Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

Pull first round of SCSI updates from James Bottomley:
 "The patch set is mostly driver updates (usf, zfcp, lpfc, mpt2sas,
  megaraid_sas, bfa, ipr) and a few bug fixes.  Also of note is that the
  Buslogic driver has been rewritten to a better coding style and 64 bit
  support added.  We also removed the libsas limitation on 16 bytes for
  the command size (currently no drivers make use of this)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (101 commits)
  [SCSI] megaraid: minor cut and paste error fixed.
  [SCSI] ufshcd-pltfrm: remove unnecessary dma_set_coherent_mask() call
  [SCSI] ufs: fix register address in UIC error interrupt handling
  [SCSI] ufshcd-pltfrm: add missing empty slot in ufs_of_match[]
  [SCSI] ufs: use devres functions for ufshcd
  [SCSI] ufs: Fix the response UPIU length setting
  [SCSI] ufs: rework link start-up process
  [SCSI] ufs: remove version check before IS reg clear
  [SCSI] ufs: amend interrupt configuration
  [SCSI] ufs: wrap the i/o access operations
  [SCSI] storvsc: Update the storage protocol to win8 level
  [SCSI] storvsc: Increase the value of scsi timeout for storvsc devices
  [SCSI] MAINTAINERS: Add myself as the maintainer for BusLogic SCSI driver
  [SCSI] BusLogic: Port driver to 64-bit.
  [SCSI] BusLogic: Fix style issues
  [SCSI] libiscsi: Added new boot entries in the session sysfs
  [SCSI] aacraid: Fix for arrays are going offline in the system. System hangs
  [SCSI] ipr: IOA Status Code(IOASC) update
  [SCSI] sd: Update WRITE SAME heuristics
  [SCSI] fnic: potential dead lock in fnic_is_abts_pending()
  ...

17 files changed, 220 insertions, 178 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index bcc56cac4fd8..93f222d66716 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 3c5625b8b1f4..5cb08ae3e8c2 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -4070,11 +4070,28 @@ LPFC_VPORT_ATTR(discovery_threads, 32, 1, 64, "Maximum number of ELS commands "
                  "during discovery");
 
 /*
-# lpfc_max_luns: maximum allowed LUN.
+# lpfc_max_luns: maximum allowed LUN ID. This is the highest LUN ID that
+#    will be scanned by the SCSI midlayer when sequential scanning is
+#    used; and is also the highest LUN ID allowed when the SCSI midlayer
+#    parses REPORT_LUN responses. The lpfc driver has no LUN count or
+#    LUN ID limit, but the SCSI midlayer requires this field for the uses
+#    above. The lpfc driver limits the default value to 255 for two reasons.
+#    As it bounds the sequential scan loop, scanning for thousands of luns
+#    on a target can take minutes of wall clock time.  Additionally,
+#    there are FC targets, such as JBODs, that only recognize 8-bits of
+#    LUN ID. When they receive a value greater than 8 bits, they chop off
+#    the high order bits. In other words, they see LUN IDs 0, 256, 512,
+#    and so on all as LUN ID 0. This causes the linux kernel, which sees
+#    valid responses at each of the LUN IDs, to believe there are multiple
+#    devices present, when in fact, there is only 1.
+#    A customer that is aware of their target behaviors, and the results as
+#    indicated above, is welcome to increase the lpfc_max_luns value.
+#    As mentioned, this value is not used by the lpfc driver, only the
+#    SCSI midlayer.
 # Value range is [0,65535]. Default value is 255.
 # NOTE: The SCSI layer might probe all allowed LUN on some old targets.
 */
