net/mlx5_core: Update device capabilities handling

Rearrange struct mlx5_caps so it has a "gen" field to represent the current
capabilities configured for the device. Max capabilities can also be queried
from the device. Also update capabilities struct to contain more fields as per
the latest revision if firmware specification.

Signed-off-by: Eli Cohen <eli@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mlx5/srq.c b/drivers/infiniband/hw/mlx5/srq.c
index 70bd131ba646..97cc1baaa8e3 100644
--- a/drivers/infiniband/hw/mlx5/srq.c
+++ b/drivers/infiniband/hw/mlx5/srq.c
@@ -238,6 +238,7 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
                                   struct ib_udata *udata)
 {
         struct mlx5_ib_dev *dev = to_mdev(pd->device);
+        struct mlx5_general_caps *gen;
         struct mlx5_ib_srq *srq;
         int desc_size;
         int buf_size;
@@ -247,11 +248,12 @@ struct ib_srq *mlx5_ib_create_srq(struct ib_pd *pd,
         int is_xrc;
         u32 flgs, xrcdn;
 
+        gen = &dev->mdev->caps.gen;
         /* Sanity check SRQ size before proceeding */
-        if (init_attr->attr.max_wr >= dev->mdev->caps.max_srq_wqes) {
+        if (init_attr->attr.max_wr >= gen->max_srq_wqes) {
                 mlx5_ib_dbg(dev, "max_wr %d, cap %d\n",
                             init_attr->attr.max_wr,
-                            dev->mdev->caps.max_srq_wqes);
+                            gen->max_srq_wqes);
                 return ERR_PTR(-EINVAL);
         }