Commit b5b6f6a9 authored by Naveen Singh's avatar Naveen Singh Committed by Kalle Valo
Browse files

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: default avatarNaveen Singh <navesing@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 7940bad5

drivers/net/wireless/ath/ath6kl/init.c

+8 −0
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/ath/ath6kl/main.c

+13 −9
Original line number Diff line number Diff line
@@ -554,13 +554,16 @@ 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;



	if (strlen(ar->wiphy->fw_version) == 0) {

		snprintf(ar->wiphy->fw_version,

			 sizeof(ar->wiphy->fw_version),

			 "%u.%u.%u.%u",
@@ -568,6 +571,7 @@ void ath6kl_ready_event(void *devt, u8 *datap, u32 sw_ver, u32 abi_ver, 
			 (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);