1 files changed, 21 insertions, 0 deletions

diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 73b3a7132587..d5e60f44ba5a 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -33,6 +33,7 @@
 
 #include <linux/mlx4/cq.h>
 #include <linux/mlx4/qp.h>
+#include <linux/mlx4/srq.h>
 #include <linux/slab.h>
 
 #include "mlx4_ib.h"
@@ -585,6 +586,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,
         struct mlx4_qp *mqp;
         struct mlx4_ib_wq *wq;
         struct mlx4_ib_srq *srq;
+        struct mlx4_srq *msrq = NULL;
         int is_send;
         int is_error;
         u32 g_mlpath_rqpn;
@@ -653,6 +655,20 @@ repoll:
 
         wc->qp = &(*cur_qp)->ibqp;
 
+        if (wc->qp->qp_type == IB_QPT_XRC_TGT) {
+                u32 srq_num;
+                g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn);
+                srq_num       = g_mlpath_rqpn & 0xffffff;
+                /* SRQ is also in the radix tree */
+                msrq = mlx4_srq_lookup(to_mdev(cq->ibcq.device)->dev,
+                                       srq_num);
+                if (unlikely(!msrq)) {
+                        pr_warn("CQ %06x with entry for unknown SRQN %06x\n",
+                                cq->mcq.cqn, srq_num);
+                        return -EINVAL;
+                }
+        }
+
         if (is_send) {
                 wq = &(*cur_qp)->sq;
                 if (!(*cur_qp)->sq_signal_bits) {
@@ -666,6 +682,11 @@ repoll:
                 wqe_ctr = be16_to_cpu(cqe->wqe_index);
                 wc->wr_id = srq->wrid[wqe_ctr];
                 mlx4_ib_free_srq_wqe(srq, wqe_ctr);
+        } else if (msrq) {
+                srq = to_mibsrq(msrq);
+                wqe_ctr = be16_to_cpu(cqe->wqe_index);
+                wc->wr_id = srq->wrid[wqe_ctr];
+                mlx4_ib_free_srq_wqe(srq, wqe_ctr);
         } else {
                 wq        = &(*cur_qp)->rq;
                 tail      = wq->tail & (wq->wqe_cnt - 1);