Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 13:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

qla2xxx: Fix duplicate message id.

Browse Source 
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>
This commit is contained in:
Sawan Chandak 2016-07-06 11:14:33 -04:00 committed by Martin K. Petersen
parent a465537ad1
commit 75d560e095
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
drivers/scsi/qla2xxx/qla_dbg.c
View File

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

2
drivers/scsi/qla2xxx/qla_isr.c
View File

@ -721,7 +721,7 @@ skip_rio:
break; break;
case MBA_LOOP_INIT_ERR: 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]); "LOOP INIT ERROR (%x).\n", mb[1]);
ha->isp_ops->fw_dump(vha, 1); ha->isp_ops->fw_dump(vha, 1);
set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags); set_bit(ISP_ABORT_NEEDED, &vha->dpc_flags);

4
drivers/scsi/qla2xxx/qla_mbx.c
View File

@ -404,7 +404,7 @@ mbx_done:
"**** Failed mbx[0]=%x, mb[1]=%x, mb[2]=%x, mb[3]=%x, cmd=%x ****.\n", "**** 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); 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", "host status: 0x%x, flags:0x%lx, intr ctrl reg:0x%x, intr status:0x%x\n",
RD_REG_DWORD(&reg->isp24.host_status), RD_REG_DWORD(&reg->isp24.host_status),
ha->fw_dump_cap_flags, ha->fw_dump_cap_flags,
@ -413,7 +413,7 @@ mbx_done:
mbx_reg = &reg->isp24.mailbox0; mbx_reg = &reg->isp24.mailbox0;
for (i = 0; i < 6; i++) 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++)); "mbox[%d] 0x%04x\n", i, RD_REG_WORD(mbx_reg++));
} else { } else {
ql_dbg(ql_dbg_mbx, base_vha, 0x1021, "Done %s.\n", __func__); ql_dbg(ql_dbg_mbx, base_vha, 0x1021, "Done %s.\n", __func__);