tree 830f591f6931ceb411f0ae97196f113db2cd766b parent ddf841f052fa218547c86169d1074968eca8c503 author Roland Dreier <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:34 -0700 committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:26:34 -0700
[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 <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> infiniband/hw/mthca/mthca_dev.h | 1 + infiniband/hw/mthca/mthca_main.c | 18 ++++++++++++++++-- infiniband/hw/mthca/mthca_qp.c | 13 ++++++++++++- 3 files changed, 29 insertions(+), 3 deletions(-) Index: drivers/infiniband/hw/mthca/mthca_dev.h =================================================================== --- a7e6e193f0a9fce9652b1c8b33913b199b3a4c49/drivers/infiniband/hw/mthca/mthca_dev.h (mode:100644 sha1:616a0de54b4037db4522f4252815faa892a1f552) +++ 830f591f6931ceb411f0ae97196f113db2cd766b/drivers/infiniband/hw/mthca/mthca_dev.h (mode:100644 sha1:d014b443dc3c2c45760f31123b363b6e8f997ab9) @@ -222,6 +222,7 @@ 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 { Index: drivers/infiniband/hw/mthca/mthca_main.c =================================================================== --- a7e6e193f0a9fce9652b1c8b33913b199b3a4c49/drivers/infiniband/hw/mthca/mthca_main.c (mode:100644 sha1:c9c94686e7a92ae554732cee35eb6550b303b9af) +++ 830f591f6931ceb411f0ae97196f113db2cd766b/drivers/infiniband/hw/mthca/mthca_main.c (mode:100644 sha1:014369626f65552f601a2e81e277affd763fa73d) @@ -430,14 +430,25 @@ 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 @@ 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); Index: drivers/infiniband/hw/mthca/mthca_qp.c =================================================================== --- a7e6e193f0a9fce9652b1c8b33913b199b3a4c49/drivers/infiniband/hw/mthca/mthca_qp.c (mode:100644 sha1:53af7aab19910609c1107d5547d33fb645cc43e8) +++ 830f591f6931ceb411f0ae97196f113db2cd766b/drivers/infiniband/hw/mthca/mthca_qp.c (mode:100644 sha1:ca73bab11a0288f8538d3991011c84ddf903034d) @@ -1029,11 +1029,16 @@ 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, @@ -1049,6 +1054,10 @@ 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); @@ -1064,6 +1073,8 @@ 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); } - To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html