ath6kl: use firmware version from FW IE

Need to have different FW versioning for different FW binaries.
This is handled by appending different meta data in firmware
binaries.

kvalo: add an empty line before a debug message, use '0' instead of '0x00',
fix indentation

Signed-off-by: Naveen Singh <navesing@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>

2 files changed, 21 insertions, 9 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/init.c b/drivers/net/wireless/ath/ath6kl/init.c
index daf24ee9d28a..62e25ccd1016 100644
--- a/drivers/net/wireless/ath/ath6kl/init.c
+++ b/drivers/net/wireless/ath/ath6kl/init.c
@@ -943,6 +943,14 @@ static int ath6kl_fetch_fw_apin(struct ath6kl *ar, const char *name)
                 }
 
                 switch (ie_id) {
+                case ATH6KL_FW_IE_FW_VERSION:
+                        strlcpy(ar->wiphy->fw_version, data,
+                                sizeof(ar->wiphy->fw_version));
+
+                        ath6kl_dbg(ATH6KL_DBG_BOOT,
+                                   "found fw version %s\n",
+                                    ar->wiphy->fw_version);
+                        break;
                 case ATH6KL_FW_IE_OTP_IMAGE:
                         ath6kl_dbg(ATH6KL_DBG_BOOT, "found otp image ie (%zd B)\n",
                                    ie_len);
diff --git a/drivers/net/wireless/ath/ath6kl/main.c b/drivers/net/wireless/ath/ath6kl/main.c
index 3e6768ae80af..45621baca24a 100644
--- a/drivers/net/wireless/ath/ath6kl/main.c
+++ b/drivers/net/wireless/ath/ath6kl/main.c
@@ -554,20 +554,24 @@ void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver,
         struct ath6kl *ar = devt;
 
         memcpy(ar->mac_addr, datap, ETH_ALEN);
-        ath6kl_dbg(ATH6KL_DBG_TRC, "%s: mac addr = %pM\n",
-                   __func__, ar->mac_addr);
+
+        ath6kl_dbg(ATH6KL_DBG_BOOT,
+                   "ready event mac addr %pM sw_ver 0x%x abi_ver 0x%x cap 0x%x\n",
+                   ar->mac_addr, sw_ver, abi_ver, cap);
 
         ar->version.wlan_ver = sw_ver;
         ar->version.abi_ver = abi_ver;
         ar->hw.cap = cap;
 
-        snprintf(ar->wiphy->fw_version,
-                 sizeof(ar->wiphy->fw_version),
-                 "%u.%u.%u.%u",
-                 (ar->version.wlan_ver & 0xf0000000) >> 28,
-                 (ar->version.wlan_ver & 0x0f000000) >> 24,
-                 (ar->version.wlan_ver & 0x00ff0000) >> 16,
-                 (ar->version.wlan_ver & 0x0000ffff));
+        if (strlen(ar->wiphy->fw_version) == 0) {
+                snprintf(ar->wiphy->fw_version,
+                         sizeof(ar->wiphy->fw_version),
+                         "%u.%u.%u.%u",
+                         (ar->version.wlan_ver & 0xf0000000) >> 28,
+                         (ar->version.wlan_ver & 0x0f000000) >> 24,
+                         (ar->version.wlan_ver & 0x00ff0000) >> 16,
+                         (ar->version.wlan_ver & 0x0000ffff));
+        }
 
         /* indicate to the waiting thread that the ready event was received */
         set_bit(WMI_READY, &ar->flag);