1 files changed, 41 insertions, 48 deletions

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index d35f62d4f4c5..203c8a45e095 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -220,13 +220,11 @@ static void mlx5_ib_qp_event(struct mlx5_core_qp *qp, int type)
 static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
                        int has_rq, struct mlx5_ib_qp *qp, struct mlx5_ib_create_qp *ucmd)
 {
-        struct mlx5_general_caps *gen;
         int wqe_size;
         int wq_size;
 
-        gen = &dev->mdev->caps.gen;
         /* Sanity check RQ size before proceeding */
-        if (cap->max_recv_wr  > gen->max_wqes)
+        if (cap->max_recv_wr > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz)))
                 return -EINVAL;
 
         if (!has_rq) {
@@ -246,10 +244,11 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
                         wq_size = roundup_pow_of_two(cap->max_recv_wr) * wqe_size;
                         wq_size = max_t(int, wq_size, MLX5_SEND_WQE_BB);
                         qp->rq.wqe_cnt = wq_size / wqe_size;
-                        if (wqe_size > gen->max_rq_desc_sz) {
+                        if (wqe_size > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_rq)) {
                                 mlx5_ib_dbg(dev, "wqe_size %d, max %d\n",
                                             wqe_size,
-                                            gen->max_rq_desc_sz);
+                                            MLX5_CAP_GEN(dev->mdev,
+                                                         max_wqe_sz_rq));
                                 return -EINVAL;
                         }
                         qp->rq.wqe_shift = ilog2(wqe_size);
@@ -330,11 +329,9 @@ static int calc_send_wqe(struct ib_qp_init_attr *attr)
 static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
                         struct mlx5_ib_qp *qp)
 {
-        struct mlx5_general_caps *gen;
         int wqe_size;
         int wq_size;
 
-        gen = &dev->mdev->caps.gen;
         if (!attr->cap.max_send_wr)
                 return 0;
 
@@ -343,9 +340,9 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
         if (wqe_size < 0)
                 return wqe_size;
 
-        if (wqe_size > gen->max_sq_desc_sz) {
+        if (wqe_size > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq)) {
                 mlx5_ib_dbg(dev, "wqe_size(%d) > max_sq_desc_sz(%d)\n",
-                            wqe_size, gen->max_sq_desc_sz);
+                            wqe_size, MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq));
                 return -EINVAL;
         }
 
@@ -358,9 +355,10 @@ static int calc_sq_size(struct mlx5_ib_dev *dev, struct ib_qp_init_attr *attr,
 
         wq_size = roundup_pow_of_two(attr->cap.max_send_wr * wqe_size);
         qp->sq.wqe_cnt = wq_size / MLX5_SEND_WQE_BB;
-        if (qp->sq.wqe_cnt > gen->max_wqes) {
+        if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) {
                 mlx5_ib_dbg(dev, "wqe count(%d) exceeds limits(%d)\n",
-                            qp->sq.wqe_cnt, gen->max_wqes);
+                            qp->sq.wqe_cnt,
+                            1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz));
                 return -ENOMEM;
         }
         qp->sq.wqe_shift = ilog2(MLX5_SEND_WQE_BB);
@@ -375,13 +373,11 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,
                             struct mlx5_ib_qp *qp,
                             struct mlx5_ib_create_qp *ucmd)
 {
-        struct mlx5_general_caps *gen;
         int desc_sz = 1 << qp->sq.wqe_shift;
 
-        gen = &dev->mdev->caps.gen;
-        if (desc_sz > gen->max_sq_desc_sz) {
+        if (desc_sz > MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq)) {
                 mlx5_ib_warn(dev, "desc_sz %d, max_sq_desc_sz %d\n",
-                             desc_sz, gen->max_sq_desc_sz);
+                             desc_sz, MLX5_CAP_GEN(dev->mdev, max_wqe_sz_sq));
                 return -EINVAL;
         }
 
