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

Pull InfiniBand/RDMA changes from Roland Dreier:
 - XRC transport fixes
 - Fix DHCP on IPoIB
 - mlx4 preparations for flow steering
 - iSER fixes
 - miscellaneous other fixes

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (23 commits)
  IB/iser: Add support for iser CM REQ additional info
  IB/iser: Return error to upper layers on EAGAIN registration failures
  IB/iser: Move informational messages from error to info level
  IB/iser: Add module version
  mlx4_core: Expose a few helpers to fill DMFS HW strucutures
  mlx4_core: Directly expose fields of DMFS HW rule control segment
  mlx4_core: Change a few DMFS fields names to match firmare spec
  mlx4: Match DMFS promiscuous field names to firmware spec
  mlx4_core: Move DMFS HW structs to common header file
  IB/mlx4: Set link type for RAW PACKET QPs in the QP context
  IB/mlx4: Disable VLAN stripping for RAW PACKET QPs
  mlx4_core: Reduce warning message for SRQ_LIMIT event to debug level
  RDMA/iwcm: Don't touch cmid after dropping reference
  IB/qib: Correct qib_verbs_register_sysfs() error handling
  IB/ipath: Correct ipath_verbs_register_sysfs() error handling
  RDMA/cxgb4: Fix SQ allocation when on-chip SQ is disabled
  SRPT: Fix odd use of WARN_ON()
  IPoIB: Fix ipoib_hard_header() return value
  RDMA: Rename random32() to prandom_u32()
  RDMA/cxgb3: Fix uninitialized variable
  ...

7 files changed, 58 insertions, 21 deletions

diff --git a/drivers/infiniband/hw/cxgb3/iwch_provider.c b/drivers/infiniband/hw/cxgb3/iwch_provider.c
index 9c12da0cbd32..e87f2201b220 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_provider.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_provider.c
@@ -559,7 +559,7 @@ static int iwch_reregister_phys_mem(struct ib_mr *mr,
         __be64 *page_list = NULL;
         int shift = 0;
         u64 total_size;
-        int npages;
+        int npages = 0;
         int ret;
 
         PDBG("%s ib_mr %p ib_pd %p\n", __func__, mr, pd);
diff --git a/drivers/infiniband/hw/cxgb4/qp.c b/drivers/infiniband/hw/cxgb4/qp.c
index 5b059e2d80cc..232040447e8a 100644
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
@@ -111,6 +111,16 @@ static int alloc_host_sq(struct c4iw_rdev *rdev, struct t4_sq *sq)
         return 0;
 }
 
+static int alloc_sq(struct c4iw_rdev *rdev, struct t4_sq *sq, int user)
+{
+        int ret = -ENOSYS;
+        if (user)
+                ret = alloc_oc_sq(rdev, sq);
+        if (ret)
+                ret = alloc_host_sq(rdev, sq);
+        return ret;
+}
+
 static int destroy_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                       struct c4iw_dev_ucontext *uctx)
 {
@@ -179,15 +189,9 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq,
                 goto free_sw_rq;
         }
 
-        if (user) {
-                if (alloc_oc_sq(rdev, &wq->sq) && alloc_host_sq(rdev, &wq->sq))
-                        goto free_hwaddr;
-        } else {
-                ret = alloc_host_sq(rdev, &wq->sq);
-                if (ret)
-                        goto free_hwaddr;
-        }
-
+        ret = alloc_sq(rdev, &wq->sq, user);
+        if (ret)
+                goto free_hwaddr;
         memset(wq->sq.queue, 0, wq->sq.memsize);
         dma_unmap_addr_set(&wq->sq, mapping, wq->sq.dma_addr);
 
diff --git a/drivers/infiniband/hw/ipath/ipath_verbs.c b/drivers/infiniband/hw/ipath/ipath_verbs.c
index ea93870266eb..44ea9390417c 100644
--- a/drivers/infiniband/hw/ipath/ipath_verbs.c
+++ b/drivers/infiniband/hw/ipath/ipath_verbs.c
@@ -2187,7 +2187,8 @@ int ipath_register_ib_device(struct ipath_devdata *dd)
         if (ret)
                 goto err_reg;
 
-        if (ipath_verbs_register_sysfs(dev))
+        ret = ipath_verbs_register_sysfs(dev);
+        if (ret)
                 goto err_class;
 
         enable_timer(dd);
@@ -2327,15 +2328,15 @@ static int ipath_verbs_register_sysfs(struct ib_device *dev)
         int i;
         int ret;
 
-        for (i = 0; i < ARRAY_SIZE(ipath_class_attributes); ++i)
-                if (device_create_file(&dev->dev,
-                                       ipath_class_attributes[i])) {
-                        ret = 1;
+        for (i = 0; i < ARRAY_SIZE(ipath_class_attributes); ++i) {
+                ret = device_create_file(&dev->dev,
+                                       ipath_class_attributes[i]);
+                if (ret)
                         goto bail;
-                }
-
-        ret = 0;
-
+        }
+        return 0;
 bail:
+        for (i = 0; i < ARRAY_SIZE(ipath_class_attributes); ++i)
+                device_remove_file(&dev->dev, ipath_class_attributes[i]);
         return ret;
 }
diff --git a/drivers/infiniband/hw/mlx4/cq.c b/drivers/infiniband/hw/mlx4/cq.c
index 73b3a7132587..d5e60f44ba5a 100644
--- a/drivers/infiniband/hw/mlx4/cq.c
+++ b/drivers/infiniband/hw/mlx4/cq.c
@@ -33,6 +33,7 @@
 
 #include <linux/mlx4/cq.h>
 #include <linux/mlx4/qp.h>
+#include <linux/mlx4/srq.h>
 #include <linux/slab.h>
 
 #include "mlx4_ib.h"
@@ -585,6 +586,7 @@ static int mlx4_ib_poll_one(struct mlx4_ib_cq *cq,
         struct mlx4_qp *mqp;
         struct mlx4_ib_wq *wq;
         struct mlx4_ib_srq *srq;
+        struct mlx4_srq *msrq = NULL;
         int is_send;
         int is_error;
         u32 g_mlpath_rqpn;
@@ -653,6 +655,20 @@ repoll:
 
         wc->qp = &(*cur_qp)->ibqp;
 
+        if (wc->qp->qp_type == IB_QPT_XRC_TGT) {
+                u32 srq_num;
+                g_mlpath_rqpn = be32_to_cpu(cqe->g_mlpath_rqpn);
+                srq_num       = g_mlpath_rqpn & 0xffffff;
+                /* SRQ is also in the radix tree */
+                msrq = mlx4_srq_lookup(to_mdev(cq->ibcq.device)->dev,
+                                       srq_num);
+                if (unlikely(!msrq)) {
+                        pr_warn("CQ %06x with entry for unknown SRQN %06x\n",
+                                cq->mcq.cqn, srq_num);
+                        return -EINVAL;
+                }
+        }
+
         if (is_send) {
                 wq = &(*cur_qp)->sq;
                 if (!(*cur_qp)->sq_signal_bits) {
@@ -666,6 +682,11 @@ repoll:
                 wqe_ctr = be16_to_cpu(cqe->wqe_index);
                 wc->wr_id = srq->wrid[wqe_ctr];
                 mlx4_ib_free_srq_wqe(srq, wqe_ctr);
+        } else if (msrq) {
+                srq = to_mibsrq(msrq);
+                wqe_ctr = be16_to_cpu(cqe->wqe_index);
+                wc->wr_id = srq->wrid[wqe_ctr];
+                mlx4_ib_free_srq_wqe(srq, wqe_ctr);
         } else {
                 wq        = &(*cur_qp)->rq;
                 tail      = wq->tail & (wq->wqe_cnt - 1);
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 35cced2a4da8..4f10af2905b5 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1292,6 +1292,8 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
         if (cur_state == IB_QPS_RESET && new_state == IB_QPS_INIT) {
                 context->sq_size_stride |= !!qp->sq_no_prefetch << 7;
                 context->xrcd = cpu_to_be32((u32) qp->xrcdn);
+                if (ibqp->qp_type == IB_QPT_RAW_PACKET)
+                        context->param3 |= cpu_to_be32(1 << 30);
         }
 
         if (qp->ibqp.uobject)
@@ -1458,6 +1460,10 @@ static int __mlx4_ib_modify_qp(struct ib_qp *ibqp,
                 }
         }
 
+        if (qp->ibqp.qp_type == IB_QPT_RAW_PACKET)
+                context->pri_path.ackto = (context->pri_path.ackto & 0xf8) |
+                                        MLX4_IB_LINK_TYPE_ETH;
+
         if (cur_state == IB_QPS_RTS && new_state == IB_QPS_SQD  &&
             attr_mask & IB_QP_EN_SQD_ASYNC_NOTIFY && attr->en_sqd_async_notify)
                 sqd_event = 1;
diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/qib/qib_sysfs.c
index 034cc821de5c..3c8e4e3caca6 100644
--- a/drivers/infiniband/hw/qib/qib_sysfs.c
+++ b/drivers/infiniband/hw/qib/qib_sysfs.c
@@ -808,10 +808,14 @@ int qib_verbs_register_sysfs(struct qib_devdata *dd)
         for (i = 0; i < ARRAY_SIZE(qib_attributes); ++i) {
                 ret = device_create_file(&dev->dev, qib_attributes[i]);
                 if (ret)
-                        return ret;
+                        goto bail;
         }
 
         return 0;
+bail:
+        for (i = 0; i < ARRAY_SIZE(qib_attributes); ++i)
+                device_remove_file(&dev->dev, qib_attributes[i]);
+        return ret;
 }
 
 /*
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 7c0ab16a2fe2..904c384aa361 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -2234,7 +2234,8 @@ int qib_register_ib_device(struct qib_devdata *dd)
         if (ret)
                 goto err_agents;
 
-        if (qib_verbs_register_sysfs(dd))
+        ret = qib_verbs_register_sysfs(dd);
+        if (ret)
                 goto err_class;
 
         goto bail;