-LPFC_VPORT_ATTR_R(max_luns, 255, 0, 65535, "Maximum allowed LUN");
+LPFC_VPORT_ATTR_R(max_luns, 255, 0, 65535, "Maximum allowed LUN ID");
 
 /*
 # lpfc_poll_tmo: .Milliseconds driver will wait between polling FCP ring.
diff --git a/drivers/scsi/lpfc/lpfc_bsg.c b/drivers/scsi/lpfc/lpfc_bsg.c
index 094be2cad65b..6630520d295c 100644
--- a/drivers/scsi/lpfc/lpfc_bsg.c
+++ b/drivers/scsi/lpfc/lpfc_bsg.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2009-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -3392,6 +3392,7 @@ static int lpfc_bsg_check_cmd_access(struct lpfc_hba *phba,
         case MBX_DOWN_LOAD:
         case MBX_UPDATE_CFG:
         case MBX_KILL_BOARD:
+        case MBX_READ_TOPOLOGY:
         case MBX_LOAD_AREA:
         case MBX_LOAD_EXP_ROM:
         case MBX_BEACON:
@@ -3422,7 +3423,6 @@ static int lpfc_bsg_check_cmd_access(struct lpfc_hba *phba,
                 }
                 break;
         case MBX_READ_SPARM64:
-        case MBX_READ_TOPOLOGY:
         case MBX_REG_LOGIN:
         case MBX_REG_LOGIN64:
         case MBX_CONFIG_PORT:
diff --git a/drivers/scsi/lpfc/lpfc_crtn.h b/drivers/scsi/lpfc/lpfc_crtn.h
index d41456e5f814..cda076a84239 100644
--- a/drivers/scsi/lpfc/lpfc_crtn.h
+++ b/drivers/scsi/lpfc/lpfc_crtn.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index ae1a07c57cae..68391177432b 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2010 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_els.c b/drivers/scsi/lpfc/lpfc_els.c
index 3cae0a92e8bd..6b8ee7449f16 100644
--- a/drivers/scsi/lpfc/lpfc_els.c
+++ b/drivers/scsi/lpfc/lpfc_els.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c
index 0f6e2548f35d..60d6ca2f68c2 100644
--- a/drivers/scsi/lpfc/lpfc_hbadisc.c
+++ b/drivers/scsi/lpfc/lpfc_hbadisc.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -6158,12 +6158,44 @@ lpfc_read_fcf_conn_tbl(struct lpfc_hba *phba,
                 memcpy(&conn_entry->conn_rec, &conn_rec[i],
                         sizeof(struct lpfc_fcf_conn_rec));
                 conn_entry->conn_rec.vlan_tag =
-                        le16_to_cpu(conn_entry->conn_rec.vlan_tag) & 0xFFF;
+                        conn_entry->conn_rec.vlan_tag;
                 conn_entry->conn_rec.flags =
-                        le16_to_cpu(conn_entry->conn_rec.flags);
+                        conn_entry->conn_rec.flags;
                 list_add_tail(&conn_entry->list,
                         &phba->fcf_conn_rec_list);
         }
+
+        if (!list_empty(&phba->fcf_conn_rec_list)) {
+                i = 0;
+                list_for_each_entry(conn_entry, &phba->fcf_conn_rec_list,
+                                    list) {
+                        conn_rec = &conn_entry->conn_rec;
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "3345 FCF connection list rec[%02d]: "
+                                        "flags:x%04x, vtag:x%04x, "
+                                        "fabric_name:x%02x:%02x:%02x:%02x:"
+                                        "%02x:%02x:%02x:%02x, "
+                                        "switch_name:x%02x:%02x:%02x:%02x:"
+                                        "%02x:%02x:%02x:%02x\n", i++,
+                                        conn_rec->flags, conn_rec->vlan_tag,
+                                        conn_rec->fabric_name[0],
+                                        conn_rec->fabric_name[1],
+                                        conn_rec->fabric_name[2],
+                                        conn_rec->fabric_name[3],
+                                        conn_rec->fabric_name[4],
+                                        conn_rec->fabric_name[5],
+                                        conn_rec->fabric_name[6],
+                                        conn_rec->fabric_name[7],
+                                        conn_rec->switch_name[0],
+                                        conn_rec->switch_name[1],
+                                        conn_rec->switch_name[2],
+                                        conn_rec->switch_name[3],
+                                        conn_rec->switch_name[4],
+                                        conn_rec->switch_name[5],
+                                        conn_rec->switch_name[6],
+                                        conn_rec->switch_name[7]);
+                }
+        }
 }
 
 /**
diff --git a/drivers/scsi/lpfc/lpfc_hw.h b/drivers/scsi/lpfc/lpfc_hw.h
index 83700c18f468..6f927d30ca69 100644
--- a/drivers/scsi/lpfc/lpfc_hw.h
+++ b/drivers/scsi/lpfc/lpfc_hw.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2011 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_hw4.h b/drivers/scsi/lpfc/lpfc_hw4.h
index 713a4613ec3a..4ec3d7c044c2 100644
--- a/drivers/scsi/lpfc/lpfc_hw4.h
+++ b/drivers/scsi/lpfc/lpfc_hw4.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2012 Emulex.  All rights reserved.                *
+ * Copyright (C) 2009-2013 Emulex.  All rights reserved.                *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index cb465b253910..e0b20fad8502 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -60,7 +60,8 @@ unsigned long _dump_buf_dif_order;
 spinlock_t _dump_buf_lock;
 
 /* Used when mapping IRQ vectors in a driver centric manner */
-uint16_t lpfc_used_cpu[LPFC_MAX_CPU];
+uint16_t *lpfc_used_cpu;
+uint32_t lpfc_present_cpu;
 
 static void lpfc_get_hba_model_desc(struct lpfc_hba *, uint8_t *, uint8_t *);
 static int lpfc_post_rcv_buf(struct lpfc_hba *);
