net/ice/base: read option ROM combo version from CIVD

The driver currently reads the combo image version data from within the
Boot Configuration TLV block of the PFA area of the NVM. This allows
access to the active Option ROM version data, assuming that it has been
properly copied into this section.

There is no equivalent method for reading the Option ROM version data
from a pending Option ROM update, as it will not yet have been copied
into the PFA boot configuration block. Instead, replace this
implementation with one which scans for the CIVD data section of the
Option ROM image data.

This CIVD data is stored in a packed structured format within the Option
ROM. It is always aligned to a 512 byte boundary, and starts with
a special '$CIV' 4-byte signature. Data integrity is checked using
a simple modulo 256 sum of the structure bytes.

Implement a new ice_get_orom_civd_data function which allows reading
from the selected flash bank (active or inactive), and scans for valid
CIVD data. Use this instead of the boot configuration TLV in order to
report the combo version data of precisely what is in the Option ROM
data.

To allow access to reading the inactive Option ROM bank, introduce a new
ice_get_inactive_orom_ver function. Use of a new function is done in
order to avoid leaking the bank selection abstraction outside of
ice_nvm.c

With this new function, the driver can now read and display the version
of the to-be-activated Option ROM when an update has been initiated but
not yet finalized.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
Acked-by: Qiming Yang <qiming.yang@intel.com>

diff --git a/drivers/net/ice/base/ice_nvm.c b/drivers/net/ice/base/ice_nvm.c
index e2c9068..71affd1 100644 (file)
--- a/drivers/net/ice/base/ice_nvm.c
+++ b/drivers/net/ice/base/ice_nvm.c
@@ -629,64 +629,109 @@ static enum ice_status ice_get_orom_srev(struct ice_hw *hw, enum ice_bank_select
 }
 
 /**
- * ice_get_orom_ver_info - Read Option ROM version information
+ * ice_get_orom_civd_data - Get the combo version information from Option ROM
  * @hw: pointer to the HW struct
- * @orom: pointer to Option ROM info structure
+ * @bank: whether to read from the active or inactive flash module
+ * @civd: storage for the Option ROM CIVD data.
  *
- * Read the Combo Image version data from the Boot Configuration TLV and fill
- * in the option ROM version data.
+ * Searches through the Option ROM flash contents to locate the CIVD data for
+ * the image.
  */
 static enum ice_status
