fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git] / drivers / scsi / lpfc / lpfc_init.c
index e7f9278..afca45c 100644 (file)
@@ -1,51 +1,53 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
- * Enterprise Fibre Channel Host Bus Adapters.                     *
- * Refer to the README file included with this package for         *
- * driver version and adapter support.                             *
- * Copyright (C) 2004 Emulex Corporation.                          *
+ * Fibre Channel Host Bus Adapters.                                *
+ * Copyright (C) 2004-2006 Emulex.  All rights reserved.           *
+ * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
+ * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
  *                                                                 *
  * This program is free software; you can redistribute it and/or   *
- * modify it under the terms of the GNU General Public License     *
- * as published by the Free Software Foundation; either version 2  *
- * of the License, or (at your option) any later version.          *
- *                                                                 *
- * This program is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of  *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the   *
- * GNU General Public License for more details, a copy of which    *
- * can be found in the file COPYING included with this package.    *
+ * modify it under the terms of version 2 of the GNU General       *
+ * Public License as published by the Free Software Foundation.    *
+ * This program is distributed in the hope that it will be useful. *
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND          *
+ * WARRANTIES, INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY,  *
+ * FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT, ARE      *
+ * DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH DISCLAIMERS ARE HELD *
+ * TO BE LEGALLY INVALID.  See the GNU General Public License for  *
+ * more details, a copy of which can be found in the file COPYING  *
+ * included with this package.                                     *
  *******************************************************************/
 
-/*
- * $Id: lpfc_init.c 1.168 2004/11/15 11:01:33EST sf_support Exp  $
- */
-
-#include <linux/version.h>
 #include <linux/blkdev.h>
-#include <linux/ctype.h>
+#include <linux/delay.h>
 #include <linux/dma-mapping.h>
+#include <linux/idr.h>
+#include <linux/interrupt.h>
+#include <linux/kthread.h>
 #include <linux/pci.h>
 #include <linux/spinlock.h>
 
+#include <scsi/scsi.h>
 #include <scsi/scsi_device.h>
 #include <scsi/scsi_host.h>
+#include <scsi/scsi_transport_fc.h>
 
+#include "lpfc_hw.h"
 #include "lpfc_sli.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
-#include "lpfc_crtn.h"
-#include "lpfc_hw.h"
 #include "lpfc_logmsg.h"
-#include "lpfc_mem.h"
+#include "lpfc_crtn.h"
 #include "lpfc_version.h"
-#include "lpfc_compat.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 int lpfc_rdrev_wd30 = 0;
+
+static struct scsi_transport_template *lpfc_transport_template = NULL;
+static DEFINE_IDR(lpfc_hba_index);
 
 /************************************************************************/
 /*                                                                      */
@@ -62,14 +64,16 @@ int
 lpfc_config_port_prep(struct lpfc_hba * phba)
 {
        lpfc_vpd_t *vp = &phba->vpd;
-       int i = 0;
+       int i = 0, rc;
        LPFC_MBOXQ_t *pmb;
        MAILBOX_t *mb;
+       char *lpfc_vpd_data = NULL;
+       uint16_t offset = 0;
+       static char licensed[56] =
+                   "key unlock for use with gnu public licensed code only\0";
+       static int init_key = 1;
 
-
-       /* Get a Mailbox buffer to setup mailbox commands for HBA
-          initialization */
-       pmb = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC);
+       pmb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        if (!pmb) {
                phba->hba_state = LPFC_HBA_ERROR;
                return -ENOMEM;
@@ -78,25 +82,24 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
        mb = &pmb->mb;
        phba->hba_state = LPFC_INIT_MBX_CMDS;
 
-       /* special handling for LC HBAs */
        if (lpfc_is_LC_HBA(phba->pcidev->device)) {
-               char licensed[56] =
-                   "key unlock for use with gnu public licensed code only\0";
-               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;
+               }
 
-               /* Setup and issue mailbox READ NVPARAMS command */
                lpfc_read_nv(phba, pmb);
                memset((char*)mb->un.varRDnvp.rsvd3, 0,
                        sizeof (mb->un.varRDnvp.rsvd3));
                memcpy((char*)mb->un.varRDnvp.rsvd3, licensed,
                         sizeof (licensed));
 
-               if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
-                       /* Adapter initialization error, mbxCmd <cmd>
-                          READ_NVPARM, mbxStatus <status> */
+               rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+
+               if (rc != MBX_SUCCESS) {
                        lpfc_printf_log(phba,
                                        KERN_ERR,
                                        LOG_MBOX,
@@ -105,6 +108,7 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                                        "mbxStatus x%x\n",
                                        phba->brd_no,
                                        mb->mbxCommand, mb->mbxStatus);
+                       mempool_free(pmb, phba->mbox_mem_pool);
                        return -ERESTART;
                }
                memcpy(phba->wwnn, (char *)mb->un.varRDnvp.nodename,
@@ -113,9 +117,8 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
 
        /* Setup and issue mailbox READ REV command */
        lpfc_read_rev(phba, pmb);
-       if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
-               /* Adapter failed to init, mbxCmd <mbxCmd> READ_REV, mbxStatus
-                  <status> */
+       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+       if (rc != MBX_SUCCESS) {
                lpfc_printf_log(phba,
                                KERN_ERR,
                                LOG_INIT,
@@ -127,36 +130,26 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
                return -ERESTART;
        }
 
-       /* The HBA's current state is provided by the ProgType and rr fields.
-        * Read and check the value of these fields before continuing to config
-        * this port.
+       /*
+        * The value of rr must be 1 since the driver set the cv field to 1.
+        * This setting requires the FW to set all revision fields.
         */
-       if (mb->un.varRdRev.rr == 0 || mb->un.varRdRev.un.b.ProgType != 2) {
-               /* Old firmware */
+       if (mb->un.varRdRev.rr == 0) {
                vp->rev.rBit = 0;
-               /* Adapter failed to init, mbxCmd <cmd> READ_REV detected
-                  outdated firmware */
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0440 Adapter failed to init, mbxCmd x%x "
-                               "READ_REV detected outdated firmware"
-                               "Data: x%x\n",
-                               phba->brd_no,
-                               mb->mbxCommand, 0);
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "%d:0440 Adapter failed to init, READ_REV has "
+                               "missing revision information.\n",
+                               phba->brd_no);
                mempool_free(pmb, phba->mbox_mem_pool);
                return -ERESTART;
-       } else {
-               vp->rev.rBit = 1;
-               vp->rev.sli1FwRev = mb->un.varRdRev.sli1FwRev;
-               memcpy(vp->rev.sli1FwName,
-                       (char*)mb->un.varRdRev.sli1FwName, 16);
-               vp->rev.sli2FwRev = mb->un.varRdRev.sli2FwRev;
-               memcpy(vp->rev.sli2FwName,
-                       (char *)mb->un.varRdRev.sli2FwName, 16);
        }
 
        /* Save information as VPD data */
+       vp->rev.rBit = 1;
+       vp->rev.sli1FwRev = mb->un.varRdRev.sli1FwRev;
+       memcpy(vp->rev.sli1FwName, (char*) mb->un.varRdRev.sli1FwName, 16);
+       vp->rev.sli2FwRev = mb->un.varRdRev.sli2FwRev;
+       memcpy(vp->rev.sli2FwName, (char *) mb->un.varRdRev.sli2FwName, 16);
        vp->rev.biuRev = mb->un.varRdRev.biuRev;
        vp->rev.smRev = mb->un.varRdRev.smRev;
        vp->rev.smFwRev = mb->un.varRdRev.un.smFwRev;
@@ -167,28 +160,43 @@ lpfc_config_port_prep(struct lpfc_hba * phba)
        vp->rev.feaLevelLow = mb->un.varRdRev.feaLevelLow;
        vp->rev.postKernRev = mb->un.varRdRev.postKernRev;
        vp->rev.opFwRev = mb->un.varRdRev.opFwRev;
-       lpfc_rdrev_wd30 = mb->un.varWords[30];
 
        if (lpfc_is_LC_HBA(phba->pcidev->device))
                memcpy(phba->RandomData, (char *)&mb->un.varWords[24],
-                       sizeof (phba->RandomData));
+                                               sizeof (phba->RandomData));
 
        /* Get adapter VPD information */
-       lpfc_dump_mem(phba, pmb);
-       if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
-               /* Let it go through even if failed. */
-               /* Adapter failed to init, mbxCmd <cmd> DUMP VPD,
-                  mbxStatus <status> */
-               lpfc_printf_log(phba,
-                               KERN_INFO,
-                               LOG_INIT,
-                               "%d:0441 VPD not present on adapter, mbxCmd "
-                               "x%x DUMP VPD, mbxStatus x%x\n",
-                               phba->brd_no,
-                               mb->mbxCommand, mb->mbxStatus);
-       } else if (mb->un.varDmp.ra == 1) {
-               lpfc_parse_vpd(phba, (uint8_t *)&mb->un.varDmp.resp_offset);
-       }
+       pmb->context2 = kmalloc(DMP_RSP_SIZE, GFP_KERNEL);
+       if (!pmb->context2)
+               goto out_free_mbox;
+       lpfc_vpd_data = kmalloc(DMP_VPD_SIZE, GFP_KERNEL);
+       if (!lpfc_vpd_data)
+               goto out_free_context2;
+
+       do {
+               lpfc_dump_mem(phba, pmb, offset);
+               rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+
+               if (rc != MBX_SUCCESS) {
+                       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                       "%d:0441 VPD not present on adapter, "
+                                       "mbxCmd x%x DUMP VPD, mbxStatus x%x\n",
+                                       phba->brd_no,
+                                       mb->mbxCommand, mb->mbxStatus);
+                       mb->un.varDmp.word_cnt = 0;
+               }
+               if (mb->un.varDmp.word_cnt > DMP_VPD_SIZE - offset)
+                       mb->un.varDmp.word_cnt = DMP_VPD_SIZE - offset;
+               lpfc_sli_pcimem_bcopy(pmb->context2, lpfc_vpd_data + offset,
+                                                       mb->un.varDmp.word_cnt);
+               offset += mb->un.varDmp.word_cnt;
+       } 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:
+       kfree(pmb->context2);
+out_free_mbox:
        mempool_free(pmb, phba->mbox_mem_pool);
        return 0;
 }
