Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
[pandora-kernel.git] / drivers / scsi / lpfc / lpfc_init.c
index 9d014e5..3205f74 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-2006 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2007 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>
@@ -40,6 +41,7 @@
 #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 *, int);
@@ -47,6 +49,7 @@ 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);
 
 /************************************************************************/
@@ -61,7 +64,7 @@ static DEFINE_IDR(lpfc_hba_index);
 /*                                                                      */
 /************************************************************************/
 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;
@@ -75,12 +78,12 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
 
        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)) {
                if (init_key) {
@@ -100,36 +103,35 @@ 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 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.
@@ -137,15 +139,18 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
        if (mb->un.varRdRev.rr == 0) {
                vp->rev.rBit = 0;
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                               "%d:0440 Adapter failed to init, READ_REV has "
-                               "missing revision information.\n",
-                               phba->brd_no);
+                               "0440 Adapter failed to init, READ_REV has "
+                               "missing revision information.\n");
                mempool_free(pmb, phba->mbox_mem_pool);
                return -ERESTART;
        }
 
+       if (phba->sli_rev == 3 && !mb->un.varRdRev.v3rsp)
+               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;
@@ -161,6 +166,13 @@ 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));
@@ -179,16 +191,15 @@ 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);
                        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 && offset < DMP_VPD_SIZE);
        lpfc_parse_vpd(phba, lpfc_vpd_data, offset);
@@ -201,6 +212,18 @@ out_free_mbox:
        return 0;
 }
 
+/* Completion handler for config async event mailbox command. */
+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                                             */
@@ -212,48 +235,42 @@ out_free_mbox:
 /*                                                                      */
 /************************************************************************/
 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);
@@ -263,25 +280,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;
 
        if (phba->cfg_soft_wwnn)
-               u64_to_wwn(phba->cfg_soft_wwnn, phba->fc_sparam.nodeName.u.wwn);
+               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, phba->fc_sparam.portName.u.wwn);
-       memcpy(&phba->fc_nodename, &phba->fc_sparam.nodeName,
+               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);
@@ -303,15 +322,13 @@ lpfc_config_port_post(struct lpfc_hba * phba)
        }
 
        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;
        }
@@ -338,19 +355,16 @@ lpfc_config_port_post(struct lpfc_hba * phba)
            || ((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,
-                       "%d:1302 Invalid speed for this board: "
+               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 */
+       /* 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)
@@ -359,10 +373,11 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                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)
@@ -380,25 +395,26 @@ lpfc_config_port_post(struct lpfc_hba * phba)
 
        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;
+       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,
-                               "%d:0454 Adapter failed to init, mbxCmd x%x "
+               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 */
@@ -408,41 +424,28 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                writel(0xffffffff, phba->HAregaddr);
                readl(phba->HAregaddr); /* flush */
 
-               phba->hba_state = LPFC_HBA_ERROR;
+               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);
 
-       return (0);
-}
-
-static int
-lpfc_discovery_wait(struct lpfc_hba *phba)
-{
-       int i = 0;
-
-       while ((phba->hba_state != LPFC_HBA_READY) ||
-              (phba->num_disc_nodes) || (phba->fc_prli_sent) ||
-              ((phba->fc_map_cnt == 0) && (i<2)) ||
-              (phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE)) {
-               /* Check every second for 30 retries. */
-               i++;
-               if (i > 30) {
-                       return -ETIMEDOUT;
-               }
-               if ((i >= 15) && (phba->hba_state <= LPFC_LINK_DOWN)) {
-                       /* The link is down.  Set linkdown timeout */
-                       return -ETIMEDOUT;
-               }
-
-               /* 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);
        }
-
-       return 0;
+       return (0);
 }
 
 /************************************************************************/
@@ -456,18 +459,14 @@ lpfc_discovery_wait(struct lpfc_hba *phba)
 /*                                                                      */
 /************************************************************************/
 int
-lpfc_hba_down_prep(struct lpfc_hba * phba)
+lpfc_hba_down_prep(struct lpfc_hba *phba)
 {
        /* 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);
-
-       return (0);
+       lpfc_cleanup_discovery_resources(phba->pport);
+       return 0;
 }
 
 /************************************************************************/
@@ -480,30 +479,217 @@ lpfc_hba_down_prep(struct lpfc_hba * phba)
 /*                                                                      */
 /************************************************************************/
 int
-lpfc_hba_down_post(struct lpfc_hba * phba)
+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;
 
-       /* 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);
+       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;
 }
 
+/* HBA heart beat timeout handler */
+static void
+lpfc_hb_timeout(unsigned long ptr)
+{
+       struct lpfc_hba *phba;
+       unsigned long iflag;
+
+       phba = (struct lpfc_hba *)ptr;
+       spin_lock_irqsave(&phba->pport->work_port_lock, iflag);
+       if (!(phba->pport->work_port_events & WORKER_HB_TMO))
+               phba->pport->work_port_events |= WORKER_HB_TMO;
+       spin_unlock_irqrestore(&phba->pport->work_port_lock, iflag);
+
+       if (phba->work_wait)
+               wake_up(phba->work_wait);
+       return;
+}
+
+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;
+}
+
+void
+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;
+       LIST_HEAD(completions);
+
+       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;
+       }
+
+       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);
+               }
+       }
+}
+
+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                                                 */
@@ -513,28 +699,48 @@ lpfc_hba_down_post(struct lpfc_hba * phba)
 /*                                                                      */
 /************************************************************************/
 void
