1 files changed, 36 insertions, 8 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index 07c204bd3fc4..ef3f3d06ff1e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -3931,26 +3931,43 @@ static void mlx4_devlink_param_load_driverinit_values(struct devlink *devlink)
         }
 }
 
-static int mlx4_devlink_reload(struct devlink *devlink,
-                               struct netlink_ext_ack *extack)
+static void mlx4_restart_one_down(struct pci_dev *pdev);
+static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,
+                               struct devlink *devlink);
+
+static int mlx4_devlink_reload_down(struct devlink *devlink,
+                                    struct netlink_ext_ack *extack)
 {
         struct mlx4_priv *priv = devlink_priv(devlink);
         struct mlx4_dev *dev = &priv->dev;
         struct mlx4_dev_persistent *persist = dev->persist;
-        int err;
 
         if (persist->num_vfs)
                 mlx4_warn(persist->dev, "Reload performed on PF, will cause reset on operating Virtual Functions\n");
-        err = mlx4_restart_one(persist->pdev, true, devlink);
+        mlx4_restart_one_down(persist->pdev);
+        return 0;
+}
+
+static int mlx4_devlink_reload_up(struct devlink *devlink,
+                                  struct netlink_ext_ack *extack)
+{
+        struct mlx4_priv *priv = devlink_priv(devlink);
+        struct mlx4_dev *dev = &priv->dev;
+        struct mlx4_dev_persistent *persist = dev->persist;
+        int err;
+
+        err = mlx4_restart_one_up(persist->pdev, true, devlink);
         if (err)
-                mlx4_err(persist->dev, "mlx4_restart_one failed, ret=%d\n", err);
+                mlx4_err(persist->dev, "mlx4_restart_one_up failed, ret=%d\n",
+                         err);
 
         return err;
 }
 
 static const struct devlink_ops mlx4_devlink_ops = {
         .port_type_set  = mlx4_devlink_port_type_set,
-        .reload         = mlx4_devlink_reload,
+        .reload_down    = mlx4_devlink_reload_down,
+        .reload_up      = mlx4_devlink_reload_up,
 };
 
 static int mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
@@ -4163,7 +4180,13 @@ static int restore_current_port_types(struct mlx4_dev *dev,
         return err;
 }
 
-int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink)
+static void mlx4_restart_one_down(struct pci_dev *pdev)
+{
+        mlx4_unload_one(pdev);
+}
+
+static int mlx4_restart_one_up(struct pci_dev *pdev, bool reload,
+                               struct devlink *devlink)
 {
         struct mlx4_dev_persistent *persist = pci_get_drvdata(pdev);
         struct mlx4_dev  *dev  = persist->dev;
@@ -4175,7 +4198,6 @@ int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink)
         total_vfs = dev->persist->num_vfs;
         memcpy(nvfs, dev->persist->nvfs, sizeof(dev->persist->nvfs));
 
-        mlx4_unload_one(pdev);
         if (reload)
                 mlx4_devlink_param_load_driverinit_values(devlink);
         err = mlx4_load_one(pdev, pci_dev_data, total_vfs, nvfs, priv, 1);
@@ -4194,6 +4216,12 @@ int mlx4_restart_one(struct pci_dev *pdev, bool reload, struct devlink *devlink)
         return err;
 }
 
+int mlx4_restart_one(struct pci_dev *pdev)
+{
+        mlx4_restart_one_down(pdev);
+        return mlx4_restart_one_up(pdev, false, NULL);
+}
+
 #define MLX_SP(id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_FORCE_SENSE_PORT }
 #define MLX_VF(id) { PCI_VDEVICE(MELLANOX, id), MLX4_PCI_DEV_IS_VF }
 #define MLX_GN(id) { PCI_VDEVICE(MELLANOX, id), 0 }