Commit ae345299 authored by Khalid Manaa's avatar Khalid Manaa Committed by Saeed Mahameed
Browse files

net/mlx5e: Prevent HW-GRO and CQE-COMPRESS features operate together 



HW-GRO and CQE-COMPRESS are mutually exclusive, this commit adds this
restriction.

Signed-off-by: default avatarKhalid Manaa <khalidm@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 83439f3c

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

+5 −0
Original line number Diff line number Diff line
@@ -1900,6 +1900,11 @@ int mlx5e_modify_rx_cqe_compression_locked(struct mlx5e_priv *priv, bool new_val 
		return -EINVAL;

	}



	if (priv->channels.params.packet_merge.type == MLX5E_PACKET_MERGE_SHAMPO) {

		netdev_warn(priv->netdev, "Can't set CQE compression with HW-GRO, disable it first.\n");

		return -EINVAL;

	}



	new_params = priv->channels.params;

	MLX5E_SET_PFLAG(&new_params, MLX5E_PFLAG_RX_CQE_COMPRESS, new_val);

	if (rx_filter)

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

+5 −0
Original line number Diff line number Diff line
@@ -3560,6 +3560,11 @@ static int set_feature_hw_gro(struct net_device *netdev, bool enable) 
	new_params = priv->channels.params;



	if (enable) {

		if (MLX5E_GET_PFLAG(&new_params, MLX5E_PFLAG_RX_CQE_COMPRESS)) {

			netdev_warn(netdev, "Can't set HW-GRO when CQE compress is active\n");

			err = -EINVAL;

			goto out;

		}

		new_params.packet_merge.type = MLX5E_PACKET_MERGE_SHAMPO;

		new_params.packet_merge.shampo.match_criteria_type =

			MLX5_RQC_SHAMPO_MATCH_CRITERIA_TYPE_EXTENDED;