From: "Ewan D. Milne" <emilne@redhat.com>

Date: Mon, 8 Nov 2021 13:30:12 -0500

Subject: scsi: qla2xxx: Fix mailbox direction flags in

 qla2xxx_get_adapter_id()

Patch-mainline: v5.16-rc2

Git-commit: 392006871bb26166bcfafa56faf49431c2cfaaa8

References: git-fixes

The SCM changes set the flags in mcp->out_mb instead of mcp->in_mb so the

data was not actually being read into the mcp->mb[] array from the adapter.

Link: https://lore.kernel.org/r/20211108183012.13895-1-emilne@redhat.com

Fixes: 9f2475fe7406 ("scsi: qla2xxx: SAN congestion management implementation")

Cc: stable@vger.kernel.org

Reviewed-by: Himanshu Madhani <himanshu.madhani@oracle.com>

Reviewed-by: Arun Easi <aeasi@marvell.com>

Signed-off-by: Ewan D. Milne <emilne@redhat.com>

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

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

---

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

 1 file changed, 2 insertions(+), 4 deletions(-)

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

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

@@ -1696,10 +1696,8 @@ qla2x00_get_adapter_id(scsi_qla_host_t *

 		mcp->in_mb |= MBX_13|MBX_12|MBX_11|MBX_10;

 	if (IS_FWI2_CAPABLE(vha->hw))

 		mcp->in_mb |= MBX_19|MBX_18|MBX_17|MBX_16;

-	if (IS_QLA27XX(vha->hw) || IS_QLA28XX(vha->hw)) {

-		mcp->in_mb |= MBX_15;

-		mcp->out_mb |= MBX_7|MBX_21|MBX_22|MBX_23;

-	}

+	if (IS_QLA27XX(vha->hw) || IS_QLA28XX(vha->hw))

+		mcp->in_mb |= MBX_15|MBX_21|MBX_22|MBX_23;

 	mcp->tov = MBX_TOV_SECONDS;

 	mcp->flags = 0;