40 files changed, 372 insertions, 319 deletions

diff --git a/drivers/infiniband/core/cm.c b/drivers/infiniband/core/cm.c
index ad63b79afac1..64e0903091a8 100644
--- a/drivers/infiniband/core/cm.c
+++ b/drivers/infiniband/core/cm.c
@@ -2409,10 +2409,12 @@ int ib_send_cm_mra(struct ib_cm_id *cm_id,
                 msg_response = CM_MSG_RESPONSE_REP;
                 break;
         case IB_CM_ESTABLISHED:
-                cm_state = cm_id->state;
-                lap_state = IB_CM_MRA_LAP_SENT;
-                msg_response = CM_MSG_RESPONSE_OTHER;
-                break;
+                if (cm_id->lap_state == IB_CM_LAP_RCVD) {
+                        cm_state = cm_id->state;
+                        lap_state = IB_CM_MRA_LAP_SENT;
+                        msg_response = CM_MSG_RESPONSE_OTHER;
+                        break;
+                }
         default:
                 ret = -EINVAL;
                 goto error1;
diff --git a/drivers/infiniband/core/user_mad.c b/drivers/infiniband/core/user_mad.c
index 6babb72b39fc..5fa856909511 100644
--- a/drivers/infiniband/core/user_mad.c
+++ b/drivers/infiniband/core/user_mad.c
@@ -1085,7 +1085,6 @@ err_cdev:
 static void ib_umad_kill_port(struct ib_umad_port *port)
 {
         struct ib_umad_file *file;
-        int already_dead;
         int id;
 
         dev_set_drvdata(port->dev,    NULL);
@@ -1103,7 +1102,6 @@ static void ib_umad_kill_port(struct ib_umad_port *port)
 
         list_for_each_entry(file, &port->file_list, port_list) {
                 mutex_lock(&file->mutex);
-                already_dead = file->agents_dead;
                 file->agents_dead = 1;
                 mutex_unlock(&file->mutex);
 
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index a7da9be43e61..e0fa22238715 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -310,8 +310,8 @@ EXPORT_SYMBOL(ib_create_qp);
 
 static const struct {
         int                     valid;
-        enum ib_qp_attr_mask    req_param[IB_QPT_RAW_ETY + 1];
-        enum ib_qp_attr_mask    opt_param[IB_QPT_RAW_ETY + 1];
+        enum ib_qp_attr_mask    req_param[IB_QPT_RAW_ETHERTYPE + 1];
+        enum ib_qp_attr_mask    opt_param[IB_QPT_RAW_ETHERTYPE + 1];
 } qp_state_table[IB_QPS_ERR + 1][IB_QPS_ERR + 1] = {
         [IB_QPS_RESET] = {
                 [IB_QPS_RESET] = { .valid = 1 },
diff --git a/drivers/infiniband/hw/cxgb3/iwch_cm.c b/drivers/infiniband/hw/cxgb3/iwch_cm.c
index ebfb117ba68b..3cdb535c03dd 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_cm.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_cm.c
@@ -137,7 +137,7 @@ static void stop_ep_timer(struct iwch_ep *ep)
         put_ep(&ep->com);
 }
 
-int iwch_l2t_send(struct t3cdev *tdev, struct sk_buff *skb, struct l2t_entry *l2e)
+static int iwch_l2t_send(struct t3cdev *tdev, struct sk_buff *skb, struct l2t_entry *l2e)
 {
         int     error = 0;
         struct cxio_rdev *rdev;
diff --git a/drivers/infiniband/hw/cxgb3/iwch_qp.c b/drivers/infiniband/hw/cxgb3/iwch_qp.c
index ae47bfd22bd5..6adc13fc1e4c 100644
--- a/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@ -371,7 +371,7 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr,
         }
         num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr,
                   qhp->wq.sq_size_log2);
-        if (num_wrs <= 0) {
+        if (num_wrs == 0) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
                 err = -ENOMEM;
                 goto out;
@@ -554,7 +554,7 @@ int iwch_bind_mw(struct ib_qp *qp,
         }
         num_wrs = Q_FREECNT(qhp->wq.sq_rptr, qhp->wq.sq_wptr,
                             qhp->wq.sq_size_log2);
-        if ((num_wrs) <= 0) {
+        if (num_wrs == 0) {
                 spin_unlock_irqrestore(&qhp->lock, flag);
                 return -ENOMEM;
         }
diff --git a/drivers/infiniband/hw/ehca/ehca_eq.c b/drivers/infiniband/hw/ehca/ehca_eq.c
index 3b87589b8ea0..d9b1bb40f480 100644
--- a/drivers/infiniband/hw/ehca/ehca_eq.c
+++ b/drivers/infiniband/hw/ehca/ehca_eq.c
@@ -122,21 +122,21 @@ int ehca_create_eq(struct ehca_shca *shca,
 
         /* register interrupt handlers and initialize work queues */
         if (type == EHCA_EQ) {
+                tasklet_init(&eq->interrupt_task, ehca_tasklet_eq, (long)shca);
+
                 ret = ibmebus_request_irq(eq->ist, ehca_interrupt_eq,
                                           IRQF_DISABLED, "ehca_eq",
                                           (void *)shca);
                 if (ret < 0)
                         ehca_err(ib_dev, "Can't map interrupt handler.");
-
-                tasklet_init(&eq->interrupt_task, ehca_tasklet_eq, (long)shca);
         } else if (type == EHCA_NEQ) {
+                tasklet_init(&eq->interrupt_task, ehca_tasklet_neq, (long)shca);
+
                 ret = ibmebus_request_irq(eq->ist, ehca_interrupt_neq,
                                           IRQF_DISABLED, "ehca_neq",
                                           (void *)shca);
                 if (ret < 0)
                         ehca_err(ib_dev, "Can't map interrupt handler.");
-
-                tasklet_init(&eq->interrupt_task, ehca_tasklet_neq, (long)shca);
         }
 
         eq->is_initialized = 1;
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index ecb51b396c42..cfc4de7a5da4 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -360,7 +360,8 @@ static int ehca_sense_attributes(struct ehca_shca *shca)
          * a firmware property, so it's valid across all adapters
          */
         if (ehca_lock_hcalls == -1)
-                ehca_lock_hcalls = !(shca->hca_cap & HCA_CAP_H_ALLOC_RES_SYNC);
+                ehca_lock_hcalls = !EHCA_BMASK_GET(HCA_CAP_H_ALLOC_RES_SYNC,
+                                        shca->hca_cap);
 
         /* translate supported MR page sizes; always support 4K */
         shca->hca_cap_mr_pgsize = EHCA_PAGESIZE;
diff --git a/drivers/infiniband/hw/ehca/ehca_mrmw.c b/drivers/infiniband/hw/ehca/ehca_mrmw.c
index 31a68b9c52d0..53f4cd4fc19a 100644
--- a/drivers/infiniband/hw/ehca/ehca_mrmw.c
+++ b/drivers/infiniband/hw/ehca/ehca_mrmw.c
@@ -933,11 +933,6 @@ int ehca_unmap_fmr(struct list_head *fmr_list)
         /* check all FMR belong to same SHCA, and check internal flag */
         list_for_each_entry(ib_fmr, fmr_list, list) {
                 prev_shca = shca;
-                if (!ib_fmr) {
-                        ehca_gen_err("bad fmr=%p in list", ib_fmr);
-                        ret = -EINVAL;
-                        goto unmap_fmr_exit0;
-                }
                 shca = container_of(ib_fmr->device, struct ehca_shca,
                                     ib_device);
                 e_fmr = container_of(ib_fmr, struct ehca_mr, ib.ib_fmr);
diff --git a/drivers/infiniband/hw/ehca/ehca_qp.c b/drivers/infiniband/hw/ehca/ehca_qp.c
index 47d388ec1cde..32fb34201aba 100644
--- a/drivers/infiniband/hw/ehca/ehca_qp.c
+++ b/drivers/infiniband/hw/ehca/ehca_qp.c
@@ -251,7 +251,7 @@ static inline int ibqptype2servicetype(enum ib_qp_type ibqptype)
                 return ST_UD;
         case IB_QPT_RAW_IPV6:
                 return -EINVAL;
-        case IB_QPT_RAW_ETY:
+        case IB_QPT_RAW_ETHERTYPE:
                 return -EINVAL;
         default:
                 ehca_gen_err("Invalid ibqptype=%x", ibqptype);
diff --git a/drivers/infiniband/hw/ehca/hcp_if.c b/drivers/infiniband/hw/ehca/hcp_if.c
index 4d5dc3304d42..e6f9cdd94c7a 100644
--- a/drivers/infiniband/hw/ehca/hcp_if.c
+++ b/drivers/infiniband/hw/ehca/hcp_if.c
@@ -269,6 +269,7 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle,
                              struct ehca_cq *cq,
                              struct ehca_alloc_cq_parms *param)
 {
+        int rc;
         u64 ret;
         unsigned long outs[PLPAR_HCALL9_BUFSIZE];
 
@@ -283,8 +284,19 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle,
         param->act_nr_of_entries = (u32)outs[3];
         param->act_pages = (u32)outs[4];
 
-        if (ret == H_SUCCESS)
-                hcp_galpas_ctor(&cq->galpas, 0, outs[5], outs[6]);
+        if (ret == H_SUCCESS) {
+                rc = hcp_galpas_ctor(&cq->galpas, 0, outs[5], outs[6]);
+                if (rc) {
+                        ehca_gen_err("Could not establish HW access. rc=%d paddr=%#lx",
+                                     rc, outs[5]);
+
+                        ehca_plpar_hcall_norets(H_FREE_RESOURCE,
+                                                adapter_handle.handle,     /* r4 */
+                                                cq->ipz_cq_handle.handle,  /* r5 */
+                                                0, 0, 0, 0, 0);
+                        ret = H_NO_MEM;
+                }
+        }
 
         if (ret == H_NOT_ENOUGH_RESOURCES)
                 ehca_gen_err("Not enough resources. ret=%lli", ret);
@@ -295,6 +307,7 @@ u64 hipz_h_alloc_resource_cq(const struct ipz_adapter_handle adapter_handle,
 u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle,
                              struct ehca_alloc_qp_parms *parms, int is_user)
 {
+        int rc;
         u64 ret;
         u64 allocate_controls, max_r10_reg, r11, r12;
         unsigned long outs[PLPAR_HCALL9_BUFSIZE];
@@ -358,8 +371,19 @@ u64 hipz_h_alloc_resource_qp(const struct ipz_adapter_handle adapter_handle,
         parms->rqueue.queue_size =
                 (u32)EHCA_BMASK_GET(H_ALL_RES_QP_RQUEUE_SIZE_PAGES, outs[4]);
 
-        if (ret == H_SUCCESS)
-                hcp_galpas_ctor(&parms->galpas, is_user, outs[6], outs[6]);
+        if (ret == H_SUCCESS) {
+                rc = hcp_galpas_ctor(&parms->galpas, is_user, outs[6], outs[6]);
+                if (rc) {
+                        ehca_gen_err("Could not establish HW access. rc=%d paddr=%#lx",
+                                     rc, outs[6]);
+
+                        ehca_plpar_hcall_norets(H_FREE_RESOURCE,
+                                                adapter_handle.handle,     /* r4 */
+                                                parms->qp_handle.handle,  /* r5 */
+                                                0, 0, 0, 0, 0);
+                        ret = H_NO_MEM;
+                }
+        }
 
         if (ret == H_NOT_ENOUGH_RESOURCES)
                 ehca_gen_err("Not enough resources. ret=%lli", ret);
diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.c b/drivers/infiniband/hw/ehca/hcp_phyp.c
index b3e0e72e8a73..077376ff3d28 100644
--- a/drivers/infiniband/hw/ehca/hcp_phyp.c
+++ b/drivers/infiniband/hw/ehca/hcp_phyp.c
@@ -42,10 +42,9 @@
 #include "ehca_classes.h"
 #include "hipz_hw.h"
 
-int hcall_map_page(u64 physaddr, u64 *mapaddr)
+u64 hcall_map_page(u64 physaddr)
 {
-        *mapaddr = (u64)(ioremap(physaddr, EHCA_PAGESIZE));
-        return 0;
+        return (u64)ioremap(physaddr, EHCA_PAGESIZE);
 }
 
 int hcall_unmap_page(u64 mapaddr)
@@ -58,9 +57,9 @@ int hcp_galpas_ctor(struct h_galpas *galpas, int is_user,
                     u64 paddr_kernel, u64 paddr_user)
 {
         if (!is_user) {
-                int ret = hcall_map_page(paddr_kernel, &galpas->kernel.fw_handle);
-                if (ret)
-                        return ret;
+                galpas->kernel.fw_handle = hcall_map_page(paddr_kernel);
+                if (!galpas->kernel.fw_handle)
+                        return -ENOMEM;
         } else
                 galpas->kernel.fw_handle = 0;
 
diff --git a/drivers/infiniband/hw/ehca/hcp_phyp.h b/drivers/infiniband/hw/ehca/hcp_phyp.h
index 204227d5303a..d1b029910249 100644
--- a/drivers/infiniband/hw/ehca/hcp_phyp.h
+++ b/drivers/infiniband/hw/ehca/hcp_phyp.h
@@ -83,7 +83,7 @@ int hcp_galpas_ctor(struct h_galpas *galpas, int is_user,
 
 int hcp_galpas_dtor(struct h_galpas *galpas);
 
-int hcall_map_page(u64 physaddr, u64 * mapaddr);
+u64 hcall_map_page(u64 physaddr);
 
 int hcall_unmap_page(u64 mapaddr);
 
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
index 21337468c652..765f0fc1da76 100644
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
@@ -390,6 +390,8 @@ done:
         ipath_enable_armlaunch(dd);
 }
 
+static void cleanup_device(struct ipath_devdata *dd);
+
 static int __devinit ipath_init_one(struct pci_dev *pdev,
                                     const struct pci_device_id *ent)
 {
@@ -616,8 +618,13 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
         goto bail;
 
 bail_irqsetup:
-        if (pdev->irq)
-                free_irq(pdev->irq, dd);
+        cleanup_device(dd);
+
+        if (dd->ipath_irq)
+                dd->ipath_f_free_irq(dd);
+
+        if (dd->ipath_f_cleanup)
+                dd->ipath_f_cleanup(dd);
 
 bail_iounmap:
         iounmap((volatile void __iomem *) dd->ipath_kregbase);
@@ -635,7 +642,7 @@ bail:
         return ret;
 }
 
-static void __devexit cleanup_device(struct ipath_devdata *dd)
+static void cleanup_device(struct ipath_devdata *dd)
 {
         int port;
         struct ipath_portdata **tmp;
diff --git a/drivers/infiniband/hw/mthca/mthca_cmd.c b/drivers/infiniband/hw/mthca/mthca_cmd.c
index 3603ae89b606..f4ceecd9684b 100644
--- a/drivers/infiniband/hw/mthca/mthca_cmd.c
+++ b/drivers/infiniband/hw/mthca/mthca_cmd.c
@@ -1817,7 +1817,7 @@ int mthca_CONF_SPECIAL_QP(struct mthca_dev *dev, int type, u32 qpn,
         case IB_QPT_RAW_IPV6:
                 op_mod = 2;
                 break;
-        case IB_QPT_RAW_ETY:
+        case IB_QPT_RAW_ETHERTYPE:
                 op_mod = 3;
                 break;
         default:
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index de7b9d7166f3..0c9f0aa5d4ea 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -110,8 +110,8 @@ static unsigned int sysfs_nonidx_addr;
 static unsigned int sysfs_idx_addr;
 
 static struct pci_device_id nes_pci_table[] = {
-        {PCI_VENDOR_ID_NETEFFECT, PCI_DEVICE_ID_NETEFFECT_NE020, PCI_ANY_ID, PCI_ANY_ID},
-        {PCI_VENDOR_ID_NETEFFECT, PCI_DEVICE_ID_NETEFFECT_NE020_KR, PCI_ANY_ID, PCI_ANY_ID},
+        { PCI_VDEVICE(NETEFFECT, PCI_DEVICE_ID_NETEFFECT_NE020), },
+        { PCI_VDEVICE(NETEFFECT, PCI_DEVICE_ID_NETEFFECT_NE020_KR), },
         {0}
 };
 
@@ -259,13 +259,11 @@ static void nes_cqp_rem_ref_callback(struct nes_device *nesdev, struct nes_cqp_r
         unsigned long flags;
         struct nes_qp *nesqp = cqp_request->cqp_callback_pointer;
         struct nes_adapter *nesadapter = nesdev->nesadapter;
-        u32 qp_id;
 
         atomic_inc(&qps_destroyed);
 
         /* Free the control structures */
 
-        qp_id = nesqp->hwqp.qp_id;
         if (nesqp->pbl_vbase) {
                 pci_free_consistent(nesdev->pcidev, nesqp->qp_mem_size,
                                 nesqp->hwqp.q2_vbase, nesqp->hwqp.q2_pbase);
@@ -441,7 +439,6 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
         struct net_device *netdev = NULL;
         struct nes_device *nesdev = NULL;
         int ret = 0;
-        struct nes_vnic *nesvnic = NULL;
         void __iomem *mmio_regs = NULL;
         u8 hw_rev;
 
@@ -664,25 +661,21 @@ static int __devinit nes_probe(struct pci_dev *pcidev, const struct pci_device_i
         nes_notifiers_registered++;
 
         /* Initialize network devices */
-                if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL) {
-                        goto bail7;
-                }
-
-                /* Register network device */
-                ret = register_netdev(netdev);
-                if (ret) {
-                        printk(KERN_ERR PFX "Unable to register netdev, ret = %d\n", ret);
-                        nes_netdev_destroy(netdev);
-                        goto bail7;
-                }
+        if ((netdev = nes_netdev_init(nesdev, mmio_regs)) == NULL)
+                goto bail7;
 
-                nes_print_macaddr(netdev);
-                /* create a CM core for this netdev */
-                nesvnic = netdev_priv(netdev);
+        /* Register network device */
+        ret = register_netdev(netdev);
+        if (ret) {
+                printk(KERN_ERR PFX "Unable to register netdev, ret = %d\n", ret);
+                nes_netdev_destroy(netdev);
+                goto bail7;
+        }
 
-                nesdev->netdev_count++;
-                nesdev->nesadapter->netdev_count++;
+        nes_print_macaddr(netdev);
 
+        nesdev->netdev_count++;
+        nesdev->nesadapter->netdev_count++;
 
         printk(KERN_ERR PFX "%s: NetEffect RNIC driver successfully loaded.\n",
                         pci_name(pcidev));
@@ -1104,7 +1097,7 @@ static ssize_t nes_show_wqm_quanta(struct device_driver *ddp, char *buf)
                 i++;
         }
 
-        return  snprintf(buf, PAGE_SIZE, "0x%X\n", wqm_quanta);
+        return  snprintf(buf, PAGE_SIZE, "0x%X\n", wqm_quanta_value);
 }
 
 
diff --git a/drivers/infiniband/hw/nes/nes.h b/drivers/infiniband/hw/nes/nes.h
index cc78fee1dd51..b3d145e82b4c 100644
--- a/drivers/infiniband/hw/nes/nes.h
+++ b/drivers/infiniband/hw/nes/nes.h
@@ -262,6 +262,7 @@ struct nes_device {
         u16                    base_doorbell_index;
         u16                    currcq_count;
         u16                    deepcq_count;
+        u8                     iw_status;
         u8                     msi_enabled;
         u8                     netdev_count;
         u8                     napi_isr_ran;
@@ -527,6 +528,7 @@ void nes_cm_disconn_worker(void *);
 int nes_hw_modify_qp(struct nes_device *, struct nes_qp *, u32, u32, u32);
 int nes_modify_qp(struct ib_qp *, struct ib_qp_attr *, int, struct ib_udata *);
 struct nes_ib_device *nes_init_ofa_device(struct net_device *);
+void  nes_port_ibevent(struct nes_vnic *nesvnic);
 void nes_destroy_ofa_device(struct nes_ib_device *);
 int nes_register_ofa_device(struct nes_ib_device *);
 
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 986d6f32dded..8bc11e183803 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1719,8 +1719,6 @@ static int handle_ack_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
 {
         int datasize = 0;
         u32 inc_sequence;
-        u32 rem_seq_ack;
-        u32 rem_seq;
         int ret = 0;
         int optionsize;
         optionsize = (tcph->doff << 2) - sizeof(struct tcphdr);
@@ -1730,8 +1728,6 @@ static int handle_ack_pkt(struct nes_cm_node *cm_node, struct sk_buff *skb,
 
         skb_pull(skb, tcph->doff << 2);
         inc_sequence = ntohl(tcph->seq);
-        rem_seq = ntohl(tcph->seq);
-        rem_seq_ack =  ntohl(tcph->ack_seq);
         datasize = skb->len;
         switch (cm_node->state) {
         case NES_CM_STATE_SYN_RCVD:
@@ -2565,7 +2561,7 @@ static int nes_cm_disconn_true(struct nes_qp *nesqp)
         u16 last_ae;
         u8 original_hw_tcp_state;
         u8 original_ibqp_state;
-        enum iw_cm_event_type disconn_status = IW_CM_EVENT_STATUS_OK;
+        enum iw_cm_event_status disconn_status = IW_CM_EVENT_STATUS_OK;
         int issue_disconn = 0;
         int issue_close = 0;
         int issue_flush = 0;
@@ -3128,17 +3124,15 @@ int nes_create_listen(struct iw_cm_id *cm_id, int backlog)
         struct nes_vnic *nesvnic;
         struct nes_cm_listener *cm_node;
         struct nes_cm_info cm_info;
-        struct nes_adapter *adapter;
         int err;
 
-
         nes_debug(NES_DBG_CM, "cm_id = %p, local port = 0x%04X.\n",
                         cm_id, ntohs(cm_id->local_addr.sin_port));
 
         nesvnic = to_nesvnic(cm_id->device);
         if (!nesvnic)
                 return -EINVAL;
-        adapter = nesvnic->nesdev->nesadapter;
+
         nes_debug(NES_DBG_CM, "nesvnic=%p, netdev=%p, %s\n",
                         nesvnic, nesvnic->netdev, nesvnic->netdev->name);
 
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 57874a165083..f8233c851c69 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -1970,7 +1970,7 @@ void nes_destroy_nic_qp(struct nes_vnic *nesvnic)
                         dev_kfree_skb(
                                 nesvnic->nic.tx_skb[nesvnic->nic.sq_tail]);
 
-                nesvnic->nic.sq_tail = (++nesvnic->nic.sq_tail)
+                nesvnic->nic.sq_tail = (nesvnic->nic.sq_tail + 1)
                                         & (nesvnic->nic.sq_size - 1);
         }
 
@@ -2737,9 +2737,9 @@ void nes_nic_ce_handler(struct nes_device *nesdev, struct nes_hw_nic_cq *cq)
                                 nesnic->sq_tail &= nesnic->sq_size-1;
                                 if (sq_cqes > 128) {
                                         barrier();
-                                /* restart the queue if it had been stopped */
-                                if (netif_queue_stopped(nesvnic->netdev))
-                                        netif_wake_queue(nesvnic->netdev);
+                                        /* restart the queue if it had been stopped */
+                                        if (netif_queue_stopped(nesvnic->netdev))
+                                                netif_wake_queue(nesvnic->netdev);
                                         sq_cqes = 0;
                                 }
                         } else {
@@ -2999,11 +2999,8 @@ static void nes_cqp_ce_handler(struct nes_device *nesdev, struct nes_hw_cq *cq)
 
 static u8 *locate_mpa(u8 *pkt, u32 aeq_info)
 {
-        u16 pkt_len;
-
         if (aeq_info & NES_AEQE_Q2_DATA_ETHERNET) {
                 /* skip over ethernet header */
-                pkt_len = be16_to_cpu(*(u16 *)(pkt + ETH_HLEN - 2));
                 pkt += ETH_HLEN;
 
                 /* Skip over IP and TCP headers */
@@ -3283,9 +3280,15 @@ static void nes_terminate_connection(struct nes_device *nesdev, struct nes_qp *n
         else
                 mod_qp_flags |= NES_CQP_QP_TERM_DONT_SEND_TERM_MSG;
 
-        nes_terminate_start_timer(nesqp);
-        nesqp->term_flags |= NES_TERM_SENT;
-        nes_hw_modify_qp(nesdev, nesqp, mod_qp_flags, termlen, 0);
+        if (!nesdev->iw_status)  {
+                nesqp->term_flags = NES_TERM_DONE;
+                nes_hw_modify_qp(nesdev, nesqp, NES_CQP_QP_IWARP_STATE_ERROR, 0, 0);
+                nes_cm_disconn(nesqp);
+        } else {
+                nes_terminate_start_timer(nesqp);
+                nesqp->term_flags |= NES_TERM_SENT;
+                nes_hw_modify_qp(nesdev, nesqp, mod_qp_flags, termlen, 0);
+        }
 }
 
 static void nes_terminate_send_fin(struct nes_device *nesdev,
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
index bbbfe9fc5a5a..aa9183db32b1 100644
--- a/drivers/infiniband/hw/nes/nes_hw.h
+++ b/drivers/infiniband/hw/nes/nes_hw.h
@@ -1100,11 +1100,12 @@ struct nes_adapter {
         u32 wqm_wat;
         u32 core_clock;
         u32 firmware_version;
+        u32 eeprom_version;
 
         u32 nic_rx_eth_route_err;
 
         u32 et_rx_coalesce_usecs;
-        u32     et_rx_max_coalesced_frames;
+        u32 et_rx_max_coalesced_frames;
         u32 et_rx_coalesce_usecs_irq;
         u32 et_rx_max_coalesced_frames_irq;
         u32 et_pkt_rate_low;
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 5cc0a9ae5bb1..1901ec789696 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -232,6 +232,13 @@ static int nes_netdev_open(struct net_device *netdev)
                                 NES_MAC_INT_TX_UNDERFLOW | NES_MAC_INT_TX_ERROR));
                 first_nesvnic = nesvnic;
         }
+
+        if (nesvnic->of_device_registered) {
+                nesdev->iw_status = 1;
+                nesdev->nesadapter->send_term_ok = 1;
+                nes_port_ibevent(nesvnic);
+        }
+
         if (first_nesvnic->linkup) {
                 /* Enable network packets */
                 nesvnic->linkup = 1;
@@ -309,9 +316,9 @@ static int nes_netdev_stop(struct net_device *netdev)
 
 
         if (nesvnic->of_device_registered) {
-                nes_destroy_ofa_device(nesvnic->nesibdev);
-                nesvnic->nesibdev = NULL;
-                nesvnic->of_device_registered = 0;
+                nesdev->nesadapter->send_term_ok = 0;
+                nesdev->iw_status = 0;
+                nes_port_ibevent(nesvnic);
         }
         nes_destroy_nic_qp(nesvnic);
 
@@ -463,7 +470,6 @@ static int nes_netdev_start_xmit(struct sk_buff *skb, struct net_device *netdev)
         u16 nhoffset;
         u16 wqes_needed;
         u16 wqes_available;
-        u32 old_head;
         u32 wqe_misc;
 
         /*
@@ -503,7 +509,6 @@ sq_no_longer_full:
                 if (skb_is_gso(skb)) {
                         nesvnic->segmented_tso_requests++;
                         nesvnic->tso_requests++;
-                        old_head = nesnic->sq_head;
                         /* Basically 4 fragments available per WQE with extended fragments */
                         wqes_needed = nr_frags >> 2;
                         wqes_needed += (nr_frags&3)?1:0;
diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index a9f5dd272f1a..f9c417c6b3b3 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -190,6 +190,11 @@ int nes_read_eeprom_values(struct nes_device *nesdev, struct nes_adapter *nesada
                 nesadapter->firmware_version = (((u32)(u8)(eeprom_data>>8))  <<  16) +
                                 (u32)((u8)eeprom_data);
 
+                eeprom_data = nes_read16_eeprom(nesdev->regs, next_section_address + 10);
+                printk(PFX "EEPROM version %u.%u\n", (u8)(eeprom_data>>8), (u8)eeprom_data);
+                nesadapter->eeprom_version = (((u32)(u8)(eeprom_data>>8)) << 16) +
+                                (u32)((u8)eeprom_data);
+
 no_fw_rev:
                 /* eeprom is valid */
                 eeprom_offset = nesadapter->software_eeprom_offset;
diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 9bc2d744b2ea..9046e6675686 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -518,7 +518,7 @@ static int nes_query_device(struct ib_device *ibdev, struct ib_device_attr *prop
         memset(props, 0, sizeof(*props));
         memcpy(&props->sys_image_guid, nesvnic->netdev->dev_addr, 6);
 
-        props->fw_ver = nesdev->nesadapter->fw_ver;
+        props->fw_ver = nesdev->nesadapter->firmware_version;
         props->device_cap_flags = nesdev->nesadapter->device_cap_flags;
         props->vendor_id = nesdev->nesadapter->vendor_id;
         props->vendor_part_id = nesdev->nesadapter->vendor_part_id;
@@ -1941,7 +1941,7 @@ static int nes_reg_mr(struct nes_device *nesdev, struct nes_pd *nespd,
         u8  use_256_pbls = 0;
         u8  use_4k_pbls = 0;
         u16 use_two_level = (pbl_count_4k > 1) ? 1 : 0;
-        struct nes_root_vpbl new_root = {0, 0, 0};
+        struct nes_root_vpbl new_root = { 0, NULL, NULL };
         u32 opcode = 0;
         u16 major_code;
 
@@ -2112,13 +2112,12 @@ static struct ib_mr *nes_reg_phys_mr(struct ib_pd *ib_pd,
         u32 driver_key = 0;
         u32 root_pbl_index = 0;
         u32 cur_pbl_index = 0;
-        int err = 0, pbl_depth = 0;
+        int err = 0;
         int ret = 0;
         u16 pbl_count = 0;
         u8 single_page = 1;
         u8 stag_key = 0;
 
-        pbl_depth = 0;
         region_length = 0;
         vpbl.pbl_vbase = NULL;
         root_vpbl.pbl_vbase = NULL;
@@ -2931,7 +2930,6 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
         int ret;
         u16 original_last_aeq;
         u8 issue_modify_qp = 0;
-        u8 issue_disconnect = 0;
         u8 dont_wait = 0;
 
         nes_debug(NES_DBG_MOD_QP, "QP%u: QP State=%u, cur QP State=%u,"
@@ -3058,6 +3056,7 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                                                 nesqp->hte_added = 0;
                                         }
                                 if ((nesqp->hw_tcp_state > NES_AEQE_TCP_STATE_CLOSED) &&
+                                                (nesdev->iw_status) &&
                                                 (nesqp->hw_tcp_state != NES_AEQE_TCP_STATE_TIME_WAIT)) {
                                         next_iwarp_state |= NES_CQP_QP_RESET;
                                 } else {
@@ -3082,7 +3081,6 @@ int nes_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr,
                         nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
                         nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",
                                         nesqp->iwarp_state);
-                        issue_disconnect = 1;
                 } else {
                         nesqp->iwarp_state = next_iwarp_state & NES_CQP_QP_IWARP_STATE_MASK;
                         nes_debug(NES_DBG_MOD_QP, "Change nesqp->iwarp_state=%08x\n",
@@ -3936,6 +3934,17 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
         return nesibdev;
 }
 
+void  nes_port_ibevent(struct nes_vnic *nesvnic)
+{
+        struct nes_ib_device *nesibdev = nesvnic->nesibdev;
+        struct nes_device *nesdev = nesvnic->nesdev;
+        struct ib_event event;
+        event.device = &nesibdev->ibdev;
+        event.element.port_num = nesvnic->logical_port + 1;
+        event.event = nesdev->iw_status ? IB_EVENT_PORT_ACTIVE : IB_EVENT_PORT_ERR;
+        ib_dispatch_event(&event);
+}
+
 
 /**
  * nes_destroy_ofa_device
diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 3593983df7ba..61de0654820e 100644
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -45,6 +45,7 @@
 #include <linux/mutex.h>
 #include <linux/list.h>
 #include <linux/scatterlist.h>
+#include <linux/slab.h>
 #include <linux/io.h>
 #include <linux/fs.h>
 #include <linux/completion.h>
@@ -326,6 +327,9 @@ struct qib_verbs_txreq {
 
 #define QIB_DEFAULT_MTU 4096
 
+/* max number of IB ports supported per HCA */
+#define QIB_MAX_IB_PORTS 2
+
 /*
  * Possible IB config parameters for f_get/set_ib_table()
  */
diff --git a/drivers/infiniband/hw/qib/qib_common.h b/drivers/infiniband/hw/qib/qib_common.h
index b3955ed8f794..145da4040883 100644
--- a/drivers/infiniband/hw/qib/qib_common.h
+++ b/drivers/infiniband/hw/qib/qib_common.h
@@ -279,7 +279,7 @@ struct qib_base_info {
  * may not be implemented; the user code must deal with this if it
  * cares, or it must abort after initialization reports the difference.
  */
-#define QIB_USER_SWMINOR 10
+#define QIB_USER_SWMINOR 11
 
 #define QIB_USER_SWVERSION ((QIB_USER_SWMAJOR << 16) | QIB_USER_SWMINOR)
 
@@ -302,6 +302,18 @@ struct qib_base_info {
 #define QIB_KERN_SWVERSION ((QIB_KERN_TYPE << 31) | QIB_USER_SWVERSION)
 
 /*
+ * If the unit is specified via open, HCA choice is fixed.  If port is
+ * specified, it's also fixed.  Otherwise we try to spread contexts
+ * across ports and HCAs, using different algorithims.  WITHIN is
+ * the old default, prior to this mechanism.
+ */
+#define QIB_PORT_ALG_ACROSS 0 /* round robin contexts across HCAs, then
+                               * ports; this is the default */
+#define QIB_PORT_ALG_WITHIN 1 /* use all contexts on an HCA (round robin
+                               * active ports within), then next HCA */
+#define QIB_PORT_ALG_COUNT 2 /* number of algorithm choices */
+
+/*
  * This structure is passed to qib_userinit() to tell the driver where
  * user code buffers are, sizes, etc.   The offsets and sizes of the
  * fields must remain unchanged, for binary compatibility.  It can
@@ -319,7 +331,7 @@ struct qib_user_info {
         /* size of struct base_info to write to */
         __u32 spu_base_info_size;
 
-        __u32 _spu_unused3;
+        __u32 spu_port_alg; /* which QIB_PORT_ALG_*; unused user minor < 11 */
 
         /*
          * If two or more processes wish to share a context, each process
diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c
index f15ce076ac49..9cd193603fb1 100644
--- a/drivers/infiniband/hw/qib/qib_driver.c
+++ b/drivers/infiniband/hw/qib/qib_driver.c
@@ -335,7 +335,7 @@ u32 qib_kreceive(struct qib_ctxtdata *rcd, u32 *llic, u32 *npkts)
                 smp_rmb();  /* prevent speculative reads of dma'ed hdrq */
         }
 
-        for (last = 0, i = 1; !last; i += !last) {
+        for (last = 0, i = 1; !last && i <= 64; i += !last) {
                 hdr = dd->f_get_msgheader(dd, rhf_addr);
                 eflags = qib_hdrget_err_flags(rhf_addr);
                 etype = qib_hdrget_rcv_type(rhf_addr);
diff --git a/drivers/infiniband/hw/qib/qib_file_ops.c b/drivers/infiniband/hw/qib/qib_file_ops.c
index a142a9eb5226..6b11645edf35 100644
--- a/drivers/infiniband/hw/qib/qib_file_ops.c
+++ b/drivers/infiniband/hw/qib/qib_file_ops.c
@@ -1294,128 +1294,130 @@ bail:
         return ret;
 }
 
-static inline int usable(struct qib_pportdata *ppd, int active_only)
+static inline int usable(struct qib_pportdata *ppd)
 {
         struct qib_devdata *dd = ppd->dd;
-        u32 linkok = active_only ? QIBL_LINKACTIVE :
-                 (QIBL_LINKINIT | QIBL_LINKARMED | QIBL_LINKACTIVE);
 
         return dd && (dd->flags & QIB_PRESENT) && dd->kregbase && ppd->lid &&
-                (ppd->lflags & linkok);
+                (ppd->lflags & QIBL_LINKACTIVE);
 }
 
-static int find_free_ctxt(int unit, struct file *fp,
-                          const struct qib_user_info *uinfo)
+/*
+ * Select a context on the given device, either using a requested port
+ * or the port based on the context number.
+ */
+static int choose_port_ctxt(struct file *fp, struct qib_devdata *dd, u32 port,
+                            const struct qib_user_info *uinfo)
 {
-        struct qib_devdata *dd = qib_lookup(unit);
         struct qib_pportdata *ppd = NULL;
-        int ret;
-        u32 ctxt;
+        int ret, ctxt;
 
-        if (!dd || (uinfo->spu_port && uinfo->spu_port > dd->num_pports)) {
-                ret = -ENODEV;
-                goto bail;
-        }
-
-        /*
-         * If users requests specific port, only try that one port, else
-         * select "best" port below, based on context.
-         */
-        if (uinfo->spu_port) {
-                ppd = dd->pport + uinfo->spu_port - 1;
-                if (!usable(ppd, 0)) {
+        if (port) {
+                if (!usable(dd->pport + port - 1)) {
                         ret = -ENETDOWN;
-                        goto bail;
-                }
+                        goto done;
+                } else
+                        ppd = dd->pport + port - 1;
         }
-
-        for (ctxt = dd->first_user_ctxt; ctxt < dd->cfgctxts; ctxt++) {
-                if (dd->rcd[ctxt])
-                        continue;
-                /*
-                 * The setting and clearing of user context rcd[x] protected
-                 * by the qib_mutex
-                 */
-                if (!ppd) {
-                        /* choose port based on ctxt, if up, else 1st up */
-                        ppd = dd->pport + (ctxt % dd->num_pports);
-                        if (!usable(ppd, 0)) {
-                                int i;
-                                for (i = 0; i < dd->num_pports; i++) {
-                                        ppd = dd->pport + i;
-                                        if (usable(ppd, 0))
-                                                break;
-                                }
-                                if (i == dd->num_pports) {
-                                        ret = -ENETDOWN;
-                                        goto bail;
-                                }
-                        }
+        for (ctxt = dd->first_user_ctxt; ctxt < dd->cfgctxts && dd->rcd[ctxt];
+             ctxt++)
+                ;
+        if (ctxt == dd->cfgctxts) {
+                ret = -EBUSY;
+                goto done;
+        }
+        if (!ppd) {
+                u32 pidx = ctxt % dd->num_pports;
+                if (usable(dd->pport + pidx))
+                        ppd = dd->pport + pidx;
+                else {
+                        for (pidx = 0; pidx < dd->num_pports && !ppd;
+                             pidx++)
+                                if (usable(dd->pport + pidx))
+                                        ppd = dd->pport + pidx;
                 }
-                ret = setup_ctxt(ppd, ctxt, fp, uinfo);
-                goto bail;
         }
-        ret = -EBUSY;
+        ret = ppd ? setup_ctxt(ppd, ctxt, fp, uinfo) : -ENETDOWN;
+done:
+        return ret;
+}
+
+static int find_free_ctxt(int unit, struct file *fp,
+                          const struct qib_user_info *uinfo)
+{
+        struct qib_devdata *dd = qib_lookup(unit);
+        int ret;
+
+        if (!dd || (uinfo->spu_port && uinfo->spu_port > dd->num_pports))
+                ret = -ENODEV;
+        else
+                ret = choose_port_ctxt(fp, dd, uinfo->spu_port, uinfo);
 
-bail:
         return ret;
 }
 
-static int get_a_ctxt(struct file *fp, const struct qib_user_info *uinfo)
+static int get_a_ctxt(struct file *fp, const struct qib_user_info *uinfo,
+                      unsigned alg)
 {
-        struct qib_pportdata *ppd;
-        int ret = 0, devmax;
-        int npresent, nup;
-        int ndev;
+        struct qib_devdata *udd = NULL;
+        int ret = 0, devmax, npresent, nup, ndev, dusable = 0, i;
         u32 port = uinfo->spu_port, ctxt;
 
         devmax = qib_count_units(&npresent, &nup);
+        if (!npresent) {
+                ret = -ENXIO;
+                goto done;
+        }
+        if (nup == 0) {
+                ret = -ENETDOWN;
+                goto done;
+        }
 
-        for (ndev = 0; ndev < devmax; ndev++) {
-                struct qib_devdata *dd = qib_lookup(ndev);
-
-                /* device portion of usable() */
-                if (!(dd && (dd->flags & QIB_PRESENT) && dd->kregbase))
-                        continue;
-                for (ctxt = dd->first_user_ctxt; ctxt < dd->cfgctxts; ctxt++) {
-                        if (dd->rcd[ctxt])
+        if (alg == QIB_PORT_ALG_ACROSS) {
+                unsigned inuse = ~0U;
+                /* find device (with ACTIVE ports) with fewest ctxts in use */
+                for (ndev = 0; ndev < devmax; ndev++) {
+                        struct qib_devdata *dd = qib_lookup(ndev);
+                        unsigned cused = 0, cfree = 0;
+                        if (!dd)
                                 continue;
-                        if (port) {
-                                if (port > dd->num_pports)
-                                        continue;
-                                ppd = dd->pport + port - 1;
-                                if (!usable(ppd, 0))
-                                        continue;
-                        } else {
-                                /*
-                                 * choose port based on ctxt, if up, else
-                                 * first port that's up for multi-port HCA
-                                 */
-                                ppd = dd->pport + (ctxt % dd->num_pports);
-                                if (!usable(ppd, 0)) {
-                                        int j;
-
-                                        ppd = NULL;
-                                        for (j = 0; j < dd->num_pports &&
-                                                !ppd; j++)
-                                                if (usable(dd->pport + j, 0))
-                                                        ppd = dd->pport + j;
-                                        if (!ppd)
-                                                continue; /* to next unit */
-                                }
+                        if (port && port <= dd->num_pports &&
+                            usable(dd->pport + port - 1))
+                                dusable = 1;
+                        else
+                                for (i = 0; i < dd->num_pports; i++)
+                                        if (usable(dd->pport + i))
+                                                dusable++;
+                        if (!dusable)
+                                continue;
+                        for (ctxt = dd->first_user_ctxt; ctxt < dd->cfgctxts;
+                             ctxt++)
+                                if (dd->rcd[ctxt])
+                                        cused++;
+                                else
+                                        cfree++;
+                        if (cfree && cused < inuse) {
+                                udd = dd;
+                                inuse = cused;
                         }
-                        ret = setup_ctxt(ppd, ctxt, fp, uinfo);
+                }
+                if (udd) {
+                        ret = choose_port_ctxt(fp, udd, port, uinfo);
                         goto done;
                 }
+        } else {
+                for (ndev = 0; ndev < devmax; ndev++) {
+                        struct qib_devdata *dd = qib_lookup(ndev);
+                        if (dd) {
+                                ret = choose_port_ctxt(fp, dd, port, uinfo);
+                                if (!ret)
+                                        goto done;
+                                if (ret == -EBUSY)
+                                        dusable++;
+                        }
+                }
         }
-
-        if (npresent) {
-                if (nup == 0)
-                        ret = -ENETDOWN;
-                else
-                        ret = -EBUSY;
-        } else
-                ret = -ENXIO;
+        ret = dusable ? -EBUSY : -ENETDOWN;
 
 done:
         return ret;
@@ -1481,7 +1483,7 @@ static int qib_assign_ctxt(struct file *fp, const struct qib_user_info *uinfo)
 {
         int ret;
         int i_minor;
-        unsigned swmajor, swminor;
+        unsigned swmajor, swminor, alg = QIB_PORT_ALG_ACROSS;
 
         /* Check to be sure we haven't already initialized this file */
         if (ctxt_fp(fp)) {
@@ -1498,6 +1500,9 @@ static int qib_assign_ctxt(struct file *fp, const struct qib_user_info *uinfo)
 
         swminor = uinfo->spu_userversion & 0xffff;
 
+        if (swminor >= 11 && uinfo->spu_port_alg < QIB_PORT_ALG_COUNT)
+                alg = uinfo->spu_port_alg;
+
         mutex_lock(&qib_mutex);
 
         if (qib_compatible_subctxts(swmajor, swminor) &&
@@ -1514,7 +1519,7 @@ static int qib_assign_ctxt(struct file *fp, const struct qib_user_info *uinfo)
         if (i_minor)
                 ret = find_free_ctxt(i_minor - 1, fp, uinfo);
         else
-                ret = get_a_ctxt(fp, uinfo);
+                ret = get_a_ctxt(fp, uinfo, alg);
 
 done_chk_sdma:
         if (!ret) {
@@ -1862,7 +1867,7 @@ static int disarm_req_delay(struct qib_ctxtdata *rcd)
 {
         int ret = 0;
 
-        if (!usable(rcd->ppd, 1)) {
+        if (!usable(rcd->ppd)) {
                 int i;
                 /*
                  * if link is down, or otherwise not usable, delay
@@ -1881,7 +1886,7 @@ static int disarm_req_delay(struct qib_ctxtdata *rcd)
                                 set_bit(_QIB_EVENT_DISARM_BUFS_BIT,
                                         &rcd->user_event_mask[i]);
                 }
-                for (i = 0; !usable(rcd->ppd, 1) && i < 300; i++)
+                for (i = 0; !usable(rcd->ppd) && i < 300; i++)
                         msleep(100);
                 ret = -ENETDOWN;
         }
diff --git a/drivers/infiniband/hw/qib/qib_fs.c b/drivers/infiniband/hw/qib/qib_fs.c
index 844954bf417b..9f989c0ba9d3 100644
--- a/drivers/infiniband/hw/qib/qib_fs.c
+++ b/drivers/infiniband/hw/qib/qib_fs.c
@@ -135,8 +135,8 @@ static ssize_t driver_names_read(struct file *file, char __user *buf,
 }
 
 static const struct file_operations driver_ops[] = {
-        { .read = driver_stats_read, },
-        { .read = driver_names_read, },
+        { .read = driver_stats_read, .llseek = generic_file_llseek, },
+        { .read = driver_names_read, .llseek = generic_file_llseek, },
 };
 
 /* read the per-device counters */
@@ -164,8 +164,8 @@ static ssize_t dev_names_read(struct file *file, char __user *buf,
 }
 
 static const struct file_operations cntr_ops[] = {
-        { .read = dev_counters_read, },
-        { .read = dev_names_read, },
+        { .read = dev_counters_read, .llseek = generic_file_llseek, },
+        { .read = dev_names_read, .llseek = generic_file_llseek, },
 };
 
 /*
@@ -210,9 +210,9 @@ static ssize_t portcntrs_2_read(struct file *file, char __user *buf,
 }
 
 static const struct file_operations portcntr_ops[] = {
-        { .read = portnames_read, },
-        { .read = portcntrs_1_read, },
-        { .read = portcntrs_2_read, },
+        { .read = portnames_read, .llseek = generic_file_llseek, },
+        { .read = portcntrs_1_read, .llseek = generic_file_llseek, },
+        { .read = portcntrs_2_read, .llseek = generic_file_llseek, },
 };
 
 /*
@@ -261,8 +261,8 @@ static ssize_t qsfp_2_read(struct file *file, char __user *buf,
 }
 
 static const struct file_operations qsfp_ops[] = {
-        { .read = qsfp_1_read, },
-        { .read = qsfp_2_read, },
+        { .read = qsfp_1_read, .llseek = generic_file_llseek, },
+        { .read = qsfp_2_read, .llseek = generic_file_llseek, },
 };
 
 static ssize_t flash_read(struct file *file, char __user *buf,
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index 5eedf83e2c3b..584d443b5335 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -5864,7 +5864,7 @@ static void write_7322_initregs(struct qib_devdata *dd)
          * Doesn't clear any of the error bits that might be set.
          */
         val = TIDFLOW_ERRBITS; /* these are W1C */
-        for (i = 0; i < dd->ctxtcnt; i++) {
+        for (i = 0; i < dd->cfgctxts; i++) {
                 int flow;
                 for (flow = 0; flow < NUM_TIDFLOWS_CTXT; flow++)
                         qib_write_ureg(dd, ur_rcvflowtable+flow, val, i);
@@ -7271,6 +7271,8 @@ static int serdes_7322_init(struct qib_pportdata *ppd)
         ibsd_wr_allchans(ppd, 20, (4 << 13), BMASK(15, 13)); /* SDR */
 
         data = qib_read_kreg_port(ppd, krp_serdesctrl);
+        /* Turn off IB latency mode */
+        data &= ~SYM_MASK(IBSerdesCtrl_0, IB_LAT_MODE);
         qib_write_kreg_port(ppd, krp_serdesctrl, data |
                 SYM_MASK(IBSerdesCtrl_0, RXLOSEN));
 
diff --git a/drivers/infiniband/hw/qib/qib_init.c b/drivers/infiniband/hw/qib/qib_init.c
index a873dd596e81..f1d16d3a01f6 100644
--- a/drivers/infiniband/hw/qib/qib_init.c
+++ b/drivers/infiniband/hw/qib/qib_init.c
@@ -93,7 +93,7 @@ unsigned long *qib_cpulist;
 void qib_set_ctxtcnt(struct qib_devdata *dd)
 {
         if (!qib_cfgctxts)
-                dd->cfgctxts = dd->ctxtcnt;
+                dd->cfgctxts = dd->first_user_ctxt + num_online_cpus();
         else if (qib_cfgctxts < dd->num_pports)
                 dd->cfgctxts = dd->ctxtcnt;
         else if (qib_cfgctxts <= dd->ctxtcnt)
diff --git a/drivers/infiniband/hw/qib/qib_qp.c b/drivers/infiniband/hw/qib/qib_qp.c
index e0f65e39076b..6c39851d2ded 100644
--- a/drivers/infiniband/hw/qib/qib_qp.c
+++ b/drivers/infiniband/hw/qib/qib_qp.c
@@ -450,7 +450,7 @@ static void clear_mr_refs(struct qib_qp *qp, int clr_sends)
  *
  * Flushes both send and receive work queues.
  * Returns true if last WQE event should be generated.
- * The QP s_lock should be held and interrupts disabled.
+ * The QP r_lock and s_lock should be held and interrupts disabled.
  * If we are already in error state, just return.
  */
 int qib_error_qp(struct qib_qp *qp, enum ib_wc_status err)
diff --git a/drivers/infiniband/hw/qib/qib_rc.c b/drivers/infiniband/hw/qib/qib_rc.c
index 40c0a373719c..a0931119bd78 100644
--- a/drivers/infiniband/hw/qib/qib_rc.c
+++ b/drivers/infiniband/hw/qib/qib_rc.c
@@ -868,7 +868,7 @@ done:
 
 /*
  * Back up requester to resend the last un-ACKed request.
- * The QP s_lock should be held and interrupts disabled.
+ * The QP r_lock and s_lock should be held and interrupts disabled.
  */
 static void qib_restart_rc(struct qib_qp *qp, u32 psn, int wait)
 {
@@ -911,7 +911,8 @@ static void rc_timeout(unsigned long arg)
         struct qib_ibport *ibp;
         unsigned long flags;
 
-        spin_lock_irqsave(&qp->s_lock, flags);
+        spin_lock_irqsave(&qp->r_lock, flags);
+        spin_lock(&qp->s_lock);
         if (qp->s_flags & QIB_S_TIMER) {
                 ibp = to_iport(qp->ibqp.device, qp->port_num);
                 ibp->n_rc_timeouts++;
@@ -920,7 +921,8 @@ static void rc_timeout(unsigned long arg)
                 qib_restart_rc(qp, qp->s_last_psn + 1, 1);
                 qib_schedule_send(qp);
         }
-        spin_unlock_irqrestore(&qp->s_lock, flags);
+        spin_unlock(&qp->s_lock);
+        spin_unlock_irqrestore(&qp->r_lock, flags);
 }
 
 /*
@@ -1414,10 +1416,6 @@ static void qib_rc_rcv_resp(struct qib_ibport *ibp,
 
         spin_lock_irqsave(&qp->s_lock, flags);
 
-        /* Double check we can process this now that we hold the s_lock. */
-        if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))
-                goto ack_done;
-
         /* Ignore invalid responses. */
         if (qib_cmp24(psn, qp->s_next_psn) >= 0)
                 goto ack_done;
@@ -1661,9 +1659,6 @@ static int qib_rc_rcv_error(struct qib_other_headers *ohdr,
         ibp->n_rc_dupreq++;
 
         spin_lock_irqsave(&qp->s_lock, flags);
-        /* Double check we can process this now that we hold the s_lock. */
-        if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))
-                goto unlock_done;
 
         for (i = qp->r_head_ack_queue; ; i = prev) {
                 if (i == qp->s_tail_ack_queue)
@@ -1878,9 +1873,6 @@ void qib_rc_rcv(struct qib_ctxtdata *rcd, struct qib_ib_header *hdr,
         psn = be32_to_cpu(ohdr->bth[2]);
         opcode >>= 24;
 
-        /* Prevent simultaneous processing after APM on different CPUs */
-        spin_lock(&qp->r_lock);
-
         /*
          * Process responses (ACKs) before anything else.  Note that the
          * packet sequence number will be for something in the send work
@@ -1891,14 +1883,14 @@ void qib_rc_rcv(struct qib_ctxtdata *rcd, struct qib_ib_header *hdr,
             opcode <= OP(ATOMIC_ACKNOWLEDGE)) {
                 qib_rc_rcv_resp(ibp, ohdr, data, tlen, qp, opcode, psn,
                                 hdrsize, pmtu, rcd);
-                goto runlock;
+                return;
         }
 
         /* Compute 24 bits worth of difference. */
         diff = qib_cmp24(psn, qp->r_psn);
         if (unlikely(diff)) {
                 if (qib_rc_rcv_error(ohdr, data, qp, opcode, psn, diff, rcd))
-                        goto runlock;
+                        return;
                 goto send_ack;
         }
 
@@ -2090,9 +2082,6 @@ send_last:
                 if (next > QIB_MAX_RDMA_ATOMIC)
                         next = 0;
                 spin_lock_irqsave(&qp->s_lock, flags);
-                /* Double check we can process this while holding the s_lock. */
-                if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))
-                        goto srunlock;
                 if (unlikely(next == qp->s_tail_ack_queue)) {
                         if (!qp->s_ack_queue[next].sent)
                                 goto nack_inv_unlck;
@@ -2146,7 +2135,7 @@ send_last:
                 qp->s_flags |= QIB_S_RESP_PENDING;
                 qib_schedule_send(qp);
 
-                goto srunlock;
+                goto sunlock;
         }
 
         case OP(COMPARE_SWAP):
@@ -2165,9 +2154,6 @@ send_last:
                 if (next > QIB_MAX_RDMA_ATOMIC)
                         next = 0;
                 spin_lock_irqsave(&qp->s_lock, flags);
-                /* Double check we can process this while holding the s_lock. */
-                if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK))
-                        goto srunlock;
                 if (unlikely(next == qp->s_tail_ack_queue)) {
                         if (!qp->s_ack_queue[next].sent)
                                 goto nack_inv_unlck;
@@ -2213,7 +2199,7 @@ send_last:
                 qp->s_flags |= QIB_S_RESP_PENDING;
                 qib_schedule_send(qp);
 
-                goto srunlock;
+                goto sunlock;
         }
 
         default:
@@ -2227,7 +2213,7 @@ send_last:
         /* Send an ACK if requested or required. */
         if (psn & (1 << 31))
                 goto send_ack;
-        goto runlock;
+        return;
 
 rnr_nak:
         qp->r_nak_state = IB_RNR_NAK | qp->r_min_rnr_timer;
@@ -2238,7 +2224,7 @@ rnr_nak:
                 atomic_inc(&qp->refcount);
                 list_add_tail(&qp->rspwait, &rcd->qp_wait_list);
         }
-        goto runlock;
+        return;
 
 nack_op_err:
         qib_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
@@ -2250,7 +2236,7 @@ nack_op_err:
                 atomic_inc(&qp->refcount);
                 list_add_tail(&qp->rspwait, &rcd->qp_wait_list);
         }
-        goto runlock;
+        return;
 
 nack_inv_unlck:
         spin_unlock_irqrestore(&qp->s_lock, flags);
@@ -2264,7 +2250,7 @@ nack_inv:
                 atomic_inc(&qp->refcount);
                 list_add_tail(&qp->rspwait, &rcd->qp_wait_list);
         }
-        goto runlock;
+        return;
 
 nack_acc_unlck:
         spin_unlock_irqrestore(&qp->s_lock, flags);
@@ -2274,13 +2260,6 @@ nack_acc:
         qp->r_ack_psn = qp->r_psn;
 send_ack:
         qib_send_rc_ack(qp);
-runlock:
-        spin_unlock(&qp->r_lock);
-        return;
-
-srunlock:
-        spin_unlock_irqrestore(&qp->s_lock, flags);
-        spin_unlock(&qp->r_lock);
         return;
 
 sunlock:
diff --git a/drivers/infiniband/hw/qib/qib_sdma.c b/drivers/infiniband/hw/qib/qib_sdma.c
index b8456881f7f6..cad44491320b 100644
--- a/drivers/infiniband/hw/qib/qib_sdma.c
+++ b/drivers/infiniband/hw/qib/qib_sdma.c
@@ -656,6 +656,7 @@ unmap:
         }
         qp = tx->qp;
         qib_put_txreq(tx);
+        spin_lock(&qp->r_lock);
         spin_lock(&qp->s_lock);
         if (qp->ibqp.qp_type == IB_QPT_RC) {
                 /* XXX what about error sending RDMA read responses? */
@@ -664,6 +665,7 @@ unmap:
         } else if (qp->s_wqe)
                 qib_send_complete(qp, qp->s_wqe, IB_WC_GENERAL_ERR);
         spin_unlock(&qp->s_lock);
+        spin_unlock(&qp->r_lock);
         /* return zero to process the next send work request */
         goto unlock;
 
diff --git a/drivers/infiniband/hw/qib/qib_sysfs.c b/drivers/infiniband/hw/qib/qib_sysfs.c
index dab4d9f4a2cc..d50a33fe8bbc 100644
--- a/drivers/infiniband/hw/qib/qib_sysfs.c
+++ b/drivers/infiniband/hw/qib/qib_sysfs.c
@@ -347,7 +347,7 @@ static struct kobj_type qib_sl2vl_ktype = {
 
 #define QIB_DIAGC_ATTR(N) \
         static struct qib_diagc_attr qib_diagc_attr_##N = { \
-                .attr = { .name = __stringify(N), .mode = 0444 }, \
+                .attr = { .name = __stringify(N), .mode = 0664 }, \
                 .counter = offsetof(struct qib_ibport, n_##N) \
         }
 
@@ -403,8 +403,27 @@ static ssize_t diagc_attr_show(struct kobject *kobj, struct attribute *attr,
         return sprintf(buf, "%u\n", *(u32 *)((char *)qibp + dattr->counter));
 }
 
+static ssize_t diagc_attr_store(struct kobject *kobj, struct attribute *attr,
+                                const char *buf, size_t size)
+{
+        struct qib_diagc_attr *dattr =
+                container_of(attr, struct qib_diagc_attr, attr);
+        struct qib_pportdata *ppd =
+                container_of(kobj, struct qib_pportdata, diagc_kobj);
+        struct qib_ibport *qibp = &ppd->ibport_data;
+        char *endp;
+        long val = simple_strtol(buf, &endp, 0);
+
+        if (val < 0 || endp == buf)
+                return -EINVAL;
+
+        *(u32 *)((char *) qibp + dattr->counter) = val;
+        return size;
+}
+
 static const struct sysfs_ops qib_diagc_ops = {
         .show = diagc_attr_show,
+        .store = diagc_attr_store,
 };
 
 static struct kobj_type qib_diagc_ktype = {
diff --git a/drivers/infiniband/hw/qib/qib_tx.c b/drivers/infiniband/hw/qib/qib_tx.c
index af30232b6831..7f36454c225e 100644
--- a/drivers/infiniband/hw/qib/qib_tx.c
+++ b/drivers/infiniband/hw/qib/qib_tx.c
@@ -170,7 +170,7 @@ static int find_ctxt(struct qib_devdata *dd, unsigned bufn)
 void qib_disarm_piobufs_set(struct qib_devdata *dd, unsigned long *mask,
                             unsigned cnt)
 {
-        struct qib_pportdata *ppd, *pppd[dd->num_pports];
+        struct qib_pportdata *ppd, *pppd[QIB_MAX_IB_PORTS];
         unsigned i;
         unsigned long flags;
 
diff --git a/drivers/infiniband/hw/qib/qib_uc.c b/drivers/infiniband/hw/qib/qib_uc.c
index 6c7fe78cca64..b9c8b6346c1b 100644
--- a/drivers/infiniband/hw/qib/qib_uc.c
+++ b/drivers/infiniband/hw/qib/qib_uc.c
@@ -272,9 +272,6 @@ void qib_uc_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
         opcode >>= 24;
         memset(&wc, 0, sizeof wc);
 
-        /* Prevent simultaneous processing after APM on different CPUs */
-        spin_lock(&qp->r_lock);
-
         /* Compare the PSN verses the expected PSN. */
         if (unlikely(qib_cmp24(psn, qp->r_psn) != 0)) {
                 /*
@@ -534,7 +531,6 @@ rdma_last:
         }
         qp->r_psn++;
         qp->r_state = opcode;
-        spin_unlock(&qp->r_lock);
         return;
 
 rewind:
@@ -542,12 +538,10 @@ rewind:
         qp->r_sge.num_sge = 0;
 drop:
         ibp->n_pkt_drops++;
-        spin_unlock(&qp->r_lock);
         return;
 
 op_err:
         qib_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
-        spin_unlock(&qp->r_lock);
         return;
 
 sunlock:
diff --git a/drivers/infiniband/hw/qib/qib_ud.c b/drivers/infiniband/hw/qib/qib_ud.c
index c838cda73347..e1b3da2a1f85 100644
--- a/drivers/infiniband/hw/qib/qib_ud.c
+++ b/drivers/infiniband/hw/qib/qib_ud.c
@@ -535,13 +535,6 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
         wc.byte_len = tlen + sizeof(struct ib_grh);
 
         /*
-         * We need to serialize getting a receive work queue entry and
-         * generating a completion for it against QPs sending to this QP
-         * locally.
-         */
-        spin_lock(&qp->r_lock);
-
-        /*
          * Get the next work request entry to find where to put the data.
          */
         if (qp->r_flags & QIB_R_REUSE_SGE)
@@ -552,19 +545,19 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
                 ret = qib_get_rwqe(qp, 0);
                 if (ret < 0) {
                         qib_rc_error(qp, IB_WC_LOC_QP_OP_ERR);
-                        goto bail_unlock;
+                        return;
                 }
                 if (!ret) {
                         if (qp->ibqp.qp_num == 0)
                                 ibp->n_vl15_dropped++;
-                        goto bail_unlock;
+                        return;
                 }
         }
         /* Silently drop packets which are too big. */
         if (unlikely(wc.byte_len > qp->r_len)) {
                 qp->r_flags |= QIB_R_REUSE_SGE;
                 ibp->n_pkt_drops++;
-                goto bail_unlock;
+                return;
         }
         if (has_grh) {
                 qib_copy_sge(&qp->r_sge, &hdr->u.l.grh,
@@ -579,7 +572,7 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
                         qp->r_sge.sge = *qp->r_sge.sg_list++;
         }
         if (!test_and_clear_bit(QIB_R_WRID_VALID, &qp->r_aflags))
-                goto bail_unlock;
+                return;
         wc.wr_id = qp->r_wr_id;
         wc.status = IB_WC_SUCCESS;
         wc.opcode = IB_WC_RECV;
@@ -601,7 +594,5 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
         qib_cq_enter(to_icq(qp->ibqp.recv_cq), &wc,
                      (ohdr->bth[0] &
                         cpu_to_be32(IB_BTH_SOLICITED)) != 0);
-bail_unlock:
-        spin_unlock(&qp->r_lock);
 bail:;
 }
diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index cda8f4173d23..9fab40488850 100644
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -550,10 +550,12 @@ static void qib_qp_rcv(struct qib_ctxtdata *rcd, struct qib_ib_header *hdr,
 {
         struct qib_ibport *ibp = &rcd->ppd->ibport_data;
 
+        spin_lock(&qp->r_lock);
+
         /* Check for valid receive state. */
         if (!(ib_qib_state_ops[qp->state] & QIB_PROCESS_RECV_OK)) {
                 ibp->n_pkt_drops++;
-                return;
+                goto unlock;
         }
 
         switch (qp->ibqp.qp_type) {
@@ -577,6 +579,9 @@ static void qib_qp_rcv(struct qib_ctxtdata *rcd, struct qib_ib_header *hdr,
         default:
                 break;
         }
+
+unlock:
+        spin_unlock(&qp->r_lock);
 }
 
 /**
diff --git a/drivers/infiniband/ulp/iser/iser_initiator.c b/drivers/infiniband/ulp/iser/iser_initiator.c
index 0b9ef0716588..95a08a8ca8aa 100644
--- a/drivers/infiniband/ulp/iser/iser_initiator.c
+++ b/drivers/infiniband/ulp/iser/iser_initiator.c
@@ -170,7 +170,7 @@ static void iser_create_send_desc(struct iser_conn	*ib_conn,
 }
 
 
-int iser_alloc_rx_descriptors(struct iser_conn *ib_conn)
+static int iser_alloc_rx_descriptors(struct iser_conn *ib_conn)
 {
         int i, j;
         u64 dma_addr;
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index ed3f9ebae882..7f8f16bad753 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -811,6 +811,38 @@ static int srp_map_data(struct scsi_cmnd *scmnd, struct srp_target_port *target,
         return len;
 }
 
+static int srp_post_recv(struct srp_target_port *target)
+{
+        unsigned long flags;
+        struct srp_iu *iu;
+        struct ib_sge list;
+        struct ib_recv_wr wr, *bad_wr;
+        unsigned int next;
+        int ret;
+
+        spin_lock_irqsave(target->scsi_host->host_lock, flags);
+
+        next     = target->rx_head & (SRP_RQ_SIZE - 1);
+        wr.wr_id = next;
+        iu       = target->rx_ring[next];
+
+        list.addr   = iu->dma;
+        list.length = iu->size;
+        list.lkey   = target->srp_host->srp_dev->mr->lkey;
+
+        wr.next     = NULL;
+        wr.sg_list  = &list;
+        wr.num_sge  = 1;
+
+        ret = ib_post_recv(target->qp, &wr, &bad_wr);
+        if (!ret)
+                ++target->rx_head;
+
+        spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
+
+        return ret;
+}
+
 static void srp_process_rsp(struct srp_target_port *target, struct srp_rsp *rsp)
 {
         struct srp_request *req;
@@ -868,6 +900,7 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
 {
         struct ib_device *dev;
         struct srp_iu *iu;
+        int res;
         u8 opcode;
 
         iu = target->rx_ring[wc->wr_id];
@@ -879,21 +912,10 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
         opcode = *(u8 *) iu->buf;
 
         if (0) {
-                int i;
-
                 shost_printk(KERN_ERR, target->scsi_host,
                              PFX "recv completion, opcode 0x%02x\n", opcode);
-
-                for (i = 0; i < wc->byte_len; ++i) {
-                        if (i % 8 == 0)
-                                printk(KERN_ERR "  [%02x] ", i);
-                        printk(" %02x", ((u8 *) iu->buf)[i]);
-                        if ((i + 1) % 8 == 0)
-                                printk("\n");
-                }
-
-                if (wc->byte_len % 8)
-                        printk("\n");
+                print_hex_dump(KERN_ERR, "", DUMP_PREFIX_OFFSET, 8, 1,
+                               iu->buf, wc->byte_len, true);
         }
 
         switch (opcode) {
@@ -915,6 +937,11 @@ static void srp_handle_recv(struct srp_target_port *target, struct ib_wc *wc)
 
         ib_dma_sync_single_for_device(dev, iu->dma, target->max_ti_iu_len,
                                       DMA_FROM_DEVICE);
+
+        res = srp_post_recv(target);
+        if (res != 0)
+                shost_printk(KERN_ERR, target->scsi_host,
+                             PFX "Recv failed with error code %d\n", res);
 }
 
 static void srp_recv_completion(struct ib_cq *cq, void *target_ptr)
@@ -954,45 +981,6 @@ static void srp_send_completion(struct ib_cq *cq, void *target_ptr)
         }
 }
 
-static int __srp_post_recv(struct srp_target_port *target)
-{
-        struct srp_iu *iu;
-        struct ib_sge list;
-        struct ib_recv_wr wr, *bad_wr;
-        unsigned int next;
-        int ret;
-
-        next     = target->rx_head & (SRP_RQ_SIZE - 1);
-        wr.wr_id = next;
-        iu       = target->rx_ring[next];
-
-        list.addr   = iu->dma;
-        list.length = iu->size;
-        list.lkey   = target->srp_host->srp_dev->mr->lkey;
-
-        wr.next     = NULL;
-        wr.sg_list  = &list;
-        wr.num_sge  = 1;
-
-        ret = ib_post_recv(target->qp, &wr, &bad_wr);
-        if (!ret)
-                ++target->rx_head;
-
-        return ret;
-}
-
-static int srp_post_recv(struct srp_target_port *target)
-{
-        unsigned long flags;
-        int ret;
-
-        spin_lock_irqsave(target->scsi_host->host_lock, flags);
-        ret = __srp_post_recv(target);
-        spin_unlock_irqrestore(target->scsi_host->host_lock, flags);
-
-        return ret;
-}
-
 /*
  * Must be called with target->scsi_host->host_lock held to protect
  * req_lim and tx_head.  Lock cannot be dropped between call here and
@@ -1102,11 +1090,6 @@ static int srp_queuecommand(struct scsi_cmnd *scmnd,
                 goto err;
         }
 
-        if (__srp_post_recv(target)) {
-                shost_printk(KERN_ERR, target->scsi_host, PFX "Recv failed\n");
-                goto err_unmap;
-        }
-
         ib_dma_sync_single_for_device(dev, iu->dma, srp_max_iu_len,
                                       DMA_TO_DEVICE);
 
@@ -1249,6 +1232,7 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
         int attr_mask = 0;
         int comp = 0;
         int opcode = 0;
+        int i;
 
         switch (event->event) {
         case IB_CM_REQ_ERROR:
@@ -1298,7 +1282,11 @@ static int srp_cm_handler(struct ib_cm_id *cm_id, struct ib_cm_event *event)
                 if (target->status)
                         break;
 
-                target->status = srp_post_recv(target);
+                for (i = 0; i < SRP_RQ_SIZE; i++) {
+                        target->status = srp_post_recv(target);
+                        if (target->status)
+                                break;
+                }
                 if (target->status)
                         break;
 
@@ -1564,6 +1552,18 @@ static ssize_t show_orig_dgid(struct device *dev,
         return sprintf(buf, "%pI6\n", target->orig_dgid);
 }
 
+static ssize_t show_req_lim(struct device *dev,
+                            struct device_attribute *attr, char *buf)
+{
+        struct srp_target_port *target = host_to_target(class_to_shost(dev));
+
+        if (target->state == SRP_TARGET_DEAD ||
+            target->state == SRP_TARGET_REMOVED)
+                return -ENODEV;
+
+        return sprintf(buf, "%d\n", target->req_lim);
+}
+
 static ssize_t show_zero_req_lim(struct device *dev,
                                  struct device_attribute *attr, char *buf)
 {
@@ -1598,6 +1598,7 @@ static DEVICE_ATTR(service_id,	    S_IRUGO, show_service_id,	   NULL);
 static DEVICE_ATTR(pkey,            S_IRUGO, show_pkey,            NULL);
 static DEVICE_ATTR(dgid,            S_IRUGO, show_dgid,            NULL);
 static DEVICE_ATTR(orig_dgid,       S_IRUGO, show_orig_dgid,       NULL);
+static DEVICE_ATTR(req_lim,         S_IRUGO, show_req_lim,         NULL);
 static DEVICE_ATTR(zero_req_lim,    S_IRUGO, show_zero_req_lim,    NULL);
 static DEVICE_ATTR(local_ib_port,   S_IRUGO, show_local_ib_port,   NULL);
 static DEVICE_ATTR(local_ib_device, S_IRUGO, show_local_ib_device, NULL);
@@ -1609,6 +1610,7 @@ static struct device_attribute *srp_host_attrs[] = {
         &dev_attr_pkey,
         &dev_attr_dgid,
         &dev_attr_orig_dgid,
+        &dev_attr_req_lim,
         &dev_attr_zero_req_lim,
         &dev_attr_local_ib_port,
         &dev_attr_local_ib_device,
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index f3e8f3c07725..857b3b9cf120 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -555,7 +555,7 @@ enum ib_qp_type {
         IB_QPT_UC,
         IB_QPT_UD,
         IB_QPT_RAW_IPV6,
-        IB_QPT_RAW_ETY
+        IB_QPT_RAW_ETHERTYPE
 };
 
 enum ib_qp_create_flags {