1 files changed, 25 insertions, 16 deletions

diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c
index 504117657d41..ce434228a5ea 100644
--- a/drivers/infiniband/hw/mlx5/qp.c
+++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -235,6 +235,8 @@ static int set_rq_size(struct mlx5_ib_dev *dev, struct ib_qp_cap *cap,
                 qp->rq.max_gs = 0;
                 qp->rq.wqe_cnt = 0;
                 qp->rq.wqe_shift = 0;
+                cap->max_recv_wr = 0;
+                cap->max_recv_sge = 0;
         } else {
                 if (ucmd) {
                         qp->rq.wqe_cnt = ucmd->rq_wqe_count;
@@ -1851,13 +1853,15 @@ static int modify_raw_packet_eth_prio(struct mlx5_core_dev *dev,
 static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
                          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)
+                         u32 path_flags, const struct ib_qp_attr *attr,
+                         bool alt)
 {
         enum rdma_link_layer ll = rdma_port_get_link_layer(&dev->ib_dev, port);
         int err;
 
         if (attr_mask & IB_QP_PKEY_INDEX)
-                path->pkey_index = attr->pkey_index;
+                path->pkey_index = cpu_to_be16(alt ? attr->alt_pkey_index :
+                                                     attr->pkey_index);
 
         if (ah->ah_flags & IB_AH_GRH) {
                 if (ah->grh.sgid_index >=
@@ -1877,9 +1881,9 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
                                                           ah->grh.sgid_index);
                 path->dci_cfi_prio_sl = (ah->sl & 0x7) << 4;
         } else {
-                path->fl = (path_flags & MLX5_PATH_FLAG_FL) ? 0x80 : 0;
-                path->free_ar = (path_flags & MLX5_PATH_FLAG_FREE_AR) ? 0x80 :
-                                                                        0;
+                path->fl_free_ar = (path_flags & MLX5_PATH_FLAG_FL) ? 0x80 : 0;
+                path->fl_free_ar |=
+                        (path_flags & MLX5_PATH_FLAG_FREE_AR) ? 0x40 : 0;
                 path->rlid = cpu_to_be16(ah->dlid);
                 path->grh_mlid = ah->src_path_bits & 0x7f;
                 if (ah->ah_flags & IB_AH_GRH)
@@ -1903,7 +1907,7 @@ static int mlx5_set_path(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
         path->port = port;
 
         if (attr_mask & IB_QP_TIMEOUT)
-                path->ackto_lt = attr->timeout << 3;
+                path->ackto_lt = (alt ? attr->alt_timeout : attr->timeout) << 3;
 
         if ((qp->ibqp.qp_type == IB_QPT_RAW_PACKET) && qp->sq.wqe_cnt)
                 return modify_raw_packet_eth_prio(dev->mdev,
@@ -2264,7 +2268,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
                 context->log_pg_sz_remote_qpn = cpu_to_be32(attr->dest_qp_num);
 
         if (attr_mask & IB_QP_PKEY_INDEX)
-                context->pri_path.pkey_index = attr->pkey_index;
+                context->pri_path.pkey_index = cpu_to_be16(attr->pkey_index);
 
         /* todo implement counter_index functionality */
 
@@ -2277,7 +2281,7 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         if (attr_mask & IB_QP_AV) {
                 err = mlx5_set_path(dev, qp, &attr->ah_attr, &context->pri_path,
                                     attr_mask & IB_QP_PORT ? attr->port_num : qp->port,
-                                    attr_mask, 0, attr);
+                                    attr_mask, 0, attr, false);
                 if (err)
                         goto out;
         }
@@ -2288,7 +2292,9 @@ static int __mlx5_ib_modify_qp(struct ib_qp *ibqp,
         if (attr_mask & IB_QP_ALT_PATH) {
                 err = mlx5_set_path(dev, qp, &attr->alt_ah_attr,
                                     &context->alt_path,
-                                    attr->alt_port_num, attr_mask, 0, attr);
+                                    attr->alt_port_num,
+                                    attr_mask | IB_QP_PKEY_INDEX | IB_QP_TIMEOUT,
+                                    0, attr, true);
                 if (err)
                         goto out;
         }
@@ -4013,11 +4019,12 @@ static int query_qp_attr(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,
         if (qp->ibqp.qp_type == IB_QPT_RC || qp->ibqp.qp_type == IB_QPT_UC) {
                 to_ib_ah_attr(dev, &qp_attr->ah_attr, &context->pri_path);
                 to_ib_ah_attr(dev, &qp_attr->alt_ah_attr, &context->alt_path);
-                qp_attr->alt_pkey_index = context->alt_path.pkey_index & 0x7f;
+                qp_attr->alt_pkey_index =
+                        be16_to_cpu(context->alt_path.pkey_index);
                 qp_attr->alt_port_num   = qp_attr->alt_ah_attr.port_num;
         }
 
-        qp_attr->pkey_index = context->pri_path.pkey_index & 0x7f;
+        qp_attr->pkey_index = be16_to_cpu(context->pri_path.pkey_index);
         qp_attr->port_num = context->pri_path.port;
 
         /* qp_attr->en_sqd_async_notify is only applicable in modify qp */
@@ -4079,17 +4086,19 @@ int mlx5_ib_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr,
         qp_attr->cap.max_recv_sge    = qp->rq.max_gs;
 
         if (!ibqp->uobject) {
-                qp_attr->cap.max_send_wr  = qp->sq.wqe_cnt;
+                qp_attr->cap.max_send_wr  = qp->sq.max_post;
                 qp_attr->cap.max_send_sge = qp->sq.max_gs;
+                qp_init_attr->qp_context = ibqp->qp_context;
         } else {
                 qp_attr->cap.max_send_wr  = 0;
                 qp_attr->cap.max_send_sge = 0;
         }
 
-        /* We don't support inline sends for kernel QPs (yet), and we
-         * don't know what userspace's value should be.
-         */
-        qp_attr->cap.max_inline_data = 0;
+        qp_init_attr->qp_type = ibqp->qp_type;
+        qp_init_attr->recv_cq = ibqp->recv_cq;
+        qp_init_attr->send_cq = ibqp->send_cq;
+        qp_init_attr->srq = ibqp->srq;
+        qp_attr->cap.max_inline_data = qp->max_inline_data;
 
         qp_init_attr->cap            = qp_attr->cap;