Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 26450608 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by David S. Miller
Browse files

net/mlx4_core: Fix warnings during boot on driverinit param set failures 



During boot, mlx4_core sets the driverinit configuration parameters and
updates the devlink module on the initial values calling
devlink_param_driverinit_value_set().
If devlink_param_driverinit_value_set() returns an error mlx4_core
reports kernel module warning.

This caused false alarm during boot in case kernel was compiled with
CONFIG_NET_DEVLINK off.
Fix by removing warning reported in case
devlink_param_driverinit_value_set() fails.

This actually makes the function mlx4_devlink_set_init_value()
redundant to using directly devlink_param_driverinit_value_set() and so
removed.

It fixes the following kernel trace:

 mlx4_core 0000:00:06.0: devlink set parameter 0 value failed (err = -95)
 mlx4_core 0000:00:06.0: devlink set parameter 1 value failed (err = -95)
 mlx4_core 0000:00:06.0: devlink set parameter 4 value failed (err = -95)
 mlx4_core 0000:00:06.0: devlink set parameter 5 value failed (err = -95)
 mlx4_core 0000:00:06.0: devlink set parameter 3 value failed (err = -95)

Fixes: bd1b51dc ("mlx4: Add mlx4 initial parameters table and register it")
Signed-off-by: default avatarMoshe Shemesh <moshe@mellanox.com>
Signed-off-by: default avatarTariq Toukan <tariqt@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a1f8dd34

drivers/net/ethernet/mellanox/mlx4/main.c

+15 −28
Original line number Diff line number Diff line
@@ -260,45 +260,32 @@ static const struct devlink_param mlx4_devlink_params[] = { 
			     NULL, NULL, NULL),

};



static void mlx4_devlink_set_init_value(struct devlink *devlink, u32 param_id,

					union devlink_param_value init_val)

{

	struct mlx4_priv *priv = devlink_priv(devlink);

	struct mlx4_dev *dev = &priv->dev;

	int err;



	err = devlink_param_driverinit_value_set(devlink, param_id, init_val);

	if (err)

		mlx4_warn(dev,

			  "devlink set parameter %u value failed (err = %d)",

			  param_id, err);

}



static void mlx4_devlink_set_params_init_values(struct devlink *devlink)

{

	union devlink_param_value value;



	value.vbool = !!mlx4_internal_err_reset;

	mlx4_devlink_set_init_value(devlink,

	devlink_param_driverinit_value_set(devlink,

					   DEVLINK_PARAM_GENERIC_ID_INT_ERR_RESET,

					   value);



	value.vu32 = 1UL << log_num_mac;

	mlx4_devlink_set_init_value(devlink,

				    DEVLINK_PARAM_GENERIC_ID_MAX_MACS, value);

	devlink_param_driverinit_value_set(devlink,

					   DEVLINK_PARAM_GENERIC_ID_MAX_MACS,

					   value);



	value.vbool = enable_64b_cqe_eqe;

	mlx4_devlink_set_init_value(devlink,

	devlink_param_driverinit_value_set(devlink,

					   MLX4_DEVLINK_PARAM_ID_ENABLE_64B_CQE_EQE,

					   value);



	value.vbool = enable_4k_uar;

	mlx4_devlink_set_init_value(devlink,

	devlink_param_driverinit_value_set(devlink,

					   MLX4_DEVLINK_PARAM_ID_ENABLE_4K_UAR,

					   value);



	value.vbool = false;

	mlx4_devlink_set_init_value(devlink,

	devlink_param_driverinit_value_set(devlink,

					   DEVLINK_PARAM_GENERIC_ID_REGION_SNAPSHOT,

					   value);

}