Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net/mlx5: Handle sync reset abort event

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>

authored by

Moshe Shemesh and committed by
Jakub Kicinski
7dd6df32 eabe8e5e

+15
+15
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c
··· 14 14 struct work_struct reset_request_work; 15 15 struct work_struct reset_reload_work; 16 16 struct work_struct reset_now_work; 17 + struct work_struct reset_abort_work; 17 18 unsigned long reset_flags; 18 19 struct timer_list timer; 19 20 }; ··· 272 271 mlx5_load_one(dev, false); 273 272 } 274 273 274 + static void mlx5_sync_reset_abort_event(struct work_struct *work) 275 + { 276 + struct mlx5_fw_reset *fw_reset = container_of(work, struct mlx5_fw_reset, 277 + reset_abort_work); 278 + struct mlx5_core_dev *dev = fw_reset->dev; 279 + 280 + mlx5_sync_reset_clear_reset_requested(dev, true); 281 + mlx5_core_warn(dev, "PCI Sync FW Update Reset Aborted.\n"); 282 + } 283 + 275 284 static void mlx5_sync_reset_events_handle(struct mlx5_fw_reset *fw_reset, struct mlx5_eqe *eqe) 276 285 { 277 286 struct mlx5_eqe_sync_fw_update *sync_fw_update_eqe; ··· 295 284 break; 296 285 case MLX5_SYNC_RST_STATE_RESET_NOW: 297 286 queue_work(fw_reset->wq, &fw_reset->reset_now_work); 287 + break; 288 + case MLX5_SYNC_RST_STATE_RESET_ABORT: 289 + queue_work(fw_reset->wq, &fw_reset->reset_abort_work); 298 290 break; 299 291 } 300 292 } ··· 349 335 INIT_WORK(&fw_reset->reset_request_work, mlx5_sync_reset_request_event); 350 336 INIT_WORK(&fw_reset->reset_reload_work, mlx5_sync_reset_reload_work); 351 337 INIT_WORK(&fw_reset->reset_now_work, mlx5_sync_reset_now_event); 338 + INIT_WORK(&fw_reset->reset_abort_work, mlx5_sync_reset_abort_event); 352 339 353 340 return 0; 354 341 }