OSDN Git Service

mac80211: ath10k: backport bus and device specific API 1 BDF selection
authorRobert Marko <robimarko@gmail.com>
Tue, 30 Nov 2021 09:37:41 +0000 (10:37 +0100)
committerHauke Mehrtens <hauke@hauke-m.de>
Thu, 19 May 2022 09:07:02 +0000 (11:07 +0200)
Some ath10k IPQ40xx devices like the MikroTik hAP ac2 and ac3 require the
BDF-s to be extracted from the device storage instead of shipping packaged
API 2 BDF-s.

This is required as MikroTik has started shipping boards that require BDF-s
to be updated, as otherwise their WLAN performance really suffers.
This is however impossible as the devices that require this are release under
the same revision and its not possible to differentiate them from devices
using the older BDF-s.

In OpenWrt we are extracting the calibration data during runtime and we are
able to extract the BDF-s in the same manner, however we cannot package the
BDF-s to API 2 format on the fly and can only use API 1 to provide BDF-s on
the fly.
This is an issue as the ath10k driver explicitly looks only for the board.bin
file and not for something like board-bus-device.bin like it does for pre-cal
data.
Due to this we have no way of providing correct BDF-s on the fly, so lets
extend the ath10k driver to first look for BDF-s in the board-bus-device.bin
format, for example: board-ahb-a800000.wifi.bin
If that fails, look for the default board file name as defined previously.

So, backport the upstream ath10k patch.

Signed-off-by: Robert Marko <robimarko@gmail.com>
package/kernel/mac80211/patches/ath10k/100-ath10k-support-bus-and-device-specific-API-1-BDF-sel.patch [new file with mode: 0644]
package/kernel/mac80211/patches/ath10k/120-ath10k-fetch-calibration-data-via-nvmem-subsystem.patch
package/kernel/mac80211/patches/ath10k/921-ath10k_init_devices_synchronously.patch
package/kernel/mac80211/patches/ath10k/974-ath10k_add-LED-and-GPIO-controlling-support-for-various-chipsets.patch
package/kernel/mac80211/patches/ath10k/984-ath10k-Try-to-get-mac-address-from-dts.patch
package/kernel/mac80211/patches/ath9k/580-ath9k_ar9561_fix_bias_level.patch

diff --git a/package/kernel/mac80211/patches/ath10k/100-ath10k-support-bus-and-device-specific-API-1-BDF-sel.patch b/package/kernel/mac80211/patches/ath10k/100-ath10k-support-bus-and-device-specific-API-1-BDF-sel.patch
new file mode 100644 (file)
index 0000000..74d5b37
--- /dev/null
@@ -0,0 +1,65 @@
+From f2a7064a78b22f2b68b9fcbc8a6f4c5e61c5ba64 Mon Sep 17 00:00:00 2001
+From: Robert Marko <robimarko@gmail.com>
+Date: Sun, 10 Oct 2021 00:17:11 +0200
+Subject: [PATCH] ath10k: support bus and device specific API 1 BDF selection
+
+Some ath10k IPQ40xx devices like the MikroTik hAP ac2 and ac3 require the
+BDF-s to be extracted from the device storage instead of shipping packaged
+API 2 BDF-s.
+
+This is required as MikroTik has started shipping boards that require BDF-s
+to be updated, as otherwise their WLAN performance really suffers.
+This is however impossible as the devices that require this are release
+under the same revision and its not possible to differentiate them from
+devices using the older BDF-s.
+
+In OpenWrt we are extracting the calibration data during runtime and we are
+able to extract the BDF-s in the same manner, however we cannot package the
+BDF-s to API 2 format on the fly and can only use API 1 to provide BDF-s on
+the fly.
+This is an issue as the ath10k driver explicitly looks only for the
+board.bin file and not for something like board-bus-device.bin like it does
+for pre-cal data.
+Due to this we have no way of providing correct BDF-s on the fly, so lets
+extend the ath10k driver to first look for BDF-s in the
+board-bus-device.bin format, for example: board-ahb-a800000.wifi.bin
+If that fails, look for the default board file name as defined previously.
+
+Signed-off-by: Robert Marko <robimarko@gmail.com>
+Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
+Link: https://lore.kernel.org/r/20211009221711.2315352-1-robimarko@gmail.com
+---
+ drivers/net/wireless/ath/ath10k/core.c | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/ath/ath10k/core.c
++++ b/drivers/net/wireless/ath/ath10k/core.c
+@@ -1199,6 +1199,7 @@ success:
+ static int ath10k_core_fetch_board_data_api_1(struct ath10k *ar, int bd_ie_type)
+ {
+       const struct firmware *fw;
++      char boardname[100];
+       if (bd_ie_type == ATH10K_BD_IE_BOARD) {
+               if (!ar->hw_params.fw.board) {
+@@ -1206,9 +1207,19 @@ static int ath10k_core_fetch_board_data_
+                       return -EINVAL;
+               }
++              scnprintf(boardname, sizeof(boardname), "board-%s-%s.bin",
++                        ath10k_bus_str(ar->hif.bus), dev_name(ar->dev));
++
+               ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar,
+                                                               ar->hw_params.fw.dir,
+-                                                              ar->hw_params.fw.board);
++                                                              boardname);
++              if (IS_ERR(ar->normal_mode_fw.board)) {
++                      fw = ath10k_fetch_fw_file(ar,
++                                                ar->hw_params.fw.dir,
++                                                ar->hw_params.fw.board);
++                      ar->normal_mode_fw.board = fw;
++              }
++
+               if (IS_ERR(ar->normal_mode_fw.board))
+                       return PTR_ERR(ar->normal_mode_fw.board);
index bebd5fe..ab42c6e 100644 (file)
@@ -44,7 +44,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
                bmi_board_id_param = BMI_PARAM_GET_FLASH_BOARD_ID;
        else
                bmi_board_id_param = BMI_PARAM_GET_EEPROM_BOARD_ID;
