Commit 9cb7e94a authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Jakub Kicinski
Browse files

net/mlx4: Use devl_ API for devlink region create / destroy 



Use devl_ API to call devl_region_create() and devl_region_destroy()
instead of devlink_region_create() and devlink_region_destroy().
Add devlink instance lock in mlx4 driver paths to these functions.

This will be used by the downstream patch to invoke mlx4 devlink reload
callbacks with devlink lock held.

Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 84a433a4

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

+10 −10
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ int mlx4_crdump_init(struct mlx4_dev *dev) 


	/* Create cr-space region */

	crdump->region_crspace =

		devlink_region_create(devlink,

		devl_region_create(devlink,

				   &region_cr_space_ops,

				   MAX_NUM_OF_DUMPS_TO_STORE,

				   pci_resource_len(pdev, 0));
@@ -237,7 +237,7 @@ int mlx4_crdump_init(struct mlx4_dev *dev) 


	/* Create fw-health region */

	crdump->region_fw_health =

		devlink_region_create(devlink,

		devl_region_create(devlink,

				   &region_fw_health_ops,

				   MAX_NUM_OF_DUMPS_TO_STORE,

				   HEALTH_BUFFER_SIZE);
@@ -253,6 +253,6 @@ void mlx4_crdump_end(struct mlx4_dev *dev) 
{

	struct mlx4_fw_crdump *crdump = &dev->persist->crdump;



	devlink_region_destroy(crdump->region_fw_health);

	devlink_region_destroy(crdump->region_crspace);

	devl_region_destroy(crdump->region_fw_health);

	devl_region_destroy(crdump->region_crspace);

}

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

+7 −0
Original line number Diff line number Diff line
@@ -3732,6 +3732,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data, 
	int prb_vf[MLX4_MAX_PORTS + 1] = {0, 0, 0};

	const int param_map[MLX4_MAX_PORTS + 1][MLX4_MAX_PORTS + 1] = {

		{2, 0, 0}, {0, 1, 2}, {0, 1, 2} };

	struct devlink *devlink = priv_to_devlink(priv);

	unsigned total_vfs = 0;

	unsigned int i;
@@ -3844,7 +3845,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data, 
		}

	}



	devl_lock(devlink);

	err = mlx4_crdump_init(&priv->dev);

	devl_unlock(devlink);

	if (err)

		goto err_release_regions;
@@ -3862,7 +3865,9 @@ static int __mlx4_init_one(struct pci_dev *pdev, int pci_dev_data, 
	mlx4_catas_end(&priv->dev);



err_crdump:

	devl_lock(devlink);

	mlx4_crdump_end(&priv->dev);

	devl_unlock(devlink);



err_release_regions:

	pci_release_regions(pdev);
@@ -4161,7 +4166,9 @@ static void mlx4_remove_one(struct pci_dev *pdev) 
	else

		mlx4_info(dev, "%s: interface is down\n", __func__);

	mlx4_catas_end(dev);

	devl_lock(devlink);

	mlx4_crdump_end(dev);

	devl_unlock(devlink);

	if (dev->flags & MLX4_FLAG_SRIOV && !active_vfs) {

		mlx4_warn(dev, "Disabling SR-IOV\n");

		pci_disable_sriov(pdev);