]> err.no Git - linux-2.6/blobdiff - drivers/scsi/lpfc/lpfc_sli.c
[SCSI] lpfc 8.2.7 : Miscellaneous Fixes
[linux-2.6] / drivers / scsi / lpfc / lpfc_sli.c
index 1edac15eed40b7e7c520c45e5b748dc56d1aa997..f40aa7b905f716e335b4d30b33e1859ed478b214 100644 (file)
@@ -1,7 +1,7 @@
 /*******************************************************************
  * This file is part of the Emulex Linux Device Driver for         *
  * Fibre Channel Host Bus Adapters.                                *
- * Copyright (C) 2004-2007 Emulex.  All rights reserved.           *
+ * Copyright (C) 2004-2008 Emulex.  All rights reserved.           *
  * EMULEX and SLI are trademarks of Emulex.                        *
  * www.emulex.com                                                  *
  * Portions Copyright (C) 2004-2005 Christoph Hellwig              *
 #include "lpfc_crtn.h"
 #include "lpfc_logmsg.h"
 #include "lpfc_compat.h"
+#include "lpfc_debugfs.h"
 
 /*
  * Define macro to log: Mailbox command x%x cannot issue Data
  * This allows multiple uses of lpfc_msgBlk0311
  * w/o perturbing log msg utility.
  */
-#define LOG_MBOX_CANNOT_ISSUE_DATA( phba, mb, psli, flag) \
+#define LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag) \
                        lpfc_printf_log(phba, \
                                KERN_INFO, \
                                LOG_MBOX | LOG_SLI, \
-                               "%d:0311 Mailbox command x%x cannot issue " \
-                               "Data: x%x x%x x%x\n", \
-                               phba->brd_no, \
-                               mb->mbxCommand,         \
+                               "(%d):0311 Mailbox command x%x cannot " \
+                               "issue Data: x%x x%x x%x\n", \
+                               pmbox->vport ? pmbox->vport->vpi : 0, \
+                               pmbox->mb.mbxCommand,           \
                                phba->pport->port_state,        \
                                psli->sli_flag, \
                                flag)
@@ -65,6 +66,24 @@ typedef enum _lpfc_iocb_type {
        LPFC_ABORT_IOCB
 } lpfc_iocb_type;
 
+               /* SLI-2/SLI-3 provide different sized iocbs.  Given a pointer
+                * to the start of the ring, and the slot number of the
+                * desired iocb entry, calc a pointer to that entry.
+                */
+static inline IOCB_t *
+lpfc_cmd_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
+{
+       return (IOCB_t *) (((char *) pring->cmdringaddr) +
+                          pring->cmdidx * phba->iocb_cmd_size);
+}
+
+static inline IOCB_t *
+lpfc_resp_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
+{
+       return (IOCB_t *) (((char *) pring->rspringaddr) +
+                          pring->rspidx * phba->iocb_rsp_size);
+}
+
 static struct lpfc_iocbq *
 __lpfc_sli_get_iocbq(struct lpfc_hba *phba)
 {
@@ -87,7 +106,7 @@ lpfc_sli_get_iocbq(struct lpfc_hba *phba)
        return iocbq;
 }
 
-void
+static void
 __lpfc_sli_release_iocbq(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
 {
        size_t start_clean = offsetof(struct lpfc_iocbq, iocb);
@@ -180,8 +199,29 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
        case CMD_RCV_ELS_REQ_CX:
        case CMD_RCV_SEQUENCE64_CX:
        case CMD_RCV_ELS_REQ64_CX:
+       case CMD_ASYNC_STATUS:
+       case CMD_IOCB_RCV_SEQ64_CX:
+       case CMD_IOCB_RCV_ELS64_CX:
+       case CMD_IOCB_RCV_CONT64_CX:
+       case CMD_IOCB_RET_XRI64_CX:
                type = LPFC_UNSOL_IOCB;
                break;
+       case CMD_IOCB_XMIT_MSEQ64_CR:
+       case CMD_IOCB_XMIT_MSEQ64_CX:
+       case CMD_IOCB_RCV_SEQ_LIST64_CX:
+       case CMD_IOCB_RCV_ELS_LIST64_CX:
+       case CMD_IOCB_CLOSE_EXTENDED_CN:
+       case CMD_IOCB_ABORT_EXTENDED_CN:
+       case CMD_IOCB_RET_HBQE64_CN:
+       case CMD_IOCB_FCP_IBIDIR64_CR:
+       case CMD_IOCB_FCP_IBIDIR64_CX:
+       case CMD_IOCB_FCP_ITASKMGT64_CX:
+       case CMD_IOCB_LOGENTRY_CN:
+       case CMD_IOCB_LOGENTRY_ASYNC_CN:
+               printk("%s - Unhandled SLI-3 Command x%x\n",
+                               __FUNCTION__, iocb_cmnd);
+               type = LPFC_UNKNOWN_IOCB;
+               break;
        default:
                type = LPFC_UNKNOWN_IOCB;
                break;
@@ -191,32 +231,35 @@ lpfc_sli_iocb_cmd_type(uint8_t iocb_cmnd)
 }
 
 static int
-lpfc_sli_ring_map(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
+lpfc_sli_ring_map(struct lpfc_hba *phba)
 {
        struct lpfc_sli *psli = &phba->sli;
-       MAILBOX_t *pmbox = &pmb->mb;
-       int i, rc;
+       LPFC_MBOXQ_t *pmb;
+       MAILBOX_t *pmbox;
+       int i, rc, ret = 0;
 
+       pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!pmb)
+               return -ENOMEM;
+       pmbox = &pmb->mb;
+       phba->link_state = LPFC_INIT_MBX_CMDS;
        for (i = 0; i < psli->num_rings; i++) {
-               phba->link_state = LPFC_INIT_MBX_CMDS;
                lpfc_config_ring(phba, i, pmb);
                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
                if (rc != MBX_SUCCESS) {
-                       lpfc_printf_log(phba,
-                                       KERN_ERR,
-                                       LOG_INIT,
-                                       "%d:0446 Adapter failed to init, "
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                       "0446 Adapter failed to init (%d), "
                                        "mbxCmd x%x CFG_RING, mbxStatus x%x, "
                                        "ring %d\n",
-                                       phba->brd_no,
-                                       pmbox->mbxCommand,
-                                       pmbox->mbxStatus,
-                                       i);
+                                       rc, pmbox->mbxCommand,
+                                       pmbox->mbxStatus, i);
                        phba->link_state = LPFC_HBA_ERROR;
-                       return -ENXIO;
+                       ret = -ENXIO;
+                       break;
                }
        }
-       return 0;
+       mempool_free(pmb, phba->mbox_mem_pool);
+       return ret;
 }
 
 static int
@@ -225,9 +268,16 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 {
        list_add_tail(&piocb->list, &pring->txcmplq);
        pring->txcmplq_cnt++;
-       if (unlikely(pring->ringno == LPFC_ELS_RING))
-               mod_timer(&piocb->vport->els_tmofunc,
-                         jiffies + HZ * (phba->fc_ratov << 1));
+       if ((unlikely(pring->ringno == LPFC_ELS_RING)) &&
+          (piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) &&
+          (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) {
+               if (!piocb->vport)
+                       BUG();
+               else
+                       mod_timer(&piocb->vport->els_tmofunc,
+                                 jiffies + HZ * (phba->fc_ratov << 1));
+       }
+
 
        return 0;
 }
@@ -235,29 +285,21 @@ lpfc_sli_ringtxcmpl_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 static struct lpfc_iocbq *
 lpfc_sli_ringtx_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
-       struct list_head *dlp;
        struct lpfc_iocbq *cmd_iocb;
 
-       dlp = &pring->txq;
-       cmd_iocb = NULL;
-       list_remove_head((&pring->txq), cmd_iocb,
-                        struct lpfc_iocbq,
-                        list);
-       if (cmd_iocb) {
-               /* If the first ptr is not equal to the list header,
-                * deque the IOCBQ_t and return it.
-                */
+       list_remove_head((&pring->txq), cmd_iocb, struct lpfc_iocbq, list);
+       if (cmd_iocb != NULL)
                pring->txq_cnt--;
-       }
        return cmd_iocb;
 }
 
 static IOCB_t *
 lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
-       struct lpfc_pgp *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
+       struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+               &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
+               &phba->slim2p->mbx.us.s2.port[pring->ringno];
        uint32_t  max_cmd_idx = pring->numCiocb;
-       IOCB_t *iocb = NULL;
 
        if ((pring->next_cmdidx == pring->cmdidx) &&
           (++pring->next_cmdidx >= max_cmd_idx))
@@ -269,9 +311,9 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 
                if (unlikely(pring->local_getidx >= max_cmd_idx)) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                       "%d:0315 Ring %d issue: portCmdGet %d "
+                                       "0315 Ring %d issue: portCmdGet %d "
                                        "is bigger then cmd ring %d\n",
-                                       phba->brd_no, pring->ringno,
+                                       pring->ringno,
                                        pring->local_getidx, max_cmd_idx);
 
                        phba->link_state = LPFC_HBA_ERROR;
@@ -281,8 +323,8 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
                         */
                        phba->work_ha |= HA_ERATT;
                        phba->work_hs = HS_FFER3;
-                       if (phba->work_wait)
-                               wake_up(phba->work_wait);
+
+                       lpfc_worker_wake_up(phba);
 
                        return NULL;
                }
@@ -291,9 +333,7 @@ lpfc_sli_next_iocb_slot (struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
                        return NULL;
        }
 
-       iocb = IOCB_ENTRY(pring->cmdringaddr, pring->cmdidx);
-
-       return iocb;
+       return lpfc_cmd_iocb(phba, pring);
 }
 
 uint16_t
@@ -339,7 +379,7 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
                        if (psli->iocbq_lookup)
                                memcpy(new_arr, old_arr,
                                       ((psli->last_iotag  + 1) *
-                                       sizeof (struct lpfc_iocbq *)));
+                                       sizeof (struct lpfc_iocbq *)));
                        psli->iocbq_lookup = new_arr;
                        psli->iocbq_lookup_len = new_len;
                        psli->last_iotag = iotag;
@@ -353,8 +393,8 @@ lpfc_sli_next_iotag(struct lpfc_hba *phba, struct lpfc_iocbq *iocbq)
                spin_unlock_irq(&phba->hbalock);
 
        lpfc_printf_log(phba, KERN_ERR,LOG_SLI,
-                       "%d:0318 Failed to allocate IOTAG.last IOTAG is %d\n",
-                       phba->brd_no, psli->last_iotag);
+                       "0318 Failed to allocate IOTAG.last IOTAG is %d\n",
+                       psli->last_iotag);
 
        return 0;
 }
@@ -368,10 +408,18 @@ lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         */
        nextiocb->iocb.ulpIoTag = (nextiocb->iocb_cmpl) ? nextiocb->iotag : 0;
 
+       if (pring->ringno == LPFC_ELS_RING) {
+               lpfc_debugfs_slow_ring_trc(phba,
+                       "IOCB cmd ring:   wd4:x%08x wd6:x%08x wd7:x%08x",
+                       *(((uint32_t *) &nextiocb->iocb) + 4),
+                       *(((uint32_t *) &nextiocb->iocb) + 6),
+                       *(((uint32_t *) &nextiocb->iocb) + 7));
+       }
+
        /*
         * Issue iocb command to adapter
         */
-       lpfc_sli_pcimem_bcopy(&nextiocb->iocb, iocb, sizeof (IOCB_t));
+       lpfc_sli_pcimem_bcopy(&nextiocb->iocb, iocb, phba->iocb_cmd_size);
        wmb();
        pring->stats.iocb_cmd++;
 
@@ -390,8 +438,7 @@ lpfc_sli_submit_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         * driver will put a command into.
         */
        pring->cmdidx = pring->next_cmdidx;
-       writel(pring->cmdidx, phba->MBslimaddr
-              + (SLIMOFF + (pring->ringno * 2)) * 4);
+       writel(pring->cmdidx, &phba->host_gp[pring->ringno].cmdPutInx);
 }
 
 static void
@@ -442,8 +489,7 @@ lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        if (pring->txq_cnt &&
            lpfc_is_link_up(phba) &&
            (pring->ringno != phba->sli.fcp_ring ||
-            phba->sli.sli_flag & LPFC_PROCESS_LA) &&
-           !(pring->flag & LPFC_STOP_IOCB_MBX)) {
+            phba->sli.sli_flag & LPFC_PROCESS_LA)) {
 
                while ((iocb = lpfc_sli_next_iocb_slot(phba, pring)) &&
                       (nextiocb = lpfc_sli_ringtx_get(phba, pring)))
@@ -458,27 +504,229 @@ lpfc_sli_resume_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        return;
 }
 
-/* lpfc_sli_turn_on_ring is only called by lpfc_sli_handle_mb_event below */
-static void
-lpfc_sli_turn_on_ring(struct lpfc_hba *phba, int ringno)
+static struct lpfc_hbq_entry *
+lpfc_sli_next_hbq_slot(struct lpfc_hba *phba, uint32_t hbqno)
 {
-       struct lpfc_pgp  *pgp = &phba->slim2p->mbx.us.s2.port[ringno];
-       unsigned long iflags;
+       struct hbq_s *hbqp = &phba->hbqs[hbqno];
 
-       /* If the ring is active, flag it */
-       spin_lock_irqsave(&phba->hbalock, iflags);
-       if (phba->sli.ring[ringno].cmdringaddr) {
-               if (phba->sli.ring[ringno].flag & LPFC_STOP_IOCB_MBX) {
-                       phba->sli.ring[ringno].flag &= ~LPFC_STOP_IOCB_MBX;
-                       /*
-                        * Force update of the local copy of cmdGetInx
-                        */
-                       phba->sli.ring[ringno].local_getidx
-                               = le32_to_cpu(pgp->cmdGetInx);
-                       lpfc_sli_resume_iocb(phba, &phba->sli.ring[ringno]);
+       if (hbqp->next_hbqPutIdx == hbqp->hbqPutIdx &&
+           ++hbqp->next_hbqPutIdx >= hbqp->entry_count)
+               hbqp->next_hbqPutIdx = 0;
+
+       if (unlikely(hbqp->local_hbqGetIdx == hbqp->next_hbqPutIdx)) {
+               uint32_t raw_index = phba->hbq_get[hbqno];
+               uint32_t getidx = le32_to_cpu(raw_index);
+
+               hbqp->local_hbqGetIdx = getidx;
+
+               if (unlikely(hbqp->local_hbqGetIdx >= hbqp->entry_count)) {
+                       lpfc_printf_log(phba, KERN_ERR,
+                                       LOG_SLI | LOG_VPORT,
+                                       "1802 HBQ %d: local_hbqGetIdx "
+                                       "%u is > than hbqp->entry_count %u\n",
+                                       hbqno, hbqp->local_hbqGetIdx,
+                                       hbqp->entry_count);
+
+                       phba->link_state = LPFC_HBA_ERROR;
+                       return NULL;
+               }
+
+               if (hbqp->local_hbqGetIdx == hbqp->next_hbqPutIdx)
+                       return NULL;
+       }
+
+       return (struct lpfc_hbq_entry *) phba->hbqs[hbqno].hbq_virt +
+                       hbqp->hbqPutIdx;
+}
+
+void
+lpfc_sli_hbqbuf_free_all(struct lpfc_hba *phba)
+{
+       struct lpfc_dmabuf *dmabuf, *next_dmabuf;
+       struct hbq_dmabuf *hbq_buf;
+       unsigned long flags;
+       int i, hbq_count;
+       uint32_t hbqno;
+
+       hbq_count = lpfc_sli_hbq_count();
+       /* Return all memory used by all HBQs */
+       spin_lock_irqsave(&phba->hbalock, flags);
+       for (i = 0; i < hbq_count; ++i) {
+               list_for_each_entry_safe(dmabuf, next_dmabuf,
+                               &phba->hbqs[i].hbq_buffer_list, list) {
+                       hbq_buf = container_of(dmabuf, struct hbq_dmabuf, dbuf);
+                       list_del(&hbq_buf->dbuf.list);
+                       (phba->hbqs[i].hbq_free_buffer)(phba, hbq_buf);
+               }
+               phba->hbqs[i].buffer_count = 0;
+       }
+       /* Return all HBQ buffer that are in-fly */
+       list_for_each_entry_safe(dmabuf, next_dmabuf,
+                       &phba->hbqbuf_in_list, list) {
+               hbq_buf = container_of(dmabuf, struct hbq_dmabuf, dbuf);
+               list_del(&hbq_buf->dbuf.list);
+               if (hbq_buf->tag == -1) {
+                       (phba->hbqs[LPFC_ELS_HBQ].hbq_free_buffer)
+                               (phba, hbq_buf);
+               } else {
+                       hbqno = hbq_buf->tag >> 16;
+                       if (hbqno >= LPFC_MAX_HBQS)
+                               (phba->hbqs[LPFC_ELS_HBQ].hbq_free_buffer)
+                                       (phba, hbq_buf);
+                       else
+                               (phba->hbqs[hbqno].hbq_free_buffer)(phba,
+                                       hbq_buf);
+               }
+       }
+
+       /* Mark the HBQs not in use */
+       phba->hbq_in_use = 0;
+       spin_unlock_irqrestore(&phba->hbalock, flags);
+}
+
+static struct lpfc_hbq_entry *
+lpfc_sli_hbq_to_firmware(struct lpfc_hba *phba, uint32_t hbqno,
+                        struct hbq_dmabuf *hbq_buf)
+{
+       struct lpfc_hbq_entry *hbqe;
+       dma_addr_t physaddr = hbq_buf->dbuf.phys;
+
+       /* Get next HBQ entry slot to use */
+       hbqe = lpfc_sli_next_hbq_slot(phba, hbqno);
+       if (hbqe) {
+               struct hbq_s *hbqp = &phba->hbqs[hbqno];
+
+               hbqe->bde.addrHigh = le32_to_cpu(putPaddrHigh(physaddr));
+               hbqe->bde.addrLow  = le32_to_cpu(putPaddrLow(physaddr));
+               hbqe->bde.tus.f.bdeSize = hbq_buf->size;
+               hbqe->bde.tus.f.bdeFlags = 0;
+               hbqe->bde.tus.w = le32_to_cpu(hbqe->bde.tus.w);
+               hbqe->buffer_tag = le32_to_cpu(hbq_buf->tag);
+                               /* Sync SLIM */
+               hbqp->hbqPutIdx = hbqp->next_hbqPutIdx;
+               writel(hbqp->hbqPutIdx, phba->hbq_put + hbqno);
+                               /* flush */
+               readl(phba->hbq_put + hbqno);
+               list_add_tail(&hbq_buf->dbuf.list, &hbqp->hbq_buffer_list);
+       }
+       return hbqe;
+}
+
+static struct lpfc_hbq_init lpfc_els_hbq = {
+       .rn = 1,
+       .entry_count = 200,
+       .mask_count = 0,
+       .profile = 0,
+       .ring_mask = (1 << LPFC_ELS_RING),
+       .buffer_count = 0,
+       .init_count = 20,
+       .add_count = 5,
+};
+
+static struct lpfc_hbq_init lpfc_extra_hbq = {
+       .rn = 1,
+       .entry_count = 200,
+       .mask_count = 0,
+       .profile = 0,
+       .ring_mask = (1 << LPFC_EXTRA_RING),
+       .buffer_count = 0,
+       .init_count = 0,
+       .add_count = 5,
+};
+
+struct lpfc_hbq_init *lpfc_hbq_defs[] = {
+       &lpfc_els_hbq,
+       &lpfc_extra_hbq,
+};
+
+static int
+lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
+{
+       uint32_t i, start, end;
+       unsigned long flags;
+       struct hbq_dmabuf *hbq_buffer;
+
+       if (!phba->hbqs[hbqno].hbq_alloc_buffer)
+               return 0;
+
+       start = phba->hbqs[hbqno].buffer_count;
+       end = count + start;
+       if (end > lpfc_hbq_defs[hbqno]->entry_count)
+               end = lpfc_hbq_defs[hbqno]->entry_count;
+
+       /* Check whether HBQ is still in use */
+       spin_lock_irqsave(&phba->hbalock, flags);
+       if (!phba->hbq_in_use)
+               goto out;
+
+       /* Populate HBQ entries */
+       for (i = start; i < end; i++) {
+               hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
+               if (!hbq_buffer)
+                       goto err;
+               hbq_buffer->tag = (i | (hbqno << 16));
+               if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer))
+                       phba->hbqs[hbqno].buffer_count++;
+               else
+                       (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
+       }
+
+ out:
+       spin_unlock_irqrestore(&phba->hbalock, flags);
+       return 0;
+ err:
+       spin_unlock_irqrestore(&phba->hbalock, flags);
+       return 1;
+}
+
+int
+lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
+{
+       return(lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
+                                        lpfc_hbq_defs[qno]->add_count));
+}
+
+static int
+lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)
+{
+       return(lpfc_sli_hbqbuf_fill_hbqs(phba, qno,
+                                        lpfc_hbq_defs[qno]->init_count));
+}
+
+static struct hbq_dmabuf *
+lpfc_sli_hbqbuf_find(struct lpfc_hba *phba, uint32_t tag)
+{
+       struct lpfc_dmabuf *d_buf;
+       struct hbq_dmabuf *hbq_buf;
+       uint32_t hbqno;
+
+       hbqno = tag >> 16;
+       if (hbqno >= LPFC_MAX_HBQS)
+               return NULL;
+
+       list_for_each_entry(d_buf, &phba->hbqs[hbqno].hbq_buffer_list, list) {
+               hbq_buf = container_of(d_buf, struct hbq_dmabuf, dbuf);
+               if (hbq_buf->tag == tag) {
+                       return hbq_buf;
+               }
+       }
+       lpfc_printf_log(phba, KERN_ERR, LOG_SLI | LOG_VPORT,
+                       "1803 Bad hbq tag. Data: x%x x%x\n",
+                       tag, phba->hbqs[tag >> 16].buffer_count);
+       return NULL;
+}
+
+void
+lpfc_sli_free_hbq(struct lpfc_hba *phba, struct hbq_dmabuf *hbq_buffer)
+{
+       uint32_t hbqno;
+
+       if (hbq_buffer) {
+               hbqno = hbq_buffer->tag >> 16;
+               if (!lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer)) {
+                       (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
                }
        }
-       spin_unlock_irqrestore(&phba->hbalock, iflags);
 }
 
 static int
