]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/scsi/lpfc/lpfc_init.c
[SCSI] lpfc: Fix NPIV compile problem
[linux-2.6-omap-h63xx.git] / drivers / scsi / lpfc / lpfc_init.c
index e11c4cda0f3fad41dc6b9ec084ba9779c4b6d374..4a50e0a21470ae17ef9847d855610df449ecc473 100644 (file)
@@ -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 *, 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);
 
 
@@ -102,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",
@@ -119,13 +121,13 @@ lpfc_config_port_prep(struct lpfc_hba *phba)
                       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,
@@ -134,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.
@@ -148,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;
@@ -165,6 +172,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));
@@ -192,7 +206,7 @@ lpfc_config_port_prep(struct lpfc_hba *phba)
                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);
@@ -235,11 +249,10 @@ lpfc_config_port_post(struct lpfc_hba *phba)
        mb = &pmb->mb;
 
        /* 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,
@@ -296,10 +309,9 @@ 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,
+               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,
@@ -331,9 +343,7 @@ 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,
+               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,
@@ -352,7 +362,8 @@ 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->hbalock);
@@ -380,15 +391,17 @@ lpfc_config_port_post(struct lpfc_hba *phba)
         */
        timeout = phba->fc_ratov << 1;
        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,
+               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,
@@ -430,10 +443,9 @@ lpfc_hba_down_prep(struct lpfc_hba *phba)
        writel(0, phba->HCregaddr);
        readl(phba->HCregaddr); /* flush */
 
-                               /* Cleanup potential discovery resources */
-       lpfc_els_flush_rscn(vport);
-       lpfc_els_flush_cmd(vport);
-       lpfc_disc_flush_list(vport);
+       list_for_each_entry(vport, &phba->port_list, listentry) {
+               lpfc_cleanup_discovery_resources(vport);
+       }
 
        return 0;
 }
@@ -455,13 +467,17 @@ lpfc_hba_down_post(struct lpfc_hba *phba)
        struct lpfc_dmabuf *mp, *next_mp;
        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);
+               }
        }
 
        for (i = 0; i < psli->num_rings; i++) {
@@ -472,6 +488,119 @@ lpfc_hba_down_post(struct lpfc_hba *phba)
        return 0;
 }
 
+/* HBA heart beat timeout handler */
+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->fc_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;
+       int retval;
+       struct lpfc_sli *psli = &phba->sli;
+
+       if ((phba->link_state == LPFC_HBA_ERROR) ||
+               (phba->pport->fc_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 there is no heart beat outstanding, issue a heartbeat command */
+       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,
+                       "%d:0459 Adapter heartbeat failure, taking "
+                       "this port offline.\n", phba->brd_no);
+
+               spin_lock_irq(&phba->hbalock);
+               psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+               spin_unlock_irq(&phba->hbalock);
+
+               lpfc_offline_prep(phba);
+               lpfc_offline(phba);
+               lpfc_unblock_mgmt_io(phba);
+               phba->link_state = LPFC_HBA_ERROR;
+               lpfc_hba_down_post(phba);
+       }
+}
+
 /************************************************************************/
 /*                                                                      */
 /*    lpfc_handle_eratt                                                 */
