net/mlx5: Delete redundant default assignment of runtime devlink params

Runtime devlink params always read their values from the get() callbacks.
Also, it is an error to set driverinit_value for params which don't
support driverinit cmode. Delete such assignments.

In addition, move the set of default matching mode inside eswitch code.

Signed-off-by: Shay Drory <shayd@nvidia.com>
Reviewed-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Mark Bloch <mbloch@nvidia.com>
Signed-off-by: Saeed Mahameed <saeedm@nvidia.com>

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
index 057dde6f441741f74c4f986d70e5775c59e11102..e8789e6d7e7b448f7d2d97c4ec4bab0e11c0c5a0 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/devlink.c
@@ -584,14 +584,6 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink)
        struct mlx5_core_dev *dev = devlink_priv(devlink);
        union devlink_param_value value;
 
-       if (dev->priv.steering->mode == MLX5_FLOW_STEERING_MODE_DMFS)
-               strcpy(value.vstr, "dmfs");
-       else
-               strcpy(value.vstr, "smfs");
-       devlink_param_driverinit_value_set(devlink,
-                                          MLX5_DEVLINK_PARAM_ID_FLOW_STEERING_MODE,
-                                          value);
-
        value.vbool = MLX5_CAP_GEN(dev, roce);
        devlink_param_driverinit_value_set(devlink,
                                           DEVLINK_PARAM_GENERIC_ID_ENABLE_ROCE,
@@ -602,18 +594,6 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink)
        devlink_param_driverinit_value_set(devlink,
                                           MLX5_DEVLINK_PARAM_ID_ESW_LARGE_GROUP_NUM,
                                           value);
-
-       if (MLX5_ESWITCH_MANAGER(dev)) {
-               if (mlx5_esw_vport_match_metadata_supported(dev->priv.eswitch)) {
-                       dev->priv.eswitch->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;
-                       value.vbool = true;
-               } else {
-                       value.vbool = false;
-               }
-               devlink_param_driverinit_value_set(devlink,
-                                                  MLX5_DEVLINK_PARAM_ID_ESW_PORT_METADATA,
-                                                  value);
-       }
 #endif
 
        value.vu32 = MLX5_COMP_EQ_SIZE;

diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
index 458ec0bca1b80135efb3c680bba130995776cee5..25f2d2717aaa8440b69536b16dbc4077417e2760 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch.c
@@ -1582,6 +1582,9 @@ int mlx5_eswitch_init(struct mlx5_core_dev *dev)
                esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_BASIC;
        else
                esw->offloads.encap = DEVLINK_ESWITCH_ENCAP_MODE_NONE;
+       if (MLX5_ESWITCH_MANAGER(dev) &&
+           mlx5_esw_vport_match_metadata_supported(esw))
+               esw->flags |= MLX5_ESWITCH_VPORT_MATCH_METADATA;
 
        dev->priv.eswitch = esw;
        BLOCKING_INIT_NOTIFIER_HEAD(&esw->n_head);