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, 21 insertions, 14 deletions

diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 6b811e3e8bd1..7e62f4137148 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -530,8 +530,6 @@ struct qib_pportdata {
         /* qib_lflags driver is waiting for */
         u32 state_wanted;
         spinlock_t lflags_lock;
-        /* number of (port-specific) interrupts for this port -- saturates... */
-        u32 int_counter;
 
         /* ref count for each pkey */
         atomic_t pkeyrefs[4];
@@ -543,24 +541,26 @@ struct qib_pportdata {
         u64 *statusp;
 
         /* SendDMA related entries */
-        spinlock_t            sdma_lock;
-        struct qib_sdma_state sdma_state;
-        unsigned long         sdma_buf_jiffies;
+
+        /* read mostly */
         struct qib_sdma_desc *sdma_descq;
+        struct qib_sdma_state sdma_state;
+        dma_addr_t       sdma_descq_phys;
+        volatile __le64 *sdma_head_dma; /* DMA'ed by chip */
+        dma_addr_t       sdma_head_phys;
+        u16                   sdma_descq_cnt;
+
+        /* read/write using lock */
+        spinlock_t            sdma_lock ____cacheline_aligned_in_smp;
+        struct list_head      sdma_activelist;
         u64                   sdma_descq_added;
         u64                   sdma_descq_removed;
-        u16                   sdma_descq_cnt;
         u16                   sdma_descq_tail;
         u16                   sdma_descq_head;
-        u16                   sdma_next_intr;
-        u16                   sdma_reset_wait;
         u8                    sdma_generation;
-        struct tasklet_struct sdma_sw_clean_up_task;
-        struct list_head      sdma_activelist;
 
-        dma_addr_t       sdma_descq_phys;
-        volatile __le64 *sdma_head_dma; /* DMA'ed by chip */
-        dma_addr_t       sdma_head_phys;
+        struct tasklet_struct sdma_sw_clean_up_task
+                ____cacheline_aligned_in_smp;
 
         wait_queue_head_t state_wait; /* for state_wanted */
 
@@ -873,7 +873,14 @@ struct qib_devdata {
          * pio_writing.
          */
         spinlock_t pioavail_lock;
-
+        /*
+         * index of last buffer to optimize search for next
+         */
+        u32 last_pio;
+        /*
+         * min kernel pio buffer to optimize search
+         */
+        u32 min_kernel_pio;
         /*
          * Shadow copies of registers; size indicates read access size.
          * Most of them are readonly, but some are write-only register,