-ice_get_orom_ver_info(struct ice_hw *hw, struct ice_orom_info *orom)
+ice_get_orom_civd_data(struct ice_hw *hw, enum ice_bank_select bank,
+                      struct ice_orom_civd_info *civd)
 {
-       u16 combo_hi, combo_lo, boot_cfg_tlv, boot_cfg_tlv_len;
+       struct ice_orom_civd_info tmp;
        enum ice_status status;
-       u32 combo_ver;
-
-       status = ice_get_pfa_module_tlv(hw, &boot_cfg_tlv, &boot_cfg_tlv_len,
-                                       ICE_SR_BOOT_CFG_PTR);
-       if (status) {
-               ice_debug(hw, ICE_DBG_INIT, "Failed to read Boot Configuration Block TLV.\n");
-               return status;
-       }
+       u32 offset;
 
-       /* Boot Configuration Block must have length at least 2 words
-        * (Combo Image Version High and Combo Image Version Low)
+       /* The CIVD section is located in the Option ROM aligned to 512 bytes.
+        * The first 4 bytes must contain the ASCII characters "$CIV".
+        * A simple modulo 256 sum of all of the bytes of the structure must
+        * equal 0.
         */
-       if (boot_cfg_tlv_len < 2) {
-               ice_debug(hw, ICE_DBG_INIT, "Invalid Boot Configuration Block TLV size.\n");
-               return ICE_ERR_INVAL_SIZE;
-       }
+       for (offset = 0; (offset + 512) <= hw->flash.banks.orom_size; offset += 512) {
+               u8 sum = 0, i;
 
-       status = ice_read_sr_word(hw, (boot_cfg_tlv + ICE_NVM_OROM_VER_OFF),
-                                 &combo_hi);
-       if (status) {
-               ice_debug(hw, ICE_DBG_INIT, "Failed to read OROM_VER hi.\n");
-               return status;
+               status = ice_read_flash_module(hw, bank, ICE_SR_1ST_OROM_BANK_PTR,
+                                              offset, (u8 *)&tmp, sizeof(tmp));
+               if (status) {
+                       ice_debug(hw, ICE_DBG_NVM, "Unable to read Option ROM CIVD data\n");
+                       return status;
+               }
+
+               /* Skip forward until we find a matching signature */
+               if (memcmp("$CIV", tmp.signature, sizeof(tmp.signature)) != 0)
+                       continue;
+
+               /* Verify that the simple checksum is zero */
+               for (i = 0; i < sizeof(tmp); i++)
+                       sum += ((u8 *)&tmp)[i];
+
+               if (sum) {
+                       ice_debug(hw, ICE_DBG_NVM, "Found CIVD data with invalid checksum of %u\n",
+                                 sum);
+                       return ICE_ERR_NVM;
+               }
+
+               *civd = tmp;
+               return ICE_SUCCESS;
        }
 
-       status = ice_read_sr_word(hw, (boot_cfg_tlv + ICE_NVM_OROM_VER_OFF + 1),
-                                 &combo_lo);
+       return ICE_ERR_NVM;
+}
+
+/**
+ * ice_get_orom_ver_info - Read Option ROM version information
+ * @hw: pointer to the HW struct
+ * @bank: whether to read from the active or inactive flash module
+ * @orom: pointer to Option ROM info structure
+ *
+ * Read Option ROM version and security revision from the Option ROM flash
+ * section.
+ */
+static enum ice_status
+ice_get_orom_ver_info(struct ice_hw *hw, enum ice_bank_select bank, struct ice_orom_info *orom)
+{
+       struct ice_orom_civd_info civd;
+       enum ice_status status;
+       u32 combo_ver;
+
+       status = ice_get_orom_civd_data(hw, bank, &civd);
        if (status) {
-               ice_debug(hw, ICE_DBG_INIT, "Failed to read OROM_VER lo.\n");
+               ice_debug(hw, ICE_DBG_NVM, "Failed to locate valid Option ROM CIVD data\n");
                return status;
        }
 
-       combo_ver = ((u32)combo_hi << 16) | combo_lo;
+       combo_ver = LE32_TO_CPU(civd.combo_ver);
 
-       orom->major = (u8)((combo_ver & ICE_OROM_VER_MASK) >>
-                          ICE_OROM_VER_SHIFT);
+       orom->major = (u8)((combo_ver & ICE_OROM_VER_MASK) >> ICE_OROM_VER_SHIFT);
        orom->patch = (u8)(combo_ver & ICE_OROM_VER_PATCH_MASK);
-       orom->build = (u16)((combo_ver & ICE_OROM_VER_BUILD_MASK) >>
-                           ICE_OROM_VER_BUILD_SHIFT);
+       orom->build = (u16)((combo_ver & ICE_OROM_VER_BUILD_MASK) >> ICE_OROM_VER_BUILD_SHIFT);
 
-       status = ice_get_orom_srev(hw, ICE_ACTIVE_FLASH_BANK, &orom->srev);
-       if (status)
+       status = ice_get_orom_srev(hw, bank, &orom->srev);
+       if (status) {
                ice_debug(hw, ICE_DBG_NVM, "Failed to read Option ROM security revision.\n");
+               return status;
+       }
 
        return ICE_SUCCESS;
 }
 
+/**
+ * ice_get_inactive_orom_ver - Read Option ROM version from the inactive bank
+ * @hw: pointer to the HW structure
+ * @orom: storage for Option ROM version information
+ *
+ * Reads the Option ROM version and security revision data for the inactive
+ * section of flash. Used to access version data for a pending update that has
+ * not yet been activated.
+ */
+enum ice_status ice_get_inactive_orom_ver(struct ice_hw *hw, struct ice_orom_info *orom)
+{
+       return ice_get_orom_ver_info(hw, ICE_INACTIVE_FLASH_BANK, orom);
+}
+
 /**
  * ice_discover_flash_size - Discover the available flash size.
  * @hw: pointer to the HW struct
@@ -937,11 +982,9 @@ enum ice_status ice_init_nvm(struct ice_hw *hw)
                return status;
        }
 
-       status = ice_get_orom_ver_info(hw, &flash->orom);
-       if (status) {
+       status = ice_get_orom_ver_info(hw, ICE_ACTIVE_FLASH_BANK, &flash->orom);
+       if (status)
                ice_debug(hw, ICE_DBG_INIT, "Failed to read Option ROM info.\n");
-               return status;
-       }
 
        return ICE_SUCCESS;
 }

diff --git a/drivers/net/ice/base/ice_nvm.h b/drivers/net/ice/base/ice_nvm.h
index 8e2eb4d..74fd163 100644 (file)
--- a/drivers/net/ice/base/ice_nvm.h
+++ b/drivers/net/ice/base/ice_nvm.h
@@ -26,6 +26,17 @@
 #define ICE_NVM_REG_RW_MODULE  0x0
 #define ICE_NVM_REG_RW_FLAGS   0x1
 
+#pragma pack(1)
+struct ice_orom_civd_info {
+       u8 signature[4];        /* Must match ASCII '$CIV' characters */
+       u8 checksum;            /* Simple modulo 256 sum of all structure bytes must equal 0 */
+       __le32 combo_ver;       /* Combo Image Version number */
+       u8 combo_name_len;      /* Length of the unicode combo image version string, max of 32 */
+       __le16 combo_name[32];  /* Unicode string representing the Combo Image version */
+};
+
+#pragma pack()
+
 #define ICE_NVM_ACCESS_MAJOR_VER       0
 #define ICE_NVM_ACCESS_MINOR_VER       5
 
@@ -98,6 +109,8 @@ enum ice_status
 ice_get_pfa_module_tlv(struct ice_hw *hw, u16 *module_tlv, u16 *module_tlv_len,
                       u16 module_type);
 enum ice_status
+ice_get_inactive_orom_ver(struct ice_hw *hw, struct ice_orom_info *orom);
+enum ice_status
 ice_read_pba_string(struct ice_hw *hw, u8 *pba_num, u32 pba_num_size);
 enum ice_status ice_init_nvm(struct ice_hw *hw);
 enum ice_status ice_read_sr_word(struct ice_hw *hw, u16 offset, u16 *data);