-lpfc_handle_eratt(struct lpfc_hba * phba)
+lpfc_handle_eratt(struct lpfc_hba *phba)
 {
-       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_sli   *psli = &phba->sli;
        struct lpfc_sli_ring  *pring;
+       struct lpfc_vport **vports;
        uint32_t event_data;
+       unsigned long temperature;
+       struct temp_event temp_event_data;
+       struct Scsi_Host  *shost;
+       int i;
+
        /* 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 ||
            phba->work_hs & HS_FFER5) {
                /* 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;
+               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]->fc_flag |= FC_ESTABLISH_LINK;
+                               spin_unlock_irq(shost->host_lock);
+                       }
+               lpfc_destroy_vport_work_array(phba, vports);
+               spin_lock_irq(&phba->hbalock);
                psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(&phba->hbalock);
 
                /*
                * Firmware stops when it triggled erratt with HS_FFER6.
@@ -550,32 +756,58 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                 * 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]);
 
                event_data = FC_REG_DUMP_EVENT;
-               fc_host_post_vendor_event(phba->host, fc_get_event_number(),
+               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);
 
-               psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
-               lpfc_offline(phba);
-               phba->hba_state = LPFC_HBA_ERROR;
-               lpfc_hba_down_post(phba);
+               lpfc_offline_eratt(phba);
        }
 }
 
@@ -588,43 +820,51 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
 /*                                                                      */
 /************************************************************************/
 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_cmd(phba);
+       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)
+       pmb->vport = vport;
+       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;
 
@@ -633,10 +873,10 @@ lpfc_handle_latt_free_mbuf:
 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;
@@ -646,17 +886,12 @@ 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;
 }
@@ -668,10 +903,10 @@ lpfc_handle_latt_err_exit:
 /*                                                                      */
 /************************************************************************/
 static int
-lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd, int len)
+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;
@@ -680,11 +915,8 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd, int len)
                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]);
        while (!finished && (index < (len - 4))) {
@@ -807,7 +1039,7 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd, int len)
 }
 
 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;
        uint16_t dev_id = phba->pcidev->device;
@@ -925,6 +1157,24 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
                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:
                m = (typeof(m)){ NULL };
                break;
@@ -947,7 +1197,7 @@ lpfc_get_hba_model_desc(struct lpfc_hba * phba, uint8_t * mdp, uint8_t * descp)
 /*   Returns the number of buffers NOT posted.    */
 /**************************************************/
 int
-lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
+lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt,
                 int type)
 {
        IOCB_t *icmd;
@@ -959,9 +1209,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;
@@ -972,13 +1220,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) {
+                   mp1->virt = lpfc_mbuf_alloc(phba, MEM_PRI, &mp1->phys);
+               if (!mp1 || !mp1->virt) {
                        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;
                }
@@ -990,13 +1235,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 || !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;
                        }
@@ -1022,7 +1265,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);
@@ -1034,14 +1276,11 @@ 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;
@@ -1054,7 +1293,7 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
 /*                                                                      */
 /************************************************************************/
 static int
-lpfc_post_rcv_buf(struct lpfc_hba * phba)
+lpfc_post_rcv_buf(struct lpfc_hba *phba)
 {
        struct lpfc_sli *psli = &phba->sli;
 
@@ -1155,13 +1394,12 @@ 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;
 
@@ -1173,204 +1411,236 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
        kfree(HashWorking);
 }
 
