RDMA/cxgb4: Obtain RDMA QID ranges from LLD/FW

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index d870f9c17c1e85255618b3ca8068365ceb87d908..9bbf491d5d9ee087e2081ef024e7ebdd0d2c23aa 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -250,12 +250,17 @@ static int c4iw_rdev_open(struct c4iw_rdev *rdev)
        rdev->cqshift = PAGE_SHIFT - ilog2(rdev->lldi.ucq_density);
        rdev->cqmask = rdev->lldi.ucq_density - 1;
        PDBG("%s dev %s stag start 0x%0x size 0x%0x num stags %d "
-            "pbl start 0x%0x size 0x%0x rq start 0x%0x size 0x%0x\n",
+            "pbl start 0x%0x size 0x%0x rq start 0x%0x size 0x%0x "
+            "qp qid start %u size %u cq qid start %u size %u\n",
             __func__, pci_name(rdev->lldi.pdev), rdev->lldi.vr->stag.start,
             rdev->lldi.vr->stag.size, c4iw_num_stags(rdev),
             rdev->lldi.vr->pbl.start,
             rdev->lldi.vr->pbl.size, rdev->lldi.vr->rq.start,
-            rdev->lldi.vr->rq.size);
+            rdev->lldi.vr->rq.size,
+            rdev->lldi.vr->qp.start,
+            rdev->lldi.vr->qp.size,
+            rdev->lldi.vr->cq.start,
+            rdev->lldi.vr->cq.size);
        PDBG("udb len 0x%x udb base %p db_reg %p gts_reg %p qpshift %lu "
             "qpmask 0x%x cqshift %lu cqmask 0x%x\n",
             (unsigned)pci_resource_len(rdev->lldi.pdev, 2),

diff --git a/drivers/infiniband/hw/cxgb4/resource.c b/drivers/infiniband/hw/cxgb4/resource.c
index fb195d1d90151690b8d1491dca590f2f5d12e89e..83b23dfa250dea9171ef44a9e37fa3fc7efe3698 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/resource.c
+++ b/drivers/infiniband/hw/cxgb4/resource.c
@@ -110,11 +110,12 @@ static int c4iw_init_qid_fifo(struct c4iw_rdev *rdev)
 
        spin_lock_init(&rdev->resource.qid_fifo_lock);
 
-       if (kfifo_alloc(&rdev->resource.qid_fifo, T4_MAX_QIDS * sizeof(u32),
-                       GFP_KERNEL))
+       if (kfifo_alloc(&rdev->resource.qid_fifo, rdev->lldi.vr->qp.size *
+                       sizeof(u32), GFP_KERNEL))
                return -ENOMEM;
 
-       for (i = T4_QID_BASE; i < T4_QID_BASE + T4_MAX_QIDS; i++)
+       for (i = rdev->lldi.vr->qp.start;
+            i < rdev->lldi.vr->qp.start + rdev->lldi.vr->qp.size; i++)
                if (!(i & rdev->qpmask))
                        kfifo_in(&rdev->resource.qid_fifo,
                                    (unsigned char *) &i, sizeof(u32));

diff --git a/drivers/infiniband/hw/cxgb4/t4.h b/drivers/infiniband/hw/cxgb4/t4.h
index aef55f42bea4ed0a59977d9b3455c11833341054..24f369046ef3cc772a84ca54082b8b8d945916f8 100644 (file)
--- a/drivers/infiniband/hw/cxgb4/t4.h
+++ b/drivers/infiniband/hw/cxgb4/t4.h
@@ -36,8 +36,6 @@
 #include "t4_msg.h"
 #include "t4fw_ri_api.h"
 
-#define T4_QID_BASE 1024
-#define T4_MAX_QIDS 256
 #define T4_MAX_NUM_QP (1<<16)
 #define T4_MAX_NUM_CQ (1<<15)
 #define T4_MAX_NUM_PD (1<<15)