[IB] mthca: report asynchronous CQ events

Implement reporting asynchronous CQ events in Mellanox HCA driver.

Signed-off-by: Michael S. Tsirkin <mst@mellanox.co.il>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

3 files changed, 36 insertions, 3 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_cq.c b/drivers/infiniband/hw/mthca/mthca_cq.c
index 8600b6c3e0c2..f98e23555826 100644
--- a/drivers/infiniband/hw/mthca/mthca_cq.c
+++ b/drivers/infiniband/hw/mthca/mthca_cq.c
@@ -208,7 +208,7 @@ static inline void update_cons_index(struct mthca_dev *dev, struct mthca_cq *cq,
         }
 }
 
-void mthca_cq_event(struct mthca_dev *dev, u32 cqn)
+void mthca_cq_completion(struct mthca_dev *dev, u32 cqn)
 {
         struct mthca_cq *cq;
 
@@ -224,6 +224,35 @@ void mthca_cq_event(struct mthca_dev *dev, u32 cqn)
         cq->ibcq.comp_handler(&cq->ibcq, cq->ibcq.cq_context);
 }
 
+void mthca_cq_event(struct mthca_dev *dev, u32 cqn,
+                    enum ib_event_type event_type)
+{
+        struct mthca_cq *cq;
+        struct ib_event event;
+
+        spin_lock(&dev->cq_table.lock);
+
+        cq = mthca_array_get(&dev->cq_table.cq, cqn & (dev->limits.num_cqs - 1));
+
+        if (cq)
+                atomic_inc(&cq->refcount);
+        spin_unlock(&dev->cq_table.lock);
+
+        if (!cq) {
+                mthca_warn(dev, "Async event for bogus CQ %08x\n", cqn);
+                return;
+        }
+
+        event.device      = &dev->ib_dev;
+        event.event       = event_type;
+        event.element.cq  = &cq->ibcq;
+        if (cq->ibcq.event_handler)
+                cq->ibcq.event_handler(&event, cq->ibcq.cq_context);
+
+        if (atomic_dec_and_test(&cq->refcount))
+                wake_up(&cq->wait);
+}
+
 void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn,
                     struct mthca_srq *srq)
 {
diff --git a/drivers/infiniband/hw/mthca/mthca_dev.h b/drivers/infiniband/hw/mthca/mthca_dev.h
index 7e68bd4a3780..e7e5d3b4f004 100644
--- a/drivers/infiniband/hw/mthca/mthca_dev.h
+++ b/drivers/infiniband/hw/mthca/mthca_dev.h
@@ -460,7 +460,9 @@ int mthca_init_cq(struct mthca_dev *dev, int nent,
                   struct mthca_cq *cq);
 void mthca_free_cq(struct mthca_dev *dev,
                    struct mthca_cq *cq);
-void mthca_cq_event(struct mthca_dev *dev, u32 cqn);
+void mthca_cq_completion(struct mthca_dev *dev, u32 cqn);
+void mthca_cq_event(struct mthca_dev *dev, u32 cqn,
+                    enum ib_event_type event_type);
 void mthca_cq_clean(struct mthca_dev *dev, u32 cqn, u32 qpn,
                     struct mthca_srq *srq);
 
diff --git a/drivers/infiniband/hw/mthca/mthca_eq.c b/drivers/infiniband/hw/mthca/mthca_eq.c
index e5a047a6dbeb..34d68e5a72d8 100644
--- a/drivers/infiniband/hw/mthca/mthca_eq.c
+++ b/drivers/infiniband/hw/mthca/mthca_eq.c
@@ -292,7 +292,7 @@ static int mthca_eq_int(struct mthca_dev *dev, struct mthca_eq *eq)
                 case MTHCA_EVENT_TYPE_COMP:
                         disarm_cqn = be32_to_cpu(eqe->event.comp.cqn) & 0xffffff;
                         disarm_cq(dev, eq->eqn, disarm_cqn);
-                        mthca_cq_event(dev, disarm_cqn);
+                        mthca_cq_completion(dev, disarm_cqn);
                         break;
 
                 case MTHCA_EVENT_TYPE_PATH_MIG:
@@ -364,6 +364,8 @@ static int mthca_eq_int(struct mthca_dev *dev, struct mthca_eq *eq)
                                    eqe->event.cq_err.syndrome == 1 ?
                                    "overrun" : "access violation",
                                    be32_to_cpu(eqe->event.cq_err.cqn) & 0xffffff);
+                        mthca_cq_event(dev, be32_to_cpu(eqe->event.cq_err.cqn),
+                                       IB_EVENT_CQ_ERR);
                         break;
 
                 case MTHCA_EVENT_TYPE_EQ_OVERFLOW: