Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d93412f2 authored by Parav Pandit's avatar Parav Pandit Committed by Greg Kroah-Hartman
Browse files

IB/mlx4: Follow mirror sequence of device add during device removal 



[ Upstream commit 89f988d93c62384758b19323c886db917a80c371 ]

Current code device add sequence is:

ib_register_device()
ib_mad_init()
init_sriov_init()
register_netdev_notifier()

Therefore, the remove sequence should be,

unregister_netdev_notifier()
close_sriov()
mad_cleanup()
ib_unregister_device()

However it is not above.
Hence, make do above remove sequence.

Fixes: fa417f7b ("IB/mlx4: Add support for IBoE")
Signed-off-by: default avatarParav Pandit <parav@mellanox.com>
Reviewed-by: default avatarMaor Gottlieb <maorg@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Link: https://lore.kernel.org/r/20191212091214.315005-3-leon@kernel.org


Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent fbf01d59

drivers/infiniband/hw/mlx4/main.c

+5 −4
Original line number Diff line number Diff line
@@ -3069,16 +3069,17 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) 
	ibdev->ib_active = false;

	flush_workqueue(wq);



	mlx4_ib_close_sriov(ibdev);

	mlx4_ib_mad_cleanup(ibdev);

	ib_unregister_device(&ibdev->ib_dev);

	mlx4_ib_diag_cleanup(ibdev);

	if (ibdev->iboe.nb.notifier_call) {

		if (unregister_netdevice_notifier(&ibdev->iboe.nb))

			pr_warn("failure unregistering notifier\n");

		ibdev->iboe.nb.notifier_call = NULL;

	}



	mlx4_ib_close_sriov(ibdev);

	mlx4_ib_mad_cleanup(ibdev);

	ib_unregister_device(&ibdev->ib_dev);

	mlx4_ib_diag_cleanup(ibdev);



	mlx4_qp_release_range(dev, ibdev->steer_qpn_base,

			      ibdev->steer_qpn_count);

	kfree(ibdev->ib_uc_qpns_bitmap);