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

Commit 75d560e0 authored Jul 06, 2016 by Sawan Chandak Committed by Martin K. Petersen Jul 15, 2016

qla2xxx: Fix duplicate message id.



Signed-off-by: Sawan Chandak <sawan.chandak@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Reviewed-by: Hannes Reinecke <hare@suse.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

parent a465537a

drivers/scsi/qla2xxx/qla_dbg.c

+3 −4

Original line number	Diff line number	Diff line
		@@ -14,9 +14,8 @@
		* \| Module Init and Probe \| 0x0191 \| 0x0146 \|
		* \| \| \| 0x015b-0x0160 \|
		* \| \| \| 0x016e \|
		* \| Mailbox commands \| 0x1196 \| 0x1193 \|
		* \| \| \| \|
		* \| Device Discovery \| 0x2003 \| 0x2016 \|
		* \| Mailbox commands \| 0x1199 \| 0x1193 \|
		* \| Device Discovery \| 0x2004 \| 0x2016 \|
		* \| \| \| 0x2011-0x2012, \|
		* \| \| \| 0x2099-0x20a4 \|
		* \| Queue Command and IO tracing \| 0x3074 \| 0x300b \|
		@@ -26,7 +25,7 @@
		* \| \| \| 0x3036,0x3038 \|
		* \| \| \| 0x303a \|
		* \| DPC Thread \| 0x4023 \| 0x4002,0x4013 \|
		* \| Async Events \| 0x5089 \| 0x502b-0x502f \|
		* \| Async Events \| 0x5090 \| 0x502b-0x502f \|
		* \| \| \| 0x5047 \|
		* \| \| \| 0x5084,0x5075 \|
		* \| \| \| 0x503d,0x5044 \|

drivers/scsi/qla2xxx/qla_isr.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -721,7 +721,7 @@ qla2x00_async_event(scsi_qla_host_t vha, struct rsp_que rsp, uint16_t *mb)
		break;

		case MBA_LOOP_INIT_ERR:
		ql_log(ql_log_warn, vha, 0x507b,
		ql_log(ql_log_warn, vha, 0x5090,
		"LOOP INIT ERROR (%x).\n", mb[1]);
		ha->isp_ops->fw_dump(vha, 1);
		set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

drivers/scsi/qla2xxx/qla_mbx.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -404,7 +404,7 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)
		"** 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);

		ql_dbg(ql_dbg_disc, vha, 0x1115,
		ql_dbg(ql_dbg_mbx, vha, 0x1198,
		"host status: 0x%x, flags:0x%lx, intr ctrl reg:0x%x, intr status:0x%x\n",
		RD_REG_DWORD(&reg->isp24.host_status),
		ha->fw_dump_cap_flags,
		@@ -413,7 +413,7 @@ qla2x00_mailbox_command(scsi_qla_host_t vha, mbx_cmd_t mcp)

		mbx_reg = &reg->isp24.mailbox0;
		for (i = 0; i < 6; i++)
		ql_dbg(ql_dbg_disc + ql_dbg_verbose, vha, 0x1116,
		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__);