[SCSI] lpfc: NPIV: add NPIV support on top of SLI-3
[safe/jmp/linux-2.6] / drivers / scsi / lpfc / lpfc_init.c
index 369487e..4dd0f1a 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-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>
 #include "lpfc.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_crtn.h"
+#include "lpfc_vport.h"
 #include "lpfc_version.h"
+#include "lpfc_vport.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                                             */
@@ -61,7 +67,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;
@@ -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,9 +106,7 @@ 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,
+                       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX,
                                        "%d:0324 Config Port initialization "
                                        "error, mbxCmd x%x READ_NVPARM, "
                                        "mbxStatus x%x\n",
@@ -108,16 +116,18 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                        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,
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "%d:0439 Adapter failed to init, mbxCmd x%x "
                                "READ_REV, mbxStatus x%x\n",
                                phba->brd_no,
@@ -126,6 +136,7 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                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.
@@ -140,8 +151,12 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                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;
@@ -157,13 +172,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)
@@ -182,16 +201,15 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                                        "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:
@@ -212,48 +230,34 @@ 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;
 
        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,
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "%d: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,21 +267,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);
@@ -298,25 +308,15 @@ 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,
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "%d: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;
        }
@@ -327,16 +327,23 @@ 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,
+
+       /* 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,
                        "%d:1302 Invalid speed for this board: "
                        "Reset link speed to auto: x%x\n",
                        phba->brd_no,
@@ -344,21 +351,22 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                        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;
+       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)
@@ -376,21 +384,21 @@ 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);
 
        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,
+       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 "
                                "INIT_LINK, mbxStatus x%x\n",
                                phba->brd_no,
@@ -403,37 +411,13 @@ 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 */
 
-       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);
-
-       }
-
-       /* 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);
 }
 
@@ -448,18 +432,57 @@ lpfc_config_port_post(struct lpfc_hba * phba)
 /*                                                                      */
 /************************************************************************/
 int
-lpfc_hba_down_prep(struct lpfc_hba * phba)
+lpfc_hba_down_prep(struct lpfc_hba *phba)
 {
+       struct lpfc_vport *vport = phba->pport;
+
        /* 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);
+       list_for_each_entry(vport, &phba->port_list, listentry) {
+               lpfc_cleanup_discovery_resources(vport);
+       }
 
-       return (0);
+       return 0;
+}
+
+/************************************************************************/
+/*                                                                      */
+/*    lpfc_hba_down_post                                                */
+/*    This routine will do uninitialization after the HBA is reset      */
+/*    when bringing down the SLI Layer.                                 */
+/*    This routine returns 0 on success. Any other return value         */
+/*    indicates an 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;
+       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);
+               }
+       }
+
+       for (i = 0; i < psli->num_rings; i++) {
+               pring = &psli->ring[i];
+               lpfc_sli_abort_iocb_ring(phba, pring);
+       }
+
+       return 0;
 }
 
 /************************************************************************/
@@ -471,35 +494,39 @@ lpfc_hba_down_prep(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 *port_iterator;
+       uint32_t event_data;
+       struct Scsi_Host  *shost;
 
-       /*
-        * 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 */
-
-               /* Restore PCI cmd register */
-               pci_write_config_word(phba->pcidev,
-                                     PCI_COMMAND, phba->pci_cfg_value);
-       }
+       /* 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 (phba->work_hs & HS_FFER6) {
+       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 "
                                "Data: x%x x%x x%x\n",
                                phba->brd_no, 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);
+               list_for_each_entry(port_iterator, &phba->port_list,
+                                   listentry) {
+                       shost = lpfc_shost_from_vport(port_iterator);
+
+                       spin_lock_irq(shost->host_lock);
+                       port_iterator->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->hbalock);
 
                /*
                * Firmware stops when it triggled erratt with HS_FFER6.
@@ -515,11 +542,15 @@ 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 {
                /* The if clause above forces this code path when the status
                 * failure is a value other than FFER6.  Do not call the offline
@@ -531,8 +562,20 @@ lpfc_handle_eratt(struct lpfc_hba * phba)
                                phba->brd_no, 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);
 
+               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);
        }
 }
 
@@ -545,9 +588,11 @@ 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;
+       struct lpfc_vport *port_iterator;
        LPFC_MBOXQ_t *pmb;
        volatile uint32_t control;
        struct lpfc_dmabuf *mp;
@@ -568,30 +613,34 @@ lpfc_handle_latt(struct lpfc_hba * phba)
        rc = -EIO;
 
        /* Cleanup any outstanding ELS commands */
-       lpfc_els_flush_cmd(phba);
+       list_for_each_entry(port_iterator, &phba->port_list, listentry)
+               lpfc_els_flush_cmd(port_iterator);
 
        psli->slistat.link_event++;
        lpfc_read_la(phba, pmb, mp);
        pmb->mbox_cmpl = lpfc_mbx_cmpl_read_la;
+       pmb->vport = vport;
        rc = lpfc_sli_issue_mbox (phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB));
        if (rc == MBX_NOT_FINISHED)
