scsi: lpfc: Fix auto sli_mode and its effect on CONFIG_PORT for SLI3

A very long time ago, there was a feature: auto sli mode. It gave the user
the ability to auto select the SLI mode (SLI2 or SLI3) to run the port in,
or even force SLI2 mode if configured.  Because of the convoluted logic,
the CONFIG_PORT mbox command ends up being called 2 or 3 times. It should
have been called only once.  Additionally, the driver no longer supports
SLI-2, so only SLI-3 mode should be allowed.

The following changes were made:

 - Force module parameter to SLI3 only.

 - Rip out redundant CONFIG_PORT mbox commands.

 - Force CONFIG_PORT mbox command to be in beginning of enable ISR routine.

 - Added changes for offline to online behavior

Link: https://lore.kernel.org/r/20210104180240.46824-3-jsmart2021@gmail.com
Co-developed-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/lpfc/lpfc.h b/drivers/scsi/lpfc/lpfc.h
index a54c8da30273ba47c00c7ddd7a22f08734ed62e3..7875552c07d353e7c87bdcb62a0f1a7967568781 100644 (file)
--- a/drivers/scsi/lpfc/lpfc.h
+++ b/drivers/scsi/lpfc/lpfc.h
@@ -779,6 +779,7 @@ struct lpfc_hba {
                                         */
 #define HBA_FLOGI_ISSUED       0x100000 /* FLOGI was issued */
 #define HBA_DEFER_FLOGI                0x800000 /* Defer FLOGI till read_sparm cmpl */
+#define HBA_NEEDS_CFG_PORT     0x2000000 /* SLI3 - needs a CONFIG_PORT mbox */
 
        uint32_t fcp_ring_in_use; /* When polling test if intr-hndlr active*/
        struct lpfc_dmabuf slim2p;

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 4528166dee36ed68b936185944cfd3548c40d448..f8bb6a4f780ced4bf0398d24d3f129c226750443 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -3441,11 +3441,8 @@ unsigned long lpfc_no_hba_reset[MAX_HBAS_NO_RESET] = {
 module_param_array(lpfc_no_hba_reset, ulong, &lpfc_no_hba_reset_cnt, 0444);
 MODULE_PARM_DESC(lpfc_no_hba_reset, "WWPN of HBAs that should not be reset");
 
-LPFC_ATTR(sli_mode, 0, 0, 3,
-       "SLI mode selector:"
-       " 0 - auto (SLI-3 if supported),"
-       " 2 - select SLI-2 even on SLI-3 capable HBAs,"
-       " 3 - select SLI-3");
+LPFC_ATTR(sli_mode, 3, 3, 3,
+       "SLI mode selector: 3 - select SLI-3");
 
 LPFC_ATTR_R(enable_npiv, 1, 0, 1,
        "Enable NPIV functionality");

diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index ac67f420ec2642e81f1de78cfbc029fea53bfb99..1f0a62ecfad8f9960d3e17f8b6a091f197ba8207 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -10728,17 +10728,19 @@ lpfc_sli_enable_intr(struct lpfc_hba *phba, uint32_t cfg_mode)
        uint32_t intr_mode = LPFC_INTR_ERROR;
        int retval;
 
+       /* Need to issue conf_port mbox cmd before conf_msi mbox cmd */
+       retval = lpfc_sli_config_port(phba, LPFC_SLI_REV3);
+       if (retval)
+               return intr_mode;
+       phba->hba_flag &= ~HBA_NEEDS_CFG_PORT;
+
        if (cfg_mode == 2) {
-               /* Need to issue conf_port mbox cmd before conf_msi mbox cmd */
-               retval = lpfc_sli_config_port(phba, LPFC_SLI_REV3);
+               /* Now, try to enable MSI-X interrupt mode */
+               retval = lpfc_sli_enable_msix(phba);
                if (!retval) {
-                       /* Now, try to enable MSI-X interrupt mode */
-                       retval = lpfc_sli_enable_msix(phba);
-                       if (!retval) {
-                               /* Indicate initialization to MSI-X mode */
-                               phba->intr_type = MSIX;
-                               intr_mode = 2;
-                       }
+                       /* Indicate initialization to MSI-X mode */
+                       phba->intr_type = MSIX;
+                       intr_mode = 2;
                }
        }
 

diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c
index 95caad764fb7b8a36c4e2c31e48072d0f8f70c07..735fa1d484eb345a24d0b5ead08a3f6a6942bfa2 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_sli.c
+++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -4359,6 +4359,8 @@ lpfc_sli_brdready_s3(struct lpfc_hba *phba, uint32_t mask)
        if (lpfc_readl(phba->HSregaddr, &status))
                return 1;
 
+       phba->hba_flag |= HBA_NEEDS_CFG_PORT;
+
        /*
         * Check status register every 100ms for 5 retries, then every
         * 500ms for 5, then every 2.5 sec for 5, then reset board and
@@ -4687,6 +4689,7 @@ lpfc_sli_brdreset(struct lpfc_hba *phba)
        /* perform board reset */
        phba->fc_eventTag = 0;
        phba->link_events = 0;
+       phba->hba_flag |= HBA_NEEDS_CFG_PORT;
        if (phba->pport) {
                phba->pport->fc_myDID = 0;
                phba->pport->fc_prevDID = 0;
@@ -5020,6 +5023,8 @@ lpfc_sli_chipset_init(struct lpfc_hba *phba)
                return -EIO;
        }
 
+       phba->hba_flag |= HBA_NEEDS_CFG_PORT;
+
        /* Clear all interrupt enable conditions */
        writel(0, phba->HCregaddr);
        readl(phba->HCregaddr); /* flush */
@@ -5316,45 +5321,18 @@ int
 lpfc_sli_hba_setup(struct lpfc_hba *phba)
 {
        uint32_t rc;
-       int  mode = 3, i;
+       int  i;
        int longs;
 
-       switch (phba->cfg_sli_mode) {
-       case 2:
-               if (phba->cfg_enable_npiv) {
-                       lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
-                               "1824 NPIV enabled: Override sli_mode "
-                               "parameter (%d) to auto (0).\n",
-                               phba->cfg_sli_mode);
-                       break;
-               }
-               mode = 2;
-               break;
-       case 0:
-       case 3:
-               break;
-       default:
-               lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
-                               "1819 Unrecognized sli_mode parameter: %d.\n",
-                               phba->cfg_sli_mode);
-
-               break;
+       /* Enable ISR already does config_port because of config_msi mbx */
+       if (phba->hba_flag & HBA_NEEDS_CFG_PORT) {
+               rc = lpfc_sli_config_port(phba, LPFC_SLI_REV3);
+               if (rc)
+                       return -EIO;
+               phba->hba_flag &= ~HBA_NEEDS_CFG_PORT;
        }
        phba->fcp_embed_io = 0; /* SLI4 FC support only */
 
-       rc = lpfc_sli_config_port(phba, mode);
-
-       if (rc && phba->cfg_sli_mode == 3)
-               lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
-                               "1820 Unable to select SLI-3.  "
-                               "Not supported by adapter.\n");
-       if (rc && mode != 2)
-               rc = lpfc_sli_config_port(phba, 2);
-       else if (rc && mode == 2)
-               rc = lpfc_sli_config_port(phba, 3);
-       if (rc)
-               goto lpfc_sli_hba_setup_error;
-
        /* 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);