aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaurav Kashyap <saurav.kashyap@qlogic.com>2013-08-27 01:37:53 -0400
committerJames Bottomley <JBottomley@Parallels.com>2013-09-03 10:28:07 -0400
commit6ddcfef7e10b5e6faa05533674fcec4a7298ad3a (patch)
treeb22b16a0db683023bcb17e679271d369dadde0a9
parent0e31a2c830a95f7b92f6148d3b4c1f5520978951 (diff)
[SCSI] qla2xxx: Correction to message ids.
Signed-off-by: Giridhar Malavali <giridhar.malavali@qlogic.com> Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat
-rw-r--r--drivers/scsi/qla2xxx/qla_dbg.c12
-rw-r--r--drivers/scsi/qla2xxx/qla_mr.c2
-rw-r--r--drivers/scsi/qla2xxx/qla_nx2.c10
-rw-r--r--drivers/scsi/qla2xxx/qla_sup.c2
4 files changed, 15 insertions, 11 deletions
diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index f693b30c7ff0..2ef497ebadc0 100644
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -11,10 +11,11 @@
11 * ---------------------------------------------------------------------- 11 * ----------------------------------------------------------------------
12 * | Level | Last Value Used | Holes | 12 * | Level | Last Value Used | Holes |
13 * ---------------------------------------------------------------------- 13 * ----------------------------------------------------------------------
14 * | Module Init and Probe | 0x0152 | 0x4b,0xba,0xfa | 14 * | Module Init and Probe | 0x0159 | 0x4b,0xba,0xfa |
15 * | Mailbox commands | 0x1181 | 0x111a-0x111b | 15 * | Mailbox commands | 0x1181 | 0x111a-0x111b |
16 * | | | 0x1155-0x1158 | 16 * | | | 0x1155-0x1158 |
17 * | | | 0x1018-0x1019 | 17 * | | | 0x1018-0x1019 |
18 * | | | 0x1115-0x1116 |
18 * | | | 0x10ca | 19 * | | | 0x10ca |
19 * | Device Discovery | 0x2095 | 0x2020-0x2022, | 20 * | Device Discovery | 0x2095 | 0x2020-0x2022, |
20 * | | | 0x2011-0x2012, | 21 * | | | 0x2011-0x2012, |
@@ -28,7 +29,7 @@
28 * | DPC Thread | 0x4022 | 0x4002,0x4013 | 29 * | DPC Thread | 0x4022 | 0x4002,0x4013 |
29 * | Async Events | 0x5087 | 0x502b-0x502f | 30 * | Async Events | 0x5087 | 0x502b-0x502f |
30 * | | | 0x5047,0x5052 | 31 * | | | 0x5047,0x5052 |
31 * | | | 0x5040,0x5075 | 32 * | | | 0x5084,0x5075 |
32 * | | | 0x503d,0x5044 | 33 * | | | 0x503d,0x5044 |
33 * | Timer Routines | 0x6012 | | 34 * | Timer Routines | 0x6012 | |
34 * | User Space Interactions | 0x70e1 | 0x7018,0x702e, | 35 * | User Space Interactions | 0x70e1 | 0x7018,0x702e, |
@@ -41,6 +42,7 @@
41 * | | | 0x70ad-0x70ae, | 42 * | | | 0x70ad-0x70ae, |
42 * | | | 0x70d1-0x70db, | 43 * | | | 0x70d1-0x70db, |
43 * | | | 0x7047,0x703b | 44 * | | | 0x7047,0x703b |
45 * | | | 0x70de-0x70df, |
44 * | Task Management | 0x803d | 0x8025-0x8026 | 46 * | Task Management | 0x803d | 0x8025-0x8026 |
45 * | | | 0x800b,0x8039 | 47 * | | | 0x800b,0x8039 |
46 * | AER/EEH | 0x9011 | | 48 * | AER/EEH | 0x9011 | |
@@ -54,10 +56,12 @@
54 * | | | 0xb12c,0xb12d | 56 * | | | 0xb12c,0xb12d |
55 * | | | 0xb13a,0xb142 | 57 * | | | 0xb13a,0xb142 |
56 * | | | 0xb13c-0xb140 | 58 * | | | 0xb13c-0xb140 |
59 * | | | 0xb149 |
57 * | MultiQ | 0xc00c | | 60 * | MultiQ | 0xc00c | |
58 * | Misc | 0xd010 | | 61 * | Misc | 0xd010 | |
59 * | Target Mode | 0xe070 | | 62 * | Target Mode | 0xe070 | 0xe021 |
60 * | Target Mode Management | 0xf072 | | 63 * | Target Mode Management | 0xf072 | 0xf002-0xf003 |
64 * | | | 0xf046-0xf049 |
61 * | Target Mode Task Management | 0x1000b | | 65 * | Target Mode Task Management | 0x1000b | |
62 * ---------------------------------------------------------------------- 66 * ----------------------------------------------------------------------
63 */ 67 */
diff --git a/drivers/scsi/qla2xxx/qla_mr.c b/drivers/scsi/qla2xxx/qla_mr.c
index 39d13061d742..2482975d72b2 100644
--- a/drivers/scsi/qla2xxx/qla_mr.c
+++ b/drivers/scsi/qla2xxx/qla_mr.c
@@ -1596,7 +1596,7 @@ qlafx00_timer_routine(scsi_qla_host_t *vha)
1596 */ 1596 */
1597 if (ha->mr.fw_critemp_timer_tick == 0) { 1597 if (ha->mr.fw_critemp_timer_tick == 0) {
1598 tempc = QLAFX00_GET_TEMPERATURE(ha); 1598 tempc = QLAFX00_GET_TEMPERATURE(ha);
1599 ql_log(ql_dbg_timer, vha, 0x6012, 1599 ql_dbg(ql_dbg_timer, vha, 0x6012,
1600 "ISPFx00(%s): Critical temp timer, " 1600 "ISPFx00(%s): Critical temp timer, "
1601 "current SOC temperature: %d\n", 1601 "current SOC temperature: %d\n",
1602 __func__, tempc); 1602 __func__, tempc);
diff --git a/drivers/scsi/qla2xxx/qla_nx2.c b/drivers/scsi/qla2xxx/qla_nx2.c
index cbccb3f87643..8164cc9e7286 100644
--- a/drivers/scsi/qla2xxx/qla_nx2.c
+++ b/drivers/scsi/qla2xxx/qla_nx2.c
@@ -3153,7 +3153,7 @@ qla8044_poll_flash_status_reg(struct scsi_qla_host *vha)
3153 ret_val = qla8044_rd_reg_indirect(vha, QLA8044_FLASH_STATUS, 3153 ret_val = qla8044_rd_reg_indirect(vha, QLA8044_FLASH_STATUS,
3154 &flash_status); 3154 &flash_status);
3155 if (ret_val) { 3155 if (ret_val) {
3156 ql_log(ql_log_warn, vha, 0xb120, 3156 ql_log(ql_log_warn, vha, 0xb13c,
3157 "%s: Failed to read FLASH_STATUS reg.\n", 3157 "%s: Failed to read FLASH_STATUS reg.\n",
3158 __func__); 3158 __func__);
3159 break; 3159 break;
@@ -3484,7 +3484,7 @@ qla8044_write_optrom_data(struct scsi_qla_host *vha, uint8_t *buf,
3484 } 3484 }
3485 erase_offset += QLA8044_SECTOR_SIZE; 3485 erase_offset += QLA8044_SECTOR_SIZE;
3486 } 3486 }
3487 ql_dbg(ql_dbg_user, vha, 0xb139, 3487 ql_dbg(ql_dbg_user, vha, 0xb13f,
3488 "Got write for addr = 0x%x length=0x%x.\n", 3488 "Got write for addr = 0x%x length=0x%x.\n",
3489 offset, length); 3489 offset, length);
3490 3490
@@ -3653,7 +3653,7 @@ qla8044_clear_rst_ready(scsi_qla_host_t *vha)
3653 */ 3653 */
3654 drv_state &= ~(1 << vha->hw->portnum); 3654 drv_state &= ~(1 << vha->hw->portnum);
3655 3655
3656 ql_dbg(ql_dbg_p3p, vha, 0xb143, 3656 ql_dbg(ql_dbg_p3p, vha, 0xb13d,
3657 "drv_state: 0x%08x\n", drv_state); 3657 "drv_state: 0x%08x\n", drv_state);
3658 qla8044_wr_direct(vha, QLA8044_CRB_DRV_STATE_INDEX, drv_state); 3658 qla8044_wr_direct(vha, QLA8044_CRB_DRV_STATE_INDEX, drv_state);
3659} 3659}
@@ -3681,13 +3681,13 @@ qla8044_abort_isp(scsi_qla_host_t *vha)
3681 /* If IDC_CTRL DONTRESETHBA_BIT0 is set don't do reset 3681 /* If IDC_CTRL DONTRESETHBA_BIT0 is set don't do reset
3682 * recovery */ 3682 * recovery */
3683 if (qla8044_idc_dontreset(ha) == DONTRESET_BIT0) { 3683 if (qla8044_idc_dontreset(ha) == DONTRESET_BIT0) {
3684 ql_dbg(ql_dbg_p3p, vha, 0xb144, 3684 ql_dbg(ql_dbg_p3p, vha, 0xb13e,
3685 "Reset recovery disabled\n"); 3685 "Reset recovery disabled\n");
3686 rval = QLA_FUNCTION_FAILED; 3686 rval = QLA_FUNCTION_FAILED;
3687 goto exit_isp_reset; 3687 goto exit_isp_reset;
3688 } 3688 }
3689 3689
3690 ql_dbg(ql_dbg_p3p, vha, 0xb145, 3690 ql_dbg(ql_dbg_p3p, vha, 0xb140,
3691 "HW State: NEED RESET\n"); 3691 "HW State: NEED RESET\n");
3692 qla8044_wr_direct(vha, QLA8044_CRB_DEV_STATE_INDEX, 3692 qla8044_wr_direct(vha, QLA8044_CRB_DEV_STATE_INDEX,
3693 QLA8XXX_DEV_NEED_RESET); 3693 QLA8XXX_DEV_NEED_RESET);
diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 2f2e029d41ea..bd56cde795fc 100644
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -2944,7 +2944,7 @@ qla82xx_get_flash_version(scsi_qla_host_t *vha, void *mbuf)
2944 ha->fw_revision[0] = bcode[0x4]; 2944 ha->fw_revision[0] = bcode[0x4];
2945 ha->fw_revision[1] = bcode[0x5]; 2945 ha->fw_revision[1] = bcode[0x5];
2946 ha->fw_revision[2] = bcode[0x6]; 2946 ha->fw_revision[2] = bcode[0x6];
2947 ql_dbg(ql_dbg_init, vha, 0x015a, 2947 ql_dbg(ql_dbg_init, vha, 0x0153,
2948 "Firmware revision %d.%d.%d\n", 2948 "Firmware revision %d.%d.%d\n",
2949 ha->fw_revision[0], ha->fw_revision[1], 2949 ha->fw_revision[0], ha->fw_revision[1],
2950 ha->fw_revision[2]); 2950 ha->fw_revision[2]);
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-24 06:14:03 -0400