This is a note to let you know that I've just added the patch titled net/mlx5: Reload auxiliary devices in pci error handlers to the 6.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: net-mlx5-reload-auxiliary-devices-in-pci-error-handlers.patch and it can be found in the queue-6.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From aab8e1a200b926147db51e3f82fd07bb9edf6a98 Mon Sep 17 00:00:00 2001 From: Moshe Shemesh <moshe@xxxxxxxxxx> Date: Sun, 23 Jul 2023 11:03:01 +0300 Subject: net/mlx5: Reload auxiliary devices in pci error handlers From: Moshe Shemesh <moshe@xxxxxxxxxx> commit aab8e1a200b926147db51e3f82fd07bb9edf6a98 upstream. Handling pci errors should fully teardown and load back auxiliary devices, same as done through mlx5 health recovery flow. Fixes: 72ed5d5624af ("net/mlx5: Suspend auxiliary devices only in case of PCI device suspend") Signed-off-by: Moshe Shemesh <moshe@xxxxxxxxxx> Signed-off-by: Saeed Mahameed <saeedm@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c @@ -1845,7 +1845,7 @@ static pci_ers_result_t mlx5_pci_err_det mlx5_enter_error_state(dev, false); mlx5_error_sw_reset(dev); - mlx5_unload_one(dev, true); + mlx5_unload_one(dev, false); mlx5_drain_health_wq(dev); mlx5_pci_disable_device(dev); Patches currently in stable-queue which might be from moshe@xxxxxxxxxx are queue-6.4/net-mlx5-skip-clock-update-work-when-device-is-in-error-state.patch queue-6.4/net-mlx5-reload-auxiliary-devices-in-pci-error-handlers.patch