@@ -490,6 +738,7 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
        case MBX_LOAD_SM:
        case MBX_READ_NV:
        case MBX_WRITE_NV:
+       case MBX_WRITE_VPARMS:
        case MBX_RUN_BIU_DIAG:
        case MBX_INIT_LINK:
        case MBX_DOWN_LINK:
@@ -517,7 +766,7 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
        case MBX_DEL_LD_ENTRY:
        case MBX_RUN_PROGRAM:
        case MBX_SET_MASK:
-       case MBX_SET_SLIM:
+       case MBX_SET_VARIABLE:
        case MBX_UNREG_D_ID:
        case MBX_KILL_BOARD:
        case MBX_CONFIG_FARP:
@@ -529,9 +778,13 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
        case MBX_READ_RPI64:
        case MBX_REG_LOGIN64:
        case MBX_READ_LA64:
-       case MBX_FLASH_WR_ULA:
+       case MBX_WRITE_WWN:
        case MBX_SET_DEBUG:
        case MBX_LOAD_EXP_ROM:
+       case MBX_ASYNCEVT_ENABLE:
+       case MBX_REG_VPI:
+       case MBX_UNREG_VPI:
+       case MBX_HEARTBEAT:
                ret = mbxCommand;
                break;
        default:
@@ -544,15 +797,18 @@ static void
 lpfc_sli_wake_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq)
 {
        wait_queue_head_t *pdone_q;
+       unsigned long drvr_flag;
 
        /*
         * If pdone_q is empty, the driver thread gave up waiting and
         * continued running.
         */
        pmboxq->mbox_flag |= LPFC_MBX_WAKE;
+       spin_lock_irqsave(&phba->hbalock, drvr_flag);
        pdone_q = (wait_queue_head_t *) pmboxq->context1;
        if (pdone_q)
                wake_up_interruptible(pdone_q);
+       spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
        return;
 }
 
@@ -579,8 +835,8 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
            !pmb->mb.mbxStatus) {
 
                rpi = pmb->mb.un.varWords[0];
-               lpfc_unreg_login(phba, rpi, pmb);
-               pmb->mbox_cmpl=lpfc_sli_def_mbox_cmpl;
+               lpfc_unreg_login(phba, pmb->mb.un.varRegLogin.vpi, rpi, pmb);
+               pmb->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
                if (rc != MBX_NOT_FINISHED)
                        return;
@@ -593,95 +849,76 @@ lpfc_sli_def_mbox_cmpl(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmb)
 int
 lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
 {
-       MAILBOX_t *mbox, *pmbox;
+       MAILBOX_t *pmbox;
        LPFC_MBOXQ_t *pmb;
-       int i, rc;
-       uint32_t process_next;
-       unsigned long iflags;
-
-       /* We should only get here if we are in SLI2 mode */
-       if (!(phba->sli.sli_flag & LPFC_SLI2_ACTIVE)) {
-               return 1;
-       }
+       int rc;
+       LIST_HEAD(cmplq);
 
        phba->sli.slistat.mbox_event++;
 
+       /* Get all completed mailboxe buffers into the cmplq */
+       spin_lock_irq(&phba->hbalock);
+       list_splice_init(&phba->sli.mboxq_cmpl, &cmplq);
+       spin_unlock_irq(&phba->hbalock);
+
        /* Get a Mailbox buffer to setup mailbox commands for callback */
-       if ((pmb = phba->sli.mbox_active)) {
-               pmbox = &pmb->mb;
-               mbox = &phba->slim2p->mbx;
+       do {
+               list_remove_head(&cmplq, pmb, LPFC_MBOXQ_t, list);
+               if (pmb == NULL)
+                       break;
 
-               /* First check out the status word */
-               lpfc_sli_pcimem_bcopy(mbox, pmbox, sizeof (uint32_t));
+               pmbox = &pmb->mb;
 
-               /* Sanity check to ensure the host owns the mailbox */
-               if (pmbox->mbxOwner != OWN_HOST) {
-                       /* Lets try for a while */
-                       for (i = 0; i < 10240; i++) {
-                               /* First copy command data */
-                               lpfc_sli_pcimem_bcopy(mbox, pmbox,
-                                                       sizeof (uint32_t));
-                               if (pmbox->mbxOwner == OWN_HOST)
-                                       goto mbout;
+               if (pmbox->mbxCommand != MBX_HEARTBEAT) {
+                       if (pmb->vport) {
+                               lpfc_debugfs_disc_trc(pmb->vport,
+                                       LPFC_DISC_TRC_MBOX_VPORT,
+                                       "MBOX cmpl vport: cmd:x%x mb:x%x x%x",
+                                       (uint32_t)pmbox->mbxCommand,
+                                       pmbox->un.varWords[0],
+                                       pmbox->un.varWords[1]);
+                       }
+                       else {
+                               lpfc_debugfs_disc_trc(phba->pport,
+                                       LPFC_DISC_TRC_MBOX,
+                                       "MBOX cmpl:       cmd:x%x mb:x%x x%x",
+                                       (uint32_t)pmbox->mbxCommand,
+                                       pmbox->un.varWords[0],
+                                       pmbox->un.varWords[1]);
                        }
-                       /* Stray Mailbox Interrupt, mbxCommand <cmd> mbxStatus
-                          <status> */
-                       lpfc_printf_log(phba,
-                                       KERN_WARNING,
-                                       LOG_MBOX | LOG_SLI,
-                                       "%d:0304 Stray Mailbox Interrupt "
-                                       "mbxCommand x%x mbxStatus x%x\n",
-                                       phba->brd_no,
-                                       pmbox->mbxCommand,
-                                       pmbox->mbxStatus);
-
-                       spin_lock_irq(&phba->hbalock);
-                       phba->sli.sli_flag |= LPFC_SLI_MBOX_ACTIVE;
-                       spin_unlock_irq(&phba->hbalock);
-                       return 1;
                }
 
-             mbout:
-               del_timer_sync(&phba->sli.mbox_tmo);
-
-               spin_lock_irqsave(&phba->pport->work_port_lock, iflags);
-               phba->pport->work_port_events &= ~WORKER_MBOX_TMO;
-               spin_unlock_irqrestore(&phba->pport->work_port_lock, iflags);
-
                /*
                 * It is a fatal error if unknown mbox command completion.
                 */
                if (lpfc_sli_chk_mbx_command(pmbox->mbxCommand) ==
                    MBX_SHUTDOWN) {
-
                        /* Unknow mailbox command compl */
-                       lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_MBOX | LOG_SLI,
-                               "%d:0323 Unknown Mailbox command %x Cmpl\n",
-                               phba->brd_no,
-                               pmbox->mbxCommand);
+                       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
+                                       "(%d):0323 Unknown Mailbox command "
+                                       "%x Cmpl\n",
+                                       pmb->vport ? pmb->vport->vpi : 0,
+                                       pmbox->mbxCommand);
                        phba->link_state = LPFC_HBA_ERROR;
                        phba->work_hs = HS_FFER3;
                        lpfc_handle_eratt(phba);
-                       return 0;
+                       continue;
                }
 
-               phba->sli.mbox_active = NULL;
                if (pmbox->mbxStatus) {
                        phba->sli.slistat.mbox_stat_err++;
                        if (pmbox->mbxStatus == MBXERR_NO_RESOURCES) {
                                /* Mbox cmd cmpl error - RETRYing */
-                               lpfc_printf_log(phba,
-                                       KERN_INFO,
-                                       LOG_MBOX | LOG_SLI,
-                                       "%d:0305 Mbox cmd cmpl error - "
-                                       "RETRYing Data: x%x x%x x%x x%x\n",
-                                       phba->brd_no,
-                                       pmbox->mbxCommand,
-                                       pmbox->mbxStatus,
-                                       pmbox->un.varWords[0],
-                                       phba->pport->port_state);
+                               lpfc_printf_log(phba, KERN_INFO,
+                                               LOG_MBOX | LOG_SLI,
+                                               "(%d):0305 Mbox cmd cmpl "
+                                               "error - RETRYing Data: x%x "
+                                               "x%x x%x x%x\n",
+                                               pmb->vport ? pmb->vport->vpi :0,
+                                               pmbox->mbxCommand,
+                                               pmbox->mbxStatus,
+                                               pmbox->un.varWords[0],
+                                               pmb->vport->port_state);
                                pmbox->mbxStatus = 0;
                                pmbox->mbxOwner = OWN_HOST;
                                spin_lock_irq(&phba->hbalock);
@@ -689,17 +926,15 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
                                spin_unlock_irq(&phba->hbalock);
                                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
                                if (rc == MBX_SUCCESS)
-                                       return 0;
+                                       continue;
                        }
                }
 
                /* Mailbox cmd <cmd> Cmpl <cmpl> */
-               lpfc_printf_log(phba,
-                               KERN_INFO,
-                               LOG_MBOX | LOG_SLI,
-                               "%d:0307 Mailbox cmd x%x Cmpl x%p "
+               lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
+                               "(%d):0307 Mailbox cmd x%x Cmpl x%p "
                                "Data: x%x x%x x%x x%x x%x x%x x%x x%x x%x\n",
-                               phba->brd_no,
+                               pmb->vport ? pmb->vport->vpi : 0,
                                pmbox->mbxCommand,
                                pmb->mbox_cmpl,
                                *((uint32_t *) pmbox),
@@ -712,39 +947,67 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
                                pmbox->un.varWords[6],
                                pmbox->un.varWords[7]);
 
-               if (pmb->mbox_cmpl) {
-                       lpfc_sli_pcimem_bcopy(mbox, pmbox, MAILBOX_CMD_SIZE);
+               if (pmb->mbox_cmpl)
                        pmb->mbox_cmpl(phba,pmb);
-               }
-       }
+       } while (1);
+       return 0;
+}
 
+static struct lpfc_dmabuf *
+lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
+{
+       struct hbq_dmabuf *hbq_entry, *new_hbq_entry;
+       uint32_t hbqno;
+       void *virt;             /* virtual address ptr */
+       dma_addr_t phys;        /* mapped address */
+       unsigned long flags;
 
-       do {
-               process_next = 0;       /* by default don't loop */
-               spin_lock_irq(&phba->hbalock);
-               phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
+       /* Check whether HBQ is still in use */
+       spin_lock_irqsave(&phba->hbalock, flags);
+       if (!phba->hbq_in_use) {
+               spin_unlock_irqrestore(&phba->hbalock, flags);
+               return NULL;
+       }
 
-               /* Process next mailbox command if there is one */
-               if ((pmb = lpfc_mbox_get(phba))) {
-                       spin_unlock_irq(&phba->hbalock);
-                       rc = lpfc_sli_issue_mbox(phba, pmb, MBX_NOWAIT);
-                       if (rc == MBX_NOT_FINISHED) {
-                               pmb->mb.mbxStatus = MBX_NOT_FINISHED;
-                               pmb->mbox_cmpl(phba,pmb);
-                               process_next = 1;
-                               continue;       /* loop back */
-                       }
-               } else {
-                       spin_unlock_irq(&phba->hbalock);
-                       /* Turn on IOCB processing */
-                       for (i = 0; i < phba->sli.num_rings; i++)
-                               lpfc_sli_turn_on_ring(phba, i);
-               }
+       hbq_entry = lpfc_sli_hbqbuf_find(phba, tag);
+       if (hbq_entry == NULL) {
+               spin_unlock_irqrestore(&phba->hbalock, flags);
+               return NULL;
+       }
+       list_del(&hbq_entry->dbuf.list);
+
+       hbqno = tag >> 16;
+       new_hbq_entry = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
+       if (new_hbq_entry == NULL) {
+               list_add_tail(&hbq_entry->dbuf.list, &phba->hbqbuf_in_list);
+               spin_unlock_irqrestore(&phba->hbalock, flags);
+               return &hbq_entry->dbuf;
+       }
+       new_hbq_entry->tag = -1;
+       phys = new_hbq_entry->dbuf.phys;
+       virt = new_hbq_entry->dbuf.virt;
+       new_hbq_entry->dbuf.phys = hbq_entry->dbuf.phys;
+       new_hbq_entry->dbuf.virt = hbq_entry->dbuf.virt;
+       hbq_entry->dbuf.phys = phys;
+       hbq_entry->dbuf.virt = virt;
+       lpfc_sli_free_hbq(phba, hbq_entry);
+       list_add_tail(&new_hbq_entry->dbuf.list, &phba->hbqbuf_in_list);
+       spin_unlock_irqrestore(&phba->hbalock, flags);
 
-       } while (process_next);
+       return &new_hbq_entry->dbuf;
+}
 
-       return 0;
+static struct lpfc_dmabuf *
+lpfc_sli_get_buff(struct lpfc_hba *phba,
+                       struct lpfc_sli_ring *pring,
+                       uint32_t tag)
+{
+       if (tag & QUE_BUFTAG_BIT)
+               return lpfc_sli_ring_taggedbuf_get(phba, pring, tag);
+       else
+               return lpfc_sli_replace_hbqbuff(phba, tag);
 }
+
 static int
 lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                            struct lpfc_iocbq *saveq)
