[SCSI] lpfc 8.3.14: PCI fixes and enhancements

- Allow enabling MSI-X intterupts with fewer vectors than requested
  by looking at the return value from pci_enable_msix.
- Implemented driver PCI AER error handling routines for supporting
  AER error recovering on SLI4 devices.
- Remove redundant SLI_ACTIVE checks

Signed-off-by: Alex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: James Smart <james.smart@emulex.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>

1 files changed, 34 insertions, 7 deletions

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index ae3cb0ab0ae4..9c609546b4ef 100644
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -3593,13 +3593,16 @@ static int
 lpfc_sli_brdrestart_s4(struct lpfc_hba *phba)
 {
         struct lpfc_sli *psli = &phba->sli;
-
+        uint32_t hba_aer_enabled;
 
         /* Restart HBA */
         lpfc_printf_log(phba, KERN_INFO, LOG_SLI,
                         "0296 Restart HBA Data: x%x x%x\n",
                         phba->pport->port_state, psli->sli_flag);
 
+        /* Take PCIe device Advanced Error Reporting (AER) state */
+        hba_aer_enabled = phba->hba_flag & HBA_AER_ENABLED;
+
         lpfc_sli4_brdreset(phba);
 
         spin_lock_irq(&phba->hbalock);
@@ -3611,6 +3614,10 @@ lpfc_sli_brdrestart_s4(struct lpfc_hba *phba)
         memset(&psli->lnk_stat_offsets, 0, sizeof(psli->lnk_stat_offsets));
         psli->stats_start = get_seconds();
 
+        /* Reset HBA AER if it was enabled, note hba_flag was reset above */
+        if (hba_aer_enabled)
+                pci_disable_pcie_error_reporting(phba->pcidev);
+
         lpfc_hba_down_post(phba);
 
         return 0;
@@ -4554,6 +4561,24 @@ lpfc_sli4_hba_setup(struct lpfc_hba *phba)
         /* Start error attention (ERATT) polling timer */
         mod_timer(&phba->eratt_poll, jiffies + HZ * LPFC_ERATT_POLL_INTERVAL);
 
+        /* Enable PCIe device Advanced Error Reporting (AER) if configured */
+        if (phba->cfg_aer_support == 1 && !(phba->hba_flag & HBA_AER_ENABLED)) {
+                rc = pci_enable_pcie_error_reporting(phba->pcidev);
+                if (!rc) {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "2829 This device supports "
+                                        "Advanced Error Reporting (AER)\n");
+                        spin_lock_irq(&phba->hbalock);
+                        phba->hba_flag |= HBA_AER_ENABLED;
+                        spin_unlock_irq(&phba->hbalock);
+                } else {
+                        lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
+                                        "2830 This device does not support "
+                                        "Advanced Error Reporting (AER)\n");
+                        phba->cfg_aer_support = 0;
+                }
+        }
+
         /*
          * The port is ready, set the host's link state to LINK_DOWN
          * in preparation for link interrupts.
@@ -9089,9 +9114,10 @@ lpfc_sli4_sp_handle_eqe(struct lpfc_hba *phba, struct lpfc_eqe *eqe)
                 }
         }
         if (unlikely(!cq)) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                "0365 Slow-path CQ identifier (%d) does "
-                                "not exist\n", cqid);
+                if (phba->sli.sli_flag & LPFC_SLI_ACTIVE)
+                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                        "0365 Slow-path CQ identifier "
+                                        "(%d) does not exist\n", cqid);
                 return;
         }
 
@@ -9321,9 +9347,10 @@ lpfc_sli4_fp_handle_eqe(struct lpfc_hba *phba, struct lpfc_eqe *eqe,
 
         cq = phba->sli4_hba.fcp_cq[fcp_cqidx];
         if (unlikely(!cq)) {
-                lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
-                                "0367 Fast-path completion queue does not "
-                                "exist\n");
+                if (phba->sli.sli_flag & LPFC_SLI_ACTIVE)
+                        lpfc_printf_log(phba, KERN_ERR, LOG_SLI,
+                                        "0367 Fast-path completion queue "
+                                        "does not exist\n");
                 return;
         }