| Message ID | 1491944688-5795-1-git-send-email-ryanhsu@qca.qualcomm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | aad1fd7f7677d05013b5fe247a5a6e1464c69a0f |
| Delegated to: | Kalle Valo |
| Headers | show |
ryanhsu@qti.qualcomm.com wrote: > From: Ryan Hsu <ryanhsu@qca.qualcomm.com> > > 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 'd2e202c06ca4 ("ath10k: ignore configuring the incorrect board_id")' > > So bump the fw api version to differentiate the latest firmware support. > > Signed-off-by: Ryan Hsu <ryanhsu@qca.qualcomm.com> Patch applied to ath-next branch of ath.git, thanks. aad1fd7f7677 ath10k: bump up FW API to 6
Kalle Valo <kvalo@qca.qualcomm.com> writes: > ryanhsu@qti.qualcomm.com wrote: >> From: Ryan Hsu <ryanhsu@qca.qualcomm.com> >> >> 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 'd2e202c06ca4 ("ath10k: ignore configuring the incorrect board_id")' >> >> So bump the fw api version to differentiate the latest firmware support. >> >> Signed-off-by: Ryan Hsu <ryanhsu@qca.qualcomm.com> > > Patch applied to ath-next branch of ath.git, thanks. > > aad1fd7f7677 ath10k: bump up FW API to 6 And I renamed the RM.4.4 firmware image also: https://github.com/kvalo/ath10k-firmware/commit/da1564dafe1c8175faf694482d1649f56229ae96
diff --git a/drivers/net/wireless/ath/ath10k/hw.h b/drivers/net/wireless/ath/ath10k/hw.h index f7c5c13..cd3dd11 100644 --- a/drivers/net/wireless/ath/ath10k/hw.h +++ b/drivers/net/wireless/ath/ath10k/hw.h @@ -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" diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 5d2f9b9..66e27a3 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -3429,6 +3429,7 @@ static void __exit ath10k_pci_exit(void) /* 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);