@@ -4049,52 +4050,6 @@ lpfc_sli4_perform_all_vport_cvl(struct lpfc_hba *phba)
 }
 
 /**
- * lpfc_sli4_perform_inuse_fcf_recovery - Perform inuse fcf recovery
- * @vport: pointer to lpfc hba data structure.
- *
- * This routine is to perform FCF recovery when the in-use FCF either dead or
- * got modified.
- **/
-static void
-lpfc_sli4_perform_inuse_fcf_recovery(struct lpfc_hba *phba,
-                                     struct lpfc_acqe_fip *acqe_fip)
-{
-        int rc;
-
-        spin_lock_irq(&phba->hbalock);
-        /* Mark the fast failover process in progress */
-        phba->fcf.fcf_flag |= FCF_DEAD_DISC;
-        spin_unlock_irq(&phba->hbalock);
-
-        lpfc_printf_log(phba, KERN_INFO, LOG_FIP | LOG_DISCOVERY,
-                        "2771 Start FCF fast failover process due to in-use "
-                        "FCF DEAD/MODIFIED event: evt_tag:x%x, index:x%x\n",
-                        acqe_fip->event_tag, acqe_fip->index);
-        rc = lpfc_sli4_redisc_fcf_table(phba);
-        if (rc) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_FIP | LOG_DISCOVERY,
-                                "2772 Issue FCF rediscover mabilbox command "
-                                "failed, fail through to FCF dead event\n");
-                spin_lock_irq(&phba->hbalock);
-                phba->fcf.fcf_flag &= ~FCF_DEAD_DISC;
-                spin_unlock_irq(&phba->hbalock);
-                /*
-                 * Last resort will fail over by treating this as a link
-                 * down to FCF registration.
-                 */
-                lpfc_sli4_fcf_dead_failthrough(phba);
-        } else {
-                /* Reset FCF roundrobin bmask for new discovery */
-                lpfc_sli4_clear_fcf_rr_bmask(phba);
-                /*
-                 * Handling fast FCF failover to a DEAD FCF event is
-                 * considered equalivant to receiving CVL to all vports.
-                 */
-                lpfc_sli4_perform_all_vport_cvl(phba);
-        }
-}
-
-/**
  * lpfc_sli4_async_fip_evt - Process the asynchronous FCoE FIP event
  * @phba: pointer to lpfc hba data structure.
  * @acqe_link: pointer to the async fcoe completion queue entry.
@@ -4159,22 +4114,9 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,
                         break;
                 }
 
-                /* If FCF has been in discovered state, perform rediscovery
-                 * only if the FCF with the same index of the in-use FCF got
-                 * modified during normal operation. Otherwise, do nothing.
-                 */
-                if (phba->pport->port_state > LPFC_FLOGI) {
+                /* If the FCF has been in discovered state, do nothing. */
+                if (phba->fcf.fcf_flag & FCF_SCAN_DONE) {
                         spin_unlock_irq(&phba->hbalock);
-                        if (phba->fcf.current_rec.fcf_indx ==
-                            acqe_fip->index) {
-                                lpfc_printf_log(phba, KERN_ERR, LOG_FIP,
-                                                "3300 In-use FCF (%d) "
-                                                "modified, perform FCF "
-                                                "rediscovery\n",
-                                                acqe_fip->index);
-                                lpfc_sli4_perform_inuse_fcf_recovery(phba,
-                                                                     acqe_fip);
-                        }
                         break;
                 }
                 spin_unlock_irq(&phba->hbalock);
@@ -4227,7 +4169,39 @@ lpfc_sli4_async_fip_evt(struct lpfc_hba *phba,
                  * is no longer valid as we are not in the middle of FCF
                  * failover process already.
                  */
-                lpfc_sli4_perform_inuse_fcf_recovery(phba, acqe_fip);
+                spin_lock_irq(&phba->hbalock);
+                /* Mark the fast failover process in progress */
+                phba->fcf.fcf_flag |= FCF_DEAD_DISC;
+                spin_unlock_irq(&phba->hbalock);
+
+                lpfc_printf_log(phba, KERN_INFO, LOG_FIP | LOG_DISCOVERY,
+                                "2771 Start FCF fast failover process due to "
+                                "FCF DEAD event: evt_tag:x%x, fcf_index:x%x "
+                                "\n", acqe_fip->event_tag, acqe_fip->index);
+                rc = lpfc_sli4_redisc_fcf_table(phba);
+                if (rc) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_FIP |
+                                        LOG_DISCOVERY,
+                                        "2772 Issue FCF rediscover mabilbox "
+                                        "command failed, fail through to FCF "
+                                        "dead event\n");
+                        spin_lock_irq(&phba->hbalock);
+                        phba->fcf.fcf_flag &= ~FCF_DEAD_DISC;
+                        spin_unlock_irq(&phba->hbalock);
+                        /*
+                         * Last resort will fail over by treating this
+                         * as a link down to FCF registration.
+                         */
+                        lpfc_sli4_fcf_dead_failthrough(phba);
+                } else {
+                        /* Reset FCF roundrobin bmask for new discovery */
+                        lpfc_sli4_clear_fcf_rr_bmask(phba);
+                        /*
+                         * Handling fast FCF failover to a DEAD FCF event is
+                         * considered equalivant to receiving CVL to all vports.
+                         */
+                        lpfc_sli4_perform_all_vport_cvl(phba);
+                }
                 break;
         case LPFC_FIP_EVENT_TYPE_CVL:
                 phba->fcoe_cvl_eventtag = acqe_fip->event_tag;
@@ -5213,6 +5187,21 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba)
                 rc = -ENOMEM;
                 goto out_free_msix;
         }
