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: Khalid Manaa <khalidm@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
index 5a46b6e1b9daa2edf1c9d4e92d6d7673106dc6b6..c2ea5fad48ddf28e7222592a7d37a9b563763c51 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
@@ -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)

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index ecaad2d6c216a5781da03f1a179dbdc7a9022b0b..6f398f636f015761f663a051660d4b833782f96c 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -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;