@@ -484,10 +613,11 @@ void
 lpfc_handle_eratt(struct lpfc_hba *phba)
 {
        struct lpfc_vport *vport = phba->pport;
-       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        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 the pci channel is offline, ignore possible errors,
         * since we cannot communicate with the pci card anyway. */
@@ -502,10 +632,17 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
                                "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(shost->host_lock);
-               vport->fc_flag |= FC_ESTABLISH_LINK;
+               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(shost->host_lock);
+               spin_unlock_irq(&phba->hbalock);
 
                /*
                * Firmware stops when it triggled erratt with HS_FFER6.
@@ -542,11 +679,14 @@ lpfc_handle_eratt(struct lpfc_hba *phba)
                                phba->work_status[0], phba->work_status[1]);
 
                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);
@@ -568,6 +708,7 @@ lpfc_handle_latt(struct lpfc_hba *phba)
 {
        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;
@@ -588,7 +729,8 @@ lpfc_handle_latt(struct lpfc_hba *phba)
        rc = -EIO;
 
        /* Cleanup any outstanding ELS commands */
-       lpfc_els_flush_cmd(vport);
+       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);
@@ -630,9 +772,7 @@ lpfc_handle_latt_err_exit:
 
        /* 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);
 
@@ -658,9 +798,7 @@ lpfc_parse_vpd(struct lpfc_hba *phba, uint8_t *vpd, int len)
                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],
@@ -1026,9 +1164,8 @@ lpfc_post_buffer(struct lpfc_hba *phba, struct lpfc_sli_ring *pring, int cnt,
                        return cnt;
                }
                lpfc_sli_ringpostbuf_put(phba, pring, mp1);
-               if (mp2) {
+               if (mp2)
                        lpfc_sli_ringpostbuf_put(phba, pring, mp2);
-               }
        }
        pring->missbufcnt = 0;
        return 0;
@@ -1169,43 +1306,53 @@ lpfc_cleanup(struct lpfc_vport *vport)
        lpfc_can_disctmo(vport);
        list_for_each_entry_safe(ndlp, next_ndlp, &vport->fc_nodes, nlp_listp)
                lpfc_nlp_put(ndlp);
-
-       INIT_LIST_HEAD(&vport->fc_nodes);
-
        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;
-       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
        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, vport->fc_flag,
                        vport->port_state);
-       spin_lock_irqsave(shost->host_lock, iflag);
-       vport->fc_flag &= ~FC_ESTABLISH_LINK;
-       spin_unlock_irqrestore(shost->host_lock, iflag);
+       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);
+       }
+}
+
+void
+lpfc_stop_vport_timers(struct lpfc_vport *vport)
+{
+       del_timer_sync(&vport->els_tmofunc);
+       del_timer_sync(&vport->fc_fdmitmo);
+       lpfc_can_disctmo(vport);
+       return;
 }
 
 static void
-lpfc_stop_timer(struct lpfc_hba *phba)
+lpfc_stop_phba_timers(struct lpfc_hba *phba)
 {
-       struct lpfc_vport *vport = phba->pport;
+       struct lpfc_vport *vport;
 
        del_timer_sync(&phba->fcp_poll_timer);
        del_timer_sync(&phba->fc_estabtmo);
-       del_timer_sync(&vport->els_tmofunc);
-       del_timer_sync(&vport->fc_fdmitmo);
-       del_timer_sync(&vport->fc_disctmo);
+       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);
+       phba->hb_outstanding = 0;
+       del_timer_sync(&phba->hb_tmofunc);
        return;
 }
 
@@ -1213,7 +1360,6 @@ int
 lpfc_online(struct lpfc_hba *phba)
 {
        struct lpfc_vport *vport = phba->pport;
-       struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
 
        if (!phba)
                return 0;
@@ -1221,9 +1367,7 @@ lpfc_online(struct lpfc_hba *phba)
        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);
 
@@ -1239,9 +1383,14 @@ lpfc_online(struct lpfc_hba *phba)
                return 1;
        }
 
-       spin_lock_irq(shost->host_lock);
-       vport->fc_flag &= ~FC_OFFLINE_MODE;
-       spin_unlock_irq(shost->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;
@@ -1293,31 +1442,37 @@ lpfc_offline(struct lpfc_hba *phba)
 {
        struct lpfc_vport *vport = phba->pport;
        struct Scsi_Host  *shost = lpfc_shost_from_vport(vport);
-       unsigned long iflag;
+       struct lpfc_vport *port_iterator;
 
        if (vport->fc_flag & FC_OFFLINE_MODE)
                return;
 
        /* stop all timers associated with this hba */
-       lpfc_stop_timer(phba);
+       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(vport);
-       spin_lock_irqsave(shost->host_lock, iflag);
-       spin_lock(&phba->hbalock);
+       spin_lock_irq(&phba->hbalock);
        phba->work_ha = 0;
-       vport->work_port_events = 0;
        vport->fc_flag |= FC_OFFLINE_MODE;
-       spin_unlock(&phba->hbalock);
-       spin_unlock_irqrestore(shost->host_lock, iflag);
+       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);
+       }
 }
 
 /******************************************************************************
@@ -1337,7 +1492,7 @@ lpfc_scsi_free(struct lpfc_hba *phba)
        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--;
        }
@@ -1354,8 +1509,9 @@ lpfc_scsi_free(struct lpfc_hba *phba)
        return 0;
 }
 
+
 struct lpfc_vport *
-lpfc_create_port(struct lpfc_hba *phba, int instance)
+lpfc_create_port(struct lpfc_hba *phba, int instance, struct fc_vport *fc_vport)
 {
        struct lpfc_vport *vport;
        struct Scsi_Host  *shost;
@@ -1369,6 +1525,7 @@ lpfc_create_port(struct lpfc_hba *phba, int instance)
        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;
@@ -1381,7 +1538,13 @@ lpfc_create_port(struct lpfc_hba *phba, int instance)
         * max xri value determined in hba setup.
         */
        shost->can_queue = phba->cfg_hba_queue_depth - 10;