@@ -753,29 +1016,150 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        WORD5            * w5p;
        uint32_t           Rctl, Type;
        uint32_t           match, i;
+       struct lpfc_iocbq *iocbq;
+       struct lpfc_dmabuf *dmzbuf;
 
        match = 0;
        irsp = &(saveq->iocb);
-       if ((irsp->ulpCommand == CMD_RCV_ELS_REQ64_CX)
-           || (irsp->ulpCommand == CMD_RCV_ELS_REQ_CX)) {
+
+       if (irsp->ulpStatus == IOSTAT_NEED_BUFFER)
+               return 1;
+       if (irsp->ulpCommand == CMD_ASYNC_STATUS) {
+               if (pring->lpfc_sli_rcv_async_status)
+                       pring->lpfc_sli_rcv_async_status(phba, pring, saveq);
+               else
+                       lpfc_printf_log(phba,
+                                       KERN_WARNING,
+                                       LOG_SLI,
+                                       "0316 Ring %d handler: unexpected "
+                                       "ASYNC_STATUS iocb received evt_code "
+                                       "0x%x\n",
+                                       pring->ringno,
+                                       irsp->un.asyncstat.evt_code);
+               return 1;
+       }
+
+       if ((irsp->ulpCommand == CMD_IOCB_RET_XRI64_CX) &&
+               (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED)) {
+               if (irsp->ulpBdeCount > 0) {
+                       dmzbuf = lpfc_sli_get_buff(phba, pring,
+                                       irsp->un.ulpWord[3]);
+                       lpfc_in_buf_free(phba, dmzbuf);
+               }
+
+               if (irsp->ulpBdeCount > 1) {
+                       dmzbuf = lpfc_sli_get_buff(phba, pring,
+                                       irsp->unsli3.sli3Words[3]);
+                       lpfc_in_buf_free(phba, dmzbuf);
+               }
+
+               if (irsp->ulpBdeCount > 2) {
+                       dmzbuf = lpfc_sli_get_buff(phba, pring,
+                               irsp->unsli3.sli3Words[7]);
+                       lpfc_in_buf_free(phba, dmzbuf);
+               }
+
+               return 1;
+       }
+
+       if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
+               if (irsp->ulpBdeCount != 0) {
+                       saveq->context2 = lpfc_sli_get_buff(phba, pring,
+                                               irsp->un.ulpWord[3]);
+                       if (!saveq->context2)
+                               lpfc_printf_log(phba,
+                                       KERN_ERR,
+                                       LOG_SLI,
+                                       "0341 Ring %d Cannot find buffer for "
+                                       "an unsolicited iocb. tag 0x%x\n",
+                                       pring->ringno,
+                                       irsp->un.ulpWord[3]);
+               }
+               if (irsp->ulpBdeCount == 2) {
+                       saveq->context3 = lpfc_sli_get_buff(phba, pring,
+                                               irsp->unsli3.sli3Words[7]);
+                       if (!saveq->context3)
+                               lpfc_printf_log(phba,
+                                       KERN_ERR,
+                                       LOG_SLI,
+                                       "0342 Ring %d Cannot find buffer for an"
+                                       " unsolicited iocb. tag 0x%x\n",
+                                       pring->ringno,
+                                       irsp->unsli3.sli3Words[7]);
+               }
+               list_for_each_entry(iocbq, &saveq->list, list) {
+                       irsp = &(iocbq->iocb);
+                       if (irsp->ulpBdeCount != 0) {
+                               iocbq->context2 = lpfc_sli_get_buff(phba, pring,
+                                                       irsp->un.ulpWord[3]);
+                               if (!iocbq->context2)
+                                       lpfc_printf_log(phba,
+                                               KERN_ERR,
+                                               LOG_SLI,
+                                               "0343 Ring %d Cannot find "
+                                               "buffer for an unsolicited iocb"
+                                               ". tag 0x%x\n", pring->ringno,
+                                               irsp->un.ulpWord[3]);
+                       }
+                       if (irsp->ulpBdeCount == 2) {
+                               iocbq->context3 = lpfc_sli_get_buff(phba, pring,
+                                               irsp->unsli3.sli3Words[7]);
+                               if (!iocbq->context3)
+                                       lpfc_printf_log(phba,
+                                               KERN_ERR,
+                                               LOG_SLI,
+                                               "0344 Ring %d Cannot find "
+                                               "buffer for an unsolicited "
+                                               "iocb. tag 0x%x\n",
+                                               pring->ringno,
+                                               irsp->unsli3.sli3Words[7]);
+                       }
+               }
+       }
+       if (irsp->ulpBdeCount != 0 &&
+           (irsp->ulpCommand == CMD_IOCB_RCV_CONT64_CX ||
+            irsp->ulpStatus == IOSTAT_INTERMED_RSP)) {
+               int found = 0;
+
+               /* search continue save q for same XRI */
+               list_for_each_entry(iocbq, &pring->iocb_continue_saveq, clist) {
+                       if (iocbq->iocb.ulpContext == saveq->iocb.ulpContext) {
+                               list_add_tail(&saveq->list, &iocbq->list);
+                               found = 1;
+                               break;
+                       }
+               }
+               if (!found)
+                       list_add_tail(&saveq->clist,
+                                     &pring->iocb_continue_saveq);
+               if (saveq->iocb.ulpStatus != IOSTAT_INTERMED_RSP) {
+                       list_del_init(&iocbq->clist);
+                       saveq = iocbq;
+                       irsp = &(saveq->iocb);
+               } else
+                       return 0;
+       }
+       if ((irsp->ulpCommand == CMD_RCV_ELS_REQ64_CX) ||
+           (irsp->ulpCommand == CMD_RCV_ELS_REQ_CX) ||
+           (irsp->ulpCommand == CMD_IOCB_RCV_ELS64_CX)) {
                Rctl = FC_ELS_REQ;
                Type = FC_ELS_DATA;
        } else {
-               w5p =
-                   (WORD5 *) & (saveq->iocb.un.
-                                ulpWord[5]);
+               w5p = (WORD5 *)&(saveq->iocb.un.ulpWord[5]);
                Rctl = w5p->hcsw.Rctl;
                Type = w5p->hcsw.Type;
 
                /* Firmware Workaround */
                if ((Rctl == 0) && (pring->ringno == LPFC_ELS_RING) &&
-                       (irsp->ulpCommand == CMD_RCV_SEQUENCE64_CX)) {
+                       (irsp->ulpCommand == CMD_RCV_SEQUENCE64_CX ||
+                        irsp->ulpCommand == CMD_IOCB_RCV_SEQ64_CX)) {
                        Rctl = FC_ELS_REQ;
                        Type = FC_ELS_DATA;
                        w5p->hcsw.Rctl = Rctl;
                        w5p->hcsw.Type = Type;
                }
        }
+
        /* unSolicited Responses */
        if (pring->prt[0].profile) {
                if (pring->prt[0].lpfc_sli_rcv_unsol_event)
@@ -785,12 +1169,9 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        } else {
                /* We must search, based on rctl / type
                   for the right routine */
-               for (i = 0; i < pring->num_mask;
-                    i++) {
-                       if ((pring->prt[i].rctl ==
-                            Rctl)
-                           && (pring->prt[i].
-                               type == Type)) {
+               for (i = 0; i < pring->num_mask; i++) {
+                       if ((pring->prt[i].rctl == Rctl)
+                           && (pring->prt[i].type == Type)) {
                                if (pring->prt[i].lpfc_sli_rcv_unsol_event)
                                        (pring->prt[i].lpfc_sli_rcv_unsol_event)
                                                        (phba, pring, saveq);
@@ -803,17 +1184,12 @@ lpfc_sli_process_unsol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                /* Unexpected Rctl / Type received */
                /* Ring <ringno> handler: unexpected
                   Rctl <Rctl> Type <Type> received */
-               lpfc_printf_log(phba,
-                               KERN_WARNING,
-                               LOG_SLI,
-                               "%d:0313 Ring %d handler: unexpected Rctl x%x "
-                               "Type x%x received \n",
-                               phba->brd_no,
-                               pring->ringno,
-                               Rctl,
-                               Type);
+               lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
+                               "0313 Ring %d handler: unexpected Rctl x%x "
+                               "Type x%x received\n",
+                               pring->ringno, Rctl, Type);
        }
-       return(1);
+       return 1;
 }
 
 static struct lpfc_iocbq *
@@ -828,16 +1204,15 @@ lpfc_sli_iocbq_lookup(struct lpfc_hba *phba,
 
        if (iotag != 0 && iotag <= phba->sli.last_iotag) {
                cmd_iocb = phba->sli.iocbq_lookup[iotag];
-               list_del(&cmd_iocb->list);
+               list_del_init(&cmd_iocb->list);
                pring->txcmplq_cnt--;
                return cmd_iocb;
        }
 
        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                       "%d:0317 iotag x%x is out off "
+                       "0317 iotag x%x is out off "
                        "range: max iotag x%x wd0 x%x\n",
-                       phba->brd_no, iotag,
-                       phba->sli.last_iotag,
+                       iotag, phba->sli.last_iotag,
                        *(((uint32_t *) &prspiocb->iocb) + 7));
        return NULL;
 }
@@ -869,6 +1244,12 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                                                IOSTAT_LOCAL_REJECT;
                                        saveq->iocb.un.ulpWord[4] =
                                                IOERR_SLI_ABORTED;
+
+                                       /* Firmware could still be in progress
+                                        * of DMAing payload, so don't free data
+                                        * buffer till after a hbeat.
+                                        */
+                                       saveq->iocb_flag |= LPFC_DELAY_MEM_FREE;
                                }
                        }
                        (cmdiocbp->iocb_cmpl) (phba, cmdiocbp, saveq);
@@ -885,18 +1266,16 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         * Ring <ringno> handler: unexpected completion IoTag
                         * <IoTag>
                         */
-                       lpfc_printf_log(phba,
-                               KERN_WARNING,
-                               LOG_SLI,
-                               "%d:0322 Ring %d handler: unexpected "
-                               "completion IoTag x%x Data: x%x x%x x%x x%x\n",
-                               phba->brd_no,
-                               pring->ringno,
-                               saveq->iocb.ulpIoTag,
-                               saveq->iocb.ulpStatus,
-                               saveq->iocb.un.ulpWord[4],
-                               saveq->iocb.ulpCommand,
-                               saveq->iocb.ulpContext);
+                       lpfc_printf_vlog(cmdiocbp->vport, KERN_WARNING, LOG_SLI,
+                                        "0322 Ring %d handler: "
+                                        "unexpected completion IoTag x%x "
+                                        "Data: x%x x%x x%x x%x\n",
+                                        pring->ringno,
+                                        saveq->iocb.ulpIoTag,
+                                        saveq->iocb.ulpStatus,
+                                        saveq->iocb.un.ulpWord[4],
+                                        saveq->iocb.ulpCommand,
+                                        saveq->iocb.ulpContext);
                }
        }
 
@@ -906,16 +1285,17 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 static void
 lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
 {
-       struct lpfc_pgp *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
+       struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+               &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
+               &phba->slim2p->mbx.us.s2.port[pring->ringno];
        /*
         * Ring <ringno> handler: portRspPut <portRspPut> is bigger then
         * rsp ring <portRspMax>
         */
        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                       "%d:0312 Ring %d handler: portRspPut %d "
+                       "0312 Ring %d handler: portRspPut %d "
                        "is bigger then rsp ring %d\n",
-                       phba->brd_no, pring->ringno,
-                       le32_to_cpu(pgp->rspPutInx),
+                       pring->ringno, le32_to_cpu(pgp->rspPutInx),
                        pring->numRiocb);
 
        phba->link_state = LPFC_HBA_ERROR;
@@ -926,8 +1306,8 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
         */
        phba->work_ha |= HA_ERATT;
        phba->work_hs = HS_FFER3;
-       if (phba->work_wait)
-               wake_up(phba->work_wait);
+
+       lpfc_worker_wake_up(phba);
 
        return;
 }
@@ -945,14 +1325,15 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
        uint32_t portRspPut, portRspMax;
        int type;
        uint32_t rsp_cmpl = 0;
-       void __iomem *to_slim;
        uint32_t ha_copy;
        unsigned long iflags;
 
        pring->stats.iocb_event++;
 
-       /* The driver assumes SLI-2 mode */
-       pgp =  &phba->slim2p->mbx.us.s2.port[pring->ringno];
+       pgp = (phba->sli_rev == 3) ?
+               &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
+               &phba->slim2p->mbx.us.s2.port[pring->ringno];
+
 
        /*
         * The next available response entry should never exceed the maximum
@@ -967,15 +1348,13 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
 
        rmb();
        while (pring->rspidx != portRspPut) {
-
-               entry = IOCB_ENTRY(pring->rspringaddr, pring->rspidx);
-
+               entry = lpfc_resp_iocb(phba, pring);
                if (++pring->rspidx >= portRspMax)
                        pring->rspidx = 0;
 
                lpfc_sli_pcimem_bcopy((uint32_t *) entry,
                                      (uint32_t *) &rspiocbq.iocb,
-                                     sizeof(IOCB_t));
+                                     phba->iocb_rsp_size);
                irsp = &rspiocbq.iocb;
                type = lpfc_sli_iocb_cmd_type(irsp->ulpCommand & CMD_IOCB_MASK);
                pring->stats.iocb_rsp++;
@@ -984,9 +1363,9 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                if (unlikely(irsp->ulpStatus)) {
                        /* Rsp ring <ringno> error: IOCB */
                        lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
-                                       "%d:0326 Rsp Ring %d error: IOCB Data: "
+                                       "0326 Rsp Ring %d error: IOCB Data: "
                                        "x%x x%x x%x x%x x%x x%x x%x x%x\n",
-                                       phba->brd_no, pring->ringno,
+                                       pring->ringno,
                                        irsp->un.ulpWord[0],
                                        irsp->un.ulpWord[1],
                                        irsp->un.ulpWord[2],
@@ -1006,9 +1385,9 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                         */
                        if (unlikely(irsp->ulpCommand == CMD_XRI_ABORTED_CX)) {
                                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                                               "%d:0314 IOCB cmd 0x%x"
-                                               " processed. Skipping"
-                                               " completion", phba->brd_no,
+                                               "0314 IOCB cmd 0x%x "
+                                               "processed. Skipping "
+                                               "completion",
                                                irsp->ulpCommand);
                                break;
                        }
@@ -1028,15 +1407,15 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                                memset(adaptermsg, 0, LPFC_MAX_ADPTMSG);
                                memcpy(&adaptermsg[0], (uint8_t *) irsp,
                                       MAX_MSG_DATA);
-                               dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s",
+                               dev_warn(&((phba->pcidev)->dev),
+                                        "lpfc%d: %s\n",
                                         phba->brd_no, adaptermsg);
                        } else {
                                /* Unknown IOCB command */
                                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                               "%d:0321 Unknown IOCB command "
+                                               "0321 Unknown IOCB command "
                                                "Data: x%x, x%x x%x x%x x%x\n",
-                                               phba->brd_no, type,
-                                               irsp->ulpCommand,
+                                               type, irsp->ulpCommand,
                                                irsp->ulpStatus,
                                                irsp->ulpIoTag,
                                                irsp->ulpContext);
@@ -1050,9 +1429,7 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                 * been updated, sync the pgp->rspPutInx and fetch the new port
                 * response put pointer.
                 */
-               to_slim = phba->MBslimaddr +
-                       (SLIMOFF + (pring->ringno * 2) + 1) * 4;
-               writeb(pring->rspidx, to_slim);
+               writel(pring->rspidx, &phba->host_gp[pring->ringno].rspGetInx);
 
                if (pring->rspidx == portRspPut)
                        portRspPut = le32_to_cpu(pgp->rspPutInx);
@@ -1096,7 +1473,9 @@ static int
 lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                                struct lpfc_sli_ring *pring, uint32_t mask)
 {
-       struct lpfc_pgp  *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
+       struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+               &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
+               &phba->slim2p->mbx.us.s2.port[pring->ringno];
        IOCB_t *irsp = NULL;
        IOCB_t *entry = NULL;
        struct lpfc_iocbq *cmdiocbq = NULL;
@@ -1107,7 +1486,6 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
        lpfc_iocb_type type;
        unsigned long iflag;
        uint32_t rsp_cmpl = 0;
-       void __iomem *to_slim;
 
        spin_lock_irqsave(&phba->hbalock, iflag);
        pring->stats.iocb_event++;
@@ -1131,14 +1509,15 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                 * structure.  The copy involves a byte-swap since the
                 * network byte order and pci byte orders are different.
                 */
-               entry = IOCB_ENTRY(pring->rspringaddr, pring->rspidx);
+               entry = lpfc_resp_iocb(phba, pring);
+               phba->last_completion_time = jiffies;
 
                if (++pring->rspidx >= portRspMax)
                        pring->rspidx = 0;
 
                lpfc_sli_pcimem_bcopy((uint32_t *) entry,
                                      (uint32_t *) &rspiocbq.iocb,
-                                     sizeof(IOCB_t));
+                                     phba->iocb_rsp_size);
                INIT_LIST_HEAD(&(rspiocbq.list));
                irsp = &rspiocbq.iocb;
 
@@ -1147,16 +1526,30 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                rsp_cmpl++;
 
                if (unlikely(irsp->ulpStatus)) {
+                       /*
+                        * If resource errors reported from HBA, reduce
+                        * queuedepths of the SCSI device.
+                        */
+                       if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
+                               (irsp->un.ulpWord[4] == IOERR_NO_RESOURCES)) {
+                               spin_unlock_irqrestore(&phba->hbalock, iflag);
+                               lpfc_adjust_queue_depth(phba);
+                               spin_lock_irqsave(&phba->hbalock, iflag);
+                       }
+
                        /* Rsp ring <ringno> error: IOCB */
                        lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