@@ -211,22 +219,18 @@ lpfc_config_port_post(struct lpfc_hba * phba)
        struct lpfc_dmabuf *mp;
        struct lpfc_sli *psli = &phba->sli;
        uint32_t status, timeout;
-       int i, j, flogi_sent;
-       unsigned long isr_cnt, clk_cnt;
-
+       int i, j, rc;
 
-       /* Get a Mailbox buffer to setup mailbox commands for HBA
-          initialization */
-       pmb = mempool_alloc(phba->mbox_mem_pool, GFP_ATOMIC);
+       pmb = mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
        if (!pmb) {
                phba->hba_state = LPFC_HBA_ERROR;
                return -ENOMEM;
        }
        mb = &pmb->mb;
 
-       /* Setup link timers */
        lpfc_config_link(phba, pmb);
-       if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
+       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
+       if (rc != MBX_SUCCESS) {
                lpfc_printf_log(phba,
                                KERN_ERR,
                                LOG_INIT,
@@ -250,24 +254,24 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                                phba->brd_no,
                                mb->mbxCommand, mb->mbxStatus);
                phba->hba_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);
+               kfree(mp);
                return -EIO;
        }
 
        mp = (struct lpfc_dmabuf *) pmb->context1;
 
-       /* The mailbox was populated by the HBA.  Flush it to main store for the
-        * driver.  Note that all context buffers are from the driver's
-        * dma pool and have length LPFC_BPL_SIZE.
-        */
-        pci_dma_sync_single_for_cpu(phba->pcidev, mp->phys, LPFC_BPL_SIZE,
-               PCI_DMA_FROMDEVICE);
-
        memcpy(&phba->fc_sparam, mp->virt, sizeof (struct serv_parm));
        lpfc_mbuf_free(phba, mp->virt, mp->phys);
        kfree(mp);
        pmb->context1 = NULL;
 
+       if (phba->cfg_soft_wwnn)
+               u64_to_wwn(phba->cfg_soft_wwnn, phba->fc_sparam.nodeName.u.wwn);
+       if (phba->cfg_soft_wwpn)
+               u64_to_wwn(phba->cfg_soft_wwpn, phba->fc_sparam.portName.u.wwn);
        memcpy(&phba->fc_nodename, &phba->fc_sparam.nodeName,
               sizeof (struct lpfc_name));
        memcpy(&phba->fc_portname, &phba->fc_sparam.portName,
@@ -277,7 +281,7 @@ lpfc_config_port_post(struct lpfc_hba * phba)
        if (phba->SerialNumber[0] == 0) {
                uint8_t *outptr;
 
-               outptr = (uint8_t *) & phba->fc_nodename.IEEE[0];
+               outptr = &phba->fc_nodename.u.s.IEEE[0];
                for (i = 0; i < 12; i++) {
                        status = *outptr++;
                        j = ((status & 0xf0) >> 4);
@@ -298,15 +302,6 @@ 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);
        if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
                lpfc_printf_log(phba,
@@ -327,13 +322,22 @@ 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 */
+
+       /* 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,
@@ -344,35 +348,11 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                        phba->cfg_link_speed = LINK_SPEED_AUTO;
        }
 
-       if (!phba->intr_inited) {
-               /* Add our interrupt routine to kernel's interrupt chain &
-                  enable it */
-
-               if (request_irq(phba->pcidev->irq,
-                               lpfc_intr_handler,
-                               SA_SHIRQ,
-                               LPFC_DRIVER_NAME,
-                               phba) != 0) {
-                       /* Enable interrupt handler failed */
-                       lpfc_printf_log(phba,
-                                       KERN_ERR,
-                                       LOG_INIT,
-                                       "%d:0451 Enable interrupt handler "
-                                       "failed\n",
-                                       phba->brd_no);
-                       phba->hba_state = LPFC_HBA_ERROR;
-                       mempool_free(pmb, phba->mbox_mem_pool);
-                       return -EIO;
-               }
-               phba->intr_inited =
-                       (HC_MBINT_ENA | HC_ERINT_ENA | HC_LAINT_ENA);
-       }
-
        phba->hba_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)
@@ -382,28 +362,37 @@ lpfc_config_port_post(struct lpfc_hba * phba)
        lpfc_post_rcv_buf(phba);
 
        /* Enable appropriate host interrupts */
+       spin_lock_irq(phba->host->host_lock);
        status = readl(phba->HCregaddr);
-       status |= phba->intr_inited;
-       if (psli->sliinit.num_rings > 0)
+       status |= HC_MBINT_ENA | HC_ERINT_ENA | HC_LAINT_ENA;
+       if (psli->num_rings > 0)
                status |= HC_R0INT_ENA;
-       if (psli->sliinit.num_rings > 1)
+       if (psli->num_rings > 1)
                status |= HC_R1INT_ENA;
-       if (psli->sliinit.num_rings > 2)
+       if (psli->num_rings > 2)
                status |= HC_R2INT_ENA;
-       if (psli->sliinit.num_rings > 3)
+       if (psli->num_rings > 3)
                status |= HC_R3INT_ENA;
 
+       if ((phba->cfg_poll & ENABLE_FCP_RING_POLLING) &&
+           (phba->cfg_poll & DISABLE_FCP_RING_INT))
+               status &= ~(HC_R0INT_ENA << LPFC_FCP_RING);
+
        writel(status, phba->HCregaddr);
        readl(phba->HCregaddr); /* flush */
+       spin_unlock_irq(phba->host->host_lock);
 
-       /* Setup and issue mailbox INITIALIZE LINK command */
-       lpfc_init_link(phba, pmb, phba->cfg_topology,
-                      phba->cfg_link_speed);
-
-       isr_cnt = psli->slistat.sliIntr;
-       clk_cnt = jiffies;
+       /*
+        * Setup the ring 0 (els)  timeout handler
+        */
+       timeout = phba->fc_ratov << 1;
+       phba->els_tmofunc.expires = jiffies + HZ * timeout;
+       add_timer(&phba->els_tmofunc);
 
-       if (lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT) != MBX_SUCCESS) {
+       lpfc_init_link(phba, pmb, phba->cfg_topology, phba->cfg_link_speed);
+       pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
+       if (rc != MBX_SUCCESS) {
                lpfc_printf_log(phba,
                                KERN_ERR,
                                LOG_INIT,
@@ -419,70 +408,41 @@ lpfc_config_port_post(struct lpfc_hba * phba)
                writel(0xffffffff, phba->HAregaddr);
                readl(phba->HAregaddr); /* flush */
 
-               free_irq(phba->pcidev->irq, phba);
                phba->hba_state = LPFC_HBA_ERROR;
-               mempool_free(pmb, phba->mbox_mem_pool);
+               if (rc != MBX_BUSY)
+                       mempool_free(pmb, phba->mbox_mem_pool);
                return -EIO;
        }
        /* MBOX buffer will be freed in mbox compl */
 
-       /*
-        * Setup the ring 0 (els)  timeout handler
-        */
-       timeout = phba->fc_ratov << 1;
+       return (0);
+}
 
-       phba->els_tmofunc.expires = jiffies + HZ * timeout;
-       add_timer(&phba->els_tmofunc);
+static int
+lpfc_discovery_wait(struct lpfc_hba *phba)
+{
+       int i = 0;
 
-       phba->fc_prevDID = Mask_DID;
-       flogi_sent = 0;
-       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->sliinit.sli_flag & LPFC_SLI_MBOX_ACTIVE)) {
+              (phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE)) {
                /* Check every second for 30 retries. */
                i++;
                if (i > 30) {
-                       break;
+                       return -ETIMEDOUT;
                }
                if ((i >= 15) && (phba->hba_state <= LPFC_LINK_DOWN)) {
                        /* The link is down.  Set linkdown timeout */
-                       break;
+                       return -ETIMEDOUT;
                }
 
                /* Delay for 1 second to give discovery time to complete. */
-               for (j = 0; j < 20; j++) {
-                       /* On some systems, the driver's attach/detect routines
-                        * are uninterruptible.  Since the driver cannot predict
-                        * when this is true, just manually call the ISR every
-                        * 50 ms to service any interrupts.
-                        */
-                       msleep(50);
-                       if (isr_cnt == psli->slistat.sliIntr) {
-                               lpfc_sli_intr(phba);
-                               isr_cnt = psli->slistat.sliIntr;
-                       }
-               }
-               isr_cnt = psli->slistat.sliIntr;
-
-               if (clk_cnt == jiffies) {
-                       /* REMOVE: IF THIS HAPPENS, SYSTEM CLOCK IS NOT RUNNING.
-                        * WE HAVE TO MANUALLY CALL OUR TIMEOUT ROUTINES.
-                        */
-                       clk_cnt = jiffies;
-               }
-       }
+               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);
-       if (isr_cnt == psli->slistat.sliIntr) {
-               lpfc_sli_intr(phba);
        }
 
