Commit fe578cbb authored by Eli Cohen's avatar Eli Cohen Committed by Saeed Mahameed
Browse files

net/mlx5: Move devlink registration before mlx5_load 



In order to allow reference to devlink parameters during driver load,
move the devlink registration before mlx5_load. Subsequent patch will
use it to control the number of completion vectors required based on
whether eth is enabled or not.

Signed-off-by: default avatarEli Cohen <elic@nvidia.com>
Reviewed-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
parent 3354822c

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

+7 −7
Original line number Diff line number Diff line
@@ -1399,16 +1399,16 @@ int mlx5_init_one(struct mlx5_core_dev *dev) 
		goto function_teardown;

	}



	err = mlx5_devlink_params_register(priv_to_devlink(dev));

	if (err)

		goto err_devlink_params_reg;



	err = mlx5_load(dev);

	if (err)

		goto err_load;



	set_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);



	err = mlx5_devlink_params_register(priv_to_devlink(dev));

	if (err)

		goto err_devlink_params_reg;



	err = mlx5_register_device(dev);

	if (err)

		goto err_register;
@@ -1418,11 +1418,11 @@ int mlx5_init_one(struct mlx5_core_dev *dev) 
	return 0;



err_register:

	mlx5_devlink_params_unregister(priv_to_devlink(dev));

err_devlink_params_reg:

	clear_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);

	mlx5_unload(dev);

err_load:

	mlx5_devlink_params_unregister(priv_to_devlink(dev));

err_devlink_params_reg:

	mlx5_cleanup_once(dev);

function_teardown:

	mlx5_function_teardown(dev, true);
@@ -1441,7 +1441,6 @@ void mlx5_uninit_one(struct mlx5_core_dev *dev) 
	mutex_lock(&dev->intf_state_mutex);



	mlx5_unregister_device(dev);

	mlx5_devlink_params_unregister(priv_to_devlink(dev));



	if (!test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {

		mlx5_core_warn(dev, "%s: interface is down, NOP\n",
@@ -1452,6 +1451,7 @@ void mlx5_uninit_one(struct mlx5_core_dev *dev) 


	clear_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state);

	mlx5_unload(dev);

	mlx5_devlink_params_unregister(priv_to_devlink(dev));

	mlx5_cleanup_once(dev);

	mlx5_function_teardown(dev, true);

out: