kernel/mac80211: skip ath10k OTP check if caldata found

Signed-off-by: Ash Benz <ash.benz@bk.ru>

diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
new file mode 100644 (file)
index 0000000..39aba41
--- /dev/null
+++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
@@ -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);