+        if (lpfc_used_cpu == NULL) {
+                lpfc_used_cpu = kzalloc((sizeof(uint16_t) * lpfc_present_cpu),
+                                         GFP_KERNEL);
+                if (!lpfc_used_cpu) {
+                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                        "3335 Failed allocate memory for msi-x "
+                                        "interrupt vector mapping\n");
+                        kfree(phba->sli4_hba.cpu_map);
+                        rc = -ENOMEM;
+                        goto out_free_msix;
+                }
+                for (i = 0; i < lpfc_present_cpu; i++)
+                        lpfc_used_cpu[i] = LPFC_VECTOR_MAP_EMPTY;
+        }
+
         /* Initialize io channels for round robin */
         cpup = phba->sli4_hba.cpu_map;
         rc = 0;
@@ -6824,8 +6813,6 @@ lpfc_sli4_queue_verify(struct lpfc_hba *phba)
         int cfg_fcp_io_channel;
         uint32_t cpu;
         uint32_t i = 0;
-        uint32_t j = 0;
-
 
         /*
          * Sanity check for configured queue parameters against the run-time
@@ -6839,10 +6826,9 @@ lpfc_sli4_queue_verify(struct lpfc_hba *phba)
         for_each_present_cpu(cpu) {
                 if (cpu_online(cpu))
                         i++;
-                j++;
         }
         phba->sli4_hba.num_online_cpu = i;
-        phba->sli4_hba.num_present_cpu = j;
+        phba->sli4_hba.num_present_cpu = lpfc_present_cpu;
 
         if (i < cfg_fcp_io_channel) {
                 lpfc_printf_log(phba,
@@ -10967,8 +10953,10 @@ lpfc_init(void)
         }
 
         /* Initialize in case vector mapping is needed */
-        for (cpu = 0; cpu < LPFC_MAX_CPU; cpu++)
-                lpfc_used_cpu[cpu] = LPFC_VECTOR_MAP_EMPTY;
+        lpfc_used_cpu = NULL;
+        lpfc_present_cpu = 0;
+        for_each_present_cpu(cpu)
+                lpfc_present_cpu++;
 
         error = pci_register_driver(&lpfc_driver);
         if (error) {
@@ -11008,6 +10996,7 @@ lpfc_exit(void)
                                 (1L << _dump_buf_dif_order), _dump_buf_dif);
                 free_pages((unsigned long)_dump_buf_dif, _dump_buf_dif_order);
         }
+        kfree(lpfc_used_cpu);
 }
 
 module_init(lpfc_init);
diff --git a/drivers/scsi/lpfc/lpfc_mbox.c b/drivers/scsi/lpfc/lpfc_mbox.c
index 41363db7d426..b1c510f6b8f0 100644
--- a/drivers/scsi/lpfc/lpfc_mbox.c
+++ b/drivers/scsi/lpfc/lpfc_mbox.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2009 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
diff --git a/drivers/scsi/lpfc/lpfc_nportdisc.c b/drivers/scsi/lpfc/lpfc_nportdisc.c
index 31e9b92f5a9b..6aaf39a1f1c5 100644
--- a/drivers/scsi/lpfc/lpfc_nportdisc.c
+++ b/drivers/scsi/lpfc/lpfc_nportdisc.c
@@ -1,7 +1,7 @@
  /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index 8523b278ec9d..243de1d324b7 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -68,14 +68,12 @@ struct scsi_dif_tuple {
         __be32 ref_tag;         /* Target LBA or indirect LBA */
 };
 
-#if !defined(SCSI_PROT_GUARD_CHECK) || !defined(SCSI_PROT_REF_CHECK)
-#define scsi_prot_flagged(sc, flg)      sc
-#endif
-
 static void
 lpfc_release_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb);
 static void
 lpfc_release_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *psb);
+static int
+lpfc_prot_group_type(struct lpfc_hba *phba, struct scsi_cmnd *sc);
 
 static void
 lpfc_debug_save_data(struct lpfc_hba *phba, struct scsi_cmnd *cmnd)
@@ -134,6 +132,30 @@ lpfc_debug_save_dif(struct lpfc_hba *phba, struct scsi_cmnd *cmnd)
         }
 }
 