-       return (0);
+       return 0;
 }
 
 /************************************************************************/
@@ -510,6 +470,40 @@ lpfc_hba_down_prep(struct lpfc_hba * phba)
        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;
+
+       /* 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;
+}
+
 /************************************************************************/
 /*                                                                      */
 /*    lpfc_handle_eratt                                                 */
@@ -519,31 +513,24 @@ lpfc_hba_down_prep(struct lpfc_hba * phba)
 /*                                                                      */
 /************************************************************************/
 void
-lpfc_handle_eratt(struct lpfc_hba * phba, uint32_t status)
+lpfc_handle_eratt(struct lpfc_hba * phba)
 {
-       struct lpfc_sli *psli;
+       struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring  *pring;
-       struct lpfc_iocbq     *iocb, *next_iocb;
-       IOCB_t          *icmd = NULL, *cmd = NULL;
-       struct lpfc_scsi_buf  *lpfc_cmd;
-       volatile uint32_t status1, status2;
-       void *from_slim;
-       unsigned long iflag;
-
-       psli = &phba->sli;
-       from_slim = ((uint8_t *)phba->MBslimaddr + 0xa8);
-       status1 = readl( from_slim);
-       from_slim =  ((uint8_t *)phba->MBslimaddr + 0xac);
-       status2 = readl( from_slim);
+       uint32_t event_data;
 
-       if (status & HS_FFER6) {
+       if (phba->work_hs & HS_FFER6 ||
+           phba->work_hs & HS_FFER5) {
                /* Re-establishing Link */
-               spin_lock_irqsave(phba->host->host_lock, iflag);
                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, status, status1, status2);
+                               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;
+               psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+               spin_unlock_irq(phba->host->host_lock);
 
                /*
                * Firmware stops when it triggled erratt with HS_FFER6.
@@ -552,43 +539,15 @@ lpfc_handle_eratt(struct lpfc_hba * phba, uint32_t status)
                * retry it after re-establishing link.
                */
                pring = &psli->ring[psli->fcp_ring];
+               lpfc_sli_abort_iocb_ring(phba, pring);
 
-               list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq,
-                                        list) {
-                       cmd = &iocb->iocb;
-
-                       /* Must be a FCP command */
-                       if ((cmd->ulpCommand != CMD_FCP_ICMND64_CR) &&
-                               (cmd->ulpCommand != CMD_FCP_IWRITE64_CR) &&
-                               (cmd->ulpCommand != CMD_FCP_IREAD64_CR)) {
-                               continue;
-                               }
-
-                       /* context1 MUST be a struct lpfc_scsi_buf */
-                       lpfc_cmd = (struct lpfc_scsi_buf *)(iocb->context1);
-                       if (lpfc_cmd == 0) {
-                               continue;
-                       }
-
-                       list_del(&iocb->list);
-                       pring->txcmplq_cnt--;
-
-                       if (iocb->iocb_cmpl) {
-                               icmd = &iocb->iocb;
-                               icmd->ulpStatus = IOSTAT_LOCAL_REJECT;
-                               icmd->un.ulpWord[4] = IOERR_SLI_ABORTED;
-                               (iocb->iocb_cmpl)(phba, iocb, iocb);
-                       } else {
-                               mempool_free( iocb, phba->iocb_mem_pool);
-                       }
-               }
 
                /*
                 * There was a firmware error.  Take the hba offline and then
                 * attempt to restart it.
                 */
-               spin_unlock_irqrestore(phba->host->host_lock, iflag);
                lpfc_offline(phba);
+               lpfc_sli_brdrestart(phba);
                if (lpfc_online(phba) == 0) {   /* Initialize the HBA */
                        mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
                        return;
@@ -601,18 +560,19 @@ lpfc_handle_eratt(struct lpfc_hba * phba, uint32_t status)
                lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
                                "%d:0457 Adapter Hardware Error "
                                "Data: x%x x%x x%x\n",
-                               phba->brd_no, status, status1, status2);
+                               phba->brd_no, phba->work_hs,
+                               phba->work_status[0], phba->work_status[1]);
 
-               lpfc_offline(phba);
+               event_data = FC_REG_DUMP_EVENT;
+               fc_host_post_vendor_event(phba->host, fc_get_event_number(),
+                               sizeof(event_data), (char *) &event_data,
+                               SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
 
-               /*
-                * Restart all traffic to this host.  Since the fc_transport
-                * block functions (future) were not called in lpfc_offline,
-                * don't call them here.
-                */
-               scsi_unblock_requests(phba->host);
+               psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
+               lpfc_offline(phba);
+               phba->hba_state = LPFC_HBA_ERROR;
+               lpfc_hba_down_post(phba);
        }
-       return;
 }
 
 /************************************************************************/
@@ -626,54 +586,74 @@ lpfc_handle_eratt(struct lpfc_hba * phba, uint32_t status)
 void
 lpfc_handle_latt(struct lpfc_hba * phba)
 {
-       struct lpfc_sli *psli;
+       struct lpfc_sli *psli = &phba->sli;
        LPFC_MBOXQ_t *pmb;
        volatile uint32_t control;
-       unsigned long iflag;
+       struct lpfc_dmabuf *mp;
+       int rc = -ENOMEM;
 
+       pmb = (LPFC_MBOXQ_t *)mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!pmb)
+               goto lpfc_handle_latt_err_exit;
 
