lkml.org 
[lkml]   [2005]   [Apr]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH][25/27] IB/mthca: map context for RDMA responder in mem-free mode
    Date
    From
    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>


    --- linux-export.orig/drivers/infiniband/hw/mthca/mthca_dev.h 2005-04-01 12:38:30.772280864 -0800
    +++ linux-export/drivers/infiniband/hw/mthca/mthca_dev.h 2005-04-01 12:38:31.661087929 -0800
    @@ -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 {
    --- linux-export.orig/drivers/infiniband/hw/mthca/mthca_main.c 2005-04-01 12:38:30.776279996 -0800
    +++ linux-export/drivers/infiniband/hw/mthca/mthca_main.c 2005-04-01 12:38:31.666086844 -0800
    @@ -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);

    --- linux-export.orig/drivers/infiniband/hw/mthca/mthca_qp.c 2005-04-01 12:38:30.827268928 -0800
    +++ linux-export/drivers/infiniband/hw/mthca/mthca_qp.c 2005-04-01 12:38:31.673085325 -0800
    @@ -1025,11 +1025,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,
    @@ -1045,6 +1050,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);

    @@ -1060,6 +1069,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 linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2005-04-06 13:31    [W:2.579 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site