From: Quinn Tran <qutran@marvell.com>

Date: Wed, 15 Jun 2022 22:35:07 -0700

Subject: scsi: qla2xxx: Fix erroneous mailbox timeout after PCI error

 injection

Patch-mainline: v5.20-rc1

Git-commit: f260694e6463b63ae550aad25ddefe94cb1904da

References: bsc#1201958

Clear wait for mailbox interrupt flag to prevent stale mailbox:

Feb 22 05:22:56 ltcden4-lp7 kernel: qla2xxx [0135:90:00.1]-500a:4: LOOP UP detected (16 Gbps).

Feb 22 05:22:59 ltcden4-lp7 kernel: qla2xxx [0135:90:00.1]-d04c:4: MBX Command timeout for cmd 69, ...

To fix the issue, driver needs to clear the MBX_INTR_WAIT flag on purging

the mailbox. When the stale mailbox completion does arrive, it will be

dropped.

Link: https://lore.kernel.org/r/20220616053508.27186-11-njavali@marvell.com

Fixes: b6faaaf796d7 ("scsi: qla2xxx: Serialize mailbox request")

Cc: Naresh Bannoth <nbannoth@in.ibm.com>

Cc: Kyle Mahlkuch <Kyle.Mahlkuch@ibm.com>

Cc: stable@vger.kernel.org

Reported-by: Naresh Bannoth <nbannoth@in.ibm.com>

Tested-by: Naresh Bannoth <nbannoth@in.ibm.com>

Signed-off-by: Quinn Tran <qutran@marvell.com>

Signed-off-by: Nilesh Javali <njavali@marvell.com>

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

Acked-by: Daniel Wagner <dwagner@suse.de>

---

 drivers/scsi/qla2xxx/qla_mbx.c |   12 ++++++------

 1 file changed, 6 insertions(+), 6 deletions(-)

--- a/drivers/scsi/qla2xxx/qla_mbx.c

+++ b/drivers/scsi/qla2xxx/qla_mbx.c

@@ -275,6 +275,12 @@ qla2x00_mailbox_command(scsi_qla_host_t

 		atomic_inc(&ha->num_pend_mbx_stage3);

 		if (!wait_for_completion_timeout(&ha->mbx_intr_comp,

 		    mcp->tov * HZ)) {

+			ql_dbg(ql_dbg_mbx, vha, 0x117a,

+			    "cmd=%x Timeout.\n", command);

+			spin_lock_irqsave(&ha->hardware_lock, flags);

+			clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);

+			spin_unlock_irqrestore(&ha->hardware_lock, flags);

+

 			if (chip_reset != ha->chip_reset) {

 				eeh_delay = ha->flags.eeh_busy ? 1 : 0;

@@ -287,12 +293,6 @@ qla2x00_mailbox_command(scsi_qla_host_t

 				rval = QLA_ABORTED;

 				goto premature_exit;

 			}

-			ql_dbg(ql_dbg_mbx, vha, 0x117a,

-			    "cmd=%x Timeout.\n", command);

-			spin_lock_irqsave(&ha->hardware_lock, flags);

-			clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags);

-			spin_unlock_irqrestore(&ha->hardware_lock, flags);

-

 		} else if (ha->flags.purge_mbox ||

 		    chip_reset != ha->chip_reset) {

 			eeh_delay = ha->flags.eeh_busy ? 1 : 0;