-static void
-lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
+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);
-       }
-
-       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, &phba->fc_plogi_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_adisc_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp) {
+               if (ndlp->nlp_type & NLP_FABRIC)
+                       lpfc_disc_state_machine(vport, ndlp, NULL,
+                                       NLP_EVT_DEVICE_RECOVERY);
+               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);
-       }
+       /* 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)) {
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_prli_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+               if (i++ > 3000) {
+                       lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,
+                               "0233 Nodelist not empty\n");
+                       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);
        }
-
-       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;
        return;
 }
 
 static void
 lpfc_establish_link_tmo(unsigned long ptr)
 {
-       struct lpfc_hba *phba = (struct lpfc_hba *)ptr;
+       struct lpfc_hba   *phba = (struct lpfc_hba *) ptr;
+       struct lpfc_vport **vports;
        unsigned long iflag;
-
+       int i;
 
        /* Re-establishing Link, timer expired */
        lpfc_printf_log(phba, KERN_ERR, LOG_LINK_EVENT,
-                       "%d:1300 Re-establishing Link, timer expired "
+                       "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);
+                       phba->pport->fc_flag, phba->pport->port_state);
+       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_irqsave(shost->host_lock, iflag);
+                       vports[i]->fc_flag &= ~FC_ESTABLISH_LINK;
+                       spin_unlock_irqrestore(shost->host_lock, iflag);
+               }
+       lpfc_destroy_vport_work_array(phba, vports);
 }
 
-static int
-lpfc_stop_timer(struct lpfc_hba * phba)
+void
+lpfc_stop_vport_timers(struct lpfc_vport *vport)
 {
-       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);
-               }
-       }
+       del_timer_sync(&vport->els_tmofunc);
+       del_timer_sync(&vport->fc_fdmitmo);
+       lpfc_can_disctmo(vport);
+       return;
+}
 
+static void
+lpfc_stop_phba_timers(struct lpfc_hba *phba)
+{
        del_timer_sync(&phba->fcp_poll_timer);
        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);
+       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 void
+lpfc_block_mgmt_io(struct lpfc_hba * phba)
+{
+       unsigned long iflag;
+
+       spin_lock_irqsave(&phba->hbalock, iflag);
+       phba->sli.sli_flag |= LPFC_BLOCK_MGMT_IO;
+       spin_unlock_irqrestore(&phba->hbalock, iflag);
 }
 
 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");
 
-       if (!lpfc_sli_queue_setup(phba))
+       lpfc_block_mgmt_io(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)
+void
+lpfc_unblock_mgmt_io(struct lpfc_hba * phba)
 {
-       struct lpfc_sli_ring *pring;
-       struct lpfc_sli *psli;
        unsigned long iflag;
-       int i;
-       int cnt = 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;
+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;
+       if (vport->fc_flag & FC_OFFLINE_MODE)
+               return;
+
+       lpfc_block_mgmt_io(phba);
 
        lpfc_linkdown(phba);
-       lpfc_sli_flush_mbox_queue(phba);
 
-       for (i = 0; i < psli->num_rings; i++) {
-               pring = &psli->ring[i];
-               /* The linkdown event takes 30 seconds to timeout. */
-               while (pring->txcmplq_cnt) {
-                       mdelay(10);
-                       if (cnt++ > 3000) {
-                               lpfc_printf_log(phba,
-                                       KERN_WARNING, LOG_INIT,
-                                       "%d:0466 Outstanding IO when "
-                                       "bringing Adapter offline\n",
-                                       phba->brd_no);
-                               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 (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);
 
+       lpfc_sli_flush_mbox_queue(phba);
+}
 
-       /* stop all timers associated with this hba */
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
-       phba->work_ha = 0;
+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);
 }
 
 /******************************************************************************
@@ -1380,17 +1650,17 @@ lpfc_offline(struct lpfc_hba * phba)
 *
 ******************************************************************************/
 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--;
        }
@@ -1402,102 +1672,275 @@ 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;
 }
 
+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;
+
+       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;
+}
+
+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;
+}
+
+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;
+}
+
+/*
+ * Note: there is no scan_start function as adapter initialization
+ * will have asynchronously kicked off the link initialization.
+ */
+
+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;
+}
+
+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);
+}
 
 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_bars(pdev, bars))
                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);
 
-       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;
+       if ((phba->brd_no = lpfc_get_instance()) < 0)
+               goto out_free_phba;
 