+static inline unsigned
+lpfc_cmd_blksize(struct scsi_cmnd *sc)
+{
+        return sc->device->sector_size;
+}
+
+#define LPFC_CHECK_PROTECT_GUARD        1
+#define LPFC_CHECK_PROTECT_REF          2
+static inline unsigned
+lpfc_cmd_protect(struct scsi_cmnd *sc, int flag)
+{
+        return 1;
+}
+
+static inline unsigned
+lpfc_cmd_guard_csum(struct scsi_cmnd *sc)
+{
+        if (lpfc_prot_group_type(NULL, sc) == LPFC_PG_TYPE_NO_DIF)
+                return 0;
+        if (scsi_host_get_guard(sc->device->host) == SHOST_DIX_GUARD_IP)
+                return 1;
+        return 0;
+}
+
 /**
  * lpfc_sli4_set_rsp_sgl_last - Set the last bit in the response sge.
  * @phba: Pointer to HBA object.
@@ -1144,13 +1166,14 @@ lpfc_get_scsi_buf_s3(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 static struct lpfc_scsi_buf*
 lpfc_get_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
 {
-        struct lpfc_scsi_buf *lpfc_cmd ;
+        struct lpfc_scsi_buf *lpfc_cmd, *lpfc_cmd_next;
         unsigned long gflag = 0;
         unsigned long pflag = 0;
         int found = 0;
 
         spin_lock_irqsave(&phba->scsi_buf_list_get_lock, gflag);
-        list_for_each_entry(lpfc_cmd, &phba->lpfc_scsi_buf_list_get, list) {
+        list_for_each_entry_safe(lpfc_cmd, lpfc_cmd_next,
+                                 &phba->lpfc_scsi_buf_list_get, list) {
                 if (lpfc_test_rrq_active(phba, ndlp,
                                          lpfc_cmd->cur_iocbq.sli4_lxritag))
                         continue;
@@ -1164,8 +1187,8 @@ lpfc_get_scsi_buf_s4(struct lpfc_hba *phba, struct lpfc_nodelist *ndlp)
                             &phba->lpfc_scsi_buf_list_get);
                 INIT_LIST_HEAD(&phba->lpfc_scsi_buf_list_put);
                 spin_unlock_irqrestore(&phba->scsi_buf_list_put_lock, pflag);
-                list_for_each_entry(lpfc_cmd, &phba->lpfc_scsi_buf_list_get,
-                                    list) {
+                list_for_each_entry_safe(lpfc_cmd, lpfc_cmd_next,
+                                         &phba->lpfc_scsi_buf_list_get, list) {
                         if (lpfc_test_rrq_active(
                                 phba, ndlp, lpfc_cmd->cur_iocbq.sli4_lxritag))
                                 continue;
@@ -1409,12 +1432,6 @@ lpfc_scsi_prep_dma_buf_s3(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
         return 0;
 }
 
-static inline unsigned
-lpfc_cmd_blksize(struct scsi_cmnd *sc)
-{
-        return sc->device->sector_size;
-}
-
 #ifdef CONFIG_SCSI_LPFC_DEBUG_FS
 
 /* Return if if error injection is detected by Initiator */
