iwlwifi: Handle new firmware file with ucode build number in header

Adding new API version to account for change to ucode file format.  New
header includes the build number of the ucode.  This build number is the
SVN revision thus allowing for exact correlation to the code that
generated it.

The header adds the build number so that older ucode images can also be
enhanced to include the build in the future.

some cleanup in iwl_read_ucode needed to ensure old header not used and
reduce unnecessary references through pointer with the data is already
in heap variable.

Signed-off-by: Jay Sternberg <jay.e.sternberg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

1 files changed, 32 insertions, 23 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index ad5002211ab4..6b874dab4120 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -1284,7 +1284,7 @@ static void iwl_nic_start(struct iwl_priv *priv)
  */
 static int iwl_read_ucode(struct iwl_priv *priv)
 {
-        struct iwl_ucode *ucode;
+        struct iwl_ucode_header *ucode;
         int ret = -EINVAL, index;
         const struct firmware *ucode_raw;
         const char *name_pre = priv->cfg->fw_name_pre;
@@ -1293,7 +1293,8 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         char buf[25];
         u8 *src;
         size_t len;
-        u32 api_ver, inst_size, data_size, init_size, init_data_size, boot_size;
+        u32 api_ver, build;
+        u32 inst_size, data_size, init_size, init_data_size, boot_size;
 
         /* Ask kernel firmware_class module to get the boot firmware off disk.
          * request_firmware() is synchronous, file is in memory on return. */
@@ -1323,23 +1324,26 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         if (ret < 0)
                 goto error;
 
-        /* Make sure that we got at least our header! */
-        if (ucode_raw->size < sizeof(*ucode)) {
+        /* Make sure that we got at least the v1 header! */
+        if (ucode_raw->size < priv->cfg->ops->ucode->get_header_size(1)) {
                 IWL_ERR(priv, "File size way too small!\n");
                 ret = -EINVAL;
                 goto err_release;
         }
 
         /* Data from ucode file:  header followed by uCode images */
-        ucode = (void *)ucode_raw->data;
+        ucode = (struct iwl_ucode_header *)ucode_raw->data;
 
         priv->ucode_ver = le32_to_cpu(ucode->ver);
         api_ver = IWL_UCODE_API(priv->ucode_ver);
-        inst_size = le32_to_cpu(ucode->inst_size);
-        data_size = le32_to_cpu(ucode->data_size);
-        init_size = le32_to_cpu(ucode->init_size);
-        init_data_size = le32_to_cpu(ucode->init_data_size);
-        boot_size = le32_to_cpu(ucode->boot_size);
+        build = priv->cfg->ops->ucode->get_build(ucode, api_ver);
+        inst_size = priv->cfg->ops->ucode->get_inst_size(ucode, api_ver);
+        data_size = priv->cfg->ops->ucode->get_data_size(ucode, api_ver);
+        init_size = priv->cfg->ops->ucode->get_init_size(ucode, api_ver);
+        init_data_size =
+                priv->cfg->ops->ucode->get_init_data_size(ucode, api_ver);
+        boot_size = priv->cfg->ops->ucode->get_boot_size(ucode, api_ver);
+        src = priv->cfg->ops->ucode->get_data(ucode, api_ver);
 
         /* api_ver should match the api version forming part of the
          * firmware filename ... but we don't check for that and only rely
@@ -1365,6 +1369,9 @@ static int iwl_read_ucode(struct iwl_priv *priv)
                IWL_UCODE_API(priv->ucode_ver),
                IWL_UCODE_SERIAL(priv->ucode_ver));
 
+        if (build)
+                IWL_DEBUG_INFO(priv, "Build %u\n", build);
+
         IWL_DEBUG_INFO(priv, "f/w package hdr ucode version raw = 0x%x\n",
                        priv->ucode_ver);
         IWL_DEBUG_INFO(priv, "f/w package hdr runtime inst size = %u\n",
@@ -1379,12 +1386,14 @@ static int iwl_read_ucode(struct iwl_priv *priv)
                        boot_size);
 
         /* Verify size of file vs. image size info in file's header */
-        if (ucode_raw->size < sizeof(*ucode) +
+        if (ucode_raw->size !=
+                priv->cfg->ops->ucode->get_header_size(api_ver) +
                 inst_size + data_size + init_size +
                 init_data_size + boot_size) {
 
-                IWL_DEBUG_INFO(priv, "uCode file size %d too small\n",
-                               (int)ucode_raw->size);
+                IWL_DEBUG_INFO(priv,
+                        "uCode file size %d does not match expected size\n",
+                        (int)ucode_raw->size);
                 ret = -EINVAL;
                 goto err_release;
         }
@@ -1464,42 +1473,42 @@ static int iwl_read_ucode(struct iwl_priv *priv)
         /* Copy images into buffers for card's bus-master reads ... */
 
         /* Runtime instructions (first block of data in file) */
-        src = &ucode->data[0];
-        len = priv->ucode_code.len;
+        len = inst_size;
         IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode instr len %Zd\n", len);
         memcpy(priv->ucode_code.v_addr, src, len);
+        src += len;
+
         IWL_DEBUG_INFO(priv, "uCode instr buf vaddr = 0x%p, paddr = 0x%08x\n",
                 priv->ucode_code.v_addr, (u32)priv->ucode_code.p_addr);
 
         /* Runtime data (2nd block)
          * NOTE:  Copy into backup buffer will be done in iwl_up()  */
-        src = &ucode->data[inst_size];
-        len = priv->ucode_data.len;
+        len = data_size;
         IWL_DEBUG_INFO(priv, "Copying (but not loading) uCode data len %Zd\n", len);
         memcpy(priv->ucode_data.v_addr, src, len);
         memcpy(priv->ucode_data_backup.v_addr, src, len);
+        src += len;
 
         /* Initialization instructions (3rd block) */
         if (init_size) {
-                src = &ucode->data[inst_size + data_size];
-                len = priv->ucode_init.len;
+                len = init_size;
                 IWL_DEBUG_INFO(priv, "Copying (but not loading) init instr len %Zd\n",
                                 len);
                 memcpy(priv->ucode_init.v_addr, src, len);
+                src += len;
         }
 
         /* Initialization data (4th block) */
         if (init_data_size) {
-                src = &ucode->data[inst_size + data_size + init_size];
-                len = priv->ucode_init_data.len;
+                len = init_data_size;
                 IWL_DEBUG_INFO(priv, "Copying (but not loading) init data len %Zd\n",
                                len);
                 memcpy(priv->ucode_init_data.v_addr, src, len);
+                src += len;
         }
 
         /* Bootstrap instructions (5th block) */
-        src = &ucode->data[inst_size + data_size + init_size + init_data_size];
-        len = priv->ucode_boot.len;
+        len = boot_size;
         IWL_DEBUG_INFO(priv, "Copying (but not loading) boot instr len %Zd\n", len);
         memcpy(priv->ucode_boot.v_addr, src, len);