[PATCH] IB/mthca: map context for RDMA responder in mem-free mode

Fix RDMA in mem-free mode: we need to make sure that the RDMA context memory
is mapped for the HCA.

Signed-off-by: Roland Dreier <roland@topspin.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 16 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_main.c b/drivers/infiniband/hw/mthca/mthca_main.c
index c9c94686e7a9..014369626f65 100644
--- a/drivers/infiniband/hw/mthca/mthca_main.c
+++ b/drivers/infiniband/hw/mthca/mthca_main.c
@@ -430,14 +430,25 @@ static int __devinit mthca_init_icm(struct mthca_dev *mdev,
                 goto err_unmap_qp;
         }
 
-        mdev->cq_table.table = mthca_alloc_icm_table(mdev, init_hca->cqc_base,
+        mdev->qp_table.rdb_table = mthca_alloc_icm_table(mdev, init_hca->rdb_base,
+                                                         MTHCA_RDB_ENTRY_SIZE,
+                                                         mdev->limits.num_qps <<
+                                                         mdev->qp_table.rdb_shift,
+                                                         0, 0);
+        if (!mdev->qp_table.rdb_table) {
+                mthca_err(mdev, "Failed to map RDB context memory, aborting\n");
+                err = -ENOMEM;
+                goto err_unmap_eqp;
+        }
+
+       mdev->cq_table.table = mthca_alloc_icm_table(mdev, init_hca->cqc_base,
                                                      dev_lim->cqc_entry_sz,
                                                      mdev->limits.num_cqs,
                                                      mdev->limits.reserved_cqs, 0);
         if (!mdev->cq_table.table) {
                 mthca_err(mdev, "Failed to map CQ context memory, aborting.\n");
                 err = -ENOMEM;
-                goto err_unmap_eqp;
+                goto err_unmap_rdb;
         }
 
         /*
@@ -463,6 +474,9 @@ static int __devinit mthca_init_icm(struct mthca_dev *mdev,
 err_unmap_cq:
         mthca_free_icm_table(mdev, mdev->cq_table.table);
 
+err_unmap_rdb:
+        mthca_free_icm_table(mdev, mdev->qp_table.rdb_table);
+
 err_unmap_eqp:
         mthca_free_icm_table(mdev, mdev->qp_table.eqp_table);