ath10k-ct: Update to current version

This commit is contained in:
coolsnowwolf 2019-05-12 15:57:10 +08:00
parent aee3fbbcd0
commit 71b06caf2c
12 changed files with 72 additions and 72 deletions

View File

@ -64,92 +64,92 @@ define Download/ct-firmware-htt
URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT) URL_FILE:=$($(1)_FIRMWARE_FILE_CT_HTT)
endef endef
QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.007 QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.008
define Download/ath10k-firmware-qca988x-ct define Download/ath10k-firmware-qca988x-ct
$(call Download/ct-firmware,QCA988X,) $(call Download/ct-firmware,QCA988X,)
HASH:=56b8faa255d053404981fc0e2ffa8dec1aa6adfffd4e4a2af2b6ac25f131ecce HASH:=c2407cbdaaf143c9796e654aed026f0aa70fc93a82dd1244c62e95ede894e829
endef endef
$(eval $(call Download,ath10k-firmware-qca988x-ct)) $(eval $(call Download,ath10k-firmware-qca988x-ct))
QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.007 QCA988X_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.008
define Download/ath10k-firmware-qca988x-ct-htt define Download/ath10k-firmware-qca988x-ct-htt
$(call Download/ct-firmware-htt,QCA988X,) $(call Download/ct-firmware-htt,QCA988X,)
HASH:=f85296afae06548256167a58ecf58f11cc79aba7f96629124dc7b07611f4614f HASH:=789c4d1c8ac5edeb43d507157944102b564cd6970c365a14b50cab08ffa4e3b5
endef endef
$(eval $(call Download,ath10k-firmware-qca988x-ct-htt)) $(eval $(call Download,ath10k-firmware-qca988x-ct-htt))
QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.007 QCA9887_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-22.bin.lede.008
define Download/ath10k-firmware-qca9887-ct define Download/ath10k-firmware-qca9887-ct
$(call Download/ct-firmware,QCA9887,ath10k-9887) $(call Download/ct-firmware,QCA9887,ath10k-9887)
HASH:=d42d57ded7de4f8caf4bfd163db0910af7f0e155b11e484dbaa94c341f1e6dec HASH:=07692a63ab9d11a65c17cc896aff89ea33b7af4e0e1e51ae100651291afe3a4d
endef endef
$(eval $(call Download,ath10k-firmware-qca9887-ct)) $(eval $(call Download,ath10k-firmware-qca9887-ct))
QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.007 QCA9887_FIRMWARE_FILE_CT_HTT:=firmware-2-ct-full-htt-mgt-community-22.bin.lede.008
define Download/ath10k-firmware-qca9887-ct-htt define Download/ath10k-firmware-qca9887-ct-htt
$(call Download/ct-firmware-htt,QCA9887,ath10k-9887) $(call Download/ct-firmware-htt,QCA9887,ath10k-9887)
HASH:=2b016a6f59520925ff9996e458c26dde3422e2d142a36e235cca7aad822ad2b6 HASH:=ef336462d4a44ab9a0d89e83064124e647a9fb4a8af8be9df5724378611d2e82
endef endef
$(eval $(call Download,ath10k-firmware-qca9887-ct-htt)) $(eval $(call Download,ath10k-firmware-qca9887-ct-htt))
QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.007 QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.008
define Download/ath10k-firmware-qca99x0-ct define Download/ath10k-firmware-qca99x0-ct
$(call Download/ct-firmware,QCA99X0,ath10k-10-4b) $(call Download/ct-firmware,QCA99X0,ath10k-10-4b)
HASH:=3dbf966fdbad9e55936fa62516e2fcca2a5952030132407f80c41d7da819c82c HASH:=3357d7ba739512619ccd14043338cfe8e148d5d8e99343e3ccf7a2ff0d07d05f
endef endef
$(eval $(call Download,ath10k-firmware-qca99x0-ct)) $(eval $(call Download,ath10k-firmware-qca99x0-ct))
QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.007 QCA99X0_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.008
define Download/ath10k-firmware-qca99x0-ct-htt define Download/ath10k-firmware-qca99x0-ct-htt
$(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b) $(call Download/ct-firmware-htt,QCA99X0,ath10k-10-4b)
HASH:=c98993f541fbe02e88dfd3d5ed70bbaaad228776da29260348c5b00966682b69 HASH:=ce81e1b9b80b30263e9d5010e38fac3f005214fd955dc2cff95e7fe633796212
endef endef
$(eval $(call Download,ath10k-firmware-qca99x0-ct-htt)) $(eval $(call Download,ath10k-firmware-qca99x0-ct-htt))
QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.007 QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.008
define Download/ath10k-firmware-qca9984-ct define Download/ath10k-firmware-qca9984-ct
$(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b) $(call Download/ct-firmware,QCA9984,ath10k-9984-10-4b)
HASH:=1bdb2f62fb7f6947db992f0dc48b2864b51c7544ff8672a6c7570ecf2273054c HASH:=e2794ce577ff7942dc5f767a77fa52167f323bc8f50f04570fc5efe92ed761cf
endef endef
$(eval $(call Download,ath10k-firmware-qca9984-ct)) $(eval $(call Download,ath10k-firmware-qca9984-ct))
QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.007 QCA9984_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.008
define Download/ath10k-firmware-qca9984-ct-htt define Download/ath10k-firmware-qca9984-ct-htt
$(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b) $(call Download/ct-firmware-htt,QCA9984,ath10k-9984-10-4b)
HASH:=ff4c4f734711d4ead8a8ed226c5347073a9ce32b60b91d995f197b6e7809b7c6 HASH:=1f90555963c2e52ac8fc5581b2a0f9c658e3f5205844898bdc48c78d009bb6eb
endef endef
$(eval $(call Download,ath10k-firmware-qca9984-ct-htt)) $(eval $(call Download,ath10k-firmware-qca9984-ct-htt))
QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.007 QCA4019_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.008
define Download/ath10k-firmware-qca4019-ct define Download/ath10k-firmware-qca4019-ct
$(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b) $(call Download/ct-firmware,QCA4019,ath10k-4019-10-4b)
HASH:=98568845cf82dea679b1f4dee23f3d3eb39755c6bcdaeb89ed188e52e0f42b2d HASH:=4e73cf8e24e83df87d6dce2038e350b3f67753ccca37a8c0d1b861818991e6aa
endef endef
$(eval $(call Download,ath10k-firmware-qca4019-ct)) $(eval $(call Download,ath10k-firmware-qca4019-ct))
QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.007 QCA4019_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.008
define Download/ath10k-firmware-qca4019-ct-htt define Download/ath10k-firmware-qca4019-ct-htt
$(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b) $(call Download/ct-firmware-htt,QCA4019,ath10k-4019-10-4b)
HASH:=b791820962e26ba186d2310c024dd16c5ec44bfbbaf40bfeb77ab30bb297e75f HASH:=8f6434856d6f0207bc3f519cf50d2bf45df1bfcbc69b864ed02fcb5cd5ef6f4b
endef endef
$(eval $(call Download,ath10k-firmware-qca4019-ct-htt)) $(eval $(call Download,ath10k-firmware-qca4019-ct-htt))
QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.007 QCA9888_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-12.bin-lede.008
define Download/ath10k-firmware-qca9888-ct define Download/ath10k-firmware-qca9888-ct
$(call Download/ct-firmware,QCA9888,ath10k-9888-10-4b) $(call Download/ct-firmware,QCA9888,ath10k-9888-10-4b)
HASH:=f96e5d62c9b5d79cad0b0ff702cdd2644c408bcaeb1bd23f340f0425a002c8cd HASH:=6b627746f88c1bfecb872e72c61d6097192e389592e391630d2661b44f13b10d
endef endef
$(eval $(call Download,ath10k-firmware-qca9888-ct)) $(eval $(call Download,ath10k-firmware-qca9888-ct))
QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.007 QCA9888_FIRMWARE_FILE_CT_HTT:=firmware-5-ct-full-htt-mgt-community-12.bin-lede.008
define Download/ath10k-firmware-qca9888-ct-htt define Download/ath10k-firmware-qca9888-ct-htt
$(call Download/ct-firmware-htt,QCA9888,ath10k-9888-10-4b) $(call Download/ct-firmware-htt,QCA9888,ath10k-9888-10-4b)
HASH:=1f6d872f29d1635df55737458fc054adc64803638b4ad220ce0ccb13be5c0010 HASH:=4ef46b2bdd3ddc894f79da2dbf90ee04cb58781f3eb193840bd5fdb8624b447b
endef endef
$(eval $(call Download,ath10k-firmware-qca9888-ct-htt)) $(eval $(call Download,ath10k-firmware-qca9888-ct-htt))