-                               "%d:0336 Rsp Ring %d error: IOCB Data: "
-                               "x%x x%x x%x x%x x%x x%x x%x x%x\n",
-                               phba->brd_no, pring->ringno,
-                               irsp->un.ulpWord[0], irsp->un.ulpWord[1],
-                               irsp->un.ulpWord[2], irsp->un.ulpWord[3],
-                               irsp->un.ulpWord[4], irsp->un.ulpWord[5],
-                               *(((uint32_t *) irsp) + 6),
-                               *(((uint32_t *) irsp) + 7));
+                                       "0336 Rsp Ring %d error: IOCB Data: "
+                                       "x%x x%x x%x x%x x%x x%x x%x x%x\n",
+                                       pring->ringno,
+                                       irsp->un.ulpWord[0],
+                                       irsp->un.ulpWord[1],
+                                       irsp->un.ulpWord[2],
+                                       irsp->un.ulpWord[3],
+                                       irsp->un.ulpWord[4],
+                                       irsp->un.ulpWord[5],
+                                       *(((uint32_t *) irsp) + 6),
+                                       *(((uint32_t *) irsp) + 7));
                }
 
                switch (type) {
@@ -1168,9 +1561,9 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                         */
                        if (unlikely(irsp->ulpCommand == CMD_XRI_ABORTED_CX)) {
                                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                                               "%d:0333 IOCB cmd 0x%x"
+                                               "0333 IOCB cmd 0x%x"
                                                " processed. Skipping"
-                                               " completion\n", phba->brd_no,
+                                               " completion\n",
                                                irsp->ulpCommand);
                                break;
                        }
@@ -1202,16 +1595,18 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                                memset(adaptermsg, 0, LPFC_MAX_ADPTMSG);
                                memcpy(&adaptermsg[0], (uint8_t *) irsp,
                                       MAX_MSG_DATA);
-                               dev_warn(&((phba->pcidev)->dev), "lpfc%d: %s",
+                               dev_warn(&((phba->pcidev)->dev),
+                                        "lpfc%d: %s\n",
                                         phba->brd_no, adaptermsg);
                        } else {
                                /* Unknown IOCB command */
                                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                       "%d:0334 Unknown IOCB command "
-                                       "Data: x%x, x%x x%x x%x x%x\n",
-                                       phba->brd_no, type, irsp->ulpCommand,
-                                       irsp->ulpStatus, irsp->ulpIoTag,
-                                       irsp->ulpContext);
+                                               "0334 Unknown IOCB command "
+                                               "Data: x%x, x%x x%x x%x x%x\n",
+                                               type, irsp->ulpCommand,
+                                               irsp->ulpStatus,
+                                               irsp->ulpIoTag,
+                                               irsp->ulpContext);
                        }
                        break;
                }
@@ -1222,9 +1617,7 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                 * been updated, sync the pgp->rspPutInx and fetch the new port
                 * response put pointer.
                 */
-               to_slim = phba->MBslimaddr +
-                       (SLIMOFF + (pring->ringno * 2) + 1) * 4;
-               writel(pring->rspidx, to_slim);
+               writel(pring->rspidx, &phba->host_gp[pring->ringno].rspGetInx);
 
                if (pring->rspidx == portRspPut)
                        portRspPut = le32_to_cpu(pgp->rspPutInx);
@@ -1253,12 +1646,13 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
        return rc;
 }
 
-
 int
 lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                                struct lpfc_sli_ring *pring, uint32_t mask)
 {
-       struct lpfc_pgp  *pgp = &phba->slim2p->mbx.us.s2.port[pring->ringno];
+       struct lpfc_pgp *pgp = (phba->sli_rev == 3) ?
+               &phba->slim2p->mbx.us.s3_pgp.port[pring->ringno] :
+               &phba->slim2p->mbx.us.s2.port[pring->ringno];
        IOCB_t *entry;
        IOCB_t *irsp = NULL;
        struct lpfc_iocbq *rspiocbp = NULL;
@@ -1271,7 +1665,6 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
        uint32_t portRspPut, portRspMax;
        int rc = 1;
        unsigned long iflag;
-       void __iomem *to_slim;
 
        spin_lock_irqsave(&phba->hbalock, iflag);
        pring->stats.iocb_event++;
@@ -1287,12 +1680,9 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                 * Ring <ringno> handler: portRspPut <portRspPut> is bigger then
                 * rsp ring <portRspMax>
                 */
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_SLI,
-                               "%d:0303 Ring %d handler: portRspPut %d "
+               lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                               "0303 Ring %d handler: portRspPut %d "
                                "is bigger then rsp ring %d\n",
-                               phba->brd_no,
                                pring->ringno, portRspPut, portRspMax);
 
                phba->link_state = LPFC_HBA_ERROR;
@@ -1319,7 +1709,9 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                 * the ulpLe field is set, the entire Command has been
                 * received.
                 */
-               entry = IOCB_ENTRY(pring->rspringaddr, pring->rspidx);
+               entry = lpfc_resp_iocb(phba, pring);
+
+               phba->last_completion_time = jiffies;
                rspiocbp = __lpfc_sli_get_iocbq(phba);
                if (rspiocbp == NULL) {
                        printk(KERN_ERR "%s: out of buffers! Failing "
@@ -1327,22 +1719,24 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                        break;
                }
 
-               lpfc_sli_pcimem_bcopy(entry, &rspiocbp->iocb, sizeof(IOCB_t));
+               lpfc_sli_pcimem_bcopy(entry, &rspiocbp->iocb,
+                                     phba->iocb_rsp_size);
                irsp = &rspiocbp->iocb;
 
                if (++pring->rspidx >= portRspMax)
                        pring->rspidx = 0;
 
-               to_slim = phba->MBslimaddr + (SLIMOFF + (pring->ringno * 2)
-                                             + 1) * 4;
-               writel(pring->rspidx, to_slim);
+               if (pring->ringno == LPFC_ELS_RING) {
+                       lpfc_debugfs_slow_ring_trc(phba,
+                       "IOCB rsp ring:   wd4:x%08x wd6:x%08x wd7:x%08x",
+                               *(((uint32_t *) irsp) + 4),
+                               *(((uint32_t *) irsp) + 6),
+                               *(((uint32_t *) irsp) + 7));
+               }
 
-               if (list_empty(&(pring->iocb_continueq))) {
-                       list_add(&rspiocbp->list, &(pring->iocb_continueq));
-               } else {
-                       list_add_tail(&rspiocbp->list,
-                                     &(pring->iocb_continueq));
-               }
+               writel(pring->rspidx, &phba->host_gp[pring->ringno].rspGetInx);
+
+               list_add_tail(&rspiocbp->list, &(pring->iocb_continueq));
 
                pring->iocb_continueq_cnt++;
                if (irsp->ulpLe) {
@@ -1359,23 +1753,43 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
 
                        pring->stats.iocb_rsp++;
 
+                       /*
+                        * If resource errors reported from HBA, reduce
+                        * queuedepths of the SCSI device.
+                        */
+                       if ((irsp->ulpStatus == IOSTAT_LOCAL_REJECT) &&
+                            (irsp->un.ulpWord[4] == IOERR_NO_RESOURCES)) {
+                               spin_unlock_irqrestore(&phba->hbalock, iflag);
+                               lpfc_adjust_queue_depth(phba);
+                               spin_lock_irqsave(&phba->hbalock, iflag);
+                       }
+
                        if (irsp->ulpStatus) {
                                /* Rsp ring <ringno> error: IOCB */
-                               lpfc_printf_log(phba,
-                                       KERN_WARNING,
-                                       LOG_SLI,
-                                       "%d:0328 Rsp Ring %d error: IOCB Data: "
-                                       "x%x x%x x%x x%x x%x x%x x%x x%x\n",
-                                       phba->brd_no,
-                                       pring->ringno,
-                                       irsp->un.ulpWord[0],
-                                       irsp->un.ulpWord[1],
-                                       irsp->un.ulpWord[2],
-                                       irsp->un.ulpWord[3],
-                                       irsp->un.ulpWord[4],
-                                       irsp->un.ulpWord[5],
-                                       *(((uint32_t *) irsp) + 6),
-                                       *(((uint32_t *) irsp) + 7));
+                               lpfc_printf_log(phba, KERN_WARNING, LOG_SLI,
+                                               "0328 Rsp Ring %d error: "
+                                               "IOCB Data: "
+                                               "x%x x%x x%x x%x "
+                                               "x%x x%x x%x x%x "
+                                               "x%x x%x x%x x%x "
+                                               "x%x x%x x%x x%x\n",
+                                               pring->ringno,
+                                               irsp->un.ulpWord[0],
+                                               irsp->un.ulpWord[1],
+                                               irsp->un.ulpWord[2],
+                                               irsp->un.ulpWord[3],
+                                               irsp->un.ulpWord[4],
+                                               irsp->un.ulpWord[5],
+                                               *(((uint32_t *) irsp) + 6),
+                                               *(((uint32_t *) irsp) + 7),
+                                               *(((uint32_t *) irsp) + 8),
+                                               *(((uint32_t *) irsp) + 9),
+                                               *(((uint32_t *) irsp) + 10),
+                                               *(((uint32_t *) irsp) + 11),
+                                               *(((uint32_t *) irsp) + 12),
+                                               *(((uint32_t *) irsp) + 13),
+                                               *(((uint32_t *) irsp) + 14),
+                                               *(((uint32_t *) irsp) + 15));
                        }
 
                        /*
@@ -1387,17 +1801,17 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                        iocb_cmd_type = irsp->ulpCommand & CMD_IOCB_MASK;
                        type = lpfc_sli_iocb_cmd_type(iocb_cmd_type);
                        if (type == LPFC_SOL_IOCB) {
-                               spin_unlock_irqrestore(&phba->hbalock,
-                                                      iflag);
+                               spin_unlock_irqrestore(&phba->hbalock, iflag);
                                rc = lpfc_sli_process_sol_iocb(phba, pring,
                                                               saveq);
                                spin_lock_irqsave(&phba->hbalock, iflag);
                        } else if (type == LPFC_UNSOL_IOCB) {
-                               spin_unlock_irqrestore(&phba->hbalock,
-                                                      iflag);
+                               spin_unlock_irqrestore(&phba->hbalock, iflag);
                                rc = lpfc_sli_process_unsol_iocb(phba, pring,
                                                                 saveq);
                                spin_lock_irqsave(&phba->hbalock, iflag);
+                               if (!rc)
+                                       free_saveq = 0;
                        } else if (type == LPFC_ABORT_IOCB) {
                                if ((irsp->ulpCommand != CMD_XRI_ABORTED_CX) &&
                                    ((cmdiocbp =
@@ -1428,20 +1842,18 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                                        memcpy(&adaptermsg[0], (uint8_t *) irsp,
                                               MAX_MSG_DATA);
                                        dev_warn(&((phba->pcidev)->dev),
-                                                "lpfc%d: %s",
+                                                "lpfc%d: %s\n",
                                                 phba->brd_no, adaptermsg);
                                } else {
                                        /* Unknown IOCB command */
-                                       lpfc_printf_log(phba,
-                                               KERN_ERR,
-                                               LOG_SLI,
-                                               "%d:0335 Unknown IOCB command "
-                                               "Data: x%x x%x x%x x%x\n",
-                                               phba->brd_no,
-                                               irsp->ulpCommand,
-                                               irsp->ulpStatus,
-                                               irsp->ulpIoTag,
-                                               irsp->ulpContext);
+                                       lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                                       "0335 Unknown IOCB "
+                                                       "command Data: x%x "
+                                                       "x%x x%x x%x\n",
+                                                       irsp->ulpCommand,
+                                                       irsp->ulpStatus,
+                                                       irsp->ulpIoTag,
+                                                       irsp->ulpContext);
                                }
                        }
 
@@ -1454,6 +1866,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                                }
                                __lpfc_sli_release_iocbq(phba, saveq);
                        }
+                       rspiocbp = NULL;
                }
 
                /*
@@ -1466,7 +1879,7 @@ lpfc_sli_handle_slow_ring_event(struct lpfc_hba *phba,
                }
        } /* while (pring->rspidx != portRspPut) */
 
-       if ((rspiocbp != 0) && (mask & HA_R0RE_REQ)) {
+       if ((rspiocbp != NULL) && (mask & HA_R0RE_REQ)) {
                /* At least one response entry has been freed */
                pring->stats.iocb_rsp_full++;
                /* SET RxRE_RSP in Chip Att register */
@@ -1498,6 +1911,10 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        struct lpfc_iocbq *iocb, *next_iocb;
        IOCB_t *cmd = NULL;
 
+       if (pring->ringno == LPFC_ELS_RING) {
+               lpfc_fabric_abort_hba(phba);
+       }
+
        /* Error everything on txq and txcmplq
         * First do the txq.
         */
@@ -1514,7 +1931,7 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        while (!list_empty(&completions)) {
                iocb = list_get_first(&completions, struct lpfc_iocbq, list);
                cmd = &iocb->iocb;
-               list_del(&iocb->list);
+               list_del_init(&iocb->list);
 
                if (!iocb->iocb_cmpl)
                        lpfc_sli_release_iocbq(phba, iocb);
@@ -1555,7 +1972,7 @@ lpfc_sli_brdready(struct lpfc_hba *phba, uint32_t mask)
 
                if (i == 15) {
                                /* Do post */
-                       phba->pport->port_state = LPFC_STATE_UNKNOWN;
+                       phba->pport->port_state = LPFC_VPORT_UNKNOWN;
                        lpfc_sli_brdrestart(phba);
                }
                /* Read the HBA Host Status Register */
@@ -1659,16 +2076,12 @@ lpfc_sli_brdkill(struct lpfc_hba *phba)
        psli = &phba->sli;
 
        /* Kill HBA */
-       lpfc_printf_log(phba,
-               KERN_INFO,
-               LOG_SLI,
-               "%d:0329 Kill HBA Data: x%x x%x\n",
-               phba->brd_no,
-               phba->pport->port_state,
-               psli->sli_flag);
-
-       if ((pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool,
-                                                 GFP_KERNEL)) == 0)
+       lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
+                       "0329 Kill HBA Data: x%x x%x\n",
+                       phba->pport->port_state, psli->sli_flag);
+
+       pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+       if (!pmb)
                return 1;
 
        /* Disable the error attention */
@@ -1738,7 +2151,7 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)
 
        /* Reset HBA */
        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                       "%d:0325 Reset HBA Data: x%x x%x\n", phba->brd_no,
+                       "0325 Reset HBA Data: x%x x%x\n",
                        phba->pport->port_state, psli->sli_flag);
 
        /* perform board reset */
@@ -1793,7 +2206,7 @@ lpfc_sli_brdrestart(struct lpfc_hba *phba)
 
        /* Restart HBA */
        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                       "%d:0337 Restart HBA Data: x%x x%x\n", phba->brd_no,
+                       "0337 Restart HBA Data: x%x x%x\n",
                        phba->pport->port_state, psli->sli_flag);
 
        word0 = 0;
@@ -1857,13 +2270,12 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
                if (i++ >= 20) {
                        /* Adapter failed to init, timeout, status reg
                           <status> */
-                       lpfc_printf_log(phba,
-                                       KERN_ERR,
-                                       LOG_INIT,
-                                       "%d:0436 Adapter failed to init, "
-                                       "timeout, status reg x%x\n",
-                                       phba->brd_no,
-                                       status);
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                       "0436 Adapter failed to init, "
+                                       "timeout, status reg x%x, "
+                                       "FW Data: A8 x%x AC x%x\n", status,
+                                       readl(phba->MBslimaddr + 0xa8),
+                                       readl(phba->MBslimaddr + 0xac));
                        phba->link_state = LPFC_HBA_ERROR;
                        return -ETIMEDOUT;
                }
@@ -1873,13 +2285,12 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
                        /* ERROR: During chipset initialization */
                        /* Adapter failed to init, chipset, status reg
                           <status> */
-                       lpfc_printf_log(phba,
-                                       KERN_ERR,
-                                       LOG_INIT,
-                                       "%d:0437 Adapter failed to init, "
-                                       "chipset, status reg x%x\n",
-                                       phba->brd_no,
-                                       status);
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                                       "0437 Adapter failed to init, "
+                                       "chipset, status reg x%x, "
+                                       "FW Data: A8 x%x AC x%x\n", status,
+                                       readl(phba->MBslimaddr + 0xa8),
+                                       readl(phba->MBslimaddr + 0xac));
                        phba->link_state = LPFC_HBA_ERROR;
                        return -EIO;
                }
@@ -1894,7 +2305,7 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
 
                if (i == 15) {
                                /* Do post */
-                       phba->pport->port_state = LPFC_STATE_UNKNOWN;
+                       phba->pport->port_state = LPFC_VPORT_UNKNOWN;
                        lpfc_sli_brdrestart(phba);
                }
                /* Read the HBA Host Status Register */
@@ -1905,13 +2316,12 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
        if (status & HS_FFERM) {
                /* ERROR: During chipset initialization */
                /* Adapter failed to init, chipset, status reg <status> */
-               lpfc_printf_log(phba,
-                               KERN_ERR,
-                               LOG_INIT,
-                               "%d:0438 Adapter failed to init, chipset, "
-                               "status reg x%x\n",
-                               phba->brd_no,
-                               status);
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                               "0438 Adapter failed to init, chipset, "
+                               "status reg x%x, "
+                               "FW Data: A8 x%x AC x%x\n", status,
+                               readl(phba->MBslimaddr + 0xa8),
+                               readl(phba->MBslimaddr + 0xac));
                phba->link_state = LPFC_HBA_ERROR;
                return -EIO;
        }
