[SCSI] lpfc 8.2.8 : Add kernel-doc function headers
[safe/jmp/linux-2.6] / drivers / scsi / lpfc / lpfc_init.c
index 4e04470..b9d553c 100644 (file)
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2005 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
@@ -27,6 +27,7 @@
 #include <linux/kthread.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
+#include <linux/ctype.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include "lpfc.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_crtn.h"
+#include "lpfc_vport.h"
 #include "lpfc_version.h"
 
-static int lpfc_parse_vpd(struct lpfc_hba *, uint8_t *);
+static int lpfc_parse_vpd(struct lpfc_hba *, uint8_t *, int);
 static void lpfc_get_hba_model_desc(struct lpfc_hba *, uint8_t *, uint8_t *);
 static int lpfc_post_rcv_buf(struct lpfc_hba *);
 
 static struct scsi_transport_template *lpfc_transport_template = NULL;
+static struct scsi_transport_template *lpfc_vport_transport_template = NULL;
 static DEFINE_IDR(lpfc_hba_index);
 
-/************************************************************************/
-/*                                                                      */
-/*    lpfc_config_port_prep                                             */
-/*    This routine will do LPFC initialization prior to the             */
-/*    CONFIG_PORT mailbox command. This will be initialized             */
-/*    as a SLI layer callback routine.                                  */
-/*    This routine returns 0 on success or -ERESTART if it wants        */
-/*    the SLI layer to reset the HBA and try again. Any                 */
-/*    other return value indicates an error.                            */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_config_port_prep: Perform lpfc initialization prior to config port.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine will do LPFC initialization prior to issuing the CONFIG_PORT
+ * mailbox command. It retrieves the revision information from the HBA and
+ * collects the Vital Product Data (VPD) about the HBA for preparing the
+ * configuration of the HBA.
+ *
+ * Return codes:
+ *   0 - success.
+ *   -ERESTART - requests the SLI layer to reset the HBA and try again.
+ *   Any other value - indicates an error.
+ **/
 int
-lpfc_config_port_prep(struct lpfc_hba * phba)
+lpfc_config_port_prep(struct lpfc_hba *phba)
 {
        lpfc_vpd_t *vp = &phba->vpd;
        int i = 0, rc;
@@ -71,21 +77,25 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
        uint16_t offset = 0;
        static char licensed[56] =
                    "key unlock for use with gnu public licensed code only\0";
+       static int init_key = 1;
 
        pmb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        if (!pmb) {
-               phba->hba_state = LPFC_HBA_ERROR;
+               phba->link_state = LPFC_HBA_ERROR;
                return -ENOMEM;
        }
 
        mb = &pmb->mb;
-       phba->hba_state = LPFC_INIT_MBX_CMDS;
+       phba->link_state = LPFC_INIT_MBX_CMDS;
 
        if (lpfc_is_LC_HBA(phba->pcidev->device)) {
-               uint32_t *ptext = (uint32_t *) licensed;
+               if (init_key) {
+                       uint32_t *ptext = (uint32_t *) licensed;
 
-               for (i = 0; i < 56; i += sizeof (uint32_t), ptext++)
-                       *ptext = cpu_to_be32(*ptext);
+                       for (i = 0; i < 56; i += sizeof (uint32_t), ptext++)
+                               *ptext = cpu_to_be32(*ptext);
+                       init_key = 0;
+               }
 
                lpfc_read_nv(phba, pmb);
                memset((char*)mb->un.varRDnvp.rsvd3, 0,
@@ -96,64 +106,60 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
 
                if (rc != MBX_SUCCESS) {
-                       lpfc_printf_log(phba,
-                                       KERN_ERR,
-                                       LOG_MBOX,
-                                       "%d:0324 Config Port initialization "
+                       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                                       "0324 Config Port initialization "
                                        "error, mbxCmd x%x READ_NVPARM, "
                                        "mbxStatus x%x\n",
-                                       phba->brd_no,
                                        mb->mbxCommand, mb->mbxStatus);
                        mempool_free(pmb, phba->mbox_mem_pool);
                        return -ERESTART;
                }
                memcpy(phba->wwnn, (char *)mb->un.varRDnvp.nodename,
-                      sizeof (mb->un.varRDnvp.nodename));
+                      sizeof(phba->wwnn));
+               memcpy(phba->wwpn, (char *)mb->un.varRDnvp.portname,
+                      sizeof(phba->wwpn));
        }
 
+       phba->sli3_options = 0x0;
+
        /* Setup and issue mailbox READ REV command */
        lpfc_read_rev(phba, pmb);
        rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
        if (rc != MBX_SUCCESS) {
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0439 Adapter failed to init, mbxCmd x%x "
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0439 Adapter failed to init, mbxCmd x%x "
                                "READ_REV, mbxStatus x%x\n",
-                               phba->brd_no,
                                mb->mbxCommand, mb->mbxStatus);
                mempool_free( pmb, phba->mbox_mem_pool);
                return -ERESTART;
        }
 
-       /* The HBA's current state is provided by the ProgType and rr fields.
-        * Read and check the value of these fields before continuing to config
-        * this port.
+
+       /*
+        * The value of rr must be 1 since the driver set the cv field to 1.
+        * This setting requires the FW to set all revision fields.
         */
-       if (mb->un.varRdRev.rr == 0 || mb->un.varRdRev.un.b.ProgType != 2) {
-               /* Old firmware */
+       if (mb->un.varRdRev.rr == 0) {
                vp->rev.rBit = 0;
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0440 Adapter failed to init, mbxCmd x%x "
-                               "READ_REV detected outdated firmware"
-                               "Data: x%x\n",
-                               phba->brd_no,
-                               mb->mbxCommand, 0);
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0440 Adapter failed to init, READ_REV has "
+                               "missing revision information.\n");
                mempool_free(pmb, phba->mbox_mem_pool);
                return -ERESTART;
-       } else {
-               vp->rev.rBit = 1;
-               vp->rev.sli1FwRev = mb->un.varRdRev.sli1FwRev;
-               memcpy(vp->rev.sli1FwName,
-                       (char*)mb->un.varRdRev.sli1FwName, 16);
-               vp->rev.sli2FwRev = mb->un.varRdRev.sli2FwRev;
-               memcpy(vp->rev.sli2FwName,
-                                       (char *)mb->un.varRdRev.sli2FwName, 16);
+       }
+
+       if (phba->sli_rev == 3 && !mb->un.varRdRev.v3rsp) {
+               mempool_free(pmb, phba->mbox_mem_pool);
+               return -EINVAL;
        }
 
        /* Save information as VPD data */
+       vp->rev.rBit = 1;
+       memcpy(&vp->sli3Feat, &mb->un.varRdRev.sli3Feat, sizeof(uint32_t));
+       vp->rev.sli1FwRev = mb->un.varRdRev.sli1FwRev;
+       memcpy(vp->rev.sli1FwName, (char*) mb->un.varRdRev.sli1FwName, 16);
+       vp->rev.sli2FwRev = mb->un.varRdRev.sli2FwRev;
+       memcpy(vp->rev.sli2FwName, (char *) mb->un.varRdRev.sli2FwName, 16);
        vp->rev.biuRev = mb->un.varRdRev.biuRev;
        vp->rev.smRev = mb->un.varRdRev.smRev;
        vp->rev.smFwRev = mb->un.varRdRev.un.smFwRev;
@@ -165,13 +171,17 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
        vp->rev.postKernRev = mb->un.varRdRev.postKernRev;
        vp->rev.opFwRev = mb->un.varRdRev.opFwRev;
 
+       /* If the sli feature level is less then 9, we must
+        * tear down all RPIs and VPIs on link down if NPIV
+        * is enabled.
+        */
+       if (vp->rev.feaLevelHigh < 9)
+               phba->sli3_options |= LPFC_SLI3_VPORT_TEARDOWN;
+
        if (lpfc_is_LC_HBA(phba->pcidev->device))
                memcpy(phba->RandomData, (char *)&mb->un.varWords[24],
                                                sizeof (phba->RandomData));
 
-       /* Get the default values for Model Name and Description */
-       lpfc_get_hba_model_desc(phba, phba->ModelName, phba->ModelDesc);
-
        /* Get adapter VPD information */
        pmb->context2 = kmalloc(DMP_RSP_SIZE, GFP_KERNEL);
        if (!pmb->context2)
@@ -186,20 +196,18 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
 
                if (rc != MBX_SUCCESS) {
                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
-                                       "%d:0441 VPD not present on adapter, "
+                                       "0441 VPD not present on adapter, "
                                        "mbxCmd x%x DUMP VPD, mbxStatus x%x\n",
-                                       phba->brd_no,
                                        mb->mbxCommand, mb->mbxStatus);
-                       kfree(lpfc_vpd_data);
-                       lpfc_vpd_data = NULL;
-                       break;
+                       mb->un.varDmp.word_cnt = 0;
                }
-
+               if (mb->un.varDmp.word_cnt > DMP_VPD_SIZE - offset)
+                       mb->un.varDmp.word_cnt = DMP_VPD_SIZE - offset;
                lpfc_sli_pcimem_bcopy(pmb->context2, lpfc_vpd_data + offset,
-                                                       mb->un.varDmp.word_cnt);
+                                     mb->un.varDmp.word_cnt);
                offset += mb->un.varDmp.word_cnt;
-       } while (mb->un.varDmp.word_cnt);
-       lpfc_parse_vpd(phba, lpfc_vpd_data);
+       } while (mb->un.varDmp.word_cnt && offset < DMP_VPD_SIZE);
+       lpfc_parse_vpd(phba, lpfc_vpd_data, offset);
 
        kfree(lpfc_vpd_data);
 out_free_context2:
@@ -209,59 +217,77 @@ out_free_mbox:
        return 0;
 }
 
-/************************************************************************/
-/*                                                                      */
-/*    lpfc_config_port_post                                             */
-/*    This routine will do LPFC initialization after the                */
-/*    CONFIG_PORT mailbox command. This will be initialized             */
-/*    as a SLI layer callback routine.                                  */
-/*    This routine returns 0 on success. Any other return value         */
-/*    indicates an error.                                               */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_config_async_cmpl: Completion handler for config async event mbox cmd.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmboxq: pointer to the driver internal queue element for mailbox command.
+ *
+ * This is the completion handler for driver's configuring asynchronous event
+ * mailbox command to the device. If the mailbox command returns successfully,
+ * it will set internal async event support flag to 1; otherwise, it will
+ * set internal async event support flag to 0.
+ **/
+static void
+lpfc_config_async_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
+{
+       if (pmboxq->mb.mbxStatus == MBX_SUCCESS)
+               phba->temp_sensor_support = 1;
+       else
+               phba->temp_sensor_support = 0;
+       mempool_free(pmboxq, phba->mbox_mem_pool);
+       return;
+}
+
+/**
+ * lpfc_config_port_post: Perform lpfc initialization after config port.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine will do LPFC initialization after the CONFIG_PORT mailbox
+ * command call. It performs all internal resource and state setups on the
+ * port: post IOCB buffers, enable appropriate host interrupt attentions,
+ * ELS ring timers, etc.
+ *
+ * Return codes
+ *   0 - success.
+ *   Any other value - error.
+ **/
 int
-lpfc_config_port_post(struct lpfc_hba * phba)
+lpfc_config_port_post(struct lpfc_hba *phba)
 {
+       struct lpfc_vport *vport = phba->pport;
        LPFC_MBOXQ_t *pmb;
        MAILBOX_t *mb;
        struct lpfc_dmabuf *mp;
        struct lpfc_sli *psli = &phba->sli;
        uint32_t status, timeout;
-       int i, j, rc;
+       int i, j;
+       int rc;
+
+       spin_lock_irq(&phba->hbalock);
+       /*
+        * If the Config port completed correctly the HBA is not
+        * over heated any more.
+        */
+       if (phba->over_temp_state == HBA_OVER_TEMP)
+               phba->over_temp_state = HBA_NORMAL_TEMP;
+       spin_unlock_irq(&phba->hbalock);
 
        pmb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        if (!pmb) {
-               phba->hba_state = LPFC_HBA_ERROR;
+               phba->link_state = LPFC_HBA_ERROR;
                return -ENOMEM;
        }
        mb = &pmb->mb;
 
-       lpfc_config_link(phba, pmb);
-       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
-       if (rc != MBX_SUCCESS) {
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0447 Adapter failed init, mbxCmd x%x "
-                               "CONFIG_LINK mbxStatus x%x\n",
-                               phba->brd_no,
-                               mb->mbxCommand, mb->mbxStatus);
-               phba->hba_state = LPFC_HBA_ERROR;
-               mempool_free( pmb, phba->mbox_mem_pool);
-               return -EIO;
-       }
-
        /* Get login parameters for NID.  */
-       lpfc_read_sparam(phba, pmb);
+       lpfc_read_sparam(phba, pmb, 0);
+       pmb->vport = vport;
        if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0448 Adapter failed init, mbxCmd x%x "
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0448 Adapter failed init, mbxCmd x%x "
                                "READ_SPARM mbxStatus x%x\n",
-                               phba->brd_no,
                                mb->mbxCommand, mb->mbxStatus);
-               phba->hba_state = LPFC_HBA_ERROR;
+               phba->link_state = LPFC_HBA_ERROR;
                mp = (struct lpfc_dmabuf *) pmb->context1;
                mempool_free( pmb, phba->mbox_mem_pool);
                lpfc_mbuf_free(phba, mp->virt, mp->phys);
@@ -271,21 +297,27 @@ lpfc_config_port_post(struct lpfc_hba * phba)
 
        mp = (struct lpfc_dmabuf *) pmb->context1;
 
-       memcpy(&phba->fc_sparam, mp->virt, sizeof (struct serv_parm));
+       memcpy(&vport->fc_sparam, mp->virt, sizeof (struct serv_parm));
        lpfc_mbuf_free(phba, mp->virt, mp->phys);
        kfree(mp);
        pmb->context1 = NULL;
 
-       memcpy(&phba->fc_nodename, &phba->fc_sparam.nodeName,
+       if (phba->cfg_soft_wwnn)
+               u64_to_wwn(phba->cfg_soft_wwnn,
+                          vport->fc_sparam.nodeName.u.wwn);
+       if (phba->cfg_soft_wwpn)
+               u64_to_wwn(phba->cfg_soft_wwpn,
+                          vport->fc_sparam.portName.u.wwn);
+       memcpy(&vport->fc_nodename, &vport->fc_sparam.nodeName,
               sizeof (struct lpfc_name));
-       memcpy(&phba->fc_portname, &phba->fc_sparam.portName,
+       memcpy(&vport->fc_portname, &vport->fc_sparam.portName,
               sizeof (struct lpfc_name));
        /* If no serial number in VPD data, use low 6 bytes of WWNN */
        /* This should be consolidated into parse_vpd ? - mr */
        if (phba->SerialNumber[0] == 0) {
                uint8_t *outptr;
 
-               outptr = &phba->fc_nodename.u.s.IEEE[0];
+               outptr = &vport->fc_nodename.u.s.IEEE[0];
                for (i = 0; i < 12; i++) {
                        status = *outptr++;
                        j = ((status & 0xf0) >> 4);
@@ -306,25 +338,14 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                }
        }
 
-       /* This should turn on DELAYED ABTS for ELS timeouts */
-       lpfc_set_slim(phba, pmb, 0x052198, 0x1);
-       if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
-               phba->hba_state = LPFC_HBA_ERROR;
-               mempool_free( pmb, phba->mbox_mem_pool);
-               return -EIO;
-       }
-
-
        lpfc_read_config(phba, pmb);
+       pmb->vport = vport;
        if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0453 Adapter failed to init, mbxCmd x%x "
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0453 Adapter failed to init, mbxCmd x%x "
                                "READ_CONFIG, mbxStatus x%x\n",
-                               phba->brd_no,
                                mb->mbxCommand, mb->mbxStatus);
