aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorManish Rangankar <manish.rangankar@qlogic.com>2012-02-13 08:00:43 -0500
committerJames Bottomley <JBottomley@Parallels.com>2012-02-19 10:32:12 -0500
commite8fb00e068e057ad2fc28fd0d398ff028bc540ff (patch)
tree9e22edf4b6e98e823cb240b4e20c0da566aea8e7 /drivers/scsi
parent20e835b43f3f81e29f34e06099a47285ffebe688 (diff)
[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>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/qla4xxx/ql4_os.c26
1 files changed, 12 insertions, 14 deletions
diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index a9ff05e24f34..3339cc1e3390 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -3393,9 +3393,8 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
3393 /* Check Boot Mode */ 3393 /* Check Boot Mode */
3394 val = rd_nvram_byte(ha, addr); 3394 val = rd_nvram_byte(ha, addr);
3395 if (!(val & 0x07)) { 3395 if (!(val & 0x07)) {
3396 DEBUG2(ql4_printk(KERN_ERR, ha, 3396 DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Adapter boot "
3397 "%s: Failed Boot options : 0x%x\n", 3397 "options : 0x%x\n", __func__, val));
3398 __func__, val));
3399 ret = QLA_ERROR; 3398 ret = QLA_ERROR;
3400 goto exit_boot_info; 3399 goto exit_boot_info;
3401 } 3400 }
@@ -3440,9 +3439,8 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
3440 } 3439 }
3441 /* Check Boot Mode */ 3440 /* Check Boot Mode */
3442 if (!(buf[1] & 0x07)) { 3441 if (!(buf[1] & 0x07)) {
3443 DEBUG2(ql4_printk(KERN_INFO, ha, 3442 DEBUG2(ql4_printk(KERN_INFO, ha, "Firmware boot options"
3444 "Failed: Boot options : 0x%x\n", 3443 " : 0x%x\n", buf[1]));
3445 buf[1]));
3446 ret = QLA_ERROR; 3444 ret = QLA_ERROR;
3447 goto exit_boot_info_free; 3445 goto exit_boot_info_free;
3448 } 3446 }
@@ -3548,8 +3546,8 @@ static int qla4xxx_get_boot_target(struct scsi_qla_host *ha,
3548 3546
3549 if (qla4xxx_bootdb_by_index(ha, fw_ddb_entry, 3547 if (qla4xxx_bootdb_by_index(ha, fw_ddb_entry,
3550 fw_ddb_entry_dma, ddb_index)) { 3548 fw_ddb_entry_dma, ddb_index)) {
3551 DEBUG2(ql4_printk(KERN_ERR, ha, 3549 DEBUG2(ql4_printk(KERN_INFO, ha, "%s: No Flash DDB found at "
3552 "%s: Flash DDB read Failed\n", __func__)); 3550 "index [%d]\n", __func__, ddb_index));
3553 ret = QLA_ERROR; 3551 ret = QLA_ERROR;
3554 goto exit_boot_target; 3552 goto exit_boot_target;
3555 } 3553 }
@@ -3627,8 +3625,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
3627 ddb_index[1] = 0xffff; 3625 ddb_index[1] = 0xffff;
3628 ret = get_fw_boot_info(ha, ddb_index); 3626 ret = get_fw_boot_info(ha, ddb_index);
3629 if (ret != QLA_SUCCESS) { 3627 if (ret != QLA_SUCCESS) {
3630 DEBUG2(ql4_printk(KERN_ERR, ha, 3628 DEBUG2(ql4_printk(KERN_INFO, ha,
3631 "%s: Failed to set boot info.\n", __func__)); 3629 "%s: No boot target configured.\n", __func__));
3632 return ret; 3630 return ret;
3633 } 3631 }
3634 3632
@@ -3641,8 +3639,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
3641 rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_pri_sess), 3639 rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_pri_sess),
3642 ddb_index[0]); 3640 ddb_index[0]);
3643 if (rval != QLA_SUCCESS) { 3641 if (rval != QLA_SUCCESS) {
3644 DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Failed to get " 3642 DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Primary boot target not "
3645 "primary target\n", __func__)); 3643 "configured\n", __func__));
3646 } else 3644 } else
3647 ret = QLA_SUCCESS; 3645 ret = QLA_SUCCESS;
3648 3646
@@ -3653,8 +3651,8 @@ sec_target:
3653 rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_sec_sess), 3651 rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_sec_sess),
3654 ddb_index[1]); 3652 ddb_index[1]);
3655 if (rval != QLA_SUCCESS) { 3653 if (rval != QLA_SUCCESS) {
3656 DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Failed to get " 3654 DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Secondary boot target not"
3657 "secondary target\n", __func__)); 3655 " configured\n", __func__));
3658 } else 3656 } else
3659 ret = QLA_SUCCESS; 3657 ret = QLA_SUCCESS;
3660 3658