-       shost->transportt = lpfc_transport_template;
+       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);
@@ -1389,22 +1552,25 @@ lpfc_create_port(struct lpfc_hba *phba, int instance)
 
        init_timer(&vport->fc_disctmo);
        vport->fc_disctmo.function = lpfc_disc_timeout;
-       vport->fc_disctmo.data = (unsigned long) vport;
+       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;
+       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;
+       vport->els_tmofunc.data = (unsigned long)vport;
 
-       error = scsi_add_host(shost, &phba->pcidev->dev);
+       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;
 
        list_add_tail(&vport->listentry, &phba->port_list);
-       scsi_scan_host(shost);
        return vport;
 
 out_put_shost:
@@ -1415,62 +1581,60 @@ out:
 
 void
 destroy_port(struct lpfc_vport *vport)
-{
-       lpfc_cleanup(vport);
-       list_del(&vport->listentry);
-       lpfc_free_sysfs_attr(vport);
-       fc_remove_host(lpfc_shost_from_vport(vport));
-       scsi_remove_host(lpfc_shost_from_vport(vport));
-       return;
-}
-
-static void
-lpfc_remove_device(struct lpfc_vport *vport)
 {
        struct Scsi_Host *shost = lpfc_shost_from_vport(vport);
-       struct lpfc_hba  *phba  = vport->phba;
-
-       lpfc_free_sysfs_attr(vport);
+       struct lpfc_hba  *phba = vport->phba;
 
-       spin_lock_irq(shost->host_lock);
-       vport->fc_flag |= FC_UNLOADING;
-       spin_unlock_irq(shost->host_lock);
+       kfree(vport->vname);
 
+       lpfc_debugfs_terminate(vport);
        fc_remove_host(shost);
        scsi_remove_host(shost);
 
-       kthread_stop(phba->worker_thread);
+       spin_lock_irq(&phba->hbalock);
+       list_del_init(&vport->listentry);
+       spin_unlock_irq(&phba->hbalock);
+
+       lpfc_cleanup(vport);
+       return;
 }
 
-void lpfc_scan_start(struct Scsi_Host *shost)
+int
+lpfc_get_instance(void)
 {
-       struct lpfc_vport *vport = (struct lpfc_vport *) shost->hostdata;
-       struct lpfc_hba   *phba = vport->phba;
-
-       if (lpfc_alloc_sysfs_attr(vport))
-               goto error;
+       int instance = 0;
 
-       /*
-        * 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);
+       /* 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->fc_flag & FC_UNLOADING) {
+               stat = 1;
+               goto finished;
+       }
        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);
+               stat = 1;
                goto finished;
        }
        if (time >= 15 * HZ && phba->link_state <= LPFC_LINK_DOWN) {
@@ -1478,19 +1642,30 @@ int lpfc_scan_finished(struct Scsi_Host *shost, unsigned long time)
                                "%d:0465 Link down longer than 15 "
                                "seconds.  Continuing initialization\n",
                                phba->brd_no);
+               stat = 1;
                goto finished;
        }
 
        if (vport->port_state != LPFC_VPORT_READY)
-               return 0;
+               goto finished;
        if (vport->num_disc_nodes || vport->fc_prli_sent)
-               return 0;
+               goto finished;
        if (vport->fc_map_cnt == 0 && time < 2 * HZ)
-               return 0;
+               goto finished;
        if ((phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE) != 0)
-               return 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().
         */
@@ -1504,7 +1679,8 @@ finished:
        fc_host_supported_fc4s(shost)[2] = 1;
        fc_host_supported_fc4s(shost)[7] = 1;
 
-       lpfc_get_hba_sym_node_name(phba, fc_host_symbolic_name(shost));
+       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)
@@ -1526,11 +1702,10 @@ finished:
        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);
-
-       return 1;
 }
 
 static int __devinit
@@ -1542,7 +1717,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        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 error = -ENODEV;
        int i;
        uint16_t iotag;
 
@@ -1560,25 +1735,27 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        phba->pcidev = pdev;
 
        /* Assign an unused board number */
-       if (!idr_pre_get(&lpfc_hba_index, GFP_KERNEL))
-               goto out_free_phba;
-
-       error = idr_get_new(&lpfc_hba_index, NULL, &phba->brd_no);
-       if (error)
+       if ((phba->brd_no = lpfc_get_instance()) < 0)
                goto out_free_phba;
 
        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;
+       phba->fc_estabtmo.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;
@@ -1586,6 +1763,9 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        init_timer(&phba->fcp_poll_timer);
        phba->fcp_poll_timer.function = lpfc_poll_timeout;
        phba->fcp_poll_timer.data = (unsigned long) phba;
