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

Commit 45bded2c authored by Kamal Heib's avatar Kamal Heib Committed by Doug Ledford
Browse files

IB/mlx5: Verify that Q counters are supported 



Make sure that the Q counters are supported by the FW before trying
to allocate/deallocte them, this will avoid driver load failure when
they aren't supported by the FW.

Fixes: 0837e86a ('IB/mlx5: Add per port counters')
Cc: <stable@vger.kernel.org> # v4.7+
Signed-off-by: default avatarKamal Heib <kamalh@mellanox.com>
Reviewed-by: default avatarMark Bloch <markb@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 12bbf1ea

drivers/infiniband/hw/mlx5/main.c

+9 −5
Original line number Diff line number Diff line
@@ -3313,9 +3313,11 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	if (err)

		goto err_rsrc;



	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt)) {

		err = mlx5_ib_alloc_q_counters(dev);

		if (err)

			goto err_odp;

	}



	dev->mdev->priv.uar = mlx5_get_uars_page(dev->mdev);

	if (!dev->mdev->priv.uar)
@@ -3364,6 +3366,7 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev) 
	mlx5_put_uars_page(dev->mdev, dev->mdev->priv.uar);



err_q_cnt:

	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))

		mlx5_ib_dealloc_q_counters(dev);



err_odp:
@@ -3397,6 +3400,7 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context) 
	mlx5_free_bfreg(dev->mdev, &dev->fp_bfreg);

	mlx5_free_bfreg(dev->mdev, &dev->bfreg);

	mlx5_put_uars_page(dev->mdev, mdev->priv.uar);

	if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))

		mlx5_ib_dealloc_q_counters(dev);

	destroy_umrc_res(dev);

	mlx5_ib_odp_remove_one(dev);