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

Pull InfiniBand/RDMA changes from Roland Dreier:
 - Add ocrdma hardware driver for Emulex IB-over-Ethernet adapters
 - Add generic and mlx4 support for "raw" QPs: allow suitably privileged
   applications to send and receive arbitrary packets directly to/from
   the hardware
 - Add "doorbell drop" handling to the cxgb4 driver
 - A fairly large batch of qib hardware driver changes
 - A few fixes for lockdep-detected issues
 - A few other miscellaneous fixes and cleanups

Fix up trivial conflict in drivers/net/ethernet/emulex/benet/be.h.

* tag 'rdma-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (53 commits)
  RDMA/cxgb4: Include vmalloc.h for vmalloc and vfree
  IB/mlx4: Fix mlx4_ib_add() error flow
  IB/core: Fix IB_SA_COMP_MASK macro
  IB/iser: Fix error flow in iser ep connection establishment
  IB/mlx4: Increase the number of vectors (EQs) available for ULPs
  RDMA/cxgb4: Add query_qp support
  RDMA/cxgb4: Remove kfifo usage
  RDMA/cxgb4: Use vmalloc() for debugfs QP dump
  RDMA/cxgb4: DB Drop Recovery for RDMA and LLD queues
  RDMA/cxgb4: Disable interrupts in c4iw_ev_dispatch()
  RDMA/cxgb4: Add DB Overflow Avoidance
  RDMA/cxgb4: Add debugfs RDMA memory stats
  cxgb4: DB Drop Recovery for RDMA and LLD queues
  cxgb4: Common platform specific changes for DB Drop Recovery
  cxgb4: Detect DB FULL events and notify RDMA ULD
  RDMA/cxgb4: Drop peer_abort when no endpoint found
  RDMA/cxgb4: Always wake up waiters in c4iw_peer_abort_intr()
  mlx4_core: Change bitmap allocator to work in round-robin fashion
  RDMA/nes: Don't call event handler if pointer is NULL
  RDMA/nes: Fix for the ORD value of the connecting peer
  ...

1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/cxgb4/mem.c b/drivers/infiniband/hw/cxgb4/mem.c
index 40c835309e49..57e07c61ace2 100644
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
@@ -131,10 +131,14 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
         stag_idx = (*stag) >> 8;
 
         if ((!reset_tpt_entry) && (*stag == T4_STAG_UNSET)) {
-                stag_idx = c4iw_get_resource(&rdev->resource.tpt_fifo,
-                                             &rdev->resource.tpt_fifo_lock);
+                stag_idx = c4iw_get_resource(&rdev->resource.tpt_table);
                 if (!stag_idx)
                         return -ENOMEM;
+                mutex_lock(&rdev->stats.lock);
+                rdev->stats.stag.cur += 32;
+                if (rdev->stats.stag.cur > rdev->stats.stag.max)
+                        rdev->stats.stag.max = rdev->stats.stag.cur;
+                mutex_unlock(&rdev->stats.lock);
                 *stag = (stag_idx << 8) | (atomic_inc_return(&key) & 0xff);
         }
         PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
@@ -165,9 +169,12 @@ static int write_tpt_entry(struct c4iw_rdev *rdev, u32 reset_tpt_entry,
                                 (rdev->lldi.vr->stag.start >> 5),
                                 sizeof(tpt), &tpt);
 
-        if (reset_tpt_entry)
-                c4iw_put_resource(&rdev->resource.tpt_fifo, stag_idx,
-                                  &rdev->resource.tpt_fifo_lock);
+        if (reset_tpt_entry) {
+                c4iw_put_resource(&rdev->resource.tpt_table, stag_idx);
+                mutex_lock(&rdev->stats.lock);
+                rdev->stats.stag.cur -= 32;
+                mutex_unlock(&rdev->stats.lock);
+        }
         return err;
 }
 
@@ -686,8 +693,8 @@ int c4iw_dealloc_mw(struct ib_mw *mw)
         mhp = to_c4iw_mw(mw);
         rhp = mhp->rhp;
         mmid = (mw->rkey) >> 8;
-        deallocate_window(&rhp->rdev, mhp->attr.stag);
         remove_handle(rhp, &rhp->mmidr, mmid);
+        deallocate_window(&rhp->rdev, mhp->attr.stag);
         kfree(mhp);
         PDBG("%s ib_mw %p mmid 0x%x ptr %p\n", __func__, mw, mmid, mhp);
         return 0;
@@ -789,12 +796,12 @@ int c4iw_dereg_mr(struct ib_mr *ib_mr)
         mhp = to_c4iw_mr(ib_mr);
         rhp = mhp->rhp;
         mmid = mhp->attr.stag >> 8;
+        remove_handle(rhp, &rhp->mmidr, mmid);
         dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,
                        mhp->attr.pbl_addr);
         if (mhp->attr.pbl_size)
                 c4iw_pblpool_free(&mhp->rhp->rdev, mhp->attr.pbl_addr,
                                   mhp->attr.pbl_size << 3);
-        remove_handle(rhp, &rhp->mmidr, mmid);
         if (mhp->kva)
                 kfree((void *) (unsigned long) mhp->kva);
         if (mhp->umem)