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: (42 commits)
  IB/qib: Add missing <linux/slab.h> include
  IB/ehca: Drop unnecessary NULL test
  RDMA/nes: Fix confusing if statement indentation
  IB/ehca: Init irq tasklet before irq can happen
  RDMA/nes: Fix misindented code
  RDMA/nes: Fix showing wqm_quanta
  RDMA/nes: Get rid of "set but not used" variables
  RDMA/nes: Read firmware version from correct place
  IB/srp: Export req_lim via sysfs
  IB/srp: Make receive buffer handling more robust
  IB/srp: Use print_hex_dump()
  IB: Rename RAW_ETY to RAW_ETHERTYPE
  RDMA/nes: Fix two sparse warnings
  RDMA/cxgb3: Make needlessly global iwch_l2t_send() static
  IB/iser: Make needlessly global iser_alloc_rx_descriptors() static
  RDMA/cxgb4: Add timeouts when waiting for FW responses
  IB/qib: Fix race between qib_error_qp() and receive packet processing
  IB/qib: Limit the number of packets processed per interrupt
  IB/qib: Allow writes to the diag_counters to be able to clear them
  IB/qib: Set cfgctxts to number of CPUs by default
  ...

8 files changed, 64 insertions, 52 deletions

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 d876d0435cd4..443cea55daac 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 42e7aad1ec23..6dfdd49cdbcf 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