@@ -1927,7 +2337,93 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
 }
 
 int
-lpfc_sli_hba_setup(struct lpfc_hba *phba)
+lpfc_sli_hbq_count(void)
+{
+       return ARRAY_SIZE(lpfc_hbq_defs);
+}
+
+static int
+lpfc_sli_hbq_entry_count(void)
+{
+       int  hbq_count = lpfc_sli_hbq_count();
+       int  count = 0;
+       int  i;
+
+       for (i = 0; i < hbq_count; ++i)
+               count += lpfc_hbq_defs[i]->entry_count;
+       return count;
+}
+
+int
+lpfc_sli_hbq_size(void)
+{
+       return lpfc_sli_hbq_entry_count() * sizeof(struct lpfc_hbq_entry);
+}
+
+static int
+lpfc_sli_hbq_setup(struct lpfc_hba *phba)
+{
+       int  hbq_count = lpfc_sli_hbq_count();
+       LPFC_MBOXQ_t *pmb;
+       MAILBOX_t *pmbox;
+       uint32_t hbqno;
+       uint32_t hbq_entry_index;
+
+                               /* Get a Mailbox buffer to setup mailbox
+                                * commands for HBA initialization
+                                */
+       pmb = (LPFC_MBOXQ_t *) mempool_alloc(phba->mbox_mem_pool, GFP_KERNEL);
+
+       if (!pmb)
+               return -ENOMEM;
+
+       pmbox = &pmb->mb;
+
+       /* Initialize the struct lpfc_sli_hbq structure for each hbq */
+       phba->link_state = LPFC_INIT_MBX_CMDS;
+       phba->hbq_in_use = 1;
+
+       hbq_entry_index = 0;
+       for (hbqno = 0; hbqno < hbq_count; ++hbqno) {
+               phba->hbqs[hbqno].next_hbqPutIdx = 0;
+               phba->hbqs[hbqno].hbqPutIdx      = 0;
+               phba->hbqs[hbqno].local_hbqGetIdx   = 0;
+               phba->hbqs[hbqno].entry_count =
+                       lpfc_hbq_defs[hbqno]->entry_count;
+               lpfc_config_hbq(phba, hbqno, lpfc_hbq_defs[hbqno],
+                       hbq_entry_index, pmb);
+               hbq_entry_index += phba->hbqs[hbqno].entry_count;
+
+               if (lpfc_sli_issue_mbox(phba, pmb, MBX_POLL) != MBX_SUCCESS) {
+                       /* Adapter failed to init, mbxCmd <cmd> CFG_RING,
+                          mbxStatus <status>, ring <num> */
+
+                       lpfc_printf_log(phba, KERN_ERR,
+                                       LOG_SLI | LOG_VPORT,
+                                       "1805 Adapter failed to init. "
+                                       "Data: x%x x%x x%x\n",
+                                       pmbox->mbxCommand,
+                                       pmbox->mbxStatus, hbqno);
+
+                       phba->link_state = LPFC_HBA_ERROR;
+                       mempool_free(pmb, phba->mbox_mem_pool);
+                       return ENXIO;
+               }
+       }
+       phba->hbq_count = hbq_count;
+
+       mempool_free(pmb, phba->mbox_mem_pool);
+
+       /* Initially populate or replenish the HBQs */
+       for (hbqno = 0; hbqno < hbq_count; ++hbqno) {
+               if (lpfc_sli_hbqbuf_init_hbqs(phba, hbqno))
+                       return -ENOMEM;
+       }
+       return 0;
+}
+
+static int
+lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
 {
        LPFC_MBOXQ_t *pmb;
        uint32_t resetcount = 0, rc = 0, done = 0;
@@ -1938,11 +2434,12 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                return -ENOMEM;
        }
 
+       phba->sli_rev = sli_mode;
        while (resetcount < 2 && !done) {
                spin_lock_irq(&phba->hbalock);
                phba->sli.sli_flag |= LPFC_SLI_MBOX_ACTIVE;
                spin_unlock_irq(&phba->hbalock);
-               phba->pport->port_state = LPFC_STATE_UNKNOWN;
+               phba->pport->port_state = LPFC_VPORT_UNKNOWN;
                lpfc_sli_brdrestart(phba);
                msleep(2500);
                rc = lpfc_sli_chipset_init(phba);
@@ -1954,14 +2451,14 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                spin_unlock_irq(&phba->hbalock);
                resetcount++;
 
-       /* Call pre CONFIG_PORT mailbox command initialization.  A value of 0
-        * means the call was successful.  Any other nonzero value is a failure,
-        * but if ERESTART is returned, the driver may reset the HBA and try
-        * again.
-        */
+               /* Call pre CONFIG_PORT mailbox command initialization.  A
+                * value of 0 means the call was successful.  Any other
+                * nonzero value is a failure, but if ERESTART is returned,
+                * the driver may reset the HBA and try again.
+                */
                rc = lpfc_config_port_prep(phba);
                if (rc == -ERESTART) {
-                       phba->pport->port_state = 0;
+                       phba->link_state = LPFC_LINK_UNKNOWN;
                        continue;
                } else if (rc) {
                        break;
@@ -1970,39 +2467,117 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                phba->link_state = LPFC_INIT_MBX_CMDS;
                lpfc_config_port(phba, pmb);
                rc = lpfc_sli_issue_mbox(phba, pmb, MBX_POLL);
-               if (rc == MBX_SUCCESS)
-                       done = 1;
-               else {
+               if (rc != MBX_SUCCESS) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                               "%d:0442 Adapter failed to init, mbxCmd x%x "
+                               "0442 Adapter failed to init, mbxCmd x%x "
                                "CONFIG_PORT, mbxStatus x%x Data: x%x\n",
-                               phba->brd_no, pmb->mb.mbxCommand,
-                               pmb->mb.mbxStatus, 0);
+                               pmb->mb.mbxCommand, pmb->mb.mbxStatus, 0);
                        spin_lock_irq(&phba->hbalock);
                        phba->sli.sli_flag &= ~LPFC_SLI2_ACTIVE;
                        spin_unlock_irq(&phba->hbalock);
                        rc = -ENXIO;
+               } else {
+                       done = 1;
+                       phba->max_vpi = (phba->max_vpi &&
+                                        pmb->mb.un.varCfgPort.gmv) != 0
+                               ? pmb->mb.un.varCfgPort.max_vpi
+                               : 0;
+               }
+       }
+
+       if (!done) {
+               rc = -EINVAL;
+               goto do_prep_failed;
+       }
+
+       if ((pmb->mb.un.varCfgPort.sli_mode == 3) &&
+               (!pmb->mb.un.varCfgPort.cMA)) {
+               rc = -ENXIO;
+       }
+
+do_prep_failed:
+       mempool_free(pmb, phba->mbox_mem_pool);
+       return rc;
+}
+
+int
+lpfc_sli_hba_setup(struct lpfc_hba *phba)
+{
+       uint32_t rc;
+       int  mode = 3;
+
+       switch (lpfc_sli_mode) {
+       case 2:
+               if (phba->cfg_enable_npiv) {
+                       lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT,
+                               "1824 NPIV enabled: Override lpfc_sli_mode "
+                               "parameter (%d) to auto (0).\n",
+                               lpfc_sli_mode);
+                       break;
                }
+               mode = 2;
+               break;
+       case 0:
+       case 3:
+               break;
+       default:
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT,
+                               "1819 Unrecognized lpfc_sli_mode "
+                               "parameter: %d.\n", lpfc_sli_mode);
+
+               break;
        }
-       if (!done)
+
+       rc = lpfc_do_config_port(phba, mode);
+       if (rc && lpfc_sli_mode == 3)
+               lpfc_printf_log(phba, KERN_ERR, LOG_INIT | LOG_VPORT,
+                               "1820 Unable to select SLI-3.  "
+                               "Not supported by adapter.\n");
+       if (rc && mode != 2)
+               rc = lpfc_do_config_port(phba, 2);
+       if (rc)
                goto lpfc_sli_hba_setup_error;
 
-       rc = lpfc_sli_ring_map(phba, pmb);
+       if (phba->sli_rev == 3) {
+               phba->iocb_cmd_size = SLI3_IOCB_CMD_SIZE;
+               phba->iocb_rsp_size = SLI3_IOCB_RSP_SIZE;
+               phba->sli3_options |= LPFC_SLI3_ENABLED;
+               phba->sli3_options |= LPFC_SLI3_HBQ_ENABLED;
+
+       } else {
+               phba->iocb_cmd_size = SLI2_IOCB_CMD_SIZE;
+               phba->iocb_rsp_size = SLI2_IOCB_RSP_SIZE;
+               phba->sli3_options = 0;
+       }
+
+       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                       "0444 Firmware in SLI %x mode. Max_vpi %d\n",
+                       phba->sli_rev, phba->max_vpi);
+       rc = lpfc_sli_ring_map(phba);
 
        if (rc)
                goto lpfc_sli_hba_setup_error;
 
+                               /* Init HBQs */
+
+       if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
+               rc = lpfc_sli_hbq_setup(phba);
+               if (rc)
+                       goto lpfc_sli_hba_setup_error;
+       }
+
        phba->sli.sli_flag |= LPFC_PROCESS_LA;
 
        rc = lpfc_config_port_post(phba);
        if (rc)
                goto lpfc_sli_hba_setup_error;
 
-       goto lpfc_sli_hba_setup_exit;
+       return rc;
+
 lpfc_sli_hba_setup_error:
        phba->link_state = LPFC_HBA_ERROR;
-lpfc_sli_hba_setup_exit:
-       mempool_free(pmb, phba->mbox_mem_pool);
+       lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                       "0445 Firmware initialization failed\n");
        return rc;
 }
 
@@ -2022,20 +2597,19 @@ lpfc_sli_hba_setup_exit:
 void
 lpfc_mbox_timeout(unsigned long ptr)
 {
-       struct lpfc_hba  *phba = (struct lpfc_hba *) phba;
+       struct lpfc_hba  *phba = (struct lpfc_hba *) ptr;
        unsigned long iflag;
        uint32_t tmo_posted;
 
        spin_lock_irqsave(&phba->pport->work_port_lock, iflag);
-       tmo_posted = (phba->pport->work_port_events & WORKER_MBOX_TMO) == 0;
+       tmo_posted = phba->pport->work_port_events & WORKER_MBOX_TMO;
        if (!tmo_posted)
                phba->pport->work_port_events |= WORKER_MBOX_TMO;
        spin_unlock_irqrestore(&phba->pport->work_port_lock, iflag);
 
-       if (!tmo_posted) {
-               if (phba->work_wait)
-                       wake_up(phba->work_wait);
-       }
+       if (!tmo_posted)
+               lpfc_worker_wake_up(phba);
+       return;
 }
 
 void
@@ -2051,15 +2625,12 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
        }
 
        /* Mbox cmd <mbxCommand> timeout */
-       lpfc_printf_log(phba,
-               KERN_ERR,
-               LOG_MBOX | LOG_SLI,
-               "%d:0310 Mailbox command x%x timeout Data: x%x x%x x%p\n",
-               phba->brd_no,
-               mb->mbxCommand,
-               phba->pport->port_state,
-               phba->sli.sli_flag,
-               phba->sli.mbox_active);
+       lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
+                       "0310 Mailbox command x%x timeout Data: x%x x%x x%p\n",
+                       mb->mbxCommand,
+                       phba->pport->port_state,
+                       phba->sli.sli_flag,
+                       phba->sli.mbox_active);
 
        /* Setting state unknown so lpfc_sli_abort_iocb_ring
         * would get IOCB_ERROR from lpfc_sli_issue_iocb, allowing
@@ -2070,7 +2641,6 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
        spin_unlock_irq(&phba->pport->work_port_lock);
        spin_lock_irq(&phba->hbalock);
        phba->link_state = LPFC_LINK_UNKNOWN;
-       phba->pport->fc_flag |= FC_ESTABLISH_LINK;
        psli->sli_flag &= ~LPFC_SLI2_ACTIVE;
        spin_unlock_irq(&phba->hbalock);
 
@@ -2078,17 +2648,20 @@ lpfc_mbox_timeout_handler(struct lpfc_hba *phba)
        lpfc_sli_abort_iocb_ring(phba, pring);
 
        lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
-                       "%d:0316 Resetting board due to mailbox timeout\n",
-                       phba->brd_no);
+                       "0345 Resetting board due to mailbox timeout\n");
        /*
         * lpfc_offline calls lpfc_sli_hba_down which will clean up
         * on oustanding mailbox commands.
         */
+       /* If resets are disabled then set error state and return. */
+       if (!phba->cfg_enable_hba_reset) {
+               phba->link_state = LPFC_HBA_ERROR;
+               return;
+       }
        lpfc_offline_prep(phba);
        lpfc_offline(phba);
        lpfc_sli_brdrestart(phba);
-       if (lpfc_online(phba) == 0)             /* Initialize the HBA */
-               mod_timer(&phba->fc_estabtmo, jiffies + HZ * 60);
+       lpfc_online(phba);
        lpfc_unblock_mgmt_io(phba);
        return;
 }
@@ -2101,15 +2674,43 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
        uint32_t status, evtctr;
        uint32_t ha_copy;
        int i;
+       unsigned long timeout;
        unsigned long drvr_flag = 0;
        volatile uint32_t word0, ldata;
        void __iomem *to_slim;
+       int processing_queue = 0;
+
+       spin_lock_irqsave(&phba->hbalock, drvr_flag);
+       if (!pmbox) {
+               /* processing mbox queue from intr_handler */
+               processing_queue = 1;
+               phba->sli.sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
+               pmbox = lpfc_mbox_get(phba);
+               if (!pmbox) {
+                       spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
+                       return MBX_SUCCESS;
+               }
+       }
+
+       if (pmbox->mbox_cmpl && pmbox->mbox_cmpl != lpfc_sli_def_mbox_cmpl &&
+               pmbox->mbox_cmpl != lpfc_sli_wake_mbox_wait) {
+               if(!pmbox->vport) {
+                       spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
+                       lpfc_printf_log(phba, KERN_ERR,
+                                       LOG_MBOX | LOG_VPORT,
+                                       "1806 Mbox x%x failed. No vport\n",
+                                       pmbox->mb.mbxCommand);
+                       dump_stack();
+                       goto out_not_finished;
+               }
+       }
 
        /* If the PCI channel is in offline state, do not post mbox. */
-       if (unlikely(pci_channel_offline(phba->pcidev)))
-               return MBX_NOT_FINISHED;
+       if (unlikely(pci_channel_offline(phba->pcidev))) {
+               spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
+               goto out_not_finished;
+       }
 
-       spin_lock_irqsave(&phba->hbalock, drvr_flag);
        psli = &phba->sli;
 
        mb = &pmbox->mb;
@@ -2119,15 +2720,15 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
 
                /* Mbox command <mbxCommand> cannot issue */
-               LOG_MBOX_CANNOT_ISSUE_DATA( phba, mb, psli, flag)
-               return MBX_NOT_FINISHED;
+               LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
+               goto out_not_finished;
        }
 
        if (mb->mbxCommand != MBX_KILL_BOARD && flag & MBX_NOWAIT &&
            !(readl(phba->HCregaddr) & HC_MBINT_ENA)) {
                spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
-               LOG_MBOX_CANNOT_ISSUE_DATA( phba, mb, psli, flag)
-               return MBX_NOT_FINISHED;
+               LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
+               goto out_not_finished;
        }
 
        if (psli->sli_flag & LPFC_SLI_MBOX_ACTIVE) {
@@ -2140,30 +2741,15 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                        spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
 
                        /* Mbox command <mbxCommand> cannot issue */
-                       LOG_MBOX_CANNOT_ISSUE_DATA(phba, mb, psli, flag);
-                       return MBX_NOT_FINISHED;
+                       LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
+                       goto out_not_finished;
                }
 
                if (!(psli->sli_flag & LPFC_SLI2_ACTIVE)) {
                        spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
                        /* Mbox command <mbxCommand> cannot issue */
-                       LOG_MBOX_CANNOT_ISSUE_DATA(phba, mb, psli, flag);
-                       return MBX_NOT_FINISHED;
-               }
-
-               /* Handle STOP IOCB processing flag. This is only meaningful
-                * if we are not polling for mbox completion.
-                */
-               if (flag & MBX_STOP_IOCB) {
-                       flag &= ~MBX_STOP_IOCB;
-                       /* Now flag each ring */
-                       for (i = 0; i < psli->num_rings; i++) {
-                               /* If the ring is active, flag it */
-                               if (psli->ring[i].cmdringaddr) {
-                                       psli->ring[i].flag |=
-                                           LPFC_STOP_IOCB_MBX;
-                               }
-                       }
+                       LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
+                       goto out_not_finished;
                }
 
                /* Another mailbox command is still being processed, queue this
@@ -2172,37 +2758,32 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                lpfc_mbox_put(phba, pmbox);
 
                /* Mbox cmd issue - BUSY */
-               lpfc_printf_log(phba,
-                       KERN_INFO,
-                       LOG_MBOX | LOG_SLI,
-                       "%d:0308 Mbox cmd issue - BUSY Data: x%x x%x x%x x%x\n",
-                       phba->brd_no,
-                       mb->mbxCommand,
-                       phba->pport->port_state,
-                       psli->sli_flag,
-                       flag);
+               lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
+                               "(%d):0308 Mbox cmd issue - BUSY Data: "
+                               "x%x x%x x%x x%x\n",
+                               pmbox->vport ? pmbox->vport->vpi : 0xffffff,
+                               mb->mbxCommand, phba->pport->port_state,
+                               psli->sli_flag, flag);
 
                psli->slistat.mbox_busy++;
                spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
 
