Commit 7ba930fc authored by Daniel Jurgens's avatar Daniel Jurgens Committed by Saeed Mahameed
Browse files

net/mlx5: Disable eswitch before waiting for VF pages 



The offending commit changed the ordering of moving to legacy mode and
waiting for the VF pages. Moving to legacy mode is important in
bluefield, because it sends the host driver into error state, and frees
its pages. Without this transition we end up waiting 2 minutes for
pages that aren't coming before carrying on with the unload process.

Fixes: f019679e ("net/mlx5: E-switch, Remove dependency between sriov and eswitch mode")
Signed-off-by: default avatarDaniel Jurgens <danielj@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent ba5d8f72

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

+1 −1
Original line number Diff line number Diff line
@@ -1364,8 +1364,8 @@ static void mlx5_unload(struct mlx5_core_dev *dev) 
{

	mlx5_devlink_traps_unregister(priv_to_devlink(dev));

	mlx5_sf_dev_table_destroy(dev);

	mlx5_sriov_detach(dev);

	mlx5_eswitch_disable(dev->priv.eswitch);

	mlx5_sriov_detach(dev);

	mlx5_lag_remove_mdev(dev);

	mlx5_ec_cleanup(dev);

	mlx5_sf_hw_table_destroy(dev);