diff mbox series

[v3,5/7] qla2xxx: Fix mailbox Ch erroneous error

Message ID 20210105103847.25041-6-njavali@marvell.com
State New
Headers show
Series [v3,1/7] qla2xxx: Implementation to get and manage host, target stats and initiator port | expand

Commit Message

Nilesh Javali Jan. 5, 2021, 10:38 a.m. UTC 
From: Quinn Tran <qutran@marvell.com>

Mailbox Ch/dump ram extend expects mb register 10 to be
set. If not set/clear, firmware can pick up garbage from previous
invocation of this mailbox. Example: mctp dump can set mb10.
On subsequent flash read which use mailbox cmd Ch, mb10 can
retain previous value.

Cc: stable@vger.kernel.org
Signed-off-by: Quinn Tran <qutran@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
---
 drivers/scsi/qla2xxx/qla_dbg.c | 1 +
 drivers/scsi/qla2xxx/qla_mbx.c | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

Comments

Himanshu Madhani Jan. 6, 2021, 3:37 p.m. UTC | #1 
> On Jan 5, 2021, at 4:38 AM, Nilesh Javali <njavali@marvell.com> wrote:

> 

> From: Quinn Tran <qutran@marvell.com>

> 

> Mailbox Ch/dump ram extend expects mb register 10 to be

> set. If not set/clear, firmware can pick up garbage from previous

> invocation of this mailbox. Example: mctp dump can set mb10.

> On subsequent flash read which use mailbox cmd Ch, mb10 can

> retain previous value.

> 

> Cc: stable@vger.kernel.org

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

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

> ---

> drivers/scsi/qla2xxx/qla_dbg.c | 1 +

> drivers/scsi/qla2xxx/qla_mbx.c | 3 ++-

> 2 files changed, 3 insertions(+), 1 deletion(-)

> 

> diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c

> index bb7431912d41..144a893e7335 100644

> --- a/drivers/scsi/qla2xxx/qla_dbg.c

> +++ b/drivers/scsi/qla2xxx/qla_dbg.c

> @@ -202,6 +202,7 @@ qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,

> 		wrt_reg_word(&reg->mailbox0, MBC_DUMP_RISC_RAM_EXTENDED);

> 		wrt_reg_word(&reg->mailbox1, LSW(addr));

> 		wrt_reg_word(&reg->mailbox8, MSW(addr));

> +		wrt_reg_word(&reg->mailbox10, 0);

> 

> 		wrt_reg_word(&reg->mailbox2, MSW(LSD(dump_dma)));

> 		wrt_reg_word(&reg->mailbox3, LSW(LSD(dump_dma)));

> diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c

> index 629af6fe8c55..06c99963b2c9 100644

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

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

> @@ -4291,7 +4291,8 @@ qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,

> 	if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) {

> 		mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED;

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

> -		mcp->out_mb = MBX_8|MBX_0;

> +		mcp->mb[10] = 0;

> +		mcp->out_mb = MBX_10|MBX_8|MBX_0;

> 	} else {

> 		mcp->mb[0] = MBC_DUMP_RISC_RAM;

> 		mcp->out_mb = MBX_0;

> -- 

> 2.19.0.rc0

> 


Looks Good. 

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


--
Himanshu Madhani	 Oracle Linux Engineering
diff mbox series

Patch

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index bb7431912d41..144a893e7335 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -202,6 +202,7 @@  qla24xx_dump_ram(struct qla_hw_data *ha, uint32_t addr, __be32 *ram,
 		wrt_reg_word(&reg->mailbox0, MBC_DUMP_RISC_RAM_EXTENDED);
 		wrt_reg_word(&reg->mailbox1, LSW(addr));
 		wrt_reg_word(&reg->mailbox8, MSW(addr));
+		wrt_reg_word(&reg->mailbox10, 0);
 
 		wrt_reg_word(&reg->mailbox2, MSW(LSD(dump_dma)));
 		wrt_reg_word(&reg->mailbox3, LSW(LSD(dump_dma)));
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 629af6fe8c55..06c99963b2c9 100644
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -4291,7 +4291,8 @@  qla2x00_dump_ram(scsi_qla_host_t *vha, dma_addr_t req_dma, uint32_t addr,
 	if (MSW(addr) || IS_FWI2_CAPABLE(vha->hw)) {
 		mcp->mb[0] = MBC_DUMP_RISC_RAM_EXTENDED;
 		mcp->mb[8] = MSW(addr);
-		mcp->out_mb = MBX_8|MBX_0;
+		mcp->mb[10] = 0;
+		mcp->out_mb = MBX_10|MBX_8|MBX_0;
 	} else {
 		mcp->mb[0] = MBC_DUMP_RISC_RAM;
 		mcp->out_mb = MBX_0;