Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cma: Save PID of ID's owner
  RDMA/cma: Add support for netlink statistics export
  RDMA/cma: Pass QP type into rdma_create_id()
  RDMA: Update exported headers list
  RDMA/cma: Export enum cma_state in <rdma/rdma_cm.h>
  RDMA/nes: Add a check for strict_strtoul()
  RDMA/cxgb3: Don't post zero-byte read if endpoint is going away
  RDMA/cxgb4: Use completion objects for event blocking
  IB/srp: Fix integer -> pointer cast warnings
  IB: Add devnode methods to cm_class and umad_class
  IB/mad: Return EPROTONOSUPPORT when an RDMA device lacks the QP required
  IB/uverbs: Add devnode method to set path/mode
  RDMA/ucma: Add .nodename/.mode to tell userspace where to create device node
  RDMA: Add netlink infrastructure
  RDMA: Add error handling to ib_core_init()

6 files changed, 30 insertions, 28 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index 23918413899..0a5008fbeba 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -914,7 +914,7 @@ static void process_mpa_reply(struct iwch_ep *ep, struct sk_buff *skb)
                 goto err;
 
         if (peer2peer && iwch_rqes_posted(ep->com.qp) == 0) {
-                iwch_post_zb_read(ep->com.qp);
+                iwch_post_zb_read(ep);
         }
 
         goto out;
@@ -1078,6 +1078,8 @@ static int tx_ack(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
         struct iwch_ep *ep = ctx;
         struct cpl_wr_ack *hdr = cplhdr(skb);
         unsigned int credits = ntohs(hdr->credits);
+        unsigned long flags;
+        int post_zb = 0;
 
         PDBG("%s ep %p credits %u\n", __func__, ep, credits);
 
@@ -1087,28 +1089,34 @@ static int tx_ack(struct t3cdev *tdev, struct sk_buff *skb, void *ctx)
                 return CPL_RET_BUF_DONE;
         }
 
+        spin_lock_irqsave(&ep->com.lock, flags);
         BUG_ON(credits != 1);
         dst_confirm(ep->dst);
         if (!ep->mpa_skb) {
                 PDBG("%s rdma_init wr_ack ep %p state %u\n",
-                        __func__, ep, state_read(&ep->com));
+                        __func__, ep, ep->com.state);
                 if (ep->mpa_attr.initiator) {
                         PDBG("%s initiator ep %p state %u\n",
-                                __func__, ep, state_read(&ep->com));
-                        if (peer2peer)
-                                iwch_post_zb_read(ep->com.qp);
+                                __func__, ep, ep->com.state);
+                        if (peer2peer && ep->com.state == FPDU_MODE)
+                                post_zb = 1;
                 } else {
                         PDBG("%s responder ep %p state %u\n",
-                                __func__, ep, state_read(&ep->com));
-                        ep->com.rpl_done = 1;
-                        wake_up(&ep->com.waitq);
+                                __func__, ep, ep->com.state);
+                        if (ep->com.state == MPA_REQ_RCVD) {
+                                ep->com.rpl_done = 1;
+                                wake_up(&ep->com.waitq);
+                        }
                 }
         } else {
                 PDBG("%s lsm ack ep %p state %u freeing skb\n",
-                        __func__, ep, state_read(&ep->com));
+                        __func__, ep, ep->com.state);
                 kfree_skb(ep->mpa_skb);
                 ep->mpa_skb = NULL;
         }
+        spin_unlock_irqrestore(&ep->com.lock, flags);
+        if (post_zb)
+                iwch_post_zb_read(ep);
         return CPL_RET_BUF_DONE;
 }
 
diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.h b/drivers/infiniband/hw/cxgb3/iwch_provider.h
index c5406da3f4c..9a342c9b220 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.h
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.h
@@ -332,7 +332,7 @@ int iwch_bind_mw(struct ib_qp *qp,
                              struct ib_mw_bind *mw_bind);
 int iwch_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc);
 int iwch_post_terminate(struct iwch_qp *qhp, struct respQ_msg_t *rsp_msg);
-int iwch_post_zb_read(struct iwch_qp *qhp);
+int iwch_post_zb_read(struct iwch_ep *ep);
 int iwch_register_device(struct iwch_dev *dev);
 void iwch_unregister_device(struct iwch_dev *dev);
 void stop_read_rep_timer(struct iwch_qp *qhp);
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index 1b4cd09f74d..ecd313f359a 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -738,7 +738,7 @@ static inline void build_term_codes(struct respQ_msg_t *rsp_msg,
         }
 }
 
