Commit 99a2b9be authored by Ben Ben-Ishay's avatar Ben Ben-Ishay Committed by Saeed Mahameed
Browse files

net/mlx5e: SHAMPO, reduce TIR indication 



SHAMPO is an RQ / WQ feature, an indication was added to the TIR in the
first place to enforce suitability between connected TIR and RQ, this
enforcement does not exist in current the Firmware implementation and was
redundant in the first place.

Fixes: 83439f3c ("net/mlx5e: Add HW-GRO offload")
Signed-off-by: default avatarBen Ben-Ishay <benishay@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent ad11c4f1

drivers/net/ethernet/mellanox/mlx5/core/en/tir.c

+0 −3
Original line number Diff line number Diff line
@@ -88,9 +88,6 @@ void mlx5e_tir_builder_build_packet_merge(struct mlx5e_tir_builder *builder, 
			 (MLX5E_PARAMS_DEFAULT_LRO_WQE_SZ - rough_max_l2_l3_hdr_sz) >> 8);

		MLX5_SET(tirc, tirc, lro_timeout_period_usecs, pkt_merge_param->timeout);

		break;

	case MLX5E_PACKET_MERGE_SHAMPO:

		MLX5_SET(tirc, tirc, packet_merge_mask, MLX5_TIRC_PACKET_MERGE_MASK_SHAMPO);

		break;

	default:

		break;

	}

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1 −2
Original line number Diff line number Diff line
@@ -3616,8 +3616,7 @@ static int set_feature_hw_gro(struct net_device *netdev, bool enable) 
		goto out;

	}



	err = mlx5e_safe_switch_params(priv, &new_params,

				       mlx5e_modify_tirs_packet_merge_ctx, NULL, reset);

	err = mlx5e_safe_switch_params(priv, &new_params, NULL, NULL, reset);

out:

	mutex_unlock(&priv->state_lock);

	return err;

include/linux/mlx5/mlx5_ifc.h

+0 −1
Original line number Diff line number Diff line
@@ -3434,7 +3434,6 @@ enum { 
enum {

	MLX5_TIRC_PACKET_MERGE_MASK_IPV4_LRO  = BIT(0),

	MLX5_TIRC_PACKET_MERGE_MASK_IPV6_LRO  = BIT(1),

	MLX5_TIRC_PACKET_MERGE_MASK_SHAMPO    = BIT(2),

};



enum {