Skip to content

Commit e8fb00e

Browse files
Manish RangankarJames Bottomley
authored andcommitted
[SCSI] qla4xxx: Modified debug log messages for boot info.
In some configurations user may not have boot targets configured. In such cases the debug messages printed out by driver look like some kind of failure happening. However this could be a valid case, so modified the messages to appear as warning messages versus failure messages. Signed-off-by: Manish Rangankar <manish.rangankar@qlogic.com> Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com> Reviewed-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
1 parent 20e835b commit e8fb00e

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

drivers/scsi/qla4xxx/ql4_os.c

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3393,9 +3393,8 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
33933393
/* Check Boot Mode */
33943394
val = rd_nvram_byte(ha, addr);
33953395
if (!(val & 0x07)) {
3396-
DEBUG2(ql4_printk(KERN_ERR, ha,
3397-
"%s: Failed Boot options : 0x%x\n",
3398-
__func__, val));
3396+
DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Adapter boot "
3397+
"options : 0x%x\n", __func__, val));
33993398
ret = QLA_ERROR;
34003399
goto exit_boot_info;
34013400
}
@@ -3440,9 +3439,8 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
34403439
}
34413440
/* Check Boot Mode */
34423441
if (!(buf[1] & 0x07)) {
3443-
DEBUG2(ql4_printk(KERN_INFO, ha,
3444-
"Failed: Boot options : 0x%x\n",
3445-
buf[1]));
3442+
DEBUG2(ql4_printk(KERN_INFO, ha, "Firmware boot options"
3443+
" : 0x%x\n", buf[1]));
34463444
ret = QLA_ERROR;
34473445
goto exit_boot_info_free;
34483446
}
@@ -3548,8 +3546,8 @@ static int qla4xxx_get_boot_target(struct scsi_qla_host *ha,
35483546

35493547
if (qla4xxx_bootdb_by_index(ha, fw_ddb_entry,
35503548
fw_ddb_entry_dma, ddb_index)) {
3551-
DEBUG2(ql4_printk(KERN_ERR, ha,
3552-
"%s: Flash DDB read Failed\n", __func__));
3549+
DEBUG2(ql4_printk(KERN_INFO, ha, "%s: No Flash DDB found at "
3550+
"index [%d]\n", __func__, ddb_index));
35533551
ret = QLA_ERROR;
35543552
goto exit_boot_target;
35553553
}
@@ -3627,8 +3625,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
36273625
ddb_index[1] = 0xffff;
36283626
ret = get_fw_boot_info(ha, ddb_index);
36293627
if (ret != QLA_SUCCESS) {
3630-
DEBUG2(ql4_printk(KERN_ERR, ha,
3631-
"%s: Failed to set boot info.\n", __func__));
3628+
DEBUG2(ql4_printk(KERN_INFO, ha,
3629+
"%s: No boot target configured.\n", __func__));
36323630
return ret;
36333631
}
36343632

@@ -3641,8 +3639,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
36413639
rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_pri_sess),
36423640
ddb_index[0]);
36433641
if (rval != QLA_SUCCESS) {
3644-
DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Failed to get "
3645-
"primary target\n", __func__));
3642+
DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Primary boot target not "
3643+
"configured\n", __func__));
36463644
} else
36473645
ret = QLA_SUCCESS;
36483646

@@ -3653,8 +3651,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
36533651
rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_sec_sess),
36543652
ddb_index[1]);
36553653
if (rval != QLA_SUCCESS) {
3656-
DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Failed to get "
3657-
"secondary target\n", __func__));
3654+
DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Secondary boot target not"
3655+
" configured\n", __func__));
36583656
} else
36593657
ret = QLA_SUCCESS;
36603658

0 commit comments

Comments
 (0)