]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - drivers/scsi/lpfc/lpfc_sli.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6
[linux-2.6-omap-h63xx.git] / drivers / scsi / lpfc / lpfc_sli.c
index 77afa2ba6a2b402db55eb9a46f87ea242b7a6577..8ab5babdeebcded91401e0617c82ab2d5931b08e 100644 (file)
@@ -32,6 +32,7 @@
 
 #include "lpfc_hw.h"
 #include "lpfc_sli.h"
+#include "lpfc_nl.h"
 #include "lpfc_disc.h"
 #include "lpfc_scsi.h"
 #include "lpfc.h"
@@ -844,48 +845,58 @@ struct lpfc_hbq_init *lpfc_hbq_defs[] = {
  * @hbqno: HBQ number.
  * @count: Number of HBQ buffers to be posted.
  *
- * This function is called with no lock held to post more
- * hbq buffers to the given HBQ. The function returns 0
- * when successful and returns 1 other wise.
+ * This function is called with no lock held to post more hbq buffers to the
+ * given HBQ. The function returns the number of HBQ buffers successfully
+ * posted.
  **/
 static int
 lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
 {
-       uint32_t i, start, end;
+       uint32_t i, posted = 0;
        unsigned long flags;
        struct hbq_dmabuf *hbq_buffer;
-
+       LIST_HEAD(hbq_buf_list);
        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;
-
+       if ((phba->hbqs[hbqno].buffer_count + count) >
+           lpfc_hbq_defs[hbqno]->entry_count)
+               count = lpfc_hbq_defs[hbqno]->entry_count -
+                                       phba->hbqs[hbqno].buffer_count;
+       if (!count)
+               return 0;
+       /* Allocate HBQ entries */
+       for (i = 0; i < count; i++) {
+               hbq_buffer = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
+               if (!hbq_buffer)
+                       break;
+               list_add_tail(&hbq_buffer->dbuf.list, &hbq_buf_list);
+       }
        /* 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))
+               goto err;
+       while (!list_empty(&hbq_buf_list)) {
+               list_remove_head(&hbq_buf_list, hbq_buffer, struct hbq_dmabuf,
+                                dbuf.list);
+               hbq_buffer->tag = (phba->hbqs[hbqno].buffer_count |
+                                     (hbqno << 16));
+               if (lpfc_sli_hbq_to_firmware(phba, hbqno, hbq_buffer)) {
                        phba->hbqs[hbqno].buffer_count++;
-               else
+                       posted++;
+               } else
                        (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
        }
-
- out:
        spin_unlock_irqrestore(&phba->hbalock, flags);
-       return 0;
- err:
+       return posted;
+err:
        spin_unlock_irqrestore(&phba->hbalock, flags);
-       return 1;
+       while (!list_empty(&hbq_buf_list)) {
+               list_remove_head(&hbq_buf_list, hbq_buffer, struct hbq_dmabuf,
+                                dbuf.list);
+               (phba->hbqs[hbqno].hbq_free_buffer)(phba, hbq_buffer);
+       }
+       return 0;
 }
 
 /**
@@ -894,8 +905,8 @@ lpfc_sli_hbqbuf_fill_hbqs(struct lpfc_hba *phba, uint32_t hbqno, uint32_t count)
  * @qno: HBQ number.
  *
  * This function posts more buffers to the HBQ. This function
- * is called with no lock held. The function returns 0 when
- * successful and returns 1 otherwise.
+ * is called with no lock held. The function returns the number of HBQ entries
+ * successfully allocated.
  **/
 int
 lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
@@ -911,7 +922,7 @@ lpfc_sli_hbqbuf_add_hbqs(struct lpfc_hba *phba, uint32_t qno)
  *
  * This function is called from SLI initialization code path with
  * no lock held to post initial HBQ buffers to firmware. The
- * function returns 0 when successful and returns 1 otherwise.
+ * function returns the number of HBQ entries successfully allocated.
  **/
 static int
 lpfc_sli_hbqbuf_init_hbqs(struct lpfc_hba *phba, uint32_t qno)
@@ -1040,6 +1051,8 @@ lpfc_sli_chk_mbx_command(uint8_t mbxCommand)
        case MBX_REG_VPI:
        case MBX_UNREG_VPI:
        case MBX_HEARTBEAT:
+       case MBX_PORT_CAPABILITIES:
+       case MBX_PORT_IOV_CONTROL:
                ret = mbxCommand;
                break;
        default:
@@ -1253,7 +1266,9 @@ lpfc_sli_handle_mb_event(struct lpfc_hba *phba)
  * This function is called from unsolicited event handler code path to get the
  * HBQ buffer associated with an unsolicited iocb. This function is called with
  * no lock held. It returns the buffer associated with the given tag and posts
- * another buffer to the firmware.
+ * another buffer to the firmware. Note that the new buffer must be allocated
+ * before taking the hbalock and that the hba lock must be held until it is
+ * finished with the hbq entry swap.
  **/
 static struct lpfc_dmabuf *
 lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
@@ -1264,22 +1279,28 @@ lpfc_sli_replace_hbqbuff(struct lpfc_hba *phba, uint32_t tag)
        dma_addr_t phys;        /* mapped address */
        unsigned long flags;
 
+       hbqno = tag >> 16;
+       new_hbq_entry = (phba->hbqs[hbqno].hbq_alloc_buffer)(phba);
        /* Check whether HBQ is still in use */
        spin_lock_irqsave(&phba->hbalock, flags);
        if (!phba->hbq_in_use) {
+               if (new_hbq_entry)
+                       (phba->hbqs[hbqno].hbq_free_buffer)(phba,
+                                                           new_hbq_entry);
                spin_unlock_irqrestore(&phba->hbalock, flags);
                return NULL;
        }
 
        hbq_entry = lpfc_sli_hbqbuf_find(phba, tag);
        if (hbq_entry == NULL) {
+               if (new_hbq_entry)
+                       (phba->hbqs[hbqno].hbq_free_buffer)(phba,
+                                                           new_hbq_entry);
                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);
@@ -1590,6 +1611,17 @@ lpfc_sli_process_sol_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
        if (cmdiocbp) {
                if (cmdiocbp->iocb_cmpl) {
+                       /*
+                        * If an ELS command failed send an event to mgmt
+                        * application.
+                        */
+                       if (saveq->iocb.ulpStatus &&
+                            (pring->ringno == LPFC_ELS_RING) &&
+                            (cmdiocbp->iocb.ulpCommand ==
+                               CMD_ELS_REQUEST64_CR))
+                               lpfc_send_els_failure_event(phba,
+                                       cmdiocbp, saveq);
+
                        /*
                         * Post all ELS completions to the worker thread.
                         * All other are passed to the completion callback.
@@ -1678,6 +1710,36 @@ lpfc_sli_rsp_pointers_error(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        return;
 }
 
+/**
+ * lpfc_poll_eratt: Error attention polling timer timeout handler.
+ * @ptr: Pointer to address of HBA context object.
+ *
+ * This function is invoked by the Error Attention polling timer when the
+ * timer times out. It will check the SLI Error Attention register for
+ * possible attention events. If so, it will post an Error Attention event
+ * and wake up worker thread to process it. Otherwise, it will set up the
+ * Error Attention polling timer for the next poll.
+ **/
+void lpfc_poll_eratt(unsigned long ptr)
+{
+       struct lpfc_hba *phba;
+       uint32_t eratt = 0;
+
+       phba = (struct lpfc_hba *)ptr;
+
+       /* Check chip HA register for error event */
+       eratt = lpfc_sli_check_eratt(phba);
+
+       if (eratt)
+               /* Tell the worker thread there is work to do */
+               lpfc_worker_wake_up(phba);
+       else
+               /* Restart the timer for next eratt poll */
+               mod_timer(&phba->eratt_poll, jiffies +
+                                       HZ * LPFC_ERATT_POLL_INTERVAL);
+       return;
+}
+
 /**
  * lpfc_sli_poll_fcp_ring: Handle FCP ring completion in polling mode.
  * @phba: Pointer to HBA context object.
@@ -1748,8 +1810,8 @@ void lpfc_sli_poll_fcp_ring(struct lpfc_hba *phba)
                                        irsp->un.ulpWord[3],
                                        irsp->un.ulpWord[4],
                                        irsp->un.ulpWord[5],
-                                       *(((uint32_t *) irsp) + 6),
-                                       *(((uint32_t *) irsp) + 7));
+                                       *(uint32_t *)&irsp->un1,
+                                       *((uint32_t *)&irsp->un1 + 1));
                }
 
                switch (type) {
@@ -1935,8 +1997,8 @@ lpfc_sli_handle_fast_ring_event(struct lpfc_hba *phba,
                                        irsp->un.ulpWord[3],
                                        irsp->un.ulpWord[4],
                                        irsp->un.ulpWord[5],
-                                       *(((uint32_t *) irsp) + 6),
-                                       *(((uint32_t *) irsp) + 7));
+                                       *(uint32_t *)&irsp->un1,
+                                       *((uint32_t *)&irsp->un1 + 1));
                }
 
                switch (type) {
@@ -2356,6 +2418,70 @@ lpfc_sli_abort_iocb_ring(struct lpfc_hba *phba, struct lpfc_sli_ring *pring)
        }
 }
 
+/**
+ * lpfc_sli_flush_fcp_rings: flush all iocbs in the fcp ring.
+ * @phba: Pointer to HBA context object.
+ *
+ * This function flushes all iocbs in the fcp ring and frees all the iocb
+ * objects in txq and txcmplq. This function will not issue abort iocbs
+ * for all the iocb commands in txcmplq, they will just be returned with
+ * IOERR_SLI_DOWN. This function is invoked with EEH when device's PCI
+ * slot has been permanently disabled.
+ **/
+void
+lpfc_sli_flush_fcp_rings(struct lpfc_hba *phba)
+{
+       LIST_HEAD(txq);
+       LIST_HEAD(txcmplq);
+       struct lpfc_iocbq *iocb;
+       IOCB_t *cmd = NULL;
+       struct lpfc_sli *psli = &phba->sli;
+       struct lpfc_sli_ring  *pring;
+
+       /* Currently, only one fcp ring */
+       pring = &psli->ring[psli->fcp_ring];
+
+       spin_lock_irq(&phba->hbalock);
+       /* Retrieve everything on txq */
+       list_splice_init(&pring->txq, &txq);
+       pring->txq_cnt = 0;
+
+       /* Retrieve everything on the txcmplq */
+       list_splice_init(&pring->txcmplq, &txcmplq);
+       pring->txcmplq_cnt = 0;
+       spin_unlock_irq(&phba->hbalock);
+
+       /* Flush the txq */
+       while (!list_empty(&txq)) {
+               iocb = list_get_first(&txq, struct lpfc_iocbq, list);
+               cmd = &iocb->iocb;
+               list_del_init(&iocb->list);
+
+               if (!iocb->iocb_cmpl)
+                       lpfc_sli_release_iocbq(phba, iocb);
+               else {
+                       cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                       cmd->un.ulpWord[4] = IOERR_SLI_DOWN;
+                       (iocb->iocb_cmpl) (phba, iocb, iocb);
+               }
+       }
+
+       /* Flush the txcmpq */
+       while (!list_empty(&txcmplq)) {
+               iocb = list_get_first(&txcmplq, struct lpfc_iocbq, list);
+               cmd = &iocb->iocb;
+               list_del_init(&iocb->list);
+
+               if (!iocb->iocb_cmpl)
+                       lpfc_sli_release_iocbq(phba, iocb);
+               else {
+                       cmd->ulpStatus = IOSTAT_LOCAL_REJECT;
+                       cmd->un.ulpWord[4] = IOERR_SLI_DOWN;
+                       (iocb->iocb_cmpl) (phba, iocb, iocb);
+               }
+       }
+}
+
 /**
  * lpfc_sli_brdready: Check for host status bits.
  * @phba: Pointer to HBA context object.
@@ -2921,15 +3047,13 @@ lpfc_sli_hbq_setup(struct lpfc_hba *phba)
        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;
-       }
+       for (hbqno = 0; hbqno < hbq_count; ++hbqno)
+               lpfc_sli_hbqbuf_init_hbqs(phba, hbqno);
        return 0;
 }
 
 /**
- * lpfc_do_config_port: Issue config port mailbox command.
+ * lpfc_sli_config_port: Issue config port mailbox command.
  * @phba: Pointer to HBA context object.
  * @sli_mode: sli mode - 2/3
  *
@@ -2941,8 +3065,8 @@ lpfc_sli_hbq_setup(struct lpfc_hba *phba)
  * The function returns 0 if successful, else returns negative error
  * code.
  **/
-static int
-lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
+int
+lpfc_sli_config_port(struct lpfc_hba *phba, int sli_mode)
 {
        LPFC_MBOXQ_t *pmb;
        uint32_t resetcount = 0, rc = 0, done = 0;
@@ -3034,6 +3158,7 @@ lpfc_do_config_port(struct lpfc_hba *phba, int sli_mode)
                phba->port_gp = phba->mbox->us.s2.port;
                phba->inb_ha_copy = NULL;
                phba->inb_counter = NULL;
+               phba->max_vpi = 0;
        }
 do_prep_failed:
        mempool_free(pmb, phba->mbox_mem_pool);
@@ -3082,13 +3207,14 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
                break;
        }
 
-       rc = lpfc_do_config_port(phba, mode);
+       rc = lpfc_sli_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);
+               rc = lpfc_sli_config_port(phba, 2);
        if (rc)
                goto lpfc_sli_hba_setup_error;
 
@@ -3109,8 +3235,7 @@ lpfc_sli_hba_setup(struct lpfc_hba *phba)
        if (rc)
                goto lpfc_sli_hba_setup_error;
 
-                               /* Init HBQs */
-
+       /* Init HBQs */
        if (phba->sli3_options & LPFC_SLI3_HBQ_ENABLED) {
                rc = lpfc_sli_hbq_setup(phba);
                if (rc)
@@ -3680,6 +3805,16 @@ __lpfc_sli_issue_iocb(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                 * can be issued if the link is not up.
                 */
                switch (piocb->iocb.ulpCommand) {
+               case CMD_GEN_REQUEST64_CR:
+               case CMD_GEN_REQUEST64_CX:
+                       if (!(phba->sli.sli_flag & LPFC_MENLO_MAINT) ||
+                               (piocb->iocb.un.genreq64.w5.hcsw.Rctl !=
+                                       FC_FCP_CMND) ||
+                               (piocb->iocb.un.genreq64.w5.hcsw.Type !=
+                                       MENLO_TRANSPORT_TYPE))
+
+                               goto iocb_busy;
+                       break;
                case CMD_QUE_RING_BUF_CN:
                case CMD_QUE_RING_BUF64_CN:
                        /*
@@ -4335,7 +4470,7 @@ lpfc_sli_ring_taggedbuf_get(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
 
        spin_unlock_irq(&phba->hbalock);
        lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                       "0410 Cannot find virtual addr for buffer tag on "
+                       "0402 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);
@@ -4482,7 +4617,7 @@ lpfc_ignore_els_cmpl(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
        /* ELS cmd tag <ulpIoTag> completes */
        lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                       "0133 Ignoring ELS cmd tag x%x completion Data: "
+                       "0139 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);
@@ -4568,6 +4703,8 @@ lpfc_sli_issue_abort_iotag(struct lpfc_hba *phba, struct lpfc_sli_ring *pring,
                         iabt->un.acxri.abortIoTag, abtsiocbp->iotag);
        retval = __lpfc_sli_issue_iocb(phba, pring, abtsiocbp, 0);
 
+       if (retval)
+               __lpfc_sli_release_iocbq(phba, abtsiocbp);
 abort_iotag_exit:
        /*
         * Caller to this routine should check for IOCB_ERROR
@@ -4899,7 +5036,7 @@ lpfc_sli_issue_iocb_wait(struct lpfc_hba *phba,
                }
        } else {
                lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
-                               ":0332 IOCB wait issue failed, Data x%x\n",
+                               "0332 IOCB wait issue failed, Data x%x\n",
                                retval);
                retval = IOCB_ERROR;
        }
@@ -5033,28 +5170,73 @@ lpfc_sli_flush_mbox_queue(struct lpfc_hba * phba)
 }
 
 /**
- * lpfc_intr_handler: The interrupt handler of lpfc driver.
+ * lpfc_sli_check_eratt: check error attention events
+ * @phba: Pointer to HBA context.
+ *
+ * This function is called form timer soft interrupt context to check HBA's
+ * error attention register bit for error attention events.
+ *
+ * This fucntion returns 1 when there is Error Attention in the Host Attention
+ * Register and returns 0 otherwise.
+ **/
+int
+lpfc_sli_check_eratt(struct lpfc_hba *phba)
+{
+       uint32_t ha_copy;
+
+       /* If somebody is waiting to handle an eratt, don't process it
+        * here. The brdkill function will do this.
+        */
+       if (phba->link_flag & LS_IGNORE_ERATT)
+               return 0;
+
+       /* Check if interrupt handler handles this ERATT */
+       spin_lock_irq(&phba->hbalock);
+       if (phba->hba_flag & HBA_ERATT_HANDLED) {
+               /* Interrupt handler has handled ERATT */
+               spin_unlock_irq(&phba->hbalock);
+               return 0;
+       }
+
+       /* Read chip Host Attention (HA) register */
+       ha_copy = readl(phba->HAregaddr);
+       if (ha_copy & HA_ERATT) {
+               /* Read host status register to retrieve error event */
+               lpfc_sli_read_hs(phba);
+               /* Set the driver HA work bitmap */
+               phba->work_ha |= HA_ERATT;
+               /* Indicate polling handles this ERATT */
+               phba->hba_flag |= HBA_ERATT_HANDLED;
+               spin_unlock_irq(&phba->hbalock);
+               return 1;
+       }
+       spin_unlock_irq(&phba->hbalock);
+       return 0;
+}
+
+/**
+ * lpfc_sp_intr_handler: The slow-path interrupt handler of lpfc driver.
  * @irq: Interrupt number.
  * @dev_id: The device context pointer.
  *
- * This function is called from the PCI layer when there is
- * an event in the HBA which requires driver attention. When
- * the PCI slot is in error recovery or the HBA is undergoing
- * initialization the interrupt handler will not process the
- * interrupt.
- * The error attention, link attention and els ring attention
- * events are handled by the worker thread. The interrupt
- * handler signals the worker thread and returns for these
- * events.
- * The SCSI ring event and mailbox events are handled in the
- * interrupt context.
- * This function is called without any lock held. It gets the
- * hbalock to access and update SLI data structures.
- * This function returns IRQ_HANDLED when interrupt is handled
- * else it returns IRQ_NONE.
+ * This function is directly called from the PCI layer as an interrupt
+ * service routine when the device is enabled with MSI-X multi-message
+ * interrupt mode and there are slow-path events in the HBA. However,
+ * when the device is enabled with either MSI or Pin-IRQ interrupt mode,
+ * this function is called as part of the device-level interrupt handler.
+ * When the PCI slot is in error recovery or the HBA is undergoing
+ * initialization, the interrupt handler will not process the interrupt.
+ * The link attention and ELS ring attention events are handled by the
+ * worker thread. The interrupt handler signals the worker thread and
+ * and returns for these events. This function is called without any
+ * lock held. It gets the hbalock to access and update SLI data
+ * structures.
+ *
+ * This function returns IRQ_HANDLED when interrupt is handled else it
+ * returns IRQ_NONE.
  **/
 irqreturn_t
-lpfc_intr_handler(int irq, void *dev_id)
+lpfc_sp_intr_handler(int irq, void *dev_id)
 {
        struct lpfc_hba  *phba;
        uint32_t ha_copy;
@@ -5073,54 +5255,52 @@ lpfc_intr_handler(int irq, void *dev_id)
         * Get the driver's phba structure from the dev_id and
         * assume the HBA is not interrupting.
         */
-       phba = (struct lpfc_hba *) dev_id;
+       phba = (struct lpfc_hba *)dev_id;
 
        if (unlikely(!phba))
                return IRQ_NONE;
 
-       /* If the pci channel is offline, ignore all the interrupts. */
-       if (unlikely(pci_channel_offline(phba->pcidev)))
-               return IRQ_NONE;
-
-       phba->sli.slistat.sli_intr++;
-
        /*
-        * Call the HBA to see if it is interrupting.  If not, don't claim
-        * the interrupt
+        * Stuff needs to be attented to when this function is invoked as an
+        * individual interrupt handler in MSI-X multi-message interrupt mode
         */
-
-       /* Ignore all interrupts during initialization. */
-       if (unlikely(phba->link_state < LPFC_LINK_DOWN))
-               return IRQ_NONE;
-
-       /*
-        * Read host attention register to determine interrupt source
-        * Clear Attention Sources, except Error Attention (to
-        * preserve status) and Link Attention
-        */
-       spin_lock(&phba->hbalock);
-       if (phba->sli3_options & LPFC_SLI3_INB_ENABLED &&
-           (phba->inb_last_counter != *phba->inb_counter)) {
-               phba->inb_last_counter = *phba->inb_counter;
-               ha_copy = le32_to_cpu(*phba->inb_ha_copy);
-       } else
+       if (phba->intr_type == MSIX) {
+               /* If the pci channel is offline, ignore all the interrupts */
+               if (unlikely(pci_channel_offline(phba->pcidev)))
+                       return IRQ_NONE;
+               /* Update device-level interrupt statistics */
+               phba->sli.slistat.sli_intr++;
+               /* Ignore all interrupts during initialization. */
+               if (unlikely(phba->link_state < LPFC_LINK_DOWN))
+                       return IRQ_NONE;
+               /* Need to read HA REG for slow-path events */
+               spin_lock(&phba->hbalock);
                ha_copy = readl(phba->HAregaddr);
-       if (unlikely(!ha_copy)) {
+               /* If somebody is waiting to handle an eratt don't process it
+                * here. The brdkill function will do this.
+                */
+               if (phba->link_flag & LS_IGNORE_ERATT)
+                       ha_copy &= ~HA_ERATT;
+               /* Check the need for handling ERATT in interrupt handler */
+               if (ha_copy & HA_ERATT) {
+                       if (phba->hba_flag & HBA_ERATT_HANDLED)
+                               /* ERATT polling has handled ERATT */
+                               ha_copy &= ~HA_ERATT;
+                       else
+                               /* Indicate interrupt handler handles ERATT */
+                               phba->hba_flag |= HBA_ERATT_HANDLED;
+               }
+               /* Clear up only attention source related to slow-path */
+               writel((ha_copy & (HA_MBATT | HA_R2_CLR_MSK)),
+                       phba->HAregaddr);
+               readl(phba->HAregaddr); /* flush */
                spin_unlock(&phba->hbalock);
-               return IRQ_NONE;
-       }
-       /* If somebody is waiting to handle an eratt don't process it
-        * here.  The brdkill function will do this.
-        */
-       if (phba->link_flag & LS_IGNORE_ERATT)
-               ha_copy &= ~HA_ERATT;
-       writel((ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr);
-       readl(phba->HAregaddr); /* flush */
-       spin_unlock(&phba->hbalock);
+       } else
+               ha_copy = phba->ha_copy;
 
        work_ha_copy = ha_copy & phba->work_ha_mask;
 
-       if (unlikely(work_ha_copy)) {
+       if (work_ha_copy) {
                if (work_ha_copy & HA_LATT) {
                        if (phba->sli.sli_flag & LPFC_PROCESS_LA) {
                                /*
@@ -5139,7 +5319,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                                work_ha_copy &= ~HA_LATT;
                }
 
-               if (work_ha_copy & ~(HA_ERATT|HA_MBATT|HA_LATT)) {
+               if (work_ha_copy & ~(HA_ERATT | HA_MBATT | HA_LATT)) {
                        /*
                         * Turn off Slow Rings interrupts, LPFC_ELS_RING is
                         * the only slow ring.
@@ -5180,28 +5360,10 @@ lpfc_intr_handler(int irq, void *dev_id)
                                spin_unlock(&phba->hbalock);
                        }
                }
-
-               if (work_ha_copy & HA_ERATT) {
-                       /*
-                        * There was a link/board error.  Read the
-                        * status register to retrieve the error event
-                        * and process it.
-                        */
-                       phba->sli.slistat.err_attn_event++;
-                       /* Save status info */
-                       phba->work_hs = readl(phba->HSregaddr);
-                       phba->work_status[0] = readl(phba->MBslimaddr + 0xa8);
-                       phba->work_status[1] = readl(phba->MBslimaddr + 0xac);
-
-                       /* Clear Chip error bit */
-                       writel(HA_ERATT, phba->HAregaddr);
-                       readl(phba->HAregaddr); /* flush */
-                       phba->pport->stopped = 1;
-               }
-
                spin_lock(&phba->hbalock);
-               if ((work_ha_copy & HA_MBATT) &&
-                   (phba->sli.mbox_active)) {
+               if (work_ha_copy & HA_ERATT)
+                       lpfc_sli_read_hs(phba);
+               if ((work_ha_copy & HA_MBATT) && (phba->sli.mbox_active)) {
                        pmb = phba->sli.mbox_active;
                        pmbox = &pmb->mb;
                        mbox = phba->mbox;
@@ -5271,7 +5433,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                                                        lpfc_printf_log(phba,
                                                        KERN_ERR,
                                                        LOG_MBOX | LOG_SLI,
-                                                       "0306 rc should have"
+                                                       "0350 rc should have"
                                                        "been MBX_BUSY");
                                                goto send_current_mbox;
                                        }
@@ -5284,6 +5446,7 @@ lpfc_intr_handler(int irq, void *dev_id)
                        }
                } else
                        spin_unlock(&phba->hbalock);
+
                if ((work_ha_copy & HA_MBATT) &&
                    (phba->sli.mbox_active == NULL)) {
 send_current_mbox:
@@ -5303,15 +5466,74 @@ send_current_mbox:
                spin_unlock(&phba->hbalock);
                lpfc_worker_wake_up(phba);
        }
+       return IRQ_HANDLED;
 
-       ha_copy &= ~(phba->work_ha_mask);
+} /* lpfc_sp_intr_handler */
+
+/**
+ * lpfc_fp_intr_handler: The fast-path interrupt handler of lpfc driver.
+ * @irq: Interrupt number.
+ * @dev_id: The device context pointer.
+ *
+ * This function is directly called from the PCI layer as an interrupt
+ * service routine when the device is enabled with MSI-X multi-message
+ * interrupt mode and there is a fast-path FCP IOCB ring event in the
+ * HBA. However, when the device is enabled with either MSI or Pin-IRQ
+ * interrupt mode, this function is called as part of the device-level
+ * interrupt handler. When the PCI slot is in error recovery or the HBA
+ * is undergoing initialization, the interrupt handler will not process
+ * the interrupt. The SCSI FCP fast-path ring event are handled in the
+ * intrrupt context. This function is called without any lock held. It
+ * gets the hbalock to access and update SLI data structures.
+ *
+ * This function returns IRQ_HANDLED when interrupt is handled else it
+ * returns IRQ_NONE.
+ **/
+irqreturn_t
+lpfc_fp_intr_handler(int irq, void *dev_id)
+{
+       struct lpfc_hba  *phba;
+       uint32_t ha_copy;
+       unsigned long status;
+
+       /* Get the driver's phba structure from the dev_id and
+        * assume the HBA is not interrupting.
+        */
+       phba = (struct lpfc_hba *) dev_id;
+
+       if (unlikely(!phba))
+               return IRQ_NONE;
 
        /*
-        * Process all events on FCP ring.  Take the optimized path for
-        * FCP IO.  Any other IO is slow path and is handled by
-        * the worker thread.
+        * Stuff needs to be attented to when this function is invoked as an
+        * individual interrupt handler in MSI-X multi-message interrupt mode
         */
-       status = (ha_copy & (HA_RXMASK  << (4*LPFC_FCP_RING)));
+       if (phba->intr_type == MSIX) {
+               /* If pci channel is offline, ignore all the interrupts */
+               if (unlikely(pci_channel_offline(phba->pcidev)))
+                       return IRQ_NONE;
+               /* Update device-level interrupt statistics */
+               phba->sli.slistat.sli_intr++;
+               /* Ignore all interrupts during initialization. */
+               if (unlikely(phba->link_state < LPFC_LINK_DOWN))
+                       return IRQ_NONE;
+               /* Need to read HA REG for FCP ring and other ring events */
+               ha_copy = readl(phba->HAregaddr);
+               /* Clear up only attention source related to fast-path */
+               spin_lock(&phba->hbalock);
+               writel((ha_copy & (HA_R0_CLR_MSK | HA_R1_CLR_MSK)),
+                       phba->HAregaddr);
+               readl(phba->HAregaddr); /* flush */
+               spin_unlock(&phba->hbalock);
+       } else
+               ha_copy = phba->ha_copy;
+
+       /*
+        * Process all events on FCP ring. Take the optimized path for FCP IO.
+        */
+       ha_copy &= ~(phba->work_ha_mask);
+
+       status = (ha_copy & (HA_RXMASK << (4*LPFC_FCP_RING)));
        status >>= (4*LPFC_FCP_RING);
        if (status & HA_RXMASK)
                lpfc_sli_handle_fast_ring_event(phba,
@@ -5320,11 +5542,10 @@ send_current_mbox:
 
        if (phba->cfg_multi_ring_support == 2) {
                /*
-                * Process all events on extra ring.  Take the optimized path
-                * for extra ring IO.  Any other IO is slow path and is handled
-                * by the worker thread.
+                * Process all events on extra ring. Take the optimized path
+                * for extra ring IO.
                 */
-               status = (ha_copy & (HA_RXMASK  << (4*LPFC_EXTRA_RING)));
+               status = (ha_copy & (HA_RXMASK << (4*LPFC_EXTRA_RING)));
                status >>= (4*LPFC_EXTRA_RING);
                if (status & HA_RXMASK) {
                        lpfc_sli_handle_fast_ring_event(phba,
@@ -5333,5 +5554,106 @@ send_current_mbox:
                }
        }
        return IRQ_HANDLED;
+}  /* lpfc_fp_intr_handler */
+
+/**
+ * lpfc_intr_handler: The device-level interrupt handler of lpfc driver.
+ * @irq: Interrupt number.
+ * @dev_id: The device context pointer.
+ *
+ * This function is the device-level interrupt handler called from the PCI
+ * layer when either MSI or Pin-IRQ interrupt mode is enabled and there is
+ * an event in the HBA which requires driver attention. This function
+ * invokes the slow-path interrupt attention handling function and fast-path
+ * interrupt attention handling function in turn to process the relevant
+ * HBA attention events. This function is called without any lock held. It
+ * gets the hbalock to access and update SLI data structures.
+ *
+ * This function returns IRQ_HANDLED when interrupt is handled, else it
+ * returns IRQ_NONE.
+ **/
+irqreturn_t
+lpfc_intr_handler(int irq, void *dev_id)
+{
+       struct lpfc_hba  *phba;
+       irqreturn_t sp_irq_rc, fp_irq_rc;
+       unsigned long status1, status2;
+
+       /*
+        * Get the driver's phba structure from the dev_id and
+        * assume the HBA is not interrupting.
+        */
+       phba = (struct lpfc_hba *) dev_id;
+
+       if (unlikely(!phba))
+               return IRQ_NONE;
+
+       /* If the pci channel is offline, ignore all the interrupts. */
+       if (unlikely(pci_channel_offline(phba->pcidev)))
+               return IRQ_NONE;
+
+       /* Update device level interrupt statistics */
+       phba->sli.slistat.sli_intr++;
+
+       /* Ignore all interrupts during initialization. */
+       if (unlikely(phba->link_state < LPFC_LINK_DOWN))
+               return IRQ_NONE;
+
+       spin_lock(&phba->hbalock);
+       phba->ha_copy = readl(phba->HAregaddr);
+       if (unlikely(!phba->ha_copy)) {
+               spin_unlock(&phba->hbalock);
+               return IRQ_NONE;
+       } else if (phba->ha_copy & HA_ERATT) {
+               if (phba->hba_flag & HBA_ERATT_HANDLED)
+                       /* ERATT polling has handled ERATT */
+                       phba->ha_copy &= ~HA_ERATT;
+               else
+                       /* Indicate interrupt handler handles ERATT */
+                       phba->hba_flag |= HBA_ERATT_HANDLED;
+       }
+
+       /* Clear attention sources except link and error attentions */
+       writel((phba->ha_copy & ~(HA_LATT | HA_ERATT)), phba->HAregaddr);
+       readl(phba->HAregaddr); /* flush */
+       spin_unlock(&phba->hbalock);
+
+       /*
+        * Invokes slow-path host attention interrupt handling as appropriate.
+        */
+
+       /* status of events with mailbox and link attention */
+       status1 = phba->ha_copy & (HA_MBATT | HA_LATT | HA_ERATT);
+
+       /* status of events with ELS ring */
+       status2 = (phba->ha_copy & (HA_RXMASK  << (4*LPFC_ELS_RING)));
+       status2 >>= (4*LPFC_ELS_RING);
+
+       if (status1 || (status2 & HA_RXMASK))
+               sp_irq_rc = lpfc_sp_intr_handler(irq, dev_id);
+       else
+               sp_irq_rc = IRQ_NONE;
+
+       /*
+        * Invoke fast-path host attention interrupt handling as appropriate.
+        */
+
+       /* status of events with FCP ring */
+       status1 = (phba->ha_copy & (HA_RXMASK << (4*LPFC_FCP_RING)));
+       status1 >>= (4*LPFC_FCP_RING);
+
+       /* status of events with extra ring */
+       if (phba->cfg_multi_ring_support == 2) {
+               status2 = (phba->ha_copy & (HA_RXMASK << (4*LPFC_EXTRA_RING)));
+               status2 >>= (4*LPFC_EXTRA_RING);
+       } else
+               status2 = 0;
+
+       if ((status1 & HA_RXMASK) || (status2 & HA_RXMASK))
+               fp_irq_rc = lpfc_fp_intr_handler(irq, dev_id);
+       else
+               fp_irq_rc = IRQ_NONE;
 
-} /* lpfc_intr_handler */
+       /* Return device-level interrupt handling status */
+       return (sp_irq_rc == IRQ_HANDLED) ? sp_irq_rc : fp_irq_rc;
+}  /* lpfc_intr_handler */