+       init_timer(&phba->fabric_block_timer);
+       phba->fabric_block_timer.function = lpfc_fabric_block_timeout;
+       phba->fabric_block_timer.data = (unsigned long) phba;
 
        pci_set_master(pdev);
        retval = pci_set_mwi(pdev);
@@ -1633,13 +1813,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);
@@ -1692,15 +1881,18 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        spin_lock_init(&phba->scsi_buf_list_lock);
        INIT_LIST_HEAD(&phba->lpfc_scsi_buf_list);
 
-       vport = lpfc_create_port(phba, phba->brd_no);
+       /* Initialize list of fabric iocbs */
+       INIT_LIST_HEAD(&phba->fabric_iocb_list);
+
+       vport = lpfc_create_port(phba, phba->brd_no, NULL);
        if (!vport)
                goto out_kthread_stop;
 
        shost = lpfc_shost_from_vport(vport);
-       vport->port_type = LPFC_PHYSICAL_PORT;
        phba->pport = vport;
+       lpfc_debugfs_initialize(vport);
 
-       pci_set_drvdata(pdev, lpfc_shost_from_vport(vport));
+       pci_set_drvdata(pdev, shost);
 
        if (phba->cfg_use_msi) {
                error = pci_enable_msi(phba->pcidev);
@@ -1716,7 +1908,7 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                        "%d:0451 Enable interrupt handler failed\n",
                        phba->brd_no);
-               goto out_destroy_port;
+               goto out_disable_msi;
        }
 
        phba->MBslimaddr = phba->slim_memmap_p;
@@ -1725,24 +1917,41 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
        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;
 
+       if (lpfc_sli_hba_setup(phba))
+               goto out_remove_device;
+
+       /*
+        * 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;
+
+       lpfc_host_attrib_init(shost);
+
        if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
                spin_lock_irq(shost->host_lock);
                lpfc_poll_start_timer(phba);
                spin_unlock_irq(shost->host_lock);
        }
 
+       scsi_scan_host(shost);
+
        return 0;
 
+out_remove_device:
+       lpfc_free_sysfs_attr(vport);
+       spin_lock_irq(shost->host_lock);
+       vport->fc_flag |= FC_UNLOADING;
+       spin_unlock_irq(shost->host_lock);
 out_free_irq:
-       lpfc_stop_timer(phba);
+       lpfc_stop_phba_timers(phba);
        phba->pport->work_port_events = 0;
        free_irq(phba->pcidev->irq, phba);
+out_disable_msi:
        pci_disable_msi(phba->pcidev);
-out_destroy_port:
        destroy_port(vport);
 out_kthread_stop:
        kthread_stop(phba->worker_thread);
@@ -1753,6 +1962,9 @@ out_free_iocbq:
                phba->total_iocbq_bufs--;
        }
        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);
@@ -1770,6 +1982,8 @@ out_disable_device:
        pci_disable_device(pdev);
 out:
        pci_set_drvdata(pdev, NULL);
+       if (shost)
+               scsi_host_put(shost);
        return error;
 }
 
@@ -1779,9 +1993,15 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        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;
 
-       vport->load_flag |= FC_UNLOADING;
-       lpfc_remove_device(vport);
+       kfree(vport->vname);
+       lpfc_free_sysfs_attr(vport);
+
+       fc_remove_host(shost);
+       scsi_remove_host(shost);
 
        /*
         * Bring down the SLI Layer. This step disable all interrupts,
@@ -1791,7 +2011,14 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        lpfc_sli_hba_down(phba);
        lpfc_sli_brdrestart(phba);
 
-       lpfc_stop_timer(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);
+       lpfc_cleanup(vport);
 
        kthread_stop(phba->worker_thread);
 
@@ -1799,10 +2026,8 @@ lpfc_pci_remove_one(struct pci_dev *pdev)
        free_irq(phba->pcidev->irq, phba);
        pci_disable_msi(phba->pcidev);
 
-       vport->work_port_events = 0;
-       destroy_port(vport);
-
        pci_set_drvdata(pdev, NULL);
+       scsi_host_put(shost);
 
        /*
         * Call scsi_free before mem_free since scsi bufs are released to their
@@ -1811,6 +2036,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);
@@ -1882,13 +2110,14 @@ static pci_ers_result_t lpfc_io_slot_reset(struct pci_dev *pdev)
        pci_set_master(pdev);
 
        /* Re-establishing Link */
-       spin_lock_irq(&phba->hbalock);
-       phba->pport->fc_flag |= FC_ESTABLISH_LINK;
-       spin_unlock_irq(&phba->hbalock);
        spin_lock_irq(host->host_lock);
-       psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+       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);
@@ -2010,11 +2239,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;
 }
@@ -2024,6 +2257,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);