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

Commit aad1fd7f authored by Ryan Hsu's avatar Ryan Hsu Committed by Kalle Valo
Browse files

ath10k: bump up FW API to 6 



For QCA6174 hw3.0, since WLAN.RM.4.4-00022-QCARMSWPZ-2, it starts to
support the board ID information from otp, with some devices released on
the market that didn't calibrated with OTP, will have 0 for board ID
information, which cause the backward compatibility issue and was fixed
in commit 'd2e202c0 ("ath10k: ignore configuring the incorrect board_id")'

So bump the fw api version to differentiate the latest firmware support.

Signed-off-by: default avatarRyan Hsu <ryanhsu@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent a4aab099

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

+4 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ enum qca9377_chip_id_rev { 
#define QCA4019_HW_1_0_PATCH_LOAD_ADDR  0x1234



#define ATH10K_FW_FILE_BASE		"firmware"

#define ATH10K_FW_API_MAX		5

#define ATH10K_FW_API_MAX		6

#define ATH10K_FW_API_MIN		2



#define ATH10K_FW_API2_FILE		"firmware-2.bin"
@@ -141,6 +141,9 @@ enum qca9377_chip_id_rev { 
/* HTT id conflict fix for management frames over HTT */

#define ATH10K_FW_API5_FILE		"firmware-5.bin"



/* the firmware-6.bin blob */

#define ATH10K_FW_API6_FILE		"firmware-6.bin"



#define ATH10K_FW_UTF_FILE		"utf.bin"

#define ATH10K_FW_UTF_API2_FILE		"utf-2.bin"

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

+1 −0
Original line number Diff line number Diff line
@@ -3428,6 +3428,7 @@ MODULE_FIRMWARE(QCA6174_HW_2_1_FW_DIR "/" ATH10K_BOARD_API2_FILE); 
/* QCA6174 3.1 firmware files */

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API4_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API5_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_FW_API6_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" QCA6174_HW_3_0_BOARD_DATA_FILE);

MODULE_FIRMWARE(QCA6174_HW_3_0_FW_DIR "/" ATH10K_BOARD_API2_FILE);