@@ -1847,10 +1864,9 @@ static int
 lpfc_sc_to_bg_opcodes(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 uint8_t *txop, uint8_t *rxop)
 {
-        uint8_t guard_type = scsi_host_get_guard(sc->device->host);
         uint8_t ret = 0;
 
-        if (guard_type == SHOST_DIX_GUARD_IP) {
+        if (lpfc_cmd_guard_csum(sc)) {
                 switch (scsi_get_prot_op(sc)) {
                 case SCSI_PROT_READ_INSERT:
                 case SCSI_PROT_WRITE_STRIP:
@@ -1928,10 +1944,9 @@ static int
 lpfc_bg_err_opcodes(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 uint8_t *txop, uint8_t *rxop)
 {
-        uint8_t guard_type = scsi_host_get_guard(sc->device->host);
         uint8_t ret = 0;
 
-        if (guard_type == SHOST_DIX_GUARD_IP) {
+        if (lpfc_cmd_guard_csum(sc)) {
                 switch (scsi_get_prot_op(sc)) {
                 case SCSI_PROT_READ_INSERT:
                 case SCSI_PROT_WRITE_STRIP:
@@ -2078,12 +2093,12 @@ lpfc_bg_setup_bpl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
          * protection data is automatically generated, not checked.
          */
         if (datadir == DMA_FROM_DEVICE) {
-                if (scsi_prot_flagged(sc, SCSI_PROT_GUARD_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD))
                         bf_set(pde6_ce, pde6, checking);
                 else
                         bf_set(pde6_ce, pde6, 0);
 
-                if (scsi_prot_flagged(sc, SCSI_PROT_REF_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF))
                         bf_set(pde6_re, pde6, checking);
                 else
                         bf_set(pde6_re, pde6, 0);
@@ -2240,12 +2255,12 @@ lpfc_bg_setup_bpl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 bf_set(pde6_optx, pde6, txop);
                 bf_set(pde6_oprx, pde6, rxop);
 
-                if (scsi_prot_flagged(sc, SCSI_PROT_GUARD_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD))
                         bf_set(pde6_ce, pde6, checking);
                 else
                         bf_set(pde6_ce, pde6, 0);
 
-                if (scsi_prot_flagged(sc, SCSI_PROT_REF_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF))
                         bf_set(pde6_re, pde6, checking);
                 else
                         bf_set(pde6_re, pde6, 0);
@@ -2454,12 +2469,12 @@ lpfc_bg_setup_sgl(struct lpfc_hba *phba, struct scsi_cmnd *sc,
          * protection data is automatically generated, not checked.
          */
         if (sc->sc_data_direction == DMA_FROM_DEVICE) {
-                if (scsi_prot_flagged(sc, SCSI_PROT_GUARD_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD))
                         bf_set(lpfc_sli4_sge_dif_ce, diseed, checking);
                 else
                         bf_set(lpfc_sli4_sge_dif_ce, diseed, 0);
 
-                if (scsi_prot_flagged(sc, SCSI_PROT_REF_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF))
                         bf_set(lpfc_sli4_sge_dif_re, diseed, checking);
                 else
                         bf_set(lpfc_sli4_sge_dif_re, diseed, 0);
@@ -2610,7 +2625,7 @@ lpfc_bg_setup_sgl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 diseed->ref_tag = cpu_to_le32(reftag);
                 diseed->ref_tag_tran = diseed->ref_tag;
 
-                if (scsi_prot_flagged(sc, SCSI_PROT_GUARD_CHECK)) {
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_GUARD)) {
                         bf_set(lpfc_sli4_sge_dif_ce, diseed, checking);
 
                 } else {
@@ -2629,7 +2644,7 @@ lpfc_bg_setup_sgl_prot(struct lpfc_hba *phba, struct scsi_cmnd *sc,
                 }
 
 
-                if (scsi_prot_flagged(sc, SCSI_PROT_REF_CHECK))
+                if (lpfc_cmd_protect(sc, LPFC_CHECK_PROTECT_REF))
                         bf_set(lpfc_sli4_sge_dif_re, diseed, checking);
                 else
                         bf_set(lpfc_sli4_sge_dif_re, diseed, 0);
@@ -2792,11 +2807,12 @@ lpfc_prot_group_type(struct lpfc_hba *phba, struct scsi_cmnd *sc)
                 ret = LPFC_PG_TYPE_DIF_BUF;
                 break;
         default:
-                lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
-                                "9021 Unsupported protection op:%d\n", op);
+                if (phba)
+                        lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
+                                        "9021 Unsupported protection op:%d\n",
+                                        op);
                 break;
         }
-
         return ret;
 }
 
@@ -2821,22 +2837,22 @@ lpfc_bg_scsi_adjust_dl(struct lpfc_hba *phba,
 
         /* Check if there is protection data on the wire */
         if (sc->sc_data_direction == DMA_FROM_DEVICE) {
-                /* Read */
+                /* Read check for protection data */
                 if (scsi_get_prot_op(sc) ==  SCSI_PROT_READ_INSERT)
                         return fcpdl;
 
         } else {
-                /* Write */
+                /* Write check for protection data */
                 if (scsi_get_prot_op(sc) ==  SCSI_PROT_WRITE_STRIP)
                         return fcpdl;
         }
 
         /*
          * If we are in DIF Type 1 mode every data block has a 8 byte
-         * DIF (trailer) attached to it. Must ajust FCP data length.
+         * DIF (trailer) attached to it. Must ajust FCP data length
+         * to account for the protection data.
          */
-        if (scsi_prot_flagged(sc, SCSI_PROT_TRANSFER_PI))
-                fcpdl += (fcpdl / lpfc_cmd_blksize(sc)) * 8;
+        fcpdl += (fcpdl / lpfc_cmd_blksize(sc)) * 8;
 
         return fcpdl;
 }
@@ -3073,9 +3089,9 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
                         chk_guard = 1;
                 guard_type = scsi_host_get_guard(cmd->device->host);
 
+                src = (struct scsi_dif_tuple *)sg_virt(sgpe);
                 start_ref_tag = (uint32_t)scsi_get_lba(cmd); /* Truncate LBA */
                 start_app_tag = src->app_tag;
-                src = (struct scsi_dif_tuple *)sg_virt(sgpe);
                 len = sgpe->length;
                 while (src && protsegcnt) {
                         while (len) {
@@ -3090,25 +3106,10 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
                                         goto skipit;
                                 }
 
-                                /* App Tag checking */
-                                app_tag = src->app_tag;
-                                if (chk_app && (app_tag != start_app_tag)) {
-                                        err_type = BGS_APPTAG_ERR_MASK;
-                                        goto out;
-                                }
-
-                                /* Reference Tag checking */
-                                ref_tag = be32_to_cpu(src->ref_tag);
-                                if (chk_ref && (ref_tag != start_ref_tag)) {
-                                        err_type = BGS_REFTAG_ERR_MASK;
-                                        goto out;
-                                }
-                                start_ref_tag++;
-
-                                /* Guard Tag checking */
+                                /* First Guard Tag checking */
                                 if (chk_guard) {
                                         guard_tag = src->guard_tag;
-                                        if (guard_type == SHOST_DIX_GUARD_IP)
+                                        if (lpfc_cmd_guard_csum(cmd))
                                                 sum = lpfc_bg_csum(data_src,
                                                                    blksize);
                                         else
@@ -3119,6 +3120,21 @@ lpfc_calc_bg_err(struct lpfc_hba *phba, struct lpfc_scsi_buf *lpfc_cmd)
                                                 goto out;
                                         }
                                 }
+
+                                /* Reference Tag checking */
+                                ref_tag = be32_to_cpu(src->ref_tag);
+                                if (chk_ref && (ref_tag != start_ref_tag)) {
+                                        err_type = BGS_REFTAG_ERR_MASK;
+                                        goto out;
+                                }
+                                start_ref_tag++;
+
+                                /* App Tag checking */
+                                app_tag = src->app_tag;
+                                if (chk_app && (app_tag != start_app_tag)) {
+                                        err_type = BGS_APPTAG_ERR_MASK;
+                                        goto out;
+                                }
 skipit:
                                 len -= sizeof(struct scsi_dif_tuple);
                                 if (len < 0)
@@ -4074,7 +4090,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *pIocbIn,
                          cmd->device ? cmd->device->id : 0xffff,
                          cmd->device ? cmd->device->lun : 0xffff,
                          lpfc_cmd->status, lpfc_cmd->result,
-                         vport->fc_myDID, pnode->nlp_DID,
+                         vport->fc_myDID,
+                         (pnode) ? pnode->nlp_DID : 0,
                          phba->sli_rev == LPFC_SLI_REV4 ?
                              lpfc_cmd->cur_iocbq.sli4_xritag : 0xffff,
                          pIocbOut->iocb.ulpContext,
diff --git a/drivers/scsi/lpfc/lpfc_scsi.h b/drivers/scsi/lpfc/lpfc_scsi.h
index 21a2ffe67eac..b1d9f7fcb911 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.h
+++ b/drivers/scsi/lpfc/lpfc_scsi.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 572579f87de4..43440ca16f46 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -1011,17 +1011,6 @@ __lpfc_sli_release_iocbq_s4(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
         else
                 sglq = __lpfc_clear_active_sglq(phba, iocbq->sli4_lxritag);
 
-        /*
-        ** This should have been removed from the txcmplq before calling
-        ** iocbq_release. The normal completion
-        ** path should have already done the list_del_init.
-        */
-        if (unlikely(!list_empty(&iocbq->list))) {
-                if (iocbq->iocb_flag & LPFC_IO_ON_TXCMPLQ)
-                        iocbq->iocb_flag &= ~LPFC_IO_ON_TXCMPLQ;
-                list_del_init(&iocbq->list);
-        }
-
 
         if (sglq)  {
                 if ((iocbq->iocb_flag & LPFC_EXCHANGE_BUSY) &&
@@ -1070,13 +1059,6 @@ __lpfc_sli_release_iocbq_s3(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
 {
         size_t start_clean = offsetof(struct lpfc_iocbq, iocb);
 
-        /*
-        ** This should have been removed from the txcmplq before calling
-        ** iocbq_release. The normal completion
-        ** path should have already done the list_del_init.
-        */
-        if (unlikely(!list_empty(&iocbq->list)))
-                list_del_init(&iocbq->list);
 
         /*
          * Clean all volatile data fields, preserve iotag and node struct.
@@ -3279,7 +3261,7 @@ lpfc_sli_sp_handle_rspiocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 if (free_saveq) {
                         list_for_each_entry_safe(rspiocbp, next_iocb,
                                                  &saveq->list, list) {
-                                list_del(&rspiocbp->list);
+                                list_del_init(&rspiocbp->list);
                                 __lpfc_sli_release_iocbq(phba, rspiocbp);
                         }
                         __lpfc_sli_release_iocbq(phba, saveq);
@@ -4584,7 +4566,8 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                 } else {
                         lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
                                         "2708 This device does not support "
-                                        "Advanced Error Reporting (AER)\n");
+                                        "Advanced Error Reporting (AER): %d\n",
+                                        rc);
                         phba->cfg_aer_support = 0;
                 }
         }
@@ -8731,7 +8714,7 @@ lpfc_sli4_abts_err_handler(struct lpfc_hba *phba,
         lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
                         "3116 Port generated FCP XRI ABORT event on "
                         "vpi %d rpi %d xri x%x status 0x%x parameter x%x\n",
-                        ndlp->vport->vpi, ndlp->nlp_rpi,
+                        ndlp->vport->vpi, phba->sli4_hba.rpi_ids[ndlp->nlp_rpi],
                         bf_get(lpfc_wcqe_xa_xri, axri),
                         bf_get(lpfc_wcqe_xa_status, axri),
                         axri->parameter);
@@ -9787,7 +9770,7 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                         struct lpfc_iocbq *rspiocb)
 {
         lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                        "3096 ABORT_XRI_CN completing on xri x%x "
+                        "3096 ABORT_XRI_CN completing on rpi x%x "
                         "original iotag x%x, abort cmd iotag x%x "
                         "status 0x%x, reason 0x%x\n",
                         cmdiocb->iocb.un.acxri.abortContextTag,
@@ -10109,12 +10092,13 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                          uint32_t timeout)
 {
         DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_q);
+        MAILBOX_t *mb = NULL;
         int retval;
         unsigned long flag;
 
-        /* The caller must leave context1 empty. */
+        /* The caller might set context1 for extended buffer */
         if (pmboxq->context1)
-                return MBX_NOT_FINISHED;
+                mb = (MAILBOX_t *)pmboxq->context1;
 
         pmboxq->mbox_flag &= ~LPFC_MBX_WAKE;
         /* setup wake call as IOCB callback */
@@ -10130,7 +10114,8 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                                 msecs_to_jiffies(timeout * 1000));
 
                 spin_lock_irqsave(&phba->hbalock, flag);
-                pmboxq->context1 = NULL;
+                /* restore the possible extended buffer for free resource */
+                pmboxq->context1 = (uint8_t *)mb;
                 /*
                  * if LPFC_MBX_WAKE flag is set the mailbox is completed
                  * else do not free the resources.
@@ -10143,6 +10128,9 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                         pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                 }
                 spin_unlock_irqrestore(&phba->hbalock, flag);
+        } else {
+                /* restore the possible extended buffer for free resource */
+                pmboxq->context1 = (uint8_t *)mb;
         }
 
         return retval;
@@ -16304,7 +16292,7 @@ lpfc_drain_txq(struct lpfc_hba *phba)
         union lpfc_wqe wqe;
         int txq_cnt = 0;
 
-        spin_lock_irqsave(&phba->hbalock, iflags);
+        spin_lock_irqsave(&pring->ring_lock, iflags);
         list_for_each_entry(piocbq, &pring->txq, list) {
                 txq_cnt++;
         }
@@ -16312,14 +16300,14 @@ lpfc_drain_txq(struct lpfc_hba *phba)
         if (txq_cnt > pring->txq_max)
                 pring->txq_max = txq_cnt;
 
-        spin_unlock_irqrestore(&phba->hbalock, iflags);
+        spin_unlock_irqrestore(&pring->ring_lock, iflags);
 
         while (!list_empty(&pring->txq)) {
-                spin_lock_irqsave(&phba->hbalock, iflags);
+                spin_lock_irqsave(&pring->ring_lock, iflags);
 
                 piocbq = lpfc_sli_ringtx_get(phba, pring);
                 if (!piocbq) {
-                        spin_unlock_irqrestore(&phba->hbalock, iflags);
+                        spin_unlock_irqrestore(&pring->ring_lock, iflags);
                         lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
                                 "2823 txq empty and txq_cnt is %d\n ",
                                 txq_cnt);
@@ -16328,7 +16316,7 @@ lpfc_drain_txq(struct lpfc_hba *phba)
                 sglq = __lpfc_sli_get_sglq(phba, piocbq);
                 if (!sglq) {
                         __lpfc_sli_ringtx_put(phba, pring, piocbq);
-                        spin_unlock_irqrestore(&phba->hbalock, iflags);
+                        spin_unlock_irqrestore(&pring->ring_lock, iflags);
                         break;
                 }
                 txq_cnt--;
@@ -16356,7 +16344,7 @@ lpfc_drain_txq(struct lpfc_hba *phba)
                                         piocbq->iotag, piocbq->sli4_xritag);
                         list_add_tail(&piocbq->list, &completions);
                 }
-                spin_unlock_irqrestore(&phba->hbalock, iflags);
+                spin_unlock_irqrestore(&pring->ring_lock, iflags);
         }
 
         /* Cancel all the IOCBs that cannot be issued */
diff --git a/drivers/scsi/lpfc/lpfc_sli4.h b/drivers/scsi/lpfc/lpfc_sli4.h
index 67af460184ba..d710b87a4417 100644
--- a/drivers/scsi/lpfc/lpfc_sli4.h
+++ b/drivers/scsi/lpfc/lpfc_sli4.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2009-2011 Emulex.  All rights reserved.           *
+ * Copyright (C) 2009-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -444,7 +444,6 @@ struct lpfc_vector_map_info {
         struct cpumask  maskbits;
 };
 #define LPFC_VECTOR_MAP_EMPTY   0xffff
-#define LPFC_MAX_CPU            256
 
 /* SLI4 HBA data structure entries */
 struct lpfc_sli4_hba {
diff --git a/drivers/scsi/lpfc/lpfc_version.h b/drivers/scsi/lpfc/lpfc_version.h
index a38dc3b16969..c6c32eebf3dd 100644
--- a/drivers/scsi/lpfc/lpfc_version.h
+++ b/drivers/scsi/lpfc/lpfc_version.h
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2012 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2013 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  *                                                                 *
@@ -18,7 +18,7 @@
  * included with this package.                                     *
  *******************************************************************/
 
-#define LPFC_DRIVER_VERSION "8.3.39"
+#define LPFC_DRIVER_VERSION "8.3.40"
 #define LPFC_DRIVER_NAME                "lpfc"
 
 /* Used for SLI 2/3 */
@@ -30,4 +30,4 @@
 
 #define LPFC_MODULE_DESC "Emulex LightPulse Fibre Channel SCSI driver " \
                 LPFC_DRIVER_VERSION
-#define LPFC_COPYRIGHT "Copyright(c) 2004-2009 Emulex.  All rights reserved."
+#define LPFC_COPYRIGHT "Copyright(c) 2004-2013 Emulex.  All rights reserved."