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: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Tariq Toukan <tariqt@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/mellanox/mlx4/crdump.c b/drivers/net/ethernet/mellanox/mlx4/crdump.c
index ac5468b..82a07a3 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/crdump.c
+++ b/drivers/net/ethernet/mellanox/mlx4/crdump.c
@@ -226,10 +226,10 @@ int mlx4_crdump_init(struct mlx4_dev *dev)
 
        /* Create cr-space region */
        crdump->region_crspace =
-               devlink_region_create(devlink,
-                                     &region_cr_space_ops,
-                                     MAX_NUM_OF_DUMPS_TO_STORE,
-                                     pci_resource_len(pdev, 0));
+               devl_region_create(devlink,
+                                  &region_cr_space_ops,
+                                  MAX_NUM_OF_DUMPS_TO_STORE,
+                                  pci_resource_len(pdev, 0));
        if (IS_ERR(crdump->region_crspace))
                mlx4_warn(dev, "crdump: create devlink region %s err %ld\n",
                          region_cr_space_str,
@@ -237,10 +237,10 @@ int mlx4_crdump_init(struct mlx4_dev *dev)
 
        /* Create fw-health region */
        crdump->region_fw_health =
-               devlink_region_create(devlink,
-                                     &region_fw_health_ops,
-                                     MAX_NUM_OF_DUMPS_TO_STORE,
-                                     HEALTH_BUFFER_SIZE);
+               devl_region_create(devlink,
+                                  &region_fw_health_ops,
+                                  MAX_NUM_OF_DUMPS_TO_STORE,
+                                  HEALTH_BUFFER_SIZE);
        if (IS_ERR(crdump->region_fw_health))
                mlx4_warn(dev, "crdump: create devlink region %s err %ld\n",
                          region_fw_health_str,
@@ -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);
 }

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index b187c21..f3d1319 100644 (file)
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -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 @@ err_catas:
        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);