Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 050dc76a authored by Joe Carnuccio's avatar Joe Carnuccio Committed by Martin K. Petersen
Browse files

scsi: qla2xxx: Print correct mailbox registers in failed summary 



Signed-off-by: default avatarJoe Carnuccio <joe.carnuccio@cavium.com>
Signed-off-by: default avatarHimanshu Madhani <himanshu.madhani@cavium.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 72fcd4eb

drivers/scsi/qla2xxx/qla_mbx.c

+14 −12
Original line number Diff line number Diff line
@@ -106,7 +106,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 
	uint16_t __iomem *optr;

	uint32_t	cnt;

	uint32_t	mboxes;

	uint16_t __iomem *mbx_reg;

	unsigned long	wait_time;

	struct qla_hw_data *ha = vha->hw;

	scsi_qla_host_t *base_vha = pci_get_drvdata(ha->pdev);
@@ -490,21 +489,24 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) 


mbx_done:

	if (rval) {

		ql_dbg(ql_dbg_disc, base_vha, 0x1020,

		    "**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x, cmd=%x ****.\n",

		    mcp->mb[0], mcp->mb[1], mcp->mb[2], mcp->mb[3], command);



		if (ql2xextended_error_logging & (ql_dbg_disc|ql_dbg_mbx)) {

			pr_warn("%s [%s]-%04x:%ld: **** Failed", QL_MSGHDR,

			    dev_name(&ha->pdev->dev), 0x1020+0x800,

			    vha->host_no);

			mboxes = mcp->in_mb;

			cnt = 4;

			for (i = 0; i < ha->mbx_count && cnt; i++, mboxes >>= 1)

				if (mboxes & BIT_0) {

					printk(" mb[%u]=%x", i, mcp->mb[i]);

					cnt--;

				}

			pr_warn(" cmd=%x ****\n", command);

		}

		ql_dbg(ql_dbg_mbx, vha, 0x1198,

		    "host status: 0x%x, flags:0x%lx, intr ctrl reg:0x%x, intr status:0x%x\n",

		    "host_status=%#x intr_ctrl=%#x intr_status=%#x\n",

		    RD_REG_DWORD(&reg->isp24.host_status),

		    ha->fw_dump_cap_flags,

		    RD_REG_DWORD(&reg->isp24.ictrl),

		    RD_REG_DWORD(&reg->isp24.istatus));



		mbx_reg = &reg->isp24.mailbox0;

		for (i = 0; i < 6; i++)

			ql_dbg(ql_dbg_mbx + ql_dbg_verbose, vha, 0x1199,

			    "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));

	} else {

		ql_dbg(ql_dbg_mbx, base_vha, 0x1021, "Done %s.\n", __func__);

	}