1 files changed, 34 insertions, 34 deletions

diff --git a/drivers/infiniband/hw/ipath/ipath_cq.c b/drivers/infiniband/hw/ipath/ipath_cq.c
index ea78e6dddc90..3e9241badba0 100644
--- a/drivers/infiniband/hw/ipath/ipath_cq.c
+++ b/drivers/infiniband/hw/ipath/ipath_cq.c
@@ -204,7 +204,7 @@ static void send_complete(unsigned long data)
  *
  * Called by ib_create_cq() in the generic verbs code.
  */
-struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
+struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries, int comp_vector,
                               struct ib_ucontext *context,
                               struct ib_udata *udata)
 {
@@ -243,33 +243,21 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
          * See ipath_mmap() for details.
          */
         if (udata && udata->outlen >= sizeof(__u64)) {
-                struct ipath_mmap_info *ip;
-                __u64 offset = (__u64) wc;
                 int err;
+                u32 s = sizeof *wc + sizeof(struct ib_wc) * entries;
 
-                err = ib_copy_to_udata(udata, &offset, sizeof(offset));
-                if (err) {
-                        ret = ERR_PTR(err);
+                cq->ip = ipath_create_mmap_info(dev, s, context, wc);
+                if (!cq->ip) {
+                        ret = ERR_PTR(-ENOMEM);
                         goto bail_wc;
                 }
 
-                /* Allocate info for ipath_mmap(). */
-                ip = kmalloc(sizeof(*ip), GFP_KERNEL);
-                if (!ip) {
-                        ret = ERR_PTR(-ENOMEM);
-                        goto bail_wc;
+                err = ib_copy_to_udata(udata, &cq->ip->offset,
+                                       sizeof(cq->ip->offset));
+                if (err) {
+                        ret = ERR_PTR(err);
+                        goto bail_ip;
                 }
-                cq->ip = ip;
-                ip->context = context;
-                ip->obj = wc;
-                kref_init(&ip->ref);
-                ip->mmap_cnt = 0;
-                ip->size = PAGE_ALIGN(sizeof(*wc) +
-                                      sizeof(struct ib_wc) * entries);
-                spin_lock_irq(&dev->pending_lock);
-                ip->next = dev->pending_mmaps;
-                dev->pending_mmaps = ip;
-                spin_unlock_irq(&dev->pending_lock);
         } else
                 cq->ip = NULL;
 
@@ -277,12 +265,18 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
         if (dev->n_cqs_allocated == ib_ipath_max_cqs) {
                 spin_unlock(&dev->n_cqs_lock);
                 ret = ERR_PTR(-ENOMEM);
-                goto bail_wc;
+                goto bail_ip;
         }
 
         dev->n_cqs_allocated++;
         spin_unlock(&dev->n_cqs_lock);
 
+        if (cq->ip) {
+                spin_lock_irq(&dev->pending_lock);
+                list_add(&cq->ip->pending_mmaps, &dev->pending_mmaps);
+                spin_unlock_irq(&dev->pending_lock);
+        }
+
         /*
          * ib_create_cq() will initialize cq->ibcq except for cq->ibcq.cqe.
          * The number of entries should be >= the number requested or return
@@ -301,12 +295,12 @@ struct ib_cq *ipath_create_cq(struct ib_device *ibdev, int entries,
 
         goto done;
 
+bail_ip:
+        kfree(cq->ip);
 bail_wc:
         vfree(wc);
-
 bail_cq:
         kfree(cq);
-
 done:
         return ret;
 }
@@ -340,17 +334,18 @@ int ipath_destroy_cq(struct ib_cq *ibcq)
 /**
  * ipath_req_notify_cq - change the notification type for a completion queue
  * @ibcq: the completion queue
- * @notify: the type of notification to request
+ * @notify_flags: the type of notification to request
  *
  * Returns 0 for success.
  *
  * This may be called from interrupt context.  Also called by
  * ib_req_notify_cq() in the generic verbs code.
  */
-int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
+int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags notify_flags)
 {
         struct ipath_cq *cq = to_icq(ibcq);
         unsigned long flags;
+        int ret = 0;
 
         spin_lock_irqsave(&cq->lock, flags);
         /*
@@ -358,9 +353,15 @@ int ipath_req_notify_cq(struct ib_cq *ibcq, enum ib_cq_notify notify)
          * any other transitions (see C11-31 and C11-32 in ch. 11.4.2.2).
          */
         if (cq->notify != IB_CQ_NEXT_COMP)
-                cq->notify = notify;
+                cq->notify = notify_flags & IB_CQ_SOLICITED_MASK;
+
+        if ((notify_flags & IB_CQ_REPORT_MISSED_EVENTS) &&
+            cq->queue->head != cq->queue->tail)
+                ret = 1;
+
         spin_unlock_irqrestore(&cq->lock, flags);
-        return 0;
+
+        return ret;
 }
 
 /**
@@ -443,13 +444,12 @@ int ipath_resize_cq(struct ib_cq *ibcq, int cqe, struct ib_udata *udata)
         if (cq->ip) {
                 struct ipath_ibdev *dev = to_idev(ibcq->device);
                 struct ipath_mmap_info *ip = cq->ip;
+                u32 s = sizeof *wc + sizeof(struct ib_wc) * cqe;
 
-                ip->obj = wc;
-                ip->size = PAGE_ALIGN(sizeof(*wc) +
-                                      sizeof(struct ib_wc) * cqe);
+                ipath_update_mmap_info(dev, ip, s, wc);
                 spin_lock_irq(&dev->pending_lock);
-                ip->next = dev->pending_mmaps;
-                dev->pending_mmaps = ip;
+                if (list_empty(&ip->pending_mmaps))
+                        list_add(&ip->pending_mmaps, &dev->pending_mmaps);
                 spin_unlock_irq(&dev->pending_lock);
         }