system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-04 02:10:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/mlx5: Handle sync reset abort event

Browse source 
If firmware sends sync_reset_abort to driver the driver should clear the
reset requested mode as reset is not expected any more.

Signed-off-by: Moshe Shemesh <moshe@mellanox.com>
Reviewed-by: Saeed Mahameed <saeedm@nvidia.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Moshe Shemesh 2020-10-07 09:00:51 +03:00 committed by Jakub Kicinski
parent eabe8e5e88
commit 7dd6df329d
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
View file

@ -14,6 +14,7 @@ struct mlx5_fw_reset {
struct work_struct reset_request_work; struct work_struct reset_request_work;
struct work_struct reset_reload_work; struct work_struct reset_reload_work;
struct work_struct reset_now_work; struct work_struct reset_now_work;
struct work_struct reset_abort_work;
unsigned long reset_flags; unsigned long reset_flags;
struct timer_list timer; struct timer_list timer;
}; };
@ -271,6 +272,16 @@ static void mlx5_sync_reset_now_event(struct work_struct *work)
mlx5_load_one(dev, false); mlx5_load_one(dev, false);
} }
static void mlx5_sync_reset_abort_event(struct work_struct *work)
{
struct mlx5_fw_reset *fw_reset = container_of(work, struct mlx5_fw_reset,
reset_abort_work);
struct mlx5_core_dev *dev = fw_reset->dev;
mlx5_sync_reset_clear_reset_requested(dev, true);
mlx5_core_warn(dev, "PCI Sync FW Update Reset Aborted.\n");
}
static void mlx5_sync_reset_events_handle(struct mlx5_fw_reset *fw_reset, struct mlx5_eqe *eqe) static void mlx5_sync_reset_events_handle(struct mlx5_fw_reset *fw_reset, struct mlx5_eqe *eqe)
{ {
struct mlx5_eqe_sync_fw_update *sync_fw_update_eqe; struct mlx5_eqe_sync_fw_update *sync_fw_update_eqe;
@ -285,6 +296,9 @@ static void mlx5_sync_reset_events_handle(struct mlx5_fw_reset *fw_reset, struct
case MLX5_SYNC_RST_STATE_RESET_NOW: case MLX5_SYNC_RST_STATE_RESET_NOW:
queue_work(fw_reset->wq, &fw_reset->reset_now_work); queue_work(fw_reset->wq, &fw_reset->reset_now_work);
break; break;
case MLX5_SYNC_RST_STATE_RESET_ABORT:
queue_work(fw_reset->wq, &fw_reset->reset_abort_work);
break;
} }
} }
@ -335,6 +349,7 @@ int mlx5_fw_reset_init(struct mlx5_core_dev *dev)
INIT_WORK(&fw_reset->reset_request_work, mlx5_sync_reset_request_event); INIT_WORK(&fw_reset->reset_request_work, mlx5_sync_reset_request_event);
INIT_WORK(&fw_reset->reset_reload_work, mlx5_sync_reset_reload_work); INIT_WORK(&fw_reset->reset_reload_work, mlx5_sync_reset_reload_work);
INIT_WORK(&fw_reset->reset_now_work, mlx5_sync_reset_now_event); INIT_WORK(&fw_reset->reset_now_work, mlx5_sync_reset_now_event);
INIT_WORK(&fw_reset->reset_abort_work, mlx5_sync_reset_abort_event);
return 0; return 0;
} }