View File

@ -8,9 +8,9 @@ PKG_LICENSE_FILES:=
PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2019-03-25 PKG_SOURCE_DATE:=2019-05-08
PKG_SOURCE_VERSION:=2e917efb607fdc807a8ec6e9ad8de176fc51d329 PKG_SOURCE_VERSION:=f98b6dc4d27ea2d79a1577285d1d5cb0641b3eb4
PKG_MIRROR_HASH:=290eeaaea84ab8112e06b66bb1edd78ae717ad4e04417893b936e4e6de8d5bf0 PKG_MIRROR_HASH:=ca2f0e9da25fc7140d26ddeeb8e929e172755aa0e41e4e92e5b87bb972b8ed41
# Build the 4.19 ath10k-ct driver version. Other options are "-4.16", or # Build the 4.19 ath10k-ct driver version. Other options are "-4.16", or
# leave un-defined for 4.7 kernel. Probably this should match as closely as # leave un-defined for 4.7 kernel. Probably this should match as closely as

View File

@ -98,7 +98,7 @@ Origin: upstream, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
scnprintf(name, name_len, scnprintf(name, name_len,
"bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s", "bus=%s,vendor=%04x,device=%04x,subsystem-vendor=%04x,subsystem-device=%04x%s",
ath10k_bus_str(ar->hif.bus), ath10k_bus_str(ar->hif.bus),
@@ -2977,7 +2999,11 @@ static int ath10k_core_probe_fw(struct a @@ -3014,7 +3036,11 @@ static int ath10k_core_probe_fw(struct a
ret = ath10k_core_check_smbios(ar); ret = ath10k_core_check_smbios(ar);
if (ret) if (ret)

View File

@ -97,7 +97,7 @@
ATH10K_DFS_STAT_INC(ar, pulses_total); ATH10K_DFS_STAT_INC(ar, pulses_total);
--- a/ath10k-4.13/wmi.c --- a/ath10k-4.13/wmi.c
+++ b/ath10k-4.13/wmi.c +++ b/ath10k-4.13/wmi.c
@@ -4030,7 +4030,7 @@ static void ath10k_dfs_radar_report(stru @@ -4033,7 +4033,7 @@ static void ath10k_dfs_radar_report(stru
ATH10K_DFS_STAT_INC(ar, pulses_detected); ATH10K_DFS_STAT_INC(ar, pulses_detected);
@ -108,7 +108,7 @@
return; return;
--- a/ath10k-4.16/wmi.c --- a/ath10k-4.16/wmi.c
+++ b/ath10k-4.16/wmi.c +++ b/ath10k-4.16/wmi.c
@@ -4105,7 +4105,7 @@ static void ath10k_dfs_radar_report(stru @@ -4117,7 +4117,7 @@ static void ath10k_dfs_radar_report(stru
ATH10K_DFS_STAT_INC(ar, pulses_detected); ATH10K_DFS_STAT_INC(ar, pulses_detected);

View File

@ -249,7 +249,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
goto success; goto success;
--- a/ath10k-4.16/core.c --- a/ath10k-4.16/core.c
+++ b/ath10k-4.16/core.c +++ b/ath10k-4.16/core.c
@@ -1562,14 +1562,61 @@ out: @@ -1563,14 +1563,61 @@ out:
return ret; return ret;
} }
@ -314,7 +314,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar, ar->normal_mode_fw.board = ath10k_fetch_fw_file(ar,
ar->hw_params.fw.dir, ar->hw_params.fw.dir,
@@ -1607,73 +1654,28 @@ static int ath10k_core_fetch_board_data_ @@ -1608,73 +1655,28 @@ static int ath10k_core_fetch_board_data_
data += magic_len; data += magic_len;
len -= magic_len; len -= magic_len;
@ -397,7 +397,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
return 0; return 0;
err: err:
@@ -1682,12 +1684,12 @@ err: @@ -1683,12 +1685,12 @@ err:
} }
static int ath10k_core_create_board_name(struct ath10k *ar, char *name, static int ath10k_core_create_board_name(struct ath10k *ar, char *name,
@ -412,7 +412,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
scnprintf(variant, sizeof(variant), ",variant=%s", scnprintf(variant, sizeof(variant), ",variant=%s",
ar->id.bdf_ext); ar->id.bdf_ext);
@@ -1713,21 +1715,31 @@ out: @@ -1714,21 +1716,31 @@ out:
static int ath10k_core_fetch_board_file(struct ath10k *ar) static int ath10k_core_fetch_board_file(struct ath10k *ar)
{ {

View File

@ -43,7 +43,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
static int ath10k_mac_get_max_vht_mcs_map(u16 mcs_map, int nss) static int ath10k_mac_get_max_vht_mcs_map(u16 mcs_map, int nss)
{ {
switch ((mcs_map >> (2 * nss)) & 0x3) { switch ((mcs_map >> (2 * nss)) & 0x3) {
@@ -6262,9 +6278,10 @@ static void ath10k_bss_info_changed(stru @@ -6333,9 +6349,10 @@ static void ath10k_bss_info_changed(stru
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
u32 vdev_param, pdev_param, slottime, preamble; u32 vdev_param, pdev_param, slottime, preamble;
u16 bitrate, hw_value; u16 bitrate, hw_value;
@ -56,7 +56,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
mutex_lock(&ar->conf_mutex); mutex_lock(&ar->conf_mutex);
@@ -6470,6 +6487,30 @@ static void ath10k_bss_info_changed(stru @@ -6541,6 +6558,30 @@ static void ath10k_bss_info_changed(stru
arvif->vdev_id, ret); arvif->vdev_id, ret);
} }

View File

@ -26,7 +26,7 @@ Origin: backport, https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux
if (ath10k_rates[i].bitrate == bitrate) if (ath10k_rates[i].bitrate == bitrate)
return hw_value_prefix | ath10k_rates[i].hw_value; return hw_value_prefix | ath10k_rates[i].hw_value;
} }
@@ -6493,22 +6493,22 @@ static void ath10k_bss_info_changed(stru @@ -6564,22 +6564,22 @@ static void ath10k_bss_info_changed(stru
return; return;
} }

View File

@ -17,7 +17,7 @@ Origin: other, https://patchwork.kernel.org/patch/10723033/
--- a/ath10k-4.19/mac.c --- a/ath10k-4.19/mac.c
+++ b/ath10k-4.19/mac.c +++ b/ath10k-4.19/mac.c
@@ -6278,8 +6278,8 @@ static void ath10k_bss_info_changed(stru @@ -6349,8 +6349,8 @@ static void ath10k_bss_info_changed(stru
struct cfg80211_chan_def def; struct cfg80211_chan_def def;
u32 vdev_param, pdev_param, slottime, preamble; u32 vdev_param, pdev_param, slottime, preamble;
u16 bitrate, hw_value; u16 bitrate, hw_value;
@ -28,7 +28,7 @@ Origin: other, https://patchwork.kernel.org/patch/10723033/
enum nl80211_band band; enum nl80211_band band;
const struct ieee80211_supported_band *sband; const struct ieee80211_supported_band *sband;
@@ -6452,7 +6452,11 @@ static void ath10k_bss_info_changed(stru @@ -6523,7 +6523,11 @@ static void ath10k_bss_info_changed(stru
if (changed & BSS_CHANGED_MCAST_RATE && if (changed & BSS_CHANGED_MCAST_RATE &&
!WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) { !WARN_ON(ath10k_mac_vif_chan(arvif->vif, &def))) {
band = def.chan->band; band = def.chan->band;

View File

@ -11,7 +11,7 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
--- a/ath10k-4.19/mac.c --- a/ath10k-4.19/mac.c
+++ b/ath10k-4.19/mac.c +++ b/ath10k-4.19/mac.c
@@ -6474,6 +6474,7 @@ static void ath10k_bss_info_changed(stru @@ -6545,6 +6545,7 @@ static void ath10k_bss_info_changed(stru
"mac vdev %d mcast_rate %x\n", "mac vdev %d mcast_rate %x\n",
arvif->vdev_id, rate); arvif->vdev_id, rate);
@ -19,7 +19,7 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
vdev_param = ar->wmi.vdev_param->mcast_data_rate; vdev_param = ar->wmi.vdev_param->mcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate); vdev_param, rate);
@@ -6482,6 +6483,7 @@ static void ath10k_bss_info_changed(stru @@ -6553,6 +6554,7 @@ static void ath10k_bss_info_changed(stru
"failed to set mcast rate on vdev %i: %d\n", "failed to set mcast rate on vdev %i: %d\n",
arvif->vdev_id, ret); arvif->vdev_id, ret);
@ -27,7 +27,7 @@ Signed-off-by: Sven Eckelmann <sven@narfation.org>
vdev_param = ar->wmi.vdev_param->bcast_data_rate; vdev_param = ar->wmi.vdev_param->bcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate); vdev_param, rate);
@@ -6508,6 +6510,7 @@ static void ath10k_bss_info_changed(stru @@ -6579,6 +6581,7 @@ static void ath10k_bss_info_changed(stru
return; return;
} }

View File

@ -161,8 +161,8 @@ v13:
.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR, .patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
.uart_pin = 7, .uart_pin = 7,
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH, .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
@@ -3042,6 +3048,10 @@ int ath10k_core_start(struct ath10k *ar, @@ -3084,6 +3090,10 @@ int ath10k_core_start(struct ath10k *ar,
ar->eeprom_overrides.rc_txbf_probe); ath10k_wmi_check_apply_board_power_ctl_table(ar);
} }
+ status = ath10k_leds_start(ar); + status = ath10k_leds_start(ar);
@ -172,7 +172,7 @@ v13:
return 0; return 0;
err_hif_stop: err_hif_stop:
@@ -3288,9 +3298,18 @@ static void ath10k_core_register_work(st @@ -3330,9 +3340,18 @@ static void ath10k_core_register_work(st
goto err_spectral_destroy; goto err_spectral_destroy;
} }
@ -191,7 +191,7 @@ v13:
err_spectral_destroy: err_spectral_destroy:
ath10k_spectral_destroy(ar); ath10k_spectral_destroy(ar);
err_debug_destroy: err_debug_destroy:
@@ -3348,6 +3367,8 @@ void ath10k_core_unregister(struct ath10 @@ -3390,6 +3409,8 @@ void ath10k_core_unregister(struct ath10
if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags)) if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
return; return;
@ -210,7 +210,7 @@ v13:
#include "htt.h" #include "htt.h"
#include "htc.h" #include "htc.h"
@@ -1255,6 +1256,13 @@ struct ath10k { @@ -1273,6 +1274,13 @@ struct ath10k {
} testmode; } testmode;
struct { struct {
@ -455,7 +455,7 @@ v13:
static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = { static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
--- a/ath10k-4.16/wmi.c --- a/ath10k-4.16/wmi.c
+++ b/ath10k-4.16/wmi.c +++ b/ath10k-4.16/wmi.c
@@ -7405,6 +7405,49 @@ ath10k_wmi_op_gen_peer_set_param(struct @@ -7593,6 +7593,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
return skb; return skb;
} }
@ -505,7 +505,7 @@ v13:
static struct sk_buff * static struct sk_buff *
ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id, ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
enum wmi_sta_ps_mode psmode) enum wmi_sta_ps_mode psmode)
@@ -9020,6 +9063,9 @@ static const struct wmi_ops wmi_ops = { @@ -9235,6 +9278,9 @@ static const struct wmi_ops wmi_ops = {
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill, .fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo, .gen_echo = ath10k_wmi_op_gen_echo,
@ -515,7 +515,7 @@ v13:
/* .gen_bcn_tmpl not implemented */ /* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */ /* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */ /* .gen_p2p_go_bcn_ie not implemented */
@@ -9090,6 +9136,8 @@ static const struct wmi_ops wmi_10_1_ops @@ -9305,6 +9351,8 @@ static const struct wmi_ops wmi_10_1_ops
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill, .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo, .gen_echo = ath10k_wmi_op_gen_echo,
@ -524,7 +524,7 @@ v13:
/* .gen_bcn_tmpl not implemented */ /* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */ /* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */ /* .gen_p2p_go_bcn_ie not implemented */
@@ -9167,6 +9215,8 @@ static const struct wmi_ops wmi_10_2_ops @@ -9383,6 +9431,8 @@ static const struct wmi_ops wmi_10_2_ops
.gen_delba_send = ath10k_wmi_op_gen_delba_send, .gen_delba_send = ath10k_wmi_op_gen_delba_send,
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill, .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
@ -533,7 +533,7 @@ v13:
/* .gen_pdev_enable_adaptive_cca not implemented */ /* .gen_pdev_enable_adaptive_cca not implemented */
}; };
@@ -9237,6 +9287,8 @@ static const struct wmi_ops wmi_10_2_4_o @@ -9453,6 +9503,8 @@ static const struct wmi_ops wmi_10_2_4_o
.gen_pdev_enable_adaptive_cca = .gen_pdev_enable_adaptive_cca =
ath10k_wmi_op_gen_pdev_enable_adaptive_cca, ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
@ -542,7 +542,7 @@ v13:
/* .gen_bcn_tmpl not implemented */ /* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */ /* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */ /* .gen_p2p_go_bcn_ie not implemented */
@@ -9313,6 +9365,8 @@ static const struct wmi_ops wmi_10_4_ops @@ -9529,6 +9581,8 @@ static const struct wmi_ops wmi_10_4_ops
.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info, .gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
.gen_echo = ath10k_wmi_op_gen_echo, .gen_echo = ath10k_wmi_op_gen_echo,
.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config, .gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
@ -553,7 +553,7 @@ v13:
int ath10k_wmi_attach(struct ath10k *ar) int ath10k_wmi_attach(struct ath10k *ar)
--- a/ath10k-4.16/wmi.h --- a/ath10k-4.16/wmi.h
+++ b/ath10k-4.16/wmi.h +++ b/ath10k-4.16/wmi.h
@@ -3011,6 +3011,41 @@ enum wmi_10_4_feature_mask { @@ -3013,6 +3013,41 @@ enum wmi_10_4_feature_mask {
}; };
@ -674,8 +674,8 @@ v13:
.patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR, .patch_load_addr = QCA9888_HW_2_0_PATCH_LOAD_ADDR,
.uart_pin = 7, .uart_pin = 7,
.cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH, .cc_wraparound_type = ATH10K_HW_CC_WRAP_SHIFTED_EACH,
@@ -3103,6 +3109,10 @@ int ath10k_core_start(struct ath10k *ar, @@ -3147,6 +3153,10 @@ int ath10k_core_start(struct ath10k *ar,
ar->eeprom_overrides.rc_txbf_probe); ath10k_wmi_check_apply_board_power_ctl_table(ar);
} }
+ status = ath10k_leds_start(ar); + status = ath10k_leds_start(ar);
@ -685,7 +685,7 @@ v13:
return 0; return 0;
err_hif_stop: err_hif_stop:
@@ -3357,9 +3367,18 @@ static void ath10k_core_register_work(st @@ -3401,9 +3411,18 @@ static void ath10k_core_register_work(st
goto err_spectral_destroy; goto err_spectral_destroy;
} }
@ -704,7 +704,7 @@ v13:
err_spectral_destroy: err_spectral_destroy:
ath10k_spectral_destroy(ar); ath10k_spectral_destroy(ar);
err_debug_destroy: err_debug_destroy:
@@ -3417,6 +3436,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)) if (!test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))
return; return;
@ -723,7 +723,7 @@ v13:
#include "htt.h" #include "htt.h"
#include "htc.h" #include "htc.h"
@@ -1113,7 +1114,6 @@ struct ath10k { @@ -1132,7 +1133,6 @@ struct ath10k {
u32 low_5ghz_chan; u32 low_5ghz_chan;
u32 high_5ghz_chan; u32 high_5ghz_chan;
bool ani_enabled; bool ani_enabled;
@ -731,7 +731,7 @@ v13:
bool p2p; bool p2p;
bool ct_all_pkts_htt; /* CT firmware only: native-wifi for all pkts */ bool ct_all_pkts_htt; /* CT firmware only: native-wifi for all pkts */
@@ -1362,6 +1362,13 @@ struct ath10k { @@ -1383,6 +1383,13 @@ struct ath10k {
} testmode; } testmode;
struct { struct {
@ -977,7 +977,7 @@ v13:
static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = { static const struct wmi_peer_flags_map wmi_tlv_peer_flags_map = {
--- a/ath10k-4.19/wmi.c --- a/ath10k-4.19/wmi.c
+++ b/ath10k-4.19/wmi.c +++ b/ath10k-4.19/wmi.c
@@ -7881,6 +7881,49 @@ ath10k_wmi_op_gen_peer_set_param(struct @@ -8070,6 +8070,49 @@ ath10k_wmi_op_gen_peer_set_param(struct
return skb; return skb;
} }
@ -1027,7 +1027,7 @@ v13:
static struct sk_buff * static struct sk_buff *
ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id, ath10k_wmi_op_gen_set_psmode(struct ath10k *ar, u32 vdev_id,
enum wmi_sta_ps_mode psmode) enum wmi_sta_ps_mode psmode)
@@ -9605,6 +9648,9 @@ static const struct wmi_ops wmi_ops = { @@ -9821,6 +9864,9 @@ static const struct wmi_ops wmi_ops = {
.fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill, .fw_stats_fill = ath10k_wmi_main_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo, .gen_echo = ath10k_wmi_op_gen_echo,
@ -1037,7 +1037,7 @@ v13:
/* .gen_bcn_tmpl not implemented */ /* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */ /* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */ /* .gen_p2p_go_bcn_ie not implemented */
@@ -9675,6 +9721,8 @@ static const struct wmi_ops wmi_10_1_ops @@ -9891,6 +9937,8 @@ static const struct wmi_ops wmi_10_1_ops
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill, .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
.gen_echo = ath10k_wmi_op_gen_echo, .gen_echo = ath10k_wmi_op_gen_echo,
@ -1046,7 +1046,7 @@ v13:
/* .gen_bcn_tmpl not implemented */ /* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */ /* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */ /* .gen_p2p_go_bcn_ie not implemented */
@@ -9752,6 +9800,8 @@ static const struct wmi_ops wmi_10_2_ops @@ -9969,6 +10017,8 @@ static const struct wmi_ops wmi_10_2_ops
.gen_delba_send = ath10k_wmi_op_gen_delba_send, .gen_delba_send = ath10k_wmi_op_gen_delba_send,
.fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill, .fw_stats_fill = ath10k_wmi_10x_op_fw_stats_fill,
.get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_op_get_vdev_subtype,
@ -1055,7 +1055,7 @@ v13:
/* .gen_pdev_enable_adaptive_cca not implemented */ /* .gen_pdev_enable_adaptive_cca not implemented */
}; };
@@ -9822,6 +9872,8 @@ static const struct wmi_ops wmi_10_2_4_o @@ -10039,6 +10089,8 @@ static const struct wmi_ops wmi_10_2_4_o
.gen_pdev_enable_adaptive_cca = .gen_pdev_enable_adaptive_cca =
ath10k_wmi_op_gen_pdev_enable_adaptive_cca, ath10k_wmi_op_gen_pdev_enable_adaptive_cca,
.get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype, .get_vdev_subtype = ath10k_wmi_10_2_4_op_get_vdev_subtype,
@ -1064,7 +1064,7 @@ v13:
/* .gen_bcn_tmpl not implemented */ /* .gen_bcn_tmpl not implemented */
/* .gen_prb_tmpl not implemented */ /* .gen_prb_tmpl not implemented */
/* .gen_p2p_go_bcn_ie not implemented */ /* .gen_p2p_go_bcn_ie not implemented */
@@ -9902,6 +9954,8 @@ static const struct wmi_ops wmi_10_4_ops @@ -10119,6 +10171,8 @@ static const struct wmi_ops wmi_10_4_ops
.gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info, .gen_pdev_bss_chan_info_req = ath10k_wmi_10_2_op_gen_pdev_bss_chan_info,
.gen_echo = ath10k_wmi_op_gen_echo, .gen_echo = ath10k_wmi_op_gen_echo,
.gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config, .gen_pdev_get_tpc_config = ath10k_wmi_10_2_4_op_gen_pdev_get_tpc_config,
@ -1075,7 +1075,7 @@ v13:
int ath10k_wmi_attach(struct ath10k *ar) int ath10k_wmi_attach(struct ath10k *ar)
--- a/ath10k-4.19/wmi.h --- a/ath10k-4.19/wmi.h
+++ b/ath10k-4.19/wmi.h +++ b/ath10k-4.19/wmi.h
@@ -3040,6 +3040,41 @@ enum wmi_10_4_feature_mask { @@ -3041,6 +3041,41 @@ enum wmi_10_4_feature_mask {
}; };

View File

@ -16,7 +16,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
--- a/ath10k-4.16/core.h --- a/ath10k-4.16/core.h
+++ b/ath10k-4.16/core.h +++ b/ath10k-4.16/core.h
@@ -1346,6 +1346,10 @@ struct ath10k { @@ -1366,6 +1366,10 @@ struct ath10k {
u8 csi_data[4096]; u8 csi_data[4096];
u16 csi_data_len; u16 csi_data_len;
@ -42,7 +42,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
if (ret) if (ret)
--- a/ath10k-4.16/mac.c --- a/ath10k-4.16/mac.c
+++ b/ath10k-4.16/mac.c +++ b/ath10k-4.16/mac.c
@@ -9665,7 +9665,7 @@ int ath10k_mac_register(struct ath10k *a @@ -9739,7 +9739,7 @@ int ath10k_mac_register(struct ath10k *a
wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
#ifdef CPTCFG_MAC80211_LEDS #ifdef CPTCFG_MAC80211_LEDS
@ -53,7 +53,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
#endif #endif
--- a/ath10k-4.19/core.h --- a/ath10k-4.19/core.h
+++ b/ath10k-4.19/core.h +++ b/ath10k-4.19/core.h
@@ -1459,6 +1459,10 @@ struct ath10k { @@ -1482,6 +1482,10 @@ struct ath10k {
u8 csi_data[4096]; u8 csi_data[4096];
u16 csi_data_len; u16 csi_data_len;
@ -79,7 +79,7 @@ Signed-off-by: Mathias Kresin <dev@kresin.me>
if (ret) if (ret)
--- a/ath10k-4.19/mac.c --- a/ath10k-4.19/mac.c
+++ b/ath10k-4.19/mac.c +++ b/ath10k-4.19/mac.c
@@ -9837,7 +9837,7 @@ int ath10k_mac_register(struct ath10k *a @@ -9908,7 +9908,7 @@ int ath10k_mac_register(struct ath10k *a
wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST);
#ifdef CPTCFG_MAC80211_LEDS #ifdef CPTCFG_MAC80211_LEDS

View File

@ -29,7 +29,7 @@ Forwarded: https://patchwork.kernel.org/patch/10549245/
#include <net/mac80211.h> #include <net/mac80211.h>
#include <linux/etherdevice.h> #include <linux/etherdevice.h>
#include <linux/acpi.h> #include <linux/acpi.h>
@@ -9561,6 +9562,7 @@ int ath10k_mac_register(struct ath10k *a @@ -9632,6 +9633,7 @@ int ath10k_mac_register(struct ath10k *a
ar->hw->wiphy->bands[NL80211_BAND_5GHZ] = band; ar->hw->wiphy->bands[NL80211_BAND_5GHZ] = band;
} }