5 files changed, 66 insertions, 14 deletions

diff --git a/drivers/infiniband/hw/cxgb4/cq.c b/drivers/infiniband/hw/cxgb4/cq.c
index 1720dc790d13..f35a935267e7 100644
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
@@ -185,7 +185,7 @@ static void insert_recv_cqe(struct t4_wq *wq, struct t4_cq *cq)
                                  V_CQE_OPCODE(FW_RI_SEND) |
                                  V_CQE_TYPE(0) |
                                  V_CQE_SWCQE(1) |
-                                 V_CQE_QPID(wq->rq.qid));
+                                 V_CQE_QPID(wq->sq.qid));
         cqe.bits_type_ts = cpu_to_be64(V_CQE_GENBIT((u64)cq->gen));
         cq->sw_queue[cq->sw_pidx] = cqe;
         t4_swcq_produce(cq);
@@ -818,6 +818,7 @@ struct ib_cq *c4iw_create_cq(struct ib_device *ibdev, int entries,
         chp->cq.size--;                         /* status page */
         chp->ibcq.cqe = entries - 2;
         spin_lock_init(&chp->lock);
+        spin_lock_init(&chp->comp_handler_lock);
         atomic_set(&chp->refcnt, 1);
         init_waitqueue_head(&chp->wait);
         ret = insert_handle(rhp, &rhp->cqidr, chp, chp->cq.cqid);
diff --git a/drivers/infiniband/hw/cxgb4/device.c b/drivers/infiniband/hw/cxgb4/device.c
index 40a13cc633a3..6d0df6ec161b 100644
--- a/drivers/infiniband/hw/cxgb4/device.c
+++ b/drivers/infiniband/hw/cxgb4/device.c
@@ -376,10 +376,8 @@ struct uld_ctx {
         struct c4iw_dev *dev;
 };
 
-static void c4iw_remove(struct uld_ctx *ctx)
+static void c4iw_dealloc(struct uld_ctx *ctx)
 {
-        PDBG("%s c4iw_dev %p\n", __func__,  ctx->dev);
-        c4iw_unregister_device(ctx->dev);
         c4iw_rdev_close(&ctx->dev->rdev);
         idr_destroy(&ctx->dev->cqidr);
         idr_destroy(&ctx->dev->qpidr);
@@ -389,11 +387,30 @@ static void c4iw_remove(struct uld_ctx *ctx)
         ctx->dev = NULL;
 }
 
+static void c4iw_remove(struct uld_ctx *ctx)
+{
+        PDBG("%s c4iw_dev %p\n", __func__,  ctx->dev);
+        c4iw_unregister_device(ctx->dev);
+        c4iw_dealloc(ctx);
+}
+
+static int rdma_supported(const struct cxgb4_lld_info *infop)
+{
+        return infop->vr->stag.size > 0 && infop->vr->pbl.size > 0 &&
+               infop->vr->rq.size > 0 && infop->vr->qp.size > 0 &&
+               infop->vr->cq.size > 0 && infop->vr->ocq.size > 0;
+}
+
 static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
 {
         struct c4iw_dev *devp;
         int ret;
 
+        if (!rdma_supported(infop)) {
+                printk(KERN_INFO MOD "%s: RDMA not supported on this device.\n",
+                       pci_name(infop->pdev));
+                return ERR_PTR(-ENOSYS);
+        }
         devp = (struct c4iw_dev *)ib_alloc_device(sizeof(*devp));
         if (!devp) {
                 printk(KERN_ERR MOD "Cannot allocate ib device\n");
@@ -414,7 +431,6 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop)
 
         ret = c4iw_rdev_open(&devp->rdev);
         if (ret) {
-                mutex_unlock(&dev_mutex);
                 printk(KERN_ERR MOD "Unable to open CXIO rdev err %d\n", ret);
                 ib_dealloc_device(&devp->ibdev);
                 return ERR_PTR(ret);
@@ -519,15 +535,24 @@ static int c4iw_uld_state_change(void *handle, enum cxgb4_state new_state)
         case CXGB4_STATE_UP:
                 printk(KERN_INFO MOD "%s: Up\n", pci_name(ctx->lldi.pdev));
                 if (!ctx->dev) {
-                        int ret = 0;
+                        int ret;
 
                         ctx->dev = c4iw_alloc(&ctx->lldi);
-                        if (!IS_ERR(ctx->dev))
-                                ret = c4iw_register_device(ctx->dev);
-                        if (IS_ERR(ctx->dev) || ret)
+                        if (IS_ERR(ctx->dev)) {
+                                printk(KERN_ERR MOD
+                                       "%s: initialization failed: %ld\n",
+                                       pci_name(ctx->lldi.pdev),
+                                       PTR_ERR(ctx->dev));
+                                ctx->dev = NULL;
+                                break;
+                        }
+                        ret = c4iw_register_device(ctx->dev);
+                        if (ret) {
                                 printk(KERN_ERR MOD
                                        "%s: RDMA registration failed: %d\n",
                                        pci_name(ctx->lldi.pdev), ret);
+                                c4iw_dealloc(ctx);
+                        }
                 }
                 break;
         case CXGB4_STATE_DOWN:
diff --git a/drivers/infiniband/hw/cxgb4/ev.c b/drivers/infiniband/hw/cxgb4/ev.c
index c13041a0aeba..397cb36cf103 100644
--- a/drivers/infiniband/hw/cxgb4/ev.c
+++ b/drivers/infiniband/hw/cxgb4/ev.c
@@ -42,6 +42,7 @@ static void post_qp_event(struct c4iw_dev *dev, struct c4iw_cq *chp,
 {
         struct ib_event event;
         struct c4iw_qp_attributes attrs;
+        unsigned long flag;
 
         if ((qhp->attr.state == C4IW_QP_STATE_ERROR) ||
             (qhp->attr.state == C4IW_QP_STATE_TERMINATE)) {
@@ -72,7 +73,9 @@ static void post_qp_event(struct c4iw_dev *dev, struct c4iw_cq *chp,
         if (qhp->ibqp.event_handler)
                 (*qhp->ibqp.event_handler)(&event, qhp->ibqp.qp_context);
 
+        spin_lock_irqsave(&chp->comp_handler_lock, flag);
         (*chp->ibcq.comp_handler)(&chp->ibcq, chp->ibcq.cq_context);
+        spin_unlock_irqrestore(&chp->comp_handler_lock, flag);
 }
 
 void c4iw_ev_dispatch(struct c4iw_dev *dev, struct t4_cqe *err_cqe)
@@ -183,11 +186,14 @@ out:
 int c4iw_ev_handler(struct c4iw_dev *dev, u32 qid)
 {
         struct c4iw_cq *chp;
+        unsigned long flag;
 
         chp = get_chp(dev, qid);
-        if (chp)
+        if (chp) {
+                spin_lock_irqsave(&chp->comp_handler_lock, flag);
                 (*chp->ibcq.comp_handler)(&chp->ibcq, chp->ibcq.cq_context);
-        else
+                spin_unlock_irqrestore(&chp->comp_handler_lock, flag);
+        } else
                 PDBG("%s unknown cqid 0x%x\n", __func__, qid);
         return 0;
 }
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 62cea0e2b158..1357c5bf209b 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -309,6 +309,7 @@ struct c4iw_cq {
         struct c4iw_dev *rhp;
         struct t4_cq cq;
         spinlock_t lock;
+        spinlock_t comp_handler_lock;
         atomic_t refcnt;
         wait_queue_head_t wait;
 };
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index ec3ce675fdff..d6ccc7e84802 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -945,8 +945,11 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
         flushed = c4iw_flush_rq(&qhp->wq, &rchp->cq, count);
         spin_unlock(&qhp->lock);
         spin_unlock_irqrestore(&rchp->lock, flag);
-        if (flushed)
+        if (flushed) {
+                spin_lock_irqsave(&rchp->comp_handler_lock, flag);
                 (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
+                spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);
+        }
 
         /* locking hierarchy: cq lock first, then qp lock. */
         spin_lock_irqsave(&schp->lock, flag);
@@ -956,13 +959,17 @@ static void __flush_qp(struct c4iw_qp *qhp, struct c4iw_cq *rchp,
         flushed = c4iw_flush_sq(&qhp->wq, &schp->cq, count);
         spin_unlock(&qhp->lock);
         spin_unlock_irqrestore(&schp->lock, flag);
-        if (flushed)
+        if (flushed) {
+                spin_lock_irqsave(&schp->comp_handler_lock, flag);
                 (*schp->ibcq.comp_handler)(&schp->ibcq, schp->ibcq.cq_context);
+                spin_unlock_irqrestore(&schp->comp_handler_lock, flag);
+        }
 }
 
 static void flush_qp(struct c4iw_qp *qhp)
 {
         struct c4iw_cq *rchp, *schp;
+        unsigned long flag;
 
         rchp = get_chp(qhp->rhp, qhp->attr.rcq);
         schp = get_chp(qhp->rhp, qhp->attr.scq);
@@ -970,8 +977,16 @@ static void flush_qp(struct c4iw_qp *qhp)
         if (qhp->ibqp.uobject) {
                 t4_set_wq_in_error(&qhp->wq);
                 t4_set_cq_in_error(&rchp->cq);
-                if (schp != rchp)
+                spin_lock_irqsave(&rchp->comp_handler_lock, flag);
+                (*rchp->ibcq.comp_handler)(&rchp->ibcq, rchp->ibcq.cq_context);
+                spin_unlock_irqrestore(&rchp->comp_handler_lock, flag);
+                if (schp != rchp) {
                         t4_set_cq_in_error(&schp->cq);
+                        spin_lock_irqsave(&schp->comp_handler_lock, flag);
+                        (*schp->ibcq.comp_handler)(&schp->ibcq,
+                                        schp->ibcq.cq_context);
+                        spin_unlock_irqrestore(&schp->comp_handler_lock, flag);
+                }
                 return;
         }
         __flush_qp(qhp, rchp, schp);
@@ -1211,6 +1226,8 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
                                 disconnect = 1;
                                 c4iw_get_ep(&qhp->ep->com);
                         }
+                        if (qhp->ibqp.uobject)
+                                t4_set_wq_in_error(&qhp->wq);
                         ret = rdma_fini(rhp, qhp, ep);
                         if (ret)
                                 goto err;
@@ -1229,6 +1246,8 @@ int c4iw_modify_qp(struct c4iw_dev *rhp, struct c4iw_qp *qhp,
                         break;
                 case C4IW_QP_STATE_ERROR:
                         set_state(qhp, C4IW_QP_STATE_ERROR);
+                        if (qhp->ibqp.uobject)
+                                t4_set_wq_in_error(&qhp->wq);
                         if (!internal) {
                                 abort = 1;
                                 disconnect = 1;