1 files changed, 34 insertions, 1 deletions

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index aee5444b63d9..181538466117 100644
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -49,6 +49,9 @@ struct lpfc_sli2_slim;
 #define LPFC_HB_MBOX_INTERVAL   5       /* Heart beat interval in seconds. */
 #define LPFC_HB_MBOX_TIMEOUT    30      /* Heart beat timeout  in seconds. */
 
+/* Error Attention event polling interval */
+#define LPFC_ERATT_POLL_INTERVAL        5 /* EATT poll interval in seconds */
+
 /* Define macros for 64 bit support */
 #define putPaddrLow(addr)    ((uint32_t) (0xffffffff & (u64)(addr)))
 #define putPaddrHigh(addr)   ((uint32_t) (0xffffffff & (((u64)(addr))>>32)))
@@ -60,6 +63,9 @@ struct lpfc_sli2_slim;
 
 #define MAX_HBAEVT      32
 
+/* Number of MSI-X vectors the driver uses */
+#define LPFC_MSIX_VECTORS       2
+
 /* lpfc wait event data ready flag */
 #define LPFC_DATA_READY         (1<<0)
 
@@ -423,12 +429,16 @@ struct lpfc_hba {
 #define LS_NPIV_FAB_SUPPORTED 0x2       /* Fabric supports NPIV */
 #define LS_IGNORE_ERATT       0x4       /* intr handler should ignore ERATT */
 
+        uint32_t hba_flag;      /* hba generic flags */
+#define HBA_ERATT_HANDLED       0x1 /* This flag is set when eratt handled */
+
         struct lpfc_dmabuf slim2p;
 
         MAILBOX_t *mbox;
         uint32_t *inb_ha_copy;
         uint32_t *inb_counter;
         uint32_t inb_last_counter;
+        uint32_t ha_copy;
         struct _PCB *pcb;
         struct _IOCB *IOCBs;
 
@@ -544,6 +554,7 @@ struct lpfc_hba {
         uint8_t soft_wwn_enable;
 
         struct timer_list fcp_poll_timer;
+        struct timer_list eratt_poll;
 
         /*
          * stat  counters
@@ -573,7 +584,7 @@ struct lpfc_hba {
 
         struct fc_host_statistics link_stats;
         enum intr_type_t intr_type;
-        struct msix_entry msix_entries[1];
+        struct msix_entry msix_entries[LPFC_MSIX_VECTORS];
 
         struct list_head port_list;
         struct lpfc_vport *pport;       /* physical lpfc_vport pointer */
@@ -660,6 +671,28 @@ lpfc_worker_wake_up(struct lpfc_hba *phba)
         return;
 }
 
+static inline void
+lpfc_sli_read_hs(struct lpfc_hba *phba)
+{
+        /*
+         * 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 Host Attention error bit */
+        writel(HA_ERATT, phba->HAregaddr);
+        readl(phba->HAregaddr); /* flush */
+        phba->pport->stopped = 1;
+
+        return;
+}
+
 #define FC_REG_DUMP_EVENT               0x10    /* Register for Dump events */
 #define FC_REG_TEMPERATURE_EVENT        0x20    /* Register for temperature
                                                    event */