-int iwch_post_zb_read(struct iwch_qp *qhp)
+int iwch_post_zb_read(struct iwch_ep *ep)
 {
         union t3_wr *wqe;
         struct sk_buff *skb;
@@ -761,10 +761,10 @@ int iwch_post_zb_read(struct iwch_qp *qhp)
         wqe->read.local_len = cpu_to_be32(0);
         wqe->read.local_to = cpu_to_be64(1);
         wqe->send.wrh.op_seop_flags = cpu_to_be32(V_FW_RIWR_OP(T3_WR_READ));
-        wqe->send.wrh.gen_tid_len = cpu_to_be32(V_FW_RIWR_TID(qhp->ep->hwtid)|
+        wqe->send.wrh.gen_tid_len = cpu_to_be32(V_FW_RIWR_TID(ep->hwtid)|
                                                 V_FW_RIWR_LEN(flit_cnt));
         skb->priority = CPL_PRIORITY_DATA;
-        return iwch_cxgb3_ofld_send(qhp->rhp->rdev.t3cdev_p, skb);
+        return iwch_cxgb3_ofld_send(ep->com.qp->rhp->rdev.t3cdev_p, skb);
 }
 
 /*
diff --git a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
index 35d2a5dd9bb..4f045375c8e 100644
--- a/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
+++ b/drivers/infiniband/hw/cxgb4/iw_cxgb4.h
@@ -35,7 +35,7 @@
 #include <linux/list.h>
 #include <linux/spinlock.h>
 #include <linux/idr.h>
-#include <linux/workqueue.h>
+#include <linux/completion.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
 #include <linux/pci.h>
@@ -131,28 +131,21 @@ static inline int c4iw_num_stags(struct c4iw_rdev *rdev)
 
 #define C4IW_WR_TO (10*HZ)
 
-enum {
-        REPLY_READY = 0,
-};
-
 struct c4iw_wr_wait {
-        wait_queue_head_t wait;
-        unsigned long status;
+        struct completion completion;
         int ret;
 };
 
 static inline void c4iw_init_wr_wait(struct c4iw_wr_wait *wr_waitp)
 {
         wr_waitp->ret = 0;
-        wr_waitp->status = 0;
-        init_waitqueue_head(&wr_waitp->wait);
+        init_completion(&wr_waitp->completion);
 }
 
 static inline void c4iw_wake_up(struct c4iw_wr_wait *wr_waitp, int ret)
 {
         wr_waitp->ret = ret;
-        set_bit(REPLY_READY, &wr_waitp->status);
-        wake_up(&wr_waitp->wait);
+        complete(&wr_waitp->completion);
 }
 
 static inline int c4iw_wait_for_reply(struct c4iw_rdev *rdev,
@@ -164,8 +157,7 @@ static inline int c4iw_wait_for_reply(struct c4iw_rdev *rdev,
         int ret;
 
         do {
-                ret = wait_event_timeout(wr_waitp->wait,
-                        test_and_clear_bit(REPLY_READY, &wr_waitp->status), to);
+                ret = wait_for_completion_timeout(&wr_waitp->completion, to);
                 if (!ret) {
                         printk(KERN_ERR MOD "%s - Device %s not responding - "
                                "tid %u qpid %u\n", func,
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index 13de1192927..2d668c69f6d 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -1138,7 +1138,9 @@ static ssize_t nes_store_wqm_quanta(struct device_driver *ddp,
         u32 i = 0;
         struct nes_device *nesdev;
 
-        strict_strtoul(buf, 0, &wqm_quanta_value);
+        if (kstrtoul(buf, 0, &wqm_quanta_value) < 0)
+                return -EINVAL;
+
         list_for_each_entry(nesdev, &nes_dev_list, list) {
                 if (i == ee_flsh_adapter) {
                         nesdev->nesadapter->wqm_quanta = wqm_quanta_value;
diff --git a/drivers/infiniband/hw/qib/Kconfig b/drivers/infiniband/hw/qib/Kconfig
index 7c03a70c55a..8349f9c5064 100644
--- a/drivers/infiniband/hw/qib/Kconfig
+++ b/drivers/infiniband/hw/qib/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_QIB
         tristate "QLogic PCIe HCA support"
-        depends on 64BIT && NET
+        depends on 64BIT
         ---help---
         This is a low-level driver for QLogic PCIe QLE InfiniBand host
         channel adapters.  This driver does not support the QLogic