From f71276d16f091a7ddbea4b80006842f3ae9a5846 Mon Sep 17 00:00:00 2001 From: lean Date: Thu, 25 Aug 2022 11:20:24 +0800 Subject: [PATCH 1/4] ath11k: add wcn685x wifi6e ap mode and firmware support --- package/firmware/ath11k-firmware/Makefile | 20 ++++++++++++++++++++ package/kernel/linux/modules/netsupport.mk | 2 +- package/kernel/linux/modules/other.mk | 6 ++++-- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/package/firmware/ath11k-firmware/Makefile b/package/firmware/ath11k-firmware/Makefile index 57350f72f6ae2a..e1b2a3dcec9fc6 100644 --- a/package/firmware/ath11k-firmware/Makefile +++ b/package/firmware/ath11k-firmware/Makefile @@ -47,6 +47,11 @@ $(Package/ath11k-firmware-default) TITLE:=ath11k firmware for QCN9074 devices endef +define Package/ath11k-firmware-wcn6855 +$(Package/ath11k-firmware-default) + TITLE:=ath11k firmware for WCN6855 devices +endef + define Build/Compile endef @@ -87,7 +92,22 @@ define Package/ath11k-firmware-qcn9074/install $(1)/lib/firmware/ath11k/QCN9074/hw1.0/ endef +define Package/ath11k-firmware-wcn6855/install + $(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/WCN6855/hw2.0/1.1/WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.7/* \ + $(1)/lib/firmware/ath11k/WCN6855/hw2.0/ + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/WCN6855/hw2.0/board-2.bin \ + $(1)/lib/firmware/ath11k/WCN6855/hw2.0/board-2.bin + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/WCN6855/hw2.0/regdb.bin \ + $(1)/lib/firmware/ath11k/WCN6855/hw2.0/regdb.bin + $(LN) $(1)/lib/firmware/ath11k/WCN6855/hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1 +endef + $(eval $(call BuildPackage,ath11k-firmware-ipq6018)) $(eval $(call BuildPackage,ath11k-firmware-ipq8074)) $(eval $(call BuildPackage,ath11k-firmware-qca6390)) $(eval $(call BuildPackage,ath11k-firmware-qcn9074)) +$(eval $(call BuildPackage,ath11k-firmware-wcn6855)) diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk index fe2d70a27ba3d9..6beaafe2a98053 100644 --- a/package/kernel/linux/modules/netsupport.mk +++ b/package/kernel/linux/modules/netsupport.mk @@ -1334,7 +1334,7 @@ define KernelPackage/qrtr SUBMENU:=$(NETWORK_SUPPORT_MENU) TITLE:=Qualcomm IPC Router support HIDDEN:=1 - DEPENDS:=@LINUX_5_15 + DEPENDS:=@(LINUX_5_15||LINUX_5_19) KCONFIG:=CONFIG_QRTR FILES:= \ $(LINUX_DIR)/net/qrtr/qrtr.ko \ diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index 95902cca6b79ce..3eb1aae3ea279a 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -1298,12 +1298,14 @@ $(eval $(call KernelPackage,qcom-qmi-helpers)) define KernelPackage/mhi SUBMENU:=$(OTHER_MENU) TITLE:=Modem Host Interface (MHI) bus - DEPENDS:=@LINUX_5_15 + DEPENDS:=@(LINUX_5_15||LINUX_5_19) KCONFIG:=CONFIG_MHI_BUS \ CONFIG_MHI_BUS_DEBUG=y \ CONFIG_MHI_BUS_PCI_GENERIC=n \ CONFIG_MHI_NET=n - FILES:=$(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko + FILES:= \ + $(LINUX_DIR)/drivers/bus/mhi/core/mhi.ko@lt5.18 \ + $(LINUX_DIR)/drivers/bus/mhi/host/mhi.ko@ge5.18 AUTOLOAD:=$(call AutoProbe,mhi) endef From 013282f696c874bda20218c42e73716d1eb22af9 Mon Sep 17 00:00:00 2001 From: lovehackintosh <92633080+lovehackintosh@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:22:58 +0800 Subject: [PATCH 2/4] kernel: bump 5.15 to 5.15.62 (#9994) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Runtime tested on turris-omnia and glinet-b1300. Tested-by: John Audia [bcm2711/RPi4B, mt7622/RT3200] Signed-off-by: Petr Štetiar Signed-off-by: Petr Štetiar Co-authored-by: Petr Štetiar --- include/kernel-5.15 | 4 ++-- .../generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch | 2 +- target/linux/generic/hack-5.15/904-debloat_dma_buf.patch | 2 +- target/linux/generic/pending-5.15/420-mtd-redboot_space.patch | 2 +- .../pending-5.15/811-pci_disable_usb_common_quirks.patch | 2 +- target/linux/generic/pending-5.15/920-mangle_bootargs.patch | 4 ++-- .../linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/include/kernel-5.15 b/include/kernel-5.15 index 962cd0a3ad7820..622349cf46241d 100644 --- a/include/kernel-5.15 +++ b/include/kernel-5.15 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.15 = .60 -LINUX_KERNEL_HASH-5.15.60 = 2d9545f7c96faffd8407522011b9533adefd1360118494dfb6c862f2f15e237a +LINUX_VERSION-5.15 = .62 +LINUX_KERNEL_HASH-5.15.62 = 06817cde8e57cdb6dbf20eaa5122fee110024f6e8b783799c98cb65dc753f141 diff --git a/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch b/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch index 3d34231b82f678..9fde1eaabb0851 100644 --- a/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch +++ b/target/linux/generic/hack-5.15/800-GPIO-add-named-gpio-exports.patch @@ -15,7 +15,7 @@ Signed-off-by: John Crispin #include "gpiolib.h" #include "gpiolib-of.h" -@@ -1057,3 +1059,72 @@ void of_gpio_dev_init(struct gpio_chip * +@@ -1059,3 +1061,72 @@ void of_gpio_dev_init(struct gpio_chip * else gc->of_node = gdev->dev.of_node; } diff --git a/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch b/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch index a685c429c41b4a..302c0007f2f8af 100644 --- a/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-5.15/904-debloat_dma_buf.patch @@ -72,7 +72,7 @@ Signed-off-by: Felix Fietkau +MODULE_LICENSE("GPL"); --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -4175,6 +4175,7 @@ int wake_up_state(struct task_struct *p, +@@ -4184,6 +4184,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } diff --git a/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch b/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch index fee193659334a1..5518ea71dd51f9 100644 --- a/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch +++ b/target/linux/generic/pending-5.15/420-mtd-redboot_space.patch @@ -11,7 +11,7 @@ Signed-off-by: Felix Fietkau --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c -@@ -277,14 +277,21 @@ nogood: +@@ -278,14 +278,21 @@ nogood: #endif names += strlen(names) + 1; diff --git a/target/linux/generic/pending-5.15/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/pending-5.15/811-pci_disable_usb_common_quirks.patch index 67406bac84c098..b498d9f700a91e 100644 --- a/target/linux/generic/pending-5.15/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/pending-5.15/811-pci_disable_usb_common_quirks.patch @@ -98,7 +98,7 @@ Signed-off-by: Felix Fietkau #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -497,7 +497,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -498,7 +498,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch index dbcd6a5b32db80..2a02efe0aa989f 100644 --- a/target/linux/generic/pending-5.15/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.15/920-mangle_bootargs.patch @@ -31,7 +31,7 @@ Signed-off-by: Imre Kaloz help --- a/init/main.c +++ b/init/main.c -@@ -615,6 +615,29 @@ static inline void setup_nr_cpu_ids(void +@@ -616,6 +616,29 @@ static inline void setup_nr_cpu_ids(void static inline void smp_prepare_cpus(unsigned int maxcpus) { } #endif @@ -61,7 +61,7 @@ Signed-off-by: Imre Kaloz /* * We need to store the untouched command line for future reference. * We also need to store the touched command line since the parameter -@@ -955,6 +978,7 @@ asmlinkage __visible void __init __no_sa +@@ -956,6 +979,7 @@ asmlinkage __visible void __init __no_sa pr_notice("%s", linux_banner); early_security_init(); setup_arch(&command_line); diff --git a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch index f5b360a464711f..a5836a826847b5 100644 --- a/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch +++ b/target/linux/mediatek/patches-5.15/410-bt-mtk-serial-fix.patch @@ -1,6 +1,6 @@ --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h -@@ -83,6 +83,7 @@ struct serial8250_config { +@@ -85,6 +85,7 @@ struct serial8250_config { #define UART_CAP_MINI BIT(17) /* Mini UART on BCM283X family lacks: * STOP PARITY EPAR SPAR WLEN5 WLEN6 */ @@ -19,7 +19,7 @@ }, [PORT_NPCM] = { .name = "Nuvoton 16550", -@@ -2766,6 +2766,11 @@ serial8250_do_set_termios(struct uart_po +@@ -2745,6 +2745,11 @@ serial8250_do_set_termios(struct uart_po unsigned long flags; unsigned int baud, quot, frac = 0; From abd4c51b2e1a0c0ff1ae4f2142cc9872d4727ddb Mon Sep 17 00:00:00 2001 From: aakkll <94471752+aakkll@users.noreply.github.com> Date: Thu, 25 Aug 2022 22:23:31 +0800 Subject: [PATCH 3/4] kernel: bump 5.19 to 5.19.4 (#9995) Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> Signed-off-by: aakkll <94471752+aakkll@users.noreply.github.com> --- include/kernel-5.19 | 4 ++-- target/linux/generic/hack-5.19/204-module_strip.patch | 4 ++-- .../generic/hack-5.19/321-powerpc_crtsavres_prereq.patch | 2 +- .../703-phy-add-detach-callback-to-struct-phy_driver.patch | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/kernel-5.19 b/include/kernel-5.19 index 18817401879e95..18f2ab6f641241 100644 --- a/include/kernel-5.19 +++ b/include/kernel-5.19 @@ -1,2 +1,2 @@ -LINUX_VERSION-5.19 = .3 -LINUX_KERNEL_HASH-5.19.3 = 513bd672066f5fb22e5739aae3eed60c75c4accc9ba365d1060c4e4225442721 +LINUX_VERSION-5.19 = .4 +LINUX_KERNEL_HASH-5.19.4 = a9214b97085af98dfcaaa8c2e8eff4858c1d53dccd6c58931cf7b0455ff9bf87 diff --git a/target/linux/generic/hack-5.19/204-module_strip.patch b/target/linux/generic/hack-5.19/204-module_strip.patch index ecafa7706ef312..de724bb2506b45 100644 --- a/target/linux/generic/hack-5.19/204-module_strip.patch +++ b/target/linux/generic/hack-5.19/204-module_strip.patch @@ -148,7 +148,7 @@ Signed-off-by: Felix Fietkau buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__section(\".gnu.linkonce.this_module\") = {\n"); -@@ -2285,11 +2289,13 @@ static void add_depends(struct buffer *b +@@ -2283,11 +2287,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -162,7 +162,7 @@ Signed-off-by: Felix Fietkau } static void write_buf(struct buffer *b, const char *fname) -@@ -2375,7 +2381,9 @@ static void write_mod_c_file(struct modu +@@ -2373,7 +2379,9 @@ static void write_mod_c_file(struct modu add_exported_symbols(&buf, mod); add_versions(&buf, mod); add_depends(&buf, mod); diff --git a/target/linux/generic/hack-5.19/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/hack-5.19/321-powerpc_crtsavres_prereq.patch index 40b2a51ed7e934..17eba0b354eb80 100644 --- a/target/linux/generic/hack-5.19/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/hack-5.19/321-powerpc_crtsavres_prereq.patch @@ -16,7 +16,7 @@ Signed-off-by: Alexandros C. Couloumbis --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile -@@ -59,19 +59,6 @@ machine-$(CONFIG_PPC64) += 64 +@@ -42,19 +42,6 @@ machine-$(CONFIG_PPC64) += 64 machine-$(CONFIG_CPU_LITTLE_ENDIAN) += le UTS_MACHINE := $(subst $(space),,$(machine-y)) diff --git a/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch b/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch index 0a06ea37a795a3..bcba043f48de09 100644 --- a/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch +++ b/target/linux/generic/pending-5.19/703-phy-add-detach-callback-to-struct-phy_driver.patch @@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1738,6 +1738,9 @@ void phy_detach(struct phy_device *phyde +@@ -1744,6 +1744,9 @@ void phy_detach(struct phy_device *phyde struct module *ndev_owner = NULL; struct mii_bus *bus; From 80ea9d5bbf204938213461970ad38a656e5f6451 Mon Sep 17 00:00:00 2001 From: 1054009064 <44148148+1054009064@users.noreply.github.com> Date: Thu, 25 Aug 2022 11:45:01 -0400 Subject: [PATCH 4/4] hostapd: fix this patch to cause some wireless driver DFS detection (#9997) --- .../patches/800-hostapd-2.10-lar.patch | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/package/network/services/hostapd/patches/800-hostapd-2.10-lar.patch b/package/network/services/hostapd/patches/800-hostapd-2.10-lar.patch index c3808ef03f7d09..db8889911ea79c 100644 --- a/package/network/services/hostapd/patches/800-hostapd-2.10-lar.patch +++ b/package/network/services/hostapd/patches/800-hostapd-2.10-lar.patch @@ -1,10 +1,11 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c --- a/src/ap/hw_features.c 2022-01-16 15:51:29.000000000 -0500 +++ b/src/ap/hw_features.c 2022-07-06 22:57:53.007315518 -0500 -@@ -26,6 +26,17 @@ +@@ -24,6 +24,19 @@ #include "beacon.h" #include "hw_features.h" ++#ifdef CONFIG_IWLWIFI +static void ieee80211n_do_nothing(struct hostapd_iface *iface) +{ + wpa_printf(MSG_DEBUG, @@ -16,13 +17,15 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c +static void ieee80211n_scan_channels_5g(struct hostapd_iface *iface, + struct wpa_driver_scan_params *params); + ++#endif void hostapd_free_hw_features(struct hostapd_hw_modes *hw_features, size_t num_hw_features) -@@ -82,6 +93,33 @@ +@@ -82,6 +93,35 @@ if (hostapd_drv_none(hapd)) return -1; ++#ifdef CONFIG_IWLWIFI + + + if (!iface->conf->noscan) { @@ -50,37 +53,35 @@ diff -ru a/src/ap/hw_features.c b/src/ap/hw_features.c + } + } + } ++#endif modes = hostapd_get_hw_feature_data(hapd, &num_modes, &flags, &dfs_domain); if (modes == NULL) { - -@@ -308,7 +346,6 @@ - sec_chan); - } - -- - static void ieee80211n_check_scan(struct hostapd_iface *iface) - { - struct wpa_scan_results *scan_res; -@@ -517,8 +554,10 @@ - int ret; +@@ -518,8 +556,15 @@ /* Check that HT40 is used and PRI / SEC switch is allowed */ -- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch) -+ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || iface->conf->noscan) { + if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch || ++#ifdef CONFIG_IWLWIFI ++ iface->conf->noscan) { + wpa_printf(MSG_DEBUG, "Not scanning due to noscan?"); ++ return 0; ++ } ++#else + iface->conf->noscan) return 0; -+ } ++#endif hostapd_set_state(iface, HAPD_IFACE_HT_SCAN); wpa_printf(MSG_DEBUG, "Scan for neighboring BSSes prior to enabling " -@@ -916,7 +954,7 @@ +@@ -916,7 +954,11 @@ if (!hostapd_is_usable_edmg(iface)) return 0; -- if (!iface->conf->secondary_channel) ++#ifdef CONFIG_IWLWIFI + if (!iface->conf->secondary_channel || iface->conf->noscan) ++#else + if (!iface->conf->secondary_channel) ++#endif return 1; if (hostapd_is_usable_chan(iface, iface->freq + -