3 files changed, 40 insertions, 11 deletions

diff --git a/drivers/net/ethernet/mellanox/mlx4/main.c b/drivers/net/ethernet/mellanox/mlx4/main.c
index a39c647c12dc..ef3f3d06ff1e 100644
--- a/drivers/net/ethernet/mellanox/mlx4/main.c
+++ b/drivers/net/ethernet/mellanox/mlx4/main.c
@@ -3935,17 +3935,27 @@ 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(struct devlink *devlink,
-                               struct netlink_ext_ack *extack)
+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");
         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_up failed, ret=%d\n",
@@ -3956,7 +3966,8 @@ static int mlx4_devlink_reload(struct devlink *devlink,
 
 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)
diff --git a/drivers/net/ethernet/mellanox/mlxsw/core.c b/drivers/net/ethernet/mellanox/mlxsw/core.c
index 963a2b4b61b1..c71a1d9ea17b 100644
--- a/drivers/net/ethernet/mellanox/mlxsw/core.c
+++ b/drivers/net/ethernet/mellanox/mlxsw/core.c
@@ -984,16 +984,26 @@ mlxsw_devlink_info_get(struct devlink *devlink, struct devlink_info_req *req,
         return 0;
 }
 
-static int mlxsw_devlink_core_bus_device_reload(struct devlink *devlink,
-                                                struct netlink_ext_ack *extack)
+static int
+mlxsw_devlink_core_bus_device_reload_down(struct devlink *devlink,
+                                          struct netlink_ext_ack *extack)
 {
         struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
-        int err;
 
         if (!(mlxsw_core->bus->features & MLXSW_BUS_F_RESET))
                 return -EOPNOTSUPP;
 
         mlxsw_core_bus_device_unregister(mlxsw_core, true);
+        return 0;
+}
+
+static int
+mlxsw_devlink_core_bus_device_reload_up(struct devlink *devlink,
+                                        struct netlink_ext_ack *extack)
+{
+        struct mlxsw_core *mlxsw_core = devlink_priv(devlink);
+        int err;
+
         err = mlxsw_core_bus_device_register(mlxsw_core->bus_info,
                                              mlxsw_core->bus,
                                              mlxsw_core->bus_priv, true,
@@ -1066,7 +1076,8 @@ mlxsw_devlink_trap_group_init(struct devlink *devlink,
 }
 
 static const struct devlink_ops mlxsw_devlink_ops = {
-        .reload                         = mlxsw_devlink_core_bus_device_reload,
+        .reload_down            = mlxsw_devlink_core_bus_device_reload_down,
+        .reload_up              = mlxsw_devlink_core_bus_device_reload_up,
         .port_type_set                  = mlxsw_devlink_port_type_set,
         .port_split                     = mlxsw_devlink_port_split,
         .port_unsplit                   = mlxsw_devlink_port_unsplit,
diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c
index 39cdb6c18ec0..7fba7b271a57 100644
--- a/drivers/net/netdevsim/dev.c
+++ b/drivers/net/netdevsim/dev.c
@@ -521,8 +521,14 @@ static void nsim_dev_traps_exit(struct devlink *devlink)
         kfree(nsim_dev->trap_data);
 }
 
-static int nsim_dev_reload(struct devlink *devlink,
-                           struct netlink_ext_ack *extack)
+static int nsim_dev_reload_down(struct devlink *devlink,
+                                struct netlink_ext_ack *extack)
+{
+        return 0;
+}
+
+static int nsim_dev_reload_up(struct devlink *devlink,
+                              struct netlink_ext_ack *extack)
 {
         enum nsim_resource_id res_ids[] = {
                 NSIM_RESOURCE_IPV4_FIB, NSIM_RESOURCE_IPV4_FIB_RULES,
@@ -638,7 +644,8 @@ nsim_dev_devlink_trap_action_set(struct devlink *devlink,
 }
 
 static const struct devlink_ops nsim_dev_devlink_ops = {
-        .reload = nsim_dev_reload,
+        .reload_down = nsim_dev_reload_down,
+        .reload_up = nsim_dev_reload_up,
         .flash_update = nsim_dev_flash_update,
         .trap_init = nsim_dev_devlink_trap_init,
         .trap_action_set = nsim_dev_devlink_trap_action_set,