Skip to content

Commit

Permalink
net/mlx5: Covert devlink params registration to use devlink_params_re…
Browse files Browse the repository at this point in the history 
…gister/unregister()

Since mlx5 is the only user of devlink API to register/unregister a
single param, convert it to use array registration function allowing to
simplify the devlink API by removing the single param registration
functions.

Signed-off-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed Jan 27, 2023
1 parent c8aebff commit a756185
Showing 1 changed file with 46 additions and 34 deletions.
80 changes: 46 additions & 34 deletions drivers/net/ethernet/mellanox/mlx5/core/devlink.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -624,11 +624,12 @@ static void mlx5_devlink_set_params_init_values(struct devlink *devlink)
value);
}

static const struct devlink_param enable_eth_param =
static const struct devlink_param mlx5_devlink_eth_params[] = {
DEVLINK_PARAM_GENERIC(ENABLE_ETH, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
NULL, NULL, NULL);
NULL, NULL, NULL),
};

static int mlx5_devlink_eth_param_register(struct devlink *devlink)
static int mlx5_devlink_eth_params_register(struct devlink *devlink)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);
union devlink_param_value value;
Expand All @@ -637,7 +638,8 @@ static int mlx5_devlink_eth_param_register(struct devlink *devlink)
if (!mlx5_eth_supported(dev))
return 0;

err = devlink_param_register(devlink, &enable_eth_param);
err = devlink_params_register(devlink, mlx5_devlink_eth_params,
ARRAY_SIZE(mlx5_devlink_eth_params));
if (err)
return err;

Expand All @@ -648,14 +650,15 @@ static int mlx5_devlink_eth_param_register(struct devlink *devlink)
return 0;
}

static void mlx5_devlink_eth_param_unregister(struct devlink *devlink)
static void mlx5_devlink_eth_params_unregister(struct devlink *devlink)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);

if (!mlx5_eth_supported(dev))
return;

devlink_param_unregister(devlink, &enable_eth_param);
devlink_params_unregister(devlink, mlx5_devlink_eth_params,
ARRAY_SIZE(mlx5_devlink_eth_params));
}

static int mlx5_devlink_enable_rdma_validate(struct devlink *devlink, u32 id,
Expand All @@ -670,19 +673,21 @@ static int mlx5_devlink_enable_rdma_validate(struct devlink *devlink, u32 id,
return 0;
}

static const struct devlink_param enable_rdma_param =
static const struct devlink_param mlx5_devlink_rdma_params[] = {
DEVLINK_PARAM_GENERIC(ENABLE_RDMA, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
NULL, NULL, mlx5_devlink_enable_rdma_validate);
NULL, NULL, mlx5_devlink_enable_rdma_validate),
};

static int mlx5_devlink_rdma_param_register(struct devlink *devlink)
static int mlx5_devlink_rdma_params_register(struct devlink *devlink)
{
union devlink_param_value value;
int err;

if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))
return 0;

err = devlink_param_register(devlink, &enable_rdma_param);
err = devlink_params_register(devlink, mlx5_devlink_rdma_params,
ARRAY_SIZE(mlx5_devlink_rdma_params));
if (err)
return err;

Expand All @@ -693,19 +698,21 @@ static int mlx5_devlink_rdma_param_register(struct devlink *devlink)
return 0;
}

static void mlx5_devlink_rdma_param_unregister(struct devlink *devlink)
static void mlx5_devlink_rdma_params_unregister(struct devlink *devlink)
{
if (!IS_ENABLED(CONFIG_MLX5_INFINIBAND))
return;

devlink_param_unregister(devlink, &enable_rdma_param);
devlink_params_unregister(devlink, mlx5_devlink_rdma_params,
ARRAY_SIZE(mlx5_devlink_rdma_params));
}

static const struct devlink_param enable_vnet_param =
static const struct devlink_param mlx5_devlink_vnet_params[] = {
DEVLINK_PARAM_GENERIC(ENABLE_VNET, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
NULL, NULL, NULL);
NULL, NULL, NULL),
};

static int mlx5_devlink_vnet_param_register(struct devlink *devlink)
static int mlx5_devlink_vnet_params_register(struct devlink *devlink)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);
union devlink_param_value value;
Expand All @@ -714,7 +721,8 @@ static int mlx5_devlink_vnet_param_register(struct devlink *devlink)
if (!mlx5_vnet_supported(dev))
return 0;

err = devlink_param_register(devlink, &enable_vnet_param);
err = devlink_params_register(devlink, mlx5_devlink_vnet_params,
ARRAY_SIZE(mlx5_devlink_vnet_params));
if (err)
return err;

Expand All @@ -725,45 +733,46 @@ static int mlx5_devlink_vnet_param_register(struct devlink *devlink)
return 0;
}

