Commit 72ed5d56 authored by Jiri Pirko's avatar Jiri Pirko Committed by Saeed Mahameed
Browse files

net/mlx5: Suspend auxiliary devices only in case of PCI device suspend 



The original behavior introduced by commit c6acd629 ("net/mlx5e: Add
support for devlink-port in non-representors mode") correctly
re-instantiated uplink devlink port and related netdevice during devlink
reload. However with migration to auxiliary devices, this behaviour
changed.

Restore the original behaviour and tear down auxiliary devices
completely during devlink reload.

Signed-off-by: default avatarJiri Pirko <jiri@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 5977ac39

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

+2 −2
Original line number Diff line number Diff line
@@ -396,7 +396,7 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) 
	return ret;

}



void mlx5_detach_device(struct mlx5_core_dev *dev)

void mlx5_detach_device(struct mlx5_core_dev *dev, bool suspend)

{

	struct mlx5_priv *priv = &dev->priv;

	struct auxiliary_device *adev;
@@ -425,7 +425,7 @@ void mlx5_detach_device(struct mlx5_core_dev *dev) 


		adrv = to_auxiliary_drv(adev->dev.driver);



		if (adrv->suspend) {

		if (adrv->suspend && suspend) {

			adrv->suspend(adev, pm);

			continue;

		}

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

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int mlx5_devlink_reload_fw_activate(struct devlink *devlink, struct netli 
	if (err)

		return err;



	mlx5_unload_one_devl_locked(dev);

	mlx5_unload_one_devl_locked(dev, true);

	err = mlx5_health_wait_pci_up(dev);

	if (err)

		NL_SET_ERR_MSG_MOD(extack, "FW activate aborted, PCI reads fail after reset");
@@ -168,7 +168,7 @@ static int mlx5_devlink_reload_down(struct devlink *devlink, bool netns_change, 


	switch (action) {

	case DEVLINK_RELOAD_ACTION_DRIVER_REINIT:

		mlx5_unload_one_devl_locked(dev);

		mlx5_unload_one_devl_locked(dev, false);

		break;

	case DEVLINK_RELOAD_ACTION_FW_ACTIVATE:

		if (limit == DEVLINK_RELOAD_LIMIT_NO_RESET)

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

+2 −2
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static void mlx5_fw_reset_complete_reload(struct mlx5_core_dev *dev) 
	if (test_bit(MLX5_FW_RESET_FLAGS_PENDING_COMP, &fw_reset->reset_flags)) {

		complete(&fw_reset->done);

	} else {

		mlx5_unload_one(dev);

		mlx5_unload_one(dev, false);

		if (mlx5_health_wait_pci_up(dev))

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

		else
@@ -498,7 +498,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);

		mlx5_unload_one_devl_locked(dev, false);

		mlx5_load_one_devl_locked(dev, false);

	}

out:

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

+1 −1
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ static void mlx5_fw_fatal_reporter_err_work(struct work_struct *work) 
		 * requests from the kernel.

		 */

		mlx5_core_err(dev, "Driver is in error state. Unloading\n");

		mlx5_unload_one(dev);

		mlx5_unload_one(dev, false);

	}

}

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

+8 −8
Original line number Diff line number Diff line
@@ -1520,12 +1520,12 @@ int mlx5_load_one(struct mlx5_core_dev *dev) 
	return ret;

}



void mlx5_unload_one_devl_locked(struct mlx5_core_dev *dev)

void mlx5_unload_one_devl_locked(struct mlx5_core_dev *dev, bool suspend)

{

	devl_assert_locked(priv_to_devlink(dev));

	mutex_lock(&dev->intf_state_mutex);



	mlx5_detach_device(dev);

	mlx5_detach_device(dev, suspend);



	if (!test_bit(MLX5_INTERFACE_STATE_UP, &dev->intf_state)) {

		mlx5_core_warn(dev, "%s: interface is down, NOP\n",
@@ -1540,12 +1540,12 @@ void mlx5_unload_one_devl_locked(struct mlx5_core_dev *dev) 
	mutex_unlock(&dev->intf_state_mutex);

}



void mlx5_unload_one(struct mlx5_core_dev *dev)

void mlx5_unload_one(struct mlx5_core_dev *dev, bool suspend)

{

	struct devlink *devlink = priv_to_devlink(dev);



	devl_lock(devlink);

	mlx5_unload_one_devl_locked(dev);

	mlx5_unload_one_devl_locked(dev, suspend);

	devl_unlock(devlink);

}
@@ -1830,7 +1830,7 @@ static pci_ers_result_t mlx5_pci_err_detected(struct pci_dev *pdev, 


	mlx5_enter_error_state(dev, false);

	mlx5_error_sw_reset(dev);

	mlx5_unload_one(dev);

	mlx5_unload_one(dev, true);

	mlx5_drain_health_wq(dev);

	mlx5_pci_disable_device(dev);
@@ -1986,7 +1986,7 @@ static void shutdown(struct pci_dev *pdev) 
	set_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state);

	err = mlx5_try_fast_unload(dev);

	if (err)

		mlx5_unload_one(dev);

		mlx5_unload_one(dev, false);

	mlx5_pci_disable_device(dev);

}
@@ -1994,7 +1994,7 @@ static int mlx5_suspend(struct pci_dev *pdev, pm_message_t state) 
{

	struct mlx5_core_dev *dev = pci_get_drvdata(pdev);



	mlx5_unload_one(dev);

	mlx5_unload_one(dev, true);



	return 0;

}
@@ -2037,7 +2037,7 @@ MODULE_DEVICE_TABLE(pci, mlx5_core_pci_table); 
void mlx5_disable_device(struct mlx5_core_dev *dev)

{

	mlx5_error_sw_reset(dev);

	mlx5_unload_one_devl_locked(dev);

	mlx5_unload_one_devl_locked(dev, false);

}



int mlx5_recover_device(struct mlx5_core_dev *dev)