-               return MBX_BUSY;
-       }
-
-       /* Handle STOP IOCB processing flag. This is only meaningful
-        * if we are not polling for mbox completion.
-        */
-       if (flag & MBX_STOP_IOCB) {
-               flag &= ~MBX_STOP_IOCB;
-               if (flag == MBX_NOWAIT) {
-                       /* Now flag each ring */
-                       for (i = 0; i < psli->num_rings; i++) {
-                               /* If the ring is active, flag it */
-                               if (psli->ring[i].cmdringaddr) {
-                                       psli->ring[i].flag |=
-                                           LPFC_STOP_IOCB_MBX;
-                               }
-                       }
+               if (pmbox->vport) {
+                       lpfc_debugfs_disc_trc(pmbox->vport,
+                               LPFC_DISC_TRC_MBOX_VPORT,
+                               "MBOX Bsy vport:  cmd:x%x mb:x%x x%x",
+                               (uint32_t)mb->mbxCommand,
+                               mb->un.varWords[0], mb->un.varWords[1]);
                }
+               else {
+                       lpfc_debugfs_disc_trc(phba->pport,
+                               LPFC_DISC_TRC_MBOX,
+                               "MBOX Bsy:        cmd:x%x mb:x%x x%x",
+                               (uint32_t)mb->mbxCommand,
+                               mb->un.varWords[0], mb->un.varWords[1]);
+               }
+
+               return MBX_BUSY;
        }
 
        psli->sli_flag |= LPFC_SLI_MBOX_ACTIVE;
@@ -2214,8 +2795,8 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                        psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
                        spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
                        /* Mbox command <mbxCommand> cannot issue */
-                       LOG_MBOX_CANNOT_ISSUE_DATA( phba, mb, psli, flag);
-                       return MBX_NOT_FINISHED;
+                       LOG_MBOX_CANNOT_ISSUE_DATA(phba, pmbox, psli, flag);
+                       goto out_not_finished;
                }
                /* timeout active mbox command */
                mod_timer(&psli->mbox_tmo, (jiffies +
@@ -2223,15 +2804,29 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
        }
 
        /* Mailbox cmd <cmd> issue */
-       lpfc_printf_log(phba,
-               KERN_INFO,
-               LOG_MBOX | LOG_SLI,
-               "%d:0309 Mailbox cmd x%x issue Data: x%x x%x x%x\n",
-               phba->brd_no,
-               mb->mbxCommand,
-               phba->pport->port_state,
-               psli->sli_flag,
-                       flag);
+       lpfc_printf_log(phba, KERN_INFO, LOG_MBOX | LOG_SLI,
+                       "(%d):0309 Mailbox cmd x%x issue Data: x%x x%x "
+                       "x%x\n",
+                       pmbox->vport ? pmbox->vport->vpi : 0,
+                       mb->mbxCommand, phba->pport->port_state,
+                       psli->sli_flag, flag);
+
+       if (mb->mbxCommand != MBX_HEARTBEAT) {
+               if (pmbox->vport) {
+                       lpfc_debugfs_disc_trc(pmbox->vport,
+                               LPFC_DISC_TRC_MBOX_VPORT,
+                               "MBOX Send vport: cmd:x%x mb:x%x x%x",
+                               (uint32_t)mb->mbxCommand,
+                               mb->un.varWords[0], mb->un.varWords[1]);
+               }
+               else {
+                       lpfc_debugfs_disc_trc(phba->pport,
+                               LPFC_DISC_TRC_MBOX,
+                               "MBOX Send:       cmd:x%x mb:x%x x%x",
+                               (uint32_t)mb->mbxCommand,
+                               mb->un.varWords[0], mb->un.varWords[1]);
+               }
+       }
 
        psli->slistat.mbox_cmd++;
        evtctr = psli->slistat.mbox_event;
@@ -2246,7 +2841,7 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                if (mb->mbxCommand == MBX_CONFIG_PORT) {
                        /* copy command data into host mbox for cmpl */
                        lpfc_sli_pcimem_bcopy(mb, &phba->slim2p->mbx,
-                                       MAILBOX_CMD_SIZE);
+                                             MAILBOX_CMD_SIZE);
                }
 
                /* First copy mbox command data to HBA SLIM, skip past first
@@ -2268,18 +2863,24 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
        }
 
        wmb();
-       /* interrupt board to doit right away */
-       writel(CA_MBATT, phba->CAregaddr);
-       readl(phba->CAregaddr); /* flush */
 
        switch (flag) {
        case MBX_NOWAIT:
-               /* Don't wait for it to finish, just return */
+               /* Set up reference to mailbox command */
                psli->mbox_active = pmbox;
+               /* Interrupt board to do it */
+               writel(CA_MBATT, phba->CAregaddr);
+               readl(phba->CAregaddr); /* flush */
+               /* Don't wait for it to finish, just return */
                break;
 
        case MBX_POLL:
+               /* Set up null reference to mailbox command */
                psli->mbox_active = NULL;
+               /* Interrupt board to do it */
+               writel(CA_MBATT, phba->CAregaddr);
+               readl(phba->CAregaddr); /* flush */
+
                if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                        /* First read mbox status word */
                        word0 = *((volatile uint32_t *)&phba->slim2p->mbx);
@@ -2291,19 +2892,19 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
 
                /* Read the HBA Host Attention Register */
                ha_copy = readl(phba->HAregaddr);
-
-               i = lpfc_mbox_tmo_val(phba, mb->mbxCommand);
-               i *= 1000; /* Convert to ms */
-
+               timeout = msecs_to_jiffies(lpfc_mbox_tmo_val(phba,
+                                                            mb->mbxCommand) *
+                                          1000) + jiffies;
+               i = 0;
                /* Wait for command to complete */
                while (((word0 & OWN_CHIP) == OWN_CHIP) ||
                       (!(ha_copy & HA_MBATT) &&
                        (phba->link_state > LPFC_WARM_START))) {
-                       if (i-- <= 0) {
+                       if (time_after(jiffies, timeout)) {
                                psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
                                spin_unlock_irqrestore(&phba->hbalock,
                                                       drvr_flag);
-                               return MBX_NOT_FINISHED;
+                               goto out_not_finished;
                        }
 
                        /* Check if we took a mbox interrupt while we were
@@ -2312,12 +2913,12 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                            && (evtctr != psli->slistat.mbox_event))
                                break;
 
-                       spin_unlock_irqrestore(&phba->hbalock,
-                                              drvr_flag);
-
-                       msleep(1);
-
-                       spin_lock_irqsave(&phba->hbalock, drvr_flag);
+                       if (i++ > 10) {
+                               spin_unlock_irqrestore(&phba->hbalock,
+                                                      drvr_flag);
+                               msleep(1);
+                               spin_lock_irqsave(&phba->hbalock, drvr_flag);
+                       }
 
                        if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                                /* First copy command data */
@@ -2348,14 +2949,14 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
                if (psli->sli_flag & LPFC_SLI2_ACTIVE) {
                        /* copy results back to user */
                        lpfc_sli_pcimem_bcopy(&phba->slim2p->mbx, mb,
-                                       MAILBOX_CMD_SIZE);
+                                             MAILBOX_CMD_SIZE);
                } else {
                        /* First copy command data */
                        lpfc_memcpy_from_slim(mb, phba->MBslimaddr,
                                                        MAILBOX_CMD_SIZE);
                        if ((mb->mbxCommand == MBX_DUMP_MEMORY) &&
                                pmbox->context2) {
-                               lpfc_memcpy_from_slim((void *) pmbox->context2,
+                               lpfc_memcpy_from_slim((void *)pmbox->context2,
                                      phba->MBslimaddr + DMP_RSP_OFFSET,
                                                      mb->un.varDmp.word_cnt);
                        }
@@ -2370,20 +2971,25 @@ lpfc_sli_issue_mbox(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmbox, uint32_t flag)
 
        spin_unlock_irqrestore(&phba->hbalock, drvr_flag);
        return status;
+
+out_not_finished:
+       if (processing_queue) {
+               pmbox->mb.mbxStatus = MBX_NOT_FINISHED;
+               lpfc_mbox_cmpl_put(phba, pmbox);
+       }
+       return MBX_NOT_FINISHED;
 }
 
-static int
-lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+/*
+ * Caller needs to hold lock.
+ */
+static void
+__lpfc_sli_ringtx_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                    struct lpfc_iocbq *piocb)
 {
-       unsigned long iflags;
-
        /* Insert the caller's iocb in the txq tail for later processing. */
-       spin_lock_irqsave(&phba->hbalock, iflags);
        list_add_tail(&piocb->list, &pring->txq);
        pring->txq_cnt++;
-       spin_unlock_irqrestore(&phba->hbalock, iflags);
-       return 0;
 }
 
 static struct lpfc_iocbq *
@@ -2401,14 +3007,28 @@ lpfc_sli_next_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return nextiocb;
 }
 
-int
-lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+/*
+ * Lockless version of lpfc_sli_issue_iocb.
+ */
+static int
+__lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                    struct lpfc_iocbq *piocb, uint32_t flag)
 {
        struct lpfc_iocbq *nextiocb;
-       unsigned long iflags;
        IOCB_t *iocb;
 
+       if (piocb->iocb_cmpl && (!piocb->vport) &&
+          (piocb->iocb.ulpCommand != CMD_ABORT_XRI_CN) &&
+          (piocb->iocb.ulpCommand != CMD_CLOSE_XRI_CN)) {
+               lpfc_printf_log(phba, KERN_ERR,
+                               LOG_SLI | LOG_VPORT,
+                               "1807 IOCB x%x failed. No vport\n",
+                               piocb->iocb.ulpCommand);
+               dump_stack();
+               return IOCB_ERROR;
+       }
+
+
        /* If the PCI channel is in offline state, do not post iocbs. */
        if (unlikely(pci_channel_offline(phba->pcidev)))
                return IOCB_ERROR;
@@ -2421,9 +3041,9 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
        /*
         * Check to see if we are blocking IOCB processing because of a
-        * outstanding mbox command.
+        * outstanding event.
         */
-       if (unlikely(pring->flag & LPFC_STOP_IOCB_MBX))
+       if (unlikely(pring->flag & LPFC_STOP_IOCB_EVENT))
                goto iocb_busy;
 
        if (unlikely(phba->link_state == LPFC_LINK_DOWN)) {
@@ -2454,10 +3074,10 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
         * attention events.
         */
        } else if (unlikely(pring->ringno == phba->sli.fcp_ring &&
-                  !(phba->sli.sli_flag & LPFC_PROCESS_LA)))
+                           !(phba->sli.sli_flag & LPFC_PROCESS_LA))) {
                goto iocb_busy;
+       }
 
-       spin_lock_irqsave(&phba->hbalock, iflags);
        while ((iocb = lpfc_sli_next_iocb_slot(phba, pring)) &&
               (nextiocb = lpfc_sli_next_iocb(phba, pring, &piocb)))
                lpfc_sli_submit_iocb(phba, pring, iocb, nextiocb);
@@ -2466,7 +3086,6 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                lpfc_sli_update_ring(phba, pring);
        else
                lpfc_sli_update_full_ring(phba, pring);
-       spin_unlock_irqrestore(&phba->hbalock, iflags);
 
        if (!piocb)
                return IOCB_SUCCESS;
@@ -2474,20 +3093,33 @@ lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        goto out_busy;
 
  iocb_busy:
-       spin_lock_irqsave(&phba->hbalock, iflags);
        pring->stats.iocb_cmd_delay++;
-       spin_unlock_irqrestore(&phba->hbalock, iflags);
 
  out_busy:
 
        if (!(flag & SLI_IOCB_RET_IOCB)) {
-               lpfc_sli_ringtx_put(phba, pring, piocb);
+               __lpfc_sli_ringtx_put(phba, pring, piocb);
                return IOCB_SUCCESS;
        }
 
        return IOCB_BUSY;
 }
 
+
+int
+lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+                   struct lpfc_iocbq *piocb, uint32_t flag)
+{
+       unsigned long iflags;
+       int rc;
+
+       spin_lock_irqsave(&phba->hbalock, iflags);
+       rc = __lpfc_sli_issue_iocb(phba, pring, piocb, flag);
+       spin_unlock_irqrestore(&phba->hbalock, iflags);
+
+       return rc;
+}
+
 static int
 lpfc_extra_ring_setup( struct lpfc_hba *phba)
 {
@@ -2523,10 +3155,65 @@ lpfc_extra_ring_setup( struct lpfc_hba *phba)
        return 0;
 }
 
+static void
+lpfc_sli_async_event_handler(struct lpfc_hba * phba,
+       struct lpfc_sli_ring * pring, struct lpfc_iocbq * iocbq)
+{
+       IOCB_t *icmd;
+       uint16_t evt_code;
+       uint16_t temp;
+       struct temp_event temp_event_data;
+       struct Scsi_Host *shost;
+
+       icmd = &iocbq->iocb;
+       evt_code = icmd->un.asyncstat.evt_code;
+       temp = icmd->ulpContext;
+
+       if ((evt_code != ASYNC_TEMP_WARN) &&
+               (evt_code != ASYNC_TEMP_SAFE)) {
+               lpfc_printf_log(phba,
+                       KERN_ERR,
+                       LOG_SLI,
+                       "0346 Ring %d handler: unexpected ASYNC_STATUS"
+                       " evt_code 0x%x\n",
+                       pring->ringno,
+                       icmd->un.asyncstat.evt_code);
+               return;
+       }
+       temp_event_data.data = (uint32_t)temp;
+       temp_event_data.event_type = FC_REG_TEMPERATURE_EVENT;
+       if (evt_code == ASYNC_TEMP_WARN) {
+               temp_event_data.event_code = LPFC_THRESHOLD_TEMP;
+               lpfc_printf_log(phba,
+                               KERN_ERR,
+                               LOG_TEMP,
+                               "0347 Adapter is very hot, please take "
+                               "corrective action. temperature : %d Celsius\n",
+                               temp);
+       }
+       if (evt_code == ASYNC_TEMP_SAFE) {
+               temp_event_data.event_code = LPFC_NORMAL_TEMP;
+               lpfc_printf_log(phba,
+                               KERN_ERR,
+                               LOG_TEMP,
+                               "0340 Adapter temperature is OK now. "
+                               "temperature : %d Celsius\n",
+                               temp);
+       }
+
+       /* Send temperature change event to applications */
+       shost = lpfc_shost_from_vport(phba->pport);
+       fc_host_post_vendor_event(shost, fc_get_event_number(),
+               sizeof(temp_event_data), (char *) &temp_event_data,
+               SCSI_NL_VID_TYPE_PCI | PCI_VENDOR_ID_EMULEX);
+
+}
+
+
 int
 lpfc_sli_setup(struct lpfc_hba *phba)
 {
-       int i, totiocb = 0;
+       int i, totiocbsize = 0;
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring *pring;
 
@@ -2551,6 +3238,12 @@ lpfc_sli_setup(struct lpfc_hba *phba)
                        pring->numRiocb += SLI2_IOCB_RSP_R1XTRA_ENTRIES;
                        pring->numCiocb += SLI2_IOCB_CMD_R3XTRA_ENTRIES;
                        pring->numRiocb += SLI2_IOCB_RSP_R3XTRA_ENTRIES;
+                       pring->sizeCiocb = (phba->sli_rev == 3) ?
+                                                       SLI3_IOCB_CMD_SIZE :
+                                                       SLI2_IOCB_CMD_SIZE;
+                       pring->sizeRiocb = (phba->sli_rev == 3) ?
+                                                       SLI3_IOCB_RSP_SIZE :
+                                                       SLI2_IOCB_RSP_SIZE;
                        pring->iotag_ctr = 0;
                        pring->iotag_max =
                            (phba->cfg_hba_queue_depth * 2);
@@ -2561,6 +3254,12 @@ lpfc_sli_setup(struct lpfc_hba *phba)
                        /* numCiocb and numRiocb are used in config_port */
                        pring->numCiocb = SLI2_IOCB_CMD_R1_ENTRIES;
                        pring->numRiocb = SLI2_IOCB_RSP_R1_ENTRIES;
+                       pring->sizeCiocb = (phba->sli_rev == 3) ?
+                                                       SLI3_IOCB_CMD_SIZE :
+                                                       SLI2_IOCB_CMD_SIZE;
+                       pring->sizeRiocb = (phba->sli_rev == 3) ?
+                                                       SLI3_IOCB_RSP_SIZE :
+                                                       SLI2_IOCB_RSP_SIZE;
                        pring->iotag_max = phba->cfg_hba_queue_depth;
                        pring->num_mask = 0;
                        break;
@@ -2568,9 +3267,17 @@ lpfc_sli_setup(struct lpfc_hba *phba)
                        /* numCiocb and numRiocb are used in config_port */
                        pring->numCiocb = SLI2_IOCB_CMD_R2_ENTRIES;
                        pring->numRiocb = SLI2_IOCB_RSP_R2_ENTRIES;
+                       pring->sizeCiocb = (phba->sli_rev == 3) ?
+                                                       SLI3_IOCB_CMD_SIZE :
+                                                       SLI2_IOCB_CMD_SIZE;
+                       pring->sizeRiocb = (phba->sli_rev == 3) ?
+                                                       SLI3_IOCB_RSP_SIZE :
+                                                       SLI2_IOCB_RSP_SIZE;
                        pring->fast_iotag = 0;
                        pring->iotag_ctr = 0;
                        pring->iotag_max = 4096;
+                       pring->lpfc_sli_rcv_async_status =
+                               lpfc_sli_async_event_handler;
                        pring->num_mask = 4;
                        pring->prt[0].profile = 0;      /* Mask 0 */
                        pring->prt[0].rctl = FC_ELS_REQ;
@@ -2598,14 +3305,15 @@ lpfc_sli_setup(struct lpfc_hba *phba)
                            lpfc_ct_unsol_event;
                        break;
                }
