Patched in Tegra support.

author: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
committer: Jonathan Herman <hermanjl@cs.unc.edu> 2013-01-17 16:15:55 -0500
commit: 8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree: a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/infiniband/hw/qib/qib_qp.c
parent: 406089d01562f1e2bf9f089fd7637009ebaad589 (diff)
1 files changed, 53 insertions, 92 deletions
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index 4850d03870c..e16751f8639 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2012 Intel Corporation.  All rights reserved.
+ * Copyright (c) 2006, 2007, 2008, 2009, 2010 QLogic Corporation.
- * Copyright (c) 2006 - 2012 QLogic Corporation.  * All rights reserved.
+ * All rights reserved.
 * Copyright (c) 2005, 2006 PathScale, Inc. All rights reserved.
 *
 * This software is available to you under a choice of one of two
@@ -34,7 +34,6 @@
 #include <linux/err.h>
 #include <linux/vmalloc.h>
-#include <linux/jhash.h>
 #include "qib.h"
@@ -205,13 +204,6 @@ static void free_qpn(struct qib_qpn_table *qpt, u32 qpn)
                clear_bit(qpn & BITS_PER_PAGE_MASK, map->page);
 }
-static inline unsigned qpn_hash(struct qib_ibdev *dev, u32 qpn)
-{
-        return jhash_1word(qpn, dev->qp_rnd) &
-                (dev->qp_table_size - 1);
-}
 /*
 * Put the QP into the hash table.
 * The hash table holds a reference to the QP.
@@ -219,23 +211,22 @@ static inline unsigned qpn_hash(struct qib_ibdev *dev, u32 qpn)
 static void insert_qp(struct qib_ibdev *dev, struct qib_qp *qp)
 {
        struct qib_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num);
+        unsigned n = qp->ibqp.qp_num % dev->qp_table_size;
        unsigned long flags;
-        unsigned n = qpn_hash(dev, qp->ibqp.qp_num);
        spin_lock_irqsave(&dev->qpt_lock, flags);
-        atomic_inc(&qp->refcount);
        if (qp->ibqp.qp_num == 0)
-                rcu_assign_pointer(ibp->qp0, qp);
+                ibp->qp0 = qp;
        else if (qp->ibqp.qp_num == 1)
-                rcu_assign_pointer(ibp->qp1, qp);
+                ibp->qp1 = qp;
        else {
                qp->next = dev->qp_table[n];
-                rcu_assign_pointer(dev->qp_table[n], qp);
+                dev->qp_table[n] = qp;
        }
+        atomic_inc(&qp->refcount);
        spin_unlock_irqrestore(&dev->qpt_lock, flags);
-        synchronize_rcu();
 }
 /*
@@ -245,42 +236,29 @@ static void insert_qp(struct qib_ibdev *dev, struct qib_qp *qp)
 static void remove_qp(struct qib_ibdev *dev, struct qib_qp *qp)
 {
        struct qib_ibport *ibp = to_iport(qp->ibqp.device, qp->port_num);
-        unsigned n = qpn_hash(dev, qp->ibqp.qp_num);
+        struct qib_qp *q, **qpp;
        unsigned long flags;
+        qpp = &dev->qp_table[qp->ibqp.qp_num % dev->qp_table_size];
        spin_lock_irqsave(&dev->qpt_lock, flags);
-        if (rcu_dereference_protected(ibp->qp0,
+        if (ibp->qp0 == qp) {
-                        lockdep_is_held(&dev->qpt_lock)) == qp) {
+                ibp->qp0 = NULL;
                atomic_dec(&qp->refcount);
-                rcu_assign_pointer(ibp->qp0, NULL);
+        } else if (ibp->qp1 == qp) {
-        } else if (rcu_dereference_protected(ibp->qp1,
+                ibp->qp1 = NULL;
-                        lockdep_is_held(&dev->qpt_lock)) == qp) {
                atomic_dec(&qp->refcount);
-                rcu_assign_pointer(ibp->qp1, NULL);
+        } else
-        } else {
+                for (; (q = *qpp) != NULL; qpp = &q->next)
-                struct qib_qp *q;
-                struct qib_qp __rcu **qpp;
-                qpp = &dev->qp_table[n];
-                q = rcu_dereference_protected(*qpp,
-                        lockdep_is_held(&dev->qpt_lock));
-                for (; q; qpp = &q->next) {
                        if (q == qp) {
-                                atomic_dec(&qp->refcount);
                                *qpp = qp->next;
-                                rcu_assign_pointer(qp->next, NULL);
+                                qp->next = NULL;
-                                q = rcu_dereference_protected(*qpp,
+                                atomic_dec(&qp->refcount);
-                                        lockdep_is_held(&dev->qpt_lock));
                                break;
                        }
-                        q = rcu_dereference_protected(*qpp,
-                                lockdep_is_held(&dev->qpt_lock));
-                }
-        }
        spin_unlock_irqrestore(&dev->qpt_lock, flags);
-        synchronize_rcu();
 }
 /**
@@ -302,26 +280,21 @@ unsigned qib_free_all_qps(struct qib_devdata *dd)
                if (!qib_mcast_tree_empty(ibp))
                        qp_inuse++;
-                rcu_read_lock();
+                if (ibp->qp0)
-                if (rcu_dereference(ibp->qp0))
                        qp_inuse++;
-                if (rcu_dereference(ibp->qp1))
+                if (ibp->qp1)
                        qp_inuse++;
-                rcu_read_unlock();
        }
        spin_lock_irqsave(&dev->qpt_lock, flags);
        for (n = 0; n < dev->qp_table_size; n++) {
-                qp = rcu_dereference_protected(dev->qp_table[n],
+                qp = dev->qp_table[n];
-                        lockdep_is_held(&dev->qpt_lock));
+                dev->qp_table[n] = NULL;
-                rcu_assign_pointer(dev->qp_table[n], NULL);
-                for (; qp; qp = rcu_dereference_protected(qp->next,
+                for (; qp; qp = qp->next)
-                                        lockdep_is_held(&dev->qpt_lock)))
                        qp_inuse++;
        }
        spin_unlock_irqrestore(&dev->qpt_lock, flags);
-        synchronize_rcu();
        return qp_inuse;
 }
@@ -336,29 +309,25 @@ unsigned qib_free_all_qps(struct qib_devdata *dd)
 */
 struct qib_qp *qib_lookup_qpn(struct qib_ibport *ibp, u32 qpn)
 {
-        struct qib_qp *qp = NULL;
+        struct qib_ibdev *dev = &ppd_from_ibp(ibp)->dd->verbs_dev;
+        unsigned long flags;
+        struct qib_qp *qp;
-        if (unlikely(qpn <= 1)) {
+        spin_lock_irqsave(&dev->qpt_lock, flags);
-                rcu_read_lock();
-                if (qpn == 0)
-                        qp = rcu_dereference(ibp->qp0);
-                else
-                        qp = rcu_dereference(ibp->qp1);
-        } else {
-                struct qib_ibdev *dev = &ppd_from_ibp(ibp)->dd->verbs_dev;
-                unsigned n = qpn_hash(dev, qpn);
-                rcu_read_lock();
+        if (qpn == 0)
-                for (qp = rcu_dereference(dev->qp_table[n]); qp;
+                qp = ibp->qp0;
-                        qp = rcu_dereference(qp->next))
+        else if (qpn == 1)
+                qp = ibp->qp1;
+        else
+                for (qp = dev->qp_table[qpn % dev->qp_table_size]; qp;
+                     qp = qp->next)
                        if (qp->ibqp.qp_num == qpn)
                                break;
-        }
        if (qp)
-                if (unlikely(!atomic_inc_not_zero(&qp->refcount)))
+                atomic_inc(&qp->refcount);
-                        qp = NULL;
-        rcu_read_unlock();
+        spin_unlock_irqrestore(&dev->qpt_lock, flags);
        return qp;
 }
