Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53513c30 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath10k: bump up FW API to 5 



Firmware 10.2.4.48-3 now supports management frames over HTT feature and has
ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX. But as 10.2.4 branch has conflicting HTT ids
patch "ath10k: add ATH10K_FW_IE_HTT_OP_VERSION" is needed to fix the issue.
Older ath10k versions don't have support that support and to maintain backwards
compatibility we need bump up the FW API to 5 not break older versions.

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 8348db29

drivers/net/wireless/ath/ath10k/core.c

+7 −0
Original line number Diff line number Diff line
@@ -741,6 +741,13 @@ static int ath10k_core_fetch_firmware_files(struct ath10k *ar) 
	/* calibration file is optional, don't check for any errors */

	ath10k_fetch_cal_file(ar);



	ar->fw_api = 5;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);



	ret = ath10k_core_fetch_firmware_api_n(ar, ATH10K_FW_API5_FILE);

	if (ret == 0)

		goto success;



	ar->fw_api = 4;

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);

drivers/net/wireless/ath/ath10k/hw.h

+3 −0
Original line number Diff line number Diff line
@@ -78,6 +78,9 @@ enum qca6174_chip_id_rev { 
/* added support for ATH10K_FW_IE_WMI_OP_VERSION */

#define ATH10K_FW_API4_FILE		"firmware-4.bin"



/* HTT id conflict fix for management frames over HTT */

#define ATH10K_FW_API5_FILE		"firmware-5.bin"



#define ATH10K_FW_UTF_FILE		"utf.bin"



/* includes also the null byte */

drivers/net/wireless/ath/ath10k/pci.c

+1 −0
Original line number Diff line number Diff line
@@ -2780,6 +2780,7 @@ MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_FW_FILE); 
MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API2_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API3_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA988X_HW_2_0_FW_DIR "/" QCA988X_HW_2_0_BOARD_DATA_FILE);



/* QCA6174 2.1 firmware files */