scsi: lpfc: Fix FW reset action if I/Os are outstanding

If the port is configured for NVME and has any outstanding IOs when a FW
reset is requesteed, outstanding I/Os are not properly cleaned up. This
causes the fw download request to fail.

Fix by clearing the LPFC_SLI_ACTIVE flag to signify the I/O must be
manually flushed by the driver on port reset.

Link: https://lore.kernel.org/r/20210104180240.46824-7-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_init.c b/drivers/scsi/lpfc/lpfc_init.c
index 1f0a62ecfad8f9960d3e17f8b6a091f197ba8207..593b175702eb806a16ad2a54aed45a7a344648aa 100644 (file)
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -1833,6 +1833,16 @@ lpfc_sli4_port_sta_fn_reset(struct lpfc_hba *phba, int mbx_action,
                lpfc_printf_log(phba, KERN_ERR, LOG_TRACE_EVENT,
                                "2887 Reset Needed: Attempting Port "
                                "Recovery...\n");
+
+       /* If we are no wait, the HBA has been reset and is not
+        * functional, thus we should clear LPFC_SLI_ACTIVE flag.
+        */
+       if (mbx_action == LPFC_MBX_NO_WAIT) {
+               spin_lock_irq(&phba->hbalock);
+               phba->sli.sli_flag &= ~LPFC_SLI_ACTIVE;
+               spin_unlock_irq(&phba->hbalock);
+       }
+
        lpfc_offline_prep(phba, mbx_action);
        lpfc_sli_flush_io_rings(phba);
        lpfc_offline(phba);