-       host->unique_id = phba->brd_no;
-       INIT_LIST_HEAD(&phba->ctrspbuflist);
-       INIT_LIST_HEAD(&phba->rnidrspbuflist);
-       INIT_LIST_HEAD(&phba->freebufList);
+       INIT_LIST_HEAD(&phba->port_list);
+       /*
+        * Get all the module params for configuring this host and then
+        * establish the host.
+        */
+       lpfc_get_cfgparam(phba);
+       phba->max_vpi = LPFC_MAX_VPI;
 
        /* 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;
+
+       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;
-
+       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;
-
-       /*
-        * Get all the module params for configuring this host and then
-        * establish the host parameters.
-        */
-       lpfc_get_cfgparam(phba);
-
-       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);
-
+       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)
@@ -1539,18 +1982,40 @@ 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());
+
        /* 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",
@@ -1559,7 +2024,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                        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);
@@ -1569,10 +2033,11 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                        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 */
@@ -1593,134 +2058,104 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                goto out_free_iocbq;
        }
 
-       /*
-        * 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.
-        */
-       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;
-       pci_set_drvdata(pdev, host);
-       error = scsi_add_host(host, &pdev->dev);
-       if (error)
+       /* Initialize list of fabric iocbs */
+       INIT_LIST_HEAD(&phba->fabric_iocb_list);
+
+       /* 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 = lpfc_alloc_sysfs_attr(phba);
-       if (error)
-               goto out_remove_host;
+       shost = lpfc_shost_from_vport(vport);
+       phba->pport = vport;
+       lpfc_debugfs_initialize(vport);
+
+       pci_set_drvdata(pdev, shost);
 
        if (phba->cfg_use_msi) {
-               error = pci_enable_msi(phba->pcidev);
-               if (error)
-                       lpfc_printf_log(phba, KERN_INFO, LOG_INIT, "%d:0452 "
-                                       "Enable MSI failed, continuing with "
-                                       "IRQ\n", phba->brd_no);
+               retval = pci_enable_msi(phba->pcidev);
+               if (!retval)
+                       phba->using_msi = 1;
+               else
+                       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                       "0452 Enable MSI failed, continuing "
+                                       "with IRQ\n");
        }
 
-       error = request_irq(phba->pcidev->irq, lpfc_intr_handler, IRQF_SHARED,
-                                                       LPFC_DRIVER_NAME, phba);
-       if (error) {
+       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,
-                       "%d:0451 Enable interrupt handler failed\n",
-                       phba->brd_no);
-               goto out_free_sysfs_attr;
+                       "0451 Enable interrupt handler failed\n");
+               error = retval;
+               goto out_disable_msi;
        }
+
        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) {
-               error = -ENODEV;
+       if (lpfc_alloc_sysfs_attr(vport)) {
+               error = -ENOMEM;
                goto out_free_irq;
        }
 
+       if (lpfc_sli_hba_setup(phba)) {
+               error = -ENODEV;
+               goto out_remove_device;
+       }
+
        /*
         * hba setup may have changed the hba_queue_depth so we need to adjust
         * the value of can_queue.
         */
-       host->can_queue = phba->cfg_hba_queue_depth - 10;
+       shost->can_queue = phba->cfg_hba_queue_depth - 10;
 
-       lpfc_discovery_wait(phba);
+       lpfc_host_attrib_init(shost);
 
        if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
-               spin_lock_irq(phba->host->host_lock);
+               spin_lock_irq(shost->host_lock);
                lpfc_poll_start_timer(phba);
-               spin_unlock_irq(phba->host->host_lock);
+               spin_unlock_irq(shost->host_lock);
        }
 
-       /*
-        * set fixed host attributes
-        * Must done after lpfc_sli_hba_setup()
-        */
-
-       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;
+       scsi_scan_host(shost);
 