static void mlx5_devlink_vnet_param_unregister(struct devlink *devlink)
static void mlx5_devlink_vnet_params_unregister(struct devlink *devlink)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);

if (!mlx5_vnet_supported(dev))
return;

devlink_param_unregister(devlink, &enable_vnet_param);
devlink_params_unregister(devlink, mlx5_devlink_vnet_params,
ARRAY_SIZE(mlx5_devlink_vnet_params));
}

static int mlx5_devlink_auxdev_params_register(struct devlink *devlink)
{
int err;

err = mlx5_devlink_eth_param_register(devlink);
err = mlx5_devlink_eth_params_register(devlink);
if (err)
return err;

err = mlx5_devlink_rdma_param_register(devlink);
err = mlx5_devlink_rdma_params_register(devlink);
if (err)
goto rdma_err;

err = mlx5_devlink_vnet_param_register(devlink);
err = mlx5_devlink_vnet_params_register(devlink);
if (err)
goto vnet_err;
return 0;

vnet_err:
mlx5_devlink_rdma_param_unregister(devlink);
mlx5_devlink_rdma_params_unregister(devlink);
rdma_err:
mlx5_devlink_eth_param_unregister(devlink);
mlx5_devlink_eth_params_unregister(devlink);
return err;
}

static void mlx5_devlink_auxdev_params_unregister(struct devlink *devlink)
{
mlx5_devlink_vnet_param_unregister(devlink);
mlx5_devlink_rdma_param_unregister(devlink);
mlx5_devlink_eth_param_unregister(devlink);
mlx5_devlink_vnet_params_unregister(devlink);
mlx5_devlink_rdma_params_unregister(devlink);
mlx5_devlink_eth_params_unregister(devlink);
}

static int mlx5_devlink_max_uc_list_validate(struct devlink *devlink, u32 id,
Expand Down Expand Up @@ -791,11 +800,12 @@ static int mlx5_devlink_max_uc_list_validate(struct devlink *devlink, u32 id,
return 0;
}

static const struct devlink_param max_uc_list_param =
static const struct devlink_param mlx5_devlink_max_uc_list_params[] = {
DEVLINK_PARAM_GENERIC(MAX_MACS, BIT(DEVLINK_PARAM_CMODE_DRIVERINIT),
NULL, NULL, mlx5_devlink_max_uc_list_validate);
NULL, NULL, mlx5_devlink_max_uc_list_validate),
};

static int mlx5_devlink_max_uc_list_param_register(struct devlink *devlink)
static int mlx5_devlink_max_uc_list_params_register(struct devlink *devlink)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);
union devlink_param_value value;
Expand All @@ -804,7 +814,8 @@ static int mlx5_devlink_max_uc_list_param_register(struct devlink *devlink)
if (!MLX5_CAP_GEN_MAX(dev, log_max_current_uc_list_wr_supported))
return 0;

err = devlink_param_register(devlink, &max_uc_list_param);
err = devlink_params_register(devlink, mlx5_devlink_max_uc_list_params,
ARRAY_SIZE(mlx5_devlink_max_uc_list_params));
if (err)
return err;

Expand All @@ -816,14 +827,15 @@ static int mlx5_devlink_max_uc_list_param_register(struct devlink *devlink)
}

static void
mlx5_devlink_max_uc_list_param_unregister(struct devlink *devlink)
mlx5_devlink_max_uc_list_params_unregister(struct devlink *devlink)
{
struct mlx5_core_dev *dev = devlink_priv(devlink);

if (!MLX5_CAP_GEN_MAX(dev, log_max_current_uc_list_wr_supported))
return;

devlink_param_unregister(devlink, &max_uc_list_param);
devlink_params_unregister(devlink, mlx5_devlink_max_uc_list_params,
ARRAY_SIZE(mlx5_devlink_max_uc_list_params));
}

#define MLX5_TRAP_DROP(_id, _group_id) \
Expand Down Expand Up @@ -885,7 +897,7 @@ int mlx5_devlink_params_register(struct devlink *devlink)
if (err)
goto auxdev_reg_err;

err = mlx5_devlink_max_uc_list_param_register(devlink);
err = mlx5_devlink_max_uc_list_params_register(devlink);
if (err)
goto max_uc_list_err;

Expand All @@ -904,7 +916,7 @@ int mlx5_devlink_params_register(struct devlink *devlink)

void mlx5_devlink_params_unregister(struct devlink *devlink)
{
mlx5_devlink_max_uc_list_param_unregister(devlink);
mlx5_devlink_max_uc_list_params_unregister(devlink);
mlx5_devlink_auxdev_params_unregister(devlink);
devlink_params_unregister(devlink, mlx5_devlink_params,
ARRAY_SIZE(mlx5_devlink_params));
Expand Down

0 comments on commit a756185

Please sign in to comment.