-               goto lpfc_handle_latt_free_mp;
+               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:
+       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;
@@ -601,15 +650,13 @@ 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,
+               lpfc_printf_log(phba, KERN_WARNING, LOG_MBOX,
                                "%d:0300 READ_LA: no buffers\n",
                                phba->brd_no);
 
@@ -623,10 +670,10 @@ lpfc_handle_latt_err_exit:
 /*                                                                      */
 /************************************************************************/
 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;
@@ -635,16 +682,15 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                return 0;
 
        /* Vital Product */
-       lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_INIT,
+       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,
                        (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;
@@ -660,7 +706,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')) {
@@ -754,148 +801,159 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                        index ++;
                        break;
                }
-       } while (!finished && (index < 108));
+       }
 
        return(1);
 }
 
 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;
-       uint16_t dev_subid = phba->pcidev->subsystem_device;
-       uint8_t hdrtype = phba->pcidev->hdr_type;
-       char *model_str = "";
+       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;
 
        switch (dev_id) {
        case PCI_DEVICE_ID_FIREFLY:
-               model_str = "LP6000 1Gb PCI";
+               m = (typeof(m)){"LP6000", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_SUPERFLY:
                if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3)
-                       model_str = "LP7000 1Gb PCI";
+                       m = (typeof(m)){"LP7000", max_speed,  "PCI"};
                else
-                       model_str = "LP7000E 1Gb PCI";
+                       m = (typeof(m)){"LP7000E", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_DRAGONFLY:
-               model_str = "LP8000 1Gb PCI";
+               m = (typeof(m)){"LP8000", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_CENTAUR:
                if (FC_JEDEC_ID(vp->rev.biuRev) == CENTAUR_2G_JEDEC_ID)
-                       model_str = "LP9002 2Gb PCI";
+                       m = (typeof(m)){"LP9002", max_speed, "PCI"};
                else
-                       model_str = "LP9000 1Gb PCI";
+                       m = (typeof(m)){"LP9000", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_RFLY:
-               model_str = "LP952 2Gb PCI";
+               m = (typeof(m)){"LP952", max_speed, "PCI"};
                break;
        case PCI_DEVICE_ID_PEGASUS:
-               model_str = "LP9802 2Gb PCI-X";
+               m = (typeof(m)){"LP9802", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_THOR:
-               if (hdrtype == 0x80)
-                       model_str = "LP10000DC 2Gb 2-port PCI-X";
-               else
-                       model_str = "LP10000 2Gb PCI-X";
+               m = (typeof(m)){"LP10000", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_VIPER:
-               model_str = "LPX1000 10Gb PCI-X";
+               m = (typeof(m)){"LPX1000", max_speed,  "PCI-X"};
                break;
        case PCI_DEVICE_ID_PFLY:
-               model_str = "LP982 2Gb PCI-X";
+               m = (typeof(m)){"LP982", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_TFLY:
-               if (hdrtype == 0x80)
-                       model_str = "LP1050DC 2Gb 2-port PCI-X";
-               else
-                       model_str = "LP1050 2Gb PCI-X";
+               m = (typeof(m)){"LP1050", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_HELIOS:
-               if (hdrtype == 0x80)
-                       model_str = "LP11002 4Gb 2-port PCI-X2";
-               else
-                       model_str = "LP11000 4Gb PCI-X2";
+               m = (typeof(m)){"LP11000", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_HELIOS_SCSP:
-               model_str = "LP11000-SP 4Gb PCI-X2";
+               m = (typeof(m)){"LP11000-SP", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_HELIOS_DCSP:
-               model_str = "LP11002-SP 4Gb 2-port PCI-X2";
+               m = (typeof(m)){"LP11002-SP", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_NEPTUNE:
-               if (hdrtype == 0x80)
-                       model_str = "LPe1002 4Gb 2-port";
-               else
-                       model_str = "LPe1000 4Gb PCIe";
+               m = (typeof(m)){"LPe1000", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_NEPTUNE_SCSP:
-               model_str = "LPe1000-SP 4Gb PCIe";
+               m = (typeof(m)){"LPe1000-SP", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_NEPTUNE_DCSP:
-               model_str = "LPe1002-SP 4Gb 2-port PCIe";
+               m = (typeof(m)){"LPe1002-SP", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_BMID:
-               model_str = "LP1150 4Gb PCI-X2";
+               m = (typeof(m)){"LP1150", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_BSMB:
-               model_str = "LP111 4Gb PCI-X2";
+               m = (typeof(m)){"LP111", max_speed, "PCI-X2"};
                break;
        case PCI_DEVICE_ID_ZEPHYR:
-               if (hdrtype == 0x80)
-                       model_str = "LPe11002 4Gb 2-port PCIe";
-               else
-                       model_str = "LPe11000 4Gb PCIe";
+               m = (typeof(m)){"LPe11000", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_ZEPHYR_SCSP:
-               model_str = "LPe11000-SP 4Gb PCIe";
+               m = (typeof(m)){"LPe11000", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_ZEPHYR_DCSP:
-               model_str = "LPe11002-SP 4Gb 2-port PCIe";
+               m = (typeof(m)){"LPe11002-SP", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_ZMID:
-               model_str = "LPe1150 4Gb PCIe";
+               m = (typeof(m)){"LPe1150", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_ZSMB:
-               model_str = "LPe111 4Gb PCIe";
+               m = (typeof(m)){"LPe111", max_speed, "PCIe"};
                break;
        case PCI_DEVICE_ID_LP101:
-               model_str = "LP101 2Gb PCI-X";
+               m = (typeof(m)){"LP101", max_speed, "PCI-X"};
                break;
        case PCI_DEVICE_ID_LP10000S:
-               model_str = "LP10000-S 2Gb PCI";
+               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:
-               switch (dev_subid) {
-               case PCI_SUBSYSTEM_ID_LP11000S:
-                       model_str = "LP11002-S 4Gb PCI-X2";
-                       break;
-               case PCI_SUBSYSTEM_ID_LP11002S:
-                       model_str = "LP11000-S 4Gb 2-port PCI-X2";
-                       break;
-               case PCI_SUBSYSTEM_ID_LPE11000S:
-                       model_str = "LPe11002-S 4Gb PCIe";
-                       break;
-               case PCI_SUBSYSTEM_ID_LPE11002S:
-                       model_str = "LPe11002-S 4Gb 2-port PCIe";
-                       break;
-               case PCI_SUBSYSTEM_ID_LPE11010S:
-                       model_str = "LPe11010-S 4Gb 10-port PCIe";
-                       break;
-               default:
-                       break;
-               }
+               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;
        }
-       if (mdp)
-               sscanf(model_str, "%s", mdp);
-       if (descp)
-               sprintf(descp, "Emulex %s Fibre Channel Adapter", model_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);
 }
 
 /**************************************************/
@@ -907,7 +965,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;
@@ -919,9 +977,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;
@@ -936,9 +992,7 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                                                &mp1->phys);
                if (mp1 == 0 || mp1->virt == 0) {
                        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;
                }
@@ -954,9 +1008,7 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                                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;
                        }
@@ -982,7 +1034,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);
@@ -994,14 +1045,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;
@@ -1014,7 +1062,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;
 
@@ -1115,7 +1163,7 @@ 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);
        if (!HashWorking)
@@ -1134,191 +1182,182 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
 }
 
 static void
-lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
+lpfc_cleanup(struct lpfc_vport *vport)
 {
        struct lpfc_nodelist *ndlp, *next_ndlp;
 
        /* 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);
-       }
-
-       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, &phba->fc_reglogin_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
-
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_prli_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+       lpfc_can_disctmo(vport);
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp)
+               lpfc_nlp_put(ndlp);
 
-       list_for_each_entry_safe(ndlp, next_ndlp, &phba->fc_npr_list,
-                               nlp_listp) {
-               lpfc_nlp_remove(phba, ndlp);
-       }
+       INIT_LIST_HEAD(&vport->fc_nodes);
 
-       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 *vport = phba->pport;
        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);
+                       phba->brd_no, vport->fc_flag,
+                       vport->port_state);
+       list_for_each_entry(vport, &phba->port_list, listentry) {
+               struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+               spin_lock_irqsave(shost->host_lock, iflag);
+               vport->fc_flag &= ~FC_ESTABLISH_LINK;
+               spin_unlock_irqrestore(shost->host_lock, iflag);
+       }
 }
 
-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;
+       del_timer_sync(&vport->els_tmofunc);
+       del_timer_sync(&vport->fc_fdmitmo);
+       lpfc_can_disctmo(vport);
+       return;
+}
 
-               list_remove_head((&phba->freebufList), mp,
-                                struct lpfc_dmabuf, list);
-               if (mp) {
-                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
-                       kfree(mp);
-               }
-       }
+static void
+lpfc_stop_phba_timers(struct lpfc_hba *phba)
+{
+       struct lpfc_vport *vport;
 
        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);
+       list_for_each_entry(vport, &phba->port_list, listentry)
+               lpfc_stop_vport_timers(vport);
+       del_timer_sync(&phba->sli.mbox_tmo);
+       del_timer_sync(&phba->fabric_block_timer);
+       return;
 }
 
 int
-lpfc_online(struct lpfc_hba * phba)
+lpfc_online(struct lpfc_hba *phba)
 {
+       struct lpfc_vport *vport = phba->pport;
+
        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,
+       lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,
                       "%d:0458 Bring Adapter online\n",
                       phba->brd_no);
 
-       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);
+       list_for_each_entry(vport, &phba->port_list, listentry) {
+               struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+               spin_lock_irq(shost->host_lock);
+               vport->fc_flag &= ~FC_OFFLINE_MODE;
+               if (phba->sli3_options & LPFC_SLI3_NPIV_ENABLED)
+                       vport->fc_flag |= FC_VPORT_NEEDS_REG_VPI;
+               spin_unlock_irq(shost->host_lock);
+       }
 
+       lpfc_unblock_mgmt_io(phba);
        return 0;
 }
 
-int
-lpfc_offline(struct lpfc_hba * phba)
+void
+lpfc_block_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;
+void
+lpfc_unblock_mgmt_io(struct lpfc_hba * phba)
+{
+       unsigned long iflag;
 
-       psli = &phba->sli;
-       pring = &psli->ring[psli->fcp_ring];
+       spin_lock_irqsave(&phba->hbalock, iflag);
+       phba->sli.sli_flag &= ~LPFC_BLOCK_MGMT_IO;
+       spin_unlock_irqrestore(&phba->hbalock, iflag);
+}
+
+void
+lpfc_offline_prep(struct lpfc_hba * phba)
+{
+       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_nodelist  *ndlp, *next_ndlp;
+
+       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 */
+       list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp)
+               if (ndlp->nlp_state != NLP_STE_UNUSED_NODE)
+                       lpfc_unreg_rpi(vport, ndlp);
+
+       lpfc_sli_flush_mbox_queue(phba);
+}
+
+void
+lpfc_offline(struct lpfc_hba *phba)
+{
+       struct lpfc_vport *vport = phba->pport;
+       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
+       struct lpfc_vport *port_iterator;
+
+       if (vport->fc_flag & FC_OFFLINE_MODE)
+               return;
 
        /* stop all timers associated with this hba */
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
+       lpfc_stop_phba_timers(phba);
+       list_for_each_entry(port_iterator, &phba->port_list, listentry) {
+               port_iterator->work_port_events = 0;
+       }
 
-       lpfc_printf_log(phba,
-                      KERN_WARNING,
-                      LOG_INIT,
+       lpfc_printf_log(phba, KERN_WARNING, LOG_INIT,
                       "%d:0460 Bring Adapter offline\n",
                       phba->brd_no);
 
        /* 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;
+       vport->fc_flag |= FC_OFFLINE_MODE;
+       spin_unlock_irq(&phba->hbalock);
+       list_for_each_entry(port_iterator, &phba->port_list, listentry) {
+               shost = lpfc_shost_from_vport(port_iterator);
+
+               lpfc_cleanup(port_iterator);
+               spin_lock_irq(shost->host_lock);
+               vport->work_port_events = 0;
+               vport->fc_flag |= FC_OFFLINE_MODE;
+               spin_unlock_irq(shost->host_lock);
+       }
 }
 
 /******************************************************************************
@@ -1328,17 +1367,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--;
        }
@@ -1350,19 +1389,239 @@ 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 fc_vport *fc_vport)
+{
+       struct lpfc_vport *vport;
+       struct Scsi_Host  *shost;
+       int error = 0;
+
+       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;
+
+       shost->unique_id = instance;
+       shost->max_id = LPFC_MAX_TARGET;
+       shost->max_lun = phba->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 (fc_vport != NULL) {
+               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;
+
+       if (fc_vport != NULL) {
+               error = scsi_add_host(shost, &fc_vport->dev);
+       } else {
+               error = scsi_add_host(shost, &phba->pcidev->dev);
+       }
+       if (error)
+               goto out_put_shost;
+
+       if (!shost->shost_classdev.kobj.dentry)
+               goto out_put_shost;
+
+       list_add_tail(&vport->listentry, &phba->port_list);
+       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_free_sysfs_attr(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;
+}
+
+static void
+lpfc_remove_device(struct lpfc_vport *vport)
+{
+       struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
+
+       lpfc_free_sysfs_attr(vport);
+
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag |= FC_UNLOADING;
+       spin_unlock_irq(shost->host_lock);
+
+       fc_remove_host(shost);
+       scsi_remove_host(shost);
+}
+
+void lpfc_scan_start(struct Scsi_Host *shost)
+{
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+
+       if (lpfc_sli_hba_setup(phba))
+               goto error;
+
+       /*
+        * 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;
+       return;
+
+error:
+       lpfc_remove_device(vport);
+}
+
+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;
+
+       if (time >= 30 * HZ) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                               "%d:0461 Scanning longer than 30 "
+                               "seconds.  Continuing initialization\n",
+                               phba->brd_no);
+               goto finished;
+       }
+       if (time >= 15 * HZ && phba->link_state <= LPFC_LINK_DOWN) {
+               lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                               "%d:0465 Link down longer than 15 "
+                               "seconds.  Continuing initialization\n",
+                               phba->brd_no);
+               goto finished;
+       }
+
+       if (vport->port_state != LPFC_VPORT_READY)
+               return 0;
+       if (vport->num_disc_nodes || vport->fc_prli_sent)
+               return 0;
+       if (vport->fc_map_cnt == 0 && time < 2 * HZ)
+               return 0;
+       if ((phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE) != 0)
+               return 0;
+
+finished:
+       lpfc_host_attrib_init(shost);
+       return 1;
+}
+
+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_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->fc_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;
        unsigned long bar0map_len, bar2map_len;
        int error = -ENODEV, retval;
        int i;
@@ -1373,74 +1632,41 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        if (pci_request_regions(pdev, 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_MUTEX(&phba->hba_can_block);
-       INIT_LIST_HEAD(&phba->ctrspbuflist);
-       INIT_LIST_HEAD(&phba->rnidrspbuflist);
-       INIT_LIST_HEAD(&phba->freebufList);
+       INIT_LIST_HEAD(&phba->port_list);
+       INIT_LIST_HEAD(&phba->hbq_buffer_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;
+       phba->fc_estabtmo.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);
@@ -1488,13 +1714,22 @@ 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;
+
+       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;
+               goto out_free_hbqslimp;
 
        /* Initialize and populate the iocb list per host.  */
        INIT_LIST_HEAD(&phba->lpfc_iocb_list);
@@ -1518,10 +1753,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 */
@@ -1542,116 +1778,76 @@ 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)
+       vport = lpfc_create_port(phba, phba->brd_no, NULL);
+       if (!vport)
                goto out_kthread_stop;
 
-       error = request_irq(phba->pcidev->irq, lpfc_intr_handler, SA_SHIRQ,
-                                                       LPFC_DRIVER_NAME, phba);
+       shost = lpfc_shost_from_vport(vport);
+       phba->pport = 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);
+       }
+
+       error = request_irq(phba->pcidev->irq, lpfc_intr_handler, IRQF_SHARED,
+                           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;
+               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)
+       if (lpfc_alloc_sysfs_attr(vport))
                goto out_free_irq;
 
+       scsi_scan_host(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;
-
-       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;
-       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;
-       }
-
-       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_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);
-out_free_sysfs_attr:
-       lpfc_free_sysfs_attr(phba);
+out_disable_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);
@@ -1661,34 +1857,26 @@ 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);
 out_disable_device:
        pci_disable_device(pdev);
 out:
+       pci_set_drvdata(pdev, NULL);
        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[0];
-       unsigned long iflag;
-
-       lpfc_free_sysfs_attr(phba);
-
-       spin_lock_irqsave(phba->host->host_lock, iflag);
-       phba->fc_flag |= FC_UNLOADING;
-
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
-
-       fc_remove_host(phba->host);
-       scsi_remove_host(phba->host);
-
-       kthread_stop(phba->worker_thread);
+       struct Scsi_Host  *shost = pci_get_drvdata(pdev);
+       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
+       struct lpfc_hba   *phba = vport->phba;
+       struct lpfc_vport *port_iterator;
+       list_for_each_entry(port_iterator, &phba->port_list, listentry)
+               port_iterator->load_flag |= FC_UNLOADING;
 
        /*
         * Bring down the SLI Layer. This step disable all interrupts,
@@ -1696,13 +1884,19 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
         * the HBA.
         */
        lpfc_sli_hba_down(phba);
+       lpfc_sli_brdrestart(phba);
+
+       lpfc_stop_phba_timers(phba);
+
+       kthread_stop(phba->worker_thread);
 
        /* Release the irq reservation */
        free_irq(phba->pcidev->irq, phba);
+       pci_disable_msi(phba->pcidev);
 
-       lpfc_cleanup(phba, 0);
-       lpfc_stop_timer(phba);
-       phba->work_hba_events = 0;
+       destroy_port(vport);
+
+       pci_set_drvdata(pdev, NULL);
 
        /*
         * Call scsi_free before mem_free since scsi bufs are released to their
@@ -1711,6 +1905,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);
@@ -1719,13 +1916,100 @@ 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_regions(pdev);
+       pci_disable_device(pdev);
+}
+
+/**
+ * lpfc_io_error_detected - called when PCI error is detected
+ * @pdev: Pointer to PCI device
+ * @state: The current pci conneection state
+ *
+ * This function is called after a PCI bus error affecting
+ * this device has been detected.
+ */
+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 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);
+
+       /* Request a slot reset. */
+       return PCI_ERS_RESULT_NEED_RESET;
+}
+
+/**
+ * lpfc_io_slot_reset - called after the pci bus has been reset.
+ * @pdev: Pointer to PCI device
+ *
+ * Restart the card from scratch, as if from a cold-boot.
+ */
+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 lpfc_sli *psli = &phba->sli;
+       int bars = pci_select_bars(pdev, IORESOURCE_MEM);
+
+       dev_printk(KERN_INFO, &pdev->dev, "recovering from a slot reset.\n");
+       if (pci_enable_device_bars(pdev, bars)) {
+               printk(KERN_ERR "lpfc: Cannot re-enable "
+                       "PCI device after reset.\n");
+               return PCI_ERS_RESULT_DISCONNECT;
+       }
+
+       pci_set_master(pdev);
+
+       /* Re-establishing Link */
+       spin_lock_irq(host->host_lock);
+       phba->pport->fc_flag |= FC_ESTABLISH_LINK;
+       spin_unlock_irq(host->host_lock);
+
+       spin_lock_irq(&phba->hbalock);
+       psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+       spin_unlock_irq(&phba->hbalock);
+
+
+       /* Take device offline; this will perform cleanup */
+       lpfc_offline(phba);
+       lpfc_sli_brdrestart(phba);
+
+       return PCI_ERS_RESULT_RECOVERED;
+}
+
+/**
+ * lpfc_io_resume - called when traffic can start flowing again.
+ * @pdev: Pointer to PCI device
+ *
+ * This callback is called when the error recovery driver tells us that
+ * its OK to resume normal operation.
+ */
+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;
+
+       if (lpfc_online(phba) == 0) {
+               mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
+       }
 }
 
 static struct pci_device_id lpfc_id_table[] = {
@@ -1783,16 +2067,35 @@ 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 }
 };
 
 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,
        .id_table       = lpfc_id_table,
        .probe          = lpfc_pci_probe_one,
        .remove         = __devexit_p(lpfc_pci_remove_one),
+       .err_handler    = &lpfc_err_handler,
 };
 
 static int __init
@@ -1805,11 +2108,15 @@ lpfc_init(void)
 
        lpfc_transport_template =
                                fc_attach_transport(&lpfc_transport_functions);
-       if (!lpfc_transport_template)
+       lpfc_vport_transport_template =
+                       fc_attach_transport(&lpfc_vport_transport_functions);
+       if (!lpfc_transport_template || !lpfc_vport_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;
 }
@@ -1819,6 +2126,7 @@ lpfc_exit(void)
 {
        pci_unregister_driver(&lpfc_driver);
        fc_release_transport(lpfc_transport_template);
+       fc_release_transport(lpfc_vport_transport_template);
 }
 
 module_init(lpfc_init);