@@ -419,9 +388,18 @@ static void clear_mr_refs(struct qib_qp *qp, int clr_sends)
        unsigned n;
        if (test_and_clear_bit(QIB_R_REWIND_SGE, &qp->r_aflags))
-                qib_put_ss(&qp->s_rdma_read_sge);
+                while (qp->s_rdma_read_sge.num_sge) {
+                        atomic_dec(&qp->s_rdma_read_sge.sge.mr->refcount);
+                        if (--qp->s_rdma_read_sge.num_sge)
+                                qp->s_rdma_read_sge.sge =
+                                        *qp->s_rdma_read_sge.sg_list++;
+                }
-        qib_put_ss(&qp->r_sge);
+        while (qp->r_sge.num_sge) {
+                atomic_dec(&qp->r_sge.sge.mr->refcount);
+                if (--qp->r_sge.num_sge)
+                        qp->r_sge.sge = *qp->r_sge.sg_list++;
+        }
        if (clr_sends) {
                while (qp->s_last != qp->s_head) {
@@ -431,7 +409,7 @@ static void clear_mr_refs(struct qib_qp *qp, int clr_sends)
                        for (i = 0; i < wqe->wr.num_sge; i++) {
                                struct qib_sge *sge = &wqe->sg_list[i];
-                                qib_put_mr(sge->mr);
+                                atomic_dec(&sge->mr->refcount);
                        }
                        if (qp->ibqp.qp_type == IB_QPT_UD ||
                            qp->ibqp.qp_type == IB_QPT_SMI ||
@@ -441,7 +419,7 @@ static void clear_mr_refs(struct qib_qp *qp, int clr_sends)
                                qp->s_last = 0;
                }
                if (qp->s_rdma_mr) {
-                        qib_put_mr(qp->s_rdma_mr);
+                        atomic_dec(&qp->s_rdma_mr->refcount);
                        qp->s_rdma_mr = NULL;
                }
        }
@@ -454,7 +432,7 @@ static void clear_mr_refs(struct qib_qp *qp, int clr_sends)
                if (e->opcode == IB_OPCODE_RC_RDMA_READ_REQUEST &&
                    e->rdma_sge.mr) {
-                        qib_put_mr(e->rdma_sge.mr);
+                        atomic_dec(&e->rdma_sge.mr->refcount);
                        e->rdma_sge.mr = NULL;
                }
        }