-               phba->hba_state = LPFC_HBA_ERROR;
+               phba->link_state = LPFC_HBA_ERROR;
                mempool_free( pmb, phba->mbox_mem_pool);
                return -EIO;
        }
@@ -335,38 +356,45 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                        mb->un.varRdConfig.max_xri + 1;
 
        phba->lmt = mb->un.varRdConfig.lmt;
-       /* HBA is not 4GB capable, or HBA is not 2GB capable,
-       don't let link speed ask for it */
-       if ((((phba->lmt & LMT_4250_10bit) != LMT_4250_10bit) &&
-               (phba->cfg_link_speed > LINK_SPEED_2G)) ||
-               (((phba->lmt & LMT_2125_10bit) != LMT_2125_10bit) &&
-               (phba->cfg_link_speed > LINK_SPEED_1G))) {
-               /* Reset link speed to auto. 1G/2GB HBA cfg'd for 4G */
-               lpfc_printf_log(phba,
-                       KERN_WARNING,
-                       LOG_LINK_EVENT,
-                       "%d:1302 Invalid speed for this board: "
+
+       /* Get the default values for Model Name and Description */
+       lpfc_get_hba_model_desc(phba, phba->ModelName, phba->ModelDesc);
+
+       if ((phba->cfg_link_speed > LINK_SPEED_10G)
+           || ((phba->cfg_link_speed == LINK_SPEED_1G)
+               && !(phba->lmt & LMT_1Gb))
+           || ((phba->cfg_link_speed == LINK_SPEED_2G)
+               && !(phba->lmt & LMT_2Gb))
+           || ((phba->cfg_link_speed == LINK_SPEED_4G)
+               && !(phba->lmt & LMT_4Gb))
+           || ((phba->cfg_link_speed == LINK_SPEED_8G)
+               && !(phba->lmt & LMT_8Gb))
+           || ((phba->cfg_link_speed == LINK_SPEED_10G)
+               && !(phba->lmt & LMT_10Gb))) {
+               /* Reset link speed to auto */
+               lpfc_printf_log(phba, KERN_WARNING, LOG_LINK_EVENT,
+                       "1302 Invalid speed for this board: "
                        "Reset link speed to auto: x%x\n",
-                       phba->brd_no,
                        phba->cfg_link_speed);
                        phba->cfg_link_speed = LINK_SPEED_AUTO;
        }
 
-       phba->hba_state = LPFC_LINK_DOWN;
+       phba->link_state = LPFC_LINK_DOWN;
 
-       /* Only process IOCBs on ring 0 till hba_state is READY */
-       if (psli->ring[psli->ip_ring].cmdringaddr)
-               psli->ring[psli->ip_ring].flag |= LPFC_STOP_IOCB_EVENT;
+       /* Only process IOCBs on ELS ring till hba_state is READY */
+       if (psli->ring[psli->extra_ring].cmdringaddr)
+               psli->ring[psli->extra_ring].flag |= LPFC_STOP_IOCB_EVENT;
        if (psli->ring[psli->fcp_ring].cmdringaddr)
                psli->ring[psli->fcp_ring].flag |= LPFC_STOP_IOCB_EVENT;
        if (psli->ring[psli->next_ring].cmdringaddr)
                psli->ring[psli->next_ring].flag |= LPFC_STOP_IOCB_EVENT;
 
        /* Post receive buffers for desired rings */
-       lpfc_post_rcv_buf(phba);
+       if (phba->sli_rev != 3)
+               lpfc_post_rcv_buf(phba);
 
        /* Enable appropriate host interrupts */
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(&phba->hbalock);
        status = readl(phba->HCregaddr);
        status |= HC_MBINT_ENA | HC_ERINT_ENA | HC_LAINT_ENA;
        if (psli->num_rings > 0)
@@ -378,26 +406,32 @@ lpfc_config_port_post(struct lpfc_hba * phba)
        if (psli->num_rings > 3)
                status |= HC_R3INT_ENA;
 
+       if ((phba->cfg_poll & ENABLE_FCP_RING_POLLING) &&
+           (phba->cfg_poll & DISABLE_FCP_RING_INT))
+               status &= ~(HC_R0INT_ENA << LPFC_FCP_RING);
+
        writel(status, phba->HCregaddr);
        readl(phba->HCregaddr); /* flush */
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
 
        /*
         * Setup the ring 0 (els)  timeout handler
         */
        timeout = phba->fc_ratov << 1;
-       phba->els_tmofunc.expires = jiffies + HZ * timeout;
-       add_timer(&phba->els_tmofunc);
+       mod_timer(&vport->els_tmofunc, jiffies + HZ * timeout);
+       mod_timer(&phba->hb_tmofunc, jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+       phba->hb_outstanding = 0;
+       phba->last_completion_time = jiffies;
 
        lpfc_init_link(phba, pmb, phba->cfg_topology, phba->cfg_link_speed);
        pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
-       if (lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT) != MBX_SUCCESS) {
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0454 Adapter failed to init, mbxCmd x%x "
+       pmb->vport = vport;
+       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
+       lpfc_set_loopback_flag(phba);
+       if (rc != MBX_SUCCESS) {
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0454 Adapter failed to init, mbxCmd x%x "
                                "INIT_LINK, mbxStatus x%x\n",
-                               phba->brd_no,
                                mb->mbxCommand, mb->mbxStatus);
 
                /* Clear all interrupt enable conditions */
@@ -407,103 +441,377 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                writel(0xffffffff, phba->HAregaddr);
                readl(phba->HAregaddr); /* flush */
 
-               phba->hba_state = LPFC_HBA_ERROR;
-               mempool_free(pmb, phba->mbox_mem_pool);
+               phba->link_state = LPFC_HBA_ERROR;
+               if (rc != MBX_BUSY)
+                       mempool_free(pmb, phba->mbox_mem_pool);
                return -EIO;
        }
        /* MBOX buffer will be freed in mbox compl */
+       pmb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       lpfc_config_async(phba, pmb, LPFC_ELS_RING);
+       pmb->mbox_cmpl = lpfc_config_async_cmpl;
+       pmb->vport = phba->pport;
+       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
 
-       i = 0;
-       while ((phba->hba_state != LPFC_HBA_READY) ||
-              (phba->num_disc_nodes) || (phba->fc_prli_sent) ||
-              ((phba->fc_map_cnt == 0) && (i<2)) ||
-              (psli->sli_flag & LPFC_SLI_MBOX_ACTIVE)) {
-               /* Check every second for 30 retries. */
-               i++;
-               if (i > 30) {
-                       break;
-               }
-               if ((i >= 15) && (phba->hba_state <= LPFC_LINK_DOWN)) {
-                       /* The link is down.  Set linkdown timeout */
-                       break;
-               }
-
-               /* Delay for 1 second to give discovery time to complete. */
-               msleep(1000);
-
+       if ((rc != MBX_BUSY) && (rc != MBX_SUCCESS)) {
+               lpfc_printf_log(phba,
+                               KERN_ERR,
+                               LOG_INIT,
+                               "0456 Adapter failed to issue "
+                               "ASYNCEVT_ENABLE mbox status x%x \n.",
+                               rc);
+               mempool_free(pmb, phba->mbox_mem_pool);
        }
-
-       /* Since num_disc_nodes keys off of PLOGI, delay a bit to let
-        * any potential PRLIs to flush thru the SLI sub-system.
-        */
-       msleep(50);
-
        return (0);
 }
 
-/************************************************************************/
-/*                                                                      */
-/*    lpfc_hba_down_prep                                                */
-/*    This routine will do LPFC uninitialization before the             */
-/*    HBA is reset when bringing down the SLI Layer. This will be       */
-/*    initialized as a SLI layer callback routine.                      */
-/*    This routine returns 0 on success. Any other return value         */
-/*    indicates an error.                                               */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_hba_down_prep: Perform lpfc uninitialization prior to HBA reset.
+ * @phba: pointer to lpfc HBA data structure.
+ *
+ * This routine will do LPFC uninitialization before the HBA is reset when
+ * bringing down the SLI Layer.
+ *
+ * Return codes
+ *   0 - success.
+ *   Any other value - error.
+ **/
 int
-lpfc_hba_down_prep(struct lpfc_hba * phba)
+lpfc_hba_down_prep(struct lpfc_hba *phba)
 {
+       struct lpfc_vport **vports;
+       int i;
        /* Disable interrupts */
        writel(0, phba->HCregaddr);
        readl(phba->HCregaddr); /* flush */
 
-       /* Cleanup potential discovery resources */
-       lpfc_els_flush_rscn(phba);
-       lpfc_els_flush_cmd(phba);
-       lpfc_disc_flush_list(phba);
+       if (phba->pport->load_flag & FC_UNLOADING)
+               lpfc_cleanup_discovery_resources(phba->pport);
+       else {
+               vports = lpfc_create_vport_work_array(phba);
+               if (vports != NULL)
+                       for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++)
+                               lpfc_cleanup_discovery_resources(vports[i]);
+               lpfc_destroy_vport_work_array(phba, vports);
+       }
+       return 0;
+}
 
-       return (0);
+/**
+ * lpfc_hba_down_post: Perform lpfc uninitialization after HBA reset.
+ * @phba: pointer to lpfc HBA data structure.
+ *
+ * This routine will do uninitialization after the HBA is reset when bring
+ * down the SLI Layer.
+ *
+ * Return codes
+ *   0 - sucess.
+ *   Any other value - error.
+ **/
+int
+lpfc_hba_down_post(struct lpfc_hba *phba)
+{
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring *pring;
+       struct lpfc_dmabuf *mp, *next_mp;
+       struct lpfc_iocbq *iocb;
+       IOCB_t *cmd = NULL;
+       LIST_HEAD(completions);
+       int i;
+
+       if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED)
+               lpfc_sli_hbqbuf_free_all(phba);
+       else {
+               /* Cleanup preposted buffers on the ELS ring */
+               pring = &psli->ring[LPFC_ELS_RING];
+               list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
+                       list_del(&mp->list);
+                       pring->postbufq_cnt--;
+                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                       kfree(mp);
+               }
+       }
+
+       spin_lock_irq(&phba->hbalock);
+       for (i = 0; i < psli->num_rings; i++) {
+               pring = &psli->ring[i];
+
+               /* At this point in time the HBA is either reset or DOA. Either
+                * way, nothing should be on txcmplq as it will NEVER complete.
+                */
+               list_splice_init(&pring->txcmplq, &completions);
+               pring->txcmplq_cnt = 0;
+               spin_unlock_irq(&phba->hbalock);
+
+               while (!list_empty(&completions)) {
+                       iocb = list_get_first(&completions, struct lpfc_iocbq,
+                               list);
+                       cmd = &iocb->iocb;
+                       list_del_init(&iocb->list);
+
+                       if (!iocb->iocb_cmpl)
+                               lpfc_sli_release_iocbq(phba, iocb);
+                       else {
+                               cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                               cmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
+                               (iocb->iocb_cmpl) (phba, iocb, iocb);
+                       }
+               }
+
+               lpfc_sli_abort_iocb_ring(phba, pring);
+               spin_lock_irq(&phba->hbalock);
+       }
+       spin_unlock_irq(&phba->hbalock);
+
+       return 0;
+}
+
+/**
+ * lpfc_hb_timeout: The HBA-timer timeout handler.
+ * @ptr: unsigned long holds the pointer to lpfc hba data structure.
+ *
+ * This is the HBA-timer timeout handler registered to the lpfc driver. When
+ * this timer fires, a HBA timeout event shall be posted to the lpfc driver
+ * work-port-events bitmap and the worker thread is notified. This timeout
+ * event will be used by the worker thread to invoke the actual timeout
+ * handler routine, lpfc_hb_timeout_handler. Any periodical operations will
+ * be performed in the timeout handler and the HBA timeout event bit shall
+ * be cleared by the worker thread after it has taken the event bitmap out.
+ **/
+static void
+lpfc_hb_timeout(unsigned long ptr)
+{
+       struct lpfc_hba *phba;
+       uint32_t tmo_posted;
+       unsigned long iflag;
+
+       phba = (struct lpfc_hba *)ptr;
+       spin_lock_irqsave(&phba->pport->work_port_lock, iflag);
+       tmo_posted = phba->pport->work_port_events & WORKER_HB_TMO;
+       if (!tmo_posted)
+               phba->pport->work_port_events |= WORKER_HB_TMO;
+       spin_unlock_irqrestore(&phba->pport->work_port_lock, iflag);
+
+       if (!tmo_posted)
+               lpfc_worker_wake_up(phba);
+       return;
+}
+
+/**
+ * lpfc_hb_mbox_cmpl: The lpfc heart-beat mailbox command callback function.
+ * @phba: pointer to lpfc hba data structure.
+ * @pmboxq: pointer to the driver internal queue element for mailbox command.
+ *
+ * This is the callback function to the lpfc heart-beat mailbox command.
+ * If configured, the lpfc driver issues the heart-beat mailbox command to
+ * the HBA every LPFC_HB_MBOX_INTERVAL (current 5) seconds. At the time the
+ * heart-beat mailbox command is issued, the driver shall set up heart-beat
+ * timeout timer to LPFC_HB_MBOX_TIMEOUT (current 30) seconds and marks
+ * heart-beat outstanding state. Once the mailbox command comes back and
+ * no error conditions detected, the heart-beat mailbox command timer is
+ * reset to LPFC_HB_MBOX_INTERVAL seconds and the heart-beat outstanding
+ * state is cleared for the next heart-beat. If the timer expired with the
+ * heart-beat outstanding state set, the driver will put the HBA offline.
+ **/
+static void
+lpfc_hb_mbox_cmpl(struct lpfc_hba * phba, LPFC_MBOXQ_t * pmboxq)
+{
+       unsigned long drvr_flag;
+
+       spin_lock_irqsave(&phba->hbalock, drvr_flag);
+       phba->hb_outstanding = 0;
+       spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
+
+       mempool_free(pmboxq, phba->mbox_mem_pool);
+       if (!(phba->pport->fc_flag & FC_OFFLINE_MODE) &&
+               !(phba->link_state == LPFC_HBA_ERROR) &&
+               !(phba->pport->load_flag & FC_UNLOADING))
+               mod_timer(&phba->hb_tmofunc,
+                       jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+       return;
 }
 
-/************************************************************************/
-/*                                                                      */
-/*    lpfc_handle_eratt                                                 */
-/*    This routine will handle processing a Host Attention              */
-/*    Error Status event. This will be initialized                      */
-/*    as a SLI layer callback routine.                                  */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_hb_timeout_handler: The HBA-timer timeout handler.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This is the actual HBA-timer timeout handler to be invoked by the worker
+ * thread whenever the HBA timer fired and HBA-timeout event posted. This
+ * handler performs any periodic operations needed for the device. If such
+ * periodic event has already been attended to either in the interrupt handler
+ * or by processing slow-ring or fast-ring events within the HBA-timer
+ * timeout window (LPFC_HB_MBOX_INTERVAL), this handler just simply resets
+ * the timer for the next timeout period. If lpfc heart-beat mailbox command
+ * is configured and there is no heart-beat mailbox command outstanding, a
+ * heart-beat mailbox is issued and timer set properly. Otherwise, if there
+ * has been a heart-beat mailbox command outstanding, the HBA shall be put
+ * to offline.
+ **/
 void
-lpfc_handle_eratt(struct lpfc_hba * phba)
+lpfc_hb_timeout_handler(struct lpfc_hba *phba)
 {
+       LPFC_MBOXQ_t *pmboxq;
+       struct lpfc_dmabuf *buf_ptr;
+       int retval;
        struct lpfc_sli *psli = &phba->sli;
-       struct lpfc_sli_ring  *pring;
+       LIST_HEAD(completions);
 
-       /*
-        * If a reset is sent to the HBA restore PCI configuration registers.
-        */
-       if ( phba->hba_state == LPFC_INIT_START ) {
-               mdelay(1);
-               readl(phba->HCregaddr); /* flush */
-               writel(0, phba->HCregaddr);
-               readl(phba->HCregaddr); /* flush */
+       if ((phba->link_state == LPFC_HBA_ERROR) ||
+               (phba->pport->load_flag & FC_UNLOADING) ||
+               (phba->pport->fc_flag & FC_OFFLINE_MODE))
+               return;
+
+       spin_lock_irq(&phba->pport->work_port_lock);
+       /* If the timer is already canceled do nothing */
+       if (!(phba->pport->work_port_events & WORKER_HB_TMO)) {
+               spin_unlock_irq(&phba->pport->work_port_lock);
+               return;
+       }
 
-               /* Restore PCI cmd register */
-               pci_write_config_word(phba->pcidev,
-                                     PCI_COMMAND, phba->pci_cfg_value);
+       if (time_after(phba->last_completion_time + LPFC_HB_MBOX_INTERVAL * HZ,
+               jiffies)) {
+               spin_unlock_irq(&phba->pport->work_port_lock);
+               if (!phba->hb_outstanding)
+                       mod_timer(&phba->hb_tmofunc,
+                               jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+               else
+                       mod_timer(&phba->hb_tmofunc,
+                               jiffies + HZ * LPFC_HB_MBOX_TIMEOUT);
+               return;
        }
+       spin_unlock_irq(&phba->pport->work_port_lock);
+
+       if (phba->elsbuf_cnt &&
+               (phba->elsbuf_cnt == phba->elsbuf_prev_cnt)) {
+               spin_lock_irq(&phba->hbalock);
+               list_splice_init(&phba->elsbuf, &completions);
+               phba->elsbuf_cnt = 0;
+               phba->elsbuf_prev_cnt = 0;
+               spin_unlock_irq(&phba->hbalock);
+
+               while (!list_empty(&completions)) {
+                       list_remove_head(&completions, buf_ptr,
+                               struct lpfc_dmabuf, list);
+                       lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
+                       kfree(buf_ptr);
+               }
+       }
+       phba->elsbuf_prev_cnt = phba->elsbuf_cnt;
+
+       /* If there is no heart beat outstanding, issue a heartbeat command */
+       if (phba->cfg_enable_hba_heartbeat) {
+               if (!phba->hb_outstanding) {
+                       pmboxq = mempool_alloc(phba->mbox_mem_pool,GFP_KERNEL);
+                       if (!pmboxq) {
+                               mod_timer(&phba->hb_tmofunc,
+                                         jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+                               return;
+                       }
+
+                       lpfc_heart_beat(phba, pmboxq);
+                       pmboxq->mbox_cmpl = lpfc_hb_mbox_cmpl;
+                       pmboxq->vport = phba->pport;
+                       retval = lpfc_sli_issue_mbox(phba, pmboxq, MBX_NOWAIT);
+
+                       if (retval != MBX_BUSY && retval != MBX_SUCCESS) {
+                               mempool_free(pmboxq, phba->mbox_mem_pool);
+                               mod_timer(&phba->hb_tmofunc,
+                                         jiffies + HZ * LPFC_HB_MBOX_INTERVAL);
+                               return;
+                       }
+                       mod_timer(&phba->hb_tmofunc,
+                                 jiffies + HZ * LPFC_HB_MBOX_TIMEOUT);
+                       phba->hb_outstanding = 1;
+                       return;
+               } else {
+                       /*
+                       * If heart beat timeout called with hb_outstanding set
+                       * we need to take the HBA offline.
+                       */
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                       "0459 Adapter heartbeat failure, "
+                                       "taking this port offline.\n");
+
+                       spin_lock_irq(&phba->hbalock);
+                       psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+                       spin_unlock_irq(&phba->hbalock);
+
+                       lpfc_offline_prep(phba);
+                       lpfc_offline(phba);
+                       lpfc_unblock_mgmt_io(phba);
+                       phba->link_state = LPFC_HBA_ERROR;
+                       lpfc_hba_down_post(phba);
+               }
+       }
+}
+
+/**
+ * lpfc_offline_eratt: Bring lpfc offline on hardware error attention.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is called to bring the HBA offline when HBA hardware error
+ * other than Port Error 6 has been detected.
+ **/
+static void
+lpfc_offline_eratt(struct lpfc_hba *phba)
+{
+       struct lpfc_sli   *psli = &phba->sli;
+
+       spin_lock_irq(&phba->hbalock);
+       psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+       spin_unlock_irq(&phba->hbalock);
+       lpfc_offline_prep(phba);
+
+       lpfc_offline(phba);
+       lpfc_reset_barrier(phba);
+       lpfc_sli_brdreset(phba);
+       lpfc_hba_down_post(phba);
+       lpfc_sli_brdready(phba, HS_MBRDY);
+       lpfc_unblock_mgmt_io(phba);
+       phba->link_state = LPFC_HBA_ERROR;
+       return;
+}
+
+/**
+ * lpfc_handle_eratt: The HBA hardware error handler.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to handle the following HBA hardware error
+ * conditions:
+ * 1 - HBA error attention interrupt
+ * 2 - DMA ring index out of range
+ * 3 - Mailbox command came back as unknown
+ **/
+void
+lpfc_handle_eratt(struct lpfc_hba *phba)
+{
+       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_sli   *psli = &phba->sli;
+       struct lpfc_sli_ring  *pring;
+       uint32_t event_data;
+       unsigned long temperature;
+       struct temp_event temp_event_data;
+       struct Scsi_Host  *shost;
+
+       /* If the pci channel is offline, ignore possible errors,
+        * since we cannot communicate with the pci card anyway. */
+       if (pci_channel_offline(phba->pcidev))
+               return;
+       /* If resets are disabled then leave the HBA alone and return */
+       if (!phba->cfg_enable_hba_reset)
+               return;
 
        if (phba->work_hs & HS_FFER6) {
                /* Re-establishing Link */
                lpfc_printf_log(phba, KERN_INFO, LOG_LINK_EVENT,
-                               "%d:1301 Re-establishing Link "
+                               "1301 Re-establishing Link "
                                "Data: x%x x%x x%x\n",
-                               phba->brd_no, phba->work_hs,
+                               phba->work_hs,
                                phba->work_status[0], phba->work_status[1]);
-               spin_lock_irq(phba->host->host_lock);
-               phba->fc_flag |= FC_ESTABLISH_LINK;
-               spin_unlock_irq(phba->host->host_lock);
+
+               spin_lock_irq(&phba->hbalock);
+               psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+               spin_unlock_irq(&phba->hbalock);
 
                /*
                * Firmware stops when it triggled erratt with HS_FFER6.
@@ -514,86 +822,132 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                pring = &psli->ring[psli->fcp_ring];
                lpfc_sli_abort_iocb_ring(phba, pring);
 
-
                /*
                 * There was a firmware error.  Take the hba offline and then
                 * attempt to restart it.
                 */
+               lpfc_offline_prep(phba);
                lpfc_offline(phba);
+               lpfc_sli_brdrestart(phba);
                if (lpfc_online(phba) == 0) {   /* Initialize the HBA */
-                       mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
+                       lpfc_unblock_mgmt_io(phba);
                        return;
                }
+               lpfc_unblock_mgmt_io(phba);
+       } else if (phba->work_hs & HS_CRIT_TEMP) {
+               temperature = readl(phba->MBslimaddr + TEMPERATURE_OFFSET);
+               temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;
+               temp_event_data.event_code = LPFC_CRIT_TEMP;
+               temp_event_data.data = (uint32_t)temperature;
+
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0459 Adapter maximum temperature exceeded "
+                               "(%ld), taking this port offline "
+                               "Data: x%x x%x x%x\n",
+                               temperature, phba->work_hs,
+                               phba->work_status[0], phba->work_status[1]);
+
+               shost = lpfc_shost_from_vport(phba->pport);
+               fc_host_post_vendor_event(shost, fc_get_event_number(),
+                                         sizeof(temp_event_data),
+                                         (char *) &temp_event_data,
+                                         SCSI_NL_VID_TYPE_PCI
+                                         | PCI_VENDOR_ID_EMULEX);
+
+               spin_lock_irq(&phba->hbalock);
+               phba->over_temp_state = HBA_OVER_TEMP;
+               spin_unlock_irq(&phba->hbalock);
+               lpfc_offline_eratt(phba);
+
        } else {
                /* The if clause above forces this code path when the status
                 * failure is a value other than FFER6.  Do not call the offline
                 *  twice. This is the adapter hardware error path.
                 */
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                               "%d:0457 Adapter Hardware Error "
+                               "0457 Adapter Hardware Error "
                                "Data: x%x x%x x%x\n",
-                               phba->brd_no, phba->work_hs,
+                               phba->work_hs,
                                phba->work_status[0], phba->work_status[1]);
 
-               lpfc_offline(phba);
+               event_data = FC_REG_DUMP_EVENT;
+               shost = lpfc_shost_from_vport(vport);
+               fc_host_post_vendor_event(shost, fc_get_event_number(),
+                               sizeof(event_data), (char *) &event_data,
+                               SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
 
+               lpfc_offline_eratt(phba);
        }
 }
 
-/************************************************************************/
-/*                                                                      */
-/*    lpfc_handle_latt                                                  */
-/*    This routine will handle processing a Host Attention              */
-/*    Link Status event. This will be initialized                       */
-/*    as a SLI layer callback routine.                                  */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_handle_latt: The HBA link event handler.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked from the worker thread to handle a HBA host
+ * attention link event.
+ **/
 void
-lpfc_handle_latt(struct lpfc_hba * phba)
+lpfc_handle_latt(struct lpfc_hba *phba)
 {
-       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_sli   *psli = &phba->sli;
        LPFC_MBOXQ_t *pmb;
        volatile uint32_t control;
        struct lpfc_dmabuf *mp;
-       int rc = -ENOMEM;
+       int rc = 0;
 
        pmb = (LPFC_MBOXQ_t *)mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
-       if (!pmb)
+       if (!pmb) {
+               rc = 1;
                goto lpfc_handle_latt_err_exit;
+       }
 
        mp = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
-       if (!mp)
+       if (!mp) {
+               rc = 2;
                goto lpfc_handle_latt_free_pmb;
+       }
 
        mp->virt = lpfc_mbuf_alloc(phba, 0, &mp->phys);
-       if (!mp->virt)
+       if (!mp->virt) {
+               rc = 3;
                goto lpfc_handle_latt_free_mp;
+       }
 
-       rc = -EIO;
-
+       /* Cleanup any outstanding ELS commands */
+       lpfc_els_flush_all_cmd(phba);
 
        psli->slistat.link_event++;
        lpfc_read_la(phba, pmb, mp);
        pmb->mbox_cmpl = lpfc_mbx_cmpl_read_la;
-       rc = lpfc_sli_issue_mbox (phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB));
-       if (rc == MBX_NOT_FINISHED)
-               goto lpfc_handle_latt_free_mp;
+       pmb->vport = vport;
+       /* Block ELS IOCBs until we have processed this mbox command */
+       phba->sli.ring[LPFC_ELS_RING].flag |= LPFC_STOP_IOCB_EVENT;
+       rc = lpfc_sli_issue_mbox (phba, pmb, MBX_NOWAIT);
+       if (rc == MBX_NOT_FINISHED) {
+               rc = 4;
+               goto lpfc_handle_latt_free_mbuf;
+       }
 
        /* Clear Link Attention in HA REG */
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(&phba->hbalock);
        writel(HA_LATT, phba->HAregaddr);
        readl(phba->HAregaddr); /* flush */
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
 
        return;
 
+lpfc_handle_latt_free_mbuf:
+       phba->sli.ring[LPFC_ELS_RING].flag &= ~LPFC_STOP_IOCB_EVENT;
+       lpfc_mbuf_free(phba, mp->virt, mp->phys);
 lpfc_handle_latt_free_mp:
        kfree(mp);
 lpfc_handle_latt_free_pmb:
-       kfree(pmb);
+       mempool_free(pmb, phba->mbox_mem_pool);
 lpfc_handle_latt_err_exit:
        /* Enable Link attention interrupts */
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(&phba->hbalock);
        psli->sli_flag |= LPFC_PROCESS_LA;
        control = readl(phba->HCregaddr);
        control |= HC_LAINT_ENA;
@@ -603,32 +957,35 @@ lpfc_handle_latt_err_exit:
        /* Clear Link Attention in HA REG */
        writel(HA_LATT, phba->HAregaddr);
        readl(phba->HAregaddr); /* flush */
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
        lpfc_linkdown(phba);
-       phba->hba_state = LPFC_HBA_ERROR;
+       phba->link_state = LPFC_HBA_ERROR;
 
-       /* The other case is an error from issue_mbox */
-       if (rc == -ENOMEM)
-               lpfc_printf_log(phba,
-                               KERN_WARNING,
-                               LOG_MBOX,
-                               "%d:0300 READ_LA: no buffers\n",
-                               phba->brd_no);
+       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
+                    "0300 LATT: Cannot issue READ_LA: Data:%d\n", rc);
 
        return;
 }
 
