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

Revert "net/mlx5: Remove "recovery" arg from mlx5_load_one() function" 



This reverts commit 5977ac39.

Revert this patch as we need the "recovery" arg back in mlx5_load_one()
function. This arg will be used in the next patch for using recovery
timeout during sync reset flow.

Signed-off-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Reviewed-by: default avatarMaher Sanalla <msanalla@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 0a6b069c

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

+1 −1
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);

			mlx5_load_one(dev, false);

		devlink_remote_reload_actions_performed(priv_to_devlink(dev), 0,

							BIT(DEVLINK_RELOAD_ACTION_DRIVER_REINIT) |

							BIT(DEVLINK_RELOAD_ACTION_FW_ACTIVATE));

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

+5 −4
Original line number Diff line number Diff line
@@ -1509,13 +1509,13 @@ int mlx5_load_one_devl_locked(struct mlx5_core_dev *dev, bool recovery) 
	return err;

}



int mlx5_load_one(struct mlx5_core_dev *dev)

int mlx5_load_one(struct mlx5_core_dev *dev, bool recovery)

{

	struct devlink *devlink = priv_to_devlink(dev);

	int ret;



	devl_lock(devlink);

	ret = mlx5_load_one_devl_locked(dev, false);

	ret = mlx5_load_one_devl_locked(dev, recovery);

	devl_unlock(devlink);

	return ret;

}
@@ -1912,7 +1912,8 @@ static void mlx5_pci_resume(struct pci_dev *pdev) 


	mlx5_pci_trace(dev, "Enter, loading driver..\n");



	err = mlx5_load_one(dev);

	err = mlx5_load_one(dev, false);



	if (!err)

		devlink_health_reporter_state_update(dev->priv.health.fw_fatal_reporter,

						     DEVLINK_HEALTH_REPORTER_STATE_HEALTHY);
@@ -2003,7 +2004,7 @@ static int mlx5_resume(struct pci_dev *pdev) 
{

	struct mlx5_core_dev *dev = pci_get_drvdata(pdev);



	return mlx5_load_one(dev);

	return mlx5_load_one(dev, false);

}



static const struct pci_device_id mlx5_core_pci_table[] = {

drivers/net/ethernet/mellanox/mlx5/core/mlx5_core.h

+1 −1
Original line number Diff line number Diff line
@@ -321,7 +321,7 @@ int mlx5_init_one(struct mlx5_core_dev *dev); 
void mlx5_uninit_one(struct mlx5_core_dev *dev);

void mlx5_unload_one(struct mlx5_core_dev *dev, bool suspend);

void mlx5_unload_one_devl_locked(struct mlx5_core_dev *dev, bool suspend);

int mlx5_load_one(struct mlx5_core_dev *dev);

int mlx5_load_one(struct mlx5_core_dev *dev, bool recovery);

int mlx5_load_one_devl_locked(struct mlx5_core_dev *dev, bool recovery);



int mlx5_vport_set_other_func_cap(struct mlx5_core_dev *dev, const void *hca_cap, u16 function_id,