scsi: qla2xxx: Improved secure flash support messages

This patch improved message for Secure Flash support.  No
functionality has been changed.

Link: https://lore.kernel.org/r/20200226224022.24518-6-hmadhani@marvell.com
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Michael Hernandez <mhernandez@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 23a9617fe035eb1f873d912ce35eb20a486a494d..87b2d62b91f96369cea91b46526f0bab9aedbca2 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2219,10 +2219,10 @@ qla2x00_initialize_adapter(scsi_qla_host_t *vha)
 
        /* Check for secure flash support */
        if (IS_QLA28XX(ha)) {
-               if (RD_REG_DWORD(&reg->mailbox12) & BIT_0) {
-                       ql_log(ql_log_info, vha, 0xffff, "Adapter is Secure\n");
+               if (RD_REG_DWORD(&reg->mailbox12) & BIT_0)
                        ha->flags.secure_adapter = 1;
-               }
+               ql_log(ql_log_info, vha, 0xffff, "Secure Adapter: %s\n",
+                   (ha->flags.secure_adapter) ? "Yes" : "No");
        }
 
 

diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c
index 0f0af3c2cf813abdc11120e4cd40367282e18bfa..938b4e4190c959f13cbd46a99700f1258e375188 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_mbx.c
+++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -1135,11 +1135,13 @@ qla2x00_get_fw_version(scsi_qla_host_t *vha)
                ha->fw_ddr_ram_start = (mcp->mb[23] << 16) | mcp->mb[22];
                ha->fw_ddr_ram_end = (mcp->mb[25] << 16) | mcp->mb[24];
                if (IS_QLA28XX(ha)) {
-                       if (mcp->mb[16] & BIT_10) {
-                               ql_log(ql_log_info, vha, 0xffff,
-                                   "FW support secure flash updates\n");
+                       if (mcp->mb[16] & BIT_10)
                                ha->flags.secure_fw = 1;
-                       }
+
+                       ql_log(ql_log_info, vha, 0xffff,
+                           "Secure Flash Update in FW: %s\n",
+                           (ha->flags.secure_fw) ? "Supported" :
+                           "Not Supported");
                }
        }