From: Quinn Tran <qutran@marvell.com>

Date: Tue, 17 Dec 2019 14:06:16 -0800

Subject: scsi: qla2xxx: Fix mtcp dump collection failure

Patch-mainline: v5.6-rc1

Git-commit: 641e0efddcbde52461e017136acd3ce7f2ef0c14

References: jsc#SLE-9714 jsc#SLE-10327 jsc#SLE-10334

MTCP dump failed due to MB Reg 10 was picking garbage data from stack

memory.

Fixes: 81178772b636a ("[SCSI] qla2xxx: Implemetation of mctp.")

Cc: stable@vger.kernel.org

Link: https://lore.kernel.org/r/20191217220617.28084-14-hmadhani@marvell.com

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

Signed-off-by: Himanshu Madhani <hmadhani@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 |    3 +--

 1 file changed, 1 insertion(+), 2 deletions(-)

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

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

@@ -6152,9 +6152,8 @@ qla2x00_dump_mctp_data(scsi_qla_host_t *

 	mcp->mb[7] = LSW(MSD(req_dma));

 	mcp->mb[8] = MSW(addr);

 	/* Setting RAM ID to valid */

-	mcp->mb[10] |= BIT_7;

 	/* For MCTP RAM ID is 0x40 */

-	mcp->mb[10] |= 0x40;

+	mcp->mb[10] = BIT_7 | 0x40;

 	mcp->out_mb |= MBX_10|MBX_8|MBX_7|MBX_6|MBX_5|MBX_4|MBX_3|MBX_2|MBX_1|

 	    MBX_0;