-               totiocb += (pring->numCiocb + pring->numRiocb);
+               totiocbsize += (pring->numCiocb * pring->sizeCiocb) +
+                               (pring->numRiocb * pring->sizeRiocb);
        }
-       if (totiocb > MAX_SLI2_IOCB) {
+       if (totiocbsize > MAX_SLIM_IOCB_SIZE) {
                /* Too many cmd / rsp ring entries in SLI2 SLIM */
-               lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                               "%d:0462 Too many cmd / rsp ring entries in "
-                               "SLI2 SLIM Data: x%x x%x\n",
-                               phba->brd_no, totiocb, MAX_SLI2_IOCB);
+               printk(KERN_ERR "%d:0462 Too many cmd / rsp ring entries in "
+                      "SLI2 SLIM Data: x%x x%lx\n",
+                      phba->brd_no, totiocbsize,
+                      (unsigned long) MAX_SLIM_IOCB_SIZE);
        }
        if (phba->cfg_multi_ring_support == 2)
                lpfc_extra_ring_setup(phba);
@@ -2623,6 +3331,7 @@ lpfc_sli_queue_setup(struct lpfc_hba *phba)
        psli = &phba->sli;
        spin_lock_irq(&phba->hbalock);
        INIT_LIST_HEAD(&psli->mboxq);
+       INIT_LIST_HEAD(&psli->mboxq_cmpl);
        /* Initialize list headers for txq and txcmplq as double linked lists */
        for (i = 0; i < psli->num_rings; i++) {
                pring = &psli->ring[i];
@@ -2633,18 +3342,82 @@ lpfc_sli_queue_setup(struct lpfc_hba *phba)
                INIT_LIST_HEAD(&pring->txq);
                INIT_LIST_HEAD(&pring->txcmplq);
                INIT_LIST_HEAD(&pring->iocb_continueq);
+               INIT_LIST_HEAD(&pring->iocb_continue_saveq);
                INIT_LIST_HEAD(&pring->postbufq);
        }
        spin_unlock_irq(&phba->hbalock);
        return 1;
 }
 
+int
+lpfc_sli_host_down(struct lpfc_vport *vport)
+{
+       LIST_HEAD(completions);
+       struct lpfc_hba *phba = vport->phba;
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring *pring;
+       struct lpfc_iocbq *iocb, *next_iocb;
+       int i;
+       unsigned long flags = 0;
+       uint16_t prev_pring_flag;
+
+       lpfc_cleanup_discovery_resources(vport);
+
+       spin_lock_irqsave(&phba->hbalock, flags);
+       for (i = 0; i < psli->num_rings; i++) {
+               pring = &psli->ring[i];
+               prev_pring_flag = pring->flag;
+               /* Only slow rings */
+               if (pring->ringno == LPFC_ELS_RING) {
+                       pring->flag |= LPFC_DEFERRED_RING_EVENT;
+                       /* Set the lpfc data pending flag */
+                       set_bit(LPFC_DATA_READY, &phba->data_flags);
+               }
+               /*
+                * Error everything on the txq since these iocbs have not been
+                * given to the FW yet.
+                */
+               list_for_each_entry_safe(iocb, next_iocb, &pring->txq, list) {
+                       if (iocb->vport != vport)
+                               continue;
+                       list_move_tail(&iocb->list, &completions);
+                       pring->txq_cnt--;
+               }
+
+               /* Next issue ABTS for everything on the txcmplq */
+               list_for_each_entry_safe(iocb, next_iocb, &pring->txcmplq,
+                                                                       list) {
+                       if (iocb->vport != vport)
+                               continue;
+                       lpfc_sli_issue_abort_iotag(phba, pring, iocb);
+               }
+
+               pring->flag = prev_pring_flag;
+       }
+
+       spin_unlock_irqrestore(&phba->hbalock, flags);
+
+       while (!list_empty(&completions)) {
+               list_remove_head(&completions, iocb, struct lpfc_iocbq, list);
+
+               if (!iocb->iocb_cmpl)
+                       lpfc_sli_release_iocbq(phba, iocb);
+               else {
+                       iocb->iocb.ulpStatus = IOSTAT_LOCAL_REJECT;
+                       iocb->iocb.un.ulpWord[4] = IOERR_SLI_DOWN;
+                       (iocb->iocb_cmpl) (phba, iocb, iocb);
+               }
+       }
+       return 1;
+}
+
 int
 lpfc_sli_hba_down(struct lpfc_hba *phba)
 {
        LIST_HEAD(completions);
        struct lpfc_sli *psli = &phba->sli;
        struct lpfc_sli_ring *pring;
+       struct lpfc_dmabuf *buf_ptr;
        LPFC_MBOXQ_t *pmb;
        struct lpfc_iocbq *iocb;
        IOCB_t *cmd = NULL;
@@ -2653,10 +3426,17 @@ lpfc_sli_hba_down(struct lpfc_hba *phba)
 
        lpfc_hba_down_prep(phba);
 
+       lpfc_fabric_abort_hba(phba);
+
        spin_lock_irqsave(&phba->hbalock, flags);
        for (i = 0; i < psli->num_rings; i++) {
                pring = &psli->ring[i];
-               pring->flag |= LPFC_DEFERRED_RING_EVENT;
+               /* Only slow rings */
+               if (pring->ringno == LPFC_ELS_RING) {
+                       pring->flag |= LPFC_DEFERRED_RING_EVENT;
+                       /* Set the lpfc data pending flag */
+                       set_bit(LPFC_DATA_READY, &phba->data_flags);
+               }
 
                /*
                 * Error everything on the txq since these iocbs have not been
@@ -2669,9 +3449,8 @@ lpfc_sli_hba_down(struct lpfc_hba *phba)
        spin_unlock_irqrestore(&phba->hbalock, flags);
 
        while (!list_empty(&completions)) {
-               iocb = list_get_first(&completions, struct lpfc_iocbq, list);
+               list_remove_head(&completions, iocb, struct lpfc_iocbq, list);
                cmd = &iocb->iocb;
-               list_del(&iocb->list);
 
                if (!iocb->iocb_cmpl)
                        lpfc_sli_release_iocbq(phba, iocb);
@@ -2682,32 +3461,43 @@ lpfc_sli_hba_down(struct lpfc_hba *phba)
                }
        }
 
+       spin_lock_irqsave(&phba->hbalock, flags);
+       list_splice_init(&phba->elsbuf, &completions);
+       phba->elsbuf_cnt = 0;
+       phba->elsbuf_prev_cnt = 0;
+       spin_unlock_irqrestore(&phba->hbalock, flags);
+
+       while (!list_empty(&completions)) {
+               list_remove_head(&completions, buf_ptr,
+                       struct lpfc_dmabuf, list);
+               lpfc_mbuf_free(phba, buf_ptr->virt, buf_ptr->phys);
+               kfree(buf_ptr);
+       }
+
        /* Return any active mbox cmds */
        del_timer_sync(&psli->mbox_tmo);
+       spin_lock_irqsave(&phba->hbalock, flags);
 
-       spin_lock_irqsave(&phba->pport->work_port_lock, flags);
+       spin_lock(&phba->pport->work_port_lock);
        phba->pport->work_port_events &= ~WORKER_MBOX_TMO;
-       spin_unlock_irqrestore(&phba->pport->work_port_lock, flags);
+       spin_unlock(&phba->pport->work_port_lock);
 
-       pmb = psli->mbox_active;
-       if (pmb) {
+       /* Return any pending or completed mbox cmds */
+       list_splice_init(&phba->sli.mboxq, &completions);
+       if (psli->mbox_active) {
+               list_add_tail(&psli->mbox_active->list, &completions);
                psli->mbox_active = NULL;
-               pmb->mb.mbxStatus = MBX_NOT_FINISHED;
                psli->sli_flag &= ~LPFC_SLI_MBOX_ACTIVE;
-               if (pmb->mbox_cmpl) {
-                       pmb->mbox_cmpl(phba,pmb);
-               }
        }
+       list_splice_init(&phba->sli.mboxq_cmpl, &completions);
+       spin_unlock_irqrestore(&phba->hbalock, flags);
 
-       /* Return any pending mbox cmds */
-       while ((pmb = lpfc_mbox_get(phba)) != NULL) {
+       while (!list_empty(&completions)) {
+               list_remove_head(&completions, pmb, LPFC_MBOXQ_t, list);
                pmb->mb.mbxStatus = MBX_NOT_FINISHED;
-               if (pmb->mbox_cmpl) {
+               if (pmb->mbox_cmpl)
                        pmb->mbox_cmpl(phba,pmb);
-               }
        }
-       INIT_LIST_HEAD(&psli->mboxq);
-
        return 1;
 }
 
@@ -2741,6 +3531,47 @@ lpfc_sli_ringpostbuf_put(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        return 0;
 }
 
+uint32_t
+lpfc_sli_get_buffer_tag(struct lpfc_hba *phba)
+{
+       spin_lock_irq(&phba->hbalock);
+       phba->buffer_tag_count++;
+       /*
+        * Always set the QUE_BUFTAG_BIT to distiguish between
+        * a tag assigned by HBQ.
+        */
+       phba->buffer_tag_count |= QUE_BUFTAG_BIT;
+       spin_unlock_irq(&phba->hbalock);
+       return phba->buffer_tag_count;
+}
+
+struct lpfc_dmabuf *
+lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
+                       uint32_t tag)
+{
+       struct lpfc_dmabuf *mp, *next_mp;
+       struct list_head *slp = &pring->postbufq;
+
+       /* Search postbufq, from the begining, looking for a match on tag */
+       spin_lock_irq(&phba->hbalock);
+       list_for_each_entry_safe(mp, next_mp, &pring->postbufq, list) {
+               if (mp->buffer_tag == tag) {
+                       list_del_init(&mp->list);
+                       pring->postbufq_cnt--;
+                       spin_unlock_irq(&phba->hbalock);
+                       return mp;
+               }
+       }
+
+       spin_unlock_irq(&phba->hbalock);
+       lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
+                       "0410 Cannot find virtual addr for buffer tag on "
+                       "ring %d Data x%lx x%p x%p x%x\n",
+                       pring->ringno, (unsigned long) tag,
+                       slp->next, slp->prev, pring->postbufq_cnt);
+
+       return NULL;
+}
 
 struct lpfc_dmabuf *
 lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
@@ -2762,9 +3593,9 @@ lpfc_sli_ringpostbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
        spin_unlock_irq(&phba->hbalock);
        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                       "%d:0410 Cannot find virtual addr for mapped buf on "
+                       "0410 Cannot find virtual addr for mapped buf on "
                        "ring %d Data x%llx x%p x%p x%x\n",
-                       phba->brd_no, pring->ringno, (unsigned long long) phys,
+                       pring->ringno, (unsigned long long)phys,
                        slp->next, slp->prev, pring->postbufq_cnt);
        return NULL;
 }
@@ -2775,7 +3606,7 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 {
        IOCB_t *irsp = &rspiocb->iocb;
        uint16_t abort_iotag, abort_context;
-       struct lpfc_iocbq *abort_iocb, *rsp_ab_iocb;
+       struct lpfc_iocbq *abort_iocb;
        struct lpfc_sli_ring *pring = &phba->sli.ring[LPFC_ELS_RING];
 
        abort_iocb = NULL;
@@ -2788,12 +3619,22 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                if (abort_iotag != 0 && abort_iotag <= phba->sli.last_iotag)
                        abort_iocb = phba->sli.iocbq_lookup[abort_iotag];
 
-               lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                               "%d:0327 Cannot abort els iocb %p"
-                               " with tag %x context %x\n",
-                               phba->brd_no, abort_iocb,
-                               abort_iotag, abort_context);
+               lpfc_printf_log(phba, KERN_INFO, LOG_ELS | LOG_SLI,
+                               "0327 Cannot abort els iocb %p "
+                               "with tag %x context %x, abort status %x, "
+                               "abort code %x\n",
+                               abort_iocb, abort_iotag, abort_context,
+                               irsp->ulpStatus, irsp->un.ulpWord[4]);
 
+               /*
+                *  If the iocb is not found in Firmware queue the iocb
+                *  might have completed already. Do not free it again.
+                */
+               if (irsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
+                       spin_unlock_irq(&phba->hbalock);
+                       lpfc_sli_release_iocbq(phba, cmdiocb);
+                       return;
+               }
                /*
                 * make sure we have the right iocbq before taking it
                 * off the txcmplq and try to call completion routine.
@@ -2803,23 +3644,20 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
                    (abort_iocb->iocb_flag & LPFC_DRIVER_ABORTED) == 0)
                        spin_unlock_irq(&phba->hbalock);
                else {
-                       list_del(&abort_iocb->list);
+                       list_del_init(&abort_iocb->list);
                        pring->txcmplq_cnt--;
                        spin_unlock_irq(&phba->hbalock);
 
-                       rsp_ab_iocb = lpfc_sli_get_iocbq(phba);
-                       if (rsp_ab_iocb == NULL)
-                               lpfc_sli_release_iocbq(phba, abort_iocb);
-                       else {
-                               abort_iocb->iocb_flag &= ~LPFC_DRIVER_ABORTED;
-                               rsp_ab_iocb->iocb.ulpStatus =
-                                       IOSTAT_LOCAL_REJECT;
-                               rsp_ab_iocb->iocb.un.ulpWord[4] =
-                                       IOERR_SLI_ABORTED;
-                               (abort_iocb->iocb_cmpl)(phba, abort_iocb,
-                                                       rsp_ab_iocb);
-                               lpfc_sli_release_iocbq(phba, rsp_ab_iocb);
-                       }
+                       /* Firmware could still be in progress of DMAing
+                        * payload, so don't free data buffer till after
+                        * a hbeat.
+                        */
+                       abort_iocb->iocb_flag |= LPFC_DELAY_MEM_FREE;
+
+                       abort_iocb->iocb_flag &= ~LPFC_DRIVER_ABORTED;
+                       abort_iocb->iocb.ulpStatus = IOSTAT_LOCAL_REJECT;
+                       abort_iocb->iocb.un.ulpWord[4] = IOERR_SLI_ABORTED;
+                       (abort_iocb->iocb_cmpl)(phba, abort_iocb, abort_iocb);
                }
        }
 
@@ -2827,6 +3665,25 @@ lpfc_sli_abort_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
        return;
 }
 
+static void
+lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
+                    struct lpfc_iocbq *rspiocb)
+{
+       IOCB_t *irsp = &rspiocb->iocb;
+
+       /* ELS cmd tag <ulpIoTag> completes */
+       lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
+                       "0133 Ignoring ELS cmd tag x%x completion Data: "
+                       "x%x x%x x%x\n",
+                       irsp->ulpIoTag, irsp->ulpStatus,
+                       irsp->un.ulpWord[4], irsp->ulpTimeout);
+       if (cmdiocb->iocb.ulpCommand == CMD_GEN_REQUEST64_CR)
+               lpfc_ct_free_iocb(phba, cmdiocb);
+       else
+               lpfc_els_free_iocb(phba, cmdiocb);
+       return;
+}
+
 int
 lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                           struct lpfc_iocbq *cmdiocb)
@@ -2837,22 +3694,31 @@ lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        IOCB_t *iabt = NULL;
        int retval = IOCB_ERROR;
 
-       /* There are certain command types we don't want
-        * to abort.
+       /*
+        * There are certain command types we don't want to abort.  And we
+        * don't want to abort commands that are already in the process of
+        * being aborted.
         */
        icmd = &cmdiocb->iocb;
        if (icmd->ulpCommand == CMD_ABORT_XRI_CN ||
-           icmd->ulpCommand == CMD_CLOSE_XRI_CN)
+           icmd->ulpCommand == CMD_CLOSE_XRI_CN ||
+           (cmdiocb->iocb_flag & LPFC_DRIVER_ABORTED) != 0)
                return 0;
 
-       /* If we're unloading, interrupts are disabled so we
-        * need to cleanup the iocb here.
+       /* If we're unloading, don't abort iocb on the ELS ring, but change the
+        * callback so that nothing happens when it finishes.
         */
-       if (vport->load_flag & FC_UNLOADING)
+       if ((vport->load_flag & FC_UNLOADING) &&
+           (pring->ringno == LPFC_ELS_RING)) {
+               if (cmdiocb->iocb_flag & LPFC_IO_FABRIC)
+                       cmdiocb->fabric_iocb_cmpl = lpfc_ignore_els_cmpl;
+               else
+                       cmdiocb->iocb_cmpl = lpfc_ignore_els_cmpl;
                goto abort_iotag_exit;
+       }
 
        /* issue ABTS for this IOCB based on iotag */
-       abtsiocbp = lpfc_sli_get_iocbq(phba);
+       abtsiocbp = __lpfc_sli_get_iocbq(phba);
        if (abtsiocbp == NULL)
                return 0;
 
@@ -2875,12 +3741,12 @@ lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
        abtsiocbp->iocb_cmpl = lpfc_sli_abort_els_cmpl;
 