-       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));
-
-       fc_host_supported_speeds(host) = 0;
-       if (phba->lmt & LMT_10Gb)
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_10GBIT;
-       if (phba->lmt & LMT_4Gb)
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_4GBIT;
-       if (phba->lmt & LMT_2Gb)
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_2GBIT;
-       if (phba->lmt & LMT_1Gb)
-               fc_host_supported_speeds(host) |= FC_PORTSPEED_1GBIT;
-
-       fc_host_maxframe_size(host) =
-               ((((uint32_t) phba->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
-                (uint32_t) phba->fc_sparam.cmn.bbRcvSizeLsb);
-
-       /* 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;
+       lpfc_stop_phba_timers(phba);
+       phba->pport->work_port_events = 0;
        free_irq(phba->pcidev->irq, phba);
-       pci_disable_msi(phba->pcidev);
-out_free_sysfs_attr:
-       lpfc_free_sysfs_attr(phba);
-out_remove_host:
-       fc_remove_host(phba->host);
-       scsi_remove_host(phba->host);
+out_disable_msi:
+       if (phba->using_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);
@@ -1730,37 +2165,40 @@ out_iounmap_slim:
        iounmap(phba->slim_memmap_p);
 out_idr_remove:
        idr_remove(&lpfc_hba_index, phba->brd_no);
-out_put_host:
-       phba->host = NULL;
-       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;
 }
 
 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;
-       unsigned long iflag;
-
-       lpfc_free_sysfs_attr(phba);
-
-       spin_lock_irqsave(phba->host->host_lock, iflag);
-       phba->fc_flag |= FC_UNLOADING;
+       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_unlock_irqrestore(phba->host->host_lock, iflag);
+       spin_lock_irq(&phba->hbalock);
+       vport->load_flag |= FC_UNLOADING;
+       spin_unlock_irq(&phba->hbalock);
 
-       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
@@ -1769,13 +2207,20 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        lpfc_sli_hba_down(phba);
        lpfc_sli_brdrestart(phba);
 
+       lpfc_stop_phba_timers(phba);
+       spin_lock_irq(&phba->hbalock);
+       list_del_init(&vport->listentry);
+       spin_unlock_irq(&phba->hbalock);
+
+       lpfc_debugfs_terminate(vport);
+
        /* Release the irq reservation */
        free_irq(phba->pcidev->irq, phba);
-       pci_disable_msi(phba->pcidev);
+       if (phba->using_msi)
+               pci_disable_msi(phba->pcidev);
 
-       lpfc_cleanup(phba, 0);
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
+       pci_set_drvdata(pdev, NULL);
+       scsi_host_put(shost);
 
        /*
         * Call scsi_free before mem_free since scsi bufs are released to their
@@ -1784,6 +2229,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);
@@ -1792,13 +2240,12 @@ 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);
 }
 
 /**
@@ -1812,15 +2259,14 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
 static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
                                pci_channel_state_t state)
 {
-       struct Scsi_Host *host = pci_get_drvdata(pdev);
-       struct lpfc_hba *phba = (struct lpfc_hba *)host->hostdata;
+       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) {
-               lpfc_pci_remove_one(pdev);
+       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.
@@ -1830,6 +2276,11 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
        pring = &psli->ring[psli->fcp_ring];
        lpfc_sli_abort_iocb_ring(phba, pring);
 
+       /* Release the irq reservation */
+       free_irq(phba->pcidev->irq, phba);
+       if (phba->using_msi)
+               pci_disable_msi(phba->pcidev);
+
        /* Request a slot reset. */
        return PCI_ERS_RESULT_NEED_RESET;
 }
@@ -1842,8 +2293,8 @@ static pci_ers_result_t lpfc_io_error_detected(struct pci_dev *pdev,
  */
 static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
 {
-       struct Scsi_Host *host = pci_get_drvdata(pdev);
-       struct lpfc_hba *phba = (struct lpfc_hba *)host->hostdata;
+       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 bars = pci_select_bars(pdev, IORESOURCE_MEM);
 
@@ -1857,10 +2308,13 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
        pci_set_master(pdev);
 
        /* Re-establishing Link */
-       spin_lock_irq(phba->host->host_lock);
-       phba->fc_flag |= FC_ESTABLISH_LINK;
+       spin_lock_irq(shost->host_lock);
+       phba->pport->fc_flag |= FC_ESTABLISH_LINK;
+       spin_unlock_irq(shost->host_lock);
+
+       spin_lock_irq(&phba->hbalock);
        psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
-       spin_unlock_irq(phba->host->host_lock);
+       spin_unlock_irq(&phba->hbalock);
 
 
        /* Take device offline; this will perform cleanup */
@@ -1879,8 +2333,8 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
  */
 static void lpfc_io_resume(struct pci_dev *pdev)
 {
-       struct Scsi_Host *host = pci_get_drvdata(pdev);
-       struct lpfc_hba *phba = (struct lpfc_hba *)host->hostdata;
+       struct Scsi_Host *shost = pci_get_drvdata(pdev);
+       struct lpfc_hba *phba = ((struct lpfc_vport *)shost->hostdata)->phba;
 
        if (lpfc_online(phba) == 0) {
                mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
@@ -1942,6 +2396,18 @@ static struct pci_device_id lpfc_id_table[] = {
                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 }
 };
 
@@ -1958,7 +2424,7 @@ static struct pci_driver lpfc_driver = {
        .id_table       = lpfc_id_table,
        .probe          = lpfc_pci_probe_one,
        .remove         = __devexit_p(lpfc_pci_remove_one),
-       .err_handler = &lpfc_err_handler,
+       .err_handler    = &lpfc_err_handler,
 };
 
 static int __init
@@ -1969,13 +2435,27 @@ 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;
 }
@@ -1985,6 +2465,8 @@ 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);