-       spin_lock_irqsave(phba->host->host_lock, iflag);
+       mp = kmalloc(sizeof(struct lpfc_dmabuf), GFP_KERNEL);
+       if (!mp)
+               goto lpfc_handle_latt_free_pmb;
 
-       /* called from host_interrupt, to process LATT */
-       psli = &phba->sli;
-       psli->slistat.linkEvent++;
-
-       /* Get a buffer which will be used for mailbox commands */
-       if ((pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool,
-                                                 GFP_ATOMIC))) {
-               if (lpfc_read_la(phba, pmb) == 0) {
-                       pmb->mbox_cmpl = lpfc_mbx_cmpl_read_la;
-                       if (lpfc_sli_issue_mbox
-                           (phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB))
-                           != MBX_NOT_FINISHED) {
-                               /* Turn off Link Attention interrupts until
-                                  CLEAR_LA done */
-                               psli->sliinit.sli_flag &= ~LPFC_PROCESS_LA;
-                               control = readl(phba->HCregaddr);
-                               control &= ~HC_LAINT_ENA;
-                               writel(control, phba->HCregaddr);
-                               readl(phba->HCregaddr); /* flush */
-
-                               /* Clear Link Attention in HA REG */
-                               writel(HA_LATT, phba->HAregaddr);
-                               readl(phba->HAregaddr); /* flush */
-                               spin_unlock_irqrestore(phba->host->host_lock,
-                                                      iflag);
-                               return;
-                       } else {
-                               mempool_free(pmb, phba->mbox_mem_pool);
-                       }
-               } else {
-                       mempool_free(pmb, phba->mbox_mem_pool);
-               }
-       }
+       mp->virt = lpfc_mbuf_alloc(phba, 0, &mp->phys);
+       if (!mp->virt)
+               goto lpfc_handle_latt_free_mp;
+
+       rc = -EIO;
+
+       /* Cleanup any outstanding ELS commands */
+       lpfc_els_flush_cmd(phba);
+
+       psli->slistat.link_event++;
+       lpfc_read_la(phba, pmb, mp);
+       pmb->mbox_cmpl = lpfc_mbx_cmpl_read_la;
+       rc = lpfc_sli_issue_mbox (phba, pmb, (MBX_NOWAIT | MBX_STOP_IOCB));
+       if (rc == MBX_NOT_FINISHED)
+               goto lpfc_handle_latt_free_mbuf;
 
        /* Clear Link Attention in HA REG */
+       spin_lock_irq(phba->host->host_lock);
        writel(HA_LATT, phba->HAregaddr);
        readl(phba->HAregaddr); /* flush */
+       spin_unlock_irq(phba->host->host_lock);
+
+       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);
+lpfc_handle_latt_err_exit:
+       /* Enable Link attention interrupts */
+       spin_lock_irq(phba->host->host_lock);
+       psli->sli_flag |= LPFC_PROCESS_LA;
+       control = readl(phba->HCregaddr);
+       control |= HC_LAINT_ENA;
+       writel(control, phba->HCregaddr);
+       readl(phba->HCregaddr); /* flush */
+
+       /* Clear Link Attention in HA REG */
+       writel(HA_LATT, phba->HAregaddr);
+       readl(phba->HAregaddr); /* flush */
+       spin_unlock_irq(phba->host->host_lock);
        lpfc_linkdown(phba);
        phba->hba_state = LPFC_HBA_ERROR;
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
+
+       /* The other case is an error from issue_mbox */
+       if (rc == -ENOMEM)
+               lpfc_printf_log(phba,
+                               KERN_WARNING,
+                               LOG_MBOX,
+                               "%d:0300 READ_LA: no buffers\n",
+                               phba->brd_no);
+
        return;
 }
 
@@ -684,14 +664,17 @@ lpfc_handle_latt(struct lpfc_hba * phba)
 /*                                                                      */
 /************************************************************************/
 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;
-       uint8_t *Length;
+       uint32_t Length;
        int i, j;
        int finished = 0;
        int index = 0;
 
+       if (!vpd)
+               return 0;
+
        /* Vital Product */
        lpfc_printf_log(phba,
                        KERN_INFO,
@@ -700,9 +683,10 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                        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;
@@ -717,43 +701,237 @@ lpfc_parse_vpd(struct lpfc_hba * phba, uint8_t * vpd)
                        index += 1;
                        lenhi = vpd[index];
                        index += 1;
-                       i = ((((unsigned short)lenhi) << 8) + lenlo);
-                       do {
-                               /* Look for Serial Number */
-                               if ((vpd[index] == 'S')
-                                   && (vpd[index + 1] == 'N')) {
-                                       index += 2;
-                                       Length = &vpd[index];
-                                       index += 1;
-                                       i = *Length;
-                                       j = 0;
-                                       while (i--) {
-                                               phba->SerialNumber[j++] =
-                                                   vpd[index++];
-                                               if (j == 31)
-                                                       break;
-                                       }
-                                       phba->SerialNumber[j] = 0;
-                                       return (1);
-                               } else {
-                                       index += 2;
-                                       Length = &vpd[index];
-                                       index += 1;
-                                       j = (int)(*Length);
-                                       index += j;
-                                       i -= (3 + j);
+                       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')) {
+                               index += 2;
+                               i = vpd[index];
+                               index += 1;
+                               j = 0;
+                               Length -= (3+i);
+                               while(i--) {
+                                       phba->SerialNumber[j++] = vpd[index++];
+                                       if (j == 31)
+                                               break;
                                }
-                       } while (i > 0);
-                       finished = 0;
-                       break;
+                               phba->SerialNumber[j] = 0;
+                               continue;
+                       }
+                       else if ((vpd[index] == 'V') && (vpd[index+1] == '1')) {
+                               phba->vpd_flag |= VPD_MODEL_DESC;
+                               index += 2;
+                               i = vpd[index];
+                               index += 1;
+                               j = 0;
+                               Length -= (3+i);
+                               while(i--) {
+                                       phba->ModelDesc[j++] = vpd[index++];
+                                       if (j == 255)
+                                               break;
+                               }
+                               phba->ModelDesc[j] = 0;
+                               continue;
+                       }
+                       else if ((vpd[index] == 'V') && (vpd[index+1] == '2')) {
+                               phba->vpd_flag |= VPD_MODEL_NAME;
+                               index += 2;
+                               i = vpd[index];
+                               index += 1;
+                               j = 0;
+                               Length -= (3+i);
+                               while(i--) {
+                                       phba->ModelName[j++] = vpd[index++];
+                                       if (j == 79)
+                                               break;
+                               }
+                               phba->ModelName[j] = 0;
+                               continue;
+                       }
+                       else if ((vpd[index] == 'V') && (vpd[index+1] == '3')) {
+                               phba->vpd_flag |= VPD_PROGRAM_TYPE;
+                               index += 2;
+                               i = vpd[index];
+                               index += 1;
+                               j = 0;
+                               Length -= (3+i);
+                               while(i--) {
+                                       phba->ProgramType[j++] = vpd[index++];
+                                       if (j == 255)
+                                               break;
+                               }
+                               phba->ProgramType[j] = 0;
+                               continue;
+                       }
+                       else if ((vpd[index] == 'V') && (vpd[index+1] == '4')) {
+                               phba->vpd_flag |= VPD_PORT;
+                               index += 2;
+                               i = vpd[index];
+                               index += 1;
+                               j = 0;
+                               Length -= (3+i);
+                               while(i--) {
+                               phba->Port[j++] = vpd[index++];
+                               if (j == 19)
+                                       break;
+                               }
+                               phba->Port[j] = 0;
+                               continue;
+                       }
+                       else {
+                               index += 2;
+                               i = vpd[index];
+                               index += 1;
+                               index += i;
+                               Length -= (3 + i);
+                       }
+               }
+               finished = 0;
+               break;
                case 0x78:
                        finished = 1;
                        break;
                default:
-                       return (0);
+                       index ++;
+                       break;
                }
