Commit dfad9975 authored by Moshe Shemesh's avatar Moshe Shemesh Committed by Saeed Mahameed
Browse files

net/mlx5: Use recovery timeout on sync reset flow 



Use the same timeout for sync reset flow and health recovery flow, since
the former involves driver's recovery from firmware reset, which is
similar to health recovery. Otherwise, in some cases, such as a firmware
upgrade on the DPU, the firmware pre-init bit may not be ready within
current timeout and the driver will abort loading back after reset.

Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Fixes: 37ca95e6 ("net/mlx5: Increase FW pre-init timeout for health recovery")
Reviewed-by: default avatarMaher Sanalla <msanalla@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 21608a2c

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static int mlx5_devlink_reload_up(struct devlink *devlink, enum devlink_reload_a 
			break;

		/* On fw_activate action, also driver is reloaded and reinit performed */

		*actions_performed |= BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT);

		ret = mlx5_load_one_devl_locked(dev, false);

		ret = mlx5_load_one_devl_locked(dev, true);

		break;

	default:

		/* Unsupported action should not get to this function */

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

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev) 
		if (mlx5_health_wait_pci_up(dev))

			mlx5_core_err(dev, "reset reload flow aborted, PCI reads still not working\n");

		else

			mlx5_load_one(dev, false);

			mlx5_load_one(dev, true);

		devlink_remote_reload_actions_performed(priv_to_devlink(dev), 0,

							BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |

							BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE));
@@ -499,7 +499,7 @@ int mlx5_fw_reset_wait_reset_done(struct mlx5_core_dev *dev) 
	err = fw_reset->ret;

	if (test_and_clear_bit(MLX5_FW_RESET_FLAGS_RELOAD_REQUIRED, &fw_reset->reset_flags)) {

		mlx5_unload_one_devl_locked(dev, false);

		mlx5_load_one_devl_locked(dev, false);

		mlx5_load_one_devl_locked(dev, true);

	}

out:

	clear_bit(MLX5_FW_RESET_FLAGS_PENDING_COMP, &fw_reset->reset_flags);