-@@ -1743,7 +1745,8 @@ static int ath10k_download_and_run_otp(s
+@@ -1754,7 +1756,8 @@ static int ath10k_download_and_run_otp(s
  
        /* As of now pre-cal is valid for 10_4 variants */
        if (ar->cal_mode == ATH10K_PRE_CAL_MODE_DT ||
@@ -54,7 +54,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
                bmi_otp_exe_param = BMI_PARAM_FLASH_SECTION_ALL;
  
        ret = ath10k_bmi_execute(ar, address, bmi_otp_exe_param, &result);
-@@ -1870,6 +1873,39 @@ out_free:
+@@ -1881,6 +1884,39 @@ out_free:
        return ret;
  }
  
@@ -94,7 +94,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
  int ath10k_core_fetch_firmware_api_n(struct ath10k *ar, const char *name,
                                     struct ath10k_fw_file *fw_file)
  {
-@@ -2104,6 +2140,18 @@ static int ath10k_core_pre_cal_download(
+@@ -2115,6 +2151,18 @@ static int ath10k_core_pre_cal_download(
  {
        int ret;
  
@@ -113,7 +113,7 @@ Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
        ret = ath10k_download_cal_file(ar, ar->pre_cal_file);
        if (ret == 0) {
                ar->cal_mode = ATH10K_PRE_CAL_MODE_FILE;
-@@ -2170,6 +2218,18 @@ static int ath10k_download_cal_data(stru
+@@ -2181,6 +2229,18 @@ static int ath10k_download_cal_data(stru
                   "pre cal download procedure failed, try cal file: %d\n",
                   ret);
  
index b6ae2c7..5362c24 100644 (file)
@@ -14,7 +14,7 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
 
 --- a/drivers/net/wireless/ath/ath10k/core.c
 +++ b/drivers/net/wireless/ath/ath10k/core.c
-@@ -3429,6 +3429,16 @@ int ath10k_core_register(struct ath10k *
+@@ -3440,6 +3440,16 @@ int ath10k_core_register(struct ath10k *
  
        queue_work(ar->workqueue, &ar->register_work);
  
index 6db2430..f63f45d 100644 (file)
@@ -172,7 +172,7 @@ v13:
                .patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
                .uart_pin = 7,
                .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
-@@ -3144,6 +3150,10 @@ int ath10k_core_start(struct ath10k *ar,
+@@ -3155,6 +3161,10 @@ int ath10k_core_start(struct ath10k *ar,
                goto err_hif_stop;
        }
  
@@ -183,7 +183,7 @@ v13:
        return 0;
  
  err_hif_stop:
-@@ -3402,9 +3412,18 @@ static void ath10k_core_register_work(st
+@@ -3413,9 +3423,18 @@ static void ath10k_core_register_work(st
                goto err_spectral_destroy;
        }
  
@@ -202,7 +202,7 @@ v13:
  err_spectral_destroy:
        ath10k_spectral_destroy(ar);
  err_debug_destroy:
-@@ -3450,6 +3469,8 @@ void ath10k_core_unregister(struct ath10
+@@ -3461,6 +3480,8 @@ void ath10k_core_unregister(struct ath10
        if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
                return;
  
index 4077b2f..d94a8a8 100644 (file)
@@ -26,7 +26,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  #include <linux/property.h>
  #include <linux/dmi.h>
  #include <linux/ctype.h>
-@@ -3320,6 +3321,8 @@ static int ath10k_core_probe_fw(struct a
+@@ -3331,6 +3332,8 @@ static int ath10k_core_probe_fw(struct a
  
        device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
  
index e4c2e1c..b883177 100644 (file)
@@ -29,8 +29,6 @@ v2: Adjust #define per Felix's suggestion
  drivers/net/wireless/ath/ath9k/ar9003_phy.h | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-index a171dbb29..ad949eb02 100644
 --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
 @@ -720,7 +720,7 @@
@@ -42,6 +40,3 @@ index a171dbb29..ad949eb02 100644
  
  #define AR_CH0_XTAL           (AR_SREV_9300(ah) ? 0x16294 : \
                                 ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16298 : \
--- 
-2.30.2
-