KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

kernel/mac80211: skip ath10k OTP check if caldata found

Browse source 
Signed-off-by: Ash Benz <ash.benz@bk.ru>
This commit is contained in:
Ash Benz 2016-05-27 22:26:46 +08:00 committed by John Crispin
parent cd36d71655
commit 867c0cb237
1 changed files with 42 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch Normal file
View file

@ -0,0 +1,42 @@
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1165,9 +1165,6 @@ static int ath10k_core_fetch_firmware_fi
{
int ret;
- /* 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);
@@ -1870,6 +1867,9 @@ static int ath10k_core_probe_fw(struct a
goto err_power_down;
}
+ /* calibration file is optional, don't check for any errors */
+ int calret = ath10k_fetch_cal_file(ar);
+
ret = ath10k_core_fetch_firmware_files(ar);
if (ret) {
ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
@@ -1892,11 +1892,14 @@ static int ath10k_core_probe_fw(struct a
"could not load pre cal data: %d\n", ret);
}
- ret = ath10k_core_get_board_id_from_otp(ar);
- if (ret && ret != -EOPNOTSUPP) {
- ath10k_err(ar, "failed to get board id from otp: %d\n",
- ret);
- goto err_free_firmware_files;
+ /* otp and board file not needed if calibration data is present */
+ if (calret) {
+ ret = ath10k_core_get_board_id_from_otp(ar);
+ if (ret && ret != -EOPNOTSUPP) {
+ ath10k_err(ar, "failed to get board id from otp: %d\n",
+ ret);
+ return ret;
+ }
}
ret = ath10k_core_fetch_board_file(ar);