@@ -499,7 +477,7 @@ int qib_error_qp(struct qib_qp *qp, enum ib_wc_status err)
        if (!(qp->s_flags & QIB_S_BUSY)) {
                qp->s_hdrwords = 0;
                if (qp->s_rdma_mr) {
-                        qib_put_mr(qp->s_rdma_mr);
+                        atomic_dec(&qp->s_rdma_mr->refcount);
                        qp->s_rdma_mr = NULL;
                }
                if (qp->s_tx) {
@@ -787,10 +765,8 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                }
        }
-        if (attr_mask & IB_QP_PATH_MTU) {
+        if (attr_mask & IB_QP_PATH_MTU)
                qp->path_mtu = pmtu;
-                qp->pmtu = ib_mtu_enum_to_int(pmtu);
-        }
        if (attr_mask & IB_QP_RETRY_CNT) {
                qp->s_retry_cnt = attr->retry_cnt;
@@ -805,12 +781,8 @@ int qib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
        if (attr_mask & IB_QP_MIN_RNR_TIMER)
                qp->r_min_rnr_timer = attr->min_rnr_timer;
-        if (attr_mask & IB_QP_TIMEOUT) {
+        if (attr_mask & IB_QP_TIMEOUT)
                qp->timeout = attr->timeout;
-                qp->timeout_jiffies =
-                        usecs_to_jiffies((4096UL * (1UL << qp->timeout)) /
-                                1000UL);
-        }
        if (attr_mask & IB_QP_QKEY)
                qp->qkey = attr->qkey;
@@ -1041,15 +1013,6 @@ struct ib_qp *qib_create_qp(struct ib_pd *ibpd,
                        ret = ERR_PTR(-ENOMEM);
                        goto bail_swq;
                }
-                RCU_INIT_POINTER(qp->next, NULL);
-                qp->s_hdr = kzalloc(sizeof(*qp->s_hdr), GFP_KERNEL);
-                if (!qp->s_hdr) {
-                        ret = ERR_PTR(-ENOMEM);
-                        goto bail_qp;
-                }
-                qp->timeout_jiffies =
-                        usecs_to_jiffies((4096UL * (1UL << qp->timeout)) /
-                                1000UL);
                if (init_attr->srq)
                        sz = 0;
                else {
@@ -1168,7 +1131,6 @@ bail_ip:
                vfree(qp->r_rq.wq);
        free_qpn(&dev->qpn_table, qp->ibqp.qp_num);
 bail_qp:
-        kfree(qp->s_hdr);
        kfree(qp);
 bail_swq:
        vfree(swq);
@@ -1224,7 +1186,6 @@ int qib_destroy_qp(struct ib_qp *ibqp)
        else
                vfree(qp->r_rq.wq);
        vfree(qp->s_wq);
-        kfree(qp->s_hdr);
        kfree(qp);
        return 0;
 }
author	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
committer	Jonathan Herman <hermanjl@cs.unc.edu>	2013-01-17 16:15:55 -0500
commit	8dea78da5cee153b8af9c07a2745f6c55057fe12 (patch)
tree	a8f4d49d63b1ecc92f2fddceba0655b2472c5bd9 /drivers/infiniband/hw/qib/qib_qp.c
parent	406089d01562f1e2bf9f089fd7637009ebaad589 (diff)