From 840c1fda8346c187e42c28e55a692a61f0cdd8d1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20Owoc?= Date: Tue, 6 May 2025 22:53:49 +0200 Subject: [PATCH] ath10k-ct: update to latest version 6.14 from 2025-04-30 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit In this new version channel 177 is supported. Dropped patches: [1] 001-patch-version.patch [2] 205-ath10k-ct-silence-warning-caused-by-unsupported-retr.patch [1] [2] https://github.com/greearb/ath10k-ct/commit/8adb310f84b0a90df1f65701b863321e7b2afecd Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/18731 Signed-off-by: Robert Marko --- package/kernel/ath10k-ct/Makefile | 8 ++--- .../ath10k-ct/patches/001-patch-version.patch | 11 ------ ...h10k-6.10-remove-unsupported-feature.patch | 2 +- ...02-ath10k-use-tpt-trigger-by-default.patch | 2 +- ...e-warning-caused-by-unsupported-retr.patch | 34 ------------------- ...k-always-use-mac80211-loss-detection.patch | 2 +- 6 files changed, 7 insertions(+), 52 deletions(-) delete mode 100644 package/kernel/ath10k-ct/patches/001-patch-version.patch delete mode 100644 package/kernel/ath10k-ct/patches/205-ath10k-ct-silence-warning-caused-by-unsupported-retr.patch diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile index bc7e79c2630..dc78a12e457 100644 --- a/package/kernel/ath10k-ct/Makefile +++ b/package/kernel/ath10k-ct/Makefile @@ -1,16 +1,16 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ath10k-ct -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_LICENSE:=GPLv2 PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2025-03-14 -PKG_SOURCE_VERSION:=63f5b605236f2cd2f919539d67236c43fb8f957d -PKG_MIRROR_HASH:=d83cb59b947680d40006e0da825735c387c5b1699a7981c2d973ca4d285266f2 +PKG_SOURCE_DATE:=2025-04-30 +PKG_SOURCE_VERSION:=23ee90f0ee20323b90870e8be694db3e0c972b67 +PKG_MIRROR_HASH:=ee91de4f34c76db6a80c477ee3430e4cc493d55d59d7ae8e11d78500d2d8e0d8 # Build the 6.14 ath10k-ct driver version. # Probably this should match as closely as diff --git a/package/kernel/ath10k-ct/patches/001-patch-version.patch b/package/kernel/ath10k-ct/patches/001-patch-version.patch deleted file mode 100644 index 9cea32e6399..00000000000 --- a/package/kernel/ath10k-ct/patches/001-patch-version.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/ath10k-6.14/pci.c -+++ b/ath10k-6.14/pci.c -@@ -3871,7 +3871,7 @@ static int __ath10k_pci_probe(struct pci - int (*pci_hard_reset)(struct ath10k *ar); - u32 (*targ_cpu_to_ce_addr)(struct ath10k *ar, u32 addr); - -- printk(KERN_INFO "ath10k 6.7 driver, optimized for CT firmware, probing pci device: 0x%x.\n", -+ printk(KERN_INFO "ath10k 6.14 driver, optimized for CT firmware, probing pci device: 0x%x.\n", - pci_dev->device); - - switch (pci_dev->device) { diff --git a/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch b/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch index f7caa526037..f2adce735a5 100644 --- a/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch +++ b/package/kernel/ath10k-ct/patches/002-ath10k-6.10-remove-unsupported-feature.patch @@ -1,6 +1,6 @@ --- a/ath10k-6.14/mac.c +++ b/ath10k-6.14/mac.c -@@ -11648,7 +11648,6 @@ int ath10k_mac_register(struct ath10k *a +@@ -11650,7 +11650,6 @@ int ath10k_mac_register(struct ath10k *a ar->hw->wiphy->n_cipher_suites = ar->hw_params.n_cipher_suites; wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); diff --git a/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch b/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch index 47c4ad60797..c884777baf9 100644 --- a/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch +++ b/package/kernel/ath10k-ct/patches/202-ath10k-use-tpt-trigger-by-default.patch @@ -40,7 +40,7 @@ Signed-off-by: Mathias Kresin if (ret) --- a/ath10k-6.14/mac.c +++ b/ath10k-6.14/mac.c -@@ -11652,7 +11652,7 @@ int ath10k_mac_register(struct ath10k *a +@@ -11654,7 +11654,7 @@ int ath10k_mac_register(struct ath10k *a ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; #ifdef CPTCFG_MAC80211_LEDS diff --git a/package/kernel/ath10k-ct/patches/205-ath10k-ct-silence-warning-caused-by-unsupported-retr.patch b/package/kernel/ath10k-ct/patches/205-ath10k-ct-silence-warning-caused-by-unsupported-retr.patch deleted file mode 100644 index 202728d5638..00000000000 --- a/package/kernel/ath10k-ct/patches/205-ath10k-ct-silence-warning-caused-by-unsupported-retr.patch +++ /dev/null @@ -1,34 +0,0 @@ -From: Shiji Yang -Date: Fri, 28 Mar 2025 20:26:04 +0800 -Subject: [PATCH] ath10k-ct: silence warning caused by unsupported retry_limit - value - -Some retry_limit values are not supported by ath10k wave2 chips. -We can just skip config it for these chips. And it's safe to -return 0 in this case because the hardware is still working. - -Suggested-by: Ben Greear -Signed-off-by: Shiji Yang ---- - ath10k-6.14/mac.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/ath10k-6.14/mac.c -+++ b/ath10k-6.14/mac.c -@@ -5401,7 +5401,7 @@ static int ath10k_config_retry_limit(str - */ - ath10k_warn(ar, "Firmware lacks feature flag indicating a retry limit of > 2 is OK, requested limit: %d\n", - limit); -- return -EINVAL; -+ goto skip_retry_limit; - } - - list_for_each_entry(arvif, &ar->arvifs, list) { -@@ -5412,6 +5412,7 @@ static int ath10k_config_retry_limit(str - } - } - -+skip_retry_limit: - return ret; - } - diff --git a/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch b/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch index e1bb1c7fa1d..cc93623ed8a 100644 --- a/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch +++ b/package/kernel/ath10k-ct/patches/988-ath10k-always-use-mac80211-loss-detection.patch @@ -18,7 +18,7 @@ Signed-off-by: David Bauer --- a/ath10k-6.14/mac.c +++ b/ath10k-6.14/mac.c -@@ -11338,7 +11338,6 @@ int ath10k_mac_register(struct ath10k *a +@@ -11339,7 +11339,6 @@ int ath10k_mac_register(struct ath10k *a ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA); ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); -- 2.47.2