@@ -393,9 +389,10 @@ static int set_user_buf_size(struct mlx5_ib_dev *dev,
 
         qp->sq.wqe_cnt = ucmd->sq_wqe_count;
 
-        if (qp->sq.wqe_cnt > gen->max_wqes) {
+        if (qp->sq.wqe_cnt > (1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz))) {
                 mlx5_ib_warn(dev, "wqe_cnt %d, max_wqes %d\n",
-                             qp->sq.wqe_cnt, gen->max_wqes);
+                             qp->sq.wqe_cnt,
+                             1 << MLX5_CAP_GEN(dev->mdev, log_max_qp_sz));
                 return -EINVAL;
         }
 
@@ -768,7 +765,7 @@ static int create_kernel_qp(struct mlx5_ib_dev *dev,
         qp->sq.offset = qp->rq.wqe_cnt << qp->rq.wqe_shift;
         qp->buf_size = err + (qp->rq.wqe_cnt << qp->rq.wqe_shift);
 
-        err = mlx5_buf_alloc(dev->mdev, qp->buf_size, PAGE_SIZE * 2, &qp->buf);
+        err = mlx5_buf_alloc(dev->mdev, qp->buf_size, &qp->buf);
         if (err) {
                 mlx5_ib_dbg(dev, "err %d\n", err);
                 goto err_uuar;
@@ -866,22 +863,21 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd,
                             struct ib_udata *udata, struct mlx5_ib_qp *qp)
 {
         struct mlx5_ib_resources *devr = &dev->devr;
+        struct mlx5_core_dev *mdev = dev->mdev;
         struct mlx5_ib_create_qp_resp resp;
         struct mlx5_create_qp_mbox_in *in;
-        struct mlx5_general_caps *gen;
         struct mlx5_ib_create_qp ucmd;
         int inlen = sizeof(*in);
         int err;
 
         mlx5_ib_odp_create_qp(qp);
 
-        gen = &dev->mdev->caps.gen;
         mutex_init(&qp->mutex);
         spin_lock_init(&qp->sq.lock);
         spin_lock_init(&qp->rq.lock);
 
         if (init_attr->create_flags & IB_QP_CREATE_BLOCK_MULTICAST_LOOPBACK) {
-                if (!(gen->flags & MLX5_DEV_CAP_FLAG_BLOCK_MCAST)) {
+                if (!MLX5_CAP_GEN(mdev, block_lb_mc)) {
                         mlx5_ib_dbg(dev, "block multicast loopback isn't supported\n");
                         return -EINVAL;
                 } else {
@@ -914,15 +910,17 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd,
 
         if (pd) {
                 if (pd->uobject) {
+                        __u32 max_wqes =
+                                1 << MLX5_CAP_GEN(mdev, log_max_qp_sz);
                         mlx5_ib_dbg(dev, "requested sq_wqe_count (%d)\n", ucmd.sq_wqe_count);
                         if (ucmd.rq_wqe_shift != qp->rq.wqe_shift ||
                             ucmd.rq_wqe_count != qp->rq.wqe_cnt) {
                                 mlx5_ib_dbg(dev, "invalid rq params\n");
                                 return -EINVAL;
                         }
-                        if (ucmd.sq_wqe_count > gen->max_wqes) {
+                        if (ucmd.sq_wqe_count > max_wqes) {
                                 mlx5_ib_dbg(dev, "requested sq_wqe_count (%d) > max allowed (%d)\n",
-                                            ucmd.sq_wqe_count, gen->max_wqes);
+                                            ucmd.sq_wqe_count, max_wqes);
                                 return -EINVAL;
                         }
                         err = create_user_qp(dev, pd, qp, udata, &in, &resp, &inlen);
@@ -1014,7 +1012,8 @@ static int create_qp_common(struct mlx5_ib_dev *dev, struct ib_pd *pd,
                         in->ctx.rq_type_srqn |= cpu_to_be32(to_msrq(init_attr->srq)->msrq.srqn);
                 } else {
                         in->ctx.xrcd = cpu_to_be32(to_mxrcd(devr->x1)->xrcdn);
-                        in->ctx.rq_type_srqn |= cpu_to_be32(to_msrq(devr->s0)->msrq.srqn);
+                        in->ctx.rq_type_srqn |=
+                                cpu_to_be32(to_msrq(devr->s1)->msrq.srqn);
                 }
         }
 
@@ -1226,7 +1225,6 @@ struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd,
                                 struct ib_qp_init_attr *init_attr,
                                 struct ib_udata *udata)
 {
-        struct mlx5_general_caps *gen;
         struct mlx5_ib_dev *dev;
         struct mlx5_ib_qp *qp;
         u16 xrcdn = 0;
@@ -1244,12 +1242,11 @@ struct ib_qp *mlx5_ib_create_qp(struct ib_pd *pd,
                 }
                 dev = to_mdev(to_mxrcd(init_attr->xrcd)->ibxrcd.device);
         }
-        gen = &dev->mdev->caps.gen;
 
         switch (init_attr->qp_type) {
         case IB_QPT_XRC_TGT:
         case IB_QPT_XRC_INI:
-                if (!(gen->flags & MLX5_DEV_CAP_FLAG_XRC)) {
+                if (!MLX5_CAP_GEN(dev->mdev, xrc)) {
                         mlx5_ib_dbg(dev, "XRC not supported\n");
                         return ERR_PTR(-ENOSYS);
                 }
@@ -1356,9 +1353,6 @@ enum {
 
 static int ib_rate_to_mlx5(struct mlx5_ib_dev *dev, u8 rate)
 {
-        struct mlx5_general_caps *gen;
-
-        gen = &dev->mdev->caps.gen;
         if (rate == IB_RATE_PORT_CURRENT) {
                 return 0;
         } else if (rate < IB_RATE_2_5_GBPS || rate > IB_RATE_300_GBPS) {
@@ -1366,7 +1360,7 @@ static int ib_rate_to_mlx5(struct mlx5_ib_dev *dev, u8 rate)
         } else {
                 while (rate != IB_RATE_2_5_GBPS &&
                        !(1 << (rate + MLX5_STAT_RATE_OFFSET) &
-                         gen->stat_rate_support))
+                         MLX5_CAP_GEN(dev->mdev, stat_rate_support)))
                         --rate;
         }
 
@@ -1377,10 +1371,8 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, const struct ib_ah_attr *ah,
                          struct mlx5_qp_path *path, u8 port, int attr_mask,
                          u32 path_flags, const struct ib_qp_attr *attr)
 {
-        struct mlx5_general_caps *gen;
         int err;
 
-        gen = &dev->mdev->caps.gen;
         path->fl = (path_flags & MLX5_PATH_FLAG_FL) ? 0x80 : 0;
         path->free_ar = (path_flags & MLX5_PATH_FLAG_FREE_AR) ? 0x80 : 0;
 
@@ -1391,9 +1383,11 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, const struct ib_ah_attr *ah,
         path->rlid      = cpu_to_be16(ah->dlid);
 
         if (ah->ah_flags & IB_AH_GRH) {
-                if (ah->grh.sgid_index >= gen->port[port - 1].gid_table_len) {
+                if (ah->grh.sgid_index >=
+                    dev->mdev->port_caps[port - 1].gid_table_len) {
                         pr_err("sgid_index (%u) too large. max is %d\n",
-                               ah->grh.sgid_index, gen->port[port - 1].gid_table_len);
+                               ah->grh.sgid_index,
+                               dev->mdev->port_caps[port - 1].gid_table_len);
                         return -EINVAL;
                 }
                 path->grh_mlid |= 1 << 7;
@@ -1570,7 +1564,6 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         struct mlx5_ib_qp *qp = to_mqp(ibqp);
         struct mlx5_ib_cq *send_cq, *recv_cq;
         struct mlx5_qp_context *context;
-        struct mlx5_general_caps *gen;
         struct mlx5_modify_qp_mbox_in *in;
         struct mlx5_ib_pd *pd;
         enum mlx5_qp_state mlx5_cur, mlx5_new;
@@ -1579,7 +1572,6 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         int mlx5_st;
         int err;
 
-        gen = &dev->mdev->caps.gen;
         in = kzalloc(sizeof(*in), GFP_KERNEL);
         if (!in)
                 return -ENOMEM;
@@ -1619,7 +1611,8 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
                         err = -EINVAL;
                         goto out;
                 }
-                context->mtu_msgmax = (attr->path_mtu << 5) | gen->log_max_msg;
+                context->mtu_msgmax = (attr->path_mtu << 5) |
+                                      (u8)MLX5_CAP_GEN(dev->mdev, log_max_msg);
         }
 
         if (attr_mask & IB_QP_DEST_QPN)
@@ -1777,11 +1770,9 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         struct mlx5_ib_dev *dev = to_mdev(ibqp->device);
         struct mlx5_ib_qp *qp = to_mqp(ibqp);
         enum ib_qp_state cur_state, new_state;
-        struct mlx5_general_caps *gen;
         int err = -EINVAL;
         int port;
 
-        gen = &dev->mdev->caps.gen;
         mutex_lock(&qp->mutex);
 
         cur_state = attr_mask & IB_QP_CUR_STATE ? attr->cur_qp_state : qp->state;
@@ -1793,21 +1784,25 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                 goto out;
 
         if ((attr_mask & IB_QP_PORT) &&
-            (attr->port_num == 0 || attr->port_num > gen->num_ports))
+            (attr->port_num == 0 ||
+             attr->port_num > MLX5_CAP_GEN(dev->mdev, num_ports)))
                 goto out;
 
         if (attr_mask & IB_QP_PKEY_INDEX) {
                 port = attr_mask & IB_QP_PORT ? attr->port_num : qp->port;
-                if (attr->pkey_index >= gen->port[port - 1].pkey_table_len)
+                if (attr->pkey_index >=
+                    dev->mdev->port_caps[port - 1].pkey_table_len)
                         goto out;
         }
 
         if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC &&
-            attr->max_rd_atomic > (1 << gen->log_max_ra_res_qp))
+            attr->max_rd_atomic >
+            (1 << MLX5_CAP_GEN(dev->mdev, log_max_ra_res_qp)))
                 goto out;
 
         if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC &&
-            attr->max_dest_rd_atomic > (1 << gen->log_max_ra_req_qp))
+            attr->max_dest_rd_atomic >
+            (1 << MLX5_CAP_GEN(dev->mdev, log_max_ra_req_qp)))
                 goto out;
 
         if (cur_state == new_state && cur_state == IB_QPS_RESET) {
@@ -3009,7 +3004,7 @@ static void to_ib_ah_attr(struct mlx5_ib_dev *ibdev, struct ib_ah_attr *ib_ah_at
         ib_ah_attr->port_num      = path->port;
 
         if (ib_ah_attr->port_num == 0 ||
-            ib_ah_attr->port_num > dev->caps.gen.num_ports)
+            ib_ah_attr->port_num > MLX5_CAP_GEN(dev, num_ports))
                 return;
 
         ib_ah_attr->sl = path->sl & 0xf;
@@ -3135,12 +3130,10 @@ struct ib_xrcd *mlx5_ib_alloc_xrcd(struct ib_device *ibdev,
                                           struct ib_udata *udata)
 {
         struct mlx5_ib_dev *dev = to_mdev(ibdev);
-        struct mlx5_general_caps *gen;
         struct mlx5_ib_xrcd *xrcd;
         int err;
 
-        gen = &dev->mdev->caps.gen;
-        if (!(gen->flags & MLX5_DEV_CAP_FLAG_XRC))
+        if (!MLX5_CAP_GEN(dev->mdev, xrc))
                 return ERR_PTR(-ENOSYS);
 
         xrcd = kmalloc(sizeof(*xrcd), GFP_KERNEL);