-       lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                       "%d:0339 Abort xri x%x, original iotag x%x, abort "
-                       "cmd iotag x%x\n",
-                       phba->brd_no, iabt->un.acxri.abortContextTag,
-                       iabt->un.acxri.abortIoTag, abtsiocbp->iotag);
-       retval = lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0);
+       lpfc_printf_vlog(vport, KERN_INFO, LOG_SLI,
+                        "0339 Abort xri x%x, original iotag x%x, "
+                        "abort cmd iotag x%x\n",
+                        iabt->un.acxri.abortContextTag,
+                        iabt->un.acxri.abortIoTag, abtsiocbp->iotag);
+       retval = __lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0);
 
 abort_iotag_exit:
        /*
@@ -2892,35 +3758,34 @@ abort_iotag_exit:
 }
 
 static int
-lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, uint16_t tgt_id,
-                          uint64_t lun_id, uint32_t ctx,
+lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, struct lpfc_vport *vport,
+                          uint16_t tgt_id, uint64_t lun_id,
                           lpfc_ctx_cmd ctx_cmd)
 {
        struct lpfc_scsi_buf *lpfc_cmd;
-       struct scsi_cmnd *cmnd;
        int rc = 1;
 
        if (!(iocbq->iocb_flag &  LPFC_IO_FCP))
                return rc;
 
+       if (iocbq->vport != vport)
+               return rc;
+
        lpfc_cmd = container_of(iocbq, struct lpfc_scsi_buf, cur_iocbq);
-       cmnd = lpfc_cmd->pCmd;
 
-       if (cmnd == NULL)
+       if (lpfc_cmd->pCmd == NULL)
                return rc;
 
        switch (ctx_cmd) {
        case LPFC_CTX_LUN:
-               if ((cmnd->device->id == tgt_id) &&
-                   (cmnd->device->lun == lun_id))
+               if ((lpfc_cmd->rdata->pnode) &&
+                   (lpfc_cmd->rdata->pnode->nlp_sid == tgt_id) &&
+                   (scsilun_to_int(&lpfc_cmd->fcp_cmnd->fcp_lun) == lun_id))
                        rc = 0;
                break;
        case LPFC_CTX_TGT:
-               if (cmnd->device->id == tgt_id)
-                       rc = 0;
-               break;
-       case LPFC_CTX_CTX:
-               if (iocbq->iocb.ulpContext == ctx)
+               if ((lpfc_cmd->rdata->pnode) &&
+                   (lpfc_cmd->rdata->pnode->nlp_sid == tgt_id))
                        rc = 0;
                break;
        case LPFC_CTX_HOST:
@@ -2936,17 +3801,18 @@ lpfc_sli_validate_fcp_iocb(struct lpfc_iocbq *iocbq, uint16_t tgt_id,
 }
 
 int
-lpfc_sli_sum_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
-                 uint16_t tgt_id, uint64_t lun_id, lpfc_ctx_cmd ctx_cmd)
+lpfc_sli_sum_iocb(struct lpfc_vport *vport, uint16_t tgt_id, uint64_t lun_id,
+                 lpfc_ctx_cmd ctx_cmd)
 {
+       struct lpfc_hba *phba = vport->phba;
        struct lpfc_iocbq *iocbq;
        int sum, i;
 
        for (i = 1, sum = 0; i <= phba->sli.last_iotag; i++) {
                iocbq = phba->sli.iocbq_lookup[i];
 
-               if (lpfc_sli_validate_fcp_iocb (iocbq, tgt_id, lun_id,
-                                               0, ctx_cmd) == 0)
+               if (lpfc_sli_validate_fcp_iocb (iocbq, vport, tgt_id, lun_id,
+                                               ctx_cmd) == 0)
                        sum++;
        }
 
@@ -2962,10 +3828,10 @@ lpfc_sli_abort_fcp_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 }
 
 int
-lpfc_sli_abort_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
-                   uint16_t tgt_id, uint64_t lun_id, uint32_t ctx,
-                   lpfc_ctx_cmd abort_cmd)
+lpfc_sli_abort_iocb(struct lpfc_vport *vport, struct lpfc_sli_ring *pring,
+                   uint16_t tgt_id, uint64_t lun_id, lpfc_ctx_cmd abort_cmd)
 {
+       struct lpfc_hba *phba = vport->phba;
        struct lpfc_iocbq *iocbq;
        struct lpfc_iocbq *abtsiocb;
        IOCB_t *cmd = NULL;
@@ -2975,7 +3841,7 @@ lpfc_sli_abort_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
        for (i = 1; i <= phba->sli.last_iotag; i++) {
                iocbq = phba->sli.iocbq_lookup[i];
 
-               if (lpfc_sli_validate_fcp_iocb(iocbq, tgt_id, lun_id, 0,
+               if (lpfc_sli_validate_fcp_iocb(iocbq, vport, tgt_id, lun_id,
                                               abort_cmd) != 0)
                        continue;
 
@@ -3027,9 +3893,9 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba,
                       &rspiocbq->iocb, sizeof(IOCB_t));
 
        pdone_q = cmdiocbq->context_un.wait_queue;
-       spin_unlock_irqrestore(&phba->hbalock, iflags);
        if (pdone_q)
                wake_up(pdone_q);
+       spin_unlock_irqrestore(&phba->hbalock, iflags);
        return;
 }
 
@@ -3039,6 +3905,7 @@ lpfc_sli_wake_iocb_wait(struct lpfc_hba *phba,
  * lpfc_sli_issue_call since the wake routine sets a unique value and by
  * definition this is a wait function.
  */
+
 int
 lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
                         struct lpfc_sli_ring *pring,
@@ -3075,33 +3942,29 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
        retval = lpfc_sli_issue_iocb(phba, pring, piocb, 0);
        if (retval == IOCB_SUCCESS) {
                timeout_req = timeout * HZ;
-               spin_unlock_irq(&phba->hbalock);
                timeleft = wait_event_timeout(done_q,
                                piocb->iocb_flag & LPFC_IO_WAKE,
                                timeout_req);
-               spin_lock_irq(&phba->hbalock);
 
                if (piocb->iocb_flag & LPFC_IO_WAKE) {
                        lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                                       "%d:0331 IOCB wake signaled\n",
-                                       phba->brd_no);
+                                       "0331 IOCB wake signaled\n");
                } else if (timeleft == 0) {
                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                       "%d:0338 IOCB wait timeout error - no "
-                                       "wake response Data x%x\n",
-                                       phba->brd_no, timeout);
+                                       "0338 IOCB wait timeout error - no "
+                                       "wake response Data x%x\n", timeout);
                        retval = IOCB_TIMEDOUT;
                } else {
                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                       "%d:0330 IOCB wake NOT set, "
-                                       "Data x%x x%lx\n", phba->brd_no,
+                                       "0330 IOCB wake NOT set, "
+                                       "Data x%x x%lx\n",
                                        timeout, (timeleft / jiffies));
                        retval = IOCB_TIMEDOUT;
                }
        } else {
                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                               "%d:0332 IOCB wait issue failed, Data x%x\n",
-                               phba->brd_no, retval);
+                               ":0332 IOCB wait issue failed, Data x%x\n",
+                               retval);
                retval = IOCB_ERROR;
        }
 
@@ -3126,12 +3989,13 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
 {
        DECLARE_WAIT_QUEUE_HEAD_ONSTACK(done_q);
        int retval;
+       unsigned long flag;
 
        /* The caller must leave context1 empty. */
-       if (pmboxq->context1 != 0) {
+       if (pmboxq->context1)
                return MBX_NOT_FINISHED;
-       }
 
+       pmboxq->mbox_flag &= ~LPFC_MBX_WAKE;
        /* setup wake call as IOCB callback */
        pmboxq->mbox_cmpl = lpfc_sli_wake_mbox_wait;
        /* setup context field to pass wait_queue pointer to wake function  */
@@ -3145,6 +4009,7 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                                pmboxq->mbox_flag & LPFC_MBX_WAKE,
                                timeout * HZ);
 
+               spin_lock_irqsave(&phba->hbalock, flag);
                pmboxq->context1 = NULL;
                /*
                 * if LPFC_MBX_WAKE flag is set the mailbox is completed
@@ -3152,8 +4017,11 @@ lpfc_sli_issue_mbox_wait(struct lpfc_hba *phba, LPFC_MBOXQ_t *pmboxq,
                 */
                if (pmboxq->mbox_flag & LPFC_MBX_WAKE)
                        retval = MBX_SUCCESS;
-               else
+               else {
                        retval = MBX_TIMEOUT;
+                       pmboxq->mbox_cmpl = lpfc_sli_def_mbox_cmpl;
+               }
+               spin_unlock_irqrestore(&phba->hbalock, flag);
        }
 
        return retval;
@@ -3164,13 +4032,25 @@ lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba)
 {
        struct lpfc_vport *vport = phba->pport;
        int i = 0;
+       uint32_t ha_copy;
 
        while (phba->sli.sli_flag & LPFC_SLI_MBOX_ACTIVE && !vport->stopped) {
                if (i++ > LPFC_MBOX_TMO * 1000)
                        return 1;
 
-               if (lpfc_sli_handle_mb_event(phba) == 0)
-                       i = 0;
+               /*
+                * Call lpfc_sli_handle_mb_event only if a mailbox cmd
+                * did finish. This way we won't get the misleading
+                * "Stray Mailbox Interrupt" message.
+                */
+               spin_lock_irq(&phba->hbalock);
+               ha_copy = phba->work_ha;
+               phba->work_ha &= ~HA_MBATT;
+               spin_unlock_irq(&phba->hbalock);
+
+               if (ha_copy & HA_MBATT)
+                       if (lpfc_sli_handle_mb_event(phba) == 0)
+                               i = 0;
 
                msleep(1);
        }
@@ -3185,9 +4065,15 @@ lpfc_intr_handler(int irq, void *dev_id)
        uint32_t ha_copy;
        uint32_t work_ha_copy;
        unsigned long status;
-       int i;
        uint32_t control;
 
+       MAILBOX_t *mbox, *pmbox;
+       struct lpfc_vport *vport;
+       struct lpfc_nodelist *ndlp;
+       struct lpfc_dmabuf *mp;
+       LPFC_MBOXQ_t *pmb;
+       int rc;
+
        /*
         * Get the driver's phba structure from the dev_id and
         * assume the HBA is not interrupting.
@@ -3253,23 +4139,48 @@ lpfc_intr_handler(int irq, void *dev_id)
                }
 
                if (work_ha_copy & ~(HA_ERATT|HA_MBATT|HA_LATT)) {
-                       for (i = 0; i < phba->sli.num_rings; i++) {
-                               if (work_ha_copy & (HA_RXATT << (4*i))) {
-                                       /*
-                                        * Turn off Slow Rings interrupts
-                                        */
-                                       spin_lock(&phba->hbalock);
-                                       control = readl(phba->HCregaddr);
-                                       control &= ~(HC_R0INT_ENA << i);
+                       /*
+                        * Turn off Slow Rings interrupts, LPFC_ELS_RING is
+                        * the only slow ring.
+                        */
+                       status = (work_ha_copy &
+                               (HA_RXMASK  << (4*LPFC_ELS_RING)));
+                       status >>= (4*LPFC_ELS_RING);
+                       if (status & HA_RXMASK) {
+                               spin_lock(&phba->hbalock);
+                               control = readl(phba->HCregaddr);
+
+                               lpfc_debugfs_slow_ring_trc(phba,
+                               "ISR slow ring:   ctl:x%x stat:x%x isrcnt:x%x",
+                               control, status,
+                               (uint32_t)phba->sli.slistat.sli_intr);
+
+                               if (control & (HC_R0INT_ENA << LPFC_ELS_RING)) {
+                                       lpfc_debugfs_slow_ring_trc(phba,
+                                               "ISR Disable ring:"
+                                               "pwork:x%x hawork:x%x wait:x%x",
+                                               phba->work_ha, work_ha_copy,
+                                               (uint32_t)((unsigned long)
+                                               &phba->work_waitq));
+
+                                       control &=
+                                           ~(HC_R0INT_ENA << LPFC_ELS_RING);
                                        writel(control, phba->HCregaddr);
                                        readl(phba->HCregaddr); /* flush */
-                                       spin_unlock(&phba->hbalock);
                                }
+                               else {
+                                       lpfc_debugfs_slow_ring_trc(phba,
+                                               "ISR slow ring:   pwork:"
+                                               "x%x hawork:x%x wait:x%x",
+                                               phba->work_ha, work_ha_copy,
+                                               (uint32_t)((unsigned long)
+                                               &phba->work_waitq));
+                               }
+                               spin_unlock(&phba->hbalock);
                        }
                }
 
                if (work_ha_copy & HA_ERATT) {
-                       phba->link_state = LPFC_HBA_ERROR;
                        /*
                         * There was a link/board error.  Read the
                         * status register to retrieve the error event
@@ -3287,11 +4198,109 @@ lpfc_intr_handler(int irq, void *dev_id)
                        phba->pport->stopped = 1;
                }
 
+               spin_lock(&phba->hbalock);
+               if ((work_ha_copy & HA_MBATT) &&
+                   (phba->sli.mbox_active)) {
+                       pmb = phba->sli.mbox_active;
+                       pmbox = &pmb->mb;
+                       mbox = &phba->slim2p->mbx;
+                       vport = pmb->vport;
+
+                       /* First check out the status word */
+                       lpfc_sli_pcimem_bcopy(mbox, pmbox, sizeof(uint32_t));
+                       if (pmbox->mbxOwner != OWN_HOST) {
+                               spin_unlock(&phba->hbalock);
+                               /*
+                                * Stray Mailbox Interrupt, mbxCommand <cmd>
+                                * mbxStatus <status>
+                                */
+                               lpfc_printf_log(phba, KERN_ERR, LOG_MBOX |
+                                               LOG_SLI,
+                                               "(%d):0304 Stray Mailbox "
+                                               "Interrupt mbxCommand x%x "
+                                               "mbxStatus x%x\n",
+                                               (vport ? vport->vpi : 0),
+                                               pmbox->mbxCommand,
+                                               pmbox->mbxStatus);
+                               /* clear mailbox attention bit */
+                               work_ha_copy &= ~HA_MBATT;
+                       } else {
+                               phba->sli.mbox_active = NULL;
+                               spin_unlock(&phba->hbalock);
+                               phba->last_completion_time = jiffies;
+                               del_timer(&phba->sli.mbox_tmo);
+                               if (pmb->mbox_cmpl) {
+                                       lpfc_sli_pcimem_bcopy(mbox, pmbox,
+                                                       MAILBOX_CMD_SIZE);
+                               }
+                               if (pmb->mbox_flag & LPFC_MBX_IMED_UNREG) {
+                                       pmb->mbox_flag &= ~LPFC_MBX_IMED_UNREG;
+
+                                       lpfc_debugfs_disc_trc(vport,
+                                               LPFC_DISC_TRC_MBOX_VPORT,
+                                               "MBOX dflt rpi: : "
+                                               "status:x%x rpi:x%x",
+                                               (uint32_t)pmbox->mbxStatus,
+                                               pmbox->un.varWords[0], 0);
+
+                                       if (!pmbox->mbxStatus) {
+                                               mp = (struct lpfc_dmabuf *)
+                                                       (pmb->context1);
+                                               ndlp = (struct lpfc_nodelist *)
+                                                       pmb->context2;
+
+                                               /* Reg_LOGIN of dflt RPI was
+                                                * successful. new lets get
+                                                * rid of the RPI using the
+                                                * same mbox buffer.
+                                                */
+                                               lpfc_unreg_login(phba,
+                                                       vport->vpi,
+                                                       pmbox->un.varWords[0],
+                                                       pmb);
+                                               pmb->mbox_cmpl =
+                                                       lpfc_mbx_cmpl_dflt_rpi;
+                                               pmb->context1 = mp;
+                                               pmb->context2 = ndlp;
+                                               pmb->vport = vport;
+                                               rc = lpfc_sli_issue_mbox(phba,
+                                                               pmb,
+                                                               MBX_NOWAIT);
+                                               if (rc != MBX_BUSY)
+                                                       lpfc_printf_log(phba,
+                                                       KERN_ERR,
+                                                       LOG_MBOX | LOG_SLI,
+                                                       "0306 rc should have"
+                                                       "been MBX_BUSY");
+                                               goto send_current_mbox;
+                                       }
+                               }
+                               spin_lock(&phba->pport->work_port_lock);
+                               phba->pport->work_port_events &=
+                                       ~WORKER_MBOX_TMO;
+                               spin_unlock(&phba->pport->work_port_lock);
+                               lpfc_mbox_cmpl_put(phba, pmb);
+                       }
+               } else
+                       spin_unlock(&phba->hbalock);
+               if ((work_ha_copy & HA_MBATT) &&
+                   (phba->sli.mbox_active == NULL)) {
+send_current_mbox:
+                       /* Process next mailbox command if there is one */
+                       do {
+                               rc = lpfc_sli_issue_mbox(phba, NULL,
+                                                        MBX_NOWAIT);
+                       } while (rc == MBX_NOT_FINISHED);
+                       if (rc != MBX_SUCCESS)
+                               lpfc_printf_log(phba, KERN_ERR, LOG_MBOX |
+                                               LOG_SLI, "0349 rc should be "
+                                               "MBX_SUCCESS");
+               }
+
                spin_lock(&phba->hbalock);
                phba->work_ha |= work_ha_copy;
-               if (phba->work_wait)
-                       wake_up(phba->work_wait);
                spin_unlock(&phba->hbalock);
+               lpfc_worker_wake_up(phba);
        }
 
        ha_copy &= ~(phba->work_ha_mask);
@@ -3303,7 +4312,7 @@ lpfc_intr_handler(int irq, void *dev_id)
         */
        status = (ha_copy & (HA_RXMASK  << (4*LPFC_FCP_RING)));
        status >>= (4*LPFC_FCP_RING);
-       if (status & HA_RXATT)
+       if (status & HA_RXMASK)
                lpfc_sli_handle_fast_ring_event(phba,
                                                &phba->sli.ring[LPFC_FCP_RING],
                                                status);
@@ -3316,7 +4325,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                 */
                status = (ha_copy & (HA_RXMASK  << (4*LPFC_EXTRA_RING)));
                status >>= (4*LPFC_EXTRA_RING);
-               if (status & HA_RXATT) {
+               if (status & HA_RXMASK) {
                        lpfc_sli_handle_fast_ring_event(phba,
                                        &phba->sli.ring[LPFC_EXTRA_RING],
                                        status);