]> git.karo-electronics.de Git - linux-beck.git/commitdiff
[SCSI] qla4xxx: Modified debug log messages for boot info.
authorManish Rangankar <manish.rangankar@qlogic.com>
Mon, 13 Feb 2012 13:00:43 +0000 (18:30 +0530)
committerJames Bottomley <JBottomley@Parallels.com>
Sun, 19 Feb 2012 15:32:12 +0000 (09:32 -0600)
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>
drivers/scsi/qla4xxx/ql4_os.c

index a9ff05e24f34b2406fab1805cb3a8eef219bea66..3339cc1e3390b0fb43a3761cba41e51c4b7d9477 100644 (file)
@@ -3393,9 +3393,8 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
                /* Check Boot Mode */
                val = rd_nvram_byte(ha, addr);
                if (!(val & 0x07)) {
-                       DEBUG2(ql4_printk(KERN_ERR, ha,
-                                         "%s: Failed Boot options : 0x%x\n",
-                                         __func__, val));
+                       DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Adapter boot "
+                                         "options : 0x%x\n", __func__, val));
                        ret = QLA_ERROR;
                        goto exit_boot_info;
                }
@@ -3440,9 +3439,8 @@ static int get_fw_boot_info(struct scsi_qla_host *ha, uint16_t ddb_index[])
                }
                /* Check Boot Mode */
                if (!(buf[1] & 0x07)) {
-                       DEBUG2(ql4_printk(KERN_INFO, ha,
-                                         "Failed: Boot options : 0x%x\n",
-                                         buf[1]));
+                       DEBUG2(ql4_printk(KERN_INFO, ha, "Firmware boot options"
+                                         " : 0x%x\n", buf[1]));
                        ret = QLA_ERROR;
                        goto exit_boot_info_free;
                }
@@ -3548,8 +3546,8 @@ static int qla4xxx_get_boot_target(struct scsi_qla_host *ha,
 
        if (qla4xxx_bootdb_by_index(ha, fw_ddb_entry,
                                   fw_ddb_entry_dma, ddb_index)) {
-               DEBUG2(ql4_printk(KERN_ERR, ha,
-                                 "%s: Flash DDB read Failed\n", __func__));
+               DEBUG2(ql4_printk(KERN_INFO, ha, "%s: No Flash DDB found at "
+                                 "index [%d]\n", __func__, ddb_index));
                ret = QLA_ERROR;
                goto exit_boot_target;
        }
@@ -3627,8 +3625,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
        ddb_index[1] = 0xffff;
        ret = get_fw_boot_info(ha, ddb_index);
        if (ret != QLA_SUCCESS) {
-               DEBUG2(ql4_printk(KERN_ERR, ha,
-                                 "%s: Failed to set boot info.\n", __func__));
+               DEBUG2(ql4_printk(KERN_INFO, ha,
+                               "%s: No boot target configured.\n", __func__));
                return ret;
        }
 
@@ -3641,8 +3639,8 @@ static int qla4xxx_get_boot_info(struct scsi_qla_host *ha)
        rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_pri_sess),
                                      ddb_index[0]);
        if (rval != QLA_SUCCESS) {
-               DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Failed to get "
-                                 "primary target\n", __func__));
+               DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Primary boot target not "
+                                 "configured\n", __func__));
        } else
                ret = QLA_SUCCESS;
 
@@ -3653,8 +3651,8 @@ sec_target:
        rval = qla4xxx_get_boot_target(ha, &(ha->boot_tgt.boot_sec_sess),
                                      ddb_index[1]);
        if (rval != QLA_SUCCESS) {
-               DEBUG2(ql4_printk(KERN_ERR, ha, "%s: Failed to get "
-                                 "secondary target\n", __func__));
+               DEBUG2(ql4_printk(KERN_INFO, ha, "%s: Secondary boot target not"
+                                 " configured\n", __func__));
        } else
                ret = QLA_SUCCESS;