IB/mlx4: Add support for XRC SRQs

Allow the user to create XRC SRQs.  This patch is based on a patch
from Jack Morgenstrein <jackm@dev.mellanox.co.il>.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <roland@purestorage.com>

2 files changed, 11 insertions, 5 deletions

diff --git a/drivers/infiniband/hw/mlx4/main.c b/drivers/infiniband/hw/mlx4/main.c
index 23e45df9ae36..42a538e5df36 100644
--- a/drivers/infiniband/hw/mlx4/main.c
+++ b/drivers/infiniband/hw/mlx4/main.c
@@ -1095,7 +1095,8 @@ static void *mlx4_ib_add(struct mlx4_dev *dev)
                 (1ull << IB_USER_VERBS_CMD_CREATE_SRQ)          |
                 (1ull << IB_USER_VERBS_CMD_MODIFY_SRQ)          |
                 (1ull << IB_USER_VERBS_CMD_QUERY_SRQ)           |
-                (1ull << IB_USER_VERBS_CMD_DESTROY_SRQ);
+                (1ull << IB_USER_VERBS_CMD_DESTROY_SRQ)         |
+                (1ull << IB_USER_VERBS_CMD_CREATE_XSRQ);
 
         ibdev->ib_dev.query_device      = mlx4_ib_query_device;
         ibdev->ib_dev.query_port        = mlx4_ib_query_port;
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index 4f7f7600d27c..39542f3703b8 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -76,14 +76,13 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
         struct mlx4_ib_srq *srq;
         struct mlx4_wqe_srq_next_seg *next;
         struct mlx4_wqe_data_seg *scatter;
+        u32 cqn;
+        u16 xrcdn;
         int desc_size;
         int buf_size;
         int err;
         int i;
 
-        if (init_attr->srq_type != IB_SRQT_BASIC)
-                return ERR_PTR(-ENOSYS);
-
         /* Sanity check SRQ size before proceeding */
         if (init_attr->attr.max_wr  >= dev->dev->caps.max_srq_wqes ||
             init_attr->attr.max_sge >  dev->dev->caps.max_srq_sge)
@@ -177,12 +176,18 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                 }
         }
 
-        err = mlx4_srq_alloc(dev->dev, to_mpd(pd)->pdn, &srq->mtt,
+        cqn = (init_attr->srq_type == IB_SRQT_XRC) ?
+                to_mcq(init_attr->ext.xrc.cq)->mcq.cqn : 0;
+        xrcdn = (init_attr->srq_type == IB_SRQT_XRC) ?
+                to_mxrcd(init_attr->ext.xrc.xrcd)->xrcdn :
+                (u16) dev->dev->caps.reserved_xrcds;
+        err = mlx4_srq_alloc(dev->dev, to_mpd(pd)->pdn, cqn, xrcdn, &srq->mtt,
                              srq->db.dma, &srq->msrq);
         if (err)
                 goto err_wrid;
 
         srq->msrq.event = mlx4_ib_srq_event;
+        srq->ibsrq.ext.xrc.srq_num = srq->msrq.srqn;
 
         if (pd->uobject)
                 if (ib_copy_to_udata(udata, &srq->msrq.srqn, sizeof (__u32))) {