Commit 031a163f authored by Shay Drory's avatar Shay Drory Committed by Saeed Mahameed
Browse files

net/mlx5: Set BREAK_FW_WAIT flag first when removing driver 



Currently, BREAK_FW_WAIT flag is set after syncing with fw_reset.
However, fw_reset can call mlx5_load_one() which is waiting for fw
init bit and BREAK_FW_WAIT flag is intended to stop. e.g.: the driver
might wait on a loop it should exit.
Fix it by setting the flag before syncing with fw_reset.

Fixes: 8324a02c ("net/mlx5: Add exit route when waiting for FW")
Signed-off-by: default avatarShay Drory <shayd@nvidia.com>
Reviewed-by: default avatarMoshe Shemesh <moshe@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent dd645724

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

+1 −1
Original line number Diff line number Diff line
@@ -1789,11 +1789,11 @@ static void remove_one(struct pci_dev *pdev) 
	struct mlx5_core_dev *dev  = pci_get_drvdata(pdev);

	struct devlink *devlink = priv_to_devlink(dev);



	set_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state);

	/* mlx5_drain_fw_reset() is using devlink APIs. Hence, we must drain

	 * fw_reset before unregistering the devlink.

	 */

	mlx5_drain_fw_reset(dev);

	set_bit(MLX5_BREAK_FW_WAIT, &dev->intf_state);

	devlink_unregister(devlink);

	mlx5_sriov_disable(pdev);

	mlx5_crdump_disable(dev);