From: Roland Dreier 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 Signed-off-by: Andrew Morton --- 25-akpm/drivers/infiniband/hw/mthca/mthca_dev.h | 1 + 25-akpm/drivers/infiniband/hw/mthca/mthca_main.c | 18 ++++++++++++++++-- 25-akpm/drivers/infiniband/hw/mthca/mthca_qp.c | 13 ++++++++++++- 3 files changed, 29 insertions(+), 3 deletions(-) diff -puN drivers/infiniband/hw/mthca/mthca_dev.h~ib-mthca-map-context-for-rdma-responder-in-mem-free-mode drivers/infiniband/hw/mthca/mthca_dev.h --- 25/drivers/infiniband/hw/mthca/mthca_dev.h~ib-mthca-map-context-for-rdma-responder-in-mem-free-mode Fri Apr 1 14:15:03 2005 +++ 25-akpm/drivers/infiniband/hw/mthca/mthca_dev.h Fri Apr 1 14:15:03 2005 @@ -222,6 +222,7 @@ struct mthca_qp_table { struct mthca_array qp; struct mthca_icm_table *qp_table; struct mthca_icm_table *eqp_table; + struct mthca_icm_table *rdb_table; }; struct mthca_av_table { diff -puN drivers/infiniband/hw/mthca/mthca_main.c~ib-mthca-map-context-for-rdma-responder-in-mem-free-mode drivers/infiniband/hw/mthca/mthca_main.c --- 25/drivers/infiniband/hw/mthca/mthca_main.c~ib-mthca-map-context-for-rdma-responder-in-mem-free-mode Fri Apr 1 14:15:03 2005 +++ 25-akpm/drivers/infiniband/hw/mthca/mthca_main.c Fri Apr 1 14:15:03 2005 @@ -430,14 +430,25 @@ static int __devinit mthca_init_icm(stru 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(stru 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); diff -puN drivers/infiniband/hw/mthca/mthca_qp.c~ib-mthca-map-context-for-rdma-responder-in-mem-free-mode drivers/infiniband/hw/mthca/mthca_qp.c --- 25/drivers/infiniband/hw/mthca/mthca_qp.c~ib-mthca-map-context-for-rdma-responder-in-mem-free-mode Fri Apr 1 14:15:03 2005 +++ 25-akpm/drivers/infiniband/hw/mthca/mthca_qp.c Fri Apr 1 14:15:03 2005 @@ -1025,11 +1025,16 @@ static int mthca_alloc_memfree(struct mt if (ret) goto err_qpc; + ret = mthca_table_get(dev, dev->qp_table.rdb_table, + qp->qpn << dev->qp_table.rdb_shift); + if (ret) + goto err_eqpc; + qp->rq.db_index = mthca_alloc_db(dev, MTHCA_DB_TYPE_RQ, qp->qpn, &qp->rq.db); if (qp->rq.db_index < 0) { ret = -ENOMEM; - goto err_eqpc; + goto err_rdb; } qp->sq.db_index = mthca_alloc_db(dev, MTHCA_DB_TYPE_SQ, @@ -1045,6 +1050,10 @@ static int mthca_alloc_memfree(struct mt err_rq_db: mthca_free_db(dev, MTHCA_DB_TYPE_RQ, qp->rq.db_index); +err_rdb: + mthca_table_put(dev, dev->qp_table.rdb_table, + qp->qpn << dev->qp_table.rdb_shift); + err_eqpc: mthca_table_put(dev, dev->qp_table.eqp_table, qp->qpn); @@ -1060,6 +1069,8 @@ static void mthca_free_memfree(struct mt if (mthca_is_memfree(dev)) { mthca_free_db(dev, MTHCA_DB_TYPE_SQ, qp->sq.db_index); mthca_free_db(dev, MTHCA_DB_TYPE_RQ, qp->rq.db_index); + mthca_table_put(dev, dev->qp_table.rdb_table, + qp->qpn << dev->qp_table.rdb_shift); mthca_table_put(dev, dev->qp_table.eqp_table, qp->qpn); mthca_table_put(dev, dev->qp_table.qp_table, qp->qpn); } _