-/************************************************************************/
-/*                                                                      */
-/*   lpfc_parse_vpd                                                     */
-/*   This routine will parse the VPD data                               */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_parse_vpd: Parse VPD (Vital Product Data).
+ * @phba: pointer to lpfc hba data structure.
+ * @vpd: pointer to the vital product data.
+ * @len: length of the vital product data in bytes.
+ *
+ * This routine parses the Vital Product Data (VPD). The VPD is treated as
+ * an array of characters. In this routine, the ModelName, ProgramType, and
+ * ModelDesc, etc. fields of the phba data structure will be populated.
+ *
+ * Return codes
+ *   0 - pointer to the VPD passed in is NULL
+ *   1 - success
+ **/
 static int
-lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
+lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len)
 {
        uint8_t lenlo, lenhi;
-       uint32_t Length;
+       int Length;
        int i, j;
        int finished = 0;
        int index = 0;
@@ -637,16 +994,14 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                return 0;
 
        /* Vital Product */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_INIT,
-                       "%d:0455 Vital Product Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
+       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                       "0455 Vital Product Data: x%x x%x x%x x%x\n",
                        (uint32_t) vpd[0], (uint32_t) vpd[1], (uint32_t) vpd[2],
                        (uint32_t) vpd[3]);
-       do {
+       while (!finished && (index < (len - 4))) {
                switch (vpd[index]) {
                case 0x82:
+               case 0x91:
                        index += 1;
                        lenlo = vpd[index];
                        index += 1;
@@ -662,7 +1017,8 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                        lenhi = vpd[index];
                        index += 1;
                        Length = ((((unsigned short)lenhi) << 8) + lenlo);
-
+                       if (Length > len - index)
+                               Length = len - index;
                        while (Length > 0) {
                        /* Look for Serial Number */
                        if ((vpd[index] == 'S') && (vpd[index+1] == 'N')) {
@@ -756,118 +1112,187 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                        index ++;
                        break;
                }
-       } while (!finished && (index < 108));
+       }
 
        return(1);
 }
 
+/**
+ * lpfc_get_hba_model_desc: Retrieve HBA device model name and description.
+ * @phba: pointer to lpfc hba data structure.
+ * @mdp: pointer to the data structure to hold the derived model name.
+ * @descp: pointer to the data structure to hold the derived description.
+ *
+ * This routine retrieves HBA's description based on its registered PCI device
+ * ID. The @descp passed into this function points to an array of 256 chars. It
+ * shall be returned with the model name, maximum speed, and the host bus type.
+ * The @mdp passed into this function points to an array of 80 chars. When the
+ * function returns, the @mdp will be filled with the model name.
+ **/
 static void
-lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
+lpfc_get_hba_model_desc(struct lpfc_hba *phba, uint8_t *mdp, uint8_t *descp)
 {
        lpfc_vpd_t *vp;
-       uint32_t id;
-       uint8_t hdrtype;
-       char str[16];
+       uint16_t dev_id = phba->pcidev->device;
+       int max_speed;
+       struct {
+               char * name;
+               int    max_speed;
+               char * bus;
+       } m = {"<Unknown>", 0, ""};
+
+       if (mdp && mdp[0] != '\0'
+               && descp && descp[0] != '\0')
+               return;
+
+       if (phba->lmt & LMT_10Gb)
+               max_speed = 10;
+       else if (phba->lmt & LMT_8Gb)
+               max_speed = 8;
+       else if (phba->lmt & LMT_4Gb)
+               max_speed = 4;
+       else if (phba->lmt & LMT_2Gb)
+               max_speed = 2;
+       else
+               max_speed = 1;
 
        vp = &phba->vpd;
-       pci_read_config_dword(phba->pcidev, PCI_VENDOR_ID, &id);
-       pci_read_config_byte(phba->pcidev, PCI_HEADER_TYPE, &hdrtype);
 
-       switch ((id >> 16) & 0xffff) {
+       switch (dev_id) {
        case PCI_DEVICE_ID_FIREFLY:
-               strcpy(str, "LP6000 1");
+               m = (typeof(m)){"LP6000", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_SUPERFLY:
                if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3)
-                       strcpy(str, "LP7000 1");
+                       m = (typeof(m)){"LP7000", max_speed,  "PCI"};
                else
-                       strcpy(str, "LP7000E 1");
+                       m = (typeof(m)){"LP7000E", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_DRAGONFLY:
-               strcpy(str, "LP8000 1");
+               m = (typeof(m)){"LP8000", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_CENTAUR:
                if (FC_JEDEC_ID(vp->rev.biuRev) == CENTAUR_2G_JEDEC_ID)
-                       strcpy(str, "LP9002 2");
+                       m = (typeof(m)){"LP9002", max_speed, "PCI"};
                else
-                       strcpy(str, "LP9000 1");
+                       m = (typeof(m)){"LP9000", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_RFLY:
-               strcpy(str, "LP952 2");
+               m = (typeof(m)){"LP952", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_PEGASUS:
-               strcpy(str, "LP9802 2");
+               m = (typeof(m)){"LP9802", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_THOR:
-               if (hdrtype == 0x80)
-                       strcpy(str, "LP10000DC 2");
-               else
-                       strcpy(str, "LP10000 2");
+               m = (typeof(m)){"LP10000", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_VIPER:
-               strcpy(str, "LPX1000 10");
+               m = (typeof(m)){"LPX1000", max_speed,  "PCI-X"};
                break;
        case PCI_DEVICE_ID_PFLY:
-               strcpy(str, "LP982 2");
+               m = (typeof(m)){"LP982", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_TFLY:
-               if (hdrtype == 0x80)
-                       strcpy(str, "LP1050DC 2");
-               else
-                       strcpy(str, "LP1050 2");
+               m = (typeof(m)){"LP1050", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_HELIOS:
-               if (hdrtype == 0x80)
-                       strcpy(str, "LP11002 4");
-               else
-                       strcpy(str, "LP11000 4");
+               m = (typeof(m)){"LP11000", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_HELIOS_SCSP:
+               m = (typeof(m)){"LP11000-SP", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_HELIOS_DCSP:
+               m = (typeof(m)){"LP11002-SP", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_NEPTUNE:
+               m = (typeof(m)){"LPe1000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_NEPTUNE_SCSP:
+               m = (typeof(m)){"LPe1000-SP", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_NEPTUNE_DCSP:
+               m = (typeof(m)){"LPe1002-SP", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_BMID:
-               strcpy(str, "LP1150 4");
+               m = (typeof(m)){"LP1150", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_BSMB:
-               strcpy(str, "LP111 4");
+               m = (typeof(m)){"LP111", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_ZEPHYR:
-               if (hdrtype == 0x80)
-                       strcpy(str, "LPe11002 4");
-               else
-                       strcpy(str, "LPe11000 4");
+               m = (typeof(m)){"LPe11000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_ZEPHYR_SCSP:
+               m = (typeof(m)){"LPe11000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_ZEPHYR_DCSP:
+               m = (typeof(m)){"LPe11002-SP", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_ZMID:
-               strcpy(str, "LPe1150 4");
+               m = (typeof(m)){"LPe1150", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_ZSMB:
-               strcpy(str, "LPe111 4");
+               m = (typeof(m)){"LPe111", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_LP101:
-               strcpy(str, "LP101 2");
+               m = (typeof(m)){"LP101", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_LP10000S:
-               strcpy(str, "LP10000-S 2");
+               m = (typeof(m)){"LP10000-S", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_LP11000S:
+               m = (typeof(m)){"LP11000-S", max_speed,
+                       "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_LPE11000S:
+               m = (typeof(m)){"LPe11000-S", max_speed,
+                       "PCIe"};
+               break;
+       case PCI_DEVICE_ID_SAT:
+               m = (typeof(m)){"LPe12000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_SAT_MID:
+               m = (typeof(m)){"LPe1250", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_SAT_SMB:
+               m = (typeof(m)){"LPe121", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_SAT_DCSP:
+               m = (typeof(m)){"LPe12002-SP", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_SAT_SCSP:
+               m = (typeof(m)){"LPe12000-SP", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_SAT_S:
+               m = (typeof(m)){"LPe12000-S", max_speed, "PCIe"};
                break;
        default:
-               memset(str, 0, 16);
+               m = (typeof(m)){ NULL };
                break;
        }
-       if (mdp)
-               sscanf(str, "%s", mdp);
-       if (descp)
-               sprintf(descp, "Emulex LightPulse %s Gigabit PCI Fibre "
-                       "Channel Adapter", str);
+
+       if (mdp && mdp[0] == '\0')
+               snprintf(mdp, 79,"%s", m.name);
+       if (descp && descp[0] == '\0')
+               snprintf(descp, 255,
+                        "Emulex %s %dGb %s Fibre Channel Adapter",
+                        m.name, m.max_speed, m.bus);
 }
 
-/**************************************************/
-/*   lpfc_post_buffer                             */
-/*                                                */
-/*   This routine will post count buffers to the  */
-/*   ring with the QUE_RING_BUF_CN command. This  */
-/*   allows 3 buffers / command to be posted.     */
-/*   Returns the number of buffers NOT posted.    */
-/**************************************************/
+/**
+ * lpfc_post_buffer: Post IOCB(s) with DMA buffer descriptor(s) to a IOCB ring.
+ * @phba: pointer to lpfc hba data structure.
+ * @pring: pointer to a IOCB ring.
+ * @cnt: the number of IOCBs to be posted to the IOCB ring.
+ *
+ * This routine posts a given number of IOCBs with the associated DMA buffer
+ * descriptors specified by the cnt argument to the given IOCB ring.
+ *
+ * Return codes
+ *   The number of IOCBs NOT able to be posted to the IOCB ring.
+ **/
 int
-lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
-                int type)
+lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt)
 {
        IOCB_t *icmd;
        struct lpfc_iocbq *iocb;
@@ -878,9 +1303,7 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
        /* While there are buffers to post */
        while (cnt > 0) {
                /* Allocate buffer for  command iocb */
-               spin_lock_irq(phba->host->host_lock);
                iocb = lpfc_sli_get_iocbq(phba);
-               spin_unlock_irq(phba->host->host_lock);
                if (iocb == NULL) {
                        pring->missbufcnt = cnt;
                        return cnt;
@@ -891,14 +1314,10 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                /* Allocate buffer to post */
                mp1 = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL);
                if (mp1)
-                   mp1->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
-                                               &mp1->phys);
-               if (mp1 == 0 || mp1->virt == 0) {
-                       if (mp1)
-                               kfree(mp1);
-                       spin_lock_irq(phba->host->host_lock);
+                   mp1->virt = lpfc_mbuf_alloc(phba, MEM_PRI, &mp1->phys);
+               if (!mp1 || !mp1->virt) {
+                       kfree(mp1);
                        lpfc_sli_release_iocbq(phba, iocb);
-                       spin_unlock_irq(phba->host->host_lock);
                        pring->missbufcnt = cnt;
                        return cnt;
                }
@@ -910,14 +1329,11 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                        if (mp2)
                                mp2->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                            &mp2->phys);
-                       if (mp2 == 0 || mp2->virt == 0) {
-                               if (mp2)
-                                       kfree(mp2);
+                       if (!mp2 || !mp2->virt) {
+                               kfree(mp2);
                                lpfc_mbuf_free(phba, mp1->virt, mp1->phys);
                                kfree(mp1);
-                               spin_lock_irq(phba->host->host_lock);
                                lpfc_sli_release_iocbq(phba, iocb);
-                               spin_unlock_irq(phba->host->host_lock);
                                pring->missbufcnt = cnt;
                                return cnt;
                        }
@@ -943,7 +1359,6 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                icmd->ulpCommand = CMD_QUE_RING_BUF64_CN;
                icmd->ulpLe = 1;
 
-               spin_lock_irq(phba->host->host_lock);
                if (lpfc_sli_issue_iocb(phba, pring, iocb, 0) == IOCB_ERROR) {
                        lpfc_mbuf_free(phba, mp1->virt, mp1->phys);
                        kfree(mp1);
@@ -955,32 +1370,34 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                        }
                        lpfc_sli_release_iocbq(phba, iocb);
                        pring->missbufcnt = cnt;
-                       spin_unlock_irq(phba->host->host_lock);
                        return cnt;
                }
-               spin_unlock_irq(phba->host->host_lock);
                lpfc_sli_ringpostbuf_put(phba, pring, mp1);
-               if (mp2) {
+               if (mp2)
                        lpfc_sli_ringpostbuf_put(phba, pring, mp2);
-               }
        }
        pring->missbufcnt = 0;
        return 0;
 }
 
-/************************************************************************/
-/*                                                                      */
-/*   lpfc_post_rcv_buf                                                  */
-/*   This routine post initial rcv buffers to the configured rings      */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_post_rcv_buf: Post the initial receive IOCB buffers to ELS ring.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine posts initial receive IOCB buffers to the ELS ring. The
+ * current number of initial IOCB buffers specified by LPFC_BUF_RING0 is
+ * set to 64 IOCBs.
+ *
+ * Return codes
+ *   0 - success (currently always success)
+ **/
 static int
-lpfc_post_rcv_buf(struct lpfc_hba * phba)
+lpfc_post_rcv_buf(struct lpfc_hba *phba)
 {
        struct lpfc_sli *psli = &phba->sli;
 
        /* Ring 0, ELS / CT buffers */
-       lpfc_post_buffer(phba, &psli->ring[LPFC_ELS_RING], LPFC_BUF_RING0, 1);
+       lpfc_post_buffer(phba, &psli->ring[LPFC_ELS_RING], LPFC_BUF_RING0);
        /* Ring 2 - FCP no buffers needed */
 
        return 0;
@@ -988,11 +1405,13 @@ lpfc_post_rcv_buf(struct lpfc_hba * phba)
 
 #define S(N,V) (((V)<<(N))|((V)>>(32-(N))))
 
-/************************************************************************/
-/*                                                                      */
-/*   lpfc_sha_init                                                      */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_sha_init: Set up initial array of hash table entries.
+ * @HashResultPointer: pointer to an array as hash table.
+ *
+ * This routine sets up the initial values to the array of hash table entries
+ * for the LC HBAs.
+ **/
 static void
 lpfc_sha_init(uint32_t * HashResultPointer)
 {
@@ -1003,11 +1422,16 @@ lpfc_sha_init(uint32_t * HashResultPointer)
        HashResultPointer[4] = 0xC3D2E1F0;
 }
 
-/************************************************************************/
-/*                                                                      */
-/*   lpfc_sha_iterate                                                   */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_sha_iterate: Iterate initial hash table with the working hash table.
+ * @HashResultPointer: pointer to an initial/result hash table.
+ * @HashWorkingPointer: pointer to an working hash table.
+ *
+ * This routine iterates an initial hash table pointed by @HashResultPointer
+ * with the values from the working hash table pointeed by @HashWorkingPointer.
+ * The results are putting back to the initial hash table, returned through
+ * the @HashResultPointer as the result hash table.
+ **/
 static void
 lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer)
 {
@@ -1055,34 +1479,40 @@ lpfc_sha_iterate(uint32_t * HashResultPointer, uint32_t * HashWorkingPointer)
 
 }
 
-/************************************************************************/
-/*                                                                      */
-/*   lpfc_challenge_key                                                 */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_challenge_key: Create challenge key based on WWPN of the HBA.
+ * @RandomChallenge: pointer to the entry of host challenge random number array.
+ * @HashWorking: pointer to the entry of the working hash array.
+ *
+ * This routine calculates the working hash array referred by @HashWorking
+ * from the challenge random numbers associated with the host, referred by
+ * @RandomChallenge. The result is put into the entry of the working hash
+ * array and returned by reference through @HashWorking.
+ **/
 static void
 lpfc_challenge_key(uint32_t * RandomChallenge, uint32_t * HashWorking)
 {
        *HashWorking = (*RandomChallenge ^ *HashWorking);
 }
 
-/************************************************************************/
-/*                                                                      */
-/*   lpfc_hba_init                                                      */
-/*                                                                      */
-/************************************************************************/
+/**
+ * lpfc_hba_init: Perform special handling for LC HBA initialization.
+ * @phba: pointer to lpfc hba data structure.
+ * @hbainit: pointer to an array of unsigned 32-bit integers.
+ *
+ * This routine performs the special handling for LC HBA initialization.
+ **/
 void
 lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
 {
        int t;
        uint32_t *HashWorking;
-       uint32_t *pwwnn = phba->wwnn;
+       uint32_t *pwwnn = (uint32_t *) phba->wwnn;
 
-       HashWorking = kmalloc(80 * sizeof(uint32_t), GFP_KERNEL);
+       HashWorking = kcalloc(80, sizeof(uint32_t), GFP_KERNEL);
        if (!HashWorking)
                return;
 
-       memset(HashWorking, 0, (80 * sizeof(uint32_t)));
        HashWorking[0] = HashWorking[78] = *pwwnn++;
        HashWorking[1] = HashWorking[79] = *pwwnn;
 
@@ -1094,211 +1524,360 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
        kfree(HashWorking);
 }
 
-static void
-lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
+/**
+ * lpfc_cleanup: Performs vport cleanups before deleting a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine performs the necessary cleanups before deleting the @vport.
+ * It invokes the discovery state machine to perform necessary state
+ * transitions and to release the ndlps associated with the @vport. Note,
+ * the physical port is treated as @vport 0.
+ **/
+void
+lpfc_cleanup(struct lpfc_vport *vport)
 {
+       struct lpfc_hba   *phba = vport->phba;
        struct lpfc_nodelist *ndlp, *next_ndlp;
+       int i = 0;
 
-       /* clean up phba - lpfc specific */
-       lpfc_can_disctmo(phba);
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpunmap_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+       if (phba->link_state > LPFC_LINK_DOWN)
+               lpfc_port_link_failure(vport);
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_nlpmap_list,
-                                nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
-
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_unused_list,
-                               nlp_listp) {
-               lpfc_nlp_list(phba, ndlp, NLP_NO_LIST);
-       }
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+               if (!NLP_CHK_NODE_ACT(ndlp)) {
+                       ndlp = lpfc_enable_node(vport, ndlp,
+                                               NLP_STE_UNUSED_NODE);
+                       if (!ndlp)
+                               continue;
+                       spin_lock_irq(&phba->ndlp_lock);
+                       NLP_SET_FREE_REQ(ndlp);
+                       spin_unlock_irq(&phba->ndlp_lock);
+                       /* Trigger the release of the ndlp memory */
+                       lpfc_nlp_put(ndlp);
+                       continue;
+               }
+               spin_lock_irq(&phba->ndlp_lock);
+               if (NLP_CHK_FREE_REQ(ndlp)) {
+                       /* The ndlp should not be in memory free mode already */
+                       spin_unlock_irq(&phba->ndlp_lock);
+                       continue;
+               } else
+                       /* Indicate request for freeing ndlp memory */
+                       NLP_SET_FREE_REQ(ndlp);
+               spin_unlock_irq(&phba->ndlp_lock);
+
+               if (vport->port_type != LPFC_PHYSICAL_PORT &&
+                   ndlp->nlp_DID == Fabric_DID) {
+                       /* Just free up ndlp with Fabric_DID for vports */
+                       lpfc_nlp_put(ndlp);
+                       continue;
+               }
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_plogi_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+               if (ndlp->nlp_type & NLP_FABRIC)
+                       lpfc_disc_state_machine(vport, ndlp, NULL,
+                                       NLP_EVT_DEVICE_RECOVERY);
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_adisc_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+               lpfc_disc_state_machine(vport, ndlp, NULL,
+                                            NLP_EVT_DEVICE_RM);
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_reglogin_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
+               /* nlp_type zero is not defined, nlp_flag zero also not defined,
+                * nlp_state is unused, this happens when
+                * an initiator has logged
+                * into us so cleanup this ndlp.
+                */
+               if ((ndlp->nlp_type == 0) && (ndlp->nlp_flag == 0) &&
+                       (ndlp->nlp_state == 0))
+                       lpfc_nlp_put(ndlp);
        }
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_prli_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+       /* At this point, ALL ndlp's should be gone
+        * because of the previous NLP_EVT_DEVICE_RM.
+        * Lets wait for this to happen, if needed.
+        */
+       while (!list_empty(&vport->fc_nodes)) {
+
+               if (i++ > 3000) {
+                       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                               "0233 Nodelist not empty\n");
+                       list_for_each_entry_safe(ndlp, next_ndlp,
+                                               &vport->fc_nodes, nlp_listp) {
+                               lpfc_printf_vlog(ndlp->vport, KERN_ERR,
+                                               LOG_NODE,
+                                               "0282: did:x%x ndlp:x%p "
+                                               "usgmap:x%x refcnt:%d\n",
+                                               ndlp->nlp_DID, (void *)ndlp,
+                                               ndlp->nlp_usg_map,
+                                               atomic_read(
+                                                       &ndlp->kref.refcount));
+                       }
+                       break;
+               }
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
+               /* Wait for any activity on ndlps to settle */
+               msleep(10);
        }
+       return;
+}
 
-       INIT_LIST_HEAD(&phba->fc_nlpmap_list);
-       INIT_LIST_HEAD(&phba->fc_nlpunmap_list);
-       INIT_LIST_HEAD(&phba->fc_unused_list);
-       INIT_LIST_HEAD(&phba->fc_plogi_list);
-       INIT_LIST_HEAD(&phba->fc_adisc_list);
-       INIT_LIST_HEAD(&phba->fc_reglogin_list);
-       INIT_LIST_HEAD(&phba->fc_prli_list);
-       INIT_LIST_HEAD(&phba->fc_npr_list);
-
-       phba->fc_map_cnt   = 0;
-       phba->fc_unmap_cnt = 0;
-       phba->fc_plogi_cnt = 0;
-       phba->fc_adisc_cnt = 0;
-       phba->fc_reglogin_cnt = 0;
-       phba->fc_prli_cnt  = 0;
-       phba->fc_npr_cnt   = 0;
-       phba->fc_unused_cnt= 0;
+/**
+ * lpfc_stop_vport_timers: Stop all the timers associated with a vport.
+ * @vport: pointer to a virtual N_Port data structure.
+ *
+ * This routine stops all the timers associated with a @vport. This function
+ * is invoked before disabling or deleting a @vport. Note that the physical
+ * port is treated as @vport 0.
+ **/
+void
+lpfc_stop_vport_timers(struct lpfc_vport *vport)
+{
+       del_timer_sync(&vport->els_tmofunc);
+       del_timer_sync(&vport->fc_fdmitmo);
+       lpfc_can_disctmo(vport);
        return;
 }
 
+/**
+ * lpfc_stop_phba_timers: Stop all the timers associated with an HBA.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine stops all the timers associated with a HBA. This function is
+ * invoked before either putting a HBA offline or unloading the driver.
+ **/
 static void
-lpfc_establish_link_tmo(unsigned long ptr)
+lpfc_stop_phba_timers(struct lpfc_hba *phba)
 {
-       struct lpfc_hba *phba = (struct lpfc_hba *)ptr;
-       unsigned long iflag;
-
-
-       /* Re-establishing Link, timer expired */
-       lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
-                       "%d:1300 Re-establishing Link, timer expired "
-                       "Data: x%x x%x\n",
-                       phba->brd_no, phba->fc_flag, phba->hba_state);
-       spin_lock_irqsave(phba->host->host_lock, iflag);
-       phba->fc_flag &= ~FC_ESTABLISH_LINK;
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
+       del_timer_sync(&phba->fcp_poll_timer);
+       lpfc_stop_vport_timers(phba->pport);
+       del_timer_sync(&phba->sli.mbox_tmo);
+       del_timer_sync(&phba->fabric_block_timer);
+       phba->hb_outstanding = 0;
+       del_timer_sync(&phba->hb_tmofunc);
+       return;
 }
 
-static int
-lpfc_stop_timer(struct lpfc_hba * phba)
+/**
+ * lpfc_block_mgmt_io: Mark a HBA's management interface as blocked.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine marks a HBA's management interface as blocked. Once the HBA's
+ * management interface is marked as blocked, all the user space access to
+ * the HBA, whether they are from sysfs interface or libdfc interface will
+ * all be blocked. The HBA is set to block the management interface when the
+ * driver prepares the HBA interface for online or offline.
+ **/
+static void
+lpfc_block_mgmt_io(struct lpfc_hba * phba)
 {
-       struct lpfc_sli *psli = &phba->sli;
-
-       /* Instead of a timer, this has been converted to a
-        * deferred procedding list.
-        */
-       while (!list_empty(&phba->freebufList)) {
-
-               struct lpfc_dmabuf *mp = NULL;
-
-               list_remove_head((&phba->freebufList), mp,
-                                struct lpfc_dmabuf, list);
-               if (mp) {
-                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
-                       kfree(mp);
-               }
-       }
+       unsigned long iflag;
 
-       del_timer_sync(&phba->fc_estabtmo);
-       del_timer_sync(&phba->fc_disctmo);
-       del_timer_sync(&phba->fc_fdmitmo);
-       del_timer_sync(&phba->els_tmofunc);
-       psli = &phba->sli;
-       del_timer_sync(&psli->mbox_tmo);
-       return(1);
+       spin_lock_irqsave(&phba->hbalock, iflag);
+       phba->sli.sli_flag |= LPFC_BLOCK_MGMT_IO;
+       spin_unlock_irqrestore(&phba->hbalock, iflag);
 }
 
+/**
+ * lpfc_online: Initialize and bring a HBA online.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine initializes the HBA and brings a HBA online. During this
+ * process, the management interface is blocked to prevent user space access
+ * to the HBA interfering with the driver initialization.
+ *
+ * Return codes
+ *   0 - successful
+ *   1 - failed
+ **/
 int
-lpfc_online(struct lpfc_hba * phba)
+lpfc_online(struct lpfc_hba *phba)
 {
+       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_vport **vports;
+       int i;
+
        if (!phba)
                return 0;
 
-       if (!(phba->fc_flag & FC_OFFLINE_MODE))
+       if (!(vport->fc_flag & FC_OFFLINE_MODE))
                return 0;
 
-       lpfc_printf_log(phba,
-                      KERN_WARNING,
-                      LOG_INIT,
-                      "%d:0458 Bring Adapter online\n",
-                      phba->brd_no);
+       lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,
+                       "0458 Bring Adapter online\n");
+
+       lpfc_block_mgmt_io(phba);
 
-       if (!lpfc_sli_queue_setup(phba))
+       if (!lpfc_sli_queue_setup(phba)) {
+               lpfc_unblock_mgmt_io(phba);
                return 1;
+       }
 
-       if (lpfc_sli_hba_setup(phba))   /* Initialize the HBA */
+       if (lpfc_sli_hba_setup(phba)) { /* Initialize the HBA */
+               lpfc_unblock_mgmt_io(phba);
                return 1;
+       }
 
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag &= ~FC_OFFLINE_MODE;
-       spin_unlock_irq(phba->host->host_lock);
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL)
+               for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                       struct Scsi_Host *shost;
+                       shost = lpfc_shost_from_vport(vports[i]);
+                       spin_lock_irq(shost->host_lock);
+                       vports[i]->fc_flag &= ~FC_OFFLINE_MODE;
+                       if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)
+                               vports[i]->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+                       spin_unlock_irq(shost->host_lock);
+               }
+               lpfc_destroy_vport_work_array(phba, vports);
 
+       lpfc_unblock_mgmt_io(phba);
        return 0;
 }
 
-int
-lpfc_offline(struct lpfc_hba * phba)
+/**
+ * lpfc_unblock_mgmt_io: Mark a HBA's management interface to be not blocked.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine marks a HBA's management interface as not blocked. Once the
+ * HBA's management interface is marked as not blocked, all the user space
+ * access to the HBA, whether they are from sysfs interface or libdfc
+ * interface will be allowed. The HBA is set to block the management interface
+ * when the driver prepares the HBA interface for online or offline and then
+ * set to unblock the management interface afterwards.
+ **/
+void
+lpfc_unblock_mgmt_io(struct lpfc_hba * phba)
 {
-       struct lpfc_sli_ring *pring;
-       struct lpfc_sli *psli;
        unsigned long iflag;
-       int i = 0;
 
-       if (!phba)
-               return 0;
+       spin_lock_irqsave(&phba->hbalock, iflag);
+       phba->sli.sli_flag &= ~LPFC_BLOCK_MGMT_IO;
+       spin_unlock_irqrestore(&phba->hbalock, iflag);
+}
 
-       if (phba->fc_flag & FC_OFFLINE_MODE)
-               return 0;
+/**
+ * lpfc_offline_prep: Prepare a HBA to be brought offline.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to prepare a HBA to be brought offline. It performs
+ * unregistration login to all the nodes on all vports and flushes the mailbox
+ * queue to make it ready to be brought offline.
+ **/
+void
+lpfc_offline_prep(struct lpfc_hba * phba)
+{
+       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_nodelist  *ndlp, *next_ndlp;
+       struct lpfc_vport **vports;
+       int i;
 
-       psli = &phba->sli;
-       pring = &psli->ring[psli->fcp_ring];
+       if (vport->fc_flag & FC_OFFLINE_MODE)
+               return;
+
+       lpfc_block_mgmt_io(phba);
 
        lpfc_linkdown(phba);
 
-       /* The linkdown event takes 30 seconds to timeout. */
-       while (pring->txcmplq_cnt) {
-               mdelay(10);
-               if (i++ > 3000)
-                       break;
+       /* Issue an unreg_login to all nodes on all vports */
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL) {
+               for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                       struct Scsi_Host *shost;
+
+                       if (vports[i]->load_flag & FC_UNLOADING)
+                               continue;
+                       shost = lpfc_shost_from_vport(vports[i]);
+                       list_for_each_entry_safe(ndlp, next_ndlp,
+                                                &vports[i]->fc_nodes,
+                                                nlp_listp) {
+                               if (!NLP_CHK_NODE_ACT(ndlp))
+                                       continue;
+                               if (ndlp->nlp_state == NLP_STE_UNUSED_NODE)
+                                       continue;
+                               if (ndlp->nlp_type & NLP_FABRIC) {
+                                       lpfc_disc_state_machine(vports[i], ndlp,
+                                               NULL, NLP_EVT_DEVICE_RECOVERY);
+                                       lpfc_disc_state_machine(vports[i], ndlp,
+                                               NULL, NLP_EVT_DEVICE_RM);
+                               }
+                               spin_lock_irq(shost->host_lock);
+                               ndlp->nlp_flag &= ~NLP_NPR_ADISC;
+                               spin_unlock_irq(shost->host_lock);
+                               lpfc_unreg_rpi(vports[i], ndlp);
+                       }
+               }
        }
+       lpfc_destroy_vport_work_array(phba, vports);
 
-       /* stop all timers associated with this hba */
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
+       lpfc_sli_flush_mbox_queue(phba);
+}
+
+/**
+ * lpfc_offline: Bring a HBA offline.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine actually brings a HBA offline. It stops all the timers
+ * associated with the HBA, brings down the SLI layer, and eventually
+ * marks the HBA as in offline state for the upper layer protocol.
+ **/
+void
+lpfc_offline(struct lpfc_hba *phba)
+{
+       struct Scsi_Host  *shost;
+       struct lpfc_vport **vports;
+       int i;
 
-       lpfc_printf_log(phba,
-                      KERN_WARNING,
-                      LOG_INIT,
-                      "%d:0460 Bring Adapter offline\n",
-                      phba->brd_no);
+       if (phba->pport->fc_flag & FC_OFFLINE_MODE)
+               return;
 
+       /* stop all timers associated with this hba */
+       lpfc_stop_phba_timers(phba);
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL)
+               for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++)
+                       lpfc_stop_vport_timers(vports[i]);
+       lpfc_destroy_vport_work_array(phba, vports);
+       lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,
+                       "0460 Bring Adapter offline\n");
        /* Bring down the SLI Layer and cleanup.  The HBA is offline
           now.  */
        lpfc_sli_hba_down(phba);
-       lpfc_cleanup(phba, 1);
-       spin_lock_irqsave(phba->host->host_lock, iflag);
-       phba->fc_flag |= FC_OFFLINE_MODE;
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
-       return 0;
+       spin_lock_irq(&phba->hbalock);
+       phba->work_ha = 0;
+       spin_unlock_irq(&phba->hbalock);
+       vports = lpfc_create_vport_work_array(phba);
+       if (vports != NULL)
+               for(i = 0; i <= phba->max_vpi && vports[i] != NULL; i++) {
+                       shost = lpfc_shost_from_vport(vports[i]);
+                       spin_lock_irq(shost->host_lock);
+                       vports[i]->work_port_events = 0;
+                       vports[i]->fc_flag |= FC_OFFLINE_MODE;
+                       spin_unlock_irq(shost->host_lock);
+               }
+       lpfc_destroy_vport_work_array(phba, vports);
 }
 
-/******************************************************************************
-* Function name: lpfc_scsi_free
-*
-* Description: Called from lpfc_pci_remove_one free internal driver resources
-*
-******************************************************************************/
+/**
+ * lpfc_scsi_free: Free all the SCSI buffers and IOCBs from driver lists.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is to free all the SCSI buffers and IOCBs from the driver
+ * list back to kernel. It is called from lpfc_pci_remove_one to free
+ * the internal resources before the device is removed from the system.
+ *
+ * Return codes
+ *   0 - successful (for now, it always returns 0)
+ **/
 static int
-lpfc_scsi_free(struct lpfc_hba * phba)
+lpfc_scsi_free(struct lpfc_hba *phba)
 {
        struct lpfc_scsi_buf *sb, *sb_next;
        struct lpfc_iocbq *io, *io_next;
 
-       spin_lock_irq(phba->host->host_lock);
+       spin_lock_irq(&phba->hbalock);
        /* Release all the lpfc_scsi_bufs maintained by this host. */
        list_for_each_entry_safe(sb, sb_next, &phba->lpfc_scsi_buf_list, list) {
                list_del(&sb->list);
                pci_pool_free(phba->lpfc_scsi_dma_buf_pool, sb->data,
-                                                               sb->dma_handle);
+                             sb->dma_handle);
                kfree(sb);
                phba->total_scsi_bufs--;
        }
@@ -1310,99 +1889,403 @@ lpfc_scsi_free(struct lpfc_hba * phba)
                phba->total_iocbq_bufs--;
        }
 
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
 
        return 0;
 }
 
+/**
+ * lpfc_create_port: Create an FC port.
+ * @phba: pointer to lpfc hba data structure.
+ * @instance: a unique integer ID to this FC port.
+ * @dev: pointer to the device data structure.
+ *
+ * This routine creates a FC port for the upper layer protocol. The FC port
+ * can be created on top of either a physical port or a virtual port provided
+ * by the HBA. This routine also allocates a SCSI host data structure (shost)
+ * and associates the FC port created before adding the shost into the SCSI
+ * layer.
+ *
+ * Return codes
+ *   @vport - pointer to the virtual N_Port data structure.
+ *   NULL - port create failed.
+ **/
+struct lpfc_vport *
+lpfc_create_port(struct lpfc_hba *phba, int instance, struct device *dev)
+{
+       struct lpfc_vport *vport;
+       struct Scsi_Host  *shost;
+       int error = 0;
+
+       if (dev != &phba->pcidev->dev)
+               shost = scsi_host_alloc(&lpfc_vport_template,
+                                       sizeof(struct lpfc_vport));
+       else
+               shost = scsi_host_alloc(&lpfc_template,
+                                       sizeof(struct lpfc_vport));
+       if (!shost)
+               goto out;
+
+       vport = (struct lpfc_vport *) shost->hostdata;
+       vport->phba = phba;
+       vport->load_flag |= FC_LOADING;
+       vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+       vport->fc_rscn_flush = 0;
+
+       lpfc_get_vport_cfgparam(vport);
+       shost->unique_id = instance;
+       shost->max_id = LPFC_MAX_TARGET;
+       shost->max_lun = vport->cfg_max_luns;
+       shost->this_id = -1;
+       shost->max_cmd_len = 16;
+       /*
+        * Set initial can_queue value since 0 is no longer supported and
+        * scsi_add_host will fail. This will be adjusted later based on the
+        * max xri value determined in hba setup.
+        */
+       shost->can_queue = phba->cfg_hba_queue_depth - 10;
+       if (dev != &phba->pcidev->dev) {
+               shost->transportt = lpfc_vport_transport_template;
+               vport->port_type = LPFC_NPIV_PORT;
+       } else {
+               shost->transportt = lpfc_transport_template;
+               vport->port_type = LPFC_PHYSICAL_PORT;
+       }
+
+       /* Initialize all internally managed lists. */
+       INIT_LIST_HEAD(&vport->fc_nodes);
+       spin_lock_init(&vport->work_port_lock);
+
+       init_timer(&vport->fc_disctmo);
+       vport->fc_disctmo.function = lpfc_disc_timeout;
+       vport->fc_disctmo.data = (unsigned long)vport;
+
+       init_timer(&vport->fc_fdmitmo);
+       vport->fc_fdmitmo.function = lpfc_fdmi_tmo;
+       vport->fc_fdmitmo.data = (unsigned long)vport;
+
+       init_timer(&vport->els_tmofunc);
+       vport->els_tmofunc.function = lpfc_els_timeout;
+       vport->els_tmofunc.data = (unsigned long)vport;
+
+       error = scsi_add_host(shost, dev);
+       if (error)
+               goto out_put_shost;
+
+       spin_lock_irq(&phba->hbalock);
+       list_add_tail(&vport->listentry, &phba->port_list);
+       spin_unlock_irq(&phba->hbalock);
+       return vport;
+
+out_put_shost:
+       scsi_host_put(shost);
+out:
+       return NULL;
+}
 
+/**
+ * destroy_port: Destroy an FC port.
+ * @vport: pointer to an lpfc virtual N_Port data structure.
+ *
+ * This routine destroys a FC port from the upper layer protocol. All the
+ * resources associated with the port are released.
+ **/
+void
+destroy_port(struct lpfc_vport *vport)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_hba  *phba = vport->phba;
+
+       kfree(vport->vname);
+
+       lpfc_debugfs_terminate(vport);
+       fc_remove_host(shost);
+       scsi_remove_host(shost);
+
+       spin_lock_irq(&phba->hbalock);
+       list_del_init(&vport->listentry);
+       spin_unlock_irq(&phba->hbalock);
+
+       lpfc_cleanup(vport);
+       return;
+}
+
+/**
+ * lpfc_get_instance: Get a unique integer ID.
+ *
+ * This routine allocates a unique integer ID from lpfc_hba_index pool. It
+ * uses the kernel idr facility to perform the task.
+ *
+ * Return codes:
+ *   instance - a unique integer ID allocated as the new instance.
+ *   -1 - lpfc get instance failed.
+ **/
+int
+lpfc_get_instance(void)
+{
+       int instance = 0;
+
+       /* Assign an unused number */
+       if (!idr_pre_get(&lpfc_hba_index, GFP_KERNEL))
+               return -1;
+       if (idr_get_new(&lpfc_hba_index, NULL, &instance))
+               return -1;
+       return instance;
+}
+
+/**
+ * lpfc_scan_finished: method for SCSI layer to detect whether scan is done.
+ * @shost: pointer to SCSI host data structure.
+ * @time: elapsed time of the scan in jiffies.
+ *
+ * This routine is called by the SCSI layer with a SCSI host to determine
+ * whether the scan host is finished.
+ *
+ * Note: there is no scan_start function as adapter initialization will have
+ * asynchronously kicked off the link initialization.
+ *
+ * Return codes
+ *   0 - SCSI host scan is not over yet.
+ *   1 - SCSI host scan is over.
+ **/
+int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
+{
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+       int stat = 0;
+
+       spin_lock_irq(shost->host_lock);
+
+       if (vport->load_flag & FC_UNLOADING) {
+               stat = 1;
+               goto finished;
+       }
+       if (time >= 30 * HZ) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                               "0461 Scanning longer than 30 "
+                               "seconds.  Continuing initialization\n");
+               stat = 1;
+               goto finished;
+       }
+       if (time >= 15 * HZ && phba->link_state <= LPFC_LINK_DOWN) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                               "0465 Link down longer than 15 "
+                               "seconds.  Continuing initialization\n");
+               stat = 1;
+               goto finished;
+       }
+
+       if (vport->port_state != LPFC_VPORT_READY)
+               goto finished;
+       if (vport->num_disc_nodes || vport->fc_prli_sent)
+               goto finished;
+       if (vport->fc_map_cnt == 0 && time < 2 * HZ)
+               goto finished;
+       if ((phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE) != 0)
+               goto finished;
+
+       stat = 1;
+
+finished:
+       spin_unlock_irq(shost->host_lock);
+       return stat;
+}
+
+/**
+ * lpfc_host_attrib_init: Initialize SCSI host attributes on a FC port.
+ * @shost: pointer to SCSI host data structure.
+ *
+ * This routine initializes a given SCSI host attributes on a FC port. The
+ * SCSI host can be either on top of a physical port or a virtual port.
+ **/
+void lpfc_host_attrib_init(struct Scsi_Host *shost)
+{
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+       /*
+        * Set fixed host attributes.  Must done after lpfc_sli_hba_setup().
+        */
+
+       fc_host_node_name(shost) = wwn_to_u64(vport->fc_nodename.u.wwn);
+       fc_host_port_name(shost) = wwn_to_u64(vport->fc_portname.u.wwn);
+       fc_host_supported_classes(shost) = FC_COS_CLASS3;
+
+       memset(fc_host_supported_fc4s(shost), 0,
+              sizeof(fc_host_supported_fc4s(shost)));
+       fc_host_supported_fc4s(shost)[2] = 1;
+       fc_host_supported_fc4s(shost)[7] = 1;
+
+       lpfc_vport_symbolic_node_name(vport, fc_host_symbolic_name(shost),
+                                sizeof fc_host_symbolic_name(shost));
+
+       fc_host_supported_speeds(shost) = 0;
+       if (phba->lmt & LMT_10Gb)
+               fc_host_supported_speeds(shost) |= FC_PORTSPEED_10GBIT;
+       if (phba->lmt & LMT_8Gb)
+               fc_host_supported_speeds(shost) |= FC_PORTSPEED_8GBIT;
+       if (phba->lmt & LMT_4Gb)
+               fc_host_supported_speeds(shost) |= FC_PORTSPEED_4GBIT;
+       if (phba->lmt & LMT_2Gb)
+               fc_host_supported_speeds(shost) |= FC_PORTSPEED_2GBIT;
+       if (phba->lmt & LMT_1Gb)
+               fc_host_supported_speeds(shost) |= FC_PORTSPEED_1GBIT;
+
+       fc_host_maxframe_size(shost) =
+               (((uint32_t) vport->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
+               (uint32_t) vport->fc_sparam.cmn.bbRcvSizeLsb;
+
+       /* This value is also unchanging */
+       memset(fc_host_active_fc4s(shost), 0,
+              sizeof(fc_host_active_fc4s(shost)));
+       fc_host_active_fc4s(shost)[2] = 1;
+       fc_host_active_fc4s(shost)[7] = 1;
+
+       fc_host_max_npiv_vports(shost) = phba->max_vpi;
+       spin_lock_irq(shost->host_lock);
+       vport->load_flag &= ~FC_LOADING;
+       spin_unlock_irq(shost->host_lock);
+}
+
+/**
+ * lpfc_enable_msix: Enable MSI-X interrupt mode.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to enable the MSI-X interrupt vectors. The kernel
+ * function pci_enable_msix() is called to enable the MSI-X vectors. Note that
+ * pci_enable_msix(), once invoked, enables either all or nothing, depending
+ * on the current availability of PCI vector resources. The device driver is
+ * responsible for calling the individual request_irq() to register each MSI-X
+ * vector with a interrupt handler, which is done in this function. Note that
+ * later when device is unloading, the driver should always call free_irq()
+ * on all MSI-X vectors it has done request_irq() on before calling
+ * pci_disable_msix(). Failure to do so results in a BUG_ON() and a device
+ * will be left with MSI-X enabled and leaks its vectors.
+ *
+ * Return codes
+ *   0 - sucessful
+ *   other values - error
+ **/
+static int
+lpfc_enable_msix(struct lpfc_hba *phba)
+{
+       int error;
+
+       phba->msix_entries[0].entry = 0;
+       phba->msix_entries[0].vector = 0;
+
+       error = pci_enable_msix(phba->pcidev, phba->msix_entries,
+                               ARRAY_SIZE(phba->msix_entries));
+       if (error) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                               "0420 Enable MSI-X failed (%d), continuing "
+                               "with MSI\n", error);
+               pci_disable_msix(phba->pcidev);
+               return error;
+       }
+
+       error = request_irq(phba->msix_entries[0].vector, lpfc_intr_handler, 0,
+                           LPFC_DRIVER_NAME, phba);
+       if (error) {
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0421 MSI-X request_irq failed (%d), "
+                               "continuing with MSI\n", error);
+               pci_disable_msix(phba->pcidev);
+       }
+       return error;
+}
+
+/**
+ * lpfc_disable_msix: Disable MSI-X interrupt mode.
+ * @phba: pointer to lpfc hba data structure.
+ *
+ * This routine is invoked to release the MSI-X vectors and then disable the
+ * MSI-X interrupt mode.
+ **/
+static void
+lpfc_disable_msix(struct lpfc_hba *phba)
+{
+       free_irq(phba->msix_entries[0].vector, phba);
+       pci_disable_msix(phba->pcidev);
+}
+
+/**
+ * lpfc_pci_probe_one: lpfc PCI probe func to register device to PCI subsystem.
+ * @pdev: pointer to PCI device
+ * @pid: pointer to PCI device identifier
+ *
+ * This routine is to be registered to the kernel's PCI subsystem. When an
+ * Emulex HBA is presented in PCI bus, the kernel PCI subsystem looks at
+ * PCI device-specific information of the device and driver to see if the
+ * driver state that it can support this kind of device. If the match is
+ * successful, the driver core invokes this routine. If this routine
+ * determines it can claim the HBA, it does all the initialization that it
+ * needs to do to handle the HBA properly.
+ *
+ * Return code
+ *   0 - driver can claim the device
+ *   negative value - driver can not claim the device
+ **/
 static int __devinit
 lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 {
-       struct Scsi_Host *host;
-       struct lpfc_hba  *phba;
-       struct lpfc_sli  *psli;
+       struct lpfc_vport *vport = NULL;
+       struct lpfc_hba   *phba;
+       struct lpfc_sli   *psli;
        struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL;
+       struct Scsi_Host  *shost = NULL;
+       void *ptr;
        unsigned long bar0map_len, bar2map_len;
        int error = -ENODEV, retval;
-       int i;
+       int  i, hbq_count;
        uint16_t iotag;
+       int bars = pci_select_bars(pdev, IORESOURCE_MEM);
 
-       if (pci_enable_device(pdev))
+       if (pci_enable_device_mem(pdev))
                goto out;
-       if (pci_request_regions(pdev, LPFC_DRIVER_NAME))
+       if (pci_request_selected_regions(pdev, bars, LPFC_DRIVER_NAME))
                goto out_disable_device;
 
-       host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba));
-       if (!host)
+       phba = kzalloc(sizeof (struct lpfc_hba), GFP_KERNEL);
+       if (!phba)
                goto out_release_regions;
 
-       phba = (struct lpfc_hba*)host->hostdata;
-       memset(phba, 0, sizeof (struct lpfc_hba));
-       phba->host = host;
+       spin_lock_init(&phba->hbalock);
+
+       /* Initialize ndlp management spinlock */
+       spin_lock_init(&phba->ndlp_lock);
 
-       phba->fc_flag |= FC_LOADING;
        phba->pcidev = pdev;
 
        /* Assign an unused board number */
-       if (!idr_pre_get(&lpfc_hba_index, GFP_KERNEL))
-               goto out_put_host;
-
-       error = idr_get_new(&lpfc_hba_index, NULL, &phba->brd_no);
-       if (error)
-               goto out_put_host;
-
-       host->unique_id = phba->brd_no;
-
-       INIT_LIST_HEAD(&phba->ctrspbuflist);
-       INIT_LIST_HEAD(&phba->rnidrspbuflist);
-       INIT_LIST_HEAD(&phba->freebufList);
-
-       /* Initialize timers used by driver */
-       init_timer(&phba->fc_estabtmo);
-       phba->fc_estabtmo.function = lpfc_establish_link_tmo;
-       phba->fc_estabtmo.data = (unsigned long)phba;
-       init_timer(&phba->fc_disctmo);
-       phba->fc_disctmo.function = lpfc_disc_timeout;
-       phba->fc_disctmo.data = (unsigned long)phba;
-
-       init_timer(&phba->fc_fdmitmo);
-       phba->fc_fdmitmo.function = lpfc_fdmi_tmo;
-       phba->fc_fdmitmo.data = (unsigned long)phba;
-       init_timer(&phba->els_tmofunc);
-       phba->els_tmofunc.function = lpfc_els_timeout;
-       phba->els_tmofunc.data = (unsigned long)phba;
-       psli = &phba->sli;
-       init_timer(&psli->mbox_tmo);
-       psli->mbox_tmo.function = lpfc_mbox_timeout;
-       psli->mbox_tmo.data = (unsigned long)phba;
+       if ((phba->brd_no = lpfc_get_instance()) < 0)
+               goto out_free_phba;
 
+       INIT_LIST_HEAD(&phba->port_list);
        /*
         * Get all the module params for configuring this host and then
-        * establish the host parameters.
+        * establish the host.
         */
        lpfc_get_cfgparam(phba);
+       phba->max_vpi = LPFC_MAX_VPI;
 
-       host->max_id = LPFC_MAX_TARGET;
-       host->max_lun = phba->cfg_max_luns;
-       host->this_id = -1;
-
-       /* Initialize all internally managed lists. */
-       INIT_LIST_HEAD(&phba->fc_nlpmap_list);
-       INIT_LIST_HEAD(&phba->fc_nlpunmap_list);
-       INIT_LIST_HEAD(&phba->fc_unused_list);
-       INIT_LIST_HEAD(&phba->fc_plogi_list);
-       INIT_LIST_HEAD(&phba->fc_adisc_list);
-       INIT_LIST_HEAD(&phba->fc_reglogin_list);
-       INIT_LIST_HEAD(&phba->fc_prli_list);
-       INIT_LIST_HEAD(&phba->fc_npr_list);
+       /* Initialize timers used by driver */
+       init_timer(&phba->hb_tmofunc);
+       phba->hb_tmofunc.function = lpfc_hb_timeout;
+       phba->hb_tmofunc.data = (unsigned long)phba;
 
+       psli = &phba->sli;
+       init_timer(&psli->mbox_tmo);
+       psli->mbox_tmo.function = lpfc_mbox_timeout;
+       psli->mbox_tmo.data = (unsigned long) phba;
+       init_timer(&phba->fcp_poll_timer);
+       phba->fcp_poll_timer.function = lpfc_poll_timeout;
+       phba->fcp_poll_timer.data = (unsigned long) phba;
+       init_timer(&phba->fabric_block_timer);
+       phba->fabric_block_timer.function = lpfc_fabric_block_timeout;
+       phba->fabric_block_timer.data = (unsigned long) phba;
 
        pci_set_master(pdev);
-       retval = pci_set_mwi(pdev);
-       if (retval)
-               dev_printk(KERN_WARNING, &pdev->dev,
-                          "Warning: pci_set_mwi returned %d\n", retval);
+       pci_try_set_mwi(pdev);
 
        if (pci_set_dma_mask(phba->pcidev, DMA_64BIT_MASK) != 0)
                if (pci_set_dma_mask(phba->pcidev, DMA_32BIT_MASK) != 0)
@@ -1418,9 +2301,23 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        phba->pci_bar2_map = pci_resource_start(phba->pcidev, 2);
        bar2map_len        = pci_resource_len(phba->pcidev, 2);
 
-       /* Map HBA SLIM and Control Registers to a kernel virtual address. */
+       /* Map HBA SLIM to a kernel virtual address. */
        phba->slim_memmap_p      = ioremap(phba->pci_bar0_map, bar0map_len);
+       if (!phba->slim_memmap_p) {
+               error = -ENODEV;
+               dev_printk(KERN_ERR, &pdev->dev,
+                          "ioremap failed for SLIM memory.\n");
+               goto out_idr_remove;
+       }
+
+       /* Map HBA Control Registers to a kernel virtual address. */
        phba->ctrl_regs_memmap_p = ioremap(phba->pci_bar2_map, bar2map_len);
+       if (!phba->ctrl_regs_memmap_p) {
+               error = -ENODEV;
+               dev_printk(KERN_ERR, &pdev->dev,
+                          "ioremap failed for HBA control registers.\n");
+               goto out_iounmap_slim;
+       }
 
        /* Allocate memory for SLI-2 structures */
        phba->slim2p = dma_alloc_coherent(&phba->pcidev->dev, SLI2_SLIM_SIZE,
@@ -1430,40 +2327,64 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 
        memset(phba->slim2p, 0, SLI2_SLIM_SIZE);
 
+       phba->hbqslimp.virt = dma_alloc_coherent(&phba->pcidev->dev,
+                                                lpfc_sli_hbq_size(),
+                                                &phba->hbqslimp.phys,
+                                                GFP_KERNEL);
+       if (!phba->hbqslimp.virt)
+               goto out_free_slim;
+
+       hbq_count = lpfc_sli_hbq_count();
+       ptr = phba->hbqslimp.virt;
+       for (i = 0; i < hbq_count; ++i) {
+               phba->hbqs[i].hbq_virt = ptr;
+               INIT_LIST_HEAD(&phba->hbqs[i].hbq_buffer_list);
+               ptr += (lpfc_hbq_defs[i]->entry_count *
+                       sizeof(struct lpfc_hbq_entry));
+       }
+       phba->hbqs[LPFC_ELS_HBQ].hbq_alloc_buffer = lpfc_els_hbq_alloc;
+       phba->hbqs[LPFC_ELS_HBQ].hbq_free_buffer  = lpfc_els_hbq_free;
+
+       memset(phba->hbqslimp.virt, 0, lpfc_sli_hbq_size());
+
+       INIT_LIST_HEAD(&phba->hbqbuf_in_list);
+
        /* Initialize the SLI Layer to run with lpfc HBAs. */
        lpfc_sli_setup(phba);
        lpfc_sli_queue_setup(phba);
 
-       error = lpfc_mem_alloc(phba);
-       if (error)
-               goto out_free_slim;
+       retval = lpfc_mem_alloc(phba);
+       if (retval) {
+               error = retval;
+               goto out_free_hbqslimp;
+       }
 
        /* Initialize and populate the iocb list per host.  */
        INIT_LIST_HEAD(&phba->lpfc_iocb_list);
        for (i = 0; i < LPFC_IOCB_LIST_CNT; i++) {
-               iocbq_entry = kmalloc(sizeof(struct lpfc_iocbq), GFP_KERNEL);
+               iocbq_entry = kzalloc(sizeof(struct lpfc_iocbq), GFP_KERNEL);
                if (iocbq_entry == NULL) {
                        printk(KERN_ERR "%s: only allocated %d iocbs of "
                                "expected %d count. Unloading driver.\n",
-                               __FUNCTION__, i, LPFC_IOCB_LIST_CNT);
+                               __func__, i, LPFC_IOCB_LIST_CNT);
                        error = -ENOMEM;
                        goto out_free_iocbq;
                }
 
-               memset(iocbq_entry, 0, sizeof(struct lpfc_iocbq));
                iotag = lpfc_sli_next_iotag(phba, iocbq_entry);
                if (iotag == 0) {
                        kfree (iocbq_entry);
                        printk(KERN_ERR "%s: failed to allocate IOTAG. "
                               "Unloading driver.\n",
-                               __FUNCTION__);
+                               __func__);
                        error = -ENOMEM;
                        goto out_free_iocbq;
                }
-               spin_lock_irq(phba->host->host_lock);
+
+               spin_lock_irq(&phba->hbalock);
                list_add(&iocbq_entry->list, &phba->lpfc_iocb_list);
                phba->total_iocbq_bufs++;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(&phba->hbalock);
        }
 
        /* Initialize HBA structure */
@@ -1476,6 +2397,9 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        phba->work_ha_mask = (HA_ERATT|HA_MBATT|HA_LATT);
        phba->work_ha_mask |= (HA_RXMASK << (LPFC_ELS_RING * 4));
 
+       /* Initialize the wait queue head for the kernel thread */
+       init_waitqueue_head(&phba->work_waitq);
+
        /* Startup the kernel thread for this host adapter. */
        phba->worker_thread = kthread_run(lpfc_do_work, phba,
                                       "lpfc_worker_%d", phba->brd_no);
@@ -1484,159 +2408,197 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                goto out_free_iocbq;
        }
 
-       /* We can rely on a queue depth attribute only after SLI HBA setup */
-       host->can_queue = phba->cfg_hba_queue_depth - 10;
-
-       /* Tell the midlayer we support 16 byte commands */
-       host->max_cmd_len = 16;
-
        /* Initialize the list of scsi buffers used by driver for scsi IO. */
+       spin_lock_init(&phba->scsi_buf_list_lock);
        INIT_LIST_HEAD(&phba->lpfc_scsi_buf_list);
 
-       host->transportt = lpfc_transport_template;
-       host->hostdata[0] = (unsigned long)phba;
-       pci_set_drvdata(pdev, host);
-       error = scsi_add_host(host, &pdev->dev);
-       if (error)
-               goto out_kthread_stop;
+       /* Initialize list of fabric iocbs */
+       INIT_LIST_HEAD(&phba->fabric_iocb_list);
 
-       error = lpfc_alloc_sysfs_attr(phba);
-       if (error)
+       /* Initialize list to save ELS buffers */
+       INIT_LIST_HEAD(&phba->elsbuf);
+
+       vport = lpfc_create_port(phba, phba->brd_no, &phba->pcidev->dev);
+       if (!vport)
                goto out_kthread_stop;
 
-       error = request_irq(phba->pcidev->irq, lpfc_intr_handler, SA_SHIRQ,
-                                                       LPFC_DRIVER_NAME, phba);
-       if (error) {
-               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                       "%d:0451 Enable interrupt handler failed\n",
-                       phba->brd_no);
-               goto out_free_sysfs_attr;
+       shost = lpfc_shost_from_vport(vport);
+       phba->pport = vport;
+       lpfc_debugfs_initialize(vport);
+
+       pci_set_drvdata(pdev, shost);
+       phba->intr_type = NONE;
+
+       if (phba->cfg_use_msi == 2) {
+               error = lpfc_enable_msix(phba);
+               if (!error)
+                       phba->intr_type = MSIX;
+       }
+
+       /* Fallback to MSI if MSI-X initialization failed */
+       if (phba->cfg_use_msi >= 1 && phba->intr_type == NONE) {
+               retval = pci_enable_msi(phba->pcidev);
+               if (!retval)
+                       phba->intr_type = MSI;
+               else
+                       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                       "0452 Enable MSI failed, continuing "
+                                       "with IRQ\n");
+       }
+
+       /* MSI-X is the only case the doesn't need to call request_irq */
+       if (phba->intr_type != MSIX) {
+               retval = request_irq(phba->pcidev->irq, lpfc_intr_handler,
+                                    IRQF_SHARED, LPFC_DRIVER_NAME, phba);
+               if (retval) {
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT, "0451 Enable "
+                                       "interrupt handler failed\n");
+                       error = retval;
+                       goto out_disable_msi;
+               } else if (phba->intr_type != MSI)
+                       phba->intr_type = INTx;
        }
+
        phba->MBslimaddr = phba->slim_memmap_p;
        phba->HAregaddr = phba->ctrl_regs_memmap_p + HA_REG_OFFSET;
        phba->CAregaddr = phba->ctrl_regs_memmap_p + CA_REG_OFFSET;
        phba->HSregaddr = phba->ctrl_regs_memmap_p + HS_REG_OFFSET;
        phba->HCregaddr = phba->ctrl_regs_memmap_p + HC_REG_OFFSET;
 
-       error = lpfc_sli_hba_setup(phba);
-       if (error)
+       if (lpfc_alloc_sysfs_attr(vport)) {
+               error = -ENOMEM;
                goto out_free_irq;
+       }
+
+       if (lpfc_sli_hba_setup(phba)) {
+               error = -ENODEV;
+               goto out_remove_device;
+       }
 
        /*
-        * set fixed host attributes
-        * Must done after lpfc_sli_hba_setup()
+        * hba setup may have changed the hba_queue_depth so we need to adjust
+        * the value of can_queue.
         */
+       shost->can_queue = phba->cfg_hba_queue_depth - 10;
 
-       fc_host_node_name(host) = wwn_to_u64(phba->fc_nodename.u.wwn);
-       fc_host_port_name(host) = wwn_to_u64(phba->fc_portname.u.wwn);
-       fc_host_supported_classes(host) = FC_COS_CLASS3;
-
-       memset(fc_host_supported_fc4s(host), 0,
-               sizeof(fc_host_supported_fc4s(host)));
-       fc_host_supported_fc4s(host)[2] = 1;
-       fc_host_supported_fc4s(host)[7] = 1;
-
-       lpfc_get_hba_sym_node_name(phba, fc_host_symbolic_name(host));
+       lpfc_host_attrib_init(shost);
 
-       fc_host_supported_speeds(host) = 0;
-       switch (FC_JEDEC_ID(phba->vpd.rev.biuRev)) {
-       case VIPER_JEDEC_ID:
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_10GBIT;
-               break;
-       case HELIOS_JEDEC_ID:
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_4GBIT;
-               /* Fall through */
-       case CENTAUR_2G_JEDEC_ID:
-       case PEGASUS_JEDEC_ID:
-       case THOR_JEDEC_ID:
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_2GBIT;
-               /* Fall through */
-       default:
-               fc_host_supported_speeds(host) = FC_PORTSPEED_1GBIT;
+       if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
+               spin_lock_irq(shost->host_lock);
+               lpfc_poll_start_timer(phba);
+               spin_unlock_irq(shost->host_lock);
        }
 
-       fc_host_maxframe_size(host) =
-               ((((uint32_t) phba->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
-                (uint32_t) phba->fc_sparam.cmn.bbRcvSizeLsb);
+       scsi_scan_host(shost);
 
-       /* This value is also unchanging */
-       memset(fc_host_active_fc4s(host), 0,
-               sizeof(fc_host_active_fc4s(host)));
-       fc_host_active_fc4s(host)[2] = 1;
-       fc_host_active_fc4s(host)[7] = 1;
-
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag &= ~FC_LOADING;
-       spin_unlock_irq(phba->host->host_lock);
        return 0;
 
+out_remove_device:
+       lpfc_free_sysfs_attr(vport);
+       spin_lock_irq(shost->host_lock);
+       vport->load_flag |= FC_UNLOADING;
+       spin_unlock_irq(shost->host_lock);
 out_free_irq:
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
-       free_irq(phba->pcidev->irq, phba);
-out_free_sysfs_attr:
-       lpfc_free_sysfs_attr(phba);
+       lpfc_stop_phba_timers(phba);
+       phba->pport->work_port_events = 0;
+
+       if (phba->intr_type == MSIX)
+               lpfc_disable_msix(phba);
+       else
+               free_irq(phba->pcidev->irq, phba);
+
+out_disable_msi:
+       if (phba->intr_type == MSI)
+               pci_disable_msi(phba->pcidev);
+       destroy_port(vport);
 out_kthread_stop:
        kthread_stop(phba->worker_thread);
 out_free_iocbq:
        list_for_each_entry_safe(iocbq_entry, iocbq_next,
                                                &phba->lpfc_iocb_list, list) {
-               spin_lock_irq(phba->host->host_lock);
                kfree(iocbq_entry);
                phba->total_iocbq_bufs--;
-               spin_unlock_irq(phba->host->host_lock);
        }
        lpfc_mem_free(phba);
+out_free_hbqslimp:
+       dma_free_coherent(&pdev->dev, lpfc_sli_hbq_size(), phba->hbqslimp.virt,
+                         phba->hbqslimp.phys);
 out_free_slim:
        dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE, phba->slim2p,
                                                        phba->slim2p_mapping);
 out_iounmap:
        iounmap(phba->ctrl_regs_memmap_p);
+out_iounmap_slim:
        iounmap(phba->slim_memmap_p);
 out_idr_remove:
        idr_remove(&lpfc_hba_index, phba->brd_no);
-out_put_host:
-       scsi_host_put(host);
+out_free_phba:
+       kfree(phba);
 out_release_regions:
-       pci_release_regions(pdev);
+       pci_release_selected_regions(pdev, bars);
 out_disable_device:
        pci_disable_device(pdev);
 out:
+       pci_set_drvdata(pdev, NULL);
+       if (shost)
+               scsi_host_put(shost);
        return error;
 }
 
+/**
+ * lpfc_pci_remove_one: lpfc PCI func to unregister device from PCI subsystem.
+ * @pdev: pointer to PCI device
+ *
+ * This routine is to be registered to the kernel's PCI subsystem. When an
+ * Emulex HBA is removed from PCI bus. It perform all the necessary cleanup
+ * for the HBA device to be removed from the PCI subsystem properly.
+ **/
 static void __devexit
 lpfc_pci_remove_one(struct pci_dev *pdev)
 {
-       struct Scsi_Host   *host = pci_get_drvdata(pdev);
-       struct lpfc_hba    *phba = (struct lpfc_hba *)host->hostdata[0];
-       unsigned long iflag;
-
-       lpfc_free_sysfs_attr(phba);
+       struct Scsi_Host  *shost = pci_get_drvdata(pdev);
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+       int bars = pci_select_bars(pdev, IORESOURCE_MEM);
 
-       spin_lock_irqsave(phba->host->host_lock, iflag);
-       phba->fc_flag |= FC_UNLOADING;
+       spin_lock_irq(&phba->hbalock);
+       vport->load_flag |= FC_UNLOADING;
+       spin_unlock_irq(&phba->hbalock);
 
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
-
-       fc_remove_host(phba->host);
-       scsi_remove_host(phba->host);
+       kfree(vport->vname);
+       lpfc_free_sysfs_attr(vport);
 
        kthread_stop(phba->worker_thread);
 
+       fc_remove_host(shost);
+       scsi_remove_host(shost);
+       lpfc_cleanup(vport);
+
        /*
         * Bring down the SLI Layer. This step disable all interrupts,
         * clears the rings, discards all mailbox commands, and resets
         * the HBA.
         */
        lpfc_sli_hba_down(phba);
+       lpfc_sli_brdrestart(phba);
 
-       /* Release the irq reservation */
-       free_irq(phba->pcidev->irq, phba);
+       lpfc_stop_phba_timers(phba);
+       spin_lock_irq(&phba->hbalock);
+       list_del_init(&vport->listentry);
+       spin_unlock_irq(&phba->hbalock);
 
-       lpfc_cleanup(phba, 0);
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
+       lpfc_debugfs_terminate(vport);
+
+       if (phba->intr_type == MSIX)
+               lpfc_disable_msix(phba);
+       else {
+               free_irq(phba->pcidev->irq, phba);
+               if (phba->intr_type == MSI)
+                       pci_disable_msi(phba->pcidev);
+       }
+
+       pci_set_drvdata(pdev, NULL);
+       scsi_host_put(shost);
 
        /*
         * Call scsi_free before mem_free since scsi bufs are released to their
@@ -1645,6 +2607,9 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        lpfc_scsi_free(phba);
        lpfc_mem_free(phba);
 
+       dma_free_coherent(&pdev->dev, lpfc_sli_hbq_size(), phba->hbqslimp.virt,
+                         phba->hbqslimp.phys);
+
        /* Free resources associated with SLI2 interface */
        dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE,
                          phba->slim2p, phba->slim2p_mapping);
@@ -1653,13 +2618,152 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        iounmap(phba->ctrl_regs_memmap_p);
        iounmap(phba->slim_memmap_p);
 
-       pci_release_regions(phba->pcidev);
-       pci_disable_device(phba->pcidev);
-
        idr_remove(&lpfc_hba_index, phba->brd_no);
-       scsi_host_put(phba->host);
 
-       pci_set_drvdata(pdev, NULL);
+       kfree(phba);
+
+       pci_release_selected_regions(pdev, bars);
+       pci_disable_device(pdev);
+}
+
+/**
+ * lpfc_io_error_detected: Driver method for handling PCI I/O error detected.
+ * @pdev: pointer to PCI device.
+ * @state: the current PCI connection state.
+ *
+ * This routine is registered to the PCI subsystem for error handling. This
+ * function is called by the PCI subsystem after a PCI bus error affecting
+ * this device has been detected. When this function is invoked, it will
+ * need to stop all the I/Os and interrupt(s) to the device. Once that is
+ * done, it will return PCI_ERS_RESULT_NEED_RESET for the PCI subsystem to
+ * perform proper recovery as desired.
+ *
+ * Return codes
+ *   PCI_ERS_RESULT_NEED_RESET - need to reset before recovery
+ *   PCI_ERS_RESULT_DISCONNECT - device could not be recovered
+ **/
+static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
+                               pci_channel_state_t state)
+{
+       struct Scsi_Host *shost = pci_get_drvdata(pdev);
+       struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring  *pring;
+
+       if (state == pci_channel_io_perm_failure)
+               return PCI_ERS_RESULT_DISCONNECT;
+
+       pci_disable_device(pdev);
+       /*
+        * There may be I/Os dropped by the firmware.
+        * Error iocb (I/O) on txcmplq and let the SCSI layer
+        * retry it after re-establishing link.
+        */
+       pring = &psli->ring[psli->fcp_ring];
+       lpfc_sli_abort_iocb_ring(phba, pring);
+
+       if (phba->intr_type == MSIX)
+               lpfc_disable_msix(phba);
+       else {
+               free_irq(phba->pcidev->irq, phba);
+               if (phba->intr_type == MSI)
+                       pci_disable_msi(phba->pcidev);
+       }
+
+       /* Request a slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * lpfc_io_slot_reset: Restart a PCI device from scratch.
+ * @pdev: pointer to PCI device.
+ *
+ * This routine is registered to the PCI subsystem for error handling. This is
+ * called after PCI bus has been reset to restart the PCI card from scratch,
+ * as if from a cold-boot. During the PCI subsystem error recovery, after the
+ * driver returns PCI_ERS_RESULT_NEED_RESET, the PCI subsystem will perform
+ * proper error recovery and then call this routine before calling the .resume
+ * method to recover the device. This function will initialize the HBA device,
+ * enable the interrupt, but it will just put the HBA to offline state without
+ * passing any I/O traffic.
+ *
+ * Return codes
+ *   PCI_ERS_RESULT_RECOVERED - the device has been recovered
+ *   PCI_ERS_RESULT_DISCONNECT - device could not be recovered
+ */
+static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
+{
+       struct Scsi_Host *shost = pci_get_drvdata(pdev);
+       struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;
+       struct lpfc_sli *psli = &phba->sli;
+       int error, retval;
+
+       dev_printk(KERN_INFO, &pdev->dev, "recovering from a slot reset.\n");
+       if (pci_enable_device_mem(pdev)) {
+               printk(KERN_ERR "lpfc: Cannot re-enable "
+                       "PCI device after reset.\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+
+       pci_set_master(pdev);
+
+       spin_lock_irq(&phba->hbalock);
+       psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+       spin_unlock_irq(&phba->hbalock);
+
+       /* Enable configured interrupt method */
+       phba->intr_type = NONE;
+       if (phba->cfg_use_msi == 2) {
+               error = lpfc_enable_msix(phba);
+               if (!error)
+                       phba->intr_type = MSIX;
+       }
+
+       /* Fallback to MSI if MSI-X initialization failed */
+       if (phba->cfg_use_msi >= 1 && phba->intr_type == NONE) {
+               retval = pci_enable_msi(phba->pcidev);
+               if (!retval)
+                       phba->intr_type = MSI;
+               else
+                       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                       "0470 Enable MSI failed, continuing "
+                                       "with IRQ\n");
+       }
+
+       /* MSI-X is the only case the doesn't need to call request_irq */
+       if (phba->intr_type != MSIX) {
+               retval = request_irq(phba->pcidev->irq, lpfc_intr_handler,
+                                    IRQF_SHARED, LPFC_DRIVER_NAME, phba);
+               if (retval) {
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                       "0471 Enable interrupt handler "
+                                       "failed\n");
+               } else if (phba->intr_type != MSI)
+                       phba->intr_type = INTx;
+       }
+
+       /* Take device offline; this will perform cleanup */
+       lpfc_offline(phba);
+       lpfc_sli_brdrestart(phba);
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * lpfc_io_resume: Resume PCI I/O operation.
+ * @pdev: pointer to PCI device
+ *
+ * This routine is registered to the PCI subsystem for error handling. It is
+ * called when kernel error recovery tells the lpfc driver that it is ok to
+ * resume normal PCI operation after PCI bus error recovery. After this call,
+ * traffic can start to flow from this device again.
+ */
+static void lpfc_io_resume(struct pci_dev *pdev)
+{
+       struct Scsi_Host *shost = pci_get_drvdata(pdev);
+       struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;
+
+       lpfc_online(phba);
 }
 
 static struct pci_device_id lpfc_id_table[] = {
@@ -1681,14 +2785,28 @@ static struct pci_device_id lpfc_id_table[] = {
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
                PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
                PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
                PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZMID,
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
@@ -1699,19 +2817,53 @@ static struct pci_device_id lpfc_id_table[] = {
                PCI_ANY_ID, PCI_ANY_ID, },
        {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
                PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_MID,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SMB,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SAT_S,
+               PCI_ANY_ID, PCI_ANY_ID, },
        { 0 }
 };
 
 MODULE_DEVICE_TABLE(pci, lpfc_id_table);
 
+static struct pci_error_handlers lpfc_err_handler = {
+       .error_detected = lpfc_io_error_detected,
+       .slot_reset = lpfc_io_slot_reset,
+       .resume = lpfc_io_resume,
+};
+
 static struct pci_driver lpfc_driver = {
        .name           = LPFC_DRIVER_NAME,
-       .owner          = THIS_MODULE,
        .id_table       = lpfc_id_table,
        .probe          = lpfc_pci_probe_one,
        .remove         = __devexit_p(lpfc_pci_remove_one),
+       .err_handler    = &lpfc_err_handler,
 };
 
+/**
+ * lpfc_init: lpfc module initialization routine.
+ *
+ * This routine is to be invoked when the lpfc module is loaded into the
+ * kernel. The special kernel macro module_init() is used to indicate the
+ * role of this routine to the kernel as lpfc module entry point.
+ *
+ * Return codes
+ *   0 - successful
+ *   -ENOMEM - FC attach transport failed
+ *   all others - failed
+ */
 static int __init
 lpfc_init(void)
 {
@@ -1720,22 +2872,45 @@ lpfc_init(void)
        printk(LPFC_MODULE_DESC "\n");
        printk(LPFC_COPYRIGHT "\n");
 
+       if (lpfc_enable_npiv) {
+               lpfc_transport_functions.vport_create = lpfc_vport_create;
+               lpfc_transport_functions.vport_delete = lpfc_vport_delete;
+       }
        lpfc_transport_template =
                                fc_attach_transport(&lpfc_transport_functions);
-       if (!lpfc_transport_template)
+       if (lpfc_transport_template == NULL)
                return -ENOMEM;
+       if (lpfc_enable_npiv) {
+               lpfc_vport_transport_template =
+                       fc_attach_transport(&lpfc_vport_transport_functions);
+               if (lpfc_vport_transport_template == NULL) {
+                       fc_release_transport(lpfc_transport_template);
+                       return -ENOMEM;
+               }
+       }
        error = pci_register_driver(&lpfc_driver);
-       if (error)
+       if (error) {
                fc_release_transport(lpfc_transport_template);
+               fc_release_transport(lpfc_vport_transport_template);
+       }
 
        return error;
 }
 
+/**
+ * lpfc_exit: lpfc module removal routine.
+ *
+ * This routine is invoked when the lpfc module is removed from the kernel.
+ * The special kernel macro module_exit() is used to indicate the role of
+ * this routine to the kernel as lpfc module exit point.
+ */
 static void __exit
 lpfc_exit(void)
 {
        pci_unregister_driver(&lpfc_driver);
        fc_release_transport(lpfc_transport_template);
+       if (lpfc_enable_npiv)
+               fc_release_transport(lpfc_vport_transport_template);
 }
 
 module_init(lpfc_init);