Commit bf729988 authored by Shay Drory's avatar Shay Drory Committed by Jakub Kicinski
Browse files

net/mlx5: Restore mistakenly dropped parts in register devlink flow 



Code parts from cited commit were mistakenly dropped while rebasing
before submission. Add them here.

Fixes: c6e77aa9 ("net/mlx5: Register devlink first under devlink lock")
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://lore.kernel.org/r/20240411115444.374475-4-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent aa4ac90d

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

+4 −1
Original line number Diff line number Diff line
@@ -1699,12 +1699,15 @@ int mlx5_init_one_light(struct mlx5_core_dev *dev) 
	err = mlx5_devlink_params_register(priv_to_devlink(dev));

	if (err) {

		mlx5_core_warn(dev, "mlx5_devlink_param_reg err = %d\n", err);

		goto query_hca_caps_err;

		goto params_reg_err;

	}



	devl_unlock(devlink);

	return 0;



params_reg_err:

	devl_unregister(devlink);

	devl_unlock(devlink);

query_hca_caps_err:

	devl_unregister(devlink);

	devl_unlock(devlink);

drivers/net/ethernet/mellanox/mlx5/core/sf/dev/driver.c

+0 −1
Original line number Diff line number Diff line
@@ -75,7 +75,6 @@ static int mlx5_sf_dev_probe(struct auxiliary_device *adev, const struct auxilia 
		goto peer_devlink_set_err;

	}



	devlink_register(devlink);

	return 0;



peer_devlink_set_err: