scsi: qla2xxx: Validate MCU signature before executing MBC 03h

FC firmware does not come online during on-the-fly upgrade i.e. on soft
reset.  To limit Load flash firmware, i.e. MBC 3 changes, validate MCU
signature before executing MBC 03h

Signed-off-by: Manish Rangankar <mrangankar@marvell.com>
Signed-off-by: Nilesh Javali <njavali@marvell.com>
Reviewed-by: Himanshu Madhani <hmadhani2024@gmail.com>
Link: https://patch.msgid.link/20251210101604.431868-5-njavali@marvell.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 04bc69bb11b11b09fbeca521ebe0a76645f0e1a7..7e693540c4349f2b54c5fb139ee2fd5119d4650c 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -4150,6 +4150,7 @@ struct qla_hw_data {
                uint32_t        eeh_flush:2;
 #define EEH_FLUSH_RDY  1
 #define EEH_FLUSH_DONE 2
+               uint32_t        secure_mcu:1;
        } flags;
 
        uint16_t max_exchg;
@@ -4415,6 +4416,8 @@ struct qla_hw_data {
        ((IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) &&\
         (ha->zio_mode == QLA_ZIO_MODE_6))
 
+#define IS_QLA28XX_SECURED(ha) (IS_QLA28XX(ha) && ha->flags.secure_mcu)
+
        /* HBA serial number */
        uint8_t         serial0;
        uint8_t         serial1;

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 5183ff8134877e806f68d6987036ae78032b67a9..9729e32012aa1d5ad01e0bf355ea0682d6d43bfd 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -9059,7 +9059,7 @@ qla81xx_load_risc(scsi_qla_host_t *vha, uint32_t *srisc_addr)
        qla27xx_get_active_image(vha, &active_regions);
 
        /* For 28XXX, always load the flash firmware using rom mbx */
-       if (IS_QLA28XX(ha)) {
+       if (IS_QLA28XX_SECURED(ha)) {
                rval = qla28xx_load_flash_firmware(vha);
                if (rval != QLA_SUCCESS) {
                        ql_log(ql_log_fatal, vha, 0x019e,

diff --git a/drivers/scsi/qla2xxx/qla_nx.h b/drivers/scsi/qla2xxx/qla_nx.h
index 5d1bdc15b75c2f209e0bc8efaa35e4ffcc6ab1b0..8e7a7f5f0adb271cd2fcec2fe1b70be00fa38d75 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_nx.h
+++ b/drivers/scsi/qla2xxx/qla_nx.h
@@ -892,6 +892,7 @@ struct ct6_dsd {
 #define        FA_VPD_SIZE_82XX        0x400
 
 #define FA_FLASH_LAYOUT_ADDR_82        0xFC400
+#define FA_FLASH_MCU_OFF       0x13000
 
 /******************************************************************************
 *

diff --git a/drivers/scsi/qla2xxx/qla_sup.c b/drivers/scsi/qla2xxx/qla_sup.c
index 9e7a407ba1b9a38fa92c28a8ec821bfd56ee1fd8..b6c36a8a2d60b49019a3b308053b55fe54234d41 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_sup.c
+++ b/drivers/scsi/qla2xxx/qla_sup.c
@@ -1084,6 +1084,32 @@ qla2xxx_get_idc_param(scsi_qla_host_t *vha)
        return;
 }
 
+static int qla28xx_validate_mcu_signature(scsi_qla_host_t *vha)
+{
+       struct qla_hw_data *ha = vha->hw;
+       struct req_que *req = ha->req_q_map[0];
+       uint32_t *dcode = (uint32_t *)req->ring;
+       uint32_t signature[2] = {0x000c0000, 0x00050000};
+       int ret = QLA_SUCCESS;
+
+       ret = qla24xx_read_flash_data(vha, dcode, FA_FLASH_MCU_OFF >> 2, 2);
+       if (ret) {
+               ql_log(ql_log_fatal, vha, 0x01ab,
+                      "-> Failed to read flash mcu signature.\n");
+               ret = QLA_FUNCTION_FAILED;
+               goto done;
+       }
+
+       ql_dbg(ql_dbg_init, vha, 0x01ac,
+               "Flash data 0x%08x 0x%08x.\n", dcode[0], dcode[1]);
+
+       if (!(dcode[0] == signature[0] && dcode[1] == signature[1]))
+               ret = QLA_FUNCTION_FAILED;
+
+done:
+       return ret;
+}
+
 int
 qla2xxx_get_flash_info(scsi_qla_host_t *vha)
 {
@@ -1096,6 +1122,9 @@ qla2xxx_get_flash_info(scsi_qla_host_t *vha)
            !IS_QLA27XX(ha) && !IS_QLA28XX(ha))
                return QLA_SUCCESS;
 
+       if (IS_QLA28XX(ha) && !qla28xx_validate_mcu_signature(vha))
+               ha->flags.secure_mcu = 1;
+
        ret = qla2xxx_find_flt_start(vha, &flt_addr);
        if (ret != QLA_SUCCESS)
                return ret;