IB/mlx5: Verify that Q counters are supported

commit 45bded2c216da6010184ac5ebe88c27f73439009 upstream.

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: 0837e86a7a34 ('IB/mlx5: Add per port counters')
Signed-off-by: Kamal Heib <kamalh@mellanox.com>
Reviewed-by: Mark Bloch <markb@mellanox.com>
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 9 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/mlx5/main.c b/drivers/infiniband/hw/mlx5/main.c
index 4cab29ea394c..11bfa27b022c 100644
--- a/drivers/infiniband/hw/mlx5/main.c
+++ b/drivers/infiniband/hw/mlx5/main.c
@@ -3141,9 +3141,11 @@ static void *mlx5_ib_add(struct mlx5_core_dev *mdev)
         if (err)
                 goto err_rsrc;
 
-        err = mlx5_ib_alloc_q_counters(dev);
-        if (err)
-                goto err_odp;
+        if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt)) {
+                err = mlx5_ib_alloc_q_counters(dev);
+                if (err)
+                        goto err_odp;
+        }
 
         err = ib_register_device(&dev->ib_dev, NULL);
         if (err)
@@ -3171,7 +3173,8 @@ err_dev:
         ib_unregister_device(&dev->ib_dev);
 
 err_q_cnt:
-        mlx5_ib_dealloc_q_counters(dev);
+        if (MLX5_CAP_GEN(dev->mdev, max_qp_cnt))
+                mlx5_ib_dealloc_q_counters(dev);
 
 err_odp:
         mlx5_ib_odp_remove_one(dev);
@@ -3201,7 +3204,8 @@ static void mlx5_ib_remove(struct mlx5_core_dev *mdev, void *context)
 
         mlx5_remove_roce_notifier(dev);
         ib_unregister_device(&dev->ib_dev);
-        mlx5_ib_dealloc_q_counters(dev);
+        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);
         destroy_dev_resources(&dev->devr);