-       } while (!finished);
-       return (1);
+       }
+
+       return(1);
+}
+
+static void
+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;
+       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:
+               m = (typeof(m)){"LP6000", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_SUPERFLY:
+               if (vp->rev.biuRev >= 1 && vp->rev.biuRev <= 3)
+                       m = (typeof(m)){"LP7000", max_speed,  "PCI"};
+               else
+                       m = (typeof(m)){"LP7000E", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_DRAGONFLY:
+               m = (typeof(m)){"LP8000", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_CENTAUR:
+               if (FC_JEDEC_ID(vp->rev.biuRev) == CENTAUR_2G_JEDEC_ID)
+                       m = (typeof(m)){"LP9002", max_speed, "PCI"};
+               else
+                       m = (typeof(m)){"LP9000", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_RFLY:
+               m = (typeof(m)){"LP952", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_PEGASUS:
+               m = (typeof(m)){"LP9802", max_speed, "PCI-X"};
+               break;
+       case PCI_DEVICE_ID_THOR:
+               m = (typeof(m)){"LP10000", max_speed, "PCI-X"};
+               break;
+       case PCI_DEVICE_ID_VIPER:
+               m = (typeof(m)){"LPX1000", max_speed,  "PCI-X"};
+               break;
+       case PCI_DEVICE_ID_PFLY:
+               m = (typeof(m)){"LP982", max_speed, "PCI-X"};
+               break;
+       case PCI_DEVICE_ID_TFLY:
+               m = (typeof(m)){"LP1050", max_speed, "PCI-X"};
+               break;
+       case PCI_DEVICE_ID_HELIOS:
+               m = (typeof(m)){"LP11000", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_HELIOS_SCSP:
+               m = (typeof(m)){"LP11000-SP", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_HELIOS_DCSP:
+               m = (typeof(m)){"LP11002-SP", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_NEPTUNE:
+               m = (typeof(m)){"LPe1000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_NEPTUNE_SCSP:
+               m = (typeof(m)){"LPe1000-SP", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_NEPTUNE_DCSP:
+               m = (typeof(m)){"LPe1002-SP", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_BMID:
+               m = (typeof(m)){"LP1150", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_BSMB:
+               m = (typeof(m)){"LP111", max_speed, "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_ZEPHYR:
+               m = (typeof(m)){"LPe11000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_ZEPHYR_SCSP:
+               m = (typeof(m)){"LPe11000", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_ZEPHYR_DCSP:
+               m = (typeof(m)){"LPe11002-SP", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_ZMID:
+               m = (typeof(m)){"LPe1150", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_ZSMB:
+               m = (typeof(m)){"LPe111", max_speed, "PCIe"};
+               break;
+       case PCI_DEVICE_ID_LP101:
+               m = (typeof(m)){"LP101", max_speed, "PCI-X"};
+               break;
+       case PCI_DEVICE_ID_LP10000S:
+               m = (typeof(m)){"LP10000-S", max_speed, "PCI"};
+               break;
+       case PCI_DEVICE_ID_LP11000S:
+               m = (typeof(m)){"LP11000-S", max_speed,
+                       "PCI-X2"};
+               break;
+       case PCI_DEVICE_ID_LPE11000S:
+               m = (typeof(m)){"LPe11000-S", max_speed,
+                       "PCIe"};
+               break;
+       default:
+               m = (typeof(m)){ NULL };
+               break;
+       }
+
+       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);
 }
 
 /**************************************************/
@@ -777,27 +955,28 @@ 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 */
-               if ((iocb = mempool_alloc(phba->iocb_mem_pool, GFP_ATOMIC))
-                   == 0) {
+               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);
+                       return cnt;
                }
-               memset(iocb, 0, sizeof (struct lpfc_iocbq));
                icmd = &iocb->iocb;
 
                /* 2 buffers can be posted per command */
                /* Allocate buffer to post */
-               mp1 = kmalloc(sizeof (struct lpfc_dmabuf), GFP_ATOMIC);
+               mp1 = kmalloc(sizeof (struct lpfc_dmabuf), GFP_KERNEL);
                if (mp1)
                    mp1->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                &mp1->phys);
                if (mp1 == 0 || mp1->virt == 0) {
-                       if (mp1)
-                               kfree(mp1);
-
-                       mempool_free( iocb, phba->iocb_mem_pool);
+                       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);
+                       return cnt;
                }
 
                INIT_LIST_HEAD(&mp1->list);
@@ -808,13 +987,14 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                                mp2->virt = lpfc_mbuf_alloc(phba, MEM_PRI,
                                                            &mp2->phys);
                        if (mp2 == 0 || mp2->virt == 0) {
-                               if (mp2)
-                                       kfree(mp2);
+                               kfree(mp2);
                                lpfc_mbuf_free(phba, mp1->virt, mp1->phys);
                                kfree(mp1);
-                               mempool_free( iocb, phba->iocb_mem_pool);
+                               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);
+                               return cnt;
                        }
 
                        INIT_LIST_HEAD(&mp2->list);
@@ -836,27 +1016,31 @@ lpfc_post_buffer(struct lpfc_hba * phba, struct lpfc_sli_ring * pring, int cnt,
                }
 
                icmd->ulpCommand = CMD_QUE_RING_BUF64_CN;
-               icmd->ulpIoTag = lpfc_sli_next_iotag(phba, pring);
                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);
+                       cnt++;
                        if (mp2) {
                                lpfc_mbuf_free(phba, mp2->virt, mp2->phys);
                                kfree(mp2);
+                               cnt++;
                        }
-                       mempool_free( iocb, phba->iocb_mem_pool);
+                       lpfc_sli_release_iocbq(phba, iocb);
                        pring->missbufcnt = cnt;
-                       return (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) {
                        lpfc_sli_ringpostbuf_put(phba, pring, mp2);
                }
        }
        pring->missbufcnt = 0;
-       return (0);
+       return 0;
 }
 
 /************************************************************************/
@@ -969,10 +1153,10 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
        uint32_t *HashWorking;
        uint32_t *pwwnn = phba->wwnn;
 
-       HashWorking = kmalloc(80 * sizeof(uint32_t), GFP_ATOMIC);
+       HashWorking = kmalloc(80 * sizeof(uint32_t), GFP_KERNEL);
        if (!HashWorking)
                return;
-       
+
        memset(HashWorking, 0, (80 * sizeof(uint32_t)));
        HashWorking[0] = HashWorking[78] = *pwwnn++;
        HashWorking[1] = HashWorking[79] = *pwwnn;
@@ -986,19 +1170,6 @@ lpfc_hba_init(struct lpfc_hba *phba, uint32_t *hbainit)
 }
 
 static void
-lpfc_consistent_bind_cleanup(struct lpfc_hba * phba)
-{
-       struct lpfc_bindlist *bdlp, *next_bdlp;
-
-       list_for_each_entry_safe(bdlp, next_bdlp,
-                                &phba->fc_nlpbind_list, nlp_listp) {
-               list_del(&bdlp->nlp_listp);
-               mempool_free( bdlp, phba->bind_mem_pool);
-       }
-       phba->fc_bind_cnt = 0;
-}
-
-void
 lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
 {
        struct lpfc_nodelist *ndlp, *next_ndlp;
@@ -1045,10 +1216,6 @@ lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
                lpfc_nlp_remove(phba, ndlp);
        }
 
-       if (save_bind == 0) {
-               lpfc_consistent_bind_cleanup(phba);
-       }
-
        INIT_LIST_HEAD(&phba->fc_nlpmap_list);
        INIT_LIST_HEAD(&phba->fc_nlpunmap_list);
        INIT_LIST_HEAD(&phba->fc_unused_list);
@@ -1069,23 +1236,53 @@ lpfc_cleanup(struct lpfc_hba * phba, uint32_t save_bind)
        return;
 }
 
-void
+static void
 lpfc_establish_link_tmo(unsigned long ptr)
 {
        struct lpfc_hba *phba = (struct lpfc_hba *)ptr;
        unsigned long iflag;
 
-       spin_lock_irqsave(phba->host->host_lock, 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);
 }
 
+static int
+lpfc_stop_timer(struct lpfc_hba * phba)
+{
+       struct lpfc_sli *psli = &phba->sli;
+
+       /* Instead of a timer, this has been converted to a
+        * deferred procedding list.
+        */
+       while (!list_empty(&phba->freebufList)) {
+
+               struct lpfc_dmabuf *mp = NULL;
+
+               list_remove_head((&phba->freebufList), mp,
+                                struct lpfc_dmabuf, list);
+               if (mp) {
+                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
+                       kfree(mp);
+               }
+       }
+
+       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);
+}
+
 int
 lpfc_online(struct lpfc_hba * phba)
 {
@@ -1107,14 +1304,10 @@ lpfc_online(struct lpfc_hba * phba)
        if (lpfc_sli_hba_setup(phba))   /* Initialize the HBA */
                return 1;
 
+       spin_lock_irq(phba->host->host_lock);
        phba->fc_flag &= ~FC_OFFLINE_MODE;
+       spin_unlock_irq(phba->host->host_lock);
 
-       /*
-        * Restart all traffic to this host.  Since the fc_transport block
-        * functions (future) were not called in lpfc_offline, don't call them
-        * here.
-        */
-       scsi_unblock_requests(phba->host);
        return 0;
 }
 
@@ -1124,7 +1317,8 @@ lpfc_offline(struct lpfc_hba * phba)
        struct lpfc_sli_ring *pring;
        struct lpfc_sli *psli;
        unsigned long iflag;
-       int i = 0;
+       int i;
+       int cnt = 0;
 
        if (!phba)
                return 0;
@@ -1132,29 +1326,32 @@ lpfc_offline(struct lpfc_hba * phba)
        if (phba->fc_flag & FC_OFFLINE_MODE)
                return 0;
 
-       /*
-        * Don't call the fc_transport block api (future).  The device is
-        * going offline and causing a timer to fire in the midlayer is
-        * unproductive.  Just block all new requests until the driver
-        * comes back online.
-        */
-       scsi_block_requests(phba->host);
        psli = &phba->sli;
-       pring = &psli->ring[psli->fcp_ring];
 
        lpfc_linkdown(phba);
-
-       /* The linkdown event takes 30 seconds to timeout. */
-       while (pring->txcmplq_cnt) {
-               mdelay(10);
-               if (i++ > 3000)
-                       break;
+       lpfc_sli_flush_mbox_queue(phba);
+
+       for (i = 0; i < psli->num_rings; i++) {
+               pring = &psli->ring[i];
+               /* The linkdown event takes 30 seconds to timeout. */
+               while (pring->txcmplq_cnt) {
+                       mdelay(10);
+                       if (cnt++ > 3000) {
+                               lpfc_printf_log(phba,
+                                       KERN_WARNING, LOG_INIT,
+                                       "%d:0466 Outstanding IO when "
+                                       "bringing Adapter offline\n",
+                                       phba->brd_no);
+                               break;
+                       }
+               }
        }
 
+
        /* stop all timers associated with this hba */
-       spin_lock_irqsave(phba->host->host_lock, iflag);
        lpfc_stop_timer(phba);
-       spin_unlock_irqrestore(phba->host->host_lock, iflag);
+       phba->work_hba_events = 0;
+       phba->work_ha = 0;
 
        lpfc_printf_log(phba,
                       KERN_WARNING,
@@ -1166,180 +1363,536 @@ lpfc_offline(struct lpfc_hba * phba)
           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;
 }
 
 /******************************************************************************
-* Function name : lpfc_scsi_free
+* Function name: lpfc_scsi_free
 *
-* Description   : Called from fc_detach to free scsi tgt / lun resources
+* Description: Called from lpfc_pci_remove_one free internal driver resources
 *
 ******************************************************************************/
-int
+static int
 lpfc_scsi_free(struct lpfc_hba * phba)
 {
-       struct lpfc_target *targetp;
-       int i;
+       struct lpfc_scsi_buf *sb, *sb_next;
+       struct lpfc_iocbq *io, *io_next;
+
+       spin_lock_irq(phba->host->host_lock);
+       /* 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);
+               kfree(sb);
+               phba->total_scsi_bufs--;
+       }
 
-       for (i = 0; i < MAX_FCP_TARGET; i++) {
-               targetp = phba->device_queue_hash[i];
-               if (targetp) {
-                       kfree(targetp);
-                       phba->device_queue_hash[i] = NULL;
-               }
+       /* Release all the lpfc_iocbq entries maintained by this host. */
+       list_for_each_entry_safe(io, io_next, &phba->lpfc_iocb_list, list) {
+               list_del(&io->list);
+               kfree(io);
+               phba->total_iocbq_bufs--;
        }
+
+       spin_unlock_irq(phba->host->host_lock);
+
        return 0;
 }
 
-static void
-lpfc_wakeup_event(struct lpfc_hba * phba, fcEVTHDR_t * ep)
-{
-       ep->e_mode &= ~E_SLEEPING_MODE;
-       switch (ep->e_mask) {
-       case FC_REG_LINK_EVENT:
-               wake_up_interruptible(&phba->linkevtwq);
-               break;
-       case FC_REG_RSCN_EVENT:
-               wake_up_interruptible(&phba->rscnevtwq);
-               break;
-       case FC_REG_CT_EVENT:
-               wake_up_interruptible(&phba->ctevtwq);
-               break;
-       }
-       return;
-}
 
-int
-lpfc_put_event(struct lpfc_hba * phba, uint32_t evcode, uint32_t evdata0,
-              void * evdata1, uint32_t evdata2, uint32_t evdata3)
+static int __devinit
+lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid)
 {
-       fcEVT_t *ep;
-       fcEVTHDR_t *ehp = phba->fc_evt_head;
-       int found = 0;
-       void *fstype = NULL;
-       struct lpfc_dmabuf *mp;
-       struct lpfc_sli_ct_request *ctp;
-       struct lpfc_hba_event *rec;
-       uint32_t evtype;
+       struct Scsi_Host *host;
+       struct lpfc_hba  *phba;
+       struct lpfc_sli  *psli;
+       struct lpfc_iocbq *iocbq_entry = NULL, *iocbq_next = NULL;
+       unsigned long bar0map_len, bar2map_len;
+       int error = -ENODEV, retval;
+       int i;
+       uint16_t iotag;
+
+       if (pci_enable_device(pdev))
+               goto out;
+       if (pci_request_regions(pdev, LPFC_DRIVER_NAME))
+               goto out_disable_device;
+
+       host = scsi_host_alloc(&lpfc_template, sizeof (struct lpfc_hba));
+       if (!host)
+               goto out_release_regions;
+
+       phba = (struct lpfc_hba*)host->hostdata;
+       memset(phba, 0, sizeof (struct lpfc_hba));
+       phba->host = host;
+
+       phba->fc_flag |= FC_LOADING;
+       phba->pcidev = pdev;
+
+       /* Assign an unused board number */
+       if (!idr_pre_get(&lpfc_hba_index, GFP_KERNEL))
+               goto out_put_host;
+
+       error = idr_get_new(&lpfc_hba_index, NULL, &phba->brd_no);
+       if (error)
+               goto out_put_host;
+
+       host->unique_id = phba->brd_no;
+       INIT_LIST_HEAD(&phba->ctrspbuflist);
+       INIT_LIST_HEAD(&phba->rnidrspbuflist);
+       INIT_LIST_HEAD(&phba->freebufList);
+
+       /* Initialize timers used by driver */
+       init_timer(&phba->fc_estabtmo);
+       phba->fc_estabtmo.function = lpfc_establish_link_tmo;
+       phba->fc_estabtmo.data = (unsigned long)phba;
+       init_timer(&phba->fc_disctmo);
+       phba->fc_disctmo.function = lpfc_disc_timeout;
+       phba->fc_disctmo.data = (unsigned long)phba;
+
+       init_timer(&phba->fc_fdmitmo);
+       phba->fc_fdmitmo.function = lpfc_fdmi_tmo;
+       phba->fc_fdmitmo.data = (unsigned long)phba;
+       init_timer(&phba->els_tmofunc);
+       phba->els_tmofunc.function = lpfc_els_timeout;
+       phba->els_tmofunc.data = (unsigned long)phba;
+       psli = &phba->sli;
+       init_timer(&psli->mbox_tmo);
+       psli->mbox_tmo.function = lpfc_mbox_timeout;
+       psli->mbox_tmo.data = (unsigned long)phba;
 
-       switch (evcode) {
-               case HBA_EVENT_RSCN:
-                       evtype = FC_REG_RSCN_EVENT;
-                       break;
-               case HBA_EVENT_LINK_DOWN:
-               case HBA_EVENT_LINK_UP:
-                       evtype = FC_REG_LINK_EVENT;
-                       break;
-               default:
-                       evtype = FC_REG_CT_EVENT;
+       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);
+
+
+       pci_set_master(pdev);
+       retval = pci_set_mwi(pdev);
+       if (retval)
+               dev_printk(KERN_WARNING, &pdev->dev,
+                          "Warning: pci_set_mwi returned %d\n", retval);
+
+       if (pci_set_dma_mask(phba->pcidev, DMA_64BIT_MASK) != 0)
+               if (pci_set_dma_mask(phba->pcidev, DMA_32BIT_MASK) != 0)
+                       goto out_idr_remove;
+
+       /*
+        * Get the bus address of Bar0 and Bar2 and the number of bytes
+        * required by each mapping.
+        */
+       phba->pci_bar0_map = pci_resource_start(phba->pcidev, 0);
+       bar0map_len        = pci_resource_len(phba->pcidev, 0);
+
+       phba->pci_bar2_map = pci_resource_start(phba->pcidev, 2);
+       bar2map_len        = pci_resource_len(phba->pcidev, 2);
+
+       /* Map HBA SLIM to a kernel virtual address. */
+       phba->slim_memmap_p      = ioremap(phba->pci_bar0_map, bar0map_len);
+       if (!phba->slim_memmap_p) {
+               error = -ENODEV;
+               dev_printk(KERN_ERR, &pdev->dev,
+                          "ioremap failed for SLIM memory.\n");
+               goto out_idr_remove;
        }
 
-       if (evtype == FC_REG_RSCN_EVENT || evtype == FC_REG_LINK_EVENT) {
-               rec = &phba->hbaevt[phba->hba_event_put];
-               rec->fc_eventcode = evcode;
-               rec->fc_evdata1 = evdata0;
-               rec->fc_evdata2 = (uint32_t)(unsigned long)evdata1;
-               rec->fc_evdata3 = evdata2;
-               rec->fc_evdata4 = evdata3;
-
-               phba->hba_event_put++;
-               if (phba->hba_event_put >= MAX_HBAEVT)
-                       phba->hba_event_put = 0;
-
-               if (phba->hba_event_put == phba->hba_event_get) {
-                       phba->hba_event_missed++;
-                       phba->hba_event_get++;
-                       if (phba->hba_event_get >= MAX_HBAEVT)
-                               phba->hba_event_get = 0;
+       /* Map HBA Control Registers to a kernel virtual address. */
+       phba->ctrl_regs_memmap_p = ioremap(phba->pci_bar2_map, bar2map_len);
+       if (!phba->ctrl_regs_memmap_p) {
+               error = -ENODEV;
+               dev_printk(KERN_ERR, &pdev->dev,
+                          "ioremap failed for HBA control registers.\n");
+               goto out_iounmap_slim;
+       }
+
+       /* Allocate memory for SLI-2 structures */
+       phba->slim2p = dma_alloc_coherent(&phba->pcidev->dev, SLI2_SLIM_SIZE,
+                                         &phba->slim2p_mapping, GFP_KERNEL);
+       if (!phba->slim2p)
+               goto out_iounmap;
+
+       memset(phba->slim2p, 0, SLI2_SLIM_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;
+
+       /* Initialize and populate the iocb list per host.  */
+       INIT_LIST_HEAD(&phba->lpfc_iocb_list);
+       for (i = 0; i < LPFC_IOCB_LIST_CNT; i++) {
+               iocbq_entry = kmalloc(sizeof(struct lpfc_iocbq), GFP_KERNEL);
+               if (iocbq_entry == NULL) {
+                       printk(KERN_ERR "%s: only allocated %d iocbs of "
+                               "expected %d count. Unloading driver.\n",
+                               __FUNCTION__, i, LPFC_IOCB_LIST_CNT);
+                       error = -ENOMEM;
+                       goto out_free_iocbq;
+               }
+
+               memset(iocbq_entry, 0, sizeof(struct lpfc_iocbq));
+               iotag = lpfc_sli_next_iotag(phba, iocbq_entry);
+               if (iotag == 0) {
+                       kfree (iocbq_entry);
+                       printk(KERN_ERR "%s: failed to allocate IOTAG. "
+                              "Unloading driver.\n",
+                               __FUNCTION__);
+                       error = -ENOMEM;
+                       goto out_free_iocbq;
                }
+               spin_lock_irq(phba->host->host_lock);
+               list_add(&iocbq_entry->list, &phba->lpfc_iocb_list);
+               phba->total_iocbq_bufs++;
+               spin_unlock_irq(phba->host->host_lock);
        }
 
-       if (evtype == FC_REG_CT_EVENT) {
-               mp = (struct lpfc_dmabuf *) evdata1;
-               ctp = (struct lpfc_sli_ct_request *) mp->virt;
-               fstype = (void *)(ulong) (ctp->FsType);
+       /* Initialize HBA structure */
+       phba->fc_edtov = FF_DEF_EDTOV;
+       phba->fc_ratov = FF_DEF_RATOV;
+       phba->fc_altov = FF_DEF_ALTOV;
+       phba->fc_arbtov = FF_DEF_ARBTOV;
+
+       INIT_LIST_HEAD(&phba->work_list);
+       phba->work_ha_mask = (HA_ERATT|HA_MBATT|HA_LATT);
+       phba->work_ha_mask |= (HA_RXMASK << (LPFC_ELS_RING * 4));
+
+       /* Startup the kernel thread for this host adapter. */
+       phba->worker_thread = kthread_run(lpfc_do_work, phba,
+                                      "lpfc_worker_%d", phba->brd_no);
+       if (IS_ERR(phba->worker_thread)) {
+               error = PTR_ERR(phba->worker_thread);
+               goto out_free_iocbq;
        }
 
-       while (ehp && ((ehp->e_mask != evtype) || (ehp->e_type != fstype)))
-               ehp = (fcEVTHDR_t *) ehp->e_next_header;
-
-       if (!ehp)
-               return (0);
-
-       ep = ehp->e_head;
-
-       while (ep && !(found)) {
-               if (ep->evt_sleep) {
-                       switch (evtype) {
-                       case FC_REG_CT_EVENT:
-                               if ((ep->evt_type ==
-                                    (void *)(ulong) FC_FSTYPE_ALL)
-                                   || (ep->evt_type == fstype)) {
-                                       found++;
-                                       ep->evt_data0 = evdata0; /* tag */
-                                       ep->evt_data1 = evdata1; /* buffer
-                                                                   ptr */
-                                       ep->evt_data2 = evdata2; /* count */
-                                       ep->evt_sleep = 0;
-                                       if (ehp->e_mode & E_SLEEPING_MODE) {
-                                               ehp->e_flag |=
-                                                   E_GET_EVENT_ACTIVE;
-                                               lpfc_wakeup_event(phba, ehp);
-                                       }
-                                       /* For FC_REG_CT_EVENT just give it to
-                                          first one found */
-                               }
-                               break;
-                       default:
-                               found++;
-                               ep->evt_data0 = evdata0;
-                               ep->evt_data1 = evdata1;
-                               ep->evt_data2 = evdata2;
-                               ep->evt_sleep = 0;
-                               if ((ehp->e_mode & E_SLEEPING_MODE)
-                                   && !(ehp->e_flag & E_GET_EVENT_ACTIVE)) {
-                                       ehp->e_flag |= E_GET_EVENT_ACTIVE;
-                                       lpfc_wakeup_event(phba, ehp);
-                               }
-                               /* For all other events, give it to every one
-                                  waiting */
-                               break;
-                       }
-               }
-               ep = ep->evt_next;
+       /*
+        * Set initial can_queue value since 0 is no longer supported and
+        * scsi_add_host will fail. This will be adjusted later based on the
+        * max xri value determined in hba setup.
+        */
+       host->can_queue = phba->cfg_hba_queue_depth - 10;
+
+       /* Tell the midlayer we support 16 byte commands */
+       host->max_cmd_len = 16;
+
+       /* Initialize the list of scsi buffers used by driver for scsi IO. */
+       spin_lock_init(&phba->scsi_buf_list_lock);
+       INIT_LIST_HEAD(&phba->lpfc_scsi_buf_list);
+
+       host->transportt = lpfc_transport_template;
+       pci_set_drvdata(pdev, host);
+       error = scsi_add_host(host, &pdev->dev);
+       if (error)
+               goto out_kthread_stop;
+
+       error = lpfc_alloc_sysfs_attr(phba);
+       if (error)
+               goto out_remove_host;
+
+       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;
+       }
+       phba->MBslimaddr = phba->slim_memmap_p;
+       phba->HAregaddr = phba->ctrl_regs_memmap_p + HA_REG_OFFSET;
+       phba->CAregaddr = phba->ctrl_regs_memmap_p + CA_REG_OFFSET;
+       phba->HSregaddr = phba->ctrl_regs_memmap_p + HS_REG_OFFSET;
+       phba->HCregaddr = phba->ctrl_regs_memmap_p + HC_REG_OFFSET;
+
+       error = lpfc_sli_hba_setup(phba);
+       if (error) {
+               error = -ENODEV;
+               goto out_free_irq;
        }
-       if (evtype == FC_REG_LINK_EVENT)
-               phba->nport_event_cnt++;
 
-       return (found);
+       /*
+        * hba setup may have changed the hba_queue_depth so we need to adjust
+        * the value of can_queue.
+        */
+       host->can_queue = phba->cfg_hba_queue_depth - 10;
+
+       lpfc_discovery_wait(phba);
+
+       if (phba->cfg_poll & DISABLE_FCP_RING_INT) {
+               spin_lock_irq(phba->host->host_lock);
+               lpfc_poll_start_timer(phba);
+               spin_unlock_irq(phba->host->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;
+       if (phba->lmt & LMT_10Gb)
+               fc_host_supported_speeds(host) |= FC_PORTSPEED_10GBIT;
+       if (phba->lmt & LMT_4Gb)
+               fc_host_supported_speeds(host) |= FC_PORTSPEED_4GBIT;
+       if (phba->lmt & LMT_2Gb)
+               fc_host_supported_speeds(host) |= FC_PORTSPEED_2GBIT;
+       if (phba->lmt & LMT_1Gb)
+               fc_host_supported_speeds(host) |= FC_PORTSPEED_1GBIT;
+
+       fc_host_maxframe_size(host) =
+               ((((uint32_t) phba->fc_sparam.cmn.bbRcvSizeMsb & 0x0F) << 8) |
+                (uint32_t) phba->fc_sparam.cmn.bbRcvSizeLsb);
+
+       /* This value is also unchanging */
+       memset(fc_host_active_fc4s(host), 0,
+               sizeof(fc_host_active_fc4s(host)));
+       fc_host_active_fc4s(host)[2] = 1;
+       fc_host_active_fc4s(host)[7] = 1;
+
+       spin_lock_irq(phba->host->host_lock);
+       phba->fc_flag &= ~FC_LOADING;
+       spin_unlock_irq(phba->host->host_lock);
+       return 0;
+
+out_free_irq:
+       lpfc_stop_timer(phba);
+       phba->work_hba_events = 0;
+       free_irq(phba->pcidev->irq, phba);
+       pci_disable_msi(phba->pcidev);
+out_free_sysfs_attr:
+       lpfc_free_sysfs_attr(phba);
+out_remove_host:
+       fc_remove_host(phba->host);
+       scsi_remove_host(phba->host);
+out_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_slim:
+       dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE, phba->slim2p,
+                                                       phba->slim2p_mapping);
+out_iounmap:
+       iounmap(phba->ctrl_regs_memmap_p);
+out_iounmap_slim:
+       iounmap(phba->slim_memmap_p);
+out_idr_remove:
+       idr_remove(&lpfc_hba_index, phba->brd_no);
+out_put_host:
+       phba->host = NULL;
+       scsi_host_put(host);
+out_release_regions:
+       pci_release_regions(pdev);
+out_disable_device:
+       pci_disable_device(pdev);
+out:
+       pci_set_drvdata(pdev, NULL);
+       return error;
 }
 
-int
-lpfc_stop_timer(struct lpfc_hba * phba)
+static void __devexit
+lpfc_pci_remove_one(struct pci_dev *pdev)
 {
-       struct lpfc_sli *psli = &phba->sli;
+       struct Scsi_Host   *host = pci_get_drvdata(pdev);
+       struct lpfc_hba    *phba = (struct lpfc_hba *)host->hostdata;
+       unsigned long iflag;
 
-       /* Instead of a timer, this has been converted to a
-        * deferred procedding list.
+       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);
+
+       /*
+        * Bring down the SLI Layer. This step disable all interrupts,
+        * clears the rings, discards all mailbox commands, and resets
+        * the HBA.
         */
-       while (!list_empty(&phba->freebufList)) {
-               struct lpfc_dmabuf *mp;
+       lpfc_sli_hba_down(phba);
+       lpfc_sli_brdrestart(phba);
 
-               mp = (struct lpfc_dmabuf *)(phba->freebufList.next);
-               if (mp) {
-                       lpfc_mbuf_free(phba, mp->virt, mp->phys);
-                       list_del(&mp->list);
-                       kfree(mp);
-               }
-       }
+       /* Release the irq reservation */
+       free_irq(phba->pcidev->irq, phba);
+       pci_disable_msi(phba->pcidev);
 
-       del_timer_sync(&phba->fc_estabtmo);
-       del_timer_sync(&phba->fc_disctmo);
-       del_timer_sync(&phba->fc_scantmo);
-       del_timer_sync(&phba->fc_fdmitmo);
-       del_timer_sync(&phba->els_tmofunc);
-       psli = &phba->sli;
-       del_timer_sync(&psli->mbox_tmo);
-       return(1);
+       lpfc_cleanup(phba, 0);
+       lpfc_stop_timer(phba);
+       phba->work_hba_events = 0;
+
+       /*
+        * Call scsi_free before mem_free since scsi bufs are released to their
+        * corresponding pools here.
+        */
+       lpfc_scsi_free(phba);
+       lpfc_mem_free(phba);
+
+       /* Free resources associated with SLI2 interface */
+       dma_free_coherent(&pdev->dev, SLI2_SLIM_SIZE,
+                         phba->slim2p, phba->slim2p_mapping);
+
+       /* unmap adapter SLIM and Control Registers */
+       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);
+}
+
+static struct pci_device_id lpfc_id_table[] = {
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_VIPER,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_FIREFLY,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_THOR,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PEGASUS,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_CENTAUR,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_DRAGONFLY,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_SUPERFLY,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_RFLY,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_PFLY,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_NEPTUNE_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_HELIOS_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BMID,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_BSMB,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_SCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZEPHYR_DCSP,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZMID,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_ZSMB,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_TFLY,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP101,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP10000S,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LP11000S,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       {PCI_VENDOR_ID_EMULEX, PCI_DEVICE_ID_LPE11000S,
+               PCI_ANY_ID, PCI_ANY_ID, },
+       { 0 }
+};
+
+MODULE_DEVICE_TABLE(pci, lpfc_id_table);
+
+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),
+};
+
+static int __init
+lpfc_init(void)
+{
+       int error = 0;
+
+       printk(LPFC_MODULE_DESC "\n");
+       printk(LPFC_COPYRIGHT "\n");
+
+       lpfc_transport_template =
+                               fc_attach_transport(&lpfc_transport_functions);
+       if (!lpfc_transport_template)
+               return -ENOMEM;
+       error = pci_register_driver(&lpfc_driver);
+       if (error)
+               fc_release_transport(lpfc_transport_template);
+
+       return error;
+}
+
+static void __exit
+lpfc_exit(void)
+{
+       pci_unregister_driver(&lpfc_driver);
+       fc_release_transport(lpfc_transport_template);
 }
+
+module_init(lpfc_init);
+module_exit(lpfc_exit);
+MODULE_LICENSE("GPL");
+MODULE_DESCRIPTION(LPFC_MODULE_DESC);
+MODULE_AUTHOR("Emulex Corporation - tech.support@emulex.com");
+MODULE_VERSION("0:" LPFC_DRIVER_VERSION);