From 8b0fa6d30b12b5de07ffea2e7d8552e0640c3e15 Mon Sep 17 00:00:00 2001 From: David Adriao Date: Fri, 10 May 2024 21:10:48 +0100 Subject: [PATCH 01/80] mac80211: Add support for RTL8723BE This adds support for the RTL8723BE PCIe Wi-Fi Adapter by adding backports drivers Signed-off-by: David Adriao [Do not remove rtl8xxxu and add dependency to rtl8723be-firmware] Signed-off-by: Hauke Mehrtens --- package/firmware/linux-firmware/realtek.mk | 8 ++++++++ package/kernel/mac80211/realtek.mk | 21 ++++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk index e077c796bee2a8..cd64d79d632a55 100644 --- a/package/firmware/linux-firmware/realtek.mk +++ b/package/firmware/linux-firmware/realtek.mk @@ -87,6 +87,14 @@ define Package/rtl8723au-firmware/install endef $(eval $(call BuildPackage,rtl8723au-firmware)) +Package/rtl8723be-firmware = $(call Package/firmware-default,RealTek RTL8723BE firmware,,LICENCE.rtlwifi_firmware.txt) +define Package/rtl8723be-firmware/install + $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi + $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723befw_36.bin $(1)/lib/firmware/rtlwifi + $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8723befw.bin $(1)/lib/firmware/rtlwifi +endef +$(eval $(call BuildPackage,rtl8723be-firmware)) + Package/rtl8723bu-firmware = $(call Package/firmware-default,RealTek RTL8723BU firmware,,LICENCE.rtlwifi_firmware.txt) define Package/rtl8723bu-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi diff --git a/package/kernel/mac80211/realtek.mk b/package/kernel/mac80211/realtek.mk index 04057b3106996c..28ea6a65718bba 100644 --- a/package/kernel/mac80211/realtek.mk +++ b/package/kernel/mac80211/realtek.mk @@ -1,6 +1,6 @@ PKG_DRIVERS += \ rtlwifi rtlwifi-pci rtlwifi-btcoexist rtlwifi-usb rtl8192c-common \ - rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8723bs rtl8821ae \ + rtl8192ce rtl8192se rtl8192de rtl8192cu rtl8723-common rtl8723be rtl8723bs rtl8821ae \ rtl8xxxu rtw88 rtw88-pci rtw88-usb rtw88-8821c rtw88-8822b rtw88-8822c \ rtw88-8723d rtw88-8821ce rtw88-8821cu rtw88-8822be rtw88-8822bu \ rtw88-8822ce rtw88-8822cu rtw88-8723de @@ -20,6 +20,9 @@ config-$(CONFIG_PACKAGE_RTLWIFI_DEBUG) += RTLWIFI_DEBUG config-$(call config_package,rtl8xxxu) += RTL8XXXU config-y += RTL8XXXU_UNTESTED +config-$(call config_package,rtl8723-common) += RTL8723_COMMON +config-$(call config_package,rtl8723be) += RTL8723BE + config-$(call config_package,rtl8723bs) += RTL8723BS config-y += STAGING @@ -299,6 +302,22 @@ define KernelPackage/rtw88-8723de AUTOLOAD:=$(call AutoProbe,rtw88_8723) endef +define KernelPackage/rtl8723-common + $(call KernelPackage/mac80211/Default) + TITLE:=Realtek RTL8723AE/RTL8723BE common support module + DEPENDS+= +kmod-rtlwifi + FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtl8723com/rtl8723-common.ko + HIDDEN:=1 +endef + +define KernelPackage/rtl8723be + $(call KernelPackage/mac80211/Default) + TITLE:=Realtek RTL8723AE/RTL8723BE support + DEPENDS+= +kmod-rtlwifi-btcoexist +kmod-rtlwifi-pci +kmod-rtl8723-common +rtl8723be-firmware + FILES:= $(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtlwifi/rtl8723be/rtl8723be.ko + AUTOLOAD:=$(call AutoProbe,rtl8723be) +endef + define KernelPackage/rtl8723bs $(call KernelPackage/mac80211/Default) TITLE:=Realtek RTL8723BS SDIO Wireless LAN NIC driver (staging) From ff3d0de095065fe642177940c055825f859e5a07 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 9 May 2024 12:28:35 +0200 Subject: [PATCH 02/80] ramips: Fix wmac dts definition for TP-Link TL-MR6400 v4 and v5 This code assumed that the mt7628an_tplink_8m.dtsi file defines mediatek,mtd-eeprom for the wmac and sets status to okay. The mediatek,mtd-eeprom definition was removed in commit e93f41adee3e ("ramips: convert MT7628 EEPROM to NVMEM format") but the dts for these two devices was not adapted to include the eeprom position on its own. The status = "okay" property was removed in 0a1d15642fa6 ("ramips: mt7628: use nvmem-layout"), but the property was not added to these dts files. Without this change wifi does not work for these devices. Fixes: e93f41adee3e ("ramips: convert MT7628 EEPROM to NVMEM format") Fixes: 0a1d15642fa6 ("ramips: mt7628: use nvmem-layout") Signed-off-by: Hauke Mehrtens --- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts | 6 ++++-- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts index 21d1e483361eac..19783274e7f5a4 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts @@ -89,8 +89,10 @@ }; &wmac { - nvmem-cells = <&macaddr_factory_1f100>; - nvmem-cell-names = "mac-address"; + status = "okay"; + + nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_1f100>; + nvmem-cell-names = "eeprom", "mac-address"; }; ðernet { diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts index 1bd35fc33491a5..857e61f614abf9 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts @@ -89,8 +89,10 @@ }; &wmac { - nvmem-cells = <&macaddr_factory_1f100>; - nvmem-cell-names = "mac-address"; + status = "okay"; + + nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_1f100>; + nvmem-cell-names = "eeprom", "mac-address"; }; ðernet { From 9c84d619fcf31b810cdea18d751a4418d956da81 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Thu, 9 May 2024 22:10:52 +0200 Subject: [PATCH 03/80] ramips: Fix use mac-base for TP-Link TL-MR6400 v4 and v5 Use mac-base for mac-base TP-Link TL-MR6400 v4 and v5 Signed-off-by: Hauke Mehrtens --- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts | 6 ++++-- target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts index 19783274e7f5a4..67cc54650f210b 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v4.dts @@ -91,12 +91,12 @@ &wmac { status = "okay"; - nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_1f100>; + nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_1f100 0>; nvmem-cell-names = "eeprom", "mac-address"; }; ðernet { - nvmem-cells = <&macaddr_factory_1f100>; + nvmem-cells = <&macaddr_factory_1f100 0>; nvmem-cell-names = "mac-address"; }; @@ -107,7 +107,9 @@ #size-cells = <1>; macaddr_factory_1f100: macaddr@1f100 { + compatible = "mac-base"; reg = <0x1f100 0x6>; + #nvmem-cell-cells = <1>; }; }; }; diff --git a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts index 857e61f614abf9..609452dfe17aad 100644 --- a/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts +++ b/target/linux/ramips/dts/mt7628an_tplink_tl-mr6400-v5.dts @@ -91,12 +91,12 @@ &wmac { status = "okay"; - nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_1f100>; + nvmem-cells = <&eeprom_factory_20000>, <&macaddr_factory_1f100 0>; nvmem-cell-names = "eeprom", "mac-address"; }; ðernet { - nvmem-cells = <&macaddr_factory_1f100>; + nvmem-cells = <&macaddr_factory_1f100 0>; nvmem-cell-names = "mac-address"; }; @@ -107,7 +107,9 @@ #size-cells = <1>; macaddr_factory_1f100: macaddr@1f100 { + compatible = "mac-base"; reg = <0x1f100 0x6>; + #nvmem-cell-cells = <1>; }; }; }; From ca1c7635b911e68df74958f8f1301c7b44a61206 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 15 May 2024 10:43:52 +0200 Subject: [PATCH 04/80] config: build: dont allow STRIP_KERNEL_EXPORTS on kernel 6.6 STRIP_KERNEL_EXPORTS is currently not working on kernel 6.6 as there have been major changes in the upstream kernel. I have looked at it, and I dont think we can adapt the current patch to work so until this is fixed lets prevent STRIP_KERNEL_EXPORTS from being selected on 6.6. Link: https://github.com/openwrt/openwrt/pull/15498 Signed-off-by: Robert Marko --- config/Config-build.in | 1 + 1 file changed, 1 insertion(+) diff --git a/config/Config-build.in b/config/Config-build.in index 24c2bcf13007c7..97688785723d3b 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -228,6 +228,7 @@ menu "Global build settings" config STRIP_KERNEL_EXPORTS bool "Strip unnecessary exports from the kernel image" + depends on !LINUX_6_6 help Reduces kernel size by stripping unused kernel exports from the kernel image. Note that this might make the kernel incompatible with any kernel From f12179fa15d9e9b141b46f101999bdad3ba34f74 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Wed, 15 May 2024 10:57:06 +0200 Subject: [PATCH 05/80] generic: 6.6: remove kernel export stripping patch Our kernel export stripping has been broken on 6.6 from the start since upstream kernel really reworked stuff in ("kbuild: generate KSYMTAB entries by modpost") and other commits as well. So, until this is either fixed or reworked lets drop the patch as it doesnt make sense to carry it knowing its broken and it can always be easily restored. Link: https://github.com/openwrt/openwrt/pull/15498 Signed-off-by: Robert Marko --- .../generic/hack-6.6/221-module_exports.patch | 102 ------------------ 1 file changed, 102 deletions(-) delete mode 100644 target/linux/generic/hack-6.6/221-module_exports.patch diff --git a/target/linux/generic/hack-6.6/221-module_exports.patch b/target/linux/generic/hack-6.6/221-module_exports.patch deleted file mode 100644 index 294944a34bc5a8..00000000000000 --- a/target/linux/generic/hack-6.6/221-module_exports.patch +++ /dev/null @@ -1,102 +0,0 @@ -From b14784e7883390c20ed3ff904892255404a5914b Mon Sep 17 00:00:00 2001 -From: Felix Fietkau -Date: Fri, 7 Jul 2017 17:05:53 +0200 -Subject: add an optional config option for stripping all unnecessary symbol exports from the kernel image - -lede-commit: bb5a40c64b7c4f4848509fa0a6625055fc9e66cc -Signed-off-by: Felix Fietkau ---- - include/asm-generic/vmlinux.lds.h | 18 +++++++++++++++--- - include/linux/export.h | 9 ++++++++- - scripts/Makefile.build | 2 +- - 3 files changed, 24 insertions(+), 5 deletions(-) - ---- a/include/asm-generic/vmlinux.lds.h -+++ b/include/asm-generic/vmlinux.lds.h -@@ -81,6 +81,16 @@ - #define RO_EXCEPTION_TABLE - #endif - -+#ifndef SYMTAB_KEEP -+#define SYMTAB_KEEP KEEP(*(SORT(___ksymtab+*))) -+#define SYMTAB_KEEP_GPL KEEP(*(SORT(___ksymtab_gpl+*))) -+#endif -+ -+#ifndef SYMTAB_DISCARD -+#define SYMTAB_DISCARD -+#define SYMTAB_DISCARD_GPL -+#endif -+ - /* Align . function alignment. */ - #define ALIGN_FUNCTION() . = ALIGN(CONFIG_FUNCTION_ALIGNMENT) - -@@ -486,14 +496,14 @@ - /* Kernel symbol table: Normal symbols */ \ - __ksymtab : AT(ADDR(__ksymtab) - LOAD_OFFSET) { \ - __start___ksymtab = .; \ -- KEEP(*(SORT(___ksymtab+*))) \ -+ SYMTAB_KEEP \ - __stop___ksymtab = .; \ - } \ - \ - /* Kernel symbol table: GPL-only symbols */ \ - __ksymtab_gpl : AT(ADDR(__ksymtab_gpl) - LOAD_OFFSET) { \ - __start___ksymtab_gpl = .; \ -- KEEP(*(SORT(___ksymtab_gpl+*))) \ -+ SYMTAB_KEEP_GPL \ - __stop___ksymtab_gpl = .; \ - } \ - \ -@@ -513,7 +523,7 @@ - \ - /* Kernel symbol table: strings */ \ - __ksymtab_strings : AT(ADDR(__ksymtab_strings) - LOAD_OFFSET) { \ -- *(__ksymtab_strings) \ -+ *(__ksymtab_strings+*) \ - } \ - \ - /* __*init sections */ \ -@@ -1000,6 +1010,8 @@ - #define COMMON_DISCARDS \ - SANITIZER_DISCARDS \ - PATCHABLE_DISCARDS \ -+ SYMTAB_DISCARD \ -+ SYMTAB_DISCARD_GPL \ - *(.discard) \ - *(.discard.*) \ - *(.export_symbol) \ ---- a/include/linux/export-internal.h -+++ b/include/linux/export-internal.h -@@ -26,6 +26,12 @@ - #define __KSYM_REF(sym) ".long " #sym - #endif - -+#ifdef MODULE -+#define __EXPORT_SUFFIX(sym) -+#else -+#define __EXPORT_SUFFIX(sym) "+" #sym -+#endif -+ - /* - * For every exported symbol, do the following: - * -@@ -38,7 +44,7 @@ - * former apparently works on all arches according to the binutils source. - */ - #define __KSYMTAB(name, sym, sec, ns) \ -- asm(" .section \"__ksymtab_strings\",\"aMS\",%progbits,1" "\n" \ -+ asm(" .section \"__ksymtab_strings" __EXPORT_SUFFIX(sym) "\",\"aMS\",%progbits,1" "\n" \ - "__kstrtab_" #name ":" "\n" \ - " .asciz \"" #name "\"" "\n" \ - "__kstrtabns_" #name ":" "\n" \ ---- a/scripts/Makefile.build -+++ b/scripts/Makefile.build -@@ -366,7 +366,7 @@ targets += $(real-dtb-y) $(lib-y) $(alwa - # Linker scripts preprocessor (.lds.S -> .lds) - # --------------------------------------------------------------------------- - quiet_cmd_cpp_lds_S = LDS $@ -- cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -U$(ARCH) \ -+ cmd_cpp_lds_S = $(CPP) $(EXTRA_LDSFLAGS) $(cpp_flags) -P -U$(ARCH) \ - -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $< - - $(obj)/%.lds: $(src)/%.lds.S FORCE From 96e402aef7a8245d7c41e9d424125930fd781332 Mon Sep 17 00:00:00 2001 From: Robert Marko Date: Thu, 16 May 2024 12:03:19 +0200 Subject: [PATCH 06/80] ipq806x: mr42/mr52: fix PCIe ports All three PCIe ports are reported non working on Meraki MR42/MR52 boards since kernel 6.1 with the issue of PCIe PHY link never coming up thus no WLAN cards are available on the boards. After debugging it seems that PCIe worked on 5.15 and older purely by accident as device DTS was using /delete-property/ perst-gpios; in each of the 3 PCIe nodes but there was no "perst-gpios" property in the SoC DTSI as it was still using the older "perst-gpio" property so it was not getting removed from the device DTS. However, in kernel 6.1 commit ("ARM: dts: qcom-*: replace deprecated perst-gpio with perst-gpios") updated all Qualcomm DTS-es to use the newer "perst-gpios" and thus once ipq806x moved to 6.1 PCIe stopped working as now that property was being dropped from the device DTS. So, since the removal of PERST pins seems to have been wrong from the start lets drop the property removal from MR42/MR52. Fixes: #15408 Link: https://github.com/openwrt/openwrt/pull/15509 Signed-off-by: Robert Marko --- .../boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi index a8f43591f90535..2e7157533178ec 100644 --- a/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi +++ b/target/linux/ipq806x/files-6.6/arch/arm/boot/dts/qcom/qcom-ipq8068-cryptid-common.dtsi @@ -73,10 +73,6 @@ &pcie0 { status = "okay"; - /delete-property/ pinctrl-0; - /delete-property/ pinctrl-names; - /delete-property/ perst-gpios; - bridge@0,0 { reg = <0x0 0 0 0 0>; #address-cells = <3>; @@ -94,10 +90,6 @@ &pcie1 { status = "okay"; - /delete-property/ pinctrl-0; - /delete-property/ pinctrl-names; - /delete-property/ perst-gpios; - bridge@0,0 { reg = <0x0 0 0 0 0>; #address-cells = <3>; @@ -115,10 +107,6 @@ &pcie2 { status = "okay"; - /delete-property/ pinctrl-0; - /delete-property/ pinctrl-names; - /delete-property/ perst-gpios; - bridge@0,0 { reg = <0x0 0 0 0 0>; #address-cells = <3>; From b32a17e82df32b197fb64e2588262e2ddb8dccd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Owoc?= Date: Wed, 13 Mar 2024 12:22:30 +0100 Subject: [PATCH 07/80] qualcommax: ipq807x: Remove unused gpio from QPIC pins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove gpio16 from the default NAND pinctrl configuration as its unused and only needed for LCD. Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/14883 Signed-off-by: Robert Marko --- ...pq8074-Remove-unused-gpio-from-QPIC-.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 target/linux/qualcommax/patches-6.6/0063-v6.9-arm64-dts-qcom-ipq8074-Remove-unused-gpio-from-QPIC-.patch diff --git a/target/linux/qualcommax/patches-6.6/0063-v6.9-arm64-dts-qcom-ipq8074-Remove-unused-gpio-from-QPIC-.patch b/target/linux/qualcommax/patches-6.6/0063-v6.9-arm64-dts-qcom-ipq8074-Remove-unused-gpio-from-QPIC-.patch new file mode 100644 index 00000000000000..e075c590fb4c2d --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0063-v6.9-arm64-dts-qcom-ipq8074-Remove-unused-gpio-from-QPIC-.patch @@ -0,0 +1,32 @@ +From 5f78d9213ae753e2242b0f6a5d4a5e98e55ddc76 Mon Sep 17 00:00:00 2001 +From: Paweł Owoc +Date: Wed, 13 Mar 2024 11:27:06 +0100 +Subject: [PATCH] arm64: dts: qcom: ipq8074: Remove unused gpio from QPIC pins + +gpio16 will only be used for LCD support, as its NAND/LCDC data[8] +so its bit 9 of the parallel QPIC interface, and ONFI NAND is only 8 +or 16-bit with only 8-bit one being supported in our case so that pin +is unused. + +It should be dropped from the default NAND pinctrl configuration +as its unused and only needed for LCD. + +Signed-off-by: Paweł Owoc +Reviewed-by: Kathiravan Thirumoorthy +Link: https://lore.kernel.org/r/20240313102713.1727458-1-frut3k7@gmail.com +Signed-off-by: Bjorn Andersson +--- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi ++++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi +@@ -372,7 +372,7 @@ + "gpio5", "gpio6", "gpio7", + "gpio8", "gpio10", "gpio11", + "gpio12", "gpio13", "gpio14", +- "gpio15", "gpio16", "gpio17"; ++ "gpio15", "gpio17"; + function = "qpic"; + drive-strength = <8>; + bias-disable; From a7c068b935909ed6d91396d856fc3d2bb2df276a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Owoc?= Date: Wed, 13 Mar 2024 12:57:04 +0100 Subject: [PATCH 08/80] generic: 6.6: add patch to support AQR114C PHY ID MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for AQR114C PHY ID. Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/14883 Signed-off-by: Robert Marko --- ...antia-add-support-for-AQR114C-PHY-ID.patch | 69 +++++++++++++++++++ ...hy-aquantia-enable-AQR112-and-AQR412.patch | 8 +-- ...aquantia-fix-system-side-protocol-mi.patch | 2 +- ...ntia-add-PHY_IDs-for-AQR112-variants.patch | 10 +-- 4 files changed, 79 insertions(+), 10 deletions(-) create mode 100644 target/linux/generic/backport-6.6/765-v6.9-net-phy-aquantia-add-support-for-AQR114C-PHY-ID.patch diff --git a/target/linux/generic/backport-6.6/765-v6.9-net-phy-aquantia-add-support-for-AQR114C-PHY-ID.patch b/target/linux/generic/backport-6.6/765-v6.9-net-phy-aquantia-add-support-for-AQR114C-PHY-ID.patch new file mode 100644 index 00000000000000..714ef4987225c4 --- /dev/null +++ b/target/linux/generic/backport-6.6/765-v6.9-net-phy-aquantia-add-support-for-AQR114C-PHY-ID.patch @@ -0,0 +1,69 @@ +From c278ec644377249aba5b1e1ca2b5705fd1c0132c Mon Sep 17 00:00:00 2001 +From: Paweł Owoc +Date: Mon, 1 Apr 2024 16:51:06 +0200 +Subject: [PATCH net-next v2] net: phy: aquantia: add support for AQR114C PHY ID + +Add support for AQR114C PHY ID. This PHY advertise 10G speed: +SPEED(0x04): 0x6031 + capabilities: -400g +5g +2.5g -200g -25g -10g-xr -100g -40g -10g/1g -10 + +100 +1000 -10-ts -2-tl +10g +EXTABLE(0x0B): 0x40fc + capabilities: -10g-cx4 -10g-lrm +10g-t +10g-kx4 +10g-kr +1000-t +1000-kx + +100-tx -10-t -p2mp -40g/100g -1000/100-t1 -25g -200g/400g + +2.5g/5g -1000-h + +but supports only up to 5G speed (as with AQR111/111B0). +AQR111 init config is used to set max speed 5G. + +Signed-off-by: Paweł Owoc +Reviewed-by: Andrew Lunn +Link: https://lore.kernel.org/r/20240401145114.1699451-1-frut3k7@gmail.com +Signed-off-by: Jakub Kicinski +--- + drivers/net/phy/aquantia/aquantia_main.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +--- a/drivers/net/phy/aquantia/aquantia_main.c ++++ b/drivers/net/phy/aquantia/aquantia_main.c +@@ -28,6 +28,7 @@ + #define PHY_ID_AQR412 0x03a1b712 + #define PHY_ID_AQR113 0x31c31c40 + #define PHY_ID_AQR113C 0x31c31c12 ++#define PHY_ID_AQR114C 0x31c31c22 + #define PHY_ID_AQR813 0x31c31cb2 + + #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 +@@ -880,6 +881,25 @@ static struct phy_driver aqr_driver[] = + .link_change_notify = aqr107_link_change_notify, + }, + { ++ PHY_ID_MATCH_MODEL(PHY_ID_AQR114C), ++ .name = "Aquantia AQR114C", ++ .probe = aqr107_probe, ++ .get_rate_matching = aqr107_get_rate_matching, ++ .config_init = aqr111_config_init, ++ .config_aneg = aqr_config_aneg, ++ .config_intr = aqr_config_intr, ++ .handle_interrupt = aqr_handle_interrupt, ++ .read_status = aqr107_read_status, ++ .get_tunable = aqr107_get_tunable, ++ .set_tunable = aqr107_set_tunable, ++ .suspend = aqr107_suspend, ++ .resume = aqr107_resume, ++ .get_sset_count = aqr107_get_sset_count, ++ .get_strings = aqr107_get_strings, ++ .get_stats = aqr107_get_stats, ++ .link_change_notify = aqr107_link_change_notify, ++}, ++{ + PHY_ID_MATCH_MODEL(PHY_ID_AQR813), + .name = "Aquantia AQR813", + .probe = aqr107_probe, +@@ -916,6 +936,7 @@ static struct mdio_device_id __maybe_unu + { PHY_ID_MATCH_MODEL(PHY_ID_AQR412) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR113) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) }, ++ { PHY_ID_MATCH_MODEL(PHY_ID_AQR114C) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR813) }, + { } + }; diff --git a/target/linux/generic/hack-6.6/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch b/target/linux/generic/hack-6.6/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch index 1232c664ed5d1a..ff2038d6f7cd44 100644 --- a/target/linux/generic/hack-6.6/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch +++ b/target/linux/generic/hack-6.6/722-net-phy-aquantia-enable-AQR112-and-AQR412.patch @@ -15,7 +15,7 @@ Signed-off-by: Alex Marginean --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c -@@ -101,6 +101,29 @@ +@@ -102,6 +102,29 @@ #define AQR107_OP_IN_PROG_SLEEP 1000 #define AQR107_OP_IN_PROG_TIMEOUT 100000 @@ -45,7 +45,7 @@ Signed-off-by: Alex Marginean struct aqr107_hw_stat { const char *name; int reg; -@@ -232,6 +255,51 @@ static int aqr_config_aneg(struct phy_de +@@ -233,6 +256,51 @@ static int aqr_config_aneg(struct phy_de return genphy_c45_check_and_restart_aneg(phydev, changed); } @@ -97,7 +97,7 @@ Signed-off-by: Alex Marginean static int aqr_config_intr(struct phy_device *phydev) { bool en = phydev->interrupts == PHY_INTERRUPT_ENABLED; -@@ -809,7 +877,7 @@ static struct phy_driver aqr_driver[] = +@@ -810,7 +878,7 @@ static struct phy_driver aqr_driver[] = PHY_ID_MATCH_MODEL(PHY_ID_AQR112), .name = "Aquantia AQR112", .probe = aqr107_probe, @@ -106,7 +106,7 @@ Signed-off-by: Alex Marginean .config_intr = aqr_config_intr, .handle_interrupt = aqr_handle_interrupt, .get_tunable = aqr107_get_tunable, -@@ -827,7 +895,7 @@ static struct phy_driver aqr_driver[] = +@@ -828,7 +896,7 @@ static struct phy_driver aqr_driver[] = PHY_ID_MATCH_MODEL(PHY_ID_AQR412), .name = "Aquantia AQR412", .probe = aqr107_probe, diff --git a/target/linux/generic/hack-6.6/723-net-phy-aquantia-fix-system-side-protocol-mi.patch b/target/linux/generic/hack-6.6/723-net-phy-aquantia-fix-system-side-protocol-mi.patch index 72a70ebc140a94..614003a5d8d367 100644 --- a/target/linux/generic/hack-6.6/723-net-phy-aquantia-fix-system-side-protocol-mi.patch +++ b/target/linux/generic/hack-6.6/723-net-phy-aquantia-fix-system-side-protocol-mi.patch @@ -14,7 +14,7 @@ Signed-off-by: Alex Marginean --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c -@@ -288,10 +288,16 @@ static int aqr_config_aneg_set_prot(stru +@@ -289,10 +289,16 @@ static int aqr_config_aneg_set_prot(stru phy_write_mmd(phydev, MDIO_MMD_VEND1, AQUANTIA_VND1_GSTART_RATE, aquantia_syscfg[if_type].start_rate); diff --git a/target/linux/generic/hack-6.6/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch b/target/linux/generic/hack-6.6/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch index ee7d0c57b0fec1..4a72b1bd2b2998 100644 --- a/target/linux/generic/hack-6.6/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch +++ b/target/linux/generic/hack-6.6/725-net-phy-aquantia-add-PHY_IDs-for-AQR112-variants.patch @@ -12,16 +12,16 @@ Signed-off-by: Daniel Golle --- a/drivers/net/phy/aquantia/aquantia_main.c +++ b/drivers/net/phy/aquantia/aquantia_main.c -@@ -29,6 +29,8 @@ - #define PHY_ID_AQR113 0x31c31c40 +@@ -30,6 +30,8 @@ #define PHY_ID_AQR113C 0x31c31c12 + #define PHY_ID_AQR114C 0x31c31c22 #define PHY_ID_AQR813 0x31c31cb2 +#define PHY_ID_AQR112C 0x03a1b790 +#define PHY_ID_AQR112R 0x31c31d12 #define MDIO_PHYXS_VEND_IF_STATUS 0xe812 #define MDIO_PHYXS_VEND_IF_STATUS_TYPE_MASK GENMASK(7, 3) -@@ -972,6 +974,30 @@ static struct phy_driver aqr_driver[] = +@@ -992,6 +994,30 @@ static struct phy_driver aqr_driver[] = .get_stats = aqr107_get_stats, .link_change_notify = aqr107_link_change_notify, }, @@ -52,9 +52,9 @@ Signed-off-by: Daniel Golle }; module_phy_driver(aqr_driver); -@@ -991,6 +1017,8 @@ static struct mdio_device_id __maybe_unu - { PHY_ID_MATCH_MODEL(PHY_ID_AQR113) }, +@@ -1012,6 +1038,8 @@ static struct mdio_device_id __maybe_unu { PHY_ID_MATCH_MODEL(PHY_ID_AQR113C) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR114C) }, { PHY_ID_MATCH_MODEL(PHY_ID_AQR813) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR112C) }, + { PHY_ID_MATCH_MODEL(PHY_ID_AQR112R) }, From 0354f6baaea4638975c7f7e0404bed1a92987e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Owoc?= Date: Wed, 13 Mar 2024 13:01:01 +0100 Subject: [PATCH 09/80] qca-ssdk: add patch to support AQR114C-B0 PHY MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add support for AQR114C-B0 PHY. Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/14883 Signed-off-by: Robert Marko --- ...l_phy-add-support-for-AQR114C-B0-PHY.patch | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch diff --git a/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch b/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch new file mode 100644 index 00000000000000..d93cf0978ca498 --- /dev/null +++ b/package/kernel/qca-ssdk/patches/103-hsl_phy-add-support-for-AQR114C-B0-PHY.patch @@ -0,0 +1,33 @@ +From ab3b663842f66d0ed290696cee9edb9070a36e8f Mon Sep 17 00:00:00 2001 +From: Paweł Owoc +Date: Wed, 7 May 2024 10:37:44 +0100 +Subject: [PATCH] hsl_phy: add support for AQR114C-B0 PHY + +Add support for AQR114C-B0 PHY. + +Signed-off-by: Paweł Owoc +--- + include/hsl/phy/hsl_phy.h | 1 + + src/hsl/phy/hsl_phy.c | 1 + + 2 files changed, 2 insertions(+) + +--- a/include/hsl/phy/hsl_phy.h ++++ b/include/hsl/phy/hsl_phy.h +@@ -612,6 +612,7 @@ typedef struct { + #define AQUANTIA_PHY_113C_B0 0x31c31C12 + #define AQUANTIA_PHY_113C_B1 0x31c31C13 + #define AQUANTIA_PHY_112C 0x03a1b792 ++#define AQUANTIA_PHY_114C_B0 0x31c31c22 + #define MVL_PHY_X3410 0x31c31DD3 + + #define PHY_805XV2 0x004DD082 +--- a/src/hsl/phy/hsl_phy.c ++++ b/src/hsl/phy/hsl_phy.c +@@ -271,6 +271,7 @@ phy_type_t hsl_phytype_get_by_phyid(a_uint32_t dev_id, a_uint32_t phy_id) + case AQUANTIA_PHY_113C_B0: + case AQUANTIA_PHY_113C_B1: + case AQUANTIA_PHY_112C: ++ case AQUANTIA_PHY_114C_B0: + case MVL_PHY_X3410: + phytype = AQUANTIA_PHY_CHIP; + break; From 7f1c87ebde223e9ddfd4fc9ea0a653596e60b935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Owoc?= Date: Wed, 13 Mar 2024 12:36:39 +0100 Subject: [PATCH 10/80] qualcommax: ipq807x: define common Linksys MX device MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Define common Linksys MX device for MX4200v1/v2 and MX5300. Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/14883 Signed-off-by: Robert Marko --- target/linux/qualcommax/image/ipq807x.mk | 33 +++++++++++------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index e32250d4583715..a4fd6ff7969044 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -103,20 +103,26 @@ define Device/edimax_cax1800 endef TARGET_DEVICES += edimax_cax1800 -define Device/linksys_mx4200v1 +define Device/linksys_mx $(call Device/FitImage) DEVICE_VENDOR := Linksys - DEVICE_MODEL := MX4200 - DEVICE_VARIANT := v1 BLOCKSIZE := 128k PAGESIZE := 2048 KERNEL_SIZE := 6144k IMAGE_SIZE := 147456k NAND_SIZE := 512m - SOC := ipq8174 + SOC := ipq8072 IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=MX4200 - DEVICE_PACKAGES := kmod-leds-pca963x ipq-wifi-linksys_mx4200 kmod-bluetooth + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=$$$$(DEVICE_MODEL) + DEVICE_PACKAGES := kmod-leds-pca963x +endef + +define Device/linksys_mx4200v1 + $(call Device/linksys_mx) + DEVICE_MODEL := MX4200 + DEVICE_VARIANT := v1 + SOC := ipq8174 + DEVICE_PACKAGES += ipq-wifi-linksys_mx4200 kmod-bluetooth endef TARGET_DEVICES += linksys_mx4200v1 @@ -127,19 +133,10 @@ endef TARGET_DEVICES += linksys_mx4200v2 define Device/linksys_mx5300 - $(call Device/FitImage) - DEVICE_VENDOR := Linksys + $(call Device/linksys_mx) DEVICE_MODEL := MX5300 - BLOCKSIZE := 128k - PAGESIZE := 2048 - KERNEL_SIZE := 6144k - IMAGE_SIZE := 147456k - NAND_SIZE := 512m - SOC := ipq8072 - IMAGES += factory.bin - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | linksys-image type=MX5300 - DEVICE_PACKAGES := kmod-leds-pca963x kmod-rtc-ds1307 \ - ipq-wifi-linksys_mx5300 kmod-ath10k-ct ath10k-firmware-qca9984-ct + DEVICE_PACKAGES += kmod-rtc-ds1307 ipq-wifi-linksys_mx5300 \ + kmod-ath10k-ct ath10k-firmware-qca9984-ct endef TARGET_DEVICES += linksys_mx5300 From 9bdaebaff323e554046ce354092832c956b2ad5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Owoc?= Date: Mon, 26 Feb 2024 11:38:02 +0100 Subject: [PATCH 11/80] qualcommax: ipq807x: add support for Linksys MX8500 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hardware specification: ======== SoC: Qualcomm IPQ8072A Flash: 512MB (Fidelix FMND4G08S3J-ID) RAM: 1GB (2x Kingston DDR3L D2516ECMDXGJD) Ethernet: 1x 10/100/1000/2500/5000Mbps (Marvell AQR114C) Ethernet: 4x 10/100/1000Mbps (Qualcomm QCA8075) WiFi1: 6GHz ax 4x4 (Qualcomm QCN9024 + Skyworks SKY85784-11) - channels 33-229 WiFi2: 5GHz ax 4x4 (Qualcomm QCN5054 + Skyworks SKY85755-11) - channels 36-177 WiFi3: 2.4GHz ax 4x4 (Qualcomm QCN5024 + Skyworks SKY8340-11) IoT: Bluetooth 5, Zigbee and Thread (NXP K32W041) LED: 1x RGB status (NXP PCA9633) USB: 1x USB 3.0 Button: WPS, Reset Flash instructions: ======== 1. Manually upgrade firmware using openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin image. More details can be found here: https://www.linksys.com/support-article?articleNum=47547 After first boot check actual partition: - fw_printenv -n boot_part and install firmware on second partition using command in case of 2: - mtd -r -e kernel -n write openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin kernel and in case of 1: - mtd -r -e alt_kernel -n write openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin alt_kernel 2. Installation using serial connection from OEM firmware (default login: root, password: admin): - fw_printenv -n boot_part In case of 2: - flash_erase /dev/mtd21 0 0 - nandwrite -p /dev/mtd21 openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin or in case of 1: - flash_erase /dev/mtd23 0 0 - nandwrite -p /dev/mtd23 openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin After first boot install firmware on second partition: - mtd -r -e kernel -n write openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin kernel or: - mtd -r -e alt_kernel -n write openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin alt_kernel 3. Installation from initramfs image using USB drive: Put the initramfs image on the USB drive: - dd bs=1M if=openwrt-qualcommax-ipq807x-linksys_mx8500-initramfs-uImage.itb of=/dev/sda Stop u-boot and run: - usb start && usbboot $loadaddr 0 && bootm $loadaddr Write firmware to the flash from initramfs: - mtd -e kernel -n write openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin kernel and: - mtd -r -e alt_kernel -n write openwrt-qualcommax-ipq807x-linksys_mx8500-squashfs-factory.bin alt_kernel 4. Back to the OEM firmware: - mtd -e kernel -n write FW_MX8500_1.0.11.208937_prod.img kernel and: - mtd -r -e alt_kernel -n write FW_MX8500_1.0.11.208937_prod.img alt_kernel 5. USB recovery: Put the initramfs image on the USB: - dd bs=1M if=openwrt-qualcommax-ipq807x-linksys_mx8500-initramfs-uImage.itb of=/dev/sda Set u-boot env: - fw_setenv bootusb 'usb start && usbboot $loadaddr 0 && bootm $loadaddr' - fw_setenv bootcmd 'run bootusb; if test $auto_recovery = no; then bootipq; elif test $boot_part = 1; then run bootpart1; else run bootpart2; fi' AQR firmware: ======== 1. Firmware loading: To properly load the firmware and initialize AQR PHY, we must use the u-boot aq_load_fw function. To do this, you need to modify u-boot env: With USB recovery: - fw_setenv bootcmd 'aq_load_fw; run bootusb; if test $auto_recovery = no; then bootipq; elif test $boot_part = 1; then run bootpart1; else run bootpart2; fi' and without: - fw_setenv bootcmd 'aq_load_fw; if test $auto_recovery = no; then bootipq; elif test $boot_part = 1; then run bootpart1; else run bootpart2; fi' 2. Firmware updating: Newer firmware (AQR-G4_v5.6.5-AQR_WNC_SAQA-L2_GT_ID45287_VER24005.cld) is available in the latest OEM firmware. To load this firmware via u-boot, we need to add the MBN header and update 0:ethphyfw partition. For MBN header we can use script from this repository: https://github.com/testuser7/aqr_mbn_tool - python aqr_mbn_tool.py AQR-G4_v5.6.5-AQR_WNC_SAQA-L2_GT_ID45287_VER24005.cld To update partition we need to install kmod-mtd-rw package first: - insmod mtd-rw.ko i_want_a_brick=1 - mtd -e /dev/mtd26 -n write aqr_fw.mbn /dev/mtd26 Signed-off-by: Paweł Owoc Link: https://github.com/openwrt/openwrt/pull/14883 Signed-off-by: Robert Marko --- .../uboot-envtools/files/qualcommax_ipq807x | 3 +- package/firmware/ipq-wifi/Makefile | 2 + .../arm64/boot/dts/qcom/ipq8072-mx8500.dts | 523 ++++++++++++++++++ target/linux/qualcommax/image/ipq807x.mk | 8 + .../ipq807x/base-files/etc/board.d/02_network | 6 + .../etc/hotplug.d/firmware/11-ath11k-caldata | 7 +- .../ipq807x/base-files/etc/init.d/bootcount | 3 +- .../base-files/lib/upgrade/platform.sh | 3 +- 8 files changed, 551 insertions(+), 4 deletions(-) create mode 100644 target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts diff --git a/package/boot/uboot-envtools/files/qualcommax_ipq807x b/package/boot/uboot-envtools/files/qualcommax_ipq807x index 312fdf8d871eae..060871396b4ea9 100644 --- a/package/boot/uboot-envtools/files/qualcommax_ipq807x +++ b/package/boot/uboot-envtools/files/qualcommax_ipq807x @@ -31,7 +31,8 @@ edimax,cax1800) ;; linksys,mx4200v1|\ linksys,mx4200v2|\ -linksys,mx5300) +linksys,mx5300|\ +linksys,mx8500) idx="$(find_mtd_index u_env)" [ -n "$idx" ] && \ ubootenv_add_uci_config "/dev/mtd$idx" "0x0" "0x40000" "0x20000" "2" diff --git a/package/firmware/ipq-wifi/Makefile b/package/firmware/ipq-wifi/Makefile index 68448a6ec1d1f9..2ffd2e014c7fd1 100644 --- a/package/firmware/ipq-wifi/Makefile +++ b/package/firmware/ipq-wifi/Makefile @@ -37,6 +37,7 @@ ALLWIFIBOARDS:= \ edimax_cax1800 \ linksys_mx4200 \ linksys_mx5300 \ + linksys_mx8500 \ netgear_lbr20 \ netgear_rax120v2 \ netgear_wax214 \ @@ -157,6 +158,7 @@ $(eval $(call generate-ipq-wifi-package,edgecore_eap102,Edgecore EAP102)) $(eval $(call generate-ipq-wifi-package,edimax_cax1800,Edimax CAX1800)) $(eval $(call generate-ipq-wifi-package,linksys_mx4200,Linksys MX4200)) $(eval $(call generate-ipq-wifi-package,linksys_mx5300,Linksys MX5300)) +$(eval $(call generate-ipq-wifi-package,linksys_mx8500,Linksys MX8500)) $(eval $(call generate-ipq-wifi-package,netgear_lbr20,Netgear LBR20)) $(eval $(call generate-ipq-wifi-package,netgear_rax120v2,Netgear RAX120v2)) $(eval $(call generate-ipq-wifi-package,netgear_wax214,Netgear WAX214)) diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts new file mode 100644 index 00000000000000..70f4438ab0c530 --- /dev/null +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx8500.dts @@ -0,0 +1,523 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +/dts-v1/; + +#include "ipq8074.dtsi" +#include "ipq8074-hk-cpu.dtsi" +#include "ipq8074-ess.dtsi" +#include +#include +#include + +/ { + model = "Linksys MX8500"; + compatible = "linksys,mx8500", "qcom,ipq8074"; + + aliases { + serial0 = &blsp1_uart5; + serial1 = &blsp1_uart3; + led-boot = &led_system_blue; + led-running = &led_system_blue; + led-failsafe = &led_system_red; + led-upgrade = &led_system_green; + }; + + chosen { + stdout-path = "serial0:115200n8"; + bootargs-append = " root=/dev/ubiblock0_0 rootfstype=squashfs ro"; + }; + + gpio_export { + compatible = "gpio-export"; + #size-cells = <0>; + + bt_pwr { + gpio-export,name = "bt_pwr"; + gpio-export,output = <1>; + gpios = <&tlmm 21 GPIO_ACTIVE_HIGH>; + }; + }; + + keys { + compatible = "gpio-keys"; + pinctrl-0 = <&button_pins>; + pinctrl-names = "default"; + + reset-button { + label = "reset"; + gpios = <&tlmm 67 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + + wps-button { + label = "wps"; + gpios = <&tlmm 64 GPIO_ACTIVE_LOW>; + linux,code = ; + }; + }; +}; + +&tlmm { + button_pins: button-state { + pins = "gpio64", "gpio67"; + function = "gpio"; + drive-strength = <8>; + bias-pull-up; + }; + + mdio_pins: mdio-state { + mdc-pins { + pins = "gpio68"; + function = "mdc"; + drive-strength = <8>; + bias-pull-up; + }; + + mdio-pins { + pins = "gpio69"; + function = "mdio"; + drive-strength = <8>; + bias-pull-up; + }; + }; +}; + +&blsp1_uart3 { + status = "okay"; +}; + +&blsp1_uart5 { + status = "okay"; +}; + +&prng { + status = "okay"; +}; + +&cryptobam { + status = "okay"; +}; + +&crypto { + status = "okay"; +}; + +&qpic_bam { + status = "okay"; +}; + +&qpic_nand { + status = "okay"; + + /* + * Bootloader will find the NAND DT node by the compatible and + * then "fixup" it by adding the partitions from the SMEM table + * using the legacy bindings thus making it impossible for us + * to change the partition table or utilize NVMEM for calibration. + * So add a dummy partitions node that bootloader will populate + * and set it as disabled so the kernel ignores it instead of + * printing warnings due to the broken way bootloader adds the + * partitions. + */ + partitions { + status = "disabled"; + }; + + nand@0 { + reg = <0>; + nand-ecc-strength = <4>; + nand-ecc-step-size = <512>; + nand-bus-width = <8>; + + #address-cells = <1>; + #size-cells = <1>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "0:sbl1"; + reg = <0x0 0x100000>; + read-only; + }; + + partition@100000 { + label = "0:mibib"; + reg = <0x100000 0x100000>; + read-only; + }; + + partition@200000 { + label = "0:bootconfig"; + reg = <0x200000 0x80000>; + read-only; + }; + + partition@280000 { + label = "0:bootconfig1"; + reg = <0x280000 0x80000>; + read-only; + }; + + partition@300000 { + label = "0:qsee"; + reg = <0x300000 0x300000>; + read-only; + }; + + partition@600000 { + label = "0:qsee_1"; + reg = <0x600000 0x300000>; + read-only; + }; + + partition@900000 { + label = "0:devcfg"; + reg = <0x900000 0x80000>; + read-only; + }; + + partition@980000 { + label = "0:devcfg_1"; + reg = <0x980000 0x80000>; + read-only; + }; + + partition@a00000 { + label = "0:apdp"; + reg = <0xa00000 0x80000>; + read-only; + }; + + partition@a80000 { + label = "0:apdp_1"; + reg = <0xa80000 0x80000>; + read-only; + }; + + partition@b00000 { + label = "0:rpm"; + reg = <0xb00000 0x80000>; + read-only; + }; + + partition@b80000 { + label = "0:rpm_1"; + reg = <0xb80000 0x80000>; + read-only; + }; + + partition@c00000 { + label = "0:cdt"; + reg = <0xc00000 0x80000>; + read-only; + }; + + partition@c80000 { + label = "0:cdt_1"; + reg = <0xc80000 0x80000>; + read-only; + }; + + partition@d00000 { + label = "0:appsblenv"; + reg = <0xd00000 0x80000>; + }; + + partition@d80000 { + label = "0:appsbl"; + reg = <0xd80000 0x100000>; + read-only; + }; + + partition@e80000 { + label = "0:appsbl_1"; + reg = <0xe80000 0x100000>; + read-only; + }; + + partition@f80000 { + label = "0:art"; + reg = <0xf80000 0x80000>; + read-only; + }; + + partition@1000000 { + label = "u_env"; + reg = <0x1000000 0x40000>; + }; + + partition@1040000 { + label = "s_env"; + reg = <0x1040000 0x20000>; + }; + + partition@1060000 { + label = "devinfo"; + reg = <0x1060000 0x20000>; + read-only; + }; + + partition@1080000 { + label = "kernel"; + reg = <0x1080000 0x9600000>; + }; + + partition@1680000 { + label = "rootfs"; + reg = <0x1680000 0x9000000>; + }; + + partition@a680000 { + label = "alt_kernel"; + reg = <0xa680000 0x9600000>; + }; + + partition@ac80000 { + label = "alt_rootfs"; + reg = <0xac80000 0x9000000>; + }; + + partition@13c80000 { + label = "sysdiag"; + reg = <0x13c80000 0x200000>; + read-only; + }; + + partition@13e80000 { + label = "0:ethphyfw"; + reg = <0x13e80000 0x100000>; + read-only; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + aqr_fw: firmware@0 { + /* Skip the QCOM MBN Header of 40 bytes */ + reg = <0x28 0x60002>; + }; + }; + }; + + partition@13f80000 { + label = "syscfg"; + reg = <0x13f80000 0xb180000>; + read-only; + }; + + partition@1f100000 { + label = "app_data"; + reg = <0x1f100000 0x500000>; + read-only; + }; + + partition@1f600000 { + label = "0:wififw"; + reg = <0x1f600000 0xa00000>; + read-only; + }; + }; + }; +}; + +&blsp1_i2c2 { + status = "okay"; + + led-controller@62 { + compatible = "nxp,pca9633"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x62>; + nxp,hw-blink; + + led_system_red: led@0 { + reg = <0>; + color = ; + function = LED_FUNCTION_STATUS; + }; + + led_system_green: led@1 { + reg = <1>; + color = ; + function = LED_FUNCTION_STATUS; + }; + + led_system_blue: led@2 { + reg = <2>; + color = ; + function = LED_FUNCTION_STATUS; + }; + }; +}; + +&mdio { + status = "okay"; + + pinctrl-0 = <&mdio_pins>; + pinctrl-names = "default"; + reset-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>; + + ethernet-phy-package@0 { + #address-cells = <1>; + #size-cells = <0>; + compatible = "qcom,qca8075-package"; + reg = <0>; + + qcom,package-mode = "qsgmii"; + + qca8075_0: ethernet-phy@0 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0>; + }; + + qca8075_1: ethernet-phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <1>; + }; + + qca8075_2: ethernet-phy@2 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <2>; + }; + + qca8075_3: ethernet-phy@3 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <3>; + }; + }; + + aqr114c: ethernet-phy@8 { + compatible = "ethernet-phy-ieee802.3-c45"; + reg = <8>; + reset-gpios = <&tlmm 44 GPIO_ACTIVE_LOW>; + firmware-name = "marvell/AQR-G4_v5.6.5-AQR_WNC_SAQA-L2_GT_ID45287_VER24005.cld"; + nvmem-cells = <&aqr_fw>; + nvmem-cell-names = "firmware"; + }; +}; + +&switch { + status = "okay"; + + switch_lan_bmp = <(ESS_PORT1 | ESS_PORT2 | ESS_PORT3 | ESS_PORT4)>; /* lan port bitmap */ + switch_wan_bmp = ; /* wan port bitmap */ + switch_mac_mode = ; /* mac mode for uniphy instance0*/ + switch_mac_mode2 = ; /* mac mode for uniphy instance2*/ + + qcom,port_phyinfo { + port@1 { + port_id = <1>; + phy_address = <0>; + }; + + port@2 { + port_id = <2>; + phy_address = <1>; + }; + + port@3 { + port_id = <3>; + phy_address = <2>; + }; + + port@4 { + port_id = <4>; + phy_address = <3>; + }; + + port@6 { + port_id = <6>; + phy_address = <8>; + compatible = "ethernet-phy-ieee802.3-c45"; + ethernet-phy-ieee802.3-c45; + }; + }; +}; + +&edma { + status = "okay"; +}; + +&dp1 { + status = "okay"; + phy-mode = "qsgmii"; + phy-handle = <&qca8075_0>; + label = "lan1"; +}; + +&dp2 { + status = "okay"; + phy-mode = "qsgmii"; + phy-handle = <&qca8075_1>; + label = "lan2"; +}; + +&dp3 { + status = "okay"; + phy-mode = "qsgmii"; + phy-handle = <&qca8075_2>; + label = "lan3"; +}; + +&dp4 { + status = "okay"; + phy-mode = "qsgmii"; + phy-handle = <&qca8075_3>; + label = "lan4"; +}; + +&dp6_syn { + status = "okay"; + phy-mode = "usxgmii"; + phy-handle = <&aqr114c>; + label = "wan"; +}; + +&ssphy_0 { + status = "okay"; +}; + +&qusb_phy_0 { + status = "okay"; +}; + +&usb_0 { + status = "okay"; +}; + +&pcie_qmp0 { + status = "okay"; +}; + +&pcie0 { + status = "okay"; + + perst-gpio = <&tlmm 61 GPIO_ACTIVE_LOW>; + + bridge@0,0 { + reg = <0x00000000 0 0 0 0>; + #address-cells = <3>; + #size-cells = <2>; + ranges; + + wifi@1,0 { + status = "okay"; + + /* ath11k has no DT compatible for PCI cards */ + compatible = "pci17cb,1104"; + reg = <0x00010000 0 0 0 0>; + + qcom,ath11k-calibration-variant = "Linksys-MX8500"; + }; + }; +}; + +&wifi { + status = "okay"; + + qcom,ath11k-calibration-variant = "Linksys-MX8500"; +}; diff --git a/target/linux/qualcommax/image/ipq807x.mk b/target/linux/qualcommax/image/ipq807x.mk index a4fd6ff7969044..007c73555e2254 100644 --- a/target/linux/qualcommax/image/ipq807x.mk +++ b/target/linux/qualcommax/image/ipq807x.mk @@ -140,6 +140,14 @@ define Device/linksys_mx5300 endef TARGET_DEVICES += linksys_mx5300 +define Device/linksys_mx8500 + $(call Device/linksys_mx) + DEVICE_MODEL := MX8500 + DEVICE_PACKAGES += ipq-wifi-linksys_mx8500 kmod-ath11k-pci \ + ath11k-firmware-qcn9074 kmod-bluetooth +endef +TARGET_DEVICES += linksys_mx8500 + define Device/netgear_rax120v2 $(call Device/FitImage) $(call Device/UbiFit) diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network index d87e4246e1a36e..380588bbab14d8 100644 --- a/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network +++ b/target/linux/qualcommax/ipq807x/base-files/etc/board.d/02_network @@ -15,6 +15,7 @@ ipq807x_setup_interfaces() buffalo,wxr-5950ax12|\ dynalink,dl-wrx36|\ linksys,mx5300|\ + linksys,mx8500|\ xiaomi,ax9000|\ zbtlink,zbt-z800ax) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan" @@ -76,6 +77,11 @@ ipq807x_setup_macs() done [ "$(mtd_get_mac_ascii u_env eth2addr)" != "$label_mac" ] && wan_mac=$label_mac ;; + linksys,mx8500) + label_mac=$(mtd_get_mac_ascii devinfo hw_mac_addr) + lan_mac=$(macaddr_add $label_mac 1) + wan_mac=$label_mac + ;; esac [ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata index c40d9bc5f9edce..018e8288590b96 100644 --- a/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata +++ b/target/linux/qualcommax/ipq807x/base-files/etc/hotplug.d/firmware/11-ath11k-caldata @@ -29,7 +29,8 @@ case "$FIRMWARE" in zte,mf269) caldata_extract "0:art" 0x1000 0x20000 ;; - linksys,mx4200v1) + linksys,mx4200v1|\ + linksys,mx8500) caldata_extract "0:art" 0x1000 0x20000 ath11k_remove_regdomain ;; @@ -66,6 +67,10 @@ case "$FIRMWARE" in "ath11k/QCN9074/hw1.0/cal-pci-0000:01:00.0.bin"|\ "ath11k/QCN9074/hw1.0/cal-pci-0001:01:00.0.bin") case "$board" in + linksys,mx8500) + caldata_extract "0:art" 0x26800 0x20000 + ath11k_remove_regdomain + ;; prpl,haze) caldata_extract_mmc "0:ART" 0x26800 0x20000 ;; diff --git a/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount index 3e81caf63f2e47..26da7cd614efec 100755 --- a/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount +++ b/target/linux/qualcommax/ipq807x/base-files/etc/init.d/bootcount @@ -12,7 +12,8 @@ boot() { ;; linksys,mx4200v1|\ linksys,mx4200v2|\ - linksys,mx5300) + linksys,mx5300|\ + linksys,mx8500) mtd resetbc s_env || true ;; esac diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh index b9668d0af4ef9f..b99657fb4ccbd3 100644 --- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh +++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh @@ -77,7 +77,8 @@ platform_do_upgrade() { ;; linksys,mx4200v1|\ linksys,mx4200v2|\ - linksys,mx5300) + linksys,mx5300|\ + linksys,mx8500) boot_part="$(fw_printenv -n boot_part)" if [ "$boot_part" -eq "1" ]; then fw_setenv boot_part 2 From 82353d3e3d3059fa221541f764df9cdc8a20d9ed Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Wed, 15 May 2024 19:02:06 +0200 Subject: [PATCH 12/80] tegra: pad rootfs to recreate overlay after upgrade The old overlay remained after upgrades and would cause failure on first boot after upgrade, in which no new overlay could be created while old one was unusable. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/image/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index 82394f4ab6fadb..8a331f2607538e 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -16,12 +16,13 @@ define Build/tegra-sdcard -n '$(DEVICE_TITLE) OpenWrt bootscript' \ -d $(BOOT_SCRIPT) \ $@.boot/boot.scr + $(CP) $@ $@.rootfs SIGNATURE="$(IMG_PART_SIGNATURE)" \ $(SCRIPT_DIR)/gen_image_generic.sh \ $@ \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $@.boot \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) $(IMAGE_ROOTFS) \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) $@.rootfs \ 2048 $(if $(UBOOT),dd if=$(STAGING_DIR_IMAGE)/$(UBOOT).img of=$@ bs=512 skip=1 seek=1 conv=notrunc) @@ -32,7 +33,7 @@ DEVICE_VARS += BOOT_SCRIPT UBOOT define Device/Default BOOT_SCRIPT := generic-bootscript IMAGES := sdcard.img.gz - IMAGE/sdcard.img.gz := tegra-sdcard | gzip | append-metadata + IMAGE/sdcard.img.gz := append-rootfs | pad-extra 128k | tegra-sdcard | gzip | append-metadata KERNEL_NAME := zImage KERNEL := kernel-bin PROFILES := Default From a0c5efd3f7f40420655b5f92bd9002f2eb6ba35d Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Wed, 15 May 2024 19:02:07 +0200 Subject: [PATCH 13/80] tegra: drop console specifiers from kernel commad line Because recent changes to procd, last "console" argument was used as primary argument and causing no terminal to be spawned on serial interface. So drop the hardcoded consoles in boot script, since dts has already an alias specified, which lets procd decide where to spawn the terminal. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/image/generic-bootscript | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/tegra/image/generic-bootscript b/target/linux/tegra/image/generic-bootscript index 0e7816490d9ebd..5d4620c4d20048 100644 --- a/target/linux/tegra/image/generic-bootscript +++ b/target/linux/tegra/image/generic-bootscript @@ -1,6 +1,6 @@ part uuid ${devtype} ${devnum}:2 ptuuid -setenv bootargs "root=PARTUUID=${ptuuid} rw rootwait console=ttyS0,115200 console=tty0" +setenv bootargs "root=PARTUUID=${ptuuid} rw rootwait" load ${devtype} ${devnum}:${bootpart} ${kernel_addr_r} zImage load ${devtype} ${devnum}:${bootpart} ${fdt_addr_r} ${soc}-${board}.dtb From 6660a15d72cbb640292d821fa92240db0befa532 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Wed, 15 May 2024 19:02:08 +0200 Subject: [PATCH 14/80] tegra: trimslice: enable GPIO LEDs driver LEDs are on all the time since boot, until there's driver to claim them. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/image/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index 8a331f2607538e..609cf5dd38f96d 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -43,8 +43,8 @@ define Device/compulab_trimslice DEVICE_VENDOR := CompuLab DEVICE_MODEL := TrimSlice DEVICE_DTS := tegra20-trimslice - DEVICE_PACKAGES := kmod-r8169 kmod-rt2800-usb kmod-rtc-em3027 \ - kmod-usb-storage wpad-basic-mbedtls + DEVICE_PACKAGES := kmod-leds-gpio kmod-r8169 kmod-rt2800-usb \ + kmod-rtc-em3027 kmod-usb-storage wpad-basic-mbedtls UBOOT := trimslice-mmc endef TARGET_DEVICES += compulab_trimslice From 6a29d32d8aebba7f427c7ace92c02d95281967b4 Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Wed, 15 May 2024 19:02:09 +0200 Subject: [PATCH 15/80] tegra: trimslice: enable USB HID driver Without serial or network access the only option for initial configuration, is a attached display with USB keyboard, but the keyboard driver needs to be installed first. So enable keyboard driver by default to avoid this issue. Signed-off-by: Tomasz Maciej Nowak --- target/linux/tegra/image/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/tegra/image/Makefile b/target/linux/tegra/image/Makefile index 609cf5dd38f96d..da0b3813bb2f6c 100644 --- a/target/linux/tegra/image/Makefile +++ b/target/linux/tegra/image/Makefile @@ -44,7 +44,7 @@ define Device/compulab_trimslice DEVICE_MODEL := TrimSlice DEVICE_DTS := tegra20-trimslice DEVICE_PACKAGES := kmod-leds-gpio kmod-r8169 kmod-rt2800-usb \ - kmod-rtc-em3027 kmod-usb-storage wpad-basic-mbedtls + kmod-rtc-em3027 kmod-usb-hid kmod-usb-storage wpad-basic-mbedtls UBOOT := trimslice-mmc endef TARGET_DEVICES += compulab_trimslice From 6832faf3407e79c3814759074d5cc76f87adeffe Mon Sep 17 00:00:00 2001 From: Tomasz Maciej Nowak Date: Wed, 15 May 2024 19:11:53 +0200 Subject: [PATCH 16/80] uboot-tegra: bump version to 2024.04 Since swig is mentioned as build dependency and buildbots have it installed we can safely bump version. Signed-off-by: Tomasz Maciej Nowak --- package/boot/uboot-tegra/Makefile | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/package/boot/uboot-tegra/Makefile b/package/boot/uboot-tegra/Makefile index d47ef6f6f01a3a..5bed6b97dd9c0b 100644 --- a/package/boot/uboot-tegra/Makefile +++ b/package/boot/uboot-tegra/Makefile @@ -6,10 +6,10 @@ # include $(TOPDIR)/rules.mk -PKG_VERSION := 2020.04 -PKG_RELEASE:=3 +PKG_VERSION := 2024.04 +PKG_RELEASE:=1 -PKG_HASH := fe732aaf037d9cc3c0909bad8362af366ae964bbdac6913a34081ff4ad565372 +PKG_HASH := 18a853fe39fad7ad03a90cc2d4275aeaed6da69735defac3492b80508843dd4a PKG_MAINTAINER := Tomasz Maciej Nowak @@ -46,11 +46,6 @@ define Build/bct-image ) endef -define Build/Configure - sed '/select BINMAN/d' -i $(PKG_BUILD_DIR)/arch/arm/mach-tegra/Kconfig - $(call Build/Configure/U-Boot) -endef - define Build/Compile $(call Build/Compile/U-Boot) $(call Build/bct-image) From 081a59e0f289b820f101cedf1dbbff29e3d4d45a Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 3 May 2024 17:43:08 +0200 Subject: [PATCH 17/80] rpcd: fix package dependency for APK Version dependencies must not contain spaces to be compatible with both OPKG and APK. Signed-off-by: Paul Spooren --- package/system/rpcd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/system/rpcd/Makefile b/package/system/rpcd/Makefile index 2db014f2df34ef..041164ccca959a 100644 --- a/package/system/rpcd/Makefile +++ b/package/system/rpcd/Makefile @@ -103,5 +103,5 @@ endef $(eval $(call BuildPackage,rpcd)) $(eval $(call BuildPlugin,file,,Provides ubus calls for file and directory operations.)) $(eval $(call BuildPlugin,rpcsys,,Provides ubus calls for sysupgrade and password changing.)) -$(eval $(call BuildPlugin,iwinfo,+libiwinfo,Provides ubus calls for accessing iwinfo data.,libiwinfo (>= 2023-01-21))) +$(eval $(call BuildPlugin,iwinfo,+libiwinfo,Provides ubus calls for accessing iwinfo data.,libiwinfo (>=2023.01.21))) $(eval $(call BuildPlugin,ucode,+libucode,Allows implementing plugins using ucode scripts.)) From ad4bd9c5d8245ca7e8abaccce8ff106e2a16980b Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 17 May 2024 21:47:46 +0300 Subject: [PATCH 18/80] apk: add missing PROVIDES Add PROVIDES:=apk to the Makefile so we can default to install `apk` by default as a dependency. Signed-off-by: Paul Spooren --- package/system/apk/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 912ddc253e6e23..0f0e043986ba94 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -30,6 +30,7 @@ define Package/apk/default TITLE:=apk package manager DEPENDS:=+zlib URL:=$(PKG_SOURCE_URL) + PROVIDES:=apk endef define Package/apk-mbedtls From 3e5a23639f53f6a5e969f7c243b534f31399fe8a Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 3 May 2024 17:26:35 +0200 Subject: [PATCH 19/80] gitignore: ignore local APK keys Those keys should never be added to the git repository. Signed-off-by: Paul Spooren --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 84cfc997705f4b..ad0475591915f4 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,8 @@ /*.patch /llvm-bpf* key-build* +private-key.pem +public-key.pem *.orig *.rej *~ From d788ab376f859164df84e2054cbbbb0921943c5b Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Tue, 14 May 2024 12:36:59 +0200 Subject: [PATCH 20/80] build: add APK package build capabilities A new option called `USE_APK` is added which generated APK packages (.apk) instead of OPKG packages (.ipk). Some features like fstools `snapshot` command are not yet ported Signed-off-by: Paul Spooren --- config/Config-build.in | 3 + include/feeds.mk | 20 +- include/image.mk | 22 +- include/{package-ipkg.mk => package-pack.mk} | 145 +++-- include/package.mk | 2 +- include/rootfs.mk | 30 +- include/target.mk | 7 +- package/Makefile | 40 +- package/base-files/Makefile | 25 +- .../apk/patches/0002-mbedtls-support.patch | 546 ++++++------------ rules.mk | 2 + scripts/feeds | 4 +- scripts/package-metadata.pl | 2 +- target/imagebuilder/Makefile | 23 +- target/imagebuilder/files/Makefile | 50 +- 15 files changed, 476 insertions(+), 445 deletions(-) rename include/{package-ipkg.mk => package-pack.mk} (69%) diff --git a/config/Config-build.in b/config/Config-build.in index 97688785723d3b..292899df6bbd7c 100644 --- a/config/Config-build.in +++ b/config/Config-build.in @@ -68,6 +68,9 @@ menu "Global build settings" bool "Enable TLS certificate verification during package download" default y + config USE_APK + bool "Use APK instead of OPKG to build distribution (EXPERIMENTAL)" + comment "General build options" config TESTING_KERNEL diff --git a/include/feeds.mk b/include/feeds.mk index 632fecb4a3aaec..87b1562c3edbf7 100644 --- a/include/feeds.mk +++ b/include/feeds.mk @@ -18,6 +18,10 @@ opkg_package_files = $(wildcard \ $(foreach dir,$(PACKAGE_SUBDIRS), \ $(foreach pkg,$(1), $(dir)/$(pkg)_*.ipk))) +apk_package_files = $(wildcard \ + $(foreach dir,$(PACKAGE_SUBDIRS), \ + $(foreach pkg,$(1), $(dir)/$(pkg)_*.apk))) + # 1: package name define FeedPackageDir $(strip $(if $(CONFIG_PER_FEED_REPO), \ @@ -28,7 +32,7 @@ $(strip $(if $(CONFIG_PER_FEED_REPO), \ endef # 1: destination file -define FeedSourcesAppend +define FeedSourcesAppendOPKG ( \ echo 'src/gz %d_core %U/targets/%S/packages'; \ $(strip $(if $(CONFIG_PER_FEED_REPO), \ @@ -41,6 +45,20 @@ define FeedSourcesAppend ) >> $(1) endef +# 1: destination file +define FeedSourcesAppendAPK +( \ + echo '%U/targets/%S/packages/packages.adb'; \ + $(strip $(if $(CONFIG_PER_FEED_REPO), \ + echo '%U/packages/%A/base/packages.adb'; \ + $(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \ + echo '%U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)/packages.adb';) \ + $(foreach feed,$(FEEDS_AVAILABLE), \ + $(if $(CONFIG_FEED_$(feed)), \ + echo '$(if $(filter m,$(CONFIG_FEED_$(feed))),# )%U/packages/%A/$(feed)/packages.adb';)))) \ +) >> $(1) +endef + # 1: package name define GetABISuffix $(if $(ABIV_$(1)),$(ABIV_$(1)),$(call FormatABISuffix,$(1),$(foreach v,$(wildcard $(STAGING_DIR)/pkginfo/$(1).version),$(shell cat $(v))))) diff --git a/include/image.mk b/include/image.mk index 0dd18dbd82714e..406f0b8534f276 100644 --- a/include/image.mk +++ b/include/image.mk @@ -278,8 +278,12 @@ define Image/mkfs/ext4 endef define Image/Manifest - $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \ - $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest + $(if $(CONFIG_USE_APK), \ + $(call apk,$(TARGET_DIR_ORIG)) list --quiet --manifest --no-network | sort | sed 's/ / - /' > \ + $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest, \ + $(call opkg,$(TARGET_DIR_ORIG)) list-installed > \ + $(BIN_DIR)/$(IMG_PREFIX)$(if $(PROFILE_SANITIZED),-$(PROFILE_SANITIZED)).manifest \ + ) ifneq ($(CONFIG_JSON_CYCLONEDX_SBOM),) $(SCRIPT_DIR)/package-metadata.pl imgcyclonedxsbom \ $(if $(IB),$(TOPDIR)/.packageinfo, $(TMP_DIR)/.packageinfo) \ @@ -328,7 +332,20 @@ opkg_target = \ $(call opkg,$(mkfs_cur_target_dir)) \ -f $(mkfs_cur_target_dir).conf +apk_target = $(call apk,$(mkfs_cur_target_dir)) --no-scripts + + target-dir-%: FORCE +ifneq ($(CONFIG_USE_APK),) + rm -rf $(mkfs_cur_target_dir) + $(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir) + mv $(mkfs_cur_target_dir)/etc/apk/repositories $(mkfs_cur_target_dir).repositories + $(if $(mkfs_packages_remove), \ + $(apk_target) del $(mkfs_packages_remove)) + $(if $(mkfs_packages_add), \ + $(apk_target) add $(mkfs_packages_add)) + mv $(mkfs_cur_target_dir).repositories $(mkfs_cur_target_dir)/etc/apk/repositories +else rm -rf $(mkfs_cur_target_dir) $(mkfs_cur_target_dir).opkg $(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir) -mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg @@ -342,6 +359,7 @@ target-dir-%: FORCE $(call opkg_package_files,$(mkfs_packages_add))) -$(CP) -T $(mkfs_cur_target_dir).opkg/ $(mkfs_cur_target_dir)/etc/opkg/ rm -rf $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir).conf +endif $(call prepare_rootfs,$(mkfs_cur_target_dir),$(TOPDIR)/files) $(KDIR)/root.%: kernel_prepare diff --git a/include/package-ipkg.mk b/include/package-pack.mk similarity index 69% rename from include/package-ipkg.mk rename to include/package-pack.mk index 5f5f7e13175d10..16b56344e1d150 100644 --- a/include/package-ipkg.mk +++ b/include/package-pack.mk @@ -1,35 +1,32 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2006-2020 OpenWrt.org +# Copyright (C) 2006-2022 OpenWrt.org ifndef DUMP include $(INCLUDE_DIR)/feeds.mk endif -IPKG_REMOVE:= \ - $(SCRIPT_DIR)/ipkg-remove - IPKG_STATE_DIR:=$(TARGET_DIR)/usr/lib/opkg # Generates a make statement to return a wildcard for candidate ipkg files # 1: package name -define gen_ipkg_wildcard +define gen_package_wildcard $(1)$$(if $$(filter -%,$$(ABIV_$(1))),,[^a-z-])* endef # 1: package name # 2: candidate ipk files define remove_ipkg_files - $(if $(strip $(2)),$(IPKG_REMOVE) $(1) $(2)) + $(if $(strip $(2)),$(SCRIPT_DIR)/ipkg-remove $(1) $(2)) endef # 1: package name # 2: variable name # 3: variable suffix # 4: file is a script -define BuildIPKGVariable +define BuildPackVariable ifdef Package/$(1)/$(2) - $$(IPKG_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2)) + $$(PACK_$(1)) : VAR_$(2)$(3)=$$(Package/$(1)/$(2)) $(call shexport,Package/$(1)/$(2)) $(1)_COMMANDS += echo "$$$$$$$$$(call shvar,Package/$(1)/$(2))" > $(2)$(3); $(if $(4),chmod 0755 $(2)$(3);) endif @@ -50,7 +47,7 @@ strip_deps=$(strip $(subst +,,$(filter-out @%,$(1)))) filter_deps=$(foreach dep,$(call strip_deps,$(1)),$(if $(findstring :,$(dep)),$(call dep_if,$(dep)),$(dep))) define AddDependency - $$(if $(1),$$(if $(2),$$(foreach pkg,$(1),$$(IPKG_$$(pkg))): $$(foreach pkg,$(2),$$(IPKG_$$(pkg))))) + $$(if $(1),$$(if $(2),$$(foreach pkg,$(1),$$(PACK_$$(pkg))): $$(foreach pkg,$(2),$$(PACK_$$(pkg))))) endef define FixupReverseDependencies @@ -101,8 +98,13 @@ ifeq ($(DUMP),) define BuildTarget/ipkg ABIV_$(1):=$(call FormatABISuffix,$(1),$(ABI_VERSION)) PDIR_$(1):=$(call FeedPackageDir,$(1)) - IPKG_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk +ifeq ($(CONFIG_USE_APK),) + PACK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))_$(VERSION)_$(PKGARCH).ipk +else + PACK_$(1):=$$(PDIR_$(1))/$(1)$$(ABIV_$(1))-$(VERSION).apk +endif IDIR_$(1):=$(PKG_BUILD_DIR)/ipkg-$(PKGARCH)/$(1) + ADIR_$(1):=$(PKG_BUILD_DIR)/apk-$(PKGARCH)/$(1) KEEP_$(1):=$(strip $(call Package/$(1)/conffiles)) TARGET_VARIANT:=$$(if $(ALL_VARIANTS),$$(if $$(VARIANT),$$(filter-out *,$$(VARIANT)),$(firstword $(ALL_VARIANTS)))) @@ -117,8 +119,8 @@ ifeq ($(DUMP),) ifdef do_install ifneq ($(CONFIG_PACKAGE_$(1))$(DEVELOPER),) IPKGS += $(1) - $(_pkg_target)compile: $$(IPKG_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed - prepare-package-install: $$(IPKG_$(1)) + $(_pkg_target)compile: $$(PACK_$(1)) $(PKG_INFO_DIR)/$(1).provides $(PKG_BUILD_DIR)/.pkgdir/$(1).installed + prepare-package-install: $$(PACK_$(1)) compile: $(STAGING_DIR_ROOT)/stamp/.$(1)_installed else $(if $(CONFIG_PACKAGE_$(1)),$$(info WARNING: skipping $(1) -- package not selected)) @@ -141,11 +143,11 @@ ifeq ($(DUMP),) $(FixupDependencies) $(FixupReverseDependencies) - $(eval $(call BuildIPKGVariable,$(1),conffiles)) - $(eval $(call BuildIPKGVariable,$(1),preinst,,1)) - $(eval $(call BuildIPKGVariable,$(1),postinst,-pkg,1)) - $(eval $(call BuildIPKGVariable,$(1),prerm,-pkg,1)) - $(eval $(call BuildIPKGVariable,$(1),postrm,,1)) + $(eval $(call BuildPackVariable,$(1),conffiles)) + $(eval $(call BuildPackVariable,$(1),preinst,,1)) + $(eval $(call BuildPackVariable,$(1),postinst,-pkg,1)) + $(eval $(call BuildPackVariable,$(1),prerm,-pkg,1)) + $(eval $(call BuildPackVariable,$(1),postrm,,1)) $(PKG_BUILD_DIR)/.pkgdir/$(1).installed : export PATH=$$(TARGET_PATH_PKG) $(PKG_BUILD_DIR)/.pkgdir/$(1).installed: $(STAMP_BUILT) @@ -195,14 +197,16 @@ $$(call addfield,Depends,$$(Package/$(1)/DEPENDS) Installed-Size: 0 $(_endef) - $$(IPKG_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL) - $$(IPKG_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) - $$(IPKG_$(1)) : export PATH=$$(TARGET_PATH_PKG) - $$(IPKG_$(1)) : export PKG_SOURCE_DATE_EPOCH:=$(PKG_SOURCE_DATE_EPOCH) - $(PKG_INFO_DIR)/$(1).provides $$(IPKG_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-ipkg.mk - @rm -rf $$(IDIR_$(1)); \ - $$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1)))) - mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/CONTROL $(PKG_INFO_DIR) + $$(PACK_$(1)) : export CONTROL=$$(Package/$(1)/CONTROL) + $$(PACK_$(1)) : export DESCRIPTION=$$(Package/$(1)/description) + $$(PACK_$(1)) : export PATH=$$(TARGET_PATH_PKG) + $$(PACK_$(1)) : export PKG_SOURCE_DATE_EPOCH:=$(PKG_SOURCE_DATE_EPOCH) + $(PKG_INFO_DIR)/$(1).provides $$(PACK_$(1)): $(STAMP_BUILT) $(INCLUDE_DIR)/package-pack.mk + rm -rf $$(IDIR_$(1)) +ifeq ($$(CONFIG_USE_APK),) + $$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_package_wildcard,$(1)))) +endif + mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1)) $(PKG_INFO_DIR) $(call Package/$(1)/install,$$(IDIR_$(1))) $(if $(Package/$(1)/install-overlay),mkdir -p $(PACKAGE_DIR) $$(IDIR_$(1))/rootfs-overlay) $(call Package/$(1)/install-overlay,$$(IDIR_$(1))/rootfs-overlay) @@ -228,6 +232,24 @@ $(_endef) ) || true \ ) endif + + ifneq ($$(KEEP_$(1)),) + @( \ + keepfiles=""; \ + for x in $$(KEEP_$(1)); do \ + [ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \ + done; \ + [ -z "$$$$keepfiles" ] || { \ + mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \ + for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \ + }; \ + ) + endif + + $(INSTALL_DIR) $$(PDIR_$(1))/tmp + +ifeq ($(CONFIG_USE_APK),) + mkdir -p $$(IDIR_$(1))/CONTROL (cd $$(IDIR_$(1))/CONTROL; \ ( \ echo "$$$$CONTROL"; \ @@ -251,25 +273,66 @@ $(_endef) $($(1)_COMMANDS) \ ) - ifneq ($$(KEEP_$(1)),) - @( \ - keepfiles=""; \ - for x in $$(KEEP_$(1)); do \ - [ -f "$$(IDIR_$(1))/$$$$x" ] || keepfiles="$$$${keepfiles:+$$$$keepfiles }$$$$x"; \ - done; \ - [ -z "$$$$keepfiles" ] || { \ - mkdir -p $$(IDIR_$(1))/lib/upgrade/keep.d; \ - for x in $$$$keepfiles; do echo $$$$x >> $$(IDIR_$(1))/lib/upgrade/keep.d/$(1); done; \ - }; \ - ) - endif - - $(INSTALL_DIR) $$(PDIR_$(1)) $(FAKEROOT) $(STAGING_DIR_HOST)/bin/bash $(SCRIPT_DIR)/ipkg-build -m "$(FILE_MODES)" $$(IDIR_$(1)) $$(PDIR_$(1)) - @[ -f $$(IPKG_$(1)) ] +else + mkdir -p $$(ADIR_$(1))/ + mkdir -p $$(IDIR_$(1))/lib/apk/packages/ + + (cd $$(ADIR_$(1)); $($(1)_COMMANDS)) + + ( \ + echo "#!/bin/sh"; \ + echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \ + echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ + echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ + echo 'export root="$$$${IPKG_INSTROOT}"'; \ + echo 'export pkgname="$(1)"'; \ + echo "add_group_and_user"; \ + [ ! -f $$(ADIR_$(1))/postinst-pkg ] || cat "$$(ADIR_$(1))/postinst-pkg"; \ + echo "default_postinst"; \ + ) > $$(ADIR_$(1))/post-install; + + ( \ + echo "#!/bin/sh"; \ + echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ + echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ + echo 'export root="$$$${IPKG_INSTROOT}"'; \ + echo 'export pkgname="$(1)"'; \ + [ ! -f $$(ADIR_$(1))/prerm-pkg ] || cat "$$(ADIR_$(1))/prerm-pkg"; \ + echo "default_prerm"; \ + ) > $$(ADIR_$(1))/pre-deinstall; + + if [ -n "$(USERID)" ]; then echo $(USERID) > $$(IDIR_$(1))/lib/apk/packages/$(1).rusers; fi; + if [ -n "$(ALTERNATIVES)" ]; then echo $(ALTERNATIVES) > $$(IDIR_$(1))/lib/apk/packages/$(1).alternatives; fi; + (cd $$(IDIR_$(1)) && find . -type f,l -printf "/%P\n" > $$(IDIR_$(1))/lib/apk/packages/$(1).list) + if [ -f $$(ADIR_$(1))/conffiles ]; then mv $$(ADIR_$(1))/conffiles $$(IDIR_$(1))/lib/apk/packages/$(1).conffiles; fi; + + $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk mkpkg \ + --info "name:$(1)$$(ABIV_$(1))" \ + --info "version:$(VERSION)" \ + --info "description:" \ + --info "arch:$(PKGARCH)" \ + --info "license:$(LICENSE)" \ + --info "origin:$(SOURCE)" \ + --info "provides:$$(foreach prov,$$(filter-out $(1)$$(ABIV_$(1)),$(PROVIDES)$$(if $$(ABIV_$(1)), \ + $(1) $(foreach provide,$(PROVIDES),$(provide)$$(ABIV_$(1))))),$$(prov)=$(VERSION) )" \ + --script "post-install:$$(ADIR_$(1))/post-install" \ + --script "pre-deinstall:$$(ADIR_$(1))/pre-deinstall" \ + --info "depends:$$(foreach depends,$$(subst $$(comma),$$(space),$$(subst $$(space),,$$(subst $$(paren_right),,$$(subst $$(paren_left),,$$(Package/$(1)/DEPENDS))))),$$(depends))" \ + --files "$$(IDIR_$(1))" \ + --output "$$(PACK_$(1))" \ + --sign "$(BUILD_KEY_APK_SEC)" +endif + + @[ -f $$(PACK_$(1)) ] $(1)-clean: - $$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_ipkg_wildcard,$(1)))) +ifeq ($(CONFIG_USE_APK),) + $$(call remove_ipkg_files,$(1),$$(call opkg_package_files,$(call gen_package_wildcard,$(1)))) +else + $$(call remove_ipkg_files,$(1),$$(call apk_package_files,$(call gen_package_wildcard,$(1)))) +endif + clean: $(1)-clean diff --git a/include/package.mk b/include/package.mk index 61a26f0c4380f4..8ee78415df24c1 100644 --- a/include/package.mk +++ b/include/package.mk @@ -136,7 +136,7 @@ PKG_INSTALL_STAMP:=$(PKG_INFO_DIR)/$(PKG_DIR_NAME).$(if $(BUILD_VARIANT),$(BUILD include $(INCLUDE_DIR)/package-defaults.mk include $(INCLUDE_DIR)/package-dumpinfo.mk -include $(INCLUDE_DIR)/package-ipkg.mk +include $(INCLUDE_DIR)/package-pack.mk include $(INCLUDE_DIR)/package-bin.mk include $(INCLUDE_DIR)/autotools.mk diff --git a/include/rootfs.mk b/include/rootfs.mk index 2128aefc2abda8..eb4fa434a36510 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -43,6 +43,16 @@ opkg = \ --add-arch all:100 \ --add-arch $(if $(ARCH_PACKAGES),$(ARCH_PACKAGES),$(BOARD)):200 +apk = \ + IPKG_INSTROOT=$(1) \ + $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk \ + --root $(1) \ + --keys-dir $(TOPDIR) \ + --no-cache \ + --no-logfile \ + --preserve-env \ + --repository file://$(PACKAGE_DIR_ALL)/packages.adb + TARGET_DIR_ORIG := $(TARGET_ROOTFS_DIR)/root.orig-$(BOARD) ifdef CONFIG_CLEAN_IPKG @@ -68,6 +78,11 @@ define prepare_rootfs @mkdir -p $(1)/var/lock @( \ cd $(1); \ + if [ -n $(CONFIG_USE_APK) ]; then \ + $(STAGING_DIR_HOST)/bin/tar -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install" -O > script.sh; \ + chmod +x script.sh; \ + IPKG_INSTROOT=$(1) $$(command -v bash) script.sh; \ + else \ for script in ./usr/lib/opkg/info/*.postinst; do \ IPKG_INSTROOT=$(1) $$(command -v bash) $$script; \ ret=$$?; \ @@ -76,6 +91,13 @@ define prepare_rootfs exit 1; \ fi; \ done; \ + $(if $(IB),,awk -i inplace \ + '/^Status:/ { \ + if ($$3 == "user") { $$3 = "ok" } \ + else { sub(/,\|\,/, "", $$3) } \ + }1' $(1)/usr/lib/opkg/status) ; \ + $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status ;) \ + fi; \ for script in ./etc/init.d/*; do \ grep '#!/bin/sh /etc/rc.common' $$script >/dev/null || continue; \ if ! echo " $(3) " | grep -q " $$(basename $$script) "; then \ @@ -87,13 +109,9 @@ define prepare_rootfs fi; \ done || true \ ) - awk -i inplace \ - '/^Status:/ { \ - if ($$3 == "user") { $$3 = "ok" } \ - else { sub(/,\|\,/, "", $$3) } \ - }1' $(1)/usr/lib/opkg/status - $(if $(SOURCE_DATE_EPOCH),sed -i "s/Installed-Time: .*/Installed-Time: $(SOURCE_DATE_EPOCH)/" $(1)/usr/lib/opkg/status) + @-find $(1) -name CVS -o -name .svn -o -name .git -o -name '.#*' | $(XARGS) rm -rf + @-find $(1)/usr/cache/apk/ -name '*.apk' -delete rm -rf \ $(1)/boot \ $(1)/tmp/* \ diff --git a/include/target.mk b/include/target.mk index 68558601f33c4f..8b81b54624869b 100644 --- a/include/target.mk +++ b/include/target.mk @@ -21,12 +21,17 @@ DEFAULT_PACKAGES:=\ logd \ mtd \ netifd \ - opkg \ uci \ uclient-fetch \ urandom-seed \ urngd +ifdef CONFIG_USE_APK +DEFAULT_PACKAGES+=apk +else +DEFAULT_PACKAGES+=opkg +endif + ifneq ($(CONFIG_SELINUX),) DEFAULT_PACKAGES+=busybox-selinux procd-selinux else diff --git a/package/Makefile b/package/Makefile index d72ce09a816b42..301a9e6cd5ae99 100644 --- a/package/Makefile +++ b/package/Makefile @@ -53,20 +53,43 @@ $(curdir)/cleanup: $(TMP_DIR)/.build $(curdir)/merge: rm -rf $(PACKAGE_DIR_ALL) mkdir -p $(PACKAGE_DIR_ALL) +ifneq ($(CONFIG_USE_APK),) + -$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.apk),ln -s $(pdir)/*.apk $(PACKAGE_DIR_ALL);)) +else -$(foreach pdir,$(PACKAGE_SUBDIRS),$(if $(wildcard $(pdir)/*.ipk),ln -s $(pdir)/*.ipk $(PACKAGE_DIR_ALL);)) +endif $(curdir)/merge-index: $(curdir)/merge +ifneq ($(CONFIG_USE_APK),) + (cd $(PACKAGE_DIR_ALL) && $(STAGING_DIR_HOST)/bin/apk mkndx \ + --root $(TOPDIR) \ + --keys-dir $(TOPDIR) \ + --sign $(BUILD_KEY_APK_SEC) \ + --output packages.adb \ + *.apk; \ + ) +else (cd $(PACKAGE_DIR_ALL) && $(SCRIPT_DIR)/ipkg-make-index.sh . 2>&1 > Packages; ) +endif ifndef SDK $(curdir)//compile = $(STAGING_DIR)/.prepared $(BIN_DIR) +ifneq ($(CONFIG_USE_APK),) + $(curdir)/compile: $(curdir)/system/apk/host/compile +else $(curdir)/compile: $(curdir)/system/opkg/host/compile endif +endif -$(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DEVICE_ROOTFS),$(curdir)/merge-index) +$(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(curdir)/merge-index - find $(STAGING_DIR_ROOT) -type d | $(XARGS) chmod 0755 rm -rf $(TARGET_DIR) $(TARGET_DIR_ORIG) mkdir -p $(TARGET_DIR)/tmp +ifneq ($(CONFIG_USE_APK),) + $(file >$(TMP_DIR)/apk_install_list,\ + $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg)))) + $(call apk,$(TARGET_DIR)) add --initdb --no-scripts --arch $(ARCH_PACKAGES) $$(cat $(TMP_DIR)/apk_install_list) +else $(file >$(TMP_DIR)/opkg_install_list,\ $(call opkg_package_files,\ $(foreach pkg,$(shell cat $(PACKAGE_INSTALL_FILES) 2>/dev/null),$(pkg)$(call GetABISuffix,$(pkg))))) @@ -77,6 +100,7 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE $(call opkg,$(TARGET_DIR)) flag $$flag `cat $$file`; \ done; \ done || true +endif $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) @@ -84,6 +108,19 @@ $(curdir)/install: $(TMP_DIR)/.build $(curdir)/merge $(if $(CONFIG_TARGET_PER_DE $(curdir)/index: FORCE @echo Generating package index... +ifneq ($(CONFIG_USE_APK),) + @for d in $(PACKAGE_SUBDIRS); do \ + mkdir -p $$d; \ + cd $$d || continue; \ + ls *.apk >/dev/null 2>&1 || continue; \ + $(STAGING_DIR_HOST)/bin/apk mkndx \ + --root $(TOPDIR) \ + --keys-dir $(TOPDIR) \ + --sign $(BUILD_KEY_APK_SEC) \ + --output packages.adb \ + *.apk; \ + done +else @for d in $(PACKAGE_SUBDIRS); do ( \ mkdir -p $$d; \ cd $$d || continue; \ @@ -115,6 +152,7 @@ ifdef CONFIG_JSON_CYCLONEDX_SBOM $(SCRIPT_DIR)/package-metadata.pl pkgcyclonedxsbom Packages.manifest > Packages.bom.cdx.json || true; \ ); done endif +endif $(curdir)/flags-install:= -j1 diff --git a/package/base-files/Makefile b/package/base-files/Makefile index b1a834e1bf5130..c42e2d9dd41657 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -116,6 +116,13 @@ define Build/Compile/Default endef Build/Compile = $(Build/Compile/Default) +ifneq ($(CONFIG_USE_APK),) + define Build/Configure + [ -s $(BUILD_KEY_APK_SEC) -a -s $(BUILD_KEY_APK_PUB) ] || \ + $(STAGING_DIR_HOST)/bin/openssl ecparam -name prime256v1 -genkey -noout -out $(BUILD_KEY_APK_SEC); \ + $(STAGING_DIR_HOST)/bin/openssl ec -in $(BUILD_KEY_APK_SEC) -pubout > $(BUILD_KEY_APK_PUB) + endef +else ifdef CONFIG_SIGNED_PACKAGES define Build/Configure [ -s $(BUILD_KEY) -a -s $(BUILD_KEY).pub ] || \ @@ -131,9 +138,13 @@ ifndef CONFIG_BUILDBOT mkdir -p $(1)/etc/opkg/keys $(CP) $(BUILD_KEY).pub $(1)/etc/opkg/keys/`$(STAGING_DIR_HOST)/bin/usign -F -p $(BUILD_KEY).pub` + mkdir -p $(1)/etc/apk/keys + $(CP) $(BUILD_KEY_APK_PUB) $(1)/etc/apk/keys/ + endef endif endif +endif ifeq ($(CONFIG_NAND_SUPPORT),) define Package/base-files/nand-support @@ -234,15 +245,21 @@ endif cat $(BIN_DIR)/feeds.buildinfo >>$(1)/etc/build.feeds; \ cat $(BIN_DIR)/version.buildinfo >>$(1)/etc/build.version) + $(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \ + rm -f $(1)/etc/banner.failsafe,) + +ifneq ($(CONFIG_USE_APK),) + mkdir -p $(1)/etc/apk/ + $(call FeedSourcesAppendAPK,$(1)/etc/apk/repositories) + $(VERSION_SED_SCRIPT) $(1)/etc/apk/repositories +else $(if $(CONFIG_CLEAN_IPKG),, \ mkdir -p $(1)/etc/opkg; \ - $(call FeedSourcesAppend,$(1)/etc/opkg/distfeeds.conf); \ + $(call FeedSourcesAppendOPKG,$(1)/etc/opkg/distfeeds.conf); \ $(VERSION_SED_SCRIPT) $(1)/etc/opkg/distfeeds.conf) $(if $(CONFIG_IPK_FILES_CHECKSUMS),, \ rm -f $(1)/sbin/pkg_check) - - $(if $(CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE), \ - rm -f $(1)/etc/banner.failsafe,) +endif endef ifneq ($(DUMP),1) diff --git a/package/system/apk/patches/0002-mbedtls-support.patch b/package/system/apk/patches/0002-mbedtls-support.patch index 62b3ab81d3a94b..d06db30f03f89e 100644 --- a/package/system/apk/patches/0002-mbedtls-support.patch +++ b/package/system/apk/patches/0002-mbedtls-support.patch @@ -1,51 +1,16 @@ -From 74ea482102e1a7c1845b3eec19cbdb21264836d4 Mon Sep 17 00:00:00 2001 +From 68352e0cb94fe08b220d4befec828171ec871154 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Fri, 5 Apr 2024 12:06:56 +0300 -Subject: [PATCH 1/4] add alternate url wget implementation +Subject: [PATCH 1/2] add alternate url wget implementation --- - .gitlab-ci.yml | 16 ++++- meson.build | 6 +- meson_options.txt | 1 + - src/io_url_wget.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++ - src/meson.build | 4 +- - 5 files changed, 173 insertions(+), 4 deletions(-) + src/io_url_wget.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ + src/meson.build | 8 ++- + 4 files changed, 150 insertions(+), 2 deletions(-) create mode 100644 src/io_url_wget.c -diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml -index 7fc86563..b7e00008 100644 ---- a/.gitlab-ci.yml -+++ b/.gitlab-ci.yml -@@ -24,7 +24,19 @@ test:alpine: - script: - - apk update - - apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev zstd-dev lua5.3-dev lua5.3-lzlib meson zlib-static zstd-static openssl-libs-static -- - meson build -+ - meson setup build -Dstatic_apk=true -+ - ninja -C build -+ tags: -+ - docker-alpine -+ - x86_64 -+ -+test:alpine-alt-config: -+ image: alpine -+ stage: test -+ script: -+ - apk update -+ - apk add make gcc git musl-dev openssl-dev linux-headers zlib-dev lua5.3-dev lua5.3-lzlib meson -+ - meson setup build -Durl_backend=wget -Dzstd=false - - ninja -C build - tags: - - docker-alpine -@@ -38,7 +50,7 @@ test:debian: - - apt-get install -y make gcc git libssl-dev zlib1g-dev libzstd-dev lua5.3-dev lua5.2 lua-zlib-dev sudo meson - - unlink /bin/sh - - ln -s /bin/bash /bin/sh -- - meson build -+ - meson setup build - - ninja -C build - tags: - - docker-alpine diff --git a/meson.build b/meson.build index 1a44c11f..9a14cac0 100644 --- a/meson.build @@ -63,26 +28,26 @@ index 1a44c11f..9a14cac0 100644 subdir('src') subdir('tests') diff --git a/meson_options.txt b/meson_options.txt -index 693f46ec..940fe9a4 100644 +index 693f46ec..44b88b32 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -5,5 +5,6 @@ option('help', description: 'Build help into apk binaries, needs lua', type: 'fe option('lua', description: 'Build luaapk (lua bindings)', type: 'feature', value: 'auto') option('lua_version', description: 'Lua version to build against', type: 'string', value: '5.3') option('static_apk', description: 'Also build apk.static', type: 'boolean', value: false) -+option('url_backend', description: 'URL backend', type: 'combo', choices: ['libfetch', 'wget'], value: 'libfetch') ++option('url_backend', description: 'URL backend', type: 'string', value: 'libfetch') option('uvol_db_target', description: 'Default target for uvol database layer', type: 'string') option('zstd', description: 'Build with zstd support', type: 'boolean', value: true) diff --git a/src/io_url_wget.c b/src/io_url_wget.c new file mode 100644 -index 00000000..9a929222 +index 00000000..d8885a4f --- /dev/null +++ b/src/io_url_wget.c -@@ -0,0 +1,150 @@ +@@ -0,0 +1,137 @@ +/* io_url_wget.c - Alpine Package Keeper (APK) + * + * Copyright (C) 2005-2008 Natanael Copa -+ * Copyright (C) 2008-2011 Timo Teräs ++ * Copyright (C) 2008-2011 Timo Teräs + * All rights reserved. + * + * SPDX-License-Identifier: GPL-2.0-only @@ -93,9 +58,6 @@ index 00000000..9a929222 +#include +#include "apk_io.h" + -+static char wget_timeout[16]; -+static char wget_no_check_certificate; -+ +static int wget_translate_status(int status) +{ + if (!WIFEXITED(status)) return -EFAULT; @@ -118,19 +80,11 @@ index 00000000..9a929222 + +static int wget_spawn(const char *url, pid_t *pid, int *fd) +{ -+ int i = 0, r, pipefds[2]; ++ int r, pipefds[2]; + posix_spawn_file_actions_t act; -+ char *argv[16]; -+ -+ argv[i++] = "wget"; -+ argv[i++] = "-q"; -+ argv[i++] = "-T"; -+ argv[i++] = wget_timeout; -+ if (wget_no_check_certificate) argv[i++] = "--no-check-certificate"; -+ argv[i++] = (char *) url; -+ argv[i++] = "-O"; -+ argv[i++] = "-"; -+ argv[i++] = 0; ++ char *argv[] = { ++ (char*)"wget", "-q", (char*) url, "-O", "-", 0 ++ }; + + if (pipe2(pipefds, O_CLOEXEC) != 0) return -errno; + @@ -214,12 +168,10 @@ index 00000000..9a929222 + +void apk_io_url_no_check_certificate(void) +{ -+ wget_no_check_certificate = 1; +} + +void apk_io_url_set_timeout(int timeout) +{ -+ snprintf(wget_timeout, sizeof wget_timeout, "%d", timeout); +} + +void apk_io_url_set_redirect_callback(void (*cb)(int, const char *)) @@ -230,97 +182,39 @@ index 00000000..9a929222 +{ +} diff --git a/src/meson.build b/src/meson.build -index c1aae550..38e9d3b0 100644 +index c1aae550..28bfce7e 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -1,3 +1,5 @@ -+url_backend = get_option('url_backend') -+ - libapk_so_version = '2.99.0' - libapk_src = [ - 'adb.c', -@@ -22,8 +24,8 @@ libapk_src = [ +@@ -22,7 +22,6 @@ libapk_src = [ 'fs_uvol.c', 'hash.c', 'io.c', - 'io_url_libfetch.c', 'io_gunzip.c', -+ 'io_url_@0@.c'.format(url_backend), 'package.c', 'pathbuilder.c', - 'print.c', --- -GitLab - - -From b9fe78fbf19bb10e1d0b8eb1cb1de123bee2ed7e Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Tue, 16 Apr 2024 17:55:15 +0200 -Subject: [PATCH 2/4] add option to configure url backend in legacy make build - system - -Can be configured by setting URL_BACKEND. If not set libfetch is -selected by default. - -Signed-off-by: Christian Marangi ---- - src/Makefile | 20 ++++++++++++++------ - 1 file changed, 14 insertions(+), 6 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index f7873cb1..efdc68df 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -9,8 +9,8 @@ else - $(error Lua interpreter not found. Please specify LUA interpreter, or use LUA=no to build without help.) - endif - --OPENSSL_CFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) --OPENSSL_LIBS := $(shell $(PKG_CONFIG) --libs openssl) -+OPENSSL_CFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) -+OPENSSL_LIBS := $(shell $(PKG_CONFIG) --libs openssl) - - ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib) - ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib) -@@ -21,10 +21,18 @@ libapk_so := $(obj)/libapk.so.$(libapk_soname) - libapk.so.$(libapk_soname)-objs := \ - adb.o adb_comp.o adb_walk_adb.o adb_walk_genadb.o adb_walk_gentext.o adb_walk_text.o apk_adb.o \ - atom.o blob.o commit.o common.o context.o crypto.o crypto_openssl.o ctype.o database.o hash.o \ -- extract_v2.o extract_v3.o fs_fsys.o fs_uvol.o io.o io_gunzip.o io_url_libfetch.o \ -- tar.o package.o pathbuilder.o print.o solver.o trust.o version.o -+ extract_v2.o extract_v3.o fs_fsys.o fs_uvol.o io.o io_gunzip.o tar.o package.o pathbuilder.o \ -+ print.o solver.o trust.o version.o +@@ -87,6 +86,13 @@ apk_src = [ + 'applet.c', + ] --libapk.so.$(libapk_soname)-libs := libfetch/libfetch.a -+libapk.so.$(libapk_soname)-libs := -+ -+ifeq ($(URL_BACKEND),wget) -+libapk.so.$(libapk_soname)-objs += io_url_wget.o -+else -+CFLAGS_ALL += -Ilibfetch -+libapk.so.$(libapk_soname)-objs += io_url_libfetch.o -+libapk.so.$(libapk_soname)-libs += libfetch/libfetch.a ++url_backend = get_option('url_backend') ++if url_backend == 'libfetch' ++ libapk_src += [ 'io_url_libfetch.c' ] ++elif url_backend == 'wget' ++ libapk_src += [ 'io_url_wget.c' ] +endif - - # ZSTD support can be disabled - ifneq ($(ZSTD),no) -@@ -79,7 +87,7 @@ LIBS_apk := -lapk - LIBS_apk-test := -lapk - LIBS_apk.so := -L$(obj) -lapk - --CFLAGS_ALL += -D_ATFILE_SOURCE -Ilibfetch -Iportability -+CFLAGS_ALL += -D_ATFILE_SOURCE -Iportability - CFLAGS_apk.o := -DAPK_VERSION=\"$(VERSION)\" - CFLAGS_apk-static.o := -DAPK_VERSION=\"$(VERSION)\" -DOPENSSL_NO_ENGINE - CFLAGS_apk-test.o := -DAPK_VERSION=\"$(VERSION)\" -DOPENSSL_NO_ENGINE -DTEST_MODE ++ + if lua_bin.found() + genhelp_script = files('genhelp.lua') + genhelp_args = [lua_bin, genhelp_script, '@INPUT@'] -- GitLab -From 0418b684898403c49905c1f0e4b7c5ca522b2d50 Mon Sep 17 00:00:00 2001 +From dc7ff789a45522eb847118a29b60b896de55d083 Mon Sep 17 00:00:00 2001 From: Jonas Jelonek Date: Sun, 14 Apr 2024 00:20:14 +0200 -Subject: [PATCH 3/4] crypto: add support for mbedtls as backend +Subject: [PATCH 2/2] crypto: add support for mbedtls as backend backend is selected at compile-time with crypto_backend option @@ -331,16 +225,11 @@ Signed-off-by: Jonas Jelonek libfetch/meson.build | 2 +- meson.build | 14 +- meson_options.txt | 1 + - portability/getrandom.c | 19 +++ - portability/meson.build | 3 +- - portability/sys/random.h | 6 + src/apk_crypto.h | 5 + - src/apk_crypto_mbedtls.h | 30 +++++ - src/crypto_mbedtls.c | 285 +++++++++++++++++++++++++++++++++++++++ - src/meson.build | 21 ++- - 10 files changed, 373 insertions(+), 13 deletions(-) - create mode 100644 portability/getrandom.c - create mode 100644 portability/sys/random.h + src/apk_crypto_mbedtls.h | 26 ++++ + src/crypto_mbedtls.c | 305 +++++++++++++++++++++++++++++++++++++++ + src/meson.build | 23 ++- + 7 files changed, 364 insertions(+), 12 deletions(-) create mode 100644 src/apk_crypto_mbedtls.h create mode 100644 src/crypto_mbedtls.c @@ -388,66 +277,17 @@ index 9a14cac0..3a83f4e1 100644 add_project_arguments('-D_GNU_SOURCE', language: 'c') diff --git a/meson_options.txt b/meson_options.txt -index 940fe9a4..df0b07dc 100644 +index 44b88b32..2b1d24ce 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -1,4 +1,5 @@ - option('arch_prefix', description: 'Define a custom arch prefix for default arch', type: 'string') -+option('crypto_backend', description: 'Crypto backend', type: 'combo', choices: ['openssl', 'mbedtls'], value: 'openssl') - option('compressed-help', description: 'Compress help database, needs lua-zlib', type: 'boolean', value: true) - option('docs', description: 'Build manpages with scdoc', type: 'feature', value: 'auto') - option('help', description: 'Build help into apk binaries, needs lua', type: 'feature', value: 'auto') -diff --git a/portability/getrandom.c b/portability/getrandom.c -new file mode 100644 -index 00000000..b2f4a07c ---- /dev/null -+++ b/portability/getrandom.c -@@ -0,0 +1,19 @@ -+#include -+#include -+#include -+#include -+ -+ssize_t getrandom(void *buf, size_t buflen, unsigned int flags) -+{ -+ int fd; -+ ssize_t ret; -+ -+ fd = open("/dev/urandom", O_RDONLY|O_CLOEXEC); -+ if (fd < 0) -+ return -1; -+ -+ ret = read(fd, buf, buflen); -+ close(fd); -+ return ret; -+} -+ -diff --git a/portability/meson.build b/portability/meson.build -index 89957c3c..3172044e 100644 ---- a/portability/meson.build -+++ b/portability/meson.build -@@ -3,7 +3,8 @@ cc = meson.get_compiler('c') - libportability_src = [] - - check_symbols = [ -- ['memrchr', 'memrchr.c', 'NEED_MEMRCHR', 'string.h'], -+ ['getrandom', 'getrandom.c', 'NEED_GETRANDOM', 'sys/random.h'], -+ ['memrchr', 'memrchr.c', 'NEED_MEMRCHR', 'string.h'], - ['mknodat', 'mknodat.c', 'NEED_MKNODAT', 'sys/stat.h'], - ['pipe2', 'pipe2.c', 'NEED_PIPE2', 'unistd.h'], - ['qsort_r', 'qsort_r.c', 'NEED_QSORT_R', 'stdlib.h'], -diff --git a/portability/sys/random.h b/portability/sys/random.h -new file mode 100644 -index 00000000..02d5b1ca ---- /dev/null -+++ b/portability/sys/random.h -@@ -0,0 +1,6 @@ -+#include_next -+#include -+ -+#ifdef NEED_GETRANDOM -+ssize_t getrandom(void *buf, size_t buflen, unsigned int flags); -+#endif +@@ -5,6 +5,7 @@ option('help', description: 'Build help into apk binaries, needs lua', type: 'fe + option('lua', description: 'Build luaapk (lua bindings)', type: 'feature', value: 'auto') + option('lua_version', description: 'Lua version to build against', type: 'string', value: '5.3') + option('static_apk', description: 'Also build apk.static', type: 'boolean', value: false) ++option('crypto_backend', description: 'SSL backend', type: 'string', value: 'openssl') + option('url_backend', description: 'URL backend', type: 'string', value: 'libfetch') + option('uvol_db_target', description: 'Default target for uvol database layer', type: 'string') + option('zstd', description: 'Build with zstd support', type: 'boolean', value: true) diff --git a/src/apk_crypto.h b/src/apk_crypto.h index 7de88dfc..5cae3bfe 100644 --- a/src/apk_crypto.h @@ -467,10 +307,10 @@ index 7de88dfc..5cae3bfe 100644 diff --git a/src/apk_crypto_mbedtls.h b/src/apk_crypto_mbedtls.h new file mode 100644 -index 00000000..5481d149 +index 00000000..e379535b --- /dev/null +++ b/src/apk_crypto_mbedtls.h -@@ -0,0 +1,30 @@ +@@ -0,0 +1,26 @@ +/* apk_crypto_mbedtls.h - Alpine Package Keeper (APK) + * + * Copyright (C) 2024 @@ -484,45 +324,36 @@ index 00000000..5481d149 + +#include +#include -+#include + +struct apk_pkey { + uint8_t id[16]; -+ mbedtls_pk_context key; ++ mbedtls_pk_context *key; +}; + +struct apk_digest_ctx { -+ mbedtls_md_context_t mdctx; ++ mbedtls_md_context_t *mdctx; + struct apk_pkey *sigver_key; + uint8_t alg; +}; + -+/* based on mbedtls' internal pkwrite.h calculations */ -+#define APK_ENC_KEY_MAX_LENGTH (38 + 2 * MBEDTLS_MPI_MAX_SIZE) -+ +#endif diff --git a/src/crypto_mbedtls.c b/src/crypto_mbedtls.c new file mode 100644 -index 00000000..73d60e9d +index 00000000..9ce148b5 --- /dev/null +++ b/src/crypto_mbedtls.c -@@ -0,0 +1,285 @@ +@@ -0,0 +1,305 @@ +#include +#include +#include +#include +#include -+#include -+#include + +#include +#include +#include +#include -+ -+#ifdef MBEDTLS_PSA_CRYPTO_C +#include -+#endif + +#include "apk_crypto.h" + @@ -559,11 +390,14 @@ index 00000000..73d60e9d +int apk_digest_ctx_init(struct apk_digest_ctx *dctx, uint8_t alg) +{ + dctx->alg = alg; ++ dctx->mdctx = malloc(sizeof(mbedtls_md_context_t)); ++ ++ if (!dctx->mdctx) return -ENOMEM; + -+ mbedtls_md_init(&dctx->mdctx); ++ mbedtls_md_init(dctx->mdctx); + if (alg == APK_DIGEST_NONE) return 0; -+ if (mbedtls_md_setup(&dctx->mdctx, apk_digest_alg_to_mdinfo(alg), 0) || -+ mbedtls_md_starts(&dctx->mdctx)) ++ if (mbedtls_md_setup(dctx->mdctx, apk_digest_alg_to_mdinfo(alg), 0) || ++ mbedtls_md_starts(dctx->mdctx)) + return -APKE_CRYPTO_ERROR; + + return 0; @@ -572,77 +406,105 @@ index 00000000..73d60e9d +int apk_digest_ctx_reset(struct apk_digest_ctx *dctx) +{ + if (dctx->alg == APK_DIGEST_NONE) return 0; -+ if (mbedtls_md_starts(&dctx->mdctx)) return -APKE_CRYPTO_ERROR; ++ if (mbedtls_md_starts(dctx->mdctx)) return -APKE_CRYPTO_ERROR; + return 0; +} + +int apk_digest_ctx_reset_alg(struct apk_digest_ctx *dctx, uint8_t alg) +{ -+ mbedtls_md_free(&dctx->mdctx); ++ mbedtls_md_free(dctx->mdctx); + + dctx->alg = alg; + if (alg == APK_DIGEST_NONE) return 0; -+ if (mbedtls_md_setup(&dctx->mdctx, apk_digest_alg_to_mdinfo(alg), 0) || -+ mbedtls_md_starts(&dctx->mdctx)) ++ if (mbedtls_md_setup(dctx->mdctx, apk_digest_alg_to_mdinfo(alg), 0) || ++ mbedtls_md_starts(dctx->mdctx)) + return -APKE_CRYPTO_ERROR; -+ ++ + return 0; +} + +void apk_digest_ctx_free(struct apk_digest_ctx *dctx) +{ -+ mbedtls_md_free(&dctx->mdctx); ++ free(dctx->mdctx); ++ dctx->mdctx = 0; +} + +int apk_digest_ctx_update(struct apk_digest_ctx *dctx, const void *ptr, size_t sz) +{ + if (dctx->alg == APK_DIGEST_NONE) return 0; -+ return mbedtls_md_update(&dctx->mdctx, ptr, sz) == 0 ? 0 : -APKE_CRYPTO_ERROR; ++ return mbedtls_md_update(dctx->mdctx, ptr, sz) == 0 ? 0 : -APKE_CRYPTO_ERROR; +} + +int apk_digest_ctx_final(struct apk_digest_ctx *dctx, struct apk_digest *d) +{ -+ if (mbedtls_md_finish(&dctx->mdctx, d->data)) { ++ if (mbedtls_md_finish(dctx->mdctx, d->data)) { + apk_digest_reset(d); + return -APKE_CRYPTO_ERROR; + } + ++ mbedtls_md_free(dctx->mdctx); ++ + d->alg = dctx->alg; + d->len = apk_digest_alg_len(d->alg); + return 0; +} + -+static int apk_load_file_at(int dirfd, const char *fn, unsigned char **buf, size_t *n) ++// Entropy function adopted from ustream-ssl to avoid using the bloated mbedtls' ++// mbedtls_entropy_context and mbedtls_ctr_drbg_context. ++static int _apk_random(void *ctx, unsigned char *out, size_t len) +{ -+ struct stat stats; -+ size_t size; -+ int fd; ++ static FILE *f; + -+ if ((fd = openat(dirfd, fn, O_RDONLY|O_CLOEXEC)) < 0) -+ return -errno; ++ if (!f) ++ f = fopen("/dev/urandom", "r"); ++ if (fread(out, len, 1, f) != 1) ++ return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; + -+ if (fstat(fd, &stats)) { -+ close(fd); -+ return -errno; ++ return 0; ++} ++ ++// adopted from mbedtls_pk_load_file ++static int apk_load_file_fd(int fd, unsigned char **buf, size_t *n) ++{ ++ FILE *f; ++ long size; ++ ++ if ((f = fdopen(fd, "rb")) == NULL) { ++ return MBEDTLS_ERR_PK_FILE_IO_ERROR; ++ } ++ ++#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) ++ /* Ensure no stdio buffering of secrets, as such buffers cannot be wiped. */ ++ mbedtls_setbuf(f, NULL); ++#endif ++ ++ fseek(f, 0, SEEK_END); ++ if ((size = ftell(f)) == -1) { ++ fclose(f); ++ return MBEDTLS_ERR_PK_FILE_IO_ERROR; + } ++ fseek(f, 0, SEEK_SET); + -+ size = (size_t)stats.st_size; -+ *n = size; ++ *n = (size_t) size; + -+ if (size == 0 || (*buf = mbedtls_calloc(1, size + 1)) == NULL) ++ if (*n + 1 == 0 || ++ (*buf = mbedtls_calloc(1, *n + 1)) == NULL) { ++ fclose(f); + return MBEDTLS_ERR_PK_ALLOC_FAILED; ++ } + -+ if (read(fd, *buf, size) != size) { -+ close(fd); ++ if (fread(*buf, 1, *n, f) != *n) { ++ fclose(f); + -+ mbedtls_platform_zeroize(*buf, size); ++ mbedtls_platform_zeroize(*buf, *n); + mbedtls_free(*buf); + + return MBEDTLS_ERR_PK_FILE_IO_ERROR; + } -+ close(fd); + -+ (*buf)[size] = '\0'; ++ fclose(f); ++ ++ (*buf)[*n] = '\0'; + + if (strstr((const char *) *buf, "-----BEGIN ") != NULL) { + ++*n; @@ -651,79 +513,68 @@ index 00000000..73d60e9d + return 0; +} + -+static int apk_pkey_init(struct apk_pkey *pkey) ++static int apk_pkey_init(struct apk_pkey *pkey, mbedtls_pk_context *key) +{ -+ unsigned char dig[APK_DIGEST_MAX_LENGTH]; -+ unsigned char pub[APK_ENC_KEY_MAX_LENGTH] = {}; ++ unsigned char dig[APK_DIGEST_MAX_LENGTH], *pub = NULL; + unsigned char *c; -+ int len, r = -APKE_CRYPTO_ERROR; ++ int len, publen, r = -APKE_CRYPTO_ERROR; + -+ c = pub + APK_ENC_KEY_MAX_LENGTH; ++ // Assume byte len is always * 2 + NULL terminated ++ publen = mbedtls_pk_get_len(key) * 2 + 1; ++ pub = malloc(publen); ++ if (!pub) ++ return -ENOMEM; ++ c = pub + publen; + -+ // key is written backwards into pub starting at c! -+ if ((len = mbedtls_pk_write_pubkey(&c, pub, &pkey->key)) < 0) return -APKE_CRYPTO_ERROR; -+ if (!mbedtls_md(apk_digest_alg_to_mdinfo(APK_DIGEST_SHA512), c, len, dig)) { ++ if ((len = mbedtls_pk_write_pubkey(&c, pub, key)) < 0) return -APKE_CRYPTO_ERROR; ++ if (!mbedtls_md(apk_digest_alg_to_mdinfo(APK_DIGEST_SHA512), pub, len, dig)) { + memcpy(pkey->id, dig, sizeof pkey->id); + r = 0; + } -+ ++ ++ free(pub); ++ pkey->key = key; ++ + return r; +} + +void apk_pkey_free(struct apk_pkey *pkey) +{ -+ mbedtls_pk_free(&pkey->key); -+} -+ -+static int apk_random(void *ctx, unsigned char *out, size_t len) -+{ -+ return (int)getrandom(out, len, 0); ++ mbedtls_pk_free(pkey->key); +} + -+#if MBEDTLS_VERSION_NUMBER >= 0x03000000 -+static inline int apk_mbedtls_parse_privkey(struct apk_pkey *pkey, const unsigned char *buf, size_t blen) -+{ -+ return mbedtls_pk_parse_key(&pkey->key, buf, blen, NULL, 0, apk_random, NULL); -+} -+static inline int apk_mbedtls_sign(struct apk_digest_ctx *dctx, struct apk_digest *dig, -+ unsigned char *sig, size_t *sig_len) -+{ -+ return mbedtls_pk_sign(&dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), -+ (const unsigned char *)&dig->data, dig->len, sig, sizeof *sig, sig_len, -+ apk_random, NULL); -+} -+#else -+static inline int apk_mbedtls_parse_privkey(struct apk_pkey *pkey, const unsigned char *buf, size_t blen) -+{ -+ return mbedtls_pk_parse_key(&pkey->key, buf, blen, NULL, 0); -+} -+static inline int apk_mbedtls_sign(struct apk_digest_ctx *dctx, struct apk_digest *dig, -+ unsigned char *sig, size_t *sig_len) -+{ -+ return mbedtls_pk_sign(&dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), -+ (const unsigned char *)&dig->data, dig->len, sig, sig_len, apk_random, NULL); -+} -+#endif -+ +int apk_pkey_load(struct apk_pkey *pkey, int dirfd, const char *fn) +{ -+ unsigned char *buf = NULL; -+ size_t blen = 0; -+ int ret; ++ mbedtls_pk_context *key; ++ unsigned char *buf; ++ size_t blen; ++ int ret, fd; + -+ if (apk_load_file_at(dirfd, fn, &buf, &blen)) -+ return -APKE_CRYPTO_ERROR; ++ fd = openat(dirfd, fn, O_RDONLY|O_CLOEXEC); ++ if (fd < 0) ++ return -errno; + -+ mbedtls_pk_init(&pkey->key); -+ if ((ret = mbedtls_pk_parse_public_key(&pkey->key, buf, blen)) != 0) -+ ret = apk_mbedtls_parse_privkey(pkey, buf, blen); ++ key = malloc(sizeof *key); ++ if (!key) ++ return -ENOMEM; ++ ++ mbedtls_pk_init(key); ++ if (apk_load_file_fd(fd, &buf, &blen)) ++ return -APKE_CRYPTO_ERROR; + ++ if ((ret = mbedtls_pk_parse_public_key(key, buf, blen)) != 0) { ++#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) ++ ret = mbedtls_pk_parse_key(key, buf, blen, NULL, 0, _apk_random, NULL); ++#else ++ ret = mbedtls_pk_parse_key(key, buf, blen, NULL, 0); ++#endif ++ } + mbedtls_platform_zeroize(buf, blen); + mbedtls_free(buf); + if (ret != 0) + return -APKE_CRYPTO_KEY_FORMAT; + -+ return apk_pkey_init(pkey); ++ return apk_pkey_init(pkey, key); +} + +int apk_sign_start(struct apk_digest_ctx *dctx, uint8_t alg, struct apk_pkey *pkey) @@ -743,10 +594,16 @@ index 00000000..73d60e9d + + if (apk_digest_ctx_final(dctx, &dig)) + return -APKE_SIGNATURE_GEN_FAILURE; -+ -+ if (apk_mbedtls_sign(dctx, &dig, sig, len)) ++#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) ++ if (mbedtls_pk_sign(dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), ++ &dig.data, dig.len, sig, sizeof *sig, len, _apk_random, NULL)) ++#else ++ if (mbedtls_pk_sign(dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), ++ &dig.data, dig.len, sig, len, _apk_random, NULL)) ++#endif + r = -APKE_SIGNATURE_GEN_FAILURE; + ++ + dctx->sigver_key = NULL; + return r; +} @@ -769,8 +626,7 @@ index 00000000..73d60e9d + if (apk_digest_ctx_final(dctx, &dig)) + return -APKE_SIGNATURE_GEN_FAILURE; + -+ if (mbedtls_pk_verify(&dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), -+ (const unsigned char *)&dig.data, dig.len, sig, len)) ++ if (mbedtls_pk_verify(dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), &dig.data, dig.len, sig, len)) + r = -APKE_SIGNATURE_INVALID; + + dctx->sigver_key = NULL; @@ -793,33 +649,26 @@ index 00000000..73d60e9d +#endif +} diff --git a/src/meson.build b/src/meson.build -index 38e9d3b0..e1204fc0 100644 +index 28bfce7e..4eab6e0d 100644 --- a/src/meson.build +++ b/src/meson.build -@@ -1,3 +1,4 @@ -+crypto_backend = get_option('crypto_backend') - url_backend = get_option('url_backend') - - libapk_so_version = '2.99.0' -@@ -15,7 +16,7 @@ libapk_src = [ +@@ -13,7 +13,6 @@ libapk_src = [ 'common.c', 'context.c', 'crypto.c', - 'crypto_openssl.c', -+ 'crypto_@0@.c'.format(crypto_backend), 'ctype.c', 'database.c', 'extract_v2.c', -@@ -40,7 +41,7 @@ libapk_headers = [ +@@ -37,7 +36,6 @@ libapk_headers = [ 'apk_atom.h', 'apk_blob.h', 'apk_crypto.h', - 'apk_crypto_openssl.h', -+ 'apk_crypto_@0@.h'.format(crypto_backend), 'apk_ctype.h', 'apk_database.h', 'apk_defines.h', -@@ -89,6 +90,17 @@ apk_src = [ +@@ -86,6 +84,11 @@ apk_src = [ 'applet.c', ] @@ -828,16 +677,28 @@ index 38e9d3b0..e1204fc0 100644 + '-D_ATFILE_SOURCE', +] + + url_backend = get_option('url_backend') + if url_backend == 'libfetch' + libapk_src += [ 'io_url_libfetch.c' ] +@@ -93,6 +96,17 @@ elif url_backend == 'wget' + libapk_src += [ 'io_url_wget.c' ] + endif + ++crypto_backend = get_option('crypto_backend') +if crypto_backend == 'openssl' + apk_cargs += [ '-DCRYPTO_USE_OPENSSL' ] ++ libapk_src += [ 'crypto_openssl.c' ] ++ libapk_headers += [ 'apk_crypto_openssl.h' ] +elif crypto_backend == 'mbedtls' + apk_cargs += [ '-DCRYPTO_USE_MBEDTLS' ] ++ libapk_src += [ 'crypto_mbedtls.c' ] ++ libapk_headers += [ 'apk_crypto_mbedtls.h' ] +endif + if lua_bin.found() genhelp_script = files('genhelp.lua') genhelp_args = [lua_bin, genhelp_script, '@INPUT@'] -@@ -115,11 +127,6 @@ endif +@@ -119,11 +133,6 @@ endif apk_src += [ generated_help ] @@ -852,66 +713,3 @@ index 38e9d3b0..e1204fc0 100644 -- GitLab - -From 34bb1021284dccbf97f02b0a0bb9e751b8887cad Mon Sep 17 00:00:00 2001 -From: Christian Marangi -Date: Tue, 16 Apr 2024 17:56:45 +0200 -Subject: [PATCH 4/4] add option to configure crypto backend in legacy make - build system - -Define CRYPTO to select mbedtls as alternative crypto backend. By -default openssl is used. - -Signed-off-by: Christian Marangi ---- - src/Makefile | 20 +++++++++++++++----- - 1 file changed, 15 insertions(+), 5 deletions(-) - -diff --git a/src/Makefile b/src/Makefile -index efdc68df..97db0e72 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -20,9 +20,9 @@ libapk_soname := 2.99.0 - libapk_so := $(obj)/libapk.so.$(libapk_soname) - libapk.so.$(libapk_soname)-objs := \ - adb.o adb_comp.o adb_walk_adb.o adb_walk_genadb.o adb_walk_gentext.o adb_walk_text.o apk_adb.o \ -- atom.o blob.o commit.o common.o context.o crypto.o crypto_openssl.o ctype.o database.o hash.o \ -- extract_v2.o extract_v3.o fs_fsys.o fs_uvol.o io.o io_gunzip.o tar.o package.o pathbuilder.o \ -- print.o solver.o trust.o version.o -+ atom.o blob.o commit.o common.o context.o crypto.o ctype.o database.o hash.o extract_v2.o \ -+ extract_v3.o fs_fsys.o fs_uvol.o io.o io_gunzip.o tar.o package.o pathbuilder.o print.o \ -+ solver.o trust.o version.o - - libapk.so.$(libapk_soname)-libs := - -@@ -34,6 +34,16 @@ libapk.so.$(libapk_soname)-objs += io_url_libfetch.o - libapk.so.$(libapk_soname)-libs += libfetch/libfetch.a - endif - -+ifeq ($(CRYPTO),mbedtls) -+CRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags mbedtls mbedcrypto) -DCRYPTO_USE_MBEDTLS -+CRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs mbedtls mbedcrypto) -+libapk.so.$(libapk_soname)-objs += crypto_mbedtls.o -+else -+CRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags openssl) -DCRYPTO_USE_OPENSSL -+CRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs openssl) -+libapk.so.$(libapk_soname)-objs += crypto_openssl.o -+endif -+ - # ZSTD support can be disabled - ifneq ($(ZSTD),no) - ZSTD_CFLAGS := $(shell $(PKG_CONFIG) --cflags libzstd) -@@ -100,9 +110,9 @@ LIBS_apk.static := -Wl,--as-needed -ldl -Wl,--no-as-needed - LDFLAGS_apk += -L$(obj) - LDFLAGS_apk-test += -L$(obj) - --CFLAGS_ALL += $(OPENSSL_CFLAGS) $(ZLIB_CFLAGS) $(ZSTD_CFLAGS) -+CFLAGS_ALL += $(CRYPTO_CFLAGS) $(ZLIB_CFLAGS) $(ZSTD_CFLAGS) - LIBS := -Wl,--as-needed \ -- $(OPENSSL_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) \ -+ $(CRYPTO_LIBS) $(ZLIB_LIBS) $(ZSTD_LIBS) \ - -Wl,--no-as-needed - - # Help generation --- -GitLab diff --git a/rules.mk b/rules.mk index 84586ac26b7791..66297565cbab34 100644 --- a/rules.mk +++ b/rules.mk @@ -249,6 +249,8 @@ HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS) HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib) BUILD_KEY=$(TOPDIR)/key-build +BUILD_KEY_APK_SEC=$(TOPDIR)/private-key.pem +BUILD_KEY_APK_PUB=$(TOPDIR)/public-key.pem FAKEROOT:=$(STAGING_DIR_HOST)/bin/fakeroot diff --git a/scripts/feeds b/scripts/feeds index 7d5b83e08135c4..b5b943c70bf764 100755 --- a/scripts/feeds +++ b/scripts/feeds @@ -865,7 +865,7 @@ sub feed_config() { printf "\t\tdepends on PER_FEED_REPO\n"; printf "\t\tdefault y\n" if $installed; printf "\t\thelp\n"; - printf "\t\t Enable the \\\"%s\\\" feed in opkg distfeeds.conf.\n", $feed->[1]; + printf "\t\t Enable the \\\"%s\\\" feed in opkg distfeeds.conf and apk repositories.\n", $feed->[1]; printf "\t\t Say M to add the feed commented out.\n"; printf "\n"; } @@ -884,7 +884,7 @@ Commands: -s : List of feed names and their URL. -r : List packages of specified feed. -d : Use specified delimiter to distinguish rows (default: spaces) - -f : List feeds in feeds.conf compatible format (when using -s). + -f : List feeds in opkg feeds.conf compatible format (when using -s). install [options] : Install a package Options: diff --git a/scripts/package-metadata.pl b/scripts/package-metadata.pl index a46f819ab50f0f..2c7d3c624b34fb 100755 --- a/scripts/package-metadata.pl +++ b/scripts/package-metadata.pl @@ -373,7 +373,7 @@ ($) sub gen_condition ($) { my $condition = shift; - # remove '!()', just as include/package-ipkg.mk does + # remove '!()', just as include/package-pack.mk does $condition =~ s/[()!]//g; return join("", map(and_condition($_), split('\|\|', $condition))); } diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index bfc72dacd0326c..ef32d2cf7c0aac 100644 --- a/target/imagebuilder/Makefile +++ b/target/imagebuilder/Makefile @@ -22,6 +22,8 @@ IB_IDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(STAGING_DIR_IMAGE)) BUNDLER_PATH := $(subst $(space),:,$(filter-out $(TOPDIR)/%,$(subst :,$(space),$(PATH)))) BUNDLER_COMMAND := PATH=$(BUNDLER_PATH) $(XARGS) $(SCRIPT_DIR)/bundle-libraries.sh $(PKG_BUILD_DIR)/staging_dir/host +PACKAGE_SUFFIX:=$(if $(CONFIG_USE_APK),apk,ipk) + all: compile $(BIN_DIR)/$(IB_NAME).tar.zst: clean @@ -35,18 +37,21 @@ $(BIN_DIR)/$(IB_NAME).tar.zst: clean $(INCLUDE_DIR) $(SCRIPT_DIR) \ $(TOPDIR)/rules.mk \ ./files/Makefile \ - ./files/repositories.conf \ $(TMP_DIR)/.targetinfo \ $(TMP_DIR)/.packageinfo \ $(PKG_BUILD_DIR)/ + $(INSTALL_DIR) $(PKG_BUILD_DIR)/packages + ifeq ($(CONFIG_IB_STANDALONE),) +ifneq ($(CONFIG_USE_APK),) + $(call FeedSourcesAppendAPK,$(PKG_BUILD_DIR)/repositories) + $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories +else echo '## Remote package repositories' >> $(PKG_BUILD_DIR)/repositories.conf - $(call FeedSourcesAppend,$(PKG_BUILD_DIR)/repositories.conf) + $(call FeedSourcesAppendOPKG,$(PKG_BUILD_DIR)/repositories.conf) $(VERSION_SED_SCRIPT) $(PKG_BUILD_DIR)/repositories.conf -endif - $(INSTALL_DIR) $(PKG_BUILD_DIR)/packages # create an empty package index so `opkg` doesn't report an error touch $(PKG_BUILD_DIR)/packages/Packages $(INSTALL_DATA) ./files/README.md $(PKG_BUILD_DIR)/packages/ @@ -54,28 +59,32 @@ endif echo '' >> $(PKG_BUILD_DIR)/repositories.conf echo '## This is the local package repository, do not remove!' >> $(PKG_BUILD_DIR)/repositories.conf echo 'src imagebuilder file:packages' >> $(PKG_BUILD_DIR)/repositories.conf +endif +endif ifeq ($(CONFIG_BUILDBOT),) ifeq ($(CONFIG_IB_STANDALONE),) $(FIND) $(call FeedPackageDir,libc) -type f \ - \( -name 'libc_*.ipk' -or -name 'kernel_*.ipk' -or -name 'kmod-*.ipk' \) \ + \( -name 'libc_*.$(PACKAGE_SUFFIX)' -or -name 'kernel_*.$(PACKAGE_SUFFIX)' -or -name 'kmod-*.$(PACKAGE_SUFFIX)' \) \ -exec $(CP) -t $(PKG_BUILD_DIR)/packages {} + else - $(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.ipk' \ + $(FIND) $(wildcard $(PACKAGE_SUBDIRS)) -type f -name '*.$(PACKAGE_SUFFIX)' \ -exec $(CP) -t $(PKG_BUILD_DIR)/packages/ {} + endif else $(FIND) $(call FeedPackageDir,libc) -type f \ - \( -name 'libc_*.ipk' -or -name 'kernel_*.ipk' \) \ + \( -name 'libc_*.$(PACKAGE_SUFFIX)' -or -name 'kernel_*.$(PACKAGE_SUFFIX)' \) \ -exec $(CP) -t $(IB_LDIR)/ {} + endif +ifneq ($(CONFIG_USE_APK),y) ifneq ($(CONFIG_SIGNATURE_CHECK),) echo '' >> $(PKG_BUILD_DIR)/repositories.conf echo 'option check_signature' >> $(PKG_BUILD_DIR)/repositories.conf $(INSTALL_DIR) $(PKG_BUILD_DIR)/keys $(CP) -L $(STAGING_DIR_ROOT)/etc/opkg/keys/ $(PKG_BUILD_DIR)/ $(CP) -L $(STAGING_DIR_ROOT)/usr/sbin/opkg-key $(PKG_BUILD_DIR)/scripts/ +endif endif $(CP) -L $(TOPDIR)/target/linux/Makefile $(PKG_BUILD_DIR)/target/linux diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 78a75e96a8ffad..c032306c8e2d97 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -85,6 +85,8 @@ help: FORCE # override variables from rules.mk PACKAGE_DIR:=$(TOPDIR)/packages LISTS_DIR:=$(subst $(space),/,$(patsubst %,..,$(subst /,$(space),$(TARGET_DIR))))$(DL_DIR) +PACKAGE_DIR_ALL:=$(TOPDIR)/packages + export OPKG_KEYS:=$(TOPDIR)/keys OPKG:=$(call opkg,$(TARGET_DIR)) \ -f $(TOPDIR)/repositories.conf \ @@ -92,6 +94,11 @@ OPKG:=$(call opkg,$(TARGET_DIR)) \ --cache $(DL_DIR) \ --lists-dir $(LISTS_DIR) +APK:=$(call apk,$(TARGET_DIR)) \ + --cache-dir $(DL_DIR) \ + --allow-untrusted + + include $(INCLUDE_DIR)/target.mk -include .profiles.mk @@ -152,20 +159,25 @@ _call_manifest: FORCE mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR) $(MAKE) package_reload >/dev/null $(MAKE) package_install >/dev/null - $(OPKG) list-installed $(if $(STRIP_ABI),--strip-abi) + $(APK) list --quiet --manifest --no-network package_index: FORCE @echo >&2 @echo Building package index... >&2 @mkdir -p $(TMP_DIR) $(TARGET_DIR)/tmp +ifeq ($(CONFIG_USE_APK),) (cd $(PACKAGE_DIR); $(SCRIPT_DIR)/ipkg-make-index.sh . > Packages && \ gzip -9nc Packages > Packages.gz; \ $(if $(CONFIG_SIGNATURE_CHECK), \ $(STAGING_DIR_HOST)/bin/usign -S -m Packages -s $(BUILD_KEY)) \ ) >/dev/null 2>/dev/null $(OPKG) update >&2 || true +else + (cd $(PACKAGE_DIR); $(APK) mkndx --output packages.adb *.apk) >&2 +endif package_reload: +ifeq ($(CONFIG_USE_APK),) if [ -d "$(PACKAGE_DIR)" ] && ( \ [ ! -f "$(PACKAGE_DIR)/Packages" ] || \ [ ! -f "$(PACKAGE_DIR)/Packages.gz" ] || \ @@ -176,29 +188,48 @@ package_reload: mkdir -p $(TARGET_DIR)/tmp; \ $(OPKG) update >&2 || true; \ fi +else + if [ -d "$(PACKAGE_DIR)" ] && ( \ + [ ! -f "$(PACKAGE_DIR)/packages.adb" ] || \ + [ "`find $(PACKAGE_DIR) -cnewer $(PACKAGE_DIR)/packages.adb`" ] ); then \ + echo "Package list missing or not up-to-date, generating it." >&2 ;\ + $(MAKE) package_index; \ + else \ + mkdir -p $(TARGET_DIR)/tmp; \ + $(APK) update >&2 || true; \ + fi +endif package_list: FORCE @$(MAKE) -s package_reload - @$(OPKG) list --size 2>/dev/null + @$(APK) list --size 2>/dev/null package_install: FORCE @echo @echo Installing packages... +ifeq ($(CONFIG_USE_APK),) $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/libc_*.ipk $(PACKAGE_DIR)/libc_*.ipk)) $(OPKG) install $(firstword $(wildcard $(LINUX_DIR)/kernel_*.ipk $(PACKAGE_DIR)/kernel_*.ipk)) $(OPKG) install $(BUILD_PACKAGES) +else + $(APK) add --initdb --no-scripts $(firstword $(wildcard $(LINUX_DIR)/libc-*.apk $(PACKAGE_DIR)/libc_*.apk)) + $(APK) add --no-scripts $(firstword $(wildcard $(LINUX_DIR)/kernel-*.apk $(PACKAGE_DIR)/kernel_*.apk)) + $(APK) add --no-scripts $(BUILD_PACKAGES) +endif prepare_rootfs: FORCE @echo @echo Finalizing root filesystem... $(CP) $(TARGET_DIR) $(TARGET_DIR_ORIG) +ifeq ($(CONFIG_USE_APK),) $(if $(CONFIG_SIGNATURE_CHECK), \ $(if $(ADD_LOCAL_KEY), \ OPKG_KEYS=$(TARGET_DIR)/etc/opkg/keys/ \ $(SCRIPT_DIR)/opkg-key add $(BUILD_KEY).pub \ ) \ ) +endif $(call prepare_rootfs,$(TARGET_DIR),$(USER_FILES),$(DISABLED_SERVICES)) build_image: FORCE @@ -245,6 +276,9 @@ ifneq ($(PROFILE),) endif _check_keys: FORCE +ifeq ($(CONFIG_USE_APK),) + # TODO +else ifneq ($(CONFIG_SIGNATURE_CHECK),) @if [ ! -s $(BUILD_KEY) -o ! -s $(BUILD_KEY).pub ]; then \ echo Generate local signing keys... >&2; \ @@ -260,6 +294,7 @@ ifneq ($(CONFIG_SIGNATURE_CHECK),) -s $(BUILD_KEY); \ fi endif +endif image: $(MAKE) -s _check_profile @@ -287,7 +322,11 @@ ifeq ($(PACKAGE),) @exit 1 endif @$(MAKE) -s package_reload - @$(OPKG) whatdepends -A $(PACKAGE) +ifeq ($(CONFIG_USE_APK),) + @$(OPKG) list --depends $(PACKAGE) +else + @$(APK) list --depends $(PACKAGE) +endif package_depends: FORCE ifeq ($(PACKAGE),) @@ -295,7 +334,10 @@ ifeq ($(PACKAGE),) @exit 1 endif @$(MAKE) -s package_reload +ifeq ($(CONFIG_USE_APK),) @$(OPKG) depends -A $(PACKAGE) - +else + @$(OPKG) whatdepends -A $(PACKAGE) +endif .SILENT: help info image manifest package_whatdepends package_depends From 3010ab87bc5eb4278a8d550c7ad576836fbbbdf9 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 3 May 2024 17:53:52 +0200 Subject: [PATCH 21/80] base-files: add update_alternatives function The APK package manager does not support handling of package alternatives itself, so implement it via a simple shell script. Signed-off-by: Paul Spooren --- package/base-files/files/lib/functions.sh | 49 +++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 82ee58f6425ed2..1126a93e889745 100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -286,6 +286,55 @@ add_group_and_user() { fi } +update_alternatives() { + local root="${IPKG_INSTROOT}" + local action="$1" + local pkgname="$2" + + if [ -f "$root/lib/apk/packages/${pkgname}.alternatives" ]; then + for pkg_alt in $(cat $root/lib/apk/packages/${pkgname}.alternatives); do + local best_prio=0; + local best_src="/bin/busybox"; + pkg_prio=${pkg_alt%%:*}; + pkg_target=${pkg_alt#*:}; + pkg_target=${pkg_target%:*}; + pkg_src=${pkg_alt##*:}; + + if [ -e "$root/$target" ]; then + for alts in $root/lib/apk/packages/*.alternatives; do + for alt in $(cat $alts); do + prio=${alt%%:*}; + target=${alt#*:}; + target=${target%:*}; + src=${alt##*:}; + + if [ "$target" = "$pkg_target" ] && + [ "$src" != "$pkg_src" ] && + [ "$best_prio" -lt "$prio" ]; then + best_prio=$prio; + best_src=$src; + fi + done + done + fi + case "$action" in + install) + if [ "$best_prio" -lt "$pkg_prio" ]; then + ln -sf "$pkg_src" "$root/$pkg_target" + echo "add alternative: $pkg_target -> $pkg_src" + fi + ;; + remove) + if [ "$best_prio" -lt "$pkg_prio" ]; then + ln -sf "$best_src" "$root/$pkg_target" + echo "add alternative: $pkg_target -> $best_src" + fi + ;; + esac + done + fi +} + default_postinst() { local root="${IPKG_INSTROOT}" local pkgname="$(basename ${1%.*})" From bcc641504d401336336ae1ada8a9935ff05c6055 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 3 May 2024 18:24:17 +0200 Subject: [PATCH 22/80] base-files: add compatibility for APK and OPKG Both package managers work slightly different, i.e. stores files at different places. Modify the `functions.sh` file to cover those. Signed-off-by: Paul Spooren --- package/base-files/files/lib/functions.sh | 28 +++++++++++++++++------ 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 1126a93e889745..a009aa81e99d0b 100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -211,8 +211,10 @@ config_list_foreach() { default_prerm() { local root="${IPKG_INSTROOT}" - local pkgname="$(basename ${1%.*})" + [ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})" local ret=0 + local filelist="${root}/usr/lib/opkg/info/${pkgname}.list" + [ -f "$root/lib/apk/packages/${pkgname}.list" ] && filelist="$root/lib/apk/packages/${pkgname}.list" if [ -f "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ]; then ( . "$root/usr/lib/opkg/info/${pkgname}.prerm-pkg" ) @@ -220,7 +222,7 @@ default_prerm() { fi local shell="$(command -v bash)" - for i in $(grep -s "^/etc/init.d/" "$root/usr/lib/opkg/info/${pkgname}.list"); do + for i in $(grep -s "^/etc/init.d/" "$filelist"); do if [ -n "$root" ]; then ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" disable else @@ -235,8 +237,11 @@ default_prerm() { } add_group_and_user() { - local pkgname="$1" + [ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})" local rusers="$(sed -ne 's/^Require-User: *//p' $root/usr/lib/opkg/info/${pkgname}.control 2>/dev/null)" + if [ -f "$root/lib/apk/packages/${pkgname}.rusers" ]; then + local rusers="$(cat $root/lib/apk/packages/${pkgname}.rusers)" + fi if [ -n "$rusers" ]; then local tuple oIFS="$IFS" @@ -337,11 +342,20 @@ update_alternatives() { default_postinst() { local root="${IPKG_INSTROOT}" - local pkgname="$(basename ${1%.*})" - local filelist="/usr/lib/opkg/info/${pkgname}.list" + [ -z "$pkgname" ] && local pkgname="$(basename ${1%.*})" + local filelist="${root}/usr/lib/opkg/info/${pkgname}.list" + [ -f "$root/lib/apk/packages/${pkgname}.list" ] && filelist="$root/lib/apk/packages/${pkgname}.list" local ret=0 - add_group_and_user "${pkgname}" + if [ -e "${root}/usr/lib/opkg/info/${pkgname}.list" ]; then + filelist="${root}/usr/lib/opkg/info/${pkgname}.list" + add_group_and_user "${pkgname}" + fi + + if [ -e "${root}/lib/apk/packages/${pkgname}.list" ]; then + filelist="${root}/lib/apk/packages/${pkgname}.list" + update_alternatives install "${pkgname}" + fi if [ -d "$root/rootfs-overlay" ]; then cp -R $root/rootfs-overlay/. $root/ @@ -374,7 +388,7 @@ default_postinst() { fi local shell="$(command -v bash)" - for i in $(grep -s "^/etc/init.d/" "$root$filelist"); do + for i in $(grep -s "^/etc/init.d/" "$filelist"); do if [ -n "$root" ]; then ${shell:-/bin/sh} "$root/etc/rc.common" "$root$i" enable else From b773ca1a966de99a43925bbaa2ac775536a7b112 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 17 May 2024 23:19:52 +0300 Subject: [PATCH 23/80] apk: disable helptext for host build The host build would need Lua to compile which currently adds a race condition. Instead of tracking that down just disable helptext for the host build. Signed-off-by: Paul Spooren --- package/system/apk/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 0f0e043986ba94..7aaf9f4c5ef8b7 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -17,8 +17,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_INSTALL:=1 HOST_BUILD_PREFIX:=$(STAGING_DIR_HOST) -HOST_BUILD_DEPENDS:=lua/host -PKG_BUILD_DEPENDS:=$(HOST_BUILD_DEPENDS) +PKG_BUILD_DEPENDS:=lua/host include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/host-build.mk @@ -53,7 +52,7 @@ MESON_HOST_VARS+=VERSION=$(PKG_VERSION) MESON_VARS+=VERSION=$(PKG_VERSION) MESON_HOST_ARGS += \ - -Dlua_version=5.1 \ + -Dhelp=disabled \ -Dcompressed-help=false \ -Ddocs=disabled \ -Dcrypto_backend=openssl \ From a96354bcfb0ad1c0deccbfdb3264c149447d474b Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Fri, 17 May 2024 23:32:00 +0300 Subject: [PATCH 24/80] base-files: correctly split install-key function for APK The function incorrectly tried to APK keys even if there were none. Correctly separate it into its own `ifdef` section. Signed-off-by: Paul Spooren Link: https://github.com/openwrt/openwrt/pull/15519 Signed-off-by: Christian Marangi --- package/base-files/Makefile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index c42e2d9dd41657..0aa7ecd85420b9 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -122,6 +122,13 @@ ifneq ($(CONFIG_USE_APK),) $(STAGING_DIR_HOST)/bin/openssl ecparam -name prime256v1 -genkey -noout -out $(BUILD_KEY_APK_SEC); \ $(STAGING_DIR_HOST)/bin/openssl ec -in $(BUILD_KEY_APK_SEC) -pubout > $(BUILD_KEY_APK_PUB) endef + +ifndef CONFIG_BUILDBOT + define Package/base-files/install-key + mkdir -p $(1)/etc/apk/keys + $(CP) $(BUILD_KEY_APK_PUB) $(1)/etc/apk/keys/ + endef +endif else ifdef CONFIG_SIGNED_PACKAGES define Build/Configure @@ -137,10 +144,6 @@ ifndef CONFIG_BUILDBOT define Package/base-files/install-key mkdir -p $(1)/etc/opkg/keys $(CP) $(BUILD_KEY).pub $(1)/etc/opkg/keys/`$(STAGING_DIR_HOST)/bin/usign -F -p $(BUILD_KEY).pub` - - mkdir -p $(1)/etc/apk/keys - $(CP) $(BUILD_KEY_APK_PUB) $(1)/etc/apk/keys/ - endef endif endif From 99636d4dd8d4bda15b9e072d2d92dd5f4ae0580f Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sat, 18 May 2024 16:29:07 +0300 Subject: [PATCH 25/80] apk: update to latest HEAD 2024-05-18 Drop downstream mbedtls patch since it went upstream. Signed-off-by: Paul Spooren Link: https://github.com/openwrt/openwrt/pull/15522 Signed-off-by: Christian Marangi --- package/system/apk/Makefile | 6 +- .../apk/patches/0002-mbedtls-support.patch | 715 ------------------ 2 files changed, 3 insertions(+), 718 deletions(-) delete mode 100644 package/system/apk/patches/0002-mbedtls-support.patch diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 7aaf9f4c5ef8b7..332596719f5182 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2024-04-16 -PKG_SOURCE_VERSION:=ba6c31a5469ef74fb85119508e55de9631ffef41 -PKG_MIRROR_HASH:=3455d5799481add9ece3db685576d58be6303f3a13140133979b965cbd3c9966 +PKG_SOURCE_DATE:=2024-05-18 +PKG_SOURCE_VERSION:=a6ce0a1be1a42a5cf4136eb0db5ea95168ee73fe +PKG_MIRROR_HASH:=a5f59907cd742ec12f31f42910ea9a6ecfaf91e18218a7888836a01cfa272a72 PKG_VERSION=3.0.0_pre$(subst -,,$(PKG_SOURCE_DATE)) diff --git a/package/system/apk/patches/0002-mbedtls-support.patch b/package/system/apk/patches/0002-mbedtls-support.patch deleted file mode 100644 index d06db30f03f89e..00000000000000 --- a/package/system/apk/patches/0002-mbedtls-support.patch +++ /dev/null @@ -1,715 +0,0 @@ -From 68352e0cb94fe08b220d4befec828171ec871154 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= -Date: Fri, 5 Apr 2024 12:06:56 +0300 -Subject: [PATCH 1/2] add alternate url wget implementation - ---- - meson.build | 6 +- - meson_options.txt | 1 + - src/io_url_wget.c | 137 ++++++++++++++++++++++++++++++++++++++++++++++ - src/meson.build | 8 ++- - 4 files changed, 150 insertions(+), 2 deletions(-) - create mode 100644 src/io_url_wget.c - -diff --git a/meson.build b/meson.build -index 1a44c11f..9a14cac0 100644 ---- a/meson.build -+++ b/meson.build -@@ -33,6 +33,10 @@ subproject = meson.is_subproject() - - subdir('doc') - subdir('portability') --subdir('libfetch') -+if get_option('url_backend') == 'libfetch' -+ subdir('libfetch') -+else -+ libfetch_dep = dependency('', required: false) -+endif - subdir('src') - subdir('tests') -diff --git a/meson_options.txt b/meson_options.txt -index 693f46ec..44b88b32 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -5,5 +5,6 @@ option('help', description: 'Build help into apk binaries, needs lua', type: 'fe - option('lua', description: 'Build luaapk (lua bindings)', type: 'feature', value: 'auto') - option('lua_version', description: 'Lua version to build against', type: 'string', value: '5.3') - option('static_apk', description: 'Also build apk.static', type: 'boolean', value: false) -+option('url_backend', description: 'URL backend', type: 'string', value: 'libfetch') - option('uvol_db_target', description: 'Default target for uvol database layer', type: 'string') - option('zstd', description: 'Build with zstd support', type: 'boolean', value: true) -diff --git a/src/io_url_wget.c b/src/io_url_wget.c -new file mode 100644 -index 00000000..d8885a4f ---- /dev/null -+++ b/src/io_url_wget.c -@@ -0,0 +1,137 @@ -+/* io_url_wget.c - Alpine Package Keeper (APK) -+ * -+ * Copyright (C) 2005-2008 Natanael Copa -+ * Copyright (C) 2008-2011 Timo Teräs -+ * All rights reserved. -+ * -+ * SPDX-License-Identifier: GPL-2.0-only -+ */ -+ -+#include -+#include -+#include -+#include "apk_io.h" -+ -+static int wget_translate_status(int status) -+{ -+ if (!WIFEXITED(status)) return -EFAULT; -+ switch (WEXITSTATUS(status)) { -+ case 0: return 0; -+ case 3: return -EIO; -+ case 4: return -ENETUNREACH; -+ case 5: return -EACCES; -+ case 6: return -EACCES; -+ case 7: return -EPROTO; -+ default: return -APKE_REMOTE_IO; -+ } -+} -+ -+struct apk_wget_istream { -+ struct apk_istream is; -+ int fd; -+ pid_t pid; -+}; -+ -+static int wget_spawn(const char *url, pid_t *pid, int *fd) -+{ -+ int r, pipefds[2]; -+ posix_spawn_file_actions_t act; -+ char *argv[] = { -+ (char*)"wget", "-q", (char*) url, "-O", "-", 0 -+ }; -+ -+ if (pipe2(pipefds, O_CLOEXEC) != 0) return -errno; -+ -+ posix_spawn_file_actions_init(&act); -+ posix_spawn_file_actions_adddup2(&act, pipefds[1], STDOUT_FILENO); -+ r = posix_spawnp(pid, "wget", &act, 0, argv, environ); -+ posix_spawn_file_actions_destroy(&act); -+ if (r != 0) return -r; -+ close(pipefds[1]); -+ *fd = pipefds[0]; -+ return 0; -+} -+ -+static int wget_check_exit(struct apk_wget_istream *wis) -+{ -+ int status; -+ -+ if (wis->pid == 0) return apk_istream_error(&wis->is, 0); -+ if (waitpid(wis->pid, &status, 0) == wis->pid) { -+ wis->pid = 0; -+ return apk_istream_error(&wis->is, wget_translate_status(status)); -+ } -+ return 0; -+} -+ -+static void wget_get_meta(struct apk_istream *is, struct apk_file_meta *meta) -+{ -+} -+ -+static ssize_t wget_read(struct apk_istream *is, void *ptr, size_t size) -+{ -+ struct apk_wget_istream *wis = container_of(is, struct apk_wget_istream, is); -+ ssize_t r; -+ -+ r = read(wis->fd, ptr, size); -+ if (r < 0) return -errno; -+ if (r == 0) return wget_check_exit(wis); -+ return r; -+} -+ -+static int wget_close(struct apk_istream *is) -+{ -+ int r = is->err; -+ struct apk_wget_istream *wis = container_of(is, struct apk_wget_istream, is); -+ -+ while (wis->pid != 0) -+ wget_check_exit(wis); -+ -+ close(wis->fd); -+ free(wis); -+ return r < 0 ? r : 0; -+} -+ -+static const struct apk_istream_ops wget_istream_ops = { -+ .get_meta = wget_get_meta, -+ .read = wget_read, -+ .close = wget_close, -+}; -+ -+struct apk_istream *apk_io_url_istream(const char *url, time_t since) -+{ -+ struct apk_wget_istream *wis; -+ int r; -+ -+ wis = malloc(sizeof(*wis) + apk_io_bufsize); -+ if (wis == NULL) return ERR_PTR(-ENOMEM); -+ -+ *wis = (struct apk_wget_istream) { -+ .is.ops = &wget_istream_ops, -+ .is.buf = (uint8_t *)(wis + 1), -+ .is.buf_size = apk_io_bufsize, -+ }; -+ r = wget_spawn(url, &wis->pid, &wis->fd); -+ if (r != 0) { -+ free(wis); -+ return ERR_PTR(r); -+ } -+ -+ return &wis->is; -+} -+ -+void apk_io_url_no_check_certificate(void) -+{ -+} -+ -+void apk_io_url_set_timeout(int timeout) -+{ -+} -+ -+void apk_io_url_set_redirect_callback(void (*cb)(int, const char *)) -+{ -+} -+ -+void apk_io_url_init(void) -+{ -+} -diff --git a/src/meson.build b/src/meson.build -index c1aae550..28bfce7e 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -22,7 +22,6 @@ libapk_src = [ - 'fs_uvol.c', - 'hash.c', - 'io.c', -- 'io_url_libfetch.c', - 'io_gunzip.c', - 'package.c', - 'pathbuilder.c', -@@ -87,6 +86,13 @@ apk_src = [ - 'applet.c', - ] - -+url_backend = get_option('url_backend') -+if url_backend == 'libfetch' -+ libapk_src += [ 'io_url_libfetch.c' ] -+elif url_backend == 'wget' -+ libapk_src += [ 'io_url_wget.c' ] -+endif -+ - if lua_bin.found() - genhelp_script = files('genhelp.lua') - genhelp_args = [lua_bin, genhelp_script, '@INPUT@'] --- -GitLab - - -From dc7ff789a45522eb847118a29b60b896de55d083 Mon Sep 17 00:00:00 2001 -From: Jonas Jelonek -Date: Sun, 14 Apr 2024 00:20:14 +0200 -Subject: [PATCH 2/2] crypto: add support for mbedtls as backend - -backend is selected at compile-time with crypto_backend option - -Co-developed-by: Christian Marangi -Signed-off-by: Christian Marangi -Signed-off-by: Jonas Jelonek ---- - libfetch/meson.build | 2 +- - meson.build | 14 +- - meson_options.txt | 1 + - src/apk_crypto.h | 5 + - src/apk_crypto_mbedtls.h | 26 ++++ - src/crypto_mbedtls.c | 305 +++++++++++++++++++++++++++++++++++++++ - src/meson.build | 23 ++- - 7 files changed, 364 insertions(+), 12 deletions(-) - create mode 100644 src/apk_crypto_mbedtls.h - create mode 100644 src/crypto_mbedtls.c - -diff --git a/libfetch/meson.build b/libfetch/meson.build -index 431ba197..e24f95eb 100644 ---- a/libfetch/meson.build -+++ b/libfetch/meson.build -@@ -40,7 +40,7 @@ libfetch = static_library( - c_args: libfetch_cargs, - dependencies: [ - libportability_dep.partial_dependency(compile_args: true, includes: true), -- openssl_dep.partial_dependency(compile_args: true, includes: true) -+ crypto_dep.partial_dependency(compile_args: true, includes: true) - ], - ) - -diff --git a/meson.build b/meson.build -index 9a14cac0..3a83f4e1 100644 ---- a/meson.build -+++ b/meson.build -@@ -13,15 +13,21 @@ apk_libdir = get_option('libdir') - lua_bin = find_program('lua' + get_option('lua_version'), required: get_option('help')) - lua_dep = dependency('lua' + get_option('lua_version'), required: get_option('lua')) - scdoc_dep = dependency('scdoc', version: '>=1.10', required: get_option('docs')) --openssl_dep = dependency('openssl') --openssl_static_dep = dependency('openssl', static: true) - zlib_dep = dependency('zlib') - zlib_static_dep = dependency('zlib', static: true) - libzstd_dep = dependency('libzstd', required: get_option('zstd')) - libzstd_static_dep = dependency('libzstd', required: get_option('zstd'), static: true) - --shared_deps = [ openssl_dep, zlib_dep, libzstd_dep ] --static_deps = [ openssl_static_dep, zlib_static_dep, libzstd_static_dep ] -+if get_option('crypto_backend') == 'openssl' -+ crypto_dep = dependency('openssl') -+ crypto_static_dep = dependency('openssl', static: true) -+elif get_option('crypto_backend') == 'mbedtls' -+ crypto_dep = [ dependency('mbedtls'), dependency('mbedcrypto') ] -+ crypto_static_dep = [ dependency('mbedtls', static: true), dependency('mbedcrypto', static: true) ] -+endif -+ -+shared_deps = [ crypto_dep, zlib_dep, libzstd_dep ] -+static_deps = [ crypto_static_dep, zlib_static_dep, libzstd_static_dep ] - - add_project_arguments('-D_GNU_SOURCE', language: 'c') - -diff --git a/meson_options.txt b/meson_options.txt -index 44b88b32..2b1d24ce 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -5,6 +5,7 @@ option('help', description: 'Build help into apk binaries, needs lua', type: 'fe - option('lua', description: 'Build luaapk (lua bindings)', type: 'feature', value: 'auto') - option('lua_version', description: 'Lua version to build against', type: 'string', value: '5.3') - option('static_apk', description: 'Also build apk.static', type: 'boolean', value: false) -+option('crypto_backend', description: 'SSL backend', type: 'string', value: 'openssl') - option('url_backend', description: 'URL backend', type: 'string', value: 'libfetch') - option('uvol_db_target', description: 'Default target for uvol database layer', type: 'string') - option('zstd', description: 'Build with zstd support', type: 'boolean', value: true) -diff --git a/src/apk_crypto.h b/src/apk_crypto.h -index 7de88dfc..5cae3bfe 100644 ---- a/src/apk_crypto.h -+++ b/src/apk_crypto.h -@@ -12,7 +12,12 @@ - #include - #include "apk_defines.h" - #include "apk_blob.h" -+ -+#if defined(CRYPTO_USE_OPENSSL) - #include "apk_crypto_openssl.h" -+#elif defined(CRYPTO_USE_MBEDTLS) -+#include "apk_crypto_mbedtls.h" -+#endif - - // Digest - -diff --git a/src/apk_crypto_mbedtls.h b/src/apk_crypto_mbedtls.h -new file mode 100644 -index 00000000..e379535b ---- /dev/null -+++ b/src/apk_crypto_mbedtls.h -@@ -0,0 +1,26 @@ -+/* apk_crypto_mbedtls.h - Alpine Package Keeper (APK) -+ * -+ * Copyright (C) 2024 -+ * All rights reserved. -+ * -+ * SPDX-License-Identifier: GPL-2.0-only -+ */ -+ -+#ifndef APK_CRYPTO_MBEDTLS_H -+#define APK_CRYPTO_MBEDTLS_H -+ -+#include -+#include -+ -+struct apk_pkey { -+ uint8_t id[16]; -+ mbedtls_pk_context *key; -+}; -+ -+struct apk_digest_ctx { -+ mbedtls_md_context_t *mdctx; -+ struct apk_pkey *sigver_key; -+ uint8_t alg; -+}; -+ -+#endif -diff --git a/src/crypto_mbedtls.c b/src/crypto_mbedtls.c -new file mode 100644 -index 00000000..9ce148b5 ---- /dev/null -+++ b/src/crypto_mbedtls.c -@@ -0,0 +1,305 @@ -+#include -+#include -+#include -+#include -+#include -+ -+#include -+#include -+#include -+#include -+#include -+ -+#include "apk_crypto.h" -+ -+static inline const mbedtls_md_type_t apk_digest_alg_to_mbedtls_type(uint8_t alg) { -+ switch (alg) { -+ case APK_DIGEST_NONE: return MBEDTLS_MD_NONE; -+ case APK_DIGEST_MD5: return MBEDTLS_MD_MD5; -+ case APK_DIGEST_SHA1: return MBEDTLS_MD_SHA1; -+ case APK_DIGEST_SHA256_160: -+ case APK_DIGEST_SHA256: return MBEDTLS_MD_SHA256; -+ case APK_DIGEST_SHA512: return MBEDTLS_MD_SHA512; -+ default: -+ assert(alg); -+ return MBEDTLS_MD_NONE; -+ } -+} -+ -+static inline const mbedtls_md_info_t *apk_digest_alg_to_mdinfo(uint8_t alg) -+{ -+ return mbedtls_md_info_from_type( -+ apk_digest_alg_to_mbedtls_type(alg) -+ ); -+} -+ -+int apk_digest_calc(struct apk_digest *d, uint8_t alg, const void *ptr, size_t sz) -+{ -+ if (mbedtls_md(apk_digest_alg_to_mdinfo(alg), ptr, sz, d->data)) -+ return -APKE_CRYPTO_ERROR; -+ -+ apk_digest_set(d, alg); -+ return 0; -+} -+ -+int apk_digest_ctx_init(struct apk_digest_ctx *dctx, uint8_t alg) -+{ -+ dctx->alg = alg; -+ dctx->mdctx = malloc(sizeof(mbedtls_md_context_t)); -+ -+ if (!dctx->mdctx) return -ENOMEM; -+ -+ mbedtls_md_init(dctx->mdctx); -+ if (alg == APK_DIGEST_NONE) return 0; -+ if (mbedtls_md_setup(dctx->mdctx, apk_digest_alg_to_mdinfo(alg), 0) || -+ mbedtls_md_starts(dctx->mdctx)) -+ return -APKE_CRYPTO_ERROR; -+ -+ return 0; -+} -+ -+int apk_digest_ctx_reset(struct apk_digest_ctx *dctx) -+{ -+ if (dctx->alg == APK_DIGEST_NONE) return 0; -+ if (mbedtls_md_starts(dctx->mdctx)) return -APKE_CRYPTO_ERROR; -+ return 0; -+} -+ -+int apk_digest_ctx_reset_alg(struct apk_digest_ctx *dctx, uint8_t alg) -+{ -+ mbedtls_md_free(dctx->mdctx); -+ -+ dctx->alg = alg; -+ if (alg == APK_DIGEST_NONE) return 0; -+ if (mbedtls_md_setup(dctx->mdctx, apk_digest_alg_to_mdinfo(alg), 0) || -+ mbedtls_md_starts(dctx->mdctx)) -+ return -APKE_CRYPTO_ERROR; -+ -+ return 0; -+} -+ -+void apk_digest_ctx_free(struct apk_digest_ctx *dctx) -+{ -+ free(dctx->mdctx); -+ dctx->mdctx = 0; -+} -+ -+int apk_digest_ctx_update(struct apk_digest_ctx *dctx, const void *ptr, size_t sz) -+{ -+ if (dctx->alg == APK_DIGEST_NONE) return 0; -+ return mbedtls_md_update(dctx->mdctx, ptr, sz) == 0 ? 0 : -APKE_CRYPTO_ERROR; -+} -+ -+int apk_digest_ctx_final(struct apk_digest_ctx *dctx, struct apk_digest *d) -+{ -+ if (mbedtls_md_finish(dctx->mdctx, d->data)) { -+ apk_digest_reset(d); -+ return -APKE_CRYPTO_ERROR; -+ } -+ -+ mbedtls_md_free(dctx->mdctx); -+ -+ d->alg = dctx->alg; -+ d->len = apk_digest_alg_len(d->alg); -+ return 0; -+} -+ -+// Entropy function adopted from ustream-ssl to avoid using the bloated mbedtls' -+// mbedtls_entropy_context and mbedtls_ctr_drbg_context. -+static int _apk_random(void *ctx, unsigned char *out, size_t len) -+{ -+ static FILE *f; -+ -+ if (!f) -+ f = fopen("/dev/urandom", "r"); -+ if (fread(out, len, 1, f) != 1) -+ return MBEDTLS_ERR_ENTROPY_SOURCE_FAILED; -+ -+ return 0; -+} -+ -+// adopted from mbedtls_pk_load_file -+static int apk_load_file_fd(int fd, unsigned char **buf, size_t *n) -+{ -+ FILE *f; -+ long size; -+ -+ if ((f = fdopen(fd, "rb")) == NULL) { -+ return MBEDTLS_ERR_PK_FILE_IO_ERROR; -+ } -+ -+#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) -+ /* Ensure no stdio buffering of secrets, as such buffers cannot be wiped. */ -+ mbedtls_setbuf(f, NULL); -+#endif -+ -+ fseek(f, 0, SEEK_END); -+ if ((size = ftell(f)) == -1) { -+ fclose(f); -+ return MBEDTLS_ERR_PK_FILE_IO_ERROR; -+ } -+ fseek(f, 0, SEEK_SET); -+ -+ *n = (size_t) size; -+ -+ if (*n + 1 == 0 || -+ (*buf = mbedtls_calloc(1, *n + 1)) == NULL) { -+ fclose(f); -+ return MBEDTLS_ERR_PK_ALLOC_FAILED; -+ } -+ -+ if (fread(*buf, 1, *n, f) != *n) { -+ fclose(f); -+ -+ mbedtls_platform_zeroize(*buf, *n); -+ mbedtls_free(*buf); -+ -+ return MBEDTLS_ERR_PK_FILE_IO_ERROR; -+ } -+ -+ fclose(f); -+ -+ (*buf)[*n] = '\0'; -+ -+ if (strstr((const char *) *buf, "-----BEGIN ") != NULL) { -+ ++*n; -+ } -+ -+ return 0; -+} -+ -+static int apk_pkey_init(struct apk_pkey *pkey, mbedtls_pk_context *key) -+{ -+ unsigned char dig[APK_DIGEST_MAX_LENGTH], *pub = NULL; -+ unsigned char *c; -+ int len, publen, r = -APKE_CRYPTO_ERROR; -+ -+ // Assume byte len is always * 2 + NULL terminated -+ publen = mbedtls_pk_get_len(key) * 2 + 1; -+ pub = malloc(publen); -+ if (!pub) -+ return -ENOMEM; -+ c = pub + publen; -+ -+ if ((len = mbedtls_pk_write_pubkey(&c, pub, key)) < 0) return -APKE_CRYPTO_ERROR; -+ if (!mbedtls_md(apk_digest_alg_to_mdinfo(APK_DIGEST_SHA512), pub, len, dig)) { -+ memcpy(pkey->id, dig, sizeof pkey->id); -+ r = 0; -+ } -+ -+ free(pub); -+ pkey->key = key; -+ -+ return r; -+} -+ -+void apk_pkey_free(struct apk_pkey *pkey) -+{ -+ mbedtls_pk_free(pkey->key); -+} -+ -+int apk_pkey_load(struct apk_pkey *pkey, int dirfd, const char *fn) -+{ -+ mbedtls_pk_context *key; -+ unsigned char *buf; -+ size_t blen; -+ int ret, fd; -+ -+ fd = openat(dirfd, fn, O_RDONLY|O_CLOEXEC); -+ if (fd < 0) -+ return -errno; -+ -+ key = malloc(sizeof *key); -+ if (!key) -+ return -ENOMEM; -+ -+ mbedtls_pk_init(key); -+ if (apk_load_file_fd(fd, &buf, &blen)) -+ return -APKE_CRYPTO_ERROR; -+ -+ if ((ret = mbedtls_pk_parse_public_key(key, buf, blen)) != 0) { -+#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) -+ ret = mbedtls_pk_parse_key(key, buf, blen, NULL, 0, _apk_random, NULL); -+#else -+ ret = mbedtls_pk_parse_key(key, buf, blen, NULL, 0); -+#endif -+ } -+ mbedtls_platform_zeroize(buf, blen); -+ mbedtls_free(buf); -+ if (ret != 0) -+ return -APKE_CRYPTO_KEY_FORMAT; -+ -+ return apk_pkey_init(pkey, key); -+} -+ -+int apk_sign_start(struct apk_digest_ctx *dctx, uint8_t alg, struct apk_pkey *pkey) -+{ -+ if (apk_digest_ctx_reset_alg(dctx, alg)) -+ return -APKE_CRYPTO_ERROR; -+ -+ dctx->sigver_key = pkey; -+ -+ return 0; -+} -+ -+int apk_sign(struct apk_digest_ctx *dctx, void *sig, size_t *len) -+{ -+ struct apk_digest dig; -+ int r = 0; -+ -+ if (apk_digest_ctx_final(dctx, &dig)) -+ return -APKE_SIGNATURE_GEN_FAILURE; -+#if (MBEDTLS_VERSION_NUMBER >= 0x03000000) -+ if (mbedtls_pk_sign(dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), -+ &dig.data, dig.len, sig, sizeof *sig, len, _apk_random, NULL)) -+#else -+ if (mbedtls_pk_sign(dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), -+ &dig.data, dig.len, sig, len, _apk_random, NULL)) -+#endif -+ r = -APKE_SIGNATURE_GEN_FAILURE; -+ -+ -+ dctx->sigver_key = NULL; -+ return r; -+} -+ -+int apk_verify_start(struct apk_digest_ctx *dctx, uint8_t alg, struct apk_pkey *pkey) -+{ -+ if (apk_digest_ctx_reset_alg(dctx, alg)) -+ return -APKE_CRYPTO_ERROR; -+ -+ dctx->sigver_key = pkey; -+ -+ return 0; -+} -+ -+int apk_verify(struct apk_digest_ctx *dctx, void *sig, size_t len) -+{ -+ struct apk_digest dig; -+ int r = 0; -+ -+ if (apk_digest_ctx_final(dctx, &dig)) -+ return -APKE_SIGNATURE_GEN_FAILURE; -+ -+ if (mbedtls_pk_verify(dctx->sigver_key->key, apk_digest_alg_to_mbedtls_type(dctx->alg), &dig.data, dig.len, sig, len)) -+ r = -APKE_SIGNATURE_INVALID; -+ -+ dctx->sigver_key = NULL; -+ return r; -+} -+ -+static void apk_crypto_cleanup(void) -+{ -+#ifdef MBEDTLS_PSA_CRYPTO_C -+ mbedtls_psa_crypto_free(); -+#endif -+} -+ -+void apk_crypto_init(void) -+{ -+ atexit(apk_crypto_cleanup); -+ -+#ifdef MBEDTLS_PSA_CRYPTO_C -+ psa_crypto_init(); -+#endif -+} -diff --git a/src/meson.build b/src/meson.build -index 28bfce7e..4eab6e0d 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -13,7 +13,6 @@ libapk_src = [ - 'common.c', - 'context.c', - 'crypto.c', -- 'crypto_openssl.c', - 'ctype.c', - 'database.c', - 'extract_v2.c', -@@ -37,7 +36,6 @@ libapk_headers = [ - 'apk_atom.h', - 'apk_blob.h', - 'apk_crypto.h', -- 'apk_crypto_openssl.h', - 'apk_ctype.h', - 'apk_database.h', - 'apk_defines.h', -@@ -86,6 +84,11 @@ apk_src = [ - 'applet.c', - ] - -+apk_cargs = [ -+ '-DAPK_VERSION="' + meson.project_version() + '"', -+ '-D_ATFILE_SOURCE', -+] -+ - url_backend = get_option('url_backend') - if url_backend == 'libfetch' - libapk_src += [ 'io_url_libfetch.c' ] -@@ -93,6 +96,17 @@ elif url_backend == 'wget' - libapk_src += [ 'io_url_wget.c' ] - endif - -+crypto_backend = get_option('crypto_backend') -+if crypto_backend == 'openssl' -+ apk_cargs += [ '-DCRYPTO_USE_OPENSSL' ] -+ libapk_src += [ 'crypto_openssl.c' ] -+ libapk_headers += [ 'apk_crypto_openssl.h' ] -+elif crypto_backend == 'mbedtls' -+ apk_cargs += [ '-DCRYPTO_USE_MBEDTLS' ] -+ libapk_src += [ 'crypto_mbedtls.c' ] -+ libapk_headers += [ 'apk_crypto_mbedtls.h' ] -+endif -+ - if lua_bin.found() - genhelp_script = files('genhelp.lua') - genhelp_args = [lua_bin, genhelp_script, '@INPUT@'] -@@ -119,11 +133,6 @@ endif - - apk_src += [ generated_help ] - --apk_cargs = [ -- '-DAPK_VERSION="' + meson.project_version() + '"', -- '-D_ATFILE_SOURCE', --] -- - apk_arch_prefix = get_option('arch_prefix') - if apk_arch_prefix != '' - apk_cargs += ['-DAPK_ARCH_PREFIX="@0@"'.format(apk_arch_prefix)] --- -GitLab - From 52a225cba41f72f0e38958a77bcbc5353ccaa731 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Sat, 18 May 2024 23:10:49 +0300 Subject: [PATCH 26/80] rootfs: fix USE_APK detection Due to missing quotes the script would wrongly assume APK to be enabled and don't run post install scripts, breaking pretty much everything. Signed-off-by: Paul Spooren --- include/rootfs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/rootfs.mk b/include/rootfs.mk index eb4fa434a36510..907a95a794a34a 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -78,7 +78,7 @@ define prepare_rootfs @mkdir -p $(1)/var/lock @( \ cd $(1); \ - if [ -n $(CONFIG_USE_APK) ]; then \ + if [ -n "$(CONFIG_USE_APK)" ]; then \ $(STAGING_DIR_HOST)/bin/tar -xf ./lib/apk/db/scripts.tar --wildcards "*.post-install" -O > script.sh; \ chmod +x script.sh; \ IPKG_INSTROOT=$(1) $$(command -v bash) script.sh; \ From 3bc9ac29425b5a2fd35637c09cee609b6de0713a Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 13 May 2024 20:17:33 +0200 Subject: [PATCH 27/80] uboot-mediatek: add missing options for mt7988-rfb Fixes autoboot and storing env in UBI Signed-off-by: Felix Fietkau --- ...figs-add-usefull-stuff-to-mt7988-rfb.patch | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch index da1d985688b981..311a828a9370b7 100644 --- a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch +++ b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch @@ -157,10 +157,11 @@ CONFIG_MTD=y --- a/configs/mt7988_rfb_defconfig +++ b/configs/mt7988_rfb_defconfig -@@ -11,6 +11,24 @@ CONFIG_DEBUG_UART_BASE=0x11000000 +@@ -11,7 +11,24 @@ CONFIG_DEBUG_UART_BASE=0x11000000 CONFIG_DEBUG_UART_CLOCK=40000000 CONFIG_SYS_LOAD_ADDR=0x46000000 CONFIG_DEBUG_UART=y +-# CONFIG_AUTOBOOT is not set +CONFIG_OF_LIBFDT_OVERLAY=y +CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_CFB_CONSOLE_ANSI=y @@ -179,10 +180,10 @@ +CONFIG_NAND_BOOT=y +CONFIG_BOOTSTD_DEFAULTS=y +CONFIG_BOOTSTD_FULL=y - # CONFIG_AUTOBOOT is not set CONFIG_DEFAULT_FDT_FILE="mt7988-rfb" CONFIG_LOGLEVEL=7 -@@ -22,15 +40,118 @@ CONFIG_SYS_PBSIZE=1049 + CONFIG_LOG=y +@@ -22,15 +39,120 @@ CONFIG_SYS_PBSIZE=1049 # CONFIG_BOOTM_PLAN9 is not set # CONFIG_BOOTM_RTEMS is not set # CONFIG_BOOTM_VXWORKS is not set @@ -293,16 +294,18 @@ +CONFIG_USB_XHCI_MTK=y +CONFIG_USB_STORAGE=y +CONFIG_OF_EMBED=y ++CONFIG_OF_SYSTEM_SETUP=y +CONFIG_ENV_OVERWRITE=y -+CONFIG_ENV_IS_IN_MMC=y -+CONFIG_ENV_OFFSET=0x400000 -+CONFIG_ENV_OFFSET_REDUND=0x440000 -+CONFIG_ENV_SIZE=0x40000 -+CONFIG_ENV_SIZE_REDUND=0x40000 ++CONFIG_ENV_IS_IN_UBI=y ++CONFIG_ENV_UBI_PART="ubi" ++CONFIG_ENV_SIZE=0x1f000 ++CONFIG_ENV_SIZE_REDUND=0x1f000 ++CONFIG_ENV_UBI_VOLUME="ubootenv" ++CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2" CONFIG_DOS_PARTITION=y CONFIG_EFI_PARTITION=y CONFIG_PARTITION_TYPE_GUID=y -@@ -46,6 +167,9 @@ CONFIG_PROT_TCP=y +@@ -46,6 +168,9 @@ CONFIG_PROT_TCP=y CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CLK=y From 59ac0440b160a007f2ad7a7e64af58be224de04e Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 8 May 2024 13:40:14 +0200 Subject: [PATCH 28/80] mediatek: convert mt7988a-rfb to keep bl31/uboot in UBI Add ubi volumes for mt7988a-rfb and support for using factory data for Ethernet MAC addresses and MT7996 WLAN calibration data. Also add rootdisk handle. Removes the need to keep using nmbm Signed-off-by: Felix Fietkau --- ...figs-add-usefull-stuff-to-mt7988-rfb.patch | 26 ++++++ .../mt7988a-rfb-spim-nand-factory.dtso | 82 +++++++++++++++++++ .../dts/mediatek/mt7988a-rfb-spim-nand.dtso | 49 ++++++----- .../base-files/lib/upgrade/platform.sh | 1 + target/linux/mediatek/image/filogic.mk | 3 +- 5 files changed, 141 insertions(+), 20 deletions(-) create mode 100644 target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand-factory.dtso diff --git a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch index 311a828a9370b7..535af4fa0956a6 100644 --- a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch +++ b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch @@ -315,3 +315,29 @@ CONFIG_MMC_HS200_SUPPORT=y CONFIG_MMC_MTK=y CONFIG_MTD=y +--- a/arch/arm/dts/mt7988-rfb.dts ++++ b/arch/arm/dts/mt7988-rfb.dts +@@ -144,6 +144,23 @@ + compatible = "spi-nand"; + reg = <0>; + spi-max-frequency = <52000000>; ++ ++ partitions { ++ compatible = "fixed-partitions"; ++ #address-cells = <1>; ++ #size-cells = <1>; ++ ++ partition@0 { ++ label = "bl2"; ++ reg = <0x0 0x200000>; ++ }; ++ ++ partition@200000 { ++ label = "ubi"; ++ reg = <0x200000 0x7e00000>; ++ compatible = "linux,ubi"; ++ }; ++ }; + }; + }; + diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand-factory.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand-factory.dtso new file mode 100644 index 00000000000000..3fe75aca361a9d --- /dev/null +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand-factory.dtso @@ -0,0 +1,82 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) + +/dts-v1/; +/plugin/; + +/ { + compatible = "mediatek,mt7988a-rfb", "mediatek,mt7988a"; + + fragment@0 { + target = <&ubi_part>; + + __overlay__ { + volumes { + ubi_factory: ubi-volume-factory { + volname = "factory"; + + nvmem-layout { + compatible = "fixed-layout"; + #address-cells = <1>; + #size-cells = <1>; + + eeprom_wmac: eeprom@0 { + reg = <0x0 0x1e00>; + }; + + gmac2_mac: eeprom@fffee { + reg = <0xfffee 0x6>; + }; + + gmac1_mac: eeprom@ffff4 { + reg = <0xffff4 0x6>; + }; + + gmac0_mac: eeprom@ffffa { + reg = <0xffffa 0x6>; + }; + }; + }; + }; + }; + }; + + fragment@1 { + target = <&pcie0>; + __overlay__ { + pcie@0,0 { + reg = <0x0000 0 0 0 0>; + + wifi@0,0 { + compatible = "mediatek,mt76"; + reg = <0x0000 0 0 0 0>; + nvmem-cell-names = "eeprom"; + nvmem-cells = <&eeprom_wmac>; + }; + }; + }; + }; + + fragment@2 { + target = <&gmac0>; + __overlay__ { + nvmem-cell-names = "mac-address"; + nvmem-cells = <&gmac0_mac>; + }; + }; + + fragment@3 { + target = <&gmac1>; + __overlay__ { + nvmem-cell-names = "mac-address"; + nvmem-cells = <&gmac1_mac>; + }; + }; + + fragment@4 { + target = <&gmac2>; + __overlay__ { + nvmem-cell-names = "mac-address"; + nvmem-cells = <&gmac2_mac>; + }; + }; +}; diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso index a9eca00d4416cb..b5a67c725bf109 100644 --- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-spim-nand.dtso @@ -23,9 +23,6 @@ spi-max-frequency = <52000000>; spi-tx-bus-width = <4>; spi-rx-bus-width = <4>; - mediatek,nmbm; - mediatek,bmt-max-ratio = <1>; - mediatek,bmt-max-reserved-blocks = <64>; partitions { compatible = "fixed-partitions"; @@ -34,31 +31,45 @@ partition@0 { label = "BL2"; - reg = <0x00000 0x0100000>; + reg = <0x00000 0x0200000>; read-only; }; - partition@100000 { - label = "u-boot-env"; - reg = <0x0100000 0x0080000>; - }; + ubi_part: partition@200000 { + label = "ubi"; + reg = <0x0200000 0x7e00000>; + compatible = "linux,ubi"; - partition@180000 { - label = "Factory"; - reg = <0x180000 0x0400000>; - }; + volumes { + ubi-volume-ubootenv { + volname = "ubootenv"; + nvmem-layout { + compatible = "u-boot,env-redundant-bool-layout"; + }; + }; - partition@580000 { - label = "FIP"; - reg = <0x580000 0x0200000>; - }; + ubi-volume-ubootenv2 { + volname = "ubootenv2"; + nvmem-layout { + compatible = "u-boot,env-redundant-bool-layout"; + }; + }; - partition@780000 { - label = "ubi"; - reg = <0x780000 0x7080000>; + ubi_root: ubi-volume-fit { + volname = "fit"; + }; + + }; }; }; }; }; }; + + fragment@1 { + target-path = "/chosen"; + __overlay__ { + rootdisk-spim-nand = <&ubi_root>; + }; + }; }; diff --git a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh index ff791a600a3442..e7b347dc5f9828 100755 --- a/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh +++ b/target/linux/mediatek/filogic/base-files/lib/upgrade/platform.sh @@ -84,6 +84,7 @@ platform_do_upgrade() { bananapi,bpi-r3-mini|\ bananapi,bpi-r4|\ bananapi,bpi-r4-poe|\ + mediatek,mt7988a-rfb|\ jdcloud,re-cp-03|\ tplink,tl-xdr4288|\ tplink,tl-xdr6086|\ diff --git a/target/linux/mediatek/image/filogic.mk b/target/linux/mediatek/image/filogic.mk index 79489558421b7c..5c2f67eb992a12 100644 --- a/target/linux/mediatek/image/filogic.mk +++ b/target/linux/mediatek/image/filogic.mk @@ -824,6 +824,7 @@ define Device/mediatek_mt7988a-rfb mt7988a-rfb-sd \ mt7988a-rfb-snfi-nand \ mt7988a-rfb-spim-nand \ + mt7988a-rfb-spim-nand-factory \ mt7988a-rfb-spim-nor \ mt7988a-rfb-eth1-aqr \ mt7988a-rfb-eth1-i2p5g-phy \ @@ -855,7 +856,7 @@ define Device/mediatek_mt7988a-rfb ARTIFACT/emmc-bl31-uboot.fip := mt7988-bl31-uboot rfb-emmc ARTIFACT/nor-preloader.bin := mt7988-bl2 nor-comb ARTIFACT/nor-bl31-uboot.fip := mt7988-bl31-uboot rfb-nor - ARTIFACT/snand-preloader.bin := mt7988-bl2 spim-nand-comb + ARTIFACT/snand-preloader.bin := mt7988-bl2 spim-nand-ubi-comb ARTIFACT/snand-bl31-uboot.fip := mt7988-bl31-uboot rfb-snand ARTIFACT/sdcard.img.gz := mt798x-gpt sdmmc |\ pad-to 17k | mt7988-bl2 sdmmc-comb |\ From ba245d6bca4724506c4003166fc768a906fca3fb Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Fri, 10 May 2024 17:39:56 +0200 Subject: [PATCH 29/80] mediatek: add firmware name for AQR PHYs on mt7988a-rfb Fixes PHY probe in case there is no firmware in a connected EEPROM Signed-off-by: Felix Fietkau --- .../arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso | 1 + .../arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso | 1 + 2 files changed, 2 insertions(+) diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso index d21a61ad19fef3..c471b9ed91da8d 100644 --- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth1-aqr.dtso @@ -22,6 +22,7 @@ phy0: ethernet-phy@0 { reg = <0>; compatible = "ethernet-phy-ieee802.3-c45"; + firmware-name = "AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2140.cld"; reset-gpios = <&pio 72 GPIO_ACTIVE_LOW>; reset-assert-us = <100000>; reset-deassert-us = <221000>; diff --git a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso index 140391fc45a8f4..1490f055b59bdb 100644 --- a/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso +++ b/target/linux/mediatek/files-6.6/arch/arm64/boot/dts/mediatek/mt7988a-rfb-eth2-aqr.dtso @@ -22,6 +22,7 @@ phy8: ethernet-phy@8 { reg = <8>; compatible = "ethernet-phy-ieee802.3-c45"; + firmware-name = "AQR-G4_v5.7.0-AQR_EVB_Generic_X3410_StdCfg_MDISwap_USX_ID46316_VER2140.cld"; reset-gpios = <&pio 71 GPIO_ACTIVE_LOW>; reset-assert-us = <100000>; reset-deassert-us = <221000>; From 65c1f0d433e89c794a6d22dbe474666c241f9e7b Mon Sep 17 00:00:00 2001 From: Yuu Toriyama Date: Sun, 19 May 2024 07:08:37 +0900 Subject: [PATCH 30/80] wireless-regdb: update to 2024.05.08 Changes: 73529a8 Revert "wireless-regdb: Update and disable 5470-5730MHz band according to TPC requirement for Singapore (SG)" 87941e4 wireless-regdb: Update regulatory rules for Taiwan (TW) on 6GHz 33797ae wireless-regdb: update regulatory database based on preceding changes Signed-off-by: Yuu Toriyama --- package/firmware/wireless-regdb/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/firmware/wireless-regdb/Makefile b/package/firmware/wireless-regdb/Makefile index a0080bdbfdb09b..5b95ec59de2dd2 100644 --- a/package/firmware/wireless-regdb/Makefile +++ b/package/firmware/wireless-regdb/Makefile @@ -1,14 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wireless-regdb -PKG_VERSION:=2024.01.23 +PKG_VERSION:=2024.05.08 PKG_RELEASE:=1 PKG_LICENSE:=ISC PKG_LICENSE_FILES:=LICENSE PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/network/wireless-regdb/ -PKG_HASH:=c8a61c9acf76fa7eb4239e89f640dee3e87098d9f69b4d3518c9c60fc6d20c55 +PKG_HASH:=9aee1d86ebebb363b714bec941b2820f31e3b7f1a485ddc9fcbd9985c7d3e7c4 PKG_MAINTAINER:=Felix Fietkau From 5d37d8dc824f4fdef690b80ceae1bde6a6f16913 Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 19 May 2024 14:58:11 +0200 Subject: [PATCH 31/80] imagebuilder: fix multiple issue with manifest and sign keys handling Fix multiple issue with manifest handling where APK was hardcoded and fix a logic error where (TODO) APK _check_keys was called for the OPKG codepath instead of correctly calling for the APK codepath. Fixes: d788ab376f85 ("build: add APK package build capabilities") Signed-off-by: Christian Marangi --- target/imagebuilder/files/Makefile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index c032306c8e2d97..7d01bc0e4201b2 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -159,7 +159,11 @@ _call_manifest: FORCE mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TMP_DIR) $(DL_DIR) $(MAKE) package_reload >/dev/null $(MAKE) package_install >/dev/null +ifeq ($(CONFIG_USE_APK),) + $(OPKG) list-installed $(if $(STRIP_ABI),--strip-abi) +else $(APK) list --quiet --manifest --no-network +endif package_index: FORCE @echo >&2 @@ -202,7 +206,11 @@ endif package_list: FORCE @$(MAKE) -s package_reload +ifeq ($(CONFIG_USE_APK),) + @$(OPKG) list --size 2>/dev/null +else @$(APK) list --size 2>/dev/null +endif package_install: FORCE @echo @@ -277,8 +285,6 @@ endif _check_keys: FORCE ifeq ($(CONFIG_USE_APK),) - # TODO -else ifneq ($(CONFIG_SIGNATURE_CHECK),) @if [ ! -s $(BUILD_KEY) -o ! -s $(BUILD_KEY).pub ]; then \ echo Generate local signing keys... >&2; \ @@ -294,6 +300,8 @@ ifneq ($(CONFIG_SIGNATURE_CHECK),) -s $(BUILD_KEY); \ fi endif +else + # TODO endif image: From f46867e5ccfa87d698bb11c4ecc9f4592890b06e Mon Sep 17 00:00:00 2001 From: Christian Marangi Date: Sun, 19 May 2024 15:03:27 +0200 Subject: [PATCH 32/80] include/rootfs: skip removal of APK cache now deprecated Skip removal of APK cache since now deprecated as APK doesn't make use of cache anymore in our configuration. Signed-off-by: Christian Marangi --- include/rootfs.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/include/rootfs.mk b/include/rootfs.mk index 907a95a794a34a..c2a32fa102dba2 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -111,7 +111,6 @@ define prepare_rootfs ) @-find $(1) -name CVS -o -name .svn -o -name .git -o -name '.#*' | $(XARGS) rm -rf - @-find $(1)/usr/cache/apk/ -name '*.apk' -delete rm -rf \ $(1)/boot \ $(1)/tmp/* \ From 70e81efe93a669ab22f08155720b09b269929c7b Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 15 May 2024 10:21:47 +0200 Subject: [PATCH 33/80] gemini: In-flight ethernet patches These patches have partial acceptance upstream and are still a WIP, now there is merge window for kernel v6.10 so these will not be reposted until that is over. In the meantime, let's add the current state to OpenWrt so the ethernet on Gemini is up and working (tested on several devices). Signed-off-by: Linus Walleij --- ...3-net-ethernet-cortina-Locking-fixes.patch | 73 +++++++++++ ...ethernet-cortina-Restore-TSO-support.patch | 124 ++++++++++++++++++ ...t-cortina-Use-TSO-also-on-common-TCP.patch | 95 ++++++++++++++ ...-cortina-Rename-adjust-link-callback.patch | 36 +++++ ...t-cortina-Use-negotiated-TX-RX-pause.patch | 46 +++++++ ...et-cortina-Implement-.set_pauseparam.patch | 46 +++++++ 6 files changed, 420 insertions(+) create mode 100644 target/linux/gemini/patches-6.6/0003-net-ethernet-cortina-Locking-fixes.patch create mode 100644 target/linux/gemini/patches-6.6/0004-net-ethernet-cortina-Restore-TSO-support.patch create mode 100644 target/linux/gemini/patches-6.6/0005-net-ethernet-cortina-Use-TSO-also-on-common-TCP.patch create mode 100644 target/linux/gemini/patches-6.6/0006-net-ethernet-cortina-Rename-adjust-link-callback.patch create mode 100644 target/linux/gemini/patches-6.6/0007-net-ethernet-cortina-Use-negotiated-TX-RX-pause.patch create mode 100644 target/linux/gemini/patches-6.6/0008-net-ethernet-cortina-Implement-.set_pauseparam.patch diff --git a/target/linux/gemini/patches-6.6/0003-net-ethernet-cortina-Locking-fixes.patch b/target/linux/gemini/patches-6.6/0003-net-ethernet-cortina-Locking-fixes.patch new file mode 100644 index 00000000000000..661e9287c09d4c --- /dev/null +++ b/target/linux/gemini/patches-6.6/0003-net-ethernet-cortina-Locking-fixes.patch @@ -0,0 +1,73 @@ +From 81889eb2b37bc21df4ff259441e8fc12d4f27cd9 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Thu, 9 May 2024 08:48:31 +0200 +Subject: [PATCH] net: ethernet: cortina: Locking fixes + +This fixes a probably long standing problem in the Cortina +Gemini ethernet driver: there are some paths in the code +where the IRQ registers are written without taking the proper +locks. + +Fixes: 4d5ae32f5e1e ("net: ethernet: Add a driver for Gemini gigabit ethernet") +Signed-off-by: Linus Walleij +--- + drivers/net/ethernet/cortina/gemini.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -1107,10 +1107,13 @@ static void gmac_tx_irq_enable(struct ne + { + struct gemini_ethernet_port *port = netdev_priv(netdev); + struct gemini_ethernet *geth = port->geth; ++ unsigned long flags; + u32 val, mask; + + netdev_dbg(netdev, "%s device %d\n", __func__, netdev->dev_id); + ++ spin_lock_irqsave(&geth->irq_lock, flags); ++ + mask = GMAC0_IRQ0_TXQ0_INTS << (6 * netdev->dev_id + txq); + + if (en) +@@ -1119,6 +1122,8 @@ static void gmac_tx_irq_enable(struct ne + val = readl(geth->base + GLOBAL_INTERRUPT_ENABLE_0_REG); + val = en ? val | mask : val & ~mask; + writel(val, geth->base + GLOBAL_INTERRUPT_ENABLE_0_REG); ++ ++ spin_unlock_irqrestore(&geth->irq_lock, flags); + } + + static void gmac_tx_irq(struct net_device *netdev, unsigned int txq_num) +@@ -1415,15 +1420,19 @@ static unsigned int gmac_rx(struct net_d + union gmac_rxdesc_3 word3; + struct page *page = NULL; + unsigned int page_offs; ++ unsigned long flags; + unsigned short r, w; + union dma_rwptr rw; + dma_addr_t mapping; + int frag_nr = 0; + ++ spin_lock_irqsave(&geth->irq_lock, flags); + rw.bits32 = readl(ptr_reg); + /* Reset interrupt as all packages until here are taken into account */ + writel(DEFAULT_Q0_INT_BIT << netdev->dev_id, + geth->base + GLOBAL_INTERRUPT_STATUS_1_REG); ++ spin_unlock_irqrestore(&geth->irq_lock, flags); ++ + r = rw.bits.rptr; + w = rw.bits.wptr; + +@@ -1726,10 +1735,9 @@ static irqreturn_t gmac_irq(int irq, voi + gmac_update_hw_stats(netdev); + + if (val & (GMAC0_RX_OVERRUN_INT_BIT << (netdev->dev_id * 8))) { ++ spin_lock(&geth->irq_lock); + writel(GMAC0_RXDERR_INT_BIT << (netdev->dev_id * 8), + geth->base + GLOBAL_INTERRUPT_STATUS_4_REG); +- +- spin_lock(&geth->irq_lock); + u64_stats_update_begin(&port->ir_stats_syncp); + ++port->stats.rx_fifo_errors; + u64_stats_update_end(&port->ir_stats_syncp); diff --git a/target/linux/gemini/patches-6.6/0004-net-ethernet-cortina-Restore-TSO-support.patch b/target/linux/gemini/patches-6.6/0004-net-ethernet-cortina-Restore-TSO-support.patch new file mode 100644 index 00000000000000..809941a95d401a --- /dev/null +++ b/target/linux/gemini/patches-6.6/0004-net-ethernet-cortina-Restore-TSO-support.patch @@ -0,0 +1,124 @@ +From 30fcba19ed88997a2909e4a68b4d39ff371357c3 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Wed, 1 May 2024 21:46:31 +0200 +Subject: [PATCH 1/5] net: ethernet: cortina: Restore TSO support + +An earlier commit deleted the TSO support in the Cortina Gemini +driver because the driver was confusing gso_size and MTU, +probably because what the Linux kernel calls "gso_size" was +called "MTU" in the datasheet. + +Restore the functionality properly reading the gso_size from +the skbuff. + +Tested with iperf3, running a server on a different machine +and client on the device with the cortina gemini ethernet: + +Connecting to host 192.168.1.2, port 5201 +60008000.ethernet-port eth0: segment offloading mss = 05ea len=1c8a +60008000.ethernet-port eth0: segment offloading mss = 05ea len=1c8a +60008000.ethernet-port eth0: segment offloading mss = 05ea len=27da +60008000.ethernet-port eth0: segment offloading mss = 05ea len=0b92 +60008000.ethernet-port eth0: segment offloading mss = 05ea len=2bda +(...) + +(The hardware MSS 0x05ea here includes the ethernet headers.) + +If I disable all segment offloading on the receiving host and +dump packets using tcpdump -xx like this: + +ethtool -K enp2s0 gro off gso off tso off +tcpdump -xx -i enp2s0 host 192.168.1.136 + +I get segmented packages such as this when running iperf3: + +23:16:54.024139 IP OpenWrt.lan.59168 > Fecusia.targus-getdata1: +Flags [.], seq 1486:2934, ack 1, win 4198, +options [nop,nop,TS val 3886192908 ecr 3601341877], length 1448 +0x0000: fc34 9701 a0c6 14d6 4da8 3c4f 0800 4500 +0x0010: 05dc 16a0 4000 4006 9aa1 c0a8 0188 c0a8 +0x0020: 0102 e720 1451 ff25 9822 4c52 29cf 8010 +0x0030: 1066 ac8c 0000 0101 080a e7a2 990c d6a8 +(...) +0x05c0: 5e49 e109 fe8c 4617 5e18 7a82 7eae d647 +0x05d0: e8ee ae64 dc88 c897 3f8a 07a4 3a33 6b1b +0x05e0: 3501 a30f 2758 cc44 4b4a + +Several such packets often follow after each other verifying +the segmentation into 0x05a8 (1448) byte packages also on the +reveiving end. As can be seen, the ethernet frames are +0x05ea (1514) in size. + +Performance with iperf3 before this patch: ~15.5 Mbit/s +Performance with iperf3 after this patch: ~175 Mbit/s + +This was running a 60 second test (twice) the best measurement +was 179 Mbit/s. + +For comparison if I run iperf3 with UDP I get around 1.05 Mbit/s +both before and after this patch. + +While this is a gigabit ethernet interface, the CPU is a cheap +D-Link DIR-685 router (based on the ARMv5 Faraday FA526 at +~50 MHz), and the software is not supposed to drive traffic, +as the device has a DSA chip, so this kind of numbers can be +expected. + +Fixes: ac631873c9e7 ("net: ethernet: cortina: Drop TSO support") +Reviewed-by: Eric Dumazet +Signed-off-by: Linus Walleij +--- + drivers/net/ethernet/cortina/gemini.c | 23 +++++++++++++++++++---- + 1 file changed, 19 insertions(+), 4 deletions(-) + +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -79,7 +79,8 @@ MODULE_PARM_DESC(debug, "Debug level (0= + #define GMAC0_IRQ4_8 (GMAC0_MIB_INT_BIT | GMAC0_RX_OVERRUN_INT_BIT) + + #define GMAC_OFFLOAD_FEATURES (NETIF_F_SG | NETIF_F_IP_CSUM | \ +- NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM) ++ NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM | \ ++ NETIF_F_TSO | NETIF_F_TSO_ECN | NETIF_F_TSO6) + + /** + * struct gmac_queue_page - page buffer per-page info +@@ -1148,13 +1149,25 @@ static int gmac_map_tx_bufs(struct net_d + skb_frag_t *skb_frag; + dma_addr_t mapping; + void *buffer; ++ u16 mss; + int ret; + +- /* TODO: implement proper TSO using MTU in word3 */ + word1 = skb->len; + word3 = SOF_BIT; + +- if (skb->len >= ETH_FRAME_LEN) { ++ mss = skb_shinfo(skb)->gso_size; ++ if (mss) { ++ /* This means we are dealing with TCP and skb->len is the ++ * sum total of all the segments. The TSO will deal with ++ * chopping this up for us. ++ */ ++ /* The accelerator needs the full frame size here */ ++ mss += skb_tcp_all_headers(skb); ++ netdev_dbg(netdev, "segment offloading mss = %04x len=%04x\n", ++ mss, skb->len); ++ word1 |= TSS_MTU_ENABLE_BIT; ++ word3 |= mss; ++ } else if (skb->len >= ETH_FRAME_LEN) { + /* Hardware offloaded checksumming isn't working on frames + * bigger than 1514 bytes. A hypothesis about this is that the + * checksum buffer is only 1518 bytes, so when the frames get +@@ -1169,7 +1182,9 @@ static int gmac_map_tx_bufs(struct net_d + return ret; + } + word1 |= TSS_BYPASS_BIT; +- } else if (skb->ip_summed == CHECKSUM_PARTIAL) { ++ } ++ ++ if (skb->ip_summed == CHECKSUM_PARTIAL) { + int tcp = 0; + + /* We do not switch off the checksumming on non TCP/UDP diff --git a/target/linux/gemini/patches-6.6/0005-net-ethernet-cortina-Use-TSO-also-on-common-TCP.patch b/target/linux/gemini/patches-6.6/0005-net-ethernet-cortina-Use-TSO-also-on-common-TCP.patch new file mode 100644 index 00000000000000..c690b8fddb391c --- /dev/null +++ b/target/linux/gemini/patches-6.6/0005-net-ethernet-cortina-Use-TSO-also-on-common-TCP.patch @@ -0,0 +1,95 @@ +From 91fb8a7328dda827bc6c0da240a1eb17028416cd Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Thu, 9 May 2024 23:59:28 +0200 +Subject: [PATCH 2/5] net: ethernet: cortina: Use TSO also on common TCP + +It is possible to push the segment offloader to also +process non-segmented frames: just pass the skb->len +or desired MSS to the offloader and it will handle them. + +This is especially good if the user sets up the MTU +and the frames get big, because the checksumming engine +cannot handle any frames bigger than 1518 bytes, so +segmenting them all to be at max that will be helpful +for the hardware, which only need to quirk odd frames +such as big UDP ping packets. + +The vendor driver always uses the TSO like this, and +the driver seems more stable after this, so apparently +the hardware may have been engineered to always use +the TSO on anything it can handle. + +Signed-off-by: Linus Walleij +--- + drivers/net/ethernet/cortina/gemini.c | 31 +++++++++++++++++++++------ + 1 file changed, 24 insertions(+), 7 deletions(-) + +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -1148,6 +1148,7 @@ static int gmac_map_tx_bufs(struct net_d + struct gmac_txdesc *txd; + skb_frag_t *skb_frag; + dma_addr_t mapping; ++ bool tcp = false; + void *buffer; + u16 mss; + int ret; +@@ -1155,6 +1156,13 @@ static int gmac_map_tx_bufs(struct net_d + word1 = skb->len; + word3 = SOF_BIT; + ++ /* Determine if we are doing TCP */ ++ if (skb->protocol == htons(ETH_P_IP)) ++ tcp = (ip_hdr(skb)->protocol == IPPROTO_TCP); ++ else ++ /* IPv6 */ ++ tcp = (ipv6_hdr(skb)->nexthdr == IPPROTO_TCP); ++ + mss = skb_shinfo(skb)->gso_size; + if (mss) { + /* This means we are dealing with TCP and skb->len is the +@@ -1167,6 +1175,20 @@ static int gmac_map_tx_bufs(struct net_d + mss, skb->len); + word1 |= TSS_MTU_ENABLE_BIT; + word3 |= mss; ++ } else if (tcp) { ++ /* Even if we are not using TSO, use the segment offloader ++ * for transferring the TCP frame: the TSO engine will deal ++ * with chopping up frames that exceed ETH_DATA_LEN which ++ * the checksumming engine cannot handle (see below) into ++ * manageable chunks. It flawlessly deals with quite big ++ * frames and frames containing custom DSA EtherTypes. ++ */ ++ mss = netdev->mtu + skb_tcp_all_headers(skb); ++ mss = min(mss, skb->len); ++ netdev_dbg(netdev, "botched TSO len %04x mtu %04x mss %04x\n", ++ skb->len, netdev->mtu, mss); ++ word1 |= TSS_MTU_ENABLE_BIT; ++ word3 |= mss; + } else if (skb->len >= ETH_FRAME_LEN) { + /* Hardware offloaded checksumming isn't working on frames + * bigger than 1514 bytes. A hypothesis about this is that the +@@ -1185,21 +1207,16 @@ static int gmac_map_tx_bufs(struct net_d + } + + if (skb->ip_summed == CHECKSUM_PARTIAL) { +- int tcp = 0; +- + /* We do not switch off the checksumming on non TCP/UDP + * frames: as is shown from tests, the checksumming engine + * is smart enough to see that a frame is not actually TCP + * or UDP and then just pass it through without any changes + * to the frame. + */ +- if (skb->protocol == htons(ETH_P_IP)) { ++ if (skb->protocol == htons(ETH_P_IP)) + word1 |= TSS_IP_CHKSUM_BIT; +- tcp = ip_hdr(skb)->protocol == IPPROTO_TCP; +- } else { /* IPv6 */ ++ else + word1 |= TSS_IPV6_ENABLE_BIT; +- tcp = ipv6_hdr(skb)->nexthdr == IPPROTO_TCP; +- } + + word1 |= tcp ? TSS_TCP_CHKSUM_BIT : TSS_UDP_CHKSUM_BIT; + } diff --git a/target/linux/gemini/patches-6.6/0006-net-ethernet-cortina-Rename-adjust-link-callback.patch b/target/linux/gemini/patches-6.6/0006-net-ethernet-cortina-Rename-adjust-link-callback.patch new file mode 100644 index 00000000000000..bbdef8fefc2b53 --- /dev/null +++ b/target/linux/gemini/patches-6.6/0006-net-ethernet-cortina-Rename-adjust-link-callback.patch @@ -0,0 +1,36 @@ +From fa01c904b844e6033445f75b0b4d46a8e83b6086 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Fri, 10 May 2024 19:48:27 +0200 +Subject: [PATCH 3/5] net: ethernet: cortina: Rename adjust link callback + +The callback passed to of_phy_get_and_connect() in the +Cortina Gemini driver is called "gmac_speed_set" which is +archaic, rename it to "gmac_adjust_link" following the +pattern of most other drivers. + +Reviewed-by: Andrew Lunn +Signed-off-by: Linus Walleij +--- + drivers/net/ethernet/cortina/gemini.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -288,7 +288,7 @@ static void gmac_set_flow_control(struct + spin_unlock_irqrestore(&port->config_lock, flags); + } + +-static void gmac_speed_set(struct net_device *netdev) ++static void gmac_adjust_link(struct net_device *netdev) + { + struct gemini_ethernet_port *port = netdev_priv(netdev); + struct phy_device *phydev = netdev->phydev; +@@ -367,7 +367,7 @@ static int gmac_setup_phy(struct net_dev + + phy = of_phy_get_and_connect(netdev, + dev->of_node, +- gmac_speed_set); ++ gmac_adjust_link); + if (!phy) + return -ENODEV; + netdev->phydev = phy; diff --git a/target/linux/gemini/patches-6.6/0007-net-ethernet-cortina-Use-negotiated-TX-RX-pause.patch b/target/linux/gemini/patches-6.6/0007-net-ethernet-cortina-Use-negotiated-TX-RX-pause.patch new file mode 100644 index 00000000000000..a1b8707f72500d --- /dev/null +++ b/target/linux/gemini/patches-6.6/0007-net-ethernet-cortina-Use-negotiated-TX-RX-pause.patch @@ -0,0 +1,46 @@ +From 50ac9765c674bac803719c6b8294670edc6df31d Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Fri, 10 May 2024 19:44:39 +0200 +Subject: [PATCH 4/5] net: ethernet: cortina: Use negotiated TX/RX pause + +Instead of directly poking into registers of the PHY, use +the existing function to query phylib about this directly. + +Suggested-by: Andrew Lunn +Reviewed-by: Andrew Lunn +Signed-off-by: Linus Walleij +--- + drivers/net/ethernet/cortina/gemini.c | 15 +++++---------- + 1 file changed, 5 insertions(+), 10 deletions(-) + +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -293,8 +293,8 @@ static void gmac_adjust_link(struct net_ + struct gemini_ethernet_port *port = netdev_priv(netdev); + struct phy_device *phydev = netdev->phydev; + union gmac_status status, old_status; +- int pause_tx = 0; +- int pause_rx = 0; ++ bool pause_tx = false; ++ bool pause_rx = false; + + status.bits32 = readl(port->gmac_base + GMAC_STATUS); + old_status.bits32 = status.bits32; +@@ -329,14 +329,9 @@ static void gmac_adjust_link(struct net_ + } + + if (phydev->duplex == DUPLEX_FULL) { +- u16 lcladv = phy_read(phydev, MII_ADVERTISE); +- u16 rmtadv = phy_read(phydev, MII_LPA); +- u8 cap = mii_resolve_flowctrl_fdx(lcladv, rmtadv); +- +- if (cap & FLOW_CTRL_RX) +- pause_rx = 1; +- if (cap & FLOW_CTRL_TX) +- pause_tx = 1; ++ phy_get_pause(phydev, &pause_tx, &pause_rx); ++ netdev_dbg(netdev, "set negotiated pause params pause TX = %s, pause RX = %s\n", ++ pause_tx ? "ON" : "OFF", pause_rx ? "ON" : "OFF"); + } + + gmac_set_flow_control(netdev, pause_tx, pause_rx); diff --git a/target/linux/gemini/patches-6.6/0008-net-ethernet-cortina-Implement-.set_pauseparam.patch b/target/linux/gemini/patches-6.6/0008-net-ethernet-cortina-Implement-.set_pauseparam.patch new file mode 100644 index 00000000000000..ad7594e855c722 --- /dev/null +++ b/target/linux/gemini/patches-6.6/0008-net-ethernet-cortina-Implement-.set_pauseparam.patch @@ -0,0 +1,46 @@ +From 4eed4b87f17d10b7586349c13c3a30f9c24c9ba4 Mon Sep 17 00:00:00 2001 +From: Linus Walleij +Date: Wed, 8 May 2024 23:21:17 +0200 +Subject: [PATCH 5/5] net: ethernet: cortina: Implement .set_pauseparam() + +The Cortina Gemini ethernet can very well set up TX or RX +pausing, so add this functionality to the driver in a +.set_pauseparam() callback. Essentially just call down to +phylib and let phylib deal with this, .adjust_link() +will respect the setting from phylib. + +Signed-off-by: Linus Walleij +--- + drivers/net/ethernet/cortina/gemini.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +--- a/drivers/net/ethernet/cortina/gemini.c ++++ b/drivers/net/ethernet/cortina/gemini.c +@@ -2143,6 +2143,19 @@ static void gmac_get_pauseparam(struct n + pparam->autoneg = true; + } + ++static int gmac_set_pauseparam(struct net_device *netdev, ++ struct ethtool_pauseparam *pparam) ++{ ++ struct phy_device *phydev = netdev->phydev; ++ ++ if (!pparam->autoneg) ++ return -EOPNOTSUPP; ++ ++ phy_set_asym_pause(phydev, pparam->rx_pause, pparam->tx_pause); ++ ++ return 0; ++} ++ + static void gmac_get_ringparam(struct net_device *netdev, + struct ethtool_ringparam *rp, + struct kernel_ethtool_ringparam *kernel_rp, +@@ -2263,6 +2276,7 @@ static const struct ethtool_ops gmac_351 + .set_link_ksettings = gmac_set_ksettings, + .nway_reset = gmac_nway_reset, + .get_pauseparam = gmac_get_pauseparam, ++ .set_pauseparam = gmac_set_pauseparam, + .get_ringparam = gmac_get_ringparam, + .set_ringparam = gmac_set_ringparam, + .get_coalesce = gmac_get_coalesce, From 2b8e875a85802f6281df134e2231308f6c928796 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 8 May 2024 22:04:55 +0100 Subject: [PATCH 34/80] linux-firmware: realtek: update rtl8821ae firmware A newer version, rtl8821aefw_29.bin, has been available for over 7 years [1]. Let's use it. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit?id=f70e4df2b384d21e36a7c30a591639592692e0ec Signed-off-by: Rui Salvaterra --- package/firmware/linux-firmware/realtek.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk index cd64d79d632a55..e0707251603c70 100644 --- a/package/firmware/linux-firmware/realtek.mk +++ b/package/firmware/linux-firmware/realtek.mk @@ -136,7 +136,7 @@ $(eval $(call BuildPackage,rtl8761bu-firmware)) Package/rtl8821ae-firmware = $(call Package/firmware-default,RealTek RTL8821AE firmware,,LICENCE.rtlwifi_firmware.txt) define Package/rtl8821ae-firmware/install $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi - $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8821aefw.bin $(1)/lib/firmware/rtlwifi + $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8821aefw_29.bin $(1)/lib/firmware/rtlwifi $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8821aefw_wowlan.bin $(1)/lib/firmware/rtlwifi endef $(eval $(call BuildPackage,rtl8821ae-firmware)) From c1e0f99ef8066b4a5032409b7e81516fed166008 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 20 May 2024 18:08:28 +0300 Subject: [PATCH 35/80] apk: disable rootfs repositories during build Since we set the root for APK it tries to use those during the build, which shouldn't happen since local package are used instead. Disable the repositories by manually setting an empty repository. Signed-off-by: Paul Spooren --- include/rootfs.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/include/rootfs.mk b/include/rootfs.mk index c2a32fa102dba2..9fb7d8cfdfe86c 100644 --- a/include/rootfs.mk +++ b/include/rootfs.mk @@ -47,6 +47,7 @@ apk = \ IPKG_INSTROOT=$(1) \ $(FAKEROOT) $(STAGING_DIR_HOST)/bin/apk \ --root $(1) \ + --repositories-file /dev/zero \ --keys-dir $(TOPDIR) \ --no-cache \ --no-logfile \ From 5a5d12695489141e1e99552e525bc00aa963c2e1 Mon Sep 17 00:00:00 2001 From: Paul Spooren Date: Mon, 20 May 2024 18:10:42 +0300 Subject: [PATCH 36/80] apk: update to latest HEAD 2024-05-19 Upstream refactoring caused some mbedtls issues, now fixed again. Signed-off-by: Paul Spooren --- package/system/apk/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/system/apk/Makefile b/package/system/apk/Makefile index 332596719f5182..c208144f2efffd 100644 --- a/package/system/apk/Makefile +++ b/package/system/apk/Makefile @@ -5,9 +5,9 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://gitlab.alpinelinux.org/alpine/apk-tools.git PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2024-05-18 -PKG_SOURCE_VERSION:=a6ce0a1be1a42a5cf4136eb0db5ea95168ee73fe -PKG_MIRROR_HASH:=a5f59907cd742ec12f31f42910ea9a6ecfaf91e18218a7888836a01cfa272a72 +PKG_SOURCE_DATE:=2024-05-19 +PKG_SOURCE_VERSION:=825681118d05ca5801c6b3852a70a42499e57def +PKG_MIRROR_HASH:=adc07e3320e8d780bbbd3d95d3c6c6ce259f3dbf97ab0a4ff9dc4853af21e04f PKG_VERSION=3.0.0_pre$(subst -,,$(PKG_SOURCE_DATE)) From 59ef42ad7399e22fa3c9cbd341f3407a7d6c9a5b Mon Sep 17 00:00:00 2001 From: bitthief Date: Tue, 19 Jul 2022 19:52:34 +0300 Subject: [PATCH 37/80] feeds: use forked bitthief/nss-packages Signed-off-by: bitthief --- feeds.conf.default | 1 + 1 file changed, 1 insertion(+) diff --git a/feeds.conf.default b/feeds.conf.default index fc679335e0e47f..e0bad42753507c 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -2,6 +2,7 @@ src-git packages https://git.openwrt.org/feed/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git +src-git nss_packages https://github.com/bitthief/nss-packages.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git #src-git oldpackages http://git.openwrt.org/packages.git From 3ec5d2466e46c9af17bd3c78775b372a0495e9ff Mon Sep 17 00:00:00 2001 From: bitthief Date: Tue, 18 Jul 2023 01:51:06 +0300 Subject: [PATCH 38/80] qualcommax: crypto, ktls, netfilter, misc. Signed-off-by: bitthief Co-Developed-by: Sean Khan --- .../linux/qualcommax/ipq807x/config-default | 96 +++++++++++++++++++ 1 file changed, 96 insertions(+) diff --git a/target/linux/qualcommax/ipq807x/config-default b/target/linux/qualcommax/ipq807x/config-default index 18483d05b449a2..68a750e6edb4ac 100644 --- a/target/linux/qualcommax/ipq807x/config-default +++ b/target/linux/qualcommax/ipq807x/config-default @@ -1,9 +1,92 @@ CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y +CONFIG_ARM_QCOM_CPUFREQ_HW=y +CONFIG_ASN1=y +CONFIG_ASN1_ENCODER=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_ASYMMETRIC_KEY_TYPE=y +# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set +CONFIG_AT803X_PHY=y +CONFIG_BPFILTER=y +CONFIG_BPFILTER_UMH=m +CONFIG_CLZ_TAB=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CRYPTO_AES_ARM64=y +CONFIG_CRYPTO_AES_ARM64_BS=y +CONFIG_CRYPTO_AES_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_AES_ARM64_CE_CCM=y +CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y +CONFIG_CRYPTO_BLAKE2B=y +CONFIG_CRYPTO_BLAKE2S=y +CONFIG_CRYPTO_CFB=y +CONFIG_CRYPTO_CHACHA20=y +CONFIG_CRYPTO_CHACHA20POLY1305=y +CONFIG_CRYPTO_CHACHA20_NEON=y +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_CRCT10DIF=y +CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y +CONFIG_CRYPTO_CRYPTD=y +CONFIG_CRYPTO_CURVE25519=y +CONFIG_CRYPTO_DH=y +CONFIG_CRYPTO_DH_RFC7919_GROUPS=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_ECC=y +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y +CONFIG_CRYPTO_ECRDSA=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_GHASH_ARM64_CE=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_KEYWRAP=y +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y +CONFIG_CRYPTO_LIB_SM4=y +CONFIG_CRYPTO_LRW=y +CONFIG_CRYPTO_MD4=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_NHPOLY1305_NEON=y +CONFIG_CRYPTO_OFB=y +CONFIG_CRYPTO_POLY1305=y +CONFIG_CRYPTO_POLY1305_NEON=y +CONFIG_CRYPTO_POLYVAL_ARM64_CE=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_RSA=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_SHA256_ARM64=y +CONFIG_CRYPTO_SHA3=y +CONFIG_CRYPTO_SHA3_ARM64=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_SHA512_ARM64=y +CONFIG_CRYPTO_SHA512_ARM64_CE=y +CONFIG_CRYPTO_SIMD=y +CONFIG_CRYPTO_SM2=y +CONFIG_CRYPTO_SM3=y +CONFIG_CRYPTO_SM3_ARM64_CE=y +CONFIG_CRYPTO_SM3_NEON=y +CONFIG_CRYPTO_SM4_ARM64_CE=y +CONFIG_CRYPTO_SM4_ARM64_CE_BLK=y +CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=y +CONFIG_CRYPTO_STREEBOG=y +CONFIG_CRYPTO_XXHASH=y CONFIG_DT_IDLE_GENPD=y +CONFIG_IP6_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IPQ_GCC_8074=y # CONFIG_MFD_HI6421_SPMI is not set CONFIG_MFD_SPMI_PMIC=y +CONFIG_MPILIB=y # CONFIG_NVMEM_SPMI_SDAM is not set +CONFIG_OID_REGISTRY=y CONFIG_PINCTRL_IPQ8074=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y # CONFIG_PM8916_WATCHDOG is not set @@ -13,9 +96,14 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y CONFIG_QCOM_APM=y # CONFIG_QCOM_COINCELL is not set CONFIG_QCOM_GDSC=y +# CONFIG_QCOM_IPA is not set +CONFIG_QCOM_QFPROM=y +# CONFIG_QCOM_QMI_HELPERS is not set CONFIG_QCOM_SPMI_ADC5=y # CONFIG_QCOM_SPMI_RRADC is not set CONFIG_QCOM_VADC_COMMON=y +CONFIG_QCOM_WCNSS_CTRL=y +CONFIG_QCOM_WCNSS_PIL=y CONFIG_REGMAP_SPMI=y CONFIG_REGULATOR_CPR3=y # CONFIG_REGULATOR_CPR3_NPU is not set @@ -23,8 +111,16 @@ CONFIG_REGULATOR_CPR4_APSS=y # CONFIG_REGULATOR_QCOM_LABIBB is not set CONFIG_REGULATOR_QCOM_SPMI=y # CONFIG_REGULATOR_QCOM_USB_VBUS is not set +CONFIG_RESET_QCOM_AOSS=y +CONFIG_RESET_QCOM_PDC=y CONFIG_RTC_DRV_PM8XXX=y +# CONFIG_SCHED_CLUSTER is not set +CONFIG_SCHED_CORE=y CONFIG_SPMI=y # CONFIG_SPMI_HISI3670 is not set CONFIG_SPMI_MSM_PMIC_ARB=y # CONFIG_SPMI_PMIC_CLKDIV is not set +CONFIG_TLS=y +CONFIG_TLS_DEVICE=y +# CONFIG_TLS_TOE is not set +CONFIG_XOR_BLOCKS=y From 47fb940298379e66e0c3aa1f783c0f79554f9c4b Mon Sep 17 00:00:00 2001 From: bitthief Date: Sat, 4 Feb 2023 01:30:08 +0200 Subject: [PATCH 39/80] nat46: patches for QCA NSS ECM Signed-off-by: bitthief package: kernel: nat46: add kernel 6.1 support Signed-off-by: bitthief Co-Developed-by: Sean Khan --- package/kernel/nat46/Makefile | 10 +- .../kernel/nat46/patches/101-skb-reset.patch | 30 + package/kernel/nat46/patches/102-mapt.patch | 209 ++++++ package/kernel/nat46/patches/103-tos.patch | 39 ++ package/kernel/nat46/patches/104-icmp.patch | 439 ++++++++++++ .../patches/105-longest-prefix-match.patch | 640 ++++++++++++++++++ .../nat46/patches/106-dummy_header.patch | 104 +++ package/kernel/nat46/patches/107-stats.patch | 136 ++++ .../kernel/nat46/patches/108-ce_port.patch | 134 ++++ ...agment_if_not_df_and_larger_than_mtu.patch | 30 + .../patches/110-icmp_error_not_handled.patch | 100 +++ .../111-fix_null_point_reference.patch | 40 ++ .../nat46/patches/112-fix_icmp_crash.patch | 40 ++ .../patches/116-rate-limit-the-print.patch | 34 + .../patches/117-fix-icmp-no-payload-bug.patch | 34 + .../nat46/patches/118-performance_fix.patch | 415 ++++++++++++ .../patches/120-sleeping_backtrace.patch | 57 ++ .../kernel/nat46/patches/121-tos-fix.patch | 27 + 18 files changed, 2517 insertions(+), 1 deletion(-) create mode 100644 package/kernel/nat46/patches/101-skb-reset.patch create mode 100644 package/kernel/nat46/patches/102-mapt.patch create mode 100644 package/kernel/nat46/patches/103-tos.patch create mode 100644 package/kernel/nat46/patches/104-icmp.patch create mode 100644 package/kernel/nat46/patches/105-longest-prefix-match.patch create mode 100644 package/kernel/nat46/patches/106-dummy_header.patch create mode 100644 package/kernel/nat46/patches/107-stats.patch create mode 100644 package/kernel/nat46/patches/108-ce_port.patch create mode 100644 package/kernel/nat46/patches/109-fragment_if_not_df_and_larger_than_mtu.patch create mode 100644 package/kernel/nat46/patches/110-icmp_error_not_handled.patch create mode 100644 package/kernel/nat46/patches/111-fix_null_point_reference.patch create mode 100644 package/kernel/nat46/patches/112-fix_icmp_crash.patch create mode 100644 package/kernel/nat46/patches/116-rate-limit-the-print.patch create mode 100644 package/kernel/nat46/patches/117-fix-icmp-no-payload-bug.patch create mode 100644 package/kernel/nat46/patches/118-performance_fix.patch create mode 100644 package/kernel/nat46/patches/120-sleeping_backtrace.patch create mode 100644 package/kernel/nat46/patches/121-tos-fix.patch diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile index 296ef5a058e83e..32ea3a4516d4e0 100644 --- a/package/kernel/nat46/Makefile +++ b/package/kernel/nat46/Makefile @@ -12,6 +12,8 @@ PKG_SOURCE_VERSION:=4c5beee236841724219598fabb1edc93d4f08ce5 PKG_MAINTAINER:=Hans Dedecker PKG_LICENSE:=GPL-2.0 +PKG_BUILD_PARALLEL:=1 + include $(INCLUDE_DIR)/package.mk define KernelPackage/nat46 @@ -25,11 +27,17 @@ endef include $(INCLUDE_DIR)/kernel-defaults.mk +define Build/InstallDev + mkdir -p -m 0777 $(STAGING_DIR)/usr/include/nat46 + $(CP) $(PKG_BUILD_DIR)/nat46/modules/*.h $(STAGING_DIR)/usr/include/nat46/ +endef + define Build/Compile - $(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/nat46/modules" \ + +$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/nat46/modules" \ MODFLAGS="-DMODULE -mlong-calls" \ EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \ modules + cp $(PKG_BUILD_DIR)/nat46/modules/Module.symvers $(PKG_BUILD_DIR)/Module.symvers endef $(eval $(call KernelPackage,nat46)) diff --git a/package/kernel/nat46/patches/101-skb-reset.patch b/package/kernel/nat46/patches/101-skb-reset.patch new file mode 100644 index 00000000000000..14cf2d75a07d88 --- /dev/null +++ b/package/kernel/nat46/patches/101-skb-reset.patch @@ -0,0 +1,30 @@ +Author: Pavithra R +Date: Sun Sep 20 13:33:42 2020 +0530 + +nat46: Add skb_ext_reset to reset skb extensions + +This patch adds support to reset the skb extensions before +resetting the netfilter. Without the change, conntrack +is in invalid state and traffic gets dropped. + +Change-Id: I24ee6fe8a9a9dec09d61d8e716fff587f65e4e4f +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -1710,6 +1710,7 @@ int nat46_ipv6_input(struct sk_buff *old + #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) + nf_reset(new_skb); + #else ++ skb_ext_reset(new_skb); + nf_reset_ct(new_skb); + #endif + +@@ -1936,6 +1937,7 @@ int nat46_ipv4_input(struct sk_buff *old + #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) + nf_reset(new_skb); + #else ++ skb_ext_reset(new_skb); + nf_reset_ct(new_skb); + #endif + diff --git a/package/kernel/nat46/patches/102-mapt.patch b/package/kernel/nat46/patches/102-mapt.patch new file mode 100644 index 00000000000000..1e83481c967f8b --- /dev/null +++ b/package/kernel/nat46/patches/102-mapt.patch @@ -0,0 +1,209 @@ +Author: Pavithra R +Date: Sat Aug 1 13:27:20 2020 +0530 + +nat46: Export APIs for acceleration engine support in nat46 for kernel 5.4 + +This patch is propagated from kernel 4.4 commit +861e64a607fd22d5af089cf56539f42a2e31d581 + +The patch defines and exports APIs in nat46 to be used for accelaration. + +Change-Id: I7934b15544953f870d3595b8b359433b4fff7c30 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -1497,7 +1497,6 @@ static uint16_t nat46_fixup_icmp_dest_un + return 0; + } + +- + /* Fixup ICMP->ICMP6 before IP header translation, according to http://tools.ietf.org/html/rfc6145 */ + + static uint16_t nat46_fixup_icmp(nat46_instance_t *nat46, struct iphdr *iph, struct sk_buff *old_skb) { +@@ -1579,6 +1578,10 @@ int pairs_xlate_v6_to_v4_outer(nat46_ins + return ( (xlate_src >= 0) && (xlate_dst >= 0) ); + } + ++int xlate_6_to_4(struct net_device *dev, struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr) { ++ return pairs_xlate_v6_to_v4_outer(netdev_nat46_instance(dev), ip6h, proto, pv4saddr, pv4daddr); ++} ++EXPORT_SYMBOL(xlate_6_to_4); + + int nat46_ipv6_input(struct sk_buff *old_skb) { + struct ipv6hdr *ip6h = ipv6_hdr(old_skb); +@@ -1733,6 +1736,10 @@ int nat46_ipv6_input(struct sk_buff *old + + nat46debug(5, "about to send v4 packet, flags: %02x", IPCB(new_skb)->flags); + nat46_netdev_count_xmit(new_skb, old_skb->dev); ++ ++ /* set skb->iif */ ++ new_skb->skb_iif = old_skb->skb_iif; ++ + netif_rx(new_skb); + + /* TBD: should copy be released here? */ +@@ -1841,6 +1848,10 @@ int pairs_xlate_v4_to_v6_outer(nat46_ins + return 0; + } + ++int xlate_4_to_6(struct net_device *dev, struct iphdr *hdr4, uint16_t sport, uint16_t dport, void *v6saddr, void *v6daddr) { ++ return pairs_xlate_v4_to_v6_outer(netdev_nat46_instance(dev), hdr4, &sport, &dport, v6saddr, v6daddr); ++} ++EXPORT_SYMBOL(xlate_4_to_6); + + int nat46_ipv4_input(struct sk_buff *old_skb) { + nat46_instance_t *nat46 = get_nat46_instance(old_skb); +@@ -1981,6 +1992,10 @@ int nat46_ipv4_input(struct sk_buff *old + + nat46debug(5, "about to send v6 packet, flags: %02x", IP6CB(new_skb)->flags); + nat46_netdev_count_xmit(new_skb, old_skb->dev); ++ ++ /* set skb->iif */ ++ new_skb->skb_iif = old_skb->skb_iif; ++ + netif_rx(new_skb); + + done: +@@ -1988,4 +2003,22 @@ done: + return err; + } + ++int nat46_get_npairs(struct net_device *dev) { ++ nat46_instance_t *nat46 = netdev_nat46_instance(dev); ++ return nat46->npairs; ++} ++EXPORT_SYMBOL(nat46_get_npairs); + ++bool nat46_get_rule_config(struct net_device *dev, nat46_xlate_rulepair_t **nat46_rule_pair, int *count) { ++ nat46_instance_t *nat46 = netdev_nat46_instance(dev); ++ if (nat46->npairs < 1) { ++ /* ++ * no rules ? ++ */ ++ return false; ++ } ++ *count = nat46->npairs; ++ *nat46_rule_pair = nat46->pairs; ++ return true; ++} ++EXPORT_SYMBOL(nat46_get_rule_config); +--- a/nat46/modules/nat46-core.h ++++ b/nat46/modules/nat46-core.h +@@ -42,18 +42,18 @@ typedef enum { + #define NAT46_SIGNATURE 0x544e3634 + #define FREED_NAT46_SIGNATURE 0xdead544e + +-typedef struct { ++typedef struct nat46_xlate_rule { + nat46_xlate_style_t style; + struct in6_addr v6_pref; +- int v6_pref_len; +- u32 v4_pref; +- int v4_pref_len; +- int ea_len; +- int psid_offset; +- int fmr_flag; ++ int v6_pref_len; ++ u32 v4_pref; ++ int v4_pref_len; ++ int ea_len; ++ int psid_offset; ++ int fmr_flag; + } nat46_xlate_rule_t; + +-typedef struct { ++typedef struct nat46_xlate_rulepair { + nat46_xlate_rule_t local; + nat46_xlate_rule_t remote; + } nat46_xlate_rulepair_t; +@@ -82,4 +82,9 @@ nat46_instance_t *get_nat46_instance(str + nat46_instance_t *alloc_nat46_instance(int npairs, nat46_instance_t *old, int from_ipair, int to_ipair, int remove_ipair); + void release_nat46_instance(nat46_instance_t *nat46); + ++int xlate_6_to_4(struct net_device *dev, struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr); ++int xlate_4_to_6(struct net_device *dev, struct iphdr *hdr4, uint16_t sport, uint16_t dport, void *v6saddr, void *v6daddr); ++bool nat46_get_rule_config(struct net_device *dev, nat46_xlate_rulepair_t **nat46_rule_pair, int *count); ++int nat46_get_npairs(struct net_device *dev); ++ + #endif +--- a/nat46/modules/nat46-netdev.c ++++ b/nat46/modules/nat46-netdev.c +@@ -24,10 +24,12 @@ + #include + #include + #include ++#include + #include "nat46-core.h" + #include "nat46-module.h" + + #define NETDEV_DEFAULT_NAME "nat46." ++static RADIX_TREE(netdev_tree, GFP_ATOMIC); + + typedef struct { + u32 sig; +@@ -83,6 +85,18 @@ void nat46_netdev_count_xmit(struct sk_b + dev->stats.tx_bytes += skb->len; + } + ++void nat46_update_stats(struct net_device *dev, uint32_t rx_packets, uint32_t rx_bytes, ++ uint32_t tx_packets, uint32_t tx_bytes, uint32_t rx_dropped, uint32_t tx_dropped) ++{ ++ dev->stats.rx_packets += rx_packets; ++ dev->stats.rx_bytes += rx_bytes; ++ dev->stats.tx_packets += tx_packets; ++ dev->stats.tx_bytes += tx_bytes; ++ dev->stats.rx_dropped += rx_dropped; ++ dev->stats.tx_dropped += tx_dropped; ++} ++EXPORT_SYMBOL(nat46_update_stats); ++ + void *netdev_nat46_instance(struct net_device *dev) { + nat46_netdev_priv_t *priv = netdev_priv(dev); + return priv->nat46; +@@ -159,6 +173,11 @@ int nat46_netdev_create(char *basename, + printk("nat46: netdevice nat46 '%s' created successfully.\n", devname); + kfree(devname); + ++ /* ++ * add this netdevice to list ++ */ ++ radix_tree_insert(&netdev_tree, (*dev)->ifindex, (void *)*dev); ++ + return 0; + + err_register_dev: +@@ -175,10 +194,24 @@ void nat46_netdev_destroy(struct net_dev + netif_stop_queue(dev); + netdev_nat46_set_instance(dev, NULL); + unregister_netdev(dev); ++ radix_tree_delete(&netdev_tree, dev->ifindex); + free_netdev(dev); + printk("nat46: Destroying nat46 device.\n"); + } + ++bool is_map_t_dev(struct net_device *dev) ++{ ++ if(!dev) { ++ return false; ++ } ++ ++ if(radix_tree_lookup(&netdev_tree, dev->ifindex)) { ++ return true; ++ } ++ return false; ++} ++EXPORT_SYMBOL(is_map_t_dev); ++ + static int is_nat46(struct net_device *dev) { + nat46_netdev_priv_t *priv = netdev_priv(dev); + return (priv && (NAT46_DEVICE_SIGNATURE == priv->sig)); +--- a/nat46/modules/nat46-netdev.h ++++ b/nat46/modules/nat46-netdev.h +@@ -26,3 +26,6 @@ void nat64_show_all_configs(struct seq_f + void nat46_netdev_count_xmit(struct sk_buff *skb, struct net_device *dev); + void *netdev_nat46_instance(struct net_device *dev); + ++void nat46_update_stats(struct net_device *dev, uint32_t rx_packets, uint32_t rx_bytes, uint32_t tx_packets, uint32_t tx_bytes, ++ uint32_t rx_dropped, uint32_t tx_dropped); ++bool is_map_t_dev(struct net_device *dev); diff --git a/package/kernel/nat46/patches/103-tos.patch b/package/kernel/nat46/patches/103-tos.patch new file mode 100644 index 00000000000000..60ffcb2fae802a --- /dev/null +++ b/package/kernel/nat46/patches/103-tos.patch @@ -0,0 +1,39 @@ +Author: Pavithra R +Date: Sat Aug 1 13:55:33 2020 +0530 + +nat46: Set IPv6 traffic class from IPv4 ToS value + +Set IPv6 traffic class from IPv4 ToS value during +IPv4 to IPv6 translation and vice-versa. + +This patch is propagated from kernel 4.4 commit +1cd3b55b059d4513649bb73bc69da931ed3beb7b + +Change-Id: Ia14e53447e829c8648c01656237ac902ad8674ec +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -886,11 +886,12 @@ void *get_next_header_ptr6(void *pv6, in + } + + void fill_v4hdr_from_v6hdr(struct iphdr * iph, struct ipv6hdr *ip6h, __u32 v4saddr, __u32 v4daddr, __u16 id, __u16 frag_off, __u16 proto, int l3_payload_len) { ++ uint32_t ver_class_flow = ntohl(*(__be32 *)ip6h); + iph->ttl = ip6h->hop_limit; + iph->saddr = v4saddr; + iph->daddr = v4daddr; + iph->protocol = proto; +- *((__be16 *)iph) = htons((4 << 12) | (5 << 8) | (0x00/*tos*/ & 0xff)); ++ *((__be16 *)iph) = htons((4 << 12) | (5 << 8) | ((ver_class_flow >> 20) & 0xff)); + iph->frag_off = frag_off; + iph->id = id; + iph->tot_len = htons( l3_payload_len + IPV4HDRSIZE ); +@@ -1859,7 +1860,7 @@ int nat46_ipv4_input(struct sk_buff *old + uint16_t sport = 0, dport = 0; + + int err = 0; +- int tclass = 0; ++ uint8_t tclass = 0; + int flowlabel = 0; + int check_for_l4 = 0; + int having_l4 = 0; diff --git a/package/kernel/nat46/patches/104-icmp.patch b/package/kernel/nat46/patches/104-icmp.patch new file mode 100644 index 00000000000000..7907a66726005b --- /dev/null +++ b/package/kernel/nat46/patches/104-icmp.patch @@ -0,0 +1,439 @@ +Author: Pavithra R +Date: Mon Aug 3 17:03:37 2020 +0530 + +nat46: Fix for icmp translation issues. + +This patch is propagated from kernel 4.4 commit +45fce10ba0105515289930b3e3f9df57bf3c22b6. + +Fixed icmpv4 to icmpv6 and vice-versa translation issues, in accordance with RFC6145. + +The change covers: +1. Translation of ICMP errors from IPv4 to IPv6 and vice-versa. +2. Translation of inner L3 packet header {Eth:IPv4:ICMP:IPv4:ICMP} in ICMP error messages. +3. Address translation for packets not having port numbers, hence CE/BR needs to fetch this + information from inner header (atleast 28 bytes (IP hdr + 8 bytes) of orignal packet received + that is transmitted back will be there in response). + +Change-Id: I677474728aeaee656376fdb1edcb9476783d5b40 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -29,6 +29,9 @@ + #include "nat46-core.h" + #include "nat46-module.h" + ++static uint16_t xlate_pkt_in_err_v4_to_v6(nat46_instance_t *nat46, struct iphdr *iph, ++ struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport); ++ + void + nat46debug_dump(nat46_instance_t *nat46, int level, void *addr, int len) + { +@@ -885,6 +888,14 @@ void *get_next_header_ptr6(void *pv6, in + return ret; + } + ++void fill_v6hdr_from_v4hdr(struct iphdr *iph, struct ipv6hdr *ip6h) { ++ *((__be16 *)ip6h) = htons((6 << 12) | (iph->tos << 4)); /* Version, Traffic Class */ ++ memset(&(ip6h->flow_lbl), 0, sizeof(ip6h->flow_lbl)); /* Flowlabel */ ++ ip6h->payload_len = htons(ntohs(iph->tot_len) - IPV4HDRSIZE); ++ ip6h->nexthdr = iph->protocol; ++ ip6h->hop_limit = iph->ttl; ++} ++ + void fill_v4hdr_from_v6hdr(struct iphdr * iph, struct ipv6hdr *ip6h, __u32 v4saddr, __u32 v4daddr, __u16 id, __u16 frag_off, __u16 proto, int l3_payload_len) { + uint32_t ver_class_flow = ntohl(*(__be32 *)ip6h); + iph->ttl = ip6h->hop_limit; +@@ -1212,10 +1223,14 @@ static void nat46_fixup_icmp6_paramprob( + 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, -1 }; + u32 *pptr6 = icmp6_parameter_ptr(icmp6h); + u8 *pptr4 = icmp_parameter_ptr((struct icmphdr *)icmp6h); +- int new_pptr = -1; ++ u8 new_pptr = -1; + int len = ntohs(ip6h->payload_len)-sizeof(*icmp6h); + + switch(icmp6h->icmp6_code) { ++ case 1: ++ update_icmp6_type_code(nat46, icmp6h, 3, 2); ++ break; ++ + case 0: + if(*pptr6 < sizeof(ptr6_4)/sizeof(ptr6_4[0])) { + new_pptr = ptr6_4[*pptr6]; +@@ -1224,27 +1239,21 @@ static void nat46_fixup_icmp6_paramprob( + *pptr4 = 0xff & new_pptr; + update_icmp6_type_code(nat46, icmp6h, 12, 0); + len = xlate_payload6_to4(nat46, (icmp6h + 1), get_next_header_ptr6((icmp6h + 1), len), len, &icmp6h->icmp6_cksum, ptailTruncSize); +- } else { +- ip6h->nexthdr = NEXTHDR_NONE; ++ update_icmp6_type_code(nat46, icmp6h, 12, 0); ++ break; + } +- } else { +- ip6h->nexthdr = NEXTHDR_NONE; + } +- break; +- case 1: +- icmp6h->icmp6_cksum = csum16_upd(icmp6h->icmp6_cksum, ((*pptr6 >> 16) & 0xffff), 0); +- icmp6h->icmp6_cksum = csum16_upd(icmp6h->icmp6_cksum, (*pptr6 & 0xffff), 0); +- *pptr6 = 0; +- update_icmp6_type_code(nat46, icmp6h, 3, 2); +- len = xlate_payload6_to4(nat46, (icmp6h + 1), get_next_header_ptr6((icmp6h + 1), len), len, &icmp6h->icmp6_cksum, ptailTruncSize); +- break; ++#if __has_attribute(__fallthrough__) ++ __attribute__((__fallthrough__)); ++#endif + case 2: /* fallthrough to default */ + default: + ip6h->nexthdr = NEXTHDR_NONE; ++ return; + } ++ len = xlate_payload6_to4(nat46, (icmp6h + 1), get_next_header_ptr6((icmp6h + 1), len), len, &icmp6h->icmp6_cksum, ptailTruncSize); + } + +- + /* Fixup ICMP6->ICMP before IP header translation, according to http://tools.ietf.org/html/rfc6145 */ + + static void nat46_fixup_icmp6(nat46_instance_t *nat46, struct ipv6hdr *ip6h, struct icmp6hdr *icmp6h, struct sk_buff *old_skb, int *ptailTruncSize) { +@@ -1299,17 +1308,19 @@ int ip6_input_not_interested(nat46_insta + return 0; + } + +-static uint16_t nat46_fixup_icmp_time_exceeded(nat46_instance_t *nat46, struct iphdr *iph, struct icmphdr *icmph, struct sk_buff *old_skb) { ++static uint16_t nat46_fixup_icmp_time_exceeded(nat46_instance_t *nat46, struct iphdr *iph, ++ struct icmphdr *icmph, struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport) { + /* + * Set the Type to 3, and adjust the + * ICMP checksum both to take the type change into account and + * to include the ICMPv6 pseudo-header. The Code is unchanged. + */ + icmph->type = 3; +- return 0; ++ return xlate_pkt_in_err_v4_to_v6(nat46, iph, old_skb, sport, dport); + } + +-static uint16_t nat46_fixup_icmp_parameterprob(nat46_instance_t *nat46, struct iphdr *iph, struct icmphdr *icmph, struct sk_buff *old_skb) { ++static uint16_t nat46_fixup_icmp_parameterprob(nat46_instance_t *nat46, struct iphdr *iph, ++ struct icmphdr *icmph, struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport) { + /* + * Set the Type to 4, and adjust the + * ICMP checksum both to take the type/code change into account +@@ -1352,27 +1363,33 @@ static uint16_t nat46_fixup_icmp_paramet + */ + static int ptr4_6[] = { 0, 1, 4, 4, -1, -1, -1, -1, 7, 6, -1, -1, 8, 8, 8, 8, 24, 24, 24, 24, -1 }; + u8 *icmp_pptr = icmp_parameter_ptr(icmph); +- int new_pptr = -1; ++ u32 *icmp6_pptr = icmp6_parameter_ptr((struct icmp6hdr *)icmph); ++ int8_t new_pptr = -1; ++ ++ icmph->type = 4; ++ + switch (icmph->code) { + case 0: + case 2: + if (*icmp_pptr < (sizeof(ptr4_6)/sizeof(ptr4_6[0]))) { + icmph->code = 0; + new_pptr = ptr4_6[*icmp_pptr]; +- if(new_pptr >= 0) { +- /* FIXME: update the parameter pointer in ICMPv6 with new_pptr value */ ++ if (new_pptr >= 0) { ++ *icmp6_pptr = new_pptr; ++ return xlate_pkt_in_err_v4_to_v6(nat46, iph, old_skb, sport, dport); + } +- } else { +- iph->protocol = NEXTHDR_NONE; + } +- break; ++#if __has_attribute(__fallthrough__) ++ __attribute__((__fallthrough__)); ++#endif + default: + iph->protocol = NEXTHDR_NONE; + } + return 0; + } + +-static uint16_t nat46_fixup_icmp_dest_unreach(nat46_instance_t *nat46, struct iphdr *iph, struct icmphdr *icmph, struct sk_buff *old_skb) { ++static uint16_t nat46_fixup_icmp_dest_unreach(nat46_instance_t *nat46, struct iphdr *iph, ++ struct icmphdr *icmph, struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport) { + /* + * Translate the Code as + * described below, set the Type to 1, and adjust the ICMP +@@ -1435,16 +1452,21 @@ static uint16_t nat46_fixup_icmp_dest_un + + u16 *pmtu = ((u16 *)icmph) + 3; /* IPv4-compatible MTU value is 16 bit */ + ++ icmph->type = 1; ++ + switch (icmph->code) { + case 0: + case 1: + icmph->code = 0; + break; +- case 2: +- /* FIXME: set ICMPv6 parameter pointer to 6 */ ++ case 2: { ++ u32 *icmp6_pptr = icmp6_parameter_ptr((struct icmp6hdr *)icmph); ++ *icmp6_pptr = 6; /* Offset to Next Proto field in IPv6 header. */ + icmph->type = 4; + icmph->code = 1; ++ nat46debug(3, "ICMP Proto Unreachable translated into IPv6 Param Prob.\n"); + break; ++ } + case 3: + icmph->code = 4; + break; +@@ -1494,13 +1516,15 @@ static uint16_t nat46_fixup_icmp_dest_un + break; + default: + iph->protocol = NEXTHDR_NONE; ++ return 0; + } +- return 0; ++ return xlate_pkt_in_err_v4_to_v6(nat46, iph, old_skb, sport, dport); + } + + /* Fixup ICMP->ICMP6 before IP header translation, according to http://tools.ietf.org/html/rfc6145 */ +- +-static uint16_t nat46_fixup_icmp(nat46_instance_t *nat46, struct iphdr *iph, struct sk_buff *old_skb) { ++static uint16_t nat46_fixup_icmp(nat46_instance_t *nat46, struct iphdr *iph, ++ struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport) ++{ + struct icmphdr *icmph = (struct icmphdr *)(iph+1); + uint16_t ret = 0; + +@@ -1509,22 +1533,22 @@ static uint16_t nat46_fixup_icmp(nat46_i + switch(icmph->type) { + case ICMP_ECHO: + icmph->type = ICMPV6_ECHO_REQUEST; +- ret = icmph->un.echo.id; ++ *sport = *dport = icmph->un.echo.id; + nat46debug(3, "ICMP echo request translated into IPv6, id: %d", ntohs(ret)); + break; + case ICMP_ECHOREPLY: + icmph->type = ICMPV6_ECHO_REPLY; +- ret = icmph->un.echo.id; ++ *sport = *dport = icmph->un.echo.id; + nat46debug(3, "ICMP echo reply translated into IPv6, id: %d", ntohs(ret)); + break; + case ICMP_TIME_EXCEEDED: +- ret = nat46_fixup_icmp_time_exceeded(nat46, iph, icmph, old_skb); ++ ret = nat46_fixup_icmp_time_exceeded(nat46, iph, icmph, old_skb, sport, dport); + break; + case ICMP_PARAMETERPROB: +- ret = nat46_fixup_icmp_parameterprob(nat46, iph, icmph, old_skb); ++ ret = nat46_fixup_icmp_parameterprob(nat46, iph, icmph, old_skb, sport, dport); + break; + case ICMP_DEST_UNREACH: +- ret = nat46_fixup_icmp_dest_unreach(nat46, iph, icmph, old_skb); ++ ret = nat46_fixup_icmp_dest_unreach(nat46, iph, icmph, old_skb, sport, dport); + break; + default: + /* Silently drop. */ +@@ -1544,11 +1568,13 @@ int pairs_xlate_v6_to_v4_outer(nat46_ins + + if(-1 == xlate_dst) { + if (xlate_v6_to_v4(nat46, &apair->local, &ip6h->daddr, pv4daddr)) { ++ nat46debug(5, "Dst addr %pI6 to %pI4 \n", &ip6h->daddr, pv4daddr); + xlate_dst = ipair; + } + } + if(-1 == xlate_src) { + if (xlate_v6_to_v4(nat46, &apair->remote, &ip6h->saddr, pv4saddr)) { ++ nat46debug(5, "Src addr %pI6 to %pI4 \n", &ip6h->saddr, pv4saddr); + xlate_src = ipair; + } + } +@@ -1659,6 +1685,7 @@ int nat46_ipv6_input(struct sk_buff *old + } + + if(!pairs_xlate_v6_to_v4_outer(nat46, ip6h, proto, &v4saddr, &v4daddr)) { ++ nat46debug(0, "[nat46] Could not translate v6->v4"); + goto done; + } + +@@ -1821,11 +1848,13 @@ int pairs_xlate_v4_to_v6_outer(nat46_ins + + if(-1 == xlate_src) { + if(xlate_v4_to_v6(nat46, &apair->local, &hdr4->saddr, v6saddr, sport)) { ++ nat46debug(5, "Src addr %pI4 to %pI6 \n", &hdr4->saddr, v6saddr); + xlate_src = ipair; + } + } + if(-1 == xlate_dst) { + if(xlate_v4_to_v6(nat46, &apair->remote, &hdr4->daddr, v6daddr, dport)) { ++ nat46debug(5, "Dst addr %pI4 to %pI6 \n", &hdr4->daddr, v6daddr); + xlate_dst = ipair; + } + } +@@ -1854,10 +1883,145 @@ int xlate_4_to_6(struct net_device *dev, + } + EXPORT_SYMBOL(xlate_4_to_6); + ++/* FIXME: This is a workaround, till the LPM is not added. The sport & dport in inner header will be dport & sport of the outer ++ * header, respectively. Hence, dest. and source ips of inner header will be found in local & remote rules, respectively. ++ * Will work only for a pair of local & remote rules. Once LPM is brought in, this method can be removed and ++ * pairs_xlate_v4_to_v6_outer be used instead. ++ */ ++int pairs_xlate_v4_to_v6_inner(nat46_instance_t *nat46, struct iphdr *iph, ++ uint16_t sport, uint16_t dport, void *v6saddr, void *v6daddr) { ++ int ipair = 0; ++ nat46_xlate_rulepair_t *apair = NULL; ++ int xlate_src = -1; ++ int xlate_dst = -1; ++ ++ for (ipair = 0; ipair < nat46->npairs; ipair++) { ++ apair = &nat46->pairs[ipair]; ++ ++ if (-1 == xlate_dst) { ++ if (xlate_v4_to_v6(nat46, &apair->local, &iph->daddr, v6daddr, &dport)) { ++ nat46debug(3, "Dst addr %pI4 to %pI6 \n", &iph->daddr, v6daddr); ++ xlate_dst = ipair; ++ } ++ } ++ if (-1 == xlate_src) { ++ if(xlate_v4_to_v6(nat46, &apair->remote, &iph->saddr, v6saddr, &sport)) { ++ nat46debug(3, "Src addr %pI4 to %pI6 \n", &iph->saddr, v6saddr); ++ xlate_src = ipair; ++ } ++ } ++ if ((xlate_src >= 0) && (xlate_dst >= 0)) { ++ /* we did manage to translate it */ ++ nat46debug(5, "[nat46] Inner header xlate results: src %d dst %d", xlate_src, xlate_dst); ++ return 1; ++ } else { ++ /* We did not match fully and there are more rules */ ++ if((ipair+1 < nat46->npairs) && is_last_pair_in_group(apair)) { ++ xlate_src = -1; ++ xlate_dst = -1; ++ } ++ } ++} ++ ++ nat46debug(1, "[nat46] Could not find a translation pair v4->v6"); ++ return 0; ++} ++ ++static uint16_t xlate_pkt_in_err_v4_to_v6(nat46_instance_t *nat46, struct iphdr *iph, ++ struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport) { ++ struct ipv6hdr ip6h; ++ char v6saddr[16], v6daddr[16]; ++ uint16_t temp_port = 0; ++ int ret = 0; ++ struct icmphdr *icmph = (struct icmphdr *)(iph + 1); ++ struct iphdr *iiph = (struct iphdr *)(icmph + 1); ++ ++ switch (iiph->protocol) { ++ case IPPROTO_TCP: { ++ struct tcphdr *th = (struct tcphdr *)(iiph + 1); ++ *sport = th->source; ++ *dport = th->dest; ++ iiph->protocol = NEXTHDR_TCP; ++ break; ++ } ++ case IPPROTO_UDP: { ++ struct udphdr *udp = (struct udphdr *)(iiph + 1); ++ *sport = udp->source; ++ *dport = udp->dest; ++ iiph->protocol = NEXTHDR_UDP; ++ break; ++ } ++ case IPPROTO_ICMP: { ++ struct icmphdr *icmph = (struct icmphdr *)(iiph + 1); ++ iiph->protocol = NEXTHDR_ICMP; ++ switch (icmph->type) { ++ case ICMP_ECHO: ++ icmph->type = ICMPV6_ECHO_REQUEST; ++ *sport = *dport = icmph->un.echo.id; ++ break; ++ case ICMP_ECHOREPLY: ++ icmph->type = ICMPV6_ECHO_REPLY; ++ *sport = *dport = icmph->un.echo.id; ++ break; ++ default: ++ nat46debug(3, "ICMP Error message can't be inside another ICMP Error messgae."); ++ *sport = *dport = 0; ++ return 0; ++ } ++ break; ++ } ++ default: ++ nat46debug(3, "[ICMPv4] Next header: %u. Only TCP, UDP, and ICMP are supported.", iiph->protocol); ++ *sport = *dport = 0; ++ return 0; ++ } ++ ++ nat46debug(3, "Retrieved from pkt in error: dest port %d, and src port %d.", ntohs(*dport), ntohs(*sport)); ++ ++ if (!pairs_xlate_v4_to_v6_inner(nat46, iiph, *sport, *dport, v6saddr, v6daddr)) { ++ nat46debug(0, "[nat46] Could not translate inner header v4->v6"); ++ *sport = *dport = 0; ++ return 0; ++ } ++ ++ fill_v6hdr_from_v4hdr (iiph, &ip6h); ++ memcpy(&ip6h.saddr, v6saddr, sizeof(ip6h.saddr)); ++ memcpy(&ip6h.daddr, v6daddr, sizeof(ip6h.daddr)); ++ ++ if (skb_tailroom(old_skb) >= IPV6V4HDRDELTA){ ++ skb_put(old_skb, IPV6V4HDRDELTA); ++ memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), ntohs(iiph->tot_len) - IPV4HDRSIZE); ++ memcpy(iiph, &ip6h, IPV6HDRSIZE); ++ } ++ else { ++ ret = pskb_expand_head(old_skb, 0, IPV6V4HDRDELTA, GFP_ATOMIC); ++ if (unlikely(ret)) { ++ nat46debug(0, "[nat46] Could not copy v4 skb"); ++ *sport = *dport = 0; ++ return 0; ++ } ++ ++ skb_put(old_skb, IPV6V4HDRDELTA); ++ iiph = (struct iphdr *)(icmp_hdr(old_skb) + 1); ++ memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), ntohs(iiph->tot_len) - IPV4HDRSIZE); ++ memcpy(iiph, &ip6h, IPV6HDRSIZE); ++ nat46 = get_nat46_instance(old_skb); ++ iph = ip_hdr(old_skb); ++ } ++ ++ /* Swapping Ports for outer header */ ++ /* Another work-around till LPM is not present. */ ++ temp_port = *sport; ++ *sport = *dport; ++ *dport = temp_port; ++ ++ return 1; ++} ++ + int nat46_ipv4_input(struct sk_buff *old_skb) { + nat46_instance_t *nat46 = get_nat46_instance(old_skb); + struct sk_buff *new_skb; +- uint16_t sport = 0, dport = 0; ++ uint16_t sport = 0, dport = 0, ret = 0; + + int err = 0; + uint8_t tclass = 0; +@@ -1879,7 +2043,7 @@ int nat46_ipv4_input(struct sk_buff *old + } + nat46debug(1, "nat46_ipv4_input packet"); + nat46debug(5, "nat46_ipv4_input protocol: %d, len: %d, flags: %02x", hdr4->protocol, old_skb->len, IPCB(old_skb)->flags); +- if(0 == (ntohs(hdr4->frag_off) & 0x3FFF) ) { ++ if (0 == (ntohs(hdr4->frag_off) & 0x3FFF)) { + check_for_l4 = 1; + } else if (IPPROTO_ICMP == hdr4->protocol) { + /* +@@ -1916,9 +2080,10 @@ int nat46_ipv4_input(struct sk_buff *old + break; + } + case IPPROTO_ICMP: +- sport = dport = nat46_fixup_icmp(nat46, hdr4, old_skb); +- having_l4 = 1; +- break; ++ ret = nat46_fixup_icmp(nat46, hdr4, old_skb, &sport, &dport); ++ nat46debug(3, "ICMP translated to dest port %d, and src port %d.", ntohs(dport), ntohs(sport)); ++ having_l4 = 1; ++ break; + default: + break; + } diff --git a/package/kernel/nat46/patches/105-longest-prefix-match.patch b/package/kernel/nat46/patches/105-longest-prefix-match.patch new file mode 100644 index 00000000000000..95fe6af973f45b --- /dev/null +++ b/package/kernel/nat46/patches/105-longest-prefix-match.patch @@ -0,0 +1,640 @@ +Author: Pavithra R +Date: Tue Aug 4 10:33:59 2020 +0530 + +nat46: Adding support for multiple MAP-T rules. + +This patch is propagated from kernel 4.4 commit +05a122b0cb0d3a99f040c94b3f626e7350f1445b + +This change covers: +1. Support for adding maximum of 32 MAP-T rules (DMR + FMRs). +2. Support for rule lookup based on Longest Prefix Match method. +3. Support for validation of new rules being inserted. + +Change-Id: Id87448a8f544273b40c20aaab6e5c63b0dbd72e +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -128,6 +128,13 @@ int try_parse_ipv6_prefix(struct in6_add + *arg_plen++ = 0; + if (pref_len) { + *pref_len = simple_strtol(arg_plen, NULL, 10); ++ ++ /* ++ * ipv6 prefix should be <= 128 ++ */ ++ if (*pref_len > IPV6_BITS_MAX) { ++ return -1; ++ } + } + } + err = (1 != in6_pton(arg, -1, (u8 *)pref, '\0', NULL)); +@@ -141,6 +148,13 @@ int try_parse_ipv4_prefix(u32 *v4addr, i + *arg_plen++ = 0; + if (pref_len) { + *pref_len = simple_strtol(arg_plen, NULL, 10); ++ ++ /* ++ * ipv4 prefix len should be <= 32 ++ */ ++ if (*pref_len > IPV4_BITS_MAX) { ++ return -1; ++ } + } + } + err = (1 != in4_pton(arg, -1, (u8 *)v4addr, '/', NULL)); +@@ -183,11 +197,127 @@ int try_parse_rule_arg(nat46_xlate_rule_ + return err; + } + +-/* +- * Parse the config commands in the buffer, +- * destructive (puts zero between the args) ++static inline void nat46_swap(nat46_xlate_rulepair_t *var1, nat46_xlate_rulepair_t *var2) { ++ nat46_xlate_rulepair_t temp; ++ temp = *var1; ++ *var1 = *var2; ++ *var2 = temp; ++} ++ ++/* ++ * Sort rule pairs based on prefix length. + */ ++void nat46_sort_rule_array(nat46_instance_t *nat46) { ++ int i, j; ++ int nelem = nat46->npairs; ++ nat46_xlate_rulepair_t *array = NULL; ++ ++ memcpy(nat46->sorted_ipv4_local_pairs, nat46->pairs, nelem * sizeof(nat46_xlate_rulepair_t)); ++ memcpy(nat46->sorted_ipv4_remote_pairs, nat46->pairs, nelem * sizeof(nat46_xlate_rulepair_t)); ++ memcpy(nat46->sorted_ipv6_local_pairs, nat46->pairs, nelem * sizeof(nat46_xlate_rulepair_t)); ++ memcpy(nat46->sorted_ipv6_remote_pairs, nat46->pairs, nelem * sizeof(nat46_xlate_rulepair_t)); ++ ++ array = &nat46->sorted_ipv4_local_pairs[0]; ++ for (i = 0; i < nelem - 1; i++) { ++ for (j = 0; j < nelem - i - 1; j++) { ++ if (array[j].local.v4_pref_len < array[j+1].local.v4_pref_len) { ++ nat46_swap (&array[j], &array[j+1]); ++ } ++ } ++ } ++ ++ array = &nat46->sorted_ipv4_remote_pairs[0]; ++ for (i = 0; i < nelem - 1; i++) { ++ for (j = 0; j < nelem - i - 1; j++) { ++ if (array[j].remote.v4_pref_len < array[j+1].remote.v4_pref_len) { ++ nat46_swap (&array[j], &array[j+1]); ++ } ++ } ++ } + ++ array = &nat46->sorted_ipv6_local_pairs[0]; ++ for (i = 0; i < nelem - 1; i++) { ++ for (j = 0; j < nelem - i - 1; j++) { ++ if (array[j].local.v6_pref_len < array[j+1].local.v6_pref_len) { ++ nat46_swap (&array[j], &array[j+1]); ++ } ++ } ++ } ++ ++ array = &nat46->sorted_ipv6_remote_pairs[0]; ++ for (i = 0; i < nelem - 1; i++) { ++ for (j = 0; j < nelem - i - 1; j++) { ++ if (array[j].remote.v6_pref_len < array[j+1].remote.v6_pref_len) { ++ nat46_swap (&array[j], &array[j+1]); ++ } ++ } ++ } ++} ++ ++bool nat46_validate_RFC6052_style(nat46_instance_t *nat46, nat46_xlate_rule_t rule) ++{ ++ if (rule.style == NAT46_XLATE_RFC6052) { ++ if (!((rule.v6_pref_len == 32) || (rule.v6_pref_len == 40) || ++ (rule.v6_pref_len == 48) || (rule.v6_pref_len == 56) || ++ (rule.v6_pref_len == 64) || (rule.v6_pref_len == 96))) { ++ nat46debug(3, "IPv6 prefix len is invalid"); ++ return false; ++ } ++ } ++ return true; ++} ++ ++bool nat46_validate_MAP_style(nat46_instance_t *nat46, nat46_xlate_rule_t rule) ++{ ++ int psid_len; ++ if (rule.style == NAT46_XLATE_MAP) { ++ ++ /* ++ * max ea_len is 48 ++ */ ++ if (rule.ea_len > EA_LEN_MAX) { ++ nat46debug(3, "EA-length should not exceed 48"); ++ return false; ++ } ++ ++ if (rule.v4_pref_len + rule.ea_len > IPV4_BITS_MAX) { ++ psid_len = rule.ea_len - (IPV4_BITS_MAX - rule.v4_pref_len); ++ } else { ++ psid_len = 0; ++ } ++ ++ if (psid_len + rule.psid_offset > PSID_LEN_MAX) { ++ nat46debug(3, "psid_len + psid_offset should not exceed 16"); ++ return false; ++ } ++ } ++ return true; ++} ++ ++int nat46_validate_ipair_config(nat46_instance_t *nat46, nat46_xlate_rulepair_t *apair) ++{ ++ if (!nat46_validate_RFC6052_style(nat46, apair->local)) { ++ return -1; ++ } ++ ++ if (!nat46_validate_RFC6052_style(nat46, apair->remote)) { ++ return -1; ++ } ++ ++ if (!nat46_validate_MAP_style(nat46, apair->local)) { ++ return -1; ++ } ++ ++ if (!nat46_validate_MAP_style(nat46, apair->remote)) { ++ return -1; ++ } ++ return 0; ++} ++ ++/* ++ * Parse the config commands in the buffer, ++ * destructive (puts zero between the args) ++ */ + int nat46_set_ipair_config(nat46_instance_t *nat46, int ipair, char *buf, int count) { + char *tail = buf; + char *arg_name; +@@ -217,7 +347,18 @@ int nat46_set_ipair_config(nat46_instanc + err = try_parse_rule_arg(&apair->remote, arg_name, &tail); + } + } +- return err; ++ ++ err = nat46_validate_ipair_config(nat46, apair); ++ if (err) { ++ return err; ++ } ++ ++ /* ++ * sort nat46->pairs based on prefix length. ++ */ ++ nat46_sort_rule_array(nat46); ++ ++ return 0; + } + + int nat46_set_config(nat46_instance_t *nat46, char *buf, int count) { +@@ -933,37 +1074,120 @@ int is_last_pair_in_group(nat46_xlate_ru + return ( (apair->local.style != NAT46_XLATE_NONE) && (apair->remote.style != NAT46_XLATE_NONE) ); + } + ++nat46_xlate_rulepair_t *nat46_lpm(nat46_instance_t *nat46, nat46_rule_type_t type, void *paddr) { ++ int ipair = 0; ++ nat46_xlate_rulepair_t *apair = NULL; ++ uint32_t mask = 0; ++ uint8_t *pa1; ++ uint8_t *pa2; ++ ++ if(!nat46 || !paddr) { ++ return NULL; ++ } ++ ++ switch (type) { ++ case NAT46_IPV4_LOCAL: ++ for (ipair = 0; ipair < nat46->npairs; ipair++) { ++ apair = &nat46->sorted_ipv4_local_pairs[ipair]; ++ ++ /* ++ * For a 32-bit number, if the shift count is 32, then the ++ * result of the left shift operation is always 0. ++ */ ++ if (apair->local.v4_pref_len) { ++ mask = htonl(U32_MASK << (IPV4_BITS_MAX - apair->local.v4_pref_len)); ++ } ++ ++ if((*(uint32_t *)paddr & mask) == (apair->local.v4_pref & mask)) { ++ return apair; ++ } ++ } ++ break; ++ case NAT46_IPV4_REMOTE: ++ for (ipair = 0; ipair < nat46->npairs; ipair++) { ++ apair = &nat46->sorted_ipv4_remote_pairs[ipair]; ++ ++ /* ++ * For a 32-bit number, if the shift count is 32, then the ++ * result of the left shift operation is always 0. ++ */ ++ if (apair->remote.v4_pref_len) { ++ mask = htonl(U32_MASK << (IPV4_BITS_MAX - apair->remote.v4_pref_len)); ++ } ++ ++ if((*(uint32_t *)paddr & mask) == (apair->remote.v4_pref & mask)) { ++ return apair; ++ } ++ } ++ break; ++ case NAT46_IPV6_LOCAL: ++ for (ipair = 0; ipair < nat46->npairs; ipair++) { ++ apair = &nat46->sorted_ipv6_local_pairs[ipair]; ++ if(memcmp(paddr, &apair->local.v6_pref, apair->local.v6_pref_len / BITS_PER_BYTE)) { ++ continue; ++ } ++ if(apair->local.v6_pref_len % BITS_PER_BYTE) { ++ mask = U8_MASK << (BITS_PER_BYTE - (apair->local.v6_pref_len % BITS_PER_BYTE)); ++ pa1 = (uint8_t *)paddr + (apair->local.v6_pref_len / BITS_PER_BYTE); ++ pa2 = (uint8_t *)&apair->local.v6_pref + (apair->local.v6_pref_len / BITS_PER_BYTE); ++ ++ if ((*pa1 & mask) == (*pa2 & mask)) { ++ return apair; ++ } ++ } ++ else ++ return apair; ++ } ++ break; ++ case NAT46_IPV6_REMOTE: ++ for (ipair = 0; ipair < nat46->npairs; ipair++) { ++ apair = &nat46->sorted_ipv6_remote_pairs[ipair]; ++ if(memcmp(paddr, &apair->remote.v6_pref, apair->remote.v6_pref_len / BITS_PER_BYTE)) { ++ continue; ++ } ++ if(apair->remote.v6_pref_len % BITS_PER_BYTE) { ++ mask = U8_MASK << (BITS_PER_BYTE - (apair->remote.v6_pref_len % BITS_PER_BYTE)); ++ pa1 = (uint8_t *)paddr + (apair->remote.v6_pref_len / BITS_PER_BYTE); ++ pa2 = (uint8_t *)&apair->remote.v6_pref + (apair->remote.v6_pref_len / BITS_PER_BYTE); ++ ++ if((*pa1 & mask) == (*pa2 & mask)) { ++ return apair; ++ } ++ } ++ else ++ return apair; ++ } ++ break; ++ default: ++ nat46debug(0, "%s : Invalid prefix type.\n", __func__); ++ } ++ return NULL; ++} ++ + void pairs_xlate_v6_to_v4_inner(nat46_instance_t *nat46, struct ipv6hdr *ip6h, __u32 *pv4saddr, __u32 *pv4daddr) { + int ipair = 0; + nat46_xlate_rulepair_t *apair = NULL; + int xlate_src = -1; + int xlate_dst = -1; + +- for(ipair = 0; ipair < nat46->npairs; ipair++) { +- apair = &nat46->pairs[ipair]; ++ apair = nat46_lpm(nat46, NAT46_IPV6_REMOTE, &ip6h->daddr); ++ if (!apair) { ++ return; ++ } + +- if(-1 == xlate_dst) { +- if(xlate_v6_to_v4(nat46, &apair->remote, &ip6h->daddr, pv4daddr)) { +- xlate_dst = ipair; +- } +- } +- if(-1 == xlate_src) { +- if(xlate_v6_to_v4(nat46, &apair->local, &ip6h->saddr, pv4saddr)) { +- xlate_src = ipair; +- } +- } +- if((xlate_src >= 0) && (xlate_dst >= 0)) { +- /* we did manage to translate it */ +- break; +- } else { +- /* We did not match fully and there are more rules */ +- if((ipair+1 < nat46->npairs) && is_last_pair_in_group(apair)) { +- xlate_src = -1; +- xlate_dst = -1; +- } +- } ++ if (xlate_v6_to_v4(nat46, &apair->remote, &ip6h->daddr, pv4daddr)) { ++ xlate_dst = ipair; ++ } ++ if (xlate_v6_to_v4(nat46, &apair->local, &ip6h->saddr, pv4saddr)) { ++ xlate_src = ipair; ++ } ++ ++ if ((xlate_src >= 0) && (xlate_dst >= 0)) { ++ /* we did manage to translate it */ ++ nat46debug(5, "[nat46payload] xlate results: src %d dst %d", xlate_src, xlate_dst); ++ } else { ++ nat46debug(1, "[nat46] Could not find a translation pair v6->v4 src %pI6c dst %pI6c", &ip6h->saddr, &ip6h->daddr); + } +- nat46debug(5, "[nat46payload] xlate results: src %d dst %d", xlate_src, xlate_dst); + } + + /* +@@ -1557,40 +1781,31 @@ static uint16_t nat46_fixup_icmp(nat46_i + return ret; + } + +-int pairs_xlate_v6_to_v4_outer(nat46_instance_t *nat46, struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr) { ++int pairs_xlate_v6_to_v4_outer(nat46_instance_t *nat46, nat46_xlate_rulepair_t *apair, ++ struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr) { + int ipair = 0; +- nat46_xlate_rulepair_t *apair = NULL; + int xlate_src = -1; + int xlate_dst = -1; + + for(ipair = 0; ipair < nat46->npairs; ipair++) { +- apair = &nat46->pairs[ipair]; +- +- if(-1 == xlate_dst) { +- if (xlate_v6_to_v4(nat46, &apair->local, &ip6h->daddr, pv4daddr)) { +- nat46debug(5, "Dst addr %pI6 to %pI4 \n", &ip6h->daddr, pv4daddr); +- xlate_dst = ipair; +- } ++ apair = nat46_lpm(nat46, NAT46_IPV6_REMOTE, &ip6h->saddr); ++ if (!apair) { ++ return 0; + } +- if(-1 == xlate_src) { +- if (xlate_v6_to_v4(nat46, &apair->remote, &ip6h->saddr, pv4saddr)) { +- nat46debug(5, "Src addr %pI6 to %pI4 \n", &ip6h->saddr, pv4saddr); +- xlate_src = ipair; +- } ++ ++ if (xlate_v6_to_v4(nat46, &apair->local, &ip6h->daddr, pv4daddr)) { ++ nat46debug(5, "Dst addr %pI6 to %pI4 \n", &ip6h->daddr, pv4daddr); ++ xlate_dst = ipair; + } +- if( (xlate_src >= 0) && (xlate_dst >= 0) ) { +- break; +- } else { +- /* We did not match fully and there are more rules */ +- if((ipair+1 < nat46->npairs) && is_last_pair_in_group(apair)) { +- xlate_src = -1; +- xlate_dst = -1; +- } ++ ++ if (xlate_v6_to_v4(nat46, &apair->remote, &ip6h->saddr, pv4saddr)) { ++ nat46debug(5, "Src addr %pI6 to %pI4 \n", &ip6h->saddr, pv4saddr); ++ xlate_src = ipair; + } + } + if (xlate_dst >= 0) { + if (xlate_src < 0) { +- if(proto == NEXTHDR_ICMP) { ++ if (proto == NEXTHDR_ICMP) { + nat46debug(1, "[nat46] Could not translate remote address v6->v4, ipair %d, for ICMP6 use dest addr", ipair); + *pv4saddr = *pv4daddr; + xlate_src = xlate_dst; +@@ -1606,12 +1821,14 @@ int pairs_xlate_v6_to_v4_outer(nat46_ins + } + + int xlate_6_to_4(struct net_device *dev, struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr) { +- return pairs_xlate_v6_to_v4_outer(netdev_nat46_instance(dev), ip6h, proto, pv4saddr, pv4daddr); ++ nat46_xlate_rulepair_t apair; ++ return pairs_xlate_v6_to_v4_outer(netdev_nat46_instance(dev), &apair, ip6h, proto, pv4saddr, pv4daddr); + } + EXPORT_SYMBOL(xlate_6_to_4); + + int nat46_ipv6_input(struct sk_buff *old_skb) { + struct ipv6hdr *ip6h = ipv6_hdr(old_skb); ++ nat46_xlate_rulepair_t apair; + nat46_instance_t *nat46 = get_nat46_instance(old_skb); + uint16_t proto; + uint16_t frag_off; +@@ -1684,7 +1901,7 @@ int nat46_ipv6_input(struct sk_buff *old + check_for_l4 = 1; + } + +- if(!pairs_xlate_v6_to_v4_outer(nat46, ip6h, proto, &v4saddr, &v4daddr)) { ++ if (!pairs_xlate_v6_to_v4_outer(nat46, &apair, ip6h, proto, &v4saddr, &v4daddr)) { + nat46debug(0, "[nat46] Could not translate v6->v4"); + goto done; + } +@@ -1837,56 +2054,44 @@ int ip4_input_not_interested(nat46_insta + return 0; + } + +-int pairs_xlate_v4_to_v6_outer(nat46_instance_t *nat46, struct iphdr *hdr4, uint16_t *sport, uint16_t *dport, void *v6saddr, void *v6daddr) { ++int pairs_xlate_v4_to_v6_outer(nat46_instance_t *nat46, nat46_xlate_rulepair_t *apair, ++ struct iphdr *hdr4, uint16_t *sport, uint16_t *dport, void *v6saddr, void *v6daddr) { + int ipair = 0; +- nat46_xlate_rulepair_t *apair = NULL; + int xlate_src = -1; + int xlate_dst = -1; ++ int ret = 0; + +- for(ipair = 0; ipair < nat46->npairs; ipair++) { +- apair = &nat46->pairs[ipair]; ++ apair = nat46_lpm(nat46, NAT46_IPV4_REMOTE, &hdr4->daddr); ++ if (!apair) { ++ return 0; ++ } + +- if(-1 == xlate_src) { +- if(xlate_v4_to_v6(nat46, &apair->local, &hdr4->saddr, v6saddr, sport)) { +- nat46debug(5, "Src addr %pI4 to %pI6 \n", &hdr4->saddr, v6saddr); +- xlate_src = ipair; +- } +- } +- if(-1 == xlate_dst) { +- if(xlate_v4_to_v6(nat46, &apair->remote, &hdr4->daddr, v6daddr, dport)) { +- nat46debug(5, "Dst addr %pI4 to %pI6 \n", &hdr4->daddr, v6daddr); +- xlate_dst = ipair; +- } +- } +- if( (xlate_src >= 0) && (xlate_dst >= 0) ) { +- break; +- } else { +- /* We did not match fully and there are more rules */ +- if((ipair+1 < nat46->npairs) && is_last_pair_in_group(apair)) { +- xlate_src = -1; +- xlate_dst = -1; +- } +- } ++ if (xlate_v4_to_v6(nat46, &apair->local, &hdr4->saddr, v6saddr, sport)) { ++ nat46debug(5, "Src addr %pI4 to %pI6 \n", &hdr4->saddr, v6saddr); ++ xlate_src = ipair; ++ } ++ if (xlate_v4_to_v6(nat46, &apair->remote, &hdr4->daddr, v6daddr, dport)) { ++ nat46debug(5, "Dst addr %pI4 to %pI6 \n", &hdr4->daddr, v6daddr); ++ xlate_dst = ipair; + } + nat46debug(5, "[nat46] pairs_xlate_v4_to_v6_outer result: src %d dst %d", xlate_src, xlate_dst); + if ( (xlate_src >= 0) && (xlate_dst >= 0) ) { +- return 1; ++ ret = 1; ++ } else { ++ nat46debug(1, "[nat46] Could not find a translation pair v4->v6"); + } +- +- nat46debug(1, "[nat46] Could not find a translation pair v4->v6"); +- +- return 0; ++ return ret; + } + + int xlate_4_to_6(struct net_device *dev, struct iphdr *hdr4, uint16_t sport, uint16_t dport, void *v6saddr, void *v6daddr) { +- return pairs_xlate_v4_to_v6_outer(netdev_nat46_instance(dev), hdr4, &sport, &dport, v6saddr, v6daddr); ++ nat46_xlate_rulepair_t apair; ++ return pairs_xlate_v4_to_v6_outer(netdev_nat46_instance(dev), &apair, hdr4, &sport, &dport, v6saddr, v6daddr); + } + EXPORT_SYMBOL(xlate_4_to_6); + +-/* FIXME: This is a workaround, till the LPM is not added. The sport & dport in inner header will be dport & sport of the outer +- * header, respectively. Hence, dest. and source ips of inner header will be found in local & remote rules, respectively. +- * Will work only for a pair of local & remote rules. Once LPM is brought in, this method can be removed and +- * pairs_xlate_v4_to_v6_outer be used instead. ++/* ++ * The sport & dport in inner header will be dport & sport of the outer header, respectively. ++ * Hence, dest. and source ips of inner header will be found in local & remote rules, respectively. + */ + int pairs_xlate_v4_to_v6_inner(nat46_instance_t *nat46, struct iphdr *iph, + uint16_t sport, uint16_t dport, void *v6saddr, void *v6daddr) { +@@ -1895,35 +2100,27 @@ int pairs_xlate_v4_to_v6_inner(nat46_ins + int xlate_src = -1; + int xlate_dst = -1; + +- for (ipair = 0; ipair < nat46->npairs; ipair++) { +- apair = &nat46->pairs[ipair]; ++ apair = nat46_lpm(nat46, NAT46_IPV4_REMOTE, &iph->saddr); ++ if (!apair) { ++ return 0; ++ } + +- if (-1 == xlate_dst) { +- if (xlate_v4_to_v6(nat46, &apair->local, &iph->daddr, v6daddr, &dport)) { +- nat46debug(3, "Dst addr %pI4 to %pI6 \n", &iph->daddr, v6daddr); +- xlate_dst = ipair; +- } +- } +- if (-1 == xlate_src) { +- if(xlate_v4_to_v6(nat46, &apair->remote, &iph->saddr, v6saddr, &sport)) { +- nat46debug(3, "Src addr %pI4 to %pI6 \n", &iph->saddr, v6saddr); +- xlate_src = ipair; +- } +- } +- if ((xlate_src >= 0) && (xlate_dst >= 0)) { +- /* we did manage to translate it */ +- nat46debug(5, "[nat46] Inner header xlate results: src %d dst %d", xlate_src, xlate_dst); +- return 1; +- } else { +- /* We did not match fully and there are more rules */ +- if((ipair+1 < nat46->npairs) && is_last_pair_in_group(apair)) { +- xlate_src = -1; +- xlate_dst = -1; +- } +- } +-} ++ if (xlate_v4_to_v6(nat46, &apair->local, &iph->daddr, v6daddr, &dport)) { ++ nat46debug(3, "Dst addr %pI4 to %pI6 \n", &iph->daddr, v6daddr); ++ xlate_dst = ipair; ++ } ++ if (xlate_v4_to_v6(nat46, &apair->remote, &iph->saddr, v6saddr, &sport)) { ++ nat46debug(3, "Src addr %pI4 to %pI6 \n", &iph->saddr, v6saddr); ++ xlate_src = ipair; ++ } ++ if ((xlate_src >= 0) && (xlate_dst >= 0)) { ++ /* we did manage to translate it */ ++ nat46debug(5, "[nat46] Inner header xlate results: src %d dst %d", xlate_src, xlate_dst); ++ return 1; ++ } else { ++ nat46debug(1, "[nat46] Could not find a translation pair v4->v6"); ++ } + +- nat46debug(1, "[nat46] Could not find a translation pair v4->v6"); + return 0; + } + +@@ -2020,6 +2217,7 @@ static uint16_t xlate_pkt_in_err_v4_to_v + + int nat46_ipv4_input(struct sk_buff *old_skb) { + nat46_instance_t *nat46 = get_nat46_instance(old_skb); ++ nat46_xlate_rulepair_t apair; + struct sk_buff *new_skb; + uint16_t sport = 0, dport = 0, ret = 0; + +@@ -2097,7 +2295,7 @@ int nat46_ipv4_input(struct sk_buff *old + having_l4 = 1; + } + +- if(!pairs_xlate_v4_to_v6_outer(nat46, hdr4, having_l4 ? &sport : NULL, having_l4 ? &dport : NULL, v6saddr, v6daddr)) { ++ if(!pairs_xlate_v4_to_v6_outer(nat46, &apair, hdr4, having_l4 ? &sport : NULL, having_l4 ? &dport : NULL, v6saddr, v6daddr)) { + nat46debug(0, "[nat46] Could not translate v4->v6"); + goto done; + } +--- a/nat46/modules/nat46-core.h ++++ b/nat46/modules/nat46-core.h +@@ -23,6 +23,15 @@ + // #define nat46debug(level, format, ...) + #define nat46debug(level, format, ...) do { if(nat46->debug >= level) { printk(format "\n", ##__VA_ARGS__); } } while (0) + ++#define U8_MASK (uint8_t)(0xFF) ++#define U32_MASK (uint32_t)(~0U) ++#define BITS_PER_BYTE 8 ++#define PSID_LEN_MAX 16 ++#define NUM_RULE_PAIRS_MAX 32 ++#define IPV4_BITS_MAX 32 ++#define EA_LEN_MAX 48 ++#define IPV6_BITS_MAX 128 ++ + #define IPV6HDRSIZE 40 + #define IPV4HDRSIZE 20 + #define IPV6V4HDRDELTA (IPV6HDRSIZE - IPV4HDRSIZE) +@@ -39,6 +48,17 @@ typedef enum { + NAT46_XLATE_RFC6052 + } nat46_xlate_style_t; + ++/* ++ * Enumeration for sorting pairs based on ++ * type of prefix length. ++ */ ++typedef enum { ++ NAT46_IPV4_LOCAL = 0, ++ NAT46_IPV4_REMOTE, ++ NAT46_IPV6_LOCAL, ++ NAT46_IPV6_REMOTE ++} nat46_rule_type_t; ++ + #define NAT46_SIGNATURE 0x544e3634 + #define FREED_NAT46_SIGNATURE 0xdead544e + +@@ -64,7 +84,11 @@ typedef struct { + int debug; + + int npairs; +- nat46_xlate_rulepair_t pairs[0]; /* npairs */ ++ nat46_xlate_rulepair_t pairs[NUM_RULE_PAIRS_MAX]; /* npairs */ ++ nat46_xlate_rulepair_t sorted_ipv4_local_pairs[NUM_RULE_PAIRS_MAX]; /* npairs */ ++ nat46_xlate_rulepair_t sorted_ipv4_remote_pairs[NUM_RULE_PAIRS_MAX]; /* npairs */ ++ nat46_xlate_rulepair_t sorted_ipv6_local_pairs[NUM_RULE_PAIRS_MAX]; /* npairs */ ++ nat46_xlate_rulepair_t sorted_ipv6_remote_pairs[NUM_RULE_PAIRS_MAX]; /* npairs */ + } nat46_instance_t; + + int nat46_ipv6_input(struct sk_buff *old_skb); +--- a/nat46/modules/nat46-netdev.c ++++ b/nat46/modules/nat46-netdev.c +@@ -270,7 +270,14 @@ int nat46_insert(char *devname, char *bu + int ret = -1; + if(dev) { + nat46_instance_t *nat46 = netdev_nat46_instance(dev); +- nat46_instance_t *nat46_new = alloc_nat46_instance(nat46->npairs+1, nat46, 0, 1, -1); ++ nat46_instance_t *nat46_new; ++ ++ if(nat46->npairs == NUM_RULE_PAIRS_MAX) { ++ printk("Could not insert a new rule on device %s\n", devname); ++ return ret; ++ } ++ ++ nat46_new = alloc_nat46_instance(nat46->npairs+1, nat46, 0, 1, -1); + if(nat46_new) { + netdev_nat46_set_instance(dev, nat46_new); + ret = nat46_set_ipair_config(nat46_new, 0, buf, strlen(buf)); diff --git a/package/kernel/nat46/patches/106-dummy_header.patch b/package/kernel/nat46/patches/106-dummy_header.patch new file mode 100644 index 00000000000000..1d4351166fb963 --- /dev/null +++ b/package/kernel/nat46/patches/106-dummy_header.patch @@ -0,0 +1,104 @@ +Author: Pavithra R +Date: Wed Aug 5 10:09:45 2020 +0530 + +nat46: Add dummy fragment header for DF=0 IPv4 packet. + +This patch is propagated from 4.4 kernel commit +b45f19e86ebcc19ea26d5e014bfdcb837148f99e. + +Add dummy fragment header to IPv6 translated packet for +every DF=0 IPv4 packet. + +Change-Id: Id72945eefac030e95e4fd18305e48c46e525def3 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -1996,6 +1996,27 @@ done: + + + ++/* ++ * Function to get MAP-T rules and flags. ++ */ ++bool nat46_get_info(struct net_device *dev, nat46_xlate_rulepair_t **nat46_rule_pair, ++ int *count, u8 *flag) { ++ if ((!dev) || (!nat46_rule_pair) || (!count) || (!flag)) { ++ return false; ++ } ++ ++ if (!nat46_get_rule_config(dev, nat46_rule_pair, count)) { ++ return false; ++ } ++ ++ /* Check add dummy header flag */ ++ if (add_dummy_header) { ++ *flag = ADD_DUMMY_HEADER; ++ } ++ return true; ++} ++EXPORT_SYMBOL(nat46_get_info); ++ + void ip6_update_csum(struct sk_buff * skb, struct ipv6hdr * ip6hdr, int do_atomic_frag) + { + u32 sum1=0; +@@ -2254,6 +2275,11 @@ int nat46_ipv4_input(struct sk_buff *old + } + hdr4 = ip_hdr(old_skb); + check_for_l4 = 1; ++ if (add_dummy_header) { ++ if (0 == (ntohs(hdr4->frag_off) & IP_DF)) { ++ add_frag_header = 1; ++ } ++ } + } else { + add_frag_header = 1; + if (0 == (ntohs(hdr4->frag_off) & 0x1FFF)) { +--- a/nat46/modules/nat46-core.h ++++ b/nat46/modules/nat46-core.h +@@ -32,6 +32,9 @@ + #define EA_LEN_MAX 48 + #define IPV6_BITS_MAX 128 + ++/* Flag definations for MAP-T */ ++#define ADD_DUMMY_HEADER 0x01 ++ + #define IPV6HDRSIZE 40 + #define IPV4HDRSIZE 20 + #define IPV6V4HDRDELTA (IPV6HDRSIZE - IPV4HDRSIZE) +@@ -110,5 +113,6 @@ int xlate_6_to_4(struct net_device *dev, + int xlate_4_to_6(struct net_device *dev, struct iphdr *hdr4, uint16_t sport, uint16_t dport, void *v6saddr, void *v6daddr); + bool nat46_get_rule_config(struct net_device *dev, nat46_xlate_rulepair_t **nat46_rule_pair, int *count); + int nat46_get_npairs(struct net_device *dev); +- ++bool nat46_get_info(struct net_device *dev, nat46_xlate_rulepair_t **nat46_rule_pair, ++ int *count, u8 *flag); + #endif +--- a/nat46/modules/nat46-module.c ++++ b/nat46/modules/nat46-module.c +@@ -56,12 +56,16 @@ MODULE_AUTHOR("Andrew Yourtchenko +Date: Wed Aug 5 10:57:25 2020 +0530 + +nat46: Add support for 64-bits stats. + +This patch is propagated from 4.4 kernel commit +4a2d1dd9bc9331392c7a4947126c361217c82e0c + +Add 64-bits stats functionality for MAP-T interface. + +Change-Id: I4a6f9c7ed3554ac0ec672aa5fa283be2e95cfdc0 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-netdev.c ++++ b/nat46/modules/nat46-netdev.c +@@ -24,6 +24,7 @@ + #include + #include + #include ++#include + #include + #include "nat46-core.h" + #include "nat46-module.h" +@@ -40,16 +41,40 @@ static u8 netdev_count = 0; + + static int nat46_netdev_up(struct net_device *dev); + static int nat46_netdev_down(struct net_device *dev); +- ++static int nat46_netdev_init(struct net_device *dev); ++static void nat46_get_stats64(struct net_device *dev, struct rtnl_link_stats64 *tot); + static netdev_tx_t nat46_netdev_xmit(struct sk_buff *skb, struct net_device *dev); + + + static const struct net_device_ops nat46_netdev_ops = { ++ .ndo_init = nat46_netdev_init, /* device specific initialization */ + .ndo_open = nat46_netdev_up, /* Called at ifconfig nat46 up */ + .ndo_stop = nat46_netdev_down, /* Called at ifconfig nat46 down */ + .ndo_start_xmit = nat46_netdev_xmit, /* REQUIRED, must return NETDEV_TX_OK */ ++ .ndo_get_stats64 = nat46_get_stats64, /* 64 bit device stats */ + }; + ++static int nat46_netdev_init(struct net_device *dev) ++{ ++ int i; ++ dev->tstats = alloc_percpu(struct pcpu_sw_netstats); ++ if (!dev->tstats) { ++ return -ENOMEM; ++ } ++ ++ for_each_possible_cpu(i) { ++ struct pcpu_sw_netstats *ipt_stats; ++ ipt_stats = per_cpu_ptr(dev->tstats, i); ++ u64_stats_init(&ipt_stats->syncp); ++ } ++ return 0; ++} ++ ++static void nat46_netdev_resource_free(struct net_device *dev) ++{ ++ free_percpu(dev->tstats); ++} ++ + static int nat46_netdev_up(struct net_device *dev) + { + netif_start_queue(dev); +@@ -65,9 +90,14 @@ static int nat46_netdev_down(struct net_ + static netdev_tx_t nat46_netdev_xmit(struct sk_buff *skb, struct net_device *dev) + { + int ret = 0; ++ struct pcpu_sw_netstats *tstats = get_cpu_ptr(dev->tstats); ++ ++ u64_stats_update_begin(&tstats->syncp); ++ u64_stats_inc(&tstats->rx_packets); ++ u64_stats_add(&tstats->rx_bytes, skb->len); ++ u64_stats_update_end(&tstats->syncp); ++ put_cpu_ptr(tstats); + +- dev->stats.rx_packets++; +- dev->stats.rx_bytes += skb->len; + if(ETH_P_IP == ntohs(skb->protocol)) { + ret = nat46_ipv4_input(skb); + } +@@ -81,22 +111,39 @@ static netdev_tx_t nat46_netdev_xmit(str + } + + void nat46_netdev_count_xmit(struct sk_buff *skb, struct net_device *dev) { +- dev->stats.tx_packets++; +- dev->stats.tx_bytes += skb->len; ++ struct pcpu_sw_netstats *tstats = get_cpu_ptr(dev->tstats); ++ ++ u64_stats_update_begin(&tstats->syncp); ++ u64_stats_inc(&tstats->tx_packets); ++ u64_stats_add(&tstats->tx_bytes, skb->len); ++ u64_stats_update_end(&tstats->syncp); ++ put_cpu_ptr(tstats); + } + + void nat46_update_stats(struct net_device *dev, uint32_t rx_packets, uint32_t rx_bytes, + uint32_t tx_packets, uint32_t tx_bytes, uint32_t rx_dropped, uint32_t tx_dropped) + { +- dev->stats.rx_packets += rx_packets; +- dev->stats.rx_bytes += rx_bytes; +- dev->stats.tx_packets += tx_packets; +- dev->stats.tx_bytes += tx_bytes; ++ struct pcpu_sw_netstats *tstats = get_cpu_ptr(dev->tstats); ++ ++ u64_stats_update_begin(&tstats->syncp); ++ u64_stats_add(&tstats->rx_packets, rx_packets); ++ u64_stats_add(&tstats->rx_bytes, rx_bytes); ++ u64_stats_add(&tstats->tx_packets, tx_packets); ++ u64_stats_add(&tstats->tx_bytes, tx_bytes); + dev->stats.rx_dropped += rx_dropped; + dev->stats.tx_dropped += tx_dropped; ++ u64_stats_update_end(&tstats->syncp); ++ put_cpu_ptr(tstats); + } + EXPORT_SYMBOL(nat46_update_stats); + ++static void nat46_get_stats64(struct net_device *dev, ++ struct rtnl_link_stats64 *tot) ++{ ++ netdev_stats_to_stats64(tot, &dev->stats); ++ dev_fetch_sw_netstats(tot, dev->tstats); ++} ++ + void *netdev_nat46_instance(struct net_device *dev) { + nat46_netdev_priv_t *priv = netdev_priv(dev); + return priv->nat46; +@@ -120,6 +167,7 @@ static void nat46_netdev_setup(struct ne + priv->nat46 = nat46; + + dev->netdev_ops = &nat46_netdev_ops; ++ dev->priv_destructor = nat46_netdev_resource_free; + dev->type = ARPHRD_NONE; + dev->hard_header_len = 0; + dev->addr_len = 0; diff --git a/package/kernel/nat46/patches/108-ce_port.patch b/package/kernel/nat46/patches/108-ce_port.patch new file mode 100644 index 00000000000000..ab6ab37b986e07 --- /dev/null +++ b/package/kernel/nat46/patches/108-ce_port.patch @@ -0,0 +1,134 @@ +Author: Pavithra R +Date: Wed Aug 5 18:59:20 2020 +0530 + +nat46: Copy CE's port number to IPv6 fragment header. + +This patch is propagated from kernel 4.4 commit +7886fd3eb081c7767b02685593bc1d19deaecba8 + +Copy CE's port number to the lower 16-bits of IPv6 identification +number. + +Change-Id: I6946e93bf8bed4c1378d19e75db0729097e0d9eb +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -31,6 +31,7 @@ + + static uint16_t xlate_pkt_in_err_v4_to_v6(nat46_instance_t *nat46, struct iphdr *iph, + struct sk_buff *old_skb, uint16_t *sport, uint16_t *dport); ++static DEFINE_SPINLOCK(port_id_lock); + + void + nat46debug_dump(nat46_instance_t *nat46, int level, void *addr, int len) +@@ -2236,6 +2237,73 @@ static uint16_t xlate_pkt_in_err_v4_to_v + return 1; + } + ++/* Return the port number from CE's port set */ ++static uint16_t nat46_get_ce_port(nat46_xlate_rulepair_t *pair, uint16_t sport) ++{ ++ /* ++ * 'psid_bits_len' represents number of bits in PSID. ++ * 'offset' represents offset of PSID in a port number. ++ */ ++ uint8_t psid_bits_len, offset, port_set_bitmask; ++ ++ /* ++ * 'psid16' represent PSID value. ++ * 'm' represents number of bits in excluded port set. ++ * 'a' represents number of bits in a 16-bit port number after PSID. ++ * It is used to control number of port in one contiguous port set. ++ * ++ * Name of a variable 'a' and 'm' is as per Appendix B of [RFC7597]. ++ */ ++ uint16_t psid16, value, m, a; ++ nat46_xlate_rule_t *rule; ++ ++ /* stores to last port number from CE's port set */ ++ static uint16_t port_num; ++ ++ rule = &pair->local; ++ offset = rule->psid_offset; ++ ++ if (rule->ea_len + rule->v4_pref_len > IPV4_BITS_MAX) { ++ psid_bits_len = rule->ea_len - (IPV4_BITS_MAX - rule->v4_pref_len); ++ } else { ++ return 0; ++ } ++ a = PSID_LEN_MAX - offset - psid_bits_len; ++ psid16 = (ntohs(sport) >> a) & (0xffff >> (PSID_LEN_MAX - psid_bits_len)); ++ ++ spin_lock(&port_id_lock); ++ ++ /* Start case */ ++ if (0 == port_num) { ++ m = (offset) ? 1 : 0; ++ port_num = (m << (PSID_LEN_MAX - offset)) | (psid16 << a); ++ value = port_num; ++ spin_unlock(&port_id_lock); ++ return value; ++ } ++ ++ /* End of one port set */ ++ port_set_bitmask = (1 << a) - 1; ++ value = port_num & port_set_bitmask; ++ if (0 == (value ^ port_set_bitmask)) { ++ m = port_num >> (PSID_LEN_MAX - offset); ++ m++; ++ /* End case */ ++ if (m >= (1 << offset)) { ++ m = (offset) ? 1 : 0; ++ } ++ port_num = (m << (PSID_LEN_MAX - offset)) | (psid16 << a); ++ value = port_num; ++ spin_unlock(&port_id_lock); ++ return value; ++ } ++ ++ port_num++; ++ value = port_num; ++ spin_unlock(&port_id_lock); ++ return value; ++} ++ + int nat46_ipv4_input(struct sk_buff *old_skb) { + nat46_instance_t *nat46 = get_nat46_instance(old_skb); + nat46_xlate_rulepair_t apair; +@@ -2368,9 +2436,34 @@ int nat46_ipv4_input(struct sk_buff *old + + if (add_frag_header) { + struct frag_hdr *fh = (struct frag_hdr*)(hdr6 + 1); ++ uint16_t ce_port_num = 0; ++ ++ /* Flag to represent whether PSID is assigned to MAP-T node or not */ ++ bool is_psid = false; ++ + fh->frag_off = htons(((ntohs(hdr4->frag_off) >> 13) & 7) + ((ntohs(hdr4->frag_off) & 0x1FFF) << 3)); + fh->nexthdr = hdr4->protocol; +- fh->identification = htonl(ntohs(hdr4->id)); ++ ++ /* ++ * PSID assigned MAP-T node will have non-zero ea_len and we are currently ++ * only supporting NAT46_XLATE_MAP as the CE's rule style. ++ */ ++ is_psid = (apair.local.style == NAT46_XLATE_MAP) && apair.local.ea_len; ++ if (is_psid) { ++ ce_port_num = nat46_get_ce_port(nat46->pairs, sport); ++ nat46debug(10, "\n ce port number is %02x\n", ce_port_num); ++ ++ /* Assign CE's port number as the fragment identifier */ ++ if (ce_port_num) { ++ fh->identification = htonl(ce_port_num); ++ } else { ++ fh->identification = htonl(ntohs(hdr4->id)); ++ } ++ } else { ++ fh->identification = htonl(ntohs(hdr4->id)); ++ } ++ ++ + } + ip6_update_csum(new_skb, hdr6, add_frag_header); + diff --git a/package/kernel/nat46/patches/109-fragment_if_not_df_and_larger_than_mtu.patch b/package/kernel/nat46/patches/109-fragment_if_not_df_and_larger_than_mtu.patch new file mode 100644 index 00000000000000..333228a97496c3 --- /dev/null +++ b/package/kernel/nat46/patches/109-fragment_if_not_df_and_larger_than_mtu.patch @@ -0,0 +1,30 @@ +Author: Pavithra R +Date: Wed Aug 5 19:26:48 2020 +0530 + +nat46: Fix the issue of packets not fragmented + +This patch is propagated from the kernel 4.4 commit +e598f9c249092abd7c7978fe99b6690884f225c9 + +when packets size is larger than the MTU of dst, if DF flag is not set, +fragment it instead of dropping it with PktTooBig ICMPv6 message. + +Change-Id: I380d42f59bb4f46a45e542f251f5710f2cca8b62 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -2343,10 +2343,11 @@ int nat46_ipv4_input(struct sk_buff *old + } + hdr4 = ip_hdr(old_skb); + check_for_l4 = 1; +- if (add_dummy_header) { +- if (0 == (ntohs(hdr4->frag_off) & IP_DF)) { ++ if (0 == (ntohs(hdr4->frag_off) & IP_DF)) { ++ if (add_dummy_header) { + add_frag_header = 1; + } ++ old_skb->ignore_df = 1; + } + } else { + add_frag_header = 1; diff --git a/package/kernel/nat46/patches/110-icmp_error_not_handled.patch b/package/kernel/nat46/patches/110-icmp_error_not_handled.patch new file mode 100644 index 00000000000000..5697c609732ccf --- /dev/null +++ b/package/kernel/nat46/patches/110-icmp_error_not_handled.patch @@ -0,0 +1,100 @@ +Author: Pavithra R +Date: Wed Aug 5 20:16:27 2020 +0530 + +nat46: fix ICMPv6 error message dropped locally + +This patch is propagated from the kernel 4.4 commit +1b96bd0e9ee9182566b119741854c03bf4b94a99 + +While routing IPv6 packets from a customer-side translated device (CLAT) +to a provider-side translated device (PLAT), it is possible that the IPv6 +destination is unknown. In such a scenario, the IPv6 stack must send back +an ICMP error. However, the source IPv6 address of this error message does +not have a MAP-T translation. According to RFC2473, the translation layer +should use the tunnel's own IPv4 address for the IPv6 ICMP packet's source +address. + +Change-Id: I784473cddf9214843c466d10763cb66852139ef6 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -1782,11 +1782,12 @@ static uint16_t nat46_fixup_icmp(nat46_i + return ret; + } + +-int pairs_xlate_v6_to_v4_outer(nat46_instance_t *nat46, nat46_xlate_rulepair_t *apair, ++int pairs_xlate_v6_to_v4_outer(nat46_instance_t *nat46, nat46_xlate_rulepair_t **papair, + struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr) { + int ipair = 0; + int xlate_src = -1; + int xlate_dst = -1; ++ nat46_xlate_rulepair_t *apair; + + for(ipair = 0; ipair < nat46->npairs; ipair++) { + apair = nat46_lpm(nat46, NAT46_IPV6_REMOTE, &ip6h->saddr); +@@ -1794,6 +1795,7 @@ int pairs_xlate_v6_to_v4_outer(nat46_ins + return 0; + } + ++ *papair = apair; + if (xlate_v6_to_v4(nat46, &apair->local, &ip6h->daddr, pv4daddr)) { + nat46debug(5, "Dst addr %pI6 to %pI4 \n", &ip6h->daddr, pv4daddr); + xlate_dst = ipair; +@@ -1822,14 +1824,14 @@ int pairs_xlate_v6_to_v4_outer(nat46_ins + } + + int xlate_6_to_4(struct net_device *dev, struct ipv6hdr *ip6h, uint16_t proto, __u32 *pv4saddr, __u32 *pv4daddr) { +- nat46_xlate_rulepair_t apair; ++ nat46_xlate_rulepair_t *apair; + return pairs_xlate_v6_to_v4_outer(netdev_nat46_instance(dev), &apair, ip6h, proto, pv4saddr, pv4daddr); + } + EXPORT_SYMBOL(xlate_6_to_4); + + int nat46_ipv6_input(struct sk_buff *old_skb) { + struct ipv6hdr *ip6h = ipv6_hdr(old_skb); +- nat46_xlate_rulepair_t apair; ++ nat46_xlate_rulepair_t *apair; + nat46_instance_t *nat46 = get_nat46_instance(old_skb); + uint16_t proto; + uint16_t frag_off; +@@ -1903,8 +1905,37 @@ int nat46_ipv6_input(struct sk_buff *old + } + + if (!pairs_xlate_v6_to_v4_outer(nat46, &apair, ip6h, proto, &v4saddr, &v4daddr)) { +- nat46debug(0, "[nat46] Could not translate v6->v4"); +- goto done; ++ if (proto == NEXTHDR_ICMP) { ++ struct icmp6hdr *icmp6h = add_offset(ip6h, v6packet_l3size); ++ struct ipv6hdr *ip6h_inner = (struct ipv6hdr *) (icmp6h + 1); ++ struct ipv6hdr hdr6; ++ switch(icmp6h->icmp6_type) { ++ case ICMPV6_DEST_UNREACH: ++ case ICMPV6_PKT_TOOBIG: ++ case ICMPV6_TIME_EXCEED: ++ case ICMPV6_PARAMPROB: ++ /* ++ * For icmpv6 error message, using the original message ++ * address to locate the apair one more time according ++ * to the RFC 2473, and use the ipv4 address of the ++ * tunnel as SRC ipv4 address ++ */ ++ memcpy(&hdr6.saddr, &ip6h_inner->daddr, 16); ++ memcpy(&hdr6.daddr, &ip6h_inner->saddr, 16); ++ if (!pairs_xlate_v6_to_v4_outer(nat46, &apair, &hdr6, proto, &v4saddr, &v4daddr)) { ++ nat46debug(0, "[nat46] Could not translate v6->v4"); ++ goto done; ++ } ++ v4saddr = apair->local.v4_pref; ++ break; ++ default: ++ nat46debug(0, "[nat46] Could not translate v6->v4"); ++ goto done; ++ } ++ } else { ++ nat46debug(0, "[nat46] Could not translate v6->v4"); ++ goto done; ++ } + } + + if (check_for_l4) { diff --git a/package/kernel/nat46/patches/111-fix_null_point_reference.patch b/package/kernel/nat46/patches/111-fix_null_point_reference.patch new file mode 100644 index 00000000000000..4cef9db199d639 --- /dev/null +++ b/package/kernel/nat46/patches/111-fix_null_point_reference.patch @@ -0,0 +1,40 @@ +Author: Pavithra R +Date: Wed Aug 5 20:35:00 2020 +0530 + +nat46: Fix null pointer dereference issue + +This patch is propagated from the kernel 4.4 commit +5bdf9bd5500c45ab5a3fd43e60c40a09d5e5a13d + +get_nat46_instance possibly returns null point, before using the returning +point, caller needs to check if it is null. + +Change-Id: Id407a71ca8eccd60a713c34429e7e3f16e2cdd12 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -1847,6 +1847,11 @@ int nat46_ipv6_input(struct sk_buff *old + int l3_infrag_payload_len = ntohs(ip6h->payload_len); + int check_for_l4 = 0; + ++ if (nat46 == NULL) { ++ printk("nat46:%p skb is dropped for no valid instance found\n", old_skb); ++ return err; ++ } ++ + nat46debug(4, "nat46_ipv6_input packet"); + + if(ip6_input_not_interested(nat46, ip6h, old_skb)) { +@@ -2353,6 +2358,11 @@ int nat46_ipv4_input(struct sk_buff *old + + char v6saddr[16], v6daddr[16]; + ++ if (nat46 == NULL) { ++ printk("nat46:%p skb is dropped for no valid instance found\n", old_skb); ++ return err; ++ } ++ + memset(v6saddr, 1, 16); + memset(v6daddr, 2, 16); + diff --git a/package/kernel/nat46/patches/112-fix_icmp_crash.patch b/package/kernel/nat46/patches/112-fix_icmp_crash.patch new file mode 100644 index 00000000000000..5d34697a45b84d --- /dev/null +++ b/package/kernel/nat46/patches/112-fix_icmp_crash.patch @@ -0,0 +1,40 @@ +Author: Pavithra R +Date: Wed Aug 5 20:57:33 2020 +0530 + +Fix crash of free skb + +This patch is propagated from the 4.4 kernel commit +b959b0d45c66ae004a5bfc1687980093fa5b8cc3. + +This is caused by the translation of the inner ipv6 header, it +move memory by the inner head's tot_len which is not exact that +inner packet will be trimmed for icmp error packets size no more +than 576. + +Change-Id: Id5d41fa0721acdf6ea76721c45415fe3be432207 +Signed-off-by: Pavithra R + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -2245,7 +2245,9 @@ static uint16_t xlate_pkt_in_err_v4_to_v + + if (skb_tailroom(old_skb) >= IPV6V4HDRDELTA){ + skb_put(old_skb, IPV6V4HDRDELTA); +- memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), ntohs(iiph->tot_len) - IPV4HDRSIZE); ++ /* ErrorICMP size is less than 576, the inner ipv4 packet will be trimmed */ ++ memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), ++ ntohs(iph->tot_len) - 2 * IPV4HDRSIZE - sizeof(struct icmphdr)); + memcpy(iiph, &ip6h, IPV6HDRSIZE); + } + else { +@@ -2258,7 +2260,9 @@ static uint16_t xlate_pkt_in_err_v4_to_v + + skb_put(old_skb, IPV6V4HDRDELTA); + iiph = (struct iphdr *)(icmp_hdr(old_skb) + 1); +- memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), ntohs(iiph->tot_len) - IPV4HDRSIZE); ++ /* ErrorICMP size is less than 576, the inner ipv4 packet will be trimmed */ ++ memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), ++ ntohs(iph->tot_len) - 2 * IPV4HDRSIZE - sizeof(struct icmphdr)); + memcpy(iiph, &ip6h, IPV6HDRSIZE); + nat46 = get_nat46_instance(old_skb); + iph = ip_hdr(old_skb); diff --git a/package/kernel/nat46/patches/116-rate-limit-the-print.patch b/package/kernel/nat46/patches/116-rate-limit-the-print.patch new file mode 100644 index 00000000000000..d857d0e6cb0a05 --- /dev/null +++ b/package/kernel/nat46/patches/116-rate-limit-the-print.patch @@ -0,0 +1,34 @@ +Author: Pavithra R +Date: Wed Sep 30 14:05:50 2020 +0530 + +nat46: Add rate limit to a print. + +This patch is propagated from the kernel 4.4 commit +d47f62508d2c105f236470e56bedbe279db0e6f1 + +Change-Id: I2119fbe54d630c3ed39535f1cb1b8a0d9d3199b4 +Signed-off-by: Pavithra R +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -1928,7 +1928,9 @@ int nat46_ipv6_input(struct sk_buff *old + memcpy(&hdr6.saddr, &ip6h_inner->daddr, 16); + memcpy(&hdr6.daddr, &ip6h_inner->saddr, 16); + if (!pairs_xlate_v6_to_v4_outer(nat46, &apair, &hdr6, proto, &v4saddr, &v4daddr)) { +- nat46debug(0, "[nat46] Could not translate v6->v4"); ++ if (net_ratelimit()) { ++ nat46debug(0, "[nat46] Could not translate v6->v4"); ++ } + goto done; + } + v4saddr = apair->local.v4_pref; +@@ -2436,7 +2438,9 @@ int nat46_ipv4_input(struct sk_buff *old + } + + if(!pairs_xlate_v4_to_v6_outer(nat46, &apair, hdr4, having_l4 ? &sport : NULL, having_l4 ? &dport : NULL, v6saddr, v6daddr)) { +- nat46debug(0, "[nat46] Could not translate v4->v6"); ++ if (net_ratelimit()) { ++ nat46debug(0, "[nat46] Could not translate v4->v6"); ++ } + goto done; + } + diff --git a/package/kernel/nat46/patches/117-fix-icmp-no-payload-bug.patch b/package/kernel/nat46/patches/117-fix-icmp-no-payload-bug.patch new file mode 100644 index 00000000000000..a8bff4a945457c --- /dev/null +++ b/package/kernel/nat46/patches/117-fix-icmp-no-payload-bug.patch @@ -0,0 +1,34 @@ +Author: Pavithra R +Date: Wed Sep 30 14:27:37 2020 +0530 + +nat46: Fix for ICMP error packets with no payload. + +This patch is propagated from the kernel 4.4 commit +d8b29a8e31f948a5d7338aa69c36e0f654fcb9e4 + +When no payload is attached to the original packet, any +ICMP error message generated in response to such packets +gets dropped due to malformed packet at CE. + +During the translation of packet-in-error in ICMP, +the IPv6 header in ICMPv6 payload gets corrupted. +Hence, the translated packet gets dropped at CE. + +This fix updates the outer IPv4 header's total length +before translating to IPv6 header. + +Change-Id: Ifd9802afb50771de39b4c6fb734d36b0801613ec +Signed-off-by: Pavithra R +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -2266,9 +2266,8 @@ static uint16_t xlate_pkt_in_err_v4_to_v + memmove(((char *)iiph + IPV6HDRSIZE), (iiph + 1), + ntohs(iph->tot_len) - 2 * IPV4HDRSIZE - sizeof(struct icmphdr)); + memcpy(iiph, &ip6h, IPV6HDRSIZE); +- nat46 = get_nat46_instance(old_skb); +- iph = ip_hdr(old_skb); + } ++ iph->tot_len = htons(ntohs(iph->tot_len) + IPV6V4HDRDELTA); + + /* Swapping Ports for outer header */ + /* Another work-around till LPM is not present. */ diff --git a/package/kernel/nat46/patches/118-performance_fix.patch b/package/kernel/nat46/patches/118-performance_fix.patch new file mode 100644 index 00000000000000..5de4906ef99f7f --- /dev/null +++ b/package/kernel/nat46/patches/118-performance_fix.patch @@ -0,0 +1,415 @@ +Author: Suruchi Agarwal +Date: Fri Dec 17 13:37:15 2021 -0800 + + nat46: Performance fix + + Avoid allocating new skb and copy for map-t translation + + Change-Id: I621b90609b4642d64b6e4cfb98b105b3fcbb0365 + Signed-off-by: Suruchi Agarwal + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -118,7 +118,7 @@ char *get_next_arg(char **ptail) { + return pc; + } + +-/* ++/* + * Parse an IPv6 address (if pref_len is NULL), or prefix (if it isn't). + * parses destructively (places \0 between address and prefix len) + */ +@@ -163,7 +163,7 @@ int try_parse_ipv4_prefix(u32 *v4addr, i + } + + +-/* ++/* + * parse a rule argument and put config into a rule. + * advance the tail to prepare for the next arg parsing. + * destructive. +@@ -384,7 +384,7 @@ char *xlate_style_to_string(nat46_xlate_ + return "unknown"; + } + +-/* ++/* + * Get the nat46 configuration into a supplied buffer (if non-null). + */ + int nat46_get_ipair_config(nat46_instance_t *nat46, int ipair, char *buf, int count) { +@@ -985,6 +985,28 @@ __sum16 csum_ipv6_unmagic(nat46_instance + return csum; + } + ++/* Update UDP with incremental checksum */ ++__sum16 csum_ipv6_udp_remagic(struct ipv6hdr *ip6hdr, u32 csum) { ++ uint32_t sum; ++ sum = csum_partial(ip6hdr->saddr.s6_addr16, 2 * sizeof(ip6hdr->saddr), ~csum); ++ sum = ((sum >> 16) & 0xffff) + (sum & 0xffff); ++ sum += ((sum >> 16) & 0xffff); ++ return (u16)(~sum); ++} ++ ++/* Undo the IPv4 pseudoheader inclusion into the checksum */ ++__sum16 csum_ipv4_unmagic(__be32 saddr, __be32 daddr, ++ u32 csum) { ++ u32 s; ++ uint32_t addr_csum; ++ csum = ntohs(~csum); ++ addr_csum = (saddr & 0xffff) + (saddr >> 16) + (daddr & 0xffff) + (daddr >> 16); ++ s= csum + ntohs(~addr_csum); ++ s = ((s >> 16) & 0xffff) + (s & 0xffff); ++ s += ((s >> 16) & 0xffff); ++ return htons((u16)(~s)); ++} ++ + /* Update ICMPv6 type/code with incremental checksum adjustment */ + void update_icmp6_type_code(nat46_instance_t *nat46, struct icmp6hdr *icmp6h, u8 type, u8 code) { + u16 old_tc = *((u16 *)icmp6h); +@@ -1038,9 +1060,8 @@ void fill_v6hdr_from_v4hdr(struct iphdr + ip6h->hop_limit = iph->ttl; + } + +-void fill_v4hdr_from_v6hdr(struct iphdr * iph, struct ipv6hdr *ip6h, __u32 v4saddr, __u32 v4daddr, __u16 id, __u16 frag_off, __u16 proto, int l3_payload_len) { +- uint32_t ver_class_flow = ntohl(*(__be32 *)ip6h); +- iph->ttl = ip6h->hop_limit; ++void fill_v4hdr_from_v6hdr(struct iphdr * iph, uint32_t ver_class_flow, uint8_t hop_limit, __u32 v4saddr, __u32 v4daddr, __u16 id, __u16 frag_off, __u16 proto, int l3_payload_len) { ++ iph->ttl = hop_limit; + iph->saddr = v4saddr; + iph->daddr = v4daddr; + iph->protocol = proto; +@@ -1198,6 +1219,8 @@ void pairs_xlate_v6_to_v4_inner(nat46_in + */ + int xlate_payload6_to4(nat46_instance_t *nat46, void *pv6, void *ptrans_hdr, int v6_len, u16 *ul_sum, int *ptailTruncSize) { + struct ipv6hdr *ip6h = pv6; ++ uint32_t ver_class_flow; ++ uint8_t hop_limit; + __u32 v4saddr, v4daddr; + struct iphdr new_ipv4; + struct iphdr *iph = &new_ipv4; +@@ -1274,7 +1297,10 @@ int xlate_payload6_to4(nat46_instance_t + } + } + +- fill_v4hdr_from_v6hdr(iph, ip6h, v4saddr, v4daddr, ipid, ipflags, proto, infrag_payload_len); ++ ver_class_flow = ntohl(*(__be32 *)ip6h); ++ hop_limit = ip6h->hop_limit; ++ ++ fill_v4hdr_from_v6hdr(iph, ver_class_flow, hop_limit, v4saddr, v4daddr, ipid, ipflags, proto, infrag_payload_len); + if(ul_sum) { + *ul_sum = unchecksum16(pv6, (((u8 *)ptrans_hdr)-((u8 *)pv6))/2, *ul_sum); + *ul_sum = rechecksum16(iph, 10, *ul_sum); +@@ -1831,6 +1857,8 @@ EXPORT_SYMBOL(xlate_6_to_4); + + int nat46_ipv6_input(struct sk_buff *old_skb) { + struct ipv6hdr *ip6h = ipv6_hdr(old_skb); ++ uint32_t ver_class_flow; ++ uint8_t hop_limit; + nat46_xlate_rulepair_t *apair; + nat46_instance_t *nat46 = get_nat46_instance(old_skb); + uint16_t proto; +@@ -1839,22 +1867,20 @@ int nat46_ipv6_input(struct sk_buff *old + + struct iphdr * iph; + __u32 v4saddr, v4daddr; +- struct sk_buff * new_skb = 0; + int err = 0; +- int truncSize = 0; + int tailTruncSize = 0; + int v6packet_l3size = sizeof(*ip6h); + int l3_infrag_payload_len = ntohs(ip6h->payload_len); + int check_for_l4 = 0; + +- if (nat46 == NULL) { ++ if (unlikely(nat46 == NULL)) { + printk("nat46:%p skb is dropped for no valid instance found\n", old_skb); + return err; + } + + nat46debug(4, "nat46_ipv6_input packet"); + +- if(ip6_input_not_interested(nat46, ip6h, old_skb)) { ++ if(unlikely(ip6_input_not_interested(nat46, ip6h, old_skb))) { + nat46debug(1, "nat46_ipv6_input not interested"); + goto done; + } +@@ -1985,47 +2011,45 @@ int nat46_ipv6_input(struct sk_buff *old + } + } + +- new_skb = skb_copy(old_skb, GFP_ATOMIC); // other possible option: GFP_ATOMIC +- if (!new_skb) { +- nat46debug(0, "[nat46] Could not copy v6 skb"); +- goto done; +- } ++ ver_class_flow = ntohl(*(__be32 *)ip6h); ++ hop_limit = ip6h->hop_limit; + + /* Remove any debris in the socket control block */ +- memset(IPCB(new_skb), 0, sizeof(struct inet_skb_parm)); ++ memset(IPCB(old_skb), 0, sizeof(struct inet_skb_parm)); ++ + /* Remove netfilter references to IPv6 packet, new netfilter references will be created based on IPv4 packet */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) +- nf_reset(new_skb); ++ nf_reset(old_skb); + #else +- skb_ext_reset(new_skb); +- nf_reset_ct(new_skb); ++ skb_ext_reset(old_skb); ++ nf_reset_ct(old_skb); + #endif + + /* modify packet: actual IPv6->IPv4 transformation */ +- truncSize = v6packet_l3size - sizeof(struct iphdr); /* chop first 20 bytes */ +- skb_pull(new_skb, truncSize); +- skb_put(new_skb, -tailTruncSize); ++ skb_pull(old_skb, sizeof(struct iphdr)); + l3_infrag_payload_len -= tailTruncSize; +- skb_reset_network_header(new_skb); +- skb_set_transport_header(new_skb,IPV4HDRSIZE); /* transport (TCP/UDP/ICMP/...) header starts after 20 bytes */ ++ skb_reset_mac_header(old_skb); ++ skb_reset_network_header(old_skb); ++ skb_set_transport_header(old_skb,IPV4HDRSIZE); /* transport (TCP/UDP/ICMP/...) header starts after 20 bytes */ + + /* build IPv4 header */ +- iph = ip_hdr(new_skb); +- fill_v4hdr_from_v6hdr(iph, ip6h, v4saddr, v4daddr, frag_id, frag_off, proto, l3_infrag_payload_len); +- new_skb->protocol = htons(ETH_P_IP); ++ iph = ip_hdr(old_skb); ++ fill_v4hdr_from_v6hdr(iph, ver_class_flow, hop_limit, v4saddr, v4daddr, frag_id, frag_off, proto, l3_infrag_payload_len); ++ old_skb->protocol = htons(ETH_P_IP); + + if (ntohs(iph->tot_len) >= 2000) { + nat46debug(0, "Too big IP len: %d", ntohs(iph->tot_len)); + } + +- nat46debug(5, "about to send v4 packet, flags: %02x", IPCB(new_skb)->flags); +- nat46_netdev_count_xmit(new_skb, old_skb->dev); ++ nat46debug(5, "about to send v4 packet, flags: %02x", IPCB(old_skb)->flags); ++ nat46_netdev_count_xmit(old_skb, old_skb->dev); + +- /* set skb->iif */ +- new_skb->skb_iif = old_skb->skb_iif; +- +- netif_rx(new_skb); ++ netif_rx(old_skb); + ++ /* ++ * skb was consumed in the ipv4 format, don't release later. ++ */ ++ err = 1; + /* TBD: should copy be released here? */ + + done: +@@ -2056,7 +2080,7 @@ bool nat46_get_info(struct net_device *d + } + EXPORT_SYMBOL(nat46_get_info); + +-void ip6_update_csum(struct sk_buff * skb, struct ipv6hdr * ip6hdr, int do_atomic_frag) ++void ip6_update_csum(struct sk_buff * skb, struct ipv6hdr * ip6hdr, uint32_t v4saddr, uint32_t v4daddr, int do_atomic_frag) + { + u32 sum1=0; + u16 sum2=0; +@@ -2079,12 +2103,13 @@ void ip6_update_csum(struct sk_buff * sk + struct udphdr *udp = udp_hdr(skb); + unsigned udplen = ntohs(ip6hdr->payload_len) - (do_atomic_frag?8:0); /* UDP hdr + payload */ + +- oldsum = udp->check; +- udp->check = 0; +- +- sum1 = csum_partial((char*)udp, udplen, 0); /* calculate checksum for UDP hdr+payload */ +- sum2 = csum_ipv6_magic(&ip6hdr->saddr, &ip6hdr->daddr, udplen, ip6hdr->nexthdr, sum1); /* add pseudoheader */ +- ++ if (!udp->check) { ++ sum1 = csum_partial((char*)udp, udplen, 0); /* calculate checksum for UDP hdr+payload */ ++ sum2 = csum_ipv6_magic(&ip6hdr->saddr, &ip6hdr->daddr, udplen, ip6hdr->nexthdr, sum1); /* add pseudoheader */ ++ } else { ++ sum1 = csum_ipv4_unmagic(v4saddr, v4daddr, udp->check); ++ sum2 = csum_ipv6_udp_remagic(ip6hdr, sum1); ++ } + udp->check = sum2; + + break; +@@ -2348,7 +2373,6 @@ static uint16_t nat46_get_ce_port(nat46_ + int nat46_ipv4_input(struct sk_buff *old_skb) { + nat46_instance_t *nat46 = get_nat46_instance(old_skb); + nat46_xlate_rulepair_t apair; +- struct sk_buff *new_skb; + uint16_t sport = 0, dport = 0, ret = 0; + + int err = 0; +@@ -2360,10 +2384,15 @@ int nat46_ipv4_input(struct sk_buff *old + + struct ipv6hdr * hdr6; + struct iphdr * hdr4 = ip_hdr(old_skb); ++ uint32_t v4saddr, v4daddr; ++ uint8_t ttl; ++ uint16_t tot_len; ++ uint8_t protocol; ++ uint16_t frag_off, id; + + char v6saddr[16], v6daddr[16]; + +- if (nat46 == NULL) { ++ if (unlikely(nat46 == NULL)) { + printk("nat46:%p skb is dropped for no valid instance found\n", old_skb); + return err; + } +@@ -2443,31 +2472,39 @@ int nat46_ipv4_input(struct sk_buff *old + goto done; + } + +- new_skb = skb_copy(old_skb, GFP_ATOMIC); +- if (!new_skb) { +- nat46debug(0, "[nat46] Could not copy v4 skb"); +- goto done; +- } ++ v4saddr = hdr4->saddr; ++ v4daddr = hdr4->daddr; ++ protocol = hdr4->protocol; ++ tot_len = hdr4->tot_len; ++ ttl = hdr4->ttl; ++ frag_off = hdr4->frag_off; ++ id = hdr4->id; + + /* Remove any debris in the socket control block */ +- memset(IP6CB(new_skb), 0, sizeof(struct inet6_skb_parm)); ++ memset(IP6CB(old_skb), 0, sizeof(struct inet6_skb_parm)); + /* Remove netfilter references to IPv4 packet, new netfilter references will be created based on IPv6 packet */ + #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) +- nf_reset(new_skb); ++ nf_reset(old_skb); + #else +- skb_ext_reset(new_skb); +- nf_reset_ct(new_skb); ++ skb_ext_reset(old_skb); ++ nf_reset_ct(old_skb); + #endif + + /* expand header (add 20 extra bytes at the beginning of sk_buff) */ +- pskb_expand_head(new_skb, IPV6HDRSIZE - (hdr4->ihl << 2) + (add_frag_header?8:0), 0, GFP_ATOMIC); ++ if (skb_headroom(old_skb) < IPV6V4HDRDELTA) { ++ ret = pskb_expand_head(old_skb, IPV6V4HDRDELTA + (add_frag_header?8:0), 0, GFP_ATOMIC); ++ if (unlikely(ret)) { ++ nat46debug(0, "[nat46] Could not expand skb header"); ++ goto done; ++ } ++ } + +- skb_push(new_skb, IPV6HDRSIZE - (hdr4->ihl << 2) + (add_frag_header?8:0)); /* push boundary by extra 20 bytes */ ++ skb_push(old_skb, IPV6HDRSIZE - (hdr4->ihl << 2) + (add_frag_header?8:0)); /* push boundary by extra 20 bytes */ + +- skb_reset_network_header(new_skb); +- skb_set_transport_header(new_skb, IPV6HDRSIZE + (add_frag_header?8:0) ); /* transport (TCP/UDP/ICMP/...) header starts after 40 bytes */ ++ skb_reset_network_header(old_skb); ++ skb_set_transport_header(old_skb, IPV6HDRSIZE + (add_frag_header?8:0) ); /* transport (TCP/UDP/ICMP/...) header starts after 40 bytes */ + +- hdr6 = ipv6_hdr(new_skb); ++ hdr6 = ipv6_hdr(old_skb); + memset(hdr6, 0, sizeof(*hdr6) + (add_frag_header?8:0)); + + /* build IPv6 header */ +@@ -2475,13 +2512,14 @@ int nat46_ipv4_input(struct sk_buff *old + *(__be32 *)hdr6 = htonl(0x60000000 | (tclass << 20)) | flowlabel; /* version, priority, flowlabel */ + + /* IPv6 length is a payload length, IPv4 is hdr+payload */ +- hdr6->payload_len = htons(ntohs(hdr4->tot_len) - (hdr4->ihl << 2) + (add_frag_header?8:0)); +- hdr6->nexthdr = hdr4->protocol; +- hdr6->hop_limit = hdr4->ttl; ++ hdr6->payload_len = htons(ntohs(tot_len) - sizeof(struct iphdr) + (add_frag_header?8:0)); ++ hdr6->nexthdr = protocol; ++ hdr6->hop_limit = ttl; ++ + memcpy(&hdr6->saddr, v6saddr, 16); + memcpy(&hdr6->daddr, v6daddr, 16); + +- new_skb->protocol = htons(ETH_P_IPV6); ++ old_skb->protocol = htons(ETH_P_IPV6); + + if (add_frag_header) { + struct frag_hdr *fh = (struct frag_hdr*)(hdr6 + 1); +@@ -2490,8 +2528,8 @@ int nat46_ipv4_input(struct sk_buff *old + /* Flag to represent whether PSID is assigned to MAP-T node or not */ + bool is_psid = false; + +- fh->frag_off = htons(((ntohs(hdr4->frag_off) >> 13) & 7) + ((ntohs(hdr4->frag_off) & 0x1FFF) << 3)); +- fh->nexthdr = hdr4->protocol; ++ fh->frag_off = htons(((ntohs(frag_off) >> 13) & 7) + ((ntohs(frag_off) & 0x1FFF) << 3)); ++ fh->nexthdr = protocol; + + /* + * PSID assigned MAP-T node will have non-zero ea_len and we are currently +@@ -2506,29 +2544,30 @@ int nat46_ipv4_input(struct sk_buff *old + if (ce_port_num) { + fh->identification = htonl(ce_port_num); + } else { +- fh->identification = htonl(ntohs(hdr4->id)); ++ fh->identification = htonl(ntohs(id)); + } + } else { +- fh->identification = htonl(ntohs(hdr4->id)); ++ fh->identification = htonl(ntohs(id)); + } + + + } +- ip6_update_csum(new_skb, hdr6, add_frag_header); ++ ip6_update_csum(old_skb, hdr6, v4saddr, v4daddr, add_frag_header); + +- hdr6->nexthdr = add_frag_header ? NEXTHDR_FRAGMENT : hdr4->protocol; ++ hdr6->nexthdr = add_frag_header ? NEXTHDR_FRAGMENT : protocol; + + + // FIXME: check if you can not fit the packet into the cached MTU +- // if (dst_mtu(skb_dst(new_skb))==0) { } +- +- nat46debug(5, "about to send v6 packet, flags: %02x", IP6CB(new_skb)->flags); +- nat46_netdev_count_xmit(new_skb, old_skb->dev); ++ // if (dst_mtu(skb_dst(old_skb))==0) { } + +- /* set skb->iif */ +- new_skb->skb_iif = old_skb->skb_iif; ++ nat46debug(5, "about to send v6 packet, flags: %02x", IPCB(old_skb)->flags); ++ nat46_netdev_count_xmit(old_skb, old_skb->dev); ++ netif_rx(old_skb); + +- netif_rx(new_skb); ++ /* ++ * skb was reused, needn't free it later. ++ */ ++ err = 1; + + done: + release_nat46_instance(nat46); +--- a/nat46/modules/nat46-core.h ++++ b/nat46/modules/nat46-core.h +@@ -39,7 +39,7 @@ + #define IPV4HDRSIZE 20 + #define IPV6V4HDRDELTA (IPV6HDRSIZE - IPV4HDRSIZE) + +-/* ++/* + * A generic v4<->v6 translation structure. + * The currently supported translation styles: + */ +--- a/nat46/modules/nat46-netdev.c ++++ b/nat46/modules/nat46-netdev.c +@@ -100,8 +100,7 @@ static netdev_tx_t nat46_netdev_xmit(str + + if(ETH_P_IP == ntohs(skb->protocol)) { + ret = nat46_ipv4_input(skb); +- } +- if(ETH_P_IPV6 == ntohs(skb->protocol)) { ++ }else if(ETH_P_IPV6 == ntohs(skb->protocol)) { + ret = nat46_ipv6_input(skb); + } + if(0 == ret) { +@@ -174,6 +173,7 @@ static void nat46_netdev_setup(struct ne + dev->mtu = 16384; /* iptables does reassembly. Rather than using ETH_DATA_LEN, let's try to get as much mileage as we can with the Linux stack */ + dev->features = NETIF_F_NETNS_LOCAL; + dev->flags = IFF_NOARP | IFF_POINTOPOINT; ++ dev->priv_flags_ext = IFF_EXT_MAPT; + } + + int nat46_netdev_create(char *basename, struct net_device **dev) diff --git a/package/kernel/nat46/patches/120-sleeping_backtrace.patch b/package/kernel/nat46/patches/120-sleeping_backtrace.patch new file mode 100644 index 00000000000000..5963af2b0365d7 --- /dev/null +++ b/package/kernel/nat46/patches/120-sleeping_backtrace.patch @@ -0,0 +1,57 @@ +commit 9457a8be6e700f39e6b545f8db0edd30c0693700 +Author: Ken Zhu +Date: Tue Sep 6 11:11:20 2022 -0700 + + nat46: fix sleeping warning back trace + + use spin_lock instead of mutex_lock since + mutex_lock could sleep in the kernel packet process. + + Change-Id: I65c15a9f618ef296159884a0d6d742e66aaf6623 + Signed-off-by: Ken Zhu + +--- a/nat46/modules/nat46-glue.c ++++ b/nat46/modules/nat46-glue.c +@@ -18,7 +18,7 @@ + #include "nat46-glue.h" + #include "nat46-core.h" + +-static DEFINE_MUTEX(ref_lock); ++static DEFINE_SPINLOCK(ref_lock); + int is_valid_nat46(nat46_instance_t *nat46) { + return (nat46 && (nat46->sig == NAT46_SIGNATURE)); + } +@@ -47,28 +47,27 @@ nat46_instance_t *alloc_nat46_instance(i + return nat46; + } + +- + nat46_instance_t *get_nat46_instance(struct sk_buff *sk) { + nat46_instance_t *nat46 = netdev_nat46_instance(sk->dev); +- mutex_lock(&ref_lock); ++ spin_lock_bh(&ref_lock); + if (is_valid_nat46(nat46)) { + nat46->refcount++; +- mutex_unlock(&ref_lock); ++ spin_unlock_bh(&ref_lock); + return nat46; + } else { + printk("[nat46] get_nat46_instance: Could not find a valid NAT46 instance!"); +- mutex_unlock(&ref_lock); ++ spin_unlock_bh(&ref_lock); + return NULL; + } + } + + void release_nat46_instance(nat46_instance_t *nat46) { +- mutex_lock(&ref_lock); ++ spin_lock_bh(&ref_lock); + nat46->refcount--; + if(0 == nat46->refcount) { + printk("[nat46] release_nat46_instance: freeing nat46 instance with %d pairs\n", nat46->npairs); + nat46->sig = FREED_NAT46_SIGNATURE; + kfree(nat46); + } +- mutex_unlock(&ref_lock); ++ spin_unlock_bh(&ref_lock); + } diff --git a/package/kernel/nat46/patches/121-tos-fix.patch b/package/kernel/nat46/patches/121-tos-fix.patch new file mode 100644 index 00000000000000..6b265886f5b70b --- /dev/null +++ b/package/kernel/nat46/patches/121-tos-fix.patch @@ -0,0 +1,27 @@ +Author: Ramkishan Gurjar +Date: Thu Nov 16 15:30:04 2023 +0530 + + nat46: Fix traffic class is not set in ipv6 Header from ipv4 tos value. + + Change-Id: I781d7af8bc9751dd23f6c3f4195644b3f9025fcb + Signed-off-by: Ramkishan Gurjar + +--- a/nat46/modules/nat46-core.c ++++ b/nat46/modules/nat46-core.c +@@ -2397,6 +2397,8 @@ int nat46_ipv4_input(struct sk_buff *old + return err; + } + ++ tclass = ip_tos_ignore ? 0 : hdr4->tos; /* traffic class */ ++ + memset(v6saddr, 1, 16); + memset(v6daddr, 2, 16); + +@@ -2508,7 +2510,6 @@ int nat46_ipv4_input(struct sk_buff *old + memset(hdr6, 0, sizeof(*hdr6) + (add_frag_header?8:0)); + + /* build IPv6 header */ +- tclass = ip_tos_ignore ? 0 : hdr4->tos; /* traffic class */ + *(__be32 *)hdr6 = htonl(0x60000000 | (tclass << 20)) | flowlabel; /* version, priority, flowlabel */ + + /* IPv6 length is a payload length, IPv4 is hdr+payload */ From daa6a37ddfde7ac330fcc753e5ed8420b10eb4cf Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Mon, 6 May 2024 00:33:46 -0400 Subject: [PATCH 40/80] package: kernel: nat46: use standard build functions Instead of 'install', 'cp', use standard build functions Signed-off-by: Sean Khan --- package/kernel/nat46/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/nat46/Makefile b/package/kernel/nat46/Makefile index 32ea3a4516d4e0..dd1d55b84eef02 100644 --- a/package/kernel/nat46/Makefile +++ b/package/kernel/nat46/Makefile @@ -28,8 +28,8 @@ endef include $(INCLUDE_DIR)/kernel-defaults.mk define Build/InstallDev - mkdir -p -m 0777 $(STAGING_DIR)/usr/include/nat46 - $(CP) $(PKG_BUILD_DIR)/nat46/modules/*.h $(STAGING_DIR)/usr/include/nat46/ + $(INSTALL_DIR) $(STAGING_DIR)/usr/include/nat46 + $(INSTALL_DATA) $(PKG_BUILD_DIR)/nat46/modules/*.h $(STAGING_DIR)/usr/include/nat46/ endef define Build/Compile @@ -37,7 +37,7 @@ define Build/Compile MODFLAGS="-DMODULE -mlong-calls" \ EXTRA_CFLAGS="-DNAT46_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\"" \ modules - cp $(PKG_BUILD_DIR)/nat46/modules/Module.symvers $(PKG_BUILD_DIR)/Module.symvers + $(INSTALL_DATA) $(PKG_BUILD_DIR)/nat46/modules/Module.symvers $(PKG_BUILD_DIR)/Module.symvers endef $(eval $(call KernelPackage,nat46)) From d029c63c132db69accb50c95b142be79e0028689 Mon Sep 17 00:00:00 2001 From: bitthief Date: Sat, 4 Feb 2023 01:28:51 +0200 Subject: [PATCH 41/80] iproute2: add NSS QDISC support Signed-off-by: bitthief Co-Developed-by: Sean Khan --- .../iproute2/patches/400-add-nss-qdisc.patch | 2093 +++++++++++++++++ .../iproute2/patches/500-add-nssmirred.patch | 243 ++ 2 files changed, 2336 insertions(+) create mode 100644 package/network/utils/iproute2/patches/400-add-nss-qdisc.patch create mode 100644 package/network/utils/iproute2/patches/500-add-nssmirred.patch diff --git a/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch b/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch new file mode 100644 index 00000000000000..299710f79169d0 --- /dev/null +++ b/package/network/utils/iproute2/patches/400-add-nss-qdisc.patch @@ -0,0 +1,2093 @@ +--- a/include/uapi/linux/pkt_sched.h ++++ b/include/uapi/linux/pkt_sched.h +@@ -119,6 +119,251 @@ enum { + + #define TCA_STAB_MAX (__TCA_STAB_MAX - 1) + ++enum { ++ TCA_NSS_ACCEL_MODE_NSS_FW, ++ TCA_NSS_ACCEL_MODE_PPE, ++ TCA_NSS_ACCEL_MODE_MAX ++}; ++ ++/* NSSFIFO section */ ++ ++enum { ++ TCA_NSSFIFO_UNSPEC, ++ TCA_NSSFIFO_PARMS, ++ __TCA_NSSFIFO_MAX ++}; ++ ++#define TCA_NSSFIFO_MAX (__TCA_NSSFIFO_MAX - 1) ++ ++struct tc_nssfifo_qopt { ++ __u32 limit; /* Queue length: bytes for bfifo, packets for pfifo */ ++ __u8 set_default; /* Sets qdisc to be the default qdisc for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSWRED section */ ++ ++enum { ++ TCA_NSSWRED_UNSPEC, ++ TCA_NSSWRED_PARMS, ++ __TCA_NSSWRED_MAX ++}; ++ ++#define TCA_NSSWRED_MAX (__TCA_NSSWRED_MAX - 1) ++#define NSSWRED_CLASS_MAX 6 ++struct tc_red_alg_parameter { ++ __u32 min; /* qlen_avg < min: pkts are all enqueued */ ++ __u32 max; /* qlen_avg > max: pkts are all dropped */ ++ __u32 probability;/* Drop probability at qlen_avg = max */ ++ __u32 exp_weight_factor;/* exp_weight_factor for calculate qlen_avg */ ++}; ++ ++struct tc_nsswred_traffic_class { ++ __u32 limit; /* Queue length */ ++ __u32 weight_mode_value; /* Weight mode value */ ++ struct tc_red_alg_parameter rap;/* Parameters for RED alg */ ++}; ++ ++/* ++ * Weight modes for WRED ++ */ ++enum tc_nsswred_weight_modes { ++ TC_NSSWRED_WEIGHT_MODE_DSCP = 0,/* Weight mode is DSCP */ ++ TC_NSSWRED_WEIGHT_MODES, /* Must be last */ ++}; ++typedef enum tc_nsswred_weight_modes tc_nsswred_weight_mode_t; ++ ++struct tc_nsswred_qopt { ++ __u32 limit; /* Queue length */ ++ enum tc_nsswred_weight_modes weight_mode; ++ /* Weight mode */ ++ __u32 traffic_classes; /* How many traffic classes: DPs */ ++ __u32 def_traffic_class; /* Default traffic if no match: def_DP */ ++ __u32 traffic_id; /* The traffic id to be configured: DP */ ++ __u32 weight_mode_value; /* Weight mode value */ ++ struct tc_red_alg_parameter rap;/* RED algorithm parameters */ ++ struct tc_nsswred_traffic_class tntc[NSSWRED_CLASS_MAX]; ++ /* Traffic settings for dumpping */ ++ __u8 ecn; /* Setting ECN bit or dropping */ ++ __u8 set_default; /* Sets qdisc to be the default for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSCODEL section */ ++ ++enum { ++ TCA_NSSCODEL_UNSPEC, ++ TCA_NSSCODEL_PARMS, ++ __TCA_NSSCODEL_MAX ++}; ++ ++#define TCA_NSSCODEL_MAX (__TCA_NSSCODEL_MAX - 1) ++ ++struct tc_nsscodel_qopt { ++ __u32 target; /* Acceptable queueing delay */ ++ __u32 limit; /* Max number of packets that can be held in the queue */ ++ __u32 interval; /* Monitoring interval */ ++ __u32 flows; /* Number of flow buckets */ ++ __u32 quantum; /* Weight (in bytes) used for DRR of flow buckets */ ++ __u8 ecn; /* 0 - disable ECN, 1 - enable ECN */ ++ __u8 set_default; /* Sets qdisc to be the default qdisc for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++struct tc_nsscodel_xstats { ++ __u32 peak_queue_delay; /* Peak delay experienced by a dequeued packet */ ++ __u32 peak_drop_delay; /* Peak delay experienced by a dropped packet */ ++}; ++ ++/* NSSFQ_CODEL section */ ++ ++struct tc_nssfq_codel_xstats { ++ __u32 new_flow_count; /* Total number of new flows seen */ ++ __u32 new_flows_len; /* Current number of new flows */ ++ __u32 old_flows_len; /* Current number of old flows */ ++ __u32 ecn_mark; /* Number of packets marked with ECN */ ++ __u32 drop_overlimit; /* Number of packets dropped due to overlimit */ ++ __u32 maxpacket; /* The largest packet seen so far in the queue */ ++}; ++ ++/* NSSTBL section */ ++ ++enum { ++ TCA_NSSTBL_UNSPEC, ++ TCA_NSSTBL_PARMS, ++ __TCA_NSSTBL_MAX ++}; ++ ++#define TCA_NSSTBL_MAX (__TCA_NSSTBL_MAX - 1) ++ ++struct tc_nsstbl_qopt { ++ __u32 burst; /* Maximum burst size */ ++ __u32 rate; /* Limiting rate of TBF */ ++ __u32 peakrate; /* Maximum rate at which TBF is allowed to send */ ++ __u32 mtu; /* Max size of packet, or minumim burst size */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSPRIO section */ ++ ++#define TCA_NSSPRIO_MAX_BANDS 256 ++ ++enum { ++ TCA_NSSPRIO_UNSPEC, ++ TCA_NSSPRIO_PARMS, ++ __TCA_NSSPRIO_MAX ++}; ++ ++#define TCA_NSSPRIO_MAX (__TCA_NSSPRIO_MAX - 1) ++ ++struct tc_nssprio_qopt { ++ __u32 bands; /* Number of bands */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSBF section */ ++ ++enum { ++ TCA_NSSBF_UNSPEC, ++ TCA_NSSBF_CLASS_PARMS, ++ TCA_NSSBF_QDISC_PARMS, ++ __TCA_NSSBF_MAX ++}; ++ ++#define TCA_NSSBF_MAX (__TCA_NSSBF_MAX - 1) ++ ++struct tc_nssbf_class_qopt { ++ __u32 burst; /* Maximum burst size */ ++ __u32 rate; /* Allowed bandwidth for this class */ ++ __u32 mtu; /* MTU of the associated interface */ ++ __u32 quantum; /* Quantum allocation for DRR */ ++}; ++ ++struct tc_nssbf_qopt { ++ __u16 defcls; /* Default class value */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSWRR section */ ++ ++enum { ++ TCA_NSSWRR_UNSPEC, ++ TCA_NSSWRR_CLASS_PARMS, ++ TCA_NSSWRR_QDISC_PARMS, ++ __TCA_NSSWRR_MAX ++}; ++ ++#define TCA_NSSWRR_MAX (__TCA_NSSWRR_MAX - 1) ++ ++struct tc_nsswrr_class_qopt { ++ __u32 quantum; /* Weight associated to this class */ ++}; ++ ++struct tc_nsswrr_qopt { ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSWFQ section */ ++ ++enum { ++ TCA_NSSWFQ_UNSPEC, ++ TCA_NSSWFQ_CLASS_PARMS, ++ TCA_NSSWFQ_QDISC_PARMS, ++ __TCA_NSSWFQ_MAX ++}; ++ ++#define TCA_NSSWFQ_MAX (__TCA_NSSWFQ_MAX - 1) ++ ++struct tc_nsswfq_class_qopt { ++ __u32 quantum; /* Weight associated to this class */ ++}; ++ ++struct tc_nsswfq_qopt { ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSHTB section */ ++ ++enum { ++ TCA_NSSHTB_UNSPEC, ++ TCA_NSSHTB_CLASS_PARMS, ++ TCA_NSSHTB_QDISC_PARMS, ++ __TCA_NSSHTB_MAX ++}; ++ ++#define TCA_NSSHTB_MAX (__TCA_NSSHTB_MAX - 1) ++ ++struct tc_nsshtb_class_qopt { ++ __u32 burst; /* Allowed burst size */ ++ __u32 rate; /* Allowed bandwidth for this class */ ++ __u32 cburst; /* Maximum burst size */ ++ __u32 crate; /* Maximum bandwidth for this class */ ++ __u32 quantum; /* Quantum allocation for DRR */ ++ __u32 priority; /* Priority value associated with this class */ ++ __u32 overhead; /* Overhead in bytes per packet */ ++}; ++ ++struct tc_nsshtb_qopt { ++ __u32 r2q; /* Rate to quantum ratio */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSBLACKHOLE section */ ++ ++enum { ++ TCA_NSSBLACKHOLE_UNSPEC, ++ TCA_NSSBLACKHOLE_PARMS, ++ __TCA_NSSBLACKHOLE_MAX ++}; ++ ++#define TCA_NSSBLACKHOLE_MAX (__TCA_NSSBLACKHOLE_MAX - 1) ++ ++struct tc_nssblackhole_qopt { ++ __u8 set_default; /* Sets qdisc to be the default qdisc for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++ + /* FIFO section */ + + struct tc_fifo_qopt { +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -77,6 +77,7 @@ TCMODULES += q_etf.o + TCMODULES += q_taprio.o + TCMODULES += q_plug.o + TCMODULES += q_ets.o ++TCMODULES += q_nss.o + + TCSO := + +--- /dev/null ++++ b/tc/q_nss.c +@@ -0,0 +1,1826 @@ ++/* ++ ************************************************************************** ++ * Copyright (c) 2015, 2018 The Linux Foundation. All rights reserved. ++ * Permission to use, copy, modify, and/or distribute this software for ++ * any purpose with or without fee is hereby granted, provided that the ++ * above copyright notice and this permission notice appear in all copies. ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT ++ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ************************************************************************** ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++ ++#include "utils.h" ++#include "tc_util.h" ++#include "tc_red.h" ++ ++/* ======================== NSSWRED =======================*/ ++ ++static void nssred_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nssred limit BYTES avpkt BYTES [ min BYTES ] [ max BYTES ] [ probability VALUE ]\n"); ++ fprintf(stderr, " [ burst PACKETS ] [ecn] [ set_default ] [ accel_mode ]\n"); ++} ++ ++static void nsswred_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nsswred setup DPs NUMBER dp_default NUMBER [ weight_mode dscp ] [ecn] [ set_default ] [ accel_mode ]\n"); ++ fprintf(stderr, " nsswred limit BYTES DP NUMBER min BYTES max BYTES avpkt BYTES dscp NUMBER [ probability VALUE ] [ burst PACKETS ]\n"); ++} ++ ++static int nsswred_setup(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct rtattr *tail; ++ struct tc_nsswred_qopt opt; ++ ++ memset(&opt, 0, sizeof(opt)); ++ unsigned int dps = 0; ++ unsigned int def_dp = 0; ++ bool accel_mode = false; ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "DPs") == 0) { ++ NEXT_ARG(); ++ if (get_unsigned(&dps, *argv, 0) || dps > NSSWRED_CLASS_MAX) { ++ ++ fprintf(stderr, "DPs should be between 1 - %d\n", NSSWRED_CLASS_MAX); ++ return -1; ++ } ++ } else if (strcmp(*argv, "weight_mode") == 0) { ++ NEXT_ARG(); ++ if (strcmp(*argv, "dscp") == 0) { ++ opt.weight_mode = TC_NSSWRED_WEIGHT_MODE_DSCP; ++ } else { ++ fprintf(stderr, "Illegal \"weight_mode\", we only support dscp at this moment\n"); ++ } ++ } else if (strcmp(*argv, "ecn") == 0) { ++ opt.ecn = 1; ++ } else if (strcmp(*argv, "dp_default") == 0) { ++ NEXT_ARG(); ++ if (get_unsigned(&def_dp, *argv, 0) || def_dp > dps) { ++ fprintf(stderr, "Illegal dp_default value\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "help") == 0) { ++ nsswred_explain(); ++ return -1; ++ } else if (strcmp(*argv, "set_default") == 0) { ++ opt.set_default = 1; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nsswred_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_NSS_FW; ++ } else if (opt.accel_mode != TCA_NSS_ACCEL_MODE_NSS_FW) { ++ fprintf(stderr, "accel_mode should be %d\n", TCA_NSS_ACCEL_MODE_NSS_FW); ++ return -1; ++ } ++ ++ if (!dps || !def_dp) { ++ fprintf(stderr, "Illegal nsswred setup parameters\n"); ++ return -1; ++ } ++ opt.traffic_classes = dps; ++ opt.def_traffic_class = def_dp; ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSWRED_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsswred_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct rtattr *tail; ++ struct tc_nsswred_qopt opt; ++ ++ int total_args = argc; ++ unsigned burst = 0; ++ unsigned avpkt = 0; ++ double probability = 0.0; ++ unsigned char weighted = (strcmp(qu->id, "nsswred") == 0); ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "limit") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.limit, *argv)) { ++ fprintf(stderr, "Illegal \"limit\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "set_default") == 0) { ++ opt.set_default = 1; ++ } else if (strcmp(*argv, "min") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.rap.min, *argv)) { ++ fprintf(stderr, "Illegal \"min\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "max") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.rap.max, *argv)) { ++ fprintf(stderr, "Illegal \"max\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "burst") == 0) { ++ NEXT_ARG(); ++ if (get_unsigned(&burst, *argv, 0)) { ++ fprintf(stderr, "Illegal \"burst\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "avpkt") == 0) { ++ NEXT_ARG(); ++ if (get_size(&avpkt, *argv)) { ++ fprintf(stderr, "Illegal \"avpkt\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "probability") == 0) { ++ NEXT_ARG(); ++ if (sscanf(*argv, "%lg", &probability) != 1) { ++ fprintf(stderr, "Illegal \"probability\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "ecn") == 0) { ++ opt.ecn = 1; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ if (weighted) { ++ nsswred_explain(); ++ } else { ++ nssred_explain(); ++ } ++ return -1; ++ } else if (weighted) { ++ if (strcmp(*argv, "setup") == 0) { ++ if (argc != total_args) { ++ fprintf(stderr, "Setup command must be the first parameter\n"); ++ return -1; ++ } ++ return nsswred_setup(qu, argc-1, argv+1, n); ++ } else if (strcmp(*argv, "DP") == 0) { ++ NEXT_ARG(); ++ if (get_unsigned(&opt.traffic_id, *argv, 0)) { ++ fprintf(stderr, "Illegal \"DP\""); ++ return -1; ++ } ++ } else if (strcmp(*argv, "dscp") == 0) { ++ NEXT_ARG(); ++ if (get_unsigned(&opt.weight_mode_value, *argv, 0)) { ++ fprintf(stderr, "Illegal \"dscp\" value\n"); ++ return -1; ++ } ++ } ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ if (weighted) { ++ nsswred_explain(); ++ } else { ++ nssred_explain(); ++ } ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "Accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ if (weighted) { ++ if (!opt.limit || !opt.rap.min || !opt.rap.max || !opt.traffic_id || !avpkt || !opt.weight_mode_value) { ++ fprintf(stderr, "Require limit, min, max, avpkt, DP, weight_mode_value\n"); ++ return -1; ++ } ++ } else { ++ if (!opt.limit || !avpkt) { ++ fprintf(stderr, "Require limit, avpkt"); ++ return -1; ++ } ++ } ++ ++ /* ++ * Compute default min/max thresholds based on ++ * Sally Floyd's recommendations: ++ * http://www.icir.org/floyd/REDparameters.txt ++ */ ++ if (!opt.rap.max) ++ opt.rap.max = opt.rap.min ? opt.rap.min * 3 : opt.limit / 4; ++ if (!opt.rap.min) ++ opt.rap.min = opt.rap.max / 3; ++ if (!burst) ++ burst = (2 * opt.rap.min + opt.rap.max) / (3 * avpkt); ++ if ((opt.rap.exp_weight_factor = tc_red_eval_ewma(opt.rap.min, burst, avpkt)) < 0) { ++ fprintf(stderr, "Failed to calculate EWMA constant.\n"); ++ return -1; ++ } ++ ++ /* ++ * project [0.0-1.0] to [0-255] to avoid floating point calculation ++ */ ++ opt.rap.probability = probability * (pow(2, 8)-1); ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSWRED_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsswred_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSWRED_MAX + 1]; ++ struct tc_nsswred_qopt *qopt; ++ int i; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSWRED_MAX, opt); ++ ++ if (tb[TCA_NSSWRED_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSWRED_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSWRED_PARMS]); ++ ++ if (strcmp(qu->id, "nsswred") == 0) { ++ fprintf(f, "DPs %d def_DP %d weight mode: " , qopt->traffic_classes, qopt->def_traffic_class); ++ if (qopt->weight_mode == TC_NSSWRED_WEIGHT_MODE_DSCP) ++ fprintf(f, "DSCP\n"); ++ else ++ fprintf(f, "Unknown\n"); ++ for (i = 0;i < qopt->traffic_classes; i ++) { ++ if (qopt->tntc[i].rap.exp_weight_factor) { ++ double prob = (double)qopt->tntc[i].rap.probability; ++ fprintf(f, "DP %d: limit %d, weight mode value: %d min: %d max: %d exp_weight_factor: %d probability %.2f\n", ++ i + 1, qopt->tntc[i].limit, qopt->tntc[i].weight_mode_value ++ , qopt->tntc[i].rap.min,qopt->tntc[i].rap.max,qopt->tntc[i].rap.exp_weight_factor,prob/255); ++ } ++ } ++ } else { ++ double prob = (double)qopt->rap.probability; ++ fprintf(f, "limit %d, min: %d max: %d exp_weight_factor: %d probability %.2f\n", ++ qopt->limit, qopt->rap.min,qopt->rap.max,qopt->rap.exp_weight_factor,prob/255); ++ } ++ ++ if (qopt->ecn) ++ fprintf(f, "ECN enabled "); ++ if (qopt->set_default) ++ fprintf(f, "set_default "); ++ ++ fprintf(f, "accel_mode: %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++struct qdisc_util nssred_qdisc_util = { ++ .id = "nssred", ++ .parse_qopt = nsswred_parse_opt, ++ .print_qopt = nsswred_print_opt, ++}; ++ ++struct qdisc_util nsswred_qdisc_util = { ++ .id = "nsswred", ++ .parse_qopt = nsswred_parse_opt, ++ .print_qopt = nsswred_print_opt, ++}; ++ ++/* ======================== NSSFIFO =======================*/ ++ ++static void nssfifo_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nsspfifo [ limit PACKETS ] [ set_default ] [ accel_mode ]\n"); ++} ++ ++static int nssfifo_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct rtattr *tail; ++ struct tc_nssfifo_qopt opt; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "limit") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.limit, *argv) || opt.limit == 0) { ++ fprintf(stderr, "Illegal \"limit\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "set_default") == 0) { ++ opt.set_default = 1; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nssfifo_explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nssfifo_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSFIFO_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nssfifo_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSFIFO_MAX + 1]; ++ struct tc_nssfifo_qopt *qopt; ++ SPRINT_BUF(b1); ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSFIFO_MAX, opt); ++ ++ if (tb[TCA_NSSFIFO_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSFIFO_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSFIFO_PARMS]); ++ ++ if (strcmp(qu->id, "nssbfifo") == 0) ++ fprintf(f, "limit %s ", sprint_size(qopt->limit, b1)); ++ else ++ fprintf(f, "limit %up ", qopt->limit); ++ ++ if (qopt->set_default) ++ fprintf(f, "set_default "); ++ ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++struct qdisc_util nsspfifo_qdisc_util = { ++ .id = "nsspfifo", ++ .parse_qopt = nssfifo_parse_opt, ++ .print_qopt = nssfifo_print_opt, ++}; ++ ++struct qdisc_util nssbfifo_qdisc_util = { ++ .id = "nssbfifo", ++ .parse_qopt = nssfifo_parse_opt, ++ .print_qopt = nssfifo_print_opt, ++}; ++ ++/* ======================== NSSFQ_CODEL =======================*/ ++ ++static void nssfq_codel_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nssfq_codel target TIME interval TIME [ flows NUMBER ] [ quantum BYTES ]" ++ "[ limit PACKETS ] [ set_default ] [ accel_mode ]\n"); ++} ++ ++static void nssfq_codel_explain_err1(void) ++{ ++ fprintf(stderr, "Value of target and interval should be greater than 1ms\n"); ++} ++ ++static int nssfq_codel_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct rtattr *tail; ++ struct tc_nsscodel_qopt opt; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "target") == 0) { ++ NEXT_ARG(); ++ if (get_time(&opt.target, *argv)) { ++ fprintf(stderr, "Illegal \"target\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "limit") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.limit, *argv) || opt.limit == 0) { ++ fprintf(stderr, "Illegal \"limit\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "flows") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.flows, *argv) || opt.flows == 0) { ++ fprintf(stderr, "Illegal \"flows\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "quantum") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.quantum, *argv) || opt.quantum == 0) { ++ fprintf(stderr, "Illegal \"quantum\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "interval") == 0) { ++ NEXT_ARG(); ++ if (get_time(&opt.interval, *argv)) { ++ fprintf(stderr, "Illegal \"interval\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "ecn") == 0) { ++ fprintf(stderr, "Illegal, ECN not supported\n"); ++ nssfq_codel_explain(); ++ return -1; ++ } else if (strcmp(*argv, "set_default") == 0) { ++ opt.set_default = 1; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nssfq_codel_explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nssfq_codel_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_NSS_FW; ++ } else if (opt.accel_mode != TCA_NSS_ACCEL_MODE_NSS_FW) { ++ fprintf(stderr, "accel_mode should be %d\n", TCA_NSS_ACCEL_MODE_NSS_FW); ++ return -1; ++ } ++ ++ if (!opt.target || !opt.interval) { ++ nssfq_codel_explain(); ++ return -1; ++ } ++ ++ if (opt.target < 1000 || opt.interval < 1000) { ++ nssfq_codel_explain_err1(); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSCODEL_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nssfq_codel_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSCODEL_MAX + 1]; ++ struct tc_nsscodel_qopt *qopt; ++ SPRINT_BUF(b1); ++ SPRINT_BUF(b2); ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSCODEL_MAX, opt); ++ ++ if (tb[TCA_NSSCODEL_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSCODEL_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSCODEL_PARMS]); ++ ++ fprintf(f, "target %s limit %up interval %s flows %u quantum %u ", ++ sprint_time(qopt->target, b1), ++ qopt->limit, ++ sprint_time(qopt->interval, b2), ++ qopt->flows, ++ qopt->quantum); ++ ++ if (qopt->ecn) ++ fprintf(f, "ecn "); ++ ++ if (qopt->set_default) ++ fprintf(f, "set_default "); ++ ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++static int nssfq_codel_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats) ++{ ++ struct tc_nssfq_codel_xstats *st; ++ ++ if (xstats == NULL) ++ return 0; ++ ++ if (RTA_PAYLOAD(xstats) < sizeof(*st)) ++ return -1; ++ ++ st = RTA_DATA(xstats); ++ fprintf(f, " maxpacket %u drop_overlimit %u new_flow_count %u ecn_mark %u\n", ++ st->maxpacket, st->drop_overlimit, st->new_flow_count, st->ecn_mark); ++ fprintf(f, " new_flows_len %u old_flows_len %u", st->new_flows_len, st->old_flows_len); ++ ++ return 0; ++} ++ ++struct qdisc_util nssfq_codel_qdisc_util = { ++ .id = "nssfq_codel", ++ .parse_qopt = nssfq_codel_parse_opt, ++ .print_qopt = nssfq_codel_print_opt, ++ .print_xstats = nssfq_codel_print_xstats, ++}; ++ ++/* ======================== NSSCODEL =======================*/ ++ ++static void nsscodel_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nsscodel target TIME interval TIME [ limit PACKETS ] [ set_default ] [ accel_mode ]\n"); ++} ++ ++static void nsscodel_explain_err1(void) ++{ ++ fprintf(stderr, "Value of target and interval should be greater than 1ms\n"); ++} ++ ++static int nsscodel_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct rtattr *tail; ++ struct tc_nsscodel_qopt opt; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "target") == 0) { ++ NEXT_ARG(); ++ if (get_time(&opt.target, *argv)) { ++ fprintf(stderr, "Illegal \"target\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "limit") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.limit, *argv) || opt.limit == 0) { ++ fprintf(stderr, "Illegal \"limit\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "interval") == 0) { ++ NEXT_ARG(); ++ if (get_time(&opt.interval, *argv)) { ++ fprintf(stderr, "Illegal \"interval\"\n"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "set_default") == 0) { ++ opt.set_default = 1; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nsscodel_explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nsscodel_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_NSS_FW; ++ } else if (opt.accel_mode != TCA_NSS_ACCEL_MODE_NSS_FW) { ++ fprintf(stderr, "accel_mode should be %d\n", TCA_NSS_ACCEL_MODE_NSS_FW); ++ return -1; ++ } ++ ++ if (!opt.target || !opt.interval) { ++ nsscodel_explain(); ++ return -1; ++ } ++ ++ if (opt.target < 1000 || opt.interval < 1000) { ++ nsscodel_explain_err1(); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSCODEL_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsscodel_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSCODEL_MAX + 1]; ++ struct tc_nsscodel_qopt *qopt; ++ SPRINT_BUF(b1); ++ SPRINT_BUF(b2); ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSCODEL_MAX, opt); ++ ++ if (tb[TCA_NSSCODEL_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSCODEL_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSCODEL_PARMS]); ++ ++ fprintf(f, "target %s limit %up interval %s ", ++ sprint_time(qopt->target, b1), ++ qopt->limit, ++ sprint_time(qopt->interval, b2)); ++ ++ if (qopt->set_default) ++ fprintf(f, "set_default "); ++ ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++static int nsscodel_print_xstats(struct qdisc_util *qu, FILE *f, struct rtattr *xstats) ++{ ++ struct tc_nsscodel_xstats *st; ++ ++ if (xstats == NULL) ++ return 0; ++ ++ if (RTA_PAYLOAD(xstats) < sizeof(*st)) ++ return -1; ++ ++ st = RTA_DATA(xstats); ++ fprintf(f, " peak queue delay %ums peak drop delay %ums", ++ st->peak_queue_delay, st->peak_drop_delay); ++ ++ return 0; ++} ++ ++struct qdisc_util nsscodel_qdisc_util = { ++ .id = "nsscodel", ++ .parse_qopt = nsscodel_parse_opt, ++ .print_qopt = nsscodel_print_opt, ++ .print_xstats = nsscodel_print_xstats, ++}; ++ ++/* ======================== NSSTBL =======================*/ ++ ++static void nsstbl_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nsstbl burst BYTES rate BPS [ mtu BYTES ] [ accel_mode ]\n"); ++} ++ ++static int nsstbl_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ int ok = 0; ++ struct rtattr *tail; ++ struct tc_nsstbl_qopt opt; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "burst") == 0 || ++ strcmp(*argv, "buffer") == 0 || ++ strcmp(*argv, "maxburst") == 0) { ++ NEXT_ARG(); ++ if (opt.burst) { ++ fprintf(stderr, "Double \"buffer/burst\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.burst, *argv)) { ++ fprintf(stderr, "Illegal \"burst\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "mtu") == 0 || ++ strcmp(*argv, "minburst") == 0) { ++ NEXT_ARG(); ++ if (opt.mtu) { ++ fprintf(stderr, "Double \"mtu/minburst\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.mtu, *argv)) { ++ fprintf(stderr, "Illegal \"mtu\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "rate") == 0) { ++ NEXT_ARG(); ++ if (opt.rate) { ++ fprintf(stderr, "Double \"rate\" spec\n"); ++ return -1; ++ } ++ if (get_rate(&opt.rate, *argv)) { ++ fprintf(stderr, "Illegal \"rate\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nsstbl_explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nsstbl_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!ok) { ++ nsstbl_explain(); ++ return -1; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ if (!opt.rate || !opt.burst) { ++ fprintf(stderr, "Both \"rate\" and \"burst\" are required.\n"); ++ return -1; ++ } ++ ++ /* ++ * Peakrate is currently not supported, but we keep the infrastructure ++ * for future use. However, we have disabled taking input for this. ++ */ ++ if (opt.peakrate) { ++ if (!opt.mtu) { ++ fprintf(stderr, "\"mtu\" is required, if \"peakrate\" is requested.\n"); ++ return -1; ++ } ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSTBL_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsstbl_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSTBL_MAX + 1]; ++ struct tc_nsstbl_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSTBL_MAX, opt); ++ ++ if (tb[TCA_NSSTBL_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSTBL_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSTBL_PARMS]); ++ ++ print_size(PRINT_FP, NULL, "buffer/maxburst %s ", qopt->burst); ++ tc_print_rate(PRINT_FP, NULL, "rate %s ", qopt->rate); ++ print_size(PRINT_FP, NULL, "mtu %s ", qopt->mtu); ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++struct qdisc_util nsstbl_qdisc_util = { ++ .id = "nsstbl", ++ .parse_qopt = nsstbl_parse_opt, ++ .print_qopt = nsstbl_print_opt, ++}; ++ ++/* ======================== NSSPRIO =======================*/ ++ ++static void nssprio_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nssprio [ bands NUMBER (default 256) ] [ accel_mode ]\n"); ++} ++ ++static int nssprio_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ int ok = 0; ++ struct rtattr *tail; ++ struct tc_nssprio_qopt opt; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "bands") == 0) { ++ NEXT_ARG(); ++ if (get_unsigned(&opt.bands, *argv, 0)) { ++ fprintf(stderr, "Illegal \"limit\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nssprio_explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nssprio_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!ok) { ++ opt.bands = TCA_NSSPRIO_MAX_BANDS; ++ } else if (opt.bands > TCA_NSSPRIO_MAX_BANDS) { ++ nssprio_explain(); ++ return -1; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSPRIO_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nssprio_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSPRIO_MAX + 1]; ++ struct tc_nssprio_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSPRIO_MAX, opt); ++ ++ if (tb[TCA_NSSPRIO_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSPRIO_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSPRIO_PARMS]); ++ ++ fprintf(f, "bands %u ", qopt->bands); ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++struct qdisc_util nssprio_qdisc_util = { ++ .id = "nssprio", ++ .parse_qopt = nssprio_parse_opt, ++ .print_qopt = nssprio_print_opt, ++}; ++ ++/* ======================== NSSBF =======================*/ ++ ++static void nssbf_explain_qdisc(void) ++{ ++ fprintf(stderr, ++ "Usage: ... nssbf [ accel_mode ]\n" ++ ); ++} ++ ++static void nssbf_explain_class(void) ++{ ++ fprintf(stderr, "Usage: ... nssbf rate BPS burst BYTES [ mtu BYTES ]\n"); ++ fprintf(stderr, " [ quantum BYTES ]\n"); ++} ++ ++static void nssbf_explain1(char *arg) ++{ ++ fprintf(stderr, "NSSBF: Illegal \"%s\"\n", arg); ++} ++ ++static int nssbf_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct tc_nssbf_qopt opt; ++ struct rtattr *tail; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (matches(*argv, "default") == 0) { ++ NEXT_ARG(); ++ if (opt.defcls != 0) { ++ fprintf(stderr, "NSSBF: Double \"default\"\n"); ++ return -1; ++ } ++ if (get_u16(&opt.defcls, *argv, 16) < 0) { ++ nssbf_explain1("default"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (matches(*argv, "help") == 0) { ++ nssbf_explain_qdisc(); ++ return -1; ++ } else { ++ fprintf(stderr, "NSSBF: What is \"%s\" ?\n", *argv); ++ nssbf_explain_qdisc(); ++ return -1; ++ } ++ argc--, argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_NSS_FW; ++ } else if (opt.accel_mode != TCA_NSS_ACCEL_MODE_NSS_FW) { ++ fprintf(stderr, "accel_mode should be %d\n", TCA_NSS_ACCEL_MODE_NSS_FW); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSBF_QDISC_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nssbf_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSBF_MAX + 1]; ++ struct tc_nssbf_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSBF_MAX, opt); ++ ++ if (tb[TCA_NSSBF_QDISC_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSBF_QDISC_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSBF_QDISC_PARMS]); ++ ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++static int nssbf_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ int ok = 0; ++ struct rtattr *tail; ++ struct tc_nssbf_class_qopt opt; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "burst") == 0 || ++ strcmp(*argv, "buffer") == 0 || ++ strcmp(*argv, "maxburst") == 0) { ++ NEXT_ARG(); ++ if (opt.burst) { ++ fprintf(stderr, "Double \"buffer/burst\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.burst, *argv)) { ++ fprintf(stderr, "Illegal \"burst\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "mtu") == 0) { ++ NEXT_ARG(); ++ if (opt.mtu) { ++ fprintf(stderr, "Double \"mtu\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.mtu, *argv)) { ++ fprintf(stderr, "Illegal \"mtu\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "quantum") == 0) { ++ NEXT_ARG(); ++ if (opt.quantum) { ++ fprintf(stderr, "Double \"quantum\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.quantum, *argv)) { ++ fprintf(stderr, "Illegal \"quantum\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "rate") == 0) { ++ NEXT_ARG(); ++ if (opt.rate) { ++ fprintf(stderr, "Double \"rate\" spec\n"); ++ return -1; ++ } ++ if (get_rate(&opt.rate, *argv)) { ++ fprintf(stderr, "Illegal \"rate\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "help") == 0) { ++ nssbf_explain_class(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nssbf_explain_class(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!ok) { ++ nssbf_explain_class(); ++ return -1; ++ } ++ ++ if (!opt.rate || !opt.burst) { ++ fprintf(stderr, "Both \"rate\" and \"burst\" are required.\n"); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSBF_CLASS_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nssbf_print_class_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSBF_MAX + 1]; ++ struct tc_nssbf_class_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSBF_MAX, opt); ++ ++ if (tb[TCA_NSSBF_CLASS_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSBF_CLASS_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSBF_CLASS_PARMS]); ++ ++ print_size(PRINT_FP, NULL, "burst %s ", qopt->burst); ++ tc_print_rate(PRINT_FP, NULL, "rate %s ", qopt->rate); ++ print_size(PRINT_FP, NULL, "quantum %s ", qopt->quantum); ++ print_size(PRINT_FP, NULL, "mtu %s ", qopt->mtu); ++ ++ return 0; ++} ++ ++struct qdisc_util nssbf_qdisc_util = { ++ .id = "nssbf", ++ .parse_qopt = nssbf_parse_opt, ++ .print_qopt = nssbf_print_opt, ++ .parse_copt = nssbf_parse_class_opt, ++ .print_copt = nssbf_print_class_opt, ++}; ++ ++/* ======================== NSSWRR =======================*/ ++ ++static void nsswrr_explain_qdisc(void) ++{ ++ fprintf(stderr, "Usage (qdisc): ... nsswrr [ accel_mode ]\n"); ++} ++ ++static void nsswrr_explain_class(void) ++{ ++ fprintf(stderr, "Usage (class): ... nsswrr quantum PACKETS ]\n"); ++} ++ ++static int nsswrr_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct tc_nsswrr_qopt opt; ++ bool accel_mode = false; ++ struct rtattr *tail; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (matches(*argv, "help") == 0) { ++ nsswrr_explain_qdisc(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\" ?\n", *argv); ++ nsswrr_explain_qdisc(); ++ return -1; ++ } ++ argc--, argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSWRR_QDISC_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsswrr_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSWRR_MAX + 1]; ++ struct tc_nsswrr_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSWRR_MAX, opt); ++ ++ if (tb[TCA_NSSWRR_QDISC_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSWRR_QDISC_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSWRR_QDISC_PARMS]); ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++static int nsswrr_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ int ok = 0; ++ struct rtattr *tail; ++ struct tc_nsswrr_class_qopt opt; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "quantum") == 0) { ++ NEXT_ARG(); ++ if (get_u32(&opt.quantum, *argv, 10)) { ++ fprintf(stderr, "Illegal \"quantum\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "help") == 0) { ++ nsswrr_explain_class(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nsswrr_explain_class(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!ok) { ++ nsswrr_explain_class(); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSWRR_CLASS_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsswrr_print_class_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSWRR_MAX + 1]; ++ struct tc_nsswrr_class_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSWRR_MAX, opt); ++ ++ if (tb[TCA_NSSWRR_CLASS_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSWRR_CLASS_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSWRR_CLASS_PARMS]); ++ ++ fprintf(f, "quantum %up ", qopt->quantum); ++ return 0; ++} ++ ++struct qdisc_util nsswrr_qdisc_util = { ++ .id = "nsswrr", ++ .parse_qopt = nsswrr_parse_opt, ++ .print_qopt = nsswrr_print_opt, ++ .parse_copt = nsswrr_parse_class_opt, ++ .print_copt = nsswrr_print_class_opt, ++}; ++ ++/* ======================== NSSWFQ =======================*/ ++ ++static void nsswfq_explain_qdisc(void) ++{ ++ fprintf(stderr, "Usage (qdisc): ... nsswfq [ accel_mode ]\n"); ++} ++ ++static void nsswfq_explain_class(void) ++{ ++ fprintf(stderr, "Usage (class): ... nsswfq quantum BYTES ]\n"); ++} ++ ++static int nsswfq_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct tc_nsswfq_qopt opt; ++ bool accel_mode = false; ++ struct rtattr *tail; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (matches(*argv, "help") == 0) { ++ nsswfq_explain_qdisc(); ++ return -1; ++ } else { ++ fprintf(stderr, "NSSWFQ: What is \"%s\" ?\n", *argv); ++ nsswfq_explain_qdisc(); ++ return -1; ++ } ++ argc--, argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSWFQ_QDISC_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsswfq_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSWFQ_MAX + 1]; ++ struct tc_nsswfq_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSWFQ_MAX, opt); ++ ++ if (tb[TCA_NSSWFQ_QDISC_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSWFQ_QDISC_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSWFQ_QDISC_PARMS]); ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++static int nsswfq_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ int ok = 0; ++ struct rtattr *tail; ++ struct tc_nsswfq_class_qopt opt; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "quantum") == 0) { ++ NEXT_ARG(); ++ if (get_size(&opt.quantum, *argv)) { ++ fprintf(stderr, "Illegal \"quantum\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "help") == 0) { ++ nsswfq_explain_class(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nsswfq_explain_class(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!ok) { ++ nsswfq_explain_class(); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSWFQ_CLASS_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsswfq_print_class_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSWFQ_MAX + 1]; ++ struct tc_nsswfq_class_qopt *qopt; ++ SPRINT_BUF(b1); ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSWFQ_MAX, opt); ++ ++ if (tb[TCA_NSSWFQ_CLASS_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSWFQ_CLASS_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSWFQ_CLASS_PARMS]); ++ ++ fprintf(f, "quantum %s ", sprint_size(qopt->quantum, b1)); ++ ++ return 0; ++} ++ ++struct qdisc_util nsswfq_qdisc_util = { ++ .id = "nsswfq", ++ .parse_qopt = nsswfq_parse_opt, ++ .print_qopt = nsswfq_print_opt, ++ .parse_copt = nsswfq_parse_class_opt, ++ .print_copt = nsswfq_print_class_opt, ++}; ++ ++/* ======================== NSSHTB =======================*/ ++ ++static void nsshtb_explain_qdisc(void) ++{ ++ fprintf(stderr, ++ "Usage: ... nsshtb [ r2q ] [ accel_mode ]\n" ++ ); ++} ++ ++static void nsshtb_explain_class(void) ++{ ++ fprintf(stderr, "Usage: ... nsshtb priority 0-3 [ quantum BYTES ] [ rate BPS ] [ burst BYTES ] [crate BPS ] [ cburst BYTES ]\n"); ++ fprintf(stderr, " [ overhead BYTES ] \n"); ++} ++ ++static void nsshtb_explain1(char *arg) ++{ ++ fprintf(stderr, "NSSHTB: Illegal \"%s\"\n", arg); ++} ++ ++static int nsshtb_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct tc_nsshtb_qopt opt; ++ struct rtattr *tail; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "r2q") == 0) { ++ NEXT_ARG(); ++ if (opt.r2q != 0) { ++ fprintf(stderr, "NSSHTB: Double \"r2q\"\n"); ++ return -1; ++ } ++ if (get_u32(&opt.r2q, *argv, 10) < 0) { ++ nsshtb_explain1("r2q"); ++ return -1; ++ } ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nsshtb_explain_qdisc(); ++ return -1; ++ } else { ++ fprintf(stderr, "NSSHTB: What is \"%s\" ?\n", *argv); ++ nsshtb_explain_qdisc(); ++ return -1; ++ } ++ argc--, argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSHTB_QDISC_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsshtb_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSHTB_MAX + 1]; ++ struct tc_nsshtb_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSHTB_MAX, opt); ++ ++ if (tb[TCA_NSSHTB_QDISC_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSHTB_QDISC_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSHTB_QDISC_PARMS]); ++ ++ if (qopt->r2q != 0) ++ fprintf(f, "r2q %u ", qopt->r2q); ++ ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++static int nsshtb_parse_class_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ int ok = 0; ++ struct rtattr *tail; ++ struct tc_nsshtb_class_qopt opt; ++ int crate = 0; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "burst") == 0) { ++ NEXT_ARG(); ++ if (opt.burst) { ++ fprintf(stderr, "Double \"burst\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.burst, *argv)) { ++ fprintf(stderr, "Illegal \"burst\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "rate") == 0) { ++ NEXT_ARG(); ++ if (opt.rate) { ++ fprintf(stderr, "Double \"rate\" spec\n"); ++ return -1; ++ } ++ if (get_rate(&opt.rate, *argv)) { ++ fprintf(stderr, "Illegal \"rate\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "cburst") == 0) { ++ NEXT_ARG(); ++ if (opt.cburst) { ++ fprintf(stderr, "Double \"cburst\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.cburst, *argv)) { ++ fprintf(stderr, "Illegal \"cburst\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "crate") == 0) { ++ NEXT_ARG(); ++ if (opt.crate) { ++ fprintf(stderr, "Double \"crate\" spec\n"); ++ return -1; ++ } ++ if (get_rate(&opt.crate, *argv)) { ++ fprintf(stderr, "Illegal \"crate\"\n"); ++ return -1; ++ } ++ crate++; ++ ok++; ++ } else if (strcmp(*argv, "priority") == 0) { ++ NEXT_ARG(); ++ if (opt.priority) { ++ fprintf(stderr, "Double \"priority\" spec\n"); ++ return -1; ++ } ++ if (get_u32(&opt.priority, *argv, 10) < 0) { ++ fprintf(stderr, "Illegal \"priority\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "quantum") == 0) { ++ NEXT_ARG(); ++ if (opt.quantum) { ++ fprintf(stderr, "Double \"quantum\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.quantum, *argv)) { ++ fprintf(stderr, "Illegal \"quantum\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "overhead") == 0) { ++ NEXT_ARG(); ++ if (opt.overhead) { ++ fprintf(stderr, "Double \"overhead\" spec\n"); ++ return -1; ++ } ++ if (get_size(&opt.overhead, *argv)) { ++ fprintf(stderr, "Illegal \"overhead\"\n"); ++ return -1; ++ } ++ ok++; ++ } else if (strcmp(*argv, "help") == 0) { ++ nsshtb_explain_class(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nsshtb_explain_class(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!ok) { ++ nsshtb_explain_class(); ++ return -1; ++ } ++ ++ if (opt.rate && !opt.burst) { ++ fprintf(stderr, "\"burst\" required if \"rate\" is specified.\n"); ++ return -1; ++ } ++ ++ if (!crate) { ++ fprintf(stderr, "\"crate\" is required.\n"); ++ return -1; ++ } ++ ++ if (opt.crate && !opt.cburst) { ++ fprintf(stderr, "\"cburst\" required if \"crate\" is non-zero.\n"); ++ return -1; ++ } ++ ++ if (opt.priority > 3) { ++ fprintf(stderr, "\"priority\" should be an integer between 0 and 3.\n"); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSHTB_CLASS_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nsshtb_print_class_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSHTB_MAX + 1]; ++ struct tc_nsshtb_class_qopt *qopt; ++ SPRINT_BUF(b1); ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSHTB_MAX, opt); ++ ++ if (tb[TCA_NSSHTB_CLASS_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSHTB_CLASS_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSHTB_CLASS_PARMS]); ++ ++ print_size(PRINT_FP, NULL, "burst %s ", qopt->burst); ++ tc_print_rate(PRINT_FP, NULL, "rate %s ", qopt->rate); ++ print_size(PRINT_FP, NULL, "cburst %s ", qopt->cburst); ++ tc_print_rate(PRINT_FP, NULL, "crate %s ", qopt->crate); ++ fprintf(f, "priority %u ", qopt->priority); ++ print_size(PRINT_FP, NULL, "quantum %s ", qopt->quantum); ++ print_size(PRINT_FP, NULL, "overhead %s ", qopt->overhead); ++ ++ return 0; ++} ++ ++struct qdisc_util nsshtb_qdisc_util = { ++ .id = "nsshtb", ++ .parse_qopt = nsshtb_parse_opt, ++ .print_qopt = nsshtb_print_opt, ++ .parse_copt = nsshtb_parse_class_opt, ++ .print_copt = nsshtb_print_class_opt, ++}; ++ ++/* ======================== NSSBLACKHOLE ======================= */ ++ ++static void nssblackhole_explain(void) ++{ ++ fprintf(stderr, "Usage: ... nssblackhole [ set_default ] [ accel_mode ]\n"); ++} ++ ++static int nssblackhole_parse_opt(struct qdisc_util *qu, int argc, char **argv, struct nlmsghdr *n) ++{ ++ struct rtattr *tail; ++ struct tc_nssblackhole_qopt opt; ++ bool accel_mode = false; ++ ++ memset(&opt, 0, sizeof(opt)); ++ ++ while (argc > 0) { ++ if (strcmp(*argv, "set_default") == 0) { ++ opt.set_default = 1; ++ } else if (strcmp(*argv, "accel_mode") == 0) { ++ NEXT_ARG(); ++ if (get_u8(&opt.accel_mode, *argv, 0)) { ++ fprintf(stderr, "Illegal accel_mode value\n"); ++ return -1; ++ } ++ accel_mode = true; ++ } else if (strcmp(*argv, "help") == 0) { ++ nssblackhole_explain(); ++ return -1; ++ } else { ++ fprintf(stderr, "What is \"%s\"?\n", *argv); ++ nssblackhole_explain(); ++ return -1; ++ } ++ argc--; argv++; ++ } ++ ++ if (!accel_mode) { ++ opt.accel_mode = TCA_NSS_ACCEL_MODE_PPE; ++ } else if (opt.accel_mode >= TCA_NSS_ACCEL_MODE_MAX) { ++ fprintf(stderr, "accel_mode should be < %d\n", TCA_NSS_ACCEL_MODE_MAX); ++ return -1; ++ } ++ ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, 1024, TCA_OPTIONS, NULL, 0); ++ addattr_l(n, 1024, TCA_NSSBLACKHOLE_PARMS, &opt, sizeof(opt)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ ++ return 0; ++} ++ ++static int nssblackhole_print_opt(struct qdisc_util *qu, FILE *f, struct rtattr *opt) ++{ ++ struct rtattr *tb[TCA_NSSBLACKHOLE_MAX + 1]; ++ struct tc_nssblackhole_qopt *qopt; ++ ++ if (opt == NULL) ++ return 0; ++ ++ parse_rtattr_nested(tb, TCA_NSSBLACKHOLE_MAX, opt); ++ ++ if (tb[TCA_NSSBLACKHOLE_PARMS] == NULL) ++ return -1; ++ ++ if (RTA_PAYLOAD(tb[TCA_NSSBLACKHOLE_PARMS]) < sizeof(*qopt)) ++ return -1; ++ ++ qopt = RTA_DATA(tb[TCA_NSSBLACKHOLE_PARMS]); ++ ++ if (qopt->set_default) ++ fprintf(f, "set_default "); ++ ++ fprintf(f, "accel_mode %d ", qopt->accel_mode); ++ ++ return 0; ++} ++ ++struct qdisc_util nssblackhole_qdisc_util = { ++ .id = "nssblackhole", ++ .parse_qopt = nssblackhole_parse_opt, ++ .print_qopt = nssblackhole_print_opt, ++}; diff --git a/package/network/utils/iproute2/patches/500-add-nssmirred.patch b/package/network/utils/iproute2/patches/500-add-nssmirred.patch new file mode 100644 index 00000000000000..f4c3bc587d124c --- /dev/null +++ b/package/network/utils/iproute2/patches/500-add-nssmirred.patch @@ -0,0 +1,243 @@ +--- a/tc/Makefile ++++ b/tc/Makefile +@@ -50,6 +50,7 @@ TCMODULES += m_tunnel_key.o + TCMODULES += m_sample.o + TCMODULES += m_ct.o + TCMODULES += m_gate.o ++TCMODULES += m_nssmirred.o + TCMODULES += p_ip.o + TCMODULES += p_ip6.o + TCMODULES += p_icmp.o +--- /dev/null ++++ b/tc/m_nssmirred.c +@@ -0,0 +1,183 @@ ++/* ++ ************************************************************************** ++ * Copyright (c) 2019 The Linux Foundation. All rights reserved. ++ * Permission to use, copy, modify, and/or distribute this software for ++ * any purpose with or without fee is hereby granted, provided that the ++ * above copyright notice and this permission notice appear in all copies. ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT ++ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ************************************************************************** ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "utils.h" ++#include "tc_util.h" ++#include "tc_common.h" ++#include ++ ++/* ++ * explain() ++ * API to print the explaination of nssmirred action statement's ++ * elements. ++ */ ++static void explain(void) ++{ ++ fprintf(stderr, "Usage: nssmirred redirect \n"); ++ fprintf(stderr, "where: \n"); ++ fprintf(stderr, "\tTO_DEVICENAME is the devicename to redirect to\n"); ++ fprintf(stderr, "\tFROM_DEVICENAME is the devicename to redirect from\n"); ++} ++ ++/* ++ * usage() ++ * API to show the usage of the nssmirred action. ++ */ ++static void usage(void) ++{ ++ explain(); ++ exit(-1); ++} ++ ++/* ++ * parse_nss_mirred() ++ * Parse and validate the nssmirred action statement. ++ */ ++static int parse_nss_mirred(struct action_util *a, int *argc_p, char ***argv_p, ++ int tca_id, struct nlmsghdr *n) ++{ ++ int idx, argc = *argc_p; ++ char **argv = *argv_p; ++ struct tc_nss_mirred p; ++ struct rtattr *tail; ++ ++ if (argc < 0) { ++ fprintf(stderr, "nssmirred bad argument count %d. Try option \"help\"\n", argc); ++ goto error; ++ } ++ ++ if (matches(*argv, "nssmirred")) { ++ fprintf(stderr, "nssmirred bad argument %s. Try option \"help\"\n", *argv); ++ goto error; ++ } ++ ++ NEXT_ARG(); ++ if (!matches(*argv, "help")) { ++ usage(); ++ } ++ ++ if (matches(*argv, "redirect")) { ++ fprintf(stderr, "nssmirred bad argument %s. Try option \"help\"\n", *argv); ++ goto error; ++ } ++ ++ NEXT_ARG(); ++ if (matches(*argv, "dev")) { ++ fprintf(stderr, "nssmirred: bad value %s. Try option \"help\"\n", *argv); ++ goto error; ++ } ++ ++ NEXT_ARG(); ++ memset(&p, 0, sizeof(struct tc_nss_mirred)); ++ if ((idx = ll_name_to_index(*argv)) == 0) { ++ fprintf(stderr, "Cannot find to device \"%s\"\n", *argv); ++ goto error; ++ } ++ ++ p.to_ifindex = idx; ++ NEXT_ARG(); ++ if (matches(*argv, "fromdev")) { ++ fprintf(stderr, "nssmirred: bad value %s. Try option \"help\"\n", *argv); ++ goto error; ++ } ++ ++ NEXT_ARG(); ++ if ((idx = ll_name_to_index(*argv)) == 0) { ++ fprintf(stderr, "Cannot find from device \"%s\"\n", *argv); ++ goto error; ++ } ++ ++ p.from_ifindex = idx; ++ p.action = TC_ACT_STOLEN; ++ tail = NLMSG_TAIL(n); ++ addattr_l(n, MAX_MSG, tca_id, NULL, 0); ++ addattr_l(n, MAX_MSG, TCA_NSS_MIRRED_PARMS, &p, sizeof (p)); ++ tail->rta_len = (void *) NLMSG_TAIL(n) - (void *) tail; ++ argc--; ++ argv++; ++ *argc_p = argc; ++ *argv_p = argv; ++ return 0; ++ ++error: ++ return -1; ++} ++ ++/* ++ * print_nss_mirred() ++ * Print information related to nssmirred action. ++ */ ++static int print_nss_mirred(struct action_util *au, FILE * f, struct rtattr *arg) ++{ ++ struct tc_nss_mirred *p; ++ struct rtattr *tb[TCA_NSS_MIRRED_MAX + 1]; ++ const char *from_dev, *to_dev; ++ ++ if (arg == NULL) { ++ return -1; ++ } ++ ++ parse_rtattr_nested(tb, TCA_NSS_MIRRED_MAX, arg); ++ ++ if (tb[TCA_NSS_MIRRED_PARMS] == NULL) { ++ fprintf(f, "[NULL nssmirred parameters]"); ++ goto error; ++ } ++ ++ p = RTA_DATA(tb[TCA_NSS_MIRRED_PARMS]); ++ if ((from_dev = ll_index_to_name(p->from_ifindex)) == 0) { ++ fprintf(stderr, "Invalid interface (index: %d)\n", p->from_ifindex); ++ goto error; ++ } ++ ++ if ((to_dev = ll_index_to_name(p->to_ifindex)) == 0) { ++ fprintf(stderr, "Invalid interface (index: %d)\n", p->to_ifindex); ++ goto error; ++ } ++ ++ fprintf(f, "nssmirred (%s to device %s) stolen\n", from_dev, to_dev); ++ fprintf(f, "\tindex %d ref %d bind %d\n",p->index,p->refcnt,p->bindcnt); ++ ++ if (show_stats) { ++ if (tb[TCA_NSS_MIRRED_TM]) { ++ struct tcf_t *tm = RTA_DATA(tb[TCA_NSS_MIRRED_TM]); ++ print_tm(f,tm); ++ } ++ } ++ return 0; ++ ++error: ++ return -1; ++} ++ ++/* ++ * nssmirred_action_util ++ * nssmirred action utility structure. ++ */ ++struct action_util nssmirred_action_util = { ++ .id = "nssmirred", ++ .parse_aopt = parse_nss_mirred, ++ .print_aopt = print_nss_mirred, ++}; +--- /dev/null ++++ b/include/linux/tc_act/tc_nssmirred.h +@@ -0,0 +1,44 @@ ++/* ++ ************************************************************************** ++ * Copyright (c) 2019 The Linux Foundation. All rights reserved. ++ * Permission to use, copy, modify, and/or distribute this software for ++ * any purpose with or without fee is hereby granted, provided that the ++ * above copyright notice and this permission notice appear in all copies. ++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES ++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF ++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES ++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT ++ * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ ************************************************************************** ++ */ ++ ++#ifndef __LINUX_TC_NSS_MIR_H ++#define __LINUX_TC_NSS_MIR_H ++ ++#include ++#include ++ ++/* ++ * tc_nss_mirred ++ * Structure for nssmirred action. ++ */ ++struct tc_nss_mirred { ++ tc_gen; ++ __u32 from_ifindex; /* ifindex of the port to be redirected from */ ++ __u32 to_ifindex; /* ifindex of the port to be redirected to */ ++}; ++ ++/* ++ * Types of nssmirred action parameters. ++ */ ++enum { ++ TCA_NSS_MIRRED_UNSPEC, ++ TCA_NSS_MIRRED_TM, ++ TCA_NSS_MIRRED_PARMS, ++ __TCA_NSS_MIRRED_MAX ++}; ++#define TCA_NSS_MIRRED_MAX (__TCA_NSS_MIRRED_MAX - 1) ++ ++#endif /* __LINUX_TC_NSS_MIR_H */ From 7fd446eb26b6a8981d3ed9925350c72eec827db5 Mon Sep 17 00:00:00 2001 From: bitthief Date: Tue, 18 Jul 2023 02:01:58 +0300 Subject: [PATCH 42/80] qualcommax: dts: add NSS nodes to IPQ807x devices Signed-off-by: bitthief qualcommax: dts: provide label for NSS reserved-memory Provide a label for the NSS reserved-memory node so it can be easily passed to the NSS DRV instead of having to global match by name which is fragile. Signed-off-by: bitthief --- .../arm64/boot/dts/qcom/ipq8070-cax1800.dts | 1 + .../arm64/boot/dts/qcom/ipq8071-ax3600.dtsi | 1 + .../arm64/boot/dts/qcom/ipq8071-eap102.dts | 1 + .../arch/arm64/boot/dts/qcom/ipq8072-301w.dts | 1 + .../arm64/boot/dts/qcom/ipq8072-ax9000.dts | 1 + .../arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts | 1 + .../arch/arm64/boot/dts/qcom/ipq8072-haze.dts | 1 + .../arm64/boot/dts/qcom/ipq8072-wax218.dts | 1 + .../arm64/boot/dts/qcom/ipq8072-wax620.dts | 1 + .../arm64/boot/dts/qcom/ipq8072-wpq873.dts | 1 + .../arm64/boot/dts/qcom/ipq8074-nbg7815.dts | 1 + .../arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi | 271 ++++++++++++++++++ .../arm64/boot/dts/qcom/ipq8074-rax120v2.dts | 1 + .../arm64/boot/dts/qcom/ipq8074-wax630.dts | 1 + .../boot/dts/qcom/ipq8074-wxr-5950ax12.dts | 1 + ...ts-ipq8074-add-reserved-memory-nodes.patch | 6 +- 16 files changed, 288 insertions(+), 3 deletions(-) create mode 100644 target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts index e62ae314fb5d82..4359c3d5b1c8fd 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts @@ -6,6 +6,7 @@ #include "ipq8074-512m.dtsi" #include "ipq8074-ac-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi index 6afafb35546e00..c2c5f4ce8362c0 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi @@ -4,6 +4,7 @@ #include "ipq8074-512m.dtsi" #include "ipq8074-ac-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts index d55904a24a447b..ba03e147fbf799 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-eap102.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-ac-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts index 2fe723591e77f4..0c80020cd1b373 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-301w.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts index ec66d47d16a93f..fe5a1367226177 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax9000.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts index c5c089c00f7dd4..24dd51b47fc585 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-dl-wrx36.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts index 289680d678be07..3c63c0b00350bc 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-haze.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts index 0e71faea72a220..2c1e0f5e472fdb 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts @@ -3,6 +3,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts index ceb719d81322e1..66bf68eb656460 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wax620.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts index 5b2c1d570fd943..ebc68e15a840e1 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts index b18f38cc6cf4dc..1390b3a286b166 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nbg7815.dts @@ -9,6 +9,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi new file mode 100644 index 00000000000000..d85a37230a0e04 --- /dev/null +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi @@ -0,0 +1,271 @@ +// SPDX-License-Identifier: GPL-2.0-only + +/ { + nss_dummy_reg: nss-regulator { + compatible = "regulator-fixed"; + regulator-name = "nss-reg"; + regulator-min-microvolt = <848000>; + regulator-max-microvolt = <848000>; + regulator-always-on; + regulator-boot-on; + }; +}; + +&soc { + nss-common { + compatible = "qcom,nss-common"; + reg = <0x01868010 0x1000>; + reg-names = "nss-misc-reset"; + memory-region = <&nss_region>; + }; + + nss0: nss@40000000 { + compatible = "qcom,nss"; + interrupts = , + , + , + , + , + , + , + , + , + ; + reg = <0x39000000 0x1000>, + <0x38000000 0x30000>, + <0x0b111000 0x1000>; + reg-names = "nphys", "vphys", "qgic-phys"; + clocks = <&gcc GCC_NSS_NOC_CLK>, + <&gcc GCC_NSS_PTP_REF_CLK>, + <&gcc GCC_NSS_CSR_CLK>, + <&gcc GCC_NSS_CFG_CLK>, + <&gcc GCC_NSS_IMEM_CLK>, + <&gcc GCC_NSSNOC_QOSGEN_REF_CLK>, + <&gcc GCC_MEM_NOC_NSS_AXI_CLK>, + <&gcc GCC_NSSNOC_SNOC_CLK>, + <&gcc GCC_NSSNOC_TIMEOUT_REF_CLK>, + <&gcc GCC_NSS_CE_AXI_CLK>, + <&gcc GCC_NSS_CE_APB_CLK>, + <&gcc GCC_NSSNOC_CE_AXI_CLK>, + <&gcc GCC_NSSNOC_CE_APB_CLK>, + <&gcc GCC_NSSNOC_UBI0_AHB_CLK>, + <&gcc GCC_UBI0_CORE_CLK>, + <&gcc GCC_UBI0_AHB_CLK>, + <&gcc GCC_UBI0_AXI_CLK>, + <&gcc GCC_UBI0_MPT_CLK>, + <&gcc GCC_UBI0_NC_AXI_CLK>; + clock-names = "nss-noc-clk", + "nss-ptp-ref-clk", + "nss-csr-clk", + "nss-cfg-clk", + "nss-imem-clk", + "nss-nssnoc-qosgen-ref-clk", + "nss-mem-noc-nss-axi-clk", + "nss-nssnoc-snoc-clk", + "nss-nssnoc-timeout-ref-clk", + "nss-ce-axi-clk", + "nss-ce-apb-clk", + "nss-nssnoc-ce-axi-clk", + "nss-nssnoc-ce-apb-clk", + "nss-nssnoc-ahb-clk", + "nss-core-clk", + "nss-ahb-clk", + "nss-axi-clk", + "nss-mpt-clk", + "nss-nc-axi-clk"; + qcom,id = <0>; + qcom,num-queue = <4>; + qcom,num-irq = <10>; + qcom,num-pri = <4>; + qcom,load-addr = <0x40000000>; + qcom,low-frequency = <187200000>; + qcom,mid-frequency = <748800000>; + qcom,max-frequency = <1689600000>; + qcom,bridge-enabled; + qcom,ipv4-enabled; + qcom,ipv4-reasm-enabled; + qcom,ipv6-enabled; + qcom,ipv6-reasm-enabled; + qcom,wlanredirect-enabled; + qcom,tun6rd-enabled; + qcom,l2tpv2-enabled; + qcom,gre-enabled; + qcom,gre-redir-enabled; + qcom,gre-redir-mark-enabled; + qcom,map-t-enabled; + qcom,portid-enabled; + qcom,ppe-enabled; + qcom,pppoe-enabled; + qcom,pptp-enabled; + qcom,tunipip6-enabled; + qcom,shaping-enabled; + qcom,wlan-dataplane-offload-enabled; + qcom,vlan-enabled; + qcom,igs-enabled; + qcom,vxlan-enabled; + qcom,match-enabled; + qcom,mirror-enabled; + qcom,udp-st-enabled; + mx-supply = <&nss_dummy_reg>; + npu-supply = <&nss_dummy_reg>; + }; + + nss1: nss@40800000 { + compatible = "qcom,nss"; + interrupts = , + , + , + , + , + , + , + , + ; + reg = <0x39400000 0x1000>, + <0x38030000 0x30000>, + <0x0b111000 0x1000>; + reg-names = "nphys", "vphys", "qgic-phys"; + clocks = <&gcc GCC_NSS_NOC_CLK>, + <&gcc GCC_NSS_PTP_REF_CLK>, + <&gcc GCC_NSS_CSR_CLK>, + <&gcc GCC_NSS_CFG_CLK>, + <&gcc GCC_NSS_IMEM_CLK>, + <&gcc GCC_NSSNOC_QOSGEN_REF_CLK>, + <&gcc GCC_MEM_NOC_NSS_AXI_CLK>, + <&gcc GCC_NSSNOC_SNOC_CLK>, + <&gcc GCC_NSSNOC_TIMEOUT_REF_CLK>, + <&gcc GCC_NSS_CE_AXI_CLK>, + <&gcc GCC_NSS_CE_APB_CLK>, + <&gcc GCC_NSSNOC_CE_AXI_CLK>, + <&gcc GCC_NSSNOC_CE_APB_CLK>, + <&gcc GCC_NSSNOC_UBI1_AHB_CLK>, + <&gcc GCC_UBI1_CORE_CLK>, + <&gcc GCC_UBI1_AHB_CLK>, + <&gcc GCC_UBI1_AXI_CLK>, + <&gcc GCC_UBI1_MPT_CLK>, + <&gcc GCC_UBI1_NC_AXI_CLK>; + clock-names = "nss-noc-clk", + "nss-ptp-ref-clk", + "nss-csr-clk", + "nss-cfg-clk", + "nss-imem-clk", + "nss-nssnoc-qosgen-ref-clk", + "nss-mem-noc-nss-axi-clk", + "nss-nssnoc-snoc-clk", + "nss-nssnoc-timeout-ref-clk", + "nss-ce-axi-clk", + "nss-ce-apb-clk", + "nss-nssnoc-ce-axi-clk", + "nss-nssnoc-ce-apb-clk", + "nss-nssnoc-ahb-clk", + "nss-core-clk", + "nss-ahb-clk", + "nss-axi-clk", + "nss-mpt-clk", + "nss-nc-axi-clk"; + qcom,id = <1>; + qcom,num-queue = <4>; + qcom,num-irq = <9>; + qcom,num-pri = <4>; + qcom,load-addr = <0x40800000>; + qcom,capwap-enabled; + qcom,dtls-enabled; + qcom,tls-enabled; + qcom,crypto-enabled; + qcom,ipsec-enabled; + qcom,qvpn-enabled; + qcom,pvxlan-enabled; + qcom,clmap-enabled; + qcom,rmnet_rx-enabled; + }; + + nss_crypto: qcom,nss_crypto { + compatible = "qcom,nss-crypto"; + #address-cells = <1>; + #size-cells = <1>; + qcom,max-contexts = <64>; + qcom,max-context-size = <32>; + ranges; + + eip197_node { + compatible = "qcom,eip197"; + reg-names = "crypto_pbase"; + reg = <0x39800000 0x7ffff>; + clocks = <&gcc GCC_NSS_CRYPTO_CLK>, + <&gcc GCC_NSSNOC_CRYPTO_CLK>, + <&gcc GCC_CRYPTO_PPE_CLK>; + clock-names = "crypto_clk", + "crypto_nocclk", + "crypto_ppeclk"; + clock-frequency = /bits/ 64 <600000000 600000000 300000000>; + qcom,dma-mask = <0xff>; + qcom,transform-enabled; + qcom,aes128-cbc; + qcom,aes192-cbc; + qcom,aes256-cbc; + qcom,aes128-ctr; + qcom,aes192-ctr; + qcom,aes256-ctr; + qcom,aes128-ecb; + qcom,aes192-ecb; + qcom,aes256-ecb; + qcom,3des-cbc; + qcom,md5-hash; + qcom,sha160-hash; + qcom,sha224-hash; + qcom,sha384-hash; + qcom,sha512-hash; + qcom,sha256-hash; + qcom,md5-hmac; + qcom,sha160-hmac; + qcom,sha224-hmac; + qcom,sha256-hmac; + qcom,sha384-hmac; + qcom,sha512-hmac; + qcom,aes128-gcm-gmac; + qcom,aes192-gcm-gmac; + qcom,aes256-gcm-gmac; + qcom,aes128-cbc-md5-hmac; + qcom,aes128-cbc-sha160-hmac; + qcom,aes192-cbc-md5-hmac; + qcom,aes192-cbc-sha160-hmac; + qcom,aes256-cbc-md5-hmac; + qcom,aes256-cbc-sha160-hmac; + qcom,aes128-ctr-sha160-hmac; + qcom,aes192-ctr-sha160-hmac; + qcom,aes256-ctr-sha160-hmac; + qcom,aes128-ctr-md5-hmac; + qcom,aes192-ctr-md5-hmac; + qcom,aes256-ctr-md5-hmac; + qcom,3des-cbc-md5-hmac; + qcom,3des-cbc-sha160-hmac; + qcom,aes128-cbc-sha256-hmac; + qcom,aes192-cbc-sha256-hmac; + qcom,aes256-cbc-sha256-hmac; + qcom,aes128-ctr-sha256-hmac; + qcom,aes192-ctr-sha256-hmac; + qcom,aes256-ctr-sha256-hmac; + qcom,3des-cbc-sha256-hmac; + qcom,aes128-cbc-sha384-hmac; + qcom,aes192-cbc-sha384-hmac; + qcom,aes256-cbc-sha384-hmac; + qcom,aes128-ctr-sha384-hmac; + qcom,aes192-ctr-sha384-hmac; + qcom,aes256-ctr-sha384-hmac; + qcom,aes128-cbc-sha512-hmac; + qcom,aes192-cbc-sha512-hmac; + qcom,aes256-cbc-sha512-hmac; + qcom,aes128-ctr-sha512-hmac; + qcom,aes192-ctr-sha512-hmac; + qcom,aes256-ctr-sha512-hmac; + + engine0 { + reg_offset = <0x80000>; + qcom,ifpp-enabled; + qcom,ipue-enabled; + qcom,ofpp-enabled; + qcom,opue-enabled; + }; + }; + }; +}; diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts index ceb47f14fdd0a2..9fca32578d769a 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-rax120v2.dts @@ -4,6 +4,7 @@ #include "ipq8074.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include "ipq8074-hk-cpu.dtsi" #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts index 3393efd7b550f3..d241ae642acbac 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wax630.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts index d8237e81dde950..dfe27a99d18e64 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8074-wxr-5950ax12.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/patches-6.6/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch b/target/linux/qualcommax/patches-6.6/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch index 6d97641f658cc1..64f8da87aadedb 100644 --- a/target/linux/qualcommax/patches-6.6/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch +++ b/target/linux/qualcommax/patches-6.6/0102-arm64-dts-ipq8074-add-reserved-memory-nodes.patch @@ -22,8 +22,8 @@ Signed-off-by: Robert Marko @@ -86,6 +86,16 @@ #size-cells = <2>; ranges; - -+ nss@40000000 { + ++ nss_region: nss@40000000 { + no-map; + reg = <0x0 0x40000000 0x0 0x01000000>; + }; @@ -56,5 +56,5 @@ Signed-off-by: Robert Marko + reg = <0x0 0x51000000 0x0 0x100000>; + }; }; - + firmware { From d3d28a54b0cc4c5d91ed4492cd5f52d5b79f7840 Mon Sep 17 00:00:00 2001 From: bitthief Date: Tue, 18 Jul 2023 01:24:45 +0300 Subject: [PATCH 43/80] qualcommax: net: QCA NSS igs support Signed-off-by: bitthief --- .../include/uapi/linux/tc_act/tc_nss_mirred.h | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 target/linux/qualcommax/files/include/uapi/linux/tc_act/tc_nss_mirred.h diff --git a/target/linux/qualcommax/files/include/uapi/linux/tc_act/tc_nss_mirred.h b/target/linux/qualcommax/files/include/uapi/linux/tc_act/tc_nss_mirred.h new file mode 100644 index 00000000000000..3a368fcc8c17ee --- /dev/null +++ b/target/linux/qualcommax/files/include/uapi/linux/tc_act/tc_nss_mirred.h @@ -0,0 +1,36 @@ +#ifndef __LINUX_TC_NSS_MIRRED_H +#define __LINUX_TC_NSS_MIRRED_H + +#include + +/* + * Type of nss mirred action. + */ +#define TCA_ACT_MIRRED_NSS 17 + +/* + * Types of parameters for nss mirred action. + */ +enum { + TC_NSS_MIRRED_UNSPEC, + TC_NSS_MIRRED_TM, + TC_NSS_MIRRED_PARMS, + __TC_NSS_MIRRED_MAX +}; +#define TC_NSS_MIRRED_MAX (__TC_NSS_MIRRED_MAX - 1) + +/* + * tc_nss_mirred + * tc command structure for nss mirred action. + */ +struct tc_nss_mirred { + tc_gen; /* General tc structure. */ + __u32 from_ifindex; /* ifindex of the port from which traffic + * will be redirected. + */ + __u32 to_ifindex; /* ifindex of the port to which traffic + * will be redirected. + */ +}; + +#endif /* __LINUX_TC_NSS_MIRRED_H */ From 2b820696559977f6b73ed3708f5bf09a0f2846b8 Mon Sep 17 00:00:00 2001 From: bitthief Date: Tue, 18 Jul 2023 01:25:01 +0300 Subject: [PATCH 44/80] qualcommax: net: QCA NSS qdisc ifb support Signed-off-by: bitthief --- .../netfilter/nf_conntrack_dscpremark_ext.h | 95 +++++++++++++++++++ .../netfilter/nf_conntrack_dscpremark_ext.c | 61 ++++++++++++ 2 files changed, 156 insertions(+) create mode 100644 target/linux/qualcommax/files/include/net/netfilter/nf_conntrack_dscpremark_ext.h create mode 100644 target/linux/qualcommax/files/net/netfilter/nf_conntrack_dscpremark_ext.c diff --git a/target/linux/qualcommax/files/include/net/netfilter/nf_conntrack_dscpremark_ext.h b/target/linux/qualcommax/files/include/net/netfilter/nf_conntrack_dscpremark_ext.h new file mode 100644 index 00000000000000..dc6a5004ef6d7a --- /dev/null +++ b/target/linux/qualcommax/files/include/net/netfilter/nf_conntrack_dscpremark_ext.h @@ -0,0 +1,95 @@ +/* + ************************************************************************** + * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. + * Copyright (c) 2022, Qualcomm Innovation Center, Inc. All rights reserved. + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all copies. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + ************************************************************************** + */ + +/* DSCP remark conntrack extension APIs. */ + +#ifndef _NF_CONNTRACK_DSCPREMARK_H +#define _NF_CONNTRACK_DSCPREMARK_H + +#include +#include + +/* Rule flags */ +#define NF_CT_DSCPREMARK_EXT_DSCP_RULE_VALID 0x1 + +/* Rule validity */ +#define NF_CT_DSCPREMARK_EXT_RULE_VALID 0x1 +#define NF_CT_DSCPREMARK_EXT_RULE_NOT_VALID 0x0 + +/* Which QoS features are set flags */ +#define NF_CT_DSCPREMARK_EXT_PRIO 0x1 +#define NF_CT_DSCPREMARK_EXT_DSCP 0x2 +#define NF_CT_DSCPREMARK_EXT_IGS_QOS 0x4 +#define NF_CT_DSCPREMARK_EXT_MARK 0x8 + +/* + * DSCP remark conntrack extension structure. + */ +struct nf_ct_dscpremark_ext { + __u32 flow_priority; /* Original direction packet priority */ + __u32 reply_priority; /* Reply direction packet priority */ + __u32 flow_mark; /* Original direction packet mark */ + __u32 reply_mark; /* Reply direction packet mark */ + __u16 igs_flow_qos_tag; /* Original direction ingress packet priority */ + __u16 igs_reply_qos_tag; /* Reply direction ingress packet priority */ + __u8 flow_dscp; /* IP DSCP value for original direction */ + __u8 reply_dscp; /* IP DSCP value for reply direction */ + __u16 rule_flags; /* Rule Validity flags */ + __u16 flow_set_flags; /* Original direction set flags */ + __u16 return_set_flags; /* Reply direction set flags */ +}; + +/* + * nf_ct_dscpremark_ext_find() + * Finds the extension data of the conntrack entry if it exists. + */ +static inline struct nf_ct_dscpremark_ext * +nf_ct_dscpremark_ext_find(const struct nf_conn *ct) +{ +#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT + return nf_ct_ext_find(ct, NF_CT_EXT_DSCPREMARK); +#else + return NULL; +#endif +} + +/* + * nf_ct_dscpremark_ext_add() + * Adds the extension data to the conntrack entry. + */ +static inline +struct nf_ct_dscpremark_ext *nf_ct_dscpremark_ext_add(struct nf_conn *ct, + gfp_t gfp) +{ +#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT + struct nf_ct_dscpremark_ext *ncde; + + ncde = nf_ct_ext_add(ct, NF_CT_EXT_DSCPREMARK, gfp); + if (!ncde) + return NULL; + + return ncde; +#else + return NULL; +#endif +}; + +#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT +extern int nf_conntrack_dscpremark_ext_set_dscp_rule_valid(struct nf_conn *ct); +extern int nf_conntrack_dscpremark_ext_get_dscp_rule_validity(struct nf_conn *ct); +#endif /* CONFIG_NF_CONNTRACK_DSCPREMARK_EXT */ +#endif /* _NF_CONNTRACK_DSCPREMARK_H */ diff --git a/target/linux/qualcommax/files/net/netfilter/nf_conntrack_dscpremark_ext.c b/target/linux/qualcommax/files/net/netfilter/nf_conntrack_dscpremark_ext.c new file mode 100644 index 00000000000000..678d27ac9df9c2 --- /dev/null +++ b/target/linux/qualcommax/files/net/netfilter/nf_conntrack_dscpremark_ext.c @@ -0,0 +1,61 @@ +/* + ************************************************************************** + * Copyright (c) 2014-2015, The Linux Foundation. All rights reserved. + * Permission to use, copy, modify, and/or distribute this software for + * any purpose with or without fee is hereby granted, provided that the + * above copyright notice and this permission notice appear in all copies. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT + * OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + ************************************************************************** + */ + +/* DSCP remark handling conntrack extension registration. */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +/* nf_conntrack_dscpremark_ext_set_dscp_rule_valid() + * Set DSCP rule validity flag in the extension + */ +int nf_conntrack_dscpremark_ext_set_dscp_rule_valid(struct nf_conn *ct) +{ + struct nf_ct_dscpremark_ext *ncde; + + ncde = nf_ct_dscpremark_ext_find(ct); + if (!ncde) + return -1; + + ncde->rule_flags = NF_CT_DSCPREMARK_EXT_DSCP_RULE_VALID; + return 0; +} +EXPORT_SYMBOL(nf_conntrack_dscpremark_ext_set_dscp_rule_valid); + +/* nf_conntrack_dscpremark_ext_get_dscp_rule_validity() + * Check if the DSCP rule flag is valid from the extension + */ +int nf_conntrack_dscpremark_ext_get_dscp_rule_validity(struct nf_conn *ct) +{ + struct nf_ct_dscpremark_ext *ncde; + + ncde = nf_ct_dscpremark_ext_find(ct); + if (!ncde) + return NF_CT_DSCPREMARK_EXT_RULE_NOT_VALID; + + if (ncde->rule_flags & NF_CT_DSCPREMARK_EXT_DSCP_RULE_VALID) + return NF_CT_DSCPREMARK_EXT_RULE_VALID; + + return NF_CT_DSCPREMARK_EXT_RULE_NOT_VALID; +} +EXPORT_SYMBOL(nf_conntrack_dscpremark_ext_get_dscp_rule_validity); From 71e832c7e389105a4c47396c784fc063c674ca17 Mon Sep 17 00:00:00 2001 From: dimfish Date: Wed, 2 Aug 2023 11:43:48 +0300 Subject: [PATCH 45/80] feeds: use forked dimfishr/nss-packages --- feeds.conf.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds.conf.default b/feeds.conf.default index e0bad42753507c..4699f733f878e2 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -2,7 +2,7 @@ src-git packages https://git.openwrt.org/feed/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git -src-git nss_packages https://github.com/bitthief/nss-packages.git +src-git nss_packages https://github.com/dimfishr/nss-packages.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git #src-git oldpackages http://git.openwrt.org/packages.git From e1bfa372668214b5c3872c53119867edb13730b2 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 16 Dec 2023 18:09:40 -0500 Subject: [PATCH 46/80] ath11k-nss: Add NSS WiFi feature MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Attempt at getting NSS WiFi Offload working on kernel 6.1 (backport 6.5) These patches are a mix of @ansuel branch for 5.15 (ipq807x-5.15-ecm-wifi) https://github.com/Ansuel/openwrt/commit/3ecaee768e8d08d20eaf2a554eb2bf1da9bbf21b And QUIC's upstream NSS patches on [NHSS.QSDK.12.4.5.r3](https://git.codelinaro.org/clo/qsdk/oss/system/feeds/wlan-open.git) For the actual package setup (Makfiles,ath.mk) Qualcomm's branch is under 'wlan-open/NHSS.QSDK.12.4.5.r3' Looks like they've swtiched to using backports 6.5-rc3, and figured to use a mix of their patches on 'NHSS.QSDK.12.4.5.r3' (nss) 'wlan-open/NHSS.QSDK.12.4.5.r3' (syncing with openwrt main). Booting with "nss_offload=1 frame_mode=2" Logs show: [ 16.606282] WARNING: CPU: 2 PID: 3524 at ath11k_nss_tx+0x1d4/0x1e0 [ath11k] [ 16.611060] Modules linked in: ecm pppoe ppp_async nft_fib_inet nf_flow_table_inet ath11k_ahb ath11k pptp pppox ppp_generic nft_reject_ipv6 nft_reject_ipv4 nft_reject_inet nft_reject nft_redir nft_quota nft_objref nft_numgen nft_nat nft_masq nft_log nft_limit nft_hash nft_fullcone nft_flow_offload nft_fib_ipv6 nft_fib_ipv4 nft_fib nft_ct nft_compat nft_chain_nat nf_tables nf_nat nf_flow_table nf_conntrack_netlink nf_conntrack mac80211 iptable_mangle iptable_filter ipt_REJECT ipt_ECN ip_tables cfg80211 xt_time xt_tcpudp xt_tcpmss xt_statistic xt_multiport xt_mark xt_mac xt_limit xt_length xt_hl xt_ecn xt_dscp xt_comment xt_TCPMSS xt_LOG xt_HL xt_DSCP xt_CLASSIFY x_tables wireguard slhc sch_cake qrtr_smd qrtr qmi_helpers nfnetlink nf_reject_ipv6 nf_reject_ipv4 nf_log_syslog nf_defrag_ipv4 mhi libcrc32c libchacha20poly1305 compat sch_tbf sch_ingress sch_htb sch_hfsc em_u32 cls_u32 cls_route cls_matchall cls_fw cls_flow cls_basic act_skbedit act_mirred act_gact qca_nss_cfi_cryptoapi [ 16.611215] qca_nss_crypto qca_nss_qdisc qca_nss_wifi_meshmgr qca_nss_gre ledtrig_usbport qca_mcs bonding ip6_gre ip_gre gre ifb nat46 nf_defrag_ipv6 sit qca_nss_drv ip6_tunnel tunnel6 tunnel4 nls_utf8 nls_iso8859_1 nls_cp437 vxlan seqiv michael_mic uas usb_storage leds_gpio xhci_plat_hcd xhci_pci xhci_hcd dwc3 dwc3_qcom qca_nss_dp qca_ssdk ramoops reed_solomon pstore gpio_button_hotplug ext4 mbcache jbd2 aquantia hwmon crc_ccitt crc32c_generic [ 16.721723] CPU: 2 PID: 3524 Comm: hostapd Not tainted 6.1.68 #0 [ 16.743958] Hardware name: Dynalink DL-WRX36 (DT) [ 16.750032] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 16.754635] pc : ath11k_nss_tx+0x1d4/0x1e0 [ath11k] [ 16.761403] lr : ath11k_nss_tx+0x1bc/0x1e0 [ath11k] [ 16.766264] sp : ffffffc00b1db790 [ 16.771122] x29: ffffffc00b1db790 x28: 0000000000000038 x27: 0000000000000000 [ 16.774602] x26: ffffff8006dd7430 x25: ffffff8007ea9dc8 x24: 0000000060000012 [ 16.781719] x23: ffffff8005c6a060 x22: ffffff8005c6a060 x21: ffffff80072f12d8 [ 16.788837] x20: ffffff8007ea9dc8 x19: ffffff8006082800 x18: 0000000000000005 [ 16.795957] x17: 6976312065707974 x16: 207061636e652062 x15: 6b73207874207373 [ 16.803075] x14: ffffffc00a0dd518 x13: 000000000000018b x12: 000000000000018b [ 16.810192] x11: 00000000ffffffea x10: ffffffc00a135518 x9 : 0000000000000001 [ 16.817310] x8 : 0000000000000001 x7 : 0000000000017fe8 x6 : c0000000ffffefff [ 16.824429] x5 : 0000000000000000 x4 : 0000000000000000 x3 : 0000000000000000 [ 16.831547] x2 : ffffff80072f1370 x1 : 0000000000000000 x0 : 0000000000000001 [ 16.838665] Call trace: [ 16.845774] ath11k_nss_tx+0x1d4/0x1e0 [ath11k] [ 16.848035] ath11k_mac_tx_mgmt_pending_free+0x3034/0x9600 [ath11k] [ 16.852551] ieee80211_handle_wake_tx_queue+0x68/0xb10 [mac80211] [ 16.858801] ieee80211_probereq_get+0xca4/0x11f0 [mac80211] [ 16.865049] ieee80211_tx_prepare_skb+0x1dc/0x240 [mac80211] [ 16.870432] ieee80211_xmit+0xcc/0x120 [mac80211] [ 16.876333] __ieee80211_subif_start_xmit+0x2b8/0x380 [mac80211] [ 16.880937] ieee80211_subif_start_xmit+0x40/0x3b0 [mac80211] [ 16.887013] ieee80211_subif_start_xmit_8023+0xb8/0x430 [mac80211] [ 16.892656] dev_hard_start_xmit+0x8c/0x110 [ 16.898728] __dev_queue_xmit+0x1f0/0xbc0 [ 16.902808] dev_queue_xmit+0x14/0x20 [ 16.906975] packet_sendmsg+0x768/0x1260 [ 16.910620] __sys_sendto+0xdc/0x140 [ 16.914613] __arm64_sys_sendto+0x28/0x40 [ 16.918174] invoke_syscall.constprop.0+0x5c/0x110 [ 16.922081] do_el0_svc+0x58/0x170 [ 16.926765] el0_svc+0x18/0x60 [ 16.930149] el0t_64_sync_handler+0x114/0x120 [ 16.933190] el0t_64_sync+0x174/0x178 [ 16.933197] ---[ end trace 0000000000000000 ]--- [ 16.933230] ath11k c000000.wifi: failed to transmit frame -22 [ 17.041495] ath11k c000000.wifi: encap mismatch in nss tx skb encap type 1vif encap type 2 [ 17.041578] ath11k c000000.wifi: failed to transmit frame -22 Which is confusing since the parameter is definitley set to '2'. ➤ cat /sys/module/ath11k/parameters/frame_mode 2 Booting with either "nss_offload=1 frame_mode=3" (RAW), or "nss_offload=1 frame_mode=1" (Native Wifi) Results in: [ 15.644742] ath11k c000000.wifi: peer not found for nss peer delete [ 15.744742] ath11k c000000.wifi: peer not found for nss peer delete [ 15.745742] ath11k c000000.wifi: peer not found for nss peer delete [ 15.746682] ath11k c000000.wifi: peer not found for nss peer delete Clients connect and then are immediately kicked off, stuck in a loop. ath11k-nss: Wifi offloading working (unstable) Wifi offloading seems to be working, however it is not stable. Logs will initially show a lot of flooding. ``` [Sun Dec 17 02:43:25 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:28 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:30 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:32 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:34 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:40 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:41 2023] ath11k c000000.wifi: peer not found for nss peer delete [Sun Dec 17 02:43:46 2023] ath11k c000000.wifi: peer not found for nss peer delete ``` But eventually ends up subsiding. Needs heavy testing... ath11k_nss: Add mac address to debug `nss peer delete` warnings also delete ath10k patch, and refresh. ath11k_nss: FIX `nss peer delete` + encap errors This should hopefullly fix the following errors: ``` [Sun Dec 24 22:03:21 2023] ath11k c000000.wifi: encap mismatch in nss tx skb encap type 1vif encap type 2 [Sun Dec 24 22:03:21 2023] ath11k c000000.wifi: failed to transmit frame -22 [Sun Dec 24 22:08:25 2023] ath11k c000000.wifi: encap mismatch in nss tx skb encap type 1vif encap type 2 [Sun Dec 24 22:08:25 2023] ath11k c000000.wifi: failed to transmit frame -22 ``` Clients should also be able to switch between 2Ghz and 5Ghz AP, as well as join using password (no longer required to boot with NSS off first, connect the client to acquire PSK, and reboot back with nss wifi offload enabled). Uptime has been 5 hours and so far no issues. ath11k_nss: Remove unecessary clang-tidy formatting ath11k_nss: add 'debug_mode' flag quiet warnings Will properly handle: ``` [Mon Dec 25 16:51:34 2023] ath11k c000000.wifi: encap mismatch in nss tx skb encap type 1 vif encap type 2 ``` should take the path for native wifi encap ath11k_nss: Rework depends, make `nss_redirect` optional 1.) Added a reworked `qca-nss-pbuf` init script from QSDK that will set sysctl NSS `n2hcfg` wifi options based on board type and available RAM. 2.) ath11k is fully capable of offloading wifi, it does not need mac80211 to create any NSS vifs. This lowers overhead and has actually shown considerable speed improvements for CPU programs on the router side (i.e. SMB). I believe ax3600's IoT (ath10k) would require it for offloading. I've added 2 new makemenu options, `MAC80211_NSS_SUPPORT` which enables NSS related features, and `MAC80211_NSS_REDIRECT` which provides the option to autoload the module on boot with `nss_redirect=1`. 3.) Reverted the option that deafulted `ATH11K_MEM_PROFILE_512M` to true. This was not required for platforms with 1GB or more memory (which is most of them). The default is 1GB. Select for platforms like Xiaomi AX3600. ath11k_nss: remove requirement for '/sys/kernel/debug/ath11k' ath11k_nss: set default values lower to avoid eating up memory ath11k_nss: Add NSS VLAN support + improvements 1) tweaked qca-nss-pbuf script to better handle different board configs 2) added some QSDK NSS patches for dynamic vlan, WDS. 3) added QSDK fixes for beacon, and bt-coex For devices that keep getting disconnected (mostly on 2G). It is recommended to use the following settings for wifi. Change for your country. config wifi-device 'radio0' option type 'mac80211' option path 'platform/soc/c000000.wifi' option band '5g' option txpower '24' option country 'PA' option channel '100' option htmode 'HE160' option cell_density '0' config wifi-iface 'default_radio0' option device 'radio0' option network 'lan' option mode 'ap' option encryption 'psk2' option key 'SOME_PASSWORD' option ssid 'EXAMPLE_5G' option dtim_period '3' option max_inactivity '86400' option disassoc_low_ack '0' config wifi-device 'radio1' option type 'mac80211' option path 'platform/soc/c000000.wifi+1' option band '2g' option htmode 'HT20' option channel '1' option txpower '36' option country 'PA' option cell_density '0' config wifi-iface 'default_radio1' option device 'radio1' option network 'lan' option mode 'ap' option ssid 'EXAMPLE_2G' option encryption 'psk2' option key 'SOME_PASSWORD' option max_inactivity '86400' option dtim_period '3' option disassoc_low_ack '0' WPA3 should be disabled, and left as WPA2. Experimenting with max_inactivity, dtim_period, and disassoc_low_ack to hopefully resolve the deauth disconnects. --- package/kernel/mac80211/Makefile | 32 +- package/kernel/mac80211/ath.mk | 29 +- .../mac80211/files/etc/init.d/qca-nss-pbuf | 91 + ...th11k-fix-for-peer-memory-corruption.patch | 48 + ...dma-counter-increamenting-improperly.patch | 51 + ...nitor-crash-if-tx-offload-is-enabled.patch | 60 + .../107-ath11k-tid-counter-fix.patch | 21 + .../113-ath11k-add-8023-undecap-support.patch | 55 + ...-adding-support-for-mgmt-frame-stats.patch | 292 ++ ...-when-using-encapsulation-offloading.patch | 12 + ...91-ath11k-add-mgmt-and-data-ack-rssi.patch | 48 + .../199-001-mac80211-add-nss-support.patch | 461 +++ ...-ath11k_nss-add-nss-driver-interface.patch | 3020 +++++++++++++++++ .../199-003-ath11k-add-nss-support.patch | 1283 +++++++ ...t-callback-when-hwencap-enable-in-st.patch | 35 + ...-ath11k-Add-support-for-dynamic-vlan.patch | 60 + ...th11k-Enable-512MB-profile-in-ath11k.patch | 332 ++ ...07-mac80211-add-nss-redirect-support.patch | 268 ++ .../211-ath11k-add-obss-pd-support.patch | 56 + ...14-ath11k-qos-null-frame-tx-over-wmi.patch | 519 +++ ...11k-Disable-rx_header-tlv-for-2K-SKB.patch | 906 +++++ ...01-ath11k-account-tx-rx-packets-flow.patch | 494 +++ ...-mac80211-account-tx-rx-packets-flow.patch | 369 ++ ...th11k-Add-support-for-beacon-tx-mode.patch | 45 + ...80211-Add-support-for-beacon-tx-mode.patch | 159 + ...dd-provision-to-configure-rx-hashmap.patch | 208 ++ ...dst-ring-descriptors-from-cacheable-.patch | 147 + ...ow-fast-rx-by-bypassing-stats-update.patch | 412 +++ .../ath11k_nss/245-compilation_fix.patch | 192 ++ .../245-revert-dev-sw-netstats-txrx-add.patch | 145 + ...-nss-thread-priority-during-pdev_ini.patch | 109 + ...avoid-stack-corrupt-in-nwifi-undecap.patch | 11 + ...e-free-of-peer-rx_tid-during-reo-cmd.patch | 40 + ...-0005-mac80211-simple-tx-for-AP-mode.patch | 99 + ...1k-skip-status-ring-entry-processing.patch | 191 ++ ...ccess-of-the-dma-buffer-back-to-dma-.patch | 28 + ...mac80211-fix-unconditional-sta-usage.patch | 50 + ...-fix-clear-peer-keys-during-disassoc.patch | 50 + ...-fix-tkip-encryption-traffic-failure.patch | 25 + ...-event-handler-support-for-link-desc.patch | 73 + ...unused-RX_FLAGS-from-mac80211_rx_fla.patch | 85 + .../640-006-mac80211-add-eht-radiotap.patch | 506 +++ ...ncapsulation-of-EAPOL-frames-if-OFFL.patch | 232 ++ .../702-ath11k-fix-memory-leak-in-dp-rx.patch | 48 + ...-the-frame-to-driver-tx-ops-directly.patch | 74 + ...se-HW-checksum-offload-only-for-ethm.patch | 140 + .../patches/ath11k_nss/900-fix-build.patch | 236 ++ ...N-iftype-support-on-NSS-offload-case.patch | 206 ++ ...load-changes-to-NSS-driver-interface.patch | 701 ++++ ...-dynamic-VLAN-support-on-NSS-offload.patch | 102 + ...-support-on-NSS-offload-for-STA-mode.patch | 973 ++++++ ...02-ath11k-add-HE-stats-in-peer-stats.patch | 777 +++++ .../902-ath11k-add-btcoex-config.patch | 612 ++++ ...vdev-in-NSS-for-AP_VLAN-vif-handling.patch | 784 +++++ ...pport-for-WDS-offload-in-NSS-offload.patch | 575 ++++ ...dev-in-NSS-for-dynamic-VLAN-handling.patch | 213 ++ ...-dynamic-VLAN-support-in-NSS-offload.patch | 557 +++ .../patches-6.6/9999-add-btcoex-dts.patch | 30 + 58 files changed, 17374 insertions(+), 3 deletions(-) create mode 100755 package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf create mode 100644 package/kernel/mac80211/patches/ath11k_nss/033-ath11k-fix-for-peer-memory-corruption.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/207-mac80211-add-nss-redirect-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch create mode 100644 target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 566cfdd7b2efcb..c65898aa46c0eb 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -36,6 +36,8 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_MAC80211_DEBUGFS \ CONFIG_PACKAGE_MAC80211_MESH \ CONFIG_PACKAGE_MAC80211_TRACING \ + CONFIG_PACKAGE_MAC80211_NSS_SUPPORT \ + CONFIG_PACKAGE_MAC80211_NSS_REDIRECT \ CONFIG_PACKAGE_IWLWIFI_DEBUG \ CONFIG_PACKAGE_IWLWIFI_DEBUGFS \ CONFIG_PACKAGE_RTLWIFI_DEBUG \ @@ -129,10 +131,15 @@ define KernelPackage/mac80211 $(call KernelPackage/mac80211/Default) TITLE:=Linux 802.11 Wireless Networking Stack # +kmod-crypto-cmac is a runtime only dependency of net/mac80211/aes_cmac.c - DEPENDS+= +kmod-cfg80211 +kmod-crypto-cmac +kmod-crypto-ccm +kmod-crypto-gcm +hostapd-common + DEPENDS+= +kmod-cfg80211 +kmod-crypto-cmac +kmod-crypto-ccm +kmod-crypto-gcm +hostapd-common \ + +ATH11K_NSS_SUPPORT:kmod-qca-nss-drv KCONFIG:=\ CONFIG_AVERAGE=y FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko +ifdef CONFIG_PACKAGE_MAC80211_NSS_REDIRECT + AUTOLOAD:=$(call AutoProbe, mac80211) + MODPARAMS.mac80211:=nss_redirect=1 +endif ABI_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) MENU:=1 endef @@ -140,6 +147,21 @@ endef define KernelPackage/mac80211/config if PACKAGE_kmod-mac80211 + if PACKAGE_kmod-qca-nss-drv + config PACKAGE_MAC80211_NSS_SUPPORT + bool "Enable NSS support" + default y + help + This option enables support for NSS in QCA boards. + config PACKAGE_MAC80211_NSS_REDIRECT + bool "Enable autoloading with 'nss_redirect=1' (not needed on ath11k)" + depends on PACKAGE_MAC80211_NSS_SUPPORT + default n + help + This option enables autoloading mac80211 with 'nss_redirect=1'. + However, it is not required for wifi offloading. + endif + config PACKAGE_MAC80211_DEBUGFS bool "Export mac80211 internals in DebugFS" select KERNEL_DEBUG_FS @@ -281,6 +303,12 @@ ifeq ($(BUILD_VARIANT),smallbuffers) C_DEFINES+= -DCONFIG_ATH10K_SMALLBUFFERS endif +ifdef CONFIG_ATH11K_NSS_SUPPORT + IREMAP_CFLAGS+=-I$(STAGING_DIR)/usr/include/qca-nss-drv -I$(STAGING_DIR)/usr/include/qca-nss-clients +endif + +config-$(CONFIG_PACKAGE_MAC80211_NSS_SUPPORT) += MAC80211_NSS_SUPPORT + MAKE_OPTS:= \ $(subst -C $(LINUX_DIR),-C "$(PKG_BUILD_DIR)",$(KERNEL_MAKEOPTS)) \ EXTRA_CFLAGS="-I$(PKG_BUILD_DIR)/include $(IREMAP_CFLAGS) $(C_DEFINES)" \ @@ -349,6 +377,7 @@ define Build/Patch $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath9k,ath9k/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath10k,ath10k/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k,ath11k/) + $(if $(CONFIG_ATH11K_NSS_SUPPORT),$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k_nss,ath11k_nss/)) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rt2x00,rt2x00/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mt7601u,mt7601u/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mwl,mwl/) @@ -365,6 +394,7 @@ define Quilt/Refresh/Package $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath9k,ath9k/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath10k,ath10k/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k,ath11k/) + $(if $(CONFIG_ATH11K_NSS_SUPPORT),$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k_nss,ath11k_nss/)) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rt2x00,rt2x00/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mt7601u,mt7601u/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mwl,mwl/) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index b0c3691a572ae6..6795818446ace6 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -13,7 +13,10 @@ PKG_CONFIG_DEPENDS += \ CONFIG_ATH10K_LEDS \ CONFIG_ATH10K_THERMAL \ CONFIG_ATH11K_THERMAL \ - CONFIG_ATH_USER_REGD + CONFIG_ATH_USER_REGD \ + CONFIG_ATH11K_MEM_PROFILE_512M \ + CONFIG_ATH11K_NSS_SUPPORT \ + CONFIG_ATH11K_SMART_ANT_ALG ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS config-y += \ @@ -56,6 +59,9 @@ config-$(CONFIG_ATH9K_UBNTHSR) += ATH9K_UBNTHSR config-$(CONFIG_ATH10K_LEDS) += ATH10K_LEDS config-$(CONFIG_ATH10K_THERMAL) += ATH10K_THERMAL config-$(CONFIG_ATH11K_THERMAL) += ATH11K_THERMAL +config-$(CONFIG_ATH11K_MEM_PROFILE_512M) += ATH11K_MEM_PROFILE_512M +config-$(CONFIG_ATH11K_NSS_SUPPORT) += ATH11K_NSS_SUPPORT +config-$(CONFIG_ATH11K_SMART_ANT_ALG) += ATH11K_SMART_ANT_ALG config-$(call config_package,ath9k-htc) += ATH9K_HTC config-$(call config_package,ath10k,regular) += ATH10K ATH10K_PCI @@ -297,9 +303,14 @@ define KernelPackage/ath11k TITLE:=Qualcomm 802.11ax wireless chipset support (common code) URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k DEPENDS+= +kmod-ath +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT \ - +kmod-crypto-michael-mic +ATH11K_THERMAL:kmod-hwmon-core +ATH11K_THERMAL:kmod-thermal + +kmod-crypto-michael-mic +ATH11K_THERMAL:kmod-hwmon-core +ATH11K_THERMAL:kmod-thermal \ + +ATH11K_NSS_SUPPORT:kmod-qca-nss-drv FILES:=$(PKG_BUILD_DIR)/drivers/soc/qcom/qmi_helpers.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k.ko +ifdef CONFIG_ATH11K_NSS_SUPPORT + AUTOLOAD:=$(call AutoProbe,ath11k) + MODPARAMS.ath11k:=nss_offload=1 frame_mode=2 +endif endef define KernelPackage/ath11k/description @@ -314,6 +325,20 @@ define KernelPackage/ath11k/config depends on PACKAGE_kmod-ath11k default y if TARGET_qualcommax + config ATH11K_NSS_SUPPORT + bool "Enable NSS WiFi offload" + default y if TARGET_qualcommax + + config ATH11K_MEM_PROFILE_512M + bool "Use limits for the 512MB memory size" + default n + help + This allows selecting the ath11k memory size profile to be used. + + config ATH11K_SMART_ANT_ALG + bool "Enable smart antenna" + depends on PACKAGE_ATH_DEBUG + default n endef define KernelPackage/ath11k-ahb diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf new file mode 100755 index 00000000000000..40f05c46fb28fb --- /dev/null +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -0,0 +1,91 @@ +#!/bin/sh /etc/rc.common +# +# Copyright (c) 2021 The Linux Foundation. All rights reserved. +# Permission to use, copy, modify, and/or distribute this software for any +# purpose with or without fee is hereby granted, provided that the above +# copyright notice and this permission notice appear in all copies. +# +# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +# + +START=20 + +apply_sysctl() { + [ $(sysctl -n -e dev.nss.general.redirect) = "0" ] && /etc/init.d/qca-nss-ecm start + + logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0" + sysctl -w dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0 > /dev/null 2> /dev/null + + logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0" + sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 > /dev/null 2> /dev/null + + logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf" + sysctl -w dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf > /dev/null 2> /dev/null + +} + +apply_nss_config() { + + sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core0=256 > /dev/null 2> /dev/null + sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core1=256 > /dev/null 2> /dev/null + + board=$(board_name) + + case "$board" in + # 1GB+ profile + buffalo,wxr-5950ax12 | \ + dynalink,dl-wrx36 | \ + edgecore,eap102 | \ + linksys,mx5300 | \ + linksys,mx4200v2 | \ + netgear,rax120v2 | \ + netgear,wax620 | \ + netgear,wax630 | \ + prpl,haze | \ + qnap,301w | \ + xiaomi,ax9000 | \ + zyxel,nbg7815) + extra_pbuf_core0=10000000 n2h_high_water_core0=72512 n2h_wifi_pool_buf=36864 apply_sysctl + ;; + # 512MB profile + edimax,cax1800 | \ + linksys,mx4200v1 | \ + xiaomi,ax3600) # 512MB profile + extra_pbuf_core0=3100000 n2h_high_water_core0=30624 n2h_wifi_pool_buf=8192 apply_sysctl + ;; + # 256MB profile + netgear,wax218) + extra_pbuf_core0=3100000 n2h_high_water_core0=30258 n2h_wifi_pool_buf=4096 apply_sysctl + ;; + esac +} + +start() { + if [ ! -r /sys/module/ath11k/parameters/nss_offload ]; then + logger -t ath11k_nss "Module parameter '/sys/module/ath11k/parameters/nss_offload' does NOT exist. Skipping applying wifi nss configs" + exit 1 + fi + + enable_nss_offload=$(cat /sys/module/ath11k/parameters/nss_offload) + + if [ "$enable_nss_offload" = "0" ]; then + logger -t ath11k_nss "Module parameter 'nss_offload=0'. Skipping applying wifi nss configs" + exit 1 + fi + + # Running this script multiple times is useless, as extra_pbuf_core0 + # can't be changed if it is allocated, assume it's already been run. + extra_pbuf_core0=$(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0) + + if [ "$extra_pbuf_core0" = "0" ]; then + apply_nss_config + else + logger -t ath11k_nss "Sysctl key 'extra_pbuf_core0' already set to '"$extra_pbuf_core0"'. Skipping applying wifi nss configs" + fi +} diff --git a/package/kernel/mac80211/patches/ath11k_nss/033-ath11k-fix-for-peer-memory-corruption.patch b/package/kernel/mac80211/patches/ath11k_nss/033-ath11k-fix-for-peer-memory-corruption.patch new file mode 100644 index 00000000000000..5c9c723913b09a --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/033-ath11k-fix-for-peer-memory-corruption.patch @@ -0,0 +1,48 @@ +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -4178,22 +4178,28 @@ static int ath11k_clear_peer_keys(struct + int ret; + int i; + u32 flags = 0; ++ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; + + lockdep_assert_held(&ar->conf_mutex); + + spin_lock_bh(&ab->base_lock); + peer = ath11k_peer_find(ab, arvif->vdev_id, addr); +- spin_unlock_bh(&ab->base_lock); +- +- if (!peer) ++ if (!peer) { ++ spin_unlock_bh(&ab->base_lock); + return -ENOENT; ++ } ++ for (i = 0; i < ARRAY_SIZE(keys); i++) { ++ keys[i]= peer->keys[i]; ++ peer->keys[i]= NULL; ++ } ++ spin_unlock_bh(&ab->base_lock); + +- for (i = 0; i < ARRAY_SIZE(peer->keys); i++) { +- if (!peer->keys[i]) ++ for (i = 0; i < ARRAY_SIZE(keys); i++) { ++ if (!keys[i]) + continue; + + /* key flags are not required to delete the key */ +- ret = ath11k_install_key(arvif, peer->keys[i], ++ ret = ath11k_install_key(arvif, keys[i], + DISABLE_KEY, addr, flags); + if (ret < 0 && first_errno == 0) + first_errno = ret; +@@ -4201,10 +4207,6 @@ static int ath11k_clear_peer_keys(struct + if (ret < 0) + ath11k_warn(ab, "failed to remove peer key %d: %d\n", + i, ret); +- +- spin_lock_bh(&ab->base_lock); +- peer->keys[i] = NULL; +- spin_unlock_bh(&ab->base_lock); + } + + return first_errno; diff --git a/package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch b/package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch new file mode 100644 index 00000000000000..326db09145b342 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch @@ -0,0 +1,51 @@ + drivers/net/wireless/ath/ath11k/dp_rx.c | 3 ++- + drivers/net/wireless/ath/ath11k/hal_rx.c | 3 +++ + drivers/net/wireless/ath/ath11k/hal_rx.h | 2 ++ + 3 files changed, 7 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -5242,8 +5242,11 @@ int ath11k_dp_rx_process_mon_status(stru + goto next_skb; + } + +- arsta = ath11k_sta_to_arsta(peer->sta); +- ath11k_dp_rx_update_peer_stats(arsta, ppdu_info); ++ if ((ppdu_info->fc_valid) && ++ (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { ++ arsta = (struct ath11k_sta *)peer->sta->drv_priv; ++ ath11k_dp_rx_update_peer_stats(arsta, ppdu_info); ++ } + + if (ath11k_debugfs_is_pktlog_peer_valid(ar, peer->addr)) + trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -900,6 +900,9 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + ppdu_info->ast_index = + FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX, + __le32_to_cpu(eu_stats->info2)); ++ ppdu_info->fc_valid = ++ FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID, ++ __le32_to_cpu(eu_stats->info1)); + ppdu_info->tid = + ffs(FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP, + __le32_to_cpu(eu_stats->info7))) - 1; +--- a/drivers/net/wireless/ath/ath11k/hal_rx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.h +@@ -66,6 +66,7 @@ enum hal_rx_reception_type { + }; + + #define HAL_RX_FCS_LEN 4 ++#define HAL_AST_IDX_INVALID 0xFFFF + + enum hal_rx_mon_status { + HAL_RX_MON_STATUS_PPDU_NOT_DONE, +@@ -150,6 +151,7 @@ struct hal_rx_mon_ppdu_info { + u8 rssi_comb; + u8 rssi_chain_pri20[HAL_RX_MAX_NSS]; + u16 tid; ++ u8 fc_valid; + u16 ht_flags; + u16 vht_flags; + u16 he_flags; diff --git a/package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch b/package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch new file mode 100644 index 00000000000000..9304833c87d1c3 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch @@ -0,0 +1,60 @@ + drivers/net/wireless/ath/ath11k/dp_tx.c | 20 +++++++++++++++++--- + 1 file changed, 17 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -322,6 +322,8 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + struct ath11k_skb_cb *skb_cb; + struct ath11k *ar; + struct ath11k_peer *peer; ++ struct ieee80211_vif *vif; ++ u8 flags = 0; + + spin_lock(&tx_ring->tx_idr_lock); + msdu = idr_remove(&tx_ring->txbuf_idr, ts->msdu_id); +@@ -348,6 +350,14 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + return; + } + ++ if (!skb_cb->vif) { ++ dev_kfree_skb_any(msdu); ++ return; ++ } ++ ++ flags = skb_cb->flags; ++ vif = skb_cb->vif; ++ + memset(&info->status, 0, sizeof(info->status)); + + if (ts->acked) { +@@ -555,6 +565,8 @@ static void ath11k_dp_tx_complete_msdu(s + struct ath11k_peer *peer; + struct ath11k_sta *arsta; + struct rate_info rate; ++ struct ieee80211_vif *vif; ++ u8 flags = 0; + + if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { + /* Must not happen */ +@@ -575,6 +587,9 @@ static void ath11k_dp_tx_complete_msdu(s + return; + } + ++ flags = skb_cb->flags; ++ vif = skb_cb->vif; ++ + info = IEEE80211_SKB_CB(msdu); + memset(&info->status, 0, sizeof(info->status)); + +@@ -641,7 +656,10 @@ static void ath11k_dp_tx_complete_msdu(s + + spin_unlock_bh(&ab->base_lock); + +- ieee80211_tx_status_ext(ar->hw, &status); ++ if (flags & ATH11K_SKB_HW_80211_ENCAP) ++ ieee80211_tx_status_8023(ar->hw, vif, msdu); ++ else ++ ieee80211_tx_status_ext(ar->hw, &status); + } + + static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab, diff --git a/package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch b/package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch new file mode 100644 index 00000000000000..1826e64bbcba05 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch @@ -0,0 +1,21 @@ +From e227e5896dc8fe69d63334819c5fbada9caddc50 Mon Sep 17 00:00:00 2001 +From: Miles Hu +Date: Tue, 14 Jan 2020 14:29:53 -0800 +Subject: [PATCH] tid fix + +--- + drivers/net/wireless/ath/ath11k/hal_rx.c | 2 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -905,7 +905,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + __le32_to_cpu(eu_stats->info1)); + ppdu_info->tid = + ffs(FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP, +- __le32_to_cpu(eu_stats->info7))) - 1; ++ __le32_to_cpu(eu_stats->rsvd2[0]))) - 1; + ppdu_info->tcp_msdu_count = + FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT, + __le32_to_cpu(eu_stats->info4)); diff --git a/package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch b/package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch new file mode 100644 index 00000000000000..8ef3d9ba7c4d91 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch @@ -0,0 +1,55 @@ +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2163,6 +2163,42 @@ static void ath11k_dp_rx_h_undecap_eth(s + ether_addr_copy(ieee80211_get_SA(hdr), sa); + } + ++static void ath11k_dp_rx_h_undecap_snap(struct ath11k *ar, ++ struct sk_buff *msdu, ++ u8 *first_hdr, ++ enum hal_encrypt_type enctype, ++ struct ieee80211_rx_status *status) ++{ ++ struct ieee80211_hdr *hdr; ++ size_t hdr_len; ++ u8 l3_pad_bytes; ++ struct hal_rx_desc *rx_desc; ++ ++ /* Delivered decapped frame: ++ * [amsdu header] <-- replaced with 802.11 hdr ++ * [rfc1042/llc] ++ * [payload] ++ */ ++ ++ rx_desc = (void *)msdu->data - sizeof(*rx_desc); ++ l3_pad_bytes = ath11k_dp_rx_h_msdu_end_l3pad(ar->ab, rx_desc); ++ ++ skb_put(msdu, l3_pad_bytes); ++ skb_pull(msdu, sizeof(struct ath11k_dp_amsdu_subframe_hdr) + l3_pad_bytes); ++ ++ hdr = (struct ieee80211_hdr *)first_hdr; ++ hdr_len = ieee80211_hdrlen(hdr->frame_control); ++ ++ if (!(status->flag & RX_FLAG_IV_STRIPPED)) { ++ memcpy(skb_push(msdu, ++ ath11k_dp_rx_crypto_param_len(ar, enctype)), ++ (void *)hdr + hdr_len, ++ ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ } ++ ++ memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); ++} ++ + static void ath11k_dp_rx_h_undecap(struct ath11k *ar, struct sk_buff *msdu, + struct hal_rx_desc *rx_desc, + enum hal_encrypt_type enctype, +@@ -2204,7 +2240,8 @@ static void ath11k_dp_rx_h_undecap(struc + enctype, status); + break; + case DP_RX_DECAP_TYPE_8023: +- /* TODO: Handle undecap for these formats */ ++ ath11k_dp_rx_h_undecap_snap(ar, msdu, first_hdr, ++ enctype, status); + break; + } + } diff --git a/package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch new file mode 100644 index 00000000000000..f1dfc0f7b9a887 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch @@ -0,0 +1,292 @@ +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -311,6 +311,16 @@ struct ath11k_rekey_data { + bool enable_offload; + }; + ++#define ATH11K_STATS_MGMT_FRM_TYPE_MAX 16 ++ ++struct ath11k_mgmt_frame_stats { ++ u32 tx_succ_cnt[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; ++ u32 tx_fail_cnt[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; ++ u32 rx_cnt[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; ++ u32 tx_compl_succ[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; ++ u32 tx_compl_fail[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; ++}; ++ + struct ath11k_vif { + u32 vdev_id; + enum wmi_vdev_type vdev_type; +@@ -369,6 +379,8 @@ struct ath11k_vif { + #ifdef CPTCFG_ATH11K_DEBUGFS + struct dentry *debugfs_twt; + #endif /* CPTCFG_ATH11K_DEBUGFS */ ++ ++ struct ath11k_mgmt_frame_stats mgmt_stats; + }; + + struct ath11k_vif_iter { +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1588,6 +1588,87 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++static ssize_t ath11k_dump_mgmt_stats(struct file *file, char __user *ubuf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k *ar = file->private_data; ++ struct ath11k_vif *arvif = NULL; ++ struct ath11k_mgmt_frame_stats *mgmt_stats; ++ int len = 0, ret, i; ++ int size = (TARGET_NUM_VDEVS - 1) * 1500; ++ char *buf; ++ const char *mgmt_frm_type[ATH11K_STATS_MGMT_FRM_TYPE_MAX-1] = {"assoc_req", "assoc_resp", ++ "reassoc_req", "reassoc_resp", ++ "probe_req", "probe_resp", ++ "timing_advertisement", "reserved", ++ "beacon", "atim", "disassoc", ++ "auth", "deauth", "action", "action_no_ack"}; ++ ++ if (ar->state != ATH11K_STATE_ON) ++ return -ENETDOWN; ++ ++ buf = kzalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ mutex_lock(&ar->conf_mutex); ++ spin_lock_bh(&ar->data_lock); ++ ++ list_for_each_entry (arvif, &ar->arvifs, list) { ++ if (!arvif) ++ break; ++ ++ if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ++ continue; ++ ++ mgmt_stats = &arvif->mgmt_stats; ++ len += scnprintf(buf + len, size - len, "MGMT frame stats for vdev %u :\n", ++ arvif->vdev_id); ++ len += scnprintf(buf + len, size - len, " TX stats :\n "); ++ len += scnprintf(buf + len, size - len, " Success frames:\n"); ++ for (i = 0; i < ATH11K_STATS_MGMT_FRM_TYPE_MAX-1; i++) ++ len += scnprintf(buf + len, size - len, " %s: %d\n", mgmt_frm_type[i], ++ mgmt_stats->tx_succ_cnt[i]); ++ ++ len += scnprintf(buf + len, size - len, " Failed frames:\n"); ++ ++ for (i = 0; i < ATH11K_STATS_MGMT_FRM_TYPE_MAX-1; i++) ++ len += scnprintf(buf + len, size - len, " %s: %d\n", mgmt_frm_type[i], ++ mgmt_stats->tx_fail_cnt[i]); ++ ++ len += scnprintf(buf + len, size - len, " RX stats :\n"); ++ len += scnprintf(buf + len, size - len, " Success frames:\n"); ++ for (i = 0; i < ATH11K_STATS_MGMT_FRM_TYPE_MAX-1; i++) ++ len += scnprintf(buf + len, size - len, " %s: %d\n", mgmt_frm_type[i], ++ mgmt_stats->rx_cnt[i]); ++ ++ len += scnprintf(buf + len, size - len, " Tx completion stats :\n"); ++ len += scnprintf(buf + len, size - len, " success completions:\n"); ++ for (i = 0; i < ATH11K_STATS_MGMT_FRM_TYPE_MAX-1; i++) ++ len += scnprintf(buf + len, size - len, " %s: %d\n", mgmt_frm_type[i], ++ mgmt_stats->tx_compl_succ[i]); ++ len += scnprintf(buf + len, size - len, " failure completions:\n"); ++ for (i = 0; i < ATH11K_STATS_MGMT_FRM_TYPE_MAX-1; i++) ++ len += scnprintf(buf + len, size - len, " %s: %d\n", mgmt_frm_type[i], ++ mgmt_stats->tx_compl_fail[i]); ++ } ++ ++ spin_unlock_bh(&ar->data_lock); ++ ++ if (len > size) ++ len = size; ++ ++ ret = simple_read_from_buffer(ubuf, count, ppos, buf, len); ++ mutex_unlock(&ar->conf_mutex); ++ kfree(buf); ++ return ret; ++} ++ ++static const struct file_operations fops_dump_mgmt_stats = { ++ .read = ath11k_dump_mgmt_stats, ++ .open = simple_open ++}; ++ + int ath11k_debugfs_register(struct ath11k *ar) + { + struct ath11k_base *ab = ar->ab; +@@ -1620,6 +1701,9 @@ int ath11k_debugfs_register(struct ath11 + debugfs_create_file("fw_dbglog_config", 0600, + ar->debug.debugfs_pdev, ar, + &fops_fw_dbglog); ++ debugfs_create_file("dump_mgmt_stats", 0644, ++ ar->debug.debugfs_pdev, ar, ++ &fops_dump_mgmt_stats); + + if (ar->hw->wiphy->bands[NL80211_BAND_5GHZ]) { + debugfs_create_file("dfs_simulate_radar", 0200, +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6148,9 +6148,9 @@ static int ath11k_mac_mgmt_tx(struct ath + */ + if (is_prb_rsp && + atomic_read(&ar->num_pending_mgmt_tx) > ATH11K_PRB_RSP_DROP_THRESHOLD) { +- ath11k_warn(ar->ab, ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, + "dropping probe response as pending queue is almost full\n"); +- return -ENOSPC; ++ return -EBUSY; + } + + if (skb_queue_len_lockless(q) >= ATH11K_TX_MGMT_NUM_PENDING_MAX) { +@@ -6176,9 +6176,11 @@ static void ath11k_mac_op_tx(struct ieee + struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + struct ieee80211_key_conf *key = info->control.hw_key; ++ struct ath11k_mgmt_frame_stats *mgmt_stats = &arvif->mgmt_stats; + struct ath11k_sta *arsta = NULL; + u32 info_flags = info->flags; + bool is_prb_rsp; ++ u16 frm_type = 0; + int ret; + + memset(skb_cb, 0, sizeof(*skb_cb)); +@@ -6192,12 +6194,21 @@ static void ath11k_mac_op_tx(struct ieee + if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { + skb_cb->flags |= ATH11K_SKB_HW_80211_ENCAP; + } else if (ieee80211_is_mgmt(hdr->frame_control)) { ++ frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); + is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control); + ret = ath11k_mac_mgmt_tx(ar, skb, is_prb_rsp); + if (ret) { +- ath11k_warn(ar->ab, "failed to queue management frame %d\n", +- ret); ++ if (ret != -EBUSY) ++ ath11k_warn(ar->ab, "failed to queue management frame %d\n", ++ ret); + ieee80211_free_txskb(ar->hw, skb); ++ spin_lock_bh(&ar->data_lock); ++ mgmt_stats->tx_fail_cnt[frm_type]++; ++ spin_unlock_bh(&ar->data_lock); ++ } else { ++ spin_lock_bh(&ar->data_lock); ++ mgmt_stats->tx_succ_cnt[frm_type]++; ++ spin_unlock_bh(&ar->data_lock); + } + return; + } +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -444,6 +444,7 @@ int ath11k_peer_create(struct ath11k *ar + + peer->sec_type = HAL_ENCRYPT_TYPE_OPEN; + peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; ++ peer->vif = arvif->vif; + + if (sta) { + arsta = ath11k_sta_to_arsta(sta); +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -10,6 +10,7 @@ + struct ath11k_peer { + struct list_head list; + struct ieee80211_sta *sta; ++ struct ieee80211_vif *vif; + int vdev_id; + u8 addr[ETH_ALEN]; + int peer_id; +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -5823,6 +5823,12 @@ static int wmi_process_mgmt_tx_comp(stru + struct sk_buff *msdu; + struct ieee80211_tx_info *info; + struct ath11k_skb_cb *skb_cb; ++ struct ieee80211_hdr *hdr; ++ struct ath11k_peer *peer; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k_mgmt_frame_stats *mgmt_stats; ++ u16 frm_type; + int num_mgmt; + + spin_lock_bh(&ar->txmgmt_idr_lock); +@@ -5850,6 +5856,31 @@ static int wmi_process_mgmt_tx_comp(stru + info->status.ack_signal = tx_compl_param->ack_rssi; + } + ++ hdr = (struct ieee80211_hdr *)msdu->data; ++ frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); ++ ++ spin_lock_bh(&ar->ab->base_lock); ++ peer = ath11k_peer_find_by_addr(ar->ab, hdr->addr2); ++ if (!peer) { ++ spin_unlock_bh(&ar->ab->base_lock); ++ ath11k_warn(ar->ab, "failed to find peer to update txcompl mgmt stats\n"); ++ goto skip_mgmt_stats; ++ } ++ ++ vif = peer->vif; ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ spin_lock_bh(&ar->data_lock); ++ arvif = ath11k_vif_to_arvif(vif); ++ mgmt_stats = &arvif->mgmt_stats; ++ ++ if (!status) ++ mgmt_stats->tx_compl_succ[frm_type]++; ++ else ++ mgmt_stats->tx_compl_fail[frm_type]++; ++ spin_unlock_bh(&ar->data_lock); ++ ++skip_mgmt_stats: + ieee80211_tx_status_irqsafe(ar->hw, msdu); + + num_mgmt = atomic_dec_if_positive(&ar->num_pending_mgmt_tx); +@@ -7519,6 +7550,11 @@ static void ath11k_mgmt_rx_event(struct + struct ieee80211_hdr *hdr; + u16 fc; + struct ieee80211_supported_band *sband; ++ struct ath11k_peer *peer; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k_mgmt_frame_stats *mgmt_stats; ++ u16 frm_type = 0; + + if (ath11k_pull_mgmt_rx_params_tlv(ab, skb, &rx_ev) != 0) { + ath11k_warn(ab, "failed to extract mgmt rx event"); +@@ -7584,7 +7620,34 @@ static void ath11k_mgmt_rx_event(struct + + hdr = (struct ieee80211_hdr *)skb->data; + fc = le16_to_cpu(hdr->frame_control); ++ frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, fc); ++ ++ spin_lock_bh(&ab->base_lock); ++ ++ peer = ath11k_peer_find_by_addr(ab, hdr->addr1); ++ if(!peer) ++ peer = ath11k_peer_find_by_addr(ab, hdr->addr3); ++ if (!peer) { ++ spin_unlock_bh(&ab->base_lock); ++ goto skip_mgmt_stats; ++ } ++ ++ vif = peer->vif; ++ ++ spin_unlock_bh(&ab->base_lock); ++ ++ if (!vif) ++ goto skip_mgmt_stats; ++ ++ spin_lock_bh(&ar->data_lock); ++ ++ arvif = ath11k_vif_to_arvif(vif); ++ mgmt_stats = &arvif->mgmt_stats; ++ mgmt_stats->rx_cnt[frm_type]++; ++ ++ spin_unlock_bh(&ar->data_lock); + ++skip_mgmt_stats: + /* Firmware is guaranteed to report all essential management frames via + * WMI while it can deliver some extra via HTT. Since there can be + * duplicates split the reporting wrt monitor/sniffing. diff --git a/package/kernel/mac80211/patches/ath11k_nss/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch b/package/kernel/mac80211/patches/ath11k_nss/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch new file mode 100644 index 00000000000000..82d8c4e05bb11f --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch @@ -0,0 +1,12 @@ +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4686,8 +4686,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + if (!key) + key = rcu_dereference(sdata->default_unicast_key); + +- if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) || +- key->conf.cipher == WLAN_CIPHER_SUITE_TKIP)) ++ if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))) + goto skip_offload; + + sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); diff --git a/package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch b/package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch new file mode 100644 index 00000000000000..dea5600324f536 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch @@ -0,0 +1,48 @@ +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9571,6 +9571,8 @@ static int __ath11k_mac_register(struct + wiphy_ext_feature_set(ar->hw->wiphy, + NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); + ++ wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); ++ + ar->hw->queues = ATH11K_HW_MAX_QUEUES; + ar->hw->wiphy->tx_queue_len = ATH11K_QUEUE_LEN; + ar->hw->offchannel_tx_hw_queue = ATH11K_HW_MAX_QUEUES - 1; +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -4065,6 +4065,7 @@ ath11k_wmi_copy_resource_config(struct w + wmi_cfg->max_bssid_rx_filters = tg_cfg->max_bssid_rx_filters; + wmi_cfg->use_pdev_id = tg_cfg->use_pdev_id; + wmi_cfg->flag1 = tg_cfg->flag1; ++ wmi_cfg->flag1 |= WMI_RSRC_CFG_FLAG1_ACK_RSSI; + wmi_cfg->peer_map_unmap_v2_support = tg_cfg->peer_map_unmap_v2_support; + wmi_cfg->sched_params = tg_cfg->sched_params; + wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count; +@@ -5874,7 +5875,7 @@ static int wmi_process_mgmt_tx_comp(stru + arvif = ath11k_vif_to_arvif(vif); + mgmt_stats = &arvif->mgmt_stats; + +- if (!status) ++ if (!tx_compl_param->status) + mgmt_stats->tx_compl_succ[frm_type]++; + else + mgmt_stats->tx_compl_fail[frm_type]++; +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -4539,6 +4539,7 @@ struct wmi_pdev_bss_chan_info_event { + u32 rx_bss_cycle_count_low; + u32 rx_bss_cycle_count_high; + u32 pdev_id; ++ u32 ack_rssi; + } __packed; + + #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0 +@@ -4890,7 +4891,6 @@ struct wmi_mgmt_tx_compl_event { + u32 desc_id; + u32 status; + u32 pdev_id; +- u32 ppdu_id; + u32 ack_rssi; + } __packed; + diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch new file mode 100644 index 00000000000000..0b017ec97ad24d --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch @@ -0,0 +1,461 @@ +From 193bfea2185a0ee976f54812e41ace77e6ee85e4 Mon Sep 17 00:00:00 2001 +From: Sriram R +Date: Fri, 10 Jul 2020 12:46:12 +0530 +Subject: [PATCH 1/3] mac80211: add nss support + +Add Support for NSS Offload if the HW supports it. +New flag is introduced to indicate HW support for NSS +offload + +Signed-off-by: Sriram R +--- + include/net/mac80211.h | 13 +++++++++++++ + net/mac80211/debugfs.c | 1 + + net/mac80211/util.c | 16 ++++++++++++++++ + 3 files changed, 30 insertions(+) + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -380,6 +380,20 @@ enum ieee80211_bss_change { + /* when adding here, make sure to change ieee80211_reconfig */ + }; + ++/** ++ * enum ieee80211_nss_bss_change - NSS BSS change notification flags ++ * ++ * These flags are used with the nss_bss_info_changed() callback ++ * to indicate which NSS BSS parameter changed. ++ * ++ * @BSS_CHANGED_NSS_AP_ISOLATE: AP Isolate feature in NSS mode ++ * ++ */ ++ ++enum ieee80211_nss_bss_change { ++ BSS_CHANGED_NSS_AP_ISOLATE = BIT(0), ++}; ++ + /* + * The maximum number of IPv4 addresses listed for ARP filtering. If the number + * of addresses for an interface increase beyond this value, hardware ARP +@@ -683,6 +697,7 @@ struct ieee80211_fils_discovery { + * beamformee + * @eht_mu_beamformer: in AP-mode, does this BSS enable operation as an EHT MU + * beamformer ++ * @nss_ap_isolate: Used for notifying the NSS host about AP isolate feature + */ + struct ieee80211_bss_conf { + struct ieee80211_vif *vif; +@@ -776,6 +791,7 @@ struct ieee80211_bss_conf { + bool eht_su_beamformer; + bool eht_su_beamformee; + bool eht_mu_beamformer; ++ bool nss_ap_isolate; + }; + + /** +@@ -1406,7 +1422,7 @@ ieee80211_tx_info_clear_status(struct ie + * @RX_FLAG_AMPDU_EOF_BIT_KNOWN: The EOF value is known + * @RX_FLAG_RADIOTAP_HE: HE radiotap data is present + * (&struct ieee80211_radiotap_he, mac80211 will fill in +- * ++ * + * - DATA3_DATA_MCS + * - DATA3_DATA_DCM + * - DATA3_CODING +@@ -1414,7 +1430,7 @@ ieee80211_tx_info_clear_status(struct ie + * - DATA5_DATA_BW_RU_ALLOC + * - DATA6_NSTS + * - DATA3_STBC +- * ++ * + * from the RX info data, so leave those zeroed when building this data) + * @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present + * (&struct ieee80211_radiotap_he_mu) +@@ -1987,6 +2003,16 @@ static inline bool lockdep_vif_mutex_hel + lockdep_vif_mutex_held(vif)) + + /** ++ * ieee80211_vif_to_wdev_relaxed - return a wdev struct from a vif ++ * @vif: the vif to get the wdev for ++ * ++ * This function is similar to ieee80211_vif_to_wdev, but the wdev ++ * is returned even if sdata is not running. ++ * ++ */ ++struct wireless_dev *ieee80211_vif_to_wdev_relaxed(struct ieee80211_vif *vif); ++ ++/** + * enum ieee80211_key_flags - key flags + * + * These flags are used for communication about keys between the driver +@@ -2677,6 +2703,8 @@ struct ieee80211_txq { + * @IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX: Hardware/driver handles transmitting + * multicast frames on all links, mac80211 should not do that. + * ++ * @IEEE80211_HW_SUPPORTS_NSS_OFFLOAD: Hardware/driver supports NSS offload ++ * + * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays + */ + enum ieee80211_hw_flags { +@@ -2734,6 +2762,7 @@ enum ieee80211_hw_flags { + IEEE80211_HW_SUPPORTS_CONC_MON_RX_DECAP, + IEEE80211_HW_DETECTS_COLOR_COLLISION, + IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, ++ IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, + + /* keep last, obviously */ + NUM_IEEE80211_HW_FLAGS +@@ -3746,6 +3775,10 @@ struct ieee80211_prep_tx_info { + * non-MLO connections. + * The callback can sleep. + * ++ * @nss_bss_info_changed: Handler for configuration requests related to NSS BSS ++ * parameters that may vary during BSS's lifespan, and may affect low level ++ * driver. ++ * + * @prepare_multicast: Prepare for multicast filter configuration. + * This callback is optional, and its return value is passed + * to configure_filter(). This callback must be atomic. +@@ -4297,7 +4330,9 @@ struct ieee80211_ops { + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *info, + u64 changed); +- ++ void (*nss_bss_info_changed)(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ u64 changed); + int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); + void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, +@@ -4602,7 +4637,7 @@ struct ieee80211_ops { + int (*reset_tid_config)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, u8 tids); +- void (*update_vif_offload)(struct ieee80211_hw *hw, ++ int (*update_vif_offload)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif); + void (*sta_set_4addr)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta, bool enabled); +--- a/net/mac80211/debugfs.c ++++ b/net/mac80211/debugfs.c +@@ -496,6 +496,7 @@ static const char *hw_flag_names[] = { + FLAG(SUPPORTS_CONC_MON_RX_DECAP), + FLAG(DETECTS_COLOR_COLLISION), + FLAG(MLO_MCAST_MULTI_LINK_TX), ++ FLAG(SUPPORTS_NSS_OFFLOAD), + #undef FLAG + }; + +--- a/net/mac80211/util.c ++++ b/net/mac80211/util.c +@@ -868,6 +868,22 @@ struct wireless_dev *ieee80211_vif_to_wd + } + EXPORT_SYMBOL_GPL(ieee80211_vif_to_wdev); + ++struct wireless_dev *ieee80211_vif_to_wdev_relaxed(struct ieee80211_vif *vif) ++{ ++ struct ieee80211_sub_if_data *sdata; ++ ++ if (!vif) ++ return NULL; ++ ++ sdata = vif_to_sdata(vif); ++ ++ if (sdata) ++ return &sdata->wdev; ++ ++ return NULL; ++} ++EXPORT_SYMBOL(ieee80211_vif_to_wdev_relaxed); ++ + /* + * Nothing should have been stuffed into the workqueue during + * the suspend->resume cycle. Since we can't check each caller +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -291,6 +291,17 @@ void ieee80211_link_info_change_notify(s + drv_link_info_changed(local, sdata, link->conf, link->link_id, changed); + } + ++void ieee80211_nss_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, ++ u64 changed) ++{ ++ struct ieee80211_local *local = sdata->local; ++ ++ if (!changed || sdata->vif.type == NL80211_IFTYPE_AP_VLAN) ++ return; ++ ++ drv_nss_bss_info_changed(local, sdata, &sdata->vif.bss_conf, changed); ++} ++ + u64 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) + { + sdata->vif.bss_conf.use_cts_prot = false; +@@ -694,12 +705,6 @@ struct ieee80211_hw *ieee80211_alloc_hw_ + NL80211_FEATURE_FULL_AP_CLIENT_STATE; + wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA); + wiphy_ext_feature_set(wiphy, +- NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211); +- wiphy_ext_feature_set(wiphy, +- NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH); +- wiphy_ext_feature_set(wiphy, +- NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS); +- wiphy_ext_feature_set(wiphy, + NL80211_EXT_FEATURE_SCAN_FREQ_KHZ); + wiphy_ext_feature_set(wiphy, + NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE); +@@ -1007,6 +1012,18 @@ int ieee80211_register_hw(struct ieee802 + return -EINVAL; + } + ++ /* Control port over nl80211 is disabled for nss offload as ++ * sending per packet tx status is not supported and only ++ * rx over netdev from driver is done currently */ ++ if (!ieee80211_hw_check(hw, SUPPORTS_NSS_OFFLOAD)) { ++ wiphy_ext_feature_set(hw->wiphy, ++ NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211); ++ wiphy_ext_feature_set(hw->wiphy, ++ NL80211_EXT_FEATURE_CONTROL_PORT_NO_PREAUTH); ++ wiphy_ext_feature_set(hw->wiphy, ++ NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211_TX_STATUS); ++ } ++ + #ifdef CONFIG_PM + if (hw->wiphy->wowlan && (!local->ops->suspend || !local->ops->resume)) + return -EINVAL; +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -2379,6 +2379,9 @@ sta_get_last_rx_stats(struct sta_info *s + struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; + int cpu; + ++ if (ieee80211_hw_check(&sta->local->hw, SUPPORTS_NSS_OFFLOAD)) ++ return stats; ++ + if (!sta->deflink.pcpu_rx_stats) + return stats; + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -1028,11 +1028,23 @@ ieee80211_tx_h_stats(struct ieee80211_tx + { + struct sk_buff *skb; + int ac = -1; ++ struct ieee80211_hdr *hdr; ++ bool nss_offload; + + if (!tx->sta) + return TX_CONTINUE; + ++ nss_offload = ieee80211_hw_check(&tx->local->hw, SUPPORTS_NSS_OFFLOAD); ++ + skb_queue_walk(&tx->skbs, skb) { ++ /* Do not increment stats for data packets if NSS offload is enabled. ++ * As we use the stats from NSS, this will be a duplication ++ */ ++ if (nss_offload) { ++ hdr = (void *) skb->data; ++ if (ieee80211_is_data(hdr->frame_control)) ++ continue; ++ } + ac = skb_get_queue_mapping(skb); + tx->sta->deflink.tx_stats.bytes[ac] += skb->len; + } +@@ -2857,7 +2869,9 @@ static struct sk_buff *ieee80211_build_h + + if (unlikely(!multicast && ((skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || +- ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS))) ++ ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && ++ !(ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && ++ ieee80211_is_data(fc) && !ieee80211_is_qos_nullfunc(fc)))) + info_id = ieee80211_store_ack_skb(local, skb, &info_flags, + cookie); + +@@ -4639,13 +4653,16 @@ static void ieee80211_8023_xmit(struct i + } + + if (unlikely(skb->sk && +- skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) ++ skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS && ++ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) + info->ack_frame_id = ieee80211_store_ack_skb(local, skb, + &info->flags, NULL); + + dev_sw_netstats_tx_add(dev, skbs, len); +- sta->deflink.tx_stats.packets[queue] += skbs; +- sta->deflink.tx_stats.bytes[queue] += len; ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { ++ sta->deflink.tx_stats.packets[queue] += skbs; ++ sta->deflink.tx_stats.bytes[queue] += len; ++ } + + ieee80211_tpt_led_trig_tx(local, len); + +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -2447,6 +2447,9 @@ bool cfg80211_does_bw_fit_range(const st + + int cfg80211_sinfo_alloc_tid_stats(struct station_info *sinfo, gfp_t gfp) + { ++ if(sinfo->pertid) ++ return 0; ++ + sinfo->pertid = kcalloc(IEEE80211_NUM_TIDS + 1, + sizeof(*(sinfo->pertid)), + gfp); +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -2675,7 +2675,7 @@ static int ieee80211_change_bss(struct w + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_link_data *link; + struct ieee80211_supported_band *sband; +- u64 changed = 0; ++ u32 changed = 0, nss_changed = 0; + + link = ieee80211_link_or_deflink(sdata, params->link_id, true); + if (IS_ERR(link)) +@@ -2725,6 +2725,8 @@ static int ieee80211_change_bss(struct w + sdata->flags |= IEEE80211_SDATA_DONT_BRIDGE_PACKETS; + else + sdata->flags &= ~IEEE80211_SDATA_DONT_BRIDGE_PACKETS; ++ sdata->vif.bss_conf.nss_ap_isolate = params->ap_isolate; ++ nss_changed |= BSS_CHANGED_NSS_AP_ISOLATE; + ieee80211_check_fast_rx_iface(sdata); + } + +@@ -2753,6 +2755,8 @@ static int ieee80211_change_bss(struct w + + ieee80211_link_info_change_notify(sdata, link, changed); + ++ ieee80211_nss_bss_info_change_notify(sdata, nss_changed); ++ + return 0; + } + +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -172,6 +172,23 @@ void drv_link_info_changed(struct ieee80 + struct ieee80211_bss_conf *info, + int link_id, u64 changed); + ++static inline void drv_nss_bss_info_changed(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ struct ieee80211_bss_conf *info, ++ u32 changed) ++{ ++ might_sleep(); ++ ++ if (!check_sdata_in_driver(sdata)) ++ return; ++ ++ trace_drv_nss_bss_info_changed(local, sdata, info, changed); ++ if (local->ops->nss_bss_info_changed) { ++ local->ops->nss_bss_info_changed(&local->hw, &sdata->vif, changed); ++ } ++ trace_drv_nss_return_void(local); ++} ++ + static inline u64 drv_prepare_multicast(struct ieee80211_local *local, + struct netdev_hw_addr_list *mc_list) + { +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -1845,6 +1845,8 @@ void ieee80211_vif_cfg_change_notify(str + void ieee80211_link_info_change_notify(struct ieee80211_sub_if_data *sdata, + struct ieee80211_link_data *link, + u64 changed); ++void ieee80211_nss_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, ++ u64 changed); + void ieee80211_configure_filter(struct ieee80211_local *local); + u64 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata); + +--- a/net/mac80211/trace.h ++++ b/net/mac80211/trace.h +@@ -389,6 +389,38 @@ TRACE_EVENT(drv_config, + LOCAL_PR_ARG, __entry->changed, CHANDEF_PR_ARG + ) + ); ++TRACE_EVENT(drv_nss_bss_info_changed, ++ TP_PROTO(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ struct ieee80211_bss_conf *info, ++ u32 changed), ++ ++ TP_ARGS(local, sdata, info, changed), ++ ++ TP_STRUCT__entry( ++ LOCAL_ENTRY ++ VIF_ENTRY ++ __field(u32, changed) ++ __field(bool, nss_ap_isolate); ++ ), ++ ++ TP_fast_assign( ++ LOCAL_ASSIGN; ++ VIF_ASSIGN; ++ __entry->changed = changed; ++ __entry->nss_ap_isolate = info->nss_ap_isolate; ++ ), ++ ++ TP_printk( ++ LOCAL_PR_FMT VIF_PR_FMT " changed:%#x", ++ LOCAL_PR_ARG, VIF_PR_ARG, __entry->changed ++ ) ++); ++ ++DEFINE_EVENT(local_only_evt, drv_nss_return_void, ++ TP_PROTO(struct ieee80211_local *local), ++ TP_ARGS(local) ++); + + TRACE_EVENT(drv_vif_cfg_changed, + TP_PROTO(struct ieee80211_local *local, +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -969,7 +969,8 @@ static bool ieee80211_set_sdata_offload_ + local->hw.wiphy->frag_threshold != (u32)-1) + flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED; + +- if (local->monitors) ++ if (local->monitors && ++ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) + flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED; + } else { + flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED; +--- a/net/mac80211/Kconfig ++++ b/net/mac80211/Kconfig +@@ -104,6 +104,15 @@ menuconfig MAC80211_DEBUG_MENU + help + This option collects various mac80211 debug settings. + ++config MAC80211_NSS_SUPPORT ++ bool "QTI mac80211 nss support" ++ depends on ATH11K_NSS_SUPPORT ++ default n ++ ---help--- ++ Enables NSS offload support for ATH11K driver ++ ++ If unsure, say Y to enable NSS offload support. ++ + config MAC80211_NOINLINE + bool "Do not inline TX/RX handlers" + depends on MAC80211_DEBUG_MENU +--- a/local-symbols ++++ b/local-symbols +@@ -65,6 +65,7 @@ MAC80211_MESH_PS_DEBUG= + MAC80211_TDLS_DEBUG= + MAC80211_DEBUG_COUNTERS= + MAC80211_STA_HASH_MAX_SIZE= ++MAC80211_NSS_SUPPORT= + QCOM_AOSS_QMP= + QCOM_COMMAND_DB= + QCOM_CPR= +@@ -174,6 +175,7 @@ ATH11K_DEBUGFS= + ATH11K_TRACING= + ATH11K_SPECTRAL= + ATH11K_THERMAL= ++ATH11K_MEM_PROFILE_512M= + ATH12K= + ATH12K_DEBUG= + ATH12K_TRACING= diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch b/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch new file mode 100644 index 00000000000000..beee16098f14c3 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch @@ -0,0 +1,3020 @@ +From 0fa55ca418c8afd6da242407a184c23548c553dc Mon Sep 17 00:00:00 2001 +From: Sriram R +Date: Fri, 5 Jun 2020 12:21:15 +0530 +Subject: [PATCH 2/3] ath11k: Add nss driver interface + +This patch adds interface support for accessing nss driver with +support for initialization, teardown, vap up/down, peer create/delete, +tx/rx. NSS Stats addition is not part of this version. + +Signed-off-by: Sriram R +--- + drivers/net/wireless/ath/ath11k/Kconfig | 9 + + drivers/net/wireless/ath/ath11k/Makefile | 1 + + drivers/net/wireless/ath/ath11k/nss.c | 1762 ++++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/nss.h | 217 ++++ + 4 files changed, 1989 insertions(+) + create mode 100644 drivers/net/wireless/ath/ath11k/nss.c + create mode 100644 drivers/net/wireless/ath/ath11k/nss.h + +--- a/drivers/net/wireless/ath/ath11k/Kconfig ++++ b/drivers/net/wireless/ath/ath11k/Kconfig +@@ -13,6 +13,16 @@ config ATH11K + + If you choose to build a module, it'll be called ath11k. + ++config ATH11K_NSS_SUPPORT ++ bool "QCA ath11k nss support" ++ depends on ATH11K ++ default n ++ select MAC80211_NSS_SUPPORT ++ ---help--- ++ Enables NSS offload support for ATH11K driver ++ ++ If unsure, say Y to enable NSS offload support. ++ + config ATH11K_AHB + tristate "Atheros ath11k AHB support" + depends on m +--- a/drivers/net/wireless/ath/ath11k/Makefile ++++ b/drivers/net/wireless/ath/ath11k/Makefile +@@ -25,6 +25,7 @@ ath11k-$(CPTCFG_ATH11K_TRACING) += trace + ath11k-$(CPTCFG_ATH11K_THERMAL) += thermal.o + ath11k-$(CPTCFG_ATH11K_SPECTRAL) += spectral.o + ath11k-$(CONFIG_PM) += wow.o ++ath11k-$(CPTCFG_ATH11K_NSS_SUPPORT) += nss.o + + obj-$(CPTCFG_ATH11K_AHB) += ath11k_ahb.o + ath11k_ahb-y += ahb.o +--- /dev/null ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -0,0 +1,2392 @@ ++// SPDX-License-Identifier: BSD-3-Clause-Clear ++/* ++ * Copyright (c) 2020 The Linux Foundation. All rights reserved. ++ */ ++ ++#include "debug.h" ++#include "mac.h" ++#include "nss.h" ++#include "core.h" ++#include "peer.h" ++#include "hif.h" ++#include "wmi.h" ++#include "../../../../../net/mac80211/sta_info.h" ++ ++/*-----------------------------ATH11K-NSS Helpers--------------------------*/ ++ ++static enum ath11k_nss_opmode ++ath11k_nss_get_vdev_opmode(struct ath11k_vif *arvif) ++{ ++ switch (arvif->vdev_type) { ++ case WMI_VDEV_TYPE_AP: ++ return ATH11K_NSS_OPMODE_AP; ++ case WMI_VDEV_TYPE_STA: ++ return ATH11K_NSS_OPMODE_STA; ++ default: ++ ath11k_warn(arvif->ar->ab, "unsupported nss vdev type %d\n", ++ arvif->vdev_type); ++ } ++ ++ return ATH11K_NSS_OPMODE_UNKNOWN; ++} ++ ++static void ath11k_nss_wifili_stats_sync(struct ath11k_base *ab, ++ struct nss_wifili_stats_sync_msg *wlsoc_stats) ++{ ++ struct nss_wifili_device_stats *devstats = &wlsoc_stats->stats; ++ struct ath11k_soc_dp_stats *soc_stats = &ab->soc_stats; ++ int i; ++ ++ spin_lock_bh(&ab->base_lock); ++ ++ soc_stats->err_ring_pkts += devstats->rxwbm_stats.err_src_rxdma; ++ soc_stats->invalid_rbm += devstats->rxwbm_stats.invalid_buf_mgr; ++ ++ for (i = 0; i < HAL_REO_ENTR_RING_RXDMA_ECODE_MAX; i++) ++ soc_stats->rxdma_error[i] += devstats->rxwbm_stats.err_dma_codes[i]; ++ ++ for (i = 0; i < HAL_REO_DEST_RING_ERROR_CODE_MAX; i++) ++ soc_stats->reo_error[i] += devstats->rxwbm_stats.err_reo_codes[i]; ++ ++ for (i = 0; i < DP_REO_DST_RING_MAX; i++) ++ soc_stats->hal_reo_error[i] += devstats->rxreo_stats[i].ring_error; ++ ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) ++ soc_stats->tx_err.desc_na[i] += devstats->tcl_stats[i].tcl_ring_full; ++ ++ ++ for (i = 0; i < NSS_WIFILI_MAX_TCL_DATA_RINGS_MSG; i++) ++ atomic_add(devstats->txcomp_stats[i].invalid_bufsrc ++ + devstats->txcomp_stats[i].invalid_cookie ++ + devstats->tx_sw_pool_stats[i].desc_alloc_fail ++ + devstats->tx_ext_sw_pool_stats[i].desc_alloc_fail, ++ &soc_stats->tx_err.misc_fail); ++ ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) ++ atomic_add(devstats->tx_data_stats[i].tx_send_fail_cnt, ++ &soc_stats->tx_err.misc_fail); ++ ++ spin_unlock_bh(&ab->base_lock); ++} ++ ++static void ath11k_nss_get_peer_stats(struct ath11k_base *ab, struct nss_wifili_peer_stats *stats) ++{ ++ struct ath11k_peer *peer; ++ struct nss_wifili_peer_ctrl_stats *pstats = NULL; ++ int i, j; ++ u64 tx_packets, tx_bytes, tx_dropped = 0; ++ u64 rx_packets, rx_bytes, rx_dropped; ++ ++ if (!ab->nss.stats_enabled) ++ return; ++ ++ for (i = 0; i < stats->npeers; i++) { ++ pstats = &stats->wpcs[i]; ++ ++ rcu_read_lock(); ++ spin_lock_bh(&ab->base_lock); ++ ++ peer = ath11k_peer_find_by_id(ab, pstats->peer_id); ++ if (!peer || !peer->sta) { ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss wifili: unable to find peer %d\n", pstats->peer_id); ++ spin_unlock_bh(&ab->base_lock); ++ rcu_read_unlock(); ++ continue; ++ } ++ ++ if (!peer->nss.nss_stats) { ++ spin_unlock_bh(&ab->base_lock); ++ rcu_read_unlock(); ++ return; ++ } ++ ++ if (pstats->tx.tx_success_cnt) ++ peer->nss.nss_stats->last_ack = jiffies; ++ ++ if (pstats->rx.rx_recvd) { ++ peer->nss.nss_stats->last_rx = jiffies; ++ } ++ ++ tx_packets = pstats->tx.tx_mcast_cnt + ++ pstats->tx.tx_ucast_cnt + ++ pstats->tx.tx_bcast_cnt; ++ peer->nss.nss_stats->tx_packets += tx_packets; ++ tx_bytes = pstats->tx.tx_mcast_bytes + ++ pstats->tx.tx_ucast_bytes + ++ pstats->tx.tx_bcast_bytes; ++ peer->nss.nss_stats->tx_bytes += tx_bytes; ++ peer->nss.nss_stats->tx_retries += pstats->tx.retries; ++ ++ for (j = 0; j < NSS_WIFILI_TQM_RR_MAX; j++) ++ tx_dropped += pstats->tx.dropped.drop_stats[j]; ++ ++ peer->nss.nss_stats->tx_failed += tx_dropped; ++ ++ ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->vif, tx_bytes, tx_packets); ++ ++ rx_packets = pstats->rx.rx_recvd; ++ peer->nss.nss_stats->rx_packets += rx_packets; ++ rx_bytes = pstats->rx.rx_recvd_bytes; ++ peer->nss.nss_stats->rx_bytes += rx_bytes; ++ rx_dropped = pstats->rx.err.mic_err + ++ pstats->rx.err.decrypt_err; ++ peer->nss.nss_stats->rx_dropped += rx_dropped; ++ ++ ATH11K_NSS_TXRX_NETDEV_STATS(rx, peer->vif, rx_bytes, rx_packets); ++ ++ spin_unlock_bh(&ab->base_lock); ++ rcu_read_unlock(); ++ } ++} ++ ++void ath11k_nss_ext_rx_stats(struct ath11k_base *ab, struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ if (ab->nss.enabled) ++ tlv_filter->rx_filter |= HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS; ++} ++ ++static u32 ath11k_nss_cipher_type(struct ath11k_base *ab, u32 cipher) ++{ ++ switch (cipher) { ++ case WLAN_CIPHER_SUITE_CCMP: ++ return PEER_SEC_TYPE_AES_CCMP; ++ case WLAN_CIPHER_SUITE_TKIP: ++ return PEER_SEC_TYPE_TKIP; ++ case WLAN_CIPHER_SUITE_CCMP_256: ++ return PEER_SEC_TYPE_AES_CCMP_256; ++ case WLAN_CIPHER_SUITE_GCMP: ++ return PEER_SEC_TYPE_AES_GCMP; ++ case WLAN_CIPHER_SUITE_GCMP_256: ++ return PEER_SEC_TYPE_AES_GCMP_256; ++ default: ++ ath11k_warn(ab, "unknown cipher type %d\n", cipher); ++ return PEER_SEC_TYPE_NONE; ++ } ++} ++ ++static void ath11k_nss_tx_encap_nwifi(struct sk_buff *skb) ++{ ++ struct ieee80211_hdr *hdr = (void *)skb->data; ++ u8 *qos_ctl; ++ ++ if (!ieee80211_is_data_qos(hdr->frame_control)) ++ return; ++ ++ qos_ctl = ieee80211_get_qos_ctl(hdr); ++ memmove(skb->data + IEEE80211_QOS_CTL_LEN, ++ skb->data, (void *)qos_ctl - (void *)skb->data); ++ skb_pull(skb, IEEE80211_QOS_CTL_LEN); ++ ++ hdr = (void *)skb->data; ++ hdr->frame_control &= ~__cpu_to_le16(IEEE80211_STYPE_QOS_DATA); ++} ++ ++static void ath11k_nss_tx_encap_raw(struct sk_buff *skb) ++{ ++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); ++ struct ieee80211_hdr *hdr = (void *)skb->data; ++ u32 cipher; ++ ++ if (!ieee80211_has_protected(hdr->frame_control) || !info->control.hw_key) ++ return; ++ ++ /* Include length for MIC */ ++ skb_put(skb, IEEE80211_CCMP_MIC_LEN); ++ ++ /* Include length for ICV if TKIP is used */ ++ cipher = info->control.hw_key->cipher; ++ if (cipher == WLAN_CIPHER_SUITE_TKIP) ++ skb_put(skb, IEEE80211_TKIP_ICV_LEN); ++} ++ ++static void ath11k_nss_peer_mem_free(struct ath11k_base *ab, u32 peer_id) ++{ ++ struct ath11k_peer *peer; ++ ++ spin_lock_bh(&ab->base_lock); ++ ++ peer = ath11k_peer_find_by_id(ab, peer_id); ++ if (!peer) { ++ spin_unlock_bh(&ab->base_lock); ++ ath11k_warn(ab, "ath11k_nss: unable to free peer mem, peer_id:%d\n", ++ peer_id); ++ return; ++ } ++ ++ dma_unmap_single(ab->dev, peer->nss.paddr, ++ WIFILI_NSS_PEER_BYTE_SIZE, DMA_FROM_DEVICE); ++ ++ kfree(peer->nss.vaddr); ++ if (peer->nss.nss_stats) { ++ kfree(peer->nss.nss_stats); ++ peer->nss.nss_stats = NULL; ++ } ++ ++ complete(&peer->nss.complete); ++ spin_unlock_bh(&ab->base_lock); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss peer %d mem freed\n", peer_id); ++} ++ ++/*-----------------------------Events/Callbacks------------------------------*/ ++ ++void ath11k_nss_wifili_event_receive(struct ath11k_base *ab, struct nss_wifili_msg *msg) ++{ ++ u32 msg_type = msg->cm.type; ++ enum nss_cmn_response response = msg->cm.response; ++ u32 error = msg->cm.error; ++ u32 peer_id; ++ struct nss_wifili_peer_stats *peer_stats; ++ ++ if (!ab) ++ return; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss wifili event received %d response %d error %d\n", ++ msg_type, response, error); ++ ++ switch (msg_type) { ++ case NSS_WIFILI_INIT_MSG: ++ case NSS_WIFILI_PDEV_INIT_MSG: ++ case NSS_WIFILI_START_MSG: ++ case NSS_WIFILI_SOC_RESET_MSG: ++ case NSS_WIFILI_STOP_MSG: ++ case NSS_WIFILI_PDEV_DEINIT_MSG: ++ ab->nss.response = response; ++ complete(&ab->nss.complete); ++ break; ++ ++ case NSS_WIFILI_PEER_CREATE_MSG: ++ if (response != NSS_CMN_RESPONSE_EMSG) ++ break; ++ ++ peer_id = (&msg->msg.peermsg)->peer_id; ++ ++ /* free peer memory allocated during peer create due to failure */ ++ ath11k_nss_peer_mem_free(ab, peer_id); ++ break; ++ case NSS_WIFILI_PEER_DELETE_MSG: ++ peer_id = (&msg->msg.peermsg)->peer_id; ++ ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab, "ath11k_nss: peer delete failed%d\n", ++ peer_id); ++ ++ /* free peer memory allocated during peer create irrespective of ++ * delete status ++ */ ++ ath11k_nss_peer_mem_free(ab, peer_id); ++ break; ++ case NSS_WIFILI_PEER_SECURITY_TYPE_MSG: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab, "peer securty config failed\n"); ++ ++ break; ++ case NSS_WIFILI_PEER_UPDATE_AUTH_FLAG: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab, "peer authorize config failed\n"); ++ ++ break; ++ case NSS_WIFILI_STATS_MSG: ++ if (response == NSS_CMN_RESPONSE_EMSG) { ++ ath11k_warn(ab, "soc_dp_stats failed to get updated\n"); ++ break; ++ } ++ ath11k_nss_wifili_stats_sync(ab, &msg->msg.wlsoc_stats); ++ break; ++ case NSS_WIFILI_PEER_STATS_MSG: ++ peer_stats = &msg->msg.peer_stats.stats; ++ if (response == NSS_CMN_RESPONSE_EMSG) { ++ ath11k_warn(ab, "peer stats msg failed with error = %u\n", error); ++ break; ++ } ++ ath11k_nss_get_peer_stats(ab, peer_stats); ++ break; ++ case NSS_WIFILI_TID_REOQ_SETUP_MSG: ++ /* TODO setup tidq */ ++ break; ++ default: ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); ++ break; ++ } ++} ++ ++void ath11k_nss_process_mic_error(struct ath11k_base *ab, struct sk_buff *skb) ++{ ++ struct ath11k_vif *arvif; ++ struct ath11k_peer *peer = NULL; ++ struct hal_rx_desc *desc = (struct hal_rx_desc *)skb->data; ++ struct wireless_dev *wdev; ++ u16 peer_id; ++ u8 peer_addr[ETH_ALEN]; ++ u8 ucast_keyidx, mcast_keyidx; ++ bool is_mcbc; ++ ++ if (!ath11k_dp_rx_h_msdu_end_first_msdu(ab, desc)) ++ goto fail; ++ ++ is_mcbc = ath11k_dp_rx_h_attn_is_mcbc(ab, desc); ++ peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ab, desc); ++ ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_id(ab, peer_id); ++ if (!peer) { ++ ath11k_info(ab, "ath11k_nss:peer not found"); ++ spin_unlock_bh(&ab->base_lock); ++ goto fail; ++ } ++ ++ if (!peer->vif) { ++ ath11k_warn(ab, "ath11k_nss:vif not found"); ++ spin_unlock_bh(&ab->base_lock); ++ goto fail; ++ } ++ ++ ether_addr_copy(peer_addr, peer->addr); ++ mcast_keyidx = peer->mcast_keyidx; ++ ucast_keyidx = peer->ucast_keyidx; ++ arvif = ath11k_vif_to_arvif(peer->vif); ++ spin_unlock_bh(&ab->base_lock); ++ ++ if (!arvif->is_started) { ++ ath11k_warn(ab, "ath11k_nss:arvif not started"); ++ goto fail; ++ } ++ ++ wdev = ieee80211_vif_to_wdev_relaxed(arvif->vif); ++ if (!wdev) { ++ ath11k_warn(ab, "ath11k_nss: wdev is null\n"); ++ goto fail; ++ } ++ ++ if (!wdev->netdev) { ++ ath11k_warn(ab, "ath11k_nss: netdev is null\n"); ++ goto fail; ++ } ++ ++ cfg80211_michael_mic_failure(wdev->netdev, peer_addr, ++ is_mcbc ? NL80211_KEYTYPE_GROUP : ++ NL80211_KEYTYPE_PAIRWISE, ++ is_mcbc ? mcast_keyidx : ucast_keyidx, ++ NULL, GFP_ATOMIC); ++ dev_kfree_skb_any(skb); ++ return; ++ ++fail: ++ dev_kfree_skb_any(skb); ++ ath11k_warn(ab, "ath11k_nss: Failed to handle mic error\n"); ++ return; ++} ++ ++static void ++ath11k_nss_wifili_ext_callback_fn(struct ath11k_base *ab, struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ struct nss_wifili_soc_per_packet_metadata *wepm; ++ ++ wepm = (struct nss_wifili_soc_per_packet_metadata *)(skb->head + ++ NSS_WIFILI_SOC_PER_PACKET_METADATA_OFFSET); ++ ++ switch (wepm->pkt_type) { ++ case NSS_WIFILI_SOC_EXT_DATA_PKT_MIC_ERROR: ++ ath11k_nss_process_mic_error(ab, skb); ++ break; ++ default: ++ kfree(skb); ++ break; ++ } ++} ++ ++void ath11k_nss_vdev_cfg_cb(void *app_data, struct nss_cmn_msg *msg) ++{ ++ struct ath11k_vif *arvif = (struct ath11k_vif *)app_data; ++ ++ if (!arvif) ++ return; ++ ++ ath11k_dbg(arvif->ar->ab, ATH11K_DBG_NSS, "vdev cfg msg callback received msg:%d rsp:%d\n", ++ msg->type, msg->response); ++ ++ complete(&arvif->nss.complete); ++} ++ ++static void ath11k_nss_vdev_event_receive(void *dev, struct nss_cmn_msg *vdev_msg) ++{ ++ /*TODO*/ ++} ++ ++static void ++ath11k_nss_vdev_special_data_receive(struct net_device *dev, struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ /* TODO */ ++} ++ ++/* TODO: move to mac80211 after cleanups/refactoring required after feature completion */ ++static int ath11k_nss_deliver_rx(struct ieee80211_vif *vif, struct sk_buff *skb, ++ bool eth, int data_offs, struct napi_struct *napi) ++{ ++ struct sk_buff_head subframe_list; ++ struct ieee80211_hdr *hdr; ++ struct sk_buff *subframe; ++ struct net_device *dev; ++ int hdr_len; ++ u8 *qc; ++ ++ dev = skb->dev; ++ ++ if (eth) ++ goto deliver_msdu; ++ ++ hdr = (struct ieee80211_hdr *)skb->data; ++ hdr_len = ieee80211_hdrlen(hdr->frame_control); ++ ++ if (ieee80211_is_data_qos(hdr->frame_control)) { ++ qc = ieee80211_get_qos_ctl(hdr); ++ if (*qc & IEEE80211_QOS_CTL_A_MSDU_PRESENT) ++ goto deliver_amsdu; ++ } ++ ++ if (ieee80211_data_to_8023_exthdr(skb, NULL, vif->addr, vif->type, ++ data_offs - hdr_len, false)) { ++ dev_kfree_skb_any(skb); ++ return -EINVAL; ++ } ++ ++deliver_msdu: ++ skb->protocol = eth_type_trans(skb, dev); ++ napi_gro_receive(napi, skb); ++ return 0; ++ ++deliver_amsdu: ++ /* Move to the start of the first subframe */ ++ skb_pull(skb, data_offs); ++ ++ __skb_queue_head_init(&subframe_list); ++ ++ /* create list containing all the subframes */ ++ ieee80211_amsdu_to_8023s(skb, &subframe_list, NULL, ++ vif->type, 0, NULL, NULL); ++ ++ /* This shouldn't happen, indicating error during defragmentation */ ++ if (skb_queue_empty(&subframe_list)) ++ return -EINVAL; ++ ++ while (!skb_queue_empty(&subframe_list)) { ++ subframe = __skb_dequeue(&subframe_list); ++ subframe->protocol = eth_type_trans(subframe, dev); ++ napi_gro_receive(napi, subframe); ++ } ++ ++ return 0; ++} ++ ++static int ath11k_nss_undecap_raw(struct ath11k_vif *arvif, struct sk_buff *skb, ++ int *data_offset) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct ath11k *ar = arvif->ar; ++ enum hal_encrypt_type enctype; ++ struct ath11k_peer *peer = NULL; ++ struct ieee80211_hdr *hdr; ++ int hdr_len; ++ ++ hdr = (struct ieee80211_hdr *)skb->data; ++ hdr_len = ieee80211_hdrlen(hdr->frame_control); ++ ++ *data_offset = hdr_len; ++ ++ /* FCS is included in the raw mode skb, we can trim it, fcs error ++ * packets are not expected to be received in this path ++ */ ++ skb_trim(skb, skb->len - FCS_LEN); ++ ++ spin_lock_bh(&ab->base_lock); ++ ++ peer = ath11k_peer_find_by_addr(ab, hdr->addr2); ++ if (!peer) { ++ ath11k_warn(ab, "peer not found for raw/nwifi undecap, drop this packet\n"); ++ spin_unlock_bh(&ab->base_lock); ++ return -EINVAL; ++ } ++ enctype = peer->sec_type; ++ ++ spin_unlock_bh(&ab->base_lock); ++ ++ *data_offset += ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ /* Strip ICV, MIC, MMIC */ ++ skb_trim(skb, skb->len - ++ ath11k_dp_rx_crypto_mic_len(ar, enctype)); ++ ++ skb_trim(skb, skb->len - ++ ath11k_dp_rx_crypto_icv_len(ar, enctype)); ++ ++ if (enctype == HAL_ENCRYPT_TYPE_TKIP_MIC) ++ skb_trim(skb, skb->len - IEEE80211_CCMP_MIC_LEN); ++ ++ return 0; ++} ++ ++static int ath11k_nss_undecap_nwifi(struct ath11k_vif *arvif, struct sk_buff *skb, ++ int *data_offset) ++{ ++ struct ieee80211_hdr *hdr; ++ int hdr_len; ++ ++ hdr = (struct ieee80211_hdr *)skb->data; ++ hdr_len = ieee80211_hdrlen(hdr->frame_control); ++ ++ *data_offset = hdr_len; ++ ++ /* We dont receive the IV from nss host on slow path ++ * hence we can return only the header length as offset. ++ **/ ++ return 0; ++} ++ ++static void ++ath11k_nss_vdev_data_receive(struct net_device *dev, struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ enum ath11k_hw_txrx_mode decap_type; ++ struct wireless_dev *wdev; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k_base *ab; ++ bool eth_decap = false; ++ int data_offs = 0; ++ int ret; ++ ++ if (!dev) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ wdev = dev->ieee80211_ptr; ++ if (!wdev) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ab = arvif->ar->ab; ++ ++ skb->dev = dev; ++ ++ /* log the original skb received from nss */ ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss: ", ++ skb->data, skb->len); ++ ++ decap_type = arvif->nss.decap; ++ ++ switch (decap_type) { ++ case ATH11K_HW_TXRX_RAW: ++ ret = ath11k_nss_undecap_raw(arvif, skb, &data_offs); ++ break; ++ case ATH11K_HW_TXRX_NATIVE_WIFI: ++ ret = ath11k_nss_undecap_nwifi(arvif, skb, &data_offs); ++ break; ++ case ATH11K_HW_TXRX_ETHERNET: ++ /* no changes required for ethernet decap */ ++ ret = 0; ++ eth_decap = true; ++ break; ++ default: ++ ret = -EINVAL; ++ break; ++ } ++ ++ if (ret) { ++ ath11k_warn(ab, "error in nss rx undecap, type %d err %d\n", decap_type, ++ ret); ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++} ++ ++int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb) ++{ ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int encap_type = ath11k_dp_tx_get_encap_type(arvif, skb); ++ struct ath11k_soc_dp_stats *soc_stats = &ar->ab->soc_stats; ++ ++ if (!arvif->ar->ab->nss.debug_mode && encap_type != arvif->nss.encap) { ++ ath11k_warn(ar->ab, "encap mismatch in nss tx skb encap type %d" \ ++ " vif encap type %d\n", encap_type, arvif->nss.encap); ++ goto drop; ++ } ++ ++ if (encap_type == HAL_TCL_ENCAP_TYPE_ETHERNET) ++ goto send; ++ ++ if (encap_type == HAL_TCL_ENCAP_TYPE_RAW) ++ ath11k_nss_tx_encap_raw(skb); ++ else ++ ath11k_nss_tx_encap_nwifi(skb); ++ ++send: ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, "", "nss tx msdu: ", ++ skb->data, skb->len); ++ ++ status = nss_wifi_vdev_tx_buf(arvif->ar->nss.ctx, skb, arvif->nss.if_num); ++ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_dbg(ar->ab, (ATH11K_DBG_NSS | ATH11K_DBG_DP_TX), ++ "nss tx failure: %d\n", status); ++ atomic_inc(&soc_stats->tx_err.nss_tx_fail); ++ } ++ ++ return status; ++drop: ++ atomic_inc(&soc_stats->tx_err.misc_fail); ++ WARN_ON_ONCE(1); ++ return -EINVAL; ++} ++ ++int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, int cmd, int val) ++{ ++ struct nss_wifi_vdev_msg *vdev_msg = NULL; ++ struct nss_wifi_vdev_cmd_msg *vdev_cmd; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ /* Monitor interface is not offloaded to nss */ ++ if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ++ return 0; ++ ++ vdev_msg = kzalloc(sizeof(*vdev_msg), GFP_ATOMIC); ++ if (!vdev_msg) ++ return -ENOMEM; ++ ++ /* TODO: Convert to function for conversion in case of many ++ * such commands ++ */ ++ if (cmd == NSS_WIFI_VDEV_SECURITY_TYPE_CMD) ++ val = ath11k_nss_cipher_type(ar->ab, val); ++ ++ if (cmd == NSS_WIFI_VDEV_ENCAP_TYPE_CMD) ++ arvif->nss.encap = val; ++ else if (cmd == NSS_WIFI_VDEV_DECAP_TYPE_CMD) ++ arvif->nss.decap = val; ++ ++ vdev_cmd = &vdev_msg->msg.vdev_cmd; ++ vdev_cmd->cmd = cmd; ++ vdev_cmd->value = val; ++ ++ nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_VDEV_INTERFACE_CMD_MSG, ++ sizeof(struct nss_wifi_vdev_cmd_msg), ++ NULL, NULL); ++ ++ status = nss_wifi_vdev_tx_msg(ar->nss.ctx, vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss vdev set cmd failure cmd:%d val:%d", ++ cmd, val); ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev set cmd success cmd:%d val:%d\n", ++ cmd, val); ++free: ++ kfree(vdev_msg); ++ return status; ++} ++ ++static int ath11k_nss_vdev_configure(struct ath11k_vif *arvif) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct nss_wifi_vdev_msg *vdev_msg; ++ struct nss_wifi_vdev_config_msg *vdev_cfg; ++ nss_tx_status_t status; ++ int ret; ++ ++ vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); ++ if (!vdev_msg) ++ return -ENOMEM; ++ ++ vdev_cfg = &vdev_msg->msg.vdev_config; ++ ++ vdev_cfg->radio_ifnum = ar->nss.if_num; ++ vdev_cfg->vdev_id = arvif->vdev_id; ++ ++ vdev_cfg->opmode = ath11k_nss_get_vdev_opmode(arvif); ++ ++ ether_addr_copy(vdev_cfg->mac_addr, arvif->vif->addr); ++ ++ reinit_completion(&arvif->nss.complete); ++ ++ nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_VDEV_INTERFACE_CONFIGURE_MSG, ++ sizeof(struct nss_wifi_vdev_config_msg), ++ (nss_wifi_vdev_msg_callback_t *)ath11k_nss_vdev_cfg_cb, ++ arvif); ++ ++ status = nss_wifi_vdev_tx_msg(ar->nss.ctx, vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "failed to configure nss vdev nss_err:%d\n", ++ status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&arvif->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ar->ab, "timeout in receiving nss vdev cfg response\n"); ++ ret = -ETIMEDOUT; ++ goto free; ++ } ++ ++ ret = 0; ++free: ++ kfree(vdev_msg); ++ ++ return ret; ++} ++ ++static void ath11k_nss_vdev_unregister(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ ++ switch (arvif->vif->type) { ++ case NL80211_IFTYPE_AP: ++ case NL80211_IFTYPE_STATION: ++ nss_unregister_wifi_vdev_if(arvif->nss.if_num); ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "unregistered nss vdev %d \n", ++ arvif->nss.if_num); ++ break; ++ default: ++ ath11k_warn(ab, "unsupported interface type %d for nss vdev unregister\n", ++ arvif->vif->type); ++ return; ++ } ++} ++ ++static int ath11k_nss_vdev_register(struct ath11k_vif *arvif, ++ struct net_device *netdev) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ nss_tx_status_t status; ++ u32 features = 0; ++ ++ switch (arvif->vif->type) { ++ case NL80211_IFTYPE_AP: ++ case NL80211_IFTYPE_STATION: ++ status = nss_register_wifi_vdev_if(ar->nss.ctx, ++ arvif->nss.if_num, ++ ath11k_nss_vdev_data_receive, ++ ath11k_nss_vdev_special_data_receive, ++ ath11k_nss_vdev_event_receive, ++ netdev, features); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "failed to register nss vdev if_num %d nss_err:%d\n", ++ arvif->nss.if_num, status); ++ return -EINVAL; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "registered nss vdev if_num %d\n", ++ arvif->nss.if_num); ++ ++ break; ++ default: ++ ath11k_warn(ab, "unsupported interface type %d for nss vdev register\n", ++ arvif->vif->type); ++ return -ENOTSUPP; ++ } ++ ++ return 0; ++} ++ ++void ath11k_nss_vdev_free(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ nss_tx_status_t status; ++ ++ switch (arvif->vif->type) { ++ case NL80211_IFTYPE_AP: ++ case NL80211_IFTYPE_STATION: ++ status = nss_dynamic_interface_dealloc_node( ++ arvif->nss.if_num, ++ NSS_DYNAMIC_INTERFACE_TYPE_VAP); ++ if (status != NSS_TX_SUCCESS) ++ ath11k_warn(ab, "failed to free nss vdev nss_err:%d\n", ++ status); ++ else ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "nss vdev interface deallocated\n"); ++ ++ return; ++ default: ++ ath11k_warn(ab, "unsupported interface type %d for nss vdev dealloc\n", ++ arvif->vif->type); ++ return; ++ } ++} ++ ++static int ath11k_nss_vdev_alloc(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ enum nss_dynamic_interface_type if_type; ++ int if_num; ++ ++ /* Initialize completion for verifying NSS message response */ ++ init_completion(&arvif->nss.complete); ++ ++ switch (arvif->vif->type) { ++ case NL80211_IFTYPE_AP: ++ case NL80211_IFTYPE_STATION: ++ if_type = NSS_DYNAMIC_INTERFACE_TYPE_VAP; ++ /* allocate interface context with NSS driver for the new vdev */ ++ if_num = nss_dynamic_interface_alloc_node(if_type); ++ if (if_num < 0) { ++ ath11k_warn(ab, "failed to allocate nss vdev\n"); ++ return -EINVAL; ++ } ++ ++ arvif->nss.if_num = if_num; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "allocated nss vdev if_num %d\n", ++ arvif->nss.if_num); ++ ++ break; ++ default: ++ ath11k_warn(ab, "unsupported interface type %d for nss vdev alloc\n", ++ arvif->vif->type); ++ return -ENOTSUPP; ++ } ++ ++ return 0; ++} ++ ++int ath11k_nss_vdev_create(struct ath11k_vif *arvif) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ struct wireless_dev *wdev; ++ int ret; ++ ++ if (!ab->nss.enabled) ++ return 0; ++ ++ /* Monitor interface is not offloaded to nss */ ++ if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ++ return 0; ++ ++ if (arvif->nss.created) ++ return 0; ++ ++ wdev = ieee80211_vif_to_wdev_relaxed(arvif->vif); ++ if (!wdev) { ++ ath11k_warn(ab, "ath11k_nss: wdev is null\n"); ++ return -EINVAL; ++ } ++ ++ if (!wdev->netdev) { ++ ath11k_warn(ab, "ath11k_nss: netdev is null\n"); ++ return -EINVAL; ++ } ++ ++ ret = ath11k_nss_vdev_alloc(arvif); ++ if (ret) ++ return ret; ++ ++ ret = ath11k_nss_vdev_register(arvif, wdev->netdev); ++ if (ret) ++ goto free_vdev; ++ ++ switch (arvif->vif->type) { ++ case NL80211_IFTYPE_AP: ++ case NL80211_IFTYPE_STATION: ++ ret = ath11k_nss_vdev_configure(arvif); ++ if (ret) ++ goto unregister_vdev; ++ ++ break; ++ default: ++ ret = -ENOTSUPP; ++ goto unregister_vdev; ++ } ++ ++ arvif->nss.created = true; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "nss vdev interface created ctx %pK, ifnum %d\n", ++ ar->nss.ctx, arvif->nss.if_num); ++ ++ return ret; ++ ++unregister_vdev: ++ ath11k_nss_vdev_unregister(arvif); ++free_vdev: ++ ath11k_nss_vdev_free(arvif); ++ ++ return ret; ++} ++ ++void ath11k_nss_vdev_delete(struct ath11k_vif *arvif) ++{ ++ if (!arvif->ar->ab->nss.enabled) ++ return; ++ ++ /* Monitor interface is not offloaded to nss */ ++ if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ++ return; ++ ++ if (!arvif->nss.created) ++ return; ++ ++ ath11k_nss_vdev_unregister(arvif); ++ ++ ath11k_nss_vdev_free(arvif); ++ ++ arvif->nss.created = false; ++} ++ ++int ath11k_nss_vdev_up(struct ath11k_vif *arvif) ++{ ++ struct nss_wifi_vdev_msg *vdev_msg = NULL; ++ struct nss_wifi_vdev_enable_msg *vdev_en; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ /* Monitor interface is not offloaded to nss */ ++ if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ++ return 0; ++ ++ vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); ++ if (!vdev_msg) ++ return -ENOMEM; ++ ++ vdev_en = &vdev_msg->msg.vdev_enable; ++ ++ ether_addr_copy(vdev_en->mac_addr, arvif->vif->addr); ++ ++ nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_VDEV_INTERFACE_UP_MSG, ++ sizeof(struct nss_wifi_vdev_enable_msg), ++ NULL, NULL); ++ ++ status = nss_wifi_vdev_tx_msg(ar->nss.ctx, vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss vdev up tx msg error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev up tx msg success\n"); ++free: ++ kfree(vdev_msg); ++ return ret; ++} ++ ++int ath11k_nss_vdev_down(struct ath11k_vif *arvif) ++{ ++ struct nss_wifi_vdev_msg *vdev_msg = NULL; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ /* Monitor interface is not offloaded to nss */ ++ if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ++ return 0; ++ ++ vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); ++ if (!vdev_msg) ++ return -ENOMEM; ++ ++ nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_VDEV_INTERFACE_DOWN_MSG, ++ sizeof(struct nss_wifi_vdev_disable_msg), ++ NULL, NULL); ++ ++ status = nss_wifi_vdev_tx_msg(ar->nss.ctx, vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss vdev down tx msg error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev down tx msg success\n"); ++free: ++ kfree(vdev_msg); ++ return ret; ++} ++ ++/*----------------------------Peer Setup/Config -----------------------------*/ ++ ++int ath11k_nss_set_peer_sec_type(struct ath11k *ar, ++ struct ath11k_peer *peer, ++ struct ieee80211_key_conf *key_conf) ++{ ++ struct nss_wifili_peer_security_type_msg *sec_msg; ++ nss_wifili_msg_callback_t msg_cb; ++ struct nss_wifili_msg *wlmsg; ++ nss_tx_status_t status; ++ u8 *mic_key; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ sec_msg = &wlmsg->msg.securitymsg; ++ sec_msg->peer_id = peer->peer_id; ++ ++ /* 0 -unicast , 1 - mcast/unicast */ ++ sec_msg->pkt_type = !(key_conf->flags & IEEE80211_KEY_FLAG_PAIRWISE); ++ ++ sec_msg->security_type = ath11k_nss_cipher_type(ar->ab, ++ key_conf->cipher); ++ ++ if (sec_msg->security_type == PEER_SEC_TYPE_TKIP) { ++ mic_key = &key_conf->key[NL80211_TKIP_DATA_OFFSET_RX_MIC_KEY]; ++ memcpy(&sec_msg->mic_key[0], mic_key, NSS_WIFILI_MIC_KEY_LEN); ++ } ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ar->ab->nss.if_num, ++ NSS_WIFILI_PEER_SECURITY_TYPE_MSG, ++ sizeof(struct nss_wifili_peer_security_type_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss peer %d security cfg fail %d\n", ++ peer->peer_id, status); ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss peer id %d security cfg complete\n", ++ peer->peer_id); ++free: ++ kfree(wlmsg); ++ return status; ++} ++ ++int ath11k_nss_set_peer_authorize(struct ath11k *ar, u16 peer_id) ++{ ++ struct nss_wifili_peer_update_auth_flag *auth_msg; ++ nss_wifili_msg_callback_t msg_cb; ++ struct nss_wifili_msg *wlmsg; ++ nss_tx_status_t status; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ auth_msg = &wlmsg->msg.peer_auth; ++ auth_msg->peer_id = peer_id; ++ auth_msg->auth_flag = 1; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ar->ab->nss.if_num, ++ NSS_WIFILI_PEER_UPDATE_AUTH_FLAG, ++ sizeof(struct nss_wifili_peer_update_auth_flag), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss peer %d auth cfg fail %d\n", ++ peer_id, status); ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss peer id %d auth cfg complete\n", ++ peer_id); ++free: ++ kfree(wlmsg); ++ return status; ++} ++ ++void ath11k_nss_update_sta_stats(struct station_info *sinfo, ++ struct ieee80211_sta *sta, ++ struct ath11k_sta *arsta) ++{ ++ struct sta_info *stainfo; ++ struct ath11k_peer *peer; ++ int tid_idx; ++ struct ath11k *ar = arsta->arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ ++ if (!ab->nss.enabled) ++ return; ++ ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_addr(arsta->arvif->ar->ab, sta->addr); ++ if (!peer) { ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "unable to find peer %pM\n", ++ sta->addr); ++ goto exit; ++ } ++ ++ if (!peer->nss.nss_stats) ++ goto exit; ++ ++ stainfo = container_of(sta, struct sta_info, sta); ++ if (peer->nss.nss_stats->last_rx && ++ time_after((unsigned long)peer->nss.nss_stats->last_rx, stainfo->deflink.rx_stats.last_rx)) ++ stainfo->deflink.rx_stats.last_rx = peer->nss.nss_stats->last_rx; ++ ++ if (peer->nss.nss_stats->last_ack && ++ time_after((unsigned long)peer->nss.nss_stats->last_ack, stainfo->deflink.status_stats.last_ack)) ++ stainfo->deflink.status_stats.last_ack = peer->nss.nss_stats->last_ack; ++ ++ stainfo->deflink.rx_stats.dropped += peer->nss.nss_stats->rx_dropped - ++ peer->nss.nss_stats->last_rxdrop; ++ peer->nss.nss_stats->last_rxdrop = peer->nss.nss_stats->rx_dropped; ++ ++ sinfo->tx_packets = 0; ++ /* Add only ac-0 count as mgmt packets uses WME_AC_BE */ ++ sinfo->tx_packets += stainfo->deflink.tx_stats.packets[WME_AC_BE]; ++ sinfo->tx_packets += peer->nss.nss_stats->tx_packets; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_PACKETS); ++ sinfo->tx_bytes = 0; ++ ++ /* Add only ac-0 count as mgmt packets uses WME_AC_BE */ ++ sinfo->tx_bytes += stainfo->deflink.tx_stats.bytes[WME_AC_BE]; ++ sinfo->tx_bytes += peer->nss.nss_stats->tx_bytes; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BYTES); ++ ++ sinfo->tx_failed = stainfo->deflink.status_stats.retry_failed + ++ peer->nss.nss_stats->tx_failed; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_FAILED); ++ ++ sinfo->tx_retries = stainfo->deflink.status_stats.retry_count + ++ peer->nss.nss_stats->tx_retries; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_RETRIES); ++ ++ sinfo->rx_packets = stainfo->deflink.rx_stats.packets + ++ peer->nss.nss_stats->rx_packets; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_PACKETS); ++ ++ sinfo->rx_bytes = stainfo->deflink.rx_stats.bytes + ++ peer->nss.nss_stats->rx_bytes; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BYTES); ++ ++ if (peer->nss.nss_stats->rxrate.legacy || peer->nss.nss_stats->rxrate.nss) { ++ if (peer->nss.nss_stats->rxrate.legacy) { ++ sinfo->rxrate.legacy = peer->nss.nss_stats->rxrate.legacy; ++ } else { ++ sinfo->rxrate.mcs = peer->nss.nss_stats->rxrate.mcs; ++ sinfo->rxrate.nss = peer->nss.nss_stats->rxrate.nss; ++ sinfo->rxrate.bw = peer->nss.nss_stats->rxrate.bw; ++ sinfo->rxrate.he_gi = peer->nss.nss_stats->rxrate.he_gi; ++ sinfo->rxrate.he_dcm = peer->nss.nss_stats->rxrate.he_dcm; ++ sinfo->rxrate.he_ru_alloc = peer->nss.nss_stats->rxrate.he_ru_alloc; ++ } ++ sinfo->rxrate.flags = peer->nss.nss_stats->rxrate.flags; ++ sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_BITRATE); ++ } ++ ++exit: ++ spin_unlock_bh(&ab->base_lock); ++} ++ ++void ath11k_nss_update_sta_rxrate(struct hal_rx_mon_ppdu_info *ppdu_info, ++ struct ath11k_peer *peer, ++ struct hal_rx_user_status *user_stats) ++{ ++ struct ath11k_sta *arsta = (struct ath11k_sta *)peer->sta->drv_priv; ++ u16 ath11k_hal_rx_legacy_rates[] = ++ { 10, 20, 55, 60, 90, 110, 120, 180, 240, 360, 480, 540 }; ++ u16 rate = 0; ++ u32 preamble_type; ++ u8 mcs, nss; ++ struct ath11k *ar = arsta->arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ ++ if (!ab->nss.enabled) ++ return; ++ ++ if (!peer->nss.nss_stats) ++ return; ++ ++ if (user_stats) { ++ mcs = user_stats->mcs; ++ nss = user_stats->nss; ++ preamble_type = user_stats->preamble_type; ++ } else { ++ mcs = ppdu_info->mcs; ++ nss = ppdu_info->nss; ++ preamble_type = ppdu_info->preamble_type; ++ } ++ ++ if ((preamble_type == WMI_RATE_PREAMBLE_CCK || ++ preamble_type == WMI_RATE_PREAMBLE_OFDM) && ++ (ppdu_info->rate < ATH11K_LEGACY_NUM)) { ++ rate = ath11k_hal_rx_legacy_rates[ppdu_info->rate]; ++ } ++ ++ memset(&peer->nss.nss_stats->rxrate, 0, sizeof(peer->nss.nss_stats->rxrate)); ++ ++ switch (preamble_type) { ++ case WMI_RATE_PREAMBLE_OFDM: ++ peer->nss.nss_stats->rxrate.legacy = rate; ++ break; ++ case WMI_RATE_PREAMBLE_CCK: ++ peer->nss.nss_stats->rxrate.legacy = rate; ++ break; ++ case WMI_RATE_PREAMBLE_HT: ++ if (mcs >= ATH11K_HT_MCS_NUM) { ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, ++ "Received invalid mcs in HT mode %d\n", mcs); ++ return; ++ } ++ peer->nss.nss_stats->rxrate.mcs = mcs; ++ peer->nss.nss_stats->rxrate.flags = RATE_INFO_FLAGS_MCS; ++ if (ppdu_info->gi) ++ peer->nss.nss_stats->rxrate.flags |= RATE_INFO_FLAGS_SHORT_GI; ++ break; ++ case WMI_RATE_PREAMBLE_VHT: ++ if (mcs > ATH11K_VHT_MCS_MAX) { ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, ++ "Received invalid mcs in VHT mode %d\n", mcs); ++ return; ++ } ++ peer->nss.nss_stats->rxrate.mcs = mcs; ++ peer->nss.nss_stats->rxrate.flags = RATE_INFO_FLAGS_VHT_MCS; ++ if (ppdu_info->gi) ++ peer->nss.nss_stats->rxrate.flags |= RATE_INFO_FLAGS_SHORT_GI; ++ break; ++ case WMI_RATE_PREAMBLE_HE: ++ if (mcs > ATH11K_HE_MCS_MAX) { ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, ++ "Received invalid mcs in HE mode %d\n", mcs); ++ return; ++ } ++ peer->nss.nss_stats->rxrate.mcs = mcs; ++ peer->nss.nss_stats->rxrate.flags = RATE_INFO_FLAGS_HE_MCS; ++ peer->nss.nss_stats->rxrate.he_dcm = ppdu_info->dcm; ++ peer->nss.nss_stats->rxrate.he_gi = ath11k_he_gi_to_nl80211_he_gi(ppdu_info->gi); ++ peer->nss.nss_stats->rxrate.he_ru_alloc = ppdu_info->ru_alloc; ++ break; ++ } ++ ++ peer->nss.nss_stats->rxrate.nss = nss; ++ peer->nss.nss_stats->rxrate.bw = ath11k_mac_bw_to_mac80211_bw(ppdu_info->bw); ++} ++ ++int ath11k_nss_peer_delete(struct ath11k_base *ab, const u8 *addr) ++{ ++ struct nss_wifili_peer_msg *peer_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ struct ath11k_peer *peer; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret; ++ ++ if (!ab->nss.enabled) ++ return 0; ++ ++ spin_lock_bh(&ab->base_lock); ++ ++ peer = ath11k_peer_find_by_addr(ab, addr); ++ if (!peer) { ++ ath11k_warn(ab, "peer (%pM) not found for nss peer delete\n", addr); ++ spin_unlock_bh(&ab->base_lock); ++ return -EINVAL; ++ } ++ ++ if (!peer->nss.vaddr) { ++ ath11k_warn(ab, "peer already deleted or peer create failed %pM\n", ++ addr); ++ spin_unlock_bh(&ab->base_lock); ++ return -EINVAL; ++ } ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) { ++ ath11k_warn(ab, "nss send peer delete msg alloc failure\n"); ++ ret = -ENOMEM; ++ goto free_peer; ++ } ++ ++ peer_msg = &wlmsg->msg.peermsg; ++ ++ peer_msg->vdev_id = peer->vdev_id; ++ peer_msg->peer_id = peer->peer_id; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_PEER_DELETE_MSG, ++ sizeof(struct nss_wifili_peer_msg), ++ msg_cb, NULL); ++ ++ reinit_completion(&peer->nss.complete); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss send peer (%pM) delete msg tx error %d\n", ++ addr, status); ++ ret = -EINVAL; ++ kfree(wlmsg); ++ goto free_peer; ++ } else { ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss peer delete message success : peer_id %d\n", ++ peer->peer_id); ++ ret = 0; ++ } ++ ++ spin_unlock_bh(&ab->base_lock); ++ ++ kfree(wlmsg); ++ ++ /* No need to return failure or free up here, since the msg was tx succesfully ++ * the peer delete response would be received from NSS which will free up ++ * the allocated memory ++ */ ++ ret = wait_for_completion_timeout(&peer->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) ++ ath11k_warn(ab, "timeout while waiting for nss peer delete msg response\n"); ++ ++ return 0; ++ ++free_peer: ++ dma_unmap_single(ab->dev, peer->nss.paddr, ++ WIFILI_NSS_PEER_BYTE_SIZE, DMA_FROM_DEVICE); ++ kfree(peer->nss.vaddr); ++ if (peer->nss.nss_stats) { ++ kfree(peer->nss.nss_stats); ++ peer->nss.nss_stats = NULL; ++ } ++ spin_unlock_bh(&ab->base_lock); ++ return ret; ++} ++ ++int ath11k_nss_peer_create(struct ath11k_base *ab, struct ath11k_peer *peer) ++{ ++ struct nss_wifili_peer_msg *peer_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret; ++ ++ if (!ab->nss.enabled) ++ return -ENOTSUPP; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ peer_msg = &wlmsg->msg.peermsg; ++ ++ peer_msg->vdev_id = peer->vdev_id; ++ peer_msg->peer_id = peer->peer_id; ++ peer_msg->hw_ast_idx = peer->hw_peer_id; ++ peer_msg->tx_ast_hash = peer->ast_hash; ++ ether_addr_copy(peer_msg->peer_mac_addr, peer->addr); ++ ++ peer->nss.vaddr = kzalloc(WIFILI_NSS_PEER_BYTE_SIZE, GFP_ATOMIC); ++ ++ /* Initialize completion for verifying Peer NSS message response */ ++ init_completion(&peer->nss.complete); ++ ++ if (!peer->nss.vaddr) { ++ ath11k_warn(ab, "failed to allocate memory for nss peer info\n"); ++ kfree(wlmsg); ++ return -ENOMEM; ++ } ++ ++ peer->nss.paddr = dma_map_single(ab->dev, peer->nss.vaddr, ++ WIFILI_NSS_PEER_BYTE_SIZE, DMA_TO_DEVICE); ++ ++ ret = dma_mapping_error(ab->dev, peer->nss.paddr); ++ if (ret) { ++ ath11k_warn(ab, "error during nss peer info memalloc\n"); ++ kfree(peer->nss.vaddr); ++ ret = -ENOMEM; ++ goto msg_free; ++ } ++ ++ peer_msg->nss_peer_mem = peer->nss.paddr; ++ peer_msg->psta_vdev_id = peer->vdev_id; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_PEER_CREATE_MSG, ++ sizeof(struct nss_wifili_peer_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ret = -EINVAL; ++ ath11k_warn(ab, "nss send peer (%pM) create msg tx error\n", ++ peer->addr); ++ goto peer_mem_free; ++ } ++ ++ ret = 0; ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "nss peer_create msg success mac:%pM vdev:%d peer_id:%d hw_ast_idx:%d ast_hash:%d\n", ++ peer_msg->peer_mac_addr, peer_msg->vdev_id, peer_msg->peer_id, ++ peer_msg->hw_ast_idx, peer_msg->tx_ast_hash); ++ ++ peer->nss.nss_stats = kzalloc(sizeof(*peer->nss.nss_stats), GFP_ATOMIC); ++ if (!peer->nss.nss_stats) { ++ ret = -ENOMEM; ++ ath11k_warn(ab, "Unable to create nss stats memory\n"); ++ goto peer_mem_free; ++ } ++ ++ goto msg_free; ++ ++peer_mem_free: ++ dma_unmap_single(ab->dev, peer->nss.paddr, ++ WIFILI_NSS_PEER_BYTE_SIZE, DMA_FROM_DEVICE); ++ kfree(peer->nss.vaddr); ++msg_free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++/*-------------------------------INIT/DEINIT---------------------------------*/ ++ ++static int ath11k_nss_radio_buf_cfg(struct ath11k *ar, int range, int buf_sz) ++{ ++ struct nss_wifili_radio_buf_cfg_msg *buf_cfg; ++ struct nss_wifili_radio_cfg_msg *radio_buf_cfg_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ radio_buf_cfg_msg = &wlmsg->msg.radiocfgmsg; ++ ++ radio_buf_cfg_msg->radio_if_num = ar->nss.if_num; ++ buf_cfg = &wlmsg->msg.radiocfgmsg.radiomsg.radiobufcfgmsg; ++ buf_cfg->range = range; ++ buf_cfg->buf_cnt = buf_sz; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ar->ab->nss.if_num, ++ NSS_WIFILI_RADIO_BUF_CFG, ++ sizeof(struct nss_wifili_radio_buf_cfg_msg), ++ NULL, NULL); ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss radio buf cfg send failed %d\n", status); ++ ret = -EINVAL; ++ } else { ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS, ++ "nss radio cfg message range:%d buf_sz:%d if_num:%d ctx:%p\n", ++ range, buf_sz, ar->nss.if_num, ar->nss.ctx); ++ } ++ ++ kfree(wlmsg); ++ return ret; ++} ++ ++static void ath11k_nss_fill_srng_info(struct ath11k_base *ab, int ring_id, ++ struct nss_wifili_hal_srng_info *hsi) ++{ ++ struct ath11k_hal *hal = &ab->hal; ++ struct hal_srng *srng; ++ u32 offset; ++ int i; ++ ++ if (ring_id < 0) { ++ ath11k_warn(ab, "Invalid ring id used for nss init\n"); ++ WARN_ON(1); ++ return; ++ } ++ ++ srng = &hal->srng_list[ring_id]; ++ ++ hsi->ring_id = srng->ring_id; ++ hsi->ring_dir = srng->ring_dir; ++ hsi->ring_base_paddr = srng->ring_base_paddr; ++ hsi->entry_size = srng->entry_size; ++ hsi->num_entries = srng->num_entries; ++ hsi->flags = srng->flags; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Ring info to send to nss - ring_id:%d ring_dir:%d ring_paddr:%d entry_size:%d num_entries:%d flags:%d\n", ++ hsi->ring_id, hsi->ring_dir, hsi->ring_base_paddr, ++ hsi->entry_size, hsi->num_entries, hsi->flags); ++ ++ for (i = 0; i < HAL_SRNG_NUM_REG_GRP; i++) { ++ offset = srng->hwreg_base[i]; ++ ++ /* For PCI based devices, get the umac ring base address offset ++ * based on window register configuration. ++ */ ++ if (!(srng->flags & HAL_SRNG_FLAGS_LMAC_RING)) ++ offset = ath11k_hif_get_window_offset(ab, srng->hwreg_base[i]); ++ ++ hsi->hwreg_base[i] = (u32)ab->mem_pa + offset; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "SRNG Register %d address %d\n", ++ i, hsi->hwreg_base[i]); ++ } ++} ++ ++static void ath11k_nss_tx_desc_mem_free(struct ath11k_base *ab) ++{ ++ int i; ++ ++ for (i = 0; i < ATH11K_NSS_MAX_NUMBER_OF_PAGE; i++) { ++ if (!ab->nss.tx_desc_paddr[i]) ++ continue; ++ ++ dma_free_coherent(ab->dev, ++ ab->nss.tx_desc_size[i], ++ ab->nss.tx_desc_vaddr[i], ++ ab->nss.tx_desc_paddr[i]); ++ ab->nss.tx_desc_vaddr[i] = NULL; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "allocated tx desc mem freed\n"); ++} ++ ++static int ath11k_nss_tx_desc_mem_alloc(struct ath11k_base *ab, u32 required_size, u32 *page_idx) ++{ ++ int i, alloc_size; ++ int curr_page_idx; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "tx desc mem alloc size: %d\n", required_size); ++ ++ curr_page_idx = *page_idx; ++ ++ for (i = 0, alloc_size = 0; i < required_size; i += alloc_size) { ++ alloc_size = required_size - i; ++ ++ if (alloc_size > WIFILI_NSS_MAX_MEM_PAGE_SIZE) ++ alloc_size = WIFILI_NSS_MAX_MEM_PAGE_SIZE; ++ ++ ab->nss.tx_desc_vaddr[curr_page_idx] = ++ dma_alloc_coherent(ab->dev, alloc_size, ++ &ab->nss.tx_desc_paddr[curr_page_idx], ++ GFP_KERNEL); ++ ++ if (!ab->nss.tx_desc_vaddr[curr_page_idx]) ++ return -ENOMEM; ++ ++ ab->nss.tx_desc_size[curr_page_idx] = alloc_size; ++ curr_page_idx++; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "curr page %d, allocated %d, total allocated %d\n", ++ curr_page_idx, alloc_size, i + alloc_size); ++ ++ if (curr_page_idx == ATH11K_NSS_MAX_NUMBER_OF_PAGE) { ++ ath11k_warn(ab, "max page number reached while tx desc mem allocation\n"); ++ return -EINVAL; ++ } ++ } ++ *page_idx = curr_page_idx; ++ return 0; ++} ++ ++static int ath11k_nss_fill_tx_desc_info(struct ath11k_base *ab, ++ struct nss_wifili_init_msg *wim) ++{ ++ struct nss_wifili_tx_desc_addtnl_mem_msg *dam; ++ u32 required_size, required_size_ext; ++ struct nss_wifili_tx_desc_init_msg *dim; ++ u32 tx_desc_limit_0 = 0; ++ u32 tx_desc_limit_1 = 0; ++ u32 tx_desc_limit_2 = 0; ++ u32 dam_page_idx = 0; ++ int page_idx = 0; ++ int i; ++ ++ wim->tx_sw_internode_queue_size = ATH11K_WIFIILI_MAX_TX_PROCESSQ; ++ ++ dim = &wim->wtdim; ++ dam = &wim->wtdam; ++ ++ dim->num_pool = ab->num_radios; ++ dim->num_tx_device_limit = ATH11K_WIFILI_MAX_TX_DESC; ++ ++ //TODO Revisit below calc based on platform/mem cfg ++ switch (dim->num_pool) { ++ case 1: ++ tx_desc_limit_0 = ATH11K_WIFILI_DBDC_NUM_TX_DESC; ++ break; ++ case 2: ++ tx_desc_limit_0 = ATH11K_WIFILI_DBDC_NUM_TX_DESC; ++ tx_desc_limit_1 = ATH11K_WIFILI_DBDC_NUM_TX_DESC; ++ break; ++ case 3: ++ tx_desc_limit_0 = ATH11K_WIFILI_DBTC_NUM_TX_DESC; ++ tx_desc_limit_1 = ATH11K_WIFILI_DBTC_NUM_TX_DESC; ++ tx_desc_limit_2 = ATH11K_WIFILI_DBTC_NUM_TX_DESC; ++ break; ++ default: ++ ath11k_warn(ab, "unexpected num radios during tx desc alloc\n"); ++ return -EINVAL; ++ } ++ ++ dim->num_tx_desc = tx_desc_limit_0; ++ dim->num_tx_desc_ext = tx_desc_limit_0; ++ dim->num_tx_desc_2 = tx_desc_limit_1; ++ dim->num_tx_desc_ext_2 = tx_desc_limit_1; ++ dim->num_tx_desc_3 = tx_desc_limit_2; ++ dim->num_tx_desc_ext_3 = tx_desc_limit_2; ++ ++ required_size = (dim->num_tx_desc + dim->num_tx_desc_2 + ++ dim->num_tx_desc_3 + ++ dim->num_pool) * WIFILI_NSS_TX_DESC_SIZE; ++ ++ required_size_ext = (dim->num_tx_desc_ext + dim->num_tx_desc_ext_2 + ++ dim->num_tx_desc_ext_3 + ++ dim->num_pool) * WIFILI_NSS_TX_EXT_DESC_SIZE; ++ ++ if (ath11k_nss_tx_desc_mem_alloc(ab, required_size, &page_idx)) { ++ ath11k_warn(ab, "memory allocation for tx desc of size %d failed\n", ++ required_size); ++ return -ENOMEM; ++ } ++ ++ /* Fill the page number from where extension tx descriptor is available */ ++ dim->ext_desc_page_num = page_idx; ++ ++ if (ath11k_nss_tx_desc_mem_alloc(ab, required_size_ext, &page_idx)) { ++ ath11k_warn(ab, "memory allocation for extension tx desc of size %d failed\n", ++ required_size_ext); ++ return -ENOMEM; ++ } ++ ++ for (i = 0; i < page_idx; i++) { ++ if (i < NSS_WIFILI_MAX_NUMBER_OF_PAGE_MSG) { ++ dim->memory_addr[i] = (u32)ab->nss.tx_desc_paddr[i]; ++ dim->memory_size[i] = (u32)ab->nss.tx_desc_size[i]; ++ dim->num_memaddr++; ++ } else { ++ dam_page_idx = i - NSS_WIFILI_MAX_NUMBER_OF_PAGE_MSG; ++ dam->addtnl_memory_addr[dam_page_idx] = (u32)ab->nss.tx_desc_paddr[i]; ++ dam->addtnl_memory_size[dam_page_idx] = (u32)ab->nss.tx_desc_size[i]; ++ dam->num_addtnl_addr++; ++ } ++ } ++ ++ if (i > NSS_WIFILI_MAX_NUMBER_OF_PAGE_MSG) ++ wim->flags |= WIFILI_ADDTL_MEM_SEG_SET; ++ ++ return 0; ++} ++ ++static int ath11k_nss_get_target_type(struct ath11k_base *ab) ++{ ++ switch (ab->hw_rev) { ++ case ATH11K_HW_IPQ8074: ++ return ATH11K_WIFILI_TARGET_TYPE_QCA8074V2; ++ case ATH11K_HW_IPQ6018_HW10: ++ return ATH11K_WIFILI_TARGET_TYPE_QCA6018; ++ case ATH11K_HW_QCN9074_HW10: ++ return ATH11K_WIFILI_TARGET_TYPE_QCN9074; ++ default: ++ ath11k_warn(ab, "NSS Offload not supported for this HW\n"); ++ return ATH11K_WIFILI_TARGET_TYPE_UNKNOWN; ++ } ++} ++ ++static int ath11k_nss_get_interface_type(struct ath11k_base *ab) ++{ ++ switch (ab->hw_rev) { ++ case ATH11K_HW_IPQ8074: ++ case ATH11K_HW_IPQ6018_HW10: ++ return NSS_WIFILI_INTERNAL_INTERFACE; ++ case ATH11K_HW_QCN9074_HW10: ++ return nss_get_available_wifili_external_if(); ++ default: ++ /* This can't happen since we validated target type earlier */ ++ WARN_ON(1); ++ return NSS_MAX_NET_INTERFACES; ++ } ++} ++ ++static int ath11k_nss_get_dynamic_interface_type(struct ath11k_base *ab) ++{ ++ switch (ab->nss.if_num) { ++ case NSS_WIFILI_INTERNAL_INTERFACE: ++ return NSS_DYNAMIC_INTERFACE_TYPE_WIFILI_INTERNAL; ++ case NSS_WIFILI_EXTERNAL_INTERFACE0: ++ return NSS_DYNAMIC_INTERFACE_TYPE_WIFILI_EXTERNAL0; ++ case NSS_WIFILI_EXTERNAL_INTERFACE1: ++ return NSS_DYNAMIC_INTERFACE_TYPE_WIFILI_EXTERNAL1; ++ default: ++ ath11k_warn(ab, "NSS Offload invalid interface\n"); ++ return NSS_DYNAMIC_INTERFACE_TYPE_NONE; ++ } ++} ++ ++static int ath11k_nss_init(struct ath11k_base *ab) ++{ ++ struct nss_wifili_init_msg *wim = NULL; ++ struct nss_wifili_msg *wlmsg = NULL; ++ struct nss_ctx_instance *nss_contex; ++ nss_wifili_msg_callback_t msg_cb; ++ u32 target_type; ++ u32 features = 0; ++ nss_tx_status_t status; ++ struct ath11k_dp *dp; ++ int i, ret; ++ ++ dp = &ab->dp; ++ ++ target_type = ath11k_nss_get_target_type(ab); ++ ++ if (target_type == ATH11K_WIFILI_TARGET_TYPE_UNKNOWN) ++ return -ENOTSUPP; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ wim = &wlmsg->msg.init; ++ ++ wim->target_type = target_type; ++ ++ /* fill rx parameters to initialize rx context */ ++ wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; ++ wim->wrip.rx_buf_len = DP_RX_BUFFER_SIZE; ++ ++ /* fill hal srng message */ ++ wim->hssm.dev_base_addr = (u32)ab->mem_pa; ++ wim->hssm.shadow_rdptr_mem_addr = (u32)ab->hal.rdp.paddr; ++ wim->hssm.shadow_wrptr_mem_addr = (u32)ab->hal.wrp.paddr; ++ wim->hssm.lmac_rings_start_id = HAL_SRNG_RING_ID_LMAC1_ID_START; ++ ++ /* fill TCL data/completion ring info */ ++ wim->num_tcl_data_rings = DP_TCL_NUM_RING_MAX; ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { ++ ath11k_nss_fill_srng_info(ab, dp->tx_ring[i].tcl_data_ring.ring_id, ++ &wim->tcl_ring_info[i]); ++ ath11k_nss_fill_srng_info(ab, dp->tx_ring[i].tcl_comp_ring.ring_id, ++ &wim->tx_comp_ring[i]); ++ } ++ ++ /* allocate tx desc memory for NSS and fill corresponding info */ ++ ret = ath11k_nss_fill_tx_desc_info(ab, wim); ++ if (ret) ++ goto free; ++ ++ /* fill reo dest ring info */ ++ wim->num_reo_dest_rings = DP_REO_DST_RING_MAX; ++ for (i = 0; i < DP_REO_DST_RING_MAX; i++) { ++ ath11k_nss_fill_srng_info(ab, dp->reo_dst_ring[i].ring_id, ++ &wim->reo_dest_ring[i]); ++ } ++ ++ /* fill reo reinject ring info */ ++ ath11k_nss_fill_srng_info(ab, dp->reo_reinject_ring.ring_id, ++ &wim->reo_reinject_ring); ++ ++ /* fill reo release ring info */ ++ ath11k_nss_fill_srng_info(ab, dp->rx_rel_ring.ring_id, ++ &wim->rx_rel_ring); ++ ++ /* fill reo exception ring info */ ++ ath11k_nss_fill_srng_info(ab, dp->reo_except_ring.ring_id, ++ &wim->reo_exception_ring); ++ ++ ab->nss.if_num = ath11k_nss_get_interface_type(ab); ++ ++ ath11k_info(ab, "nss init soc nss if_num %d userpd_id %d\n", ab->nss.if_num, ab->userpd_id); ++ ++ if (ab->nss.if_num >= NSS_MAX_NET_INTERFACES) { ++ ath11k_warn(ab, "NSS invalid interface\n"); ++ goto free; ++ } ++ ++ /* register callbacks for events and exceptions with nss */ ++ nss_contex = nss_register_wifili_if(ab->nss.if_num, NULL, ++ (nss_wifili_callback_t)ath11k_nss_wifili_ext_callback_fn, ++ (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive, ++ (struct net_device *)ab, features); ++ ++ if (!nss_contex) { ++ ath11k_warn(ab, "nss wifili register failure\n"); ++ goto free; ++ } ++ ++ if (nss_cmn_get_state(nss_contex) != NSS_STATE_INITIALIZED) { ++ ath11k_warn(ab, "nss state in default init state\n"); ++ goto free; ++ } ++ ++ /* The registered soc context is stored in ab, and will be used for ++ * all soc related messages with nss ++ */ ++ ab->nss.ctx = nss_contex; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ /* Initialize the common part of the wlmsg */ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_INIT_MSG, ++ sizeof(struct nss_wifili_init_msg), ++ msg_cb, NULL); ++ ++ reinit_completion(&ab->nss.complete); ++ ++ /* Note: response is contention free during init sequence */ ++ ab->nss.response = ATH11K_NSS_MSG_ACK; ++ ++ status = nss_wifili_tx_msg(nss_contex, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "failure to send nss init msg\n"); ++ goto unregister; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for nss init msg response\n"); ++ goto unregister; ++ } ++ ++ /* Check if the response is success from the callback */ ++ if (ab->nss.response != ATH11K_NSS_MSG_ACK) ++ goto unregister; ++ ++ kfree(wlmsg); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS Init Message TX Success %p %d\n", ++ ab->nss.ctx, ab->nss.if_num); ++ return 0; ++ ++unregister: ++ nss_unregister_wifili_if(ab->nss.if_num); ++free: ++ ath11k_nss_tx_desc_mem_free(ab); ++ kfree(wlmsg); ++ return -EINVAL; ++} ++ ++static int ath11k_nss_stats_cfg(struct ath11k *ar, int nss_msg, int enable) ++{ ++ struct nss_wifili_msg *wlmsg = NULL; ++ struct nss_wifili_stats_cfg_msg *stats_cfg; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ struct ath11k_base *ab = ar->ab; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ stats_cfg = &wlmsg->msg.scm; ++ stats_cfg->cfg = enable; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ nss_msg, ++ sizeof(struct nss_wifili_stats_cfg_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss stats cfg %d msg tx failure\n", nss_msg); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss stats %d enable %d\n", nss_msg, enable); ++ ++free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++static void ath11k_nss_sojourn_stats_disable(struct ath11k *ar) ++{ ++ ath11k_nss_stats_cfg(ar, NSS_WIFILI_STATS_V2_CFG_MSG, ++ ATH11K_NSS_STATS_DISABLE); ++} ++ ++void ath11k_nss_peer_stats_disable(struct ath11k *ar) ++{ ++ ath11k_nss_stats_cfg(ar, NSS_WIFILI_STATS_CFG_MSG, ++ ATH11K_NSS_STATS_DISABLE); ++} ++ ++void ath11k_nss_peer_stats_enable(struct ath11k *ar) ++{ ++ ath11k_nss_stats_cfg(ar, NSS_WIFILI_STATS_CFG_MSG, ++ ATH11K_NSS_STATS_ENABLE); ++} ++ ++int ath11k_nss_pdev_init(struct ath11k_base *ab, int radio_id) ++{ ++ struct ath11k *ar = ab->pdevs[radio_id].ar; ++ struct nss_wifili_pdev_init_msg *pdevmsg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int radio_if_num = -1; ++ int refill_ring_id; ++ int features = 0; ++ int dyn_if_type; ++ int ret, i; ++ ++ dyn_if_type = ath11k_nss_get_dynamic_interface_type(ab); ++ ++ /* Allocate a node for dynamic interface */ ++ radio_if_num = nss_dynamic_interface_alloc_node(dyn_if_type); ++ ++ if (radio_if_num < 0) ++ return -EINVAL; ++ ++ /* The ifnum and registered radio context is stored in ar and used ++ * for messages related to vdev/radio ++ */ ++ ar->nss.if_num = radio_if_num; ++ ++ /* No callbacks are registered for radio specific events/data */ ++ ar->nss.ctx = nss_register_wifili_radio_if((u32)radio_if_num, NULL, ++ NULL, NULL, (struct net_device *)ar, ++ features); ++ ++ if (!ar->nss.ctx) { ++ ath11k_warn(ab, "failure during nss pdev register\n"); ++ ret = -EINVAL; ++ goto dealloc; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss pdev init - id:%d init ctxt:%p ifnum:%d\n", ++ ar->pdev->pdev_id, ar->nss.ctx, ar->nss.if_num); ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) { ++ ret = -ENOMEM; ++ goto unregister; ++ } ++ ++ pdevmsg = &wlmsg->msg.pdevmsg; ++ ++ pdevmsg->radio_id = radio_id; ++ pdevmsg->lmac_id = ar->lmac_id; ++ pdevmsg->target_pdev_id = ar->pdev->pdev_id; ++ pdevmsg->num_rx_swdesc = WIFILI_RX_DESC_POOL_WEIGHT * DP_RXDMA_BUF_RING_SIZE; ++ ++ /* Store rxdma ring info to the message */ ++ refill_ring_id = ar->dp.rx_refill_buf_ring.refill_buf_ring.ring_id; ++ ath11k_nss_fill_srng_info(ab, refill_ring_id, &pdevmsg->rxdma_ring); ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_PDEV_INIT_MSG, ++ sizeof(struct nss_wifili_pdev_init_msg), ++ msg_cb, NULL); ++ ++ reinit_completion(&ab->nss.complete); ++ ++ /* Note: response is contention free during init sequence */ ++ ab->nss.response = ATH11K_NSS_MSG_ACK; ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss send pdev msg tx error : %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for pdev init msg response\n"); ++ ret = -ETIMEDOUT; ++ goto free; ++ } ++ ++ /* Check if the response is success from the callback */ ++ if (ab->nss.response != ATH11K_NSS_MSG_ACK) { ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ kfree(wlmsg); ++ ++ /* Disable nss sojourn stats by default */ ++ ath11k_nss_sojourn_stats_disable(ar); ++ /* Enable nss wifili peer stats by default */ ++ ath11k_nss_peer_stats_enable(ar); ++ ++ /*TODO CFG Tx buffer limit as per no clients range per radio ++ * this needs to be based on target/mem cfg ++ * similar to tx desc cfg at soc init per radio ++ */ ++ ++ for (i = 0; i < ATH11K_NSS_RADIO_TX_LIMIT_RANGE; i++) ++ ath11k_nss_radio_buf_cfg(ar, i, ATH11K_NSS_RADIO_TX_LIMIT_RANGE3); ++ ++ return 0; ++ ++free: ++ kfree(wlmsg); ++unregister: ++ nss_unregister_wifili_radio_if(ar->nss.if_num); ++dealloc: ++ nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); ++ return ret; ++} ++ ++/* TODO : Check if start, reset and stop messages can be done using single function as ++ * body is similar, having it now for clarity */ ++ ++int ath11k_nss_start(struct ath11k_base *ab) ++{ ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ /* Empty message for NSS Start message */ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_START_MSG, ++ 0, ++ msg_cb, NULL); ++ ++ reinit_completion(&ab->nss.complete); ++ ++ /* Note: response is contention free during init sequence */ ++ ab->nss.response = ATH11K_NSS_MSG_ACK; ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss send start msg tx error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for response for nss start msg\n"); ++ ret = -ETIMEDOUT; ++ goto free; ++ } ++ ++ /* Check if the response is success from the callback */ ++ if (ab->nss.response != ATH11K_NSS_MSG_ACK) { ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ /* NSS Start success */ ++ ret = 0; ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "nss start success\n"); ++ ++free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++static void ath11k_nss_reset(struct ath11k_base *ab) ++{ ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS reset\n"); ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) { ++ ath11k_warn(ab, "mem allocation failure during nss reset\n"); ++ return; ++ } ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ /* Empty message for NSS Reset message */ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_SOC_RESET_MSG, ++ 0, ++ msg_cb, NULL); ++ ++ reinit_completion(&ab->nss.complete); ++ ++ /* Note: response is contention free during deinit sequence */ ++ ab->nss.response = ATH11K_NSS_MSG_ACK; ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ ++ /* Add a retry mechanism to reset nss until success */ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss send reset msg tx error %d\n", status); ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for response for nss reset msg\n"); ++ goto free; ++ } ++ ++ /* Check if the response is success from the callback */ ++ if (ab->nss.response != ATH11K_NSS_MSG_ACK) { ++ ath11k_warn(ab, "failure response during nss reset %d\n", ab->nss.response); ++ goto free; ++ } ++ ++ /* Unregister wifili interface */ ++ nss_unregister_wifili_if(ab->nss.if_num); ++ ++free: ++ kfree(wlmsg); ++} ++ ++static int ath11k_nss_stop(struct ath11k_base *ab) ++{ ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS stop\n"); ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ /* Empty message for Stop command */ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_STOP_MSG, ++ 0, ++ msg_cb, NULL); ++ ++ reinit_completion(&ab->nss.complete); ++ ++ /* Note: response is contention free during deinit sequence */ ++ ab->nss.response = ATH11K_NSS_MSG_ACK; ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ ++ /* Add a retry mechanism to stop nss until success */ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss send stop msg tx error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for response for nss stop msg\n"); ++ ret = -ETIMEDOUT; ++ goto free; ++ } ++ ++ /* Check if the response is success from the callback */ ++ if (ab->nss.response != ATH11K_NSS_MSG_ACK) { ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ /* NSS Stop success */ ++ ret = 0; ++free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++int ath11k_nss_pdev_deinit(struct ath11k_base *ab, int radio_id) ++{ ++ struct ath11k *ar = ab->pdevs[radio_id].ar; ++ struct nss_wifili_pdev_deinit_msg *deinit; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int dyn_if_type; ++ int ret; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS pdev %d deinit\n", radio_id); ++ dyn_if_type = ath11k_nss_get_dynamic_interface_type(ab); ++ ++ /* Disable NSS wifili peer stats before teardown */ ++ if (ab->nss.stats_enabled) ++ ath11k_nss_peer_stats_disable(ar); ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ deinit = &wlmsg->msg.pdevdeinit; ++ deinit->ifnum = radio_id; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_PDEV_DEINIT_MSG, ++ sizeof(struct nss_wifili_pdev_deinit_msg), ++ msg_cb, NULL); ++ ++ reinit_completion(&ab->nss.complete); ++ ++ /* Note: response is contention free during deinit sequence */ ++ ab->nss.response = ATH11K_NSS_MSG_ACK; ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss send pdev deinit msg tx error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for pdev deinit msg response\n"); ++ ret = -ETIMEDOUT; ++ goto free; ++ } ++ ++ /* Check if the response is success from the callback */ ++ if (ab->nss.response != ATH11K_NSS_MSG_ACK) { ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ /* pdev deinit msg success, dealloc, deregister and return */ ++ ret = 0; ++ ++ nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); ++ nss_unregister_wifili_radio_if(ar->nss.if_num); ++free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++int ath11k_nss_teardown(struct ath11k_base *ab) ++{ ++ int i, ret; ++ ++ if (!ab->nss.enabled) ++ return 0; ++ ++ ath11k_nss_stop(ab); ++ ++ for (i = 0; i < ab->num_radios ; i++) { ++ ret = ath11k_nss_pdev_deinit(ab, i); ++ if (ret) ++ ath11k_warn(ab, "failure during pdev%d deinit\n", i); ++ } ++ ++ ath11k_nss_reset(ab); ++ ath11k_nss_tx_desc_mem_free(ab); ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS Teardown Complete\n"); ++ ++ return 0; ++} ++ ++int ath11k_nss_setup(struct ath11k_base *ab) ++{ ++ int i; ++ int ret = 0; ++ u32 target_type; ++ ++ if (!ab->nss.enabled) ++ return 0; ++ ++ target_type = ath11k_nss_get_target_type(ab); ++ ++ if (target_type == ATH11K_WIFILI_TARGET_TYPE_UNKNOWN) ++ return -ENOTSUPP; ++ ++ /* Verify NSS support is enabled */ ++ if (nss_cmn_get_nss_enabled() == false) { ++ ath11k_warn(ab, "NSS offload support disabled, falling back to default mode\n"); ++ return -ENOTSUPP; ++ } ++ ++ /* Initialize completion for verifying NSS message response */ ++ init_completion(&ab->nss.complete); ++ ++ /* Setup common resources for NSS */ ++ ret = ath11k_nss_init(ab); ++ if (ret) { ++ ath11k_warn(ab, "NSS SOC Initialization Failed :%d\n", ret); ++ goto fail; ++ } ++ ++ /* Setup pdev related resources for NSS */ ++ for (i = 0; i < ab->num_radios; i++) { ++ ret = ath11k_nss_pdev_init(ab, i); ++ if (ret) { ++ ath11k_warn(ab, "NSS PDEV %d Initialization Failed :%d\n", i, ret); ++ goto pdev_deinit; ++ } ++ } ++ ++ /* Set the NSS statemachine to start */ ++ ret = ath11k_nss_start(ab); ++ if (ret) { ++ ath11k_warn(ab, "NSS Start Failed : %d\n", ret); ++ goto pdev_deinit; ++ } ++ ++ /* Default nexthop interface is set to ETH RX */ ++ ret = nss_wifi_vdev_base_set_next_hop(ab->nss.ctx, NSS_ETH_RX_INTERFACE); ++ if (ret != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "Failure to set default next hop : %d\n", ret); ++ goto stop; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS Setup Complete\n"); ++ return ret; ++ ++stop: ++ ath11k_nss_stop(ab); ++ ++pdev_deinit: ++ for (i -= 1; i >= 0; i--) ++ ath11k_nss_pdev_deinit(ab, i); ++ ++ ath11k_nss_reset(ab); ++ ath11k_nss_tx_desc_mem_free(ab); ++fail: ++ return ret; ++} +--- /dev/null ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -0,0 +1,307 @@ ++/* SPDX-License-Identifier: BSD-3-Clause-Clear */ ++/* ++ * Copyright (c) 2020 The Linux Foundation. All rights reserved. ++ */ ++ ++#ifndef ATH11K_NSS_H ++#define ATH11K_NSS_H ++ ++#include "net/cfg80211.h" ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++#include ++#include ++ ++#endif ++struct ath11k; ++struct ath11k_base; ++struct ath11k_vif; ++struct ath11k_peer; ++struct ath11k_sta; ++struct hal_rx_mon_ppdu_info; ++struct hal_rx_user_status; ++ ++/* NSS DBG macro is not included as part of debug enum to avoid ++ * frequent changes during upgrade*/ ++#define ATH11K_DBG_NSS 0x80000000 ++ ++/* WIFILI Supported Target Types */ ++#define ATH11K_WIFILI_TARGET_TYPE_UNKNOWN 0xFF ++#define ATH11K_WIFILI_TARGET_TYPE_QCA8074 20 ++#define ATH11K_WIFILI_TARGET_TYPE_QCA8074V2 24 ++#define ATH11K_WIFILI_TARGET_TYPE_QCA6018 25 ++#define ATH11K_WIFILI_TARGET_TYPE_QCN9074 26 ++#define ATH11K_WIFILI_TARGET_TYPE_QCA5018 29 ++ ++/* Max limit for NSS Queue */ ++#define ATH11K_WIFIILI_MAX_TX_PROCESSQ 1024 ++ ++/* Max TX Desc limit */ ++#define ATH11K_WIFILI_MAX_TX_DESC 65536 ++ ++/* TX Desc related info */ ++/*TODO : Check this again during experiments for lowmem or ++ changes for platforms based on num radios supported */ ++#define ATH11K_WIFILI_DBDC_NUM_TX_DESC (1024 * 8) ++#define ATH11K_WIFILI_DBTC_NUM_TX_DESC (1024 * 8) ++ ++// TODO Revisit these page size calc ++#define WIFILI_NSS_TX_DESC_SIZE 20*4 ++#define WIFILI_NSS_TX_EXT_DESC_SIZE 40*4 ++/* Number of desc per page(12bit) should be<4096, page limit per 1024 byte is 80*3=240 */ ++#define WIFILI_NSS_TX_DESC_PAGE_LIMIT 240 ++#define WIFILI_NSS_MAX_MEM_PAGE_SIZE (WIFILI_NSS_TX_DESC_PAGE_LIMIT * 1024) ++#define WIFILI_NSS_MAX_EXT_MEM_PAGE_SIZE (WIFILI_NSS_TX_DESC_PAGE_LIMIT * 1024) ++#define WIFILI_RX_DESC_POOL_WEIGHT 3 ++ ++/* Status of the NSS messages sent from driver */ ++#define ATH11K_NSS_MSG_ACK 0 ++/* Timeout for waiting for response from NSS on TX msg */ ++#define ATH11K_NSS_MSG_TIMEOUT_MS 5000 ++ ++/* Init Flags */ ++#define WIFILI_NSS_CCE_DISABLED 0x1 ++#define WIFILI_ADDTL_MEM_SEG_SET 0x000000002 ++ ++/* ATH11K NSS PEER Info */ ++/* Host memory allocated for peer info storage in nss */ ++#define WIFILI_NSS_PEER_BYTE_SIZE NSS_WIFILI_PEER_SIZE ++ ++/* ATH11K NSS Stats */ ++#define ATH11K_NSS_STATS_ENABLE 1 ++#define ATH11K_NSS_STATS_DISABLE 0 ++ ++/* TX Buf cfg range */ ++#define ATH11K_NSS_RADIO_TX_LIMIT_RANGE 4 ++ ++/* TODO : Analysis based on platform */ ++/* TX Limit till 64 clients */ ++#define ATH11K_NSS_RADIO_TX_LIMIT_RANGE0 8192 ++/* TX Limit till 128 clients */ ++#define ATH11K_NSS_RADIO_TX_LIMIT_RANGE1 8192 ++/* TX Limit till 256 clients */ ++#define ATH11K_NSS_RADIO_TX_LIMIT_RANGE2 8192 ++/* TX Limit > 256 clients */ ++#define ATH11K_NSS_RADIO_TX_LIMIT_RANGE3 8192 ++ ++#define ATH11K_NSS_MAX_NUMBER_OF_PAGE 96 ++ ++#define NSS_TX_TID_MAX 8 ++ ++#define ATH11K_NSS_TXRX_NETDEV_STATS(txrx, vif, len, pkt_count) \ ++do { \ ++ struct wireless_dev *wdev = ieee80211_vif_to_wdev(vif); \ ++ struct pcpu_sw_netstats *tstats; \ ++ \ ++ if (!wdev) \ ++ break; \ ++ tstats = this_cpu_ptr(netdev_tstats(wdev->netdev)); \ ++ u64_stats_update_begin(&tstats->syncp); \ ++ u64_stats_add(&tstats->txrx ## _packets, pkt_count); \ ++ u64_stats_add(&tstats->txrx ## _bytes, len); \ ++ u64_stats_update_end(&tstats->syncp); \ ++} while (0) ++ ++enum ath11k_nss_opmode { ++ ATH11K_NSS_OPMODE_UNKNOWN, ++ ATH11K_NSS_OPMODE_AP, ++ ATH11K_NSS_OPMODE_IBSS, ++ ATH11K_NSS_OPMODE_STA, ++ ATH11K_NSS_OPMODE_MONITOR, ++}; ++ ++struct peer_stats { ++ u64 last_rx; ++ u64 last_ack; ++ u32 tx_packets; ++ u32 tx_bytes; ++ u32 tx_retries; ++ u32 tx_failed; ++ u32 rx_packets; ++ u32 rx_bytes; ++ u32 rx_dropped; ++ u32 last_rxdrop; ++ struct rate_info rxrate; ++}; ++ ++enum ath11k_nss_peer_sec_type { ++ PEER_SEC_TYPE_NONE, ++ PEER_SEC_TYPE_WEP128, ++ PEER_SEC_TYPE_WEP104, ++ PEER_SEC_TYPE_WEP40, ++ PEER_SEC_TYPE_TKIP, ++ PEER_SEC_TYPE_TKIP_NOMIC, ++ PEER_SEC_TYPE_AES_CCMP, ++ PEER_SEC_TYPE_WAPI, ++ PEER_SEC_TYPE_AES_CCMP_256, ++ PEER_SEC_TYPE_AES_GCMP, ++ PEER_SEC_TYPE_AES_GCMP_256, ++ PEER_SEC_TYPES_MAX ++}; ++ ++/* this holds the memory allocated for nss managed peer info */ ++struct ath11k_nss_peer { ++ uint32_t *vaddr; ++ dma_addr_t paddr; ++ struct peer_stats *nss_stats; ++ struct completion complete; ++}; ++ ++/* Structure to hold the vif related info for nss offload support */ ++struct arvif_nss { ++ /* dynamic ifnum allocated by nss driver for vif */ ++ int if_num; ++ /* Used for completion status for vdev config nss messages */ ++ struct completion complete; ++ /* Keep the copy of encap type for nss */ ++ int encap; ++ /* Keep the copy of decap type for nss */ ++ int decap; ++ bool created; ++}; ++ ++/* Structure to hold the pdev/radio related info for nss offload support */ ++struct ath11k_nss { ++ /* dynamic ifnum allocated by nss driver for pdev */ ++ int if_num; ++ /* Radio/pdev Context obtained on pdev register */ ++ void* ctx; ++}; ++ ++/* Structure to hold the soc related info for nss offload support */ ++struct ath11k_soc_nss { ++ /* turn on/off nss offload support in ath11k */ ++ bool enabled; ++ /* turn on/off nss stats support in ath11k */ ++ bool stats_enabled; ++ /* soc nss ctx */ ++ void* ctx; ++ /* if_num to be used for soc related nss messages */ ++ int if_num; ++ /* debug mode to disable the regular mesh configuration from mac80211 */ ++ bool debug_mode; ++ /* Completion to nss message response */ ++ struct completion complete; ++ /* Response to nss messages are stored here on msg callback ++ * used only in contention free messages during init */ ++ int response; ++ /* Below is used for identifying allocated tx descriptors */ ++ dma_addr_t tx_desc_paddr[ATH11K_NSS_MAX_NUMBER_OF_PAGE]; ++ uint32_t * tx_desc_vaddr[ATH11K_NSS_MAX_NUMBER_OF_PAGE]; ++ uint32_t tx_desc_size[ATH11K_NSS_MAX_NUMBER_OF_PAGE]; ++}; ++ ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb); ++int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, int cmd, int val); ++int ath11k_nss_vdev_create(struct ath11k_vif *arvif); ++void ath11k_nss_vdev_delete(struct ath11k_vif *arvif); ++int ath11k_nss_vdev_up(struct ath11k_vif *arvif); ++int ath11k_nss_vdev_down(struct ath11k_vif *arvif); ++int ath11k_nss_peer_delete(struct ath11k_base *ab, const u8 *addr); ++int ath11k_nss_set_peer_authorize(struct ath11k *ar, u16 peer_id); ++int ath11k_nss_peer_create(struct ath11k_base *ab, struct ath11k_peer *peer); ++void ath11k_nss_peer_stats_enable(struct ath11k *ar); ++void ath11k_nss_peer_stats_disable(struct ath11k *ar); ++int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, ++ struct ieee80211_key_conf *key_conf); ++void ath11k_nss_update_sta_stats(struct station_info *sinfo, ++ struct ieee80211_sta *sta, ++ struct ath11k_sta *arsta); ++void ath11k_nss_update_sta_rxrate(struct hal_rx_mon_ppdu_info *ppdu_info, ++ struct ath11k_peer *peer, ++ struct hal_rx_user_status *user_stats); ++int ath11k_nss_setup(struct ath11k_base *ab); ++int ath11k_nss_teardown(struct ath11k_base *ab); ++void ath11k_nss_ext_rx_stats(struct ath11k_base *ab, struct htt_rx_ring_tlv_filter *tlv_filter); ++#else ++static inline int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, int cmd, int val) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_vdev_create(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_set_peer_authorize(struct ath11k *ar, u16 peer_id) ++{ ++ return 0; ++} ++ ++static inline void ath11k_nss_vdev_delete(struct ath11k_vif *arvif) ++{ ++} ++ ++static inline void ath11k_nss_update_sta_stats(struct station_info *sinfo, ++ struct ieee80211_sta *sta, ++ struct ath11k_sta *arsta) ++{ ++ return; ++} ++ ++static inline void ath11k_nss_update_sta_rxrate(struct hal_rx_mon_ppdu_info *ppdu_info, ++ struct ath11k_peer *peer, ++ struct hal_rx_user_status *user_stats) ++{ ++ return; ++} ++ ++static inline int ath11k_nss_vdev_up(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_vdev_down(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_peer_delete(struct ath11k_base *ab, const u8 *addr) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_peer_create(struct ath11k_base *ab, struct ath11k_peer *peer) ++{ ++ return 0; ++} ++ ++static inline void ath11k_nss_peer_stats_enable(struct ath11k *ar) ++{ ++ return; ++} ++ ++static inline void ath11k_nss_peer_stats_disable(struct ath11k *ar) ++{ ++ return; ++} ++ ++static inline int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, ++ struct ieee80211_key_conf *key_conf) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_setup(struct ath11k_base *ab) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_teardown(struct ath11k_base *ab) ++{ ++ return 0; ++} ++ ++static inline void ath11k_nss_ext_rx_stats(struct ath11k_base *ab, ++ struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ return; ++} ++#endif /* CPTCFG_ATH11K_NSS_SUPPORT */ ++#endif +--- a/drivers/net/wireless/ath/ath11k/hif.h ++++ b/drivers/net/wireless/ath/ath11k/hif.h +@@ -30,6 +30,7 @@ struct ath11k_hif_ops { + void (*ce_irq_enable)(struct ath11k_base *ab); + void (*ce_irq_disable)(struct ath11k_base *ab); + void (*get_ce_msi_idx)(struct ath11k_base *ab, u32 ce_id, u32 *msi_idx); ++ u32 (*get_window_offset)(struct ath11k_base *ab, u32 offset); + }; + + static inline void ath11k_hif_ce_irq_enable(struct ath11k_base *ab) +@@ -136,6 +137,14 @@ static inline void ath11k_get_msi_addres + ab->hif.ops->get_msi_address(ab, msi_addr_lo, msi_addr_hi); + } + ++static inline u32 ath11k_hif_get_window_offset(struct ath11k_base *ab, u32 offset) ++{ ++ if (ab->hif.ops->get_window_offset) ++ return ab->hif.ops->get_window_offset(ab, offset); ++ ++ return offset; ++} ++ + static inline void ath11k_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id, + u32 *msi_data_idx) + { +--- a/drivers/net/wireless/ath/ath11k/pci.c ++++ b/drivers/net/wireless/ath/ath11k/pci.c +@@ -67,6 +67,20 @@ static u32 ath11k_pci_get_window_start(s + return ATH11K_PCI_WINDOW_START; + } + ++static inline u32 ath11k_pci_get_window_offset(struct ath11k_base *ab, ++ u32 offset) ++{ ++ u32 window_start; ++ ++ if (ab->hw_params.static_window_map) { ++ window_start = ath11k_pci_get_window_start(ab, offset); ++ ++ if (window_start) ++ offset = window_start + (offset & ATH11K_PCI_WINDOW_RANGE_MASK); ++ } ++ return offset; ++} ++ + static inline void ath11k_pci_select_window(struct ath11k_pci *ab_pci, u32 offset) + { + struct ath11k_base *ab = ab_pci->ab; +@@ -708,6 +722,7 @@ static const struct ath11k_hif_ops ath11 + .map_service_to_pipe = ath11k_pcic_map_service_to_pipe, + .ce_irq_enable = ath11k_pci_hif_ce_irq_enable, + .ce_irq_disable = ath11k_pci_hif_ce_irq_disable, ++ .get_window_offset = ath11k_pci_get_window_offset, + .get_ce_msi_idx = ath11k_pcic_get_ce_msi_idx, + }; + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -992,6 +992,29 @@ unlock_exit: + spin_unlock_bh(&ab->base_lock); + } + ++/* Sends WMI config to filter packets to route packets to WBM release ring */ ++int ath11k_dp_rx_pkt_type_filter(struct ath11k *ar, enum ath11k_routing_pkt_type pkt_type, u32 meta_data) ++{ ++ struct ath11k_wmi_pkt_route_param param; ++ int ret; ++ ++ /* Routing Eapol packets to CCE is only allowed now */ ++ if (pkt_type != ATH11K_PKT_TYPE_EAP) ++ return -EINVAL; ++ ++ param.opcode = ATH11K_WMI_PKTROUTE_ADD; ++ param.meta_data = meta_data; ++ param.dst_ring = ATH11K_ROUTE_WBM_RELEASE; ++ param.dst_ring_handler = ATH11K_WMI_PKTROUTE_USE_CCE; ++ param.route_type_bmap = 1 << pkt_type; ++ ++ ret = ath11k_wmi_send_pdev_pkt_route(ar, ¶m); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to configure pkt route %d", ret); ++ ++ return ret; ++} ++ + int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id, + u8 tid, u32 ba_win_sz, u16 ssn, + enum hal_pn_type pn_type) +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -1164,6 +1164,44 @@ int ath11k_wmi_send_pdev_set_regdomain(s + return ret; + } + ++int ath11k_wmi_send_pdev_pkt_route(struct ath11k *ar, struct ath11k_wmi_pkt_route_param *param) ++{ ++ struct ath11k_pdev_wmi *wmi = ar->wmi; ++ struct wmi_pdev_pkt_route_cmd *cmd; ++ struct sk_buff *skb; ++ int ret; ++ ++ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); ++ if (!skb) ++ return -ENOMEM; ++ ++ cmd = (struct wmi_pdev_pkt_route_cmd *)skb->data; ++ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, ++ WMI_TAG_PDEV_UPDATE_PKT_ROUTING_CMD) | ++ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); ++ ++ cmd->pdev_id = ar->pdev->pdev_id; ++ cmd->opcode = param->opcode; ++ cmd->route_type_bmap = param->route_type_bmap; ++ cmd->dst_ring = param->dst_ring; ++ cmd->meta_data = param->meta_data; ++ cmd->dst_ring_handler = param->dst_ring_handler; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "WMI pdev pkt route opcode %d route_bmap %d dst_ring %d meta_datan %d dst_ringg_handler %d\n", ++ param->opcode, param->route_type_bmap, ++ param->dst_ring, param->meta_data, param->dst_ring_handler); ++ ++ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_UPDATE_PKT_ROUTING_CMDID); ++ if (ret) { ++ ath11k_warn(ar->ab, ++ "failed to send WMI_PDEV_UPDATE_PKT_ROUTING cmd\n"); ++ dev_kfree_skb(skb); ++ } ++ ++ return ret; ++} ++ + int ath11k_wmi_set_peer_param(struct ath11k *ar, const u8 *peer_addr, + u32 vdev_id, u32 param_id, u32 param_val) + { +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -2873,6 +2873,27 @@ struct pdev_set_regdomain_params { + u32 pdev_id; + }; + ++ /* Defines various options for routing policy */ ++enum wmi_pdev_dest_ring_handler_type { ++ ATH11K_WMI_PKTROUTE_USE_CCE = 0, ++ ATH11K_WMI_PKTROUTE_USE_ASPT = 1, ++ ATH11K_WMI_PKTROUTE_USE_FSE = 2, ++ ATH11K_WMI_PKTROUTE_USE_CCE2 = 3, ++}; ++ ++enum ath11k_wmi_pkt_route_opcode { ++ ATH11K_WMI_PKTROUTE_ADD, ++ ATH11K_WMI_PKTROUTE_DEL, ++}; ++ ++struct ath11k_wmi_pkt_route_param { ++ enum ath11k_wmi_pkt_route_opcode opcode; ++ u32 route_type_bmap; ++ u32 dst_ring_handler; ++ u32 dst_ring; ++ u32 meta_data; ++}; ++ + struct rx_reorder_queue_remove_params { + u8 *peer_macaddr; + u16 vdev_id; +@@ -3121,6 +3142,16 @@ struct wmi_pdev_set_regdomain_cmd { + u32 dfs_domain; + } __packed; + ++struct wmi_pdev_pkt_route_cmd { ++ u32 tlv_header; ++ u32 pdev_id; ++ u32 opcode; ++ u32 route_type_bmap; ++ u32 dst_ring; ++ u32 meta_data; ++ u32 dst_ring_handler; ++} __packed; ++ + struct wmi_peer_set_param_cmd { + u32 tlv_header; + u32 vdev_id; +@@ -6362,6 +6393,8 @@ int ath11k_wmi_send_peer_create_cmd(stru + int ath11k_wmi_vdev_set_param_cmd(struct ath11k *ar, u32 vdev_id, + u32 param_id, u32 param_value); + ++int ath11k_wmi_send_pdev_pkt_route(struct ath11k *ar, ++ struct ath11k_wmi_pkt_route_param *param); + int ath11k_wmi_set_sta_ps_param(struct ath11k *ar, u32 vdev_id, + u32 param, u32 param_value); + int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms); +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -20,6 +20,34 @@ + #define DP_RX_MPDU_ERR_MPDU_LEN BIT(6) + #define DP_RX_MPDU_ERR_UNENCRYPTED_FRAME BIT(7) + ++/* different supported pkt types for routing */ ++enum ath11k_routing_pkt_type { ++ ATH11K_PKT_TYPE_ARP_IPV4, ++ ATH11K_PKT_TYPE_NS_IPV6, ++ ATH11K_PKT_TYPE_IGMP_IPV4, ++ ATH11K_PKT_TYPE_MLD_IPV6, ++ ATH11K_PKT_TYPE_DHCP_IPV4, ++ ATH11K_PKT_TYPE_DHCP_IPV6, ++ ATH11K_PKT_TYPE_DNS_TCP_IPV4, ++ ATH11K_PKT_TYPE_DNS_TCP_IPV6, ++ ATH11K_PKT_TYPE_DNS_UDP_IPV4, ++ ATH11K_PKT_TYPE_DNS_UDP_IPV6, ++ ATH11K_PKT_TYPE_ICMP_IPV4, ++ ATH11K_PKT_TYPE_ICMP_IPV6, ++ ATH11K_PKT_TYPE_TCP_IPV4, ++ ATH11K_PKT_TYPE_TCP_IPV6, ++ ATH11K_PKT_TYPE_UDP_IPV4, ++ ATH11K_PKT_TYPE_UDP_IPV6, ++ ATH11K_PKT_TYPE_IPV4, ++ ATH11K_PKT_TYPE_IPV6, ++ ATH11K_PKT_TYPE_EAP, ++ ATH11K_PKT_TYPE_MAX ++}; ++ ++#define ATH11K_RX_PROTOCOL_TAG_START_OFFSET 128 ++#define ATH11K_ROUTE_WBM_RELEASE 5 ++#define ATH11K_ROUTE_EAP_METADATA (ATH11K_RX_PROTOCOL_TAG_START_OFFSET + ATH11K_PKT_TYPE_EAP) ++ + enum dp_rx_decap_type { + DP_RX_DECAP_TYPE_RAW, + DP_RX_DECAP_TYPE_NATIVE_WIFI, +@@ -56,6 +84,9 @@ void ath11k_peer_rx_tid_delete(struct at + int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id, + u8 tid, u32 ba_win_sz, u16 ssn, + enum hal_pn_type pn_type); ++int ath11k_dp_rx_pkt_type_filter(struct ath11k *ar, ++ enum ath11k_routing_pkt_type pkt_type, ++ u32 meta_data); + void ath11k_dp_htt_htc_t2h_msg_handler(struct ath11k_base *ab, + struct sk_buff *skb); + int ath11k_dp_pdev_reo_setup(struct ath11k_base *ab); +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6367,6 +6367,16 @@ static int ath11k_mac_op_start(struct ie + goto err; + } + ++ /* nss offload requires eapol packets to be routed to wbm release ring */ ++ if (ab->nss.enabled) { ++ ret = ath11k_dp_rx_pkt_type_filter(ar, ATH11K_PKT_TYPE_EAP, ++ ATH11K_ROUTE_EAP_METADATA); ++ if (ret) { ++ ath11k_err(ar->ab, "failed to configure EAP pkt route: %d\n", ret); ++ goto err; ++ } ++ } ++ + __ath11k_set_antenna(ar, ar->cfg_tx_chainmask, ar->cfg_rx_chainmask); + + /* TODO: Do we need to enable ANI? */ +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -913,6 +913,7 @@ struct ath11k_base { + struct list_head peers; + wait_queue_head_t peer_mapping_wq; + u8 mac_addr[ETH_ALEN]; ++ int userpd_id; + int irq_num[ATH11K_IRQ_NUM_MAX]; + struct ath11k_ext_irq_grp ext_irq_grp[ATH11K_EXT_IRQ_GRP_NUM_MAX]; + struct ath11k_targ_cap target_caps; diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch b/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch new file mode 100644 index 00000000000000..cfe11083939837 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch @@ -0,0 +1,1283 @@ +From 65c511e3aeb9afb84a3c6c8ac34353af91b880e9 Mon Sep 17 00:00:00 2001 +From: Sriram R +Date: Fri, 10 Jul 2020 12:50:21 +0530 +Subject: [PATCH 3/3] ath11k: add nss support + + Add NSS Offload support for ath11k driver. + +Signed-off-by: Sriram R +--- + drivers/net/wireless/ath/ath11k/ahb.c | 18 ++++++-- + drivers/net/wireless/ath/ath11k/core.c | 24 ++++++++++ + drivers/net/wireless/ath/ath11k/core.h | 14 +++++- + drivers/net/wireless/ath/ath11k/dp.c | 21 ++++++--- + drivers/net/wireless/ath/ath11k/dp.h | 1 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 17 +++++-- + drivers/net/wireless/ath/ath11k/dp_rx.h | 6 +++ + drivers/net/wireless/ath/ath11k/hal.h | 2 + + drivers/net/wireless/ath/ath11k/hal_rx.c | 10 +++- + drivers/net/wireless/ath/ath11k/mac.c | 78 +++++++++++++++++++++++++++++++- + drivers/net/wireless/ath/ath11k/peer.c | 9 +++- + drivers/net/wireless/ath/ath11k/peer.h | 6 ++- + local-symbols | 1 + + 13 files changed, 186 insertions(+), 21 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/ahb.c ++++ b/drivers/net/wireless/ath/ath11k/ahb.c +@@ -525,6 +525,12 @@ static int ath11k_ahb_config_ext_irq(str + int i, j; + int irq; + int ret; ++ bool nss_offload; ++ ++ /* TCL Completion, REO Dest, ERR, Exception and h2rxdma rings are offloaded ++ * to nss when its enabled, hence don't enable these interrupts ++ */ ++ nss_offload = ab->nss.enabled; + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; +@@ -537,20 +543,20 @@ static int ath11k_ahb_config_ext_irq(str + ath11k_ahb_ext_grp_napi_poll); + + for (j = 0; j < ATH11K_EXT_IRQ_NUM_MAX; j++) { +- if (ab->hw_params.ring_mask->tx[i] & BIT(j)) { ++ if (!nss_offload && ab->hw_params.ring_mask->tx[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + wbm2host_tx_completions_ring1 - j; + } + +- if (ab->hw_params.ring_mask->rx[i] & BIT(j)) { ++ if (!nss_offload && ab->hw_params.ring_mask->rx[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + reo2host_destination_ring1 - j; + } + +- if (ab->hw_params.ring_mask->rx_err[i] & BIT(j)) ++ if (!nss_offload && ab->hw_params.ring_mask->rx_err[i] & BIT(j)) + irq_grp->irqs[num_irq++] = reo2host_exception; + +- if (ab->hw_params.ring_mask->rx_wbm_rel[i] & BIT(j)) ++ if (!nss_offload && ab->hw_params.ring_mask->rx_wbm_rel[i] & BIT(j)) + irq_grp->irqs[num_irq++] = wbm2host_rx_release; + + if (ab->hw_params.ring_mask->reo_status[i] & BIT(j)) +@@ -563,7 +569,7 @@ static int ath11k_ahb_config_ext_irq(str + ath11k_hw_get_mac_from_pdev_id(hw, j); + } + +- if (ab->hw_params.ring_mask->host2rxdma[i] & BIT(j)) { ++ if (!nss_offload && ab->hw_params.ring_mask->host2rxdma[i] & BIT(j)) { + irq_grp->irqs[num_irq++] = + host2rxdma_host_buf_ring_mac1 - + ath11k_hw_get_mac_from_pdev_id(hw, j); +@@ -904,6 +910,7 @@ static int ath11k_ahb_setup_resources(st + } + + ab->mem = mem; ++ ab->mem_pa = mem_res->start; + ab->mem_len = resource_size(mem_res); + + return 0; +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -17,6 +17,12 @@ + #include "hif.h" + #include "wow.h" + ++unsigned int nss_offload; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++module_param_named(nss_offload, nss_offload, uint, 0644); ++MODULE_PARM_DESC(nss_offload, "Enable NSS Offload support"); ++#endif ++ + unsigned int ath11k_debug_mask; + EXPORT_SYMBOL(ath11k_debug_mask); + module_param_named(debug_mask, ath11k_debug_mask, uint, 0644); +@@ -1528,10 +1534,16 @@ static int ath11k_core_pdev_create(struc + goto err_pdev_debug; + } + ++ ret = ath11k_nss_setup(ab); ++ if (ret) { ++ ath11k_err(ab, "failed to setup nss driver interface%d", ret); ++ goto err_dp_pdev_free; ++ } ++ + ret = ath11k_mac_register(ab); + if (ret) { + ath11k_err(ab, "failed register the radio with mac80211: %d\n", ret); +- goto err_dp_pdev_free; ++ goto err_nss_tear; + } + + ret = ath11k_thermal_register(ab); +@@ -1553,6 +1565,8 @@ err_thermal_unregister: + ath11k_thermal_unregister(ab); + err_mac_unregister: + ath11k_mac_unregister(ab); ++err_nss_tear: ++ ath11k_nss_teardown(ab); + err_dp_pdev_free: + ath11k_dp_pdev_free(ab); + err_pdev_debug: +@@ -1566,6 +1580,10 @@ static void ath11k_core_pdev_destroy(str + ath11k_spectral_deinit(ab); + ath11k_thermal_unregister(ab); + ath11k_mac_unregister(ab); ++ ++ ath11k_nss_teardown(ab); ++ ab->nss.enabled = false; ++ + ath11k_hif_irq_disable(ab); + ath11k_dp_pdev_free(ab); + ath11k_debugfs_pdev_destroy(ab); +@@ -1772,6 +1790,10 @@ static int ath11k_core_reconfigure_on_cr + int ret; + + mutex_lock(&ab->core_lock); ++ ++ ath11k_nss_teardown(ab); ++ ab->nss.enabled = false; ++ + ath11k_thermal_unregister(ab); + ath11k_hif_irq_disable(ab); + ath11k_dp_pdev_free(ab); +@@ -2095,6 +2117,10 @@ int ath11k_core_pre_init(struct ath11k_b + ath11k_err(ab, "failed to get hw params: %d\n", ret); + return ret; + } ++ ab->nss.enabled = nss_offload; ++ ++ if (nss_offload) ++ ab->nss.stats_enabled = 1; + + return 0; + } +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -29,6 +29,7 @@ + #include "dbring.h" + #include "spectral.h" + #include "wow.h" ++#include "nss.h" + + #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) + +@@ -381,6 +382,9 @@ struct ath11k_vif { + #endif /* CPTCFG_ATH11K_DEBUGFS */ + + struct ath11k_mgmt_frame_stats mgmt_stats; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ struct arvif_nss nss; ++#endif + }; + + struct ath11k_vif_iter { +@@ -520,6 +524,9 @@ struct ath11k_sta { + #endif + + bool use_4addr_set; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ struct ath11k_nss_sta_stats *nss_stats; ++#endif + u16 tcl_metadata; + + /* Protected with ar->data_lock */ +@@ -610,6 +617,9 @@ struct ath11k { + struct ieee80211_hw *hw; + struct ieee80211_ops *ops; + struct ath11k_pdev_wmi *wmi; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ struct ath11k_nss nss; ++#endif + struct ath11k_pdev_dp dp; + u8 mac_addr[ETH_ALEN]; + struct ath11k_he ar_he; +@@ -827,6 +837,7 @@ struct ath11k_soc_dp_tx_err_stats { + * idr unavailable etc. + */ + atomic_t misc_fail; ++ atomic_t nss_tx_fail; + }; + + struct ath11k_soc_dp_stats { +@@ -868,9 +879,11 @@ struct ath11k_base { + struct ath11k_htc htc; + + struct ath11k_dp dp; ++ struct ath11k_soc_nss nss; + + void __iomem *mem; + void __iomem *mem_ce; ++ dma_addr_t mem_pa; + unsigned long mem_len; + + struct { +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -47,12 +47,17 @@ int ath11k_dp_peer_setup(struct ath11k * + struct ath11k_peer *peer; + u32 reo_dest; + int ret = 0, tid; ++ bool rx_hash_enable = DP_RX_HASH_ENABLE; ++ ++ /* RX Hash based steering is disabled for NSS Offload */ ++ if (ar->ab->nss.enabled) ++ rx_hash_enable = DP_RX_HASH_DISABLE; + + /* NOTE: reo_dest ring id starts from 1 unlike mac_id which starts from 0 */ + reo_dest = ar->dp.mac_id + 1; + ret = ath11k_wmi_set_peer_param(ar, addr, vdev_id, + WMI_PEER_SET_DEFAULT_ROUTING, +- DP_RX_HASH_ENABLE | (reo_dest << 1)); ++ rx_hash_enable | (reo_dest << 1)); + + if (ret) { + ath11k_warn(ab, "failed to set default routing %d peer :%pM vdev_id :%d\n", +@@ -132,6 +137,18 @@ static int ath11k_dp_srng_calculate_msi_ + { + const u8 *grp_mask; + ++ if (ab->nss.enabled) { ++ switch (type) { ++ case HAL_REO_STATUS: ++ case HAL_RXDMA_MONITOR_STATUS: ++ case HAL_RXDMA_MONITOR_DST: ++ case HAL_RXDMA_MONITOR_BUF: ++ break; ++ default: ++ return -ENOENT; ++ } ++ } ++ + switch (type) { + case HAL_WBM2SW_RELEASE: + if (ring_num == DP_RX_RELEASE_RING_NUM) { +@@ -778,14 +795,16 @@ int ath11k_dp_service_srng(struct ath11k + int work_done = 0; + int i, j; + int tot_work_done = 0; ++ bool nss_offload; + +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) { +- if (BIT(ab->hw_params.hal_params->tcl2wbm_rbm_map[i].wbm_ring_num) & +- ab->hw_params.ring_mask->tx[grp_id]) +- ath11k_dp_tx_completion_handler(ab, i); ++ nss_offload = ab->nss.enabled; ++ ++ if (!nss_offload && ab->hw_params.ring_mask->tx[grp_id]) { ++ i = __fls(ab->hw_params.ring_mask->tx[grp_id]); ++ ath11k_dp_tx_completion_handler(ab, i); + } + +- if (ab->hw_params.ring_mask->rx_err[grp_id]) { ++ if (!nss_offload && ab->hw_params.ring_mask->rx_err[grp_id]) { + work_done = ath11k_dp_process_rx_err(ab, napi, budget); + budget -= work_done; + tot_work_done += work_done; +@@ -793,7 +812,7 @@ int ath11k_dp_service_srng(struct ath11k + goto done; + } + +- if (ab->hw_params.ring_mask->rx_wbm_rel[grp_id]) { ++ if (!nss_offload && ab->hw_params.ring_mask->rx_wbm_rel[grp_id]) { + work_done = ath11k_dp_rx_process_wbm_err(ab, + napi, + budget); +@@ -804,7 +823,7 @@ int ath11k_dp_service_srng(struct ath11k + goto done; + } + +- if (ab->hw_params.ring_mask->rx[grp_id]) { ++ if (!nss_offload && ab->hw_params.ring_mask->rx[grp_id]) { + i = fls(ab->hw_params.ring_mask->rx[grp_id]) - 1; + work_done = ath11k_dp_process_rx(ab, i, napi, + budget); +@@ -838,7 +857,7 @@ int ath11k_dp_service_srng(struct ath11k + if (ab->hw_params.ring_mask->reo_status[grp_id]) + ath11k_dp_process_reo_status(ab); + +- for (i = 0; i < ab->num_radios; i++) { ++ for (i = 0; !nss_offload && i < ab->num_radios; i++) { + for (j = 0; j < ab->hw_params.num_rxmda_per_pdev; j++) { + int id = i * ab->hw_params.num_rxmda_per_pdev + j; + +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -194,6 +194,7 @@ struct ath11k_pdev_dp { + #define DP_AVG_MSDUS_PER_MPDU 4 + + #define DP_RX_HASH_ENABLE 1 /* Enable hash based Rx steering */ ++#define DP_RX_HASH_DISABLE 0 /* Disable hash based Rx steering */ + + #define DP_BA_WIN_SZ_MAX 256 + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -17,6 +17,7 @@ + #include "hal_rx.h" + #include "dp_tx.h" + #include "peer.h" ++#include "nss.h" + + #define ATH11K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ) + +@@ -213,8 +214,8 @@ static inline u8 ath11k_dp_rx_h_mpdu_sta + return ab->hw_params.hw_ops->rx_desc_get_mpdu_tid(desc); + } + +-static inline u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab, +- struct hal_rx_desc *desc) ++u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) + { + return ab->hw_params.hw_ops->rx_desc_get_mpdu_peer_id(desc); + } +@@ -225,8 +226,8 @@ static inline u8 ath11k_dp_rx_h_msdu_end + return ab->hw_params.hw_ops->rx_desc_get_l3_pad_bytes(desc); + } + +-static inline bool ath11k_dp_rx_h_msdu_end_first_msdu(struct ath11k_base *ab, +- struct hal_rx_desc *desc) ++bool ath11k_dp_rx_h_msdu_end_first_msdu(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) + { + return ab->hw_params.hw_ops->rx_desc_get_first_msdu(desc); + } +@@ -283,7 +284,7 @@ static inline void ath11k_dp_rxdesc_set_ + ab->hw_params.hw_ops->rx_desc_set_msdu_len(desc, len); + } + +-static bool ath11k_dp_rx_h_attn_is_mcbc(struct ath11k_base *ab, ++bool ath11k_dp_rx_h_attn_is_mcbc(struct ath11k_base *ab, + struct hal_rx_desc *desc) + { + struct rx_attention *attn = ath11k_dp_rx_get_attention(ab, desc); +@@ -498,7 +499,9 @@ static int ath11k_dp_rxdma_pdev_buf_setu + struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring; + int i; + +- ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_BUF); ++ /* RXDMA BUF ring is offloaded to NSS */ ++ if (!ar->ab->nss.enabled) ++ ath11k_dp_rxdma_ring_buf_setup(ar, rx_ring, HAL_RXDMA_BUF); + + if (ar->ab->hw_params.rxdma1_enable) { + rx_ring = &dp->rxdma_mon_buf_ring; +@@ -1893,7 +1896,7 @@ static void ath11k_dp_rx_h_csum_offload( + CHECKSUM_NONE : CHECKSUM_UNNECESSARY; + } + +-static int ath11k_dp_rx_crypto_mic_len(struct ath11k *ar, ++int ath11k_dp_rx_crypto_mic_len(struct ath11k *ar, + enum hal_encrypt_type enctype) + { + switch (enctype) { +@@ -1920,7 +1923,7 @@ static int ath11k_dp_rx_crypto_mic_len(s + return 0; + } + +-static int ath11k_dp_rx_crypto_param_len(struct ath11k *ar, ++int ath11k_dp_rx_crypto_param_len(struct ath11k *ar, + enum hal_encrypt_type enctype) + { + switch (enctype) { +@@ -1948,7 +1951,7 @@ static int ath11k_dp_rx_crypto_param_len + return 0; + } + +-static int ath11k_dp_rx_crypto_icv_len(struct ath11k *ar, ++int ath11k_dp_rx_crypto_icv_len(struct ath11k *ar, + enum hal_encrypt_type enctype) + { + switch (enctype) { +@@ -5239,7 +5242,7 @@ int ath11k_dp_rx_process_mon_status(stru + struct sk_buff *skb; + struct sk_buff_head skb_list; + struct ath11k_peer *peer; +- struct ath11k_sta *arsta; ++ struct ath11k_sta *arsta = NULL; + int num_buffs_reaped = 0; + u32 rx_buf_sz; + u16 log_type; +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -126,4 +126,16 @@ int ath11k_peer_rx_frag_setup(struct ath + int ath11k_dp_rx_pktlog_start(struct ath11k_base *ab); + int ath11k_dp_rx_pktlog_stop(struct ath11k_base *ab, bool stop_timer); + ++int ath11k_dp_rx_crypto_mic_len(struct ath11k *ar, ++ enum hal_encrypt_type enctype); ++int ath11k_dp_rx_crypto_param_len(struct ath11k *ar, ++ enum hal_encrypt_type enctype); ++int ath11k_dp_rx_crypto_icv_len(struct ath11k *ar, ++ enum hal_encrypt_type enctype); ++bool ath11k_dp_rx_h_msdu_end_first_msdu(struct ath11k_base *ab, ++ struct hal_rx_desc *desc); ++bool ath11k_dp_rx_h_attn_is_mcbc(struct ath11k_base *ab, ++ struct hal_rx_desc *desc); ++u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab, ++ struct hal_rx_desc *desc); + #endif /* ATH11K_DP_RX_H */ +--- a/drivers/net/wireless/ath/ath11k/hal.h ++++ b/drivers/net/wireless/ath/ath11k/hal.h +@@ -424,6 +424,8 @@ enum hal_srng_ring_id { + #define HAL_SRNG_RING_ID_MAX (HAL_SRNG_RING_ID_UMAC_ID_END + \ + HAL_SRNG_NUM_LMAC_RINGS) + ++#define HAL_SRNG_REO_ALTERNATE_SELECT 0x7 ++ + enum hal_ring_type { + HAL_REO_DST, + HAL_REO_EXCEPTION, +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -24,6 +24,7 @@ + #include "debugfs_sta.h" + #include "hif.h" + #include "wow.h" ++#include "nss.h" + + #define CHAN2G(_channel, _freq, _flags) { \ + .band = NL80211_BAND_2GHZ, \ +@@ -1603,6 +1604,11 @@ static void ath11k_control_beaconing(str + lockdep_assert_held(&arvif->ar->conf_mutex); + + if (!info->enable_beacon) { ++ ++ ret = ath11k_nss_vdev_down(arvif); ++ if(ret) ++ ath11k_warn(ar->ab, "failure in nss vdev down %d\r\n",ret); ++ + ret = ath11k_wmi_vdev_down(ar, arvif->vdev_id); + if (ret) + ath11k_warn(ar->ab, "failed to down vdev_id %i: %d\n", +@@ -1642,6 +1648,12 @@ static void ath11k_control_beaconing(str + + arvif->is_up = true; + ++ ret = ath11k_nss_vdev_up(arvif); ++ if(ret) { ++ ath11k_warn(ar->ab, "failure in nss vdev up %d\r\n",ret); ++ return; ++ } ++ + ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev %d up\n", arvif->vdev_id); + } + +@@ -3075,6 +3087,12 @@ static void ath11k_bss_assoc(struct ieee + "vdev %d up (associated) bssid %pM aid %d\n", + arvif->vdev_id, bss_conf->bssid, vif->cfg.aid); + ++ ret = ath11k_nss_vdev_up(arvif); ++ if(ret) { ++ ath11k_warn(ar->ab, "failure in nss vdev up %d\r\n",ret); ++ return; ++ } ++ + spin_lock_bh(&ar->ab->base_lock); + + peer = ath11k_peer_find(ar->ab, arvif->vdev_id, arvif->bssid); +@@ -3117,6 +3135,10 @@ static void ath11k_bss_disassoc(struct i + + lockdep_assert_held(&ar->conf_mutex); + ++ ret = ath11k_nss_vdev_down(arvif); ++ if(ret) ++ ath11k_warn(ar->ab, "failure in nss vdev down %d\r\n",ret); ++ + ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "vdev %i disassoc bssid %pM\n", + arvif->vdev_id, arvif->bssid); + +@@ -3397,6 +3419,28 @@ static int ath11k_mac_config_obss_pd(str + return 0; + } + ++static void ath11k_mac_op_nss_bss_info_changed(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ u32 changed) ++{ ++ struct ath11k *ar = hw->priv; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ int ret = 0; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "Setting ap_isolate %d to NSS\n", ++ arvif->vif->bss_conf.nss_ap_isolate); ++ if (changed & BSS_CHANGED_NSS_AP_ISOLATE) { ++ ret = ath11k_nss_vdev_set_cmd(arvif, ATH11K_NSS_WIFI_VDEV_CFG_AP_BRIDGE_CMD, ++ !arvif->vif->bss_conf.nss_ap_isolate); ++ if(ret) ++ ath11k_warn(ar->ab, "failed to set ap_isolate in nss %d\n", ret); ++ } ++ ++ mutex_unlock(&ar->conf_mutex); ++} ++ + static void ath11k_mac_op_bss_info_changed(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *info, +@@ -4295,6 +4339,26 @@ static int ath11k_mac_op_set_key(struct + + spin_lock_bh(&ab->base_lock); + peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr); ++ ++ /* TODO: Check if vdev specific security cfg is mandatory */ ++ ret = ath11k_nss_vdev_set_cmd(arvif, ATH11K_NSS_WIFI_VDEV_SECURITY_TYPE_CMD, key->cipher); ++ if (ret) { ++ ath11k_warn(ab, "failure to set vdev security type in nss"); ++ goto unlock; ++ } ++ ++ ret = ath11k_nss_set_peer_sec_type(ar, peer, key); ++ if (ret) { ++ ath11k_warn(ab, "failure to set peer security type in nss"); ++ goto unlock; ++ } ++ ++ ret = ath11k_nss_set_peer_authorize(ar, peer->peer_id); ++ if (ret) { ++ ath11k_warn(ab, "failure to authorize peer in nss"); ++ goto unlock; ++ } ++ + if (peer && cmd == SET_KEY) { + peer->keys[key->keyidx] = key; + if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) { +@@ -4333,9 +4397,8 @@ static int ath11k_mac_op_set_key(struct + break; + } + } +- ++unlock: + spin_unlock_bh(&ab->base_lock); +- + exit: + mutex_unlock(&ar->conf_mutex); + return ret; +@@ -6216,10 +6279,16 @@ static void ath11k_mac_op_tx(struct ieee + if (control->sta) + arsta = ath11k_sta_to_arsta(control->sta); + +- ret = ath11k_dp_tx(ar, arvif, arsta, skb); ++ if (ar->ab->nss.enabled) { ++ arvif->ar->ab->nss.debug_mode = true; ++ ret = ath11k_nss_tx(arvif, skb); ++ } ++ else ++ ret = ath11k_dp_tx(ar, arvif, arsta, skb); + if (unlikely(ret)) { + ath11k_warn(ar->ab, "failed to transmit frame %d\n", ret); + ieee80211_free_txskb(ar->hw, skb); ++ return; + } + } + +@@ -6241,6 +6310,8 @@ static int ath11k_mac_config_mon_status_ + + if (enable) { + tlv_filter = ath11k_mac_mon_status_filter_default; ++ ath11k_nss_ext_rx_stats(ar->ab, &tlv_filter); ++ + if (ath11k_debugfs_rx_filter(ar)) + tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); + } +@@ -6539,7 +6610,7 @@ static int ath11k_mac_setup_vdev_create_ + return 0; + } + +-static void ath11k_mac_op_update_vif_offload(struct ieee80211_hw *hw, ++static int ath11k_mac_op_update_vif_offload(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) + { + struct ath11k *ar = hw->priv; +@@ -6585,6 +6656,8 @@ static void ath11k_mac_op_update_vif_off + arvif->vdev_id, ret); + vif->offload_flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED; + } ++ ++ return ret; + } + + static bool ath11k_mac_vif_ap_active_any(struct ath11k_base *ab) +@@ -6715,6 +6788,8 @@ static int ath11k_mac_vdev_delete(struct + + reinit_completion(&ar->vdev_delete_done); + ++ ath11k_nss_vdev_delete(arvif); ++ + ret = ath11k_wmi_vdev_delete(ar, arvif->vdev_id); + if (ret) { + ath11k_warn(ar->ab, "failed to delete WMI vdev %d: %d\n", +@@ -6855,7 +6930,34 @@ static int ath11k_mac_op_add_interface(s + list_add(&arvif->list, &ar->arvifs); + spin_unlock_bh(&ar->data_lock); + +- ath11k_mac_op_update_vif_offload(hw, vif); ++ ret = ath11k_nss_vdev_create(arvif); ++ if(ret) { ++ ath11k_warn(ab, "failed to create nss vdev %d\n", ret); ++ goto err_vdev_del; ++ } ++ ++ if (ath11k_mac_op_update_vif_offload(hw, vif)) ++ goto err_vdev_del; ++ ++ if (vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) ++ param_value = ATH11K_HW_TXRX_ETHERNET; ++ else if (test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags)) ++ param_value = ATH11K_HW_TXRX_RAW; ++ else ++ param_value = ATH11K_HW_TXRX_NATIVE_WIFI; ++ ++ ret = ath11k_nss_vdev_set_cmd(arvif, ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, param_value); ++ ++ if(ret) { ++ ath11k_warn(ab, "failed to set encap type in nss %d\n", ret); ++ goto err_vdev_del; ++ } ++ ++ ret = ath11k_nss_vdev_set_cmd(arvif, ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, param_value); ++ if(ret) { ++ ath11k_warn(ab, "failed to set decap type in nss %d\n", ret); ++ goto err_vdev_del; ++ } + + nss = get_num_chains(ar->cfg_tx_chainmask) ? : 1; + ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, +@@ -6979,6 +7081,7 @@ err_peer_del: + } + + err_vdev_del: ++ ath11k_nss_vdev_delete(arvif); + ath11k_mac_vdev_delete(ar, arvif); + spin_lock_bh(&ar->data_lock); + list_del(&arvif->list); +@@ -7489,6 +7592,10 @@ ath11k_mac_update_vif_chan(struct ath11k + arvif->vdev_id, ret); + continue; + } ++ ++ ret = ath11k_nss_vdev_up(arvif); ++ if(ret) ++ ath11k_warn(ar->ab, "failure in nss vdev up %d\r\n",ret); + } + + /* Restart the internal monitor vdev on new channel */ +@@ -8717,6 +8824,8 @@ static void ath11k_mac_op_sta_statistics + sinfo->signal_avg = ewma_avg_rssi_read(&arsta->avg_rssi) + + ATH11K_DEFAULT_NOISE_FLOOR; + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); ++ ++ ath11k_nss_update_sta_stats(sinfo, sta, arsta); + } + + #if IS_ENABLED(CONFIG_IPV6) +@@ -9136,6 +9245,7 @@ static const struct ieee80211_ops ath11k + .update_vif_offload = ath11k_mac_op_update_vif_offload, + .config = ath11k_mac_op_config, + .bss_info_changed = ath11k_mac_op_bss_info_changed, ++ .nss_bss_info_changed = ath11k_mac_op_nss_bss_info_changed, + .configure_filter = ath11k_mac_op_configure_filter, + .hw_scan = ath11k_mac_op_hw_scan, + .cancel_hw_scan = ath11k_mac_op_cancel_hw_scan, +@@ -9521,7 +9631,8 @@ static int __ath11k_mac_register(struct + ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW); + ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER); + ieee80211_hw_set(ar->hw, SUPPORTS_AMSDU_IN_AMPDU); +- ieee80211_hw_set(ar->hw, USES_RSS); ++ if(!ab->nss.enabled) ++ ieee80211_hw_set(ar->hw, USES_RSS); + } + + ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; +@@ -9636,6 +9747,9 @@ static int __ath11k_mac_register(struct + ab->hw_params.bios_sar_capa) + ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; + ++ if (ab->nss.enabled) ++ ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); ++ + ret = ieee80211_register_hw(ar->hw); + if (ret) { + ath11k_err(ar->ab, "ieee80211 registration failed: %d\n", ret); +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -7,6 +7,7 @@ + #include "core.h" + #include "peer.h" + #include "debug.h" ++#include "nss.h" + + static struct ath11k_peer *ath11k_peer_find_list_by_id(struct ath11k_base *ab, + int peer_id) +@@ -136,6 +137,8 @@ void ath11k_peer_map_event(struct ath11k + ether_addr_copy(peer->addr, mac_addr); + list_add(&peer->list, &ab->peers); + wake_up(&ab->peer_mapping_wq); ++ if (ab->nss.enabled) ++ ath11k_nss_peer_create(ab, peer); + } + + ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "peer map vdev %d peer %pM id %d\n", +@@ -298,17 +301,13 @@ static int __ath11k_peer_delete(struct a + + lockdep_assert_held(&ar->conf_mutex); + ++ reinit_completion(&ar->peer_delete_done); ++ ath11k_nss_peer_delete(ar->ab, addr); ++ + mutex_lock(&ab->tbl_mtx_lock); + spin_lock_bh(&ab->base_lock); + + peer = ath11k_peer_find_by_addr(ab, addr); +- /* Check if the found peer is what we want to remove. +- * While the sta is transitioning to another band we may +- * have 2 peer with the same addr assigned to different +- * vdev_id. Make sure we are deleting the correct peer. +- */ +- if (peer && peer->vdev_id == vdev_id) +- ath11k_peer_rhash_delete(ab, peer); + + /* Fallback to peer list search if the correct peer can't be found. + * Skip the deletion of the peer from the rhash since it has already +@@ -327,10 +326,17 @@ static int __ath11k_peer_delete(struct a + return -EINVAL; + } + ++ /* Check if the found peer is what we want to remove. ++ * While the sta is transitioning to another band we may ++ * have 2 peer with the same addr assigned to different ++ * vdev_id. Make sure we are deleting the correct peer. ++ */ ++ if (peer && peer->vdev_id == vdev_id) ++ ath11k_peer_rhash_delete(ab, peer); ++ + spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); + +- reinit_completion(&ar->peer_delete_done); + + ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id); + if (ret) { +@@ -446,6 +452,7 @@ int ath11k_peer_create(struct ath11k *ar + peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; + peer->vif = arvif->vif; + ++ + if (sta) { + arsta = ath11k_sta_to_arsta(sta); + arsta->tcl_metadata |= FIELD_PREP(HTT_TCL_META_DATA_TYPE, 0) | +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -17,6 +17,7 @@ struct ath11k_peer { + u16 ast_hash; + u8 pdev_idx; + u16 hw_peer_id; ++ struct ath11k_nss_peer nss; + + /* protected by ab->data_lock */ + struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; +--- a/drivers/net/wireless/ath/ath11k/pci.c ++++ b/drivers/net/wireless/ath/ath11k/pci.c +@@ -570,6 +570,7 @@ static int ath11k_pci_claim(struct ath11 + } + + ab->mem_ce = ab->mem; ++ ab->mem_pa = pci_resource_start(pdev, ATH11K_PCI_BAR_NUM); + + ath11k_dbg(ab, ATH11K_DBG_BOOT, "pci_mem 0x%p\n", ab->mem); + return 0; +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -10,11 +10,10 @@ + #include "core.h" + #include "debug.h" + #include "wmi.h" +-#include "hal_rx.h" + #include "dp_tx.h" + #include "debugfs_htt_stats.h" +-#include "peer.h" + #include "hif.h" ++#include "qmi.h" + + static const char *htt_bp_umac_ring[HTT_SW_UMAC_RING_IDX_MAX] = { + "REO2SW1_RING", +@@ -663,6 +662,7 @@ static ssize_t ath11k_write_extd_rx_stat + HTT_RX_FP_DATA_FILTER_FLASG3; + } else { + tlv_filter = ath11k_mac_mon_status_filter_default; ++ ath11k_nss_ext_rx_stats(ar->ab, &tlv_filter); + } + + ar->debug.rx_filter = tlv_filter.rx_filter; +@@ -1669,72 +1669,6 @@ static const struct file_operations fops + .open = simple_open + }; + +-int ath11k_debugfs_register(struct ath11k *ar) +-{ +- struct ath11k_base *ab = ar->ab; +- char pdev_name[10]; +- char buf[100] = {0}; +- +- snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); +- +- ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); +- if (IS_ERR(ar->debug.debugfs_pdev)) +- return PTR_ERR(ar->debug.debugfs_pdev); +- +- /* Create a symlink under ieee80211/phy* */ +- snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); +- debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); +- +- ath11k_debugfs_htt_stats_init(ar); +- +- ath11k_debugfs_fw_stats_init(ar); +- +- debugfs_create_file("ext_tx_stats", 0644, +- ar->debug.debugfs_pdev, ar, +- &fops_extd_tx_stats); +- debugfs_create_file("ext_rx_stats", 0644, +- ar->debug.debugfs_pdev, ar, +- &fops_extd_rx_stats); +- debugfs_create_file("pktlog_filter", 0644, +- ar->debug.debugfs_pdev, ar, +- &fops_pktlog_filter); +- debugfs_create_file("fw_dbglog_config", 0600, +- ar->debug.debugfs_pdev, ar, +- &fops_fw_dbglog); +- debugfs_create_file("dump_mgmt_stats", 0644, +- ar->debug.debugfs_pdev, ar, +- &fops_dump_mgmt_stats); +- +- if (ar->hw->wiphy->bands[NL80211_BAND_5GHZ]) { +- debugfs_create_file("dfs_simulate_radar", 0200, +- ar->debug.debugfs_pdev, ar, +- &fops_simulate_radar); +- debugfs_create_bool("dfs_block_radar_events", 0200, +- ar->debug.debugfs_pdev, +- &ar->dfs_block_radar_events); +- } +- +- if (ab->hw_params.dbr_debug_support) +- debugfs_create_file("enable_dbr_debug", 0200, ar->debug.debugfs_pdev, +- ar, &fops_dbr_debug); +- +- debugfs_create_file("ps_state_enable", 0600, ar->debug.debugfs_pdev, ar, +- &fops_ps_state_enable); +- +- if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT, +- ar->ab->wmi_ab.svc_map)) { +- debugfs_create_file("ps_timekeeper_enable", 0600, +- ar->debug.debugfs_pdev, ar, +- &fops_ps_timekeeper_enable); +- +- debugfs_create_file("reset_ps_duration", 0200, +- ar->debug.debugfs_pdev, ar, +- &fops_reset_ps_duration); +- } +- +- return 0; +-} +- + void ath11k_debugfs_unregister(struct ath11k *ar) + { + struct ath11k_debug_dbr *dbr_debug; +@@ -1977,6 +1911,144 @@ static const struct file_operations ath1 + .open = simple_open + }; + ++static ssize_t ath11k_write_nss_stats(struct file *file, ++ const char __user *ubuf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k *ar = file->private_data; ++ struct ath11k_base *ab = ar->ab; ++ u32 nss_stats; ++ int ret; ++ ++ if (!ab->nss.enabled) { ++ ath11k_warn(ab, "nss offload not enabled\n"); ++ return -EINVAL; ++ } ++ ++ if (kstrtouint_from_user(ubuf, count, 0, &nss_stats)) ++ return -EINVAL; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ if (ar->state != ATH11K_STATE_ON) { ++ ret = -ENETDOWN; ++ goto out; ++ } ++ ++ if (nss_stats == ab->nss.stats_enabled) { ++ ret = count; ++ goto out; ++ } ++ ++ if (nss_stats > 0) { ++ ab->nss.stats_enabled = 1; ++ ath11k_nss_peer_stats_enable(ar); ++ } else { ++ ab->nss.stats_enabled = 0; ++ ath11k_nss_peer_stats_disable(ar); ++ } ++ ++ ret = count; ++out: ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++} ++ ++static ssize_t ath11k_read_nss_stats(struct file *file, ++ char __user *ubuf, ++ size_t count, loff_t *ppos) ++ ++{ ++ char buf[32] = {0}; ++ struct ath11k *ar = file->private_data; ++ struct ath11k_base *ab = ar->ab; ++ int len = 0; ++ ++ mutex_lock(&ar->conf_mutex); ++ len = scnprintf(buf, sizeof(buf) - len, "%08x\n", ++ ab->nss.stats_enabled); ++ mutex_unlock(&ar->conf_mutex); ++ ++ return simple_read_from_buffer(ubuf, count, ppos, buf, len); ++} ++ ++static const struct file_operations fops_nss_stats = { ++ .read = ath11k_read_nss_stats, ++ .write = ath11k_write_nss_stats, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++int ath11k_debugfs_register(struct ath11k *ar) ++{ ++ struct ath11k_base *ab = ar->ab; ++ char pdev_name[10]; ++ char buf[100] = {0}; ++ ++ snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); ++ ++ ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); ++ if (IS_ERR(ar->debug.debugfs_pdev)) ++ return PTR_ERR(ar->debug.debugfs_pdev); ++ ++ /* Create a symlink under ieee80211/phy* */ ++ snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); ++ debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); ++ ++ ath11k_debugfs_htt_stats_init(ar); ++ ++ ath11k_debugfs_fw_stats_init(ar); ++ ++ debugfs_create_file("ext_tx_stats", 0644, ++ ar->debug.debugfs_pdev, ar, ++ &fops_extd_tx_stats); ++ debugfs_create_file("ext_rx_stats", 0644, ++ ar->debug.debugfs_pdev, ar, ++ &fops_extd_rx_stats); ++ debugfs_create_file("pktlog_filter", 0644, ++ ar->debug.debugfs_pdev, ar, ++ &fops_pktlog_filter); ++ debugfs_create_file("fw_dbglog_config", 0600, ++ ar->debug.debugfs_pdev, ar, ++ &fops_fw_dbglog); ++ debugfs_create_file("dump_mgmt_stats", 0644, ++ ar->debug.debugfs_pdev, ar, ++ &fops_dump_mgmt_stats); ++ ++ if (ar->hw->wiphy->bands[NL80211_BAND_5GHZ]) { ++ debugfs_create_file("dfs_simulate_radar", 0200, ++ ar->debug.debugfs_pdev, ar, ++ &fops_simulate_radar); ++ debugfs_create_bool("dfs_block_radar_events", 0200, ++ ar->debug.debugfs_pdev, ++ &ar->dfs_block_radar_events); ++ } ++ ++ if (ab->hw_params.dbr_debug_support) ++ debugfs_create_file("enable_dbr_debug", 0200, ar->debug.debugfs_pdev, ++ ar, &fops_dbr_debug); ++ ++ debugfs_create_file("ps_state_enable", 0600, ar->debug.debugfs_pdev, ar, ++ &fops_ps_state_enable); ++ ++ if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT, ++ ar->ab->wmi_ab.svc_map)) { ++ debugfs_create_file("ps_timekeeper_enable", 0600, ++ ar->debug.debugfs_pdev, ar, ++ &fops_ps_timekeeper_enable); ++ ++ debugfs_create_file("reset_ps_duration", 0200, ++ ar->debug.debugfs_pdev, ar, ++ &fops_reset_ps_duration); ++ } ++ ++ if (ab->nss.enabled) ++ debugfs_create_file("nss_peer_stats_config", 0644, ++ ar->debug.debugfs_pdev, ar, &fops_nss_stats); ++ ++ return 0; ++} + void ath11k_debugfs_add_interface(struct ath11k_vif *arvif) + { + struct ath11k_base *ab = arvif->ar->ab; +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -12,7 +12,7 @@ + #include "peer.h" + #include "mac.h" + +-static enum hal_tcl_encap_type ++enum hal_tcl_encap_type + ath11k_dp_tx_get_encap_type(struct ath11k_vif *arvif, struct sk_buff *skb) + { + struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); +--- a/drivers/net/wireless/ath/ath11k/dp_tx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.h +@@ -38,6 +38,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str + int mac_id, enum hal_ring_type ring_type, + int rx_buf_size, + struct htt_rx_ring_tlv_filter *tlv_filter); ++enum hal_tcl_encap_type ++ath11k_dp_tx_get_encap_type(struct ath11k_vif *arvif, struct sk_buff *skb); + + int ath11k_dp_tx_htt_rx_full_mon_setup(struct ath11k_base *ab, int mac_id, + bool config); +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -8,6 +8,8 @@ + #include "nss.h" + #include "core.h" + #include "peer.h" ++#include "dp_rx.h" ++#include "dp_tx.h" + #include "hif.h" + #include "wmi.h" + #include "../../../../../net/mac80211/sta_info.h" +@@ -465,7 +467,7 @@ deliver_amsdu: + + /* create list containing all the subframes */ + ieee80211_amsdu_to_8023s(skb, &subframe_list, NULL, +- vif->type, 0, NULL, NULL); ++ vif->type, 0, NULL, NULL, false); + + /* This shouldn't happen, indicating error during defragmentation */ + if (skb_queue_empty(&subframe_list)) +@@ -657,12 +659,14 @@ drop: + return -EINVAL; + } + +-int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, int cmd, int val) ++int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, enum ath11k_nss_vdev_cmd nss_cmd, ++ int val) + { + struct nss_wifi_vdev_msg *vdev_msg = NULL; + struct nss_wifi_vdev_cmd_msg *vdev_cmd; + struct ath11k *ar = arvif->ar; + nss_tx_status_t status; ++ int cmd; + + if (!ar->ab->nss.enabled) + return 0; +@@ -675,6 +679,22 @@ int ath11k_nss_vdev_set_cmd(struct ath11 + if (!vdev_msg) + return -ENOMEM; + ++ switch(nss_cmd) { ++ case ATH11K_NSS_WIFI_VDEV_CFG_AP_BRIDGE_CMD: ++ cmd = NSS_WIFI_VDEV_CFG_AP_BRIDGE_CMD; ++ break; ++ case ATH11K_NSS_WIFI_VDEV_SECURITY_TYPE_CMD: ++ cmd = NSS_WIFI_VDEV_SECURITY_TYPE_CMD; ++ break; ++ case ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD: ++ cmd = NSS_WIFI_VDEV_ENCAP_TYPE_CMD; ++ break; ++ case ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD: ++ cmd = NSS_WIFI_VDEV_DECAP_TYPE_CMD; ++ break; ++ default: ++ return -EINVAL; ++ } + /* TODO: Convert to function for conversion in case of many + * such commands + */ +@@ -1136,7 +1156,6 @@ void ath11k_nss_update_sta_stats(struct + { + struct sta_info *stainfo; + struct ath11k_peer *peer; +- int tid_idx; + struct ath11k *ar = arsta->arvif->ar; + struct ath11k_base *ab = ar->ab; + +@@ -1230,6 +1249,9 @@ void ath11k_nss_update_sta_rxrate(struct + if (!ab->nss.enabled) + return; + ++ if (!ieee80211_is_data(__cpu_to_le16(ppdu_info->frame_control))) ++ return; ++ + if (!peer->nss.nss_stats) + return; + +@@ -1289,7 +1311,7 @@ void ath11k_nss_update_sta_rxrate(struct + peer->nss.nss_stats->rxrate.mcs = mcs; + peer->nss.nss_stats->rxrate.flags = RATE_INFO_FLAGS_HE_MCS; + peer->nss.nss_stats->rxrate.he_dcm = ppdu_info->dcm; +- peer->nss.nss_stats->rxrate.he_gi = ath11k_he_gi_to_nl80211_he_gi(ppdu_info->gi); ++ peer->nss.nss_stats->rxrate.he_gi = ath11k_mac_he_gi_to_nl80211_he_gi(ppdu_info->gi); + peer->nss.nss_stats->rxrate.he_ru_alloc = ppdu_info->ru_alloc; + break; + } +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -101,6 +101,13 @@ do { \ + u64_stats_update_end(&tstats->syncp); \ + } while (0) + ++enum ath11k_nss_vdev_cmd { ++ ATH11K_NSS_WIFI_VDEV_CFG_AP_BRIDGE_CMD, ++ ATH11K_NSS_WIFI_VDEV_SECURITY_TYPE_CMD, ++ ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, ++ ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, ++}; ++ + enum ath11k_nss_opmode { + ATH11K_NSS_OPMODE_UNKNOWN, + ATH11K_NSS_OPMODE_AP, +@@ -192,7 +199,8 @@ struct ath11k_soc_nss { + + #ifdef CPTCFG_ATH11K_NSS_SUPPORT + int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb); +-int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, int cmd, int val); ++int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, enum ath11k_nss_vdev_cmd cmd, ++ int val); + int ath11k_nss_vdev_create(struct ath11k_vif *arvif); + void ath11k_nss_vdev_delete(struct ath11k_vif *arvif); + int ath11k_nss_vdev_up(struct ath11k_vif *arvif); +@@ -219,7 +227,8 @@ static inline int ath11k_nss_tx(struct a + return 0; + } + +-static inline int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, int cmd, int val) ++static inline int ath11k_nss_vdev_set_cmd(struct ath11k_vif *arvif, enum ath11k_nss_vdev_cmd cmd, ++ int val) + { + return 0; + } +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -104,8 +104,10 @@ static void ath11k_init_wmi_config_qca63 + + static void ath11k_hw_ipq8074_reo_setup(struct ath11k_base *ab) + { ++ u8 frag_dest_ring = HAL_SRNG_RING_ID_REO2SW1; + u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; + u32 val; ++ + /* Each hash entry uses three bits to map to a particular ring. */ + u32 ring_hash_map = HAL_HASH_ROUTING_RING_SW1 << 0 | + HAL_HASH_ROUTING_RING_SW2 << 3 | +@@ -116,11 +118,14 @@ static void ath11k_hw_ipq8074_reo_setup( + HAL_HASH_ROUTING_RING_SW3 << 18 | + HAL_HASH_ROUTING_RING_SW4 << 21; + ++ if (ab->nss.enabled) ++ frag_dest_ring = HAL_SRNG_REO_ALTERNATE_SELECT; ++ + val = ath11k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE); + + val &= ~HAL_REO1_GEN_ENABLE_FRAG_DST_RING; + val |= FIELD_PREP(HAL_REO1_GEN_ENABLE_FRAG_DST_RING, +- HAL_SRNG_RING_ID_REO2SW1) | ++ frag_dest_ring) | + FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE, 1) | + FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE, 1); + ath11k_hif_write32(ab, reo_base + HAL_REO1_GEN_ENABLE, val); +@@ -134,6 +139,10 @@ static void ath11k_hw_ipq8074_reo_setup( + ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab), + HAL_DEFAULT_REO_TIMEOUT_USEC); + ++ /* REO Dest ring setup is not required in NSS offload case */ ++ if (ab->nss.enabled) ++ return; ++ + ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0, + FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, + ring_hash_map)); +@@ -758,8 +767,10 @@ static u8 *ath11k_hw_wcn6855_rx_desc_mpd + + static void ath11k_hw_wcn6855_reo_setup(struct ath11k_base *ab) + { ++ u8 frag_dest_ring = HAL_SRNG_RING_ID_REO2SW1; + u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; + u32 val; ++ + /* Each hash entry uses four bits to map to a particular ring. */ + u32 ring_hash_map = HAL_HASH_ROUTING_RING_SW1 << 0 | + HAL_HASH_ROUTING_RING_SW2 << 4 | +@@ -770,6 +781,9 @@ static void ath11k_hw_wcn6855_reo_setup( + HAL_HASH_ROUTING_RING_SW3 << 24 | + HAL_HASH_ROUTING_RING_SW4 << 28; + ++ if (ab->nss.enabled) ++ frag_dest_ring = HAL_SRNG_REO_ALTERNATE_SELECT; ++ + val = ath11k_hif_read32(ab, reo_base + HAL_REO1_GEN_ENABLE); + val |= FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_LIST_ENABLE, 1) | + FIELD_PREP(HAL_REO1_GEN_ENABLE_AGING_FLUSH_ENABLE, 1); +@@ -777,7 +791,7 @@ static void ath11k_hw_wcn6855_reo_setup( + + val = ath11k_hif_read32(ab, reo_base + HAL_REO1_MISC_CTL(ab)); + val &= ~HAL_REO1_MISC_CTL_FRAGMENT_DST_RING; +- val |= FIELD_PREP(HAL_REO1_MISC_CTL_FRAGMENT_DST_RING, HAL_SRNG_RING_ID_REO2SW1); ++ val |= FIELD_PREP(HAL_REO1_MISC_CTL_FRAGMENT_DST_RING, frag_dest_ring); + ath11k_hif_write32(ab, reo_base + HAL_REO1_MISC_CTL(ab), val); + + ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_0(ab), +@@ -789,6 +803,10 @@ static void ath11k_hw_wcn6855_reo_setup( + ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab), + HAL_DEFAULT_REO_TIMEOUT_USEC); + ++ /* REO Dest ring setup is not required in NSS offload case */ ++ if (ab->nss.enabled) ++ return; ++ + ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, + ring_hash_map); + ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, +--- a/drivers/net/wireless/ath/ath11k/pcic.c ++++ b/drivers/net/wireless/ath/ath11k/pcic.c +@@ -571,6 +571,12 @@ static int ath11k_pcic_ext_irq_config(st + netif_napi_add(&irq_grp->napi_ndev, &irq_grp->napi, + ath11k_pcic_ext_grp_napi_poll); + ++ /* tcl, reo, rx_err, wbm release, rxdma rings are offloaded to nss. */ ++ if (ab->nss.enabled && ++ !(ab->hw_params.ring_mask->reo_status[i] || ++ ab->hw_params.ring_mask->rx_mon_status[i])) ++ continue; ++ + if (ab->hw_params.ring_mask->tx[i] || + ab->hw_params.ring_mask->rx[i] || + ab->hw_params.ring_mask->rx_err[i] || +--- a/local-symbols ++++ b/local-symbols +@@ -170,6 +170,7 @@ WCN36XX_DEBUGFS= + ATH11K= + ATH11K_AHB= + ATH11K_PCI= ++ATH11K_NSS_SUPPORT= + ATH11K_DEBUG= + ATH11K_DEBUGFS= + ATH11K_TRACING= diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch b/package/kernel/mac80211/patches/ath11k_nss/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch new file mode 100644 index 00000000000000..87c2a52b676f21 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch @@ -0,0 +1,35 @@ +From c3389f87ea09dea804cda2483922e03ad3eb6c79 Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Thu, 18 Jun 2020 00:07:15 +0530 +Subject: [PATCH] mac80211: fix xmit callback when hwencap enable in sta + +Since transmit control port uses same callback for both +(ieee80211_subif_start_xmit) ethernet mode and native +wifi mode, which cause regression in ethernet mode +when we use DUT as a STA with encryption(psk2+ccmp). + +Added hardware encap check to filter out ethernet mode +packets to follow ieee80211_subif_start_xmit_8023 callback. + +Signed-off-by: P Praneesh +--- + net/mac80211/tx.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -6213,7 +6213,13 @@ start_xmit: + mutex_lock(&local->mtx); + + local_bh_disable(); +- __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); ++ ++ /* added hardware encap check for ethernet mode */ ++ if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) ++ ieee80211_subif_start_xmit_8023(skb, skb->dev); ++ else ++ __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); ++ + local_bh_enable(); + + mutex_unlock(&local->mtx); diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch new file mode 100644 index 00000000000000..af46c8f0bfa05e --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -0,0 +1,60 @@ +From f013e1e9829ec346fa0a215552eef51953b46bf0 Mon Sep 17 00:00:00 2001 +From: Seevalamuthu Mariappan +Date: Fri, 7 Aug 2020 18:24:32 +0530 +Subject: [PATCH] ath11k: Add support for dynamic vlan + +This patch adds support for dynamic vlan. VLAN group traffics +are encrypted in software. vlan unicast packets shall be taking +8023 xmit path if encap offload is enabled and mcast/bcast will +be using 80211 xmit path. + +Metadata info in dp_tx added to notify firmware that the +multicast/broadcast packets are encrypted in sw. + +Signed-off-by: Seevalamuthu Mariappan +Signed-off-by: Gautham Kumar Senthilkumaran +--- + net/mac80211/tx.c | 14 +++ + 1 files changed, 14 insertions(+) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -37,6 +37,9 @@ + #include "wme.h" + #include "rate.h" + ++static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, ++ struct net_device *dev, struct sta_info *sta, ++ struct ieee80211_key *key, struct sk_buff *skb); + /* misc utils */ + + static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, +@@ -4268,6 +4271,8 @@ void __ieee80211_subif_start_xmit(struct + struct sta_info *sta; + struct sk_buff *next; + int len = skb->len; ++ struct ieee80211_key *key = NULL; ++ struct ieee80211_sub_if_data *ap_sdata; + + if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { + kfree_skb(skb); +@@ -4289,6 +4294,19 @@ void __ieee80211_subif_start_xmit(struct + if (IS_ERR(sta)) + sta = NULL; + ++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { ++ ap_sdata = container_of(sdata->bss, ++ struct ieee80211_sub_if_data, u.ap); ++ if (ap_sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED && ++ !is_multicast_ether_addr(skb->data)) { ++ if (sta) ++ key = rcu_dereference(sta->ptk[sta->ptk_idx]); ++ ieee80211_8023_xmit(sdata, dev, sta, key, skb); ++ rcu_read_unlock(); ++ return; ++ } ++ } ++ + skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, sta, skb)); + ieee80211_aggr_check(sdata, sta, skb); + diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch new file mode 100644 index 00000000000000..0e7ddb8539a207 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch @@ -0,0 +1,332 @@ +From 1b402e444ff99efe84d09a084b96c39826783a8e Mon Sep 17 00:00:00 2001 +From: Ramya Gnanasekar +Date: Thu, 10 Sep 2020 13:33:55 +0530 +Subject: [PATCH] ath11k: Enable 512MB profile in ath11k + +Below changes are made to enable 512MB mem mode in ath11k + * Makefile changes to implement compilation flag when + 512MB mem profile is configured. + * Enabling 512MB mem profile by default from Makefile + for IPQ5018. This can be removed later once + 512MB profile config is supported. + * Update target_mem_mode, number of stations, peer and vap + during compile time + +Signed-off-by: Ramya Gnanasekar +--- + drivers/net/wireless/ath/ath11k/Kconfig | 7 +++++++ + drivers/net/wireless/ath/ath11k/hw.h | 14 +++++++++++--- + drivers/net/wireless/ath/ath11k/qmi.c | 2 +- + drivers/net/wireless/ath/ath11k/qmi.h | 6 +++++- + 4 files changed, 24 insertions(+), 5 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/Kconfig ++++ b/drivers/net/wireless/ath/ath11k/Kconfig +@@ -23,6 +23,13 @@ config ATH11K_NSS_SUPPORT + + If unsure, say Y to enable NSS offload support. + ++config ATH11K_MEM_PROFILE_512M ++ bool "ath11k enable 512MB memory profile" ++ depends on ATH11K ++ default n ++ ---help--- ++ Enables 512MB memory profile for ath11k ++ + config ATH11K_AHB + tristate "Atheros ath11k AHB support" + depends on m +--- a/drivers/net/wireless/ath/ath11k/hw.h ++++ b/drivers/net/wireless/ath/ath11k/hw.h +@@ -11,11 +11,30 @@ + #include "wmi.h" + + /* Target configuration defines */ ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + ++#define TARGET_NUM_VDEVS(ab) 8 ++#define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) ++/* Max num of stations (per radio) */ ++#define TARGET_NUM_STATIONS(ab) 128 ++#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_512M ++#define ATH11K_DP_TX_COMP_RING_SIZE 8192 ++#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 ++#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 ++#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 ++#else + /* Num VDEVS per radio */ + #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs) + + #define TARGET_NUM_PEERS_PDEV(ab) (ab->hw_params.num_peers + TARGET_NUM_VDEVS(ab)) ++/* Max num of stations (per radio) */ ++#define TARGET_NUM_STATIONS(ab) (ab->hw_params.num_peers) ++#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_DEFAULT ++#define ATH11K_DP_TX_COMP_RING_SIZE 32768 ++#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 ++#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 ++#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 ++#endif + + /* Num of peers for Single Radio mode */ + #define TARGET_NUM_PEERS_SINGLE(ab) (TARGET_NUM_PEERS_PDEV(ab)) +@@ -26,9 +45,6 @@ + /* Num of peers for DBS_SBS */ + #define TARGET_NUM_PEERS_DBS_SBS(ab) (3 * TARGET_NUM_PEERS_PDEV(ab)) + +-/* Max num of stations (per radio) */ +-#define TARGET_NUM_STATIONS(ab) (ab->hw_params.num_peers) +- + #define TARGET_NUM_PEERS(ab, x) TARGET_NUM_PEERS_##x(ab) + #define TARGET_NUM_PEER_KEYS 2 + #define TARGET_NUM_TIDS(ab, x) (2 * TARGET_NUM_PEERS(ab, x) + \ +--- a/drivers/net/wireless/ath/ath11k/qmi.h ++++ b/drivers/net/wireless/ath/ath11k/qmi.h +@@ -29,6 +29,12 @@ + #define ATH11K_QMI_BDF_EXT_STR_LENGTH 0x20 + #define ATH11K_QMI_FW_MEM_REQ_SEGMENT_CNT 5 + ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++#define ATH11K_QMI_IPQ8074_M3_DUMP_ADDRESS 0x4E800000 ++#else ++#define ATH11K_QMI_IPQ8074_M3_DUMP_ADDRESS 0x51000000 ++#endif ++ + #define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035 + #define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037 + #define QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01 0x003E +@@ -519,4 +525,10 @@ int ath11k_qmi_init_service(struct ath11 + void ath11k_qmi_free_resource(struct ath11k_base *ab); + int ath11k_qmi_fwreset_from_cold_boot(struct ath11k_base *ab); + ++enum ath11k_target_mem_mode { ++ ATH11K_QMI_TARGET_MEM_MODE_DEFAULT = 0, ++ ATH11K_QMI_TARGET_MEM_MODE_512M, ++ ATH11K_QMI_TARGET_MEM_MODE_256M, ++}; ++ + #endif +--- a/local-symbols ++++ b/local-symbols +@@ -171,6 +171,7 @@ ATH11K= + ATH11K_AHB= + ATH11K_PCI= + ATH11K_NSS_SUPPORT= ++ATH11K_MEM_PROFILE_512M= + ATH11K_DEBUG= + ATH11K_DEBUGFS= + ATH11K_TRACING= +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -863,6 +863,11 @@ struct ath11k_msi_config { + u16 hw_rev; + }; + ++struct ath11k_num_vdevs_peers { ++ u32 num_vdevs; ++ u32 num_peers; ++}; ++ + /* Master structure to hold the hw data which may be used in core module */ + struct ath11k_base { + enum ath11k_hw_rev hw_rev; +@@ -1016,6 +1021,9 @@ struct ath11k_base { + } testmode; + #endif + ++ atomic_t num_max_allowed; ++ struct ath11k_num_vdevs_peers *num_vdevs_peers; ++ + /* must be last */ + u8 drv_priv[] __aligned(sizeof(void *)); + }; +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -206,8 +206,9 @@ struct ath11k_pdev_dp { + #define DP_WBM_RELEASE_RING_SIZE 64 + #define DP_TCL_DATA_RING_SIZE 512 + #define DP_TCL_DATA_RING_SIZE_WCN6750 2048 +-#define DP_TX_COMP_RING_SIZE 32768 ++#define DP_TX_COMP_RING_SIZE ATH11K_DP_TX_COMP_RING_SIZE + #define DP_TX_IDR_SIZE DP_TX_COMP_RING_SIZE ++#define DP_TX_COMP_MAX_ALLOWED DP_TX_COMP_RING_SIZE + #define DP_TCL_CMD_RING_SIZE 32 + #define DP_TCL_STATUS_RING_SIZE 32 + #define DP_REO_DST_RING_MAX 4 +@@ -220,9 +221,9 @@ struct ath11k_pdev_dp { + #define DP_RXDMA_BUF_RING_SIZE 4096 + #define DP_RXDMA_REFILL_RING_SIZE 2048 + #define DP_RXDMA_ERR_DST_RING_SIZE 1024 +-#define DP_RXDMA_MON_STATUS_RING_SIZE 1024 +-#define DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 +-#define DP_RXDMA_MONITOR_DST_RING_SIZE 2048 ++#define DP_RXDMA_MON_STATUS_RING_SIZE ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE ++#define DP_RXDMA_MONITOR_BUF_RING_SIZE ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE ++#define DP_RXDMA_MONITOR_DST_RING_SIZE ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE + #define DP_RXDMA_MONITOR_DESC_RING_SIZE 4096 + + #define DP_RX_RELEASE_RING_NUM 3 +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -265,6 +265,7 @@ tcl_ring_sel: + skb->data, skb->len); + + atomic_inc(&ar->dp.num_tx_pending); ++ atomic_inc(&ab->num_max_allowed); + + return 0; + +@@ -309,6 +310,7 @@ static void ath11k_dp_tx_free_txbuf(stru + ar = ab->pdevs[mac_id].ar; + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) + wake_up(&ar->dp.tx_empty_waitq); ++ atomic_dec(&ab->num_max_allowed); + } + + static void +@@ -342,6 +344,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) + wake_up(&ar->dp.tx_empty_waitq); ++ atomic_dec(&ab->num_max_allowed); + + dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + +@@ -769,6 +772,7 @@ void ath11k_dp_tx_completion_handler(str + wake_up(&ar->dp.tx_empty_waitq); + + ath11k_dp_tx_complete_msdu(ar, msdu, &ts); ++ atomic_dec(&ab->num_max_allowed); + } + } + +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "core.h" + #include "dp_tx.h" +@@ -16,6 +17,7 @@ + #include "debug.h" + #include "hif.h" + #include "wow.h" ++#include "ahb.h" + + unsigned int nss_offload; + #ifdef CPTCFG_ATH11K_NSS_SUPPORT +@@ -42,6 +44,8 @@ bool ath11k_ftm_mode; + module_param_named(ftm_mode, ath11k_ftm_mode, bool, 0444); + MODULE_PARM_DESC(ftm_mode, "Boots up in factory test mode"); + ++static const struct ath11k_num_vdevs_peers ath11k_vdevs_peers[]; ++ + static struct ath11k_hw_params ath11k_hw_params[] = { + { + .hw_rev = ATH11K_HW_IPQ8074, +@@ -100,6 +104,7 @@ static struct ath11k_hw_params ath11k_hw + .num_peers = 512, + .supports_suspend = false, + .hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074), ++ .reo_dest_ring_map_shift = HAL_REO_DEST_RING_CTRL_HASH_RING_SHIFT, + .supports_regdb = false, + .fix_l1ss = true, + .credit_flow = false, +@@ -177,7 +182,7 @@ static struct ath11k_hw_params ath11k_hw + .coldboot_cal_mm = true, + .coldboot_cal_ftm = true, + .cbcal_restart_fw = true, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, + .num_peers = 512, + .supports_suspend = false, +@@ -259,7 +264,7 @@ static struct ath11k_hw_params ath11k_hw + .coldboot_cal_mm = false, + .coldboot_cal_ftm = false, + .cbcal_restart_fw = false, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, + .num_peers = 512, + .supports_suspend = true, +@@ -426,7 +431,7 @@ static struct ath11k_hw_params ath11k_hw + .coldboot_cal_mm = false, + .coldboot_cal_ftm = false, + .cbcal_restart_fw = false, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, + .num_peers = 512, + .supports_suspend = true, +@@ -509,7 +514,7 @@ static struct ath11k_hw_params ath11k_hw + .coldboot_cal_mm = false, + .coldboot_cal_ftm = false, + .cbcal_restart_fw = false, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, + .num_peers = 512, + .supports_suspend = true, +@@ -593,7 +598,7 @@ static struct ath11k_hw_params ath11k_hw + .coldboot_cal_mm = true, + .coldboot_cal_ftm = true, + .cbcal_restart_fw = false, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, + .num_peers = 512, + .supports_suspend = false, +@@ -672,7 +677,7 @@ static struct ath11k_hw_params ath11k_hw + .supports_monitor = false, + .supports_sta_ps = false, + .supports_shadow_regs = false, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, + .num_peers = 512, + .supports_regdb = false, +@@ -710,7 +715,23 @@ static struct ath11k_hw_params ath11k_hw + }, + }; + +-static inline struct ath11k_pdev *ath11k_core_get_single_pdev(struct ath11k_base *ab) ++static const struct ath11k_num_vdevs_peers ath11k_vdevs_peers[] = { ++ { ++ .num_vdevs = (16 + 1), ++ .num_peers = 512, ++ }, ++ { ++ .num_vdevs = (8 + 1), ++ .num_peers = 128, ++ }, ++ { ++ .num_vdevs = 8, ++ .num_peers = 128, ++ }, ++}; ++ ++static inline struct ath11k_pdev * ++ath11k_core_get_single_pdev(struct ath11k_base *ab) + { + WARN_ON(!ab->hw_params.single_pdev_only); + +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1592,10 +1592,13 @@ static ssize_t ath11k_dump_mgmt_stats(st + size_t count, loff_t *ppos) + { + struct ath11k *ar = file->private_data; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M ++ struct ath11k_base *ab = ar->ab; ++#endif + struct ath11k_vif *arvif = NULL; + struct ath11k_mgmt_frame_stats *mgmt_stats; + int len = 0, ret, i; +- int size = (TARGET_NUM_VDEVS - 1) * 1500; ++ int size = (TARGET_NUM_VDEVS(ab) - 1) * 1500; + char *buf; + const char *mgmt_frm_type[ATH11K_STATS_MGMT_FRM_TYPE_MAX-1] = {"assoc_req", "assoc_resp", + "reassoc_req", "reassoc_resp", diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-mac80211-add-nss-redirect-support.patch b/package/kernel/mac80211/patches/ath11k_nss/207-mac80211-add-nss-redirect-support.patch new file mode 100644 index 00000000000000..c9a12d5f127cbe --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/207-mac80211-add-nss-redirect-support.patch @@ -0,0 +1,268 @@ +From 3acca4ecfe25a7d97e7cb820fd8c7c6324a1f318 Mon Sep 17 00:00:00 2001 +From: Sowmiya Sree Elavalagan +Date: Tue, 18 Aug 2020 16:17:25 +0530 +Subject: [PATCH] ath11k : Add NSS redirect support + +Add NSS Redirect support for ath11k. Tested on ipq8074 +Most of the changes are similar to the one done for ath10k with +minor changes to send to nss with eth header + +Redirect can be enabled by setting nss_redirect module param during +mac80211 insmod followed by ecm start +insmod mac80211.ko nss_redirect=1 +/etc/init.d/qca-nss-ecm start + +Check for ipv4_hash_hits counts in ipv4 stats and eth_rx +in qca-nss-drv to check whether packets are redirected or not. + +Verified both in nwifi and ethernet mode by running tcp and udp +traffic. + +Co-developed by: Sriram R +Signed-off-by: Sriram R +Signed-off-by: Sowmiya Sree Elavalagan +--- + net/mac80211/ieee80211_i.h | 2 ++ + net/mac80211/iface.c | 43 ++++++++++++++++++++++++++++++++ + net/mac80211/rx.c | 61 +++++++++++++++++++++++++++++++++++++--------- + net/mac80211/tx.c | 32 ++++++++++++++++++++++++ + 4 files changed, 126 insertions(+), 12 deletions(-) + +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -34,6 +34,9 @@ + #include "sta_info.h" + #include "debug.h" + #include "drop.h" ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++#include ++#endif + + extern const struct cfg80211_ops mac80211_config_ops; + +@@ -1120,6 +1123,9 @@ struct ieee80211_sub_if_data { + struct dentry *default_beacon_key; + } debugfs; + #endif ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++ struct nss_virt_if_handle *nssctx; ++#endif + + /* must be last, dynamically sized area in this! */ + struct ieee80211_vif vif; +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -27,6 +27,12 @@ + #include "wme.h" + #include "rate.h" + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++bool nss_redirect = false; ++module_param(nss_redirect, bool, 0644); ++MODULE_PARM_DESC(nss_redirect, "module param to enable NSS Redirect; 1-enable, 0-disable"); ++#endif ++ + /** + * DOC: Interface list locking + * +@@ -752,6 +758,13 @@ static int ieee80211_stop(struct net_dev + + cancel_work_sync(&sdata->activate_links_work); + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++ if (sdata->nssctx) { ++ nss_virt_if_destroy_sync(sdata->nssctx); ++ sdata_info(sdata, "Destroyed NSS virtual interface\n"); ++ } ++#endif ++ + wiphy_lock(sdata->local->hw.wiphy); + ieee80211_do_stop(sdata, true); + wiphy_unlock(sdata->local->hw.wiphy); +@@ -1219,6 +1232,34 @@ void ieee80211_del_virtual_monitor(struc + kfree(sdata); + } + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++/* This callback is registered for nss redirect to receive packet exceptioned from nss in Rx path. ++ * When packet does not match any of the ecm rules is redirected back here. ++ */ ++void receive_from_nss(struct net_device *dev, struct sk_buff *sk_buff, struct napi_struct *napi) ++{ ++ struct net_device *netdev; ++ struct sk_buff *skb; ++ struct ieee80211_sub_if_data *sdata; ++ ++ if (!dev) { ++ kfree(sk_buff); ++ return; ++ } ++ ++ netdev = (struct net_device *)dev; ++ sdata = netdev_priv(netdev); ++ if (sdata->dev != dev) { ++ kfree(sk_buff); ++ return; ++ } ++ skb = (struct sk_buff *)sk_buff; ++ skb->dev = netdev; ++ skb->protocol = eth_type_trans(skb, netdev); ++ napi_gro_receive(napi, skb); ++} ++#endif ++ + /* + * NOTE: Be very careful when changing this function, it must NOT return + * an error on interface type changes that have been pre-checked, so most +@@ -1450,6 +1491,19 @@ int ieee80211_do_open(struct wireless_de + + ieee80211_recalc_ps(local); + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++ sdata->nssctx = NULL; ++ if (nss_redirect) { ++ sdata->nssctx = nss_virt_if_create_sync(dev); ++ if (sdata->nssctx) { ++ sdata_info(sdata, "Created a NSS virtual interface\n"); ++ nss_virt_if_register(sdata->nssctx, receive_from_nss, sdata->dev); ++ } else { ++ sdata_info(sdata, "Failed to create a NSS virtual interface\n"); ++ } ++ } ++#endif ++ + set_bit(SDATA_STATE_RUNNING, &sdata->state); + + return 0; +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2570,6 +2570,54 @@ static bool ieee80211_frame_allowed(stru + return true; + } + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++#define case_rtn_string(val) case val: return #val ++ ++static const char *nss_tx_status_str(nss_tx_status_t status) ++{ ++ switch (status) { ++ case_rtn_string(NSS_TX_SUCCESS); ++ case_rtn_string(NSS_TX_FAILURE); ++ case_rtn_string(NSS_TX_FAILURE_QUEUE); ++ case_rtn_string(NSS_TX_FAILURE_NOT_READY); ++ case_rtn_string(NSS_TX_FAILURE_TOO_LARGE); ++ case_rtn_string(NSS_TX_FAILURE_TOO_SHORT); ++ case_rtn_string(NSS_TX_FAILURE_NOT_SUPPORTED); ++ case_rtn_string(NSS_TX_FAILURE_BAD_PARAM); ++ default: ++ return "Unknown NSS TX status"; ++ } ++} ++ ++static void netif_rx_nss(struct ieee80211_rx_data *rx, ++ struct sk_buff *skb) ++{ ++ struct ieee80211_sub_if_data *sdata = rx->sdata; ++ int ret; ++ ++ if (!sdata->nssctx) ++ goto out; ++ ++ /* NSS expects ethernet header in skb data so resetting here */ ++ skb_push(skb, ETH_HLEN); ++ ret = nss_virt_if_tx_buf(sdata->nssctx, skb); ++ if (ret) { ++ if (net_ratelimit()) { ++ sdata_err(sdata, "NSS TX failed with error: %s\n", ++ nss_tx_status_str(ret)); ++ } ++ goto out; ++ } ++ ++ return; ++out: ++ if (rx->napi) ++ napi_gro_receive(rx->napi, skb); ++ else ++ netif_receive_skb(skb); ++} ++#endif ++ + static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb, + struct ieee80211_rx_data *rx) + { +@@ -2609,11 +2657,15 @@ static void ieee80211_deliver_skb_to_loc + !ether_addr_equal(ehdr->h_dest, sdata->vif.addr))) + ether_addr_copy(ehdr->h_dest, sdata->vif.addr); + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++ netif_rx_nss(rx, skb); ++#else + /* deliver to local stack */ + if (rx->list) + list_add_tail(&skb->list, rx->list); + else + netif_receive_skb(skb); ++#endif + } + } + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4501,6 +4501,35 @@ static void ieee80211_mlo_multicast_tx(s + kfree_skb(skb); + } + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++void ieee80211_xmit_nss_fixup(struct sk_buff *skb, ++ struct net_device *dev) ++{ ++ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); ++ ++ /* Packets from NSS does not have valid protocol, priority and other ++ * network stack values. Derive required parameters (priority ++ * and network_header) from payload for QoS header. ++ * XXX: Here the assumption is that packet are in 802.3 format. ++ * As of now priority is handled only for IPv4 and IPv6. ++ */ ++ ++ if (sdata->nssctx && likely(!skb->protocol)) { ++ skb_set_network_header(skb, 14); ++ switch (((struct ethhdr *)skb->data)->h_proto) { ++ case htons(ETH_P_IP): ++ skb->priority = (ipv4_get_dsfield(ip_hdr(skb)) & ++ 0xfc) >> 5; ++ break; ++ case htons(ETH_P_IPV6): ++ skb->priority = (ipv6_get_dsfield(ipv6_hdr(skb)) & ++ 0xfc) >> 5; ++ break; ++ } ++ } ++} ++#endif ++ + /** + * ieee80211_subif_start_xmit - netif start_xmit function for 802.3 vifs + * @skb: packet to be sent +@@ -4514,6 +4543,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + const struct ethhdr *eth = (void *)skb->data; + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++ ieee80211_xmit_nss_fixup(skb, dev); ++#endif ++ + if (likely(!is_multicast_ether_addr(eth->h_dest))) + goto normal; + +@@ -4700,6 +4733,9 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + struct ieee80211_key *key; + struct sta_info *sta; + ++#ifdef CPTCFG_MAC80211_NSS_SUPPORT ++ ieee80211_xmit_nss_fixup(skb, dev); ++#endif + if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { + kfree_skb(skb); + return NETDEV_TX_OK; diff --git a/package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch b/package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch new file mode 100644 index 00000000000000..ddae9fcbc50e7d --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch @@ -0,0 +1,56 @@ +From 81694575884dc69535252a6f44128323fd6a2504 Mon Sep 17 00:00:00 2001 +From: Rajkumar Manoharan +Date: Sat, 26 Sep 2020 23:17:03 -0700 +Subject: [PATCH 1/3] nl80211: fix OBSS PD min and max offset validation + +The SRG minimum and maximum offset doesn't present when the SR control field +of Spatial Reuse Parameter Set element set SRG Information Present to 0. +Both attributes are 1-byte values so use appropriate nla_get function. + +Signed-off-by: Rajkumar Manoharan +--- + net/wireless/nl80211.c | 21 ++++++++++----------- + 1 file changed, 10 insertions(+), 11 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -3272,7 +3272,8 @@ static int ath11k_mac_config_obss_pd(str + { + u32 bitmap[2], param_id, param_val, pdev_id; + int ret; +- s8 non_srg_th = 0, srg_th = 0; ++ s8 non_srg_th = ATH11K_OBSS_PD_THRESHOLD_DISABLED; ++ s8 srg_th = 0; + + pdev_id = ar->pdev->pdev_id; + +@@ -3301,8 +3302,6 @@ static int ath11k_mac_config_obss_pd(str + if (he_obss_pd->sr_ctrl & IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT) + non_srg_th = (ATH11K_OBSS_PD_MAX_THRESHOLD + + he_obss_pd->non_srg_max_offset); +- else +- non_srg_th = ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD; + + param_val |= ATH11K_OBSS_PD_NON_SRG_EN; + } +@@ -3317,7 +3316,8 @@ static int ath11k_mac_config_obss_pd(str + param_val |= ATH11K_OBSS_PD_THRESHOLD_IN_DBM; + param_val |= FIELD_PREP(GENMASK(15, 8), srg_th); + } else { +- non_srg_th -= ATH11K_DEFAULT_NOISE_FLOOR; ++ if ((non_srg_th & 0xff) != ATH11K_OBSS_PD_THRESHOLD_DISABLED) ++ non_srg_th -= ATH11K_DEFAULT_NOISE_FLOOR; + /* SRG not supported and threshold in dB */ + param_val &= ~(ATH11K_OBSS_PD_SRG_EN | + ATH11K_OBSS_PD_THRESHOLD_IN_DBM); +--- a/drivers/net/wireless/ath/ath11k/mac.h ++++ b/drivers/net/wireless/ath/ath11k/mac.h +@@ -121,7 +121,7 @@ struct ath11k_generic_iter { + #define ATH11K_PEER_RX_NSS_80_80MHZ GENMASK(5, 3) + + #define ATH11K_OBSS_PD_MAX_THRESHOLD -82 +-#define ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD -62 ++#define ATH11K_OBSS_PD_THRESHOLD_DISABLED 128 + #define ATH11K_OBSS_PD_THRESHOLD_IN_DBM BIT(29) + #define ATH11K_OBSS_PD_SRG_EN BIT(30) + #define ATH11K_OBSS_PD_NON_SRG_EN BIT(31) diff --git a/package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch b/package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch new file mode 100644 index 00000000000000..a69c5b2af244f8 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch @@ -0,0 +1,519 @@ +From 0e29b669153f100b60107d5f6b3fe407b71ba79a Mon Sep 17 00:00:00 2001 +From: Sowmiya Sree Elavalagan +Date: Wed, 30 Sep 2020 22:33:42 +0530 +Subject: [PATCH] ath11k: QOS null frame tx over wmi + +Added support to send qos null frame through FW. +NSS driver does not support QOS null frame tx. +Hence this is brought for nss offload case to send +qos null frame. QOS null packet queued from mac80211 +is sent to FW through wmi interface. This happens only if FW supports +qos null tx, this is based on service bit received in ext2 service +event from FW. On successful transmission of QOS null frame status +is set 0 in the event received for this wmi message. This is status +is sent to mac80211 for further handling. + +Signed-off-by: Sowmiya Sree Elavalagan +--- + drivers/net/wireless/ath/ath11k/mac.c | 28 ++++- + drivers/net/wireless/ath/ath11k/wmi.c | 200 ++++++++++++++++++++++++++-------- + drivers/net/wireless/ath/ath11k/wmi.h | 46 +++++++- + 3 files changed, 220 insertions(+), 54 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6129,6 +6129,16 @@ static int ath11k_mac_mgmt_tx_wmi(struct + + ATH11K_SKB_CB(skb)->paddr = paddr; + ++ if (ieee80211_is_qos_nullfunc(hdr->frame_control)) { ++ ret = ath11k_wmi_qos_null_send(ar, arvif->vdev_id, buf_id, skb); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send qos null frame over wmi: %d\n", ret); ++ goto err_unmap_buf; ++ } ++ ++ return 0; ++ } ++ + ret = ath11k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb); + if (ret) { + ath11k_warn(ar->ab, "failed to send mgmt frame: %d\n", ret); +@@ -6196,8 +6206,8 @@ static void ath11k_mgmt_over_wmi_tx_work + } + } + +-static int ath11k_mac_mgmt_tx(struct ath11k *ar, struct sk_buff *skb, +- bool is_prb_rsp) ++static int ath11k_mac_tx_over_wmi(struct ath11k *ar, struct sk_buff *skb, ++ bool is_prb_rsp) + { + struct sk_buff_head *q = &ar->wmi_mgmt_tx_queue; + +@@ -6259,7 +6269,7 @@ static void ath11k_mac_op_tx(struct ieee + } else if (ieee80211_is_mgmt(hdr->frame_control)) { + frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); + is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control); +- ret = ath11k_mac_mgmt_tx(ar, skb, is_prb_rsp); ++ ret = ath11k_mac_tx_over_wmi(ar, skb, is_prb_rsp); + if (ret) { + if (ret != -EBUSY) + ath11k_warn(ar->ab, "failed to queue management frame %d\n", +@@ -6274,6 +6284,20 @@ static void ath11k_mac_op_tx(struct ieee + spin_unlock_bh(&ar->data_lock); + } + return; ++ } else if (ar->ab->nss.enabled && ++ ieee80211_is_qos_nullfunc(hdr->frame_control) && ++ test_bit(WMI_TLV_SERVICE_QOS_NULL_FRAME_TX_OVER_WMI, ++ ar->ab->wmi_ab.svc_map)) { ++ /* NSS driver does not support tx qos null pkt hence it is offload ++ * to fw via wmi path similar to mgmt frames ++ */ ++ ret = ath11k_mac_tx_over_wmi(ar, skb, false); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to queue qos null frame %d\n", ++ ret); ++ ieee80211_free_txskb(ar->hw, skb); ++ } ++ return; + } + + if (control->sta) +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -23,6 +23,7 @@ + + struct wmi_tlv_policy { + size_t min_len; ++ char policy[40]; + }; + + struct wmi_tlv_svc_ready_parse { +@@ -91,69 +92,69 @@ struct wmi_tlv_mgmt_rx_parse { + + static const struct wmi_tlv_policy wmi_tlv_policies[] = { + [WMI_TAG_ARRAY_BYTE] +- = { .min_len = 0 }, ++ = { .min_len = 0, .policy = "WMI_TAG_ARRAY_BYTE" }, + [WMI_TAG_ARRAY_UINT32] +- = { .min_len = 0 }, ++ = { .min_len = 0, .policy = "WMI_TAG_ARRAY_UINT32" }, + [WMI_TAG_SERVICE_READY_EVENT] +- = { .min_len = sizeof(struct wmi_service_ready_event) }, ++ = { .min_len = sizeof(struct wmi_service_ready_event), .policy = "wmi_service_ready_event" }, + [WMI_TAG_SERVICE_READY_EXT_EVENT] +- = { .min_len = sizeof(struct wmi_service_ready_ext_event) }, ++ = { .min_len = sizeof(struct wmi_service_ready_ext_event), .policy = "wmi_service_ready_ext_event" }, + [WMI_TAG_SOC_MAC_PHY_HW_MODE_CAPS] +- = { .min_len = sizeof(struct wmi_soc_mac_phy_hw_mode_caps) }, ++ = { .min_len = sizeof(struct wmi_soc_mac_phy_hw_mode_caps), .policy = "wmi_soc_mac_phy_hw_mode_caps" }, + [WMI_TAG_SOC_HAL_REG_CAPABILITIES] +- = { .min_len = sizeof(struct wmi_soc_hal_reg_capabilities) }, ++ = { .min_len = sizeof(struct wmi_soc_hal_reg_capabilities), .policy = "wmi_soc_hal_reg_capabilities" }, + [WMI_TAG_VDEV_START_RESPONSE_EVENT] +- = { .min_len = sizeof(struct wmi_vdev_start_resp_event) }, ++ = { .min_len = sizeof(struct wmi_vdev_start_resp_event), .policy = "wmi_vdev_start_resp_event" }, + [WMI_TAG_PEER_DELETE_RESP_EVENT] +- = { .min_len = sizeof(struct wmi_peer_delete_resp_event) }, ++ = { .min_len = sizeof(struct wmi_peer_delete_resp_event), .policy = "wmi_peer_delete_resp_event" }, + [WMI_TAG_OFFLOAD_BCN_TX_STATUS_EVENT] +- = { .min_len = sizeof(struct wmi_bcn_tx_status_event) }, ++ = { .min_len = sizeof(struct wmi_bcn_tx_status_event), .policy = "wmi_bcn_tx_status_event" }, + [WMI_TAG_VDEV_STOPPED_EVENT] +- = { .min_len = sizeof(struct wmi_vdev_stopped_event) }, ++ = { .min_len = sizeof(struct wmi_vdev_stopped_event), .policy = "wmi_vdev_stopped_event" }, + [WMI_TAG_REG_CHAN_LIST_CC_EVENT] +- = { .min_len = sizeof(struct wmi_reg_chan_list_cc_event) }, ++ = { .min_len = sizeof(struct wmi_reg_chan_list_cc_event), .policy = "wmi_reg_chan_list_cc_event" }, + [WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT] +- = { .min_len = sizeof(struct wmi_reg_chan_list_cc_ext_event) }, ++ = { .min_len = sizeof(struct wmi_reg_chan_list_cc_ext_event), .policy = "wmi_reg_chan_list_cc_ext_event" }, + [WMI_TAG_MGMT_RX_HDR] +- = { .min_len = sizeof(struct wmi_mgmt_rx_hdr) }, ++ = { .min_len = sizeof(struct wmi_mgmt_rx_hdr), .policy = "wmi_mgmt_rx_hdr" }, + [WMI_TAG_MGMT_TX_COMPL_EVENT] +- = { .min_len = sizeof(struct wmi_mgmt_tx_compl_event) }, ++ = { .min_len = sizeof(struct wmi_tx_compl_event), .policy = "wmi_tx_compl_event" }, + [WMI_TAG_SCAN_EVENT] +- = { .min_len = sizeof(struct wmi_scan_event) }, ++ = { .min_len = sizeof(struct wmi_scan_event), .policy = "wmi_scan_event" }, + [WMI_TAG_PEER_STA_KICKOUT_EVENT] +- = { .min_len = sizeof(struct wmi_peer_sta_kickout_event) }, ++ = { .min_len = sizeof(struct wmi_peer_sta_kickout_event), .policy = "wmi_peer_sta_kickout_event" }, + [WMI_TAG_ROAM_EVENT] +- = { .min_len = sizeof(struct wmi_roam_event) }, ++ = { .min_len = sizeof(struct wmi_roam_event), .policy = "wmi_roam_event" }, + [WMI_TAG_CHAN_INFO_EVENT] +- = { .min_len = sizeof(struct wmi_chan_info_event) }, ++ = { .min_len = sizeof(struct wmi_chan_info_event), .policy = "wmi_chan_info_event" }, + [WMI_TAG_PDEV_BSS_CHAN_INFO_EVENT] +- = { .min_len = sizeof(struct wmi_pdev_bss_chan_info_event) }, ++ = { .min_len = sizeof(struct wmi_pdev_bss_chan_info_event), .policy = "wmi_pdev_bss_chan_info_event" }, + [WMI_TAG_VDEV_INSTALL_KEY_COMPLETE_EVENT] +- = { .min_len = sizeof(struct wmi_vdev_install_key_compl_event) }, ++ = { .min_len = sizeof(struct wmi_vdev_install_key_compl_event), .policy = "wmi_vdev_install_key_compl_event" }, + [WMI_TAG_READY_EVENT] = { +- .min_len = sizeof(struct wmi_ready_event_min) }, ++ .min_len = sizeof(struct wmi_ready_event_min), .policy = "wmi_ready_event_min" }, + [WMI_TAG_SERVICE_AVAILABLE_EVENT] +- = {.min_len = sizeof(struct wmi_service_available_event) }, ++ = {.min_len = sizeof(struct wmi_service_available_event), .policy = "wmi_service_available_event" }, + [WMI_TAG_PEER_ASSOC_CONF_EVENT] +- = { .min_len = sizeof(struct wmi_peer_assoc_conf_event) }, ++ = { .min_len = sizeof(struct wmi_peer_assoc_conf_event), .policy = "wmi_peer_assoc_conf_event" }, + [WMI_TAG_STATS_EVENT] +- = { .min_len = sizeof(struct wmi_stats_event) }, ++ = { .min_len = sizeof(struct wmi_stats_event), .policy = "wmi_stats_event" }, + [WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT] +- = { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event) }, ++ = { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event), .policy = "wmi_pdev_ctl_failsafe_chk_event" }, + [WMI_TAG_HOST_SWFDA_EVENT] = { +- .min_len = sizeof(struct wmi_fils_discovery_event) }, ++ .min_len = sizeof(struct wmi_fils_discovery_event), .policy = "wmi_fils_discovery_event" }, + [WMI_TAG_OFFLOAD_PRB_RSP_TX_STATUS_EVENT] = { +- .min_len = sizeof(struct wmi_probe_resp_tx_status_event) }, ++ .min_len = sizeof(struct wmi_probe_resp_tx_status_event), .policy = "wmi_probe_resp_tx_status_event" }, + [WMI_TAG_VDEV_DELETE_RESP_EVENT] = { +- .min_len = sizeof(struct wmi_vdev_delete_resp_event) }, ++ .min_len = sizeof(struct wmi_vdev_delete_resp_event), .policy = "wmi_vdev_delete_resp_event" }, + [WMI_TAG_OBSS_COLOR_COLLISION_EVT] = { +- .min_len = sizeof(struct wmi_obss_color_collision_event) }, ++ .min_len = sizeof(struct wmi_obss_color_collision_event), .policy = "wmi_obss_color_collision_event" }, + [WMI_TAG_11D_NEW_COUNTRY_EVENT] = { +- .min_len = sizeof(struct wmi_11d_new_cc_ev) }, ++ .min_len = sizeof(struct wmi_11d_new_cc_ev), .policy = "wmi_11d_new_cc_ev" }, + [WMI_TAG_PER_CHAIN_RSSI_STATS] = { +- .min_len = sizeof(struct wmi_per_chain_rssi_stats) }, ++ .min_len = sizeof(struct wmi_per_chain_rssi_stats), .policy = "wmi_per_chain_rssi_stats" }, + [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = { +- .min_len = sizeof(struct wmi_twt_add_dialog_event) }, ++ .min_len = sizeof(struct wmi_twt_add_dialog_event), .policy = "wmi_twt_add_dialog_event" }, + }; + + #define PRIMAP(_hw_mode_) \ +@@ -203,8 +204,8 @@ ath11k_wmi_tlv_iter(struct ath11k_base * + if (tlv_tag < ARRAY_SIZE(wmi_tlv_policies) && + wmi_tlv_policies[tlv_tag].min_len && + wmi_tlv_policies[tlv_tag].min_len > tlv_len) { +- ath11k_err(ab, "wmi tlv parse failure of tag %u at byte %zd (%u bytes is less than min length %zu)\n", +- tlv_tag, ptr - begin, tlv_len, ++ ath11k_err(ab, "wmi tlv parse failure of tag %u (%s) at byte %zd (%u bytes is less than min length %zu)\n", ++ tlv_tag, wmi_tlv_policies[tlv_tag].policy, ptr - begin, tlv_len, + wmi_tlv_policies[tlv_tag].min_len); + return -EINVAL; + } +@@ -697,6 +698,55 @@ int ath11k_wmi_mgmt_send(struct ath11k * + return ret; + } + ++int ath11k_wmi_qos_null_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, ++ struct sk_buff *frame) ++{ ++ struct ath11k_pdev_wmi *wmi = ar->wmi; ++ struct wmi_qos_null_tx_cmd *cmd; ++ struct wmi_tlv *frame_tlv; ++ struct sk_buff *skb; ++ u32 buf_len; ++ int len, ret = 0; ++ ++ buf_len = frame->len < WMI_QOS_NULL_SEND_BUF_LEN ? ++ frame->len : WMI_QOS_NULL_SEND_BUF_LEN; ++ ++ len = sizeof(*cmd) + sizeof(*frame_tlv) + roundup(buf_len, 4); ++ ++ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, len); ++ if (!skb) ++ return -ENOMEM; ++ ++ cmd = (struct wmi_qos_null_tx_cmd *)skb->data; ++ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_QOS_NULL_FRAME_TX_SEND) | ++ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); ++ cmd->vdev_id = vdev_id; ++ cmd->desc_id = buf_id; ++ cmd->paddr_lo = lower_32_bits(ATH11K_SKB_CB(frame)->paddr); ++ cmd->paddr_hi = upper_32_bits(ATH11K_SKB_CB(frame)->paddr); ++ cmd->frame_len = frame->len; ++ cmd->buf_len = buf_len; ++ ++ frame_tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); ++ frame_tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | ++ FIELD_PREP(WMI_TLV_LEN, buf_len); ++ ++ memcpy(frame_tlv->value, frame->data, buf_len); ++ ++ ath11k_ce_byte_swap(frame_tlv->value, buf_len); ++ ++ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_QOS_NULL_FRAME_TX_SEND_CMDID); ++ if (ret) { ++ ath11k_warn(ar->ab, ++ "failed to submit WMI_QOS_NULL_FRAME_TX_SEND_CMDID cmd\n"); ++ dev_kfree_skb(skb); ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "wmi QOS null tx send cmd sent successfully\n"); ++ return ret; ++} ++ + int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr, + struct vdev_create_params *param) + { +@@ -4103,7 +4153,6 @@ ath11k_wmi_copy_resource_config(struct w + wmi_cfg->max_bssid_rx_filters = tg_cfg->max_bssid_rx_filters; + wmi_cfg->use_pdev_id = tg_cfg->use_pdev_id; + wmi_cfg->flag1 = tg_cfg->flag1; +- wmi_cfg->flag1 |= WMI_RSRC_CFG_FLAG1_ACK_RSSI; + wmi_cfg->peer_map_unmap_v2_support = tg_cfg->peer_map_unmap_v2_support; + wmi_cfg->sched_params = tg_cfg->sched_params; + wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count; +@@ -5856,8 +5905,8 @@ static int ath11k_pull_mgmt_rx_params_tl + return 0; + } + +-static int wmi_process_mgmt_tx_comp(struct ath11k *ar, +- struct wmi_mgmt_tx_compl_event *tx_compl_param) ++static int wmi_process_tx_comp(struct ath11k *ar, ++ struct wmi_tx_compl_event *tx_compl_param) + { + struct sk_buff *msdu; + struct ieee80211_tx_info *info; +@@ -5895,6 +5944,11 @@ static int wmi_process_mgmt_tx_comp(stru + info->status.ack_signal = tx_compl_param->ack_rssi; + } + ++ /* dont update rates in this path, qos null data tx completions also can ++ * take this path in case of nss offload and can update invalid rates. ++ */ ++ info->status.rates[0].idx = -1; ++ + hdr = (struct ieee80211_hdr *)msdu->data; + frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); + +@@ -5913,10 +5967,13 @@ static int wmi_process_mgmt_tx_comp(stru + arvif = ath11k_vif_to_arvif(vif); + mgmt_stats = &arvif->mgmt_stats; + +- if (!tx_compl_param->status) +- mgmt_stats->tx_compl_succ[frm_type]++; +- else +- mgmt_stats->tx_compl_fail[frm_type]++; ++ if (ieee80211_is_mgmt(hdr->frame_control)) { ++ if (!tx_compl_param->status) ++ mgmt_stats->tx_compl_succ[frm_type]++; ++ else ++ mgmt_stats->tx_compl_fail[frm_type]++; ++ } ++ + spin_unlock_bh(&ar->data_lock); + + skip_mgmt_stats: +@@ -5938,12 +5995,13 @@ skip_mgmt_stats: + return 0; + } + +-static int ath11k_pull_mgmt_tx_compl_param_tlv(struct ath11k_base *ab, +- struct sk_buff *skb, +- struct wmi_mgmt_tx_compl_event *param) ++static int ath11k_pull_tx_compl_param_tlv(struct ath11k_base *ab, ++ struct sk_buff *skb, ++ struct wmi_tx_compl_event *param, ++ int event_id) + { + const void **tb; +- const struct wmi_mgmt_tx_compl_event *ev; ++ const struct wmi_tx_compl_event *ev; + int ret; + + tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); +@@ -5953,7 +6011,7 @@ static int ath11k_pull_mgmt_tx_compl_par + return ret; + } + +- ev = tb[WMI_TAG_MGMT_TX_COMPL_EVENT]; ++ ev = tb[event_id]; + if (!ev) { + ath11k_warn(ab, "failed to fetch mgmt tx compl ev"); + kfree(tb); +@@ -7730,10 +7788,11 @@ exit: + + static void ath11k_mgmt_tx_compl_event(struct ath11k_base *ab, struct sk_buff *skb) + { +- struct wmi_mgmt_tx_compl_event tx_compl_param = {0}; ++ struct wmi_tx_compl_event tx_compl_param = {0}; + struct ath11k *ar; + +- if (ath11k_pull_mgmt_tx_compl_param_tlv(ab, skb, &tx_compl_param) != 0) { ++ if (ath11k_pull_tx_compl_param_tlv(ab, skb, &tx_compl_param, ++ WMI_TAG_MGMT_TX_COMPL_EVENT) != 0) { + ath11k_warn(ab, "failed to extract mgmt tx compl event"); + return; + } +@@ -7746,7 +7805,7 @@ static void ath11k_mgmt_tx_compl_event(s + goto exit; + } + +- wmi_process_mgmt_tx_comp(ar, &tx_compl_param); ++ wmi_process_tx_comp(ar, &tx_compl_param); + + ath11k_dbg(ab, ATH11K_DBG_MGMT, + "event mgmt tx compl ev pdev_id %d, desc_id %d, status %d ack_rssi %d", +@@ -7757,6 +7816,36 @@ exit: + rcu_read_unlock(); + } + ++static void ath11k_qos_null_compl_event(struct ath11k_base *ab, struct sk_buff *skb) ++{ ++ struct wmi_tx_compl_event tx_compl_param = {0}; ++ struct ath11k *ar; ++ ++ if (ath11k_pull_tx_compl_param_tlv(ab, skb, &tx_compl_param, ++ WMI_TAG_QOS_NULL_FRAME_TX_STATUS) != 0) { ++ ath11k_warn(ab, "failed to extract qos null tx compl event"); ++ return; ++ } ++ ++ rcu_read_lock(); ++ ar = ath11k_mac_get_ar_by_pdev_id(ab, tx_compl_param.pdev_id); ++ if (!ar) { ++ ath11k_warn(ab, "invalid pdev id %d in qos_null_tx_compl_event\n", ++ tx_compl_param.pdev_id); ++ goto exit; ++ } ++ ++ wmi_process_tx_comp(ar, &tx_compl_param); ++ ++ ath11k_dbg(ab, ATH11K_DBG_WMI, ++ "QOS null tx compl ev pdev_id %d, desc_id %d, status %d", ++ tx_compl_param.pdev_id, tx_compl_param.desc_id, ++ tx_compl_param.status); ++ ++exit: ++ rcu_read_unlock(); ++} ++ + static struct ath11k *ath11k_get_ar_on_scan_state(struct ath11k_base *ab, + u32 vdev_id, + enum ath11k_scan_state state) +@@ -8843,6 +8932,9 @@ static void ath11k_wmi_tlv_op_rx(struct + case WMI_GTK_OFFLOAD_STATUS_EVENTID: + ath11k_wmi_gtk_offload_status_event(ab, skb); + break; ++ case WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID: ++ ath11k_qos_null_compl_event(ab, skb); ++ break; + default: + ath11k_dbg(ab, ATH11K_DBG_WMI, "unsupported event id 0x%x\n", id); + break; +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -363,6 +363,7 @@ enum wmi_tlv_cmd_id { + WMI_BSS_COLOR_CHANGE_ENABLE_CMDID, + WMI_VDEV_BCN_OFFLOAD_QUIET_CONFIG_CMDID, + WMI_FILS_DISCOVERY_TMPL_CMDID, ++ WMI_QOS_NULL_FRAME_TX_SEND_CMDID, + WMI_ADDBA_CLEAR_RESP_CMDID = WMI_TLV_CMD(WMI_GRP_BA_NEG), + WMI_ADDBA_SEND_CMDID, + WMI_ADDBA_STATUS_CMDID, +@@ -693,6 +694,8 @@ enum wmi_tlv_event_id { + WMI_TBTTOFFSET_EXT_UPDATE_EVENTID, + WMI_OFFCHAN_DATA_TX_COMPLETION_EVENTID, + WMI_HOST_FILS_DISCOVERY_EVENTID, ++ WMI_HOST_SWBA_V2_EVENTID, ++ WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID, + WMI_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_CMD(WMI_GRP_BA_NEG), + WMI_TX_ADDBA_COMPLETE_EVENTID, + WMI_BA_RSP_SSN_EVENTID, +@@ -1880,6 +1883,9 @@ enum wmi_tlv_tag { + WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT, + WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8, + WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD, ++ /* TODO add all the missing cmds */ ++ WMI_TAG_QOS_NULL_FRAME_TX_SEND = 0x3A6, ++ WMI_TAG_QOS_NULL_FRAME_TX_STATUS, + WMI_TAG_MAX + }; + +@@ -2107,7 +2113,17 @@ enum wmi_tlv_service { + WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246, + WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, + WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253, ++ WMI_TLV_SERVICE_CONFIGURE_ROAM_TRIGGER_PARAM_SUPPORT = 254, ++ WMI_TLV_SERVICE_CFR_TA_RA_AS_FP_SUPPORT = 255, ++ WMI_TLV_SERVICE_CFR_CAPTURE_COUNT_SUPPORT = 256, ++ WMI_TLV_SERVICE_OCV_SUPPORT = 257, ++ WMI_TLV_SERVICE_LL_STATS_PER_CHAN_RX_TX_TIME_SUPPORT = 258, ++ WMI_TLV_SERVICE_THERMAL_MULTI_CLIENT_SUPPORT = 259, ++ WMI_TLV_SERVICE_NAN_SEND_NAN_ENABLE_RESPONSE_TO_HOST = 260, ++ WMI_TLV_SERVICE_UNIFIED_LL_GET_STA_CMD_SUPPORT = 261, ++ WMI_TLV_SERVICE_FSE_CMEM_ALLOC_SUPPORT = 262, + WMI_TLV_SERVICE_PASSIVE_SCAN_START_TIME_ENHANCE = 263, ++ WMI_TLV_SERVICE_QOS_NULL_FRAME_TX_OVER_WMI = 264, + + /* The second 128 bits */ + WMI_MAX_EXT_SERVICE = 256, +@@ -3814,6 +3830,7 @@ struct wmi_scan_prob_req_oui_cmd { + } __packed; + + #define WMI_MGMT_SEND_DOWNLD_LEN 64 ++#define WMI_QOS_NULL_SEND_BUF_LEN 64 + + #define WMI_TX_PARAMS_DWORD0_POWER GENMASK(7, 0) + #define WMI_TX_PARAMS_DWORD0_MCS_MASK GENMASK(19, 8) +@@ -3824,9 +3841,10 @@ struct wmi_scan_prob_req_oui_cmd { + #define WMI_TX_PARAMS_DWORD1_BW_MASK GENMASK(14, 8) + #define WMI_TX_PARAMS_DWORD1_PREAMBLE_TYPE GENMASK(19, 15) + #define WMI_TX_PARAMS_DWORD1_FRAME_TYPE BIT(20) +-#define WMI_TX_PARAMS_DWORD1_RSVD GENMASK(31, 21) ++#define WMI_TX_PARAMS_DWORD1_CFR_CAPTURE BIT(21) ++#define WMI_TX_PARAMS_DWORD1_RSVD GENMASK(31, 22) + +-struct wmi_mgmt_send_params { ++struct wmi_tx_send_params { + u32 tlv_header; + u32 tx_params_dword0; + u32 tx_params_dword1; +@@ -4570,7 +4588,6 @@ struct wmi_pdev_bss_chan_info_event { + u32 rx_bss_cycle_count_low; + u32 rx_bss_cycle_count_high; + u32 pdev_id; +- u32 ack_rssi; + } __packed; + + #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0 +@@ -4918,7 +4935,7 @@ struct wmi_rssi_ctl_ext { + u32 rssi_ctl_ext[MAX_ANTENNA_EIGHT - ATH_MAX_ANTENNA]; + }; + +-struct wmi_mgmt_tx_compl_event { ++struct wmi_tx_compl_event { + u32 desc_id; + u32 status; + u32 pdev_id; +@@ -5748,6 +5765,17 @@ struct wmi_debug_log_config_cmd_fixed_pa + u32 value; + } __packed; + ++struct wmi_qos_null_tx_cmd { ++ u32 tlv_header; ++ u32 vdev_id; ++ u32 desc_id; ++ u32 paddr_lo; ++ u32 paddr_hi; ++ u32 frame_len; ++ u32 buf_len; ++ u32 tx_params_valid; ++} __packed; ++ + #define WMI_MAX_MEM_REQS 32 + + #define MAX_RADIOS 3 +@@ -6358,6 +6386,8 @@ int ath11k_wmi_cmd_send(struct ath11k_pd + struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len); + int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, + struct sk_buff *frame); ++int ath11k_wmi_qos_null_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, ++ struct sk_buff *frame); + int ath11k_wmi_bcn_tmpl(struct ath11k *ar, u32 vdev_id, + struct ieee80211_mutable_offsets *offs, + struct sk_buff *bcn, u32 ema_param); diff --git a/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch b/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch new file mode 100644 index 00000000000000..0b9d559a4857ae --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch @@ -0,0 +1,906 @@ +From 30f54666ae15128f26fbad787a35253885a10513 Mon Sep 17 00:00:00 2001 +From: Ramya Gnanasekar +Date: Fri, 25 Dec 2020 16:11:06 +0530 +Subject: [PATCH] ath11k: Disable rx_header tlv for 2K SKB + +On low memory platform hdr_status in hal_rx_desc is not subscribed to +get a savings of 128bytes in skb. This is required to reduce the skb +size from 4K to 2K. Use HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG message +to unsubscribe rx_pkt_header tlv for rxdma ring. + +Signed-off-by: Ramya Gnanasekar + +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -666,6 +666,7 @@ static ssize_t ath11k_write_extd_rx_stat + } + + ar->debug.rx_filter = tlv_filter.rx_filter; ++ tlv_filter.offset_valid = false; + + for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; +@@ -1111,6 +1112,7 @@ static ssize_t ath11k_write_pktlog_filte + } + + /* Clear rx filter set for monitor mode and rx status */ ++ tlv_filter.offset_valid = false; + for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; + ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id, +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -219,7 +219,8 @@ struct ath11k_pdev_dp { + #define DP_REO_CMD_RING_SIZE 256 + #define DP_REO_STATUS_RING_SIZE 2048 + #define DP_RXDMA_BUF_RING_SIZE 4096 +-#define DP_RXDMA_REFILL_RING_SIZE 2048 ++#define DP_RXDMA_REFILL_RING_SIZE ATH11K_DP_RXDMA_REFILL_RING_SIZE ++#define DP_RXDMA_NSS_REFILL_RING_SIZE ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE + #define DP_RXDMA_ERR_DST_RING_SIZE 1024 + #define DP_RXDMA_MON_STATUS_RING_SIZE ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE + #define DP_RXDMA_MONITOR_BUF_RING_SIZE ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE +@@ -609,7 +610,7 @@ enum htt_ppdu_stats_tag_type { + * + * |31 26|25|24|23 16|15 8|7 0| + * |-----------------+----------------+----------------+---------------| +- * | rsvd1 |PS|SS| ring_id | pdev_id | msg_type | ++ * | rsvd1|OV|PS|SS| ring_id | pdev_id | msg_type | + * |-------------------------------------------------------------------| + * | rsvd2 | ring_buffer_size | + * |-------------------------------------------------------------------| +@@ -623,6 +624,14 @@ enum htt_ppdu_stats_tag_type { + * |-------------------------------------------------------------------| + * | tlv_filter_in_flags | + * |-------------------------------------------------------------------| ++ * | rx_header_offset | rx_packet_offset | ++ * |-------------------------------------------------------------------| ++ * | rx_mpdu_start_offset | rx_mpdu_end_offset | ++ * |-------------------------------------------------------------------| ++ * | rx_msdu_start_offset | rx_msdu_end_offset | ++ * |-------------------------------------------------------------------| ++ * | rsvd3 | rx_attention_offset | ++ * |-------------------------------------------------------------------| + * Where: + * PS = pkt_swap + * SS = status_swap +@@ -636,6 +645,9 @@ enum htt_ppdu_stats_tag_type { + * More details can be got from enum htt_srng_ring_id + * b'24 - status_swap: 1 is to swap status TLV + * b'25 - pkt_swap: 1 is to swap packet TLV ++ * b'26 - rx_offset_valid (OV): flag to indicate rx offsets ++ * configuration fields are valid ++ * + * b'26:31 - rsvd1: reserved for future use + * dword1 - b'0:16 - ring_buffer_size: size of buffers referenced by rx ring, + * in byte units. +@@ -665,6 +677,42 @@ enum htt_ppdu_stats_tag_type { + * dword6 - b'0:31 - tlv_filter_in_flags: + * Filter in Attention/MPDU/PPDU/Header/User tlvs + * Refer to CFG_TLV_FILTER_IN_FLAG defs ++ * dword7 - b'0:15 - rx_packet_offset: rx_packet_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_1 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rx_header_offset: rx_header_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_1 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * dword8 - b'0:15 - rx_mpdu_end_offset: rx_mpdu_end_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_2 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rx_mpdu_start_offset: rx_mpdu_start_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_2 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * dword9 - b'0:15 - rx_msdu_end_offset: rx_msdu_end_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_3 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rx_msdu_start_offset: rx_msdu_start_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_3 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * dword10- b'0:15 - rx_attention_offset: rx_attention_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_4 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rsvd3 for future use + */ + + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) +@@ -672,8 +720,16 @@ enum htt_ppdu_stats_tag_type { + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID GENMASK(23, 16) + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS BIT(24) + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS BIT(25) ++#define HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID BIT(26) + + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET GENMASK(31, 16) ++#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET GENMASK(31, 16) ++#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET GENMASK(31, 16) ++#define HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET GENMASK(15, 0) + + enum htt_rx_filter_tlv_flags { + HTT_RX_FILTER_TLV_FLAGS_MPDU_START = BIT(0), +@@ -977,6 +1033,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { + HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ + HTT_RX_FILTER_TLV_FLAGS_ATTENTION) + ++#define HTT_RX_RXDMA_FILTER_TLV_FLAGS_BUF_RING \ ++ (HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \ ++ HTT_RX_FILTER_TLV_FLAGS_MSDU_START | \ ++ HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \ ++ HTT_RX_FILTER_TLV_FLAGS_MSDU_END | \ ++ HTT_RX_FILTER_TLV_FLAGS_MPDU_END | \ ++ HTT_RX_FILTER_TLV_FLAGS_ATTENTION) ++ + struct htt_rx_ring_selection_cfg_cmd { + u32 info0; + u32 info1; +@@ -985,6 +1049,10 @@ struct htt_rx_ring_selection_cfg_cmd { + u32 pkt_type_en_flags2; + u32 pkt_type_en_flags3; + u32 rx_filter_tlv; ++ u32 rx_packet_offset; ++ u32 rx_mpdu_offset; ++ u32 rx_msdu_offset; ++ u32 rx_attn_offset; + } __packed; + + struct htt_rx_ring_tlv_filter { +@@ -993,6 +1061,14 @@ struct htt_rx_ring_tlv_filter { + u32 pkt_filter_flags1; /* MGMT */ + u32 pkt_filter_flags2; /* CTRL */ + u32 pkt_filter_flags3; /* DATA */ ++ bool offset_valid; ++ u16 rx_packet_offset; ++ u16 rx_header_offset; ++ u16 rx_mpdu_end_offset; ++ u16 rx_mpdu_start_offset; ++ u16 rx_msdu_end_offset; ++ u16 rx_msdu_start_offset; ++ u16 rx_attn_offset; + }; + + #define HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -70,6 +70,12 @@ static inline bool ath11k_dp_rx_h_mpdu_s + return ab->hw_params.hw_ops->rx_desc_get_mpdu_fc_valid(desc); + } + ++static u16 ath11k_dp_rxdesc_get_mpdu_frame_ctrl(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) ++{ ++ return ab->hw_params.hw_ops->rx_desc_get_mpdu_frame_ctl(desc); ++} ++ + static inline bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab, + struct sk_buff *skb) + { +@@ -306,6 +312,35 @@ static u8 *ath11k_dp_rxdesc_mpdu_start_a + return ab->hw_params.hw_ops->rx_desc_mpdu_start_addr2(desc); + } + ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static void ath11k_dp_get_rx_header_offset(struct ath11k_base *ab, ++ struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ ab->hw_params.hw_ops->rx_desc_get_offset(tlv_filter); ++} ++#endif ++ ++static bool ath11k_dp_rx_desc_dot11_hdr_fields_valid(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) ++{ ++ return ab->hw_params.hw_ops->rx_desc_dot11_hdr_fields_valid(desc); ++} ++ ++static void ath11k_dp_rx_desc_get_dot11_hdr(struct ath11k_base *ab, ++ struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr) ++{ ++ ab->hw_params.hw_ops->rx_desc_get_dot11_hdr(desc, hdr); ++} ++ ++static void ath11k_dp_rx_desc_get_crypto_header(struct ath11k_base *ab, ++ struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype) ++{ ++ ab->hw_params.hw_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype); ++} ++ + static void ath11k_dp_service_mon_ring(struct timer_list *t) + { + struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer); +@@ -1976,6 +2011,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a + return 0; + } + ++static void ath11k_get_dot11_hdr_from_rx_desc(struct ath11k *ar, ++ struct sk_buff *msdu, ++ struct ath11k_skb_rxcb *rxcb, ++ struct ieee80211_rx_status *status, ++ enum hal_encrypt_type enctype) ++{ ++ struct hal_rx_desc *rx_desc = rxcb->rx_desc; ++ struct ath11k_base *ab = ar->ab; ++ size_t hdr_len, crypto_len; ++ struct ieee80211_hdr *hdr; ++ u16 fc, qos_ctl = 0; ++ u8 *crypto_hdr; ++ ++ if (!(status->flag & RX_FLAG_IV_STRIPPED)) { ++ crypto_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ crypto_hdr = skb_push(msdu, crypto_len); ++ ath11k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); ++ } ++ ++ fc = ath11k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc); ++ hdr_len = ieee80211_hdrlen(fc); ++ skb_push(msdu, hdr_len); ++ hdr = (struct ieee80211_hdr *)msdu->data; ++ hdr->frame_control = fc; ++ ++ /* Get wifi header from rx_desc */ ++ ath11k_dp_rx_desc_get_dot11_hdr(ab, rx_desc, hdr); ++ ++ if (rxcb->is_mcbc) ++ status->flag &= ~RX_FLAG_PN_VALIDATED; ++ ++ /* Add QOS header */ ++ if (ieee80211_is_data_qos(hdr->frame_control)) { ++ qos_ctl = rxcb->tid; ++ if (ath11k_dp_rx_h_msdu_start_mesh_ctl_present(ab, rx_desc)) ++ qos_ctl |= IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT; ++ ++ /* TODO Add other QoS ctl fields when required */ ++ memcpy(msdu->data + (hdr_len - IEEE80211_QOS_CTL_LEN), ++ &qos_ctl, IEEE80211_QOS_CTL_LEN); ++ } ++} ++ + static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, + struct sk_buff *msdu, + u8 *first_hdr, +@@ -1989,7 +2067,8 @@ static void ath11k_dp_rx_h_undecap_nwifi + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + u16 qos_ctl = 0; +- u8 *qos; ++ u8 *qos, *crypto_hdr; ++ bool add_qos_ctrl = false; + + /* copy SA & DA and pull decapped header */ + hdr = (struct ieee80211_hdr *)msdu->data; +@@ -1998,7 +2077,7 @@ static void ath11k_dp_rx_h_undecap_nwifi + ether_addr_copy(sa, ieee80211_get_SA(hdr)); + skb_pull(msdu, ieee80211_hdrlen(hdr->frame_control)); + +- if (rxcb->is_first_msdu) { ++ if (rxcb->is_first_msdu && first_hdr) { + /* original 802.11 header is valid for the first msdu + * hence we can reuse the same header + */ +@@ -2028,16 +2107,23 @@ static void ath11k_dp_rx_h_undecap_nwifi + + /* copy decap header before overwriting for reuse below */ + memcpy(decap_hdr, (uint8_t *)hdr, hdr_len); ++ add_qos_ctrl = true; + } + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ if (first_hdr) { ++ memcpy(skb_push(msdu, ++ ath11k_dp_rx_crypto_param_len(ar, enctype)), ++ (void *)hdr + hdr_len, ++ ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ } else { ++ crypto_hdr = skb_push(msdu, ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ ath11k_dp_rx_desc_get_crypto_header(ar->ab, ++ rxcb->rx_desc, crypto_hdr, enctype); ++ } + } + +- if (!rxcb->is_first_msdu) { ++ if (!rxcb->is_first_msdu || add_qos_ctrl) { + memcpy(skb_push(msdu, + IEEE80211_QOS_CTL_LEN), &qos_ctl, + IEEE80211_QOS_CTL_LEN); +@@ -2153,6 +2239,20 @@ static void ath11k_dp_rx_h_undecap_eth(s + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + void *rfc1042; ++ struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); ++ struct ath11k_dp_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}}; ++ ++ if (!first_hdr) { ++ eth = (struct ethhdr *)msdu->data; ++ ether_addr_copy(da, eth->h_dest); ++ ether_addr_copy(sa, eth->h_source); ++ rfc.snap_type = eth->h_proto; ++ skb_pull(msdu, sizeof(struct ethhdr)); ++ memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), &rfc, ++ sizeof(struct ath11k_dp_rfc1042_hdr)); ++ ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); ++ goto exit; ++ } + + rfc1042 = ath11k_dp_rx_h_find_rfc1042(ar, msdu, enctype); + if (WARN_ON_ONCE(!rfc1042)) +@@ -2181,6 +2281,7 @@ static void ath11k_dp_rx_h_undecap_eth(s + + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + ++exit: + /* original 802.11 header has a different DA and in + * case of 4addr it may also have different SA + */ +@@ -2199,6 +2300,7 @@ static void ath11k_dp_rx_h_undecap_snap( + size_t hdr_len; + u8 l3_pad_bytes; + struct hal_rx_desc *rx_desc; ++ struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + + /* Delivered decapped frame: + * [amsdu header] <-- replaced with 802.11 hdr +@@ -2212,6 +2314,11 @@ static void ath11k_dp_rx_h_undecap_snap( + skb_put(msdu, l3_pad_bytes); + skb_pull(msdu, sizeof(struct ath11k_dp_amsdu_subframe_hdr) + l3_pad_bytes); + ++ if (!first_hdr) { ++ ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); ++ return; ++ } ++ + hdr = (struct ieee80211_hdr *)first_hdr; + hdr_len = ieee80211_hdrlen(hdr->frame_control); + +@@ -2608,6 +2715,20 @@ static int ath11k_dp_rx_process_msdu(str + goto free_out; + } + ++ hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); ++ /* wifi hdr fields validation for 512M:: ++ * Mcast packets in ethernet frame mode ++ * will need wifi hdr in msdu to validate PN. ++ * Header will be added in undecap routine. ++ * Validation on wifi hdr fields from rx_desc. ++ */ ++ if (!hdr_status && ath11k_dp_rx_h_attn_is_mcbc(ab, rx_desc) && ++ !ath11k_dp_rx_desc_dot11_hdr_fields_valid(ab, rx_desc)) { ++ ath11k_warn(ab, "One or more invalid dot11 header fields\n"); ++ ret = -EIO; ++ goto free_out; ++ } ++ + rxcb = ATH11K_SKB_RXCB(msdu); + rxcb->rx_desc = rx_desc; + msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ab, rx_desc); +@@ -2620,8 +2741,9 @@ static int ath11k_dp_rx_process_msdu(str + hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); + ret = -EINVAL; + ath11k_warn(ab, "invalid msdu len %u\n", msdu_len); +- ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", hdr_status, +- sizeof(struct ieee80211_hdr)); ++ if (hdr_status) ++ ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", hdr_status, ++ sizeof(struct ieee80211_hdr)); + ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", rx_desc, + sizeof(struct hal_rx_desc)); + goto free_out; +@@ -3283,6 +3405,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi + + hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); + hdr_len = ieee80211_hdrlen(hdr->frame_control); ++ + head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN; + tail_len = IEEE80211_CCMP_MIC_LEN + IEEE80211_TKIP_ICV_LEN + FCS_LEN; + +@@ -3563,8 +3686,8 @@ static void ath11k_dp_rx_h_sort_frags(st + + static u64 ath11k_dp_rx_h_get_pn(struct ath11k *ar, struct sk_buff *skb) + { +- struct ieee80211_hdr *hdr; + u64 pn = 0; ++ struct ieee80211_hdr *hdr; + u8 *ehdr; + u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; + +@@ -3794,8 +3917,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 + if ((msdu_len + hal_rx_desc_sz) > DP_RX_BUFFER_SIZE) { + hdr_status = ath11k_dp_rx_h_80211_hdr(ar->ab, rx_desc); + ath11k_warn(ar->ab, "invalid msdu leng %u", msdu_len); +- ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", hdr_status, +- sizeof(struct ieee80211_hdr)); ++ if (hdr_status) ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", hdr_status, ++ sizeof(struct ieee80211_hdr)); + ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", rx_desc, + sizeof(struct hal_rx_desc)); + dev_kfree_skb_any(msdu); +@@ -4418,6 +4542,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 + ath11k_dp_rxdma_pdev_buf_free(ar); + } + ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static int ath11k_dp_rxdma_ring_sel_config(struct ath11k *ar) ++{ ++ struct ath11k_pdev_dp *dp = &ar->dp; ++ struct htt_rx_ring_tlv_filter tlv_filter = {0}; ++ u32 ring_id; ++ int ret; ++ u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; ++ ++ ring_id = dp->rx_refill_buf_ring.refill_buf_ring.ring_id; ++ ++ tlv_filter.rx_filter = HTT_RX_RXDMA_FILTER_TLV_FLAGS_BUF_RING; ++ tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR; ++ tlv_filter.pkt_filter_flags3 = HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST | ++ HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST; ++ tlv_filter.offset_valid = true; ++ tlv_filter.rx_packet_offset = hal_rx_desc_sz; ++ tlv_filter.rx_header_offset = 0; ++ ++ ath11k_dp_get_rx_header_offset(ar->ab, &tlv_filter); ++ ++ if (!ar->ab->nss.enabled) ++ ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, dp->mac_id, ++ HAL_RXDMA_BUF, ++ DP_RXDMA_REFILL_RING_SIZE, ++ &tlv_filter); ++ else ++ ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, dp->mac_id, ++ HAL_RXDMA_BUF, ++ DP_RXDMA_NSS_REFILL_RING_SIZE, ++ &tlv_filter); ++ ++ return ret; ++} ++#else ++static int ath11k_dp_rxdma_ring_sel_config(struct ath11k *ar) ++{ ++ return 0; ++} ++#endif ++ + int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) + { + struct ath11k *ar = ab->pdevs[mac_id].ar; +@@ -4511,6 +4676,12 @@ config_refill_ring: + } + } + ++ ret = ath11k_dp_rxdma_ring_sel_config(ar); ++ if (ret) { ++ ath11k_warn(ab, "failed to setup rxdma ring selection config\n"); ++ return ret; ++ } ++ + return 0; + } + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -1127,6 +1127,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str + !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); + cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS, + !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); ++ cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID, ++ tlv_filter->offset_valid); + + cmd->info1 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE, + rx_buf_size); +@@ -1136,6 +1138,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str + cmd->pkt_type_en_flags3 = tlv_filter->pkt_filter_flags3; + cmd->rx_filter_tlv = tlv_filter->rx_filter; + ++ if (tlv_filter->offset_valid) { ++ cmd->rx_packet_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET, ++ tlv_filter->rx_packet_offset); ++ cmd->rx_packet_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET, ++ tlv_filter->rx_header_offset); ++ ++ cmd->rx_mpdu_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET, ++ tlv_filter->rx_mpdu_end_offset); ++ cmd->rx_mpdu_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET, ++ tlv_filter->rx_mpdu_start_offset); ++ ++ cmd->rx_msdu_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET, ++ tlv_filter->rx_msdu_end_offset); ++ cmd->rx_msdu_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET, ++ tlv_filter->rx_msdu_start_offset); ++ ++ cmd->rx_attn_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET, ++ tlv_filter->rx_attn_offset); ++ } ++ + ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); + if (ret) + goto err_free; +@@ -1214,6 +1236,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c + } + + ring_id = dp->rxdma_mon_buf_ring.refill_buf_ring.ring_id; ++ tlv_filter.offset_valid = false; + + if (!reset) { + tlv_filter.rx_filter = HTT_RX_MON_FILTER_TLV_FLAGS_MON_BUF_RING; +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -260,7 +260,11 @@ static u8 ath11k_hw_ipq8074_rx_desc_get_ + + static u8 *ath11k_hw_ipq8074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) + { ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + return desc->u.ipq8074.hdr_status; ++#else ++ return NULL; ++#endif + } + + static bool ath11k_hw_ipq8074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) +@@ -395,26 +399,132 @@ static void ath11k_hw_ipq8074_rx_desc_se + desc->u.ipq8074.msdu_start.info1 = __cpu_to_le32(info); + } + ++static ++struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc) ++{ ++ return &desc->u.ipq8074.attention; ++} ++ ++static u8 *ath11k_hw_ipq8074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc) ++{ ++ return &desc->u.ipq8074.msdu_payload[0]; ++} ++ ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static void ath11k_hw_ipq8074_rx_desc_get_offset(struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ tlv_filter->rx_mpdu_end_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, mpdu_end_tag)); ++ tlv_filter->rx_mpdu_start_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, mpdu_start_tag)); ++ tlv_filter->rx_msdu_end_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, msdu_end_tag)); ++ tlv_filter->rx_msdu_start_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, msdu_start_tag)); ++ tlv_filter->rx_attn_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, rx_attn_tag)); ++} ++#endif ++ ++static u16 ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl(struct hal_rx_desc *desc) ++{ ++ return __le16_to_cpu(desc->u.ipq8074.mpdu_start.frame_ctrl); ++} ++ + static bool ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) + { + return __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & + RX_MPDU_START_INFO1_MAC_ADDR2_VALID; + } + +-static u8 *ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) ++static u8* ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) + { + return desc->u.ipq8074.mpdu_start.addr2; + } + +-static +-struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc) ++static bool ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid(struct hal_rx_desc *desc) + { +- return &desc->u.ipq8074.attention; ++ if ((ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(desc) && ++ ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid(desc) && ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & ++ RX_MPDU_START_INFO1_MAC_ADDR1_VALID && ++ ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(desc) && ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & ++ RX_MPDU_START_INFO1_MAC_ADDR3_VALID && ++ FIELD_GET((RX_MPDU_START_INFO1_MPDU_DUR_VALID), ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1)))) { ++ return true; ++ } ++ return false; ++} ++ ++static void ath11k_hw_ipq8074_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr) ++{ ++ hdr->frame_control = __le16_to_cpu(desc->u.ipq8074.mpdu_start.frame_ctrl); ++ hdr->duration_id = __le16_to_cpu(desc->u.ipq8074.mpdu_start.duration); ++ ether_addr_copy(hdr->addr1, desc->u.ipq8074.mpdu_start.addr1); ++ ether_addr_copy(hdr->addr2, desc->u.ipq8074.mpdu_start.addr2); ++ ether_addr_copy(hdr->addr3, desc->u.ipq8074.mpdu_start.addr3); ++ if (__le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & ++ RX_MPDU_START_INFO1_MAC_ADDR4_VALID) { ++ ether_addr_copy(hdr->addr4, desc->u.ipq8074.mpdu_start.addr4); ++ } ++ hdr->seq_ctrl = __le16_to_cpu(desc->u.ipq8074.mpdu_start.seq_ctrl); ++} ++ ++static void ath11k_hw_ipq8074_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype) ++{ ++ unsigned int key_id; ++ ++ switch (enctype) { ++ case HAL_ENCRYPT_TYPE_OPEN: ++ return; ++ case HAL_ENCRYPT_TYPE_TKIP_NO_MIC: ++ case HAL_ENCRYPT_TYPE_TKIP_MIC: ++ crypto_hdr[0] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[1] = 0; ++ crypto_hdr[2] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[0]); ++ break; ++ case HAL_ENCRYPT_TYPE_CCMP_128: ++ case HAL_ENCRYPT_TYPE_CCMP_256: ++ case HAL_ENCRYPT_TYPE_GCMP_128: ++ case HAL_ENCRYPT_TYPE_AES_GCMP_256: ++ crypto_hdr[0] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[1] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[2] = 0; ++ break; ++ case HAL_ENCRYPT_TYPE_WEP_40: ++ case HAL_ENCRYPT_TYPE_WEP_104: ++ case HAL_ENCRYPT_TYPE_WEP_128: ++ case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4: ++ case HAL_ENCRYPT_TYPE_WAPI: ++ return; ++ } ++ key_id = FIELD_GET(RX_MPDU_START_INFO5_KEY_ID, ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info5)); ++ crypto_hdr[3] = 0x20 | (key_id << 6); ++ crypto_hdr[4] = HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[5] = HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[1]); ++ crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[1]); + } + +-static u8 *ath11k_hw_ipq8074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc) ++static bool ath11k_hw_qcn9074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) + { +- return &desc->u.ipq8074.msdu_payload[0]; ++ return __le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & ++ RX_MPDU_START_INFO11_MAC_ADDR2_VALID; ++} ++ ++static u8* ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) ++{ ++ return desc->u.qcn9074.mpdu_start.addr2; + } + + static bool ath11k_hw_qcn9074_rx_desc_get_first_msdu(struct hal_rx_desc *desc) +@@ -437,7 +547,11 @@ static u8 ath11k_hw_qcn9074_rx_desc_get_ + + static u8 *ath11k_hw_qcn9074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) + { ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + return desc->u.qcn9074.hdr_status; ++#else ++ return NULL; ++#endif + } + + static bool ath11k_hw_qcn9074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) +@@ -614,7 +728,11 @@ static u8 ath11k_hw_wcn6855_rx_desc_get_ + + static u8 *ath11k_hw_wcn6855_rx_desc_get_hdr_status(struct hal_rx_desc *desc) + { ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + return desc->u.wcn6855.hdr_status; ++#else ++ return NULL; ++#endif + } + + static bool ath11k_hw_wcn6855_rx_desc_encrypt_valid(struct hal_rx_desc *desc) +@@ -956,6 +1074,13 @@ const struct ath11k_hw_ops ipq8074_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, ++#endif ++ .rx_desc_get_mpdu_frame_ctl = ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl, ++ .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, ++ .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, ++ .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, + }; + + const struct ath11k_hw_ops ipq6018_ops = { +@@ -1043,6 +1168,8 @@ const struct ath11k_hw_ops qcn9074_ops = + .wmi_init_config = ath11k_init_wmi_config_ipq8074, + .mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_ipq8074, + .mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_ipq8074, ++ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, ++ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, + .tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable, + .rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu, + .rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu, +@@ -1073,8 +1200,6 @@ const struct ath11k_hw_ops qcn9074_ops = + .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, + .reo_setup = ath11k_hw_ipq8074_reo_setup, + .mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid, +- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, +- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + }; + +--- a/drivers/net/wireless/ath/ath11k/hw.h ++++ b/drivers/net/wireless/ath/ath11k/hw.h +@@ -22,6 +22,11 @@ + #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 + #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 + #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 ++#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 ++/* 256b desc TLV + 4b(rounded) Pad + 30byte max nwifi header + ++ * 18byte mesh hdr + 8byte snap + 1500 eth payload ++ */ ++#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 1816 + #else + /* Num VDEVS per radio */ + #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs) +@@ -34,6 +39,8 @@ + #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 + #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 + #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 ++#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 ++#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 2048 + #endif + + /* Num of peers for Single Radio mode */ +@@ -129,6 +136,8 @@ enum ath11k_bus { + + struct hal_rx_desc; + struct hal_tcl_data_cmd; ++struct htt_rx_ring_tlv_filter; ++enum hal_encrypt_type; + + struct ath11k_hw_ring_mask { + u8 tx[ATH11K_EXT_IRQ_GRP_NUM_MAX]; +@@ -218,6 +227,7 @@ struct ath11k_hw_params { + const struct ath11k_hw_hal_params *hal_params; + bool supports_dynamic_smps_6ghz; + bool alloc_cacheable_memory; ++ u8 reo_dest_ring_map_shift; + bool supports_rssi_stats; + bool fw_wmi_diag_event; + bool current_cc_support; +@@ -285,6 +295,16 @@ struct ath11k_hw_ops { + bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); + u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); + u32 (*get_ring_selector)(struct sk_buff *skb); ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ void (*rx_desc_get_offset)(struct htt_rx_ring_tlv_filter *tlv_filter); ++#endif ++ u16 (*rx_desc_get_mpdu_frame_ctl)(struct hal_rx_desc *desc); ++ bool (*rx_desc_dot11_hdr_fields_valid)(struct hal_rx_desc *desc); ++ void (*rx_desc_get_dot11_hdr)(struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr); ++ void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype); + }; + + extern const struct ath11k_hw_ops ipq8074_ops; +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -3421,7 +3421,7 @@ static int ath11k_mac_config_obss_pd(str + + static void ath11k_mac_op_nss_bss_info_changed(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, +- u32 changed) ++ u64 changed) + { + struct ath11k *ar = hw->priv; + struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); +@@ -6340,6 +6340,7 @@ static int ath11k_mac_config_mon_status_ + tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); + } + ++ tlv_filter.offset_valid = false; + for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; + ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, +@@ -9716,8 +9717,6 @@ static int __ath11k_mac_register(struct + wiphy_ext_feature_set(ar->hw->wiphy, + NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); + +- wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); +- + ar->hw->queues = ATH11K_HW_MAX_QUEUES; + ar->hw->wiphy->tx_queue_len = ATH11K_QUEUE_LEN; + ar->hw->offchannel_tx_hw_queue = ATH11K_HW_MAX_QUEUES - 1; +--- a/drivers/net/wireless/ath/ath11k/rx_desc.h ++++ b/drivers/net/wireless/ath/ath11k/rx_desc.h +@@ -1442,9 +1442,11 @@ struct hal_rx_desc_ipq8074 { + __le32 mpdu_end_tag; + struct rx_mpdu_end mpdu_end; + u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + __le32 hdr_status_tag; + __le32 phy_ppdu_id; + u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; ++#endif + u8 msdu_payload[]; + } __packed; + +@@ -1461,9 +1463,11 @@ struct hal_rx_desc_qcn9074 { + __le32 mpdu_end_tag; + struct rx_mpdu_end mpdu_end; + u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + __le32 hdr_status_tag; + __le32 phy_ppdu_id; + u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; ++#endif + u8 msdu_payload[]; + } __packed; + +@@ -1480,9 +1484,11 @@ struct hal_rx_desc_wcn6855 { + __le32 mpdu_end_tag; + struct rx_mpdu_end mpdu_end; + u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + __le32 hdr_status_tag; + __le32 phy_ppdu_id; + u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; ++#endif + u8 msdu_payload[]; + } __packed; + +@@ -1502,4 +1508,17 @@ struct hal_rx_desc { + #define RU_484 18 + #define RU_996 37 + ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE1(__val) \ ++ FIELD_GET(GENMASK(7, 0), __le32_to_cpu(__val)) ++ ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE2(__val) \ ++ FIELD_GET(GENMASK(15, 8), __le32_to_cpu(__val)) ++ ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE3(__val) \ ++ FIELD_GET(GENMASK(23, 16), __le32_to_cpu(__val)) ++ ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE4(__val) \ ++ FIELD_GET(GENMASK(31, 24), __le32_to_cpu(__val)) ++ ++ + #endif /* ATH11K_RX_DESC_H */ +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -1800,7 +1800,7 @@ static int ath11k_nss_init(struct ath11k + + /* fill rx parameters to initialize rx context */ + wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; +- wim->wrip.rx_buf_len = DP_RX_BUFFER_SIZE; ++ wim->wrip.rx_buf_len = DP_RXDMA_NSS_REFILL_RING_SIZE; + + /* fill hal srng message */ + wim->hssm.dev_base_addr = (u32)ab->mem_pa; diff --git a/package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch b/package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch new file mode 100644 index 00000000000000..08e158a407ca8f --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch @@ -0,0 +1,494 @@ +From d6d86c0c48c8d114e94c5b5f749c97d629d727ef Mon Sep 17 00:00:00 2001 +From: Maharaja Kennadyrajan +Date: Mon, 4 Jan 2021 23:49:21 +0530 +Subject: [PATCH 1/2] ath11k/mac80211: Add support to account Tx and Rx flow + packets + +Added support to log the inflow and outflow of the Tx and Rx +packets in netif and host driver. + +Command to dump the Tx pkts flow in driver: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/driver_tx_pkts_flow + +Command to dump the Rx pkts flow in driver: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/driver_rx_pkts_flow + +Commands to reset the Tx/Rx pkts flow in driver: +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_tx_stats + +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_rx_stats + +Command to dump the Tx pkts flow in mac80211: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/mac80211_tx_pkts_flow + +Command to dump the Rx pkts flow in mac80211: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/mac80211_rx_pkts_flow + +Commands to reset the Tx/Rx pkts flow in mac80211: +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_tx_pkts_flow + +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_rx_pkts_flow + +Sample output after running the Tx and Rx traffic. + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_tx_pkts_flow +Tx packets inflow from mac80211: 20 +Tx packets outflow to HW: 20 + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_tx_pkts_flow +Tx packets outflow from netif: 20 +Tx packets inflow in mac80211: 20 + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_rx_pkts_flow +Rx packets inflow from HW: 28 +Rx packets outflow from driver: 28 + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_rx_pkts_flow +Rx packets inflow in mac80211: 28 +Rx packets inflow in netif: 26 +Rx forwarded packets in bridge: 2 + +Signed-off-by: Maharaja Kennadyrajan +--- + drivers/net/wireless/ath/ath11k/core.h | 12 ++ + drivers/net/wireless/ath/ath11k/debugfs.h | 2 + + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 145 +++++++++++++++++- + drivers/net/wireless/ath/ath11k/dp_rx.c | 38 +++++ + drivers/net/wireless/ath/ath11k/mac.c | 11 ++ + 5 files changed, 207 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -494,6 +494,17 @@ struct ath11k_per_ppdu_tx_stats { + + DECLARE_EWMA(avg_rssi, 10, 8) + ++struct ath11k_driver_tx_pkts_flow { ++ atomic_t pkts_in; ++ atomic_t pkts_out; ++}; ++ ++struct ath11k_driver_rx_pkts_flow { ++ atomic_t pkts_frm_hw; ++ atomic_t pkts_out; ++ atomic_t pkts_out_to_netif; ++}; ++ + struct ath11k_sta { + struct ath11k_vif *arvif; + +@@ -527,6 +538,8 @@ struct ath11k_sta { + #ifdef CPTCFG_ATH11K_NSS_SUPPORT + struct ath11k_nss_sta_stats *nss_stats; + #endif ++ struct ath11k_driver_tx_pkts_flow drv_tx_pkts; ++ struct ath11k_driver_rx_pkts_flow drv_rx_pkts; + u16 tcl_metadata; + + /* Protected with ar->data_lock */ +--- a/drivers/net/wireless/ath/ath11k/debugfs.h ++++ b/drivers/net/wireless/ath/ath11k/debugfs.h +@@ -98,7 +98,7 @@ struct ath_pktlog_hdr { + }; + + #define ATH11K_HTT_PEER_STATS_RESET BIT(16) +- ++#define ATH11K_DRV_TX_STATS_SIZE 1024 + #define ATH11K_HTT_STATS_BUF_SIZE (1024 * 512) + #define ATH11K_FW_STATS_BUF_SIZE (1024 * 1024) + +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -146,9 +146,6 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + const int size = 2 * 4096; + char *buf; + +- if (!arsta->tx_stats) +- return -ENOENT; +- + buf = kzalloc(size, GFP_KERNEL); + if (!buf) + return -ENOMEM; +@@ -156,6 +153,12 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + mutex_lock(&ar->conf_mutex); + + spin_lock_bh(&ar->data_lock); ++ ++ if (!arsta->tx_stats) { ++ retval = -ENOENT; ++ goto end; ++ } ++ + for (k = 0; k < ATH11K_STATS_TYPE_MAX; k++) { + for (j = 0; j < ATH11K_COUNTER_TYPE_MAX; j++) { + stats = &arsta->tx_stats->stats[k]; +@@ -229,6 +232,11 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + + mutex_unlock(&ar->conf_mutex); + return retval; ++end: ++ spin_unlock_bh(&ar->data_lock); ++ mutex_unlock(&ar->conf_mutex); ++ kfree(buf); ++ return retval; + } + + static const struct file_operations fops_tx_stats = { +@@ -847,17 +855,211 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++static ssize_t ath11k_dbg_sta_reset_rx_stats(struct file *file, ++ const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ieee80211_sta *sta = file->private_data; ++ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; ++ struct ath11k *ar = arsta->arvif->ar; ++ int ret, reset; ++ ++ if (!arsta->rx_stats) ++ return -ENOENT; ++ ++ ret = kstrtoint_from_user(buf, count, 0, &reset); ++ if (ret) ++ return ret; ++ ++ if (!reset || reset > 1) ++ return -EINVAL; ++ ++ spin_lock_bh(&ar->ab->base_lock); ++ memset(arsta->rx_stats, 0, sizeof(*arsta->rx_stats)); ++ atomic_set(&arsta->drv_rx_pkts.pkts_frm_hw, 0); ++ atomic_set(&arsta->drv_rx_pkts.pkts_out, 0); ++ atomic_set(&arsta->drv_rx_pkts.pkts_out_to_netif, 0); ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ ret = count; ++ return ret; ++} ++ ++static const struct file_operations fops_reset_rx_stats = { ++ .write = ath11k_dbg_sta_reset_rx_stats, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ++ath11k_dbg_sta_dump_driver_tx_pkts_flow(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ieee80211_sta *sta = file->private_data; ++ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; ++ struct ath11k *ar = arsta->arvif->ar; ++ int len = 0, ret_val; ++ const int size = ATH11K_DRV_TX_STATS_SIZE; ++ char *buf; ++ ++ buf = kzalloc(ATH11K_DRV_TX_STATS_SIZE, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ mutex_lock(&ar->conf_mutex); ++ spin_lock_bh(&ar->ab->base_lock); ++ ++ if (!arsta->tx_stats) { ++ ret_val = -ENOENT; ++ goto end; ++ } ++ ++ len += scnprintf(buf + len, size - len, ++ "Tx packets inflow from mac80211: %u\n", ++ atomic_read(&arsta->drv_tx_pkts.pkts_in)); ++ len += scnprintf(buf + len, size - len, ++ "Tx packets outflow to HW: %u\n", ++ atomic_read(&arsta->drv_tx_pkts.pkts_out)); ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ if (len > size) ++ len = size; ++ ++ ret_val = simple_read_from_buffer(user_buf, count, ppos, buf, len); ++ kfree(buf); ++ ++ mutex_unlock(&ar->conf_mutex); ++ return ret_val; ++end: ++ spin_unlock_bh(&ar->ab->base_lock); ++ mutex_unlock(&ar->conf_mutex); ++ kfree(buf); ++ return ret_val; ++} ++ ++static const struct file_operations fops_driver_tx_pkts_flow = { ++ .read = ath11k_dbg_sta_dump_driver_tx_pkts_flow, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_dbg_sta_reset_tx_stats(struct file *file, ++ const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ieee80211_sta *sta = file->private_data; ++ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; ++ struct ath11k *ar = arsta->arvif->ar; ++ int ret, reset; ++ ++ ret = kstrtoint_from_user(buf, count, 0, &reset); ++ if (ret) ++ return ret; ++ ++ if (!reset || reset > 1) ++ return -EINVAL; ++ ++ spin_lock_bh(&ar->ab->base_lock); ++ ++ if (!arsta->tx_stats) { ++ spin_unlock_bh(&ar->ab->base_lock); ++ return -ENOENT; ++ } ++ ++ memset(arsta->tx_stats, 0, sizeof(*arsta->tx_stats)); ++ atomic_set(&arsta->drv_tx_pkts.pkts_in, 0); ++ atomic_set(&arsta->drv_tx_pkts.pkts_out, 0); ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ ret = count; ++ return ret; ++} ++ ++static const struct file_operations fops_reset_tx_stats = { ++ .write = ath11k_dbg_sta_reset_tx_stats, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ++ath11k_dbg_sta_dump_driver_rx_pkts_flow(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ieee80211_sta *sta = file->private_data; ++ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; ++ struct ath11k *ar = arsta->arvif->ar; ++ struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; ++ int len = 0, ret_val = 0; ++ const int size = 1024; ++ char *buf; ++ ++ if (!rx_stats) ++ return -ENOENT; ++ ++ buf = kzalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ mutex_lock(&ar->conf_mutex); ++ spin_lock_bh(&ar->ab->base_lock); ++ ++ len += scnprintf(buf + len, size - len, ++ "Rx packets inflow from HW: %u\n", ++ atomic_read(&arsta->drv_rx_pkts.pkts_frm_hw)); ++ len += scnprintf(buf + len, size - len, ++ "Rx packets outflow from driver: %u\n", ++ atomic_read(&arsta->drv_rx_pkts.pkts_out)); ++ len += scnprintf(buf + len, size - len, ++ "Rx packets outflow from driver to netif in Fast rx: %u\n", ++ atomic_read(&arsta->drv_rx_pkts.pkts_out_to_netif)); ++ ++ len += scnprintf(buf + len, size - len, "\n"); ++ ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ if (len > size) ++ len = size; ++ ++ ret_val = simple_read_from_buffer(user_buf, count, ppos, buf, len); ++ kfree(buf); ++ ++ mutex_unlock(&ar->conf_mutex); ++ return ret_val; ++} ++ ++static const struct file_operations fops_driver_rx_pkts_flow = { ++ .read = ath11k_dbg_sta_dump_driver_rx_pkts_flow, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ + void ath11k_debugfs_sta_op_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta, struct dentry *dir) + { + struct ath11k *ar = hw->priv; + +- if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) +- debugfs_create_file("tx_stats", 0400, dir, sta, +- &fops_tx_stats); +- if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) ++ if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) { ++ debugfs_create_file("tx_stats", 0400, dir, sta, ++ &fops_tx_stats); ++ debugfs_create_file("reset_tx_stats", 0600, dir, sta, ++ &fops_reset_tx_stats); ++ debugfs_create_file("driver_tx_pkts_flow", 0400, dir, sta, ++ &fops_driver_tx_pkts_flow); ++ } ++ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { + debugfs_create_file("rx_stats", 0400, dir, sta, + &fops_rx_stats); ++ debugfs_create_file("reset_rx_stats", 0600, dir, sta, ++ &fops_reset_rx_stats); ++ debugfs_create_file("driver_rx_pkts_flow", 0400, dir, sta, ++ &fops_driver_rx_pkts_flow); ++ } + + debugfs_create_file("htt_peer_stats", 0400, dir, sta, + &fops_htt_peer_stats); +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2416,6 +2416,7 @@ static void ath11k_dp_rx_h_mpdu(struct a + struct rx_attention *rx_attention; + u32 err_bitmap; + ++ + /* PN for multicast packets will be checked in mac80211 */ + rxcb = ATH11K_SKB_RXCB(msdu); + fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); +@@ -2609,6 +2610,7 @@ static void ath11k_dp_rx_deliver_msdu(st + struct ieee80211_rx_status *rx_status; + struct ieee80211_radiotap_he *he = NULL; + struct ieee80211_sta *pubsta = NULL; ++ struct ath11k_sta *arsta = NULL; + struct ath11k_peer *peer; + struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + u8 decap = DP_RX_DECAP_TYPE_RAW; +@@ -2674,6 +2676,18 @@ static void ath11k_dp_rx_deliver_msdu(st + rx_status->flag |= RX_FLAG_8023; + + ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); ++ ++ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { ++ if (!(status->flag & RX_FLAG_ONLY_MONITOR)) { ++ spin_lock_bh(&ar->ab->base_lock); ++ if (peer && peer->sta) ++ arsta = ++ (struct ath11k_sta *)peer->sta->drv_priv; ++ spin_unlock_bh(&ar->ab->base_lock); ++ if (arsta) ++ atomic_inc(&arsta->drv_rx_pkts.pkts_out); ++ } ++ } + } + + static int ath11k_dp_rx_process_msdu(struct ath11k *ar, +@@ -2820,6 +2834,8 @@ int ath11k_dp_process_rx(struct ath11k_b + int total_msdu_reaped = 0; + struct hal_srng *srng; + struct sk_buff *msdu; ++ struct ath11k_peer *peer = NULL; ++ struct ath11k_sta *arsta = NULL; + bool done = false; + int buf_id, mac_id; + struct ath11k *ar; +@@ -2893,6 +2909,19 @@ try_again: + rxcb->tid = FIELD_GET(HAL_REO_DEST_RING_INFO0_RX_QUEUE_NUM, + desc->info0); + ++ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar) && rxcb->peer_id) { ++ rcu_read_lock(); ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_id(ab, rxcb->peer_id); ++ if (peer && peer->sta) ++ arsta = ++ (struct ath11k_sta *)peer->sta->drv_priv; ++ spin_unlock_bh(&ab->base_lock); ++ if (arsta) ++ atomic_inc(&arsta->drv_rx_pkts.pkts_frm_hw); ++ rcu_read_unlock(); ++ } ++ + rxcb->mac_id = mac_id; + __skb_queue_tail(&msdu_list[mac_id], msdu); + +@@ -4084,7 +4113,10 @@ static int ath11k_dp_rx_h_null_q_desc(st + struct rx_attention *rx_attention; + u8 l3pad_bytes; + struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); ++ struct ath11k_peer *peer = NULL; ++ struct ath11k_sta *arsta = NULL; + u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; ++ u32 peer_id; + + msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ar->ab, desc); + +@@ -4136,6 +4168,18 @@ static int ath11k_dp_rx_h_null_q_desc(st + * rx with mac80211. Need not worry about cleaning up amsdu_list. + */ + ++ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { ++ peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ar->ab, desc); ++ spin_lock_bh(&ar->ab->base_lock); ++ if (peer_id) ++ peer = ath11k_peer_find_by_id(ar->ab, rxcb->peer_id); ++ if (peer && peer->sta) ++ arsta = (struct ath11k_sta *)peer->sta->drv_priv; ++ spin_unlock_bh(&ar->ab->base_lock); ++ if (arsta) ++ atomic_inc(&arsta->drv_rx_pkts.pkts_frm_hw); ++ } ++ + return 0; + } + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6252,6 +6252,7 @@ static void ath11k_mac_op_tx(struct ieee + struct ath11k_mgmt_frame_stats *mgmt_stats = &arvif->mgmt_stats; + struct ath11k_sta *arsta = NULL; + u32 info_flags = info->flags; ++ struct ieee80211_sta *sta = control->sta; + bool is_prb_rsp; + u16 frm_type = 0; + int ret; +@@ -6314,6 +6315,15 @@ static void ath11k_mac_op_tx(struct ieee + ieee80211_free_txskb(ar->hw, skb); + return; + } ++ ++ if (ath11k_debugfs_is_extd_tx_stats_enabled(ar) && sta) { ++ arsta = (struct ath11k_sta *)sta->drv_priv; ++ if (arsta) { ++ atomic_inc(&arsta->drv_tx_pkts.pkts_in); ++ if (!ret) ++ atomic_inc(&arsta->drv_tx_pkts.pkts_out); ++ } ++ } + } + + void ath11k_mac_drain_tx(struct ath11k *ar) diff --git a/package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch b/package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch new file mode 100644 index 00000000000000..7488f0c2bfce6b --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch @@ -0,0 +1,369 @@ +From 26bf6027fe93346f47358e8933e613ac1ece3455 Mon Sep 17 00:00:00 2001 +From: Maharaja Kennadyrajan +Date: Mon, 4 Jan 2021 23:50:37 +0530 +Subject: [PATCH 2/2] ath11k/mac80211: Add support to account Tx and Rx flow + packets + +Added support to log the inflow and outflow of the Tx and Rx +packets in netif and host driver. + +Command to dump the Tx pkts flow in driver: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/driver_tx_pkts_flow + +Command to dump the Rx pkts flow in driver: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/driver_rx_pkts_flow + +Commands to reset the Tx/Rx pkts flow in driver: +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_tx_stats + +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_rx_stats + +Command to dump the Tx pkts flow in mac80211: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/mac80211_tx_pkts_flow + +Command to dump the Rx pkts flow in mac80211: +cat +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/mac80211_rx_pkts_flow + +Commands to reset the Tx/Rx pkts flow in mac80211: +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_tx_pkts_flow + +echo 1 > +/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ +XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_rx_pkts_flow + +Sample output after running the Tx and Rx traffic. + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_tx_pkts_flow +Tx packets inflow from mac80211: 20 +Tx packets outflow to HW: 20 + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_tx_pkts_flow +Tx packets outflow from netif: 20 +Tx packets inflow in mac80211: 20 + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_rx_pkts_flow +Rx packets inflow from HW: 28 +Rx packets outflow from driver: 28 + +root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: +wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_rx_pkts_flow +Rx packets inflow in mac80211: 28 +Rx packets inflow in netif: 26 +Rx forwarded packets in bridge: 2 + +Signed-off-by: Maharaja Kennadyrajan +--- + net/mac80211/debugfs_sta.c | 174 +++++++++++++++++++++++++++++++++++++ + net/mac80211/rx.c | 13 +++ + net/mac80211/sta_info.h | 7 ++ + net/mac80211/tx.c | 8 ++ + 4 files changed, 202 insertions(+) + +--- a/net/mac80211/debugfs_sta.c ++++ b/net/mac80211/debugfs_sta.c +@@ -1219,6 +1219,176 @@ out: + } + LINK_STA_OPS(eht_capa); + ++static ssize_t ++sta_reset_mac80211_tx_pkts_flow_read(struct file *file, ++ char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ size_t bufsz = 30; ++ char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; ++ ssize_t rv; ++ ++ if (!buf) ++ return -ENOMEM; ++ ++ p += scnprintf(p, bufsz + buf - p, "write 1 to reset the stats\n"); ++ ++ rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); ++ kfree(buf); ++ return rv; ++} ++ ++static ssize_t ++sta_reset_mac80211_tx_pkts_flow_write(struct file *file, ++ const char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ struct sta_info *sta = file->private_data; ++ unsigned long tx_stats_reset; ++ int ret; ++ char _buf[2] = {}, *buf = _buf; ++ ++ if (count > sizeof(_buf)) ++ return -EINVAL; ++ ++ if (copy_from_user(buf, userbuf, count)) ++ return -EFAULT; ++ ++ buf[sizeof(_buf) - 1] = '\0'; ++ if (sscanf(buf, "%lu", &tx_stats_reset) != 1) ++ return -EINVAL; ++ ++ ret = kstrtoul(buf, 0, &tx_stats_reset); ++ if (ret || tx_stats_reset != 1) ++ return -EINVAL; ++ ++ atomic_set(&sta->tx_drv_pkts, 0); ++ atomic_set(&sta->tx_netif_pkts, 0); ++ ++ return count; ++} ++STA_OPS_RW(reset_mac80211_tx_pkts_flow); ++ ++static ssize_t ++sta_reset_mac80211_rx_pkts_flow_read(struct file *file, ++ char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ size_t bufsz = 30; ++ char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; ++ ssize_t rv; ++ ++ if (!buf) ++ return -ENOMEM; ++ ++ p += scnprintf(p, bufsz + buf - p, "write 1 to reset the stats\n"); ++ ++ rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); ++ kfree(buf); ++ return rv; ++} ++ ++static ssize_t ++sta_reset_mac80211_rx_pkts_flow_write(struct file *file, ++ const char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ struct sta_info *sta = file->private_data; ++ unsigned long rx_stats_reset; ++ int ret; ++ char _buf[2] = {}, *buf = _buf; ++ ++ if (count > sizeof(_buf)) ++ return -EINVAL; ++ ++ if (copy_from_user(buf, userbuf, count)) ++ return -EFAULT; ++ ++ buf[sizeof(_buf) - 1] = '\0'; ++ if (sscanf(buf, "%lu", &rx_stats_reset) != 1) ++ return -EINVAL; ++ ++ ret = kstrtoul(buf, 0, &rx_stats_reset); ++ if (ret || rx_stats_reset != 1) ++ return -EINVAL; ++ ++ atomic_set(&sta->rx_drv_pkts, 0); ++ atomic_set(&sta->rx_netif_pkts, 0); ++ atomic_set(&sta->rx_forwarded_pkts, 0); ++ ++ return count; ++} ++STA_OPS_RW(reset_mac80211_rx_pkts_flow); ++ ++static ssize_t sta_mac80211_tx_pkts_flow_read(struct file *file, ++ char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ struct sta_info *sta = file->private_data; ++ int retval = 0, len = 0; ++ const int size = 256; ++ char *buf; ++ ++ buf = kzalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ rcu_read_lock(); ++ ++ len += scnprintf(buf + len, size - len, ++ "Tx packets outflow from netif: %u\n", ++ atomic_read(&sta->tx_netif_pkts)); ++ len += scnprintf(buf + len, size - len, ++ "Tx packets outflow from mac80211: %u\n", ++ atomic_read(&sta->tx_drv_pkts)); ++ rcu_read_unlock(); ++ ++ if (len > size) ++ len = size; ++ ++ retval = simple_read_from_buffer(userbuf, count, ppos, buf, len); ++ kfree(buf); ++ ++ return retval; ++} ++STA_OPS(mac80211_tx_pkts_flow); ++ ++static ssize_t sta_mac80211_rx_pkts_flow_read(struct file *file, ++ char __user *userbuf, ++ size_t count, loff_t *ppos) ++{ ++ struct sta_info *sta = file->private_data; ++ int retval = 0, len = 0; ++ const int size = 512; ++ char *buf; ++ ++ buf = kzalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ rcu_read_lock(); ++ ++ len += scnprintf(buf + len, size - len, ++ "Rx packets inflow in mac80211: %u\n", ++ atomic_read(&sta->rx_drv_pkts)); ++ len += scnprintf(buf + len, size - len, ++ "Rx packets inflow in netif: %u\n", ++ atomic_read(&sta->rx_netif_pkts)); ++ len += scnprintf(buf + len, size - len, ++ "Rx forwarded packets in bridge: %u\n", ++ atomic_read(&sta->rx_forwarded_pkts)); ++ ++ rcu_read_unlock(); ++ ++ if (len > size) ++ len = size; ++ retval = simple_read_from_buffer(userbuf, count, ppos, buf, len); ++ kfree(buf); ++ ++ return retval; ++} ++STA_OPS(mac80211_rx_pkts_flow); ++ + #define DEBUGFS_ADD(name) \ + debugfs_create_file(#name, 0400, \ + sta->debugfs_dir, sta, &sta_ ##name## _ops) +@@ -1254,6 +1424,10 @@ void ieee80211_sta_debugfs_add(struct st + DEBUGFS_ADD(num_ps_buf_frames); + DEBUGFS_ADD(last_seq_ctrl); + DEBUGFS_ADD(agg_status); ++ DEBUGFS_ADD(reset_mac80211_tx_pkts_flow); ++ DEBUGFS_ADD(reset_mac80211_rx_pkts_flow); ++ DEBUGFS_ADD(mac80211_tx_pkts_flow); ++ DEBUGFS_ADD(mac80211_rx_pkts_flow); + /* FIXME: Kept here as the statistics are only done on the deflink */ + DEBUGFS_ADD_COUNTER(tx_filtered, deflink.status_stats.filtered); + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -2623,6 +2623,7 @@ static void ieee80211_deliver_skb_to_loc + { + struct ieee80211_sub_if_data *sdata = rx->sdata; + struct net_device *dev = sdata->dev; ++ struct sta_info *sta = rx->sta; + + if (unlikely((skb->protocol == sdata->control_port_protocol || + (skb->protocol == cpu_to_be16(ETH_P_PREAUTH) && +@@ -2666,6 +2667,7 @@ static void ieee80211_deliver_skb_to_loc + else + netif_receive_skb(skb); + #endif ++ atomic_inc(&sta->rx_netif_pkts); + } + } + +@@ -2724,6 +2726,7 @@ ieee80211_deliver_skb(struct ieee80211_r + */ + xmit_skb = skb; + skb = NULL; ++ atomic_inc(&rx->sta->rx_forwarded_pkts); + } + } + } +@@ -4836,6 +4839,7 @@ static void ieee80211_rx_8023(struct iee + skb_reset_network_header(xmit_skb); + skb_reset_mac_header(xmit_skb); + dev_queue_xmit(xmit_skb); ++ atomic_inc(&rx->sta->rx_forwarded_pkts); + } + + if (!skb) +@@ -5332,9 +5336,18 @@ void ieee80211_rx_list(struct ieee80211_ + struct ieee80211_supported_band *sband; + struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; ++ struct sta_info *sta = NULL; + + WARN_ON_ONCE(softirq_count() == 0); + ++ if (pubsta) { ++ sta = container_of(pubsta, struct sta_info, sta); ++ if (sta && napi) { ++ if (!(status->flag & RX_FLAG_ONLY_MONITOR)) ++ atomic_inc(&sta->rx_drv_pkts); ++ } ++ } ++ + if (WARN_ON(status->band >= NUM_NL80211_BANDS)) + goto drop; + +--- a/net/mac80211/sta_info.h ++++ b/net/mac80211/sta_info.h +@@ -724,6 +724,13 @@ struct sta_info { + struct link_sta_info deflink; + struct link_sta_info __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS]; + ++ atomic_t tx_drv_pkts; ++ atomic_t tx_netif_pkts; ++ atomic_t rx_drv_pkts; ++ atomic_t rx_netif_pkts; ++ /* Rx packets forwarded to bridge */ ++ atomic_t rx_forwarded_pkts; ++ + /* keep last! */ + struct ieee80211_sta sta; + }; +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4294,6 +4294,9 @@ void __ieee80211_subif_start_xmit(struct + if (IS_ERR(sta)) + sta = NULL; + ++ if (sta) ++ atomic_inc(&sta->tx_netif_pkts); ++ + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { + ap_sdata = container_of(sdata->bss, + struct ieee80211_sub_if_data, u.ap); +@@ -4614,6 +4617,9 @@ static bool __ieee80211_tx_8023(struct i + + drv_tx(local, &control, skb); + ++ if (sta) ++ atomic_inc(&sta->tx_drv_pkts); ++ + return true; + } + +@@ -4719,6 +4725,9 @@ static void ieee80211_8023_xmit(struct i + + ieee80211_tx_8023(sdata, skb, sta, false); + ++ if (sta) ++ atomic_inc(&sta->tx_netif_pkts); ++ + return; + + out_free: diff --git a/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch new file mode 100644 index 00000000000000..a95308a74ed223 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch @@ -0,0 +1,45 @@ +From a297f43a9ad6d8c95cf8b984337ffb410f3eb92c Mon Sep 17 00:00:00 2001 +From: Maharaja Kennadyrajan +Date: Tue, 12 Jan 2021 18:07:51 +0530 +Subject: [PATCH] ath11k: Add support for beacon tx mode + +User can configure the beacon tx mode while bring-up the +AP via hostapd configuration. + +Use the below configuration in the hostapd to configure +the beacon tx mode. + +"beacon_tx_mode=N", where N = 0 for STAGGERED beacon mode +and N = 1 for BURST beacon mode. + +Signed-off-by: Maharaja Kennadyrajan +--- + drivers/net/wireless/ath/ath11k/mac.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -3483,7 +3483,10 @@ static void ath11k_mac_op_bss_info_chang + + if (changed & BSS_CHANGED_BEACON) { + param_id = WMI_PDEV_PARAM_BEACON_TX_MODE; +- param_value = WMI_BEACON_STAGGERED_MODE; ++ if (info->beacon_tx_mode == NL80211_BEACON_BURST_MODE) ++ param_value = WMI_BEACON_BURST_MODE; ++ else ++ param_value = WMI_BEACON_STAGGERED_MODE; + ret = ath11k_wmi_pdev_set_param(ar, param_id, + param_value, ar->pdev->pdev_id); + if (ret) +@@ -3491,8 +3494,9 @@ static void ath11k_mac_op_bss_info_chang + arvif->vdev_id); + else + ath11k_dbg(ar->ab, ATH11K_DBG_MAC, +- "Set staggered beacon mode for VDEV: %d\n", +- arvif->vdev_id); ++ "Set %s beacon mode for VDEV: %d mode: %d\n", ++ param_value ? "burst" : "staggered", ++ arvif->vdev_id, param_value); + + if (!arvif->do_not_send_tmpl || !arvif->bcca_zero_sent) { + ret = ath11k_mac_setup_bcn_tmpl(arvif); diff --git a/package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch new file mode 100644 index 00000000000000..6fb460f6b4f740 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch @@ -0,0 +1,159 @@ +From f8e7ec408c357d6438abd980f700353a7efcac7e Mon Sep 17 00:00:00 2001 +From: Maharaja Kennadyrajan +Date: Tue, 12 Jan 2021 18:11:33 +0530 +Subject: [PATCH] mac80211: Add support for beacon tx mode + +User can configure the beacon tx mode while bring-up the +AP via hostapd configuration. + +Use the below configuration in the hostapd to configure +the beacon tx mode. + +"beacon_tx_mode=N", where N = 0 for STAGGERED beacon mode +and N = 1 for BURST beacon mode. + +Signed-off-by: Maharaja Kennadyrajan +--- + include/net/cfg80211.h | 2 +- + include/net/mac80211.h | 1 + + include/uapi/linux/nl80211.h | 2 ++ + net/mac80211/cfg.c | 1 + + net/wireless/nl80211.c | 7 ++++++- + 5 files changed, 11 insertions(+), 2 deletions(-) + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -1443,6 +1443,7 @@ struct cfg80211_unsol_bcast_probe_resp { + * @punct_bitmap: Preamble puncturing bitmap. Each bit represents + * a 20 MHz channel, lowest bit corresponding to the lowest channel. + * Bit set to 1 indicates that the channel is punctured. ++ * @beacon_tx_mode: Beacon Tx Mode setting + */ + struct cfg80211_ap_settings { + struct cfg80211_chan_def chandef; +@@ -1478,6 +1479,7 @@ struct cfg80211_ap_settings { + struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp; + struct cfg80211_mbssid_config mbssid_config; + u16 punct_bitmap; ++ enum nl80211_beacon_tx_mode beacon_tx_mode; + }; + + /** +@@ -2436,6 +2438,7 @@ struct mesh_config { + * to operate on DFS channels. + * @control_port_over_nl80211: TRUE if userspace expects to exchange control + * port frames over NL80211 instead of the network interface. ++ * @beacon_tx_mode: Beacon Tx Mode setting. + * + * These parameters are fixed when the mesh is created. + */ +@@ -2459,6 +2462,7 @@ struct mesh_setup { + struct cfg80211_bitrate_mask beacon_rate; + bool userspace_handles_dfs; + bool control_port_over_nl80211; ++ enum nl80211_beacon_tx_mode beacon_tx_mode; + }; + + /** +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -698,6 +698,7 @@ struct ieee80211_fils_discovery { + * @eht_mu_beamformer: in AP-mode, does this BSS enable operation as an EHT MU + * beamformer + * @nss_ap_isolate: Used for notifying the NSS host about AP isolate feature ++ * @beacon_tx_mode: Beacon Tx Mode setting. + */ + struct ieee80211_bss_conf { + struct ieee80211_vif *vif; +@@ -792,6 +793,7 @@ struct ieee80211_bss_conf { + bool eht_su_beamformee; + bool eht_mu_beamformer; + bool nss_ap_isolate; ++ enum nl80211_beacon_tx_mode beacon_tx_mode; + }; + + /** +--- a/include/uapi/linux/nl80211.h ++++ b/include/uapi/linux/nl80211.h +@@ -2814,7 +2814,9 @@ enum nl80211_commands { + * + * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is + * disabled. +- * ++ * @NL80211_ATTR_BEACON_TX_MODE: used to configure the beacon tx mode as ++ * staggered mode = 1 or burst mode = 2 in %NL80211_CMD_START_AP or ++ * %NL80211_CMD_JOIN_MESH from user-space. + * @NUM_NL80211_ATTR: total number of nl80211_attrs available + * @NL80211_ATTR_MAX: highest attribute number currently defined + * @__NL80211_ATTR_AFTER_LAST: internal use +@@ -3353,6 +3355,8 @@ enum nl80211_attrs { + + NL80211_ATTR_MLO_LINK_DISABLED, + ++ NL80211_ATTR_BEACON_TX_MODE, ++ + /* add attributes here, update the policy in nl80211.c */ + + __NL80211_ATTR_AFTER_LAST, +@@ -7840,4 +7844,12 @@ enum nl80211_ap_settings_flags { + NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT = 1 << 1, + }; + ++/** ++ * enum nl80211_beacon_tx_mode - Beacon Tx Mode enum. ++ * Used to configure beacon staggered mode or beacon burst mode. ++ */ ++enum nl80211_beacon_tx_mode { ++ NL80211_BEACON_STAGGERED_MODE = 1, ++ NL80211_BEACON_BURST_MODE = 2, ++}; + #endif /* __LINUX_NL80211_H */ +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -1294,6 +1294,7 @@ static int ieee80211_start_ap(struct wip + + prev_beacon_int = link_conf->beacon_int; + link_conf->beacon_int = params->beacon_interval; ++ link_conf->beacon_tx_mode = params->beacon_tx_mode; + + if (params->ht_cap) + link_conf->ht_ldpc = +@@ -2490,6 +2491,7 @@ static int copy_mesh_setup(struct ieee80 + + sdata->vif.bss_conf.beacon_int = setup->beacon_interval; + sdata->vif.bss_conf.dtim_period = setup->dtim_period; ++ sdata->vif.bss_conf.beacon_tx_mode = setup->beacon_tx_mode; + + sdata->beacon_rate_set = false; + if (wiphy_ext_feature_isset(sdata->local->hw.wiphy, +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -811,6 +811,7 @@ static const struct nla_policy nl80211_p + [NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG }, + [NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED }, + [NL80211_ATTR_MLO_LINK_DISABLED] = { .type = NLA_FLAG }, ++ [NL80211_ATTR_BEACON_TX_MODE] = NLA_POLICY_RANGE(NLA_U32, 1, 2), + }; + + /* policy for the key attributes */ +@@ -5941,6 +5942,9 @@ static int nl80211_start_ap(struct sk_bu + nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]); + params->dtim_period = + nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]); ++ if (info->attrs[NL80211_ATTR_BEACON_TX_MODE]) ++ params->beacon_tx_mode = ++ nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]); + + err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype, + params->beacon_interval); +@@ -13037,6 +13041,10 @@ static int nl80211_join_mesh(struct sk_b + return -EINVAL; + } + ++ if (info->attrs[NL80211_ATTR_BEACON_TX_MODE]) ++ setup.beacon_tx_mode = ++ nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]); ++ + if (info->attrs[NL80211_ATTR_MESH_SETUP]) { + /* parse additional setup parameters if given */ + err = nl80211_parse_mesh_setup(info, &setup); diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch b/package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch new file mode 100644 index 00000000000000..83c019b871e81b --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch @@ -0,0 +1,208 @@ +From 60d0a63d537c280ff9501296cefd322b981b88f5 Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Mon, 14 Dec 2020 19:13:49 +0530 +Subject: [PATCH] ath11k: Add provision to configure rx hashmap + +Currently the hashmap is set to default during REO +setup and all REO rings are equally distributed across +32 hash values. + +Add provision to configure the hashmap so that destination +rings can be controlled. Setting 0 will disable hash based +steering. + +echo "hashmap" > /sys/kernel/debug/ath11k/ipq8074\ hw2.0/rx_hash + +Signed-off-by: Sriram R +Signed-off-by: P Praneesh +--- + drivers/net/wireless/ath/ath11k/core.h | 2 ++ + drivers/net/wireless/ath/ath11k/debugfs.c | 51 ++++++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/dp.c | 4 ++- + drivers/net/wireless/ath/ath11k/hal.h | 1 + + drivers/net/wireless/ath/ath11k/hal_rx.c | 30 +++++++++++-------- + 5 files changed, 74 insertions(+), 14 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -65,6 +65,7 @@ extern bool ath11k_ftm_mode; + #define ATH11K_RECONFIGURE_TIMEOUT_HZ (10 * HZ) + #define ATH11K_RECOVER_START_TIMEOUT_HZ (20 * HZ) + ++#define HAL_REO_DEST_RING_CTRL_HASH_RING_SHIFT 8 + enum ath11k_supported_bw { + ATH11K_BW_20 = 0, + ATH11K_BW_40 = 1, +@@ -1037,6 +1038,8 @@ struct ath11k_base { + atomic_t num_max_allowed; + struct ath11k_num_vdevs_peers *num_vdevs_peers; + ++ u32 rx_hash; ++ + /* must be last */ + u8 drv_priv[] __aligned(sizeof(void *)); + }; +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -972,6 +972,54 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++static ssize_t ath11k_write_rx_hash(struct file *file, ++ const char __user *ubuf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_base *ab = file->private_data; ++ struct ath11k_pdev *pdev; ++ u32 rx_hash; ++ u8 buf[128] = {0}; ++ int ret, i, radioup = 0; ++ ++ for (i = 0; i < ab->num_radios; i++) { ++ pdev = &ab->pdevs[i]; ++ if (pdev && pdev->ar) { ++ radioup = 1; ++ break; ++ } ++ } ++ ++ if (radioup == 0) { ++ ath11k_err(ab, "radio is not up\n"); ++ ret = -ENETDOWN; ++ goto exit; ++ } ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count); ++ if (ret < 0) ++ goto exit; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%x", &rx_hash); ++ if (!ret) { ++ ret = -EINVAL; ++ goto exit; ++ } ++ ++ if (rx_hash != ab->rx_hash) { ++ ab->rx_hash = rx_hash; ++ if (rx_hash) ++ ath11k_hal_reo_hash_setup(ab, rx_hash); ++ } ++ ret = count; ++exit: ++ return ret; ++} ++static const struct file_operations fops_soc_rx_hash = { ++ .open = simple_open, ++ .write = ath11k_write_rx_hash, ++}; + int ath11k_debugfs_pdev_create(struct ath11k_base *ab) + { + if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) +@@ -987,6 +1035,10 @@ int ath11k_debugfs_pdev_create(struct at + debugfs_create_file("sram", 0400, ab->debugfs_soc, ab, + &fops_sram_dump); + ++ debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, ++ &fops_soc_rx_hash); ++ ++ + return 0; + } + +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -50,7 +50,7 @@ int ath11k_dp_peer_setup(struct ath11k * + bool rx_hash_enable = DP_RX_HASH_ENABLE; + + /* RX Hash based steering is disabled for NSS Offload */ +- if (ar->ab->nss.enabled) ++ if (ar->ab->nss.enabled || !ab->rx_hash) + rx_hash_enable = DP_RX_HASH_DISABLE; + + /* NOTE: reo_dest ring id starts from 1 unlike mac_id which starts from 0 */ +--- a/drivers/net/wireless/ath/ath11k/hal.h ++++ b/drivers/net/wireless/ath/ath11k/hal.h +@@ -922,6 +922,7 @@ void ath11k_hal_reo_qdesc_setup(void *va + u32 start_seq, enum hal_pn_type type); + void ath11k_hal_reo_init_cmd_ring(struct ath11k_base *ab, + struct hal_srng *srng); ++void ath11k_hal_reo_hash_setup(struct ath11k_base *ab, u32 ring_hash_map); + void ath11k_hal_setup_link_idle_list(struct ath11k_base *ab, + struct hal_wbm_idle_scatter_list *sbuf, + u32 nsbufs, u32 tot_link_desc, +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -102,6 +102,23 @@ static void ath11k_init_wmi_config_qca63 + config->flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64; + } + ++void ath11k_hal_reo_hash_setup(struct ath11k_base *ab, u32 ring_hash_map) ++{ ++ u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; ++ u8 reo_dest_hash_shift = ab->hw_params.reo_dest_ring_map_shift; ++ ++ ab->rx_hash = ring_hash_map; ++ ++ /* These registers use only 24bits(3 bits x 8 hash values) for ++ * mapping the dest rings and remaining bits are reserved/not used ++ * so its safe to write them completely. ++ */ ++ ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, ++ ring_hash_map << reo_dest_hash_shift); ++ ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, ++ ring_hash_map << reo_dest_hash_shift); ++} ++ + static void ath11k_hw_ipq8074_reo_setup(struct ath11k_base *ab) + { + u8 frag_dest_ring = HAL_SRNG_RING_ID_REO2SW1; +@@ -143,18 +160,7 @@ static void ath11k_hw_ipq8074_reo_setup( + if (ab->nss.enabled) + return; + +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0, +- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, +- ring_hash_map)); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1, +- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, +- ring_hash_map)); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, +- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, +- ring_hash_map)); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, +- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, +- ring_hash_map)); ++ ath11k_hal_reo_hash_setup(ab, ring_hash_map); + } + + static void ath11k_init_wmi_config_ipq8074(struct ath11k_base *ab, +@@ -925,10 +931,7 @@ static void ath11k_hw_wcn6855_reo_setup( + if (ab->nss.enabled) + return; + +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, +- ring_hash_map); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, +- ring_hash_map); ++ ath11k_hal_reo_hash_setup(ab, ring_hash_map); + } + + static void ath11k_hw_ipq5018_reo_setup(struct ath11k_base *ab) +@@ -963,15 +966,7 @@ static void ath11k_hw_ipq5018_reo_setup( + HAL_DEFAULT_REO_TIMEOUT_USEC); + ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab), + HAL_DEFAULT_REO_TIMEOUT_USEC); +- +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0, +- ring_hash_map); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1, +- ring_hash_map); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, +- ring_hash_map); +- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, +- ring_hash_map); ++ ath11k_hal_reo_hash_setup(ab, ring_hash_map); + } + + static u16 diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch b/package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch new file mode 100644 index 00000000000000..c054ee146f748a --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch @@ -0,0 +1,147 @@ +From 61342ee83df7fa0b90d5ece88e3f83dea426802c Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Mon, 14 Dec 2020 20:22:22 +0530 +Subject: [PATCH] ath11k: allocate dst ring descriptors from cacheable + memory + +tcl_data and reo_dst rings are currently being allocated +using dma_allocate_coherent() which is non cachable. + +Allocating ring memory from cacheable memory area +allows cached descriptor access and prefetch next +descriptors to optimize CPU usage during +descriptor processing on NAPI. + +Signed-off-by: Pradeep Kumar Chitrapu +Signed-off-by: Sriram R +Signed-off-by: P Praneesh +--- + drivers/net/wireless/ath/ath11k/dp.c | 39 ++++++++++++++++++++++++++++++----- + drivers/net/wireless/ath/ath11k/dp.h | 1 + + drivers/net/wireless/ath/ath11k/hal.c | 33 ++++++++++++++++++++++++++--- + drivers/net/wireless/ath/ath11k/hal.h | 1 + + 4 files changed, 66 insertions(+), 8 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -705,6 +705,7 @@ void ath11k_dp_tx_completion_handler(str + struct sk_buff *msdu; + struct hal_tx_status ts = { 0 }; + struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; ++ int valid_entries; + u32 *desc; + u32 msdu_id; + u8 mac_id; +@@ -713,9 +714,18 @@ void ath11k_dp_tx_completion_handler(str + + ath11k_hal_srng_access_begin(ab, status_ring); + ++ valid_entries = ath11k_hal_srng_dst_num_free(ab, status_ring, false); ++ if (!valid_entries) { ++ ath11k_hal_srng_access_end(ab, status_ring); ++ spin_unlock_bh(&status_ring->lock); ++ return; ++ } ++ ++ ath11k_hal_srng_dst_invalidate_entry(ab, status_ring, valid_entries); ++ + while ((ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_head) != + tx_ring->tx_status_tail) && +- (desc = ath11k_hal_srng_dst_get_next_entry(ab, status_ring))) { ++ (desc = ath11k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { + memcpy(&tx_ring->tx_status[tx_ring->tx_status_head], + desc, sizeof(struct hal_wbm_release_ring)); + tx_ring->tx_status_head = +--- a/drivers/net/wireless/ath/ath11k/hal.c ++++ b/drivers/net/wireless/ath/ath11k/hal.c +@@ -653,7 +653,8 @@ u32 *ath11k_hal_srng_dst_get_next_entry( + + desc = srng->ring_base_vaddr + srng->u.dst_ring.tp; + +- srng->u.dst_ring.tp += srng->entry_size; ++ srng->u.dst_ring.tp = (srng->u.dst_ring.tp + srng->entry_size) % ++ srng->ring_size; + + /* wrap around to start of ring*/ + if (srng->u.dst_ring.tp == srng->ring_size) +@@ -666,8 +667,63 @@ u32 *ath11k_hal_srng_dst_get_next_entry( + return desc; + } + ++u32 *ath11k_hal_srng_dst_get_next_cache_entry(struct ath11k_base *ab, ++ struct hal_srng *srng) ++{ ++ u32 *desc,*desc_next; ++ lockdep_assert_held(&srng->lock); ++ ++ if (srng->u.dst_ring.tp == srng->u.dst_ring.cached_hp) ++ return NULL; ++ ++ desc = srng->ring_base_vaddr + srng->u.dst_ring.tp; ++ ++ srng->u.dst_ring.tp = (srng->u.dst_ring.tp + srng->entry_size) % ++ srng->ring_size; ++ ++ /* Try to prefetch the next descriptor in the ring */ ++ if (srng->u.dst_ring.tp != srng->u.dst_ring.cached_hp) { ++ /* prefetch only if desc is available */ ++ desc_next = srng->ring_base_vaddr + srng->u.dst_ring.tp; ++ prefetch(desc_next); ++ } ++ return desc; ++} ++ ++void ath11k_hal_srng_dst_invalidate_entry(struct ath11k_base *ab, ++ struct hal_srng *srng, int entries) ++{ ++ u32 *desc; ++ u32 tp, hp; ++ ++ lockdep_assert_held(&srng->lock); ++ ++ if (!(srng->flags & HAL_SRNG_FLAGS_CACHED) || !entries) ++ return; ++ ++ tp = srng->u.dst_ring.tp; ++ hp = srng->u.dst_ring.cached_hp; ++ ++ desc = srng->ring_base_vaddr + tp; ++ if (hp > tp) { ++ dma_sync_single_for_cpu(ab->dev, virt_to_phys(desc), ++ entries * srng->entry_size * sizeof(u32), ++ DMA_FROM_DEVICE); ++ } else { ++ entries = srng->ring_size - tp; ++ dma_sync_single_for_cpu(ab->dev, virt_to_phys(desc), ++ entries * sizeof(u32), ++ DMA_FROM_DEVICE); ++ ++ entries = hp; ++ dma_sync_single_for_cpu(ab->dev, virt_to_phys(srng->ring_base_vaddr), ++ entries * sizeof(u32), ++ DMA_FROM_DEVICE); ++ } ++} ++ + int ath11k_hal_srng_dst_num_free(struct ath11k_base *ab, struct hal_srng *srng, +- bool sync_hw_ptr) ++ bool sync_hw_ptr) + { + u32 tp, hp; + +--- a/drivers/net/wireless/ath/ath11k/hal.h ++++ b/drivers/net/wireless/ath/ath11k/hal.h +@@ -946,8 +946,12 @@ void ath11k_hal_srng_get_params(struct a + u32 *ath11k_hal_srng_dst_get_next_entry(struct ath11k_base *ab, + struct hal_srng *srng); + u32 *ath11k_hal_srng_dst_peek(struct ath11k_base *ab, struct hal_srng *srng); ++u32 *ath11k_hal_srng_dst_get_next_cache_entry(struct ath11k_base *ab, ++ struct hal_srng *srng); + int ath11k_hal_srng_dst_num_free(struct ath11k_base *ab, struct hal_srng *srng, +- bool sync_hw_ptr); ++ bool sync_hw_ptr); ++void ath11k_hal_srng_dst_invalidate_entry(struct ath11k_base *ab, ++ struct hal_srng *srng, int entries); + u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng); + u32 *ath11k_hal_srng_src_get_next_reaped(struct ath11k_base *ab, + struct hal_srng *srng); diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch new file mode 100644 index 00000000000000..bb46abada6b9e3 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -0,0 +1,412 @@ +From 594992a7ef169aa406e7fc025df2455af5d226be Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Tue, 15 Dec 2020 10:31:30 +0530 +Subject: [PATCH] ath11k: Allow fast rx by bypassing stats update + +Add a provision to disable stats and enable fast rx support +for a peer when it is connected to an AP with ethernet decap support. +All valid IP packets are directly passed to the net core stack +bypassing mac80211 stats update + +Signed-off-by: Sriram R +Signed-off-by: P Praneesh +--- + drivers/net/wireless/ath/ath11k/core.h | 3 ++ + drivers/net/wireless/ath/ath11k/debugfs.c | 76 +++++++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/dp.c | 45 +++++++++++++++++++ + drivers/net/wireless/ath/ath11k/dp_rx.c | 54 ++++++++++++++++++++--- + drivers/net/wireless/ath/ath11k/hw.c | 25 +++++++++++ + drivers/net/wireless/ath/ath11k/hw.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 2 + + drivers/net/wireless/ath/ath11k/peer.h | 1 + + 8 files changed, 201 insertions(+), 6 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -135,6 +135,7 @@ struct ath11k_skb_rxcb { + u8 tid; + u16 peer_id; + u16 seq_no; ++ struct napi_struct *napi; + }; + + enum ath11k_hw_rev { +@@ -1039,6 +1040,7 @@ struct ath11k_base { + struct ath11k_num_vdevs_peers *num_vdevs_peers; + + u32 rx_hash; ++ bool stats_disable; + + /* must be last */ + u8 drv_priv[] __aligned(sizeof(void *)); +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1020,6 +1020,80 @@ static const struct file_operations fops + .open = simple_open, + .write = ath11k_write_rx_hash, + }; ++ ++static void ath11k_debug_config_mon_status(struct ath11k *ar, bool enable) ++{ ++ struct htt_rx_ring_tlv_filter tlv_filter = {0}; ++ struct ath11k_base *ab = ar->ab; ++ int i; ++ u32 ring_id; ++ ++ if (enable) ++ tlv_filter = ath11k_mac_mon_status_filter_default; ++ ++ for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { ++ ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; ++ ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ++ ar->dp.mac_id + i, ++ HAL_RXDMA_MONITOR_STATUS, ++ DP_RX_BUFFER_SIZE, ++ &tlv_filter); ++ } ++} ++ ++static ssize_t ath11k_write_stats_disable(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_base *ab = file->private_data; ++ struct ath11k_pdev *pdev; ++ bool disable; ++ int ret, i, radioup = 0; ++ u32 mask = 0; ++ ++ for (i = 0; i < ab->num_radios; i++) { ++ pdev = &ab->pdevs[i]; ++ if (pdev && pdev->ar) { ++ radioup = 1; ++ break; ++ } ++ } ++ ++ if (radioup == 0) { ++ ath11k_err(ab, "radio is not up\n"); ++ ret = -ENETDOWN; ++ goto exit; ++ } ++ ++ if (kstrtobool_from_user(user_buf, count, &disable)) ++ return -EINVAL; ++ ++ if (disable != ab->stats_disable) { ++ ab->stats_disable = disable; ++ for (i = 0; i < ab->num_radios; i++) { ++ pdev = &ab->pdevs[i]; ++ if (pdev && pdev->ar) { ++ ath11k_debug_config_mon_status(pdev->ar, !disable); ++ ++ if (!disable) ++ mask = HTT_PPDU_STATS_TAG_DEFAULT; ++ ++ ath11k_dp_tx_htt_h2t_ppdu_stats_req(pdev->ar, mask); ++ } ++ } ++ } ++ ++ ret = count; ++ ++exit: ++ return ret; ++} ++ ++static const struct file_operations fops_soc_stats_disable = { ++ .open = simple_open, ++ .write = ath11k_write_stats_disable, ++}; ++ + int ath11k_debugfs_pdev_create(struct ath11k_base *ab) + { + if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) +@@ -1035,7 +1109,7 @@ int ath11k_debugfs_pdev_create(struct at + debugfs_create_file("sram", 0400, ab->debugfs_soc, ab, + &fops_sram_dump); + +- debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, ++ debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, + &fops_soc_rx_hash); + + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -375,6 +375,12 @@ static int ath11k_dp_purge_mon_ring(stru + return -ETIMEDOUT; + } + ++static inline u8 ath11k_dp_rx_h_msdu_start_ip_valid(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) ++{ ++ return ab->hw_params.hw_ops->rx_desc_get_ip_valid(desc); ++} ++ + /* Returns number of Rx buffers replenished */ + int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id, + struct dp_rxdma_ring *rx_ring, +@@ -2402,10 +2408,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b + return peer; + } + ++static bool ath11k_dp_rx_check_fast_rx(struct ath11k *ar, ++ struct sk_buff *msdu, ++ struct hal_rx_desc *rx_desc, ++ struct ath11k_peer *peer) ++{ ++ struct ethhdr *ehdr; ++ struct ath11k_peer *f_peer; ++ struct ath11k_skb_rxcb *rxcb; ++ u8 decap; ++ ++ lockdep_assert_held(&ar->ab->base_lock); ++ ++ decap = ath11k_dp_rx_h_msdu_start_decap_type(ar->ab, rx_desc); ++ rxcb = ATH11K_SKB_RXCB(msdu); ++ ++ if (!ar->ab->stats_disable || ++ decap != DP_RX_DECAP_TYPE_ETHERNET2_DIX || ++ peer->vif->type != NL80211_IFTYPE_AP) ++ return false; ++ ++ /* mcbc packets go through mac80211 for PN validation */ ++ if (rxcb->is_mcbc) ++ return false; ++ ++ if (!peer->is_authorized) ++ return false; ++ ++ if (!ath11k_dp_rx_h_msdu_start_ip_valid(ar->ab, rx_desc)) ++ return false; ++ ++ /* fast rx is supported only on ethernet decap, so ++ * we can directly gfet the ethernet header ++ */ ++ ehdr = (struct ethhdr *)msdu->data; ++ ++ /* requires rebroadcast from mac80211 */ ++ if (is_multicast_ether_addr(ehdr->h_dest)) ++ return false; ++ ++ /* check if the msdu needs to be bridged to our connected peer */ ++ f_peer = ath11k_peer_find_by_addr(ar->ab, ehdr->h_dest); ++ ++ if (f_peer && f_peer != peer) ++ return false; ++ ++ /* allow direct rx */ ++ return true; ++} ++ + static void ath11k_dp_rx_h_mpdu(struct ath11k *ar, + struct sk_buff *msdu, + struct hal_rx_desc *rx_desc, +- struct ieee80211_rx_status *rx_status) ++ struct ieee80211_rx_status *rx_status, ++ bool *fast_rx) + { + bool fill_crypto_hdr; + enum hal_encrypt_type enctype; +@@ -2417,6 +2473,9 @@ static void ath11k_dp_rx_h_mpdu(struct a + u32 err_bitmap; + + ++ struct wireless_dev *wdev = NULL; ++ struct ath11k_sta *arsta = NULL; ++ + /* PN for multicast packets will be checked in mac80211 */ + rxcb = ATH11K_SKB_RXCB(msdu); + fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); +@@ -2430,6 +2489,30 @@ static void ath11k_dp_rx_h_mpdu(struct a + spin_lock_bh(&ar->ab->base_lock); + peer = ath11k_dp_rx_h_find_peer(ar->ab, msdu); + if (peer) { ++ /* If the pkt is a valid IP packet and peer supports ++ * fast rx, deliver directly to net, also note that ++ * pkts with crypto error are not expected to arrive in this ++ * path, so its safe to skip checking errors here */ ++ if (*fast_rx && ++ ath11k_dp_rx_check_fast_rx(ar, msdu, rx_desc, peer)) { ++ wdev = ieee80211_vif_to_wdev(peer->vif); ++ if (wdev) { ++ spin_unlock_bh(&ar->ab->base_lock); ++ ath11k_dp_rx_h_csum_offload(ar, msdu); ++ msdu->dev = wdev->netdev; ++ msdu->protocol = eth_type_trans(msdu, msdu->dev); ++ napi_gro_receive(rxcb->napi, msdu); ++ if (peer->sta) ++ arsta = ++ (struct ath11k_sta *)peer->sta->drv_priv; ++ if (arsta) ++ atomic_inc(&arsta->drv_rx_pkts.pkts_out_to_netif); ++ return; ++ } ++ } ++ ++ *fast_rx = false; ++ + if (rxcb->is_mcbc) + enctype = peer->sec_type_grp; + else +@@ -2693,7 +2776,8 @@ static void ath11k_dp_rx_deliver_msdu(st + static int ath11k_dp_rx_process_msdu(struct ath11k *ar, + struct sk_buff *msdu, + struct sk_buff_head *msdu_list, +- struct ieee80211_rx_status *rx_status) ++ struct ieee80211_rx_status *rx_status, ++ bool *fast_rx) + { + struct ath11k_base *ab = ar->ab; + struct hal_rx_desc *rx_desc, *lrx_desc; +@@ -2775,8 +2859,13 @@ static int ath11k_dp_rx_process_msdu(str + } + } + ++ ath11k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_status, fast_rx); ++ if (*fast_rx) { ++ ab->soc_stats.invalid_rbm++; ++ return 0; ++ } ++ + ath11k_dp_rx_h_ppdu(ar, rx_desc, rx_status); +- ath11k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_status); + + rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; + +@@ -2791,10 +2880,12 @@ static void ath11k_dp_rx_process_receive + struct sk_buff_head *msdu_list, + int mac_id) + { ++ struct ath11k_skb_rxcb *rxcb; + struct sk_buff *msdu; + struct ath11k *ar; + struct ieee80211_rx_status rx_status = {0}; + int ret; ++ bool fast_rx; + + if (skb_queue_empty(msdu_list)) + return; +@@ -2811,7 +2902,12 @@ static void ath11k_dp_rx_process_receive + } + + while ((msdu = __skb_dequeue(msdu_list))) { +- ret = ath11k_dp_rx_process_msdu(ar, msdu, msdu_list, &rx_status); ++ rxcb = ATH11K_SKB_RXCB(msdu); ++ /* Enable fast rx by default, the value will cahnge based on peer cap ++ * and packet type */ ++ fast_rx = true; ++ rxcb->napi = napi; ++ ret = ath11k_dp_rx_process_msdu(ar, msdu, msdu_list, &rx_status, &fast_rx); + if (unlikely(ret)) { + ath11k_dbg(ab, ATH11K_DBG_DATA, + "Unable to process msdu %d", ret); +@@ -2819,7 +2915,10 @@ static void ath11k_dp_rx_process_receive + continue; + } + +- ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_status); ++ /* msdu is already delivered directectly */ ++ if (!fast_rx) ++ ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_status); ++ + } + } + +@@ -4117,6 +4216,7 @@ static int ath11k_dp_rx_h_null_q_desc(st + struct ath11k_sta *arsta = NULL; + u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; + u32 peer_id; ++ bool fast_rx; + + msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ar->ab, desc); + +@@ -4160,7 +4260,8 @@ static int ath11k_dp_rx_h_null_q_desc(st + } + ath11k_dp_rx_h_ppdu(ar, desc, status); + +- ath11k_dp_rx_h_mpdu(ar, msdu, desc, status); ++ fast_rx = false; ++ ath11k_dp_rx_h_mpdu(ar, msdu, desc, status, &fast_rx); + + rxcb->tid = ath11k_dp_rx_h_mpdu_start_tid(ar->ab, desc); + +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -303,6 +303,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge + __le32_to_cpu(desc->u.ipq8074.msdu_start.info2)); + } + ++static u8 ath11k_hw_ipq8074_rx_desc_get_ip_valid(struct hal_rx_desc *desc) ++{ ++ bool ipv4, ipv6; ++ ipv4 = FIELD_GET(RX_MSDU_START_INFO2_IPV4, ++ __le32_to_cpu(desc->u.ipq8074.msdu_start.info2)); ++ ipv6 = FIELD_GET(RX_MSDU_START_INFO2_IPV6, ++ __le32_to_cpu(desc->u.ipq8074.msdu_start.info2)); ++ return (ipv4 || ipv6); ++} ++ + static bool ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) + { + return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_CTRL_VALID, +@@ -590,6 +600,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge + __le32_to_cpu(desc->u.qcn9074.msdu_start.info2)); + } + ++static u8 ath11k_hw_qcn9074_rx_desc_get_ip_valid(struct hal_rx_desc *desc) ++{ ++ bool ipv4 , ipv6; ++ ipv4 = FIELD_GET(RX_MSDU_START_INFO2_IPV4, ++ __le32_to_cpu(desc->u.qcn9074.msdu_start.info2)); ++ ipv6 = FIELD_GET(RX_MSDU_START_INFO2_IPV6, ++ __le32_to_cpu(desc->u.qcn9074.msdu_start.info2)); ++ return (ipv4 || ipv6); ++} ++ + static bool ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) + { + return !!FIELD_GET(RX_MPDU_START_INFO11_MPDU_SEQ_CTRL_VALID, +@@ -1132,6 +1152,7 @@ const struct ath11k_hw_ops qca6390_ops = + .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, ++ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid, + .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, + .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, +@@ -1293,6 +1314,7 @@ const struct ath11k_hw_ops ipq5018_ops = + .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, ++ .rx_desc_get_ip_valid = ath11k_hw_qcn9074_rx_desc_get_ip_valid, + .rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support, + .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, +--- a/drivers/net/wireless/ath/ath11k/hw.h ++++ b/drivers/net/wireless/ath/ath11k/hw.h +@@ -270,6 +270,7 @@ struct ath11k_hw_ops { + u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc); + u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc); + u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc); ++ u8 (*rx_desc_get_ip_valid)(struct hal_rx_desc *desc); + bool (*rx_desc_get_ldpc_support)(struct hal_rx_desc *desc); + bool (*rx_desc_get_mpdu_seq_ctl_vld)(struct hal_rx_desc *desc); + bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc); +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -5197,6 +5197,14 @@ static int ath11k_mac_op_sta_state(struc + } + } else if (old_state == IEEE80211_STA_AUTHORIZED && + new_state == IEEE80211_STA_ASSOC) { ++ ++ spin_lock_bh(&ar->ab->base_lock); ++ peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); ++ if (peer) ++ peer->is_authorized = false; ++ spin_unlock_bh(&ar->ab->base_lock); ++ } else if (old_state == IEEE80211_STA_AUTHORIZED && ++ new_state == IEEE80211_STA_ASSOC) { + spin_lock_bh(&ar->ab->base_lock); + + peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); diff --git a/package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch b/package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch new file mode 100644 index 00000000000000..b4a735f10fc0e6 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch @@ -0,0 +1,192 @@ +From 9cdb8bae50aca80b593d0f53be5b8efedfc91324 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam +Date: Sun, 7 Mar 2021 22:49:26 +0530 +Subject: [PATCH] backport: Compile fix + +Adding these changes to fix compilation issue due to +package upgrade + +Signed-off-by: Tamizh Chelvam +Signed-off-by: Gautham Kumar Senthilkumaran +--- + include/linux/backport-refcount.h | 4 +-- + include/net/fq.h | 10 +++++- + net/mac80211/cfg.c | 4 +-- + net/mac80211/ieee80211_i.h | 4 ++- + net/mac80211/iface.c | 2 -- + net/mac80211/rx.c | 23 +++++++++----- + net/mac80211/tx.c | 54 ++++++++++++++++++++++---------- + 7 files changed, 40 insertions(+), 23 deletions(-) + +--- a/include/linux/backport-refcount.h ++++ b/include/linux/backport-refcount.h +@@ -247,7 +247,7 @@ static inline __must_check bool refcount + + static inline void __refcount_inc(refcount_t *r, int *oldp) + { +- __refcount_add(1, r, oldp); ++ refcount_add(1, r); + } + + /** +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -207,6 +207,7 @@ enum ieee80211_rx_flags { + }; + + struct ieee80211_rx_data { ++ struct napi_struct *napi; + struct list_head *list; + struct sk_buff *skb; + struct ieee80211_local *local; +@@ -292,6 +293,7 @@ struct unsol_bcast_probe_resp_data { + u8 data[]; + }; + ++ + struct ps_data { + /* yes, this looks ugly, but guarantees that we can later use + * bitmap_empty :) +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -1705,7 +1705,6 @@ static void ieee80211_iface_work(struct + + /* first process frames */ + while ((skb = skb_dequeue(&sdata->skb_queue))) { +- kcov_remote_start_common(skb_get_kcov_handle(skb)); + + if (skb->protocol == cpu_to_be16(ETH_P_TDLS)) + ieee80211_process_tdls_channel_switch(sdata, skb); +@@ -1713,17 +1712,14 @@ static void ieee80211_iface_work(struct + ieee80211_iface_process_skb(local, sdata, skb); + + kfree_skb(skb); +- kcov_remote_stop(); + } + + /* process status queue */ + while ((skb = skb_dequeue(&sdata->status_queue))) { +- kcov_remote_start_common(skb_get_kcov_handle(skb)); + + ieee80211_iface_process_status(sdata, skb); + kfree_skb(skb); + +- kcov_remote_stop(); + } + + /* then other type-dependent work */ +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4668,19 +4668,21 @@ static void ieee80211_8023_xmit(struct i + + ieee80211_aggr_check(sdata, sta, skb); + +- tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; +- tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]); +- if (tid_tx) { +- if (!test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) { +- /* fall back to non-offload slow path */ +- __ieee80211_subif_start_xmit(skb, dev, 0, +- IEEE80211_TX_CTRL_MLO_LINK_UNSPEC, +- NULL); +- return; +- } ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { ++ tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; ++ tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]); ++ if (tid_tx) { ++ if (!test_bit(HT_AGG_STATE_OPERATIONAL, &tid_tx->state)) { ++ /* fall back to non-offload slow path */ ++ __ieee80211_subif_start_xmit(skb, dev, 0, ++ IEEE80211_TX_CTRL_MLO_LINK_UNSPEC, ++ NULL); ++ return; ++ } + +- if (tid_tx->timeout) +- tid_tx->last_tx = jiffies; ++ if (tid_tx->timeout) ++ tid_tx->last_tx = jiffies; ++ } + } + + skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata)); +@@ -4739,7 +4741,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + { + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ethhdr *ehdr = (struct ethhdr *)skb->data; +- struct ieee80211_key *key; ++ struct ieee80211_key *key = NULL; + struct sta_info *sta; + + #ifdef CPTCFG_MAC80211_NSS_SUPPORT +@@ -4757,9 +4759,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + goto out; + } + +- if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded || +- !test_sta_flag(sta, WLAN_STA_AUTHORIZED) || +- sdata->control_port_protocol == ehdr->h_proto)) ++ if (ieee80211_hw_check(&sdata->local->hw, SUPPORTS_NSS_OFFLOAD)) { ++ if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded)) ++ sta = NULL; ++ goto tx_offload; ++ } else if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded || ++ !test_sta_flag(sta, WLAN_STA_AUTHORIZED) || ++ sdata->control_port_protocol == ehdr->h_proto)) + goto skip_offload; + + key = rcu_dereference(sta->ptk[sta->ptk_idx]); +@@ -4770,6 +4776,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + goto skip_offload; + + sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); ++tx_offload: + ieee80211_8023_xmit(sdata, dev, sta, key, skb); + goto out; + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -5342,7 +5342,7 @@ void ieee80211_rx_list(struct ieee80211_ + + if (pubsta) { + sta = container_of(pubsta, struct sta_info, sta); +- if (sta && napi) { ++ if (sta) { + if (!(status->flag & RX_FLAG_ONLY_MONITOR)) + atomic_inc(&sta->rx_drv_pkts); + } +@@ -5442,8 +5442,6 @@ void ieee80211_rx_list(struct ieee80211_ + + status->rx_flags = 0; + +- kcov_remote_start_common(skb_get_kcov_handle(skb)); +- + /* + * Frames with failed FCS/PLCP checksum are not returned, + * all other frames are returned without radiotap header +@@ -5463,7 +5461,6 @@ void ieee80211_rx_list(struct ieee80211_ + __ieee80211_rx_handle_packet(hw, pubsta, skb, list); + } + +- kcov_remote_stop(); + return; + drop: + kfree_skb(skb); +--- a/backport-include/linux/skbuff.h ++++ b/backport-include/linux/skbuff.h +@@ -24,14 +24,6 @@ static inline void *backport___skb_push( + } + #define __skb_push LINUX_BACKPORT(__skb_push) + +-static inline void *__skb_put_zero(struct sk_buff *skb, unsigned int len) +-{ +- void *tmp = __skb_put(skb, len); +- +- memset(tmp, 0, len); +- return tmp; +-} +- + static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) + { + void *tmp = skb_put(skb, len); diff --git a/package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch b/package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch new file mode 100644 index 00000000000000..6f7c1aadd95b64 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch @@ -0,0 +1,145 @@ +From 3be7ae2d65b6638c4165d66c1c4b5d82d95517d9 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam +Date: Wed, 10 Mar 2021 12:21:49 +0530 +Subject: [PATCH] Revert "net: mac80211: use core API for updating TX/RX stats" + +This reverts 36ec144f041bedc2f14b32faa2da11d4d9660003 commit +in QSDK since 4.4 backports does not support netstats APIs +for tx/rx stats and retaining the original logic for calculating +tx/rx stats. + +Signed-off-by: Tamizh Chelvam +--- + net/mac80211/rx.c | 18 ++++++++++++++---- + net/mac80211/tx.c | 16 +++++++++++++--- + 2 files changed, 27 insertions(+), 7 deletions(-) + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -33,6 +33,18 @@ + #include "wme.h" + #include "rate.h" + ++static inline void ieee80211_rx_stats(struct net_device *dev, u32 len) ++{ ++ struct pcpu_sw_netstats *tstats = this_cpu_ptr(netdev_tstats(dev)); ++ ++ u64_stats_update_begin(&tstats->syncp); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) ++ tstats->rx_packets++; ++ tstats->rx_bytes += len; ++#endif ++ u64_stats_update_end(&tstats->syncp); ++} ++ + /* + * monitor mode reception + * +@@ -50,7 +62,11 @@ static struct sk_buff *ieee80211_clean_s + + if (present_fcs_len) + __pskb_trim(skb, skb->len - present_fcs_len); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) ++ __pskb_pull(skb, rtap_space); ++#else + pskb_pull(skb, rtap_space); ++#endif + + /* After pulling radiotap header, clear all flags that indicate + * info in skb->data. +@@ -83,7 +99,11 @@ static struct sk_buff *ieee80211_clean_s + + memmove(skb->data + IEEE80211_HT_CTL_LEN, skb->data, + hdrlen - IEEE80211_HT_CTL_LEN); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) ++ __pskb_pull(skb, IEEE80211_HT_CTL_LEN); ++#else + pskb_pull(skb, IEEE80211_HT_CTL_LEN); ++#endif + + return skb; + } +@@ -853,7 +873,7 @@ ieee80211_rx_monitor(struct ieee80211_lo + + if (skb) { + skb->dev = sdata->dev; +- dev_sw_netstats_rx_add(skb->dev, skb->len); ++ ieee80211_rx_stats(skb->dev, skb->len); + netif_receive_skb(skb); + } + } +@@ -2686,7 +2706,7 @@ ieee80211_deliver_skb(struct ieee80211_r + skb = rx->skb; + xmit_skb = NULL; + +- dev_sw_netstats_rx_add(dev, skb->len); ++ ieee80211_rx_stats(dev, skb->len); + + if (rx->sta) { + /* The seqno index has the same property as needed +@@ -4098,7 +4118,7 @@ static void ieee80211_rx_cooked_monitor( + } + + prev_dev = sdata->dev; +- dev_sw_netstats_rx_add(sdata->dev, skb->len); ++ ieee80211_rx_stats(sdata->dev, skb->len); + } + + if (prev_dev) { +@@ -4806,7 +4826,7 @@ static void ieee80211_rx_8023(struct iee + + skb->dev = fast_rx->dev; + +- dev_sw_netstats_rx_add(fast_rx->dev, skb->len); ++ ieee80211_rx_stats(fast_rx->dev, skb->len); + + /* The seqno index has the same property as needed + * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -40,6 +40,18 @@ + static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, + struct net_device *dev, struct sta_info *sta, + struct ieee80211_key *key, struct sk_buff *skb); ++ ++static inline void ieee80211_tx_stats(struct net_device *dev, u32 len) ++{ ++ struct pcpu_sw_netstats *tstats = this_cpu_ptr(netdev_tstats(dev)); ++ ++ u64_stats_update_begin(&tstats->syncp); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) ++ tstats->tx_packets++; ++ tstats->tx_bytes += len; ++#endif ++ u64_stats_update_end(&tstats->syncp); ++} + /* misc utils */ + + static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, +@@ -3557,7 +3569,7 @@ ieee80211_xmit_fast_finish(struct ieee80 + if (key) + info->control.hw_key = &key->conf; + +- dev_sw_netstats_tx_add(skb->dev, 1, skb->len); ++ ieee80211_tx_stats(skb->dev, skb->len); + + if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) { + tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; +@@ -4346,7 +4358,7 @@ void __ieee80211_subif_start_xmit(struct + goto out; + } + +- dev_sw_netstats_tx_add(dev, 1, skb->len); ++ ieee80211_tx_stats(dev, skb->len); + + ieee80211_xmit(sdata, sta, skb); + } +@@ -4717,7 +4729,7 @@ static void ieee80211_8023_xmit(struct i + info->ack_frame_id = ieee80211_store_ack_skb(local, skb, + &info->flags, NULL); + +- dev_sw_netstats_tx_add(dev, skbs, len); ++ ieee80211_tx_stats(dev, len); + if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { + sta->deflink.tx_stats.packets[queue] += skbs; + sta->deflink.tx_stats.bytes[queue] += len; diff --git a/package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch b/package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch new file mode 100644 index 00000000000000..0a7dcf5e845780 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch @@ -0,0 +1,109 @@ +From 246e530a47d9adab9106fb6f2b92197cace17e53 Mon Sep 17 00:00:00 2001 +From: Seevalamuthu Mariappan +Date: Fri, 21 May 2021 14:16:22 +0530 +Subject: [PATCH] ath11k: configure nss radio priority during pdev_init + +pdev's priority value is read from dts. Get scheme_id +using pdev priority. Configure scheme_id during pdev_init. + +Signed-off-by: Seevalamuthu Mariappan +--- + drivers/net/wireless/ath/ath11k/nss.c | 20 +++++++++++++++++++- + drivers/net/wireless/ath/ath11k/nss.h | 3 +++ + 2 files changed, 22 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -2,6 +2,7 @@ + /* + * Copyright (c) 2020 The Linux Foundation. All rights reserved. + */ ++#include + + #include "debug.h" + #include "mac.h" +@@ -1782,6 +1783,7 @@ static int ath11k_nss_init(struct ath11k + nss_tx_status_t status; + struct ath11k_dp *dp; + int i, ret; ++ struct device *dev = ab->dev; + + dp = &ab->dp; + +@@ -1801,6 +1803,8 @@ static int ath11k_nss_init(struct ath11k + /* fill rx parameters to initialize rx context */ + wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; + wim->wrip.rx_buf_len = DP_RXDMA_NSS_REFILL_RING_SIZE; ++ if (of_property_read_bool(dev->of_node, "nss-radio-priority")) ++ wim->flags |= WIFILI_MULTISOC_THREAD_MAP_ENABLE; + + /* fill hal srng message */ + wim->hssm.dev_base_addr = (u32)ab->mem_pa; +@@ -1977,11 +1981,13 @@ int ath11k_nss_pdev_init(struct ath11k_b + struct nss_wifili_msg *wlmsg = NULL; + nss_wifili_msg_callback_t msg_cb; + nss_tx_status_t status; ++ struct device *dev = ab->dev; + int radio_if_num = -1; + int refill_ring_id; + int features = 0; + int dyn_if_type; +- int ret, i; ++ int ret, i, scheme_id = 0; ++ u32 nss_radio_priority; + + dyn_if_type = ath11k_nss_get_dynamic_interface_type(ab); + +@@ -2010,6 +2016,15 @@ int ath11k_nss_pdev_init(struct ath11k_b + ath11k_dbg(ab, ATH11K_DBG_NSS, "nss pdev init - id:%d init ctxt:%p ifnum:%d\n", + ar->pdev->pdev_id, ar->nss.ctx, ar->nss.if_num); + ++ if (!of_property_read_u32(dev->of_node, "nss-radio-priority", &nss_radio_priority)) { ++ scheme_id = nss_wifili_thread_scheme_alloc(ab->nss.ctx, ar->nss.if_num, nss_radio_priority); ++ if (scheme_id == WIFILI_SCHEME_ID_INVALID) { ++ ath11k_warn(ab, "received invalid scheme_id, configuring default value\n"); ++ scheme_id = 0; ++ } ++ } ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "ifnum: %d scheme_id: %d nss_radio_priority: %d\n", ar->nss.if_num, scheme_id, nss_radio_priority); ++ + wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); + if (!wlmsg) { + ret = -ENOMEM; +@@ -2022,6 +2037,7 @@ int ath11k_nss_pdev_init(struct ath11k_b + pdevmsg->lmac_id = ar->lmac_id; + pdevmsg->target_pdev_id = ar->pdev->pdev_id; + pdevmsg->num_rx_swdesc = WIFILI_RX_DESC_POOL_WEIGHT * DP_RXDMA_BUF_RING_SIZE; ++ pdevmsg->scheme_id = scheme_id; + + /* Store rxdma ring info to the message */ + refill_ring_id = ar->dp.rx_refill_buf_ring.refill_buf_ring.ring_id; +@@ -2315,6 +2331,9 @@ int ath11k_nss_pdev_deinit(struct ath11k + /* pdev deinit msg success, dealloc, deregister and return */ + ret = 0; + ++ /* reset thread scheme*/ ++ nss_wifili_thread_scheme_dealloc(ab->nss.ctx, ar->nss.if_num); ++ + nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); + nss_unregister_wifili_radio_if(ar->nss.if_num); + free: +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -61,6 +61,7 @@ struct hal_rx_user_status; + /* Init Flags */ + #define WIFILI_NSS_CCE_DISABLED 0x1 + #define WIFILI_ADDTL_MEM_SEG_SET 0x000000002 ++#define WIFILI_MULTISOC_THREAD_MAP_ENABLE 0x10 + + /* ATH11K NSS PEER Info */ + /* Host memory allocated for peer info storage in nss */ +@@ -108,6 +109,8 @@ enum ath11k_nss_vdev_cmd { + ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, + }; + ++#define WIFILI_SCHEME_ID_INVALID -1 ++ + enum ath11k_nss_opmode { + ATH11K_NSS_OPMODE_UNKNOWN, + ATH11K_NSS_OPMODE_AP, diff --git a/package/kernel/mac80211/patches/ath11k_nss/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch b/package/kernel/mac80211/patches/ath11k_nss/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch new file mode 100644 index 00000000000000..9189729b77f595 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -9,7 +9,7 @@ + #include "rx_desc.h" + #include "debug.h" + +-#define DP_MAX_NWIFI_HDR_LEN 30 ++#define DP_MAX_NWIFI_HDR_LEN 36 + + #define DP_RX_MPDU_ERR_FCS BIT(0) + #define DP_RX_MPDU_ERR_DECRYPT BIT(1) diff --git a/package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch b/package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch new file mode 100644 index 00000000000000..7ea6b471e340aa --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch @@ -0,0 +1,40 @@ +From 210b20357989ace8bb5c861b37e25b6c986c816d Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Thu, 1 Jul 2021 13:08:54 +0530 +Subject: [PATCH] ath11k: fix double free of peer rx_tid during reo cmd failure + +Peer rx_tid is locally copied thrice during peer_rx_tid_cleanup to send +REO_CMD_UPDATE_RX_QUEUE followed by REO_CMD_FLUSH_CACHE to flush all +aged REO descriptors from HW cache. + +When sending REO_CMD_FLUSH_CACHE fails, we do dma unmap of already +mapped rx_tid->vaddr and free it. This is not checked during +reo_cmd_list_cleanup() and dp_reo_cmd_free() before trying to free and +unmap again. + +Fix this by setting rx_tid->vaddr NULL in rx tid delete and also wherever +freeing it to check in reo_cmd_list_cleanup() and reo_cmd_free() before +trying to free again. + +Prevent REO cmd failures causing double free by increasing REO cmd +ring size and moving REO status ring mask to IRQ group 3 from group +0 to separate from tx completion ring on IRQ group 0 which may delay +reo status processing. + +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/dp.h | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 66 ++++++++++++++++++------- + drivers/net/wireless/ath/ath11k/hw.c | 1 + + 3 files changed, 49 insertions(+), 20 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -1435,6 +1435,7 @@ const struct ath11k_hw_ring_mask ath11k_ + ATH11K_RX_WBM_REL_RING_MASK_0, + }, + .reo_status = { ++ 0, 0, 0, + ATH11K_REO_STATUS_RING_MASK_0, + }, + .rxdma2host = { diff --git a/package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch new file mode 100644 index 00000000000000..d859d038003196 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch @@ -0,0 +1,99 @@ +From 190652ce1b56a41ed3a99d9f9c9160deba34810b Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Thu, 18 Nov 2021 12:28:31 +0530 +Subject: [PATCH] mac80211: simple tx for AP mode + +Introduced new API ieee80211_8023_xmit_ap to make tx simple and +to avoid unnecessary checks for AP mode. + +Signed-off-by: Venkateswara Naralasetty +Signed-off-by: Aloka Dixit +--- + net/mac80211/tx.c | 40 ++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 40 insertions(+) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4748,6 +4748,70 @@ out_free: + kfree_skb(skb); + } + ++void ieee80211_8023_xmit_ap(struct ieee80211_sub_if_data *sdata, ++ struct net_device *dev, struct sta_info *sta, ++ struct ieee80211_key *key, struct sk_buff *skb) ++{ ++ struct ieee80211_tx_info *info; ++ struct ieee80211_local *local = sdata->local; ++ struct ieee80211_sta *pubsta = NULL; ++ struct ieee80211_tx_control control = {}; ++ unsigned long flags; ++ int q; ++ u16 q_map; ++ ++ /* ++ * If the skb is shared we need to obtain our own copy. ++ */ ++ skb = skb_share_check(skb, GFP_ATOMIC); ++ ++ if (unlikely(!skb)) ++ return; ++ ++ info = IEEE80211_SKB_CB(skb); ++ memset(info, 0, sizeof(*info)); ++ ++ if (unlikely(skb->sk && ++ skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) ++ info->ack_frame_id = ieee80211_store_ack_skb(local, skb, ++ &info->flags, NULL); ++ ++ info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; ++ info->control.vif = &sdata->vif; ++ ++ if (key) ++ info->control.hw_key = &key->conf; ++ ++ q_map = skb_get_queue_mapping(skb); ++ q = sdata->vif.hw_queue[q_map]; ++ ++ if (sta) { ++ sta->deflink.tx_stats.bytes[q_map] += skb->len; ++ sta->deflink.tx_stats.packets[q_map]++; ++ atomic_inc(&sta->tx_netif_pkts); ++ } ++ ++ spin_lock_irqsave(&local->queue_stop_reason_lock, flags); ++ ++ if (local->queue_stop_reasons[q] || !skb_queue_empty(&local->pending[q])) { ++ skb_queue_tail(&local->pending[q], skb); ++ spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); ++ return; ++ } ++ ++ spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); ++ ++ if (sta && sta->uploaded) ++ pubsta = &sta->sta; ++ ++ control.sta = pubsta; ++ ++ drv_tx(local, &control, skb); ++ ++ if (sta) ++ atomic_inc(&sta->tx_drv_pkts); ++} ++ + netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev) + { +@@ -4787,6 +4851,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))) + goto skip_offload; + ++ if (sdata->vif.type == NL80211_IFTYPE_AP) { ++ ieee80211_8023_xmit_ap(sdata, dev, sta, key, skb); ++ goto out; ++ } ++ + sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); + tx_offload: + ieee80211_8023_xmit(sdata, dev, sta, key, skb); diff --git a/package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch b/package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch new file mode 100644 index 00000000000000..2e874d321d0ad1 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch @@ -0,0 +1,191 @@ +From 0e79fe8c6937e080816230892d5382af5a5a86c6 Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Mon, 29 Nov 2021 11:07:53 +0530 +Subject: [PATCH] ath11k: skip status ring entry processing + +If STATUS_BUFFER_DONE is not set for a monitor status ring entry, +we don't process the status ring until STATUS_BUFFER_DONE set +for that status ring entry. + +During LMAC reset it may happnen that HW will not write +STATUS_BUFFER_DONE tlv in status buffer, in that case we end up +waiting for STATUS_BUFFER_DONE leading to backpressure on monitor +status ring. + +As per MAC team's suggestion, when HP + 1 entry is peeked and if DMA +is not done and if HP + 2 entry's DMA done is set, +replenish HP + 1 entry and start processing in next interrupt. +If HP + 2 entry's DMA done is not set, +poll onto HP + 1 entry DMA done to be set. + +Also, During monitor attach HP points to the end of the ring and TP +points to the start of the ring. Using ath11k_hal_srng_src_peek() +may result in processing invali buffer for the very first interrupt. +Since, HW starts writing buffer from TP. + +Hence, replaced ath11k_hal_srng_src_peek() with +ath11k_hal_srng_src_next_peek(). + +Signed-off-by: Venkateswara Naralasetty +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 92 ++++++++++++++++++++++++++++----- + drivers/net/wireless/ath/ath11k/hal.c | 30 +++++++++++ + drivers/net/wireless/ath/ath11k/hal.h | 4 ++ + 3 files changed, 113 insertions(+), 13 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -3296,6 +3296,46 @@ ath11k_dp_rx_mon_update_status_buf_state + } + } + ++enum dp_mon_status_buf_state ++dp_rx_mon_handle_status_buf_done(struct ath11k_base *ab, struct hal_srng *srng, ++ struct dp_rxdma_ring *rx_ring) ++{ ++ void *status_desc; ++ struct sk_buff *skb; ++ struct ath11k_skb_rxcb *rxcb; ++ struct hal_tlv_hdr *tlv; ++ dma_addr_t paddr; ++ u32 cookie; ++ int buf_id; ++ u8 rbm; ++ ++ status_desc = ath11k_hal_srng_src_next_peek(ab, srng); ++ if (!status_desc) ++ return DP_MON_STATUS_NO_DMA; ++ ++ ath11k_hal_rx_buf_addr_info_get(status_desc, &paddr, &cookie, &rbm); ++ ++ buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, cookie); ++ ++ spin_lock_bh(&rx_ring->idr_lock); ++ skb = idr_find(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); ++ ++ if (!skb) ++ return DP_MON_STATUS_NO_DMA; ++ ++ rxcb = ATH11K_SKB_RXCB(skb); ++ dma_sync_single_for_cpu(ab->dev, rxcb->paddr, ++ skb->len + skb_tailroom(skb), ++ DMA_FROM_DEVICE); ++ ++ tlv = (struct hal_tlv_hdr *)skb->data; ++ if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_STATUS_BUFFER_DONE) ++ return DP_MON_STATUS_NO_DMA; ++ ++ return DP_MON_STATUS_REPLINISH; ++} ++ + static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id, + int *budget, struct sk_buff_head *skb_list) + { +@@ -3309,6 +3349,7 @@ static int ath11k_dp_rx_reap_mon_status_ + struct sk_buff *skb; + struct ath11k_skb_rxcb *rxcb; + struct hal_tlv_hdr *tlv; ++ enum dp_mon_status_buf_state reap_status; + u32 cookie; + int buf_id, srng_id; + dma_addr_t paddr; +@@ -3328,8 +3369,7 @@ static int ath11k_dp_rx_reap_mon_status_ + ath11k_hal_srng_access_begin(ab, srng); + while (*budget) { + *budget -= 1; +- rx_mon_status_desc = +- ath11k_hal_srng_src_peek(ab, srng); ++ rx_mon_status_desc = ath11k_hal_srng_src_peek(ab, srng); + if (!rx_mon_status_desc) { + pmon->buf_state = DP_MON_STATUS_REPLINISH; + break; +@@ -3360,18 +3400,43 @@ static int ath11k_dp_rx_reap_mon_status_ + tlv = (struct hal_tlv_hdr *)skb->data; + if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != + HAL_RX_STATUS_BUFFER_DONE) { +- ath11k_warn(ab, "mon status DONE not set %lx, buf_id %d\n", +- FIELD_GET(HAL_TLV_HDR_TAG, +- tlv->tl), buf_id); +- /* If done status is missing, hold onto status +- * ring until status is done for this status +- * ring buffer. +- * Keep HP in mon_status_ring unchanged, +- * and break from here. +- * Check status for same buffer for next time ++ /* RxDMA status done bit might not be set even ++ * though tp is moved by HW. + */ +- pmon->buf_state = DP_MON_STATUS_NO_DMA; +- break; ++ ++ /* If done status is missing: ++ * 1. As per MAC team's suggestion, ++ * when HP + 1 entry is peeked and if DMA ++ * is not done and if HP + 2 entry's DMA done ++ * is set. skip HP + 1 entry and ++ * start processing in next interrupt. ++ * 2. If HP + 2 entry's DMA done is not set, ++ * poll onto HP + 1 entry DMA done to be set. ++ * Check status for same buffer for next time ++ * dp_rx_mon_status_srng_process ++ */ ++ ++ reap_status = dp_rx_mon_handle_status_buf_done(ab, srng, ++ rx_ring); ++ if (reap_status == DP_MON_STATUS_NO_DMA) { ++ continue; ++ } else if (reap_status == DP_MON_STATUS_REPLINISH) { ++ ath11k_warn(ab, "mon status DONE not set %lx, buf_id %d\n", ++ FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl), ++ buf_id); ++ ++ spin_lock_bh(&rx_ring->idr_lock); ++ idr_remove(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); ++ ++ dma_unmap_single(ab->dev, rxcb->paddr, ++ skb->len + skb_tailroom(skb), ++ DMA_FROM_DEVICE); ++ ++ dev_kfree_skb_any(skb); ++ pmon->buf_state = DP_MON_STATUS_REPLINISH; ++ goto move_next; ++ } + } + + spin_lock_bh(&rx_ring->idr_lock); +--- a/drivers/net/wireless/ath/ath11k/hal.c ++++ b/drivers/net/wireless/ath/ath11k/hal.c +@@ -837,6 +837,20 @@ u32 *ath11k_hal_srng_src_get_next_reaped + return desc; + } + ++u32 *ath11k_hal_srng_src_next_peek(struct ath11k_base *ab, struct hal_srng *srng) ++{ ++ u32 next_hp; ++ ++ lockdep_assert_held(&srng->lock); ++ ++ next_hp = (srng->u.src_ring.hp + srng->entry_size) % srng->ring_size; ++ ++ if (next_hp != srng->u.src_ring.cached_tp) ++ return srng->ring_base_vaddr + next_hp; ++ ++ return NULL; ++} ++ + u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng) + { + lockdep_assert_held(&srng->lock); +--- a/drivers/net/wireless/ath/ath11k/hal.h ++++ b/drivers/net/wireless/ath/ath11k/hal.h +@@ -953,6 +953,8 @@ int ath11k_hal_srng_dst_num_free(struct + void ath11k_hal_srng_dst_invalidate_entry(struct ath11k_base *ab, + struct hal_srng *srng, int entries); + u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng); ++u32 *ath11k_hal_srng_src_next_peek(struct ath11k_base *ab, ++ struct hal_srng *srng); + u32 *ath11k_hal_srng_src_get_next_reaped(struct ath11k_base *ab, + struct hal_srng *srng); + u32 *ath11k_hal_srng_src_reap_next(struct ath11k_base *ab, diff --git a/package/kernel/mac80211/patches/ath11k_nss/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch b/package/kernel/mac80211/patches/ath11k_nss/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch new file mode 100644 index 00000000000000..db779080b71f96 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch @@ -0,0 +1,28 @@ +From a12157095a8a59eeaeb7c9efe70495288140159c Mon Sep 17 00:00:00 2001 +From: Hari Chandrakanthan +Date: Mon, 10 Jan 2022 12:38:10 +0530 +Subject: [PATCH] ath11k: provide access of the dma buffer back to dma device + +In ath11k_dbring_bufs_replenish, after accessing paddr which is a member of +ath11k_dbring_element, provide the access of the buffer back to +dma device by using dma_sync_single_for_device. + +Also the gfp flag to used inside ath11k_dbring_fill_bufs is changed +from GFP_KERNEL to GFP_ATOMIC as the buffers are allocated inside spin lock. + +Signed-off-by: Hari Chandrakanthan +--- + drivers/net/wireless/ath/ath11k/dbring.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/dbring.c ++++ b/drivers/net/wireless/ath/ath11k/dbring.c +@@ -80,6 +80,8 @@ static int ath11k_dbring_bufs_replenish( + + buff->paddr = paddr; + ++ dma_sync_single_for_device(ab->dev, paddr, ring->buf_sz, DMA_FROM_DEVICE); ++ + cookie = FIELD_PREP(DP_RXDMA_BUF_COOKIE_PDEV_ID, ar->pdev_idx) | + FIELD_PREP(DP_RXDMA_BUF_COOKIE_BUF_ID, buf_id); + diff --git a/package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch b/package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch new file mode 100644 index 00000000000000..e4890a3654c3b3 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch @@ -0,0 +1,50 @@ +From 479096a023928cc75aa38953b7170a8984acd0da Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam +Date: Tue, 11 Jan 2022 14:04:09 +0530 +Subject: [PATCH] mac80211: Fix kernel panic due to unsafe sta usage + +Observing below crash in dynamic vlan scneario when +abruptly killing hostapd while ping or any traffic to stations +are going on. + +[ 753.307213] Unable to handle kernel NULL pointer dereference at virtual address 0000058c +[ 753.309137] pgd = 7514769a +[ 753.317392] [0000058c] *pgd=00000000 +[ 753.319892] Internal error: Oops: 5 [#1] PREEMPT SMP ARM +[ 753.604280] PC is at __ieee80211_subif_start_xmit+0xc58/0xe48 [mac80211] +[ 753.608954] LR is at __ieee80211_subif_start_xmit+0xc3c/0xe48 [mac80211] +[ 753.615729] pc : [] lr : [] psr: 40000013 +[ 753.622411] sp : 843b5940 ip : 98e7d348 fp : 99463e42 +[ 753.628398] r10: 98e7d318 r9 : 92d0e000 r8 : 00000000 +[ 753.633606] r7 : 963c8d20 r6 : 92d0e580 r5 : 00000000 r4 : 98e7d300 +[ 753.638819] r3 : 00000163 r2 : fffffff0 r1 : 00000000 r0 : 98e7d318 +[ 753.645416] Flags: nZcv IRQs on FIQs on Mode SVC_32 ISA ARM Segment user +[ 753.651928] Control: 10c0383d Table: 5db8806a DAC: 00000055 +[ 753.659135] Process ping (pid: 4436, stack limit = 0xf466aee4) + +Its due to accessing the sta pointer +unconditionally. Fix that by checking sta pointer is +available or not before using. + +Signed-off-by: Tamizh Chelvam +--- + net/mac80211/tx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4725,12 +4725,12 @@ static void ieee80211_8023_xmit(struct i + + if (unlikely(skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS && +- !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) ++ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta)) + info->ack_frame_id = ieee80211_store_ack_skb(local, skb, + &info->flags, NULL); + + ieee80211_tx_stats(dev, len); +- if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta) { + sta->deflink.tx_stats.packets[queue] += skbs; + sta->deflink.tx_stats.bytes[queue] += len; + } diff --git a/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch b/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch new file mode 100644 index 00000000000000..5050192acc64ae --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch @@ -0,0 +1,50 @@ +From 451cd8d4f107750d86a51c3cf750015676991d17 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Kathirvel +Date: Thu, 11 Aug 2022 21:27:16 +0530 +Subject: [PATCH] ath11k: fix clearing peer keys during sta state auth to assoc + +During station state change from AUTHORIZED to ASSOC, driver must clear its key +from hw. Ath11k clearing the keys during ASSOC to AUTH which is not a +valid sequence and there is a chance of accessing ptr after free. + +Clear the peer keys while the state of station changes from AUTHORIZED +to ASSOC. + +Signed-off-by: Karthikeyan Kathirvel +--- + drivers/net/wireless/ath/ath11k/mac.c | 37 ++++++++++++++++++++--------------- + 1 file changed, 21 insertions(+), 16 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -4708,12 +4708,6 @@ static int ath11k_station_disassoc(struc + return ret; + } + +- ret = ath11k_clear_peer_keys(arvif, sta->addr); +- if (ret) { +- ath11k_warn(ar->ab, "failed to clear all peer keys for vdev %i: %d\n", +- arvif->vdev_id, ret); +- return ret; +- } + return 0; + } + +@@ -5176,6 +5170,17 @@ static int ath11k_mac_op_sta_state(struc + arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); + arsta->bw_prev = arsta->bw; + spin_unlock_bh(&ar->data_lock); ++ ++ /* Driver should clear the peer keys during mac80211's ref ptr ++ * gets cleared in __sta_info_destroy_part2 (trans from ++ * IEEE80211_STA_AUTHORIZED to IEEE80211_STA_ASSOC) ++ */ ++ ret = ath11k_clear_peer_keys(arvif, sta->addr); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to clear all peer keys for vdev %i: %d\n", ++ arvif->vdev_id, ret); ++ return ret; ++ } + } else if (old_state == IEEE80211_STA_ASSOC && + new_state == IEEE80211_STA_AUTHORIZED) { + spin_lock_bh(&ar->ab->base_lock); diff --git a/package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch b/package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch new file mode 100644 index 00000000000000..d8c907556645cf --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch @@ -0,0 +1,25 @@ +From e4f2f898dcbe2bf82b9e8fb4f3d306c98d82e5bd Mon Sep 17 00:00:00 2001 +From: Ramya Gnanasekar +Date: Wed, 7 Dec 2022 17:29:50 +0530 +Subject: [PATCH] ath11k: fix tkip encryption traffic failure + +Fast rx is not assigned in case of TKIP cipher and hence +packets are dropped in fast path. + +Handle the rx decap for TKIP so frames will be handled in +normal rx path. + +Signed-off-by: Ramya Gnanasekar + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2364,7 +2364,8 @@ static void ath11k_dp_rx_h_undecap(struc + ehdr = (struct ethhdr *)msdu->data; + + /* mac80211 allows fast path only for authorized STA */ +- if (ehdr->h_proto == cpu_to_be16(ETH_P_PAE)) { ++ if (ehdr->h_proto == cpu_to_be16(ETH_P_PAE) || ++ enctype == HAL_ENCRYPT_TYPE_TKIP_MIC) { + ATH11K_SKB_RXCB(msdu)->is_eapol = true; + ath11k_dp_rx_h_undecap_eth(ar, msdu, first_hdr, + enctype, status); diff --git a/package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch b/package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch new file mode 100644 index 00000000000000..7b3df32c05b69e --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch @@ -0,0 +1,73 @@ +From 69356d5f6947c8a6182e1c6283478ad40c6df37b Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam Raja +Date: Wed, 21 Jun 2023 20:26:02 +0530 +Subject: [PATCH] ath11k: Add nss event handler support for link desc + +Add NSS event handler support for NSS_WIFILI_LINK_DESC_INFO_MSG. +This event will be given to host from NSS for releasing +link descriptor which used for fragmentation. This needs to be +handled to release the link descriptor back to hardware for +other usage. + +Signed-off-by: Tamizh Chelvam Raja +--- + drivers/net/wireless/ath/ath11k/nss.c | 43 +++++++++++++++++++++++++++ + 1 file changed, 43 insertions(+) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -72,6 +72,43 @@ static void ath11k_nss_wifili_stats_sync + spin_unlock_bh(&ab->base_lock); + } + ++static void ath11k_nss_wifili_link_desc_set(struct ath11k_base *ab, void *desc, ++ struct ath11k_buffer_addr *buf_addr_info, ++ enum hal_wbm_rel_bm_act action) ++{ ++ struct hal_wbm_release_ring *dst_desc = desc; ++ ++ dst_desc->buf_addr_info = *buf_addr_info; ++ dst_desc->info0 |= FIELD_PREP(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, ++ HAL_WBM_REL_SRC_MODULE_SW) | ++ FIELD_PREP(HAL_WBM_RELEASE_INFO0_BM_ACTION, action) | ++ FIELD_PREP(HAL_WBM_RELEASE_INFO0_DESC_TYPE, ++ HAL_WBM_REL_DESC_TYPE_MSDU_LINK); ++} ++ ++static void ath11k_nss_wifili_link_desc_return(struct ath11k_base *ab, ++ struct ath11k_buffer_addr *buf_addr_info) ++{ ++ struct ath11k_dp *dp = &ab->dp; ++ struct hal_srng *srng; ++ u32 *desc; ++ ++ srng = &ab->hal.srng_list[dp->wbm_desc_rel_ring.ring_id]; ++ spin_lock_bh(&srng->lock); ++ ++ ath11k_hal_srng_access_begin(ab, srng); ++ desc = ath11k_hal_srng_src_get_next_entry(ab, srng); ++ ++ if (!desc) ++ goto exit; ++ ++ ath11k_nss_wifili_link_desc_set(ab, desc, buf_addr_info, HAL_WBM_REL_BM_ACT_PUT_IN_IDLE); ++ ++exit: ++ ath11k_hal_srng_access_end(ab, srng); ++ spin_unlock(&srng->lock); ++} ++ + static void ath11k_nss_get_peer_stats(struct ath11k_base *ab, struct nss_wifili_peer_stats *stats) + { + struct ath11k_peer *peer; +@@ -307,6 +344,10 @@ void ath11k_nss_wifili_event_receive(str + case NSS_WIFILI_TID_REOQ_SETUP_MSG: + /* TODO setup tidq */ + break; ++ case NSS_WIFILI_LINK_DESC_INFO_MSG: ++ ath11k_nss_wifili_link_desc_return(ab, ++ (void *)&msg->msg.linkdescinfomsg); ++ break; + default: + ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); + break; diff --git a/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch b/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch new file mode 100644 index 00000000000000..2d1fbc097df375 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch @@ -0,0 +1,85 @@ +From 11d0cce62afc157468e1d97ea80a2510091ea2c2 Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Fri, 1 Jul 2022 11:57:00 +0530 +Subject: [PATCH] mac80211: Remove unused RX_FLAGS from mac80211_rx_flags + +Remove unused RX_FLAG_AMPDU_DELIM_CRC_KNOWN flag from +mac80211_rx_flags to provide space for new EHT flags. + +Signed-off-by: P Praneesh +--- + include/net/mac80211.h | 33 +++++++++++++++------------------ + net/mac80211/rx.c | 7 +------ + 2 files changed, 16 insertions(+), 24 deletions(-) + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -1385,8 +1385,6 @@ ieee80211_tx_info_clear_status(struct ie + * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU + * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected + * on this subframe +- * @RX_FLAG_AMPDU_DELIM_CRC_KNOWN: The delimiter CRC field is known (the CRC +- * is stored in the @ampdu_delimiter_crc field) + * @RX_FLAG_MIC_STRIPPED: The mic was stripped of this packet. Decryption was + * done by the hardware + * @RX_FLAG_ONLY_MONITOR: Report frame only to monitor interfaces without +@@ -1458,22 +1456,21 @@ enum mac80211_rx_flags { + RX_FLAG_AMPDU_LAST_KNOWN = BIT(12), + RX_FLAG_AMPDU_IS_LAST = BIT(13), + RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(14), +- RX_FLAG_AMPDU_DELIM_CRC_KNOWN = BIT(15), +- RX_FLAG_MACTIME_END = BIT(16), +- RX_FLAG_ONLY_MONITOR = BIT(17), +- RX_FLAG_SKIP_MONITOR = BIT(18), +- RX_FLAG_AMSDU_MORE = BIT(19), +- RX_FLAG_RADIOTAP_TLV_AT_END = BIT(20), +- RX_FLAG_MIC_STRIPPED = BIT(21), +- RX_FLAG_ALLOW_SAME_PN = BIT(22), +- RX_FLAG_ICV_STRIPPED = BIT(23), +- RX_FLAG_AMPDU_EOF_BIT = BIT(24), +- RX_FLAG_AMPDU_EOF_BIT_KNOWN = BIT(25), +- RX_FLAG_RADIOTAP_HE = BIT(26), +- RX_FLAG_RADIOTAP_HE_MU = BIT(27), +- RX_FLAG_RADIOTAP_LSIG = BIT(28), +- RX_FLAG_NO_PSDU = BIT(29), +- RX_FLAG_8023 = BIT(30), ++ RX_FLAG_MACTIME_END = BIT(15), ++ RX_FLAG_ONLY_MONITOR = BIT(16), ++ RX_FLAG_SKIP_MONITOR = BIT(17), ++ RX_FLAG_AMSDU_MORE = BIT(18), ++ RX_FLAG_RADIOTAP_TLV_AT_END = BIT(19), ++ RX_FLAG_MIC_STRIPPED = BIT(20), ++ RX_FLAG_ALLOW_SAME_PN = BIT(21), ++ RX_FLAG_ICV_STRIPPED = BIT(22), ++ RX_FLAG_AMPDU_EOF_BIT = BIT(23), ++ RX_FLAG_AMPDU_EOF_BIT_KNOWN = BIT(24), ++ RX_FLAG_RADIOTAP_HE = BIT(25), ++ RX_FLAG_RADIOTAP_HE_MU = BIT(26), ++ RX_FLAG_RADIOTAP_LSIG = BIT(27), ++ RX_FLAG_NO_PSDU = BIT(28), ++ RX_FLAG_8023 = BIT(29), + }; + + /** +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -527,18 +527,13 @@ ieee80211_add_rx_radiotap_header(struct + flags |= IEEE80211_RADIOTAP_AMPDU_IS_LAST; + if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_ERROR) + flags |= IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR; +- if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_KNOWN) +- flags |= IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_KNOWN; + if (status->flag & RX_FLAG_AMPDU_EOF_BIT_KNOWN) + flags |= IEEE80211_RADIOTAP_AMPDU_EOF_KNOWN; + if (status->flag & RX_FLAG_AMPDU_EOF_BIT) + flags |= IEEE80211_RADIOTAP_AMPDU_EOF; + put_unaligned_le16(flags, pos); + pos += 2; +- if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_KNOWN) +- *pos++ = status->ampdu_delimiter_crc; +- else +- *pos++ = 0; ++ *pos++ = 0; + *pos++ = 0; + } + diff --git a/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch b/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch new file mode 100644 index 00000000000000..b8d2b614dd4759 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch @@ -0,0 +1,506 @@ +From f76abd98383dbd350f4e41b400beaaff2130254a Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Sun, 3 Jul 2022 19:31:44 +0530 +Subject: [PATCH] mac80211: add EHT radiotap header construction logic + +Driver advertises U_SIG and EHT info in the flag under rx_status +structure. Based on this flag, corresponding EHT and U_SIG +information are added in the radiotap header. + +Signed-off-by: P Praneesh +--- + include/net/ieee80211_radiotap.h | 160 +++++++++++++++++++++++++++++++++++++++ + include/net/mac80211.h | 9 +++ + net/mac80211/rx.c | 88 +++++++++++++++++++++ + 3 files changed, 257 insertions(+) + +--- a/include/net/ieee80211_radiotap.h ++++ b/include/net/ieee80211_radiotap.h +@@ -92,6 +92,11 @@ enum ieee80211_radiotap_presence { + IEEE80211_RADIOTAP_EHT = 34, + }; + ++enum ieee80211_radiotap_presence_ext { ++ IEEE80211_RADIOTAP_USIG_INFO = 1, ++ IEEE80211_RADIOTAP_EHT_INFO = 2, ++}; ++ + /* for IEEE80211_RADIOTAP_FLAGS */ + enum ieee80211_radiotap_flags { + IEEE80211_RADIOTAP_F_CFP = 0x01, +@@ -406,128 +411,6 @@ struct ieee80211_radiotap_eht_usig { + __le32 mask; + } __packed; + +-/* ieee80211_radiotap_eht - content of EHT tlv (type 34) +- * see www.radiotap.org/fields/EHT.html for details +- */ +-struct ieee80211_radiotap_eht { +- __le32 known; +- __le32 data[9]; +- __le32 user_info[]; +-} __packed; +- +-/* Known field for EHT TLV +- * The ending defines for what the field applies as following +- * O - OFDMA (including TB), M - MU-MIMO, S - EHT sounding. +- */ +-enum ieee80211_radiotap_eht_known { +- IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE = 0x00000002, +- IEEE80211_RADIOTAP_EHT_KNOWN_GI = 0x00000004, +- IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF = 0x00000010, +- IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM = 0x00000020, +- IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM = 0x00000040, +- IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM = 0x00000080, +- IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_O = 0x00000100, +- IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_S = 0x00000200, +- IEEE80211_RADIOTAP_EHT_KNOWN_CRC1 = 0x00002000, +- IEEE80211_RADIOTAP_EHT_KNOWN_TAIL1 = 0x00004000, +- IEEE80211_RADIOTAP_EHT_KNOWN_CRC2_O = 0x00008000, +- IEEE80211_RADIOTAP_EHT_KNOWN_TAIL2_O = 0x00010000, +- IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S = 0x00020000, +- IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S = 0x00040000, +- IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M = 0x00080000, +- IEEE80211_RADIOTAP_EHT_KNOWN_ENCODING_BLOCK_CRC_M = 0x00100000, +- IEEE80211_RADIOTAP_EHT_KNOWN_ENCODING_BLOCK_TAIL_M = 0x00200000, +- IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_SIZE_OM = 0x00400000, +- IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_INDEX_OM = 0x00800000, +- IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT = 0x01000000, +- IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80 = 0x02000000, +-}; +- +-enum ieee80211_radiotap_eht_data { +- /* Data 0 */ +- IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE = 0x00000078, +- IEEE80211_RADIOTAP_EHT_DATA0_GI = 0x00000180, +- IEEE80211_RADIOTAP_EHT_DATA0_LTF = 0x00000600, +- IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF = 0x00003800, +- IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM = 0x00004000, +- IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM = 0x00018000, +- IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM = 0x00020000, +- IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_S = 0x000c0000, +- IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_O = 0x003c0000, +- IEEE80211_RADIOTAP_EHT_DATA0_CRC1_O = 0x03c00000, +- IEEE80211_RADIOTAP_EHT_DATA0_TAIL1_O = 0xfc000000, +- /* Data 1 */ +- IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE = 0x0000001f, +- IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX = 0x00001fe0, +- IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1 = 0x003fe000, +- IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1_KNOWN = 0x00400000, +- IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80 = 0xc0000000, +- /* Data 2 */ +- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1 = 0x000001ff, +- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1_KNOWN = 0x00000200, +- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2 = 0x0007fc00, +- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2_KNOWN = 0x00080000, +- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2 = 0x1ff00000, +- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2_KNOWN = 0x20000000, +- /* Data 3 */ +- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1 = 0x000001ff, +- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1_KNOWN = 0x00000200, +- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1 = 0x0007fc00, +- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1_KNOWN = 0x00080000, +- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2 = 0x1ff00000, +- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2_KNOWN = 0x20000000, +- /* Data 4 */ +- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2 = 0x000001ff, +- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2_KNOWN = 0x00000200, +- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3 = 0x0007fc00, +- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3_KNOWN = 0x00080000, +- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3 = 0x1ff00000, +- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3_KNOWN = 0x20000000, +- /* Data 5 */ +- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4 = 0x000001ff, +- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4_KNOWN = 0x00000200, +- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4 = 0x0007fc00, +- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4_KNOWN = 0x00080000, +- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5 = 0x1ff00000, +- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5_KNOWN = 0x20000000, +- /* Data 6 */ +- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5 = 0x000001ff, +- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5_KNOWN = 0x00000200, +- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6 = 0x0007fc00, +- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6_KNOWN = 0x00080000, +- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6 = 0x1ff00000, +- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6_KNOWN = 0x20000000, +- /* Data 7 */ +- IEEE80211_RADIOTAP_EHT_DATA7_CRC2_O = 0x0000000f, +- IEEE80211_RADIOTAP_EHT_DATA7_TAIL_2_O = 0x000003f0, +- IEEE80211_RADIOTAP_EHT_DATA7_NSS_S = 0x0000f000, +- IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S = 0x00010000, +- IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS = 0x000e0000, +- IEEE80211_RADIOTAP_EHT_DATA7_USER_ENCODING_BLOCK_CRC = 0x00f00000, +- IEEE80211_RADIOTAP_EHT_DATA7_USER_ENCODING_BLOCK_TAIL = 0x3f000000, +- /* Data 8 */ +- IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160 = 0x00000001, +- IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0 = 0x00000002, +- IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1 = 0x000001fc, +-}; +- +-enum ieee80211_radiotap_eht_user_info { +- IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN = 0x00000001, +- IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN = 0x00000002, +- IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN = 0x00000004, +- IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O = 0x00000010, +- IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O = 0x00000020, +- IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN_M = 0x00000040, +- IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_FOR_USER = 0x00000080, +- IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID = 0x0007ff00, +- IEEE80211_RADIOTAP_EHT_USER_INFO_CODING = 0x00080000, +- IEEE80211_RADIOTAP_EHT_USER_INFO_MCS = 0x00f00000, +- IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O = 0x0f000000, +- IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O = 0x20000000, +- IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_M = 0x3f000000, +- IEEE80211_RADIOTAP_EHT_USER_INFO_RESEVED_c0000000 = 0xc0000000, +-}; +- + enum ieee80211_radiotap_eht_usig_common { + IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN = 0x00000001, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN = 0x00000002, +@@ -573,6 +456,161 @@ enum ieee80211_radiotap_eht_usig_tb { + IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL = 0xfc000000, + }; + ++enum ieee80211_radiotap_usig_common { ++ IEEE80211_RADIOTAP_USIG_CMN_PHY_VERSION = 0x00000001, ++ IEEE80211_RADIOTAP_USIG_CMN_BW_KNOWN = 0x00000002, ++ IEEE80211_RADIOTAP_USIG_CMN_UL_DL_KNOWN = 0x00000004, ++ IEEE80211_RADIOTAP_USIG_CMN_BSS_COLOR_KNOWN = 0x00000008, ++ IEEE80211_RADIOTAP_USIG_CMN_TXOP_KNOWN = 0x00000010, ++ IEEE80211_RADIOTAP_USIG_CMN_BAD_CRC = 0x00000020, ++ IEEE80211_RADIOTAP_USIG_CMN_PHY_VERSION_ID = 0x00007000, ++ IEEE80211_RADIOTAP_USIG_CMN_BW = 0x00038000, ++ IEEE80211_RADIOTAP_USIG_CMN_UL_DL = 0x00040000, ++ IEEE80211_RADIOTAP_USIG_CMN_BSS_COLOR = 0x01f80000, ++ IEEE80211_RADIOTAP_USIG_CMN_TXOP = 0xfe000000, ++}; ++ ++enum ieee80211_radiotap_usig_eht_mu_ppdu { ++ IEEE80211_RADIOTAP_USIG_EHT_MU_DISREGARD = 0x0000001f, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_DISREGARD_VALIDATE = 0x00000020, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_PPDU_TYPE_COMP_MODE = 0x000000c0, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_PPDU_COMP_VALIDATE = 0x00000100, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_PUNCTURED_CHAN_INFO = 0x00003e00, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_PUNCTURED_CHAN_VALIDATE = 0x00004000, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_MCS = 0x00018000, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_NUM_SYMBOLS = 0x003e0000, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_CRC = 0x03c00000, ++ IEEE80211_RADIOTAP_USIG_EHT_MU_TAIL = 0xfc000000, ++}; ++ ++enum ieee80211_radiotap_usig_eht_tb_ppdu { ++ IEEE80211_RADIOTAP_USIG_EHT_TB_DISREGARD = 0x0000003f, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_PPDU_TYPE_COMP_MODE = 0x000000c0, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_VALIDATE = 0x00000100, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_SPATIAL_REUSE1 = 0x00001e00, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_SPATIAL_REUSE2 = 0x0001e000, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_DISREGARD1 = 0x003e0000, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_CRC = 0x03c00000, ++ IEEE80211_RADIOTAP_USIG_EHT_TB_TAIL = 0xfc000000, ++}; ++ ++struct ieee80211_radiotap_usig { ++ __le32 usig_cmn; ++ __le32 eht_mu_ppdu; ++ __le32 eht_tb_ppdu; ++}; ++ ++enum ieee80211_radiotap_eht_known { ++ IEEE80211_RADIOTAP_EHT_SPATIAL_REUSE_KNOWN = 0x00000002, ++ IEEE80211_RADIOTAP_EHT_GUARD_INTERVAL_KNOWN = 0x00000004, ++ IEEE80211_RADIOTAP_EHT_LTF_KNOWN = 0x00000008, ++ IEEE80211_RADIOTAP_EHT_EHT_LTF_KNOWN = 0x00000010, ++ IEEE80211_RADIOTAP_EHT_LDPC_EXTRA_SYM_SEG_KNOWN = 0x00000020, ++ IEEE80211_RADIOTAP_EHT_PRE_FEC_PAD_FACTOR_KNOWN = 0x00000040, ++ IEEE80211_RADIOTAP_EHT_PE_DISAMBIGUITY_KNOWN = 0x00000080, ++ IEEE80211_RADIOTAP_EHT_DISREGARD_KNOWN = 0x00000100, ++ IEEE80211_RADIOTAP_EHT_SOUNDING_DISREGARD_KNOWN = 0x00000200, ++ IEEE80211_RADIOTAP_EHT_CRC1_KNOWN = 0x00002000, ++ IEEE80211_RADIOTAP_EHT_TAIL1_KNOWN = 0x00004000, ++ IEEE80211_RADIOTAP_EHT_CRC2_KNOWN = 0x00008000, ++ IEEE80211_RADIOTAP_EHT_TAIL2_KNOWN = 0x00010000, ++ IEEE80211_RADIOTAP_EHT_NSS_KNOWN = 0x00020000, ++ IEEE80211_RADIOTAP_EHT_BEAMFORMED_KNOWN = 0x00040000, ++ IEEE80211_RADIOTAP_EHT_NUM_NON_OFDMA_USR_KNOWN = 0x00080000, ++ IEEE80211_RADIOTAP_EHT_USR_ENC_BLK_CRC_KNOWN = 0x00100000, ++ IEEE80211_RADIOTAP_EHT_USR_ENC_BLK_TAIL_KNOWN = 0x00200000, ++ IEEE80211_RADIOTAP_EHT_RU_SIZE_KNOWN = 0x00400000, ++ IEEE80211_RADIOTAP_EHT_RU_INDEX_KNOWN = 0x00800000, ++ IEEE80211_RADIOTAP_EHT_RU_ALLOCATION = 0x01000000, ++ IEEE80211_RADIOTAP_EHT_PRI80_CHAN_POS_KNOWN = 0x02000000, ++}; ++ ++enum ieee80211_radiotap_eht_data0 { ++ IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE = 0x00000078, ++ IEEE80211_RADIOTAP_EHT_DATA0_GI = 0x00000180, ++ IEEE80211_RADIOTAP_EHT_DATA0_LTF = 0x00000600, ++ IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF = 0x00003800, ++ IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_SEG = 0x00004000, ++ IEEE80211_RADIOTAP_EHT_DATA0_PRE_FEC_PAD_FACTOR = 0x00018000, ++ IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY = 0x00020000, ++ IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_EHT_SOUND = 0x000c0000, ++ IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_NON_EHT_SOUND = 0x003c0000, ++ IEEE80211_RADIOTAP_EHT_DATA0_CRC1 = 0x03c00000, ++ IEEE80211_RADIOTAP_EHT_DATA0_TAIL1 = 0xfc000000, ++}; ++ ++enum ieee80211_radiotap_eht_data1 { ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE = 0x0000001f, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_26 = 0, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_52 = 1, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_106 = 2, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_242 = 3, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_484 = 4, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_996 = 5, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_2x996 = 6, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_4x996 = 7, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_52P26 = 8, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_106P26 = 9, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_484P242 = 10, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_996P484 = 11, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_996P484P242 = 12, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_2x996P484 = 13, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_3x996 = 14, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_3x996P484 = 15, ++ ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX = 0x00001fe0, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOCATION1 = 0x003fe000, ++ IEEE80211_RADIOTAP_EHT_DATA1_RU_PRIMARY_80MHZ_CHAN_POS = 0xc0000000, ++}; ++ ++enum ieee80211_radiotap_eht_data2_to_data6 { ++ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_X = 0x000001ff, ++ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_X_KNOWN = 0x00000200, ++ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP1 = 0x0007fc00, ++ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP1_KNOWN = 0x00080000, ++ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP2 = 0x1ff00000, ++ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP2_KNOWN = 0x20000000, ++}; ++ ++enum ieee80211_radiotap_eht_data7 { ++ IEEE80211_RADIOTAP_EHT_DATA7_CRC2 = 0x0000000f, ++ IEEE80211_RADIOTAP_EHT_DATA7_TAIL2 = 0x000003f0, ++ IEEE80211_RADIOTAP_EHT_DATA7_NSS = 0x0000f000, ++ IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED = 0x00010000, ++ IEEE80211_RADIOTAP_EHT_DATA7_NUM_NON_OFDMA_USERS = 0x000e0000, ++ IEEE80211_RADIOTAP_EHT_DATA7_USR_ENC_BLK_CRC = 0x00f00000, ++ IEEE80211_RADIOTAP_EHT_DATA7_USR_ENC_BLK_TAIL = 0x3f000000, ++}; ++ ++enum ieee80211_radiotap_eht_data8 { ++ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOCATION_PS160 = 0x00000001, ++ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOCATION_TB_FORMAT1 = 0x00000002, ++ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOCATION_TB_FORMAT2 = 0x000001fc, ++}; ++ ++enum ieee80211_radiotap_eht_user_info { ++ IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN = 0x00000001, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN = 0x00000002, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN = 0x00000004, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_RSVD_KNOWN = 0x00000008, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN = 0x00000010, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN = 0x00000020, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN = 0x00000040, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_CAPTURE = 0x00000080, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID = 0x0007ff00, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_CODING = 0x00080000, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_MCS = 0x00f00000, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_NSS = 0x0f000000, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING = 0x20000000, ++ IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG = 0x3f000000, ++}; ++ ++struct ieee80211_radiotap_eht { ++ __le32 known; ++ __le32 data[9]; ++ __le32 user_info[]; ++}; ++ + /** + * ieee80211_get_radiotap_len - get radiotap header length + */ +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -1439,7 +1439,11 @@ ieee80211_tx_info_clear_status(struct ie + * known the frame shouldn't be reported. + * @RX_FLAG_8023: the frame has an 802.3 header (decap offload performed by + * hardware or driver) ++ * @RX_FLAG_USIG_HEADER: Universal field carries information necessary to ++ * interpret EHT PPDUs. ++ * @RX_FLAG_EHT_HEADER: EHT radiotap data is present. + */ ++ + enum mac80211_rx_flags { + RX_FLAG_MMIC_ERROR = BIT(0), + RX_FLAG_DECRYPTED = BIT(1), +@@ -1471,6 +1475,8 @@ enum mac80211_rx_flags { + RX_FLAG_RADIOTAP_LSIG = BIT(27), + RX_FLAG_NO_PSDU = BIT(28), + RX_FLAG_8023 = BIT(29), ++ RX_FLAG_USIG_HEADER = BIT(30), ++ RX_FLAG_EHT_HEADER = BIT(31), + }; + + /** +@@ -1538,6 +1544,7 @@ enum mac80211_rx_encoding { + * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) + * @nss: number of streams (VHT, HE and EHT only) + * @flag: %RX_FLAG_\* ++ * @ext_flag: %RX_FLAG_\* + * @encoding: &enum mac80211_rx_encoding + * @bw: &enum rate_info_bw + * @enc_flags: uses bits from &enum mac80211_rx_encoding_flags +@@ -1591,6 +1598,7 @@ struct ieee80211_rx_status { + u8 ampdu_delimiter_crc; + u8 zero_length_psdu_type; + u8 link_valid:1, link_id:4; ++ u8 eht_num_user; + }; + + static inline u32 +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -143,6 +143,12 @@ ieee80211_rx_radiotap_hdrlen(struct ieee + /* always present fields */ + len = sizeof(struct ieee80211_radiotap_header) + 8; + ++ /* EHT present fields */ ++ if ((status->flag & RX_FLAG_EHT_HEADER) || ++ (status->flag & RX_FLAG_USIG_HEADER)) { ++ len += 4; ++ } ++ + /* allocate extra bitmaps */ + if (status->chains) + len += 4 * hweight8(status->chains); +@@ -202,6 +208,20 @@ ieee80211_rx_radiotap_hdrlen(struct ieee + BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_lsig) != 4); + } + ++ if (status->flag & RX_FLAG_USIG_HEADER && ++ status->encoding == RX_ENC_EHT) { ++ len = ALIGN(len, 4); ++ len += 12; ++ BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_usig) != 12); ++ } ++ ++ if (status->flag & RX_FLAG_EHT_HEADER && ++ status->encoding == RX_ENC_EHT) { ++ len = ALIGN(len, 4); ++ len += 40; ++ len += status->eht_num_user * 4; ++ } ++ + if (status->chains) { + /* antenna and antenna signal fields */ + len += 2 * hweight8(status->chains); +@@ -223,6 +243,15 @@ ieee80211_rx_radiotap_hdrlen(struct ieee + if (status->flag & RX_FLAG_RADIOTAP_LSIG) + tlv_offset += + sizeof(struct ieee80211_radiotap_lsig); ++ if (status->flag & RX_FLAG_USIG_HEADER) ++ tlv_offset += ++ sizeof(struct ieee80211_radiotap_usig); ++ if (status->flag & RX_FLAG_EHT_HEADER) { ++ tlv_offset += ++ sizeof(struct ieee80211_radiotap_eht); ++ tlv_offset += ++ status->eht_num_user * sizeof(u32); ++ } + + /* ensure 4 byte alignment for TLV */ + len = ALIGN(len, 4); +@@ -330,6 +359,14 @@ ieee80211_add_rx_radiotap_header(struct + struct ieee80211_radiotap_he he = {}; + struct ieee80211_radiotap_he_mu he_mu = {}; + struct ieee80211_radiotap_lsig lsig = {}; ++ struct ieee80211_radiotap_usig usig = {}; ++ struct ieee80211_radiotap_eht eht = {}; ++ u32 *user_info; ++ bool rhdr_ext = false; ++ ++ if ((status->flag & RX_FLAG_USIG_HEADER) || ++ (status->flag & RX_FLAG_EHT_HEADER)) ++ rhdr_ext = true; + + if (status->flag & RX_FLAG_RADIOTAP_HE) { + he = *(struct ieee80211_radiotap_he *)skb->data; +@@ -352,6 +389,20 @@ ieee80211_add_rx_radiotap_header(struct + tlvs_len = skb_mac_header(skb) - skb->data; + } + ++ if (status->flag & RX_FLAG_USIG_HEADER) { ++ usig = *(struct ieee80211_radiotap_usig *)skb->data; ++ skb_pull(skb, sizeof(usig)); ++ WARN_ON_ONCE(status->encoding != RX_ENC_EHT); ++ } ++ ++ if (status->flag & RX_FLAG_EHT_HEADER) { ++ eht = *(struct ieee80211_radiotap_eht *)skb->data; ++ skb_pull(skb, sizeof(eht)); ++ user_info = (u32 *)skb->data; ++ skb_pull(skb, status->eht_num_user * sizeof(u32)); ++ WARN_ON_ONCE(status->encoding != RX_ENC_EHT); ++ } ++ + mpdulen = skb->len; + if (!(has_fcs && ieee80211_hw_check(&local->hw, RX_INCLUDES_FCS))) + mpdulen += FCS_LEN; +@@ -382,6 +433,19 @@ ieee80211_add_rx_radiotap_header(struct + if (status->flag & RX_FLAG_RADIOTAP_TLV_AT_END) + it_present_val |= BIT(IEEE80211_RADIOTAP_TLV); + ++ if (rhdr_ext) { ++ it_present_val |= BIT(IEEE80211_RADIOTAP_EXT); ++ put_unaligned_le32(it_present_val, it_present); ++ it_present_val = 0; ++ it_present++; ++ /* IEEE80211_RADIOTAP_USIG */ ++ if (status->flag & RX_FLAG_USIG_HEADER) ++ it_present_val |= BIT(IEEE80211_RADIOTAP_USIG_INFO); ++ /* IEEE80211_RADIOTAP_EHT */ ++ if (status->flag & RX_FLAG_EHT_HEADER) ++ it_present_val |= BIT(IEEE80211_RADIOTAP_EHT_INFO); ++ } ++ + put_unaligned_le32(it_present_val, it_present); + + /* This references through an offset into it_optional[] rather +@@ -706,6 +770,22 @@ ieee80211_add_rx_radiotap_header(struct + *pos++ = status->chain_signal[chain]; + *pos++ = chain; + } ++ ++ if (status->flag & RX_FLAG_USIG_HEADER) { ++ while ((pos - (u8 *)rthdr) & 1) ++ pos++; ++ memcpy(pos, &usig, sizeof(usig)); ++ pos += sizeof(usig); ++ } ++ ++ if (status->flag & RX_FLAG_EHT_HEADER) { ++ while ((pos - (u8 *)rthdr) & 1) ++ pos++; ++ memcpy(pos, &eht, sizeof(eht)); ++ pos += sizeof(eht); ++ memcpy(pos, user_info, (status->eht_num_user * sizeof(u32))); ++ pos += status->eht_num_user * sizeof(u32); ++ } + } + + static struct sk_buff * +@@ -800,6 +880,14 @@ ieee80211_rx_monitor(struct ieee80211_lo + if (status->flag & RX_FLAG_RADIOTAP_TLV_AT_END) + rtap_space += skb_mac_header(origskb) - &origskb->data[rtap_space]; + ++ if (status->flag & RX_FLAG_USIG_HEADER) ++ rtap_space += sizeof(struct ieee80211_radiotap_usig); ++ ++ if (status->flag & RX_FLAG_EHT_HEADER) { ++ rtap_space += sizeof(struct ieee80211_radiotap_eht); ++ rtap_space += (status->eht_num_user * sizeof(u32)); ++ } ++ + min_head_len = rtap_space; + + /* diff --git a/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch b/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch new file mode 100644 index 00000000000000..b64643140a14b1 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch @@ -0,0 +1,232 @@ +From f2c96599c02eb0d47602d000fe0f40358c10c892 Mon Sep 17 00:00:00 2001 +From: Aaradhana Sahu +Date: Fri, 26 Aug 2022 17:54:37 +0530 +Subject: [PATCH] mac80211: Avoid encapsulation of EAPOL frames if OFFLOAD_ENCAP is enabled + +EAP Frames over NL80211 Control port are 802.11 Native WiFi +encapsulated by default, but for a vdev operating in 802.3, when FW doesn’t +advertise WMI_SERVICE_EAPOL_OVER_NWIFI, it cannot accept an 802.11 +Native WiFi frame. + +Allow EAP Frames over NL80211 Control port to be passed as 802.3 +if vif has IEEE80211_OFFLOAD_ENCAP_ENABLED set. + +Signed-off-by: Rameshkumar Sundaram +Signed-off-by: Aaradhana Sahu +--- + net/mac80211/ieee80211_i.h | 5 ++++ + net/mac80211/tx.c | 58 ++++++++++++++++++++++++++------------ + 2 files changed, 45 insertions(+), 18 deletions(-) + +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -2062,6 +2062,11 @@ netdev_tx_t ieee80211_subif_start_xmit(s + struct net_device *dev); + netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev); ++netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, ++ struct net_device *dev, ++ u32 info_flags, ++ u32 ctrl_flags, ++ u64 *cookie); + void __ieee80211_subif_start_xmit(struct sk_buff *skb, + struct net_device *dev, + u32 info_flags, +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -39,7 +39,8 @@ + + static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, + struct net_device *dev, struct sta_info *sta, +- struct ieee80211_key *key, struct sk_buff *skb); ++ struct ieee80211_key *key, struct sk_buff *skb, ++ u32 info_flags, u32 ctrl_flags, u64 *cookie); + + static inline void ieee80211_tx_stats(struct net_device *dev, u32 len) + { +@@ -4310,13 +4311,18 @@ void __ieee80211_subif_start_xmit(struct + atomic_inc(&sta->tx_netif_pkts); + + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { +- ap_sdata = container_of(sdata->bss, +- struct ieee80211_sub_if_data, u.ap); ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) ++ ap_sdata = container_of(sdata->bss, ++ struct ieee80211_sub_if_data, ++ u.ap); ++ else ++ ap_sdata = sdata; ++ + if (ap_sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED && + !is_multicast_ether_addr(skb->data)) { + if (sta) + key = rcu_dereference(sta->ptk[sta->ptk_idx]); +- ieee80211_8023_xmit(sdata, dev, sta, key, skb); ++ ieee80211_8023_xmit(sdata, dev, sta, key, skb, info_flags, ctrl_flags, cookie); + rcu_read_unlock(); + return; + } +@@ -4657,19 +4663,29 @@ static bool ieee80211_tx_8023(struct iee + + static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, + struct net_device *dev, struct sta_info *sta, +- struct ieee80211_key *key, struct sk_buff *skb) ++ struct ieee80211_key *key, struct sk_buff *skb, ++ u32 info_flags, u32 ctrl_flags, u64 *cookie) + { + struct ieee80211_tx_info *info; ++ struct ethhdr *ehdr = (struct ethhdr *)skb->data; + struct ieee80211_local *local = sdata->local; + struct tid_ampdu_tx *tid_tx; + struct sk_buff *seg, *next; + unsigned int skbs = 0, len = 0; + u16 queue; ++ unsigned char *ra = ehdr->h_dest; ++ bool multicast; + u8 tid; + + queue = ieee80211_select_queue(sdata, sta, skb); + skb_set_queue_mapping(skb, queue); + ++ multicast = is_multicast_ether_addr(ra); ++ ++ if (multicast && sdata->vif.type == NL80211_IFTYPE_AP_VLAN && ++ !atomic_read(&sdata->u.vlan.num_mcast_sta)) ++ goto out_free; ++ + if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)) && + test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) + goto out_free; +@@ -4704,6 +4720,7 @@ static void ieee80211_8023_xmit(struct i + info = IEEE80211_SKB_CB(skb); + memset(info, 0, sizeof(*info)); + ++ info->flags |= info_flags; + info->hw_queue = sdata->vif.hw_queue[queue]; + + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) +@@ -4723,9 +4740,10 @@ static void ieee80211_8023_xmit(struct i + memcpy(IEEE80211_SKB_CB(seg), info, sizeof(*info)); + } + +- if (unlikely(skb->sk && +- skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS && +- !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta)) ++ if (unlikely(((skb->sk && ++ skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || ++ ((ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && !multicast)) && ++ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) + info->ack_frame_id = ieee80211_store_ack_skb(local, skb, + &info->flags, NULL); + +@@ -4750,7 +4768,8 @@ out_free: + + void ieee80211_8023_xmit_ap(struct ieee80211_sub_if_data *sdata, + struct net_device *dev, struct sta_info *sta, +- struct ieee80211_key *key, struct sk_buff *skb) ++ struct ieee80211_key *key, struct sk_buff *skb, ++ u32 info_flags, u32 ctrl_flags, u64 *cookie) + { + struct ieee80211_tx_info *info; + struct ieee80211_local *local = sdata->local; +@@ -4759,6 +4778,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 + unsigned long flags; + int q; + u16 q_map; ++ struct ethhdr *ehdr = (struct ethhdr *)skb->data; ++ unsigned char *ra = ehdr->h_dest; ++ bool multicast = is_multicast_ether_addr(ra); + + /* + * If the skb is shared we need to obtain our own copy. +@@ -4770,11 +4792,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 + + info = IEEE80211_SKB_CB(skb); + memset(info, 0, sizeof(*info)); ++ info->flags |= info_flags; + +- if (unlikely(skb->sk && +- skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) ++ if (unlikely((skb->sk && ++ skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || ++ ((ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && !multicast))) + info->ack_frame_id = ieee80211_store_ack_skb(local, skb, +- &info->flags, NULL); ++ &info->flags, cookie); + + info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; + info->control.vif = &sdata->vif; +@@ -4811,14 +4835,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 + if (sta) + atomic_inc(&sta->tx_drv_pkts); + } +- + netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev) + { ++ return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); ++} ++ ++netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, ++ struct net_device *dev, ++ u32 info_flags, ++ u32 ctrl_flags, ++ u64 *cookie) ++{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ethhdr *ehdr = (struct ethhdr *)skb->data; + struct ieee80211_key *key = NULL; + struct sta_info *sta; ++ bool is_eapol; + + #ifdef CPTCFG_MAC80211_NSS_SUPPORT + ieee80211_xmit_nss_fixup(skb, dev); +@@ -4834,14 +4867,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + kfree_skb(skb); + goto out; + } ++ is_eapol = (sdata->control_port_protocol == ehdr->h_proto); + + if (ieee80211_hw_check(&sdata->local->hw, SUPPORTS_NSS_OFFLOAD)) { + if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded)) + sta = NULL; + goto tx_offload; + } else if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded || +- !test_sta_flag(sta, WLAN_STA_AUTHORIZED) || +- sdata->control_port_protocol == ehdr->h_proto)) ++ (!test_sta_flag(sta, WLAN_STA_AUTHORIZED) && !is_eapol) || ++ (is_eapol && !(sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED)))) + goto skip_offload; + + key = rcu_dereference(sta->ptk[sta->ptk_idx]); +@@ -4852,13 +4886,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 + goto skip_offload; + + if (sdata->vif.type == NL80211_IFTYPE_AP) { +- ieee80211_8023_xmit_ap(sdata, dev, sta, key, skb); ++ ieee80211_8023_xmit_ap(sdata, dev, sta, key, skb, info_flags, ctrl_flags, cookie); + goto out; + } + + sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); + tx_offload: +- ieee80211_8023_xmit(sdata, dev, sta, key, skb); ++ ieee80211_8023_xmit(sdata, dev, sta, key, skb, info_flags, ctrl_flags, cookie); + goto out; + + skip_offload: +@@ -6364,13 +6398,10 @@ start_xmit: + mutex_lock(&local->mtx); + + local_bh_disable(); +- +- /* added hardware encap check for ethernet mode */ + if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) +- ieee80211_subif_start_xmit_8023(skb, skb->dev); ++ __ieee80211_subif_start_xmit_8023(skb, skb->dev, flags, ctrl_flags, cookie); + else + __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); +- + local_bh_enable(); + + mutex_unlock(&local->mtx); diff --git a/package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch b/package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch new file mode 100644 index 00000000000000..1bfa9b89b45c5f --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch @@ -0,0 +1,48 @@ +From 9e4857cfe7f646c239fde030eb16b3d6520c34d8 Mon Sep 17 00:00:00 2001 +From: Hari Chandrakanthan +Date: Fri, 6 Jan 2023 12:49:44 +0530 +Subject: [PATCH] ath11k: fix memory leak in dp rx + +In dp rx path, by default, fast_rx is set as true. +And if peer supports fast rx, the frame is sent to upper layer +through napi_gro_receive. + +If peer doesn't support fast rx, the frames need to be processed in +ath11k_dp_rx_deliver_msdu and sent to mac80211 using ieee80211_rx_napi. +In dp rx path, the api ath11k_dp_rx_h_mpdu checks whether peer supports +fast rx. + +If peer find fails in ath11k_dp_rx_h_mpdu, the skb is not sent to network stack +as well as mac80211. Because the argument fast_rx is not set to false in ath11k_dp_rx_h_mpdu +when peer find fails. + +This can lead to memory leak. + +Fix it by setting argument fast_rx as false in ath11k_dp_rx_h_mpdu +so that the skb is sent to mac80211 through ath11k_dp_rx_deliver_msdu. + +Signed-off-by: Hari Chandrakanthan +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2512,8 +2512,6 @@ static void ath11k_dp_rx_h_mpdu(struct a + } + } + +- *fast_rx = false; +- + if (rxcb->is_mcbc) + enctype = peer->sec_type_grp; + else +@@ -2523,6 +2521,8 @@ static void ath11k_dp_rx_h_mpdu(struct a + } + spin_unlock_bh(&ar->ab->base_lock); + ++ *fast_rx = false; ++ + rx_attention = ath11k_dp_rx_get_attention(ar->ab, rx_desc); + err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention); + if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) diff --git a/package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch b/package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch new file mode 100644 index 00000000000000..31db236d5fd4ef --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch @@ -0,0 +1,74 @@ +From f37e9b4a68d32d03346cbfc3cb4178b186c8f2a4 Mon Sep 17 00:00:00 2001 +From: Ramanathan Choodamani +Date: Fri, 17 Feb 2023 03:08:29 -0800 +Subject: [PATCH 5/7] mac80211: Deliver the frame to driver tx ops + directly + +Deliver the frame to driver directly in the forwarding path +to improve the throughput performance. + +Reset the fast xmit flag in ieee80211 datapath to ensure +other features handled as normal through the ath12k_dp_tx +function + +Signed-off-by: Balamurugan Mahalingam +Signed-off-by: Ramanathan Choodamani +--- + net/mac80211/tx.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4567,6 +4567,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s + #ifdef CPTCFG_MAC80211_NSS_SUPPORT + ieee80211_xmit_nss_fixup(skb, dev); + #endif ++ skb->fast_xmit = 0; + + if (likely(!is_multicast_ether_addr(eth->h_dest))) + goto normal; +@@ -4838,7 +4839,43 @@ void ieee80211_8023_xmit_ap(struct ieee8 + netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev) + { +- return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); ++ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); ++ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); ++ struct ieee80211_tx_control control = {}; ++ struct sta_info *sta; ++ struct ieee80211_sta *pubsta = NULL; ++ ++ info->control.vif = &sdata->vif; ++ ++ if (skb->fast_xmit) { ++ info->control.flags = u32_encode_bits(IEEE80211_LINK_UNSPECIFIED, ++ IEEE80211_TX_CTRL_MLO_LINK); ++ info->flags = IEEE80211_TX_CTL_HW_80211_ENCAP; ++ ++ if (hweight16(sdata->vif.valid_links) > 1) { ++ rcu_read_lock(); ++ ++ if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) { ++ kfree_skb(skb); ++ goto out; ++ } ++ ++ if (!IS_ERR_OR_NULL(sta) && sta->uploaded) ++ pubsta = &sta->sta; ++ ++ control.sta = pubsta; ++ drv_tx(sdata->local, &control, skb); ++out: ++ rcu_read_unlock(); ++ } else { ++ control.sta = NULL; ++ drv_tx(sdata->local, &control, skb); ++ } ++ ++ return NETDEV_TX_OK; ++ } else { ++ return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); ++ } + } + + netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, diff --git a/package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch b/package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch new file mode 100644 index 00000000000000..e5b4d7d9e7ef4e --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch @@ -0,0 +1,140 @@ +From d4ddaebe2132dbb169f78da3666b11a21f645ea0 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam Raja +Date: Fri, 21 Apr 2023 12:28:21 +0530 +Subject: [PATCH] mac80211: Advertise HW checksum offload only for ethmode + +Upper(NSS/SFE) layer might remove checksum offset from a skb +for the net device which advertise HW checksum offload +feature. This would create an issue if any software encrypted +packet or for the netdev which don't support IEEE80211_OFFLOAD_*. +Avoid this by advertising the HW checksum offload feature +only for the netdev which supports IEEE80211_OFFLOAD_* +and have an check before checking checksum offset for the +exceptional packets getting called from 8023_xmit API. + +Signed-off-by: Tamizh Chelvam Raja +--- + net/mac80211/ieee80211_i.h | 3 ++- + net/mac80211/iface.c | 4 ++++ + net/mac80211/tdls.c | 2 +- + net/mac80211/tx.c | 19 ++++++++++--------- + 4 files changed, 17 insertions(+), 11 deletions(-) + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -37,6 +37,8 @@ + #include "wme.h" + #include "rate.h" + ++#define IS_HW_CSUM_NOT_ENABLED(dev) (!((dev)->features & NETIF_F_HW_CSUM)) ++ + static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, + struct net_device *dev, struct sta_info *sta, + struct ieee80211_key *key, struct sk_buff *skb, +@@ -3633,7 +3635,7 @@ ieee80211_sdata_netdev_features(struct i + } + + static struct sk_buff * +-ieee80211_tx_skb_fixup(struct sk_buff *skb, netdev_features_t features) ++ieee80211_tx_skb_fixup(struct sk_buff *skb, netdev_features_t features, struct net_device *dev) + { + if (skb_is_gso(skb)) { + struct sk_buff *segs; +@@ -3651,7 +3653,7 @@ ieee80211_tx_skb_fixup(struct sk_buff *s + if (skb_needs_linearize(skb, features) && __skb_linearize(skb)) + goto free; + +- if (skb->ip_summed == CHECKSUM_PARTIAL) { ++ if (skb->ip_summed == CHECKSUM_PARTIAL && IS_HW_CSUM_NOT_ENABLED(dev)) { + int ofs = skb_checksum_start_offset(skb); + + if (skb->encapsulation) +@@ -3797,7 +3799,7 @@ static bool ieee80211_xmit_fast(struct i + memcpy(ð, skb->data, ETH_HLEN - 2); + + /* after this point (skb is modified) we cannot return false */ +- skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata)); ++ skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata), sdata->dev); + if (!skb) + return true; + +@@ -4345,7 +4347,7 @@ void __ieee80211_subif_start_xmit(struct + * things so we cannot really handle checksum or GSO offload. + * fix it up in software before we handle anything else. + */ +- skb = ieee80211_tx_skb_fixup(skb, 0); ++ skb = ieee80211_tx_skb_fixup(skb, 0, dev); + if (!skb) { + len = 0; + goto out; +@@ -4567,7 +4569,6 @@ netdev_tx_t ieee80211_subif_start_xmit(s + #ifdef CPTCFG_MAC80211_NSS_SUPPORT + ieee80211_xmit_nss_fixup(skb, dev); + #endif +- skb->fast_xmit = 0; + + if (likely(!is_multicast_ether_addr(eth->h_dest))) + goto normal; +@@ -4714,7 +4715,7 @@ static void ieee80211_8023_xmit(struct i + } + } + +- skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata)); ++ skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata), dev); + if (!skb) + return; + +@@ -4839,6 +4840,7 @@ void ieee80211_8023_xmit_ap(struct ieee8 + netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev) + { ++#ifdef CPTCFG_MAC80211_SFE_SUPPORT + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct ieee80211_tx_control control = {}; +@@ -4873,9 +4875,10 @@ out: + } + + return NETDEV_TX_OK; +- } else { +- return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); + } ++#endif ++ return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); ++ + } + + netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -2250,6 +2250,10 @@ int ieee80211_if_add(struct ieee80211_lo + + ndev->features |= local->hw.netdev_features; + ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE; ++ if ((type == NL80211_IFTYPE_AP || type == NL80211_IFTYPE_STATION) && ++ ieee80211_hw_check(&local->hw, SUPPORTS_TX_ENCAP_OFFLOAD) && !params->use_4addr) ++ ndev->features |= NETIF_F_HW_CSUM; ++ + ndev->hw_features |= ndev->features & + MAC80211_SUPPORTED_FEATURES_TX; + sdata->vif.netdev_features = local->hw.netdev_features; +--- a/net/mac80211/mesh.c ++++ b/net/mac80211/mesh.c +@@ -13,6 +13,8 @@ + #include "wme.h" + #include "driver-ops.h" + ++#define IS_HW_CSUM_NOT_ENABLED(dev) (!((dev)->features & NETIF_F_HW_CSUM)) ++ + static int mesh_allocated; + static struct kmem_cache *rm_cache; + +@@ -797,7 +799,7 @@ bool ieee80211_mesh_xmit_fast(struct iee + if (skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) + return false; + +- if (skb->ip_summed == CHECKSUM_PARTIAL) { ++ if (skb->ip_summed == CHECKSUM_PARTIAL && IS_HW_CSUM_NOT_ENABLED(sdata->dev)) { + skb_set_transport_header(skb, skb_checksum_start_offset(skb)); + if (skb_checksum_help(skb)) + return false; diff --git a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch b/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch new file mode 100644 index 00000000000000..67d6e5285bdd94 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch @@ -0,0 +1,236 @@ +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2305,6 +2305,7 @@ static void ath11k_dp_rx_h_undecap_snap( + struct ieee80211_hdr *hdr; + size_t hdr_len; + u8 l3_pad_bytes; ++ int expand_by; + struct hal_rx_desc *rx_desc; + struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + +@@ -2329,12 +2330,22 @@ static void ath11k_dp_rx_h_undecap_snap( + hdr_len = ieee80211_hdrlen(hdr->frame_control); + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ if (skb_headroom(msdu) < crypto_param_len) { ++ expand_by = crypto_param_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } ++ memcpy(skb_push(msdu, crypto_param_len), ++ (void *)hdr + hdr_len, crypto_param_len); + } + ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + } + +@@ -2464,7 +2475,7 @@ static void ath11k_dp_rx_h_mpdu(struct a + struct ieee80211_rx_status *rx_status, + bool *fast_rx) + { +- bool fill_crypto_hdr; ++ bool fill_crypto_hdr = 0; + enum hal_encrypt_type enctype; + bool is_decrypted = false; + struct ath11k_skb_rxcb *rxcb; +@@ -2479,7 +2490,8 @@ static void ath11k_dp_rx_h_mpdu(struct a + + /* PN for multicast packets will be checked in mac80211 */ + rxcb = ATH11K_SKB_RXCB(msdu); +- fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); ++ if (!ar->ab->nss.enabled) ++ fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); + rxcb->is_mcbc = fill_crypto_hdr; + + if (rxcb->is_mcbc) { +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -9224,7 +9224,7 @@ void cfg80211_bss_flush(struct wiphy *wi + * @count: the number of TBTTs until the color change happens + * @color_bitmap: representations of the colors that the local BSS is aware of + */ +-int cfg80211_bss_color_notify(struct net_device *dev, ++int cfg80211_bss_color_notify(struct net_device *dev, gfp_t gfp, + enum nl80211_commands cmd, u8 count, + u64 color_bitmap); + +@@ -9234,9 +9234,9 @@ int cfg80211_bss_color_notify(struct net + * @color_bitmap: representations of the colors that the local BSS is aware of + */ + static inline int cfg80211_obss_color_collision_notify(struct net_device *dev, +- u64 color_bitmap) ++ u64 color_bitmap, gfp_t gfp) + { +- return cfg80211_bss_color_notify(dev, NL80211_CMD_OBSS_COLOR_COLLISION, ++ return cfg80211_bss_color_notify(dev, gfp, NL80211_CMD_OBSS_COLOR_COLLISION, + 0, color_bitmap); + } + +@@ -9250,7 +9250,7 @@ static inline int cfg80211_obss_color_co + static inline int cfg80211_color_change_started_notify(struct net_device *dev, + u8 count) + { +- return cfg80211_bss_color_notify(dev, NL80211_CMD_COLOR_CHANGE_STARTED, ++ return cfg80211_bss_color_notify(dev, GFP_KERNEL, NL80211_CMD_COLOR_CHANGE_STARTED, + count, 0); + } + +@@ -9262,7 +9262,7 @@ static inline int cfg80211_color_change_ + */ + static inline int cfg80211_color_change_aborted_notify(struct net_device *dev) + { +- return cfg80211_bss_color_notify(dev, NL80211_CMD_COLOR_CHANGE_ABORTED, ++ return cfg80211_bss_color_notify(dev, GFP_KERNEL, NL80211_CMD_COLOR_CHANGE_ABORTED, + 0, 0); + } + +@@ -9274,7 +9274,7 @@ static inline int cfg80211_color_change_ + */ + static inline int cfg80211_color_change_notify(struct net_device *dev) + { +- return cfg80211_bss_color_notify(dev, ++ return cfg80211_bss_color_notify(dev, GFP_KERNEL, + NL80211_CMD_COLOR_CHANGE_COMPLETED, + 0, 0); + } +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -5239,6 +5239,10 @@ void ieee80211_tx_status_ext(struct ieee + * (NULL for multicast packets) + * @info: tx status information + */ ++void ieee80211_tx_status_8023(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ struct sk_buff *skb); ++ + static inline void ieee80211_tx_status_noskb(struct ieee80211_hw *hw, + struct ieee80211_sta *sta, + struct ieee80211_tx_info *info) +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -4775,7 +4775,7 @@ void ieee80211_color_collision_detection + struct ieee80211_sub_if_data *sdata = link->sdata; + + sdata_lock(sdata); +- cfg80211_obss_color_collision_notify(sdata->dev, link->color_bitmap); ++ cfg80211_obss_color_collision_notify(sdata->dev, link->color_bitmap, GFP_KERNEL); + sdata_unlock(sdata); + } + +--- a/net/mac80211/debugfs_netdev.c ++++ b/net/mac80211/debugfs_netdev.c +@@ -889,7 +889,7 @@ void ieee80211_debugfs_add_netdev(struct + { + char buf[10+IFNAMSIZ]; + +- sprintf(buf, "netdev:%s", sdata->name); ++ snprintf(buf, 10 + IFNAMSIZ, "netdev:%s", sdata->name); + sdata->vif.debugfs_dir = debugfs_create_dir(buf, + sdata->local->hw.wiphy->debugfsdir); + sdata->debugfs.subdir_stations = debugfs_create_dir("stations", +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -1406,18 +1406,6 @@ static void __sta_info_destroy_part2(str + WARN_ON_ONCE(ret); + } + +- /* Flush queues before removing keys, as that might remove them +- * from hardware, and then depending on the offload method, any +- * frames sitting on hardware queues might be sent out without +- * any encryption at all. +- */ +- if (local->ops->set_key) { +- if (local->ops->flush_sta) +- drv_flush_sta(local, sta->sdata, sta); +- else +- ieee80211_flush_queues(local, sta->sdata, false); +- } +- + /* now keys can no longer be reached */ + ieee80211_free_sta_keys(local, sta); + +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -1244,6 +1244,30 @@ void ieee80211_tx_rate_update(struct iee + } + EXPORT_SYMBOL(ieee80211_tx_rate_update); + ++void ieee80211_tx_status_8023(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ struct sk_buff *skb) ++{ ++ struct ieee80211_sub_if_data *sdata; ++ struct ieee80211_tx_status status = { ++ .skb = skb, ++ .info = IEEE80211_SKB_CB(skb), ++ }; ++ struct sta_info *sta; ++ ++ sdata = vif_to_sdata(vif); ++ ++ rcu_read_lock(); ++ ++ if (!ieee80211_lookup_ra_sta(sdata, skb, &sta) && !IS_ERR(sta)) ++ status.sta = &sta->sta; ++ ++ ieee80211_tx_status_ext(hw, &status); ++ ++ rcu_read_unlock(); ++} ++EXPORT_SYMBOL(ieee80211_tx_status_8023); ++ + void ieee80211_report_low_ack(struct ieee80211_sta *pubsta, u32 num_packets) + { + struct sta_info *sta = container_of(pubsta, struct sta_info, sta); +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -19406,7 +19406,7 @@ void cfg80211_ch_switch_started_notify(s + } + EXPORT_SYMBOL(cfg80211_ch_switch_started_notify); + +-int cfg80211_bss_color_notify(struct net_device *dev, ++int cfg80211_bss_color_notify(struct net_device *dev, gfp_t gfp, + enum nl80211_commands cmd, u8 count, + u64 color_bitmap) + { +@@ -19420,7 +19420,7 @@ int cfg80211_bss_color_notify(struct net + + trace_cfg80211_bss_color_notify(dev, cmd, count, color_bitmap); + +- msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); ++ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); + if (!msg) + return -ENOMEM; + +@@ -19443,7 +19443,7 @@ int cfg80211_bss_color_notify(struct net + genlmsg_end(msg, hdr); + + return genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), +- msg, 0, NL80211_MCGRP_MLME, GFP_KERNEL); ++ msg, 0, NL80211_MCGRP_MLME, gfp); + + nla_put_failure: + nlmsg_free(msg); +--- a/backport-include/linux/netdevice.h ++++ b/backport-include/linux/netdevice.h +@@ -70,6 +70,9 @@ static inline void netif_trans_update(st + (_dev)->needs_free_netdev = true; + #endif + ++#define netdev_tstats(dev) dev->tstats ++#define netdev_assign_tstats(dev, e) dev->tstats = (e); ++ + #if LINUX_VERSION_IS_LESS(4,15,0) + static inline int _bp_netdev_upper_dev_link(struct net_device *dev, + struct net_device *upper_dev) diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch b/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch new file mode 100644 index 00000000000000..f0fc8c14ec1efd --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch @@ -0,0 +1,206 @@ +From 05d9bff2eb8b057d34c7c4b24329dd92cf4faddb Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Wed, 18 Nov 2020 23:54:38 +0530 +Subject: [PATCH 1/3] mac80211: add AP_VLAN iftype support on NSS offload case + +- allow AP_VLAN iftype to get added, removed +- add new callback for 4addr rx_notify to get AP_VLAN created from hostapd +- modify sta_use_4addr drv callback to advertise AP_VLAN vif instead of AP vif +- modify drv_tx callback to use AP_VLAN vif on NSS offload case + +Signed-off-by: Sathishkumar Muruganandam +--- + include/net/mac80211.h | 11 +++++++++++ + net/mac80211/cfg.c | 5 ++++- + net/mac80211/driver-ops.c | 9 +++++---- + net/mac80211/iface.c | 10 ++++++---- + net/mac80211/rx.c | 6 ++++++ + net/mac80211/tx.c | 14 ++++++++++---- + net/mac80211/util.c | 6 ++---- + 7 files changed, 44 insertions(+), 17 deletions(-) + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -5100,6 +5100,17 @@ void ieee80211_sta_pspoll(struct ieee802 + */ + void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); + ++/** ++ * ieee80211_rx_nss_notify_4addr - notify userspace about 4addr frame rx ++ * @dev: The device the frame matched to ++ * @addr: the transmitter address of 4addr sta ++ * ++ * When operating in AP mode with NSS offload enabled, this function is used ++ * to invoke cfg80211 callback to notify userspace that an associated station ++ * sent a 4addr frame. ++ */ ++void ieee80211_rx_nss_notify_4addr(struct net_device *dev, u8* sta_addr); ++ + /* + * The TX headroom reserved by mac80211 for its own tx_status functions. + * This is enough for the radiotap header. +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -2176,7 +2176,13 @@ static int ieee80211_change_station(stru + + rcu_assign_pointer(vlansdata->u.vlan.sta, sta); + __ieee80211_check_fast_rx_iface(vlansdata); +- drv_sta_set_4addr(local, sta->sdata, &sta->sta, true); ++ ++ if (ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) ++ drv_sta_set_4addr(local, vlansdata, &sta->sta, ++ true); ++ else ++ drv_sta_set_4addr(local, sta->sdata, &sta->sta, ++ true); + } + + if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN && +--- a/net/mac80211/driver-ops.c ++++ b/net/mac80211/driver-ops.c +@@ -59,10 +59,9 @@ int drv_add_interface(struct ieee80211_l + + might_sleep(); + +- if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN || +- (sdata->vif.type == NL80211_IFTYPE_MONITOR && ++ if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_MONITOR && + !ieee80211_hw_check(&local->hw, WANT_MONITOR_VIF) && +- !(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE)))) ++ !(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE))) + return -EINVAL; + + trace_drv_add_interface(local, sdata); +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -676,6 +676,9 @@ static void ieee80211_do_stop(struct iee + + switch (sdata->vif.type) { + case NL80211_IFTYPE_AP_VLAN: ++ if (ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && ++ going_down) ++ drv_remove_interface(local, sdata); + break; + case NL80211_IFTYPE_MONITOR: + if (local->monitors == 0) +@@ -960,6 +963,7 @@ static bool ieee80211_iftype_supports_hd + switch (iftype) { + /* P2P GO and client are mapped to AP/STATION types */ + case NL80211_IFTYPE_AP: ++ case NL80211_IFTYPE_AP_VLAN: + case NL80211_IFTYPE_STATION: + return true; + default: +@@ -1014,7 +1018,8 @@ static void ieee80211_set_vif_encap_ops( + struct ieee80211_sub_if_data *bss = sdata; + bool enabled; + +- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { ++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && ++ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { + if (!sdata->bss) + return; + +@@ -1359,10 +1364,17 @@ int ieee80211_do_open(struct wireless_de + + switch (sdata->vif.type) { + case NL80211_IFTYPE_AP_VLAN: +- /* no need to tell driver, but set carrier and chanctx */ + if (sdata->bss->active) { + ieee80211_link_vlan_copy_chanctx(&sdata->deflink); + netif_carrier_on(dev); ++ ++ if (ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { ++ ieee80211_set_sdata_offload_flags(sdata); ++ res = drv_add_interface(local, sdata); ++ if (res) ++ goto err_del_interface; ++ } ++ + ieee80211_set_vif_encap_ops(sdata); + } else { + netif_carrier_off(dev); +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -1759,6 +1759,12 @@ void ieee80211_sta_uapsd_trigger(struct + } + EXPORT_SYMBOL(ieee80211_sta_uapsd_trigger); + ++void ieee80211_rx_nss_notify_4addr(struct net_device *dev, u8 *sta_addr) ++{ ++ cfg80211_rx_unexpected_4addr_frame(dev, sta_addr, GFP_ATOMIC); ++} ++EXPORT_SYMBOL(ieee80211_rx_nss_notify_4addr); ++ + static ieee80211_rx_result debug_noinline + ieee80211_rx_h_uapsd_and_pspoll(struct ieee80211_rx_data *rx) + { +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4725,7 +4725,8 @@ static void ieee80211_8023_xmit(struct i + info->flags |= info_flags; + info->hw_queue = sdata->vif.hw_queue[queue]; + +- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) ++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && ++ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) + sdata = container_of(sdata->bss, + struct ieee80211_sub_if_data, u.ap); + +--- a/net/mac80211/util.c ++++ b/net/mac80211/util.c +@@ -2410,6 +2410,9 @@ static void ieee80211_assign_chanctx(str + if (!local->use_chanctx) + return; + ++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) ++ return; ++ + mutex_lock(&local->chanctx_mtx); + conf = rcu_dereference_protected(link->conf->chanctx_conf, + lockdep_is_held(&local->chanctx_mtx)); +@@ -2615,7 +2618,8 @@ int ieee80211_reconfig(struct ieee80211_ + } + + list_for_each_entry(sdata, &local->interfaces, list) { +- if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN && ++ if ((sdata->vif.type != NL80211_IFTYPE_AP_VLAN || ++ ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) && + sdata->vif.type != NL80211_IFTYPE_MONITOR && + ieee80211_sdata_running(sdata)) { + res = drv_add_interface(local, sdata); +@@ -2630,7 +2634,8 @@ int ieee80211_reconfig(struct ieee80211_ + if (res) { + list_for_each_entry_continue_reverse(sdata, &local->interfaces, + list) +- if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN && ++ if ((sdata->vif.type != NL80211_IFTYPE_AP_VLAN || ++ ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) && + sdata->vif.type != NL80211_IFTYPE_MONITOR && + ieee80211_sdata_running(sdata)) + drv_remove_interface(local, sdata); +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -5235,7 +5235,8 @@ static bool ieee80211_assoc_success(stru + * If we're using 4-addr mode, let the AP know that we're + * doing so, so that it can create the STA VLAN on its side + */ +- if (ifmgd->use_4addr) ++ if (ifmgd->use_4addr && ++ (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) + ieee80211_send_4addr_nullfunc(local, sdata); + + /* +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -1457,7 +1457,9 @@ static inline void drv_sta_set_4addr(str + struct ieee80211_sub_if_data *sdata, + struct ieee80211_sta *sta, bool enabled) + { +- sdata = get_bss_sdata(sdata); ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) ++ sdata = get_bss_sdata(sdata); ++ + if (!check_sdata_in_driver(sdata)) + return; + diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch b/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch new file mode 100644 index 00000000000000..7e2a9f0ee4dd4b --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch @@ -0,0 +1,701 @@ +From d4c3b17e66243a2d6d8845192453ef7da568bac2 Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Thu, 10 Sep 2020 15:58:53 +0530 +Subject: [PATCH 1/2] ath11k: add WDS offload changes to NSS driver interface + +add WDS and MEC AST handling to NSS + +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/nss.c | 465 ++++++++++++++++++++++++++++++++-- + drivers/net/wireless/ath/ath11k/nss.h | 36 ++- + 2 files changed, 473 insertions(+), 28 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -9,10 +9,12 @@ + #include "nss.h" + #include "core.h" + #include "peer.h" ++#include "dp_tx.h" + #include "dp_rx.h" + #include "dp_tx.h" + #include "hif.h" + #include "wmi.h" ++#include "wmi.h" + #include "../../../../../net/mac80211/sta_info.h" + + /*-----------------------------ATH11K-NSS Helpers--------------------------*/ +@@ -348,6 +350,22 @@ void ath11k_nss_wifili_event_receive(str + ath11k_nss_wifili_link_desc_return(ab, + (void *)&msg->msg.linkdescinfomsg); + break; ++ case NSS_WIFILI_WDS_PEER_ADD_MSG: ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer add event received %d response %d error %d\n", ++ msg_type, response, error); ++ break; ++ case NSS_WIFILI_WDS_PEER_UPDATE_MSG: ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer update event received %d response %d error %d\n", ++ msg_type, response, error); ++ break; ++ case NSS_WIFILI_WDS_PEER_MAP_MSG: ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer map event received %d response %d error %d\n", ++ msg_type, response, error); ++ break; ++ case NSS_WIFILI_WDS_PEER_DEL_MSG: ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer del event received %d response %d error %d\n", ++ msg_type, response, error); ++ break; + default: + ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); + break; +@@ -458,13 +476,6 @@ static void ath11k_nss_vdev_event_receiv + /*TODO*/ + } + +-static void +-ath11k_nss_vdev_special_data_receive(struct net_device *dev, struct sk_buff *skb, +- __attribute__((unused)) struct napi_struct *napi) +-{ +- /* TODO */ +-} +- + /* TODO: move to mac80211 after cleanups/refactoring required after feature completion */ + static int ath11k_nss_deliver_rx(struct ieee80211_vif *vif, struct sk_buff *skb, + bool eth, int data_offs, struct napi_struct *napi) +@@ -588,11 +599,239 @@ static int ath11k_nss_undecap_nwifi(stru + return 0; + } + ++static void ath11k_nss_wds_type_rx(struct ath11k *ar, u8* src_mac, u8 is_sa_valid, ++ u8 addr4_valid, u16 peer_id) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_ast_entry *ast_entry = NULL; ++ struct ath11k_peer *ta_peer = NULL; ++ ++ spin_lock_bh(&ab->base_lock); ++ ta_peer = ath11k_peer_find_by_id(ab, peer_id); ++ ++ if (!ta_peer) { ++ spin_unlock_bh(&ab->base_lock); ++ return; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS,"ath11k_nss_wds_type_rx ta_peer %pM\n", ++ ta_peer->addr); ++ ++ if (addr4_valid) { ++ ast_entry = ath11k_peer_ast_find_by_addr(ab, src_mac); ++ if (!is_sa_valid) { ++ ath11k_peer_add_ast(ar, ta_peer, src_mac, ++ ATH11K_AST_TYPE_WDS); ++ ath11k_nss_add_wds_peer(ar, ta_peer, ++ src_mac, ATH11K_AST_TYPE_WDS); ++ } else { ++ if (!ast_entry) { ++ ath11k_peer_add_ast(ar, ta_peer, src_mac, ++ ATH11K_AST_TYPE_WDS); ++ ath11k_nss_add_wds_peer(ar, ta_peer, src_mac, ++ ATH11K_AST_TYPE_WDS); ++ } else { ++ ath11k_peer_update_ast(ar, ta_peer, ast_entry); ++ ath11k_nss_update_wds_peer(ar, ta_peer, src_mac); ++ } ++ } ++ } ++ ++ spin_unlock_bh(&ab->base_lock); ++} ++ ++static void ath11k_nss_mec_handler(struct ath11k *ar, u8* mec_mac_addr) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_peer *peer = ar->bss_peer; ++ u8 mac_addr[ETH_ALEN]; ++ u32 *mac_addr_l32; ++ u16 *mac_addr_h16; ++ ++ if (!peer) ++ return; ++ ++ /* mec_mac_addr has the swapped mac_addr after 4 bytes (sizeof(u32)) ++ * mec_mac_addr[0] ++ * | ++ * 03:0a:00:00:2d:15:22:f0:fd:8c ++ * ^ ++ * Swapped MAC address present after 4 bytes ++ * MAC address after swapping is 8c:fd:f0:22:15:2d */ ++ ++ mac_addr_l32 = (u32 *) (mec_mac_addr + sizeof(u32)); ++ mac_addr_h16 = (u16 *) (mec_mac_addr + sizeof(u32) + sizeof(u32)); ++ ++ *mac_addr_l32 = swab32(*mac_addr_l32); ++ *mac_addr_h16 = swab16(*mac_addr_h16); ++ ++ memcpy(mac_addr, mac_addr_h16, ETH_ALEN - 4); ++ memcpy(mac_addr + 2, mac_addr_l32, 4); ++ ++ if (!ether_addr_equal(ar->mac_addr, mac_addr)) { ++ spin_lock_bh(&ab->base_lock); ++ ath11k_peer_add_ast(ar, peer, mac_addr, ++ ATH11K_AST_TYPE_MEC); ++ spin_unlock_bh(&ab->base_lock); ++ } ++} ++ ++static void ath11k_nss_vdev_spl_receive_ext_wdsdata(struct ath11k_vif *arvif, ++ struct sk_buff *skb, ++ struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ enum wifi_vdev_ext_wds_info_type wds_type; ++ u8 is_sa_valid = 0, addr4_valid = 0; ++ u16 peer_id; ++ u8 src_mac[ETH_ALEN]; ++ ++ is_sa_valid = wds_metadata->is_sa_valid; ++ addr4_valid = wds_metadata->addr4_valid; ++ wds_type = wds_metadata->wds_type; ++ peer_id = wds_metadata->peer_id; ++ ++ memcpy(src_mac, ((struct ethhdr *)skb->data)->h_source, ETH_ALEN); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS,"receive_ext_wdsdata wds_type %d peer id %u sa_valid %d addr4_valid %d src_mac %pM\n", ++ wds_type, peer_id, is_sa_valid, addr4_valid, src_mac); ++ ++ switch (wds_type) { ++ case NSS_WIFI_VDEV_WDS_TYPE_RX: ++ ath11k_nss_wds_type_rx(ar, src_mac, is_sa_valid, ++ addr4_valid, peer_id); ++ break; ++ case NSS_WIFI_VDEV_WDS_TYPE_MEC: ++ ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); ++ break; ++ default: ++ ath11k_warn(ab, "unsupported wds_type %d\n", wds_type); ++ break; ++ } ++} ++ ++static bool ath11k_nss_vdev_data_receive_mec_check(struct ath11k *ar, ++ struct sk_buff *skb) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_ast_entry *ast_entry = NULL; ++ u8 src_mac[ETH_ALEN]; ++ ++ memcpy(src_mac, ((struct ethhdr *)skb->data)->h_source, ETH_ALEN); ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "ath11k_nss_vdev_data_receive_mec_check src mac %pM\n", ++ src_mac); ++ ++ spin_lock_bh(&ab->base_lock); ++ ast_entry = ath11k_peer_ast_find_by_addr(ab, src_mac); ++ ++ if (ast_entry && ast_entry->type == ATH11K_AST_TYPE_MEC) { ++ spin_unlock_bh(&ab->base_lock); ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "dropping mec traffic from %pM\n", ast_entry->addr); ++ return true; ++ } ++ ++ spin_unlock_bh(&ab->base_lock); ++ return false; ++} ++ ++static int ath11k_nss_undecap(struct ath11k_vif *arvif, struct sk_buff *skb, ++ int *data_offs, bool *eth_decap) ++{ ++ enum ath11k_hw_txrx_mode decap_type; ++ ++ decap_type = arvif->nss.decap; ++ ++ switch (decap_type) { ++ case ATH11K_HW_TXRX_RAW: ++ return ath11k_nss_undecap_raw(arvif, skb, data_offs); ++ case ATH11K_HW_TXRX_NATIVE_WIFI: ++ return ath11k_nss_undecap_nwifi(arvif, skb, data_offs); ++ case ATH11K_HW_TXRX_ETHERNET: ++ *eth_decap = true; ++ return 0; ++ default: ++ return -EINVAL; ++ } ++} ++ ++static void ++ath11k_nss_vdev_special_data_receive(struct net_device *dev, struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; ++ struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; ++ struct wireless_dev *wdev; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k_base *ab; ++ bool eth_decap = false; ++ int data_offs = 0; ++ int ret = 0; ++ ++ if (!dev) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ wdev = dev->ieee80211_ptr; ++ if (!wdev) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ab = arvif->ar->ab; ++ ++ skb->dev = dev; ++ ++ dma_unmap_single(ab->dev, virt_to_phys(skb->head), ++ NSS_WIFI_VDEV_PER_PACKET_METADATA_OFFSET + ++ sizeof(struct nss_wifi_vdev_per_packet_metadata), ++ DMA_FROM_DEVICE); ++ ++ wifi_metadata = (struct nss_wifi_vdev_per_packet_metadata *)(skb->head + ++ NSS_WIFI_VDEV_PER_PACKET_METADATA_OFFSET); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "dp special data from nss: wifi_metadata->pkt_type %d", ++ wifi_metadata->pkt_type); ++ ++ ret = ath11k_nss_undecap(arvif, skb, &data_offs, ð_decap); ++ if (ret) { ++ ath11k_warn(ab, "error in nss rx undecap, type %d err %d\n", ++ arvif->nss.decap, ret); ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ if (eth_decap && wifi_metadata->pkt_type == ++ NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_WDS_LEARN) { ++ wds_metadata = &wifi_metadata->metadata.wds_metadata; ++ ath11k_nss_vdev_spl_receive_ext_wdsdata(arvif, skb, ++ wds_metadata); ++ } ++ ++ ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++} ++ + static void + ath11k_nss_vdev_data_receive(struct net_device *dev, struct sk_buff *skb, + __attribute__((unused)) struct napi_struct *napi) + { +- enum ath11k_hw_txrx_mode decap_type; + struct wireless_dev *wdev; + struct ieee80211_vif *vif; + struct ath11k_vif *arvif; +@@ -632,28 +871,16 @@ ath11k_nss_vdev_data_receive(struct net_ + ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss: ", + skb->data, skb->len); + +- decap_type = arvif->nss.decap; +- +- switch (decap_type) { +- case ATH11K_HW_TXRX_RAW: +- ret = ath11k_nss_undecap_raw(arvif, skb, &data_offs); +- break; +- case ATH11K_HW_TXRX_NATIVE_WIFI: +- ret = ath11k_nss_undecap_nwifi(arvif, skb, &data_offs); +- break; +- case ATH11K_HW_TXRX_ETHERNET: +- /* no changes required for ethernet decap */ +- ret = 0; +- eth_decap = true; +- break; +- default: +- ret = -EINVAL; +- break; ++ if ((vif->type == NL80211_IFTYPE_STATION && wdev->use_4addr) && ++ ath11k_nss_vdev_data_receive_mec_check(arvif->ar, skb)) { ++ dev_kfree_skb_any(skb); ++ return; + } + ++ ret = ath11k_nss_undecap(arvif, skb, &data_offs, ð_decap); + if (ret) { +- ath11k_warn(ab, "error in nss rx undecap, type %d err %d\n", decap_type, +- ret); ++ ath11k_warn(ab, "error in nss rx undecap, type %d err %d\n", ++ arvif->nss.decap, ret); + dev_kfree_skb_any(skb); + return; + } +@@ -1362,7 +1589,7 @@ void ath11k_nss_update_sta_rxrate(struct + peer->nss.nss_stats->rxrate.bw = ath11k_mac_bw_to_mac80211_bw(ppdu_info->bw); + } + +-int ath11k_nss_peer_delete(struct ath11k_base *ab, const u8 *addr) ++int ath11k_nss_peer_delete(struct ath11k_base *ab, u32 vdev_id, const u8 *addr) + { + struct nss_wifili_peer_msg *peer_msg; + struct nss_wifili_msg *wlmsg = NULL; +@@ -1376,9 +1603,10 @@ int ath11k_nss_peer_delete(struct ath11k + + spin_lock_bh(&ab->base_lock); + +- peer = ath11k_peer_find_by_addr(ab, addr); ++ peer = ath11k_peer_find(ab, vdev_id, addr); + if (!peer) { +- ath11k_warn(ab, "peer (%pM) not found for nss peer delete\n", addr); ++ ath11k_warn(ab, "peer (%pM) not found on vdev_id %d for nss peer delete\n", ++ addr, vdev_id); + spin_unlock_bh(&ab->base_lock); + return -EINVAL; + } +@@ -1451,8 +1679,9 @@ free_peer: + return ret; + } + +-int ath11k_nss_peer_create(struct ath11k_base *ab, struct ath11k_peer *peer) ++int ath11k_nss_peer_create(struct ath11k *ar, struct ath11k_peer *peer) + { ++ struct ath11k_base *ab = ar->ab; + struct nss_wifili_peer_msg *peer_msg; + struct nss_wifili_msg *wlmsg = NULL; + nss_wifili_msg_callback_t msg_cb; +@@ -1509,17 +1738,23 @@ int ath11k_nss_peer_create(struct ath11k + status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); + if (status != NSS_TX_SUCCESS) { + ret = -EINVAL; +- ath11k_warn(ab, "nss send peer (%pM) create msg tx error\n", +- peer->addr); ++ ath11k_warn(ab, "nss send peer (%pM) create msg tx error: %d\n", ++ peer->addr, status); + goto peer_mem_free; + } + +- ret = 0; + ath11k_dbg(ab, ATH11K_DBG_NSS, + "nss peer_create msg success mac:%pM vdev:%d peer_id:%d hw_ast_idx:%d ast_hash:%d\n", + peer_msg->peer_mac_addr, peer_msg->vdev_id, peer_msg->peer_id, + peer_msg->hw_ast_idx, peer_msg->tx_ast_hash); + ++ ret = ath11k_peer_add_ast(ar, peer, peer->addr, ++ ATH11K_AST_TYPE_STATIC); ++ if (ret) { ++ ath11k_warn(ab, "failed to add STATIC ast: %d\n", ret); ++ goto peer_mem_free; ++ } ++ + peer->nss.nss_stats = kzalloc(sizeof(*peer->nss.nss_stats), GFP_ATOMIC); + if (!peer->nss.nss_stats) { + ret = -ENOMEM; +@@ -1538,6 +1773,199 @@ msg_free: + return ret; + } + ++int ath11k_nss_add_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac, enum ath11k_ast_entry_type type) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct nss_wifili_wds_peer_msg *wds_peer_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (wlmsg == NULL) ++ return -ENOMEM; ++ ++ wds_peer_msg = &wlmsg->msg.wdspeermsg; ++ ++ wds_peer_msg->pdev_id = ar->pdev->pdev_id; ++ wds_peer_msg->ast_type = type; ++ wds_peer_msg->peer_id = peer->peer_id; ++ ++ if (type == ATH11K_AST_TYPE_MEC) ++ ether_addr_copy(wds_peer_msg->peer_mac, ar->mac_addr); ++ else ++ ether_addr_copy(wds_peer_msg->peer_mac, peer->addr); ++ ++ ether_addr_copy(wds_peer_msg->dest_mac, dest_mac); ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_WDS_PEER_ADD_MSG, ++ sizeof(struct nss_wifili_wds_peer_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ret = -EINVAL; ++ ath11k_warn(ab, "nss send wds add peer msg tx error: %d\n", ++ status); ++ goto msg_free; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss add wds peer success peer mac:%pM dest mac:%pM peer_id:%d\n", ++ wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); ++ ++msg_free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++int ath11k_nss_update_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct nss_wifili_wds_peer_msg *wds_peer_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (wlmsg == NULL) ++ return -ENOMEM; ++ ++ wds_peer_msg = &wlmsg->msg.wdspeermsg; ++ ++ wds_peer_msg->pdev_id = ar->pdev->pdev_id; ++ wds_peer_msg->ast_type = ATH11K_AST_TYPE_WDS; ++ wds_peer_msg->peer_id = peer->peer_id; ++ ether_addr_copy(wds_peer_msg->peer_mac, peer->addr); ++ ether_addr_copy(wds_peer_msg->dest_mac, dest_mac); ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_WDS_PEER_UPDATE_MSG, ++ sizeof(struct nss_wifili_wds_peer_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ret = -EINVAL; ++ ath11k_warn(ab, "nss send wds update peer msg tx error: %d\n", ++ status); ++ goto msg_free; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss update wds peer success peer mac:%pM dest mac:%pM peer_id:%d\n", ++ wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); ++ ++msg_free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac, enum ath11k_ast_entry_type type) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct nss_wifili_wds_peer_map_msg *wds_peer_map_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (wlmsg == NULL) ++ return -ENOMEM; ++ ++ wds_peer_map_msg = &wlmsg->msg.wdspeermapmsg; ++ ++ wds_peer_map_msg->vdev_id = peer->vdev_id; ++ wds_peer_map_msg->ast_idx = peer->hw_peer_id; ++ ++ if (type == ATH11K_AST_TYPE_MEC) ++ wds_peer_map_msg->peer_id = NSS_WIFILI_MEC_PEER_ID; ++ else ++ wds_peer_map_msg->peer_id = peer->peer_id; ++ ++ ether_addr_copy(wds_peer_map_msg->dest_mac, dest_mac); ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_WDS_PEER_MAP_MSG, ++ sizeof(struct nss_wifili_wds_peer_map_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ret = -EINVAL; ++ ath11k_warn(ab, "nss send wds peer map msg tx error: %d\n", ++ status); ++ goto msg_free; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss wds peer map success mac:%pM hw_ast_idx:%d peer_id:%d\n", ++ wds_peer_map_msg->dest_mac, wds_peer_map_msg->ast_idx, wds_peer_map_msg->peer_id); ++ ++msg_free: ++ kfree(wlmsg); ++ return ret; ++} ++ ++int ath11k_nss_del_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct nss_wifili_wds_peer_msg *wds_peer_msg; ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (wlmsg == NULL) ++ return -ENOMEM; ++ ++ wds_peer_msg = &wlmsg->msg.wdspeermsg; ++ ++ wds_peer_msg->pdev_id = ar->pdev->pdev_id; ++ wds_peer_msg->ast_type = ATH11K_AST_TYPE_NONE; ++ wds_peer_msg->peer_id = peer->peer_id; ++ ether_addr_copy(wds_peer_msg->peer_mac, peer->addr); ++ ether_addr_copy(wds_peer_msg->dest_mac, dest_mac); ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_WDS_PEER_DEL_MSG, ++ sizeof(struct nss_wifili_wds_peer_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ret = -EINVAL; ++ ath11k_warn(ab, "nss send wds del peer msg tx error: %d\n", ++ status); ++ goto msg_free; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss del wds peer success peer mac:%pM dest mac:%pM peer_id:%d\n", ++ wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); ++ ++msg_free: ++ kfree(wlmsg); ++ return ret; ++} ++ + /*-------------------------------INIT/DEINIT---------------------------------*/ + + static int ath11k_nss_radio_buf_cfg(struct ath11k *ar, int range, int buf_sz) +@@ -1931,7 +2359,7 @@ static int ath11k_nss_init(struct ath11k + + status = nss_wifili_tx_msg(nss_contex, wlmsg); + if (status != NSS_TX_SUCCESS) { +- ath11k_warn(ab, "failure to send nss init msg\n"); ++ ath11k_warn(ab, "failure to send nss init msg: %d \n", status); + goto unregister; + } + +@@ -1985,7 +2413,8 @@ static int ath11k_nss_stats_cfg(struct a + + status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); + if (status != NSS_TX_SUCCESS) { +- ath11k_warn(ab, "nss stats cfg %d msg tx failure\n", nss_msg); ++ ath11k_warn(ab, "nss stats cfg %d msg tx failure: %d\n", ++ nss_msg, status); + ret = -EINVAL; + goto free; + } +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -17,12 +17,14 @@ struct ath11k_base; + struct ath11k_vif; + struct ath11k_peer; + struct ath11k_sta; ++enum ath11k_ast_entry_type; + struct hal_rx_mon_ppdu_info; + struct hal_rx_user_status; + + /* NSS DBG macro is not included as part of debug enum to avoid + * frequent changes during upgrade*/ +-#define ATH11K_DBG_NSS 0x80000000 ++#define ATH11K_DBG_NSS 0x40000000 ++#define ATH11K_DBG_NSS_WDS 0x80000000 + + /* WIFILI Supported Target Types */ + #define ATH11K_WIFILI_TARGET_TYPE_UNKNOWN 0xFF +@@ -208,11 +210,19 @@ int ath11k_nss_vdev_create(struct ath11k + void ath11k_nss_vdev_delete(struct ath11k_vif *arvif); + int ath11k_nss_vdev_up(struct ath11k_vif *arvif); + int ath11k_nss_vdev_down(struct ath11k_vif *arvif); +-int ath11k_nss_peer_delete(struct ath11k_base *ab, const u8 *addr); ++int ath11k_nss_peer_delete(struct ath11k_base *ab, u32 vdev_id, const u8 *addr); + int ath11k_nss_set_peer_authorize(struct ath11k *ar, u16 peer_id); +-int ath11k_nss_peer_create(struct ath11k_base *ab, struct ath11k_peer *peer); ++int ath11k_nss_peer_create(struct ath11k *ar, struct ath11k_peer *peer); + void ath11k_nss_peer_stats_enable(struct ath11k *ar); + void ath11k_nss_peer_stats_disable(struct ath11k *ar); ++int ath11k_nss_add_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac, enum ath11k_ast_entry_type type); ++int ath11k_nss_update_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac); ++int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac, enum ath11k_ast_entry_type type); ++int ath11k_nss_del_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac); + int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, + struct ieee80211_key_conf *key_conf); + void ath11k_nss_update_sta_stats(struct station_info *sinfo, +@@ -274,12 +284,37 @@ static inline int ath11k_nss_vdev_down(s + return 0; + } + +-static inline int ath11k_nss_peer_delete(struct ath11k_base *ab, const u8 *addr) ++static inline int ath11k_nss_peer_delete(struct ath11k_base *ab, u32 vdev_id, ++ const u8 *addr) + { + return 0; + } + +-static inline int ath11k_nss_peer_create(struct ath11k_base *ab, struct ath11k_peer *peer) ++static inline int ath11k_nss_add_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac, int type) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_update_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++ u8 *dest_mac, int type) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_del_wds_peer(struct ath11k_vif *arvif, struct ath11k_peer *peer, ++ u8 *dest_mac) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_peer_create(struct ath11k *ar, struct ath11k_peer *peer) + { + return 0; + } diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch b/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch new file mode 100644 index 00000000000000..143191f6a9bca9 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch @@ -0,0 +1,102 @@ +From 36ee9d37b53c933f4dd8f934f8e0273b5e901549 Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Fri, 8 Jan 2021 00:02:54 +0530 +Subject: [PATCH 1/3] mac80211: add dynamic VLAN support on NSS offload + +NSS requires dynamic AP_VLAN vif ifnum and its corresponding VLAN ID +and group key index to configure dynamic VLAN ext VDEV in NSS. + +Hence mac80211 set_key and sta_state callbacks are modified to advertise +AP_VLAN vif when NSS offload is enabled and VLAN ID provided by hostapd +in key params is stored to ieee80211_key_conf for the driver. + +Co-Developed-by: Seevalamuthu Mariappan +Signed-off-by: Seevalamuthu Mariappan +Signed-off-by: Sathishkumar Muruganandam +--- + include/net/mac80211.h | 3 +++ + net/mac80211/cfg.c | 1 + + net/mac80211/driver-ops.c | 4 +++- + net/mac80211/driver-ops.h | 4 +++- + net/mac80211/key.c | 5 ++++- + net/mac80211/tx.c | 4 ++++ + 6 files changed, 18 insertions(+), 3 deletions(-) + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -2089,6 +2089,8 @@ enum ieee80211_key_flags { + * @tx_pn: PN used for TX keys, may be used by the driver as well if it + * needs to do software PN assignment by itself (e.g. due to TSO) + * @flags: key flags, see &enum ieee80211_key_flags. ++ * @vlan_id: VLAN ID corresponding to the group key. ++ * For VLAN interfaces 1-4096, 0 for non-vlan interfaces + * @keyidx: the key index (0-3) + * @keylen: key material length + * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) +@@ -2108,6 +2110,7 @@ struct ieee80211_key_conf { + u8 hw_key_idx; + s8 keyidx; + u16 flags; ++ u16 vlan_id; + s8 link_id; + u8 keylen; + u8 key[]; +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -538,6 +538,7 @@ static int ieee80211_add_key(struct wiph + break; + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_AP_VLAN: ++ key->conf.vlan_id = params->vlan_id; + /* Keys without a station are used for TX only */ + if (sta && test_sta_flag(sta, WLAN_STA_MFP)) + key->conf.flags |= IEEE80211_KEY_FLAG_RX_MGMT; +--- a/net/mac80211/driver-ops.c ++++ b/net/mac80211/driver-ops.c +@@ -116,7 +116,11 @@ int drv_sta_state(struct ieee80211_local + + might_sleep(); + +- sdata = get_bss_sdata(sdata); ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) || ++ !(old_state == IEEE80211_STA_ASSOC && ++ new_state == IEEE80211_STA_AUTHORIZED)) ++ sdata = get_bss_sdata(sdata); ++ + if (!check_sdata_in_driver(sdata)) + return -EIO; + +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -453,7 +453,9 @@ static inline int drv_sta_add(struct iee + + might_sleep(); + +- sdata = get_bss_sdata(sdata); ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) ++ sdata = get_bss_sdata(sdata); ++ + if (!check_sdata_in_driver(sdata)) + return -EIO; + +--- a/net/mac80211/key.c ++++ b/net/mac80211/key.c +@@ -166,7 +166,8 @@ static int ieee80211_key_enable_hw_accel + if (sta && !sta->uploaded) + goto out_unsupported; + +- if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { ++ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && ++ !ieee80211_hw_check(&key->local->hw, SUPPORTS_NSS_OFFLOAD)) { + /* + * The driver doesn't know anything about VLAN interfaces. + * Hence, don't send GTKs for VLAN interfaces to the driver. +@@ -610,6 +611,8 @@ ieee80211_key_alloc(u32 cipher, int idx, + */ + key->conf.flags = 0; + key->flags = 0; ++ /* VLAN ID initialised to zero for non-vlan interfaces */ ++ key->conf.vlan_id = 0; + + key->conf.link_id = -1; + key->conf.cipher = cipher; diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch new file mode 100644 index 00000000000000..12d42ddaa9ba9c --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch @@ -0,0 +1,973 @@ +From e6ecf9e1cc115b5821a880c6dccc5d8c9cd76fbd Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Tue, 15 Sep 2020 21:12:37 +0530 +Subject: [PATCH] ath11k: add WDS offload support on NSS offload for STA mode + +When 4addr is set ON for STA interface along with NSS enabled case, WDS +offload is enabled for ethernet mode. + +STA mode uses MEC (Multicast Echo Check) AST (Address Search Table) entry +to update the bridge MAC address from NSS to drop the locally generated +multicast/broadcast frames as multicast echo frames. + +AST handling and callbacks to NSS WDS APIs are added. + +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/core.h | 8 +- + drivers/net/wireless/ath/ath11k/dp.h | 6 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 18 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath11k/peer.c | 389 +++++++++++++++++++++++++++++++- + drivers/net/wireless/ath/ath11k/peer.h | 117 ++++++++++ + drivers/net/wireless/ath/ath11k/wmi.c | 99 +++++++- + drivers/net/wireless/ath/ath11k/wmi.h | 33 +++ + 8 files changed, 658 insertions(+), 14 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -655,6 +655,7 @@ struct ath11k { + struct ath11k_pdev_wmi *wmi; + #ifdef CPTCFG_ATH11K_NSS_SUPPORT + struct ath11k_nss nss; ++ struct ath11k_peer *bss_peer; + #endif + struct ath11k_pdev_dp dp; + u8 mac_addr[ETH_ALEN]; +@@ -1065,6 +1066,8 @@ struct ath11k_base { + u32 rx_hash; + bool stats_disable; + ++ u32 max_ast_index; ++ u32 num_ast_entries; + /* must be last */ + u8 drv_priv[] __aligned(sizeof(void *)); + }; +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -1181,13 +1181,16 @@ struct htt_t2h_peer_map_event { + #define HTT_T2H_PEER_UNMAP_INFO_PEER_ID HTT_T2H_PEER_MAP_INFO_PEER_ID + #define HTT_T2H_PEER_UNMAP_INFO1_MAC_ADDR_H16 \ + HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16 +-#define HTT_T2H_PEER_MAP_INFO1_NEXT_HOP_M HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_M +-#define HTT_T2H_PEER_MAP_INFO1_NEXT_HOP_S HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S ++#define HTT_T2H_PEER_UNMAP_INFO1_NEXT_HOP_M HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_M ++#define HTT_T2H_PEER_UNMAP_INFO1_NEXT_HOP_S HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S ++#define HTT_T2H_PEER_UNMAP_INFO3_WDS_FREE_COUNT GENMASK(15, 0) + + struct htt_t2h_peer_unmap_event { + u32 info; + u32 mac_addr_l32; + u32 info1; ++ u32 info2; ++ u32 info3; + } __packed; + + struct htt_resp_msg { +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -1890,6 +1890,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s + u16 peer_mac_h16; + u16 ast_hash; + u16 hw_peer_id; ++ u32 free_wds_count; ++ bool is_wds = false; + + ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "dp_htt rx msg type :0x%0x\n", type); + +@@ -1925,15 +1927,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s + resp->peer_map_ev.info2); + hw_peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID, + resp->peer_map_ev.info1); +- ath11k_peer_map_event(ab, vdev_id, peer_id, mac_addr, ast_hash, +- hw_peer_id); ++ is_wds = FIELD_GET(HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_M, ++ resp->peer_map_ev.info2); ++ ath11k_peer_map_v2_event(ab, vdev_id, peer_id, mac_addr, ast_hash, ++ hw_peer_id, is_wds); + break; + case HTT_T2H_MSG_TYPE_PEER_UNMAP: +- case HTT_T2H_MSG_TYPE_PEER_UNMAP2: + peer_id = FIELD_GET(HTT_T2H_PEER_UNMAP_INFO_PEER_ID, + resp->peer_unmap_ev.info); + ath11k_peer_unmap_event(ab, peer_id); + break; ++ case HTT_T2H_MSG_TYPE_PEER_UNMAP2: ++ peer_id = FIELD_GET(HTT_T2H_PEER_UNMAP_INFO_PEER_ID, ++ resp->peer_unmap_ev.info); ++ peer_mac_h16 = FIELD_GET(HTT_T2H_PEER_UNMAP_INFO1_MAC_ADDR_H16, ++ resp->peer_unmap_ev.info1); ++ ath11k_dp_get_mac_addr(resp->peer_map_ev.mac_addr_l32, ++ peer_mac_h16, mac_addr); ++ is_wds = FIELD_GET(HTT_T2H_PEER_UNMAP_INFO1_NEXT_HOP_M, ++ resp->peer_unmap_ev.info1); ++ free_wds_count = FIELD_GET(HTT_T2H_PEER_UNMAP_INFO3_WDS_FREE_COUNT, ++ resp->peer_unmap_ev.info3); ++ ath11k_peer_unmap_v2_event(ab, peer_id, mac_addr, is_wds, free_wds_count); ++ break; + case HTT_T2H_MSG_TYPE_PPDU_STATS_IND: + ath11k_htt_pull_ppdu_stats(ab, skb); + break; +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -431,7 +431,7 @@ ath11k_dp_tx_process_htt_tx_complete(str + break; + case HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY: + /* This event is to be handled only when the driver decides to +- * use WDS offload functionality. ++ * use WDS offload functionality on NSS disabled case. + */ + break; + default: +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -94,6 +94,287 @@ struct ath11k_peer *ath11k_peer_find_by_ + return NULL; + } + ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++struct ath11k_ast_entry *ath11k_peer_ast_find_by_peer(struct ath11k_base *ab, ++ struct ath11k_peer *peer, ++ u8* addr) ++{ ++ struct ath11k_ast_entry *ast_entry; ++ ++ lockdep_assert_held(&ab->base_lock); ++ ++ list_for_each_entry(ast_entry, &peer->ast_entry_list, ase_list) ++ if (ether_addr_equal(ast_entry->addr, addr)) ++ return ast_entry; ++ ++ return NULL; ++} ++ ++struct ath11k_ast_entry *ath11k_peer_ast_find_by_addr(struct ath11k_base *ab, ++ u8* addr) ++{ ++ struct ath11k_ast_entry *ast_entry; ++ struct ath11k_peer *peer; ++ ++ lockdep_assert_held(&ab->base_lock); ++ ++ list_for_each_entry(peer, &ab->peers, list) ++ list_for_each_entry(ast_entry, &peer->ast_entry_list, ase_list) ++ if (ether_addr_equal(ast_entry->addr, addr)) ++ return ast_entry; ++ ++ return NULL; ++} ++ ++void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk) ++{ ++ struct ath11k_ast_entry *ast_entry = container_of(wk, ++ struct ath11k_ast_entry, ++ wds_wmi_wk); ++ struct ath11k *ar; ++ struct ath11k_peer *peer; ++ int ret; ++ ++ if (!ast_entry) ++ return; ++ ++ ar = ast_entry->ar; ++ peer = ast_entry->peer; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "ath11k_peer_ast_wds_wmi_wk action %d ast_entry %pM next_node %pM vdev %d\n", ++ ast_entry->action, ast_entry->addr, ast_entry->next_node_mac, ++ ast_entry->vdev_id); ++ ++ if (ast_entry->action == ATH11K_WDS_WMI_ADD) { ++ ret = ath11k_wmi_send_add_update_wds_entry_cmd(ar, ++ ast_entry->next_node_mac, ++ ast_entry->addr, ++ ast_entry->vdev_id, ++ true); ++ if (ret) { ++ ath11k_warn(ar->ab, "add wds_entry_cmd failed %d for %pM next_node %pM\n", ++ ret, ast_entry->addr, ++ ast_entry->next_node_mac); ++ if (peer) ++ ath11k_nss_del_wds_peer(ar, peer, ++ ast_entry->addr); ++ } ++ } else if (ast_entry->action == ATH11K_WDS_WMI_UPDATE) { ++ if (!peer) ++ return; ++ ++ ret = ath11k_wmi_send_add_update_wds_entry_cmd(ar, peer->addr, ++ ast_entry->addr, ++ ast_entry->vdev_id, ++ false); ++ if (ret) ++ ath11k_warn(ar->ab, "update wds_entry_cmd failed %d for %pM on peer %pM\n", ++ ret, ast_entry->addr, peer->addr); ++ } ++} ++ ++int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ u8* mac_addr, enum ath11k_ast_entry_type type) ++{ ++ struct ath11k_ast_entry *ast_entry = NULL; ++ struct ath11k_base *ab = ar->ab; ++ ++ if (ab->num_ast_entries == ab->max_ast_index) { ++ ath11k_warn(ab, "failed to add ast for %pM due to insufficient ast entry resource %d in target\n", ++ mac_addr, ab->max_ast_index); ++ return -ENOBUFS; ++ } ++ ++ if (type != ATH11K_AST_TYPE_STATIC) { ++ ast_entry = ath11k_peer_ast_find_by_addr(ab, mac_addr); ++ if (ast_entry) { ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "ast_entry %pM already present on peer %pM\n", ++ mac_addr, ast_entry->peer->addr); ++ return 0; ++ } ++ } ++ ++ ast_entry = kzalloc(sizeof(*ast_entry), GFP_ATOMIC); ++ if (!ast_entry) { ++ ath11k_warn(ab, "failed to alloc ast_entry for %pM\n", ++ mac_addr); ++ return -ENOMEM; ++ } ++ ++ switch (type) { ++ case ATH11K_AST_TYPE_STATIC: ++ peer->self_ast_entry = ast_entry; ++ ast_entry->type = ATH11K_AST_TYPE_STATIC; ++ break; ++ case ATH11K_AST_TYPE_SELF: ++ peer->self_ast_entry = ast_entry; ++ ast_entry->type = ATH11K_AST_TYPE_SELF; ++ break; ++ case ATH11K_AST_TYPE_WDS: ++ ast_entry->type = ATH11K_AST_TYPE_WDS; ++ ast_entry->next_hop = 1; ++ break; ++ case ATH11K_AST_TYPE_MEC: ++ ast_entry->type = ATH11K_AST_TYPE_MEC; ++ ast_entry->next_hop = 1; ++ break; ++ default: ++ ath11k_warn(ab, "unsupported ast_type %d", type); ++ kfree(ast_entry); ++ return -EINVAL; ++ } ++ ++ INIT_LIST_HEAD(&ast_entry->ase_list); ++ INIT_WORK(&ast_entry->wds_wmi_wk, ath11k_peer_ast_wds_wmi_wk); ++ ast_entry->vdev_id = peer->vdev_id; ++ ast_entry->pdev_idx = peer->pdev_idx; ++ ast_entry->is_mapped = false; ++ ast_entry->is_active = true; ++ ast_entry->peer = peer; ++ ast_entry->ar = ar; ++ ether_addr_copy(ast_entry->addr, mac_addr); ++ ++ list_add_tail(&ast_entry->ase_list, &peer->ast_entry_list); ++ ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_add_ast peer %pM ast_entry %pM, ast_type %d\n", ++ peer->addr, mac_addr, ast_entry->type); ++ ++ if (type == ATH11K_AST_TYPE_MEC) ++ ether_addr_copy(ast_entry->next_node_mac, ar->mac_addr); ++ else if (type == ATH11K_AST_TYPE_WDS) ++ ether_addr_copy(ast_entry->next_node_mac, peer->addr); ++ ++ if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || ++ (ast_entry->type == ATH11K_AST_TYPE_MEC)) { ++ ath11k_nss_add_wds_peer(ar, peer, mac_addr, ast_entry->type); ++ ast_entry->action = ATH11K_WDS_WMI_ADD; ++ ieee80211_queue_work(ar->hw, &ast_entry->wds_wmi_wk); ++ } ++ ++ ab->num_ast_entries++; ++ return 0; ++} ++ ++int ath11k_peer_update_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ struct ath11k_ast_entry *ast_entry) ++{ ++ struct ath11k_peer *old_peer = ast_entry->peer; ++ struct ath11k_base *ab = ar->ab; ++ ++ if (!ast_entry->is_mapped) { ++ ath11k_warn(ab, "ath11k_peer_update_ast: ast_entry %pM not mapped yet\n", ++ ast_entry->addr); ++ return -EINVAL; ++ } ++ ++ if (ether_addr_equal(old_peer->addr, peer->addr) && ++ (ast_entry->type == ATH11K_AST_TYPE_WDS) && ++ (ast_entry->vdev_id == peer->vdev_id) && ++ (ast_entry->is_active)) ++ return 0; ++ ++ ast_entry->vdev_id = peer->vdev_id; ++ ast_entry->pdev_idx = peer->pdev_idx; ++ ast_entry->type = ATH11K_AST_TYPE_WDS; ++ ast_entry->is_active = true; ++ ast_entry->peer = peer; ++ ++ list_move_tail(&ast_entry->ase_list, &peer->ast_entry_list); ++ ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_update_ast old peer %pM new peer %pM ast_entry %pM\n", ++ old_peer->addr, peer->addr, ast_entry->addr); ++ ++ flush_work(&ast_entry->wds_wmi_wk); ++ ast_entry->action = ATH11K_WDS_WMI_UPDATE; ++ ieee80211_queue_work(ar->hw, &ast_entry->wds_wmi_wk); ++ ++ return 0; ++} ++ ++void ath11k_peer_map_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ u8* mac_addr, u16 hw_peer_id, u16 ast_hash) ++{ ++ struct ath11k_ast_entry *ast_entry = NULL; ++ struct ath11k_base *ab = ar->ab; ++ ++ if (!peer) ++ return; ++ ++ ast_entry = ath11k_peer_ast_find_by_peer(ab, peer, mac_addr); ++ ++ if (ast_entry) { ++ ast_entry->ast_idx = hw_peer_id; ++ ast_entry->is_active = true; ++ ast_entry->is_mapped = true; ++ ast_entry->ast_hash_value = ast_hash; ++ ++ if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || ++ (ast_entry->type == ATH11K_AST_TYPE_MEC)) ++ ath11k_nss_map_wds_peer(ar, peer, mac_addr, ++ ast_entry->type); ++ ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_map_ast peer %pM ast_entry %pM\n", ++ peer->addr, ast_entry->addr); ++ } ++ ++} ++ ++void ath11k_peer_del_ast(struct ath11k *ar, struct ath11k_ast_entry *ast_entry) ++{ ++ struct ath11k_peer *peer; ++ struct ath11k_base *ab = ar->ab; ++ ++ if (!ast_entry || !ast_entry->peer) ++ return; ++ ++ peer = ast_entry->peer; ++ ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_del_ast peer %pM ast_entry %pM\n", ++ peer->addr, ast_entry->addr); ++ ++ if (ast_entry->is_mapped) ++ list_del(&ast_entry->ase_list); ++ ++ /* WDS, MEC type AST entries need to be deleted on NSS */ ++ if (ast_entry->next_hop) ++ ath11k_nss_del_wds_peer(ar, peer, ast_entry->addr); ++ ++ cancel_work_sync(&ast_entry->wds_wmi_wk); ++ kfree(ast_entry); ++ ++ ab->num_ast_entries--; ++} ++ ++void ath11k_peer_ast_cleanup(struct ath11k *ar, struct ath11k_peer *peer, ++ bool is_wds, u32 free_wds_count) ++{ ++ struct ath11k_ast_entry *ast_entry, *tmp; ++ u32 ast_deleted_count = 0; ++ ++ if (peer->self_ast_entry) { ++ ath11k_peer_del_ast(ar, peer->self_ast_entry); ++ peer->self_ast_entry = NULL; ++ } ++ ++ list_for_each_entry_safe(ast_entry, tmp, &peer->ast_entry_list, ++ ase_list) { ++ if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || ++ (ast_entry->type == ATH11K_AST_TYPE_MEC)) ++ ast_deleted_count++; ++ ath11k_peer_del_ast(ar, ast_entry); ++ } ++ ++ if (!is_wds) { ++ if (ast_deleted_count != free_wds_count) ++ ath11k_warn(ar->ab, "ast_deleted_count (%d) mismatch on peer %pM free_wds_count (%d)!\n", ++ ast_deleted_count, peer->addr, free_wds_count); ++ else ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "ast_deleted_count (%d) on peer %pM free_wds_count (%d)\n", ++ ast_deleted_count, peer->addr, free_wds_count); ++ } ++} ++#endif ++ + void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id) + { + struct ath11k_peer *peer; +@@ -118,11 +399,67 @@ exit: + spin_unlock_bh(&ab->base_lock); + } + ++void ath11k_peer_unmap_v2_event(struct ath11k_base *ab, u16 peer_id, u8 *mac_addr, ++ bool is_wds, u32 free_wds_count) ++{ ++ struct ath11k_peer *peer; ++ struct ath11k *ar; ++ ++ spin_lock_bh(&ab->base_lock); ++ ++ peer = ath11k_peer_find_list_by_id(ab, peer_id); ++ if (!peer) { ++ ath11k_warn(ab, "peer-unmap-event: unknown peer id %d\n", ++ peer_id); ++ goto exit; ++ } ++ ++ rcu_read_lock(); ++ ar = ath11k_mac_get_ar_by_vdev_id(ab, peer->vdev_id); ++ if (!ar) { ++ ath11k_warn(ab, "peer-unmap-event: unknown peer vdev id %d\n", ++ peer->vdev_id); ++ goto free_peer; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer unmap vdev %d peer %pM id %d is_wds %d free_wds_count %d\n", ++ peer->vdev_id, peer->addr, peer_id, is_wds, free_wds_count); ++ ++ if (ab->nss.enabled) { ++ if (is_wds) { ++ struct ath11k_ast_entry *ast_entry = ++ ath11k_peer_ast_find_by_peer(ab, peer, mac_addr); ++ ++ if (ast_entry) ++ ath11k_peer_del_ast(ar, ast_entry); ++ rcu_read_unlock(); ++ goto exit; ++ } else ++ ath11k_peer_ast_cleanup(ar, peer, is_wds, free_wds_count); ++ } ++ ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ if (ar->bss_peer && ether_addr_equal(ar->bss_peer->addr, peer->addr)) ++ ar->bss_peer = NULL; ++#endif ++free_peer: ++ rcu_read_unlock(); ++ list_del(&peer->list); ++ kfree(peer); ++ wake_up(&ab->peer_mapping_wq); ++ ++exit: ++ spin_unlock_bh(&ab->base_lock); ++} ++ + void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id, + u8 *mac_addr, u16 ast_hash, u16 hw_peer_id) + { + struct ath11k_peer *peer; ++ struct ath11k *ar = NULL; + ++ rcu_read_lock(); ++ ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id); + spin_lock_bh(&ab->base_lock); + peer = ath11k_peer_find(ab, vdev_id, mac_addr); + if (!peer) { +@@ -137,8 +474,8 @@ void ath11k_peer_map_event(struct ath11k + ether_addr_copy(peer->addr, mac_addr); + list_add(&peer->list, &ab->peers); + wake_up(&ab->peer_mapping_wq); +- if (ab->nss.enabled) +- ath11k_nss_peer_create(ab, peer); ++ if (ab->nss.enabled && ar) ++ ath11k_nss_peer_create(ar, peer); + } + + ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "peer map vdev %d peer %pM id %d\n", +@@ -146,6 +483,69 @@ void ath11k_peer_map_event(struct ath11k + + exit: + spin_unlock_bh(&ab->base_lock); ++ rcu_read_unlock(); ++} ++ ++void ath11k_peer_map_v2_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id, ++ u8 *mac_addr, u16 ast_hash, u16 hw_peer_id, ++ bool is_wds) ++{ ++ struct ath11k_peer *peer; ++ struct ath11k *ar = NULL; ++ int ret; ++ ++ rcu_read_lock(); ++ ar = ath11k_mac_get_ar_by_vdev_id(ab, vdev_id); ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find(ab, vdev_id, mac_addr); ++ if (!peer && !is_wds) { ++ peer = kzalloc(sizeof(*peer), GFP_ATOMIC); ++ if (!peer) { ++ ath11k_warn(ab, "failed to allocated peer for %pM vdev_id %d\n", ++ mac_addr, vdev_id); ++ spin_unlock_bh(&ab->base_lock); ++ goto exit; ++ } ++ ++ peer->vdev_id = vdev_id; ++ peer->peer_id = peer_id; ++ peer->ast_hash = ast_hash; ++ peer->hw_peer_id = hw_peer_id; ++ ether_addr_copy(peer->addr, mac_addr); ++ list_add(&peer->list, &ab->peers); ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ INIT_LIST_HEAD(&peer->ast_entry_list); ++#endif ++ if (ab->nss.enabled && ar) { ++ ret = ath11k_nss_peer_create(ar, peer); ++ if (ret) { ++ ath11k_warn(ab, "failed to do nss peer create: %d\n", ++ ret); ++ goto peer_free; ++ } ++ } ++ wake_up(&ab->peer_mapping_wq); ++ } ++ ++ if (is_wds) ++ peer = ath11k_peer_find_by_id(ab, peer_id); ++ ++ if (ab->nss.enabled && ar) ++ ath11k_peer_map_ast(ar, peer, mac_addr, hw_peer_id, ast_hash); ++ ++ ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "htt peer map vdev %d peer %pM id %d is_wds %d\n", ++ vdev_id, mac_addr, peer_id, is_wds); ++ ++ spin_unlock_bh(&ab->base_lock); ++ goto exit; ++ ++peer_free: ++ spin_unlock_bh(&ab->base_lock); ++ mutex_lock(&ar->conf_mutex); ++ ath11k_peer_delete(ar, vdev_id, mac_addr); ++ mutex_unlock(&ar->conf_mutex); ++exit: ++ rcu_read_unlock(); + } + + static int ath11k_wait_for_peer_common(struct ath11k_base *ab, int vdev_id, +@@ -242,20 +642,34 @@ err_clean: + + void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id) + { +- struct ath11k_peer *peer, *tmp; ++ struct ath11k_peer *peer, *tmp_peer; + struct ath11k_base *ab = ar->ab; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ struct ath11k_ast_entry *ast_entry, *tmp_ast; ++#endif + + lockdep_assert_held(&ar->conf_mutex); + + mutex_lock(&ab->tbl_mtx_lock); + spin_lock_bh(&ab->base_lock); +- list_for_each_entry_safe(peer, tmp, &ab->peers, list) { ++ list_for_each_entry_safe(peer, tmp_peer, &ab->peers, list) { + if (peer->vdev_id != vdev_id) + continue; + + ath11k_warn(ab, "removing stale peer %pM from vdev_id %d\n", + peer->addr, vdev_id); + ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ if (peer->self_ast_entry) { ++ ath11k_peer_del_ast(ar, peer->self_ast_entry); ++ peer->self_ast_entry = NULL; ++ } ++ ++ list_for_each_entry_safe(ast_entry, tmp_ast, ++ &peer->ast_entry_list, ase_list) ++ ath11k_peer_del_ast(ar, ast_entry); ++#endif ++ + ath11k_peer_rhash_delete(ab, peer); + list_del(&peer->list); + kfree(peer); +@@ -302,7 +716,7 @@ static int __ath11k_peer_delete(struct a + lockdep_assert_held(&ar->conf_mutex); + + reinit_completion(&ar->peer_delete_done); +- ath11k_nss_peer_delete(ar->ab, addr); ++ ath11k_nss_peer_delete(ar->ab, vdev_id, addr); + + mutex_lock(&ab->tbl_mtx_lock); + spin_lock_bh(&ab->base_lock); +@@ -377,6 +791,7 @@ int ath11k_peer_create(struct ath11k *ar + struct ieee80211_sta *sta, struct peer_create_params *param) + { + struct ath11k_peer *peer; ++ struct ieee80211_vif *vif = arvif->vif; + struct ath11k_sta *arsta; + int ret, fbret; + +@@ -450,7 +865,14 @@ int ath11k_peer_create(struct ath11k *ar + + peer->sec_type = HAL_ENCRYPT_TYPE_OPEN; + peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; +- peer->vif = arvif->vif; ++ peer->vif = vif; ++ ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ if (vif->type == NL80211_IFTYPE_STATION && ar->ab->nss.enabled) ++ ar->bss_peer = peer; ++ else ++ ar->bss_peer = NULL; ++#endif + + + if (sta) { +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -18,6 +18,47 @@ struct ppdu_user_delayba { + u32 resp_rate_flags; + }; + ++enum ath11k_ast_entry_type { ++ ATH11K_AST_TYPE_NONE, /* static ast entry for connected peer */ ++ ATH11K_AST_TYPE_STATIC, /* static ast entry for connected peer */ ++ ATH11K_AST_TYPE_SELF, /* static ast entry for self peer (STA mode) */ ++ ATH11K_AST_TYPE_WDS, /* WDS peer ast entry type*/ ++ ATH11K_AST_TYPE_MEC, /* Multicast echo ast entry type */ ++ ATH11K_AST_TYPE_WDS_HM, /* HM WDS entry */ ++ ATH11K_AST_TYPE_STA_BSS, /* BSS entry(STA mode) */ ++ ATH11K_AST_TYPE_DA, /* AST entry based on Destination address */ ++ ATH11K_AST_TYPE_WDS_HM_SEC, /* HM WDS entry for secondary radio */ ++ ATH11K_AST_TYPE_MAX ++}; ++ ++enum ath11k_wds_wmi_action { ++ ATH11K_WDS_WMI_ADD = 1, ++ ATH11K_WDS_WMI_UPDATE, ++ ++ ATH11K_WDS_WMI_MAX ++}; ++ ++struct ath11k_ast_entry { ++ u16 ast_idx; ++ u8 addr[ETH_ALEN]; ++ u8 next_node_mac[ETH_ALEN]; ++ enum ath11k_wds_wmi_action action; ++ struct work_struct wds_wmi_wk; ++ struct ath11k_peer *peer; ++ struct ath11k *ar; ++ bool next_hop; ++ bool is_active; ++ bool is_mapped; ++ u8 pdev_idx; ++ u8 vdev_id; ++ u16 ast_hash_value; ++ int ref_cnt; ++ enum ath11k_ast_entry_type type; ++ bool delete_in_progress; ++ void *cookie; ++ struct list_head ase_list; ++}; ++ + struct ath11k_peer { + struct list_head list; + struct ieee80211_sta *sta; +@@ -29,6 +70,10 @@ struct ath11k_peer { + u8 pdev_idx; + u16 hw_peer_id; + struct ath11k_nss_peer nss; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ struct ath11k_ast_entry *self_ast_entry; ++ struct list_head ast_entry_list; ++#endif + + /* protected by ab->data_lock */ + struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; +@@ -54,8 +99,13 @@ struct ath11k_peer { + }; + + void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id); ++void ath11k_peer_unmap_v2_event(struct ath11k_base *ab, u16 peer_id, u8 *mac_addr, ++ bool is_wds, u32 free_wds_count); + void ath11k_peer_map_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id, + u8 *mac_addr, u16 ast_hash, u16 hw_peer_id); ++void ath11k_peer_map_v2_event(struct ath11k_base *ab, u8 vdev_id, u16 peer_id, ++ u8 *mac_addr, u16 ast_hash, u16 hw_peer_id, ++ bool is_wds); + struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id, + const u8 *addr); + struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab, +@@ -72,4 +122,71 @@ struct ath11k_peer *ath11k_peer_find_by_ + int ath11k_peer_rhash_tbl_init(struct ath11k_base *ab); + void ath11k_peer_rhash_tbl_destroy(struct ath11k_base *ab); + int ath11k_peer_rhash_delete(struct ath11k_base *ab, struct ath11k_peer *peer); ++ ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++struct ath11k_ast_entry *ath11k_peer_ast_find_by_addr(struct ath11k_base *ab, ++ u8* addr); ++int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ u8* mac_addr, enum ath11k_ast_entry_type type); ++int ath11k_peer_update_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ struct ath11k_ast_entry *ast_entry); ++void ath11k_peer_map_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ u8* mac_addr, u16 hw_peer_id, u16 ast_hash); ++void ath11k_peer_del_ast(struct ath11k *ar, struct ath11k_ast_entry *ast_entry); ++void ath11k_peer_ast_cleanup(struct ath11k *ar, struct ath11k_peer *peer, ++ bool is_wds, u32 free_wds_count); ++void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk); ++struct ath11k_ast_entry *ath11k_peer_ast_find_by_peer(struct ath11k_base *ab, ++ struct ath11k_peer *peer, ++ u8* addr); ++#else ++static inline struct ath11k_ast_entry *ath11k_peer_ast_find_by_addr(struct ath11k_base *ab, ++ u8* addr) ++{ ++ return NULL; ++} ++ ++static inline int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ u8* mac_addr, enum ath11k_ast_entry_type type) ++{ ++ return 0; ++} ++ ++static inline int ath11k_peer_update_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ struct ath11k_ast_entry *ast_entry) ++{ ++ return 0; ++} ++ ++static inline void ath11k_peer_map_ast(struct ath11k *ar, struct ath11k_peer *peer, ++ u8* mac_addr, u16 hw_peer_id, u16 ast_hash) ++{ ++ return; ++} ++ ++static inline void ath11k_peer_del_ast(struct ath11k *ar, ++ struct ath11k_ast_entry *ast_entry) ++{ ++ return; ++} ++ ++static inline void ath11k_peer_ast_cleanup(struct ath11k *ar, ++ struct ath11k_peer *peer, ++ bool is_wds, u32 free_wds_count) ++{ ++ return; ++} ++ ++static inline void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk) ++{ ++ return; ++} ++ ++static inline struct ath11k_ast_entry *ath11k_peer_ast_find_by_peer(struct ath11k_base *ab, ++ struct ath11k_peer *peer, ++ u8* addr) ++{ ++ return NULL; ++} ++#endif /* CPTCFG_ATH11K_NSS_SUPPORT */ + #endif /* _PEER_H_ */ +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -155,6 +155,7 @@ static const struct wmi_tlv_policy wmi_t + .min_len = sizeof(struct wmi_per_chain_rssi_stats), .policy = "wmi_per_chain_rssi_stats" }, + [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = { + .min_len = sizeof(struct wmi_twt_add_dialog_event), .policy = "wmi_twt_add_dialog_event" }, ++ [WMI_TAG_WDS_ADDR_EVENT] = { .min_len = sizeof(struct wmi_wds_addr_event), .policy = "wmi_wds_addr_event" }, + }; + + #define PRIMAP(_hw_mode_) \ +@@ -1174,6 +1175,51 @@ int ath11k_wmi_send_peer_delete_cmd(stru + return ret; + } + ++int ath11k_wmi_send_add_update_wds_entry_cmd(struct ath11k *ar, ++ const u8 *peer_addr, ++ const u8 *wds_addr, u8 vdev_id, ++ bool add_wds) ++{ ++ struct ath11k_pdev_wmi *wmi = ar->wmi; ++ struct wmi_add_wds_entry_cmd *cmd; ++ struct sk_buff *skb; ++ int ret; ++ ++ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); ++ if (!skb) ++ return -ENOMEM; ++ ++ cmd = (struct wmi_add_wds_entry_cmd *)skb->data; ++ if (add_wds) ++ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_ADD_WDS_ENTRY_CMD) | ++ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); ++ else ++ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_PEER_UPDATE_WDS_ENTRY_CMD) | ++ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); ++ ++ ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); ++ ether_addr_copy(cmd->wds_macaddr.addr, wds_addr); ++ cmd->vdev_id = vdev_id; ++ cmd->flags = WMI_WDS_FLAG_STATIC; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "WMI add WDS entry vdev_id %d peer_addr %pM, wds_addr %pM flags %x\n", ++ vdev_id, peer_addr, wds_addr, cmd->flags); ++ ++ if (add_wds) ++ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_ADD_WDS_ENTRY_CMDID); ++ else ++ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PEER_UPDATE_WDS_ENTRY_CMDID); ++ ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send WMI_PEER_%s_WDS_ENTRY cmd\n", ++ add_wds ? "ADD" : "UPDATE"); ++ dev_kfree_skb(skb); ++ } ++ ++ return ret; ++} ++ + int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar, + struct pdev_set_regdomain_params *param) + { +@@ -6484,6 +6530,36 @@ static int ath11k_pull_peer_assoc_conf_e + return 0; + } + ++static int ath11k_pull_wds_addr_ev(struct ath11k_base *ab, struct sk_buff *skb, ++ struct wmi_wds_addr_arg *wds_addr_arg) ++{ ++ const void **tb; ++ const struct wmi_wds_addr_event *ev; ++ int ret; ++ ++ tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); ++ if (IS_ERR(tb)) { ++ ret = PTR_ERR(tb); ++ ath11k_warn(ab, "failed to parse tlv: %d\n", ret); ++ return ret; ++ } ++ ++ ev = tb[WMI_TAG_WDS_ADDR_EVENT]; ++ if (!ev) { ++ ath11k_warn(ab, "failed to fetch wds peer ev"); ++ kfree(tb); ++ return -EPROTO; ++ } ++ ++ memcpy(wds_addr_arg->event_type, ev->event_type, WMI_NUM_WDS_EVENTS); ++ wds_addr_arg->vdev_id = ev->vdev_id; ++ wds_addr_arg->peer_macaddr = ev->peer_macaddr.addr; ++ wds_addr_arg->dst_macaddr = ev->dst_macaddr.addr; ++ ++ kfree(tb); ++ return 0; ++} ++ + static void ath11k_wmi_pull_pdev_stats_base(const struct wmi_pdev_stats_base *src, + struct ath11k_fw_stats_pdev *dst) + { +@@ -7399,6 +7475,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru + + ether_addr_copy(ab->mac_addr, + fixed_param.ready_event_min.mac_addr.addr); ++ ab->max_ast_index = fixed_param.max_ast_index + 1; + ab->pktlog_defs_checksum = fixed_param.pktlog_defs_checksum; + break; + case WMI_TAG_ARRAY_FIXED_STRUCT: +@@ -8870,6 +8947,22 @@ static void ath11k_wmi_gtk_offload_statu + kfree(tb); + } + ++static void ath11k_wmi_wds_peer_event(struct ath11k_base *ab, ++ struct sk_buff *skb) ++{ ++ struct wmi_wds_addr_arg wds_addr_arg = {0}; ++ ++ if (ath11k_pull_wds_addr_ev(ab, skb, &wds_addr_arg) != 0) { ++ ath11k_warn(ab, "failed to extract wds addr event"); ++ return; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_WMI, ++ "wds addr event vdev id %d peer macaddr %pM dst macaddr %pM\n", ++ wds_addr_arg.vdev_id, wds_addr_arg.peer_macaddr, ++ wds_addr_arg.dst_macaddr); ++} ++ + static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) + { + struct wmi_cmd_hdr *cmd_hdr; +@@ -9000,6 +9093,9 @@ static void ath11k_wmi_tlv_op_rx(struct + case WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID: + ath11k_qos_null_compl_event(ab, skb); + break; ++ case WMI_WDS_PEER_EVENTID: ++ ath11k_wmi_wds_peer_event(ab, skb); ++ break; + default: + ath11k_dbg(ab, ATH11K_DBG_WMI, "unsupported event id 0x%x\n", id); + break; +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -3025,6 +3025,21 @@ struct wmi_peer_delete_cmd { + struct wmi_mac_addr peer_macaddr; + } __packed; + ++#define WMI_WDS_FLAG_STATIC 0x1 /* Disable aging & learning */ ++struct wmi_add_wds_entry_cmd { ++ u32 tlv_header; ++ struct wmi_mac_addr peer_macaddr; ++ struct wmi_mac_addr wds_macaddr; ++ u32 flags; ++ u32 vdev_id; ++} __packed; ++ ++struct wmi_remove_wds_entry_cmd { ++ u32 tlv_header; ++ struct wmi_mac_addr wds_macaddr; ++ u32 vdev_id; ++} __packed; ++ + struct wmi_peer_reorder_queue_setup_cmd { + u32 tlv_header; + u32 vdev_id; +@@ -4629,6 +4644,21 @@ struct wmi_probe_resp_tx_status_event { + u32 tx_status; + } __packed; + ++#define WMI_NUM_WDS_EVENTS 4 ++struct wmi_wds_addr_arg { ++ u32 event_type[WMI_NUM_WDS_EVENTS]; ++ const u8 *peer_macaddr; ++ const u8 *dst_macaddr; ++ u32 vdev_id; ++}; ++ ++struct wmi_wds_addr_event { ++ u32 event_type[WMI_NUM_WDS_EVENTS]; ++ struct wmi_mac_addr peer_macaddr; ++ struct wmi_mac_addr dst_macaddr; ++ u32 vdev_id; ++} __packed; ++ + /* + * PDEV statistics + */ +@@ -6503,6 +6533,9 @@ int ath11k_wmi_set_sta_ps_param(struct a + int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms); + int ath11k_wmi_send_peer_delete_cmd(struct ath11k *ar, + const u8 *peer_addr, u8 vdev_id); ++int ath11k_wmi_send_add_update_wds_entry_cmd(struct ath11k *ar, ++ const u8 *peer_addr, const u8 *wds_addr, ++ u8 vdev_id, bool add_wds); + int ath11k_wmi_vdev_delete(struct ath11k *ar, u8 vdev_id); + void ath11k_wmi_start_scan_init(struct ath11k *ar, struct scan_req_params *arg); + int ath11k_wmi_send_scan_start_cmd(struct ath11k *ar, diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch new file mode 100644 index 00000000000000..edb60ac18bef10 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch @@ -0,0 +1,777 @@ +From e4f16128c53b48f166301085cecc23f77bf3ff8e Mon Sep 17 00:00:00 2001 +From: Miles Hu +Date: Fri, 11 Oct 2019 19:24:06 -0700 +Subject: [PATCH] ath11k: add HE stats in peer stats packet counters for MIMO + and OFDMA + +Signed-off-by: Miles Hu +--- + drivers/net/wireless/ath/ath11k/core.h | 23 ++++- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 127 +++++++++++++++++++++++++- + drivers/net/wireless/ath/ath11k/dp.h | 21 ++++- + drivers/net/wireless/ath/ath11k/dp_rx.c | 17 +++- + drivers/net/wireless/ath/ath11k/rx_desc.h | 5 + + 5 files changed, 185 insertions(+), 8 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -29,6 +29,7 @@ + #include "dbring.h" + #include "spectral.h" + #include "wow.h" ++#include "rx_desc.h" + #include "nss.h" + + #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) +@@ -476,6 +477,8 @@ struct ath11k_htt_data_stats { + u64 bw[ATH11K_COUNTER_TYPE_MAX][ATH11K_BW_NUM]; + u64 nss[ATH11K_COUNTER_TYPE_MAX][ATH11K_NSS_NUM]; + u64 gi[ATH11K_COUNTER_TYPE_MAX][ATH11K_GI_NUM]; ++ u64 transmit_type[ATH11K_COUNTER_TYPE_MAX][HAL_RX_RECEPTION_TYPE_MAX]; ++ u64 ru_loc[ATH11K_COUNTER_TYPE_MAX][HAL_RX_RU_ALLOC_TYPE_MAX]; + }; + + struct ath11k_htt_tx_stats { +@@ -483,6 +486,9 @@ struct ath11k_htt_tx_stats { + u64 tx_duration; + u64 ba_fails; + u64 ack_fails; ++ u16 ru_start; ++ u16 ru_tones; ++ u32 mu_group[MAX_MU_GROUP_ID]; + }; + + struct ath11k_per_ppdu_tx_stats { +@@ -615,11 +621,16 @@ struct ath11k_per_peer_tx_stats { + u32 succ_bytes; + u32 retry_bytes; + u32 failed_bytes; ++ u32 duration; + u16 succ_pkts; + u16 retry_pkts; + u16 failed_pkts; +- u32 duration; ++ u16 ru_start; ++ u16 ru_tones; + u8 ba_fails; ++ u8 ppdu_type; ++ u32 mu_grpid; ++ u32 mu_pos; + bool is_ampdu; + }; + +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -12,13 +12,39 @@ + #include "dp_tx.h" + #include "debugfs_htt_stats.h" + ++static inline u32 ath11k_he_tones_in_ru_to_nl80211_he_ru_alloc(u16 ru_tones) ++{ ++ u32 ret = 0; ++ switch (ru_tones) { ++ case 26: ++ ret = NL80211_RATE_INFO_HE_RU_ALLOC_26; ++ break; ++ case 52: ++ ret = NL80211_RATE_INFO_HE_RU_ALLOC_52; ++ break; ++ case 106: ++ ret = NL80211_RATE_INFO_HE_RU_ALLOC_106; ++ break; ++ case 242: ++ ret = NL80211_RATE_INFO_HE_RU_ALLOC_242; ++ break; ++ case 484: ++ ret = NL80211_RATE_INFO_HE_RU_ALLOC_484; ++ break; ++ case 996: ++ ret = NL80211_RATE_INFO_HE_RU_ALLOC_996; ++ break; ++ } ++ return ret; ++} ++ + void ath11k_debugfs_sta_add_tx_stats(struct ath11k_sta *arsta, + struct ath11k_per_peer_tx_stats *peer_stats, + u8 legacy_rate_idx) + { + struct rate_info *txrate = &arsta->txrate; + struct ath11k_htt_tx_stats *tx_stats; +- int gi, mcs, bw, nss; ++ int gi, mcs, bw, nss, ru_type, ppdu_type; + + if (!arsta->tx_stats) + return; +@@ -63,6 +89,43 @@ void ath11k_debugfs_sta_add_tx_stats(str + STATS_OP_FMT(RETRY).legacy[1][mcs] += peer_stats->retry_pkts; + } + ++ ppdu_type = peer_stats->ppdu_type; ++ if ((ppdu_type == HTT_PPDU_STATS_PPDU_TYPE_MU_OFDMA || ++ ppdu_type == HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO_OFDMA) && ++ (txrate->flags & RATE_INFO_FLAGS_HE_MCS)){ ++ ru_type = peer_stats->ru_tones; ++ ++ if (ru_type <= NL80211_RATE_INFO_HE_RU_ALLOC_996) { ++ STATS_OP_FMT(SUCC).ru_loc[0][ru_type] += peer_stats->succ_bytes; ++ STATS_OP_FMT(SUCC).ru_loc[1][ru_type] += peer_stats->succ_pkts; ++ STATS_OP_FMT(FAIL).ru_loc[0][ru_type] += peer_stats->failed_bytes; ++ STATS_OP_FMT(FAIL).ru_loc[1][ru_type] += peer_stats->failed_pkts; ++ STATS_OP_FMT(RETRY).ru_loc[0][ru_type] += peer_stats->retry_bytes; ++ STATS_OP_FMT(RETRY).ru_loc[1][ru_type] += peer_stats->retry_pkts; ++ if (peer_stats->is_ampdu) { ++ STATS_OP_FMT(AMPDU).ru_loc[0][ru_type] += ++ peer_stats->succ_bytes + peer_stats->retry_bytes; ++ STATS_OP_FMT(AMPDU).ru_loc[1][ru_type] += ++ peer_stats->succ_pkts + peer_stats->retry_pkts; ++ } ++ } ++ } ++ ++ if (ppdu_type < HTT_PPDU_STATS_PPDU_TYPE_MAX) { ++ STATS_OP_FMT(SUCC).transmit_type[0][ppdu_type] += peer_stats->succ_bytes; ++ STATS_OP_FMT(SUCC).transmit_type[1][ppdu_type] += peer_stats->succ_pkts; ++ STATS_OP_FMT(FAIL).transmit_type[0][ppdu_type] += peer_stats->failed_bytes; ++ STATS_OP_FMT(FAIL).transmit_type[1][ppdu_type] += peer_stats->failed_pkts; ++ STATS_OP_FMT(RETRY).transmit_type[0][ppdu_type] += peer_stats->retry_bytes; ++ STATS_OP_FMT(RETRY).transmit_type[1][ppdu_type] += peer_stats->retry_pkts; ++ if (peer_stats->is_ampdu) { ++ STATS_OP_FMT(AMPDU).transmit_type[0][ppdu_type] += ++ peer_stats->succ_bytes + peer_stats->retry_bytes; ++ STATS_OP_FMT(AMPDU).transmit_type[1][ppdu_type] += ++ peer_stats->succ_pkts + peer_stats->retry_pkts; ++ } ++ } ++ + if (peer_stats->is_ampdu) { + tx_stats->ba_fails += peer_stats->ba_fails; + +@@ -123,6 +186,17 @@ void ath11k_debugfs_sta_add_tx_stats(str + STATS_OP_FMT(RETRY).gi[1][gi] += peer_stats->retry_pkts; + + tx_stats->tx_duration += peer_stats->duration; ++ ++ tx_stats->ru_start = peer_stats->ru_start; ++ tx_stats->ru_tones = peer_stats->ru_tones; ++ ++ if (peer_stats->mu_grpid <= MAX_MU_GROUP_ID && ++ peer_stats->ppdu_type != HTT_PPDU_STATS_PPDU_TYPE_SU) { ++ if (peer_stats->mu_grpid & (MAX_MU_GROUP_ID - 1)) ++ tx_stats->mu_group[peer_stats->mu_grpid] = ++ (peer_stats->mu_pos + 1); ++ } ++ + } + + void ath11k_debugfs_sta_update_txcompl(struct ath11k *ar, +@@ -139,12 +213,13 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); + struct ath11k *ar = arsta->arvif->ar; + struct ath11k_htt_data_stats *stats; +- static const char *str_name[ATH11K_STATS_TYPE_MAX] = {"succ", "fail", ++ static const char *str_name[ATH11K_STATS_TYPE_MAX] = {"success", "fail", + "retry", "ampdu"}; + static const char *str[ATH11K_COUNTER_TYPE_MAX] = {"bytes", "packets"}; + int len = 0, i, j, k, retval = 0; + const int size = 2 * 4096; +- char *buf; ++ char *buf, mu_group_id[MAX_MU_GROUP_LENGTH] = {0}; ++ u32 index; + + buf = kzalloc(size, GFP_KERNEL); + if (!buf) +@@ -165,45 +240,46 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + len += scnprintf(buf + len, size - len, "%s_%s\n", + str_name[k], + str[j]); ++ len += scnprintf(buf + len, size - len, "==========\n"); + len += scnprintf(buf + len, size - len, +- " HE MCS %s\n", ++ " HE MCS %s\n\t", + str[j]); + for (i = 0; i < ATH11K_HE_MCS_NUM; i++) + len += scnprintf(buf + len, size - len, +- " %llu ", ++ "%llu ", + stats->he[j][i]); + len += scnprintf(buf + len, size - len, "\n"); + len += scnprintf(buf + len, size - len, +- " VHT MCS %s\n", ++ " VHT MCS %s\n\t", + str[j]); + for (i = 0; i < ATH11K_VHT_MCS_NUM; i++) + len += scnprintf(buf + len, size - len, +- " %llu ", ++ "%llu ", + stats->vht[j][i]); + len += scnprintf(buf + len, size - len, "\n"); +- len += scnprintf(buf + len, size - len, " HT MCS %s\n", ++ len += scnprintf(buf + len, size - len, " HT MCS %s\n\t", + str[j]); + for (i = 0; i < ATH11K_HT_MCS_NUM; i++) + len += scnprintf(buf + len, size - len, +- " %llu ", stats->ht[j][i]); ++ "%llu ", stats->ht[j][i]); + len += scnprintf(buf + len, size - len, "\n"); + len += scnprintf(buf + len, size - len, + " BW %s (20,40,80,160 MHz)\n", str[j]); + len += scnprintf(buf + len, size - len, +- " %llu %llu %llu %llu\n", ++ "\t%llu %llu %llu %llu\n", + stats->bw[j][0], stats->bw[j][1], + stats->bw[j][2], stats->bw[j][3]); + len += scnprintf(buf + len, size - len, + " NSS %s (1x1,2x2,3x3,4x4)\n", str[j]); + len += scnprintf(buf + len, size - len, +- " %llu %llu %llu %llu\n", ++ "\t%llu %llu %llu %llu\n", + stats->nss[j][0], stats->nss[j][1], + stats->nss[j][2], stats->nss[j][3]); + len += scnprintf(buf + len, size - len, + " GI %s (0.4us,0.8us,1.6us,3.2us)\n", + str[j]); + len += scnprintf(buf + len, size - len, +- " %llu %llu %llu %llu\n", ++ "\t%llu %llu %llu %llu\n", + stats->gi[j][0], stats->gi[j][1], + stats->gi[j][2], stats->gi[j][3]); + len += scnprintf(buf + len, size - len, +@@ -212,10 +288,68 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + for (i = 0; i < ATH11K_LEGACY_NUM; i++) + len += scnprintf(buf + len, size - len, "%llu ", + stats->legacy[j][i]); +- len += scnprintf(buf + len, size - len, "\n"); ++ ++ len += scnprintf(buf + len, size - len, "\n ru %s: \n", str[j]); ++ len += scnprintf(buf + len, size - len, ++ "\tru 26: %llu\n", stats->ru_loc[j][0]); ++ len += scnprintf(buf + len, size - len, ++ "\tru 52: %llu \n", stats->ru_loc[j][1]); ++ len += scnprintf(buf + len, size - len, ++ "\tru 106: %llu \n", stats->ru_loc[j][2]); ++ len += scnprintf(buf + len, size - len, ++ "\tru 242: %llu \n", stats->ru_loc[j][3]); ++ len += scnprintf(buf + len, size - len, ++ "\tru 484: %llu \n", stats->ru_loc[j][4]); ++ len += scnprintf(buf + len, size - len, ++ "\tru 996: %llu \n", stats->ru_loc[j][5]); ++ ++ len += scnprintf(buf + len, size - len, ++ " ppdu type %s: \n", str[j]); ++ if (k == ATH11K_STATS_TYPE_FAIL || ++ k == ATH11K_STATS_TYPE_RETRY) { ++ len += scnprintf(buf + len, size - len, ++ "\tSU/MIMO: %llu\n", ++ stats->transmit_type[j][0]); ++ len += scnprintf(buf + len, size - len, ++ "\tOFDMA/OFDMA_MIMO: %llu\n", ++ stats->transmit_type[j][2]); ++ } else { ++ len += scnprintf(buf + len, size - len, ++ "\tSU: %llu\n", ++ stats->transmit_type[j][0]); ++ len += scnprintf(buf + len, size - len, ++ "\tMIMO: %llu\n", ++ stats->transmit_type[j][1]); ++ len += scnprintf(buf + len, size - len, ++ "\tOFDMA: %llu\n", ++ stats->transmit_type[j][2]); ++ len += scnprintf(buf + len, size - len, ++ "\tOFDMA_MIMO: %llu\n", ++ stats->transmit_type[j][3]); ++ } + } + } + ++ len += scnprintf(buf + len, size - len, "\n"); ++ ++ for (i = 0; i < MAX_MU_GROUP_ID;) { ++ index = 0; ++ for (j = 0; j < MAX_MU_GROUP_SHOW && i < MAX_MU_GROUP_ID; ++ j++) { ++ index += snprintf(&mu_group_id[index], ++ MAX_MU_GROUP_LENGTH - index, ++ " %d", ++ arsta->tx_stats->mu_group[i]); ++ i++; ++ } ++ len += scnprintf(buf + len, size - len, ++ "User position list for GID %02d->%d: [%s]\n", ++ i - MAX_MU_GROUP_SHOW, i - 1, mu_group_id); ++ } ++ len += scnprintf(buf + len, size - len, ++ "\nLast Packet RU index [%d], Size [%d]\n", ++ arsta->tx_stats->ru_start, arsta->tx_stats->ru_tones); ++ + len += scnprintf(buf + len, size - len, + "\nTX duration\n %llu usecs\n", + arsta->tx_stats->tx_duration); +@@ -223,6 +357,7 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + "BA fails\n %llu\n", arsta->tx_stats->ba_fails); + len += scnprintf(buf + len, size - len, + "ack fails\n %llu\n", arsta->tx_stats->ack_fails); ++ + spin_unlock_bh(&ar->data_lock); + + if (len > size) +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -598,6 +598,45 @@ enum htt_ppdu_stats_tag_type { + BIT(HTT_PPDU_STATS_TAG_TX_MGMTCTRL_PAYLOAD) | \ + HTT_PPDU_STATS_TAG_DEFAULT) + ++#define HTT_STATS_FRAMECTRL_TYPE_MASK 0x0C ++#define HTT_STATS_GET_FRAME_CTRL_TYPE(_val) \ ++ (((_val) & HTT_STATS_FRAMECTRL_TYPE_MASK) >> 2) ++#define HTT_STATS_FRAME_CTRL_TYPE_MGMT 0x0 ++#define HTT_STATS_FRAME_CTRL_TYPE_CTRL 0x1 ++#define HTT_STATS_FRAME_CTRL_TYPE_DATA 0x2 ++#define HTT_STATS_FRAME_CTRL_TYPE_RESV 0x3 ++ ++enum htt_stats_frametype { ++ HTT_STATS_FTYPE_SGEN_NDPA = 0, ++ HTT_STATS_FTYPE_SGEN_NDP, ++ HTT_STATS_FTYPE_SGEN_BRP, ++ HTT_STATS_FTYPE_SGEN_BAR, ++ HTT_STATS_FTYPE_SGEN_RTS, ++ HTT_STATS_FTYPE_SGEN_CTS, ++ HTT_STATS_FTYPE_SGEN_CFEND, ++ HTT_STATS_FTYPE_SGEN_AX_NDPA, ++ HTT_STATS_FTYPE_SGEN_AX_NDP, ++ HTT_STATS_FTYPE_SGEN_MU_TRIG, ++ HTT_STATS_FTYPE_SGEN_MU_BAR, ++ HTT_STATS_FTYPE_SGEN_MU_BRP, ++ HTT_STATS_FTYPE_SGEN_MU_RTS, ++ HTT_STATS_FTYPE_SGEN_MU_BSR, ++ HTT_STATS_FTYPE_SGEN_UL_BSR, ++ HTT_STATS_FTYPE_SGEN_UL_BSR_TRIGGER = HTT_STATS_FTYPE_SGEN_UL_BSR, ++ HTT_STATS_FTYPE_TIDQ_DATA_SU, ++ HTT_STATS_FTYPE_TIDQ_DATA_MU, ++ HTT_STATS_FTYPE_SGEN_UL_BSR_RESP, ++ HTT_STATS_FTYPE_SGEN_QOS_NULL, ++ HTT_STATS_FTYPE_MAX, ++}; ++ ++enum htt_stats_internal_ppdu_frametype { ++ HTT_STATS_PPDU_FTYPE_CTRL, ++ HTT_STATS_PPDU_FTYPE_DATA, ++ HTT_STATS_PPDU_FTYPE_BAR, ++ HTT_STATS_PPDU_FTYPE_MAX ++}; ++ + /* HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG Message + * + * details: +@@ -1312,6 +1351,19 @@ enum htt_ppdu_stats_gi { + #define HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M GENMASK(3, 0) + #define HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M GENMASK(11, 4) + ++enum HTT_PPDU_STATS_PPDU_TYPE { ++ HTT_PPDU_STATS_PPDU_TYPE_SU, ++ HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO, ++ HTT_PPDU_STATS_PPDU_TYPE_MU_OFDMA, ++ HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO_OFDMA, ++ HTT_PPDU_STATS_PPDU_TYPE_UL_TRIG, ++ HTT_PPDU_STATS_PPDU_TYPE_BURST_BCN, ++ HTT_PPDU_STATS_PPDU_TYPE_UL_BSR_RESP, ++ HTT_PPDU_STATS_PPDU_TYPE_UL_BSR_TRIG, ++ HTT_PPDU_STATS_PPDU_TYPE_UL_RESP, ++ HTT_PPDU_STATS_PPDU_TYPE_MAX ++}; ++ + #define HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALD_M BIT(0) + #define HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M GENMASK(5, 1) + +@@ -1339,6 +1391,12 @@ enum htt_ppdu_stats_gi { + FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M, _val) + #define HTT_USR_RATE_DCM(_val) \ + FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M, _val) ++#define HTT_USR_RATE_PPDU_TYPE(_val) \ ++ FIELD_GET(HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M, _val) ++#define HTT_USR_RATE_MU_GRPID(_val) \ ++ FIELD_GET(HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M, _val) ++#define HTT_USR_RATE_USR_POS(_val) \ ++ FIELD_GET(HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M, _val) + + #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M GENMASK(1, 0) + #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M BIT(2) +@@ -1442,6 +1500,21 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_ + u32 success_bytes; + } __packed; + ++#define HTT_PPDU_STATS_USR_CMN_FLAG_DELAYBA BIT(14) ++#define HTT_PPDU_STATS_USR_CMN_HDR_SW_PEERID GENMASK(31, 16) ++#define HTT_PPDU_STATS_USR_CMN_CTL_FRM_CTRL GENMASK(15, 0) ++ ++struct htt_ppdu_stats_user_common { ++ u8 tid_num; ++ u8 vdev_id; ++ u16 sw_peer_id; ++ u32 info; ++ u32 ctrl; ++ u32 buffer_paddr_31_0; ++ u32 buffer_paddr_39_32; ++ u32 host_opaque_cookie; ++} __packed; ++ + struct htt_ppdu_stats_usr_cmn_array { + struct htt_tlv tlv_hdr; + u32 num_ppdu_stats; +@@ -1455,14 +1528,16 @@ struct htt_ppdu_stats_usr_cmn_array { + + struct htt_ppdu_user_stats { + u16 peer_id; ++ u16 delay_ba; + u32 tlv_flags; + bool is_valid_peer_id; + struct htt_ppdu_stats_user_rate rate; + struct htt_ppdu_stats_usr_cmpltn_cmn cmpltn_cmn; + struct htt_ppdu_stats_usr_cmpltn_ack_ba_status ack_ba; ++ struct htt_ppdu_stats_user_common common; + }; + +-#define HTT_PPDU_STATS_MAX_USERS 8 ++#define HTT_PPDU_STATS_MAX_USERS 37 + #define HTT_PPDU_DESC_MAX_DEPTH 16 + + struct htt_ppdu_stats { +@@ -1471,7 +1546,7 @@ struct htt_ppdu_stats { + }; + + struct htt_ppdu_stats_info { +- u32 ppdu_id; ++ u32 tlv_bitmap, ppdu_id, frame_type, frame_ctrl, delay_ba, bar_num_users; + struct htt_ppdu_stats ppdu_stats; + struct list_head list; + }; +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -1319,9 +1319,10 @@ static int ath11k_htt_tlv_ppdu_stats_par + void *data) + { + struct htt_ppdu_stats_info *ppdu_info; +- struct htt_ppdu_user_stats *user_stats; ++ struct htt_ppdu_user_stats *user_stats = NULL; + int cur_user; + u16 peer_id; ++ u32 frame_type; + + ppdu_info = data; + +@@ -1334,6 +1335,26 @@ static int ath11k_htt_tlv_ppdu_stats_par + } + memcpy((void *)&ppdu_info->ppdu_stats.common, ptr, + sizeof(struct htt_ppdu_stats_common)); ++ frame_type = ++ FIELD_GET(HTT_PPDU_STATS_CMN_FLAGS_FRAME_TYPE_M, ++ ppdu_info->ppdu_stats.common.flags); ++ switch (frame_type) { ++ case HTT_STATS_FTYPE_TIDQ_DATA_SU: ++ case HTT_STATS_FTYPE_TIDQ_DATA_MU: ++ if (HTT_STATS_GET_FRAME_CTRL_TYPE(ppdu_info->frame_ctrl) <= HTT_STATS_FRAME_CTRL_TYPE_CTRL) ++ ppdu_info->frame_type = HTT_STATS_PPDU_FTYPE_CTRL; ++ else ++ ppdu_info->frame_type = HTT_STATS_PPDU_FTYPE_DATA; ++ break; ++ case HTT_STATS_FTYPE_SGEN_MU_BAR: ++ case HTT_STATS_FTYPE_SGEN_BAR: ++ ppdu_info->frame_type = HTT_STATS_PPDU_FTYPE_BAR; ++ break; ++ default: ++ ppdu_info->frame_type = HTT_STATS_PPDU_FTYPE_CTRL; ++ break; ++ } ++ + break; + case HTT_PPDU_STATS_TAG_USR_RATE: + if (len < sizeof(struct htt_ppdu_stats_user_rate)) { +@@ -1366,6 +1387,7 @@ static int ath11k_htt_tlv_ppdu_stats_par + peer_id); + if (cur_user < 0) + return -EINVAL; ++ ppdu_info->bar_num_users += 1; + user_stats = &ppdu_info->ppdu_stats.user_stats[cur_user]; + user_stats->peer_id = peer_id; + user_stats->is_valid_peer_id = true; +@@ -1394,44 +1416,30 @@ static int ath11k_htt_tlv_ppdu_stats_par + sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); + user_stats->tlv_flags |= BIT(tag); + break; +- } +- return 0; +-} +- +-int ath11k_dp_htt_tlv_iter(struct ath11k_base *ab, const void *ptr, size_t len, +- int (*iter)(struct ath11k_base *ar, u16 tag, u16 len, +- const void *ptr, void *data), +- void *data) +-{ +- const struct htt_tlv *tlv; +- const void *begin = ptr; +- u16 tlv_tag, tlv_len; +- int ret = -EINVAL; +- +- while (len > 0) { +- if (len < sizeof(*tlv)) { +- ath11k_err(ab, "htt tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n", +- ptr - begin, len, sizeof(*tlv)); ++ case HTT_PPDU_STATS_TAG_USR_COMMON: ++ if (len < sizeof(struct htt_ppdu_stats_user_common)) { ++ ath11k_warn(ab, "Invalid len %d for the tag 0x%x\n", ++ len, tag); + return -EINVAL; + } +- tlv = (struct htt_tlv *)ptr; +- tlv_tag = FIELD_GET(HTT_TLV_TAG, tlv->header); +- tlv_len = FIELD_GET(HTT_TLV_LEN, tlv->header); +- ptr += sizeof(*tlv); +- len -= sizeof(*tlv); +- +- if (tlv_len > len) { +- ath11k_err(ab, "htt tlv parse failure of tag %u at byte %zd (%zu bytes left, %u expected)\n", +- tlv_tag, ptr - begin, len, tlv_len); ++ peer_id = ((struct htt_ppdu_stats_user_common *)ptr)->sw_peer_id; ++ cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, ++ peer_id); ++ if (cur_user < 0) + return -EINVAL; +- } +- ret = iter(ab, tlv_tag, tlv_len, ptr, data); +- if (ret == -ENOMEM) +- return ret; +- +- ptr += tlv_len; +- len -= tlv_len; ++ user_stats = &ppdu_info->ppdu_stats.user_stats[cur_user]; ++ memcpy(&user_stats->common, ptr, ++ sizeof(struct htt_ppdu_stats_user_common)); ++ ppdu_info->frame_ctrl = FIELD_GET(HTT_PPDU_STATS_USR_CMN_CTL_FRM_CTRL, ++ user_stats->common.ctrl); ++ user_stats->delay_ba = FIELD_GET(HTT_PPDU_STATS_USR_CMN_FLAG_DELAYBA, ++ user_stats->common.info); ++ ppdu_info->delay_ba = user_stats->delay_ba; ++ break; ++ default: ++ break; + } ++ ppdu_info->tlv_bitmap |= BIT(tag); + return 0; + } + +@@ -1449,8 +1457,8 @@ ath11k_update_per_peer_tx_stats(struct a + struct htt_ppdu_stats_common *common = &ppdu_stats->common; + int ret; + u8 flags, mcs, nss, bw, sgi, dcm, rate_idx = 0; +- u32 succ_bytes = 0; +- u16 rate = 0, succ_pkts = 0; ++ u32 succ_bytes = 0, ppdu_type, mu_grpid, mu_pos; ++ u16 rate = 0, succ_pkts = 0, ru_tone, ru_start; + u32 tx_duration = 0; + u8 tid = HTT_PPDU_STATS_NON_QOS_TID; + bool is_ampdu = false; +@@ -1481,6 +1489,11 @@ ath11k_update_per_peer_tx_stats(struct a + mcs = HTT_USR_RATE_MCS(user_rate->rate_flags); + sgi = HTT_USR_RATE_GI(user_rate->rate_flags); + dcm = HTT_USR_RATE_DCM(user_rate->rate_flags); ++ ppdu_type = HTT_USR_RATE_PPDU_TYPE(user_rate->info1); ++ mu_grpid = HTT_USR_RATE_MU_GRPID(user_rate->info0); ++ mu_pos = HTT_USR_RATE_USR_POS(user_rate->info0); ++ ru_start = user_rate->ru_start; ++ ru_tone = user_rate->ru_end; + + /* Note: If host configured fixed rates and in some other special + * cases, the broadcast/management frames are sent in different rates. +@@ -1575,6 +1588,12 @@ ath11k_update_per_peer_tx_stats(struct a + peer_stats->ba_fails = + HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) + + HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags); ++ peer_stats->ppdu_type = ppdu_type; ++ peer_stats->ru_tones = ru_tone; ++ peer_stats->ru_start = ru_start; ++ peer_stats->mu_grpid = mu_grpid; ++ peer_stats->mu_pos = mu_pos; ++ peer_stats->ru_tones = arsta->txrate.he_ru_alloc; + + if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) + ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); +@@ -1627,13 +1646,87 @@ struct htt_ppdu_stats_info *ath11k_dp_ht + return ppdu_info; + } + ++void ath11k_copy_to_delay_stats(struct ath11k_peer *peer, ++ struct htt_ppdu_user_stats* usr_stats) ++{ ++ peer->ppdu_stats_delayba.reserved0 = usr_stats->rate.reserved0; ++ peer->ppdu_stats_delayba.sw_peer_id = usr_stats->rate.sw_peer_id; ++ peer->ppdu_stats_delayba.info0 = usr_stats->rate.info0; ++ peer->ppdu_stats_delayba.ru_end = usr_stats->rate.ru_end; ++ peer->ppdu_stats_delayba.ru_start = usr_stats->rate.ru_start; ++ peer->ppdu_stats_delayba.info1 = usr_stats->rate.info1; ++ peer->ppdu_stats_delayba.rate_flags = usr_stats->rate.rate_flags; ++ peer->ppdu_stats_delayba.resp_rate_flags = usr_stats->rate.resp_rate_flags; ++ ++ peer->delayba_flag = true; ++} ++ ++void ath11k_copy_to_bar(struct ath11k_peer *peer, ++ struct htt_ppdu_user_stats* usr_stats) ++{ ++ usr_stats->rate.reserved0 = peer->ppdu_stats_delayba.reserved0; ++ usr_stats->rate.sw_peer_id = peer->ppdu_stats_delayba.sw_peer_id; ++ usr_stats->rate.info0 = peer->ppdu_stats_delayba.info0; ++ usr_stats->rate.ru_end = peer->ppdu_stats_delayba.ru_end; ++ usr_stats->rate.ru_start = peer->ppdu_stats_delayba.ru_start; ++ usr_stats->rate.info1 = peer->ppdu_stats_delayba.info1; ++ usr_stats->rate.rate_flags = peer->ppdu_stats_delayba.rate_flags; ++ usr_stats->rate.resp_rate_flags = peer->ppdu_stats_delayba.resp_rate_flags; ++ ++ peer->delayba_flag = false; ++} ++ ++int ath11k_dp_htt_tlv_iter(struct ath11k_base *ab, const void *ptr, size_t len, ++ int (*iter)(struct ath11k_base *ar, u16 tag, u16 len, ++ const void *ptr, void *data), ++ void *data) ++{ ++ const struct htt_tlv *tlv; ++ const void *begin = ptr; ++ u16 tlv_tag, tlv_len; ++ int ret = -EINVAL; ++ struct htt_ppdu_stats_info * ppdu_info = NULL; ++ ++ ppdu_info = (struct htt_ppdu_stats_info *)data; ++ ppdu_info->tlv_bitmap = 0; ++ while (len > 0) { ++ if (len < sizeof(*tlv)) { ++ ath11k_err(ab, "htt tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n", ++ ptr - begin, len, sizeof(*tlv)); ++ return -EINVAL; ++ } ++ tlv = (struct htt_tlv *)ptr; ++ tlv_tag = FIELD_GET(HTT_TLV_TAG, tlv->header); ++ tlv_len = FIELD_GET(HTT_TLV_LEN, tlv->header); ++ ptr += sizeof(*tlv); ++ len -= sizeof(*tlv); ++ ++ if (tlv_len > len) { ++ ath11k_err(ab, "htt tlv parse failure of tag %hhu at byte %zd (%zu bytes left, %hhu expected)\n", ++ tlv_tag, ptr - begin, len, tlv_len); ++ return -EINVAL; ++ } ++ ++ ret = iter(ab, tlv_tag, tlv_len, ptr, ppdu_info); ++ if (ret == -ENOMEM) ++ return ret; ++ ++ ptr += tlv_len; ++ len -= tlv_len; ++ } ++ return 0; ++} ++ + static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, + struct sk_buff *skb) + { + struct ath11k_htt_ppdu_stats_msg *msg; + struct htt_ppdu_stats_info *ppdu_info; ++ struct ath11k_peer *peer = NULL; ++ struct htt_ppdu_user_stats* usr_stats = NULL; ++ u32 peer_id = 0; + struct ath11k *ar; +- int ret; ++ int ret, i; + u8 pdev_id; + u32 ppdu_id, len; + +@@ -1668,6 +1761,47 @@ static int ath11k_htt_pull_ppdu_stats(st + goto out_unlock_data; + } + ++ /* back up data rate tlv for all peers */ ++ if (ppdu_info->frame_type == HTT_STATS_PPDU_FTYPE_DATA && ++ (ppdu_info->tlv_bitmap & (1 << HTT_PPDU_STATS_TAG_USR_COMMON)) && ++ ppdu_info->delay_ba) { ++ ++ for (i = 0; i < ppdu_info->ppdu_stats.common.num_users; i++) { ++ peer_id = ppdu_info->ppdu_stats.user_stats[i].peer_id; ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_id(ab, peer_id); ++ if (!peer) { ++ spin_unlock_bh(&ab->base_lock); ++ continue; ++ } ++ ++ usr_stats = &ppdu_info->ppdu_stats.user_stats[i]; ++ if (usr_stats->delay_ba) ++ ath11k_copy_to_delay_stats(peer, usr_stats); ++ spin_unlock_bh(&ab->base_lock); ++ } ++ } ++ ++ /* restore all peers' data rate tlv to mu-bar tlv */ ++ if (ppdu_info->frame_type == HTT_STATS_PPDU_FTYPE_BAR && ++ (ppdu_info->tlv_bitmap & (1 << HTT_PPDU_STATS_TAG_USR_COMMON))) { ++ ++ for (i = 0; i < ppdu_info->bar_num_users; i++) { ++ peer_id = ppdu_info->ppdu_stats.user_stats[i].peer_id; ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_id(ab, peer_id); ++ if (!peer) { ++ spin_unlock_bh(&ab->base_lock); ++ continue; ++ } ++ ++ usr_stats = &ppdu_info->ppdu_stats.user_stats[i]; ++ if (peer->delayba_flag) ++ ath11k_copy_to_bar(peer, usr_stats); ++ spin_unlock_bh(&ab->base_lock); ++ } ++ } ++ + out_unlock_data: + spin_unlock_bh(&ar->data_lock); + +--- a/drivers/net/wireless/ath/ath11k/rx_desc.h ++++ b/drivers/net/wireless/ath/ath11k/rx_desc.h +@@ -1500,6 +1500,11 @@ struct hal_rx_desc { + } u; + } __packed; + ++#define MAX_USER_POS 8 ++#define MAX_MU_GROUP_ID 64 ++#define MAX_MU_GROUP_SHOW 16 ++#define MAX_MU_GROUP_LENGTH (6 * MAX_MU_GROUP_SHOW) ++ + #define HAL_RX_RU_ALLOC_TYPE_MAX 6 + #define RU_26 1 + #define RU_52 2 +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -7,6 +7,17 @@ + #ifndef ATH11K_PEER_H + #define ATH11K_PEER_H + ++struct ppdu_user_delayba { ++ u8 reserved0; ++ u16 sw_peer_id; ++ u32 info0; ++ u16 ru_end; ++ u16 ru_start; ++ u32 info1; ++ u32 rate_flags; ++ u32 resp_rate_flags; ++}; ++ + struct ath11k_peer { + struct list_head list; + struct ieee80211_sta *sta; +@@ -38,6 +49,8 @@ struct ath11k_peer { + u16 sec_type_grp; + bool is_authorized; + bool dp_setup_done; ++ struct ppdu_user_delayba ppdu_stats_delayba; ++ bool delayba_flag; + }; + + void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id); diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch new file mode 100644 index 00000000000000..18bc4384094eca --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch @@ -0,0 +1,612 @@ +--- a/drivers/net/wireless/ath/ath11k/Makefile ++++ b/drivers/net/wireless/ath/ath11k/Makefile +@@ -17,7 +17,8 @@ ath11k-y += core.o \ + peer.o \ + dbring.o \ + hw.o \ +- pcic.o ++ pcic.o \ ++ vendor.o + + ath11k-$(CPTCFG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o + ath11k-$(CPTCFG_NL80211_TESTMODE) += testmode.o +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -637,6 +637,16 @@ struct ath11k_per_peer_tx_stats { + #define ATH11K_FLUSH_TIMEOUT (5 * HZ) + #define ATH11K_VDEV_DELETE_TIMEOUT_HZ (5 * HZ) + ++struct ath11k_coex_info { ++ bool coex_support; ++ u32 pta_num; ++ u32 coex_mode; ++ u32 bt_active_time_slot; ++ u32 bt_priority_time_slot; ++ u32 coex_algo_type; ++ u32 pta_priority; ++}; ++ + struct ath11k { + struct ath11k_base *ab; + struct ath11k_pdev *pdev; +@@ -759,6 +769,8 @@ struct ath11k { + struct ath11k_per_peer_tx_stats cached_stats; + u32 last_ppdu_id; + u32 cached_ppdu_id; ++ ++ struct ath11k_coex_info coex; + int monitor_vdev_id; + struct completion fw_mode_reset; + u8 ftm_msgref; +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -24,6 +25,7 @@ + #include "debugfs_sta.h" + #include "hif.h" + #include "wow.h" ++#include "vendor.h" + #include "nss.h" + + #define CHAN2G(_channel, _freq, _flags) { \ +@@ -9282,6 +9284,91 @@ err_fallback: + return 0; + } + ++#define ATH11K_WLAN_PRIO_MAX 0x63 ++#define ATH11K_WLAN_PRIO_WEIGHT 0xff ++ ++int ath11k_mac_coex_config(struct ath11k *ar, struct ath11k_vif *arvif, ++ int coex, u32 wlan_prio_mask, u8 wlan_weight) ++{ ++ struct coex_config_arg coex_config; ++ int ret; ++ ++ if (ar->state != ATH11K_STATE_ON && ++ ar->state != ATH11K_STATE_RESTARTED) ++ return -ENETDOWN; ++ ++ if (coex == -1 || !(test_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags) ^ coex)) ++ goto next; ++ ++ coex_config.vdev_id = arvif->vdev_id; ++ if (coex == 1) { ++ coex_config.config_type = WMI_COEX_CONFIG_PTA_INTERFACE; ++ coex_config.pta_num = ar->coex.pta_num; ++ coex_config.coex_mode = ar->coex.coex_mode; ++ coex_config.bt_txrx_time = ar->coex.bt_active_time_slot; ++ coex_config.bt_priority_time = ar->coex.bt_priority_time_slot; ++ coex_config.pta_algorithm = ar->coex.coex_algo_type; ++ coex_config.pta_priority = ar->coex.pta_priority; ++ ret = ath11k_send_coex_config_cmd(ar, &coex_config); ++ if (ret) { ++ ath11k_warn(ar->ab, ++ "failed to set coex config vdev_id %d ret %d\n", ++ coex_config.vdev_id, ret); ++ goto out; ++ } ++ } ++ ++ memset(&coex_config, 0, sizeof(struct coex_config_arg)); ++ coex_config.vdev_id = arvif->vdev_id; ++ coex_config.config_type = WMI_COEX_CONFIG_BTC_ENABLE; ++ coex_config.coex_enable = coex; ++ ret = ath11k_send_coex_config_cmd(ar, &coex_config); ++ if (ret) { ++ ath11k_warn(ar->ab, ++ "failed to set coex config vdev_id %d ret %d\n", ++ coex_config.vdev_id, ret); ++ goto out; ++ } ++ ++ if (coex) ++ set_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags); ++ else ++ clear_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags); ++ ++next: ++ if (!wlan_prio_mask) { ++ ret = 0; ++ goto out; ++ } ++ ++ if (!(test_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags))) { ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ if (wlan_prio_mask > ATH11K_WLAN_PRIO_MAX || ++ wlan_weight > ATH11K_WLAN_PRIO_WEIGHT) { ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ memset(&coex_config, 0, sizeof(struct coex_config_arg)); ++ coex_config.vdev_id = arvif->vdev_id; ++ coex_config.config_type = WMI_COEX_CONFIG_WLAN_PKT_PRIORITY; ++ coex_config.wlan_pkt_type = wlan_prio_mask; ++ coex_config.wlan_pkt_weight = wlan_weight; ++ ret = ath11k_send_coex_config_cmd(ar, &coex_config); ++ if (ret) { ++ ath11k_warn(ar->ab, ++ "failed to set coex config vdev_id %d ret %d\n", ++ coex_config.vdev_id, ret); ++ goto out; ++ } ++ ++out: ++ return ret; ++} ++ + static const struct ieee80211_ops ath11k_ops = { + .tx = ath11k_mac_op_tx, + .wake_tx_queue = ieee80211_handle_wake_tx_queue, +@@ -9521,6 +9608,56 @@ static int ath11k_mac_setup_iface_combin + return 0; + } + ++static void ath11k_mac_fetch_coex_info(struct ath11k *ar) ++{ ++ struct ath11k_pdev_cap *cap = &ar->pdev->cap; ++ struct ath11k_base *ab = ar->ab; ++ struct device *dev = ab->dev; ++ ++ ar->coex.coex_support = false; ++ ++ if (!(cap->supported_bands & WMI_HOST_WLAN_2G_CAP)) ++ return; ++ ++ if (of_property_read_u32(dev->of_node, "qcom,pta-num", ++ &ar->coex.pta_num)) { ++ ath11k_err(ab, "No qcom,pta_num entry in dev-tree.\n"); ++ } ++ ++ if (of_property_read_u32(dev->of_node, "qcom,coex-mode", ++ &ar->coex.coex_mode)) { ++ ath11k_err(ab, "No qcom,coex_mode entry in dev-tree.\n"); ++ } ++ ++ if (of_property_read_u32(dev->of_node, "qcom,bt-active-time", ++ &ar->coex.bt_active_time_slot)) { ++ ath11k_err(ab, "No qcom,bt-active-time entry in dev-tree.\n"); ++ } ++ ++ if (of_property_read_u32(dev->of_node, "qcom,bt-priority-time", ++ &ar->coex.bt_priority_time_slot)) { ++ ath11k_err(ab, "No qcom,bt-priority-time entry in dev-tree.\n"); ++ } ++ ++ if (of_property_read_u32(dev->of_node, "qcom,coex-algo", ++ &ar->coex.coex_algo_type)) { ++ ath11k_err(ab, "No qcom,coex-algo entry in dev-tree.\n"); ++ } ++ ++ if (of_property_read_u32(dev->of_node, "qcom,pta-priority", ++ &ar->coex.pta_priority)) { ++ ath11k_err(ab, "No qcom,pta-priority entry in dev-tree.\n"); ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "coex pta_num %u coex_mode %u" ++ " bt_active_time_slot %u bt_priority_time_slot %u" ++ " coex_algorithm %u pta_priority %u\n", ar->coex.pta_num, ++ ar->coex.coex_mode, ar->coex.bt_active_time_slot, ++ ar->coex.bt_priority_time_slot, ar->coex.coex_algo_type, ++ ar->coex.pta_priority); ++ ar->coex.coex_support = true; ++} ++ + static const u8 ath11k_if_types_ext_capa[] = { + [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, + [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, +@@ -9782,6 +9919,7 @@ static int __ath11k_mac_register(struct + ar->hw->wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD; + + ath11k_reg_init(ar); ++ ath11k_vendor_register(ar); + + if (!test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags)) { + ar->hw->netdev_features = NETIF_F_HW_CSUM; +@@ -9944,6 +10082,7 @@ int ath11k_mac_allocate(struct ath11k_ba + */ + ath11k_wmi_pdev_attach(ab, i); + ++ ath11k_mac_fetch_coex_info(ar); + ar->cfg_tx_chainmask = pdev->cap.tx_chain_mask; + ar->cfg_rx_chainmask = pdev->cap.rx_chain_mask; + ar->num_tx_chains = get_num_chains(pdev->cap.tx_chain_mask); +--- a/drivers/net/wireless/ath/ath11k/mac.h ++++ b/drivers/net/wireless/ath/ath11k/mac.h +@@ -150,8 +150,9 @@ void __ath11k_mac_scan_finish(struct ath + void ath11k_mac_scan_finish(struct ath11k *ar); + + struct ath11k_vif *ath11k_mac_get_arvif(struct ath11k *ar, u32 vdev_id); +-struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab, +- u32 vdev_id); ++struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab, u32 vdev_id); ++int ath11k_mac_coex_config(struct ath11k *ar, struct ath11k_vif *arvif, ++ int coex, u32 wlan_prio_mask, u8 wlan_weight); + u8 ath11k_mac_get_target_pdev_id(struct ath11k *ar); + u8 ath11k_mac_get_target_pdev_id_from_vif(struct ath11k_vif *arvif); + struct ath11k_vif *ath11k_mac_get_vif_up(struct ath11k_base *ab); +--- /dev/null ++++ b/drivers/net/wireless/ath/ath11k/vendor.c +@@ -0,0 +1,121 @@ ++// SPDX-License-Identifier: ISC ++/* ++ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. ++ */ ++ ++#include ++#include ++#include "core.h" ++#include "vendor.h" ++#include "debug.h" ++ ++static const struct nla_policy ++ath11k_vendor_btcoex_config_policy[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX + 1] = { ++ [QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE] = { .type = NLA_U8 }, ++ [QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY] = { .type = NLA_NESTED }, ++}; ++ ++static const struct nla_policy ++ath11k_vendor_wlan_prio_policy[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX + 1] = { ++ [QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK] = { .type = NLA_U8 }, ++ [QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT] = { .type = NLA_U8 }, ++}; ++ ++static int ath11k_vendor_btcoex_configure(struct wiphy *wiphy, ++ struct wireless_dev *wdev, ++ const void *data, ++ int data_len) ++{ ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k *ar; ++ struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX + 1]; ++ struct nlattr *tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX + 1]; ++ struct nlattr *wlan_prio; ++ enum qca_wlan_priority_type wlan_prio_mask = 0; ++ int ret, coex = -1, rem_conf; ++ u8 wlan_weight = 0; ++ ++ if (!wdev) ++ return -EINVAL; ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) ++ return -EINVAL; ++ ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) ++ return -EINVAL; ++ ++ ar = arvif->ar; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ ret = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX, data, data_len, ++ ath11k_vendor_btcoex_config_policy, NULL); ++ if (ret) { ++ ath11k_warn(ar->ab, "invalid BTCOEX config policy attribute\n"); ++ goto out; ++ } ++ ++ if (!tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE] && ++ !tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY]) { ++ ath11k_warn(ar->ab, "invalid BTCOEX config attributes\n"); ++ ret = -EINVAL; ++ goto out; ++ } ++ ++ if (tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE]) { ++ coex = nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE]); ++ ret = ath11k_mac_coex_config(ar, arvif, coex, wlan_prio_mask, wlan_weight); ++ if (ret) ++ goto out; ++ } ++ if (tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY]) { ++ nla_for_each_nested(wlan_prio, ++ tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY], ++ rem_conf) { ++ ret = ++ nla_parse_nested(tb_wlan_prio, QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX, ++ wlan_prio, ath11k_vendor_wlan_prio_policy, ++ NULL); ++ if (ret) ++ goto out; ++ wlan_prio_mask = ++ nla_get_u8(tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK]); ++ if (tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT]) ++ wlan_weight = ++ nla_get_u8(tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT]); ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, ++ "BTCOEX enable %u WLAN Priority %u wlan weight %u\n", ++ coex, wlan_prio_mask, wlan_weight); ++ ++ ret = ath11k_mac_coex_config(ar, arvif, coex, wlan_prio_mask, wlan_weight); ++ if (ret) ++ goto out; ++ } ++ } ++ ++out: ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++} ++ ++static struct wiphy_vendor_command ath11k_vendor_commands[] = { ++ { ++ .info.vendor_id = QCA_NL80211_VENDOR_ID, ++ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG, ++ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | ++ WIPHY_VENDOR_CMD_NEED_RUNNING, ++ .doit = ath11k_vendor_btcoex_configure, ++ .policy = ath11k_vendor_btcoex_config_policy ++ } ++}; ++ ++int ath11k_vendor_register(struct ath11k *ar) ++{ ++ ar->hw->wiphy->vendor_commands = ath11k_vendor_commands; ++ ar->hw->wiphy->n_vendor_commands = ARRAY_SIZE(ath11k_vendor_commands); ++ ++ return 0; ++} +--- /dev/null ++++ b/drivers/net/wireless/ath/ath11k/vendor.h +@@ -0,0 +1,83 @@ ++/* SPDX-License-Identifier: ISC */ ++/* ++ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. ++ */ ++ ++#ifndef ATH11K_VENDOR_H ++#define ATH11K_VENDOR_H ++ ++#define QCA_NL80211_VENDOR_ID 0x001374 ++ ++enum qca_nl80211_vendor_subcmds { ++ /* QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG: This command is used to ++ * enable/disable BTCOEX and set priority for different type of WLAN ++ * traffic over BT low priority traffic. This uses attributes in ++ * enum qca-vendor_attr_btcoex_config. ++ */ ++ QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG = 182, ++}; ++ ++/* ++ * enum qca_wlan_priority_type - priority mask ++ * This enum defines priority mask that user can configure ++ * over BT traffic type which can be passed through ++ * QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY attribute. ++ * ++ * @QCA_WLAN_PRIORITY_BE: Bit mask for WLAN Best effort traffic ++ * @QCA_WLAN_PRIORITY_BK: Bit mask for WLAN Background traffic ++ * @QCA_WLAN_PRIORITY_VI: Bit mask for WLAN Video traffic ++ * @QCA_WLAN_PRIORITY_VO: Bit mask for WLAN Voice traffic ++ * @QCA_WLAN_PRIORITY_BEACON: Bit mask for WLAN BEACON frame ++ * @QCA_WLAN_PRIORITY_MGMT: Bit mask for WLAN Management frame ++*/ ++enum qca_wlan_priority_type { ++ QCA_WLAN_PRIORITY_BE = BIT(0), ++ QCA_WLAN_PRIORITY_BK = BIT(1), ++ QCA_WLAN_PRIORITY_VI = BIT(2), ++ QCA_WLAN_PRIORITY_VO = BIT(3), ++ QCA_WLAN_PRIORITY_BEACON = BIT(4), ++ QCA_WLAN_PRIORITY_MGMT = BIT(5), ++}; ++ ++/** ++ * enum qca_wlan_vendor_attr_wlan_prio - Used to configure ++ * WLAN priority mask and its respective weight value. ++ * @QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK - This is u8 attribute ++ * used to pass traffic type mask value see %qca_wlan_priority_type ++ * @QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT - This is u8 attribute ++ * accepts value between 0 and 255 and used to configure weight for ++ * traffic type mentioned in %QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK. ++ */ ++enum qca_wlan_vendor_attr_wlan_prio { ++ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_INVALID = 0, ++ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK = 1, ++ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT = 2, ++ ++ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_LAST, ++ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX = ++ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_LAST - 1, ++}; ++ ++ ++ ++/** ++ * enum qca_wlan_vendor_attr_btcoex_config - Used by the vendor command ++ * The use can enable/disable BTCOEX and configure WLAN priority for ++ * different traffic type over BT. ++ * QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE, enable/disable BTCOEX ++ * QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY, This is a nested ++ * attribute pass the attributes in %qca_wlan_vendor_attr_wlan_prio. ++ */ ++enum qca_wlan_vendor_attr_btcoex_config { ++ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_INVALID = 0, ++ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE = 1, ++ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY = 2, ++ ++ /* keep last */ ++ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_LAST, ++ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX = ++ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_LAST - 1 ++}; ++ ++int ath11k_vendor_register(struct ath11k *ar); ++#endif /* QCA_VENDOR_H */ +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -1697,6 +1697,71 @@ int ath11k_wmi_vdev_set_param_cmd(struct + return ret; + } + ++static void ath11k_wmi_copy_coex_config(struct ath11k *ar, struct wmi_coex_config_cmd *cmd, ++ struct coex_config_arg *coex_config) ++{ ++ if (coex_config->config_type == WMI_COEX_CONFIG_BTC_ENABLE) { ++ cmd->coex_enable = coex_config->coex_enable; ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "WMI coex config type %u vdev id %d coex_enable %u\n", ++ coex_config->config_type, coex_config->vdev_id, ++ coex_config->coex_enable); ++ } ++ ++ if (coex_config->config_type == WMI_COEX_CONFIG_WLAN_PKT_PRIORITY) { ++ cmd->wlan_pkt_type = coex_config->wlan_pkt_type; ++ cmd->wlan_pkt_weight = coex_config->wlan_pkt_weight; ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "WMI coex config type %u vdev id %d wlan pkt type 0x%x wlan pkt weight %u\n", ++ coex_config->config_type, coex_config->vdev_id, ++ coex_config->wlan_pkt_type, coex_config->wlan_pkt_weight); ++ } ++ ++ if (coex_config->config_type == WMI_COEX_CONFIG_PTA_INTERFACE) { ++ cmd->pta_num = coex_config->pta_num; ++ cmd->coex_mode = coex_config->coex_mode; ++ cmd->bt_txrx_time = coex_config->bt_txrx_time; ++ cmd->bt_priority_time = coex_config->bt_priority_time; ++ cmd->pta_algorithm = coex_config->pta_algorithm; ++ cmd->pta_priority = coex_config->pta_priority; ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "WMI coex config type %u vdev id %d pta num %u coex mode %u bt_txrx_time %u bt_priority_time %u pta alogrithm %u pta priority %u\n", ++ coex_config->config_type, coex_config->vdev_id, ++ coex_config->pta_num, coex_config->coex_mode, ++ coex_config->bt_txrx_time, coex_config->bt_priority_time, ++ coex_config->pta_algorithm, coex_config->pta_priority); ++ } ++} ++ ++int ath11k_send_coex_config_cmd(struct ath11k *ar, ++ struct coex_config_arg *coex_config) ++{ ++ struct ath11k_pdev_wmi *wmi = ar->wmi; ++ struct wmi_coex_config_cmd *cmd; ++ struct sk_buff *skb; ++ int ret; ++ ++ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); ++ if (!skb) ++ return -ENOMEM; ++ ++ cmd = (struct wmi_coex_config_cmd *)skb->data; ++ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_COEX_CONFIG_CMD) | ++ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); ++ ++ cmd->vdev_id = coex_config->vdev_id; ++ cmd->config_type = coex_config->config_type; ++ ath11k_wmi_copy_coex_config(ar, cmd, coex_config); ++ ++ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_COEX_CONFIG_CMDID); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send WMI_COEX_CONFIG_CMD cmd\n"); ++ dev_kfree_skb(skb); ++ } ++ ++ return ret; ++} ++ + int ath11k_wmi_send_stats_request_cmd(struct ath11k *ar, + struct stats_request_params *param) + { +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -5303,6 +5303,79 @@ struct wmi_wmm_params_arg { + u8 no_ack; + }; + ++enum wmi_coex_config_type { ++ WMI_COEX_CONFIG_PAGE_P2P_TDM = 1, ++ WMI_COEX_CONFIG_PAGE_STA_TDM = 2, ++ WMI_COEX_CONFIG_PAGE_SAP_TDM = 3, ++ WMI_COEX_CONFIG_DURING_WLAN_CONN = 4, ++ WMI_COEX_CONFIG_BTC_ENABLE = 5, ++ WMI_COEX_CONFIG_COEX_DBG = 6, ++ WMI_COEX_CONFIG_PAGE_P2P_STA_TDM = 7, ++ WMI_COEX_CONFIG_INQUIRY_P2P_TDM = 8, ++ WMI_COEX_CONFIG_INQUIRY_STA_TDM = 9, ++ WMI_COEX_CONFIG_INQUIRY_SAP_TDM = 10, ++ WMI_COEX_CONFIG_INQUIRY_P2P_STA_TDM = 11, ++ WMI_COEX_CONFIG_TX_POWER = 12, ++ WMI_COEX_CONFIG_PTA_CONFIG = 13, ++ WMI_COEX_CONFIG_AP_TDM = 14, ++ WMI_COEX_CONFIG_WLAN_SCAN_PRIORITY = 15, ++ WMI_COEX_CONFIG_WLAN_PKT_PRIORITY = 16, ++ WMI_COEX_CONFIG_PTA_INTERFACE = 17, ++}; ++ ++struct coex_config_arg { ++ u32 vdev_id; ++ u32 config_type; ++ union { ++ struct { ++ u32 coex_enable; ++ }; ++ ++ struct { ++ u32 pta_num; ++ u32 coex_mode; ++ u32 bt_txrx_time; ++ u32 bt_priority_time; ++ u32 pta_algorithm; ++ u32 pta_priority; ++ }; ++ ++ struct { ++ u32 wlan_pkt_type; ++ u32 wlan_pkt_type_continued; ++ u32 wlan_pkt_weight; ++ u32 bt_pkt_weight; ++ }; ++ }; ++}; ++ ++struct wmi_coex_config_cmd { ++ u32 tlv_header; ++ u32 vdev_id; ++ u32 config_type; ++ union { ++ struct { ++ u32 coex_enable; ++ } __packed; ++ ++ struct { ++ u32 pta_num; ++ u32 coex_mode; ++ u32 bt_txrx_time; ++ u32 bt_priority_time; ++ u32 pta_algorithm; ++ u32 pta_priority; ++ } __packed; ++ ++ struct { ++ u32 wlan_pkt_type; ++ u32 wlan_pkt_type_continued; ++ u32 wlan_pkt_weight; ++ u32 bt_pkt_weight; ++ } __packed; ++ } __packed; ++} __packed; ++ + struct wmi_vdev_set_wmm_params_cmd { + u32 tlv_header; + u32 vdev_id; +@@ -6520,6 +6593,8 @@ int ath11k_wmi_pdev_non_srg_obss_color_e + u32 *bitmap); + int ath11k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath11k *ar, + u32 *bitmap); ++int ath11k_send_coex_config_cmd(struct ath11k *ar, ++ struct coex_config_arg *coex_config); + int ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id, + u8 bss_color, u32 period, + bool enable); diff --git a/package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch b/package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch new file mode 100644 index 00000000000000..6f5fffe596172b --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch @@ -0,0 +1,784 @@ +From 83c2a029a5300b2aaeaa9855011668b407d142c2 Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Fri, 20 Nov 2020 11:41:11 +0530 +Subject: [PATCH 2/3] ath11k: add support for ext vdev in NSS for AP_VLAN vif + handling + +- add ext vdev NSS API callbacks required for AP_VLAN vif +- invoke ieee80211_rx_nss_notify_4addr on WDS Rx path for 4addr frames until + ext vdev interface is UP +- do ext vdev down of all AP_VLAN vifs upon vdev down of associated AP vif + +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/nss.c | 452 ++++++++++++++++++++++++++++++++-- + drivers/net/wireless/ath/ath11k/nss.h | 57 +++++ + 2 files changed, 495 insertions(+), 14 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -366,6 +366,10 @@ void ath11k_nss_wifili_event_receive(str + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer del event received %d response %d error %d\n", + msg_type, response, error); + break; ++ case NSS_WIFILI_PEER_4ADDR_EVENT_MSG: ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili peer 4addr event received %d response %d error %d\n", ++ msg_type, response, error); ++ break; + default: + ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); + break; +@@ -599,8 +603,9 @@ static int ath11k_nss_undecap_nwifi(stru + return 0; + } + +-static void ath11k_nss_wds_type_rx(struct ath11k *ar, u8* src_mac, u8 is_sa_valid, +- u8 addr4_valid, u16 peer_id) ++static void ath11k_nss_wds_type_rx(struct ath11k *ar, struct net_device *dev, ++ u8* src_mac, u8 is_sa_valid, u8 addr4_valid, ++ u16 peer_id, bool *drop) + { + struct ath11k_base *ab = ar->ab; + struct ath11k_ast_entry *ast_entry = NULL; +@@ -622,19 +627,22 @@ static void ath11k_nss_wds_type_rx(struc + if (!is_sa_valid) { + ath11k_peer_add_ast(ar, ta_peer, src_mac, + ATH11K_AST_TYPE_WDS); +- ath11k_nss_add_wds_peer(ar, ta_peer, +- src_mac, ATH11K_AST_TYPE_WDS); ++ if (!ta_peer->nss.ext_vdev_up) ++ ieee80211_rx_nss_notify_4addr(dev, ta_peer->addr); + } else { + if (!ast_entry) { + ath11k_peer_add_ast(ar, ta_peer, src_mac, + ATH11K_AST_TYPE_WDS); +- ath11k_nss_add_wds_peer(ar, ta_peer, src_mac, +- ATH11K_AST_TYPE_WDS); +- } else { ++ if (!ta_peer->nss.ext_vdev_up) ++ ieee80211_rx_nss_notify_4addr(dev, ta_peer->addr); ++ } else if (ast_entry->type == ATH11K_AST_TYPE_WDS) { + ath11k_peer_update_ast(ar, ta_peer, ast_entry); + ath11k_nss_update_wds_peer(ar, ta_peer, src_mac); + } + } ++ ++ if (!ta_peer->nss.ext_vdev_up) ++ *drop = true; + } + + spin_unlock_bh(&ab->base_lock); +@@ -678,7 +686,8 @@ static void ath11k_nss_mec_handler(struc + + static void ath11k_nss_vdev_spl_receive_ext_wdsdata(struct ath11k_vif *arvif, + struct sk_buff *skb, +- struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata) ++ struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata, ++ bool *drop) + { + struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; +@@ -699,8 +708,8 @@ static void ath11k_nss_vdev_spl_receive_ + + switch (wds_type) { + case NSS_WIFI_VDEV_WDS_TYPE_RX: +- ath11k_nss_wds_type_rx(ar, src_mac, is_sa_valid, +- addr4_valid, peer_id); ++ ath11k_nss_wds_type_rx(ar, skb->dev, src_mac, is_sa_valid, ++ addr4_valid, peer_id, drop); + break; + case NSS_WIFI_VDEV_WDS_TYPE_MEC: + ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); +@@ -767,6 +776,7 @@ ath11k_nss_vdev_special_data_receive(str + struct ieee80211_vif *vif; + struct ath11k_vif *arvif; + struct ath11k_base *ab; ++ bool drop = false; + bool eth_decap = false; + int data_offs = 0; + int ret = 0; +@@ -822,10 +832,11 @@ ath11k_nss_vdev_special_data_receive(str + NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_WDS_LEARN) { + wds_metadata = &wifi_metadata->metadata.wds_metadata; + ath11k_nss_vdev_spl_receive_ext_wdsdata(arvif, skb, +- wds_metadata); ++ wds_metadata, &drop); + } + +- ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++ if (!drop) ++ ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); + } + + static void +@@ -888,6 +899,68 @@ ath11k_nss_vdev_data_receive(struct net_ + ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); + } + ++static void ++ath11k_nss_ext_vdev_special_data_receive(struct net_device *dev, ++ struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ dev_kfree_skb_any(skb); ++} ++ ++static void ++ath11k_nss_ext_vdev_data_receive(struct net_device *dev, struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ struct wireless_dev *wdev; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k_base *ab; ++ bool eth_decap = false; ++ int data_offs = 0; ++ int ret; ++ ++ if (!dev) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ wdev = dev->ieee80211_ptr; ++ if (!wdev) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ab = arvif->ar->ab; ++ ++ skb->dev = dev; ++ ++ /* log the original skb received from nss */ ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss ext : ", ++ skb->data, skb->len); ++ ++ ret = ath11k_nss_undecap(arvif, skb, &data_offs, ð_decap); ++ if (ret) { ++ ath11k_warn(ab, "error in nss ext rx undecap, type %d err %d\n", ++ arvif->nss.decap, ret); ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++} ++ + int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb) + { + struct ath11k *ar = arvif->ar; +@@ -910,10 +983,16 @@ int ath11k_nss_tx(struct ath11k_vif *arv + ath11k_nss_tx_encap_nwifi(skb); + + send: +- ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, "", "nss tx msdu: ", +- skb->data, skb->len); +- +- status = nss_wifi_vdev_tx_buf(arvif->ar->nss.ctx, skb, arvif->nss.if_num); ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, ++ arvif->vif->type == NL80211_IFTYPE_AP_VLAN ? "ext vdev" : "", ++ "nss tx msdu: ", skb->data, skb->len); ++ ++ if (arvif->vif->type == NL80211_IFTYPE_AP_VLAN) ++ status = nss_wifi_ext_vdev_tx_buf(arvif->nss.ctx, skb, ++ arvif->nss.if_num); ++ else ++ status = nss_wifi_vdev_tx_buf(arvif->ar->nss.ctx, skb, ++ arvif->nss.if_num); + + if (status != NSS_TX_SUCCESS) { + ath11k_dbg(ar->ab, (ATH11K_DBG_NSS | ATH11K_DBG_DP_TX), +@@ -1254,6 +1333,7 @@ int ath11k_nss_vdev_up(struct ath11k_vif + struct nss_wifi_vdev_msg *vdev_msg = NULL; + struct nss_wifi_vdev_enable_msg *vdev_en; + struct ath11k *ar = arvif->ar; ++ struct ath11k_vif *ap_vlan_arvif, *tmp; + nss_tx_status_t status; + int ret = 0; + +@@ -1285,6 +1365,12 @@ int ath11k_nss_vdev_up(struct ath11k_vif + } + + ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev up tx msg success\n"); ++ ++ if (arvif->vif->type == NL80211_IFTYPE_AP) ++ list_for_each_entry_safe(ap_vlan_arvif, tmp, &arvif->ap_vlan_arvifs, ++ list) ++ if (ap_vlan_arvif->nss.added) ++ ath11k_nss_ext_vdev_up(ap_vlan_arvif); + free: + kfree(vdev_msg); + return ret; +@@ -1294,6 +1380,7 @@ int ath11k_nss_vdev_down(struct ath11k_v + { + struct nss_wifi_vdev_msg *vdev_msg = NULL; + struct ath11k *ar = arvif->ar; ++ struct ath11k_vif *ap_vlan_arvif, *tmp; + nss_tx_status_t status; + int ret = 0; + +@@ -1321,11 +1408,362 @@ int ath11k_nss_vdev_down(struct ath11k_v + } + + ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev down tx msg success\n"); ++ ++ if (arvif->vif->type == NL80211_IFTYPE_AP) ++ list_for_each_entry_safe(ap_vlan_arvif, tmp, &arvif->ap_vlan_arvifs, ++ list) ++ ath11k_nss_ext_vdev_down(ap_vlan_arvif); + free: + kfree(vdev_msg); + return ret; + } + ++int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, ++ u8 *wds_addr, u32 wds_peer_id) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct nss_wifi_ext_vdev_msg *ext_vdev_msg = NULL; ++ struct nss_wifi_ext_vdev_wds_msg *cfg_wds_msg = NULL; ++ nss_tx_status_t status; ++ int ret; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return -EINVAL; ++ ++ ext_vdev_msg = kzalloc(sizeof(struct nss_wifi_ext_vdev_msg), GFP_ATOMIC); ++ if (!ext_vdev_msg) ++ return -ENOMEM; ++ ++ cfg_wds_msg = &ext_vdev_msg->msg.wmsg; ++ cfg_wds_msg->wds_peer_id = wds_peer_id; ++ ether_addr_copy(cfg_wds_msg->mac_addr, wds_addr); ++ ++ nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_EXT_VDEV_MSG_CONFIGURE_WDS, ++ sizeof(struct nss_wifi_ext_vdev_wds_msg), ++ NULL, arvif); ++ ++ status = nss_wifi_ext_vdev_tx_msg_sync(arvif->nss.ctx, ext_vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "failed to configure wds peer nss_err:%d\n", ++ status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = 0; ++free: ++ kfree(ext_vdev_msg); ++ ++ return ret; ++} ++ ++int ath11k_nss_ext_vdev_wds_4addr_allow(struct ath11k_vif *arvif, ++ u32 wds_peer_id) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct nss_wifili_peer_wds_4addr_allow_msg *cfg_4addr_msg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ struct nss_wifili_msg *wlmsg; ++ nss_tx_status_t status; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return -EINVAL; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ cfg_4addr_msg = &wlmsg->msg.wpswm; ++ cfg_4addr_msg->peer_id = wds_peer_id; ++ cfg_4addr_msg->if_num = arvif->nss.if_num; ++ cfg_4addr_msg->enable = true; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ nss_cmn_msg_init(&wlmsg->cm, ar->ab->nss.if_num, ++ NSS_WIFILI_PEER_4ADDR_EVENT_MSG, ++ sizeof(struct nss_wifili_peer_wds_4addr_allow_msg), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss wds 4addr allow if_num %d, peer_id %d cfg fail: %d\n", ++ arvif->nss.if_num, wds_peer_id, status); ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_WDS, "nss wds 4addr allow if_num %d, peer_id %d cfg complete\n", ++ arvif->nss.if_num, wds_peer_id); ++free: ++ kfree(wlmsg); ++ return status; ++} ++ ++int ath11k_nss_ext_vdev_configure(struct ath11k_vif *arvif) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_vif *ap_vif = arvif->nss.ap_vif; ++ struct nss_wifi_ext_vdev_msg *ext_vdev_msg = NULL; ++ struct nss_wifi_ext_vdev_configure_if_msg *ext_vdev_cfg = NULL; ++ nss_tx_status_t status; ++ int ret; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return -EINVAL; ++ ++ ext_vdev_msg = kzalloc(sizeof(struct nss_wifi_ext_vdev_msg), GFP_ATOMIC); ++ if (!ext_vdev_msg) ++ return -ENOMEM; ++ ++ ext_vdev_cfg = &ext_vdev_msg->msg.cmsg; ++ ++ ext_vdev_cfg->radio_ifnum = ar->nss.if_num; ++ ext_vdev_cfg->pvap_ifnum = ap_vif->nss.if_num; ++ ++ ether_addr_copy(ext_vdev_cfg->mac_addr, arvif->vif->addr); ++ ++ nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_EXT_VDEV_MSG_CONFIGURE_IF, ++ sizeof(struct nss_wifi_ext_vdev_configure_if_msg), ++ NULL, arvif); ++ ++ status = nss_wifi_ext_vdev_tx_msg_sync(arvif->ar->nss.ctx, ext_vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "failed to configure nss ext vdev nss_err:%d\n", ++ status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = 0; ++free: ++ kfree(ext_vdev_msg); ++ ++ return ret; ++} ++ ++void ath11k_nss_ext_vdev_unregister(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return; ++ ++ nss_wifi_ext_vdev_unregister_if(arvif->nss.if_num); ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "unregistered nss vdev %d \n", ++ arvif->nss.if_num); ++} ++ ++static int ath11k_nss_ext_vdev_register(struct ath11k_vif *arvif, ++ struct net_device *netdev) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ nss_tx_status_t status; ++ enum nss_dynamic_interface_type di_type; ++ u32 features = 0; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN || arvif->nss.ctx) ++ return -EINVAL; ++ ++ di_type = NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS; ++ ++ arvif->nss.ctx = nss_wifi_ext_vdev_register_if(arvif->nss.if_num, ++ ath11k_nss_ext_vdev_data_receive, ++ ath11k_nss_ext_vdev_special_data_receive, ++ NULL, netdev, features, ++ arvif); ++ ++ if (!arvif->nss.ctx) { ++ ath11k_warn(ab, "failed to register nss vdev if_num %d nss_err:%d\n", ++ arvif->nss.if_num, status); ++ return -EINVAL; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "registered nss ext vdev if_num %d\n", ++ arvif->nss.if_num); ++ return 0; ++} ++ ++static void ath11k_nss_ext_vdev_free(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ nss_tx_status_t status; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return; ++ ++ status = nss_dynamic_interface_dealloc_node( ++ arvif->nss.if_num, ++ NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS); ++ if (status != NSS_TX_SUCCESS) ++ ath11k_warn(ab, "failed to free nss ext vdev err:%d\n", ++ status); ++ else ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss ext vdev interface deallocated\n"); ++} ++ ++static int ath11k_nss_ext_vdev_alloc(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ enum nss_dynamic_interface_type di_type; ++ int if_num; ++ ++ di_type = NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS; ++ ++ if_num = nss_dynamic_interface_alloc_node(di_type); ++ if (if_num < 0) { ++ ath11k_warn(ab, "failed to allocate nss ext vdev\n"); ++ return -EINVAL; ++ } ++ ++ arvif->nss.if_num = if_num; ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss ext vdev interface %pM allocated if_num %d\n", ++ arvif->vif->addr, if_num); ++ ++ return 0; ++} ++ ++int ath11k_nss_ext_vdev_create(struct ath11k_vif *arvif) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ struct wireless_dev *wdev; ++ int ret; ++ ++ if (!ab->nss.enabled) ++ return 0; ++ ++ if (arvif->nss.created) ++ return 0; ++ ++ wdev = ieee80211_vif_to_wdev_relaxed(arvif->vif); ++ if (!wdev) { ++ ath11k_warn(ab, "ath11k_nss: ext wdev is null\n"); ++ return -EINVAL; ++ } ++ ++ if (!wdev->netdev) { ++ ath11k_warn(ab, "ath11k_nss: ext netdev is null\n"); ++ return -EINVAL; ++ } ++ ++ ret = ath11k_nss_ext_vdev_alloc(arvif); ++ if (ret) ++ return ret; ++ ++ ret = ath11k_nss_ext_vdev_register(arvif, wdev->netdev); ++ if (ret) ++ goto free_ext_vdev; ++ ++ arvif->nss.created = true; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, ++ "nss ext vdev interface created ctx %pK, ifnum %d\n", ++ arvif->nss.ctx, arvif->nss.if_num); ++ ++ return ret; ++ ++free_ext_vdev: ++ ath11k_nss_ext_vdev_free(arvif); ++ ++ return ret; ++} ++ ++void ath11k_nss_ext_vdev_delete(struct ath11k_vif *arvif) ++{ ++ if (!arvif->ar->ab->nss.enabled) ++ return; ++ ++ if (!arvif->nss.created) ++ return; ++ ++ ath11k_dbg(arvif->ar->ab, ATH11K_DBG_NSS_WDS, ++ "nss ext vdev interface delete ctx %pK, ifnum %d\n", ++ arvif->nss.ctx, arvif->nss.if_num); ++ ++ ath11k_nss_ext_vdev_unregister(arvif); ++ ++ ath11k_nss_ext_vdev_free(arvif); ++ ++ arvif->nss.created = false; ++} ++ ++int ath11k_nss_ext_vdev_up(struct ath11k_vif *arvif) ++{ ++ struct nss_wifi_ext_vdev_msg *ext_vdev_msg = NULL; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return -EINVAL; ++ ++ if (arvif->nss.ext_vdev_up) ++ return 0; ++ ++ ext_vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); ++ if (!ext_vdev_msg) ++ return -ENOMEM; ++ ++ nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, NSS_IF_OPEN, ++ sizeof(struct nss_if_open), NULL, arvif); ++ ++ status = nss_wifi_ext_vdev_tx_msg_sync(arvif->nss.ctx, ext_vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss ext vdev up tx msg error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_WDS, "nss ext vdev up tx msg success\n"); ++ arvif->nss.ext_vdev_up = true; ++free: ++ kfree(ext_vdev_msg); ++ return ret; ++} ++ ++int ath11k_nss_ext_vdev_down(struct ath11k_vif *arvif) ++{ ++ struct nss_wifi_ext_vdev_msg *ext_vdev_msg = NULL; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return -EINVAL; ++ ++ ext_vdev_msg = kzalloc(sizeof(struct nss_wifi_ext_vdev_msg), GFP_ATOMIC); ++ if (!ext_vdev_msg) ++ return -ENOMEM; ++ ++ nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, NSS_IF_CLOSE, ++ sizeof(struct nss_if_close), NULL, arvif); ++ ++ status = nss_wifi_ext_vdev_tx_msg_sync(arvif->nss.ctx, ext_vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss ext vdev down tx msg error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_WDS, "nss ext vdev down tx msg success\n"); ++ ++ arvif->nss.ext_vdev_up = false; ++free: ++ kfree(ext_vdev_msg); ++ return ret; ++} ++ + /*----------------------------Peer Setup/Config -----------------------------*/ + + int ath11k_nss_set_peer_sec_type(struct ath11k *ar, +@@ -1419,22 +1857,22 @@ free: + return status; + } + +-void ath11k_nss_update_sta_stats(struct station_info *sinfo, +- struct ieee80211_sta *sta, +- struct ath11k_sta *arsta) ++void ath11k_nss_update_sta_stats(struct ath11k_vif *arvif, ++ struct station_info *sinfo, ++ struct ieee80211_sta *sta) + { + struct sta_info *stainfo; + struct ath11k_peer *peer; +- struct ath11k *ar = arsta->arvif->ar; ++ struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; + +- if (!ab->nss.enabled) ++ if (!ab->nss.stats_enabled) + return; + + spin_lock_bh(&ab->base_lock); +- peer = ath11k_peer_find_by_addr(arsta->arvif->ar->ab, sta->addr); ++ peer = ath11k_peer_find_by_addr(ab, sta->addr); + if (!peer) { +- ath11k_dbg(ab, ATH11K_DBG_NSS, "unable to find peer %pM\n", ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "sta stats: unable to find peer %pM\n", + sta->addr); + goto exit; + } +@@ -1506,13 +1944,13 @@ void ath11k_nss_update_sta_rxrate(struct + struct ath11k_peer *peer, + struct hal_rx_user_status *user_stats) + { +- struct ath11k_sta *arsta = (struct ath11k_sta *)peer->sta->drv_priv; + u16 ath11k_hal_rx_legacy_rates[] = + { 10, 20, 55, 60, 90, 110, 120, 180, 240, 360, 480, 540 }; + u16 rate = 0; + u32 preamble_type; + u8 mcs, nss; +- struct ath11k *ar = arsta->arvif->ar; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(peer->vif); ++ struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; + + if (!ab->nss.enabled) +@@ -1816,8 +2254,8 @@ int ath11k_nss_add_wds_peer(struct ath11 + } + + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, +- "nss add wds peer success peer mac:%pM dest mac:%pM peer_id:%d\n", +- wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); ++ "nss add wds peer success pdev:%d peer mac:%pM dest mac:%pM peer_id:%d\n", ++ wds_peer_msg->pdev_id, wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); + + msg_free: + kfree(wlmsg); +@@ -1862,8 +2300,8 @@ int ath11k_nss_update_wds_peer(struct at + } + + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, +- "nss update wds peer success peer mac:%pM dest mac:%pM peer_id:%d\n", +- wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); ++ "nss update wds peer success pdev:%d peer mac:%pM dest mac:%pM peer_id:%d\n", ++ wds_peer_msg->pdev_id, wds_peer_msg->peer_mac, wds_peer_msg->dest_mac, wds_peer_msg->peer_id); + + msg_free: + kfree(wlmsg); +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -154,6 +154,7 @@ enum ath11k_nss_peer_sec_type { + struct ath11k_nss_peer { + uint32_t *vaddr; + dma_addr_t paddr; ++ bool ext_vdev_up; + struct peer_stats *nss_stats; + struct completion complete; + }; +@@ -168,6 +169,16 @@ struct arvif_nss { + int encap; + /* Keep the copy of decap type for nss */ + int decap; ++ /* AP_VLAN vif context obtained on ext vdev register */ ++ void* ctx; ++ /* Parent AP vif stored in case of AP_VLAN vif */ ++ struct ath11k_vif *ap_vif; ++ /* Flag to notify if vlan arvif object is added to arvif list*/ ++ bool added; ++ /* Flag to notify if ext vdev is up/down */ ++ bool ext_vdev_up; ++ /* WDS cfg should be done only once for ext vdev */ ++ bool wds_cfg_done; + bool created; + }; + +@@ -223,11 +234,21 @@ int ath11k_nss_map_wds_peer(struct ath11 + u8 *dest_mac, enum ath11k_ast_entry_type type); + int ath11k_nss_del_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, + u8 *dest_mac); ++int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, ++ u8 *wds_addr, u32 wds_peer_id); ++int ath11k_nss_ext_vdev_wds_4addr_allow(struct ath11k_vif *arvif, ++ u32 wds_peer_id); ++int ath11k_nss_ext_vdev_create(struct ath11k_vif *arvif); ++int ath11k_nss_ext_vdev_configure(struct ath11k_vif *arvif); ++void ath11k_nss_ext_vdev_unregister(struct ath11k_vif *arvif); ++int ath11k_nss_ext_vdev_up(struct ath11k_vif *arvif); ++int ath11k_nss_ext_vdev_down(struct ath11k_vif *arvif); ++void ath11k_nss_ext_vdev_delete(struct ath11k_vif *arvif); + int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, + struct ieee80211_key_conf *key_conf); +-void ath11k_nss_update_sta_stats(struct station_info *sinfo, +- struct ieee80211_sta *sta, +- struct ath11k_sta *arsta); ++void ath11k_nss_update_sta_stats(struct ath11k_vif *arvif, ++ struct station_info *sinfo, ++ struct ieee80211_sta *sta); + void ath11k_nss_update_sta_rxrate(struct hal_rx_mon_ppdu_info *ppdu_info, + struct ath11k_peer *peer, + struct hal_rx_user_status *user_stats); +@@ -260,9 +281,9 @@ static inline void ath11k_nss_vdev_delet + { + } + +-static inline void ath11k_nss_update_sta_stats(struct station_info *sinfo, +- struct ieee80211_sta *sta, +- struct ath11k_sta *arsta) ++static inline void ath11k_nss_update_sta_stats(struct ath11k_vif *arvif, ++ struct station_info *sinfo, ++ struct ieee80211_sta *sta) + { + return; + } +@@ -319,6 +340,43 @@ static inline int ath11k_nss_peer_create + return 0; + } + ++static inline int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, ++ u8 *wds_addr, u32 wds_peer_id) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_ext_vdev_wds_4addr_allow(struct ath11k_vif *arvif, ++ u32 wds_peer_id) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_ext_vdev_create(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_ext_vdev_configure(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ ++static inline void ath11k_nss_ext_vdev_unregister(struct ath11k_vif *arvif) ++{ ++ return; ++} ++ ++static inline int ath11k_nss_ext_vdev_up(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_ext_vdev_down(struct ath11k_vif *arvif) ++{ ++ return 0; ++} ++ + static inline void ath11k_nss_peer_stats_enable(struct ath11k *ar) + { + return; +@@ -340,6 +398,11 @@ static inline int ath11k_nss_setup(struc + return 0; + } + ++static inline void ath11k_nss_ext_vdev_delete(struct ath11k_vif *arvif) ++{ ++ return; ++} ++ + static inline int ath11k_nss_teardown(struct ath11k_base *ab) + { + return 0; diff --git a/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch new file mode 100644 index 00000000000000..86714fea844e81 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -0,0 +1,575 @@ +From 730f568af3fac2f31467ea0ff374ea442ddc379f Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Fri, 20 Nov 2020 11:57:36 +0530 +Subject: [PATCH 3/3] ath11k: add AP_VLAN vif support for WDS offload in NSS + offload + +- AP_VLAN vif support is required for WDS offload to interop with mac80211 + based 4addr STA and also for multicast-to-unicast conversion of 3addr + multicast to 4addr frames for each associated 4addr STA. + +- For each associated 4addr STA, corresponding AP_VLAN vif having same MAC + address as AP vif is created from hostapd upon 4addr rx_notify from NSS RX. + +- AP_VLAN vif support is added to add/remove interface mac80211 callbacks only + for NSS ext vdev handling and vdev_id, FW vdev operations are not needed. + +- mac80211 advertises AP_VLAN vif for sta_use_4addr drv callback in case of + NSS offload. Extending ath11k_mac_op_sta_use_4addr to invoke ext vdev NSS + APIs required for AP WDS handling. + +- Maintain AP_VLAN vif(s) list on corresponding AP vif and vice versa required + for ext vdev operations (VDEV_DOWN, DELETE, CONFIGURE_IF). + +- NSS require ENABLE_NAWDS and WDS_BACKHAUL to be configured for AP_VLAN + support via ext vdev. + +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/mac.c | 156 +++++++++++++++++++++++++++++++-- + drivers/net/wireless/ath/ath11k/wmi.h | 2 + + 3 files changed, 154 insertions(+), 5 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -385,9 +385,8 @@ struct ath11k_vif { + #endif /* CPTCFG_ATH11K_DEBUGFS */ + + struct ath11k_mgmt_frame_stats mgmt_stats; +-#ifdef CPTCFG_ATH11K_NSS_SUPPORT + struct arvif_nss nss; +-#endif ++ struct list_head ap_vlan_arvifs; + }; + + struct ath11k_vif_iter { +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -4739,6 +4739,11 @@ static void ath11k_sta_rc_update_wk(stru + arvif = arsta->arvif; + ar = arvif->ar; + ++ if (ar->ab->nss.enabled && ++ arsta->arvif->vif->type == NL80211_IFTYPE_AP_VLAN && ++ arsta->use_4addr_set) ++ arvif = arvif->nss.ap_vif; ++ + if (WARN_ON(ath11k_mac_vif_chan(arvif->vif, &def))) + return; + +@@ -4910,17 +4915,28 @@ err_rc_bw_changed: + static void ath11k_sta_set_4addr_wk(struct work_struct *wk) + { + struct ath11k *ar; +- struct ath11k_vif *arvif; ++ struct ath11k_vif *arvif, *ap_vlan_arvif = NULL; ++ struct ieee80211_vif *vif; + struct ath11k_sta *arsta; + struct ieee80211_sta *sta; ++ struct ath11k_base *ab; ++ struct ath11k_peer *wds_peer; ++ u8 wds_addr[ETH_ALEN]; ++ u32 wds_peer_id; + int ret = 0; + + arsta = container_of(wk, struct ath11k_sta, set_4addr_wk); + sta = container_of((void *)arsta, struct ieee80211_sta, drv_priv); + arvif = arsta->arvif; + ar = arvif->ar; ++ ab = ar->ab; + +- ath11k_dbg(ar->ab, ATH11K_DBG_MAC, ++ if (ab->nss.enabled && arvif->vif->type == NL80211_IFTYPE_AP_VLAN) { ++ ap_vlan_arvif = arsta->arvif; ++ arvif = ap_vlan_arvif->nss.ap_vif; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_MAC, + "setting USE_4ADDR for peer %pM\n", sta->addr); + + ret = ath11k_wmi_set_peer_param(ar, sta->addr, +@@ -4928,8 +4944,93 @@ static void ath11k_sta_set_4addr_wk(stru + WMI_PEER_USE_4ADDR, 1); + + if (ret) +- ath11k_warn(ar->ab, "failed to set peer %pM 4addr capability: %d\n", ++ ath11k_warn(ab, "failed to set 4addr for STA %pM: %d\n", + sta->addr, ret); ++ ++ if (!ab->nss.enabled || !ap_vlan_arvif) ++ return; ++ ++ vif = ap_vlan_arvif->vif; ++ ++ spin_lock_bh(&ab->base_lock); ++ wds_peer = ath11k_peer_find_by_addr(ab, sta->addr); ++ if (!wds_peer) { ++ spin_unlock_bh(&ab->base_lock); ++ ath11k_warn(ab, "mac sta use 4addr failed to find peer %pM\n", ++ sta->addr); ++ return; ++ } ++ ++ wds_peer_id = wds_peer->peer_id; ++ ether_addr_copy(wds_addr, wds_peer->addr); ++ spin_unlock_bh(&ab->base_lock); ++ ++ /* skip NSS ext vdev registration if already done */ ++ if (ap_vlan_arvif->nss.wds_cfg_done) ++ goto skip_nss_ext; ++ ++ ret = ath11k_nss_ext_vdev_configure(ap_vlan_arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to nss cfg ext vdev %pM: %d\n", ++ vif->addr, ret); ++ goto ext_vdev_delete; ++ } ++ ++ ap_vlan_arvif->nss.wds_cfg_done = true; ++ ++skip_nss_ext: ++ ++ ret = ath11k_nss_ext_vdev_cfg_wds_peer(ap_vlan_arvif, ++ wds_addr, wds_peer_id); ++ if (ret) { ++ ath11k_warn(ab, "failed to nss cfg_wds_peer %pM on %pM: %d\n", ++ sta->addr, vif->addr, ret); ++ goto ext_vdev_delete; ++ } ++ ++ ret = ath11k_nss_ext_vdev_wds_4addr_allow(ap_vlan_arvif, ++ wds_peer_id); ++ if (ret) { ++ ath11k_warn(ab, "failed to nss 4addr allow %pM: %d\n", ++ vif->addr, ret); ++ goto ext_vdev_delete; ++ } ++ ++ ret = ath11k_nss_ext_vdev_up(ap_vlan_arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to nss ext vdev up %pM: %d\n", ++ vif->addr, ret); ++ goto ext_vdev_delete; ++ } ++ ++ spin_lock_bh(&ab->base_lock); ++ wds_peer->nss.ext_vdev_up = true; ++ wds_peer->nss.ext_vif = vif; ++ spin_unlock_bh(&ab->base_lock); ++ ++ /* NAWDS and CFG_WDS_BACKHAUL configs should be done on corresponding ++ * AP vif of the AP_VLAN vif ++ */ ++ ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, ++ WMI_VDEV_PARAM_AP_ENABLE_NAWDS, ++ MIN_IDLE_INACTIVE_TIME_SECS); ++ if (ret) { ++ ath11k_warn(ab, "failed to set vdev %i nawds parameters: %d\n", ++ arvif->vdev_id, ret); ++ goto ext_vdev_down; ++ } ++ ++ return; ++ ++ext_vdev_down: ++ ath11k_nss_ext_vdev_down(ap_vlan_arvif); ++ext_vdev_delete: ++ ath11k_nss_ext_vdev_delete(ap_vlan_arvif); ++ ++ spin_lock_bh(&ar->data_lock); ++ list_del(&ap_vlan_arvif->list); ++ spin_unlock_bh(&ar->data_lock); ++ ap_vlan_arvif->nss.added = false; + } + + static int ath11k_mac_inc_num_stations(struct ath11k_vif *arvif, +@@ -5278,9 +5379,32 @@ static void ath11k_mac_op_sta_set_4addr( + struct ieee80211_sta *sta, bool enabled) + { + struct ath11k *ar = hw->priv; ++ struct ath11k_vif *arvif = (void *)vif->drv_priv; + struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); ++ struct ath11k_vif *ap_arvif = NULL; + + if (enabled && !arsta->use_4addr_set) { ++ if (ar->ab->nss.enabled && vif->type == NL80211_IFTYPE_AP_VLAN) { ++ /* 4addr STA is initially associated to AP vif, change ++ * it to AP_VLAN vif and add AP_VLAN vif to AP vifs list ++ */ ++ ap_arvif = arsta->arvif; ++ arvif->nss.ap_vif = ap_arvif; ++ ++ /* Check if the vlan arvif object was already present in the ++ * list. We can receive this path multiple times for the same ++ * vlan vif for different sta objects ++ */ ++ if (!arvif->nss.added) { ++ spin_lock_bh(&ar->data_lock); ++ list_add(&arvif->list, &ap_arvif->ap_vlan_arvifs); ++ spin_unlock_bh(&ar->data_lock); ++ arvif->nss.added = true; ++ } ++ ++ arsta->arvif = arvif; ++ } ++ + ieee80211_queue_work(ar->hw, &arsta->set_4addr_wk); + arsta->use_4addr_set = true; + } +@@ -6673,6 +6797,9 @@ static int ath11k_mac_op_update_vif_offl + u32 param_id, param_value; + int ret; + ++ if (ab->nss.enabled && vif->type == NL80211_IFTYPE_AP_VLAN) ++ return 0; ++ + param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; + if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET || + (vif->type != NL80211_IFTYPE_STATION && +@@ -6893,7 +7020,8 @@ static int ath11k_mac_op_add_interface(s + goto err; + } + +- if (ar->num_created_vdevs > (TARGET_NUM_VDEVS(ab) - 1)) { ++ if (vif->type != NL80211_IFTYPE_AP_VLAN && ++ ar->num_created_vdevs > (TARGET_NUM_VDEVS(ab) - 1)) { + ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n", + ar->num_created_vdevs, TARGET_NUM_VDEVS(ab)); + ret = -EBUSY; +@@ -6913,6 +7041,28 @@ static int ath11k_mac_op_add_interface(s + arvif->vif = vif; + + INIT_LIST_HEAD(&arvif->list); ++ ++ if ((vif->type == NL80211_IFTYPE_AP_VLAN || ++ vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { ++ if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && ++ ieee80211_set_hw_80211_encap(vif, true)) { ++ vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; ++ arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; ++ arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; ++ } ++ ++ if (vif->type == NL80211_IFTYPE_AP_VLAN) { ++ ret = ath11k_nss_ext_vdev_create(arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to create ext vdev %pM: %d\n", ++ vif->addr, ret); ++ goto err; ++ } ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++ } ++ } ++ + INIT_DELAYED_WORK(&arvif->connection_loss_work, + ath11k_mac_vif_sta_connection_loss_work); + +@@ -6942,6 +7092,7 @@ static int ath11k_mac_op_add_interface(s + fallthrough; + case NL80211_IFTYPE_AP: + arvif->vdev_type = WMI_VDEV_TYPE_AP; ++ INIT_LIST_HEAD(&arvif->ap_vlan_arvifs); + break; + case NL80211_IFTYPE_MONITOR: + arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; +@@ -7164,13 +7315,30 @@ static void ath11k_mac_op_remove_interfa + struct ath11k *ar = hw->priv; + struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + struct ath11k_base *ab = ar->ab; ++ struct ath11k_vif *ap_vlan_arvif, *tmp; + int ret; + int i; + +- cancel_delayed_work_sync(&arvif->connection_loss_work); +- + mutex_lock(&ar->conf_mutex); + ++ if (vif->type == NL80211_IFTYPE_AP_VLAN) { ++ ath11k_nss_ext_vdev_delete(arvif); ++ ++ /* In case the vlan vif never got added into the ap vlan arvifs ++ * list, avoid removal here ++ */ ++ if (!arvif->nss.added) ++ goto unlock; ++ ++ spin_lock_bh(&ar->data_lock); ++ list_del(&arvif->list); ++ spin_unlock_bh(&ar->data_lock); ++ ++ goto unlock; ++ } ++ ++ cancel_delayed_work_sync(&arvif->connection_loss_work); ++ + ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n", + arvif->vdev_id); + +@@ -7187,6 +7355,14 @@ static void ath11k_mac_op_remove_interfa + if (ret) + ath11k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", + arvif->vdev_id, ret); ++ ++ list_for_each_entry_safe(ap_vlan_arvif, tmp, &arvif->ap_vlan_arvifs, ++ list) { ++ ath11k_nss_ext_vdev_delete(ap_vlan_arvif); ++ spin_lock_bh(&ar->data_lock); ++ list_del(&ap_vlan_arvif->list); ++ spin_unlock_bh(&ar->data_lock); ++ } + } + + ret = ath11k_mac_vdev_delete(ar, arvif); +@@ -7230,8 +7406,7 @@ err_vdev_del: + + ath11k_debugfs_remove_interface(arvif); + +- /* TODO: recal traffic pause state based on the available vdevs */ +- ++unlock: + mutex_unlock(&ar->conf_mutex); + } + +@@ -7291,16 +7466,17 @@ static int ath11k_mac_op_ampdu_action(st + struct ieee80211_ampdu_params *params) + { + struct ath11k *ar = hw->priv; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + int ret = -EINVAL; + + mutex_lock(&ar->conf_mutex); + + switch (params->action) { + case IEEE80211_AMPDU_RX_START: +- ret = ath11k_dp_rx_ampdu_start(ar, params); ++ ret = ath11k_dp_rx_ampdu_start(arvif, params); + break; + case IEEE80211_AMPDU_RX_STOP: +- ret = ath11k_dp_rx_ampdu_stop(ar, params); ++ ret = ath11k_dp_rx_ampdu_stop(arvif, params); + break; + case IEEE80211_AMPDU_TX_START: + case IEEE80211_AMPDU_TX_STOP_CONT: +@@ -8823,6 +8999,7 @@ static void ath11k_mac_op_sta_statistics + { + struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); + struct ath11k *ar = arsta->arvif->ar; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + s8 signal; + bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT, + ar->ab->wmi_ab.svc_map); +@@ -8879,7 +9056,8 @@ static void ath11k_mac_op_sta_statistics + ATH11K_DEFAULT_NOISE_FLOOR; + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); + +- ath11k_nss_update_sta_stats(sinfo, sta, arsta); ++ if (arvif->ar->ab->nss.enabled) ++ ath11k_nss_update_sta_stats(arvif, sinfo, sta); + } + + #if IS_ENABLED(CONFIG_IPV6) +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -5069,6 +5069,8 @@ enum wmi_vdev_subtype { + WMI_VDEV_SUBTYPE_MESH_11S, + }; + ++#define MIN_IDLE_INACTIVE_TIME_SECS 256 ++ + enum wmi_sta_powersave_param { + WMI_STA_PS_PARAM_RX_WAKE_POLICY = 0, + WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD = 1, +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -1162,12 +1162,13 @@ err_mem_free: + return ret; + } + +-int ath11k_dp_rx_ampdu_start(struct ath11k *ar, ++int ath11k_dp_rx_ampdu_start(struct ath11k_vif *arvif, + struct ieee80211_ampdu_params *params) + { ++ struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; + struct ath11k_sta *arsta = ath11k_sta_to_arsta(params->sta); +- int vdev_id = arsta->arvif->vdev_id; ++ int vdev_id = arvif->vdev_id; + int ret; + + ret = ath11k_peer_rx_tid_setup(ar, params->sta->addr, vdev_id, +@@ -1179,13 +1180,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 + return ret; + } + +-int ath11k_dp_rx_ampdu_stop(struct ath11k *ar, ++int ath11k_dp_rx_ampdu_stop(struct ath11k_vif *arvif, + struct ieee80211_ampdu_params *params) + { ++ struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; + struct ath11k_peer *peer; +- struct ath11k_sta *arsta = ath11k_sta_to_arsta(params->sta); +- int vdev_id = arsta->arvif->vdev_id; ++ int vdev_id = arvif->vdev_id; + dma_addr_t paddr; + bool active; + int ret; +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -69,9 +69,9 @@ struct ath11k_dp_rfc1042_hdr { + __be16 snap_type; + } __packed; + +-int ath11k_dp_rx_ampdu_start(struct ath11k *ar, ++int ath11k_dp_rx_ampdu_start(struct ath11k_vif *arvif, + struct ieee80211_ampdu_params *params); +-int ath11k_dp_rx_ampdu_stop(struct ath11k *ar, ++int ath11k_dp_rx_ampdu_stop(struct ath11k_vif *arvif, + struct ieee80211_ampdu_params *params); + int ath11k_dp_peer_rx_pn_replay_config(struct ath11k_vif *arvif, + const u8 *peer_addr, +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -126,6 +126,24 @@ struct ath11k_ast_entry *ath11k_peer_ast + return NULL; + } + ++struct ath11k_ast_entry *ath11k_peer_ast_find_by_pdev_idx(struct ath11k *ar, ++ u8* addr) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_ast_entry *ast_entry; ++ struct ath11k_peer *peer; ++ ++ lockdep_assert_held(&ab->base_lock); ++ ++ list_for_each_entry(peer, &ab->peers, list) ++ list_for_each_entry(ast_entry, &peer->ast_entry_list, ase_list) ++ if (ether_addr_equal(ast_entry->addr, addr) && ++ ast_entry->pdev_idx == ar->pdev_idx) ++ return ast_entry; ++ ++ return NULL; ++} ++ + void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk) + { + struct ath11k_ast_entry *ast_entry = container_of(wk, +@@ -186,8 +204,8 @@ int ath11k_peer_add_ast(struct ath11k *a + } + + if (type != ATH11K_AST_TYPE_STATIC) { +- ast_entry = ath11k_peer_ast_find_by_addr(ab, mac_addr); +- if (ast_entry) { ++ ast_entry = ath11k_peer_ast_find_by_pdev_idx(ar, mac_addr); ++ if (ast_entry && ast_entry->type != ATH11K_AST_TYPE_STATIC) { + ath11k_dbg(ab, ATH11K_DBG_MAC, "ast_entry %pM already present on peer %pM\n", + mac_addr, ast_entry->peer->addr); + return 0; +@@ -284,7 +302,6 @@ int ath11k_peer_update_ast(struct ath11k + ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_update_ast old peer %pM new peer %pM ast_entry %pM\n", + old_peer->addr, peer->addr, ast_entry->addr); + +- flush_work(&ast_entry->wds_wmi_wk); + ast_entry->action = ATH11K_WDS_WMI_UPDATE; + ieee80211_queue_work(ar->hw, &ast_entry->wds_wmi_wk); + +@@ -329,8 +346,8 @@ void ath11k_peer_del_ast(struct ath11k * + + peer = ast_entry->peer; + +- ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_del_ast peer %pM ast_entry %pM\n", +- peer->addr, ast_entry->addr); ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_del_ast pdev:%d peer %pM ast_entry %pM\n", ++ ar->pdev->pdev_id, peer->addr, ast_entry->addr); + + if (ast_entry->is_mapped) + list_del(&ast_entry->ase_list); +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -34,6 +34,7 @@ enum ath11k_ast_entry_type { + enum ath11k_wds_wmi_action { + ATH11K_WDS_WMI_ADD = 1, + ATH11K_WDS_WMI_UPDATE, ++ ATH11K_WDS_WMI_REMOVE, + + ATH11K_WDS_WMI_MAX + }; +@@ -126,6 +127,8 @@ int ath11k_peer_rhash_delete(struct ath1 + #ifdef CPTCFG_ATH11K_NSS_SUPPORT + struct ath11k_ast_entry *ath11k_peer_ast_find_by_addr(struct ath11k_base *ab, + u8* addr); ++struct ath11k_ast_entry *ath11k_peer_ast_find_by_pdev_idx(struct ath11k *ar, ++ u8* addr); + int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, + u8* mac_addr, enum ath11k_ast_entry_type type); + int ath11k_peer_update_ast(struct ath11k *ar, struct ath11k_peer *peer, +@@ -145,6 +148,12 @@ static inline struct ath11k_ast_entry *a + { + return NULL; + } ++ ++static inline struct ath11k_ast_entry *ath11k_peer_ast_find_by_pdev_idx(struct ath11k *ar, ++ u8* addr) ++{ ++ return NULL; ++} + + static inline int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, + u8* mac_addr, enum ath11k_ast_entry_type type) +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -164,7 +164,10 @@ static void ath11k_nss_get_peer_stats(st + + peer->nss.nss_stats->tx_failed += tx_dropped; + +- ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->vif, tx_bytes, tx_packets); ++ if (peer->nss.ext_vdev_up) ++ ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->nss.ext_vif, tx_bytes, tx_packets); ++ else ++ ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->vif, tx_bytes, tx_packets); + + rx_packets = pstats->rx.rx_recvd; + peer->nss.nss_stats->rx_packets += rx_packets; +@@ -174,7 +177,10 @@ static void ath11k_nss_get_peer_stats(st + pstats->rx.err.decrypt_err; + peer->nss.nss_stats->rx_dropped += rx_dropped; + +- ATH11K_NSS_TXRX_NETDEV_STATS(rx, peer->vif, rx_bytes, rx_packets); ++ if (peer->nss.ext_vdev_up) ++ ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->nss.ext_vif, tx_bytes, tx_packets); ++ else ++ ATH11K_NSS_TXRX_NETDEV_STATS(rx, peer->vif, rx_bytes, rx_packets); + + spin_unlock_bh(&ab->base_lock); + rcu_read_unlock(); +@@ -1040,6 +1046,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 + case ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD: + cmd = NSS_WIFI_VDEV_DECAP_TYPE_CMD; + break; ++ case ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD: ++ cmd = NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD; ++ break; + default: + return -EINVAL; + } +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -109,6 +109,7 @@ enum ath11k_nss_vdev_cmd { + ATH11K_NSS_WIFI_VDEV_SECURITY_TYPE_CMD, + ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, + ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, ++ ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD, + }; + + #define WIFILI_SCHEME_ID_INVALID -1 +@@ -155,6 +156,7 @@ struct ath11k_nss_peer { + uint32_t *vaddr; + dma_addr_t paddr; + bool ext_vdev_up; ++ struct ieee80211_vif *ext_vif; + struct peer_stats *nss_stats; + struct completion complete; + }; diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch b/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch new file mode 100644 index 00000000000000..c97edcd605d7f1 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch @@ -0,0 +1,213 @@ +From 6f51430f2614ca2fb2a1e45cc81464c6d7a29f03 Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Fri, 8 Jan 2021 00:34:09 +0530 +Subject: [PATCH 2/3] ath11k: extend ext vdev in NSS for dynamic VLAN handling + +- add ext vdev NSS API callbacks required for dynamic AP_VLAN vif +- existing ext vdev NSS API callbacks are used for both WDS and + dynamic VLAN di_types. + +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/nss.c | 101 +++++++++++++++++++++++++++++++--- + drivers/net/wireless/ath/ath11k/nss.h | 17 ++++++ + 2 files changed, 109 insertions(+), 9 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -1483,14 +1483,11 @@ static int ath11k_nss_ext_vdev_register( + struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; + nss_tx_status_t status; +- enum nss_dynamic_interface_type di_type; + u32 features = 0; + + if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN || arvif->nss.ctx) + return -EINVAL; + +- di_type = NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS; +- + arvif->nss.ctx = nss_wifi_ext_vdev_register_if(arvif->nss.if_num, + ath11k_nss_ext_vdev_data_receive, + ath11k_nss_ext_vdev_special_data_receive, +@@ -1518,7 +1515,8 @@ static void ath11k_nss_ext_vdev_free(str + + status = nss_dynamic_interface_dealloc_node( + arvif->nss.if_num, +- NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS); ++ arvif->nss.di_type); ++ + if (status != NSS_TX_SUCCESS) + ath11k_warn(ab, "failed to free nss ext vdev err:%d\n", + status); +@@ -1527,14 +1525,19 @@ static void ath11k_nss_ext_vdev_free(str + "nss ext vdev interface deallocated\n"); + } + +-static int ath11k_nss_ext_vdev_alloc(struct ath11k_vif *arvif) ++static int ath11k_nss_ext_vdev_alloc(struct ath11k_vif *arvif, ++ struct wireless_dev *wdev) + { + struct ath11k_base *ab = arvif->ar->ab; + enum nss_dynamic_interface_type di_type; + int if_num; + +- di_type = NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS; ++ if (wdev->use_4addr) ++ di_type = NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_WDS; ++ else ++ di_type = NSS_DYNAMIC_INTERFACE_TYPE_WIFI_EXT_VDEV_VLAN; + ++ arvif->nss.di_type = di_type; + if_num = nss_dynamic_interface_alloc_node(di_type); + if (if_num < 0) { + ath11k_warn(ab, "failed to allocate nss ext vdev\n"); +@@ -1543,8 +1546,8 @@ static int ath11k_nss_ext_vdev_alloc(str + + arvif->nss.if_num = if_num; + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, +- "nss ext vdev interface %pM allocated if_num %d\n", +- arvif->vif->addr, if_num); ++ "nss ext vdev interface %pM di_type %d allocated if_num %d\n", ++ arvif->vif->addr, di_type, if_num); + + return 0; + } +@@ -1573,7 +1576,7 @@ int ath11k_nss_ext_vdev_create(struct at + return -EINVAL; + } + +- ret = ath11k_nss_ext_vdev_alloc(arvif); ++ ret = ath11k_nss_ext_vdev_alloc(arvif, wdev); + if (ret) + return ret; + +@@ -1684,6 +1687,86 @@ free: + return ret; + } + ++int ath11k_nss_ext_vdev_cfg_dyn_vlan(struct ath11k_vif *arvif, u16 vlan_id) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct nss_wifi_ext_vdev_msg *ext_vdev_msg = NULL; ++ struct nss_wifi_ext_vdev_vlan_msg *cfg_dyn_vlan_msg = NULL; ++ nss_tx_status_t status; ++ int ret; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN) ++ return -EINVAL; ++ ++ ext_vdev_msg = kzalloc(sizeof(struct nss_wifi_ext_vdev_msg), GFP_ATOMIC); ++ if (!ext_vdev_msg) ++ return -ENOMEM; ++ ++ cfg_dyn_vlan_msg = &ext_vdev_msg->msg.vmsg; ++ cfg_dyn_vlan_msg->vlan_id = vlan_id; ++ ++ nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_EXT_VDEV_MSG_CONFIGURE_VLAN, ++ sizeof(struct nss_wifi_ext_vdev_vlan_msg), ++ NULL, arvif); ++ ++ status = nss_wifi_ext_vdev_tx_msg_sync(arvif->nss.ctx, ext_vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "failed to configure dyn vlan nss_err:%d\n", ++ status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = 0; ++free: ++ kfree(ext_vdev_msg); ++ ++ return ret; ++} ++ ++int ath11k_nss_dyn_vlan_set_group_key(struct ath11k_vif *arvif, u16 vlan_id, ++ u16 group_key) ++{ ++ struct nss_wifi_vdev_msg *vdev_msg = NULL; ++ struct nss_wifi_vdev_set_vlan_group_key *vlan_group_key; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); ++ if (!vdev_msg) ++ return -ENOMEM; ++ ++ vlan_group_key = &vdev_msg->msg.vlan_group_key; ++ vlan_group_key->vlan_id = vlan_id; ++ vlan_group_key->group_key = group_key; ++ ++ nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, ++ NSS_WIFI_VDEV_SET_GROUP_KEY, ++ sizeof(struct nss_wifi_vdev_set_vlan_group_key), ++ NULL, NULL); ++ ++ status = nss_wifi_vdev_tx_msg(ar->nss.ctx, vdev_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss vdev set vlan group key error %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_WDS, "nss vdev set vlan group key success\n"); ++free: ++ kfree(vdev_msg); ++ return ret; ++ ++} ++ + /*----------------------------Peer Setup/Config -----------------------------*/ + + int ath11k_nss_set_peer_sec_type(struct ath11k *ar, +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -150,6 +150,10 @@ struct arvif_nss { + bool added; + /* Flag to notify if ext vdev is up/down */ + bool ext_vdev_up; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ /* Keep the copy of di_type for nss */ ++ enum nss_dynamic_interface_type di_type; ++#endif + /* WDS cfg should be done only once for ext vdev */ + bool wds_cfg_done; + bool created; +@@ -215,6 +217,9 @@ void ath11k_nss_ext_vdev_unregister(stru + int ath11k_nss_ext_vdev_up(struct ath11k_vif *arvif); + int ath11k_nss_ext_vdev_down(struct ath11k_vif *arvif); + void ath11k_nss_ext_vdev_delete(struct ath11k_vif *arvif); ++int ath11k_nss_ext_vdev_cfg_dyn_vlan(struct ath11k_vif *arvif, u16 vlan_id); ++int ath11k_nss_dyn_vlan_set_group_key(struct ath11k_vif *arvif, u16 vlan_id, ++ u16 group_key); + int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, + struct ieee80211_key_conf *key_conf); + void ath11k_nss_update_sta_stats(struct ath11k_vif *arvif, +@@ -343,6 +348,18 @@ static inline int ath11k_nss_ext_vdev_do + { + return 0; + } ++ ++static inline int ath11k_nss_ext_vdev_cfg_dyn_vlan(struct ath11k_vif *arvif, ++ u16 vlan_id) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_dyn_vlan_set_group_key(struct ath11k_vif *arvif, ++ u16 vlan_id, u16 group_key) ++{ ++ return 0; ++} + + static inline void ath11k_nss_peer_stats_enable(struct ath11k *ar) + { diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch b/package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch new file mode 100644 index 00000000000000..2361523d394ac4 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch @@ -0,0 +1,557 @@ +From da432fe6dda831c867416d338def3e277c989287 Mon Sep 17 00:00:00 2001 +From: Sathishkumar Muruganandam +Date: Fri, 8 Jan 2021 00:39:47 +0530 +Subject: [PATCH 3/3] ath11k: add dynamic VLAN support in NSS offload + +Driver should advertise NL80211_EXT_FEATURE_VLAN_OFFLOAD to enable +vlan offload in hostapd. + +Group Key for multiple vlan interfaces are configured with the help +of group key index as NSS uses this index to get the corresponding +group key during transmission. + +Each dynamic AP-VLAN interface choose unique group key index which +will be sent to NSS along with VLAN ID for dynamic VLAN ext vdev +configuration. + +ath11k_mac_op_set_key() does the NSS ext vdev config upon receiving +VLAN ID on group key. + +ath11k_mac_op_sta_state() does the STA assignment from AP vif to +AP_VLAN vif in NSS after mac80211. + +Currently, the firmware supports upto 128 group keys for an AP +interface. The multiple group key support can be enabled during +resource config. + +Co-Developed-by: Seevalamuthu Mariappan +Signed-off-by: Seevalamuthu Mariappan +Signed-off-by: Sathishkumar Muruganandam +--- + drivers/net/wireless/ath/ath11k/core.h | 8 ++ + drivers/net/wireless/ath/ath11k/mac.c | 237 ++++++++++++++++++++++++++++++--- + drivers/net/wireless/ath/ath11k/wmi.c | 5 + + drivers/net/wireless/ath/ath11k/wmi.h | 2 + + 4 files changed, 233 insertions(+), 19 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -98,6 +98,11 @@ enum ath11k_crypt_mode { + ATH11K_CRYPT_MODE_SW, + }; + ++#define ATH11K_GROUP_KEYS_NUM_MAX 128 ++#define ATH11K_FREE_GROUP_IDX_MAP_BITS (BITS_PER_BYTE * (sizeof(long))) ++#define ATH11K_FREE_GROUP_IDX_MAP_MAX (ATH11K_GROUP_KEYS_NUM_MAX / \ ++ ATH11K_FREE_GROUP_IDX_MAP_BITS) ++ + static inline enum wme_ac ath11k_tid_to_ac(u32 tid) + { + return (((tid == 0) || (tid == 3)) ? WME_AC_BE : +@@ -325,6 +330,20 @@ struct ath11k_mgmt_frame_stats { + u32 tx_compl_fail[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; + }; + ++/** ++ *struct ath11k_dyn_vlan_cfg - dynamic vlan config state info container. ++ * will be used during ieee80211_reconfig ++ * nss offload case ++ *@arvif: driver's data for the corresponding AP_VLAN ieee80211_vif ++ *@sta: ieee80211_sta which is getting associated to AP_VLAN ++ *@cfg_list: list to hold all associated sta's state ++ */ ++struct ath11k_dyn_vlan_cfg { ++ struct ath11k_vif *arvif; ++ struct ieee80211_sta *sta; ++ struct list_head cfg_list; ++}; ++ + struct ath11k_vif { + u32 vdev_id; + enum wmi_vdev_type vdev_type; +@@ -387,6 +406,11 @@ struct ath11k_vif { + struct ath11k_mgmt_frame_stats mgmt_stats; + struct arvif_nss nss; + struct list_head ap_vlan_arvifs; ++ /* list required by Dynamic VLAN during fw_recovery */ ++ struct list_head dyn_vlan_cfg; ++ /* VLAN keyidx map required for Dynamic VLAN */ ++ u16 *vlan_keyid_map; ++ DECLARE_BITMAP(free_groupidx_map, ATH11K_GROUP_KEYS_NUM_MAX); + }; + + struct ath11k_vif_iter { +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -348,6 +348,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n + return ret; + } + ++static int ath11k_mac_cfg_dyn_vlan(struct ath11k_base *ab, ++ struct ath11k_vif *ap_vlan_arvif, ++ struct ieee80211_sta *sta); ++ + u8 ath11k_mac_bw_to_mac80211_bw(u8 bw) + { + u8 ret = 0; +@@ -720,6 +724,33 @@ u8 ath11k_mac_get_target_pdev_id(struct + return ar->ab->target_pdev_ids[0].pdev_id; + } + ++struct ath11k_vif *ath11k_mac_get_ap_arvif_by_addr(struct ath11k_base *ab, ++ const u8 *addr) ++{ ++ int i; ++ struct ath11k_pdev *pdev; ++ struct ath11k_vif *arvif; ++ struct ath11k *ar; ++ ++ for (i = 0; i < ab->num_radios; i++) { ++ pdev = rcu_dereference(ab->pdevs_active[i]); ++ if (pdev && pdev->ar) { ++ ar = pdev->ar; ++ ++ spin_lock_bh(&ar->data_lock); ++ list_for_each_entry(arvif, &ar->arvifs, list) { ++ if (arvif->vif->type == NL80211_IFTYPE_AP && ++ ether_addr_equal(arvif->vif->addr, addr)) { ++ spin_unlock_bh(&ar->data_lock); ++ return arvif; ++ } ++ } ++ spin_unlock_bh(&ar->data_lock); ++ } ++ } ++ return NULL; ++} ++ + static void ath11k_pdev_caps_update(struct ath11k *ar) + { + struct ath11k_base *ab = ar->ab; +@@ -4173,6 +4204,9 @@ static int ath11k_install_key(struct ath + if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) + return 0; + ++ if (key->vlan_id) ++ arg.group_key_idx = key->hw_key_idx; ++ + if (cmd == DISABLE_KEY) { + arg.key_cipher = WMI_CIPHER_NONE; + arg.key_data = NULL; +@@ -4262,15 +4296,40 @@ static int ath11k_clear_peer_keys(struct + return first_errno; + } + ++static int ath11k_get_vlan_groupkey_index(struct ath11k_vif *arvif, ++ struct ieee80211_key_conf *key) ++{ ++ struct ath11k *ar = arvif->ar; ++ int map_idx = 0; ++ int free_bit; ++ ++ for (map_idx = 0; map_idx < ATH11K_FREE_GROUP_IDX_MAP_MAX; map_idx++) ++ if (arvif->free_groupidx_map[map_idx] != 0) ++ break; ++ ++ if (map_idx == ATH11K_FREE_GROUP_IDX_MAP_MAX) ++ return -ENOSPC; ++ ++ spin_lock_bh(&ar->data_lock); ++ /* select the first free key index */ ++ free_bit = __ffs64(arvif->free_groupidx_map[map_idx]); ++ key->hw_key_idx = (map_idx * ATH11K_FREE_GROUP_IDX_MAP_BITS) + free_bit; ++ /* clear the selected bit from free index map */ ++ clear_bit(key->hw_key_idx, arvif->free_groupidx_map); ++ spin_unlock_bh(&ar->data_lock); ++ ++ return 0; ++} ++ + static int ath11k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, + struct ieee80211_vif *vif, struct ieee80211_sta *sta, + struct ieee80211_key_conf *key) + { + struct ath11k *ar = hw->priv; + struct ath11k_base *ab = ar->ab; +- struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ struct ath11k_vif *arvif, *ap_vlan_arvif = NULL; + struct ath11k_peer *peer; +- struct ath11k_sta *arsta; ++ struct ath11k_sta *arsta = NULL; + const u8 *peer_addr; + int ret = 0; + u32 flags = 0; +@@ -4288,17 +4347,38 @@ static int ath11k_mac_op_set_key(struct + if (key->keyidx > WMI_MAX_KEY_INDEX) + return -ENOSPC; + +- mutex_lock(&ar->conf_mutex); ++ arvif = ath11k_vif_to_arvif(vif); + +- if (sta) ++ mutex_lock(&ar->conf_mutex); ++ if (sta) { + peer_addr = sta->addr; +- else if (arvif->vdev_type == WMI_VDEV_TYPE_STA) ++ arsta = (struct ath11k_sta *)sta->drv_priv; ++ } else if (arvif->vdev_type == WMI_VDEV_TYPE_STA) { + peer_addr = vif->bss_conf.bssid; +- else ++ } else { + peer_addr = vif->addr; ++ } + + key->hw_key_idx = key->keyidx; + ++ if (ab->nss.enabled && vif->type == NL80211_IFTYPE_AP_VLAN) { ++ ap_vlan_arvif = arvif; ++ if (arsta) { ++ ap_vlan_arvif->nss.ap_vif = arsta->arvif; ++ arvif = arsta->arvif; ++ } else { ++ rcu_read_lock(); ++ arvif = ath11k_mac_get_ap_arvif_by_addr(ab, peer_addr); ++ if (!arvif) { ++ rcu_read_unlock(); ++ ret = -EINVAL; ++ goto exit; ++ } ++ ap_vlan_arvif->nss.ap_vif = arvif; ++ rcu_read_unlock(); ++ } ++ } ++ + /* the peer should not disappear in mid-way (unless FW goes awry) since + * we already hold conf_mutex. we just make sure its there now. + */ +@@ -4343,6 +4423,74 @@ static int ath11k_mac_op_set_key(struct + goto exit; + } + ++ /* VLAN ID is updated non-zero only for AP_VLAN vif */ ++ if (key->vlan_id && !(key->flags & IEEE80211_KEY_FLAG_PAIRWISE) && ++ ap_vlan_arvif) { ++ if (arvif->vlan_keyid_map) ++ key->hw_key_idx = arvif->vlan_keyid_map[key->vlan_id]; ++ else ++ key->hw_key_idx = 0; ++ switch (cmd) { ++ case SET_KEY: ++ /* If the group key idx is already available, ++ * no need to find the free index again. ++ * This happens during GTK rekey. It uses ++ * the same index after rekey also. ++ */ ++ if (!key->hw_key_idx) ++ ret = ath11k_get_vlan_groupkey_index(arvif, key); ++ break; ++ case DISABLE_KEY: ++ /* If the group key idx is already 0, ++ * no need of freeing the index. ++ */ ++ if (key->hw_key_idx) { ++ spin_lock_bh(&ar->data_lock); ++ /* make the group index as available */ ++ set_bit(key->hw_key_idx, arvif->free_groupidx_map); ++ spin_unlock_bh(&ar->data_lock); ++ } ++ break; ++ default: ++ ret = -EINVAL; ++ } ++ ++ if (ret) { ++ ath11k_warn(ab, "failed to set group key index for vlan %u : %d\n", ++ key->vlan_id, ret); ++ goto exit; ++ } ++ ++ ret = ath11k_nss_ext_vdev_configure(ap_vlan_arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to nss cfg ext vdev %pM: %d\n", ++ ap_vlan_arvif->vif->addr, ret); ++ goto exit; ++ } ++ ++ ret = ath11k_nss_ext_vdev_cfg_dyn_vlan(ap_vlan_arvif, ++ key->vlan_id); ++ if (ret) { ++ ath11k_warn(ab, "failed to cfg dynamic vlan %d\n", ret); ++ goto exit; ++ } ++ ++ ret = ath11k_nss_dyn_vlan_set_group_key(ap_vlan_arvif->nss.ap_vif, ++ key->vlan_id, ++ key->hw_key_idx); ++ if (ret) { ++ ath11k_warn(ab, "failed to set dynamic vlan group key %d\n", ++ ret); ++ goto exit; ++ } ++ ++ ret = ath11k_nss_ext_vdev_up(ap_vlan_arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to set dyn vlan UP %d\n", ret); ++ goto exit; ++ } ++ } ++ + spin_lock_bh(&ab->base_lock); + peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr); + +@@ -4365,6 +4513,27 @@ static int ath11k_mac_op_set_key(struct + goto unlock; + } + ++ spin_unlock_bh(&ar->ab->base_lock); ++ if (ap_vlan_arvif && ar->state == ATH11K_STATE_RESTARTED) { ++ /* Keys are getting installed during ieee80211_reconfig(). Configuring ++ * dynamic vlan is pending and the state is saved in the ap_vlan ++ * arvif dyn_vlan_cfg list. We will configure it now since nss peer is authorised */ ++ struct ath11k_dyn_vlan_cfg *dyn_vlan_cfg, *tmp; ++ ++ list_for_each_entry_safe(dyn_vlan_cfg, tmp, &ap_vlan_arvif->dyn_vlan_cfg, cfg_list) { ++ struct ieee80211_sta *vlan_sta = dyn_vlan_cfg->sta; ++ ++ ret = ath11k_mac_cfg_dyn_vlan(ar->ab, ap_vlan_arvif, vlan_sta); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to cfg dyn vlan for peer %pM: %d\n", ++ vlan_sta->addr, ret); ++ /* Configuration is used. Free up space */ ++ list_del(&dyn_vlan_cfg->cfg_list); ++ kfree(dyn_vlan_cfg); ++ } ++ } ++ ++ spin_lock_bh(&ar->ab->base_lock); + if (peer && cmd == SET_KEY) { + peer->keys[key->keyidx] = key; + if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) { +@@ -4374,18 +4543,23 @@ static int ath11k_mac_op_set_key(struct + peer->mcast_keyidx = key->keyidx; + peer->sec_type_grp = ath11k_dp_tx_get_encrypt_type(key->cipher); + } ++ /* storing group key idx which will be used during rekey */ ++ if (key->vlan_id) ++ arvif->vlan_keyid_map[key->vlan_id] = key->hw_key_idx; + } else if (peer && cmd == DISABLE_KEY) { + peer->keys[key->keyidx] = NULL; + if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) + peer->ucast_keyidx = 0; + else + peer->mcast_keyidx = 0; +- } else if (!peer) ++ if (key->vlan_id) ++ arvif->vlan_keyid_map[key->vlan_id] = 0; ++ } else if (!peer) { + /* impossible unless FW goes crazy */ + ath11k_warn(ab, "peer %pM disappeared!\n", peer_addr); ++ } + +- if (sta) { +- arsta = ath11k_sta_to_arsta(sta); ++ if (arsta) { + + switch (key->cipher) { + case WLAN_CIPHER_SUITE_TKIP: +@@ -5186,6 +5360,33 @@ static u32 ath11k_mac_ieee80211_sta_bw_t + return bw; + } + ++static int ath11k_mac_cfg_dyn_vlan(struct ath11k_base *ab, ++ struct ath11k_vif *ap_vlan_arvif, ++ struct ieee80211_sta *sta) ++{ ++ struct ath11k_peer *peer; ++ int peer_id, ret; ++ ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_addr(ab, sta->addr); ++ if (!peer) { ++ ath11k_warn(ab, "failed to find peer for %pM\n", sta->addr); ++ spin_unlock_bh(&ab->base_lock); ++ return -EINVAL; ++ } ++ peer_id = peer->peer_id; ++ spin_unlock_bh(&ab->base_lock); ++ ++ ret = ath11k_nss_ext_vdev_wds_4addr_allow(ap_vlan_arvif, peer_id); ++ if (ret) { ++ ath11k_warn(ab, "failed to set 4addr allow for %pM:%d\n", ++ sta->addr, ret); ++ return ret; ++ } ++ ++ return ret; ++} ++ + static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, +@@ -5306,6 +5507,34 @@ static int ath11k_mac_op_sta_state(struc + if (ret) + ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", + sta->addr, arvif->vdev_id, ret); ++ } else if (ar->ab->nss.enabled && ++ vif->type == NL80211_IFTYPE_AP_VLAN && ++ !arsta->use_4addr_set) { ++ ++ if (ar->state == ATH11K_STATE_RESTARTED) { ++ /* During ieee80211_reconfig(), at this point, nss ext vdev peer is not ++ * authorized. Hence ath11k_mac_cfg_dyn_vlan() will return error. We save ++ * the state vars here and use it later once nss ext vdev is authorized ++ * in ath11k_mac_op_set_key() */ ++ struct ath11k_dyn_vlan_cfg *ar_dyn_vlan_cfg; ++ ar_dyn_vlan_cfg = kzalloc(sizeof(*ar_dyn_vlan_cfg), GFP_ATOMIC); ++ ++ if (!ar_dyn_vlan_cfg) { ++ ath11k_warn(ar->ab, "failed to save state for dynamic AP_VLAN configuration (%d)", ++ -ENOSPC); ++ } else { ++ INIT_LIST_HEAD(&ar_dyn_vlan_cfg->cfg_list); ++ ar_dyn_vlan_cfg->arvif = arvif; ++ ar_dyn_vlan_cfg->sta = sta; ++ /* save it to arvif (AP_VLAN) list */ ++ list_add_tail(&ar_dyn_vlan_cfg->cfg_list, &arvif->dyn_vlan_cfg); ++ } ++ } else { ++ ret = ath11k_mac_cfg_dyn_vlan(ar->ab, arvif, sta); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to cfg dyn vlan for peer %pM: %d\n", ++ sta->addr, ret); ++ } + } + } else if (old_state == IEEE80211_STA_AUTHORIZED && + new_state == IEEE80211_STA_ASSOC) { +@@ -7045,7 +7274,7 @@ static int ath11k_mac_op_add_interface(s + if ((vif->type == NL80211_IFTYPE_AP_VLAN || + vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { + if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && +- ieee80211_set_hw_80211_encap(vif, true)) { ++ (vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED)) { + vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; + arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; + arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; +@@ -7058,6 +7287,7 @@ static int ath11k_mac_op_add_interface(s + vif->addr, ret); + goto err; + } ++ INIT_LIST_HEAD(&arvif->dyn_vlan_cfg); + mutex_unlock(&ar->conf_mutex); + return ret; + } +@@ -7082,6 +7312,20 @@ static int ath11k_mac_op_add_interface(s + arvif->vdev_id = bit; + arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; + ++ spin_lock_bh(&ar->data_lock); ++ /* Configure vlan specific parameters */ ++ for (i = 0; i < ATH11K_FREE_GROUP_IDX_MAP_MAX; i++) ++ arvif->free_groupidx_map[i] = 0xFFFFFFFFL; ++ /* Group idx 0 is not valid for VLAN*/ ++ arvif->free_groupidx_map[0] &= ~(1L); ++ spin_unlock_bh(&ar->data_lock); ++ ++ arvif->vlan_keyid_map = kzalloc(4096, GFP_KERNEL); ++ if (!arvif->vlan_keyid_map) { ++ ret = -ENOMEM; ++ goto err; ++ } ++ + switch (vif->type) { + case NL80211_IFTYPE_UNSPECIFIED: + case NL80211_IFTYPE_STATION: +@@ -7122,7 +7366,7 @@ static int ath11k_mac_op_add_interface(s + if (ret) { + ath11k_warn(ab, "failed to create WMI vdev %d: %d\n", + arvif->vdev_id, ret); +- goto err; ++ goto err_keyid; + } + + ar->num_created_vdevs++; +@@ -7281,7 +7525,7 @@ err_peer_del: + if (fbret) { + ath11k_warn(ar->ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n", + vif->addr, arvif->vdev_id, fbret); +- goto err; ++ goto err_keyid; + } + } + +@@ -7292,6 +7536,8 @@ err_vdev_del: + list_del(&arvif->list); + spin_unlock_bh(&ar->data_lock); + ++err_keyid: ++ kfree(arvif->vlan_keyid_map); + err: + mutex_unlock(&ar->conf_mutex); + +@@ -7389,6 +7635,7 @@ err_vdev_del: + list_del(&arvif->list); + spin_unlock_bh(&ar->data_lock); + ++ kfree(arvif->vlan_keyid_map); + ath11k_peer_cleanup(ar, arvif->vdev_id); + + idr_for_each(&ar->txmgmt_idr, +@@ -10113,8 +10360,11 @@ static int __ath11k_mac_register(struct + ab->hw_params.bios_sar_capa) + ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; + +- if (ab->nss.enabled) ++ if (ab->nss.enabled) { + ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); ++ wiphy_ext_feature_set(ar->hw->wiphy, ++ NL80211_EXT_FEATURE_VLAN_OFFLOAD); ++ } + + ret = ieee80211_register_hw(ar->hw); + if (ret) { +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -2001,6 +2001,7 @@ int ath11k_wmi_vdev_install_key(struct a + cmd->key_len = arg->key_len; + cmd->key_txmic_len = arg->key_txmic_len; + cmd->key_rxmic_len = arg->key_rxmic_len; ++ cmd->group_key_id = arg->group_key_idx; + + if (arg->key_rsc_counter) + memcpy(&cmd->key_rsc_counter, &arg->key_rsc_counter, +@@ -4275,6 +4276,7 @@ ath11k_wmi_copy_resource_config(struct w + wmi_cfg->flags2 = WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET; + wmi_cfg->ema_max_vap_cnt = tg_cfg->ema_max_vap_cnt; + wmi_cfg->ema_max_profile_period = tg_cfg->ema_max_profile_period; ++ wmi_cfg->max_num_group_keys = tg_cfg->max_num_group_keys; + } + + static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, +@@ -4497,6 +4499,9 @@ int ath11k_wmi_cmd_init(struct ath11k_ba + memset(&init_param, 0, sizeof(init_param)); + memset(&config, 0, sizeof(config)); + ++ if (ab->nss.enabled) ++ config.max_num_group_keys = ATH11K_GROUP_KEYS_NUM_MAX; ++ + ab->hw_params.hw_ops->wmi_init_config(ab, &config); + + if (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT, +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -3701,6 +3701,7 @@ struct wmi_vdev_install_key_arg { + u32 vdev_id; + const u8 *macaddr; + u32 key_idx; ++ u32 group_key_idx; + u32 key_flags; + u32 key_cipher; + u32 key_len; +@@ -5846,6 +5847,7 @@ struct target_resource_config { + u32 bpf_instruction_size; + u32 max_bssid_rx_filters; + u32 use_pdev_id; ++ u32 max_num_group_keys; + u32 peer_map_unmap_v2_support; + u32 sched_params; + u32 twt_ap_pdev_count; diff --git a/target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch b/target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch new file mode 100644 index 00000000000000..83825b782c1b7f --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch @@ -0,0 +1,30 @@ +--- linux-6.1.71/arch/arm64/boot/dts/qcom/ipq8074.dtsi 2024-01-07 01:44:56.908138962 -0500 ++++ linux-6.1.71/arch/arm64/boot/dts/qcom/ipq8074.dtsi 2024-01-07 01:44:58.908138962 -0500 +@@ -1170,7 +1170,14 @@ + wifi: wifi@c0000000 { + compatible = "qcom,ipq8074-wifi"; + reg = <0xc000000 0x2000000>; +- ++ qcom,hw-mode-id = <1>; ++ #ifdef __IPQ_MEM_PROFILE_256_MB__ ++ qcom,tgt-mem-mode = <2>; ++ #elif __IPQ_MEM_PROFILE_512_MB__ ++ qcom,tgt-mem-mode = <1>; ++ #else ++ qcom,tgt-mem-mode = <0>; ++ #endif + interrupts = , + , + , +@@ -1276,6 +1283,12 @@ + "tcl2host-status-ring"; + qcom,rproc = <&q6v5_wcss>; + status = "disabled"; ++ qcom,pta-num = <0>; ++ qcom,coex-mode = <0x2>; ++ qcom,bt-active-time = <0x12>; ++ qcom,bt-priority-time = <0x0c>; ++ qcom,coex-algo = <0x2>; ++ qcom,pta-priority = <0x80800505>; + }; + }; From a539fb0d653c8a0d16fc3a1d8d9fe5127a12736d Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 7 Jan 2024 18:59:36 -0500 Subject: [PATCH 47/80] feeds: update to use personal fork of nss-packages --- feeds.conf.default | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/feeds.conf.default b/feeds.conf.default index 4699f733f878e2..741b14a875d234 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -2,7 +2,8 @@ src-git packages https://git.openwrt.org/feed/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git -src-git nss_packages https://github.com/dimfishr/nss-packages.git +src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.4-K6.1 +src-git sqm_scripts_nss https://github.com/rickkdotnet/sqm-scripts-nss.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git #src-git oldpackages http://git.openwrt.org/packages.git From 274f035d46868d3151791e61d69e4be2d018844e Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 7 Jan 2024 22:41:14 -0500 Subject: [PATCH 48/80] ath11k_nss: handle qca-nss-drv symbol dependancies --- package/kernel/mac80211/ath.mk | 2 ++ .../199-001-mac80211-add-nss-support.patch | 2 +- ...th11k-Add-support-for-beacon-tx-mode.patch | 4 +-- ...ow-fast-rx-by-bypassing-stats-update.patch | 2 +- ...-fix-clear-peer-keys-during-disassoc.patch | 4 +-- ...unused-RX_FLAGS-from-mac80211_rx_fla.patch | 4 +-- .../640-006-mac80211-add-eht-radiotap.patch | 8 ++--- .../patches/ath11k_nss/900-fix-build.patch | 22 ++++++------- ...N-iftype-support-on-NSS-offload-case.patch | 4 +-- ...-dynamic-VLAN-support-on-NSS-offload.patch | 4 +-- ...-support-on-NSS-offload-for-STA-mode.patch | 32 +++++++++---------- ...02-ath11k-add-HE-stats-in-peer-stats.patch | 18 +++++------ .../902-ath11k-add-btcoex-config.patch | 16 +++++----- ...pport-for-WDS-offload-in-NSS-offload.patch | 2 +- ...dev-in-NSS-for-dynamic-VLAN-handling.patch | 18 +++++------ 15 files changed, 72 insertions(+), 70 deletions(-) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 6795818446ace6..30a8e96f0dd1c4 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -327,6 +327,8 @@ define KernelPackage/ath11k/config config ATH11K_NSS_SUPPORT bool "Enable NSS WiFi offload" + select NSS_DRV_WIFI_ENABLE + select NSS_DRV_WIFI_EXT_VDEV_ENABLE default y if TARGET_qualcommax config ATH11K_MEM_PROFILE_512M diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch index 0b017ec97ad24d..f25def295537ca 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch @@ -225,7 +225,7 @@ Signed-off-by: Sriram R return -EINVAL; --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -2379,6 +2379,9 @@ sta_get_last_rx_stats(struct sta_info *s +@@ -2380,6 +2380,9 @@ sta_get_last_rx_stats(struct sta_info *s struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; int cpu; diff --git a/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch index a95308a74ed223..5d5a83911d8519 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch @@ -19,7 +19,7 @@ Signed-off-by: Maharaja Kennadyrajan --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -3483,7 +3483,10 @@ static void ath11k_mac_op_bss_info_chang +@@ -3481,7 +3481,10 @@ static void ath11k_mac_op_bss_info_chang if (changed & BSS_CHANGED_BEACON) { param_id = WMI_PDEV_PARAM_BEACON_TX_MODE; @@ -31,7 +31,7 @@ Signed-off-by: Maharaja Kennadyrajan ret = ath11k_wmi_pdev_set_param(ar, param_id, param_value, ar->pdev->pdev_id); if (ret) -@@ -3491,8 +3494,9 @@ static void ath11k_mac_op_bss_info_chang +@@ -3489,8 +3492,9 @@ static void ath11k_mac_op_bss_info_chang arvif->vdev_id); else ath11k_dbg(ar->ab, ATH11K_DBG_MAC, diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index bb46abada6b9e3..b0f6b03f750f9e 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -395,7 +395,7 @@ Signed-off-by: P Praneesh bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -5197,6 +5197,14 @@ static int ath11k_mac_op_sta_state(struc +@@ -5201,6 +5201,14 @@ static int ath11k_mac_op_sta_state(struc } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch b/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch index 5050192acc64ae..414cb06d87bd4b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch @@ -17,7 +17,7 @@ Signed-off-by: Karthikeyan Kathirvel --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4708,12 +4708,6 @@ static int ath11k_station_disassoc(struc +@@ -4712,12 +4712,6 @@ static int ath11k_station_disassoc(struc return ret; } @@ -30,7 +30,7 @@ Signed-off-by: Karthikeyan Kathirvel return 0; } -@@ -5176,6 +5170,17 @@ static int ath11k_mac_op_sta_state(struc +@@ -5180,6 +5174,17 @@ static int ath11k_mac_op_sta_state(struc arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); arsta->bw_prev = arsta->bw; spin_unlock_bh(&ar->data_lock); diff --git a/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch b/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch index 2d1fbc097df375..14fd82cbeaa853 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch @@ -14,7 +14,7 @@ Signed-off-by: P Praneesh --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1385,8 +1385,6 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1387,8 +1387,6 @@ ieee80211_tx_info_clear_status(struct ie * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected * on this subframe @@ -23,7 +23,7 @@ Signed-off-by: P Praneesh * @RX_FLAG_MIC_STRIPPED: The mic was stripped of this packet. Decryption was * done by the hardware * @RX_FLAG_ONLY_MONITOR: Report frame only to monitor interfaces without -@@ -1458,22 +1456,21 @@ enum mac80211_rx_flags { +@@ -1460,22 +1458,21 @@ enum mac80211_rx_flags { RX_FLAG_AMPDU_LAST_KNOWN = BIT(12), RX_FLAG_AMPDU_IS_LAST = BIT(13), RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(14), diff --git a/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch b/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch index b8d2b614dd4759..79146df5447b8b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch @@ -321,7 +321,7 @@ Signed-off-by: P Praneesh */ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1439,7 +1439,11 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1441,7 +1441,11 @@ ieee80211_tx_info_clear_status(struct ie * known the frame shouldn't be reported. * @RX_FLAG_8023: the frame has an 802.3 header (decap offload performed by * hardware or driver) @@ -333,7 +333,7 @@ Signed-off-by: P Praneesh enum mac80211_rx_flags { RX_FLAG_MMIC_ERROR = BIT(0), RX_FLAG_DECRYPTED = BIT(1), -@@ -1471,6 +1475,8 @@ enum mac80211_rx_flags { +@@ -1473,6 +1477,8 @@ enum mac80211_rx_flags { RX_FLAG_RADIOTAP_LSIG = BIT(27), RX_FLAG_NO_PSDU = BIT(28), RX_FLAG_8023 = BIT(29), @@ -342,7 +342,7 @@ Signed-off-by: P Praneesh }; /** -@@ -1538,6 +1544,7 @@ enum mac80211_rx_encoding { +@@ -1540,6 +1546,7 @@ enum mac80211_rx_encoding { * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) * @nss: number of streams (VHT, HE and EHT only) * @flag: %RX_FLAG_\* @@ -350,7 +350,7 @@ Signed-off-by: P Praneesh * @encoding: &enum mac80211_rx_encoding * @bw: &enum rate_info_bw * @enc_flags: uses bits from &enum mac80211_rx_encoding_flags -@@ -1591,6 +1598,7 @@ struct ieee80211_rx_status { +@@ -1593,6 +1600,7 @@ struct ieee80211_rx_status { u8 ampdu_delimiter_crc; u8 zero_length_psdu_type; u8 link_valid:1, link_id:4; diff --git a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch b/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch index 67d6e5285bdd94..180fb7feab2e49 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch @@ -56,7 +56,7 @@ if (rxcb->is_mcbc) { --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -9224,7 +9224,7 @@ void cfg80211_bss_flush(struct wiphy *wi +@@ -9228,7 +9228,7 @@ void cfg80211_bss_flush(struct wiphy *wi * @count: the number of TBTTs until the color change happens * @color_bitmap: representations of the colors that the local BSS is aware of */ @@ -65,7 +65,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap); -@@ -9234,9 +9234,9 @@ int cfg80211_bss_color_notify(struct net +@@ -9238,9 +9238,9 @@ int cfg80211_bss_color_notify(struct net * @color_bitmap: representations of the colors that the local BSS is aware of */ static inline int cfg80211_obss_color_collision_notify(struct net_device *dev, @@ -77,7 +77,7 @@ 0, color_bitmap); } -@@ -9250,7 +9250,7 @@ static inline int cfg80211_obss_color_co +@@ -9254,7 +9254,7 @@ static inline int cfg80211_obss_color_co static inline int cfg80211_color_change_started_notify(struct net_device *dev, u8 count) { @@ -86,7 +86,7 @@ count, 0); } -@@ -9262,7 +9262,7 @@ static inline int cfg80211_color_change_ +@@ -9266,7 +9266,7 @@ static inline int cfg80211_color_change_ */ static inline int cfg80211_color_change_aborted_notify(struct net_device *dev) { @@ -95,7 +95,7 @@ 0, 0); } -@@ -9274,7 +9274,7 @@ static inline int cfg80211_color_change_ +@@ -9278,7 +9278,7 @@ static inline int cfg80211_color_change_ */ static inline int cfg80211_color_change_notify(struct net_device *dev) { @@ -106,7 +106,7 @@ } --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -5239,6 +5239,10 @@ void ieee80211_tx_status_ext(struct ieee +@@ -5241,6 +5241,10 @@ void ieee80211_tx_status_ext(struct ieee * (NULL for multicast packets) * @info: tx status information */ @@ -119,7 +119,7 @@ struct ieee80211_tx_info *info) --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -4775,7 +4775,7 @@ void ieee80211_color_collision_detection +@@ -4777,7 +4777,7 @@ void ieee80211_color_collision_detection struct ieee80211_sub_if_data *sdata = link->sdata; sdata_lock(sdata); @@ -141,7 +141,7 @@ sdata->debugfs.subdir_stations = debugfs_create_dir("stations", --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -1406,18 +1406,6 @@ static void __sta_info_destroy_part2(str +@@ -1407,18 +1407,6 @@ static void __sta_info_destroy_part2(str WARN_ON_ONCE(ret); } @@ -195,7 +195,7 @@ struct sta_info *sta = container_of(pubsta, struct sta_info, sta); --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -19406,7 +19406,7 @@ void cfg80211_ch_switch_started_notify(s +@@ -19414,7 +19414,7 @@ void cfg80211_ch_switch_started_notify(s } EXPORT_SYMBOL(cfg80211_ch_switch_started_notify); @@ -204,7 +204,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap) { -@@ -19420,7 +19420,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19428,7 +19428,7 @@ int cfg80211_bss_color_notify(struct net trace_cfg80211_bss_color_notify(dev, cmd, count, color_bitmap); @@ -213,7 +213,7 @@ if (!msg) return -ENOMEM; -@@ -19443,7 +19443,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19451,7 +19451,7 @@ int cfg80211_bss_color_notify(struct net genlmsg_end(msg, hdr); return genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch b/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch index f0fc8c14ec1efd..7dc88faed71f9f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch @@ -21,7 +21,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -5100,6 +5100,17 @@ void ieee80211_sta_pspoll(struct ieee802 +@@ -5102,6 +5102,17 @@ void ieee80211_sta_pspoll(struct ieee802 */ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); @@ -41,7 +41,7 @@ Signed-off-by: Sathishkumar Muruganandam * This is enough for the radiotap header. --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2176,7 +2176,13 @@ static int ieee80211_change_station(stru +@@ -2177,7 +2177,13 @@ static int ieee80211_change_station(stru rcu_assign_pointer(vlansdata->u.vlan.sta, sta); __ieee80211_check_fast_rx_iface(vlansdata); diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch b/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch index 143191f6a9bca9..33eb5d2001db91 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch @@ -24,7 +24,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2089,6 +2089,8 @@ enum ieee80211_key_flags { +@@ -2091,6 +2091,8 @@ enum ieee80211_key_flags { * @tx_pn: PN used for TX keys, may be used by the driver as well if it * needs to do software PN assignment by itself (e.g. due to TSO) * @flags: key flags, see &enum ieee80211_key_flags. @@ -33,7 +33,7 @@ Signed-off-by: Sathishkumar Muruganandam * @keyidx: the key index (0-3) * @keylen: key material length * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) -@@ -2108,6 +2110,7 @@ struct ieee80211_key_conf { +@@ -2110,6 +2112,7 @@ struct ieee80211_key_conf { u8 hw_key_idx; s8 keyidx; u16 flags; diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch index 12d42ddaa9ba9c..0e6c0d92d2abde 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch @@ -26,7 +26,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -655,6 +655,7 @@ struct ath11k { +@@ -634,6 +634,7 @@ struct ath11k { struct ath11k_pdev_wmi *wmi; #ifdef CPTCFG_ATH11K_NSS_SUPPORT struct ath11k_nss nss; @@ -34,7 +34,7 @@ Signed-off-by: Sathishkumar Muruganandam #endif struct ath11k_pdev_dp dp; u8 mac_addr[ETH_ALEN]; -@@ -1065,6 +1066,8 @@ struct ath11k_base { +@@ -1042,6 +1043,8 @@ struct ath11k_base { u32 rx_hash; bool stats_disable; @@ -45,7 +45,7 @@ Signed-off-by: Sathishkumar Muruganandam }; --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1181,13 +1181,16 @@ struct htt_t2h_peer_map_event { +@@ -1142,13 +1142,16 @@ struct htt_t2h_peer_map_event { #define HTT_T2H_PEER_UNMAP_INFO_PEER_ID HTT_T2H_PEER_MAP_INFO_PEER_ID #define HTT_T2H_PEER_UNMAP_INFO1_MAC_ADDR_H16 \ HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16 @@ -66,7 +66,7 @@ Signed-off-by: Sathishkumar Muruganandam struct htt_resp_msg { --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1890,6 +1890,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -1756,6 +1756,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s u16 peer_mac_h16; u16 ast_hash; u16 hw_peer_id; @@ -75,7 +75,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "dp_htt rx msg type :0x%0x\n", type); -@@ -1925,15 +1927,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -1791,15 +1793,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s resp->peer_map_ev.info2); hw_peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID, resp->peer_map_ev.info1); @@ -630,9 +630,9 @@ Signed-off-by: Sathishkumar Muruganandam if (sta) { --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -18,6 +18,47 @@ struct ppdu_user_delayba { - u32 resp_rate_flags; - }; +@@ -7,6 +7,47 @@ + #ifndef ATH11K_PEER_H + #define ATH11K_PEER_H +enum ath11k_ast_entry_type { + ATH11K_AST_TYPE_NONE, /* static ast entry for connected peer */ @@ -678,7 +678,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_peer { struct list_head list; struct ieee80211_sta *sta; -@@ -29,6 +70,10 @@ struct ath11k_peer { +@@ -18,6 +59,10 @@ struct ath11k_peer { u8 pdev_idx; u16 hw_peer_id; struct ath11k_nss_peer nss; @@ -689,7 +689,7 @@ Signed-off-by: Sathishkumar Muruganandam /* protected by ab->data_lock */ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; -@@ -54,8 +99,13 @@ struct ath11k_peer { +@@ -41,8 +86,13 @@ struct ath11k_peer { }; void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id); @@ -703,7 +703,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id, const u8 *addr); struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab, -@@ -72,4 +122,71 @@ struct ath11k_peer *ath11k_peer_find_by_ +@@ -59,4 +109,71 @@ struct ath11k_peer *ath11k_peer_find_by_ int ath11k_peer_rhash_tbl_init(struct ath11k_base *ab); void ath11k_peer_rhash_tbl_destroy(struct ath11k_base *ab); int ath11k_peer_rhash_delete(struct ath11k_base *ab, struct ath11k_peer *peer); @@ -837,7 +837,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar, struct pdev_set_regdomain_params *param) { -@@ -6484,6 +6530,36 @@ static int ath11k_pull_peer_assoc_conf_e +@@ -6419,6 +6465,36 @@ static int ath11k_pull_peer_assoc_conf_e return 0; } @@ -874,7 +874,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_wmi_pull_pdev_stats_base(const struct wmi_pdev_stats_base *src, struct ath11k_fw_stats_pdev *dst) { -@@ -7399,6 +7475,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru +@@ -7334,6 +7410,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru ether_addr_copy(ab->mac_addr, fixed_param.ready_event_min.mac_addr.addr); @@ -882,7 +882,7 @@ Signed-off-by: Sathishkumar Muruganandam ab->pktlog_defs_checksum = fixed_param.pktlog_defs_checksum; break; case WMI_TAG_ARRAY_FIXED_STRUCT: -@@ -8870,6 +8947,22 @@ static void ath11k_wmi_gtk_offload_statu +@@ -8805,6 +8882,22 @@ static void ath11k_wmi_gtk_offload_statu kfree(tb); } @@ -905,7 +905,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) { struct wmi_cmd_hdr *cmd_hdr; -@@ -9000,6 +9093,9 @@ static void ath11k_wmi_tlv_op_rx(struct +@@ -8935,6 +9028,9 @@ static void ath11k_wmi_tlv_op_rx(struct case WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID: ath11k_qos_null_compl_event(ab, skb); break; @@ -961,7 +961,7 @@ Signed-off-by: Sathishkumar Muruganandam /* * PDEV statistics */ -@@ -6503,6 +6533,9 @@ int ath11k_wmi_set_sta_ps_param(struct a +@@ -6430,6 +6460,9 @@ int ath11k_wmi_set_sta_ps_param(struct a int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms); int ath11k_wmi_send_peer_delete_cmd(struct ath11k *ar, const u8 *peer_addr, u8 vdev_id); diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch index edb60ac18bef10..4831424fa40810 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch @@ -363,7 +363,7 @@ Signed-off-by: Miles Hu /* HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG Message * * details: -@@ -1312,6 +1351,19 @@ enum htt_ppdu_stats_gi { +@@ -1315,6 +1354,19 @@ enum htt_ppdu_stats_gi { #define HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M GENMASK(3, 0) #define HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M GENMASK(11, 4) @@ -383,7 +383,7 @@ Signed-off-by: Miles Hu #define HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALD_M BIT(0) #define HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M GENMASK(5, 1) -@@ -1339,6 +1391,12 @@ enum htt_ppdu_stats_gi { +@@ -1342,6 +1394,12 @@ enum htt_ppdu_stats_gi { FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M, _val) #define HTT_USR_RATE_DCM(_val) \ FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M, _val) @@ -396,7 +396,7 @@ Signed-off-by: Miles Hu #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M GENMASK(1, 0) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M BIT(2) -@@ -1442,6 +1500,21 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_ +@@ -1445,6 +1503,21 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_ u32 success_bytes; } __packed; @@ -418,7 +418,7 @@ Signed-off-by: Miles Hu struct htt_ppdu_stats_usr_cmn_array { struct htt_tlv tlv_hdr; u32 num_ppdu_stats; -@@ -1455,14 +1528,16 @@ struct htt_ppdu_stats_usr_cmn_array { +@@ -1458,14 +1531,16 @@ struct htt_ppdu_stats_usr_cmn_array { struct htt_ppdu_user_stats { u16 peer_id; @@ -436,7 +436,7 @@ Signed-off-by: Miles Hu #define HTT_PPDU_DESC_MAX_DEPTH 16 struct htt_ppdu_stats { -@@ -1471,7 +1546,7 @@ struct htt_ppdu_stats { +@@ -1474,7 +1549,7 @@ struct htt_ppdu_stats { }; struct htt_ppdu_stats_info { @@ -748,9 +748,9 @@ Signed-off-by: Miles Hu #define RU_52 2 --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -7,6 +7,17 @@ - #ifndef ATH11K_PEER_H - #define ATH11K_PEER_H +@@ -48,6 +48,17 @@ struct ath11k_ast_entry { + struct list_head ase_list; + }; +struct ppdu_user_delayba { + u8 reserved0; @@ -766,7 +766,7 @@ Signed-off-by: Miles Hu struct ath11k_peer { struct list_head list; struct ieee80211_sta *sta; -@@ -38,6 +49,8 @@ struct ath11k_peer { +@@ -83,6 +94,8 @@ struct ath11k_peer { u16 sec_type_grp; bool is_authorized; bool dp_setup_done; diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch index 18bc4384094eca..495245f9662462 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch @@ -29,7 +29,7 @@ struct ath11k { struct ath11k_base *ab; struct ath11k_pdev *pdev; -@@ -759,6 +769,8 @@ struct ath11k { +@@ -760,6 +770,8 @@ struct ath11k { struct ath11k_per_peer_tx_stats cached_stats; u32 last_ppdu_id; u32 cached_ppdu_id; @@ -56,7 +56,7 @@ #include "nss.h" #define CHAN2G(_channel, _freq, _flags) { \ -@@ -9282,6 +9284,91 @@ err_fallback: +@@ -9286,6 +9288,91 @@ err_fallback: return 0; } @@ -148,7 +148,7 @@ static const struct ieee80211_ops ath11k_ops = { .tx = ath11k_mac_op_tx, .wake_tx_queue = ieee80211_handle_wake_tx_queue, -@@ -9521,6 +9608,56 @@ static int ath11k_mac_setup_iface_combin +@@ -9525,6 +9612,56 @@ static int ath11k_mac_setup_iface_combin return 0; } @@ -205,7 +205,7 @@ static const u8 ath11k_if_types_ext_capa[] = { [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, -@@ -9782,6 +9919,7 @@ static int __ath11k_mac_register(struct +@@ -9786,6 +9923,7 @@ static int __ath11k_mac_register(struct ar->hw->wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD; ath11k_reg_init(ar); @@ -213,7 +213,7 @@ if (!test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags)) { ar->hw->netdev_features = NETIF_F_HW_CSUM; -@@ -9944,6 +10082,7 @@ int ath11k_mac_allocate(struct ath11k_ba +@@ -9948,6 +10086,7 @@ int ath11k_mac_allocate(struct ath11k_ba */ ath11k_wmi_pdev_attach(ab, i); @@ -447,7 +447,7 @@ +#endif /* QCA_VENDOR_H */ --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -1697,6 +1697,71 @@ int ath11k_wmi_vdev_set_param_cmd(struct +@@ -1743,6 +1743,71 @@ int ath11k_wmi_vdev_set_param_cmd(struct return ret; } @@ -521,7 +521,7 @@ { --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -5303,6 +5303,79 @@ struct wmi_wmm_params_arg { +@@ -5333,6 +5333,79 @@ struct wmi_wmm_params_arg { u8 no_ack; }; @@ -601,7 +601,7 @@ struct wmi_vdev_set_wmm_params_cmd { u32 tlv_header; u32 vdev_id; -@@ -6520,6 +6593,8 @@ int ath11k_wmi_pdev_non_srg_obss_color_e +@@ -6553,6 +6626,8 @@ int ath11k_wmi_pdev_non_srg_obss_color_e u32 *bitmap); int ath11k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath11k *ar, u32 *bitmap); diff --git a/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch index 86714fea844e81..de7bc77ef53456 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -489,7 +489,7 @@ Signed-off-by: Sathishkumar Muruganandam list_del(&ast_entry->ase_list); --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -34,6 +34,7 @@ enum ath11k_ast_entry_type { +@@ -23,6 +23,7 @@ enum ath11k_ast_entry_type { enum ath11k_wds_wmi_action { ATH11K_WDS_WMI_ADD = 1, ATH11K_WDS_WMI_UPDATE, diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch b/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch index c97edcd605d7f1..14274b6a72680a 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch @@ -15,7 +15,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -1483,14 +1483,11 @@ static int ath11k_nss_ext_vdev_register( +@@ -1570,14 +1570,11 @@ static int ath11k_nss_ext_vdev_register( struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; nss_tx_status_t status; @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam arvif->nss.ctx = nss_wifi_ext_vdev_register_if(arvif->nss.if_num, ath11k_nss_ext_vdev_data_receive, ath11k_nss_ext_vdev_special_data_receive, -@@ -1518,7 +1515,8 @@ static void ath11k_nss_ext_vdev_free(str +@@ -1605,7 +1602,8 @@ static void ath11k_nss_ext_vdev_free(str status = nss_dynamic_interface_dealloc_node( arvif->nss.if_num, @@ -40,7 +40,7 @@ Signed-off-by: Sathishkumar Muruganandam if (status != NSS_TX_SUCCESS) ath11k_warn(ab, "failed to free nss ext vdev err:%d\n", status); -@@ -1527,14 +1525,19 @@ static void ath11k_nss_ext_vdev_free(str +@@ -1614,14 +1612,19 @@ static void ath11k_nss_ext_vdev_free(str "nss ext vdev interface deallocated\n"); } @@ -62,7 +62,7 @@ Signed-off-by: Sathishkumar Muruganandam if_num = nss_dynamic_interface_alloc_node(di_type); if (if_num < 0) { ath11k_warn(ab, "failed to allocate nss ext vdev\n"); -@@ -1543,8 +1546,8 @@ static int ath11k_nss_ext_vdev_alloc(str +@@ -1630,8 +1633,8 @@ static int ath11k_nss_ext_vdev_alloc(str arvif->nss.if_num = if_num; ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, @@ -73,7 +73,7 @@ Signed-off-by: Sathishkumar Muruganandam return 0; } -@@ -1573,7 +1576,7 @@ int ath11k_nss_ext_vdev_create(struct at +@@ -1660,7 +1663,7 @@ int ath11k_nss_ext_vdev_create(struct at return -EINVAL; } @@ -82,7 +82,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ret) return ret; -@@ -1684,6 +1687,86 @@ free: +@@ -1773,6 +1776,86 @@ free: return ret; } @@ -171,7 +171,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_nss_set_peer_sec_type(struct ath11k *ar, --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -150,6 +150,10 @@ struct arvif_nss { +@@ -179,6 +179,10 @@ struct arvif_nss { bool added; /* Flag to notify if ext vdev is up/down */ bool ext_vdev_up; @@ -182,7 +182,7 @@ Signed-off-by: Sathishkumar Muruganandam /* WDS cfg should be done only once for ext vdev */ bool wds_cfg_done; bool created; -@@ -215,6 +217,9 @@ void ath11k_nss_ext_vdev_unregister(stru +@@ -246,6 +250,9 @@ void ath11k_nss_ext_vdev_unregister(stru int ath11k_nss_ext_vdev_up(struct ath11k_vif *arvif); int ath11k_nss_ext_vdev_down(struct ath11k_vif *arvif); void ath11k_nss_ext_vdev_delete(struct ath11k_vif *arvif); @@ -192,7 +192,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, struct ieee80211_key_conf *key_conf); void ath11k_nss_update_sta_stats(struct ath11k_vif *arvif, -@@ -343,6 +348,18 @@ static inline int ath11k_nss_ext_vdev_do +@@ -378,6 +385,18 @@ static inline int ath11k_nss_ext_vdev_do { return 0; } From 9b9588cb9dba34ad1fa808e8e9de44151d5dc1d1 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Mon, 8 Jan 2024 03:08:03 -0500 Subject: [PATCH 49/80] ath11k_nss: fix ordering of sysctl values `dev.nss.n2hcfg.n2h_wifi_pool_buf` must be set BEFORE setting `dev.nss.n2hcfg.n2h_high_water_core0`, otherwise it resets the value. --- .../mac80211/files/etc/init.d/qca-nss-pbuf | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf index 40f05c46fb28fb..11604d15dc5c47 100755 --- a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -18,16 +18,23 @@ START=20 apply_sysctl() { [ $(sysctl -n -e dev.nss.general.redirect) = "0" ] && /etc/init.d/qca-nss-ecm start + # Running this script multiple times is useless, as extra_pbuf_core0 + # can't be changed if it is allocated, assume it's already been run. + extra_pbuf_core0=$(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0) - logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0" - sysctl -w dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0 > /dev/null 2> /dev/null - - logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0" - sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 > /dev/null 2> /dev/null + if [ "$extra_pbuf_core0" = "0" ]; then + logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0" + sysctl -w dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0 > /dev/null 2> /dev/null + else + logger -t ath11k_nss "Sysctl key 'extra_pbuf_core0' already set to '"$extra_pbuf_core0"'. Skipping applying wifi nss configs" + fi logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf" sysctl -w dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf > /dev/null 2> /dev/null + logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0" + sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 + } apply_nss_config() { @@ -51,7 +58,7 @@ apply_nss_config() { qnap,301w | \ xiaomi,ax9000 | \ zyxel,nbg7815) - extra_pbuf_core0=10000000 n2h_high_water_core0=72512 n2h_wifi_pool_buf=36864 apply_sysctl + extra_pbuf_core0=9000000 n2h_high_water_core0=67392 n2h_wifi_pool_buf=40960 apply_sysctl ;; # 512MB profile edimax,cax1800 | \ @@ -79,13 +86,5 @@ start() { exit 1 fi - # Running this script multiple times is useless, as extra_pbuf_core0 - # can't be changed if it is allocated, assume it's already been run. - extra_pbuf_core0=$(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0) - - if [ "$extra_pbuf_core0" = "0" ]; then - apply_nss_config - else - logger -t ath11k_nss "Sysctl key 'extra_pbuf_core0' already set to '"$extra_pbuf_core0"'. Skipping applying wifi nss configs" - fi + apply_nss_config } From 5fc020cd5fe9cf26944c766a465ca1773a9ce882 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Mon, 8 Jan 2024 18:55:20 -0500 Subject: [PATCH 50/80] qualcommax: add nss-macsec dt support --- .../patches-6.6/9999-add-nss-macsec.patch | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 target/linux/qualcommax/patches-6.6/9999-add-nss-macsec.patch diff --git a/target/linux/qualcommax/patches-6.6/9999-add-nss-macsec.patch b/target/linux/qualcommax/patches-6.6/9999-add-nss-macsec.patch new file mode 100644 index 00000000000000..1be086be21789f --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/9999-add-nss-macsec.patch @@ -0,0 +1,13 @@ +--- a/arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi 2024-01-08 16:04:51.957322224 -0500 ++++ b/arch/arm64/boot/dts/qcom/ipq8074-nss.dtsi 2024-01-08 16:09:29.079630738 -0500 +@@ -268,4 +268,10 @@ + }; + }; + }; ++ nss-macsec1 { ++ compatible = "qcom,nss-macsec"; ++ phy_addr = <0x1c>; ++ phy_access_mode = <0x00>; ++ mdiobus = <&mdio>; ++ }; + }; From 1d6d76640b71567cd28e9774e9819614dcde92c6 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Tue, 9 Jan 2024 01:07:01 -0500 Subject: [PATCH 51/80] ath11k_nss: bugfix overwriting high watermark ath11k_nss: bugfix change start order value 'dev.nss.n2hcfg.n2h_wifi_pool_buf' was not getting set, wait till after qca-nss-drv is loaded. ath11k_nss: finally fix n2hcfg values not being set --- .../kernel/mac80211/files/etc/init.d/qca-nss-pbuf | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf index 11604d15dc5c47..50f13b33e89429 100755 --- a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -14,23 +14,24 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. # -START=20 +START=71 apply_sysctl() { - [ $(sysctl -n -e dev.nss.general.redirect) = "0" ] && /etc/init.d/qca-nss-ecm start + [ $(sysctl -n -e dev.nss.general.redirect) -eq 0 ] && /etc/init.d/qca-nss-ecm start + # Running this script multiple times is useless, as extra_pbuf_core0 # can't be changed if it is allocated, assume it's already been run. - extra_pbuf_core0=$(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0) - - if [ "$extra_pbuf_core0" = "0" ]; then + if [ $(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0) -eq 0 ]; then logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0" sysctl -w dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0 > /dev/null 2> /dev/null else logger -t ath11k_nss "Sysctl key 'extra_pbuf_core0' already set to '"$extra_pbuf_core0"'. Skipping applying wifi nss configs" fi + sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 > /dev/null 2>/dev/null + logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf" - sysctl -w dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf > /dev/null 2> /dev/null + sysctl -w dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0" sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 From d1efc8703b5942da81afe20ab2df82329e944679 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Wed, 10 Jan 2024 21:01:36 -0500 Subject: [PATCH 52/80] ath11k_nss: Handle 256/512/1G boards automatically --- package/kernel/mac80211/ath.mk | 45 ++++++--- .../mac80211/files/etc/init.d/qca-nss-pbuf | 9 +- ...07-ath11k-Enable-256_512MB-profiles.patch} | 95 +++++++++++++++---- ...11k-Disable-rx_header-tlv-for-2K-SKB.patch | 26 +++-- ...ow-fast-rx-by-bypassing-stats-update.patch | 2 +- 5 files changed, 139 insertions(+), 38 deletions(-) rename package/kernel/mac80211/patches/ath11k_nss/{207-ath11k-Enable-512MB-profile-in-ath11k.patch => 207-ath11k-Enable-256_512MB-profiles.patch} (77%) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 30a8e96f0dd1c4..af60c499ddde7c 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -14,9 +14,10 @@ PKG_CONFIG_DEPENDS += \ CONFIG_ATH10K_THERMAL \ CONFIG_ATH11K_THERMAL \ CONFIG_ATH_USER_REGD \ + CONFIG_ATH11K_MEM_PROFILE_1G \ CONFIG_ATH11K_MEM_PROFILE_512M \ - CONFIG_ATH11K_NSS_SUPPORT \ - CONFIG_ATH11K_SMART_ANT_ALG + CONFIG_ATH11K_MEM_PROFILE_256M \ + CONFIG_ATH11K_NSS_SUPPORT ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS config-y += \ @@ -59,9 +60,10 @@ config-$(CONFIG_ATH9K_UBNTHSR) += ATH9K_UBNTHSR config-$(CONFIG_ATH10K_LEDS) += ATH10K_LEDS config-$(CONFIG_ATH10K_THERMAL) += ATH10K_THERMAL config-$(CONFIG_ATH11K_THERMAL) += ATH11K_THERMAL +config-$(CONFIG_ATH11K_MEM_PROFILE_1G) += ATH11K_MEM_PROFILE_1G config-$(CONFIG_ATH11K_MEM_PROFILE_512M) += ATH11K_MEM_PROFILE_512M +config-$(CONFIG_ATH11K_MEM_PROFILE_256M) += ATH11K_MEM_PROFILE_256M config-$(CONFIG_ATH11K_NSS_SUPPORT) += ATH11K_NSS_SUPPORT -config-$(CONFIG_ATH11K_SMART_ANT_ALG) += ATH11K_SMART_ANT_ALG config-$(call config_package,ath9k-htc) += ATH9K_HTC config-$(call config_package,ath10k,regular) += ATH10K ATH10K_PCI @@ -327,20 +329,41 @@ define KernelPackage/ath11k/config config ATH11K_NSS_SUPPORT bool "Enable NSS WiFi offload" + select ATH11K_MEM_PROFILE_512M if (TARGET_qualcommax_ipq807x_DEVICE_edimax_cax1800 || \ + TARGET_qualcommax_ipq807x_DEVICE_compex_wpq873 || \ + TARGET_qualcommax_ipq807x_DEVICE_linksys_mx4200v1 || \ + TARGET_qualcommax_ipq807x_DEVICE_redmi_ax6 || \ + TARGET_qualcommax_ipq807x_DEVICE_xiaomi_ax3600 || \ + TARGET_qualcommax_ipq807x_DEVICE_zte_mf269 ) + select ATH11K_MEM_PROFILE_256M if (TARGET_qualcommax_ipq807x_DEVICE_netgear_wax218) select NSS_DRV_WIFI_ENABLE select NSS_DRV_WIFI_EXT_VDEV_ENABLE default y if TARGET_qualcommax - config ATH11K_MEM_PROFILE_512M - bool "Use limits for the 512MB memory size" - default n + choice + prompt "ATH11K Memory Profile" + default ATH11K_MEM_PROFILE_1G + help + This option allows you to select the memory profile. + It should correspond to the total RAM of your board. + + config ATH11K_MEM_PROFILE_1G + bool "Use 1G memory profile" + help + This allows configuring ath11k for boards with 1GB+ memory. + + config ATH11K_MEM_PROFILE_512M + bool "Use 512MB memory profile" help - This allows selecting the ath11k memory size profile to be used. + This allows configuring ath11k for boards with 512M memory. + The default is 1GB if not selected - config ATH11K_SMART_ANT_ALG - bool "Enable smart antenna" - depends on PACKAGE_ATH_DEBUG - default n + config ATH11K_MEM_PROFILE_256M + bool "Use 256MB memory profile" + help + This allows configuring ath11k for boards with 256M memory. + The default is 1GB if not selected + endchoice endef define KernelPackage/ath11k-ahb diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf index 50f13b33e89429..260726fb12d871 100755 --- a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -47,24 +47,29 @@ apply_nss_config() { case "$board" in # 1GB+ profile + arcadyan,aw1000 | \ buffalo,wxr-5950ax12 | \ dynalink,dl-wrx36 | \ edgecore,eap102 | \ - linksys,mx5300 | \ linksys,mx4200v2 | \ + linksys,mx5300 | \ netgear,rax120v2 | \ netgear,wax620 | \ netgear,wax630 | \ prpl,haze | \ qnap,301w | \ xiaomi,ax9000 | \ + yuncore,ax880 | \ zyxel,nbg7815) extra_pbuf_core0=9000000 n2h_high_water_core0=67392 n2h_wifi_pool_buf=40960 apply_sysctl ;; # 512MB profile edimax,cax1800 | \ + compex,wpq873 | \ linksys,mx4200v1 | \ - xiaomi,ax3600) # 512MB profile + redmi,ax6 | \ + xiaomi,ax3600 | \ + zte,mf269) # 512MB profile extra_pbuf_core0=3100000 n2h_high_water_core0=30624 n2h_wifi_pool_buf=8192 apply_sysctl ;; # 256MB profile diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch similarity index 77% rename from package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch rename to package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch index 0e7ddb8539a207..a4c063ce69ba49 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-512MB-profile-in-ath11k.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch @@ -22,7 +22,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/Kconfig +++ b/drivers/net/wireless/ath/ath11k/Kconfig -@@ -23,6 +23,13 @@ config ATH11K_NSS_SUPPORT +@@ -23,6 +23,20 @@ config ATH11K_NSS_SUPPORT If unsure, say Y to enable NSS offload support. @@ -32,36 +32,59 @@ Signed-off-by: Ramya Gnanasekar + default n + ---help--- + Enables 512MB memory profile for ath11k ++ ++config ATH11K_MEM_PROFILE_256M ++ bool "ath11k enable 256MB memory profile" ++ depends on ATH11K ++ default n ++ ---help--- ++ Enables 256MB memory profile for ath11k + config ATH11K_AHB tristate "Atheros ath11k AHB support" depends on m --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -11,11 +11,30 @@ +@@ -11,11 +11,43 @@ #include "wmi.h" /* Target configuration defines */ -+#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M - ++#if defined(CPTCFG_ATH11K_MEM_PROFILE_256M) ++#define TARGET_NUM_VDEVS 8 ++#define TARGET_NUM_PEERS_PDEV (128 + TARGET_NUM_VDEVS) ++/* Max num of stations (per radio) */ ++#define TARGET_NUM_STATIONS 128 ++#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_512M ++#define ATH11K_DP_TX_COMP_RING_SIZE 2048 ++#define ATH11K_DP_RXDMA_BUF_RING_SIZE 1024 ++#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 ++#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 ++#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 ++ ++#elif defined(CPTCFG_ATH11K_MEM_PROFILE_512M) +#define TARGET_NUM_VDEVS(ab) 8 +#define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) +/* Max num of stations (per radio) */ +#define TARGET_NUM_STATIONS(ab) 128 +#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_512M +#define ATH11K_DP_TX_COMP_RING_SIZE 8192 ++#define ATH11K_DP_RXDMA_BUF_RING_SIZE 4096 +#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 +#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 +#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 + +#else /* Num VDEVS per radio */ - #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs) - - #define TARGET_NUM_PEERS_PDEV(ab) (ab->hw_params.num_peers + TARGET_NUM_VDEVS(ab)) +-#define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs) +- +-#define TARGET_NUM_PEERS_PDEV(ab) (ab->hw_params.num_peers + TARGET_NUM_VDEVS(ab)) ++#define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_vdevs) ++#define TARGET_NUM_PEERS_PDEV(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_peers + TARGET_NUM_VDEVS(ab)) +/* Max num of stations (per radio) */ -+#define TARGET_NUM_STATIONS(ab) (ab->hw_params.num_peers) ++#define TARGET_NUM_STATIONS(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_peers) +#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_DEFAULT +#define ATH11K_DP_TX_COMP_RING_SIZE 32768 ++#define ATH11K_DP_RXDMA_BUF_RING_SIZE 4096 +#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 +#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 +#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 @@ -69,7 +92,7 @@ Signed-off-by: Ramya Gnanasekar /* Num of peers for Single Radio mode */ #define TARGET_NUM_PEERS_SINGLE(ab) (TARGET_NUM_PEERS_PDEV(ab)) -@@ -26,9 +45,6 @@ +@@ -26,9 +58,6 @@ /* Num of peers for DBS_SBS */ #define TARGET_NUM_PEERS_DBS_SBS(ab) (3 * TARGET_NUM_PEERS_PDEV(ab)) @@ -79,6 +102,14 @@ Signed-off-by: Ramya Gnanasekar #define TARGET_NUM_PEERS(ab, x) TARGET_NUM_PEERS_##x(ab) #define TARGET_NUM_PEER_KEYS 2 #define TARGET_NUM_TIDS(ab, x) (2 * TARGET_NUM_PEERS(ab, x) + \ +@@ -226,6 +255,7 @@ struct ath11k_hw_params { + u32 tx_ring_size; + bool smp2p_wow_exit; + bool support_fw_mac_sequence; ++ const struct ath11k_num_vdevs_peers *num_vdevs_peers; + }; + + struct ath11k_hw_ops { --- a/drivers/net/wireless/ath/ath11k/qmi.h +++ b/drivers/net/wireless/ath/ath11k/qmi.h @@ -29,6 +29,12 @@ @@ -107,14 +138,21 @@ Signed-off-by: Ramya Gnanasekar #endif --- a/local-symbols +++ b/local-symbols -@@ -171,6 +171,7 @@ ATH11K= +@@ -171,12 +171,13 @@ ATH11K= ATH11K_AHB= ATH11K_PCI= ATH11K_NSS_SUPPORT= ++ATH11K_MEM_PROFILE_256M= +ATH11K_MEM_PROFILE_512M= ATH11K_DEBUG= ATH11K_DEBUGFS= ATH11K_TRACING= + ATH11K_SPECTRAL= + ATH11K_THERMAL= +-ATH11K_MEM_PROFILE_512M= + ATH12K= + ATH12K_DEBUG= + ATH12K_TRACING= --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -863,6 +863,11 @@ struct ath11k_msi_config { @@ -226,7 +264,13 @@ Signed-off-by: Ramya Gnanasekar static struct ath11k_hw_params ath11k_hw_params[] = { { .hw_rev = ATH11K_HW_IPQ8074, -@@ -100,6 +104,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -95,15 +99,15 @@ static struct ath11k_hw_params ath11k_hw + .coldboot_cal_mm = false, + .coldboot_cal_ftm = false, + .cbcal_restart_fw = true, +- .fw_mem_mode = 0, ++ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, + .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, .hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074), @@ -234,7 +278,22 @@ Signed-off-by: Ramya Gnanasekar .supports_regdb = false, .fix_l1ss = true, .credit_flow = false, -@@ -177,7 +182,7 @@ static struct ath11k_hw_params ath11k_hw +- .max_tx_ring = DP_TCL_NUM_RING_MAX, + .hal_params = &ath11k_hw_hal_params_ipq8074, + .supports_dynamic_smps_6ghz = false, + .alloc_cacheable_memory = true, +@@ -127,7 +131,9 @@ static struct ath11k_hw_params ath11k_hw + .tcl_ring_retry = true, + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, +- }, ++ /* In addition to TCL ring use TCL_CMD ring also for tx */ ++ .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, ++ .num_vdevs_peers = ath11k_vdevs_peers, + { + .hw_rev = ATH11K_HW_IPQ6018_HW10, + .name = "ipq6018 hw1.0", +@@ -177,7 +183,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, .cbcal_restart_fw = true, @@ -243,7 +302,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -259,7 +264,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -259,7 +265,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -252,7 +311,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -426,7 +431,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -426,7 +432,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -261,7 +320,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -509,7 +514,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -509,7 +515,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -270,7 +329,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -593,7 +598,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -593,7 +599,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, .cbcal_restart_fw = false, @@ -279,7 +338,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -672,7 +677,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -672,7 +678,7 @@ static struct ath11k_hw_params ath11k_hw .supports_monitor = false, .supports_sta_ps = false, .supports_shadow_regs = false, @@ -288,7 +347,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_regdb = false, -@@ -710,7 +715,23 @@ static struct ath11k_hw_params ath11k_hw +@@ -710,7 +716,23 @@ static struct ath11k_hw_params ath11k_hw }, }; diff --git a/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch b/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch index 0b9d559a4857ae..87314bc425d3d1 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch @@ -754,10 +754,24 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -22,6 +22,11 @@ +@@ -22,7 +22,11 @@ #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 +- ++#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 ++/* 256b desc TLV + 4b(rounded) Pad + 30byte max nwifi header + ++ * 18byte mesh hdr + 8byte snap + 1500 eth payload ++ */ ++#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 1816 + #elif defined(CPTCFG_ATH11K_MEM_PROFILE_512M) + #define TARGET_NUM_VDEVS(ab) 8 + #define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) +@@ -34,7 +38,11 @@ + #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 + #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 + #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 +- +#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 +/* 256b desc TLV + 4b(rounded) Pad + 30byte max nwifi header + + * 18byte mesh hdr + 8byte snap + 1500 eth payload @@ -765,8 +779,8 @@ Signed-off-by: Ramya Gnanasekar +#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 1816 #else /* Num VDEVS per radio */ - #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs) -@@ -34,6 +39,8 @@ + #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_vdevs) +@@ -47,6 +55,8 @@ #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 @@ -775,7 +789,7 @@ Signed-off-by: Ramya Gnanasekar #endif /* Num of peers for Single Radio mode */ -@@ -129,6 +136,8 @@ enum ath11k_bus { +@@ -142,6 +152,8 @@ enum ath11k_bus { struct hal_rx_desc; struct hal_tcl_data_cmd; @@ -784,7 +798,7 @@ Signed-off-by: Ramya Gnanasekar struct ath11k_hw_ring_mask { u8 tx[ATH11K_EXT_IRQ_GRP_NUM_MAX]; -@@ -218,6 +227,7 @@ struct ath11k_hw_params { +@@ -231,6 +243,7 @@ struct ath11k_hw_params { const struct ath11k_hw_hal_params *hal_params; bool supports_dynamic_smps_6ghz; bool alloc_cacheable_memory; @@ -792,7 +806,7 @@ Signed-off-by: Ramya Gnanasekar bool supports_rssi_stats; bool fw_wmi_diag_event; bool current_cc_support; -@@ -285,6 +295,16 @@ struct ath11k_hw_ops { +@@ -299,6 +312,16 @@ struct ath11k_hw_ops { bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); u32 (*get_ring_selector)(struct sk_buff *skb); diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index b0f6b03f750f9e..9bc2b50f7cbd45 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -385,7 +385,7 @@ Signed-off-by: P Praneesh .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -270,6 +270,7 @@ struct ath11k_hw_ops { +@@ -287,6 +287,7 @@ struct ath11k_hw_ops { u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc); From 881fae45d8120fda2e7e3cb625767a6e2dd8c32f Mon Sep 17 00:00:00 2001 From: Qosmio Date: Wed, 10 Jan 2024 21:02:52 -0500 Subject: [PATCH 53/80] ath11k_nss: Add support to account memory stats Memory allocations in the driver & mac80211 are logged and populate those values to the user space via debugfs. This stats will give the snapshot of the memory being used by the driver at the time of dumping these memory stats. Command: cat /sys/kernel/debug/ath11k/ipq8074\ hw2.0/memory_stats Sample output of the stats MEMORY STATS IN BYTES: malloc size : 6287583 ce_ring_alloc size: 109308 dma_alloc size:: 10831860 htc_skb_alloc size: 3840 wmi alloc size: 0 per peer object: 4644 rx_post_buf size: 5091840 Total size: 22329075 User can disable/enable the memory stats accounting with the below command. echo N > /sys/kernel/debug/ath11k/ipq8074\ hw2.0/enable_memory_stats where N = 0 to disable logging, 1 to enable the logging. Note: This should be enabled/disabled only after wifi is down. User shouldn't enable/disable when the wifi is up to avoid accounting the negative values which cause incorrect values in the memory stats. Command: cat /sys/kernel/debug/ieee80211/phyX/memory_stats memory stats: malloc_size: 108 --- .../905-ath11k-add-support-memory-stats.patch | 946 ++++++++++++++++++ 1 file changed, 946 insertions(+) create mode 100644 package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch new file mode 100644 index 00000000000000..f4f4389960bd74 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch @@ -0,0 +1,946 @@ +From 9c99e124a279391dbe2cef66226fd4e86bde8f4d Mon Sep 17 00:00:00 2001 +From: Maharaja Kennadyrajan +Date: Mon, 4 Jan 2021 23:46:53 +0530 +Subject: [PATCH 1/2] ath11k/mac80211: Add support to account memory stats + +Memory allocations in the driver & mac80211 are logged +and populate those values to the user space via debugfs. +This stats will give the snapshot of the memory being +used by the driver at the time of dumping these +memory stats. + +Command: +cat /sys/kernel/debug/ath11k/ipq8074\ hw2.0/memory_stats + +Sample output of the stats +MEMORY STATS IN BYTES: +malloc size : 6287583 +ce_ring_alloc size: 109308 +dma_alloc size:: 10831860 +htc_skb_alloc size: 3840 +wmi alloc size: 0 +per peer object: 4644 +rx_post_buf size: 5091840 +Total size: 22329075 + +User can disable/enable the memory stats accounting with +the below command. + +echo N > /sys/kernel/debug/ath11k/ipq8074\ hw2.0/enable_memory_stats +where N = 0 to disable logging, 1 to enable the logging. + +Note: This should be enabled/disabled only after wifi is down. +User shouldn't enable/disable when the wifi is up to avoid +accounting the negative values which cause incorrect values +in the memory stats. + +Command: + +cat /sys/kernel/debug/ieee80211/phyX/memory_stats +memory stats: malloc_size: 108 + +Signed-off-by: Maharaja Kennadyrajan +--- + drivers/net/wireless/ath/ath11k/ce.c | 24 ++++ + drivers/net/wireless/ath/ath11k/core.c | 2 +- + drivers/net/wireless/ath/ath11k/core.h | 19 +++ + drivers/net/wireless/ath/ath11k/dbring.c | 3 + + drivers/net/wireless/ath/ath11k/debugfs.c | 115 ++++++++++++++++++ + drivers/net/wireless/ath/ath11k/debugfs.h | 29 +++++ + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 4 + + drivers/net/wireless/ath/ath11k/dp.c | 13 ++ + drivers/net/wireless/ath/ath11k/hal.c | 6 + + drivers/net/wireless/ath/ath11k/htc.c | 5 + + drivers/net/wireless/ath/ath11k/mac.c | 15 ++- + drivers/net/wireless/ath/ath11k/nss.c | 46 +++++++ + drivers/net/wireless/ath/ath11k/peer.c | 5 + + drivers/net/wireless/ath/ath11k/wmi.c | 4 + + 15 files changed, 302 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/ce.c ++++ b/drivers/net/wireless/ath/ath11k/ce.c +@@ -359,6 +359,9 @@ static int ath11k_ce_rx_post_pipe(struct + dev_kfree_skb_any(skb); + goto exit; + } ++ ++ ATH11K_MEMORY_STATS_INC(ab, ce_rx_pipe, skb->truesize); ++ + } + + exit: +@@ -427,6 +430,9 @@ static void ath11k_ce_recv_process_cb(st + __skb_queue_head_init(&list); + while (ath11k_ce_completed_recv_next(pipe, &skb, &nbytes) == 0) { + max_nbytes = skb->len + skb_tailroom(skb); ++ ++ ATH11K_MEMORY_STATS_DEC(ab, ce_rx_pipe, skb->truesize); ++ + dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, + max_nbytes, DMA_FROM_DEVICE); + +@@ -620,6 +626,9 @@ ath11k_ce_alloc_ring(struct ath11k_base + if (ce_ring == NULL) + return ERR_PTR(-ENOMEM); + ++ ATH11K_MEMORY_STATS_INC(ab, ce_ring_alloc, ++ struct_size(ce_ring, skb, nentries)); ++ + ce_ring->nentries = nentries; + ce_ring->nentries_mask = nentries - 1; + +@@ -635,6 +644,9 @@ ath11k_ce_alloc_ring(struct ath11k_base + return ERR_PTR(-ENOMEM); + } + ++ ATH11K_MEMORY_STATS_INC(ab, ce_ring_alloc, ++ nentries * desc_sz + CE_DESC_RING_ALIGN); ++ + ce_ring->base_addr_ce_space_unaligned = base_addr; + + ce_ring->base_addr_owner_space = PTR_ALIGN( +@@ -814,6 +826,9 @@ static void ath11k_ce_rx_pipe_cleanup(st + continue; + + ring->skb[i] = NULL; ++ ++ ATH11K_MEMORY_STATS_DEC(ab, ce_rx_pipe, skb->truesize); ++ + dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, + skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); + dev_kfree_skb_any(skb); +@@ -992,6 +1007,9 @@ void ath11k_ce_free_pipes(struct ath11k_ + CE_DESC_RING_ALIGN, + ce_ring->base_addr_owner_space_unaligned, + ce_ring->base_addr_ce_space_unaligned); ++ ATH11K_MEMORY_STATS_DEC(ab, ce_ring_alloc, ++ pipe->src_ring->nentries * desc_sz + ++ CE_DESC_RING_ALIGN); + kfree(pipe->src_ring); + pipe->src_ring = NULL; + } +@@ -1004,6 +1022,9 @@ void ath11k_ce_free_pipes(struct ath11k_ + CE_DESC_RING_ALIGN, + ce_ring->base_addr_owner_space_unaligned, + ce_ring->base_addr_ce_space_unaligned); ++ ATH11K_MEMORY_STATS_DEC(ab, ce_ring_alloc, ++ pipe->dest_ring->nentries * desc_sz + ++ CE_DESC_RING_ALIGN); + kfree(pipe->dest_ring); + pipe->dest_ring = NULL; + } +@@ -1017,6 +1038,9 @@ void ath11k_ce_free_pipes(struct ath11k_ + CE_DESC_RING_ALIGN, + ce_ring->base_addr_owner_space_unaligned, + ce_ring->base_addr_ce_space_unaligned); ++ ATH11K_MEMORY_STATS_DEC(ab, ce_ring_alloc, ++ pipe->status_ring->nentries * desc_sz + ++ CE_DESC_RING_ALIGN); + kfree(pipe->status_ring); + pipe->status_ring = NULL; + } +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -2144,6 +2144,8 @@ int ath11k_core_pre_init(struct ath11k_b + if (nss_offload) + ab->nss.stats_enabled = 1; + ++ ab->enable_memory_stats = ATH11K_DEBUG_ENABLE_MEMORY_STATS; ++ + return 0; + } + EXPORT_SYMBOL(ath11k_core_pre_init); +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -930,6 +930,23 @@ struct ath11k_num_vdevs_peers { + u32 num_peers; + }; + ++struct ath11k_memory_stats { ++ /* Account kzalloc and valloc */ ++ atomic_t malloc_size; ++ /* Account dma_alloc in dp.c & hal.c */ ++ atomic_t dma_alloc; ++ /* Account memory used in ce rings */ ++ atomic_t ce_ring_alloc; ++ /* Account memory used in htc_send */ ++ atomic_t htc_skb_alloc; ++ /* Account memory used in wmi tx skb alloc */ ++ atomic_t wmi_tx_skb_alloc; ++ /* Account memory consumed for peer object */ ++ atomic_t per_peer_object; ++ /* Account memory used in ce rx pipe */ ++ atomic_t ce_rx_pipe; ++}; ++ + /* Master structure to hold the hw data which may be used in core module */ + struct ath11k_base { + enum ath11k_hw_rev hw_rev; +@@ -1019,6 +1036,7 @@ struct ath11k_base { + enum ath11k_dfs_region dfs_region; + #ifdef CPTCFG_ATH11K_DEBUGFS + struct dentry *debugfs_soc; ++ struct ath11k_memory_stats memory_stats; + #endif + struct ath11k_soc_dp_stats soc_stats; + +@@ -1085,6 +1103,7 @@ struct ath11k_base { + + atomic_t num_max_allowed; + struct ath11k_num_vdevs_peers *num_vdevs_peers; ++ bool enable_memory_stats; + + u32 rx_hash; + bool stats_disable; +--- a/drivers/net/wireless/ath/ath11k/dbring.c ++++ b/drivers/net/wireless/ath/ath11k/dbring.c +@@ -143,6 +143,7 @@ static int ath11k_dbring_fill_bufs(struc + break; + } + num_remain--; ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, size); + } + + spin_unlock_bh(&srng->lock); +@@ -392,6 +393,8 @@ void ath11k_dbring_buf_cleanup(struct at + idr_remove(&ring->bufs_idr, buf_id); + dma_unmap_single(ar->ab->dev, buff->paddr, + ring->buf_sz, DMA_FROM_DEVICE); ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(*buff) + ++ ring->buf_sz + ring->buf_align - 1); + kfree(buff->payload); + kfree(buff); + } +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -801,6 +801,8 @@ static ssize_t ath11k_debugfs_dump_soc_d + if (!buf) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, size); ++ + len += scnprintf(buf + len, size - len, "SOC RX STATS:\n\n"); + len += scnprintf(buf + len, size - len, "err ring pkts: %u\n", + soc_stats->err_ring_pkts); +@@ -842,6 +844,8 @@ static ssize_t ath11k_debugfs_dump_soc_d + retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); + kfree(buf); + ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, size); ++ + return retval; + } + +@@ -1094,6 +1098,106 @@ static const struct file_operations fops + .write = ath11k_write_stats_disable, + }; + ++static ssize_t ++ath11k_debug_read_enable_memory_stats(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_base *ab = file->private_data; ++ char buf[10]; ++ size_t len; ++ ++ len = scnprintf(buf, sizeof(buf), "%d\n", ab->enable_memory_stats); ++ ++ return simple_read_from_buffer(user_buf, count, ppos, buf, len); ++} ++ ++static ssize_t ++ath11k_debug_write_enable_memory_stats(struct file *file, ++ char __user *ubuf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_base *ab = file->private_data; ++ bool enable; ++ int ret; ++ ++ if (kstrtobool_from_user(ubuf, count, &enable)) ++ return -EINVAL; ++ ++ if (enable == ab->enable_memory_stats) { ++ ret = count; ++ goto exit; ++ } ++ ++ ab->enable_memory_stats = enable; ++ ret = count; ++exit: ++ return ret; ++} ++ ++static const struct file_operations fops_enable_memory_stats = { ++ .read = ath11k_debug_read_enable_memory_stats, ++ .write = ath11k_debug_write_enable_memory_stats, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++ .open = simple_open, ++}; ++ ++static ssize_t ath11k_debug_dump_memory_stats(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_base *ab = file->private_data; ++ struct ath11k_memory_stats *memory_stats = &ab->memory_stats; ++ int len = 0, retval; ++ const int size = 4096; ++ ++ char *buf; ++ ++ buf = kzalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ len += scnprintf(buf + len, size - len, "MEMORY STATS IN BYTES:\n"); ++ len += scnprintf(buf + len, size - len, "malloc size : %u\n", ++ atomic_read(&memory_stats->malloc_size)); ++ len += scnprintf(buf + len, size - len, "ce_ring_alloc size: %u\n", ++ atomic_read(&memory_stats->ce_ring_alloc)); ++ len += scnprintf(buf + len, size - len, "dma_alloc size:: %u\n", ++ atomic_read(&memory_stats->dma_alloc)); ++ len += scnprintf(buf + len, size - len, "htc_skb_alloc size: %u\n", ++ atomic_read(&memory_stats->htc_skb_alloc)); ++ len += scnprintf(buf + len, size - len, "wmi tx skb alloc size: %u\n", ++ atomic_read(&memory_stats->wmi_tx_skb_alloc)); ++ len += scnprintf(buf + len, size - len, "per peer object: %u\n", ++ atomic_read(&memory_stats->per_peer_object)); ++ len += scnprintf(buf + len, size - len, "rx_post_buf size: %u\n", ++ atomic_read(&memory_stats->ce_rx_pipe)); ++ len += scnprintf(buf + len, size - len, "Total size: %u\n\n", ++ (atomic_read(&memory_stats->malloc_size) + ++ atomic_read(&memory_stats->ce_ring_alloc) + ++ atomic_read(&memory_stats->dma_alloc) + ++ atomic_read(&memory_stats->htc_skb_alloc) + ++ atomic_read(&memory_stats->wmi_tx_skb_alloc) + ++ atomic_read(&memory_stats->per_peer_object) + ++ atomic_read(&memory_stats->ce_rx_pipe))); ++ ++ if (len > size) ++ len = size; ++ ++ retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); ++ kfree(buf); ++ ++ return retval; ++} ++ ++static const struct file_operations fops_memory_stats = { ++ .read = ath11k_debug_dump_memory_stats, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ + int ath11k_debugfs_pdev_create(struct ath11k_base *ab) + { + if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) +@@ -1112,6 +1216,12 @@ int ath11k_debugfs_pdev_create(struct at + debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, + &fops_soc_rx_hash); + ++ debugfs_create_file("enable_memory_stats", 0600, ab->debugfs_soc, ++ ab, &fops_enable_memory_stats); ++ ++ debugfs_create_file("memory_stats", 0600, ab->debugfs_soc, ab, ++ &fops_memory_stats); ++ + + return 0; + } +@@ -1742,6 +1852,8 @@ static ssize_t ath11k_dump_mgmt_stats(st + if (!buf) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, size); ++ + mutex_lock(&ar->conf_mutex); + spin_lock_bh(&ar->data_lock); + +@@ -1792,6 +1904,9 @@ static ssize_t ath11k_dump_mgmt_stats(st + ret = simple_read_from_buffer(ubuf, count, ppos, buf, len); + mutex_unlock(&ar->conf_mutex); + kfree(buf); ++ ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, size); ++ + return ret; + } + +--- a/drivers/net/wireless/ath/ath11k/debugfs.h ++++ b/drivers/net/wireless/ath/ath11k/debugfs.h +@@ -10,6 +10,7 @@ + + #define ATH11K_TX_POWER_MAX_VAL 70 + #define ATH11K_TX_POWER_MIN_VAL 0 ++#define ATH11K_DEBUG_ENABLE_MEMORY_STATS 1 + + /* htt_dbg_ext_stats_type */ + enum ath11k_dbg_htt_ext_stats_type { +@@ -263,6 +264,24 @@ struct ath11k_fw_dbglog { + }; + + #ifdef CPTCFG_ATH11K_DEBUGFS ++#define ATH11K_MEMORY_STATS_INC(_struct, _field, _size) \ ++do { \ ++ if (ath11k_debug_is_memory_stats_enabled(_struct)) \ ++ atomic_add(_size, &_struct->memory_stats._field); \ ++} while(0) ++ ++#define ATH11K_MEMORY_STATS_DEC(_struct, _field, _size) \ ++do { \ ++ if (ath11k_debug_is_memory_stats_enabled(_struct)) \ ++ atomic_sub(_size, &_struct->memory_stats._field); \ ++} while(0) ++ ++#else ++#define ATH11K_MEMORY_STATS_INC(_struct, _field, _size) ++#define ATH11K_MEMORY_STATS_DEC(_struct, _field, _size) ++#endif ++ ++#ifdef CPTCFG_ATH11K_DEBUGFS + int ath11k_debugfs_soc_create(struct ath11k_base *ab); + void ath11k_debugfs_soc_destroy(struct ath11k_base *ab); + int ath11k_debugfs_pdev_create(struct ath11k_base *ab); +@@ -313,6 +332,11 @@ void ath11k_debugfs_add_dbring_entry(str + enum ath11k_dbg_dbr_event event, + struct hal_srng *srng); + ++static inline int ath11k_debug_is_memory_stats_enabled(struct ath11k_base *ab) ++{ ++ return ab->enable_memory_stats; ++} ++ + #else + static inline int ath11k_debugfs_soc_create(struct ath11k_base *ab) + { +@@ -375,6 +399,11 @@ static inline bool ath11k_debugfs_is_pkt + return false; + } + ++static inline int ath11k_debug_is_memory_stats_enabled(struct ath11k_base *ab) ++{ ++ return 0; ++} ++ + static inline int ath11k_debugfs_rx_filter(struct ath11k *ar) + { + return 0; +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -468,6 +468,8 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); + kfree(buf); + ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, size); ++ + mutex_unlock(&ar->conf_mutex); + return retval; + } +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -115,6 +115,8 @@ void ath11k_dp_srng_cleanup(struct ath11 + dma_free_coherent(ab->dev, ring->size, ring->vaddr_unaligned, + ring->paddr_unaligned); + ++ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, ring->size); ++ + ring->vaddr_unaligned = NULL; + } + +@@ -278,6 +280,8 @@ int ath11k_dp_srng_setup(struct ath11k_b + if (!ring->vaddr_unaligned) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, ring->size); ++ + ring->vaddr = PTR_ALIGN(ring->vaddr_unaligned, HAL_RING_BASE_ALIGN); + ring->paddr = ring->paddr_unaligned + ((unsigned long)ring->vaddr - + (unsigned long)ring->vaddr_unaligned); +@@ -514,6 +518,7 @@ static void ath11k_dp_scatter_idle_link_ + dma_free_coherent(ab->dev, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX, + slist[i].vaddr, slist[i].paddr); + slist[i].vaddr = NULL; ++ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX); + } + } + +@@ -551,6 +556,7 @@ static int ath11k_dp_scatter_idle_link_d + ret = -ENOMEM; + goto err; + } ++ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX); + } + + scatter_idx = 0; +@@ -605,6 +611,7 @@ ath11k_dp_link_desc_bank_free(struct ath + link_desc_banks[i].vaddr_unaligned, + link_desc_banks[i].paddr_unaligned); + link_desc_banks[i].vaddr_unaligned = NULL; ++ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, link_desc_banks[i].size); + } + } + } +@@ -638,6 +645,7 @@ static int ath11k_dp_link_desc_bank_allo + ((unsigned long)desc_bank[i].vaddr - + (unsigned long)desc_bank[i].vaddr_unaligned); + desc_bank[i].size = desc_sz; ++ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, desc_bank[i].size); + } + + return 0; +@@ -1042,8 +1050,11 @@ static int ath11k_dp_tx_pending_cleanup( + void ath11k_dp_free(struct ath11k_base *ab) + { + struct ath11k_dp *dp = &ab->dp; ++ size_t size = 0; + int i; + ++ size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE; ++ + ath11k_dp_link_desc_cleanup(ab, dp->link_desc_banks, + HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); + +@@ -1057,6 +1068,7 @@ void ath11k_dp_free(struct ath11k_base * + ath11k_dp_tx_pending_cleanup, ab); + idr_destroy(&dp->tx_ring[i].txbuf_idr); + spin_unlock_bh(&dp->tx_ring[i].tx_idr_lock); ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, size); + kfree(dp->tx_ring[i].tx_status); + } + +@@ -1114,6 +1126,7 @@ int ath11k_dp_alloc(struct ath11k_base * + ret = -ENOMEM; + goto fail_cmn_srng_cleanup; + } ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, size); + } + + for (i = 0; i < HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX; i++) +--- a/drivers/net/wireless/ath/ath11k/hal.c ++++ b/drivers/net/wireless/ath/ath11k/hal.c +@@ -201,6 +201,8 @@ static int ath11k_hal_alloc_cont_rdp(str + if (!hal->rdp.vaddr) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, size); ++ + return 0; + } + +@@ -215,6 +217,7 @@ static void ath11k_hal_free_cont_rdp(str + size = sizeof(u32) * HAL_SRNG_RING_ID_MAX; + dma_free_coherent(ab->dev, size, + hal->rdp.vaddr, hal->rdp.paddr); ++ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, size); + hal->rdp.vaddr = NULL; + } + +@@ -229,6 +232,8 @@ static int ath11k_hal_alloc_cont_wrp(str + if (!hal->wrp.vaddr) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, size); ++ + return 0; + } + +@@ -243,6 +248,7 @@ static void ath11k_hal_free_cont_wrp(str + size = sizeof(u32) * HAL_SRNG_NUM_LMAC_RINGS; + dma_free_coherent(ab->dev, size, + hal->wrp.vaddr, hal->wrp.paddr); ++ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, size); + hal->wrp.vaddr = NULL; + } + +--- a/drivers/net/wireless/ath/ath11k/htc.c ++++ b/drivers/net/wireless/ath/ath11k/htc.c +@@ -28,6 +28,7 @@ struct sk_buff *ath11k_htc_alloc_skb(str + static void ath11k_htc_control_tx_complete(struct ath11k_base *ab, + struct sk_buff *skb) + { ++ ATH11K_MEMORY_STATS_DEC(ab, htc_skb_alloc, skb->truesize); + kfree_skb(skb); + } + +@@ -609,6 +610,7 @@ int ath11k_htc_connect_service(struct at + bool disable_credit_flow_ctrl = false; + u16 message_id, service_id, flags = 0; + u8 tx_alloc = 0; ++ size_t truesize; + + /* special case for HTC pseudo control service */ + if (conn_req->service_id == ATH11K_HTC_SVC_ID_RSVD_CTRL) { +@@ -632,6 +634,7 @@ int ath11k_htc_connect_service(struct at + return -ENOMEM; + } + ++ truesize = skb->truesize; + length = sizeof(*req_msg); + skb_put(skb, length); + memset(skb->data, 0, length); +@@ -667,6 +670,8 @@ int ath11k_htc_connect_service(struct at + return status; + } + ++ ATH11K_MEMORY_STATS_INC(ab, htc_skb_alloc, truesize); ++ + /* wait for response */ + time_left = wait_for_completion_timeout(&htc->ctl_resp, + ATH11K_HTC_CONN_SVC_TIMEOUT_HZ); +@@ -768,11 +773,13 @@ int ath11k_htc_start(struct ath11k_htc * + int status = 0; + struct ath11k_base *ab = htc->ab; + struct ath11k_htc_setup_complete_extended *msg; ++ size_t truesize; + + skb = ath11k_htc_build_tx_ctrl_skb(htc->ab); + if (!skb) + return -ENOMEM; + ++ truesize = skb->truesize; + skb_put(skb, sizeof(*msg)); + memset(skb->data, 0, skb->len); + +@@ -791,6 +798,8 @@ int ath11k_htc_start(struct ath11k_htc * + return status; + } + ++ ATH11K_MEMORY_STATS_INC(ab, htc_skb_alloc, truesize); ++ + return 0; + } + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -4058,6 +4058,8 @@ static int ath11k_mac_op_hw_scan(struct + goto exit; + } + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, sizeof(*arg)); ++ + ath11k_wmi_start_scan_init(ar, arg); + arg->vdev_id = arvif->vdev_id; + arg->scan_id = ATH11K_SCAN_ID; +@@ -4071,6 +4073,8 @@ static int ath11k_mac_op_hw_scan(struct + arg->extraie.len = req->ie_len; + } + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, req->ie_len); ++ + if (req->n_ssids) { + arg->num_ssids = req->n_ssids; + for (i = 0; i < arg->num_ssids; i++) { +@@ -4157,9 +4161,16 @@ static int ath11k_mac_op_hw_scan(struct + exit: + if (arg) { + kfree(arg->chan_list); +- kfree(arg->extraie.ptr); +- kfree(arg); +- } ++ ++ if (arg->extraie.ptr) { ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, req->ie_len); ++ kfree(arg->extraie.ptr); ++ } ++ ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(*arg)); ++ ++ kfree(arg); ++ } + + mutex_unlock(&ar->conf_mutex); + +@@ -8113,6 +8124,8 @@ ath11k_mac_update_active_vif_chan(struct + if (!arg.vifs) + return; + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, sizeof(arg.vifs[0])); ++ + ieee80211_iterate_active_interfaces_atomic(ar->hw, + IEEE80211_IFACE_ITER_NORMAL, + ath11k_mac_change_chanctx_fill_iter, +@@ -8120,6 +8133,8 @@ ath11k_mac_update_active_vif_chan(struct + + ath11k_mac_update_vif_chan(ar, arg.vifs, arg.n_vifs); + ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(arg.vifs[0])); ++ + kfree(arg.vifs); + } + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -1052,6 +1052,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 + default: + return -EINVAL; + } ++ ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, sizeof(*vdev_msg)); ++ + /* TODO: Convert to function for conversion in case of many + * such commands + */ +@@ -1082,6 +1085,7 @@ int ath11k_nss_vdev_set_cmd(struct ath11 + ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev set cmd success cmd:%d val:%d\n", + cmd, val); + free: ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(*vdev_msg)); + kfree(vdev_msg); + return status; + } +@@ -1098,6 +1102,9 @@ static int ath11k_nss_vdev_configure(str + if (!vdev_msg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, ++ sizeof(struct nss_wifi_vdev_msg)); ++ + vdev_cfg = &vdev_msg->msg.vdev_config; + + vdev_cfg->radio_ifnum = ar->nss.if_num; +@@ -1133,6 +1140,8 @@ static int ath11k_nss_vdev_configure(str + + ret = 0; + free: ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, ++ sizeof(struct nss_wifi_vdev_msg)); + kfree(vdev_msg); + + return ret; +@@ -1357,6 +1366,9 @@ int ath11k_nss_vdev_up(struct ath11k_vif + if (!vdev_msg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, ++ sizeof(struct nss_wifi_vdev_msg)); ++ + vdev_en = &vdev_msg->msg.vdev_enable; + + ether_addr_copy(vdev_en->mac_addr, arvif->vif->addr); +@@ -1381,6 +1393,8 @@ int ath11k_nss_vdev_up(struct ath11k_vif + if (ap_vlan_arvif->nss.added) + ath11k_nss_ext_vdev_up(ap_vlan_arvif); + free: ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, ++ sizeof(struct nss_wifi_vdev_msg)); + kfree(vdev_msg); + return ret; + } +@@ -1404,6 +1418,8 @@ int ath11k_nss_vdev_down(struct ath11k_v + if (!vdev_msg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, ++ sizeof(struct nss_wifi_vdev_msg)); + nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, + NSS_WIFI_VDEV_INTERFACE_DOWN_MSG, + sizeof(struct nss_wifi_vdev_disable_msg), +@@ -1423,6 +1439,8 @@ int ath11k_nss_vdev_down(struct ath11k_v + list) + ath11k_nss_ext_vdev_down(ap_vlan_arvif); + free: ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, ++ sizeof(struct nss_wifi_vdev_msg)); + kfree(vdev_msg); + return ret; + } +@@ -1875,6 +1893,9 @@ int ath11k_nss_set_peer_sec_type(struct + if (!wlmsg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, ++ sizeof(struct nss_wifili_msg)); ++ + sec_msg = &wlmsg->msg.securitymsg; + sec_msg->peer_id = peer->peer_id; + +@@ -1906,6 +1927,8 @@ int ath11k_nss_set_peer_sec_type(struct + ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss peer id %d security cfg complete\n", + peer->peer_id); + free: ++ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, ++ sizeof(struct nss_wifili_msg)); + kfree(wlmsg); + return status; + } +@@ -2593,6 +2616,7 @@ static void ath11k_nss_tx_desc_mem_free( + ab->nss.tx_desc_vaddr[i], + ab->nss.tx_desc_paddr[i]); + ab->nss.tx_desc_vaddr[i] = NULL; ++ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, ab->nss.tx_desc_size[i]); + } + + ath11k_dbg(ab, ATH11K_DBG_NSS, "allocated tx desc mem freed\n"); +@@ -2624,6 +2648,8 @@ static int ath11k_nss_tx_desc_mem_alloc( + ab->nss.tx_desc_size[curr_page_idx] = alloc_size; + curr_page_idx++; + ++ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, alloc_size); ++ + ath11k_dbg(ab, ATH11K_DBG_NSS, + "curr page %d, allocated %d, total allocated %d\n", + curr_page_idx, alloc_size, i + alloc_size); +@@ -2795,6 +2821,8 @@ static int ath11k_nss_init(struct ath11k + if (!wlmsg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + wim = &wlmsg->msg.init; + + wim->target_type = target_type; +@@ -2914,6 +2942,7 @@ unregister: + nss_unregister_wifili_if(ab->nss.if_num); + free: + ath11k_nss_tx_desc_mem_free(ab); ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); + kfree(wlmsg); + return -EINVAL; + } +@@ -3031,6 +3060,8 @@ int ath11k_nss_pdev_init(struct ath11k_b + goto unregister; + } + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + pdevmsg = &wlmsg->msg.pdevmsg; + + pdevmsg->radio_id = radio_id; +@@ -3077,6 +3108,8 @@ int ath11k_nss_pdev_init(struct ath11k_b + goto free; + } + ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + kfree(wlmsg); + + /* Disable nss sojourn stats by default */ +@@ -3095,6 +3128,7 @@ int ath11k_nss_pdev_init(struct ath11k_b + return 0; + + free: ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); + kfree(wlmsg); + unregister: + nss_unregister_wifili_radio_if(ar->nss.if_num); +@@ -3117,6 +3151,8 @@ int ath11k_nss_start(struct ath11k_base + if (!wlmsg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; + + /* Empty message for NSS Start message */ +@@ -3157,6 +3193,7 @@ int ath11k_nss_start(struct ath11k_base + ath11k_dbg(ab, ATH11K_DBG_NSS, "nss start success\n"); + + free: ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); + kfree(wlmsg); + return ret; + } +@@ -3175,6 +3212,8 @@ static void ath11k_nss_reset(struct ath1 + return; + } + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; + + /* Empty message for NSS Reset message */ +@@ -3213,6 +3252,7 @@ static void ath11k_nss_reset(struct ath1 + nss_unregister_wifili_if(ab->nss.if_num); + + free: ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); + kfree(wlmsg); + } + +@@ -3228,6 +3268,8 @@ static int ath11k_nss_stop(struct ath11k + if (!wlmsg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; + + /* Empty message for Stop command */ +@@ -3267,6 +3309,8 @@ static int ath11k_nss_stop(struct ath11k + /* NSS Stop success */ + ret = 0; + free: ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + kfree(wlmsg); + return ret; + } +@@ -3292,6 +3336,8 @@ int ath11k_nss_pdev_deinit(struct ath11k + if (!wlmsg) + return -ENOMEM; + ++ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); ++ + deinit = &wlmsg->msg.pdevdeinit; + deinit->ifnum = radio_id; + +@@ -3337,6 +3383,7 @@ int ath11k_nss_pdev_deinit(struct ath11k + nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); + nss_unregister_wifili_radio_if(ar->nss.if_num); + free: ++ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); + kfree(wlmsg); + return ret; + } +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -794,6 +794,9 @@ int ath11k_peer_delete(struct ath11k *ar + if (ret) + return ret; + ++ ATH11K_MEMORY_STATS_DEC(ar->ab, per_peer_object, ++ sizeof(struct ath11k_peer)); ++ + ar->num_peers--; + + return 0; +@@ -902,6 +905,8 @@ int ath11k_peer_create(struct ath11k *ar + arsta->tcl_metadata &= ~HTT_TCL_META_DATA_VALID_HTT; + } + ++ ATH11K_MEMORY_STATS_INC(ar->ab, per_peer_object, sizeof(*peer)); ++ + ar->num_peers++; + + spin_unlock_bh(&ar->ab->base_lock); +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -623,6 +623,8 @@ struct sk_buff *ath11k_wmi_alloc_skb(str + if (!skb) + return NULL; + ++ ATH11K_MEMORY_STATS_INC(ab, wmi_tx_skb_alloc, skb->truesize); ++ + skb_reserve(skb, WMI_SKB_HEADROOM); + if (!IS_ALIGNED((unsigned long)skb->data, 4)) + ath11k_warn(ab, "unaligned WMI skb data\n"); +@@ -7314,6 +7316,7 @@ static void ath11k_wmi_htc_tx_complete(s + u8 eid; + + eid = ATH11K_SKB_CB(skb)->eid; ++ ATH11K_MEMORY_STATS_DEC(ab, wmi_tx_skb_alloc, skb->truesize); + dev_kfree_skb(skb); + + if (eid >= ATH11K_HTC_EP_COUNT) +@@ -9107,6 +9110,7 @@ static void ath11k_wmi_tlv_op_rx(struct + } + + out: ++ ATH11K_MEMORY_STATS_DEC(ab, wmi_tx_skb_alloc, skb->truesize); + dev_kfree_skb(skb); + } + From 22a55da97d8d7a0f8d45590176b94d523412bfe0 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Wed, 10 Jan 2024 22:19:51 -0500 Subject: [PATCH 54/80] ath11k_nss: allow specifying pbuf 'memory_profile' In case you want to specify the memory profile to use rather than letting it autodetect. The following new uci option is introduced. pbuf. config general opt option memory_profile '' choices are 1gb, 512mb, 256mb. Delete option to let it autodetect. NOTE: You must reboot after changing these settings, for it to autoapply. ath11k_nss: fix compilation and rename some patches --- .../mac80211/files/etc/init.d/qca-nss-pbuf | 29 +++++++++++++++---- package/kernel/mac80211/files/pbuf.uci | 5 ++++ .../199-003-ath11k-add-nss-support.patch | 2 +- ...c80211-Add-support-for-dynamic-vlan.patch} | 0 ...ncapsulation-of-EAPOL-frames-if-OFFL.patch | 9 ++++++ ...=> 902-020-ath11k-add-btcoex-config.patch} | 0 ...9-ath11k-add-HE-stats-in-peer-stats.patch} | 0 .../905-ath11k-add-support-memory-stats.patch | 2 +- 8 files changed, 40 insertions(+), 7 deletions(-) create mode 100644 package/kernel/mac80211/files/pbuf.uci rename package/kernel/mac80211/patches/ath11k_nss/{207-ath11k-Add-support-for-dynamic-vlan.patch => 207-mac80211-Add-support-for-dynamic-vlan.patch} (100%) rename package/kernel/mac80211/patches/ath11k_nss/{902-ath11k-add-btcoex-config.patch => 902-020-ath11k-add-btcoex-config.patch} (100%) rename package/kernel/mac80211/patches/ath11k_nss/{902-ath11k-add-HE-stats-in-peer-stats.patch => 902-069-ath11k-add-HE-stats-in-peer-stats.patch} (100%) diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf index 260726fb12d871..be89de061ce8b1 100755 --- a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -43,7 +43,23 @@ apply_nss_config() { sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core0=256 > /dev/null 2> /dev/null sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core1=256 > /dev/null 2> /dev/null - board=$(board_name) + local memory_profile + if memory_profile=$(uci_get pbuf.opt.memory_profile); then + case "$memory_profile" in + 1g*|512m*|256m*) + board=$memory_profile + logger -t ath11k_nss "Using custom memory profile - $board" + ;; + *) + logger -s -t ath11k_nss -p user.error "Unknown profile $memory_profile. Choose 1gb, 512mb, or 256mb" + board=$(board_name) + logger -s -t ath11k_nss -p user.warn "Falling back to: $board" + ;; + esac + else + board=$(board_name) + logger -t ath11k_nss "Setting n2hcfg values for board: $board" + fi case "$board" in # 1GB+ profile @@ -60,7 +76,8 @@ apply_nss_config() { qnap,301w | \ xiaomi,ax9000 | \ yuncore,ax880 | \ - zyxel,nbg7815) + zyxel,nbg7815 | \ + 1g*) extra_pbuf_core0=9000000 n2h_high_water_core0=67392 n2h_wifi_pool_buf=40960 apply_sysctl ;; # 512MB profile @@ -69,11 +86,13 @@ apply_nss_config() { linksys,mx4200v1 | \ redmi,ax6 | \ xiaomi,ax3600 | \ - zte,mf269) # 512MB profile + zte,mf269 | \ + 512m*) extra_pbuf_core0=3100000 n2h_high_water_core0=30624 n2h_wifi_pool_buf=8192 apply_sysctl ;; # 256MB profile - netgear,wax218) + netgear,wax218 | \ + 256m*) extra_pbuf_core0=3100000 n2h_high_water_core0=30258 n2h_wifi_pool_buf=4096 apply_sysctl ;; esac @@ -88,7 +107,7 @@ start() { enable_nss_offload=$(cat /sys/module/ath11k/parameters/nss_offload) if [ "$enable_nss_offload" = "0" ]; then - logger -t ath11k_nss "Module parameter 'nss_offload=0'. Skipping applying wifi nss configs" + logger -t ath11k_nss -s user.warn "Module parameter 'nss_offload=0'. Skipping applying wifi nss configs" exit 1 fi diff --git a/package/kernel/mac80211/files/pbuf.uci b/package/kernel/mac80211/files/pbuf.uci new file mode 100644 index 00000000000000..ac4fadbc4f5e63 --- /dev/null +++ b/package/kernel/mac80211/files/pbuf.uci @@ -0,0 +1,5 @@ +config general opt + # to bypass board autodetection, uncomment ONE of the options below + # option memory_profile '1gb' + # option memory_profile '512mb' + # option memory_profile '256mb' diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch b/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch index cfe11083939837..ffae0a9448ef8b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch @@ -1069,7 +1069,7 @@ Signed-off-by: Sriram R /* create list containing all the subframes */ ieee80211_amsdu_to_8023s(skb, &subframe_list, NULL, - vif->type, 0, NULL, NULL); -+ vif->type, 0, NULL, NULL, false); ++ vif->type, 0, NULL, NULL, 0); /* This shouldn't happen, indicating error during defragmentation */ if (skb_queue_empty(&subframe_list)) diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/ath11k_nss/207-mac80211-Add-support-for-dynamic-vlan.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch rename to package/kernel/mac80211/patches/ath11k_nss/207-mac80211-Add-support-for-dynamic-vlan.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch b/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch index b64643140a14b1..70e2603c8cc02b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch @@ -66,6 +66,15 @@ Signed-off-by: Aaradhana Sahu rcu_read_unlock(); return; } +@@ -4374,7 +4378,7 @@ void __ieee80211_subif_start_xmit(struct + if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { + if (sta) + key = rcu_dereference(sta->ptk[sta->ptk_idx]); +- ieee80211_8023_xmit(sdata, dev, sta, key, skb); ++ ieee80211_8023_xmit(sdata, dev, sta, key, skb, info_flags, ctrl_flags, cookie); + } else { + ieee80211_tx_stats(dev, skb->len); + ieee80211_xmit(sdata, sta, skb); @@ -4657,19 +4663,29 @@ static bool ieee80211_tx_8023(struct iee static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch b/package/kernel/mac80211/patches/ath11k_nss/902-020-ath11k-add-btcoex-config.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-btcoex-config.patch rename to package/kernel/mac80211/patches/ath11k_nss/902-020-ath11k-add-btcoex-config.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/902-069-ath11k-add-HE-stats-in-peer-stats.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/902-ath11k-add-HE-stats-in-peer-stats.patch rename to package/kernel/mac80211/patches/ath11k_nss/902-069-ath11k-add-HE-stats-in-peer-stats.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch index f4f4389960bd74..734b6fb8c4b160 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch @@ -251,7 +251,7 @@ Signed-off-by: Maharaja Kennadyrajan + +static ssize_t +ath11k_debug_write_enable_memory_stats(struct file *file, -+ char __user *ubuf, ++ const char __user *ubuf, + size_t count, loff_t *ppos) +{ + struct ath11k_base *ab = file->private_data; From 019f41236fcf41395aadc7736635f783afdcefc3 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 13 Jan 2024 08:19:32 -0500 Subject: [PATCH 55/80] ath11k_nss: ath11k support dynamic vlan also support offload for the following: mac80211: * vlan * mesh (partial) ath11k: * vlan --- ...-ath11k-Add-support-for-dynamic-vlan.patch | 381 ++++ ...00-mac80211-nss-mesh-offload-support.patch | 1241 +++++++++++++ ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 80 + ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 45 + .../336-mac80211-Mesh-Fast-rx-support.patch | 208 +++ ...rning-with-monitor-interface-restart.patch | 33 + ...interface-combination-advertisement-.patch | 1594 +++++++++++++++++ .../829-mac80211-fix-mesh-ping-issue.patch | 113 ++ .../902-022-ath11k-add-ap-ps-support.patch | 324 ++++ ...x-memory-corruption-during-mesh-beac.patch | 68 + ...04-300-ath11k-nss_get_arvif_from_dev.patch | 113 ++ ...07-068-ath11k-add-rx-histogram-stats.patch | 608 +++++++ ...ul-ofdma-ru-allocation-in-peer-stats.patch | 452 +++++ ...11k-remove-error-on-soc-debugfs-fail.patch | 146 ++ .../908-301-ath11k-nss-mcbc-exception.patch | 253 +++ ...30-ath11k-sync-wds_ast_entry-updates.patch | 522 ++++++ ...ct-ast-index-assignment-for-wds-peer.patch | 96 + 17 files changed, 6277 insertions(+) create mode 100644 package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch new file mode 100644 index 00000000000000..b17b9fb419745d --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -0,0 +1,381 @@ +From 71add81f4a3f1ea505f498d789e7a1721c4d7a6e Mon Sep 17 00:00:00 2001 +From: Seevalamuthu Mariappan +Date: Mon, 4 Sep 2023 12:48:19 +0530 +Subject: [PATCH] ath11k: Add support for dynamic vlan + +This patch adds support for dynamic vlan. VLAN group traffics +are encrypted in software. vlan unicast packets shall be taking +8023 xmit path if encap offload is enabled and mcast/bcast will +be using 80211 xmit path. + +Metadata info in dp_tx added to notify firmware that the +multicast/broadcast packets are encrypted in sw. + +Signed-off-by: Seevalamuthu Mariappan +--- + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/dp_tx.c | 80 +++++++++- + drivers/net/wireless/ath/ath11k/dp_tx.h | 198 ++++++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/mac.c | 3 + + 4 files changed, 279 insertions(+), 3 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -116,6 +116,7 @@ struct ath11k_skb_cb { + u32 cipher; + struct ath11k *ar; + struct ieee80211_vif *vif; ++ u32 pkt_offset; + } __packed; + + struct ath11k_skb_rxcb { +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -79,6 +79,43 @@ enum hal_encrypt_type ath11k_dp_tx_get_e + } + } + ++#define HTT_META_DATA_ALIGNMENT 0x8 ++ ++static int ath11k_dp_metadata_align_skb(struct sk_buff *skb, u8 align_len) ++{ ++ if (unlikely(skb_cow_head(skb, align_len))) ++ return -ENOMEM; ++ ++ skb_push(skb, align_len); ++ memset(skb->data, 0, align_len); ++ return 0; ++} ++ ++static int ath11k_dp_prepare_htt_metadata(struct sk_buff *skb, ++ u8 *htt_metadata_size) ++{ ++ u8 htt_desc_size; ++ /* Size rounded of multiple of 8 bytes */ ++ u8 htt_desc_size_aligned; ++ int ret; ++ struct htt_tx_msdu_desc_ext *desc_ext; ++ ++ htt_desc_size = sizeof(struct htt_tx_msdu_desc_ext); ++ htt_desc_size_aligned = ALIGN(htt_desc_size, HTT_META_DATA_ALIGNMENT); ++ ++ ret = ath11k_dp_metadata_align_skb(skb, htt_desc_size_aligned); ++ if (unlikely(ret)) ++ return ret; ++ ++ desc_ext = (struct htt_tx_msdu_desc_ext *)skb->data; ++ desc_ext->valid_encrypt_type = 1; ++ desc_ext->encrypt_type = 0; ++ desc_ext->host_tx_desc_pool = 1; ++ *htt_metadata_size = htt_desc_size_aligned; ++ ++ return 0; ++} ++ + int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, + struct ath11k_sta *arsta, struct sk_buff *skb) + { +@@ -96,7 +133,8 @@ int ath11k_dp_tx(struct ath11k *ar, stru + int ret; + u32 ring_selector = 0; + u8 ring_map = 0; +- bool tcl_ring_retry; ++ bool tcl_ring_retry, is_diff_encap = false; ++ u8 align_pad, htt_meta_size = 0; + + if (unlikely(test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) + return -ESHUTDOWN; +@@ -189,7 +227,10 @@ tcl_ring_sel: + + switch (ti.encap_type) { + case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: +- ath11k_dp_tx_encap_nwifi(skb); ++ if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) ++ is_diff_encap = true; ++ else ++ ath11k_dp_tx_encap_nwifi(skb); + break; + case HAL_TCL_ENCAP_TYPE_RAW: + if (!test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags)) { +@@ -208,6 +249,33 @@ tcl_ring_sel: + goto fail_remove_idr; + } + ++ /* Add metadata for sw encrypted vlan group traffic */ ++ if ((!test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags) && ++ !(info->control.flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && ++ !info->control.hw_key && ieee80211_has_protected(hdr->frame_control)) || ++ (skb->protocol == cpu_to_be16(ETH_P_PAE) && is_diff_encap)) { ++ /* HW requirement is that metadata should always point to a ++ * 8-byte aligned address. So we add alignment pad to start of ++ * buffer. HTT Metadata should be ensured to be multiple of 8-bytes ++ * to get 8-byte aligned start address along with align_pad added ++ */ ++ align_pad = ((unsigned long)skb->data) & (HTT_META_DATA_ALIGNMENT - 1); ++ ret = ath11k_dp_metadata_align_skb(skb, align_pad); ++ if (unlikely(ret)) ++ goto fail_remove_idr; ++ ++ ti.pkt_offset += align_pad; ++ ret = ath11k_dp_prepare_htt_metadata(skb, &htt_meta_size); ++ if (unlikely(ret)) ++ goto fail_remove_idr; ++ ++ ti.pkt_offset += htt_meta_size; ++ ti.meta_data_flags |= HTT_TCL_META_DATA_VALID_HTT; ++ ti.flags0 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_TO_FW, 1); ++ ti.encap_type = HAL_TCL_ENCAP_TYPE_RAW; ++ ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; ++ } ++ + ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(ab->dev, ti.paddr))) { + atomic_inc(&ab->soc_stats.tx_err.misc_fail); +@@ -216,7 +284,8 @@ tcl_ring_sel: + goto fail_remove_idr; + } + +- ti.data_len = skb->len; ++ ti.data_len = skb->len - ti.pkt_offset; ++ skb_cb->pkt_offset = ti.pkt_offset; + skb_cb->paddr = ti.paddr; + skb_cb->vif = arvif->vif; + skb_cb->ar = ar; +@@ -272,6 +341,8 @@ fail_unmap_dma: + dma_unmap_single(ab->dev, ti.paddr, ti.data_len, DMA_TO_DEVICE); + + fail_remove_idr: ++ if (ti.pkt_offset) ++ skb_pull(skb, ti.pkt_offset); + spin_lock_bh(&tx_ring->tx_idr_lock); + idr_remove(&tx_ring->txbuf_idr, + FIELD_GET(DP_TX_DESC_ID_MSDU_ID, ti.desc_id)); +@@ -358,6 +429,9 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + flags = skb_cb->flags; + vif = skb_cb->vif; + ++ if (skb_cb->pkt_offset) ++ skb_pull(msdu, skb_cb->pkt_offset); /* removing the alignment and htt meta data */ ++ + memset(&info->status, 0, sizeof(info->status)); + + if (ts->acked) { +--- a/drivers/net/wireless/ath/ath11k/dp_tx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.h +@@ -16,6 +16,204 @@ struct ath11k_dp_htt_wbm_tx_status { + u16 peer_id; + }; + ++/* htt_tx_msdu_desc_ext ++ * ++ * valid_pwr ++ * if set, tx pwr spec is valid ++ * ++ * valid_mcs_mask ++ * if set, tx MCS mask is valid ++ * ++ * valid_nss_mask ++ * if set, tx Nss mask is valid ++ * ++ * valid_preamble_type ++ * if set, tx preamble spec is valid ++ * ++ * valid_retries ++ * if set, tx retries spec is valid ++ * ++ * valid_bw_info ++ * if set, tx dyn_bw and bw_mask are valid ++ * ++ * valid_guard_interval ++ * if set, tx guard intv spec is valid ++ * ++ * valid_chainmask ++ * if set, tx chainmask is valid ++ * ++ * valid_encrypt_type ++ * if set, encrypt type is valid ++ * ++ * valid_key_flags ++ * if set, key flags is valid ++ * ++ * valid_expire_tsf ++ * if set, tx expire TSF spec is valid ++ * ++ * valid_chanfreq ++ * if set, chanfreq is valid ++ * ++ * is_dsrc ++ * if set, MSDU is a DSRC frame ++ * ++ * guard_interval ++ * 0.4us, 0.8us, 1.6us, 3.2us ++ * ++ * encrypt_type ++ * 0 = NO_ENCRYPT, ++ * 1 = ENCRYPT, ++ * 2 ~ 3 - Reserved ++ * ++ * retry_limit ++ * Specify the maximum number of transmissions, including the ++ * initial transmission, to attempt before giving up if no ack ++ * is received. ++ * If the tx rate is specified, then all retries shall use the ++ * same rate as the initial transmission. ++ * If no tx rate is specified, the target can choose whether to ++ * retain the original rate during the retransmissions, or to ++ * fall back to a more robust rate. ++ * ++ * use_dcm_11ax ++ * If set, Use Dual subcarrier modulation. ++ * Valid only for 11ax preamble types HE_SU ++ * and HE_EXT_SU ++ * ++ * ltf_subtype_11ax ++ * Takes enum values of htt_11ax_ltf_subtype_t ++ * Valid only for 11ax preamble types HE_SU ++ * and HE_EXT_SU ++ * ++ * dyn_bw ++ * 0 = static bw, 1 = dynamic bw ++ * ++ * bw_mask ++ * Valid only if dyn_bw == 0 (static bw). ++ * ++ * host_tx_desc_pool ++ * If set, Firmware allocates tx_descriptors ++ * in WAL_BUFFERID_TX_HOST_DATA_EXP,instead ++ * of WAL_BUFFERID_TX_TCL_DATA_EXP. ++ * Use cases: ++ * Any time firmware uses TQM-BYPASS for Data ++ * TID, firmware expect host to set this bit. ++ * ++ * power ++ * unit of the power field is 0.5 dbm ++ * signed value ranging from -64dbm to 63.5 dbm ++ * ++ * mcs_mask ++ * mcs bit mask of 0 ~ 11 ++ * Setting more than one MCS isn't currently ++ * supported by the target (but is supported ++ * in the interface in case in the future ++ * the target supports specifications of ++ * a limited set of MCS values. ++ * ++ * nss_mask ++ * Nss bit mask 0 ~ 7 ++ * Setting more than one Nss isn't currently ++ * supported by the target (but is supported ++ * in the interface in case in the future ++ * the target supports specifications of ++ * a limited set of Nss values. ++ * ++ * pream_type ++ * Preamble types ++ * ++ * update_peer_cache ++ * When set these custom values will be ++ * used for all packets, until the next ++ * update via this ext header. ++ * This is to make sure not all packets ++ * need to include this header. ++ * ++ * chain_mask ++ * specify which chains to transmit from ++ * ++ * key_flags ++ * Key Index and related flags - used in mesh mode ++ * ++ * chanfreq ++ * Channel frequency: This identifies the desired channel ++ * frequency (in MHz) for tx frames. This is used by FW to help ++ * determine when it is safe to transmit or drop frames for ++ * off-channel operation. ++ * The default value of zero indicates to FW that the corresponding ++ * VDEV's home channel (if there is one) is the desired channel ++ * frequency. ++ * ++ * expire_tsf_lo ++ * tx expiry time (TSF) LSBs ++ * ++ * expire_tsf_hi ++ * tx expiry time (TSF) MSBs ++ * ++ * learning_frame ++ * When this flag is set, this frame will be dropped by FW ++ * rather than being enqueued to the Transmit Queue Manager (TQM) HW. ++ * ++ * send_as_standalone ++ * This will indicate if the msdu needs to be sent as a singleton PPDU, ++ * i.e. with no A-MSDU or A-MPDU aggregation. ++ * The scope is extended to other use-cases. ++ * ++ * is_host_opaque_valid ++ * set this bit to 1 if the host_opaque_cookie is populated ++ * with valid information. ++ * ++ * host_opaque_cookie ++ * Host opaque cookie for special frames ++ */ ++ ++struct htt_tx_msdu_desc_ext { ++ u32 ++ valid_pwr : 1, ++ valid_mcs_mask : 1, ++ valid_nss_mask : 1, ++ valid_preamble_type : 1, ++ valid_retries : 1, ++ valid_bw_info : 1, ++ valid_guard_interval : 1, ++ valid_chainmask : 1, ++ valid_encrypt_type : 1, ++ valid_key_flags : 1, ++ valid_expire_tsf : 1, ++ valid_chanfreq : 1, ++ is_dsrc : 1, ++ guard_interval : 2, ++ encrypt_type : 2, ++ retry_limit : 4, ++ use_dcm_11ax : 1, ++ ltf_subtype_11ax : 2, ++ dyn_bw : 1, ++ bw_mask : 6, ++ host_tx_desc_pool : 1; ++ u32 ++ power : 8, ++ mcs_mask : 12, ++ nss_mask : 8, ++ pream_type : 3, ++ update_peer_cache : 1; ++ u32 ++ chain_mask : 8, ++ key_flags : 8, ++ chanfreq : 16; ++ ++ u32 expire_tsf_lo; ++ u32 expire_tsf_hi; ++ ++ u32 ++ learning_frame : 1, ++ send_as_standalone : 1, ++ is_host_opaque_valid : 1, ++ rsvd0 : 29; ++ u32 ++ host_opaque_cookie : 16, ++ rsvd1 : 16; ++} __packed; ++ + void ath11k_dp_tx_update_txcompl(struct ath11k *ar, struct hal_tx_status *ts); + int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab); + int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9764,6 +9764,9 @@ static int __ath11k_mac_register(struct + */ + ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); + ++ ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN); ++ ar->hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN); ++ + /* Apply the regd received during initialization */ + ret = ath11k_regd_update(ar); + if (ret) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch new file mode 100644 index 00000000000000..7233913ee6f0f7 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch @@ -0,0 +1,1241 @@ +From fbe5a76d8c9ff1cf3f906a3c863928fc1adcbc95 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Kathirvel +Date: Tue, 16 Feb 2021 13:44:39 +0530 +Subject: [PATCH] ath11k: Add mesh nss offload support + +- New capability advertising nss offload support for mesh type +- Mesh obj vap and link vap registration/clean up +- Command/event handling +- New .ch files in ath11k for nss mesh offload related debugs +- Tx/Rx data path on mesh link vap uses native wifi format +- Mesh obj vap handls packets in ether format. No Tx on Mesh + obj vap is expected as packets transmitted in slow path is + supposed to be encapsulated in 802.11 format. +- New mac80211-driver callbacks for mesh vap, mpath and mpp + configurations. + +Signed-off-by: Vasanthakumar Thiagarajan + +Change-Id: Ib6950344286ba18fab43586262c62dcd09557614 +Co-developed-by: Karthikeyan Kathirvel +Signed-off-by: Karthikeyan Kathirvel +Signed-off-by: Vasanthakumar Thiagarajan +Signed-off-by: Gautham Kumar Senthilkumaran +--- + include/net/mac80211.h | 106 ++ + net/mac80211/cfg.c | 19 +- + net/mac80211/debug.h | 10 + + net/mac80211/debugfs.c | 1 + + net/mac80211/driver-ops.c | 20 + + net/mac80211/driver-ops.h | 7 + + net/mac80211/mesh.h | 5 + + net/mac80211/mesh_hwmp.c | 273 +++++ + net/mac80211/mesh_pathtbl.c | 167 ++- + net/mac80211/rx.c | 8 +- + 10 files changed, 2548 insertions(+), 206 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath11k/debug_nss.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug_nss.h + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -145,6 +145,9 @@ + */ + struct device; + ++struct ieee80211_mesh_path_offld; ++enum ieee80211_mesh_path_offld_cmd; ++ + /** + * enum ieee80211_max_queues - maximum number of queues + * +@@ -387,11 +390,17 @@ enum ieee80211_bss_change { + * to indicate which NSS BSS parameter changed. + * + * @BSS_CHANGED_NSS_AP_ISOLATE: AP Isolate feature in NSS mode ++ * @BSS_CHANGED_NSS_MESH_TTL: TTL update in NSS mesh mode ++ * @BSS_CHANGED_NSS_MESH_REFRESH_TIME: Mesh refresh time in NSS mesh mode ++ * @BSS_CHANGED_NSS_MESH_FWD_ENABLED: NSS offload mesh forward enabled + * + */ + + enum ieee80211_nss_bss_change { + BSS_CHANGED_NSS_AP_ISOLATE = BIT(0), ++ BSS_CHANGED_NSS_MESH_TTL = BIT(1), ++ BSS_CHANGED_NSS_MESH_REFRESH_TIME = BIT(2), ++ BSS_CHANGED_NSS_MESH_FWD_ENABLED = BIT(3), + }; + + /* +@@ -794,6 +803,11 @@ struct ieee80211_bss_conf { + bool eht_mu_beamformer; + bool nss_ap_isolate; + enum nl80211_beacon_tx_mode beacon_tx_mode; ++ ++ /* Mesh configuration for nss offload */ ++ u8 nss_offld_ttl; ++ bool nss_offld_mesh_forward_enabled; ++ u32 nss_offld_mpath_refresh_time; + }; + + /** +@@ -1273,6 +1287,8 @@ struct ieee80211_rate_status { + * @ack_hwtstamp: Hardware timestamp of the received ack in nanoseconds + * Only needed for Timing measurement and Fine timing measurement action + * frames. Only reported by devices that have timestamping enabled. ++ * @mpdu_succ: Number of mpdus successfully transmitted ++ * @mpdu_fail: Number of mpdus failed + */ + struct ieee80211_tx_status { + struct ieee80211_sta *sta; +@@ -1283,6 +1299,8 @@ struct ieee80211_tx_status { + u8 n_rates; + + struct list_head *free_list; ++ u32 mpdu_succ; ++ u32 mpdu_fail; + }; + + /** +@@ -1775,6 +1793,7 @@ struct ieee80211_channel_switch { + * this is not pure P2P vif. + * @IEEE80211_VIF_DISABLE_SMPS_OVERRIDE: disable user configuration of + * SMPS mode via debugfs. ++ * @IEEE80211_HW_NSS_OFFLOAD_DEBUG_MODE: It enables the debug mode of nss offload. + */ + enum ieee80211_vif_flags { + IEEE80211_VIF_BEACON_FILTER = BIT(0), +@@ -1782,6 +1801,7 @@ enum ieee80211_vif_flags { + IEEE80211_VIF_SUPPORTS_UAPSD = BIT(2), + IEEE80211_VIF_GET_NOA_UPDATE = BIT(3), + IEEE80211_VIF_DISABLE_SMPS_OVERRIDE = BIT(4), ++ IEEE80211_VIF_NSS_OFFLOAD_DEBUG_MODE = BIT(5), + }; + + +@@ -2765,6 +2785,7 @@ enum ieee80211_hw_flags { + IEEE80211_HW_DETECTS_COLOR_COLLISION, + IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, + IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, ++ IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, + + /* keep last, obviously */ + NUM_IEEE80211_HW_FLAGS +@@ -4265,6 +4286,8 @@ struct ieee80211_prep_tx_info { + * @set_sar_specs: Update the SAR (TX power) settings. + * @sta_set_decap_offload: Called to notify the driver when a station is allowed + * to use rx decapsulation offload ++ * @config_mesh_offload_path: Configure mesh path table when driver supports mesh offload. ++ * This calback must be atomic. + * @add_twt_setup: Update hw with TWT agreement parameters received from the peer. + * This callback allows the hw to check if requested parameters + * are supported and if there is enough room for a new agreement. +@@ -4648,6 +4671,12 @@ struct ieee80211_ops { + void (*sta_set_decap_offload)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, bool enabled); ++#ifdef CPTCFG_MAC80211_MESH ++ void (*config_mesh_offload_path)(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path); ++#endif + void (*add_twt_setup)(struct ieee80211_hw *hw, + struct ieee80211_sta *sta, + struct ieee80211_twt_setup *twt); +@@ -7481,4 +7510,100 @@ int ieee80211_set_active_links(struct ie + void ieee80211_set_active_links_async(struct ieee80211_vif *vif, + u16 active_links); + ++/* Defines for Mesh NSS offload */ ++ ++enum ieee80211_mesh_path_offld_cmd { ++ IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPATH, ++ IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPATH, ++ IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPATH, ++ IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPP, ++ IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPP, ++ IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPP, ++}; ++ ++enum ieee80211_mesh_path_offld_action { ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_REFRESH = BIT(0), ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_DEL = BIT(1), ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_EXP = BIT(2), ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_LEARN = BIT(3), ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_ADD = BIT(4), ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_UPDATE = BIT(5), ++ IEEE80211_MESH_PATH_OFFLD_ACTION_PATH_NOT_FOUND = BIT(6), ++}; ++ ++/* Duplicate defines to make it available to driver */ ++enum ieee80211_mesh_path_flags { ++ IEEE80211_MESH_PATH_ACTIVE = BIT(0), ++ IEEE80211_MESH_PATH_RESOLVING = BIT(1), ++ IEEE80211_MESH_PATH_SN_VALID = BIT(2), ++ IEEE80211_MESH_PATH_FIXED = BIT(3), ++ IEEE80211_MESH_PATH_RESOLVED = BIT(4), ++ IEEE80211_MESH_PATH_REQ_QUEUED = BIT(5), ++ IEEE80211_MESH_PATH_DELETED = BIT(6), ++}; ++ ++struct ieee80211_mesh_path_offld { ++ u8 mesh_da[ETH_ALEN]; ++ u8 da[ETH_ALEN]; ++ u8 next_hop[ETH_ALEN]; ++ u8 old_next_hop[ETH_ALEN]; ++ u8 ta[ETH_ALEN]; ++ u32 metric; ++ unsigned long exp_time; ++ u8 hop_count; ++ u16 flags; /* See &enum ieee80211_mesh_path_flags */ ++ u8 mesh_gate; ++ u8 block_mesh_fwd; ++ u8 metadata_type; ++}; ++ ++#ifdef CPTCFG_MAC80211_MESH ++/** ieee80211_mesh_path_offld_change_notify - Notify mesh path change event. ++ * @vif: Mesh interface on which the event is being reported. ++ * @path: Mesh path which got changed. Please note not all the entries in the ++ * path will have valid information. Based on the action code, it will be ++ * processed. ++ * @action: Type of the event. ++ */ ++int ieee80211_mesh_path_offld_change_notify(struct ieee80211_vif *vif, ++ struct ieee80211_mesh_path_offld *path, ++ enum ieee80211_mesh_path_offld_action action); ++ ++/** ieee80211s_update_metric_ppdu - Upate tx PPDU stats for 11s metric computation ++ * ++ * @hw: the hardware the frame was transmitted by ++ * @st: tx status information ++*/ ++void ieee80211s_update_metric_ppdu(struct ieee80211_hw *hw, ++ struct ieee80211_tx_status *st); ++ ++/** mesh_nss_offld_proxy_path_exp_update - update the expiry time from nss ++ * @vif Mesh interface on which the event is being reported. ++ * @mac: dest_mac_addr of the mesh proxy path ++ * @time_diff: This is the time diff since the mesh peer is active ++ */ ++void mesh_nss_offld_proxy_path_exp_update(struct ieee80211_vif *vif, u8* da, ++ u8* mesh_da, u32 time_diff); ++#else ++static inline int ++ieee80211_mesh_path_offld_change_notify(struct ieee80211_vif *vif, ++ struct ieee80211_mesh_path_offld *path, ++ enum ieee80211_mesh_path_offld_action action) ++{ ++ return 0; ++} ++ ++static inline void ++ieee80211s_update_metric_ppdu(struct ieee80211_hw *hw, ++ struct ieee80211_tx_status *st) ++{ ++} ++ ++static inline void ++mesh_nss_offld_proxy_path_exp_update(struct ieee80211_vif *vif, u8* da, ++ u8* mesh_da, u32 time_diff) ++{ ++} ++#endif ++ + #endif /* MAC80211_H */ +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -2514,6 +2514,7 @@ static int ieee80211_update_mesh_config( + struct mesh_config *conf; + struct ieee80211_sub_if_data *sdata; + struct ieee80211_if_mesh *ifmsh; ++ u32 nss_changed = 0; + + sdata = IEEE80211_DEV_TO_SUB_IF(dev); + ifmsh = &sdata->u.mesh; +@@ -2530,8 +2531,11 @@ static int ieee80211_update_mesh_config( + conf->dot11MeshMaxPeerLinks = nconf->dot11MeshMaxPeerLinks; + if (_chg_mesh_attr(NL80211_MESHCONF_MAX_RETRIES, mask)) + conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries; +- if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask)) ++ if (_chg_mesh_attr(NL80211_MESHCONF_TTL, mask)) { + conf->dot11MeshTTL = nconf->dot11MeshTTL; ++ sdata->vif.bss_conf.nss_offld_ttl = nconf->dot11MeshTTL; ++ nss_changed |= BSS_CHANGED_NSS_MESH_TTL; ++ } + if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask)) + conf->element_ttl = nconf->element_ttl; + if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask)) { +@@ -2545,8 +2549,12 @@ static int ieee80211_update_mesh_config( + if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES, mask)) + conf->dot11MeshHWMPmaxPREQretries = + nconf->dot11MeshHWMPmaxPREQretries; +- if (_chg_mesh_attr(NL80211_MESHCONF_PATH_REFRESH_TIME, mask)) ++ if (_chg_mesh_attr(NL80211_MESHCONF_PATH_REFRESH_TIME, mask)) { + conf->path_refresh_time = nconf->path_refresh_time; ++ sdata->vif.bss_conf.nss_offld_mpath_refresh_time = ++ nconf->path_refresh_time; ++ nss_changed |= BSS_CHANGED_NSS_MESH_REFRESH_TIME; ++ } + if (_chg_mesh_attr(NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT, mask)) + conf->min_discovery_timeout = nconf->min_discovery_timeout; + if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT, mask)) +@@ -2581,8 +2589,12 @@ static int ieee80211_update_mesh_config( + if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) + conf->dot11MeshHWMPRannInterval = + nconf->dot11MeshHWMPRannInterval; +- if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask)) ++ if (_chg_mesh_attr(NL80211_MESHCONF_FORWARDING, mask)) { + conf->dot11MeshForwarding = nconf->dot11MeshForwarding; ++ sdata->vif.bss_conf.nss_offld_mesh_forward_enabled = ++ nconf->dot11MeshForwarding; ++ nss_changed |= BSS_CHANGED_NSS_MESH_FWD_ENABLED; ++ } + if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) { + /* our RSSI threshold implementation is supported only for + * devices that report signal in dBm. +@@ -2624,6 +2636,7 @@ static int ieee80211_update_mesh_config( + conf->dot11MeshConnectedToAuthServer = + nconf->dot11MeshConnectedToAuthServer; + ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON); ++ ieee80211_nss_bss_info_change_notify(sdata, nss_changed); + return 0; + } + +--- a/net/mac80211/debug.h ++++ b/net/mac80211/debug.h +@@ -67,6 +67,12 @@ + #define MAC80211_MESH_PS_DEBUG 0 + #endif + ++#ifdef CPTCFG_MAC80211_MESH_OFFLOAD_DEBUG ++#define MAC80211_MESH_OFFLOAD_DEBUG 1 ++#else ++#define MAC80211_MESH_OFFLOAD_DEBUG 0 ++#endif ++ + #ifdef CPTCFG_MAC80211_TDLS_DEBUG + #define MAC80211_TDLS_DEBUG 1 + #else +@@ -215,6 +221,10 @@ do { \ + _sdata_dbg(MAC80211_MESH_PS_DEBUG, \ + sdata, fmt, ##__VA_ARGS__) + ++#define moffld_dbg(sdata, fmt, ...) \ ++ _sdata_dbg(MAC80211_MESH_OFFLOAD_DEBUG, \ ++ sdata, fmt, ##__VA_ARGS__) ++ + #define tdls_dbg(sdata, fmt, ...) \ + _sdata_dbg(MAC80211_TDLS_DEBUG, \ + sdata, fmt, ##__VA_ARGS__) +--- a/net/mac80211/debugfs.c ++++ b/net/mac80211/debugfs.c +@@ -497,6 +497,7 @@ static const char *hw_flag_names[] = { + FLAG(DETECTS_COLOR_COLLISION), + FLAG(MLO_MCAST_MULTI_LINK_TX), + FLAG(SUPPORTS_NSS_OFFLOAD), ++ FLAG(SUPPORTS_MESH_NSS_OFFLOAD), + #undef FLAG + }; + +--- a/net/mac80211/driver-ops.c ++++ b/net/mac80211/driver-ops.c +@@ -569,3 +569,23 @@ int drv_change_sta_links(struct ieee8021 + + return 0; + } ++ ++#ifdef CPTCFG_MAC80211_MESH ++void drv_config_mesh_offload_path(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ if (!check_sdata_in_driver(sdata)) ++ return; ++ ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_MESH_NSS_OFFLOAD)) ++ return; ++ ++ if (local->ops->config_mesh_offload_path) ++ local->ops->config_mesh_offload_path(&local->hw, ++ &sdata->vif, cmd, path); ++ ++ /* TODO: trace event */ ++} ++#endif +--- a/net/mac80211/driver-ops.h ++++ b/net/mac80211/driver-ops.h +@@ -1567,4 +1567,10 @@ int drv_change_sta_links(struct ieee8021 + struct ieee80211_sta *sta, + u16 old_links, u16 new_links); + ++#ifdef CPTCFG_MAC80211_MESH ++void drv_config_mesh_offload_path(struct ieee80211_local *local, ++ struct ieee80211_sub_if_data *sdata, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path); ++#endif /* CPTCFG_MAC80211_MESH */ + #endif /* __MAC80211_DRIVER_OPS */ +--- a/net/mac80211/mesh.h ++++ b/net/mac80211/mesh.h +@@ -316,6 +316,10 @@ void mesh_rx_path_sel_frame(struct ieee8 + struct ieee80211_mgmt *mgmt, size_t len); + struct mesh_path * + mesh_path_add(struct ieee80211_sub_if_data *sdata, const u8 *dst); ++struct mesh_path *__mesh_path_add(struct ieee80211_sub_if_data *sdata, ++ const u8 *dst); ++int __mpp_path_add(struct ieee80211_sub_if_data *sdata, ++ const u8 *dst, const u8 *mpp); + + int mesh_path_add_gate(struct mesh_path *mpath); + int mesh_path_send_to_gates(struct mesh_path *mpath); +@@ -357,6 +361,7 @@ void mesh_path_discard_frame(struct ieee + void mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata); + + bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt); ++void mesh_nss_offld_path_update(struct mesh_path *mpath, bool is_mpath, u8 *old_next_hop_addr); + struct ieee80211_mesh_fast_tx * + mesh_fast_tx_get(struct ieee80211_sub_if_data *sdata, + struct ieee80211_mesh_fast_tx_key *key); +--- a/net/mac80211/mesh_hwmp.c ++++ b/net/mac80211/mesh_hwmp.c +@@ -365,6 +365,13 @@ u32 airtime_link_metric_get(struct ieee8 + return (u32)result; + } + ++static inline struct sta_info * ++next_hop_deref_protected(struct mesh_path *mpath) ++{ ++ return rcu_dereference_protected(mpath->next_hop, ++ lockdep_is_held(&mpath->state_lock)); ++} ++ + /** + * hwmp_route_info_get - Update routing info to originator and transmitter + * +@@ -388,9 +395,10 @@ static u32 hwmp_route_info_get(struct ie + { + struct ieee80211_local *local = sdata->local; + struct mesh_path *mpath; +- struct sta_info *sta; ++ struct sta_info *sta, *next_hop; + bool fresh_info; + const u8 *orig_addr, *ta; ++ u8 old_next_hop_addr[ETH_ALEN] = {0}; + u32 orig_sn, orig_metric; + unsigned long orig_lifetime, exp_time; + u32 last_hop_metric, new_metric; +@@ -492,7 +500,10 @@ static u32 hwmp_route_info_get(struct ie + } + + if (fresh_info) { +- if (rcu_access_pointer(mpath->next_hop) != sta) { ++ next_hop = rcu_dereference(mpath->next_hop); ++ if (next_hop) ++ ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); ++ if (next_hop != sta) { + mpath->path_change_count++; + flush_mpath = true; + } +@@ -514,6 +525,8 @@ static u32 hwmp_route_info_get(struct ie + /* draft says preq_id should be saved to, but there does + * not seem to be any use for it, skipping by now + */ ++ ++ mesh_nss_offld_path_update(mpath, true, old_next_hop_addr); + } else + spin_unlock_bh(&mpath->state_lock); + } +@@ -544,7 +557,14 @@ static u32 hwmp_route_info_get(struct ie + } + + if (fresh_info) { +- if (rcu_access_pointer(mpath->next_hop) != sta) { ++ /* Reset the old_next_hop_addr since this may have filled ++ * if orig_addr and ta are different ++ */ ++ memset(old_next_hop_addr, 0, ETH_ALEN); ++ next_hop = rcu_dereference(mpath->next_hop); ++ if (next_hop) ++ ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); ++ if (next_hop != sta) { + mpath->path_change_count++; + flush_mpath = true; + } +@@ -561,6 +581,8 @@ static u32 hwmp_route_info_get(struct ie + /* init it at a low value - 0 start is tricky */ + ewma_mesh_fail_avg_add(&sta->mesh->fail_avg, 1); + mesh_path_tx_pending(mpath); ++ ++ mesh_nss_offld_path_update(mpath, true, old_next_hop_addr); + } else + spin_unlock_bh(&mpath->state_lock); + } +@@ -697,15 +719,6 @@ static void hwmp_preq_frame_process(stru + } + } + +- +-static inline struct sta_info * +-next_hop_deref_protected(struct mesh_path *mpath) +-{ +- return rcu_dereference_protected(mpath->next_hop, +- lockdep_is_held(&mpath->state_lock)); +-} +- +- + static void hwmp_prep_frame_process(struct ieee80211_sub_if_data *sdata, + struct ieee80211_mgmt *mgmt, + const u8 *prep_elem, u32 metric) +@@ -1349,3 +1362,274 @@ void mesh_path_tx_root_frame(struct ieee + return; + } + } ++ ++static int mesh_path_offld_mpath_refresh(struct ieee80211_sub_if_data *sdata, ++ u8 *mda) ++{ ++ struct mesh_path *mpath; ++ ++ rcu_read_lock(); ++ ++ mpath = mesh_path_lookup(sdata, mda); ++ if (!mpath || !(mpath->flags & MESH_PATH_ACTIVE)) { ++ moffld_dbg(sdata, ++ "mpath lookup failed during path refresh for %pM, is_mpath %d\n", ++ mda, mpath != NULL); ++ rcu_read_unlock(); ++ return -ENOENT; ++ } ++ ++ if (!(mpath->flags & MESH_PATH_RESOLVING) && !(mpath->flags & MESH_PATH_FIXED)) ++ mesh_queue_preq(mpath, PREQ_Q_F_START | PREQ_Q_F_REFRESH); ++ ++ rcu_read_unlock(); ++ ++ return 0; ++} ++ ++static int mesh_path_offld_mpath_del(struct ieee80211_sub_if_data *sdata, u8 *da) ++{ ++ struct mesh_path *mpath, *mppath; ++ ++ rcu_read_lock(); ++ ++ mpath = mesh_path_lookup(sdata, da); ++ if (!mpath) { ++ moffld_dbg(sdata, "mpath lookup failed for %pM during duplicate mpath removal\n", ++ da); ++ rcu_read_unlock(); ++ return -ENOENT; ++ } ++ ++ mppath = mpp_path_lookup(sdata, da); ++ if (!mppath) { ++ moffld_dbg(sdata, "proxy path lookup failed for %pM during duplicate mpath removal\n", ++ da); ++ rcu_read_unlock(); ++ return -EINVAL; ++ } ++ ++ mesh_path_del(sdata, mpath->dst); ++ ++ rcu_read_unlock(); ++ ++ return 0; ++} ++ ++static int mesh_path_offld_mpath_exp(struct ieee80211_sub_if_data *sdata, u8 *mda) ++{ ++ struct mesh_path *mpath; ++ ++ rcu_read_lock(); ++ ++ mpath = mesh_path_lookup(sdata, mda); ++ if (!mpath) { ++ mpath = mesh_path_add(sdata, mda); ++ if (IS_ERR(mpath)) { ++ rcu_read_unlock(); ++ moffld_dbg(sdata, ++ "failed to add mpath for %pM during mpath exp\n", mda); ++ return PTR_ERR(mpath); ++ } ++ } ++ ++ spin_lock_bh(&mpath->state_lock); ++ mpath->flags &= ~MESH_PATH_ACTIVE; ++ spin_unlock_bh(&mpath->state_lock); ++ ++ if (!(mpath->flags & MESH_PATH_RESOLVING) && ++ mesh_path_sel_is_hwmp(sdata)) ++ mesh_queue_preq(mpath, PREQ_Q_F_START); ++ ++ rcu_read_unlock(); ++ ++ return 0; ++} ++ ++static int mesh_path_offld_mpp_learn(struct ieee80211_sub_if_data *sdata, ++ u8 *da, u8 *mda) ++{ ++ struct mesh_path *mppath; ++ int ret; ++ ++ rcu_read_lock(); ++ mppath = mpp_path_lookup(sdata, da); ++ if (mppath) { ++ moffld_dbg(sdata, "proxy path for da %pM mesh_da %pM already exists\n", ++ da, mda); ++ rcu_read_unlock(); ++ return -EEXIST; ++ } ++ ++ ret = mpp_path_add(sdata, da, mda); ++ if (ret) ++ moffld_dbg(sdata, "failed to add proxy path entry (%d): da %pM mesh_da %pM\n", ++ ret, da, mda); ++ ++ rcu_read_unlock(); ++ ++ return ret; ++} ++ ++static int mesh_path_offld_mpp_add(struct ieee80211_sub_if_data *sdata, ++ u8 *da, u8 *mda) ++{ ++ struct mesh_path *mppath; ++ int ret; ++ ++ rcu_read_lock(); ++ mppath = mpp_path_lookup(sdata, da); ++ if (mppath) { ++ moffld_dbg(sdata, "proxy path for da %pM mesh_da %pM already exists\n", ++ da, mda); ++ rcu_read_unlock(); ++ return -EEXIST; ++ } ++ ++ ret = __mpp_path_add(sdata, da, mda); ++ if (ret) ++ moffld_dbg(sdata, "failed to add proxy path entry (%d): da %pM mesh_da %pM\n", ++ ret, da, mda); ++ ++ rcu_read_unlock(); ++ ++ return ret; ++} ++ ++static int mesh_path_offld_mpp_update(struct ieee80211_sub_if_data *sdata, ++ u8 *da, u8 *mda) ++{ ++ struct mesh_path *mppath; ++ ++ rcu_read_lock(); ++ mppath = mpp_path_lookup(sdata, da); ++ if (!mppath) { ++ moffld_dbg(sdata, ++ "proxy path lookup for da %pM failed during MPP update with mesh_da %pM\n", ++ da, mda); ++ rcu_read_unlock(); ++ return -ENOENT; ++ } else { ++ spin_lock_bh(&mppath->state_lock); ++ if (!ether_addr_equal(mppath->mpp, mda)) ++ memcpy(mppath->mpp, mda, ETH_ALEN); ++ mppath->exp_time = jiffies; ++ spin_unlock_bh(&mppath->state_lock); ++ } ++ rcu_read_unlock(); ++ ++ return 0; ++} ++ ++static int mesh_path_offld_mpath_not_found(struct ieee80211_sub_if_data *sdata, ++ u8 *mda, u8 *ta) ++{ ++ struct mesh_path *mpath; ++ struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; ++ ++ rcu_read_lock(); ++ ++ mpath = mesh_path_lookup(sdata, mda); ++ if (!mpath) { ++ mpath = mesh_path_add(sdata, mda); ++ if (IS_ERR(mpath)) { ++ moffld_dbg(sdata, "mpath add failed for mesh_da %pM (%lu)\n", ++ mda, PTR_ERR(mpath)); ++ rcu_read_unlock(); ++ return PTR_ERR(mpath); ++ } ++ } ++ ++ if (!(mpath->flags & MESH_PATH_RESOLVING) && ++ mesh_path_sel_is_hwmp(sdata)) ++ mesh_queue_preq(mpath, PREQ_Q_F_START); ++ ++ rcu_read_unlock(); ++ ++ if (!is_zero_ether_addr(ta)) ++ mesh_path_error_tx(sdata, ifmsh->mshcfg.element_ttl, ++ mda, 0, WLAN_REASON_MESH_PATH_NOFORWARD, ta); ++ ++ return 0; ++} ++ ++void ieee80211s_update_metric_ppdu(struct ieee80211_hw *hw, ++ struct ieee80211_tx_status *st) ++{ ++ struct sta_info *sta; ++ int i, num_mpdu; ++ bool failed; ++ struct rate_info rinfo; ++ ++ if (!st->sta) ++ return; ++ ++ if (st->mpdu_succ) { ++ num_mpdu = st->mpdu_succ; ++ failed = false; ++ } else if (st->mpdu_fail) { ++ num_mpdu = st->mpdu_fail; ++ failed = true; ++ } else ++ return; ++ ++ sta = container_of(st->sta, struct sta_info, sta); ++ if (!ieee80211_vif_is_mesh(&sta->sdata->vif)) ++ return; ++ ++ for (i = 0; i < num_mpdu; i++) { ++ ewma_mesh_fail_avg_add(&sta->mesh->fail_avg, failed * 100); ++ if (ewma_mesh_fail_avg_read(&sta->mesh->fail_avg) > ++ LINK_FAIL_THRESH) ++ mesh_plink_broken(sta); ++ ++ if (!st->rates) ++ continue; ++ ++ rinfo = st->rates->rate_idx; ++ ewma_mesh_tx_rate_avg_add(&sta->mesh->tx_rate_avg, ++ cfg80211_calculate_bitrate(&rinfo)); ++ } ++} ++EXPORT_SYMBOL(ieee80211s_update_metric_ppdu); ++ ++int ieee80211_mesh_path_offld_change_notify(struct ieee80211_vif *vif, ++ struct ieee80211_mesh_path_offld *path, ++ enum ieee80211_mesh_path_offld_action action) ++{ ++ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); ++ int ret = -ENOTSUPP; ++ ++ moffld_dbg(sdata, "received mesh offload event %d\n", action); ++ ++ switch (action) { ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_REFRESH: ++ ret = mesh_path_offld_mpath_refresh(sdata, path->mesh_da); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_DEL: ++ ret = mesh_path_offld_mpath_del(sdata, path->mesh_da); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_EXP: ++ ret = mesh_path_offld_mpath_exp(sdata, path->mesh_da); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_LEARN: ++ ret = mesh_path_offld_mpp_learn(sdata, path->da, path->mesh_da); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_ADD: ++ ret = mesh_path_offld_mpp_add(sdata, path->da, path->mesh_da); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_UPDATE: ++ ret = mesh_path_offld_mpp_update(sdata, path->da, ++ path->mesh_da); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_ACTION_PATH_NOT_FOUND: ++ ret = mesh_path_offld_mpath_not_found(sdata, path->da, ++ path->ta); ++ break; ++ default: ++ break; ++ } ++ ++ return ret; ++} ++EXPORT_SYMBOL(ieee80211_mesh_path_offld_change_notify); +--- a/net/mac80211/mesh_pathtbl.c ++++ b/net/mac80211/mesh_pathtbl.c +@@ -15,6 +15,7 @@ + #include "ieee80211_i.h" + #include "mesh.h" + #include ++#include "driver-ops.h" + + static void mesh_path_free_rcu(struct mesh_table *tbl, struct mesh_path *mpath); + +@@ -103,6 +104,63 @@ static void mesh_table_free(struct mesh_ + mesh_path_rht_free, tbl); + } + ++void mesh_nss_offld_proxy_path_exp_update(struct ieee80211_vif *vif, u8* da, u8* mesh_da, u32 inactive_time) ++{ ++ struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); ++ struct mesh_table *tbl = &sdata->u.mesh.mpp_paths; ++ struct mesh_path *mppath; ++ struct hlist_node *n; ++ unsigned long expiry; ++ ++ spin_lock_bh(&tbl->walk_lock); ++ hlist_for_each_entry_safe(mppath, n, &tbl->walk_head, walk_list) { ++ if(!ether_addr_equal(da, mppath->dst) || !ether_addr_equal(mesh_da, mppath->mpp)) ++ continue; ++ if ((!(mppath->flags & MESH_PATH_RESOLVING)) && ++ (!(mppath->flags & MESH_PATH_FIXED))) { ++ expiry = jiffies - msecs_to_jiffies(inactive_time); ++ mppath->exp_time = time_after(mppath->exp_time, expiry) ? ++ mppath->exp_time : expiry; ++ } ++ } ++ spin_unlock_bh(&tbl->walk_lock); ++} ++EXPORT_SYMBOL(mesh_nss_offld_proxy_path_exp_update); ++ ++void mesh_nss_offld_path_update(struct mesh_path *mpath, bool is_mpath, u8 *old_next_hop_addr) ++{ ++ struct ieee80211_mesh_path_offld path = {0}; ++ struct sta_info *next_hop; ++ struct ieee80211_sub_if_data *sdata = mpath->sdata; ++ ++ ++ path.metric = mpath->metric; ++ if (time_before(jiffies, mpath->exp_time)) ++ path.exp_time = jiffies_to_msecs(mpath->exp_time - jiffies); ++ ++ path.hop_count = mpath->hop_count; ++ path.flags = mpath->flags; ++ path.mesh_gate = mpath->is_gate; ++ if (is_mpath) { ++ ether_addr_copy(path.mesh_da, mpath->dst); ++ } else { ++ ether_addr_copy(path.mesh_da, mpath->mpp); ++ ether_addr_copy(path.da, mpath->dst); ++ } ++ ++ next_hop = rcu_dereference(mpath->next_hop); ++ if (next_hop) ++ ether_addr_copy(path.next_hop, next_hop->addr); ++ ++ if (old_next_hop_addr) ++ ether_addr_copy(path.old_next_hop, old_next_hop_addr); ++ ++ drv_config_mesh_offload_path(sdata->local, sdata, ++ is_mpath ? IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPATH : ++ IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPP, ++ &path); ++} ++ + /** + * mesh_path_assign_nexthop - update mesh path next hop + * +@@ -240,16 +298,23 @@ static void mesh_path_move_to_queue(stru + + + static struct mesh_path *mpath_lookup(struct mesh_table *tbl, const u8 *dst, +- struct ieee80211_sub_if_data *sdata) ++ struct ieee80211_sub_if_data *sdata, ++ bool is_mpath) + { + struct mesh_path *mpath; ++ bool update; ++ struct sta_info *next_hop; + + mpath = rhashtable_lookup(&tbl->rhead, dst, mesh_rht_params); + + if (mpath && mpath_expired(mpath)) { + spin_lock_bh(&mpath->state_lock); ++ next_hop = rcu_dereference(mpath->next_hop); ++ update = !!(mpath->flags & MESH_PATH_ACTIVE); + mpath->flags &= ~MESH_PATH_ACTIVE; + spin_unlock_bh(&mpath->state_lock); ++ if (update && is_mpath) ++ mesh_nss_offld_path_update(mpath, true, next_hop ? next_hop->addr : NULL); + } + return mpath; + } +@@ -266,13 +331,13 @@ static struct mesh_path *mpath_lookup(st + struct mesh_path * + mesh_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst) + { +- return mpath_lookup(&sdata->u.mesh.mesh_paths, dst, sdata); ++ return mpath_lookup(&sdata->u.mesh.mesh_paths, dst, sdata, true); + } + + struct mesh_path * + mpp_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst) + { +- return mpath_lookup(&sdata->u.mesh.mpp_paths, dst, sdata); ++ return mpath_lookup(&sdata->u.mesh.mpp_paths, dst, sdata, false); + } + + static struct mesh_path * +@@ -334,6 +399,7 @@ mpp_path_lookup_by_idx(struct ieee80211_ + int mesh_path_add_gate(struct mesh_path *mpath) + { + struct mesh_table *tbl; ++ struct sta_info *next_hop; + int err; + + rcu_read_lock(); +@@ -346,6 +412,7 @@ int mesh_path_add_gate(struct mesh_path + goto err_rcu; + } + mpath->is_gate = true; ++ next_hop = rcu_dereference(mpath->next_hop); + mpath->sdata->u.mesh.num_gates++; + + spin_lock(&tbl->gates_lock); +@@ -354,6 +421,8 @@ int mesh_path_add_gate(struct mesh_path + + spin_unlock_bh(&mpath->state_lock); + ++ mesh_nss_offld_path_update(mpath, true, next_hop ? next_hop->addr : NULL); ++ + mpath_dbg(mpath->sdata, + "Mesh path: Recorded new gate: %pM. %d known gates\n", + mpath->dst, mpath->sdata->u.mesh.num_gates); +@@ -370,16 +439,21 @@ err_rcu: + */ + static void mesh_gate_del(struct mesh_table *tbl, struct mesh_path *mpath) + { ++ struct sta_info *next_hop; ++ + lockdep_assert_held(&mpath->state_lock); + if (!mpath->is_gate) + return; + ++ next_hop = rcu_dereference(mpath->next_hop); + mpath->is_gate = false; + spin_lock_bh(&tbl->gates_lock); + hlist_del_rcu(&mpath->gate_list); + mpath->sdata->u.mesh.num_gates--; + spin_unlock_bh(&tbl->gates_lock); + ++ mesh_nss_offld_path_update(mpath, true, next_hop ? next_hop->addr : NULL); ++ + mpath_dbg(mpath->sdata, + "Mesh path: Deleted gate: %pM. %d known gates\n", + mpath->dst, mpath->sdata->u.mesh.num_gates); +@@ -667,17 +741,8 @@ void mesh_fast_tx_flush_addr(struct ieee + spin_unlock_bh(&cache->walk_lock); + } + +-/** +- * mesh_path_add - allocate and add a new path to the mesh path table +- * @dst: destination address of the path (ETH_ALEN length) +- * @sdata: local subif +- * +- * Returns: 0 on success +- * +- * State: the initial state of the new path is set to 0 +- */ +-struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata, +- const u8 *dst) ++struct mesh_path *__mesh_path_add(struct ieee80211_sub_if_data *sdata, ++ const u8 *dst) + { + struct mesh_table *tbl; + struct mesh_path *mpath, *new_mpath; +@@ -718,8 +783,36 @@ struct mesh_path *mesh_path_add(struct i + return new_mpath; + } + +-int mpp_path_add(struct ieee80211_sub_if_data *sdata, +- const u8 *dst, const u8 *mpp) ++/** ++ * mesh_path_add - allocate and add a new path to the mesh path table ++ * @dst: destination address of the path (ETH_ALEN length) ++ * @sdata: local subif ++ * ++ * Returns: 0 on success ++ * ++ * State: the initial state of the new path is set to 0 ++ */ ++struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata, ++ const u8 *dst) ++{ ++ struct mesh_path *new_path; ++ struct ieee80211_mesh_path_offld path = {0}; ++ ++ new_path = __mesh_path_add(sdata, dst); ++ if (IS_ERR(new_path)) ++ return new_path; ++ ++ ether_addr_copy(path.mesh_da, dst); ++ ++ drv_config_mesh_offload_path(sdata->local, sdata, ++ IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPATH, ++ &path); ++ ++ return new_path; ++} ++ ++int __mpp_path_add(struct ieee80211_sub_if_data *sdata, ++ const u8 *dst, const u8 *mpp) + { + struct mesh_table *tbl; + struct mesh_path *new_mpath; +@@ -757,6 +850,25 @@ int mpp_path_add(struct ieee80211_sub_if + return ret; + } + ++int mpp_path_add(struct ieee80211_sub_if_data *sdata, ++ const u8 *dst, const u8 *mpp) ++{ ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ ret = __mpp_path_add(sdata, dst, mpp); ++ if (ret) ++ return ret; ++ ++ ether_addr_copy(path.mesh_da, mpp); ++ ether_addr_copy(path.da, dst); ++ ++ drv_config_mesh_offload_path(sdata->local, sdata, ++ IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPP, ++ &path); ++ ++ return 0; ++} + + /** + * mesh_plink_broken - deactivates paths and sends perr when a link breaks +@@ -807,8 +919,29 @@ static void mesh_path_free_rcu(struct me + kfree_rcu(mpath, rcu); + } + +-static void __mesh_path_del(struct mesh_table *tbl, struct mesh_path *mpath) ++static void __mesh_path_del(struct mesh_table *tbl, struct mesh_path *mpath, ++ bool is_mpath_tbl) + { ++ struct ieee80211_mesh_path_offld path = {0}; ++ struct sta_info *next_hop; ++ struct ieee80211_sub_if_data *sdata = mpath->sdata; ++ ++ ++ path.metric = mpath->metric; ++ path.exp_time = mpath->exp_time; ++ path.hop_count = mpath->hop_count; ++ path.flags = mpath->flags; ++ if (is_mpath_tbl) { ++ ether_addr_copy(path.mesh_da, mpath->dst); ++ } else { ++ ether_addr_copy(path.mesh_da, mpath->mpp); ++ ether_addr_copy(path.da, mpath->dst); ++ } ++ ++ next_hop = rcu_dereference(mpath->next_hop); ++ if (next_hop) ++ ether_addr_copy(path.next_hop, next_hop->addr); ++ + hlist_del_rcu(&mpath->walk_list); + rhashtable_remove_fast(&tbl->rhead, &mpath->rhash, mesh_rht_params); + if (tbl == &mpath->sdata->u.mesh.mpp_paths) +@@ -816,6 +949,11 @@ static void __mesh_path_del(struct mesh_ + else + mesh_fast_tx_flush_mpath(mpath); + mesh_path_free_rcu(tbl, mpath); ++ ++ drv_config_mesh_offload_path(sdata->local, sdata, ++ is_mpath_tbl ? IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPATH : ++ IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPP, ++ &path); + } + + /** +@@ -839,7 +977,7 @@ void mesh_path_flush_by_nexthop(struct s + spin_lock_bh(&tbl->walk_lock); + hlist_for_each_entry_safe(mpath, n, &tbl->walk_head, walk_list) { + if (rcu_access_pointer(mpath->next_hop) == sta) +- __mesh_path_del(tbl, mpath); ++ __mesh_path_del(tbl, mpath, true); + } + spin_unlock_bh(&tbl->walk_lock); + } +@@ -854,19 +992,19 @@ static void mpp_flush_by_proxy(struct ie + spin_lock_bh(&tbl->walk_lock); + hlist_for_each_entry_safe(mpath, n, &tbl->walk_head, walk_list) { + if (ether_addr_equal(mpath->mpp, proxy)) +- __mesh_path_del(tbl, mpath); ++ __mesh_path_del(tbl, mpath, false); + } + spin_unlock_bh(&tbl->walk_lock); + } + +-static void table_flush_by_iface(struct mesh_table *tbl) ++static void table_flush_by_iface(struct mesh_table *tbl, bool is_mpath_tbl) + { + struct mesh_path *mpath; + struct hlist_node *n; + + spin_lock_bh(&tbl->walk_lock); + hlist_for_each_entry_safe(mpath, n, &tbl->walk_head, walk_list) { +- __mesh_path_del(tbl, mpath); ++ __mesh_path_del(tbl, mpath, is_mpath_tbl); + } + spin_unlock_bh(&tbl->walk_lock); + } +@@ -881,8 +1019,8 @@ static void table_flush_by_iface(struct + */ + void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata) + { +- table_flush_by_iface(&sdata->u.mesh.mesh_paths); +- table_flush_by_iface(&sdata->u.mesh.mpp_paths); ++ table_flush_by_iface(&sdata->u.mesh.mesh_paths, true); ++ table_flush_by_iface(&sdata->u.mesh.mpp_paths, false); + } + + /** +@@ -896,7 +1034,7 @@ void mesh_path_flush_by_iface(struct iee + */ + static int table_path_del(struct mesh_table *tbl, + struct ieee80211_sub_if_data *sdata, +- const u8 *addr) ++ const u8 *addr, bool is_mpath_tbl) + { + struct mesh_path *mpath; + +@@ -907,7 +1045,7 @@ static int table_path_del(struct mesh_ta + return -ENXIO; + } + +- __mesh_path_del(tbl, mpath); ++ __mesh_path_del(tbl, mpath, is_mpath_tbl); + spin_unlock_bh(&tbl->walk_lock); + return 0; + } +@@ -928,7 +1066,7 @@ int mesh_path_del(struct ieee80211_sub_i + /* flush relevant mpp entries first */ + mpp_flush_by_proxy(sdata, addr); + +- err = table_path_del(&sdata->u.mesh.mesh_paths, sdata, addr); ++ err = table_path_del(&sdata->u.mesh.mesh_paths, sdata, addr, true); + sdata->u.mesh.mesh_paths_generation++; + return err; + } +@@ -1031,7 +1169,10 @@ void mesh_path_flush_pending(struct mesh + */ + void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop) + { ++ struct sta_info *old_next_hop; ++ + spin_lock_bh(&mpath->state_lock); ++ old_next_hop = rcu_dereference(mpath->next_hop); + mesh_path_assign_nexthop(mpath, next_hop); + mpath->sn = 0xffff; + mpath->metric = 0; +@@ -1045,6 +1186,8 @@ void mesh_path_fix_nexthop(struct mesh_p + /* init it at a low value - 0 start is tricky */ + ewma_mesh_fail_avg_add(&next_hop->mesh->fail_avg, 1); + mesh_path_tx_pending(mpath); ++ ++ mesh_nss_offld_path_update(mpath, true, old_next_hop ? old_next_hop->addr : NULL); + } + + void mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata) +@@ -1056,7 +1199,7 @@ void mesh_pathtbl_init(struct ieee80211_ + + static + void mesh_path_tbl_expire(struct ieee80211_sub_if_data *sdata, +- struct mesh_table *tbl) ++ struct mesh_table *tbl, bool is_mpath_tbl) + { + struct mesh_path *mpath; + struct hlist_node *n; +@@ -1066,15 +1209,15 @@ void mesh_path_tbl_expire(struct ieee802 + if ((!(mpath->flags & MESH_PATH_RESOLVING)) && + (!(mpath->flags & MESH_PATH_FIXED)) && + time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE)) +- __mesh_path_del(tbl, mpath); ++ __mesh_path_del(tbl, mpath, is_mpath_tbl); + } + spin_unlock_bh(&tbl->walk_lock); + } + + void mesh_path_expire(struct ieee80211_sub_if_data *sdata) + { +- mesh_path_tbl_expire(sdata, &sdata->u.mesh.mesh_paths); +- mesh_path_tbl_expire(sdata, &sdata->u.mesh.mpp_paths); ++ mesh_path_tbl_expire(sdata, &sdata->u.mesh.mesh_paths, true); ++ mesh_path_tbl_expire(sdata, &sdata->u.mesh.mpp_paths, false); + } + + void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata) +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -2633,6 +2633,9 @@ static struct sk_buff *ieee80211_build_h + info_flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; + #endif + ++ info = IEEE80211_SKB_CB(skb); ++ memset(info, 0, sizeof(*info)); ++ + /* convert Ethernet header to proper 802.11 header (based on + * operation mode) */ + ethertype = (skb->data[12] << 8) | skb->data[13]; +@@ -2703,6 +2706,13 @@ static struct sk_buff *ieee80211_build_h + break; + #ifdef CPTCFG_MAC80211_MESH + case NL80211_IFTYPE_MESH_POINT: ++ if (ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && ++ (sdata->vif.driver_flags & IEEE80211_VIF_NSS_OFFLOAD_DEBUG_MODE) && ++ !(is_multicast_ether_addr(skb->data))) { ++ info->flags = IEEE80211_TX_CTL_HW_80211_ENCAP; ++ goto nss_mesh; ++ } ++ + if (!is_multicast_ether_addr(skb->data)) { + struct sta_info *next_hop; + bool mpp_lookup = true; +@@ -2966,10 +2976,10 @@ static struct sk_buff *ieee80211_build_h + + skb_reset_mac_header(skb); + +- info = IEEE80211_SKB_CB(skb); +- memset(info, 0, sizeof(*info)); +- +- info->flags = info_flags; ++#ifdef CPTCFG_MAC80211_MESH ++nss_mesh: ++#endif ++ info->flags |= info_flags; + info->ack_frame_id = info_id; + info->band = band; + +@@ -4284,6 +4294,7 @@ void __ieee80211_subif_start_xmit(struct + struct sk_buff *next; + int len = skb->len; + struct ieee80211_key *key = NULL; ++ struct ieee80211_tx_info *info; + struct ieee80211_sub_if_data *ap_sdata; + + if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { +@@ -4359,9 +4370,15 @@ void __ieee80211_subif_start_xmit(struct + goto out; + } + +- ieee80211_tx_stats(dev, skb->len); +- +- ieee80211_xmit(sdata, sta, skb); ++ info = IEEE80211_SKB_CB(skb); ++ if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { ++ if (sta) ++ key = rcu_dereference(sta->ptk[sta->ptk_idx]); ++ ieee80211_8023_xmit(sdata, dev, sta, key, skb); ++ } else { ++ ieee80211_tx_stats(dev, skb->len); ++ ieee80211_xmit(sdata, sta, skb); ++ } + } + goto out; + out_free: diff --git a/package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch new file mode 100644 index 00000000000000..1bfbd0ebdbb27e --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -0,0 +1,80 @@ +From 6a9662d48c4f277380283050370ab3f1f940b6a6 Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Mon, 4 Sep 2023 13:44:47 +0530 +Subject: [PATCH] ath11k: skip HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE config + +Don't set HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE flag to TCL, +HW only take care of tid classification if this flag is not set. + +Signed-off-by: Venkateswara Naralasetty +--- + drivers/net/wireless/ath/ath11k/dp_tx.c | 19 +------------------ + drivers/net/wireless/ath/ath11k/hal_tx.c | 1 - + drivers/net/wireless/ath/ath11k/mac.c | 2 ++ + 3 files changed, 3 insertions(+), 19 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -44,19 +44,6 @@ static void ath11k_dp_tx_encap_nwifi(str + hdr->frame_control &= ~__cpu_to_le16(IEEE80211_STYPE_QOS_DATA); + } + +-static u8 ath11k_dp_tx_get_tid(struct sk_buff *skb) +-{ +- struct ieee80211_hdr *hdr = (void *)skb->data; +- struct ath11k_skb_cb *cb = ATH11K_SKB_CB(skb); +- +- if (cb->flags & ATH11K_SKB_HW_80211_ENCAP) +- return skb->priority & IEEE80211_QOS_CTL_TID_MASK; +- else if (!ieee80211_is_data_qos(hdr->frame_control)) +- return HAL_DESC_REO_NON_QOS_TID; +- else +- return skb->priority & IEEE80211_QOS_CTL_TID_MASK; +-} +- + enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type(u32 cipher) + { + switch (cipher) { +@@ -143,9 +130,8 @@ int ath11k_dp_tx(struct ath11k *ar, stru + !ieee80211_is_data(hdr->frame_control))) + return -ENOTSUPP; + +- pool_id = skb_get_queue_mapping(skb) & (ATH11K_HW_MAX_QUEUES - 1); +- + ring_selector = ab->hw_params.hw_ops->get_ring_selector(skb); ++ pool_id = ring_selector; + + tcl_ring_sel: + tcl_ring_retry = false; +@@ -221,10 +207,6 @@ tcl_ring_sel: + if (ieee80211_vif_is_mesh(arvif->vif)) + ti.enable_mesh = true; + +- ti.flags1 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE, 1); +- +- ti.tid = ath11k_dp_tx_get_tid(skb); +- + switch (ti.encap_type) { + case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: + if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) +--- a/drivers/net/wireless/ath/ath11k/hal_tx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_tx.c +@@ -65,7 +65,6 @@ void ath11k_hal_tx_cmd_desc_setup(struct + FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_PKT_OFFSET, ti->pkt_offset); + + tcl_cmd->info2 = ti->flags1 | +- FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TID, ti->tid) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ti->lmac_id); + + tcl_cmd->info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9682,6 +9682,8 @@ static int __ath11k_mac_register(struct + ieee80211_hw_set(ar->hw, USES_RSS); + } + ++ ieee80211_hw_set(ar->hw, SUPPORTS_TID_CLASS_OFFLOAD); ++ + ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; + ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; + diff --git a/package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch new file mode 100644 index 00000000000000..6a37ba0e1aa730 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -0,0 +1,45 @@ +From c7bd857a315fb299e4c984be2f3720428477ae6e Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Thu, 11 Nov 2021 11:14:08 +0530 +Subject: [PATCH] ath11k: skip HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE config + +Don't set HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE flag to TCL, +HW only take care of tid classification if this flag is not set. + +Signed-off-by: Venkateswara Naralasetty +Signed-off-by: Gautham Kumar Senthilkumaran +--- + include/net/mac80211.h | 3 +++ + net/mac80211/debugfs.c | 1 + + net/mac80211/wme.c | 3 +++ + 3 files changed, 7 insertions(+) + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -2727,6 +2727,8 @@ struct ieee80211_txq { + * + * @IEEE80211_HW_SUPPORTS_NSS_OFFLOAD: Hardware/driver supports NSS offload + * ++ * @IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD: Hardware suports tid calssification offload. ++ * + * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays + */ + enum ieee80211_hw_flags { +@@ -2786,6 +2788,7 @@ enum ieee80211_hw_flags { + IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, + IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, + IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, ++ IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD, + + /* keep last, obviously */ + NUM_IEEE80211_HW_FLAGS +--- a/net/mac80211/debugfs.c ++++ b/net/mac80211/debugfs.c +@@ -498,6 +498,7 @@ static const char *hw_flag_names[] = { + FLAG(MLO_MCAST_MULTI_LINK_TX), + FLAG(SUPPORTS_NSS_OFFLOAD), + FLAG(SUPPORTS_MESH_NSS_OFFLOAD), ++ FLAG(SUPPORTS_TID_CLASS_OFFLOAD), + #undef FLAG + }; + diff --git a/package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch b/package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch new file mode 100644 index 00000000000000..d29a05f13943bf --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch @@ -0,0 +1,208 @@ +From 0f024902a8a54c70204f5b2f824c5dc74888c536 Mon Sep 17 00:00:00 2001 +From: Sriram R +Date: Wed, 29 Sep 2021 09:30:21 +0530 +Subject: [PATCH] mac80211: Add support for mesh fast Rx path + +Add support to process rx frames for the mesh destination +when driver supports fast Rx by offloading PN, Duplicate, +reordering to the HW. + +Fast Rx from a peer is enabled once the PLINK is established. +Fast Rx is not supported for the forwarding path currently. + +Signed-off-by: Sriram R +--- + net/mac80211/cfg.c | 5 + + net/mac80211/ieee80211_i.h | 1 + + net/mac80211/mesh_plink.c | 5 + + net/mac80211/rx.c | 262 ++++++++++++++++++++++++++++++++++++++++++++- + 4 files changed, 269 insertions(+), 4 deletions(-) + +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -1747,6 +1747,8 @@ static void sta_apply_mesh_params(struct + /* init at low value */ + ewma_mesh_tx_rate_avg_add(&sta->mesh->tx_rate_avg, 10); + ++ ieee80211_check_fast_rx(sta); ++ + break; + case NL80211_PLINK_LISTEN: + case NL80211_PLINK_BLOCKED: +@@ -1761,6 +1763,7 @@ static void sta_apply_mesh_params(struct + ieee80211_mps_sta_status_update(sta); + changed |= ieee80211_mps_set_sta_local_pm(sta, + NL80211_MESH_POWER_UNKNOWN); ++ ieee80211_check_fast_rx(sta); + break; + default: + /* nothing */ +--- a/net/mac80211/mesh_plink.c ++++ b/net/mac80211/mesh_plink.c +@@ -381,6 +381,8 @@ static u64 __mesh_plink_deactivate(struc + changed |= ieee80211_mps_set_sta_local_pm(sta, + NL80211_MESH_POWER_UNKNOWN); + ++ ieee80211_check_fast_rx(sta); ++ + return changed; + } + +@@ -846,6 +848,7 @@ static u64 mesh_plink_establish(struct i + mpl_dbg(sdata, "Mesh plink with %pM ESTABLISHED\n", sta->sta.addr); + ieee80211_mps_sta_status_update(sta); + changed |= ieee80211_mps_set_sta_local_pm(sta, mshcfg->power_mode); ++ ieee80211_check_fast_rx(sta); + return changed; + } + +@@ -864,7 +867,7 @@ static u64 mesh_plink_fsm(struct ieee802 + struct mesh_config *mshcfg = &sdata->u.mesh.mshcfg; + enum ieee80211_self_protected_actioncode action = 0; + u64 changed = 0; +- bool flush = false; ++ bool flush = false, check_fast_rx = false; + + mpl_dbg(sdata, "peer %pM in state %s got event %s\n", sta->sta.addr, + mplstates[sta->mesh->plink_state], mplevents[event]); +@@ -924,6 +927,7 @@ static u64 mesh_plink_fsm(struct ieee802 + break; + case CNF_ACPT: + changed |= mesh_plink_establish(sdata, sta); ++ check_fast_rx = true; + break; + default: + break; +@@ -939,6 +943,7 @@ static u64 mesh_plink_fsm(struct ieee802 + break; + case OPN_ACPT: + changed |= mesh_plink_establish(sdata, sta); ++ check_fast_rx = true; + action = WLAN_SP_MESH_PEERING_CONFIRM; + break; + default: +@@ -985,6 +990,10 @@ static u64 mesh_plink_fsm(struct ieee802 + break; + } + spin_unlock_bh(&sta->mesh->plink_lock); ++ ++ if (check_fast_rx) ++ ieee80211_check_fast_rx(sta); ++ + if (flush) + mesh_path_flush_by_nexthop(sta); + if (action) { +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -4663,10 +4663,15 @@ void ieee80211_check_fast_rx(struct sta_ + + break; + case NL80211_IFTYPE_MESH_POINT: ++ /* Not required for NSS mode */ ++ if (ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) ++ goto clear; ++ /* Note: da and sa offs are not static, determine in fast rx path */ ++ + fastrx.expected_ds_bits = cpu_to_le16(IEEE80211_FCTL_FROMDS | + IEEE80211_FCTL_TODS); +- fastrx.da_offs = offsetof(struct ieee80211_hdr, addr3); +- fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr4); ++ ++ fastrx.internal_forward = 0; + break; + default: + goto clear; +@@ -4707,7 +4712,7 @@ void ieee80211_check_fast_rx(struct sta_ + __release(check_fast_rx); + + if (assign) +- new = kmemdup(&fastrx, sizeof(fastrx), GFP_KERNEL); ++ new = kmemdup(&fastrx, sizeof(fastrx), GFP_ATOMIC); + + offload_flags = get_bss_sdata(sdata)->vif.offload_flags; + offload = offload_flags & IEEE80211_OFFLOAD_DECAP_ENABLED; +@@ -4890,6 +4895,10 @@ static bool ieee80211_invoke_fast_rx(str + u8 sa[ETH_ALEN]; + } addrs __aligned(2); + struct ieee80211_sta_rx_stats *stats; ++ struct ieee80211s_hdr *mesh_hdr; ++ struct mesh_path *mppath; ++ u8 da_offs = fast_rx->da_offs, sa_offs = fast_rx->sa_offs; ++ struct ieee80211_sub_if_data *sdata = rx->sdata; + + /* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write + * to a common data structure; drivers can implement that per queue +@@ -4939,6 +4948,37 @@ static bool ieee80211_invoke_fast_rx(str + snap_offs += IEEE80211_CCMP_HDR_LEN; + } + ++ /* Find corresponding offsets for mesh hdr */ ++ if (ieee80211_vif_is_mesh(&sdata->vif)) { ++ if (status->rx_flags & IEEE80211_RX_AMSDU) ++ return false; ++ ++ /* All mesh data frames needs to be QoS Data */ ++ if (unlikely(!ieee80211_is_data_qos(hdr->frame_control))) ++ return false; ++ ++ /* TODO forwarding not handled yet in fast rx */ ++ if (!ether_addr_equal(fast_rx->vif_addr, hdr->addr3)) ++ return false; ++ ++ /* Check if Min Mesh hdr is present */ ++ if (!pskb_may_pull(skb, hdrlen + 6)) ++ goto drop; ++ ++ /* Goto mesh hdr, located at snap offs compared to AP/STA */ ++ mesh_hdr = (struct ieee80211s_hdr *) (skb->data + snap_offs); ++ ++ /* Only Ext Mesh hdr supported in this path now */ ++ if ((mesh_hdr->flags & MESH_FLAGS_AE) != MESH_FLAGS_AE_A5_A6) ++ return false; ++ ++ /* Point to eaddr1 and eaddr2 */ ++ da_offs = snap_offs + ETH_ALEN; ++ sa_offs = da_offs + ETH_ALEN; ++ ++ snap_offs += sizeof(struct ieee80211s_hdr); ++ } ++ + if (!ieee80211_vif_is_mesh(&rx->sdata->vif) && + !(status->rx_flags & IEEE80211_RX_AMSDU)) { + if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) +@@ -4976,9 +5016,33 @@ static bool ieee80211_invoke_fast_rx(str + return true; + } + ++ /* Update MPP table for the received packet */ ++ if (ieee80211_vif_is_mesh(&sdata->vif)) { ++ char *proxied_addr, *mpp_addr; ++ ++ mpp_addr = hdr->addr4; ++ proxied_addr = mesh_hdr->eaddr2; ++ ++ /* Update mpp for the SA */ ++ rcu_read_lock(); ++ mppath = mpp_path_lookup(sdata, proxied_addr); ++ if (!mppath) { ++ mpp_path_add(sdata, proxied_addr, mpp_addr); ++ } else { ++ spin_lock_bh(&mppath->state_lock); ++ ++ if (!ether_addr_equal(mppath->mpp, mpp_addr)) ++ ether_addr_copy(mppath->mpp, mpp_addr); ++ ++ mppath->exp_time = jiffies; ++ spin_unlock_bh(&mppath->state_lock); ++ } ++ rcu_read_unlock(); ++ } ++ + /* do the header conversion - first grab the addresses */ +- ether_addr_copy(addrs.da, skb->data + fast_rx->da_offs); +- ether_addr_copy(addrs.sa, skb->data + fast_rx->sa_offs); ++ ether_addr_copy(addrs.da, skb->data + da_offs); ++ ether_addr_copy(addrs.sa, skb->data + sa_offs); + if (ieee80211_vif_is_mesh(&rx->sdata->vif)) { + skb_pull(skb, snap_offs - 2); + put_unaligned_be16(skb->len - 2, skb->data); diff --git a/package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch b/package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch new file mode 100644 index 00000000000000..d128824140ecb6 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch @@ -0,0 +1,33 @@ +From 0628e831520aa2e57aed02aee4a1772b40ce4f9d Mon Sep 17 00:00:00 2001 +From: Nagarajan Maran +Date: Thu, 30 Jun 2022 17:20:29 +0530 +Subject: [PATCH] mac80211: fix dynamic vlan warning with monitor interface restart + +When monitor interface restarts, in nss offload disabled +case, the encap and decap offload flags are removed +from all the interfaces in that phy#. + +However when dynamic VLAN and monitor interfaces are +created in the same phy#, these flags are not updated +correctly, due to which warning calltrace is observed. + +Add condition check to update the correct flags in +dynamic VLAN case. + +Signed-off-by: Nagarajan Maran +--- + net/mac80211/iface.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/net/mac80211/iface.c ++++ b/net/mac80211/iface.c +@@ -994,7 +994,8 @@ static bool ieee80211_set_sdata_offload_ + flags |= IEEE80211_OFFLOAD_DECAP_ENABLED; + + if (local->monitors && +- !ieee80211_hw_check(&local->hw, SUPPORTS_CONC_MON_RX_DECAP)) ++ (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) || ++ !ieee80211_hw_check(&local->hw, SUPPORTS_CONC_MON_RX_DECAP))) + flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED; + } else { + flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED; diff --git a/package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch b/package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch new file mode 100644 index 00000000000000..4a8328f4e3ca83 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch @@ -0,0 +1,1594 @@ +From 1c326ee47eb453b884aa0436916f73c458e1a7f3 Mon Sep 17 00:00:00 2001 +From: Vasanthakumar Thiagarajan +Date: Sat, 8 Oct 2022 13:59:17 +0530 +Subject: [PATCH 1/3] cfg80211/mac80211: extend iface comb +advertisement for multi-hardware dev + +When driver combines multiple discrete hardware under one wiphy, it is +required for the driver to be able to advertise iface combination +capabilities per underlying physical hardware. Iface combination for each +underlying hardware is described with an identifier, the same index which +is used in wiphy->hw_chans[] to learn the channel capabilities of the +respective hardware. It should be noted that the supporting drivers also +need to signal the iface comb capabilities that are common for all the +hardware through the existing interface to maintain the backward +compatibility with the user space. Provision to advertise per physical +hardware specific iface comb capabilities and the sanity checks on the +advertised capabilities are implemented in this commit. + +Example: + +Say driver abstracts two discrete hardware under one wiphy, +wiphy->hw_chans[0] supporting 2 GHz and wiphy->hw_chans[1] supporting +5 GHz. Each hardware can operate on only one channel at any given time +but under the wiphy there can be concurrent interfaces on both the radios. +2 GHz hardware supports #STA <= 1, #AP <= 3 total 4 and 5 GHz hardware +supports #STA <= 1, #AP <= 4 total 5 + +struct ieee80211_iface_limit limits_common[] = { + { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, + { .max = 3, .types = BIT(NL80211_IFTYPE_AP), }, +}; + +limits_common[] defines the minimum (common) capability out of all the +underlying hardware specific capabilities. This is reported in the existing +advertisement mechanism. Common max_interfaces across 2 GHz and 5 GHz is 4, +common num_different_channels is 1. + +struct ieee80211_iface_limit limits_2ghz[] = { + { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, + { .max = 3, .types = BIT(NL80211_IFTYPE_AP), }, +}; + +struct ieee80211_iface_limit limits_5ghz[] = { + { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, + { .max = 4, .types = BIT(NL80211_IFTYPE_AP), }, +}; + +struct ieee80211_iface_combination combination = { + .limits = limits_common, + .max_interfaces = 4, + .num_different_channels = 1, + ... + .freq_range = { + { + .hw_chan_idx = 0, + .limits = limits_2ghz, + .max_interfaces = 4, + .num_different_channels = 1, + .n_limits = ARRAY_SIZE(limits_2ghz), + }, + { + .hw_chan_idx = 1, + .limits = limits_5ghz, + .max_interfaces = 5, + .num_different_channels = 1, + .n_limits = ARRAY_SIZE(limits_5ghz), + }, + }, +}; + +Signed-off-by: Vasanthakumar Thiagarajan +--- + include/net/cfg80211.h | 188 +++++++++++++++++++- + net/mac80211/chan.c | 29 ++- + net/mac80211/ieee80211_i.h | 5 +- + net/mac80211/main.c | 58 ++++++ + net/mac80211/util.c | 315 ++++++++++++++++++++++++++------ + net/wireless/core.c | 265 ++++++++++++++++++++++----- + net/wireless/util.c | 356 +++++++++++++++++++++++++++++++++---- + 7 files changed, 1073 insertions(+), 143 deletions(-) + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -1537,27 +1537,60 @@ struct cfg80211_color_change_settings { + }; + + /** ++ * struct iface_comb_per_hw_params - HW specific interface combinations input ++ * ++ * Used to pass per-hw interface combination parameters ++ * ++ * @num_different_channels: the number of different channels we want to use ++ * with in the per-hw supported channels. ++ * @iftype_num: array with the number of interfaces of each interface ++ * type. The index is the interface type as specified in &enum ++ * nl80211_iftype. ++ */ ++ ++struct iface_comb_per_hw_params { ++ int num_different_channels; ++ int iftype_num[NUM_NL80211_IFTYPES]; ++}; ++ ++/** + * struct iface_combination_params - input parameters for interface combinations + * + * Used to pass interface combination parameters + * + * @num_different_channels: the number of different channels we want +- * to use for verification ++ * to use for verification, not applicable when hw specific interface ++ * combination parameters are passed in @per_hw_params + * @radar_detect: a bitmap where each bit corresponds to a channel + * width where radar detection is needed, as in the definition of + * &struct ieee80211_iface_combination.@radar_detect_widths + * @iftype_num: array with the number of interfaces of each interface + * type. The index is the interface type as specified in &enum +- * nl80211_iftype. ++ * nl80211_iftype. This will hold the interfaces which are not ++ * yet assigned a channel when hw specific interface combination ++ * is passed in @per_hw_params. + * @new_beacon_int: set this to the beacon interval of a new interface + * that's not operating yet, if such is to be checked as part of + * the verification ++ * @per_hw: underlying hw specific interface combinations. Per-hw channel ++ * list index as advertised in wiphy @hw_chans is used as index ++ * in @per_hw to maintain the interface combination of the corresponding ++ * hw. ++ * @chandef: Channel definition for which the interface combination is to be ++ * checked, when checking during interface preparation on a new channel, ++ * for example. This will be used when the driver advertises underlying ++ * hw specific interface combination in a multi-mac device. This will be ++ * NULL when the interface combination check is not due to channel or the ++ * interface combination does not include per-hw advertisement. ++ * + */ + struct iface_combination_params { + int num_different_channels; + u8 radar_detect; + int iftype_num[NUM_NL80211_IFTYPES]; + u32 new_beacon_int; ++ struct iface_comb_per_hw_params *per_hw; ++ const struct cfg80211_chan_def *chandef; + }; + + /** +@@ -4941,6 +4974,32 @@ struct ieee80211_iface_limit { + }; + + /** ++ * strucieee80211_iface_per_hw - hardware specific interface combination ++ * ++ * Drivers registering multiple radios under a single wiphy can advertise ++ * radio specific interface combinations through this structure. Please note ++ * that to maintain the compatibility with the user space which is not aware ++ * of this extension of per-hardware interface combination signaling, ++ * the driver should still advertise it's interface combination (mostly ++ * common minimum capability) using the existing interface combination signaling ++ * method. ++ * ++ * @hw_chans_idx: index of hardware specific channel list as per wiphy @hw_chans ++ * @limits: limits for the given interface type ++ * @num_different_channels: number of different channels which can be active ++ * concurrently in this hw ++ * @max_interfaces: maximum number of total interfaces allowed in this group ++ * @n_limits: number of limitations ++ */ ++struct ieee80211_iface_per_hw { ++ u8 hw_chans_idx; ++ const struct ieee80211_iface_limit *limits; ++ u32 num_different_channels; ++ u16 max_interfaces; ++ u8 n_limits; ++}; ++ ++/** + * struct ieee80211_iface_combination - possible interface combination + * + * With this structure the driver can describe which interface +@@ -4998,6 +5057,62 @@ struct ieee80211_iface_limit { + * .num_different_channels = 2, + * }; + * ++ * ++ * 4. Hardware specific interface combination with driver supporting two hw ++ * (MAC), one underlying MAC supporting 2 GHz band and the other supporting ++ * 5 GHz band. ++ * ++ * Allow #STA <= 1, #AP <= 1, channels = 1, total 2 in 2 GHz radio and ++ * ++ * Allow #STA <= 1, #AP <= 2, channels = 1, total 3 in 5 GHz radio ++ * ++ * Drivers advertising per-hardware interface combination should also ++ * advertise a sub-set of capabilities using existing interface mainly for ++ * maintaining compatibility with the user space which is not aware of the ++ * new per-hardware advertisement. ++ * ++ * Sub-set interface combination advertised in the existing infrastructure: ++ * Allow #STA <= 1, #AP <= 1, channel = 1, total 2 ++ * ++ * .. code-block:: c ++ * ++ * struct ieee80211_iface_limit limits4[] = { ++ * { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, ++ * { .max = 1, .types = BIT(NL80211_IFTYPE_AP), }, ++ * }; ++ * struct ieee80211_iface_limit limits5_2ghz[] = { ++ * { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, ++ * { .max = 1, .types = BIT(NL80211_IFTYPE_AP), }, ++ * }; ++ * struct ieee80211_iface_limit limits5_5ghz[] = { ++ * { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, ++ * { .max = 2, .types = BIT(NL80211_IFTYPE_AP), }, ++ * }; ++ * struct ieee80211_iface_per_hw hw_combinations[] = { ++ * { ++ * .hw_chans_idx = 0, ++ * .limits = limits5_2ghz, ++ * .num_different_channels = 1, ++ * .max_interfaces = 2, ++ * .n_limits = ARRAY_SIZE(limits5_2ghz), ++ * }, ++ * { ++ * .hw_chans_idx = 1, ++ * .limits = limits5_5ghz, ++ * .num_different_channels = 1, ++ * .max_interfaces = 3, ++ * .n_limits = ARRAY_SIZE(limits5_5ghz), ++ * }, ++ * }; ++ * struct ieee80211_iface_combination combination4 = { ++ * .limits = limits4, ++ * .n_limits = ARRAY_SIZE(limits4), ++ * .max_interfaces = 2, ++ * .num_different_channels = 1, ++ * .iface_hw_list = hw_combinations, ++ * .n_hw_list = ARRAY_SIZE(hw_combinations), ++ * }; ++ * + */ + struct ieee80211_iface_combination { + /** +@@ -5055,6 +5170,20 @@ struct ieee80211_iface_combination { + * combination must be greater or equal to this value. + */ + u32 beacon_int_min_gcd; ++ ++ /** ++ * @iface_hw_list: ++ * This wiphy has multiple underlying radios, describe interface ++ * combination for each of them, valid only when the driver advertises ++ * multi-radio presence in wiphy @hw_chans. ++ */ ++ const struct ieee80211_iface_per_hw *iface_hw_list; ++ ++ /** ++ * @n_hw_list: ++ * number of hardware in @iface_hw_List ++ */ ++ u32 n_hw_list; + }; + + struct ieee80211_txrx_stypes { +@@ -5305,6 +5434,18 @@ struct wiphy_iftype_akm_suites { + #define CFG80211_HW_TIMESTAMP_ALL_PEERS 0xffff + + /** ++ * struct ieee80211_supported_chans_per_hw - supported channels as per the ++ * underlying constituent hw configuration ++ * ++ * @n_chans: number of channels in @chans ++ * @chans: list of channels supported by the constituent hw ++ */ ++struct ieee80211_chans_per_hw { ++ int n_chans; ++ struct ieee80211_channel chans[]; ++}; ++ ++/** + * struct wiphy - wireless hardware description + * @mtx: mutex for the data (structures) of this device + * @reg_notifier: the driver's regulatory notification callback, +@@ -5520,6 +5661,13 @@ struct wiphy_iftype_akm_suites { + * A value of %CFG80211_HW_TIMESTAMP_ALL_PEERS indicates the driver + * supports enabling HW timestamping for all peers (i.e. no need to + * specify a mac address). ++ * @hw_chans: list of the channels supported by every constituent underlying hw. ++ * The drivers registering multiple radios under the a wiphy can advertise ++ * the list of channels supported by each hw in this list. Underlying hw ++ * specific channel list can be used while describing interface combination ++ * for each of the underlying hw. ++ * @num_hw: number of underlying hw for which the channels list are advertised ++ * in @hw_chans. + */ + struct wiphy { + struct mutex mtx; +@@ -5670,6 +5818,9 @@ struct wiphy { + + u16 hw_timestamp_max_peers; + ++ struct ieee80211_chans_per_hw **hw_chans; ++ int num_hw; ++ + char priv[] __aligned(NETDEV_ALIGN); + }; + +@@ -8956,9 +9107,32 @@ int cfg80211_check_combinations(struct w + int cfg80211_iter_combinations(struct wiphy *wiphy, + struct iface_combination_params *params, + void (*iter)(const struct ieee80211_iface_combination *c, +- void *data), ++ void *data, int hw_chan_idx), + void *data); + ++/** ++ * cfg80211_per_hw_iface_comb_advertised - if per-hw iface combination supported ++ * ++ * @wiphy: the wiphy ++ * ++ * This function is used to check underlying per-hw interface combination is ++ * advertised by the driver. ++ */ ++bool cfg80211_per_hw_iface_comb_advertised(struct wiphy *wiphy); ++ ++/** ++ * cfg80211_get_hw_idx_by_chan - get the hw index by the channel ++ * ++ * @wiphy: the wiphy ++ * @chandef: channel definition for which the supported hw index is ++ * required ++ * ++ * returns -1 in case the channel is not supported by any of the constituent ++ * hw ++ */ ++int cfg80211_get_hw_idx_by_chan(struct wiphy *wiphy, ++ const struct cfg80211_chan_def *chandef); ++ + /* + * cfg80211_stop_iface - trigger interface disconnection + * +@@ -9152,6 +9326,16 @@ bool cfg80211_iftype_allowed(struct wiph + void cfg80211_assoc_comeback(struct net_device *netdev, + const u8 *ap_addr, u32 timeout); + ++/** ++ * cfg80211_hw_chans_includes_dfs - check if per-hardware channel includes DFS ++ * @chans: hardware channel list ++ * ++ * Check if the given per-hardware list includes channels in DFS range. ++ * Please note the channel is checked against the entire range of DFS ++ * freq in 5 GHz irrespective of regulatory configurations. ++ */ ++bool cfg80211_hw_chans_includes_dfs(const struct ieee80211_chans_per_hw *chans); ++ + /* Logging, debugging and troubleshooting/diagnostic helpers. */ + + /* wiphy_printk helpers, similar to dev_printk */ +--- a/net/mac80211/chan.c ++++ b/net/mac80211/chan.c +@@ -47,26 +47,41 @@ int ieee80211_chanctx_refcount(struct ie + ieee80211_chanctx_num_reserved(local, ctx); + } + +-static int ieee80211_num_chanctx(struct ieee80211_local *local) ++static int ieee80211_num_chanctx(struct ieee80211_local *local, ++ const struct cfg80211_chan_def *chandef) + { + struct ieee80211_chanctx *ctx; + int num = 0; ++ int hw_idx, ctx_idx; + + lockdep_assert_held(&local->chanctx_mtx); + +- list_for_each_entry(ctx, &local->chanctx_list, list) +- num++; ++ hw_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, chandef); ++ ++ list_for_each_entry(ctx, &local->chanctx_list, list) { ++ if (hw_idx < 0) ++ num++; ++ else { ++ ctx_idx = ++ cfg80211_get_hw_idx_by_chan(local->hw.wiphy, ++ &ctx->conf.def); ++ if (ctx_idx == hw_idx) ++ num++; ++ } ++ } + + return num; + } + +-static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local) ++static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local, ++ const struct cfg80211_chan_def *chandef) + { + lockdep_assert_held(&local->chanctx_mtx); +- return ieee80211_num_chanctx(local) < ieee80211_max_num_channels(local); ++ return ieee80211_num_chanctx(local, chandef) < ++ ieee80211_max_num_channels(local, chandef); + } + +-static struct ieee80211_chanctx * ++struct ieee80211_chanctx * + ieee80211_link_get_chanctx(struct ieee80211_link_data *link) + { + struct ieee80211_local *local __maybe_unused = link->sdata->local; +@@ -1116,7 +1131,7 @@ int ieee80211_link_reserve_chanctx(struc + + new_ctx = ieee80211_find_reservation_chanctx(local, chandef, mode); + if (!new_ctx) { +- if (ieee80211_can_create_new_chanctx(local)) { ++ if (ieee80211_can_create_new_chanctx(local, chandef)) { + new_ctx = ieee80211_new_chanctx(local, chandef, mode); + if (IS_ERR(new_ctx)) + return PTR_ERR(new_ctx); +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -2573,6 +2573,8 @@ void ieee80211_link_copy_chanctx_to_vlan + bool clear); + int ieee80211_chanctx_refcount(struct ieee80211_local *local, + struct ieee80211_chanctx *ctx); ++struct ieee80211_chanctx * ++ieee80211_link_get_chanctx(struct ieee80211_link_data *link); + + void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, + struct ieee80211_chanctx *chanctx); +@@ -2594,7 +2596,8 @@ int ieee80211_check_combinations(struct + const struct cfg80211_chan_def *chandef, + enum ieee80211_chanctx_mode chanmode, + u8 radar_detect); +-int ieee80211_max_num_channels(struct ieee80211_local *local); ++int ieee80211_max_num_channels(struct ieee80211_local *local, ++ const struct cfg80211_chan_def *chandef); + void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local, + struct ieee80211_chanctx *ctx); + +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -937,6 +937,45 @@ static int ieee80211_init_cipher_suites( + return 0; + } + ++static int ++ieee80211_check_per_hw_iface_comb(struct ieee80211_local *local, ++ const struct ieee80211_iface_combination *c) ++{ ++ int h, l; ++ u32 hw_idx_bm = 0; ++ ++ if (!local->use_chanctx) ++ return -EINVAL; ++ ++ for (h = 0; h < c->n_hw_list; h++) { ++ const struct ieee80211_iface_per_hw *hl; ++ const struct ieee80211_chans_per_hw *chans; ++ ++ hl = &c->iface_hw_list[h]; ++ ++ if (hl->hw_chans_idx >= local->hw.wiphy->num_hw) ++ return -EINVAL; ++ ++ chans = local->hw.wiphy->hw_chans[hl->hw_chans_idx]; ++ if (c->radar_detect_widths && ++ cfg80211_hw_chans_includes_dfs(chans) && ++ hl->num_different_channels > 1) ++ return -EINVAL; ++ ++ for (l = 0; l < hl->n_limits; l++) ++ if ((hl->limits[l].types & BIT(NL80211_IFTYPE_ADHOC)) && ++ hl->limits[l].max > 1) ++ return -EINVAL; ++ ++ if (hw_idx_bm & BIT(h)) ++ return -EINVAL; ++ ++ hw_idx_bm |= BIT(h); ++ } ++ ++ return 0; ++} ++ + int ieee80211_register_hw(struct ieee80211_hw *hw) + { + struct ieee80211_local *local = hw_to_local(hw); +@@ -1051,6 +1090,25 @@ int ieee80211_register_hw(struct ieee802 + } + } + ++ for (i = 0; i < local->hw.wiphy->n_iface_combinations; i++) { ++ const struct ieee80211_iface_combination *comb; ++ ++ comb = &local->hw.wiphy->iface_combinations[i]; ++ ++ if (comb->n_hw_list && !local->hw.wiphy->num_hw) ++ return -EINVAL; ++ ++ if (!comb->n_hw_list) ++ continue; ++ ++ /* ++ * Run through similar validations on the per-hardware ++ * interface combinations, if advertised. ++ */ ++ if (ieee80211_check_per_hw_iface_comb(local, comb)) ++ return -EINVAL; ++ } ++ + /* Only HW csum features are currently compatible with mac80211 */ + if (WARN_ON(hw->netdev_features & ~MAC80211_SUPPORTED_FEATURES)) + return -EINVAL; +--- a/net/mac80211/util.c ++++ b/net/mac80211/util.c +@@ -4818,16 +4818,174 @@ static u8 ieee80211_chanctx_radar_detect + return radar_detect; + } + ++static void ++ieee80211_prepare_iface_combination(struct ieee80211_sub_if_data *sdata, ++ const struct cfg80211_chan_def *chandef, ++ enum ieee80211_chanctx_mode chanmode, ++ struct iface_combination_params *params, ++ int *total) ++{ ++ struct ieee80211_local *local = sdata->local; ++ struct ieee80211_sub_if_data *sdata_iter; ++ enum nl80211_iftype iftype = sdata->wdev.iftype; ++ struct ieee80211_chanctx *ctx; ++ ++ lockdep_assert_held(&local->chanctx_mtx); ++ ++ if (chandef) ++ params->num_different_channels = 1; ++ ++ if (iftype != NL80211_IFTYPE_UNSPECIFIED) ++ params->iftype_num[iftype] = 1; ++ ++ list_for_each_entry(ctx, &local->chanctx_list, list) { ++ if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) ++ continue; ++ params->radar_detect |= ++ ieee80211_chanctx_radar_detect(local, ctx); ++ if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) { ++ params->num_different_channels++; ++ continue; ++ } ++ if (chandef && chanmode == IEEE80211_CHANCTX_SHARED && ++ cfg80211_chandef_compatible(chandef, ++ &ctx->conf.def)) ++ continue; ++ params->num_different_channels++; ++ } ++ ++ list_for_each_entry_rcu(sdata_iter, &local->interfaces, list) { ++ struct wireless_dev *wdev_iter; ++ ++ wdev_iter = &sdata_iter->wdev; ++ ++ if (sdata_iter == sdata || ++ !ieee80211_sdata_running(sdata_iter) || ++ cfg80211_iftype_allowed(local->hw.wiphy, ++ wdev_iter->iftype, 0, 1)) ++ continue; ++ ++ params->iftype_num[wdev_iter->iftype]++; ++ (*total)++; ++ } ++} ++ ++static void ++ieee80211_get_per_hw_sdata_active_iface(struct ieee80211_sub_if_data *sdata, ++ struct iface_combination_params *params, ++ int *total) ++{ ++ struct ieee80211_local *local = sdata->local; ++ unsigned int link_id; ++ int idx; ++ ++ for (link_id = 0; link_id < ARRAY_SIZE(sdata->link); link_id++) { ++ struct ieee80211_link_data *link; ++ struct ieee80211_chanctx *ctx; ++ ++ link = sdata_dereference(sdata->link[link_id], sdata); ++ if (!link) ++ continue; ++ ++ ctx = ieee80211_link_get_chanctx(link); ++ if (ctx && ++ ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) ++ ctx = ctx->replace_ctx; ++ ++ idx = -1; ++ if (ctx) ++ idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, ++ &ctx->conf.def); ++ ++ if (idx >= 0) ++ params->per_hw[idx].iftype_num[sdata->wdev.iftype]++; ++ else ++ params->iftype_num[sdata->wdev.iftype]++; ++ ++ if (total) ++ (*total)++; ++ } ++} ++ ++static int ++ieee80211_prepare_per_hw_iface_combination(struct ieee80211_sub_if_data *sdata, ++ const struct cfg80211_chan_def *chandef, ++ enum ieee80211_chanctx_mode chanmode, ++ struct iface_combination_params *params, ++ int *total) ++{ ++ struct ieee80211_local *local = sdata->local; ++ struct ieee80211_sub_if_data *sdata_iter; ++ enum nl80211_iftype iftype = sdata->wdev.iftype; ++ struct ieee80211_chanctx *ctx; ++ int hchan_idx; ++ size_t size; ++ bool sdata_included = false; ++ ++ lockdep_assert_held(&local->chanctx_mtx); ++ ++ size = sizeof(*params->per_hw) * local->hw.wiphy->num_hw; ++ /* caller should free this memory upon success status */ ++ params->per_hw = kzalloc(size, GFP_KERNEL); ++ if (!params->per_hw) ++ return -ENOMEM; ++ ++ hchan_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, chandef); ++ if (hchan_idx >= 0) { ++ params->per_hw[hchan_idx].num_different_channels = 1; ++ if (iftype != NL80211_IFTYPE_UNSPECIFIED) { ++ params->per_hw[hchan_idx].iftype_num[iftype] = 1; ++ sdata_included = true; ++ } ++ } ++ ++ list_for_each_entry(ctx, &local->chanctx_list, list) { ++ if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) ++ continue; ++ hchan_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, ++ &ctx->conf.def); ++ if (WARN_ON(hchan_idx < 0)) ++ continue; ++ ++ params->radar_detect |= ++ ieee80211_chanctx_radar_detect(local, ctx); ++ if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) { ++ params->per_hw[hchan_idx].num_different_channels++; ++ continue; ++ } ++ if (chandef && chanmode == IEEE80211_CHANCTX_SHARED && ++ cfg80211_chandef_compatible(chandef, ++ &ctx->conf.def)) ++ continue; ++ params->per_hw[hchan_idx].num_different_channels++; ++ } ++ ++ list_for_each_entry_rcu(sdata_iter, &local->interfaces, list) { ++ struct wireless_dev *wdev_iter; ++ ++ wdev_iter = &sdata_iter->wdev; ++ ++ if ((sdata_included && sdata_iter == sdata) || ++ !ieee80211_sdata_running(sdata_iter) || ++ cfg80211_iftype_allowed(local->hw.wiphy, ++ wdev_iter->iftype, 0, 1)) ++ continue; ++ ++ ieee80211_get_per_hw_sdata_active_iface(sdata_iter, params, ++ total); ++ } ++ ++ return 0; ++} ++ + int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, + const struct cfg80211_chan_def *chandef, + enum ieee80211_chanctx_mode chanmode, + u8 radar_detect) + { + struct ieee80211_local *local = sdata->local; +- struct ieee80211_sub_if_data *sdata_iter; + enum nl80211_iftype iftype = sdata->wdev.iftype; +- struct ieee80211_chanctx *ctx; +- int total = 1; ++ int total = 1, ret; + struct iface_combination_params params = { + .radar_detect = radar_detect, + }; +@@ -4861,60 +5019,118 @@ int ieee80211_check_combinations(struct + return 0; + } + +- if (chandef) +- params.num_different_channels = 1; ++ if (cfg80211_per_hw_iface_comb_advertised(local->hw.wiphy)) { ++ ret = ieee80211_prepare_per_hw_iface_combination(sdata, chandef, ++ chanmode, ++ ¶ms, ++ &total); ++ if (ret) ++ return ret; ++ } else { ++ ieee80211_prepare_iface_combination(sdata, chandef, chanmode, ++ ¶ms, &total); ++ } + +- if (iftype != NL80211_IFTYPE_UNSPECIFIED) +- params.iftype_num[iftype] = 1; ++ if (total == 1 && !params.radar_detect) { ++ kfree(params.per_hw); ++ return 0; ++ } + +- list_for_each_entry(ctx, &local->chanctx_list, list) { +- if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) +- continue; +- params.radar_detect |= +- ieee80211_chanctx_radar_detect(local, ctx); +- if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) { +- params.num_different_channels++; ++ ret = cfg80211_check_combinations(local->hw.wiphy, ¶ms); ++ ++ kfree(params.per_hw); ++ ++ return ret; ++} ++ ++static void ++ieee80211_iter_max_chans(const struct ieee80211_iface_combination *c, ++ void *data, int hw_chan_idx) ++{ ++ u32 *max_num_different_channels = data; ++ ++ *max_num_different_channels = ++ max(*max_num_different_channels, c->num_different_channels); ++} ++ ++static void ++ieee80211_iter_per_hw_max_chans(const struct ieee80211_iface_combination *c, ++ void *data, int hw_chan_idx) ++{ ++ u32 *max_num_different_channels = data; ++ u32 max_supported_different_channels = 0; ++ int i; ++ ++ for (i = 0; i < c->n_hw_list; i++) { ++ const struct ieee80211_iface_per_hw *h; ++ ++ h = &c->iface_hw_list[i]; ++ if (hw_chan_idx != -1) { ++ if (h->hw_chans_idx == hw_chan_idx) { ++ max_supported_different_channels = ++ h->num_different_channels; ++ break; ++ } + continue; + } +- if (chandef && chanmode == IEEE80211_CHANCTX_SHARED && +- cfg80211_chandef_compatible(chandef, +- &ctx->conf.def)) +- continue; +- params.num_different_channels++; ++ max_supported_different_channels += h->num_different_channels; + } + +- list_for_each_entry_rcu(sdata_iter, &local->interfaces, list) { +- struct wireless_dev *wdev_iter; ++ *max_num_different_channels = max(*max_num_different_channels, ++ max_supported_different_channels); ++} + +- wdev_iter = &sdata_iter->wdev; ++static int ++ieee80211_max_num_channels_hw_list(struct ieee80211_local *local, ++ const struct cfg80211_chan_def *chandef) ++{ ++ struct ieee80211_sub_if_data *sdata; ++ struct ieee80211_chanctx *ctx; ++ u32 max_num_different_channels = 1; ++ size_t size; ++ int err, hchan_idx; ++ struct iface_combination_params params = { 0 }; ++ ++ size = sizeof(*params.per_hw) * local->hw.wiphy->num_hw; ++ /* caller should free this memory */ ++ params.per_hw = kzalloc(size, GFP_KERNEL); ++ if (!params.per_hw) ++ return -ENOMEM; + +- if (sdata_iter == sdata || +- !ieee80211_sdata_running(sdata_iter) || +- cfg80211_iftype_allowed(local->hw.wiphy, +- wdev_iter->iftype, 0, 1)) ++ params.chandef = chandef; ++ list_for_each_entry(ctx, &local->chanctx_list, list) { ++ if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) ++ continue; ++ hchan_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, ++ &ctx->conf.def); ++ if (WARN_ON(hchan_idx < 0)) + continue; + +- params.iftype_num[wdev_iter->iftype]++; +- total++; ++ params.radar_detect |= ++ ieee80211_chanctx_radar_detect(local, ctx); ++ params.per_hw[hchan_idx].num_different_channels++; + } + +- if (total == 1 && !params.radar_detect) +- return 0; ++ list_for_each_entry_rcu(sdata, &local->interfaces, list) { ++ struct wireless_dev *wdev = &sdata->wdev; + +- return cfg80211_check_combinations(local->hw.wiphy, ¶ms); +-} ++ if (!ieee80211_sdata_running(sdata) || ++ cfg80211_iftype_allowed(local->hw.wiphy, wdev->iftype, 0, ++ 1)) ++ continue; ++ ieee80211_get_per_hw_sdata_active_iface(sdata, ¶ms, NULL); ++ } + +-static void +-ieee80211_iter_max_chans(const struct ieee80211_iface_combination *c, +- void *data) +-{ +- u32 *max_num_different_channels = data; ++ err = cfg80211_iter_combinations(local->hw.wiphy, ¶ms, ++ ieee80211_iter_per_hw_max_chans, ++ &max_num_different_channels); ++ kfree(params.per_hw); + +- *max_num_different_channels = max(*max_num_different_channels, +- c->num_different_channels); ++ return err < 0 ? err : max_num_different_channels; + } + +-int ieee80211_max_num_channels(struct ieee80211_local *local) ++int ieee80211_max_num_channels(struct ieee80211_local *local, ++ const struct cfg80211_chan_def *chandef) + { + struct ieee80211_sub_if_data *sdata; + struct ieee80211_chanctx *ctx; +@@ -4924,6 +5140,9 @@ int ieee80211_max_num_channels(struct ie + + lockdep_assert_held(&local->chanctx_mtx); + ++ if (cfg80211_per_hw_iface_comb_advertised(local->hw.wiphy)) ++ return ieee80211_max_num_channels_hw_list(local, chandef); ++ + list_for_each_entry(ctx, &local->chanctx_list, list) { + if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) + continue; +--- a/net/wireless/core.c ++++ b/net/wireless/core.c +@@ -594,10 +594,125 @@ use_default_name: + } + EXPORT_SYMBOL(wiphy_new_nm); + ++static int ++wiphy_verify_comb_limit(struct wiphy *wiphy, ++ const struct ieee80211_iface_limit *limits, ++ u8 n_limits, u32 bcn_int_min_gcd, u32 *iface_cnt, ++ u16 *all_iftypes) ++{ ++ int l; ++ ++ for (l = 0; l < n_limits; l++) { ++ u16 types = limits[l].types; ++ ++ /* ++ * Don't advertise an unsupported type ++ * in a combination. ++ */ ++ if (WARN_ON((wiphy->interface_modes & types) != types)) ++ return -EINVAL; ++ ++ /* interface types shouldn't overlap */ ++ if (WARN_ON(types & *all_iftypes)) ++ return -EINVAL; ++ ++ *all_iftypes |= types; ++ ++ /* Shouldn't list software iftypes in combinations! */ ++ if (WARN_ON(wiphy->software_iftypes & types)) ++ return -EINVAL; ++ ++ /* Only a single P2P_DEVICE can be allowed */ ++ if (WARN_ON(types & BIT(NL80211_IFTYPE_P2P_DEVICE) && ++ limits[l].max > 1)) ++ return -EINVAL; ++ ++ /* Only a single NAN can be allowed */ ++ if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) && ++ limits[l].max > 1)) ++ return -EINVAL; ++ ++ /* ++ * This isn't well-defined right now. If you have an ++ * IBSS interface, then its beacon interval may change ++ * by joining other networks, and nothing prevents it ++ * from doing that. ++ * So technically we probably shouldn't even allow AP ++ * and IBSS in the same interface, but it seems that ++ * some drivers support that, possibly only with fixed ++ * beacon intervals for IBSS. ++ */ ++ if (WARN_ON(types & BIT(NL80211_IFTYPE_ADHOC) && ++ bcn_int_min_gcd)) ++ return -EINVAL; ++ ++ *iface_cnt += limits[l].max; ++ } ++ ++ return 0; ++} ++ ++static int ++wiphy_verify_comb_per_hw(struct wiphy *wiphy, ++ const struct ieee80211_iface_combination *comb) ++{ ++ int h; ++ u32 hw_idx_bitmap = 0; ++ int ret; ++ ++ for (h = 0; h < comb->n_hw_list; h++) { ++ const struct ieee80211_iface_per_hw *hl; ++ const struct ieee80211_chans_per_hw *chans; ++ u32 iface_cnt = 0; ++ u16 all_iftypes = 0; ++ ++ hl = &comb->iface_hw_list[h]; ++ ++ if (hl->hw_chans_idx >= wiphy->num_hw) ++ return -EINVAL; ++ ++ if (hw_idx_bitmap & BIT(hl->hw_chans_idx)) ++ return -EINVAL; ++ ++ hw_idx_bitmap |= BIT(hl->hw_chans_idx); ++ chans = wiphy->hw_chans[hl->hw_chans_idx]; ++ ++ if (WARN_ON(hl->max_interfaces < 2 && (!comb->radar_detect_widths || ++ !(cfg80211_hw_chans_includes_dfs(chans))))) ++ return -EINVAL; ++ ++ if (WARN_ON(!hl->num_different_channels)) ++ return -EINVAL; ++ ++ if (WARN_ON(comb->radar_detect_widths && ++ cfg80211_hw_chans_includes_dfs(chans) && ++ hl->num_different_channels > 1)) ++ return -EINVAL; ++ ++ if (WARN_ON(!hl->n_limits)) ++ return -EINVAL; ++ ++ ret = wiphy_verify_comb_limit(wiphy, hl->limits, hl->n_limits, ++ comb->beacon_int_min_gcd, ++ &iface_cnt, &all_iftypes); ++ if (ret) ++ return ret; ++ ++ if (WARN_ON(all_iftypes & BIT(NL80211_IFTYPE_WDS))) ++ return -EINVAL; ++ ++ if (WARN_ON(iface_cnt < comb->max_interfaces)) ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ + static int wiphy_verify_combinations(struct wiphy *wiphy) + { + const struct ieee80211_iface_combination *c; +- int i, j; ++ int i; ++ int ret; + + for (i = 0; i < wiphy->n_iface_combinations; i++) { + u32 cnt = 0; +@@ -624,39 +739,11 @@ static int wiphy_verify_combinations(str + if (WARN_ON(!c->n_limits)) + return -EINVAL; + +- for (j = 0; j < c->n_limits; j++) { +- u16 types = c->limits[j].types; +- +- /* interface types shouldn't overlap */ +- if (WARN_ON(types & all_iftypes)) +- return -EINVAL; +- all_iftypes |= types; +- +- if (WARN_ON(!c->limits[j].max)) +- return -EINVAL; +- +- /* Shouldn't list software iftypes in combinations! */ +- if (WARN_ON(wiphy->software_iftypes & types)) +- return -EINVAL; +- +- /* Only a single P2P_DEVICE can be allowed */ +- if (WARN_ON(types & BIT(NL80211_IFTYPE_P2P_DEVICE) && +- c->limits[j].max > 1)) +- return -EINVAL; +- +- /* Only a single NAN can be allowed */ +- if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) && +- c->limits[j].max > 1)) +- return -EINVAL; +- +- cnt += c->limits[j].max; +- /* +- * Don't advertise an unsupported type +- * in a combination. +- */ +- if (WARN_ON((wiphy->interface_modes & types) != types)) +- return -EINVAL; +- } ++ ret = wiphy_verify_comb_limit(wiphy, c->limits, c->n_limits, ++ c->beacon_int_min_gcd, ++ &cnt, &all_iftypes); ++ if (ret) ++ return ret; + + if (WARN_ON(all_iftypes & BIT(NL80211_IFTYPE_WDS))) + return -EINVAL; +@@ -664,11 +751,119 @@ static int wiphy_verify_combinations(str + /* You can't even choose that many! */ + if (WARN_ON(cnt < c->max_interfaces)) + return -EINVAL; ++ /* ++ * Do similar validations on the freq range specific interface ++ * combinations when advertised. ++ */ ++ if (WARN_ON(c->n_hw_list && ++ wiphy_verify_comb_per_hw(wiphy, c))) ++ return -EINVAL; + } + + return 0; + } + ++static int cfg80211_check_hw_chans(const struct ieee80211_chans_per_hw *chans1, ++ const struct ieee80211_chans_per_hw *chans2) ++{ ++ int i, j; ++ ++ if (!chans1 || !chans2) ++ return -EINVAL; ++ ++ if (!chans1->n_chans || !chans2->n_chans) ++ return -EINVAL; ++ ++ /* for now same channel is not allowed in more than one sub-hw */ ++ for (i = 0; i < chans1->n_chans; i++) ++ for (j = 0; j < chans2->n_chans; j++) ++ if (chans1->chans[i].center_freq == ++ chans2->chans[j].center_freq) ++ return -EINVAL; ++ return 0; ++} ++ ++static bool ++cfg80211_hw_chans_in_supported_list(struct wiphy *wiphy, ++ const struct ieee80211_chans_per_hw *chans) ++{ ++ enum nl80211_band band; ++ struct ieee80211_supported_band *sband; ++ bool found; ++ int i, j; ++ ++ for (i = 0; i < chans->n_chans; i++) { ++ found = false; ++ for (band = 0; band < NUM_NL80211_BANDS; band++) { ++ sband = wiphy->bands[band]; ++ if (!sband) ++ continue; ++ for (j = 0; j < sband->n_channels; j++) { ++ if (chans->chans[i].center_freq == ++ sband->channels[j].center_freq) { ++ found = true; ++ break; ++ } ++ } ++ ++ if (found) ++ break; ++ } ++ ++ if (!found) ++ return false; ++ } ++ ++ return true; ++} ++ ++static int cfg80211_validate_per_hw_chans(struct wiphy *wiphy) ++{ ++ int i, j; ++ int ret; ++ ++ if (!wiphy->num_hw) ++ return 0; ++ ++ if (!wiphy->hw_chans) ++ return -EINVAL; ++ ++ /* ++ * to advertise channel list for one hw, sband alone should ++ * be sufficient ++ */ ++ if (wiphy->num_hw < 2) ++ return -EINVAL; ++ ++ for (i = 0; i < wiphy->num_hw; i++) { ++ for (j = 0; j < wiphy->num_hw; j++) { ++ const struct ieee80211_chans_per_hw *hw_chans1; ++ const struct ieee80211_chans_per_hw *hw_chans2; ++ ++ if (i == j) ++ continue; ++ ++ hw_chans1 = wiphy->hw_chans[i]; ++ hw_chans2 = wiphy->hw_chans[j]; ++ ret = cfg80211_check_hw_chans(hw_chans1, hw_chans2); ++ if (ret) ++ return ret; ++ } ++ } ++ ++ for (i = 0; i < wiphy->num_hw; i++) { ++ const struct ieee80211_chans_per_hw *hw_chans; ++ ++ hw_chans = wiphy->hw_chans[i]; ++ if (!cfg80211_hw_chans_in_supported_list(wiphy, hw_chans)) { ++ WARN_ON(1); ++ return -EINVAL; ++ } ++ } ++ ++ return 0; ++} ++ + int wiphy_register(struct wiphy *wiphy) + { + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); +@@ -905,6 +1100,11 @@ int wiphy_register(struct wiphy *wiphy) + WARN_ON(1); + return -EINVAL; + } ++ ++ if (cfg80211_validate_per_hw_chans(&rdev->wiphy)) { ++ WARN_ON(1); ++ return -EINVAL; ++ } + + for (i = 0; i < rdev->wiphy.n_vendor_commands; i++) { + /* +--- a/net/wireless/util.c ++++ b/net/wireless/util.c +@@ -2204,19 +2204,271 @@ int cfg80211_validate_beacon_int(struct + return 0; + } + ++static const struct ieee80211_iface_per_hw * ++cfg80211_get_hw_iface_comb_by_idx(struct wiphy *wiphy, ++ const struct ieee80211_iface_combination *c, ++ int idx) ++{ ++ int i; ++ ++ for (i = 0; i < c->n_hw_list; i++) ++ if (c->iface_hw_list[i].hw_chans_idx == idx) ++ break; ++ ++ if (i == c->n_hw_list) ++ return NULL; ++ ++ return &c->iface_hw_list[i]; ++} ++ ++static int ++cfg80211_validate_per_hw_iface_comb_limits(struct wiphy *wiphy, ++ struct iface_combination_params *params, ++ const struct ieee80211_iface_combination *c, ++ int *num_per_hw_ifaces, u32 *all_iftypes) ++{ ++ struct ieee80211_iface_limit **limits; ++ const struct ieee80211_iface_per_hw *per_hw_comb; ++ int iftype_num[NUM_NL80211_IFTYPES] = { 0 }; ++ int *n_limits; ++ int ret = 0; ++ int i, j, iftype; ++ ++ limits = kzalloc(sizeof(*limits) * wiphy->num_hw, GFP_KERNEL); ++ if (!limits) ++ return -ENOMEM; ++ ++ n_limits = kzalloc(sizeof(*n_limits) * wiphy->num_hw, GFP_KERNEL); ++ if (!n_limits) { ++ kfree(limits); ++ return -ENOMEM; ++ } ++ ++ for (i = 0; i < wiphy->num_hw; i++) { ++ per_hw_comb = cfg80211_get_hw_iface_comb_by_idx(wiphy, c, i); ++ if (!per_hw_comb) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ limits[i] = kmemdup(per_hw_comb->limits, ++ per_hw_comb->n_limits * ++ sizeof(limits[i][0]), GFP_KERNEL); ++ if (!limits[i]) { ++ ret = -ENOMEM; ++ goto out_free; ++ } ++ ++ n_limits[i] = per_hw_comb->n_limits; ++ } ++ ++ for (i = 0; i < wiphy->num_hw; i++) { ++ per_hw_comb = cfg80211_get_hw_iface_comb_by_idx(wiphy, c, i); ++ if (!per_hw_comb) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ if (num_per_hw_ifaces[i] > per_hw_comb->max_interfaces) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ if (params->per_hw[i].num_different_channels > ++ per_hw_comb->num_different_channels) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { ++ if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) ++ continue; ++ for (j = 0; j < n_limits[i]; j++) { ++ *all_iftypes |= limits[i][j].types; ++ if (!(limits[i][j].types & BIT(iftype))) ++ continue; ++ if (limits[i][j].max < ++ params->per_hw[i].iftype_num[iftype]) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ limits[i][j].max -= ++ params->per_hw[i].iftype_num[iftype]; ++ } ++ } ++ } ++ ++ memcpy(iftype_num, params->iftype_num, NUM_NL80211_IFTYPES); ++ for (i = 0; i < wiphy->num_hw; i++) { ++ u16 rem_iface; ++ per_hw_comb = cfg80211_get_hw_iface_comb_by_idx(wiphy, c, i); ++ if (!per_hw_comb) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ ++ /* ++ * we'll not be here in the first place if the numbre of per-hw ++ * interfaces are more than the advertised ones. So it is safe ++ * to ignore that error case here. ++ */ ++ rem_iface = per_hw_comb->max_interfaces - num_per_hw_ifaces[i]; ++ if (!rem_iface) ++ continue; ++ ++ /* ++ * check if the interfaces which are not yet assigned the ++ * operating channel can be accommodated with all the available ++ * per-hw interface combination advertisements. ++ */ ++ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { ++ if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) ++ continue; ++ if (!rem_iface) ++ break; ++ for (j = 0; j < n_limits[i]; j++) { ++ u16 num_avail; ++ if (!(limits[i][j].types & BIT(iftype))) ++ continue; ++ if (!rem_iface) ++ break; ++ num_avail = min(rem_iface, limits[i][j].max); ++ if (num_avail < iftype_num[iftype]) { ++ iftype_num[iftype] -= num_avail; ++ rem_iface -= num_avail; ++ } else { ++ rem_iface -= iftype_num[iftype]; ++ iftype_num[iftype] = 0; ++ } ++ } ++ } ++ } ++ ++ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { ++ if (iftype_num[iftype]) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ } ++ ++out_free: ++ for (i = 0; i < wiphy->num_hw; i++) ++ kfree(limits[i]); ++ ++ kfree(n_limits); ++ kfree(limits); ++ ++ return ret; ++} ++ ++static int ++cfg80211_validate_iface_comb_limits(struct wiphy *wiphy, ++ struct iface_combination_params *params, ++ const struct ieee80211_iface_combination *c, ++ int num_interfaces, u32 *all_iftypes) ++{ ++ struct ieee80211_iface_limit *limits; ++ int j, iftype; ++ int ret = 0; ++ ++ if (num_interfaces > c->max_interfaces) ++ return -EINVAL; ++ if (params->num_different_channels > c->num_different_channels) ++ return -EINVAL; ++ ++ limits = kmemdup(c->limits, sizeof(limits[0]) * c->n_limits, ++ GFP_KERNEL); ++ if (!limits) ++ return -ENOMEM; ++ ++ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { ++ if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) ++ continue; ++ for (j = 0; j < c->n_limits; j++) { ++ *all_iftypes |= limits[j].types; ++ if (!(limits[j].types & BIT(iftype))) ++ continue; ++ if (limits[j].max < params->iftype_num[iftype]) { ++ ret = -EINVAL; ++ goto out_free; ++ } ++ limits[j].max -= params->iftype_num[iftype]; ++ } ++ } ++out_free: ++ kfree(limits); ++ return ret; ++} ++ ++bool cfg80211_per_hw_iface_comb_advertised(struct wiphy *wiphy) ++{ ++ int i; ++ ++ for (i = 0; i < wiphy->n_iface_combinations; i++) { ++ const struct ieee80211_iface_combination *c; ++ c = &wiphy->iface_combinations[i]; ++ if (c->n_hw_list) ++ return true; ++ } ++ ++ return false; ++} ++EXPORT_SYMBOL(cfg80211_per_hw_iface_comb_advertised); ++ ++static bool ++cfg80211_chan_supported_by_sub_hw(struct ieee80211_chans_per_hw *hw_chans, ++ const struct cfg80211_chan_def *chandef) ++{ ++ int i; ++ ++ for (i = 0; i < hw_chans->n_chans; i++) ++ if (chandef->chan->center_freq == ++ hw_chans->chans[i].center_freq) ++ return true; ++ ++ return false; ++} ++ ++int ++cfg80211_get_hw_idx_by_chan(struct wiphy *wiphy, ++ const struct cfg80211_chan_def *chandef) ++{ ++ int i; ++ ++ if (!chandef) ++ return -1; ++ ++ if (!cfg80211_chandef_valid(chandef)) ++ return -1; ++ ++ for (i = 0; i < wiphy->num_hw; i++) { ++ if (cfg80211_chan_supported_by_sub_hw(wiphy->hw_chans[i], ++ chandef)) ++ return i; ++ } ++ ++ return -1; ++} ++EXPORT_SYMBOL(cfg80211_get_hw_idx_by_chan); ++ + int cfg80211_iter_combinations(struct wiphy *wiphy, + struct iface_combination_params *params, + void (*iter)(const struct ieee80211_iface_combination *c, +- void *data), ++ void *data, int hw_chan_idx), + void *data) + { + const struct ieee80211_regdomain *regdom; + enum nl80211_dfs_regions region = 0; +- int i, j, iftype; ++ int i, iftype; + int num_interfaces = 0; ++ int *num_per_hw_ifaces = NULL; + u32 used_iftypes = 0; + u32 beacon_int_gcd; + bool beacon_int_different; ++ bool per_hw_iface_comb_used; ++ int hw_chan_idx = -1; ++ int ret = 0; + + /* + * This is a bit strange, since the iteration used to rely only on +@@ -2239,50 +2491,66 @@ int cfg80211_iter_combinations(struct wi + rcu_read_unlock(); + } + ++ per_hw_iface_comb_used = cfg80211_per_hw_iface_comb_advertised(wiphy); ++ if (per_hw_iface_comb_used) { ++ num_per_hw_ifaces = kzalloc(sizeof(*num_per_hw_ifaces) * ++ wiphy->num_hw, GFP_KERNEL); ++ if (!num_per_hw_ifaces) ++ return -ENOMEM; ++ ++ hw_chan_idx = cfg80211_get_hw_idx_by_chan(wiphy, ++ params->chandef); ++ } ++ + for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { + num_interfaces += params->iftype_num[iftype]; + if (params->iftype_num[iftype] > 0 && + !cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) + used_iftypes |= BIT(iftype); ++ ++ if (!per_hw_iface_comb_used) ++ continue; ++ ++ /* account per_hw interfaces, if advertised */ ++ for (i = 0; i < wiphy->num_hw; i++) { ++ struct iface_comb_per_hw_params *per_hw; ++ per_hw = ¶ms->per_hw[i]; ++ num_per_hw_ifaces[i] += per_hw->iftype_num[iftype]; ++ if (per_hw->iftype_num[iftype] > 0 && ++ !cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) ++ used_iftypes |= BIT(iftype); ++ } + } + + for (i = 0; i < wiphy->n_iface_combinations; i++) { + const struct ieee80211_iface_combination *c; +- struct ieee80211_iface_limit *limits; + u32 all_iftypes = 0; + + c = &wiphy->iface_combinations[i]; + +- if (num_interfaces > c->max_interfaces) +- continue; +- if (params->num_different_channels > c->num_different_channels) +- continue; ++ if (per_hw_iface_comb_used) ++ ret = cfg80211_validate_per_hw_iface_comb_limits(wiphy, ++ params, c, ++ num_per_hw_ifaces, ++ &all_iftypes); ++ else ++ ret = cfg80211_validate_iface_comb_limits(wiphy, params, ++ c, ++ num_interfaces, ++ &all_iftypes); ++ if (ret == -ENOMEM) ++ goto out_free; + +- limits = kmemdup(c->limits, sizeof(limits[0]) * c->n_limits, +- GFP_KERNEL); +- if (!limits) +- return -ENOMEM; +- +- for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { +- if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) +- continue; +- for (j = 0; j < c->n_limits; j++) { +- all_iftypes |= limits[j].types; +- if (!(limits[j].types & BIT(iftype))) +- continue; +- if (limits[j].max < params->iftype_num[iftype]) +- goto cont; +- limits[j].max -= params->iftype_num[iftype]; +- } +- } ++ if (ret) ++ continue; + + if (params->radar_detect != +- (c->radar_detect_widths & params->radar_detect)) +- goto cont; ++ (c->radar_detect_widths & params->radar_detect)) ++ continue; + + if (params->radar_detect && c->radar_detect_regions && + !(c->radar_detect_regions & BIT(region))) +- goto cont; ++ continue; + + /* Finally check that all iftypes that we're currently + * using are actually part of this combination. If they +@@ -2290,32 +2558,32 @@ int cfg80211_iter_combinations(struct wi + * to continue to the next. + */ + if ((all_iftypes & used_iftypes) != used_iftypes) +- goto cont; ++ continue; + + if (beacon_int_gcd) { + if (c->beacon_int_min_gcd && + beacon_int_gcd < c->beacon_int_min_gcd) +- goto cont; ++ continue; + if (!c->beacon_int_min_gcd && beacon_int_different) +- goto cont; ++ continue; + } + + /* This combination covered all interface types and + * supported the requested numbers, so we're good. + */ + +- (*iter)(c, data); +- cont: +- kfree(limits); ++ (*iter)(c, data, hw_chan_idx); + } + +- return 0; ++out_free: ++ kfree(num_per_hw_ifaces); ++ return ret; + } + EXPORT_SYMBOL(cfg80211_iter_combinations); + + static void + cfg80211_iter_sum_ifcombs(const struct ieee80211_iface_combination *c, +- void *data) ++ void *data, int hw_chan_idx) + { + int *num = data; + (*num)++; +@@ -2709,3 +2977,21 @@ cfg80211_get_iftype_ext_capa(struct wiph + return NULL; + } + EXPORT_SYMBOL(cfg80211_get_iftype_ext_capa); ++ ++bool ++cfg80211_hw_chans_includes_dfs(const struct ieee80211_chans_per_hw *chans) ++{ ++ int i; ++ ++ for (i = 0; i < chans->n_chans; i++) { ++ if (chans->chans[i].band == NL80211_BAND_5GHZ && ++ ((chans->chans[i].center_freq >= 5250 && ++ chans->chans[i].center_freq <= 5340) || ++ (chans->chans[i].center_freq >= 5480 && ++ chans->chans[i].center_freq <= 5720))) ++ return true; ++ } ++ ++ return false; ++} ++EXPORT_SYMBOL(cfg80211_hw_chans_includes_dfs); diff --git a/package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch b/package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch new file mode 100644 index 00000000000000..7043ecb079061a --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch @@ -0,0 +1,113 @@ +From a76238143218ea348cec4b5d26fe9411338ae09e Mon Sep 17 00:00:00 2001 +From: Aaradhana Sahu +Date: Fri, 6 Oct 2023 18:19:53 +0530 +Subject: [PATCH] mac80211: fix mesh ping issue + +Signed-off-by: Aaradhana Sahu +--- + net/mac80211/rx.c | 68 +++-------------------------------------------- + 1 file changed, 4 insertions(+), 64 deletions(-) + +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -4748,16 +4748,14 @@ void ieee80211_check_fast_rx(struct sta_ + + break; + case NL80211_IFTYPE_MESH_POINT: +- /* Not required for NSS mode */ +- if (ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) +- goto clear; + /* Note: da and sa offs are not static, determine in fast rx path */ + + fastrx.expected_ds_bits = cpu_to_le16(IEEE80211_FCTL_FROMDS | + IEEE80211_FCTL_TODS); +- +- fastrx.internal_forward = 0; +- break; ++ fastrx.da_offs = offsetof(struct ieee80211_hdr, addr3); ++ fastrx.sa_offs = offsetof(struct ieee80211_hdr, addr4); ++ break; ++ + default: + goto clear; + } +@@ -4980,10 +4978,7 @@ static bool ieee80211_invoke_fast_rx(str + u8 sa[ETH_ALEN]; + } addrs __aligned(2); + struct ieee80211_sta_rx_stats *stats; +- struct ieee80211s_hdr *mesh_hdr; +- struct mesh_path *mppath; + u8 da_offs = fast_rx->da_offs, sa_offs = fast_rx->sa_offs; +- struct ieee80211_sub_if_data *sdata = rx->sdata; + + /* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write + * to a common data structure; drivers can implement that per queue +@@ -5033,37 +5028,6 @@ static bool ieee80211_invoke_fast_rx(str + snap_offs += IEEE80211_CCMP_HDR_LEN; + } + +- /* Find corresponding offsets for mesh hdr */ +- if (ieee80211_vif_is_mesh(&sdata->vif)) { +- if (status->rx_flags & IEEE80211_RX_AMSDU) +- return false; +- +- /* All mesh data frames needs to be QoS Data */ +- if (unlikely(!ieee80211_is_data_qos(hdr->frame_control))) +- return false; +- +- /* TODO forwarding not handled yet in fast rx */ +- if (!ether_addr_equal(fast_rx->vif_addr, hdr->addr3)) +- return false; +- +- /* Check if Min Mesh hdr is present */ +- if (!pskb_may_pull(skb, hdrlen + 6)) +- goto drop; +- +- /* Goto mesh hdr, located at snap offs compared to AP/STA */ +- mesh_hdr = (struct ieee80211s_hdr *) (skb->data + snap_offs); +- +- /* Only Ext Mesh hdr supported in this path now */ +- if ((mesh_hdr->flags & MESH_FLAGS_AE) != MESH_FLAGS_AE_A5_A6) +- return false; +- +- /* Point to eaddr1 and eaddr2 */ +- da_offs = snap_offs + ETH_ALEN; +- sa_offs = da_offs + ETH_ALEN; +- +- snap_offs += sizeof(struct ieee80211s_hdr); +- } +- + if (!ieee80211_vif_is_mesh(&rx->sdata->vif) && + !(status->rx_flags & IEEE80211_RX_AMSDU)) { + if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) +@@ -5101,30 +5065,6 @@ static bool ieee80211_invoke_fast_rx(str + return true; + } + +- /* Update MPP table for the received packet */ +- if (ieee80211_vif_is_mesh(&sdata->vif)) { +- char *proxied_addr, *mpp_addr; +- +- mpp_addr = hdr->addr4; +- proxied_addr = mesh_hdr->eaddr2; +- +- /* Update mpp for the SA */ +- rcu_read_lock(); +- mppath = mpp_path_lookup(sdata, proxied_addr); +- if (!mppath) { +- mpp_path_add(sdata, proxied_addr, mpp_addr); +- } else { +- spin_lock_bh(&mppath->state_lock); +- +- if (!ether_addr_equal(mppath->mpp, mpp_addr)) +- ether_addr_copy(mppath->mpp, mpp_addr); +- +- mppath->exp_time = jiffies; +- spin_unlock_bh(&mppath->state_lock); +- } +- rcu_read_unlock(); +- } +- + /* do the header conversion - first grab the addresses */ + ether_addr_copy(addrs.da, skb->data + da_offs); + ether_addr_copy(addrs.sa, skb->data + sa_offs); diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch b/package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch new file mode 100644 index 00000000000000..52037816a113b1 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch @@ -0,0 +1,324 @@ +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -30,6 +30,7 @@ + #include "spectral.h" + #include "wow.h" + #include "nss.h" ++#include "vendor.h" + + #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) + +@@ -637,6 +638,11 @@ struct ath11k_coex_info { + u32 pta_priority; + }; + ++enum ath11k_ap_ps_state { ++ ATH11K_AP_PS_STATE_OFF, ++ ATH11K_AP_PS_STATE_ON, ++}; ++ + struct ath11k { + struct ath11k_base *ab; + struct ath11k_pdev *pdev; +@@ -765,6 +771,8 @@ struct ath11k { + int monitor_vdev_id; + struct completion fw_mode_reset; + u8 ftm_msgref; ++ int ap_ps_enabled; ++ enum ath11k_ap_ps_state ap_ps_state; + #ifdef CPTCFG_ATH11K_DEBUGFS + struct ath11k_debug debug; + #endif +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -4963,6 +4963,33 @@ static void ath11k_mac_dec_num_stations( + ar->num_stations--; + } + ++int ath11k_mac_ap_ps_recalc(struct ath11k *ar) ++{ ++ struct ath11k_vif *arvif; ++ bool has_sta_iface = false; ++ enum ath11k_ap_ps_state state = ATH11K_AP_PS_STATE_OFF; ++ int ret = 0; ++ ++ list_for_each_entry(arvif, &ar->arvifs, list) { ++ if (arvif->vdev_type == WMI_VDEV_TYPE_STA) { ++ has_sta_iface = true; ++ break; ++ } ++ } ++ ++ if (!has_sta_iface && !ar->num_stations && ar->ap_ps_enabled) ++ state = ATH11K_AP_PS_STATE_ON; ++ ++ if (ar->ap_ps_state == state) ++ return ret; ++ ++ ret = ath11k_wmi_pdev_ap_ps_cmd_send(ar, ar->pdev->pdev_id, state); ++ if (!ret) ++ ar->ap_ps_state = state; ++ ++ return ret; ++} ++ + static int ath11k_mac_station_add(struct ath11k *ar, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta) +@@ -5002,6 +5029,12 @@ static int ath11k_mac_station_add(struct + ath11k_dbg(ab, ATH11K_DBG_MAC, "Added peer: %pM for VDEV: %d\n", + sta->addr, arvif->vdev_id); + ++ ret = ath11k_mac_ap_ps_recalc(ar); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send ap ps ret %d\n", ret); ++ goto exit; ++ } ++ + if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) { + arsta->tx_stats = kzalloc(sizeof(*arsta->tx_stats), GFP_KERNEL); + if (!arsta->tx_stats) { +@@ -5158,6 +5191,9 @@ static int ath11k_mac_op_sta_state(struc + + kfree(arsta->tx_stats); + arsta->tx_stats = NULL; ++ ret = ath11k_mac_ap_ps_recalc(ar); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to send ap ps ret %d\n", ret); + + kfree(arsta->rx_stats); + arsta->rx_stats = NULL; +@@ -6566,6 +6602,7 @@ static void ath11k_mac_op_stop(struct ie + + clear_bit(ATH11K_CAC_RUNNING, &ar->dev_flags); + ar->state = ATH11K_STATE_OFF; ++ ar->ap_ps_state = ATH11K_AP_PS_STATE_OFF; + mutex_unlock(&ar->conf_mutex); + + cancel_delayed_work_sync(&ar->scan.timeout); +@@ -6973,7 +7010,6 @@ static int ath11k_mac_op_add_interface(s + arvif->vdev_id, ret); + goto err; + } +- + ar->num_created_vdevs++; + ath11k_dbg(ab, ATH11K_DBG_MAC, "vdev %pM created, vdev_id %d\n", + vif->addr, arvif->vdev_id); +@@ -7120,6 +7156,10 @@ static int ath11k_mac_op_add_interface(s + ret); + } + ++ ret = ath11k_mac_ap_ps_recalc(ar); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to set ap ps ret %d\n", ret); ++ + mutex_unlock(&ar->conf_mutex); + + return 0; +@@ -7227,6 +7267,7 @@ err_vdev_del: + + /* Recalc txpower for remaining vdev */ + ath11k_mac_txpower_recalc(ar); ++ ath11k_mac_ap_ps_recalc(ar); + + ath11k_debugfs_remove_interface(arvif); + +--- a/drivers/net/wireless/ath/ath11k/mac.h ++++ b/drivers/net/wireless/ath/ath11k/mac.h +@@ -135,6 +135,7 @@ void ath11k_mac_11d_scan_start(struct at + void ath11k_mac_11d_scan_stop(struct ath11k *ar); + void ath11k_mac_11d_scan_stop_all(struct ath11k_base *ab); + ++int ath11k_mac_ap_ps_recalc(struct ath11k *ar); + void ath11k_mac_destroy(struct ath11k_base *ab); + void ath11k_mac_unregister(struct ath11k_base *ab); + int ath11k_mac_register(struct ath11k_base *ab); +--- a/drivers/net/wireless/ath/ath11k/vendor.c ++++ b/drivers/net/wireless/ath/ath11k/vendor.c +@@ -6,7 +6,6 @@ + #include + #include + #include "core.h" +-#include "vendor.h" + #include "debug.h" + + static const struct nla_policy +@@ -21,6 +20,11 @@ ath11k_vendor_wlan_prio_policy[QCA_WLAN_ + [QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT] = { .type = NLA_U8 }, + }; + ++static const struct nla_policy ++ath11k_vendor_set_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = { ++ [QCA_WLAN_VENDOR_ATTR_CONFIG_GTX] = {.type = NLA_FLAG} ++}; ++ + static int ath11k_vendor_btcoex_configure(struct wiphy *wiphy, + struct wireless_dev *wdev, + const void *data, +@@ -101,6 +105,51 @@ out: + return ret; + } + ++static int ath11k_vendor_set_wifi_config(struct wiphy *wihpy, ++ struct wireless_dev *wdev, ++ const void *data, ++ int data_len) ++{ ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k *ar; ++ struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1]; ++ int ret = 0; ++ ++ if (!wdev) ++ return -EINVAL; ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) ++ return -EINVAL; ++ ++ arvif = (struct ath11k_vif*)vif->drv_priv; ++ if (!arvif) ++ return -EINVAL; ++ ++ ar = arvif->ar; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ ret = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_CONFIG_MAX, data, data_len, ++ ath11k_vendor_set_wifi_config_policy, NULL); ++ if (ret) { ++ ath11k_warn(ar->ab, "invalid set wifi config policy attribute\n"); ++ goto exit; ++ } ++ ++ ar->ap_ps_enabled = nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_CONFIG_GTX]); ++ ret = ath11k_mac_ap_ps_recalc(ar); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send ap ps ret %d\n", ret); ++ goto exit; ++ } ++ ++exit: ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++} ++ + static struct wiphy_vendor_command ath11k_vendor_commands[] = { + { + .info.vendor_id = QCA_NL80211_VENDOR_ID, +@@ -108,8 +157,18 @@ static struct wiphy_vendor_command ath11 + .flags = WIPHY_VENDOR_CMD_NEED_WDEV | + WIPHY_VENDOR_CMD_NEED_RUNNING, + .doit = ath11k_vendor_btcoex_configure, +- .policy = ath11k_vendor_btcoex_config_policy +- } ++ .policy = ath11k_vendor_btcoex_config_policy, ++ .maxattr = QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX ++ }, ++ { ++ .info.vendor_id = QCA_NL80211_VENDOR_ID, ++ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION, ++ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | ++ WIPHY_VENDOR_CMD_NEED_RUNNING, ++ .doit = ath11k_vendor_set_wifi_config, ++ .policy = ath11k_vendor_set_wifi_config_policy, ++ .maxattr = QCA_WLAN_VENDOR_ATTR_CONFIG_MAX ++ }, + }; + + int ath11k_vendor_register(struct ath11k *ar) +--- a/drivers/net/wireless/ath/ath11k/vendor.h ++++ b/drivers/net/wireless/ath/ath11k/vendor.h +@@ -9,6 +9,9 @@ + #define QCA_NL80211_VENDOR_ID 0x001374 + + enum qca_nl80211_vendor_subcmds { ++ /* Wi-Fi configuration subcommand */ ++ QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION = 74, ++ + /* QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG: This command is used to + * enable/disable BTCOEX and set priority for different type of WLAN + * traffic over BT low priority traffic. This uses attributes in +@@ -58,7 +61,17 @@ enum qca_wlan_vendor_attr_wlan_prio { + QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_LAST - 1, + }; + ++/* Attributes for data used by ++ * QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION ++ */ ++enum qca_wlan_vendor_attr_config { ++ QCA_WLAN_VENDOR_ATTR_CONFIG_GTX = 57, + ++ /* keep last */ ++ QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST, ++ QCA_WLAN_VENDOR_ATTR_CONFIG_MAX = ++ QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST - 1, ++}; + + /** + * enum qca_wlan_vendor_attr_btcoex_config - Used by the vendor command +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -1446,6 +1446,38 @@ ath11k_wmi_rx_reord_queue_remove(struct + return ret; + } + ++int ath11k_wmi_pdev_ap_ps_cmd_send(struct ath11k *ar, u8 pdev_id, ++ u32 param_value) ++{ ++ struct ath11k_pdev_wmi *wmi = ar->wmi; ++ struct wmi_pdev_ap_ps_cmd *cmd; ++ struct sk_buff *skb; ++ int ret; ++ ++ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); ++ if (!skb) ++ return -ENOMEM; ++ ++ cmd = (struct wmi_pdev_ap_ps_cmd *)skb->data; ++ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, ++ WMI_TAG_PDEV_GREEN_AP_PS_ENABLE_CMD) | ++ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); ++ cmd->pdev_id = pdev_id; ++ cmd->param_value = param_value; ++ ++ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send ap ps enable/disable cmd\n"); ++ dev_kfree_skb(skb); ++ } ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, ++ "wmi pdev ap ps set pdev id %d value %d\n", ++ pdev_id, param_value); ++ ++ return ret; ++} ++ + int ath11k_wmi_pdev_set_param(struct ath11k *ar, u32 param_id, + u32 param_value, u8 pdev_id) + { +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -3110,6 +3110,12 @@ struct set_fwtest_params { + u32 value; + }; + ++struct wmi_pdev_ap_ps_cmd { ++ u32 tlv_header; ++ u32 pdev_id; ++ u32 param_value; ++} __packed; ++ + struct wmi_fwtest_set_param_cmd_param { + u32 tlv_header; + u32 param_id; +@@ -6628,6 +6634,7 @@ int ath11k_wmi_pdev_non_srg_obss_bssid_e + u32 *bitmap); + int ath11k_send_coex_config_cmd(struct ath11k *ar, + struct coex_config_arg *coex_config); ++int ath11k_wmi_pdev_ap_ps_cmd_send(struct ath11k *ar, u8 pdev_id, u32 value); + int ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id, + u8 bss_color, u32 period, + bool enable); diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch b/package/kernel/mac80211/patches/ath11k_nss/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch new file mode 100644 index 00000000000000..ea76cd96327e46 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch @@ -0,0 +1,68 @@ +From 0ff455d1d446e34ae6c2596d4d8491f66fc61913 Mon Sep 17 00:00:00 2001 +From: Manish Dharanenthiran +Date: Sat, 2 Dec 2023 03:38:31 +0530 +Subject: [PATCH] wifi: mac80211: Fix memory corruption during mesh beacon + update + +During mesh beacon update, u64 flag is used to check for +bit set/unset for validation purpose. But, in +'ieee80211_mbss_info_change_notify' API, unsigned long flag +is modified using sizeof(u64). This leads to following issue: + + > 'mbss_changed' flag in 'ieee80211_if_mesh' is declared as + unsigned_long which creates an architecture dependency + (32bit vs 64bit) while modifying it with u64 flag which + leads to memory corruption. + +Fix above mentioned issue by replacing unsigned long with u64 +for changed flag. + +Signed-off-by: Manish Dharanenthiran +--- + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/mesh.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +--- a/net/mac80211/ieee80211_i.h ++++ b/net/mac80211/ieee80211_i.h +@@ -683,7 +683,7 @@ struct ieee80211_if_mesh { + struct timer_list mesh_path_root_timer; + + unsigned long wrkq_flags; +- unsigned long mbss_changed[64 / BITS_PER_LONG]; ++ unsigned long mbss_changed; + + bool userspace_handles_dfs; + +--- a/net/mac80211/mesh.c ++++ b/net/mac80211/mesh.c +@@ -1183,7 +1183,7 @@ void ieee80211_mbss_info_change_notify(s + + /* if we race with running work, worst case this work becomes a noop */ + for_each_set_bit(bit, &bits, sizeof(changed) * BITS_PER_BYTE) +- set_bit(bit, ifmsh->mbss_changed); ++ set_bit(bit, &ifmsh->mbss_changed); + set_bit(MESH_WORK_MBSS_CHANGED, &ifmsh->wrkq_flags); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); + } +@@ -1265,7 +1265,7 @@ void ieee80211_stop_mesh(struct ieee8021 + + /* clear any mesh work (for next join) we may have accrued */ + ifmsh->wrkq_flags = 0; +- memset(ifmsh->mbss_changed, 0, sizeof(ifmsh->mbss_changed)); ++ ifmsh->mbss_changed = 0; + + local->fif_other_bss--; + atomic_dec(&local->iff_allmultis); +@@ -1732,9 +1732,9 @@ static void mesh_bss_info_changed(struct + u32 bit; + u64 changed = 0; + +- for_each_set_bit(bit, ifmsh->mbss_changed, ++ for_each_set_bit(bit, &ifmsh->mbss_changed, + sizeof(changed) * BITS_PER_BYTE) { +- clear_bit(bit, ifmsh->mbss_changed); ++ clear_bit(bit, &ifmsh->mbss_changed); + changed |= BIT(bit); + } + diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch b/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch new file mode 100644 index 00000000000000..5d695ccfe55f2e --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch @@ -0,0 +1,113 @@ +From fbe5a76d8c9ff1cf3f906a3c863928fc1adcbc95 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Kathirvel +Date: Tue, 16 Feb 2021 13:44:39 +0530 +Subject: [PATCH] ath11k: Add mesh nss offload support + +- New capability advertising nss offload support for mesh type +- Mesh obj vap and link vap registration/clean up +- Command/event handling +- New .ch files in ath11k for nss mesh offload related debugs +- Tx/Rx data path on mesh link vap uses native wifi format +- Mesh obj vap handls packets in ether format. No Tx on Mesh + obj vap is expected as packets transmitted in slow path is + supposed to be encapsulated in 802.11 format. +- New mac80211-driver callbacks for mesh vap, mpath and mpp + configurations. + +Signed-off-by: Vasanthakumar Thiagarajan + +Change-Id: Ib6950344286ba18fab43586262c62dcd09557614 +Co-developed-by: Karthikeyan Kathirvel +Signed-off-by: Karthikeyan Kathirvel +Signed-off-by: Vasanthakumar Thiagarajan +--- + drivers/net/wireless/ath/ath11k/nss.c | 1482 ++++++++++++++++++++++++--- + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -35,6 +35,30 @@ ath11k_nss_get_vdev_opmode(struct ath11k + return ATH11K_NSS_OPMODE_UNKNOWN; + } + ++static struct ath11k_vif *ath11k_nss_get_arvif_from_dev(struct net_device *dev) ++{ ++ struct wireless_dev *wdev; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ ++ if (!dev) ++ return NULL; ++ ++ wdev = dev->ieee80211_ptr; ++ if (!wdev) ++ return NULL; ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) ++ return NULL; ++ ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) ++ return NULL; ++ ++ return arvif; ++} ++ + static void ath11k_nss_wifili_stats_sync(struct ath11k_base *ab, + struct nss_wifili_stats_sync_msg *wlsoc_stats) + { +@@ -294,6 +318,9 @@ void ath11k_nss_wifili_event_receive(str + + switch (msg_type) { + case NSS_WIFILI_INIT_MSG: ++ ab->nss.response = response; ++ complete(&ab->nss.complete); ++ break; + case NSS_WIFILI_PDEV_INIT_MSG: + case NSS_WIFILI_START_MSG: + case NSS_WIFILI_SOC_RESET_MSG: +@@ -302,7 +329,6 @@ void ath11k_nss_wifili_event_receive(str + ab->nss.response = response; + complete(&ab->nss.complete); + break; +- + case NSS_WIFILI_PEER_CREATE_MSG: + if (response != NSS_CMN_RESPONSE_EMSG) + break; +@@ -463,7 +489,9 @@ ath11k_nss_wifili_ext_callback_fn(struct + ath11k_nss_process_mic_error(ab, skb); + break; + default: +- kfree(skb); ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "unknown packet type received in wifili ext cb %d", ++ wepm->pkt_type); ++ dev_kfree_skb_any(skb); + break; + } + } +@@ -786,24 +814,7 @@ ath11k_nss_vdev_special_data_receive(str + int ret = 0; + struct ath11k_peer *ta_peer = NULL; + +- if (!dev) { +- dev_kfree_skb_any(skb); +- return; +- } +- +- wdev = dev->ieee80211_ptr; +- if (!wdev) { +- dev_kfree_skb_any(skb); +- return; +- } +- +- vif = wdev_to_ieee80211_vif(wdev); +- if (!vif) { +- dev_kfree_skb_any(skb); +- return; +- } +- +- arvif = (struct ath11k_vif *)vif->drv_priv; ++ arvif = ath11k_nss_get_arvif_from_dev(dev); + if (!arvif) { + dev_kfree_skb_any(skb); + return; diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch new file mode 100644 index 00000000000000..d3ffa5bd8da8e7 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch @@ -0,0 +1,608 @@ +From 4635ca1f29bc5838d556b09e3c186b76a5198ddb Mon Sep 17 00:00:00 2001 +From: Manikanta Pubbisetty +Date: Fri, 18 Aug 2023 11:43:33 +0530 +Subject: [PATCH] ath11k: add rx histogram stats + +Adding rx rate table and byte level peer rx statistics. Also, +adding a debugfs knob to reset rx stats specific to the peer. + +Signed-off-by: Manikanta Pubbisetty +--- + drivers/net/wireless/ath/ath11k/core.h | 19 ++- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 152 ++++++++++++++++-- + drivers/net/wireless/ath/ath11k/dp_rx.c | 95 +++++++++-- + drivers/net/wireless/ath/ath11k/dp_rx.h | 19 +++ + drivers/net/wireless/ath/ath11k/hal_rx.c | 85 +++++++--- + drivers/net/wireless/ath/ath11k/hal_rx.h | 21 +++ + drivers/net/wireless/ath/ath11k/hw.c | 18 +++ + drivers/net/wireless/ath/ath11k/hw.h | 1 + + 8 files changed, 351 insertions(+), 59 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -44,6 +44,8 @@ + + #define ATH11K_INVALID_HW_MAC_ID 0xFF + #define ATH11K_CONNECTION_LOSS_HZ (3 * HZ) ++#define ATH11K_RX_RATE_TABLE_NUM 320 ++#define ATH11K_RX_RATE_TABLE_11AX_NUM 576 + + /* SMBIOS type containing Board Data File Name Extension */ + #define ATH11K_SMBIOS_BDF_EXT_TYPE 0xF8 +@@ -420,6 +422,17 @@ struct ath11k_vif_iter { + struct ath11k_vif *arvif; + }; + ++struct ath11k_rx_peer_rate_stats { ++ u64 ht_mcs_count[HAL_RX_MAX_MCS_HT + 1]; ++ u64 vht_mcs_count[HAL_RX_MAX_MCS_VHT + 1]; ++ u64 he_mcs_count[HAL_RX_MAX_MCS_HE + 1]; ++ u64 nss_count[HAL_RX_MAX_NSS]; ++ u64 bw_count[HAL_RX_BW_MAX]; ++ u64 gi_count[HAL_RX_GI_MAX]; ++ u64 legacy_count[HAL_RX_MAX_NUM_LEGACY_RATES]; ++ u64 rx_rate[ATH11K_RX_RATE_TABLE_11AX_NUM]; ++}; ++ + struct ath11k_rx_peer_stats { + u64 num_msdu; + u64 num_mpdu_fcs_ok; +@@ -431,10 +444,6 @@ struct ath11k_rx_peer_stats { + u64 non_ampdu_msdu_count; + u64 stbc_count; + u64 beamformed_count; +- u64 mcs_count[HAL_RX_MAX_MCS + 1]; +- u64 nss_count[HAL_RX_MAX_NSS]; +- u64 bw_count[HAL_RX_BW_MAX]; +- u64 gi_count[HAL_RX_GI_MAX]; + u64 coding_count[HAL_RX_SU_MU_CODING_MAX]; + u64 tid_count[IEEE80211_NUM_TIDS + 1]; + u64 pream_cnt[HAL_RX_PREAMBLE_MAX]; +@@ -442,6 +451,8 @@ struct ath11k_rx_peer_stats { + u64 rx_duration; + u64 dcm_count; + u64 ru_alloc_cnt[HAL_RX_RU_ALLOC_TYPE_MAX]; ++ struct ath11k_rx_peer_rate_stats pkt_stats; ++ struct ath11k_rx_peer_rate_stats byte_stats; + }; + + #define ATH11K_HE_MCS_NUM 12 +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -10,6 +10,7 @@ + #include "peer.h" + #include "debug.h" + #include "dp_tx.h" ++#include "dp_rx.h" + #include "debugfs_htt_stats.h" + + static inline u32 ath11k_he_tones_in_ru_to_nl80211_he_ru_alloc(u16 ru_tones) +@@ -390,8 +391,14 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + struct ath11k *ar = arsta->arvif->ar; + struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; + int len = 0, i, retval = 0; +- const int size = 4096; ++ const int size = 4 * 4096; + char *buf; ++ int he_rates_avail = (rx_stats->pream_cnt[HAL_RX_PREAMBLE_11AX] > 1) ? 1 : 0; ++ int rate_table_len = he_rates_avail ? ATH11K_RX_RATE_TABLE_11AX_NUM : ++ ATH11K_RX_RATE_TABLE_NUM; ++ char *legacy_rate_str[] = {"1Mbps", "2Mbps", "5.5Mbps", "6Mbps", ++ "9Mbps", "11Mbps", "12Mbps", "18Mbps", ++ "24Mbps", "36 Mbps", "48Mbps", "54Mbps"}; + + if (!rx_stats) + return -ENOENT; +@@ -422,14 +429,6 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + rx_stats->num_mpdu_fcs_ok); + len += scnprintf(buf + len, size - len, "Num of MPDUs with FCS error: %llu\n", + rx_stats->num_mpdu_fcs_err); +- len += scnprintf(buf + len, size - len, +- "GI: 0.8us %llu 0.4us %llu 1.6us %llu 3.2us %llu\n", +- rx_stats->gi_count[0], rx_stats->gi_count[1], +- rx_stats->gi_count[2], rx_stats->gi_count[3]); +- len += scnprintf(buf + len, size - len, +- "BW: 20Mhz %llu 40Mhz %llu 80Mhz %llu 160Mhz %llu\n", +- rx_stats->bw_count[0], rx_stats->bw_count[1], +- rx_stats->bw_count[2], rx_stats->bw_count[3]); + len += scnprintf(buf + len, size - len, "BCC %llu LDPC %llu\n", + rx_stats->coding_count[0], rx_stats->coding_count[1]); + len += scnprintf(buf + len, size - len, +@@ -444,14 +443,96 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + len += scnprintf(buf + len, size - len, "TID(0-15) Legacy TID(16):"); + for (i = 0; i <= IEEE80211_NUM_TIDS; i++) + len += scnprintf(buf + len, size - len, "%llu ", rx_stats->tid_count[i]); +- len += scnprintf(buf + len, size - len, "\nMCS(0-11) Legacy MCS(12):"); +- for (i = 0; i < HAL_RX_MAX_MCS + 1; i++) +- len += scnprintf(buf + len, size - len, "%llu ", rx_stats->mcs_count[i]); +- len += scnprintf(buf + len, size - len, "\nNSS(1-8):"); +- for (i = 0; i < HAL_RX_MAX_NSS; i++) +- len += scnprintf(buf + len, size - len, "%llu ", rx_stats->nss_count[i]); +- len += scnprintf(buf + len, size - len, "\nRX Duration:%llu ", ++ len += scnprintf(buf + len, size - len, "\nRX Duration:%llu\n", + rx_stats->rx_duration); ++ ++ len += scnprintf(buf + len, size - len, "\nRX success packet stats:\n"); ++ len += scnprintf(buf + len, size - len, "\nHE packet stats:\n"); ++ for (i = 0; i <= HAL_RX_MAX_MCS_HE; i++) ++ len += scnprintf(buf + len, size - len, "MCS %d: %llu%s", i, ++ rx_stats->pkt_stats.he_mcs_count[i], ++ (i + 1) % 6 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nVHT packet stats:\n"); ++ for (i = 0; i <= HAL_RX_MAX_MCS_VHT; i++) ++ len += scnprintf(buf + len, size - len, "MCS %d: %llu%s", i, ++ rx_stats->pkt_stats.vht_mcs_count[i], ++ (i + 1) % 5 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nHT packet stats:\n"); ++ for (i = 0; i <= HAL_RX_MAX_MCS_HT; i++) ++ len += scnprintf(buf + len, size - len, "MCS %d: %llu%s", i, ++ rx_stats->pkt_stats.ht_mcs_count[i], ++ (i + 1) % 8 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nLegacy rate packet stats:\n"); ++ for (i = 0; i < HAL_RX_MAX_NUM_LEGACY_RATES; i++) ++ len += scnprintf(buf + len, size - len, "%s: %llu%s", legacy_rate_str[i], ++ rx_stats->pkt_stats.legacy_count[i], ++ (i + 1) % 4 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nNSS packet stats:\n"); ++ for (i = 0; i < HAL_RX_MAX_NSS; i++) ++ len += scnprintf(buf + len, size - len, "%dx%d: %llu ", i + 1, i + 1, ++ rx_stats->pkt_stats.nss_count[i]); ++ len += scnprintf(buf + len, size - len, ++ "\n\nGI: 0.8us %llu 0.4us %llu 1.6us %llu 3.2us %llu\n", ++ rx_stats->pkt_stats.gi_count[0], ++ rx_stats->pkt_stats.gi_count[1], ++ rx_stats->pkt_stats.gi_count[2], ++ rx_stats->pkt_stats.gi_count[3]); ++ len += scnprintf(buf + len, size - len, ++ "BW: 20Mhz %llu 40Mhz %llu 80Mhz %llu 160Mhz %llu\n", ++ rx_stats->pkt_stats.bw_count[0], ++ rx_stats->pkt_stats.bw_count[1], ++ rx_stats->pkt_stats.bw_count[2], ++ rx_stats->pkt_stats.bw_count[3]); ++ len += scnprintf(buf + len, size - len, "\nRate Table (packets):\n"); ++ for (i = 0; i < rate_table_len; i++) ++ len += scnprintf(buf + len, size - len, "%10llu%s", ++ rx_stats->pkt_stats.rx_rate[i], ++ (i + 1) % (he_rates_avail ? 12 : 8) ? "\t" : "\n"); ++ ++ len += scnprintf(buf + len, size - len, "\nRX success byte stats:\n"); ++ len += scnprintf(buf + len, size - len, "\nHE byte stats:\n"); ++ for (i = 0; i <= HAL_RX_MAX_MCS_HE; i++) ++ len += scnprintf(buf + len, size - len, "MCS %d: %llu%s", i, ++ rx_stats->byte_stats.he_mcs_count[i], ++ (i + 1) % 6 ? "\t" : "\n"); ++ ++ len += scnprintf(buf + len, size - len, "\nVHT byte stats:\n"); ++ for (i = 0; i <= HAL_RX_MAX_MCS_VHT; i++) ++ len += scnprintf(buf + len, size - len, "MCS %d: %llu%s", i, ++ rx_stats->byte_stats.vht_mcs_count[i], ++ (i + 1) % 5 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nHT byte stats:\n"); ++ for (i = 0; i <= HAL_RX_MAX_MCS_HT; i++) ++ len += scnprintf(buf + len, size - len, "MCS %d: %llu%s", i, ++ rx_stats->byte_stats.ht_mcs_count[i], ++ (i + 1) % 8 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nLegacy rate byte stats:\n"); ++ for (i = 0; i < HAL_RX_MAX_NUM_LEGACY_RATES; i++) ++ len += scnprintf(buf + len, size - len, "%s: %llu%s", legacy_rate_str[i], ++ rx_stats->byte_stats.legacy_count[i], ++ (i + 1) % 4 ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, "\nNSS byte stats:\n"); ++ for (i = 0; i < HAL_RX_MAX_NSS; i++) ++ len += scnprintf(buf + len, size - len, "%dx%d: %llu ", i + 1, i + 1, ++ rx_stats->byte_stats.nss_count[i]); ++ len += scnprintf(buf + len, size - len, ++ "\n\nGI: 0.8us %llu 0.4us %llu 1.6us %llu 3.2us %llu\n", ++ rx_stats->byte_stats.gi_count[0], ++ rx_stats->byte_stats.gi_count[1], ++ rx_stats->byte_stats.gi_count[2], ++ rx_stats->byte_stats.gi_count[3]); ++ len += scnprintf(buf + len, size - len, ++ "BW: 20Mhz %llu 40Mhz %llu 80Mhz %llu 160Mhz %llu\n", ++ rx_stats->byte_stats.bw_count[0], ++ rx_stats->byte_stats.bw_count[1], ++ rx_stats->byte_stats.bw_count[2], ++ rx_stats->byte_stats.bw_count[3]); ++ len += scnprintf(buf + len, size - len, "\nRate Table (bytes):\n"); ++ for (i = 0; i < rate_table_len; i++) ++ len += scnprintf(buf + len, size - len, "%10llu%s", ++ rx_stats->byte_stats.rx_rate[i], ++ (i + 1) % (he_rates_avail ? 12 : 8) ? "\t" : "\n"); ++ + len += scnprintf(buf + len, size - len, + "\nDCM: %llu\nRU: 26 %llu 52: %llu 106: %llu 242: %llu 484: %llu 996: %llu\n", + rx_stats->dcm_count, rx_stats->ru_alloc_cnt[0], +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -3400,10 +3400,43 @@ exit: + return total_msdu_reaped; + } + ++static void ++ath11k_dp_rx_update_peer_rate_table_stats(struct ath11k_rx_peer_stats *rx_stats, ++ struct hal_rx_mon_ppdu_info *ppdu_info, ++ u32 num_msdu) ++{ ++ u32 rate_idx = 0; ++ u32 mcs_idx = ppdu_info->mcs; ++ u32 nss_idx = ppdu_info->nss - 1; ++ u32 bw_idx = ppdu_info->bw; ++ u32 gi_idx = ppdu_info->gi; ++ ++ if ((mcs_idx > HAL_RX_MAX_MCS_HE) || (nss_idx >= HAL_RX_MAX_NSS) || ++ (bw_idx >= HAL_RX_BW_MAX) || (gi_idx >= HAL_RX_GI_MAX)) { ++ return; ++ } ++ ++ if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11N || ++ ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AC) { ++ rate_idx = mcs_idx * 8 + 8 * 10 * nss_idx; ++ rate_idx += bw_idx * 2 + gi_idx; ++ } else if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AX) { ++ gi_idx = ath11k_he_gi_to_nl80211_he_gi(ppdu_info->gi); ++ rate_idx = mcs_idx * 12 + 12 * 12 * nss_idx; ++ rate_idx += bw_idx * 3 + gi_idx; ++ } else { ++ return; ++ } ++ ++ rx_stats->pkt_stats.rx_rate[rate_idx] += num_msdu; ++ rx_stats->byte_stats.rx_rate[rate_idx] += ppdu_info->mpdu_len; ++} ++ + static void ath11k_dp_rx_update_peer_stats(struct ath11k_sta *arsta, + struct hal_rx_mon_ppdu_info *ppdu_info) + { + struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; ++ struct ath11k *ar = arsta->arvif->ar; + u32 num_msdu; + int i; + +@@ -3413,6 +3446,8 @@ static void ath11k_dp_rx_update_peer_sta + arsta->rssi_comb = ppdu_info->rssi_comb; + ewma_avg_rssi_add(&arsta->avg_rssi, ppdu_info->rssi_comb); + ++ if (!ath11k_debugfs_is_extd_rx_stats_enabled(ar)) ++ return; + num_msdu = ppdu_info->tcp_msdu_count + ppdu_info->tcp_ack_msdu_count + + ppdu_info->udp_msdu_count + ppdu_info->other_msdu_count; + +@@ -3429,18 +3464,6 @@ static void ath11k_dp_rx_update_peer_sta + ppdu_info->tid = IEEE80211_NUM_TIDS; + } + +- if (ppdu_info->nss > 0 && ppdu_info->nss <= HAL_RX_MAX_NSS) +- rx_stats->nss_count[ppdu_info->nss - 1] += num_msdu; +- +- if (ppdu_info->mcs <= HAL_RX_MAX_MCS) +- rx_stats->mcs_count[ppdu_info->mcs] += num_msdu; +- +- if (ppdu_info->gi < HAL_RX_GI_MAX) +- rx_stats->gi_count[ppdu_info->gi] += num_msdu; +- +- if (ppdu_info->bw < HAL_RX_BW_MAX) +- rx_stats->bw_count[ppdu_info->bw] += num_msdu; +- + if (ppdu_info->ldpc < HAL_RX_SU_MU_CODING_MAX) + rx_stats->coding_count[ppdu_info->ldpc] += num_msdu; + +@@ -3469,8 +3492,6 @@ static void ath11k_dp_rx_update_peer_sta + rx_stats->dcm_count += ppdu_info->dcm; + rx_stats->ru_alloc_cnt[ppdu_info->ru_alloc] += num_msdu; + +- arsta->rssi_comb = ppdu_info->rssi_comb; +- + BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > + ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); + +@@ -3479,6 +3500,52 @@ static void ath11k_dp_rx_update_peer_sta + + rx_stats->rx_duration += ppdu_info->rx_duration; + arsta->rx_duration = rx_stats->rx_duration; ++ ++ if (ppdu_info->nss > 0 && ppdu_info->nss <= HAL_RX_MAX_NSS) { ++ rx_stats->pkt_stats.nss_count[ppdu_info->nss - 1] += num_msdu; ++ rx_stats->byte_stats.nss_count[ppdu_info->nss - 1] += ppdu_info->mpdu_len; ++ } ++ ++ if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11N && ++ ppdu_info->mcs <= HAL_RX_MAX_MCS_HT) { ++ rx_stats->pkt_stats.ht_mcs_count[ppdu_info->mcs] += num_msdu; ++ rx_stats->byte_stats.ht_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; ++ /* To fit into rate table for HT packets */ ++ ppdu_info->mcs = ppdu_info->mcs % 8; ++ } ++ ++ if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AC && ++ ppdu_info->mcs <= HAL_RX_MAX_MCS_VHT) { ++ rx_stats->pkt_stats.vht_mcs_count[ppdu_info->mcs] += num_msdu; ++ rx_stats->byte_stats.vht_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; ++ } ++ ++ if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AX && ++ ppdu_info->mcs <= HAL_RX_MAX_MCS_HE) { ++ rx_stats->pkt_stats.he_mcs_count[ppdu_info->mcs] += num_msdu; ++ rx_stats->byte_stats.he_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; ++ } ++ ++ ++ if ((ppdu_info->preamble_type == HAL_RX_PREAMBLE_11A || ++ ppdu_info->preamble_type == HAL_RX_PREAMBLE_11B) && ++ ppdu_info->rate < HAL_RX_LEGACY_RATE_INVALID) { ++ rx_stats->pkt_stats.legacy_count[ppdu_info->rate] += num_msdu; ++ rx_stats->byte_stats.legacy_count[ppdu_info->rate] += ppdu_info->mpdu_len; ++ } ++ ++ if (ppdu_info->gi < HAL_RX_GI_MAX) { ++ rx_stats->pkt_stats.gi_count[ppdu_info->gi] += num_msdu; ++ rx_stats->byte_stats.gi_count[ppdu_info->gi] += ppdu_info->mpdu_len; ++ } ++ ++ if (ppdu_info->bw < HAL_RX_BW_MAX) { ++ rx_stats->pkt_stats.bw_count[ppdu_info->bw] += num_msdu; ++ rx_stats->byte_stats.bw_count[ppdu_info->bw] += ppdu_info->mpdu_len; ++ } ++ ++ ath11k_dp_rx_update_peer_rate_table_stats(rx_stats, ppdu_info, num_msdu); ++ + } + + static struct sk_buff *ath11k_dp_rx_alloc_mon_status_buf(struct ath11k_base *ab, +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -69,6 +69,25 @@ struct ath11k_dp_rfc1042_hdr { + __be16 snap_type; + } __packed; + ++static inline u32 ath11k_he_gi_to_nl80211_he_gi(u8 sgi) ++{ ++ u32 ret = 0; ++ ++ switch (sgi) { ++ case RX_MSDU_START_SGI_0_8_US: ++ ret = NL80211_RATE_INFO_HE_GI_0_8; ++ break; ++ case RX_MSDU_START_SGI_1_6_US: ++ ret = NL80211_RATE_INFO_HE_GI_1_6; ++ break; ++ case RX_MSDU_START_SGI_3_2_US: ++ ret = NL80211_RATE_INFO_HE_GI_3_2; ++ break; ++ } ++ ++ return ret; ++} ++ + int ath11k_dp_rx_ampdu_start(struct ath11k_vif *arvif, + struct ieee80211_ampdu_params *params); + int ath11k_dp_rx_ampdu_stop(struct ath11k_vif *arvif, +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -978,44 +978,78 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + ppdu_info->is_stbc = FIELD_GET(HAL_RX_HT_SIG_INFO_INFO1_STBC, + info1); + ppdu_info->ldpc = FIELD_GET(HAL_RX_HT_SIG_INFO_INFO1_FEC_CODING, info1); +- ppdu_info->gi = info1 & HAL_RX_HT_SIG_INFO_INFO1_GI; +- +- switch (ppdu_info->mcs) { +- case 0 ... 7: +- ppdu_info->nss = 1; +- break; +- case 8 ... 15: +- ppdu_info->nss = 2; +- break; +- case 16 ... 23: +- ppdu_info->nss = 3; +- break; +- case 24 ... 31: +- ppdu_info->nss = 4; +- break; +- } +- +- if (ppdu_info->nss > 1) +- ppdu_info->mcs = ppdu_info->mcs % 8; +- ++ ppdu_info->gi = FIELD_GET(HAL_RX_HT_SIG_INFO_INFO1_GI, info1); ++ ppdu_info->nss = (ppdu_info->mcs >> 3) + 1; + ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; + break; + } + case HAL_PHYRX_L_SIG_B: { + struct hal_rx_lsig_b_info *lsigb = + (struct hal_rx_lsig_b_info *)tlv_data; ++ u8 rate; ++ ++ rate = FIELD_GET(HAL_RX_LSIG_B_INFO_INFO0_RATE, ++ __le32_to_cpu(lsigb->info0)); + +- ppdu_info->rate = FIELD_GET(HAL_RX_LSIG_B_INFO_INFO0_RATE, +- __le32_to_cpu(lsigb->info0)); ++ switch (rate) { ++ case 1: ++ rate = HAL_RX_LEGACY_RATE_1_MBPS; ++ break; ++ case 2: ++ case 5: ++ rate = HAL_RX_LEGACY_RATE_2_MBPS; ++ break; ++ case 3: ++ case 6: ++ rate = HAL_RX_LEGACY_RATE_5_5_MBPS; ++ break; ++ case 4: ++ case 7: ++ rate = HAL_RX_LEGACY_RATE_11_MBPS; ++ break; ++ default: ++ rate = HAL_RX_LEGACY_RATE_INVALID; ++ } ++ ppdu_info->rate = rate; + ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; + break; + } + case HAL_PHYRX_L_SIG_A: { + struct hal_rx_lsig_a_info *lsiga = + (struct hal_rx_lsig_a_info *)tlv_data; ++ u8 rate; + +- ppdu_info->rate = FIELD_GET(HAL_RX_LSIG_A_INFO_INFO0_RATE, +- __le32_to_cpu(lsiga->info0)); ++ rate = FIELD_GET(HAL_RX_LSIG_A_INFO_INFO0_RATE, ++ __le32_to_cpu(lsiga->info0)); ++ switch (rate) { ++ case 8: ++ rate = HAL_RX_LEGACY_RATE_48_MBPS; ++ break; ++ case 9: ++ rate = HAL_RX_LEGACY_RATE_24_MBPS; ++ break; ++ case 10: ++ rate = HAL_RX_LEGACY_RATE_12_MBPS; ++ break; ++ case 11: ++ rate = HAL_RX_LEGACY_RATE_6_MBPS; ++ break; ++ case 12: ++ rate = HAL_RX_LEGACY_RATE_54_MBPS; ++ break; ++ case 13: ++ rate = HAL_RX_LEGACY_RATE_36_MBPS; ++ break; ++ case 14: ++ rate = HAL_RX_LEGACY_RATE_18_MBPS; ++ break; ++ case 15: ++ rate = HAL_RX_LEGACY_RATE_9_MBPS; ++ break; ++ default: ++ rate = HAL_RX_LEGACY_RATE_INVALID; ++ } ++ ppdu_info->rate = rate; + ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; + break; + } +@@ -1473,6 +1507,9 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + peer_id = ath11k_hal_rx_mpduinfo_get_peerid(ab, mpdu_info); + if (peer_id) + ppdu_info->peer_id = peer_id; ++ ++ ppdu_info->mpdu_len += ab->hw_params.hw_ops->rx_desc_get_hal_mpdu_len(mpdu_info); ++ + break; + } + case HAL_RXPCU_PPDU_END_INFO: { +--- a/drivers/net/wireless/ath/ath11k/hal_rx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.h +@@ -19,7 +19,11 @@ struct hal_rx_wbm_rel_info { + #define VHT_SIG_SU_NSS_MASK 0x7 + + #define HAL_RX_MAX_MCS 12 ++#define HAL_RX_MAX_MCS_HT 31 ++#define HAL_RX_MAX_MCS_VHT 9 ++#define HAL_RX_MAX_MCS_HE 11 + #define HAL_RX_MAX_NSS 8 ++#define HAL_RX_MAX_NUM_LEGACY_RATES 12 + + struct hal_rx_mon_status_tlv_hdr { + u32 hdr; +@@ -104,6 +108,22 @@ struct hal_rx_user_status { + u32 mpdu_err_byte_count; + }; + ++enum hal_rx_legacy_rate { ++ HAL_RX_LEGACY_RATE_1_MBPS, ++ HAL_RX_LEGACY_RATE_2_MBPS, ++ HAL_RX_LEGACY_RATE_5_5_MBPS, ++ HAL_RX_LEGACY_RATE_6_MBPS, ++ HAL_RX_LEGACY_RATE_9_MBPS, ++ HAL_RX_LEGACY_RATE_11_MBPS, ++ HAL_RX_LEGACY_RATE_12_MBPS, ++ HAL_RX_LEGACY_RATE_18_MBPS, ++ HAL_RX_LEGACY_RATE_24_MBPS, ++ HAL_RX_LEGACY_RATE_36_MBPS, ++ HAL_RX_LEGACY_RATE_48_MBPS, ++ HAL_RX_LEGACY_RATE_54_MBPS, ++ HAL_RX_LEGACY_RATE_INVALID, ++}; ++ + #define HAL_TLV_STATUS_PPDU_NOT_DONE HAL_RX_MON_STATUS_PPDU_NOT_DONE + #define HAL_TLV_STATUS_PPDU_DONE HAL_RX_MON_STATUS_PPDU_DONE + #define HAL_TLV_STATUS_BUF_DONE HAL_RX_MON_STATUS_BUF_DONE +@@ -128,6 +148,7 @@ struct hal_rx_mon_ppdu_info { + u32 num_mpdu_fcs_ok; + u32 num_mpdu_fcs_err; + u32 preamble_type; ++ u32 mpdu_len; + u16 chan_num; + u16 tcp_msdu_count; + u16 tcp_ack_msdu_count; +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -1051,6 +1051,17 @@ static u32 ath11k_hw_wcn6750_get_tcl_rin + return skb_get_hash(skb); + } + ++static u32 ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len(struct hal_rx_mpdu_info *mpdu_info) ++{ ++ return FIELD_GET(HAL_RX_MPDU_INFO_INFO1_MPDU_LEN, ++ __le32_to_cpu(mpdu_info->u.ipq8074.info1)); ++} ++ ++static u32 ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len(struct hal_rx_mpdu_info *mpdu_info) ++{ ++ return FIELD_GET(HAL_RX_MPDU_INFO_INFO1_MPDU_LEN, ++ __le32_to_cpu(mpdu_info->u.qcn9074.info1)); ++} + const struct ath11k_hw_ops ipq8074_ops = { + .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id, + .wmi_init_config = ath11k_init_wmi_config_ipq8074, +@@ -1089,6 +1100,7 @@ const struct ath11k_hw_ops ipq8074_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, + #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, + #endif +@@ -1136,6 +1148,7 @@ const struct ath11k_hw_ops ipq6018_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, + }; + + const struct ath11k_hw_ops qca6390_ops = { +@@ -1177,6 +1190,7 @@ const struct ath11k_hw_ops qca6390_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, + }; + + const struct ath11k_hw_ops qcn9074_ops = { +@@ -1217,6 +1231,7 @@ const struct ath11k_hw_ops qcn9074_ops = + .reo_setup = ath11k_hw_ipq8074_reo_setup, + .mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, + }; + + const struct ath11k_hw_ops wcn6855_ops = { +@@ -1339,6 +1354,7 @@ const struct ath11k_hw_ops ipq5018_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, + }; + + #define ATH11K_TX_RING_MASK_0 BIT(0) +--- a/drivers/net/wireless/ath/ath11k/hw.h ++++ b/drivers/net/wireless/ath/ath11k/hw.h +@@ -315,6 +315,7 @@ struct ath11k_hw_ops { + bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); + u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); + u32 (*get_ring_selector)(struct sk_buff *skb); ++ u32 (*rx_desc_get_hal_mpdu_len)(struct hal_rx_mpdu_info *mpdu_info); + #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + void (*rx_desc_get_offset)(struct htt_rx_ring_tlv_filter *tlv_filter); + #endif diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch new file mode 100644 index 00000000000000..e7908c6daad2a7 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch @@ -0,0 +1,452 @@ +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -532,6 +532,12 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + len += scnprintf(buf + len, size - len, "%10llu%s", + rx_stats->byte_stats.rx_rate[i], + (i + 1) % (he_rates_avail ? 12 : 8) ? "\t" : "\n"); ++ len += scnprintf(buf + len, size - len, ++ "\nDCM: %llu\nRU26: %llu \nRU52: %llu \nRU106: %llu \nRU242: %llu \nRU484: %llu \nRU996: %llu\n", ++ rx_stats->dcm_count, rx_stats->ru_alloc_cnt[0], ++ rx_stats->ru_alloc_cnt[1], rx_stats->ru_alloc_cnt[2], ++ rx_stats->ru_alloc_cnt[3], rx_stats->ru_alloc_cnt[4], ++ rx_stats->ru_alloc_cnt[5]); + + len += scnprintf(buf + len, size - len, + "\nDCM: %llu\nRU: 26 %llu 52: %llu 106: %llu 242: %llu 484: %llu 996: %llu\n", +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -3236,11 +3236,12 @@ exit: + static void + ath11k_dp_rx_update_peer_rate_table_stats(struct ath11k_rx_peer_stats *rx_stats, + struct hal_rx_mon_ppdu_info *ppdu_info, ++ struct hal_rx_user_status* user_stats, + u32 num_msdu) + { + u32 rate_idx = 0; +- u32 mcs_idx = ppdu_info->mcs; +- u32 nss_idx = ppdu_info->nss - 1; ++ u32 mcs_idx = (user_stats) ? user_stats->mcs : ppdu_info->mcs; ++ u32 nss_idx = (user_stats) ? user_stats->nss - 1 : ppdu_info->nss - 1; + u32 bw_idx = ppdu_info->bw; + u32 gi_idx = ppdu_info->gi; + +@@ -3262,10 +3263,13 @@ ath11k_dp_rx_update_peer_rate_table_stat + } + + rx_stats->pkt_stats.rx_rate[rate_idx] += num_msdu; +- rx_stats->byte_stats.rx_rate[rate_idx] += ppdu_info->mpdu_len; ++ if (user_stats) ++ rx_stats->byte_stats.rx_rate[rate_idx] += user_stats->mpdu_ok_byte_count; ++ else ++ rx_stats->byte_stats.rx_rate[rate_idx] += ppdu_info->mpdu_len; + } + +-static void ath11k_dp_rx_update_peer_stats(struct ath11k_sta *arsta, ++static void ath11k_dp_rx_update_peer_su_stats(struct ath11k_sta *arsta, + struct hal_rx_mon_ppdu_info *ppdu_info) + { + struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; +@@ -3323,7 +3327,6 @@ static void ath11k_dp_rx_update_peer_sta + rx_stats->num_mpdu_fcs_ok += ppdu_info->num_mpdu_fcs_ok; + rx_stats->num_mpdu_fcs_err += ppdu_info->num_mpdu_fcs_err; + rx_stats->dcm_count += ppdu_info->dcm; +- rx_stats->ru_alloc_cnt[ppdu_info->ru_alloc] += num_msdu; + + BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > + ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); +@@ -3341,10 +3344,10 @@ static void ath11k_dp_rx_update_peer_sta + + if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11N && + ppdu_info->mcs <= HAL_RX_MAX_MCS_HT) { +- rx_stats->pkt_stats.ht_mcs_count[ppdu_info->mcs] += num_msdu; +- rx_stats->byte_stats.ht_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; +- /* To fit into rate table for HT packets */ +- ppdu_info->mcs = ppdu_info->mcs % 8; ++ rx_stats->pkt_stats.ht_mcs_count[ppdu_info->mcs] += num_msdu; ++ rx_stats->byte_stats.ht_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; ++ /* To fit into rate table for HT packets */ ++ ppdu_info->mcs = ppdu_info->mcs % 8; + } + + if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AC && +@@ -3377,7 +3380,120 @@ static void ath11k_dp_rx_update_peer_sta + rx_stats->byte_stats.bw_count[ppdu_info->bw] += ppdu_info->mpdu_len; + } + +- ath11k_dp_rx_update_peer_rate_table_stats(rx_stats, ppdu_info, num_msdu); ++ ath11k_dp_rx_update_peer_rate_table_stats(rx_stats, ppdu_info, NULL, num_msdu); ++ ++} ++ ++static void ath11k_dp_rx_update_user_stats(struct ath11k *ar, ++ struct hal_rx_mon_ppdu_info *ppdu_info, ++ u32 uid) ++{ ++ struct ath11k_sta *arsta = NULL; ++ struct ath11k_rx_peer_stats *rx_stats = NULL; ++ struct hal_rx_user_status* user_stats = &ppdu_info->userstats[uid]; ++ struct ath11k_peer *peer; ++ u32 num_msdu; ++ ++ if (user_stats->ast_index == 0 || user_stats->ast_index == 0xFFFF) ++ return; ++ ++ peer = ath11k_peer_find_by_ast(ar->ab, user_stats->ast_index); ++ ++ if (peer == NULL) { ++ ath11k_warn(ar->ab, "peer ast idx %d can't be found\n", ++ user_stats->ast_index); ++ return; ++ } ++ ++ arsta = (struct ath11k_sta *)peer->sta->drv_priv; ++ rx_stats = arsta->rx_stats; ++ ++ if (!rx_stats) ++ return; ++ ++ arsta->rssi_comb = ppdu_info->rssi_comb; ++ ++ num_msdu = user_stats->tcp_msdu_count + user_stats->tcp_ack_msdu_count + ++ user_stats->udp_msdu_count + user_stats->other_msdu_count; ++ ++ rx_stats->num_msdu += num_msdu; ++ rx_stats->tcp_msdu_count += user_stats->tcp_msdu_count + ++ user_stats->tcp_ack_msdu_count; ++ rx_stats->udp_msdu_count += user_stats->udp_msdu_count; ++ rx_stats->other_msdu_count += user_stats->other_msdu_count; ++ ++ if (ppdu_info->ldpc < HAL_RX_SU_MU_CODING_MAX) ++ rx_stats->coding_count[ppdu_info->ldpc] += num_msdu; ++ ++ if (user_stats->tid <= IEEE80211_NUM_TIDS) ++ rx_stats->tid_count[user_stats->tid] += num_msdu; ++ ++ if (user_stats->preamble_type < HAL_RX_PREAMBLE_MAX) ++ rx_stats->pream_cnt[user_stats->preamble_type] += num_msdu; ++ ++ if (ppdu_info->reception_type < HAL_RX_RECEPTION_TYPE_MAX) ++ rx_stats->reception_type[ppdu_info->reception_type] += num_msdu; ++ ++ if (ppdu_info->is_stbc) ++ rx_stats->stbc_count += num_msdu; ++ ++ if (ppdu_info->beamformed) ++ rx_stats->beamformed_count += num_msdu; ++ ++ if (user_stats->mpdu_cnt_fcs_ok > 1) ++ rx_stats->ampdu_msdu_count += num_msdu; ++ else ++ rx_stats->non_ampdu_msdu_count += num_msdu; ++ ++ rx_stats->num_mpdu_fcs_ok += user_stats->mpdu_cnt_fcs_ok; ++ rx_stats->num_mpdu_fcs_err += user_stats->mpdu_cnt_fcs_err; ++ rx_stats->dcm_count += ppdu_info->dcm; ++ if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA || ++ ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO) ++ rx_stats->ru_alloc_cnt[user_stats->ul_ofdma_ru_size] += num_msdu; ++ ++ rx_stats->rx_duration += ppdu_info->rx_duration; ++ arsta->rx_duration = rx_stats->rx_duration; ++ ++ if (user_stats->nss > 0 && user_stats->nss <= HAL_RX_MAX_NSS) { ++ rx_stats->pkt_stats.nss_count[user_stats->nss - 1] += num_msdu; ++ rx_stats->byte_stats.nss_count[user_stats->nss - 1] += user_stats->mpdu_ok_byte_count; ++ } ++ ++ if (user_stats->preamble_type == HAL_RX_PREAMBLE_11AX && ++ user_stats->mcs <= HAL_RX_MAX_MCS_HE) { ++ rx_stats->pkt_stats.he_mcs_count[user_stats->mcs] += num_msdu; ++ rx_stats->byte_stats.he_mcs_count[user_stats->mcs] += user_stats->mpdu_ok_byte_count; ++ } ++ ++ if (ppdu_info->gi < HAL_RX_GI_MAX) { ++ rx_stats->pkt_stats.gi_count[ppdu_info->gi] += num_msdu; ++ rx_stats->byte_stats.gi_count[ppdu_info->gi] += user_stats->mpdu_ok_byte_count; ++ } ++ ++ if (ppdu_info->bw < HAL_RX_BW_MAX) { ++ rx_stats->pkt_stats.bw_count[ppdu_info->bw] += num_msdu; ++ rx_stats->byte_stats.bw_count[ppdu_info->bw] += user_stats->mpdu_ok_byte_count; ++ } ++ ++ ath11k_dp_rx_update_peer_rate_table_stats(rx_stats, ppdu_info, user_stats, num_msdu); ++} ++ ++static void ath11k_dp_rx_update_peer_mu_stats(struct ath11k *ar, ++ struct hal_rx_mon_ppdu_info *ppdu_info) ++{ ++ u32 num_users, i; ++ ++ if (!ath11k_debugfs_is_extd_rx_stats_enabled(ar)) ++ return; ++ ++ num_users = ppdu_info->num_users; ++ if (num_users > HAL_MAX_UL_MU_USERS) ++ num_users = HAL_MAX_UL_MU_USERS; ++ ++ for (i = 0; i < num_users; i++) { ++ ath11k_dp_rx_update_user_stats(ar, ppdu_info, i); ++ } + + } + +@@ -5846,6 +5962,55 @@ static void ath11k_dp_rx_mon_dest_proces + } + } + ++void ath11k_dp_rx_mon_process_ulofdma(struct hal_rx_mon_ppdu_info *ppdu_info) ++{ ++ struct hal_rx_user_status *rx_user_status; ++ u32 num_users; ++ uint32_t i; ++ uint32_t mu_ul_user_v0_word0; ++ uint32_t mu_ul_user_v0_word1; ++ uint32_t ru_size; ++ ++ if (!(ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA || ++ ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO)) ++ return; ++ ++ num_users = ppdu_info->num_users; ++ if (num_users > HAL_MAX_UL_MU_USERS) ++ num_users = HAL_MAX_UL_MU_USERS; ++ ++ for (i = 0; i < num_users; i++) { ++ rx_user_status = &ppdu_info->userstats[i]; ++ mu_ul_user_v0_word0 = ++ rx_user_status->ul_ofdma_user_v0_word0; ++ mu_ul_user_v0_word1 = ++ rx_user_status->ul_ofdma_user_v0_word1; ++ ++ if (FIELD_GET(HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID, ++ mu_ul_user_v0_word0) && ++ !FIELD_GET(HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VER, ++ mu_ul_user_v0_word0)) { ++ rx_user_status->mcs = ++ FIELD_GET(HAL_RX_UL_OFDMA_USER_INFO_V0_W1_MCS, ++ mu_ul_user_v0_word1); ++ rx_user_status->nss = ++ FIELD_GET(HAL_RX_UL_OFDMA_USER_INFO_V0_W1_NSS, ++ mu_ul_user_v0_word1) + 1; ++ ++ rx_user_status->ofdma_info_valid = 1; ++ rx_user_status->ul_ofdma_ru_start_index = ++ FIELD_GET(HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_START, ++ mu_ul_user_v0_word1); ++ ++ ru_size = FIELD_GET(HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_SIZE, ++ mu_ul_user_v0_word1); ++ rx_user_status->ul_ofdma_ru_width = ru_size; ++ rx_user_status->ul_ofdma_ru_size = ru_size; ++ } ++ } ++ ++} ++ + int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, + struct napi_struct *napi, int budget) + { +@@ -5919,8 +6084,13 @@ int ath11k_dp_rx_process_mon_status(stru + + if ((ppdu_info->fc_valid) && + (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { +- arsta = (struct ath11k_sta *)peer->sta->drv_priv; +- ath11k_dp_rx_update_peer_stats(arsta, ppdu_info); ++ if (ppdu_info.reception_type == HAL_RX_RECEPTION_TYPE_SU) { ++ arsta = (struct ath11k_sta *)peer->sta->drv_priv; ++ ath11k_dp_rx_update_peer_su_stats(arsta, &ppdu_info); ++ } else { ++ ath11k_dp_rx_mon_process_ulofdma(&ppdu_info); ++ ath11k_dp_rx_update_peer_mu_stats(ar, &ppdu_info); ++ } + } + + if (ath11k_debugfs_is_pktlog_peer_valid(ar, peer->addr)) +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -804,7 +804,6 @@ void ath11k_hal_reo_init_cmd_ring(struct + } + } + +-#define HAL_MAX_UL_MU_USERS 37 + static inline void + ath11k_hal_rx_handle_ofdma_info(void *rx_tlv, + struct hal_rx_user_status *rx_user_status) +@@ -836,6 +835,8 @@ ath11k_hal_rx_populate_mu_user_info(void + { + rx_user_status->ast_index = ppdu_info->ast_index; + rx_user_status->tid = ppdu_info->tid; ++ rx_user_status->tcp_ack_msdu_count = ++ ppdu_info->tcp_ack_msdu_count; + rx_user_status->tcp_msdu_count = + ppdu_info->tcp_msdu_count; + rx_user_status->udp_msdu_count = +@@ -859,6 +860,9 @@ ath11k_hal_rx_populate_mu_user_info(void + ppdu_info->num_mpdu_fcs_ok; + rx_user_status->mpdu_cnt_fcs_err = + ppdu_info->num_mpdu_fcs_err; ++ memcpy(&rx_user_status->mpdu_fcs_ok_bitmap[0], &ppdu_info->mpdu_fcs_ok_bitmap[0], ++ HAL_RX_NUM_WORDS_PER_PPDU_BITMAP * ++ sizeof(ppdu_info->mpdu_fcs_ok_bitmap[0])); + + ath11k_hal_rx_populate_byte_count(rx_tlv, ppdu_info, rx_user_status); + } +@@ -888,6 +892,14 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + __le32_to_cpu(ppdu_start->info0)); + ppdu_info->chan_num = __le32_to_cpu(ppdu_start->chan_num); + ppdu_info->ppdu_ts = __le32_to_cpu(ppdu_start->ppdu_start_ts); ++ ++ if (ppdu_info->ppdu_id != ppdu_info->last_ppdu_id) { ++ ppdu_info->last_ppdu_id = ppdu_info->ppdu_id; ++ ppdu_info->num_users = 0; ++ memset(&ppdu_info->mpdu_fcs_ok_bitmap, 0, ++ HAL_RX_NUM_WORDS_PER_PPDU_BITMAP * ++ sizeof(ppdu_info->mpdu_fcs_ok_bitmap[0])); ++ } + break; + } + case HAL_RX_PPDU_END_USER_STATS: { +@@ -942,15 +954,16 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + + if (userid < HAL_MAX_UL_MU_USERS) { + struct hal_rx_user_status *rxuser_stats = +- &ppdu_info->userstats; ++ &ppdu_info->userstats[userid]; ++ ppdu_info->num_users += 1; + + ath11k_hal_rx_handle_ofdma_info(tlv_data, rxuser_stats); + ath11k_hal_rx_populate_mu_user_info(tlv_data, ppdu_info, + rxuser_stats); + } +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[0] = ++ ppdu_info->mpdu_fcs_ok_bitmap[0] = + __le32_to_cpu(eu_stats->rsvd1[0]); +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[1] = ++ ppdu_info->mpdu_fcs_ok_bitmap[1] = + __le32_to_cpu(eu_stats->rsvd1[1]); + + break; +@@ -958,12 +971,12 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + case HAL_RX_PPDU_END_USER_STATS_EXT: { + struct hal_rx_ppdu_end_user_stats_ext *eu_stats = + (struct hal_rx_ppdu_end_user_stats_ext *)tlv_data; +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[2] = eu_stats->info1; +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[3] = eu_stats->info2; +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[4] = eu_stats->info3; +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[5] = eu_stats->info4; +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[6] = eu_stats->info5; +- ppdu_info->userstats.mpdu_fcs_ok_bitmap[7] = eu_stats->info6; ++ ppdu_info->mpdu_fcs_ok_bitmap[2] = eu_stats->info1; ++ ppdu_info->mpdu_fcs_ok_bitmap[3] = eu_stats->info2; ++ ppdu_info->mpdu_fcs_ok_bitmap[4] = eu_stats->info3; ++ ppdu_info->mpdu_fcs_ok_bitmap[5] = eu_stats->info4; ++ ppdu_info->mpdu_fcs_ok_bitmap[6] = eu_stats->info5; ++ ppdu_info->mpdu_fcs_ok_bitmap[7] = eu_stats->info6; + break; + } + case HAL_PHYRX_HT_SIG: { +--- a/drivers/net/wireless/ath/ath11k/hal_rx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.h +@@ -72,6 +72,10 @@ enum hal_rx_reception_type { + #define HAL_RX_FCS_LEN 4 + #define HAL_AST_IDX_INVALID 0xFFFF + ++#define HAL_MAX_UL_MU_USERS 37 ++#define HAL_RX_MAX_MPDU 256 ++#define HAL_RX_NUM_WORDS_PER_PPDU_BITMAP (HAL_RX_MAX_MPDU >> 5) ++ + enum hal_rx_mon_status { + HAL_RX_MON_STATUS_PPDU_NOT_DONE, + HAL_RX_MON_STATUS_PPDU_DONE, +@@ -82,14 +86,15 @@ struct hal_rx_user_status { + u32 mcs:4, + nss:3, + ofdma_info_valid:1, +- dl_ofdma_ru_start_index:7, +- dl_ofdma_ru_width:7, +- dl_ofdma_ru_size:8; ++ ul_ofdma_ru_start_index:7, ++ ul_ofdma_ru_width:7, ++ ul_ofdma_ru_size:8; + u32 ul_ofdma_user_v0_word0; + u32 ul_ofdma_user_v0_word1; + u32 ast_index; + u32 tid; + u16 tcp_msdu_count; ++ u16 tcp_ack_msdu_count; + u16 udp_msdu_count; + u16 other_msdu_count; + u16 frame_control; +@@ -103,7 +108,7 @@ struct hal_rx_user_status { + u8 rs_flags; + u32 mpdu_cnt_fcs_ok; + u32 mpdu_cnt_fcs_err; +- u32 mpdu_fcs_ok_bitmap[8]; ++ u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; + u32 mpdu_ok_byte_count; + u32 mpdu_err_byte_count; + }; +@@ -144,6 +149,7 @@ struct hal_sw_mon_ring_entries { + + struct hal_rx_mon_ppdu_info { + u32 ppdu_id; ++ u32 last_ppdu_id; + u32 ppdu_ts; + u32 num_mpdu_fcs_ok; + u32 num_mpdu_fcs_err; +@@ -212,9 +218,20 @@ struct hal_rx_mon_ppdu_info { + u8 ltf_size; + u8 rxpcu_filter_pass; + char rssi_chain[8][8]; +- struct hal_rx_user_status userstats; ++ u32 num_users; ++ u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; ++ struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS]; + }; + ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID BIT(30) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VER BIT(31) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_NSS GENMASK(2, 0) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_MCS GENMASK(6, 3) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_LDPC BIT(7) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_DCM BIT(8) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_START GENMASK(15, 9) ++#define HAL_RX_UL_OFDMA_USER_INFO_V0_W1_RU_SIZE GENMASK(18, 16) ++ + #define HAL_RX_PPDU_START_INFO0_PPDU_ID GENMASK(15, 0) + + struct hal_rx_ppdu_start { +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -94,6 +94,20 @@ struct ath11k_peer *ath11k_peer_find_by_ + return NULL; + } + ++struct ath11k_peer *ath11k_peer_find_by_ast(struct ath11k_base *ab, ++ int ast_hash) ++{ ++ struct ath11k_peer *peer; ++ ++ lockdep_assert_held(&ab->base_lock); ++ ++ list_for_each_entry(peer, &ab->peers, list) ++ if (ast_hash == peer->ast_hash) ++ return peer; ++ ++ return NULL; ++} ++ + #ifdef CPTCFG_ATH11K_NSS_SUPPORT + struct ath11k_ast_entry *ath11k_peer_ast_find_by_peer(struct ath11k_base *ab, + struct ath11k_peer *peer, +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -112,6 +112,7 @@ struct ath11k_peer *ath11k_peer_find(str + struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab, + const u8 *addr); + struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab, int peer_id); ++struct ath11k_peer *ath11k_peer_find_by_ast(struct ath11k_base *ab, int ast_hash); + void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id); + int ath11k_peer_delete(struct ath11k *ar, u32 vdev_id, u8 *addr); + int ath11k_peer_create(struct ath11k *ar, struct ath11k_vif *arvif, diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch b/package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch new file mode 100644 index 00000000000000..b47785828a2bd9 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch @@ -0,0 +1,146 @@ +From 41363c3109235a96d90d5946bbc01d1cc8dad47e Mon Sep 17 00:00:00 2001 +From: Anilkumar Kolli +Date: Sun, 6 Sep 2020 11:01:38 +0530 +Subject: [PATCH] ath11k: update debugfs support for mupltiple radios in PCI +bus + +debugfs_ath11k struct is moved to ath11k_core, since its common +for both pci and ahb. + +Current ath11k_pci insmod fails if there are multiple PCI rdaios, +debugfs directory is created with soc_name and bus_id to allow +creating debugfs directory for second PCI radio. + +with this Debugfs entries looks like, + # ls -l /sys/kernel/debug/ath11k/ + ipq8074 hw2.0 qcn9000 hw1.0_0000:01:00.0 qcn9000 hw1.0_0001:01:00.0 + + # ls -l /sys/kernel/debug/ath11k/ipq8074 hw2.0/ + mac0 mac1 simulate_fw_crash soc_dp_stats + + # ls -l /sys/kernel/debug/ath11k/qcn9000 hw1.0_0000:01:00.0 + mac0 simulate_fw_crash soc_dp_stats + + # /sys/kernel/debug/ath11k/qcn9000 hw1.0_0001:01:00.0: + mac0 simulate_fw_crash soc_dp_stats + +Signed-off-by: Anilkumar Kolli +--- + drivers/net/wireless/ath/ath11k/core.c | 12 +++++++ + drivers/net/wireless/ath/ath11k/core.h | 1 - + drivers/net/wireless/ath/ath11k/debugfs.c | 57 ++++++++++++++++++++++++------ + drivers/net/wireless/ath/ath11k/debugfs.h | 11 ++++++ + 5 files changed, 72 insertions(+), 13 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -2260,5 +2260,17 @@ err_sc_free: + } + EXPORT_SYMBOL(ath11k_core_alloc); + ++int ath11k_init(void) ++{ ++ return ath11k_debugfs_create(); ++} ++module_init(ath11k_init); ++ ++void ath11k_exit(void) ++{ ++ ath11k_debugfs_destroy(); ++} ++module_exit(ath11k_exit); ++ + MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11ax wireless LAN cards."); + MODULE_LICENSE("Dual BSD/GPL"); +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -15,6 +15,8 @@ + #include "hif.h" + #include "qmi.h" + ++struct dentry *debugfs_ath11k; ++ + static const char *htt_bp_umac_ring[HTT_SW_UMAC_RING_IDX_MAX] = { + "REO2SW1_RING", + "REO2SW2_RING", +@@ -1228,8 +1230,6 @@ int ath11k_debugfs_pdev_create(struct at + + void ath11k_debugfs_pdev_destroy(struct ath11k_base *ab) + { +- debugfs_remove_recursive(ab->debugfs_soc); +- ab->debugfs_soc = NULL; + } + + int ath11k_debugfs_soc_create(struct ath11k_base *ab) +@@ -1282,6 +1282,24 @@ void ath11k_debugfs_soc_destroy(struct a + } + EXPORT_SYMBOL(ath11k_debugfs_soc_destroy); + ++int ath11k_debugfs_create(void) ++{ ++ debugfs_ath11k = debugfs_create_dir("ath11k", NULL); ++ if (IS_ERR_OR_NULL(debugfs_ath11k)) { ++ if (IS_ERR(debugfs_ath11k)) ++ return PTR_ERR(debugfs_ath11k); ++ return -ENOMEM; ++ } ++ ++ return 0; ++} ++ ++void ath11k_debugfs_destroy(void) ++{ ++ debugfs_remove_recursive(debugfs_ath11k); ++ debugfs_ath11k = NULL; ++} ++ + void ath11k_debugfs_fw_stats_init(struct ath11k *ar) + { + struct dentry *fwstats_dir = debugfs_create_dir("fw_stats", +@@ -1932,6 +1950,9 @@ void ath11k_debugfs_unregister(struct at + kfree(dbr_debug); + ar->debug.dbr_debug[i] = NULL; + } ++ ++ debugfs_remove_recursive(ar->debug.debugfs_pdev); ++ ar->debug.debugfs_pdev = NULL; + } + + static ssize_t ath11k_write_twt_add_dialog(struct file *file, +@@ -2294,6 +2315,9 @@ int ath11k_debugfs_register(struct ath11 + char pdev_name[10]; + char buf[100] = {0}; + ++ if (!(IS_ERR_OR_NULL(ar->debug.debugfs_pdev))) ++ return 0; ++ + snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); + + ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); +--- a/drivers/net/wireless/ath/ath11k/debugfs.h ++++ b/drivers/net/wireless/ath/ath11k/debugfs.h +@@ -282,6 +282,8 @@ do { \ + #endif + + #ifdef CPTCFG_ATH11K_DEBUGFS ++int ath11k_debugfs_create(void); ++void ath11k_debugfs_destroy(void); + int ath11k_debugfs_soc_create(struct ath11k_base *ab); + void ath11k_debugfs_soc_destroy(struct ath11k_base *ab); + int ath11k_debugfs_pdev_create(struct ath11k_base *ab); +@@ -338,6 +340,15 @@ static inline int ath11k_debug_is_memory + } + + #else ++static inline int ath11k_debugfs_create(void) ++{ ++ return 0; ++} ++ ++static inline void ath11k_debugfs_destroy(void) ++{ ++} ++ + static inline int ath11k_debugfs_soc_create(struct ath11k_base *ab) + { + return 0; diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch b/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch new file mode 100644 index 00000000000000..bba58322a254e7 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch @@ -0,0 +1,253 @@ +From 91df8aa674d2d4064ab22f47515c3fb126527208 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Kathirvel +Date: Thu, 12 Nov 2020 15:02:56 +0530 +Subject: [PATCH] ath11k: NSS MCBC Exception added for STA + +Since NSS FW is not supporting PN check for MCBC pkts, those pkts are +excepted from NSS offload to pass through mac80211 PN check. + +Signed-off-by: Karthikeyan Kathirvel +Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 +--- + drivers/net/wireless/ath/ath11k/nss.c | 128 +++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/nss.h | 51 ++++---- + 2 files changed, 153 insertions(+), 26 deletions(-) + create mode 100644 mac80211/patches/301-ath11k-nss-mcbc-exception.patch + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -611,7 +611,7 @@ static int ath11k_nss_undecap_nwifi(stru + + static void ath11k_nss_wds_type_rx(struct ath11k *ar, struct net_device *dev, + u8* src_mac, u8 is_sa_valid, u8 addr4_valid, +- u16 peer_id, bool *drop) ++ u16 peer_id) + { + struct ath11k_base *ab = ar->ab; + struct ath11k_ast_entry *ast_entry = NULL; +@@ -647,8 +647,6 @@ static void ath11k_nss_wds_type_rx(struc + } + } + +- if (!ta_peer->nss.ext_vdev_up) +- *drop = true; + } + + spin_unlock_bh(&ab->base_lock); +@@ -692,8 +690,7 @@ static void ath11k_nss_mec_handler(struc + + static void ath11k_nss_vdev_spl_receive_ext_wdsdata(struct ath11k_vif *arvif, + struct sk_buff *skb, +- struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata, +- bool *drop) ++ struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata) + { + struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; +@@ -715,7 +712,7 @@ static void ath11k_nss_vdev_spl_receive_ + switch (wds_type) { + case NSS_WIFI_VDEV_WDS_TYPE_RX: + ath11k_nss_wds_type_rx(ar, skb->dev, src_mac, is_sa_valid, +- addr4_valid, peer_id, drop); ++ addr4_valid, peer_id); + break; + case NSS_WIFI_VDEV_WDS_TYPE_MEC: + ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); +@@ -778,14 +775,16 @@ ath11k_nss_vdev_special_data_receive(str + { + struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; + struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; ++ struct nss_wifi_vdev_addr4_data_metadata *addr4_metadata = NULL; + struct wireless_dev *wdev; + struct ieee80211_vif *vif; + struct ath11k_vif *arvif; + struct ath11k_base *ab; +- bool drop = false; ++ struct ath11k_skb_rxcb *rxcb; + bool eth_decap = false; + int data_offs = 0; + int ret = 0; ++ struct ath11k_peer *ta_peer = NULL; + + if (!dev) { + dev_kfree_skb_any(skb); +@@ -834,15 +833,50 @@ ath11k_nss_vdev_special_data_receive(str + return; + } + +- if (eth_decap && wifi_metadata->pkt_type == +- NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_WDS_LEARN) { +- wds_metadata = &wifi_metadata->metadata.wds_metadata; +- ath11k_nss_vdev_spl_receive_ext_wdsdata(arvif, skb, +- wds_metadata, &drop); +- } ++ switch(wifi_metadata->pkt_type) { ++ case NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_WDS_LEARN: ++ if (eth_decap) { ++ wds_metadata = &wifi_metadata->metadata.wds_metadata; ++ ath11k_nss_vdev_spl_receive_ext_wdsdata(arvif, skb, ++ wds_metadata); ++ } ++ dev_kfree_skb_any(skb); ++ break; ++ case NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_MCBC_RX: ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", ++ "mcbc packet exception from nss: ", ++ skb->data, skb->len); ++ rxcb = ATH11K_SKB_RXCB(skb); ++ rxcb->rx_desc = (struct hal_rx_desc *)skb->head; ++ rxcb->is_first_msdu = rxcb->is_last_msdu = true; ++ rxcb->is_continuation = false; ++ rxcb->is_mcbc = true; ++ ath11k_dp_rx_from_nss(arvif->ar, skb, napi); ++ break; ++ case NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_4ADDR: ++ if (eth_decap) { ++ addr4_metadata = &wifi_metadata->metadata.addr4_metadata; ++ ++ spin_lock_bh(&ab->base_lock); ++ ta_peer = ath11k_peer_find_by_id(ab, addr4_metadata->peer_id); ++ if (!ta_peer) { ++ spin_unlock_bh(&ab->base_lock); ++ dev_kfree_skb_any(skb); ++ return; ++ } + +- if (!drop) +- ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++ ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "4addr exception ta_peer %pM\n", ++ ta_peer->addr); ++ if (!ta_peer->nss.ext_vdev_up && addr4_metadata->addr4_valid) ++ ieee80211_rx_nss_notify_4addr(dev, ta_peer->addr); ++ spin_unlock_bh(&ab->base_lock); ++ } ++ dev_kfree_skb_any(skb); ++ break; ++ default: ++ ath11k_warn(ab, "unsupported pkt_type %d from nss\n", wifi_metadata->pkt_type); ++ dev_kfree_skb_any(skb); ++ } + } + + static void +@@ -1049,6 +1083,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 + case ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD: + cmd = NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD; + break; ++ case ATH11K_NSS_WIFI_VDEV_CFG_MCBC_EXC_TO_HOST_CMD: ++ cmd = NSS_WIFI_VDEV_CFG_MCBC_EXC_TO_HOST_CMD; ++ break; + default: + return -EINVAL; + } +@@ -1299,12 +1336,31 @@ int ath11k_nss_vdev_create(struct ath11k + goto free_vdev; + + switch (arvif->vif->type) { +- case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_STATION: + ret = ath11k_nss_vdev_configure(arvif); + if (ret) + goto unregister_vdev; + ++ ret = ath11k_nss_vdev_set_cmd(arvif, ++ ATH11K_NSS_WIFI_VDEV_CFG_MCBC_EXC_TO_HOST_CMD, ++ ATH11K_NSS_ENABLE_MCBC_EXC); ++ if (ret) { ++ ath11k_err(ab, "failed to set MCBC in nss %d\n", ret); ++ goto unregister_vdev; ++ } ++ break; ++ case NL80211_IFTYPE_AP: ++ ret = ath11k_nss_vdev_configure(arvif); ++ if (ret) ++ goto unregister_vdev; ++ ++ ret = ath11k_nss_vdev_set_cmd(arvif, ++ ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD, ++ true); ++ if (ret) { ++ ath11k_warn(ab, "failed to cfg wds backhaul in nss %d\n", ret); ++ goto unregister_vdev; ++ } + break; + default: + ret = -ENOTSUPP; +@@ -1463,7 +1519,7 @@ int ath11k_nss_ext_vdev_cfg_wds_peer(str + + cfg_wds_msg = &ext_vdev_msg->msg.wmsg; + cfg_wds_msg->wds_peer_id = wds_peer_id; +- ether_addr_copy(cfg_wds_msg->mac_addr, wds_addr); ++ ether_addr_copy((u8 *) cfg_wds_msg->mac_addr, wds_addr); + + nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, + NSS_WIFI_EXT_VDEV_MSG_CONFIGURE_WDS, +@@ -1587,7 +1643,6 @@ static int ath11k_nss_ext_vdev_register( + { + struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; +- nss_tx_status_t status; + u32 features = 0; + + if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN || arvif->nss.ctx) +@@ -1601,7 +1656,7 @@ static int ath11k_nss_ext_vdev_register( + + if (!arvif->nss.ctx) { + ath11k_warn(ab, "failed to register nss vdev if_num %d nss_err:%d\n", +- arvif->nss.if_num, status); ++ arvif->nss.if_num, NSS_TX_FAILURE); + return -EINVAL; + } + +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -110,10 +110,14 @@ enum ath11k_nss_vdev_cmd { + ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, + ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, + ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD, ++ ATH11K_NSS_WIFI_VDEV_CFG_MCBC_EXC_TO_HOST_CMD, + }; + + #define WIFILI_SCHEME_ID_INVALID -1 + ++/* Enables the MCBC exception in NSS fw, 1 = enable */ ++#define ATH11K_NSS_ENABLE_MCBC_EXC 1 ++ + enum ath11k_nss_opmode { + ATH11K_NSS_OPMODE_UNKNOWN, + ATH11K_NSS_OPMODE_AP, +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -3086,6 +3086,23 @@ static void ath11k_dp_rx_process_receive + } + } + ++void ath11k_dp_rx_from_nss(struct ath11k *ar, struct sk_buff *msdu, ++ struct napi_struct *napi) ++{ ++ struct ieee80211_rx_status rx_status = {0}; ++ struct ath11k_skb_rxcb *rxcb; ++ bool fast_rx = false; ++ ++ rxcb = ATH11K_SKB_RXCB(msdu); ++ ++ ath11k_dp_rx_h_ppdu(ar, rxcb->rx_desc, &rx_status); ++ ath11k_dp_rx_h_mpdu(ar, msdu, rxcb->rx_desc, &rx_status, &fast_rx); ++ ++ rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; ++ ++ ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_status); ++} ++ + int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, + struct napi_struct *napi, int budget) + { +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -157,4 +157,6 @@ bool ath11k_dp_rx_h_attn_is_mcbc(struct + struct hal_rx_desc *desc); + u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab, + struct hal_rx_desc *desc); ++void ath11k_dp_rx_from_nss(struct ath11k *ar, struct sk_buff *msdu, ++ struct napi_struct *napi); + #endif /* ATH11K_DP_RX_H */ diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch b/package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch new file mode 100644 index 00000000000000..6ebd709e7d3298 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch @@ -0,0 +1,522 @@ +From 9e1f28f343347774b01f330d76d2c5323fcd07ae Mon Sep 17 00:00:00 2001 +From: Rameshkumar Sundaram +Date: Fri, 24 Sep 2021 18:25:08 +0530 +Subject: [PATCH] ath11k: sync wds ast entry on peer/entry deletions + +Peer specific ast entries list is shared between +peer_unmap_event(softirq) and peer_ast_wds_wmi_wk +(worker). The worker sends a WMI command and hence tends to +sleep. +complete_work_sync() is used in peer_unmap_event bh handler +which tries to yield the CPU(calls schedule) +until the worker completes. This results kernel reporting +schedule in atomic context and system crash. +Add new global wmi_ast_list and add all ast add/update +work to this list. +Add a new global wmi_ast_work and queue this +work on each entry to global wmi_ast_list list. +Process the wmi_ast_list in worker and send updates +to FW. +Each ast entry node is shared between global wmi_ast list +and peer specific ast_list and deletes will be done +in sync between two lists. +On peer deletion all the peer specific entries will +be deleted from wmi_ast_list and peer delete in progress +will be set to avoid new ast entries adding up and therefore +peer unmap evnt won't find any ast worker in progress +entries to free in irq context. +This peer ast cleanup and worker processing same entry +will be synchronized with new base_ast_lock mutex. +FW indpendently Deleting a single wds ast entry in irq context & +worker already processing the same cannot be synchronized. +As we can't hold bh scheduling while worker tries to sleep, +and entry in scheduled update work will be sent to FW. + +Signed-off-by: Rameshkumar Sundaram +--- + drivers/net/wireless/ath/ath11k/ahb.c | 1 + + drivers/net/wireless/ath/ath11k/core.c | 3 + + drivers/net/wireless/ath/ath11k/core.h | 4 + + drivers/net/wireless/ath/ath11k/nss.c | 6 +- + drivers/net/wireless/ath/ath11k/nss.h | 8 +- + drivers/net/wireless/ath/ath11k/pci.c | 1 + + drivers/net/wireless/ath/ath11k/peer.c | 172 ++++++++++++++++++++++++--------- + drivers/net/wireless/ath/ath11k/peer.h | 3 +- + 8 files changed, 144 insertions(+), 54 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/ahb.c ++++ b/drivers/net/wireless/ath/ath11k/ahb.c +@@ -1245,6 +1245,7 @@ static void ath11k_ahb_remove_prepare(st + set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags); + cancel_work_sync(&ab->restart_work); + cancel_work_sync(&ab->qmi.event_work); ++ cancel_work_sync(&ab->wmi_ast_work); + } + + static void ath11k_ahb_free_resources(struct ath11k_base *ab) +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -2230,6 +2230,7 @@ struct ath11k_base *ath11k_core_alloc(st + + mutex_init(&ab->core_lock); + mutex_init(&ab->tbl_mtx_lock); ++ mutex_init(&ab->base_ast_lock); + spin_lock_init(&ab->base_lock); + mutex_init(&ab->vdev_id_11d_lock); + init_completion(&ab->reset_complete); +@@ -2243,6 +2244,8 @@ struct ath11k_base *ath11k_core_alloc(st + INIT_WORK(&ab->restart_work, ath11k_core_restart); + INIT_WORK(&ab->update_11d_work, ath11k_update_11d); + INIT_WORK(&ab->reset_work, ath11k_core_reset); ++ INIT_WORK(&ab->wmi_ast_work, ath11k_peer_ast_wds_wmi_wk); ++ INIT_LIST_HEAD(&ab->wmi_ast_list); + timer_setup(&ab->rx_replenish_retry, ath11k_ce_rx_replenish_retry, 0); + init_completion(&ab->htc_suspend); + init_completion(&ab->wow.wakeup_completed); +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -32,6 +32,7 @@ + #include "rx_desc.h" + #include "nss.h" + #include "vendor.h" ++#include "peer.h" + + #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) + +@@ -1131,6 +1132,11 @@ struct ath11k_base { + + u32 max_ast_index; + u32 num_ast_entries; ++ ++ struct mutex base_ast_lock; ++ struct work_struct wmi_ast_work; ++ struct list_head wmi_ast_list; ++ + /* must be last */ + u8 drv_priv[] __aligned(sizeof(void *)); + }; +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -691,8 +691,9 @@ static void ath11k_nss_wds_type_rx(struc + spin_unlock_bh(&ab->base_lock); + } + +-static void ath11k_nss_mec_handler(struct ath11k *ar, u8* mec_mac_addr) ++static void ath11k_nss_mec_handler(struct ath11k_vif *arvif, u8* mec_mac_addr) + { ++ struct ath11k *ar = arvif->ar; + struct ath11k_base *ab = ar->ab; + struct ath11k_peer *peer = ar->bss_peer; + u8 mac_addr[ETH_ALEN]; +@@ -719,7 +720,7 @@ static void ath11k_nss_mec_handler(struc + memcpy(mac_addr, mac_addr_h16, ETH_ALEN - 4); + memcpy(mac_addr + 2, mac_addr_l32, 4); + +- if (!ether_addr_equal(ar->mac_addr, mac_addr)) { ++ if (!ether_addr_equal(arvif->vif->addr, mac_addr)) { + spin_lock_bh(&ab->base_lock); + ath11k_peer_add_ast(ar, peer, mac_addr, + ATH11K_AST_TYPE_MEC); +@@ -754,7 +755,7 @@ static void ath11k_nss_vdev_spl_receive_ + addr4_valid, peer_id); + break; + case NSS_WIFI_VDEV_WDS_TYPE_MEC: +- ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); ++ ath11k_nss_mec_handler(arvif, (u8 *)(skb->data)); + break; + default: + ath11k_warn(ab, "unsupported wds_type %d\n", wds_type); +@@ -3848,11 +3849,7 @@ int ath11k_nss_add_wds_peer(struct ath11 + wds_peer_msg->ast_type = type; + wds_peer_msg->peer_id = peer->peer_id; + +- if (type == ATH11K_AST_TYPE_MEC) +- ether_addr_copy(wds_peer_msg->peer_mac, ar->mac_addr); +- else +- ether_addr_copy(wds_peer_msg->peer_mac, peer->addr); +- ++ ether_addr_copy(wds_peer_msg->peer_mac, peer->addr); + ether_addr_copy(wds_peer_msg->dest_mac, dest_mac); + + msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; +@@ -3975,7 +3972,7 @@ msg_free: + return ret; + } + +-int ath11k_nss_del_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, ++int ath11k_nss_del_wds_peer(struct ath11k *ar, u8 *peer_addr, int peer_id, + u8 *dest_mac) + { + struct ath11k_base *ab = ar->ab; +@@ -3993,8 +3990,8 @@ int ath11k_nss_del_wds_peer(struct ath11 + + wds_peer_msg->pdev_id = ar->pdev->pdev_id; + wds_peer_msg->ast_type = ATH11K_AST_TYPE_NONE; +- wds_peer_msg->peer_id = peer->peer_id; +- ether_addr_copy(wds_peer_msg->peer_mac, peer->addr); ++ wds_peer_msg->peer_id = peer_id; ++ ether_addr_copy(wds_peer_msg->peer_mac, peer_addr); + ether_addr_copy(wds_peer_msg->dest_mac, dest_mac); + + msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -291,8 +291,8 @@ int ath11k_nss_update_wds_peer(struct at + u8 *dest_mac); + int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, + u8 *dest_mac, enum ath11k_ast_entry_type type); +-int ath11k_nss_del_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, +- u8 *dest_mac); ++int ath11k_nss_del_wds_peer(struct ath11k *ar, u8 *peer_addr, ++ int peer_id, u8 *dest_mac); + int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, + u8 *wds_addr, u32 wds_peer_id); + int ath11k_nss_ext_vdev_wds_4addr_allow(struct ath11k_vif *arvif, +@@ -404,8 +404,8 @@ static inline int ath11k_nss_map_wds_pee + return 0; + } + +-static inline int ath11k_nss_del_wds_peer(struct ath11k_vif *arvif, struct ath11k_peer *peer, +- u8 *dest_mac) ++static inline int ath11k_nss_del_wds_peer(struct ath11k *ar, u8 *peer_addr, ++ int peer_id, u8 *dest_mac) + { + return 0; + } +--- a/drivers/net/wireless/ath/ath11k/pci.c ++++ b/drivers/net/wireless/ath/ath11k/pci.c +@@ -970,6 +970,7 @@ static void ath11k_pci_remove(struct pci + } + + set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags); ++ cancel_work_sync(&ab->wmi_ast_work); + + ath11k_core_deinit(ab); + +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -160,49 +160,68 @@ struct ath11k_ast_entry *ath11k_peer_ast + + void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk) + { +- struct ath11k_ast_entry *ast_entry = container_of(wk, +- struct ath11k_ast_entry, +- wds_wmi_wk); +- struct ath11k *ar; ++ struct ath11k_ast_entry *ast_entry, *entry; ++ struct ath11k_base *ab = container_of(wk, struct ath11k_base, wmi_ast_work); + struct ath11k_peer *peer; ++ struct ath11k *ar; + int ret; ++ u8 peer_addr[ETH_ALEN]; ++ int peer_id; + +- if (!ast_entry) +- return; ++ ast_entry = kzalloc(sizeof(*ast_entry), GFP_ATOMIC); + +- ar = ast_entry->ar; +- peer = ast_entry->peer; ++ mutex_lock(&ab->base_ast_lock); ++ spin_lock_bh(&ab->base_lock); ++ ++ while ((entry = list_first_entry_or_null(&ab->wmi_ast_list, ++ struct ath11k_ast_entry, wmi_list))) { ++ list_del_init(&entry->wmi_list); + +- ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "ath11k_peer_ast_wds_wmi_wk action %d ast_entry %pM next_node %pM vdev %d\n", +- ast_entry->action, ast_entry->addr, ast_entry->next_node_mac, +- ast_entry->vdev_id); +- +- if (ast_entry->action == ATH11K_WDS_WMI_ADD) { +- ret = ath11k_wmi_send_add_update_wds_entry_cmd(ar, +- ast_entry->next_node_mac, +- ast_entry->addr, +- ast_entry->vdev_id, +- true); +- if (ret) { +- ath11k_warn(ar->ab, "add wds_entry_cmd failed %d for %pM next_node %pM\n", +- ret, ast_entry->addr, +- ast_entry->next_node_mac); +- if (peer) +- ath11k_nss_del_wds_peer(ar, peer, +- ast_entry->addr); ++ if (!entry->ar || (entry->peer && entry->peer->delete_in_progress)) { ++ continue; + } +- } else if (ast_entry->action == ATH11K_WDS_WMI_UPDATE) { +- if (!peer) +- return; ++ memcpy(ast_entry, entry, sizeof(*ast_entry)); ++ ar = ast_entry->ar; ++ peer = ast_entry->peer; ++ memcpy(peer_addr, peer->addr, sizeof(peer_addr)); ++ peer_id = peer->peer_id; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, ++ "ath11k_peer_ast_wds_wmi_wk action %d ast_entry %pM peer %pM vdev %d\n", ++ ast_entry->action, ast_entry->addr, peer_addr, ++ ast_entry->vdev_id); + +- ret = ath11k_wmi_send_add_update_wds_entry_cmd(ar, peer->addr, +- ast_entry->addr, +- ast_entry->vdev_id, +- false); +- if (ret) +- ath11k_warn(ar->ab, "update wds_entry_cmd failed %d for %pM on peer %pM\n", +- ret, ast_entry->addr, peer->addr); ++ if (ast_entry->action == ATH11K_WDS_WMI_ADD) { ++ spin_unlock_bh(&ab->base_lock); ++ ret = ath11k_wmi_send_add_update_wds_entry_cmd(ar, peer_addr, ++ ast_entry->addr, ++ ast_entry->vdev_id, ++ true); ++ if (ret) { ++ ath11k_warn(ar->ab, "add wds_entry_cmd failed %d for %pM, peer %pM\n", ++ ret, ast_entry->addr, peer_addr); ++ if (peer) ++ ath11k_nss_del_wds_peer(ar, peer_addr, peer_id, ++ ast_entry->addr); ++ } ++ } else if (ast_entry->action == ATH11K_WDS_WMI_UPDATE) { ++ if (!peer) { ++ continue; ++ } ++ spin_unlock_bh(&ab->base_lock); ++ ret = ath11k_wmi_send_add_update_wds_entry_cmd(ar, peer_addr, ++ ast_entry->addr, ++ ast_entry->vdev_id, ++ false); ++ if (ret) ++ ath11k_warn(ar->ab, "update wds_entry_cmd failed %d for %pM on peer %pM\n", ++ ret, ast_entry->addr, peer_addr); ++ } ++ spin_lock_bh(&ab->base_lock); + } ++ spin_unlock_bh(&ab->base_lock); ++ mutex_unlock(&ab->base_ast_lock); ++ kfree(ast_entry); + } + + int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, +@@ -211,6 +230,8 @@ int ath11k_peer_add_ast(struct ath11k *a + struct ath11k_ast_entry *ast_entry = NULL; + struct ath11k_base *ab = ar->ab; + ++ lockdep_assert_held(&ab->base_lock); ++ + if (ab->num_ast_entries == ab->max_ast_index) { + ath11k_warn(ab, "failed to add ast for %pM due to insufficient ast entry resource %d in target\n", + mac_addr, ab->max_ast_index); +@@ -226,6 +247,9 @@ int ath11k_peer_add_ast(struct ath11k *a + } + } + ++ if (peer && peer->delete_in_progress) ++ return -EINVAL; ++ + ast_entry = kzalloc(sizeof(*ast_entry), GFP_ATOMIC); + if (!ast_entry) { + ath11k_warn(ab, "failed to alloc ast_entry for %pM\n", +@@ -257,7 +281,7 @@ int ath11k_peer_add_ast(struct ath11k *a + } + + INIT_LIST_HEAD(&ast_entry->ase_list); +- INIT_WORK(&ast_entry->wds_wmi_wk, ath11k_peer_ast_wds_wmi_wk); ++ INIT_LIST_HEAD(&ast_entry->wmi_list); + ast_entry->vdev_id = peer->vdev_id; + ast_entry->pdev_idx = peer->pdev_idx; + ast_entry->is_mapped = false; +@@ -271,16 +295,12 @@ int ath11k_peer_add_ast(struct ath11k *a + ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_add_ast peer %pM ast_entry %pM, ast_type %d\n", + peer->addr, mac_addr, ast_entry->type); + +- if (type == ATH11K_AST_TYPE_MEC) +- ether_addr_copy(ast_entry->next_node_mac, ar->mac_addr); +- else if (type == ATH11K_AST_TYPE_WDS) +- ether_addr_copy(ast_entry->next_node_mac, peer->addr); +- + if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || + (ast_entry->type == ATH11K_AST_TYPE_MEC)) { + ath11k_nss_add_wds_peer(ar, peer, mac_addr, ast_entry->type); + ast_entry->action = ATH11K_WDS_WMI_ADD; +- ieee80211_queue_work(ar->hw, &ast_entry->wds_wmi_wk); ++ list_add_tail(&ast_entry->wmi_list, &ab->wmi_ast_list); ++ ieee80211_queue_work(ar->hw, &ab->wmi_ast_work); + } + + ab->num_ast_entries++; +@@ -293,6 +313,8 @@ int ath11k_peer_update_ast(struct ath11k + struct ath11k_peer *old_peer = ast_entry->peer; + struct ath11k_base *ab = ar->ab; + ++ lockdep_assert_held(&ab->base_lock); ++ + if (!ast_entry->is_mapped) { + ath11k_warn(ab, "ath11k_peer_update_ast: ast_entry %pM not mapped yet\n", + ast_entry->addr); +@@ -305,6 +327,9 @@ int ath11k_peer_update_ast(struct ath11k + (ast_entry->is_active)) + return 0; + ++ if (peer && peer->delete_in_progress) ++ return -EINVAL; ++ + ast_entry->vdev_id = peer->vdev_id; + ast_entry->pdev_idx = peer->pdev_idx; + ast_entry->type = ATH11K_AST_TYPE_WDS; +@@ -317,7 +342,14 @@ int ath11k_peer_update_ast(struct ath11k + old_peer->addr, peer->addr, ast_entry->addr); + + ast_entry->action = ATH11K_WDS_WMI_UPDATE; +- ieee80211_queue_work(ar->hw, &ast_entry->wds_wmi_wk); ++ ++ /* wmi_list entry might've been processed & removed.*/ ++ if (list_empty(&ast_entry->wmi_list)) ++ list_add_tail(&ast_entry->wmi_list, &ab->wmi_ast_list); ++ else ++ list_move_tail(&ast_entry->wmi_list, &ab->wmi_ast_list); ++ ++ ieee80211_queue_work(ar->hw, &ab->wmi_ast_work); + + return 0; + } +@@ -363,16 +395,23 @@ void ath11k_peer_del_ast(struct ath11k * + ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_del_ast pdev:%d peer %pM ast_entry %pM\n", + ar->pdev->pdev_id, peer->addr, ast_entry->addr); + +- if (ast_entry->is_mapped) +- list_del(&ast_entry->ase_list); ++ if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || ++ (ast_entry->type == ATH11K_AST_TYPE_MEC)) { ++ if (!list_empty(&ast_entry->wmi_list)) { ++ ath11k_dbg(ab, ATH11K_DBG_MAC, ++ "ath11k_peer_del_ast deleting unprocessed ast entry %pM " ++ "of peer %pM from wmi list\n", ast_entry->addr, peer->addr); ++ list_del_init(&ast_entry->wmi_list); ++ } ++ } ++ list_del(&ast_entry->ase_list); + + /* WDS, MEC type AST entries need to be deleted on NSS */ + if (ast_entry->next_hop) +- ath11k_nss_del_wds_peer(ar, peer, ast_entry->addr); ++ ath11k_nss_del_wds_peer(ar, peer->addr, peer->peer_id, ++ ast_entry->addr); + +- cancel_work_sync(&ast_entry->wds_wmi_wk); + kfree(ast_entry); +- + ab->num_ast_entries--; + } + +@@ -681,6 +720,10 @@ void ath11k_peer_cleanup(struct ath11k * + + lockdep_assert_held(&ar->conf_mutex); + ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ mutex_lock(&ab->base_ast_lock); ++#endif ++ + mutex_lock(&ab->tbl_mtx_lock); + spin_lock_bh(&ab->base_lock); + list_for_each_entry_safe(peer, tmp_peer, &ab->peers, list) { +@@ -709,6 +752,9 @@ void ath11k_peer_cleanup(struct ath11k * + + spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ mutex_unlock(&ab->base_ast_lock); ++#endif + } + + static int ath11k_wait_for_peer_deleted(struct ath11k *ar, int vdev_id, const u8 *addr) +@@ -743,12 +789,18 @@ static int __ath11k_peer_delete(struct a + int ret; + struct ath11k_peer *peer; + struct ath11k_base *ab = ar->ab; ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ struct ath11k_ast_entry *ast_entry, *tmp_ast; ++#endif + + lockdep_assert_held(&ar->conf_mutex); + + reinit_completion(&ar->peer_delete_done); + ath11k_nss_peer_delete(ar->ab, vdev_id, addr); + ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ mutex_lock(&ab->base_ast_lock); ++#endif + mutex_lock(&ab->tbl_mtx_lock); + spin_lock_bh(&ab->base_lock); + +@@ -771,17 +823,35 @@ static int __ath11k_peer_delete(struct a + return -EINVAL; + } + +- /* Check if the found peer is what we want to remove. +- * While the sta is transitioning to another band we may +- * have 2 peer with the same addr assigned to different +- * vdev_id. Make sure we are deleting the correct peer. +- */ +- if (peer && peer->vdev_id == vdev_id) ++ if (peer) { ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ peer->delete_in_progress = true; ++ if (peer->self_ast_entry) { ++ ath11k_peer_del_ast(ar, peer->self_ast_entry); ++ peer->self_ast_entry = NULL; ++ } ++ ++ list_for_each_entry_safe(ast_entry, tmp_ast, ++ &peer->ast_entry_list, ase_list) ++ if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || ++ (ast_entry->type == ATH11K_AST_TYPE_MEC)) { ++ if (!list_empty(&ast_entry->wmi_list)) { ++ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, ++ "%s deleting unprocessed ast entry %pM of peer %pM from wmi list\n", ++ __func__, ast_entry->addr, addr); ++ list_del_init(&ast_entry->wmi_list); ++ } ++ } ++#endif + ath11k_peer_rhash_delete(ab, peer); ++ } + + spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); + ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ mutex_unlock(&ab->base_ast_lock); ++#endif + + ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id); + if (ret) { +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -31,9 +31,7 @@ enum ath11k_wds_wmi_action { + struct ath11k_ast_entry { + u16 ast_idx; + u8 addr[ETH_ALEN]; +- u8 next_node_mac[ETH_ALEN]; + enum ath11k_wds_wmi_action action; +- struct work_struct wds_wmi_wk; + struct ath11k_peer *peer; + struct ath11k *ar; + bool next_hop; +@@ -47,6 +45,7 @@ struct ath11k_ast_entry { + bool delete_in_progress; + void *cookie; + struct list_head ase_list; ++ struct list_head wmi_list; + }; + + struct ppdu_user_delayba { +@@ -97,6 +96,7 @@ struct ath11k_peer { + bool dp_setup_done; + struct ppdu_user_delayba ppdu_stats_delayba; + bool delayba_flag; ++ bool delete_in_progress; + }; + + void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id); diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch b/package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch new file mode 100644 index 00000000000000..f734c5aea8d876 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch @@ -0,0 +1,96 @@ +From 396176575be9767a79d451fba4fe2931305f0435 Mon Sep 17 00:00:00 2001 +From: Raj Kumar Bhagat +Date: Mon, 7 Nov 2022 21:49:20 +0530 +Subject: [PATCH] ath11k: fix incorrect ast index assignment for wds peer + +Currently, same ast index is assigned for different nss wds peer mac +addresses which is incorrect. However, firmware provides the correct +and different ast index for different mac addresses. + +Hence, fix this issue by assigning the correct ast index provided by +the firmware. + +Signed-off-by: Raj Kumar Bhagat +--- + drivers/net/wireless/ath/ath11k/nss.c | 5 +++-- + drivers/net/wireless/ath/ath11k/nss.h | 6 ++++-- + drivers/net/wireless/ath/ath11k/peer.c | 3 +-- + 3 files changed, 8 insertions(+), 6 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -805,8 +805,6 @@ ath11k_nss_vdev_special_data_receive(str + struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; + struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; + struct nss_wifi_vdev_addr4_data_metadata *addr4_metadata = NULL; +- struct wireless_dev *wdev; +- struct ieee80211_vif *vif; + struct ath11k_vif *arvif; + struct ath11k_base *ab; + struct ath11k_skb_rxcb *rxcb; +@@ -2487,13 +2485,14 @@ msg_free: + } + + int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, +- u8 *dest_mac, enum ath11k_ast_entry_type type) ++ u8 *dest_mac, struct ath11k_ast_entry *ast_entry) + { + struct ath11k_base *ab = ar->ab; + struct nss_wifili_wds_peer_map_msg *wds_peer_map_msg; + struct nss_wifili_msg *wlmsg = NULL; + nss_wifili_msg_callback_t msg_cb; + nss_tx_status_t status; ++ enum ath11k_ast_entry_type type = ast_entry->type; + int ret = 0; + + wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); +@@ -2503,7 +2502,7 @@ int ath11k_nss_map_wds_peer(struct ath11 + wds_peer_map_msg = &wlmsg->msg.wdspeermapmsg; + + wds_peer_map_msg->vdev_id = peer->vdev_id; +- wds_peer_map_msg->ast_idx = peer->hw_peer_id; ++ wds_peer_map_msg->ast_idx = ast_entry->ast_idx; + + if (type == ATH11K_AST_TYPE_MEC) + wds_peer_map_msg->peer_id = NSS_WIFILI_MEC_PEER_ID; +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -16,6 +16,7 @@ struct ath11k; + struct ath11k_base; + struct ath11k_vif; + struct ath11k_peer; ++struct ath11k_ast_entry; + struct ath11k_sta; + enum ath11k_ast_entry_type; + struct hal_rx_mon_ppdu_info; +@@ -241,7 +242,7 @@ int ath11k_nss_add_wds_peer(struct ath11 + int ath11k_nss_update_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, + u8 *dest_mac); + int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, +- u8 *dest_mac, enum ath11k_ast_entry_type type); ++ u8 *dest_mac, struct ath11k_ast_entry *ast_entry); + int ath11k_nss_del_wds_peer(struct ath11k *ar, u8 *peer_addr, + int peer_id, u8 *dest_mac); + int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, +@@ -337,7 +338,8 @@ static inline int ath11k_nss_update_wds_ + } + + static inline int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, +- u8 *dest_mac, int type) ++ u8 *dest_mac, ++ struct ath11k_ast_entry *ast_entry) + { + return 0; + } +--- a/drivers/net/wireless/ath/ath11k/peer.c ++++ b/drivers/net/wireless/ath/ath11k/peer.c +@@ -373,8 +373,7 @@ void ath11k_peer_map_ast(struct ath11k * + + if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || + (ast_entry->type == ATH11K_AST_TYPE_MEC)) +- ath11k_nss_map_wds_peer(ar, peer, mac_addr, +- ast_entry->type); ++ ath11k_nss_map_wds_peer(ar, peer, mac_addr, ast_entry); + + ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_map_ast peer %pM ast_entry %pM\n", + peer->addr, ast_entry->addr); From 77ef7a820cb3606c0c3f6d7cc3734d499b611b23 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 13 Jan 2024 17:13:16 -0500 Subject: [PATCH 56/80] ath11k_nss: fix `'ppdu_info' is a pointer...` error --- ...ul-ofdma-ru-allocation-in-peer-stats.patch | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch index e7908c6daad2a7..9be70411b10996 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch @@ -247,19 +247,20 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, struct napi_struct *napi, int budget) { -@@ -5919,8 +6084,13 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5917,10 +6082,13 @@ int ath11k_dp_rx_process_mon_status(stru + goto next_skb; + } - if ((ppdu_info->fc_valid) && - (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { -- arsta = (struct ath11k_sta *)peer->sta->drv_priv; +- if ((ppdu_info->fc_valid) && +- (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { ++ if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { + arsta = (struct ath11k_sta *)peer->sta->drv_priv; - ath11k_dp_rx_update_peer_stats(arsta, ppdu_info); -+ if (ppdu_info.reception_type == HAL_RX_RECEPTION_TYPE_SU) { -+ arsta = (struct ath11k_sta *)peer->sta->drv_priv; -+ ath11k_dp_rx_update_peer_su_stats(arsta, &ppdu_info); -+ } else { -+ ath11k_dp_rx_mon_process_ulofdma(&ppdu_info); -+ ath11k_dp_rx_update_peer_mu_stats(ar, &ppdu_info); -+ } ++ ath11k_dp_rx_update_peer_su_stats(arsta, ppdu_info); ++ } else if ((ppdu_info->fc_valid) && ++ (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { ++ ath11k_dp_rx_mon_process_ulofdma(ppdu_info); ++ ath11k_dp_rx_update_peer_mu_stats(ar, ppdu_info); } if (ath11k_debugfs_is_pktlog_peer_valid(ar, peer->addr)) From f75f84bb9f05f1d7aff5bd5f47790222ad39508c Mon Sep 17 00:00:00 2001 From: Qosmio Date: Tue, 16 Jan 2024 18:45:18 -0500 Subject: [PATCH 57/80] ath11k_nss: bugfix NSS memleak + enhancements bugfixes: * Rreverted patch `105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch`. Initial test show lower memory use. `ieee80211_tx_status_8023` was also removed upstream for a reason as it wasn't being used, and the logic behind it was flawed. See https://patchwork.kernel.org/project/linux-wireless/patch/20230308174703.12270-2-quic_pradeepc@quicinc.com * Mmemory profile for '256M' was missing logic that was in 512/1G. Should build correctly now * added more qsdk related patches to nss/offload ath11k_nss: fix up patches ath11k_nss: revert m3, fix coredump when rebooting M3 SSR dump logic makes the router coredump. Just putting dummy case to skip warning. [12394.072384] Hardware name: Dynalink DL-WRX36 (DT) [12394.079758] Call trace: [12394.084354] dump_backtrace.part.0+0xbc/0xd0 [12394.086614] show_stack+0x18/0x30 [12394.091127] dump_stack_lvl+0x6c/0x88 [12394.094339] dump_stack+0x18/0x34 [12394.097985] bad_page+0xe0/0x110 [12394.101282] __free_pages_ok+0x33c/0x360 [12394.104582] __free_pages+0xbc/0xe0 [12394.108487] dma_direct_free+0xd0/0x140 [12394.111701] dma_free_attrs+0x90/0xb0 [12394.115519] ath11k_qmi_fwreset_from_cold_boot+0x9e0/0xa10 [ath11k] [12394.119343] ath11k_qmi_deinit_service+0x64/0x21d0 [ath11k] [12394.125419] ath11k_core_deinit+0xa4/0xc0 [ath11k] [12394.130974] 0xffffffc000fb3600 [12394.135831] platform_shutdown+0x24/0x40 [12394.138871] device_shutdown+0x14c/0x240 [12394.143037] kernel_restart+0x40/0xb0 [12394.146944] __do_sys_reboot+0xcc/0x200 [12394.150502] __arm64_sys_reboot+0x24/0x30 [12394.154148] invoke_syscall.constprop.0+0x5c/0x110 [12394.158317] do_el0_svc+0x58/0x170 [12394.163001] el0_svc+0x18/0x60 [12394.166386] el0t_64_sync_handler+0x114/0x120 [12394.169426] el0t_64_sync+0x174/0x178 --- ...nitor-crash-if-tx-offload-is-enabled.patch | 60 -- .../199-001-mac80211-add-nss-support.patch | 8 - ...-ath11k_nss-add-nss-driver-interface.patch | 4 +- .../199-003-ath11k-add-nss-support.patch | 6 +- ...-ath11k-Add-support-for-dynamic-vlan.patch | 6 +- ...207-ath11k-Enable-256_512MB-profiles.patch | 29 +- ...00-mac80211-nss-mesh-offload-support.patch | 2 +- .../patches/ath11k_nss/900-fix-build.patch | 46 -- ...load-changes-to-NSS-driver-interface.patch | 19 +- ...04-300-ath11k-nss_get_arvif_from_dev.patch | 4 +- ...support-to-send-the-QoS-Null-Data-fr.patch | 31 + .../906-ath11k-m3-ssr-dump-collection.patch | 12 + .../908-301-ath11k-nss-mcbc-exception.patch | 6 +- .../911-244-ath11k-dp-tx-perf.patch | 623 ++++++++++++++++++ ...-0001-ath11k-optimize-tx-completions.patch | 269 ++++++++ ...se-DECLARE_BITMAP-for-idr-operations.patch | 288 ++++++++ ...1k-add-simple-tx-handler-for-AP-mode.patch | 185 ++++++ .../911-335-ath11k-fix-ar-ops-crash.patch | 71 ++ ...Add-retry-mechanism-for-update_rx_qu.patch | 384 +++++++++++ ...rt-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch | 52 ++ ...-frags-from-uninitialized-peer-in-dp.patch | 74 +++ ...356-ath11k-invalid-desc-sanity-check.patch | 74 +++ ...k-skb_headroom-before-using-skb_push.patch | 209 ++++++ ...fix-RCU-stall-in-mesh-fast-xmit-path.patch | 120 ++++ ...ix-crash-when-accessing-null-pointer.patch | 87 +++ ...ing-memset-of-ppdu-info-for-next-skb.patch | 87 +++ 26 files changed, 2590 insertions(+), 166 deletions(-) delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch create mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch b/package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch deleted file mode 100644 index 9304833c87d1c3..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/105-ath11k-fix-monitor-crash-if-tx-offload-is-enabled.patch +++ /dev/null @@ -1,60 +0,0 @@ - drivers/net/wireless/ath/ath11k/dp_tx.c | 20 +++++++++++++++++--- - 1 file changed, 17 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/dp_tx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -322,6 +322,8 @@ ath11k_dp_tx_htt_tx_complete_buf(struct - struct ath11k_skb_cb *skb_cb; - struct ath11k *ar; - struct ath11k_peer *peer; -+ struct ieee80211_vif *vif; -+ u8 flags = 0; - - spin_lock(&tx_ring->tx_idr_lock); - msdu = idr_remove(&tx_ring->txbuf_idr, ts->msdu_id); -@@ -348,6 +350,14 @@ ath11k_dp_tx_htt_tx_complete_buf(struct - return; - } - -+ if (!skb_cb->vif) { -+ dev_kfree_skb_any(msdu); -+ return; -+ } -+ -+ flags = skb_cb->flags; -+ vif = skb_cb->vif; -+ - memset(&info->status, 0, sizeof(info->status)); - - if (ts->acked) { -@@ -555,6 +565,8 @@ static void ath11k_dp_tx_complete_msdu(s - struct ath11k_peer *peer; - struct ath11k_sta *arsta; - struct rate_info rate; -+ struct ieee80211_vif *vif; -+ u8 flags = 0; - - if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { - /* Must not happen */ -@@ -575,6 +587,9 @@ static void ath11k_dp_tx_complete_msdu(s - return; - } - -+ flags = skb_cb->flags; -+ vif = skb_cb->vif; -+ - info = IEEE80211_SKB_CB(msdu); - memset(&info->status, 0, sizeof(info->status)); - -@@ -641,7 +656,10 @@ static void ath11k_dp_tx_complete_msdu(s - - spin_unlock_bh(&ab->base_lock); - -- ieee80211_tx_status_ext(ar->hw, &status); -+ if (flags & ATH11K_SKB_HW_80211_ENCAP) -+ ieee80211_tx_status_8023(ar->hw, vif, msdu); -+ else -+ ieee80211_tx_status_ext(ar->hw, &status); - } - - static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab, diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch index f25def295537ca..a06ef7652df538 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch @@ -451,11 +451,3 @@ Signed-off-by: Sriram R QCOM_AOSS_QMP= QCOM_COMMAND_DB= QCOM_CPR= -@@ -174,6 +175,7 @@ ATH11K_DEBUGFS= - ATH11K_TRACING= - ATH11K_SPECTRAL= - ATH11K_THERMAL= -+ATH11K_MEM_PROFILE_512M= - ATH12K= - ATH12K_DEBUG= - ATH12K_TRACING= diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch b/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch index beee16098f14c3..79f8190d5b990f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch @@ -600,8 +600,8 @@ Signed-off-by: Sriram R + __attribute__((unused)) struct napi_struct *napi) +{ + enum ath11k_hw_txrx_mode decap_type; -+ struct wireless_dev *wdev; -+ struct ieee80211_vif *vif; ++ struct wireless_dev *wdev = NULL; ++ struct ieee80211_vif *vif = NULL; + struct ath11k_vif *arvif; + struct ath11k_base *ab; + bool eth_decap = false; diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch b/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch index ffae0a9448ef8b..34b30984ca76d2 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch @@ -557,15 +557,13 @@ Signed-off-by: Sriram R exit: mutex_unlock(&ar->conf_mutex); return ret; -@@ -6216,10 +6279,16 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6216,10 +6279,14 @@ static void ath11k_mac_op_tx(struct ieee if (control->sta) arsta = ath11k_sta_to_arsta(control->sta); - ret = ath11k_dp_tx(ar, arvif, arsta, skb); -+ if (ar->ab->nss.enabled) { -+ arvif->ar->ab->nss.debug_mode = true; ++ if (ar->ab->nss.enabled) + ret = ath11k_nss_tx(arvif, skb); -+ } + else + ret = ath11k_dp_tx(ar, arvif, arsta, skb); if (unlikely(ret)) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch index b17b9fb419745d..a937ffba79961c 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -150,9 +150,9 @@ Signed-off-by: Seevalamuthu Mariappan spin_lock_bh(&tx_ring->tx_idr_lock); idr_remove(&tx_ring->txbuf_idr, FIELD_GET(DP_TX_DESC_ID_MSDU_ID, ti.desc_id)); -@@ -358,6 +429,9 @@ ath11k_dp_tx_htt_tx_complete_buf(struct - flags = skb_cb->flags; - vif = skb_cb->vif; +@@ -348,6 +419,9 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + return; + } + if (skb_cb->pkt_offset) + skb_pull(msdu, skb_cb->pkt_offset); /* removing the alignment and htt meta data */ diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch index a4c063ce69ba49..4d7af8641311dc 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch @@ -50,11 +50,11 @@ Signed-off-by: Ramya Gnanasekar /* Target configuration defines */ +#if defined(CPTCFG_ATH11K_MEM_PROFILE_256M) -+#define TARGET_NUM_VDEVS 8 -+#define TARGET_NUM_PEERS_PDEV (128 + TARGET_NUM_VDEVS) ++#define TARGET_NUM_VDEVS(ab) 8 ++#define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) +/* Max num of stations (per radio) */ -+#define TARGET_NUM_STATIONS 128 -+#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_512M ++#define TARGET_NUM_STATIONS(ab) 128 ++#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_256M +#define ATH11K_DP_TX_COMP_RING_SIZE 2048 +#define ATH11K_DP_RXDMA_BUF_RING_SIZE 1024 +#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 @@ -138,7 +138,7 @@ Signed-off-by: Ramya Gnanasekar #endif --- a/local-symbols +++ b/local-symbols -@@ -171,12 +171,13 @@ ATH11K= +@@ -171,6 +171,8 @@ ATH11K= ATH11K_AHB= ATH11K_PCI= ATH11K_NSS_SUPPORT= @@ -147,12 +147,6 @@ Signed-off-by: Ramya Gnanasekar ATH11K_DEBUG= ATH11K_DEBUGFS= ATH11K_TRACING= - ATH11K_SPECTRAL= - ATH11K_THERMAL= --ATH11K_MEM_PROFILE_512M= - ATH12K= - ATH12K_DEBUG= - ATH12K_TRACING= --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h @@ -863,6 +863,11 @@ struct ath11k_msi_config { @@ -282,17 +276,16 @@ Signed-off-by: Ramya Gnanasekar .hal_params = &ath11k_hw_hal_params_ipq8074, .supports_dynamic_smps_6ghz = false, .alloc_cacheable_memory = true, -@@ -127,7 +131,9 @@ static struct ath11k_hw_params ath11k_hw +@@ -127,6 +131,9 @@ static struct ath11k_hw_params ath11k_hw .tcl_ring_retry = true, .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, -- }, + /* In addition to TCL ring use TCL_CMD ring also for tx */ + .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, + .num_vdevs_peers = ath11k_vdevs_peers, + }, { .hw_rev = ATH11K_HW_IPQ6018_HW10, - .name = "ipq6018 hw1.0", @@ -177,7 +183,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, @@ -374,13 +367,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1592,10 +1592,13 @@ static ssize_t ath11k_dump_mgmt_stats(st - size_t count, loff_t *ppos) - { - struct ath11k *ar = file->private_data; -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M -+ struct ath11k_base *ab = ar->ab; -+#endif +@@ -1595,7 +1595,7 @@ static ssize_t ath11k_dump_mgmt_stats(st struct ath11k_vif *arvif = NULL; struct ath11k_mgmt_frame_stats *mgmt_stats; int len = 0, ret, i; diff --git a/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch index 7233913ee6f0f7..d3e6b9850b620f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch @@ -187,7 +187,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran + u32 metric; + unsigned long exp_time; + u8 hop_count; -+ u16 flags; /* See &enum ieee80211_mesh_path_flags */ ++ u8 flags; /* See &enum ieee80211_mesh_path_flags */ + u8 mesh_gate; + u8 block_mesh_fwd; + u8 metadata_type; diff --git a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch b/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch index 180fb7feab2e49..12feacda8555f7 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch @@ -104,19 +104,6 @@ NL80211_CMD_COLOR_CHANGE_COMPLETED, 0, 0); } ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -5241,6 +5241,10 @@ void ieee80211_tx_status_ext(struct ieee - * (NULL for multicast packets) - * @info: tx status information - */ -+void ieee80211_tx_status_8023(struct ieee80211_hw *hw, -+ struct ieee80211_vif *vif, -+ struct sk_buff *skb); -+ - static inline void ieee80211_tx_status_noskb(struct ieee80211_hw *hw, - struct ieee80211_sta *sta, - struct ieee80211_tx_info *info) --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -4777,7 +4777,7 @@ void ieee80211_color_collision_detection @@ -160,39 +147,6 @@ /* now keys can no longer be reached */ ieee80211_free_sta_keys(local, sta); ---- a/net/mac80211/status.c -+++ b/net/mac80211/status.c -@@ -1244,6 +1244,30 @@ void ieee80211_tx_rate_update(struct iee - } - EXPORT_SYMBOL(ieee80211_tx_rate_update); - -+void ieee80211_tx_status_8023(struct ieee80211_hw *hw, -+ struct ieee80211_vif *vif, -+ struct sk_buff *skb) -+{ -+ struct ieee80211_sub_if_data *sdata; -+ struct ieee80211_tx_status status = { -+ .skb = skb, -+ .info = IEEE80211_SKB_CB(skb), -+ }; -+ struct sta_info *sta; -+ -+ sdata = vif_to_sdata(vif); -+ -+ rcu_read_lock(); -+ -+ if (!ieee80211_lookup_ra_sta(sdata, skb, &sta) && !IS_ERR(sta)) -+ status.sta = &sta->sta; -+ -+ ieee80211_tx_status_ext(hw, &status); -+ -+ rcu_read_unlock(); -+} -+EXPORT_SYMBOL(ieee80211_tx_status_8023); -+ - void ieee80211_report_low_ack(struct ieee80211_sta *pubsta, u32 num_packets) - { - struct sta_info *sta = container_of(pubsta, struct sta_info, sta); --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -19414,7 +19414,7 @@ void cfg80211_ch_switch_started_notify(s diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch b/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch index 7e2a9f0ee4dd4b..47146c459e796e 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch @@ -13,20 +13,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -9,10 +9,12 @@ - #include "nss.h" - #include "core.h" - #include "peer.h" -+#include "dp_tx.h" - #include "dp_rx.h" - #include "dp_tx.h" - #include "hif.h" - #include "wmi.h" -+#include "wmi.h" - #include "../../../../../net/mac80211/sta_info.h" - - /*-----------------------------ATH11K-NSS Helpers--------------------------*/ -@@ -348,6 +350,22 @@ void ath11k_nss_wifili_event_receive(str +@@ -348,6 +348,22 @@ void ath11k_nss_wifili_event_receive(str ath11k_nss_wifili_link_desc_return(ab, (void *)&msg->msg.linkdescinfomsg); break; @@ -301,8 +288,8 @@ Signed-off-by: Sathishkumar Muruganandam __attribute__((unused)) struct napi_struct *napi) { - enum ath11k_hw_txrx_mode decap_type; - struct wireless_dev *wdev; - struct ieee80211_vif *vif; + struct wireless_dev *wdev = NULL; + struct ieee80211_vif *vif = NULL; struct ath11k_vif *arvif; @@ -632,28 +871,16 @@ ath11k_nss_vdev_data_receive(struct net_ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss: ", diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch b/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch index 5d695ccfe55f2e..86812a1830d817 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch @@ -85,9 +85,9 @@ Signed-off-by: Vasanthakumar Thiagarajan break; } } -@@ -786,24 +814,7 @@ ath11k_nss_vdev_special_data_receive(str +@@ -785,24 +813,7 @@ ath11k_nss_vdev_special_data_receive(str + int data_offs = 0; int ret = 0; - struct ath11k_peer *ta_peer = NULL; - if (!dev) { - dev_kfree_skb_any(skb); diff --git a/package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch b/package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch new file mode 100644 index 00000000000000..10c39288094b5f --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch @@ -0,0 +1,31 @@ +From 047c8f3ea16fe1d071f83b51b8c132f797903c91 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Periyasamy +Date: Tue, 10 Oct 2023 09:13:38 +0530 +Subject: [PATCH] wifi: ath11k: Add support to send the QoS Null Data frame + through exception path + +When we try to send QoS NULL Data frame in Ethernet encap type, it modified +as QoS Data frame with TID 0 (encryption enabled one if security enabled). +But expectation is, it should be send as open type frame with TID 7 since +its a QoS NULL data frame. + +Added this frame under exception route to bypass TCL with the help of FW. + +Signed-off-by: Karthikeyan Periyasamy +--- + drivers/net/wireless/ath/ath11k/dp_tx.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -209,7 +209,9 @@ tcl_ring_sel: + + switch (ti.encap_type) { + case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: +- if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) ++ if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && ++ (skb->protocol == cpu_to_be16(ETH_P_PAE) || ++ ieee80211_is_qos_nullfunc(hdr->frame_control))) + is_diff_encap = true; + else + ath11k_dp_tx_encap_nwifi(skb); diff --git a/package/kernel/mac80211/patches/ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch b/package/kernel/mac80211/patches/ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch new file mode 100644 index 00000000000000..47b29fd19e19bb --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch @@ -0,0 +1,12 @@ +--- a/drivers/net/wireless/ath/ath11k/qmi.c ++++ b/drivers/net/wireless/ath/ath11k/qmi.c +@@ -2101,6 +2101,9 @@ static int ath11k_qmi_assign_target_mem_ + ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; + idx++; + break; ++ case M3_DUMP_REGION_TYPE: ++ idx++; ++ break; + default: + ath11k_warn(ab, "qmi ignore invalid mem req type %d\n", + ab->qmi.target_mem[i].type); diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch b/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch index bba58322a254e7..47c6b7ec3e5ae2 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch +++ b/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch @@ -69,9 +69,9 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 int ret = 0; + struct ath11k_peer *ta_peer = NULL; - if (!dev) { - dev_kfree_skb_any(skb); -@@ -834,15 +833,50 @@ ath11k_nss_vdev_special_data_receive(str + arvif = ath11k_nss_get_arvif_from_dev(dev); + if (!arvif) { +@@ -843,15 +842,50 @@ ath11k_nss_vdev_special_data_receive(str return; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch b/package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch new file mode 100644 index 00000000000000..79906c8d3a4ab3 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch @@ -0,0 +1,623 @@ +From a19b1279d75dd1306c6eac291e985657f988780c Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Thu, 7 Jan 2021 16:32:30 +0530 +Subject: [PATCH] ath11k: dp_tx perf improvements + + Contains below changes, + 1. Add branch prediction in tx path + 2. Allow fast tx completion by freeing skb when stats is disabled. + 3. Remove mod operator overhead for dst ring access to avoid(to be profiled) + 4. Lockless tcl ring usage since rings are selected per cpu + +Sample stats disable command: +echo 1 > /sys/kernel/debug/ath11k/qcn9000\ hw1.0_0000\:01\:00.0/stats_disable +echo 1 > /sys/kernel/debug/ath11k/ipq8074\ hw2.0/stats_disable + +Signed-off-by: Sriram R +Signed-off-by: P Praneesh +--- + drivers/net/wireless/ath/ath11k/core.h | 1 + + drivers/net/wireless/ath/ath11k/dp.c | 7 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 118 ++++++++++++++++++-------------- + drivers/net/wireless/ath/ath11k/dp_tx.h | 2 + + drivers/net/wireless/ath/ath11k/hal.c | 9 ++- + drivers/net/wireless/ath/ath11k/mac.c | 9 ++- + 6 files changed, 88 insertions(+), 58 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -118,6 +118,7 @@ static inline enum wme_ac ath11k_tid_to_ + enum ath11k_skb_flags { + ATH11K_SKB_HW_80211_ENCAP = BIT(0), + ATH11K_SKB_CIPHER_SET = BIT(1), ++ ATH11K_SKB_TX_STATUS = BIT(2), + }; + + struct ath11k_skb_cb { +@@ -919,7 +920,12 @@ struct ath11k_soc_dp_tx_err_stats { + /* Other failures during dp_tx due to mem allocation failure + * idr unavailable etc. + */ ++ /* TCL Ring IDR unavailable */ ++ u32 idr_na[DP_TCL_NUM_RING_MAX]; ++ + atomic_t misc_fail; ++ atomic_t max_fail; ++ /* Tx failures due to NSS Tx error status */ + atomic_t nss_tx_fail; + }; + +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -362,7 +362,7 @@ void ath11k_dp_stop_shadow_timers(struct + if (!ab->hw_params.supports_shadow_regs) + return; + +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) + ath11k_dp_shadow_stop_timer(ab, &ab->dp.tx_ring_timer[i]); + + ath11k_dp_shadow_stop_timer(ab, &ab->dp.reo_cmd_timer); +@@ -377,7 +377,7 @@ static void ath11k_dp_srng_common_cleanu + ath11k_dp_srng_cleanup(ab, &dp->wbm_desc_rel_ring); + ath11k_dp_srng_cleanup(ab, &dp->tcl_cmd_ring); + ath11k_dp_srng_cleanup(ab, &dp->tcl_status_ring); +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) { ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_data_ring); + ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_comp_ring); + } +@@ -411,6 +411,11 @@ static int ath11k_dp_srng_common_setup(s + goto err; + } + ++ if (ab->hw_params.max_tx_ring > DP_TCL_NUM_RING_MAX) { ++ srng = &ab->hal.srng_list[dp->tcl_cmd_ring.ring_id]; ++ ath11k_hal_tx_init_data_ring(ab, srng, HAL_TCL_CMD); ++ } ++ + ret = ath11k_dp_srng_setup(ab, &dp->tcl_status_ring, HAL_TCL_STATUS, + 0, 0, DP_TCL_STATUS_RING_SIZE); + if (ret) { +@@ -418,7 +423,7 @@ static int ath11k_dp_srng_common_setup(s + goto err; + } + +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) { ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + tcl_num = ab->hw_params.hal_params->tcl2wbm_rbm_map[i].tcl_ring_num; + wbm_num = ab->hw_params.hal_params->tcl2wbm_rbm_map[i].wbm_ring_num; + +@@ -441,7 +446,7 @@ static int ath11k_dp_srng_common_setup(s + } + + srng = &ab->hal.srng_list[dp->tx_ring[i].tcl_data_ring.ring_id]; +- ath11k_hal_tx_init_data_ring(ab, srng); ++ ath11k_hal_tx_init_data_ring(ab, srng, HAL_TCL_DATA); + + ath11k_dp_shadow_init_timer(ab, &dp->tx_ring_timer[i], + ATH11K_SHADOW_DP_TIMER_INTERVAL, +@@ -1062,7 +1067,7 @@ void ath11k_dp_free(struct ath11k_base * + + ath11k_dp_reo_cmd_list_cleanup(ab); + +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) { ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + spin_lock_bh(&dp->tx_ring[i].tx_idr_lock); + idr_for_each(&dp->tx_ring[i].txbuf_idr, + ath11k_dp_tx_pending_cleanup, ab); +@@ -1114,7 +1119,7 @@ int ath11k_dp_alloc(struct ath11k_base * + + size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE; + +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) { ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + idr_init(&dp->tx_ring[i].txbuf_idr); + spin_lock_init(&dp->tx_ring[i].tx_idr_lock); + dp->tx_ring[i].tcl_data_ring_id = i; +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -121,27 +121,35 @@ int ath11k_dp_tx(struct ath11k *ar, stru + u32 ring_selector = 0; + u8 ring_map = 0; + bool tcl_ring_retry, is_diff_encap = false; +- u8 align_pad, htt_meta_size = 0; +- +- if (unlikely(test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) +- return -ESHUTDOWN; ++ u8 align_pad, htt_meta_size = 0, max_tx_ring, tcl_ring_id, ring_id; + + if (unlikely(!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && + !ieee80211_is_data(hdr->frame_control))) + return -ENOTSUPP; + +- ring_selector = ab->hw_params.hw_ops->get_ring_selector(skb); ++ max_tx_ring = ab->hw_params.max_tx_ring; ++ ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ if (unlikely(atomic_read(&ab->num_max_allowed) > DP_TX_COMP_MAX_ALLOWED)) { ++ atomic_inc(&ab->soc_stats.tx_err.max_fail); ++ return -ENOSPC; ++ } ++#endif ++ ring_selector = smp_processor_id();; + pool_id = ring_selector; + + tcl_ring_sel: + tcl_ring_retry = false; + +- ti.ring_id = ring_selector % ab->hw_params.max_tx_ring; +- ti.rbm_id = ab->hw_params.hal_params->tcl2wbm_rbm_map[ti.ring_id].rbm_id; ++ ring_id = ring_selector % max_tx_ring; ++ tcl_ring_id = (ring_id == DP_TCL_NUM_RING_MAX) ? ++ DP_TCL_NUM_RING_MAX - 1 : ring_id; + +- ring_map |= BIT(ti.ring_id); + +- tx_ring = &dp->tx_ring[ti.ring_id]; ++ ring_map |= BIT(ring_id); ++ ++ ti.buf_id = tcl_ring_id + HAL_RX_BUF_RBM_SW0_BM; ++ tx_ring = &dp->tx_ring[tcl_ring_id]; + + spin_lock_bh(&tx_ring->tx_idr_lock); + ret = idr_alloc(&tx_ring->txbuf_idr, skb, 0, +@@ -149,9 +157,9 @@ tcl_ring_sel: + spin_unlock_bh(&tx_ring->tx_idr_lock); + + if (unlikely(ret < 0)) { +- if (ring_map == (BIT(ab->hw_params.max_tx_ring) - 1) || ++ if (ring_map == (BIT(max_tx_ring) - 1) || + !ab->hw_params.tcl_ring_retry) { +- atomic_inc(&ab->soc_stats.tx_err.misc_fail); ++ ab->soc_stats.tx_err.idr_na[tcl_ring_id]++; + return -ENOSPC; + } + +@@ -260,6 +268,11 @@ tcl_ring_sel: + ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + } + ++ ti.data_len = skb->len - ti.pkt_offset; ++ skb_cb->pkt_offset = ti.pkt_offset; ++ skb_cb->vif = arvif->vif; ++ skb_cb->ar = ar; ++ + ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); + if (unlikely(dma_mapping_error(ab->dev, ti.paddr))) { + atomic_inc(&ab->soc_stats.tx_err.misc_fail); +@@ -268,13 +281,13 @@ tcl_ring_sel: + goto fail_remove_idr; + } + +- ti.data_len = skb->len - ti.pkt_offset; +- skb_cb->pkt_offset = ti.pkt_offset; + skb_cb->paddr = ti.paddr; +- skb_cb->vif = arvif->vif; +- skb_cb->ar = ar; + +- hal_ring_id = tx_ring->tcl_data_ring.ring_id; ++ if (ring_id == DP_TCL_NUM_RING_MAX) ++ hal_ring_id = dp->tcl_cmd_ring.ring_id; ++ else ++ hal_ring_id = tx_ring->tcl_data_ring.ring_id; ++ + tcl_ring = &ab->hal.srng_list[hal_ring_id]; + + spin_lock_bh(&tcl_ring->lock); +@@ -287,7 +300,7 @@ tcl_ring_sel: + * desc because the desc is directly enqueued onto hw queue. + */ + ath11k_hal_srng_access_end(ab, tcl_ring); +- ab->soc_stats.tx_err.desc_na[ti.ring_id]++; ++ ab->soc_stats.tx_err.desc_na[tcl_ring_id]++; + spin_unlock_bh(&tcl_ring->lock); + ret = -ENOMEM; + +@@ -296,8 +309,8 @@ tcl_ring_sel: + * checking this ring earlier for each pkt tx. + * Restart ring selection if some rings are not checked yet. + */ +- if (unlikely(ring_map != (BIT(ab->hw_params.max_tx_ring)) - 1) && +- ab->hw_params.tcl_ring_retry && ab->hw_params.max_tx_ring > 1) { ++ if (unlikely(ring_map != (BIT(max_tx_ring)) - 1) && ++ ab->hw_params.tcl_ring_retry && max_tx_ring > 1) { + tcl_ring_retry = true; + ring_selector++; + } +@@ -308,17 +321,17 @@ tcl_ring_sel: + ath11k_hal_tx_cmd_desc_setup(ab, hal_tcl_desc + + sizeof(struct hal_tlv_hdr), &ti); + ++ atomic_inc(&ar->dp.num_tx_pending); ++ atomic_inc(&ab->num_max_allowed); + ath11k_hal_srng_access_end(ab, tcl_ring); + +- ath11k_dp_shadow_start_timer(ab, tcl_ring, &dp->tx_ring_timer[ti.ring_id]); ++ ath11k_dp_shadow_start_timer(ab, tcl_ring, &dp->tx_ring_timer[ti.buf_id]); + + spin_unlock_bh(&tcl_ring->lock); + + ath11k_dbg_dump(ab, ATH11K_DBG_DP_TX, NULL, "dp tx msdu: ", + skb->data, skb->len); + +- atomic_inc(&ar->dp.num_tx_pending); +- atomic_inc(&ab->num_max_allowed); + + return 0; + +@@ -365,7 +378,6 @@ static void ath11k_dp_tx_free_txbuf(stru + ar = ab->pdevs[mac_id].ar; + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) + wake_up(&ar->dp.tx_empty_waitq); +- atomic_dec(&ab->num_max_allowed); + } + + static void +@@ -379,6 +391,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + struct ath11k_skb_cb *skb_cb; + struct ath11k *ar; + struct ath11k_peer *peer; ++ u8 flags = 0; + + spin_lock(&tx_ring->tx_idr_lock); + msdu = idr_remove(&tx_ring->txbuf_idr, ts->msdu_id); +@@ -397,10 +410,30 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) + wake_up(&ar->dp.tx_empty_waitq); +- atomic_dec(&ab->num_max_allowed); + + dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + ++ flags = skb_cb->flags; ++ ++ /* Free skb here if stats is disabled */ ++ if (ab->stats_disable && !(flags & ATH11K_SKB_TX_STATUS)) { ++ if (msdu->destructor) { ++ msdu->wifi_acked_valid = 1; ++ msdu->wifi_acked = ts->acked; ++ } ++ if (skb_has_frag_list(msdu)) { ++ kfree_skb_list(skb_shinfo(msdu)->frag_list); ++ skb_shinfo(msdu)->frag_list = NULL; ++ } ++ dev_kfree_skb(msdu); ++ return; ++ } ++ ++ if (unlikely(!skb_cb->vif)) { ++ dev_kfree_skb_any(msdu); ++ return; ++ } ++ + if (!skb_cb->vif) { + ieee80211_free_txskb(ar->hw, msdu); + return; +@@ -616,6 +649,7 @@ static void ath11k_dp_tx_complete_msdu(s + struct ath11k_peer *peer; + struct ath11k_sta *arsta; + struct rate_info rate; ++ u8 flags = 0; + + if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { + /* Must not happen */ +@@ -626,6 +660,20 @@ static void ath11k_dp_tx_complete_msdu(s + + dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + ++ /* Free skb here if stats is disabled */ ++ if (ab->stats_disable && !(flags & ATH11K_SKB_TX_STATUS)) { ++ if (msdu->destructor) { ++ msdu->wifi_acked_valid = 1; ++ msdu->wifi_acked = ts->status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED; ++ } ++ if (skb_has_frag_list(msdu)) { ++ kfree_skb_list(skb_shinfo(msdu)->frag_list); ++ skb_shinfo(msdu)->frag_list = NULL; ++ } ++ dev_kfree_skb(msdu); ++ return; ++ } ++ + if (unlikely(!rcu_access_pointer(ab->pdevs_active[ar->pdev_idx]))) { + ieee80211_free_txskb(ar->hw, msdu); + return; +@@ -680,7 +728,7 @@ static void ath11k_dp_tx_complete_msdu(s + + spin_lock_bh(&ab->base_lock); + peer = ath11k_peer_find_by_id(ab, ts->peer_id); +- if (!peer || !peer->sta) { ++ if (unlikely(!peer || !peer->sta)) { + ath11k_dbg(ab, ATH11K_DBG_DATA, + "dp_tx: failed to find the peer with peer_id %d\n", + ts->peer_id); +@@ -736,19 +784,36 @@ static inline void ath11k_dp_tx_status_p + ts->rate_stats = 0; + } + ++static inline bool ath11k_dp_tx_completion_valid(struct hal_wbm_release_ring *desc) ++{ ++ struct htt_tx_wbm_completion *status_desc; ++ ++ if (FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0) == ++ HAL_WBM_REL_SRC_MODULE_FW) { ++ status_desc = ((u8 *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; ++ ++ /* Dont consider HTT_TX_COMP_STATUS_MEC_NOTIFY */ ++ if (FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, status_desc->info0) == ++ HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY) ++ return false; ++ } ++ return true; ++} ++ + void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id) + { + struct ath11k *ar; + struct ath11k_dp *dp = &ab->dp; +- int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id; ++ int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id, count = 0, i = 0; + struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id]; + struct sk_buff *msdu; + struct hal_tx_status ts = { 0 }; + struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; + int valid_entries; + u32 *desc; +- u32 msdu_id; ++ u32 msdu_id, desc_id; + u8 mac_id; ++ struct hal_wbm_release_ring *tx_status; + + spin_lock_bh(&status_ring->lock); + +@@ -763,33 +828,27 @@ void ath11k_dp_tx_completion_handler(str + + ath11k_hal_srng_dst_invalidate_entry(ab, status_ring, valid_entries); + +- while ((ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_head) != +- tx_ring->tx_status_tail) && +- (desc = ath11k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { +- memcpy(&tx_ring->tx_status[tx_ring->tx_status_head], +- desc, sizeof(struct hal_wbm_release_ring)); +- tx_ring->tx_status_head = +- ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_head); +- } ++ while ((desc = ath11k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { ++ if (!ath11k_dp_tx_completion_valid(desc)) ++ continue; + +- if (unlikely((ath11k_hal_srng_dst_peek(ab, status_ring) != NULL) && +- (ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_head) == +- tx_ring->tx_status_tail))) { +- /* TODO: Process pending tx_status messages when kfifo_is_full() */ +- ath11k_warn(ab, "Unable to process some of the tx_status ring desc because status_fifo is full\n"); ++ memcpy(&tx_ring->tx_status[count], ++ desc, sizeof(struct hal_wbm_release_ring)); ++ count++; + } + + ath11k_hal_srng_access_end(ab, status_ring); + + spin_unlock_bh(&status_ring->lock); + +- while (ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_tail) != tx_ring->tx_status_head) { +- struct hal_wbm_release_ring *tx_status; +- u32 desc_id; +- +- tx_ring->tx_status_tail = +- ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_tail); +- tx_status = &tx_ring->tx_status[tx_ring->tx_status_tail]; ++ if (atomic_sub_return(count, &ab->num_max_allowed) < 0) { ++ ath11k_warn(ab, "tx completion mismatch count %d ring id %d max_num %d\n", ++ count, tx_ring->tcl_data_ring_id, ++ atomic_read(&ab->num_max_allowed)); ++ } ++ ++ while (count--) { ++ tx_status = &tx_ring->tx_status[i++]; + ath11k_dp_tx_status_parse(ab, tx_status, &ts); + + desc_id = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, +@@ -822,7 +881,6 @@ void ath11k_dp_tx_completion_handler(str + wake_up(&ar->dp.tx_empty_waitq); + + ath11k_dp_tx_complete_msdu(ar, msdu, &ts); +- atomic_dec(&ab->num_max_allowed); + } + } + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6723,12 +6723,22 @@ static void ath11k_mac_op_tx(struct ieee + if (control->sta) + arsta = ath11k_sta_to_arsta(control->sta); + ++ /* Must call mac80211 tx status handler, else when stats is disabled we free ++ * the skb from driver. Own tx packets on monitor will also be disabled. ++ */ ++ if ((info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS | IEEE80211_TX_INTFL_NL80211_FRAME_TX)) || ++ info->ack_frame_id || vif->type == NL80211_IFTYPE_MESH_POINT || ++ test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &ar->monitor_flags)) ++ skb_cb->flags |= ATH11K_SKB_TX_STATUS; ++ + if (ar->ab->nss.enabled) + ret = ath11k_nss_tx(arvif, skb); + else + ret = ath11k_dp_tx(ar, arvif, arsta, skb); ++ + if (unlikely(ret)) { +- ath11k_warn(ar->ab, "failed to transmit frame %d\n", ret); ++ if (!ar->ab->nss.enabled && ret != -ENOSPC && ret != -ENOMEM) ++ ath11k_warn(ar->ab, "failed to transmit frame %d\n", ret); + ieee80211_free_txskb(ar->hw, skb); + return; + } +@@ -7690,7 +7700,7 @@ err_vdev_del: + idr_for_each(&ar->txmgmt_idr, + ath11k_mac_vif_txmgmt_idr_remove, vif); + +- for (i = 0; i < ab->hw_params.max_tx_ring; i++) { ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + spin_lock_bh(&ab->dp.tx_ring[i].tx_idr_lock); + idr_for_each(&ab->dp.tx_ring[i].txbuf_idr, + ath11k_mac_vif_unref, vif); +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -833,10 +833,22 @@ static ssize_t ath11k_debugfs_dump_soc_d + len += scnprintf(buf + len, size - len, "ring%d: %u\n", + i, soc_stats->tx_err.desc_na[i]); + ++ len += scnprintf(buf + len, size - len, "\nTCL Ring idr Failures:\n"); ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) ++ len += scnprintf(buf + len, size - len, "ring%d: %u\n", ++ i, soc_stats->tx_err.idr_na[i]); ++ ++ len += scnprintf(buf + len, size - len, "\nMax Transmit Failures: %d\n", ++ atomic_read(&soc_stats->tx_err.max_fail)); ++ + len += scnprintf(buf + len, size - len, + "\nMisc Transmit Failures: %d\n", + atomic_read(&soc_stats->tx_err.misc_fail)); + ++ len += scnprintf(buf + len, size - len, ++ "\nNSS Transmit Failures: %d\n", ++ atomic_read(&soc_stats->tx_err.nss_tx_fail)); ++ + len += ath11k_debugfs_dump_soc_ring_bp_stats(ab, buf + len, size - len); + + if (len > size) +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -192,7 +192,6 @@ static struct ath11k_hw_params ath11k_hw + .supports_regdb = false, + .fix_l1ss = true, + .credit_flow = false, +- .max_tx_ring = DP_TCL_NUM_RING_MAX, + .hal_params = &ath11k_hw_hal_params_ipq8074, + .supports_dynamic_smps_6ghz = false, + .alloc_cacheable_memory = true, +@@ -217,6 +216,8 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = false, ++ /* In addition to TCL ring use TCL_CMD ring also for tx */ ++ .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, + }, + { + .name = "qca6390 hw2.0", +@@ -384,6 +384,8 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = false, ++ /* In addition to TCL ring use TCL_CMD ring also for tx */ ++ .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, + }, + { + .name = "wcn6855 hw2.0", +@@ -2147,6 +2149,9 @@ int ath11k_core_pre_init(struct ath11k_b + + ab->enable_memory_stats = ATH11K_DEBUG_ENABLE_MEMORY_STATS; + ++ if (ab->nss.enabled && ab->hw_params.max_tx_ring > DP_TCL_NUM_RING_MAX) ++ ab->hw_params.max_tx_ring = DP_TCL_NUM_RING_MAX; ++ + return 0; + } + EXPORT_SYMBOL(ath11k_core_pre_init); +--- a/drivers/net/wireless/ath/ath11k/hal_tx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_tx.h +@@ -18,7 +18,7 @@ + + struct hal_tx_info { + u16 meta_data_flags; /* %HAL_TCL_DATA_CMD_INFO0_META_ */ +- u8 ring_id; ++ u8 buf_id; + u32 desc_id; + enum hal_tcl_desc_type type; + enum hal_tcl_encap_type encap_type; +@@ -70,5 +70,5 @@ int ath11k_hal_reo_cmd_send(struct ath11 + enum hal_reo_cmd_type type, + struct ath11k_hal_reo_cmd *cmd); + void ath11k_hal_tx_init_data_ring(struct ath11k_base *ab, +- struct hal_srng *srng); ++ struct hal_srng *srng, enum hal_ring_type type); + #endif +--- a/drivers/net/wireless/ath/ath11k/hal_tx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_tx.c +@@ -37,18 +37,18 @@ static const u8 dscp_tid_map[DSCP_TID_MA + void ath11k_hal_tx_cmd_desc_setup(struct ath11k_base *ab, void *cmd, + struct hal_tx_info *ti) + { +- struct hal_tcl_data_cmd *tcl_cmd = cmd; ++ struct hal_tcl_data_cmd tcl_cmd, *tcl_desc = cmd; + +- tcl_cmd->buf_addr_info.info0 = ++ tcl_cmd.buf_addr_info.info0 = + FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, ti->paddr); +- tcl_cmd->buf_addr_info.info1 = ++ tcl_cmd.buf_addr_info.info1 = + FIELD_PREP(BUFFER_ADDR_INFO1_ADDR, + ((uint64_t)ti->paddr >> HAL_ADDR_MSB_REG_SHIFT)); +- tcl_cmd->buf_addr_info.info1 |= +- FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, ti->rbm_id) | ++ tcl_cmd.buf_addr_info.info1 |= ++ FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, ti->buf_id) | + FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, ti->desc_id); + +- tcl_cmd->info0 = ++ tcl_cmd.info0 = + FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_DESC_TYPE, ti->type) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE, ti->encap_type) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCRYPT_TYPE, +@@ -60,23 +60,25 @@ void ath11k_hal_tx_cmd_desc_setup(struct + FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_CMD_NUM, + ti->meta_data_flags); + +- tcl_cmd->info1 = ti->flags0 | ++ tcl_cmd.info1 = ti->flags0 | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_DATA_LEN, ti->data_len) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_PKT_OFFSET, ti->pkt_offset); + +- tcl_cmd->info2 = ti->flags1 | ++ tcl_cmd.info2 = ti->flags1 | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ti->lmac_id); + +- tcl_cmd->info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, ++ tcl_cmd.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, + ti->dscp_tid_tbl_idx) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_SEARCH_INDEX, + ti->bss_ast_idx) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_CACHE_SET_NUM, + ti->bss_ast_hash); +- tcl_cmd->info4 = 0; ++ tcl_cmd.info4 = 0; + + if (ti->enable_mesh) +- ab->hw_params.hw_ops->tx_mesh_enable(ab, tcl_cmd); ++ ab->hw_params.hw_ops->tx_mesh_enable(ab, &tcl_cmd); ++ ++ *tcl_desc = tcl_cmd; + } + + void ath11k_hal_tx_set_dscp_tid_map(struct ath11k_base *ab, int id) +@@ -136,7 +138,9 @@ void ath11k_hal_tx_set_dscp_tid_map(stru + ctrl_reg_val); + } + +-void ath11k_hal_tx_init_data_ring(struct ath11k_base *ab, struct hal_srng *srng) ++void ath11k_hal_tx_init_data_ring(struct ath11k_base *ab, struct hal_srng *srng, ++ enum hal_ring_type type) ++ + { + struct hal_srng_params params; + struct hal_tlv_hdr *tlv; +@@ -145,7 +149,7 @@ void ath11k_hal_tx_init_data_ring(struct + + memset(¶ms, 0, sizeof(params)); + +- entry_size = ath11k_hal_srng_get_entrysize(ab, HAL_TCL_DATA); ++ entry_size = ath11k_hal_srng_get_entrysize(ab, type); + ath11k_hal_srng_get_params(ab, srng, ¶ms); + desc = (u8 *)params.ring_base_vaddr; + diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch b/package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch new file mode 100644 index 00000000000000..3cc13d1ba98543 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch @@ -0,0 +1,269 @@ +From 34b4e65248e7e1605448b06a006347354990bfba Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Thu, 11 Nov 2021 10:30:35 +0530 +Subject: [PATCH] ath11k: optimize tx completions + +Process the required fields from tx completion status +in case of stats disabled. + +Signed-off-by: Venkateswara Naralasetty +--- + drivers/net/wireless/ath/ath11k/dp_tx.c | 114 ++++++++++++++++---------------- + 1 file changed, 58 insertions(+), 56 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -439,6 +439,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + return; + } + ++ + if (skb_cb->pkt_offset) + skb_pull(msdu, skb_cb->pkt_offset); /* removing the alignment and htt meta data */ + +@@ -637,9 +638,41 @@ err_out: + spin_unlock_bh(&ab->base_lock); + } + ++static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab, ++ struct hal_wbm_release_ring *desc, ++ struct hal_tx_status *ts) ++{ ++ ts->buf_rel_source = ++ FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0); ++ if (unlikely(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW && ++ ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) ++ return; ++ ++ if (unlikely(ts->buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) ++ return; ++ ++ ts->status = FIELD_GET(HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON, ++ desc->info0); ++ ts->ppdu_id = FIELD_GET(HAL_WBM_RELEASE_INFO1_TQM_STATUS_NUMBER, ++ desc->info1); ++ ts->try_cnt = FIELD_GET(HAL_WBM_RELEASE_INFO1_TRANSMIT_COUNT, ++ desc->info1); ++ ts->ack_rssi = FIELD_GET(HAL_WBM_RELEASE_INFO2_ACK_FRAME_RSSI, ++ desc->info2); ++ if (desc->info2 & HAL_WBM_RELEASE_INFO2_FIRST_MSDU) ++ ts->flags |= HAL_TX_STATUS_FLAGS_FIRST_MSDU; ++ ts->peer_id = FIELD_GET(HAL_WBM_RELEASE_INFO3_PEER_ID, desc->info3); ++ ts->tid = FIELD_GET(HAL_WBM_RELEASE_INFO3_TID, desc->info3); ++ if (desc->rate_stats.info0 & HAL_TX_RATE_STATS_INFO0_VALID) ++ ts->rate_stats = desc->rate_stats.info0; ++ else ++ ts->rate_stats = 0; ++} ++ + static void ath11k_dp_tx_complete_msdu(struct ath11k *ar, + struct sk_buff *msdu, +- struct hal_tx_status *ts) ++ struct hal_wbm_release_ring *tx_status, ++ enum hal_wbm_rel_src_module buf_rel_source) + { + struct ieee80211_tx_status status = { 0 }; + struct ieee80211_rate_status status_rate = { 0 }; +@@ -649,9 +682,12 @@ static void ath11k_dp_tx_complete_msdu(s + struct ath11k_peer *peer; + struct ath11k_sta *arsta; + struct rate_info rate; ++ struct hal_tx_status ts = { 0 }; ++ enum hal_wbm_htt_tx_comp_status wbm_status; ++ enum hal_wbm_tqm_rel_reason rel_status; + u8 flags = 0; + +- if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { ++ if (unlikely(WARN_ON_ONCE(buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM))) { + /* Must not happen */ + return; + } +@@ -660,11 +696,14 @@ static void ath11k_dp_tx_complete_msdu(s + + dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + +- /* Free skb here if stats is disabled */ ++ rel_status = FIELD_GET(HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON, ++ tx_status->info0); ++ ++ /* Free skb here if stats is disabled */ + if (ab->stats_disable && !(flags & ATH11K_SKB_TX_STATUS)) { + if (msdu->destructor) { + msdu->wifi_acked_valid = 1; +- msdu->wifi_acked = ts->status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED; ++ msdu->wifi_acked = rel_status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED; + } + if (skb_has_frag_list(msdu)) { + kfree_skb_list(skb_shinfo(msdu)->frag_list); +@@ -674,6 +713,8 @@ static void ath11k_dp_tx_complete_msdu(s + return; + } + ++ ath11k_dp_tx_status_parse(ab, tx_status, &ts); ++ + if (unlikely(!rcu_access_pointer(ab->pdevs_active[ar->pdev_idx]))) { + ieee80211_free_txskb(ar->hw, msdu); + return; +@@ -684,54 +725,56 @@ static void ath11k_dp_tx_complete_msdu(s + return; + } + ++ wbm_status = FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, ++ tx_status->info0); + info = IEEE80211_SKB_CB(msdu); + memset(&info->status, 0, sizeof(info->status)); + + /* skip tx rate update from ieee80211_status*/ + info->status.rates[0].idx = -1; + +- if (ts->status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED && ++ if (ts.status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED && + !(info->flags & IEEE80211_TX_CTL_NO_ACK)) { + info->flags |= IEEE80211_TX_STAT_ACK; + info->status.ack_signal = ATH11K_DEFAULT_NOISE_FLOOR + +- ts->ack_rssi; ++ ts.ack_rssi; + info->status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID; + } + +- if (ts->status == HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX && ++ if (ts.status == HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX && + (info->flags & IEEE80211_TX_CTL_NO_ACK)) + info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; + + if (unlikely(ath11k_debugfs_is_extd_tx_stats_enabled(ar)) || + ab->hw_params.single_pdev_only) { +- if (ts->flags & HAL_TX_STATUS_FLAGS_FIRST_MSDU) { ++ if (ts.flags & HAL_TX_STATUS_FLAGS_FIRST_MSDU) { + if (ar->last_ppdu_id == 0) { +- ar->last_ppdu_id = ts->ppdu_id; +- } else if (ar->last_ppdu_id == ts->ppdu_id || ++ ar->last_ppdu_id = ts.ppdu_id; ++ } else if (ar->last_ppdu_id == ts.ppdu_id || + ar->cached_ppdu_id == ar->last_ppdu_id) { + ar->cached_ppdu_id = ar->last_ppdu_id; + ar->cached_stats.is_ampdu = true; +- ath11k_dp_tx_update_txcompl(ar, ts); ++ ath11k_dp_tx_update_txcompl(ar, &ts); + memset(&ar->cached_stats, 0, + sizeof(struct ath11k_per_peer_tx_stats)); + } else { + ar->cached_stats.is_ampdu = false; +- ath11k_dp_tx_update_txcompl(ar, ts); ++ ath11k_dp_tx_update_txcompl(ar, &ts); + memset(&ar->cached_stats, 0, + sizeof(struct ath11k_per_peer_tx_stats)); + } +- ar->last_ppdu_id = ts->ppdu_id; ++ ar->last_ppdu_id = ts.ppdu_id; + } + +- ath11k_dp_tx_cache_peer_stats(ar, msdu, ts); ++ ath11k_dp_tx_cache_peer_stats(ar, msdu, &ts); + } + + spin_lock_bh(&ab->base_lock); +- peer = ath11k_peer_find_by_id(ab, ts->peer_id); ++ peer = ath11k_peer_find_by_id(ab, ts.peer_id); + if (unlikely(!peer || !peer->sta)) { + ath11k_dbg(ab, ATH11K_DBG_DATA, + "dp_tx: failed to find the peer with peer_id %d\n", +- ts->peer_id); ++ ts.peer_id); + spin_unlock_bh(&ab->base_lock); + ieee80211_free_txskb(ar->hw, msdu); + return; +@@ -753,44 +796,13 @@ static void ath11k_dp_tx_complete_msdu(s + ieee80211_tx_status_ext(ar->hw, &status); + } + +-static inline void ath11k_dp_tx_status_parse(struct ath11k_base *ab, +- struct hal_wbm_release_ring *desc, +- struct hal_tx_status *ts) +-{ +- ts->buf_rel_source = +- FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0); +- if (unlikely(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW && +- ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) +- return; +- +- if (unlikely(ts->buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) +- return; +- +- ts->status = FIELD_GET(HAL_WBM_RELEASE_INFO0_TQM_RELEASE_REASON, +- desc->info0); +- ts->ppdu_id = FIELD_GET(HAL_WBM_RELEASE_INFO1_TQM_STATUS_NUMBER, +- desc->info1); +- ts->try_cnt = FIELD_GET(HAL_WBM_RELEASE_INFO1_TRANSMIT_COUNT, +- desc->info1); +- ts->ack_rssi = FIELD_GET(HAL_WBM_RELEASE_INFO2_ACK_FRAME_RSSI, +- desc->info2); +- if (desc->info2 & HAL_WBM_RELEASE_INFO2_FIRST_MSDU) +- ts->flags |= HAL_TX_STATUS_FLAGS_FIRST_MSDU; +- ts->peer_id = FIELD_GET(HAL_WBM_RELEASE_INFO3_PEER_ID, desc->info3); +- ts->tid = FIELD_GET(HAL_WBM_RELEASE_INFO3_TID, desc->info3); +- if (desc->rate_stats.info0 & HAL_TX_RATE_STATS_INFO0_VALID) +- ts->rate_stats = desc->rate_stats.info0; +- else +- ts->rate_stats = 0; +-} +- + static inline bool ath11k_dp_tx_completion_valid(struct hal_wbm_release_ring *desc) + { + struct htt_tx_wbm_completion *status_desc; + + if (FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0) == + HAL_WBM_REL_SRC_MODULE_FW) { +- status_desc = ((u8 *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; ++ status_desc = ((struct htt_tx_wbm_completion *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; + + /* Dont consider HTT_TX_COMP_STATUS_MEC_NOTIFY */ + if (FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, status_desc->info0) == +@@ -807,9 +819,9 @@ void ath11k_dp_tx_completion_handler(str + int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id, count = 0, i = 0; + struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id]; + struct sk_buff *msdu; +- struct hal_tx_status ts = { 0 }; + struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; + int valid_entries; ++ enum hal_wbm_rel_src_module buf_rel_source; + u32 *desc; + u32 msdu_id, desc_id; + u8 mac_id; +@@ -829,7 +841,7 @@ void ath11k_dp_tx_completion_handler(str + ath11k_hal_srng_dst_invalidate_entry(ab, status_ring, valid_entries); + + while ((desc = ath11k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { +- if (!ath11k_dp_tx_completion_valid(desc)) ++ if (!ath11k_dp_tx_completion_valid((struct hal_wbm_release_ring *)desc)) + continue; + + memcpy(&tx_ring->tx_status[count], +@@ -849,14 +861,16 @@ void ath11k_dp_tx_completion_handler(str + + while (count--) { + tx_status = &tx_ring->tx_status[i++]; +- ath11k_dp_tx_status_parse(ab, tx_status, &ts); + + desc_id = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, + tx_status->buf_addr_info.info1); + mac_id = FIELD_GET(DP_TX_DESC_ID_MAC_ID, desc_id); + msdu_id = FIELD_GET(DP_TX_DESC_ID_MSDU_ID, desc_id); + +- if (unlikely(ts.buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) { ++ buf_rel_source = FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, ++ tx_status->info0); ++ ++ if (unlikely(buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) { + ath11k_dp_tx_process_htt_tx_complete(ab, + (void *)tx_status, + mac_id, msdu_id, +@@ -880,7 +894,7 @@ void ath11k_dp_tx_completion_handler(str + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) + wake_up(&ar->dp.tx_empty_waitq); + +- ath11k_dp_tx_complete_msdu(ar, msdu, &ts); ++ ath11k_dp_tx_complete_msdu(ar, msdu, tx_status, buf_rel_source); + } + } + diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch b/package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch new file mode 100644 index 00000000000000..7b87edb0ae6baa --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch @@ -0,0 +1,288 @@ +From 6cd8cb301e431860e71b8d3453846a9ed0efea81 Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Thu, 11 Nov 2021 10:38:26 +0530 +Subject: [PATCH] ath11k: use DECLARE_BITMAP for idr operations + +Use DECLARE_BITMAP for declaring bit map for idrs. And use APIs +find_first_zero_bit, set_bit and clear bit instead of idr_alloc +and idr_destroy. + +This helps in improving idle CPU and throughput. + +Signed-off-by: Venkateswara Naralasetty +--- + drivers/net/wireless/ath/ath11k/dp.c | 34 +++++++++++++----- + drivers/net/wireless/ath/ath11k/dp.h | 10 +++++- + drivers/net/wireless/ath/ath11k/dp_tx.c | 61 ++++++++++++++++++--------------- + 3 files changed, 69 insertions(+), 36 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -380,6 +380,8 @@ static void ath11k_dp_srng_common_cleanu + for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_data_ring); + ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_comp_ring); ++ kfree(dp->tx_ring[i].idr_pool); ++ dp->tx_ring[i].idr_pool = NULL; + } + ath11k_dp_srng_cleanup(ab, &dp->reo_reinject_ring); + ath11k_dp_srng_cleanup(ab, &dp->rx_rel_ring); +@@ -392,7 +394,7 @@ static int ath11k_dp_srng_common_setup(s + { + struct ath11k_dp *dp = &ab->dp; + struct hal_srng *srng; +- int i, ret; ++ int i, ret, j; + u8 tcl_num, wbm_num; + + ret = ath11k_dp_srng_setup(ab, &dp->wbm_desc_rel_ring, +@@ -451,6 +453,18 @@ static int ath11k_dp_srng_common_setup(s + ath11k_dp_shadow_init_timer(ab, &dp->tx_ring_timer[i], + ATH11K_SHADOW_DP_TIMER_INTERVAL, + dp->tx_ring[i].tcl_data_ring.ring_id); ++ ++ dp->tx_ring[i].idr_pool = kcalloc(DP_TX_IDR_SIZE, ++ sizeof(struct idr_entry), GFP_KERNEL); ++ if (!dp->tx_ring[i].idr_pool) { ++ ath11k_warn(ab, "failed to allocate memory for idr pool ring(%d)\n", i); ++ ret = -ENOMEM; ++ goto err; ++ } ++ ++ /* Reset id to default */ ++ for (j = 0; j < DP_TX_IDR_SIZE; j++) ++ dp->tx_ring[i].idr_pool[j].id = -1; + } + + ret = ath11k_dp_srng_setup(ab, &dp->reo_reinject_ring, HAL_REO_REINJECT, +@@ -1039,9 +1053,8 @@ void ath11k_dp_vdev_tx_attach(struct ath + ath11k_dp_update_vdev_search(arvif); + } + +-static int ath11k_dp_tx_pending_cleanup(int buf_id, void *skb, void *ctx) ++static int ath11k_dp_tx_pending_cleanup(struct ath11k_base *ab, void *skb) + { +- struct ath11k_base *ab = ctx; + struct sk_buff *msdu = skb; + + dma_unmap_single(ab->dev, ATH11K_SKB_CB(msdu)->paddr, msdu->len, +@@ -1056,23 +1069,30 @@ void ath11k_dp_free(struct ath11k_base * + { + struct ath11k_dp *dp = &ab->dp; + size_t size = 0; +- int i; ++ int i, j; + + size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE; + + ath11k_dp_link_desc_cleanup(ab, dp->link_desc_banks, + HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); + ++ for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { ++ struct dp_tx_ring *tx_ring = &dp->tx_ring[i]; ++ spin_lock_bh(&tx_ring->tx_idr_lock); ++ for(j = 0; j < DP_TX_IDR_SIZE; j++) { ++ ++ if (test_and_clear_bit(j, tx_ring->idrs)) ++ ath11k_dp_tx_pending_cleanup(ab, tx_ring->idr_pool[j].buf); ++ } ++ ++ spin_unlock_bh(&tx_ring->tx_idr_lock); ++ } ++ + ath11k_dp_srng_common_cleanup(ab); + + ath11k_dp_reo_cmd_list_cleanup(ab); + + for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { +- spin_lock_bh(&dp->tx_ring[i].tx_idr_lock); +- idr_for_each(&dp->tx_ring[i].txbuf_idr, +- ath11k_dp_tx_pending_cleanup, ab); +- idr_destroy(&dp->tx_ring[i].txbuf_idr); +- spin_unlock_bh(&dp->tx_ring[i].tx_idr_lock); + ATH11K_MEMORY_STATS_DEC(ab, malloc_size, size); + kfree(dp->tx_ring[i].tx_status); + } +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -8,6 +8,7 @@ + #define ATH11K_DP_H + + #include "hal_rx.h" ++#include "hw.h" + + #define MAX_RXDMA_PER_PDEV 2 + +@@ -78,6 +79,13 @@ struct dp_rxdma_ring { + + #define ATH11K_TX_COMPL_NEXT(x) (((x) + 1) % DP_TX_COMP_RING_SIZE) + ++struct idr_entry { ++ int id; ++ void *buf; ++}; ++ ++#define DP_TX_IDR_SIZE ATH11K_DP_TX_COMP_RING_SIZE ++ + struct dp_tx_ring { + u8 tcl_data_ring_id; + struct dp_srng tcl_data_ring; +@@ -88,6 +96,8 @@ struct dp_tx_ring { + struct hal_wbm_release_ring *tx_status; + int tx_status_head; + int tx_status_tail; ++ DECLARE_BITMAP(idrs, DP_TX_IDR_SIZE); ++ struct idr_entry *idr_pool; + }; + + enum dp_mon_status_buf_state { +@@ -207,7 +217,6 @@ struct ath11k_pdev_dp { + #define DP_TCL_DATA_RING_SIZE 512 + #define DP_TCL_DATA_RING_SIZE_WCN6750 2048 + #define DP_TX_COMP_RING_SIZE ATH11K_DP_TX_COMP_RING_SIZE +-#define DP_TX_IDR_SIZE DP_TX_COMP_RING_SIZE + #define DP_TX_COMP_MAX_ALLOWED DP_TX_COMP_RING_SIZE + #define DP_TCL_CMD_RING_SIZE 32 + #define DP_TCL_STATUS_RING_SIZE 32 +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -122,6 +122,7 @@ int ath11k_dp_tx(struct ath11k *ar, stru + u8 ring_map = 0; + bool tcl_ring_retry, is_diff_encap = false; + u8 align_pad, htt_meta_size = 0, max_tx_ring, tcl_ring_id, ring_id; ++ u32 idr; + + if (unlikely(!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && + !ieee80211_is_data(hdr->frame_control))) +@@ -152,24 +153,28 @@ tcl_ring_sel: + tx_ring = &dp->tx_ring[tcl_ring_id]; + + spin_lock_bh(&tx_ring->tx_idr_lock); +- ret = idr_alloc(&tx_ring->txbuf_idr, skb, 0, +- DP_TX_IDR_SIZE - 1, GFP_ATOMIC); +- spin_unlock_bh(&tx_ring->tx_idr_lock); +- +- if (unlikely(ret < 0)) { ++ idr = find_first_zero_bit(tx_ring->idrs, DP_TX_IDR_SIZE); ++ if (unlikely(idr >= DP_TX_IDR_SIZE)) { + if (ring_map == (BIT(max_tx_ring) - 1) || + !ab->hw_params.tcl_ring_retry) { ++ spin_unlock_bh(&tx_ring->tx_idr_lock); + ab->soc_stats.tx_err.idr_na[tcl_ring_id]++; + return -ENOSPC; + } + + /* Check if the next ring is available */ ++ spin_unlock_bh(&tx_ring->tx_idr_lock); + ring_selector++; + goto tcl_ring_sel; + } + ++ set_bit(idr, tx_ring->idrs); ++ tx_ring->idr_pool[idr].id = idr; ++ tx_ring->idr_pool[idr].buf = skb; ++ spin_unlock_bh(&tx_ring->tx_idr_lock); ++ + ti.desc_id = FIELD_PREP(DP_TX_DESC_ID_MAC_ID, ar->pdev_idx) | +- FIELD_PREP(DP_TX_DESC_ID_MSDU_ID, ret) | ++ FIELD_PREP(DP_TX_DESC_ID_MSDU_ID, idr) | + FIELD_PREP(DP_TX_DESC_ID_POOL_ID, pool_id); + ti.encap_type = ath11k_dp_tx_get_encap_type(arvif, skb); + +@@ -341,10 +346,9 @@ fail_unmap_dma: + fail_remove_idr: + if (ti.pkt_offset) + skb_pull(skb, ti.pkt_offset); +- spin_lock_bh(&tx_ring->tx_idr_lock); +- idr_remove(&tx_ring->txbuf_idr, +- FIELD_GET(DP_TX_DESC_ID_MSDU_ID, ti.desc_id)); +- spin_unlock_bh(&tx_ring->tx_idr_lock); ++ ++ tx_ring->idr_pool[idr].id = -1; ++ clear_bit(idr, tx_ring->idrs); + + if (tcl_ring_retry) + goto tcl_ring_sel; +@@ -353,16 +357,19 @@ fail_remove_idr: + } + + static void ath11k_dp_tx_free_txbuf(struct ath11k_base *ab, u8 mac_id, +- int msdu_id, ++ u32 msdu_id, + struct dp_tx_ring *tx_ring) + { + struct ath11k *ar; +- struct sk_buff *msdu; ++ struct sk_buff *msdu = NULL; + struct ath11k_skb_cb *skb_cb; + +- spin_lock(&tx_ring->tx_idr_lock); +- msdu = idr_remove(&tx_ring->txbuf_idr, msdu_id); +- spin_unlock(&tx_ring->tx_idr_lock); ++ if (msdu_id < DP_TX_IDR_SIZE && ++ tx_ring->idr_pool[msdu_id].id == msdu_id) { ++ msdu = tx_ring->idr_pool[msdu_id].buf; ++ tx_ring->idr_pool[msdu_id].id = -1; ++ clear_bit(msdu_id, tx_ring->idrs); ++ } + + if (unlikely(!msdu)) { + ath11k_warn(ab, "tx completion for unknown msdu_id %d\n", +@@ -386,16 +393,20 @@ ath11k_dp_tx_htt_tx_complete_buf(struct + struct ath11k_dp_htt_wbm_tx_status *ts) + { + struct ieee80211_tx_status status = { 0 }; +- struct sk_buff *msdu; ++ struct sk_buff *msdu = NULL; + struct ieee80211_tx_info *info; + struct ath11k_skb_cb *skb_cb; + struct ath11k *ar; + struct ath11k_peer *peer; ++ u32 msdu_id = ts->msdu_id; + u8 flags = 0; + +- spin_lock(&tx_ring->tx_idr_lock); +- msdu = idr_remove(&tx_ring->txbuf_idr, ts->msdu_id); +- spin_unlock(&tx_ring->tx_idr_lock); ++ if (msdu_id < DP_TX_IDR_SIZE && ++ tx_ring->idr_pool[msdu_id].id == msdu_id) { ++ msdu = tx_ring->idr_pool[msdu_id].buf; ++ tx_ring->idr_pool[msdu_id].id = -1; ++ clear_bit(msdu_id, tx_ring->idrs); ++ } + + if (unlikely(!msdu)) { + ath11k_warn(ab, "htt tx completion for unknown msdu_id %d\n", +@@ -860,6 +871,7 @@ void ath11k_dp_tx_completion_handler(str + } + + while (count--) { ++ msdu=NULL; + tx_status = &tx_ring->tx_status[i++]; + + desc_id = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, +@@ -878,17 +890,19 @@ void ath11k_dp_tx_completion_handler(str + continue; + } + +- spin_lock(&tx_ring->tx_idr_lock); +- msdu = idr_remove(&tx_ring->txbuf_idr, msdu_id); ++ if (msdu_id < DP_TX_IDR_SIZE && ++ tx_ring->idr_pool[msdu_id].id == msdu_id) { ++ msdu = tx_ring->idr_pool[msdu_id].buf; ++ tx_ring->idr_pool[msdu_id].id = -1; ++ clear_bit(msdu_id, tx_ring->idrs); ++ } ++ + if (unlikely(!msdu)) { + ath11k_warn(ab, "tx completion for unknown msdu_id %d\n", + msdu_id); +- spin_unlock(&tx_ring->tx_idr_lock); + continue; + } + +- spin_unlock(&tx_ring->tx_idr_lock); +- + ar = ab->pdevs[mac_id].ar; + + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch new file mode 100644 index 00000000000000..c61c206c417de7 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch @@ -0,0 +1,185 @@ +From 9600bc899bd28386375f5b5902a33f1984ce9da8 Mon Sep 17 00:00:00 2001 +From: Venkateswara Naralasetty +Date: Thu, 18 Nov 2021 13:11:02 +0530 +Subject: [PATCH] ath11k: add simple tx handler for AP mode + +Add simple tx handler for AP mode to skip cheks which are not +applicable for AP mode. + +Signed-off-by: Venkateswara Naralasetty +--- + drivers/net/wireless/ath/ath11k/dp_tx.c | 123 +++++++++++++++++++++++++++++ + drivers/net/wireless/ath/ath11k/dp_tx.h | 2 + + drivers/net/wireless/ath/ath11k/hal_desc.h | 6 ++ + drivers/net/wireless/ath/ath11k/mac.c | 3 + + 4 files changed, 134 insertions(+) + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -103,6 +103,128 @@ static int ath11k_dp_prepare_htt_metadat + return 0; + } + ++int ath11k_dp_tx_simple(struct ath11k *ar, struct ath11k_vif *arvif, ++ struct sk_buff *skb, struct ath11k_sta *arsta) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_dp *dp = &ab->dp; ++ struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb); ++ struct hal_srng *tcl_ring; ++ struct dp_tx_ring *tx_ring; ++ struct hal_tcl_data_cmd *tcl_desc; ++ void *hal_tcl_desc; ++ dma_addr_t paddr; ++ u8 pool_id; ++ u8 hal_ring_id; ++ int ret; ++ u32 idr; ++ u8 tcl_ring_id, ring_id, max_tx_ring; ++ u8 buf_id; ++ u32 desc_id; ++ u8 ring_selector; ++ ++ max_tx_ring = ab->hw_params.max_tx_ring; ++ ++ if (unlikely(atomic_read(&ab->num_max_allowed) > DP_TX_COMP_MAX_ALLOWED)) { ++ atomic_inc(&ab->soc_stats.tx_err.max_fail); ++ ret = -EINVAL; ++ } ++ ++ ring_selector = smp_processor_id(); ++ pool_id = ring_selector; ++ ++ if (max_tx_ring == 1) { ++ ring_id = 0; ++ tcl_ring_id = 0; ++ } else { ++ ring_id = ring_selector % max_tx_ring; ++ tcl_ring_id = (ring_id == DP_TCL_NUM_RING_MAX) ? ++ DP_TCL_NUM_RING_MAX - 1 : ring_id; ++ } ++ ++ buf_id = tcl_ring_id + HAL_RX_BUF_RBM_SW0_BM; ++ tx_ring = &dp->tx_ring[tcl_ring_id]; ++ ++ spin_lock_bh(&tx_ring->tx_idr_lock); ++ idr = find_first_zero_bit(tx_ring->idrs, DP_TX_IDR_SIZE); ++ if (unlikely(idr >= DP_TX_IDR_SIZE)) { ++ spin_unlock_bh(&tx_ring->tx_idr_lock); ++ return -ENOSPC; ++ } ++ ++ set_bit(idr, tx_ring->idrs); ++ tx_ring->idr_pool[idr].id = idr; ++ tx_ring->idr_pool[idr].buf = skb; ++ spin_unlock_bh(&tx_ring->tx_idr_lock); ++ ++ desc_id = FIELD_PREP(DP_TX_DESC_ID_MAC_ID, ar->pdev_idx) | ++ FIELD_PREP(DP_TX_DESC_ID_MSDU_ID, idr) | ++ FIELD_PREP(DP_TX_DESC_ID_POOL_ID, pool_id); ++ ++ skb_cb->vif = arvif->vif; ++ skb_cb->ar = ar; ++ ++ paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); ++ if (unlikely(dma_mapping_error(ab->dev, paddr))) { ++ atomic_inc(&ab->soc_stats.tx_err.misc_fail); ++ ath11k_warn(ab, "failed to DMA map data Tx buffer\n"); ++ ret = -ENOMEM; ++ goto fail_remove_idr; ++ } ++ ++ skb_cb->paddr = paddr; ++ ++ hal_ring_id = tx_ring->tcl_data_ring.ring_id; ++ tcl_ring = &ab->hal.srng_list[hal_ring_id]; ++ ++ spin_lock_bh(&tcl_ring->lock); ++ ath11k_hal_srng_access_begin(ab, tcl_ring); ++ ++ hal_tcl_desc = (void *)ath11k_hal_srng_src_get_next_entry(ab, tcl_ring); ++ if (unlikely(!hal_tcl_desc)) { ++ ath11k_hal_srng_access_end(ab, tcl_ring); ++ spin_unlock_bh(&tcl_ring->lock); ++ ab->soc_stats.tx_err.desc_na[tcl_ring_id]++; ++ ret = -ENOMEM; ++ goto fail_remove_idr; ++ } ++ ++ tcl_desc = (struct hal_tcl_data_cmd *)(hal_tcl_desc + sizeof(struct hal_tlv_hdr)); ++ tcl_desc->info3 = 0; ++ tcl_desc->info4 = 0; ++ ++ tcl_desc->buf_addr_info.info0 = FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, paddr); ++ tcl_desc->buf_addr_info.info1 = FIELD_PREP(BUFFER_ADDR_INFO1_ADDR, ++ ((uint64_t)paddr >> HAL_ADDR_MSB_REG_SHIFT)); ++ tcl_desc->buf_addr_info.info1 |= FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, buf_id) | ++ FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, desc_id); ++ tcl_desc->info0 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_SEARCH_TYPE, ++ arvif->search_type) | ++ FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE, HAL_TCL_ENCAP_TYPE_ETHERNET) | ++ FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ADDR_EN, arvif->hal_addr_search_flags) | ++ FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_CMD_NUM, arvif->tcl_metadata); ++ ++ tcl_desc->info1 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_DATA_LEN, skb->len); ++ ++ if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) ++ tcl_desc->info1 |= TX_IP_CHECKSUM; ++ ++ tcl_desc->info2 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ar->lmac_id); ++ ++ ath11k_hal_srng_access_end(ab, tcl_ring); ++ spin_unlock_bh(&tcl_ring->lock); ++ ++ atomic_inc(&ar->dp.num_tx_pending); ++ atomic_inc(&ab->num_max_allowed); ++ ++ return 0; ++ ++fail_remove_idr: ++ tx_ring->idr_pool[idr].id = -1; ++ clear_bit(idr, tx_ring->idrs); ++ return ret; ++} ++ + int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, + struct ath11k_sta *arsta, struct sk_buff *skb) + { +--- a/drivers/net/wireless/ath/ath11k/dp_tx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.h +@@ -218,6 +218,8 @@ void ath11k_dp_tx_update_txcompl(struct + int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab); + int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, + struct ath11k_sta *arsta, struct sk_buff *skb); ++int ath11k_dp_tx_simple(struct ath11k *ar, struct ath11k_vif *arvif, ++ struct sk_buff *skb, struct ath11k_sta *arsta); + void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id); + int ath11k_dp_tx_send_reo_cmd(struct ath11k_base *ab, struct dp_rx_tid *rx_tid, + enum hal_reo_cmd_type type, +--- a/drivers/net/wireless/ath/ath11k/hal_desc.h ++++ b/drivers/net/wireless/ath/ath11k/hal_desc.h +@@ -952,6 +952,12 @@ struct hal_reo_flush_cache { + u32 rsvd0[6]; + } __packed; + ++#define TX_IP_CHECKSUM HAL_TCL_DATA_CMD_INFO1_IP4_CKSUM_EN | \ ++ HAL_TCL_DATA_CMD_INFO1_UDP4_CKSUM_EN | \ ++ HAL_TCL_DATA_CMD_INFO1_UDP6_CKSUM_EN | \ ++ HAL_TCL_DATA_CMD_INFO1_TCP4_CKSUM_EN | \ ++ HAL_TCL_DATA_CMD_INFO1_TCP6_CKSUM_EN ++ + #define HAL_TCL_DATA_CMD_INFO0_DESC_TYPE BIT(0) + #define HAL_TCL_DATA_CMD_INFO0_EPD BIT(1) + #define HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE GENMASK(3, 2) +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6733,6 +6733,9 @@ static void ath11k_mac_op_tx(struct ieee + + if (ar->ab->nss.enabled) + ret = ath11k_nss_tx(arvif, skb); ++ else if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP && 0) ++ ret = ath11k_dp_tx_simple(ar, arvif, skb, ++ (control->sta) ? (struct ath11k_sta *)control->sta->drv_priv : NULL); + else + ret = ath11k_dp_tx(ar, arvif, arsta, skb); + diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch b/package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch new file mode 100644 index 00000000000000..ffae27277d7316 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch @@ -0,0 +1,71 @@ +From: Karthikeyan Periyasamy +Subject: [patch] ath11k: fix NULL pointer crash due to the radio ops + +Mac80211 callback ops variable not intialised in the radio structure. +when the firmware not advertise the WMI_TLV_SERVICE_PEER_TID_CONFIGS_SUPPORT +in the service bitmmap, driver try to set set_tid_config ops as NULL. +Since ar->ops already NULL, it leads to NULL pointer access crash. +So fix this crash by properly intialise the mac80211 callback ops +in the radio structure. + +Tested-on: QCN6122 hw1.0 WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 + +Signed-off-by: Karthikeyan Periyasamy +--- + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -10558,6 +10558,7 @@ int ath11k_mac_allocate(struct ath11k_ba + struct ieee80211_hw *hw; + struct ath11k *ar; + struct ath11k_pdev *pdev; ++ struct ieee80211_ops *ops; + int ret; + int i; + +@@ -10565,17 +10566,25 @@ int ath11k_mac_allocate(struct ath11k_ba + return 0; + + for (i = 0; i < ab->num_radios; i++) { ++ ops = kmemdup(&ath11k_ops, sizeof(ath11k_ops), GFP_KERNEL); ++ if (!ops) { ++ ret = -ENOMEM; ++ goto err_free_mac; ++ } ++ + pdev = &ab->pdevs[i]; +- hw = ieee80211_alloc_hw(sizeof(struct ath11k), &ath11k_ops); ++ hw = ieee80211_alloc_hw(sizeof(struct ath11k), ops); + if (!hw) { + ath11k_warn(ab, "failed to allocate mac80211 hw device\n"); + ret = -ENOMEM; ++ kfree(ops); + goto err_free_mac; + } + + ar = hw->priv; + ar->hw = hw; + ar->ab = ab; ++ ar->ops = ops; + ar->pdev = pdev; + ar->pdev_idx = i; + ar->lmac_id = ath11k_hw_get_mac_from_pdev_id(&ab->hw_params, i); +@@ -10636,6 +10645,7 @@ void ath11k_mac_destroy(struct ath11k_ba + { + struct ath11k *ar; + struct ath11k_pdev *pdev; ++ struct ieee80211_ops *ops; + int i; + + for (i = 0; i < ab->num_radios; i++) { +@@ -10644,8 +10654,9 @@ void ath11k_mac_destroy(struct ath11k_ba + if (!ar) + continue; + +- ath11k_fw_stats_free(&ar->fw_stats); ++ ops = ar->ops; + ieee80211_free_hw(ar->hw); ++ kfree(ops); + pdev->ar = NULL; + } + } diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch b/package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch new file mode 100644 index 00000000000000..90f335efbca6fb --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch @@ -0,0 +1,384 @@ +From 17d1895bad45ec2ef4c8c430ac0fbaff2ff1cf39 Mon Sep 17 00:00:00 2001 +From: Manish Dharanenthiran +Date: Tue, 18 Apr 2023 15:01:42 +0530 +Subject: [PATCH 2/3] CHROMIUM: ath11k: Add retry mechanism for update_rx_queue + reo cmd + +While reo_cmd ring is full, peer delete update rx queue +will be failed as there is no space to send the command +in ring. During the failure scenario, host will do +dma_unmap and free the allocated address but the HW +still have that particular vaddr. So, on next alloc +cycle kernel will allocated the freed addr but HW will +still have the address. This will result in memory +corruption as the host will try to access/write that +memory which is already in-use. + +To avoid this corruption, added new retry mechanism +for HAL_REO_CMD_UPDATE_RX_QUEUE by adding new list to +dp struct and protecting with new lock for access. +This avoids the host free in failure case and will +be freed only when HW freed that particular vaddr. + +Also, updated below changes +1) reo_flush command for sending 1K desc in one +command instead of sending 11 command for single +TID. + +2) Set FWD_MPDU and valid bit flag so that reo +flush will happen soon instead of waiting to +flush the queue. + +Signed-off-by: Manish Dharanenthiran +Signed-off-by: Tamizh Chelvam Raja +--- + drivers/net/wireless/ath/ath11k/core.h | 3 + + drivers/net/wireless/ath/ath11k/debugfs.c | 12 ++ + drivers/net/wireless/ath/ath11k/dp.c | 2 + + drivers/net/wireless/ath/ath11k/dp.h | 15 ++ + drivers/net/wireless/ath/ath11k/dp_rx.c | 167 +++++++++++++++++----- + 5 files changed, 161 insertions(+), 38 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -936,6 +936,9 @@ struct ath11k_soc_dp_stats { + u32 rxdma_error[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX]; + u32 reo_error[HAL_REO_DEST_RING_ERROR_CODE_MAX]; + u32 hal_reo_error[DP_REO_DST_RING_MAX]; ++ u32 hal_reo_cmd_drain; ++ u32 reo_cmd_cache_error; ++ u32 reo_cmd_update_rx_queue_error; + struct ath11k_soc_dp_tx_err_stats tx_err; + struct ath11k_dp_ring_bp_stats bp_stats; + }; +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -851,6 +851,18 @@ static ssize_t ath11k_debugfs_dump_soc_d + "\nNSS Transmit Failures: %d\n", + atomic_read(&soc_stats->tx_err.nss_tx_fail)); + ++ len += scnprintf(buf + len, size - len, ++ "\nHAL_REO_CMD_DRAIN Counter: %u\n", ++ soc_stats->hal_reo_cmd_drain); ++ ++ len += scnprintf(buf + len, size - len, ++ "\nREO_CMD_CACHE_FLUSH Failure: %u\n", ++ soc_stats->reo_cmd_cache_error); ++ ++ len += scnprintf(buf + len, size - len, ++ "\nREO_CMD_UPDATE_RX_QUEUE Failure: %u\n", ++ soc_stats->reo_cmd_update_rx_queue_error); ++ + len += ath11k_debugfs_dump_soc_ring_bp_stats(ab, buf + len, size - len); + + if (len > size) +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -1113,8 +1113,10 @@ int ath11k_dp_alloc(struct ath11k_base * + + INIT_LIST_HEAD(&dp->reo_cmd_list); + INIT_LIST_HEAD(&dp->reo_cmd_cache_flush_list); ++ INIT_LIST_HEAD(&dp->reo_cmd_update_rx_queue_list); + INIT_LIST_HEAD(&dp->dp_full_mon_mpdu_list); + spin_lock_init(&dp->reo_cmd_lock); ++ spin_lock_init(&dp->reo_cmd_update_queue_lock); + + dp->reo_cmd_cache_flush_count = 0; + +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -24,6 +24,7 @@ struct dp_rx_tid { + u32 *vaddr; + dma_addr_t paddr; + u32 size; ++ u32 pending_desc_size; + u32 ba_win_sz; + bool active; + +@@ -51,6 +52,14 @@ struct dp_reo_cache_flush_elem { + unsigned long ts; + }; + ++struct dp_reo_update_rx_queue_elem { ++ struct list_head list; ++ struct dp_rx_tid data; ++ int peer_id; ++ u8 tid; ++ bool reo_cmd_update_rx_queue_resend_flag; ++}; ++ + struct dp_reo_cmd { + struct list_head list; + struct dp_rx_tid data; +@@ -296,6 +305,12 @@ struct ath11k_dp { + * - reo_cmd_cache_flush_count + */ + spinlock_t reo_cmd_lock; ++ struct list_head reo_cmd_update_rx_queue_list; ++ /** ++ * protects access to below field, ++ * - reo_cmd_update_rx_queue_list ++ */ ++ spinlock_t reo_cmd_update_queue_lock; + struct ath11k_hp_update_timer reo_cmd_timer; + struct ath11k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX]; + }; +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -21,6 +21,9 @@ + + #define ATH11K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ) + ++static void ath11k_dp_rx_tid_del_func(struct ath11k_dp *dp, void *ctx, ++ enum hal_reo_cmd_status status); ++ + static inline + u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc) + { +@@ -707,13 +710,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( + return 0; + } + ++static int ath11k_peer_rx_tid_delete_handler(struct ath11k_base *ab, ++ struct dp_rx_tid *rx_tid, u8 tid) ++{ ++ struct ath11k_hal_reo_cmd cmd = {0}; ++ struct ath11k_dp *dp = &ab->dp; ++ ++ lockdep_assert_held(&dp->reo_cmd_update_queue_lock); ++ ++ rx_tid->active = false; ++ cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS; ++ cmd.addr_lo = lower_32_bits(rx_tid->paddr); ++ cmd.addr_hi = upper_32_bits(rx_tid->paddr); ++ cmd.upd0 |= HAL_REO_CMD_UPD0_VLD; ++ ++ return ath11k_dp_tx_send_reo_cmd(ab, rx_tid, ++ HAL_REO_CMD_UPDATE_RX_QUEUE, ++ &cmd, ++ ath11k_dp_rx_tid_del_func); ++} ++ + void ath11k_dp_reo_cmd_list_cleanup(struct ath11k_base *ab) + { + struct ath11k_dp *dp = &ab->dp; + struct dp_reo_cmd *cmd, *tmp; + struct dp_reo_cache_flush_elem *cmd_cache, *tmp_cache; ++ struct dp_reo_update_rx_queue_elem *cmd_queue, *tmp_queue; + struct dp_rx_tid *rx_tid; + ++ spin_lock_bh(&dp->reo_cmd_update_queue_lock); ++ list_for_each_entry_safe(cmd_queue, tmp_queue, ++ &dp->reo_cmd_update_rx_queue_list, ++ list) { ++ list_del(&cmd_queue->list); ++ rx_tid = &cmd_queue->data; ++ if (rx_tid->vaddr) { ++ dma_unmap_single(ab->dev, rx_tid->paddr, ++ rx_tid->size, DMA_BIDIRECTIONAL); ++ kfree(rx_tid->vaddr); ++ rx_tid->vaddr = NULL; ++ } ++ kfree(cmd_queue); ++ } ++ spin_unlock_bh(&dp->reo_cmd_update_queue_lock); ++ + spin_lock_bh(&dp->reo_cmd_lock); + list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { + list_del(&cmd->list); +@@ -759,14 +799,18 @@ static void ath11k_dp_reo_cmd_free(struc + } + } + +-static void ath11k_dp_reo_cache_flush(struct ath11k_base *ab, ++static int ath11k_dp_reo_cache_flush(struct ath11k_base *ab, + struct dp_rx_tid *rx_tid) + { + struct ath11k_hal_reo_cmd cmd = {0}; + unsigned long tot_desc_sz, desc_sz; + int ret; + +- tot_desc_sz = rx_tid->size; ++ if (rx_tid->pending_desc_size) ++ tot_desc_sz = rx_tid->pending_desc_size; ++ else ++ tot_desc_sz = rx_tid->size; ++ + desc_sz = ath11k_hal_reo_qdesc_size(0, HAL_DESC_REO_NON_QOS_TID); + + while (tot_desc_sz > desc_sz) { +@@ -777,11 +821,17 @@ static void ath11k_dp_reo_cache_flush(st + HAL_REO_CMD_FLUSH_CACHE, &cmd, + NULL); + if (ret) +- ath11k_warn(ab, +- "failed to send HAL_REO_CMD_FLUSH_CACHE, tid %d (%d)\n", +- rx_tid->tid, ret); ++ rx_tid->pending_desc_size = tot_desc_sz + desc_sz; ++ ++ /* If this fails with ring full condition, then ++ * no need to retry below as it is expected to ++ * fail within short time ++ */ ++ if (ret == -ENOBUFS) ++ goto exit; + } + ++ rx_tid->pending_desc_size = desc_sz; + memset(&cmd, 0, sizeof(cmd)); + cmd.addr_lo = lower_32_bits(rx_tid->paddr); + cmd.addr_hi = upper_32_bits(rx_tid->paddr); +@@ -789,24 +839,21 @@ static void ath11k_dp_reo_cache_flush(st + ret = ath11k_dp_tx_send_reo_cmd(ab, rx_tid, + HAL_REO_CMD_FLUSH_CACHE, + &cmd, ath11k_dp_reo_cmd_free); +- if (ret) { +- ath11k_err(ab, "failed to send HAL_REO_CMD_FLUSH_CACHE cmd, tid %d (%d)\n", +- rx_tid->tid, ret); +- dma_unmap_single(ab->dev, rx_tid->paddr, rx_tid->size, +- DMA_BIDIRECTIONAL); +- kfree(rx_tid->vaddr); +- rx_tid->vaddr = NULL; +- } ++ ++exit: ++ return ret; + } + + static void ath11k_dp_rx_tid_del_func(struct ath11k_dp *dp, void *ctx, + enum hal_reo_cmd_status status) + { + struct ath11k_base *ab = dp->ab; +- struct dp_rx_tid *rx_tid = ctx; ++ struct dp_rx_tid *rx_tid = ctx, *update_rx_tid; + struct dp_reo_cache_flush_elem *elem, *tmp; ++ struct dp_reo_update_rx_queue_elem *qelem, *qtmp; + + if (status == HAL_REO_CMD_DRAIN) { ++ ab->soc_stats.hal_reo_cmd_drain++; + goto free_desc; + } else if (status != HAL_REO_CMD_SUCCESS) { + /* Shouldn't happen! Cleanup in case of other failure? */ +@@ -815,6 +862,29 @@ static void ath11k_dp_rx_tid_del_func(st + return; + } + ++ /* Check if there is any pending rx_queue, if yes then update it */ ++ spin_lock_bh(&dp->reo_cmd_update_queue_lock); ++ list_for_each_entry_safe(qelem, qtmp, &dp->reo_cmd_update_rx_queue_list, ++ list) { ++ if (qelem->reo_cmd_update_rx_queue_resend_flag && ++ qelem->data.active) { ++ update_rx_tid = &qelem->data; ++ ++ if (ath11k_peer_rx_tid_delete_handler(ab, update_rx_tid, qelem->tid)) { ++ update_rx_tid->active = true; ++ break; ++ } ++ update_rx_tid->vaddr = NULL; ++ update_rx_tid->paddr = 0; ++ update_rx_tid->size = 0; ++ update_rx_tid->pending_desc_size = 0; ++ ++ list_del(&qelem->list); ++ kfree(qelem); ++ } ++ } ++ spin_unlock_bh(&dp->reo_cmd_update_queue_lock); ++ + elem = kzalloc(sizeof(*elem), GFP_ATOMIC); + if (!elem) + goto free_desc; +@@ -832,13 +902,20 @@ static void ath11k_dp_rx_tid_del_func(st + if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || + time_after(jiffies, elem->ts + + msecs_to_jiffies(DP_REO_DESC_FREE_TIMEOUT_MS))) { ++ spin_unlock_bh(&dp->reo_cmd_lock); ++ if (ath11k_dp_reo_cache_flush(ab, &elem->data)) { ++ ab->soc_stats.reo_cmd_cache_error++; ++ /* In failure case, just update the timestamp ++ * for flush cache elem and continue ++ */ ++ spin_lock_bh(&dp->reo_cmd_lock); ++ elem->ts = jiffies; ++ break; ++ } ++ spin_lock_bh(&dp->reo_cmd_lock); + list_del(&elem->list); + dp->reo_cmd_cache_flush_count--; +- spin_unlock_bh(&dp->reo_cmd_lock); +- +- ath11k_dp_reo_cache_flush(ab, &elem->data); + kfree(elem); +- spin_lock_bh(&dp->reo_cmd_lock); + } + } + spin_unlock_bh(&dp->reo_cmd_lock); +@@ -854,34 +931,48 @@ free_desc: + void ath11k_peer_rx_tid_delete(struct ath11k *ar, + struct ath11k_peer *peer, u8 tid) + { +- struct ath11k_hal_reo_cmd cmd = {0}; + struct dp_rx_tid *rx_tid = &peer->rx_tid[tid]; +- int ret; ++ struct dp_reo_update_rx_queue_elem *elem, *tmp; ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_dp *dp = &ab->dp; + + if (!rx_tid->active) + return; + +- rx_tid->active = false; ++ elem = kzalloc(sizeof(*elem), GFP_ATOMIC); ++ if (!elem) { ++ ath11k_warn(ar->ab, "failed to alloc reo_update_rx_queue_elem, rx tid %d\n", ++ rx_tid->tid); ++ return; ++ } ++ elem->reo_cmd_update_rx_queue_resend_flag = false; ++ elem->peer_id = peer->peer_id; ++ elem->tid = tid; ++ memcpy(&elem->data, rx_tid, sizeof(*rx_tid)); ++ spin_lock_bh(&dp->reo_cmd_update_queue_lock); ++ list_add_tail(&elem->list, &dp->reo_cmd_update_rx_queue_list); + +- cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS; +- cmd.addr_lo = lower_32_bits(rx_tid->paddr); +- cmd.addr_hi = upper_32_bits(rx_tid->paddr); +- cmd.upd0 |= HAL_REO_CMD_UPD0_VLD; +- ret = ath11k_dp_tx_send_reo_cmd(ar->ab, rx_tid, +- HAL_REO_CMD_UPDATE_RX_QUEUE, &cmd, +- ath11k_dp_rx_tid_del_func); +- if (ret) { +- if (ret != -ESHUTDOWN) +- ath11k_err(ar->ab, "failed to send HAL_REO_CMD_UPDATE_RX_QUEUE cmd, tid %d (%d)\n", +- tid, ret); +- dma_unmap_single(ar->ab->dev, rx_tid->paddr, rx_tid->size, +- DMA_BIDIRECTIONAL); +- kfree(rx_tid->vaddr); ++ list_for_each_entry_safe(elem, tmp, &dp->reo_cmd_update_rx_queue_list, ++ list) { ++ rx_tid = &elem->data; ++ ++ if (ath11k_peer_rx_tid_delete_handler(ab, rx_tid, elem->tid)) { ++ rx_tid->active = true; ++ ab->soc_stats.reo_cmd_update_rx_queue_error++; ++ elem->reo_cmd_update_rx_queue_resend_flag = true; ++ break; ++ } + rx_tid->vaddr = NULL; ++ rx_tid->paddr = 0; ++ rx_tid->size = 0; ++ rx_tid->pending_desc_size = 0; ++ ++ list_del(&elem->list); ++ kfree(elem); + } ++ spin_unlock_bh(&dp->reo_cmd_update_queue_lock); + +- rx_tid->paddr = 0; +- rx_tid->size = 0; ++ return; + } + + static int ath11k_dp_rx_link_desc_return(struct ath11k_base *ab, diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch b/package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch new file mode 100644 index 00000000000000..a1b885c8b50e5a --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch @@ -0,0 +1,52 @@ +From 516c1d2faf4480c355ec5000d6d4ad4fc287d0e8 Mon Sep 17 00:00:00 2001 +From: Aditya Kumar Singh +Date: Thu, 30 Dec 2021 17:44:40 +0530 +Subject: [PATCH] ath11k: fix support for ext vdev in NSS for AP_VLAN vif + during recovery + +When driver is recovering, it tears down nss connection and sets +ab->nss.enabled as false. However, this is not set back to its original +state post recovery and hence when ext vdev is added again, warning +trace appears since ath11k_mac_op_add_interface() does not handle +NL80211_IFTYPE_AP_VLAN vif with nss disabled and throws a WARN_ON(1). + +[ 2777.201255] ------------[ cut here ]------------ +[ 2777.209669] WARNING: CPU: 0 PID: 77 at drivers/net/wireless/ath/ath11k/mac.c:7298 ath11k_mac_op_add_interface+0x314/0xa98 [ath11k] +[----- Trimmed -----] +[ 2777.499054] CPU: 0 PID: 77 Comm: kworker/0:2 Tainted: G W 5.4.89 #0 +[ 2777.515132] Hardware name: Generic DT based system +[ 2777.522658] Workqueue: events_freezable ieee80211_restart_work [mac80211] +[ 2777.527305] [<8030f3a4>] (unwind_backtrace) from [<8030b700>] (show_stack+0x10/0x14) +[ 2777.534153] [<8030b700>] (show_stack) from [<808da410>] (dump_stack+0x88/0xa8) +[ 2777.541964] [<808da410>] (dump_stack) from [<8031bf20>] (__warn+0xa4/0xd0) +[ 2777.548994] [<8031bf20>] (__warn) from [<8031bfbc>] (warn_slowpath_fmt+0x70/0x9c) +[ 2777.555972] [<8031bfbc>] (warn_slowpath_fmt) from [] (ath11k_mac_op_add_interface+0x314/0xa98 [ath11k]) +[ 2777.563664] [] (ath11k_mac_op_add_interface [ath11k]) from [<7fd34720>] (drv_add_interface+0x68/0x78 [mac80211]) +[ 2777.573928] [<7fd34720>] (drv_add_interface [mac80211]) from [<7fd679bc>] (ieee80211_reconfig+0x240/0xce8 [mac80211]) +[ 2777.584843] [<7fd679bc>] (ieee80211_reconfig [mac80211]) from [<7fd311ec>] (ieee80211_restart_work+0xd4/0xf4 [mac80211]) +[ 2777.595401] [<7fd311ec>] (ieee80211_restart_work [mac80211]) from [<80331968>] (process_one_work+0x1dc/0x310) +[ 2777.606205] [<80331968>] (process_one_work) from [<80332cf8>] (worker_thread+0x2bc/0x40c) +[ 2777.616009] [<80332cf8>] (worker_thread) from [<803373ac>] (kthread+0x164/0x180) +[ 2777.624167] [<803373ac>] (kthread) from [<803010e0>] (ret_from_fork+0x14/0x34) + +Added logic to enable nss as per MODULE_PARM_DESC parameter. + +Signed-off-by: Aditya Kumar Singh +--- + drivers/net/wireless/ath/ath11k/core.c | 5 +++++ + 1 file changed, 5 insertions(+) + +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -2010,6 +2010,11 @@ static int ath11k_core_reconfigure_on_cr + + clear_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags); + ++ /* We have disabled NSS Offload support in the starting. ++ * Re-enabling it if it was originally enabled in the MODULE_PARM_DESC. ++ */ ++ ab->nss.enabled = nss_offload; ++ + ret = ath11k_core_qmi_firmware_ready(ab); + if (ret) + goto err_hal_srng_deinit; diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch b/package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch new file mode 100644 index 00000000000000..e8ac589acfc8ec --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch @@ -0,0 +1,74 @@ +From 0ab84604de1db0f589f7303507f38148ba8f3f04 Mon Sep 17 00:00:00 2001 +From: Nagarajan Maran +Date: Tue, 28 Jun 2022 11:31:50 +0530 +Subject: [PATCH] ath11k: Ignore frags from uninitialized peer in dp + +In certain scenario, fragmented packet is received for self peer, +for which rx_tid and rx_frags are not initialized in datapath. +While handling this fragment, crash is observed as the +rx_frag list is uninitialised and when we walk in +ath11k_dp_rx_h_sort_frags, skb null leads to exception. + +To address this, before processing received fragments we +check dp_setup_done flag is set to ensure that peer +has completed its dp peer setup for fragment queue, +else ignore processing the fragments. + +Also, __fls would have an undefined behavior if the argument +is passed as "0". Hence, added changes to handle the same. + +Below is the call trace of the crash: + + CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.164 #0 + Hardware name: Qualcomm Technologies, Inc. IPQ6018/AP-CP01-C1 (DT) + pstate: a0400005 (NzCv daif +PAN -UAO) + pc : ath11k_dp_process_rx_err+0x550/0x1084 [ath11k] + lr : ath11k_dp_process_rx_err+0x4e0/0x1084 [ath11k] + + Call trace: + ath11k_dp_process_rx_err+0x550/0x1084 [ath11k] + ath11k_dp_service_srng+0x70/0x370 [ath11k] + 0xffffffc009693a04 + __napi_poll+0x30/0xa4 + net_rx_action+0x118/0x270 + __do_softirq+0x10c/0x244 + irq_exit+0x64/0xb4 + __handle_domain_irq+0x88/0xac + gic_handle_irq+0x74/0xbc + el1_irq+0xf0/0x1c0 + arch_cpu_idle+0x10/0x18 + do_idle+0x104/0x248 + cpu_startup_entry+0x20/0x64 + rest_init+0xd0/0xdc + arch_call_rest_init+0xc/0x14 + start_kernel+0x480/0x4b8 + Code: f9400281 f94066a2 91405021 b94a0023 (f9406401) + +Signed-off-by: Harshitha Prem +Signed-off-by: Nagarajan Maran +--- + drivers/net/wireless/ath/ath11k/dp.c | 3 ++- + drivers/net/wireless/ath/ath11k/dp_rx.c | 11 ++++++++++- + drivers/net/wireless/ath/ath11k/peer.h | 2 ++ + 3 files changed, 14 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -38,6 +38,7 @@ void ath11k_dp_peer_cleanup(struct ath11 + ath11k_peer_rx_tid_cleanup(ar, peer); + peer->dp_setup_done = false; + crypto_free_shash(peer->tfm_mmic); ++ peer->dp_setup_done = false; + spin_unlock_bh(&ab->base_lock); + } + +--- a/drivers/net/wireless/ath/ath11k/peer.h ++++ b/drivers/net/wireless/ath/ath11k/peer.h +@@ -93,6 +93,7 @@ struct ath11k_peer { + u16 sec_type; + u16 sec_type_grp; + bool is_authorized; ++ /* Peer's datapath set flag */ + bool dp_setup_done; + struct ppdu_user_delayba ppdu_stats_delayba; + bool delayba_flag; diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch b/package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch new file mode 100644 index 00000000000000..4e7e37957b1f31 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch @@ -0,0 +1,74 @@ +From c7e37aebbe19056eb7b61299e75c863263acf2b9 Mon Sep 17 00:00:00 2001 +From: Nagarajan Maran +Date: Tue, 9 Aug 2022 13:22:43 +0530 +Subject: [PATCH] Fix SKB corruption in REO destination ring + +In the traffic cases, randomly, invalid RX descriptor +from REO destination ring is received. This +invalid descriptor causes wrong SKB to be fetched +which in turn causes SKB memory corruption issue. + +Introduced Sanity check to validate the descriptor, +before processing the SKB. + +During the failure scenario, invalid RX descriptor +filled with values "0" is received which in-turn +corrupts the SKB stored in the ldr lookup +with buffer id "0". Changed the start id for +idr allocation to "1" and the buffer id "0" is +reserved for error validation. + + +Crash Signature : + +Unable to handle kernel paging request at virtual address 3f004900 +During the crash, +PC points to "b15_dma_inv_range+0x30/0x50" +LR points to "dma_cache_maint_page+0x8c/0x128". +The Backtrace obtained is as follows: +[<8031716c>] (b15_dma_inv_range) from [<80313a4c>] (dma_cache_maint_page+0x8c/0x128) +[<80313a4c>] (dma_cache_maint_page) from [<80313b90>] (__dma_page_dev_to_cpu+0x28/0xcc) +[<80313b90>] (__dma_page_dev_to_cpu) from [<7fb5dd68>] (ath11k_dp_process_rx+0x1e8/0x4a4 [ath11k]) +[<7fb5dd68>] (ath11k_dp_process_rx [ath11k]) from [<7fb53c20>] (ath11k_dp_service_srng+0xb0/0x2ac [ath11k]) +[<7fb53c20>] (ath11k_dp_service_srng [ath11k]) from [<7f67bba4>] (ath11k_pci_ext_grp_napi_poll+0x1c/0x78 [ath11k_pci]) +[<7f67bba4>] (ath11k_pci_ext_grp_napi_poll [ath11k_pci]) from [<807d5cf4>] (__napi_poll+0x28/0xb8) +[<807d5cf4>] (__napi_poll) from [<807d5f28>] (net_rx_action+0xf0/0x280) +[<807d5f28>] (net_rx_action) from [<80302148>] (__do_softirq+0xd0/0x280) +[<80302148>] (__do_softirq) from [<80320408>] (irq_exit+0x74/0xd4) +[<80320408>] (irq_exit) from [<803638a4>] (__handle_domain_irq+0x90/0xb4) +[<803638a4>] (__handle_domain_irq) from [<805bedec>] (gic_handle_irq+0x58/0x90) +[<805bedec>] (gic_handle_irq) from [<80301a78>] (__irq_svc+0x58/0x8c) + +Signed-off-by: Nagarajan Maran +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -3228,6 +3228,16 @@ try_again: + while (likely(desc = + (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab, + srng))) { ++ ++ push_reason = FIELD_GET(HAL_REO_DEST_RING_INFO0_PUSH_REASON, ++ desc->info0); ++ if (unlikely(push_reason == ++ HAL_REO_DEST_RING_PUSH_REASON_ERR_DETECTED)) { ++ ath11k_warn(ab,"Received invalid desc\n"); ++ ab->soc_stats.hal_reo_error[dp->reo_dst_ring[ring_id].ring_id]++; ++ continue; ++ } ++ + cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, + desc->buf_addr_info.info1); + buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, +@@ -3258,8 +3268,6 @@ try_again: + + num_buffs_reaped[mac_id]++; + +- push_reason = FIELD_GET(HAL_REO_DEST_RING_INFO0_PUSH_REASON, +- desc->info0); + if (unlikely(push_reason != + HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION)) { + dev_kfree_skb_any(msdu); diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch b/package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch new file mode 100644 index 00000000000000..1bbbdd6c7446da --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch @@ -0,0 +1,209 @@ +From efecc6e8355d02aeac7bf1a43397551440a8d0d8 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam Raja +Date: Thu, 30 Mar 2023 22:12:56 +0530 +Subject: [PATCH] ath11k: Check skb_headroom before using skb_push + +Below kernel panic may occur if there is no +skb_headroom available for performing skb_push. + +<4>[67506.565072] CPU: 1 PID: 1741 Comm: ap-wireless-opt Not tainted 5.4.89+ #0 +<4>[67506.578860] Hardware name: Generic DT based system +<4>[67506.585728] PC is at fortify_panic+0x10/0x18 +<4>[67506.590406] LR is at fortify_panic+0x10/0x18 + +(fortify_panic) from [<7f2cd3cc>] (ath11k_dp_rx_crypto_icv_len+0x1e0/0x161c [ath11k]) +(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2cdbac>] (ath11k_dp_rx_crypto_icv_len+0x9c0/0x161c [ath11k]) +(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2ce0e8>] (ath11k_dp_rx_crypto_icv_len+0xefc/0x161c [ath11k]) +(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2cedb0>] (ath11k_dp_process_rx+0x4ec/0x544 [ath11k]) +(ath11k_dp_process_rx [ath11k]) from [<7f2c417c>] (ath11k_dp_service_srng+0xdc/0x2a0 [ath11k]) +(ath11k_dp_service_srng [ath11k]) from [<7f0d78c8>] (ath11k_pci_ext_grp_napi_poll+0x20/0x50 [ath11k_pci]) +(ath11k_pci_ext_grp_napi_poll [ath11k_pci]) from [<806a6a74>] (__napi_poll+0x28/0xb8) +(__napi_poll) from [<806a6c9c>] (net_rx_action+0xec/0x280) +(net_rx_action) from [<8010226c>] (__do_softirq+0xc4/0x248) +(__do_softirq) from [<8011f230>] (irq_exit+0x6c/0xcc) +(irq_exit) from [<80162a08>] (__handle_domain_irq+0x8c/0xb0) +(__handle_domain_irq) from [<803f0188>] (gic_handle_irq+0x54/0x8c) +(gic_handle_irq) from [<80101a8c>] (__irq_svc+0x6c/0xa8) + +Fix this by checking skb_headroom and expand the +headroom if required size is not available. + +Signed-off-by: Tamizh Chelvam Raja +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 70 +++++++++++++++++++++++++ + 1 file changed, 70 insertions(+) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2270,16 +2270,27 @@ static void ath11k_get_dot11_hdr_from_rx + size_t hdr_len, crypto_len; + struct ieee80211_hdr *hdr; + u16 fc, qos_ctl = 0; ++ int expand_by; + u8 *crypto_hdr; + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { + crypto_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ if (skb_headroom(msdu) < crypto_len) { ++ expand_by = crypto_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + crypto_hdr = skb_push(msdu, crypto_len); + ath11k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); + } + + fc = ath11k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc); + hdr_len = ieee80211_hdrlen(fc); ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + skb_push(msdu, hdr_len); + hdr = (struct ieee80211_hdr *)msdu->data; + hdr->frame_control = fc; +@@ -2315,6 +2326,7 @@ static void ath11k_dp_rx_h_undecap_nwifi + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + u16 qos_ctl = 0; ++ int expand_by = 0; + u8 *qos, *crypto_hdr; + bool add_qos_ctrl = false; + +@@ -2359,26 +2371,46 @@ static void ath11k_dp_rx_h_undecap_nwifi + } + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { ++ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ if (skb_headroom(msdu) < crypto_param_len) { ++ expand_by = crypto_param_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + if (first_hdr) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ memcpy(skb_push(msdu, crypto_param_len), ++ (void *)hdr + hdr_len, crypto_param_len); + } else { +- crypto_hdr = skb_push(msdu, ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ crypto_hdr = skb_push(msdu, crypto_param_len); + ath11k_dp_rx_desc_get_crypto_header(ar->ab, + rxcb->rx_desc, crypto_hdr, enctype); + } + } + + if (!rxcb->is_first_msdu || add_qos_ctrl) { ++ if (skb_headroom(msdu) < IEEE80211_QOS_CTL_LEN) { ++ expand_by = IEEE80211_QOS_CTL_LEN - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, + IEEE80211_QOS_CTL_LEN), &qos_ctl, + IEEE80211_QOS_CTL_LEN); ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), decap_hdr, hdr_len); + return; + } + ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + + /* original 802.11 header has a different DA and in +@@ -2487,6 +2519,7 @@ static void ath11k_dp_rx_h_undecap_eth(s + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + void *rfc1042; ++ int expand_by; + struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + struct ath11k_dp_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}}; + +@@ -2496,6 +2529,11 @@ static void ath11k_dp_rx_h_undecap_eth(s + ether_addr_copy(sa, eth->h_source); + rfc.snap_type = eth->h_proto; + skb_pull(msdu, sizeof(struct ethhdr)); ++ if (skb_headroom(msdu) < sizeof(struct ath11k_dp_rfc1042_hdr)) { ++ expand_by = sizeof(struct ath11k_dp_rfc1042_hdr) - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), &rfc, + sizeof(struct ath11k_dp_rfc1042_hdr)); + ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); +@@ -2513,6 +2551,11 @@ static void ath11k_dp_rx_h_undecap_eth(s + skb_pull(msdu, sizeof(struct ethhdr)); + + /* push rfc1042/llc/snap */ ++ if (skb_headroom(msdu) < sizeof(struct ath11k_dp_rfc1042_hdr)) { ++ expand_by = sizeof(struct ath11k_dp_rfc1042_hdr) - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), rfc1042, + sizeof(struct ath11k_dp_rfc1042_hdr)); + +@@ -2521,12 +2564,22 @@ static void ath11k_dp_rx_h_undecap_eth(s + hdr_len = ieee80211_hdrlen(hdr->frame_control); + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ if (skb_headroom(msdu) < crypto_param_len) { ++ expand_by = crypto_param_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } ++ memcpy(skb_push(msdu, crypto_param_len), ++ (void *)hdr + hdr_len, crypto_param_len); + } + ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + + exit: +@@ -2954,10 +3007,16 @@ static void ath11k_dp_rx_deliver_msdu(st + u8 decap = DP_RX_DECAP_TYPE_RAW; + bool is_mcbc = rxcb->is_mcbc; + bool is_eapol = rxcb->is_eapol; ++ int expand_by; + + if (status->encoding == RX_ENC_HE && + !(status->flag & RX_FLAG_RADIOTAP_HE) && + !(status->flag & RX_FLAG_SKIP_MONITOR)) { ++ if (skb_headroom(msdu) < sizeof(known)) { ++ expand_by = sizeof(known) - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ goto exit; ++ } + he = skb_push(msdu, sizeof(known)); + memcpy(he, &known, sizeof(known)); + status->flag |= RX_FLAG_RADIOTAP_HE; +@@ -3013,6 +3072,7 @@ static void ath11k_dp_rx_deliver_msdu(st + !(is_mcbc && rx_status->flag & RX_FLAG_DECRYPTED)) + rx_status->flag |= RX_FLAG_8023; + ++exit: + ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); + + if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch b/package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch new file mode 100644 index 00000000000000..6614d8d496b354 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch @@ -0,0 +1,120 @@ +From 331198f889cef552e4644abf1f2ebfcaa2cc41e9 Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Wed, 23 Nov 2022 18:50:47 +0530 +Subject: [PATCH] mac80211: fix RCU stall in mesh fast xmit path + +In mesh fast xmit, mesh_fill_cached_hdr tries to acquire spinlock +which is already acquired by the same core for updating mesh path +table. Fix it by using atomic variable instead of using spinlock. + +[100466.097939] rcu: INFO: rcu_preempt self-detected stall on CPU +[100466.097962] rcu: 0-....: (8381 ticks this GP) idle=e86/0/0x3 softirq=2648463/2648463 fqs=4184 +[100466.102651] (t=8403 jiffies g=5521597 q=620) +[100466.111586] Task dump for CPU 0: +[100466.115839] swapper/0 R running task 0 0 0 0x0000000a +[100466.119228] Call trace: +[100466.126348] dump_backtrace+0x0/0x15c +[100466.128949] show_stack+0x14/0x1c +[100466.132508] sched_show_task+0x104/0x134 +[100466.135893] dump_cpu_task+0x40/0x274 +[100466.139974] rcu_dump_cpu_stacks+0x7c/0xd4 +[100466.143620] rcu_sched_clock_irq+0x350/0x824 +[100466.147699] update_process_times+0x2c/0x50 +[100466.152213] tick_sched_handle.isra.4+0x3c/0x44 +[100466.156553] tick_sched_timer+0x48/0x88 +[100466.161153] __hrtimer_run_queues+0xa0/0x140 +[100466.165059] hrtimer_interrupt+0xe4/0x214 +[100466.169315] arch_timer_handler_virt+0x28/0x3c +[100466.173308] handle_percpu_devid_irq+0x84/0x12c +[100466.177733] generic_handle_irq+0x18/0x2c +[100466.182593] __handle_domain_irq+0x84/0xac +[100466.186500] gic_handle_irq+0x74/0xbc +[100466.190579] el1_irq+0xf0/0x1c0 +[100466.194398] queued_spin_lock_slowpath+0x98/0x2c0 +[100466.197800] mesh_fill_cached_hdr+0x15c/0x2d0 [mac80211] +[100466.202397] __ieee80211_subif_start_xmit+0xf4/0xf3c [mac80211] +[100466.207865] ieee80211_subif_start_xmit+0x274/0x2ac [mac80211] +[100466.213933] dev_hard_start_xmit+0x1b0/0x230 +[100466.219574] sch_direct_xmit+0xbc/0x300 +[100466.224086] __dev_queue_xmit+0x5b0/0x8cc +[100466.228079] dev_queue_xmit+0x10/0x18 +[100466.231990] sfe_ipv4_recv_udp+0x1014/0x1050 [qca_nss_sfe] +[100466.235722] sfe_ipv4_recv+0x394/0x5a4 [qca_nss_sfe] +[100466.241190] sfe_recv+0xf0/0x47c [qca_nss_sfe] +[100466.246397] __netif_receive_skb_core+0x1ac/0xa3c +[100466.250736] __netif_receive_skb_list_core+0x84/0x1ec +[100466.255598] netif_receive_skb_list_internal+0x250/0x29c +[100466.260720] gro_normal_list+0x24/0x40 +[100466.266186] gro_normal_one+0x3c/0x48 +[100466.269832] napi_gro_receive+0xc0/0x104 +[100466.273655] edma_rx_napi_poll+0x820/0xdb4 [qca_nss_dp] +[100466.277734] __napi_poll+0x30/0xa4 +[100466.283113] net_rx_action+0x118/0x270 +[100466.286325] __do_softirq+0x10c/0x244 +[100466.290145] irq_exit+0x64/0xb4 +[100466.293965] __handle_domain_irq+0x88/0xac +[100466.297350] gic_handle_irq+0x74/0xbc +[100466.301256] el1_irq+0xf0/0x1c0 +[100466.305076] arch_cpu_idle+0x10/0x18 +[100466.308461] do_idle+0x104/0x248 +[100466.312019] cpu_startup_entry+0x20/0x64 +[100466.315320] rest_init+0xd0/0xdc +[100466.319311] arch_call_rest_init+0xc/0x14 +[100466.322610] start_kernel+0x480/0x4b8 + +Signed-off-by: P Praneesh +--- + net/mac80211/cfg.c | 2 +- + net/mac80211/mesh.h | 4 ++-- + net/mac80211/mesh_hwmp.c | 4 ++-- + net/mac80211/mesh_pathtbl.c | 9 ++++----- + 4 files changed, 9 insertions(+), 10 deletions(-) + +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -2347,7 +2347,7 @@ static void mpath_set_pinfo(struct mesh_ + if (mpath->flags & MESH_PATH_RESOLVED) + pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED; + pinfo->hop_count = mpath->hop_count; +- pinfo->path_change_count = mpath->path_change_count; ++ pinfo->path_change_count = atomic_read(&mpath->path_change_count); + } + + static int ieee80211_get_mpath(struct wiphy *wiphy, struct net_device *dev, +--- a/net/mac80211/mesh.h ++++ b/net/mac80211/mesh.h +@@ -126,7 +126,7 @@ struct mesh_path { + unsigned long fast_tx_check; + bool is_root; + bool is_gate; +- u32 path_change_count; ++ atomic_t path_change_count; + }; + + #define MESH_FAST_TX_CACHE_MAX_SIZE 512 +--- a/net/mac80211/mesh_hwmp.c ++++ b/net/mac80211/mesh_hwmp.c +@@ -504,7 +504,10 @@ static u32 hwmp_route_info_get(struct ie + if (next_hop) + ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); + if (next_hop != sta) { +- mpath->path_change_count++; ++ atomic_inc(&mpath->path_change_count); ++ mpath_dbg(sdata, "MESH MPU dst %pM next hop %pM" ++ " metric %d ft 0x%x\n", ++ mpath->dst, sta->deflink.addr, last_hop_metric, action); + flush_mpath = true; + } + mesh_path_assign_nexthop(mpath, sta); +@@ -565,7 +568,10 @@ static u32 hwmp_route_info_get(struct ie + if (next_hop) + ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); + if (next_hop != sta) { +- mpath->path_change_count++; ++ atomic_inc(&mpath->path_change_count); ++ mpath_dbg(sdata, "MESH MPU dst %pM next hop %pM" ++ " metric %d ft 0x%x\n", ++ mpath->dst, sta->deflink.addr, last_hop_metric, action); + flush_mpath = true; + } + mesh_path_assign_nexthop(mpath, sta); diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch b/package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch new file mode 100644 index 00000000000000..8e60a5f6b255f7 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch @@ -0,0 +1,87 @@ +From 376306e1018974ded893d8fefb91fe69676392d9 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Kathirvel +Date: Mon, 1 May 2023 15:15:56 +0530 +Subject: [PATCH] mac80211: fix crash when accessing null pointer + +During MLD transmission, band will be zero, fetching 0th sband will be an +invalid accessing of sband information and also facing crash when 2ghz +radio is in different phy and other bands are in a single phy, this is +due to 2.4 Ghz sband will be NULL for the phy which is having sbands other +than 2.4 Ghz. + +Fix this by adding sband NULL check. + +[ 2125.764601] Unable to handle kernel read from unreadable memory at virtual address 0000000000000050 +[ 2125.764631] Mem abort info: +[ 2125.772445] ESR = 0x96000005 +[ 2125.775221] EC = 0x25: DABT (current EL), IL = 32 bits +[ 2125.778339] SET = 0, FnV = 0 +[ 2125.783804] EA = 0, S1PTW = 0 +[ 2125.786669] Data abort info: +[ 2125.789707] ISV = 0, ISS = 0x00000005 +[ 2125.792833] CM = 0, WnR = 0 +[ 2125.796394] user pgtable: 4k pages, 39-bit VAs, pgdp=000000006432b000 +[ 2125.799520] [0000000000000050] pgd=0000000000000000, pud=0000000000000000 +[ 2125.805946] Internal error: Oops: 96000005 [#1] PREEMPT SMP +[ 2126.082240] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.213 #0 +[ 2126.110546] pstate: 40400005 (nZcv daif +PAN -UAO) +[ 2126.117591] pc : ieee80211_tx_monitor+0x1ac/0x5d0 [mac80211] +[ 2126.122360] lr : ieee80211_tx_monitor+0x14c/0x5d0 [mac80211] +[ 2126.128163] sp : ffffff803e14ecc0 +[ 2126.133803] x29: ffffff803e14ecc0 x28: 000000000000000d +[ 2126.137016] x27: 0000000000000000 x26: ffffff803892aa40 +[ 2126.142398] x25: 0000000000000009 x24: 0000000000000000 +[ 2126.147694] x23: 0000000000000001 x22: ffffff80250210e0 +[ 2126.152988] x21: ffffff803a0a5800 x20: ffffff803a0a5828 +[ 2126.158284] x19: ffffff803892aa33 x18: 0000000000000000 +[ 2126.163579] x17: 0000000000000000 x16: 0000000000000000 +[ 2126.168873] x15: 0000000000000000 x14: 020101f0fd8c13dd +[ 2126.174169] x13: 00c0bf3d2d200706 x12: 3809ff36b83b03ff +[ 2126.179464] x11: 0a5802c3fe1802c3 x10: 002f3262005e4342 +[ 2126.184759] x9 : 0000a4270000a403 x8 : ffffff803892aa3f +[ 2126.190055] x7 : 0000000000000000 x6 : 0000000000000001 +[ 2126.195349] x5 : ffffff803e14edd8 x4 : 0000000000000001 +[ 2126.200644] x3 : 000000000000000c x2 : 0000000000000000 +[ 2126.205939] x1 : ffffff803892aa3b x0 : 0000000000000040 +[ 2126.211235] Call trace: +[ 2126.216542] ieee80211_tx_monitor+0x1ac/0x5d0 [mac80211] +[ 2126.218714] ieee80211_tx_status_ext+0x78c/0x7d0 [mac80211] +[ 2126.224269] ieee80211_tx_status+0x78/0xa0 [mac80211] +[ 2126.229564] ieee80211_restart_hw+0xe0/0x26c [mac80211] +[ 2126.234763] tasklet_action_common.isra.2+0xa4/0x11c +[ 2126.239795] tasklet_action+0x24/0x2c +[ 2126.245002] __do_softirq+0x10c/0x244 +[ 2126.248561] irq_exit+0x64/0xb4 +[ 2126.252207] __handle_domain_irq+0x88/0xac +[ 2126.255158] gic_handle_irq+0x74/0xbc +[ 2126.259325] el1_irq+0xf0/0x1c0 +[ 2126.263058] arch_cpu_idle+0x10/0x18 +[ 2126.266009] do_idle+0x104/0x248 +[ 2126.269827] cpu_startup_entry+0x20/0x64 +[ 2126.273041] rest_init+0xd0/0xdc +[ 2126.276947] arch_call_rest_init+0xc/0x14 +[ 2126.280159] start_kernel+0x46c/0x4a4 +[ 2126.284070] Code: d37d0863 8b030042 52800183 f9449c42 (f9402842) +[ 2126.287713] ---[ end trace 04f5d203895d53da ]--- + +Signed-off-by: Karthikeyan Kathirvel +--- + net/mac80211/status.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +--- a/net/mac80211/status.c ++++ b/net/mac80211/status.c +@@ -336,8 +336,11 @@ ieee80211_add_tx_radiotap_header(struct + struct ieee80211_supported_band *sband; + + sband = local->hw.wiphy->bands[info->band]; +- legacy_rate = +- sband->bitrates[info->status.rates[0].idx].bitrate; ++ //TODO: Incase of MLD, band will be 0 for tx pkts ++ //this has to be taken care during TX monitor support. ++ if (sband) ++ legacy_rate = ++ sband->bitrates[info->status.rates[0].idx].bitrate; + } + + if (legacy_rate) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch b/package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch new file mode 100644 index 00000000000000..28b4fdf6468337 --- /dev/null +++ b/package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch @@ -0,0 +1,87 @@ +From 5b4a0de1356558f58df9c6a1f46c7c0ce2fadb03 Mon Sep 17 00:00:00 2001 +From: Yuvasree Sivasankaran +Date: Mon, 28 Aug 2023 14:48:41 +0530 +Subject: [PATCH] ath11k: Avoiding memset of ppdu-info for next skb + +While parsing mon status from skb, ppdu_info got memset with zero during +next skb fetch from queue or mon ring in case a single PPDU is more than +RX_BUFFER_SIZE. Because of this nss value got override for respective +ppdu and leads to warn_on in mac80211.Removed memset from next skb fetch +and added flag to track discontinued skb in case of fetch from skb. + +WARN_ON Reason: + +Rate marked as an HE rate but data is invalid: MCS: 0, NSS: 0 + +Below the call trace observed: + + Call trace: + ieee80211_rx_list+0x1d4/0xcc4 [mac80211] + ieee80211_rx_napi+0x58/0xcc [mac80211] + ath11k_dp_rx_deliver_msdu+0x358/0x3e4 [ath11k] + ath11k_dp_rx_mon_deliver.isra.27+0x470/0x4cc [ath11k] + ath11k_dp_rx_mon_dest_process+0x1cc/0x2bc [ath11k] + ath11k_dp_rx_process_mon_status+0x5ec/0xf90 [ath11k] + ath11k_dp_rx_process_mon_rings+0x40c/0x44c [ath11k] + ath11k_dp_service_srng+0x114/0x2c0 [ath11k] + ath11k_ahb_ext_grp_napi_poll+0x30/0xa0 [ath11k_ahb] + __napi_poll+0x30/0xa4 + net_rx_action+0x118/0x270 + __do_softirq+0x10c/0x244 + irq_exit+0x64/0xb4 + __handle_domain_irq+0x88/0xac + gic_handle_irq+0x74/0xbc + el1_irq+0xf0/0x1c0 + arch_cpu_idle+0x10/0x18 + do_idle+0x104/0x248 + cpu_startup_entry+0x20/0x64 + rest_init+0xd0/0xdc + arch_call_rest_init+0xc/0x14 + start_kernel+0x46c/0x4a4 + --[ end trace e754e9088a240857 ]--- + +Signed-off-by: Yuvasree Sivasankaran +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 6 ++++-- + drivers/net/wireless/ath/ath11k/hal_rx.h | 1 + + 2 files changed, 5 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -6210,7 +6210,9 @@ int ath11k_dp_rx_process_mon_status(stru + if (!num_buffs_reaped) + goto exit; + +- memset(ppdu_info, 0, sizeof(*ppdu_info)); ++ if (!ppdu_info->ppdu_continuation) ++ memset(ppdu_info, 0, sizeof(*ppdu_info)); ++ + ppdu_info->peer_id = HAL_INVALID_PEERID; + + while ((skb = __skb_dequeue(&skb_list))) { +@@ -6228,7 +6230,6 @@ int ath11k_dp_rx_process_mon_status(stru + if (log_type != ATH11K_PKTLOG_TYPE_INVALID) + trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); + +- memset(ppdu_info, 0, sizeof(*ppdu_info)); + ppdu_info->peer_id = HAL_INVALID_PEERID; + hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb); + +@@ -6244,6 +6245,7 @@ int ath11k_dp_rx_process_mon_status(stru + if (ppdu_info->peer_id == HAL_INVALID_PEERID || + hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { + dev_kfree_skb_any(skb); ++ ppdu_info->ppdu_continuation = true; + continue; + } + +--- a/drivers/net/wireless/ath/ath11k/hal_rx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.h +@@ -220,6 +220,7 @@ struct hal_rx_mon_ppdu_info { + char rssi_chain[8][8]; + u32 num_users; + u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; ++ bool ppdu_continuation; + struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS]; + }; + From a5169a6a59813796ee6edff314707e3902c09d6a Mon Sep 17 00:00:00 2001 From: Qosmio Date: Wed, 17 Jan 2024 05:04:28 -0500 Subject: [PATCH 58/80] ath11k_nss: set pbuf script off by default uci option pbuf.opt.memory_profile must be explicity set to auto, 1gb, 512m, 256m to run. --- .../mac80211/files/etc/init.d/qca-nss-pbuf | 16 +++++++++++----- package/kernel/mac80211/files/pbuf.uci | 3 ++- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf index be89de061ce8b1..02afd5f6c3d380 100755 --- a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -50,15 +50,21 @@ apply_nss_config() { board=$memory_profile logger -t ath11k_nss "Using custom memory profile - $board" ;; - *) - logger -s -t ath11k_nss -p user.error "Unknown profile $memory_profile. Choose 1gb, 512mb, or 256mb" + off*|false*|disable*|0) + logger -s -t ath11k_nss -p user.warn "NSS pbuf option 'memory_profile=off'. Not running. Enable if you have issues connecting more than 65 clients" + exit 0 + ;; + auto) board=$(board_name) - logger -s -t ath11k_nss -p user.warn "Falling back to: $board" + logger -t ath11k_nss "Setting n2hcfg values for board: $board" + ;; + *) + logger -s -t ath11k_nss -p user.error "Unknown profile $memory_profile. Choose auto, 1gb, 512mb, or 256mb" + exit 1 ;; esac else - board=$(board_name) - logger -t ath11k_nss "Setting n2hcfg values for board: $board" + exi 0 fi case "$board" in diff --git a/package/kernel/mac80211/files/pbuf.uci b/package/kernel/mac80211/files/pbuf.uci index ac4fadbc4f5e63..2b277e11f02f4d 100644 --- a/package/kernel/mac80211/files/pbuf.uci +++ b/package/kernel/mac80211/files/pbuf.uci @@ -1,5 +1,6 @@ config general opt - # to bypass board autodetection, uncomment ONE of the options below + option memory_profile 'off' + # option memory_profile 'auto' # option memory_profile '1gb' # option memory_profile '512mb' # option memory_profile '256mb' From 27ef09aba14b1e56a7135e9029d3136785c0b117 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Wed, 17 Jan 2024 15:45:10 -0500 Subject: [PATCH 59/80] ath11k_nss: Refresh patches ath11k_nss: fix build for 256/1G mem, and ath10k ath11k_nss: bump release version '8' mac80211: refactor NSS patches Since NSS requires patches to subsys, and ath*k directories. Move patches into a subset of nss for better tracking against QSDK, and modularization. ath11k_nss: rename patches ath11k_nss: clean up optional patches To reduce bug tracking headaches, I've remove the following patches, as they are not required for NSS offload and have been around the last 2-3 years without ever being upstreamed. nss/ath11k/235-001-ath11k-Add-support-for-beacon-tx-mode.patch nss/ath11k/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch nss/ath11k/902-020-ath11k-add-btcoex-config.patch nss/ath11k/902-022-ath11k-add-ap-ps-support.patch nss/ath11k/907-068-ath11k-add-rx-histogram-stats.patch nss/ath11k/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch nss/ath11k/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch nss/ath11k/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch nss/ath11k/913-356-ath11k-invalid-desc-sanity-check.patch nss/ath11k/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch nss/ath11k/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch nss/subsys/235-002-mac80211-Add-support-for-beacon-tx-mode.patch nss/subsys/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch ath11k_nss: Remove superfluous patches Remove patches unrelated to NSS offloading to minimize bloat and better track NSS related issues. ath11k_nss: Refactor patches to use upstream names Reworked patches to use upstream QSDK names. Allows for better tracking ath11k_nss: align wifi offload with qca-nss-drv The option in qca-nss-drv is actually 'NSS_DRV_WIFIOFFLOAD_ENABLE' use the same syntax. ath10k-ct: fix compile with NSS wifi ath11k_nss: Merge every NSS related feature + more * Added macro to disable NSS mesh offload * Added menuconfig option "ATH11K_NSS_MESH_SUPPORT" to selectivley build mesh support, as well it's depenacndy on nss-drv-wifimeshmgr. * Added option to disable HTT Stats, and STA stats (stations). * Reducing footprint by ~210KB. Debugfs minimal is still enabled. * Reworked a TON of patches, some my own, hopefully there should be a far less amount of WOA2/WPA3 connection issues. * Updated the /etc/init.d/pbuf script to be more robust. (handles tweaking ath11k and NSS settings better) NOTES: Although mesh package builds (nss-drv-wifimeshmgr), ath11k doesn't seem to support it yet. Not sure if NSS requires 3 radios to work, I'm at a dead end currently with that route. ATTENTION: the ptch `37-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch` works well on nss with frame_mode=2. And on `ath11k frame_mode=1 nss_offload=0` And on `ath11k frame_mode=2 nss_offload=1` if you set nss_offload=off and frame_mode=2, it will CRASH if you set nss_offload=on and frame_mode=2, it will RUN if you set nss_offload=off and frame_mode=1, it will RUN ath11k_nss: fix n2h high_water_core0/wifi_pool_buf These were commented out, but looks like they are needed to prevent lock ups with heavy usage apps (users report in torrenting) ath11k_nss: Renumber ath11k patches in the range commit 3c7cc4b725ea406f19b736427034e3bdb436aedc Author: Yuvasree Sivasankaran AuthorDate: Thu Jan 4 11:25:56 2024 +0530 Commit: Yuvasree Sivasankaran CommitDate: Wed Jan 3 22:53:51 2024 -0800 wifi: ath11k: Renumber ath11k patches in the range In ath11k, patches are not maintained in the range and not sequential. Renumber the patches sequential and in the range. Change-Id: I77c51c0f5bf9f94863db4ef364b156e14465a60c Signed-off-by: Yuvasree Sivasankaran ath11k_nss: Add mac hw flag to avoid tx queue in mac80211 commit 4e9b5f7f0d1ed40dbf3208f7ed4448e49b4a4ac1 Author: Yuvasree Sivasankaran AuthorDate: Wed Dec 6 12:20:59 2023 +0530 Commit: Yuvasree Sivasankaran CommitDate: Mon Dec 18 12:52:33 2023 +0530 wifi: mac80211: Add mac hw flag to avoid tx queue in mac80211 Queue SKB in mac80211 become mandatory from latest 6.1 kernel. Because of this queuing, there will be performance degradation. Add hw flag option to enable tx queue in Driver/Hardware. Driver/hardware can register for HAS_TX_QUEUE HW flag and avoid tx queuing in mac80211. Add same HW flag checks to avoid accessing skb queues which will be NULL or invalid and also NULL checks for sta txqs for NULL or invalid access. ath11k_nss: add the HTC+ / iPhone fix commit ccdca73cd65723c3cb63c17edc95c4c43318cb38 Author: John Crispin AuthorDate: Sun Jul 9 17:12:34 2023 +0200 Commit: John Crispin CommitDate: Thu Aug 31 16:08:34 2023 +0200 mac80211: add the HTC+ / iPhone fix Signed-off-by: John Crispin ath11k_nss: ath-next fix connection failure due to unexpected peer delete Currently ath11k_mac_op_unassign_vif_chanctx() deletes peer but ath11k_mac_op_assign_vif_chanctx() doesn't create it. This results in connection failure if MAC80211 calls drv_unassign_vif_chanctx() and drv_assign_vif_chanctx() during AUTH and ASSOC, see below log: [ 102.372431] wlan0: authenticated [ 102.372585] ath11k_pci 0000:01:00.0: wlan0: disabling HT/VHT/HE as WMM/QoS is not supported by the AP [ 102.372593] ath11k_pci 0000:01:00.0: mac chanctx unassign ptr ffff895084638598 vdev_id 0 [ 102.372808] ath11k_pci 0000:01:00.0: WMI vdev stop id 0x0 [ 102.383114] ath11k_pci 0000:01:00.0: vdev stopped for vdev id 0 [ 102.384689] ath11k_pci 0000:01:00.0: WMI peer delete vdev_id 0 peer_addr 20:e5:2a:21:c4:51 [ 102.396676] ath11k_pci 0000:01:00.0: htt peer unmap vdev 0 peer 20:e5:2a:21:c4:51 id 3 [ 102.396711] ath11k_pci 0000:01:00.0: peer delete resp for vdev id 0 addr 20:e5:2a:21:c4:51 [ 102.396722] ath11k_pci 0000:01:00.0: mac removed peer 20:e5:2a:21:c4:51 vdev 0 after vdev stop [ 102.396780] ath11k_pci 0000:01:00.0: mac chanctx assign ptr ffff895084639c18 vdev_id 0 [ 102.400628] wlan0: associate with 20:e5:2a:21:c4:51 (try 1/3) [ 102.508864] wlan0: associate with 20:e5:2a:21:c4:51 (try 2/3) [ 102.612815] wlan0: associate with 20:e5:2a:21:c4:51 (try 3/3) [ 102.720846] wlan0: association with 20:e5:2a:21:c4:51 timed out The peer delete logic in ath11k_mac_op_unassign_vif_chanctx() is introduced by commit b4a0f54156ac ("ath11k: move peer delete after vdev stop of station for QCA6390 and WCN6855") to fix firmware crash issue caused by unexpected vdev stop/peer delete sequence. Actually for a STA interface peer should be deleted in ath11k_mac_op_sta_state() when STA's state changes from IEEE80211_STA_NONE to IEEE80211_STA_NOTEXIST, which also coincides with current peer creation design that peer is created during IEEE80211_STA_NOTEXIST -> IEEE80211_STA_NONE transition. So move peer delete back to ath11k_mac_op_sta_state(), also stop vdev before deleting peer to fix the firmware crash issue mentioned there. In this way the connection failure mentioned here is also fixed. Also do some cleanups in patch "wifi: ath11k: remove invalid peer create logic", and refactor in patches "wifi: ath11k: rename ath11k_start_vdev_delay()" and "wifi: ath11k: avoid forward declaration of ath11k_mac_start_vdev_delay()". Tested this patch set using QCA6390 and WCN6855 on both STA and SAP interfaces. Basic connection and ping work well. Baochen Qiang (4): wifi: ath11k: remove invalid peer create logic wifi: ath11k: rename ath11k_start_vdev_delay() wifi: ath11k: avoid forward declaration of ath11k_mac_start_vdev_delay() wifi: ath11k: fix connection failure due to unexpected peer delete drivers/net/wireless/ath/ath11k/mac.c | 564 +++++++++++++------------- 1 file changed, 288 insertions(+), 276 deletions(-) ath11k_nss: Revert support for beacon_tx_mode ath11k_nss: Update release fix dependancies ath11k_nss: mgmt and data ack rssi update Data ACK RSSI : Advertise NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT feature support for accounting and notifying "last ack signal" and "avg ack signal" to user space through NL interface. Enabled data ack rssi support for ethernet mode. Mgmt ACK RSSI: Enabled support for Tx-ACK RSSI in HTT over Management packets. --- .../999-003-ath10k-add-nss-support.patch | 32 + package/kernel/mac80211/Makefile | 18 +- package/kernel/mac80211/ath.mk | 48 +- .../mac80211/files/etc/init.d/qca-nss-pbuf | 68 +- .../107-ath11k-tid-counter-fix.patch | 21 - .../211-ath11k-add-obss-pd-support.patch | 56 - ...11k-Disable-rx_header-tlv-for-2K-SKB.patch | 920 ----- ...01-ath11k-account-tx-rx-packets-flow.patch | 494 --- ...-mac80211-account-tx-rx-packets-flow.patch | 369 -- ...th11k-Add-support-for-beacon-tx-mode.patch | 45 - ...80211-Add-support-for-beacon-tx-mode.patch | 159 - ...dd-provision-to-configure-rx-hashmap.patch | 208 - .../245-revert-dev-sw-netstats-txrx-add.patch | 145 - ...-nss-thread-priority-during-pdev_ini.patch | 109 - .../640-006-mac80211-add-eht-radiotap.patch | 506 --- ...interface-combination-advertisement-.patch | 1594 -------- .../702-ath11k-fix-memory-leak-in-dp-rx.patch | 48 - .../902-020-ath11k-add-btcoex-config.patch | 612 --- .../902-022-ath11k-add-ap-ps-support.patch | 324 -- ...04-300-ath11k-nss_get_arvif_from_dev.patch | 113 - .../905-ath11k-add-support-memory-stats.patch | 946 ----- ...1k-add-simple-tx-handler-for-AP-mode.patch | 185 - .../911-335-ath11k-fix-ar-ops-crash.patch | 71 - ...k-skb_headroom-before-using-skb_push.patch | 209 - ...ix-crash-when-accessing-null-pointer.patch | 87 - .../199-004-ath10k-fixup-nss-compile.patch | 19 + ...th11k-fix-for-peer-memory-corruption.patch | 0 .../068-ath11k-add-rx-histogram-stats.patch} | 135 +- ...9-ath11k-add-HE-stats-in-peer-stats.patch} | 74 +- ...080-ath11k-ethernet-rx-decap-offload.patch | 15 + ...dma-counter-always-zero-in-peer-stat.patch | 82 + ...dma-counter-increamenting-improperly.patch | 2 +- ...l-ofdma-ru-allocation-in-peer-stats.patch} | 51 +- .../113-ath11k-add-8023-undecap-support.patch | 4 +- ...-adding-support-for-mgmt-frame-stats.patch | 24 +- ...1k-remove-error-on-soc-debugfs-fail.patch} | 40 +- .../188-ath11k-m3-ssr-dump-collection.patch} | 0 ...91-ath11k-add-mgmt-and-data-ack-rssi.patch | 27 - ...-ath11k_nss-add-nss-driver-interface.patch | 31 +- .../199-003-ath11k-add-nss-support.patch | 323 +- ...-ath11k-Add-support-for-dynamic-vlan.patch | 4 +- ...207-ath11k-Enable-256_512MB-profiles.patch | 164 +- ...oad-changes-to-NSS-driver-interface.patch} | 30 +- ...support-on-NSS-offload-for-STA-mode.patch} | 86 +- ...14-ath11k-qos-null-frame-tx-over-wmi.patch | 181 +- ...rt-to-enable-disable-color-collision.patch | 46 + ...dev-in-NSS-for-AP_VLAN-vif-handling.patch} | 48 +- ...port-for-WDS-offload-in-NSS-offload.patch} | 77 +- ...ev-in-NSS-for-dynamic-VLAN-handling.patch} | 18 +- ...dynamic-VLAN-support-in-NSS-offload.patch} | 50 +- ...ow-fast-rx-by-bypassing-stats-update.patch | 102 + ...dst-ring-descriptors-from-cacheable-.patch | 6 +- ...ow-fast-rx-by-bypassing-stats-update.patch | 191 +- .../ath11k/244-ath11k-dp-tx-perf.patch} | 100 +- .../patches/nss/ath11k/270-iphone-issue.patch | 11 + .../300-ath11k-nss-mesh-offload-support.patch | 3365 +++++++++++++++++ .../301-ath11k-nss-mcbc-exception.patch} | 80 +- ...lookup-failure-in-mgmt-tx-completion.patch | 125 + ...avoid-stack-corrupt-in-nwifi-undecap.patch | 0 ...e-free-of-peer-rx_tid-during-reo-cmd.patch | 2 +- ...0-ath11k-sync-wds_ast_entry-updates.patch} | 45 +- ...0001-ath11k-optimize-tx-completions.patch} | 52 +- ...e-DECLARE_BITMAP-for-idr-operations.patch} | 32 +- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 19 +- ...ing-rx-stats-with-monitor-vif-enable.patch | 88 + ...1k-skip-status-ring-entry-processing.patch | 10 +- ...t-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch} | 2 +- ...ccess-of-the-dma-buffer-back-to-dma-.patch | 0 ...frags-from-uninitialized-peer-in-dp.patch} | 2 +- ...56-ath11k-invalid-desc-sanity-check.patch} | 15 +- ...-fix-clear-peer-keys-during-disassoc.patch | 4 +- ...-fix-tkip-encryption-traffic-failure.patch | 2 +- ...t-ast-index-assignment-for-wds-peer.patch} | 15 +- ...Fix-ppdu_id-from-firmware-PPDU-stats.patch | 52 + ...dd-retry-mechanism-for-update_rx_qu.patch} | 30 +- ...treaming-not-working-for-wan-to-wlan.patch | 49 + ...-event-handler-support-for-link-desc.patch | 6 +- ...th11k-Advertise-TX_QUEUE-mac-hw-flag.patch | 28 + ...id-memset-of-ppdu-info-for-next-skb.patch} | 12 +- ...upport-to-send-the-QoS-Null-Data-fr.patch} | 7 +- ...11k-remove-invalid-peer-create-logic.patch | 58 + ...th11k-rename-ath11k_start_vdev_delay.patch | 52 + ...ation-of-ath11k_mac_start_vdev_delay.patch | 601 +++ ...ailure-due-to-unexpected-peer-delete.patch | 257 ++ ...k-make-debugfs-sta-htt-stats-modular.patch | 198 + .../subsys/007-fix_compilation_issue.patch} | 74 +- ...-when-using-encapsulation-offloading.patch | 0 .../199-001-mac80211-add-nss-support.patch | 4 +- ...t-callback-when-hwencap-enable-in-st.patch | 0 ...03-mac80211-ath11k-fw-dynamic-muedca.patch | 203 + ...ath11k-Add-support-for-dynamic-vlan.patch} | 0 ...07-mac80211-add-nss-redirect-support.patch | 0 ...-iftype-support-on-NSS-offload-case.patch} | 28 +- ...dynamic-VLAN-support-on-NSS-offload.patch} | 32 +- .../subsys}/245-compilation_fix.patch | 13 +- ...300-ath11k-nss-mesh-offload-support.patch} | 57 +- ...CL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch} | 4 +- ...-0005-mac80211-simple-tx-for-AP-mode.patch | 7 +- .../336-mac80211-Mesh-Fast-rx-support.patch | 10 +- ...mac80211-fix-unconditional-sta-usage.patch | 17 +- .../345-mac80211-fix-mixed-declaration.patch | 57 + ...change-to-40Mhz-during-channel-switc.patch | 39 + ...rning-with-monitor-interface-restart.patch | 2 +- ...unused-RX_FLAGS-from-mac80211_rx_fla.patch | 6 +- ...ncapsulation-of-EAPOL-frames-if-OFFL.patch | 89 +- ...ix-RCU-stall-in-mesh-fast-xmit-path.patch} | 12 +- ...-the-frame-to-driver-tx-ops-directly.patch | 4 +- ...se-HW-checksum-offload-only-for-ethm.patch | 18 +- ...1-Add-mac-hw-flag-to-avoid-queue-skb.patch | 342 ++ .../829-mac80211-fix-mesh-ping-issue.patch | 8 +- ...x-memory-corruption-during-mesh-beac.patch | 0 111 files changed, 6921 insertions(+), 8641 deletions(-) create mode 100644 package/kernel/ath10k-ct/patches/999-003-ath10k-add-nss-support.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-020-ath11k-add-btcoex-config.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch delete mode 100644 package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch create mode 100644 package/kernel/mac80211/patches/nss/ath10k/199-004-ath10k-fixup-nss-compile.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/033-ath11k-fix-for-peer-memory-corruption.patch (100%) rename package/kernel/mac80211/patches/{ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch => nss/ath11k/068-ath11k-add-rx-histogram-stats.patch} (84%) rename package/kernel/mac80211/patches/{ath11k_nss/902-069-ath11k-add-HE-stats-in-peer-stats.patch => nss/ath11k/069-ath11k-add-HE-stats-in-peer-stats.patch} (93%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch (96%) rename package/kernel/mac80211/patches/{ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch => nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch} (91%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/113-ath11k-add-8023-undecap-support.patch (92%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/142-ath11k-adding-support-for-mgmt-frame-stats.patch (93%) rename package/kernel/mac80211/patches/{ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch => nss/ath11k/181-ath11k-remove-error-on-soc-debugfs-fail.patch} (88%) rename package/kernel/mac80211/patches/{ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch => nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch} (100%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/191-ath11k-add-mgmt-and-data-ack-rssi.patch (57%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/199-002-ath11k_nss-add-nss-driver-interface.patch (99%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/199-003-ath11k-add-nss-support.patch (82%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/207-ath11k-Add-support-for-dynamic-vlan.patch (99%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/207-ath11k-Enable-256_512MB-profiles.patch (70%) rename package/kernel/mac80211/patches/{ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch => nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch} (96%) rename package/kernel/mac80211/patches/{ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch => nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch} (93%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/214-ath11k-qos-null-frame-tx-over-wmi.patch (58%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch rename package/kernel/mac80211/patches/{ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch => nss/ath11k/235-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch} (93%) rename package/kernel/mac80211/patches/{ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch => nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch} (88%) rename package/kernel/mac80211/patches/{ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch => nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch} (92%) rename package/kernel/mac80211/patches/{ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch => nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch} (91%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch (96%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch (70%) rename package/kernel/mac80211/patches/{ath11k_nss/911-244-ath11k-dp-tx-perf.patch => nss/ath11k/244-ath11k-dp-tx-perf.patch} (88%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch rename package/kernel/mac80211/patches/{ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch => nss/ath11k/301-ath11k-nss-mcbc-exception.patch} (69%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch (100%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch (96%) rename package/kernel/mac80211/patches/{ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch => nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch} (94%) rename package/kernel/mac80211/patches/{ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch => nss/ath11k/335-0001-ath11k-optimize-tx-completions.patch} (82%) rename package/kernel/mac80211/patches/{ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch => nss/ath11k/335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch} (90%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch (81%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/336-ath11k-skip-status-ring-entry-processing.patch (95%) rename package/kernel/mac80211/patches/{ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch => nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch} (97%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch (100%) rename package/kernel/mac80211/patches/{ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch => nss/ath11k/353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch} (98%) rename package/kernel/mac80211/patches/{ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch => nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch} (86%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/357-ath11k-fix-clear-peer-keys-during-disassoc.patch (92%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/359-ath11k-fix-tkip-encryption-traffic-failure.patch (93%) rename package/kernel/mac80211/patches/{ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch => nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch} (84%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch rename package/kernel/mac80211/patches/{ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch => nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch} (93%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/ath11k}/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch (92%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch rename package/kernel/mac80211/patches/{ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch => nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch} (90%) rename package/kernel/mac80211/patches/{ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch => nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch} (86%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch rename package/kernel/mac80211/patches/{ath11k_nss/900-fix-build.patch => nss/subsys/007-fix_compilation_issue.patch} (62%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch (100%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/199-001-mac80211-add-nss-support.patch (99%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch (100%) create mode 100644 package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch rename package/kernel/mac80211/patches/{ath11k_nss/207-mac80211-Add-support-for-dynamic-vlan.patch => nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch} (100%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/207-mac80211-add-nss-redirect-support.patch (100%) rename package/kernel/mac80211/patches/{ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch => nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch} (86%) rename package/kernel/mac80211/patches/{ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch => nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch} (78%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/245-compilation_fix.patch (93%) rename package/kernel/mac80211/patches/{ath11k_nss/300-mac80211-nss-mesh-offload-support.patch => nss/subsys/300-ath11k-nss-mesh-offload-support.patch} (96%) rename package/kernel/mac80211/patches/{ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch => nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch} (94%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/335-0005-mac80211-simple-tx-for-AP-mode.patch (93%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/336-mac80211-Mesh-Fast-rx-support.patch (95%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/342-mac80211-fix-unconditional-sta-usage.patch (79%) create mode 100644 package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch create mode 100644 package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch (95%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch (94%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch (70%) rename package/kernel/mac80211/patches/{ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch => nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch} (88%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch (94%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch (89%) create mode 100644 package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/829-mac80211-fix-mesh-ping-issue.patch (92%) rename package/kernel/mac80211/patches/{ath11k_nss => nss/subsys}/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch (100%) diff --git a/package/kernel/ath10k-ct/patches/999-003-ath10k-add-nss-support.patch b/package/kernel/ath10k-ct/patches/999-003-ath10k-add-nss-support.patch new file mode 100644 index 00000000000000..2ef718625f011e --- /dev/null +++ b/package/kernel/ath10k-ct/patches/999-003-ath10k-add-nss-support.patch @@ -0,0 +1,32 @@ +--- a/ath10k-6.4/mac.c ++++ b/ath10k-6.4/mac.c +@@ -6362,13 +6362,13 @@ + ath10k_dbg(ar, ATH10K_DBG_MAC, "mac set txbf conf, value: 0x%x\n", + value); + return ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, + ar->wmi.vdev_param->txbf, value); + } + +-static void ath10k_update_vif_offload(struct ieee80211_hw *hw, ++static int ath10k_update_vif_offload(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) + { + struct ath10k_vif *arvif = (void *)vif->drv_priv; + struct ath10k *ar = hw->priv; + u32 vdev_param; + int ret; +@@ -6384,14 +6384,16 @@ + ATH10K_HW_TXRX_NATIVE_WIFI); + /* 10.X firmware does not support this VDEV parameter. Do not warn */ + if (ret && ret != -EOPNOTSUPP) { + ath10k_warn(ar, "failed to set vdev %i TX encapsulation: %d\n", + arvif->vdev_id, ret); + } ++ ++ return ret; + } + + /* + * TODO: + * Figure out how to handle WMI_VDEV_SUBTYPE_P2P_DEVICE, + * because we will send mgmt frames without CCK. This requirement diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index c65898aa46c0eb..080e07a43c8042 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -40,12 +40,14 @@ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_MAC80211_NSS_REDIRECT \ CONFIG_PACKAGE_IWLWIFI_DEBUG \ CONFIG_PACKAGE_IWLWIFI_DEBUGFS \ - CONFIG_PACKAGE_RTLWIFI_DEBUG \ + CONFIG_PACKAGE_RTLWIFI_DEBUG include $(INCLUDE_DIR)/package.mk WMENU:=Wireless Drivers +NSS_PATCH:= subsys ath10k ath11k + define KernelPackage/mac80211/Default SUBMENU:=$(WMENU) URL:=https://wireless.wiki.kernel.org/ @@ -307,6 +309,8 @@ ifdef CONFIG_ATH11K_NSS_SUPPORT IREMAP_CFLAGS+=-I$(STAGING_DIR)/usr/include/qca-nss-drv -I$(STAGING_DIR)/usr/include/qca-nss-clients endif +NSS_PATCHES:= subsys ath10k ath11k + config-$(CONFIG_PACKAGE_MAC80211_NSS_SUPPORT) += MAC80211_NSS_SUPPORT MAKE_OPTS:= \ @@ -377,7 +381,11 @@ define Build/Patch $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath9k,ath9k/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath10k,ath10k/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k,ath11k/) - $(if $(CONFIG_ATH11K_NSS_SUPPORT),$(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k_nss,ath11k_nss/)) +ifdef CONFIG_ATH11K_NSS_SUPPORT + $(foreach driver,$(NSS_PATCH), + $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nss/$(driver),nss/$(driver)/) + ) +endif $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rt2x00,rt2x00/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mt7601u,mt7601u/) $(call PatchDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mwl,mwl/) @@ -394,7 +402,11 @@ define Quilt/Refresh/Package $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath9k,ath9k/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath10k,ath10k/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k,ath11k/) - $(if $(CONFIG_ATH11K_NSS_SUPPORT),$(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/ath11k_nss,ath11k_nss/)) +ifdef CONFIG_ATH11K_NSS_SUPPORT + $(foreach driver,$(NSS_PATCH), + $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/nss/$(driver),nss/$(driver)/) + ) +endif $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/rt2x00,rt2x00/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mt7601u,mt7601u/) $(call Quilt/RefreshDir,$(PKG_BUILD_DIR),$(PATCH_DIR)/mwl,mwl/) diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index af60c499ddde7c..574a3e2424dc90 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -13,11 +13,14 @@ PKG_CONFIG_DEPENDS += \ CONFIG_ATH10K_LEDS \ CONFIG_ATH10K_THERMAL \ CONFIG_ATH11K_THERMAL \ + CONFIG_ATH11K_DEBUGFS_STA \ + CONFIG_ATH11K_DEBUGFS_HTT_STATS \ CONFIG_ATH_USER_REGD \ CONFIG_ATH11K_MEM_PROFILE_1G \ CONFIG_ATH11K_MEM_PROFILE_512M \ CONFIG_ATH11K_MEM_PROFILE_256M \ - CONFIG_ATH11K_NSS_SUPPORT + CONFIG_ATH11K_NSS_SUPPORT \ + CONFIG_ATH11K_NSS_MESH_SUPPORT ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS config-y += \ @@ -64,6 +67,10 @@ config-$(CONFIG_ATH11K_MEM_PROFILE_1G) += ATH11K_MEM_PROFILE_1G config-$(CONFIG_ATH11K_MEM_PROFILE_512M) += ATH11K_MEM_PROFILE_512M config-$(CONFIG_ATH11K_MEM_PROFILE_256M) += ATH11K_MEM_PROFILE_256M config-$(CONFIG_ATH11K_NSS_SUPPORT) += ATH11K_NSS_SUPPORT +config-$(CONFIG_ATH11K_NSS_MESH_SUPPORT) += ATH11K_NSS_MESH_SUPPORT +config-$(CONFIG_ATH11K_DEBUGFS_STA) += ATH11K_DEBUGFS_STA +config-$(CONFIG_ATH11K_DEBUGFS_HTT_STATS) += ATH11K_DEBUGFS_HTT_STATS +config-$(CONFIG_ATH11K_NSS_MESH_SUPPORT) += ATH11K_NSS_MESH_SUPPORT config-$(call config_package,ath9k-htc) += ATH9K_HTC config-$(call config_package,ath10k,regular) += ATH10K ATH10K_PCI @@ -306,7 +313,10 @@ define KernelPackage/ath11k URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath11k DEPENDS+= +kmod-ath +@DRIVER_11AC_SUPPORT +@DRIVER_11AX_SUPPORT \ +kmod-crypto-michael-mic +ATH11K_THERMAL:kmod-hwmon-core +ATH11K_THERMAL:kmod-thermal \ - +ATH11K_NSS_SUPPORT:kmod-qca-nss-drv + +ATH11K_NSS_SUPPORT:kmod-qca-nss-drv \ + +ATH11K_NSS_MESH_SUPPORT:kmod-qca-nss-drv-wifi-meshmgr \ + +@(ATH11K_NSS_SUPPORT):NSS_DRV_WIFIOFFLOAD_ENABLE \ + +@(ATH11K_NSS_SUPPORT):NSS_DRV_WIFI_EXT_VDEV_ENABLE FILES:=$(PKG_BUILD_DIR)/drivers/soc/qcom/qmi_helpers.ko \ $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath11k/ath11k.ko ifdef CONFIG_ATH11K_NSS_SUPPORT @@ -320,6 +330,10 @@ This module adds support for Qualcomm Technologies 802.11ax family of chipsets. endef +define KernelPackage/ath11k/conffiles +/etc/config/pbuf +endef + define KernelPackage/ath11k/config config ATH11K_THERMAL @@ -327,6 +341,22 @@ define KernelPackage/ath11k/config depends on PACKAGE_kmod-ath11k default y if TARGET_qualcommax + config ATH11K_DEBUGFS_STA + bool "Enable ath11k station statistics" + depends on PACKAGE_kmod-ath11k + depends on PACKAGE_MAC80211_DEBUGFS + default y + help + Say Y to enable access to the station statistics via debugfs. + + config ATH11K_DEBUGFS_HTT_STATS + bool "Enable ath11k HTT statistics" + depends on PACKAGE_kmod-ath11k + depends on PACKAGE_MAC80211_DEBUGFS + default y + help + Say Y to enable access to the HTT statistics via debugfs. + config ATH11K_NSS_SUPPORT bool "Enable NSS WiFi offload" select ATH11K_MEM_PROFILE_512M if (TARGET_qualcommax_ipq807x_DEVICE_edimax_cax1800 || \ @@ -335,13 +365,17 @@ define KernelPackage/ath11k/config TARGET_qualcommax_ipq807x_DEVICE_redmi_ax6 || \ TARGET_qualcommax_ipq807x_DEVICE_xiaomi_ax3600 || \ TARGET_qualcommax_ipq807x_DEVICE_zte_mf269 ) - select ATH11K_MEM_PROFILE_256M if (TARGET_qualcommax_ipq807x_DEVICE_netgear_wax218) - select NSS_DRV_WIFI_ENABLE - select NSS_DRV_WIFI_EXT_VDEV_ENABLE - default y if TARGET_qualcommax + select ATH11K_MEM_PROFILE_256M if TARGET_qualcommax_ipq807x_DEVICE_netgear_wax218 + + config ATH11K_NSS_MESH_SUPPORT + bool "Enable NSS WiFi Mesh offload" + depends on ATH11K_NSS_SUPPORT + select PACKAGE_MAC80211_MESH + default n choice - prompt "ATH11K Memory Profile" + prompt "Memory Profile" + depends on PACKAGE_kmod-ath11k default ATH11K_MEM_PROFILE_1G help This option allows you to select the memory profile. diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf index 02afd5f6c3d380..f4f45b9a4a4c60 100755 --- a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf +++ b/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf @@ -17,31 +17,52 @@ START=71 apply_sysctl() { - [ $(sysctl -n -e dev.nss.general.redirect) -eq 0 ] && /etc/init.d/qca-nss-ecm start + [ "$(sysctl -n -e dev.nss.general.redirect)" -eq 0 ] && /etc/init.d/qca-nss-ecm start # Running this script multiple times is useless, as extra_pbuf_core0 # can't be changed if it is allocated, assume it's already been run. - if [ $(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0) -eq 0 ]; then + if [ "$(sysctl -n -e dev.nss.n2hcfg.extra_pbuf_core0)" -eq 0 ]; then logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0" - sysctl -w dev.nss.n2hcfg.extra_pbuf_core0=$extra_pbuf_core0 > /dev/null 2> /dev/null + sysctl -w dev.nss.n2hcfg.extra_pbuf_core0="$extra_pbuf_core0" > /dev/null 2> /dev/null else - logger -t ath11k_nss "Sysctl key 'extra_pbuf_core0' already set to '"$extra_pbuf_core0"'. Skipping applying wifi nss configs" + logger -t ath11k_nss "Sysctl key 'extra_pbuf_core0' already set to '""$extra_pbuf_core0""'. Skipping applying wifi nss configs" fi - sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 > /dev/null 2>/dev/null + sysctl -w dev.nss.n2hcfg.n2h_high_water_core0="$n2h_high_water_core0" > /dev/null 2>/dev/null logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf" - sysctl -w dev.nss.n2hcfg.n2h_wifi_pool_buf=$n2h_wifi_pool_buf + sysctl -w dev.nss.n2hcfg.n2h_wifi_pool_buf="$n2h_wifi_pool_buf" logger -t ath11k_nss "$board - setting dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0" - sysctl -w dev.nss.n2hcfg.n2h_high_water_core0=$n2h_high_water_core0 + sysctl -w dev.nss.n2hcfg.n2h_high_water_core0="$n2h_high_water_core0" } apply_nss_config() { + if [ ! -r /sys/module/ath11k/parameters/nss_offload ]; then + logger -t ath11k_nss "Module parameter '/sys/module/ath11k/parameters/nss_offload' does NOT exist. Skipping applying wifi nss configs" + exit 1 + fi - sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core0=256 > /dev/null 2> /dev/null - sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core1=256 > /dev/null 2> /dev/null + enable_nss_offload=$(cat /sys/module/ath11k/parameters/nss_offload) + + if [ "$enable_nss_offload" -ne "1" ]; then + logger -t ath11k_nss -s user.warn "Module parameter 'nss_offload=0'. Skipping applying wifi nss configs" + exit 1 + fi + + [ ! -d "/proc/sys/dev/nss/rps" ] && { + logger -s -t ath11k_nss -p user.error "NSS driver not loaded or disabled! Exiting... " + exit 1 + } + + # Lock NSS clock to highest setting + sysctl -w dev.nss.clock.auto_scale=0 > /dev/null 2> /dev/null + + sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core0=2048 > /dev/null 2> /dev/null + sysctl -w dev.nss.n2hcfg.n2h_queue_limit_core1=2048 > /dev/null 2> /dev/null + + sysctl -w dev.nss.rps.hash_bitmap=15 > /dev/null 2> /dev/null local memory_profile if memory_profile=$(uci_get pbuf.opt.memory_profile); then @@ -64,7 +85,7 @@ apply_nss_config() { ;; esac else - exi 0 + exit 0 fi case "$board" in @@ -104,18 +125,25 @@ apply_nss_config() { esac } -start() { - if [ ! -r /sys/module/ath11k/parameters/nss_offload ]; then - logger -t ath11k_nss "Module parameter '/sys/module/ath11k/parameters/nss_offload' does NOT exist. Skipping applying wifi nss configs" - exit 1 - fi +boost_performance() { - enable_nss_offload=$(cat /sys/module/ath11k/parameters/nss_offload) + find /sys/kernel/debug/ath11k -name stats_disable| while read -r stats_disable; do + echo 1 > "$stats_disable" + done - if [ "$enable_nss_offload" = "0" ]; then - logger -t ath11k_nss -s user.warn "Module parameter 'nss_offload=0'. Skipping applying wifi nss configs" - exit 1 - fi + ubus call iwinfo devices | jsonfilter -e "@.devices[*]"| while read -r device; do + tc qdisc replace dev "${device}" root noqueue + done + + for num in 0 1 2 3; do + echo "performance" > /sys/devices/system/cpu/cpu${num}/cpufreq/scaling_governor + done + +} +start() { + + boost_performance apply_nss_config + } diff --git a/package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch b/package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch deleted file mode 100644 index 1826e64bbcba05..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/107-ath11k-tid-counter-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -From e227e5896dc8fe69d63334819c5fbada9caddc50 Mon Sep 17 00:00:00 2001 -From: Miles Hu -Date: Tue, 14 Jan 2020 14:29:53 -0800 -Subject: [PATCH] tid fix - ---- - drivers/net/wireless/ath/ath11k/hal_rx.c | 2 +- - drivers/net/wireless/ath/ath11k/hal_rx.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/hal_rx.c -+++ b/drivers/net/wireless/ath/ath11k/hal_rx.c -@@ -905,7 +905,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc - __le32_to_cpu(eu_stats->info1)); - ppdu_info->tid = - ffs(FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO7_TID_BITMAP, -- __le32_to_cpu(eu_stats->info7))) - 1; -+ __le32_to_cpu(eu_stats->rsvd2[0]))) - 1; - ppdu_info->tcp_msdu_count = - FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT, - __le32_to_cpu(eu_stats->info4)); diff --git a/package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch b/package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch deleted file mode 100644 index ddae9fcbc50e7d..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/211-ath11k-add-obss-pd-support.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 81694575884dc69535252a6f44128323fd6a2504 Mon Sep 17 00:00:00 2001 -From: Rajkumar Manoharan -Date: Sat, 26 Sep 2020 23:17:03 -0700 -Subject: [PATCH 1/3] nl80211: fix OBSS PD min and max offset validation - -The SRG minimum and maximum offset doesn't present when the SR control field -of Spatial Reuse Parameter Set element set SRG Information Present to 0. -Both attributes are 1-byte values so use appropriate nla_get function. - -Signed-off-by: Rajkumar Manoharan ---- - net/wireless/nl80211.c | 21 ++++++++++----------- - 1 file changed, 10 insertions(+), 11 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -3272,7 +3272,8 @@ static int ath11k_mac_config_obss_pd(str - { - u32 bitmap[2], param_id, param_val, pdev_id; - int ret; -- s8 non_srg_th = 0, srg_th = 0; -+ s8 non_srg_th = ATH11K_OBSS_PD_THRESHOLD_DISABLED; -+ s8 srg_th = 0; - - pdev_id = ar->pdev->pdev_id; - -@@ -3301,8 +3302,6 @@ static int ath11k_mac_config_obss_pd(str - if (he_obss_pd->sr_ctrl & IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT) - non_srg_th = (ATH11K_OBSS_PD_MAX_THRESHOLD + - he_obss_pd->non_srg_max_offset); -- else -- non_srg_th = ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD; - - param_val |= ATH11K_OBSS_PD_NON_SRG_EN; - } -@@ -3317,7 +3316,8 @@ static int ath11k_mac_config_obss_pd(str - param_val |= ATH11K_OBSS_PD_THRESHOLD_IN_DBM; - param_val |= FIELD_PREP(GENMASK(15, 8), srg_th); - } else { -- non_srg_th -= ATH11K_DEFAULT_NOISE_FLOOR; -+ if ((non_srg_th & 0xff) != ATH11K_OBSS_PD_THRESHOLD_DISABLED) -+ non_srg_th -= ATH11K_DEFAULT_NOISE_FLOOR; - /* SRG not supported and threshold in dB */ - param_val &= ~(ATH11K_OBSS_PD_SRG_EN | - ATH11K_OBSS_PD_THRESHOLD_IN_DBM); ---- a/drivers/net/wireless/ath/ath11k/mac.h -+++ b/drivers/net/wireless/ath/ath11k/mac.h -@@ -121,7 +121,7 @@ struct ath11k_generic_iter { - #define ATH11K_PEER_RX_NSS_80_80MHZ GENMASK(5, 3) - - #define ATH11K_OBSS_PD_MAX_THRESHOLD -82 --#define ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD -62 -+#define ATH11K_OBSS_PD_THRESHOLD_DISABLED 128 - #define ATH11K_OBSS_PD_THRESHOLD_IN_DBM BIT(29) - #define ATH11K_OBSS_PD_SRG_EN BIT(30) - #define ATH11K_OBSS_PD_NON_SRG_EN BIT(31) diff --git a/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch b/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch deleted file mode 100644 index 87314bc425d3d1..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch +++ /dev/null @@ -1,920 +0,0 @@ -From 30f54666ae15128f26fbad787a35253885a10513 Mon Sep 17 00:00:00 2001 -From: Ramya Gnanasekar -Date: Fri, 25 Dec 2020 16:11:06 +0530 -Subject: [PATCH] ath11k: Disable rx_header tlv for 2K SKB - -On low memory platform hdr_status in hal_rx_desc is not subscribed to -get a savings of 128bytes in skb. This is required to reduce the skb -size from 4K to 2K. Use HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG message -to unsubscribe rx_pkt_header tlv for rxdma ring. - -Signed-off-by: Ramya Gnanasekar - ---- a/drivers/net/wireless/ath/ath11k/debugfs.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -666,6 +666,7 @@ static ssize_t ath11k_write_extd_rx_stat - } - - ar->debug.rx_filter = tlv_filter.rx_filter; -+ tlv_filter.offset_valid = false; - - for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { - ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; -@@ -1111,6 +1112,7 @@ static ssize_t ath11k_write_pktlog_filte - } - - /* Clear rx filter set for monitor mode and rx status */ -+ tlv_filter.offset_valid = false; - for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { - ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; - ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id, ---- a/drivers/net/wireless/ath/ath11k/dp.h -+++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -219,7 +219,8 @@ struct ath11k_pdev_dp { - #define DP_REO_CMD_RING_SIZE 256 - #define DP_REO_STATUS_RING_SIZE 2048 - #define DP_RXDMA_BUF_RING_SIZE 4096 --#define DP_RXDMA_REFILL_RING_SIZE 2048 -+#define DP_RXDMA_REFILL_RING_SIZE ATH11K_DP_RXDMA_REFILL_RING_SIZE -+#define DP_RXDMA_NSS_REFILL_RING_SIZE ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE - #define DP_RXDMA_ERR_DST_RING_SIZE 1024 - #define DP_RXDMA_MON_STATUS_RING_SIZE ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE - #define DP_RXDMA_MONITOR_BUF_RING_SIZE ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE -@@ -609,7 +610,7 @@ enum htt_ppdu_stats_tag_type { - * - * |31 26|25|24|23 16|15 8|7 0| - * |-----------------+----------------+----------------+---------------| -- * | rsvd1 |PS|SS| ring_id | pdev_id | msg_type | -+ * | rsvd1|OV|PS|SS| ring_id | pdev_id | msg_type | - * |-------------------------------------------------------------------| - * | rsvd2 | ring_buffer_size | - * |-------------------------------------------------------------------| -@@ -623,6 +624,14 @@ enum htt_ppdu_stats_tag_type { - * |-------------------------------------------------------------------| - * | tlv_filter_in_flags | - * |-------------------------------------------------------------------| -+ * | rx_header_offset | rx_packet_offset | -+ * |-------------------------------------------------------------------| -+ * | rx_mpdu_start_offset | rx_mpdu_end_offset | -+ * |-------------------------------------------------------------------| -+ * | rx_msdu_start_offset | rx_msdu_end_offset | -+ * |-------------------------------------------------------------------| -+ * | rsvd3 | rx_attention_offset | -+ * |-------------------------------------------------------------------| - * Where: - * PS = pkt_swap - * SS = status_swap -@@ -636,6 +645,9 @@ enum htt_ppdu_stats_tag_type { - * More details can be got from enum htt_srng_ring_id - * b'24 - status_swap: 1 is to swap status TLV - * b'25 - pkt_swap: 1 is to swap packet TLV -+ * b'26 - rx_offset_valid (OV): flag to indicate rx offsets -+ * configuration fields are valid -+ * - * b'26:31 - rsvd1: reserved for future use - * dword1 - b'0:16 - ring_buffer_size: size of buffers referenced by rx ring, - * in byte units. -@@ -665,6 +677,42 @@ enum htt_ppdu_stats_tag_type { - * dword6 - b'0:31 - tlv_filter_in_flags: - * Filter in Attention/MPDU/PPDU/Header/User tlvs - * Refer to CFG_TLV_FILTER_IN_FLAG defs -+ * dword7 - b'0:15 - rx_packet_offset: rx_packet_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_1 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * - b'16:31 - rx_header_offset: rx_header_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_1 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * dword8 - b'0:15 - rx_mpdu_end_offset: rx_mpdu_end_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_2 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * - b'16:31 - rx_mpdu_start_offset: rx_mpdu_start_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_2 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * dword9 - b'0:15 - rx_msdu_end_offset: rx_msdu_end_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_3 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * - b'16:31 - rx_msdu_start_offset: rx_msdu_start_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_3 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * dword10- b'0:15 - rx_attention_offset: rx_attention_offset in byte units -+ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -+ * A value of 0 will be considered as ignore this config. -+ * Refer to BUF_RING_CFG_4 defs within HW .h files, -+ * e.g. wmac_top_reg_seq_hwioreg.h -+ * - b'16:31 - rsvd3 for future use - */ - - #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) -@@ -672,8 +720,16 @@ enum htt_ppdu_stats_tag_type { - #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID GENMASK(23, 16) - #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS BIT(24) - #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS BIT(25) -+#define HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID BIT(26) - - #define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE GENMASK(15, 0) -+#define HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET GENMASK(15, 0) -+#define HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET GENMASK(31, 16) -+#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET GENMASK(15, 0) -+#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET GENMASK(31, 16) -+#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET GENMASK(15, 0) -+#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET GENMASK(31, 16) -+#define HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET GENMASK(15, 0) - - enum htt_rx_filter_tlv_flags { - HTT_RX_FILTER_TLV_FLAGS_MPDU_START = BIT(0), -@@ -977,6 +1033,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { - HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ - HTT_RX_FILTER_TLV_FLAGS_ATTENTION) - -+#define HTT_RX_RXDMA_FILTER_TLV_FLAGS_BUF_RING \ -+ (HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \ -+ HTT_RX_FILTER_TLV_FLAGS_MSDU_START | \ -+ HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \ -+ HTT_RX_FILTER_TLV_FLAGS_MSDU_END | \ -+ HTT_RX_FILTER_TLV_FLAGS_MPDU_END | \ -+ HTT_RX_FILTER_TLV_FLAGS_ATTENTION) -+ - struct htt_rx_ring_selection_cfg_cmd { - u32 info0; - u32 info1; -@@ -985,6 +1049,10 @@ struct htt_rx_ring_selection_cfg_cmd { - u32 pkt_type_en_flags2; - u32 pkt_type_en_flags3; - u32 rx_filter_tlv; -+ u32 rx_packet_offset; -+ u32 rx_mpdu_offset; -+ u32 rx_msdu_offset; -+ u32 rx_attn_offset; - } __packed; - - struct htt_rx_ring_tlv_filter { -@@ -993,6 +1061,14 @@ struct htt_rx_ring_tlv_filter { - u32 pkt_filter_flags1; /* MGMT */ - u32 pkt_filter_flags2; /* CTRL */ - u32 pkt_filter_flags3; /* DATA */ -+ bool offset_valid; -+ u16 rx_packet_offset; -+ u16 rx_header_offset; -+ u16 rx_mpdu_end_offset; -+ u16 rx_mpdu_start_offset; -+ u16 rx_msdu_end_offset; -+ u16 rx_msdu_start_offset; -+ u16 rx_attn_offset; - }; - - #define HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -70,6 +70,12 @@ static inline bool ath11k_dp_rx_h_mpdu_s - return ab->hw_params.hw_ops->rx_desc_get_mpdu_fc_valid(desc); - } - -+static u16 ath11k_dp_rxdesc_get_mpdu_frame_ctrl(struct ath11k_base *ab, -+ struct hal_rx_desc *desc) -+{ -+ return ab->hw_params.hw_ops->rx_desc_get_mpdu_frame_ctl(desc); -+} -+ - static inline bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab, - struct sk_buff *skb) - { -@@ -306,6 +312,35 @@ static u8 *ath11k_dp_rxdesc_mpdu_start_a - return ab->hw_params.hw_ops->rx_desc_mpdu_start_addr2(desc); - } - -+#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M -+static void ath11k_dp_get_rx_header_offset(struct ath11k_base *ab, -+ struct htt_rx_ring_tlv_filter *tlv_filter) -+{ -+ ab->hw_params.hw_ops->rx_desc_get_offset(tlv_filter); -+} -+#endif -+ -+static bool ath11k_dp_rx_desc_dot11_hdr_fields_valid(struct ath11k_base *ab, -+ struct hal_rx_desc *desc) -+{ -+ return ab->hw_params.hw_ops->rx_desc_dot11_hdr_fields_valid(desc); -+} -+ -+static void ath11k_dp_rx_desc_get_dot11_hdr(struct ath11k_base *ab, -+ struct hal_rx_desc *desc, -+ struct ieee80211_hdr *hdr) -+{ -+ ab->hw_params.hw_ops->rx_desc_get_dot11_hdr(desc, hdr); -+} -+ -+static void ath11k_dp_rx_desc_get_crypto_header(struct ath11k_base *ab, -+ struct hal_rx_desc *desc, -+ u8 *crypto_hdr, -+ enum hal_encrypt_type enctype) -+{ -+ ab->hw_params.hw_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype); -+} -+ - static void ath11k_dp_service_mon_ring(struct timer_list *t) - { - struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer); -@@ -1976,6 +2011,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a - return 0; - } - -+static void ath11k_get_dot11_hdr_from_rx_desc(struct ath11k *ar, -+ struct sk_buff *msdu, -+ struct ath11k_skb_rxcb *rxcb, -+ struct ieee80211_rx_status *status, -+ enum hal_encrypt_type enctype) -+{ -+ struct hal_rx_desc *rx_desc = rxcb->rx_desc; -+ struct ath11k_base *ab = ar->ab; -+ size_t hdr_len, crypto_len; -+ struct ieee80211_hdr *hdr; -+ u16 fc, qos_ctl = 0; -+ u8 *crypto_hdr; -+ -+ if (!(status->flag & RX_FLAG_IV_STRIPPED)) { -+ crypto_len = ath11k_dp_rx_crypto_param_len(ar, enctype); -+ crypto_hdr = skb_push(msdu, crypto_len); -+ ath11k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); -+ } -+ -+ fc = ath11k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc); -+ hdr_len = ieee80211_hdrlen(fc); -+ skb_push(msdu, hdr_len); -+ hdr = (struct ieee80211_hdr *)msdu->data; -+ hdr->frame_control = fc; -+ -+ /* Get wifi header from rx_desc */ -+ ath11k_dp_rx_desc_get_dot11_hdr(ab, rx_desc, hdr); -+ -+ if (rxcb->is_mcbc) -+ status->flag &= ~RX_FLAG_PN_VALIDATED; -+ -+ /* Add QOS header */ -+ if (ieee80211_is_data_qos(hdr->frame_control)) { -+ qos_ctl = rxcb->tid; -+ if (ath11k_dp_rx_h_msdu_start_mesh_ctl_present(ab, rx_desc)) -+ qos_ctl |= IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT; -+ -+ /* TODO Add other QoS ctl fields when required */ -+ memcpy(msdu->data + (hdr_len - IEEE80211_QOS_CTL_LEN), -+ &qos_ctl, IEEE80211_QOS_CTL_LEN); -+ } -+} -+ - static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, - struct sk_buff *msdu, - u8 *first_hdr, -@@ -1989,7 +2067,8 @@ static void ath11k_dp_rx_h_undecap_nwifi - u8 da[ETH_ALEN]; - u8 sa[ETH_ALEN]; - u16 qos_ctl = 0; -- u8 *qos; -+ u8 *qos, *crypto_hdr; -+ bool add_qos_ctrl = false; - - /* copy SA & DA and pull decapped header */ - hdr = (struct ieee80211_hdr *)msdu->data; -@@ -1998,7 +2077,7 @@ static void ath11k_dp_rx_h_undecap_nwifi - ether_addr_copy(sa, ieee80211_get_SA(hdr)); - skb_pull(msdu, ieee80211_hdrlen(hdr->frame_control)); - -- if (rxcb->is_first_msdu) { -+ if (rxcb->is_first_msdu && first_hdr) { - /* original 802.11 header is valid for the first msdu - * hence we can reuse the same header - */ -@@ -2028,16 +2107,23 @@ static void ath11k_dp_rx_h_undecap_nwifi - - /* copy decap header before overwriting for reuse below */ - memcpy(decap_hdr, (uint8_t *)hdr, hdr_len); -+ add_qos_ctrl = true; - } - - if (!(status->flag & RX_FLAG_IV_STRIPPED)) { -- memcpy(skb_push(msdu, -- ath11k_dp_rx_crypto_param_len(ar, enctype)), -- (void *)hdr + hdr_len, -- ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ if (first_hdr) { -+ memcpy(skb_push(msdu, -+ ath11k_dp_rx_crypto_param_len(ar, enctype)), -+ (void *)hdr + hdr_len, -+ ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ } else { -+ crypto_hdr = skb_push(msdu, ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ ath11k_dp_rx_desc_get_crypto_header(ar->ab, -+ rxcb->rx_desc, crypto_hdr, enctype); -+ } - } - -- if (!rxcb->is_first_msdu) { -+ if (!rxcb->is_first_msdu || add_qos_ctrl) { - memcpy(skb_push(msdu, - IEEE80211_QOS_CTL_LEN), &qos_ctl, - IEEE80211_QOS_CTL_LEN); -@@ -2153,6 +2239,20 @@ static void ath11k_dp_rx_h_undecap_eth(s - u8 da[ETH_ALEN]; - u8 sa[ETH_ALEN]; - void *rfc1042; -+ struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); -+ struct ath11k_dp_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}}; -+ -+ if (!first_hdr) { -+ eth = (struct ethhdr *)msdu->data; -+ ether_addr_copy(da, eth->h_dest); -+ ether_addr_copy(sa, eth->h_source); -+ rfc.snap_type = eth->h_proto; -+ skb_pull(msdu, sizeof(struct ethhdr)); -+ memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), &rfc, -+ sizeof(struct ath11k_dp_rfc1042_hdr)); -+ ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); -+ goto exit; -+ } - - rfc1042 = ath11k_dp_rx_h_find_rfc1042(ar, msdu, enctype); - if (WARN_ON_ONCE(!rfc1042)) -@@ -2181,6 +2281,7 @@ static void ath11k_dp_rx_h_undecap_eth(s - - memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); - -+exit: - /* original 802.11 header has a different DA and in - * case of 4addr it may also have different SA - */ -@@ -2199,6 +2300,7 @@ static void ath11k_dp_rx_h_undecap_snap( - size_t hdr_len; - u8 l3_pad_bytes; - struct hal_rx_desc *rx_desc; -+ struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); - - /* Delivered decapped frame: - * [amsdu header] <-- replaced with 802.11 hdr -@@ -2212,6 +2314,11 @@ static void ath11k_dp_rx_h_undecap_snap( - skb_put(msdu, l3_pad_bytes); - skb_pull(msdu, sizeof(struct ath11k_dp_amsdu_subframe_hdr) + l3_pad_bytes); - -+ if (!first_hdr) { -+ ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); -+ return; -+ } -+ - hdr = (struct ieee80211_hdr *)first_hdr; - hdr_len = ieee80211_hdrlen(hdr->frame_control); - -@@ -2608,6 +2715,20 @@ static int ath11k_dp_rx_process_msdu(str - goto free_out; - } - -+ hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); -+ /* wifi hdr fields validation for 512M:: -+ * Mcast packets in ethernet frame mode -+ * will need wifi hdr in msdu to validate PN. -+ * Header will be added in undecap routine. -+ * Validation on wifi hdr fields from rx_desc. -+ */ -+ if (!hdr_status && ath11k_dp_rx_h_attn_is_mcbc(ab, rx_desc) && -+ !ath11k_dp_rx_desc_dot11_hdr_fields_valid(ab, rx_desc)) { -+ ath11k_warn(ab, "One or more invalid dot11 header fields\n"); -+ ret = -EIO; -+ goto free_out; -+ } -+ - rxcb = ATH11K_SKB_RXCB(msdu); - rxcb->rx_desc = rx_desc; - msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ab, rx_desc); -@@ -2620,8 +2741,9 @@ static int ath11k_dp_rx_process_msdu(str - hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); - ret = -EINVAL; - ath11k_warn(ab, "invalid msdu len %u\n", msdu_len); -- ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", hdr_status, -- sizeof(struct ieee80211_hdr)); -+ if (hdr_status) -+ ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", hdr_status, -+ sizeof(struct ieee80211_hdr)); - ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", rx_desc, - sizeof(struct hal_rx_desc)); - goto free_out; -@@ -3283,6 +3405,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi - - hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); - hdr_len = ieee80211_hdrlen(hdr->frame_control); -+ - head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN; - tail_len = IEEE80211_CCMP_MIC_LEN + IEEE80211_TKIP_ICV_LEN + FCS_LEN; - -@@ -3563,8 +3686,8 @@ static void ath11k_dp_rx_h_sort_frags(st - - static u64 ath11k_dp_rx_h_get_pn(struct ath11k *ar, struct sk_buff *skb) - { -- struct ieee80211_hdr *hdr; - u64 pn = 0; -+ struct ieee80211_hdr *hdr; - u8 *ehdr; - u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; - -@@ -3794,8 +3917,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 - if ((msdu_len + hal_rx_desc_sz) > DP_RX_BUFFER_SIZE) { - hdr_status = ath11k_dp_rx_h_80211_hdr(ar->ab, rx_desc); - ath11k_warn(ar->ab, "invalid msdu leng %u", msdu_len); -- ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", hdr_status, -- sizeof(struct ieee80211_hdr)); -+ if (hdr_status) -+ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", hdr_status, -+ sizeof(struct ieee80211_hdr)); - ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", rx_desc, - sizeof(struct hal_rx_desc)); - dev_kfree_skb_any(msdu); -@@ -4418,6 +4542,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 - ath11k_dp_rxdma_pdev_buf_free(ar); - } - -+#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M -+static int ath11k_dp_rxdma_ring_sel_config(struct ath11k *ar) -+{ -+ struct ath11k_pdev_dp *dp = &ar->dp; -+ struct htt_rx_ring_tlv_filter tlv_filter = {0}; -+ u32 ring_id; -+ int ret; -+ u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; -+ -+ ring_id = dp->rx_refill_buf_ring.refill_buf_ring.ring_id; -+ -+ tlv_filter.rx_filter = HTT_RX_RXDMA_FILTER_TLV_FLAGS_BUF_RING; -+ tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR; -+ tlv_filter.pkt_filter_flags3 = HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST | -+ HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST; -+ tlv_filter.offset_valid = true; -+ tlv_filter.rx_packet_offset = hal_rx_desc_sz; -+ tlv_filter.rx_header_offset = 0; -+ -+ ath11k_dp_get_rx_header_offset(ar->ab, &tlv_filter); -+ -+ if (!ar->ab->nss.enabled) -+ ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, dp->mac_id, -+ HAL_RXDMA_BUF, -+ DP_RXDMA_REFILL_RING_SIZE, -+ &tlv_filter); -+ else -+ ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, dp->mac_id, -+ HAL_RXDMA_BUF, -+ DP_RXDMA_NSS_REFILL_RING_SIZE, -+ &tlv_filter); -+ -+ return ret; -+} -+#else -+static int ath11k_dp_rxdma_ring_sel_config(struct ath11k *ar) -+{ -+ return 0; -+} -+#endif -+ - int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) - { - struct ath11k *ar = ab->pdevs[mac_id].ar; -@@ -4511,6 +4676,12 @@ config_refill_ring: - } - } - -+ ret = ath11k_dp_rxdma_ring_sel_config(ar); -+ if (ret) { -+ ath11k_warn(ab, "failed to setup rxdma ring selection config\n"); -+ return ret; -+ } -+ - return 0; - } - ---- a/drivers/net/wireless/ath/ath11k/dp_tx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -1127,6 +1127,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str - !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); - cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS, - !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); -+ cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID, -+ tlv_filter->offset_valid); - - cmd->info1 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE, - rx_buf_size); -@@ -1136,6 +1138,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str - cmd->pkt_type_en_flags3 = tlv_filter->pkt_filter_flags3; - cmd->rx_filter_tlv = tlv_filter->rx_filter; - -+ if (tlv_filter->offset_valid) { -+ cmd->rx_packet_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET, -+ tlv_filter->rx_packet_offset); -+ cmd->rx_packet_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET, -+ tlv_filter->rx_header_offset); -+ -+ cmd->rx_mpdu_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET, -+ tlv_filter->rx_mpdu_end_offset); -+ cmd->rx_mpdu_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET, -+ tlv_filter->rx_mpdu_start_offset); -+ -+ cmd->rx_msdu_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET, -+ tlv_filter->rx_msdu_end_offset); -+ cmd->rx_msdu_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET, -+ tlv_filter->rx_msdu_start_offset); -+ -+ cmd->rx_attn_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET, -+ tlv_filter->rx_attn_offset); -+ } -+ - ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); - if (ret) - goto err_free; -@@ -1214,6 +1236,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c - } - - ring_id = dp->rxdma_mon_buf_ring.refill_buf_ring.ring_id; -+ tlv_filter.offset_valid = false; - - if (!reset) { - tlv_filter.rx_filter = HTT_RX_MON_FILTER_TLV_FLAGS_MON_BUF_RING; ---- a/drivers/net/wireless/ath/ath11k/hw.c -+++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -260,7 +260,11 @@ static u8 ath11k_hw_ipq8074_rx_desc_get_ - - static u8 *ath11k_hw_ipq8074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) - { -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M - return desc->u.ipq8074.hdr_status; -+#else -+ return NULL; -+#endif - } - - static bool ath11k_hw_ipq8074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) -@@ -395,26 +399,132 @@ static void ath11k_hw_ipq8074_rx_desc_se - desc->u.ipq8074.msdu_start.info1 = __cpu_to_le32(info); - } - -+static -+struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc) -+{ -+ return &desc->u.ipq8074.attention; -+} -+ -+static u8 *ath11k_hw_ipq8074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc) -+{ -+ return &desc->u.ipq8074.msdu_payload[0]; -+} -+ -+#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M -+static void ath11k_hw_ipq8074_rx_desc_get_offset(struct htt_rx_ring_tlv_filter *tlv_filter) -+{ -+ tlv_filter->rx_mpdu_end_offset = __le16_to_cpu(offsetof -+ (struct hal_rx_desc_ipq8074, mpdu_end_tag)); -+ tlv_filter->rx_mpdu_start_offset = __le16_to_cpu(offsetof -+ (struct hal_rx_desc_ipq8074, mpdu_start_tag)); -+ tlv_filter->rx_msdu_end_offset = __le16_to_cpu(offsetof -+ (struct hal_rx_desc_ipq8074, msdu_end_tag)); -+ tlv_filter->rx_msdu_start_offset = __le16_to_cpu(offsetof -+ (struct hal_rx_desc_ipq8074, msdu_start_tag)); -+ tlv_filter->rx_attn_offset = __le16_to_cpu(offsetof -+ (struct hal_rx_desc_ipq8074, rx_attn_tag)); -+} -+#endif -+ -+static u16 ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl(struct hal_rx_desc *desc) -+{ -+ return __le16_to_cpu(desc->u.ipq8074.mpdu_start.frame_ctrl); -+} -+ - static bool ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) - { - return __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & - RX_MPDU_START_INFO1_MAC_ADDR2_VALID; - } - --static u8 *ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) -+static u8* ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) - { - return desc->u.ipq8074.mpdu_start.addr2; - } - --static --struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc) -+static bool ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid(struct hal_rx_desc *desc) - { -- return &desc->u.ipq8074.attention; -+ if ((ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(desc) && -+ ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid(desc) && -+ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & -+ RX_MPDU_START_INFO1_MAC_ADDR1_VALID && -+ ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(desc) && -+ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & -+ RX_MPDU_START_INFO1_MAC_ADDR3_VALID && -+ FIELD_GET((RX_MPDU_START_INFO1_MPDU_DUR_VALID), -+ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1)))) { -+ return true; -+ } -+ return false; -+} -+ -+static void ath11k_hw_ipq8074_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc, -+ struct ieee80211_hdr *hdr) -+{ -+ hdr->frame_control = __le16_to_cpu(desc->u.ipq8074.mpdu_start.frame_ctrl); -+ hdr->duration_id = __le16_to_cpu(desc->u.ipq8074.mpdu_start.duration); -+ ether_addr_copy(hdr->addr1, desc->u.ipq8074.mpdu_start.addr1); -+ ether_addr_copy(hdr->addr2, desc->u.ipq8074.mpdu_start.addr2); -+ ether_addr_copy(hdr->addr3, desc->u.ipq8074.mpdu_start.addr3); -+ if (__le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & -+ RX_MPDU_START_INFO1_MAC_ADDR4_VALID) { -+ ether_addr_copy(hdr->addr4, desc->u.ipq8074.mpdu_start.addr4); -+ } -+ hdr->seq_ctrl = __le16_to_cpu(desc->u.ipq8074.mpdu_start.seq_ctrl); -+} -+ -+static void ath11k_hw_ipq8074_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc, -+ u8 *crypto_hdr, -+ enum hal_encrypt_type enctype) -+{ -+ unsigned int key_id; -+ -+ switch (enctype) { -+ case HAL_ENCRYPT_TYPE_OPEN: -+ return; -+ case HAL_ENCRYPT_TYPE_TKIP_NO_MIC: -+ case HAL_ENCRYPT_TYPE_TKIP_MIC: -+ crypto_hdr[0] = -+ HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[0]); -+ crypto_hdr[1] = 0; -+ crypto_hdr[2] = -+ HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[0]); -+ break; -+ case HAL_ENCRYPT_TYPE_CCMP_128: -+ case HAL_ENCRYPT_TYPE_CCMP_256: -+ case HAL_ENCRYPT_TYPE_GCMP_128: -+ case HAL_ENCRYPT_TYPE_AES_GCMP_256: -+ crypto_hdr[0] = -+ HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[0]); -+ crypto_hdr[1] = -+ HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[0]); -+ crypto_hdr[2] = 0; -+ break; -+ case HAL_ENCRYPT_TYPE_WEP_40: -+ case HAL_ENCRYPT_TYPE_WEP_104: -+ case HAL_ENCRYPT_TYPE_WEP_128: -+ case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4: -+ case HAL_ENCRYPT_TYPE_WAPI: -+ return; -+ } -+ key_id = FIELD_GET(RX_MPDU_START_INFO5_KEY_ID, -+ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info5)); -+ crypto_hdr[3] = 0x20 | (key_id << 6); -+ crypto_hdr[4] = HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc->u.ipq8074.mpdu_start.pn[0]); -+ crypto_hdr[5] = HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc->u.ipq8074.mpdu_start.pn[0]); -+ crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[1]); -+ crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[1]); - } - --static u8 *ath11k_hw_ipq8074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc) -+static bool ath11k_hw_qcn9074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) - { -- return &desc->u.ipq8074.msdu_payload[0]; -+ return __le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & -+ RX_MPDU_START_INFO11_MAC_ADDR2_VALID; -+} -+ -+static u8* ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) -+{ -+ return desc->u.qcn9074.mpdu_start.addr2; - } - - static bool ath11k_hw_qcn9074_rx_desc_get_first_msdu(struct hal_rx_desc *desc) -@@ -437,7 +547,11 @@ static u8 ath11k_hw_qcn9074_rx_desc_get_ - - static u8 *ath11k_hw_qcn9074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) - { -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M - return desc->u.qcn9074.hdr_status; -+#else -+ return NULL; -+#endif - } - - static bool ath11k_hw_qcn9074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) -@@ -614,7 +728,11 @@ static u8 ath11k_hw_wcn6855_rx_desc_get_ - - static u8 *ath11k_hw_wcn6855_rx_desc_get_hdr_status(struct hal_rx_desc *desc) - { -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M - return desc->u.wcn6855.hdr_status; -+#else -+ return NULL; -+#endif - } - - static bool ath11k_hw_wcn6855_rx_desc_encrypt_valid(struct hal_rx_desc *desc) -@@ -956,6 +1074,13 @@ const struct ath11k_hw_ops ipq8074_ops = - .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, - .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, -+#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M -+ .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, -+#endif -+ .rx_desc_get_mpdu_frame_ctl = ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl, -+ .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, -+ .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, -+ .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, - }; - - const struct ath11k_hw_ops ipq6018_ops = { -@@ -1043,6 +1168,8 @@ const struct ath11k_hw_ops qcn9074_ops = - .wmi_init_config = ath11k_init_wmi_config_ipq8074, - .mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_ipq8074, - .mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_ipq8074, -+ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, -+ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, - .tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable, - .rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu, - .rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu, -@@ -1073,8 +1200,6 @@ const struct ath11k_hw_ops qcn9074_ops = - .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, - .reo_setup = ath11k_hw_ipq8074_reo_setup, - .mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid, -- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, -- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, - }; - ---- a/drivers/net/wireless/ath/ath11k/hw.h -+++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -22,7 +22,11 @@ - #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 - #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 - #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 -- -+#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 -+/* 256b desc TLV + 4b(rounded) Pad + 30byte max nwifi header + -+ * 18byte mesh hdr + 8byte snap + 1500 eth payload -+ */ -+#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 1816 - #elif defined(CPTCFG_ATH11K_MEM_PROFILE_512M) - #define TARGET_NUM_VDEVS(ab) 8 - #define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) -@@ -34,7 +38,11 @@ - #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 - #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 - #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 -- -+#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 -+/* 256b desc TLV + 4b(rounded) Pad + 30byte max nwifi header + -+ * 18byte mesh hdr + 8byte snap + 1500 eth payload -+ */ -+#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 1816 - #else - /* Num VDEVS per radio */ - #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_vdevs) -@@ -47,6 +55,8 @@ - #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 - #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 - #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 -+#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 -+#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 2048 - #endif - - /* Num of peers for Single Radio mode */ -@@ -142,6 +152,8 @@ enum ath11k_bus { - - struct hal_rx_desc; - struct hal_tcl_data_cmd; -+struct htt_rx_ring_tlv_filter; -+enum hal_encrypt_type; - - struct ath11k_hw_ring_mask { - u8 tx[ATH11K_EXT_IRQ_GRP_NUM_MAX]; -@@ -231,6 +243,7 @@ struct ath11k_hw_params { - const struct ath11k_hw_hal_params *hal_params; - bool supports_dynamic_smps_6ghz; - bool alloc_cacheable_memory; -+ u8 reo_dest_ring_map_shift; - bool supports_rssi_stats; - bool fw_wmi_diag_event; - bool current_cc_support; -@@ -299,6 +312,16 @@ struct ath11k_hw_ops { - bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); - u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); - u32 (*get_ring_selector)(struct sk_buff *skb); -+#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M -+ void (*rx_desc_get_offset)(struct htt_rx_ring_tlv_filter *tlv_filter); -+#endif -+ u16 (*rx_desc_get_mpdu_frame_ctl)(struct hal_rx_desc *desc); -+ bool (*rx_desc_dot11_hdr_fields_valid)(struct hal_rx_desc *desc); -+ void (*rx_desc_get_dot11_hdr)(struct hal_rx_desc *desc, -+ struct ieee80211_hdr *hdr); -+ void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, -+ u8 *crypto_hdr, -+ enum hal_encrypt_type enctype); - }; - - extern const struct ath11k_hw_ops ipq8074_ops; ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -3421,7 +3421,7 @@ static int ath11k_mac_config_obss_pd(str - - static void ath11k_mac_op_nss_bss_info_changed(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, -- u32 changed) -+ u64 changed) - { - struct ath11k *ar = hw->priv; - struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); -@@ -6340,6 +6340,7 @@ static int ath11k_mac_config_mon_status_ - tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); - } - -+ tlv_filter.offset_valid = false; - for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { - ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; - ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, -@@ -9716,8 +9717,6 @@ static int __ath11k_mac_register(struct - wiphy_ext_feature_set(ar->hw->wiphy, - NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); - -- wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); -- - ar->hw->queues = ATH11K_HW_MAX_QUEUES; - ar->hw->wiphy->tx_queue_len = ATH11K_QUEUE_LEN; - ar->hw->offchannel_tx_hw_queue = ATH11K_HW_MAX_QUEUES - 1; ---- a/drivers/net/wireless/ath/ath11k/rx_desc.h -+++ b/drivers/net/wireless/ath/ath11k/rx_desc.h -@@ -1442,9 +1442,11 @@ struct hal_rx_desc_ipq8074 { - __le32 mpdu_end_tag; - struct rx_mpdu_end mpdu_end; - u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M - __le32 hdr_status_tag; - __le32 phy_ppdu_id; - u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; -+#endif - u8 msdu_payload[]; - } __packed; - -@@ -1461,9 +1463,11 @@ struct hal_rx_desc_qcn9074 { - __le32 mpdu_end_tag; - struct rx_mpdu_end mpdu_end; - u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M - __le32 hdr_status_tag; - __le32 phy_ppdu_id; - u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; -+#endif - u8 msdu_payload[]; - } __packed; - -@@ -1480,9 +1484,11 @@ struct hal_rx_desc_wcn6855 { - __le32 mpdu_end_tag; - struct rx_mpdu_end mpdu_end; - u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; -+#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M - __le32 hdr_status_tag; - __le32 phy_ppdu_id; - u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; -+#endif - u8 msdu_payload[]; - } __packed; - -@@ -1502,4 +1508,17 @@ struct hal_rx_desc { - #define RU_484 18 - #define RU_996 37 - -+#define HAL_RX_MPDU_INFO_PN_GET_BYTE1(__val) \ -+ FIELD_GET(GENMASK(7, 0), __le32_to_cpu(__val)) -+ -+#define HAL_RX_MPDU_INFO_PN_GET_BYTE2(__val) \ -+ FIELD_GET(GENMASK(15, 8), __le32_to_cpu(__val)) -+ -+#define HAL_RX_MPDU_INFO_PN_GET_BYTE3(__val) \ -+ FIELD_GET(GENMASK(23, 16), __le32_to_cpu(__val)) -+ -+#define HAL_RX_MPDU_INFO_PN_GET_BYTE4(__val) \ -+ FIELD_GET(GENMASK(31, 24), __le32_to_cpu(__val)) -+ -+ - #endif /* ATH11K_RX_DESC_H */ ---- a/drivers/net/wireless/ath/ath11k/nss.c -+++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -1800,7 +1800,7 @@ static int ath11k_nss_init(struct ath11k - - /* fill rx parameters to initialize rx context */ - wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; -- wim->wrip.rx_buf_len = DP_RX_BUFFER_SIZE; -+ wim->wrip.rx_buf_len = DP_RXDMA_NSS_REFILL_RING_SIZE; - - /* fill hal srng message */ - wim->hssm.dev_base_addr = (u32)ab->mem_pa; diff --git a/package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch b/package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch deleted file mode 100644 index 08e158a407ca8f..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/234-001-ath11k-account-tx-rx-packets-flow.patch +++ /dev/null @@ -1,494 +0,0 @@ -From d6d86c0c48c8d114e94c5b5f749c97d629d727ef Mon Sep 17 00:00:00 2001 -From: Maharaja Kennadyrajan -Date: Mon, 4 Jan 2021 23:49:21 +0530 -Subject: [PATCH 1/2] ath11k/mac80211: Add support to account Tx and Rx flow - packets - -Added support to log the inflow and outflow of the Tx and Rx -packets in netif and host driver. - -Command to dump the Tx pkts flow in driver: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/driver_tx_pkts_flow - -Command to dump the Rx pkts flow in driver: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/driver_rx_pkts_flow - -Commands to reset the Tx/Rx pkts flow in driver: -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_tx_stats - -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_rx_stats - -Command to dump the Tx pkts flow in mac80211: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/mac80211_tx_pkts_flow - -Command to dump the Rx pkts flow in mac80211: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/mac80211_rx_pkts_flow - -Commands to reset the Tx/Rx pkts flow in mac80211: -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_tx_pkts_flow - -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_rx_pkts_flow - -Sample output after running the Tx and Rx traffic. - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_tx_pkts_flow -Tx packets inflow from mac80211: 20 -Tx packets outflow to HW: 20 - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_tx_pkts_flow -Tx packets outflow from netif: 20 -Tx packets inflow in mac80211: 20 - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_rx_pkts_flow -Rx packets inflow from HW: 28 -Rx packets outflow from driver: 28 - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_rx_pkts_flow -Rx packets inflow in mac80211: 28 -Rx packets inflow in netif: 26 -Rx forwarded packets in bridge: 2 - -Signed-off-by: Maharaja Kennadyrajan ---- - drivers/net/wireless/ath/ath11k/core.h | 12 ++ - drivers/net/wireless/ath/ath11k/debugfs.h | 2 + - drivers/net/wireless/ath/ath11k/debugfs_sta.c | 145 +++++++++++++++++- - drivers/net/wireless/ath/ath11k/dp_rx.c | 38 +++++ - drivers/net/wireless/ath/ath11k/mac.c | 11 ++ - 5 files changed, 207 insertions(+), 1 deletion(-) - ---- a/drivers/net/wireless/ath/ath11k/core.h -+++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -494,6 +494,17 @@ struct ath11k_per_ppdu_tx_stats { - - DECLARE_EWMA(avg_rssi, 10, 8) - -+struct ath11k_driver_tx_pkts_flow { -+ atomic_t pkts_in; -+ atomic_t pkts_out; -+}; -+ -+struct ath11k_driver_rx_pkts_flow { -+ atomic_t pkts_frm_hw; -+ atomic_t pkts_out; -+ atomic_t pkts_out_to_netif; -+}; -+ - struct ath11k_sta { - struct ath11k_vif *arvif; - -@@ -527,6 +538,8 @@ struct ath11k_sta { - #ifdef CPTCFG_ATH11K_NSS_SUPPORT - struct ath11k_nss_sta_stats *nss_stats; - #endif -+ struct ath11k_driver_tx_pkts_flow drv_tx_pkts; -+ struct ath11k_driver_rx_pkts_flow drv_rx_pkts; - u16 tcl_metadata; - - /* Protected with ar->data_lock */ ---- a/drivers/net/wireless/ath/ath11k/debugfs.h -+++ b/drivers/net/wireless/ath/ath11k/debugfs.h -@@ -98,7 +98,7 @@ struct ath_pktlog_hdr { - }; - - #define ATH11K_HTT_PEER_STATS_RESET BIT(16) -- -+#define ATH11K_DRV_TX_STATS_SIZE 1024 - #define ATH11K_HTT_STATS_BUF_SIZE (1024 * 512) - #define ATH11K_FW_STATS_BUF_SIZE (1024 * 1024) - ---- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c -@@ -146,9 +146,6 @@ static ssize_t ath11k_dbg_sta_dump_tx_st - const int size = 2 * 4096; - char *buf; - -- if (!arsta->tx_stats) -- return -ENOENT; -- - buf = kzalloc(size, GFP_KERNEL); - if (!buf) - return -ENOMEM; -@@ -156,6 +153,12 @@ static ssize_t ath11k_dbg_sta_dump_tx_st - mutex_lock(&ar->conf_mutex); - - spin_lock_bh(&ar->data_lock); -+ -+ if (!arsta->tx_stats) { -+ retval = -ENOENT; -+ goto end; -+ } -+ - for (k = 0; k < ATH11K_STATS_TYPE_MAX; k++) { - for (j = 0; j < ATH11K_COUNTER_TYPE_MAX; j++) { - stats = &arsta->tx_stats->stats[k]; -@@ -229,6 +232,11 @@ static ssize_t ath11k_dbg_sta_dump_tx_st - - mutex_unlock(&ar->conf_mutex); - return retval; -+end: -+ spin_unlock_bh(&ar->data_lock); -+ mutex_unlock(&ar->conf_mutex); -+ kfree(buf); -+ return retval; - } - - static const struct file_operations fops_tx_stats = { -@@ -847,17 +855,211 @@ static const struct file_operations fops - .llseek = default_llseek, - }; - -+static ssize_t ath11k_dbg_sta_reset_rx_stats(struct file *file, -+ const char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ieee80211_sta *sta = file->private_data; -+ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; -+ struct ath11k *ar = arsta->arvif->ar; -+ int ret, reset; -+ -+ if (!arsta->rx_stats) -+ return -ENOENT; -+ -+ ret = kstrtoint_from_user(buf, count, 0, &reset); -+ if (ret) -+ return ret; -+ -+ if (!reset || reset > 1) -+ return -EINVAL; -+ -+ spin_lock_bh(&ar->ab->base_lock); -+ memset(arsta->rx_stats, 0, sizeof(*arsta->rx_stats)); -+ atomic_set(&arsta->drv_rx_pkts.pkts_frm_hw, 0); -+ atomic_set(&arsta->drv_rx_pkts.pkts_out, 0); -+ atomic_set(&arsta->drv_rx_pkts.pkts_out_to_netif, 0); -+ spin_unlock_bh(&ar->ab->base_lock); -+ -+ ret = count; -+ return ret; -+} -+ -+static const struct file_operations fops_reset_rx_stats = { -+ .write = ath11k_dbg_sta_reset_rx_stats, -+ .open = simple_open, -+ .owner = THIS_MODULE, -+ .llseek = default_llseek, -+}; -+ -+static ssize_t -+ath11k_dbg_sta_dump_driver_tx_pkts_flow(struct file *file, -+ char __user *user_buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ieee80211_sta *sta = file->private_data; -+ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; -+ struct ath11k *ar = arsta->arvif->ar; -+ int len = 0, ret_val; -+ const int size = ATH11K_DRV_TX_STATS_SIZE; -+ char *buf; -+ -+ buf = kzalloc(ATH11K_DRV_TX_STATS_SIZE, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; -+ -+ mutex_lock(&ar->conf_mutex); -+ spin_lock_bh(&ar->ab->base_lock); -+ -+ if (!arsta->tx_stats) { -+ ret_val = -ENOENT; -+ goto end; -+ } -+ -+ len += scnprintf(buf + len, size - len, -+ "Tx packets inflow from mac80211: %u\n", -+ atomic_read(&arsta->drv_tx_pkts.pkts_in)); -+ len += scnprintf(buf + len, size - len, -+ "Tx packets outflow to HW: %u\n", -+ atomic_read(&arsta->drv_tx_pkts.pkts_out)); -+ spin_unlock_bh(&ar->ab->base_lock); -+ -+ if (len > size) -+ len = size; -+ -+ ret_val = simple_read_from_buffer(user_buf, count, ppos, buf, len); -+ kfree(buf); -+ -+ mutex_unlock(&ar->conf_mutex); -+ return ret_val; -+end: -+ spin_unlock_bh(&ar->ab->base_lock); -+ mutex_unlock(&ar->conf_mutex); -+ kfree(buf); -+ return ret_val; -+} -+ -+static const struct file_operations fops_driver_tx_pkts_flow = { -+ .read = ath11k_dbg_sta_dump_driver_tx_pkts_flow, -+ .open = simple_open, -+ .owner = THIS_MODULE, -+ .llseek = default_llseek, -+}; -+ -+static ssize_t ath11k_dbg_sta_reset_tx_stats(struct file *file, -+ const char __user *buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ieee80211_sta *sta = file->private_data; -+ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; -+ struct ath11k *ar = arsta->arvif->ar; -+ int ret, reset; -+ -+ ret = kstrtoint_from_user(buf, count, 0, &reset); -+ if (ret) -+ return ret; -+ -+ if (!reset || reset > 1) -+ return -EINVAL; -+ -+ spin_lock_bh(&ar->ab->base_lock); -+ -+ if (!arsta->tx_stats) { -+ spin_unlock_bh(&ar->ab->base_lock); -+ return -ENOENT; -+ } -+ -+ memset(arsta->tx_stats, 0, sizeof(*arsta->tx_stats)); -+ atomic_set(&arsta->drv_tx_pkts.pkts_in, 0); -+ atomic_set(&arsta->drv_tx_pkts.pkts_out, 0); -+ spin_unlock_bh(&ar->ab->base_lock); -+ -+ ret = count; -+ return ret; -+} -+ -+static const struct file_operations fops_reset_tx_stats = { -+ .write = ath11k_dbg_sta_reset_tx_stats, -+ .open = simple_open, -+ .owner = THIS_MODULE, -+ .llseek = default_llseek, -+}; -+ -+static ssize_t -+ath11k_dbg_sta_dump_driver_rx_pkts_flow(struct file *file, -+ char __user *user_buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ieee80211_sta *sta = file->private_data; -+ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; -+ struct ath11k *ar = arsta->arvif->ar; -+ struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; -+ int len = 0, ret_val = 0; -+ const int size = 1024; -+ char *buf; -+ -+ if (!rx_stats) -+ return -ENOENT; -+ -+ buf = kzalloc(size, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; -+ -+ mutex_lock(&ar->conf_mutex); -+ spin_lock_bh(&ar->ab->base_lock); -+ -+ len += scnprintf(buf + len, size - len, -+ "Rx packets inflow from HW: %u\n", -+ atomic_read(&arsta->drv_rx_pkts.pkts_frm_hw)); -+ len += scnprintf(buf + len, size - len, -+ "Rx packets outflow from driver: %u\n", -+ atomic_read(&arsta->drv_rx_pkts.pkts_out)); -+ len += scnprintf(buf + len, size - len, -+ "Rx packets outflow from driver to netif in Fast rx: %u\n", -+ atomic_read(&arsta->drv_rx_pkts.pkts_out_to_netif)); -+ -+ len += scnprintf(buf + len, size - len, "\n"); -+ -+ spin_unlock_bh(&ar->ab->base_lock); -+ -+ if (len > size) -+ len = size; -+ -+ ret_val = simple_read_from_buffer(user_buf, count, ppos, buf, len); -+ kfree(buf); -+ -+ mutex_unlock(&ar->conf_mutex); -+ return ret_val; -+} -+ -+static const struct file_operations fops_driver_rx_pkts_flow = { -+ .read = ath11k_dbg_sta_dump_driver_rx_pkts_flow, -+ .open = simple_open, -+ .owner = THIS_MODULE, -+ .llseek = default_llseek, -+}; -+ - void ath11k_debugfs_sta_op_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_sta *sta, struct dentry *dir) - { - struct ath11k *ar = hw->priv; - -- if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) -- debugfs_create_file("tx_stats", 0400, dir, sta, -- &fops_tx_stats); -- if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) -+ if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) { -+ debugfs_create_file("tx_stats", 0400, dir, sta, -+ &fops_tx_stats); -+ debugfs_create_file("reset_tx_stats", 0600, dir, sta, -+ &fops_reset_tx_stats); -+ debugfs_create_file("driver_tx_pkts_flow", 0400, dir, sta, -+ &fops_driver_tx_pkts_flow); -+ } -+ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { - debugfs_create_file("rx_stats", 0400, dir, sta, - &fops_rx_stats); -+ debugfs_create_file("reset_rx_stats", 0600, dir, sta, -+ &fops_reset_rx_stats); -+ debugfs_create_file("driver_rx_pkts_flow", 0400, dir, sta, -+ &fops_driver_rx_pkts_flow); -+ } - - debugfs_create_file("htt_peer_stats", 0400, dir, sta, - &fops_htt_peer_stats); ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2416,6 +2416,7 @@ static void ath11k_dp_rx_h_mpdu(struct a - struct rx_attention *rx_attention; - u32 err_bitmap; - -+ - /* PN for multicast packets will be checked in mac80211 */ - rxcb = ATH11K_SKB_RXCB(msdu); - fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); -@@ -2609,6 +2610,7 @@ static void ath11k_dp_rx_deliver_msdu(st - struct ieee80211_rx_status *rx_status; - struct ieee80211_radiotap_he *he = NULL; - struct ieee80211_sta *pubsta = NULL; -+ struct ath11k_sta *arsta = NULL; - struct ath11k_peer *peer; - struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); - u8 decap = DP_RX_DECAP_TYPE_RAW; -@@ -2674,6 +2676,18 @@ static void ath11k_dp_rx_deliver_msdu(st - rx_status->flag |= RX_FLAG_8023; - - ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); -+ -+ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { -+ if (!(status->flag & RX_FLAG_ONLY_MONITOR)) { -+ spin_lock_bh(&ar->ab->base_lock); -+ if (peer && peer->sta) -+ arsta = -+ (struct ath11k_sta *)peer->sta->drv_priv; -+ spin_unlock_bh(&ar->ab->base_lock); -+ if (arsta) -+ atomic_inc(&arsta->drv_rx_pkts.pkts_out); -+ } -+ } - } - - static int ath11k_dp_rx_process_msdu(struct ath11k *ar, -@@ -2820,6 +2834,8 @@ int ath11k_dp_process_rx(struct ath11k_b - int total_msdu_reaped = 0; - struct hal_srng *srng; - struct sk_buff *msdu; -+ struct ath11k_peer *peer = NULL; -+ struct ath11k_sta *arsta = NULL; - bool done = false; - int buf_id, mac_id; - struct ath11k *ar; -@@ -2893,6 +2909,19 @@ try_again: - rxcb->tid = FIELD_GET(HAL_REO_DEST_RING_INFO0_RX_QUEUE_NUM, - desc->info0); - -+ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar) && rxcb->peer_id) { -+ rcu_read_lock(); -+ spin_lock_bh(&ab->base_lock); -+ peer = ath11k_peer_find_by_id(ab, rxcb->peer_id); -+ if (peer && peer->sta) -+ arsta = -+ (struct ath11k_sta *)peer->sta->drv_priv; -+ spin_unlock_bh(&ab->base_lock); -+ if (arsta) -+ atomic_inc(&arsta->drv_rx_pkts.pkts_frm_hw); -+ rcu_read_unlock(); -+ } -+ - rxcb->mac_id = mac_id; - __skb_queue_tail(&msdu_list[mac_id], msdu); - -@@ -4084,7 +4113,10 @@ static int ath11k_dp_rx_h_null_q_desc(st - struct rx_attention *rx_attention; - u8 l3pad_bytes; - struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); -+ struct ath11k_peer *peer = NULL; -+ struct ath11k_sta *arsta = NULL; - u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; -+ u32 peer_id; - - msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ar->ab, desc); - -@@ -4136,6 +4168,18 @@ static int ath11k_dp_rx_h_null_q_desc(st - * rx with mac80211. Need not worry about cleaning up amsdu_list. - */ - -+ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { -+ peer_id = ath11k_dp_rx_h_mpdu_start_peer_id(ar->ab, desc); -+ spin_lock_bh(&ar->ab->base_lock); -+ if (peer_id) -+ peer = ath11k_peer_find_by_id(ar->ab, rxcb->peer_id); -+ if (peer && peer->sta) -+ arsta = (struct ath11k_sta *)peer->sta->drv_priv; -+ spin_unlock_bh(&ar->ab->base_lock); -+ if (arsta) -+ atomic_inc(&arsta->drv_rx_pkts.pkts_frm_hw); -+ } -+ - return 0; - } - ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6252,6 +6252,7 @@ static void ath11k_mac_op_tx(struct ieee - struct ath11k_mgmt_frame_stats *mgmt_stats = &arvif->mgmt_stats; - struct ath11k_sta *arsta = NULL; - u32 info_flags = info->flags; -+ struct ieee80211_sta *sta = control->sta; - bool is_prb_rsp; - u16 frm_type = 0; - int ret; -@@ -6314,6 +6315,15 @@ static void ath11k_mac_op_tx(struct ieee - ieee80211_free_txskb(ar->hw, skb); - return; - } -+ -+ if (ath11k_debugfs_is_extd_tx_stats_enabled(ar) && sta) { -+ arsta = (struct ath11k_sta *)sta->drv_priv; -+ if (arsta) { -+ atomic_inc(&arsta->drv_tx_pkts.pkts_in); -+ if (!ret) -+ atomic_inc(&arsta->drv_tx_pkts.pkts_out); -+ } -+ } - } - - void ath11k_mac_drain_tx(struct ath11k *ar) diff --git a/package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch b/package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch deleted file mode 100644 index 7488f0c2bfce6b..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/234-002-mac80211-account-tx-rx-packets-flow.patch +++ /dev/null @@ -1,369 +0,0 @@ -From 26bf6027fe93346f47358e8933e613ac1ece3455 Mon Sep 17 00:00:00 2001 -From: Maharaja Kennadyrajan -Date: Mon, 4 Jan 2021 23:50:37 +0530 -Subject: [PATCH 2/2] ath11k/mac80211: Add support to account Tx and Rx flow - packets - -Added support to log the inflow and outflow of the Tx and Rx -packets in netif and host driver. - -Command to dump the Tx pkts flow in driver: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/driver_tx_pkts_flow - -Command to dump the Rx pkts flow in driver: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/driver_rx_pkts_flow - -Commands to reset the Tx/Rx pkts flow in driver: -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_tx_stats - -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_rx_stats - -Command to dump the Tx pkts flow in mac80211: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/mac80211_tx_pkts_flow - -Command to dump the Rx pkts flow in mac80211: -cat -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/mac80211_rx_pkts_flow - -Commands to reset the Tx/Rx pkts flow in mac80211: -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_tx_pkts_flow - -echo 1 > -/sys/kernel/debug/ieee80211/phyX/netdev\:wlanX/stations/ -XX\:XX\:XX\:XX\:XX\:XX/reset_mac80211_rx_pkts_flow - -Sample output after running the Tx and Rx traffic. - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_tx_pkts_flow -Tx packets inflow from mac80211: 20 -Tx packets outflow to HW: 20 - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_tx_pkts_flow -Tx packets outflow from netif: 20 -Tx packets inflow in mac80211: 20 - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/driver_rx_pkts_flow -Rx packets inflow from HW: 28 -Rx packets outflow from driver: 28 - -root@OpenWrt:/# cat sys/kernel/debug/ieee80211/phy0/netdev\: -wlan0/stations/8c\:fd\:f0\:06\:23\:41/mac80211_rx_pkts_flow -Rx packets inflow in mac80211: 28 -Rx packets inflow in netif: 26 -Rx forwarded packets in bridge: 2 - -Signed-off-by: Maharaja Kennadyrajan ---- - net/mac80211/debugfs_sta.c | 174 +++++++++++++++++++++++++++++++++++++ - net/mac80211/rx.c | 13 +++ - net/mac80211/sta_info.h | 7 ++ - net/mac80211/tx.c | 8 ++ - 4 files changed, 202 insertions(+) - ---- a/net/mac80211/debugfs_sta.c -+++ b/net/mac80211/debugfs_sta.c -@@ -1219,6 +1219,176 @@ out: - } - LINK_STA_OPS(eht_capa); - -+static ssize_t -+sta_reset_mac80211_tx_pkts_flow_read(struct file *file, -+ char __user *userbuf, -+ size_t count, loff_t *ppos) -+{ -+ size_t bufsz = 30; -+ char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; -+ ssize_t rv; -+ -+ if (!buf) -+ return -ENOMEM; -+ -+ p += scnprintf(p, bufsz + buf - p, "write 1 to reset the stats\n"); -+ -+ rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); -+ kfree(buf); -+ return rv; -+} -+ -+static ssize_t -+sta_reset_mac80211_tx_pkts_flow_write(struct file *file, -+ const char __user *userbuf, -+ size_t count, loff_t *ppos) -+{ -+ struct sta_info *sta = file->private_data; -+ unsigned long tx_stats_reset; -+ int ret; -+ char _buf[2] = {}, *buf = _buf; -+ -+ if (count > sizeof(_buf)) -+ return -EINVAL; -+ -+ if (copy_from_user(buf, userbuf, count)) -+ return -EFAULT; -+ -+ buf[sizeof(_buf) - 1] = '\0'; -+ if (sscanf(buf, "%lu", &tx_stats_reset) != 1) -+ return -EINVAL; -+ -+ ret = kstrtoul(buf, 0, &tx_stats_reset); -+ if (ret || tx_stats_reset != 1) -+ return -EINVAL; -+ -+ atomic_set(&sta->tx_drv_pkts, 0); -+ atomic_set(&sta->tx_netif_pkts, 0); -+ -+ return count; -+} -+STA_OPS_RW(reset_mac80211_tx_pkts_flow); -+ -+static ssize_t -+sta_reset_mac80211_rx_pkts_flow_read(struct file *file, -+ char __user *userbuf, -+ size_t count, loff_t *ppos) -+{ -+ size_t bufsz = 30; -+ char *buf = kzalloc(bufsz, GFP_KERNEL), *p = buf; -+ ssize_t rv; -+ -+ if (!buf) -+ return -ENOMEM; -+ -+ p += scnprintf(p, bufsz + buf - p, "write 1 to reset the stats\n"); -+ -+ rv = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); -+ kfree(buf); -+ return rv; -+} -+ -+static ssize_t -+sta_reset_mac80211_rx_pkts_flow_write(struct file *file, -+ const char __user *userbuf, -+ size_t count, loff_t *ppos) -+{ -+ struct sta_info *sta = file->private_data; -+ unsigned long rx_stats_reset; -+ int ret; -+ char _buf[2] = {}, *buf = _buf; -+ -+ if (count > sizeof(_buf)) -+ return -EINVAL; -+ -+ if (copy_from_user(buf, userbuf, count)) -+ return -EFAULT; -+ -+ buf[sizeof(_buf) - 1] = '\0'; -+ if (sscanf(buf, "%lu", &rx_stats_reset) != 1) -+ return -EINVAL; -+ -+ ret = kstrtoul(buf, 0, &rx_stats_reset); -+ if (ret || rx_stats_reset != 1) -+ return -EINVAL; -+ -+ atomic_set(&sta->rx_drv_pkts, 0); -+ atomic_set(&sta->rx_netif_pkts, 0); -+ atomic_set(&sta->rx_forwarded_pkts, 0); -+ -+ return count; -+} -+STA_OPS_RW(reset_mac80211_rx_pkts_flow); -+ -+static ssize_t sta_mac80211_tx_pkts_flow_read(struct file *file, -+ char __user *userbuf, -+ size_t count, loff_t *ppos) -+{ -+ struct sta_info *sta = file->private_data; -+ int retval = 0, len = 0; -+ const int size = 256; -+ char *buf; -+ -+ buf = kzalloc(size, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; -+ -+ rcu_read_lock(); -+ -+ len += scnprintf(buf + len, size - len, -+ "Tx packets outflow from netif: %u\n", -+ atomic_read(&sta->tx_netif_pkts)); -+ len += scnprintf(buf + len, size - len, -+ "Tx packets outflow from mac80211: %u\n", -+ atomic_read(&sta->tx_drv_pkts)); -+ rcu_read_unlock(); -+ -+ if (len > size) -+ len = size; -+ -+ retval = simple_read_from_buffer(userbuf, count, ppos, buf, len); -+ kfree(buf); -+ -+ return retval; -+} -+STA_OPS(mac80211_tx_pkts_flow); -+ -+static ssize_t sta_mac80211_rx_pkts_flow_read(struct file *file, -+ char __user *userbuf, -+ size_t count, loff_t *ppos) -+{ -+ struct sta_info *sta = file->private_data; -+ int retval = 0, len = 0; -+ const int size = 512; -+ char *buf; -+ -+ buf = kzalloc(size, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; -+ -+ rcu_read_lock(); -+ -+ len += scnprintf(buf + len, size - len, -+ "Rx packets inflow in mac80211: %u\n", -+ atomic_read(&sta->rx_drv_pkts)); -+ len += scnprintf(buf + len, size - len, -+ "Rx packets inflow in netif: %u\n", -+ atomic_read(&sta->rx_netif_pkts)); -+ len += scnprintf(buf + len, size - len, -+ "Rx forwarded packets in bridge: %u\n", -+ atomic_read(&sta->rx_forwarded_pkts)); -+ -+ rcu_read_unlock(); -+ -+ if (len > size) -+ len = size; -+ retval = simple_read_from_buffer(userbuf, count, ppos, buf, len); -+ kfree(buf); -+ -+ return retval; -+} -+STA_OPS(mac80211_rx_pkts_flow); -+ - #define DEBUGFS_ADD(name) \ - debugfs_create_file(#name, 0400, \ - sta->debugfs_dir, sta, &sta_ ##name## _ops) -@@ -1254,6 +1424,10 @@ void ieee80211_sta_debugfs_add(struct st - DEBUGFS_ADD(num_ps_buf_frames); - DEBUGFS_ADD(last_seq_ctrl); - DEBUGFS_ADD(agg_status); -+ DEBUGFS_ADD(reset_mac80211_tx_pkts_flow); -+ DEBUGFS_ADD(reset_mac80211_rx_pkts_flow); -+ DEBUGFS_ADD(mac80211_tx_pkts_flow); -+ DEBUGFS_ADD(mac80211_rx_pkts_flow); - /* FIXME: Kept here as the statistics are only done on the deflink */ - DEBUGFS_ADD_COUNTER(tx_filtered, deflink.status_stats.filtered); - ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -2623,6 +2623,7 @@ static void ieee80211_deliver_skb_to_loc - { - struct ieee80211_sub_if_data *sdata = rx->sdata; - struct net_device *dev = sdata->dev; -+ struct sta_info *sta = rx->sta; - - if (unlikely((skb->protocol == sdata->control_port_protocol || - (skb->protocol == cpu_to_be16(ETH_P_PREAUTH) && -@@ -2666,6 +2667,7 @@ static void ieee80211_deliver_skb_to_loc - else - netif_receive_skb(skb); - #endif -+ atomic_inc(&sta->rx_netif_pkts); - } - } - -@@ -2724,6 +2726,7 @@ ieee80211_deliver_skb(struct ieee80211_r - */ - xmit_skb = skb; - skb = NULL; -+ atomic_inc(&rx->sta->rx_forwarded_pkts); - } - } - } -@@ -4836,6 +4839,7 @@ static void ieee80211_rx_8023(struct iee - skb_reset_network_header(xmit_skb); - skb_reset_mac_header(xmit_skb); - dev_queue_xmit(xmit_skb); -+ atomic_inc(&rx->sta->rx_forwarded_pkts); - } - - if (!skb) -@@ -5332,9 +5336,18 @@ void ieee80211_rx_list(struct ieee80211_ - struct ieee80211_supported_band *sband; - struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; -+ struct sta_info *sta = NULL; - - WARN_ON_ONCE(softirq_count() == 0); - -+ if (pubsta) { -+ sta = container_of(pubsta, struct sta_info, sta); -+ if (sta && napi) { -+ if (!(status->flag & RX_FLAG_ONLY_MONITOR)) -+ atomic_inc(&sta->rx_drv_pkts); -+ } -+ } -+ - if (WARN_ON(status->band >= NUM_NL80211_BANDS)) - goto drop; - ---- a/net/mac80211/sta_info.h -+++ b/net/mac80211/sta_info.h -@@ -724,6 +724,13 @@ struct sta_info { - struct link_sta_info deflink; - struct link_sta_info __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS]; - -+ atomic_t tx_drv_pkts; -+ atomic_t tx_netif_pkts; -+ atomic_t rx_drv_pkts; -+ atomic_t rx_netif_pkts; -+ /* Rx packets forwarded to bridge */ -+ atomic_t rx_forwarded_pkts; -+ - /* keep last! */ - struct ieee80211_sta sta; - }; ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -4294,6 +4294,9 @@ void __ieee80211_subif_start_xmit(struct - if (IS_ERR(sta)) - sta = NULL; - -+ if (sta) -+ atomic_inc(&sta->tx_netif_pkts); -+ - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { - ap_sdata = container_of(sdata->bss, - struct ieee80211_sub_if_data, u.ap); -@@ -4614,6 +4617,9 @@ static bool __ieee80211_tx_8023(struct i - - drv_tx(local, &control, skb); - -+ if (sta) -+ atomic_inc(&sta->tx_drv_pkts); -+ - return true; - } - -@@ -4719,6 +4725,9 @@ static void ieee80211_8023_xmit(struct i - - ieee80211_tx_8023(sdata, skb, sta, false); - -+ if (sta) -+ atomic_inc(&sta->tx_netif_pkts); -+ - return; - - out_free: diff --git a/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch deleted file mode 100644 index 5d5a83911d8519..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/235-001-ath11k-Add-support-for-beacon-tx-mode.patch +++ /dev/null @@ -1,45 +0,0 @@ -From a297f43a9ad6d8c95cf8b984337ffb410f3eb92c Mon Sep 17 00:00:00 2001 -From: Maharaja Kennadyrajan -Date: Tue, 12 Jan 2021 18:07:51 +0530 -Subject: [PATCH] ath11k: Add support for beacon tx mode - -User can configure the beacon tx mode while bring-up the -AP via hostapd configuration. - -Use the below configuration in the hostapd to configure -the beacon tx mode. - -"beacon_tx_mode=N", where N = 0 for STAGGERED beacon mode -and N = 1 for BURST beacon mode. - -Signed-off-by: Maharaja Kennadyrajan ---- - drivers/net/wireless/ath/ath11k/mac.c | 7 ++++--- - 1 file changed, 4 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -3481,7 +3481,10 @@ static void ath11k_mac_op_bss_info_chang - - if (changed & BSS_CHANGED_BEACON) { - param_id = WMI_PDEV_PARAM_BEACON_TX_MODE; -- param_value = WMI_BEACON_STAGGERED_MODE; -+ if (info->beacon_tx_mode == NL80211_BEACON_BURST_MODE) -+ param_value = WMI_BEACON_BURST_MODE; -+ else -+ param_value = WMI_BEACON_STAGGERED_MODE; - ret = ath11k_wmi_pdev_set_param(ar, param_id, - param_value, ar->pdev->pdev_id); - if (ret) -@@ -3489,8 +3492,9 @@ static void ath11k_mac_op_bss_info_chang - arvif->vdev_id); - else - ath11k_dbg(ar->ab, ATH11K_DBG_MAC, -- "Set staggered beacon mode for VDEV: %d\n", -- arvif->vdev_id); -+ "Set %s beacon mode for VDEV: %d mode: %d\n", -+ param_value ? "burst" : "staggered", -+ arvif->vdev_id, param_value); - - if (!arvif->do_not_send_tmpl || !arvif->bcca_zero_sent) { - ret = ath11k_mac_setup_bcn_tmpl(arvif); diff --git a/package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch deleted file mode 100644 index 6fb460f6b4f740..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/235-002-mac80211-Add-support-for-beacon-tx-mode.patch +++ /dev/null @@ -1,159 +0,0 @@ -From f8e7ec408c357d6438abd980f700353a7efcac7e Mon Sep 17 00:00:00 2001 -From: Maharaja Kennadyrajan -Date: Tue, 12 Jan 2021 18:11:33 +0530 -Subject: [PATCH] mac80211: Add support for beacon tx mode - -User can configure the beacon tx mode while bring-up the -AP via hostapd configuration. - -Use the below configuration in the hostapd to configure -the beacon tx mode. - -"beacon_tx_mode=N", where N = 0 for STAGGERED beacon mode -and N = 1 for BURST beacon mode. - -Signed-off-by: Maharaja Kennadyrajan ---- - include/net/cfg80211.h | 2 +- - include/net/mac80211.h | 1 + - include/uapi/linux/nl80211.h | 2 ++ - net/mac80211/cfg.c | 1 + - net/wireless/nl80211.c | 7 ++++++- - 5 files changed, 11 insertions(+), 2 deletions(-) - ---- a/include/net/cfg80211.h -+++ b/include/net/cfg80211.h -@@ -1443,6 +1443,7 @@ struct cfg80211_unsol_bcast_probe_resp { - * @punct_bitmap: Preamble puncturing bitmap. Each bit represents - * a 20 MHz channel, lowest bit corresponding to the lowest channel. - * Bit set to 1 indicates that the channel is punctured. -+ * @beacon_tx_mode: Beacon Tx Mode setting - */ - struct cfg80211_ap_settings { - struct cfg80211_chan_def chandef; -@@ -1478,6 +1479,7 @@ struct cfg80211_ap_settings { - struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp; - struct cfg80211_mbssid_config mbssid_config; - u16 punct_bitmap; -+ enum nl80211_beacon_tx_mode beacon_tx_mode; - }; - - /** -@@ -2436,6 +2438,7 @@ struct mesh_config { - * to operate on DFS channels. - * @control_port_over_nl80211: TRUE if userspace expects to exchange control - * port frames over NL80211 instead of the network interface. -+ * @beacon_tx_mode: Beacon Tx Mode setting. - * - * These parameters are fixed when the mesh is created. - */ -@@ -2459,6 +2462,7 @@ struct mesh_setup { - struct cfg80211_bitrate_mask beacon_rate; - bool userspace_handles_dfs; - bool control_port_over_nl80211; -+ enum nl80211_beacon_tx_mode beacon_tx_mode; - }; - - /** ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -698,6 +698,7 @@ struct ieee80211_fils_discovery { - * @eht_mu_beamformer: in AP-mode, does this BSS enable operation as an EHT MU - * beamformer - * @nss_ap_isolate: Used for notifying the NSS host about AP isolate feature -+ * @beacon_tx_mode: Beacon Tx Mode setting. - */ - struct ieee80211_bss_conf { - struct ieee80211_vif *vif; -@@ -792,6 +793,7 @@ struct ieee80211_bss_conf { - bool eht_su_beamformee; - bool eht_mu_beamformer; - bool nss_ap_isolate; -+ enum nl80211_beacon_tx_mode beacon_tx_mode; - }; - - /** ---- a/include/uapi/linux/nl80211.h -+++ b/include/uapi/linux/nl80211.h -@@ -2814,7 +2814,9 @@ enum nl80211_commands { - * - * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is - * disabled. -- * -+ * @NL80211_ATTR_BEACON_TX_MODE: used to configure the beacon tx mode as -+ * staggered mode = 1 or burst mode = 2 in %NL80211_CMD_START_AP or -+ * %NL80211_CMD_JOIN_MESH from user-space. - * @NUM_NL80211_ATTR: total number of nl80211_attrs available - * @NL80211_ATTR_MAX: highest attribute number currently defined - * @__NL80211_ATTR_AFTER_LAST: internal use -@@ -3353,6 +3355,8 @@ enum nl80211_attrs { - - NL80211_ATTR_MLO_LINK_DISABLED, - -+ NL80211_ATTR_BEACON_TX_MODE, -+ - /* add attributes here, update the policy in nl80211.c */ - - __NL80211_ATTR_AFTER_LAST, -@@ -7840,4 +7844,12 @@ enum nl80211_ap_settings_flags { - NL80211_AP_SETTINGS_SA_QUERY_OFFLOAD_SUPPORT = 1 << 1, - }; - -+/** -+ * enum nl80211_beacon_tx_mode - Beacon Tx Mode enum. -+ * Used to configure beacon staggered mode or beacon burst mode. -+ */ -+enum nl80211_beacon_tx_mode { -+ NL80211_BEACON_STAGGERED_MODE = 1, -+ NL80211_BEACON_BURST_MODE = 2, -+}; - #endif /* __LINUX_NL80211_H */ ---- a/net/mac80211/cfg.c -+++ b/net/mac80211/cfg.c -@@ -1294,6 +1294,7 @@ static int ieee80211_start_ap(struct wip - - prev_beacon_int = link_conf->beacon_int; - link_conf->beacon_int = params->beacon_interval; -+ link_conf->beacon_tx_mode = params->beacon_tx_mode; - - if (params->ht_cap) - link_conf->ht_ldpc = -@@ -2490,6 +2491,7 @@ static int copy_mesh_setup(struct ieee80 - - sdata->vif.bss_conf.beacon_int = setup->beacon_interval; - sdata->vif.bss_conf.dtim_period = setup->dtim_period; -+ sdata->vif.bss_conf.beacon_tx_mode = setup->beacon_tx_mode; - - sdata->beacon_rate_set = false; - if (wiphy_ext_feature_isset(sdata->local->hw.wiphy, ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -811,6 +811,7 @@ static const struct nla_policy nl80211_p - [NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG }, - [NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED }, - [NL80211_ATTR_MLO_LINK_DISABLED] = { .type = NLA_FLAG }, -+ [NL80211_ATTR_BEACON_TX_MODE] = NLA_POLICY_RANGE(NLA_U32, 1, 2), - }; - - /* policy for the key attributes */ -@@ -5941,6 +5942,9 @@ static int nl80211_start_ap(struct sk_bu - nla_get_u32(info->attrs[NL80211_ATTR_BEACON_INTERVAL]); - params->dtim_period = - nla_get_u32(info->attrs[NL80211_ATTR_DTIM_PERIOD]); -+ if (info->attrs[NL80211_ATTR_BEACON_TX_MODE]) -+ params->beacon_tx_mode = -+ nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]); - - err = cfg80211_validate_beacon_int(rdev, dev->ieee80211_ptr->iftype, - params->beacon_interval); -@@ -13037,6 +13041,10 @@ static int nl80211_join_mesh(struct sk_b - return -EINVAL; - } - -+ if (info->attrs[NL80211_ATTR_BEACON_TX_MODE]) -+ setup.beacon_tx_mode = -+ nla_get_u32(info->attrs[NL80211_ATTR_BEACON_TX_MODE]); -+ - if (info->attrs[NL80211_ATTR_MESH_SETUP]) { - /* parse additional setup parameters if given */ - err = nl80211_parse_mesh_setup(info, &setup); diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch b/package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch deleted file mode 100644 index 83c019b871e81b..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/237-002-ath11k-Add-provision-to-configure-rx-hashmap.patch +++ /dev/null @@ -1,208 +0,0 @@ -From 60d0a63d537c280ff9501296cefd322b981b88f5 Mon Sep 17 00:00:00 2001 -From: P Praneesh -Date: Mon, 14 Dec 2020 19:13:49 +0530 -Subject: [PATCH] ath11k: Add provision to configure rx hashmap - -Currently the hashmap is set to default during REO -setup and all REO rings are equally distributed across -32 hash values. - -Add provision to configure the hashmap so that destination -rings can be controlled. Setting 0 will disable hash based -steering. - -echo "hashmap" > /sys/kernel/debug/ath11k/ipq8074\ hw2.0/rx_hash - -Signed-off-by: Sriram R -Signed-off-by: P Praneesh ---- - drivers/net/wireless/ath/ath11k/core.h | 2 ++ - drivers/net/wireless/ath/ath11k/debugfs.c | 51 ++++++++++++++++++++++++++++++++ - drivers/net/wireless/ath/ath11k/dp.c | 4 ++- - drivers/net/wireless/ath/ath11k/hal.h | 1 + - drivers/net/wireless/ath/ath11k/hal_rx.c | 30 +++++++++++-------- - 5 files changed, 74 insertions(+), 14 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/core.h -+++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -65,6 +65,7 @@ extern bool ath11k_ftm_mode; - #define ATH11K_RECONFIGURE_TIMEOUT_HZ (10 * HZ) - #define ATH11K_RECOVER_START_TIMEOUT_HZ (20 * HZ) - -+#define HAL_REO_DEST_RING_CTRL_HASH_RING_SHIFT 8 - enum ath11k_supported_bw { - ATH11K_BW_20 = 0, - ATH11K_BW_40 = 1, -@@ -1037,6 +1038,8 @@ struct ath11k_base { - atomic_t num_max_allowed; - struct ath11k_num_vdevs_peers *num_vdevs_peers; - -+ u32 rx_hash; -+ - /* must be last */ - u8 drv_priv[] __aligned(sizeof(void *)); - }; ---- a/drivers/net/wireless/ath/ath11k/debugfs.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -972,6 +972,54 @@ static const struct file_operations fops - .llseek = default_llseek, - }; - -+static ssize_t ath11k_write_rx_hash(struct file *file, -+ const char __user *ubuf, -+ size_t count, loff_t *ppos) -+{ -+ struct ath11k_base *ab = file->private_data; -+ struct ath11k_pdev *pdev; -+ u32 rx_hash; -+ u8 buf[128] = {0}; -+ int ret, i, radioup = 0; -+ -+ for (i = 0; i < ab->num_radios; i++) { -+ pdev = &ab->pdevs[i]; -+ if (pdev && pdev->ar) { -+ radioup = 1; -+ break; -+ } -+ } -+ -+ if (radioup == 0) { -+ ath11k_err(ab, "radio is not up\n"); -+ ret = -ENETDOWN; -+ goto exit; -+ } -+ -+ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, ubuf, count); -+ if (ret < 0) -+ goto exit; -+ -+ buf[ret] = '\0'; -+ ret = sscanf(buf, "%x", &rx_hash); -+ if (!ret) { -+ ret = -EINVAL; -+ goto exit; -+ } -+ -+ if (rx_hash != ab->rx_hash) { -+ ab->rx_hash = rx_hash; -+ if (rx_hash) -+ ath11k_hal_reo_hash_setup(ab, rx_hash); -+ } -+ ret = count; -+exit: -+ return ret; -+} -+static const struct file_operations fops_soc_rx_hash = { -+ .open = simple_open, -+ .write = ath11k_write_rx_hash, -+}; - int ath11k_debugfs_pdev_create(struct ath11k_base *ab) - { - if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) -@@ -987,6 +1035,10 @@ int ath11k_debugfs_pdev_create(struct at - debugfs_create_file("sram", 0400, ab->debugfs_soc, ab, - &fops_sram_dump); - -+ debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, -+ &fops_soc_rx_hash); -+ -+ - return 0; - } - ---- a/drivers/net/wireless/ath/ath11k/dp.c -+++ b/drivers/net/wireless/ath/ath11k/dp.c -@@ -50,7 +50,7 @@ int ath11k_dp_peer_setup(struct ath11k * - bool rx_hash_enable = DP_RX_HASH_ENABLE; - - /* RX Hash based steering is disabled for NSS Offload */ -- if (ar->ab->nss.enabled) -+ if (ar->ab->nss.enabled || !ab->rx_hash) - rx_hash_enable = DP_RX_HASH_DISABLE; - - /* NOTE: reo_dest ring id starts from 1 unlike mac_id which starts from 0 */ ---- a/drivers/net/wireless/ath/ath11k/hal.h -+++ b/drivers/net/wireless/ath/ath11k/hal.h -@@ -922,6 +922,7 @@ void ath11k_hal_reo_qdesc_setup(void *va - u32 start_seq, enum hal_pn_type type); - void ath11k_hal_reo_init_cmd_ring(struct ath11k_base *ab, - struct hal_srng *srng); -+void ath11k_hal_reo_hash_setup(struct ath11k_base *ab, u32 ring_hash_map); - void ath11k_hal_setup_link_idle_list(struct ath11k_base *ab, - struct hal_wbm_idle_scatter_list *sbuf, - u32 nsbufs, u32 tot_link_desc, ---- a/drivers/net/wireless/ath/ath11k/hw.c -+++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -102,6 +102,23 @@ static void ath11k_init_wmi_config_qca63 - config->flag1 |= WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64; - } - -+void ath11k_hal_reo_hash_setup(struct ath11k_base *ab, u32 ring_hash_map) -+{ -+ u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; -+ u8 reo_dest_hash_shift = ab->hw_params.reo_dest_ring_map_shift; -+ -+ ab->rx_hash = ring_hash_map; -+ -+ /* These registers use only 24bits(3 bits x 8 hash values) for -+ * mapping the dest rings and remaining bits are reserved/not used -+ * so its safe to write them completely. -+ */ -+ ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, -+ ring_hash_map << reo_dest_hash_shift); -+ ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, -+ ring_hash_map << reo_dest_hash_shift); -+} -+ - static void ath11k_hw_ipq8074_reo_setup(struct ath11k_base *ab) - { - u8 frag_dest_ring = HAL_SRNG_RING_ID_REO2SW1; -@@ -143,18 +160,7 @@ static void ath11k_hw_ipq8074_reo_setup( - if (ab->nss.enabled) - return; - -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0, -- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, -- ring_hash_map)); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1, -- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, -- ring_hash_map)); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, -- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, -- ring_hash_map)); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, -- FIELD_PREP(HAL_REO_DEST_RING_CTRL_HASH_RING_MAP, -- ring_hash_map)); -+ ath11k_hal_reo_hash_setup(ab, ring_hash_map); - } - - static void ath11k_init_wmi_config_ipq8074(struct ath11k_base *ab, -@@ -925,10 +931,7 @@ static void ath11k_hw_wcn6855_reo_setup( - if (ab->nss.enabled) - return; - -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, -- ring_hash_map); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, -- ring_hash_map); -+ ath11k_hal_reo_hash_setup(ab, ring_hash_map); - } - - static void ath11k_hw_ipq5018_reo_setup(struct ath11k_base *ab) -@@ -963,15 +966,7 @@ static void ath11k_hw_ipq5018_reo_setup( - HAL_DEFAULT_REO_TIMEOUT_USEC); - ath11k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab), - HAL_DEFAULT_REO_TIMEOUT_USEC); -- -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0, -- ring_hash_map); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_1, -- ring_hash_map); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, -- ring_hash_map); -- ath11k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, -- ring_hash_map); -+ ath11k_hal_reo_hash_setup(ab, ring_hash_map); - } - - static u16 diff --git a/package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch b/package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch deleted file mode 100644 index 6f7c1aadd95b64..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/245-revert-dev-sw-netstats-txrx-add.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 3be7ae2d65b6638c4165d66c1c4b5d82d95517d9 Mon Sep 17 00:00:00 2001 -From: Tamizh Chelvam -Date: Wed, 10 Mar 2021 12:21:49 +0530 -Subject: [PATCH] Revert "net: mac80211: use core API for updating TX/RX stats" - -This reverts 36ec144f041bedc2f14b32faa2da11d4d9660003 commit -in QSDK since 4.4 backports does not support netstats APIs -for tx/rx stats and retaining the original logic for calculating -tx/rx stats. - -Signed-off-by: Tamizh Chelvam ---- - net/mac80211/rx.c | 18 ++++++++++++++---- - net/mac80211/tx.c | 16 +++++++++++++--- - 2 files changed, 27 insertions(+), 7 deletions(-) - ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -33,6 +33,18 @@ - #include "wme.h" - #include "rate.h" - -+static inline void ieee80211_rx_stats(struct net_device *dev, u32 len) -+{ -+ struct pcpu_sw_netstats *tstats = this_cpu_ptr(netdev_tstats(dev)); -+ -+ u64_stats_update_begin(&tstats->syncp); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) -+ tstats->rx_packets++; -+ tstats->rx_bytes += len; -+#endif -+ u64_stats_update_end(&tstats->syncp); -+} -+ - /* - * monitor mode reception - * -@@ -50,7 +62,11 @@ static struct sk_buff *ieee80211_clean_s - - if (present_fcs_len) - __pskb_trim(skb, skb->len - present_fcs_len); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) -+ __pskb_pull(skb, rtap_space); -+#else - pskb_pull(skb, rtap_space); -+#endif - - /* After pulling radiotap header, clear all flags that indicate - * info in skb->data. -@@ -83,7 +99,11 @@ static struct sk_buff *ieee80211_clean_s - - memmove(skb->data + IEEE80211_HT_CTL_LEN, skb->data, - hdrlen - IEEE80211_HT_CTL_LEN); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) -+ __pskb_pull(skb, IEEE80211_HT_CTL_LEN); -+#else - pskb_pull(skb, IEEE80211_HT_CTL_LEN); -+#endif - - return skb; - } -@@ -853,7 +873,7 @@ ieee80211_rx_monitor(struct ieee80211_lo - - if (skb) { - skb->dev = sdata->dev; -- dev_sw_netstats_rx_add(skb->dev, skb->len); -+ ieee80211_rx_stats(skb->dev, skb->len); - netif_receive_skb(skb); - } - } -@@ -2686,7 +2706,7 @@ ieee80211_deliver_skb(struct ieee80211_r - skb = rx->skb; - xmit_skb = NULL; - -- dev_sw_netstats_rx_add(dev, skb->len); -+ ieee80211_rx_stats(dev, skb->len); - - if (rx->sta) { - /* The seqno index has the same property as needed -@@ -4098,7 +4118,7 @@ static void ieee80211_rx_cooked_monitor( - } - - prev_dev = sdata->dev; -- dev_sw_netstats_rx_add(sdata->dev, skb->len); -+ ieee80211_rx_stats(sdata->dev, skb->len); - } - - if (prev_dev) { -@@ -4806,7 +4826,7 @@ static void ieee80211_rx_8023(struct iee - - skb->dev = fast_rx->dev; - -- dev_sw_netstats_rx_add(fast_rx->dev, skb->len); -+ ieee80211_rx_stats(fast_rx->dev, skb->len); - - /* The seqno index has the same property as needed - * for the rx_msdu field, i.e. it is IEEE80211_NUM_TIDS ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -40,6 +40,18 @@ - static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, - struct net_device *dev, struct sta_info *sta, - struct ieee80211_key *key, struct sk_buff *skb); -+ -+static inline void ieee80211_tx_stats(struct net_device *dev, u32 len) -+{ -+ struct pcpu_sw_netstats *tstats = this_cpu_ptr(netdev_tstats(dev)); -+ -+ u64_stats_update_begin(&tstats->syncp); -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 1, 0)) -+ tstats->tx_packets++; -+ tstats->tx_bytes += len; -+#endif -+ u64_stats_update_end(&tstats->syncp); -+} - /* misc utils */ - - static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, -@@ -3557,7 +3569,7 @@ ieee80211_xmit_fast_finish(struct ieee80 - if (key) - info->control.hw_key = &key->conf; - -- dev_sw_netstats_tx_add(skb->dev, 1, skb->len); -+ ieee80211_tx_stats(skb->dev, skb->len); - - if (hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) { - tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; -@@ -4346,7 +4358,7 @@ void __ieee80211_subif_start_xmit(struct - goto out; - } - -- dev_sw_netstats_tx_add(dev, 1, skb->len); -+ ieee80211_tx_stats(dev, skb->len); - - ieee80211_xmit(sdata, sta, skb); - } -@@ -4717,7 +4729,7 @@ static void ieee80211_8023_xmit(struct i - info->ack_frame_id = ieee80211_store_ack_skb(local, skb, - &info->flags, NULL); - -- dev_sw_netstats_tx_add(dev, skbs, len); -+ ieee80211_tx_stats(dev, len); - if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { - sta->deflink.tx_stats.packets[queue] += skbs; - sta->deflink.tx_stats.bytes[queue] += len; diff --git a/package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch b/package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch deleted file mode 100644 index 0a7dcf5e845780..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 246e530a47d9adab9106fb6f2b92197cace17e53 Mon Sep 17 00:00:00 2001 -From: Seevalamuthu Mariappan -Date: Fri, 21 May 2021 14:16:22 +0530 -Subject: [PATCH] ath11k: configure nss radio priority during pdev_init - -pdev's priority value is read from dts. Get scheme_id -using pdev priority. Configure scheme_id during pdev_init. - -Signed-off-by: Seevalamuthu Mariappan ---- - drivers/net/wireless/ath/ath11k/nss.c | 20 +++++++++++++++++++- - drivers/net/wireless/ath/ath11k/nss.h | 3 +++ - 2 files changed, 22 insertions(+), 1 deletion(-) - ---- a/drivers/net/wireless/ath/ath11k/nss.c -+++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -2,6 +2,7 @@ - /* - * Copyright (c) 2020 The Linux Foundation. All rights reserved. - */ -+#include - - #include "debug.h" - #include "mac.h" -@@ -1782,6 +1783,7 @@ static int ath11k_nss_init(struct ath11k - nss_tx_status_t status; - struct ath11k_dp *dp; - int i, ret; -+ struct device *dev = ab->dev; - - dp = &ab->dp; - -@@ -1801,6 +1803,8 @@ static int ath11k_nss_init(struct ath11k - /* fill rx parameters to initialize rx context */ - wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; - wim->wrip.rx_buf_len = DP_RXDMA_NSS_REFILL_RING_SIZE; -+ if (of_property_read_bool(dev->of_node, "nss-radio-priority")) -+ wim->flags |= WIFILI_MULTISOC_THREAD_MAP_ENABLE; - - /* fill hal srng message */ - wim->hssm.dev_base_addr = (u32)ab->mem_pa; -@@ -1977,11 +1981,13 @@ int ath11k_nss_pdev_init(struct ath11k_b - struct nss_wifili_msg *wlmsg = NULL; - nss_wifili_msg_callback_t msg_cb; - nss_tx_status_t status; -+ struct device *dev = ab->dev; - int radio_if_num = -1; - int refill_ring_id; - int features = 0; - int dyn_if_type; -- int ret, i; -+ int ret, i, scheme_id = 0; -+ u32 nss_radio_priority; - - dyn_if_type = ath11k_nss_get_dynamic_interface_type(ab); - -@@ -2010,6 +2016,15 @@ int ath11k_nss_pdev_init(struct ath11k_b - ath11k_dbg(ab, ATH11K_DBG_NSS, "nss pdev init - id:%d init ctxt:%p ifnum:%d\n", - ar->pdev->pdev_id, ar->nss.ctx, ar->nss.if_num); - -+ if (!of_property_read_u32(dev->of_node, "nss-radio-priority", &nss_radio_priority)) { -+ scheme_id = nss_wifili_thread_scheme_alloc(ab->nss.ctx, ar->nss.if_num, nss_radio_priority); -+ if (scheme_id == WIFILI_SCHEME_ID_INVALID) { -+ ath11k_warn(ab, "received invalid scheme_id, configuring default value\n"); -+ scheme_id = 0; -+ } -+ } -+ ath11k_dbg(ab, ATH11K_DBG_NSS, "ifnum: %d scheme_id: %d nss_radio_priority: %d\n", ar->nss.if_num, scheme_id, nss_radio_priority); -+ - wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); - if (!wlmsg) { - ret = -ENOMEM; -@@ -2022,6 +2037,7 @@ int ath11k_nss_pdev_init(struct ath11k_b - pdevmsg->lmac_id = ar->lmac_id; - pdevmsg->target_pdev_id = ar->pdev->pdev_id; - pdevmsg->num_rx_swdesc = WIFILI_RX_DESC_POOL_WEIGHT * DP_RXDMA_BUF_RING_SIZE; -+ pdevmsg->scheme_id = scheme_id; - - /* Store rxdma ring info to the message */ - refill_ring_id = ar->dp.rx_refill_buf_ring.refill_buf_ring.ring_id; -@@ -2315,6 +2331,9 @@ int ath11k_nss_pdev_deinit(struct ath11k - /* pdev deinit msg success, dealloc, deregister and return */ - ret = 0; - -+ /* reset thread scheme*/ -+ nss_wifili_thread_scheme_dealloc(ab->nss.ctx, ar->nss.if_num); -+ - nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); - nss_unregister_wifili_radio_if(ar->nss.if_num); - free: ---- a/drivers/net/wireless/ath/ath11k/nss.h -+++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -61,6 +61,7 @@ struct hal_rx_user_status; - /* Init Flags */ - #define WIFILI_NSS_CCE_DISABLED 0x1 - #define WIFILI_ADDTL_MEM_SEG_SET 0x000000002 -+#define WIFILI_MULTISOC_THREAD_MAP_ENABLE 0x10 - - /* ATH11K NSS PEER Info */ - /* Host memory allocated for peer info storage in nss */ -@@ -108,6 +109,8 @@ enum ath11k_nss_vdev_cmd { - ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, - }; - -+#define WIFILI_SCHEME_ID_INVALID -1 -+ - enum ath11k_nss_opmode { - ATH11K_NSS_OPMODE_UNKNOWN, - ATH11K_NSS_OPMODE_AP, diff --git a/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch b/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch deleted file mode 100644 index 79146df5447b8b..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/640-006-mac80211-add-eht-radiotap.patch +++ /dev/null @@ -1,506 +0,0 @@ -From f76abd98383dbd350f4e41b400beaaff2130254a Mon Sep 17 00:00:00 2001 -From: P Praneesh -Date: Sun, 3 Jul 2022 19:31:44 +0530 -Subject: [PATCH] mac80211: add EHT radiotap header construction logic - -Driver advertises U_SIG and EHT info in the flag under rx_status -structure. Based on this flag, corresponding EHT and U_SIG -information are added in the radiotap header. - -Signed-off-by: P Praneesh ---- - include/net/ieee80211_radiotap.h | 160 +++++++++++++++++++++++++++++++++++++++ - include/net/mac80211.h | 9 +++ - net/mac80211/rx.c | 88 +++++++++++++++++++++ - 3 files changed, 257 insertions(+) - ---- a/include/net/ieee80211_radiotap.h -+++ b/include/net/ieee80211_radiotap.h -@@ -92,6 +92,11 @@ enum ieee80211_radiotap_presence { - IEEE80211_RADIOTAP_EHT = 34, - }; - -+enum ieee80211_radiotap_presence_ext { -+ IEEE80211_RADIOTAP_USIG_INFO = 1, -+ IEEE80211_RADIOTAP_EHT_INFO = 2, -+}; -+ - /* for IEEE80211_RADIOTAP_FLAGS */ - enum ieee80211_radiotap_flags { - IEEE80211_RADIOTAP_F_CFP = 0x01, -@@ -406,128 +411,6 @@ struct ieee80211_radiotap_eht_usig { - __le32 mask; - } __packed; - --/* ieee80211_radiotap_eht - content of EHT tlv (type 34) -- * see www.radiotap.org/fields/EHT.html for details -- */ --struct ieee80211_radiotap_eht { -- __le32 known; -- __le32 data[9]; -- __le32 user_info[]; --} __packed; -- --/* Known field for EHT TLV -- * The ending defines for what the field applies as following -- * O - OFDMA (including TB), M - MU-MIMO, S - EHT sounding. -- */ --enum ieee80211_radiotap_eht_known { -- IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE = 0x00000002, -- IEEE80211_RADIOTAP_EHT_KNOWN_GI = 0x00000004, -- IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF = 0x00000010, -- IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM = 0x00000020, -- IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM = 0x00000040, -- IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM = 0x00000080, -- IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_O = 0x00000100, -- IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_S = 0x00000200, -- IEEE80211_RADIOTAP_EHT_KNOWN_CRC1 = 0x00002000, -- IEEE80211_RADIOTAP_EHT_KNOWN_TAIL1 = 0x00004000, -- IEEE80211_RADIOTAP_EHT_KNOWN_CRC2_O = 0x00008000, -- IEEE80211_RADIOTAP_EHT_KNOWN_TAIL2_O = 0x00010000, -- IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S = 0x00020000, -- IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S = 0x00040000, -- IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M = 0x00080000, -- IEEE80211_RADIOTAP_EHT_KNOWN_ENCODING_BLOCK_CRC_M = 0x00100000, -- IEEE80211_RADIOTAP_EHT_KNOWN_ENCODING_BLOCK_TAIL_M = 0x00200000, -- IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_SIZE_OM = 0x00400000, -- IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_INDEX_OM = 0x00800000, -- IEEE80211_RADIOTAP_EHT_KNOWN_RU_ALLOC_TB_FMT = 0x01000000, -- IEEE80211_RADIOTAP_EHT_KNOWN_PRIMARY_80 = 0x02000000, --}; -- --enum ieee80211_radiotap_eht_data { -- /* Data 0 */ -- IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE = 0x00000078, -- IEEE80211_RADIOTAP_EHT_DATA0_GI = 0x00000180, -- IEEE80211_RADIOTAP_EHT_DATA0_LTF = 0x00000600, -- IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF = 0x00003800, -- IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM = 0x00004000, -- IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM = 0x00018000, -- IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM = 0x00020000, -- IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_S = 0x000c0000, -- IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_O = 0x003c0000, -- IEEE80211_RADIOTAP_EHT_DATA0_CRC1_O = 0x03c00000, -- IEEE80211_RADIOTAP_EHT_DATA0_TAIL1_O = 0xfc000000, -- /* Data 1 */ -- IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE = 0x0000001f, -- IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX = 0x00001fe0, -- IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1 = 0x003fe000, -- IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1_KNOWN = 0x00400000, -- IEEE80211_RADIOTAP_EHT_DATA1_PRIMARY_80 = 0xc0000000, -- /* Data 2 */ -- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1 = 0x000001ff, -- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_1_KNOWN = 0x00000200, -- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2 = 0x0007fc00, -- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2_KNOWN = 0x00080000, -- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2 = 0x1ff00000, -- IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_2_1_2_KNOWN = 0x20000000, -- /* Data 3 */ -- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1 = 0x000001ff, -- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1_KNOWN = 0x00000200, -- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1 = 0x0007fc00, -- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_2_2_1_KNOWN = 0x00080000, -- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2 = 0x1ff00000, -- IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2_KNOWN = 0x20000000, -- /* Data 4 */ -- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2 = 0x000001ff, -- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_2_KNOWN = 0x00000200, -- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3 = 0x0007fc00, -- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3_KNOWN = 0x00080000, -- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3 = 0x1ff00000, -- IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_2_2_3_KNOWN = 0x20000000, -- /* Data 5 */ -- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4 = 0x000001ff, -- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4_KNOWN = 0x00000200, -- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4 = 0x0007fc00, -- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_2_2_4_KNOWN = 0x00080000, -- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5 = 0x1ff00000, -- IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5_KNOWN = 0x20000000, -- /* Data 6 */ -- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5 = 0x000001ff, -- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_5_KNOWN = 0x00000200, -- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6 = 0x0007fc00, -- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6_KNOWN = 0x00080000, -- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6 = 0x1ff00000, -- IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_2_2_6_KNOWN = 0x20000000, -- /* Data 7 */ -- IEEE80211_RADIOTAP_EHT_DATA7_CRC2_O = 0x0000000f, -- IEEE80211_RADIOTAP_EHT_DATA7_TAIL_2_O = 0x000003f0, -- IEEE80211_RADIOTAP_EHT_DATA7_NSS_S = 0x0000f000, -- IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S = 0x00010000, -- IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS = 0x000e0000, -- IEEE80211_RADIOTAP_EHT_DATA7_USER_ENCODING_BLOCK_CRC = 0x00f00000, -- IEEE80211_RADIOTAP_EHT_DATA7_USER_ENCODING_BLOCK_TAIL = 0x3f000000, -- /* Data 8 */ -- IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_PS_160 = 0x00000001, -- IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B0 = 0x00000002, -- IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOC_TB_FMT_B7_B1 = 0x000001fc, --}; -- --enum ieee80211_radiotap_eht_user_info { -- IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN = 0x00000001, -- IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN = 0x00000002, -- IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN = 0x00000004, -- IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O = 0x00000010, -- IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O = 0x00000020, -- IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN_M = 0x00000040, -- IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_FOR_USER = 0x00000080, -- IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID = 0x0007ff00, -- IEEE80211_RADIOTAP_EHT_USER_INFO_CODING = 0x00080000, -- IEEE80211_RADIOTAP_EHT_USER_INFO_MCS = 0x00f00000, -- IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O = 0x0f000000, -- IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O = 0x20000000, -- IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_M = 0x3f000000, -- IEEE80211_RADIOTAP_EHT_USER_INFO_RESEVED_c0000000 = 0xc0000000, --}; -- - enum ieee80211_radiotap_eht_usig_common { - IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN = 0x00000001, - IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN = 0x00000002, -@@ -573,6 +456,161 @@ enum ieee80211_radiotap_eht_usig_tb { - IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL = 0xfc000000, - }; - -+enum ieee80211_radiotap_usig_common { -+ IEEE80211_RADIOTAP_USIG_CMN_PHY_VERSION = 0x00000001, -+ IEEE80211_RADIOTAP_USIG_CMN_BW_KNOWN = 0x00000002, -+ IEEE80211_RADIOTAP_USIG_CMN_UL_DL_KNOWN = 0x00000004, -+ IEEE80211_RADIOTAP_USIG_CMN_BSS_COLOR_KNOWN = 0x00000008, -+ IEEE80211_RADIOTAP_USIG_CMN_TXOP_KNOWN = 0x00000010, -+ IEEE80211_RADIOTAP_USIG_CMN_BAD_CRC = 0x00000020, -+ IEEE80211_RADIOTAP_USIG_CMN_PHY_VERSION_ID = 0x00007000, -+ IEEE80211_RADIOTAP_USIG_CMN_BW = 0x00038000, -+ IEEE80211_RADIOTAP_USIG_CMN_UL_DL = 0x00040000, -+ IEEE80211_RADIOTAP_USIG_CMN_BSS_COLOR = 0x01f80000, -+ IEEE80211_RADIOTAP_USIG_CMN_TXOP = 0xfe000000, -+}; -+ -+enum ieee80211_radiotap_usig_eht_mu_ppdu { -+ IEEE80211_RADIOTAP_USIG_EHT_MU_DISREGARD = 0x0000001f, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_DISREGARD_VALIDATE = 0x00000020, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_PPDU_TYPE_COMP_MODE = 0x000000c0, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_PPDU_COMP_VALIDATE = 0x00000100, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_PUNCTURED_CHAN_INFO = 0x00003e00, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_PUNCTURED_CHAN_VALIDATE = 0x00004000, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_MCS = 0x00018000, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_NUM_SYMBOLS = 0x003e0000, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_CRC = 0x03c00000, -+ IEEE80211_RADIOTAP_USIG_EHT_MU_TAIL = 0xfc000000, -+}; -+ -+enum ieee80211_radiotap_usig_eht_tb_ppdu { -+ IEEE80211_RADIOTAP_USIG_EHT_TB_DISREGARD = 0x0000003f, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_PPDU_TYPE_COMP_MODE = 0x000000c0, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_VALIDATE = 0x00000100, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_SPATIAL_REUSE1 = 0x00001e00, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_SPATIAL_REUSE2 = 0x0001e000, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_DISREGARD1 = 0x003e0000, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_CRC = 0x03c00000, -+ IEEE80211_RADIOTAP_USIG_EHT_TB_TAIL = 0xfc000000, -+}; -+ -+struct ieee80211_radiotap_usig { -+ __le32 usig_cmn; -+ __le32 eht_mu_ppdu; -+ __le32 eht_tb_ppdu; -+}; -+ -+enum ieee80211_radiotap_eht_known { -+ IEEE80211_RADIOTAP_EHT_SPATIAL_REUSE_KNOWN = 0x00000002, -+ IEEE80211_RADIOTAP_EHT_GUARD_INTERVAL_KNOWN = 0x00000004, -+ IEEE80211_RADIOTAP_EHT_LTF_KNOWN = 0x00000008, -+ IEEE80211_RADIOTAP_EHT_EHT_LTF_KNOWN = 0x00000010, -+ IEEE80211_RADIOTAP_EHT_LDPC_EXTRA_SYM_SEG_KNOWN = 0x00000020, -+ IEEE80211_RADIOTAP_EHT_PRE_FEC_PAD_FACTOR_KNOWN = 0x00000040, -+ IEEE80211_RADIOTAP_EHT_PE_DISAMBIGUITY_KNOWN = 0x00000080, -+ IEEE80211_RADIOTAP_EHT_DISREGARD_KNOWN = 0x00000100, -+ IEEE80211_RADIOTAP_EHT_SOUNDING_DISREGARD_KNOWN = 0x00000200, -+ IEEE80211_RADIOTAP_EHT_CRC1_KNOWN = 0x00002000, -+ IEEE80211_RADIOTAP_EHT_TAIL1_KNOWN = 0x00004000, -+ IEEE80211_RADIOTAP_EHT_CRC2_KNOWN = 0x00008000, -+ IEEE80211_RADIOTAP_EHT_TAIL2_KNOWN = 0x00010000, -+ IEEE80211_RADIOTAP_EHT_NSS_KNOWN = 0x00020000, -+ IEEE80211_RADIOTAP_EHT_BEAMFORMED_KNOWN = 0x00040000, -+ IEEE80211_RADIOTAP_EHT_NUM_NON_OFDMA_USR_KNOWN = 0x00080000, -+ IEEE80211_RADIOTAP_EHT_USR_ENC_BLK_CRC_KNOWN = 0x00100000, -+ IEEE80211_RADIOTAP_EHT_USR_ENC_BLK_TAIL_KNOWN = 0x00200000, -+ IEEE80211_RADIOTAP_EHT_RU_SIZE_KNOWN = 0x00400000, -+ IEEE80211_RADIOTAP_EHT_RU_INDEX_KNOWN = 0x00800000, -+ IEEE80211_RADIOTAP_EHT_RU_ALLOCATION = 0x01000000, -+ IEEE80211_RADIOTAP_EHT_PRI80_CHAN_POS_KNOWN = 0x02000000, -+}; -+ -+enum ieee80211_radiotap_eht_data0 { -+ IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE = 0x00000078, -+ IEEE80211_RADIOTAP_EHT_DATA0_GI = 0x00000180, -+ IEEE80211_RADIOTAP_EHT_DATA0_LTF = 0x00000600, -+ IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF = 0x00003800, -+ IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_SEG = 0x00004000, -+ IEEE80211_RADIOTAP_EHT_DATA0_PRE_FEC_PAD_FACTOR = 0x00018000, -+ IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY = 0x00020000, -+ IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_EHT_SOUND = 0x000c0000, -+ IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_NON_EHT_SOUND = 0x003c0000, -+ IEEE80211_RADIOTAP_EHT_DATA0_CRC1 = 0x03c00000, -+ IEEE80211_RADIOTAP_EHT_DATA0_TAIL1 = 0xfc000000, -+}; -+ -+enum ieee80211_radiotap_eht_data1 { -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE = 0x0000001f, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_26 = 0, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_52 = 1, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_106 = 2, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_242 = 3, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_484 = 4, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_996 = 5, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_2x996 = 6, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_4x996 = 7, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_52P26 = 8, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_106P26 = 9, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_484P242 = 10, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_996P484 = 11, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_996P484P242 = 12, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_2x996P484 = 13, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_3x996 = 14, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE_3x996P484 = 15, -+ -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX = 0x00001fe0, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOCATION1 = 0x003fe000, -+ IEEE80211_RADIOTAP_EHT_DATA1_RU_PRIMARY_80MHZ_CHAN_POS = 0xc0000000, -+}; -+ -+enum ieee80211_radiotap_eht_data2_to_data6 { -+ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_X = 0x000001ff, -+ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_X_KNOWN = 0x00000200, -+ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP1 = 0x0007fc00, -+ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP1_KNOWN = 0x00080000, -+ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP2 = 0x1ff00000, -+ IEEE80211_RADIOTAP_EHT_DATA2_6_RU_ALLOCATION_XP2_KNOWN = 0x20000000, -+}; -+ -+enum ieee80211_radiotap_eht_data7 { -+ IEEE80211_RADIOTAP_EHT_DATA7_CRC2 = 0x0000000f, -+ IEEE80211_RADIOTAP_EHT_DATA7_TAIL2 = 0x000003f0, -+ IEEE80211_RADIOTAP_EHT_DATA7_NSS = 0x0000f000, -+ IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED = 0x00010000, -+ IEEE80211_RADIOTAP_EHT_DATA7_NUM_NON_OFDMA_USERS = 0x000e0000, -+ IEEE80211_RADIOTAP_EHT_DATA7_USR_ENC_BLK_CRC = 0x00f00000, -+ IEEE80211_RADIOTAP_EHT_DATA7_USR_ENC_BLK_TAIL = 0x3f000000, -+}; -+ -+enum ieee80211_radiotap_eht_data8 { -+ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOCATION_PS160 = 0x00000001, -+ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOCATION_TB_FORMAT1 = 0x00000002, -+ IEEE80211_RADIOTAP_EHT_DATA8_RU_ALLOCATION_TB_FORMAT2 = 0x000001fc, -+}; -+ -+enum ieee80211_radiotap_eht_user_info { -+ IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN = 0x00000001, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN = 0x00000002, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN = 0x00000004, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_RSVD_KNOWN = 0x00000008, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN = 0x00000010, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN = 0x00000020, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN = 0x00000040, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_DATA_CAPTURE = 0x00000080, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID = 0x0007ff00, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_CODING = 0x00080000, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_MCS = 0x00f00000, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_NSS = 0x0f000000, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING = 0x20000000, -+ IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG = 0x3f000000, -+}; -+ -+struct ieee80211_radiotap_eht { -+ __le32 known; -+ __le32 data[9]; -+ __le32 user_info[]; -+}; -+ - /** - * ieee80211_get_radiotap_len - get radiotap header length - */ ---- a/include/net/mac80211.h -+++ b/include/net/mac80211.h -@@ -1441,7 +1441,11 @@ ieee80211_tx_info_clear_status(struct ie - * known the frame shouldn't be reported. - * @RX_FLAG_8023: the frame has an 802.3 header (decap offload performed by - * hardware or driver) -+ * @RX_FLAG_USIG_HEADER: Universal field carries information necessary to -+ * interpret EHT PPDUs. -+ * @RX_FLAG_EHT_HEADER: EHT radiotap data is present. - */ -+ - enum mac80211_rx_flags { - RX_FLAG_MMIC_ERROR = BIT(0), - RX_FLAG_DECRYPTED = BIT(1), -@@ -1473,6 +1477,8 @@ enum mac80211_rx_flags { - RX_FLAG_RADIOTAP_LSIG = BIT(27), - RX_FLAG_NO_PSDU = BIT(28), - RX_FLAG_8023 = BIT(29), -+ RX_FLAG_USIG_HEADER = BIT(30), -+ RX_FLAG_EHT_HEADER = BIT(31), - }; - - /** -@@ -1540,6 +1546,7 @@ enum mac80211_rx_encoding { - * HT or VHT is used (%RX_FLAG_HT/%RX_FLAG_VHT) - * @nss: number of streams (VHT, HE and EHT only) - * @flag: %RX_FLAG_\* -+ * @ext_flag: %RX_FLAG_\* - * @encoding: &enum mac80211_rx_encoding - * @bw: &enum rate_info_bw - * @enc_flags: uses bits from &enum mac80211_rx_encoding_flags -@@ -1593,6 +1600,7 @@ struct ieee80211_rx_status { - u8 ampdu_delimiter_crc; - u8 zero_length_psdu_type; - u8 link_valid:1, link_id:4; -+ u8 eht_num_user; - }; - - static inline u32 ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -143,6 +143,12 @@ ieee80211_rx_radiotap_hdrlen(struct ieee - /* always present fields */ - len = sizeof(struct ieee80211_radiotap_header) + 8; - -+ /* EHT present fields */ -+ if ((status->flag & RX_FLAG_EHT_HEADER) || -+ (status->flag & RX_FLAG_USIG_HEADER)) { -+ len += 4; -+ } -+ - /* allocate extra bitmaps */ - if (status->chains) - len += 4 * hweight8(status->chains); -@@ -202,6 +208,20 @@ ieee80211_rx_radiotap_hdrlen(struct ieee - BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_lsig) != 4); - } - -+ if (status->flag & RX_FLAG_USIG_HEADER && -+ status->encoding == RX_ENC_EHT) { -+ len = ALIGN(len, 4); -+ len += 12; -+ BUILD_BUG_ON(sizeof(struct ieee80211_radiotap_usig) != 12); -+ } -+ -+ if (status->flag & RX_FLAG_EHT_HEADER && -+ status->encoding == RX_ENC_EHT) { -+ len = ALIGN(len, 4); -+ len += 40; -+ len += status->eht_num_user * 4; -+ } -+ - if (status->chains) { - /* antenna and antenna signal fields */ - len += 2 * hweight8(status->chains); -@@ -223,6 +243,15 @@ ieee80211_rx_radiotap_hdrlen(struct ieee - if (status->flag & RX_FLAG_RADIOTAP_LSIG) - tlv_offset += - sizeof(struct ieee80211_radiotap_lsig); -+ if (status->flag & RX_FLAG_USIG_HEADER) -+ tlv_offset += -+ sizeof(struct ieee80211_radiotap_usig); -+ if (status->flag & RX_FLAG_EHT_HEADER) { -+ tlv_offset += -+ sizeof(struct ieee80211_radiotap_eht); -+ tlv_offset += -+ status->eht_num_user * sizeof(u32); -+ } - - /* ensure 4 byte alignment for TLV */ - len = ALIGN(len, 4); -@@ -330,6 +359,14 @@ ieee80211_add_rx_radiotap_header(struct - struct ieee80211_radiotap_he he = {}; - struct ieee80211_radiotap_he_mu he_mu = {}; - struct ieee80211_radiotap_lsig lsig = {}; -+ struct ieee80211_radiotap_usig usig = {}; -+ struct ieee80211_radiotap_eht eht = {}; -+ u32 *user_info; -+ bool rhdr_ext = false; -+ -+ if ((status->flag & RX_FLAG_USIG_HEADER) || -+ (status->flag & RX_FLAG_EHT_HEADER)) -+ rhdr_ext = true; - - if (status->flag & RX_FLAG_RADIOTAP_HE) { - he = *(struct ieee80211_radiotap_he *)skb->data; -@@ -352,6 +389,20 @@ ieee80211_add_rx_radiotap_header(struct - tlvs_len = skb_mac_header(skb) - skb->data; - } - -+ if (status->flag & RX_FLAG_USIG_HEADER) { -+ usig = *(struct ieee80211_radiotap_usig *)skb->data; -+ skb_pull(skb, sizeof(usig)); -+ WARN_ON_ONCE(status->encoding != RX_ENC_EHT); -+ } -+ -+ if (status->flag & RX_FLAG_EHT_HEADER) { -+ eht = *(struct ieee80211_radiotap_eht *)skb->data; -+ skb_pull(skb, sizeof(eht)); -+ user_info = (u32 *)skb->data; -+ skb_pull(skb, status->eht_num_user * sizeof(u32)); -+ WARN_ON_ONCE(status->encoding != RX_ENC_EHT); -+ } -+ - mpdulen = skb->len; - if (!(has_fcs && ieee80211_hw_check(&local->hw, RX_INCLUDES_FCS))) - mpdulen += FCS_LEN; -@@ -382,6 +433,19 @@ ieee80211_add_rx_radiotap_header(struct - if (status->flag & RX_FLAG_RADIOTAP_TLV_AT_END) - it_present_val |= BIT(IEEE80211_RADIOTAP_TLV); - -+ if (rhdr_ext) { -+ it_present_val |= BIT(IEEE80211_RADIOTAP_EXT); -+ put_unaligned_le32(it_present_val, it_present); -+ it_present_val = 0; -+ it_present++; -+ /* IEEE80211_RADIOTAP_USIG */ -+ if (status->flag & RX_FLAG_USIG_HEADER) -+ it_present_val |= BIT(IEEE80211_RADIOTAP_USIG_INFO); -+ /* IEEE80211_RADIOTAP_EHT */ -+ if (status->flag & RX_FLAG_EHT_HEADER) -+ it_present_val |= BIT(IEEE80211_RADIOTAP_EHT_INFO); -+ } -+ - put_unaligned_le32(it_present_val, it_present); - - /* This references through an offset into it_optional[] rather -@@ -706,6 +770,22 @@ ieee80211_add_rx_radiotap_header(struct - *pos++ = status->chain_signal[chain]; - *pos++ = chain; - } -+ -+ if (status->flag & RX_FLAG_USIG_HEADER) { -+ while ((pos - (u8 *)rthdr) & 1) -+ pos++; -+ memcpy(pos, &usig, sizeof(usig)); -+ pos += sizeof(usig); -+ } -+ -+ if (status->flag & RX_FLAG_EHT_HEADER) { -+ while ((pos - (u8 *)rthdr) & 1) -+ pos++; -+ memcpy(pos, &eht, sizeof(eht)); -+ pos += sizeof(eht); -+ memcpy(pos, user_info, (status->eht_num_user * sizeof(u32))); -+ pos += status->eht_num_user * sizeof(u32); -+ } - } - - static struct sk_buff * -@@ -800,6 +880,14 @@ ieee80211_rx_monitor(struct ieee80211_lo - if (status->flag & RX_FLAG_RADIOTAP_TLV_AT_END) - rtap_space += skb_mac_header(origskb) - &origskb->data[rtap_space]; - -+ if (status->flag & RX_FLAG_USIG_HEADER) -+ rtap_space += sizeof(struct ieee80211_radiotap_usig); -+ -+ if (status->flag & RX_FLAG_EHT_HEADER) { -+ rtap_space += sizeof(struct ieee80211_radiotap_eht); -+ rtap_space += (status->eht_num_user * sizeof(u32)); -+ } -+ - min_head_len = rtap_space; - - /* diff --git a/package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch b/package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch deleted file mode 100644 index 4a8328f4e3ca83..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/675-01-cfg80211-Extend-interface-combination-advertisement-.patch +++ /dev/null @@ -1,1594 +0,0 @@ -From 1c326ee47eb453b884aa0436916f73c458e1a7f3 Mon Sep 17 00:00:00 2001 -From: Vasanthakumar Thiagarajan -Date: Sat, 8 Oct 2022 13:59:17 +0530 -Subject: [PATCH 1/3] cfg80211/mac80211: extend iface comb -advertisement for multi-hardware dev - -When driver combines multiple discrete hardware under one wiphy, it is -required for the driver to be able to advertise iface combination -capabilities per underlying physical hardware. Iface combination for each -underlying hardware is described with an identifier, the same index which -is used in wiphy->hw_chans[] to learn the channel capabilities of the -respective hardware. It should be noted that the supporting drivers also -need to signal the iface comb capabilities that are common for all the -hardware through the existing interface to maintain the backward -compatibility with the user space. Provision to advertise per physical -hardware specific iface comb capabilities and the sanity checks on the -advertised capabilities are implemented in this commit. - -Example: - -Say driver abstracts two discrete hardware under one wiphy, -wiphy->hw_chans[0] supporting 2 GHz and wiphy->hw_chans[1] supporting -5 GHz. Each hardware can operate on only one channel at any given time -but under the wiphy there can be concurrent interfaces on both the radios. -2 GHz hardware supports #STA <= 1, #AP <= 3 total 4 and 5 GHz hardware -supports #STA <= 1, #AP <= 4 total 5 - -struct ieee80211_iface_limit limits_common[] = { - { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, - { .max = 3, .types = BIT(NL80211_IFTYPE_AP), }, -}; - -limits_common[] defines the minimum (common) capability out of all the -underlying hardware specific capabilities. This is reported in the existing -advertisement mechanism. Common max_interfaces across 2 GHz and 5 GHz is 4, -common num_different_channels is 1. - -struct ieee80211_iface_limit limits_2ghz[] = { - { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, - { .max = 3, .types = BIT(NL80211_IFTYPE_AP), }, -}; - -struct ieee80211_iface_limit limits_5ghz[] = { - { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, - { .max = 4, .types = BIT(NL80211_IFTYPE_AP), }, -}; - -struct ieee80211_iface_combination combination = { - .limits = limits_common, - .max_interfaces = 4, - .num_different_channels = 1, - ... - .freq_range = { - { - .hw_chan_idx = 0, - .limits = limits_2ghz, - .max_interfaces = 4, - .num_different_channels = 1, - .n_limits = ARRAY_SIZE(limits_2ghz), - }, - { - .hw_chan_idx = 1, - .limits = limits_5ghz, - .max_interfaces = 5, - .num_different_channels = 1, - .n_limits = ARRAY_SIZE(limits_5ghz), - }, - }, -}; - -Signed-off-by: Vasanthakumar Thiagarajan ---- - include/net/cfg80211.h | 188 +++++++++++++++++++- - net/mac80211/chan.c | 29 ++- - net/mac80211/ieee80211_i.h | 5 +- - net/mac80211/main.c | 58 ++++++ - net/mac80211/util.c | 315 ++++++++++++++++++++++++++------ - net/wireless/core.c | 265 ++++++++++++++++++++++----- - net/wireless/util.c | 356 +++++++++++++++++++++++++++++++++---- - 7 files changed, 1073 insertions(+), 143 deletions(-) - ---- a/include/net/cfg80211.h -+++ b/include/net/cfg80211.h -@@ -1537,27 +1537,60 @@ struct cfg80211_color_change_settings { - }; - - /** -+ * struct iface_comb_per_hw_params - HW specific interface combinations input -+ * -+ * Used to pass per-hw interface combination parameters -+ * -+ * @num_different_channels: the number of different channels we want to use -+ * with in the per-hw supported channels. -+ * @iftype_num: array with the number of interfaces of each interface -+ * type. The index is the interface type as specified in &enum -+ * nl80211_iftype. -+ */ -+ -+struct iface_comb_per_hw_params { -+ int num_different_channels; -+ int iftype_num[NUM_NL80211_IFTYPES]; -+}; -+ -+/** - * struct iface_combination_params - input parameters for interface combinations - * - * Used to pass interface combination parameters - * - * @num_different_channels: the number of different channels we want -- * to use for verification -+ * to use for verification, not applicable when hw specific interface -+ * combination parameters are passed in @per_hw_params - * @radar_detect: a bitmap where each bit corresponds to a channel - * width where radar detection is needed, as in the definition of - * &struct ieee80211_iface_combination.@radar_detect_widths - * @iftype_num: array with the number of interfaces of each interface - * type. The index is the interface type as specified in &enum -- * nl80211_iftype. -+ * nl80211_iftype. This will hold the interfaces which are not -+ * yet assigned a channel when hw specific interface combination -+ * is passed in @per_hw_params. - * @new_beacon_int: set this to the beacon interval of a new interface - * that's not operating yet, if such is to be checked as part of - * the verification -+ * @per_hw: underlying hw specific interface combinations. Per-hw channel -+ * list index as advertised in wiphy @hw_chans is used as index -+ * in @per_hw to maintain the interface combination of the corresponding -+ * hw. -+ * @chandef: Channel definition for which the interface combination is to be -+ * checked, when checking during interface preparation on a new channel, -+ * for example. This will be used when the driver advertises underlying -+ * hw specific interface combination in a multi-mac device. This will be -+ * NULL when the interface combination check is not due to channel or the -+ * interface combination does not include per-hw advertisement. -+ * - */ - struct iface_combination_params { - int num_different_channels; - u8 radar_detect; - int iftype_num[NUM_NL80211_IFTYPES]; - u32 new_beacon_int; -+ struct iface_comb_per_hw_params *per_hw; -+ const struct cfg80211_chan_def *chandef; - }; - - /** -@@ -4941,6 +4974,32 @@ struct ieee80211_iface_limit { - }; - - /** -+ * strucieee80211_iface_per_hw - hardware specific interface combination -+ * -+ * Drivers registering multiple radios under a single wiphy can advertise -+ * radio specific interface combinations through this structure. Please note -+ * that to maintain the compatibility with the user space which is not aware -+ * of this extension of per-hardware interface combination signaling, -+ * the driver should still advertise it's interface combination (mostly -+ * common minimum capability) using the existing interface combination signaling -+ * method. -+ * -+ * @hw_chans_idx: index of hardware specific channel list as per wiphy @hw_chans -+ * @limits: limits for the given interface type -+ * @num_different_channels: number of different channels which can be active -+ * concurrently in this hw -+ * @max_interfaces: maximum number of total interfaces allowed in this group -+ * @n_limits: number of limitations -+ */ -+struct ieee80211_iface_per_hw { -+ u8 hw_chans_idx; -+ const struct ieee80211_iface_limit *limits; -+ u32 num_different_channels; -+ u16 max_interfaces; -+ u8 n_limits; -+}; -+ -+/** - * struct ieee80211_iface_combination - possible interface combination - * - * With this structure the driver can describe which interface -@@ -4998,6 +5057,62 @@ struct ieee80211_iface_limit { - * .num_different_channels = 2, - * }; - * -+ * -+ * 4. Hardware specific interface combination with driver supporting two hw -+ * (MAC), one underlying MAC supporting 2 GHz band and the other supporting -+ * 5 GHz band. -+ * -+ * Allow #STA <= 1, #AP <= 1, channels = 1, total 2 in 2 GHz radio and -+ * -+ * Allow #STA <= 1, #AP <= 2, channels = 1, total 3 in 5 GHz radio -+ * -+ * Drivers advertising per-hardware interface combination should also -+ * advertise a sub-set of capabilities using existing interface mainly for -+ * maintaining compatibility with the user space which is not aware of the -+ * new per-hardware advertisement. -+ * -+ * Sub-set interface combination advertised in the existing infrastructure: -+ * Allow #STA <= 1, #AP <= 1, channel = 1, total 2 -+ * -+ * .. code-block:: c -+ * -+ * struct ieee80211_iface_limit limits4[] = { -+ * { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, -+ * { .max = 1, .types = BIT(NL80211_IFTYPE_AP), }, -+ * }; -+ * struct ieee80211_iface_limit limits5_2ghz[] = { -+ * { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, -+ * { .max = 1, .types = BIT(NL80211_IFTYPE_AP), }, -+ * }; -+ * struct ieee80211_iface_limit limits5_5ghz[] = { -+ * { .max = 1, .types = BIT(NL80211_IFTYPE_STATION), }, -+ * { .max = 2, .types = BIT(NL80211_IFTYPE_AP), }, -+ * }; -+ * struct ieee80211_iface_per_hw hw_combinations[] = { -+ * { -+ * .hw_chans_idx = 0, -+ * .limits = limits5_2ghz, -+ * .num_different_channels = 1, -+ * .max_interfaces = 2, -+ * .n_limits = ARRAY_SIZE(limits5_2ghz), -+ * }, -+ * { -+ * .hw_chans_idx = 1, -+ * .limits = limits5_5ghz, -+ * .num_different_channels = 1, -+ * .max_interfaces = 3, -+ * .n_limits = ARRAY_SIZE(limits5_5ghz), -+ * }, -+ * }; -+ * struct ieee80211_iface_combination combination4 = { -+ * .limits = limits4, -+ * .n_limits = ARRAY_SIZE(limits4), -+ * .max_interfaces = 2, -+ * .num_different_channels = 1, -+ * .iface_hw_list = hw_combinations, -+ * .n_hw_list = ARRAY_SIZE(hw_combinations), -+ * }; -+ * - */ - struct ieee80211_iface_combination { - /** -@@ -5055,6 +5170,20 @@ struct ieee80211_iface_combination { - * combination must be greater or equal to this value. - */ - u32 beacon_int_min_gcd; -+ -+ /** -+ * @iface_hw_list: -+ * This wiphy has multiple underlying radios, describe interface -+ * combination for each of them, valid only when the driver advertises -+ * multi-radio presence in wiphy @hw_chans. -+ */ -+ const struct ieee80211_iface_per_hw *iface_hw_list; -+ -+ /** -+ * @n_hw_list: -+ * number of hardware in @iface_hw_List -+ */ -+ u32 n_hw_list; - }; - - struct ieee80211_txrx_stypes { -@@ -5305,6 +5434,18 @@ struct wiphy_iftype_akm_suites { - #define CFG80211_HW_TIMESTAMP_ALL_PEERS 0xffff - - /** -+ * struct ieee80211_supported_chans_per_hw - supported channels as per the -+ * underlying constituent hw configuration -+ * -+ * @n_chans: number of channels in @chans -+ * @chans: list of channels supported by the constituent hw -+ */ -+struct ieee80211_chans_per_hw { -+ int n_chans; -+ struct ieee80211_channel chans[]; -+}; -+ -+/** - * struct wiphy - wireless hardware description - * @mtx: mutex for the data (structures) of this device - * @reg_notifier: the driver's regulatory notification callback, -@@ -5520,6 +5661,13 @@ struct wiphy_iftype_akm_suites { - * A value of %CFG80211_HW_TIMESTAMP_ALL_PEERS indicates the driver - * supports enabling HW timestamping for all peers (i.e. no need to - * specify a mac address). -+ * @hw_chans: list of the channels supported by every constituent underlying hw. -+ * The drivers registering multiple radios under the a wiphy can advertise -+ * the list of channels supported by each hw in this list. Underlying hw -+ * specific channel list can be used while describing interface combination -+ * for each of the underlying hw. -+ * @num_hw: number of underlying hw for which the channels list are advertised -+ * in @hw_chans. - */ - struct wiphy { - struct mutex mtx; -@@ -5670,6 +5818,9 @@ struct wiphy { - - u16 hw_timestamp_max_peers; - -+ struct ieee80211_chans_per_hw **hw_chans; -+ int num_hw; -+ - char priv[] __aligned(NETDEV_ALIGN); - }; - -@@ -8956,9 +9107,32 @@ int cfg80211_check_combinations(struct w - int cfg80211_iter_combinations(struct wiphy *wiphy, - struct iface_combination_params *params, - void (*iter)(const struct ieee80211_iface_combination *c, -- void *data), -+ void *data, int hw_chan_idx), - void *data); - -+/** -+ * cfg80211_per_hw_iface_comb_advertised - if per-hw iface combination supported -+ * -+ * @wiphy: the wiphy -+ * -+ * This function is used to check underlying per-hw interface combination is -+ * advertised by the driver. -+ */ -+bool cfg80211_per_hw_iface_comb_advertised(struct wiphy *wiphy); -+ -+/** -+ * cfg80211_get_hw_idx_by_chan - get the hw index by the channel -+ * -+ * @wiphy: the wiphy -+ * @chandef: channel definition for which the supported hw index is -+ * required -+ * -+ * returns -1 in case the channel is not supported by any of the constituent -+ * hw -+ */ -+int cfg80211_get_hw_idx_by_chan(struct wiphy *wiphy, -+ const struct cfg80211_chan_def *chandef); -+ - /* - * cfg80211_stop_iface - trigger interface disconnection - * -@@ -9152,6 +9326,16 @@ bool cfg80211_iftype_allowed(struct wiph - void cfg80211_assoc_comeback(struct net_device *netdev, - const u8 *ap_addr, u32 timeout); - -+/** -+ * cfg80211_hw_chans_includes_dfs - check if per-hardware channel includes DFS -+ * @chans: hardware channel list -+ * -+ * Check if the given per-hardware list includes channels in DFS range. -+ * Please note the channel is checked against the entire range of DFS -+ * freq in 5 GHz irrespective of regulatory configurations. -+ */ -+bool cfg80211_hw_chans_includes_dfs(const struct ieee80211_chans_per_hw *chans); -+ - /* Logging, debugging and troubleshooting/diagnostic helpers. */ - - /* wiphy_printk helpers, similar to dev_printk */ ---- a/net/mac80211/chan.c -+++ b/net/mac80211/chan.c -@@ -47,26 +47,41 @@ int ieee80211_chanctx_refcount(struct ie - ieee80211_chanctx_num_reserved(local, ctx); - } - --static int ieee80211_num_chanctx(struct ieee80211_local *local) -+static int ieee80211_num_chanctx(struct ieee80211_local *local, -+ const struct cfg80211_chan_def *chandef) - { - struct ieee80211_chanctx *ctx; - int num = 0; -+ int hw_idx, ctx_idx; - - lockdep_assert_held(&local->chanctx_mtx); - -- list_for_each_entry(ctx, &local->chanctx_list, list) -- num++; -+ hw_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, chandef); -+ -+ list_for_each_entry(ctx, &local->chanctx_list, list) { -+ if (hw_idx < 0) -+ num++; -+ else { -+ ctx_idx = -+ cfg80211_get_hw_idx_by_chan(local->hw.wiphy, -+ &ctx->conf.def); -+ if (ctx_idx == hw_idx) -+ num++; -+ } -+ } - - return num; - } - --static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local) -+static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local, -+ const struct cfg80211_chan_def *chandef) - { - lockdep_assert_held(&local->chanctx_mtx); -- return ieee80211_num_chanctx(local) < ieee80211_max_num_channels(local); -+ return ieee80211_num_chanctx(local, chandef) < -+ ieee80211_max_num_channels(local, chandef); - } - --static struct ieee80211_chanctx * -+struct ieee80211_chanctx * - ieee80211_link_get_chanctx(struct ieee80211_link_data *link) - { - struct ieee80211_local *local __maybe_unused = link->sdata->local; -@@ -1116,7 +1131,7 @@ int ieee80211_link_reserve_chanctx(struc - - new_ctx = ieee80211_find_reservation_chanctx(local, chandef, mode); - if (!new_ctx) { -- if (ieee80211_can_create_new_chanctx(local)) { -+ if (ieee80211_can_create_new_chanctx(local, chandef)) { - new_ctx = ieee80211_new_chanctx(local, chandef, mode); - if (IS_ERR(new_ctx)) - return PTR_ERR(new_ctx); ---- a/net/mac80211/ieee80211_i.h -+++ b/net/mac80211/ieee80211_i.h -@@ -2573,6 +2573,8 @@ void ieee80211_link_copy_chanctx_to_vlan - bool clear); - int ieee80211_chanctx_refcount(struct ieee80211_local *local, - struct ieee80211_chanctx *ctx); -+struct ieee80211_chanctx * -+ieee80211_link_get_chanctx(struct ieee80211_link_data *link); - - void ieee80211_recalc_smps_chanctx(struct ieee80211_local *local, - struct ieee80211_chanctx *chanctx); -@@ -2594,7 +2596,8 @@ int ieee80211_check_combinations(struct - const struct cfg80211_chan_def *chandef, - enum ieee80211_chanctx_mode chanmode, - u8 radar_detect); --int ieee80211_max_num_channels(struct ieee80211_local *local); -+int ieee80211_max_num_channels(struct ieee80211_local *local, -+ const struct cfg80211_chan_def *chandef); - void ieee80211_recalc_chanctx_chantype(struct ieee80211_local *local, - struct ieee80211_chanctx *ctx); - ---- a/net/mac80211/main.c -+++ b/net/mac80211/main.c -@@ -937,6 +937,45 @@ static int ieee80211_init_cipher_suites( - return 0; - } - -+static int -+ieee80211_check_per_hw_iface_comb(struct ieee80211_local *local, -+ const struct ieee80211_iface_combination *c) -+{ -+ int h, l; -+ u32 hw_idx_bm = 0; -+ -+ if (!local->use_chanctx) -+ return -EINVAL; -+ -+ for (h = 0; h < c->n_hw_list; h++) { -+ const struct ieee80211_iface_per_hw *hl; -+ const struct ieee80211_chans_per_hw *chans; -+ -+ hl = &c->iface_hw_list[h]; -+ -+ if (hl->hw_chans_idx >= local->hw.wiphy->num_hw) -+ return -EINVAL; -+ -+ chans = local->hw.wiphy->hw_chans[hl->hw_chans_idx]; -+ if (c->radar_detect_widths && -+ cfg80211_hw_chans_includes_dfs(chans) && -+ hl->num_different_channels > 1) -+ return -EINVAL; -+ -+ for (l = 0; l < hl->n_limits; l++) -+ if ((hl->limits[l].types & BIT(NL80211_IFTYPE_ADHOC)) && -+ hl->limits[l].max > 1) -+ return -EINVAL; -+ -+ if (hw_idx_bm & BIT(h)) -+ return -EINVAL; -+ -+ hw_idx_bm |= BIT(h); -+ } -+ -+ return 0; -+} -+ - int ieee80211_register_hw(struct ieee80211_hw *hw) - { - struct ieee80211_local *local = hw_to_local(hw); -@@ -1051,6 +1090,25 @@ int ieee80211_register_hw(struct ieee802 - } - } - -+ for (i = 0; i < local->hw.wiphy->n_iface_combinations; i++) { -+ const struct ieee80211_iface_combination *comb; -+ -+ comb = &local->hw.wiphy->iface_combinations[i]; -+ -+ if (comb->n_hw_list && !local->hw.wiphy->num_hw) -+ return -EINVAL; -+ -+ if (!comb->n_hw_list) -+ continue; -+ -+ /* -+ * Run through similar validations on the per-hardware -+ * interface combinations, if advertised. -+ */ -+ if (ieee80211_check_per_hw_iface_comb(local, comb)) -+ return -EINVAL; -+ } -+ - /* Only HW csum features are currently compatible with mac80211 */ - if (WARN_ON(hw->netdev_features & ~MAC80211_SUPPORTED_FEATURES)) - return -EINVAL; ---- a/net/mac80211/util.c -+++ b/net/mac80211/util.c -@@ -4818,16 +4818,174 @@ static u8 ieee80211_chanctx_radar_detect - return radar_detect; - } - -+static void -+ieee80211_prepare_iface_combination(struct ieee80211_sub_if_data *sdata, -+ const struct cfg80211_chan_def *chandef, -+ enum ieee80211_chanctx_mode chanmode, -+ struct iface_combination_params *params, -+ int *total) -+{ -+ struct ieee80211_local *local = sdata->local; -+ struct ieee80211_sub_if_data *sdata_iter; -+ enum nl80211_iftype iftype = sdata->wdev.iftype; -+ struct ieee80211_chanctx *ctx; -+ -+ lockdep_assert_held(&local->chanctx_mtx); -+ -+ if (chandef) -+ params->num_different_channels = 1; -+ -+ if (iftype != NL80211_IFTYPE_UNSPECIFIED) -+ params->iftype_num[iftype] = 1; -+ -+ list_for_each_entry(ctx, &local->chanctx_list, list) { -+ if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) -+ continue; -+ params->radar_detect |= -+ ieee80211_chanctx_radar_detect(local, ctx); -+ if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) { -+ params->num_different_channels++; -+ continue; -+ } -+ if (chandef && chanmode == IEEE80211_CHANCTX_SHARED && -+ cfg80211_chandef_compatible(chandef, -+ &ctx->conf.def)) -+ continue; -+ params->num_different_channels++; -+ } -+ -+ list_for_each_entry_rcu(sdata_iter, &local->interfaces, list) { -+ struct wireless_dev *wdev_iter; -+ -+ wdev_iter = &sdata_iter->wdev; -+ -+ if (sdata_iter == sdata || -+ !ieee80211_sdata_running(sdata_iter) || -+ cfg80211_iftype_allowed(local->hw.wiphy, -+ wdev_iter->iftype, 0, 1)) -+ continue; -+ -+ params->iftype_num[wdev_iter->iftype]++; -+ (*total)++; -+ } -+} -+ -+static void -+ieee80211_get_per_hw_sdata_active_iface(struct ieee80211_sub_if_data *sdata, -+ struct iface_combination_params *params, -+ int *total) -+{ -+ struct ieee80211_local *local = sdata->local; -+ unsigned int link_id; -+ int idx; -+ -+ for (link_id = 0; link_id < ARRAY_SIZE(sdata->link); link_id++) { -+ struct ieee80211_link_data *link; -+ struct ieee80211_chanctx *ctx; -+ -+ link = sdata_dereference(sdata->link[link_id], sdata); -+ if (!link) -+ continue; -+ -+ ctx = ieee80211_link_get_chanctx(link); -+ if (ctx && -+ ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) -+ ctx = ctx->replace_ctx; -+ -+ idx = -1; -+ if (ctx) -+ idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, -+ &ctx->conf.def); -+ -+ if (idx >= 0) -+ params->per_hw[idx].iftype_num[sdata->wdev.iftype]++; -+ else -+ params->iftype_num[sdata->wdev.iftype]++; -+ -+ if (total) -+ (*total)++; -+ } -+} -+ -+static int -+ieee80211_prepare_per_hw_iface_combination(struct ieee80211_sub_if_data *sdata, -+ const struct cfg80211_chan_def *chandef, -+ enum ieee80211_chanctx_mode chanmode, -+ struct iface_combination_params *params, -+ int *total) -+{ -+ struct ieee80211_local *local = sdata->local; -+ struct ieee80211_sub_if_data *sdata_iter; -+ enum nl80211_iftype iftype = sdata->wdev.iftype; -+ struct ieee80211_chanctx *ctx; -+ int hchan_idx; -+ size_t size; -+ bool sdata_included = false; -+ -+ lockdep_assert_held(&local->chanctx_mtx); -+ -+ size = sizeof(*params->per_hw) * local->hw.wiphy->num_hw; -+ /* caller should free this memory upon success status */ -+ params->per_hw = kzalloc(size, GFP_KERNEL); -+ if (!params->per_hw) -+ return -ENOMEM; -+ -+ hchan_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, chandef); -+ if (hchan_idx >= 0) { -+ params->per_hw[hchan_idx].num_different_channels = 1; -+ if (iftype != NL80211_IFTYPE_UNSPECIFIED) { -+ params->per_hw[hchan_idx].iftype_num[iftype] = 1; -+ sdata_included = true; -+ } -+ } -+ -+ list_for_each_entry(ctx, &local->chanctx_list, list) { -+ if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) -+ continue; -+ hchan_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, -+ &ctx->conf.def); -+ if (WARN_ON(hchan_idx < 0)) -+ continue; -+ -+ params->radar_detect |= -+ ieee80211_chanctx_radar_detect(local, ctx); -+ if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) { -+ params->per_hw[hchan_idx].num_different_channels++; -+ continue; -+ } -+ if (chandef && chanmode == IEEE80211_CHANCTX_SHARED && -+ cfg80211_chandef_compatible(chandef, -+ &ctx->conf.def)) -+ continue; -+ params->per_hw[hchan_idx].num_different_channels++; -+ } -+ -+ list_for_each_entry_rcu(sdata_iter, &local->interfaces, list) { -+ struct wireless_dev *wdev_iter; -+ -+ wdev_iter = &sdata_iter->wdev; -+ -+ if ((sdata_included && sdata_iter == sdata) || -+ !ieee80211_sdata_running(sdata_iter) || -+ cfg80211_iftype_allowed(local->hw.wiphy, -+ wdev_iter->iftype, 0, 1)) -+ continue; -+ -+ ieee80211_get_per_hw_sdata_active_iface(sdata_iter, params, -+ total); -+ } -+ -+ return 0; -+} -+ - int ieee80211_check_combinations(struct ieee80211_sub_if_data *sdata, - const struct cfg80211_chan_def *chandef, - enum ieee80211_chanctx_mode chanmode, - u8 radar_detect) - { - struct ieee80211_local *local = sdata->local; -- struct ieee80211_sub_if_data *sdata_iter; - enum nl80211_iftype iftype = sdata->wdev.iftype; -- struct ieee80211_chanctx *ctx; -- int total = 1; -+ int total = 1, ret; - struct iface_combination_params params = { - .radar_detect = radar_detect, - }; -@@ -4861,60 +5019,118 @@ int ieee80211_check_combinations(struct - return 0; - } - -- if (chandef) -- params.num_different_channels = 1; -+ if (cfg80211_per_hw_iface_comb_advertised(local->hw.wiphy)) { -+ ret = ieee80211_prepare_per_hw_iface_combination(sdata, chandef, -+ chanmode, -+ ¶ms, -+ &total); -+ if (ret) -+ return ret; -+ } else { -+ ieee80211_prepare_iface_combination(sdata, chandef, chanmode, -+ ¶ms, &total); -+ } - -- if (iftype != NL80211_IFTYPE_UNSPECIFIED) -- params.iftype_num[iftype] = 1; -+ if (total == 1 && !params.radar_detect) { -+ kfree(params.per_hw); -+ return 0; -+ } - -- list_for_each_entry(ctx, &local->chanctx_list, list) { -- if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) -- continue; -- params.radar_detect |= -- ieee80211_chanctx_radar_detect(local, ctx); -- if (ctx->mode == IEEE80211_CHANCTX_EXCLUSIVE) { -- params.num_different_channels++; -+ ret = cfg80211_check_combinations(local->hw.wiphy, ¶ms); -+ -+ kfree(params.per_hw); -+ -+ return ret; -+} -+ -+static void -+ieee80211_iter_max_chans(const struct ieee80211_iface_combination *c, -+ void *data, int hw_chan_idx) -+{ -+ u32 *max_num_different_channels = data; -+ -+ *max_num_different_channels = -+ max(*max_num_different_channels, c->num_different_channels); -+} -+ -+static void -+ieee80211_iter_per_hw_max_chans(const struct ieee80211_iface_combination *c, -+ void *data, int hw_chan_idx) -+{ -+ u32 *max_num_different_channels = data; -+ u32 max_supported_different_channels = 0; -+ int i; -+ -+ for (i = 0; i < c->n_hw_list; i++) { -+ const struct ieee80211_iface_per_hw *h; -+ -+ h = &c->iface_hw_list[i]; -+ if (hw_chan_idx != -1) { -+ if (h->hw_chans_idx == hw_chan_idx) { -+ max_supported_different_channels = -+ h->num_different_channels; -+ break; -+ } - continue; - } -- if (chandef && chanmode == IEEE80211_CHANCTX_SHARED && -- cfg80211_chandef_compatible(chandef, -- &ctx->conf.def)) -- continue; -- params.num_different_channels++; -+ max_supported_different_channels += h->num_different_channels; - } - -- list_for_each_entry_rcu(sdata_iter, &local->interfaces, list) { -- struct wireless_dev *wdev_iter; -+ *max_num_different_channels = max(*max_num_different_channels, -+ max_supported_different_channels); -+} - -- wdev_iter = &sdata_iter->wdev; -+static int -+ieee80211_max_num_channels_hw_list(struct ieee80211_local *local, -+ const struct cfg80211_chan_def *chandef) -+{ -+ struct ieee80211_sub_if_data *sdata; -+ struct ieee80211_chanctx *ctx; -+ u32 max_num_different_channels = 1; -+ size_t size; -+ int err, hchan_idx; -+ struct iface_combination_params params = { 0 }; -+ -+ size = sizeof(*params.per_hw) * local->hw.wiphy->num_hw; -+ /* caller should free this memory */ -+ params.per_hw = kzalloc(size, GFP_KERNEL); -+ if (!params.per_hw) -+ return -ENOMEM; - -- if (sdata_iter == sdata || -- !ieee80211_sdata_running(sdata_iter) || -- cfg80211_iftype_allowed(local->hw.wiphy, -- wdev_iter->iftype, 0, 1)) -+ params.chandef = chandef; -+ list_for_each_entry(ctx, &local->chanctx_list, list) { -+ if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) -+ continue; -+ hchan_idx = cfg80211_get_hw_idx_by_chan(local->hw.wiphy, -+ &ctx->conf.def); -+ if (WARN_ON(hchan_idx < 0)) - continue; - -- params.iftype_num[wdev_iter->iftype]++; -- total++; -+ params.radar_detect |= -+ ieee80211_chanctx_radar_detect(local, ctx); -+ params.per_hw[hchan_idx].num_different_channels++; - } - -- if (total == 1 && !params.radar_detect) -- return 0; -+ list_for_each_entry_rcu(sdata, &local->interfaces, list) { -+ struct wireless_dev *wdev = &sdata->wdev; - -- return cfg80211_check_combinations(local->hw.wiphy, ¶ms); --} -+ if (!ieee80211_sdata_running(sdata) || -+ cfg80211_iftype_allowed(local->hw.wiphy, wdev->iftype, 0, -+ 1)) -+ continue; -+ ieee80211_get_per_hw_sdata_active_iface(sdata, ¶ms, NULL); -+ } - --static void --ieee80211_iter_max_chans(const struct ieee80211_iface_combination *c, -- void *data) --{ -- u32 *max_num_different_channels = data; -+ err = cfg80211_iter_combinations(local->hw.wiphy, ¶ms, -+ ieee80211_iter_per_hw_max_chans, -+ &max_num_different_channels); -+ kfree(params.per_hw); - -- *max_num_different_channels = max(*max_num_different_channels, -- c->num_different_channels); -+ return err < 0 ? err : max_num_different_channels; - } - --int ieee80211_max_num_channels(struct ieee80211_local *local) -+int ieee80211_max_num_channels(struct ieee80211_local *local, -+ const struct cfg80211_chan_def *chandef) - { - struct ieee80211_sub_if_data *sdata; - struct ieee80211_chanctx *ctx; -@@ -4924,6 +5140,9 @@ int ieee80211_max_num_channels(struct ie - - lockdep_assert_held(&local->chanctx_mtx); - -+ if (cfg80211_per_hw_iface_comb_advertised(local->hw.wiphy)) -+ return ieee80211_max_num_channels_hw_list(local, chandef); -+ - list_for_each_entry(ctx, &local->chanctx_list, list) { - if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) - continue; ---- a/net/wireless/core.c -+++ b/net/wireless/core.c -@@ -594,10 +594,125 @@ use_default_name: - } - EXPORT_SYMBOL(wiphy_new_nm); - -+static int -+wiphy_verify_comb_limit(struct wiphy *wiphy, -+ const struct ieee80211_iface_limit *limits, -+ u8 n_limits, u32 bcn_int_min_gcd, u32 *iface_cnt, -+ u16 *all_iftypes) -+{ -+ int l; -+ -+ for (l = 0; l < n_limits; l++) { -+ u16 types = limits[l].types; -+ -+ /* -+ * Don't advertise an unsupported type -+ * in a combination. -+ */ -+ if (WARN_ON((wiphy->interface_modes & types) != types)) -+ return -EINVAL; -+ -+ /* interface types shouldn't overlap */ -+ if (WARN_ON(types & *all_iftypes)) -+ return -EINVAL; -+ -+ *all_iftypes |= types; -+ -+ /* Shouldn't list software iftypes in combinations! */ -+ if (WARN_ON(wiphy->software_iftypes & types)) -+ return -EINVAL; -+ -+ /* Only a single P2P_DEVICE can be allowed */ -+ if (WARN_ON(types & BIT(NL80211_IFTYPE_P2P_DEVICE) && -+ limits[l].max > 1)) -+ return -EINVAL; -+ -+ /* Only a single NAN can be allowed */ -+ if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) && -+ limits[l].max > 1)) -+ return -EINVAL; -+ -+ /* -+ * This isn't well-defined right now. If you have an -+ * IBSS interface, then its beacon interval may change -+ * by joining other networks, and nothing prevents it -+ * from doing that. -+ * So technically we probably shouldn't even allow AP -+ * and IBSS in the same interface, but it seems that -+ * some drivers support that, possibly only with fixed -+ * beacon intervals for IBSS. -+ */ -+ if (WARN_ON(types & BIT(NL80211_IFTYPE_ADHOC) && -+ bcn_int_min_gcd)) -+ return -EINVAL; -+ -+ *iface_cnt += limits[l].max; -+ } -+ -+ return 0; -+} -+ -+static int -+wiphy_verify_comb_per_hw(struct wiphy *wiphy, -+ const struct ieee80211_iface_combination *comb) -+{ -+ int h; -+ u32 hw_idx_bitmap = 0; -+ int ret; -+ -+ for (h = 0; h < comb->n_hw_list; h++) { -+ const struct ieee80211_iface_per_hw *hl; -+ const struct ieee80211_chans_per_hw *chans; -+ u32 iface_cnt = 0; -+ u16 all_iftypes = 0; -+ -+ hl = &comb->iface_hw_list[h]; -+ -+ if (hl->hw_chans_idx >= wiphy->num_hw) -+ return -EINVAL; -+ -+ if (hw_idx_bitmap & BIT(hl->hw_chans_idx)) -+ return -EINVAL; -+ -+ hw_idx_bitmap |= BIT(hl->hw_chans_idx); -+ chans = wiphy->hw_chans[hl->hw_chans_idx]; -+ -+ if (WARN_ON(hl->max_interfaces < 2 && (!comb->radar_detect_widths || -+ !(cfg80211_hw_chans_includes_dfs(chans))))) -+ return -EINVAL; -+ -+ if (WARN_ON(!hl->num_different_channels)) -+ return -EINVAL; -+ -+ if (WARN_ON(comb->radar_detect_widths && -+ cfg80211_hw_chans_includes_dfs(chans) && -+ hl->num_different_channels > 1)) -+ return -EINVAL; -+ -+ if (WARN_ON(!hl->n_limits)) -+ return -EINVAL; -+ -+ ret = wiphy_verify_comb_limit(wiphy, hl->limits, hl->n_limits, -+ comb->beacon_int_min_gcd, -+ &iface_cnt, &all_iftypes); -+ if (ret) -+ return ret; -+ -+ if (WARN_ON(all_iftypes & BIT(NL80211_IFTYPE_WDS))) -+ return -EINVAL; -+ -+ if (WARN_ON(iface_cnt < comb->max_interfaces)) -+ return -EINVAL; -+ } -+ -+ return 0; -+} -+ - static int wiphy_verify_combinations(struct wiphy *wiphy) - { - const struct ieee80211_iface_combination *c; -- int i, j; -+ int i; -+ int ret; - - for (i = 0; i < wiphy->n_iface_combinations; i++) { - u32 cnt = 0; -@@ -624,39 +739,11 @@ static int wiphy_verify_combinations(str - if (WARN_ON(!c->n_limits)) - return -EINVAL; - -- for (j = 0; j < c->n_limits; j++) { -- u16 types = c->limits[j].types; -- -- /* interface types shouldn't overlap */ -- if (WARN_ON(types & all_iftypes)) -- return -EINVAL; -- all_iftypes |= types; -- -- if (WARN_ON(!c->limits[j].max)) -- return -EINVAL; -- -- /* Shouldn't list software iftypes in combinations! */ -- if (WARN_ON(wiphy->software_iftypes & types)) -- return -EINVAL; -- -- /* Only a single P2P_DEVICE can be allowed */ -- if (WARN_ON(types & BIT(NL80211_IFTYPE_P2P_DEVICE) && -- c->limits[j].max > 1)) -- return -EINVAL; -- -- /* Only a single NAN can be allowed */ -- if (WARN_ON(types & BIT(NL80211_IFTYPE_NAN) && -- c->limits[j].max > 1)) -- return -EINVAL; -- -- cnt += c->limits[j].max; -- /* -- * Don't advertise an unsupported type -- * in a combination. -- */ -- if (WARN_ON((wiphy->interface_modes & types) != types)) -- return -EINVAL; -- } -+ ret = wiphy_verify_comb_limit(wiphy, c->limits, c->n_limits, -+ c->beacon_int_min_gcd, -+ &cnt, &all_iftypes); -+ if (ret) -+ return ret; - - if (WARN_ON(all_iftypes & BIT(NL80211_IFTYPE_WDS))) - return -EINVAL; -@@ -664,11 +751,119 @@ static int wiphy_verify_combinations(str - /* You can't even choose that many! */ - if (WARN_ON(cnt < c->max_interfaces)) - return -EINVAL; -+ /* -+ * Do similar validations on the freq range specific interface -+ * combinations when advertised. -+ */ -+ if (WARN_ON(c->n_hw_list && -+ wiphy_verify_comb_per_hw(wiphy, c))) -+ return -EINVAL; - } - - return 0; - } - -+static int cfg80211_check_hw_chans(const struct ieee80211_chans_per_hw *chans1, -+ const struct ieee80211_chans_per_hw *chans2) -+{ -+ int i, j; -+ -+ if (!chans1 || !chans2) -+ return -EINVAL; -+ -+ if (!chans1->n_chans || !chans2->n_chans) -+ return -EINVAL; -+ -+ /* for now same channel is not allowed in more than one sub-hw */ -+ for (i = 0; i < chans1->n_chans; i++) -+ for (j = 0; j < chans2->n_chans; j++) -+ if (chans1->chans[i].center_freq == -+ chans2->chans[j].center_freq) -+ return -EINVAL; -+ return 0; -+} -+ -+static bool -+cfg80211_hw_chans_in_supported_list(struct wiphy *wiphy, -+ const struct ieee80211_chans_per_hw *chans) -+{ -+ enum nl80211_band band; -+ struct ieee80211_supported_band *sband; -+ bool found; -+ int i, j; -+ -+ for (i = 0; i < chans->n_chans; i++) { -+ found = false; -+ for (band = 0; band < NUM_NL80211_BANDS; band++) { -+ sband = wiphy->bands[band]; -+ if (!sband) -+ continue; -+ for (j = 0; j < sband->n_channels; j++) { -+ if (chans->chans[i].center_freq == -+ sband->channels[j].center_freq) { -+ found = true; -+ break; -+ } -+ } -+ -+ if (found) -+ break; -+ } -+ -+ if (!found) -+ return false; -+ } -+ -+ return true; -+} -+ -+static int cfg80211_validate_per_hw_chans(struct wiphy *wiphy) -+{ -+ int i, j; -+ int ret; -+ -+ if (!wiphy->num_hw) -+ return 0; -+ -+ if (!wiphy->hw_chans) -+ return -EINVAL; -+ -+ /* -+ * to advertise channel list for one hw, sband alone should -+ * be sufficient -+ */ -+ if (wiphy->num_hw < 2) -+ return -EINVAL; -+ -+ for (i = 0; i < wiphy->num_hw; i++) { -+ for (j = 0; j < wiphy->num_hw; j++) { -+ const struct ieee80211_chans_per_hw *hw_chans1; -+ const struct ieee80211_chans_per_hw *hw_chans2; -+ -+ if (i == j) -+ continue; -+ -+ hw_chans1 = wiphy->hw_chans[i]; -+ hw_chans2 = wiphy->hw_chans[j]; -+ ret = cfg80211_check_hw_chans(hw_chans1, hw_chans2); -+ if (ret) -+ return ret; -+ } -+ } -+ -+ for (i = 0; i < wiphy->num_hw; i++) { -+ const struct ieee80211_chans_per_hw *hw_chans; -+ -+ hw_chans = wiphy->hw_chans[i]; -+ if (!cfg80211_hw_chans_in_supported_list(wiphy, hw_chans)) { -+ WARN_ON(1); -+ return -EINVAL; -+ } -+ } -+ -+ return 0; -+} -+ - int wiphy_register(struct wiphy *wiphy) - { - struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); -@@ -905,6 +1100,11 @@ int wiphy_register(struct wiphy *wiphy) - WARN_ON(1); - return -EINVAL; - } -+ -+ if (cfg80211_validate_per_hw_chans(&rdev->wiphy)) { -+ WARN_ON(1); -+ return -EINVAL; -+ } - - for (i = 0; i < rdev->wiphy.n_vendor_commands; i++) { - /* ---- a/net/wireless/util.c -+++ b/net/wireless/util.c -@@ -2204,19 +2204,271 @@ int cfg80211_validate_beacon_int(struct - return 0; - } - -+static const struct ieee80211_iface_per_hw * -+cfg80211_get_hw_iface_comb_by_idx(struct wiphy *wiphy, -+ const struct ieee80211_iface_combination *c, -+ int idx) -+{ -+ int i; -+ -+ for (i = 0; i < c->n_hw_list; i++) -+ if (c->iface_hw_list[i].hw_chans_idx == idx) -+ break; -+ -+ if (i == c->n_hw_list) -+ return NULL; -+ -+ return &c->iface_hw_list[i]; -+} -+ -+static int -+cfg80211_validate_per_hw_iface_comb_limits(struct wiphy *wiphy, -+ struct iface_combination_params *params, -+ const struct ieee80211_iface_combination *c, -+ int *num_per_hw_ifaces, u32 *all_iftypes) -+{ -+ struct ieee80211_iface_limit **limits; -+ const struct ieee80211_iface_per_hw *per_hw_comb; -+ int iftype_num[NUM_NL80211_IFTYPES] = { 0 }; -+ int *n_limits; -+ int ret = 0; -+ int i, j, iftype; -+ -+ limits = kzalloc(sizeof(*limits) * wiphy->num_hw, GFP_KERNEL); -+ if (!limits) -+ return -ENOMEM; -+ -+ n_limits = kzalloc(sizeof(*n_limits) * wiphy->num_hw, GFP_KERNEL); -+ if (!n_limits) { -+ kfree(limits); -+ return -ENOMEM; -+ } -+ -+ for (i = 0; i < wiphy->num_hw; i++) { -+ per_hw_comb = cfg80211_get_hw_iface_comb_by_idx(wiphy, c, i); -+ if (!per_hw_comb) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ -+ limits[i] = kmemdup(per_hw_comb->limits, -+ per_hw_comb->n_limits * -+ sizeof(limits[i][0]), GFP_KERNEL); -+ if (!limits[i]) { -+ ret = -ENOMEM; -+ goto out_free; -+ } -+ -+ n_limits[i] = per_hw_comb->n_limits; -+ } -+ -+ for (i = 0; i < wiphy->num_hw; i++) { -+ per_hw_comb = cfg80211_get_hw_iface_comb_by_idx(wiphy, c, i); -+ if (!per_hw_comb) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ -+ if (num_per_hw_ifaces[i] > per_hw_comb->max_interfaces) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ -+ if (params->per_hw[i].num_different_channels > -+ per_hw_comb->num_different_channels) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ -+ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { -+ if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) -+ continue; -+ for (j = 0; j < n_limits[i]; j++) { -+ *all_iftypes |= limits[i][j].types; -+ if (!(limits[i][j].types & BIT(iftype))) -+ continue; -+ if (limits[i][j].max < -+ params->per_hw[i].iftype_num[iftype]) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ -+ limits[i][j].max -= -+ params->per_hw[i].iftype_num[iftype]; -+ } -+ } -+ } -+ -+ memcpy(iftype_num, params->iftype_num, NUM_NL80211_IFTYPES); -+ for (i = 0; i < wiphy->num_hw; i++) { -+ u16 rem_iface; -+ per_hw_comb = cfg80211_get_hw_iface_comb_by_idx(wiphy, c, i); -+ if (!per_hw_comb) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ -+ /* -+ * we'll not be here in the first place if the numbre of per-hw -+ * interfaces are more than the advertised ones. So it is safe -+ * to ignore that error case here. -+ */ -+ rem_iface = per_hw_comb->max_interfaces - num_per_hw_ifaces[i]; -+ if (!rem_iface) -+ continue; -+ -+ /* -+ * check if the interfaces which are not yet assigned the -+ * operating channel can be accommodated with all the available -+ * per-hw interface combination advertisements. -+ */ -+ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { -+ if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) -+ continue; -+ if (!rem_iface) -+ break; -+ for (j = 0; j < n_limits[i]; j++) { -+ u16 num_avail; -+ if (!(limits[i][j].types & BIT(iftype))) -+ continue; -+ if (!rem_iface) -+ break; -+ num_avail = min(rem_iface, limits[i][j].max); -+ if (num_avail < iftype_num[iftype]) { -+ iftype_num[iftype] -= num_avail; -+ rem_iface -= num_avail; -+ } else { -+ rem_iface -= iftype_num[iftype]; -+ iftype_num[iftype] = 0; -+ } -+ } -+ } -+ } -+ -+ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { -+ if (iftype_num[iftype]) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ } -+ -+out_free: -+ for (i = 0; i < wiphy->num_hw; i++) -+ kfree(limits[i]); -+ -+ kfree(n_limits); -+ kfree(limits); -+ -+ return ret; -+} -+ -+static int -+cfg80211_validate_iface_comb_limits(struct wiphy *wiphy, -+ struct iface_combination_params *params, -+ const struct ieee80211_iface_combination *c, -+ int num_interfaces, u32 *all_iftypes) -+{ -+ struct ieee80211_iface_limit *limits; -+ int j, iftype; -+ int ret = 0; -+ -+ if (num_interfaces > c->max_interfaces) -+ return -EINVAL; -+ if (params->num_different_channels > c->num_different_channels) -+ return -EINVAL; -+ -+ limits = kmemdup(c->limits, sizeof(limits[0]) * c->n_limits, -+ GFP_KERNEL); -+ if (!limits) -+ return -ENOMEM; -+ -+ for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { -+ if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) -+ continue; -+ for (j = 0; j < c->n_limits; j++) { -+ *all_iftypes |= limits[j].types; -+ if (!(limits[j].types & BIT(iftype))) -+ continue; -+ if (limits[j].max < params->iftype_num[iftype]) { -+ ret = -EINVAL; -+ goto out_free; -+ } -+ limits[j].max -= params->iftype_num[iftype]; -+ } -+ } -+out_free: -+ kfree(limits); -+ return ret; -+} -+ -+bool cfg80211_per_hw_iface_comb_advertised(struct wiphy *wiphy) -+{ -+ int i; -+ -+ for (i = 0; i < wiphy->n_iface_combinations; i++) { -+ const struct ieee80211_iface_combination *c; -+ c = &wiphy->iface_combinations[i]; -+ if (c->n_hw_list) -+ return true; -+ } -+ -+ return false; -+} -+EXPORT_SYMBOL(cfg80211_per_hw_iface_comb_advertised); -+ -+static bool -+cfg80211_chan_supported_by_sub_hw(struct ieee80211_chans_per_hw *hw_chans, -+ const struct cfg80211_chan_def *chandef) -+{ -+ int i; -+ -+ for (i = 0; i < hw_chans->n_chans; i++) -+ if (chandef->chan->center_freq == -+ hw_chans->chans[i].center_freq) -+ return true; -+ -+ return false; -+} -+ -+int -+cfg80211_get_hw_idx_by_chan(struct wiphy *wiphy, -+ const struct cfg80211_chan_def *chandef) -+{ -+ int i; -+ -+ if (!chandef) -+ return -1; -+ -+ if (!cfg80211_chandef_valid(chandef)) -+ return -1; -+ -+ for (i = 0; i < wiphy->num_hw; i++) { -+ if (cfg80211_chan_supported_by_sub_hw(wiphy->hw_chans[i], -+ chandef)) -+ return i; -+ } -+ -+ return -1; -+} -+EXPORT_SYMBOL(cfg80211_get_hw_idx_by_chan); -+ - int cfg80211_iter_combinations(struct wiphy *wiphy, - struct iface_combination_params *params, - void (*iter)(const struct ieee80211_iface_combination *c, -- void *data), -+ void *data, int hw_chan_idx), - void *data) - { - const struct ieee80211_regdomain *regdom; - enum nl80211_dfs_regions region = 0; -- int i, j, iftype; -+ int i, iftype; - int num_interfaces = 0; -+ int *num_per_hw_ifaces = NULL; - u32 used_iftypes = 0; - u32 beacon_int_gcd; - bool beacon_int_different; -+ bool per_hw_iface_comb_used; -+ int hw_chan_idx = -1; -+ int ret = 0; - - /* - * This is a bit strange, since the iteration used to rely only on -@@ -2239,50 +2491,66 @@ int cfg80211_iter_combinations(struct wi - rcu_read_unlock(); - } - -+ per_hw_iface_comb_used = cfg80211_per_hw_iface_comb_advertised(wiphy); -+ if (per_hw_iface_comb_used) { -+ num_per_hw_ifaces = kzalloc(sizeof(*num_per_hw_ifaces) * -+ wiphy->num_hw, GFP_KERNEL); -+ if (!num_per_hw_ifaces) -+ return -ENOMEM; -+ -+ hw_chan_idx = cfg80211_get_hw_idx_by_chan(wiphy, -+ params->chandef); -+ } -+ - for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { - num_interfaces += params->iftype_num[iftype]; - if (params->iftype_num[iftype] > 0 && - !cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) - used_iftypes |= BIT(iftype); -+ -+ if (!per_hw_iface_comb_used) -+ continue; -+ -+ /* account per_hw interfaces, if advertised */ -+ for (i = 0; i < wiphy->num_hw; i++) { -+ struct iface_comb_per_hw_params *per_hw; -+ per_hw = ¶ms->per_hw[i]; -+ num_per_hw_ifaces[i] += per_hw->iftype_num[iftype]; -+ if (per_hw->iftype_num[iftype] > 0 && -+ !cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) -+ used_iftypes |= BIT(iftype); -+ } - } - - for (i = 0; i < wiphy->n_iface_combinations; i++) { - const struct ieee80211_iface_combination *c; -- struct ieee80211_iface_limit *limits; - u32 all_iftypes = 0; - - c = &wiphy->iface_combinations[i]; - -- if (num_interfaces > c->max_interfaces) -- continue; -- if (params->num_different_channels > c->num_different_channels) -- continue; -+ if (per_hw_iface_comb_used) -+ ret = cfg80211_validate_per_hw_iface_comb_limits(wiphy, -+ params, c, -+ num_per_hw_ifaces, -+ &all_iftypes); -+ else -+ ret = cfg80211_validate_iface_comb_limits(wiphy, params, -+ c, -+ num_interfaces, -+ &all_iftypes); -+ if (ret == -ENOMEM) -+ goto out_free; - -- limits = kmemdup(c->limits, sizeof(limits[0]) * c->n_limits, -- GFP_KERNEL); -- if (!limits) -- return -ENOMEM; -- -- for (iftype = 0; iftype < NUM_NL80211_IFTYPES; iftype++) { -- if (cfg80211_iftype_allowed(wiphy, iftype, 0, 1)) -- continue; -- for (j = 0; j < c->n_limits; j++) { -- all_iftypes |= limits[j].types; -- if (!(limits[j].types & BIT(iftype))) -- continue; -- if (limits[j].max < params->iftype_num[iftype]) -- goto cont; -- limits[j].max -= params->iftype_num[iftype]; -- } -- } -+ if (ret) -+ continue; - - if (params->radar_detect != -- (c->radar_detect_widths & params->radar_detect)) -- goto cont; -+ (c->radar_detect_widths & params->radar_detect)) -+ continue; - - if (params->radar_detect && c->radar_detect_regions && - !(c->radar_detect_regions & BIT(region))) -- goto cont; -+ continue; - - /* Finally check that all iftypes that we're currently - * using are actually part of this combination. If they -@@ -2290,32 +2558,32 @@ int cfg80211_iter_combinations(struct wi - * to continue to the next. - */ - if ((all_iftypes & used_iftypes) != used_iftypes) -- goto cont; -+ continue; - - if (beacon_int_gcd) { - if (c->beacon_int_min_gcd && - beacon_int_gcd < c->beacon_int_min_gcd) -- goto cont; -+ continue; - if (!c->beacon_int_min_gcd && beacon_int_different) -- goto cont; -+ continue; - } - - /* This combination covered all interface types and - * supported the requested numbers, so we're good. - */ - -- (*iter)(c, data); -- cont: -- kfree(limits); -+ (*iter)(c, data, hw_chan_idx); - } - -- return 0; -+out_free: -+ kfree(num_per_hw_ifaces); -+ return ret; - } - EXPORT_SYMBOL(cfg80211_iter_combinations); - - static void - cfg80211_iter_sum_ifcombs(const struct ieee80211_iface_combination *c, -- void *data) -+ void *data, int hw_chan_idx) - { - int *num = data; - (*num)++; -@@ -2709,3 +2977,21 @@ cfg80211_get_iftype_ext_capa(struct wiph - return NULL; - } - EXPORT_SYMBOL(cfg80211_get_iftype_ext_capa); -+ -+bool -+cfg80211_hw_chans_includes_dfs(const struct ieee80211_chans_per_hw *chans) -+{ -+ int i; -+ -+ for (i = 0; i < chans->n_chans; i++) { -+ if (chans->chans[i].band == NL80211_BAND_5GHZ && -+ ((chans->chans[i].center_freq >= 5250 && -+ chans->chans[i].center_freq <= 5340) || -+ (chans->chans[i].center_freq >= 5480 && -+ chans->chans[i].center_freq <= 5720))) -+ return true; -+ } -+ -+ return false; -+} -+EXPORT_SYMBOL(cfg80211_hw_chans_includes_dfs); diff --git a/package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch b/package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch deleted file mode 100644 index 1bfa9b89b45c5f..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/702-ath11k-fix-memory-leak-in-dp-rx.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 9e4857cfe7f646c239fde030eb16b3d6520c34d8 Mon Sep 17 00:00:00 2001 -From: Hari Chandrakanthan -Date: Fri, 6 Jan 2023 12:49:44 +0530 -Subject: [PATCH] ath11k: fix memory leak in dp rx - -In dp rx path, by default, fast_rx is set as true. -And if peer supports fast rx, the frame is sent to upper layer -through napi_gro_receive. - -If peer doesn't support fast rx, the frames need to be processed in -ath11k_dp_rx_deliver_msdu and sent to mac80211 using ieee80211_rx_napi. -In dp rx path, the api ath11k_dp_rx_h_mpdu checks whether peer supports -fast rx. - -If peer find fails in ath11k_dp_rx_h_mpdu, the skb is not sent to network stack -as well as mac80211. Because the argument fast_rx is not set to false in ath11k_dp_rx_h_mpdu -when peer find fails. - -This can lead to memory leak. - -Fix it by setting argument fast_rx as false in ath11k_dp_rx_h_mpdu -so that the skb is sent to mac80211 through ath11k_dp_rx_deliver_msdu. - -Signed-off-by: Hari Chandrakanthan ---- - drivers/net/wireless/ath/ath11k/dp_rx.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2512,8 +2512,6 @@ static void ath11k_dp_rx_h_mpdu(struct a - } - } - -- *fast_rx = false; -- - if (rxcb->is_mcbc) - enctype = peer->sec_type_grp; - else -@@ -2523,6 +2521,8 @@ static void ath11k_dp_rx_h_mpdu(struct a - } - spin_unlock_bh(&ar->ab->base_lock); - -+ *fast_rx = false; -+ - rx_attention = ath11k_dp_rx_get_attention(ar->ab, rx_desc); - err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention); - if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-020-ath11k-add-btcoex-config.patch b/package/kernel/mac80211/patches/ath11k_nss/902-020-ath11k-add-btcoex-config.patch deleted file mode 100644 index 495245f9662462..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/902-020-ath11k-add-btcoex-config.patch +++ /dev/null @@ -1,612 +0,0 @@ ---- a/drivers/net/wireless/ath/ath11k/Makefile -+++ b/drivers/net/wireless/ath/ath11k/Makefile -@@ -17,7 +17,8 @@ ath11k-y += core.o \ - peer.o \ - dbring.o \ - hw.o \ -- pcic.o -+ pcic.o \ -+ vendor.o - - ath11k-$(CPTCFG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o - ath11k-$(CPTCFG_NL80211_TESTMODE) += testmode.o ---- a/drivers/net/wireless/ath/ath11k/core.h -+++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -637,6 +637,16 @@ struct ath11k_per_peer_tx_stats { - #define ATH11K_FLUSH_TIMEOUT (5 * HZ) - #define ATH11K_VDEV_DELETE_TIMEOUT_HZ (5 * HZ) - -+struct ath11k_coex_info { -+ bool coex_support; -+ u32 pta_num; -+ u32 coex_mode; -+ u32 bt_active_time_slot; -+ u32 bt_priority_time_slot; -+ u32 coex_algo_type; -+ u32 pta_priority; -+}; -+ - struct ath11k { - struct ath11k_base *ab; - struct ath11k_pdev *pdev; -@@ -760,6 +770,8 @@ struct ath11k { - struct ath11k_per_peer_tx_stats cached_stats; - u32 last_ppdu_id; - u32 cached_ppdu_id; -+ -+ struct ath11k_coex_info coex; - int monitor_vdev_id; - struct completion fw_mode_reset; - u8 ftm_msgref; ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -24,6 +25,7 @@ - #include "debugfs_sta.h" - #include "hif.h" - #include "wow.h" -+#include "vendor.h" - #include "nss.h" - - #define CHAN2G(_channel, _freq, _flags) { \ -@@ -9286,6 +9288,91 @@ err_fallback: - return 0; - } - -+#define ATH11K_WLAN_PRIO_MAX 0x63 -+#define ATH11K_WLAN_PRIO_WEIGHT 0xff -+ -+int ath11k_mac_coex_config(struct ath11k *ar, struct ath11k_vif *arvif, -+ int coex, u32 wlan_prio_mask, u8 wlan_weight) -+{ -+ struct coex_config_arg coex_config; -+ int ret; -+ -+ if (ar->state != ATH11K_STATE_ON && -+ ar->state != ATH11K_STATE_RESTARTED) -+ return -ENETDOWN; -+ -+ if (coex == -1 || !(test_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags) ^ coex)) -+ goto next; -+ -+ coex_config.vdev_id = arvif->vdev_id; -+ if (coex == 1) { -+ coex_config.config_type = WMI_COEX_CONFIG_PTA_INTERFACE; -+ coex_config.pta_num = ar->coex.pta_num; -+ coex_config.coex_mode = ar->coex.coex_mode; -+ coex_config.bt_txrx_time = ar->coex.bt_active_time_slot; -+ coex_config.bt_priority_time = ar->coex.bt_priority_time_slot; -+ coex_config.pta_algorithm = ar->coex.coex_algo_type; -+ coex_config.pta_priority = ar->coex.pta_priority; -+ ret = ath11k_send_coex_config_cmd(ar, &coex_config); -+ if (ret) { -+ ath11k_warn(ar->ab, -+ "failed to set coex config vdev_id %d ret %d\n", -+ coex_config.vdev_id, ret); -+ goto out; -+ } -+ } -+ -+ memset(&coex_config, 0, sizeof(struct coex_config_arg)); -+ coex_config.vdev_id = arvif->vdev_id; -+ coex_config.config_type = WMI_COEX_CONFIG_BTC_ENABLE; -+ coex_config.coex_enable = coex; -+ ret = ath11k_send_coex_config_cmd(ar, &coex_config); -+ if (ret) { -+ ath11k_warn(ar->ab, -+ "failed to set coex config vdev_id %d ret %d\n", -+ coex_config.vdev_id, ret); -+ goto out; -+ } -+ -+ if (coex) -+ set_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags); -+ else -+ clear_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags); -+ -+next: -+ if (!wlan_prio_mask) { -+ ret = 0; -+ goto out; -+ } -+ -+ if (!(test_bit(ATH11K_FLAG_BTCOEX, &ar->ab->dev_flags))) { -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ if (wlan_prio_mask > ATH11K_WLAN_PRIO_MAX || -+ wlan_weight > ATH11K_WLAN_PRIO_WEIGHT) { -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ memset(&coex_config, 0, sizeof(struct coex_config_arg)); -+ coex_config.vdev_id = arvif->vdev_id; -+ coex_config.config_type = WMI_COEX_CONFIG_WLAN_PKT_PRIORITY; -+ coex_config.wlan_pkt_type = wlan_prio_mask; -+ coex_config.wlan_pkt_weight = wlan_weight; -+ ret = ath11k_send_coex_config_cmd(ar, &coex_config); -+ if (ret) { -+ ath11k_warn(ar->ab, -+ "failed to set coex config vdev_id %d ret %d\n", -+ coex_config.vdev_id, ret); -+ goto out; -+ } -+ -+out: -+ return ret; -+} -+ - static const struct ieee80211_ops ath11k_ops = { - .tx = ath11k_mac_op_tx, - .wake_tx_queue = ieee80211_handle_wake_tx_queue, -@@ -9525,6 +9612,56 @@ static int ath11k_mac_setup_iface_combin - return 0; - } - -+static void ath11k_mac_fetch_coex_info(struct ath11k *ar) -+{ -+ struct ath11k_pdev_cap *cap = &ar->pdev->cap; -+ struct ath11k_base *ab = ar->ab; -+ struct device *dev = ab->dev; -+ -+ ar->coex.coex_support = false; -+ -+ if (!(cap->supported_bands & WMI_HOST_WLAN_2G_CAP)) -+ return; -+ -+ if (of_property_read_u32(dev->of_node, "qcom,pta-num", -+ &ar->coex.pta_num)) { -+ ath11k_err(ab, "No qcom,pta_num entry in dev-tree.\n"); -+ } -+ -+ if (of_property_read_u32(dev->of_node, "qcom,coex-mode", -+ &ar->coex.coex_mode)) { -+ ath11k_err(ab, "No qcom,coex_mode entry in dev-tree.\n"); -+ } -+ -+ if (of_property_read_u32(dev->of_node, "qcom,bt-active-time", -+ &ar->coex.bt_active_time_slot)) { -+ ath11k_err(ab, "No qcom,bt-active-time entry in dev-tree.\n"); -+ } -+ -+ if (of_property_read_u32(dev->of_node, "qcom,bt-priority-time", -+ &ar->coex.bt_priority_time_slot)) { -+ ath11k_err(ab, "No qcom,bt-priority-time entry in dev-tree.\n"); -+ } -+ -+ if (of_property_read_u32(dev->of_node, "qcom,coex-algo", -+ &ar->coex.coex_algo_type)) { -+ ath11k_err(ab, "No qcom,coex-algo entry in dev-tree.\n"); -+ } -+ -+ if (of_property_read_u32(dev->of_node, "qcom,pta-priority", -+ &ar->coex.pta_priority)) { -+ ath11k_err(ab, "No qcom,pta-priority entry in dev-tree.\n"); -+ } -+ -+ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, "coex pta_num %u coex_mode %u" -+ " bt_active_time_slot %u bt_priority_time_slot %u" -+ " coex_algorithm %u pta_priority %u\n", ar->coex.pta_num, -+ ar->coex.coex_mode, ar->coex.bt_active_time_slot, -+ ar->coex.bt_priority_time_slot, ar->coex.coex_algo_type, -+ ar->coex.pta_priority); -+ ar->coex.coex_support = true; -+} -+ - static const u8 ath11k_if_types_ext_capa[] = { - [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, - [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, -@@ -9786,6 +9923,7 @@ static int __ath11k_mac_register(struct - ar->hw->wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD; - - ath11k_reg_init(ar); -+ ath11k_vendor_register(ar); - - if (!test_bit(ATH11K_FLAG_RAW_MODE, &ab->dev_flags)) { - ar->hw->netdev_features = NETIF_F_HW_CSUM; -@@ -9948,6 +10086,7 @@ int ath11k_mac_allocate(struct ath11k_ba - */ - ath11k_wmi_pdev_attach(ab, i); - -+ ath11k_mac_fetch_coex_info(ar); - ar->cfg_tx_chainmask = pdev->cap.tx_chain_mask; - ar->cfg_rx_chainmask = pdev->cap.rx_chain_mask; - ar->num_tx_chains = get_num_chains(pdev->cap.tx_chain_mask); ---- a/drivers/net/wireless/ath/ath11k/mac.h -+++ b/drivers/net/wireless/ath/ath11k/mac.h -@@ -150,8 +150,9 @@ void __ath11k_mac_scan_finish(struct ath - void ath11k_mac_scan_finish(struct ath11k *ar); - - struct ath11k_vif *ath11k_mac_get_arvif(struct ath11k *ar, u32 vdev_id); --struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab, -- u32 vdev_id); -+struct ath11k_vif *ath11k_mac_get_arvif_by_vdev_id(struct ath11k_base *ab, u32 vdev_id); -+int ath11k_mac_coex_config(struct ath11k *ar, struct ath11k_vif *arvif, -+ int coex, u32 wlan_prio_mask, u8 wlan_weight); - u8 ath11k_mac_get_target_pdev_id(struct ath11k *ar); - u8 ath11k_mac_get_target_pdev_id_from_vif(struct ath11k_vif *arvif); - struct ath11k_vif *ath11k_mac_get_vif_up(struct ath11k_base *ab); ---- /dev/null -+++ b/drivers/net/wireless/ath/ath11k/vendor.c -@@ -0,0 +1,121 @@ -+// SPDX-License-Identifier: ISC -+/* -+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -+ */ -+ -+#include -+#include -+#include "core.h" -+#include "vendor.h" -+#include "debug.h" -+ -+static const struct nla_policy -+ath11k_vendor_btcoex_config_policy[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX + 1] = { -+ [QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE] = { .type = NLA_U8 }, -+ [QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY] = { .type = NLA_NESTED }, -+}; -+ -+static const struct nla_policy -+ath11k_vendor_wlan_prio_policy[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX + 1] = { -+ [QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK] = { .type = NLA_U8 }, -+ [QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT] = { .type = NLA_U8 }, -+}; -+ -+static int ath11k_vendor_btcoex_configure(struct wiphy *wiphy, -+ struct wireless_dev *wdev, -+ const void *data, -+ int data_len) -+{ -+ struct ieee80211_vif *vif; -+ struct ath11k_vif *arvif; -+ struct ath11k *ar; -+ struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX + 1]; -+ struct nlattr *tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX + 1]; -+ struct nlattr *wlan_prio; -+ enum qca_wlan_priority_type wlan_prio_mask = 0; -+ int ret, coex = -1, rem_conf; -+ u8 wlan_weight = 0; -+ -+ if (!wdev) -+ return -EINVAL; -+ -+ vif = wdev_to_ieee80211_vif(wdev); -+ if (!vif) -+ return -EINVAL; -+ -+ arvif = (struct ath11k_vif *)vif->drv_priv; -+ if (!arvif) -+ return -EINVAL; -+ -+ ar = arvif->ar; -+ -+ mutex_lock(&ar->conf_mutex); -+ -+ ret = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX, data, data_len, -+ ath11k_vendor_btcoex_config_policy, NULL); -+ if (ret) { -+ ath11k_warn(ar->ab, "invalid BTCOEX config policy attribute\n"); -+ goto out; -+ } -+ -+ if (!tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE] && -+ !tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY]) { -+ ath11k_warn(ar->ab, "invalid BTCOEX config attributes\n"); -+ ret = -EINVAL; -+ goto out; -+ } -+ -+ if (tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE]) { -+ coex = nla_get_u8(tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE]); -+ ret = ath11k_mac_coex_config(ar, arvif, coex, wlan_prio_mask, wlan_weight); -+ if (ret) -+ goto out; -+ } -+ if (tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY]) { -+ nla_for_each_nested(wlan_prio, -+ tb[QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY], -+ rem_conf) { -+ ret = -+ nla_parse_nested(tb_wlan_prio, QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX, -+ wlan_prio, ath11k_vendor_wlan_prio_policy, -+ NULL); -+ if (ret) -+ goto out; -+ wlan_prio_mask = -+ nla_get_u8(tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK]); -+ if (tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT]) -+ wlan_weight = -+ nla_get_u8(tb_wlan_prio[QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT]); -+ ath11k_dbg(ar->ab, ATH11K_DBG_MAC, -+ "BTCOEX enable %u WLAN Priority %u wlan weight %u\n", -+ coex, wlan_prio_mask, wlan_weight); -+ -+ ret = ath11k_mac_coex_config(ar, arvif, coex, wlan_prio_mask, wlan_weight); -+ if (ret) -+ goto out; -+ } -+ } -+ -+out: -+ mutex_unlock(&ar->conf_mutex); -+ return ret; -+} -+ -+static struct wiphy_vendor_command ath11k_vendor_commands[] = { -+ { -+ .info.vendor_id = QCA_NL80211_VENDOR_ID, -+ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG, -+ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | -+ WIPHY_VENDOR_CMD_NEED_RUNNING, -+ .doit = ath11k_vendor_btcoex_configure, -+ .policy = ath11k_vendor_btcoex_config_policy -+ } -+}; -+ -+int ath11k_vendor_register(struct ath11k *ar) -+{ -+ ar->hw->wiphy->vendor_commands = ath11k_vendor_commands; -+ ar->hw->wiphy->n_vendor_commands = ARRAY_SIZE(ath11k_vendor_commands); -+ -+ return 0; -+} ---- /dev/null -+++ b/drivers/net/wireless/ath/ath11k/vendor.h -@@ -0,0 +1,83 @@ -+/* SPDX-License-Identifier: ISC */ -+/* -+ * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. -+ */ -+ -+#ifndef ATH11K_VENDOR_H -+#define ATH11K_VENDOR_H -+ -+#define QCA_NL80211_VENDOR_ID 0x001374 -+ -+enum qca_nl80211_vendor_subcmds { -+ /* QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG: This command is used to -+ * enable/disable BTCOEX and set priority for different type of WLAN -+ * traffic over BT low priority traffic. This uses attributes in -+ * enum qca-vendor_attr_btcoex_config. -+ */ -+ QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG = 182, -+}; -+ -+/* -+ * enum qca_wlan_priority_type - priority mask -+ * This enum defines priority mask that user can configure -+ * over BT traffic type which can be passed through -+ * QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY attribute. -+ * -+ * @QCA_WLAN_PRIORITY_BE: Bit mask for WLAN Best effort traffic -+ * @QCA_WLAN_PRIORITY_BK: Bit mask for WLAN Background traffic -+ * @QCA_WLAN_PRIORITY_VI: Bit mask for WLAN Video traffic -+ * @QCA_WLAN_PRIORITY_VO: Bit mask for WLAN Voice traffic -+ * @QCA_WLAN_PRIORITY_BEACON: Bit mask for WLAN BEACON frame -+ * @QCA_WLAN_PRIORITY_MGMT: Bit mask for WLAN Management frame -+*/ -+enum qca_wlan_priority_type { -+ QCA_WLAN_PRIORITY_BE = BIT(0), -+ QCA_WLAN_PRIORITY_BK = BIT(1), -+ QCA_WLAN_PRIORITY_VI = BIT(2), -+ QCA_WLAN_PRIORITY_VO = BIT(3), -+ QCA_WLAN_PRIORITY_BEACON = BIT(4), -+ QCA_WLAN_PRIORITY_MGMT = BIT(5), -+}; -+ -+/** -+ * enum qca_wlan_vendor_attr_wlan_prio - Used to configure -+ * WLAN priority mask and its respective weight value. -+ * @QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK - This is u8 attribute -+ * used to pass traffic type mask value see %qca_wlan_priority_type -+ * @QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT - This is u8 attribute -+ * accepts value between 0 and 255 and used to configure weight for -+ * traffic type mentioned in %QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK. -+ */ -+enum qca_wlan_vendor_attr_wlan_prio { -+ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_INVALID = 0, -+ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MASK = 1, -+ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT = 2, -+ -+ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_LAST, -+ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_MAX = -+ QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_LAST - 1, -+}; -+ -+ -+ -+/** -+ * enum qca_wlan_vendor_attr_btcoex_config - Used by the vendor command -+ * The use can enable/disable BTCOEX and configure WLAN priority for -+ * different traffic type over BT. -+ * QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE, enable/disable BTCOEX -+ * QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY, This is a nested -+ * attribute pass the attributes in %qca_wlan_vendor_attr_wlan_prio. -+ */ -+enum qca_wlan_vendor_attr_btcoex_config { -+ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_INVALID = 0, -+ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_ENABLE = 1, -+ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_WLAN_PRIORITY = 2, -+ -+ /* keep last */ -+ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_LAST, -+ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX = -+ QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_LAST - 1 -+}; -+ -+int ath11k_vendor_register(struct ath11k *ar); -+#endif /* QCA_VENDOR_H */ ---- a/drivers/net/wireless/ath/ath11k/wmi.c -+++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -1743,6 +1743,71 @@ int ath11k_wmi_vdev_set_param_cmd(struct - return ret; - } - -+static void ath11k_wmi_copy_coex_config(struct ath11k *ar, struct wmi_coex_config_cmd *cmd, -+ struct coex_config_arg *coex_config) -+{ -+ if (coex_config->config_type == WMI_COEX_CONFIG_BTC_ENABLE) { -+ cmd->coex_enable = coex_config->coex_enable; -+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, -+ "WMI coex config type %u vdev id %d coex_enable %u\n", -+ coex_config->config_type, coex_config->vdev_id, -+ coex_config->coex_enable); -+ } -+ -+ if (coex_config->config_type == WMI_COEX_CONFIG_WLAN_PKT_PRIORITY) { -+ cmd->wlan_pkt_type = coex_config->wlan_pkt_type; -+ cmd->wlan_pkt_weight = coex_config->wlan_pkt_weight; -+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, -+ "WMI coex config type %u vdev id %d wlan pkt type 0x%x wlan pkt weight %u\n", -+ coex_config->config_type, coex_config->vdev_id, -+ coex_config->wlan_pkt_type, coex_config->wlan_pkt_weight); -+ } -+ -+ if (coex_config->config_type == WMI_COEX_CONFIG_PTA_INTERFACE) { -+ cmd->pta_num = coex_config->pta_num; -+ cmd->coex_mode = coex_config->coex_mode; -+ cmd->bt_txrx_time = coex_config->bt_txrx_time; -+ cmd->bt_priority_time = coex_config->bt_priority_time; -+ cmd->pta_algorithm = coex_config->pta_algorithm; -+ cmd->pta_priority = coex_config->pta_priority; -+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, -+ "WMI coex config type %u vdev id %d pta num %u coex mode %u bt_txrx_time %u bt_priority_time %u pta alogrithm %u pta priority %u\n", -+ coex_config->config_type, coex_config->vdev_id, -+ coex_config->pta_num, coex_config->coex_mode, -+ coex_config->bt_txrx_time, coex_config->bt_priority_time, -+ coex_config->pta_algorithm, coex_config->pta_priority); -+ } -+} -+ -+int ath11k_send_coex_config_cmd(struct ath11k *ar, -+ struct coex_config_arg *coex_config) -+{ -+ struct ath11k_pdev_wmi *wmi = ar->wmi; -+ struct wmi_coex_config_cmd *cmd; -+ struct sk_buff *skb; -+ int ret; -+ -+ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); -+ if (!skb) -+ return -ENOMEM; -+ -+ cmd = (struct wmi_coex_config_cmd *)skb->data; -+ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_COEX_CONFIG_CMD) | -+ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); -+ -+ cmd->vdev_id = coex_config->vdev_id; -+ cmd->config_type = coex_config->config_type; -+ ath11k_wmi_copy_coex_config(ar, cmd, coex_config); -+ -+ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_COEX_CONFIG_CMDID); -+ if (ret) { -+ ath11k_warn(ar->ab, "failed to send WMI_COEX_CONFIG_CMD cmd\n"); -+ dev_kfree_skb(skb); -+ } -+ -+ return ret; -+} -+ - int ath11k_wmi_send_stats_request_cmd(struct ath11k *ar, - struct stats_request_params *param) - { ---- a/drivers/net/wireless/ath/ath11k/wmi.h -+++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -5333,6 +5333,79 @@ struct wmi_wmm_params_arg { - u8 no_ack; - }; - -+enum wmi_coex_config_type { -+ WMI_COEX_CONFIG_PAGE_P2P_TDM = 1, -+ WMI_COEX_CONFIG_PAGE_STA_TDM = 2, -+ WMI_COEX_CONFIG_PAGE_SAP_TDM = 3, -+ WMI_COEX_CONFIG_DURING_WLAN_CONN = 4, -+ WMI_COEX_CONFIG_BTC_ENABLE = 5, -+ WMI_COEX_CONFIG_COEX_DBG = 6, -+ WMI_COEX_CONFIG_PAGE_P2P_STA_TDM = 7, -+ WMI_COEX_CONFIG_INQUIRY_P2P_TDM = 8, -+ WMI_COEX_CONFIG_INQUIRY_STA_TDM = 9, -+ WMI_COEX_CONFIG_INQUIRY_SAP_TDM = 10, -+ WMI_COEX_CONFIG_INQUIRY_P2P_STA_TDM = 11, -+ WMI_COEX_CONFIG_TX_POWER = 12, -+ WMI_COEX_CONFIG_PTA_CONFIG = 13, -+ WMI_COEX_CONFIG_AP_TDM = 14, -+ WMI_COEX_CONFIG_WLAN_SCAN_PRIORITY = 15, -+ WMI_COEX_CONFIG_WLAN_PKT_PRIORITY = 16, -+ WMI_COEX_CONFIG_PTA_INTERFACE = 17, -+}; -+ -+struct coex_config_arg { -+ u32 vdev_id; -+ u32 config_type; -+ union { -+ struct { -+ u32 coex_enable; -+ }; -+ -+ struct { -+ u32 pta_num; -+ u32 coex_mode; -+ u32 bt_txrx_time; -+ u32 bt_priority_time; -+ u32 pta_algorithm; -+ u32 pta_priority; -+ }; -+ -+ struct { -+ u32 wlan_pkt_type; -+ u32 wlan_pkt_type_continued; -+ u32 wlan_pkt_weight; -+ u32 bt_pkt_weight; -+ }; -+ }; -+}; -+ -+struct wmi_coex_config_cmd { -+ u32 tlv_header; -+ u32 vdev_id; -+ u32 config_type; -+ union { -+ struct { -+ u32 coex_enable; -+ } __packed; -+ -+ struct { -+ u32 pta_num; -+ u32 coex_mode; -+ u32 bt_txrx_time; -+ u32 bt_priority_time; -+ u32 pta_algorithm; -+ u32 pta_priority; -+ } __packed; -+ -+ struct { -+ u32 wlan_pkt_type; -+ u32 wlan_pkt_type_continued; -+ u32 wlan_pkt_weight; -+ u32 bt_pkt_weight; -+ } __packed; -+ } __packed; -+} __packed; -+ - struct wmi_vdev_set_wmm_params_cmd { - u32 tlv_header; - u32 vdev_id; -@@ -6553,6 +6626,8 @@ int ath11k_wmi_pdev_non_srg_obss_color_e - u32 *bitmap); - int ath11k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath11k *ar, - u32 *bitmap); -+int ath11k_send_coex_config_cmd(struct ath11k *ar, -+ struct coex_config_arg *coex_config); - int ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id, - u8 bss_color, u32 period, - bool enable); diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch b/package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch deleted file mode 100644 index 52037816a113b1..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/902-022-ath11k-add-ap-ps-support.patch +++ /dev/null @@ -1,324 +0,0 @@ ---- a/drivers/net/wireless/ath/ath11k/core.h -+++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -30,6 +30,7 @@ - #include "spectral.h" - #include "wow.h" - #include "nss.h" -+#include "vendor.h" - - #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) - -@@ -637,6 +638,11 @@ struct ath11k_coex_info { - u32 pta_priority; - }; - -+enum ath11k_ap_ps_state { -+ ATH11K_AP_PS_STATE_OFF, -+ ATH11K_AP_PS_STATE_ON, -+}; -+ - struct ath11k { - struct ath11k_base *ab; - struct ath11k_pdev *pdev; -@@ -765,6 +771,8 @@ struct ath11k { - int monitor_vdev_id; - struct completion fw_mode_reset; - u8 ftm_msgref; -+ int ap_ps_enabled; -+ enum ath11k_ap_ps_state ap_ps_state; - #ifdef CPTCFG_ATH11K_DEBUGFS - struct ath11k_debug debug; - #endif ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4963,6 +4963,33 @@ static void ath11k_mac_dec_num_stations( - ar->num_stations--; - } - -+int ath11k_mac_ap_ps_recalc(struct ath11k *ar) -+{ -+ struct ath11k_vif *arvif; -+ bool has_sta_iface = false; -+ enum ath11k_ap_ps_state state = ATH11K_AP_PS_STATE_OFF; -+ int ret = 0; -+ -+ list_for_each_entry(arvif, &ar->arvifs, list) { -+ if (arvif->vdev_type == WMI_VDEV_TYPE_STA) { -+ has_sta_iface = true; -+ break; -+ } -+ } -+ -+ if (!has_sta_iface && !ar->num_stations && ar->ap_ps_enabled) -+ state = ATH11K_AP_PS_STATE_ON; -+ -+ if (ar->ap_ps_state == state) -+ return ret; -+ -+ ret = ath11k_wmi_pdev_ap_ps_cmd_send(ar, ar->pdev->pdev_id, state); -+ if (!ret) -+ ar->ap_ps_state = state; -+ -+ return ret; -+} -+ - static int ath11k_mac_station_add(struct ath11k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta) -@@ -5002,6 +5029,12 @@ static int ath11k_mac_station_add(struct - ath11k_dbg(ab, ATH11K_DBG_MAC, "Added peer: %pM for VDEV: %d\n", - sta->addr, arvif->vdev_id); - -+ ret = ath11k_mac_ap_ps_recalc(ar); -+ if (ret) { -+ ath11k_warn(ar->ab, "failed to send ap ps ret %d\n", ret); -+ goto exit; -+ } -+ - if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) { - arsta->tx_stats = kzalloc(sizeof(*arsta->tx_stats), GFP_KERNEL); - if (!arsta->tx_stats) { -@@ -5158,6 +5191,9 @@ static int ath11k_mac_op_sta_state(struc - - kfree(arsta->tx_stats); - arsta->tx_stats = NULL; -+ ret = ath11k_mac_ap_ps_recalc(ar); -+ if (ret) -+ ath11k_warn(ar->ab, "failed to send ap ps ret %d\n", ret); - - kfree(arsta->rx_stats); - arsta->rx_stats = NULL; -@@ -6566,6 +6602,7 @@ static void ath11k_mac_op_stop(struct ie - - clear_bit(ATH11K_CAC_RUNNING, &ar->dev_flags); - ar->state = ATH11K_STATE_OFF; -+ ar->ap_ps_state = ATH11K_AP_PS_STATE_OFF; - mutex_unlock(&ar->conf_mutex); - - cancel_delayed_work_sync(&ar->scan.timeout); -@@ -6973,7 +7010,6 @@ static int ath11k_mac_op_add_interface(s - arvif->vdev_id, ret); - goto err; - } -- - ar->num_created_vdevs++; - ath11k_dbg(ab, ATH11K_DBG_MAC, "vdev %pM created, vdev_id %d\n", - vif->addr, arvif->vdev_id); -@@ -7120,6 +7156,10 @@ static int ath11k_mac_op_add_interface(s - ret); - } - -+ ret = ath11k_mac_ap_ps_recalc(ar); -+ if (ret) -+ ath11k_warn(ar->ab, "failed to set ap ps ret %d\n", ret); -+ - mutex_unlock(&ar->conf_mutex); - - return 0; -@@ -7227,6 +7267,7 @@ err_vdev_del: - - /* Recalc txpower for remaining vdev */ - ath11k_mac_txpower_recalc(ar); -+ ath11k_mac_ap_ps_recalc(ar); - - ath11k_debugfs_remove_interface(arvif); - ---- a/drivers/net/wireless/ath/ath11k/mac.h -+++ b/drivers/net/wireless/ath/ath11k/mac.h -@@ -135,6 +135,7 @@ void ath11k_mac_11d_scan_start(struct at - void ath11k_mac_11d_scan_stop(struct ath11k *ar); - void ath11k_mac_11d_scan_stop_all(struct ath11k_base *ab); - -+int ath11k_mac_ap_ps_recalc(struct ath11k *ar); - void ath11k_mac_destroy(struct ath11k_base *ab); - void ath11k_mac_unregister(struct ath11k_base *ab); - int ath11k_mac_register(struct ath11k_base *ab); ---- a/drivers/net/wireless/ath/ath11k/vendor.c -+++ b/drivers/net/wireless/ath/ath11k/vendor.c -@@ -6,7 +6,6 @@ - #include - #include - #include "core.h" --#include "vendor.h" - #include "debug.h" - - static const struct nla_policy -@@ -21,6 +20,11 @@ ath11k_vendor_wlan_prio_policy[QCA_WLAN_ - [QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_WEIGHT] = { .type = NLA_U8 }, - }; - -+static const struct nla_policy -+ath11k_vendor_set_wifi_config_policy[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1] = { -+ [QCA_WLAN_VENDOR_ATTR_CONFIG_GTX] = {.type = NLA_FLAG} -+}; -+ - static int ath11k_vendor_btcoex_configure(struct wiphy *wiphy, - struct wireless_dev *wdev, - const void *data, -@@ -101,6 +105,51 @@ out: - return ret; - } - -+static int ath11k_vendor_set_wifi_config(struct wiphy *wihpy, -+ struct wireless_dev *wdev, -+ const void *data, -+ int data_len) -+{ -+ struct ieee80211_vif *vif; -+ struct ath11k_vif *arvif; -+ struct ath11k *ar; -+ struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_CONFIG_MAX + 1]; -+ int ret = 0; -+ -+ if (!wdev) -+ return -EINVAL; -+ -+ vif = wdev_to_ieee80211_vif(wdev); -+ if (!vif) -+ return -EINVAL; -+ -+ arvif = (struct ath11k_vif*)vif->drv_priv; -+ if (!arvif) -+ return -EINVAL; -+ -+ ar = arvif->ar; -+ -+ mutex_lock(&ar->conf_mutex); -+ -+ ret = nla_parse(tb, QCA_WLAN_VENDOR_ATTR_CONFIG_MAX, data, data_len, -+ ath11k_vendor_set_wifi_config_policy, NULL); -+ if (ret) { -+ ath11k_warn(ar->ab, "invalid set wifi config policy attribute\n"); -+ goto exit; -+ } -+ -+ ar->ap_ps_enabled = nla_get_flag(tb[QCA_WLAN_VENDOR_ATTR_CONFIG_GTX]); -+ ret = ath11k_mac_ap_ps_recalc(ar); -+ if (ret) { -+ ath11k_warn(ar->ab, "failed to send ap ps ret %d\n", ret); -+ goto exit; -+ } -+ -+exit: -+ mutex_unlock(&ar->conf_mutex); -+ return ret; -+} -+ - static struct wiphy_vendor_command ath11k_vendor_commands[] = { - { - .info.vendor_id = QCA_NL80211_VENDOR_ID, -@@ -108,8 +157,18 @@ static struct wiphy_vendor_command ath11 - .flags = WIPHY_VENDOR_CMD_NEED_WDEV | - WIPHY_VENDOR_CMD_NEED_RUNNING, - .doit = ath11k_vendor_btcoex_configure, -- .policy = ath11k_vendor_btcoex_config_policy -- } -+ .policy = ath11k_vendor_btcoex_config_policy, -+ .maxattr = QCA_WLAN_VENDOR_ATTR_BTCOEX_CONFIG_MAX -+ }, -+ { -+ .info.vendor_id = QCA_NL80211_VENDOR_ID, -+ .info.subcmd = QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION, -+ .flags = WIPHY_VENDOR_CMD_NEED_WDEV | -+ WIPHY_VENDOR_CMD_NEED_RUNNING, -+ .doit = ath11k_vendor_set_wifi_config, -+ .policy = ath11k_vendor_set_wifi_config_policy, -+ .maxattr = QCA_WLAN_VENDOR_ATTR_CONFIG_MAX -+ }, - }; - - int ath11k_vendor_register(struct ath11k *ar) ---- a/drivers/net/wireless/ath/ath11k/vendor.h -+++ b/drivers/net/wireless/ath/ath11k/vendor.h -@@ -9,6 +9,9 @@ - #define QCA_NL80211_VENDOR_ID 0x001374 - - enum qca_nl80211_vendor_subcmds { -+ /* Wi-Fi configuration subcommand */ -+ QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION = 74, -+ - /* QCA_NL80211_VENDOR_SUBCMD_BTCOEX_CONFIG: This command is used to - * enable/disable BTCOEX and set priority for different type of WLAN - * traffic over BT low priority traffic. This uses attributes in -@@ -58,7 +61,17 @@ enum qca_wlan_vendor_attr_wlan_prio { - QCA_WLAN_VENDOR_ATTR_WLAN_PRIO_LAST - 1, - }; - -+/* Attributes for data used by -+ * QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION -+ */ -+enum qca_wlan_vendor_attr_config { -+ QCA_WLAN_VENDOR_ATTR_CONFIG_GTX = 57, - -+ /* keep last */ -+ QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST, -+ QCA_WLAN_VENDOR_ATTR_CONFIG_MAX = -+ QCA_WLAN_VENDOR_ATTR_CONFIG_AFTER_LAST - 1, -+}; - - /** - * enum qca_wlan_vendor_attr_btcoex_config - Used by the vendor command ---- a/drivers/net/wireless/ath/ath11k/wmi.c -+++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -1446,6 +1446,38 @@ ath11k_wmi_rx_reord_queue_remove(struct - return ret; - } - -+int ath11k_wmi_pdev_ap_ps_cmd_send(struct ath11k *ar, u8 pdev_id, -+ u32 param_value) -+{ -+ struct ath11k_pdev_wmi *wmi = ar->wmi; -+ struct wmi_pdev_ap_ps_cmd *cmd; -+ struct sk_buff *skb; -+ int ret; -+ -+ skb = ath11k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); -+ if (!skb) -+ return -ENOMEM; -+ -+ cmd = (struct wmi_pdev_ap_ps_cmd *)skb->data; -+ cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, -+ WMI_TAG_PDEV_GREEN_AP_PS_ENABLE_CMD) | -+ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); -+ cmd->pdev_id = pdev_id; -+ cmd->param_value = param_value; -+ -+ ret = ath11k_wmi_cmd_send(wmi, skb, WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID); -+ if (ret) { -+ ath11k_warn(ar->ab, "failed to send ap ps enable/disable cmd\n"); -+ dev_kfree_skb(skb); -+ } -+ -+ ath11k_dbg(ar->ab, ATH11K_DBG_WMI, -+ "wmi pdev ap ps set pdev id %d value %d\n", -+ pdev_id, param_value); -+ -+ return ret; -+} -+ - int ath11k_wmi_pdev_set_param(struct ath11k *ar, u32 param_id, - u32 param_value, u8 pdev_id) - { ---- a/drivers/net/wireless/ath/ath11k/wmi.h -+++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -3110,6 +3110,12 @@ struct set_fwtest_params { - u32 value; - }; - -+struct wmi_pdev_ap_ps_cmd { -+ u32 tlv_header; -+ u32 pdev_id; -+ u32 param_value; -+} __packed; -+ - struct wmi_fwtest_set_param_cmd_param { - u32 tlv_header; - u32 param_id; -@@ -6628,6 +6634,7 @@ int ath11k_wmi_pdev_non_srg_obss_bssid_e - u32 *bitmap); - int ath11k_send_coex_config_cmd(struct ath11k *ar, - struct coex_config_arg *coex_config); -+int ath11k_wmi_pdev_ap_ps_cmd_send(struct ath11k *ar, u8 pdev_id, u32 value); - int ath11k_wmi_send_obss_color_collision_cfg_cmd(struct ath11k *ar, u32 vdev_id, - u8 bss_color, u32 period, - bool enable); diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch b/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch deleted file mode 100644 index 86812a1830d817..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/904-300-ath11k-nss_get_arvif_from_dev.patch +++ /dev/null @@ -1,113 +0,0 @@ -From fbe5a76d8c9ff1cf3f906a3c863928fc1adcbc95 Mon Sep 17 00:00:00 2001 -From: Karthikeyan Kathirvel -Date: Tue, 16 Feb 2021 13:44:39 +0530 -Subject: [PATCH] ath11k: Add mesh nss offload support - -- New capability advertising nss offload support for mesh type -- Mesh obj vap and link vap registration/clean up -- Command/event handling -- New .ch files in ath11k for nss mesh offload related debugs -- Tx/Rx data path on mesh link vap uses native wifi format -- Mesh obj vap handls packets in ether format. No Tx on Mesh - obj vap is expected as packets transmitted in slow path is - supposed to be encapsulated in 802.11 format. -- New mac80211-driver callbacks for mesh vap, mpath and mpp - configurations. - -Signed-off-by: Vasanthakumar Thiagarajan - -Change-Id: Ib6950344286ba18fab43586262c62dcd09557614 -Co-developed-by: Karthikeyan Kathirvel -Signed-off-by: Karthikeyan Kathirvel -Signed-off-by: Vasanthakumar Thiagarajan ---- - drivers/net/wireless/ath/ath11k/nss.c | 1482 ++++++++++++++++++++++++--- - ---- a/drivers/net/wireless/ath/ath11k/nss.c -+++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -35,6 +35,30 @@ ath11k_nss_get_vdev_opmode(struct ath11k - return ATH11K_NSS_OPMODE_UNKNOWN; - } - -+static struct ath11k_vif *ath11k_nss_get_arvif_from_dev(struct net_device *dev) -+{ -+ struct wireless_dev *wdev; -+ struct ieee80211_vif *vif; -+ struct ath11k_vif *arvif; -+ -+ if (!dev) -+ return NULL; -+ -+ wdev = dev->ieee80211_ptr; -+ if (!wdev) -+ return NULL; -+ -+ vif = wdev_to_ieee80211_vif(wdev); -+ if (!vif) -+ return NULL; -+ -+ arvif = (struct ath11k_vif *)vif->drv_priv; -+ if (!arvif) -+ return NULL; -+ -+ return arvif; -+} -+ - static void ath11k_nss_wifili_stats_sync(struct ath11k_base *ab, - struct nss_wifili_stats_sync_msg *wlsoc_stats) - { -@@ -294,6 +318,9 @@ void ath11k_nss_wifili_event_receive(str - - switch (msg_type) { - case NSS_WIFILI_INIT_MSG: -+ ab->nss.response = response; -+ complete(&ab->nss.complete); -+ break; - case NSS_WIFILI_PDEV_INIT_MSG: - case NSS_WIFILI_START_MSG: - case NSS_WIFILI_SOC_RESET_MSG: -@@ -302,7 +329,6 @@ void ath11k_nss_wifili_event_receive(str - ab->nss.response = response; - complete(&ab->nss.complete); - break; -- - case NSS_WIFILI_PEER_CREATE_MSG: - if (response != NSS_CMN_RESPONSE_EMSG) - break; -@@ -463,7 +489,9 @@ ath11k_nss_wifili_ext_callback_fn(struct - ath11k_nss_process_mic_error(ab, skb); - break; - default: -- kfree(skb); -+ ath11k_dbg(ab, ATH11K_DBG_NSS, "unknown packet type received in wifili ext cb %d", -+ wepm->pkt_type); -+ dev_kfree_skb_any(skb); - break; - } - } -@@ -785,24 +813,7 @@ ath11k_nss_vdev_special_data_receive(str - int data_offs = 0; - int ret = 0; - -- if (!dev) { -- dev_kfree_skb_any(skb); -- return; -- } -- -- wdev = dev->ieee80211_ptr; -- if (!wdev) { -- dev_kfree_skb_any(skb); -- return; -- } -- -- vif = wdev_to_ieee80211_vif(wdev); -- if (!vif) { -- dev_kfree_skb_any(skb); -- return; -- } -- -- arvif = (struct ath11k_vif *)vif->drv_priv; -+ arvif = ath11k_nss_get_arvif_from_dev(dev); - if (!arvif) { - dev_kfree_skb_any(skb); - return; diff --git a/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch b/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch deleted file mode 100644 index 734b6fb8c4b160..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/905-ath11k-add-support-memory-stats.patch +++ /dev/null @@ -1,946 +0,0 @@ -From 9c99e124a279391dbe2cef66226fd4e86bde8f4d Mon Sep 17 00:00:00 2001 -From: Maharaja Kennadyrajan -Date: Mon, 4 Jan 2021 23:46:53 +0530 -Subject: [PATCH 1/2] ath11k/mac80211: Add support to account memory stats - -Memory allocations in the driver & mac80211 are logged -and populate those values to the user space via debugfs. -This stats will give the snapshot of the memory being -used by the driver at the time of dumping these -memory stats. - -Command: -cat /sys/kernel/debug/ath11k/ipq8074\ hw2.0/memory_stats - -Sample output of the stats -MEMORY STATS IN BYTES: -malloc size : 6287583 -ce_ring_alloc size: 109308 -dma_alloc size:: 10831860 -htc_skb_alloc size: 3840 -wmi alloc size: 0 -per peer object: 4644 -rx_post_buf size: 5091840 -Total size: 22329075 - -User can disable/enable the memory stats accounting with -the below command. - -echo N > /sys/kernel/debug/ath11k/ipq8074\ hw2.0/enable_memory_stats -where N = 0 to disable logging, 1 to enable the logging. - -Note: This should be enabled/disabled only after wifi is down. -User shouldn't enable/disable when the wifi is up to avoid -accounting the negative values which cause incorrect values -in the memory stats. - -Command: - -cat /sys/kernel/debug/ieee80211/phyX/memory_stats -memory stats: malloc_size: 108 - -Signed-off-by: Maharaja Kennadyrajan ---- - drivers/net/wireless/ath/ath11k/ce.c | 24 ++++ - drivers/net/wireless/ath/ath11k/core.c | 2 +- - drivers/net/wireless/ath/ath11k/core.h | 19 +++ - drivers/net/wireless/ath/ath11k/dbring.c | 3 + - drivers/net/wireless/ath/ath11k/debugfs.c | 115 ++++++++++++++++++ - drivers/net/wireless/ath/ath11k/debugfs.h | 29 +++++ - drivers/net/wireless/ath/ath11k/debugfs_sta.c | 4 + - drivers/net/wireless/ath/ath11k/dp.c | 13 ++ - drivers/net/wireless/ath/ath11k/hal.c | 6 + - drivers/net/wireless/ath/ath11k/htc.c | 5 + - drivers/net/wireless/ath/ath11k/mac.c | 15 ++- - drivers/net/wireless/ath/ath11k/nss.c | 46 +++++++ - drivers/net/wireless/ath/ath11k/peer.c | 5 + - drivers/net/wireless/ath/ath11k/wmi.c | 4 + - 15 files changed, 302 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/ce.c -+++ b/drivers/net/wireless/ath/ath11k/ce.c -@@ -359,6 +359,9 @@ static int ath11k_ce_rx_post_pipe(struct - dev_kfree_skb_any(skb); - goto exit; - } -+ -+ ATH11K_MEMORY_STATS_INC(ab, ce_rx_pipe, skb->truesize); -+ - } - - exit: -@@ -427,6 +430,9 @@ static void ath11k_ce_recv_process_cb(st - __skb_queue_head_init(&list); - while (ath11k_ce_completed_recv_next(pipe, &skb, &nbytes) == 0) { - max_nbytes = skb->len + skb_tailroom(skb); -+ -+ ATH11K_MEMORY_STATS_DEC(ab, ce_rx_pipe, skb->truesize); -+ - dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, - max_nbytes, DMA_FROM_DEVICE); - -@@ -620,6 +626,9 @@ ath11k_ce_alloc_ring(struct ath11k_base - if (ce_ring == NULL) - return ERR_PTR(-ENOMEM); - -+ ATH11K_MEMORY_STATS_INC(ab, ce_ring_alloc, -+ struct_size(ce_ring, skb, nentries)); -+ - ce_ring->nentries = nentries; - ce_ring->nentries_mask = nentries - 1; - -@@ -635,6 +644,9 @@ ath11k_ce_alloc_ring(struct ath11k_base - return ERR_PTR(-ENOMEM); - } - -+ ATH11K_MEMORY_STATS_INC(ab, ce_ring_alloc, -+ nentries * desc_sz + CE_DESC_RING_ALIGN); -+ - ce_ring->base_addr_ce_space_unaligned = base_addr; - - ce_ring->base_addr_owner_space = PTR_ALIGN( -@@ -814,6 +826,9 @@ static void ath11k_ce_rx_pipe_cleanup(st - continue; - - ring->skb[i] = NULL; -+ -+ ATH11K_MEMORY_STATS_DEC(ab, ce_rx_pipe, skb->truesize); -+ - dma_unmap_single(ab->dev, ATH11K_SKB_RXCB(skb)->paddr, - skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); - dev_kfree_skb_any(skb); -@@ -992,6 +1007,9 @@ void ath11k_ce_free_pipes(struct ath11k_ - CE_DESC_RING_ALIGN, - ce_ring->base_addr_owner_space_unaligned, - ce_ring->base_addr_ce_space_unaligned); -+ ATH11K_MEMORY_STATS_DEC(ab, ce_ring_alloc, -+ pipe->src_ring->nentries * desc_sz + -+ CE_DESC_RING_ALIGN); - kfree(pipe->src_ring); - pipe->src_ring = NULL; - } -@@ -1004,6 +1022,9 @@ void ath11k_ce_free_pipes(struct ath11k_ - CE_DESC_RING_ALIGN, - ce_ring->base_addr_owner_space_unaligned, - ce_ring->base_addr_ce_space_unaligned); -+ ATH11K_MEMORY_STATS_DEC(ab, ce_ring_alloc, -+ pipe->dest_ring->nentries * desc_sz + -+ CE_DESC_RING_ALIGN); - kfree(pipe->dest_ring); - pipe->dest_ring = NULL; - } -@@ -1017,6 +1038,9 @@ void ath11k_ce_free_pipes(struct ath11k_ - CE_DESC_RING_ALIGN, - ce_ring->base_addr_owner_space_unaligned, - ce_ring->base_addr_ce_space_unaligned); -+ ATH11K_MEMORY_STATS_DEC(ab, ce_ring_alloc, -+ pipe->status_ring->nentries * desc_sz + -+ CE_DESC_RING_ALIGN); - kfree(pipe->status_ring); - pipe->status_ring = NULL; - } ---- a/drivers/net/wireless/ath/ath11k/core.c -+++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -2144,6 +2144,8 @@ int ath11k_core_pre_init(struct ath11k_b - if (nss_offload) - ab->nss.stats_enabled = 1; - -+ ab->enable_memory_stats = ATH11K_DEBUG_ENABLE_MEMORY_STATS; -+ - return 0; - } - EXPORT_SYMBOL(ath11k_core_pre_init); ---- a/drivers/net/wireless/ath/ath11k/core.h -+++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -930,6 +930,23 @@ struct ath11k_num_vdevs_peers { - u32 num_peers; - }; - -+struct ath11k_memory_stats { -+ /* Account kzalloc and valloc */ -+ atomic_t malloc_size; -+ /* Account dma_alloc in dp.c & hal.c */ -+ atomic_t dma_alloc; -+ /* Account memory used in ce rings */ -+ atomic_t ce_ring_alloc; -+ /* Account memory used in htc_send */ -+ atomic_t htc_skb_alloc; -+ /* Account memory used in wmi tx skb alloc */ -+ atomic_t wmi_tx_skb_alloc; -+ /* Account memory consumed for peer object */ -+ atomic_t per_peer_object; -+ /* Account memory used in ce rx pipe */ -+ atomic_t ce_rx_pipe; -+}; -+ - /* Master structure to hold the hw data which may be used in core module */ - struct ath11k_base { - enum ath11k_hw_rev hw_rev; -@@ -1019,6 +1036,7 @@ struct ath11k_base { - enum ath11k_dfs_region dfs_region; - #ifdef CPTCFG_ATH11K_DEBUGFS - struct dentry *debugfs_soc; -+ struct ath11k_memory_stats memory_stats; - #endif - struct ath11k_soc_dp_stats soc_stats; - -@@ -1085,6 +1103,7 @@ struct ath11k_base { - - atomic_t num_max_allowed; - struct ath11k_num_vdevs_peers *num_vdevs_peers; -+ bool enable_memory_stats; - - u32 rx_hash; - bool stats_disable; ---- a/drivers/net/wireless/ath/ath11k/dbring.c -+++ b/drivers/net/wireless/ath/ath11k/dbring.c -@@ -143,6 +143,7 @@ static int ath11k_dbring_fill_bufs(struc - break; - } - num_remain--; -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, size); - } - - spin_unlock_bh(&srng->lock); -@@ -392,6 +393,8 @@ void ath11k_dbring_buf_cleanup(struct at - idr_remove(&ring->bufs_idr, buf_id); - dma_unmap_single(ar->ab->dev, buff->paddr, - ring->buf_sz, DMA_FROM_DEVICE); -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(*buff) + -+ ring->buf_sz + ring->buf_align - 1); - kfree(buff->payload); - kfree(buff); - } ---- a/drivers/net/wireless/ath/ath11k/debugfs.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -801,6 +801,8 @@ static ssize_t ath11k_debugfs_dump_soc_d - if (!buf) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, size); -+ - len += scnprintf(buf + len, size - len, "SOC RX STATS:\n\n"); - len += scnprintf(buf + len, size - len, "err ring pkts: %u\n", - soc_stats->err_ring_pkts); -@@ -842,6 +844,8 @@ static ssize_t ath11k_debugfs_dump_soc_d - retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); - kfree(buf); - -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, size); -+ - return retval; - } - -@@ -1094,6 +1098,106 @@ static const struct file_operations fops - .write = ath11k_write_stats_disable, - }; - -+static ssize_t -+ath11k_debug_read_enable_memory_stats(struct file *file, -+ char __user *user_buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ath11k_base *ab = file->private_data; -+ char buf[10]; -+ size_t len; -+ -+ len = scnprintf(buf, sizeof(buf), "%d\n", ab->enable_memory_stats); -+ -+ return simple_read_from_buffer(user_buf, count, ppos, buf, len); -+} -+ -+static ssize_t -+ath11k_debug_write_enable_memory_stats(struct file *file, -+ const char __user *ubuf, -+ size_t count, loff_t *ppos) -+{ -+ struct ath11k_base *ab = file->private_data; -+ bool enable; -+ int ret; -+ -+ if (kstrtobool_from_user(ubuf, count, &enable)) -+ return -EINVAL; -+ -+ if (enable == ab->enable_memory_stats) { -+ ret = count; -+ goto exit; -+ } -+ -+ ab->enable_memory_stats = enable; -+ ret = count; -+exit: -+ return ret; -+} -+ -+static const struct file_operations fops_enable_memory_stats = { -+ .read = ath11k_debug_read_enable_memory_stats, -+ .write = ath11k_debug_write_enable_memory_stats, -+ .owner = THIS_MODULE, -+ .llseek = default_llseek, -+ .open = simple_open, -+}; -+ -+static ssize_t ath11k_debug_dump_memory_stats(struct file *file, -+ char __user *user_buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ath11k_base *ab = file->private_data; -+ struct ath11k_memory_stats *memory_stats = &ab->memory_stats; -+ int len = 0, retval; -+ const int size = 4096; -+ -+ char *buf; -+ -+ buf = kzalloc(size, GFP_KERNEL); -+ if (!buf) -+ return -ENOMEM; -+ -+ len += scnprintf(buf + len, size - len, "MEMORY STATS IN BYTES:\n"); -+ len += scnprintf(buf + len, size - len, "malloc size : %u\n", -+ atomic_read(&memory_stats->malloc_size)); -+ len += scnprintf(buf + len, size - len, "ce_ring_alloc size: %u\n", -+ atomic_read(&memory_stats->ce_ring_alloc)); -+ len += scnprintf(buf + len, size - len, "dma_alloc size:: %u\n", -+ atomic_read(&memory_stats->dma_alloc)); -+ len += scnprintf(buf + len, size - len, "htc_skb_alloc size: %u\n", -+ atomic_read(&memory_stats->htc_skb_alloc)); -+ len += scnprintf(buf + len, size - len, "wmi tx skb alloc size: %u\n", -+ atomic_read(&memory_stats->wmi_tx_skb_alloc)); -+ len += scnprintf(buf + len, size - len, "per peer object: %u\n", -+ atomic_read(&memory_stats->per_peer_object)); -+ len += scnprintf(buf + len, size - len, "rx_post_buf size: %u\n", -+ atomic_read(&memory_stats->ce_rx_pipe)); -+ len += scnprintf(buf + len, size - len, "Total size: %u\n\n", -+ (atomic_read(&memory_stats->malloc_size) + -+ atomic_read(&memory_stats->ce_ring_alloc) + -+ atomic_read(&memory_stats->dma_alloc) + -+ atomic_read(&memory_stats->htc_skb_alloc) + -+ atomic_read(&memory_stats->wmi_tx_skb_alloc) + -+ atomic_read(&memory_stats->per_peer_object) + -+ atomic_read(&memory_stats->ce_rx_pipe))); -+ -+ if (len > size) -+ len = size; -+ -+ retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); -+ kfree(buf); -+ -+ return retval; -+} -+ -+static const struct file_operations fops_memory_stats = { -+ .read = ath11k_debug_dump_memory_stats, -+ .open = simple_open, -+ .owner = THIS_MODULE, -+ .llseek = default_llseek, -+}; -+ - int ath11k_debugfs_pdev_create(struct ath11k_base *ab) - { - if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) -@@ -1112,6 +1216,12 @@ int ath11k_debugfs_pdev_create(struct at - debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, - &fops_soc_rx_hash); - -+ debugfs_create_file("enable_memory_stats", 0600, ab->debugfs_soc, -+ ab, &fops_enable_memory_stats); -+ -+ debugfs_create_file("memory_stats", 0600, ab->debugfs_soc, ab, -+ &fops_memory_stats); -+ - - return 0; - } -@@ -1742,6 +1852,8 @@ static ssize_t ath11k_dump_mgmt_stats(st - if (!buf) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, size); -+ - mutex_lock(&ar->conf_mutex); - spin_lock_bh(&ar->data_lock); - -@@ -1792,6 +1904,9 @@ static ssize_t ath11k_dump_mgmt_stats(st - ret = simple_read_from_buffer(ubuf, count, ppos, buf, len); - mutex_unlock(&ar->conf_mutex); - kfree(buf); -+ -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, size); -+ - return ret; - } - ---- a/drivers/net/wireless/ath/ath11k/debugfs.h -+++ b/drivers/net/wireless/ath/ath11k/debugfs.h -@@ -10,6 +10,7 @@ - - #define ATH11K_TX_POWER_MAX_VAL 70 - #define ATH11K_TX_POWER_MIN_VAL 0 -+#define ATH11K_DEBUG_ENABLE_MEMORY_STATS 1 - - /* htt_dbg_ext_stats_type */ - enum ath11k_dbg_htt_ext_stats_type { -@@ -263,6 +264,24 @@ struct ath11k_fw_dbglog { - }; - - #ifdef CPTCFG_ATH11K_DEBUGFS -+#define ATH11K_MEMORY_STATS_INC(_struct, _field, _size) \ -+do { \ -+ if (ath11k_debug_is_memory_stats_enabled(_struct)) \ -+ atomic_add(_size, &_struct->memory_stats._field); \ -+} while(0) -+ -+#define ATH11K_MEMORY_STATS_DEC(_struct, _field, _size) \ -+do { \ -+ if (ath11k_debug_is_memory_stats_enabled(_struct)) \ -+ atomic_sub(_size, &_struct->memory_stats._field); \ -+} while(0) -+ -+#else -+#define ATH11K_MEMORY_STATS_INC(_struct, _field, _size) -+#define ATH11K_MEMORY_STATS_DEC(_struct, _field, _size) -+#endif -+ -+#ifdef CPTCFG_ATH11K_DEBUGFS - int ath11k_debugfs_soc_create(struct ath11k_base *ab); - void ath11k_debugfs_soc_destroy(struct ath11k_base *ab); - int ath11k_debugfs_pdev_create(struct ath11k_base *ab); -@@ -313,6 +332,11 @@ void ath11k_debugfs_add_dbring_entry(str - enum ath11k_dbg_dbr_event event, - struct hal_srng *srng); - -+static inline int ath11k_debug_is_memory_stats_enabled(struct ath11k_base *ab) -+{ -+ return ab->enable_memory_stats; -+} -+ - #else - static inline int ath11k_debugfs_soc_create(struct ath11k_base *ab) - { -@@ -375,6 +399,11 @@ static inline bool ath11k_debugfs_is_pkt - return false; - } - -+static inline int ath11k_debug_is_memory_stats_enabled(struct ath11k_base *ab) -+{ -+ return 0; -+} -+ - static inline int ath11k_debugfs_rx_filter(struct ath11k *ar) - { - return 0; ---- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c -@@ -468,6 +468,8 @@ static ssize_t ath11k_dbg_sta_dump_rx_st - retval = simple_read_from_buffer(user_buf, count, ppos, buf, len); - kfree(buf); - -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, size); -+ - mutex_unlock(&ar->conf_mutex); - return retval; - } ---- a/drivers/net/wireless/ath/ath11k/dp.c -+++ b/drivers/net/wireless/ath/ath11k/dp.c -@@ -115,6 +115,8 @@ void ath11k_dp_srng_cleanup(struct ath11 - dma_free_coherent(ab->dev, ring->size, ring->vaddr_unaligned, - ring->paddr_unaligned); - -+ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, ring->size); -+ - ring->vaddr_unaligned = NULL; - } - -@@ -278,6 +280,8 @@ int ath11k_dp_srng_setup(struct ath11k_b - if (!ring->vaddr_unaligned) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, ring->size); -+ - ring->vaddr = PTR_ALIGN(ring->vaddr_unaligned, HAL_RING_BASE_ALIGN); - ring->paddr = ring->paddr_unaligned + ((unsigned long)ring->vaddr - - (unsigned long)ring->vaddr_unaligned); -@@ -514,6 +518,7 @@ static void ath11k_dp_scatter_idle_link_ - dma_free_coherent(ab->dev, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX, - slist[i].vaddr, slist[i].paddr); - slist[i].vaddr = NULL; -+ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX); - } - } - -@@ -551,6 +556,7 @@ static int ath11k_dp_scatter_idle_link_d - ret = -ENOMEM; - goto err; - } -+ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX); - } - - scatter_idx = 0; -@@ -605,6 +611,7 @@ ath11k_dp_link_desc_bank_free(struct ath - link_desc_banks[i].vaddr_unaligned, - link_desc_banks[i].paddr_unaligned); - link_desc_banks[i].vaddr_unaligned = NULL; -+ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, link_desc_banks[i].size); - } - } - } -@@ -638,6 +645,7 @@ static int ath11k_dp_link_desc_bank_allo - ((unsigned long)desc_bank[i].vaddr - - (unsigned long)desc_bank[i].vaddr_unaligned); - desc_bank[i].size = desc_sz; -+ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, desc_bank[i].size); - } - - return 0; -@@ -1042,8 +1050,11 @@ static int ath11k_dp_tx_pending_cleanup( - void ath11k_dp_free(struct ath11k_base *ab) - { - struct ath11k_dp *dp = &ab->dp; -+ size_t size = 0; - int i; - -+ size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE; -+ - ath11k_dp_link_desc_cleanup(ab, dp->link_desc_banks, - HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); - -@@ -1057,6 +1068,7 @@ void ath11k_dp_free(struct ath11k_base * - ath11k_dp_tx_pending_cleanup, ab); - idr_destroy(&dp->tx_ring[i].txbuf_idr); - spin_unlock_bh(&dp->tx_ring[i].tx_idr_lock); -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, size); - kfree(dp->tx_ring[i].tx_status); - } - -@@ -1114,6 +1126,7 @@ int ath11k_dp_alloc(struct ath11k_base * - ret = -ENOMEM; - goto fail_cmn_srng_cleanup; - } -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, size); - } - - for (i = 0; i < HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX; i++) ---- a/drivers/net/wireless/ath/ath11k/hal.c -+++ b/drivers/net/wireless/ath/ath11k/hal.c -@@ -201,6 +201,8 @@ static int ath11k_hal_alloc_cont_rdp(str - if (!hal->rdp.vaddr) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, size); -+ - return 0; - } - -@@ -215,6 +217,7 @@ static void ath11k_hal_free_cont_rdp(str - size = sizeof(u32) * HAL_SRNG_RING_ID_MAX; - dma_free_coherent(ab->dev, size, - hal->rdp.vaddr, hal->rdp.paddr); -+ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, size); - hal->rdp.vaddr = NULL; - } - -@@ -229,6 +232,8 @@ static int ath11k_hal_alloc_cont_wrp(str - if (!hal->wrp.vaddr) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, size); -+ - return 0; - } - -@@ -243,6 +248,7 @@ static void ath11k_hal_free_cont_wrp(str - size = sizeof(u32) * HAL_SRNG_NUM_LMAC_RINGS; - dma_free_coherent(ab->dev, size, - hal->wrp.vaddr, hal->wrp.paddr); -+ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, size); - hal->wrp.vaddr = NULL; - } - ---- a/drivers/net/wireless/ath/ath11k/htc.c -+++ b/drivers/net/wireless/ath/ath11k/htc.c -@@ -28,6 +28,7 @@ struct sk_buff *ath11k_htc_alloc_skb(str - static void ath11k_htc_control_tx_complete(struct ath11k_base *ab, - struct sk_buff *skb) - { -+ ATH11K_MEMORY_STATS_DEC(ab, htc_skb_alloc, skb->truesize); - kfree_skb(skb); - } - -@@ -609,6 +610,7 @@ int ath11k_htc_connect_service(struct at - bool disable_credit_flow_ctrl = false; - u16 message_id, service_id, flags = 0; - u8 tx_alloc = 0; -+ size_t truesize; - - /* special case for HTC pseudo control service */ - if (conn_req->service_id == ATH11K_HTC_SVC_ID_RSVD_CTRL) { -@@ -632,6 +634,7 @@ int ath11k_htc_connect_service(struct at - return -ENOMEM; - } - -+ truesize = skb->truesize; - length = sizeof(*req_msg); - skb_put(skb, length); - memset(skb->data, 0, length); -@@ -667,6 +670,8 @@ int ath11k_htc_connect_service(struct at - return status; - } - -+ ATH11K_MEMORY_STATS_INC(ab, htc_skb_alloc, truesize); -+ - /* wait for response */ - time_left = wait_for_completion_timeout(&htc->ctl_resp, - ATH11K_HTC_CONN_SVC_TIMEOUT_HZ); -@@ -768,11 +773,13 @@ int ath11k_htc_start(struct ath11k_htc * - int status = 0; - struct ath11k_base *ab = htc->ab; - struct ath11k_htc_setup_complete_extended *msg; -+ size_t truesize; - - skb = ath11k_htc_build_tx_ctrl_skb(htc->ab); - if (!skb) - return -ENOMEM; - -+ truesize = skb->truesize; - skb_put(skb, sizeof(*msg)); - memset(skb->data, 0, skb->len); - -@@ -791,6 +798,8 @@ int ath11k_htc_start(struct ath11k_htc * - return status; - } - -+ ATH11K_MEMORY_STATS_INC(ab, htc_skb_alloc, truesize); -+ - return 0; - } - ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4058,6 +4058,8 @@ static int ath11k_mac_op_hw_scan(struct - goto exit; - } - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, sizeof(*arg)); -+ - ath11k_wmi_start_scan_init(ar, arg); - arg->vdev_id = arvif->vdev_id; - arg->scan_id = ATH11K_SCAN_ID; -@@ -4071,6 +4073,8 @@ static int ath11k_mac_op_hw_scan(struct - arg->extraie.len = req->ie_len; - } - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, req->ie_len); -+ - if (req->n_ssids) { - arg->num_ssids = req->n_ssids; - for (i = 0; i < arg->num_ssids; i++) { -@@ -4157,9 +4161,16 @@ static int ath11k_mac_op_hw_scan(struct - exit: - if (arg) { - kfree(arg->chan_list); -- kfree(arg->extraie.ptr); -- kfree(arg); -- } -+ -+ if (arg->extraie.ptr) { -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, req->ie_len); -+ kfree(arg->extraie.ptr); -+ } -+ -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(*arg)); -+ -+ kfree(arg); -+ } - - mutex_unlock(&ar->conf_mutex); - -@@ -8113,6 +8124,8 @@ ath11k_mac_update_active_vif_chan(struct - if (!arg.vifs) - return; - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, sizeof(arg.vifs[0])); -+ - ieee80211_iterate_active_interfaces_atomic(ar->hw, - IEEE80211_IFACE_ITER_NORMAL, - ath11k_mac_change_chanctx_fill_iter, -@@ -8120,6 +8133,8 @@ ath11k_mac_update_active_vif_chan(struct - - ath11k_mac_update_vif_chan(ar, arg.vifs, arg.n_vifs); - -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(arg.vifs[0])); -+ - kfree(arg.vifs); - } - ---- a/drivers/net/wireless/ath/ath11k/nss.c -+++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -1052,6 +1052,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 - default: - return -EINVAL; - } -+ -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, sizeof(*vdev_msg)); -+ - /* TODO: Convert to function for conversion in case of many - * such commands - */ -@@ -1082,6 +1085,7 @@ int ath11k_nss_vdev_set_cmd(struct ath11 - ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev set cmd success cmd:%d val:%d\n", - cmd, val); - free: -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, sizeof(*vdev_msg)); - kfree(vdev_msg); - return status; - } -@@ -1098,6 +1102,9 @@ static int ath11k_nss_vdev_configure(str - if (!vdev_msg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, -+ sizeof(struct nss_wifi_vdev_msg)); -+ - vdev_cfg = &vdev_msg->msg.vdev_config; - - vdev_cfg->radio_ifnum = ar->nss.if_num; -@@ -1133,6 +1140,8 @@ static int ath11k_nss_vdev_configure(str - - ret = 0; - free: -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, -+ sizeof(struct nss_wifi_vdev_msg)); - kfree(vdev_msg); - - return ret; -@@ -1357,6 +1366,9 @@ int ath11k_nss_vdev_up(struct ath11k_vif - if (!vdev_msg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, -+ sizeof(struct nss_wifi_vdev_msg)); -+ - vdev_en = &vdev_msg->msg.vdev_enable; - - ether_addr_copy(vdev_en->mac_addr, arvif->vif->addr); -@@ -1381,6 +1393,8 @@ int ath11k_nss_vdev_up(struct ath11k_vif - if (ap_vlan_arvif->nss.added) - ath11k_nss_ext_vdev_up(ap_vlan_arvif); - free: -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, -+ sizeof(struct nss_wifi_vdev_msg)); - kfree(vdev_msg); - return ret; - } -@@ -1404,6 +1418,8 @@ int ath11k_nss_vdev_down(struct ath11k_v - if (!vdev_msg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, -+ sizeof(struct nss_wifi_vdev_msg)); - nss_wifi_vdev_msg_init(vdev_msg, arvif->nss.if_num, - NSS_WIFI_VDEV_INTERFACE_DOWN_MSG, - sizeof(struct nss_wifi_vdev_disable_msg), -@@ -1423,6 +1439,8 @@ int ath11k_nss_vdev_down(struct ath11k_v - list) - ath11k_nss_ext_vdev_down(ap_vlan_arvif); - free: -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, -+ sizeof(struct nss_wifi_vdev_msg)); - kfree(vdev_msg); - return ret; - } -@@ -1875,6 +1893,9 @@ int ath11k_nss_set_peer_sec_type(struct - if (!wlmsg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ar->ab, malloc_size, -+ sizeof(struct nss_wifili_msg)); -+ - sec_msg = &wlmsg->msg.securitymsg; - sec_msg->peer_id = peer->peer_id; - -@@ -1906,6 +1927,8 @@ int ath11k_nss_set_peer_sec_type(struct - ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss peer id %d security cfg complete\n", - peer->peer_id); - free: -+ ATH11K_MEMORY_STATS_DEC(ar->ab, malloc_size, -+ sizeof(struct nss_wifili_msg)); - kfree(wlmsg); - return status; - } -@@ -2593,6 +2616,7 @@ static void ath11k_nss_tx_desc_mem_free( - ab->nss.tx_desc_vaddr[i], - ab->nss.tx_desc_paddr[i]); - ab->nss.tx_desc_vaddr[i] = NULL; -+ ATH11K_MEMORY_STATS_DEC(ab, dma_alloc, ab->nss.tx_desc_size[i]); - } - - ath11k_dbg(ab, ATH11K_DBG_NSS, "allocated tx desc mem freed\n"); -@@ -2624,6 +2648,8 @@ static int ath11k_nss_tx_desc_mem_alloc( - ab->nss.tx_desc_size[curr_page_idx] = alloc_size; - curr_page_idx++; - -+ ATH11K_MEMORY_STATS_INC(ab, dma_alloc, alloc_size); -+ - ath11k_dbg(ab, ATH11K_DBG_NSS, - "curr page %d, allocated %d, total allocated %d\n", - curr_page_idx, alloc_size, i + alloc_size); -@@ -2795,6 +2821,8 @@ static int ath11k_nss_init(struct ath11k - if (!wlmsg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - wim = &wlmsg->msg.init; - - wim->target_type = target_type; -@@ -2914,6 +2942,7 @@ unregister: - nss_unregister_wifili_if(ab->nss.if_num); - free: - ath11k_nss_tx_desc_mem_free(ab); -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); - kfree(wlmsg); - return -EINVAL; - } -@@ -3031,6 +3060,8 @@ int ath11k_nss_pdev_init(struct ath11k_b - goto unregister; - } - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - pdevmsg = &wlmsg->msg.pdevmsg; - - pdevmsg->radio_id = radio_id; -@@ -3077,6 +3108,8 @@ int ath11k_nss_pdev_init(struct ath11k_b - goto free; - } - -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - kfree(wlmsg); - - /* Disable nss sojourn stats by default */ -@@ -3095,6 +3128,7 @@ int ath11k_nss_pdev_init(struct ath11k_b - return 0; - - free: -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); - kfree(wlmsg); - unregister: - nss_unregister_wifili_radio_if(ar->nss.if_num); -@@ -3117,6 +3151,8 @@ int ath11k_nss_start(struct ath11k_base - if (!wlmsg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; - - /* Empty message for NSS Start message */ -@@ -3157,6 +3193,7 @@ int ath11k_nss_start(struct ath11k_base - ath11k_dbg(ab, ATH11K_DBG_NSS, "nss start success\n"); - - free: -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); - kfree(wlmsg); - return ret; - } -@@ -3175,6 +3212,8 @@ static void ath11k_nss_reset(struct ath1 - return; - } - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; - - /* Empty message for NSS Reset message */ -@@ -3213,6 +3252,7 @@ static void ath11k_nss_reset(struct ath1 - nss_unregister_wifili_if(ab->nss.if_num); - - free: -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); - kfree(wlmsg); - } - -@@ -3228,6 +3268,8 @@ static int ath11k_nss_stop(struct ath11k - if (!wlmsg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; - - /* Empty message for Stop command */ -@@ -3267,6 +3309,8 @@ static int ath11k_nss_stop(struct ath11k - /* NSS Stop success */ - ret = 0; - free: -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - kfree(wlmsg); - return ret; - } -@@ -3292,6 +3336,8 @@ int ath11k_nss_pdev_deinit(struct ath11k - if (!wlmsg) - return -ENOMEM; - -+ ATH11K_MEMORY_STATS_INC(ab, malloc_size, sizeof(struct nss_wifili_msg)); -+ - deinit = &wlmsg->msg.pdevdeinit; - deinit->ifnum = radio_id; - -@@ -3337,6 +3383,7 @@ int ath11k_nss_pdev_deinit(struct ath11k - nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); - nss_unregister_wifili_radio_if(ar->nss.if_num); - free: -+ ATH11K_MEMORY_STATS_DEC(ab, malloc_size, sizeof(struct nss_wifili_msg)); - kfree(wlmsg); - return ret; - } ---- a/drivers/net/wireless/ath/ath11k/peer.c -+++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -794,6 +794,9 @@ int ath11k_peer_delete(struct ath11k *ar - if (ret) - return ret; - -+ ATH11K_MEMORY_STATS_DEC(ar->ab, per_peer_object, -+ sizeof(struct ath11k_peer)); -+ - ar->num_peers--; - - return 0; -@@ -902,6 +905,8 @@ int ath11k_peer_create(struct ath11k *ar - arsta->tcl_metadata &= ~HTT_TCL_META_DATA_VALID_HTT; - } - -+ ATH11K_MEMORY_STATS_INC(ar->ab, per_peer_object, sizeof(*peer)); -+ - ar->num_peers++; - - spin_unlock_bh(&ar->ab->base_lock); ---- a/drivers/net/wireless/ath/ath11k/wmi.c -+++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -623,6 +623,8 @@ struct sk_buff *ath11k_wmi_alloc_skb(str - if (!skb) - return NULL; - -+ ATH11K_MEMORY_STATS_INC(ab, wmi_tx_skb_alloc, skb->truesize); -+ - skb_reserve(skb, WMI_SKB_HEADROOM); - if (!IS_ALIGNED((unsigned long)skb->data, 4)) - ath11k_warn(ab, "unaligned WMI skb data\n"); -@@ -7314,6 +7316,7 @@ static void ath11k_wmi_htc_tx_complete(s - u8 eid; - - eid = ATH11K_SKB_CB(skb)->eid; -+ ATH11K_MEMORY_STATS_DEC(ab, wmi_tx_skb_alloc, skb->truesize); - dev_kfree_skb(skb); - - if (eid >= ATH11K_HTC_EP_COUNT) -@@ -9107,6 +9110,7 @@ static void ath11k_wmi_tlv_op_rx(struct - } - - out: -+ ATH11K_MEMORY_STATS_DEC(ab, wmi_tx_skb_alloc, skb->truesize); - dev_kfree_skb(skb); - } - diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch b/package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch deleted file mode 100644 index c61c206c417de7..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/911-335-0006-ath11k-add-simple-tx-handler-for-AP-mode.patch +++ /dev/null @@ -1,185 +0,0 @@ -From 9600bc899bd28386375f5b5902a33f1984ce9da8 Mon Sep 17 00:00:00 2001 -From: Venkateswara Naralasetty -Date: Thu, 18 Nov 2021 13:11:02 +0530 -Subject: [PATCH] ath11k: add simple tx handler for AP mode - -Add simple tx handler for AP mode to skip cheks which are not -applicable for AP mode. - -Signed-off-by: Venkateswara Naralasetty ---- - drivers/net/wireless/ath/ath11k/dp_tx.c | 123 +++++++++++++++++++++++++++++ - drivers/net/wireless/ath/ath11k/dp_tx.h | 2 + - drivers/net/wireless/ath/ath11k/hal_desc.h | 6 ++ - drivers/net/wireless/ath/ath11k/mac.c | 3 + - 4 files changed, 134 insertions(+) - ---- a/drivers/net/wireless/ath/ath11k/dp_tx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -103,6 +103,128 @@ static int ath11k_dp_prepare_htt_metadat - return 0; - } - -+int ath11k_dp_tx_simple(struct ath11k *ar, struct ath11k_vif *arvif, -+ struct sk_buff *skb, struct ath11k_sta *arsta) -+{ -+ struct ath11k_base *ab = ar->ab; -+ struct ath11k_dp *dp = &ab->dp; -+ struct ath11k_skb_cb *skb_cb = ATH11K_SKB_CB(skb); -+ struct hal_srng *tcl_ring; -+ struct dp_tx_ring *tx_ring; -+ struct hal_tcl_data_cmd *tcl_desc; -+ void *hal_tcl_desc; -+ dma_addr_t paddr; -+ u8 pool_id; -+ u8 hal_ring_id; -+ int ret; -+ u32 idr; -+ u8 tcl_ring_id, ring_id, max_tx_ring; -+ u8 buf_id; -+ u32 desc_id; -+ u8 ring_selector; -+ -+ max_tx_ring = ab->hw_params.max_tx_ring; -+ -+ if (unlikely(atomic_read(&ab->num_max_allowed) > DP_TX_COMP_MAX_ALLOWED)) { -+ atomic_inc(&ab->soc_stats.tx_err.max_fail); -+ ret = -EINVAL; -+ } -+ -+ ring_selector = smp_processor_id(); -+ pool_id = ring_selector; -+ -+ if (max_tx_ring == 1) { -+ ring_id = 0; -+ tcl_ring_id = 0; -+ } else { -+ ring_id = ring_selector % max_tx_ring; -+ tcl_ring_id = (ring_id == DP_TCL_NUM_RING_MAX) ? -+ DP_TCL_NUM_RING_MAX - 1 : ring_id; -+ } -+ -+ buf_id = tcl_ring_id + HAL_RX_BUF_RBM_SW0_BM; -+ tx_ring = &dp->tx_ring[tcl_ring_id]; -+ -+ spin_lock_bh(&tx_ring->tx_idr_lock); -+ idr = find_first_zero_bit(tx_ring->idrs, DP_TX_IDR_SIZE); -+ if (unlikely(idr >= DP_TX_IDR_SIZE)) { -+ spin_unlock_bh(&tx_ring->tx_idr_lock); -+ return -ENOSPC; -+ } -+ -+ set_bit(idr, tx_ring->idrs); -+ tx_ring->idr_pool[idr].id = idr; -+ tx_ring->idr_pool[idr].buf = skb; -+ spin_unlock_bh(&tx_ring->tx_idr_lock); -+ -+ desc_id = FIELD_PREP(DP_TX_DESC_ID_MAC_ID, ar->pdev_idx) | -+ FIELD_PREP(DP_TX_DESC_ID_MSDU_ID, idr) | -+ FIELD_PREP(DP_TX_DESC_ID_POOL_ID, pool_id); -+ -+ skb_cb->vif = arvif->vif; -+ skb_cb->ar = ar; -+ -+ paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); -+ if (unlikely(dma_mapping_error(ab->dev, paddr))) { -+ atomic_inc(&ab->soc_stats.tx_err.misc_fail); -+ ath11k_warn(ab, "failed to DMA map data Tx buffer\n"); -+ ret = -ENOMEM; -+ goto fail_remove_idr; -+ } -+ -+ skb_cb->paddr = paddr; -+ -+ hal_ring_id = tx_ring->tcl_data_ring.ring_id; -+ tcl_ring = &ab->hal.srng_list[hal_ring_id]; -+ -+ spin_lock_bh(&tcl_ring->lock); -+ ath11k_hal_srng_access_begin(ab, tcl_ring); -+ -+ hal_tcl_desc = (void *)ath11k_hal_srng_src_get_next_entry(ab, tcl_ring); -+ if (unlikely(!hal_tcl_desc)) { -+ ath11k_hal_srng_access_end(ab, tcl_ring); -+ spin_unlock_bh(&tcl_ring->lock); -+ ab->soc_stats.tx_err.desc_na[tcl_ring_id]++; -+ ret = -ENOMEM; -+ goto fail_remove_idr; -+ } -+ -+ tcl_desc = (struct hal_tcl_data_cmd *)(hal_tcl_desc + sizeof(struct hal_tlv_hdr)); -+ tcl_desc->info3 = 0; -+ tcl_desc->info4 = 0; -+ -+ tcl_desc->buf_addr_info.info0 = FIELD_PREP(BUFFER_ADDR_INFO0_ADDR, paddr); -+ tcl_desc->buf_addr_info.info1 = FIELD_PREP(BUFFER_ADDR_INFO1_ADDR, -+ ((uint64_t)paddr >> HAL_ADDR_MSB_REG_SHIFT)); -+ tcl_desc->buf_addr_info.info1 |= FIELD_PREP(BUFFER_ADDR_INFO1_RET_BUF_MGR, buf_id) | -+ FIELD_PREP(BUFFER_ADDR_INFO1_SW_COOKIE, desc_id); -+ tcl_desc->info0 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_SEARCH_TYPE, -+ arvif->search_type) | -+ FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE, HAL_TCL_ENCAP_TYPE_ETHERNET) | -+ FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ADDR_EN, arvif->hal_addr_search_flags) | -+ FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_CMD_NUM, arvif->tcl_metadata); -+ -+ tcl_desc->info1 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_DATA_LEN, skb->len); -+ -+ if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) -+ tcl_desc->info1 |= TX_IP_CHECKSUM; -+ -+ tcl_desc->info2 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ar->lmac_id); -+ -+ ath11k_hal_srng_access_end(ab, tcl_ring); -+ spin_unlock_bh(&tcl_ring->lock); -+ -+ atomic_inc(&ar->dp.num_tx_pending); -+ atomic_inc(&ab->num_max_allowed); -+ -+ return 0; -+ -+fail_remove_idr: -+ tx_ring->idr_pool[idr].id = -1; -+ clear_bit(idr, tx_ring->idrs); -+ return ret; -+} -+ - int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, - struct ath11k_sta *arsta, struct sk_buff *skb) - { ---- a/drivers/net/wireless/ath/ath11k/dp_tx.h -+++ b/drivers/net/wireless/ath/ath11k/dp_tx.h -@@ -218,6 +218,8 @@ void ath11k_dp_tx_update_txcompl(struct - int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab); - int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, - struct ath11k_sta *arsta, struct sk_buff *skb); -+int ath11k_dp_tx_simple(struct ath11k *ar, struct ath11k_vif *arvif, -+ struct sk_buff *skb, struct ath11k_sta *arsta); - void ath11k_dp_tx_completion_handler(struct ath11k_base *ab, int ring_id); - int ath11k_dp_tx_send_reo_cmd(struct ath11k_base *ab, struct dp_rx_tid *rx_tid, - enum hal_reo_cmd_type type, ---- a/drivers/net/wireless/ath/ath11k/hal_desc.h -+++ b/drivers/net/wireless/ath/ath11k/hal_desc.h -@@ -952,6 +952,12 @@ struct hal_reo_flush_cache { - u32 rsvd0[6]; - } __packed; - -+#define TX_IP_CHECKSUM HAL_TCL_DATA_CMD_INFO1_IP4_CKSUM_EN | \ -+ HAL_TCL_DATA_CMD_INFO1_UDP4_CKSUM_EN | \ -+ HAL_TCL_DATA_CMD_INFO1_UDP6_CKSUM_EN | \ -+ HAL_TCL_DATA_CMD_INFO1_TCP4_CKSUM_EN | \ -+ HAL_TCL_DATA_CMD_INFO1_TCP6_CKSUM_EN -+ - #define HAL_TCL_DATA_CMD_INFO0_DESC_TYPE BIT(0) - #define HAL_TCL_DATA_CMD_INFO0_EPD BIT(1) - #define HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE GENMASK(3, 2) ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6733,6 +6733,9 @@ static void ath11k_mac_op_tx(struct ieee - - if (ar->ab->nss.enabled) - ret = ath11k_nss_tx(arvif, skb); -+ else if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP && 0) -+ ret = ath11k_dp_tx_simple(ar, arvif, skb, -+ (control->sta) ? (struct ath11k_sta *)control->sta->drv_priv : NULL); - else - ret = ath11k_dp_tx(ar, arvif, arsta, skb); - diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch b/package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch deleted file mode 100644 index ffae27277d7316..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/911-335-ath11k-fix-ar-ops-crash.patch +++ /dev/null @@ -1,71 +0,0 @@ -From: Karthikeyan Periyasamy -Subject: [patch] ath11k: fix NULL pointer crash due to the radio ops - -Mac80211 callback ops variable not intialised in the radio structure. -when the firmware not advertise the WMI_TLV_SERVICE_PEER_TID_CONFIGS_SUPPORT -in the service bitmmap, driver try to set set_tid_config ops as NULL. -Since ar->ops already NULL, it leads to NULL pointer access crash. -So fix this crash by properly intialise the mac80211 callback ops -in the radio structure. - -Tested-on: QCN6122 hw1.0 WLAN.HK.2.5.0.1-01100-QCAHKSWPL_SILICONZ-1 - -Signed-off-by: Karthikeyan Periyasamy ---- - ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10558,6 +10558,7 @@ int ath11k_mac_allocate(struct ath11k_ba - struct ieee80211_hw *hw; - struct ath11k *ar; - struct ath11k_pdev *pdev; -+ struct ieee80211_ops *ops; - int ret; - int i; - -@@ -10565,17 +10566,25 @@ int ath11k_mac_allocate(struct ath11k_ba - return 0; - - for (i = 0; i < ab->num_radios; i++) { -+ ops = kmemdup(&ath11k_ops, sizeof(ath11k_ops), GFP_KERNEL); -+ if (!ops) { -+ ret = -ENOMEM; -+ goto err_free_mac; -+ } -+ - pdev = &ab->pdevs[i]; -- hw = ieee80211_alloc_hw(sizeof(struct ath11k), &ath11k_ops); -+ hw = ieee80211_alloc_hw(sizeof(struct ath11k), ops); - if (!hw) { - ath11k_warn(ab, "failed to allocate mac80211 hw device\n"); - ret = -ENOMEM; -+ kfree(ops); - goto err_free_mac; - } - - ar = hw->priv; - ar->hw = hw; - ar->ab = ab; -+ ar->ops = ops; - ar->pdev = pdev; - ar->pdev_idx = i; - ar->lmac_id = ath11k_hw_get_mac_from_pdev_id(&ab->hw_params, i); -@@ -10636,6 +10645,7 @@ void ath11k_mac_destroy(struct ath11k_ba - { - struct ath11k *ar; - struct ath11k_pdev *pdev; -+ struct ieee80211_ops *ops; - int i; - - for (i = 0; i < ab->num_radios; i++) { -@@ -10644,8 +10654,9 @@ void ath11k_mac_destroy(struct ath11k_ba - if (!ar) - continue; - -- ath11k_fw_stats_free(&ar->fw_stats); -+ ops = ar->ops; - ieee80211_free_hw(ar->hw); -+ kfree(ops); - pdev->ar = NULL; - } - } diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch b/package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch deleted file mode 100644 index 1bbbdd6c7446da..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/913-374-ath11k-Check-skb_headroom-before-using-skb_push.patch +++ /dev/null @@ -1,209 +0,0 @@ -From efecc6e8355d02aeac7bf1a43397551440a8d0d8 Mon Sep 17 00:00:00 2001 -From: Tamizh Chelvam Raja -Date: Thu, 30 Mar 2023 22:12:56 +0530 -Subject: [PATCH] ath11k: Check skb_headroom before using skb_push - -Below kernel panic may occur if there is no -skb_headroom available for performing skb_push. - -<4>[67506.565072] CPU: 1 PID: 1741 Comm: ap-wireless-opt Not tainted 5.4.89+ #0 -<4>[67506.578860] Hardware name: Generic DT based system -<4>[67506.585728] PC is at fortify_panic+0x10/0x18 -<4>[67506.590406] LR is at fortify_panic+0x10/0x18 - -(fortify_panic) from [<7f2cd3cc>] (ath11k_dp_rx_crypto_icv_len+0x1e0/0x161c [ath11k]) -(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2cdbac>] (ath11k_dp_rx_crypto_icv_len+0x9c0/0x161c [ath11k]) -(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2ce0e8>] (ath11k_dp_rx_crypto_icv_len+0xefc/0x161c [ath11k]) -(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2cedb0>] (ath11k_dp_process_rx+0x4ec/0x544 [ath11k]) -(ath11k_dp_process_rx [ath11k]) from [<7f2c417c>] (ath11k_dp_service_srng+0xdc/0x2a0 [ath11k]) -(ath11k_dp_service_srng [ath11k]) from [<7f0d78c8>] (ath11k_pci_ext_grp_napi_poll+0x20/0x50 [ath11k_pci]) -(ath11k_pci_ext_grp_napi_poll [ath11k_pci]) from [<806a6a74>] (__napi_poll+0x28/0xb8) -(__napi_poll) from [<806a6c9c>] (net_rx_action+0xec/0x280) -(net_rx_action) from [<8010226c>] (__do_softirq+0xc4/0x248) -(__do_softirq) from [<8011f230>] (irq_exit+0x6c/0xcc) -(irq_exit) from [<80162a08>] (__handle_domain_irq+0x8c/0xb0) -(__handle_domain_irq) from [<803f0188>] (gic_handle_irq+0x54/0x8c) -(gic_handle_irq) from [<80101a8c>] (__irq_svc+0x6c/0xa8) - -Fix this by checking skb_headroom and expand the -headroom if required size is not available. - -Signed-off-by: Tamizh Chelvam Raja ---- - drivers/net/wireless/ath/ath11k/dp_rx.c | 70 +++++++++++++++++++++++++ - 1 file changed, 70 insertions(+) - ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2270,16 +2270,27 @@ static void ath11k_get_dot11_hdr_from_rx - size_t hdr_len, crypto_len; - struct ieee80211_hdr *hdr; - u16 fc, qos_ctl = 0; -+ int expand_by; - u8 *crypto_hdr; - - if (!(status->flag & RX_FLAG_IV_STRIPPED)) { - crypto_len = ath11k_dp_rx_crypto_param_len(ar, enctype); -+ if (skb_headroom(msdu) < crypto_len) { -+ expand_by = crypto_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - crypto_hdr = skb_push(msdu, crypto_len); - ath11k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); - } - - fc = ath11k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc); - hdr_len = ieee80211_hdrlen(fc); -+ if (skb_headroom(msdu) < hdr_len) { -+ expand_by = hdr_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - skb_push(msdu, hdr_len); - hdr = (struct ieee80211_hdr *)msdu->data; - hdr->frame_control = fc; -@@ -2315,6 +2326,7 @@ static void ath11k_dp_rx_h_undecap_nwifi - u8 da[ETH_ALEN]; - u8 sa[ETH_ALEN]; - u16 qos_ctl = 0; -+ int expand_by = 0; - u8 *qos, *crypto_hdr; - bool add_qos_ctrl = false; - -@@ -2359,26 +2371,46 @@ static void ath11k_dp_rx_h_undecap_nwifi - } - - if (!(status->flag & RX_FLAG_IV_STRIPPED)) { -+ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); -+ -+ if (skb_headroom(msdu) < crypto_param_len) { -+ expand_by = crypto_param_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - if (first_hdr) { -- memcpy(skb_push(msdu, -- ath11k_dp_rx_crypto_param_len(ar, enctype)), -- (void *)hdr + hdr_len, -- ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ memcpy(skb_push(msdu, crypto_param_len), -+ (void *)hdr + hdr_len, crypto_param_len); - } else { -- crypto_hdr = skb_push(msdu, ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ crypto_hdr = skb_push(msdu, crypto_param_len); - ath11k_dp_rx_desc_get_crypto_header(ar->ab, - rxcb->rx_desc, crypto_hdr, enctype); - } - } - - if (!rxcb->is_first_msdu || add_qos_ctrl) { -+ if (skb_headroom(msdu) < IEEE80211_QOS_CTL_LEN) { -+ expand_by = IEEE80211_QOS_CTL_LEN - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, - IEEE80211_QOS_CTL_LEN), &qos_ctl, - IEEE80211_QOS_CTL_LEN); -+ if (skb_headroom(msdu) < hdr_len) { -+ expand_by = hdr_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, hdr_len), decap_hdr, hdr_len); - return; - } - -+ if (skb_headroom(msdu) < hdr_len) { -+ expand_by = hdr_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); - - /* original 802.11 header has a different DA and in -@@ -2487,6 +2519,7 @@ static void ath11k_dp_rx_h_undecap_eth(s - u8 da[ETH_ALEN]; - u8 sa[ETH_ALEN]; - void *rfc1042; -+ int expand_by; - struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); - struct ath11k_dp_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}}; - -@@ -2496,6 +2529,11 @@ static void ath11k_dp_rx_h_undecap_eth(s - ether_addr_copy(sa, eth->h_source); - rfc.snap_type = eth->h_proto; - skb_pull(msdu, sizeof(struct ethhdr)); -+ if (skb_headroom(msdu) < sizeof(struct ath11k_dp_rfc1042_hdr)) { -+ expand_by = sizeof(struct ath11k_dp_rfc1042_hdr) - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), &rfc, - sizeof(struct ath11k_dp_rfc1042_hdr)); - ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); -@@ -2513,6 +2551,11 @@ static void ath11k_dp_rx_h_undecap_eth(s - skb_pull(msdu, sizeof(struct ethhdr)); - - /* push rfc1042/llc/snap */ -+ if (skb_headroom(msdu) < sizeof(struct ath11k_dp_rfc1042_hdr)) { -+ expand_by = sizeof(struct ath11k_dp_rfc1042_hdr) - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), rfc1042, - sizeof(struct ath11k_dp_rfc1042_hdr)); - -@@ -2521,12 +2564,22 @@ static void ath11k_dp_rx_h_undecap_eth(s - hdr_len = ieee80211_hdrlen(hdr->frame_control); - - if (!(status->flag & RX_FLAG_IV_STRIPPED)) { -- memcpy(skb_push(msdu, -- ath11k_dp_rx_crypto_param_len(ar, enctype)), -- (void *)hdr + hdr_len, -- ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); -+ -+ if (skb_headroom(msdu) < crypto_param_len) { -+ expand_by = crypto_param_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } -+ memcpy(skb_push(msdu, crypto_param_len), -+ (void *)hdr + hdr_len, crypto_param_len); - } - -+ if (skb_headroom(msdu) < hdr_len) { -+ expand_by = hdr_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); - - exit: -@@ -2954,10 +3007,16 @@ static void ath11k_dp_rx_deliver_msdu(st - u8 decap = DP_RX_DECAP_TYPE_RAW; - bool is_mcbc = rxcb->is_mcbc; - bool is_eapol = rxcb->is_eapol; -+ int expand_by; - - if (status->encoding == RX_ENC_HE && - !(status->flag & RX_FLAG_RADIOTAP_HE) && - !(status->flag & RX_FLAG_SKIP_MONITOR)) { -+ if (skb_headroom(msdu) < sizeof(known)) { -+ expand_by = sizeof(known) - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ goto exit; -+ } - he = skb_push(msdu, sizeof(known)); - memcpy(he, &known, sizeof(known)); - status->flag |= RX_FLAG_RADIOTAP_HE; -@@ -3013,6 +3072,7 @@ static void ath11k_dp_rx_deliver_msdu(st - !(is_mcbc && rx_status->flag & RX_FLAG_DECRYPTED)) - rx_status->flag |= RX_FLAG_8023; - -+exit: - ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); - - if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch b/package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch deleted file mode 100644 index 8e60a5f6b255f7..00000000000000 --- a/package/kernel/mac80211/patches/ath11k_nss/913-726-mac80211-fix-crash-when-accessing-null-pointer.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 376306e1018974ded893d8fefb91fe69676392d9 Mon Sep 17 00:00:00 2001 -From: Karthikeyan Kathirvel -Date: Mon, 1 May 2023 15:15:56 +0530 -Subject: [PATCH] mac80211: fix crash when accessing null pointer - -During MLD transmission, band will be zero, fetching 0th sband will be an -invalid accessing of sband information and also facing crash when 2ghz -radio is in different phy and other bands are in a single phy, this is -due to 2.4 Ghz sband will be NULL for the phy which is having sbands other -than 2.4 Ghz. - -Fix this by adding sband NULL check. - -[ 2125.764601] Unable to handle kernel read from unreadable memory at virtual address 0000000000000050 -[ 2125.764631] Mem abort info: -[ 2125.772445] ESR = 0x96000005 -[ 2125.775221] EC = 0x25: DABT (current EL), IL = 32 bits -[ 2125.778339] SET = 0, FnV = 0 -[ 2125.783804] EA = 0, S1PTW = 0 -[ 2125.786669] Data abort info: -[ 2125.789707] ISV = 0, ISS = 0x00000005 -[ 2125.792833] CM = 0, WnR = 0 -[ 2125.796394] user pgtable: 4k pages, 39-bit VAs, pgdp=000000006432b000 -[ 2125.799520] [0000000000000050] pgd=0000000000000000, pud=0000000000000000 -[ 2125.805946] Internal error: Oops: 96000005 [#1] PREEMPT SMP -[ 2126.082240] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.4.213 #0 -[ 2126.110546] pstate: 40400005 (nZcv daif +PAN -UAO) -[ 2126.117591] pc : ieee80211_tx_monitor+0x1ac/0x5d0 [mac80211] -[ 2126.122360] lr : ieee80211_tx_monitor+0x14c/0x5d0 [mac80211] -[ 2126.128163] sp : ffffff803e14ecc0 -[ 2126.133803] x29: ffffff803e14ecc0 x28: 000000000000000d -[ 2126.137016] x27: 0000000000000000 x26: ffffff803892aa40 -[ 2126.142398] x25: 0000000000000009 x24: 0000000000000000 -[ 2126.147694] x23: 0000000000000001 x22: ffffff80250210e0 -[ 2126.152988] x21: ffffff803a0a5800 x20: ffffff803a0a5828 -[ 2126.158284] x19: ffffff803892aa33 x18: 0000000000000000 -[ 2126.163579] x17: 0000000000000000 x16: 0000000000000000 -[ 2126.168873] x15: 0000000000000000 x14: 020101f0fd8c13dd -[ 2126.174169] x13: 00c0bf3d2d200706 x12: 3809ff36b83b03ff -[ 2126.179464] x11: 0a5802c3fe1802c3 x10: 002f3262005e4342 -[ 2126.184759] x9 : 0000a4270000a403 x8 : ffffff803892aa3f -[ 2126.190055] x7 : 0000000000000000 x6 : 0000000000000001 -[ 2126.195349] x5 : ffffff803e14edd8 x4 : 0000000000000001 -[ 2126.200644] x3 : 000000000000000c x2 : 0000000000000000 -[ 2126.205939] x1 : ffffff803892aa3b x0 : 0000000000000040 -[ 2126.211235] Call trace: -[ 2126.216542] ieee80211_tx_monitor+0x1ac/0x5d0 [mac80211] -[ 2126.218714] ieee80211_tx_status_ext+0x78c/0x7d0 [mac80211] -[ 2126.224269] ieee80211_tx_status+0x78/0xa0 [mac80211] -[ 2126.229564] ieee80211_restart_hw+0xe0/0x26c [mac80211] -[ 2126.234763] tasklet_action_common.isra.2+0xa4/0x11c -[ 2126.239795] tasklet_action+0x24/0x2c -[ 2126.245002] __do_softirq+0x10c/0x244 -[ 2126.248561] irq_exit+0x64/0xb4 -[ 2126.252207] __handle_domain_irq+0x88/0xac -[ 2126.255158] gic_handle_irq+0x74/0xbc -[ 2126.259325] el1_irq+0xf0/0x1c0 -[ 2126.263058] arch_cpu_idle+0x10/0x18 -[ 2126.266009] do_idle+0x104/0x248 -[ 2126.269827] cpu_startup_entry+0x20/0x64 -[ 2126.273041] rest_init+0xd0/0xdc -[ 2126.276947] arch_call_rest_init+0xc/0x14 -[ 2126.280159] start_kernel+0x46c/0x4a4 -[ 2126.284070] Code: d37d0863 8b030042 52800183 f9449c42 (f9402842) -[ 2126.287713] ---[ end trace 04f5d203895d53da ]--- - -Signed-off-by: Karthikeyan Kathirvel ---- - net/mac80211/status.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - ---- a/net/mac80211/status.c -+++ b/net/mac80211/status.c -@@ -336,8 +336,11 @@ ieee80211_add_tx_radiotap_header(struct - struct ieee80211_supported_band *sband; - - sband = local->hw.wiphy->bands[info->band]; -- legacy_rate = -- sband->bitrates[info->status.rates[0].idx].bitrate; -+ //TODO: Incase of MLD, band will be 0 for tx pkts -+ //this has to be taken care during TX monitor support. -+ if (sband) -+ legacy_rate = -+ sband->bitrates[info->status.rates[0].idx].bitrate; - } - - if (legacy_rate) { diff --git a/package/kernel/mac80211/patches/nss/ath10k/199-004-ath10k-fixup-nss-compile.patch b/package/kernel/mac80211/patches/nss/ath10k/199-004-ath10k-fixup-nss-compile.patch new file mode 100644 index 00000000000000..d413514144f161 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath10k/199-004-ath10k-fixup-nss-compile.patch @@ -0,0 +1,19 @@ +--- a/drivers/net/wireless/ath/ath10k/mac.c ++++ b/drivers/net/wireless/ath/ath10k/mac.c +@@ -5530,7 +5530,7 @@ static int ath10k_mac_set_txbf_conf(stru + ar->wmi.vdev_param->txbf, value); + } + +-static void ath10k_update_vif_offload(struct ieee80211_hw *hw, ++static int ath10k_update_vif_offload(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) + { + struct ath10k_vif *arvif = (void *)vif->drv_priv; +@@ -5552,6 +5552,7 @@ static void ath10k_update_vif_offload(st + ath10k_warn(ar, "failed to set vdev %i TX encapsulation: %d\n", + arvif->vdev_id, ret); + } ++ return ret; + } + + /* diff --git a/package/kernel/mac80211/patches/ath11k_nss/033-ath11k-fix-for-peer-memory-corruption.patch b/package/kernel/mac80211/patches/nss/ath11k/033-ath11k-fix-for-peer-memory-corruption.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/033-ath11k-fix-for-peer-memory-corruption.patch rename to package/kernel/mac80211/patches/nss/ath11k/033-ath11k-fix-for-peer-memory-corruption.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch similarity index 84% rename from package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch rename to package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch index d3ffa5bd8da8e7..c4b6d2339deea1 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/907-068-ath11k-add-rx-histogram-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch @@ -20,7 +20,7 @@ Signed-off-by: Manikanta Pubbisetty --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -44,6 +44,8 @@ +@@ -41,6 +41,8 @@ #define ATH11K_INVALID_HW_MAC_ID 0xFF #define ATH11K_CONNECTION_LOSS_HZ (3 * HZ) @@ -29,7 +29,7 @@ Signed-off-by: Manikanta Pubbisetty /* SMBIOS type containing Board Data File Name Extension */ #define ATH11K_SMBIOS_BDF_EXT_TYPE 0xF8 -@@ -420,6 +422,17 @@ struct ath11k_vif_iter { +@@ -376,6 +378,17 @@ struct ath11k_vif_iter { struct ath11k_vif *arvif; }; @@ -47,7 +47,7 @@ Signed-off-by: Manikanta Pubbisetty struct ath11k_rx_peer_stats { u64 num_msdu; u64 num_mpdu_fcs_ok; -@@ -431,10 +444,6 @@ struct ath11k_rx_peer_stats { +@@ -387,10 +400,6 @@ struct ath11k_rx_peer_stats { u64 non_ampdu_msdu_count; u64 stbc_count; u64 beamformed_count; @@ -58,7 +58,7 @@ Signed-off-by: Manikanta Pubbisetty u64 coding_count[HAL_RX_SU_MU_CODING_MAX]; u64 tid_count[IEEE80211_NUM_TIDS + 1]; u64 pream_cnt[HAL_RX_PREAMBLE_MAX]; -@@ -442,6 +451,8 @@ struct ath11k_rx_peer_stats { +@@ -398,6 +407,8 @@ struct ath11k_rx_peer_stats { u64 rx_duration; u64 dcm_count; u64 ru_alloc_cnt[HAL_RX_RU_ALLOC_TYPE_MAX]; @@ -76,8 +76,8 @@ Signed-off-by: Manikanta Pubbisetty +#include "dp_rx.h" #include "debugfs_htt_stats.h" - static inline u32 ath11k_he_tones_in_ru_to_nl80211_he_ru_alloc(u16 ru_tones) -@@ -390,8 +391,14 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + void ath11k_debugfs_sta_add_tx_stats(struct ath11k_sta *arsta, +@@ -247,8 +248,14 @@ static ssize_t ath11k_dbg_sta_dump_rx_st struct ath11k *ar = arsta->arvif->ar; struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; int len = 0, i, retval = 0; @@ -93,7 +93,7 @@ Signed-off-by: Manikanta Pubbisetty if (!rx_stats) return -ENOENT; -@@ -422,14 +429,6 @@ static ssize_t ath11k_dbg_sta_dump_rx_st +@@ -279,14 +286,6 @@ static ssize_t ath11k_dbg_sta_dump_rx_st rx_stats->num_mpdu_fcs_ok); len += scnprintf(buf + len, size - len, "Num of MPDUs with FCS error: %llu\n", rx_stats->num_mpdu_fcs_err); @@ -108,7 +108,7 @@ Signed-off-by: Manikanta Pubbisetty len += scnprintf(buf + len, size - len, "BCC %llu LDPC %llu\n", rx_stats->coding_count[0], rx_stats->coding_count[1]); len += scnprintf(buf + len, size - len, -@@ -444,14 +443,96 @@ static ssize_t ath11k_dbg_sta_dump_rx_st +@@ -301,14 +300,96 @@ static ssize_t ath11k_dbg_sta_dump_rx_st len += scnprintf(buf + len, size - len, "TID(0-15) Legacy TID(16):"); for (i = 0; i <= IEEE80211_NUM_TIDS; i++) len += scnprintf(buf + len, size - len, "%llu ", rx_stats->tid_count[i]); @@ -212,9 +212,64 @@ Signed-off-by: Manikanta Pubbisetty len += scnprintf(buf + len, size - len, "\nDCM: %llu\nRU: 26 %llu 52: %llu 106: %llu 242: %llu 484: %llu 996: %llu\n", rx_stats->dcm_count, rx_stats->ru_alloc_cnt[0], +@@ -847,6 +928,40 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++static ssize_t ath11k_dbg_sta_reset_rx_stats(struct file *file, ++ const char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ieee80211_sta *sta = file->private_data; ++ struct ath11k_sta *arsta = (struct ath11k_sta *)sta->drv_priv; ++ struct ath11k *ar = arsta->arvif->ar; ++ int ret, reset; ++ ++ if (!arsta->rx_stats) ++ return -ENOENT; ++ ++ ret = kstrtoint_from_user(buf, count, 0, &reset); ++ if (ret) ++ return ret; ++ ++ if (!reset || reset > 1) ++ return -EINVAL; ++ ++ spin_lock_bh(&ar->ab->base_lock); ++ memset(arsta->rx_stats, 0, sizeof(*arsta->rx_stats)); ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ ret = count; ++ return ret; ++} ++ ++static const struct file_operations fops_reset_rx_stats = { ++ .write = ath11k_dbg_sta_reset_rx_stats, ++ .open = simple_open, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ + void ath11k_debugfs_sta_op_add(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta, struct dentry *dir) + { +@@ -855,9 +970,12 @@ void ath11k_debugfs_sta_op_add(struct ie + if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) + debugfs_create_file("tx_stats", 0400, dir, sta, + &fops_tx_stats); +- if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) ++ if (ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { + debugfs_create_file("rx_stats", 0400, dir, sta, + &fops_rx_stats); ++ debugfs_create_file("reset_rx_stats", 0600, dir, sta, ++ &fops_reset_rx_stats); ++ } + + debugfs_create_file("htt_peer_stats", 0400, dir, sta, + &fops_htt_peer_stats); --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3400,10 +3400,43 @@ exit: +@@ -2756,10 +2756,43 @@ exit: return total_msdu_reaped; } @@ -258,7 +313,7 @@ Signed-off-by: Manikanta Pubbisetty u32 num_msdu; int i; -@@ -3413,6 +3446,8 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2769,6 +2802,8 @@ static void ath11k_dp_rx_update_peer_sta arsta->rssi_comb = ppdu_info->rssi_comb; ewma_avg_rssi_add(&arsta->avg_rssi, ppdu_info->rssi_comb); @@ -267,7 +322,7 @@ Signed-off-by: Manikanta Pubbisetty num_msdu = ppdu_info->tcp_msdu_count + ppdu_info->tcp_ack_msdu_count + ppdu_info->udp_msdu_count + ppdu_info->other_msdu_count; -@@ -3429,18 +3464,6 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2785,18 +2820,6 @@ static void ath11k_dp_rx_update_peer_sta ppdu_info->tid = IEEE80211_NUM_TIDS; } @@ -286,7 +341,7 @@ Signed-off-by: Manikanta Pubbisetty if (ppdu_info->ldpc < HAL_RX_SU_MU_CODING_MAX) rx_stats->coding_count[ppdu_info->ldpc] += num_msdu; -@@ -3469,8 +3492,6 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2825,8 +2848,6 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->dcm_count += ppdu_info->dcm; rx_stats->ru_alloc_cnt[ppdu_info->ru_alloc] += num_msdu; @@ -295,7 +350,7 @@ Signed-off-by: Manikanta Pubbisetty BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); -@@ -3479,6 +3500,52 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2835,6 +2856,52 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->rx_duration += ppdu_info->rx_duration; arsta->rx_duration = rx_stats->rx_duration; @@ -350,7 +405,7 @@ Signed-off-by: Manikanta Pubbisetty static struct sk_buff *ath11k_dp_rx_alloc_mon_status_buf(struct ath11k_base *ab, --- a/drivers/net/wireless/ath/ath11k/dp_rx.h +++ b/drivers/net/wireless/ath/ath11k/dp_rx.h -@@ -69,6 +69,25 @@ struct ath11k_dp_rfc1042_hdr { +@@ -41,6 +41,25 @@ struct ath11k_dp_rfc1042_hdr { __be16 snap_type; } __packed; @@ -373,12 +428,12 @@ Signed-off-by: Manikanta Pubbisetty + return ret; +} + - int ath11k_dp_rx_ampdu_start(struct ath11k_vif *arvif, + int ath11k_dp_rx_ampdu_start(struct ath11k *ar, struct ieee80211_ampdu_params *params); - int ath11k_dp_rx_ampdu_stop(struct ath11k_vif *arvif, + int ath11k_dp_rx_ampdu_stop(struct ath11k *ar, --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c -@@ -978,44 +978,78 @@ ath11k_hal_rx_parse_mon_status_tlv(struc +@@ -975,44 +975,78 @@ ath11k_hal_rx_parse_mon_status_tlv(struc ppdu_info->is_stbc = FIELD_GET(HAL_RX_HT_SIG_INFO_INFO1_STBC, info1); ppdu_info->ldpc = FIELD_GET(HAL_RX_HT_SIG_INFO_INFO1_FEC_CODING, info1); @@ -481,7 +536,7 @@ Signed-off-by: Manikanta Pubbisetty ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; break; } -@@ -1473,6 +1507,9 @@ ath11k_hal_rx_parse_mon_status_tlv(struc +@@ -1470,6 +1504,9 @@ ath11k_hal_rx_parse_mon_status_tlv(struc peer_id = ath11k_hal_rx_mpduinfo_get_peerid(ab, mpdu_info); if (peer_id) ppdu_info->peer_id = peer_id; @@ -505,7 +560,7 @@ Signed-off-by: Manikanta Pubbisetty struct hal_rx_mon_status_tlv_hdr { u32 hdr; -@@ -104,6 +108,22 @@ struct hal_rx_user_status { +@@ -103,6 +107,22 @@ struct hal_rx_user_status { u32 mpdu_err_byte_count; }; @@ -528,7 +583,7 @@ Signed-off-by: Manikanta Pubbisetty #define HAL_TLV_STATUS_PPDU_NOT_DONE HAL_RX_MON_STATUS_PPDU_NOT_DONE #define HAL_TLV_STATUS_PPDU_DONE HAL_RX_MON_STATUS_PPDU_DONE #define HAL_TLV_STATUS_BUF_DONE HAL_RX_MON_STATUS_BUF_DONE -@@ -128,6 +148,7 @@ struct hal_rx_mon_ppdu_info { +@@ -127,6 +147,7 @@ struct hal_rx_mon_ppdu_info { u32 num_mpdu_fcs_ok; u32 num_mpdu_fcs_err; u32 preamble_type; @@ -538,7 +593,7 @@ Signed-off-by: Manikanta Pubbisetty u16 tcp_ack_msdu_count; --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -1051,6 +1051,17 @@ static u32 ath11k_hw_wcn6750_get_tcl_rin +@@ -900,6 +900,17 @@ static u32 ath11k_hw_wcn6750_get_tcl_rin return skb_get_hash(skb); } @@ -556,15 +611,15 @@ Signed-off-by: Manikanta Pubbisetty const struct ath11k_hw_ops ipq8074_ops = { .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id, .wmi_init_config = ath11k_init_wmi_config_ipq8074, -@@ -1089,6 +1100,7 @@ const struct ath11k_hw_ops ipq8074_ops = +@@ -938,6 +949,7 @@ const struct ath11k_hw_ops ipq8074_ops = .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, - #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M - .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, - #endif -@@ -1136,6 +1148,7 @@ const struct ath11k_hw_ops ipq6018_ops = + }; + + const struct ath11k_hw_ops ipq6018_ops = { +@@ -978,6 +990,7 @@ const struct ath11k_hw_ops ipq6018_ops = .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, @@ -572,7 +627,7 @@ Signed-off-by: Manikanta Pubbisetty }; const struct ath11k_hw_ops qca6390_ops = { -@@ -1177,6 +1190,7 @@ const struct ath11k_hw_ops qca6390_ops = +@@ -1018,6 +1031,7 @@ const struct ath11k_hw_ops qca6390_ops = .rx_desc_mac_addr2_valid = ath11k_hw_ipq8074_rx_desc_mac_addr2_valid, .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, @@ -580,15 +635,23 @@ Signed-off-by: Manikanta Pubbisetty }; const struct ath11k_hw_ops qcn9074_ops = { -@@ -1217,6 +1231,7 @@ const struct ath11k_hw_ops qcn9074_ops = - .reo_setup = ath11k_hw_ipq8074_reo_setup, - .mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid, +@@ -1058,6 +1072,7 @@ const struct ath11k_hw_ops qcn9074_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, -+ .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, }; const struct ath11k_hw_ops wcn6855_ops = { -@@ -1339,6 +1354,7 @@ const struct ath11k_hw_ops ipq5018_ops = +@@ -1098,6 +1113,7 @@ const struct ath11k_hw_ops wcn6855_ops = + .rx_desc_mac_addr2_valid = ath11k_hw_wcn6855_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, ++ .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, + }; + + const struct ath11k_hw_ops wcn6750_ops = { +@@ -1179,6 +1195,7 @@ const struct ath11k_hw_ops ipq5018_ops = .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, @@ -598,11 +661,11 @@ Signed-off-by: Manikanta Pubbisetty #define ATH11K_TX_RING_MASK_0 BIT(0) --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -315,6 +315,7 @@ struct ath11k_hw_ops { +@@ -269,6 +269,7 @@ struct ath11k_hw_ops { bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); u32 (*get_ring_selector)(struct sk_buff *skb); + u32 (*rx_desc_get_hal_mpdu_len)(struct hal_rx_mpdu_info *mpdu_info); - #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M - void (*rx_desc_get_offset)(struct htt_rx_ring_tlv_filter *tlv_filter); - #endif + }; + + extern const struct ath11k_hw_ops ipq8074_ops; diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-069-ath11k-add-HE-stats-in-peer-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/069-ath11k-add-HE-stats-in-peer-stats.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/902-069-ath11k-add-HE-stats-in-peer-stats.patch rename to package/kernel/mac80211/patches/nss/ath11k/069-ath11k-add-HE-stats-in-peer-stats.patch index 4831424fa40810..5c29297c3363f8 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-069-ath11k-add-HE-stats-in-peer-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/069-ath11k-add-HE-stats-in-peer-stats.patch @@ -20,10 +20,10 @@ Signed-off-by: Miles Hu #include "spectral.h" #include "wow.h" +#include "rx_desc.h" - #include "nss.h" #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) -@@ -476,6 +477,8 @@ struct ath11k_htt_data_stats { + +@@ -469,6 +470,8 @@ struct ath11k_htt_data_stats { u64 bw[ATH11K_COUNTER_TYPE_MAX][ATH11K_BW_NUM]; u64 nss[ATH11K_COUNTER_TYPE_MAX][ATH11K_NSS_NUM]; u64 gi[ATH11K_COUNTER_TYPE_MAX][ATH11K_GI_NUM]; @@ -32,7 +32,7 @@ Signed-off-by: Miles Hu }; struct ath11k_htt_tx_stats { -@@ -483,6 +486,9 @@ struct ath11k_htt_tx_stats { +@@ -476,6 +479,9 @@ struct ath11k_htt_tx_stats { u64 tx_duration; u64 ba_fails; u64 ack_fails; @@ -42,7 +42,7 @@ Signed-off-by: Miles Hu }; struct ath11k_per_ppdu_tx_stats { -@@ -615,11 +621,16 @@ struct ath11k_per_peer_tx_stats { +@@ -592,11 +598,16 @@ struct ath11k_per_peer_tx_stats { u32 succ_bytes; u32 retry_bytes; u32 failed_bytes; @@ -62,8 +62,8 @@ Signed-off-by: Miles Hu --- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c +++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c -@@ -12,13 +12,39 @@ - #include "dp_tx.h" +@@ -13,13 +13,39 @@ + #include "dp_rx.h" #include "debugfs_htt_stats.h" +static inline u32 ath11k_he_tones_in_ru_to_nl80211_he_ru_alloc(u16 ru_tones) @@ -103,7 +103,7 @@ Signed-off-by: Miles Hu if (!arsta->tx_stats) return; -@@ -63,6 +89,43 @@ void ath11k_debugfs_sta_add_tx_stats(str +@@ -64,6 +90,43 @@ void ath11k_debugfs_sta_add_tx_stats(str STATS_OP_FMT(RETRY).legacy[1][mcs] += peer_stats->retry_pkts; } @@ -147,7 +147,7 @@ Signed-off-by: Miles Hu if (peer_stats->is_ampdu) { tx_stats->ba_fails += peer_stats->ba_fails; -@@ -123,6 +186,17 @@ void ath11k_debugfs_sta_add_tx_stats(str +@@ -124,6 +187,17 @@ void ath11k_debugfs_sta_add_tx_stats(str STATS_OP_FMT(RETRY).gi[1][gi] += peer_stats->retry_pkts; tx_stats->tx_duration += peer_stats->duration; @@ -165,7 +165,7 @@ Signed-off-by: Miles Hu } void ath11k_debugfs_sta_update_txcompl(struct ath11k *ar, -@@ -139,12 +213,13 @@ static ssize_t ath11k_dbg_sta_dump_tx_st +@@ -140,12 +214,13 @@ static ssize_t ath11k_dbg_sta_dump_tx_st struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); struct ath11k *ar = arsta->arvif->ar; struct ath11k_htt_data_stats *stats; @@ -179,9 +179,9 @@ Signed-off-by: Miles Hu + char *buf, mu_group_id[MAX_MU_GROUP_LENGTH] = {0}; + u32 index; - buf = kzalloc(size, GFP_KERNEL); - if (!buf) -@@ -165,45 +240,46 @@ static ssize_t ath11k_dbg_sta_dump_tx_st + if (!arsta->tx_stats) + return -ENOENT; +@@ -163,45 +238,46 @@ static ssize_t ath11k_dbg_sta_dump_tx_st len += scnprintf(buf + len, size - len, "%s_%s\n", str_name[k], str[j]); @@ -237,7 +237,7 @@ Signed-off-by: Miles Hu stats->gi[j][0], stats->gi[j][1], stats->gi[j][2], stats->gi[j][3]); len += scnprintf(buf + len, size - len, -@@ -212,10 +288,68 @@ static ssize_t ath11k_dbg_sta_dump_tx_st +@@ -210,10 +286,68 @@ static ssize_t ath11k_dbg_sta_dump_tx_st for (i = 0; i < ATH11K_LEGACY_NUM; i++) len += scnprintf(buf + len, size - len, "%llu ", stats->legacy[j][i]); @@ -307,7 +307,7 @@ Signed-off-by: Miles Hu len += scnprintf(buf + len, size - len, "\nTX duration\n %llu usecs\n", arsta->tx_stats->tx_duration); -@@ -223,6 +357,7 @@ static ssize_t ath11k_dbg_sta_dump_tx_st +@@ -221,6 +355,7 @@ static ssize_t ath11k_dbg_sta_dump_tx_st "BA fails\n %llu\n", arsta->tx_stats->ba_fails); len += scnprintf(buf + len, size - len, "ack fails\n %llu\n", arsta->tx_stats->ack_fails); @@ -317,7 +317,7 @@ Signed-off-by: Miles Hu if (len > size) --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -598,6 +598,45 @@ enum htt_ppdu_stats_tag_type { +@@ -595,6 +595,45 @@ enum htt_ppdu_stats_tag_type { BIT(HTT_PPDU_STATS_TAG_TX_MGMTCTRL_PAYLOAD) | \ HTT_PPDU_STATS_TAG_DEFAULT) @@ -363,7 +363,7 @@ Signed-off-by: Miles Hu /* HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG Message * * details: -@@ -1315,6 +1354,19 @@ enum htt_ppdu_stats_gi { +@@ -1234,6 +1273,19 @@ enum htt_ppdu_stats_gi { #define HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M GENMASK(3, 0) #define HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M GENMASK(11, 4) @@ -383,7 +383,7 @@ Signed-off-by: Miles Hu #define HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALD_M BIT(0) #define HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M GENMASK(5, 1) -@@ -1342,6 +1394,12 @@ enum htt_ppdu_stats_gi { +@@ -1261,6 +1313,12 @@ enum htt_ppdu_stats_gi { FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M, _val) #define HTT_USR_RATE_DCM(_val) \ FIELD_GET(HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M, _val) @@ -396,7 +396,7 @@ Signed-off-by: Miles Hu #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M GENMASK(1, 0) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M BIT(2) -@@ -1445,6 +1503,21 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_ +@@ -1364,6 +1422,21 @@ struct htt_ppdu_stats_usr_cmpltn_ack_ba_ u32 success_bytes; } __packed; @@ -418,7 +418,7 @@ Signed-off-by: Miles Hu struct htt_ppdu_stats_usr_cmn_array { struct htt_tlv tlv_hdr; u32 num_ppdu_stats; -@@ -1458,14 +1531,16 @@ struct htt_ppdu_stats_usr_cmn_array { +@@ -1377,14 +1450,16 @@ struct htt_ppdu_stats_usr_cmn_array { struct htt_ppdu_user_stats { u16 peer_id; @@ -436,7 +436,7 @@ Signed-off-by: Miles Hu #define HTT_PPDU_DESC_MAX_DEPTH 16 struct htt_ppdu_stats { -@@ -1474,7 +1549,7 @@ struct htt_ppdu_stats { +@@ -1393,7 +1468,7 @@ struct htt_ppdu_stats { }; struct htt_ppdu_stats_info { @@ -447,7 +447,7 @@ Signed-off-by: Miles Hu }; --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1319,9 +1319,10 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1252,9 +1252,10 @@ static int ath11k_htt_tlv_ppdu_stats_par void *data) { struct htt_ppdu_stats_info *ppdu_info; @@ -459,7 +459,7 @@ Signed-off-by: Miles Hu ppdu_info = data; -@@ -1334,6 +1335,26 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1267,6 +1268,26 @@ static int ath11k_htt_tlv_ppdu_stats_par } memcpy((void *)&ppdu_info->ppdu_stats.common, ptr, sizeof(struct htt_ppdu_stats_common)); @@ -486,7 +486,7 @@ Signed-off-by: Miles Hu break; case HTT_PPDU_STATS_TAG_USR_RATE: if (len < sizeof(struct htt_ppdu_stats_user_rate)) { -@@ -1366,6 +1387,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1299,6 +1320,7 @@ static int ath11k_htt_tlv_ppdu_stats_par peer_id); if (cur_user < 0) return -EINVAL; @@ -494,7 +494,7 @@ Signed-off-by: Miles Hu user_stats = &ppdu_info->ppdu_stats.user_stats[cur_user]; user_stats->peer_id = peer_id; user_stats->is_valid_peer_id = true; -@@ -1394,44 +1416,30 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1327,44 +1349,30 @@ static int ath11k_htt_tlv_ppdu_stats_par sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); user_stats->tlv_flags |= BIT(tag); break; @@ -559,7 +559,7 @@ Signed-off-by: Miles Hu return 0; } -@@ -1449,8 +1457,8 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1382,8 +1390,8 @@ ath11k_update_per_peer_tx_stats(struct a struct htt_ppdu_stats_common *common = &ppdu_stats->common; int ret; u8 flags, mcs, nss, bw, sgi, dcm, rate_idx = 0; @@ -570,7 +570,7 @@ Signed-off-by: Miles Hu u32 tx_duration = 0; u8 tid = HTT_PPDU_STATS_NON_QOS_TID; bool is_ampdu = false; -@@ -1481,6 +1489,11 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1414,6 +1422,11 @@ ath11k_update_per_peer_tx_stats(struct a mcs = HTT_USR_RATE_MCS(user_rate->rate_flags); sgi = HTT_USR_RATE_GI(user_rate->rate_flags); dcm = HTT_USR_RATE_DCM(user_rate->rate_flags); @@ -582,7 +582,7 @@ Signed-off-by: Miles Hu /* Note: If host configured fixed rates and in some other special * cases, the broadcast/management frames are sent in different rates. -@@ -1575,6 +1588,12 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1508,6 +1521,12 @@ ath11k_update_per_peer_tx_stats(struct a peer_stats->ba_fails = HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) + HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags); @@ -595,7 +595,7 @@ Signed-off-by: Miles Hu if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); -@@ -1627,13 +1646,87 @@ struct htt_ppdu_stats_info *ath11k_dp_ht +@@ -1560,13 +1579,89 @@ struct htt_ppdu_stats_info *ath11k_dp_ht return ppdu_info; } @@ -640,8 +640,10 @@ Signed-off-by: Miles Hu + int ret = -EINVAL; + struct htt_ppdu_stats_info * ppdu_info = NULL; + -+ ppdu_info = (struct htt_ppdu_stats_info *)data; -+ ppdu_info->tlv_bitmap = 0; ++ if (data) { ++ ppdu_info = (struct htt_ppdu_stats_info *)data; ++ ppdu_info->tlv_bitmap = 0; ++ } + while (len > 0) { + if (len < sizeof(*tlv)) { + ath11k_err(ab, "htt tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n", @@ -684,7 +686,7 @@ Signed-off-by: Miles Hu u8 pdev_id; u32 ppdu_id, len; -@@ -1668,6 +1761,47 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1601,6 +1696,47 @@ static int ath11k_htt_pull_ppdu_stats(st goto out_unlock_data; } @@ -734,7 +736,7 @@ Signed-off-by: Miles Hu --- a/drivers/net/wireless/ath/ath11k/rx_desc.h +++ b/drivers/net/wireless/ath/ath11k/rx_desc.h -@@ -1500,6 +1500,11 @@ struct hal_rx_desc { +@@ -1494,6 +1494,11 @@ struct hal_rx_desc { } u; } __packed; @@ -748,9 +750,9 @@ Signed-off-by: Miles Hu #define RU_52 2 --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -48,6 +48,17 @@ struct ath11k_ast_entry { - struct list_head ase_list; - }; +@@ -7,6 +7,17 @@ + #ifndef ATH11K_PEER_H + #define ATH11K_PEER_H +struct ppdu_user_delayba { + u8 reserved0; @@ -766,7 +768,7 @@ Signed-off-by: Miles Hu struct ath11k_peer { struct list_head list; struct ieee80211_sta *sta; -@@ -83,6 +94,8 @@ struct ath11k_peer { +@@ -36,6 +47,8 @@ struct ath11k_peer { u16 sec_type_grp; bool is_authorized; bool dp_setup_done; diff --git a/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch new file mode 100644 index 00000000000000..d5e6ec621fcbb3 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch @@ -0,0 +1,15 @@ +--- a/drivers/net/wireless/ath/ath11k/core.c ++++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -26,10 +26,10 @@ module_param_named(crypto_mode, ath11k_c + MODULE_PARM_DESC(crypto_mode, "crypto mode: 0-hardware, 1-software"); + + /* frame mode values are mapped as per enum ath11k_hw_txrx_mode */ +-unsigned int ath11k_frame_mode = ATH11K_HW_TXRX_NATIVE_WIFI; ++unsigned int ath11k_frame_mode = ATH11K_HW_TXRX_ETHERNET; + module_param_named(frame_mode, ath11k_frame_mode, uint, 0644); + MODULE_PARM_DESC(frame_mode, +- "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)"); ++ "Datapath frame mode (0: raw, 1: native wifi, 2: ethernet(default))"); + + struct ath11k_base *ath11k_soc[MAX_SOCS]; + diff --git a/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch b/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch new file mode 100644 index 00000000000000..6a96689002eedb --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch @@ -0,0 +1,82 @@ +From 3827a38706dcf081992fccf30957b29e81a25e5c Mon Sep 17 00:00:00 2001 +From: Miles Hu +Date: Mon, 25 Nov 2019 10:24:41 -0800 +Subject: [PATCH] ath11k: fix ul-ofdma counter always zero in peer stats + +The problem is caused by RSSI_LEGACY tlv is not handled properly. +All ul mu receiption information need to be extracted from the tlv. + +Signed-off-by: Miles Hu +--- + drivers/net/wireless/ath/ath11k/debugfs_sta.c | 7 ------- + drivers/net/wireless/ath/ath11k/hal_rx.c | 17 +++++++++++++++++ + drivers/net/wireless/ath/ath11k/hal_rx.h | 8 ++++++++ + 3 files changed, 25 insertions(+), 7 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -525,13 +525,6 @@ static ssize_t ath11k_dbg_sta_dump_rx_st + rx_stats->byte_stats.rx_rate[i], + (i + 1) % (he_rates_avail ? 12 : 8) ? "\t" : "\n"); + +- len += scnprintf(buf + len, size - len, +- "\nDCM: %llu\nRU: 26 %llu 52: %llu 106: %llu 242: %llu 484: %llu 996: %llu\n", +- rx_stats->dcm_count, rx_stats->ru_alloc_cnt[0], +- rx_stats->ru_alloc_cnt[1], rx_stats->ru_alloc_cnt[2], +- rx_stats->ru_alloc_cnt[3], rx_stats->ru_alloc_cnt[4], +- rx_stats->ru_alloc_cnt[5]); +- + len += scnprintf(buf + len, size - len, "\n"); + + spin_unlock_bh(&ar->ab->base_lock); +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -1480,6 +1480,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + ab->wmi_ab.svc_map); + struct hal_rx_phyrx_rssi_legacy_info *rssi = + (struct hal_rx_phyrx_rssi_legacy_info *)tlv_data; ++ u32 reception_type = 0; + + /* TODO: Please note that the combined rssi will not be accurate + * in MU case. Rssi in MU needs to be retrieved from +@@ -1489,6 +1490,22 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB, + __le32_to_cpu(rssi->info0)); + ++ reception_type = ++ FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_RSVD1_RECEPTION, ++ __le32_to_cpu(rssi->rsvd[0])); ++ ++ switch (reception_type) { ++ case HAL_RECEPTION_TYPE_ULOFMDA: ++ ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA; ++ break; ++ case HAL_RECEPTION_TYPE_ULMIMO: ++ ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO; ++ break; ++ default: ++ ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; ++ break; ++ } ++ + if (db2dbm) { + for (i = 0; i < ARRAY_SIZE(rssi->preamble); i++) { + ppdu_info->rssi_chain_pri20[i] = +--- a/drivers/net/wireless/ath/ath11k/hal_rx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.h +@@ -408,6 +408,15 @@ struct hal_rx_he_sig_b2_ofdma_info { + + #define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB GENMASK(15, 8) + ++#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_RSVD1_RECEPTION GENMASK(3, 0) ++ ++enum hal_rx_ul_reception_type { ++ HAL_RECEPTION_TYPE_ULOFMDA, ++ HAL_RECEPTION_TYPE_ULMIMO, ++ HAL_RECEPTION_TYPE_OTHER, ++ HAL_RECEPTION_TYPE_FRAMELESS ++}; ++ + #define HAL_RX_PHYRX_RSSI_PREAMBLE_PRI20 GENMASK(7, 0) + + struct hal_rx_phyrx_chain_rssi { diff --git a/package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch b/package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch similarity index 96% rename from package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch rename to package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch index 326db09145b342..1365bff54c1bbe 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch @@ -5,7 +5,7 @@ --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -5242,8 +5242,11 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5376,8 +5376,11 @@ int ath11k_dp_rx_process_mon_status(stru goto next_skb; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch similarity index 91% rename from package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch rename to package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch index 9be70411b10996..c9dc6912d0d185 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/907-108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c +++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c -@@ -532,6 +532,12 @@ static ssize_t ath11k_dbg_sta_dump_rx_st +@@ -524,6 +524,12 @@ static ssize_t ath11k_dbg_sta_dump_rx_st len += scnprintf(buf + len, size - len, "%10llu%s", rx_stats->byte_stats.rx_rate[i], (i + 1) % (he_rates_avail ? 12 : 8) ? "\t" : "\n"); @@ -11,11 +11,11 @@ + rx_stats->ru_alloc_cnt[3], rx_stats->ru_alloc_cnt[4], + rx_stats->ru_alloc_cnt[5]); - len += scnprintf(buf + len, size - len, - "\nDCM: %llu\nRU: 26 %llu 52: %llu 106: %llu 242: %llu 484: %llu 996: %llu\n", + len += scnprintf(buf + len, size - len, "\n"); + --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3236,11 +3236,12 @@ exit: +@@ -2893,11 +2893,12 @@ exit: static void ath11k_dp_rx_update_peer_rate_table_stats(struct ath11k_rx_peer_stats *rx_stats, struct hal_rx_mon_ppdu_info *ppdu_info, @@ -30,7 +30,7 @@ u32 bw_idx = ppdu_info->bw; u32 gi_idx = ppdu_info->gi; -@@ -3262,10 +3263,13 @@ ath11k_dp_rx_update_peer_rate_table_stat +@@ -2919,10 +2920,13 @@ ath11k_dp_rx_update_peer_rate_table_stat } rx_stats->pkt_stats.rx_rate[rate_idx] += num_msdu; @@ -46,7 +46,7 @@ struct hal_rx_mon_ppdu_info *ppdu_info) { struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; -@@ -3323,7 +3327,6 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2980,7 +2984,6 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->num_mpdu_fcs_ok += ppdu_info->num_mpdu_fcs_ok; rx_stats->num_mpdu_fcs_err += ppdu_info->num_mpdu_fcs_err; rx_stats->dcm_count += ppdu_info->dcm; @@ -54,7 +54,7 @@ BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); -@@ -3341,10 +3344,10 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2998,10 +3001,10 @@ static void ath11k_dp_rx_update_peer_sta if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11N && ppdu_info->mcs <= HAL_RX_MAX_MCS_HT) { @@ -69,7 +69,7 @@ } if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AC && -@@ -3377,7 +3380,120 @@ static void ath11k_dp_rx_update_peer_sta +@@ -3034,7 +3037,120 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->byte_stats.bw_count[ppdu_info->bw] += ppdu_info->mpdu_len; } @@ -191,7 +191,7 @@ } -@@ -5846,6 +5962,55 @@ static void ath11k_dp_rx_mon_dest_proces +@@ -5372,6 +5488,55 @@ static void ath11k_dp_rx_mon_dest_proces } } @@ -247,20 +247,19 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, struct napi_struct *napi, int budget) { -@@ -5917,10 +6082,13 @@ int ath11k_dp_rx_process_mon_status(stru - goto next_skb; - } +@@ -5445,8 +5610,13 @@ int ath11k_dp_rx_process_mon_status(stru -- if ((ppdu_info->fc_valid) && -- (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { -+ if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { - arsta = (struct ath11k_sta *)peer->sta->drv_priv; + if ((ppdu_info->fc_valid) && + (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { +- arsta = (struct ath11k_sta *)peer->sta->drv_priv; - ath11k_dp_rx_update_peer_stats(arsta, ppdu_info); -+ ath11k_dp_rx_update_peer_su_stats(arsta, ppdu_info); -+ } else if ((ppdu_info->fc_valid) && -+ (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { -+ ath11k_dp_rx_mon_process_ulofdma(ppdu_info); -+ ath11k_dp_rx_update_peer_mu_stats(ar, ppdu_info); ++ if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { ++ arsta = (struct ath11k_sta *)peer->sta->drv_priv; ++ ath11k_dp_rx_update_peer_su_stats(arsta, ppdu_info); ++ } else { ++ ath11k_dp_rx_mon_process_ulofdma(ppdu_info); ++ ath11k_dp_rx_update_peer_mu_stats(ar, ppdu_info); ++ } } if (ath11k_debugfs_is_pktlog_peer_valid(ar, peer->addr)) @@ -420,7 +419,7 @@ struct hal_rx_ppdu_start { --- a/drivers/net/wireless/ath/ath11k/peer.c +++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -94,6 +94,20 @@ struct ath11k_peer *ath11k_peer_find_by_ +@@ -93,6 +93,20 @@ struct ath11k_peer *ath11k_peer_find_by_ return NULL; } @@ -438,12 +437,12 @@ + return NULL; +} + - #ifdef CPTCFG_ATH11K_NSS_SUPPORT - struct ath11k_ast_entry *ath11k_peer_ast_find_by_peer(struct ath11k_base *ab, - struct ath11k_peer *peer, + void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id) + { + struct ath11k_peer *peer; --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -112,6 +112,7 @@ struct ath11k_peer *ath11k_peer_find(str +@@ -59,6 +59,7 @@ struct ath11k_peer *ath11k_peer_find(str struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab, const u8 *addr); struct ath11k_peer *ath11k_peer_find_by_id(struct ath11k_base *ab, int peer_id); diff --git a/package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch b/package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch similarity index 92% rename from package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch rename to package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch index 8ef3d9ba7c4d91..0dfdd6a297a7a1 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/113-ath11k-add-8023-undecap-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2163,6 +2163,42 @@ static void ath11k_dp_rx_h_undecap_eth(s +@@ -2297,6 +2297,42 @@ static void ath11k_dp_rx_h_undecap_eth(s ether_addr_copy(ieee80211_get_SA(hdr), sa); } @@ -43,7 +43,7 @@ static void ath11k_dp_rx_h_undecap(struct ath11k *ar, struct sk_buff *msdu, struct hal_rx_desc *rx_desc, enum hal_encrypt_type enctype, -@@ -2204,7 +2240,8 @@ static void ath11k_dp_rx_h_undecap(struc +@@ -2338,7 +2374,8 @@ static void ath11k_dp_rx_h_undecap(struc enctype, status); break; case DP_RX_DECAP_TYPE_8023: diff --git a/package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch rename to package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch index f1dfc0f7b9a887..9b74a712452d8b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/142-ath11k-adding-support-for-mgmt-frame-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -311,6 +311,16 @@ struct ath11k_rekey_data { +@@ -312,6 +312,16 @@ struct ath11k_rekey_data { bool enable_offload; }; @@ -17,7 +17,7 @@ struct ath11k_vif { u32 vdev_id; enum wmi_vdev_type vdev_type; -@@ -369,6 +379,8 @@ struct ath11k_vif { +@@ -370,6 +380,8 @@ struct ath11k_vif { #ifdef CPTCFG_ATH11K_DEBUGFS struct dentry *debugfs_twt; #endif /* CPTCFG_ATH11K_DEBUGFS */ @@ -39,7 +39,7 @@ + struct ath11k_vif *arvif = NULL; + struct ath11k_mgmt_frame_stats *mgmt_stats; + int len = 0, ret, i; -+ int size = (TARGET_NUM_VDEVS - 1) * 1500; ++ int size = (TARGET_NUM_VDEVS(ar->ab) - 1) * 1500; + char *buf; + const char *mgmt_frm_type[ATH11K_STATS_MGMT_FRM_TYPE_MAX-1] = {"assoc_req", "assoc_resp", + "reassoc_req", "reassoc_resp", @@ -128,7 +128,7 @@ debugfs_create_file("dfs_simulate_radar", 0200, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6148,9 +6148,9 @@ static int ath11k_mac_mgmt_tx(struct ath +@@ -6151,9 +6151,9 @@ static int ath11k_mac_mgmt_tx(struct ath */ if (is_prb_rsp && atomic_read(&ar->num_pending_mgmt_tx) > ATH11K_PRB_RSP_DROP_THRESHOLD) { @@ -140,7 +140,7 @@ } if (skb_queue_len_lockless(q) >= ATH11K_TX_MGMT_NUM_PENDING_MAX) { -@@ -6176,9 +6176,11 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6179,9 +6179,11 @@ static void ath11k_mac_op_tx(struct ieee struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_key_conf *key = info->control.hw_key; @@ -152,7 +152,7 @@ int ret; memset(skb_cb, 0, sizeof(*skb_cb)); -@@ -6192,12 +6194,21 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6195,12 +6197,21 @@ static void ath11k_mac_op_tx(struct ieee if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { skb_cb->flags |= ATH11K_SKB_HW_80211_ENCAP; } else if (ieee80211_is_mgmt(hdr->frame_control)) { @@ -188,7 +188,7 @@ arsta = ath11k_sta_to_arsta(sta); --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -10,6 +10,7 @@ +@@ -21,6 +21,7 @@ struct ppdu_user_delayba { struct ath11k_peer { struct list_head list; struct ieee80211_sta *sta; @@ -198,7 +198,7 @@ int peer_id; --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -5823,6 +5823,12 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5825,6 +5825,12 @@ static int wmi_process_mgmt_tx_comp(stru struct sk_buff *msdu; struct ieee80211_tx_info *info; struct ath11k_skb_cb *skb_cb; @@ -211,7 +211,7 @@ int num_mgmt; spin_lock_bh(&ar->txmgmt_idr_lock); -@@ -5850,6 +5856,31 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5852,6 +5858,31 @@ static int wmi_process_mgmt_tx_comp(stru info->status.ack_signal = tx_compl_param->ack_rssi; } @@ -233,7 +233,7 @@ + arvif = ath11k_vif_to_arvif(vif); + mgmt_stats = &arvif->mgmt_stats; + -+ if (!status) ++ if (!tx_compl_param->status) + mgmt_stats->tx_compl_succ[frm_type]++; + else + mgmt_stats->tx_compl_fail[frm_type]++; @@ -243,7 +243,7 @@ ieee80211_tx_status_irqsafe(ar->hw, msdu); num_mgmt = atomic_dec_if_positive(&ar->num_pending_mgmt_tx); -@@ -7519,6 +7550,11 @@ static void ath11k_mgmt_rx_event(struct +@@ -7521,6 +7552,11 @@ static void ath11k_mgmt_rx_event(struct struct ieee80211_hdr *hdr; u16 fc; struct ieee80211_supported_band *sband; @@ -255,7 +255,7 @@ if (ath11k_pull_mgmt_rx_params_tlv(ab, skb, &rx_ev) != 0) { ath11k_warn(ab, "failed to extract mgmt rx event"); -@@ -7584,7 +7620,34 @@ static void ath11k_mgmt_rx_event(struct +@@ -7586,7 +7622,34 @@ static void ath11k_mgmt_rx_event(struct hdr = (struct ieee80211_hdr *)skb->data; fc = le16_to_cpu(hdr->frame_control); diff --git a/package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch b/package/kernel/mac80211/patches/nss/ath11k/181-ath11k-remove-error-on-soc-debugfs-fail.patch similarity index 88% rename from package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch rename to package/kernel/mac80211/patches/nss/ath11k/181-ath11k-remove-error-on-soc-debugfs-fail.patch index b47785828a2bd9..ca21c0b14297b2 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/907-ath11k-remove-error-on-soc-debugfs-fail.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/181-ath11k-remove-error-on-soc-debugfs-fail.patch @@ -34,7 +34,7 @@ Signed-off-by: Anilkumar Kolli --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -2260,5 +2260,17 @@ err_sc_free: +@@ -2189,5 +2189,17 @@ err_sc_free: } EXPORT_SYMBOL(ath11k_core_alloc); @@ -54,16 +54,16 @@ Signed-off-by: Anilkumar Kolli MODULE_LICENSE("Dual BSD/GPL"); --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -15,6 +15,8 @@ +@@ -16,6 +16,8 @@ + #include "peer.h" #include "hif.h" - #include "qmi.h" +struct dentry *debugfs_ath11k; + static const char *htt_bp_umac_ring[HTT_SW_UMAC_RING_IDX_MAX] = { "REO2SW1_RING", "REO2SW2_RING", -@@ -1228,8 +1230,6 @@ int ath11k_debugfs_pdev_create(struct at +@@ -991,8 +993,6 @@ int ath11k_debugfs_pdev_create(struct at void ath11k_debugfs_pdev_destroy(struct ath11k_base *ab) { @@ -72,7 +72,7 @@ Signed-off-by: Anilkumar Kolli } int ath11k_debugfs_soc_create(struct ath11k_base *ab) -@@ -1282,6 +1282,24 @@ void ath11k_debugfs_soc_destroy(struct a +@@ -1045,6 +1045,24 @@ void ath11k_debugfs_soc_destroy(struct a } EXPORT_SYMBOL(ath11k_debugfs_soc_destroy); @@ -97,17 +97,7 @@ Signed-off-by: Anilkumar Kolli void ath11k_debugfs_fw_stats_init(struct ath11k *ar) { struct dentry *fwstats_dir = debugfs_create_dir("fw_stats", -@@ -1932,6 +1950,9 @@ void ath11k_debugfs_unregister(struct at - kfree(dbr_debug); - ar->debug.dbr_debug[i] = NULL; - } -+ -+ debugfs_remove_recursive(ar->debug.debugfs_pdev); -+ ar->debug.debugfs_pdev = NULL; - } - - static ssize_t ath11k_write_twt_add_dialog(struct file *file, -@@ -2294,6 +2315,9 @@ int ath11k_debugfs_register(struct ath11 +@@ -1675,6 +1693,9 @@ int ath11k_debugfs_register(struct ath11 char pdev_name[10]; char buf[100] = {0}; @@ -117,10 +107,20 @@ Signed-off-by: Anilkumar Kolli snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); +@@ -1752,6 +1773,9 @@ void ath11k_debugfs_unregister(struct at + kfree(dbr_debug); + ar->debug.dbr_debug[i] = NULL; + } ++ ++ debugfs_remove_recursive(ar->debug.debugfs_pdev); ++ ar->debug.debugfs_pdev = NULL; + } + + static ssize_t ath11k_write_twt_add_dialog(struct file *file, --- a/drivers/net/wireless/ath/ath11k/debugfs.h +++ b/drivers/net/wireless/ath/ath11k/debugfs.h -@@ -282,6 +282,8 @@ do { \ - #endif +@@ -263,6 +263,8 @@ struct ath11k_fw_dbglog { + }; #ifdef CPTCFG_ATH11K_DEBUGFS +int ath11k_debugfs_create(void); @@ -128,8 +128,8 @@ Signed-off-by: Anilkumar Kolli int ath11k_debugfs_soc_create(struct ath11k_base *ab); void ath11k_debugfs_soc_destroy(struct ath11k_base *ab); int ath11k_debugfs_pdev_create(struct ath11k_base *ab); -@@ -338,6 +340,15 @@ static inline int ath11k_debug_is_memory - } +@@ -314,6 +316,15 @@ void ath11k_debugfs_add_dbring_entry(str + struct hal_srng *srng); #else +static inline int ath11k_debugfs_create(void) diff --git a/package/kernel/mac80211/patches/ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch b/package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/906-ath11k-m3-ssr-dump-collection.patch rename to package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch b/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch similarity index 57% rename from package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch rename to package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch index dea5600324f536..55701c68d08760 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/191-ath11k-add-mgmt-and-data-ack-rssi.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch @@ -19,30 +19,3 @@ wmi_cfg->peer_map_unmap_v2_support = tg_cfg->peer_map_unmap_v2_support; wmi_cfg->sched_params = tg_cfg->sched_params; wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count; -@@ -5874,7 +5875,7 @@ static int wmi_process_mgmt_tx_comp(stru - arvif = ath11k_vif_to_arvif(vif); - mgmt_stats = &arvif->mgmt_stats; - -- if (!status) -+ if (!tx_compl_param->status) - mgmt_stats->tx_compl_succ[frm_type]++; - else - mgmt_stats->tx_compl_fail[frm_type]++; ---- a/drivers/net/wireless/ath/ath11k/wmi.h -+++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -4539,6 +4539,7 @@ struct wmi_pdev_bss_chan_info_event { - u32 rx_bss_cycle_count_low; - u32 rx_bss_cycle_count_high; - u32 pdev_id; -+ u32 ack_rssi; - } __packed; - - #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0 -@@ -4890,7 +4891,6 @@ struct wmi_mgmt_tx_compl_event { - u32 desc_id; - u32 status; - u32 pdev_id; -- u32 ppdu_id; - u32 ack_rssi; - } __packed; - diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch b/package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch similarity index 99% rename from package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch rename to package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch index 79f8190d5b990f..c39580e79e1a43 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-002-ath11k_nss-add-nss-driver-interface.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch @@ -48,7 +48,7 @@ Signed-off-by: Sriram R ath11k_ahb-y += ahb.o --- /dev/null +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -0,0 +1,2392 @@ +@@ -0,0 +1,2396 @@ +// SPDX-License-Identifier: BSD-3-Clause-Clear +/* + * Copyright (c) 2020 The Linux Foundation. All rights reserved. @@ -259,8 +259,9 @@ Signed-off-by: Sriram R + peer = ath11k_peer_find_by_id(ab, peer_id); + if (!peer) { + spin_unlock_bh(&ab->base_lock); -+ ath11k_warn(ab, "ath11k_nss: unable to free peer mem, peer_id:%d\n", -+ peer_id); ++ if(ab->nss.debug_mode) ++ ath11k_warn(ab, "ath11k_nss: unable to free peer mem, peer_id:%d\n", ++ peer_id); + return; + } + @@ -675,7 +676,7 @@ Signed-off-by: Sriram R + int encap_type = ath11k_dp_tx_get_encap_type(arvif, skb); + struct ath11k_soc_dp_stats *soc_stats = &ar->ab->soc_stats; + -+ if (!arvif->ar->ab->nss.debug_mode && encap_type != arvif->nss.encap) { ++ if (encap_type != arvif->nss.encap) { + ath11k_warn(ar->ab, "encap mismatch in nss tx skb encap type %d" \ + " vif encap type %d\n", encap_type, arvif->nss.encap); + goto drop; @@ -1421,7 +1422,7 @@ Signed-off-by: Sriram R + */ + ret = wait_for_completion_timeout(&peer->nss.complete, + msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); -+ if (!ret) ++ if (ab->nss.debug_mode && !ret) + ath11k_warn(ab, "timeout while waiting for nss peer delete msg response\n"); + + return 0; @@ -1764,6 +1765,8 @@ Signed-off-by: Sriram R + return ATH11K_WIFILI_TARGET_TYPE_QCA6018; + case ATH11K_HW_QCN9074_HW10: + return ATH11K_WIFILI_TARGET_TYPE_QCN9074; ++ case ATH11K_HW_IPQ5018_HW10: ++ return ATH11K_WIFILI_TARGET_TYPE_QCA5018; + default: + ath11k_warn(ab, "NSS Offload not supported for this HW\n"); + return ATH11K_WIFILI_TARGET_TYPE_UNKNOWN; @@ -1775,6 +1778,7 @@ Signed-off-by: Sriram R + switch (ab->hw_rev) { + case ATH11K_HW_IPQ8074: + case ATH11K_HW_IPQ6018_HW10: ++ case ATH11K_HW_IPQ5018_HW10: + return NSS_WIFILI_INTERNAL_INTERFACE; + case ATH11K_HW_QCN9074_HW10: + return nss_get_available_wifili_external_if(); @@ -2841,7 +2845,7 @@ Signed-off-by: Sriram R enum hal_pn_type pn_type) --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -1164,6 +1164,44 @@ int ath11k_wmi_send_pdev_set_regdomain(s +@@ -1166,6 +1166,44 @@ int ath11k_wmi_send_pdev_set_regdomain(s return ret; } @@ -2979,7 +2983,7 @@ Signed-off-by: Sriram R enum dp_rx_decap_type { DP_RX_DECAP_TYPE_RAW, DP_RX_DECAP_TYPE_NATIVE_WIFI, -@@ -56,6 +84,9 @@ void ath11k_peer_rx_tid_delete(struct at +@@ -75,6 +103,9 @@ void ath11k_peer_rx_tid_delete(struct at int ath11k_peer_rx_tid_setup(struct ath11k *ar, const u8 *peer_mac, int vdev_id, u8 tid, u32 ba_win_sz, u16 ssn, enum hal_pn_type pn_type); @@ -2991,7 +2995,7 @@ Signed-off-by: Sriram R int ath11k_dp_pdev_reo_setup(struct ath11k_base *ab); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6367,6 +6367,16 @@ static int ath11k_mac_op_start(struct ie +@@ -6370,6 +6370,16 @@ static int ath11k_mac_op_start(struct ie goto err; } @@ -3010,7 +3014,16 @@ Signed-off-by: Sriram R /* TODO: Do we need to enable ANI? */ --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -913,6 +913,7 @@ struct ath11k_base { +@@ -849,6 +849,8 @@ struct ath11k_soc_dp_tx_err_stats { + * idr unavailable etc. + */ + atomic_t misc_fail; ++ /* Tx failures due to NSS Tx error status */ ++ atomic_t nss_tx_fail; + }; + + struct ath11k_soc_dp_stats { +@@ -935,6 +937,7 @@ struct ath11k_base { struct list_head peers; wait_queue_head_t peer_mapping_wq; u8 mac_addr[ETH_ALEN]; diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch b/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch similarity index 82% rename from package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch rename to package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch index 34b30984ca76d2..2f043fd65c86b9 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-003-ath11k-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch @@ -156,15 +156,15 @@ Signed-off-by: Sriram R } --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -29,6 +29,7 @@ - #include "dbring.h" +@@ -30,6 +30,7 @@ #include "spectral.h" #include "wow.h" + #include "rx_desc.h" +#include "nss.h" #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) -@@ -381,6 +382,9 @@ struct ath11k_vif { +@@ -384,6 +385,9 @@ struct ath11k_vif { #endif /* CPTCFG_ATH11K_DEBUGFS */ struct ath11k_mgmt_frame_stats mgmt_stats; @@ -174,7 +174,7 @@ Signed-off-by: Sriram R }; struct ath11k_vif_iter { -@@ -520,6 +524,9 @@ struct ath11k_sta { +@@ -537,6 +541,9 @@ struct ath11k_sta { #endif bool use_4addr_set; @@ -184,7 +184,7 @@ Signed-off-by: Sriram R u16 tcl_metadata; /* Protected with ar->data_lock */ -@@ -610,6 +617,9 @@ struct ath11k { +@@ -632,6 +639,9 @@ struct ath11k { struct ieee80211_hw *hw; struct ieee80211_ops *ops; struct ath11k_pdev_wmi *wmi; @@ -194,15 +194,7 @@ Signed-off-by: Sriram R struct ath11k_pdev_dp dp; u8 mac_addr[ETH_ALEN]; struct ath11k_he ar_he; -@@ -827,6 +837,7 @@ struct ath11k_soc_dp_tx_err_stats { - * idr unavailable etc. - */ - atomic_t misc_fail; -+ atomic_t nss_tx_fail; - }; - - struct ath11k_soc_dp_stats { -@@ -868,9 +879,11 @@ struct ath11k_base { +@@ -892,9 +902,11 @@ struct ath11k_base { struct ath11k_htc htc; struct ath11k_dp dp; @@ -365,7 +357,7 @@ Signed-off-by: Sriram R if (ar->ab->hw_params.rxdma1_enable) { rx_ring = &dp->rxdma_mon_buf_ring; -@@ -1893,7 +1896,7 @@ static void ath11k_dp_rx_h_csum_offload( +@@ -2029,7 +2032,7 @@ static void ath11k_dp_rx_h_csum_offload( CHECKSUM_NONE : CHECKSUM_UNNECESSARY; } @@ -374,7 +366,7 @@ Signed-off-by: Sriram R enum hal_encrypt_type enctype) { switch (enctype) { -@@ -1920,7 +1923,7 @@ static int ath11k_dp_rx_crypto_mic_len(s +@@ -2056,7 +2059,7 @@ static int ath11k_dp_rx_crypto_mic_len(s return 0; } @@ -383,7 +375,7 @@ Signed-off-by: Sriram R enum hal_encrypt_type enctype) { switch (enctype) { -@@ -1948,7 +1951,7 @@ static int ath11k_dp_rx_crypto_param_len +@@ -2084,7 +2087,7 @@ static int ath11k_dp_rx_crypto_param_len return 0; } @@ -392,7 +384,56 @@ Signed-off-by: Sriram R enum hal_encrypt_type enctype) { switch (enctype) { -@@ -5239,7 +5242,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -2820,6 +2823,22 @@ static void ath11k_dp_rx_process_receive + } + } + ++void ath11k_dp_rx_from_nss(struct ath11k *ar, struct sk_buff *msdu, ++ struct napi_struct *napi) ++{ ++ struct ieee80211_rx_status rx_status = {0}; ++ struct ath11k_skb_rxcb *rxcb; ++ ++ rxcb = ATH11K_SKB_RXCB(msdu); ++ ++ ath11k_dp_rx_h_ppdu(ar, rxcb->rx_desc, &rx_status); ++ ath11k_dp_rx_h_mpdu(ar, msdu, rxcb->rx_desc, &rx_status); ++ ++ rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; ++ ++ ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_status); ++} ++ + int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, + struct napi_struct *napi, int budget) + { +@@ -3127,6 +3146,13 @@ static void ath11k_dp_rx_update_user_sta + arsta = (struct ath11k_sta *)peer->sta->drv_priv; + rx_stats = arsta->rx_stats; + ++ if (ar->ab->nss.enabled) ++ ath11k_nss_update_sta_rxrate(ppdu_info, peer, user_stats); ++ ++ /* we've updated rate stats dont update dp rx stats if not enabled */ ++ if (!ath11k_debugfs_is_extd_rx_stats_enabled(ar)) ++ return; ++ + if (!rx_stats) + return; + +@@ -3203,8 +3229,10 @@ static void ath11k_dp_rx_update_peer_mu_ + { + u32 num_users, i; + +- if (!ath11k_debugfs_is_extd_rx_stats_enabled(ar)) ++ if (!ar->ab->nss.enabled && ++ !ath11k_debugfs_is_extd_rx_stats_enabled(ar)) { + return; ++ } + + num_users = ppdu_info->num_users; + if (num_users > HAL_MAX_UL_MU_USERS) +@@ -5607,7 +5635,7 @@ int ath11k_dp_rx_process_mon_status(stru struct sk_buff *skb; struct sk_buff_head skb_list; struct ath11k_peer *peer; @@ -401,9 +442,17 @@ Signed-off-by: Sriram R int num_buffs_reaped = 0; u32 rx_buf_sz; u16 log_type; +@@ -5675,6 +5703,7 @@ int ath11k_dp_rx_process_mon_status(stru + if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { + arsta = (struct ath11k_sta *)peer->sta->drv_priv; + ath11k_dp_rx_update_peer_su_stats(arsta, ppdu_info); ++ ath11k_nss_update_sta_rxrate(ppdu_info, peer, NULL); + } else { + ath11k_dp_rx_mon_process_ulofdma(ppdu_info); + ath11k_dp_rx_update_peer_mu_stats(ar, ppdu_info); --- a/drivers/net/wireless/ath/ath11k/dp_rx.h +++ b/drivers/net/wireless/ath/ath11k/dp_rx.h -@@ -126,4 +126,16 @@ int ath11k_peer_rx_frag_setup(struct ath +@@ -145,4 +145,18 @@ int ath11k_peer_rx_frag_setup(struct ath int ath11k_dp_rx_pktlog_start(struct ath11k_base *ab); int ath11k_dp_rx_pktlog_stop(struct ath11k_base *ab, bool stop_timer); @@ -419,6 +468,8 @@ Signed-off-by: Sriram R + struct hal_rx_desc *desc); +u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab, + struct hal_rx_desc *desc); ++void ath11k_dp_rx_from_nss(struct ath11k *ar, struct sk_buff *msdu, ++ struct napi_struct *napi); #endif /* ATH11K_DP_RX_H */ --- a/drivers/net/wireless/ath/ath11k/hal.h +++ b/drivers/net/wireless/ath/ath11k/hal.h @@ -431,6 +482,21 @@ Signed-off-by: Sriram R enum hal_ring_type { HAL_REO_DST, HAL_REO_EXCEPTION, +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -938,6 +938,12 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + ppdu_info->num_mpdu_fcs_err = + FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR, + info0); ++ ++ if (ppdu_info->fc_valid) ++ ppdu_info->frame_control = ++ FIELD_GET(HAL_RX_PPDU_END_USER_STATS_INFO2_FRAME_CTRL, ++ __le32_to_cpu(eu_stats->info2)); ++ + switch (ppdu_info->preamble_type) { + case HAL_RX_PREAMBLE_11N: + ppdu_info->ht_flags = 1; --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -24,6 +24,7 @@ @@ -557,7 +623,7 @@ Signed-off-by: Sriram R exit: mutex_unlock(&ar->conf_mutex); return ret; -@@ -6216,10 +6279,14 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6219,10 +6282,14 @@ static void ath11k_mac_op_tx(struct ieee if (control->sta) arsta = ath11k_sta_to_arsta(control->sta); @@ -573,7 +639,7 @@ Signed-off-by: Sriram R } } -@@ -6241,6 +6310,8 @@ static int ath11k_mac_config_mon_status_ +@@ -6244,6 +6311,8 @@ static int ath11k_mac_config_mon_status_ if (enable) { tlv_filter = ath11k_mac_mon_status_filter_default; @@ -582,7 +648,7 @@ Signed-off-by: Sriram R if (ath11k_debugfs_rx_filter(ar)) tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); } -@@ -6539,7 +6610,7 @@ static int ath11k_mac_setup_vdev_create_ +@@ -6542,7 +6611,7 @@ static int ath11k_mac_setup_vdev_create_ return 0; } @@ -591,7 +657,7 @@ Signed-off-by: Sriram R struct ieee80211_vif *vif) { struct ath11k *ar = hw->priv; -@@ -6585,6 +6656,8 @@ static void ath11k_mac_op_update_vif_off +@@ -6588,6 +6657,8 @@ static void ath11k_mac_op_update_vif_off arvif->vdev_id, ret); vif->offload_flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED; } @@ -600,7 +666,7 @@ Signed-off-by: Sriram R } static bool ath11k_mac_vif_ap_active_any(struct ath11k_base *ab) -@@ -6715,6 +6788,8 @@ static int ath11k_mac_vdev_delete(struct +@@ -6718,6 +6789,8 @@ static int ath11k_mac_vdev_delete(struct reinit_completion(&ar->vdev_delete_done); @@ -609,7 +675,7 @@ Signed-off-by: Sriram R ret = ath11k_wmi_vdev_delete(ar, arvif->vdev_id); if (ret) { ath11k_warn(ar->ab, "failed to delete WMI vdev %d: %d\n", -@@ -6855,7 +6930,34 @@ static int ath11k_mac_op_add_interface(s +@@ -6858,7 +6931,34 @@ static int ath11k_mac_op_add_interface(s list_add(&arvif->list, &ar->arvifs); spin_unlock_bh(&ar->data_lock); @@ -645,7 +711,7 @@ Signed-off-by: Sriram R nss = get_num_chains(ar->cfg_tx_chainmask) ? : 1; ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, -@@ -6979,6 +7081,7 @@ err_peer_del: +@@ -6982,6 +7082,7 @@ err_peer_del: } err_vdev_del: @@ -653,7 +719,7 @@ Signed-off-by: Sriram R ath11k_mac_vdev_delete(ar, arvif); spin_lock_bh(&ar->data_lock); list_del(&arvif->list); -@@ -7489,6 +7592,10 @@ ath11k_mac_update_vif_chan(struct ath11k +@@ -7492,6 +7593,10 @@ ath11k_mac_update_vif_chan(struct ath11k arvif->vdev_id, ret); continue; } @@ -664,7 +730,7 @@ Signed-off-by: Sriram R } /* Restart the internal monitor vdev on new channel */ -@@ -8717,6 +8824,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8720,6 +8825,8 @@ static void ath11k_mac_op_sta_statistics sinfo->signal_avg = ewma_avg_rssi_read(&arsta->avg_rssi) + ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); @@ -673,7 +739,7 @@ Signed-off-by: Sriram R } #if IS_ENABLED(CONFIG_IPV6) -@@ -9136,6 +9245,7 @@ static const struct ieee80211_ops ath11k +@@ -9139,6 +9246,7 @@ static const struct ieee80211_ops ath11k .update_vif_offload = ath11k_mac_op_update_vif_offload, .config = ath11k_mac_op_config, .bss_info_changed = ath11k_mac_op_bss_info_changed, @@ -681,7 +747,7 @@ Signed-off-by: Sriram R .configure_filter = ath11k_mac_op_configure_filter, .hw_scan = ath11k_mac_op_hw_scan, .cancel_hw_scan = ath11k_mac_op_cancel_hw_scan, -@@ -9521,7 +9631,8 @@ static int __ath11k_mac_register(struct +@@ -9524,7 +9632,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW); ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER); ieee80211_hw_set(ar->hw, SUPPORTS_AMSDU_IN_AMPDU); @@ -691,7 +757,7 @@ Signed-off-by: Sriram R } ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; -@@ -9636,6 +9747,9 @@ static int __ath11k_mac_register(struct +@@ -9637,6 +9746,9 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; @@ -711,7 +777,7 @@ Signed-off-by: Sriram R static struct ath11k_peer *ath11k_peer_find_list_by_id(struct ath11k_base *ab, int peer_id) -@@ -136,6 +137,8 @@ void ath11k_peer_map_event(struct ath11k +@@ -150,6 +151,8 @@ void ath11k_peer_map_event(struct ath11k ether_addr_copy(peer->addr, mac_addr); list_add(&peer->list, &ab->peers); wake_up(&ab->peer_mapping_wq); @@ -720,7 +786,7 @@ Signed-off-by: Sriram R } ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "peer map vdev %d peer %pM id %d\n", -@@ -298,17 +301,13 @@ static int __ath11k_peer_delete(struct a +@@ -312,17 +315,13 @@ static int __ath11k_peer_delete(struct a lockdep_assert_held(&ar->conf_mutex); @@ -741,7 +807,7 @@ Signed-off-by: Sriram R /* Fallback to peer list search if the correct peer can't be found. * Skip the deletion of the peer from the rhash since it has already -@@ -327,10 +326,17 @@ static int __ath11k_peer_delete(struct a +@@ -341,10 +340,17 @@ static int __ath11k_peer_delete(struct a return -EINVAL; } @@ -760,17 +826,9 @@ Signed-off-by: Sriram R ret = ath11k_wmi_send_peer_delete_cmd(ar, addr, vdev_id); if (ret) { -@@ -446,6 +452,7 @@ int ath11k_peer_create(struct ath11k *ar - peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; - peer->vif = arvif->vif; - -+ - if (sta) { - arsta = ath11k_sta_to_arsta(sta); - arsta->tcl_metadata |= FIELD_PREP(HTT_TCL_META_DATA_TYPE, 0) | --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -17,6 +17,7 @@ struct ath11k_peer { +@@ -28,6 +28,7 @@ struct ath11k_peer { u16 ast_hash; u8 pdev_idx; u16 hw_peer_id; @@ -801,9 +859,9 @@ Signed-off-by: Sriram R #include "hif.h" +#include "qmi.h" - static const char *htt_bp_umac_ring[HTT_SW_UMAC_RING_IDX_MAX] = { - "REO2SW1_RING", -@@ -663,6 +662,7 @@ static ssize_t ath11k_write_extd_rx_stat + struct dentry *debugfs_ath11k; + +@@ -665,6 +664,7 @@ static ssize_t ath11k_write_extd_rx_stat HTT_RX_FP_DATA_FILTER_FLASG3; } else { tlv_filter = ath11k_mac_mon_status_filter_default; @@ -811,90 +869,18 @@ Signed-off-by: Sriram R } ar->debug.rx_filter = tlv_filter.rx_filter; -@@ -1669,72 +1669,6 @@ static const struct file_operations fops - .open = simple_open - }; - --int ath11k_debugfs_register(struct ath11k *ar) --{ -- struct ath11k_base *ab = ar->ab; -- char pdev_name[10]; -- char buf[100] = {0}; -- -- snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); -- -- ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); -- if (IS_ERR(ar->debug.debugfs_pdev)) -- return PTR_ERR(ar->debug.debugfs_pdev); -- -- /* Create a symlink under ieee80211/phy* */ -- snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); -- debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); -- -- ath11k_debugfs_htt_stats_init(ar); -- -- ath11k_debugfs_fw_stats_init(ar); -- -- debugfs_create_file("ext_tx_stats", 0644, -- ar->debug.debugfs_pdev, ar, -- &fops_extd_tx_stats); -- debugfs_create_file("ext_rx_stats", 0644, -- ar->debug.debugfs_pdev, ar, -- &fops_extd_rx_stats); -- debugfs_create_file("pktlog_filter", 0644, -- ar->debug.debugfs_pdev, ar, -- &fops_pktlog_filter); -- debugfs_create_file("fw_dbglog_config", 0600, -- ar->debug.debugfs_pdev, ar, -- &fops_fw_dbglog); -- debugfs_create_file("dump_mgmt_stats", 0644, -- ar->debug.debugfs_pdev, ar, -- &fops_dump_mgmt_stats); -- -- if (ar->hw->wiphy->bands[NL80211_BAND_5GHZ]) { -- debugfs_create_file("dfs_simulate_radar", 0200, -- ar->debug.debugfs_pdev, ar, -- &fops_simulate_radar); -- debugfs_create_bool("dfs_block_radar_events", 0200, -- ar->debug.debugfs_pdev, -- &ar->dfs_block_radar_events); -- } -- -- if (ab->hw_params.dbr_debug_support) -- debugfs_create_file("enable_dbr_debug", 0200, ar->debug.debugfs_pdev, -- ar, &fops_dbr_debug); -- -- debugfs_create_file("ps_state_enable", 0600, ar->debug.debugfs_pdev, ar, -- &fops_ps_state_enable); -- -- if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT, -- ar->ab->wmi_ab.svc_map)) { -- debugfs_create_file("ps_timekeeper_enable", 0600, -- ar->debug.debugfs_pdev, ar, -- &fops_ps_timekeeper_enable); -- -- debugfs_create_file("reset_ps_duration", 0200, -- ar->debug.debugfs_pdev, ar, -- &fops_reset_ps_duration); -- } -- -- return 0; --} -- - void ath11k_debugfs_unregister(struct ath11k *ar) - { - struct ath11k_debug_dbr *dbr_debug; -@@ -1977,6 +1911,144 @@ static const struct file_operations ath1 +@@ -1687,6 +1687,76 @@ static const struct file_operations fops .open = simple_open }; ++ +static ssize_t ath11k_write_nss_stats(struct file *file, + const char __user *ubuf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar = file->private_data; + struct ath11k_base *ab = ar->ab; -+ u32 nss_stats; ++ u8 nss_stats; + int ret; + + if (!ab->nss.enabled) { @@ -902,7 +888,7 @@ Signed-off-by: Sriram R + return -EINVAL; + } + -+ if (kstrtouint_from_user(ubuf, count, 0, &nss_stats)) ++ if (kstrtou8_from_user(ubuf, count, 0, &nss_stats)) + return -EINVAL; + + mutex_lock(&ar->conf_mutex); @@ -957,78 +943,21 @@ Signed-off-by: Sriram R + .llseek = default_llseek, +}; + -+int ath11k_debugfs_register(struct ath11k *ar) -+{ -+ struct ath11k_base *ab = ar->ab; -+ char pdev_name[10]; -+ char buf[100] = {0}; -+ -+ snprintf(pdev_name, sizeof(pdev_name), "%s%u", "mac", ar->pdev_idx); -+ -+ ar->debug.debugfs_pdev = debugfs_create_dir(pdev_name, ab->debugfs_soc); -+ if (IS_ERR(ar->debug.debugfs_pdev)) -+ return PTR_ERR(ar->debug.debugfs_pdev); -+ -+ /* Create a symlink under ieee80211/phy* */ -+ snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); -+ debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); -+ -+ ath11k_debugfs_htt_stats_init(ar); -+ -+ ath11k_debugfs_fw_stats_init(ar); -+ -+ debugfs_create_file("ext_tx_stats", 0644, -+ ar->debug.debugfs_pdev, ar, -+ &fops_extd_tx_stats); -+ debugfs_create_file("ext_rx_stats", 0644, -+ ar->debug.debugfs_pdev, ar, -+ &fops_extd_rx_stats); -+ debugfs_create_file("pktlog_filter", 0644, -+ ar->debug.debugfs_pdev, ar, -+ &fops_pktlog_filter); -+ debugfs_create_file("fw_dbglog_config", 0600, -+ ar->debug.debugfs_pdev, ar, -+ &fops_fw_dbglog); -+ debugfs_create_file("dump_mgmt_stats", 0644, -+ ar->debug.debugfs_pdev, ar, -+ &fops_dump_mgmt_stats); -+ -+ if (ar->hw->wiphy->bands[NL80211_BAND_5GHZ]) { -+ debugfs_create_file("dfs_simulate_radar", 0200, -+ ar->debug.debugfs_pdev, ar, -+ &fops_simulate_radar); -+ debugfs_create_bool("dfs_block_radar_events", 0200, -+ ar->debug.debugfs_pdev, -+ &ar->dfs_block_radar_events); -+ } -+ -+ if (ab->hw_params.dbr_debug_support) -+ debugfs_create_file("enable_dbr_debug", 0200, ar->debug.debugfs_pdev, -+ ar, &fops_dbr_debug); -+ -+ debugfs_create_file("ps_state_enable", 0600, ar->debug.debugfs_pdev, ar, -+ &fops_ps_state_enable); -+ -+ if (test_bit(WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT, -+ ar->ab->wmi_ab.svc_map)) { -+ debugfs_create_file("ps_timekeeper_enable", 0600, -+ ar->debug.debugfs_pdev, ar, -+ &fops_ps_timekeeper_enable); -+ -+ debugfs_create_file("reset_ps_duration", 0200, -+ ar->debug.debugfs_pdev, ar, -+ &fops_reset_ps_duration); -+ } -+ + int ath11k_debugfs_register(struct ath11k *ar) + { + struct ath11k_base *ab = ar->ab; +@@ -1753,6 +1823,11 @@ int ath11k_debugfs_register(struct ath11 + &fops_reset_ps_duration); + } + + if (ab->nss.enabled) + debugfs_create_file("nss_peer_stats_config", 0644, -+ ar->debug.debugfs_pdev, ar, &fops_nss_stats); ++ ar->debug.debugfs_pdev, ar, ++ &fops_nss_stats); + -+ return 0; -+} - void ath11k_debugfs_add_interface(struct ath11k_vif *arvif) - { - struct ath11k_base *ab = arvif->ar->ab; + return 0; + } + --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c @@ -12,7 +12,7 @@ @@ -1062,7 +991,7 @@ Signed-off-by: Sriram R #include "hif.h" #include "wmi.h" #include "../../../../../net/mac80211/sta_info.h" -@@ -465,7 +467,7 @@ deliver_amsdu: +@@ -466,7 +468,7 @@ deliver_amsdu: /* create list containing all the subframes */ ieee80211_amsdu_to_8023s(skb, &subframe_list, NULL, @@ -1071,7 +1000,7 @@ Signed-off-by: Sriram R /* This shouldn't happen, indicating error during defragmentation */ if (skb_queue_empty(&subframe_list)) -@@ -657,12 +659,14 @@ drop: +@@ -658,12 +660,14 @@ drop: return -EINVAL; } @@ -1087,7 +1016,7 @@ Signed-off-by: Sriram R if (!ar->ab->nss.enabled) return 0; -@@ -675,6 +679,22 @@ int ath11k_nss_vdev_set_cmd(struct ath11 +@@ -676,6 +680,22 @@ int ath11k_nss_vdev_set_cmd(struct ath11 if (!vdev_msg) return -ENOMEM; @@ -1110,7 +1039,7 @@ Signed-off-by: Sriram R /* TODO: Convert to function for conversion in case of many * such commands */ -@@ -1136,7 +1156,6 @@ void ath11k_nss_update_sta_stats(struct +@@ -1137,7 +1157,6 @@ void ath11k_nss_update_sta_stats(struct { struct sta_info *stainfo; struct ath11k_peer *peer; @@ -1118,7 +1047,7 @@ Signed-off-by: Sriram R struct ath11k *ar = arsta->arvif->ar; struct ath11k_base *ab = ar->ab; -@@ -1230,6 +1249,9 @@ void ath11k_nss_update_sta_rxrate(struct +@@ -1231,6 +1250,9 @@ void ath11k_nss_update_sta_rxrate(struct if (!ab->nss.enabled) return; @@ -1128,7 +1057,7 @@ Signed-off-by: Sriram R if (!peer->nss.nss_stats) return; -@@ -1289,7 +1311,7 @@ void ath11k_nss_update_sta_rxrate(struct +@@ -1290,7 +1312,7 @@ void ath11k_nss_update_sta_rxrate(struct peer->nss.nss_stats->rxrate.mcs = mcs; peer->nss.nss_stats->rxrate.flags = RATE_INFO_FLAGS_HE_MCS; peer->nss.nss_stats->rxrate.he_dcm = ppdu_info->dcm; diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch similarity index 99% rename from package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch rename to package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch index a937ffba79961c..d90c39c77c9a4f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Add-support-for-dynamic-vlan.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -21,7 +21,7 @@ Signed-off-by: Seevalamuthu Mariappan --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -116,6 +116,7 @@ struct ath11k_skb_cb { +@@ -117,6 +117,7 @@ struct ath11k_skb_cb { u32 cipher; struct ath11k *ar; struct ieee80211_vif *vif; @@ -369,7 +369,7 @@ Signed-off-by: Seevalamuthu Mariappan int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9764,6 +9764,9 @@ static int __ath11k_mac_register(struct +@@ -9763,6 +9763,9 @@ static int __ath11k_mac_register(struct */ ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch similarity index 70% rename from package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch rename to package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch index 4d7af8641311dc..d18b213cf27607 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/207-ath11k-Enable-256_512MB-profiles.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch @@ -45,34 +45,21 @@ Signed-off-by: Ramya Gnanasekar depends on m --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -11,11 +11,43 @@ +@@ -11,11 +11,29 @@ #include "wmi.h" /* Target configuration defines */ -+#if defined(CPTCFG_ATH11K_MEM_PROFILE_256M) -+#define TARGET_NUM_VDEVS(ab) 8 -+#define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) -+/* Max num of stations (per radio) */ -+#define TARGET_NUM_STATIONS(ab) 128 -+#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_256M -+#define ATH11K_DP_TX_COMP_RING_SIZE 2048 -+#define ATH11K_DP_RXDMA_BUF_RING_SIZE 1024 -+#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 -+#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 -+#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 -+ -+#elif defined(CPTCFG_ATH11K_MEM_PROFILE_512M) ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + +#define TARGET_NUM_VDEVS(ab) 8 +#define TARGET_NUM_PEERS_PDEV(ab) (128 + TARGET_NUM_VDEVS(ab)) +/* Max num of stations (per radio) */ +#define TARGET_NUM_STATIONS(ab) 128 +#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_512M +#define ATH11K_DP_TX_COMP_RING_SIZE 8192 -+#define ATH11K_DP_RXDMA_BUF_RING_SIZE 4096 +#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 +#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 +#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 - +#else /* Num VDEVS per radio */ -#define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs) @@ -84,7 +71,6 @@ Signed-off-by: Ramya Gnanasekar +#define TARGET_NUM_STATIONS(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_peers) +#define ATH11K_QMI_TARGET_MEM_MODE ATH11K_QMI_TARGET_MEM_MODE_DEFAULT +#define ATH11K_DP_TX_COMP_RING_SIZE 32768 -+#define ATH11K_DP_RXDMA_BUF_RING_SIZE 4096 +#define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 +#define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 +#define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 @@ -92,7 +78,7 @@ Signed-off-by: Ramya Gnanasekar /* Num of peers for Single Radio mode */ #define TARGET_NUM_PEERS_SINGLE(ab) (TARGET_NUM_PEERS_PDEV(ab)) -@@ -26,9 +58,6 @@ +@@ -26,9 +44,6 @@ /* Num of peers for DBS_SBS */ #define TARGET_NUM_PEERS_DBS_SBS(ab) (3 * TARGET_NUM_PEERS_PDEV(ab)) @@ -102,7 +88,7 @@ Signed-off-by: Ramya Gnanasekar #define TARGET_NUM_PEERS(ab, x) TARGET_NUM_PEERS_##x(ab) #define TARGET_NUM_PEER_KEYS 2 #define TARGET_NUM_TIDS(ab, x) (2 * TARGET_NUM_PEERS(ab, x) + \ -@@ -226,6 +255,7 @@ struct ath11k_hw_params { +@@ -226,6 +241,7 @@ struct ath11k_hw_params { u32 tx_ring_size; bool smp2p_wow_exit; bool support_fw_mac_sequence; @@ -125,17 +111,18 @@ Signed-off-by: Ramya Gnanasekar #define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035 #define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037 #define QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01 0x003E -@@ -519,4 +525,10 @@ int ath11k_qmi_init_service(struct ath11 - void ath11k_qmi_free_resource(struct ath11k_base *ab); - int ath11k_qmi_fwreset_from_cold_boot(struct ath11k_base *ab); +@@ -42,6 +48,11 @@ + #define ATH11K_QMI_DEVICE_BAR_SIZE 0x200000 + struct ath11k_base; +enum ath11k_target_mem_mode { -+ ATH11K_QMI_TARGET_MEM_MODE_DEFAULT = 0, -+ ATH11K_QMI_TARGET_MEM_MODE_512M, -+ ATH11K_QMI_TARGET_MEM_MODE_256M, ++ ATH11K_QMI_TARGET_MEM_MODE_DEFAULT = 0, ++ ATH11K_QMI_TARGET_MEM_MODE_512M, ++ ATH11K_QMI_TARGET_MEM_MODE_256M, +}; -+ - #endif + + enum ath11k_qmi_file_type { + ATH11K_QMI_FILE_TYPE_BDF_GOLDEN, --- a/local-symbols +++ b/local-symbols @@ -171,6 +171,8 @@ ATH11K= @@ -149,28 +136,27 @@ Signed-off-by: Ramya Gnanasekar ATH11K_TRACING= --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -863,6 +863,11 @@ struct ath11k_msi_config { +@@ -887,6 +887,11 @@ struct ath11k_msi_config { u16 hw_rev; }; +struct ath11k_num_vdevs_peers { -+ u32 num_vdevs; -+ u32 num_peers; ++ u32 num_vdevs; ++ u32 num_peers; +}; + /* Master structure to hold the hw data which may be used in core module */ struct ath11k_base { enum ath11k_hw_rev hw_rev; -@@ -1016,6 +1021,9 @@ struct ath11k_base { - } testmode; - #endif +@@ -1032,6 +1037,8 @@ struct ath11k_base { + const struct ath11k_pci_ops *ops; + } pci; + atomic_t num_max_allowed; -+ struct ath11k_num_vdevs_peers *num_vdevs_peers; + - /* must be last */ - u8 drv_priv[] __aligned(sizeof(void *)); - }; + #ifdef CPTCFG_NL80211_TESTMODE + struct { + u32 data_pos; --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h @@ -206,8 +206,9 @@ struct ath11k_pdev_dp { @@ -180,7 +166,7 @@ Signed-off-by: Ramya Gnanasekar -#define DP_TX_COMP_RING_SIZE 32768 +#define DP_TX_COMP_RING_SIZE ATH11K_DP_TX_COMP_RING_SIZE #define DP_TX_IDR_SIZE DP_TX_COMP_RING_SIZE -+#define DP_TX_COMP_MAX_ALLOWED DP_TX_COMP_RING_SIZE ++#define DP_TX_COMP_MAX_ALLOWED DP_TX_COMP_RING_SIZE #define DP_TCL_CMD_RING_SIZE 32 #define DP_TCL_STATUS_RING_SIZE 32 #define DP_REO_DST_RING_MAX 4 @@ -199,7 +185,7 @@ Signed-off-by: Ramya Gnanasekar #define DP_RX_RELEASE_RING_NUM 3 --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -265,6 +265,7 @@ tcl_ring_sel: +@@ -334,6 +334,7 @@ tcl_ring_sel: skb->data, skb->len); atomic_inc(&ar->dp.num_tx_pending); @@ -207,7 +193,7 @@ Signed-off-by: Ramya Gnanasekar return 0; -@@ -309,6 +310,7 @@ static void ath11k_dp_tx_free_txbuf(stru +@@ -380,6 +381,7 @@ static void ath11k_dp_tx_free_txbuf(stru ar = ab->pdevs[mac_id].ar; if (atomic_dec_and_test(&ar->dp.num_tx_pending)) wake_up(&ar->dp.tx_empty_waitq); @@ -215,7 +201,7 @@ Signed-off-by: Ramya Gnanasekar } static void -@@ -342,6 +344,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct +@@ -411,6 +413,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct if (atomic_dec_and_test(&ar->dp.num_tx_pending)) wake_up(&ar->dp.tx_empty_waitq); @@ -223,7 +209,7 @@ Signed-off-by: Ramya Gnanasekar dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); -@@ -769,6 +772,7 @@ void ath11k_dp_tx_completion_handler(str +@@ -825,6 +828,7 @@ void ath11k_dp_tx_completion_handler(str wake_up(&ar->dp.tx_empty_waitq); ath11k_dp_tx_complete_msdu(ar, msdu, &ts); @@ -233,23 +219,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - - #include "core.h" - #include "dp_tx.h" -@@ -16,6 +17,7 @@ - #include "debug.h" - #include "hif.h" - #include "wow.h" -+#include "ahb.h" - - unsigned int nss_offload; - #ifdef CPTCFG_ATH11K_NSS_SUPPORT -@@ -42,6 +44,8 @@ bool ath11k_ftm_mode; +@@ -42,6 +42,8 @@ bool ath11k_ftm_mode; module_param_named(ftm_mode, ath11k_ftm_mode, bool, 0444); MODULE_PARM_DESC(ftm_mode, "Boots up in factory test mode"); @@ -258,7 +228,7 @@ Signed-off-by: Ramya Gnanasekar static struct ath11k_hw_params ath11k_hw_params[] = { { .hw_rev = ATH11K_HW_IPQ8074, -@@ -95,15 +99,15 @@ static struct ath11k_hw_params ath11k_hw +@@ -95,7 +97,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = true, @@ -267,26 +237,15 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, - .hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074), -+ .reo_dest_ring_map_shift = HAL_REO_DEST_RING_CTRL_HASH_RING_SHIFT, - .supports_regdb = false, - .fix_l1ss = true, - .credit_flow = false, -- .max_tx_ring = DP_TCL_NUM_RING_MAX, - .hal_params = &ath11k_hw_hal_params_ipq8074, - .supports_dynamic_smps_6ghz = false, - .alloc_cacheable_memory = true, -@@ -127,6 +131,9 @@ static struct ath11k_hw_params ath11k_hw +@@ -127,6 +129,7 @@ static struct ath11k_hw_params ath11k_hw .tcl_ring_retry = true, .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, -+ /* In addition to TCL ring use TCL_CMD ring also for tx */ -+ .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, + .num_vdevs_peers = ath11k_vdevs_peers, }, { .hw_rev = ATH11K_HW_IPQ6018_HW10, -@@ -177,7 +183,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -177,7 +180,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, .cbcal_restart_fw = true, @@ -295,7 +254,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -259,7 +265,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -259,7 +262,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -304,7 +263,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -426,7 +432,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -426,7 +429,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -313,7 +272,15 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -509,7 +515,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -462,6 +465,7 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = true, ++ .num_vdevs_peers = ath11k_vdevs_peers, + }, + { + .name = "wcn6855 hw2.1", +@@ -509,7 +513,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -322,7 +289,15 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -593,7 +599,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -545,6 +549,7 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = true, ++ .num_vdevs_peers = ath11k_vdevs_peers, + }, + { + .name = "wcn6750 hw1.0", +@@ -593,7 +598,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, .cbcal_restart_fw = false, @@ -331,7 +306,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -672,7 +678,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -672,7 +677,7 @@ static struct ath11k_hw_params ath11k_hw .supports_monitor = false, .supports_sta_ps = false, .supports_shadow_regs = false, @@ -340,11 +315,14 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_regdb = false, -@@ -710,7 +716,23 @@ static struct ath11k_hw_params ath11k_hw - }, - }; - --static inline struct ath11k_pdev *ath11k_core_get_single_pdev(struct ath11k_base *ab) +@@ -707,6 +712,22 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = false, ++ .num_vdevs_peers = ath11k_vdevs_peers, ++ }, ++}; ++ +static const struct ath11k_num_vdevs_peers ath11k_vdevs_peers[] = { + { + .num_vdevs = (16 + 1), @@ -357,22 +335,6 @@ Signed-off-by: Ramya Gnanasekar + { + .num_vdevs = 8, + .num_peers = 128, -+ }, -+}; -+ -+static inline struct ath11k_pdev * -+ath11k_core_get_single_pdev(struct ath11k_base *ab) - { - WARN_ON(!ab->hw_params.single_pdev_only); + }, + }; ---- a/drivers/net/wireless/ath/ath11k/debugfs.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1595,7 +1595,7 @@ static ssize_t ath11k_dump_mgmt_stats(st - struct ath11k_vif *arvif = NULL; - struct ath11k_mgmt_frame_stats *mgmt_stats; - int len = 0, ret, i; -- int size = (TARGET_NUM_VDEVS - 1) * 1500; -+ int size = (TARGET_NUM_VDEVS(ab) - 1) * 1500; - char *buf; - const char *mgmt_frm_type[ATH11K_STATS_MGMT_FRM_TYPE_MAX-1] = {"assoc_req", "assoc_resp", - "reassoc_req", "reassoc_resp", diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch b/package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch similarity index 96% rename from package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch rename to package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch index 47146c459e796e..0d2de0ae895d6f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch @@ -13,9 +13,9 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -348,6 +348,22 @@ void ath11k_nss_wifili_event_receive(str - ath11k_nss_wifili_link_desc_return(ab, - (void *)&msg->msg.linkdescinfomsg); +@@ -306,6 +306,22 @@ void ath11k_nss_wifili_event_receive(str + case NSS_WIFILI_TID_REOQ_SETUP_MSG: + /* TODO setup tidq */ break; + case NSS_WIFILI_WDS_PEER_ADD_MSG: + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer add event received %d response %d error %d\n", @@ -36,7 +36,7 @@ Signed-off-by: Sathishkumar Muruganandam default: ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); break; -@@ -458,13 +476,6 @@ static void ath11k_nss_vdev_event_receiv +@@ -416,13 +432,6 @@ static void ath11k_nss_vdev_event_receiv /*TODO*/ } @@ -50,7 +50,7 @@ Signed-off-by: Sathishkumar Muruganandam /* TODO: move to mac80211 after cleanups/refactoring required after feature completion */ static int ath11k_nss_deliver_rx(struct ieee80211_vif *vif, struct sk_buff *skb, bool eth, int data_offs, struct napi_struct *napi) -@@ -588,11 +599,239 @@ static int ath11k_nss_undecap_nwifi(stru +@@ -546,11 +555,239 @@ static int ath11k_nss_undecap_nwifi(stru return 0; } @@ -291,7 +291,7 @@ Signed-off-by: Sathishkumar Muruganandam struct wireless_dev *wdev = NULL; struct ieee80211_vif *vif = NULL; struct ath11k_vif *arvif; -@@ -632,28 +871,16 @@ ath11k_nss_vdev_data_receive(struct net_ +@@ -590,28 +827,16 @@ ath11k_nss_vdev_data_receive(struct net_ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss: ", skb->data, skb->len); @@ -327,7 +327,7 @@ Signed-off-by: Sathishkumar Muruganandam dev_kfree_skb_any(skb); return; } -@@ -1362,7 +1589,7 @@ void ath11k_nss_update_sta_rxrate(struct +@@ -1320,7 +1545,7 @@ void ath11k_nss_update_sta_rxrate(struct peer->nss.nss_stats->rxrate.bw = ath11k_mac_bw_to_mac80211_bw(ppdu_info->bw); } @@ -336,7 +336,7 @@ Signed-off-by: Sathishkumar Muruganandam { struct nss_wifili_peer_msg *peer_msg; struct nss_wifili_msg *wlmsg = NULL; -@@ -1376,9 +1603,10 @@ int ath11k_nss_peer_delete(struct ath11k +@@ -1334,9 +1559,10 @@ int ath11k_nss_peer_delete(struct ath11k spin_lock_bh(&ab->base_lock); @@ -349,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam spin_unlock_bh(&ab->base_lock); return -EINVAL; } -@@ -1451,8 +1679,9 @@ free_peer: +@@ -1409,8 +1635,9 @@ free_peer: return ret; } @@ -360,7 +360,7 @@ Signed-off-by: Sathishkumar Muruganandam struct nss_wifili_peer_msg *peer_msg; struct nss_wifili_msg *wlmsg = NULL; nss_wifili_msg_callback_t msg_cb; -@@ -1509,17 +1738,23 @@ int ath11k_nss_peer_create(struct ath11k +@@ -1467,17 +1694,23 @@ int ath11k_nss_peer_create(struct ath11k status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); if (status != NSS_TX_SUCCESS) { ret = -EINVAL; @@ -387,7 +387,7 @@ Signed-off-by: Sathishkumar Muruganandam peer->nss.nss_stats = kzalloc(sizeof(*peer->nss.nss_stats), GFP_ATOMIC); if (!peer->nss.nss_stats) { ret = -ENOMEM; -@@ -1538,6 +1773,199 @@ msg_free: +@@ -1496,6 +1729,199 @@ msg_free: return ret; } @@ -587,7 +587,7 @@ Signed-off-by: Sathishkumar Muruganandam /*-------------------------------INIT/DEINIT---------------------------------*/ static int ath11k_nss_radio_buf_cfg(struct ath11k *ar, int range, int buf_sz) -@@ -1931,7 +2359,7 @@ static int ath11k_nss_init(struct ath11k +@@ -1886,7 +2312,7 @@ static int ath11k_nss_init(struct ath11k status = nss_wifili_tx_msg(nss_contex, wlmsg); if (status != NSS_TX_SUCCESS) { @@ -596,7 +596,7 @@ Signed-off-by: Sathishkumar Muruganandam goto unregister; } -@@ -1985,7 +2413,8 @@ static int ath11k_nss_stats_cfg(struct a +@@ -1940,7 +2366,8 @@ static int ath11k_nss_stats_cfg(struct a status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); if (status != NSS_TX_SUCCESS) { @@ -624,7 +624,7 @@ Signed-off-by: Sathishkumar Muruganandam /* WIFILI Supported Target Types */ #define ATH11K_WIFILI_TARGET_TYPE_UNKNOWN 0xFF -@@ -208,11 +210,19 @@ int ath11k_nss_vdev_create(struct ath11k +@@ -205,11 +207,19 @@ int ath11k_nss_vdev_create(struct ath11k void ath11k_nss_vdev_delete(struct ath11k_vif *arvif); int ath11k_nss_vdev_up(struct ath11k_vif *arvif); int ath11k_nss_vdev_down(struct ath11k_vif *arvif); @@ -646,7 +646,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, struct ieee80211_key_conf *key_conf); void ath11k_nss_update_sta_stats(struct station_info *sinfo, -@@ -274,12 +284,37 @@ static inline int ath11k_nss_vdev_down(s +@@ -271,12 +281,37 @@ static inline int ath11k_nss_vdev_down(s return 0; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch b/package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch rename to package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch index 0e6c0d92d2abde..016ace4edd7501 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch @@ -26,7 +26,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -634,6 +634,7 @@ struct ath11k { +@@ -642,6 +642,7 @@ struct ath11k { struct ath11k_pdev_wmi *wmi; #ifdef CPTCFG_ATH11K_NSS_SUPPORT struct ath11k_nss nss; @@ -34,18 +34,19 @@ Signed-off-by: Sathishkumar Muruganandam #endif struct ath11k_pdev_dp dp; u8 mac_addr[ETH_ALEN]; -@@ -1042,6 +1043,8 @@ struct ath11k_base { - u32 rx_hash; - bool stats_disable; +@@ -1042,6 +1043,9 @@ struct ath11k_base { + } testmode; + #endif + u32 max_ast_index; + u32 num_ast_entries; ++ /* must be last */ u8 drv_priv[] __aligned(sizeof(void *)); }; --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1142,13 +1142,16 @@ struct htt_t2h_peer_map_event { +@@ -1105,13 +1105,16 @@ struct htt_t2h_peer_map_event { #define HTT_T2H_PEER_UNMAP_INFO_PEER_ID HTT_T2H_PEER_MAP_INFO_PEER_ID #define HTT_T2H_PEER_UNMAP_INFO1_MAC_ADDR_H16 \ HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16 @@ -66,7 +67,7 @@ Signed-off-by: Sathishkumar Muruganandam struct htt_resp_msg { --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1756,6 +1756,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -1849,6 +1849,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s u16 peer_mac_h16; u16 ast_hash; u16 hw_peer_id; @@ -75,7 +76,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "dp_htt rx msg type :0x%0x\n", type); -@@ -1791,15 +1793,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -1884,15 +1886,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s resp->peer_map_ev.info2); hw_peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID, resp->peer_map_ev.info1); @@ -110,7 +111,7 @@ Signed-off-by: Sathishkumar Muruganandam break; --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -431,7 +431,7 @@ ath11k_dp_tx_process_htt_tx_complete(str +@@ -495,7 +495,7 @@ ath11k_dp_tx_process_htt_tx_complete(str break; case HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY: /* This event is to be handled only when the driver decides to @@ -121,7 +122,7 @@ Signed-off-by: Sathishkumar Muruganandam default: --- a/drivers/net/wireless/ath/ath11k/peer.c +++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -94,6 +94,287 @@ struct ath11k_peer *ath11k_peer_find_by_ +@@ -108,6 +108,287 @@ struct ath11k_peer *ath11k_peer_find_by_ return NULL; } @@ -409,7 +410,7 @@ Signed-off-by: Sathishkumar Muruganandam void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id) { struct ath11k_peer *peer; -@@ -118,11 +399,67 @@ exit: +@@ -132,11 +413,67 @@ exit: spin_unlock_bh(&ab->base_lock); } @@ -477,7 +478,7 @@ Signed-off-by: Sathishkumar Muruganandam spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find(ab, vdev_id, mac_addr); if (!peer) { -@@ -137,8 +474,8 @@ void ath11k_peer_map_event(struct ath11k +@@ -151,8 +488,8 @@ void ath11k_peer_map_event(struct ath11k ether_addr_copy(peer->addr, mac_addr); list_add(&peer->list, &ab->peers); wake_up(&ab->peer_mapping_wq); @@ -488,7 +489,7 @@ Signed-off-by: Sathishkumar Muruganandam } ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "peer map vdev %d peer %pM id %d\n", -@@ -146,6 +483,69 @@ void ath11k_peer_map_event(struct ath11k +@@ -160,6 +497,69 @@ void ath11k_peer_map_event(struct ath11k exit: spin_unlock_bh(&ab->base_lock); @@ -558,7 +559,7 @@ Signed-off-by: Sathishkumar Muruganandam } static int ath11k_wait_for_peer_common(struct ath11k_base *ab, int vdev_id, -@@ -242,20 +642,34 @@ err_clean: +@@ -256,20 +656,34 @@ err_clean: void ath11k_peer_cleanup(struct ath11k *ar, u32 vdev_id) { @@ -595,7 +596,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_peer_rhash_delete(ab, peer); list_del(&peer->list); kfree(peer); -@@ -302,7 +716,7 @@ static int __ath11k_peer_delete(struct a +@@ -316,7 +730,7 @@ static int __ath11k_peer_delete(struct a lockdep_assert_held(&ar->conf_mutex); reinit_completion(&ar->peer_delete_done); @@ -604,7 +605,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_lock(&ab->tbl_mtx_lock); spin_lock_bh(&ab->base_lock); -@@ -377,6 +791,7 @@ int ath11k_peer_create(struct ath11k *ar +@@ -391,6 +805,7 @@ int ath11k_peer_create(struct ath11k *ar struct ieee80211_sta *sta, struct peer_create_params *param) { struct ath11k_peer *peer; @@ -612,27 +613,25 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_sta *arsta; int ret, fbret; -@@ -450,7 +865,14 @@ int ath11k_peer_create(struct ath11k *ar - - peer->sec_type = HAL_ENCRYPT_TYPE_OPEN; +@@ -466,6 +881,13 @@ int ath11k_peer_create(struct ath11k *ar peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; -- peer->vif = arvif->vif; -+ peer->vif = vif; -+ + peer->vif = arvif->vif; + +#ifdef CPTCFG_ATH11K_NSS_SUPPORT + if (vif->type == NL80211_IFTYPE_STATION && ar->ab->nss.enabled) + ar->bss_peer = peer; + else + ar->bss_peer = NULL; +#endif - - ++ if (sta) { + arsta = ath11k_sta_to_arsta(sta); + arsta->tcl_metadata |= FIELD_PREP(HTT_TCL_META_DATA_TYPE, 0) | --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -7,6 +7,47 @@ - #ifndef ATH11K_PEER_H - #define ATH11K_PEER_H +@@ -18,6 +18,47 @@ struct ppdu_user_delayba { + u32 resp_rate_flags; + }; +enum ath11k_ast_entry_type { + ATH11K_AST_TYPE_NONE, /* static ast entry for connected peer */ @@ -678,7 +677,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_peer { struct list_head list; struct ieee80211_sta *sta; -@@ -18,6 +59,10 @@ struct ath11k_peer { +@@ -29,6 +70,10 @@ struct ath11k_peer { u8 pdev_idx; u16 hw_peer_id; struct ath11k_nss_peer nss; @@ -689,7 +688,7 @@ Signed-off-by: Sathishkumar Muruganandam /* protected by ab->data_lock */ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; -@@ -41,8 +86,13 @@ struct ath11k_peer { +@@ -54,8 +99,13 @@ struct ath11k_peer { }; void ath11k_peer_unmap_event(struct ath11k_base *ab, u16 peer_id); @@ -703,7 +702,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_peer *ath11k_peer_find(struct ath11k_base *ab, int vdev_id, const u8 *addr); struct ath11k_peer *ath11k_peer_find_by_addr(struct ath11k_base *ab, -@@ -59,4 +109,71 @@ struct ath11k_peer *ath11k_peer_find_by_ +@@ -73,4 +123,71 @@ struct ath11k_peer *ath11k_peer_find_by_ int ath11k_peer_rhash_tbl_init(struct ath11k_base *ab); void ath11k_peer_rhash_tbl_destroy(struct ath11k_base *ab); int ath11k_peer_rhash_delete(struct ath11k_base *ab, struct ath11k_peer *peer); @@ -777,15 +776,16 @@ Signed-off-by: Sathishkumar Muruganandam #endif /* _PEER_H_ */ --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -155,6 +155,7 @@ static const struct wmi_tlv_policy wmi_t - .min_len = sizeof(struct wmi_per_chain_rssi_stats), .policy = "wmi_per_chain_rssi_stats" }, +@@ -154,6 +154,8 @@ static const struct wmi_tlv_policy wmi_t + .min_len = sizeof(struct wmi_per_chain_rssi_stats) }, [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = { - .min_len = sizeof(struct wmi_twt_add_dialog_event), .policy = "wmi_twt_add_dialog_event" }, -+ [WMI_TAG_WDS_ADDR_EVENT] = { .min_len = sizeof(struct wmi_wds_addr_event), .policy = "wmi_wds_addr_event" }, + .min_len = sizeof(struct wmi_twt_add_dialog_event) }, ++ [WMI_TAG_WDS_ADDR_EVENT] = { ++ .min_len = sizeof(struct wmi_wds_addr_event) }, }; #define PRIMAP(_hw_mode_) \ -@@ -1174,6 +1175,51 @@ int ath11k_wmi_send_peer_delete_cmd(stru +@@ -1126,6 +1128,51 @@ int ath11k_wmi_send_peer_delete_cmd(stru return ret; } @@ -837,7 +837,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar, struct pdev_set_regdomain_params *param) { -@@ -6419,6 +6465,36 @@ static int ath11k_pull_peer_assoc_conf_e +@@ -6362,6 +6409,36 @@ static int ath11k_pull_peer_assoc_conf_e return 0; } @@ -874,7 +874,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_wmi_pull_pdev_stats_base(const struct wmi_pdev_stats_base *src, struct ath11k_fw_stats_pdev *dst) { -@@ -7334,6 +7410,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru +@@ -7277,6 +7354,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru ether_addr_copy(ab->mac_addr, fixed_param.ready_event_min.mac_addr.addr); @@ -882,7 +882,7 @@ Signed-off-by: Sathishkumar Muruganandam ab->pktlog_defs_checksum = fixed_param.pktlog_defs_checksum; break; case WMI_TAG_ARRAY_FIXED_STRUCT: -@@ -8805,6 +8882,22 @@ static void ath11k_wmi_gtk_offload_statu +@@ -8717,6 +8795,22 @@ static void ath11k_wmi_gtk_offload_statu kfree(tb); } @@ -905,9 +905,9 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) { struct wmi_cmd_hdr *cmd_hdr; -@@ -8935,6 +9028,9 @@ static void ath11k_wmi_tlv_op_rx(struct - case WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID: - ath11k_qos_null_compl_event(ab, skb); +@@ -8844,6 +8938,9 @@ static void ath11k_wmi_tlv_op_rx(struct + case WMI_GTK_OFFLOAD_STATUS_EVENTID: + ath11k_wmi_gtk_offload_status_event(ab, skb); break; + case WMI_WDS_PEER_EVENTID: + ath11k_wmi_wds_peer_event(ab, skb); @@ -917,7 +917,7 @@ Signed-off-by: Sathishkumar Muruganandam break; --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -3025,6 +3025,21 @@ struct wmi_peer_delete_cmd { +@@ -3009,6 +3009,21 @@ struct wmi_peer_delete_cmd { struct wmi_mac_addr peer_macaddr; } __packed; @@ -939,7 +939,7 @@ Signed-off-by: Sathishkumar Muruganandam struct wmi_peer_reorder_queue_setup_cmd { u32 tlv_header; u32 vdev_id; -@@ -4629,6 +4644,21 @@ struct wmi_probe_resp_tx_status_event { +@@ -4611,6 +4626,21 @@ struct wmi_probe_resp_tx_status_event { u32 tx_status; } __packed; @@ -961,7 +961,7 @@ Signed-off-by: Sathishkumar Muruganandam /* * PDEV statistics */ -@@ -6430,6 +6460,9 @@ int ath11k_wmi_set_sta_ps_param(struct a +@@ -6400,6 +6430,9 @@ int ath11k_wmi_set_sta_ps_param(struct a int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms); int ath11k_wmi_send_peer_delete_cmd(struct ath11k *ar, const u8 *peer_addr, u8 vdev_id); diff --git a/package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch b/package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch similarity index 58% rename from package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch rename to package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch index a69c5b2af244f8..59816b1883be1d 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/214-ath11k-qos-null-frame-tx-over-wmi.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch @@ -22,7 +22,7 @@ Signed-off-by: Sowmiya Sree Elavalagan --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6129,6 +6129,16 @@ static int ath11k_mac_mgmt_tx_wmi(struct +@@ -6132,6 +6132,16 @@ static int ath11k_mac_mgmt_tx_wmi(struct ATH11K_SKB_CB(skb)->paddr = paddr; @@ -39,7 +39,7 @@ Signed-off-by: Sowmiya Sree Elavalagan ret = ath11k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb); if (ret) { ath11k_warn(ar->ab, "failed to send mgmt frame: %d\n", ret); -@@ -6196,8 +6206,8 @@ static void ath11k_mgmt_over_wmi_tx_work +@@ -6199,8 +6209,8 @@ static void ath11k_mgmt_over_wmi_tx_work } } @@ -50,7 +50,7 @@ Signed-off-by: Sowmiya Sree Elavalagan { struct sk_buff_head *q = &ar->wmi_mgmt_tx_queue; -@@ -6259,7 +6269,7 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6262,7 +6272,7 @@ static void ath11k_mac_op_tx(struct ieee } else if (ieee80211_is_mgmt(hdr->frame_control)) { frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control); @@ -59,7 +59,7 @@ Signed-off-by: Sowmiya Sree Elavalagan if (ret) { if (ret != -EBUSY) ath11k_warn(ar->ab, "failed to queue management frame %d\n", -@@ -6274,6 +6284,20 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6277,6 +6287,20 @@ static void ath11k_mac_op_tx(struct ieee spin_unlock_bh(&ar->data_lock); } return; @@ -82,128 +82,16 @@ Signed-off-by: Sowmiya Sree Elavalagan if (control->sta) --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -23,6 +23,7 @@ - - struct wmi_tlv_policy { - size_t min_len; -+ char policy[40]; - }; - - struct wmi_tlv_svc_ready_parse { -@@ -91,69 +92,69 @@ struct wmi_tlv_mgmt_rx_parse { - - static const struct wmi_tlv_policy wmi_tlv_policies[] = { - [WMI_TAG_ARRAY_BYTE] -- = { .min_len = 0 }, -+ = { .min_len = 0, .policy = "WMI_TAG_ARRAY_BYTE" }, - [WMI_TAG_ARRAY_UINT32] -- = { .min_len = 0 }, -+ = { .min_len = 0, .policy = "WMI_TAG_ARRAY_UINT32" }, - [WMI_TAG_SERVICE_READY_EVENT] -- = { .min_len = sizeof(struct wmi_service_ready_event) }, -+ = { .min_len = sizeof(struct wmi_service_ready_event), .policy = "wmi_service_ready_event" }, - [WMI_TAG_SERVICE_READY_EXT_EVENT] -- = { .min_len = sizeof(struct wmi_service_ready_ext_event) }, -+ = { .min_len = sizeof(struct wmi_service_ready_ext_event), .policy = "wmi_service_ready_ext_event" }, - [WMI_TAG_SOC_MAC_PHY_HW_MODE_CAPS] -- = { .min_len = sizeof(struct wmi_soc_mac_phy_hw_mode_caps) }, -+ = { .min_len = sizeof(struct wmi_soc_mac_phy_hw_mode_caps), .policy = "wmi_soc_mac_phy_hw_mode_caps" }, - [WMI_TAG_SOC_HAL_REG_CAPABILITIES] -- = { .min_len = sizeof(struct wmi_soc_hal_reg_capabilities) }, -+ = { .min_len = sizeof(struct wmi_soc_hal_reg_capabilities), .policy = "wmi_soc_hal_reg_capabilities" }, - [WMI_TAG_VDEV_START_RESPONSE_EVENT] -- = { .min_len = sizeof(struct wmi_vdev_start_resp_event) }, -+ = { .min_len = sizeof(struct wmi_vdev_start_resp_event), .policy = "wmi_vdev_start_resp_event" }, - [WMI_TAG_PEER_DELETE_RESP_EVENT] -- = { .min_len = sizeof(struct wmi_peer_delete_resp_event) }, -+ = { .min_len = sizeof(struct wmi_peer_delete_resp_event), .policy = "wmi_peer_delete_resp_event" }, - [WMI_TAG_OFFLOAD_BCN_TX_STATUS_EVENT] -- = { .min_len = sizeof(struct wmi_bcn_tx_status_event) }, -+ = { .min_len = sizeof(struct wmi_bcn_tx_status_event), .policy = "wmi_bcn_tx_status_event" }, - [WMI_TAG_VDEV_STOPPED_EVENT] -- = { .min_len = sizeof(struct wmi_vdev_stopped_event) }, -+ = { .min_len = sizeof(struct wmi_vdev_stopped_event), .policy = "wmi_vdev_stopped_event" }, - [WMI_TAG_REG_CHAN_LIST_CC_EVENT] -- = { .min_len = sizeof(struct wmi_reg_chan_list_cc_event) }, -+ = { .min_len = sizeof(struct wmi_reg_chan_list_cc_event), .policy = "wmi_reg_chan_list_cc_event" }, - [WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT] -- = { .min_len = sizeof(struct wmi_reg_chan_list_cc_ext_event) }, -+ = { .min_len = sizeof(struct wmi_reg_chan_list_cc_ext_event), .policy = "wmi_reg_chan_list_cc_ext_event" }, +@@ -117,7 +117,7 @@ static const struct wmi_tlv_policy wmi_t [WMI_TAG_MGMT_RX_HDR] -- = { .min_len = sizeof(struct wmi_mgmt_rx_hdr) }, -+ = { .min_len = sizeof(struct wmi_mgmt_rx_hdr), .policy = "wmi_mgmt_rx_hdr" }, + = { .min_len = sizeof(struct wmi_mgmt_rx_hdr) }, [WMI_TAG_MGMT_TX_COMPL_EVENT] - = { .min_len = sizeof(struct wmi_mgmt_tx_compl_event) }, -+ = { .min_len = sizeof(struct wmi_tx_compl_event), .policy = "wmi_tx_compl_event" }, ++ = { .min_len = sizeof(struct wmi_tx_compl_event) }, [WMI_TAG_SCAN_EVENT] -- = { .min_len = sizeof(struct wmi_scan_event) }, -+ = { .min_len = sizeof(struct wmi_scan_event), .policy = "wmi_scan_event" }, + = { .min_len = sizeof(struct wmi_scan_event) }, [WMI_TAG_PEER_STA_KICKOUT_EVENT] -- = { .min_len = sizeof(struct wmi_peer_sta_kickout_event) }, -+ = { .min_len = sizeof(struct wmi_peer_sta_kickout_event), .policy = "wmi_peer_sta_kickout_event" }, - [WMI_TAG_ROAM_EVENT] -- = { .min_len = sizeof(struct wmi_roam_event) }, -+ = { .min_len = sizeof(struct wmi_roam_event), .policy = "wmi_roam_event" }, - [WMI_TAG_CHAN_INFO_EVENT] -- = { .min_len = sizeof(struct wmi_chan_info_event) }, -+ = { .min_len = sizeof(struct wmi_chan_info_event), .policy = "wmi_chan_info_event" }, - [WMI_TAG_PDEV_BSS_CHAN_INFO_EVENT] -- = { .min_len = sizeof(struct wmi_pdev_bss_chan_info_event) }, -+ = { .min_len = sizeof(struct wmi_pdev_bss_chan_info_event), .policy = "wmi_pdev_bss_chan_info_event" }, - [WMI_TAG_VDEV_INSTALL_KEY_COMPLETE_EVENT] -- = { .min_len = sizeof(struct wmi_vdev_install_key_compl_event) }, -+ = { .min_len = sizeof(struct wmi_vdev_install_key_compl_event), .policy = "wmi_vdev_install_key_compl_event" }, - [WMI_TAG_READY_EVENT] = { -- .min_len = sizeof(struct wmi_ready_event_min) }, -+ .min_len = sizeof(struct wmi_ready_event_min), .policy = "wmi_ready_event_min" }, - [WMI_TAG_SERVICE_AVAILABLE_EVENT] -- = {.min_len = sizeof(struct wmi_service_available_event) }, -+ = {.min_len = sizeof(struct wmi_service_available_event), .policy = "wmi_service_available_event" }, - [WMI_TAG_PEER_ASSOC_CONF_EVENT] -- = { .min_len = sizeof(struct wmi_peer_assoc_conf_event) }, -+ = { .min_len = sizeof(struct wmi_peer_assoc_conf_event), .policy = "wmi_peer_assoc_conf_event" }, - [WMI_TAG_STATS_EVENT] -- = { .min_len = sizeof(struct wmi_stats_event) }, -+ = { .min_len = sizeof(struct wmi_stats_event), .policy = "wmi_stats_event" }, - [WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT] -- = { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event) }, -+ = { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event), .policy = "wmi_pdev_ctl_failsafe_chk_event" }, - [WMI_TAG_HOST_SWFDA_EVENT] = { -- .min_len = sizeof(struct wmi_fils_discovery_event) }, -+ .min_len = sizeof(struct wmi_fils_discovery_event), .policy = "wmi_fils_discovery_event" }, - [WMI_TAG_OFFLOAD_PRB_RSP_TX_STATUS_EVENT] = { -- .min_len = sizeof(struct wmi_probe_resp_tx_status_event) }, -+ .min_len = sizeof(struct wmi_probe_resp_tx_status_event), .policy = "wmi_probe_resp_tx_status_event" }, - [WMI_TAG_VDEV_DELETE_RESP_EVENT] = { -- .min_len = sizeof(struct wmi_vdev_delete_resp_event) }, -+ .min_len = sizeof(struct wmi_vdev_delete_resp_event), .policy = "wmi_vdev_delete_resp_event" }, - [WMI_TAG_OBSS_COLOR_COLLISION_EVT] = { -- .min_len = sizeof(struct wmi_obss_color_collision_event) }, -+ .min_len = sizeof(struct wmi_obss_color_collision_event), .policy = "wmi_obss_color_collision_event" }, - [WMI_TAG_11D_NEW_COUNTRY_EVENT] = { -- .min_len = sizeof(struct wmi_11d_new_cc_ev) }, -+ .min_len = sizeof(struct wmi_11d_new_cc_ev), .policy = "wmi_11d_new_cc_ev" }, - [WMI_TAG_PER_CHAIN_RSSI_STATS] = { -- .min_len = sizeof(struct wmi_per_chain_rssi_stats) }, -+ .min_len = sizeof(struct wmi_per_chain_rssi_stats), .policy = "wmi_per_chain_rssi_stats" }, - [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = { -- .min_len = sizeof(struct wmi_twt_add_dialog_event) }, -+ .min_len = sizeof(struct wmi_twt_add_dialog_event), .policy = "wmi_twt_add_dialog_event" }, - }; - - #define PRIMAP(_hw_mode_) \ -@@ -203,8 +204,8 @@ ath11k_wmi_tlv_iter(struct ath11k_base * - if (tlv_tag < ARRAY_SIZE(wmi_tlv_policies) && - wmi_tlv_policies[tlv_tag].min_len && - wmi_tlv_policies[tlv_tag].min_len > tlv_len) { -- ath11k_err(ab, "wmi tlv parse failure of tag %u at byte %zd (%u bytes is less than min length %zu)\n", -- tlv_tag, ptr - begin, tlv_len, -+ ath11k_err(ab, "wmi tlv parse failure of tag %u (%s) at byte %zd (%u bytes is less than min length %zu)\n", -+ tlv_tag, wmi_tlv_policies[tlv_tag].policy, ptr - begin, tlv_len, - wmi_tlv_policies[tlv_tag].min_len); - return -EINVAL; - } -@@ -697,6 +698,55 @@ int ath11k_wmi_mgmt_send(struct ath11k * +@@ -699,6 +699,55 @@ int ath11k_wmi_mgmt_send(struct ath11k * return ret; } @@ -259,15 +147,7 @@ Signed-off-by: Sowmiya Sree Elavalagan int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr, struct vdev_create_params *param) { -@@ -4103,7 +4153,6 @@ ath11k_wmi_copy_resource_config(struct w - wmi_cfg->max_bssid_rx_filters = tg_cfg->max_bssid_rx_filters; - wmi_cfg->use_pdev_id = tg_cfg->use_pdev_id; - wmi_cfg->flag1 = tg_cfg->flag1; -- wmi_cfg->flag1 |= WMI_RSRC_CFG_FLAG1_ACK_RSSI; - wmi_cfg->peer_map_unmap_v2_support = tg_cfg->peer_map_unmap_v2_support; - wmi_cfg->sched_params = tg_cfg->sched_params; - wmi_cfg->twt_ap_pdev_count = tg_cfg->twt_ap_pdev_count; -@@ -5856,8 +5905,8 @@ static int ath11k_pull_mgmt_rx_params_tl +@@ -5857,8 +5906,8 @@ static int ath11k_pull_mgmt_rx_params_tl return 0; } @@ -278,7 +158,7 @@ Signed-off-by: Sowmiya Sree Elavalagan { struct sk_buff *msdu; struct ieee80211_tx_info *info; -@@ -5895,6 +5944,11 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5896,6 +5945,11 @@ static int wmi_process_mgmt_tx_comp(stru info->status.ack_signal = tx_compl_param->ack_rssi; } @@ -290,7 +170,7 @@ Signed-off-by: Sowmiya Sree Elavalagan hdr = (struct ieee80211_hdr *)msdu->data; frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); -@@ -5913,10 +5967,13 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5914,10 +5968,13 @@ static int wmi_process_mgmt_tx_comp(stru arvif = ath11k_vif_to_arvif(vif); mgmt_stats = &arvif->mgmt_stats; @@ -308,7 +188,7 @@ Signed-off-by: Sowmiya Sree Elavalagan spin_unlock_bh(&ar->data_lock); skip_mgmt_stats: -@@ -5938,12 +5995,13 @@ skip_mgmt_stats: +@@ -5939,12 +5996,13 @@ skip_mgmt_stats: return 0; } @@ -326,7 +206,7 @@ Signed-off-by: Sowmiya Sree Elavalagan int ret; tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); -@@ -5953,7 +6011,7 @@ static int ath11k_pull_mgmt_tx_compl_par +@@ -5954,7 +6012,7 @@ static int ath11k_pull_mgmt_tx_compl_par return ret; } @@ -335,7 +215,7 @@ Signed-off-by: Sowmiya Sree Elavalagan if (!ev) { ath11k_warn(ab, "failed to fetch mgmt tx compl ev"); kfree(tb); -@@ -7730,10 +7788,11 @@ exit: +@@ -7731,10 +7789,11 @@ exit: static void ath11k_mgmt_tx_compl_event(struct ath11k_base *ab, struct sk_buff *skb) { @@ -349,7 +229,7 @@ Signed-off-by: Sowmiya Sree Elavalagan ath11k_warn(ab, "failed to extract mgmt tx compl event"); return; } -@@ -7746,7 +7805,7 @@ static void ath11k_mgmt_tx_compl_event(s +@@ -7747,7 +7806,7 @@ static void ath11k_mgmt_tx_compl_event(s goto exit; } @@ -358,7 +238,7 @@ Signed-off-by: Sowmiya Sree Elavalagan ath11k_dbg(ab, ATH11K_DBG_MGMT, "event mgmt tx compl ev pdev_id %d, desc_id %d, status %d ack_rssi %d", -@@ -7757,6 +7816,36 @@ exit: +@@ -7758,6 +7817,36 @@ exit: rcu_read_unlock(); } @@ -395,13 +275,14 @@ Signed-off-by: Sowmiya Sree Elavalagan static struct ath11k *ath11k_get_ar_on_scan_state(struct ath11k_base *ab, u32 vdev_id, enum ath11k_scan_state state) -@@ -8843,6 +8932,9 @@ static void ath11k_wmi_tlv_op_rx(struct +@@ -8844,6 +8933,10 @@ static void ath11k_wmi_tlv_op_rx(struct case WMI_GTK_OFFLOAD_STATUS_EVENTID: ath11k_wmi_gtk_offload_status_event(ab, skb); break; + case WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID: + ath11k_qos_null_compl_event(ab, skb); + break; ++ default: ath11k_dbg(ab, ATH11K_DBG_WMI, "unsupported event id 0x%x\n", id); break; @@ -424,16 +305,16 @@ Signed-off-by: Sowmiya Sree Elavalagan WMI_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_CMD(WMI_GRP_BA_NEG), WMI_TX_ADDBA_COMPLETE_EVENTID, WMI_BA_RSP_SSN_EVENTID, -@@ -1880,6 +1883,9 @@ enum wmi_tlv_tag { +@@ -1878,6 +1881,9 @@ enum wmi_tlv_tag { + WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD, + WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9, WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT, - WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8, - WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD, + /* TODO add all the missing cmds */ + WMI_TAG_QOS_NULL_FRAME_TX_SEND = 0x3A6, + WMI_TAG_QOS_NULL_FRAME_TX_STATUS, + WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8, + WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD, WMI_TAG_MAX - }; - @@ -2107,7 +2113,17 @@ enum wmi_tlv_service { WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246, WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, @@ -473,15 +354,7 @@ Signed-off-by: Sowmiya Sree Elavalagan u32 tlv_header; u32 tx_params_dword0; u32 tx_params_dword1; -@@ -4570,7 +4588,6 @@ struct wmi_pdev_bss_chan_info_event { - u32 rx_bss_cycle_count_low; - u32 rx_bss_cycle_count_high; - u32 pdev_id; -- u32 ack_rssi; - } __packed; - - #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0 -@@ -4918,7 +4935,7 @@ struct wmi_rssi_ctl_ext { +@@ -4917,7 +4935,7 @@ struct wmi_rssi_ctl_ext { u32 rssi_ctl_ext[MAX_ANTENNA_EIGHT - ATH_MAX_ANTENNA]; }; @@ -490,7 +363,7 @@ Signed-off-by: Sowmiya Sree Elavalagan u32 desc_id; u32 status; u32 pdev_id; -@@ -5748,6 +5765,17 @@ struct wmi_debug_log_config_cmd_fixed_pa +@@ -5748,6 +5766,17 @@ struct wmi_debug_log_config_cmd_fixed_pa u32 value; } __packed; @@ -508,7 +381,7 @@ Signed-off-by: Sowmiya Sree Elavalagan #define WMI_MAX_MEM_REQS 32 #define MAX_RADIOS 3 -@@ -6358,6 +6386,8 @@ int ath11k_wmi_cmd_send(struct ath11k_pd +@@ -6358,6 +6387,8 @@ int ath11k_wmi_cmd_send(struct ath11k_pd struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len); int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, struct sk_buff *frame); diff --git a/package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch b/package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch new file mode 100644 index 00000000000000..24520cbeafbc7a --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch @@ -0,0 +1,46 @@ +From ee8c401bdfa08c6b98fb5b016841db5603ba4059 Mon Sep 17 00:00:00 2001 +From: Lavanya Suresh +Date: Wed, 23 Sep 2020 21:54:34 +0530 +Subject: [PATCH] ath11k: add support to enable/disable bss color collision + detection + +Added module param to enable or disable bss color collision detection. +By default, it is disabled. This config should be changed before VAP +bringup only. + + +Signed-off-by: Lavanya Suresh +--- + drivers/net/wireless/ath/ath11k/mac.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -53,6 +54,10 @@ + .max_power = 30, \ + } + ++unsigned int color_collision_enable = 0; ++module_param_named(color_collision_detect, color_collision_enable, uint, 0644); ++MODULE_PARM_DESC(color_collision_detect, "BSS color collision detecion: 0-disable 1-enable"); ++ + static const struct ieee80211_channel ath11k_2ghz_channels[] = { + CHAN2G(1, 2412, 0), + CHAN2G(2, 2417, 0), +@@ -3723,7 +3728,7 @@ static void ath11k_mac_op_bss_info_chang + ret = ath11k_wmi_send_obss_color_collision_cfg_cmd( + ar, arvif->vdev_id, info->he_bss_color.color, + ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS, +- info->he_bss_color.enabled); ++ (info->he_bss_color.enabled & color_collision_enable)); + if (ret) + ath11k_warn(ar->ab, "failed to set bss color collision on vdev %i: %d\n", + arvif->vdev_id, ret); diff --git a/package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch b/package/kernel/mac80211/patches/nss/ath11k/235-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch rename to package/kernel/mac80211/patches/nss/ath11k/235-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch index 6f5fffe596172b..7a935968261d33 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/903-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/235-002-ath11k-add-support-for-ext-vdev-in-NSS-for-AP_VLAN-vif-handling.patch @@ -17,7 +17,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -366,6 +366,10 @@ void ath11k_nss_wifili_event_receive(str +@@ -323,6 +323,10 @@ void ath11k_nss_wifili_event_receive(str ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili wds peer del event received %d response %d error %d\n", msg_type, response, error); break; @@ -28,7 +28,7 @@ Signed-off-by: Sathishkumar Muruganandam default: ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); break; -@@ -599,8 +603,9 @@ static int ath11k_nss_undecap_nwifi(stru +@@ -556,8 +560,9 @@ static int ath11k_nss_undecap_nwifi(stru return 0; } @@ -40,7 +40,7 @@ Signed-off-by: Sathishkumar Muruganandam { struct ath11k_base *ab = ar->ab; struct ath11k_ast_entry *ast_entry = NULL; -@@ -622,19 +627,22 @@ static void ath11k_nss_wds_type_rx(struc +@@ -579,19 +584,22 @@ static void ath11k_nss_wds_type_rx(struc if (!is_sa_valid) { ath11k_peer_add_ast(ar, ta_peer, src_mac, ATH11K_AST_TYPE_WDS); @@ -68,7 +68,7 @@ Signed-off-by: Sathishkumar Muruganandam } spin_unlock_bh(&ab->base_lock); -@@ -678,7 +686,8 @@ static void ath11k_nss_mec_handler(struc +@@ -635,7 +643,8 @@ static void ath11k_nss_mec_handler(struc static void ath11k_nss_vdev_spl_receive_ext_wdsdata(struct ath11k_vif *arvif, struct sk_buff *skb, @@ -78,7 +78,7 @@ Signed-off-by: Sathishkumar Muruganandam { struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; -@@ -699,8 +708,8 @@ static void ath11k_nss_vdev_spl_receive_ +@@ -656,8 +665,8 @@ static void ath11k_nss_vdev_spl_receive_ switch (wds_type) { case NSS_WIFI_VDEV_WDS_TYPE_RX: @@ -89,7 +89,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case NSS_WIFI_VDEV_WDS_TYPE_MEC: ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); -@@ -767,6 +776,7 @@ ath11k_nss_vdev_special_data_receive(str +@@ -724,6 +733,7 @@ ath11k_nss_vdev_special_data_receive(str struct ieee80211_vif *vif; struct ath11k_vif *arvif; struct ath11k_base *ab; @@ -97,7 +97,7 @@ Signed-off-by: Sathishkumar Muruganandam bool eth_decap = false; int data_offs = 0; int ret = 0; -@@ -822,10 +832,11 @@ ath11k_nss_vdev_special_data_receive(str +@@ -779,10 +789,11 @@ ath11k_nss_vdev_special_data_receive(str NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_WDS_LEARN) { wds_metadata = &wifi_metadata->metadata.wds_metadata; ath11k_nss_vdev_spl_receive_ext_wdsdata(arvif, skb, @@ -111,7 +111,7 @@ Signed-off-by: Sathishkumar Muruganandam } static void -@@ -888,6 +899,68 @@ ath11k_nss_vdev_data_receive(struct net_ +@@ -845,6 +856,68 @@ ath11k_nss_vdev_data_receive(struct net_ ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); } @@ -180,7 +180,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb) { struct ath11k *ar = arvif->ar; -@@ -910,10 +983,16 @@ int ath11k_nss_tx(struct ath11k_vif *arv +@@ -867,10 +940,16 @@ int ath11k_nss_tx(struct ath11k_vif *arv ath11k_nss_tx_encap_nwifi(skb); send: @@ -201,7 +201,7 @@ Signed-off-by: Sathishkumar Muruganandam if (status != NSS_TX_SUCCESS) { ath11k_dbg(ar->ab, (ATH11K_DBG_NSS | ATH11K_DBG_DP_TX), -@@ -1254,6 +1333,7 @@ int ath11k_nss_vdev_up(struct ath11k_vif +@@ -1211,6 +1290,7 @@ int ath11k_nss_vdev_up(struct ath11k_vif struct nss_wifi_vdev_msg *vdev_msg = NULL; struct nss_wifi_vdev_enable_msg *vdev_en; struct ath11k *ar = arvif->ar; @@ -209,7 +209,7 @@ Signed-off-by: Sathishkumar Muruganandam nss_tx_status_t status; int ret = 0; -@@ -1285,6 +1365,12 @@ int ath11k_nss_vdev_up(struct ath11k_vif +@@ -1242,6 +1322,12 @@ int ath11k_nss_vdev_up(struct ath11k_vif } ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev up tx msg success\n"); @@ -222,7 +222,7 @@ Signed-off-by: Sathishkumar Muruganandam free: kfree(vdev_msg); return ret; -@@ -1294,6 +1380,7 @@ int ath11k_nss_vdev_down(struct ath11k_v +@@ -1251,6 +1337,7 @@ int ath11k_nss_vdev_down(struct ath11k_v { struct nss_wifi_vdev_msg *vdev_msg = NULL; struct ath11k *ar = arvif->ar; @@ -230,7 +230,7 @@ Signed-off-by: Sathishkumar Muruganandam nss_tx_status_t status; int ret = 0; -@@ -1321,11 +1408,362 @@ int ath11k_nss_vdev_down(struct ath11k_v +@@ -1278,11 +1365,362 @@ int ath11k_nss_vdev_down(struct ath11k_v } ath11k_dbg(ar->ab, ATH11K_DBG_NSS, "nss vdev down tx msg success\n"); @@ -262,7 +262,7 @@ Signed-off-by: Sathishkumar Muruganandam + + cfg_wds_msg = &ext_vdev_msg->msg.wmsg; + cfg_wds_msg->wds_peer_id = wds_peer_id; -+ ether_addr_copy(cfg_wds_msg->mac_addr, wds_addr); ++ ether_addr_copy((u8 *)cfg_wds_msg->mac_addr, wds_addr); + + nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, + NSS_WIFI_EXT_VDEV_MSG_CONFIGURE_WDS, @@ -593,7 +593,7 @@ Signed-off-by: Sathishkumar Muruganandam /*----------------------------Peer Setup/Config -----------------------------*/ int ath11k_nss_set_peer_sec_type(struct ath11k *ar, -@@ -1419,22 +1857,22 @@ free: +@@ -1376,22 +1814,22 @@ free: return status; } @@ -623,7 +623,7 @@ Signed-off-by: Sathishkumar Muruganandam sta->addr); goto exit; } -@@ -1506,13 +1944,13 @@ void ath11k_nss_update_sta_rxrate(struct +@@ -1463,13 +1901,13 @@ void ath11k_nss_update_sta_rxrate(struct struct ath11k_peer *peer, struct hal_rx_user_status *user_stats) { @@ -639,7 +639,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_base *ab = ar->ab; if (!ab->nss.enabled) -@@ -1816,8 +2254,8 @@ int ath11k_nss_add_wds_peer(struct ath11 +@@ -1773,8 +2211,8 @@ int ath11k_nss_add_wds_peer(struct ath11 } ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, @@ -650,7 +650,7 @@ Signed-off-by: Sathishkumar Muruganandam msg_free: kfree(wlmsg); -@@ -1862,8 +2300,8 @@ int ath11k_nss_update_wds_peer(struct at +@@ -1819,8 +2257,8 @@ int ath11k_nss_update_wds_peer(struct at } ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, @@ -663,7 +663,7 @@ Signed-off-by: Sathishkumar Muruganandam kfree(wlmsg); --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -154,6 +154,7 @@ enum ath11k_nss_peer_sec_type { +@@ -151,6 +151,7 @@ enum ath11k_nss_peer_sec_type { struct ath11k_nss_peer { uint32_t *vaddr; dma_addr_t paddr; @@ -671,7 +671,7 @@ Signed-off-by: Sathishkumar Muruganandam struct peer_stats *nss_stats; struct completion complete; }; -@@ -168,6 +169,16 @@ struct arvif_nss { +@@ -165,6 +166,16 @@ struct arvif_nss { int encap; /* Keep the copy of decap type for nss */ int decap; @@ -688,7 +688,7 @@ Signed-off-by: Sathishkumar Muruganandam bool created; }; -@@ -223,11 +234,21 @@ int ath11k_nss_map_wds_peer(struct ath11 +@@ -220,11 +231,21 @@ int ath11k_nss_map_wds_peer(struct ath11 u8 *dest_mac, enum ath11k_ast_entry_type type); int ath11k_nss_del_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, u8 *dest_mac); @@ -713,7 +713,7 @@ Signed-off-by: Sathishkumar Muruganandam void ath11k_nss_update_sta_rxrate(struct hal_rx_mon_ppdu_info *ppdu_info, struct ath11k_peer *peer, struct hal_rx_user_status *user_stats); -@@ -260,9 +281,9 @@ static inline void ath11k_nss_vdev_delet +@@ -257,9 +278,9 @@ static inline void ath11k_nss_vdev_delet { } @@ -726,7 +726,7 @@ Signed-off-by: Sathishkumar Muruganandam { return; } -@@ -319,6 +340,43 @@ static inline int ath11k_nss_peer_create +@@ -316,6 +337,43 @@ static inline int ath11k_nss_peer_create return 0; } @@ -770,7 +770,7 @@ Signed-off-by: Sathishkumar Muruganandam static inline void ath11k_nss_peer_stats_enable(struct ath11k *ar) { return; -@@ -340,6 +398,11 @@ static inline int ath11k_nss_setup(struc +@@ -337,6 +395,11 @@ static inline int ath11k_nss_setup(struc return 0; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch similarity index 88% rename from package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch rename to package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch index de7bc77ef53456..429b781199f132 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/903-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -33,20 +33,17 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -385,9 +385,8 @@ struct ath11k_vif { - #endif /* CPTCFG_ATH11K_DEBUGFS */ - - struct ath11k_mgmt_frame_stats mgmt_stats; --#ifdef CPTCFG_ATH11K_NSS_SUPPORT +@@ -389,6 +389,7 @@ struct ath11k_vif { + #ifdef CPTCFG_ATH11K_NSS_SUPPORT struct arvif_nss nss; --#endif + #endif + struct list_head ap_vlan_arvifs; }; struct ath11k_vif_iter { --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4739,6 +4739,11 @@ static void ath11k_sta_rc_update_wk(stru +@@ -4748,6 +4748,11 @@ static void ath11k_sta_rc_update_wk(stru arvif = arsta->arvif; ar = arvif->ar; @@ -58,7 +55,7 @@ Signed-off-by: Sathishkumar Muruganandam if (WARN_ON(ath11k_mac_vif_chan(arvif->vif, &def))) return; -@@ -4910,17 +4915,28 @@ err_rc_bw_changed: +@@ -4919,17 +4924,28 @@ err_rc_bw_changed: static void ath11k_sta_set_4addr_wk(struct work_struct *wk) { struct ath11k *ar; @@ -89,7 +86,7 @@ Signed-off-by: Sathishkumar Muruganandam "setting USE_4ADDR for peer %pM\n", sta->addr); ret = ath11k_wmi_set_peer_param(ar, sta->addr, -@@ -4928,8 +4944,93 @@ static void ath11k_sta_set_4addr_wk(stru +@@ -4937,8 +4953,93 @@ static void ath11k_sta_set_4addr_wk(stru WMI_PEER_USE_4ADDR, 1); if (ret) @@ -184,7 +181,7 @@ Signed-off-by: Sathishkumar Muruganandam } static int ath11k_mac_inc_num_stations(struct ath11k_vif *arvif, -@@ -5278,9 +5379,32 @@ static void ath11k_mac_op_sta_set_4addr( +@@ -5268,9 +5369,32 @@ static void ath11k_mac_op_sta_set_4addr( struct ieee80211_sta *sta, bool enabled) { struct ath11k *ar = hw->priv; @@ -217,7 +214,7 @@ Signed-off-by: Sathishkumar Muruganandam ieee80211_queue_work(ar->hw, &arsta->set_4addr_wk); arsta->use_4addr_set = true; } -@@ -6673,6 +6797,9 @@ static int ath11k_mac_op_update_vif_offl +@@ -6654,6 +6778,9 @@ static int ath11k_mac_op_update_vif_offl u32 param_id, param_value; int ret; @@ -227,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET || (vif->type != NL80211_IFTYPE_STATION && -@@ -6893,7 +7020,8 @@ static int ath11k_mac_op_add_interface(s +@@ -6874,7 +7001,8 @@ static int ath11k_mac_op_add_interface(s goto err; } @@ -237,7 +234,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n", ar->num_created_vdevs, TARGET_NUM_VDEVS(ab)); ret = -EBUSY; -@@ -6913,6 +7041,28 @@ static int ath11k_mac_op_add_interface(s +@@ -6894,6 +7022,28 @@ static int ath11k_mac_op_add_interface(s arvif->vif = vif; INIT_LIST_HEAD(&arvif->list); @@ -266,7 +263,7 @@ Signed-off-by: Sathishkumar Muruganandam INIT_DELAYED_WORK(&arvif->connection_loss_work, ath11k_mac_vif_sta_connection_loss_work); -@@ -6942,6 +7092,7 @@ static int ath11k_mac_op_add_interface(s +@@ -6923,6 +7073,7 @@ static int ath11k_mac_op_add_interface(s fallthrough; case NL80211_IFTYPE_AP: arvif->vdev_type = WMI_VDEV_TYPE_AP; @@ -274,7 +271,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case NL80211_IFTYPE_MONITOR: arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; -@@ -7164,13 +7315,30 @@ static void ath11k_mac_op_remove_interfa +@@ -7145,13 +7296,30 @@ static void ath11k_mac_op_remove_interfa struct ath11k *ar = hw->priv; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ath11k_base *ab = ar->ab; @@ -307,7 +304,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n", arvif->vdev_id); -@@ -7187,6 +7355,14 @@ static void ath11k_mac_op_remove_interfa +@@ -7168,6 +7336,14 @@ static void ath11k_mac_op_remove_interfa if (ret) ath11k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", arvif->vdev_id, ret); @@ -322,7 +319,7 @@ Signed-off-by: Sathishkumar Muruganandam } ret = ath11k_mac_vdev_delete(ar, arvif); -@@ -7230,8 +7406,7 @@ err_vdev_del: +@@ -7211,8 +7387,7 @@ err_vdev_del: ath11k_debugfs_remove_interface(arvif); @@ -332,7 +329,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); } -@@ -7291,16 +7466,17 @@ static int ath11k_mac_op_ampdu_action(st +@@ -7272,16 +7447,17 @@ static int ath11k_mac_op_ampdu_action(st struct ieee80211_ampdu_params *params) { struct ath11k *ar = hw->priv; @@ -352,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case IEEE80211_AMPDU_TX_START: case IEEE80211_AMPDU_TX_STOP_CONT: -@@ -8823,6 +8999,7 @@ static void ath11k_mac_op_sta_statistics +@@ -8804,6 +8980,7 @@ static void ath11k_mac_op_sta_statistics { struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); struct ath11k *ar = arsta->arvif->ar; @@ -360,7 +357,7 @@ Signed-off-by: Sathishkumar Muruganandam s8 signal; bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT, ar->ab->wmi_ab.svc_map); -@@ -8879,7 +9056,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8860,7 +9037,8 @@ static void ath11k_mac_op_sta_statistics ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); @@ -372,7 +369,7 @@ Signed-off-by: Sathishkumar Muruganandam #if IS_ENABLED(CONFIG_IPV6) --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -5069,6 +5069,8 @@ enum wmi_vdev_subtype { +@@ -5070,6 +5070,8 @@ enum wmi_vdev_subtype { WMI_VDEV_SUBTYPE_MESH_11S, }; @@ -383,7 +380,7 @@ Signed-off-by: Sathishkumar Muruganandam WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD = 1, --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1162,12 +1162,13 @@ err_mem_free: +@@ -1156,12 +1156,13 @@ err_mem_free: return ret; } @@ -399,7 +396,7 @@ Signed-off-by: Sathishkumar Muruganandam int ret; ret = ath11k_peer_rx_tid_setup(ar, params->sta->addr, vdev_id, -@@ -1179,13 +1180,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 +@@ -1173,13 +1174,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 return ret; } @@ -418,9 +415,9 @@ Signed-off-by: Sathishkumar Muruganandam int ret; --- a/drivers/net/wireless/ath/ath11k/dp_rx.h +++ b/drivers/net/wireless/ath/ath11k/dp_rx.h -@@ -69,9 +69,9 @@ struct ath11k_dp_rfc1042_hdr { - __be16 snap_type; - } __packed; +@@ -88,9 +88,9 @@ static inline u32 ath11k_he_gi_to_nl8021 + return ret; + } -int ath11k_dp_rx_ampdu_start(struct ath11k *ar, +int ath11k_dp_rx_ampdu_start(struct ath11k_vif *arvif, @@ -432,7 +429,7 @@ Signed-off-by: Sathishkumar Muruganandam const u8 *peer_addr, --- a/drivers/net/wireless/ath/ath11k/peer.c +++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -126,6 +126,24 @@ struct ath11k_ast_entry *ath11k_peer_ast +@@ -140,6 +140,24 @@ struct ath11k_ast_entry *ath11k_peer_ast return NULL; } @@ -457,7 +454,7 @@ Signed-off-by: Sathishkumar Muruganandam void ath11k_peer_ast_wds_wmi_wk(struct work_struct *wk) { struct ath11k_ast_entry *ast_entry = container_of(wk, -@@ -186,8 +204,8 @@ int ath11k_peer_add_ast(struct ath11k *a +@@ -200,8 +218,8 @@ int ath11k_peer_add_ast(struct ath11k *a } if (type != ATH11K_AST_TYPE_STATIC) { @@ -468,7 +465,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_MAC, "ast_entry %pM already present on peer %pM\n", mac_addr, ast_entry->peer->addr); return 0; -@@ -284,7 +302,6 @@ int ath11k_peer_update_ast(struct ath11k +@@ -298,7 +316,6 @@ int ath11k_peer_update_ast(struct ath11k ath11k_dbg(ab, ATH11K_DBG_MAC, "ath11k_peer_update_ast old peer %pM new peer %pM ast_entry %pM\n", old_peer->addr, peer->addr, ast_entry->addr); @@ -476,7 +473,7 @@ Signed-off-by: Sathishkumar Muruganandam ast_entry->action = ATH11K_WDS_WMI_UPDATE; ieee80211_queue_work(ar->hw, &ast_entry->wds_wmi_wk); -@@ -329,8 +346,8 @@ void ath11k_peer_del_ast(struct ath11k * +@@ -343,8 +360,8 @@ void ath11k_peer_del_ast(struct ath11k * peer = ast_entry->peer; @@ -489,7 +486,7 @@ Signed-off-by: Sathishkumar Muruganandam list_del(&ast_entry->ase_list); --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -23,6 +23,7 @@ enum ath11k_ast_entry_type { +@@ -34,6 +34,7 @@ enum ath11k_ast_entry_type { enum ath11k_wds_wmi_action { ATH11K_WDS_WMI_ADD = 1, ATH11K_WDS_WMI_UPDATE, @@ -497,7 +494,7 @@ Signed-off-by: Sathishkumar Muruganandam ATH11K_WDS_WMI_MAX }; -@@ -126,6 +127,8 @@ int ath11k_peer_rhash_delete(struct ath1 +@@ -127,6 +128,8 @@ int ath11k_peer_rhash_delete(struct ath1 #ifdef CPTCFG_ATH11K_NSS_SUPPORT struct ath11k_ast_entry *ath11k_peer_ast_find_by_addr(struct ath11k_base *ab, u8* addr); @@ -506,7 +503,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_peer_add_ast(struct ath11k *ar, struct ath11k_peer *peer, u8* mac_addr, enum ath11k_ast_entry_type type); int ath11k_peer_update_ast(struct ath11k *ar, struct ath11k_peer *peer, -@@ -145,6 +148,12 @@ static inline struct ath11k_ast_entry *a +@@ -146,6 +149,12 @@ static inline struct ath11k_ast_entry *a { return NULL; } @@ -521,7 +518,7 @@ Signed-off-by: Sathishkumar Muruganandam u8* mac_addr, enum ath11k_ast_entry_type type) --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -164,7 +164,10 @@ static void ath11k_nss_get_peer_stats(st +@@ -124,7 +124,10 @@ static void ath11k_nss_get_peer_stats(st peer->nss.nss_stats->tx_failed += tx_dropped; @@ -533,19 +530,19 @@ Signed-off-by: Sathishkumar Muruganandam rx_packets = pstats->rx.rx_recvd; peer->nss.nss_stats->rx_packets += rx_packets; -@@ -174,7 +177,10 @@ static void ath11k_nss_get_peer_stats(st +@@ -134,7 +137,10 @@ static void ath11k_nss_get_peer_stats(st pstats->rx.err.decrypt_err; peer->nss.nss_stats->rx_dropped += rx_dropped; - ATH11K_NSS_TXRX_NETDEV_STATS(rx, peer->vif, rx_bytes, rx_packets); + if (peer->nss.ext_vdev_up) -+ ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->nss.ext_vif, tx_bytes, tx_packets); ++ ATH11K_NSS_TXRX_NETDEV_STATS(tx, peer->nss.ext_vif, rx_bytes, rx_packets); + else + ATH11K_NSS_TXRX_NETDEV_STATS(rx, peer->vif, rx_bytes, rx_packets); spin_unlock_bh(&ab->base_lock); rcu_read_unlock(); -@@ -1040,6 +1046,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 +@@ -997,6 +1003,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 case ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD: cmd = NSS_WIFI_VDEV_DECAP_TYPE_CMD; break; @@ -557,15 +554,15 @@ Signed-off-by: Sathishkumar Muruganandam } --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -109,6 +109,7 @@ enum ath11k_nss_vdev_cmd { +@@ -108,6 +108,7 @@ enum ath11k_nss_vdev_cmd { ATH11K_NSS_WIFI_VDEV_SECURITY_TYPE_CMD, ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, + ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD, }; - #define WIFILI_SCHEME_ID_INVALID -1 -@@ -155,6 +156,7 @@ struct ath11k_nss_peer { + enum ath11k_nss_opmode { +@@ -152,6 +153,7 @@ struct ath11k_nss_peer { uint32_t *vaddr; dma_addr_t paddr; bool ext_vdev_up; diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch b/package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch similarity index 92% rename from package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch rename to package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch index 14274b6a72680a..bad782747c57a1 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/904-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch @@ -15,7 +15,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -1570,14 +1570,11 @@ static int ath11k_nss_ext_vdev_register( +@@ -1526,14 +1526,11 @@ static int ath11k_nss_ext_vdev_register( struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; nss_tx_status_t status; @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam arvif->nss.ctx = nss_wifi_ext_vdev_register_if(arvif->nss.if_num, ath11k_nss_ext_vdev_data_receive, ath11k_nss_ext_vdev_special_data_receive, -@@ -1605,7 +1602,8 @@ static void ath11k_nss_ext_vdev_free(str +@@ -1561,7 +1558,8 @@ static void ath11k_nss_ext_vdev_free(str status = nss_dynamic_interface_dealloc_node( arvif->nss.if_num, @@ -40,7 +40,7 @@ Signed-off-by: Sathishkumar Muruganandam if (status != NSS_TX_SUCCESS) ath11k_warn(ab, "failed to free nss ext vdev err:%d\n", status); -@@ -1614,14 +1612,19 @@ static void ath11k_nss_ext_vdev_free(str +@@ -1570,14 +1568,19 @@ static void ath11k_nss_ext_vdev_free(str "nss ext vdev interface deallocated\n"); } @@ -62,7 +62,7 @@ Signed-off-by: Sathishkumar Muruganandam if_num = nss_dynamic_interface_alloc_node(di_type); if (if_num < 0) { ath11k_warn(ab, "failed to allocate nss ext vdev\n"); -@@ -1630,8 +1633,8 @@ static int ath11k_nss_ext_vdev_alloc(str +@@ -1586,8 +1589,8 @@ static int ath11k_nss_ext_vdev_alloc(str arvif->nss.if_num = if_num; ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, @@ -73,7 +73,7 @@ Signed-off-by: Sathishkumar Muruganandam return 0; } -@@ -1660,7 +1663,7 @@ int ath11k_nss_ext_vdev_create(struct at +@@ -1616,7 +1619,7 @@ int ath11k_nss_ext_vdev_create(struct at return -EINVAL; } @@ -82,7 +82,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ret) return ret; -@@ -1773,6 +1776,86 @@ free: +@@ -1729,6 +1732,86 @@ free: return ret; } @@ -171,7 +171,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_nss_set_peer_sec_type(struct ath11k *ar, --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -179,6 +179,10 @@ struct arvif_nss { +@@ -176,6 +176,10 @@ struct arvif_nss { bool added; /* Flag to notify if ext vdev is up/down */ bool ext_vdev_up; @@ -182,7 +182,7 @@ Signed-off-by: Sathishkumar Muruganandam /* WDS cfg should be done only once for ext vdev */ bool wds_cfg_done; bool created; -@@ -246,6 +250,9 @@ void ath11k_nss_ext_vdev_unregister(stru +@@ -243,6 +247,9 @@ void ath11k_nss_ext_vdev_unregister(stru int ath11k_nss_ext_vdev_up(struct ath11k_vif *arvif); int ath11k_nss_ext_vdev_down(struct ath11k_vif *arvif); void ath11k_nss_ext_vdev_delete(struct ath11k_vif *arvif); @@ -192,7 +192,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_nss_set_peer_sec_type(struct ath11k *ar, struct ath11k_peer *peer, struct ieee80211_key_conf *key_conf); void ath11k_nss_update_sta_stats(struct ath11k_vif *arvif, -@@ -378,6 +385,18 @@ static inline int ath11k_nss_ext_vdev_do +@@ -375,6 +382,18 @@ static inline int ath11k_nss_ext_vdev_do { return 0; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch similarity index 91% rename from package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch rename to package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch index 2361523d394ac4..3687af833b5082 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/904-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch @@ -36,7 +36,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -98,6 +98,11 @@ enum ath11k_crypt_mode { +@@ -97,6 +97,11 @@ enum ath11k_crypt_mode { ATH11K_CRYPT_MODE_SW, }; @@ -48,7 +48,7 @@ Signed-off-by: Sathishkumar Muruganandam static inline enum wme_ac ath11k_tid_to_ac(u32 tid) { return (((tid == 0) || (tid == 3)) ? WME_AC_BE : -@@ -325,6 +330,20 @@ struct ath11k_mgmt_frame_stats { +@@ -324,6 +329,20 @@ struct ath11k_mgmt_frame_stats { u32 tx_compl_fail[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; }; @@ -69,9 +69,9 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif { u32 vdev_id; enum wmi_vdev_type vdev_type; -@@ -387,6 +406,11 @@ struct ath11k_vif { - struct ath11k_mgmt_frame_stats mgmt_stats; +@@ -388,6 +407,11 @@ struct ath11k_vif { struct arvif_nss nss; + #endif struct list_head ap_vlan_arvifs; + /* list required by Dynamic VLAN during fw_recovery */ + struct list_head dyn_vlan_cfg; @@ -83,7 +83,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif_iter { --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -348,6 +348,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n +@@ -346,6 +346,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n return ret; } @@ -94,7 +94,7 @@ Signed-off-by: Sathishkumar Muruganandam u8 ath11k_mac_bw_to_mac80211_bw(u8 bw) { u8 ret = 0; -@@ -720,6 +724,33 @@ u8 ath11k_mac_get_target_pdev_id(struct +@@ -718,6 +722,33 @@ u8 ath11k_mac_get_target_pdev_id(struct return ar->ab->target_pdev_ids[0].pdev_id; } @@ -128,7 +128,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_pdev_caps_update(struct ath11k *ar) { struct ath11k_base *ab = ar->ab; -@@ -4173,6 +4204,9 @@ static int ath11k_install_key(struct ath +@@ -4167,6 +4198,9 @@ static int ath11k_install_key(struct ath if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) return 0; @@ -138,7 +138,7 @@ Signed-off-by: Sathishkumar Muruganandam if (cmd == DISABLE_KEY) { arg.key_cipher = WMI_CIPHER_NONE; arg.key_data = NULL; -@@ -4262,15 +4296,40 @@ static int ath11k_clear_peer_keys(struct +@@ -4256,15 +4290,40 @@ static int ath11k_clear_peer_keys(struct return first_errno; } @@ -181,7 +181,7 @@ Signed-off-by: Sathishkumar Muruganandam const u8 *peer_addr; int ret = 0; u32 flags = 0; -@@ -4288,17 +4347,38 @@ static int ath11k_mac_op_set_key(struct +@@ -4282,17 +4341,38 @@ static int ath11k_mac_op_set_key(struct if (key->keyidx > WMI_MAX_KEY_INDEX) return -ENOSPC; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam /* the peer should not disappear in mid-way (unless FW goes awry) since * we already hold conf_mutex. we just make sure its there now. */ -@@ -4343,6 +4423,74 @@ static int ath11k_mac_op_set_key(struct +@@ -4337,6 +4417,74 @@ static int ath11k_mac_op_set_key(struct goto exit; } @@ -299,7 +299,7 @@ Signed-off-by: Sathishkumar Muruganandam spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr); -@@ -4365,6 +4513,27 @@ static int ath11k_mac_op_set_key(struct +@@ -4359,6 +4507,27 @@ static int ath11k_mac_op_set_key(struct goto unlock; } @@ -327,7 +327,7 @@ Signed-off-by: Sathishkumar Muruganandam if (peer && cmd == SET_KEY) { peer->keys[key->keyidx] = key; if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) { -@@ -4374,18 +4543,23 @@ static int ath11k_mac_op_set_key(struct +@@ -4368,18 +4537,23 @@ static int ath11k_mac_op_set_key(struct peer->mcast_keyidx = key->keyidx; peer->sec_type_grp = ath11k_dp_tx_get_encrypt_type(key->cipher); } @@ -388,7 +388,7 @@ Signed-off-by: Sathishkumar Muruganandam static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -5306,6 +5507,34 @@ static int ath11k_mac_op_sta_state(struc +@@ -5295,6 +5496,34 @@ static int ath11k_mac_op_sta_state(struc if (ret) ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", sta->addr, arvif->vdev_id, ret); @@ -423,7 +423,7 @@ Signed-off-by: Sathishkumar Muruganandam } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { -@@ -7045,7 +7274,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7027,7 +7256,7 @@ static int ath11k_mac_op_add_interface(s if ((vif->type == NL80211_IFTYPE_AP_VLAN || vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && @@ -432,7 +432,7 @@ Signed-off-by: Sathishkumar Muruganandam vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; -@@ -7058,6 +7287,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7040,6 +7269,7 @@ static int ath11k_mac_op_add_interface(s vif->addr, ret); goto err; } @@ -440,7 +440,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); return ret; } -@@ -7082,6 +7312,20 @@ static int ath11k_mac_op_add_interface(s +@@ -7064,6 +7294,20 @@ static int ath11k_mac_op_add_interface(s arvif->vdev_id = bit; arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; @@ -461,7 +461,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_STATION: -@@ -7122,7 +7366,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7104,7 +7348,7 @@ static int ath11k_mac_op_add_interface(s if (ret) { ath11k_warn(ab, "failed to create WMI vdev %d: %d\n", arvif->vdev_id, ret); @@ -470,7 +470,7 @@ Signed-off-by: Sathishkumar Muruganandam } ar->num_created_vdevs++; -@@ -7281,7 +7525,7 @@ err_peer_del: +@@ -7263,7 +7507,7 @@ err_peer_del: if (fbret) { ath11k_warn(ar->ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n", vif->addr, arvif->vdev_id, fbret); @@ -479,7 +479,7 @@ Signed-off-by: Sathishkumar Muruganandam } } -@@ -7292,6 +7536,8 @@ err_vdev_del: +@@ -7274,6 +7518,8 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -488,7 +488,7 @@ Signed-off-by: Sathishkumar Muruganandam err: mutex_unlock(&ar->conf_mutex); -@@ -7389,6 +7635,7 @@ err_vdev_del: +@@ -7371,6 +7617,7 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -496,7 +496,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_peer_cleanup(ar, arvif->vdev_id); idr_for_each(&ar->txmgmt_idr, -@@ -10113,8 +10360,11 @@ static int __ath11k_mac_register(struct +@@ -9959,8 +10206,11 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; @@ -511,7 +511,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ret) { --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -2001,6 +2001,7 @@ int ath11k_wmi_vdev_install_key(struct a +@@ -1939,6 +1939,7 @@ int ath11k_wmi_vdev_install_key(struct a cmd->key_len = arg->key_len; cmd->key_txmic_len = arg->key_txmic_len; cmd->key_rxmic_len = arg->key_rxmic_len; @@ -519,7 +519,7 @@ Signed-off-by: Sathishkumar Muruganandam if (arg->key_rsc_counter) memcpy(&cmd->key_rsc_counter, &arg->key_rsc_counter, -@@ -4275,6 +4276,7 @@ ath11k_wmi_copy_resource_config(struct w +@@ -4213,6 +4214,7 @@ ath11k_wmi_copy_resource_config(struct w wmi_cfg->flags2 = WMI_RSRC_CFG_FLAG2_CALC_NEXT_DTIM_COUNT_SET; wmi_cfg->ema_max_vap_cnt = tg_cfg->ema_max_vap_cnt; wmi_cfg->ema_max_profile_period = tg_cfg->ema_max_profile_period; @@ -527,7 +527,7 @@ Signed-off-by: Sathishkumar Muruganandam } static int ath11k_init_cmd_send(struct ath11k_pdev_wmi *wmi, -@@ -4497,6 +4499,9 @@ int ath11k_wmi_cmd_init(struct ath11k_ba +@@ -4435,6 +4437,9 @@ int ath11k_wmi_cmd_init(struct ath11k_ba memset(&init_param, 0, sizeof(init_param)); memset(&config, 0, sizeof(config)); @@ -547,7 +547,7 @@ Signed-off-by: Sathishkumar Muruganandam u32 key_flags; u32 key_cipher; u32 key_len; -@@ -5846,6 +5847,7 @@ struct target_resource_config { +@@ -5774,6 +5775,7 @@ struct target_resource_config { u32 bpf_instruction_size; u32 max_bssid_rx_filters; u32 use_pdev_id; diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch new file mode 100644 index 00000000000000..ee1e977310c046 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -0,0 +1,102 @@ +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -1048,6 +1049,7 @@ struct ath11k_base { + } testmode; + #endif + ++ bool stats_disable; + /* must be last */ + u8 drv_priv[] __aligned(sizeof(void *)); + }; +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -973,6 +973,79 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++static void ath11k_debug_config_mon_status(struct ath11k *ar, bool enable) ++{ ++ struct htt_rx_ring_tlv_filter tlv_filter = {0}; ++ struct ath11k_base *ab = ar->ab; ++ int i; ++ u32 ring_id; ++ ++ if (enable) ++ tlv_filter = ath11k_mac_mon_status_filter_default; ++ ++ for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { ++ ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; ++ ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ++ ar->dp.mac_id + i, ++ HAL_RXDMA_MONITOR_STATUS, ++ DP_RX_BUFFER_SIZE, ++ &tlv_filter); ++ } ++} ++ ++static ssize_t ath11k_write_stats_disable(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_base *ab = file->private_data; ++ struct ath11k_pdev *pdev; ++ bool disable; ++ int ret, i, radioup = 0; ++ u32 mask = 0; ++ ++ for (i = 0; i < ab->num_radios; i++) { ++ pdev = &ab->pdevs[i]; ++ if (pdev && pdev->ar) { ++ radioup = 1; ++ break; ++ } ++ } ++ ++ if (radioup == 0) { ++ ath11k_err(ab, "radio is not up\n"); ++ ret = -ENETDOWN; ++ goto exit; ++ } ++ ++ if (kstrtobool_from_user(user_buf, count, &disable)) ++ return -EINVAL; ++ ++ if (disable != ab->stats_disable) { ++ ab->stats_disable = disable; ++ for (i = 0; i < ab->num_radios; i++) { ++ pdev = &ab->pdevs[i]; ++ if (pdev && pdev->ar) { ++ ath11k_debug_config_mon_status(pdev->ar, !disable); ++ ++ if (!disable) ++ mask = HTT_PPDU_STATS_TAG_DEFAULT; ++ ++ ath11k_dp_tx_htt_h2t_ppdu_stats_req(pdev->ar, mask); ++ } ++ } ++ } ++ ++ ret = count; ++ ++exit: ++ return ret; ++} ++ ++static const struct file_operations fops_soc_stats_disable = { ++ .open = simple_open, ++ .write = ath11k_write_stats_disable, ++}; ++ + int ath11k_debugfs_pdev_create(struct ath11k_base *ab) + { + if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) +@@ -1022,6 +1095,8 @@ int ath11k_debugfs_soc_create(struct ath + ret = PTR_ERR(ab->debugfs_soc); + goto out; + } ++ debugfs_create_file("stats_disable", 0600, ab->debugfs_soc, ab, ++ &fops_soc_stats_disable); + + ret = 0; + + diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch b/package/kernel/mac80211/patches/nss/ath11k/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch similarity index 96% rename from package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch rename to package/kernel/mac80211/patches/nss/ath11k/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch index c054ee146f748a..db2bbfa0d2845d 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-003-ath11k-allocate-dst-ring-descriptors-from-cacheable-.patch @@ -24,7 +24,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -705,6 +705,7 @@ void ath11k_dp_tx_completion_handler(str +@@ -761,6 +761,7 @@ void ath11k_dp_tx_completion_handler(str struct sk_buff *msdu; struct hal_tx_status ts = { 0 }; struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; @@ -32,7 +32,7 @@ Signed-off-by: P Praneesh u32 *desc; u32 msdu_id; u8 mac_id; -@@ -713,9 +714,18 @@ void ath11k_dp_tx_completion_handler(str +@@ -769,9 +770,18 @@ void ath11k_dp_tx_completion_handler(str ath11k_hal_srng_access_begin(ab, status_ring); @@ -131,7 +131,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/hal.h +++ b/drivers/net/wireless/ath/ath11k/hal.h -@@ -946,8 +946,12 @@ void ath11k_hal_srng_get_params(struct a +@@ -945,8 +945,12 @@ void ath11k_hal_srng_get_params(struct a u32 *ath11k_hal_srng_dst_get_next_entry(struct ath11k_base *ab, struct hal_srng *srng); u32 *ath11k_hal_srng_dst_peek(struct ath11k_base *ab, struct hal_srng *srng); diff --git a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch similarity index 70% rename from package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch rename to package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index 9bc2b50f7cbd45..8034b6186ee671 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -23,7 +23,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -135,6 +135,7 @@ struct ath11k_skb_rxcb { +@@ -143,6 +143,7 @@ struct ath11k_skb_rxcb { u8 tid; u16 peer_id; u16 seq_no; @@ -31,109 +31,9 @@ Signed-off-by: P Praneesh }; enum ath11k_hw_rev { -@@ -1039,6 +1040,7 @@ struct ath11k_base { - struct ath11k_num_vdevs_peers *num_vdevs_peers; - - u32 rx_hash; -+ bool stats_disable; - - /* must be last */ - u8 drv_priv[] __aligned(sizeof(void *)); ---- a/drivers/net/wireless/ath/ath11k/debugfs.c -+++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1020,6 +1020,80 @@ static const struct file_operations fops - .open = simple_open, - .write = ath11k_write_rx_hash, - }; -+ -+static void ath11k_debug_config_mon_status(struct ath11k *ar, bool enable) -+{ -+ struct htt_rx_ring_tlv_filter tlv_filter = {0}; -+ struct ath11k_base *ab = ar->ab; -+ int i; -+ u32 ring_id; -+ -+ if (enable) -+ tlv_filter = ath11k_mac_mon_status_filter_default; -+ -+ for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { -+ ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; -+ ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, -+ ar->dp.mac_id + i, -+ HAL_RXDMA_MONITOR_STATUS, -+ DP_RX_BUFFER_SIZE, -+ &tlv_filter); -+ } -+} -+ -+static ssize_t ath11k_write_stats_disable(struct file *file, -+ const char __user *user_buf, -+ size_t count, loff_t *ppos) -+{ -+ struct ath11k_base *ab = file->private_data; -+ struct ath11k_pdev *pdev; -+ bool disable; -+ int ret, i, radioup = 0; -+ u32 mask = 0; -+ -+ for (i = 0; i < ab->num_radios; i++) { -+ pdev = &ab->pdevs[i]; -+ if (pdev && pdev->ar) { -+ radioup = 1; -+ break; -+ } -+ } -+ -+ if (radioup == 0) { -+ ath11k_err(ab, "radio is not up\n"); -+ ret = -ENETDOWN; -+ goto exit; -+ } -+ -+ if (kstrtobool_from_user(user_buf, count, &disable)) -+ return -EINVAL; -+ -+ if (disable != ab->stats_disable) { -+ ab->stats_disable = disable; -+ for (i = 0; i < ab->num_radios; i++) { -+ pdev = &ab->pdevs[i]; -+ if (pdev && pdev->ar) { -+ ath11k_debug_config_mon_status(pdev->ar, !disable); -+ -+ if (!disable) -+ mask = HTT_PPDU_STATS_TAG_DEFAULT; -+ -+ ath11k_dp_tx_htt_h2t_ppdu_stats_req(pdev->ar, mask); -+ } -+ } -+ } -+ -+ ret = count; -+ -+exit: -+ return ret; -+} -+ -+static const struct file_operations fops_soc_stats_disable = { -+ .open = simple_open, -+ .write = ath11k_write_stats_disable, -+}; -+ - int ath11k_debugfs_pdev_create(struct ath11k_base *ab) - { - if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) -@@ -1035,7 +1109,7 @@ int ath11k_debugfs_pdev_create(struct at - debugfs_create_file("sram", 0400, ab->debugfs_soc, ab, - &fops_sram_dump); - -- debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, -+ debugfs_create_file("rx_hash", 0600, ab->debugfs_soc, ab, - &fops_soc_rx_hash); - - --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -375,6 +375,12 @@ static int ath11k_dp_purge_mon_ring(stru +@@ -340,6 +340,12 @@ static int ath11k_dp_purge_mon_ring(stru return -ETIMEDOUT; } @@ -146,7 +46,16 @@ Signed-off-by: P Praneesh /* Returns number of Rx buffers replenished */ int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id, struct dp_rxdma_ring *rx_ring, -@@ -2402,10 +2408,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b +@@ -1664,7 +1670,7 @@ int ath11k_dp_htt_tlv_iter(struct ath11k + len -= sizeof(*tlv); + + if (tlv_len > len) { +- ath11k_err(ab, "htt tlv parse failure of tag %hhu at byte %zd (%zu bytes left, %hhu expected)\n", ++ ath11k_err(ab, "htt tlv parse failure of tag %hu at byte %zd (%zu bytes left, %hu expected)\n", + tlv_tag, ptr - begin, len, tlv_len); + return -EINVAL; + } +@@ -2448,10 +2454,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b return peer; } @@ -208,17 +117,22 @@ Signed-off-by: P Praneesh { bool fill_crypto_hdr; enum hal_encrypt_type enctype; -@@ -2417,6 +2473,9 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2462,9 +2518,13 @@ static void ath11k_dp_rx_h_mpdu(struct a + struct rx_attention *rx_attention; u32 err_bitmap; - + struct wireless_dev *wdev = NULL; + struct ath11k_sta *arsta = NULL; + /* PN for multicast packets will be checked in mac80211 */ rxcb = ATH11K_SKB_RXCB(msdu); - fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); -@@ -2430,6 +2489,30 @@ static void ath11k_dp_rx_h_mpdu(struct a +- fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); ++ if (!ar->ab->nss.enabled) ++ fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); + rxcb->is_mcbc = fill_crypto_hdr; + + if (rxcb->is_mcbc) { +@@ -2475,6 +2535,26 @@ static void ath11k_dp_rx_h_mpdu(struct a spin_lock_bh(&ar->ab->base_lock); peer = ath11k_dp_rx_h_find_peer(ar->ab, msdu); if (peer) { @@ -238,18 +152,23 @@ Signed-off-by: P Praneesh + if (peer->sta) + arsta = + (struct ath11k_sta *)peer->sta->drv_priv; -+ if (arsta) -+ atomic_inc(&arsta->drv_rx_pkts.pkts_out_to_netif); + return; + } + } -+ -+ *fast_rx = false; + if (rxcb->is_mcbc) enctype = peer->sec_type_grp; else -@@ -2693,7 +2776,8 @@ static void ath11k_dp_rx_deliver_msdu(st +@@ -2484,6 +2564,8 @@ static void ath11k_dp_rx_h_mpdu(struct a + } + spin_unlock_bh(&ar->ab->base_lock); + ++ *fast_rx = false; ++ + rx_attention = ath11k_dp_rx_get_attention(ar->ab, rx_desc); + err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention); + if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) +@@ -2725,7 +2807,8 @@ static void ath11k_dp_rx_deliver_msdu(st static int ath11k_dp_rx_process_msdu(struct ath11k *ar, struct sk_buff *msdu, struct sk_buff_head *msdu_list, @@ -259,7 +178,7 @@ Signed-off-by: P Praneesh { struct ath11k_base *ab = ar->ab; struct hal_rx_desc *rx_desc, *lrx_desc; -@@ -2775,8 +2859,13 @@ static int ath11k_dp_rx_process_msdu(str +@@ -2792,8 +2875,13 @@ static int ath11k_dp_rx_process_msdu(str } } @@ -274,7 +193,7 @@ Signed-off-by: P Praneesh rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -2791,10 +2880,12 @@ static void ath11k_dp_rx_process_receive +@@ -2808,10 +2896,12 @@ static void ath11k_dp_rx_process_receive struct sk_buff_head *msdu_list, int mac_id) { @@ -287,7 +206,7 @@ Signed-off-by: P Praneesh if (skb_queue_empty(msdu_list)) return; -@@ -2811,7 +2902,12 @@ static void ath11k_dp_rx_process_receive +@@ -2828,7 +2918,12 @@ static void ath11k_dp_rx_process_receive } while ((msdu = __skb_dequeue(msdu_list))) { @@ -301,7 +220,7 @@ Signed-off-by: P Praneesh if (unlikely(ret)) { ath11k_dbg(ab, ATH11K_DBG_DATA, "Unable to process msdu %d", ret); -@@ -2819,7 +2915,10 @@ static void ath11k_dp_rx_process_receive +@@ -2836,7 +2931,10 @@ static void ath11k_dp_rx_process_receive continue; } @@ -313,15 +232,29 @@ Signed-off-by: P Praneesh } } -@@ -4117,6 +4216,7 @@ static int ath11k_dp_rx_h_null_q_desc(st - struct ath11k_sta *arsta = NULL; - u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; - u32 peer_id; -+ bool fast_rx; +@@ -2845,11 +2943,12 @@ void ath11k_dp_rx_from_nss(struct ath11k + { + struct ieee80211_rx_status rx_status = {0}; + struct ath11k_skb_rxcb *rxcb; ++ bool fast_rx = false; - msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ar->ab, desc); + rxcb = ATH11K_SKB_RXCB(msdu); + + ath11k_dp_rx_h_ppdu(ar, rxcb->rx_desc, &rx_status); +- ath11k_dp_rx_h_mpdu(ar, msdu, rxcb->rx_desc, &rx_status); ++ ath11k_dp_rx_h_mpdu(ar, msdu, rxcb->rx_desc, &rx_status, &fast_rx); + + rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -4160,7 +4260,8 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4316,6 +4415,7 @@ static int ath11k_dp_rx_h_null_q_desc(st + struct ieee80211_rx_status *status, + struct sk_buff_head *msdu_list) + { ++ bool fast_rx; + u16 msdu_len; + struct hal_rx_desc *desc = (struct hal_rx_desc *)msdu->data; + struct rx_attention *rx_attention; +@@ -4365,7 +4465,8 @@ static int ath11k_dp_rx_h_null_q_desc(st } ath11k_dp_rx_h_ppdu(ar, desc, status); @@ -333,7 +266,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -303,6 +303,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge +@@ -293,6 +293,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge __le32_to_cpu(desc->u.ipq8074.msdu_start.info2)); } @@ -350,7 +283,7 @@ Signed-off-by: P Praneesh static bool ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) { return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_CTRL_VALID, -@@ -590,6 +600,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge +@@ -470,6 +480,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge __le32_to_cpu(desc->u.qcn9074.msdu_start.info2)); } @@ -367,7 +300,7 @@ Signed-off-by: P Praneesh static bool ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) { return !!FIELD_GET(RX_MPDU_START_INFO11_MPDU_SEQ_CTRL_VALID, -@@ -1132,6 +1152,7 @@ const struct ath11k_hw_ops qca6390_ops = +@@ -1025,6 +1045,7 @@ const struct ath11k_hw_ops qca6390_ops = .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, @@ -375,7 +308,7 @@ Signed-off-by: P Praneesh .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, -@@ -1293,6 +1314,7 @@ const struct ath11k_hw_ops ipq5018_ops = +@@ -1189,6 +1210,7 @@ const struct ath11k_hw_ops ipq5018_ops = .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, @@ -385,7 +318,7 @@ Signed-off-by: P Praneesh .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -287,6 +287,7 @@ struct ath11k_hw_ops { +@@ -260,6 +260,7 @@ struct ath11k_hw_ops { u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc); @@ -395,7 +328,7 @@ Signed-off-by: P Praneesh bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -5201,6 +5201,14 @@ static int ath11k_mac_op_sta_state(struc +@@ -5536,6 +5536,14 @@ static int ath11k_mac_op_sta_state(struc } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch similarity index 88% rename from package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch rename to package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch index 79906c8d3a4ab3..3c4d324161644c 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/911-244-ath11k-dp-tx-perf.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch @@ -26,7 +26,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -118,6 +118,7 @@ static inline enum wme_ac ath11k_tid_to_ +@@ -115,6 +115,7 @@ static inline enum wme_ac ath11k_tid_to_ enum ath11k_skb_flags { ATH11K_SKB_HW_80211_ENCAP = BIT(0), ATH11K_SKB_CIPHER_SET = BIT(1), @@ -34,22 +34,23 @@ Signed-off-by: P Praneesh }; struct ath11k_skb_cb { -@@ -919,7 +920,12 @@ struct ath11k_soc_dp_tx_err_stats { +@@ -883,10 +884,13 @@ struct ath11k_dp_ring_bp_stats { + struct ath11k_soc_dp_tx_err_stats { + /* TCL Ring Descriptor unavailable */ + u32 desc_na[DP_TCL_NUM_RING_MAX]; ++ /* TCL Ring IDR unavailable */ ++ u32 idr_na[DP_TCL_NUM_RING_MAX]; /* Other failures during dp_tx due to mem allocation failure * idr unavailable etc. */ -+ /* TCL Ring IDR unavailable */ -+ u32 idr_na[DP_TCL_NUM_RING_MAX]; -+ atomic_t misc_fail; + atomic_t max_fail; -+ /* Tx failures due to NSS Tx error status */ + /* Tx failures due to NSS Tx error status */ atomic_t nss_tx_fail; }; - --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c -@@ -362,7 +362,7 @@ void ath11k_dp_stop_shadow_timers(struct +@@ -358,7 +358,7 @@ void ath11k_dp_stop_shadow_timers(struct if (!ab->hw_params.supports_shadow_regs) return; @@ -58,7 +59,7 @@ Signed-off-by: P Praneesh ath11k_dp_shadow_stop_timer(ab, &ab->dp.tx_ring_timer[i]); ath11k_dp_shadow_stop_timer(ab, &ab->dp.reo_cmd_timer); -@@ -377,7 +377,7 @@ static void ath11k_dp_srng_common_cleanu +@@ -373,7 +373,7 @@ static void ath11k_dp_srng_common_cleanu ath11k_dp_srng_cleanup(ab, &dp->wbm_desc_rel_ring); ath11k_dp_srng_cleanup(ab, &dp->tcl_cmd_ring); ath11k_dp_srng_cleanup(ab, &dp->tcl_status_ring); @@ -67,7 +68,7 @@ Signed-off-by: P Praneesh ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_data_ring); ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_comp_ring); } -@@ -411,6 +411,11 @@ static int ath11k_dp_srng_common_setup(s +@@ -407,6 +407,11 @@ static int ath11k_dp_srng_common_setup(s goto err; } @@ -79,7 +80,7 @@ Signed-off-by: P Praneesh ret = ath11k_dp_srng_setup(ab, &dp->tcl_status_ring, HAL_TCL_STATUS, 0, 0, DP_TCL_STATUS_RING_SIZE); if (ret) { -@@ -418,7 +423,7 @@ static int ath11k_dp_srng_common_setup(s +@@ -414,7 +419,7 @@ static int ath11k_dp_srng_common_setup(s goto err; } @@ -88,7 +89,7 @@ Signed-off-by: P Praneesh tcl_num = ab->hw_params.hal_params->tcl2wbm_rbm_map[i].tcl_ring_num; wbm_num = ab->hw_params.hal_params->tcl2wbm_rbm_map[i].wbm_ring_num; -@@ -441,7 +446,7 @@ static int ath11k_dp_srng_common_setup(s +@@ -437,7 +442,7 @@ static int ath11k_dp_srng_common_setup(s } srng = &ab->hal.srng_list[dp->tx_ring[i].tcl_data_ring.ring_id]; @@ -97,7 +98,7 @@ Signed-off-by: P Praneesh ath11k_dp_shadow_init_timer(ab, &dp->tx_ring_timer[i], ATH11K_SHADOW_DP_TIMER_INTERVAL, -@@ -1062,7 +1067,7 @@ void ath11k_dp_free(struct ath11k_base * +@@ -1051,7 +1056,7 @@ void ath11k_dp_free(struct ath11k_base * ath11k_dp_reo_cmd_list_cleanup(ab); @@ -106,7 +107,7 @@ Signed-off-by: P Praneesh spin_lock_bh(&dp->tx_ring[i].tx_idr_lock); idr_for_each(&dp->tx_ring[i].txbuf_idr, ath11k_dp_tx_pending_cleanup, ab); -@@ -1114,7 +1119,7 @@ int ath11k_dp_alloc(struct ath11k_base * +@@ -1102,7 +1107,7 @@ int ath11k_dp_alloc(struct ath11k_base * size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE; @@ -117,7 +118,7 @@ Signed-off-by: P Praneesh dp->tx_ring[i].tcl_data_ring_id = i; --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -121,27 +121,35 @@ int ath11k_dp_tx(struct ath11k *ar, stru +@@ -134,28 +134,34 @@ int ath11k_dp_tx(struct ath11k *ar, stru u32 ring_selector = 0; u8 ring_map = 0; bool tcl_ring_retry, is_diff_encap = false; @@ -131,9 +132,10 @@ Signed-off-by: P Praneesh !ieee80211_is_data(hdr->frame_control))) return -ENOTSUPP; -- ring_selector = ab->hw_params.hw_ops->get_ring_selector(skb); +- pool_id = skb_get_queue_mapping(skb) & (ATH11K_HW_MAX_QUEUES - 1); + max_tx_ring = ab->hw_params.max_tx_ring; -+ + +- ring_selector = ab->hw_params.hw_ops->get_ring_selector(skb); +#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + if (unlikely(atomic_read(&ab->num_max_allowed) > DP_TX_COMP_MAX_ALLOWED)) { + atomic_inc(&ab->soc_stats.tx_err.max_fail); @@ -141,7 +143,7 @@ Signed-off-by: P Praneesh + } +#endif + ring_selector = smp_processor_id();; - pool_id = ring_selector; ++ pool_id = ring_selector; tcl_ring_sel: tcl_ring_retry = false; @@ -153,16 +155,15 @@ Signed-off-by: P Praneesh + DP_TCL_NUM_RING_MAX - 1 : ring_id; - ring_map |= BIT(ti.ring_id); ++ ring_map |= BIT(ring_id); - tx_ring = &dp->tx_ring[ti.ring_id]; -+ ring_map |= BIT(ring_id); -+ + ti.buf_id = tcl_ring_id + HAL_RX_BUF_RBM_SW0_BM; + tx_ring = &dp->tx_ring[tcl_ring_id]; spin_lock_bh(&tx_ring->tx_idr_lock); ret = idr_alloc(&tx_ring->txbuf_idr, skb, 0, -@@ -149,9 +157,9 @@ tcl_ring_sel: +@@ -163,9 +169,9 @@ tcl_ring_sel: spin_unlock_bh(&tx_ring->tx_idr_lock); if (unlikely(ret < 0)) { @@ -174,7 +175,7 @@ Signed-off-by: P Praneesh return -ENOSPC; } -@@ -260,6 +268,11 @@ tcl_ring_sel: +@@ -276,6 +282,11 @@ tcl_ring_sel: ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; } @@ -186,7 +187,7 @@ Signed-off-by: P Praneesh ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); if (unlikely(dma_mapping_error(ab->dev, ti.paddr))) { atomic_inc(&ab->soc_stats.tx_err.misc_fail); -@@ -268,13 +281,13 @@ tcl_ring_sel: +@@ -284,13 +295,13 @@ tcl_ring_sel: goto fail_remove_idr; } @@ -205,7 +206,7 @@ Signed-off-by: P Praneesh tcl_ring = &ab->hal.srng_list[hal_ring_id]; spin_lock_bh(&tcl_ring->lock); -@@ -287,7 +300,7 @@ tcl_ring_sel: +@@ -303,7 +314,7 @@ tcl_ring_sel: * desc because the desc is directly enqueued onto hw queue. */ ath11k_hal_srng_access_end(ab, tcl_ring); @@ -214,7 +215,7 @@ Signed-off-by: P Praneesh spin_unlock_bh(&tcl_ring->lock); ret = -ENOMEM; -@@ -296,8 +309,8 @@ tcl_ring_sel: +@@ -312,8 +323,8 @@ tcl_ring_sel: * checking this ring earlier for each pkt tx. * Restart ring selection if some rings are not checked yet. */ @@ -225,7 +226,7 @@ Signed-off-by: P Praneesh tcl_ring_retry = true; ring_selector++; } -@@ -308,17 +321,17 @@ tcl_ring_sel: +@@ -324,17 +335,17 @@ tcl_ring_sel: ath11k_hal_tx_cmd_desc_setup(ab, hal_tcl_desc + sizeof(struct hal_tlv_hdr), &ti); @@ -246,7 +247,7 @@ Signed-off-by: P Praneesh return 0; -@@ -365,7 +378,6 @@ static void ath11k_dp_tx_free_txbuf(stru +@@ -381,7 +392,6 @@ static void ath11k_dp_tx_free_txbuf(stru ar = ab->pdevs[mac_id].ar; if (atomic_dec_and_test(&ar->dp.num_tx_pending)) wake_up(&ar->dp.tx_empty_waitq); @@ -254,7 +255,7 @@ Signed-off-by: P Praneesh } static void -@@ -379,6 +391,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct +@@ -395,6 +405,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct struct ath11k_skb_cb *skb_cb; struct ath11k *ar; struct ath11k_peer *peer; @@ -262,7 +263,7 @@ Signed-off-by: P Praneesh spin_lock(&tx_ring->tx_idr_lock); msdu = idr_remove(&tx_ring->txbuf_idr, ts->msdu_id); -@@ -397,10 +410,30 @@ ath11k_dp_tx_htt_tx_complete_buf(struct +@@ -413,10 +424,30 @@ ath11k_dp_tx_htt_tx_complete_buf(struct if (atomic_dec_and_test(&ar->dp.num_tx_pending)) wake_up(&ar->dp.tx_empty_waitq); @@ -294,7 +295,7 @@ Signed-off-by: P Praneesh if (!skb_cb->vif) { ieee80211_free_txskb(ar->hw, msdu); return; -@@ -616,6 +649,7 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -632,6 +663,7 @@ static void ath11k_dp_tx_complete_msdu(s struct ath11k_peer *peer; struct ath11k_sta *arsta; struct rate_info rate; @@ -302,7 +303,7 @@ Signed-off-by: P Praneesh if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { /* Must not happen */ -@@ -626,6 +660,20 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -642,6 +674,20 @@ static void ath11k_dp_tx_complete_msdu(s dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); @@ -323,7 +324,7 @@ Signed-off-by: P Praneesh if (unlikely(!rcu_access_pointer(ab->pdevs_active[ar->pdev_idx]))) { ieee80211_free_txskb(ar->hw, msdu); return; -@@ -680,7 +728,7 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -696,7 +742,7 @@ static void ath11k_dp_tx_complete_msdu(s spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find_by_id(ab, ts->peer_id); @@ -332,7 +333,7 @@ Signed-off-by: P Praneesh ath11k_dbg(ab, ATH11K_DBG_DATA, "dp_tx: failed to find the peer with peer_id %d\n", ts->peer_id); -@@ -736,19 +784,36 @@ static inline void ath11k_dp_tx_status_p +@@ -752,19 +798,36 @@ static inline void ath11k_dp_tx_status_p ts->rate_stats = 0; } @@ -342,7 +343,7 @@ Signed-off-by: P Praneesh + + if (FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0) == + HAL_WBM_REL_SRC_MODULE_FW) { -+ status_desc = ((u8 *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; ++ status_desc = ((struct htt_tx_wbm_completion *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; + + /* Dont consider HTT_TX_COMP_STATUS_MEC_NOTIFY */ + if (FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, status_desc->info0) == @@ -371,7 +372,7 @@ Signed-off-by: P Praneesh spin_lock_bh(&status_ring->lock); -@@ -763,33 +828,27 @@ void ath11k_dp_tx_completion_handler(str +@@ -779,33 +842,27 @@ void ath11k_dp_tx_completion_handler(str ath11k_hal_srng_dst_invalidate_entry(ab, status_ring, valid_entries); @@ -384,7 +385,7 @@ Signed-off-by: P Praneesh - ATH11K_TX_COMPL_NEXT(tx_ring->tx_status_head); - } + while ((desc = ath11k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { -+ if (!ath11k_dp_tx_completion_valid(desc)) ++ if (!ath11k_dp_tx_completion_valid((struct hal_wbm_release_ring *)desc)) + continue; - if (unlikely((ath11k_hal_srng_dst_peek(ab, status_ring) != NULL) && @@ -419,7 +420,7 @@ Signed-off-by: P Praneesh ath11k_dp_tx_status_parse(ab, tx_status, &ts); desc_id = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, -@@ -822,7 +881,6 @@ void ath11k_dp_tx_completion_handler(str +@@ -838,7 +895,6 @@ void ath11k_dp_tx_completion_handler(str wake_up(&ar->dp.tx_empty_waitq); ath11k_dp_tx_complete_msdu(ar, msdu, &ts); @@ -429,7 +430,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6723,12 +6723,22 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6643,12 +6643,22 @@ static void ath11k_mac_op_tx(struct ieee if (control->sta) arsta = ath11k_sta_to_arsta(control->sta); @@ -453,7 +454,7 @@ Signed-off-by: P Praneesh ieee80211_free_txskb(ar->hw, skb); return; } -@@ -7690,7 +7700,7 @@ err_vdev_del: +@@ -7596,7 +7606,7 @@ err_vdev_del: idr_for_each(&ar->txmgmt_idr, ath11k_mac_vif_txmgmt_idr_remove, vif); @@ -464,7 +465,7 @@ Signed-off-by: P Praneesh ath11k_mac_vif_unref, vif); --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -833,10 +833,22 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -832,10 +832,22 @@ static ssize_t ath11k_debugfs_dump_soc_d len += scnprintf(buf + len, size - len, "ring%d: %u\n", i, soc_stats->tx_err.desc_na[i]); @@ -489,7 +490,7 @@ Signed-off-by: P Praneesh if (len > size) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -192,7 +192,6 @@ static struct ath11k_hw_params ath11k_hw +@@ -186,7 +186,6 @@ static struct ath11k_hw_params ath11k_hw .supports_regdb = false, .fix_l1ss = true, .credit_flow = false, @@ -497,7 +498,7 @@ Signed-off-by: P Praneesh .hal_params = &ath11k_hw_hal_params_ipq8074, .supports_dynamic_smps_6ghz = false, .alloc_cacheable_memory = true, -@@ -217,6 +216,8 @@ static struct ath11k_hw_params ath11k_hw +@@ -212,6 +211,8 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, @@ -506,7 +507,7 @@ Signed-off-by: P Praneesh }, { .name = "qca6390 hw2.0", -@@ -384,6 +384,8 @@ static struct ath11k_hw_params ath11k_hw +@@ -381,6 +382,8 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, @@ -515,9 +516,9 @@ Signed-off-by: P Praneesh }, { .name = "wcn6855 hw2.0", -@@ -2147,6 +2149,9 @@ int ath11k_core_pre_init(struct ath11k_b - - ab->enable_memory_stats = ATH11K_DEBUG_ENABLE_MEMORY_STATS; +@@ -2146,6 +2149,9 @@ int ath11k_core_pre_init(struct ath11k_b + if (nss_offload) + ab->nss.stats_enabled = 1; + if (ab->nss.enabled && ab->hw_params.max_tx_ring > DP_TCL_NUM_RING_MAX) + ab->hw_params.max_tx_ring = DP_TCL_NUM_RING_MAX; @@ -570,7 +571,7 @@ Signed-off-by: P Praneesh FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_DESC_TYPE, ti->type) | FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCAP_TYPE, ti->encap_type) | FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_ENCRYPT_TYPE, -@@ -60,23 +60,25 @@ void ath11k_hal_tx_cmd_desc_setup(struct +@@ -60,24 +60,26 @@ void ath11k_hal_tx_cmd_desc_setup(struct FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_CMD_NUM, ti->meta_data_flags); @@ -581,6 +582,7 @@ Signed-off-by: P Praneesh - tcl_cmd->info2 = ti->flags1 | + tcl_cmd.info2 = ti->flags1 | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TID, ti->tid) | FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ti->lmac_id); - tcl_cmd->info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, @@ -601,7 +603,7 @@ Signed-off-by: P Praneesh } void ath11k_hal_tx_set_dscp_tid_map(struct ath11k_base *ab, int id) -@@ -136,7 +138,9 @@ void ath11k_hal_tx_set_dscp_tid_map(stru +@@ -137,7 +139,9 @@ void ath11k_hal_tx_set_dscp_tid_map(stru ctrl_reg_val); } @@ -612,7 +614,7 @@ Signed-off-by: P Praneesh { struct hal_srng_params params; struct hal_tlv_hdr *tlv; -@@ -145,7 +149,7 @@ void ath11k_hal_tx_init_data_ring(struct +@@ -146,7 +150,7 @@ void ath11k_hal_tx_init_data_ring(struct memset(¶ms, 0, sizeof(params)); diff --git a/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch b/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch new file mode 100644 index 00000000000000..5890fa6a784a08 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch @@ -0,0 +1,11 @@ +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -5898,6 +5898,8 @@ static int ath11k_mac_copy_he_cap(struct + memcpy(he_cap_elem->phy_cap_info, band_cap->he_cap_phy_info, + sizeof(he_cap_elem->phy_cap_info)); + ++ he_cap_elem->mac_cap_info[0] &= ~IEEE80211_HE_MAC_CAP0_HTC_HE; ++ + he_cap_elem->mac_cap_info[1] &= + IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK; + diff --git a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch new file mode 100644 index 00000000000000..f11c9d28710d53 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch @@ -0,0 +1,3365 @@ +From fbe5a76d8c9ff1cf3f906a3c863928fc1adcbc95 Mon Sep 17 00:00:00 2001 +From: Karthikeyan Kathirvel +Date: Tue, 16 Feb 2021 13:44:39 +0530 +Subject: [PATCH] ath11k: Add mesh nss offload support + +- New capability advertising nss offload support for mesh type +- Mesh obj vap and link vap registration/clean up +- Command/event handling +- New .ch files in ath11k for nss mesh offload related debugs +- Tx/Rx data path on mesh link vap uses native wifi format +- Mesh obj vap handls packets in ether format. No Tx on Mesh + obj vap is expected as packets transmitted in slow path is + supposed to be encapsulated in 802.11 format. +- New mac80211-driver callbacks for mesh vap, mpath and mpp + configurations. + +Signed-off-by: Vasanthakumar Thiagarajan + +Change-Id: Ib6950344286ba18fab43586262c62dcd09557614 +Co-developed-by: Karthikeyan Kathirvel +Signed-off-by: Karthikeyan Kathirvel +Signed-off-by: Vasanthakumar Thiagarajan +--- + drivers/net/wireless/ath/ath11k/Makefile | 2 +- + drivers/net/wireless/ath/ath11k/debug_nss.c | 343 +++++++ + drivers/net/wireless/ath/ath11k/debug_nss.h | 24 + + drivers/net/wireless/ath/ath11k/dp.h | 16 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 170 ++- + drivers/net/wireless/ath/ath11k/dp_rx.h | 2 + + drivers/net/wireless/ath/ath11k/mac.c | 36 +- + drivers/net/wireless/ath/ath11k/nss.c | 1482 ++++++++++++++++++++++++--- + drivers/net/wireless/ath/ath11k/nss.h | 63 +- + 19 files changed, 2548 insertions(+), 206 deletions(-) + create mode 100644 drivers/net/wireless/ath/ath11k/debug_nss.c + create mode 100644 drivers/net/wireless/ath/ath11k/debug_nss.h + +--- a/drivers/net/wireless/ath/ath11k/Makefile ++++ b/drivers/net/wireless/ath/ath11k/Makefile +@@ -27,6 +27,10 @@ ath11k-$(CPTCFG_ATH11K_SPECTRAL) += spec + ath11k-$(CONFIG_PM) += wow.o + ath11k-$(CPTCFG_ATH11K_NSS_SUPPORT) += nss.o + ++ifeq ($(and $(CPTCFG_ATH11K_DEBUGFS),$(CPTCFG_ATH11K_NSS_MESH_SUPPORT)),y) ++ath11k-y += debug_nss.o ++endif ++ + obj-$(CPTCFG_ATH11K_AHB) += ath11k_ahb.o + ath11k_ahb-y += ahb.o + +--- /dev/null ++++ b/drivers/net/wireless/ath/ath11k/debug_nss.c +@@ -0,0 +1,924 @@ ++// SPDX-License-Identifier: BSD-3-Clause-Clear ++/* ++ * Copyright (c) 2020 The Linux Foundation. All rights reserved. ++ */ ++ ++#ifdef CPTCFG_ATH11K_NSS_SUPPORT ++ ++#include ++#include "dp_rx.h" ++#include "nss.h" ++#include "debug.h" ++#include "debug_nss.h" ++ ++static unsigned int ++debug_nss_fill_mpp_dump(struct ath11k_vif *arvif, char *buf, ssize_t size) ++{ ++ struct arvif_nss *nss = &arvif->nss; ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_nss_mpp_entry *entry, *tmp; ++ LIST_HEAD(local_entry); ++ unsigned int len = 0; ++ int i; ++ ++ len += scnprintf(buf + len, size - len, "\nProxy path table\n"); ++ len += scnprintf(buf + len, size - len, "dest_mac_addr\t\tmesh_dest_mac\t\tflags\n"); ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&nss->mpp_dump, &local_entry); ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(entry, tmp, &local_entry, list) { ++ for (i = 0; i < entry->num_entries; i++) ++ len += scnprintf(buf + len, size - len, "%pM\t%pM\t0x%x\n", ++ entry->mpp[i].dest_mac_addr, ++ entry->mpp[i].mesh_dest_mac, entry->mpp[i].flags); ++ list_del(&entry->list); ++ kfree(entry); ++ } ++ ++ return len; ++} ++ ++static int ath11k_nss_dump_mpp_open(struct inode *inode, struct file *file) ++{ ++ struct ath11k_vif *arvif = inode->i_private; ++ struct ath11k *ar = arvif->ar; ++ unsigned long time_left; ++ struct ath11k_nss_dbg_priv_data *priv_data; ++ int ret; ++ ssize_t size = 100; ++ char *buf; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ reinit_completion(&arvif->nss.dump_mpp_complete); ++ ++ priv_data = kzalloc(sizeof(*priv_data), GFP_KERNEL); ++ if (!priv_data) { ++ mutex_unlock(&ar->conf_mutex); ++ return -ENOMEM; ++ } ++ ++ priv_data->arvif = arvif; ++ ret = ath11k_nss_dump_mpp_request(arvif); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send dump mpp command %d\n", ret); ++ goto err_unlock; ++ } ++ ++ time_left = wait_for_completion_timeout(&arvif->nss.dump_mpp_complete, ++ ATH11K_NSS_MPATH_DUMP_TIMEOUT); ++ if (time_left == 0) { ++ ret = -ETIMEDOUT; ++ goto err_unlock; ++ } ++ ++ mutex_unlock(&ar->conf_mutex); ++ ++ size += (arvif->nss.mpp_dump_num_entries * 200 + 10 * 100); ++ buf = kmalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ priv_data->buf = buf; ++ ++ priv_data->len= debug_nss_fill_mpp_dump(arvif, buf, size); ++ ++ file->private_data = priv_data; ++ ++ return 0; ++ ++err_unlock: ++ kfree(priv_data); ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++} ++ ++static int ath11k_nss_dump_mpp_release(struct inode *inode, struct file *file) ++{ ++ struct ath11k_nss_dbg_priv_data *priv_data = file->private_data; ++ ++ kfree(priv_data->buf); ++ kfree(priv_data); ++ return 0; ++} ++ ++static ssize_t ath11k_nss_dump_mpp_read(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_nss_dbg_priv_data *priv_data = file->private_data; ++ struct ath11k_vif *arvif = priv_data->arvif; ++ char *buf = priv_data->buf; ++ struct ath11k *ar = arvif->ar; ++ int ret; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ ret = simple_read_from_buffer(user_buf, count, ppos, buf, priv_data->len); ++ ++ mutex_unlock(&ar->conf_mutex); ++ ++ return ret; ++} ++ ++static const struct file_operations fops_nss_dump_mpp_table = { ++ .open = ath11k_nss_dump_mpp_open, ++ .read = ath11k_nss_dump_mpp_read, ++ .release = ath11k_nss_dump_mpp_release, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static unsigned int ++debug_nss_fill_mpath_dump(struct ath11k_vif *arvif, char *buf, ssize_t size) ++{ ++ struct arvif_nss *nss = &arvif->nss; ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_nss_mpath_entry *entry, *tmp; ++ LIST_HEAD(local_entry); ++ unsigned int len = 0; ++ u64 expiry_time; ++ int i; ++ ++ len += scnprintf(buf + len, size - len, "\nmpath table\n"); ++ len += scnprintf(buf + len, size - len, "dest_mac_addr\t\tnext_hop_mac\t\tmetric\t" ++ "expiry_time\thop_count\tflags\tlink_vap_id\n"); ++ ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&nss->mpath_dump, &local_entry); ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(entry, tmp, &local_entry, list) { ++ for (i = 0; i < entry->num_entries; i++) { ++ memcpy(&expiry_time, entry->mpath[i].expiry_time, sizeof(u64)); ++ len += scnprintf(buf + len, size - len, "%pM\t%pM\t%u\t%llu\t\t\t%d\t0x%x\t%d\n", ++ entry->mpath[i].dest_mac_addr, ++ entry->mpath[i].next_hop_mac_addr, entry->mpath[i].metric, ++ expiry_time, entry->mpath[i].hop_count, ++ entry->mpath[i].flags, entry->mpath[i].link_vap_id); ++ } ++ kfree(entry); ++ } ++ ++ return len; ++} ++ ++static int ath11k_nss_dump_mpath_open(struct inode *inode, struct file *file) ++{ ++ struct ath11k_vif *arvif = inode->i_private; ++ struct ath11k *ar = arvif->ar; ++ unsigned long time_left; ++ struct ath11k_nss_dbg_priv_data *priv_data; ++ ssize_t size = 200; ++ char *buf; ++ int ret; ++ ++ reinit_completion(&arvif->nss.dump_mpath_complete); ++ ++ priv_data = kzalloc(sizeof(*priv_data), GFP_KERNEL); ++ if (!priv_data) ++ return -ENOMEM; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ priv_data->arvif = arvif; ++ ret = ath11k_nss_dump_mpath_request(arvif); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to send dump mpath command %d\n", ret); ++ goto err_unlock; ++ } ++ ++ time_left = wait_for_completion_timeout(&arvif->nss.dump_mpath_complete, ++ ATH11K_NSS_MPATH_DUMP_TIMEOUT); ++ if (time_left == 0) { ++ ret = -ETIMEDOUT; ++ goto err_unlock; ++ } ++ ++ mutex_unlock(&ar->conf_mutex); ++ ++ size += (arvif->nss.mpath_dump_num_entries * 200 + 10 * 100); ++ buf = kmalloc(size, GFP_KERNEL); ++ if (!buf) ++ return -ENOMEM; ++ ++ priv_data->buf = buf; ++ ++ priv_data->len = debug_nss_fill_mpath_dump(arvif, buf, size); ++ ++ file->private_data = priv_data; ++ ++ return 0; ++ ++err_unlock: ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++} ++ ++static int ath11k_nss_dump_mpath_release(struct inode *inode, struct file *file) ++{ ++ struct ath11k_nss_dbg_priv_data *priv_data = file->private_data; ++ ++ kfree(priv_data->buf); ++ kfree(priv_data); ++ return 0; ++ ++} ++ ++static ssize_t ath11k_nss_dump_mpath_read(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_nss_dbg_priv_data *priv_data = file->private_data; ++ struct ath11k_vif *arvif = priv_data->arvif; ++ char *buf = priv_data->buf; ++ struct ath11k *ar = arvif->ar; ++ int ret; ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ ret = simple_read_from_buffer(user_buf, count, ppos, buf, priv_data->len); ++ ++ mutex_unlock(&ar->conf_mutex); ++ ++ return ret; ++} ++ ++static const struct file_operations fops_nss_dump_mpath_table = { ++ .open = ath11k_nss_dump_mpath_open, ++ .read = ath11k_nss_dump_mpath_read, ++ .release = ath11k_nss_dump_mpath_release, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_mpath_add(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ieee80211_mesh_path_offld path = {0}; ++ u8 buf[128] = {0}; ++ int ret; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%u %hhu %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %hhu %hhu", ++ &path.metric, ++ &path.hop_count, ++ &path.mesh_da[0], ++ &path.mesh_da[1], ++ &path.mesh_da[2], ++ &path.mesh_da[3], ++ &path.mesh_da[4], ++ &path.mesh_da[5], ++ &path.next_hop[0], ++ &path.next_hop[1], ++ &path.next_hop[2], ++ &path.next_hop[3], ++ &path.next_hop[4], ++ &path.next_hop[5], ++ &path.block_mesh_fwd, ++ &path.metadata_type); ++ ++ ++ path.flags |= IEEE80211_MESH_PATH_ACTIVE | IEEE80211_MESH_PATH_RESOLVED; ++ ++ if (ret != 16) ++ return -EINVAL; ++ ++ /* Configure the mpath */ ++ ret = ath11k_nss_mesh_config_path(arvif->ar, arvif, ++ IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPATH, ++ &path); ++ if(ret) { ++ ath11k_warn(arvif->ar->ab, "failed to configure mpath ret %d\n", ret); ++ return -EINVAL; ++ } ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_mpath_add = { ++ .open = simple_open, ++ .write = ath11k_nss_mpath_add, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_mpp_add(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ieee80211_mesh_path_offld path = {0}; ++ u8 buf[128] = {0}; ++ int ret; ++ ++ if (!arvif->ar->ab->nss.debug_mode) { ++ ret = -EPERM; ++ return ret; ++ } ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &path.da[0], ++ &path.da[1], ++ &path.da[2], ++ &path.da[3], ++ &path.da[4], ++ &path.da[5], ++ &path.mesh_da[0], ++ &path.mesh_da[1], ++ &path.mesh_da[2], ++ &path.mesh_da[3], ++ &path.mesh_da[4], ++ &path.mesh_da[5]); ++ ++ path.flags |= IEEE80211_MESH_PATH_ACTIVE | IEEE80211_MESH_PATH_RESOLVED; ++ ++ if (ret != 12) ++ return -EINVAL; ++ ++ /* Configure the mpp */ ++ ret = ath11k_nss_mesh_config_path(arvif->ar, arvif, ++ IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPP, ++ &path); ++ if(ret) { ++ ath11k_warn(arvif->ar->ab, "failed to configure mpp ret %d\n", ret); ++ return -EINVAL; ++ } ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_mpp_add = { ++ .open = simple_open, ++ .write = ath11k_nss_mpp_add, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_mpath_update(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ieee80211_mesh_path_offld path = {0}; ++ u8 buf[128] = {0}; ++ int ret; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%u %hhu %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %hhu %lu %hhu %hhu", ++ &path.metric, ++ &path.hop_count, ++ &path.mesh_da[0], ++ &path.mesh_da[1], ++ &path.mesh_da[2], ++ &path.mesh_da[3], ++ &path.mesh_da[4], ++ &path.mesh_da[5], ++ &path.next_hop[0], ++ &path.next_hop[1], ++ &path.next_hop[2], ++ &path.next_hop[3], ++ &path.next_hop[4], ++ &path.next_hop[5], ++ &path.old_next_hop[0], ++ &path.old_next_hop[1], ++ &path.old_next_hop[2], ++ &path.old_next_hop[3], ++ &path.old_next_hop[4], ++ &path.old_next_hop[5], ++ &path.mesh_gate, ++ &path.exp_time, ++ &path.block_mesh_fwd, ++ &path.metadata_type); ++ ++ ++ path.flags |= IEEE80211_MESH_PATH_ACTIVE | IEEE80211_MESH_PATH_RESOLVED; ++ ++ if (ret != 24) ++ return -EINVAL; ++ ++ /* Configure the mpath */ ++ ret = ath11k_nss_mesh_config_path(arvif->ar, arvif, ++ IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPATH, ++ &path); ++ if(ret) { ++ ath11k_warn(arvif->ar->ab, "failed to configure mpath ret %d\n", ret); ++ return -EINVAL; ++ } ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_mpath_update = { ++ .open = simple_open, ++ .write = ath11k_nss_mpath_update, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_mpp_update(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ieee80211_mesh_path_offld path = {0}; ++ u8 buf[128] = {0}; ++ int ret; ++ ++ if (!arvif->ar->ab->nss.debug_mode) { ++ ret = -EPERM; ++ return ret; ++ } ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &path.da[0], ++ &path.da[1], ++ &path.da[2], ++ &path.da[3], ++ &path.da[4], ++ &path.da[5], ++ &path.mesh_da[0], ++ &path.mesh_da[1], ++ &path.mesh_da[2], ++ &path.mesh_da[3], ++ &path.mesh_da[4], ++ &path.mesh_da[5]); ++ ++ path.flags |= IEEE80211_MESH_PATH_ACTIVE | IEEE80211_MESH_PATH_RESOLVED; ++ ++ if (ret != 12) ++ return -EINVAL; ++ ++ /* Configure the mpp */ ++ ret = ath11k_nss_mesh_config_path(arvif->ar, arvif, ++ IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPP, ++ &path); ++ if(ret) { ++ ath11k_warn(arvif->ar->ab, "failed to configure mpp ret %d\n", ret); ++ return -EINVAL; ++ } ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_mpp_update = { ++ .open = simple_open, ++ .write = ath11k_nss_mpp_update, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++ ++static ssize_t ath11k_nss_mpath_delete(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ieee80211_mesh_path_offld path = {0}; ++ u8 buf[128] = {0}; ++ int ret; ++ ++ if (!arvif->ar->ab->nss.debug_mode) { ++ ret = -EPERM; ++ return ret; ++ } ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &path.mesh_da[0], ++ &path.mesh_da[1], ++ &path.mesh_da[2], ++ &path.mesh_da[3], ++ &path.mesh_da[4], ++ &path.mesh_da[5], ++ &path.next_hop[0], ++ &path.next_hop[1], ++ &path.next_hop[2], ++ &path.next_hop[3], ++ &path.next_hop[4], ++ &path.next_hop[5]); ++ ++ path.flags |= IEEE80211_MESH_PATH_DELETED; ++ ++ if (ret != 12) ++ return -EINVAL; ++ ++ /* Configure the mpath */ ++ ret = ath11k_nss_mesh_config_path(arvif->ar, arvif, ++ IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPATH, ++ &path); ++ if(ret) { ++ ath11k_warn(arvif->ar->ab, "failed to configure mpath ret %d\n", ret); ++ return -EINVAL; ++ } ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_mpath_del = { ++ .open = simple_open, ++ .write = ath11k_nss_mpath_delete, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_mpp_delete(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ieee80211_mesh_path_offld path = {0}; ++ u8 buf[128] = {0}; ++ int ret; ++ ++ if (!arvif->ar->ab->nss.debug_mode) { ++ ret = -EPERM; ++ return ret; ++ } ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", ++ &path.da[0], ++ &path.da[1], ++ &path.da[2], ++ &path.da[3], ++ &path.da[4], ++ &path.da[5], ++ &path.mesh_da[0], ++ &path.mesh_da[1], ++ &path.mesh_da[2], ++ &path.mesh_da[3], ++ &path.mesh_da[4], ++ &path.mesh_da[5]); ++ ++ path.flags |= IEEE80211_MESH_PATH_DELETED; ++ ++ if (ret != 12) ++ return -EINVAL; ++ ++ /* Configure the mpp */ ++ ret = ath11k_nss_mesh_config_path(arvif->ar, arvif, ++ IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPP, ++ &path); ++ if(ret) { ++ ath11k_warn(arvif->ar->ab, "failed to configure mpp ret %d\n", ret); ++ return -EINVAL; ++ } ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_mpp_del = { ++ .open = simple_open, ++ .write = ath11k_nss_mpp_delete, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++ ++static ssize_t ath11k_nss_assoc_link(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ u8 buf[128] = {0}; ++ int ret; ++ u32 assoc_link = 0; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%u", &assoc_link); ++ ++ if (ret != 1) ++ return -EINVAL; ++ ++ arvif->ar->ab->nss.debug_mode = true; ++ arvif->vif->driver_flags |= IEEE80211_VIF_NSS_OFFLOAD_DEBUG_MODE; ++ ++ ret = ath11k_nss_assoc_link_arvif_to_ifnum(arvif, assoc_link); ++ ++ return ret ? ret : count; ++ ++} ++ ++static const struct file_operations fops_nss_assoc_link = { ++ .open = simple_open, ++ .write = ath11k_nss_assoc_link, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_links(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ char buf[512] = {0}; ++ struct arvif_nss *nss; ++ int len = 0; ++ ++ list_for_each_entry(nss, &mesh_vaps, list) ++ len += scnprintf(buf + len, sizeof(buf) - len, "link id %d\n", ++ nss->if_num); ++ ++ return simple_read_from_buffer(user_buf, count, ppos, buf, len); ++} ++ ++static const struct file_operations fops_nss_links = { ++ .open = simple_open, ++ .read = ath11k_nss_links, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_vap_link_id(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct arvif_nss *nss = &arvif->nss; ++ char buf[512] = {0}; ++ int len = 0; ++ ++ len = scnprintf(buf, sizeof(buf) - len, "link id %d\n", ++ nss->if_num); ++ ++ return simple_read_from_buffer(user_buf, count, ppos, buf, len); ++} ++ ++static const struct file_operations fops_nss_vap_link_id = { ++ .open = simple_open, ++ .read = ath11k_nss_vap_link_id, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_read_mpp_mode(struct file *file, ++ char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ char buf[512] = {0}; ++ int len = 0; ++ ++ len = scnprintf(buf, sizeof(buf) - len, "%s\n",mpp_mode ? ++ "Host Assisted Learning" : "NSS Independent Learning"); ++ ++ return simple_read_from_buffer(user_buf, count, ppos, buf, len); ++} ++ ++static ssize_t ath11k_nss_write_mpp_mode(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ u8 buf[128] = {0}; ++ int ret; ++ u32 mppath_mode = 0; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ret = sscanf(buf, "%u", &mppath_mode); ++ ++ if (ret != 1) ++ return -EINVAL; ++ ++ mpp_mode = mppath_mode; ++ ++ ret = 0; ++ ++ return ret ? ret : count; ++} ++ ++static const struct file_operations fops_nss_mpp_mode = { ++ .open = simple_open, ++ .write = ath11k_nss_write_mpp_mode, ++ .read = ath11k_nss_read_mpp_mode, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_write_excep_flags(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ u8 buf[128] = {0}; ++ int ret; ++ struct nss_wifi_mesh_exception_flag_msg msg; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ++ ret = sscanf(buf, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx %hhu", ++ &msg.dest_mac_addr[0], ++ &msg.dest_mac_addr[1], ++ &msg.dest_mac_addr[2], ++ &msg.dest_mac_addr[3], ++ &msg.dest_mac_addr[4], ++ &msg.dest_mac_addr[5], ++ &msg.exception); ++ ++ if (ret != 7) ++ return -EINVAL; ++ ++ ret = ath11k_nss_mesh_exception_flags(arvif, &msg); ++ ++ return ret ? ret : count; ++} ++ ++static const struct file_operations fops_nss_excep_flags = { ++ .open = simple_open, ++ .write = ath11k_nss_write_excep_flags, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_write_metadata_type(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ struct ath11k *ar = arvif->ar; ++ u8 buf[128] = {0}; ++ int ret; ++ u8 pkt_type; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ++ ret = sscanf(buf, "%hhu", &pkt_type); ++ mutex_lock(&ar->conf_mutex); ++ arvif->nss.metadata_type = pkt_type ? NSS_WIFI_MESH_PRE_HEADER_80211 : NSS_WIFI_MESH_PRE_HEADER_NONE; ++ mutex_unlock(&ar->conf_mutex); ++ ++ if (ret != 1) ++ return -EINVAL; ++ ++ ret = 0; ++ ++ return ret ? ret : count; ++} ++ ++static const struct file_operations fops_nss_metadata_type = { ++ .open = simple_open, ++ .write = ath11k_nss_write_metadata_type, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++static ssize_t ath11k_nss_write_exc_rate_limit(struct file *file, ++ const char __user *user_buf, ++ size_t count, loff_t *ppos) ++{ ++ struct ath11k_vif *arvif = file->private_data; ++ u8 buf[128] = {0}; ++ int ret; ++ struct nss_wifi_mesh_rate_limit_config nss_exc_cfg; ++ ++ ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); ++ if (ret < 0) ++ return ret; ++ ++ buf[ret] = '\0'; ++ ++ ret = sscanf(buf, "%u %u %u", ++ &nss_exc_cfg.exception_num, ++ &nss_exc_cfg.enable, ++ &nss_exc_cfg.rate_limit); ++ ++ if (ret != 3) ++ return -EINVAL; ++ ++ ret = ath11k_nss_exc_rate_config(arvif, &nss_exc_cfg); ++ ++ return ret ? ret : count; ++} ++ ++static const struct file_operations fops_nss_exc_rate_limit = { ++ .open = simple_open, ++ .write = ath11k_nss_write_exc_rate_limit, ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++}; ++ ++void ath11k_debugfs_nss_mesh_vap_create(struct ath11k_vif *arvif) ++{ ++ struct dentry *debugfs_nss_mesh_dir, *debugfs_dbg_infra; ++ ++ debugfs_nss_mesh_dir = debugfs_create_dir("nss_mesh", arvif->vif->debugfs_dir); ++ debugfs_dbg_infra = debugfs_create_dir("dbg_infra", debugfs_nss_mesh_dir); ++ ++ debugfs_create_file("dump_nss_mpath_table", 0600, ++ debugfs_nss_mesh_dir, arvif, ++ &fops_nss_dump_mpath_table); ++ ++ debugfs_create_file("dump_nss_mpp_table", 0600, ++ debugfs_nss_mesh_dir, arvif, ++ &fops_nss_dump_mpp_table); ++ ++ debugfs_create_file("mpath_add", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_mpath_add); ++ ++ debugfs_create_file("mpath_update", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_mpath_update); ++ ++ debugfs_create_file("mpath_del", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_mpath_del); ++ ++ debugfs_create_file("mpp_add", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_mpp_add); ++ ++ debugfs_create_file("mpp_update", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_mpp_update); ++ ++ debugfs_create_file("mpp_del", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_mpp_del); ++ ++ debugfs_create_file("assoc_link", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_assoc_link); ++ ++ debugfs_create_file("vap_linkid", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_vap_link_id); ++ ++ debugfs_create_file("excep_flags", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_excep_flags); ++ ++ debugfs_create_file("metadata_type", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_metadata_type); ++ ++ debugfs_create_file("exc_rate_limit", 0200, ++ debugfs_dbg_infra, arvif, ++ &fops_nss_exc_rate_limit); ++} ++ ++void ath11k_debugfs_nss_soc_create(struct ath11k_base *ab) ++{ ++ struct dentry *debugfs_dbg_infra; ++ ++ debugfs_dbg_infra = debugfs_create_dir("dbg_infra", debugfs_ath11k); ++ ++ debugfs_create_file("links", 0200, ++ debugfs_dbg_infra, ab, ++ &fops_nss_links); ++ ++ debugfs_create_file("mpp_mode", 0600, ++ debugfs_dbg_infra, ab, ++ &fops_nss_mpp_mode); ++} ++ ++#endif +--- /dev/null ++++ b/drivers/net/wireless/ath/ath11k/debug_nss.h +@@ -0,0 +1,35 @@ ++/* SPDX-License-Identifier: BSD-3-Clause-Clear */ ++/* ++ * Copyright (c) 2020 The Linux Foundation. All rights reserved. ++ */ ++ ++#ifndef ATH11K_DEBUG_NSS_H ++#define ATH11K_DEBUG_NSS_H ++ ++#include ++#include ++ ++#define ATH11K_NSS_MPATH_DUMP_TIMEOUT (2 * HZ) ++ ++struct ath11k_vif; ++extern enum nss_wifi_mesh_mpp_learning_mode mpp_mode; ++extern struct list_head mesh_vaps; ++struct ath11k_nss_dbg_priv_data { ++ struct ath11k_vif *arvif; ++ char *buf; ++ unsigned int len; ++}; ++ ++#ifdef CPTCFG_MAC80211_DEBUGFS ++void ath11k_debugfs_nss_mesh_vap_create(struct ath11k_vif *arvif); ++void ath11k_debugfs_nss_soc_create(struct ath11k_base *ab); ++#else ++static inline void ath11k_debugfs_nss_mesh_vap_create(struct ath11k_vif *arvif) ++{ ++} ++static inline void ath11k_debugfs_nss_soc_create(struct ath11k_base *ab) ++{ ++} ++#endif ++ ++#endif +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -1453,15 +1453,29 @@ struct htt_ppdu_stats_usr_cmn_array { + struct htt_tx_ppdu_stats_info tx_ppdu_info[]; + } __packed; + ++#define HTT_PPDU_STATS_CMPLTN_FLUSH_INFO_FLOW_TYPE GENMASK(7, 0) ++#define HTT_PPDU_STATS_CMPLTN_FLUSH_INFO_NUM_MPDU GENMASK(16, 8) ++#define HTT_PPDU_STATS_CMPLTN_FLUSH_INFO_NUM_MSDU GENMASK(30, 17) ++ ++struct htt_ppdu_stats_cmpltn_flush { ++ u32 drop_reason; ++ u32 info; ++ u8 tid_num; ++ u8 queue_type; ++ u16 sw_peer_id; ++} __packed; ++ + struct htt_ppdu_user_stats { + u16 peer_id; + u16 delay_ba; + u32 tlv_flags; + bool is_valid_peer_id; ++ bool rate_stats_updated; + struct htt_ppdu_stats_user_rate rate; + struct htt_ppdu_stats_usr_cmpltn_cmn cmpltn_cmn; + struct htt_ppdu_stats_usr_cmpltn_ack_ba_status ack_ba; + struct htt_ppdu_stats_user_common common; ++ struct htt_ppdu_stats_cmpltn_flush cmpltn_flush; + }; + + #define HTT_PPDU_STATS_MAX_USERS 37 +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -1403,6 +1403,71 @@ static int ath11k_htt_tlv_ppdu_stats_par + return 0; + } + ++static void ath11k_dp_ppdu_stats_flush_tlv_parse(struct ath11k_base *ab, ++ struct htt_ppdu_stats_cmpltn_flush *msg) ++{ ++ struct ath11k *ar; ++ struct ieee80211_sta *sta; ++ struct ath11k_sta *arsta; ++ struct ath11k_peer *peer = NULL; ++ struct ieee80211_tx_status status; ++ struct ieee80211_rate_status status_rate = { 0 }; ++ ++ if (!ab->nss.mesh_nss_offload_enabled) ++ return; ++ ++ rcu_read_lock(); ++ ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_id(ab, msg->sw_peer_id); ++ if (!peer) ++ goto exit; ++ ++ if (peer->vif->type != NL80211_IFTYPE_MESH_POINT) ++ goto exit; ++ ++ if (ether_addr_equal(peer->addr, peer->vif->addr)) ++ goto exit; ++ ++ sta = peer->sta; ++ arsta = (struct ath11k_sta *)sta->drv_priv; ++ ++ memset(&status, 0, sizeof(status)); ++ ++ status.sta = sta; ++ status_rate.rate_idx = arsta->last_txrate; ++ ++ status.rates = &status_rate; ++ status.mpdu_fail = FIELD_GET(HTT_PPDU_STATS_CMPLTN_FLUSH_INFO_NUM_MPDU, ++ msg->info); ++ ar = arsta->arvif->ar; ++ ieee80211s_update_metric_ppdu(ar->hw, &status); ++ ++exit: ++ spin_unlock_bh(&ab->base_lock); ++ rcu_read_unlock(); ++} ++ ++static int ath11k_htt_tlv_ppdu_soc_stats_parse(struct ath11k_base *ab, ++ u16 tag, u16 len, const void *ptr, ++ void *data) ++{ ++ switch (tag) { ++ case HTT_PPDU_STATS_TAG_USR_COMPLTN_FLUSH: ++ if (len < sizeof(struct htt_ppdu_stats_cmpltn_flush)) { ++ ath11k_warn(ab, "Invalid len %d for the tag 0x%x\n", ++ len, tag); ++ return -EINVAL; ++ } ++ ath11k_dp_ppdu_stats_flush_tlv_parse(ab, (struct htt_ppdu_stats_cmpltn_flush *)ptr); ++ break; ++ default: ++ break; ++ } ++ ++ return 0; ++} ++ + static void + ath11k_update_per_peer_tx_stats(struct ath11k *ar, + struct htt_ppdu_stats *ppdu_stats, u8 user) +@@ -1426,6 +1491,9 @@ ath11k_update_per_peer_tx_stats(struct a + if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE))) + return; + ++ if (usr_stats->rate_stats_updated) ++ return; ++ + if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) + is_ampdu = + HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags); +@@ -1559,6 +1627,8 @@ ath11k_update_per_peer_tx_stats(struct a + ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); + } + ++ usr_stats->rate_stats_updated = true; ++ + spin_unlock_bh(&ab->base_lock); + rcu_read_unlock(); + } +@@ -1679,6 +1749,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k + return 0; + } + ++static void ++ath11k_dp_rx_ppdu_stats_update_tx_comp_status(struct ath11k *ar, ++ struct htt_ppdu_stats_info *ppdu_info) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ieee80211_sta *sta; ++ struct ath11k_sta *arsta; ++ struct ath11k_peer *peer = NULL; ++ struct htt_ppdu_user_stats* usr_stats = NULL; ++ struct ieee80211_tx_status status; ++ struct ieee80211_rate_status status_rate = { 0 }; ++ ++ u32 peer_id = 0; ++ int i; ++ ++ lockdep_assert_held(&ar->data_lock); ++ ++ if (!ar->ab->nss.mesh_nss_offload_enabled) ++ return; ++ ++ ath11k_htt_update_ppdu_stats(ar, &ppdu_info->ppdu_stats); ++ ++ rcu_read_lock(); ++ ++ for (i = 0; i < ppdu_info->ppdu_stats.common.num_users; i++) { ++ usr_stats = &ppdu_info->ppdu_stats.user_stats[i]; ++ peer_id = usr_stats->peer_id; ++ spin_lock_bh(&ab->base_lock); ++ peer = ath11k_peer_find_by_id(ab, peer_id); ++ if (!peer) { ++ spin_unlock_bh(&ab->base_lock); ++ continue; ++ } ++ ++ if (peer->vif->type != NL80211_IFTYPE_MESH_POINT) { ++ spin_unlock_bh(&ab->base_lock); ++ goto exit; ++ } ++ ++ if (ether_addr_equal(peer->addr, peer->vif->addr)) { ++ spin_unlock_bh(&ab->base_lock); ++ continue; ++ } ++ ++ sta = peer->sta; ++ arsta = (struct ath11k_sta *)sta->drv_priv; ++ ++ memset(&status, 0, sizeof(status)); ++ ++ status.sta = sta; ++ status_rate.rate_idx = arsta->last_txrate; ++ status.rates = &status_rate; ++ status.mpdu_succ = usr_stats->cmpltn_cmn.mpdu_success; ++ ++ ieee80211s_update_metric_ppdu(ar->hw, &status); ++ ++ spin_unlock_bh(&ab->base_lock); ++ } ++ ++exit: ++ rcu_read_unlock(); ++} ++ + static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, + struct sk_buff *skb) + { +@@ -1697,6 +1830,15 @@ static int ath11k_htt_pull_ppdu_stats(st + pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, msg->info); + ppdu_id = msg->ppdu_id; + ++ if (pdev_id == 0) { ++ ret = ath11k_dp_htt_tlv_iter(ab, msg->data, len, ++ ath11k_htt_tlv_ppdu_soc_stats_parse, ++ NULL); ++ if (ret) ++ ath11k_warn(ab, "failed to parse tlv %d\n", ret); ++ return ret; ++ } ++ + rcu_read_lock(); + ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id); + if (!ar) { +@@ -1764,6 +1906,12 @@ static int ath11k_htt_pull_ppdu_stats(st + } + } + ++ /* Stats update for mesh interface used when nss-offload in mesh is enabled */ ++ if ((ppdu_info->frame_type == HTT_STATS_PPDU_FTYPE_DATA && ++ (ppdu_info->tlv_bitmap & (1 << HTT_PPDU_STATS_TAG_USR_RATE)) && ++ ppdu_info->tlv_bitmap & (1 << HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON))) ++ ath11k_dp_rx_ppdu_stats_update_tx_comp_status(ar, ppdu_info); ++ + out_unlock_data: + spin_unlock_bh(&ar->data_lock); + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -3474,6 +3474,18 @@ static void ath11k_mac_op_nss_bss_info_c + ath11k_warn(ar->ab, "failed to set ap_isolate in nss %d\n", ret); + } + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ if (changed & (BSS_CHANGED_NSS_MESH_TTL | ++ BSS_CHANGED_NSS_MESH_REFRESH_TIME | ++ BSS_CHANGED_NSS_MESH_FWD_ENABLED)) { ++ ret = ath11k_nss_mesh_config_update(vif, changed); ++ if (ret) ++ ath11k_warn(ar->ab, ++ "failed to update mesh nss offload configuration %d\n", ++ ret); ++ } ++#endif ++ + mutex_unlock(&ar->conf_mutex); + } + +@@ -9700,6 +9712,28 @@ err_fallback: + return 0; + } + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static void ++ath11k_mac_op_config_mesh_offload_path(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ struct ath11k *ar = hw->priv; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ int ret; ++ ++ if (arvif->ar->ab->nss.debug_mode) { ++ ret = 0; ++ return; ++ } ++ ++ ret = ath11k_nss_mesh_config_path(ar, arvif, cmd, path); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to configure path entry to mesh table %d\n", ret); ++} ++#endif ++ + static const struct ieee80211_ops ath11k_ops = { + .tx = ath11k_mac_op_tx, + .wake_tx_queue = ieee80211_handle_wake_tx_queue, +@@ -9757,6 +9791,9 @@ static const struct ieee80211_ops ath11k + .set_sar_specs = ath11k_mac_op_set_bios_sar_specs, + .remain_on_channel = ath11k_mac_op_remain_on_channel, + .cancel_remain_on_channel = ath11k_mac_op_cancel_remain_on_channel, ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ .config_mesh_offload_path = ath11k_mac_op_config_mesh_offload_path, ++#endif + }; + + static void ath11k_mac_update_ch_list(struct ath11k *ar, +@@ -10215,6 +10252,8 @@ static int __ath11k_mac_register(struct + ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); + wiphy_ext_feature_set(ar->hw->wiphy, + NL80211_EXT_FEATURE_VLAN_OFFLOAD); ++ if (ab->nss.mesh_nss_offload_enabled) ++ ieee80211_hw_set(ar->hw, SUPPORTS_MESH_NSS_OFFLOAD); + } + + ret = ieee80211_register_hw(ar->hw); +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -6,6 +6,7 @@ + #include "debug.h" + #include "mac.h" + #include "nss.h" ++#include "debug_nss.h" + #include "core.h" + #include "peer.h" + #include "dp_rx.h" +@@ -14,6 +15,11 @@ + #include "wmi.h" + #include "../../../../../net/mac80211/sta_info.h" + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++enum nss_wifi_mesh_mpp_learning_mode mpp_mode = NSS_WIFI_MESH_MPP_LEARNING_MODE_INDEPENDENT_NSS; ++LIST_HEAD(mesh_vaps); ++#endif ++ + /*-----------------------------ATH11K-NSS Helpers--------------------------*/ + + static enum ath11k_nss_opmode +@@ -32,6 +38,30 @@ ath11k_nss_get_vdev_opmode(struct ath11k + return ATH11K_NSS_OPMODE_UNKNOWN; + } + ++static struct ath11k_vif *ath11k_nss_get_arvif_from_dev(struct net_device *dev) ++{ ++ struct wireless_dev *wdev; ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ ++ if (!dev) ++ return NULL; ++ ++ wdev = dev->ieee80211_ptr; ++ if (!wdev) ++ return NULL; ++ ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) ++ return NULL; ++ ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) ++ return NULL; ++ ++ return arvif; ++} ++ + static void ath11k_nss_wifili_stats_sync(struct ath11k_base *ab, + struct nss_wifili_stats_sync_msg *wlsoc_stats) + { +@@ -263,7 +293,6 @@ void ath11k_nss_wifili_event_receive(str + ab->nss.response = response; + complete(&ab->nss.complete); + break; +- + case NSS_WIFILI_PEER_CREATE_MSG: + if (response != NSS_CMN_RESPONSE_EMSG) + break; +@@ -333,6 +362,13 @@ void ath11k_nss_wifili_event_receive(str + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili peer 4addr event received %d response %d error %d\n", + msg_type, response, error); + break; ++ case NSS_WIFILI_SEND_MESH_CAPABILITY_INFO: ++ complete(&ab->nss.complete); ++ if (response != NSS_CMN_RESPONSE_EMSG) ++ ab->nss.mesh_nss_offload_enabled = true; ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, "nss wifili mesh capability response %d\n", ++ ab->nss.mesh_nss_offload_enabled); ++ break; + default: + ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); + break; +@@ -420,7 +456,9 @@ ath11k_nss_wifili_ext_callback_fn(struct + ath11k_nss_process_mic_error(ab, skb); + break; + default: +- kfree(skb); ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "unknown packet type received in wifili ext cb %d", ++ wepm->pkt_type); ++ dev_kfree_skb_any(skb); + break; + } + } +@@ -735,8 +773,6 @@ ath11k_nss_vdev_special_data_receive(str + { + struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; + struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; +- struct wireless_dev *wdev; +- struct ieee80211_vif *vif; + struct ath11k_vif *arvif; + struct ath11k_base *ab; + bool drop = false; +@@ -744,24 +780,7 @@ ath11k_nss_vdev_special_data_receive(str + int data_offs = 0; + int ret = 0; + +- if (!dev) { +- dev_kfree_skb_any(skb); +- return; +- } +- +- wdev = dev->ieee80211_ptr; +- if (!wdev) { +- dev_kfree_skb_any(skb); +- return; +- } +- +- vif = wdev_to_ieee80211_vif(wdev); +- if (!vif) { +- dev_kfree_skb_any(skb); +- return; +- } +- +- arvif = (struct ath11k_vif *)vif->drv_priv; ++ arvif = ath11k_nss_get_arvif_from_dev(dev); + if (!arvif) { + dev_kfree_skb_any(skb); + return; +@@ -874,25 +893,1041 @@ static void + ath11k_nss_ext_vdev_data_receive(struct net_device *dev, struct sk_buff *skb, + __attribute__((unused)) struct napi_struct *napi) + { +- struct wireless_dev *wdev; +- struct ieee80211_vif *vif; + struct ath11k_vif *arvif; + struct ath11k_base *ab; + bool eth_decap = false; + int data_offs = 0; + int ret; + +- if (!dev) { ++ arvif = ath11k_nss_get_arvif_from_dev(dev); ++ if (!arvif) { + dev_kfree_skb_any(skb); + return; + } + +- wdev = dev->ieee80211_ptr; +- if (!wdev) { ++ ab = arvif->ar->ab; ++ ++ skb->dev = dev; ++ ++ /* log the original skb received from nss */ ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss ext : ", ++ skb->data, skb->len); ++ ++ ret = ath11k_nss_undecap(arvif, skb, &data_offs, ð_decap); ++ if (ret) { ++ ath11k_warn(ab, "error in nss ext rx undecap, type %d err %d\n", ++ arvif->nss.decap, ret); ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++} ++ ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++/*------Mesh offload------*/ ++ ++void ath11k_nss_mesh_wifili_event_receive(void *app_data, ++ struct nss_cmn_msg *cmn_msg) ++{ ++ struct nss_wifi_mesh_msg *msg = (struct nss_wifi_mesh_msg *)cmn_msg; ++ struct ath11k_base *ab = app_data; ++ u32 msg_type = msg->cm.type; ++ enum nss_cmn_response response = msg->cm.response; ++ u32 error = msg->cm.error; ++ ++ if (!ab) ++ return; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, "nss mesh event received %d response %d error %d\n", ++ msg_type, response, error); ++ ++ switch (msg_type) { ++ case NSS_WIFI_MESH_MSG_MPATH_ADD: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab,"failed to add an entry to mpath table mesh_da %pM vdev_id %d\n", ++ (&msg->msg.mpath_add)->dest_mac_addr, ++ (&msg->msg.mpath_add)->link_vap_id); ++ break; ++ case NSS_WIFI_MESH_MSG_MPATH_UPDATE: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab, "failed to update mpath entry mesh_da %pM vdev_id %d" ++ "next_hop %pM old_next_hop %pM metric %d flags 0x%u hop_count %d" ++ "exp_time %u mesh_gate %u\n", ++ (&msg->msg.mpath_update)->dest_mac_addr, ++ (&msg->msg.mpath_update)->link_vap_id, ++ (&msg->msg.mpath_update)->next_hop_mac_addr, ++ (&msg->msg.mpath_update)->old_next_hop_mac_addr, ++ (&msg->msg.mpath_update)->metric, ++ (&msg->msg.mpath_update)->path_flags, ++ (&msg->msg.mpath_update)->hop_count, ++ (&msg->msg.mpath_update)->expiry_time, ++ (&msg->msg.mpath_update)->is_mesh_gate); ++ break; ++ case NSS_WIFI_MESH_MSG_MPATH_DELETE: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab,"failed to remove mpath entry mesh_da %pM" ++ "vdev_id %d\n", ++ (&msg->msg.mpath_del)->mesh_dest_mac_addr, ++ (&msg->msg.mpath_del)->link_vap_id); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_ADD: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab,"failed to add proxy entry da %pM mesh_da %pM \n", ++ (&msg->msg.proxy_add_msg)->dest_mac_addr, ++ (&msg->msg.proxy_add_msg)->mesh_dest_mac); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_UPDATE: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab,"failed to update proxy path da %pM mesh_da %pM\n", ++ (&msg->msg.proxy_update_msg)->dest_mac_addr, ++ (&msg->msg.proxy_update_msg)->mesh_dest_mac); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_DELETE: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab,"failed to remove proxy path entry da %pM mesh_da %pM\n", ++ (&msg->msg.proxy_del_msg)->dest_mac_addr, ++ (&msg->msg.proxy_del_msg)->mesh_dest_mac_addr); ++ break; ++ case NSS_WIFI_MESH_MSG_EXCEPTION_FLAG: ++ if (response == NSS_CMN_RESPONSE_EMSG) ++ ath11k_warn(ab,"failed to add the exception da %pM\n", ++ (&msg->msg.exception_msg)->dest_mac_addr); ++ break; ++ default: ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, "unhandled event %d\n", msg_type); ++ break; ++ } ++} ++ ++static void nss_mesh_convert_path_flags(u8 *dest, u8 *src, bool to_nss) ++{ ++ if (to_nss) { ++ if (*src & IEEE80211_MESH_PATH_ACTIVE) ++ *dest |= NSS_WIFI_MESH_PATH_FLAG_ACTIVE; ++ if (*src & IEEE80211_MESH_PATH_RESOLVING) ++ *dest |= NSS_WIFI_MESH_PATH_FLAG_RESOLVING; ++ if (*src & IEEE80211_MESH_PATH_RESOLVED) ++ *dest |= NSS_WIFI_MESH_PATH_FLAG_RESOLVED; ++ if (*src & IEEE80211_MESH_PATH_FIXED) ++ *dest |= NSS_WIFI_MESH_PATH_FLAG_FIXED; ++ } else { ++ if (*src & NSS_WIFI_MESH_PATH_FLAG_ACTIVE) ++ *dest |= IEEE80211_MESH_PATH_ACTIVE; ++ if (*src & NSS_WIFI_MESH_PATH_FLAG_RESOLVING) ++ *dest |= IEEE80211_MESH_PATH_RESOLVING; ++ if (*src & NSS_WIFI_MESH_PATH_FLAG_RESOLVED) ++ *dest |= IEEE80211_MESH_PATH_RESOLVED; ++ if (*src & NSS_WIFI_MESH_PATH_FLAG_FIXED) ++ *dest |= IEEE80211_MESH_PATH_FIXED; ++ } ++} ++ ++static void ath11k_nss_mesh_mpath_refresh(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_path_refresh_msg *refresh_msg; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ refresh_msg = &msg->msg.path_refresh_msg; ++ ether_addr_copy(path.mesh_da, refresh_msg->dest_mac_addr); ++ ether_addr_copy(path.next_hop, refresh_msg->next_hop_mac_addr); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh path refresh event from nss, mDA %pM next_hop %pM link_vdev %d\n", ++ refresh_msg->dest_mac_addr, refresh_msg->next_hop_mac_addr, ++ refresh_msg->link_vap_id); ++ ++ ++ if (ab->nss.debug_mode) ++ return; ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_REFRESH); ++ if (ret) ++ ath11k_warn(ab, "failed to notify mpath refresh nss event %d\n", ret); ++} ++ ++static void ath11k_nss_mesh_path_not_found(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_mpath_not_found_msg *err_msg; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ err_msg = &msg->msg.mpath_not_found_msg; ++ ether_addr_copy(path.da, err_msg->dest_mac_addr); ++ if (err_msg->is_mesh_forward_path) ++ ether_addr_copy(path.ta, err_msg->transmitter_mac_addr); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh path not found event from nss, (m)DA %pM ta %pM link vap %d\n", ++ err_msg->dest_mac_addr, err_msg->transmitter_mac_addr, err_msg->link_vap_id); ++ ++ ++ if (ab->nss.debug_mode) ++ return; ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_PATH_NOT_FOUND); ++ if (ret) ++ ath11k_warn(ab, "failed to notify mpath not found nss event %d\n", ret); ++} ++ ++static void ath11k_nss_mesh_path_delete(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_mpath_del_msg *del_msg = &msg->msg.mpath_del; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ ether_addr_copy(path.mesh_da, del_msg->mesh_dest_mac_addr); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh path delete event from nss, mDA %pM vap_id %d\n", ++ del_msg->mesh_dest_mac_addr, del_msg->link_vap_id); ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_DEL); ++ if (ret) ++ ath11k_warn(ab, "failed to notify mpath delete nss event %d\n", ret); ++} ++ ++static void ath11k_nss_mesh_path_expiry(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_path_expiry_msg *exp_msg = &msg->msg.path_expiry_msg; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ ether_addr_copy(path.mesh_da, exp_msg->mesh_dest_mac_addr); ++ ether_addr_copy(path.next_hop, exp_msg->next_hop_mac_addr); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh path delete event from nss, mDA %pM next_hop %pM if_num %d\n", ++ exp_msg->mesh_dest_mac_addr, exp_msg->next_hop_mac_addr, ++ arvif->nss.if_num); ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPATH_EXP); ++ if (ret) ++ ath11k_warn(ab, "failed to notify mpath expiry nss event %d\n", ret); ++} ++ ++static void ath11k_nss_mesh_mpp_learn(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++ { ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_proxy_path_learn_msg *learn_msg; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ learn_msg = &msg->msg.proxy_learn_msg; ++ ++ ether_addr_copy(path.mesh_da, learn_msg->mesh_dest_mac); ++ ether_addr_copy(path.da, learn_msg->dest_mac_addr); ++ nss_mesh_convert_path_flags(&path.flags, &learn_msg->path_flags, false); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh proxy learn event from nss, mDA %pM da %pM flags 0x%x if_num %d\n", ++ learn_msg->mesh_dest_mac, learn_msg->dest_mac_addr, ++ learn_msg->path_flags, arvif->nss.if_num); ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_LEARN); ++ if (ret) ++ ath11k_warn(ab, "failed to notify proxy learn event %d\n", ret); ++} ++ ++static void ath11k_nss_mesh_mpp_add(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_proxy_path_add_msg *add_msg = &msg->msg.proxy_add_msg; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ ether_addr_copy(path.mesh_da, add_msg->mesh_dest_mac); ++ ether_addr_copy(path.da, add_msg->dest_mac_addr); ++ nss_mesh_convert_path_flags(&path.flags, &add_msg->path_flags, false); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh proxy add event from nss, mDA %pM da %pM flags 0x%x if_num %d\n", ++ add_msg->mesh_dest_mac, add_msg->dest_mac_addr, add_msg->path_flags, ++ arvif->nss.if_num); ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_ADD); ++ if (ret) ++ ath11k_warn(ab, "failed to notify proxy add event %d\n", ret); ++} ++ ++static void ath11k_nss_mesh_mpp_update(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_proxy_path_update_msg *umsg; ++ struct ieee80211_mesh_path_offld path = {0}; ++ int ret; ++ ++ umsg = &msg->msg.proxy_update_msg; ++ ether_addr_copy(path.mesh_da, umsg->mesh_dest_mac); ++ ether_addr_copy(path.da, umsg->dest_mac_addr); ++ nss_mesh_convert_path_flags(&path.flags, &umsg->path_flags, false); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "Mesh proxy update event from nss, mDA %pM da %pM flags 0x%x if_num %d\n", ++ umsg->mesh_dest_mac, umsg->dest_mac_addr, umsg->path_flags, arvif->nss.if_num); ++ ++ ret = ieee80211_mesh_path_offld_change_notify(arvif->vif, &path, ++ IEEE80211_MESH_PATH_OFFLD_ACTION_MPP_UPDATE); ++ if (ret) ++ ath11k_warn(ab, "failed to notify proxy update event %d\n", ret); ++} ++ ++static int ++ath11k_nss_mesh_process_path_table_dump_msg(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct nss_wifi_mesh_path_table_dump *mpath_dump = &msg->msg.mpath_table_dump; ++ struct ath11k_nss_mpath_entry *entry; ++ struct ath11k *ar = arvif->ar; ++ ssize_t len; ++ ++ len = sizeof(struct nss_wifi_mesh_path_dump_entry) * mpath_dump->num_entries; ++ entry = kzalloc(sizeof(*entry) + len, GFP_ATOMIC); ++ if (!entry) ++ return -ENOMEM; ++ ++ memcpy(entry->mpath, mpath_dump->path_entry, len); ++ entry->num_entries = mpath_dump->num_entries; ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_add_tail(&entry->list, &arvif->nss.mpath_dump); ++ arvif->nss.mpath_dump_num_entries += mpath_dump->num_entries; ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ if (!mpath_dump->more_events) ++ complete(&arvif->nss.dump_mpath_complete); ++ ++ return 0; ++} ++ ++static int ++ath11k_nss_mesh_process_mpp_table_dump_msg(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_msg *msg) ++{ ++ struct nss_wifi_mesh_proxy_path_table_dump *mpp_dump; ++ struct ath11k_nss_mpp_entry *entry, *tmp; ++ struct ath11k *ar = arvif->ar; ++ struct arvif_nss *nss = &arvif->nss; ++ ssize_t len; ++ LIST_HEAD(local_entry_exp_update); ++ ++ mpp_dump = &msg->msg.proxy_path_table_dump; ++ ++ if (!mpp_dump->num_entries) ++ return 0; ++ ++ len = sizeof(struct nss_wifi_mesh_proxy_path_dump_entry) * mpp_dump->num_entries; ++ entry = kzalloc(sizeof(*entry) + len, GFP_ATOMIC); ++ if (!entry) ++ return -ENOMEM; ++ ++ memcpy(entry->mpp, mpp_dump->path_entry, len); ++ entry->num_entries = mpp_dump->num_entries; ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_add_tail(&entry->list, &arvif->nss.mpp_dump); ++ arvif->nss.mpp_dump_num_entries += mpp_dump->num_entries; ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ if (!mpp_dump->more_events) { ++ if (arvif->nss.mpp_aging) { ++ arvif->nss.mpp_aging = false; ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&nss->mpp_dump, &local_entry_exp_update); ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(entry, tmp, &local_entry_exp_update, list) { ++ if (entry->mpp->time_diff > ATH11K_MPP_EXPIRY_TIMER_INTERVAL_MS) ++ continue; ++ mesh_nss_offld_proxy_path_exp_update(arvif->vif, ++ entry->mpp->dest_mac_addr, ++ entry->mpp->mesh_dest_mac, ++ entry->mpp->time_diff); ++ } ++ /* If mpp_dump_req is true dont free the entry ++ * since it will get freed in debug_nss_fill_mpp_dump ++ * both mpp_aging and mpp_dump_req will be true during ++ * simultaneous accessing of mpp dump entry. So this will ++ * gain the reuse of same dump result for both mpp_aging ++ * and mpp_dump_req */ ++ if (!arvif->nss.mpp_dump_req) { ++ list_for_each_entry_safe(entry, tmp, &local_entry_exp_update, list) ++ kfree(entry); ++ } else { ++ /* Adding back to global nss dump tbl to reuse the same ++ * tbl for mpp dump request ++ */ ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&local_entry_exp_update, &nss->mpp_dump); ++ spin_unlock_bh(&ar->nss.dump_lock); ++ } ++ } ++ ++ if (arvif->nss.mpp_dump_req) { ++ complete(&arvif->nss.dump_mpp_complete); ++ arvif->nss.mpp_dump_req = false; ++ } ++ } ++ ++ return 0; ++} ++ ++int ath11k_nss_mesh_exception_flags(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_exception_flag_msg *nss_msg) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_path_exception(arvif->nss.mesh_handle, nss_msg, ++ msg_cb, arvif->ar->ab); ++ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(arvif->ar->ab, "failed to set the exception flags\n"); ++ ret = -EINVAL; ++ } ++ ++ return ret; ++} ++ ++int ath11k_nss_exc_rate_config(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_rate_limit_config *nss_exc_cfg) ++{ ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_config_mesh_exception_sync(arvif->nss.mesh_handle, nss_exc_cfg); ++ ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(arvif->ar->ab, "failed to set the exception rate ctrl\n"); ++ ret = -EINVAL; ++ } ++ ++ return ret; ++} ++ ++static void ath11k_nss_mesh_obj_vdev_event_receive(void *dev, ++ struct nss_cmn_msg *cmn_msg) ++{ ++ struct nss_wifi_mesh_msg *msg = (struct nss_wifi_mesh_msg *) cmn_msg; ++ struct ath11k_base *ab; ++ struct ath11k_vif *arvif; ++ int ret; ++ ++ arvif = ath11k_nss_get_arvif_from_dev(dev); ++ if (!arvif) ++ return; ++ ++ ab = arvif->ar->ab; ++ ++ switch (msg->cm.type) { ++ case NSS_WIFI_MESH_MSG_PATH_REFRESH: ++ ath11k_nss_mesh_mpath_refresh(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_PATH_NOT_FOUND: ++ ath11k_nss_mesh_path_not_found(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_MPATH_DELETE: ++ ath11k_nss_mesh_path_delete(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_PATH_EXPIRY: ++ ath11k_nss_mesh_path_expiry(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_LEARN: ++ ath11k_nss_mesh_mpp_learn(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_ADD: ++ ath11k_nss_mesh_mpp_add(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_UPDATE: ++ ath11k_nss_mesh_mpp_update(arvif, msg); ++ break; ++ case NSS_WIFI_MESH_MSG_PATH_TABLE_DUMP: ++ ret = ath11k_nss_mesh_process_path_table_dump_msg(arvif, msg); ++ if (ret) ++ ath11k_warn(arvif->ar->ab, "failed mpath table dump message %d\n", ++ ret); ++ break; ++ case NSS_WIFI_MESH_MSG_PROXY_PATH_TABLE_DUMP: ++ ret = ath11k_nss_mesh_process_mpp_table_dump_msg(arvif, msg); ++ if (ret) ++ ath11k_warn(arvif->ar->ab, "failed mpp table dump message %d\n", ++ ret); ++ break; ++ default: ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "unknown message type on mesh obj vap %d\n", ++ msg->cm.type); ++ break; ++ } ++} ++ ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static int ath11k_nss_mesh_mpath_add(struct ath11k_vif *arvif, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct nss_wifi_mesh_mpath_add_msg *msg; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_MESH, "add mpath for mesh_da %pM on radio %d\n", ++ path->mesh_da, ar->pdev->pdev_id); ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_mpath_add_msg), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ ether_addr_copy(msg->dest_mac_addr, path->mesh_da); ++ ether_addr_copy(msg->next_hop_mac_addr, path->next_hop); ++ msg->hop_count = path->hop_count; ++ msg->metric = path->metric; ++ nss_mesh_convert_path_flags(&msg->path_flags, &path->flags, true); ++ msg->link_vap_id = arvif->nss.if_num; ++ msg->block_mesh_fwd = path->block_mesh_fwd; ++ msg->metadata_type = path->metadata_type ? NSS_WIFI_MESH_PRE_HEADER_80211: NSS_WIFI_MESH_PRE_HEADER_NONE; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_path_add(arvif->nss.mesh_handle, msg, ++ msg_cb, ar->ab); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, ++ "failed to add mpath entry mesh_da %pM radio_id %d status %d\n", ++ path->mesh_da, arvif->nss.if_num, status); ++ ret = -EINVAL; ++ } ++ ++ kfree(msg); ++ ++ return ret; ++} ++ ++static int ath11k_nss_mesh_mpath_update(struct ath11k_vif *arvif, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct nss_wifi_mesh_mpath_update_msg *msg; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_MESH, ++ "update mpath mesh_da %pM radio %d next_hop %pM old_next_hop %pM " ++ "metric %d flags 0x%x hop_count %d " ++ "exp_time %lu mesh_gate %d\n", ++ path->mesh_da, ar->pdev->pdev_id, path->next_hop, path->old_next_hop, ++ path->metric, path->flags, path->hop_count, path->exp_time, ++ path->mesh_gate); ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_mpath_update_msg), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ ether_addr_copy(msg->dest_mac_addr, path->mesh_da); ++ ether_addr_copy(msg->next_hop_mac_addr, path->next_hop); ++ ether_addr_copy(msg->old_next_hop_mac_addr, path->old_next_hop); ++ msg->hop_count = path->hop_count; ++ msg->metric = path->metric; ++ nss_mesh_convert_path_flags(&msg->path_flags, &path->flags, true); ++ msg->link_vap_id = arvif->nss.if_num; ++ msg->is_mesh_gate = path->mesh_gate; ++ msg->expiry_time = path->exp_time; ++ msg->block_mesh_fwd = path->block_mesh_fwd; ++ msg->metadata_type = ++ (uint8_t)(path->metadata_type == ++ (uint8_t) ++ NSS_WIFI_MESH_PRE_HEADER_80211 ? ++ NSS_WIFI_MESH_PRE_HEADER_80211 : ++ NSS_WIFI_MESH_PRE_HEADER_NONE); ++ ++ msg->update_flags = NSS_WIFI_MESH_PATH_UPDATE_FLAG_NEXTHOP | ++ NSS_WIFI_MESH_PATH_UPDATE_FLAG_HOPCOUNT | ++ NSS_WIFI_MESH_PATH_UPDATE_FLAG_METRIC | ++ NSS_WIFI_MESH_PATH_UPDATE_FLAG_MESH_FLAGS | ++ NSS_WIFI_MESH_PATH_UPDATE_FLAG_BLOCK_MESH_FWD | ++ NSS_WIFI_MESH_PATH_UPDATE_FLAG_METADATA_ENABLE_VALID; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_path_update(arvif->nss.mesh_handle, msg, ++ msg_cb, ar->ab); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, ++ "failed to update mpath entry mesh_da %pM radio_id %d status %d\n", ++ path->mesh_da, arvif->nss.if_num, status); ++ ret = -EINVAL; ++ } ++ ++ kfree(msg); ++ ++ return ret; ++} ++ ++static int ath11k_nss_mesh_mpath_del(struct ath11k_vif *arvif, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct nss_wifi_mesh_mpath_del_msg *msg; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_MESH, "del mpath for mesh_da %pM on radio %d\n", ++ path->mesh_da, ar->pdev->pdev_id); ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_mpath_del_msg), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ ether_addr_copy(msg->mesh_dest_mac_addr, path->mesh_da); ++ ether_addr_copy(msg->next_hop_mac_addr, path->next_hop); ++ msg->link_vap_id = arvif->nss.if_num; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_path_delete(arvif->nss.mesh_handle, ++ msg, msg_cb, ar->ab); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, ++ "failed to del mpath entry mesh_da %pM radio_id %d status %d\n", ++ path->mesh_da, arvif->nss.if_num, status); ++ ret = -EINVAL; ++ } ++ ++ kfree(msg); ++ ++ return ret; ++} ++ ++static int ath11k_nss_mesh_mpp_add_cmd(struct ath11k_vif *arvif, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct nss_wifi_mesh_proxy_path_add_msg *msg; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_MESH, "add mpp mesh_da %pM da %pM\n", ++ path->mesh_da, path->da); ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_proxy_path_add_msg), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ ether_addr_copy(msg->dest_mac_addr, path->da); ++ ether_addr_copy(msg->mesh_dest_mac, path->mesh_da); ++ nss_mesh_convert_path_flags(&msg->path_flags, &path->flags, true); ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_proxy_path_add(arvif->nss.mesh_handle, ++ msg, msg_cb, ar->ab); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, ++ "failed to add mpp entry da %pM mesh_da %pM status %d\n", ++ path->da, path->mesh_da, status); ++ ret = -EINVAL; ++ } ++ ++ kfree(msg); ++ ++ return ret; ++} ++ ++static int ath11k_nss_mesh_mpp_update_cmd(struct ath11k_vif *arvif, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct nss_wifi_mesh_proxy_path_update_msg *msg; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_MESH, "update mpp da %pM mesh_da %pM on vap_id %d\n", ++ path->da, path->mesh_da, arvif->nss.if_num); ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_proxy_path_update_msg), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ ether_addr_copy(msg->dest_mac_addr, path->da); ++ ether_addr_copy(msg->mesh_dest_mac, path->mesh_da); ++ nss_mesh_convert_path_flags(&msg->path_flags, &path->flags, true); ++ msg->bitmap = NSS_WIFI_MESH_PATH_UPDATE_FLAG_NEXTHOP | ++ NSS_WIFI_MESH_PATH_UPDATE_FLAG_HOPCOUNT; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_proxy_path_update(arvif->nss.mesh_handle, ++ msg, msg_cb, ar->ab); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, ++ "failed to update mpp da %pM mesh_da %pM status %d\n", ++ path->da, path->mesh_da, status); ++ ret = -EINVAL; ++ } ++ ++ kfree(msg); ++ ++ return ret; ++} ++ ++static int ath11k_nss_mesh_mpp_del_cmd(struct ath11k_vif *arvif, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct nss_wifi_mesh_proxy_path_del_msg *msg; ++ struct ath11k *ar = arvif->ar; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ ath11k_dbg(ar->ab, ATH11K_DBG_NSS_MESH, "del mpath for mesh_da %pM\n", ++ path->mesh_da); ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_proxy_path_del_msg), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ ether_addr_copy(msg->dest_mac_addr, path->da); ++ ether_addr_copy(msg->mesh_dest_mac_addr, path->mesh_da); ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_proxy_path_delete(arvif->nss.mesh_handle, msg, ++ msg_cb, ar->ab); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, ++ "failed to add mpath entry mesh_da %pM status %d\n", ++ path->mesh_da, status); ++ ret = -EINVAL; ++ } ++ ++ kfree(msg); ++ ++ return ret; ++} ++ ++int ath11k_nss_mesh_config_path(struct ath11k *ar, struct ath11k_vif *arvif, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ int ret; ++ ++ ++ if (!ar->ab->nss.enabled) ++ return 0; ++ ++ switch (cmd) { ++ case IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPATH: ++ ret = ath11k_nss_mesh_mpath_add(arvif, path); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPATH: ++ ret = ath11k_nss_mesh_mpath_update(arvif, path); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPATH: ++ ret = ath11k_nss_mesh_mpath_del(arvif, path); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_CMD_ADD_MPP: ++ ret = ath11k_nss_mesh_mpp_add_cmd(arvif, path); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_CMD_UPDATE_MPP: ++ ret = ath11k_nss_mesh_mpp_update_cmd(arvif, path); ++ break; ++ case IEEE80211_MESH_PATH_OFFLD_CMD_DELETE_MPP: ++ ret = ath11k_nss_mesh_mpp_del_cmd(arvif, path); ++ break; ++ default: ++ ath11k_warn(ar->ab, "unknown mesh path table command type %d\n", cmd); ++ return -EINVAL; ++ } ++ ++ return ret; ++} ++ ++int ath11k_nss_mesh_config_update(struct ieee80211_vif *vif, int changed) ++{ ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_config_msg *nss_msg; ++ struct arvif_nss *nss = &arvif->nss; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ if (!ab->nss.enabled) ++ return 0; ++ ++ if (!ab->nss.mesh_nss_offload_enabled) ++ return -ENOTSUPP; ++ ++ if (!changed) ++ return 0; ++ ++ nss_msg = kzalloc(sizeof(*nss_msg), GFP_KERNEL); ++ if (!nss_msg) ++ return -ENOMEM; ++ ++ if (changed & BSS_CHANGED_NSS_MESH_TTL) { ++ nss_msg->ttl = vif->bss_conf.nss_offld_ttl; ++ nss->mesh_ttl = vif->bss_conf.nss_offld_ttl; ++ nss_msg->config_flags |= NSS_WIFI_MESH_CONFIG_FLAG_TTL_VALID; ++ } ++ ++ if (changed & BSS_CHANGED_NSS_MESH_REFRESH_TIME) { ++ nss_msg->mesh_path_refresh_time = ++ vif->bss_conf.nss_offld_mpath_refresh_time; ++ nss->mpath_refresh_time = ++ vif->bss_conf.nss_offld_mpath_refresh_time; ++ nss_msg->config_flags |= NSS_WIFI_MESH_CONFIG_FLAG_MPATH_REFRESH_VALID; ++ } ++ ++ if (changed & BSS_CHANGED_NSS_MESH_FWD_ENABLED) { ++ nss_msg->block_mesh_forwarding = ++ vif->bss_conf.nss_offld_mesh_forward_enabled; ++ nss->mesh_forward_enabled = ++ vif->bss_conf.nss_offld_mesh_forward_enabled; ++ nss_msg->config_flags |= NSS_WIFI_MESH_CONFIG_FLAG_BLOCK_MESH_FWD_VALID; ++ nss_msg->metadata_type = arvif->nss.metadata_type; ++ nss_msg->config_flags |= NSS_WIFI_MESH_CONFIG_FLAG_METADATA_ENABLE_VALID; ++ } ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_mesh_config_update_sync(arvif->nss.mesh_handle, ++ nss_msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "failed to configure nss mesh obj vdev nss_err:%d\n", ++ status); ++ ret = -EINVAL; ++ } ++ ++ kfree(nss_msg); ++ ++ return ret; ++} ++#endif ++ ++int ath11k_nss_dump_mpath_request(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct ath11k *ar = arvif->ar; ++ struct arvif_nss *nss = &arvif->nss; ++ struct ath11k_nss_mpath_entry *entry, *tmp; ++ LIST_HEAD(local_entry); ++ nss_tx_status_t status; ++ ++ /* Clean up any stale entries from old events */ ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail(&nss->mpath_dump, &local_entry); ++ arvif->nss.mpath_dump_num_entries = 0; ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(entry, tmp, &local_entry, list) ++ kfree(entry); ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_dump_mesh_path_sync(arvif->nss.mesh_handle); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "failed to send mpath dump command on mesh obj vdev nss_err:%d\n", ++ status); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++int ath11k_nss_dump_mpp_request(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct ath11k *ar = arvif->ar; ++ struct arvif_nss *nss = &arvif->nss; ++ struct ath11k_nss_mpp_entry *entry, *tmp; ++ LIST_HEAD(local_entry); ++ nss_wifi_meshmgr_status_t status; ++ ++ if (!arvif->nss.mpp_aging) { ++ /* Clean up any stale entries from old events */ ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&nss->mpp_dump, &local_entry); ++ arvif->nss.mpp_dump_num_entries = 0; ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(entry, tmp, &local_entry, list) { ++ list_del(&entry->list); ++ kfree(entry); ++ } ++ } ++ ++ arvif->nss.mpp_dump_req = true; ++ ++ status = nss_wifi_meshmgr_dump_mesh_proxy_path_sync(arvif->nss.mesh_handle); ++ if (status != NSS_WIFI_MESHMGR_SUCCESS) { ++ if (status == NSS_WIFI_MESHMGR_FAILURE_ONESHOT_ALREADY_ATTACHED) ++ return 0; ++ ath11k_warn(ab, "failed to send mpp dump command on mesh obj vdev nss_err:%d\n", ++ status); ++ return -EINVAL; ++ } ++ ++ return 0; ++} ++ ++void ath11k_nss_mpp_timer_cb(struct timer_list *timer) ++{ ++ nss_wifi_mesh_msg_callback_t msg_cb; ++ struct arvif_nss *nss = from_timer(nss, timer,mpp_expiry_timer); ++ struct ath11k_vif *arvif = container_of(nss, struct ath11k_vif, nss); ++ struct ath11k_base *ab = arvif->ar->ab; ++ LIST_HEAD(local_entry); ++ nss_tx_status_t status; ++ ++ msg_cb = (nss_wifi_mesh_msg_callback_t)ath11k_nss_mesh_wifili_event_receive; ++ ++ if (!arvif->nss.mpp_dump_req) ++ arvif->nss.mpp_dump_num_entries = 0; ++ arvif->nss.mpp_aging = true; ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_dump_mesh_proxy_path(arvif->nss.mesh_handle, msg_cb, ab); ++ if (status != NSS_TX_SUCCESS) ++ ath11k_warn(ab, "failed to send mpp dump command from timer nss_err:%d\n", ++ status); ++ ++ mod_timer(&nss->mpp_expiry_timer, ++ jiffies + msecs_to_jiffies(ATH11K_MPP_EXPIRY_TIMER_INTERVAL_MS)); ++ ++} ++ ++static void ++ath11k_nss_mesh_obj_vdev_data_receive(struct net_device *dev, struct sk_buff *skb, ++ struct napi_struct *napi) ++{ ++ struct ath11k_vif *arvif; ++ struct ath11k_base *ab; ++ char dump_msg[100] = {0}; ++ struct nss_wifi_mesh_per_packet_metadata *wifi_metadata = NULL; ++ ++ arvif = ath11k_nss_get_arvif_from_dev(dev); ++ if (!arvif) { + dev_kfree_skb_any(skb); + return; + } + ++ ab = arvif->ar->ab; ++ ++ skb->dev = dev; ++ ++ snprintf(dump_msg, sizeof(dump_msg), "nss mesh obj vdev: link id %d ", ++ arvif->nss.if_num); ++ ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "dp rx msdu from nss", dump_msg, ++ skb->data, skb->len); ++ ++ if (arvif->nss.metadata_type == NSS_WIFI_MESH_PRE_HEADER_80211) { ++ wifi_metadata = (struct nss_wifi_mesh_per_packet_metadata *)(skb->data - ++ (sizeof(struct nss_wifi_mesh_per_packet_metadata))); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, ++ "exception from nss on mesh obj vap: pkt_type %d\n", ++ wifi_metadata->pkt_type); ++ switch (wifi_metadata->pkt_type) { ++ case NSS_WIFI_MESH_PRE_HEADER_80211: ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", ++ "wifi header from nss on mesh obj vdev: ", ++ skb->data - sizeof(*wifi_metadata), sizeof(*wifi_metadata) + skb->len); ++ dev_kfree_skb_any(skb); ++ break; ++ default: ++ dev_kfree_skb_any(skb); ++ } ++ ++ return; ++ } ++ ++ ath11k_nss_deliver_rx(arvif->vif, skb, true, 0, napi); ++} ++ ++static void ++ath11k_nss_mesh_obj_ext_data_callback(struct net_device *dev, struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ struct ath11k_vif *arvif; ++ struct ath11k_base *ab; ++ struct nss_wifi_mesh_encap_ext_pkt_metadata *wifi_metadata = NULL; ++ int metadata_len; ++ ++ arvif = ath11k_nss_get_arvif_from_dev(dev); ++ if (!arvif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ ab = arvif->ar->ab; ++ ++ skb->dev = dev; ++ ++ metadata_len = NSS_WIFI_MESH_ENCAP_METADATA_OFFSET_TYPE + ++ sizeof(struct nss_wifi_mesh_encap_ext_pkt_metadata); ++ ++ /* msdu from nss should contain metadata in headroom ++ * any msdu which has invalid or not contains metadata ++ * will be treated as invalid msdu and dropping it. ++ */ ++ if (!(metadata_len < skb_headroom(skb))) { ++ ath11k_warn(ab, "msdu from nss is having invalid headroom %d\n", skb_headroom(skb)); ++ dev_kfree_skb_any(skb); ++ return; ++ } ++ ++ dma_unmap_single(ab->dev, virt_to_phys(skb->head), ++ metadata_len, ++ DMA_FROM_DEVICE); ++ ++ wifi_metadata = (struct nss_wifi_mesh_encap_ext_pkt_metadata *)(skb->head + ++ NSS_WIFI_MESH_ENCAP_METADATA_OFFSET_TYPE); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, "msdu from nss ext_data _cb on mesh obj vdev"); ++ ++ switch (wifi_metadata->pkt_type) { ++ case NSS_WIFI_MESH_ENCAP_EXT_DATA_PKT_TYPE_MPATH_NOT_FOUND_EXC: ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "msdu from nss ext_data for mpath not found : ", ++ skb->data, skb->len); ++ skb->protocol = eth_type_trans(skb, dev); ++ skb_reset_network_header(skb); ++ dev_queue_xmit(skb); ++ break; ++ default: ++ ath11k_warn(ab, "unknown packet type received in mesh obj ext data %d", ++ wifi_metadata->pkt_type); ++ dev_kfree_skb_any(skb); ++ } ++} ++ ++static void ++ath11k_nss_mesh_link_vdev_data_receive(struct net_device *dev, ++ struct sk_buff *skb, ++ struct napi_struct *napi) ++{ ++ struct ieee80211_vif *vif; ++ struct ath11k_vif *arvif; ++ struct ath11k_base *ab; ++ struct wireless_dev *wdev = (struct wireless_dev *)dev; ++ + vif = wdev_to_ieee80211_vif(wdev); + if (!vif) { + dev_kfree_skb_any(skb); +@@ -906,23 +1941,81 @@ ath11k_nss_ext_vdev_data_receive(struct + } + + ab = arvif->ar->ab; ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "msdu from nss data_receive_cb on mesh link vdev: ", ++ skb->data, skb->len); ++ /* data callback for mesh link vap is not expected */ ++ dev_kfree_skb_any(skb); ++} + +- skb->dev = dev; ++static void ++ath11k_nss_mesh_link_vdev_special_data_receive(struct net_device *dev, ++ struct sk_buff *skb, ++ __attribute__((unused)) struct napi_struct *napi) ++{ ++ struct ieee80211_vif *vif; ++ struct ath11k_base *ab; ++ struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; ++ struct ath11k_skb_rxcb *rxcb; ++ struct ath11k_vif *arvif; ++ struct wireless_dev *wdev = (struct wireless_dev *)dev; + +- /* log the original skb received from nss */ +- ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss ext : ", +- skb->data, skb->len); ++ vif = wdev_to_ieee80211_vif(wdev); ++ if (!vif) { ++ dev_kfree_skb_any(skb); ++ return; ++ } + +- ret = ath11k_nss_undecap(arvif, skb, &data_offs, ð_decap); +- if (ret) { +- ath11k_warn(ab, "error in nss ext rx undecap, type %d err %d\n", +- arvif->nss.decap, ret); ++ arvif = (struct ath11k_vif *)vif->drv_priv; ++ if (!arvif) { + dev_kfree_skb_any(skb); + return; + } + +- ath11k_nss_deliver_rx(arvif->vif, skb, eth_decap, data_offs, napi); ++ ab = arvif->ar->ab; ++ ++ wifi_metadata = (struct nss_wifi_vdev_per_packet_metadata *)(skb->head + ++ NSS_WIFI_VDEV_PER_PACKET_METADATA_OFFSET); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, ++ "dp special data from nss on mesh link vap: pkt_type %d\n", ++ wifi_metadata->pkt_type); ++ ++ switch (wifi_metadata->pkt_type) { ++ case NSS_WIFI_VDEV_MESH_EXT_DATA_PKT_TYPE_RX_SPL_PACKET: ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", ++ "special packet meta data from nss on mesh link vdev: ", ++ wifi_metadata, ++ sizeof(struct nss_wifi_vdev_per_packet_metadata)); ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", ++ "special packet payload from nss on mesh link vdev: ", ++ skb->data, skb->len); ++ dev_kfree_skb_any(skb); ++ break; ++ case NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_MCBC_RX: ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", ++ "mcast packet exception from nss on mesh link vdev: ", ++ skb->data, skb->len); ++ rxcb = ATH11K_SKB_RXCB(skb); ++ rxcb->rx_desc = (struct hal_rx_desc *)skb->head; ++ rxcb->is_first_msdu = rxcb->is_last_msdu = true; ++ rxcb->is_continuation = false; ++ rxcb->is_mcbc = true; ++ ath11k_dp_rx_from_nss(arvif->ar, skb, napi); ++ break; ++ case NSS_WIFI_VDEV_EXT_DATA_PKT_TYPE_MESH: ++ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", ++ "static exception path from nss on mesh link vdev: ", ++ skb->data, skb->len); ++ dev_kfree_skb_any(skb); ++ break; ++ default: ++ ath11k_warn(ab, "unknown packet type received in mesh link vdev %d", ++ wifi_metadata->pkt_type); ++ dev_kfree_skb_any(skb); ++ break; ++ } + } ++#endif + + int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb) + { +@@ -930,8 +2023,9 @@ int ath11k_nss_tx(struct ath11k_vif *arv + nss_tx_status_t status; + int encap_type = ath11k_dp_tx_get_encap_type(arvif, skb); + struct ath11k_soc_dp_stats *soc_stats = &ar->ab->soc_stats; ++ char dump_msg[100] = {0}; + +- if (encap_type != arvif->nss.encap) { ++ if (!arvif->ar->ab->nss.debug_mode && encap_type != arvif->nss.encap) { + ath11k_warn(ar->ab, "encap mismatch in nss tx skb encap type %d" \ + " vif encap type %d\n", encap_type, arvif->nss.encap); + goto drop; +@@ -946,16 +2040,45 @@ int ath11k_nss_tx(struct ath11k_vif *arv + ath11k_nss_tx_encap_nwifi(skb); + + send: +- ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, +- arvif->vif->type == NL80211_IFTYPE_AP_VLAN ? "ext vdev" : "", +- "nss tx msdu: ", skb->data, skb->len); +- +- if (arvif->vif->type == NL80211_IFTYPE_AP_VLAN) ++ if (arvif->vif->type == NL80211_IFTYPE_AP_VLAN) { ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, "ext vdev", ++ "nss tx msdu: ", skb->data, skb->len); + status = nss_wifi_ext_vdev_tx_buf(arvif->nss.ctx, skb, + arvif->nss.if_num); +- else +- status = nss_wifi_vdev_tx_buf(arvif->ar->nss.ctx, skb, +- arvif->nss.if_num); ++ } else { ++ if (arvif->ar->ab->nss.debug_mode) { ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ if (encap_type == HAL_TCL_ENCAP_TYPE_ETHERNET && ++ !is_multicast_ether_addr(skb->data)) { ++ snprintf(dump_msg, sizeof(dump_msg), ++ "nss tx ucast msdu: %d ", ++ arvif->nss.mesh_handle); ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, "mesh", ++ dump_msg, skb->data, skb->len); ++ status = (nss_tx_status_t)nss_wifi_meshmgr_tx_buf(arvif->nss.mesh_handle, ++ skb); ++ } else { ++#endif ++ snprintf(dump_msg, sizeof(dump_msg), ++ "nss tx mcast msdu: %d ", ++ arvif->nss.if_num); ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, "mesh", ++ dump_msg, skb->data, skb->len); ++ status = nss_wifi_vdev_tx_buf(arvif->ar->nss.ctx, skb, ++ arvif->nss.if_num); ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ } ++#endif ++ } else { ++ snprintf(dump_msg, sizeof(dump_msg), ++ "nss tx msdu: %d ", ++ arvif->nss.if_num); ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DP_TX, "", ++ dump_msg, skb->data, skb->len); ++ status = nss_wifi_vdev_tx_buf(arvif->ar->nss.ctx, skb, ++ arvif->nss.if_num); ++ } ++ } + + if (status != NSS_TX_SUCCESS) { + ath11k_dbg(ar->ab, (ATH11K_DBG_NSS | ATH11K_DBG_DP_TX), +@@ -1057,6 +2180,9 @@ static int ath11k_nss_vdev_configure(str + + vdev_cfg = &vdev_msg->msg.vdev_config; + ++ if (arvif->vif->type == NL80211_IFTYPE_MESH_POINT) ++ vdev_cfg->vap_ext_mode = WIFI_VDEV_EXT_MODE_MESH_LINK; ++ + vdev_cfg->radio_ifnum = ar->nss.if_num; + vdev_cfg->vdev_id = arvif->vdev_id; + +@@ -1095,6 +2221,39 @@ free: + return ret; + } + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static int ath11k_nss_mesh_obj_assoc_link_vap(struct ath11k_vif *arvif) ++{ ++ struct nss_wifi_mesh_assoc_link_vap *msg; ++ struct ath11k_base *ab = arvif->ar->ab; ++ nss_tx_status_t status; ++ int ret; ++ ++ msg = kzalloc(sizeof(struct nss_wifi_mesh_assoc_link_vap), GFP_ATOMIC); ++ if (!msg) ++ return -ENOMEM; ++ ++ msg->link_vap_id = arvif->nss.if_num; ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, "nss mesh assoc link vap %d, mesh handle %d\n", ++ arvif->nss.if_num, arvif->nss.mesh_handle); ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_assoc_link_vap_sync(arvif->nss.mesh_handle, msg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "failed mesh obj vdev tx msg for assoc link vap nss_err:%d\n", ++ status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = 0; ++free: ++ kfree(msg); ++ ++ return ret; ++} ++#endif ++ + static void ath11k_nss_vdev_unregister(struct ath11k_vif *arvif) + { + struct ath11k_base *ab = arvif->ar->ab; +@@ -1106,6 +2265,14 @@ static void ath11k_nss_vdev_unregister(s + ath11k_dbg(ab, ATH11K_DBG_NSS, "unregistered nss vdev %d \n", + arvif->nss.if_num); + break; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ case NL80211_IFTYPE_MESH_POINT: ++ nss_unregister_wifi_vdev_if(arvif->nss.if_num); ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "unregistered nss mesh vdevs mesh link %d\n", ++ arvif->nss.if_num); ++ break; ++#endif + default: + ath11k_warn(ab, "unsupported interface type %d for nss vdev unregister\n", + arvif->vif->type); +@@ -1113,6 +2280,78 @@ static void ath11k_nss_vdev_unregister(s + } + } + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static int ath11k_nss_mesh_alloc_register(struct ath11k_vif *arvif, ++ struct net_device *netdev) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct nss_wifi_mesh_config_msg *nss_msg; ++ struct arvif_nss *nss = &arvif->nss; ++ int ret = 0; ++ ++ nss->mesh_ttl = ATH11K_MESH_DEFAULT_ELEMENT_TTL; ++ nss->mpath_refresh_time = 1000; /* msecs */ ++ nss->mesh_forward_enabled = true; ++ ++ nss_msg = kzalloc(sizeof(*nss_msg), GFP_KERNEL); ++ if (!nss_msg) ++ return -ENOMEM; ++ ++ nss_msg->ttl = nss->mesh_ttl; ++ nss_msg->mesh_path_refresh_time = nss->mpath_refresh_time; ++ nss_msg->mpp_learning_mode = mpp_mode; ++ nss_msg->block_mesh_forwarding = 0; ++ ether_addr_copy(nss_msg->local_mac_addr, arvif->vif->addr); ++ nss_msg->config_flags = ++ NSS_WIFI_MESH_CONFIG_FLAG_TTL_VALID | ++ NSS_WIFI_MESH_CONFIG_FLAG_MPATH_REFRESH_VALID | ++ NSS_WIFI_MESH_CONFIG_FLAG_MPP_LEARNING_MODE_VALID | ++ NSS_WIFI_MESH_CONFIG_FLAG_BLOCK_MESH_FWD_VALID | ++ NSS_WIFI_MESH_CONFIG_FLAG_LOCAL_MAC_VALID; ++ ++ arvif->nss.mesh_handle = nss_wifi_meshmgr_if_create_sync(netdev, nss_msg, ++ ath11k_nss_mesh_obj_vdev_data_receive, ++ ath11k_nss_mesh_obj_ext_data_callback, ++ ath11k_nss_mesh_obj_vdev_event_receive); ++ if (arvif->nss.mesh_handle == NSS_WIFI_MESH_HANDLE_INVALID) { ++ ath11k_warn(ab, "failed to create meshmgr\n"); ++ ret = -EINVAL; ++ } ++ ++ kfree(nss_msg); ++ ++ return ret; ++} ++ ++static int ath11k_nss_mesh_vdev_register(struct ath11k_vif *arvif, ++ struct net_device *netdev) ++{ ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_base *ab = ar->ab; ++ nss_tx_status_t status; ++ u32 features = 0; ++ ++ status = nss_register_wifi_vdev_if(ar->nss.ctx, ++ arvif->nss.if_num, ++ ath11k_nss_mesh_link_vdev_data_receive, ++ ath11k_nss_mesh_link_vdev_special_data_receive, ++ ath11k_nss_vdev_event_receive, ++ (struct net_device *)netdev->ieee80211_ptr, ++ features); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "failed to register nss mesh link vdev if_num %d nss_err:%d\n", ++ arvif->nss.if_num, status); ++ nss_unregister_wifi_vdev_if(arvif->nss.if_num); ++ return -EINVAL; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "registered nss mesh link vdev if_num %d\n", ++ arvif->nss.if_num); ++ ++ return 0; ++} ++#endif ++ + static int ath11k_nss_vdev_register(struct ath11k_vif *arvif, + struct net_device *netdev) + { +@@ -1140,6 +2379,15 @@ static int ath11k_nss_vdev_register(stru + arvif->nss.if_num); + + break; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ case NL80211_IFTYPE_MESH_POINT: ++ if (!ab->nss.mesh_nss_offload_enabled) ++ return -ENOTSUPP; ++ ++ if (ath11k_nss_mesh_vdev_register(arvif, netdev)) ++ return -EINVAL; ++ break; ++#endif + default: + ath11k_warn(ab, "unsupported interface type %d for nss vdev register\n", + arvif->vif->type); +@@ -1149,6 +2397,62 @@ static int ath11k_nss_vdev_register(stru + return 0; + } + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static void ath11k_nss_mesh_vdev_free(struct ath11k_vif *arvif) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct ath11k *ar = arvif->ar; ++ struct ath11k_nss_mpath_entry *mpath_entry, *mpath_tmp; ++ struct ath11k_nss_mpp_entry *mpp_entry, *mpp_tmp; ++ struct arvif_nss *nss = &arvif->nss, *nss_entry, *nss_tmp; ++ LIST_HEAD(mpath_local_entry); ++ LIST_HEAD(mpp_local_entry); ++ nss_tx_status_t status; ++ ++ del_timer_sync(&nss->mpp_expiry_timer); ++ ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&nss->mpath_dump, &mpath_local_entry); ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(mpath_entry, mpath_tmp, &mpath_local_entry, list) { ++ list_del(&mpath_entry->list); ++ kfree(mpath_entry); ++ } ++ ++ spin_lock_bh(&ar->nss.dump_lock); ++ list_splice_tail_init(&nss->mpp_dump, &mpp_local_entry); ++ spin_unlock_bh(&ar->nss.dump_lock); ++ ++ list_for_each_entry_safe(mpp_entry, mpp_tmp, &mpp_local_entry, list) { ++ list_del(&mpp_entry->list); ++ kfree(mpp_entry); ++ } ++ ++ list_for_each_entry_safe(nss_entry, nss_tmp, &mesh_vaps, list) ++ list_del(&nss_entry->list); ++ ++ status = nss_dynamic_interface_dealloc_node( ++ arvif->nss.if_num, ++ NSS_DYNAMIC_INTERFACE_TYPE_VAP); ++ if (status != NSS_TX_SUCCESS) ++ ath11k_warn(ab, "failed to free nss mesh link vdev nss_err:%d\n", ++ status); ++ else ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "nss mesh link vdev interface deallocated\n"); ++ ++ status = (nss_tx_status_t)nss_wifi_meshmgr_if_destroy_sync(arvif->nss.mesh_handle); ++ ++ if (status != NSS_TX_SUCCESS) ++ ath11k_warn(ab, "failed to free nss mesh object vdev nss_err:%d\n", ++ status); ++ else ++ ath11k_dbg(ab, ATH11K_DBG_NSS, ++ "nss mesh object vdev interface deallocated\n"); ++} ++#endif ++ + void ath11k_nss_vdev_free(struct ath11k_vif *arvif) + { + struct ath11k_base *ab = arvif->ar->ab; +@@ -1168,6 +2472,11 @@ void ath11k_nss_vdev_free(struct ath11k_ + "nss vdev interface deallocated\n"); + + return; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ case NL80211_IFTYPE_MESH_POINT: ++ ath11k_nss_mesh_vdev_free(arvif); ++ return; ++#endif + default: + ath11k_warn(ab, "unsupported interface type %d for nss vdev dealloc\n", + arvif->vif->type); +@@ -1175,11 +2484,96 @@ void ath11k_nss_vdev_free(struct ath11k_ + } + } + +-static int ath11k_nss_vdev_alloc(struct ath11k_vif *arvif) ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++struct arvif_nss *ath11k_nss_find_arvif_by_if_num(int if_num) ++{ ++ struct arvif_nss *nss; ++ ++ list_for_each_entry(nss, &mesh_vaps, list) { ++ if (if_num == nss->if_num) ++ return nss; ++ } ++ return NULL; ++} ++ ++int ath11k_nss_assoc_link_arvif_to_ifnum(struct ath11k_vif *arvif, int if_num) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ struct ath11k_vif *arvif_link; ++ struct wireless_dev *wdev; ++ struct arvif_nss *nss; ++ int ret; ++ ++ wdev = ieee80211_vif_to_wdev_relaxed(arvif->vif); ++ if (!wdev) { ++ ath11k_warn(ab, "ath11k_nss: wdev is null\n"); ++ return -EINVAL; ++ } ++ ++ if (!wdev->netdev) { ++ ath11k_warn(ab, "ath11k_nss: netdev is null\n"); ++ return -EINVAL; ++ } ++ ++ nss = ath11k_nss_find_arvif_by_if_num(if_num); ++ if (!nss) { ++ ath11k_warn(ab, "ath11k_nss: unable to find if_num %d\n",if_num); ++ return -EINVAL; ++ } ++ ++ arvif_link = container_of(nss, struct ath11k_vif, nss); ++ ++ ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, ++ "assoc link vap ifnum %d to mesh handle of link id %d\n", ++ arvif_link->nss.if_num, arvif->nss.if_num); ++ ++ arvif_link->nss.mesh_handle = arvif->nss.mesh_handle; ++ ++ ret = ath11k_nss_mesh_obj_assoc_link_vap(arvif_link); ++ if (ret) ++ ath11k_warn(ab, "failed to associate link vap to mesh vap %d\n", ret); ++ ++ return 0; ++} ++ ++static int ath11k_nss_mesh_vdev_alloc(struct ath11k_vif *arvif, ++ struct net_device *netdev) ++{ ++ struct ath11k_base *ab = arvif->ar->ab; ++ int if_num; ++ ++ if (!ab->nss.mesh_nss_offload_enabled) ++ return -ENOTSUPP; ++ ++ if_num = nss_dynamic_interface_alloc_node(NSS_DYNAMIC_INTERFACE_TYPE_VAP); ++ if (if_num < 0) { ++ ath11k_warn(ab, "failed to allocate nss mesh link vdev\n"); ++ return -EINVAL; ++ } ++ ++ arvif->nss.if_num = if_num; ++ ++ INIT_LIST_HEAD(&arvif->nss.list); ++ list_add_tail(&arvif->nss.list, &mesh_vaps); ++ ++ INIT_LIST_HEAD(&arvif->nss.mpath_dump); ++ init_completion(&arvif->nss.dump_mpath_complete); ++ INIT_LIST_HEAD(&arvif->nss.mpp_dump); ++ init_completion(&arvif->nss.dump_mpp_complete); ++ ++ return 0; ++} ++#endif ++ ++static int ath11k_nss_vdev_alloc(struct ath11k_vif *arvif, ++ struct net_device *netdev) + { + struct ath11k_base *ab = arvif->ar->ab; + enum nss_dynamic_interface_type if_type; + int if_num; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ int ret; ++#endif + + /* Initialize completion for verifying NSS message response */ + init_completion(&arvif->nss.complete); +@@ -1201,6 +2595,16 @@ static int ath11k_nss_vdev_alloc(struct + arvif->nss.if_num); + + break; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ case NL80211_IFTYPE_MESH_POINT: ++ ret = ath11k_nss_mesh_vdev_alloc(arvif, netdev); ++ if (ret) { ++ ath11k_warn(ab, "failed to allocate nss vdev of mesh type %d\n", ++ ret); ++ return ret; ++ } ++ break; ++#endif + default: + ath11k_warn(ab, "unsupported interface type %d for nss vdev alloc\n", + arvif->vif->type); +@@ -1238,7 +2642,7 @@ int ath11k_nss_vdev_create(struct ath11k + return -EINVAL; + } + +- ret = ath11k_nss_vdev_alloc(arvif); ++ ret = ath11k_nss_vdev_alloc(arvif, wdev->netdev); + if (ret) + return ret; + +@@ -1254,6 +2658,45 @@ int ath11k_nss_vdev_create(struct ath11k + goto unregister_vdev; + + break; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ case NL80211_IFTYPE_MESH_POINT: ++ ret = ath11k_nss_mesh_alloc_register(arvif, wdev->netdev); ++ if (ret) { ++ ath11k_warn(ab, "failed to alloc and register mesh vap %d\n", ret); ++ goto unregister_vdev; ++ } ++ ++ ret = ath11k_nss_vdev_configure(arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to configure nss mesh link vdev\n"); ++ goto unregister_vdev; ++ } ++ ++ ret = ath11k_nss_mesh_obj_assoc_link_vap(arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to associate link vap to mesh vap %d\n", ret); ++ goto unregister_vdev; ++ } ++ ++ ret = ath11k_nss_vdev_set_cmd(arvif, ++ ATH11K_NSS_WIFI_VDEV_CFG_MCBC_EXC_TO_HOST_CMD, 1); ++ if (ret) { ++ ath11k_warn(ab, "failed to enable mcast/bcast exception %d\n", ret); ++ goto unregister_vdev; ++ } ++ ++ ath11k_debugfs_nss_mesh_vap_create(arvif); ++ ++ /* This timer cb is called at specified ++ * interval to update mpp exp timeout */ ++ timer_setup(&arvif->nss.mpp_expiry_timer, ++ ath11k_nss_mpp_timer_cb, 0); ++ ++ /* Start the initial timer in 2 secs */ ++ mod_timer(&arvif->nss.mpp_expiry_timer, ++ jiffies + msecs_to_jiffies(2 * HZ)); ++ break; ++#endif + default: + ret = -ENOTSUPP; + goto unregister_vdev; +@@ -1310,6 +2753,15 @@ int ath11k_nss_vdev_up(struct ath11k_vif + if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) + return 0; + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ if (arvif->vif->type == NL80211_IFTYPE_MESH_POINT) { ++ status = (nss_tx_status_t)nss_wifi_meshmgr_if_up(arvif->nss.mesh_handle); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss mesh vdev up error %d\n", status); ++ return -EINVAL; ++ } ++ } ++#endif + vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); + if (!vdev_msg) + return -ENOMEM; +@@ -1357,6 +2809,15 @@ int ath11k_nss_vdev_down(struct ath11k_v + if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) + return 0; + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ if (arvif->vif->type == NL80211_IFTYPE_MESH_POINT) { ++ status = (nss_tx_status_t)nss_wifi_meshmgr_if_down(arvif->nss.mesh_handle); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ar->ab, "nss mesh vdev up error %d\n", status); ++ return -EINVAL; ++ } ++ } ++#endif + vdev_msg = kzalloc(sizeof(struct nss_wifi_vdev_msg), GFP_ATOMIC); + if (!vdev_msg) + return -ENOMEM; +@@ -2731,6 +4192,51 @@ static int ath11k_nss_get_dynamic_interf + } + } + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static int ath11k_nss_mesh_capability(struct ath11k_base *ab) ++{ ++ struct nss_wifili_msg *wlmsg = NULL; ++ nss_wifili_msg_callback_t msg_cb; ++ nss_tx_status_t status; ++ int ret = 0; ++ ++ wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); ++ if (!wlmsg) ++ return -ENOMEM; ++ ++ msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; ++ ++ reinit_completion(&ab->nss.complete); ++ ++ nss_cmn_msg_init(&wlmsg->cm, ab->nss.if_num, ++ NSS_WIFILI_SEND_MESH_CAPABILITY_INFO, ++ sizeof(struct nss_wifili_mesh_capability_info), ++ msg_cb, NULL); ++ ++ status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); ++ if (status != NSS_TX_SUCCESS) { ++ ath11k_warn(ab, "nss failed to get mesh capability msg %d\n", status); ++ ret = -EINVAL; ++ goto free; ++ } ++ ++ ret = wait_for_completion_timeout(&ab->nss.complete, ++ msecs_to_jiffies(ATH11K_NSS_MSG_TIMEOUT_MS)); ++ if (!ret) { ++ ath11k_warn(ab, "timeout while waiting for mesh capability check\n"); ++ ret = -ETIMEDOUT; ++ goto free; ++ } ++ ++ kfree(wlmsg); ++ return 0; ++ ++free: ++ kfree(wlmsg); ++ return ret; ++} ++#endif ++ + static int ath11k_nss_init(struct ath11k_base *ab) + { + struct nss_wifili_init_msg *wim = NULL; +@@ -2863,6 +4369,17 @@ static int ath11k_nss_init(struct ath11k + + kfree(wlmsg); + ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ /* Create a mesh links read debugfs entry */ ++ ath11k_debugfs_nss_soc_create(ab); ++ ++ /* Check for mesh capability */ ++ ret = ath11k_nss_mesh_capability(ab); ++ ++ if (ret) ++ ath11k_err(ab, "Mesh offload is not enabled %d\n", ret); ++#endif ++ + ath11k_dbg(ab, ATH11K_DBG_NSS, "NSS Init Message TX Success %p %d\n", + ab->nss.ctx, ab->nss.if_num); + return 0; +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -10,8 +10,12 @@ + #ifdef CPTCFG_ATH11K_NSS_SUPPORT + #include + #include +- ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++#include ++#endif + #endif ++#include "../../../../../net/mac80211/mesh.h" ++ + struct ath11k; + struct ath11k_base; + struct ath11k_vif; +@@ -23,8 +27,9 @@ struct hal_rx_user_status; + + /* NSS DBG macro is not included as part of debug enum to avoid + * frequent changes during upgrade*/ +-#define ATH11K_DBG_NSS 0x40000000 +-#define ATH11K_DBG_NSS_WDS 0x80000000 ++#define ATH11K_DBG_NSS 0x20000000 ++#define ATH11K_DBG_NSS_WDS 0x40000000 ++#define ATH11K_DBG_NSS_MESH 0x80000000 + + /* WIFILI Supported Target Types */ + #define ATH11K_WIFILI_TARGET_TYPE_UNKNOWN 0xFF +@@ -60,6 +65,7 @@ struct hal_rx_user_status; + /* Timeout for waiting for response from NSS on TX msg */ + #define ATH11K_NSS_MSG_TIMEOUT_MS 5000 + ++#define ATH11K_MESH_DEFAULT_ELEMENT_TTL 31 + /* Init Flags */ + #define WIFILI_NSS_CCE_DISABLED 0x1 + #define WIFILI_ADDTL_MEM_SEG_SET 0x000000002 +@@ -119,6 +125,8 @@ enum ath11k_nss_opmode { + ATH11K_NSS_OPMODE_MONITOR, + }; + ++#define ATH11K_MPP_EXPIRY_TIMER_INTERVAL_MS 60 * HZ ++ + struct peer_stats { + u64 last_rx; + u64 last_ack; +@@ -158,10 +166,30 @@ struct ath11k_nss_peer { + struct completion complete; + }; + ++struct ath11k_nss_mpath_entry { ++ struct list_head list; ++ u32 num_entries; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ struct nss_wifi_mesh_path_dump_entry mpath[0]; ++#endif ++}; ++ ++struct ath11k_nss_mpp_entry { ++ struct list_head list; ++ u32 num_entries; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ struct nss_wifi_mesh_proxy_path_dump_entry mpp[0]; ++#endif ++}; ++ + /* Structure to hold the vif related info for nss offload support */ + struct arvif_nss { + /* dynamic ifnum allocated by nss driver for vif */ + int if_num; ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++ /* mesh handle for mesh obj vap */ ++ nss_wifi_mesh_handle_t mesh_handle; ++#endif + /* Used for completion status for vdev config nss messages */ + struct completion complete; + /* Keep the copy of encap type for nss */ +@@ -183,6 +211,25 @@ struct arvif_nss { + /* WDS cfg should be done only once for ext vdev */ + bool wds_cfg_done; + bool created; ++ ++ bool mpp_aging; ++ bool mpp_dump_req; ++ struct timer_list mpp_expiry_timer; ++ u8 mesh_ttl; ++ bool mesh_forward_enabled; ++ u32 metadata_type; ++ u32 mpath_refresh_time; ++ ++ struct list_head list; ++ struct list_head mpath_dump; ++ /* total number of mpath entries in all of the mpath_dump list */ ++ u32 mpath_dump_num_entries; ++ struct completion dump_mpath_complete; ++ ++ struct list_head mpp_dump; ++ /* total number of mpp entries in all of the mpp_dump list */ ++ u32 mpp_dump_num_entries; ++ struct completion dump_mpp_complete; + }; + + /* Structure to hold the pdev/radio related info for nss offload support */ +@@ -191,6 +238,8 @@ struct ath11k_nss { + int if_num; + /* Radio/pdev Context obtained on pdev register */ + void* ctx; ++ /* protects stats from nss */ ++ spinlock_t dump_lock; + }; + + /* Structure to hold the soc related info for nss offload support */ +@@ -199,6 +248,8 @@ struct ath11k_soc_nss { + bool enabled; + /* turn on/off nss stats support in ath11k */ + bool stats_enabled; ++ /* Mesh offload support as advertised by nss */ ++ bool mesh_nss_offload_enabled; + /* soc nss ctx */ + void* ctx; + /* if_num to be used for soc related nss messages */ +@@ -261,6 +312,29 @@ void ath11k_nss_update_sta_rxrate(struct + int ath11k_nss_setup(struct ath11k_base *ab); + int ath11k_nss_teardown(struct ath11k_base *ab); + void ath11k_nss_ext_rx_stats(struct ath11k_base *ab, struct htt_rx_ring_tlv_filter *tlv_filter); ++int ath11k_nss_dump_mpath_request(struct ath11k_vif *arvif); ++int ath11k_nss_dump_mpp_request(struct ath11k_vif *arvif); ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++int ath11k_nss_mesh_config_path(struct ath11k *ar, struct ath11k_vif *arvif, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path); ++#else ++static inline int ++ath11k_nss_mesh_config_path(struct ath11k *ar, struct ath11k_vif *arvif, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ return 0; ++} ++#endif ++int ath11k_nss_mesh_config_update(struct ieee80211_vif *vif, int changed); ++int ath11k_nss_assoc_link_arvif_to_ifnum(struct ath11k_vif *arvif, int if_num); ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++int ath11k_nss_mesh_exception_flags(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_exception_flag_msg *nss_msg); ++int ath11k_nss_exc_rate_config(struct ath11k_vif *arvif, ++ struct nss_wifi_mesh_rate_limit_config *nss_exc_cfg); ++#endif + #else + static inline int ath11k_nss_tx(struct ath11k_vif *arvif, struct sk_buff *skb) + { +@@ -431,5 +505,38 @@ static inline void ath11k_nss_ext_rx_sta + { + return; + } ++ ++#ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT ++static inline int ++ath11k_nss_mesh_config_path(struct ath11k *ar, struct ath11k_vif *arvif, ++ enum ieee80211_mesh_path_offld_cmd cmd, ++ struct ieee80211_mesh_path_offld *path) ++{ ++ return 0; ++} ++#endif ++static inline int ++ath11k_nss_mesh_config_update(struct ieee80211_vif *vif, int changed) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_assoc_link_arvif_to_ifnum(struct ath11k_vif *arvif, ++ int if_num) ++{ ++ return 0; ++} ++ ++static inline int ath11k_nss_mesh_exception_flags(struct ath11k_vif *arvif, ++ void *nss_msg) ++{ ++ return 0; ++} ++ ++static inline int ++ath11k_nss_exc_rate_config(struct ath11k_vif *arvif, void *nss_exc_cfg) ++{ ++ return 0; ++} + #endif /* CPTCFG_ATH11K_NSS_SUPPORT */ + #endif +--- a/drivers/net/wireless/ath/ath11k/debug.h ++++ b/drivers/net/wireless/ath/ath11k/debug.h +@@ -10,6 +10,7 @@ + #include "trace.h" + #include "debugfs.h" + ++extern struct dentry *debugfs_ath11k; + enum ath11k_debug_mask { + ATH11K_DBG_AHB = 0x00000001, + ATH11K_DBG_WMI = 0x00000002, +--- a/local-symbols ++++ b/local-symbols +@@ -171,6 +171,7 @@ ATH11K= + ATH11K_AHB= + ATH11K_PCI= + ATH11K_NSS_SUPPORT= ++ATH11K_NSS_MESH_SUPPORT= + ATH11K_MEM_PROFILE_256M= + ATH11K_MEM_PROFILE_512M= + ATH11K_DEBUG= +--- a/drivers/net/wireless/ath/ath11k/Kconfig ++++ b/drivers/net/wireless/ath/ath11k/Kconfig +@@ -23,6 +23,15 @@ config ATH11K_NSS_SUPPORT + + If unsure, say Y to enable NSS offload support. + ++config ATH11K_NSS_MESH_SUPPORT ++ bool "QCA ath11k nss mesh support" ++ depends on ATH11K_NSS_SUPPORT ++ default n ++ ---help--- ++ Enables NSS offload support for ATH11K Mesh ++ ++ If unsure, say Y to enable NSS offload support. ++ + config ATH11K_MEM_PROFILE_512M + bool "ath11k enable 512MB memory profile" + depends on ATH11K diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch b/package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch similarity index 69% rename from package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch rename to package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch index 47c6b7ec3e5ae2..6f4793b5a0afd5 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/908-301-ath11k-nss-mcbc-exception.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch @@ -16,7 +16,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -611,7 +611,7 @@ static int ath11k_nss_undecap_nwifi(stru +@@ -568,7 +568,7 @@ static int ath11k_nss_undecap_nwifi(stru static void ath11k_nss_wds_type_rx(struct ath11k *ar, struct net_device *dev, u8* src_mac, u8 is_sa_valid, u8 addr4_valid, @@ -25,7 +25,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 { struct ath11k_base *ab = ar->ab; struct ath11k_ast_entry *ast_entry = NULL; -@@ -647,8 +647,6 @@ static void ath11k_nss_wds_type_rx(struc +@@ -604,8 +604,6 @@ static void ath11k_nss_wds_type_rx(struc } } @@ -34,7 +34,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 } spin_unlock_bh(&ab->base_lock); -@@ -692,8 +690,7 @@ static void ath11k_nss_mec_handler(struc +@@ -649,8 +647,7 @@ static void ath11k_nss_mec_handler(struc static void ath11k_nss_vdev_spl_receive_ext_wdsdata(struct ath11k_vif *arvif, struct sk_buff *skb, @@ -44,7 +44,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 { struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; -@@ -715,7 +712,7 @@ static void ath11k_nss_vdev_spl_receive_ +@@ -672,7 +669,7 @@ static void ath11k_nss_vdev_spl_receive_ switch (wds_type) { case NSS_WIFI_VDEV_WDS_TYPE_RX: ath11k_nss_wds_type_rx(ar, skb->dev, src_mac, is_sa_valid, @@ -53,25 +53,21 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 break; case NSS_WIFI_VDEV_WDS_TYPE_MEC: ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); -@@ -778,14 +775,16 @@ ath11k_nss_vdev_special_data_receive(str - { - struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; - struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; -+ struct nss_wifi_vdev_addr4_data_metadata *addr4_metadata = NULL; - struct wireless_dev *wdev; +@@ -739,10 +736,12 @@ ath11k_nss_vdev_special_data_receive(str struct ieee80211_vif *vif; struct ath11k_vif *arvif; struct ath11k_base *ab; - bool drop = false; -+ struct ath11k_skb_rxcb *rxcb; bool eth_decap = false; int data_offs = 0; int ret = 0; ++ struct nss_wifi_vdev_addr4_data_metadata *addr4_metadata = NULL; ++ struct ath11k_skb_rxcb *rxcb; + struct ath11k_peer *ta_peer = NULL; - arvif = ath11k_nss_get_arvif_from_dev(dev); - if (!arvif) { -@@ -843,15 +842,50 @@ ath11k_nss_vdev_special_data_receive(str + if (!dev) { + dev_kfree_skb_any(skb); +@@ -791,15 +790,50 @@ ath11k_nss_vdev_special_data_receive(str return; } @@ -130,7 +126,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 } static void -@@ -1049,6 +1083,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 +@@ -1006,6 +1040,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 case ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD: cmd = NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD; break; @@ -140,7 +136,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 default: return -EINVAL; } -@@ -1299,12 +1336,31 @@ int ath11k_nss_vdev_create(struct ath11k +@@ -1247,12 +1284,31 @@ int ath11k_nss_vdev_create(struct ath11k goto free_vdev; switch (arvif->vif->type) { @@ -173,16 +169,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 break; default: ret = -ENOTSUPP; -@@ -1463,7 +1519,7 @@ int ath11k_nss_ext_vdev_cfg_wds_peer(str - - cfg_wds_msg = &ext_vdev_msg->msg.wmsg; - cfg_wds_msg->wds_peer_id = wds_peer_id; -- ether_addr_copy(cfg_wds_msg->mac_addr, wds_addr); -+ ether_addr_copy((u8 *) cfg_wds_msg->mac_addr, wds_addr); - - nss_wifi_ext_vdev_msg_init(ext_vdev_msg, arvif->nss.if_num, - NSS_WIFI_EXT_VDEV_MSG_CONFIGURE_WDS, -@@ -1587,7 +1643,6 @@ static int ath11k_nss_ext_vdev_register( +@@ -1526,7 +1582,6 @@ static int ath11k_nss_ext_vdev_register( { struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; @@ -190,7 +177,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 u32 features = 0; if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN || arvif->nss.ctx) -@@ -1601,7 +1656,7 @@ static int ath11k_nss_ext_vdev_register( +@@ -1540,7 +1595,7 @@ static int ath11k_nss_ext_vdev_register( if (!arvif->nss.ctx) { ath11k_warn(ab, "failed to register nss vdev if_num %d nss_err:%d\n", @@ -201,53 +188,16 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -110,10 +110,14 @@ enum ath11k_nss_vdev_cmd { +@@ -109,8 +109,12 @@ enum ath11k_nss_vdev_cmd { ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD, + ATH11K_NSS_WIFI_VDEV_CFG_MCBC_EXC_TO_HOST_CMD, }; - #define WIFILI_SCHEME_ID_INVALID -1 - +/* Enables the MCBC exception in NSS fw, 1 = enable */ +#define ATH11K_NSS_ENABLE_MCBC_EXC 1 + enum ath11k_nss_opmode { ATH11K_NSS_OPMODE_UNKNOWN, ATH11K_NSS_OPMODE_AP, ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3086,6 +3086,23 @@ static void ath11k_dp_rx_process_receive - } - } - -+void ath11k_dp_rx_from_nss(struct ath11k *ar, struct sk_buff *msdu, -+ struct napi_struct *napi) -+{ -+ struct ieee80211_rx_status rx_status = {0}; -+ struct ath11k_skb_rxcb *rxcb; -+ bool fast_rx = false; -+ -+ rxcb = ATH11K_SKB_RXCB(msdu); -+ -+ ath11k_dp_rx_h_ppdu(ar, rxcb->rx_desc, &rx_status); -+ ath11k_dp_rx_h_mpdu(ar, msdu, rxcb->rx_desc, &rx_status, &fast_rx); -+ -+ rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -+ -+ ath11k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_status); -+} -+ - int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, - struct napi_struct *napi, int budget) - { ---- a/drivers/net/wireless/ath/ath11k/dp_rx.h -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.h -@@ -157,4 +157,6 @@ bool ath11k_dp_rx_h_attn_is_mcbc(struct - struct hal_rx_desc *desc); - u16 ath11k_dp_rx_h_mpdu_start_peer_id(struct ath11k_base *ab, - struct hal_rx_desc *desc); -+void ath11k_dp_rx_from_nss(struct ath11k *ar, struct sk_buff *msdu, -+ struct napi_struct *napi); - #endif /* ATH11K_DP_RX_H */ diff --git a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch new file mode 100644 index 00000000000000..ed3cde7c8e00ec --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch @@ -0,0 +1,125 @@ +From e58249f0a5826926c0e96acea4dfbc8683cfaaab Mon Sep 17 00:00:00 2001 +From: Rameshkumar Sundaram +Date: Wed, 9 Jun 2021 17:32:30 +0530 +Subject: [PATCH] ath11k: Fix peer lookup failure in mgmt tx completion + +In mgmt tx completion handler, peer lookup is done using address 2 +of transmitted frame to find arvif and update mgmt tx completion stats. +For STA interface, self peer will not be created and hence +peer lookup with address 2 keeps failing. +Fix this by obtaining vif directly from SKB_CB for updating stats. + +Possible vif removal races: +1. If vif removed before tx completion all idrs associated to the vif +would've been flushed and finding msdu with idr will fail, +hence tx completion wont be processed therafter. +2. Added data lock to protect vif removal during tx completion processing. + +Signed-off-by: Rameshkumar Sundaram +--- + drivers/net/wireless/ath/ath11k/mac.c | 2 ++ + drivers/net/wireless/ath/ath11k/wmi.c | 53 ++++++++++++++++------------------- + 2 files changed, 26 insertions(+), 29 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -7640,8 +7640,10 @@ err_vdev_del: + kfree(arvif->vlan_keyid_map); + ath11k_peer_cleanup(ar, arvif->vdev_id); + ++ spin_lock_bh(&ar->data_lock); + idr_for_each(&ar->txmgmt_idr, + ath11k_mac_vif_txmgmt_idr_remove, vif); ++ spin_unlock_bh(&ar->data_lock); + + for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { + spin_lock_bh(&ab->dp.tx_ring[i].tx_idr_lock); +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -6125,13 +6125,13 @@ static int wmi_process_tx_comp(struct at + struct ieee80211_tx_info *info; + struct ath11k_skb_cb *skb_cb; + struct ieee80211_hdr *hdr; +- struct ath11k_peer *peer; + struct ieee80211_vif *vif; + struct ath11k_vif *arvif; + struct ath11k_mgmt_frame_stats *mgmt_stats; + u16 frm_type; + int num_mgmt; + ++ spin_lock_bh(&ar->data_lock); + spin_lock_bh(&ar->txmgmt_idr_lock); + msdu = idr_find(&ar->txmgmt_idr, tx_compl_param->desc_id); + +@@ -6139,6 +6139,7 @@ static int wmi_process_tx_comp(struct at + ath11k_warn(ar->ab, "received mgmt tx compl for invalid msdu_id: %d\n", + tx_compl_param->desc_id); + spin_unlock_bh(&ar->txmgmt_idr_lock); ++ spin_unlock_bh(&ar->data_lock); + return -ENOENT; + } + +@@ -6147,6 +6148,28 @@ static int wmi_process_tx_comp(struct at + + skb_cb = ATH11K_SKB_CB(msdu); + dma_unmap_single(ar->ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); ++ hdr = (struct ieee80211_hdr *)msdu->data; ++ ++ if (ieee80211_is_mgmt(hdr->frame_control)) { ++ frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); ++ vif = skb_cb->vif; ++ ++ if (!vif) { ++ ath11k_warn(ar->ab, "failed to find vif to update txcompl mgmt stats\n"); ++ goto skip_mgmt_stats; ++ } ++ ++ arvif = ath11k_vif_to_arvif(vif); ++ mgmt_stats = &arvif->mgmt_stats; ++ ++ if (!tx_compl_param->status) ++ mgmt_stats->tx_compl_succ[frm_type]++; ++ else ++ mgmt_stats->tx_compl_fail[frm_type]++; ++ } ++ ++skip_mgmt_stats: ++ spin_unlock_bh(&ar->data_lock); + + info = IEEE80211_SKB_CB(msdu); + if ((!(info->flags & IEEE80211_TX_CTL_NO_ACK)) && !tx_compl_param->status) +@@ -6161,34 +6184,6 @@ static int wmi_process_tx_comp(struct at + */ + info->status.rates[0].idx = -1; + +- hdr = (struct ieee80211_hdr *)msdu->data; +- frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); +- +- spin_lock_bh(&ar->ab->base_lock); +- peer = ath11k_peer_find_by_addr(ar->ab, hdr->addr2); +- if (!peer) { +- spin_unlock_bh(&ar->ab->base_lock); +- ath11k_warn(ar->ab, "failed to find peer to update txcompl mgmt stats\n"); +- goto skip_mgmt_stats; +- } +- +- vif = peer->vif; +- spin_unlock_bh(&ar->ab->base_lock); +- +- spin_lock_bh(&ar->data_lock); +- arvif = ath11k_vif_to_arvif(vif); +- mgmt_stats = &arvif->mgmt_stats; +- +- if (ieee80211_is_mgmt(hdr->frame_control)) { +- if (!tx_compl_param->status) +- mgmt_stats->tx_compl_succ[frm_type]++; +- else +- mgmt_stats->tx_compl_fail[frm_type]++; +- } +- +- spin_unlock_bh(&ar->data_lock); +- +-skip_mgmt_stats: + ieee80211_tx_status_irqsafe(ar->hw, msdu); + + num_mgmt = atomic_dec_if_positive(&ar->num_pending_mgmt_tx); diff --git a/package/kernel/mac80211/patches/ath11k_nss/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch b/package/kernel/mac80211/patches/nss/ath11k/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch rename to package/kernel/mac80211/patches/nss/ath11k/318-ath11k-avoid-stack-corrupt-in-nwifi-undecap.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch similarity index 96% rename from package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch rename to package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch index 7ea6b471e340aa..6bf1ba225e0bd5 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -1435,6 +1435,7 @@ const struct ath11k_hw_ring_mask ath11k_ +@@ -1440,6 +1440,7 @@ const struct ath11k_hw_ring_mask ath11k_ ATH11K_RX_WBM_REL_RING_MASK_0, }, .reo_status = { diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch similarity index 94% rename from package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch rename to package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch index 6ebd709e7d3298..98fb7325850498 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/908-330-ath11k-sync-wds_ast_entry-updates.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch @@ -56,7 +56,7 @@ Signed-off-by: Rameshkumar Sundaram static void ath11k_ahb_free_resources(struct ath11k_base *ab) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -2230,6 +2230,7 @@ struct ath11k_base *ath11k_core_alloc(st +@@ -2235,6 +2235,7 @@ struct ath11k_base *ath11k_core_alloc(st mutex_init(&ab->core_lock); mutex_init(&ab->tbl_mtx_lock); @@ -64,7 +64,7 @@ Signed-off-by: Rameshkumar Sundaram spin_lock_init(&ab->base_lock); mutex_init(&ab->vdev_id_11d_lock); init_completion(&ab->reset_complete); -@@ -2243,6 +2244,8 @@ struct ath11k_base *ath11k_core_alloc(st +@@ -2248,6 +2249,8 @@ struct ath11k_base *ath11k_core_alloc(st INIT_WORK(&ab->restart_work, ath11k_core_restart); INIT_WORK(&ab->update_11d_work, ath11k_update_11d); INIT_WORK(&ab->reset_work, ath11k_core_reset); @@ -75,29 +75,27 @@ Signed-off-by: Rameshkumar Sundaram init_completion(&ab->wow.wakeup_completed); --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -32,6 +32,7 @@ +@@ -31,6 +31,7 @@ + #include "wow.h" #include "rx_desc.h" #include "nss.h" - #include "vendor.h" +#include "peer.h" #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) -@@ -1131,6 +1132,11 @@ struct ath11k_base { +@@ -1080,6 +1081,9 @@ struct ath11k_base { u32 max_ast_index; u32 num_ast_entries; -+ + struct mutex base_ast_lock; + struct work_struct wmi_ast_work; + struct list_head wmi_ast_list; -+ + + bool stats_disable; /* must be last */ - u8 drv_priv[] __aligned(sizeof(void *)); - }; --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -691,8 +691,9 @@ static void ath11k_nss_wds_type_rx(struc +@@ -647,8 +647,9 @@ static void ath11k_nss_wds_type_rx(struc spin_unlock_bh(&ab->base_lock); } @@ -108,7 +106,7 @@ Signed-off-by: Rameshkumar Sundaram struct ath11k_base *ab = ar->ab; struct ath11k_peer *peer = ar->bss_peer; u8 mac_addr[ETH_ALEN]; -@@ -719,7 +720,7 @@ static void ath11k_nss_mec_handler(struc +@@ -675,7 +676,7 @@ static void ath11k_nss_mec_handler(struc memcpy(mac_addr, mac_addr_h16, ETH_ALEN - 4); memcpy(mac_addr + 2, mac_addr_l32, 4); @@ -117,7 +115,7 @@ Signed-off-by: Rameshkumar Sundaram spin_lock_bh(&ab->base_lock); ath11k_peer_add_ast(ar, peer, mac_addr, ATH11K_AST_TYPE_MEC); -@@ -754,7 +755,7 @@ static void ath11k_nss_vdev_spl_receive_ +@@ -710,7 +711,7 @@ static void ath11k_nss_vdev_spl_receive_ addr4_valid, peer_id); break; case NSS_WIFI_VDEV_WDS_TYPE_MEC: @@ -126,7 +124,7 @@ Signed-off-by: Rameshkumar Sundaram break; default: ath11k_warn(ab, "unsupported wds_type %d\n", wds_type); -@@ -3848,11 +3849,7 @@ int ath11k_nss_add_wds_peer(struct ath11 +@@ -3796,11 +3797,7 @@ int ath11k_nss_add_wds_peer(struct ath11 wds_peer_msg->ast_type = type; wds_peer_msg->peer_id = peer->peer_id; @@ -139,7 +137,7 @@ Signed-off-by: Rameshkumar Sundaram ether_addr_copy(wds_peer_msg->dest_mac, dest_mac); msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; -@@ -3975,7 +3972,7 @@ msg_free: +@@ -3923,7 +3920,7 @@ msg_free: return ret; } @@ -148,7 +146,7 @@ Signed-off-by: Rameshkumar Sundaram u8 *dest_mac) { struct ath11k_base *ab = ar->ab; -@@ -3993,8 +3990,8 @@ int ath11k_nss_del_wds_peer(struct ath11 +@@ -3941,8 +3938,8 @@ int ath11k_nss_del_wds_peer(struct ath11 wds_peer_msg->pdev_id = ar->pdev->pdev_id; wds_peer_msg->ast_type = ATH11K_AST_TYPE_NONE; @@ -161,7 +159,7 @@ Signed-off-by: Rameshkumar Sundaram msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -291,8 +291,8 @@ int ath11k_nss_update_wds_peer(struct at +@@ -288,8 +288,8 @@ int ath11k_nss_update_wds_peer(struct at u8 *dest_mac); int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, u8 *dest_mac, enum ath11k_ast_entry_type type); @@ -172,7 +170,7 @@ Signed-off-by: Rameshkumar Sundaram int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, u8 *wds_addr, u32 wds_peer_id); int ath11k_nss_ext_vdev_wds_4addr_allow(struct ath11k_vif *arvif, -@@ -404,8 +404,8 @@ static inline int ath11k_nss_map_wds_pee +@@ -409,8 +409,8 @@ static inline int ath11k_nss_map_wds_pee return 0; } @@ -494,7 +492,7 @@ Signed-off-by: Rameshkumar Sundaram if (ret) { --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -31,9 +31,7 @@ enum ath11k_wds_wmi_action { +@@ -42,9 +42,7 @@ enum ath11k_wds_wmi_action { struct ath11k_ast_entry { u16 ast_idx; u8 addr[ETH_ALEN]; @@ -504,15 +502,18 @@ Signed-off-by: Rameshkumar Sundaram struct ath11k_peer *peer; struct ath11k *ar; bool next_hop; -@@ -47,6 +45,7 @@ struct ath11k_ast_entry { - bool delete_in_progress; +@@ -55,9 +53,9 @@ struct ath11k_ast_entry { + u16 ast_hash_value; + int ref_cnt; + enum ath11k_ast_entry_type type; +- bool delete_in_progress; void *cookie; struct list_head ase_list; + struct list_head wmi_list; }; - struct ppdu_user_delayba { -@@ -97,6 +96,7 @@ struct ath11k_peer { + struct ath11k_peer { +@@ -97,6 +95,7 @@ struct ath11k_peer { bool dp_setup_done; struct ppdu_user_delayba ppdu_stats_delayba; bool delayba_flag; diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0001-ath11k-optimize-tx-completions.patch similarity index 82% rename from package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch rename to package/kernel/mac80211/patches/nss/ath11k/335-0001-ath11k-optimize-tx-completions.patch index 3cc13d1ba98543..60f3b246550641 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/911-335-0001-ath11k-optimize-tx-completions.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0001-ath11k-optimize-tx-completions.patch @@ -13,15 +13,7 @@ Signed-off-by: Venkateswara Naralasetty --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -439,6 +439,7 @@ ath11k_dp_tx_htt_tx_complete_buf(struct - return; - } - -+ - if (skb_cb->pkt_offset) - skb_pull(msdu, skb_cb->pkt_offset); /* removing the alignment and htt meta data */ - -@@ -637,9 +638,41 @@ err_out: +@@ -651,9 +651,41 @@ err_out: spin_unlock_bh(&ab->base_lock); } @@ -64,12 +56,11 @@ Signed-off-by: Venkateswara Naralasetty { struct ieee80211_tx_status status = { 0 }; struct ieee80211_rate_status status_rate = { 0 }; -@@ -649,9 +682,12 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -663,9 +695,11 @@ static void ath11k_dp_tx_complete_msdu(s struct ath11k_peer *peer; struct ath11k_sta *arsta; struct rate_info rate; + struct hal_tx_status ts = { 0 }; -+ enum hal_wbm_htt_tx_comp_status wbm_status; + enum hal_wbm_tqm_rel_reason rel_status; u8 flags = 0; @@ -78,7 +69,7 @@ Signed-off-by: Venkateswara Naralasetty /* Must not happen */ return; } -@@ -660,11 +696,14 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -674,11 +708,14 @@ static void ath11k_dp_tx_complete_msdu(s dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); @@ -95,7 +86,7 @@ Signed-off-by: Venkateswara Naralasetty } if (skb_has_frag_list(msdu)) { kfree_skb_list(skb_shinfo(msdu)->frag_list); -@@ -674,6 +713,8 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -688,6 +725,8 @@ static void ath11k_dp_tx_complete_msdu(s return; } @@ -104,15 +95,7 @@ Signed-off-by: Venkateswara Naralasetty if (unlikely(!rcu_access_pointer(ab->pdevs_active[ar->pdev_idx]))) { ieee80211_free_txskb(ar->hw, msdu); return; -@@ -684,54 +725,56 @@ static void ath11k_dp_tx_complete_msdu(s - return; - } - -+ wbm_status = FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, -+ tx_status->info0); - info = IEEE80211_SKB_CB(msdu); - memset(&info->status, 0, sizeof(info->status)); - +@@ -704,48 +743,48 @@ static void ath11k_dp_tx_complete_msdu(s /* skip tx rate update from ieee80211_status*/ info->status.rates[0].idx = -1; @@ -173,7 +156,7 @@ Signed-off-by: Venkateswara Naralasetty spin_unlock_bh(&ab->base_lock); ieee80211_free_txskb(ar->hw, msdu); return; -@@ -753,44 +796,13 @@ static void ath11k_dp_tx_complete_msdu(s +@@ -767,37 +806,6 @@ static void ath11k_dp_tx_complete_msdu(s ieee80211_tx_status_ext(ar->hw, &status); } @@ -211,15 +194,7 @@ Signed-off-by: Venkateswara Naralasetty static inline bool ath11k_dp_tx_completion_valid(struct hal_wbm_release_ring *desc) { struct htt_tx_wbm_completion *status_desc; - - if (FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, desc->info0) == - HAL_WBM_REL_SRC_MODULE_FW) { -- status_desc = ((u8 *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; -+ status_desc = ((struct htt_tx_wbm_completion *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET; - - /* Dont consider HTT_TX_COMP_STATUS_MEC_NOTIFY */ - if (FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, status_desc->info0) == -@@ -807,9 +819,9 @@ void ath11k_dp_tx_completion_handler(str +@@ -821,9 +829,9 @@ void ath11k_dp_tx_completion_handler(str int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id, count = 0, i = 0; struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id]; struct sk_buff *msdu; @@ -230,16 +205,7 @@ Signed-off-by: Venkateswara Naralasetty u32 *desc; u32 msdu_id, desc_id; u8 mac_id; -@@ -829,7 +841,7 @@ void ath11k_dp_tx_completion_handler(str - ath11k_hal_srng_dst_invalidate_entry(ab, status_ring, valid_entries); - - while ((desc = ath11k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { -- if (!ath11k_dp_tx_completion_valid(desc)) -+ if (!ath11k_dp_tx_completion_valid((struct hal_wbm_release_ring *)desc)) - continue; - - memcpy(&tx_ring->tx_status[count], -@@ -849,14 +861,16 @@ void ath11k_dp_tx_completion_handler(str +@@ -863,14 +871,16 @@ void ath11k_dp_tx_completion_handler(str while (count--) { tx_status = &tx_ring->tx_status[i++]; @@ -258,7 +224,7 @@ Signed-off-by: Venkateswara Naralasetty ath11k_dp_tx_process_htt_tx_complete(ab, (void *)tx_status, mac_id, msdu_id, -@@ -880,7 +894,7 @@ void ath11k_dp_tx_completion_handler(str +@@ -894,7 +904,7 @@ void ath11k_dp_tx_completion_handler(str if (atomic_dec_and_test(&ar->dp.num_tx_pending)) wake_up(&ar->dp.tx_empty_waitq); diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch similarity index 90% rename from package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch rename to package/kernel/mac80211/patches/nss/ath11k/335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch index 7b87edb0ae6baa..f567ec640942c9 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/911-335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0002-ath11k-use-DECLARE_BITMAP-for-idr-operations.patch @@ -18,7 +18,7 @@ Signed-off-by: Venkateswara Naralasetty --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c -@@ -380,6 +380,8 @@ static void ath11k_dp_srng_common_cleanu +@@ -376,6 +376,8 @@ static void ath11k_dp_srng_common_cleanu for (i = 0; i < DP_TCL_NUM_RING_MAX; i++) { ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_data_ring); ath11k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_comp_ring); @@ -27,7 +27,7 @@ Signed-off-by: Venkateswara Naralasetty } ath11k_dp_srng_cleanup(ab, &dp->reo_reinject_ring); ath11k_dp_srng_cleanup(ab, &dp->rx_rel_ring); -@@ -392,7 +394,7 @@ static int ath11k_dp_srng_common_setup(s +@@ -388,7 +390,7 @@ static int ath11k_dp_srng_common_setup(s { struct ath11k_dp *dp = &ab->dp; struct hal_srng *srng; @@ -36,7 +36,7 @@ Signed-off-by: Venkateswara Naralasetty u8 tcl_num, wbm_num; ret = ath11k_dp_srng_setup(ab, &dp->wbm_desc_rel_ring, -@@ -451,6 +453,18 @@ static int ath11k_dp_srng_common_setup(s +@@ -447,6 +449,18 @@ static int ath11k_dp_srng_common_setup(s ath11k_dp_shadow_init_timer(ab, &dp->tx_ring_timer[i], ATH11K_SHADOW_DP_TIMER_INTERVAL, dp->tx_ring[i].tcl_data_ring.ring_id); @@ -55,7 +55,7 @@ Signed-off-by: Venkateswara Naralasetty } ret = ath11k_dp_srng_setup(ab, &dp->reo_reinject_ring, HAL_REO_REINJECT, -@@ -1039,9 +1053,8 @@ void ath11k_dp_vdev_tx_attach(struct ath +@@ -1031,9 +1045,8 @@ void ath11k_dp_vdev_tx_attach(struct ath ath11k_dp_update_vdev_search(arvif); } @@ -66,15 +66,13 @@ Signed-off-by: Venkateswara Naralasetty struct sk_buff *msdu = skb; dma_unmap_single(ab->dev, ATH11K_SKB_CB(msdu)->paddr, msdu->len, -@@ -1056,23 +1069,30 @@ void ath11k_dp_free(struct ath11k_base * +@@ -1047,21 +1060,28 @@ static int ath11k_dp_tx_pending_cleanup( + void ath11k_dp_free(struct ath11k_base *ab) { struct ath11k_dp *dp = &ab->dp; - size_t size = 0; - int i; + int i, j; - size = sizeof(struct hal_wbm_release_ring) * DP_TX_COMP_RING_SIZE; - ath11k_dp_link_desc_cleanup(ab, dp->link_desc_banks, HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); @@ -100,9 +98,9 @@ Signed-off-by: Venkateswara Naralasetty - ath11k_dp_tx_pending_cleanup, ab); - idr_destroy(&dp->tx_ring[i].txbuf_idr); - spin_unlock_bh(&dp->tx_ring[i].tx_idr_lock); - ATH11K_MEMORY_STATS_DEC(ab, malloc_size, size); kfree(dp->tx_ring[i].tx_status); } + --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h @@ -8,6 +8,7 @@ @@ -141,12 +139,12 @@ Signed-off-by: Venkateswara Naralasetty #define DP_TCL_DATA_RING_SIZE_WCN6750 2048 #define DP_TX_COMP_RING_SIZE ATH11K_DP_TX_COMP_RING_SIZE -#define DP_TX_IDR_SIZE DP_TX_COMP_RING_SIZE - #define DP_TX_COMP_MAX_ALLOWED DP_TX_COMP_RING_SIZE + #define DP_TX_COMP_MAX_ALLOWED DP_TX_COMP_RING_SIZE #define DP_TCL_CMD_RING_SIZE 32 #define DP_TCL_STATUS_RING_SIZE 32 --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -122,6 +122,7 @@ int ath11k_dp_tx(struct ath11k *ar, stru +@@ -135,6 +135,7 @@ int ath11k_dp_tx(struct ath11k *ar, stru u8 ring_map = 0; bool tcl_ring_retry, is_diff_encap = false; u8 align_pad, htt_meta_size = 0, max_tx_ring, tcl_ring_id, ring_id; @@ -154,7 +152,7 @@ Signed-off-by: Venkateswara Naralasetty if (unlikely(!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && !ieee80211_is_data(hdr->frame_control))) -@@ -152,24 +153,28 @@ tcl_ring_sel: +@@ -164,24 +165,28 @@ tcl_ring_sel: tx_ring = &dp->tx_ring[tcl_ring_id]; spin_lock_bh(&tx_ring->tx_idr_lock); @@ -189,7 +187,7 @@ Signed-off-by: Venkateswara Naralasetty FIELD_PREP(DP_TX_DESC_ID_POOL_ID, pool_id); ti.encap_type = ath11k_dp_tx_get_encap_type(arvif, skb); -@@ -341,10 +346,9 @@ fail_unmap_dma: +@@ -355,10 +360,9 @@ fail_unmap_dma: fail_remove_idr: if (ti.pkt_offset) skb_pull(skb, ti.pkt_offset); @@ -203,7 +201,7 @@ Signed-off-by: Venkateswara Naralasetty if (tcl_ring_retry) goto tcl_ring_sel; -@@ -353,16 +357,19 @@ fail_remove_idr: +@@ -367,16 +371,19 @@ fail_remove_idr: } static void ath11k_dp_tx_free_txbuf(struct ath11k_base *ab, u8 mac_id, @@ -228,7 +226,7 @@ Signed-off-by: Venkateswara Naralasetty if (unlikely(!msdu)) { ath11k_warn(ab, "tx completion for unknown msdu_id %d\n", -@@ -386,16 +393,20 @@ ath11k_dp_tx_htt_tx_complete_buf(struct +@@ -400,16 +407,20 @@ ath11k_dp_tx_htt_tx_complete_buf(struct struct ath11k_dp_htt_wbm_tx_status *ts) { struct ieee80211_tx_status status = { 0 }; @@ -253,7 +251,7 @@ Signed-off-by: Venkateswara Naralasetty if (unlikely(!msdu)) { ath11k_warn(ab, "htt tx completion for unknown msdu_id %d\n", -@@ -860,6 +871,7 @@ void ath11k_dp_tx_completion_handler(str +@@ -870,6 +881,7 @@ void ath11k_dp_tx_completion_handler(str } while (count--) { @@ -261,7 +259,7 @@ Signed-off-by: Venkateswara Naralasetty tx_status = &tx_ring->tx_status[i++]; desc_id = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, -@@ -878,17 +890,19 @@ void ath11k_dp_tx_completion_handler(str +@@ -888,17 +900,19 @@ void ath11k_dp_tx_completion_handler(str continue; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch similarity index 81% rename from package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch rename to package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index 1bfbd0ebdbb27e..3b118c3fb5093c 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -35,18 +35,7 @@ Signed-off-by: Venkateswara Naralasetty enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type(u32 cipher) { switch (cipher) { -@@ -143,9 +130,8 @@ int ath11k_dp_tx(struct ath11k *ar, stru - !ieee80211_is_data(hdr->frame_control))) - return -ENOTSUPP; - -- pool_id = skb_get_queue_mapping(skb) & (ATH11K_HW_MAX_QUEUES - 1); -- - ring_selector = ab->hw_params.hw_ops->get_ring_selector(skb); -+ pool_id = ring_selector; - - tcl_ring_sel: - tcl_ring_retry = false; -@@ -221,10 +207,6 @@ tcl_ring_sel: +@@ -232,10 +219,6 @@ tcl_ring_sel: if (ieee80211_vif_is_mesh(arvif->vif)) ti.enable_mesh = true; @@ -62,14 +51,14 @@ Signed-off-by: Venkateswara Naralasetty @@ -65,7 +65,6 @@ void ath11k_hal_tx_cmd_desc_setup(struct FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_PKT_OFFSET, ti->pkt_offset); - tcl_cmd->info2 = ti->flags1 | + tcl_cmd.info2 = ti->flags1 | - FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TID, ti->tid) | FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_LMAC_ID, ti->lmac_id); - tcl_cmd->info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, + tcl_cmd.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9682,6 +9682,8 @@ static int __ath11k_mac_register(struct +@@ -10114,6 +10114,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, USES_RSS); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch new file mode 100644 index 00000000000000..8cd0b134bdf77e --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch @@ -0,0 +1,88 @@ +From 00d07d474f2ee3aa8aa2945fc26e473183e9201a Mon Sep 17 00:00:00 2001 +From: Anilkumar Kolli +Date: Fri, 17 Dec 2021 17:16:11 +0530 +Subject: [PATCH] ath11k: Fix updating rx stats with monitor vif enabled + +Rx stats update fails when monitor vif is enabled. +Current code does not update rx stats from monitor +status ring if monitor vif is enabled. +Add logic to update rx stats even if monitor vif enabled. + +Fixes: 1f49c59c7222 ("mac80211: Package upgrade") + +Signed-off-by: Anilkumar Kolli +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 96 ++++++---------------- + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -6197,12 +6197,23 @@ int ath11k_dp_rx_process_mon_status(stru + pmon->mon_ppdu_status = DP_PPDU_STATUS_START; + } + +- if (ppdu_info->peer_id == HAL_INVALID_PEERID || +- hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { ++ if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &ar->monitor_flags) && ++ hal_status == HAL_RX_MON_STATUS_PPDU_DONE && ++ pmon->mon_ppdu_status == DP_PPDU_STATUS_START) { ++ rx_mon_stats->status_ppdu_done++; ++ pmon->mon_ppdu_status = DP_PPDU_STATUS_DONE; ++ ++ if (!ab->hw_params.full_monitor_mode) { ++ ath11k_dp_rx_mon_dest_process(ar, mac_id, budget, napi); ++ pmon->mon_ppdu_status = DP_PPDU_STATUS_START; ++ } ++ } ++ ++ if ((ppdu_info->peer_id == HAL_INVALID_PEERID || ++ hal_status != HAL_RX_MON_STATUS_PPDU_DONE)) { + dev_kfree_skb_any(skb); + continue; + } +- + rcu_read_lock(); + spin_lock_bh(&ab->base_lock); + peer = ath11k_peer_find_by_id(ab, ppdu_info->peer_id); +@@ -6524,6 +6535,13 @@ static int ath11k_dp_full_mon_process_rx + + spin_lock_bh(&pmon->mon_lock); + ++ pmon->mon_ppdu_status = DP_PPDU_STATUS_START; ++ if (!test_bit(ATH11K_FLAG_MONITOR_STARTED, &ar->monitor_flags)) { ++ quota = ath11k_dp_rx_process_mon_status(ab, mac_id, napi, budget); ++ spin_unlock_bh(&pmon->mon_lock); ++ return quota; ++ } ++ + sw_mon_entries = &pmon->sw_mon_entries; + rx_mon_stats = &pmon->rx_mon_stats; + +@@ -6563,7 +6581,6 @@ static int ath11k_dp_full_mon_process_rx + } + + rx_mon_stats->dest_ppdu_done++; +- pmon->mon_ppdu_status = DP_PPDU_STATUS_START; + pmon->buf_state = DP_MON_STATUS_LAG; + pmon->mon_status_paddr = sw_mon_entries->mon_status_paddr; + pmon->hold_mon_dst_ring = true; +@@ -6594,16 +6611,10 @@ reap_status_ring: + int ath11k_dp_rx_process_mon_rings(struct ath11k_base *ab, int mac_id, + struct napi_struct *napi, int budget) + { +- struct ath11k *ar = ath11k_ab_to_ar(ab, mac_id); +- int ret = 0; +- +- if (test_bit(ATH11K_FLAG_MONITOR_STARTED, &ar->monitor_flags) && +- ab->hw_params.full_monitor_mode) +- ret = ath11k_dp_full_mon_process_rx(ab, mac_id, napi, budget); +- else +- ret = ath11k_dp_rx_process_mon_status(ab, mac_id, napi, budget); +- +- return ret; ++ if (ab->hw_params.full_monitor_mode) ++ return ath11k_dp_full_mon_process_rx(ab, mac_id, napi, budget); ++ else ++ return ath11k_dp_rx_process_mon_status(ab, mac_id, napi, budget); + } + + static int ath11k_dp_rx_pdev_mon_status_attach(struct ath11k *ar) diff --git a/package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch similarity index 95% rename from package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch rename to package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch index 2e874d321d0ad1..f03b4e2d7e5df6 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/336-ath11k-skip-status-ring-entry-processing.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch @@ -35,7 +35,7 @@ Signed-off-by: Venkateswara Naralasetty --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3296,6 +3296,46 @@ ath11k_dp_rx_mon_update_status_buf_state +@@ -3464,6 +3464,46 @@ ath11k_dp_rx_mon_update_status_buf_state } } @@ -82,7 +82,7 @@ Signed-off-by: Venkateswara Naralasetty static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id, int *budget, struct sk_buff_head *skb_list) { -@@ -3309,6 +3349,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3477,6 +3517,7 @@ static int ath11k_dp_rx_reap_mon_status_ struct sk_buff *skb; struct ath11k_skb_rxcb *rxcb; struct hal_tlv_hdr *tlv; @@ -90,7 +90,7 @@ Signed-off-by: Venkateswara Naralasetty u32 cookie; int buf_id, srng_id; dma_addr_t paddr; -@@ -3328,8 +3369,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3496,8 +3537,7 @@ static int ath11k_dp_rx_reap_mon_status_ ath11k_hal_srng_access_begin(ab, srng); while (*budget) { *budget -= 1; @@ -100,7 +100,7 @@ Signed-off-by: Venkateswara Naralasetty if (!rx_mon_status_desc) { pmon->buf_state = DP_MON_STATUS_REPLINISH; break; -@@ -3360,18 +3400,43 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3528,18 +3568,43 @@ static int ath11k_dp_rx_reap_mon_status_ tlv = (struct hal_tlv_hdr *)skb->data; if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_STATUS_BUFFER_DONE) { @@ -180,7 +180,7 @@ Signed-off-by: Venkateswara Naralasetty lockdep_assert_held(&srng->lock); --- a/drivers/net/wireless/ath/ath11k/hal.h +++ b/drivers/net/wireless/ath/ath11k/hal.h -@@ -953,6 +953,8 @@ int ath11k_hal_srng_dst_num_free(struct +@@ -952,6 +952,8 @@ int ath11k_hal_srng_dst_num_free(struct void ath11k_hal_srng_dst_invalidate_entry(struct ath11k_base *ab, struct hal_srng *srng, int entries); u32 *ath11k_hal_srng_src_peek(struct ath11k_base *ab, struct hal_srng *srng); diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch b/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch similarity index 97% rename from package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch rename to package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch index a1b885c8b50e5a..af64057faf823f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/913-341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch @@ -38,7 +38,7 @@ Signed-off-by: Aditya Kumar Singh --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -2010,6 +2010,11 @@ static int ath11k_core_reconfigure_on_cr +@@ -1839,6 +1839,11 @@ static int ath11k_core_reconfigure_on_cr clear_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags); diff --git a/package/kernel/mac80211/patches/ath11k_nss/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch b/package/kernel/mac80211/patches/nss/ath11k/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch rename to package/kernel/mac80211/patches/nss/ath11k/342-ath11k-provide-access-of-the-dma-buffer-back-to-dma-.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch b/package/kernel/mac80211/patches/nss/ath11k/353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch similarity index 98% rename from package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch rename to package/kernel/mac80211/patches/nss/ath11k/353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch index e8ac589acfc8ec..0e99521c4d5ff0 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/913-353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/353-ath11k-ignore-frags-from-uninitialized-peer-in-dp.patch @@ -64,7 +64,7 @@ Signed-off-by: Nagarajan Maran --- a/drivers/net/wireless/ath/ath11k/peer.h +++ b/drivers/net/wireless/ath/ath11k/peer.h -@@ -93,6 +93,7 @@ struct ath11k_peer { +@@ -92,6 +92,7 @@ struct ath11k_peer { u16 sec_type; u16 sec_type_grp; bool is_authorized; diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch similarity index 86% rename from package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch rename to package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch index 4e7e37957b1f31..e1d407e57d2e6f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/913-356-ath11k-invalid-desc-sanity-check.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch @@ -46,7 +46,18 @@ Signed-off-by: Nagarajan Maran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3228,6 +3228,16 @@ try_again: +@@ -396,8 +396,8 @@ int ath11k_dp_rxbufs_replenish(struct at + goto fail_free_skb; + + spin_lock_bh(&rx_ring->idr_lock); +- buf_id = idr_alloc(&rx_ring->bufs_idr, skb, 1, +- (rx_ring->bufs_max * 3) + 1, GFP_ATOMIC); ++ buf_id = idr_alloc(&rx_ring->bufs_idr, skb, 1, ++ (rx_ring->bufs_max * 3) + 1, GFP_ATOMIC); + spin_unlock_bh(&rx_ring->idr_lock); + if (buf_id <= 0) + goto fail_dma_unmap; +@@ -3134,6 +3134,16 @@ try_again: while (likely(desc = (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab, srng))) { @@ -63,7 +74,7 @@ Signed-off-by: Nagarajan Maran cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, desc->buf_addr_info.info1); buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, -@@ -3258,8 +3268,6 @@ try_again: +@@ -3164,8 +3174,6 @@ try_again: num_buffs_reaped[mac_id]++; diff --git a/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch b/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch similarity index 92% rename from package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch rename to package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch index 414cb06d87bd4b..3c765c9c2df46e 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/357-ath11k-fix-clear-peer-keys-during-disassoc.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch @@ -17,7 +17,7 @@ Signed-off-by: Karthikeyan Kathirvel --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4712,12 +4712,6 @@ static int ath11k_station_disassoc(struc +@@ -4882,12 +4882,6 @@ static int ath11k_station_disassoc(struc return ret; } @@ -30,7 +30,7 @@ Signed-off-by: Karthikeyan Kathirvel return 0; } -@@ -5180,6 +5174,17 @@ static int ath11k_mac_op_sta_state(struc +@@ -5478,6 +5472,17 @@ static int ath11k_mac_op_sta_state(struc arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); arsta->bw_prev = arsta->bw; spin_unlock_bh(&ar->data_lock); diff --git a/package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch rename to package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch index d8c907556645cf..ec9d831abded55 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/359-ath11k-fix-tkip-encryption-traffic-failure.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch @@ -13,7 +13,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2364,7 +2364,8 @@ static void ath11k_dp_rx_h_undecap(struc +@@ -2515,7 +2515,8 @@ static void ath11k_dp_rx_h_undecap(struc ehdr = (struct ethhdr *)msdu->data; /* mac80211 allows fast path only for authorized STA */ diff --git a/package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch b/package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch similarity index 84% rename from package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch rename to package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch index f734c5aea8d876..b4e399144ac1ae 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/908-362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch @@ -19,16 +19,7 @@ Signed-off-by: Raj Kumar Bhagat --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -805,8 +805,6 @@ ath11k_nss_vdev_special_data_receive(str - struct nss_wifi_vdev_per_packet_metadata *wifi_metadata = NULL; - struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; - struct nss_wifi_vdev_addr4_data_metadata *addr4_metadata = NULL; -- struct wireless_dev *wdev; -- struct ieee80211_vif *vif; - struct ath11k_vif *arvif; - struct ath11k_base *ab; - struct ath11k_skb_rxcb *rxcb; -@@ -2487,13 +2485,14 @@ msg_free: +@@ -2410,13 +2410,14 @@ msg_free: } int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, @@ -44,7 +35,7 @@ Signed-off-by: Raj Kumar Bhagat int ret = 0; wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); -@@ -2503,7 +2502,7 @@ int ath11k_nss_map_wds_peer(struct ath11 +@@ -2426,7 +2427,7 @@ int ath11k_nss_map_wds_peer(struct ath11 wds_peer_map_msg = &wlmsg->msg.wdspeermapmsg; wds_peer_map_msg->vdev_id = peer->vdev_id; @@ -84,7 +75,7 @@ Signed-off-by: Raj Kumar Bhagat } --- a/drivers/net/wireless/ath/ath11k/peer.c +++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -373,8 +373,7 @@ void ath11k_peer_map_ast(struct ath11k * +@@ -359,8 +359,7 @@ void ath11k_peer_map_ast(struct ath11k * if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || (ast_entry->type == ATH11K_AST_TYPE_MEC)) diff --git a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch new file mode 100644 index 00000000000000..fd4f0938cdb83b --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch @@ -0,0 +1,52 @@ +From 537a8f2292ba9052957e8284161bcee0635e4223 Mon Sep 17 00:00:00 2001 +From: Ramya Gnanasekar +Date: Tue, 11 Apr 2023 14:15:36 +0530 +Subject: [PATCH] ath11k: Fix ppdu_id from firmware PPDU stats + +ppdu_id in USR_COMPLTN_ACK_BA_STATUS TLV will have firmware meta data +last 7 bits. +When ppdu_id is taken as such, during parsing this is treated as different +ppdu_id which causes incorrect stats update. Since firmware will use +this MSB 7 bits for internal accounting and optimization, +it is recommended to use first 25 bits when fetching ppdu for USR_COMPLTN_ACK_BA_STATUS. + +Signed-off-by: Ramya Gnanasekar + +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -1501,6 +1501,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { + #define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM GENMASK(31, 25) + + #define HTT_PPDU_STATS_NON_QOS_TID 16 ++#define HTT_PPDU_STATS_PPDU_ID GENMASK(24, 0) + + struct htt_ppdu_stats_usr_cmpltn_ack_ba_status { + u32 ppdu_id; +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -1323,7 +1323,7 @@ static int ath11k_htt_tlv_ppdu_stats_par + struct htt_ppdu_user_stats *user_stats = NULL; + int cur_user; + u16 peer_id; +- u32 frame_type; ++ u32 frame_type, ppdu_id; + + ppdu_info = data; + +@@ -1404,6 +1404,8 @@ static int ath11k_htt_tlv_ppdu_stats_par + return -EINVAL; + } + ++ ppdu_id = ++ ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->ppdu_id; + peer_id = + ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->sw_peer_id; + cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, +@@ -1415,6 +1417,7 @@ static int ath11k_htt_tlv_ppdu_stats_par + user_stats->is_valid_peer_id = true; + memcpy((void *)&user_stats->ack_ba, ptr, + sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); ++ ppdu_info->ppdu_id = FIELD_GET(HTT_PPDU_STATS_PPDU_ID, ppdu_id); + user_stats->tlv_flags |= BIT(tag); + break; + case HTT_PPDU_STATS_TAG_USR_COMMON: diff --git a/package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch rename to package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch index 90f335efbca6fb..832a7d92b35a0a 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/911-373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch @@ -41,9 +41,9 @@ Signed-off-by: Tamizh Chelvam Raja --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -936,6 +936,9 @@ struct ath11k_soc_dp_stats { - u32 rxdma_error[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX]; +@@ -1176,6 +1176,9 @@ struct ath11k_soc_dp_stats { u32 reo_error[HAL_REO_DEST_RING_ERROR_CODE_MAX]; + u32 reo_error_drop[HAL_REO_DEST_RING_ERROR_CODE_MAX]; u32 hal_reo_error[DP_REO_DST_RING_MAX]; + u32 hal_reo_cmd_drain; + u32 reo_cmd_cache_error; @@ -53,7 +53,7 @@ Signed-off-by: Tamizh Chelvam Raja }; --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -851,6 +851,18 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -1416,6 +1416,18 @@ static ssize_t ath11k_debugfs_dump_soc_d "\nNSS Transmit Failures: %d\n", atomic_read(&soc_stats->tx_err.nss_tx_fail)); @@ -74,7 +74,7 @@ Signed-off-by: Tamizh Chelvam Raja if (len > size) --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c -@@ -1113,8 +1113,10 @@ int ath11k_dp_alloc(struct ath11k_base * +@@ -1185,8 +1185,10 @@ int ath11k_dp_alloc(struct ath11k_base * INIT_LIST_HEAD(&dp->reo_cmd_list); INIT_LIST_HEAD(&dp->reo_cmd_cache_flush_list); @@ -95,7 +95,7 @@ Signed-off-by: Tamizh Chelvam Raja u32 ba_win_sz; bool active; -@@ -51,6 +52,14 @@ struct dp_reo_cache_flush_elem { +@@ -53,6 +54,14 @@ struct dp_reo_cache_flush_elem { unsigned long ts; }; @@ -110,7 +110,7 @@ Signed-off-by: Tamizh Chelvam Raja struct dp_reo_cmd { struct list_head list; struct dp_rx_tid data; -@@ -296,6 +305,12 @@ struct ath11k_dp { +@@ -298,6 +307,12 @@ struct ath11k_dp { * - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; @@ -122,10 +122,10 @@ Signed-off-by: Tamizh Chelvam Raja + spinlock_t reo_cmd_update_queue_lock; struct ath11k_hp_update_timer reo_cmd_timer; struct ath11k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX]; - }; + --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -21,6 +21,9 @@ +@@ -22,6 +22,9 @@ #define ATH11K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ) @@ -135,7 +135,7 @@ Signed-off-by: Tamizh Chelvam Raja static inline u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc) { -@@ -707,13 +710,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( +@@ -729,13 +732,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( return 0; } @@ -186,7 +186,7 @@ Signed-off-by: Tamizh Chelvam Raja spin_lock_bh(&dp->reo_cmd_lock); list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { list_del(&cmd->list); -@@ -759,14 +799,18 @@ static void ath11k_dp_reo_cmd_free(struc +@@ -781,14 +821,18 @@ static void ath11k_dp_reo_cmd_free(struc } } @@ -207,7 +207,7 @@ Signed-off-by: Tamizh Chelvam Raja desc_sz = ath11k_hal_reo_qdesc_size(0, HAL_DESC_REO_NON_QOS_TID); while (tot_desc_sz > desc_sz) { -@@ -777,11 +821,17 @@ static void ath11k_dp_reo_cache_flush(st +@@ -799,11 +843,17 @@ static void ath11k_dp_reo_cache_flush(st HAL_REO_CMD_FLUSH_CACHE, &cmd, NULL); if (ret) @@ -228,7 +228,7 @@ Signed-off-by: Tamizh Chelvam Raja memset(&cmd, 0, sizeof(cmd)); cmd.addr_lo = lower_32_bits(rx_tid->paddr); cmd.addr_hi = upper_32_bits(rx_tid->paddr); -@@ -789,24 +839,21 @@ static void ath11k_dp_reo_cache_flush(st +@@ -811,24 +861,21 @@ static void ath11k_dp_reo_cache_flush(st ret = ath11k_dp_tx_send_reo_cmd(ab, rx_tid, HAL_REO_CMD_FLUSH_CACHE, &cmd, ath11k_dp_reo_cmd_free); @@ -259,7 +259,7 @@ Signed-off-by: Tamizh Chelvam Raja goto free_desc; } else if (status != HAL_REO_CMD_SUCCESS) { /* Shouldn't happen! Cleanup in case of other failure? */ -@@ -815,6 +862,29 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -837,6 +884,29 @@ static void ath11k_dp_rx_tid_del_func(st return; } @@ -289,7 +289,7 @@ Signed-off-by: Tamizh Chelvam Raja elem = kzalloc(sizeof(*elem), GFP_ATOMIC); if (!elem) goto free_desc; -@@ -832,13 +902,20 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -854,13 +924,20 @@ static void ath11k_dp_rx_tid_del_func(st if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || time_after(jiffies, elem->ts + msecs_to_jiffies(DP_REO_DESC_FREE_TIMEOUT_MS))) { @@ -314,7 +314,7 @@ Signed-off-by: Tamizh Chelvam Raja } } spin_unlock_bh(&dp->reo_cmd_lock); -@@ -854,34 +931,48 @@ free_desc: +@@ -876,34 +953,48 @@ free_desc: void ath11k_peer_rx_tid_delete(struct ath11k *ar, struct ath11k_peer *peer, u8 tid) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch b/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch new file mode 100644 index 00000000000000..144d5a9ca4d36c --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch @@ -0,0 +1,49 @@ +From c9bcb26f30a1b2e3434d851aea19200a6d757cca Mon Sep 17 00:00:00 2001 +From: Aaradhana Sahu +Date: Sat, 3 Jun 2023 18:33:54 +0530 +Subject: [PATCH] ath11k: fix VLC streaming not working for wan to wlan when + multicast to unicast flag enable + +Currently, additional two bytes after 802.11 header are seen on the air. +When per-packet encap mode is native wifi and vdev level encap mode is +eth mode, native wifi encap functionality is skipped. + +This leaves QoS header unremoved in the 802.11 header of the packet. When +sending the packet HW will also add (one more) QoS header. The additional +two bytes before LLC/SNAP header confuses the receiver and those packets +will get dropped at receiver. + +Fix this issue by removing QoS header (native wifi encap functionality) +for all the packets which will be enqueued to hw in native wifi mode. + +Signed-off-by: Aaradhana Sahu +--- + drivers/net/wireless/ath/ath11k/dp_tx.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c +index 3d8417d..5c034e6 100644 +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -347,7 +347,8 @@ tcl_ring_sel: + + switch (ti.encap_type) { + case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: +- if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) ++ if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && ++ skb->protocol == cpu_to_be16(ETH_P_PAE)) + is_diff_encap = true; + else + ath11k_dp_tx_encap_nwifi(skb); +@@ -375,7 +376,7 @@ tcl_ring_sel: + if ((!test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags) && + !(info->control.flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && + !info->control.hw_key && ieee80211_has_protected(hdr->frame_control)) || +- (skb->protocol == cpu_to_be16(ETH_P_PAE) && is_diff_encap)) { ++ is_diff_encap) { + /* HW requirement is that metadata should always point to a + * 8-byte aligned address. So we add alignment pad to start of + * buffer. HTT Metadata should be ensured to be multiple of 8-bytes +-- +2.17.1 + diff --git a/package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch b/package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch similarity index 92% rename from package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch rename to package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch index 7b3df32c05b69e..6b4433aafa4f41 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch @@ -60,9 +60,9 @@ Signed-off-by: Tamizh Chelvam Raja static void ath11k_nss_get_peer_stats(struct ath11k_base *ab, struct nss_wifili_peer_stats *stats) { struct ath11k_peer *peer; -@@ -307,6 +344,10 @@ void ath11k_nss_wifili_event_receive(str - case NSS_WIFILI_TID_REOQ_SETUP_MSG: - /* TODO setup tidq */ +@@ -333,6 +370,10 @@ void ath11k_nss_wifili_event_receive(str + ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili peer 4addr event received %d response %d error %d\n", + msg_type, response, error); break; + case NSS_WIFILI_LINK_DESC_INFO_MSG: + ath11k_nss_wifili_link_desc_return(ab, diff --git a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch new file mode 100644 index 00000000000000..2b7d9c50c0c776 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch @@ -0,0 +1,28 @@ +From dbba58c4f45aecaf2c55a1b2d3500878b86cd8ef Mon Sep 17 00:00:00 2001 +From: Yuvasree Sivasankaran +Date: Mon, 11 Dec 2023 16:02:25 +0530 +Subject: [PATCH] wifi: ath11k: Advertise TX_QUEUE mac hw flag + +To avoid tx queuing in mac80211, advertise TX_QUEUE mac hw flag +which enable tx queuing in driver and avoid performance degradation. + +Signed-off-by: Yuvasree Sivasankaran +--- + drivers/net/wireless/ath/ath11k/mac.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c +index 3e79e07..32ff5c9 100644 +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -13034,6 +13034,7 @@ static int __ath11k_mac_register(struct ath11k *ar) + ieee80211_hw_set(ar->hw, QUEUE_CONTROL); + ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); + ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); ++ ieee80211_hw_set(ar->hw, HAS_TX_QUEUE); + + if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET) { + ieee80211_hw_set(ar->hw, SUPPORTS_TX_ENCAP_OFFLOAD); +-- +2.34.1 + diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch similarity index 90% rename from package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch rename to package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch index 28b4fdf6468337..de7f697c7ccb7c 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/913-830-ath11k-Avoiding-memset-of-ppdu-info-for-next-skb.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch @@ -48,7 +48,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6210,7 +6210,9 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6292,7 +6292,9 @@ int ath11k_dp_rx_process_mon_status(stru if (!num_buffs_reaped) goto exit; @@ -59,7 +59,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; while ((skb = __skb_dequeue(&skb_list))) { -@@ -6228,7 +6230,6 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6310,7 +6312,6 @@ int ath11k_dp_rx_process_mon_status(stru if (log_type != ATH11K_PKTLOG_TYPE_INVALID) trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); @@ -67,7 +67,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb); -@@ -6244,6 +6245,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6326,6 +6327,7 @@ int ath11k_dp_rx_process_mon_status(stru if (ppdu_info->peer_id == HAL_INVALID_PEERID || hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { dev_kfree_skb_any(skb); @@ -77,11 +77,11 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/hal_rx.h +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h -@@ -220,6 +220,7 @@ struct hal_rx_mon_ppdu_info { - char rssi_chain[8][8]; +@@ -221,6 +221,7 @@ struct hal_rx_mon_ppdu_info { u32 num_users; u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; -+ bool ppdu_continuation; struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS]; ++ bool ppdu_continuation; }; + #define HAL_RX_UL_OFDMA_USER_INFO_V0_W0_VALID BIT(30) diff --git a/package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch b/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch similarity index 86% rename from package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch rename to package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch index 10c39288094b5f..04d842e96a107b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/906-456-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch @@ -18,12 +18,11 @@ Signed-off-by: Karthikeyan Periyasamy --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -209,7 +209,9 @@ tcl_ring_sel: - +@@ -217,7 +217,8 @@ tcl_ring_sel: switch (ti.encap_type) { case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: -- if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) -+ if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && + if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && +- skb->protocol == cpu_to_be16(ETH_P_PAE)) + (skb->protocol == cpu_to_be16(ETH_P_PAE) || + ieee80211_is_qos_nullfunc(hdr->frame_control))) is_diff_encap = true; diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch new file mode 100644 index 00000000000000..f5301ca9e4890f --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch @@ -0,0 +1,58 @@ +Received: from bqiang-Celadon-RN.qca.qualcomm.com (10.80.80.8) by +From: Baochen Qiang +To: +Subject: [PATCH 1/4] wifi: ath11k: remove invalid peer create logic +Date: Tue, 23 Jan 2024 10:56:57 +0800 + +In ath11k_mac_op_assign_vif_chanctx(), there is a logic to +create peer using ar->mac_addr for a STA vdev. This is invalid +because a STA vdev should have a peer created using AP's +MAC address. Besides, if we run into that logic, it means a peer +has already been created earlier, we should not create it again. +So remove it. + +This is found during code review. + +Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1 +Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 +Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 +Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 + +Signed-off-by: Baochen Qiang +Acked-by: Jeff Johnson +--- + drivers/net/wireless/ath/ath11k/mac.c | 16 ---------------- + 1 file changed, 16 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -8232,7 +8232,6 @@ ath11k_mac_op_assign_vif_chanctx(struct + struct ath11k_base *ab = ar->ab; + struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + int ret; +- struct peer_create_params param; + + mutex_lock(&ar->conf_mutex); + +@@ -8255,21 +8254,6 @@ ath11k_mac_op_assign_vif_chanctx(struct + goto out; + } + +- if (ab->hw_params.vdev_start_delay && +- arvif->vdev_type != WMI_VDEV_TYPE_AP && +- arvif->vdev_type != WMI_VDEV_TYPE_MONITOR) { +- param.vdev_id = arvif->vdev_id; +- param.peer_type = WMI_PEER_TYPE_DEFAULT; +- param.peer_addr = ar->mac_addr; +- +- ret = ath11k_peer_create(ar, arvif, NULL, ¶m); +- if (ret) { +- ath11k_warn(ab, "failed to create peer after vdev start delay: %d", +- ret); +- goto out; +- } +- } +- + if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + ret = ath11k_mac_monitor_start(ar); + if (ret) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch new file mode 100644 index 00000000000000..2490a8139d452a --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch @@ -0,0 +1,52 @@ +From: Baochen Qiang +To: +Subject: [PATCH 2/4] wifi: ath11k: rename ath11k_start_vdev_delay() +Date: Tue, 23 Jan 2024 10:56:58 +0800 + +Rename ath11k_start_vdev_delay() as ath11k_mac_start_vdev_delay() +to follow naming convention. + +Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1 +Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 +Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 +Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 + +Signed-off-by: Baochen Qiang +Acked-by: Jeff Johnson +--- + drivers/net/wireless/ath/ath11k/mac.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -261,8 +261,8 @@ static const u32 ath11k_smps_map[] = { + [WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE, + }; + +-static int ath11k_start_vdev_delay(struct ieee80211_hw *hw, +- struct ieee80211_vif *vif); ++static int ath11k_mac_start_vdev_delay(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif); + + enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) + { +@@ -5323,7 +5323,7 @@ static int ath11k_mac_station_add(struct + if (ab->hw_params.vdev_start_delay && + !arvif->is_started && + arvif->vdev_type != WMI_VDEV_TYPE_AP) { +- ret = ath11k_start_vdev_delay(ar->hw, vif); ++ ret = ath11k_mac_start_vdev_delay(ar->hw, vif); + if (ret) { + ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); + goto free_tx_stats; +@@ -8175,8 +8175,8 @@ unlock: + mutex_unlock(&ar->conf_mutex); + } + +-static int ath11k_start_vdev_delay(struct ieee80211_hw *hw, +- struct ieee80211_vif *vif) ++static int ath11k_mac_start_vdev_delay(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif) + { + struct ath11k *ar = hw->priv; + struct ath11k_base *ab = ar->ab; diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch new file mode 100644 index 00000000000000..3b6e24ae508bbe --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch @@ -0,0 +1,601 @@ +From: Baochen Qiang +To: +Subject: [PATCH 3/4] wifi: ath11k: avoid forward declaration of + ath11k_mac_start_vdev_delay() +Date: Tue, 23 Jan 2024 10:56:59 +0800 + +Currently ath11k_mac_start_vdev_delay() needs a forward declaration because +it is defined after where it is called. Avoid this by re-arranging +ath11k_mac_station_add() and ath11k_mac_op_sta_state(). + +No functional changes. Compile tested only. + +Signed-off-by: Baochen Qiang +Acked-by: Jeff Johnson +--- + drivers/net/wireless/ath/ath11k/mac.c | 459 +++++++++++++------------- + 1 file changed, 228 insertions(+), 231 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -261,9 +261,6 @@ static const u32 ath11k_smps_map[] = { + [WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE, + }; + +-static int ath11k_mac_start_vdev_delay(struct ieee80211_hw *hw, +- struct ieee80211_vif *vif); +- + enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) + { + enum nl80211_he_ru_alloc ret; +@@ -5253,100 +5250,6 @@ static void ath11k_mac_dec_num_stations( + ar->num_stations--; + } + +-static int ath11k_mac_station_add(struct ath11k *ar, +- struct ieee80211_vif *vif, +- struct ieee80211_sta *sta) +-{ +- struct ath11k_base *ab = ar->ab; +- struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); +- struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); +- struct peer_create_params peer_param; +- int ret; +- +- lockdep_assert_held(&ar->conf_mutex); +- +- ret = ath11k_mac_inc_num_stations(arvif, sta); +- if (ret) { +- ath11k_warn(ab, "refusing to associate station: too many connected already (%d)\n", +- ar->max_num_stations); +- goto exit; +- } +- +- arsta->rx_stats = kzalloc(sizeof(*arsta->rx_stats), GFP_KERNEL); +- if (!arsta->rx_stats) { +- ret = -ENOMEM; +- goto dec_num_station; +- } +- +- peer_param.vdev_id = arvif->vdev_id; +- peer_param.peer_addr = sta->addr; +- peer_param.peer_type = WMI_PEER_TYPE_DEFAULT; +- +- ret = ath11k_peer_create(ar, arvif, sta, &peer_param); +- if (ret) { +- ath11k_warn(ab, "Failed to add peer: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- goto free_rx_stats; +- } +- +- ath11k_dbg(ab, ATH11K_DBG_MAC, "Added peer: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- +- if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) { +- arsta->tx_stats = kzalloc(sizeof(*arsta->tx_stats), GFP_KERNEL); +- if (!arsta->tx_stats) { +- ret = -ENOMEM; +- goto free_peer; +- } +- } +- +- if (ieee80211_vif_is_mesh(vif)) { +- ath11k_dbg(ab, ATH11K_DBG_MAC, +- "setting USE_4ADDR for mesh STA %pM\n", sta->addr); +- ret = ath11k_wmi_set_peer_param(ar, sta->addr, +- arvif->vdev_id, +- WMI_PEER_USE_4ADDR, 1); +- if (ret) { +- ath11k_warn(ab, "failed to set mesh STA %pM 4addr capability: %d\n", +- sta->addr, ret); +- goto free_tx_stats; +- } +- } +- +- ret = ath11k_dp_peer_setup(ar, arvif->vdev_id, sta->addr); +- if (ret) { +- ath11k_warn(ab, "failed to setup dp for peer %pM on vdev %i (%d)\n", +- sta->addr, arvif->vdev_id, ret); +- goto free_tx_stats; +- } +- +- if (ab->hw_params.vdev_start_delay && +- !arvif->is_started && +- arvif->vdev_type != WMI_VDEV_TYPE_AP) { +- ret = ath11k_mac_start_vdev_delay(ar->hw, vif); +- if (ret) { +- ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); +- goto free_tx_stats; +- } +- } +- +- ewma_avg_rssi_init(&arsta->avg_rssi); +- return 0; +- +-free_tx_stats: +- kfree(arsta->tx_stats); +- arsta->tx_stats = NULL; +-free_peer: +- ath11k_peer_delete(ar, arvif->vdev_id, sta->addr); +-free_rx_stats: +- kfree(arsta->rx_stats); +- arsta->rx_stats = NULL; +-dec_num_station: +- ath11k_mac_dec_num_stations(arvif, sta); +-exit: +- return ret; +-} +- + static u32 ath11k_mac_ieee80211_sta_bw_to_wmi(struct ath11k *ar, + struct ieee80211_sta *sta) + { +@@ -5402,187 +5305,6 @@ static int ath11k_mac_cfg_dyn_vlan(struc + return ret; + } + +-static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, +- struct ieee80211_vif *vif, +- struct ieee80211_sta *sta, +- enum ieee80211_sta_state old_state, +- enum ieee80211_sta_state new_state) +-{ +- struct ath11k *ar = hw->priv; +- struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); +- struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); +- struct ath11k_peer *peer; +- int ret = 0; +- +- /* cancel must be done outside the mutex to avoid deadlock */ +- if ((old_state == IEEE80211_STA_NONE && +- new_state == IEEE80211_STA_NOTEXIST)) { +- cancel_work_sync(&arsta->update_wk); +- cancel_work_sync(&arsta->set_4addr_wk); +- } +- +- mutex_lock(&ar->conf_mutex); +- +- if (old_state == IEEE80211_STA_NOTEXIST && +- new_state == IEEE80211_STA_NONE) { +- memset(arsta, 0, sizeof(*arsta)); +- arsta->arvif = arvif; +- arsta->peer_ps_state = WMI_PEER_PS_STATE_DISABLED; +- INIT_WORK(&arsta->update_wk, ath11k_sta_rc_update_wk); +- INIT_WORK(&arsta->set_4addr_wk, ath11k_sta_set_4addr_wk); +- +- ret = ath11k_mac_station_add(ar, vif, sta); +- if (ret) +- ath11k_warn(ar->ab, "Failed to add station: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- } else if ((old_state == IEEE80211_STA_NONE && +- new_state == IEEE80211_STA_NOTEXIST)) { +- bool skip_peer_delete = ar->ab->hw_params.vdev_start_delay && +- vif->type == NL80211_IFTYPE_STATION; +- +- ath11k_dp_peer_cleanup(ar, arvif->vdev_id, sta->addr); +- +- if (!skip_peer_delete) { +- ret = ath11k_peer_delete(ar, arvif->vdev_id, sta->addr); +- if (ret) +- ath11k_warn(ar->ab, +- "Failed to delete peer: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- else +- ath11k_dbg(ar->ab, +- ATH11K_DBG_MAC, +- "Removed peer: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- } +- +- ath11k_mac_dec_num_stations(arvif, sta); +- mutex_lock(&ar->ab->tbl_mtx_lock); +- spin_lock_bh(&ar->ab->base_lock); +- peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); +- if (skip_peer_delete && peer) { +- peer->sta = NULL; +- } else if (peer && peer->sta == sta) { +- ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", +- vif->addr, arvif->vdev_id); +- ath11k_peer_rhash_delete(ar->ab, peer); +- peer->sta = NULL; +- list_del(&peer->list); +- kfree(peer); +- ar->num_peers--; +- } +- spin_unlock_bh(&ar->ab->base_lock); +- mutex_unlock(&ar->ab->tbl_mtx_lock); +- +- kfree(arsta->tx_stats); +- arsta->tx_stats = NULL; +- +- kfree(arsta->rx_stats); +- arsta->rx_stats = NULL; +- } else if (old_state == IEEE80211_STA_AUTH && +- new_state == IEEE80211_STA_ASSOC && +- (vif->type == NL80211_IFTYPE_AP || +- vif->type == NL80211_IFTYPE_MESH_POINT || +- vif->type == NL80211_IFTYPE_ADHOC)) { +- ret = ath11k_station_assoc(ar, vif, sta, false); +- if (ret) +- ath11k_warn(ar->ab, "Failed to associate station: %pM\n", +- sta->addr); +- +- spin_lock_bh(&ar->data_lock); +- /* Set arsta bw and prev bw */ +- arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); +- arsta->bw_prev = arsta->bw; +- spin_unlock_bh(&ar->data_lock); +- +- /* Driver should clear the peer keys during mac80211's ref ptr +- * gets cleared in __sta_info_destroy_part2 (trans from +- * IEEE80211_STA_AUTHORIZED to IEEE80211_STA_ASSOC) +- */ +- ret = ath11k_clear_peer_keys(arvif, sta->addr); +- if (ret) { +- ath11k_warn(ar->ab, "failed to clear all peer keys for vdev %i: %d\n", +- arvif->vdev_id, ret); +- return ret; +- } +- } else if (old_state == IEEE80211_STA_ASSOC && +- new_state == IEEE80211_STA_AUTHORIZED) { +- spin_lock_bh(&ar->ab->base_lock); +- +- peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); +- if (peer) +- peer->is_authorized = true; +- +- spin_unlock_bh(&ar->ab->base_lock); +- +- if (vif->type == NL80211_IFTYPE_STATION && arvif->is_up) { +- ret = ath11k_wmi_set_peer_param(ar, sta->addr, +- arvif->vdev_id, +- WMI_PEER_AUTHORIZE, +- 1); +- if (ret) +- ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", +- sta->addr, arvif->vdev_id, ret); +- } else if (ar->ab->nss.enabled && +- vif->type == NL80211_IFTYPE_AP_VLAN && +- !arsta->use_4addr_set) { +- +- if (ar->state == ATH11K_STATE_RESTARTED) { +- /* During ieee80211_reconfig(), at this point, nss ext vdev peer is not +- * authorized. Hence ath11k_mac_cfg_dyn_vlan() will return error. We save +- * the state vars here and use it later once nss ext vdev is authorized +- * in ath11k_mac_op_set_key() */ +- struct ath11k_dyn_vlan_cfg *ar_dyn_vlan_cfg; +- ar_dyn_vlan_cfg = kzalloc(sizeof(*ar_dyn_vlan_cfg), GFP_ATOMIC); +- +- if (!ar_dyn_vlan_cfg) { +- ath11k_warn(ar->ab, "failed to save state for dynamic AP_VLAN configuration (%d)", +- -ENOSPC); +- } else { +- INIT_LIST_HEAD(&ar_dyn_vlan_cfg->cfg_list); +- ar_dyn_vlan_cfg->arvif = arvif; +- ar_dyn_vlan_cfg->sta = sta; +- /* save it to arvif (AP_VLAN) list */ +- list_add_tail(&ar_dyn_vlan_cfg->cfg_list, &arvif->dyn_vlan_cfg); +- } +- } else { +- ret = ath11k_mac_cfg_dyn_vlan(ar->ab, arvif, sta); +- if (ret) +- ath11k_warn(ar->ab, "failed to cfg dyn vlan for peer %pM: %d\n", +- sta->addr, ret); +- } +- } +- } else if (old_state == IEEE80211_STA_AUTHORIZED && +- new_state == IEEE80211_STA_ASSOC) { +- +- spin_lock_bh(&ar->ab->base_lock); +- peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); +- if (peer) +- peer->is_authorized = false; +- spin_unlock_bh(&ar->ab->base_lock); +- } else if (old_state == IEEE80211_STA_AUTHORIZED && +- new_state == IEEE80211_STA_ASSOC) { +- spin_lock_bh(&ar->ab->base_lock); +- +- peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); +- if (peer) +- peer->is_authorized = false; +- +- spin_unlock_bh(&ar->ab->base_lock); +- } else if (old_state == IEEE80211_STA_ASSOC && +- new_state == IEEE80211_STA_AUTH && +- (vif->type == NL80211_IFTYPE_AP || +- vif->type == NL80211_IFTYPE_MESH_POINT || +- vif->type == NL80211_IFTYPE_ADHOC)) { +- ret = ath11k_station_disassoc(ar, vif, sta); +- if (ret) +- ath11k_warn(ar->ab, "Failed to disassociate station: %pM\n", +- sta->addr); +- } +- +- mutex_unlock(&ar->conf_mutex); +- return ret; +-} +- + static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta) +@@ -9735,6 +9457,281 @@ ath11k_mac_op_config_mesh_offload_path(s + } + #endif + ++static int ath11k_mac_station_add(struct ath11k *ar, ++ struct ieee80211_vif *vif, ++ struct ieee80211_sta *sta) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); ++ struct peer_create_params peer_param; ++ int ret; ++ ++ lockdep_assert_held(&ar->conf_mutex); ++ ++ ret = ath11k_mac_inc_num_stations(arvif, sta); ++ if (ret) { ++ ath11k_warn(ab, "refusing to associate station: too many connected already (%d)\n", ++ ar->max_num_stations); ++ goto exit; ++ } ++ ++ arsta->rx_stats = kzalloc(sizeof(*arsta->rx_stats), GFP_KERNEL); ++ if (!arsta->rx_stats) { ++ ret = -ENOMEM; ++ goto dec_num_station; ++ } ++ ++ peer_param.vdev_id = arvif->vdev_id; ++ peer_param.peer_addr = sta->addr; ++ peer_param.peer_type = WMI_PEER_TYPE_DEFAULT; ++ ++ ret = ath11k_peer_create(ar, arvif, sta, &peer_param); ++ if (ret) { ++ ath11k_warn(ab, "Failed to add peer: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ goto free_rx_stats; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "Added peer: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ ++ if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) { ++ arsta->tx_stats = kzalloc(sizeof(*arsta->tx_stats), GFP_KERNEL); ++ if (!arsta->tx_stats) { ++ ret = -ENOMEM; ++ goto free_peer; ++ } ++ } ++ ++ if (ieee80211_vif_is_mesh(vif)) { ++ ath11k_dbg(ab, ATH11K_DBG_MAC, ++ "setting USE_4ADDR for mesh STA %pM\n", sta->addr); ++ ret = ath11k_wmi_set_peer_param(ar, sta->addr, ++ arvif->vdev_id, ++ WMI_PEER_USE_4ADDR, 1); ++ if (ret) { ++ ath11k_warn(ab, "failed to set mesh STA %pM 4addr capability: %d\n", ++ sta->addr, ret); ++ goto free_tx_stats; ++ } ++ } ++ ++ ret = ath11k_dp_peer_setup(ar, arvif->vdev_id, sta->addr); ++ if (ret) { ++ ath11k_warn(ab, "failed to setup dp for peer %pM on vdev %i (%d)\n", ++ sta->addr, arvif->vdev_id, ret); ++ goto free_tx_stats; ++ } ++ ++ if (ab->hw_params.vdev_start_delay && ++ !arvif->is_started && ++ arvif->vdev_type != WMI_VDEV_TYPE_AP) { ++ ret = ath11k_mac_start_vdev_delay(ar->hw, vif); ++ if (ret) { ++ ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); ++ goto free_tx_stats; ++ } ++ } ++ ++ ewma_avg_rssi_init(&arsta->avg_rssi); ++ return 0; ++ ++free_tx_stats: ++ kfree(arsta->tx_stats); ++ arsta->tx_stats = NULL; ++free_peer: ++ ath11k_peer_delete(ar, arvif->vdev_id, sta->addr); ++free_rx_stats: ++ kfree(arsta->rx_stats); ++ arsta->rx_stats = NULL; ++dec_num_station: ++ ath11k_mac_dec_num_stations(arvif, sta); ++exit: ++ return ret; ++} ++ ++static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif, ++ struct ieee80211_sta *sta, ++ enum ieee80211_sta_state old_state, ++ enum ieee80211_sta_state new_state) ++{ ++ struct ath11k *ar = hw->priv; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); ++ struct ath11k_peer *peer; ++ int ret = 0; ++ ++ /* cancel must be done outside the mutex to avoid deadlock */ ++ if ((old_state == IEEE80211_STA_NONE && ++ new_state == IEEE80211_STA_NOTEXIST)) { ++ cancel_work_sync(&arsta->update_wk); ++ cancel_work_sync(&arsta->set_4addr_wk); ++ } ++ ++ mutex_lock(&ar->conf_mutex); ++ ++ if (old_state == IEEE80211_STA_NOTEXIST && ++ new_state == IEEE80211_STA_NONE) { ++ memset(arsta, 0, sizeof(*arsta)); ++ arsta->arvif = arvif; ++ arsta->peer_ps_state = WMI_PEER_PS_STATE_DISABLED; ++ INIT_WORK(&arsta->update_wk, ath11k_sta_rc_update_wk); ++ INIT_WORK(&arsta->set_4addr_wk, ath11k_sta_set_4addr_wk); ++ ++ ret = ath11k_mac_station_add(ar, vif, sta); ++ if (ret) ++ ath11k_warn(ar->ab, "Failed to add station: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ } else if ((old_state == IEEE80211_STA_NONE && ++ new_state == IEEE80211_STA_NOTEXIST)) { ++ bool skip_peer_delete = ar->ab->hw_params.vdev_start_delay && ++ vif->type == NL80211_IFTYPE_STATION; ++ ++ ath11k_dp_peer_cleanup(ar, arvif->vdev_id, sta->addr); ++ ++ if (!skip_peer_delete) { ++ ret = ath11k_peer_delete(ar, arvif->vdev_id, sta->addr); ++ if (ret) ++ ath11k_warn(ar->ab, ++ "Failed to delete peer: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ else ++ ath11k_dbg(ar->ab, ++ ATH11K_DBG_MAC, ++ "Removed peer: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ } ++ ++ ath11k_mac_dec_num_stations(arvif, sta); ++ mutex_lock(&ar->ab->tbl_mtx_lock); ++ spin_lock_bh(&ar->ab->base_lock); ++ peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); ++ if (skip_peer_delete && peer) { ++ peer->sta = NULL; ++ } else if (peer && peer->sta == sta) { ++ ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", ++ vif->addr, arvif->vdev_id); ++ ath11k_peer_rhash_delete(ar->ab, peer); ++ peer->sta = NULL; ++ list_del(&peer->list); ++ kfree(peer); ++ ar->num_peers--; ++ } ++ spin_unlock_bh(&ar->ab->base_lock); ++ mutex_unlock(&ar->ab->tbl_mtx_lock); ++ ++ kfree(arsta->tx_stats); ++ arsta->tx_stats = NULL; ++ ++ kfree(arsta->rx_stats); ++ arsta->rx_stats = NULL; ++ } else if (old_state == IEEE80211_STA_AUTH && ++ new_state == IEEE80211_STA_ASSOC && ++ (vif->type == NL80211_IFTYPE_AP || ++ vif->type == NL80211_IFTYPE_MESH_POINT || ++ vif->type == NL80211_IFTYPE_ADHOC)) { ++ ret = ath11k_station_assoc(ar, vif, sta, false); ++ if (ret) ++ ath11k_warn(ar->ab, "Failed to associate station: %pM\n", ++ sta->addr); ++ ++ spin_lock_bh(&ar->data_lock); ++ /* Set arsta bw and prev bw */ ++ arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); ++ arsta->bw_prev = arsta->bw; ++ spin_unlock_bh(&ar->data_lock); ++ ++ /* Driver should clear the peer keys during mac80211's ref ptr ++ * gets cleared in __sta_info_destroy_part2 (trans from ++ * IEEE80211_STA_AUTHORIZED to IEEE80211_STA_ASSOC) ++ */ ++ ret = ath11k_clear_peer_keys(arvif, sta->addr); ++ if (ret) { ++ ath11k_warn(ar->ab, "failed to clear all peer keys for vdev %i: %d\n", ++ arvif->vdev_id, ret); ++ return ret; ++ } ++ } else if (old_state == IEEE80211_STA_ASSOC && ++ new_state == IEEE80211_STA_AUTHORIZED) { ++ spin_lock_bh(&ar->ab->base_lock); ++ ++ peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); ++ if (peer) ++ peer->is_authorized = true; ++ ++ spin_unlock_bh(&ar->ab->base_lock); ++ ++ if (vif->type == NL80211_IFTYPE_STATION && arvif->is_up) { ++ ret = ath11k_wmi_set_peer_param(ar, sta->addr, ++ arvif->vdev_id, ++ WMI_PEER_AUTHORIZE, ++ 1); ++ if (ret) ++ ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", ++ sta->addr, arvif->vdev_id, ret); ++ } else if (ar->ab->nss.enabled && ++ vif->type == NL80211_IFTYPE_AP_VLAN && ++ !arsta->use_4addr_set) { ++ ++ if (ar->state == ATH11K_STATE_RESTARTED) { ++ /* During ieee80211_reconfig(), at this point, nss ext vdev peer is not ++ * authorized. Hence ath11k_mac_cfg_dyn_vlan() will return error. We save ++ * the state vars here and use it later once nss ext vdev is authorized ++ * in ath11k_mac_op_set_key() */ ++ struct ath11k_dyn_vlan_cfg *ar_dyn_vlan_cfg; ++ ar_dyn_vlan_cfg = kzalloc(sizeof(*ar_dyn_vlan_cfg), GFP_ATOMIC); ++ ++ if (!ar_dyn_vlan_cfg) { ++ ath11k_warn(ar->ab, "failed to save state for dynamic AP_VLAN configuration (%d)", ++ -ENOSPC); ++ } else { ++ INIT_LIST_HEAD(&ar_dyn_vlan_cfg->cfg_list); ++ ar_dyn_vlan_cfg->arvif = arvif; ++ ar_dyn_vlan_cfg->sta = sta; ++ /* save it to arvif (AP_VLAN) list */ ++ list_add_tail(&ar_dyn_vlan_cfg->cfg_list, &arvif->dyn_vlan_cfg); ++ } ++ } else { ++ ret = ath11k_mac_cfg_dyn_vlan(ar->ab, arvif, sta); ++ if (ret) ++ ath11k_warn(ar->ab, "failed to cfg dyn vlan for peer %pM: %d\n", ++ sta->addr, ret); ++ } ++ } ++ } else if (old_state == IEEE80211_STA_AUTHORIZED && ++ new_state == IEEE80211_STA_ASSOC) { ++ ++ spin_lock_bh(&ar->ab->base_lock); ++ peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); ++ if (peer) ++ peer->is_authorized = false; ++ spin_unlock_bh(&ar->ab->base_lock); ++ } else if (old_state == IEEE80211_STA_AUTHORIZED && ++ new_state == IEEE80211_STA_ASSOC) { ++ spin_lock_bh(&ar->ab->base_lock); ++ ++ peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); ++ if (peer) ++ peer->is_authorized = false; ++ ++ spin_unlock_bh(&ar->ab->base_lock); ++ } else if (old_state == IEEE80211_STA_ASSOC && ++ new_state == IEEE80211_STA_AUTH && ++ (vif->type == NL80211_IFTYPE_AP || ++ vif->type == NL80211_IFTYPE_MESH_POINT || ++ vif->type == NL80211_IFTYPE_ADHOC)) { ++ ret = ath11k_station_disassoc(ar, vif, sta); ++ if (ret) ++ ath11k_warn(ar->ab, "Failed to disassociate station: %pM\n", ++ sta->addr); ++ } ++ ++ mutex_unlock(&ar->conf_mutex); ++ return ret; ++} ++ + static const struct ieee80211_ops ath11k_ops = { + .tx = ath11k_mac_op_tx, + .wake_tx_queue = ieee80211_handle_wake_tx_queue, diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch new file mode 100644 index 00000000000000..e8e663431217c5 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch @@ -0,0 +1,257 @@ +From: Baochen Qiang +To: +Subject: [PATCH 4/4] wifi: ath11k: fix connection failure due to unexpected + peer delete +Date: Tue, 23 Jan 2024 10:57:00 +0800 + +Currently ath11k_mac_op_unassign_vif_chanctx() deletes peer but +ath11k_mac_op_assign_vif_chanctx() doesn't create it. This results in +connection failure if MAC80211 calls drv_unassign_vif_chanctx() and +drv_assign_vif_chanctx() during AUTH and ASSOC, see below log: + +[ 102.372431] wlan0: authenticated +[ 102.372585] ath11k_pci 0000:01:00.0: wlan0: disabling HT/VHT/HE as WMM/QoS is not supported by the AP +[ 102.372593] ath11k_pci 0000:01:00.0: mac chanctx unassign ptr ffff895084638598 vdev_id 0 +[ 102.372808] ath11k_pci 0000:01:00.0: WMI vdev stop id 0x0 +[ 102.383114] ath11k_pci 0000:01:00.0: vdev stopped for vdev id 0 +[ 102.384689] ath11k_pci 0000:01:00.0: WMI peer delete vdev_id 0 peer_addr 20:e5:2a:21:c4:51 +[ 102.396676] ath11k_pci 0000:01:00.0: htt peer unmap vdev 0 peer 20:e5:2a:21:c4:51 id 3 +[ 102.396711] ath11k_pci 0000:01:00.0: peer delete resp for vdev id 0 addr 20:e5:2a:21:c4:51 +[ 102.396722] ath11k_pci 0000:01:00.0: mac removed peer 20:e5:2a:21:c4:51 vdev 0 after vdev stop +[ 102.396780] ath11k_pci 0000:01:00.0: mac chanctx assign ptr ffff895084639c18 vdev_id 0 +[ 102.400628] wlan0: associate with 20:e5:2a:21:c4:51 (try 1/3) +[ 102.508864] wlan0: associate with 20:e5:2a:21:c4:51 (try 2/3) +[ 102.612815] wlan0: associate with 20:e5:2a:21:c4:51 (try 3/3) +[ 102.720846] wlan0: association with 20:e5:2a:21:c4:51 timed out + +The peer delete logic in ath11k_mac_op_unassign_vif_chanctx() is +introduced by commit b4a0f54156ac ("ath11k: move peer delete after +vdev stop of station for QCA6390 and WCN6855") to fix firmware +crash issue caused by unexpected vdev stop/peer delete sequence. + +Actually for a STA interface peer should be deleted in +ath11k_mac_op_sta_state() when STA's state changes from +IEEE80211_STA_NONE to IEEE80211_STA_NOTEXIST, which also coincides +with current peer creation design that peer is created during +IEEE80211_STA_NOTEXIST -> IEEE80211_STA_NONE transition. So move +peer delete back to ath11k_mac_op_sta_state(), also stop vdev before +deleting peer to fix the firmware crash issue mentioned there. In +this way the connection failure mentioned here is also fixed. + +Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1 +Tested-on: WCN6855 hw2.1 PCI WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 +Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 +Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1 + +Fixes: b4a0f54156ac ("ath11k: move peer delete after vdev stop of station for QCA6390 and WCN6855") +Signed-off-by: Baochen Qiang +Acked-by: Jeff Johnson +--- + drivers/net/wireless/ath/ath11k/mac.c | 139 ++++++++++++++++---------- + 1 file changed, 85 insertions(+), 54 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -7937,6 +7937,30 @@ static int ath11k_mac_start_vdev_delay(s + return 0; + } + ++static int ath11k_mac_stop_vdev_early(struct ieee80211_hw *hw, ++ struct ieee80211_vif *vif) ++{ ++ struct ath11k *ar = hw->priv; ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ int ret; ++ ++ if (WARN_ON(!arvif->is_started)) ++ return -EBUSY; ++ ++ ret = ath11k_mac_vdev_stop(arvif); ++ if (ret) { ++ ath11k_warn(ab, "failed to stop vdev %i: %d\n", ++ arvif->vdev_id, ret); ++ return ret; ++ } ++ ++ arvif->is_started = false; ++ ++ /* TODO: Setup ps and cts/rts protection */ ++ return 0; ++} ++ + static int + ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, +@@ -7981,15 +8005,17 @@ ath11k_mac_op_assign_vif_chanctx(struct + goto out; + } + +- ret = ath11k_mac_vdev_start(arvif, ctx); +- if (ret) { +- ath11k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n", +- arvif->vdev_id, vif->addr, +- ctx->def.chan->center_freq, ret); +- goto out; +- } ++ if (!arvif->is_started) { ++ ret = ath11k_mac_vdev_start(arvif, ctx); ++ if (ret) { ++ ath11k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n", ++ arvif->vdev_id, vif->addr, ++ ctx->def.chan->center_freq, ret); ++ goto out; ++ } + +- arvif->is_started = true; ++ arvif->is_started = true; ++ } + + if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && + test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &ar->monitor_flags)) { +@@ -8029,8 +8055,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc + "chanctx unassign ptr %p vdev_id %i\n", + ctx, arvif->vdev_id); + +- WARN_ON(!arvif->is_started); +- + if (ab->hw_params.vdev_start_delay && + arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + spin_lock_bh(&ab->base_lock); +@@ -8054,24 +8078,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc + return; + } + +- ret = ath11k_mac_vdev_stop(arvif); +- if (ret) +- ath11k_warn(ab, "failed to stop vdev %i: %d\n", +- arvif->vdev_id, ret); +- +- arvif->is_started = false; +- +- if (ab->hw_params.vdev_start_delay && +- arvif->vdev_type == WMI_VDEV_TYPE_STA) { +- ret = ath11k_peer_delete(ar, arvif->vdev_id, arvif->bssid); ++ if (arvif->is_started) { ++ ret = ath11k_mac_vdev_stop(arvif); + if (ret) +- ath11k_warn(ar->ab, +- "failed to delete peer %pM for vdev %d: %d\n", +- arvif->bssid, arvif->vdev_id, ret); +- else +- ath11k_dbg(ar->ab, ATH11K_DBG_MAC, +- "removed peer %pM vdev %d after vdev stop\n", +- arvif->bssid, arvif->vdev_id); ++ ath11k_warn(ab, "failed to stop vdev %i: %d\n", ++ arvif->vdev_id, ret); ++ ++ arvif->is_started = false; + } + + if (ab->hw_params.vdev_start_delay && +@@ -9551,6 +9564,46 @@ exit: + return ret; + } + ++static int ath11k_mac_station_remove(struct ath11k *ar, ++ struct ieee80211_vif *vif, ++ struct ieee80211_sta *sta) ++{ ++ struct ath11k_base *ab = ar->ab; ++ struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); ++ struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); ++ int ret; ++ ++ if (ab->hw_params.vdev_start_delay && ++ arvif->is_started && ++ arvif->vdev_type != WMI_VDEV_TYPE_AP) { ++ ret = ath11k_mac_stop_vdev_early(ar->hw, vif); ++ if (ret) { ++ ath11k_warn(ab, "failed to do early vdev stop: %d\n", ret); ++ return ret; ++ } ++ } ++ ++ ath11k_dp_peer_cleanup(ar, arvif->vdev_id, sta->addr); ++ ++ ret = ath11k_peer_delete(ar, arvif->vdev_id, sta->addr); ++ if (ret) ++ ath11k_warn(ab, "Failed to delete peer: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ else ++ ath11k_dbg(ab, ATH11K_DBG_MAC, "Removed peer: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); ++ ++ ath11k_mac_dec_num_stations(arvif, sta); ++ ++ kfree(arsta->tx_stats); ++ arsta->tx_stats = NULL; ++ ++ kfree(arsta->rx_stats); ++ arsta->rx_stats = NULL; ++ ++ return ret; ++} ++ + static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, +@@ -9586,31 +9639,15 @@ static int ath11k_mac_op_sta_state(struc + sta->addr, arvif->vdev_id); + } else if ((old_state == IEEE80211_STA_NONE && + new_state == IEEE80211_STA_NOTEXIST)) { +- bool skip_peer_delete = ar->ab->hw_params.vdev_start_delay && +- vif->type == NL80211_IFTYPE_STATION; +- +- ath11k_dp_peer_cleanup(ar, arvif->vdev_id, sta->addr); +- +- if (!skip_peer_delete) { +- ret = ath11k_peer_delete(ar, arvif->vdev_id, sta->addr); +- if (ret) +- ath11k_warn(ar->ab, +- "Failed to delete peer: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- else +- ath11k_dbg(ar->ab, +- ATH11K_DBG_MAC, +- "Removed peer: %pM for VDEV: %d\n", +- sta->addr, arvif->vdev_id); +- } ++ ret = ath11k_mac_station_remove(ar, vif, sta); ++ if (ret) ++ ath11k_warn(ar->ab, "Failed to remove station: %pM for VDEV: %d\n", ++ sta->addr, arvif->vdev_id); + +- ath11k_mac_dec_num_stations(arvif, sta); + mutex_lock(&ar->ab->tbl_mtx_lock); + spin_lock_bh(&ar->ab->base_lock); + peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); +- if (skip_peer_delete && peer) { +- peer->sta = NULL; +- } else if (peer && peer->sta == sta) { ++ if (peer && peer->sta == sta) { + ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", + vif->addr, arvif->vdev_id); + ath11k_peer_rhash_delete(ar->ab, peer); +@@ -9621,12 +9658,6 @@ static int ath11k_mac_op_sta_state(struc + } + spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); +- +- kfree(arsta->tx_stats); +- arsta->tx_stats = NULL; +- +- kfree(arsta->rx_stats); +- arsta->rx_stats = NULL; + } else if (old_state == IEEE80211_STA_AUTH && + new_state == IEEE80211_STA_ASSOC && + (vif->type == NL80211_IFTYPE_AP || +@@ -10195,6 +10226,8 @@ static int __ath11k_mac_register(struct + wiphy_ext_feature_set(ar->hw->wiphy, + NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); + ++ wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); ++ + ar->hw->queues = ATH11K_HW_MAX_QUEUES; + ar->hw->wiphy->tx_queue_len = ATH11K_QUEUE_LEN; + ar->hw->offchannel_tx_hw_queue = ATH11K_HW_MAX_QUEUES - 1; diff --git a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch new file mode 100644 index 00000000000000..3bcf93279c5a2f --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch @@ -0,0 +1,198 @@ +--- a/drivers/net/wireless/ath/ath11k/Kconfig ++++ b/drivers/net/wireless/ath/ath11k/Kconfig +@@ -80,6 +80,24 @@ config ATH11K_DEBUGFS + + If unsure, say Y to make it easier to debug problems. + ++config ATH11K_DEBUGFS_STA ++ bool "QCA ath11k debugfs STA support" ++ depends on ATH11K_DEBUGFS ++ default n ++ help ++ Enable ath11k debugfs STA support ++ ++ If unsure, say Y to make it easier to debug problems. ++ ++config ATH11K_DEBUGFS_HTT_STATS ++ bool "QCA ath11k debugfs HTT stats support" ++ depends on ATH11K_DEBUGFS ++ default n ++ help ++ Enable ath11k debugfs HTT stats support ++ ++ If unsure, say Y to make it easier to debug problems. ++ + config ATH11K_TRACING + bool "ath11k tracing support" + depends on ATH11K && EVENT_TRACING +--- a/drivers/net/wireless/ath/ath11k/Makefile ++++ b/drivers/net/wireless/ath/ath11k/Makefile +@@ -19,7 +19,9 @@ ath11k-y += core.o \ + hw.o \ + pcic.o + +-ath11k-$(CPTCFG_ATH11K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o ++ath11k-$(CPTCFG_ATH11K_DEBUGFS) += debugfs.o ++ath11k-$(CPTCFG_ATH11K_DEBUGFS_STA) += debugfs_sta.o ++ath11k-$(CPTCFG_ATH11K_DEBUGFS_HTT_STATS) += debugfs_htt_stats.o + ath11k-$(CPTCFG_NL80211_TESTMODE) += testmode.o + ath11k-$(CPTCFG_ATH11K_TRACING) += trace.o + ath11k-$(CPTCFG_ATH11K_THERMAL) += thermal.o +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -1919,7 +1919,9 @@ int ath11k_debugfs_register(struct ath11 + snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); + debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); + ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + ath11k_debugfs_htt_stats_init(ar); ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + + ath11k_debugfs_fw_stats_init(ar); + +--- a/drivers/net/wireless/ath/ath11k/debugfs_sta.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs_sta.c +@@ -11,7 +11,9 @@ + #include "debug.h" + #include "dp_tx.h" + #include "dp_rx.h" ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + #include "debugfs_htt_stats.h" ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + + static inline u32 ath11k_he_tones_in_ru_to_nl80211_he_ru_alloc(u16 ru_tones) + { +@@ -551,6 +553,7 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + static int + ath11k_dbg_sta_open_htt_peer_stats(struct inode *inode, struct file *file) + { +@@ -622,6 +625,7 @@ static const struct file_operations fops + .owner = THIS_MODULE, + .llseek = default_llseek, + }; ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + + static ssize_t ath11k_dbg_sta_write_peer_pktlog(struct file *file, + const char __user *buf, +@@ -906,6 +910,7 @@ static const struct file_operations fops + .llseek = default_llseek, + }; + ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + static ssize_t + ath11k_write_htt_peer_stats_reset(struct file *file, + const char __user *user_buf, +@@ -965,6 +970,7 @@ static const struct file_operations fops + .owner = THIS_MODULE, + .llseek = default_llseek, + }; ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + + static ssize_t ath11k_dbg_sta_read_peer_ps_state(struct file *file, + char __user *user_buf, +@@ -1111,8 +1117,10 @@ void ath11k_debugfs_sta_op_add(struct ie + &fops_reset_rx_stats); + } + ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + debugfs_create_file("htt_peer_stats", 0400, dir, sta, + &fops_htt_peer_stats); ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + + debugfs_create_file("peer_pktlog", 0644, dir, sta, + &fops_peer_pktlog); +@@ -1122,10 +1130,12 @@ void ath11k_debugfs_sta_op_add(struct ie + debugfs_create_file("addba_resp", 0200, dir, sta, &fops_addba_resp); + debugfs_create_file("delba", 0200, dir, sta, &fops_delba); + ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + if (test_bit(WMI_TLV_SERVICE_PER_PEER_HTT_STATS_RESET, + ar->ab->wmi_ab.svc_map)) + debugfs_create_file("htt_peer_stats_reset", 0600, dir, sta, + &fops_htt_peer_stats_reset); ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + + debugfs_create_file("peer_ps_state", 0400, dir, sta, + &fops_peer_ps_state); +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -1664,8 +1664,10 @@ ath11k_update_per_peer_tx_stats(struct a + peer_stats->mu_pos = mu_pos; + peer_stats->ru_tones = arsta->txrate.he_ru_alloc; + ++#ifdef CPTCFG_ATH11K_DEBUGFS_STA + if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) + ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); ++#endif + } + + usr_stats->rate_stats_updated = true; +@@ -2105,7 +2107,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s + ath11k_htt_pull_ppdu_stats(ab, skb); + break; + case HTT_T2H_MSG_TYPE_EXT_STATS_CONF: ++#ifdef CPTCFG_ATH11K_DEBUGFS_HTT_STATS + ath11k_debugfs_htt_ext_stats_handler(ab, skb); ++#endif /* CPTCFG_ATH11K_DEBUGFS_HTT_STATS */ + break; + case HTT_T2H_MSG_TYPE_PKTLOG: + ath11k_htt_pktlog(ab, skb); +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -7,7 +7,9 @@ + #include "core.h" + #include "dp_tx.h" + #include "debug.h" ++#ifdef CPTCFG_ATH11K_DEBUGFS_STA + #include "debugfs_sta.h" ++#endif + #include "hw.h" + #include "peer.h" + #include "mac.h" +@@ -551,7 +553,9 @@ static void ath11k_dp_tx_cache_peer_stat + void ath11k_dp_tx_update_txcompl(struct ath11k *ar, struct hal_tx_status *ts) + { + struct ath11k_base *ab = ar->ab; ++#ifdef CPTCFG_ATH11K_DEBUGFS_STA + struct ath11k_per_peer_tx_stats *peer_stats = &ar->cached_stats; ++#endif + enum hal_tx_rate_stats_pkt_type pkt_type; + enum hal_tx_rate_stats_sgi sgi; + enum hal_tx_rate_stats_bw bw; +@@ -640,8 +644,10 @@ void ath11k_dp_tx_update_txcompl(struct + ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones); + } + ++#ifdef CPTCFG_ATH11K_DEBUGFS_STA + if (ath11k_debugfs_is_extd_tx_stats_enabled(ar)) + ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); ++#endif + + err_out: + spin_unlock_bh(&ab->base_lock); +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -9869,7 +9869,7 @@ static const struct ieee80211_ops ath11k + .set_wakeup = ath11k_wow_op_set_wakeup, + #endif + +-#ifdef CPTCFG_ATH11K_DEBUGFS ++#ifdef CPTCFG_ATH11K_DEBUGFS_STA + .sta_add_debugfs = ath11k_debugfs_sta_op_add, + #endif + +--- a/local-symbols ++++ b/local-symbols +@@ -176,6 +176,8 @@ ATH11K_MEM_PROFILE_256M= + ATH11K_MEM_PROFILE_512M= + ATH11K_DEBUG= + ATH11K_DEBUGFS= ++ATH11K_DEBUGFS_STA= ++ATH11K_DEBUGFS_HTT_STATS= + ATH11K_TRACING= + ATH11K_SPECTRAL= + ATH11K_THERMAL= diff --git a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch b/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch similarity index 62% rename from package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch rename to package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch index 12feacda8555f7..3b9f555b3bce51 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/900-fix-build.patch +++ b/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch @@ -1,62 +1,6 @@ ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2305,6 +2305,7 @@ static void ath11k_dp_rx_h_undecap_snap( - struct ieee80211_hdr *hdr; - size_t hdr_len; - u8 l3_pad_bytes; -+ int expand_by; - struct hal_rx_desc *rx_desc; - struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); - -@@ -2329,12 +2330,22 @@ static void ath11k_dp_rx_h_undecap_snap( - hdr_len = ieee80211_hdrlen(hdr->frame_control); - - if (!(status->flag & RX_FLAG_IV_STRIPPED)) { -- memcpy(skb_push(msdu, -- ath11k_dp_rx_crypto_param_len(ar, enctype)), -- (void *)hdr + hdr_len, -- ath11k_dp_rx_crypto_param_len(ar, enctype)); -+ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); -+ -+ if (skb_headroom(msdu) < crypto_param_len) { -+ expand_by = crypto_param_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } -+ memcpy(skb_push(msdu, crypto_param_len), -+ (void *)hdr + hdr_len, crypto_param_len); - } - -+ if (skb_headroom(msdu) < hdr_len) { -+ expand_by = hdr_len - skb_headroom(msdu); -+ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) -+ return; -+ } - memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); - } - -@@ -2464,7 +2475,7 @@ static void ath11k_dp_rx_h_mpdu(struct a - struct ieee80211_rx_status *rx_status, - bool *fast_rx) - { -- bool fill_crypto_hdr; -+ bool fill_crypto_hdr = 0; - enum hal_encrypt_type enctype; - bool is_decrypted = false; - struct ath11k_skb_rxcb *rxcb; -@@ -2479,7 +2490,8 @@ static void ath11k_dp_rx_h_mpdu(struct a - - /* PN for multicast packets will be checked in mac80211 */ - rxcb = ATH11K_SKB_RXCB(msdu); -- fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); -+ if (!ar->ab->nss.enabled) -+ fill_crypto_hdr = ath11k_dp_rx_h_attn_is_mcbc(ar->ab, rx_desc); - rxcb->is_mcbc = fill_crypto_hdr; - - if (rxcb->is_mcbc) { --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -9228,7 +9228,7 @@ void cfg80211_bss_flush(struct wiphy *wi +@@ -9224,7 +9224,7 @@ void cfg80211_bss_flush(struct wiphy *wi * @count: the number of TBTTs until the color change happens * @color_bitmap: representations of the colors that the local BSS is aware of */ @@ -65,7 +9,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap); -@@ -9238,9 +9238,9 @@ int cfg80211_bss_color_notify(struct net +@@ -9234,9 +9234,9 @@ int cfg80211_bss_color_notify(struct net * @color_bitmap: representations of the colors that the local BSS is aware of */ static inline int cfg80211_obss_color_collision_notify(struct net_device *dev, @@ -77,7 +21,7 @@ 0, color_bitmap); } -@@ -9254,7 +9254,7 @@ static inline int cfg80211_obss_color_co +@@ -9250,7 +9250,7 @@ static inline int cfg80211_obss_color_co static inline int cfg80211_color_change_started_notify(struct net_device *dev, u8 count) { @@ -86,7 +30,7 @@ count, 0); } -@@ -9266,7 +9266,7 @@ static inline int cfg80211_color_change_ +@@ -9262,7 +9262,7 @@ static inline int cfg80211_color_change_ */ static inline int cfg80211_color_change_aborted_notify(struct net_device *dev) { @@ -95,7 +39,7 @@ 0, 0); } -@@ -9278,7 +9278,7 @@ static inline int cfg80211_color_change_ +@@ -9274,7 +9274,7 @@ static inline int cfg80211_color_change_ */ static inline int cfg80211_color_change_notify(struct net_device *dev) { @@ -106,7 +50,7 @@ } --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -4777,7 +4777,7 @@ void ieee80211_color_collision_detection +@@ -4771,7 +4771,7 @@ void ieee80211_color_collision_detection struct ieee80211_sub_if_data *sdata = link->sdata; sdata_lock(sdata); @@ -149,7 +93,7 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -19414,7 +19414,7 @@ void cfg80211_ch_switch_started_notify(s +@@ -19406,7 +19406,7 @@ void cfg80211_ch_switch_started_notify(s } EXPORT_SYMBOL(cfg80211_ch_switch_started_notify); @@ -158,7 +102,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap) { -@@ -19428,7 +19428,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19420,7 +19420,7 @@ int cfg80211_bss_color_notify(struct net trace_cfg80211_bss_color_notify(dev, cmd, count, color_bitmap); @@ -167,7 +111,7 @@ if (!msg) return -ENOMEM; -@@ -19451,7 +19451,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19443,7 +19443,7 @@ int cfg80211_bss_color_notify(struct net genlmsg_end(msg, hdr); return genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), diff --git a/package/kernel/mac80211/patches/ath11k_nss/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch b/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch rename to package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch similarity index 99% rename from package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch rename to package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch index a06ef7652df538..1c508dc8884c96 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/199-001-mac80211-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch @@ -123,7 +123,7 @@ Signed-off-by: Sriram R - + void (*nss_bss_info_changed)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, -+ u64 changed); ++ u32 changed); int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *link_conf); void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, @@ -225,7 +225,7 @@ Signed-off-by: Sriram R return -EINVAL; --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -2380,6 +2380,9 @@ sta_get_last_rx_stats(struct sta_info *s +@@ -2368,6 +2368,9 @@ sta_get_last_rx_stats(struct sta_info *s struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; int cpu; diff --git a/package/kernel/mac80211/patches/ath11k_nss/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch b/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch rename to package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch diff --git a/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch b/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch new file mode 100644 index 00000000000000..db6550ab79c2cc --- /dev/null +++ b/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch @@ -0,0 +1,203 @@ +From ed838800bb8f4c59b320395066ac356f74528a50 Mon Sep 17 00:00:00 2001 +From: Muna Sinada +Date: Wed, 29 Jul 2020 00:11:30 -0700 +Subject: [PATCH] 203-mac80211-ath11k-fw-dynamic-muedca.patch + +mac80211/ath11k:FW Initiated Dynamic MU-EDCA + +Implementing the updating of firmware initiated dynamic MU-EDCA +parameters in Beacon IE. Firmware routinely checks its clients and +updates its MU-EDCA values every 3 seconds. Firmware is tuning +MU-EDCA parameters to improve performance. As part of this process, +the firmware informs host about new MU-EDCA values utilizing +WMI_MUEDCA_PARAMS_CONFIG_EVENTID. FW expectation is that host will +update MU-EDCA parameters in the Beacon IE. +Implementation consists of: + (1) Receiving updated parameters through event in ATH11k + (2) Passing updated parameters ATH11k -> mac80211 -> cfg80211 + (3) Passing updated parameters to user space. + +Signed-off-by: Muna Sinada +--- + drivers/net/wireless/ath/ath11k/wmi.c | 97 +++++++++++++++++++++++++++++++---- + drivers/net/wireless/ath/ath11k/wmi.h | 12 +++++ + include/net/cfg80211.h | 11 ++++ + include/net/mac80211.h | 13 +++++ + include/uapi/linux/nl80211.h | 10 ++++ + net/mac80211/mlme.c | 12 +++++ + net/mac80211/trace.h | 20 ++++++++ + net/wireless/nl80211.c | 36 +++++++++++++ + 8 files changed, 200 insertions(+), 11 deletions(-) + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -9229,4 +9229,15 @@ bool cfg80211_valid_disable_subchannel_b + */ + void cfg80211_links_removed(struct net_device *dev, u16 link_mask); + ++/** ++ * cfg80211_update_muedca_params_event - Notify the updated MU-EDCA parameters ++ * to user space. ++ * @wiphy: the wiphy ++ * @params: Updated MU-EDCA parameters ++ * @gfp: allocation flags ++ */ ++void cfg80211_update_muedca_params_event(struct wiphy *wiphy, ++ struct ieee80211_mu_edca_param_set ++ *params, gfp_t gfp); ++ + #endif /* __NET_CFG80211_H */ +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -7353,6 +7353,20 @@ u32 ieee80211_calc_rx_airtime(struct iee + int len); + + /** ++ * ieee80211_update_muedca_params - update MU-EDCA parameters. ++ * ++ * This function is used to pass dynamically updated MU-EDCA parameters from ++ * driver to user space in order for parameters to be updated in beacon. ++ * ++ * @hw: pointer as obtained from ieee80211_alloc_hw() ++ * @params: updated MU-EDCA paramters ++ * @gfp: allocation flags ++ */ ++void ieee80211_update_muedca_params(struct ieee80211_hw *hw, ++ struct ieee80211_mu_edca_param_set ++ *params, gfp_t gfp); ++ ++/** + * ieee80211_calc_tx_airtime - calculate estimated transmission airtime for TX. + * + * This function calculates the estimated airtime usage of a frame based on the +--- a/include/uapi/linux/nl80211.h ++++ b/include/uapi/linux/nl80211.h +@@ -1314,6 +1314,10 @@ + * Multi-Link reconfiguration. %NL80211_ATTR_MLO_LINKS is used to provide + * information about the removed STA MLD setup links. + * ++ * @NL80211_CMD_UPDATE_HE_MUEDCA_PARAMS: Updated MU-EDCA parameters from driver. ++ * This event is used to update dynamic MU-EDCA parameters in Beacon frame, ++ * coming from driver and now need to be reflected in Beacon frame. ++ * + * @NL80211_CMD_MAX: highest used command number + * @__NL80211_CMD_AFTER_LAST: internal use + */ +@@ -1569,6 +1573,7 @@ enum nl80211_commands { + + NL80211_CMD_LINKS_REMOVED, + ++ NL80211_CMD_UPDATE_HE_MUEDCA_PARAMS, + /* add new commands above here */ + + /* used to define NL80211_CMD_MAX below */ +@@ -2818,6 +2823,8 @@ enum nl80211_commands { + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce + * transmit power to stay within regulatory limits. u32, dBi. + * ++ * @NL80211_ATTR_HE_MUEDCA_PARAMS: MU-EDCA AC parameters for the ++ * %NL80211_CMD_UPDATE_HE_MUEDCA_PARAMS command. + * @NUM_NL80211_ATTR: total number of nl80211_attrs available + * @NL80211_ATTR_MAX: highest attribute number currently defined + * @__NL80211_ATTR_AFTER_LAST: internal use +@@ -3358,6 +3365,8 @@ enum nl80211_attrs { + + NL80211_ATTR_WIPHY_ANTENNA_GAIN, + ++ NL80211_ATTR_HE_MUEDCA_PARAMS, ++ + /* add attributes here, update the policy in nl80211.c */ + + __NL80211_ATTR_AFTER_LAST, +--- a/net/mac80211/mlme.c ++++ b/net/mac80211/mlme.c +@@ -7910,3 +7910,15 @@ void ieee80211_disable_rssi_reports(stru + _ieee80211_enable_rssi_reports(sdata, 0, 0); + } + EXPORT_SYMBOL(ieee80211_disable_rssi_reports); ++ ++void ieee80211_update_muedca_params(struct ieee80211_hw *hw, ++ struct ieee80211_mu_edca_param_set ++ *params, gfp_t gfp) ++{ ++ struct ieee80211_local *local = hw_to_local(hw); ++ ++ trace_api_update_muedca_params(local, params); ++ ++ cfg80211_update_muedca_params_event(local->hw.wiphy, params, gfp); ++} ++EXPORT_SYMBOL(ieee80211_update_muedca_params); +--- a/net/mac80211/trace.h ++++ b/net/mac80211/trace.h +@@ -3085,6 +3085,26 @@ TRACE_EVENT(stop_queue, + ) + ); + ++TRACE_EVENT(api_update_muedca_params, ++ TP_PROTO(struct ieee80211_local *local, ++ struct ieee80211_mu_edca_param_set *params), ++ ++ TP_ARGS(local, params), ++ ++ TP_STRUCT__entry( ++ LOCAL_ENTRY ++ ), ++ ++ TP_fast_assign( ++ LOCAL_ASSIGN; ++ ), ++ ++ TP_printk( ++ LOCAL_PR_FMT " updated MU-EDCA parameters", ++ LOCAL_PR_ARG ++ ) ++); ++ + #endif /* !__MAC80211_DRIVER_TRACE || TRACE_HEADER_MULTI_READ */ + + #undef TRACE_INCLUDE_PATH +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -20170,6 +20170,42 @@ nla_put_failure: + } + EXPORT_SYMBOL(cfg80211_update_owe_info_event); + ++void cfg80211_update_muedca_params_event(struct wiphy *wiphy, ++ struct ieee80211_mu_edca_param_set ++ *params, gfp_t gfp) ++{ ++ struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); ++ struct sk_buff *msg; ++ void *hdr; ++ ++ msg = nlmsg_new(NLMSG_DEFAULT_SIZE, gfp); ++ if (!msg) ++ return; ++ ++ hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_UPDATE_HE_MUEDCA_PARAMS); ++ if (!hdr) ++ goto nla_put_failure; ++ ++ if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx)) ++ goto nla_put_failure; ++ ++ if (nla_put(msg, NL80211_ATTR_HE_MUEDCA_PARAMS, ++ sizeof(struct ieee80211_mu_edca_param_set), ++ (const void *)params)) ++ goto nla_put_failure; ++ ++ genlmsg_end(msg, hdr); ++ ++ genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0, ++ NL80211_MCGRP_MLME, gfp); ++ return; ++ ++nla_put_failure: ++ genlmsg_cancel(msg, hdr); ++ nlmsg_free(msg); ++} ++EXPORT_SYMBOL(cfg80211_update_muedca_params_event); ++ + /* initialisation/exit functions */ + + int __init nl80211_init(void) diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-mac80211-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/207-mac80211-Add-support-for-dynamic-vlan.patch rename to package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/207-mac80211-add-nss-redirect-support.patch b/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/207-mac80211-add-nss-redirect-support.patch rename to package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch b/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch similarity index 86% rename from package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch rename to package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch index 7dc88faed71f9f..cf3784afa29b2a 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-000-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch +++ b/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch @@ -21,7 +21,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -5102,6 +5102,17 @@ void ieee80211_sta_pspoll(struct ieee802 +@@ -5095,6 +5095,17 @@ void ieee80211_sta_pspoll(struct ieee802 */ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); @@ -41,7 +41,7 @@ Signed-off-by: Sathishkumar Muruganandam * This is enough for the radiotap header. --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2177,7 +2177,13 @@ static int ieee80211_change_station(stru +@@ -2176,7 +2176,13 @@ static int ieee80211_change_station(stru rcu_assign_pointer(vlansdata->u.vlan.sta, sta); __ieee80211_check_fast_rx_iface(vlansdata); @@ -122,7 +122,7 @@ Signed-off-by: Sathishkumar Muruganandam netif_carrier_off(dev); --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -1759,6 +1759,12 @@ void ieee80211_sta_uapsd_trigger(struct +@@ -1656,6 +1656,12 @@ void ieee80211_sta_uapsd_trigger(struct } EXPORT_SYMBOL(ieee80211_sta_uapsd_trigger); @@ -137,8 +137,24 @@ Signed-off-by: Sathishkumar Muruganandam { --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4725,7 +4725,8 @@ static void ieee80211_8023_xmit(struct i - info->flags |= info_flags; +@@ -4298,8 +4298,13 @@ void __ieee80211_subif_start_xmit(struct + atomic_inc(&sta->tx_netif_pkts); + + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { +- ap_sdata = container_of(sdata->bss, +- struct ieee80211_sub_if_data, u.ap); ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) ++ ap_sdata = container_of(sdata->bss, ++ struct ieee80211_sub_if_data, ++ u.ap); ++ else ++ ap_sdata = sdata; ++ + if (ap_sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED && + !is_multicast_ether_addr(skb->data)) { + if (sta) +@@ -4692,7 +4692,8 @@ static void ieee80211_8023_xmit(struct i + info->hw_queue = sdata->vif.hw_queue[queue]; - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) @@ -181,7 +197,7 @@ Signed-off-by: Sathishkumar Muruganandam drv_remove_interface(local, sdata); --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -5235,7 +5235,8 @@ static bool ieee80211_assoc_success(stru +@@ -5218,7 +5218,8 @@ static bool ieee80211_assoc_success(stru * If we're using 4-addr mode, let the AP know that we're * doing so, so that it can create the STA VLAN on its side */ diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch b/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch similarity index 78% rename from package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch rename to package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch index 33eb5d2001db91..453f516497a5b5 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/902-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch @@ -24,7 +24,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2091,6 +2091,8 @@ enum ieee80211_key_flags { +@@ -2084,6 +2084,8 @@ enum ieee80211_key_flags { * @tx_pn: PN used for TX keys, may be used by the driver as well if it * needs to do software PN assignment by itself (e.g. due to TSO) * @flags: key flags, see &enum ieee80211_key_flags. @@ -33,7 +33,7 @@ Signed-off-by: Sathishkumar Muruganandam * @keyidx: the key index (0-3) * @keylen: key material length * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) -@@ -2110,6 +2112,7 @@ struct ieee80211_key_conf { +@@ -2103,6 +2105,7 @@ struct ieee80211_key_conf { u8 hw_key_idx; s8 keyidx; u16 flags; @@ -100,3 +100,31 @@ Signed-off-by: Sathishkumar Muruganandam key->conf.link_id = -1; key->conf.cipher = cipher; +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -4654,16 +4654,25 @@ static void ieee80211_8023_xmit(struct i + struct ieee80211_key *key, struct sk_buff *skb) + { + struct ieee80211_tx_info *info; ++ struct ethhdr *ehdr = (struct ethhdr *)skb->data; + struct ieee80211_local *local = sdata->local; + struct tid_ampdu_tx *tid_tx; + struct sk_buff *seg, *next; + unsigned int skbs = 0, len = 0; + u16 queue; ++ unsigned char *ra = ehdr->h_dest; ++ bool multicast; + u8 tid; + + queue = ieee80211_select_queue(sdata, sta, skb); + skb_set_queue_mapping(skb, queue); + ++ multicast = is_multicast_ether_addr(ra); ++ ++ if (multicast && sdata->vif.type == NL80211_IFTYPE_AP_VLAN && ++ !atomic_read(&sdata->u.vlan.num_mcast_sta)) ++ goto out_free; ++ + if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)) && + test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) + goto out_free; diff --git a/package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch b/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch rename to package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch index b4a735f10fc0e6..5fc14bf1d44f37 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/245-compilation_fix.patch +++ b/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch @@ -77,7 +77,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* then other type-dependent work */ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4668,19 +4668,21 @@ static void ieee80211_8023_xmit(struct i +@@ -4676,19 +4676,21 @@ static void ieee80211_8023_xmit(struct i ieee80211_aggr_check(sdata, sta, skb); @@ -111,7 +111,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran } skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata)); -@@ -4739,7 +4741,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4745,7 +4747,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ethhdr *ehdr = (struct ethhdr *)skb->data; @@ -120,7 +120,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct sta_info *sta; #ifdef CPTCFG_MAC80211_NSS_SUPPORT -@@ -4757,9 +4759,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4763,9 +4765,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto out; } @@ -137,7 +137,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); -@@ -4770,6 +4776,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4776,6 +4782,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto skip_offload; sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); @@ -145,9 +145,8 @@ Signed-off-by: Gautham Kumar Senthilkumaran ieee80211_8023_xmit(sdata, dev, sta, key, skb); goto out; ---- a/net/mac80211/rx.c -+++ b/net/mac80211/rx.c -@@ -5342,7 +5342,7 @@ void ieee80211_rx_list(struct ieee80211_ +@@ -6282,13 +6289,7 @@ start_xmit: + mutex_lock(&local->mtx); if (pubsta) { sta = container_of(pubsta, struct sta_info, sta); diff --git a/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch similarity index 96% rename from package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch rename to package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch index d3e6b9850b620f..5e0a156312fe4e 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/300-mac80211-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch @@ -66,18 +66,18 @@ Signed-off-by: Gautham Kumar Senthilkumaran }; /* -@@ -794,6 +803,11 @@ struct ieee80211_bss_conf { - bool eht_mu_beamformer; - bool nss_ap_isolate; - enum nl80211_beacon_tx_mode beacon_tx_mode; +@@ -792,6 +801,11 @@ struct ieee80211_bss_conf { + bool he_full_ul_mumimo; + bool eht_su_beamformer; + bool eht_su_beamformee; + + /* Mesh configuration for nss offload */ + u8 nss_offld_ttl; + bool nss_offld_mesh_forward_enabled; + u32 nss_offld_mpath_refresh_time; + bool eht_mu_beamformer; + bool nss_ap_isolate; }; - - /** @@ -1273,6 +1287,8 @@ struct ieee80211_rate_status { * @ack_hwtstamp: Hardware timestamp of the received ack in nanoseconds * Only needed for Timing measurement and Fine timing measurement action @@ -112,7 +112,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran }; -@@ -2765,6 +2785,7 @@ enum ieee80211_hw_flags { +@@ -2768,6 +2788,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_DETECTS_COLOR_COLLISION, IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, @@ -120,7 +120,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS -@@ -4265,6 +4286,8 @@ struct ieee80211_prep_tx_info { +@@ -4268,6 +4289,8 @@ struct ieee80211_prep_tx_info { * @set_sar_specs: Update the SAR (TX power) settings. * @sta_set_decap_offload: Called to notify the driver when a station is allowed * to use rx decapsulation offload @@ -129,7 +129,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran * @add_twt_setup: Update hw with TWT agreement parameters received from the peer. * This callback allows the hw to check if requested parameters * are supported and if there is enough room for a new agreement. -@@ -4648,6 +4671,12 @@ struct ieee80211_ops { +@@ -4651,6 +4674,12 @@ struct ieee80211_ops { void (*sta_set_decap_offload)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool enabled); @@ -142,7 +142,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran void (*add_twt_setup)(struct ieee80211_hw *hw, struct ieee80211_sta *sta, struct ieee80211_twt_setup *twt); -@@ -7481,4 +7510,100 @@ int ieee80211_set_active_links(struct ie +@@ -7509,4 +7538,100 @@ int ieee80211_set_active_links(struct ie void ieee80211_set_active_links_async(struct ieee80211_vif *vif, u16 active_links); @@ -245,7 +245,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran #endif /* MAC80211_H */ --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2514,6 +2514,7 @@ static int ieee80211_update_mesh_config( +@@ -2521,6 +2521,7 @@ static int ieee80211_update_mesh_config( struct mesh_config *conf; struct ieee80211_sub_if_data *sdata; struct ieee80211_if_mesh *ifmsh; @@ -253,7 +253,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran sdata = IEEE80211_DEV_TO_SUB_IF(dev); ifmsh = &sdata->u.mesh; -@@ -2530,8 +2531,11 @@ static int ieee80211_update_mesh_config( +@@ -2537,8 +2538,11 @@ static int ieee80211_update_mesh_config( conf->dot11MeshMaxPeerLinks = nconf->dot11MeshMaxPeerLinks; if (_chg_mesh_attr(NL80211_MESHCONF_MAX_RETRIES, mask)) conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries; @@ -266,7 +266,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask)) conf->element_ttl = nconf->element_ttl; if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask)) { -@@ -2545,8 +2549,12 @@ static int ieee80211_update_mesh_config( +@@ -2552,8 +2556,12 @@ static int ieee80211_update_mesh_config( if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES, mask)) conf->dot11MeshHWMPmaxPREQretries = nconf->dot11MeshHWMPmaxPREQretries; @@ -280,7 +280,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT, mask)) conf->min_discovery_timeout = nconf->min_discovery_timeout; if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT, mask)) -@@ -2581,8 +2589,12 @@ static int ieee80211_update_mesh_config( +@@ -2588,8 +2596,12 @@ static int ieee80211_update_mesh_config( if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) conf->dot11MeshHWMPRannInterval = nconf->dot11MeshHWMPRannInterval; @@ -294,7 +294,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) { /* our RSSI threshold implementation is supported only for * devices that report signal in dBm. -@@ -2624,6 +2636,7 @@ static int ieee80211_update_mesh_config( +@@ -2631,6 +2643,7 @@ static int ieee80211_update_mesh_config( conf->dot11MeshConnectedToAuthServer = nconf->dot11MeshConnectedToAuthServer; ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON); @@ -340,7 +340,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran --- a/net/mac80211/driver-ops.c +++ b/net/mac80211/driver-ops.c -@@ -569,3 +569,23 @@ int drv_change_sta_links(struct ieee8021 +@@ -572,3 +572,23 @@ int drv_change_sta_links(struct ieee8021 return 0; } @@ -366,7 +366,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran +#endif --- a/net/mac80211/driver-ops.h +++ b/net/mac80211/driver-ops.h -@@ -1567,4 +1567,10 @@ int drv_change_sta_links(struct ieee8021 +@@ -1571,4 +1571,10 @@ int drv_change_sta_links(struct ieee8021 struct ieee80211_sta *sta, u16 old_links, u16 new_links); @@ -1173,7 +1173,16 @@ Signed-off-by: Gautham Kumar Senthilkumaran void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata) --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2633,6 +2633,9 @@ static struct sk_buff *ieee80211_build_h +@@ -2609,7 +2609,7 @@ static struct sk_buff *ieee80211_build_h + bool multicast; + u16 info_id = 0; + struct ieee80211_chanctx_conf *chanctx_conf = NULL; +- enum nl80211_band band; ++ enum nl80211_band band = 0; + int ret; + u8 link_id = u32_get_bits(ctrl_flags, IEEE80211_TX_CTRL_MLO_LINK); + +@@ -2621,6 +2621,9 @@ static struct sk_buff *ieee80211_build_h info_flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; #endif @@ -1183,7 +1192,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* convert Ethernet header to proper 802.11 header (based on * operation mode) */ ethertype = (skb->data[12] << 8) | skb->data[13]; -@@ -2703,6 +2706,13 @@ static struct sk_buff *ieee80211_build_h +@@ -2691,6 +2694,13 @@ static struct sk_buff *ieee80211_build_h break; #ifdef CPTCFG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT: @@ -1197,7 +1206,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (!is_multicast_ether_addr(skb->data)) { struct sta_info *next_hop; bool mpp_lookup = true; -@@ -2966,10 +2976,10 @@ static struct sk_buff *ieee80211_build_h +@@ -2954,10 +2964,10 @@ static struct sk_buff *ieee80211_build_h skb_reset_mac_header(skb); @@ -1212,7 +1221,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran info->ack_frame_id = info_id; info->band = band; -@@ -4284,6 +4294,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4272,6 +4282,7 @@ void __ieee80211_subif_start_xmit(struct struct sk_buff *next; int len = skb->len; struct ieee80211_key *key = NULL; @@ -1220,11 +1229,11 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct ieee80211_sub_if_data *ap_sdata; if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { -@@ -4359,9 +4370,15 @@ void __ieee80211_subif_start_xmit(struct +@@ -4348,9 +4359,15 @@ void __ieee80211_subif_start_xmit(struct goto out; } -- ieee80211_tx_stats(dev, skb->len); +- dev_sw_netstats_tx_add(dev, 1, skb->len); - - ieee80211_xmit(sdata, sta, skb); + info = IEEE80211_SKB_CB(skb); @@ -1233,7 +1242,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran + key = rcu_dereference(sta->ptk[sta->ptk_idx]); + ieee80211_8023_xmit(sdata, dev, sta, key, skb); + } else { -+ ieee80211_tx_stats(dev, skb->len); ++ dev_sw_netstats_tx_add(dev, 1, skb->len); + ieee80211_xmit(sdata, sta, skb); + } } diff --git a/package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch similarity index 94% rename from package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch rename to package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index 6a37ba0e1aa730..b488e431c6cd3c 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/335-0003-mac80211-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -16,7 +16,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2727,6 +2727,8 @@ struct ieee80211_txq { +@@ -2728,6 +2728,8 @@ struct ieee80211_txq { * * @IEEE80211_HW_SUPPORTS_NSS_OFFLOAD: Hardware/driver supports NSS offload * @@ -25,7 +25,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2786,6 +2788,7 @@ enum ieee80211_hw_flags { +@@ -2787,6 +2789,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, diff --git a/package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch b/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch similarity index 93% rename from package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch rename to package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch index d859d038003196..0a3e71bee9716f 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/335-0005-mac80211-simple-tx-for-AP-mode.patch +++ b/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch @@ -14,7 +14,7 @@ Signed-off-by: Aloka Dixit --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4748,6 +4748,70 @@ out_free: +@@ -4759,6 +4759,67 @@ out_free: kfree_skb(skb); } @@ -58,7 +58,6 @@ Signed-off-by: Aloka Dixit + if (sta) { + sta->deflink.tx_stats.bytes[q_map] += skb->len; + sta->deflink.tx_stats.packets[q_map]++; -+ atomic_inc(&sta->tx_netif_pkts); + } + + spin_lock_irqsave(&local->queue_stop_reason_lock, flags); @@ -78,14 +77,12 @@ Signed-off-by: Aloka Dixit + + drv_tx(local, &control, skb); + -+ if (sta) -+ atomic_inc(&sta->tx_drv_pkts); +} + netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { -@@ -4787,6 +4851,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4798,6 +4859,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))) goto skip_offload; diff --git a/package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch b/package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch similarity index 95% rename from package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch rename to package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch index d29a05f13943bf..eb6c51c8ba0cad 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/336-mac80211-Mesh-Fast-rx-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch @@ -94,7 +94,7 @@ Signed-off-by: Sriram R if (action) { --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -4663,10 +4663,15 @@ void ieee80211_check_fast_rx(struct sta_ +@@ -4649,10 +4649,15 @@ void ieee80211_check_fast_rx(struct sta_ break; case NL80211_IFTYPE_MESH_POINT: @@ -112,7 +112,7 @@ Signed-off-by: Sriram R break; default: goto clear; -@@ -4707,7 +4712,7 @@ void ieee80211_check_fast_rx(struct sta_ +@@ -4693,7 +4698,7 @@ void ieee80211_check_fast_rx(struct sta_ __release(check_fast_rx); if (assign) @@ -121,7 +121,7 @@ Signed-off-by: Sriram R offload_flags = get_bss_sdata(sdata)->vif.offload_flags; offload = offload_flags & IEEE80211_OFFLOAD_DECAP_ENABLED; -@@ -4890,6 +4895,10 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4876,6 +4881,10 @@ static bool ieee80211_invoke_fast_rx(str u8 sa[ETH_ALEN]; } addrs __aligned(2); struct ieee80211_sta_rx_stats *stats; @@ -132,7 +132,7 @@ Signed-off-by: Sriram R /* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write * to a common data structure; drivers can implement that per queue -@@ -4939,6 +4948,37 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4925,6 +4934,37 @@ static bool ieee80211_invoke_fast_rx(str snap_offs += IEEE80211_CCMP_HDR_LEN; } @@ -170,7 +170,7 @@ Signed-off-by: Sriram R if (!ieee80211_vif_is_mesh(&rx->sdata->vif) && !(status->rx_flags & IEEE80211_RX_AMSDU)) { if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) -@@ -4976,9 +5016,33 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4962,9 +5002,33 @@ static bool ieee80211_invoke_fast_rx(str return true; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch b/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch similarity index 79% rename from package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch rename to package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch index e4890a3654c3b3..0be0c6106bf788 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/342-mac80211-fix-unconditional-sta-usage.patch +++ b/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch @@ -33,16 +33,19 @@ Signed-off-by: Tamizh Chelvam --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4725,12 +4725,12 @@ static void ieee80211_8023_xmit(struct i +@@ -4711,7 +4711,7 @@ static void ieee80211_8023_xmit(struct i - if (unlikely(skb->sk && - skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS && -- !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) -+ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta)) - info->ack_frame_id = ieee80211_store_ack_skb(local, skb, + ieee80211_aggr_check(sdata, sta, skb); + +- if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { ++ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta) { + tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; + tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]); + if (tid_tx) { +@@ -4762,7 +4762,7 @@ static void ieee80211_8023_xmit(struct i &info->flags, NULL); - ieee80211_tx_stats(dev, len); + dev_sw_netstats_tx_add(dev, skbs, len); - if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) { + if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta) { sta->deflink.tx_stats.packets[queue] += skbs; diff --git a/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch b/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch new file mode 100644 index 00000000000000..5fd21ba6a4d42b --- /dev/null +++ b/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch @@ -0,0 +1,57 @@ +From b3215eee07d071137e6977d60eee3cf685241fbb Mon Sep 17 00:00:00 2001 +From: Hari Chandrakanthan +Date: Thu, 3 Feb 2022 13:55:53 +0530 +Subject: [PATCH] mac80211 : fix mixed declaration + +Fix mixed declaration in the api ieee80211_parse_ch_switch_ie + +Signed-off-by: Hari Chandrakanthan +--- + net/mac80211/spectmgmt.c | 22 +++++++++------------- + 1 file changed, 9 insertions(+), 13 deletions(-) + +diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c +index 76747bf..7ddfb96 100644 +--- a/net/mac80211/spectmgmt.c ++++ b/net/mac80211/spectmgmt.c +@@ -33,7 +33,10 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, + struct cfg80211_chan_def new_vht_chandef = {}; + const struct ieee80211_sec_chan_offs_ie *sec_chan_offs; + const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie; ++ struct ieee80211_vht_operation vht_oper; ++ struct ieee80211_ht_operation ht_oper; + int secondary_channel_offset = -1; ++ u8 new_seg1; + + memset(csa_ie, 0, sizeof(*csa_ie)); + +@@ -133,20 +136,13 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, + } + + if (wide_bw_chansw_ie) { +- u8 new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1; +- struct ieee80211_vht_operation vht_oper = { +- .chan_width = +- wide_bw_chansw_ie->new_channel_width, +- .center_freq_seg0_idx = +- wide_bw_chansw_ie->new_center_freq_seg0, +- .center_freq_seg1_idx = new_seg1, ++ new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1; ++ vht_oper.chan_width = wide_bw_chansw_ie->new_channel_width; ++ vht_oper.center_freq_seg0_idx = wide_bw_chansw_ie->new_center_freq_seg0; ++ vht_oper.center_freq_seg1_idx = new_seg1; + /* .basic_mcs_set doesn't matter */ +- }; +- struct ieee80211_ht_operation ht_oper = { +- .operation_mode = +- cpu_to_le16(new_seg1 << +- IEEE80211_HT_OP_MODE_CCFS2_SHIFT), +- }; ++ ht_oper.operation_mode = cpu_to_le16(new_seg1 << ++ IEEE80211_HT_OP_MODE_CCFS2_SHIFT); + + /* default, for the case of IEEE80211_VHT_CHANWIDTH_USE_HT, + * to the previously parsed chandef +-- +2.7.4 + diff --git a/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch b/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch new file mode 100644 index 00000000000000..82e44b83600984 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch @@ -0,0 +1,39 @@ +From 9c7571646a01eedb85350dfce12b499a0267ab2b Mon Sep 17 00:00:00 2001 +From: Hari Chandrakanthan +Date: Thu, 3 Feb 2022 14:01:57 +0530 +Subject: [PATCH] mac80211 : fix bw change to 40Mhz during channel switch + +When AP reduces its channel bandwidth to 40Mhz, the associated +sta reduces the channel bandwidth to 20Mhz. + +From spec 802.11 ac, section 8.4.2.165 : +The Wide Bandwidth Channel Switch subelement is present under the following conditions: +1.Channel switching to a BSS operating channel width of 40 MHz or wider +2.Extended channel switching to a BSS operating channel width of 80 MHz or wider + +So when wide bandwidth channel switch subelement is present, +the default bandwidth is chosen as 40Mhz. + +Signed-off-by: Hari Chandrakanthan +--- + net/mac80211/spectmgmt.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c +index 7ddfb96..15c7ac3 100644 +--- a/net/mac80211/spectmgmt.c ++++ b/net/mac80211/spectmgmt.c +@@ -136,6 +136,10 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, + } + + if (wide_bw_chansw_ie) { ++ csa_ie->chandef.width = NL80211_CHAN_WIDTH_40; ++ csa_ie->chandef.center_freq1 = ++ ieee80211_channel_to_frequency(wide_bw_chansw_ie->new_center_freq_seg0, ++ new_chan->band); + new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1; + vht_oper.chan_width = wide_bw_chansw_ie->new_channel_width; + vht_oper.center_freq_seg0_idx = wide_bw_chansw_ie->new_center_freq_seg0; +-- +2.7.4 + diff --git a/package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch b/package/kernel/mac80211/patches/nss/subsys/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch similarity index 95% rename from package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch rename to package/kernel/mac80211/patches/nss/subsys/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch index d128824140ecb6..ba80b62d0ac732 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch +++ b/package/kernel/mac80211/patches/nss/subsys/353-mac80211-fix-dynamic-vlan-warning-with-monitor-interface-restart.patch @@ -21,7 +21,7 @@ Signed-off-by: Nagarajan Maran --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -994,7 +994,8 @@ static bool ieee80211_set_sdata_offload_ +@@ -998,7 +998,8 @@ static bool ieee80211_set_sdata_offload_ flags |= IEEE80211_OFFLOAD_DECAP_ENABLED; if (local->monitors && diff --git a/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch b/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch similarity index 94% rename from package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch rename to package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch index 14fd82cbeaa853..eaec491461b6cc 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch +++ b/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch @@ -14,7 +14,7 @@ Signed-off-by: P Praneesh --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1387,8 +1387,6 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1427,8 +1427,6 @@ ieee80211_tx_info_clear_status(struct ie * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected * on this subframe @@ -23,7 +23,7 @@ Signed-off-by: P Praneesh * @RX_FLAG_MIC_STRIPPED: The mic was stripped of this packet. Decryption was * done by the hardware * @RX_FLAG_ONLY_MONITOR: Report frame only to monitor interfaces without -@@ -1460,22 +1458,21 @@ enum mac80211_rx_flags { +@@ -1500,22 +1498,21 @@ enum mac80211_rx_flags { RX_FLAG_AMPDU_LAST_KNOWN = BIT(12), RX_FLAG_AMPDU_IS_LAST = BIT(13), RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(14), @@ -63,7 +63,7 @@ Signed-off-by: P Praneesh /** --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -527,18 +527,13 @@ ieee80211_add_rx_radiotap_header(struct +@@ -517,18 +517,13 @@ ieee80211_add_rx_radiotap_header(struct flags |= IEEE80211_RADIOTAP_AMPDU_IS_LAST; if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_ERROR) flags |= IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR; diff --git a/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch b/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch similarity index 70% rename from package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch rename to package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch index 70e2603c8cc02b..e0415032bb8ae7 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch +++ b/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch @@ -20,7 +20,7 @@ Signed-off-by: Aaradhana Sahu --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -2062,6 +2062,11 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2061,6 +2061,11 @@ netdev_tx_t ieee80211_subif_start_xmit(s struct net_device *dev); netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev); @@ -41,23 +41,10 @@ Signed-off-by: Aaradhana Sahu - struct ieee80211_key *key, struct sk_buff *skb); + struct ieee80211_key *key, struct sk_buff *skb, + u32 info_flags, u32 ctrl_flags, u64 *cookie); + /* misc utils */ - static inline void ieee80211_tx_stats(struct net_device *dev, u32 len) - { -@@ -4310,13 +4311,18 @@ void __ieee80211_subif_start_xmit(struct - atomic_inc(&sta->tx_netif_pkts); - - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { -- ap_sdata = container_of(sdata->bss, -- struct ieee80211_sub_if_data, u.ap); -+ if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD)) -+ ap_sdata = container_of(sdata->bss, -+ struct ieee80211_sub_if_data, -+ u.ap); -+ else -+ ap_sdata = sdata; -+ - if (ap_sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED && + static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, +@@ -4320,7 +4321,7 @@ void __ieee80211_subif_start_xmit(struct !is_multicast_ether_addr(skb->data)) { if (sta) key = rcu_dereference(sta->ptk[sta->ptk_idx]); @@ -66,16 +53,16 @@ Signed-off-by: Aaradhana Sahu rcu_read_unlock(); return; } -@@ -4374,7 +4378,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4366,7 +4367,7 @@ void __ieee80211_subif_start_xmit(struct if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { if (sta) key = rcu_dereference(sta->ptk[sta->ptk_idx]); - ieee80211_8023_xmit(sdata, dev, sta, key, skb); + ieee80211_8023_xmit(sdata, dev, sta, key, skb, info_flags, ctrl_flags, cookie); } else { - ieee80211_tx_stats(dev, skb->len); + dev_sw_netstats_tx_add(dev, 1, skb->len); ieee80211_xmit(sdata, sta, skb); -@@ -4657,19 +4663,29 @@ static bool ieee80211_tx_8023(struct iee +@@ -4667,7 +4668,8 @@ static bool ieee80211_tx_8023(struct iee static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, @@ -84,51 +71,32 @@ Signed-off-by: Aaradhana Sahu + u32 info_flags, u32 ctrl_flags, u64 *cookie) { struct ieee80211_tx_info *info; -+ struct ethhdr *ehdr = (struct ethhdr *)skb->data; - struct ieee80211_local *local = sdata->local; - struct tid_ampdu_tx *tid_tx; - struct sk_buff *seg, *next; - unsigned int skbs = 0, len = 0; - u16 queue; -+ unsigned char *ra = ehdr->h_dest; -+ bool multicast; - u8 tid; - - queue = ieee80211_select_queue(sdata, sta, skb); - skb_set_queue_mapping(skb, queue); - -+ multicast = is_multicast_ether_addr(ra); -+ -+ if (multicast && sdata->vif.type == NL80211_IFTYPE_AP_VLAN && -+ !atomic_read(&sdata->u.vlan.num_mcast_sta)) -+ goto out_free; -+ - if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)) && - test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) - goto out_free; -@@ -4704,6 +4720,7 @@ static void ieee80211_8023_xmit(struct i + struct ethhdr *ehdr = (struct ethhdr *)skb->data; +@@ -4723,6 +4725,7 @@ static void ieee80211_8023_xmit(struct i info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); + info->flags |= info_flags; info->hw_queue = sdata->vif.hw_queue[queue]; - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) -@@ -4723,9 +4740,10 @@ static void ieee80211_8023_xmit(struct i + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && +@@ -4743,11 +4746,12 @@ static void ieee80211_8023_xmit(struct i memcpy(IEEE80211_SKB_CB(seg), info, sizeof(*info)); } - if (unlikely(skb->sk && - skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS && -- !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta)) + if (unlikely(((skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || + ((ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && !multicast)) && -+ !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) + !ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD))) info->ack_frame_id = ieee80211_store_ack_skb(local, skb, - &info->flags, NULL); +- &info->flags, NULL); ++ &info->flags, cookie); -@@ -4750,7 +4768,8 @@ out_free: + dev_sw_netstats_tx_add(dev, skbs, len); + if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta) { +@@ -4770,7 +4774,8 @@ out_free: void ieee80211_8023_xmit_ap(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, @@ -138,7 +106,7 @@ Signed-off-by: Aaradhana Sahu { struct ieee80211_tx_info *info; struct ieee80211_local *local = sdata->local; -@@ -4759,6 +4778,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4779,6 +4784,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 unsigned long flags; int q; u16 q_map; @@ -148,7 +116,7 @@ Signed-off-by: Aaradhana Sahu /* * If the skb is shared we need to obtain our own copy. -@@ -4770,11 +4792,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4790,11 +4798,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); @@ -165,7 +133,7 @@ Signed-off-by: Aaradhana Sahu info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; info->control.vif = &sdata->vif; -@@ -4811,14 +4835,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4831,14 +4841,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 if (sta) atomic_inc(&sta->tx_drv_pkts); } @@ -190,7 +158,7 @@ Signed-off-by: Aaradhana Sahu #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); -@@ -4834,14 +4867,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4854,14 +4873,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 kfree_skb(skb); goto out; } @@ -208,7 +176,7 @@ Signed-off-by: Aaradhana Sahu goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); -@@ -4852,13 +4886,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4872,13 +4892,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto skip_offload; if (sdata->vif.type == NL80211_IFTYPE_AP) { @@ -224,18 +192,15 @@ Signed-off-by: Aaradhana Sahu goto out; skip_offload: -@@ -6364,13 +6398,10 @@ start_xmit: +@@ -6384,7 +6404,10 @@ start_xmit: mutex_lock(&local->mtx); local_bh_disable(); -- -- /* added hardware encap check for ethernet mode */ - if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) -- ieee80211_subif_start_xmit_8023(skb, skb->dev); +- __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); ++ if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) + __ieee80211_subif_start_xmit_8023(skb, skb->dev, flags, ctrl_flags, cookie); - else - __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); -- ++ else ++ __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); local_bh_enable(); mutex_unlock(&local->mtx); diff --git a/package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch b/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch similarity index 88% rename from package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch rename to package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch index 6614d8d496b354..61421d7d766950 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/913-686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch +++ b/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch @@ -72,7 +72,7 @@ Signed-off-by: P Praneesh --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2347,7 +2347,7 @@ static void mpath_set_pinfo(struct mesh_ +@@ -2373,7 +2373,7 @@ static void mpath_set_pinfo(struct mesh_ if (mpath->flags & MESH_PATH_RESOLVED) pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED; pinfo->hop_count = mpath->hop_count; @@ -94,27 +94,21 @@ Signed-off-by: P Praneesh #define MESH_FAST_TX_CACHE_MAX_SIZE 512 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c -@@ -504,7 +504,10 @@ static u32 hwmp_route_info_get(struct ie +@@ -510,7 +510,7 @@ static u32 hwmp_route_info_get(struct ie if (next_hop) ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); if (next_hop != sta) { - mpath->path_change_count++; + atomic_inc(&mpath->path_change_count); -+ mpath_dbg(sdata, "MESH MPU dst %pM next hop %pM" -+ " metric %d ft 0x%x\n", -+ mpath->dst, sta->deflink.addr, last_hop_metric, action); flush_mpath = true; } mesh_path_assign_nexthop(mpath, sta); -@@ -565,7 +568,10 @@ static u32 hwmp_route_info_get(struct ie +@@ -571,7 +571,7 @@ static u32 hwmp_route_info_get(struct ie if (next_hop) ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); if (next_hop != sta) { - mpath->path_change_count++; + atomic_inc(&mpath->path_change_count); -+ mpath_dbg(sdata, "MESH MPU dst %pM next hop %pM" -+ " metric %d ft 0x%x\n", -+ mpath->dst, sta->deflink.addr, last_hop_metric, action); flush_mpath = true; } mesh_path_assign_nexthop(mpath, sta); diff --git a/package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch b/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch similarity index 94% rename from package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch rename to package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch index 31db236d5fd4ef..e3c2db4cc8a713 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch +++ b/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch @@ -19,7 +19,7 @@ Signed-off-by: Ramanathan Choodamani --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4567,6 +4567,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -4572,6 +4572,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); #endif @@ -27,7 +27,7 @@ Signed-off-by: Ramanathan Choodamani if (likely(!is_multicast_ether_addr(eth->h_dest))) goto normal; -@@ -4838,7 +4839,43 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4844,7 +4845,43 @@ void ieee80211_8023_xmit_ap(struct ieee8 netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { diff --git a/package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch similarity index 89% rename from package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch rename to package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch index e5b4d7d9e7ef4e..a2a9879f25285b 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch +++ b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch @@ -31,7 +31,7 @@ Signed-off-by: Tamizh Chelvam Raja static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, struct ieee80211_key *key, struct sk_buff *skb, -@@ -3633,7 +3635,7 @@ ieee80211_sdata_netdev_features(struct i +@@ -3631,7 +3633,7 @@ ieee80211_sdata_netdev_features(struct i } static struct sk_buff * @@ -40,7 +40,7 @@ Signed-off-by: Tamizh Chelvam Raja { if (skb_is_gso(skb)) { struct sk_buff *segs; -@@ -3651,7 +3653,7 @@ ieee80211_tx_skb_fixup(struct sk_buff *s +@@ -3649,7 +3651,7 @@ ieee80211_tx_skb_fixup(struct sk_buff *s if (skb_needs_linearize(skb, features) && __skb_linearize(skb)) goto free; @@ -49,7 +49,7 @@ Signed-off-by: Tamizh Chelvam Raja int ofs = skb_checksum_start_offset(skb); if (skb->encapsulation) -@@ -3797,7 +3799,7 @@ static bool ieee80211_xmit_fast(struct i +@@ -3795,7 +3797,7 @@ static bool ieee80211_xmit_fast(struct i memcpy(ð, skb->data, ETH_HLEN - 2); /* after this point (skb is modified) we cannot return false */ @@ -58,7 +58,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) return true; -@@ -4345,7 +4347,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4344,7 +4346,7 @@ void __ieee80211_subif_start_xmit(struct * things so we cannot really handle checksum or GSO offload. * fix it up in software before we handle anything else. */ @@ -67,7 +67,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) { len = 0; goto out; -@@ -4567,7 +4569,6 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -4572,7 +4574,6 @@ netdev_tx_t ieee80211_subif_start_xmit(s #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); #endif @@ -75,7 +75,7 @@ Signed-off-by: Tamizh Chelvam Raja if (likely(!is_multicast_ether_addr(eth->h_dest))) goto normal; -@@ -4714,7 +4715,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4719,7 +4720,7 @@ static void ieee80211_8023_xmit(struct i } } @@ -84,7 +84,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) return; -@@ -4839,6 +4840,7 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4845,6 +4846,7 @@ void ieee80211_8023_xmit_ap(struct ieee8 netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { @@ -92,7 +92,7 @@ Signed-off-by: Tamizh Chelvam Raja struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_control control = {}; -@@ -4873,9 +4875,10 @@ out: +@@ -4879,9 +4881,10 @@ out: } return NETDEV_TX_OK; @@ -107,7 +107,7 @@ Signed-off-by: Tamizh Chelvam Raja netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -2250,6 +2250,10 @@ int ieee80211_if_add(struct ieee80211_lo +@@ -2267,6 +2267,10 @@ int ieee80211_if_add(struct ieee80211_lo ndev->features |= local->hw.netdev_features; ndev->priv_flags |= IFF_LIVE_ADDR_CHANGE; diff --git a/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch b/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch new file mode 100644 index 00000000000000..e25220a1b01c99 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch @@ -0,0 +1,342 @@ +From ca28b8b125c27063b9b4bc60bb85206ca8e0d403 Mon Sep 17 00:00:00 2001 +From: Yuvasree Sivasankaran +Date: Thu, 31 Aug 2023 10:59:33 +0530 +Subject: [PATCH] wifi: mac80211: Add mac hw flag to avoid queue skb + +Queue SKB in mac80211 become mandatory from latest 6.1 kernel. Because of +this queuing, there will be performance degradation. Add hw flag option +to enable tx queue in Driver/Hardware. + +Driver/hardware can register for HAS_TX_QUEUE HW flag and avoid tx queuing +in mac80211. + +Add same HW flag checks to avoid accessing skb queues which will be +NULL or invalid and also NULL checks for sta txqs for NULL or invalid +access. + +Signed-off-by: Yuvasree Sivasankaran +--- + include/net/mac80211.h | 1 + + net/mac80211/debugfs.c | 1 + + net/mac80211/tx.c | 18 ++++++++++++++---- + 4 files changed, 17 insertions(+), 4 deletions(-) + +--- a/include/net/mac80211.h ++++ b/include/net/mac80211.h +@@ -2727,6 +2727,9 @@ struct ieee80211_txq { + * + * @IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD: Hardware suports tid calssification offload. + * ++ * @IEE80211_HW_HAS_TX_QUEUE: Hardware/drivers has tx queue, does skb queuing itself, ++ * the stack will not do tx queuing. ++ * + * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays + */ + enum ieee80211_hw_flags { +@@ -2787,6 +2790,7 @@ enum ieee80211_hw_flags { + IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, + IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, + IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD, ++ IEEE80211_HW_HAS_TX_QUEUE, + + /* keep last, obviously */ + NUM_IEEE80211_HW_FLAGS +--- a/net/mac80211/debugfs.c ++++ b/net/mac80211/debugfs.c +@@ -499,6 +499,7 @@ static const char *hw_flag_names[] = { + FLAG(SUPPORTS_NSS_OFFLOAD), + FLAG(SUPPORTS_MESH_NSS_OFFLOAD), + FLAG(SUPPORTS_TID_CLASS_OFFLOAD), ++ FLAG(HAS_TX_QUEUE), + #undef FLAG + }; + +--- a/net/mac80211/tx.c ++++ b/net/mac80211/tx.c +@@ -1602,6 +1602,9 @@ int ieee80211_txq_setup_flows(struct iee + bool supp_vht = false; + enum nl80211_band band; + ++ if (ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) ++ return 0; ++ + ret = fq_init(fq, 4096); + if (ret) + return ret; +@@ -1649,6 +1652,9 @@ void ieee80211_txq_teardown_flows(struct + { + struct fq *fq = &local->fq; + ++ if (ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) ++ return; ++ + kfree(local->cvars); + local->cvars = NULL; + +@@ -1665,7 +1671,8 @@ static bool ieee80211_queue_skb(struct i + struct ieee80211_vif *vif; + struct txq_info *txqi; + +- if (sdata->vif.type == NL80211_IFTYPE_MONITOR) ++ if (ieee80211_hw_check(&local->hw, HAS_TX_QUEUE) || ++ sdata->vif.type == NL80211_IFTYPE_MONITOR) + return false; + + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) +@@ -4326,7 +4333,8 @@ void __ieee80211_subif_start_xmit(struct + } + } + +- skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, sta, skb)); ++ if (unlikely(!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE))) ++ skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, sta, skb)); + ieee80211_aggr_check(sdata, sta, skb); + + if (sta) { +@@ -4678,8 +4686,10 @@ static void ieee80211_8023_xmit(struct i + bool multicast; + u8 tid; + +- queue = ieee80211_select_queue(sdata, sta, skb); +- skb_set_queue_mapping(skb, queue); ++ if (unlikely(!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE))) { ++ queue = ieee80211_select_queue(sdata, sta, skb); ++ skb_set_queue_mapping(skb, queue); ++ } + + multicast = is_multicast_ether_addr(ra); + +@@ -6414,9 +6424,12 @@ int ieee80211_tx_control_port(struct wip + } + + if (!IS_ERR(sta)) { +- u16 queue = ieee80211_select_queue(sdata, sta, skb); + +- skb_set_queue_mapping(skb, queue); ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) { ++ u16 queue = ieee80211_select_queue(sdata, sta, skb); ++ ++ skb_set_queue_mapping(skb, queue); ++ } + + /* + * for MLO STA, the SA should be the AP MLD address, but +--- a/net/mac80211/cfg.c ++++ b/net/mac80211/cfg.c +@@ -4516,6 +4516,9 @@ static int ieee80211_get_txq_stats(struc + struct ieee80211_sub_if_data *sdata; + int ret = 0; + ++ if (ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) ++ return 1; ++ + spin_lock_bh(&local->fq.lock); + rcu_read_lock(); + +--- a/net/mac80211/main.c ++++ b/net/mac80211/main.c +@@ -841,7 +841,10 @@ struct ieee80211_hw *ieee80211_alloc_hw_ + atomic_set(&local->agg_queue_stop[i], 0); + } + tasklet_setup(&local->tx_pending_tasklet, ieee80211_tx_pending); +- tasklet_setup(&local->wake_txqs_tasklet, ieee80211_wake_txqs); ++ ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) ++ tasklet_setup(&local->wake_txqs_tasklet, ieee80211_wake_txqs); ++ + tasklet_setup(&local->tasklet, ieee80211_tasklet_handler); + + skb_queue_head_init(&local->skb_queue); +--- a/net/mac80211/rx.c ++++ b/net/mac80211/rx.c +@@ -1549,6 +1549,9 @@ static void sta_ps_start(struct sta_info + + ieee80211_clear_fast_xmit(sta); + ++ if (!sta->sta.txq[0]) ++ return; ++ + for (tid = 0; tid < IEEE80211_NUM_TIDS; tid++) { + struct ieee80211_txq *txq = sta->sta.txq[tid]; + struct txq_info *txqi = to_txq_info(txq); +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -140,15 +140,17 @@ static void __cleanup_single_sta(struct + atomic_dec(&ps->num_sta_ps); + } + +- for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { +- struct txq_info *txqi; ++ if (sta->sta.txq[0]) { ++ for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { ++ struct txq_info *txqi; + +- if (!sta->sta.txq[i]) +- continue; ++ if (!sta->sta.txq[i]) ++ continue; + +- txqi = to_txq_info(sta->sta.txq[i]); ++ txqi = to_txq_info(sta->sta.txq[i]); + +- ieee80211_txq_purge(local, txqi); ++ ieee80211_txq_purge(local, txqi); ++ } + } + + for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { +@@ -427,7 +429,9 @@ void sta_info_free(struct ieee80211_loca + + sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr); + +- kfree(to_txq_info(sta->sta.txq[0])); ++ if (sta->sta.txq[0]) ++ kfree(to_txq_info(sta->sta.txq[0])); ++ + kfree(rcu_dereference_raw(sta->sta.rates)); + #ifdef CPTCFG_MAC80211_MESH + kfree(sta->mesh); +@@ -529,8 +533,6 @@ __sta_info_alloc(struct ieee80211_sub_if + struct ieee80211_local *local = sdata->local; + struct ieee80211_hw *hw = &local->hw; + struct sta_info *sta; +- void *txq_data; +- int size; + int i; + + sta = kzalloc(sizeof(*sta) + hw->sta_data_size, gfp); +@@ -604,18 +606,22 @@ __sta_info_alloc(struct ieee80211_sub_if + + sta->last_connected = ktime_get_seconds(); + +- size = sizeof(struct txq_info) + +- ALIGN(hw->txq_data_size, sizeof(void *)); + +- txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp); +- if (!txq_data) +- goto free; ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) { ++ void *txq_data; ++ int size = sizeof(struct txq_info) + ++ ALIGN(hw->txq_data_size, sizeof(void *)); ++ ++ txq_data = kcalloc(ARRAY_SIZE(sta->sta.txq), size, gfp); ++ if (!txq_data) ++ goto free; + +- for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { +- struct txq_info *txq = txq_data + i * size; ++ for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { ++ struct txq_info *txq = txq_data + i * size; + +- /* might not do anything for the (bufferable) MMPDU TXQ */ +- ieee80211_txq_init(sdata, sta, txq, i); ++ /* might not do anything for the (bufferable) MMPDU TXQ */ ++ ieee80211_txq_init(sdata, sta, txq, i); ++ } + } + + if (sta_prepare_rate_control(local, sta, gfp)) +@@ -689,7 +695,8 @@ __sta_info_alloc(struct ieee80211_sub_if + return sta; + + free_txq: +- kfree(to_txq_info(sta->sta.txq[0])); ++ if (sta->sta.txq[0]) ++ kfree(to_txq_info(sta->sta.txq[0])); + free: + sta_info_free_link(&sta->deflink); + #ifdef CPTCFG_MAC80211_MESH +@@ -1684,11 +1691,13 @@ void ieee80211_sta_ps_deliver_wakeup(str + if (!ieee80211_hw_check(&local->hw, AP_LINK_PS)) + drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta); + +- for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { +- if (!sta->sta.txq[i] || !txq_has_queue(sta->sta.txq[i])) +- continue; ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) { ++ for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { ++ if (!sta->sta.txq[i] || !txq_has_queue(sta->sta.txq[i])) ++ continue; + +- schedule_and_wake_txq(local, to_txq_info(sta->sta.txq[i])); ++ schedule_and_wake_txq(local, to_txq_info(sta->sta.txq[i])); ++ } + } + + skb_queue_head_init(&pending); +@@ -2103,6 +2112,9 @@ ieee80211_sta_ps_deliver_response(struct + * TIM recalculation. + */ + ++ if (!sta->sta.txq[0]) ++ return; ++ + for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { + if (!sta->sta.txq[tid] || + !(driver_release_tids & BIT(tid)) || +@@ -2519,7 +2531,7 @@ static void sta_set_tidstats(struct sta_ + tidstats->tx_msdu_failed = sta->deflink.status_stats.msdu_failed[tid]; + } + +- if (tid < IEEE80211_NUM_TIDS) { ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE) && tid < IEEE80211_NUM_TIDS) { + spin_lock_bh(&local->fq.lock); + rcu_read_lock(); + +@@ -2847,6 +2859,9 @@ unsigned long ieee80211_sta_last_active( + + static void sta_update_codel_params(struct sta_info *sta, u32 thr) + { ++ if (ieee80211_hw_check(&sta->sdata->local->hw, HAS_TX_QUEUE)) ++ return; ++ + if (thr && thr < STA_SLOW_THRESHOLD * sta->local->num_sta) { + sta->cparams.target = MS2TIME(50); + sta->cparams.interval = MS2TIME(300); +--- a/net/mac80211/debugfs_sta.c ++++ b/net/mac80211/debugfs_sta.c +@@ -162,6 +162,9 @@ static ssize_t sta_aqm_read(struct file + bufsz + buf - p, + "tid ac backlog-bytes backlog-packets new-flows drops marks overlimit collisions tx-bytes tx-packets flags\n"); + ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) ++ goto skip_txq_info; ++ + for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { + if (!sta->sta.txq[i]) + continue; +@@ -186,6 +189,7 @@ static ssize_t sta_aqm_read(struct file + test_bit(IEEE80211_TXQ_DIRTY, &txqi->flags) ? " DIRTY" : ""); + } + ++skip_txq_info: + rcu_read_unlock(); + spin_unlock_bh(&local->fq.lock); + +--- a/net/mac80211/mesh.c ++++ b/net/mac80211/mesh.c +@@ -832,7 +832,8 @@ bool ieee80211_mesh_xmit_fast(struct iee + if (!skb) + return true; + +- skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, sta, skb)); ++ if (unlikely(!ieee80211_hw_check(&sdata->local->hw, HAS_TX_QUEUE))) ++ skb_set_queue_mapping(skb, ieee80211_select_queue(sdata, sta, skb)); + + meshhdr = (struct ieee80211s_hdr *)entry->hdr; + if ((meshhdr->flags & MESH_FLAGS_AE) == MESH_FLAGS_AE_A5_A6) { +--- a/net/mac80211/util.c ++++ b/net/mac80211/util.c +@@ -477,10 +477,8 @@ static void __ieee80211_wake_queue(struc + * release someone's lock, but it is fine because all the callers of + * __ieee80211_wake_queue call it right before releasing the lock. + */ +- if (reason == IEEE80211_QUEUE_STOP_REASON_DRIVER) ++ if (!ieee80211_hw_check(&local->hw, HAS_TX_QUEUE)) + tasklet_schedule(&local->wake_txqs_tasklet); +- else +- _ieee80211_wake_txqs(local, flags); + } + + void ieee80211_wake_queue_by_reason(struct ieee80211_hw *hw, int queue, diff --git a/package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch b/package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch similarity index 92% rename from package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch rename to package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch index 7043ecb079061a..c19d97a818ba17 100644 --- a/package/kernel/mac80211/patches/ath11k_nss/829-mac80211-fix-mesh-ping-issue.patch +++ b/package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch @@ -10,7 +10,7 @@ Signed-off-by: Aaradhana Sahu --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -4748,16 +4748,14 @@ void ieee80211_check_fast_rx(struct sta_ +@@ -4649,16 +4649,14 @@ void ieee80211_check_fast_rx(struct sta_ break; case NL80211_IFTYPE_MESH_POINT: @@ -31,7 +31,7 @@ Signed-off-by: Aaradhana Sahu default: goto clear; } -@@ -4980,10 +4978,7 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4881,10 +4879,7 @@ static bool ieee80211_invoke_fast_rx(str u8 sa[ETH_ALEN]; } addrs __aligned(2); struct ieee80211_sta_rx_stats *stats; @@ -42,7 +42,7 @@ Signed-off-by: Aaradhana Sahu /* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write * to a common data structure; drivers can implement that per queue -@@ -5033,37 +5028,6 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4934,37 +4929,6 @@ static bool ieee80211_invoke_fast_rx(str snap_offs += IEEE80211_CCMP_HDR_LEN; } @@ -80,7 +80,7 @@ Signed-off-by: Aaradhana Sahu if (!ieee80211_vif_is_mesh(&rx->sdata->vif) && !(status->rx_flags & IEEE80211_RX_AMSDU)) { if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) -@@ -5101,30 +5065,6 @@ static bool ieee80211_invoke_fast_rx(str +@@ -5002,30 +4966,6 @@ static bool ieee80211_invoke_fast_rx(str return true; } diff --git a/package/kernel/mac80211/patches/ath11k_nss/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch b/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch similarity index 100% rename from package/kernel/mac80211/patches/ath11k_nss/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch rename to package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch From d3f09024ea96c83fa863257e3f109ab863c5d88f Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 18 Feb 2024 01:41:24 -0500 Subject: [PATCH 60/80] feeds: Switch to fork that requires nss qdisc Without it, NSS based SQM doesn't work. --- feeds.conf.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds.conf.default b/feeds.conf.default index 741b14a875d234..4527c3215a827e 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -3,7 +3,7 @@ src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.4-K6.1 -src-git sqm_scripts_nss https://github.com/rickkdotnet/sqm-scripts-nss.git +src-git sqm_scripts_nss https://github.com/qosmio/sqm-scripts-nss.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git #src-git oldpackages http://git.openwrt.org/packages.git From caa2a3378e492a2da57f17c3d0b363362049c3b7 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Tue, 27 Feb 2024 00:44:25 -0500 Subject: [PATCH 61/80] ath11k_nss: add missing support to enable/disable bss color collision detection --- ...ort-to-enable-disable-bss-color-coll.patch | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch diff --git a/package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch b/package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch new file mode 100644 index 00000000000000..058d983c8a15f6 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch @@ -0,0 +1,78 @@ +From e4439779d28949a61228b359a27f399df9b42b1a Mon Sep 17 00:00:00 2001 +From: Rameshkumar Sundaram +Date: Mon, 25 Oct 2021 19:06:04 +0530 +Subject: [PATCH 1/2] nl80211: add support to enable/disable bss color + collision detection + +As per 802.11ax-2021, STAs shall process BSS Color Change Announcement +(BCCA) from AP and switch to new color, but some STAs aren't processing +BCCA from AP and not doing color switch, causing them to drop data +frames from AP post color change. + +Provide an option to disable color collision detection and therefore +not to do BCCA to mitigate the same from AP. If it's required in case +where STA supports BCCA handling, then it can enabled in AP using this +option. + +Signed-off-by: Rameshkumar Sundaram +Signed-off-by: Dinesh Karthikeyan +--- + include/net/cfg80211.h | 2 ++ + include/uapi/linux/nl80211.h | 3 +++ + net/wireless/nl80211.c | 3 +++ + 3 files changed, 8 insertions(+) + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -312,11 +312,13 @@ struct ieee80211_he_obss_pd { + * @color: the current color. + * @enabled: HE BSS color is used + * @partial: define the AID equation. ++ * @collision_detection_enabled: HE BSS color collision detection is enabled. + */ + struct cfg80211_he_bss_color { + u8 color; + bool enabled; + bool partial; ++ bool collision_detection_enabled; + }; + + /** +--- a/include/uapi/linux/nl80211.h ++++ b/include/uapi/linux/nl80211.h +@@ -7566,6 +7566,8 @@ enum nl80211_obss_pd_attributes { + * @NL80211_HE_BSS_COLOR_ATTR_COLOR: the current BSS Color. + * @NL80211_HE_BSS_COLOR_ATTR_DISABLED: is BSS coloring disabled. + * @NL80211_HE_BSS_COLOR_ATTR_PARTIAL: the AID equation to be used.. ++ * @NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED: is BSS ++ * color collision detection disabled. + * + * @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal + * @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute. +@@ -7576,6 +7578,7 @@ enum nl80211_bss_color_attributes { + NL80211_HE_BSS_COLOR_ATTR_COLOR, + NL80211_HE_BSS_COLOR_ATTR_DISABLED, + NL80211_HE_BSS_COLOR_ATTR_PARTIAL, ++ NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED, + + /* keep last */ + __NL80211_HE_BSS_COLOR_ATTR_LAST, +--- a/net/wireless/nl80211.c ++++ b/net/wireless/nl80211.c +@@ -378,6 +378,7 @@ he_bss_color_policy[NL80211_HE_BSS_COLOR + [NL80211_HE_BSS_COLOR_ATTR_COLOR] = NLA_POLICY_RANGE(NLA_U8, 1, 63), + [NL80211_HE_BSS_COLOR_ATTR_DISABLED] = { .type = NLA_FLAG }, + [NL80211_HE_BSS_COLOR_ATTR_PARTIAL] = { .type = NLA_FLAG }, ++ [NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED] = { .type = NLA_FLAG }, + }; + + static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = { +@@ -5495,6 +5496,8 @@ static int nl80211_parse_he_bss_color(st + !nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_DISABLED]); + he_bss_color->partial = + nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_PARTIAL]); ++ he_bss_color->collision_detection_enabled = ++ !nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED]); + + return 0; + } From 5ca3b5b2c35cf615b466308fb0aedc6e51dba5fa Mon Sep 17 00:00:00 2001 From: Qosmio Date: Tue, 27 Feb 2024 00:45:32 -0500 Subject: [PATCH 62/80] ath11k_nss: FW Initiated Dynamic MU-EDCA Implementing the updating of firmware initiated dynamic MU-EDCA parameters in Beacon IE. Firmware routinely checks its clients and updates its MU-EDCA values every 3 seconds. Firmware is tuning MU-EDCA parameters to improve performance. As part of this process, the firmware informs host about new MU-EDCA values utilizing WMI_MUEDCA_PARAMS_CONFIG_EVENTID. FW expectation is that host will update MU-EDCA parameters in the Beacon IE. --- ...03-mac80211-ath11k-fw-dynamic-muedca.patch | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/203-mac80211-ath11k-fw-dynamic-muedca.patch diff --git a/package/kernel/mac80211/patches/nss/ath11k/203-mac80211-ath11k-fw-dynamic-muedca.patch b/package/kernel/mac80211/patches/nss/ath11k/203-mac80211-ath11k-fw-dynamic-muedca.patch new file mode 100644 index 00000000000000..a91d4aa97cbbca --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/203-mac80211-ath11k-fw-dynamic-muedca.patch @@ -0,0 +1,162 @@ +From ed838800bb8f4c59b320395066ac356f74528a50 Mon Sep 17 00:00:00 2001 +From: Muna Sinada +Date: Wed, 29 Jul 2020 00:11:30 -0700 +Subject: [PATCH] 203-mac80211-ath11k-fw-dynamic-muedca.patch + +mac80211/ath11k:FW Initiated Dynamic MU-EDCA + +Implementing the updating of firmware initiated dynamic MU-EDCA +parameters in Beacon IE. Firmware routinely checks its clients and +updates its MU-EDCA values every 3 seconds. Firmware is tuning +MU-EDCA parameters to improve performance. As part of this process, +the firmware informs host about new MU-EDCA values utilizing +WMI_MUEDCA_PARAMS_CONFIG_EVENTID. FW expectation is that host will +update MU-EDCA parameters in the Beacon IE. +Implementation consists of: + (1) Receiving updated parameters through event in ATH11k + (2) Passing updated parameters ATH11k -> mac80211 -> cfg80211 + (3) Passing updated parameters to user space. + +Signed-off-by: Muna Sinada +--- + drivers/net/wireless/ath/ath11k/wmi.c | 97 +++++++++++++++++++++++++++++++---- + drivers/net/wireless/ath/ath11k/wmi.h | 12 +++++ + include/net/cfg80211.h | 11 ++++ + include/net/mac80211.h | 13 +++++ + include/uapi/linux/nl80211.h | 10 ++++ + net/mac80211/mlme.c | 12 +++++ + net/mac80211/trace.h | 20 ++++++++ + net/wireless/nl80211.c | 36 +++++++++++++ + 8 files changed, 200 insertions(+), 11 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -148,6 +148,8 @@ static const struct wmi_tlv_policy wmi_t + .min_len = sizeof(struct wmi_vdev_delete_resp_event) }, + [WMI_TAG_OBSS_COLOR_COLLISION_EVT] = { + .min_len = sizeof(struct wmi_obss_color_collision_event) }, ++ [WMI_TAG_MUEDCA_PARAMS_CONFIG_EVENT] = { ++ .min_len = sizeof(struct wmi_pdev_update_muedca_event) }, + [WMI_TAG_11D_NEW_COUNTRY_EVENT] = { + .min_len = sizeof(struct wmi_11d_new_cc_ev) }, + [WMI_TAG_PER_CHAIN_RSSI_STATS] = { +@@ -8727,6 +8729,74 @@ exit: + kfree(tb); + } + ++static void ++ath11k_wmi_pdev_update_muedca_params_status_event(struct ath11k_base *ab, ++ struct sk_buff *skb) ++{ ++ const void **tb; ++ const struct wmi_pdev_update_muedca_event *ev; ++ struct ieee80211_mu_edca_param_set *params; ++ struct ath11k *ar; ++ int ret; ++ ++ tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); ++ if (IS_ERR(tb)) { ++ ret = PTR_ERR(tb); ++ ath11k_warn(ab, "failed to parse tlv: %d\n", ret); ++ return; ++ } ++ ++ ev = tb[WMI_TAG_MUEDCA_PARAMS_CONFIG_EVENT]; ++ if (!ev) { ++ ath11k_warn(ab, "failed to fetch pdev update muedca params ev"); ++ goto exit; ++ } ++ ++ ath11k_dbg(ab, ATH11K_DBG_WMI, ++ "Update MU-EDCA parameters for pdev:%d\n", ev->pdev_id); ++ ++ ar = ath11k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); ++ if (!ar) { ++ ath11k_warn(ab, ++ "MU-EDCA parameter change in invalid pdev %d\n", ++ ev->pdev_id); ++ goto exit; ++ } ++ ++ params = kzalloc(sizeof(*params), GFP_ATOMIC); ++ if (!params) { ++ ath11k_warn(ab, ++ "Failed to allocate memory for updated MU-EDCA Parameters"); ++ goto exit; ++ } ++ ++ params->ac_be.aifsn = ev->aifsn[0]; ++ params->ac_be.ecw_min_max = ((0xF & ev->ecwmax[0]) << 4) | ++ (0xF & ev->ecwmin[0]); ++ params->ac_be.mu_edca_timer = ev->muedca_expiration_time[0]; ++ ++ params->ac_bk.aifsn = ev->aifsn[1]; ++ params->ac_bk.ecw_min_max = ((0xF & ev->ecwmax[1]) << 4) | ++ (0xF & ev->ecwmin[1]); ++ params->ac_bk.mu_edca_timer = ev->muedca_expiration_time[1]; ++ ++ params->ac_vi.aifsn = ev->aifsn[2]; ++ params->ac_vi.ecw_min_max = ((0xF & ev->ecwmax[2]) << 4) | ++ (0xF & ev->ecwmin[2]); ++ params->ac_vi.mu_edca_timer = ev->muedca_expiration_time[2]; ++ ++ params->ac_vo.aifsn = ev->aifsn[3]; ++ params->ac_vo.ecw_min_max = ((0xF & ev->ecwmax[3]) << 4) | ++ (0xF & ev->ecwmin[3]); ++ params->ac_vo.mu_edca_timer = ev->muedca_expiration_time[3]; ++ ++ ieee80211_update_muedca_params(ar->hw, params, GFP_ATOMIC); ++ ++ kfree(params); ++exit: ++ kfree(tb); ++} ++ + static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) + { + struct wmi_cmd_hdr *cmd_hdr; +@@ -8845,6 +8915,9 @@ static void ath11k_wmi_tlv_op_rx(struct + case WMI_11D_NEW_COUNTRY_EVENTID: + ath11k_reg_11d_new_cc_event(ab, skb); + break; ++ case WMI_MUEDCA_PARAMS_CONFIG_EVENTID: ++ ath11k_wmi_pdev_update_muedca_params_status_event(ab, skb); ++ break; + case WMI_DIAG_EVENTID: + ath11k_wmi_diag_event(ab, skb); + break; +--- a/drivers/net/wireless/ath/ath11k/wmi.h ++++ b/drivers/net/wireless/ath/ath11k/wmi.h +@@ -759,6 +759,7 @@ enum wmi_tlv_event_id { + WMI_READ_DATA_FROM_FLASH_EVENTID, + WMI_REPORT_RX_AGGR_FAILURE_EVENTID, + WMI_PKGID_EVENTID, ++ WMI_MUEDCA_PARAMS_CONFIG_EVENTID = 0x1d01e, + WMI_GPIO_INPUT_EVENTID = WMI_TLV_CMD(WMI_GRP_GPIO), + WMI_UPLOADH_EVENTID, + WMI_CAPTUREH_EVENTID, +@@ -1869,6 +1870,7 @@ enum wmi_tlv_tag { + WMI_TAG_NDP_EVENT, + WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD = 0x301, + WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO, ++ WMI_TAG_MUEDCA_PARAMS_CONFIG_EVENT = 0x32a, + WMI_TAG_FILS_DISCOVERY_TMPL_CMD = 0x344, + WMI_TAG_PDEV_SRG_BSS_COLOR_BITMAP_CMD = 0x37b, + WMI_TAG_PDEV_SRG_PARTIAL_BSSID_BITMAP_CMD, +@@ -4868,6 +4870,16 @@ struct wmi_pdev_temperature_event { + u32 pdev_id; + } __packed; + ++#define WMI_AC_MAX 4 ++ ++struct wmi_pdev_update_muedca_event { ++ u32 pdev_id; ++ u32 aifsn[WMI_AC_MAX]; ++ u32 ecwmin[WMI_AC_MAX]; ++ u32 ecwmax[WMI_AC_MAX]; ++ u32 muedca_expiration_time[WMI_AC_MAX]; ++} __packed; ++ + #define WMI_RX_STATUS_OK 0x00 + #define WMI_RX_STATUS_ERR_CRC 0x01 + #define WMI_RX_STATUS_ERR_DECRYPT 0x08 From d23b0dc92c737c30fda9653ec090994f2491a756 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Tue, 27 Feb 2024 00:46:09 -0500 Subject: [PATCH 63/80] ath11k_nss: refresh patches + cleanup Makefile --- package/kernel/mac80211/Makefile | 9 +++- .../init.d/qca-nss-pbuf => qca-nss-pbuf.init} | 0 .../068-ath11k-add-rx-histogram-stats.patch | 10 ++-- ...080-ath11k-ethernet-rx-decap-offload.patch | 6 +-- ...dma-counter-always-zero-in-peer-stat.patch | 6 +-- ...dma-counter-increamenting-improperly.patch | 6 +-- ...ul-ofdma-ru-allocation-in-peer-stats.patch | 14 +++--- .../113-ath11k-add-8023-undecap-support.patch | 4 +- ...-adding-support-for-mgmt-frame-stats.patch | 20 ++++---- .../188-ath11k-m3-ssr-dump-collection.patch | 2 +- ...91-ath11k-add-mgmt-and-data-ack-rssi.patch | 2 +- ...-ath11k_nss-add-nss-driver-interface.patch | 6 +-- .../199-003-ath11k-add-nss-support.patch | 40 ++++++++-------- ...-ath11k-Add-support-for-dynamic-vlan.patch | 4 +- ...207-ath11k-Enable-256_512MB-profiles.patch | 4 +- ...load-changes-to-NSS-driver-interface.patch | 22 ++++----- ...-support-on-NSS-offload-for-STA-mode.patch | 22 ++++----- ...14-ath11k-qos-null-frame-tx-over-wmi.patch | 46 +++++++++--------- ...pport-for-WDS-offload-in-NSS-offload.patch | 34 ++++++------- ...dev-in-NSS-for-dynamic-VLAN-handling.patch | 12 ++--- ...-dynamic-VLAN-support-in-NSS-offload.patch | 48 +++++++++---------- ...ow-fast-rx-by-bypassing-stats-update.patch | 7 ++- ...ow-fast-rx-by-bypassing-stats-update.patch | 26 +++++----- .../nss/ath11k/244-ath11k-dp-tx-perf.patch | 12 ++--- .../patches/nss/ath11k/270-iphone-issue.patch | 2 +- .../300-ath11k-nss-mesh-offload-support.patch | 18 +++---- .../301-ath11k-nss-mcbc-exception.patch | 32 ++++++------- ...lookup-failure-in-mgmt-tx-completion.patch | 12 ++--- ...e-free-of-peer-rx_tid-during-reo-cmd.patch | 2 +- ...30-ath11k-sync-wds_ast_entry-updates.patch | 10 ++-- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 2 +- ...ing-rx-stats-with-monitor-vif-enable.patch | 8 ++-- ...1k-skip-status-ring-entry-processing.patch | 8 ++-- ...rt-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch | 2 +- ...356-ath11k-invalid-desc-sanity-check.patch | 4 +- ...-fix-clear-peer-keys-during-disassoc.patch | 4 +- ...-fix-tkip-encryption-traffic-failure.patch | 2 +- ...ct-ast-index-assignment-for-wds-peer.patch | 12 ++--- ...Fix-ppdu_id-from-firmware-PPDU-stats.patch | 8 ++-- ...Add-retry-mechanism-for-update_rx_qu.patch | 30 ++++++------ ...treaming-not-working-for-wan-to-wlan.patch | 9 +--- ...-event-handler-support-for-link-desc.patch | 8 ++-- ...th11k-Advertise-TX_QUEUE-mac-hw-flag.patch | 7 +-- ...oid-memset-of-ppdu-info-for-next-skb.patch | 12 ++--- ...support-to-send-the-QoS-Null-Data-fr.patch | 2 +- ...11k-remove-invalid-peer-create-logic.patch | 4 +- ...th11k-rename-ath11k_start_vdev_delay.patch | 4 +- ...ation-of-ath11k_mac_start_vdev_delay.patch | 6 +-- ...ailure-due-to-unexpected-peer-delete.patch | 20 ++++---- ...k-make-debugfs-sta-htt-stats-modular.patch | 8 ++-- .../subsys/007-fix_compilation_issue.patch | 20 ++++---- ...-when-using-encapsulation-offloading.patch | 2 +- .../199-001-mac80211-add-nss-support.patch | 38 +++++++-------- ...t-callback-when-hwencap-enable-in-st.patch | 2 +- ...03-mac80211-ath11k-fw-dynamic-muedca.patch | 20 ++++---- ...-ath11k-Add-support-for-dynamic-vlan.patch | 4 +- ...07-mac80211-add-nss-redirect-support.patch | 10 ++-- ...N-iftype-support-on-NSS-offload-case.patch | 12 ++--- ...-dynamic-VLAN-support-on-NSS-offload.patch | 6 +-- .../nss/subsys/245-compilation_fix.patch | 10 ++-- .../300-ath11k-nss-mesh-offload-support.patch | 40 ++++++++-------- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 6 +-- ...-0005-mac80211-simple-tx-for-AP-mode.patch | 4 +- .../336-mac80211-Mesh-Fast-rx-support.patch | 10 ++-- ...mac80211-fix-unconditional-sta-usage.patch | 4 +- .../345-mac80211-fix-mixed-declaration.patch | 9 +--- ...change-to-40Mhz-during-channel-switc.patch | 7 +-- ...unused-RX_FLAGS-from-mac80211_rx_fla.patch | 6 +-- ...ncapsulation-of-EAPOL-frames-if-OFFL.patch | 30 ++++++------ ...fix-RCU-stall-in-mesh-fast-xmit-path.patch | 6 +-- ...-the-frame-to-driver-tx-ops-directly.patch | 4 +- ...se-HW-checksum-offload-only-for-ethm.patch | 16 +++---- ...1-Add-mac-hw-flag-to-avoid-queue-skb.patch | 38 +++++++-------- .../829-mac80211-fix-mesh-ping-issue.patch | 8 ++-- ...x-memory-corruption-during-mesh-beac.patch | 6 +-- 75 files changed, 450 insertions(+), 466 deletions(-) rename package/kernel/mac80211/files/{etc/init.d/qca-nss-pbuf => qca-nss-pbuf.init} (100%) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 080e07a43c8042..6b36819f75cc4d 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -309,8 +309,6 @@ ifdef CONFIG_ATH11K_NSS_SUPPORT IREMAP_CFLAGS+=-I$(STAGING_DIR)/usr/include/qca-nss-drv -I$(STAGING_DIR)/usr/include/qca-nss-clients endif -NSS_PATCHES:= subsys ath10k ath11k - config-$(CONFIG_PACKAGE_MAC80211_NSS_SUPPORT) += MAC80211_NSS_SUPPORT MAKE_OPTS:= \ @@ -433,6 +431,13 @@ define Build/InstallDev rm -f $(1)/usr/include/mac80211-backport/linux/module.h endef +ifdef CONFIG_ATH11K_NSS_SUPPORT +define KernelPackage/ath11k/install + $(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config + $(INSTALL_BIN) ./files/qca-nss-pbuf.init $(1)/etc/init.d/qca-nss-pbuf + $(INSTALL_BIN) ./files/pbuf.uci $(1)/etc/config/pbuf +endef +endif $(eval $(foreach drv,$(PKG_DRIVERS),$(call KernelPackage,$(drv)))) $(eval $(call KernelPackage,cfg80211)) diff --git a/package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf b/package/kernel/mac80211/files/qca-nss-pbuf.init similarity index 100% rename from package/kernel/mac80211/files/etc/init.d/qca-nss-pbuf rename to package/kernel/mac80211/files/qca-nss-pbuf.init diff --git a/package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch index c4b6d2339deea1..e4ac1ee17b0b2e 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/068-ath11k-add-rx-histogram-stats.patch @@ -269,7 +269,7 @@ Signed-off-by: Manikanta Pubbisetty &fops_htt_peer_stats); --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2756,10 +2756,43 @@ exit: +@@ -2762,10 +2762,43 @@ exit: return total_msdu_reaped; } @@ -313,7 +313,7 @@ Signed-off-by: Manikanta Pubbisetty u32 num_msdu; int i; -@@ -2769,6 +2802,8 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2775,6 +2808,8 @@ static void ath11k_dp_rx_update_peer_sta arsta->rssi_comb = ppdu_info->rssi_comb; ewma_avg_rssi_add(&arsta->avg_rssi, ppdu_info->rssi_comb); @@ -322,7 +322,7 @@ Signed-off-by: Manikanta Pubbisetty num_msdu = ppdu_info->tcp_msdu_count + ppdu_info->tcp_ack_msdu_count + ppdu_info->udp_msdu_count + ppdu_info->other_msdu_count; -@@ -2785,18 +2820,6 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2791,18 +2826,6 @@ static void ath11k_dp_rx_update_peer_sta ppdu_info->tid = IEEE80211_NUM_TIDS; } @@ -341,7 +341,7 @@ Signed-off-by: Manikanta Pubbisetty if (ppdu_info->ldpc < HAL_RX_SU_MU_CODING_MAX) rx_stats->coding_count[ppdu_info->ldpc] += num_msdu; -@@ -2825,8 +2848,6 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2831,8 +2854,6 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->dcm_count += ppdu_info->dcm; rx_stats->ru_alloc_cnt[ppdu_info->ru_alloc] += num_msdu; @@ -350,7 +350,7 @@ Signed-off-by: Manikanta Pubbisetty BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); -@@ -2835,6 +2856,52 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2841,6 +2862,52 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->rx_duration += ppdu_info->rx_duration; arsta->rx_duration = rx_stats->rx_duration; diff --git a/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch index d5e6ec621fcbb3..3334ef52f8ec78 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/080-ath11k-ethernet-rx-decap-offload.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -26,10 +26,10 @@ module_param_named(crypto_mode, ath11k_c +@@ -27,10 +27,10 @@ module_param_named(crypto_mode, ath11k_c MODULE_PARM_DESC(crypto_mode, "crypto mode: 0-hardware, 1-software"); /* frame mode values are mapped as per enum ath11k_hw_txrx_mode */ @@ -11,5 +11,5 @@ - "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)"); + "Datapath frame mode (0: raw, 1: native wifi, 2: ethernet(default))"); - struct ath11k_base *ath11k_soc[MAX_SOCS]; - + bool ath11k_ftm_mode; + module_param_named(ftm_mode, ath11k_ftm_mode, bool, 0444); diff --git a/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch b/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch index 6a96689002eedb..b46a32c09210ea 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/084-ath11k-fix-ul-ofdma-counter-always-zero-in-peer-stat.patch @@ -31,7 +31,7 @@ Signed-off-by: Miles Hu spin_unlock_bh(&ar->ab->base_lock); --- a/drivers/net/wireless/ath/ath11k/hal_rx.c +++ b/drivers/net/wireless/ath/ath11k/hal_rx.c -@@ -1480,6 +1480,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc +@@ -1478,6 +1478,7 @@ ath11k_hal_rx_parse_mon_status_tlv(struc ab->wmi_ab.svc_map); struct hal_rx_phyrx_rssi_legacy_info *rssi = (struct hal_rx_phyrx_rssi_legacy_info *)tlv_data; @@ -39,7 +39,7 @@ Signed-off-by: Miles Hu /* TODO: Please note that the combined rssi will not be accurate * in MU case. Rssi in MU needs to be retrieved from -@@ -1489,6 +1490,22 @@ ath11k_hal_rx_parse_mon_status_tlv(struc +@@ -1487,6 +1488,22 @@ ath11k_hal_rx_parse_mon_status_tlv(struc FIELD_GET(HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB, __le32_to_cpu(rssi->info0)); @@ -64,7 +64,7 @@ Signed-off-by: Miles Hu ppdu_info->rssi_chain_pri20[i] = --- a/drivers/net/wireless/ath/ath11k/hal_rx.h +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h -@@ -408,6 +408,15 @@ struct hal_rx_he_sig_b2_ofdma_info { +@@ -414,6 +414,15 @@ struct hal_rx_he_sig_b2_ofdma_info { #define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB GENMASK(15, 8) diff --git a/package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch b/package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch index 1365bff54c1bbe..52e2509b796c3d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/087-ath11k-fix-ul-ofdma-counter-increamenting-improperly.patch @@ -5,7 +5,7 @@ --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -5376,8 +5376,11 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5451,8 +5451,11 @@ int ath11k_dp_rx_process_mon_status(stru goto next_skb; } @@ -33,7 +33,7 @@ __le32_to_cpu(eu_stats->info7))) - 1; --- a/drivers/net/wireless/ath/ath11k/hal_rx.h +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h -@@ -66,6 +66,7 @@ enum hal_rx_reception_type { +@@ -70,6 +70,7 @@ enum hal_rx_reception_type { }; #define HAL_RX_FCS_LEN 4 @@ -41,7 +41,7 @@ enum hal_rx_mon_status { HAL_RX_MON_STATUS_PPDU_NOT_DONE, -@@ -150,6 +151,7 @@ struct hal_rx_mon_ppdu_info { +@@ -171,6 +172,7 @@ struct hal_rx_mon_ppdu_info { u8 rssi_comb; u8 rssi_chain_pri20[HAL_RX_MAX_NSS]; u16 tid; diff --git a/package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch index c9dc6912d0d185..18477cd5234f1b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/108-ath11k-enable-ul-ofdma-ru-allocation-in-peer-stats.patch @@ -15,7 +15,7 @@ --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2893,11 +2893,12 @@ exit: +@@ -2901,11 +2901,12 @@ exit: static void ath11k_dp_rx_update_peer_rate_table_stats(struct ath11k_rx_peer_stats *rx_stats, struct hal_rx_mon_ppdu_info *ppdu_info, @@ -30,7 +30,7 @@ u32 bw_idx = ppdu_info->bw; u32 gi_idx = ppdu_info->gi; -@@ -2919,10 +2920,13 @@ ath11k_dp_rx_update_peer_rate_table_stat +@@ -2927,10 +2928,13 @@ ath11k_dp_rx_update_peer_rate_table_stat } rx_stats->pkt_stats.rx_rate[rate_idx] += num_msdu; @@ -46,7 +46,7 @@ struct hal_rx_mon_ppdu_info *ppdu_info) { struct ath11k_rx_peer_stats *rx_stats = arsta->rx_stats; -@@ -2980,7 +2984,6 @@ static void ath11k_dp_rx_update_peer_sta +@@ -2988,7 +2992,6 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->num_mpdu_fcs_ok += ppdu_info->num_mpdu_fcs_ok; rx_stats->num_mpdu_fcs_err += ppdu_info->num_mpdu_fcs_err; rx_stats->dcm_count += ppdu_info->dcm; @@ -54,7 +54,7 @@ BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); -@@ -2998,10 +3001,10 @@ static void ath11k_dp_rx_update_peer_sta +@@ -3006,10 +3009,10 @@ static void ath11k_dp_rx_update_peer_sta if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11N && ppdu_info->mcs <= HAL_RX_MAX_MCS_HT) { @@ -69,7 +69,7 @@ } if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AC && -@@ -3034,7 +3037,120 @@ static void ath11k_dp_rx_update_peer_sta +@@ -3042,7 +3045,120 @@ static void ath11k_dp_rx_update_peer_sta rx_stats->byte_stats.bw_count[ppdu_info->bw] += ppdu_info->mpdu_len; } @@ -191,7 +191,7 @@ } -@@ -5372,6 +5488,55 @@ static void ath11k_dp_rx_mon_dest_proces +@@ -5380,6 +5496,55 @@ static void ath11k_dp_rx_mon_dest_proces } } @@ -247,7 +247,7 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, struct napi_struct *napi, int budget) { -@@ -5445,8 +5610,13 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5453,8 +5618,13 @@ int ath11k_dp_rx_process_mon_status(stru if ((ppdu_info->fc_valid) && (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch b/package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch index 0dfdd6a297a7a1..2ba2411c3ef54b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/113-ath11k-add-8023-undecap-support.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2297,6 +2297,42 @@ static void ath11k_dp_rx_h_undecap_eth(s +@@ -2305,6 +2305,42 @@ static void ath11k_dp_rx_h_undecap_eth(s ether_addr_copy(ieee80211_get_SA(hdr), sa); } @@ -43,7 +43,7 @@ static void ath11k_dp_rx_h_undecap(struct ath11k *ar, struct sk_buff *msdu, struct hal_rx_desc *rx_desc, enum hal_encrypt_type enctype, -@@ -2338,7 +2374,8 @@ static void ath11k_dp_rx_h_undecap(struc +@@ -2346,7 +2382,8 @@ static void ath11k_dp_rx_h_undecap(struc enctype, status); break; case DP_RX_DECAP_TYPE_8023: diff --git a/package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch index 9b74a712452d8b..c069cc8ff9f58a 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/142-ath11k-adding-support-for-mgmt-frame-stats.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -312,6 +312,16 @@ struct ath11k_rekey_data { +@@ -314,6 +314,16 @@ struct ath11k_rekey_data { bool enable_offload; }; @@ -17,7 +17,7 @@ struct ath11k_vif { u32 vdev_id; enum wmi_vdev_type vdev_type; -@@ -370,6 +380,8 @@ struct ath11k_vif { +@@ -372,6 +382,8 @@ struct ath11k_vif { #ifdef CPTCFG_ATH11K_DEBUGFS struct dentry *debugfs_twt; #endif /* CPTCFG_ATH11K_DEBUGFS */ @@ -128,7 +128,7 @@ debugfs_create_file("dfs_simulate_radar", 0200, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6151,9 +6151,9 @@ static int ath11k_mac_mgmt_tx(struct ath +@@ -6148,9 +6148,9 @@ static int ath11k_mac_mgmt_tx(struct ath */ if (is_prb_rsp && atomic_read(&ar->num_pending_mgmt_tx) > ATH11K_PRB_RSP_DROP_THRESHOLD) { @@ -140,7 +140,7 @@ } if (skb_queue_len_lockless(q) >= ATH11K_TX_MGMT_NUM_PENDING_MAX) { -@@ -6179,9 +6179,11 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6176,9 +6176,11 @@ static void ath11k_mac_op_tx(struct ieee struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_key_conf *key = info->control.hw_key; @@ -152,7 +152,7 @@ int ret; memset(skb_cb, 0, sizeof(*skb_cb)); -@@ -6195,12 +6197,21 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6192,12 +6194,21 @@ static void ath11k_mac_op_tx(struct ieee if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { skb_cb->flags |= ATH11K_SKB_HW_80211_ENCAP; } else if (ieee80211_is_mgmt(hdr->frame_control)) { @@ -178,7 +178,7 @@ } --- a/drivers/net/wireless/ath/ath11k/peer.c +++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -444,6 +444,7 @@ int ath11k_peer_create(struct ath11k *ar +@@ -458,6 +458,7 @@ int ath11k_peer_create(struct ath11k *ar peer->sec_type = HAL_ENCRYPT_TYPE_OPEN; peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; @@ -198,7 +198,7 @@ int peer_id; --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -5825,6 +5825,12 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5823,6 +5823,12 @@ static int wmi_process_mgmt_tx_comp(stru struct sk_buff *msdu; struct ieee80211_tx_info *info; struct ath11k_skb_cb *skb_cb; @@ -211,7 +211,7 @@ int num_mgmt; spin_lock_bh(&ar->txmgmt_idr_lock); -@@ -5852,6 +5858,31 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5850,6 +5856,31 @@ static int wmi_process_mgmt_tx_comp(stru info->status.ack_signal = tx_compl_param->ack_rssi; } @@ -243,7 +243,7 @@ ieee80211_tx_status_irqsafe(ar->hw, msdu); num_mgmt = atomic_dec_if_positive(&ar->num_pending_mgmt_tx); -@@ -7521,6 +7552,11 @@ static void ath11k_mgmt_rx_event(struct +@@ -7519,6 +7550,11 @@ static void ath11k_mgmt_rx_event(struct struct ieee80211_hdr *hdr; u16 fc; struct ieee80211_supported_band *sband; @@ -255,7 +255,7 @@ if (ath11k_pull_mgmt_rx_params_tlv(ab, skb, &rx_ev) != 0) { ath11k_warn(ab, "failed to extract mgmt rx event"); -@@ -7586,7 +7622,34 @@ static void ath11k_mgmt_rx_event(struct +@@ -7584,7 +7620,34 @@ static void ath11k_mgmt_rx_event(struct hdr = (struct ieee80211_hdr *)skb->data; fc = le16_to_cpu(hdr->frame_control); diff --git a/package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch b/package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch index 47b29fd19e19bb..1fe5317105c137 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/188-ath11k-m3-ssr-dump-collection.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c -@@ -2101,6 +2101,9 @@ static int ath11k_qmi_assign_target_mem_ +@@ -2100,6 +2100,9 @@ static int ath11k_qmi_assign_target_mem_ ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; idx++; break; diff --git a/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch b/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch index 55701c68d08760..22cdb4dccb4d5d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9571,6 +9571,8 @@ static int __ath11k_mac_register(struct +@@ -9579,6 +9579,8 @@ static int __ath11k_mac_register(struct wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); diff --git a/package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch b/package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch index c39580e79e1a43..851e4ed0225a95 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/199-002-ath11k_nss-add-nss-driver-interface.patch @@ -2803,7 +2803,7 @@ Signed-off-by: Sriram R static inline void ath11k_pci_select_window(struct ath11k_pci *ab_pci, u32 offset) { struct ath11k_base *ab = ab_pci->ab; -@@ -708,6 +722,7 @@ static const struct ath11k_hif_ops ath11 +@@ -710,6 +724,7 @@ static const struct ath11k_hif_ops ath11 .map_service_to_pipe = ath11k_pcic_map_service_to_pipe, .ce_irq_enable = ath11k_pci_hif_ce_irq_enable, .ce_irq_disable = ath11k_pci_hif_ce_irq_disable, @@ -2845,7 +2845,7 @@ Signed-off-by: Sriram R enum hal_pn_type pn_type) --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -1166,6 +1166,44 @@ int ath11k_wmi_send_pdev_set_regdomain(s +@@ -1164,6 +1164,44 @@ int ath11k_wmi_send_pdev_set_regdomain(s return ret; } @@ -2995,7 +2995,7 @@ Signed-off-by: Sriram R int ath11k_dp_pdev_reo_setup(struct ath11k_base *ab); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6370,6 +6370,16 @@ static int ath11k_mac_op_start(struct ie +@@ -6367,6 +6367,16 @@ static int ath11k_mac_op_start(struct ie goto err; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch b/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch index 2f043fd65c86b9..2234cb6bc4cc1d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch @@ -357,7 +357,7 @@ Signed-off-by: Sriram R if (ar->ab->hw_params.rxdma1_enable) { rx_ring = &dp->rxdma_mon_buf_ring; -@@ -2029,7 +2032,7 @@ static void ath11k_dp_rx_h_csum_offload( +@@ -2035,7 +2038,7 @@ static void ath11k_dp_rx_h_csum_offload( CHECKSUM_NONE : CHECKSUM_UNNECESSARY; } @@ -366,7 +366,7 @@ Signed-off-by: Sriram R enum hal_encrypt_type enctype) { switch (enctype) { -@@ -2056,7 +2059,7 @@ static int ath11k_dp_rx_crypto_mic_len(s +@@ -2062,7 +2065,7 @@ static int ath11k_dp_rx_crypto_mic_len(s return 0; } @@ -375,7 +375,7 @@ Signed-off-by: Sriram R enum hal_encrypt_type enctype) { switch (enctype) { -@@ -2084,7 +2087,7 @@ static int ath11k_dp_rx_crypto_param_len +@@ -2090,7 +2093,7 @@ static int ath11k_dp_rx_crypto_param_len return 0; } @@ -384,7 +384,7 @@ Signed-off-by: Sriram R enum hal_encrypt_type enctype) { switch (enctype) { -@@ -2820,6 +2823,22 @@ static void ath11k_dp_rx_process_receive +@@ -2826,6 +2829,22 @@ static void ath11k_dp_rx_process_receive } } @@ -407,7 +407,7 @@ Signed-off-by: Sriram R int ath11k_dp_process_rx(struct ath11k_base *ab, int ring_id, struct napi_struct *napi, int budget) { -@@ -3127,6 +3146,13 @@ static void ath11k_dp_rx_update_user_sta +@@ -3133,6 +3152,13 @@ static void ath11k_dp_rx_update_user_sta arsta = (struct ath11k_sta *)peer->sta->drv_priv; rx_stats = arsta->rx_stats; @@ -421,7 +421,7 @@ Signed-off-by: Sriram R if (!rx_stats) return; -@@ -3203,8 +3229,10 @@ static void ath11k_dp_rx_update_peer_mu_ +@@ -3209,8 +3235,10 @@ static void ath11k_dp_rx_update_peer_mu_ { u32 num_users, i; @@ -433,7 +433,7 @@ Signed-off-by: Sriram R num_users = ppdu_info->num_users; if (num_users > HAL_MAX_UL_MU_USERS) -@@ -5607,7 +5635,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5613,7 +5641,7 @@ int ath11k_dp_rx_process_mon_status(stru struct sk_buff *skb; struct sk_buff_head skb_list; struct ath11k_peer *peer; @@ -442,7 +442,7 @@ Signed-off-by: Sriram R int num_buffs_reaped = 0; u32 rx_buf_sz; u16 log_type; -@@ -5675,6 +5703,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5681,6 +5709,7 @@ int ath11k_dp_rx_process_mon_status(stru if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { arsta = (struct ath11k_sta *)peer->sta->drv_priv; ath11k_dp_rx_update_peer_su_stats(arsta, ppdu_info); @@ -623,7 +623,7 @@ Signed-off-by: Sriram R exit: mutex_unlock(&ar->conf_mutex); return ret; -@@ -6219,10 +6282,14 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6216,10 +6279,14 @@ static void ath11k_mac_op_tx(struct ieee if (control->sta) arsta = ath11k_sta_to_arsta(control->sta); @@ -639,7 +639,7 @@ Signed-off-by: Sriram R } } -@@ -6244,6 +6311,8 @@ static int ath11k_mac_config_mon_status_ +@@ -6241,6 +6308,8 @@ static int ath11k_mac_config_mon_status_ if (enable) { tlv_filter = ath11k_mac_mon_status_filter_default; @@ -648,7 +648,7 @@ Signed-off-by: Sriram R if (ath11k_debugfs_rx_filter(ar)) tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); } -@@ -6542,7 +6611,7 @@ static int ath11k_mac_setup_vdev_create_ +@@ -6539,7 +6608,7 @@ static int ath11k_mac_setup_vdev_create_ return 0; } @@ -657,7 +657,7 @@ Signed-off-by: Sriram R struct ieee80211_vif *vif) { struct ath11k *ar = hw->priv; -@@ -6588,6 +6657,8 @@ static void ath11k_mac_op_update_vif_off +@@ -6585,6 +6654,8 @@ static void ath11k_mac_op_update_vif_off arvif->vdev_id, ret); vif->offload_flags &= ~IEEE80211_OFFLOAD_DECAP_ENABLED; } @@ -666,7 +666,7 @@ Signed-off-by: Sriram R } static bool ath11k_mac_vif_ap_active_any(struct ath11k_base *ab) -@@ -6718,6 +6789,8 @@ static int ath11k_mac_vdev_delete(struct +@@ -6715,6 +6786,8 @@ static int ath11k_mac_vdev_delete(struct reinit_completion(&ar->vdev_delete_done); @@ -675,7 +675,7 @@ Signed-off-by: Sriram R ret = ath11k_wmi_vdev_delete(ar, arvif->vdev_id); if (ret) { ath11k_warn(ar->ab, "failed to delete WMI vdev %d: %d\n", -@@ -6858,7 +6931,34 @@ static int ath11k_mac_op_add_interface(s +@@ -6855,7 +6928,34 @@ static int ath11k_mac_op_add_interface(s list_add(&arvif->list, &ar->arvifs); spin_unlock_bh(&ar->data_lock); @@ -711,7 +711,7 @@ Signed-off-by: Sriram R nss = get_num_chains(ar->cfg_tx_chainmask) ? : 1; ret = ath11k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, -@@ -6982,6 +7082,7 @@ err_peer_del: +@@ -6979,6 +7079,7 @@ err_peer_del: } err_vdev_del: @@ -719,7 +719,7 @@ Signed-off-by: Sriram R ath11k_mac_vdev_delete(ar, arvif); spin_lock_bh(&ar->data_lock); list_del(&arvif->list); -@@ -7492,6 +7593,10 @@ ath11k_mac_update_vif_chan(struct ath11k +@@ -7489,6 +7590,10 @@ ath11k_mac_update_vif_chan(struct ath11k arvif->vdev_id, ret); continue; } @@ -730,7 +730,7 @@ Signed-off-by: Sriram R } /* Restart the internal monitor vdev on new channel */ -@@ -8720,6 +8825,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8717,6 +8822,8 @@ static void ath11k_mac_op_sta_statistics sinfo->signal_avg = ewma_avg_rssi_read(&arsta->avg_rssi) + ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); @@ -739,7 +739,7 @@ Signed-off-by: Sriram R } #if IS_ENABLED(CONFIG_IPV6) -@@ -9139,6 +9246,7 @@ static const struct ieee80211_ops ath11k +@@ -9144,6 +9251,7 @@ static const struct ieee80211_ops ath11k .update_vif_offload = ath11k_mac_op_update_vif_offload, .config = ath11k_mac_op_config, .bss_info_changed = ath11k_mac_op_bss_info_changed, @@ -747,7 +747,7 @@ Signed-off-by: Sriram R .configure_filter = ath11k_mac_op_configure_filter, .hw_scan = ath11k_mac_op_hw_scan, .cancel_hw_scan = ath11k_mac_op_cancel_hw_scan, -@@ -9524,7 +9632,8 @@ static int __ath11k_mac_register(struct +@@ -9529,7 +9637,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW); ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER); ieee80211_hw_set(ar->hw, SUPPORTS_AMSDU_IN_AMPDU); @@ -757,7 +757,7 @@ Signed-off-by: Sriram R } ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; -@@ -9637,6 +9746,9 @@ static int __ath11k_mac_register(struct +@@ -9644,6 +9753,9 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; diff --git a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch index d90c39c77c9a4f..54a6d1528422db 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -21,7 +21,7 @@ Signed-off-by: Seevalamuthu Mariappan --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -117,6 +117,7 @@ struct ath11k_skb_cb { +@@ -119,6 +119,7 @@ struct ath11k_skb_cb { u32 cipher; struct ath11k *ar; struct ieee80211_vif *vif; @@ -369,7 +369,7 @@ Signed-off-by: Seevalamuthu Mariappan int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9763,6 +9763,9 @@ static int __ath11k_mac_register(struct +@@ -9770,6 +9770,9 @@ static int __ath11k_mac_register(struct */ ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); diff --git a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch index d18b213cf27607..d89b500015fc33 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch @@ -246,8 +246,8 @@ Signed-off-by: Ramya Gnanasekar { .hw_rev = ATH11K_HW_IPQ6018_HW10, @@ -177,7 +180,7 @@ static struct ath11k_hw_params ath11k_hw - .coldboot_cal_mm = true, - .coldboot_cal_ftm = true, + .coldboot_cal_mm = false, + .coldboot_cal_ftm = false, .cbcal_restart_fw = true, - .fw_mem_mode = 0, + .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, diff --git a/package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch b/package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch index 0d2de0ae895d6f..a470ba934507f1 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/211-001-ath11k-add-WDS-offload-changes-to-NSS-driver-interface.patch @@ -13,7 +13,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -306,6 +306,22 @@ void ath11k_nss_wifili_event_receive(str +@@ -307,6 +307,22 @@ void ath11k_nss_wifili_event_receive(str case NSS_WIFILI_TID_REOQ_SETUP_MSG: /* TODO setup tidq */ break; @@ -36,7 +36,7 @@ Signed-off-by: Sathishkumar Muruganandam default: ath11k_dbg(ab, ATH11K_DBG_NSS, "unhandled event %d\n", msg_type); break; -@@ -416,13 +432,6 @@ static void ath11k_nss_vdev_event_receiv +@@ -417,13 +433,6 @@ static void ath11k_nss_vdev_event_receiv /*TODO*/ } @@ -50,7 +50,7 @@ Signed-off-by: Sathishkumar Muruganandam /* TODO: move to mac80211 after cleanups/refactoring required after feature completion */ static int ath11k_nss_deliver_rx(struct ieee80211_vif *vif, struct sk_buff *skb, bool eth, int data_offs, struct napi_struct *napi) -@@ -546,11 +555,239 @@ static int ath11k_nss_undecap_nwifi(stru +@@ -547,11 +556,239 @@ static int ath11k_nss_undecap_nwifi(stru return 0; } @@ -291,7 +291,7 @@ Signed-off-by: Sathishkumar Muruganandam struct wireless_dev *wdev = NULL; struct ieee80211_vif *vif = NULL; struct ath11k_vif *arvif; -@@ -590,28 +827,16 @@ ath11k_nss_vdev_data_receive(struct net_ +@@ -591,28 +828,16 @@ ath11k_nss_vdev_data_receive(struct net_ ath11k_dbg_dump(ab, ATH11K_DBG_DP_RX, "", "dp rx msdu from nss: ", skb->data, skb->len); @@ -327,7 +327,7 @@ Signed-off-by: Sathishkumar Muruganandam dev_kfree_skb_any(skb); return; } -@@ -1320,7 +1545,7 @@ void ath11k_nss_update_sta_rxrate(struct +@@ -1321,7 +1546,7 @@ void ath11k_nss_update_sta_rxrate(struct peer->nss.nss_stats->rxrate.bw = ath11k_mac_bw_to_mac80211_bw(ppdu_info->bw); } @@ -336,7 +336,7 @@ Signed-off-by: Sathishkumar Muruganandam { struct nss_wifili_peer_msg *peer_msg; struct nss_wifili_msg *wlmsg = NULL; -@@ -1334,9 +1559,10 @@ int ath11k_nss_peer_delete(struct ath11k +@@ -1335,9 +1560,10 @@ int ath11k_nss_peer_delete(struct ath11k spin_lock_bh(&ab->base_lock); @@ -349,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam spin_unlock_bh(&ab->base_lock); return -EINVAL; } -@@ -1409,8 +1635,9 @@ free_peer: +@@ -1410,8 +1636,9 @@ free_peer: return ret; } @@ -360,7 +360,7 @@ Signed-off-by: Sathishkumar Muruganandam struct nss_wifili_peer_msg *peer_msg; struct nss_wifili_msg *wlmsg = NULL; nss_wifili_msg_callback_t msg_cb; -@@ -1467,17 +1694,23 @@ int ath11k_nss_peer_create(struct ath11k +@@ -1468,17 +1695,23 @@ int ath11k_nss_peer_create(struct ath11k status = nss_wifili_tx_msg(ab->nss.ctx, wlmsg); if (status != NSS_TX_SUCCESS) { ret = -EINVAL; @@ -387,7 +387,7 @@ Signed-off-by: Sathishkumar Muruganandam peer->nss.nss_stats = kzalloc(sizeof(*peer->nss.nss_stats), GFP_ATOMIC); if (!peer->nss.nss_stats) { ret = -ENOMEM; -@@ -1496,6 +1729,199 @@ msg_free: +@@ -1497,6 +1730,199 @@ msg_free: return ret; } @@ -587,7 +587,7 @@ Signed-off-by: Sathishkumar Muruganandam /*-------------------------------INIT/DEINIT---------------------------------*/ static int ath11k_nss_radio_buf_cfg(struct ath11k *ar, int range, int buf_sz) -@@ -1886,7 +2312,7 @@ static int ath11k_nss_init(struct ath11k +@@ -1890,7 +2316,7 @@ static int ath11k_nss_init(struct ath11k status = nss_wifili_tx_msg(nss_contex, wlmsg); if (status != NSS_TX_SUCCESS) { @@ -596,7 +596,7 @@ Signed-off-by: Sathishkumar Muruganandam goto unregister; } -@@ -1940,7 +2366,8 @@ static int ath11k_nss_stats_cfg(struct a +@@ -1944,7 +2370,8 @@ static int ath11k_nss_stats_cfg(struct a status = nss_wifili_tx_msg(ar->nss.ctx, wlmsg); if (status != NSS_TX_SUCCESS) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch b/package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch index 016ace4edd7501..8ad2cc71f8981d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/211-002-ath11k-add-WDS-offload-support-on-NSS-offload-for-STA-mode.patch @@ -34,7 +34,7 @@ Signed-off-by: Sathishkumar Muruganandam #endif struct ath11k_pdev_dp dp; u8 mac_addr[ETH_ALEN]; -@@ -1042,6 +1043,9 @@ struct ath11k_base { +@@ -1047,6 +1048,9 @@ struct ath11k_base { } testmode; #endif @@ -67,7 +67,7 @@ Signed-off-by: Sathishkumar Muruganandam struct htt_resp_msg { --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1849,6 +1849,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -1857,6 +1857,8 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s u16 peer_mac_h16; u16 ast_hash; u16 hw_peer_id; @@ -76,7 +76,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_DP_HTT, "dp_htt rx msg type :0x%0x\n", type); -@@ -1884,15 +1886,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -1892,15 +1894,29 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s resp->peer_map_ev.info2); hw_peer_id = FIELD_GET(HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID, resp->peer_map_ev.info1); @@ -776,7 +776,7 @@ Signed-off-by: Sathishkumar Muruganandam #endif /* _PEER_H_ */ --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -154,6 +154,8 @@ static const struct wmi_tlv_policy wmi_t +@@ -156,6 +156,8 @@ static const struct wmi_tlv_policy wmi_t .min_len = sizeof(struct wmi_per_chain_rssi_stats) }, [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = { .min_len = sizeof(struct wmi_twt_add_dialog_event) }, @@ -837,7 +837,7 @@ Signed-off-by: Sathishkumar Muruganandam int ath11k_wmi_send_pdev_set_regdomain(struct ath11k *ar, struct pdev_set_regdomain_params *param) { -@@ -6362,6 +6409,36 @@ static int ath11k_pull_peer_assoc_conf_e +@@ -6363,6 +6410,36 @@ static int ath11k_pull_peer_assoc_conf_e return 0; } @@ -874,7 +874,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_wmi_pull_pdev_stats_base(const struct wmi_pdev_stats_base *src, struct ath11k_fw_stats_pdev *dst) { -@@ -7277,6 +7354,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru +@@ -7278,6 +7355,7 @@ static int ath11k_wmi_tlv_rdy_parse(stru ether_addr_copy(ab->mac_addr, fixed_param.ready_event_min.mac_addr.addr); @@ -882,7 +882,7 @@ Signed-off-by: Sathishkumar Muruganandam ab->pktlog_defs_checksum = fixed_param.pktlog_defs_checksum; break; case WMI_TAG_ARRAY_FIXED_STRUCT: -@@ -8717,6 +8795,22 @@ static void ath11k_wmi_gtk_offload_statu +@@ -8797,6 +8875,22 @@ exit: kfree(tb); } @@ -905,7 +905,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) { struct wmi_cmd_hdr *cmd_hdr; -@@ -8844,6 +8938,9 @@ static void ath11k_wmi_tlv_op_rx(struct +@@ -8927,6 +9021,9 @@ static void ath11k_wmi_tlv_op_rx(struct case WMI_GTK_OFFLOAD_STATUS_EVENTID: ath11k_wmi_gtk_offload_status_event(ab, skb); break; @@ -917,7 +917,7 @@ Signed-off-by: Sathishkumar Muruganandam break; --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -3009,6 +3009,21 @@ struct wmi_peer_delete_cmd { +@@ -3011,6 +3011,21 @@ struct wmi_peer_delete_cmd { struct wmi_mac_addr peer_macaddr; } __packed; @@ -939,7 +939,7 @@ Signed-off-by: Sathishkumar Muruganandam struct wmi_peer_reorder_queue_setup_cmd { u32 tlv_header; u32 vdev_id; -@@ -4611,6 +4626,21 @@ struct wmi_probe_resp_tx_status_event { +@@ -4613,6 +4628,21 @@ struct wmi_probe_resp_tx_status_event { u32 tx_status; } __packed; @@ -961,7 +961,7 @@ Signed-off-by: Sathishkumar Muruganandam /* * PDEV statistics */ -@@ -6400,6 +6430,9 @@ int ath11k_wmi_set_sta_ps_param(struct a +@@ -6412,6 +6442,9 @@ int ath11k_wmi_set_sta_ps_param(struct a int ath11k_wmi_force_fw_hang_cmd(struct ath11k *ar, u32 type, u32 delay_time_ms); int ath11k_wmi_send_peer_delete_cmd(struct ath11k *ar, const u8 *peer_addr, u8 vdev_id); diff --git a/package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch b/package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch index 59816b1883be1d..5f31f4ded2358c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/214-ath11k-qos-null-frame-tx-over-wmi.patch @@ -22,7 +22,7 @@ Signed-off-by: Sowmiya Sree Elavalagan --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6132,6 +6132,16 @@ static int ath11k_mac_mgmt_tx_wmi(struct +@@ -6129,6 +6129,16 @@ static int ath11k_mac_mgmt_tx_wmi(struct ATH11K_SKB_CB(skb)->paddr = paddr; @@ -39,7 +39,7 @@ Signed-off-by: Sowmiya Sree Elavalagan ret = ath11k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb); if (ret) { ath11k_warn(ar->ab, "failed to send mgmt frame: %d\n", ret); -@@ -6199,8 +6209,8 @@ static void ath11k_mgmt_over_wmi_tx_work +@@ -6196,8 +6206,8 @@ static void ath11k_mgmt_over_wmi_tx_work } } @@ -50,7 +50,7 @@ Signed-off-by: Sowmiya Sree Elavalagan { struct sk_buff_head *q = &ar->wmi_mgmt_tx_queue; -@@ -6262,7 +6272,7 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6259,7 +6269,7 @@ static void ath11k_mac_op_tx(struct ieee } else if (ieee80211_is_mgmt(hdr->frame_control)) { frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control); @@ -59,7 +59,7 @@ Signed-off-by: Sowmiya Sree Elavalagan if (ret) { if (ret != -EBUSY) ath11k_warn(ar->ab, "failed to queue management frame %d\n", -@@ -6277,6 +6287,20 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6274,6 +6284,20 @@ static void ath11k_mac_op_tx(struct ieee spin_unlock_bh(&ar->data_lock); } return; @@ -91,7 +91,7 @@ Signed-off-by: Sowmiya Sree Elavalagan [WMI_TAG_SCAN_EVENT] = { .min_len = sizeof(struct wmi_scan_event) }, [WMI_TAG_PEER_STA_KICKOUT_EVENT] -@@ -699,6 +699,55 @@ int ath11k_wmi_mgmt_send(struct ath11k * +@@ -701,6 +701,55 @@ int ath11k_wmi_mgmt_send(struct ath11k * return ret; } @@ -147,7 +147,7 @@ Signed-off-by: Sowmiya Sree Elavalagan int ath11k_wmi_vdev_create(struct ath11k *ar, u8 *macaddr, struct vdev_create_params *param) { -@@ -5857,8 +5906,8 @@ static int ath11k_pull_mgmt_rx_params_tl +@@ -5905,8 +5954,8 @@ static int ath11k_pull_mgmt_rx_params_tl return 0; } @@ -158,7 +158,7 @@ Signed-off-by: Sowmiya Sree Elavalagan { struct sk_buff *msdu; struct ieee80211_tx_info *info; -@@ -5896,6 +5945,11 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5944,6 +5993,11 @@ static int wmi_process_mgmt_tx_comp(stru info->status.ack_signal = tx_compl_param->ack_rssi; } @@ -170,7 +170,7 @@ Signed-off-by: Sowmiya Sree Elavalagan hdr = (struct ieee80211_hdr *)msdu->data; frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); -@@ -5914,10 +5968,13 @@ static int wmi_process_mgmt_tx_comp(stru +@@ -5962,10 +6016,13 @@ static int wmi_process_mgmt_tx_comp(stru arvif = ath11k_vif_to_arvif(vif); mgmt_stats = &arvif->mgmt_stats; @@ -188,7 +188,7 @@ Signed-off-by: Sowmiya Sree Elavalagan spin_unlock_bh(&ar->data_lock); skip_mgmt_stats: -@@ -5939,12 +5996,13 @@ skip_mgmt_stats: +@@ -5987,12 +6044,13 @@ skip_mgmt_stats: return 0; } @@ -206,7 +206,7 @@ Signed-off-by: Sowmiya Sree Elavalagan int ret; tb = ath11k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); -@@ -5954,7 +6012,7 @@ static int ath11k_pull_mgmt_tx_compl_par +@@ -6002,7 +6060,7 @@ static int ath11k_pull_mgmt_tx_compl_par return ret; } @@ -215,7 +215,7 @@ Signed-off-by: Sowmiya Sree Elavalagan if (!ev) { ath11k_warn(ab, "failed to fetch mgmt tx compl ev"); kfree(tb); -@@ -7731,10 +7789,11 @@ exit: +@@ -7810,10 +7868,11 @@ exit: static void ath11k_mgmt_tx_compl_event(struct ath11k_base *ab, struct sk_buff *skb) { @@ -229,7 +229,7 @@ Signed-off-by: Sowmiya Sree Elavalagan ath11k_warn(ab, "failed to extract mgmt tx compl event"); return; } -@@ -7747,7 +7806,7 @@ static void ath11k_mgmt_tx_compl_event(s +@@ -7826,7 +7885,7 @@ static void ath11k_mgmt_tx_compl_event(s goto exit; } @@ -238,7 +238,7 @@ Signed-off-by: Sowmiya Sree Elavalagan ath11k_dbg(ab, ATH11K_DBG_MGMT, "event mgmt tx compl ev pdev_id %d, desc_id %d, status %d ack_rssi %d", -@@ -7758,6 +7817,36 @@ exit: +@@ -7837,6 +7896,36 @@ exit: rcu_read_unlock(); } @@ -275,9 +275,9 @@ Signed-off-by: Sowmiya Sree Elavalagan static struct ath11k *ath11k_get_ar_on_scan_state(struct ath11k_base *ab, u32 vdev_id, enum ath11k_scan_state state) -@@ -8844,6 +8933,10 @@ static void ath11k_wmi_tlv_op_rx(struct - case WMI_GTK_OFFLOAD_STATUS_EVENTID: - ath11k_wmi_gtk_offload_status_event(ab, skb); +@@ -9024,6 +9113,10 @@ static void ath11k_wmi_tlv_op_rx(struct + case WMI_WDS_PEER_EVENTID: + ath11k_wmi_wds_peer_event(ab, skb); break; + case WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID: + ath11k_qos_null_compl_event(ab, skb); @@ -305,7 +305,7 @@ Signed-off-by: Sowmiya Sree Elavalagan WMI_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_CMD(WMI_GRP_BA_NEG), WMI_TX_ADDBA_COMPLETE_EVENTID, WMI_BA_RSP_SSN_EVENTID, -@@ -1878,6 +1881,9 @@ enum wmi_tlv_tag { +@@ -1880,6 +1883,9 @@ enum wmi_tlv_tag { WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD, WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9, WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT, @@ -315,7 +315,7 @@ Signed-off-by: Sowmiya Sree Elavalagan WMI_TAG_PDEV_SET_BIOS_SAR_TABLE_CMD = 0x3D8, WMI_TAG_PDEV_SET_BIOS_GEO_TABLE_CMD, WMI_TAG_MAX -@@ -2107,7 +2113,17 @@ enum wmi_tlv_service { +@@ -2109,7 +2115,17 @@ enum wmi_tlv_service { WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246, WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253, @@ -333,7 +333,7 @@ Signed-off-by: Sowmiya Sree Elavalagan /* The second 128 bits */ WMI_MAX_EXT_SERVICE = 256, -@@ -3814,6 +3830,7 @@ struct wmi_scan_prob_req_oui_cmd { +@@ -3831,6 +3847,7 @@ struct wmi_scan_prob_req_oui_cmd { } __packed; #define WMI_MGMT_SEND_DOWNLD_LEN 64 @@ -341,7 +341,7 @@ Signed-off-by: Sowmiya Sree Elavalagan #define WMI_TX_PARAMS_DWORD0_POWER GENMASK(7, 0) #define WMI_TX_PARAMS_DWORD0_MCS_MASK GENMASK(19, 8) -@@ -3824,9 +3841,10 @@ struct wmi_scan_prob_req_oui_cmd { +@@ -3841,9 +3858,10 @@ struct wmi_scan_prob_req_oui_cmd { #define WMI_TX_PARAMS_DWORD1_BW_MASK GENMASK(14, 8) #define WMI_TX_PARAMS_DWORD1_PREAMBLE_TYPE GENMASK(19, 15) #define WMI_TX_PARAMS_DWORD1_FRAME_TYPE BIT(20) @@ -354,7 +354,7 @@ Signed-off-by: Sowmiya Sree Elavalagan u32 tlv_header; u32 tx_params_dword0; u32 tx_params_dword1; -@@ -4917,7 +4935,7 @@ struct wmi_rssi_ctl_ext { +@@ -4959,7 +4977,7 @@ struct wmi_rssi_ctl_ext { u32 rssi_ctl_ext[MAX_ANTENNA_EIGHT - ATH_MAX_ANTENNA]; }; @@ -363,7 +363,7 @@ Signed-off-by: Sowmiya Sree Elavalagan u32 desc_id; u32 status; u32 pdev_id; -@@ -5748,6 +5766,17 @@ struct wmi_debug_log_config_cmd_fixed_pa +@@ -5790,6 +5808,17 @@ struct wmi_debug_log_config_cmd_fixed_pa u32 value; } __packed; @@ -381,7 +381,7 @@ Signed-off-by: Sowmiya Sree Elavalagan #define WMI_MAX_MEM_REQS 32 #define MAX_RADIOS 3 -@@ -6358,6 +6387,8 @@ int ath11k_wmi_cmd_send(struct ath11k_pd +@@ -6400,6 +6429,8 @@ int ath11k_wmi_cmd_send(struct ath11k_pd struct sk_buff *ath11k_wmi_alloc_skb(struct ath11k_wmi_base *wmi_sc, u32 len); int ath11k_wmi_mgmt_send(struct ath11k *ar, u32 vdev_id, u32 buf_id, struct sk_buff *frame); diff --git a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch index 429b781199f132..729ee80199b9a2 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -43,7 +43,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif_iter { --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4748,6 +4748,11 @@ static void ath11k_sta_rc_update_wk(stru +@@ -4744,6 +4744,11 @@ static void ath11k_sta_rc_update_wk(stru arvif = arsta->arvif; ar = arvif->ar; @@ -55,7 +55,7 @@ Signed-off-by: Sathishkumar Muruganandam if (WARN_ON(ath11k_mac_vif_chan(arvif->vif, &def))) return; -@@ -4919,17 +4924,28 @@ err_rc_bw_changed: +@@ -4915,17 +4920,28 @@ err_rc_bw_changed: static void ath11k_sta_set_4addr_wk(struct work_struct *wk) { struct ath11k *ar; @@ -86,7 +86,7 @@ Signed-off-by: Sathishkumar Muruganandam "setting USE_4ADDR for peer %pM\n", sta->addr); ret = ath11k_wmi_set_peer_param(ar, sta->addr, -@@ -4937,8 +4953,93 @@ static void ath11k_sta_set_4addr_wk(stru +@@ -4933,8 +4949,93 @@ static void ath11k_sta_set_4addr_wk(stru WMI_PEER_USE_4ADDR, 1); if (ret) @@ -181,7 +181,7 @@ Signed-off-by: Sathishkumar Muruganandam } static int ath11k_mac_inc_num_stations(struct ath11k_vif *arvif, -@@ -5268,9 +5369,32 @@ static void ath11k_mac_op_sta_set_4addr( +@@ -5264,9 +5365,32 @@ static void ath11k_mac_op_sta_set_4addr( struct ieee80211_sta *sta, bool enabled) { struct ath11k *ar = hw->priv; @@ -214,7 +214,7 @@ Signed-off-by: Sathishkumar Muruganandam ieee80211_queue_work(ar->hw, &arsta->set_4addr_wk); arsta->use_4addr_set = true; } -@@ -6654,6 +6778,9 @@ static int ath11k_mac_op_update_vif_offl +@@ -6646,6 +6770,9 @@ static int ath11k_mac_op_update_vif_offl u32 param_id, param_value; int ret; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET || (vif->type != NL80211_IFTYPE_STATION && -@@ -6874,7 +7001,8 @@ static int ath11k_mac_op_add_interface(s +@@ -6866,7 +6993,8 @@ static int ath11k_mac_op_add_interface(s goto err; } @@ -234,7 +234,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n", ar->num_created_vdevs, TARGET_NUM_VDEVS(ab)); ret = -EBUSY; -@@ -6894,6 +7022,28 @@ static int ath11k_mac_op_add_interface(s +@@ -6886,6 +7014,28 @@ static int ath11k_mac_op_add_interface(s arvif->vif = vif; INIT_LIST_HEAD(&arvif->list); @@ -263,7 +263,7 @@ Signed-off-by: Sathishkumar Muruganandam INIT_DELAYED_WORK(&arvif->connection_loss_work, ath11k_mac_vif_sta_connection_loss_work); -@@ -6923,6 +7073,7 @@ static int ath11k_mac_op_add_interface(s +@@ -6915,6 +7065,7 @@ static int ath11k_mac_op_add_interface(s fallthrough; case NL80211_IFTYPE_AP: arvif->vdev_type = WMI_VDEV_TYPE_AP; @@ -271,7 +271,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case NL80211_IFTYPE_MONITOR: arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; -@@ -7145,13 +7296,30 @@ static void ath11k_mac_op_remove_interfa +@@ -7137,13 +7288,30 @@ static void ath11k_mac_op_remove_interfa struct ath11k *ar = hw->priv; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ath11k_base *ab = ar->ab; @@ -304,7 +304,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n", arvif->vdev_id); -@@ -7168,6 +7336,14 @@ static void ath11k_mac_op_remove_interfa +@@ -7160,6 +7328,14 @@ static void ath11k_mac_op_remove_interfa if (ret) ath11k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", arvif->vdev_id, ret); @@ -319,7 +319,7 @@ Signed-off-by: Sathishkumar Muruganandam } ret = ath11k_mac_vdev_delete(ar, arvif); -@@ -7211,8 +7387,7 @@ err_vdev_del: +@@ -7203,8 +7379,7 @@ err_vdev_del: ath11k_debugfs_remove_interface(arvif); @@ -329,7 +329,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); } -@@ -7272,16 +7447,17 @@ static int ath11k_mac_op_ampdu_action(st +@@ -7264,16 +7439,17 @@ static int ath11k_mac_op_ampdu_action(st struct ieee80211_ampdu_params *params) { struct ath11k *ar = hw->priv; @@ -349,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case IEEE80211_AMPDU_TX_START: case IEEE80211_AMPDU_TX_STOP_CONT: -@@ -8804,6 +8980,7 @@ static void ath11k_mac_op_sta_statistics +@@ -8796,6 +8972,7 @@ static void ath11k_mac_op_sta_statistics { struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); struct ath11k *ar = arsta->arvif->ar; @@ -357,7 +357,7 @@ Signed-off-by: Sathishkumar Muruganandam s8 signal; bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT, ar->ab->wmi_ab.svc_map); -@@ -8860,7 +9037,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8852,7 +9029,8 @@ static void ath11k_mac_op_sta_statistics ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); @@ -369,7 +369,7 @@ Signed-off-by: Sathishkumar Muruganandam #if IS_ENABLED(CONFIG_IPV6) --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -5070,6 +5070,8 @@ enum wmi_vdev_subtype { +@@ -5082,6 +5082,8 @@ enum wmi_vdev_subtype { WMI_VDEV_SUBTYPE_MESH_11S, }; @@ -380,7 +380,7 @@ Signed-off-by: Sathishkumar Muruganandam WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD = 1, --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1156,12 +1156,13 @@ err_mem_free: +@@ -1121,12 +1121,13 @@ err_mem_free: return ret; } @@ -396,7 +396,7 @@ Signed-off-by: Sathishkumar Muruganandam int ret; ret = ath11k_peer_rx_tid_setup(ar, params->sta->addr, vdev_id, -@@ -1173,13 +1174,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 +@@ -1138,13 +1139,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 return ret; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch b/package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch index bad782747c57a1..cb1e39f149e409 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-002-ath11k-extend-ext-vdev-in-NSS-for-dynamic-VLAN-handling.patch @@ -15,7 +15,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -1526,14 +1526,11 @@ static int ath11k_nss_ext_vdev_register( +@@ -1527,14 +1527,11 @@ static int ath11k_nss_ext_vdev_register( struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; nss_tx_status_t status; @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam arvif->nss.ctx = nss_wifi_ext_vdev_register_if(arvif->nss.if_num, ath11k_nss_ext_vdev_data_receive, ath11k_nss_ext_vdev_special_data_receive, -@@ -1561,7 +1558,8 @@ static void ath11k_nss_ext_vdev_free(str +@@ -1562,7 +1559,8 @@ static void ath11k_nss_ext_vdev_free(str status = nss_dynamic_interface_dealloc_node( arvif->nss.if_num, @@ -40,7 +40,7 @@ Signed-off-by: Sathishkumar Muruganandam if (status != NSS_TX_SUCCESS) ath11k_warn(ab, "failed to free nss ext vdev err:%d\n", status); -@@ -1570,14 +1568,19 @@ static void ath11k_nss_ext_vdev_free(str +@@ -1571,14 +1569,19 @@ static void ath11k_nss_ext_vdev_free(str "nss ext vdev interface deallocated\n"); } @@ -62,7 +62,7 @@ Signed-off-by: Sathishkumar Muruganandam if_num = nss_dynamic_interface_alloc_node(di_type); if (if_num < 0) { ath11k_warn(ab, "failed to allocate nss ext vdev\n"); -@@ -1586,8 +1589,8 @@ static int ath11k_nss_ext_vdev_alloc(str +@@ -1587,8 +1590,8 @@ static int ath11k_nss_ext_vdev_alloc(str arvif->nss.if_num = if_num; ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, @@ -73,7 +73,7 @@ Signed-off-by: Sathishkumar Muruganandam return 0; } -@@ -1616,7 +1619,7 @@ int ath11k_nss_ext_vdev_create(struct at +@@ -1617,7 +1620,7 @@ int ath11k_nss_ext_vdev_create(struct at return -EINVAL; } @@ -82,7 +82,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ret) return ret; -@@ -1729,6 +1732,86 @@ free: +@@ -1730,6 +1733,86 @@ free: return ret; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch index 3687af833b5082..80b8a5fc67d7ea 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch @@ -36,7 +36,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -97,6 +97,11 @@ enum ath11k_crypt_mode { +@@ -99,6 +99,11 @@ enum ath11k_crypt_mode { ATH11K_CRYPT_MODE_SW, }; @@ -48,7 +48,7 @@ Signed-off-by: Sathishkumar Muruganandam static inline enum wme_ac ath11k_tid_to_ac(u32 tid) { return (((tid == 0) || (tid == 3)) ? WME_AC_BE : -@@ -324,6 +329,20 @@ struct ath11k_mgmt_frame_stats { +@@ -326,6 +331,20 @@ struct ath11k_mgmt_frame_stats { u32 tx_compl_fail[ATH11K_STATS_MGMT_FRM_TYPE_MAX]; }; @@ -69,7 +69,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif { u32 vdev_id; enum wmi_vdev_type vdev_type; -@@ -388,6 +407,11 @@ struct ath11k_vif { +@@ -390,6 +409,11 @@ struct ath11k_vif { struct arvif_nss nss; #endif struct list_head ap_vlan_arvifs; @@ -83,7 +83,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif_iter { --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -346,6 +346,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n +@@ -351,6 +351,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n return ret; } @@ -94,7 +94,7 @@ Signed-off-by: Sathishkumar Muruganandam u8 ath11k_mac_bw_to_mac80211_bw(u8 bw) { u8 ret = 0; -@@ -718,6 +722,33 @@ u8 ath11k_mac_get_target_pdev_id(struct +@@ -723,6 +727,33 @@ u8 ath11k_mac_get_target_pdev_id(struct return ar->ab->target_pdev_ids[0].pdev_id; } @@ -128,7 +128,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_pdev_caps_update(struct ath11k *ar) { struct ath11k_base *ab = ar->ab; -@@ -4167,6 +4198,9 @@ static int ath11k_install_key(struct ath +@@ -4172,6 +4203,9 @@ static int ath11k_install_key(struct ath if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) return 0; @@ -138,7 +138,7 @@ Signed-off-by: Sathishkumar Muruganandam if (cmd == DISABLE_KEY) { arg.key_cipher = WMI_CIPHER_NONE; arg.key_data = NULL; -@@ -4256,15 +4290,40 @@ static int ath11k_clear_peer_keys(struct +@@ -4261,15 +4295,40 @@ static int ath11k_clear_peer_keys(struct return first_errno; } @@ -181,7 +181,7 @@ Signed-off-by: Sathishkumar Muruganandam const u8 *peer_addr; int ret = 0; u32 flags = 0; -@@ -4282,17 +4341,38 @@ static int ath11k_mac_op_set_key(struct +@@ -4287,17 +4346,38 @@ static int ath11k_mac_op_set_key(struct if (key->keyidx > WMI_MAX_KEY_INDEX) return -ENOSPC; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam /* the peer should not disappear in mid-way (unless FW goes awry) since * we already hold conf_mutex. we just make sure its there now. */ -@@ -4337,6 +4417,74 @@ static int ath11k_mac_op_set_key(struct +@@ -4342,6 +4422,74 @@ static int ath11k_mac_op_set_key(struct goto exit; } @@ -299,7 +299,7 @@ Signed-off-by: Sathishkumar Muruganandam spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr); -@@ -4359,6 +4507,27 @@ static int ath11k_mac_op_set_key(struct +@@ -4364,6 +4512,27 @@ static int ath11k_mac_op_set_key(struct goto unlock; } @@ -327,7 +327,7 @@ Signed-off-by: Sathishkumar Muruganandam if (peer && cmd == SET_KEY) { peer->keys[key->keyidx] = key; if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) { -@@ -4368,18 +4537,23 @@ static int ath11k_mac_op_set_key(struct +@@ -4373,18 +4542,23 @@ static int ath11k_mac_op_set_key(struct peer->mcast_keyidx = key->keyidx; peer->sec_type_grp = ath11k_dp_tx_get_encrypt_type(key->cipher); } @@ -354,7 +354,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (key->cipher) { case WLAN_CIPHER_SUITE_TKIP: -@@ -5186,6 +5360,33 @@ static u32 ath11k_mac_ieee80211_sta_bw_t +@@ -5191,6 +5365,33 @@ static u32 ath11k_mac_ieee80211_sta_bw_t return bw; } @@ -388,7 +388,7 @@ Signed-off-by: Sathishkumar Muruganandam static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -5295,6 +5496,34 @@ static int ath11k_mac_op_sta_state(struc +@@ -5300,6 +5501,34 @@ static int ath11k_mac_op_sta_state(struc if (ret) ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", sta->addr, arvif->vdev_id, ret); @@ -423,7 +423,7 @@ Signed-off-by: Sathishkumar Muruganandam } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { -@@ -7027,7 +7256,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7018,7 +7247,7 @@ static int ath11k_mac_op_add_interface(s if ((vif->type == NL80211_IFTYPE_AP_VLAN || vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && @@ -432,7 +432,7 @@ Signed-off-by: Sathishkumar Muruganandam vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; -@@ -7040,6 +7269,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7031,6 +7260,7 @@ static int ath11k_mac_op_add_interface(s vif->addr, ret); goto err; } @@ -440,7 +440,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); return ret; } -@@ -7064,6 +7294,20 @@ static int ath11k_mac_op_add_interface(s +@@ -7055,6 +7285,20 @@ static int ath11k_mac_op_add_interface(s arvif->vdev_id = bit; arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; @@ -461,7 +461,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_STATION: -@@ -7104,7 +7348,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7095,7 +7339,7 @@ static int ath11k_mac_op_add_interface(s if (ret) { ath11k_warn(ab, "failed to create WMI vdev %d: %d\n", arvif->vdev_id, ret); @@ -470,7 +470,7 @@ Signed-off-by: Sathishkumar Muruganandam } ar->num_created_vdevs++; -@@ -7263,7 +7507,7 @@ err_peer_del: +@@ -7254,7 +7498,7 @@ err_peer_del: if (fbret) { ath11k_warn(ar->ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n", vif->addr, arvif->vdev_id, fbret); @@ -479,7 +479,7 @@ Signed-off-by: Sathishkumar Muruganandam } } -@@ -7274,6 +7518,8 @@ err_vdev_del: +@@ -7265,6 +7509,8 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -488,7 +488,7 @@ Signed-off-by: Sathishkumar Muruganandam err: mutex_unlock(&ar->conf_mutex); -@@ -7371,6 +7617,7 @@ err_vdev_del: +@@ -7362,6 +7608,7 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -496,7 +496,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_peer_cleanup(ar, arvif->vdev_id); idr_for_each(&ar->txmgmt_idr, -@@ -9959,8 +10206,11 @@ static int __ath11k_mac_register(struct +@@ -9960,8 +10207,11 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; @@ -511,7 +511,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ret) { --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -1939,6 +1939,7 @@ int ath11k_wmi_vdev_install_key(struct a +@@ -1938,6 +1938,7 @@ int ath11k_wmi_vdev_install_key(struct a cmd->key_len = arg->key_len; cmd->key_txmic_len = arg->key_txmic_len; cmd->key_rxmic_len = arg->key_rxmic_len; @@ -539,7 +539,7 @@ Signed-off-by: Sathishkumar Muruganandam if (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT, --- a/drivers/net/wireless/ath/ath11k/wmi.h +++ b/drivers/net/wireless/ath/ath11k/wmi.h -@@ -3701,6 +3701,7 @@ struct wmi_vdev_install_key_arg { +@@ -3703,6 +3703,7 @@ struct wmi_vdev_install_key_arg { u32 vdev_id; const u8 *macaddr; u32 key_idx; @@ -547,7 +547,7 @@ Signed-off-by: Sathishkumar Muruganandam u32 key_flags; u32 key_cipher; u32 key_len; -@@ -5774,6 +5775,7 @@ struct target_resource_config { +@@ -5786,6 +5787,7 @@ struct target_resource_config { u32 bpf_instruction_size; u32 max_bssid_rx_filters; u32 use_pdev_id; diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index ee1e977310c046..bbf4f20ac2326c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -1,8 +1,8 @@ --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -1048,6 +1049,7 @@ struct ath11k_base { - } testmode; - #endif +@@ -1076,6 +1076,7 @@ struct ath11k_base { + u32 max_ast_index; + u32 num_ast_entries; + bool stats_disable; /* must be last */ @@ -99,4 +99,3 @@ ret = 0; - diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index 8034b6186ee671..61077309338ffb 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -55,7 +55,7 @@ Signed-off-by: P Praneesh tlv_tag, ptr - begin, len, tlv_len); return -EINVAL; } -@@ -2448,10 +2454,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b +@@ -2454,10 +2460,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b return peer; } @@ -117,7 +117,7 @@ Signed-off-by: P Praneesh { bool fill_crypto_hdr; enum hal_encrypt_type enctype; -@@ -2462,9 +2518,13 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2468,9 +2524,13 @@ static void ath11k_dp_rx_h_mpdu(struct a struct rx_attention *rx_attention; u32 err_bitmap; @@ -132,7 +132,7 @@ Signed-off-by: P Praneesh rxcb->is_mcbc = fill_crypto_hdr; if (rxcb->is_mcbc) { -@@ -2475,6 +2535,26 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2481,6 +2541,26 @@ static void ath11k_dp_rx_h_mpdu(struct a spin_lock_bh(&ar->ab->base_lock); peer = ath11k_dp_rx_h_find_peer(ar->ab, msdu); if (peer) { @@ -159,7 +159,7 @@ Signed-off-by: P Praneesh if (rxcb->is_mcbc) enctype = peer->sec_type_grp; else -@@ -2484,6 +2564,8 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2490,6 +2570,8 @@ static void ath11k_dp_rx_h_mpdu(struct a } spin_unlock_bh(&ar->ab->base_lock); @@ -168,7 +168,7 @@ Signed-off-by: P Praneesh rx_attention = ath11k_dp_rx_get_attention(ar->ab, rx_desc); err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention); if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) -@@ -2725,7 +2807,8 @@ static void ath11k_dp_rx_deliver_msdu(st +@@ -2731,7 +2813,8 @@ static void ath11k_dp_rx_deliver_msdu(st static int ath11k_dp_rx_process_msdu(struct ath11k *ar, struct sk_buff *msdu, struct sk_buff_head *msdu_list, @@ -178,7 +178,7 @@ Signed-off-by: P Praneesh { struct ath11k_base *ab = ar->ab; struct hal_rx_desc *rx_desc, *lrx_desc; -@@ -2792,8 +2875,13 @@ static int ath11k_dp_rx_process_msdu(str +@@ -2798,8 +2881,13 @@ static int ath11k_dp_rx_process_msdu(str } } @@ -193,7 +193,7 @@ Signed-off-by: P Praneesh rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -2808,10 +2896,12 @@ static void ath11k_dp_rx_process_receive +@@ -2814,10 +2902,12 @@ static void ath11k_dp_rx_process_receive struct sk_buff_head *msdu_list, int mac_id) { @@ -206,7 +206,7 @@ Signed-off-by: P Praneesh if (skb_queue_empty(msdu_list)) return; -@@ -2828,7 +2918,12 @@ static void ath11k_dp_rx_process_receive +@@ -2834,7 +2924,12 @@ static void ath11k_dp_rx_process_receive } while ((msdu = __skb_dequeue(msdu_list))) { @@ -220,7 +220,7 @@ Signed-off-by: P Praneesh if (unlikely(ret)) { ath11k_dbg(ab, ATH11K_DBG_DATA, "Unable to process msdu %d", ret); -@@ -2836,7 +2931,10 @@ static void ath11k_dp_rx_process_receive +@@ -2842,7 +2937,10 @@ static void ath11k_dp_rx_process_receive continue; } @@ -232,7 +232,7 @@ Signed-off-by: P Praneesh } } -@@ -2845,11 +2943,12 @@ void ath11k_dp_rx_from_nss(struct ath11k +@@ -2851,11 +2949,12 @@ void ath11k_dp_rx_from_nss(struct ath11k { struct ieee80211_rx_status rx_status = {0}; struct ath11k_skb_rxcb *rxcb; @@ -246,7 +246,7 @@ Signed-off-by: P Praneesh rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -4316,6 +4415,7 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4322,6 +4421,7 @@ static int ath11k_dp_rx_h_null_q_desc(st struct ieee80211_rx_status *status, struct sk_buff_head *msdu_list) { @@ -254,7 +254,7 @@ Signed-off-by: P Praneesh u16 msdu_len; struct hal_rx_desc *desc = (struct hal_rx_desc *)msdu->data; struct rx_attention *rx_attention; -@@ -4365,7 +4465,8 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4371,7 +4471,8 @@ static int ath11k_dp_rx_h_null_q_desc(st } ath11k_dp_rx_h_ppdu(ar, desc, status); @@ -328,7 +328,7 @@ Signed-off-by: P Praneesh bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -5536,6 +5536,14 @@ static int ath11k_mac_op_sta_state(struc +@@ -5532,6 +5532,14 @@ static int ath11k_mac_op_sta_state(struc } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch index 3c4d324161644c..7535883c4763d0 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch @@ -430,7 +430,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6643,12 +6643,22 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6669,12 +6669,22 @@ static void ath11k_mac_op_tx(struct ieee if (control->sta) arsta = ath11k_sta_to_arsta(control->sta); @@ -454,7 +454,7 @@ Signed-off-by: P Praneesh ieee80211_free_txskb(ar->hw, skb); return; } -@@ -7596,7 +7606,7 @@ err_vdev_del: +@@ -7622,7 +7632,7 @@ err_vdev_del: idr_for_each(&ar->txmgmt_idr, ath11k_mac_vif_txmgmt_idr_remove, vif); @@ -490,7 +490,7 @@ Signed-off-by: P Praneesh if (len > size) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -186,7 +186,6 @@ static struct ath11k_hw_params ath11k_hw +@@ -188,7 +188,6 @@ static struct ath11k_hw_params ath11k_hw .supports_regdb = false, .fix_l1ss = true, .credit_flow = false, @@ -498,7 +498,7 @@ Signed-off-by: P Praneesh .hal_params = &ath11k_hw_hal_params_ipq8074, .supports_dynamic_smps_6ghz = false, .alloc_cacheable_memory = true, -@@ -212,6 +211,8 @@ static struct ath11k_hw_params ath11k_hw +@@ -213,6 +212,8 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, @@ -507,7 +507,7 @@ Signed-off-by: P Praneesh }, { .name = "qca6390 hw2.0", -@@ -381,6 +382,8 @@ static struct ath11k_hw_params ath11k_hw +@@ -380,6 +381,8 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, @@ -516,7 +516,7 @@ Signed-off-by: P Praneesh }, { .name = "wcn6855 hw2.0", -@@ -2146,6 +2149,9 @@ int ath11k_core_pre_init(struct ath11k_b +@@ -2143,6 +2146,9 @@ int ath11k_core_pre_init(struct ath11k_b if (nss_offload) ab->nss.stats_enabled = 1; diff --git a/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch b/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch index 5890fa6a784a08..4260d0e5337451 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -5898,6 +5898,8 @@ static int ath11k_mac_copy_he_cap(struct +@@ -6267,6 +6267,8 @@ static int ath11k_mac_copy_he_cap(struct memcpy(he_cap_elem->phy_cap_info, band_cap->he_cap_phy_info, sizeof(he_cap_elem->phy_cap_info)); diff --git a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch index f11c9d28710d53..b31809f689548b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch @@ -1046,7 +1046,7 @@ Signed-off-by: Vasanthakumar Thiagarajan #define HTT_PPDU_STATS_MAX_USERS 37 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1403,6 +1403,71 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1409,6 +1409,71 @@ static int ath11k_htt_tlv_ppdu_stats_par return 0; } @@ -1118,7 +1118,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static void ath11k_update_per_peer_tx_stats(struct ath11k *ar, struct htt_ppdu_stats *ppdu_stats, u8 user) -@@ -1426,6 +1491,9 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1432,6 +1497,9 @@ ath11k_update_per_peer_tx_stats(struct a if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE))) return; @@ -1128,7 +1128,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) is_ampdu = HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags); -@@ -1559,6 +1627,8 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1565,6 +1633,8 @@ ath11k_update_per_peer_tx_stats(struct a ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); } @@ -1137,7 +1137,7 @@ Signed-off-by: Vasanthakumar Thiagarajan spin_unlock_bh(&ab->base_lock); rcu_read_unlock(); } -@@ -1679,6 +1749,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k +@@ -1685,6 +1755,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k return 0; } @@ -1207,7 +1207,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, struct sk_buff *skb) { -@@ -1697,6 +1830,15 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1703,6 +1836,15 @@ static int ath11k_htt_pull_ppdu_stats(st pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, msg->info); ppdu_id = msg->ppdu_id; @@ -1223,7 +1223,7 @@ Signed-off-by: Vasanthakumar Thiagarajan rcu_read_lock(); ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id); if (!ar) { -@@ -1764,6 +1906,12 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1770,6 +1912,12 @@ static int ath11k_htt_pull_ppdu_stats(st } } @@ -1257,7 +1257,7 @@ Signed-off-by: Vasanthakumar Thiagarajan mutex_unlock(&ar->conf_mutex); } -@@ -9700,6 +9712,28 @@ err_fallback: +@@ -9714,6 +9726,28 @@ err_fallback: return 0; } @@ -1286,7 +1286,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static const struct ieee80211_ops ath11k_ops = { .tx = ath11k_mac_op_tx, .wake_tx_queue = ieee80211_handle_wake_tx_queue, -@@ -9757,6 +9791,9 @@ static const struct ieee80211_ops ath11k +@@ -9771,6 +9805,9 @@ static const struct ieee80211_ops ath11k .set_sar_specs = ath11k_mac_op_set_bios_sar_specs, .remain_on_channel = ath11k_mac_op_remain_on_channel, .cancel_remain_on_channel = ath11k_mac_op_cancel_remain_on_channel, @@ -1296,7 +1296,7 @@ Signed-off-by: Vasanthakumar Thiagarajan }; static void ath11k_mac_update_ch_list(struct ath11k *ar, -@@ -10215,6 +10252,8 @@ static int __ath11k_mac_register(struct +@@ -10231,6 +10268,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VLAN_OFFLOAD); diff --git a/package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch b/package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch index 6f4793b5a0afd5..2fa70d0f395ab3 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/301-ath11k-nss-mcbc-exception.patch @@ -16,7 +16,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -568,7 +568,7 @@ static int ath11k_nss_undecap_nwifi(stru +@@ -606,7 +606,7 @@ static int ath11k_nss_undecap_nwifi(stru static void ath11k_nss_wds_type_rx(struct ath11k *ar, struct net_device *dev, u8* src_mac, u8 is_sa_valid, u8 addr4_valid, @@ -25,7 +25,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 { struct ath11k_base *ab = ar->ab; struct ath11k_ast_entry *ast_entry = NULL; -@@ -604,8 +604,6 @@ static void ath11k_nss_wds_type_rx(struc +@@ -642,8 +642,6 @@ static void ath11k_nss_wds_type_rx(struc } } @@ -34,7 +34,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 } spin_unlock_bh(&ab->base_lock); -@@ -649,8 +647,7 @@ static void ath11k_nss_mec_handler(struc +@@ -687,8 +685,7 @@ static void ath11k_nss_mec_handler(struc static void ath11k_nss_vdev_spl_receive_ext_wdsdata(struct ath11k_vif *arvif, struct sk_buff *skb, @@ -44,7 +44,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 { struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; -@@ -672,7 +669,7 @@ static void ath11k_nss_vdev_spl_receive_ +@@ -710,7 +707,7 @@ static void ath11k_nss_vdev_spl_receive_ switch (wds_type) { case NSS_WIFI_VDEV_WDS_TYPE_RX: ath11k_nss_wds_type_rx(ar, skb->dev, src_mac, is_sa_valid, @@ -53,8 +53,8 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 break; case NSS_WIFI_VDEV_WDS_TYPE_MEC: ath11k_nss_mec_handler(ar, (u8 *)(skb->data)); -@@ -739,10 +736,12 @@ ath11k_nss_vdev_special_data_receive(str - struct ieee80211_vif *vif; +@@ -775,10 +772,12 @@ ath11k_nss_vdev_special_data_receive(str + struct nss_wifi_vdev_wds_per_packet_metadata *wds_metadata = NULL; struct ath11k_vif *arvif; struct ath11k_base *ab; - bool drop = false; @@ -65,9 +65,9 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 + struct ath11k_skb_rxcb *rxcb; + struct ath11k_peer *ta_peer = NULL; - if (!dev) { - dev_kfree_skb_any(skb); -@@ -791,15 +790,50 @@ ath11k_nss_vdev_special_data_receive(str + arvif = ath11k_nss_get_arvif_from_dev(dev); + if (!arvif) { +@@ -810,15 +809,50 @@ ath11k_nss_vdev_special_data_receive(str return; } @@ -126,7 +126,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 } static void -@@ -1006,6 +1040,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 +@@ -2129,6 +2163,9 @@ int ath11k_nss_vdev_set_cmd(struct ath11 case ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD: cmd = NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD; break; @@ -136,7 +136,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 default: return -EINVAL; } -@@ -1247,12 +1284,31 @@ int ath11k_nss_vdev_create(struct ath11k +@@ -2651,12 +2688,31 @@ int ath11k_nss_vdev_create(struct ath11k goto free_vdev; switch (arvif->vif->type) { @@ -167,9 +167,9 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 + goto unregister_vdev; + } break; - default: - ret = -ENOTSUPP; -@@ -1526,7 +1582,6 @@ static int ath11k_nss_ext_vdev_register( + #ifdef CPTCFG_ATH11K_NSS_MESH_SUPPORT + case NL80211_IFTYPE_MESH_POINT: +@@ -2987,7 +3043,6 @@ static int ath11k_nss_ext_vdev_register( { struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; @@ -177,7 +177,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 u32 features = 0; if (arvif->vif->type != NL80211_IFTYPE_AP_VLAN || arvif->nss.ctx) -@@ -1540,7 +1595,7 @@ static int ath11k_nss_ext_vdev_register( +@@ -3001,7 +3056,7 @@ static int ath11k_nss_ext_vdev_register( if (!arvif->nss.ctx) { ath11k_warn(ab, "failed to register nss vdev if_num %d nss_err:%d\n", @@ -188,7 +188,7 @@ Change-Id: I4a6ac67a1c2cf3ab7a219d0953907191606a5e70 --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -109,8 +109,12 @@ enum ath11k_nss_vdev_cmd { +@@ -115,8 +115,12 @@ enum ath11k_nss_vdev_cmd { ATH11K_NSS_WIFI_VDEV_ENCAP_TYPE_CMD, ATH11K_NSS_WIFI_VDEV_DECAP_TYPE_CMD, ATH11K_NSS_WIFI_VDEV_CFG_WDS_BACKHAUL_CMD, diff --git a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch index ed3cde7c8e00ec..cb4fba0a2ffdcd 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch @@ -23,7 +23,7 @@ Signed-off-by: Rameshkumar Sundaram --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7640,8 +7640,10 @@ err_vdev_del: +@@ -7643,8 +7643,10 @@ err_vdev_del: kfree(arvif->vlan_keyid_map); ath11k_peer_cleanup(ar, arvif->vdev_id); @@ -36,7 +36,7 @@ Signed-off-by: Rameshkumar Sundaram spin_lock_bh(&ab->dp.tx_ring[i].tx_idr_lock); --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c -@@ -6125,13 +6125,13 @@ static int wmi_process_tx_comp(struct at +@@ -5966,13 +5966,13 @@ static int wmi_process_tx_comp(struct at struct ieee80211_tx_info *info; struct ath11k_skb_cb *skb_cb; struct ieee80211_hdr *hdr; @@ -51,7 +51,7 @@ Signed-off-by: Rameshkumar Sundaram spin_lock_bh(&ar->txmgmt_idr_lock); msdu = idr_find(&ar->txmgmt_idr, tx_compl_param->desc_id); -@@ -6139,6 +6139,7 @@ static int wmi_process_tx_comp(struct at +@@ -5980,6 +5980,7 @@ static int wmi_process_tx_comp(struct at ath11k_warn(ar->ab, "received mgmt tx compl for invalid msdu_id: %d\n", tx_compl_param->desc_id); spin_unlock_bh(&ar->txmgmt_idr_lock); @@ -59,7 +59,7 @@ Signed-off-by: Rameshkumar Sundaram return -ENOENT; } -@@ -6147,6 +6148,28 @@ static int wmi_process_tx_comp(struct at +@@ -5988,6 +5989,28 @@ static int wmi_process_tx_comp(struct at skb_cb = ATH11K_SKB_CB(msdu); dma_unmap_single(ar->ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); @@ -87,8 +87,8 @@ Signed-off-by: Rameshkumar Sundaram + spin_unlock_bh(&ar->data_lock); info = IEEE80211_SKB_CB(msdu); - if ((!(info->flags & IEEE80211_TX_CTL_NO_ACK)) && !tx_compl_param->status) -@@ -6161,34 +6184,6 @@ static int wmi_process_tx_comp(struct at + if ((!(info->flags & IEEE80211_TX_CTL_NO_ACK)) && +@@ -6003,34 +6026,6 @@ static int wmi_process_tx_comp(struct at */ info->status.rates[0].idx = -1; diff --git a/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch index 6bf1ba225e0bd5..d733219b38aa7f 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -1440,6 +1440,7 @@ const struct ath11k_hw_ring_mask ath11k_ +@@ -1332,6 +1332,7 @@ const struct ath11k_hw_ring_mask ath11k_ ATH11K_RX_WBM_REL_RING_MASK_0, }, .reo_status = { diff --git a/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch index 98fb7325850498..662e11697f4d9c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch @@ -56,7 +56,7 @@ Signed-off-by: Rameshkumar Sundaram static void ath11k_ahb_free_resources(struct ath11k_base *ab) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -2235,6 +2235,7 @@ struct ath11k_base *ath11k_core_alloc(st +@@ -2212,6 +2212,7 @@ struct ath11k_base *ath11k_core_alloc(st mutex_init(&ab->core_lock); mutex_init(&ab->tbl_mtx_lock); @@ -64,7 +64,7 @@ Signed-off-by: Rameshkumar Sundaram spin_lock_init(&ab->base_lock); mutex_init(&ab->vdev_id_11d_lock); init_completion(&ab->reset_complete); -@@ -2248,6 +2249,8 @@ struct ath11k_base *ath11k_core_alloc(st +@@ -2225,6 +2226,8 @@ struct ath11k_base *ath11k_core_alloc(st INIT_WORK(&ab->restart_work, ath11k_core_restart); INIT_WORK(&ab->update_11d_work, ath11k_update_11d); INIT_WORK(&ab->reset_work, ath11k_core_reset); @@ -159,7 +159,7 @@ Signed-off-by: Rameshkumar Sundaram msg_cb = (nss_wifili_msg_callback_t)ath11k_nss_wifili_event_receive; --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -288,8 +288,8 @@ int ath11k_nss_update_wds_peer(struct at +@@ -290,8 +290,8 @@ int ath11k_nss_update_wds_peer(struct at u8 *dest_mac); int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, u8 *dest_mac, enum ath11k_ast_entry_type type); @@ -170,7 +170,7 @@ Signed-off-by: Rameshkumar Sundaram int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, u8 *wds_addr, u32 wds_peer_id); int ath11k_nss_ext_vdev_wds_4addr_allow(struct ath11k_vif *arvif, -@@ -409,8 +409,8 @@ static inline int ath11k_nss_map_wds_pee +@@ -413,8 +413,8 @@ static inline int ath11k_nss_map_wds_pee return 0; } @@ -183,7 +183,7 @@ Signed-off-by: Rameshkumar Sundaram } --- a/drivers/net/wireless/ath/ath11k/pci.c +++ b/drivers/net/wireless/ath/ath11k/pci.c -@@ -970,6 +970,7 @@ static void ath11k_pci_remove(struct pci +@@ -972,6 +972,7 @@ static void ath11k_pci_remove(struct pci } set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags); diff --git a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index 3b118c3fb5093c..3c3e436c75ce41 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -58,7 +58,7 @@ Signed-off-by: Venkateswara Naralasetty tcl_cmd.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10114,6 +10114,8 @@ static int __ath11k_mac_register(struct +@@ -10154,6 +10154,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, USES_RSS); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch index 8cd0b134bdf77e..752218e9b8ec26 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch @@ -16,7 +16,7 @@ Signed-off-by: Anilkumar Kolli --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6197,12 +6197,23 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5953,12 +5953,23 @@ int ath11k_dp_rx_process_mon_status(stru pmon->mon_ppdu_status = DP_PPDU_STATUS_START; } @@ -43,7 +43,7 @@ Signed-off-by: Anilkumar Kolli rcu_read_lock(); spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find_by_id(ab, ppdu_info->peer_id); -@@ -6524,6 +6535,13 @@ static int ath11k_dp_full_mon_process_rx +@@ -6282,6 +6293,13 @@ static int ath11k_dp_full_mon_process_rx spin_lock_bh(&pmon->mon_lock); @@ -57,7 +57,7 @@ Signed-off-by: Anilkumar Kolli sw_mon_entries = &pmon->sw_mon_entries; rx_mon_stats = &pmon->rx_mon_stats; -@@ -6563,7 +6581,6 @@ static int ath11k_dp_full_mon_process_rx +@@ -6321,7 +6339,6 @@ static int ath11k_dp_full_mon_process_rx } rx_mon_stats->dest_ppdu_done++; @@ -65,7 +65,7 @@ Signed-off-by: Anilkumar Kolli pmon->buf_state = DP_MON_STATUS_LAG; pmon->mon_status_paddr = sw_mon_entries->mon_status_paddr; pmon->hold_mon_dst_ring = true; -@@ -6594,16 +6611,10 @@ reap_status_ring: +@@ -6352,16 +6369,10 @@ reap_status_ring: int ath11k_dp_rx_process_mon_rings(struct ath11k_base *ab, int mac_id, struct napi_struct *napi, int budget) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch index f03b4e2d7e5df6..0adf26c808aec6 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch @@ -35,7 +35,7 @@ Signed-off-by: Venkateswara Naralasetty --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3464,6 +3464,46 @@ ath11k_dp_rx_mon_update_status_buf_state +@@ -3660,6 +3660,46 @@ ath11k_dp_rx_mon_update_status_buf_state } } @@ -82,7 +82,7 @@ Signed-off-by: Venkateswara Naralasetty static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id, int *budget, struct sk_buff_head *skb_list) { -@@ -3477,6 +3517,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3673,6 +3713,7 @@ static int ath11k_dp_rx_reap_mon_status_ struct sk_buff *skb; struct ath11k_skb_rxcb *rxcb; struct hal_tlv_hdr *tlv; @@ -90,7 +90,7 @@ Signed-off-by: Venkateswara Naralasetty u32 cookie; int buf_id, srng_id; dma_addr_t paddr; -@@ -3496,8 +3537,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3692,8 +3733,7 @@ static int ath11k_dp_rx_reap_mon_status_ ath11k_hal_srng_access_begin(ab, srng); while (*budget) { *budget -= 1; @@ -100,7 +100,7 @@ Signed-off-by: Venkateswara Naralasetty if (!rx_mon_status_desc) { pmon->buf_state = DP_MON_STATUS_REPLINISH; break; -@@ -3528,18 +3568,43 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3724,18 +3764,43 @@ static int ath11k_dp_rx_reap_mon_status_ tlv = (struct hal_tlv_hdr *)skb->data; if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_STATUS_BUFFER_DONE) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch b/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch index af64057faf823f..dbd8dd904c022d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch @@ -38,7 +38,7 @@ Signed-off-by: Aditya Kumar Singh --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -1839,6 +1839,11 @@ static int ath11k_core_reconfigure_on_cr +@@ -1838,6 +1838,11 @@ static int ath11k_core_reconfigure_on_cr clear_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags); diff --git a/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch index e1d407e57d2e6f..f574597dceb969 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch @@ -57,7 +57,7 @@ Signed-off-by: Nagarajan Maran spin_unlock_bh(&rx_ring->idr_lock); if (buf_id <= 0) goto fail_dma_unmap; -@@ -3134,6 +3134,16 @@ try_again: +@@ -3141,6 +3141,16 @@ try_again: while (likely(desc = (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab, srng))) { @@ -74,7 +74,7 @@ Signed-off-by: Nagarajan Maran cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, desc->buf_addr_info.info1); buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, -@@ -3164,8 +3174,6 @@ try_again: +@@ -3171,8 +3181,6 @@ try_again: num_buffs_reaped[mac_id]++; diff --git a/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch b/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch index 3c765c9c2df46e..15a8afde61ef4f 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch @@ -17,7 +17,7 @@ Signed-off-by: Karthikeyan Kathirvel --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4882,12 +4882,6 @@ static int ath11k_station_disassoc(struc +@@ -4899,12 +4899,6 @@ static int ath11k_station_disassoc(struc return ret; } @@ -30,7 +30,7 @@ Signed-off-by: Karthikeyan Kathirvel return 0; } -@@ -5478,6 +5472,17 @@ static int ath11k_mac_op_sta_state(struc +@@ -5495,6 +5489,17 @@ static int ath11k_mac_op_sta_state(struc arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); arsta->bw_prev = arsta->bw; spin_unlock_bh(&ar->data_lock); diff --git a/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch index ec9d831abded55..f57faaa465ae76 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch @@ -13,7 +13,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2515,7 +2515,8 @@ static void ath11k_dp_rx_h_undecap(struc +@@ -2564,7 +2564,8 @@ static void ath11k_dp_rx_h_undecap(struc ehdr = (struct ethhdr *)msdu->data; /* mac80211 allows fast path only for authorized STA */ diff --git a/package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch b/package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch index b4e399144ac1ae..3786bd3de9647d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/362-ath11k-fix-incorrect-ast-index-assignment-for-wds-peer.patch @@ -19,7 +19,7 @@ Signed-off-by: Raj Kumar Bhagat --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -2410,13 +2410,14 @@ msg_free: +@@ -3871,13 +3871,14 @@ msg_free: } int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, @@ -35,7 +35,7 @@ Signed-off-by: Raj Kumar Bhagat int ret = 0; wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); -@@ -2426,7 +2427,7 @@ int ath11k_nss_map_wds_peer(struct ath11 +@@ -3887,7 +3888,7 @@ int ath11k_nss_map_wds_peer(struct ath11 wds_peer_map_msg = &wlmsg->msg.wdspeermapmsg; wds_peer_map_msg->vdev_id = peer->vdev_id; @@ -46,7 +46,7 @@ Signed-off-by: Raj Kumar Bhagat wds_peer_map_msg->peer_id = NSS_WIFILI_MEC_PEER_ID; --- a/drivers/net/wireless/ath/ath11k/nss.h +++ b/drivers/net/wireless/ath/ath11k/nss.h -@@ -16,6 +16,7 @@ struct ath11k; +@@ -20,6 +20,7 @@ struct ath11k; struct ath11k_base; struct ath11k_vif; struct ath11k_peer; @@ -54,7 +54,7 @@ Signed-off-by: Raj Kumar Bhagat struct ath11k_sta; enum ath11k_ast_entry_type; struct hal_rx_mon_ppdu_info; -@@ -241,7 +242,7 @@ int ath11k_nss_add_wds_peer(struct ath11 +@@ -289,7 +290,7 @@ int ath11k_nss_add_wds_peer(struct ath11 int ath11k_nss_update_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, u8 *dest_mac); int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, @@ -63,7 +63,7 @@ Signed-off-by: Raj Kumar Bhagat int ath11k_nss_del_wds_peer(struct ath11k *ar, u8 *peer_addr, int peer_id, u8 *dest_mac); int ath11k_nss_ext_vdev_cfg_wds_peer(struct ath11k_vif *arvif, -@@ -337,7 +338,8 @@ static inline int ath11k_nss_update_wds_ +@@ -408,7 +409,8 @@ static inline int ath11k_nss_update_wds_ } static inline int ath11k_nss_map_wds_peer(struct ath11k *ar, struct ath11k_peer *peer, @@ -75,7 +75,7 @@ Signed-off-by: Raj Kumar Bhagat } --- a/drivers/net/wireless/ath/ath11k/peer.c +++ b/drivers/net/wireless/ath/ath11k/peer.c -@@ -359,8 +359,7 @@ void ath11k_peer_map_ast(struct ath11k * +@@ -373,8 +373,7 @@ void ath11k_peer_map_ast(struct ath11k * if ((ast_entry->type == ATH11K_AST_TYPE_WDS) || (ast_entry->type == ATH11K_AST_TYPE_MEC)) diff --git a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch index fd4f0938cdb83b..f909ba4a673f69 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch @@ -14,7 +14,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1501,6 +1501,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { +@@ -1425,6 +1425,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { #define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM GENMASK(31, 25) #define HTT_PPDU_STATS_NON_QOS_TID 16 @@ -24,7 +24,7 @@ Signed-off-by: Ramya Gnanasekar u32 ppdu_id; --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1323,7 +1323,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1288,7 +1288,7 @@ static int ath11k_htt_tlv_ppdu_stats_par struct htt_ppdu_user_stats *user_stats = NULL; int cur_user; u16 peer_id; @@ -33,7 +33,7 @@ Signed-off-by: Ramya Gnanasekar ppdu_info = data; -@@ -1404,6 +1404,8 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1369,6 +1369,8 @@ static int ath11k_htt_tlv_ppdu_stats_par return -EINVAL; } @@ -42,7 +42,7 @@ Signed-off-by: Ramya Gnanasekar peer_id = ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->sw_peer_id; cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, -@@ -1415,6 +1417,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1380,6 +1382,7 @@ static int ath11k_htt_tlv_ppdu_stats_par user_stats->is_valid_peer_id = true; memcpy((void *)&user_stats->ack_ba, ptr, sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); diff --git a/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch index 832a7d92b35a0a..8adb5448a1564c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch @@ -41,9 +41,9 @@ Signed-off-by: Tamizh Chelvam Raja --- a/drivers/net/wireless/ath/ath11k/core.h +++ b/drivers/net/wireless/ath/ath11k/core.h -@@ -1176,6 +1176,9 @@ struct ath11k_soc_dp_stats { +@@ -902,6 +902,9 @@ struct ath11k_soc_dp_stats { + u32 rxdma_error[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX]; u32 reo_error[HAL_REO_DEST_RING_ERROR_CODE_MAX]; - u32 reo_error_drop[HAL_REO_DEST_RING_ERROR_CODE_MAX]; u32 hal_reo_error[DP_REO_DST_RING_MAX]; + u32 hal_reo_cmd_drain; + u32 reo_cmd_cache_error; @@ -53,7 +53,7 @@ Signed-off-by: Tamizh Chelvam Raja }; --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1416,6 +1416,18 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -848,6 +848,18 @@ static ssize_t ath11k_debugfs_dump_soc_d "\nNSS Transmit Failures: %d\n", atomic_read(&soc_stats->tx_err.nss_tx_fail)); @@ -74,7 +74,7 @@ Signed-off-by: Tamizh Chelvam Raja if (len > size) --- a/drivers/net/wireless/ath/ath11k/dp.c +++ b/drivers/net/wireless/ath/ath11k/dp.c -@@ -1185,8 +1185,10 @@ int ath11k_dp_alloc(struct ath11k_base * +@@ -1102,8 +1102,10 @@ int ath11k_dp_alloc(struct ath11k_base * INIT_LIST_HEAD(&dp->reo_cmd_list); INIT_LIST_HEAD(&dp->reo_cmd_cache_flush_list); @@ -95,7 +95,7 @@ Signed-off-by: Tamizh Chelvam Raja u32 ba_win_sz; bool active; -@@ -53,6 +54,14 @@ struct dp_reo_cache_flush_elem { +@@ -51,6 +52,14 @@ struct dp_reo_cache_flush_elem { unsigned long ts; }; @@ -110,7 +110,7 @@ Signed-off-by: Tamizh Chelvam Raja struct dp_reo_cmd { struct list_head list; struct dp_rx_tid data; -@@ -298,6 +307,12 @@ struct ath11k_dp { +@@ -295,6 +304,12 @@ struct ath11k_dp { * - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; @@ -122,10 +122,10 @@ Signed-off-by: Tamizh Chelvam Raja + spinlock_t reo_cmd_update_queue_lock; struct ath11k_hp_update_timer reo_cmd_timer; struct ath11k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX]; - + }; --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -22,6 +22,9 @@ +@@ -21,6 +21,9 @@ #define ATH11K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ) @@ -135,7 +135,7 @@ Signed-off-by: Tamizh Chelvam Raja static inline u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc) { -@@ -729,13 +732,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( +@@ -672,13 +675,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( return 0; } @@ -186,7 +186,7 @@ Signed-off-by: Tamizh Chelvam Raja spin_lock_bh(&dp->reo_cmd_lock); list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { list_del(&cmd->list); -@@ -781,14 +821,18 @@ static void ath11k_dp_reo_cmd_free(struc +@@ -724,14 +764,18 @@ static void ath11k_dp_reo_cmd_free(struc } } @@ -207,7 +207,7 @@ Signed-off-by: Tamizh Chelvam Raja desc_sz = ath11k_hal_reo_qdesc_size(0, HAL_DESC_REO_NON_QOS_TID); while (tot_desc_sz > desc_sz) { -@@ -799,11 +843,17 @@ static void ath11k_dp_reo_cache_flush(st +@@ -742,11 +786,17 @@ static void ath11k_dp_reo_cache_flush(st HAL_REO_CMD_FLUSH_CACHE, &cmd, NULL); if (ret) @@ -228,7 +228,7 @@ Signed-off-by: Tamizh Chelvam Raja memset(&cmd, 0, sizeof(cmd)); cmd.addr_lo = lower_32_bits(rx_tid->paddr); cmd.addr_hi = upper_32_bits(rx_tid->paddr); -@@ -811,24 +861,21 @@ static void ath11k_dp_reo_cache_flush(st +@@ -754,24 +804,21 @@ static void ath11k_dp_reo_cache_flush(st ret = ath11k_dp_tx_send_reo_cmd(ab, rx_tid, HAL_REO_CMD_FLUSH_CACHE, &cmd, ath11k_dp_reo_cmd_free); @@ -259,7 +259,7 @@ Signed-off-by: Tamizh Chelvam Raja goto free_desc; } else if (status != HAL_REO_CMD_SUCCESS) { /* Shouldn't happen! Cleanup in case of other failure? */ -@@ -837,6 +884,29 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -780,6 +827,29 @@ static void ath11k_dp_rx_tid_del_func(st return; } @@ -289,7 +289,7 @@ Signed-off-by: Tamizh Chelvam Raja elem = kzalloc(sizeof(*elem), GFP_ATOMIC); if (!elem) goto free_desc; -@@ -854,13 +924,20 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -797,13 +867,20 @@ static void ath11k_dp_rx_tid_del_func(st if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || time_after(jiffies, elem->ts + msecs_to_jiffies(DP_REO_DESC_FREE_TIMEOUT_MS))) { @@ -314,7 +314,7 @@ Signed-off-by: Tamizh Chelvam Raja } } spin_unlock_bh(&dp->reo_cmd_lock); -@@ -876,34 +953,48 @@ free_desc: +@@ -819,34 +896,48 @@ free_desc: void ath11k_peer_rx_tid_delete(struct ath11k *ar, struct ath11k_peer *peer, u8 tid) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch b/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch index 144d5a9ca4d36c..020df707b6e6a4 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch @@ -21,11 +21,9 @@ Signed-off-by: Aaradhana Sahu drivers/net/wireless/ath/ath11k/dp_tx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/drivers/net/wireless/ath/ath11k/dp_tx.c b/drivers/net/wireless/ath/ath11k/dp_tx.c -index 3d8417d..5c034e6 100644 --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -347,7 +347,8 @@ tcl_ring_sel: +@@ -221,7 +221,8 @@ tcl_ring_sel: switch (ti.encap_type) { case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: @@ -35,7 +33,7 @@ index 3d8417d..5c034e6 100644 is_diff_encap = true; else ath11k_dp_tx_encap_nwifi(skb); -@@ -375,7 +376,7 @@ tcl_ring_sel: +@@ -247,7 +248,7 @@ tcl_ring_sel: if ((!test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags) && !(info->control.flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && !info->control.hw_key && ieee80211_has_protected(hdr->frame_control)) || @@ -44,6 +42,3 @@ index 3d8417d..5c034e6 100644 /* HW requirement is that metadata should always point to a * 8-byte aligned address. So we add alignment pad to start of * buffer. HTT Metadata should be ensured to be multiple of 8-bytes --- -2.17.1 - diff --git a/package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch b/package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch index 6b4433aafa4f41..df9fb62bcd17b4 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/376-ath11k-Add-nss-event-handler-support-for-link-desc.patch @@ -16,7 +16,7 @@ Signed-off-by: Tamizh Chelvam Raja --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -72,6 +72,43 @@ static void ath11k_nss_wifili_stats_sync +@@ -101,6 +101,43 @@ static void ath11k_nss_wifili_stats_sync spin_unlock_bh(&ab->base_lock); } @@ -60,9 +60,9 @@ Signed-off-by: Tamizh Chelvam Raja static void ath11k_nss_get_peer_stats(struct ath11k_base *ab, struct nss_wifili_peer_stats *stats) { struct ath11k_peer *peer; -@@ -333,6 +370,10 @@ void ath11k_nss_wifili_event_receive(str - ath11k_dbg(ab, ATH11K_DBG_NSS_WDS, "nss wifili peer 4addr event received %d response %d error %d\n", - msg_type, response, error); +@@ -369,6 +406,10 @@ void ath11k_nss_wifili_event_receive(str + ath11k_dbg(ab, ATH11K_DBG_NSS_MESH, "nss wifili mesh capability response %d\n", + ab->nss.mesh_nss_offload_enabled); break; + case NSS_WIFILI_LINK_DESC_INFO_MSG: + ath11k_nss_wifili_link_desc_return(ab, diff --git a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch index 2b7d9c50c0c776..510fbc2448cee7 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch @@ -11,11 +11,9 @@ Signed-off-by: Yuvasree Sivasankaran drivers/net/wireless/ath/ath11k/mac.c | 1 + 1 file changed, 1 insertion(+) -diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c -index 3e79e07..32ff5c9 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -13034,6 +13034,7 @@ static int __ath11k_mac_register(struct ath11k *ar) +@@ -10141,6 +10141,7 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); @@ -23,6 +21,3 @@ index 3e79e07..32ff5c9 100644 if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET) { ieee80211_hw_set(ar->hw, SUPPORTS_TX_ENCAP_OFFLOAD); --- -2.34.1 - diff --git a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch index de7f697c7ccb7c..c23b6cb3c858b4 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch @@ -48,7 +48,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6292,7 +6292,9 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6090,7 +6090,9 @@ int ath11k_dp_rx_process_mon_status(stru if (!num_buffs_reaped) goto exit; @@ -59,7 +59,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; while ((skb = __skb_dequeue(&skb_list))) { -@@ -6310,7 +6312,6 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6108,7 +6110,6 @@ int ath11k_dp_rx_process_mon_status(stru if (log_type != ATH11K_PKTLOG_TYPE_INVALID) trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); @@ -67,14 +67,14 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb); -@@ -6326,6 +6327,7 @@ int ath11k_dp_rx_process_mon_status(stru - if (ppdu_info->peer_id == HAL_INVALID_PEERID || - hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { +@@ -6136,6 +6137,7 @@ int ath11k_dp_rx_process_mon_status(stru + if ((ppdu_info->peer_id == HAL_INVALID_PEERID || + hal_status != HAL_RX_MON_STATUS_PPDU_DONE)) { dev_kfree_skb_any(skb); + ppdu_info->ppdu_continuation = true; continue; } - + rcu_read_lock(); --- a/drivers/net/wireless/ath/ath11k/hal_rx.h +++ b/drivers/net/wireless/ath/ath11k/hal_rx.h @@ -221,6 +221,7 @@ struct hal_rx_mon_ppdu_info { diff --git a/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch b/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch index 04d842e96a107b..6399718268b0b1 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch @@ -18,7 +18,7 @@ Signed-off-by: Karthikeyan Periyasamy --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -217,7 +217,8 @@ tcl_ring_sel: +@@ -222,7 +222,8 @@ tcl_ring_sel: switch (ti.encap_type) { case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch index f5301ca9e4890f..b471fb326a5b48 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch @@ -26,7 +26,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -8232,7 +8232,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8221,7 +8221,6 @@ ath11k_mac_op_assign_vif_chanctx(struct struct ath11k_base *ab = ar->ab; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); int ret; @@ -34,7 +34,7 @@ Acked-by: Jeff Johnson mutex_lock(&ar->conf_mutex); -@@ -8255,21 +8254,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8244,21 +8243,6 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch index 2490a8139d452a..2fb2cdfd429b11 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch @@ -30,7 +30,7 @@ Acked-by: Jeff Johnson enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) { -@@ -5323,7 +5323,7 @@ static int ath11k_mac_station_add(struct +@@ -5319,7 +5319,7 @@ static int ath11k_mac_station_add(struct if (ab->hw_params.vdev_start_delay && !arvif->is_started && arvif->vdev_type != WMI_VDEV_TYPE_AP) { @@ -39,7 +39,7 @@ Acked-by: Jeff Johnson if (ret) { ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); goto free_tx_stats; -@@ -8175,8 +8175,8 @@ unlock: +@@ -8164,8 +8164,8 @@ unlock: mutex_unlock(&ar->conf_mutex); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch index 3b6e24ae508bbe..4d83d0f0ed9029 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch @@ -28,7 +28,7 @@ Acked-by: Jeff Johnson enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) { enum nl80211_he_ru_alloc ret; -@@ -5253,100 +5250,6 @@ static void ath11k_mac_dec_num_stations( +@@ -5249,100 +5246,6 @@ static void ath11k_mac_dec_num_stations( ar->num_stations--; } @@ -129,7 +129,7 @@ Acked-by: Jeff Johnson static u32 ath11k_mac_ieee80211_sta_bw_to_wmi(struct ath11k *ar, struct ieee80211_sta *sta) { -@@ -5402,187 +5305,6 @@ static int ath11k_mac_cfg_dyn_vlan(struc +@@ -5398,187 +5301,6 @@ static int ath11k_mac_cfg_dyn_vlan(struc return ret; } @@ -317,7 +317,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) -@@ -9735,6 +9457,281 @@ ath11k_mac_op_config_mesh_offload_path(s +@@ -9739,6 +9461,281 @@ ath11k_mac_op_config_mesh_offload_path(s } #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch index e8e663431217c5..d1b462519c91e8 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch @@ -52,7 +52,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7937,6 +7937,30 @@ static int ath11k_mac_start_vdev_delay(s +@@ -7933,6 +7933,30 @@ static int ath11k_mac_start_vdev_delay(s return 0; } @@ -83,7 +83,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -@@ -7981,15 +8005,17 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -7977,15 +8001,17 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } @@ -109,7 +109,7 @@ Acked-by: Jeff Johnson if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &ar->monitor_flags)) { -@@ -8029,8 +8055,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8025,8 +8051,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc "chanctx unassign ptr %p vdev_id %i\n", ctx, arvif->vdev_id); @@ -118,7 +118,7 @@ Acked-by: Jeff Johnson if (ab->hw_params.vdev_start_delay && arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { spin_lock_bh(&ab->base_lock); -@@ -8054,24 +8078,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8050,24 +8074,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc return; } @@ -149,7 +149,7 @@ Acked-by: Jeff Johnson } if (ab->hw_params.vdev_start_delay && -@@ -9551,6 +9564,46 @@ exit: +@@ -9555,6 +9568,46 @@ exit: return ret; } @@ -196,7 +196,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -9586,31 +9639,15 @@ static int ath11k_mac_op_sta_state(struc +@@ -9590,31 +9643,15 @@ static int ath11k_mac_op_sta_state(struc sta->addr, arvif->vdev_id); } else if ((old_state == IEEE80211_STA_NONE && new_state == IEEE80211_STA_NOTEXIST)) { @@ -233,7 +233,7 @@ Acked-by: Jeff Johnson ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", vif->addr, arvif->vdev_id); ath11k_peer_rhash_delete(ar->ab, peer); -@@ -9621,12 +9658,6 @@ static int ath11k_mac_op_sta_state(struc +@@ -9625,12 +9662,6 @@ static int ath11k_mac_op_sta_state(struc } spin_unlock_bh(&ar->ab->base_lock); mutex_unlock(&ar->ab->tbl_mtx_lock); @@ -246,9 +246,9 @@ Acked-by: Jeff Johnson } else if (old_state == IEEE80211_STA_AUTH && new_state == IEEE80211_STA_ASSOC && (vif->type == NL80211_IFTYPE_AP || -@@ -10195,6 +10226,8 @@ static int __ath11k_mac_register(struct - wiphy_ext_feature_set(ar->hw->wiphy, - NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); +@@ -10202,6 +10233,8 @@ static int __ath11k_mac_register(struct + + wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); + wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); + diff --git a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch index 3bcf93279c5a2f..2362820dc9e838 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch @@ -40,7 +40,7 @@ ath11k-$(CPTCFG_ATH11K_THERMAL) += thermal.o --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1919,7 +1919,9 @@ int ath11k_debugfs_register(struct ath11 +@@ -1875,7 +1875,9 @@ int ath11k_debugfs_register(struct ath11 snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); @@ -120,7 +120,7 @@ &fops_peer_ps_state); --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1664,8 +1664,10 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1723,8 +1723,10 @@ ath11k_update_per_peer_tx_stats(struct a peer_stats->mu_pos = mu_pos; peer_stats->ru_tones = arsta->txrate.he_ru_alloc; @@ -131,7 +131,7 @@ } usr_stats->rate_stats_updated = true; -@@ -2105,7 +2107,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -2170,7 +2172,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s ath11k_htt_pull_ppdu_stats(ab, skb); break; case HTT_T2H_MSG_TYPE_EXT_STATS_CONF: @@ -176,7 +176,7 @@ spin_unlock_bh(&ab->base_lock); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9869,7 +9869,7 @@ static const struct ieee80211_ops ath11k +@@ -9812,7 +9812,7 @@ static const struct ieee80211_ops ath11k .set_wakeup = ath11k_wow_op_set_wakeup, #endif diff --git a/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch b/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch index 3b9f555b3bce51..d89cfbe51cb8ab 100644 --- a/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch +++ b/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -9224,7 +9224,7 @@ void cfg80211_bss_flush(struct wiphy *wi +@@ -9247,7 +9247,7 @@ void cfg80211_bss_flush(struct wiphy *wi * @count: the number of TBTTs until the color change happens * @color_bitmap: representations of the colors that the local BSS is aware of */ @@ -9,7 +9,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap); -@@ -9234,9 +9234,9 @@ int cfg80211_bss_color_notify(struct net +@@ -9257,9 +9257,9 @@ int cfg80211_bss_color_notify(struct net * @color_bitmap: representations of the colors that the local BSS is aware of */ static inline int cfg80211_obss_color_collision_notify(struct net_device *dev, @@ -21,7 +21,7 @@ 0, color_bitmap); } -@@ -9250,7 +9250,7 @@ static inline int cfg80211_obss_color_co +@@ -9273,7 +9273,7 @@ static inline int cfg80211_obss_color_co static inline int cfg80211_color_change_started_notify(struct net_device *dev, u8 count) { @@ -30,7 +30,7 @@ count, 0); } -@@ -9262,7 +9262,7 @@ static inline int cfg80211_color_change_ +@@ -9285,7 +9285,7 @@ static inline int cfg80211_color_change_ */ static inline int cfg80211_color_change_aborted_notify(struct net_device *dev) { @@ -39,7 +39,7 @@ 0, 0); } -@@ -9274,7 +9274,7 @@ static inline int cfg80211_color_change_ +@@ -9297,7 +9297,7 @@ static inline int cfg80211_color_change_ */ static inline int cfg80211_color_change_notify(struct net_device *dev) { @@ -50,7 +50,7 @@ } --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -4771,7 +4771,7 @@ void ieee80211_color_collision_detection +@@ -4780,7 +4780,7 @@ void ieee80211_color_collision_detection struct ieee80211_sub_if_data *sdata = link->sdata; sdata_lock(sdata); @@ -72,7 +72,7 @@ sdata->debugfs.subdir_stations = debugfs_create_dir("stations", --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -1407,18 +1407,6 @@ static void __sta_info_destroy_part2(str +@@ -1410,18 +1410,6 @@ static void __sta_info_destroy_part2(str WARN_ON_ONCE(ret); } @@ -93,7 +93,7 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -19406,7 +19406,7 @@ void cfg80211_ch_switch_started_notify(s +@@ -19472,7 +19472,7 @@ void cfg80211_ch_switch_started_notify(s } EXPORT_SYMBOL(cfg80211_ch_switch_started_notify); @@ -102,7 +102,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap) { -@@ -19420,7 +19420,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19486,7 +19486,7 @@ int cfg80211_bss_color_notify(struct net trace_cfg80211_bss_color_notify(dev, cmd, count, color_bitmap); @@ -111,7 +111,7 @@ if (!msg) return -ENOMEM; -@@ -19443,7 +19443,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19509,7 +19509,7 @@ int cfg80211_bss_color_notify(struct net genlmsg_end(msg, hdr); return genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), diff --git a/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch b/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch index 82d8c4e05bb11f..a5da9e91eae835 100644 --- a/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch +++ b/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4686,8 +4686,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4688,8 +4688,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 if (!key) key = rcu_dereference(sdata->default_unicast_key); diff --git a/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch index 1c508dc8884c96..2943f6b04bad5c 100644 --- a/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch @@ -53,7 +53,7 @@ Signed-off-by: Sriram R }; /** -@@ -1406,7 +1422,7 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1408,7 +1424,7 @@ ieee80211_tx_info_clear_status(struct ie * @RX_FLAG_AMPDU_EOF_BIT_KNOWN: The EOF value is known * @RX_FLAG_RADIOTAP_HE: HE radiotap data is present * (&struct ieee80211_radiotap_he, mac80211 will fill in @@ -62,7 +62,7 @@ Signed-off-by: Sriram R * - DATA3_DATA_MCS * - DATA3_DATA_DCM * - DATA3_CODING -@@ -1414,7 +1430,7 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1416,7 +1432,7 @@ ieee80211_tx_info_clear_status(struct ie * - DATA5_DATA_BW_RU_ALLOC * - DATA6_NSTS * - DATA3_STBC @@ -71,7 +71,7 @@ Signed-off-by: Sriram R * from the RX info data, so leave those zeroed when building this data) * @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present * (&struct ieee80211_radiotap_he_mu) -@@ -1987,6 +2003,16 @@ static inline bool lockdep_vif_mutex_hel +@@ -1989,6 +2005,16 @@ static inline bool lockdep_vif_mutex_hel lockdep_vif_mutex_held(vif)) /** @@ -88,7 +88,7 @@ Signed-off-by: Sriram R * enum ieee80211_key_flags - key flags * * These flags are used for communication about keys between the driver -@@ -2677,6 +2703,8 @@ struct ieee80211_txq { +@@ -2680,6 +2706,8 @@ struct ieee80211_txq { * @IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX: Hardware/driver handles transmitting * multicast frames on all links, mac80211 should not do that. * @@ -97,7 +97,7 @@ Signed-off-by: Sriram R * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2734,6 +2762,7 @@ enum ieee80211_hw_flags { +@@ -2737,6 +2765,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_CONC_MON_RX_DECAP, IEEE80211_HW_DETECTS_COLOR_COLLISION, IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, @@ -105,7 +105,7 @@ Signed-off-by: Sriram R /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS -@@ -3746,6 +3775,10 @@ struct ieee80211_prep_tx_info { +@@ -3749,6 +3778,10 @@ struct ieee80211_prep_tx_info { * non-MLO connections. * The callback can sleep. * @@ -116,7 +116,7 @@ Signed-off-by: Sriram R * @prepare_multicast: Prepare for multicast filter configuration. * This callback is optional, and its return value is passed * to configure_filter(). This callback must be atomic. -@@ -4297,7 +4330,9 @@ struct ieee80211_ops { +@@ -4300,7 +4333,9 @@ struct ieee80211_ops { struct ieee80211_vif *vif, struct ieee80211_bss_conf *info, u64 changed); @@ -127,7 +127,7 @@ Signed-off-by: Sriram R int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *link_conf); void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -@@ -4602,7 +4637,7 @@ struct ieee80211_ops { +@@ -4605,7 +4640,7 @@ struct ieee80211_ops { int (*reset_tid_config)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, u8 tids); @@ -138,7 +138,7 @@ Signed-off-by: Sriram R struct ieee80211_sta *sta, bool enabled); --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c -@@ -496,6 +496,7 @@ static const char *hw_flag_names[] = { +@@ -505,6 +505,7 @@ static const char *hw_flag_names[] = { FLAG(SUPPORTS_CONC_MON_RX_DECAP), FLAG(DETECTS_COLOR_COLLISION), FLAG(MLO_MCAST_MULTI_LINK_TX), @@ -191,7 +191,7 @@ Signed-off-by: Sriram R u64 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) { sdata->vif.bss_conf.use_cts_prot = false; -@@ -694,12 +705,6 @@ struct ieee80211_hw *ieee80211_alloc_hw_ +@@ -691,12 +702,6 @@ struct ieee80211_hw *ieee80211_alloc_hw_ NL80211_FEATURE_FULL_AP_CLIENT_STATE; wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_FILS_STA); wiphy_ext_feature_set(wiphy, @@ -204,7 +204,7 @@ Signed-off-by: Sriram R NL80211_EXT_FEATURE_SCAN_FREQ_KHZ); wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_POWERED_ADDR_CHANGE); -@@ -1007,6 +1012,18 @@ int ieee80211_register_hw(struct ieee802 +@@ -1005,6 +1010,18 @@ int ieee80211_register_hw(struct ieee802 return -EINVAL; } @@ -225,7 +225,7 @@ Signed-off-by: Sriram R return -EINVAL; --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -2368,6 +2368,9 @@ sta_get_last_rx_stats(struct sta_info *s +@@ -2370,6 +2370,9 @@ sta_get_last_rx_stats(struct sta_info *s struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; int cpu; @@ -237,7 +237,7 @@ Signed-off-by: Sriram R --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1028,11 +1028,23 @@ ieee80211_tx_h_stats(struct ieee80211_tx +@@ -1029,11 +1029,23 @@ ieee80211_tx_h_stats(struct ieee80211_tx { struct sk_buff *skb; int ac = -1; @@ -261,7 +261,7 @@ Signed-off-by: Sriram R ac = skb_get_queue_mapping(skb); tx->sta->deflink.tx_stats.bytes[ac] += skb->len; } -@@ -2857,7 +2869,9 @@ static struct sk_buff *ieee80211_build_h +@@ -2858,7 +2870,9 @@ static struct sk_buff *ieee80211_build_h if (unlikely(!multicast && ((skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || @@ -272,7 +272,7 @@ Signed-off-by: Sriram R info_id = ieee80211_store_ack_skb(local, skb, &info_flags, cookie); -@@ -4639,13 +4653,16 @@ static void ieee80211_8023_xmit(struct i +@@ -4641,13 +4655,16 @@ static void ieee80211_8023_xmit(struct i } if (unlikely(skb->sk && @@ -306,7 +306,7 @@ Signed-off-by: Sriram R gfp); --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2675,7 +2675,7 @@ static int ieee80211_change_bss(struct w +@@ -2679,7 +2679,7 @@ static int ieee80211_change_bss(struct w struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_link_data *link; struct ieee80211_supported_band *sband; @@ -315,7 +315,7 @@ Signed-off-by: Sriram R link = ieee80211_link_or_deflink(sdata, params->link_id, true); if (IS_ERR(link)) -@@ -2725,6 +2725,8 @@ static int ieee80211_change_bss(struct w +@@ -2729,6 +2729,8 @@ static int ieee80211_change_bss(struct w sdata->flags |= IEEE80211_SDATA_DONT_BRIDGE_PACKETS; else sdata->flags &= ~IEEE80211_SDATA_DONT_BRIDGE_PACKETS; @@ -324,7 +324,7 @@ Signed-off-by: Sriram R ieee80211_check_fast_rx_iface(sdata); } -@@ -2753,6 +2755,8 @@ static int ieee80211_change_bss(struct w +@@ -2757,6 +2759,8 @@ static int ieee80211_change_bss(struct w ieee80211_link_info_change_notify(sdata, link, changed); @@ -361,7 +361,7 @@ Signed-off-by: Sriram R { --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1845,6 +1845,8 @@ void ieee80211_vif_cfg_change_notify(str +@@ -1847,6 +1847,8 @@ void ieee80211_vif_cfg_change_notify(str void ieee80211_link_info_change_notify(struct ieee80211_sub_if_data *sdata, struct ieee80211_link_data *link, u64 changed); diff --git a/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch b/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch index 87c2a52b676f21..fffe171334c9a4 100644 --- a/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch +++ b/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch @@ -18,7 +18,7 @@ Signed-off-by: P Praneesh --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -6213,7 +6213,13 @@ start_xmit: +@@ -6215,7 +6215,13 @@ start_xmit: mutex_lock(&local->mtx); local_bh_disable(); diff --git a/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch b/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch index db6550ab79c2cc..bd9c1c024b1e5d 100644 --- a/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch +++ b/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch @@ -31,7 +31,7 @@ Signed-off-by: Muna Sinada --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -9229,4 +9229,15 @@ bool cfg80211_valid_disable_subchannel_b +@@ -9327,4 +9327,15 @@ bool cfg80211_valid_disable_subchannel_b */ void cfg80211_links_removed(struct net_device *dev, u16 link_mask); @@ -49,7 +49,7 @@ Signed-off-by: Muna Sinada #endif /* __NET_CFG80211_H */ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -7353,6 +7353,20 @@ u32 ieee80211_calc_rx_airtime(struct iee +@@ -7361,6 +7361,20 @@ u32 ieee80211_calc_rx_airtime(struct iee int len); /** @@ -91,18 +91,18 @@ Signed-off-by: Muna Sinada /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ -@@ -2818,6 +2823,8 @@ enum nl80211_commands { - * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce - * transmit power to stay within regulatory limits. u32, dBi. +@@ -2815,6 +2820,8 @@ enum nl80211_commands { + * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is + * disabled. * + * @NL80211_ATTR_HE_MUEDCA_PARAMS: MU-EDCA AC parameters for the + * %NL80211_CMD_UPDATE_HE_MUEDCA_PARAMS command. * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use -@@ -3358,6 +3365,8 @@ enum nl80211_attrs { +@@ -3353,6 +3360,8 @@ enum nl80211_attrs { - NL80211_ATTR_WIPHY_ANTENNA_GAIN, + NL80211_ATTR_MLO_LINK_DISABLED, + NL80211_ATTR_HE_MUEDCA_PARAMS, + @@ -111,7 +111,7 @@ Signed-off-by: Muna Sinada __NL80211_ATTR_AFTER_LAST, --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -7910,3 +7910,15 @@ void ieee80211_disable_rssi_reports(stru +@@ -7954,3 +7954,15 @@ void ieee80211_disable_rssi_reports(stru _ieee80211_enable_rssi_reports(sdata, 0, 0); } EXPORT_SYMBOL(ieee80211_disable_rssi_reports); @@ -129,7 +129,7 @@ Signed-off-by: Muna Sinada +EXPORT_SYMBOL(ieee80211_update_muedca_params); --- a/net/mac80211/trace.h +++ b/net/mac80211/trace.h -@@ -3085,6 +3085,26 @@ TRACE_EVENT(stop_queue, +@@ -3092,6 +3092,26 @@ TRACE_EVENT(stop_queue, ) ); @@ -158,7 +158,7 @@ Signed-off-by: Muna Sinada #undef TRACE_INCLUDE_PATH --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -20170,6 +20170,42 @@ nla_put_failure: +@@ -20199,6 +20199,42 @@ nla_put_failure: } EXPORT_SYMBOL(cfg80211_update_owe_info_event); diff --git a/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch index af46c8f0bfa05e..15d796071fa077 100644 --- a/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch +++ b/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -29,7 +29,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* misc utils */ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, -@@ -4268,6 +4271,8 @@ void __ieee80211_subif_start_xmit(struct +@@ -4270,6 +4273,8 @@ void __ieee80211_subif_start_xmit(struct struct sta_info *sta; struct sk_buff *next; int len = skb->len; @@ -38,7 +38,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { kfree_skb(skb); -@@ -4289,6 +4294,19 @@ void __ieee80211_subif_start_xmit(struct +@@ -4291,6 +4296,19 @@ void __ieee80211_subif_start_xmit(struct if (IS_ERR(sta)) sta = NULL; diff --git a/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch b/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch index c9a12d5f127cbe..a4895803b38ba0 100644 --- a/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch @@ -136,7 +136,7 @@ Signed-off-by: Sowmiya Sree Elavalagan return 0; --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -2570,6 +2570,54 @@ static bool ieee80211_frame_allowed(stru +@@ -2569,6 +2569,54 @@ static bool ieee80211_frame_allowed(stru return true; } @@ -191,7 +191,7 @@ Signed-off-by: Sowmiya Sree Elavalagan static void ieee80211_deliver_skb_to_local_stack(struct sk_buff *skb, struct ieee80211_rx_data *rx) { -@@ -2609,11 +2657,15 @@ static void ieee80211_deliver_skb_to_loc +@@ -2608,11 +2656,15 @@ static void ieee80211_deliver_skb_to_loc !ether_addr_equal(ehdr->h_dest, sdata->vif.addr))) ether_addr_copy(ehdr->h_dest, sdata->vif.addr); @@ -209,7 +209,7 @@ Signed-off-by: Sowmiya Sree Elavalagan --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4501,6 +4501,35 @@ static void ieee80211_mlo_multicast_tx(s +@@ -4503,6 +4503,35 @@ static void ieee80211_mlo_multicast_tx(s kfree_skb(skb); } @@ -245,7 +245,7 @@ Signed-off-by: Sowmiya Sree Elavalagan /** * ieee80211_subif_start_xmit - netif start_xmit function for 802.3 vifs * @skb: packet to be sent -@@ -4514,6 +4543,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -4516,6 +4545,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); const struct ethhdr *eth = (void *)skb->data; @@ -256,7 +256,7 @@ Signed-off-by: Sowmiya Sree Elavalagan if (likely(!is_multicast_ether_addr(eth->h_dest))) goto normal; -@@ -4700,6 +4733,9 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4702,6 +4735,9 @@ netdev_tx_t ieee80211_subif_start_xmit_8 struct ieee80211_key *key; struct sta_info *sta; diff --git a/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch b/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch index cf3784afa29b2a..55e2fff1560fb8 100644 --- a/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch +++ b/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch @@ -21,7 +21,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -5095,6 +5095,17 @@ void ieee80211_sta_pspoll(struct ieee802 +@@ -5098,6 +5098,17 @@ void ieee80211_sta_pspoll(struct ieee802 */ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); @@ -41,7 +41,7 @@ Signed-off-by: Sathishkumar Muruganandam * This is enough for the radiotap header. --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2176,7 +2176,13 @@ static int ieee80211_change_station(stru +@@ -2180,7 +2180,13 @@ static int ieee80211_change_station(stru rcu_assign_pointer(vlansdata->u.vlan.sta, sta); __ieee80211_check_fast_rx_iface(vlansdata); @@ -137,8 +137,8 @@ Signed-off-by: Sathishkumar Muruganandam { --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4298,8 +4298,13 @@ void __ieee80211_subif_start_xmit(struct - atomic_inc(&sta->tx_netif_pkts); +@@ -4297,8 +4297,13 @@ void __ieee80211_subif_start_xmit(struct + sta = NULL; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { - ap_sdata = container_of(sdata->bss, @@ -153,7 +153,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ap_sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED && !is_multicast_ether_addr(skb->data)) { if (sta) -@@ -4692,7 +4692,8 @@ static void ieee80211_8023_xmit(struct i +@@ -4688,7 +4693,8 @@ static void ieee80211_8023_xmit(struct i info->hw_queue = sdata->vif.hw_queue[queue]; @@ -197,7 +197,7 @@ Signed-off-by: Sathishkumar Muruganandam drv_remove_interface(local, sdata); --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c -@@ -5218,7 +5218,8 @@ static bool ieee80211_assoc_success(stru +@@ -5259,7 +5259,8 @@ static bool ieee80211_assoc_success(stru * If we're using 4-addr mode, let the AP know that we're * doing so, so that it can create the STA VLAN on its side */ diff --git a/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch b/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch index 453f516497a5b5..803ee900bfdcc1 100644 --- a/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch @@ -24,7 +24,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2084,6 +2084,8 @@ enum ieee80211_key_flags { +@@ -2086,6 +2086,8 @@ enum ieee80211_key_flags { * @tx_pn: PN used for TX keys, may be used by the driver as well if it * needs to do software PN assignment by itself (e.g. due to TSO) * @flags: key flags, see &enum ieee80211_key_flags. @@ -33,7 +33,7 @@ Signed-off-by: Sathishkumar Muruganandam * @keyidx: the key index (0-3) * @keylen: key material length * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) -@@ -2103,6 +2105,7 @@ struct ieee80211_key_conf { +@@ -2105,6 +2107,7 @@ struct ieee80211_key_conf { u8 hw_key_idx; s8 keyidx; u16 flags; @@ -102,7 +102,7 @@ Signed-off-by: Sathishkumar Muruganandam key->conf.cipher = cipher; --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4654,16 +4654,25 @@ static void ieee80211_8023_xmit(struct i +@@ -4649,16 +4649,25 @@ static void ieee80211_8023_xmit(struct i struct ieee80211_key *key, struct sk_buff *skb) { struct ieee80211_tx_info *info; diff --git a/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch b/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch index 5fc14bf1d44f37..46b716419a7cd8 100644 --- a/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch +++ b/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch @@ -77,7 +77,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* then other type-dependent work */ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4676,19 +4676,21 @@ static void ieee80211_8023_xmit(struct i +@@ -4678,19 +4678,21 @@ static void ieee80211_8023_xmit(struct i ieee80211_aggr_check(sdata, sta, skb); @@ -111,7 +111,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran } skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata)); -@@ -4745,7 +4747,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4747,7 +4749,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ethhdr *ehdr = (struct ethhdr *)skb->data; @@ -120,7 +120,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct sta_info *sta; #ifdef CPTCFG_MAC80211_NSS_SUPPORT -@@ -4763,9 +4765,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4765,9 +4767,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto out; } @@ -137,7 +137,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); -@@ -4776,6 +4782,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4778,6 +4784,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto skip_offload; sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); @@ -145,7 +145,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran ieee80211_8023_xmit(sdata, dev, sta, key, skb); goto out; -@@ -6282,13 +6289,7 @@ start_xmit: +@@ -6284,13 +6291,7 @@ start_xmit: mutex_lock(&local->mtx); if (pubsta) { diff --git a/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch index 5e0a156312fe4e..55ad36baf69aa4 100644 --- a/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch @@ -66,7 +66,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran }; /* -@@ -792,6 +801,11 @@ struct ieee80211_bss_conf { +@@ -790,6 +799,11 @@ struct ieee80211_bss_conf { bool he_full_ul_mumimo; bool eht_su_beamformer; bool eht_su_beamformee; @@ -112,7 +112,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran }; -@@ -2768,6 +2788,7 @@ enum ieee80211_hw_flags { +@@ -2769,6 +2789,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_DETECTS_COLOR_COLLISION, IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, @@ -120,7 +120,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS -@@ -4268,6 +4289,8 @@ struct ieee80211_prep_tx_info { +@@ -4269,6 +4290,8 @@ struct ieee80211_prep_tx_info { * @set_sar_specs: Update the SAR (TX power) settings. * @sta_set_decap_offload: Called to notify the driver when a station is allowed * to use rx decapsulation offload @@ -129,7 +129,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran * @add_twt_setup: Update hw with TWT agreement parameters received from the peer. * This callback allows the hw to check if requested parameters * are supported and if there is enough room for a new agreement. -@@ -4651,6 +4674,12 @@ struct ieee80211_ops { +@@ -4652,6 +4675,12 @@ struct ieee80211_ops { void (*sta_set_decap_offload)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool enabled); @@ -142,7 +142,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran void (*add_twt_setup)(struct ieee80211_hw *hw, struct ieee80211_sta *sta, struct ieee80211_twt_setup *twt); -@@ -7509,4 +7538,100 @@ int ieee80211_set_active_links(struct ie +@@ -7510,4 +7539,100 @@ int ieee80211_set_active_links(struct ie void ieee80211_set_active_links_async(struct ieee80211_vif *vif, u16 active_links); @@ -245,7 +245,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran #endif /* MAC80211_H */ --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2521,6 +2521,7 @@ static int ieee80211_update_mesh_config( +@@ -2523,6 +2523,7 @@ static int ieee80211_update_mesh_config( struct mesh_config *conf; struct ieee80211_sub_if_data *sdata; struct ieee80211_if_mesh *ifmsh; @@ -253,7 +253,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran sdata = IEEE80211_DEV_TO_SUB_IF(dev); ifmsh = &sdata->u.mesh; -@@ -2537,8 +2538,11 @@ static int ieee80211_update_mesh_config( +@@ -2539,8 +2540,11 @@ static int ieee80211_update_mesh_config( conf->dot11MeshMaxPeerLinks = nconf->dot11MeshMaxPeerLinks; if (_chg_mesh_attr(NL80211_MESHCONF_MAX_RETRIES, mask)) conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries; @@ -266,7 +266,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask)) conf->element_ttl = nconf->element_ttl; if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask)) { -@@ -2552,8 +2556,12 @@ static int ieee80211_update_mesh_config( +@@ -2554,8 +2558,12 @@ static int ieee80211_update_mesh_config( if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES, mask)) conf->dot11MeshHWMPmaxPREQretries = nconf->dot11MeshHWMPmaxPREQretries; @@ -280,7 +280,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT, mask)) conf->min_discovery_timeout = nconf->min_discovery_timeout; if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT, mask)) -@@ -2588,8 +2596,12 @@ static int ieee80211_update_mesh_config( +@@ -2590,8 +2598,12 @@ static int ieee80211_update_mesh_config( if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) conf->dot11MeshHWMPRannInterval = nconf->dot11MeshHWMPRannInterval; @@ -294,7 +294,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) { /* our RSSI threshold implementation is supported only for * devices that report signal in dBm. -@@ -2631,6 +2643,7 @@ static int ieee80211_update_mesh_config( +@@ -2633,6 +2645,7 @@ static int ieee80211_update_mesh_config( conf->dot11MeshConnectedToAuthServer = nconf->dot11MeshConnectedToAuthServer; ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON); @@ -330,7 +330,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran sdata, fmt, ##__VA_ARGS__) --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c -@@ -497,6 +497,7 @@ static const char *hw_flag_names[] = { +@@ -506,6 +506,7 @@ static const char *hw_flag_names[] = { FLAG(DETECTS_COLOR_COLLISION), FLAG(MLO_MCAST_MULTI_LINK_TX), FLAG(SUPPORTS_NSS_OFFLOAD), @@ -340,7 +340,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran --- a/net/mac80211/driver-ops.c +++ b/net/mac80211/driver-ops.c -@@ -572,3 +572,23 @@ int drv_change_sta_links(struct ieee8021 +@@ -579,3 +579,23 @@ int drv_change_sta_links(struct ieee8021 return 0; } @@ -379,7 +379,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran #endif /* __MAC80211_DRIVER_OPS */ --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h -@@ -316,6 +316,10 @@ void mesh_rx_path_sel_frame(struct ieee8 +@@ -315,6 +315,10 @@ void mesh_rx_path_sel_frame(struct ieee8 struct ieee80211_mgmt *mgmt, size_t len); struct mesh_path * mesh_path_add(struct ieee80211_sub_if_data *sdata, const u8 *dst); @@ -390,7 +390,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran int mesh_path_add_gate(struct mesh_path *mpath); int mesh_path_send_to_gates(struct mesh_path *mpath); -@@ -357,6 +361,7 @@ void mesh_path_discard_frame(struct ieee +@@ -356,6 +360,7 @@ void mesh_path_discard_frame(struct ieee void mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata); bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt); @@ -1173,7 +1173,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata) --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -2609,7 +2609,7 @@ static struct sk_buff *ieee80211_build_h +@@ -2610,7 +2610,7 @@ static struct sk_buff *ieee80211_build_h bool multicast; u16 info_id = 0; struct ieee80211_chanctx_conf *chanctx_conf = NULL; @@ -1182,7 +1182,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran int ret; u8 link_id = u32_get_bits(ctrl_flags, IEEE80211_TX_CTRL_MLO_LINK); -@@ -2621,6 +2621,9 @@ static struct sk_buff *ieee80211_build_h +@@ -2622,6 +2622,9 @@ static struct sk_buff *ieee80211_build_h info_flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; #endif @@ -1192,7 +1192,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* convert Ethernet header to proper 802.11 header (based on * operation mode) */ ethertype = (skb->data[12] << 8) | skb->data[13]; -@@ -2691,6 +2694,13 @@ static struct sk_buff *ieee80211_build_h +@@ -2692,6 +2695,13 @@ static struct sk_buff *ieee80211_build_h break; #ifdef CPTCFG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT: @@ -1206,7 +1206,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (!is_multicast_ether_addr(skb->data)) { struct sta_info *next_hop; bool mpp_lookup = true; -@@ -2954,10 +2964,10 @@ static struct sk_buff *ieee80211_build_h +@@ -2955,10 +2965,10 @@ static struct sk_buff *ieee80211_build_h skb_reset_mac_header(skb); @@ -1221,7 +1221,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran info->ack_frame_id = info_id; info->band = band; -@@ -4272,6 +4282,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4274,6 +4284,7 @@ void __ieee80211_subif_start_xmit(struct struct sk_buff *next; int len = skb->len; struct ieee80211_key *key = NULL; @@ -1229,7 +1229,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct ieee80211_sub_if_data *ap_sdata; if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { -@@ -4348,9 +4359,15 @@ void __ieee80211_subif_start_xmit(struct +@@ -4350,9 +4361,15 @@ void __ieee80211_subif_start_xmit(struct goto out; } diff --git a/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index b488e431c6cd3c..f78d7ce6e09304 100644 --- a/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -16,7 +16,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2728,6 +2728,8 @@ struct ieee80211_txq { +@@ -2731,6 +2731,8 @@ struct ieee80211_txq { * * @IEEE80211_HW_SUPPORTS_NSS_OFFLOAD: Hardware/driver supports NSS offload * @@ -25,7 +25,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2787,6 +2789,7 @@ enum ieee80211_hw_flags { +@@ -2790,6 +2792,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, @@ -35,7 +35,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran NUM_IEEE80211_HW_FLAGS --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c -@@ -498,6 +498,7 @@ static const char *hw_flag_names[] = { +@@ -507,6 +507,7 @@ static const char *hw_flag_names[] = { FLAG(MLO_MCAST_MULTI_LINK_TX), FLAG(SUPPORTS_NSS_OFFLOAD), FLAG(SUPPORTS_MESH_NSS_OFFLOAD), diff --git a/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch b/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch index 0a3e71bee9716f..63373b7751f9eb 100644 --- a/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch +++ b/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch @@ -14,7 +14,7 @@ Signed-off-by: Aloka Dixit --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4759,6 +4759,67 @@ out_free: +@@ -4761,6 +4761,67 @@ out_free: kfree_skb(skb); } @@ -82,7 +82,7 @@ Signed-off-by: Aloka Dixit netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { -@@ -4798,6 +4859,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4800,6 +4861,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))) goto skip_offload; diff --git a/package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch b/package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch index eb6c51c8ba0cad..0b89a11957bec4 100644 --- a/package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/336-mac80211-Mesh-Fast-rx-support.patch @@ -20,7 +20,7 @@ Signed-off-by: Sriram R --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -1747,6 +1747,8 @@ static void sta_apply_mesh_params(struct +@@ -1750,6 +1750,8 @@ static void sta_apply_mesh_params(struct /* init at low value */ ewma_mesh_tx_rate_avg_add(&sta->mesh->tx_rate_avg, 10); @@ -29,7 +29,7 @@ Signed-off-by: Sriram R break; case NL80211_PLINK_LISTEN: case NL80211_PLINK_BLOCKED: -@@ -1761,6 +1763,7 @@ static void sta_apply_mesh_params(struct +@@ -1764,6 +1766,7 @@ static void sta_apply_mesh_params(struct ieee80211_mps_sta_status_update(sta); changed |= ieee80211_mps_set_sta_local_pm(sta, NL80211_MESH_POWER_UNKNOWN); @@ -121,7 +121,7 @@ Signed-off-by: Sriram R offload_flags = get_bss_sdata(sdata)->vif.offload_flags; offload = offload_flags & IEEE80211_OFFLOAD_DECAP_ENABLED; -@@ -4876,6 +4881,10 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4875,6 +4880,10 @@ static bool ieee80211_invoke_fast_rx(str u8 sa[ETH_ALEN]; } addrs __aligned(2); struct ieee80211_sta_rx_stats *stats; @@ -132,7 +132,7 @@ Signed-off-by: Sriram R /* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write * to a common data structure; drivers can implement that per queue -@@ -4925,6 +4934,37 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4924,6 +4933,37 @@ static bool ieee80211_invoke_fast_rx(str snap_offs += IEEE80211_CCMP_HDR_LEN; } @@ -170,7 +170,7 @@ Signed-off-by: Sriram R if (!ieee80211_vif_is_mesh(&rx->sdata->vif) && !(status->rx_flags & IEEE80211_RX_AMSDU)) { if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) -@@ -4962,9 +5002,33 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4961,9 +5001,33 @@ static bool ieee80211_invoke_fast_rx(str return true; } diff --git a/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch b/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch index 0be0c6106bf788..0cb2a1e95244e3 100644 --- a/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch +++ b/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch @@ -33,7 +33,7 @@ Signed-off-by: Tamizh Chelvam --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4711,7 +4711,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4695,7 +4695,7 @@ static void ieee80211_8023_xmit(struct i ieee80211_aggr_check(sdata, sta, skb); @@ -42,7 +42,7 @@ Signed-off-by: Tamizh Chelvam tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]); if (tid_tx) { -@@ -4762,7 +4762,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4746,7 +4746,7 @@ static void ieee80211_8023_xmit(struct i &info->flags, NULL); dev_sw_netstats_tx_add(dev, skbs, len); diff --git a/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch b/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch index 5fd21ba6a4d42b..808f69e644ed61 100644 --- a/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch +++ b/package/kernel/mac80211/patches/nss/subsys/345-mac80211-fix-mixed-declaration.patch @@ -10,11 +10,9 @@ Signed-off-by: Hari Chandrakanthan net/mac80211/spectmgmt.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) -diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c -index 76747bf..7ddfb96 100644 --- a/net/mac80211/spectmgmt.c +++ b/net/mac80211/spectmgmt.c -@@ -33,7 +33,10 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, +@@ -33,7 +33,10 @@ int ieee80211_parse_ch_switch_ie(struct struct cfg80211_chan_def new_vht_chandef = {}; const struct ieee80211_sec_chan_offs_ie *sec_chan_offs; const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie; @@ -25,7 +23,7 @@ index 76747bf..7ddfb96 100644 memset(csa_ie, 0, sizeof(*csa_ie)); -@@ -133,20 +136,13 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, +@@ -133,20 +136,13 @@ int ieee80211_parse_ch_switch_ie(struct } if (wide_bw_chansw_ie) { @@ -52,6 +50,3 @@ index 76747bf..7ddfb96 100644 /* default, for the case of IEEE80211_VHT_CHANWIDTH_USE_HT, * to the previously parsed chandef --- -2.7.4 - diff --git a/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch b/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch index 82e44b83600984..df2b3a9257b115 100644 --- a/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch +++ b/package/kernel/mac80211/patches/nss/subsys/346-mac80211-fix-bw-change-to-40Mhz-during-channel-switc.patch @@ -19,11 +19,9 @@ Signed-off-by: Hari Chandrakanthan net/mac80211/spectmgmt.c | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/net/mac80211/spectmgmt.c b/net/mac80211/spectmgmt.c -index 7ddfb96..15c7ac3 100644 --- a/net/mac80211/spectmgmt.c +++ b/net/mac80211/spectmgmt.c -@@ -136,6 +136,10 @@ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, +@@ -136,6 +136,10 @@ int ieee80211_parse_ch_switch_ie(struct } if (wide_bw_chansw_ie) { @@ -34,6 +32,3 @@ index 7ddfb96..15c7ac3 100644 new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1; vht_oper.chan_width = wide_bw_chansw_ie->new_channel_width; vht_oper.center_freq_seg0_idx = wide_bw_chansw_ie->new_center_freq_seg0; --- -2.7.4 - diff --git a/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch b/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch index eaec491461b6cc..2cb2ebe6f58f76 100644 --- a/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch +++ b/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch @@ -14,7 +14,7 @@ Signed-off-by: P Praneesh --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1427,8 +1427,6 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1405,8 +1405,6 @@ ieee80211_tx_info_clear_status(struct ie * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected * on this subframe @@ -23,7 +23,7 @@ Signed-off-by: P Praneesh * @RX_FLAG_MIC_STRIPPED: The mic was stripped of this packet. Decryption was * done by the hardware * @RX_FLAG_ONLY_MONITOR: Report frame only to monitor interfaces without -@@ -1500,22 +1498,21 @@ enum mac80211_rx_flags { +@@ -1478,22 +1476,21 @@ enum mac80211_rx_flags { RX_FLAG_AMPDU_LAST_KNOWN = BIT(12), RX_FLAG_AMPDU_IS_LAST = BIT(13), RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(14), @@ -63,7 +63,7 @@ Signed-off-by: P Praneesh /** --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -517,18 +517,13 @@ ieee80211_add_rx_radiotap_header(struct +@@ -507,18 +507,13 @@ ieee80211_add_rx_radiotap_header(struct flags |= IEEE80211_RADIOTAP_AMPDU_IS_LAST; if (status->flag & RX_FLAG_AMPDU_DELIM_CRC_ERROR) flags |= IEEE80211_RADIOTAP_AMPDU_DELIM_CRC_ERR; diff --git a/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch b/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch index e0415032bb8ae7..a947728fc661f1 100644 --- a/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch +++ b/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch @@ -20,7 +20,7 @@ Signed-off-by: Aaradhana Sahu --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -2061,6 +2061,11 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -2063,6 +2063,11 @@ netdev_tx_t ieee80211_subif_start_xmit(s struct net_device *dev); netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev); @@ -44,7 +44,7 @@ Signed-off-by: Aaradhana Sahu /* misc utils */ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, -@@ -4320,7 +4321,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4319,7 +4320,7 @@ void __ieee80211_subif_start_xmit(struct !is_multicast_ether_addr(skb->data)) { if (sta) key = rcu_dereference(sta->ptk[sta->ptk_idx]); @@ -53,7 +53,7 @@ Signed-off-by: Aaradhana Sahu rcu_read_unlock(); return; } -@@ -4366,7 +4367,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4365,7 +4366,7 @@ void __ieee80211_subif_start_xmit(struct if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { if (sta) key = rcu_dereference(sta->ptk[sta->ptk_idx]); @@ -62,7 +62,7 @@ Signed-off-by: Aaradhana Sahu } else { dev_sw_netstats_tx_add(dev, 1, skb->len); ieee80211_xmit(sdata, sta, skb); -@@ -4667,7 +4668,8 @@ static bool ieee80211_tx_8023(struct iee +@@ -4663,7 +4664,8 @@ static bool ieee80211_tx_8023(struct iee static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, @@ -72,7 +72,7 @@ Signed-off-by: Aaradhana Sahu { struct ieee80211_tx_info *info; struct ethhdr *ehdr = (struct ethhdr *)skb->data; -@@ -4723,6 +4725,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4719,6 +4721,7 @@ static void ieee80211_8023_xmit(struct i info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); @@ -80,7 +80,7 @@ Signed-off-by: Aaradhana Sahu info->hw_queue = sdata->vif.hw_queue[queue]; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && -@@ -4743,11 +4746,12 @@ static void ieee80211_8023_xmit(struct i +@@ -4739,11 +4742,12 @@ static void ieee80211_8023_xmit(struct i memcpy(IEEE80211_SKB_CB(seg), info, sizeof(*info)); } @@ -96,7 +96,7 @@ Signed-off-by: Aaradhana Sahu dev_sw_netstats_tx_add(dev, skbs, len); if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta) { -@@ -4770,7 +4774,8 @@ out_free: +@@ -4763,7 +4767,8 @@ out_free: void ieee80211_8023_xmit_ap(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, @@ -106,7 +106,7 @@ Signed-off-by: Aaradhana Sahu { struct ieee80211_tx_info *info; struct ieee80211_local *local = sdata->local; -@@ -4779,6 +4784,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4772,6 +4777,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 unsigned long flags; int q; u16 q_map; @@ -116,7 +116,7 @@ Signed-off-by: Aaradhana Sahu /* * If the skb is shared we need to obtain our own copy. -@@ -4790,11 +4798,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4783,11 +4791,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); @@ -133,9 +133,9 @@ Signed-off-by: Aaradhana Sahu info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; info->control.vif = &sdata->vif; -@@ -4831,14 +4841,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 - if (sta) - atomic_inc(&sta->tx_drv_pkts); +@@ -4821,14 +4831,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 + drv_tx(local, &control, skb); + } - netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, @@ -158,7 +158,7 @@ Signed-off-by: Aaradhana Sahu #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); -@@ -4854,14 +4873,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4844,14 +4863,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 kfree_skb(skb); goto out; } @@ -176,7 +176,7 @@ Signed-off-by: Aaradhana Sahu goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); -@@ -4872,13 +4892,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4862,13 +4882,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto skip_offload; if (sdata->vif.type == NL80211_IFTYPE_AP) { @@ -192,7 +192,7 @@ Signed-off-by: Aaradhana Sahu goto out; skip_offload: -@@ -6384,7 +6404,10 @@ start_xmit: +@@ -6374,7 +6394,10 @@ start_xmit: mutex_lock(&local->mtx); local_bh_disable(); diff --git a/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch b/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch index 61421d7d766950..7ffaf99158b90e 100644 --- a/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch +++ b/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch @@ -72,7 +72,7 @@ Signed-off-by: P Praneesh --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2373,7 +2373,7 @@ static void mpath_set_pinfo(struct mesh_ +@@ -2350,7 +2350,7 @@ static void mpath_set_pinfo(struct mesh_ if (mpath->flags & MESH_PATH_RESOLVED) pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED; pinfo->hop_count = mpath->hop_count; @@ -94,7 +94,7 @@ Signed-off-by: P Praneesh #define MESH_FAST_TX_CACHE_MAX_SIZE 512 --- a/net/mac80211/mesh_hwmp.c +++ b/net/mac80211/mesh_hwmp.c -@@ -510,7 +510,7 @@ static u32 hwmp_route_info_get(struct ie +@@ -504,7 +504,7 @@ static u32 hwmp_route_info_get(struct ie if (next_hop) ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); if (next_hop != sta) { @@ -103,7 +103,7 @@ Signed-off-by: P Praneesh flush_mpath = true; } mesh_path_assign_nexthop(mpath, sta); -@@ -571,7 +571,7 @@ static u32 hwmp_route_info_get(struct ie +@@ -565,7 +565,7 @@ static u32 hwmp_route_info_get(struct ie if (next_hop) ether_addr_copy(old_next_hop_addr, next_hop->sta.addr); if (next_hop != sta) { diff --git a/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch b/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch index e3c2db4cc8a713..8d8c3c68d58c91 100644 --- a/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch +++ b/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch @@ -19,7 +19,7 @@ Signed-off-by: Ramanathan Choodamani --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4572,6 +4572,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -4571,6 +4571,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); #endif @@ -27,7 +27,7 @@ Signed-off-by: Ramanathan Choodamani if (likely(!is_multicast_ether_addr(eth->h_dest))) goto normal; -@@ -4844,7 +4845,43 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4834,7 +4835,43 @@ void ieee80211_8023_xmit_ap(struct ieee8 netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { diff --git a/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch index a2a9879f25285b..6b5cf7f3e24660 100644 --- a/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch +++ b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch @@ -31,7 +31,7 @@ Signed-off-by: Tamizh Chelvam Raja static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, struct ieee80211_key *key, struct sk_buff *skb, -@@ -3631,7 +3633,7 @@ ieee80211_sdata_netdev_features(struct i +@@ -3632,7 +3634,7 @@ ieee80211_sdata_netdev_features(struct i } static struct sk_buff * @@ -40,7 +40,7 @@ Signed-off-by: Tamizh Chelvam Raja { if (skb_is_gso(skb)) { struct sk_buff *segs; -@@ -3649,7 +3651,7 @@ ieee80211_tx_skb_fixup(struct sk_buff *s +@@ -3650,7 +3652,7 @@ ieee80211_tx_skb_fixup(struct sk_buff *s if (skb_needs_linearize(skb, features) && __skb_linearize(skb)) goto free; @@ -49,7 +49,7 @@ Signed-off-by: Tamizh Chelvam Raja int ofs = skb_checksum_start_offset(skb); if (skb->encapsulation) -@@ -3795,7 +3797,7 @@ static bool ieee80211_xmit_fast(struct i +@@ -3796,7 +3798,7 @@ static bool ieee80211_xmit_fast(struct i memcpy(ð, skb->data, ETH_HLEN - 2); /* after this point (skb is modified) we cannot return false */ @@ -58,7 +58,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) return true; -@@ -4344,7 +4346,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4343,7 +4345,7 @@ void __ieee80211_subif_start_xmit(struct * things so we cannot really handle checksum or GSO offload. * fix it up in software before we handle anything else. */ @@ -67,7 +67,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) { len = 0; goto out; -@@ -4572,7 +4574,6 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -4571,7 +4573,6 @@ netdev_tx_t ieee80211_subif_start_xmit(s #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); #endif @@ -75,7 +75,7 @@ Signed-off-by: Tamizh Chelvam Raja if (likely(!is_multicast_ether_addr(eth->h_dest))) goto normal; -@@ -4719,7 +4720,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4715,7 +4716,7 @@ static void ieee80211_8023_xmit(struct i } } @@ -84,7 +84,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) return; -@@ -4845,6 +4846,7 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4835,6 +4836,7 @@ void ieee80211_8023_xmit_ap(struct ieee8 netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { @@ -92,7 +92,7 @@ Signed-off-by: Tamizh Chelvam Raja struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_control control = {}; -@@ -4879,9 +4881,10 @@ out: +@@ -4869,9 +4871,10 @@ out: } return NETDEV_TX_OK; diff --git a/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch b/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch index e25220a1b01c99..b76692a6f9500c 100644 --- a/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch +++ b/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch @@ -23,7 +23,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2727,6 +2727,9 @@ struct ieee80211_txq { +@@ -2730,6 +2730,9 @@ struct ieee80211_txq { * * @IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD: Hardware suports tid calssification offload. * @@ -33,7 +33,7 @@ Signed-off-by: Yuvasree Sivasankaran * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2787,6 +2790,7 @@ enum ieee80211_hw_flags { +@@ -2790,6 +2793,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD, @@ -43,7 +43,7 @@ Signed-off-by: Yuvasree Sivasankaran NUM_IEEE80211_HW_FLAGS --- a/net/mac80211/debugfs.c +++ b/net/mac80211/debugfs.c -@@ -499,6 +499,7 @@ static const char *hw_flag_names[] = { +@@ -508,6 +508,7 @@ static const char *hw_flag_names[] = { FLAG(SUPPORTS_NSS_OFFLOAD), FLAG(SUPPORTS_MESH_NSS_OFFLOAD), FLAG(SUPPORTS_TID_CLASS_OFFLOAD), @@ -53,7 +53,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -1602,6 +1602,9 @@ int ieee80211_txq_setup_flows(struct iee +@@ -1603,6 +1603,9 @@ int ieee80211_txq_setup_flows(struct iee bool supp_vht = false; enum nl80211_band band; @@ -63,7 +63,7 @@ Signed-off-by: Yuvasree Sivasankaran ret = fq_init(fq, 4096); if (ret) return ret; -@@ -1649,6 +1652,9 @@ void ieee80211_txq_teardown_flows(struct +@@ -1650,6 +1653,9 @@ void ieee80211_txq_teardown_flows(struct { struct fq *fq = &local->fq; @@ -73,7 +73,7 @@ Signed-off-by: Yuvasree Sivasankaran kfree(local->cvars); local->cvars = NULL; -@@ -1665,7 +1671,8 @@ static bool ieee80211_queue_skb(struct i +@@ -1666,7 +1672,8 @@ static bool ieee80211_queue_skb(struct i struct ieee80211_vif *vif; struct txq_info *txqi; @@ -83,7 +83,7 @@ Signed-off-by: Yuvasree Sivasankaran return false; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) -@@ -4326,7 +4333,8 @@ void __ieee80211_subif_start_xmit(struct +@@ -4328,7 +4335,8 @@ void __ieee80211_subif_start_xmit(struct } } @@ -93,7 +93,7 @@ Signed-off-by: Yuvasree Sivasankaran ieee80211_aggr_check(sdata, sta, skb); if (sta) { -@@ -4678,8 +4686,10 @@ static void ieee80211_8023_xmit(struct i +@@ -4680,8 +4688,10 @@ static void ieee80211_8023_xmit(struct i bool multicast; u8 tid; @@ -106,7 +106,7 @@ Signed-off-by: Yuvasree Sivasankaran multicast = is_multicast_ether_addr(ra); -@@ -6414,9 +6424,12 @@ int ieee80211_tx_control_port(struct wip +@@ -6416,9 +6426,12 @@ int ieee80211_tx_control_port(struct wip } if (!IS_ERR(sta)) { @@ -123,7 +123,7 @@ Signed-off-by: Yuvasree Sivasankaran * for MLO STA, the SA should be the AP MLD address, but --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -4516,6 +4516,9 @@ static int ieee80211_get_txq_stats(struc +@@ -4525,6 +4525,9 @@ static int ieee80211_get_txq_stats(struc struct ieee80211_sub_if_data *sdata; int ret = 0; @@ -135,7 +135,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/net/mac80211/main.c +++ b/net/mac80211/main.c -@@ -841,7 +841,10 @@ struct ieee80211_hw *ieee80211_alloc_hw_ +@@ -839,7 +839,10 @@ struct ieee80211_hw *ieee80211_alloc_hw_ atomic_set(&local->agg_queue_stop[i], 0); } tasklet_setup(&local->tx_pending_tasklet, ieee80211_tx_pending); @@ -185,7 +185,7 @@ Signed-off-by: Yuvasree Sivasankaran } for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { -@@ -427,7 +429,9 @@ void sta_info_free(struct ieee80211_loca +@@ -430,7 +432,9 @@ void sta_info_free(struct ieee80211_loca sta_dbg(sta->sdata, "Destroyed STA %pM\n", sta->sta.addr); @@ -196,7 +196,7 @@ Signed-off-by: Yuvasree Sivasankaran kfree(rcu_dereference_raw(sta->sta.rates)); #ifdef CPTCFG_MAC80211_MESH kfree(sta->mesh); -@@ -529,8 +533,6 @@ __sta_info_alloc(struct ieee80211_sub_if +@@ -532,8 +536,6 @@ __sta_info_alloc(struct ieee80211_sub_if struct ieee80211_local *local = sdata->local; struct ieee80211_hw *hw = &local->hw; struct sta_info *sta; @@ -205,7 +205,7 @@ Signed-off-by: Yuvasree Sivasankaran int i; sta = kzalloc(sizeof(*sta) + hw->sta_data_size, gfp); -@@ -604,18 +606,22 @@ __sta_info_alloc(struct ieee80211_sub_if +@@ -607,18 +609,22 @@ __sta_info_alloc(struct ieee80211_sub_if sta->last_connected = ktime_get_seconds(); @@ -237,7 +237,7 @@ Signed-off-by: Yuvasree Sivasankaran } if (sta_prepare_rate_control(local, sta, gfp)) -@@ -689,7 +695,8 @@ __sta_info_alloc(struct ieee80211_sub_if +@@ -692,7 +698,8 @@ __sta_info_alloc(struct ieee80211_sub_if return sta; free_txq: @@ -247,7 +247,7 @@ Signed-off-by: Yuvasree Sivasankaran free: sta_info_free_link(&sta->deflink); #ifdef CPTCFG_MAC80211_MESH -@@ -1684,11 +1691,13 @@ void ieee80211_sta_ps_deliver_wakeup(str +@@ -1687,11 +1694,13 @@ void ieee80211_sta_ps_deliver_wakeup(str if (!ieee80211_hw_check(&local->hw, AP_LINK_PS)) drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta); @@ -265,7 +265,7 @@ Signed-off-by: Yuvasree Sivasankaran } skb_queue_head_init(&pending); -@@ -2103,6 +2112,9 @@ ieee80211_sta_ps_deliver_response(struct +@@ -2106,6 +2115,9 @@ ieee80211_sta_ps_deliver_response(struct * TIM recalculation. */ @@ -275,7 +275,7 @@ Signed-off-by: Yuvasree Sivasankaran for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { if (!sta->sta.txq[tid] || !(driver_release_tids & BIT(tid)) || -@@ -2519,7 +2531,7 @@ static void sta_set_tidstats(struct sta_ +@@ -2521,7 +2533,7 @@ static void sta_set_tidstats(struct sta_ tidstats->tx_msdu_failed = sta->deflink.status_stats.msdu_failed[tid]; } @@ -284,7 +284,7 @@ Signed-off-by: Yuvasree Sivasankaran spin_lock_bh(&local->fq.lock); rcu_read_lock(); -@@ -2847,6 +2859,9 @@ unsigned long ieee80211_sta_last_active( +@@ -2849,6 +2861,9 @@ unsigned long ieee80211_sta_last_active( static void sta_update_codel_params(struct sta_info *sta, u32 thr) { diff --git a/package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch b/package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch index c19d97a818ba17..642901bed17459 100644 --- a/package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch +++ b/package/kernel/mac80211/patches/nss/subsys/829-mac80211-fix-mesh-ping-issue.patch @@ -10,7 +10,7 @@ Signed-off-by: Aaradhana Sahu --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c -@@ -4649,16 +4649,14 @@ void ieee80211_check_fast_rx(struct sta_ +@@ -4647,16 +4647,14 @@ void ieee80211_check_fast_rx(struct sta_ break; case NL80211_IFTYPE_MESH_POINT: @@ -31,7 +31,7 @@ Signed-off-by: Aaradhana Sahu default: goto clear; } -@@ -4881,10 +4879,7 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4878,10 +4876,7 @@ static bool ieee80211_invoke_fast_rx(str u8 sa[ETH_ALEN]; } addrs __aligned(2); struct ieee80211_sta_rx_stats *stats; @@ -42,7 +42,7 @@ Signed-off-by: Aaradhana Sahu /* for parallel-rx, we need to have DUP_VALIDATED, otherwise we write * to a common data structure; drivers can implement that per queue -@@ -4934,37 +4929,6 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4931,37 +4926,6 @@ static bool ieee80211_invoke_fast_rx(str snap_offs += IEEE80211_CCMP_HDR_LEN; } @@ -80,7 +80,7 @@ Signed-off-by: Aaradhana Sahu if (!ieee80211_vif_is_mesh(&rx->sdata->vif) && !(status->rx_flags & IEEE80211_RX_AMSDU)) { if (!pskb_may_pull(skb, snap_offs + sizeof(*payload))) -@@ -5002,30 +4966,6 @@ static bool ieee80211_invoke_fast_rx(str +@@ -4999,30 +4963,6 @@ static bool ieee80211_invoke_fast_rx(str return true; } diff --git a/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch b/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch index ea76cd96327e46..e3d8db5815fe88 100644 --- a/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch +++ b/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch @@ -36,7 +36,7 @@ Signed-off-by: Manish Dharanenthiran --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c -@@ -1183,7 +1183,7 @@ void ieee80211_mbss_info_change_notify(s +@@ -1184,7 +1184,7 @@ void ieee80211_mbss_info_change_notify(s /* if we race with running work, worst case this work becomes a noop */ for_each_set_bit(bit, &bits, sizeof(changed) * BITS_PER_BYTE) @@ -45,7 +45,7 @@ Signed-off-by: Manish Dharanenthiran set_bit(MESH_WORK_MBSS_CHANGED, &ifmsh->wrkq_flags); wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } -@@ -1265,7 +1265,7 @@ void ieee80211_stop_mesh(struct ieee8021 +@@ -1266,7 +1266,7 @@ void ieee80211_stop_mesh(struct ieee8021 /* clear any mesh work (for next join) we may have accrued */ ifmsh->wrkq_flags = 0; @@ -54,7 +54,7 @@ Signed-off-by: Manish Dharanenthiran local->fif_other_bss--; atomic_dec(&local->iff_allmultis); -@@ -1732,9 +1732,9 @@ static void mesh_bss_info_changed(struct +@@ -1733,9 +1733,9 @@ static void mesh_bss_info_changed(struct u32 bit; u64 changed = 0; From 57dc340b0074240dda807a5b1ed421eb2bd064f8 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 9 Mar 2024 11:15:21 -0500 Subject: [PATCH 64/80] ath11k_nss: Set correct pbufs for 1GB profile --- package/kernel/mac80211/files/qca-nss-pbuf.init | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mac80211/files/qca-nss-pbuf.init b/package/kernel/mac80211/files/qca-nss-pbuf.init index f4f45b9a4a4c60..c6d6b8b2238074 100755 --- a/package/kernel/mac80211/files/qca-nss-pbuf.init +++ b/package/kernel/mac80211/files/qca-nss-pbuf.init @@ -105,7 +105,7 @@ apply_nss_config() { yuncore,ax880 | \ zyxel,nbg7815 | \ 1g*) - extra_pbuf_core0=9000000 n2h_high_water_core0=67392 n2h_wifi_pool_buf=40960 apply_sysctl + extra_pbuf_core0=10000000 n2h_high_water_core0=72512 n2h_wifi_pool_buf=36864 apply_sysctl ;; # 512MB profile edimax,cax1800 | \ @@ -115,12 +115,12 @@ apply_nss_config() { xiaomi,ax3600 | \ zte,mf269 | \ 512m*) - extra_pbuf_core0=3100000 n2h_high_water_core0=30624 n2h_wifi_pool_buf=8192 apply_sysctl + extra_pbuf_core0=3100000 n2h_high_water_core0=30624 n2h_wifi_pool_buf=8192 apply_sysctl ;; # 256MB profile netgear,wax218 | \ 256m*) - extra_pbuf_core0=3100000 n2h_high_water_core0=30258 n2h_wifi_pool_buf=4096 apply_sysctl + extra_pbuf_core0=3100000 n2h_high_water_core0=30258 n2h_wifi_pool_buf=4096 apply_sysctl ;; esac } From f233c2a496bfa90b19def9c666c0392febbf2328 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 9 Mar 2024 11:17:51 -0500 Subject: [PATCH 65/80] qualcommax: remove uneeded btcoex dts not needed for NSS offload and helps save some memory --- .../patches-6.6/9999-add-btcoex-dts.patch | 30 ------------------- 1 file changed, 30 deletions(-) delete mode 100644 target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch diff --git a/target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch b/target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch deleted file mode 100644 index 83825b782c1b7f..00000000000000 --- a/target/linux/qualcommax/patches-6.6/9999-add-btcoex-dts.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- linux-6.1.71/arch/arm64/boot/dts/qcom/ipq8074.dtsi 2024-01-07 01:44:56.908138962 -0500 -+++ linux-6.1.71/arch/arm64/boot/dts/qcom/ipq8074.dtsi 2024-01-07 01:44:58.908138962 -0500 -@@ -1170,7 +1170,14 @@ - wifi: wifi@c0000000 { - compatible = "qcom,ipq8074-wifi"; - reg = <0xc000000 0x2000000>; -- -+ qcom,hw-mode-id = <1>; -+ #ifdef __IPQ_MEM_PROFILE_256_MB__ -+ qcom,tgt-mem-mode = <2>; -+ #elif __IPQ_MEM_PROFILE_512_MB__ -+ qcom,tgt-mem-mode = <1>; -+ #else -+ qcom,tgt-mem-mode = <0>; -+ #endif - interrupts = , - , - , -@@ -1276,6 +1283,12 @@ - "tcl2host-status-ring"; - qcom,rproc = <&q6v5_wcss>; - status = "disabled"; -+ qcom,pta-num = <0>; -+ qcom,coex-mode = <0x2>; -+ qcom,bt-active-time = <0x12>; -+ qcom,bt-priority-time = <0x0c>; -+ qcom,coex-algo = <0x2>; -+ qcom,pta-priority = <0x80800505>; - }; - }; From d15ff3dc51e044dc1bbefa648b7519eae8a9118a Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 9 Mar 2024 11:31:54 -0500 Subject: [PATCH 66/80] ath11k_nss: Revert setting fw_mem_mode for IPQ807x Leave it set to '0', as it will kernel panic with 2K skb patch. This flag was incorrectly assumed to save memory on 1G platforms. ath11k_nss: remove leftover max_tx_ring it was not removed when applying patch to replace it with 'max_tx_ring = DP_TCL_NUM_RING_MAX +1' ath11k_nss: Import bugfix patches ath11k_nss: Experimental build for IPQ6018 This will require setting the correct `ATH11K_MEM_PROFILE_XXX` for your platform. Setting it to value lower/higher than physically available will cause NULL virtual address kernel panics. I believe this setting was not originally meant to reduce memory footprint of 1G+ platforms, but to account for platforms that were 512M or less. Will require tweaking to allow for the old behvaior on 1G+ IPQ807x, while still saving memory for platforms <= 512M. --- ...207-ath11k-Enable-256_512MB-profiles.patch | 41 +- ...11k-Disable-rx_header-tlv-for-2K-SKB.patch | 1016 +++++++++++++++++ ...pport-for-WDS-offload-in-NSS-offload.patch | 24 +- ...-dynamic-VLAN-support-in-NSS-offload.patch | 16 +- ...ow-fast-rx-by-bypassing-stats-update.patch | 4 +- ...ow-fast-rx-by-bypassing-stats-update.patch | 46 +- .../nss/ath11k/244-ath11k-dp-tx-perf.patch | 26 +- .../300-ath11k-nss-mesh-offload-support.patch | 20 +- ...lookup-failure-in-mgmt-tx-completion.patch | 2 +- ...e-free-of-peer-rx_tid-during-reo-cmd.patch | 2 +- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 2 +- ...ing-rx-stats-with-monitor-vif-enable.patch | 8 +- ...1k-skip-status-ring-entry-processing.patch | 8 +- ...356-ath11k-invalid-desc-sanity-check.patch | 6 +- ...-fix-tkip-encryption-traffic-failure.patch | 2 +- ...Fix-ppdu_id-from-firmware-PPDU-stats.patch | 8 +- ...Add-retry-mechanism-for-update_rx_qu.patch | 18 +- ...ix-mutex-dead-lock-and-q6-dump-crash.patch | 59 + ...agement-frames-to-firmware-before-wa.patch | 43 + ...th11k-Advertise-TX_QUEUE-mac-hw-flag.patch | 2 +- ...oid-memset-of-ppdu-info-for-next-skb.patch | 6 +- ...a_map_single-to-virt_to_phys-in-rx-r.patch | 66 ++ ...11k-remove-invalid-peer-create-logic.patch | 4 +- ...th11k-rename-ath11k_start_vdev_delay.patch | 2 +- ...ation-of-ath11k_mac_start_vdev_delay.patch | 2 +- ...ailure-due-to-unexpected-peer-delete.patch | 16 +- ...k-make-debugfs-sta-htt-stats-modular.patch | 8 +- .../999-336-0002-ath11k-Use-idr_replace.patch | 264 +++++ 28 files changed, 1601 insertions(+), 120 deletions(-) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch diff --git a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch index d89b500015fc33..75e0bf1b79b844 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch @@ -228,15 +228,6 @@ Signed-off-by: Ramya Gnanasekar static struct ath11k_hw_params ath11k_hw_params[] = { { .hw_rev = ATH11K_HW_IPQ8074, -@@ -95,7 +97,7 @@ static struct ath11k_hw_params ath11k_hw - .coldboot_cal_mm = false, - .coldboot_cal_ftm = false, - .cbcal_restart_fw = true, -- .fw_mem_mode = 0, -+ .fw_mem_mode = ATH11K_QMI_TARGET_MEM_MODE, - .num_vdevs = 16 + 1, - .num_peers = 512, - .supports_suspend = false, @@ -127,6 +129,7 @@ static struct ath11k_hw_params ath11k_hw .tcl_ring_retry = true, .tx_ring_size = DP_TCL_DATA_RING_SIZE, @@ -254,7 +245,15 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -259,7 +262,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -210,6 +213,7 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = false, ++ .num_vdevs_peers = ath11k_vdevs_peers, + }, + { + .name = "qca6390 hw2.0", +@@ -259,7 +263,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -263,7 +262,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -426,7 +429,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -426,7 +430,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -272,7 +271,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -462,6 +465,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -462,6 +466,7 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = true, @@ -280,7 +279,7 @@ Signed-off-by: Ramya Gnanasekar }, { .name = "wcn6855 hw2.1", -@@ -509,7 +513,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -509,7 +514,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -289,7 +288,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -545,6 +549,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -545,6 +550,7 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = true, @@ -297,7 +296,7 @@ Signed-off-by: Ramya Gnanasekar }, { .name = "wcn6750 hw1.0", -@@ -593,7 +598,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -593,7 +599,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, .cbcal_restart_fw = false, @@ -306,7 +305,15 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -672,7 +677,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -626,6 +632,7 @@ static struct ath11k_hw_params ath11k_hw + .tx_ring_size = DP_TCL_DATA_RING_SIZE_WCN6750, + .smp2p_wow_exit = true, + .support_fw_mac_sequence = true, ++ .num_vdevs_peers = ath11k_vdevs_peers, + }, + { + .hw_rev = ATH11K_HW_IPQ5018_HW10, +@@ -672,7 +679,7 @@ static struct ath11k_hw_params ath11k_hw .supports_monitor = false, .supports_sta_ps = false, .supports_shadow_regs = false, @@ -315,7 +322,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_regdb = false, -@@ -707,6 +712,22 @@ static struct ath11k_hw_params ath11k_hw +@@ -707,6 +714,22 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, diff --git a/package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch b/package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch new file mode 100644 index 00000000000000..7b7673953bd4fe --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch @@ -0,0 +1,1016 @@ +From 30f54666ae15128f26fbad787a35253885a10513 Mon Sep 17 00:00:00 2001 +From: Ramya Gnanasekar +Date: Fri, 25 Dec 2020 16:11:06 +0530 +Subject: [PATCH] ath11k: Disable rx_header tlv for 2K SKB + +On low memory platform hdr_status in hal_rx_desc is not subscribed to +get a savings of 128bytes in skb. This is required to reduce the skb +size from 4K to 2K. Use HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG message +to unsubscribe rx_pkt_header tlv for rxdma ring. + +Signed-off-by: Ramya Gnanasekar + +--- a/drivers/net/wireless/ath/ath11k/debugfs.c ++++ b/drivers/net/wireless/ath/ath11k/debugfs.c +@@ -668,6 +668,7 @@ static ssize_t ath11k_write_extd_rx_stat + } + + ar->debug.rx_filter = tlv_filter.rx_filter; ++ tlv_filter.offset_valid = false; + + for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; +@@ -1129,6 +1130,7 @@ static ssize_t ath11k_write_pktlog_filte + } + + /* Clear rx filter set for monitor mode and rx status */ ++ tlv_filter.offset_valid = false; + for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; + ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id, +--- a/drivers/net/wireless/ath/ath11k/dp.h ++++ b/drivers/net/wireless/ath/ath11k/dp.h +@@ -219,7 +219,8 @@ struct ath11k_pdev_dp { + #define DP_REO_CMD_RING_SIZE 256 + #define DP_REO_STATUS_RING_SIZE 2048 + #define DP_RXDMA_BUF_RING_SIZE 4096 +-#define DP_RXDMA_REFILL_RING_SIZE 2048 ++#define DP_RXDMA_REFILL_RING_SIZE ATH11K_DP_RXDMA_REFILL_RING_SIZE ++#define DP_RXDMA_NSS_REFILL_RING_SIZE ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE + #define DP_RXDMA_ERR_DST_RING_SIZE 1024 + #define DP_RXDMA_MON_STATUS_RING_SIZE ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE + #define DP_RXDMA_MONITOR_BUF_RING_SIZE ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE +@@ -648,7 +649,7 @@ enum htt_stats_internal_ppdu_frametype { + * + * |31 26|25|24|23 16|15 8|7 0| + * |-----------------+----------------+----------------+---------------| +- * | rsvd1 |PS|SS| ring_id | pdev_id | msg_type | ++ * | rsvd1|OV|PS|SS| ring_id | pdev_id | msg_type | + * |-------------------------------------------------------------------| + * | rsvd2 | ring_buffer_size | + * |-------------------------------------------------------------------| +@@ -662,6 +663,14 @@ enum htt_stats_internal_ppdu_frametype { + * |-------------------------------------------------------------------| + * | tlv_filter_in_flags | + * |-------------------------------------------------------------------| ++ * | rx_header_offset | rx_packet_offset | ++ * |-------------------------------------------------------------------| ++ * | rx_mpdu_start_offset | rx_mpdu_end_offset | ++ * |-------------------------------------------------------------------| ++ * | rx_msdu_start_offset | rx_msdu_end_offset | ++ * |-------------------------------------------------------------------| ++ * | rsvd3 | rx_attention_offset | ++ * |-------------------------------------------------------------------| + * Where: + * PS = pkt_swap + * SS = status_swap +@@ -675,7 +684,10 @@ enum htt_stats_internal_ppdu_frametype { + * More details can be got from enum htt_srng_ring_id + * b'24 - status_swap: 1 is to swap status TLV + * b'25 - pkt_swap: 1 is to swap packet TLV +- * b'26:31 - rsvd1: reserved for future use ++ * b'26 - rx_offset_valid (OV): flag to indicate rx offsets ++ * configuration fields are valid ++ * ++ * b'27:31 - rsvd1: reserved for future use + * dword1 - b'0:16 - ring_buffer_size: size of buffers referenced by rx ring, + * in byte units. + * Valid only for HW_TO_SW_RING and SW_TO_HW_RING +@@ -704,6 +716,42 @@ enum htt_stats_internal_ppdu_frametype { + * dword6 - b'0:31 - tlv_filter_in_flags: + * Filter in Attention/MPDU/PPDU/Header/User tlvs + * Refer to CFG_TLV_FILTER_IN_FLAG defs ++ * dword7 - b'0:15 - rx_packet_offset: rx_packet_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_1 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rx_header_offset: rx_header_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_1 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * dword8 - b'0:15 - rx_mpdu_end_offset: rx_mpdu_end_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_2 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rx_mpdu_start_offset: rx_mpdu_start_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_2 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * dword9 - b'0:15 - rx_msdu_end_offset: rx_msdu_end_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_3 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rx_msdu_start_offset: rx_msdu_start_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_3 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * dword10- b'0:15 - rx_attention_offset: rx_attention_offset in byte units ++ * Valid only for HW_TO_SW_RING and SW_TO_HW_RING ++ * A value of 0 will be considered as ignore this config. ++ * Refer to BUF_RING_CFG_4 defs within HW .h files, ++ * e.g. wmac_top_reg_seq_hwioreg.h ++ * - b'16:31 - rsvd3 for future use + */ + + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) +@@ -711,8 +759,16 @@ enum htt_stats_internal_ppdu_frametype { + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID GENMASK(23, 16) + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS BIT(24) + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS BIT(25) ++#define HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID BIT(26) + + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET GENMASK(31, 16) ++#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET GENMASK(31, 16) ++#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET GENMASK(15, 0) ++#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET GENMASK(31, 16) ++#define HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET GENMASK(15, 0) + + enum htt_rx_filter_tlv_flags { + HTT_RX_FILTER_TLV_FLAGS_MPDU_START = BIT(0), +@@ -1016,6 +1072,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { + HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ + HTT_RX_FILTER_TLV_FLAGS_ATTENTION) + ++#define HTT_RX_RXDMA_FILTER_TLV_FLAGS_BUF_RING \ ++ (HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \ ++ HTT_RX_FILTER_TLV_FLAGS_MSDU_START | \ ++ HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \ ++ HTT_RX_FILTER_TLV_FLAGS_MSDU_END | \ ++ HTT_RX_FILTER_TLV_FLAGS_MPDU_END | \ ++ HTT_RX_FILTER_TLV_FLAGS_ATTENTION) ++ + struct htt_rx_ring_selection_cfg_cmd { + u32 info0; + u32 info1; +@@ -1024,6 +1088,10 @@ struct htt_rx_ring_selection_cfg_cmd { + u32 pkt_type_en_flags2; + u32 pkt_type_en_flags3; + u32 rx_filter_tlv; ++ u32 rx_packet_offset; ++ u32 rx_mpdu_offset; ++ u32 rx_msdu_offset; ++ u32 rx_attn_offset; + } __packed; + + struct htt_rx_ring_tlv_filter { +@@ -1032,6 +1100,14 @@ struct htt_rx_ring_tlv_filter { + u32 pkt_filter_flags1; /* MGMT */ + u32 pkt_filter_flags2; /* CTRL */ + u32 pkt_filter_flags3; /* DATA */ ++ bool offset_valid; ++ u16 rx_packet_offset; ++ u16 rx_header_offset; ++ u16 rx_mpdu_end_offset; ++ u16 rx_mpdu_start_offset; ++ u16 rx_msdu_end_offset; ++ u16 rx_msdu_start_offset; ++ u16 rx_attn_offset; + }; + + #define HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -70,6 +70,12 @@ static inline bool ath11k_dp_rx_h_mpdu_s + return ab->hw_params.hw_ops->rx_desc_get_mpdu_fc_valid(desc); + } + ++static u16 ath11k_dp_rxdesc_get_mpdu_frame_ctrl(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) ++{ ++ return ab->hw_params.hw_ops->rx_desc_get_mpdu_frame_ctl(desc); ++} ++ + static inline bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab, + struct sk_buff *skb) + { +@@ -306,6 +312,35 @@ static u8 *ath11k_dp_rxdesc_mpdu_start_a + return ab->hw_params.hw_ops->rx_desc_mpdu_start_addr2(desc); + } + ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static void ath11k_dp_get_rx_header_offset(struct ath11k_base *ab, ++ struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ ab->hw_params.hw_ops->rx_desc_get_offset(tlv_filter); ++} ++#endif ++ ++static bool ath11k_dp_rx_desc_dot11_hdr_fields_valid(struct ath11k_base *ab, ++ struct hal_rx_desc *desc) ++{ ++ return ab->hw_params.hw_ops->rx_desc_dot11_hdr_fields_valid(desc); ++} ++ ++static void ath11k_dp_rx_desc_get_dot11_hdr(struct ath11k_base *ab, ++ struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr) ++{ ++ ab->hw_params.hw_ops->rx_desc_get_dot11_hdr(desc, hdr); ++} ++ ++static void ath11k_dp_rx_desc_get_crypto_header(struct ath11k_base *ab, ++ struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype) ++{ ++ ab->hw_params.hw_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype); ++} ++ + static void ath11k_dp_service_mon_ring(struct timer_list *t) + { + struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer); +@@ -2134,6 +2169,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a + return 0; + } + ++static void ath11k_get_dot11_hdr_from_rx_desc(struct ath11k *ar, ++ struct sk_buff *msdu, ++ struct ath11k_skb_rxcb *rxcb, ++ struct ieee80211_rx_status *status, ++ enum hal_encrypt_type enctype) ++{ ++ struct hal_rx_desc *rx_desc = rxcb->rx_desc; ++ struct ath11k_base *ab = ar->ab; ++ size_t hdr_len, crypto_len; ++ struct ieee80211_hdr *hdr; ++ u16 fc, qos_ctl = 0; ++ u8 *crypto_hdr; ++ ++ if (!(status->flag & RX_FLAG_IV_STRIPPED)) { ++ crypto_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ crypto_hdr = skb_push(msdu, crypto_len); ++ ath11k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); ++ } ++ ++ fc = ath11k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc); ++ hdr_len = ieee80211_hdrlen(fc); ++ skb_push(msdu, hdr_len); ++ hdr = (struct ieee80211_hdr *)msdu->data; ++ hdr->frame_control = fc; ++ ++ /* Get wifi header from rx_desc */ ++ ath11k_dp_rx_desc_get_dot11_hdr(ab, rx_desc, hdr); ++ ++ if (rxcb->is_mcbc) ++ status->flag &= ~RX_FLAG_PN_VALIDATED; ++ ++ /* Add QOS header */ ++ if (ieee80211_is_data_qos(hdr->frame_control)) { ++ qos_ctl = rxcb->tid; ++ if (ath11k_dp_rx_h_msdu_start_mesh_ctl_present(ab, rx_desc)) ++ qos_ctl |= IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT; ++ ++ /* TODO Add other QoS ctl fields when required */ ++ memcpy(msdu->data + (hdr_len - IEEE80211_QOS_CTL_LEN), ++ &qos_ctl, IEEE80211_QOS_CTL_LEN); ++ } ++} ++ + static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, + struct sk_buff *msdu, + u8 *first_hdr, +@@ -2147,7 +2225,8 @@ static void ath11k_dp_rx_h_undecap_nwifi + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + u16 qos_ctl = 0; +- u8 *qos; ++ u8 *qos, *crypto_hdr; ++ bool add_qos_ctrl = false; + + /* copy SA & DA and pull decapped header */ + hdr = (struct ieee80211_hdr *)msdu->data; +@@ -2156,7 +2235,7 @@ static void ath11k_dp_rx_h_undecap_nwifi + ether_addr_copy(sa, ieee80211_get_SA(hdr)); + skb_pull(msdu, ieee80211_hdrlen(hdr->frame_control)); + +- if (rxcb->is_first_msdu) { ++ if (rxcb->is_first_msdu && first_hdr) { + /* original 802.11 header is valid for the first msdu + * hence we can reuse the same header + */ +@@ -2186,16 +2265,23 @@ static void ath11k_dp_rx_h_undecap_nwifi + + /* copy decap header before overwriting for reuse below */ + memcpy(decap_hdr, (uint8_t *)hdr, hdr_len); ++ add_qos_ctrl = true; + } + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ if (first_hdr) { ++ memcpy(skb_push(msdu, ++ ath11k_dp_rx_crypto_param_len(ar, enctype)), ++ (void *)hdr + hdr_len, ++ ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ } else { ++ crypto_hdr = skb_push(msdu, ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ ath11k_dp_rx_desc_get_crypto_header(ar->ab, ++ rxcb->rx_desc, crypto_hdr, enctype); ++ } + } + +- if (!rxcb->is_first_msdu) { ++ if (!rxcb->is_first_msdu || add_qos_ctrl) { + memcpy(skb_push(msdu, + IEEE80211_QOS_CTL_LEN), &qos_ctl, + IEEE80211_QOS_CTL_LEN); +@@ -2311,6 +2397,20 @@ static void ath11k_dp_rx_h_undecap_eth(s + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + void *rfc1042; ++ struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); ++ struct ath11k_dp_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}}; ++ ++ if (!first_hdr) { ++ eth = (struct ethhdr *)msdu->data; ++ ether_addr_copy(da, eth->h_dest); ++ ether_addr_copy(sa, eth->h_source); ++ rfc.snap_type = eth->h_proto; ++ skb_pull(msdu, sizeof(struct ethhdr)); ++ memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), &rfc, ++ sizeof(struct ath11k_dp_rfc1042_hdr)); ++ ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); ++ goto exit; ++ } + + rfc1042 = ath11k_dp_rx_h_find_rfc1042(ar, msdu, enctype); + if (WARN_ON_ONCE(!rfc1042)) +@@ -2339,6 +2439,7 @@ static void ath11k_dp_rx_h_undecap_eth(s + + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + ++exit: + /* original 802.11 header has a different DA and in + * case of 4addr it may also have different SA + */ +@@ -2357,6 +2458,7 @@ static void ath11k_dp_rx_h_undecap_snap( + size_t hdr_len; + u8 l3_pad_bytes; + struct hal_rx_desc *rx_desc; ++ struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + + /* Delivered decapped frame: + * [amsdu header] <-- replaced with 802.11 hdr +@@ -2370,6 +2472,11 @@ static void ath11k_dp_rx_h_undecap_snap( + skb_put(msdu, l3_pad_bytes); + skb_pull(msdu, sizeof(struct ath11k_dp_amsdu_subframe_hdr) + l3_pad_bytes); + ++ if (!first_hdr) { ++ ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); ++ return; ++ } ++ + hdr = (struct ieee80211_hdr *)first_hdr; + hdr_len = ieee80211_hdrlen(hdr->frame_control); + +@@ -2766,6 +2873,20 @@ static int ath11k_dp_rx_process_msdu(str + goto free_out; + } + ++ hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); ++ /* wifi hdr fields validation for 512M:: ++ * Mcast packets in ethernet frame mode ++ * will need wifi hdr in msdu to validate PN. ++ * Header will be added in undecap routine. ++ * Validation on wifi hdr fields from rx_desc. ++ */ ++ if (!hdr_status && ath11k_dp_rx_h_attn_is_mcbc(ab, rx_desc) && ++ !ath11k_dp_rx_desc_dot11_hdr_fields_valid(ab, rx_desc)) { ++ ath11k_warn(ab, "One or more invalid dot11 header fields\n"); ++ ret = -EIO; ++ goto free_out; ++ } ++ + rxcb = ATH11K_SKB_RXCB(msdu); + rxcb->rx_desc = rx_desc; + msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ab, rx_desc); +@@ -2778,8 +2899,9 @@ static int ath11k_dp_rx_process_msdu(str + hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); + ret = -EINVAL; + ath11k_warn(ab, "invalid msdu len %u\n", msdu_len); +- ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", hdr_status, +- sizeof(struct ieee80211_hdr)); ++ if (hdr_status) ++ ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", hdr_status, ++ sizeof(struct ieee80211_hdr)); + ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", rx_desc, + sizeof(struct hal_rx_desc)); + goto free_out; +@@ -3649,6 +3771,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi + + hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); + hdr_len = ieee80211_hdrlen(hdr->frame_control); ++ + head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN; + tail_len = IEEE80211_CCMP_MIC_LEN + IEEE80211_TKIP_ICV_LEN + FCS_LEN; + +@@ -3929,8 +4052,8 @@ static void ath11k_dp_rx_h_sort_frags(st + + static u64 ath11k_dp_rx_h_get_pn(struct ath11k *ar, struct sk_buff *skb) + { +- struct ieee80211_hdr *hdr; + u64 pn = 0; ++ struct ieee80211_hdr *hdr; + u8 *ehdr; + u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; + +@@ -4160,8 +4283,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 + if ((msdu_len + hal_rx_desc_sz) > DP_RX_BUFFER_SIZE) { + hdr_status = ath11k_dp_rx_h_80211_hdr(ar->ab, rx_desc); + ath11k_warn(ar->ab, "invalid msdu leng %u", msdu_len); +- ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", hdr_status, +- sizeof(struct ieee80211_hdr)); ++ if (hdr_status) ++ ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", hdr_status, ++ sizeof(struct ieee80211_hdr)); + ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", rx_desc, + sizeof(struct hal_rx_desc)); + dev_kfree_skb_any(msdu); +@@ -4784,6 +4908,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 + ath11k_dp_rxdma_pdev_buf_free(ar); + } + ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static int ath11k_dp_rxdma_ring_sel_config(struct ath11k *ar) ++{ ++ struct ath11k_pdev_dp *dp = &ar->dp; ++ struct htt_rx_ring_tlv_filter tlv_filter = {0}; ++ u32 ring_id; ++ int ret; ++ u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; ++ ++ ring_id = dp->rx_refill_buf_ring.refill_buf_ring.ring_id; ++ ++ tlv_filter.rx_filter = HTT_RX_RXDMA_FILTER_TLV_FLAGS_BUF_RING; ++ tlv_filter.pkt_filter_flags2 = HTT_RX_FP_CTRL_PKT_FILTER_TLV_FLAGS2_BAR; ++ tlv_filter.pkt_filter_flags3 = HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_MCAST | ++ HTT_RX_FP_DATA_PKT_FILTER_TLV_FLASG3_UCAST; ++ tlv_filter.offset_valid = true; ++ tlv_filter.rx_packet_offset = hal_rx_desc_sz; ++ tlv_filter.rx_header_offset = 0; ++ ++ ath11k_dp_get_rx_header_offset(ar->ab, &tlv_filter); ++ ++ if (!ar->ab->nss.enabled) ++ ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, dp->mac_id, ++ HAL_RXDMA_BUF, ++ DP_RXDMA_REFILL_RING_SIZE, ++ &tlv_filter); ++ else ++ ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, dp->mac_id, ++ HAL_RXDMA_BUF, ++ DP_RXDMA_NSS_REFILL_RING_SIZE, ++ &tlv_filter); ++ ++ return ret; ++} ++#else ++static int ath11k_dp_rxdma_ring_sel_config(struct ath11k *ar) ++{ ++ return 0; ++} ++#endif ++ + int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) + { + struct ath11k *ar = ab->pdevs[mac_id].ar; +@@ -4877,6 +5042,12 @@ config_refill_ring: + } + } + ++ ret = ath11k_dp_rxdma_ring_sel_config(ar); ++ if (ret) { ++ ath11k_warn(ab, "failed to setup rxdma ring selection config\n"); ++ return ret; ++ } ++ + return 0; + } + +--- a/drivers/net/wireless/ath/ath11k/dp_tx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_tx.c +@@ -1183,6 +1183,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str + !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); + cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS, + !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); ++ cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID, ++ tlv_filter->offset_valid); + + cmd->info1 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE, + rx_buf_size); +@@ -1192,6 +1194,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str + cmd->pkt_type_en_flags3 = tlv_filter->pkt_filter_flags3; + cmd->rx_filter_tlv = tlv_filter->rx_filter; + ++ if (tlv_filter->offset_valid) { ++ cmd->rx_packet_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET, ++ tlv_filter->rx_packet_offset); ++ cmd->rx_packet_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET, ++ tlv_filter->rx_header_offset); ++ ++ cmd->rx_mpdu_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_OFFSET, ++ tlv_filter->rx_mpdu_end_offset); ++ cmd->rx_mpdu_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_OFFSET, ++ tlv_filter->rx_mpdu_start_offset); ++ ++ cmd->rx_msdu_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_OFFSET, ++ tlv_filter->rx_msdu_end_offset); ++ cmd->rx_msdu_offset |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET, ++ tlv_filter->rx_msdu_start_offset); ++ ++ cmd->rx_attn_offset = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET, ++ tlv_filter->rx_attn_offset); ++ } ++ + ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); + if (ret) + goto err_free; +@@ -1270,6 +1292,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c + } + + ring_id = dp->rxdma_mon_buf_ring.refill_buf_ring.ring_id; ++ tlv_filter.offset_valid = false; + + if (!reset) { + tlv_filter.rx_filter = HTT_RX_MON_FILTER_TLV_FLAGS_MON_BUF_RING; +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -260,7 +260,11 @@ static u8 ath11k_hw_ipq8074_rx_desc_get_ + + static u8 *ath11k_hw_ipq8074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) + { ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + return desc->u.ipq8074.hdr_status; ++#else ++ return NULL; ++#endif + } + + static bool ath11k_hw_ipq8074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) +@@ -395,26 +399,132 @@ static void ath11k_hw_ipq8074_rx_desc_se + desc->u.ipq8074.msdu_start.info1 = __cpu_to_le32(info); + } + ++static ++struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc) ++{ ++ return &desc->u.ipq8074.attention; ++} ++ ++static u8 *ath11k_hw_ipq8074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc) ++{ ++ return &desc->u.ipq8074.msdu_payload[0]; ++} ++ ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static void ath11k_hw_ipq8074_rx_desc_get_offset(struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ tlv_filter->rx_mpdu_end_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, mpdu_end_tag)); ++ tlv_filter->rx_mpdu_start_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, mpdu_start_tag)); ++ tlv_filter->rx_msdu_end_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, msdu_end_tag)); ++ tlv_filter->rx_msdu_start_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, msdu_start_tag)); ++ tlv_filter->rx_attn_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_ipq8074, rx_attn_tag)); ++} ++#endif ++ ++static u16 ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl(struct hal_rx_desc *desc) ++{ ++ return __le16_to_cpu(desc->u.ipq8074.mpdu_start.frame_ctrl); ++} ++ + static bool ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) + { + return __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & + RX_MPDU_START_INFO1_MAC_ADDR2_VALID; + } + +-static u8 *ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) ++static u8* ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) + { + return desc->u.ipq8074.mpdu_start.addr2; + } + +-static +-struct rx_attention *ath11k_hw_ipq8074_rx_desc_get_attention(struct hal_rx_desc *desc) ++static bool ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid(struct hal_rx_desc *desc) + { +- return &desc->u.ipq8074.attention; ++ if ((ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(desc) && ++ ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid(desc) && ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & ++ RX_MPDU_START_INFO1_MAC_ADDR1_VALID && ++ ath11k_hw_ipq8074_rx_desc_mac_addr2_valid(desc) && ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & ++ RX_MPDU_START_INFO1_MAC_ADDR3_VALID && ++ FIELD_GET((RX_MPDU_START_INFO1_MPDU_DUR_VALID), ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info1)))) { ++ return true; ++ } ++ return false; ++} ++ ++static void ath11k_hw_ipq8074_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr) ++{ ++ hdr->frame_control = __le16_to_cpu(desc->u.ipq8074.mpdu_start.frame_ctrl); ++ hdr->duration_id = __le16_to_cpu(desc->u.ipq8074.mpdu_start.duration); ++ ether_addr_copy(hdr->addr1, desc->u.ipq8074.mpdu_start.addr1); ++ ether_addr_copy(hdr->addr2, desc->u.ipq8074.mpdu_start.addr2); ++ ether_addr_copy(hdr->addr3, desc->u.ipq8074.mpdu_start.addr3); ++ if (__le32_to_cpu(desc->u.ipq8074.mpdu_start.info1) & ++ RX_MPDU_START_INFO1_MAC_ADDR4_VALID) { ++ ether_addr_copy(hdr->addr4, desc->u.ipq8074.mpdu_start.addr4); ++ } ++ hdr->seq_ctrl = __le16_to_cpu(desc->u.ipq8074.mpdu_start.seq_ctrl); ++} ++ ++static void ath11k_hw_ipq8074_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype) ++{ ++ unsigned int key_id; ++ ++ switch (enctype) { ++ case HAL_ENCRYPT_TYPE_OPEN: ++ return; ++ case HAL_ENCRYPT_TYPE_TKIP_NO_MIC: ++ case HAL_ENCRYPT_TYPE_TKIP_MIC: ++ crypto_hdr[0] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[1] = 0; ++ crypto_hdr[2] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[0]); ++ break; ++ case HAL_ENCRYPT_TYPE_CCMP_128: ++ case HAL_ENCRYPT_TYPE_CCMP_256: ++ case HAL_ENCRYPT_TYPE_GCMP_128: ++ case HAL_ENCRYPT_TYPE_AES_GCMP_256: ++ crypto_hdr[0] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[1] = ++ HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[2] = 0; ++ break; ++ case HAL_ENCRYPT_TYPE_WEP_40: ++ case HAL_ENCRYPT_TYPE_WEP_104: ++ case HAL_ENCRYPT_TYPE_WEP_128: ++ case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4: ++ case HAL_ENCRYPT_TYPE_WAPI: ++ return; ++ } ++ key_id = FIELD_GET(RX_MPDU_START_INFO5_KEY_ID, ++ __le32_to_cpu(desc->u.ipq8074.mpdu_start.info5)); ++ crypto_hdr[3] = 0x20 | (key_id << 6); ++ crypto_hdr[4] = HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[5] = HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc->u.ipq8074.mpdu_start.pn[0]); ++ crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.ipq8074.mpdu_start.pn[1]); ++ crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.ipq8074.mpdu_start.pn[1]); + } + +-static u8 *ath11k_hw_ipq8074_rx_desc_get_msdu_payload(struct hal_rx_desc *desc) ++static bool ath11k_hw_qcn9074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) + { +- return &desc->u.ipq8074.msdu_payload[0]; ++ return __le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & ++ RX_MPDU_START_INFO11_MAC_ADDR2_VALID; ++} ++ ++static u8* ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) ++{ ++ return desc->u.qcn9074.mpdu_start.addr2; + } + + static bool ath11k_hw_qcn9074_rx_desc_get_first_msdu(struct hal_rx_desc *desc) +@@ -437,7 +547,11 @@ static u8 ath11k_hw_qcn9074_rx_desc_get_ + + static u8 *ath11k_hw_qcn9074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) + { ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + return desc->u.qcn9074.hdr_status; ++#else ++ return NULL; ++#endif + } + + static bool ath11k_hw_qcn9074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) +@@ -614,7 +728,11 @@ static u8 ath11k_hw_wcn6855_rx_desc_get_ + + static u8 *ath11k_hw_wcn6855_rx_desc_get_hdr_status(struct hal_rx_desc *desc) + { ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + return desc->u.wcn6855.hdr_status; ++#else ++ return NULL; ++#endif + } + + static bool ath11k_hw_wcn6855_rx_desc_encrypt_valid(struct hal_rx_desc *desc) +@@ -929,6 +1047,98 @@ static u32 ath11k_hw_qcn9074_rx_desc_get + return FIELD_GET(HAL_RX_MPDU_INFO_INFO1_MPDU_LEN, + __le32_to_cpu(mpdu_info->u.qcn9074.info1)); + } ++ ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++static void ath11k_hw_qcn9074_rx_desc_get_offset(struct htt_rx_ring_tlv_filter *tlv_filter) ++{ ++ tlv_filter->rx_mpdu_end_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_qcn9074, mpdu_end_tag)); ++ tlv_filter->rx_mpdu_start_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_qcn9074, mpdu_start_tag)); ++ tlv_filter->rx_msdu_end_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_qcn9074, msdu_end_tag)); ++ tlv_filter->rx_msdu_start_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_qcn9074, msdu_start_tag)); ++ tlv_filter->rx_attn_offset = __le16_to_cpu(offsetof ++ (struct hal_rx_desc_qcn9074, rx_attn_tag)); ++} ++#endif ++ ++static u16 ath11k_hw_qcn9074_rx_desc_get_mpdu_frame_ctl(struct hal_rx_desc *desc) ++{ ++ return __le16_to_cpu(desc->u.qcn9074.mpdu_start.frame_ctrl); ++} ++ ++static bool ath11k_hw_qcn9074_rx_desc_dot11_hdr_fields_valid(struct hal_rx_desc *desc) ++{ ++ if ((ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(desc) && ++ ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid(desc) && ++ (__le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & ++ RX_MPDU_START_INFO11_MAC_ADDR1_VALID) && ++ ath11k_hw_qcn9074_rx_desc_mac_addr2_valid(desc) && ++ (__le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & ++ RX_MPDU_START_INFO11_MAC_ADDR3_VALID) && ++ FIELD_GET((RX_MPDU_START_INFO11_MPDU_DUR_VALID), ++ __le32_to_cpu(desc->u.qcn9074.mpdu_start.info11)))) { ++ return true; ++ } ++ return false; ++} ++ ++static void ath11k_hw_qcn9074_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr) ++{ ++ hdr->frame_control = __le16_to_cpu(desc->u.qcn9074.mpdu_start.frame_ctrl); ++ hdr->duration_id = __le16_to_cpu(desc->u.qcn9074.mpdu_start.duration); ++ ether_addr_copy(hdr->addr1, desc->u.qcn9074.mpdu_start.addr1); ++ ether_addr_copy(hdr->addr2, desc->u.qcn9074.mpdu_start.addr2); ++ ether_addr_copy(hdr->addr3, desc->u.qcn9074.mpdu_start.addr3); ++ if (__le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & ++ RX_MPDU_START_INFO11_MAC_ADDR4_VALID) { ++ ether_addr_copy(hdr->addr4, desc->u.qcn9074.mpdu_start.addr4); ++ } ++ hdr->seq_ctrl = __le16_to_cpu(desc->u.qcn9074.mpdu_start.seq_ctrl); ++} ++ ++static void ath11k_hw_qcn9074_rx_desc_get_crypto_hdr(struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype) ++{ ++ unsigned int key_id; ++ ++ switch (enctype) { ++ case HAL_ENCRYPT_TYPE_OPEN: ++ return; ++ case HAL_ENCRYPT_TYPE_TKIP_NO_MIC: ++ case HAL_ENCRYPT_TYPE_TKIP_MIC: ++ crypto_hdr[0] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.qcn9074.mpdu_start.pn[0]); ++ crypto_hdr[1] = 0; ++ crypto_hdr[2] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.qcn9074.mpdu_start.pn[0]); ++ break; ++ case HAL_ENCRYPT_TYPE_CCMP_128: ++ case HAL_ENCRYPT_TYPE_CCMP_256: ++ case HAL_ENCRYPT_TYPE_GCMP_128: ++ case HAL_ENCRYPT_TYPE_AES_GCMP_256: ++ crypto_hdr[0] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.qcn9074.mpdu_start.pn[0]); ++ crypto_hdr[1] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.qcn9074.mpdu_start.pn[0]); ++ crypto_hdr[2] = 0; ++ break; ++ case HAL_ENCRYPT_TYPE_WEP_40: ++ case HAL_ENCRYPT_TYPE_WEP_104: ++ case HAL_ENCRYPT_TYPE_WEP_128: ++ case HAL_ENCRYPT_TYPE_WAPI_GCM_SM4: ++ case HAL_ENCRYPT_TYPE_WAPI: ++ return; ++ } ++ key_id = FIELD_GET(RX_MPDU_START_INFO12_KEY_ID, ++ __le32_to_cpu(desc->u.qcn9074.mpdu_start.info12)); ++ crypto_hdr[3] = 0x20 | (key_id << 6); ++ crypto_hdr[4] = HAL_RX_MPDU_INFO_PN_GET_BYTE3(desc->u.qcn9074.mpdu_start.pn[0]); ++ crypto_hdr[5] = HAL_RX_MPDU_INFO_PN_GET_BYTE4(desc->u.qcn9074.mpdu_start.pn[0]); ++ crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.qcn9074.mpdu_start.pn[1]); ++ crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.qcn9074.mpdu_start.pn[1]); ++} ++ + const struct ath11k_hw_ops ipq8074_ops = { + .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id, + .wmi_init_config = ath11k_init_wmi_config_ipq8074, +@@ -1009,6 +1219,13 @@ const struct ath11k_hw_ops ipq6018_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, ++#endif ++ .rx_desc_get_mpdu_frame_ctl = ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl, ++ .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, ++ .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, ++ .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, + }; + + const struct ath11k_hw_ops qca6390_ops = { +@@ -1050,6 +1267,13 @@ const struct ath11k_hw_ops qca6390_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, ++#endif ++ .rx_desc_get_mpdu_frame_ctl = ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl, ++ .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, ++ .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, ++ .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, + }; + + const struct ath11k_hw_ops qcn9074_ops = { +@@ -1132,6 +1356,13 @@ const struct ath11k_hw_ops wcn6855_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, ++#endif ++ .rx_desc_get_mpdu_frame_ctl = ath11k_hw_ipq8074_rx_desc_get_mpdu_frame_ctl, ++ .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, ++ .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, ++ .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, + }; + + const struct ath11k_hw_ops wcn6750_ops = { +@@ -1180,6 +1411,8 @@ const struct ath11k_hw_ops ipq5018_ops = + .wmi_init_config = ath11k_init_wmi_config_ipq8074, + .mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_ipq8074, + .mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_ipq8074, ++ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, ++ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, + .tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable, + .rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu, + .rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu, +@@ -1214,6 +1447,13 @@ const struct ath11k_hw_ops ipq5018_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ .rx_desc_get_offset = ath11k_hw_qcn9074_rx_desc_get_offset, ++#endif ++ .rx_desc_get_mpdu_frame_ctl = ath11k_hw_qcn9074_rx_desc_get_mpdu_frame_ctl, ++ .rx_desc_dot11_hdr_fields_valid = ath11k_hw_qcn9074_rx_desc_dot11_hdr_fields_valid, ++ .rx_desc_get_dot11_hdr = ath11k_hw_qcn9074_rx_desc_get_dot11_hdr, ++ .rx_desc_get_crypto_header = ath11k_hw_qcn9074_rx_desc_get_crypto_hdr, + }; + + #define ATH11K_TX_RING_MASK_0 BIT(0) +--- a/drivers/net/wireless/ath/ath11k/hw.h ++++ b/drivers/net/wireless/ath/ath11k/hw.h +@@ -22,6 +22,11 @@ + #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 512 + #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 128 + #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 128 ++#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 ++/* 256b desc TLV + 4b(rounded) Pad + 30byte max nwifi header + ++ * 18byte mesh hdr + 8byte snap + 1500 eth payload ++ */ ++#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 1816 + #else + /* Num VDEVS per radio */ + #define TARGET_NUM_VDEVS(ab) (ab->hw_params.num_vdevs_peers[ab->qmi.target_mem_mode].num_vdevs) +@@ -33,6 +38,8 @@ + #define ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE 1024 + #define ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 + #define ATH11K_DP_RXDMA_MONITOR_DST_RING_SIZE 2048 ++#define ATH11K_DP_RXDMA_REFILL_RING_SIZE 2048 ++#define ATH11K_DP_RXDMA_NSS_REFILL_RING_SIZE 2048 + #endif + + /* Num of peers for Single Radio mode */ +@@ -128,6 +135,8 @@ enum ath11k_bus { + + struct hal_rx_desc; + struct hal_tcl_data_cmd; ++struct htt_rx_ring_tlv_filter; ++enum hal_encrypt_type; + + struct ath11k_hw_ring_mask { + u8 tx[ATH11K_EXT_IRQ_GRP_NUM_MAX]; +@@ -285,7 +294,17 @@ struct ath11k_hw_ops { + bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); + u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); + u32 (*get_ring_selector)(struct sk_buff *skb); +- u32 (*rx_desc_get_hal_mpdu_len)(struct hal_rx_mpdu_info *mpdu_info); ++ u32 (*rx_desc_get_hal_mpdu_len) (struct hal_rx_mpdu_info *mpdu_info); ++#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M ++ void (*rx_desc_get_offset)(struct htt_rx_ring_tlv_filter *tlv_filter); ++#endif ++ u16 (*rx_desc_get_mpdu_frame_ctl)(struct hal_rx_desc *desc); ++ bool (*rx_desc_dot11_hdr_fields_valid)(struct hal_rx_desc *desc); ++ void (*rx_desc_get_dot11_hdr)(struct hal_rx_desc *desc, ++ struct ieee80211_hdr *hdr); ++ void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, ++ u8 *crypto_hdr, ++ enum hal_encrypt_type enctype); + }; + + extern const struct ath11k_hw_ops ipq8074_ops; +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -6343,6 +6343,7 @@ static int ath11k_mac_config_mon_status_ + tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); + } + ++ tlv_filter.offset_valid = false; + for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; + ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, +--- a/drivers/net/wireless/ath/ath11k/rx_desc.h ++++ b/drivers/net/wireless/ath/ath11k/rx_desc.h +@@ -1442,9 +1442,11 @@ struct hal_rx_desc_ipq8074 { + __le32 mpdu_end_tag; + struct rx_mpdu_end mpdu_end; + u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + __le32 hdr_status_tag; + __le32 phy_ppdu_id; + u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; ++#endif + u8 msdu_payload[]; + } __packed; + +@@ -1461,9 +1463,11 @@ struct hal_rx_desc_qcn9074 { + __le32 mpdu_end_tag; + struct rx_mpdu_end mpdu_end; + u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + __le32 hdr_status_tag; + __le32 phy_ppdu_id; + u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; ++#endif + u8 msdu_payload[]; + } __packed; + +@@ -1480,9 +1484,11 @@ struct hal_rx_desc_wcn6855 { + __le32 mpdu_end_tag; + struct rx_mpdu_end mpdu_end; + u8 rx_padding1[HAL_RX_DESC_PADDING1_BYTES]; ++#ifndef CPTCFG_ATH11K_MEM_PROFILE_512M + __le32 hdr_status_tag; + __le32 phy_ppdu_id; + u8 hdr_status[HAL_RX_DESC_HDR_STATUS_LEN]; ++#endif + u8 msdu_payload[]; + } __packed; + +@@ -1507,4 +1513,17 @@ struct hal_rx_desc { + #define RU_484 18 + #define RU_996 37 + ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE1(__val) \ ++ FIELD_GET(GENMASK(7, 0), __le32_to_cpu(__val)) ++ ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE2(__val) \ ++ FIELD_GET(GENMASK(15, 8), __le32_to_cpu(__val)) ++ ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE3(__val) \ ++ FIELD_GET(GENMASK(23, 16), __le32_to_cpu(__val)) ++ ++#define HAL_RX_MPDU_INFO_PN_GET_BYTE4(__val) \ ++ FIELD_GET(GENMASK(31, 24), __le32_to_cpu(__val)) ++ ++ + #endif /* ATH11K_RX_DESC_H */ +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -2230,7 +2230,7 @@ static int ath11k_nss_init(struct ath11k + + /* fill rx parameters to initialize rx context */ + wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; +- wim->wrip.rx_buf_len = DP_RX_BUFFER_SIZE; ++ wim->wrip.rx_buf_len = DP_RXDMA_NSS_REFILL_RING_SIZE; + + /* fill hal srng message */ + wim->hssm.dev_base_addr = (u32)ab->mem_pa; diff --git a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch index 729ee80199b9a2..10e65157232edb 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -214,7 +214,7 @@ Signed-off-by: Sathishkumar Muruganandam ieee80211_queue_work(ar->hw, &arsta->set_4addr_wk); arsta->use_4addr_set = true; } -@@ -6646,6 +6770,9 @@ static int ath11k_mac_op_update_vif_offl +@@ -6647,6 +6771,9 @@ static int ath11k_mac_op_update_vif_offl u32 param_id, param_value; int ret; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET || (vif->type != NL80211_IFTYPE_STATION && -@@ -6866,7 +6993,8 @@ static int ath11k_mac_op_add_interface(s +@@ -6867,7 +6994,8 @@ static int ath11k_mac_op_add_interface(s goto err; } @@ -234,7 +234,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n", ar->num_created_vdevs, TARGET_NUM_VDEVS(ab)); ret = -EBUSY; -@@ -6886,6 +7014,28 @@ static int ath11k_mac_op_add_interface(s +@@ -6887,6 +7015,28 @@ static int ath11k_mac_op_add_interface(s arvif->vif = vif; INIT_LIST_HEAD(&arvif->list); @@ -263,7 +263,7 @@ Signed-off-by: Sathishkumar Muruganandam INIT_DELAYED_WORK(&arvif->connection_loss_work, ath11k_mac_vif_sta_connection_loss_work); -@@ -6915,6 +7065,7 @@ static int ath11k_mac_op_add_interface(s +@@ -6916,6 +7066,7 @@ static int ath11k_mac_op_add_interface(s fallthrough; case NL80211_IFTYPE_AP: arvif->vdev_type = WMI_VDEV_TYPE_AP; @@ -271,7 +271,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case NL80211_IFTYPE_MONITOR: arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; -@@ -7137,13 +7288,30 @@ static void ath11k_mac_op_remove_interfa +@@ -7138,13 +7289,30 @@ static void ath11k_mac_op_remove_interfa struct ath11k *ar = hw->priv; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ath11k_base *ab = ar->ab; @@ -304,7 +304,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n", arvif->vdev_id); -@@ -7160,6 +7328,14 @@ static void ath11k_mac_op_remove_interfa +@@ -7161,6 +7329,14 @@ static void ath11k_mac_op_remove_interfa if (ret) ath11k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", arvif->vdev_id, ret); @@ -319,7 +319,7 @@ Signed-off-by: Sathishkumar Muruganandam } ret = ath11k_mac_vdev_delete(ar, arvif); -@@ -7203,8 +7379,7 @@ err_vdev_del: +@@ -7204,8 +7380,7 @@ err_vdev_del: ath11k_debugfs_remove_interface(arvif); @@ -329,7 +329,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); } -@@ -7264,16 +7439,17 @@ static int ath11k_mac_op_ampdu_action(st +@@ -7265,16 +7440,17 @@ static int ath11k_mac_op_ampdu_action(st struct ieee80211_ampdu_params *params) { struct ath11k *ar = hw->priv; @@ -349,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case IEEE80211_AMPDU_TX_START: case IEEE80211_AMPDU_TX_STOP_CONT: -@@ -8796,6 +8972,7 @@ static void ath11k_mac_op_sta_statistics +@@ -8797,6 +8973,7 @@ static void ath11k_mac_op_sta_statistics { struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); struct ath11k *ar = arsta->arvif->ar; @@ -357,7 +357,7 @@ Signed-off-by: Sathishkumar Muruganandam s8 signal; bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT, ar->ab->wmi_ab.svc_map); -@@ -8852,7 +9029,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8853,7 +9030,8 @@ static void ath11k_mac_op_sta_statistics ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); @@ -380,7 +380,7 @@ Signed-off-by: Sathishkumar Muruganandam WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD = 1, --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1121,12 +1121,13 @@ err_mem_free: +@@ -1156,12 +1156,13 @@ err_mem_free: return ret; } @@ -396,7 +396,7 @@ Signed-off-by: Sathishkumar Muruganandam int ret; ret = ath11k_peer_rx_tid_setup(ar, params->sta->addr, vdev_id, -@@ -1138,13 +1139,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 +@@ -1173,13 +1174,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 return ret; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch index 80b8a5fc67d7ea..e7817f953ace6e 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch @@ -423,7 +423,7 @@ Signed-off-by: Sathishkumar Muruganandam } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { -@@ -7018,7 +7247,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7019,7 +7248,7 @@ static int ath11k_mac_op_add_interface(s if ((vif->type == NL80211_IFTYPE_AP_VLAN || vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && @@ -432,7 +432,7 @@ Signed-off-by: Sathishkumar Muruganandam vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; -@@ -7031,6 +7260,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7032,6 +7261,7 @@ static int ath11k_mac_op_add_interface(s vif->addr, ret); goto err; } @@ -440,7 +440,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); return ret; } -@@ -7055,6 +7285,20 @@ static int ath11k_mac_op_add_interface(s +@@ -7056,6 +7286,20 @@ static int ath11k_mac_op_add_interface(s arvif->vdev_id = bit; arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; @@ -461,7 +461,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_STATION: -@@ -7095,7 +7339,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7096,7 +7340,7 @@ static int ath11k_mac_op_add_interface(s if (ret) { ath11k_warn(ab, "failed to create WMI vdev %d: %d\n", arvif->vdev_id, ret); @@ -470,7 +470,7 @@ Signed-off-by: Sathishkumar Muruganandam } ar->num_created_vdevs++; -@@ -7254,7 +7498,7 @@ err_peer_del: +@@ -7255,7 +7499,7 @@ err_peer_del: if (fbret) { ath11k_warn(ar->ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n", vif->addr, arvif->vdev_id, fbret); @@ -479,7 +479,7 @@ Signed-off-by: Sathishkumar Muruganandam } } -@@ -7265,6 +7509,8 @@ err_vdev_del: +@@ -7266,6 +7510,8 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -488,7 +488,7 @@ Signed-off-by: Sathishkumar Muruganandam err: mutex_unlock(&ar->conf_mutex); -@@ -7362,6 +7608,7 @@ err_vdev_del: +@@ -7363,6 +7609,7 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -496,7 +496,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_peer_cleanup(ar, arvif->vdev_id); idr_for_each(&ar->txmgmt_idr, -@@ -9960,8 +10207,11 @@ static int __ath11k_mac_register(struct +@@ -9961,8 +10208,11 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index bbf4f20ac2326c..493ed32105629e 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -10,7 +10,7 @@ }; --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -973,6 +973,79 @@ static const struct file_operations fops +@@ -974,6 +974,79 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -90,7 +90,7 @@ int ath11k_debugfs_pdev_create(struct ath11k_base *ab) { if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) -@@ -1022,6 +1095,8 @@ int ath11k_debugfs_soc_create(struct ath +@@ -1023,6 +1096,8 @@ int ath11k_debugfs_soc_create(struct ath ret = PTR_ERR(ab->debugfs_soc); goto out; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index 61077309338ffb..c5cd8f20874996 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -33,7 +33,7 @@ Signed-off-by: P Praneesh enum ath11k_hw_rev { --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -340,6 +340,12 @@ static int ath11k_dp_purge_mon_ring(stru +@@ -375,6 +375,12 @@ static int ath11k_dp_purge_mon_ring(stru return -ETIMEDOUT; } @@ -46,7 +46,7 @@ Signed-off-by: P Praneesh /* Returns number of Rx buffers replenished */ int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id, struct dp_rxdma_ring *rx_ring, -@@ -1664,7 +1670,7 @@ int ath11k_dp_htt_tlv_iter(struct ath11k +@@ -1699,7 +1705,7 @@ int ath11k_dp_htt_tlv_iter(struct ath11k len -= sizeof(*tlv); if (tlv_len > len) { @@ -55,7 +55,7 @@ Signed-off-by: P Praneesh tlv_tag, ptr - begin, len, tlv_len); return -EINVAL; } -@@ -2454,10 +2460,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b +@@ -2561,10 +2567,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b return peer; } @@ -117,7 +117,7 @@ Signed-off-by: P Praneesh { bool fill_crypto_hdr; enum hal_encrypt_type enctype; -@@ -2468,9 +2524,13 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2575,9 +2631,13 @@ static void ath11k_dp_rx_h_mpdu(struct a struct rx_attention *rx_attention; u32 err_bitmap; @@ -132,7 +132,7 @@ Signed-off-by: P Praneesh rxcb->is_mcbc = fill_crypto_hdr; if (rxcb->is_mcbc) { -@@ -2481,6 +2541,26 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2588,6 +2648,26 @@ static void ath11k_dp_rx_h_mpdu(struct a spin_lock_bh(&ar->ab->base_lock); peer = ath11k_dp_rx_h_find_peer(ar->ab, msdu); if (peer) { @@ -159,7 +159,7 @@ Signed-off-by: P Praneesh if (rxcb->is_mcbc) enctype = peer->sec_type_grp; else -@@ -2490,6 +2570,8 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2597,6 +2677,8 @@ static void ath11k_dp_rx_h_mpdu(struct a } spin_unlock_bh(&ar->ab->base_lock); @@ -168,7 +168,7 @@ Signed-off-by: P Praneesh rx_attention = ath11k_dp_rx_get_attention(ar->ab, rx_desc); err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention); if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) -@@ -2731,7 +2813,8 @@ static void ath11k_dp_rx_deliver_msdu(st +@@ -2838,7 +2920,8 @@ static void ath11k_dp_rx_deliver_msdu(st static int ath11k_dp_rx_process_msdu(struct ath11k *ar, struct sk_buff *msdu, struct sk_buff_head *msdu_list, @@ -178,7 +178,7 @@ Signed-off-by: P Praneesh { struct ath11k_base *ab = ar->ab; struct hal_rx_desc *rx_desc, *lrx_desc; -@@ -2798,8 +2881,13 @@ static int ath11k_dp_rx_process_msdu(str +@@ -2920,8 +3003,13 @@ static int ath11k_dp_rx_process_msdu(str } } @@ -193,7 +193,7 @@ Signed-off-by: P Praneesh rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -2814,10 +2902,12 @@ static void ath11k_dp_rx_process_receive +@@ -2936,10 +3024,12 @@ static void ath11k_dp_rx_process_receive struct sk_buff_head *msdu_list, int mac_id) { @@ -206,7 +206,7 @@ Signed-off-by: P Praneesh if (skb_queue_empty(msdu_list)) return; -@@ -2834,7 +2924,12 @@ static void ath11k_dp_rx_process_receive +@@ -2956,7 +3046,12 @@ static void ath11k_dp_rx_process_receive } while ((msdu = __skb_dequeue(msdu_list))) { @@ -220,7 +220,7 @@ Signed-off-by: P Praneesh if (unlikely(ret)) { ath11k_dbg(ab, ATH11K_DBG_DATA, "Unable to process msdu %d", ret); -@@ -2842,7 +2937,10 @@ static void ath11k_dp_rx_process_receive +@@ -2964,7 +3059,10 @@ static void ath11k_dp_rx_process_receive continue; } @@ -232,7 +232,7 @@ Signed-off-by: P Praneesh } } -@@ -2851,11 +2949,12 @@ void ath11k_dp_rx_from_nss(struct ath11k +@@ -2973,11 +3071,12 @@ void ath11k_dp_rx_from_nss(struct ath11k { struct ieee80211_rx_status rx_status = {0}; struct ath11k_skb_rxcb *rxcb; @@ -246,7 +246,7 @@ Signed-off-by: P Praneesh rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -4322,6 +4421,7 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4446,6 +4545,7 @@ static int ath11k_dp_rx_h_null_q_desc(st struct ieee80211_rx_status *status, struct sk_buff_head *msdu_list) { @@ -254,7 +254,7 @@ Signed-off-by: P Praneesh u16 msdu_len; struct hal_rx_desc *desc = (struct hal_rx_desc *)msdu->data; struct rx_attention *rx_attention; -@@ -4371,7 +4471,8 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4495,7 +4595,8 @@ static int ath11k_dp_rx_h_null_q_desc(st } ath11k_dp_rx_h_ppdu(ar, desc, status); @@ -266,7 +266,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -293,6 +293,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge +@@ -297,6 +297,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge __le32_to_cpu(desc->u.ipq8074.msdu_start.info2)); } @@ -283,7 +283,7 @@ Signed-off-by: P Praneesh static bool ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) { return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_CTRL_VALID, -@@ -470,6 +480,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge +@@ -584,6 +594,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge __le32_to_cpu(desc->u.qcn9074.msdu_start.info2)); } @@ -300,7 +300,7 @@ Signed-off-by: P Praneesh static bool ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) { return !!FIELD_GET(RX_MPDU_START_INFO11_MPDU_SEQ_CTRL_VALID, -@@ -1025,6 +1045,7 @@ const struct ath11k_hw_ops qca6390_ops = +@@ -1194,6 +1214,7 @@ const struct ath11k_hw_ops ipq6018_ops = .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, @@ -308,7 +308,15 @@ Signed-off-by: P Praneesh .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, -@@ -1189,6 +1210,7 @@ const struct ath11k_hw_ops ipq5018_ops = +@@ -1242,6 +1263,7 @@ const struct ath11k_hw_ops qca6390_ops = + .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, ++ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid, + .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, + .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, +@@ -1379,6 +1401,7 @@ const struct ath11k_hw_ops wcn6750_ops = .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, @@ -318,7 +326,7 @@ Signed-off-by: P Praneesh .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -260,6 +260,7 @@ struct ath11k_hw_ops { +@@ -269,6 +269,7 @@ struct ath11k_hw_ops { u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc); diff --git a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch index 7535883c4763d0..f514843b447f1a 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch @@ -454,7 +454,7 @@ Signed-off-by: P Praneesh ieee80211_free_txskb(ar->hw, skb); return; } -@@ -7622,7 +7632,7 @@ err_vdev_del: +@@ -7623,7 +7633,7 @@ err_vdev_del: idr_for_each(&ar->txmgmt_idr, ath11k_mac_vif_txmgmt_idr_remove, vif); @@ -465,7 +465,7 @@ Signed-off-by: P Praneesh ath11k_mac_vif_unref, vif); --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -832,10 +832,22 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -833,10 +833,22 @@ static ssize_t ath11k_debugfs_dump_soc_d len += scnprintf(buf + len, size - len, "ring%d: %u\n", i, soc_stats->tx_err.desc_na[i]); @@ -490,6 +490,15 @@ Signed-off-by: P Praneesh if (len > size) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c +@@ -105,7 +105,7 @@ static struct ath11k_hw_params ath11k_hw + .supports_regdb = false, + .fix_l1ss = true, + .credit_flow = false, +- .max_tx_ring = DP_TCL_NUM_RING_MAX, ++ .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, + .hal_params = &ath11k_hw_hal_params_ipq8074, + .supports_dynamic_smps_6ghz = false, + .alloc_cacheable_memory = true, @@ -188,7 +188,6 @@ static struct ath11k_hw_params ath11k_hw .supports_regdb = false, .fix_l1ss = true, @@ -504,10 +513,19 @@ Signed-off-by: P Praneesh .support_fw_mac_sequence = false, + /* In addition to TCL ring use TCL_CMD ring also for tx */ + .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, + .num_vdevs_peers = ath11k_vdevs_peers, }, { .name = "qca6390 hw2.0", -@@ -380,6 +381,8 @@ static struct ath11k_hw_params ath11k_hw +@@ -355,7 +356,6 @@ static struct ath11k_hw_params ath11k_hw + .supports_regdb = false, + .fix_l1ss = true, + .credit_flow = false, +- .max_tx_ring = DP_TCL_NUM_RING_MAX, + .hal_params = &ath11k_hw_hal_params_ipq8074, + .supports_dynamic_smps_6ghz = true, + .alloc_cacheable_memory = true, +@@ -380,6 +380,8 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, @@ -516,7 +534,7 @@ Signed-off-by: P Praneesh }, { .name = "wcn6855 hw2.0", -@@ -2143,6 +2146,9 @@ int ath11k_core_pre_init(struct ath11k_b +@@ -2143,6 +2145,9 @@ int ath11k_core_pre_init(struct ath11k_b if (nss_offload) ab->nss.stats_enabled = 1; diff --git a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch index b31809f689548b..1fa2d32aaa33cb 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch @@ -1014,7 +1014,7 @@ Signed-off-by: Vasanthakumar Thiagarajan +#endif --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1453,15 +1453,29 @@ struct htt_ppdu_stats_usr_cmn_array { +@@ -1529,15 +1529,29 @@ struct htt_ppdu_stats_usr_cmn_array { struct htt_tx_ppdu_stats_info tx_ppdu_info[]; } __packed; @@ -1046,7 +1046,7 @@ Signed-off-by: Vasanthakumar Thiagarajan #define HTT_PPDU_STATS_MAX_USERS 37 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1409,6 +1409,71 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1444,6 +1444,71 @@ static int ath11k_htt_tlv_ppdu_stats_par return 0; } @@ -1118,7 +1118,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static void ath11k_update_per_peer_tx_stats(struct ath11k *ar, struct htt_ppdu_stats *ppdu_stats, u8 user) -@@ -1432,6 +1497,9 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1467,6 +1532,9 @@ ath11k_update_per_peer_tx_stats(struct a if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE))) return; @@ -1128,7 +1128,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) is_ampdu = HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags); -@@ -1565,6 +1633,8 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1600,6 +1668,8 @@ ath11k_update_per_peer_tx_stats(struct a ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); } @@ -1137,7 +1137,7 @@ Signed-off-by: Vasanthakumar Thiagarajan spin_unlock_bh(&ab->base_lock); rcu_read_unlock(); } -@@ -1685,6 +1755,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k +@@ -1720,6 +1790,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k return 0; } @@ -1207,7 +1207,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, struct sk_buff *skb) { -@@ -1703,6 +1836,15 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1738,6 +1871,15 @@ static int ath11k_htt_pull_ppdu_stats(st pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, msg->info); ppdu_id = msg->ppdu_id; @@ -1223,7 +1223,7 @@ Signed-off-by: Vasanthakumar Thiagarajan rcu_read_lock(); ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id); if (!ar) { -@@ -1770,6 +1912,12 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1805,6 +1947,12 @@ static int ath11k_htt_pull_ppdu_stats(st } } @@ -1257,7 +1257,7 @@ Signed-off-by: Vasanthakumar Thiagarajan mutex_unlock(&ar->conf_mutex); } -@@ -9714,6 +9726,28 @@ err_fallback: +@@ -9715,6 +9727,28 @@ err_fallback: return 0; } @@ -1286,7 +1286,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static const struct ieee80211_ops ath11k_ops = { .tx = ath11k_mac_op_tx, .wake_tx_queue = ieee80211_handle_wake_tx_queue, -@@ -9771,6 +9805,9 @@ static const struct ieee80211_ops ath11k +@@ -9772,6 +9806,9 @@ static const struct ieee80211_ops ath11k .set_sar_specs = ath11k_mac_op_set_bios_sar_specs, .remain_on_channel = ath11k_mac_op_remain_on_channel, .cancel_remain_on_channel = ath11k_mac_op_cancel_remain_on_channel, @@ -1296,7 +1296,7 @@ Signed-off-by: Vasanthakumar Thiagarajan }; static void ath11k_mac_update_ch_list(struct ath11k *ar, -@@ -10231,6 +10268,8 @@ static int __ath11k_mac_register(struct +@@ -10232,6 +10269,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VLAN_OFFLOAD); diff --git a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch index cb4fba0a2ffdcd..1d7cf5b0e7c585 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch @@ -23,7 +23,7 @@ Signed-off-by: Rameshkumar Sundaram --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7643,8 +7643,10 @@ err_vdev_del: +@@ -7644,8 +7644,10 @@ err_vdev_del: kfree(arvif->vlan_keyid_map); ath11k_peer_cleanup(ar, arvif->vdev_id); diff --git a/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch index d733219b38aa7f..798ec1973c3fe3 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -1332,6 +1332,7 @@ const struct ath11k_hw_ring_mask ath11k_ +@@ -1573,6 +1573,7 @@ const struct ath11k_hw_ring_mask ath11k_ ATH11K_RX_WBM_REL_RING_MASK_0, }, .reo_status = { diff --git a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index 3c3e436c75ce41..67781ea0ad2b6b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -58,7 +58,7 @@ Signed-off-by: Venkateswara Naralasetty tcl_cmd.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10154,6 +10154,8 @@ static int __ath11k_mac_register(struct +@@ -10155,6 +10155,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, USES_RSS); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch index 752218e9b8ec26..90adde1baf67db 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch @@ -16,7 +16,7 @@ Signed-off-by: Anilkumar Kolli --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -5953,12 +5953,23 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6124,12 +6124,23 @@ int ath11k_dp_rx_process_mon_status(stru pmon->mon_ppdu_status = DP_PPDU_STATUS_START; } @@ -43,7 +43,7 @@ Signed-off-by: Anilkumar Kolli rcu_read_lock(); spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find_by_id(ab, ppdu_info->peer_id); -@@ -6282,6 +6293,13 @@ static int ath11k_dp_full_mon_process_rx +@@ -6453,6 +6464,13 @@ static int ath11k_dp_full_mon_process_rx spin_lock_bh(&pmon->mon_lock); @@ -57,7 +57,7 @@ Signed-off-by: Anilkumar Kolli sw_mon_entries = &pmon->sw_mon_entries; rx_mon_stats = &pmon->rx_mon_stats; -@@ -6321,7 +6339,6 @@ static int ath11k_dp_full_mon_process_rx +@@ -6492,7 +6510,6 @@ static int ath11k_dp_full_mon_process_rx } rx_mon_stats->dest_ppdu_done++; @@ -65,7 +65,7 @@ Signed-off-by: Anilkumar Kolli pmon->buf_state = DP_MON_STATUS_LAG; pmon->mon_status_paddr = sw_mon_entries->mon_status_paddr; pmon->hold_mon_dst_ring = true; -@@ -6352,16 +6369,10 @@ reap_status_ring: +@@ -6523,16 +6540,10 @@ reap_status_ring: int ath11k_dp_rx_process_mon_rings(struct ath11k_base *ab, int mac_id, struct napi_struct *napi, int budget) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch index 0adf26c808aec6..8950e960467e67 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch @@ -35,7 +35,7 @@ Signed-off-by: Venkateswara Naralasetty --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3660,6 +3660,46 @@ ath11k_dp_rx_mon_update_status_buf_state +@@ -3782,6 +3782,46 @@ ath11k_dp_rx_mon_update_status_buf_state } } @@ -82,7 +82,7 @@ Signed-off-by: Venkateswara Naralasetty static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id, int *budget, struct sk_buff_head *skb_list) { -@@ -3673,6 +3713,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3795,6 +3835,7 @@ static int ath11k_dp_rx_reap_mon_status_ struct sk_buff *skb; struct ath11k_skb_rxcb *rxcb; struct hal_tlv_hdr *tlv; @@ -90,7 +90,7 @@ Signed-off-by: Venkateswara Naralasetty u32 cookie; int buf_id, srng_id; dma_addr_t paddr; -@@ -3692,8 +3733,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3814,8 +3855,7 @@ static int ath11k_dp_rx_reap_mon_status_ ath11k_hal_srng_access_begin(ab, srng); while (*budget) { *budget -= 1; @@ -100,7 +100,7 @@ Signed-off-by: Venkateswara Naralasetty if (!rx_mon_status_desc) { pmon->buf_state = DP_MON_STATUS_REPLINISH; break; -@@ -3724,18 +3764,43 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3846,18 +3886,43 @@ static int ath11k_dp_rx_reap_mon_status_ tlv = (struct hal_tlv_hdr *)skb->data; if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_STATUS_BUFFER_DONE) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch index f574597dceb969..8e23cd99e747c6 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch @@ -46,7 +46,7 @@ Signed-off-by: Nagarajan Maran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -396,8 +396,8 @@ int ath11k_dp_rxbufs_replenish(struct at +@@ -431,8 +431,8 @@ int ath11k_dp_rxbufs_replenish(struct at goto fail_free_skb; spin_lock_bh(&rx_ring->idr_lock); @@ -57,7 +57,7 @@ Signed-off-by: Nagarajan Maran spin_unlock_bh(&rx_ring->idr_lock); if (buf_id <= 0) goto fail_dma_unmap; -@@ -3141,6 +3141,16 @@ try_again: +@@ -3263,6 +3263,16 @@ try_again: while (likely(desc = (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab, srng))) { @@ -74,7 +74,7 @@ Signed-off-by: Nagarajan Maran cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, desc->buf_addr_info.info1); buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, -@@ -3171,8 +3181,6 @@ try_again: +@@ -3293,8 +3303,6 @@ try_again: num_buffs_reaped[mac_id]++; diff --git a/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch index f57faaa465ae76..fe231db61355ea 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch @@ -13,7 +13,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2564,7 +2564,8 @@ static void ath11k_dp_rx_h_undecap(struc +@@ -2671,7 +2671,8 @@ static void ath11k_dp_rx_h_undecap(struc ehdr = (struct ethhdr *)msdu->data; /* mac80211 allows fast path only for authorized STA */ diff --git a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch index f909ba4a673f69..fd4f0938cdb83b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch @@ -14,7 +14,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1425,6 +1425,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { +@@ -1501,6 +1501,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { #define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM GENMASK(31, 25) #define HTT_PPDU_STATS_NON_QOS_TID 16 @@ -24,7 +24,7 @@ Signed-off-by: Ramya Gnanasekar u32 ppdu_id; --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1288,7 +1288,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1323,7 +1323,7 @@ static int ath11k_htt_tlv_ppdu_stats_par struct htt_ppdu_user_stats *user_stats = NULL; int cur_user; u16 peer_id; @@ -33,7 +33,7 @@ Signed-off-by: Ramya Gnanasekar ppdu_info = data; -@@ -1369,6 +1369,8 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1404,6 +1404,8 @@ static int ath11k_htt_tlv_ppdu_stats_par return -EINVAL; } @@ -42,7 +42,7 @@ Signed-off-by: Ramya Gnanasekar peer_id = ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->sw_peer_id; cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, -@@ -1380,6 +1382,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1415,6 +1417,7 @@ static int ath11k_htt_tlv_ppdu_stats_par user_stats->is_valid_peer_id = true; memcpy((void *)&user_stats->ack_ba, ptr, sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); diff --git a/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch index 8adb5448a1564c..fd78090aebc0f0 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch @@ -53,7 +53,7 @@ Signed-off-by: Tamizh Chelvam Raja }; --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -848,6 +848,18 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -849,6 +849,18 @@ static ssize_t ath11k_debugfs_dump_soc_d "\nNSS Transmit Failures: %d\n", atomic_read(&soc_stats->tx_err.nss_tx_fail)); @@ -110,7 +110,7 @@ Signed-off-by: Tamizh Chelvam Raja struct dp_reo_cmd { struct list_head list; struct dp_rx_tid data; -@@ -295,6 +304,12 @@ struct ath11k_dp { +@@ -296,6 +305,12 @@ struct ath11k_dp { * - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; @@ -135,7 +135,7 @@ Signed-off-by: Tamizh Chelvam Raja static inline u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc) { -@@ -672,13 +675,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( +@@ -707,13 +710,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( return 0; } @@ -186,7 +186,7 @@ Signed-off-by: Tamizh Chelvam Raja spin_lock_bh(&dp->reo_cmd_lock); list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { list_del(&cmd->list); -@@ -724,14 +764,18 @@ static void ath11k_dp_reo_cmd_free(struc +@@ -759,14 +799,18 @@ static void ath11k_dp_reo_cmd_free(struc } } @@ -207,7 +207,7 @@ Signed-off-by: Tamizh Chelvam Raja desc_sz = ath11k_hal_reo_qdesc_size(0, HAL_DESC_REO_NON_QOS_TID); while (tot_desc_sz > desc_sz) { -@@ -742,11 +786,17 @@ static void ath11k_dp_reo_cache_flush(st +@@ -777,11 +821,17 @@ static void ath11k_dp_reo_cache_flush(st HAL_REO_CMD_FLUSH_CACHE, &cmd, NULL); if (ret) @@ -228,7 +228,7 @@ Signed-off-by: Tamizh Chelvam Raja memset(&cmd, 0, sizeof(cmd)); cmd.addr_lo = lower_32_bits(rx_tid->paddr); cmd.addr_hi = upper_32_bits(rx_tid->paddr); -@@ -754,24 +804,21 @@ static void ath11k_dp_reo_cache_flush(st +@@ -789,24 +839,21 @@ static void ath11k_dp_reo_cache_flush(st ret = ath11k_dp_tx_send_reo_cmd(ab, rx_tid, HAL_REO_CMD_FLUSH_CACHE, &cmd, ath11k_dp_reo_cmd_free); @@ -259,7 +259,7 @@ Signed-off-by: Tamizh Chelvam Raja goto free_desc; } else if (status != HAL_REO_CMD_SUCCESS) { /* Shouldn't happen! Cleanup in case of other failure? */ -@@ -780,6 +827,29 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -815,6 +862,29 @@ static void ath11k_dp_rx_tid_del_func(st return; } @@ -289,7 +289,7 @@ Signed-off-by: Tamizh Chelvam Raja elem = kzalloc(sizeof(*elem), GFP_ATOMIC); if (!elem) goto free_desc; -@@ -797,13 +867,20 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -832,13 +902,20 @@ static void ath11k_dp_rx_tid_del_func(st if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || time_after(jiffies, elem->ts + msecs_to_jiffies(DP_REO_DESC_FREE_TIMEOUT_MS))) { @@ -314,7 +314,7 @@ Signed-off-by: Tamizh Chelvam Raja } } spin_unlock_bh(&dp->reo_cmd_lock); -@@ -819,34 +896,48 @@ free_desc: +@@ -854,34 +931,48 @@ free_desc: void ath11k_peer_rx_tid_delete(struct ath11k *ar, struct ath11k_peer *peer, u8 tid) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch b/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch new file mode 100644 index 00000000000000..1f66f72a4a4851 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch @@ -0,0 +1,59 @@ +From 0a30d8c3d51d798b50bd792aa49e6a5b5ad14183 Mon Sep 17 00:00:00 2001 +From: Rajat Soni +Date: Wed, 12 Apr 2023 18:06:54 +0530 +Subject: [PATCH] ath11k: Fix mutex dead lock and q6 dump crash + +Issue 1: +Currently for HOST_DDR_REGION_TYPE memory, we are facing crash +because target memory virtual address (vaddr) is NULL. We are +not assigning any value to vaddr. + +Issue 2: +In ath11k_mac_op_start we are using mutex lock and waiting for +waiting for completion of ab->reconfigure_complete. +Before completing ab->reconfigure_complete in function +ath11k_core_reconfigure_on_crash, we are again trying +to get mutex lock in ath11k_spectral_deinit. This results +in dead lock. + +Due to these two issue during SSR case fw recovery pdev +is not recovered properly. + +To resolve these two issues: +Issue1: +During ath11k_qmi_assign_target_mem_chunk we should assign +ab->qmi.target_mem[idx].vaddr. + +Issue 2: +Unlock mutex lock before waiting for completion of +ab->reconfigure_complete and acquiring lock again. + +Signed-off-by: Rajat Soni +--- + drivers/net/wireless/ath/ath11k/mac.c | 2 ++ + drivers/net/wireless/ath/ath11k/qmi.c | 1 + + 2 files changed, 3 insertions(+) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -8001,7 +8001,9 @@ static int ath11k_mac_op_start(struct ie + break; + case ATH11K_STATE_RESTARTING: + ar->state = ATH11K_STATE_RESTARTED; ++ mutex_unlock(&ar->conf_mutex); + ath11k_mac_wait_reconfigure(ab); ++ mutex_lock(&ar->conf_mutex); + break; + case ATH11K_STATE_RESTARTED: + case ATH11K_STATE_WEDGED: +--- a/drivers/net/wireless/ath/ath11k/qmi.c ++++ b/drivers/net/wireless/ath/ath11k/qmi.c +@@ -2960,6 +2960,8 @@ static int ath11k_qmi_assign_target_mem_ + if (!ab->qmi.target_mem[idx].iaddr) + return -EIO; + ++ ab->qmi.target_mem[idx].vaddr = ab->qmi.target_mem[idx].iaddr; ++ + ab->qmi.target_mem[idx].size = ab->qmi.target_mem[i].size; + host_ddr_sz = ab->qmi.target_mem[i].size; + ab->qmi.target_mem[idx].type = ab->qmi.target_mem[i].type; diff --git a/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch b/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch new file mode 100644 index 00000000000000..7d413afec97b3d --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch @@ -0,0 +1,43 @@ +From 76482cd32e1053ef6437015d9418636616931213 Mon Sep 17 00:00:00 2001 +From: Hari Chandrakanthan +Date: Thu, 22 Jun 2023 00:45:47 +0530 +Subject: [PATCH] ath11k : flush management frames to firmware before waiting + for tx completion + +warning print "ath11k c000000.wifi: failed to flush mgmt transmit queue 0" +is observed during interface down. + +The management packets are queued in a skb_queue and the skb_queue +is dequeued in the work ar->wmi_mgmt_tx_work. + +In ath11k_mac_flush_tx_complete, before waiting for the tx completion of +all the management frames, we are not ensuring that queued +management frames are flushed to the firmware. + +This causes ar->num_pending_mgmt_tx to be positive and it leads to the +warning print. + +Fix this by flushing all the management frames to firmware before waiting +for the tx completion. + +Signed-off-by: Hari Chandrakanthan +--- + drivers/net/wireless/ath/ath11k/mac.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c +index 28c9908ef816..dbdb7aa5c498 100644 +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -10266,6 +10266,8 @@ static int ath11k_mac_flush_tx_complete(struct ath11k *ar) + ret = -ETIMEDOUT; + } + ++ flush_work(&ar->wmi_mgmt_tx_work); ++ + time_left = wait_event_timeout(ar->txmgmt_empty_waitq, + (atomic_read(&ar->num_pending_mgmt_tx) == 0), + ATH11K_FLUSH_TIMEOUT); +-- +2.7.4 + diff --git a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch index 510fbc2448cee7..1f81a8ef722598 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch @@ -13,7 +13,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10141,6 +10141,7 @@ static int __ath11k_mac_register(struct +@@ -10142,6 +10142,7 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); diff --git a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch index c23b6cb3c858b4..55d8063a2403ca 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch @@ -48,7 +48,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6090,7 +6090,9 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6261,7 +6261,9 @@ int ath11k_dp_rx_process_mon_status(stru if (!num_buffs_reaped) goto exit; @@ -59,7 +59,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; while ((skb = __skb_dequeue(&skb_list))) { -@@ -6108,7 +6110,6 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6279,7 +6281,6 @@ int ath11k_dp_rx_process_mon_status(stru if (log_type != ATH11K_PKTLOG_TYPE_INVALID) trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); @@ -67,7 +67,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb); -@@ -6136,6 +6137,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6307,6 +6308,7 @@ int ath11k_dp_rx_process_mon_status(stru if ((ppdu_info->peer_id == HAL_INVALID_PEERID || hal_status != HAL_RX_MON_STATUS_PPDU_DONE)) { dev_kfree_skb_any(skb); diff --git a/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch b/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch new file mode 100644 index 00000000000000..fe767b6a33de2a --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch @@ -0,0 +1,66 @@ +From cd0401a0fe82b5f9c31016d11dcc99d9fa4be96d Mon Sep 17 00:00:00 2001 +From: Balamurugan Selvarajan +Date: Wed, 14 Sep 2022 17:12:20 +0530 +Subject: [PATCH] ath11k: Skip cache invalidation in rx replenish + +In ath11k_dp_rxbufs_replenish() the descriptors are updated with +new skb physical address. currently physical address is obtained +using dma_map_single() this api additionally invalidates the cache +lines which is not required in replenish(). This consumes CPU cycles. +In the Rx data path, the desc->skb memory is invalidated before +reading from the memory. So, replace dmap_map_single() with +dma_map_single_attrs(DMA_ATTR_SKIP_CPU_SYNC). This reduces CPU usage by 7%. + +perf top with dma_map_single() +============================= + 24.99% [kernel] [k] __pi___inval_dcache_area + 14.56% [ath11k] [k] ath11k_dp_process_rx + 8.24% [qca_nss_dp] [k] edma_tx_ring_xmit + 5.22% [kernel] [k] dmac_clean_range_no_dsb + 4.26% [kernel] [k] __dma_clean_area_no_dsb + 4.22% [qca_nss_sfe] [k] sfe_recv + 3.90% [kernel] [k] skb_recycler_alloc + 3.87% [kernel] [k] __local_bh_enable_ip + +perf top with dma_map_single_attrs with DMA_ATTR_SKIP_CPU_SYNC +============================================================= + 17.07% [kernel] [k] __pi___inval_dcache_area + 15.53% [ath11k] [k] ath11k_dp_process_rx + 9.03% [qca_nss_dp] [k] edma_tx_ring_xmit + 5.62% [kernel] [k] dmac_clean_range_no_dsb + 5.41% [kernel] [k] skb_recycler_alloc + 4.68% [qca_nss_sfe] [k] sfe_recv + 4.64% [kernel] [k] __dma_clean_area_no_dsb + 3.88% [kernel] [k] __local_bh_enable_ip + +Signed-off-by: Balamurugan Selvarajan +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -427,9 +427,9 @@ int ath11k_dp_rxbufs_replenish(struct at + skb->data); + } + +- paddr = dma_map_single(ab->dev, skb->data, +- skb->len + skb_tailroom(skb), +- DMA_FROM_DEVICE); ++ paddr = dma_map_single_attrs(ab->dev, skb->data, ++ skb->len + skb_tailroom(skb), ++ DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + if (dma_mapping_error(ab->dev, paddr)) + goto fail_free_skb; + +@@ -465,8 +465,8 @@ fail_idr_remove: + idr_remove(&rx_ring->bufs_idr, buf_id); + spin_unlock_bh(&rx_ring->idr_lock); + fail_dma_unmap: +- dma_unmap_single(ab->dev, paddr, skb->len + skb_tailroom(skb), +- DMA_FROM_DEVICE); ++ dma_unmap_single_attrs(ab->dev, paddr, skb->len + skb_tailroom(skb), ++ DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + fail_free_skb: + dev_kfree_skb_any(skb); + diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch index b471fb326a5b48..b2912777fad5d0 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch @@ -26,7 +26,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -8221,7 +8221,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8222,7 +8222,6 @@ ath11k_mac_op_assign_vif_chanctx(struct struct ath11k_base *ab = ar->ab; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); int ret; @@ -34,7 +34,7 @@ Acked-by: Jeff Johnson mutex_lock(&ar->conf_mutex); -@@ -8244,21 +8243,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8245,21 +8244,6 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch index 2fb2cdfd429b11..ea08ea8818155d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch @@ -39,7 +39,7 @@ Acked-by: Jeff Johnson if (ret) { ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); goto free_tx_stats; -@@ -8164,8 +8164,8 @@ unlock: +@@ -8165,8 +8165,8 @@ unlock: mutex_unlock(&ar->conf_mutex); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch index 4d83d0f0ed9029..a2ff42ad9d194d 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch @@ -317,7 +317,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) -@@ -9739,6 +9461,281 @@ ath11k_mac_op_config_mesh_offload_path(s +@@ -9740,6 +9462,281 @@ ath11k_mac_op_config_mesh_offload_path(s } #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch index d1b462519c91e8..aeaf65aaa0e73b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch @@ -52,7 +52,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7933,6 +7933,30 @@ static int ath11k_mac_start_vdev_delay(s +@@ -7934,6 +7934,30 @@ static int ath11k_mac_start_vdev_delay(s return 0; } @@ -83,7 +83,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -@@ -7977,15 +8001,17 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -7978,15 +8002,17 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } @@ -109,7 +109,7 @@ Acked-by: Jeff Johnson if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &ar->monitor_flags)) { -@@ -8025,8 +8051,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8026,8 +8052,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc "chanctx unassign ptr %p vdev_id %i\n", ctx, arvif->vdev_id); @@ -118,7 +118,7 @@ Acked-by: Jeff Johnson if (ab->hw_params.vdev_start_delay && arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { spin_lock_bh(&ab->base_lock); -@@ -8050,24 +8074,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8051,24 +8075,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc return; } @@ -149,7 +149,7 @@ Acked-by: Jeff Johnson } if (ab->hw_params.vdev_start_delay && -@@ -9555,6 +9568,46 @@ exit: +@@ -9556,6 +9569,46 @@ exit: return ret; } @@ -196,7 +196,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -9590,31 +9643,15 @@ static int ath11k_mac_op_sta_state(struc +@@ -9591,31 +9644,15 @@ static int ath11k_mac_op_sta_state(struc sta->addr, arvif->vdev_id); } else if ((old_state == IEEE80211_STA_NONE && new_state == IEEE80211_STA_NOTEXIST)) { @@ -233,7 +233,7 @@ Acked-by: Jeff Johnson ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", vif->addr, arvif->vdev_id); ath11k_peer_rhash_delete(ar->ab, peer); -@@ -9625,12 +9662,6 @@ static int ath11k_mac_op_sta_state(struc +@@ -9626,12 +9663,6 @@ static int ath11k_mac_op_sta_state(struc } spin_unlock_bh(&ar->ab->base_lock); mutex_unlock(&ar->ab->tbl_mtx_lock); @@ -246,7 +246,7 @@ Acked-by: Jeff Johnson } else if (old_state == IEEE80211_STA_AUTH && new_state == IEEE80211_STA_ASSOC && (vif->type == NL80211_IFTYPE_AP || -@@ -10202,6 +10233,8 @@ static int __ath11k_mac_register(struct +@@ -10203,6 +10234,8 @@ static int __ath11k_mac_register(struct wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); diff --git a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch index 2362820dc9e838..06f5e62c7b103c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch @@ -40,7 +40,7 @@ ath11k-$(CPTCFG_ATH11K_THERMAL) += thermal.o --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1875,7 +1875,9 @@ int ath11k_debugfs_register(struct ath11 +@@ -1877,7 +1877,9 @@ int ath11k_debugfs_register(struct ath11 snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); @@ -120,7 +120,7 @@ &fops_peer_ps_state); --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1723,8 +1723,10 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1758,8 +1758,10 @@ ath11k_update_per_peer_tx_stats(struct a peer_stats->mu_pos = mu_pos; peer_stats->ru_tones = arsta->txrate.he_ru_alloc; @@ -131,7 +131,7 @@ } usr_stats->rate_stats_updated = true; -@@ -2170,7 +2172,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -2205,7 +2207,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s ath11k_htt_pull_ppdu_stats(ab, skb); break; case HTT_T2H_MSG_TYPE_EXT_STATS_CONF: @@ -176,7 +176,7 @@ spin_unlock_bh(&ab->base_lock); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9812,7 +9812,7 @@ static const struct ieee80211_ops ath11k +@@ -9813,7 +9813,7 @@ static const struct ieee80211_ops ath11k .set_wakeup = ath11k_wow_op_set_wakeup, #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch b/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch new file mode 100644 index 00000000000000..c2cc4f2f89f43e --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch @@ -0,0 +1,264 @@ +From 93abe1755de2727bf8fb5969bce25ae49c704484 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam +Date: Mon, 15 Nov 2021 18:15:38 +0530 +Subject: [PATCH] ath11k: Use idr_replace + +idr_alloc has been done multiple times upon reaping the msdu +using idr_remove. This idr_alloc would take more cpu, to redue +the cpu usage call idr_replace by storing used buf_ids instead +of calling idr_alloc during replenish. + +Signed-off-by: Tamizh Chelvam +--- + drivers/net/wireless/ath/ath11k/core.h | 6 +++ + drivers/net/wireless/ath/ath11k/dp.c | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 66 +++++++++++++++++++++++++-------- + drivers/net/wireless/ath/ath11k/dp_rx.h | 2 +- + 4 files changed, 59 insertions(+), 17 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/core.h ++++ b/drivers/net/wireless/ath/ath11k/core.h +@@ -662,6 +662,11 @@ struct ath11k_per_peer_tx_stats { + #define ATH11K_FLUSH_TIMEOUT (5 * HZ) + #define ATH11K_VDEV_DELETE_TIMEOUT_HZ (5 * HZ) + ++struct ath11k_rx_buf_id { ++ struct list_head list; ++ int used_buf_id; ++}; ++ + struct ath11k { + struct ath11k_base *ab; + struct ath11k_pdev *pdev; +@@ -811,6 +816,7 @@ struct ath11k { + /* protected by conf_mutex */ + bool ps_state_enable; + bool ps_timekeeper_enable; ++ struct ath11k_rx_buf_id rx_buf_id; + }; + + struct ath11k_band_cap { +--- a/drivers/net/wireless/ath/ath11k/dp.c ++++ b/drivers/net/wireless/ath/ath11k/dp.c +@@ -897,7 +897,7 @@ int ath11k_dp_service_srng(struct ath11k + + hal_params = ab->hw_params.hal_params; + ath11k_dp_rxbufs_replenish(ab, id, rx_ring, 0, +- hal_params->rx_buf_rbm); ++ hal_params->rx_buf_rbm, NULL); + } + } + } +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -388,7 +388,8 @@ static inline u8 ath11k_dp_rx_h_msdu_sta + int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id, + struct dp_rxdma_ring *rx_ring, + int req_entries, +- enum hal_rx_buf_return_buf_manager mgr) ++ enum hal_rx_buf_return_buf_manager mgr, ++ u32 *buf_ids) + { + struct hal_srng *srng; + u32 *desc; +@@ -396,9 +397,15 @@ int ath11k_dp_rxbufs_replenish(struct at + int num_free; + int num_remain; + int buf_id; ++ int buf_id_index; + u32 cookie; + dma_addr_t paddr; + ++ if (!buf_ids) ++ buf_id_index = 0; ++ else ++ buf_id_index = min(req_entries, DP_RX_MAX_IDR_BUF); ++ + req_entries = min(req_entries, rx_ring->bufs_max); + + srng = &ab->hal.srng_list[rx_ring->refill_buf_ring.ring_id]; +@@ -434,8 +441,14 @@ int ath11k_dp_rxbufs_replenish(struct at + goto fail_free_skb; + + spin_lock_bh(&rx_ring->idr_lock); ++ if (buf_ids && buf_id_index) { ++ buf_id_index--; ++ buf_id = buf_ids[buf_id_index]; ++ idr_replace(&rx_ring->bufs_idr, skb, buf_id); ++ } else { + buf_id = idr_alloc(&rx_ring->bufs_idr, skb, 1, + (rx_ring->bufs_max * 3) + 1, GFP_ATOMIC); ++ } + spin_unlock_bh(&rx_ring->idr_lock); + if (buf_id <= 0) + goto fail_dma_unmap; +@@ -458,6 +471,12 @@ int ath11k_dp_rxbufs_replenish(struct at + + spin_unlock_bh(&srng->lock); + ++ while (buf_id_index--) { ++ spin_lock_bh(&rx_ring->idr_lock); ++ idr_remove(&rx_ring->bufs_idr, buf_ids[buf_id_index]); ++ spin_unlock_bh(&rx_ring->idr_lock); ++ } ++ + return req_entries - num_remain; + + fail_idr_remove: +@@ -532,7 +551,7 @@ static int ath11k_dp_rxdma_ring_buf_setu + + rx_ring->bufs_max = num_entries; + ath11k_dp_rxbufs_replenish(ar->ab, dp->mac_id, rx_ring, num_entries, +- ar->ab->hw_params.hal_params->rx_buf_rbm); ++ ar->ab->hw_params.hal_params->rx_buf_rbm, NULL); + return 0; + } + +@@ -3346,11 +3365,14 @@ int ath11k_dp_process_rx(struct ath11k_b + struct ath11k *ar; + struct hal_reo_dest_ring *desc; + enum hal_reo_dest_ring_push_reason push_reason; ++ u32 *rx_buf_id[MAX_RADIOS]; + u32 cookie; + int i; + +- for (i = 0; i < MAX_RADIOS; i++) ++ for (i = 0; i < MAX_RADIOS; i++) { + __skb_queue_head_init(&msdu_list[i]); ++ rx_buf_id[i] = kzalloc(sizeof(u32) * DP_RX_MAX_IDR_BUF, GFP_ATOMIC); ++ } + + srng = &ab->hal.srng_list[dp->reo_dst_ring[ring_id].ring_id]; + +@@ -3383,8 +3405,16 @@ try_again: + + ar = ab->pdevs[mac_id].ar; + rx_ring = &ar->dp.rx_refill_buf_ring; ++ i = num_buffs_reaped[mac_id]; ++ + spin_lock_bh(&rx_ring->idr_lock); +- msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ if (rx_buf_id[mac_id] && i < DP_RX_MAX_IDR_BUF) { ++ msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ rx_buf_id[mac_id][i] = buf_id; ++ } else { ++ msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ } ++ spin_unlock_bh(&rx_ring->idr_lock); + if (unlikely(!msdu)) { + ath11k_warn(ab, "frame rx with invalid buf_id %d\n", + buf_id); +@@ -3464,9 +3494,12 @@ try_again: + rx_ring = &ar->dp.rx_refill_buf_ring; + + ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i], +- ab->hw_params.hal_params->rx_buf_rbm); ++ ab->hw_params.hal_params->rx_buf_rbm, rx_buf_id[i]); + } + exit: ++ for (i = 0; i < MAX_RADIOS; i++) ++ kfree(rx_buf_id[i]); ++ + return total_msdu_reaped; + } + +@@ -4831,7 +4864,7 @@ exit: + rx_ring = &ar->dp.rx_refill_buf_ring; + + ath11k_dp_rxbufs_replenish(ab, i, rx_ring, n_bufs_reaped[i], +- ab->hw_params.hal_params->rx_buf_rbm); ++ ab->hw_params.hal_params->rx_buf_rbm, NULL); + } + + return tot_n_bufs_reaped; +@@ -5047,14 +5080,17 @@ int ath11k_dp_rx_process_wbm_err(struct + struct sk_buff *msdu; + struct sk_buff_head msdu_list[MAX_RADIOS]; + struct ath11k_skb_rxcb *rxcb; ++ u32 *wbm_err_buf_id[MAX_RADIOS]; + u32 *rx_desc; + int buf_id, mac_id; + int num_buffs_reaped[MAX_RADIOS] = {0}; + int total_num_buffs_reaped = 0; + int ret, i; + +- for (i = 0; i < ab->num_radios; i++) ++ for (i = 0; i < ab->num_radios; i++) { + __skb_queue_head_init(&msdu_list[i]); ++ wbm_err_buf_id[i] = kzalloc(sizeof(u32) * DP_RX_MAX_IDR_BUF, GFP_ATOMIC); ++ } + + srng = &ab->hal.srng_list[dp->rx_rel_ring.ring_id]; + +@@ -5129,7 +5165,7 @@ int ath11k_dp_rx_process_wbm_err(struct + rx_ring = &ar->dp.rx_refill_buf_ring; + + ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i], +- ab->hw_params.hal_params->rx_buf_rbm); ++ ab->hw_params.hal_params->rx_buf_rbm, wbm_err_buf_id[i]); + } + + rcu_read_lock(); +@@ -5151,6 +5187,8 @@ int ath11k_dp_rx_process_wbm_err(struct + } + rcu_read_unlock(); + done: ++ for (i = 0; i < ab->num_radios; i++) ++ kfree(wbm_err_buf_id[i]); + return total_num_buffs_reaped; + } + +@@ -5238,7 +5276,7 @@ int ath11k_dp_process_rxdma_err(struct a + + if (num_buf_freed) + ath11k_dp_rxbufs_replenish(ab, mac_id, rx_ring, num_buf_freed, +- ab->hw_params.hal_params->rx_buf_rbm); ++ ab->hw_params.hal_params->rx_buf_rbm, NULL); + + return budget - quota; + } +@@ -6184,12 +6222,12 @@ static void ath11k_dp_rx_mon_dest_proces + ath11k_dp_rxbufs_replenish(ar->ab, dp->mac_id, + &dp->rxdma_mon_buf_ring, + rx_bufs_used, +- hal_params->rx_buf_rbm); ++ hal_params->rx_buf_rbm, NULL); + else + ath11k_dp_rxbufs_replenish(ar->ab, dp->mac_id, + &dp->rx_refill_buf_ring, + rx_bufs_used, +- hal_params->rx_buf_rbm); ++ hal_params->rx_buf_rbm, NULL); + } + } + +@@ -6701,7 +6739,7 @@ next_entry: + ath11k_dp_rxbufs_replenish(ar->ab, dp->mac_id, + &dp->rxdma_mon_buf_ring, + rx_bufs_used, +- HAL_RX_BUF_RBM_SW3_BM); ++ HAL_RX_BUF_RBM_SW3_BM, NULL); + } + + reap_status_ring: +--- a/drivers/net/wireless/ath/ath11k/dp_rx.h ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.h +@@ -11,6 +11,8 @@ + + #define DP_MAX_NWIFI_HDR_LEN 36 + ++#define DP_RX_MAX_IDR_BUF 256 ++ + #define DP_RX_MPDU_ERR_FCS BIT(0) + #define DP_RX_MPDU_ERR_DECRYPT BIT(1) + #define DP_RX_MPDU_ERR_TKIP_MIC BIT(2) +@@ -125,7 +127,8 @@ int ath11k_dp_process_rx(struct ath11k_b + int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id, + struct dp_rxdma_ring *rx_ring, + int req_entries, +- enum hal_rx_buf_return_buf_manager mgr); ++ enum hal_rx_buf_return_buf_manager mgr, ++ u32 *buf_id); + int ath11k_dp_htt_tlv_iter(struct ath11k_base *ab, const void *ptr, size_t len, + int (*iter)(struct ath11k_base *ar, u16 tag, u16 len, + const void *ptr, void *data), From f89c93256db21e802b654e0555c50a50b3609043 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sat, 9 Mar 2024 11:59:20 -0500 Subject: [PATCH 67/80] ath11k_nss: Introduce skbuff_recycle for performance QSDK NSS builds utilize skbuff recycling for better handling of memory. On a Dynalink DL-WRX36 (pbuf script should be set to 'auto') a significant drop in memory usage was observed as well consistent sustained RX/TX speeds. BEFORE: echo 3 >! /proc/sys/vm/drop_caches free -m total used free shared buff/cache available Mem: 867 338 547 90 101 528 Swap: 0 0 0 AFTER: total used free shared buff/cache available Mem: 867 242 594 1 81 624 Swap: 0 0 0 NOTE: For 512MB platforms, users need to test with the following scenarios, as the patch `999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch` is really only testable on platforms with 512M or less RAM. 1.) Explicitly setting 'ATH11K_MEM_PROFILE_512M' on and see if system crashes on boot. 2.) Explicitly setting 'ATH11K_MEM_PROFILE_1G' 3.) Remove patches 999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch 999-311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch And re-test with #1 and #2 It was incorrectly assumed that setting a 512M for 1G platforms would save memory, instead it needs to be explicitly set to know proper memory regions, otherwise it would cause fw crash. ath11k_nss: fix typo in 512M memory profile ath11k_nss: remove SFE patch 718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly It is not relevant to NSS builds and only meant for SFE. ath11k_nss: remove unecessary patches Color collision should be left on by default, as it's a primary feature of 802.11AX. ath11k_nss: fix spacing ath11k_nss: Remove unnecessary TKIP bloat Remove TKIP patches that are not being used as 99% of folks are running modern encryption (AES-CCMP,SAE,etc). ath11k_nss: parameterize DP_RXDMA_REFILL_RING_SIZE memory profile ath11k_nss: Remove SFE related code Cleanup SFE (shortcut fe) related code as we're not using it on NSS ath11k_nss: idr, ampdu, and skb headroom check optimizations ath11k_nss: get valid last_rate for rx_bitrate from cpu stats ath11k_nss: Fix BCCA counter for EMA Currently BCCA counter is updated to FW via csa counter offs and beacon with new countdown is updated for every beacon tx completion event. For EMA, all EMA beacons are updated in one shot, and counter update for every tx event will mess up the actual sequence of countdown sent over the air. Allow FW to update the countdown till 1 and finalize the color change. ath11k_nss: Fix compile for TRACE feature --- package/kernel/mac80211/ath.mk | 1 - ...207-ath11k-Enable-256_512MB-profiles.patch | 32 +- ...rt-to-enable-disable-color-collision.patch | 46 -- ...pport-for-WDS-offload-in-NSS-offload.patch | 24 +- ...-dynamic-VLAN-support-in-NSS-offload.patch | 16 +- ...ow-fast-rx-by-bypassing-stats-update.patch | 6 +- ...ow-fast-rx-by-bypassing-stats-update.patch | 46 +- .../nss/ath11k/244-ath11k-dp-tx-perf.patch | 14 +- .../300-ath11k-nss-mesh-offload-support.patch | 20 +- ...lookup-failure-in-mgmt-tx-completion.patch | 2 +- ...e-free-of-peer-rx_tid-during-reo-cmd.patch | 2 +- ...30-ath11k-sync-wds_ast_entry-updates.patch | 2 +- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 2 +- ...ing-rx-stats-with-monitor-vif-enable.patch | 8 +- ...1k-skip-status-ring-entry-processing.patch | 8 +- ...356-ath11k-invalid-desc-sanity-check.patch | 6 +- ...-fix-tkip-encryption-traffic-failure.patch | 25 - ...Fix-ppdu_id-from-firmware-PPDU-stats.patch | 8 +- ...Add-retry-mechanism-for-update_rx_qu.patch | 18 +- ...treaming-not-working-for-wan-to-wlan.patch | 44 -- ...th11k-Advertise-TX_QUEUE-mac-hw-flag.patch | 2 +- ...oid-memset-of-ppdu-info-for-next-skb.patch | 6 +- ...support-to-send-the-QoS-Null-Data-fr.patch | 10 +- ...11k-remove-invalid-peer-create-logic.patch | 4 +- ...th11k-rename-ath11k_start_vdev_delay.patch | 2 +- ...ation-of-ath11k_mac_start_vdev_delay.patch | 2 +- ...ailure-due-to-unexpected-peer-delete.patch | 16 +- ...k-make-debugfs-sta-htt-stats-modular.patch | 8 +- ...1k-Disable-rx_header-tlv-for-2K-SKB.patch} | 128 ++- ...-nss-thread-priority-during-pdev_ini.patch | 109 +++ ...d-ampdu-id-in-802.11-radiotap-header.patch | 279 +++++++ ...999-336-0001-ath11k-idr-optimization.patch | 132 ++++ .../999-336-0002-ath11k-Use-idr_replace.patch | 28 +- ...k-skb_headroom-before-using-skb_push.patch | 253 ++++++ ...wifi-ath11k-Fix-BCCA-counter-for-EMA.patch | 115 +++ .../199-001-mac80211-add-nss-support.patch | 2 +- ...ort-to-enable-disable-bss-color-coll.patch | 78 -- ...-the-frame-to-driver-tx-ops-directly.patch | 74 -- ...id-last_rate-for-rx_bitrate-from-cpu.patch | 68 ++ ...se-HW-checksum-offload-only-for-ethm.patch | 31 +- target/linux/qualcommax/config-6.6 | 5 + .../qualcommax/files/net/core/skbuff_debug.c | 332 ++++++++ .../qualcommax/files/net/core/skbuff_debug.h | 53 ++ .../files/net/core/skbuff_notifier.c | 42 + .../files/net/core/skbuff_notifier.h | 52 ++ .../files/net/core/skbuff_recycle.c | 729 ++++++++++++++++++ .../files/net/core/skbuff_recycle.h | 178 +++++ 47 files changed, 2547 insertions(+), 521 deletions(-) delete mode 100644 package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch delete mode 100644 package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch delete mode 100644 package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch rename package/kernel/mac80211/patches/nss/ath11k/{233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch => 999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch} (90%) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch create mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-783-001-wifi-ath11k-Fix-BCCA-counter-for-EMA.patch delete mode 100644 package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch delete mode 100644 package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch create mode 100644 package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch create mode 100644 target/linux/qualcommax/files/net/core/skbuff_debug.c create mode 100644 target/linux/qualcommax/files/net/core/skbuff_debug.h create mode 100644 target/linux/qualcommax/files/net/core/skbuff_notifier.c create mode 100644 target/linux/qualcommax/files/net/core/skbuff_notifier.h create mode 100644 target/linux/qualcommax/files/net/core/skbuff_recycle.c create mode 100644 target/linux/qualcommax/files/net/core/skbuff_recycle.h diff --git a/package/kernel/mac80211/ath.mk b/package/kernel/mac80211/ath.mk index 574a3e2424dc90..ba76c0125a910b 100644 --- a/package/kernel/mac80211/ath.mk +++ b/package/kernel/mac80211/ath.mk @@ -70,7 +70,6 @@ config-$(CONFIG_ATH11K_NSS_SUPPORT) += ATH11K_NSS_SUPPORT config-$(CONFIG_ATH11K_NSS_MESH_SUPPORT) += ATH11K_NSS_MESH_SUPPORT config-$(CONFIG_ATH11K_DEBUGFS_STA) += ATH11K_DEBUGFS_STA config-$(CONFIG_ATH11K_DEBUGFS_HTT_STATS) += ATH11K_DEBUGFS_HTT_STATS -config-$(CONFIG_ATH11K_NSS_MESH_SUPPORT) += ATH11K_NSS_MESH_SUPPORT config-$(call config_package,ath9k-htc) += ATH9K_HTC config-$(call config_package,ath10k,regular) += ATH10K ATH10K_PCI diff --git a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch index 75e0bf1b79b844..4d9c1537a8bb4b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Enable-256_512MB-profiles.patch @@ -245,15 +245,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -210,6 +213,7 @@ static struct ath11k_hw_params ath11k_hw - .tx_ring_size = DP_TCL_DATA_RING_SIZE, - .smp2p_wow_exit = false, - .support_fw_mac_sequence = false, -+ .num_vdevs_peers = ath11k_vdevs_peers, - }, - { - .name = "qca6390 hw2.0", -@@ -259,7 +263,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -259,7 +262,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -262,7 +254,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -426,7 +430,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -426,7 +429,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -271,7 +263,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -462,6 +466,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -462,6 +465,7 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = true, @@ -279,7 +271,7 @@ Signed-off-by: Ramya Gnanasekar }, { .name = "wcn6855 hw2.1", -@@ -509,7 +514,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -509,7 +513,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = false, .coldboot_cal_ftm = false, .cbcal_restart_fw = false, @@ -288,7 +280,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = true, -@@ -545,6 +550,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -545,6 +549,7 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = true, @@ -296,7 +288,7 @@ Signed-off-by: Ramya Gnanasekar }, { .name = "wcn6750 hw1.0", -@@ -593,7 +599,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -593,7 +598,7 @@ static struct ath11k_hw_params ath11k_hw .coldboot_cal_mm = true, .coldboot_cal_ftm = true, .cbcal_restart_fw = false, @@ -305,15 +297,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, -@@ -626,6 +632,7 @@ static struct ath11k_hw_params ath11k_hw - .tx_ring_size = DP_TCL_DATA_RING_SIZE_WCN6750, - .smp2p_wow_exit = true, - .support_fw_mac_sequence = true, -+ .num_vdevs_peers = ath11k_vdevs_peers, - }, - { - .hw_rev = ATH11K_HW_IPQ5018_HW10, -@@ -672,7 +679,7 @@ static struct ath11k_hw_params ath11k_hw +@@ -672,7 +677,7 @@ static struct ath11k_hw_params ath11k_hw .supports_monitor = false, .supports_sta_ps = false, .supports_shadow_regs = false, @@ -322,7 +306,7 @@ Signed-off-by: Ramya Gnanasekar .num_vdevs = 16 + 1, .num_peers = 512, .supports_regdb = false, -@@ -707,6 +714,22 @@ static struct ath11k_hw_params ath11k_hw +@@ -707,6 +712,22 @@ static struct ath11k_hw_params ath11k_hw .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_fw_mac_sequence = false, diff --git a/package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch b/package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch deleted file mode 100644 index 24520cbeafbc7a..00000000000000 --- a/package/kernel/mac80211/patches/nss/ath11k/218-ath11k-add-support-to-enable-disable-color-collision.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ee8c401bdfa08c6b98fb5b016841db5603ba4059 Mon Sep 17 00:00:00 2001 -From: Lavanya Suresh -Date: Wed, 23 Sep 2020 21:54:34 +0530 -Subject: [PATCH] ath11k: add support to enable/disable bss color collision - detection - -Added module param to enable or disable bss color collision detection. -By default, it is disabled. This config should be changed before VAP -bringup only. - - -Signed-off-by: Lavanya Suresh ---- - drivers/net/wireless/ath/ath11k/mac.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - ---- a/drivers/net/wireless/ath/ath11k/mac.c -+++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9,6 +9,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -53,6 +54,10 @@ - .max_power = 30, \ - } - -+unsigned int color_collision_enable = 0; -+module_param_named(color_collision_detect, color_collision_enable, uint, 0644); -+MODULE_PARM_DESC(color_collision_detect, "BSS color collision detecion: 0-disable 1-enable"); -+ - static const struct ieee80211_channel ath11k_2ghz_channels[] = { - CHAN2G(1, 2412, 0), - CHAN2G(2, 2417, 0), -@@ -3723,7 +3728,7 @@ static void ath11k_mac_op_bss_info_chang - ret = ath11k_wmi_send_obss_color_collision_cfg_cmd( - ar, arvif->vdev_id, info->he_bss_color.color, - ATH11K_BSS_COLOR_COLLISION_DETECTION_AP_PERIOD_MS, -- info->he_bss_color.enabled); -+ (info->he_bss_color.enabled & color_collision_enable)); - if (ret) - ath11k_warn(ar->ab, "failed to set bss color collision on vdev %i: %d\n", - arvif->vdev_id, ret); diff --git a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch index 10e65157232edb..729ee80199b9a2 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -214,7 +214,7 @@ Signed-off-by: Sathishkumar Muruganandam ieee80211_queue_work(ar->hw, &arsta->set_4addr_wk); arsta->use_4addr_set = true; } -@@ -6647,6 +6771,9 @@ static int ath11k_mac_op_update_vif_offl +@@ -6646,6 +6770,9 @@ static int ath11k_mac_op_update_vif_offl u32 param_id, param_value; int ret; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET || (vif->type != NL80211_IFTYPE_STATION && -@@ -6867,7 +6994,8 @@ static int ath11k_mac_op_add_interface(s +@@ -6866,7 +6993,8 @@ static int ath11k_mac_op_add_interface(s goto err; } @@ -234,7 +234,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n", ar->num_created_vdevs, TARGET_NUM_VDEVS(ab)); ret = -EBUSY; -@@ -6887,6 +7015,28 @@ static int ath11k_mac_op_add_interface(s +@@ -6886,6 +7014,28 @@ static int ath11k_mac_op_add_interface(s arvif->vif = vif; INIT_LIST_HEAD(&arvif->list); @@ -263,7 +263,7 @@ Signed-off-by: Sathishkumar Muruganandam INIT_DELAYED_WORK(&arvif->connection_loss_work, ath11k_mac_vif_sta_connection_loss_work); -@@ -6916,6 +7066,7 @@ static int ath11k_mac_op_add_interface(s +@@ -6915,6 +7065,7 @@ static int ath11k_mac_op_add_interface(s fallthrough; case NL80211_IFTYPE_AP: arvif->vdev_type = WMI_VDEV_TYPE_AP; @@ -271,7 +271,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case NL80211_IFTYPE_MONITOR: arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; -@@ -7138,13 +7289,30 @@ static void ath11k_mac_op_remove_interfa +@@ -7137,13 +7288,30 @@ static void ath11k_mac_op_remove_interfa struct ath11k *ar = hw->priv; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ath11k_base *ab = ar->ab; @@ -304,7 +304,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n", arvif->vdev_id); -@@ -7161,6 +7329,14 @@ static void ath11k_mac_op_remove_interfa +@@ -7160,6 +7328,14 @@ static void ath11k_mac_op_remove_interfa if (ret) ath11k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", arvif->vdev_id, ret); @@ -319,7 +319,7 @@ Signed-off-by: Sathishkumar Muruganandam } ret = ath11k_mac_vdev_delete(ar, arvif); -@@ -7204,8 +7380,7 @@ err_vdev_del: +@@ -7203,8 +7379,7 @@ err_vdev_del: ath11k_debugfs_remove_interface(arvif); @@ -329,7 +329,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); } -@@ -7265,16 +7440,17 @@ static int ath11k_mac_op_ampdu_action(st +@@ -7264,16 +7439,17 @@ static int ath11k_mac_op_ampdu_action(st struct ieee80211_ampdu_params *params) { struct ath11k *ar = hw->priv; @@ -349,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case IEEE80211_AMPDU_TX_START: case IEEE80211_AMPDU_TX_STOP_CONT: -@@ -8797,6 +8973,7 @@ static void ath11k_mac_op_sta_statistics +@@ -8796,6 +8972,7 @@ static void ath11k_mac_op_sta_statistics { struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); struct ath11k *ar = arsta->arvif->ar; @@ -357,7 +357,7 @@ Signed-off-by: Sathishkumar Muruganandam s8 signal; bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT, ar->ab->wmi_ab.svc_map); -@@ -8853,7 +9030,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8852,7 +9029,8 @@ static void ath11k_mac_op_sta_statistics ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); @@ -380,7 +380,7 @@ Signed-off-by: Sathishkumar Muruganandam WMI_STA_PS_PARAM_TX_WAKE_THRESHOLD = 1, --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1156,12 +1156,13 @@ err_mem_free: +@@ -1121,12 +1121,13 @@ err_mem_free: return ret; } @@ -396,7 +396,7 @@ Signed-off-by: Sathishkumar Muruganandam int ret; ret = ath11k_peer_rx_tid_setup(ar, params->sta->addr, vdev_id, -@@ -1173,13 +1174,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 +@@ -1138,13 +1139,13 @@ int ath11k_dp_rx_ampdu_start(struct ath1 return ret; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch index e7817f953ace6e..80b8a5fc67d7ea 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch @@ -423,7 +423,7 @@ Signed-off-by: Sathishkumar Muruganandam } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { -@@ -7019,7 +7248,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7018,7 +7247,7 @@ static int ath11k_mac_op_add_interface(s if ((vif->type == NL80211_IFTYPE_AP_VLAN || vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && @@ -432,7 +432,7 @@ Signed-off-by: Sathishkumar Muruganandam vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; -@@ -7032,6 +7261,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7031,6 +7260,7 @@ static int ath11k_mac_op_add_interface(s vif->addr, ret); goto err; } @@ -440,7 +440,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); return ret; } -@@ -7056,6 +7286,20 @@ static int ath11k_mac_op_add_interface(s +@@ -7055,6 +7285,20 @@ static int ath11k_mac_op_add_interface(s arvif->vdev_id = bit; arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; @@ -461,7 +461,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_STATION: -@@ -7096,7 +7340,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7095,7 +7339,7 @@ static int ath11k_mac_op_add_interface(s if (ret) { ath11k_warn(ab, "failed to create WMI vdev %d: %d\n", arvif->vdev_id, ret); @@ -470,7 +470,7 @@ Signed-off-by: Sathishkumar Muruganandam } ar->num_created_vdevs++; -@@ -7255,7 +7499,7 @@ err_peer_del: +@@ -7254,7 +7498,7 @@ err_peer_del: if (fbret) { ath11k_warn(ar->ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n", vif->addr, arvif->vdev_id, fbret); @@ -479,7 +479,7 @@ Signed-off-by: Sathishkumar Muruganandam } } -@@ -7266,6 +7510,8 @@ err_vdev_del: +@@ -7265,6 +7509,8 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -488,7 +488,7 @@ Signed-off-by: Sathishkumar Muruganandam err: mutex_unlock(&ar->conf_mutex); -@@ -7363,6 +7609,7 @@ err_vdev_del: +@@ -7362,6 +7608,7 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -496,7 +496,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_peer_cleanup(ar, arvif->vdev_id); idr_for_each(&ar->txmgmt_idr, -@@ -9961,8 +10208,11 @@ static int __ath11k_mac_register(struct +@@ -9960,8 +10207,11 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index 493ed32105629e..0362ff8caa5d0e 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-001-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -4,13 +4,13 @@ u32 max_ast_index; u32 num_ast_entries; -+ bool stats_disable; ++ bool stats_disable; /* must be last */ u8 drv_priv[] __aligned(sizeof(void *)); }; --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -974,6 +974,79 @@ static const struct file_operations fops +@@ -973,6 +973,79 @@ static const struct file_operations fops .llseek = default_llseek, }; @@ -90,7 +90,7 @@ int ath11k_debugfs_pdev_create(struct ath11k_base *ab) { if (test_bit(ATH11K_FLAG_REGISTERED, &ab->dev_flags)) -@@ -1023,6 +1096,8 @@ int ath11k_debugfs_soc_create(struct ath +@@ -1022,6 +1095,8 @@ int ath11k_debugfs_soc_create(struct ath ret = PTR_ERR(ab->debugfs_soc); goto out; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index c5cd8f20874996..61077309338ffb 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -33,7 +33,7 @@ Signed-off-by: P Praneesh enum ath11k_hw_rev { --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -375,6 +375,12 @@ static int ath11k_dp_purge_mon_ring(stru +@@ -340,6 +340,12 @@ static int ath11k_dp_purge_mon_ring(stru return -ETIMEDOUT; } @@ -46,7 +46,7 @@ Signed-off-by: P Praneesh /* Returns number of Rx buffers replenished */ int ath11k_dp_rxbufs_replenish(struct ath11k_base *ab, int mac_id, struct dp_rxdma_ring *rx_ring, -@@ -1699,7 +1705,7 @@ int ath11k_dp_htt_tlv_iter(struct ath11k +@@ -1664,7 +1670,7 @@ int ath11k_dp_htt_tlv_iter(struct ath11k len -= sizeof(*tlv); if (tlv_len > len) { @@ -55,7 +55,7 @@ Signed-off-by: P Praneesh tlv_tag, ptr - begin, len, tlv_len); return -EINVAL; } -@@ -2561,10 +2567,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b +@@ -2454,10 +2460,60 @@ ath11k_dp_rx_h_find_peer(struct ath11k_b return peer; } @@ -117,7 +117,7 @@ Signed-off-by: P Praneesh { bool fill_crypto_hdr; enum hal_encrypt_type enctype; -@@ -2575,9 +2631,13 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2468,9 +2524,13 @@ static void ath11k_dp_rx_h_mpdu(struct a struct rx_attention *rx_attention; u32 err_bitmap; @@ -132,7 +132,7 @@ Signed-off-by: P Praneesh rxcb->is_mcbc = fill_crypto_hdr; if (rxcb->is_mcbc) { -@@ -2588,6 +2648,26 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2481,6 +2541,26 @@ static void ath11k_dp_rx_h_mpdu(struct a spin_lock_bh(&ar->ab->base_lock); peer = ath11k_dp_rx_h_find_peer(ar->ab, msdu); if (peer) { @@ -159,7 +159,7 @@ Signed-off-by: P Praneesh if (rxcb->is_mcbc) enctype = peer->sec_type_grp; else -@@ -2597,6 +2677,8 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2490,6 +2570,8 @@ static void ath11k_dp_rx_h_mpdu(struct a } spin_unlock_bh(&ar->ab->base_lock); @@ -168,7 +168,7 @@ Signed-off-by: P Praneesh rx_attention = ath11k_dp_rx_get_attention(ar->ab, rx_desc); err_bitmap = ath11k_dp_rx_h_attn_mpdu_err(rx_attention); if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) -@@ -2838,7 +2920,8 @@ static void ath11k_dp_rx_deliver_msdu(st +@@ -2731,7 +2813,8 @@ static void ath11k_dp_rx_deliver_msdu(st static int ath11k_dp_rx_process_msdu(struct ath11k *ar, struct sk_buff *msdu, struct sk_buff_head *msdu_list, @@ -178,7 +178,7 @@ Signed-off-by: P Praneesh { struct ath11k_base *ab = ar->ab; struct hal_rx_desc *rx_desc, *lrx_desc; -@@ -2920,8 +3003,13 @@ static int ath11k_dp_rx_process_msdu(str +@@ -2798,8 +2881,13 @@ static int ath11k_dp_rx_process_msdu(str } } @@ -193,7 +193,7 @@ Signed-off-by: P Praneesh rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -2936,10 +3024,12 @@ static void ath11k_dp_rx_process_receive +@@ -2814,10 +2902,12 @@ static void ath11k_dp_rx_process_receive struct sk_buff_head *msdu_list, int mac_id) { @@ -206,7 +206,7 @@ Signed-off-by: P Praneesh if (skb_queue_empty(msdu_list)) return; -@@ -2956,7 +3046,12 @@ static void ath11k_dp_rx_process_receive +@@ -2834,7 +2924,12 @@ static void ath11k_dp_rx_process_receive } while ((msdu = __skb_dequeue(msdu_list))) { @@ -220,7 +220,7 @@ Signed-off-by: P Praneesh if (unlikely(ret)) { ath11k_dbg(ab, ATH11K_DBG_DATA, "Unable to process msdu %d", ret); -@@ -2964,7 +3059,10 @@ static void ath11k_dp_rx_process_receive +@@ -2842,7 +2937,10 @@ static void ath11k_dp_rx_process_receive continue; } @@ -232,7 +232,7 @@ Signed-off-by: P Praneesh } } -@@ -2973,11 +3071,12 @@ void ath11k_dp_rx_from_nss(struct ath11k +@@ -2851,11 +2949,12 @@ void ath11k_dp_rx_from_nss(struct ath11k { struct ieee80211_rx_status rx_status = {0}; struct ath11k_skb_rxcb *rxcb; @@ -246,7 +246,7 @@ Signed-off-by: P Praneesh rx_status.flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; -@@ -4446,6 +4545,7 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4322,6 +4421,7 @@ static int ath11k_dp_rx_h_null_q_desc(st struct ieee80211_rx_status *status, struct sk_buff_head *msdu_list) { @@ -254,7 +254,7 @@ Signed-off-by: P Praneesh u16 msdu_len; struct hal_rx_desc *desc = (struct hal_rx_desc *)msdu->data; struct rx_attention *rx_attention; -@@ -4495,7 +4595,8 @@ static int ath11k_dp_rx_h_null_q_desc(st +@@ -4371,7 +4471,8 @@ static int ath11k_dp_rx_h_null_q_desc(st } ath11k_dp_rx_h_ppdu(ar, desc, status); @@ -266,7 +266,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -297,6 +297,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge +@@ -293,6 +293,16 @@ static bool ath11k_hw_ipq8074_rx_desc_ge __le32_to_cpu(desc->u.ipq8074.msdu_start.info2)); } @@ -283,7 +283,7 @@ Signed-off-by: P Praneesh static bool ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) { return !!FIELD_GET(RX_MPDU_START_INFO1_MPDU_SEQ_CTRL_VALID, -@@ -584,6 +594,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge +@@ -470,6 +480,16 @@ static bool ath11k_hw_qcn9074_rx_desc_ge __le32_to_cpu(desc->u.qcn9074.msdu_start.info2)); } @@ -300,7 +300,7 @@ Signed-off-by: P Praneesh static bool ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld(struct hal_rx_desc *desc) { return !!FIELD_GET(RX_MPDU_START_INFO11_MPDU_SEQ_CTRL_VALID, -@@ -1194,6 +1214,7 @@ const struct ath11k_hw_ops ipq6018_ops = +@@ -1025,6 +1045,7 @@ const struct ath11k_hw_ops qca6390_ops = .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, @@ -308,15 +308,7 @@ Signed-off-by: P Praneesh .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, -@@ -1242,6 +1263,7 @@ const struct ath11k_hw_ops qca6390_ops = - .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, - .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, - .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, -+ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid, - .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, - .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, - .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, -@@ -1379,6 +1401,7 @@ const struct ath11k_hw_ops wcn6750_ops = +@@ -1189,6 +1210,7 @@ const struct ath11k_hw_ops ipq5018_ops = .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, @@ -326,7 +318,7 @@ Signed-off-by: P Praneesh .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -269,6 +269,7 @@ struct ath11k_hw_ops { +@@ -260,6 +260,7 @@ struct ath11k_hw_ops { u32 (*rx_desc_get_encrypt_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_decap_type)(struct hal_rx_desc *desc); u8 (*rx_desc_get_mesh_ctl)(struct hal_rx_desc *desc); diff --git a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch index f514843b447f1a..1c9a6ebd1d41ac 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch @@ -454,7 +454,7 @@ Signed-off-by: P Praneesh ieee80211_free_txskb(ar->hw, skb); return; } -@@ -7623,7 +7633,7 @@ err_vdev_del: +@@ -7622,7 +7632,7 @@ err_vdev_del: idr_for_each(&ar->txmgmt_idr, ath11k_mac_vif_txmgmt_idr_remove, vif); @@ -465,7 +465,7 @@ Signed-off-by: P Praneesh ath11k_mac_vif_unref, vif); --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -833,10 +833,22 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -832,10 +832,22 @@ static ssize_t ath11k_debugfs_dump_soc_d len += scnprintf(buf + len, size - len, "ring%d: %u\n", i, soc_stats->tx_err.desc_na[i]); @@ -490,15 +490,6 @@ Signed-off-by: P Praneesh if (len > size) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -105,7 +105,7 @@ static struct ath11k_hw_params ath11k_hw - .supports_regdb = false, - .fix_l1ss = true, - .credit_flow = false, -- .max_tx_ring = DP_TCL_NUM_RING_MAX, -+ .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, - .hal_params = &ath11k_hw_hal_params_ipq8074, - .supports_dynamic_smps_6ghz = false, - .alloc_cacheable_memory = true, @@ -188,7 +188,6 @@ static struct ath11k_hw_params ath11k_hw .supports_regdb = false, .fix_l1ss = true, @@ -513,7 +504,6 @@ Signed-off-by: P Praneesh .support_fw_mac_sequence = false, + /* In addition to TCL ring use TCL_CMD ring also for tx */ + .max_tx_ring = DP_TCL_NUM_RING_MAX + 1, - .num_vdevs_peers = ath11k_vdevs_peers, }, { .name = "qca6390 hw2.0", diff --git a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch index 1fa2d32aaa33cb..b31809f689548b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch @@ -1014,7 +1014,7 @@ Signed-off-by: Vasanthakumar Thiagarajan +#endif --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1529,15 +1529,29 @@ struct htt_ppdu_stats_usr_cmn_array { +@@ -1453,15 +1453,29 @@ struct htt_ppdu_stats_usr_cmn_array { struct htt_tx_ppdu_stats_info tx_ppdu_info[]; } __packed; @@ -1046,7 +1046,7 @@ Signed-off-by: Vasanthakumar Thiagarajan #define HTT_PPDU_STATS_MAX_USERS 37 --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1444,6 +1444,71 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1409,6 +1409,71 @@ static int ath11k_htt_tlv_ppdu_stats_par return 0; } @@ -1118,7 +1118,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static void ath11k_update_per_peer_tx_stats(struct ath11k *ar, struct htt_ppdu_stats *ppdu_stats, u8 user) -@@ -1467,6 +1532,9 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1432,6 +1497,9 @@ ath11k_update_per_peer_tx_stats(struct a if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE))) return; @@ -1128,7 +1128,7 @@ Signed-off-by: Vasanthakumar Thiagarajan if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) is_ampdu = HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags); -@@ -1600,6 +1668,8 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1565,6 +1633,8 @@ ath11k_update_per_peer_tx_stats(struct a ath11k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); } @@ -1137,7 +1137,7 @@ Signed-off-by: Vasanthakumar Thiagarajan spin_unlock_bh(&ab->base_lock); rcu_read_unlock(); } -@@ -1720,6 +1790,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k +@@ -1685,6 +1755,69 @@ int ath11k_dp_htt_tlv_iter(struct ath11k return 0; } @@ -1207,7 +1207,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, struct sk_buff *skb) { -@@ -1738,6 +1871,15 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1703,6 +1836,15 @@ static int ath11k_htt_pull_ppdu_stats(st pdev_id = FIELD_GET(HTT_T2H_PPDU_STATS_INFO_PDEV_ID, msg->info); ppdu_id = msg->ppdu_id; @@ -1223,7 +1223,7 @@ Signed-off-by: Vasanthakumar Thiagarajan rcu_read_lock(); ar = ath11k_mac_get_ar_by_pdev_id(ab, pdev_id); if (!ar) { -@@ -1805,6 +1947,12 @@ static int ath11k_htt_pull_ppdu_stats(st +@@ -1770,6 +1912,12 @@ static int ath11k_htt_pull_ppdu_stats(st } } @@ -1257,7 +1257,7 @@ Signed-off-by: Vasanthakumar Thiagarajan mutex_unlock(&ar->conf_mutex); } -@@ -9715,6 +9727,28 @@ err_fallback: +@@ -9714,6 +9726,28 @@ err_fallback: return 0; } @@ -1286,7 +1286,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static const struct ieee80211_ops ath11k_ops = { .tx = ath11k_mac_op_tx, .wake_tx_queue = ieee80211_handle_wake_tx_queue, -@@ -9772,6 +9806,9 @@ static const struct ieee80211_ops ath11k +@@ -9771,6 +9805,9 @@ static const struct ieee80211_ops ath11k .set_sar_specs = ath11k_mac_op_set_bios_sar_specs, .remain_on_channel = ath11k_mac_op_remain_on_channel, .cancel_remain_on_channel = ath11k_mac_op_cancel_remain_on_channel, @@ -1296,7 +1296,7 @@ Signed-off-by: Vasanthakumar Thiagarajan }; static void ath11k_mac_update_ch_list(struct ath11k *ar, -@@ -10232,6 +10269,8 @@ static int __ath11k_mac_register(struct +@@ -10231,6 +10268,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VLAN_OFFLOAD); diff --git a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch index 1d7cf5b0e7c585..cb4fba0a2ffdcd 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch @@ -23,7 +23,7 @@ Signed-off-by: Rameshkumar Sundaram --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7644,8 +7644,10 @@ err_vdev_del: +@@ -7643,8 +7643,10 @@ err_vdev_del: kfree(arvif->vlan_keyid_map); ath11k_peer_cleanup(ar, arvif->vdev_id); diff --git a/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch index 798ec1973c3fe3..d733219b38aa7f 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/319-ath11k-fix-double-free-of-peer-rx_tid-during-reo-cmd.patch @@ -30,7 +30,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/drivers/net/wireless/ath/ath11k/hw.c +++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -1573,6 +1573,7 @@ const struct ath11k_hw_ring_mask ath11k_ +@@ -1332,6 +1332,7 @@ const struct ath11k_hw_ring_mask ath11k_ ATH11K_RX_WBM_REL_RING_MASK_0, }, .reo_status = { diff --git a/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch index 662e11697f4d9c..361c9064148acd 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch @@ -91,7 +91,7 @@ Signed-off-by: Rameshkumar Sundaram + struct work_struct wmi_ast_work; + struct list_head wmi_ast_list; - bool stats_disable; + bool stats_disable; /* must be last */ --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c diff --git a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index 67781ea0ad2b6b..3c3e436c75ce41 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -58,7 +58,7 @@ Signed-off-by: Venkateswara Naralasetty tcl_cmd.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10155,6 +10155,8 @@ static int __ath11k_mac_register(struct +@@ -10154,6 +10154,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, USES_RSS); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch index 90adde1baf67db..752218e9b8ec26 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-Fix-updating-rx-stats-with-monitor-vif-enable.patch @@ -16,7 +16,7 @@ Signed-off-by: Anilkumar Kolli --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6124,12 +6124,23 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -5953,12 +5953,23 @@ int ath11k_dp_rx_process_mon_status(stru pmon->mon_ppdu_status = DP_PPDU_STATUS_START; } @@ -43,7 +43,7 @@ Signed-off-by: Anilkumar Kolli rcu_read_lock(); spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find_by_id(ab, ppdu_info->peer_id); -@@ -6453,6 +6464,13 @@ static int ath11k_dp_full_mon_process_rx +@@ -6282,6 +6293,13 @@ static int ath11k_dp_full_mon_process_rx spin_lock_bh(&pmon->mon_lock); @@ -57,7 +57,7 @@ Signed-off-by: Anilkumar Kolli sw_mon_entries = &pmon->sw_mon_entries; rx_mon_stats = &pmon->rx_mon_stats; -@@ -6492,7 +6510,6 @@ static int ath11k_dp_full_mon_process_rx +@@ -6321,7 +6339,6 @@ static int ath11k_dp_full_mon_process_rx } rx_mon_stats->dest_ppdu_done++; @@ -65,7 +65,7 @@ Signed-off-by: Anilkumar Kolli pmon->buf_state = DP_MON_STATUS_LAG; pmon->mon_status_paddr = sw_mon_entries->mon_status_paddr; pmon->hold_mon_dst_ring = true; -@@ -6523,16 +6540,10 @@ reap_status_ring: +@@ -6352,16 +6369,10 @@ reap_status_ring: int ath11k_dp_rx_process_mon_rings(struct ath11k_base *ab, int mac_id, struct napi_struct *napi, int budget) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch index 8950e960467e67..0adf26c808aec6 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/336-ath11k-skip-status-ring-entry-processing.patch @@ -35,7 +35,7 @@ Signed-off-by: Venkateswara Naralasetty --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3782,6 +3782,46 @@ ath11k_dp_rx_mon_update_status_buf_state +@@ -3660,6 +3660,46 @@ ath11k_dp_rx_mon_update_status_buf_state } } @@ -82,7 +82,7 @@ Signed-off-by: Venkateswara Naralasetty static int ath11k_dp_rx_reap_mon_status_ring(struct ath11k_base *ab, int mac_id, int *budget, struct sk_buff_head *skb_list) { -@@ -3795,6 +3835,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3673,6 +3713,7 @@ static int ath11k_dp_rx_reap_mon_status_ struct sk_buff *skb; struct ath11k_skb_rxcb *rxcb; struct hal_tlv_hdr *tlv; @@ -90,7 +90,7 @@ Signed-off-by: Venkateswara Naralasetty u32 cookie; int buf_id, srng_id; dma_addr_t paddr; -@@ -3814,8 +3855,7 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3692,8 +3733,7 @@ static int ath11k_dp_rx_reap_mon_status_ ath11k_hal_srng_access_begin(ab, srng); while (*budget) { *budget -= 1; @@ -100,7 +100,7 @@ Signed-off-by: Venkateswara Naralasetty if (!rx_mon_status_desc) { pmon->buf_state = DP_MON_STATUS_REPLINISH; break; -@@ -3846,18 +3886,43 @@ static int ath11k_dp_rx_reap_mon_status_ +@@ -3724,18 +3764,43 @@ static int ath11k_dp_rx_reap_mon_status_ tlv = (struct hal_tlv_hdr *)skb->data; if (FIELD_GET(HAL_TLV_HDR_TAG, tlv->tl) != HAL_RX_STATUS_BUFFER_DONE) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch index 8e23cd99e747c6..f574597dceb969 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/356-ath11k-invalid-desc-sanity-check.patch @@ -46,7 +46,7 @@ Signed-off-by: Nagarajan Maran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -431,8 +431,8 @@ int ath11k_dp_rxbufs_replenish(struct at +@@ -396,8 +396,8 @@ int ath11k_dp_rxbufs_replenish(struct at goto fail_free_skb; spin_lock_bh(&rx_ring->idr_lock); @@ -57,7 +57,7 @@ Signed-off-by: Nagarajan Maran spin_unlock_bh(&rx_ring->idr_lock); if (buf_id <= 0) goto fail_dma_unmap; -@@ -3263,6 +3263,16 @@ try_again: +@@ -3141,6 +3141,16 @@ try_again: while (likely(desc = (struct hal_reo_dest_ring *)ath11k_hal_srng_dst_get_next_entry(ab, srng))) { @@ -74,7 +74,7 @@ Signed-off-by: Nagarajan Maran cookie = FIELD_GET(BUFFER_ADDR_INFO1_SW_COOKIE, desc->buf_addr_info.info1); buf_id = FIELD_GET(DP_RXDMA_BUF_COOKIE_BUF_ID, -@@ -3293,8 +3303,6 @@ try_again: +@@ -3171,8 +3181,6 @@ try_again: num_buffs_reaped[mac_id]++; diff --git a/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch b/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch deleted file mode 100644 index fe231db61355ea..00000000000000 --- a/package/kernel/mac80211/patches/nss/ath11k/359-ath11k-fix-tkip-encryption-traffic-failure.patch +++ /dev/null @@ -1,25 +0,0 @@ -From e4f2f898dcbe2bf82b9e8fb4f3d306c98d82e5bd Mon Sep 17 00:00:00 2001 -From: Ramya Gnanasekar -Date: Wed, 7 Dec 2022 17:29:50 +0530 -Subject: [PATCH] ath11k: fix tkip encryption traffic failure - -Fast rx is not assigned in case of TKIP cipher and hence -packets are dropped in fast path. - -Handle the rx decap for TKIP so frames will be handled in -normal rx path. - -Signed-off-by: Ramya Gnanasekar - ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -2671,7 +2671,8 @@ static void ath11k_dp_rx_h_undecap(struc - ehdr = (struct ethhdr *)msdu->data; - - /* mac80211 allows fast path only for authorized STA */ -- if (ehdr->h_proto == cpu_to_be16(ETH_P_PAE)) { -+ if (ehdr->h_proto == cpu_to_be16(ETH_P_PAE) || -+ enctype == HAL_ENCRYPT_TYPE_TKIP_MIC) { - ATH11K_SKB_RXCB(msdu)->is_eapol = true; - ath11k_dp_rx_h_undecap_eth(ar, msdu, first_hdr, - enctype, status); diff --git a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch index fd4f0938cdb83b..f909ba4a673f69 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/371-ath11k-Fix-ppdu_id-from-firmware-PPDU-stats.patch @@ -14,7 +14,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -1501,6 +1501,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { +@@ -1425,6 +1425,7 @@ struct htt_ppdu_stats_usr_cmpltn_cmn { #define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM GENMASK(31, 25) #define HTT_PPDU_STATS_NON_QOS_TID 16 @@ -24,7 +24,7 @@ Signed-off-by: Ramya Gnanasekar u32 ppdu_id; --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1323,7 +1323,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1288,7 +1288,7 @@ static int ath11k_htt_tlv_ppdu_stats_par struct htt_ppdu_user_stats *user_stats = NULL; int cur_user; u16 peer_id; @@ -33,7 +33,7 @@ Signed-off-by: Ramya Gnanasekar ppdu_info = data; -@@ -1404,6 +1404,8 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1369,6 +1369,8 @@ static int ath11k_htt_tlv_ppdu_stats_par return -EINVAL; } @@ -42,7 +42,7 @@ Signed-off-by: Ramya Gnanasekar peer_id = ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->sw_peer_id; cur_user = ath11k_get_ppdu_user_index(&ppdu_info->ppdu_stats, -@@ -1415,6 +1417,7 @@ static int ath11k_htt_tlv_ppdu_stats_par +@@ -1380,6 +1382,7 @@ static int ath11k_htt_tlv_ppdu_stats_par user_stats->is_valid_peer_id = true; memcpy((void *)&user_stats->ack_ba, ptr, sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); diff --git a/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch index fd78090aebc0f0..8adb5448a1564c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/373-ath11k-Add-retry-mechanism-for-update_rx_qu.patch @@ -53,7 +53,7 @@ Signed-off-by: Tamizh Chelvam Raja }; --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -849,6 +849,18 @@ static ssize_t ath11k_debugfs_dump_soc_d +@@ -848,6 +848,18 @@ static ssize_t ath11k_debugfs_dump_soc_d "\nNSS Transmit Failures: %d\n", atomic_read(&soc_stats->tx_err.nss_tx_fail)); @@ -110,7 +110,7 @@ Signed-off-by: Tamizh Chelvam Raja struct dp_reo_cmd { struct list_head list; struct dp_rx_tid data; -@@ -296,6 +305,12 @@ struct ath11k_dp { +@@ -295,6 +304,12 @@ struct ath11k_dp { * - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; @@ -135,7 +135,7 @@ Signed-off-by: Tamizh Chelvam Raja static inline u8 *ath11k_dp_rx_h_80211_hdr(struct ath11k_base *ab, struct hal_rx_desc *desc) { -@@ -707,13 +710,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( +@@ -672,13 +675,50 @@ static int ath11k_dp_rx_pdev_srng_alloc( return 0; } @@ -186,7 +186,7 @@ Signed-off-by: Tamizh Chelvam Raja spin_lock_bh(&dp->reo_cmd_lock); list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { list_del(&cmd->list); -@@ -759,14 +799,18 @@ static void ath11k_dp_reo_cmd_free(struc +@@ -724,14 +764,18 @@ static void ath11k_dp_reo_cmd_free(struc } } @@ -207,7 +207,7 @@ Signed-off-by: Tamizh Chelvam Raja desc_sz = ath11k_hal_reo_qdesc_size(0, HAL_DESC_REO_NON_QOS_TID); while (tot_desc_sz > desc_sz) { -@@ -777,11 +821,17 @@ static void ath11k_dp_reo_cache_flush(st +@@ -742,11 +786,17 @@ static void ath11k_dp_reo_cache_flush(st HAL_REO_CMD_FLUSH_CACHE, &cmd, NULL); if (ret) @@ -228,7 +228,7 @@ Signed-off-by: Tamizh Chelvam Raja memset(&cmd, 0, sizeof(cmd)); cmd.addr_lo = lower_32_bits(rx_tid->paddr); cmd.addr_hi = upper_32_bits(rx_tid->paddr); -@@ -789,24 +839,21 @@ static void ath11k_dp_reo_cache_flush(st +@@ -754,24 +804,21 @@ static void ath11k_dp_reo_cache_flush(st ret = ath11k_dp_tx_send_reo_cmd(ab, rx_tid, HAL_REO_CMD_FLUSH_CACHE, &cmd, ath11k_dp_reo_cmd_free); @@ -259,7 +259,7 @@ Signed-off-by: Tamizh Chelvam Raja goto free_desc; } else if (status != HAL_REO_CMD_SUCCESS) { /* Shouldn't happen! Cleanup in case of other failure? */ -@@ -815,6 +862,29 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -780,6 +827,29 @@ static void ath11k_dp_rx_tid_del_func(st return; } @@ -289,7 +289,7 @@ Signed-off-by: Tamizh Chelvam Raja elem = kzalloc(sizeof(*elem), GFP_ATOMIC); if (!elem) goto free_desc; -@@ -832,13 +902,20 @@ static void ath11k_dp_rx_tid_del_func(st +@@ -797,13 +867,20 @@ static void ath11k_dp_rx_tid_del_func(st if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || time_after(jiffies, elem->ts + msecs_to_jiffies(DP_REO_DESC_FREE_TIMEOUT_MS))) { @@ -314,7 +314,7 @@ Signed-off-by: Tamizh Chelvam Raja } } spin_unlock_bh(&dp->reo_cmd_lock); -@@ -854,34 +931,48 @@ free_desc: +@@ -819,34 +896,48 @@ free_desc: void ath11k_peer_rx_tid_delete(struct ath11k *ar, struct ath11k_peer *peer, u8 tid) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch b/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch deleted file mode 100644 index 020df707b6e6a4..00000000000000 --- a/package/kernel/mac80211/patches/nss/ath11k/374-ath11k-fix-VLC-streaming-not-working-for-wan-to-wlan.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c9bcb26f30a1b2e3434d851aea19200a6d757cca Mon Sep 17 00:00:00 2001 -From: Aaradhana Sahu -Date: Sat, 3 Jun 2023 18:33:54 +0530 -Subject: [PATCH] ath11k: fix VLC streaming not working for wan to wlan when - multicast to unicast flag enable - -Currently, additional two bytes after 802.11 header are seen on the air. -When per-packet encap mode is native wifi and vdev level encap mode is -eth mode, native wifi encap functionality is skipped. - -This leaves QoS header unremoved in the 802.11 header of the packet. When -sending the packet HW will also add (one more) QoS header. The additional -two bytes before LLC/SNAP header confuses the receiver and those packets -will get dropped at receiver. - -Fix this issue by removing QoS header (native wifi encap functionality) -for all the packets which will be enqueued to hw in native wifi mode. - -Signed-off-by: Aaradhana Sahu ---- - drivers/net/wireless/ath/ath11k/dp_tx.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/dp_tx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -221,7 +221,8 @@ tcl_ring_sel: - - switch (ti.encap_type) { - case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: -- if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) -+ if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && -+ skb->protocol == cpu_to_be16(ETH_P_PAE)) - is_diff_encap = true; - else - ath11k_dp_tx_encap_nwifi(skb); -@@ -247,7 +248,7 @@ tcl_ring_sel: - if ((!test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags) && - !(info->control.flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && - !info->control.hw_key && ieee80211_has_protected(hdr->frame_control)) || -- (skb->protocol == cpu_to_be16(ETH_P_PAE) && is_diff_encap)) { -+ is_diff_encap) { - /* HW requirement is that metadata should always point to a - * 8-byte aligned address. So we add alignment pad to start of - * buffer. HTT Metadata should be ensured to be multiple of 8-bytes diff --git a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch index 1f81a8ef722598..510fbc2448cee7 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/456-wifi-ath11k-Advertise-TX_QUEUE-mac-hw-flag.patch @@ -13,7 +13,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10142,6 +10142,7 @@ static int __ath11k_mac_register(struct +@@ -10141,6 +10141,7 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); diff --git a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch index 55d8063a2403ca..c23b6cb3c858b4 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch @@ -48,7 +48,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6261,7 +6261,9 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6090,7 +6090,9 @@ int ath11k_dp_rx_process_mon_status(stru if (!num_buffs_reaped) goto exit; @@ -59,7 +59,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; while ((skb = __skb_dequeue(&skb_list))) { -@@ -6279,7 +6281,6 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6108,7 +6110,6 @@ int ath11k_dp_rx_process_mon_status(stru if (log_type != ATH11K_PKTLOG_TYPE_INVALID) trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); @@ -67,7 +67,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb); -@@ -6307,6 +6308,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6136,6 +6137,7 @@ int ath11k_dp_rx_process_mon_status(stru if ((ppdu_info->peer_id == HAL_INVALID_PEERID || hal_status != HAL_RX_MON_STATUS_PPDU_DONE)) { dev_kfree_skb_any(skb); diff --git a/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch b/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch index 6399718268b0b1..88903faddfdbf6 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/458-wifi-ath11k-Add-support-to-send-the-QoS-Null-Data-fr.patch @@ -18,13 +18,13 @@ Signed-off-by: Karthikeyan Periyasamy --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -222,7 +222,8 @@ tcl_ring_sel: +@@ -221,7 +221,8 @@ tcl_ring_sel: + switch (ti.encap_type) { case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: - if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && -- skb->protocol == cpu_to_be16(ETH_P_PAE)) -+ (skb->protocol == cpu_to_be16(ETH_P_PAE) || -+ ieee80211_is_qos_nullfunc(hdr->frame_control))) +- if (arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) ++ if ((arvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && ++ ieee80211_is_qos_nullfunc(hdr->frame_control)) is_diff_encap = true; else ath11k_dp_tx_encap_nwifi(skb); diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch index b2912777fad5d0..b471fb326a5b48 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch @@ -26,7 +26,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -8222,7 +8222,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8221,7 +8221,6 @@ ath11k_mac_op_assign_vif_chanctx(struct struct ath11k_base *ab = ar->ab; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); int ret; @@ -34,7 +34,7 @@ Acked-by: Jeff Johnson mutex_lock(&ar->conf_mutex); -@@ -8245,21 +8244,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8244,21 +8243,6 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch index ea08ea8818155d..2fb2cdfd429b11 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch @@ -39,7 +39,7 @@ Acked-by: Jeff Johnson if (ret) { ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); goto free_tx_stats; -@@ -8165,8 +8165,8 @@ unlock: +@@ -8164,8 +8164,8 @@ unlock: mutex_unlock(&ar->conf_mutex); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch index a2ff42ad9d194d..4d83d0f0ed9029 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch @@ -317,7 +317,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) -@@ -9740,6 +9462,281 @@ ath11k_mac_op_config_mesh_offload_path(s +@@ -9739,6 +9461,281 @@ ath11k_mac_op_config_mesh_offload_path(s } #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch index aeaf65aaa0e73b..d1b462519c91e8 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch @@ -52,7 +52,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7934,6 +7934,30 @@ static int ath11k_mac_start_vdev_delay(s +@@ -7933,6 +7933,30 @@ static int ath11k_mac_start_vdev_delay(s return 0; } @@ -83,7 +83,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -@@ -7978,15 +8002,17 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -7977,15 +8001,17 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } @@ -109,7 +109,7 @@ Acked-by: Jeff Johnson if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &ar->monitor_flags)) { -@@ -8026,8 +8052,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8025,8 +8051,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc "chanctx unassign ptr %p vdev_id %i\n", ctx, arvif->vdev_id); @@ -118,7 +118,7 @@ Acked-by: Jeff Johnson if (ab->hw_params.vdev_start_delay && arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { spin_lock_bh(&ab->base_lock); -@@ -8051,24 +8075,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8050,24 +8074,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc return; } @@ -149,7 +149,7 @@ Acked-by: Jeff Johnson } if (ab->hw_params.vdev_start_delay && -@@ -9556,6 +9569,46 @@ exit: +@@ -9555,6 +9568,46 @@ exit: return ret; } @@ -196,7 +196,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -9591,31 +9644,15 @@ static int ath11k_mac_op_sta_state(struc +@@ -9590,31 +9643,15 @@ static int ath11k_mac_op_sta_state(struc sta->addr, arvif->vdev_id); } else if ((old_state == IEEE80211_STA_NONE && new_state == IEEE80211_STA_NOTEXIST)) { @@ -233,7 +233,7 @@ Acked-by: Jeff Johnson ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", vif->addr, arvif->vdev_id); ath11k_peer_rhash_delete(ar->ab, peer); -@@ -9626,12 +9663,6 @@ static int ath11k_mac_op_sta_state(struc +@@ -9625,12 +9662,6 @@ static int ath11k_mac_op_sta_state(struc } spin_unlock_bh(&ar->ab->base_lock); mutex_unlock(&ar->ab->tbl_mtx_lock); @@ -246,7 +246,7 @@ Acked-by: Jeff Johnson } else if (old_state == IEEE80211_STA_AUTH && new_state == IEEE80211_STA_ASSOC && (vif->type == NL80211_IFTYPE_AP || -@@ -10203,6 +10234,8 @@ static int __ath11k_mac_register(struct +@@ -10202,6 +10233,8 @@ static int __ath11k_mac_register(struct wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); diff --git a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch index 06f5e62c7b103c..2362820dc9e838 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch @@ -40,7 +40,7 @@ ath11k-$(CPTCFG_ATH11K_THERMAL) += thermal.o --- a/drivers/net/wireless/ath/ath11k/debugfs.c +++ b/drivers/net/wireless/ath/ath11k/debugfs.c -@@ -1877,7 +1877,9 @@ int ath11k_debugfs_register(struct ath11 +@@ -1875,7 +1875,9 @@ int ath11k_debugfs_register(struct ath11 snprintf(buf, 100, "../../ath11k/%pd2", ar->debug.debugfs_pdev); debugfs_create_symlink("ath11k", ar->hw->wiphy->debugfsdir, buf); @@ -120,7 +120,7 @@ &fops_peer_ps_state); --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -1758,8 +1758,10 @@ ath11k_update_per_peer_tx_stats(struct a +@@ -1723,8 +1723,10 @@ ath11k_update_per_peer_tx_stats(struct a peer_stats->mu_pos = mu_pos; peer_stats->ru_tones = arsta->txrate.he_ru_alloc; @@ -131,7 +131,7 @@ } usr_stats->rate_stats_updated = true; -@@ -2205,7 +2207,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s +@@ -2170,7 +2172,9 @@ void ath11k_dp_htt_htc_t2h_msg_handler(s ath11k_htt_pull_ppdu_stats(ab, skb); break; case HTT_T2H_MSG_TYPE_EXT_STATS_CONF: @@ -176,7 +176,7 @@ spin_unlock_bh(&ab->base_lock); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9813,7 +9813,7 @@ static const struct ieee80211_ops ath11k +@@ -9812,7 +9812,7 @@ static const struct ieee80211_ops ath11k .set_wakeup = ath11k_wow_op_set_wakeup, #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch b/package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch similarity index 90% rename from package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch rename to package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch index 7b7673953bd4fe..85562dc463a211 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch @@ -20,7 +20,7 @@ Signed-off-by: Ramya Gnanasekar for (i = 0; i < ab->hw_params.num_rxmda_per_pdev; i++) { ring_id = ar->dp.rx_mon_status_refill_ring[i].refill_buf_ring.ring_id; -@@ -1129,6 +1130,7 @@ static ssize_t ath11k_write_pktlog_filte +@@ -1228,6 +1229,7 @@ static ssize_t ath11k_write_pktlog_filte } /* Clear rx filter set for monitor mode and rx status */ @@ -30,7 +30,7 @@ Signed-off-by: Ramya Gnanasekar ret = ath11k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id, --- a/drivers/net/wireless/ath/ath11k/dp.h +++ b/drivers/net/wireless/ath/ath11k/dp.h -@@ -219,7 +219,8 @@ struct ath11k_pdev_dp { +@@ -237,7 +237,8 @@ struct ath11k_pdev_dp { #define DP_REO_CMD_RING_SIZE 256 #define DP_REO_STATUS_RING_SIZE 2048 #define DP_RXDMA_BUF_RING_SIZE 4096 @@ -40,7 +40,7 @@ Signed-off-by: Ramya Gnanasekar #define DP_RXDMA_ERR_DST_RING_SIZE 1024 #define DP_RXDMA_MON_STATUS_RING_SIZE ATH11K_DP_RXDMA_MON_STATUS_RING_SIZE #define DP_RXDMA_MONITOR_BUF_RING_SIZE ATH11K_DP_RXDMA_MONITOR_BUF_RING_SIZE -@@ -648,7 +649,7 @@ enum htt_stats_internal_ppdu_frametype { +@@ -672,7 +673,7 @@ enum htt_stats_internal_ppdu_frametype { * * |31 26|25|24|23 16|15 8|7 0| * |-----------------+----------------+----------------+---------------| @@ -49,7 +49,7 @@ Signed-off-by: Ramya Gnanasekar * |-------------------------------------------------------------------| * | rsvd2 | ring_buffer_size | * |-------------------------------------------------------------------| -@@ -662,6 +663,14 @@ enum htt_stats_internal_ppdu_frametype { +@@ -686,6 +691,14 @@ enum htt_stats_internal_ppdu_frametype { * |-------------------------------------------------------------------| * | tlv_filter_in_flags | * |-------------------------------------------------------------------| @@ -64,7 +64,7 @@ Signed-off-by: Ramya Gnanasekar * Where: * PS = pkt_swap * SS = status_swap -@@ -675,7 +684,10 @@ enum htt_stats_internal_ppdu_frametype { +@@ -699,7 +712,10 @@ enum htt_stats_internal_ppdu_frametype { * More details can be got from enum htt_srng_ring_id * b'24 - status_swap: 1 is to swap status TLV * b'25 - pkt_swap: 1 is to swap packet TLV @@ -76,7 +76,7 @@ Signed-off-by: Ramya Gnanasekar * dword1 - b'0:16 - ring_buffer_size: size of buffers referenced by rx ring, * in byte units. * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -@@ -704,6 +716,42 @@ enum htt_stats_internal_ppdu_frametype { +@@ -728,6 +744,42 @@ enum htt_stats_internal_ppdu_frametype { * dword6 - b'0:31 - tlv_filter_in_flags: * Filter in Attention/MPDU/PPDU/Header/User tlvs * Refer to CFG_TLV_FILTER_IN_FLAG defs @@ -119,7 +119,7 @@ Signed-off-by: Ramya Gnanasekar */ #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) -@@ -711,8 +759,16 @@ enum htt_stats_internal_ppdu_frametype { +@@ -735,8 +787,16 @@ enum htt_stats_internal_ppdu_frametype { #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID GENMASK(23, 16) #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS BIT(24) #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS BIT(25) @@ -136,7 +136,7 @@ Signed-off-by: Ramya Gnanasekar enum htt_rx_filter_tlv_flags { HTT_RX_FILTER_TLV_FLAGS_MPDU_START = BIT(0), -@@ -1016,6 +1072,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { +@@ -1040,6 +1100,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ HTT_RX_FILTER_TLV_FLAGS_ATTENTION) @@ -151,7 +151,7 @@ Signed-off-by: Ramya Gnanasekar struct htt_rx_ring_selection_cfg_cmd { u32 info0; u32 info1; -@@ -1024,6 +1088,10 @@ struct htt_rx_ring_selection_cfg_cmd { +@@ -1048,6 +1116,10 @@ struct htt_rx_ring_selection_cfg_cmd { u32 pkt_type_en_flags2; u32 pkt_type_en_flags3; u32 rx_filter_tlv; @@ -162,7 +162,7 @@ Signed-off-by: Ramya Gnanasekar } __packed; struct htt_rx_ring_tlv_filter { -@@ -1032,6 +1100,14 @@ struct htt_rx_ring_tlv_filter { +@@ -1056,6 +1128,14 @@ struct htt_rx_ring_tlv_filter { u32 pkt_filter_flags1; /* MGMT */ u32 pkt_filter_flags2; /* CTRL */ u32 pkt_filter_flags3; /* DATA */ @@ -179,7 +179,7 @@ Signed-off-by: Ramya Gnanasekar #define HTT_RX_FULL_MON_MODE_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -70,6 +70,12 @@ static inline bool ath11k_dp_rx_h_mpdu_s +@@ -73,6 +73,12 @@ static inline bool ath11k_dp_rx_h_mpdu_s return ab->hw_params.hw_ops->rx_desc_get_mpdu_fc_valid(desc); } @@ -192,7 +192,7 @@ Signed-off-by: Ramya Gnanasekar static inline bool ath11k_dp_rx_h_mpdu_start_more_frags(struct ath11k_base *ab, struct sk_buff *skb) { -@@ -306,6 +312,35 @@ static u8 *ath11k_dp_rxdesc_mpdu_start_a +@@ -309,6 +315,35 @@ static u8 *ath11k_dp_rxdesc_mpdu_start_a return ab->hw_params.hw_ops->rx_desc_mpdu_start_addr2(desc); } @@ -228,7 +228,7 @@ Signed-off-by: Ramya Gnanasekar static void ath11k_dp_service_mon_ring(struct timer_list *t) { struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer); -@@ -2134,6 +2169,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a +@@ -2387,6 +2422,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a return 0; } @@ -278,7 +278,7 @@ Signed-off-by: Ramya Gnanasekar static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, struct sk_buff *msdu, u8 *first_hdr, -@@ -2147,7 +2225,8 @@ static void ath11k_dp_rx_h_undecap_nwifi +@@ -2400,7 +2478,8 @@ static void ath11k_dp_rx_h_undecap_nwifi u8 da[ETH_ALEN]; u8 sa[ETH_ALEN]; u16 qos_ctl = 0; @@ -288,7 +288,7 @@ Signed-off-by: Ramya Gnanasekar /* copy SA & DA and pull decapped header */ hdr = (struct ieee80211_hdr *)msdu->data; -@@ -2156,7 +2235,7 @@ static void ath11k_dp_rx_h_undecap_nwifi +@@ -2409,7 +2488,7 @@ static void ath11k_dp_rx_h_undecap_nwifi ether_addr_copy(sa, ieee80211_get_SA(hdr)); skb_pull(msdu, ieee80211_hdrlen(hdr->frame_control)); @@ -297,7 +297,7 @@ Signed-off-by: Ramya Gnanasekar /* original 802.11 header is valid for the first msdu * hence we can reuse the same header */ -@@ -2186,16 +2265,23 @@ static void ath11k_dp_rx_h_undecap_nwifi +@@ -2439,16 +2518,23 @@ static void ath11k_dp_rx_h_undecap_nwifi /* copy decap header before overwriting for reuse below */ memcpy(decap_hdr, (uint8_t *)hdr, hdr_len); @@ -326,7 +326,7 @@ Signed-off-by: Ramya Gnanasekar memcpy(skb_push(msdu, IEEE80211_QOS_CTL_LEN), &qos_ctl, IEEE80211_QOS_CTL_LEN); -@@ -2311,6 +2397,20 @@ static void ath11k_dp_rx_h_undecap_eth(s +@@ -2564,6 +2650,20 @@ static void ath11k_dp_rx_h_undecap_eth(s u8 da[ETH_ALEN]; u8 sa[ETH_ALEN]; void *rfc1042; @@ -347,7 +347,7 @@ Signed-off-by: Ramya Gnanasekar rfc1042 = ath11k_dp_rx_h_find_rfc1042(ar, msdu, enctype); if (WARN_ON_ONCE(!rfc1042)) -@@ -2339,6 +2439,7 @@ static void ath11k_dp_rx_h_undecap_eth(s +@@ -2592,6 +2692,7 @@ static void ath11k_dp_rx_h_undecap_eth(s memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); @@ -355,7 +355,7 @@ Signed-off-by: Ramya Gnanasekar /* original 802.11 header has a different DA and in * case of 4addr it may also have different SA */ -@@ -2357,6 +2458,7 @@ static void ath11k_dp_rx_h_undecap_snap( +@@ -2610,6 +2711,7 @@ static void ath11k_dp_rx_h_undecap_snap( size_t hdr_len; u8 l3_pad_bytes; struct hal_rx_desc *rx_desc; @@ -363,7 +363,7 @@ Signed-off-by: Ramya Gnanasekar /* Delivered decapped frame: * [amsdu header] <-- replaced with 802.11 hdr -@@ -2370,6 +2472,11 @@ static void ath11k_dp_rx_h_undecap_snap( +@@ -2623,6 +2725,11 @@ static void ath11k_dp_rx_h_undecap_snap( skb_put(msdu, l3_pad_bytes); skb_pull(msdu, sizeof(struct ath11k_dp_amsdu_subframe_hdr) + l3_pad_bytes); @@ -375,7 +375,7 @@ Signed-off-by: Ramya Gnanasekar hdr = (struct ieee80211_hdr *)first_hdr; hdr_len = ieee80211_hdrlen(hdr->frame_control); -@@ -2766,6 +2873,20 @@ static int ath11k_dp_rx_process_msdu(str +@@ -3097,6 +3204,20 @@ static int ath11k_dp_rx_process_msdu(str goto free_out; } @@ -396,7 +396,7 @@ Signed-off-by: Ramya Gnanasekar rxcb = ATH11K_SKB_RXCB(msdu); rxcb->rx_desc = rx_desc; msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ab, rx_desc); -@@ -2778,8 +2899,9 @@ static int ath11k_dp_rx_process_msdu(str +@@ -3109,8 +3230,9 @@ static int ath11k_dp_rx_process_msdu(str hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); ret = -EINVAL; ath11k_warn(ab, "invalid msdu len %u\n", msdu_len); @@ -408,7 +408,7 @@ Signed-off-by: Ramya Gnanasekar ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", rx_desc, sizeof(struct hal_rx_desc)); goto free_out; -@@ -3649,6 +3771,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi +@@ -4069,6 +4191,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); hdr_len = ieee80211_hdrlen(hdr->frame_control); @@ -416,7 +416,7 @@ Signed-off-by: Ramya Gnanasekar head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN; tail_len = IEEE80211_CCMP_MIC_LEN + IEEE80211_TKIP_ICV_LEN + FCS_LEN; -@@ -3929,8 +4052,8 @@ static void ath11k_dp_rx_h_sort_frags(st +@@ -4349,8 +4472,8 @@ static void ath11k_dp_rx_h_sort_frags(st static u64 ath11k_dp_rx_h_get_pn(struct ath11k *ar, struct sk_buff *skb) { @@ -426,7 +426,7 @@ Signed-off-by: Ramya Gnanasekar u8 *ehdr; u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; -@@ -4160,8 +4283,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 +@@ -4580,8 +4703,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 if ((msdu_len + hal_rx_desc_sz) > DP_RX_BUFFER_SIZE) { hdr_status = ath11k_dp_rx_h_80211_hdr(ar->ab, rx_desc); ath11k_warn(ar->ab, "invalid msdu leng %u", msdu_len); @@ -438,7 +438,7 @@ Signed-off-by: Ramya Gnanasekar ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", rx_desc, sizeof(struct hal_rx_desc)); dev_kfree_skb_any(msdu); -@@ -4784,6 +4908,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 +@@ -5206,6 +5330,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 ath11k_dp_rxdma_pdev_buf_free(ar); } @@ -486,7 +486,7 @@ Signed-off-by: Ramya Gnanasekar int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) { struct ath11k *ar = ab->pdevs[mac_id].ar; -@@ -4877,6 +5042,12 @@ config_refill_ring: +@@ -5299,6 +5464,12 @@ config_refill_ring: } } @@ -501,7 +501,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -1183,6 +1183,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str +@@ -1264,6 +1264,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS, !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); @@ -510,7 +510,7 @@ Signed-off-by: Ramya Gnanasekar cmd->info1 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE, rx_buf_size); -@@ -1192,6 +1194,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str +@@ -1273,6 +1275,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str cmd->pkt_type_en_flags3 = tlv_filter->pkt_filter_flags3; cmd->rx_filter_tlv = tlv_filter->rx_filter; @@ -537,7 +537,7 @@ Signed-off-by: Ramya Gnanasekar ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); if (ret) goto err_free; -@@ -1270,6 +1292,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c +@@ -1351,6 +1373,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c } ring_id = dp->rxdma_mon_buf_ring.refill_buf_ring.ring_id; @@ -559,7 +559,7 @@ Signed-off-by: Ramya Gnanasekar } static bool ath11k_hw_ipq8074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) -@@ -395,26 +399,132 @@ static void ath11k_hw_ipq8074_rx_desc_se +@@ -405,26 +409,132 @@ static void ath11k_hw_ipq8074_rx_desc_se desc->u.ipq8074.msdu_start.info1 = __cpu_to_le32(info); } @@ -698,7 +698,7 @@ Signed-off-by: Ramya Gnanasekar } static bool ath11k_hw_qcn9074_rx_desc_get_first_msdu(struct hal_rx_desc *desc) -@@ -437,7 +547,11 @@ static u8 ath11k_hw_qcn9074_rx_desc_get_ +@@ -447,7 +557,11 @@ static u8 ath11k_hw_qcn9074_rx_desc_get_ static u8 *ath11k_hw_qcn9074_rx_desc_get_hdr_status(struct hal_rx_desc *desc) { @@ -710,7 +710,7 @@ Signed-off-by: Ramya Gnanasekar } static bool ath11k_hw_qcn9074_rx_desc_encrypt_valid(struct hal_rx_desc *desc) -@@ -614,7 +728,11 @@ static u8 ath11k_hw_wcn6855_rx_desc_get_ +@@ -634,7 +748,11 @@ static u8 ath11k_hw_wcn6855_rx_desc_get_ static u8 *ath11k_hw_wcn6855_rx_desc_get_hdr_status(struct hal_rx_desc *desc) { @@ -722,11 +722,10 @@ Signed-off-by: Ramya Gnanasekar } static bool ath11k_hw_wcn6855_rx_desc_encrypt_valid(struct hal_rx_desc *desc) -@@ -929,6 +1047,98 @@ static u32 ath11k_hw_qcn9074_rx_desc_get - return FIELD_GET(HAL_RX_MPDU_INFO_INFO1_MPDU_LEN, - __le32_to_cpu(mpdu_info->u.qcn9074.info1)); +@@ -784,6 +902,96 @@ static u8 *ath11k_hw_wcn6855_rx_desc_mpd + { + return desc->u.wcn6855.mpdu_start.addr2; } -+ +#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M +static void ath11k_hw_qcn9074_rx_desc_get_offset(struct htt_rx_ring_tlv_filter *tlv_filter) +{ @@ -817,11 +816,10 @@ Signed-off-by: Ramya Gnanasekar + crypto_hdr[6] = HAL_RX_MPDU_INFO_PN_GET_BYTE1(desc->u.qcn9074.mpdu_start.pn[1]); + crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.qcn9074.mpdu_start.pn[1]); +} -+ - const struct ath11k_hw_ops ipq8074_ops = { - .get_hw_mac_from_pdev_id = ath11k_hw_ipq8074_mac_from_pdev_id, - .wmi_init_config = ath11k_init_wmi_config_ipq8074, -@@ -1009,6 +1219,13 @@ const struct ath11k_hw_ops ipq6018_ops = + + static void ath11k_hw_wcn6855_reo_setup(struct ath11k_base *ab) + { +@@ -988,6 +1196,13 @@ const struct ath11k_hw_ops ipq8074_ops = .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, @@ -834,8 +832,8 @@ Signed-off-by: Ramya Gnanasekar + .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, }; - const struct ath11k_hw_ops qca6390_ops = { -@@ -1050,6 +1267,13 @@ const struct ath11k_hw_ops qca6390_ops = + const struct ath11k_hw_ops ipq6018_ops = { +@@ -1029,6 +1244,13 @@ const struct ath11k_hw_ops ipq6018_ops = .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, @@ -848,9 +846,9 @@ Signed-off-by: Ramya Gnanasekar + .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, }; - const struct ath11k_hw_ops qcn9074_ops = { -@@ -1132,6 +1356,13 @@ const struct ath11k_hw_ops wcn6855_ops = - .rx_desc_mpdu_start_addr2 = ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2, + const struct ath11k_hw_ops qca6390_ops = { +@@ -1071,6 +1293,13 @@ const struct ath11k_hw_ops qca6390_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, +#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M @@ -862,18 +860,15 @@ Signed-off-by: Ramya Gnanasekar + .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, }; - const struct ath11k_hw_ops wcn6750_ops = { -@@ -1180,6 +1411,8 @@ const struct ath11k_hw_ops ipq5018_ops = - .wmi_init_config = ath11k_init_wmi_config_ipq8074, - .mac_id_to_pdev_id = ath11k_hw_mac_id_to_pdev_id_ipq8074, - .mac_id_to_srng_id = ath11k_hw_mac_id_to_srng_id_ipq8074, + const struct ath11k_hw_ops qcn9074_ops = { +@@ -1108,10 +1337,17 @@ const struct ath11k_hw_ops qcn9074_ops = + .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, + .reo_setup = ath11k_hw_ipq8074_reo_setup, + .mpdu_info_get_peerid = ath11k_hw_qcn9074_mpdu_info_get_peerid, +- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, +- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, + .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, - .tx_mesh_enable = ath11k_hw_qcn9074_tx_mesh_enable, - .rx_desc_get_first_msdu = ath11k_hw_qcn9074_rx_desc_get_first_msdu, - .rx_desc_get_last_msdu = ath11k_hw_qcn9074_rx_desc_get_last_msdu, -@@ -1214,6 +1447,13 @@ const struct ath11k_hw_ops ipq5018_ops = - .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, +#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M @@ -885,7 +880,7 @@ Signed-off-by: Ramya Gnanasekar + .rx_desc_get_crypto_header = ath11k_hw_qcn9074_rx_desc_get_crypto_hdr, }; - #define ATH11K_TX_RING_MASK_0 BIT(0) + const struct ath11k_hw_ops wcn6855_ops = { --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h @@ -22,6 +22,11 @@ @@ -909,21 +904,20 @@ Signed-off-by: Ramya Gnanasekar #endif /* Num of peers for Single Radio mode */ -@@ -128,6 +135,8 @@ enum ath11k_bus { - +@@ -129,6 +136,9 @@ enum ath11k_bus { struct hal_rx_desc; struct hal_tcl_data_cmd; + +struct htt_rx_ring_tlv_filter; +enum hal_encrypt_type; - ++ struct ath11k_hw_ring_mask { u8 tx[ATH11K_EXT_IRQ_GRP_NUM_MAX]; -@@ -285,7 +294,17 @@ struct ath11k_hw_ops { - bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); + u8 rx_mon_status[ATH11K_EXT_IRQ_GRP_NUM_MAX]; +@@ -287,6 +297,16 @@ struct ath11k_hw_ops { u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); u32 (*get_ring_selector)(struct sk_buff *skb); -- u32 (*rx_desc_get_hal_mpdu_len)(struct hal_rx_mpdu_info *mpdu_info); -+ u32 (*rx_desc_get_hal_mpdu_len) (struct hal_rx_mpdu_info *mpdu_info); + u32 (*rx_desc_get_hal_mpdu_len)(struct hal_rx_mpdu_info *mpdu_info); +#ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + void (*rx_desc_get_offset)(struct htt_rx_ring_tlv_filter *tlv_filter); +#endif @@ -939,7 +933,7 @@ Signed-off-by: Ramya Gnanasekar extern const struct ath11k_hw_ops ipq8074_ops; --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6343,6 +6343,7 @@ static int ath11k_mac_config_mon_status_ +@@ -6455,6 +6455,7 @@ static int ath11k_mac_config_mon_status_ tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); } @@ -1005,7 +999,7 @@ Signed-off-by: Ramya Gnanasekar #endif /* ATH11K_RX_DESC_H */ --- a/drivers/net/wireless/ath/ath11k/nss.c +++ b/drivers/net/wireless/ath/ath11k/nss.c -@@ -2230,7 +2230,7 @@ static int ath11k_nss_init(struct ath11k +@@ -4360,7 +4360,7 @@ static int ath11k_nss_init(struct ath11k /* fill rx parameters to initialize rx context */ wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch b/package/kernel/mac80211/patches/nss/ath11k/999-311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch new file mode 100644 index 00000000000000..c95960f2de04bf --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/999-311-ath11k-configure-nss-thread-priority-during-pdev_ini.patch @@ -0,0 +1,109 @@ +From 246e530a47d9adab9106fb6f2b92197cace17e53 Mon Sep 17 00:00:00 2001 +From: Seevalamuthu Mariappan +Date: Fri, 21 May 2021 14:16:22 +0530 +Subject: [PATCH] ath11k: configure nss radio priority during pdev_init + +pdev's priority value is read from dts. Get scheme_id +using pdev priority. Configure scheme_id during pdev_init. + +Signed-off-by: Seevalamuthu Mariappan +--- + drivers/net/wireless/ath/ath11k/nss.c | 20 +++++++++++++++++++- + drivers/net/wireless/ath/ath11k/nss.h | 3 +++ + 2 files changed, 22 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/ath/ath11k/nss.c ++++ b/drivers/net/wireless/ath/ath11k/nss.c +@@ -2,6 +2,7 @@ + /* + * Copyright (c) 2020 The Linux Foundation. All rights reserved. + */ ++#include + + #include "debug.h" + #include "mac.h" +@@ -4342,6 +4343,7 @@ static int ath11k_nss_init(struct ath11k + nss_tx_status_t status; + struct ath11k_dp *dp; + int i, ret; ++ struct device *dev = ab->dev; + + dp = &ab->dp; + +@@ -4361,6 +4363,8 @@ static int ath11k_nss_init(struct ath11k + /* fill rx parameters to initialize rx context */ + wim->wrip.tlv_size = ab->hw_params.hal_desc_sz; + wim->wrip.rx_buf_len = DP_RXDMA_NSS_REFILL_RING_SIZE; ++ if (of_property_read_bool(dev->of_node, "nss-radio-priority")) ++ wim->flags |= WIFILI_MULTISOC_THREAD_MAP_ENABLE; + + /* fill hal srng message */ + wim->hssm.dev_base_addr = (u32)ab->mem_pa; +@@ -4549,11 +4553,13 @@ int ath11k_nss_pdev_init(struct ath11k_b + struct nss_wifili_msg *wlmsg = NULL; + nss_wifili_msg_callback_t msg_cb; + nss_tx_status_t status; ++ struct device *dev = ab->dev; + int radio_if_num = -1; + int refill_ring_id; + int features = 0; + int dyn_if_type; +- int ret, i; ++ int ret, i, scheme_id = 0; ++ u32 nss_radio_priority; + + dyn_if_type = ath11k_nss_get_dynamic_interface_type(ab); + +@@ -4582,6 +4588,15 @@ int ath11k_nss_pdev_init(struct ath11k_b + ath11k_dbg(ab, ATH11K_DBG_NSS, "nss pdev init - id:%d init ctxt:%p ifnum:%d\n", + ar->pdev->pdev_id, ar->nss.ctx, ar->nss.if_num); + ++ if (!of_property_read_u32(dev->of_node, "nss-radio-priority", &nss_radio_priority)) { ++ scheme_id = nss_wifili_thread_scheme_alloc(ab->nss.ctx, ar->nss.if_num, nss_radio_priority); ++ if (scheme_id == WIFILI_SCHEME_ID_INVALID) { ++ ath11k_warn(ab, "received invalid scheme_id, configuring default value\n"); ++ scheme_id = 0; ++ } ++ } ++ ath11k_dbg(ab, ATH11K_DBG_NSS, "ifnum: %d scheme_id: %d nss_radio_priority: %d\n", ar->nss.if_num, scheme_id, nss_radio_priority); ++ + wlmsg = kzalloc(sizeof(struct nss_wifili_msg), GFP_ATOMIC); + if (!wlmsg) { + ret = -ENOMEM; +@@ -4594,6 +4609,7 @@ int ath11k_nss_pdev_init(struct ath11k_b + pdevmsg->lmac_id = ar->lmac_id; + pdevmsg->target_pdev_id = ar->pdev->pdev_id; + pdevmsg->num_rx_swdesc = WIFILI_RX_DESC_POOL_WEIGHT * DP_RXDMA_BUF_RING_SIZE; ++ pdevmsg->scheme_id = scheme_id; + + /* Store rxdma ring info to the message */ + refill_ring_id = ar->dp.rx_refill_buf_ring.refill_buf_ring.ring_id; +@@ -4887,6 +4903,9 @@ int ath11k_nss_pdev_deinit(struct ath11k + /* pdev deinit msg success, dealloc, deregister and return */ + ret = 0; + ++ /* reset thread scheme*/ ++ nss_wifili_thread_scheme_dealloc(ab->nss.ctx, ar->nss.if_num); ++ + nss_dynamic_interface_dealloc_node(ar->nss.if_num, dyn_if_type); + nss_unregister_wifili_radio_if(ar->nss.if_num); + free: +--- a/drivers/net/wireless/ath/ath11k/nss.h ++++ b/drivers/net/wireless/ath/ath11k/nss.h +@@ -70,6 +70,7 @@ struct hal_rx_user_status; + /* Init Flags */ + #define WIFILI_NSS_CCE_DISABLED 0x1 + #define WIFILI_ADDTL_MEM_SEG_SET 0x000000002 ++#define WIFILI_MULTISOC_THREAD_MAP_ENABLE 0x10 + + /* ATH11K NSS PEER Info */ + /* Host memory allocated for peer info storage in nss */ +@@ -122,6 +123,8 @@ enum ath11k_nss_vdev_cmd { + /* Enables the MCBC exception in NSS fw, 1 = enable */ + #define ATH11K_NSS_ENABLE_MCBC_EXC 1 + ++#define WIFILI_SCHEME_ID_INVALID -1 ++ + enum ath11k_nss_opmode { + ATH11K_NSS_OPMODE_UNKNOWN, + ATH11K_NSS_OPMODE_AP, diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch b/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch new file mode 100644 index 00000000000000..1f554ae95ccc69 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch @@ -0,0 +1,279 @@ +From 3f962ed9a4079964c48e321fd928a2719038d881 Mon Sep 17 00:00:00 2001 +From: P Praneesh +Date: Fri, 28 May 2021 23:53:57 +0530 +Subject: [PATCH] ath11k: add ampdu id in 802.11 radiotap header + +AMPDU aggregate reference number is generated by +driver internally which is same across each +subframe of an ampdu. + +For fetching AMPDU-ID, we need to concatenate +ppdu_id from mpdu_info and tlv_usr from tlv heder. +while parsing monitor TLV data with HAL_RX_MPDU_START +TLV tag, ampdu id is fetched from mpdu_info and +updated to corresponding mac80211 structure during +ath11k_update_radiotap. + +Signed-off-by: P Praneesh +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 6 ++++++ + drivers/net/wireless/ath/ath11k/hal_rx.c | 13 ++++++++++++ + drivers/net/wireless/ath/ath11k/hal_rx.h | 16 ++++++++------ + drivers/net/wireless/ath/ath11k/hw.c | 36 +++++++++++++++++++++++++------- + drivers/net/wireless/ath/ath11k/hw.h | 1 + + 5 files changed, 58 insertions(+), 14 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -5994,6 +5994,7 @@ static void ath11k_update_radiotap(struc + { + struct ieee80211_supported_band *sband; + u8 *ptr = NULL; ++ u16 ampdu_id = ppduinfo->ampdu_id[ppduinfo->userid]; + + rxs->flag |= RX_FLAG_MACTIME_START; + rxs->signal = ppduinfo->rssi_comb + ATH11K_DEFAULT_NOISE_FLOOR; +@@ -6001,6 +6002,11 @@ static void ath11k_update_radiotap(struc + if (ppduinfo->nss) + rxs->nss = ppduinfo->nss; + ++ if (ampdu_id) { ++ rxs->flag |= RX_FLAG_AMPDU_DETAILS; ++ rxs->ampdu_reference = ampdu_id; ++ } ++ + if (ppduinfo->he_mu_flags) { + rxs->flag |= RX_FLAG_RADIOTAP_HE_MU; + rxs->encoding = RX_ENC_HE; +--- a/drivers/net/wireless/ath/ath11k/hal_rx.c ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.c +@@ -873,6 +873,13 @@ static u16 ath11k_hal_rx_mpduinfo_get_pe + return ab->hw_params.hw_ops->mpdu_info_get_peerid(mpdu_info); + } + ++static ++u16 ath11k_hal_rxdesc_get_hal_mpdu_ppdu_id(struct ath11k_base *ab, ++ struct hal_rx_mpdu_info *mpdu_info) ++{ ++ return ab->hw_params.hw_ops->rx_desc_get_hal_ppdu_id(mpdu_info); ++} ++ + static enum hal_rx_mon_status + ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, + struct hal_rx_mon_ppdu_info *ppdu_info, +@@ -1546,6 +1553,12 @@ ath11k_hal_rx_parse_mon_status_tlv(struc + + ppdu_info->mpdu_len += ab->hw_params.hw_ops->rx_desc_get_hal_mpdu_len(mpdu_info); + ++ if (userid < HAL_MAX_UL_MU_USERS) { ++ ppdu_info->userid = userid; ++ ppdu_info->ampdu_id[userid] = ++ ath11k_hal_rxdesc_get_hal_mpdu_ppdu_id(ab, mpdu_info); ++ } ++ + break; + } + case HAL_RXPCU_PPDU_END_INFO: { +--- a/drivers/net/wireless/ath/ath11k/hal_rx.h ++++ b/drivers/net/wireless/ath/ath11k/hal_rx.h +@@ -221,6 +221,8 @@ struct hal_rx_mon_ppdu_info { + u32 num_users; + u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; + struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS]; ++ u8 userid; ++ u16 ampdu_id[HAL_MAX_UL_MU_USERS]; + bool ppdu_continuation; + }; + +@@ -460,20 +462,22 @@ struct hal_rx_phyrx_rssi_legacy_info { + #define HAL_RX_MPDU_INFO_INFO0_PEERID GENMASK(31, 16) + #define HAL_RX_MPDU_INFO_INFO0_PEERID_WCN6855 GENMASK(15, 0) + #define HAL_RX_MPDU_INFO_INFO1_MPDU_LEN GENMASK(13, 0) ++#define HAL_RX_MPDU_INFO_INFO0_PPDU_ID GENMASK(31, 16) + + struct hal_rx_mpdu_info_ipq8074 { +- __le32 rsvd0; + __le32 info0; +- __le32 rsvd1[11]; + __le32 info1; ++ __le32 rsvd1[11]; ++ __le32 info2; + __le32 rsvd2[9]; + } __packed; + + struct hal_rx_mpdu_info_qcn9074 { +- __le32 rsvd0[10]; ++ __le32 rsvd0[9]; + __le32 info0; +- __le32 rsvd1[2]; + __le32 info1; ++ __le32 rsvd1[2]; ++ __le32 info2; + __le32 rsvd2[9]; + } __packed; + +@@ -493,9 +497,11 @@ struct hal_rx_mpdu_info { + + #define HAL_RX_PPDU_END_DURATION GENMASK(23, 0) + struct hal_rx_ppdu_end_duration { +- __le32 rsvd0[9]; ++ __le32 rsvd0[2]; + __le32 info0; +- __le32 rsvd1[4]; ++ __le32 rsvd1[6]; ++ __le32 info1; ++ __le32 rsvd2[4]; + } __packed; + + struct hal_rx_rxpcu_classification_overview { +--- a/drivers/net/wireless/ath/ath11k/hw.h ++++ b/drivers/net/wireless/ath/ath11k/hw.h +@@ -306,6 +306,7 @@ struct ath11k_hw_ops { + void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, + u8 *crypto_hdr, + enum hal_encrypt_type enctype); ++ u16 (*rx_desc_get_hal_ppdu_id) (struct hal_rx_mpdu_info *mpdu_info); + }; + + extern const struct ath11k_hw_ops ipq8074_ops; +--- a/drivers/net/wireless/ath/ath11k/hw.c ++++ b/drivers/net/wireless/ath/ath11k/hw.c +@@ -13,6 +13,7 @@ + #include "hif.h" + #include "hal.h" + #include "hw.h" ++#include "hal_rx.h" + + /* Map from pdev index to hw mac index */ + static u8 ath11k_hw_ipq8074_mac_from_pdev_id(int pdev_idx) +@@ -717,17 +718,6 @@ static u8 *ath11k_hw_qcn9074_rx_desc_get + return &desc->u.qcn9074.msdu_payload[0]; + } + +-static bool ath11k_hw_ipq9074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) +-{ +- return __le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & +- RX_MPDU_START_INFO11_MAC_ADDR2_VALID; +-} +- +-static u8 *ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) +-{ +- return desc->u.qcn9074.mpdu_start.addr2; +-} +- + static bool ath11k_hw_wcn6855_rx_desc_get_first_msdu(struct hal_rx_desc *desc) + { + return !!FIELD_GET(RX_MSDU_END_INFO2_FIRST_MSDU_WCN6855, +@@ -1085,12 +1075,27 @@ static void ath11k_hw_ipq5018_reo_setup( + } + + static u16 ++ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id(struct hal_rx_mpdu_info *mpdu_info) ++{ ++ ++ return FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PPDU_ID, ++ __le32_to_cpu(mpdu_info->u.ipq8074.info0)); ++} ++ ++static ++u16 ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id(struct hal_rx_mpdu_info *mpdu_info) ++{ ++ ++ return FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PPDU_ID, ++ __le32_to_cpu(mpdu_info->u.qcn9074.info0)); ++} ++ ++static u16 + ath11k_hw_ipq8074_mpdu_info_get_peerid(struct hal_rx_mpdu_info *mpdu_info) + { + u16 peer_id = 0; +- + peer_id = FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PEERID, +- __le32_to_cpu(mpdu_info->u.ipq8074.info0)); ++ __le32_to_cpu(mpdu_info->u.ipq8074.info1)); + + return peer_id; + } +@@ -1196,6 +1201,7 @@ const struct ath11k_hw_ops ipq8074_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, + #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, + #endif +@@ -1219,6 +1225,7 @@ const struct ath11k_hw_ops ipq6018_ops = + .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, ++ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid, + .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, + .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, +@@ -1251,6 +1258,7 @@ const struct ath11k_hw_ops ipq6018_ops = + .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, + .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, + .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, + }; + + const struct ath11k_hw_ops qca6390_ops = { +@@ -1300,6 +1308,7 @@ const struct ath11k_hw_ops qca6390_ops = + .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, + .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, + .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, + }; + + const struct ath11k_hw_ops qcn9074_ops = { +@@ -1341,6 +1350,7 @@ const struct ath11k_hw_ops qcn9074_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id, + #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M + .rx_desc_get_offset = ath11k_hw_qcn9074_rx_desc_get_offset, + #endif +@@ -1389,6 +1399,7 @@ const struct ath11k_hw_ops wcn6855_ops = + .rx_desc_mpdu_start_addr2 = ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, + }; + + const struct ath11k_hw_ops wcn6750_ops = { +@@ -1405,6 +1416,7 @@ const struct ath11k_hw_ops wcn6750_ops = + .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, ++ .rx_desc_get_ip_valid = ath11k_hw_qcn9074_rx_desc_get_ip_valid, + .rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support, + .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, +@@ -1426,9 +1438,10 @@ const struct ath11k_hw_ops wcn6750_ops = + .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, + .reo_setup = ath11k_hw_wcn6855_reo_setup, + .mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid, +- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, +- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, ++ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, ++ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_wcn6750_get_tcl_ring_selector, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id, + }; + + /* IPQ5018 hw ops is similar to QCN9074 except for the dest ring remap */ +@@ -1468,10 +1481,11 @@ const struct ath11k_hw_ops ipq5018_ops = + .reo_setup = ath11k_hw_ipq5018_reo_setup, + .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, + .mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid, +- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, +- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, ++ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, ++ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, + .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, + .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, ++ .rx_desc_get_hal_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id, + }; + + #define ATH11K_TX_RING_MASK_0 BIT(0) diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch b/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch new file mode 100644 index 00000000000000..499f720caba8cb --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch @@ -0,0 +1,132 @@ +From 58c0d08408e58f0f496127a59465726457dc72c8 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam +Date: Mon, 15 Nov 2021 17:51:43 +0530 +Subject: [PATCH] ath11k: idr optimization + +Replace idr_find and idr_remove with idr_remove. As idr_remove +itself will do idr_find. And use dma low level api. + +Signed-off-by: Tamizh Chelvam +--- + backport-include/linux/idr.h | 4 +++ + drivers/net/wireless/ath/ath11k/dp_rx.c | 52 +++++++++++---------------------- + drivers/net/wireless/ath/ath11k/dp_tx.c | 2 +- + 3 files changed, 22 insertions(+), 36 deletions(-) + +--- a/backport-include/linux/idr.h ++++ b/backport-include/linux/idr.h +@@ -8,6 +8,10 @@ + static inline void *backport_idr_remove(struct idr *idr, int id) + { + void *item = idr_find(idr, id); ++ ++ if (!item) ++ return NULL; ++ + idr_remove(idr, id); + return item; + } +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -3336,18 +3336,16 @@ try_again: + ar = ab->pdevs[mac_id].ar; + rx_ring = &ar->dp.rx_refill_buf_ring; + spin_lock_bh(&rx_ring->idr_lock); +- msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); + if (unlikely(!msdu)) { + ath11k_warn(ab, "frame rx with invalid buf_id %d\n", + buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); + continue; + } + +- idr_remove(&rx_ring->bufs_idr, buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); +- + rxcb = ATH11K_SKB_RXCB(msdu); ++ + dma_unmap_single(ab->dev, rxcb->paddr, + msdu->len + skb_tailroom(msdu), + DMA_FROM_DEVICE); +@@ -4574,17 +4572,14 @@ ath11k_dp_process_rx_err_buf(struct ath1 + u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; + + spin_lock_bh(&rx_ring->idr_lock); +- msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); + if (!msdu) { + ath11k_warn(ar->ab, "rx err buf with invalid buf_id %d\n", + buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); + return -EINVAL; + } + +- idr_remove(&rx_ring->bufs_idr, buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); +- + rxcb = ATH11K_SKB_RXCB(msdu); + dma_unmap_single(ar->ab->dev, rxcb->paddr, + msdu->len + skb_tailroom(msdu), +@@ -5005,18 +5000,16 @@ int ath11k_dp_rx_process_wbm_err(struct + rx_ring = &ar->dp.rx_refill_buf_ring; + + spin_lock_bh(&rx_ring->idr_lock); +- msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); + if (!msdu) { + ath11k_warn(ab, "frame rx with invalid buf_id %d pdev %d\n", + buf_id, mac_id); +- spin_unlock_bh(&rx_ring->idr_lock); + continue; + } + +- idr_remove(&rx_ring->bufs_idr, buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); +- + rxcb = ATH11K_SKB_RXCB(msdu); ++ + dma_unmap_single(ab->dev, rxcb->paddr, + msdu->len + skb_tailroom(msdu), + DMA_FROM_DEVICE); +@@ -5131,16 +5124,14 @@ int ath11k_dp_process_rxdma_err(struct a + msdu_cookies[i]); + + spin_lock_bh(&rx_ring->idr_lock); +- skb = idr_find(&rx_ring->bufs_idr, buf_id); ++ skb = idr_remove(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); + if (!skb) { + ath11k_warn(ab, "rxdma error with invalid buf_id %d\n", + buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); + continue; + } + +- idr_remove(&rx_ring->bufs_idr, buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); + + rxcb = ATH11K_SKB_RXCB(skb); + dma_unmap_single(ab->dev, rxcb->paddr, +@@ -6399,16 +6390,14 @@ ath11k_dp_rx_full_mon_mpdu_pop(struct at + msdu_list.sw_cookie[i]); + + spin_lock_bh(&rx_ring->idr_lock); +- msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ spin_unlock_bh(&rx_ring->idr_lock); + if (!msdu) { + ath11k_dbg(ar->ab, ATH11K_DBG_DATA, + "full mon msdu_pop: invalid buf_id %d\n", + buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); + break; + } +- idr_remove(&rx_ring->bufs_idr, buf_id); +- spin_unlock_bh(&rx_ring->idr_lock); + + rxcb = ATH11K_SKB_RXCB(msdu); + if (!rxcb->unmapped) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch b/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch index c2cc4f2f89f43e..c5134fca93a867 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch @@ -130,25 +130,24 @@ Signed-off-by: Tamizh Chelvam srng = &ab->hal.srng_list[dp->reo_dst_ring[ring_id].ring_id]; -@@ -3383,8 +3405,16 @@ try_again: +@@ -3385,8 +3407,15 @@ try_again: ar = ab->pdevs[mac_id].ar; rx_ring = &ar->dp.rx_refill_buf_ring; + i = num_buffs_reaped[mac_id]; + spin_lock_bh(&rx_ring->idr_lock); -- msdu = idr_find(&rx_ring->bufs_idr, buf_id); +- msdu = idr_remove(&rx_ring->bufs_idr, buf_id); + if (rx_buf_id[mac_id] && i < DP_RX_MAX_IDR_BUF) { + msdu = idr_find(&rx_ring->bufs_idr, buf_id); + rx_buf_id[mac_id][i] = buf_id; + } else { + msdu = idr_remove(&rx_ring->bufs_idr, buf_id); + } -+ spin_unlock_bh(&rx_ring->idr_lock); + spin_unlock_bh(&rx_ring->idr_lock); if (unlikely(!msdu)) { ath11k_warn(ab, "frame rx with invalid buf_id %d\n", - buf_id); -@@ -3464,9 +3494,12 @@ try_again: +@@ -3464,9 +3493,12 @@ try_again: rx_ring = &ar->dp.rx_refill_buf_ring; ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i], @@ -190,7 +189,24 @@ Signed-off-by: Tamizh Chelvam srng = &ab->hal.srng_list[dp->rx_rel_ring.ring_id]; -@@ -5129,7 +5165,7 @@ int ath11k_dp_rx_process_wbm_err(struct +@@ -5077,9 +5112,15 @@ int ath11k_dp_rx_process_wbm_err(struct + + ar = ab->pdevs[mac_id].ar; + rx_ring = &ar->dp.rx_refill_buf_ring; ++ i = num_buffs_reaped[mac_id]; + + spin_lock_bh(&rx_ring->idr_lock); +- msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ if (wbm_err_buf_id[mac_id] && i < DP_RX_MAX_IDR_BUF) { ++ msdu = idr_find(&rx_ring->bufs_idr, buf_id); ++ wbm_err_buf_id[mac_id][i] = buf_id; ++ } else { ++ msdu = idr_remove(&rx_ring->bufs_idr, buf_id); ++ } + spin_unlock_bh(&rx_ring->idr_lock); + if (!msdu) { + ath11k_warn(ab, "frame rx with invalid buf_id %d pdev %d\n", +@@ -5124,7 +5165,7 @@ int ath11k_dp_rx_process_wbm_err(struct rx_ring = &ar->dp.rx_refill_buf_ring; ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i], diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch b/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch new file mode 100644 index 00000000000000..b58b13eebe1d40 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch @@ -0,0 +1,253 @@ +From efecc6e8355d02aeac7bf1a43397551440a8d0d8 Mon Sep 17 00:00:00 2001 +From: Tamizh Chelvam Raja +Date: Thu, 30 Mar 2023 22:12:56 +0530 +Subject: [PATCH] ath11k: Check skb_headroom before using skb_push + +Below kernel panic may occur if there is no +skb_headroom available for performing skb_push. + +<4>[67506.565072] CPU: 1 PID: 1741 Comm: ap-wireless-opt Not tainted 5.4.89+ #0 +<4>[67506.578860] Hardware name: Generic DT based system +<4>[67506.585728] PC is at fortify_panic+0x10/0x18 +<4>[67506.590406] LR is at fortify_panic+0x10/0x18 + +(fortify_panic) from [<7f2cd3cc>] (ath11k_dp_rx_crypto_icv_len+0x1e0/0x161c [ath11k]) +(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2cdbac>] (ath11k_dp_rx_crypto_icv_len+0x9c0/0x161c [ath11k]) +(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2ce0e8>] (ath11k_dp_rx_crypto_icv_len+0xefc/0x161c [ath11k]) +(ath11k_dp_rx_crypto_icv_len [ath11k]) from [<7f2cedb0>] (ath11k_dp_process_rx+0x4ec/0x544 [ath11k]) +(ath11k_dp_process_rx [ath11k]) from [<7f2c417c>] (ath11k_dp_service_srng+0xdc/0x2a0 [ath11k]) +(ath11k_dp_service_srng [ath11k]) from [<7f0d78c8>] (ath11k_pci_ext_grp_napi_poll+0x20/0x50 [ath11k_pci]) +(ath11k_pci_ext_grp_napi_poll [ath11k_pci]) from [<806a6a74>] (__napi_poll+0x28/0xb8) +(__napi_poll) from [<806a6c9c>] (net_rx_action+0xec/0x280) +(net_rx_action) from [<8010226c>] (__do_softirq+0xc4/0x248) +(__do_softirq) from [<8011f230>] (irq_exit+0x6c/0xcc) +(irq_exit) from [<80162a08>] (__handle_domain_irq+0x8c/0xb0) +(__handle_domain_irq) from [<803f0188>] (gic_handle_irq+0x54/0x8c) +(gic_handle_irq) from [<80101a8c>] (__irq_svc+0x6c/0xa8) + +Fix this by checking skb_headroom and expand the +headroom if required size is not available. + +Signed-off-by: Tamizh Chelvam Raja +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 70 +++++++++++++++++++++++++ + 1 file changed, 70 insertions(+) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2454,16 +2454,27 @@ static void ath11k_get_dot11_hdr_from_rx + size_t hdr_len, crypto_len; + struct ieee80211_hdr *hdr; + u16 fc, qos_ctl = 0; ++ int expand_by; + u8 *crypto_hdr; + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { + crypto_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ if (skb_headroom(msdu) < crypto_len) { ++ expand_by = crypto_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + crypto_hdr = skb_push(msdu, crypto_len); + ath11k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); + } + + fc = ath11k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc); + hdr_len = ieee80211_hdrlen(fc); ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + skb_push(msdu, hdr_len); + hdr = (struct ieee80211_hdr *)msdu->data; + hdr->frame_control = fc; +@@ -2499,6 +2510,7 @@ static void ath11k_dp_rx_h_undecap_nwifi + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + u16 qos_ctl = 0; ++ int expand_by = 0; + u8 *qos, *crypto_hdr; + bool add_qos_ctrl = false; + +@@ -2543,26 +2555,46 @@ static void ath11k_dp_rx_h_undecap_nwifi + } + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { ++ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ if (skb_headroom(msdu) < crypto_param_len) { ++ expand_by = crypto_param_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + if (first_hdr) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ memcpy(skb_push(msdu, crypto_param_len), ++ (void *)hdr + hdr_len, crypto_param_len); + } else { +- crypto_hdr = skb_push(msdu, ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ crypto_hdr = skb_push(msdu, crypto_param_len); + ath11k_dp_rx_desc_get_crypto_header(ar->ab, + rxcb->rx_desc, crypto_hdr, enctype); + } + } + + if (!rxcb->is_first_msdu || add_qos_ctrl) { ++ if (skb_headroom(msdu) < IEEE80211_QOS_CTL_LEN) { ++ expand_by = IEEE80211_QOS_CTL_LEN - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, + IEEE80211_QOS_CTL_LEN), &qos_ctl, + IEEE80211_QOS_CTL_LEN); ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), decap_hdr, hdr_len); + return; + } + ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + + /* original 802.11 header has a different DA and in +@@ -2671,6 +2703,7 @@ static void ath11k_dp_rx_h_undecap_eth(s + u8 da[ETH_ALEN]; + u8 sa[ETH_ALEN]; + void *rfc1042; ++ int expand_by; + struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + struct ath11k_dp_rfc1042_hdr rfc = {0xaa, 0xaa, 0x03, {0x00, 0x00, 0x00}}; + +@@ -2680,6 +2713,11 @@ static void ath11k_dp_rx_h_undecap_eth(s + ether_addr_copy(sa, eth->h_source); + rfc.snap_type = eth->h_proto; + skb_pull(msdu, sizeof(struct ethhdr)); ++ if (skb_headroom(msdu) < sizeof(struct ath11k_dp_rfc1042_hdr)) { ++ expand_by = sizeof(struct ath11k_dp_rfc1042_hdr) - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), &rfc, + sizeof(struct ath11k_dp_rfc1042_hdr)); + ath11k_get_dot11_hdr_from_rx_desc(ar, msdu, rxcb, status, enctype); +@@ -2697,6 +2735,11 @@ static void ath11k_dp_rx_h_undecap_eth(s + skb_pull(msdu, sizeof(struct ethhdr)); + + /* push rfc1042/llc/snap */ ++ if (skb_headroom(msdu) < sizeof(struct ath11k_dp_rfc1042_hdr)) { ++ expand_by = sizeof(struct ath11k_dp_rfc1042_hdr) - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, sizeof(struct ath11k_dp_rfc1042_hdr)), rfc1042, + sizeof(struct ath11k_dp_rfc1042_hdr)); + +@@ -2705,12 +2748,22 @@ static void ath11k_dp_rx_h_undecap_eth(s + hdr_len = ieee80211_hdrlen(hdr->frame_control); + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ if (skb_headroom(msdu) < crypto_param_len) { ++ expand_by = crypto_param_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } ++ memcpy(skb_push(msdu, crypto_param_len), ++ (void *)hdr + hdr_len, crypto_param_len); + } + ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + + exit: +@@ -2731,6 +2784,7 @@ static void ath11k_dp_rx_h_undecap_snap( + struct ieee80211_hdr *hdr; + size_t hdr_len; + u8 l3_pad_bytes; ++ int expand_by; + struct hal_rx_desc *rx_desc; + struct ath11k_skb_rxcb *rxcb = ATH11K_SKB_RXCB(msdu); + +@@ -2755,12 +2809,22 @@ static void ath11k_dp_rx_h_undecap_snap( + hdr_len = ieee80211_hdrlen(hdr->frame_control); + + if (!(status->flag & RX_FLAG_IV_STRIPPED)) { +- memcpy(skb_push(msdu, +- ath11k_dp_rx_crypto_param_len(ar, enctype)), +- (void *)hdr + hdr_len, +- ath11k_dp_rx_crypto_param_len(ar, enctype)); ++ int crypto_param_len = ath11k_dp_rx_crypto_param_len(ar, enctype); ++ ++ if (skb_headroom(msdu) < crypto_param_len) { ++ expand_by = crypto_param_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } ++ memcpy(skb_push(msdu, crypto_param_len), ++ (void *)hdr + hdr_len, crypto_param_len); + } + ++ if (skb_headroom(msdu) < hdr_len) { ++ expand_by = hdr_len - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ return; ++ } + memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); + } + +@@ -2890,7 +2954,7 @@ static void ath11k_dp_rx_h_mpdu(struct a + struct ieee80211_rx_status *rx_status, + bool *fast_rx) + { +- bool fill_crypto_hdr; ++ bool fill_crypto_hdr = 0; + enum hal_encrypt_type enctype; + bool is_decrypted = false; + struct ath11k_skb_rxcb *rxcb; +@@ -3123,10 +3187,16 @@ static void ath11k_dp_rx_deliver_msdu(st + u8 decap = DP_RX_DECAP_TYPE_RAW; + bool is_mcbc = rxcb->is_mcbc; + bool is_eapol = rxcb->is_eapol; ++ int expand_by; + + if (status->encoding == RX_ENC_HE && + !(status->flag & RX_FLAG_RADIOTAP_HE) && + !(status->flag & RX_FLAG_SKIP_MONITOR)) { ++ if (skb_headroom(msdu) < sizeof(known)) { ++ expand_by = sizeof(known) - skb_headroom(msdu); ++ if (WARN_ON_ONCE(pskb_expand_head(msdu, expand_by, 0, GFP_ATOMIC))) ++ goto exit; ++ } + he = skb_push(msdu, sizeof(known)); + memcpy(he, &known, sizeof(known)); + status->flag |= RX_FLAG_RADIOTAP_HE; +@@ -3182,6 +3252,7 @@ static void ath11k_dp_rx_deliver_msdu(st + !(is_mcbc && rx_status->flag & RX_FLAG_DECRYPTED)) + rx_status->flag |= RX_FLAG_8023; + ++exit: + ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); + } + diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-783-001-wifi-ath11k-Fix-BCCA-counter-for-EMA.patch b/package/kernel/mac80211/patches/nss/ath11k/999-783-001-wifi-ath11k-Fix-BCCA-counter-for-EMA.patch new file mode 100644 index 00000000000000..cf712593cc15b8 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/999-783-001-wifi-ath11k-Fix-BCCA-counter-for-EMA.patch @@ -0,0 +1,115 @@ +From ea4988df80e62204c411a60bafadfbff23eaa773 Mon Sep 17 00:00:00 2001 +From: Rameshkumar Sundaram +Date: Thu, 15 Jun 2023 14:33:55 +0530 +Subject: [PATCH] wifi: ath11k: Fix BCCA counter for EMA + +Currently BCCA counter is updated to FW via csa counter offs and +beacon with new countdown is updated for every beacon tx completion event. +For EMA, all EMA beacons are updated in one shot, and counter update for +every tx event will mess up the actual sequence of countdown sent over the air. + +Allow FW to update the countdown till 1 and finalize the color +change. + +Signed-off-by: Rameshkumar Sundaram +--- + drivers/net/wireless/ath/ath11k/mac.c | 21 --------------------- + drivers/net/wireless/ath/ath11k/mac.h | 1 - + drivers/net/wireless/ath/ath11k/wmi.c | 23 +++++++++++++++-------- + 3 files changed, 15 insertions(+), 30 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/mac.c ++++ b/drivers/net/wireless/ath/ath11k/mac.c +@@ -1601,27 +1601,6 @@ static int ath11k_mac_setup_bcn_tmpl(str + return ath11k_mac_setup_bcn_tmpl_mbssid(arvif); + } + +-void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif) +-{ +- struct ieee80211_vif *vif = arvif->vif; +- +- if (!vif->bss_conf.color_change_active && !arvif->bcca_zero_sent) +- return; +- +- if (vif->bss_conf.color_change_active && +- ieee80211_beacon_cntdwn_is_complete(vif)) { +- arvif->bcca_zero_sent = true; +- ieee80211_color_change_finish(vif); +- return; +- } +- +- arvif->bcca_zero_sent = false; +- +- if (vif->bss_conf.color_change_active) +- ieee80211_beacon_update_cntdwn(vif); +- ath11k_mac_setup_bcn_tmpl(arvif); +-} +- + static void ath11k_control_beaconing(struct ath11k_vif *arvif, + struct ieee80211_bss_conf *info) + { +--- a/drivers/net/wireless/ath/ath11k/mac.h ++++ b/drivers/net/wireless/ath/ath11k/mac.h +@@ -170,7 +170,6 @@ enum ath11k_supported_bw ath11k_mac_mac8 + enum hal_encrypt_type ath11k_dp_tx_get_encrypt_type(u32 cipher); + void ath11k_mac_handle_beacon(struct ath11k *ar, struct sk_buff *skb); + void ath11k_mac_handle_beacon_miss(struct ath11k *ar, u32 vdev_id); +-void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif); + int ath11k_mac_wait_tx_complete(struct ath11k *ar); + int ath11k_mac_vif_set_keepalive(struct ath11k_vif *arvif, + enum wmi_sta_keepalive_method method, +--- a/drivers/net/wireless/ath/ath11k/wmi.c ++++ b/drivers/net/wireless/ath/ath11k/wmi.c +@@ -1874,9 +1874,10 @@ int ath11k_wmi_bcn_tmpl(struct ath11k *a + cmd->vdev_id = vdev_id; + cmd->tim_ie_offset = offs->tim_offset; + +- if (vif->bss_conf.csa_active) { ++ if (vif->bss_conf.csa_active || vif->bss_conf.color_change_active) { + cmd->csa_switch_count_offset = offs->cntdwn_counter_offs[0]; + cmd->ext_csa_switch_count_offset = offs->cntdwn_counter_offs[1]; ++ cmd->csa_event_bitmap = cpu_to_le32(0xFFFFFFFF); + } + + cmd->buf_len = bcn->len; +@@ -7586,7 +7587,6 @@ static void ath11k_bcn_tx_status_event(s + rcu_read_unlock(); + return; + } +- ath11k_mac_bcn_tx_event(arvif); + rcu_read_unlock(); + } + +@@ -8500,10 +8500,7 @@ ath11k_wmi_process_csa_switch_count_even + { + int i; + struct ath11k_vif *arvif; +- +- /* Finish CSA once the switch count becomes NULL */ +- if (ev->current_switch_count) +- return; ++ struct ieee80211_bss_conf *bss_conf; + + rcu_read_lock(); + for (i = 0; i < ev->num_vdevs; i++) { +@@ -8515,8 +8512,18 @@ ath11k_wmi_process_csa_switch_count_even + continue; + } + +- if (arvif->is_up && arvif->vif->bss_conf.csa_active) +- ieee80211_csa_finish(arvif->vif); ++ bss_conf = &arvif->vif->bss_conf; ++ if (arvif->is_up && (bss_conf->csa_active || bss_conf->color_change_active)) { ++ if (!ev->current_switch_count) { ++ if (bss_conf->csa_active) ++ ieee80211_csa_finish(arvif->vif); ++ } else if (ev->current_switch_count > 1) { ++ ieee80211_beacon_update_cntdwn(arvif->vif); ++ } else { ++ if (bss_conf->color_change_active) ++ ieee80211_color_change_finish(arvif->vif); ++ } ++ } + } + rcu_read_unlock(); + } diff --git a/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch index 2943f6b04bad5c..fc8fec0660f352 100644 --- a/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch @@ -388,7 +388,7 @@ Signed-off-by: Sriram R + LOCAL_ENTRY + VIF_ENTRY + __field(u32, changed) -+ __field(bool, nss_ap_isolate); ++ __field(bool, nss_ap_isolate) + ), + + TP_fast_assign( diff --git a/package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch b/package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch deleted file mode 100644 index 058d983c8a15f6..00000000000000 --- a/package/kernel/mac80211/patches/nss/subsys/649-nl80211-Add-support-to-enable-disable-bss-color-coll.patch +++ /dev/null @@ -1,78 +0,0 @@ -From e4439779d28949a61228b359a27f399df9b42b1a Mon Sep 17 00:00:00 2001 -From: Rameshkumar Sundaram -Date: Mon, 25 Oct 2021 19:06:04 +0530 -Subject: [PATCH 1/2] nl80211: add support to enable/disable bss color - collision detection - -As per 802.11ax-2021, STAs shall process BSS Color Change Announcement -(BCCA) from AP and switch to new color, but some STAs aren't processing -BCCA from AP and not doing color switch, causing them to drop data -frames from AP post color change. - -Provide an option to disable color collision detection and therefore -not to do BCCA to mitigate the same from AP. If it's required in case -where STA supports BCCA handling, then it can enabled in AP using this -option. - -Signed-off-by: Rameshkumar Sundaram -Signed-off-by: Dinesh Karthikeyan ---- - include/net/cfg80211.h | 2 ++ - include/uapi/linux/nl80211.h | 3 +++ - net/wireless/nl80211.c | 3 +++ - 3 files changed, 8 insertions(+) - ---- a/include/net/cfg80211.h -+++ b/include/net/cfg80211.h -@@ -312,11 +312,13 @@ struct ieee80211_he_obss_pd { - * @color: the current color. - * @enabled: HE BSS color is used - * @partial: define the AID equation. -+ * @collision_detection_enabled: HE BSS color collision detection is enabled. - */ - struct cfg80211_he_bss_color { - u8 color; - bool enabled; - bool partial; -+ bool collision_detection_enabled; - }; - - /** ---- a/include/uapi/linux/nl80211.h -+++ b/include/uapi/linux/nl80211.h -@@ -7566,6 +7566,8 @@ enum nl80211_obss_pd_attributes { - * @NL80211_HE_BSS_COLOR_ATTR_COLOR: the current BSS Color. - * @NL80211_HE_BSS_COLOR_ATTR_DISABLED: is BSS coloring disabled. - * @NL80211_HE_BSS_COLOR_ATTR_PARTIAL: the AID equation to be used.. -+ * @NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED: is BSS -+ * color collision detection disabled. - * - * @__NL80211_HE_BSS_COLOR_ATTR_LAST: Internal - * @NL80211_HE_BSS_COLOR_ATTR_MAX: highest BSS Color attribute. -@@ -7576,6 +7578,7 @@ enum nl80211_bss_color_attributes { - NL80211_HE_BSS_COLOR_ATTR_COLOR, - NL80211_HE_BSS_COLOR_ATTR_DISABLED, - NL80211_HE_BSS_COLOR_ATTR_PARTIAL, -+ NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED, - - /* keep last */ - __NL80211_HE_BSS_COLOR_ATTR_LAST, ---- a/net/wireless/nl80211.c -+++ b/net/wireless/nl80211.c -@@ -378,6 +378,7 @@ he_bss_color_policy[NL80211_HE_BSS_COLOR - [NL80211_HE_BSS_COLOR_ATTR_COLOR] = NLA_POLICY_RANGE(NLA_U8, 1, 63), - [NL80211_HE_BSS_COLOR_ATTR_DISABLED] = { .type = NLA_FLAG }, - [NL80211_HE_BSS_COLOR_ATTR_PARTIAL] = { .type = NLA_FLAG }, -+ [NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED] = { .type = NLA_FLAG }, - }; - - static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = { -@@ -5495,6 +5496,8 @@ static int nl80211_parse_he_bss_color(st - !nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_DISABLED]); - he_bss_color->partial = - nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_PARTIAL]); -+ he_bss_color->collision_detection_enabled = -+ !nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_COLLISION_DETECTION_DISABLED]); - - return 0; - } diff --git a/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch b/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch deleted file mode 100644 index 8d8c3c68d58c91..00000000000000 --- a/package/kernel/mac80211/patches/nss/subsys/718-e-mac80211-Deliver-the-frame-to-driver-tx-ops-directly.patch +++ /dev/null @@ -1,74 +0,0 @@ -From f37e9b4a68d32d03346cbfc3cb4178b186c8f2a4 Mon Sep 17 00:00:00 2001 -From: Ramanathan Choodamani -Date: Fri, 17 Feb 2023 03:08:29 -0800 -Subject: [PATCH 5/7] mac80211: Deliver the frame to driver tx ops - directly - -Deliver the frame to driver directly in the forwarding path -to improve the throughput performance. - -Reset the fast xmit flag in ieee80211 datapath to ensure -other features handled as normal through the ath12k_dp_tx -function - -Signed-off-by: Balamurugan Mahalingam -Signed-off-by: Ramanathan Choodamani ---- - net/mac80211/tx.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - ---- a/net/mac80211/tx.c -+++ b/net/mac80211/tx.c -@@ -4571,6 +4571,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s - #ifdef CPTCFG_MAC80211_NSS_SUPPORT - ieee80211_xmit_nss_fixup(skb, dev); - #endif -+ skb->fast_xmit = 0; - - if (likely(!is_multicast_ether_addr(eth->h_dest))) - goto normal; -@@ -4834,7 +4835,43 @@ void ieee80211_8023_xmit_ap(struct ieee8 - netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, - struct net_device *dev) - { -- return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); -+ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); -+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); -+ struct ieee80211_tx_control control = {}; -+ struct sta_info *sta; -+ struct ieee80211_sta *pubsta = NULL; -+ -+ info->control.vif = &sdata->vif; -+ -+ if (skb->fast_xmit) { -+ info->control.flags = u32_encode_bits(IEEE80211_LINK_UNSPECIFIED, -+ IEEE80211_TX_CTRL_MLO_LINK); -+ info->flags = IEEE80211_TX_CTL_HW_80211_ENCAP; -+ -+ if (hweight16(sdata->vif.valid_links) > 1) { -+ rcu_read_lock(); -+ -+ if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) { -+ kfree_skb(skb); -+ goto out; -+ } -+ -+ if (!IS_ERR_OR_NULL(sta) && sta->uploaded) -+ pubsta = &sta->sta; -+ -+ control.sta = pubsta; -+ drv_tx(sdata->local, &control, skb); -+out: -+ rcu_read_unlock(); -+ } else { -+ control.sta = NULL; -+ drv_tx(sdata->local, &control, skb); -+ } -+ -+ return NETDEV_TX_OK; -+ } else { -+ return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); -+ } - } - - netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, diff --git a/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch b/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch new file mode 100644 index 00000000000000..098767aa3f36db --- /dev/null +++ b/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch @@ -0,0 +1,68 @@ +From eac6bea547505fc6545014755e8e529fd804df42 Mon Sep 17 00:00:00 2001 +From: Maharaja Kennadyrajan +Date: Tue, 18 Apr 2023 14:41:05 +0530 +Subject: [PATCH 1/3] mac80211: Get valid last_rate for rx_bitrate from cpu + stats + +Get the valid last_rate from the cpu rx_stats while filling the +rx_bitrate in the station dump. This helps to avoid the missing +rx bitrate field in the iw station dump. + +Signed-off-by: Tamizh Chelvam Raja +Signed-off-by: Maharaja Kennadyrajan +--- + net/mac80211/sta_info.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +--- a/net/mac80211/sta_info.c ++++ b/net/mac80211/sta_info.c +@@ -2396,7 +2396,7 @@ void ieee80211_sta_update_pending_airtim + } + + static struct ieee80211_sta_rx_stats * +-sta_get_last_rx_stats(struct sta_info *sta) ++sta_get_last_rx_stats(struct sta_info *sta, bool is_rx_bitrate) + { + struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; + int cpu; +@@ -2409,8 +2409,13 @@ sta_get_last_rx_stats(struct sta_info *s + + for_each_possible_cpu(cpu) { + struct ieee80211_sta_rx_stats *cpustats; ++ u16 rate; + + cpustats = per_cpu_ptr(sta->deflink.pcpu_rx_stats, cpu); ++ rate = READ_ONCE(cpustats->last_rate); ++ ++ if(!cpustats->last_rx || (is_rx_bitrate && (rate == STA_STATS_RATE_INVALID))) ++ continue; + + if (time_after(cpustats->last_rx, stats->last_rx)) + stats = cpustats; +@@ -2480,7 +2485,7 @@ static void sta_stats_decode_rate(struct + + static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) + { +- u32 rate = READ_ONCE(sta_get_last_rx_stats(sta)->last_rate); ++ u32 rate = READ_ONCE(sta_get_last_rx_stats(sta, true)->last_rate); + + if (rate == STA_STATS_RATE_INVALID) + return -EINVAL; +@@ -2680,7 +2685,7 @@ void sta_set_sinfo(struct sta_info *sta, + struct ieee80211_sta_rx_stats *last_rxstats; + struct link_sta_info *link_sta = NULL; + +- last_rxstats = sta_get_last_rx_stats(sta); ++ last_rxstats = sta_get_last_rx_stats(sta, false); + + sinfo->generation = sdata->local->sta_generation; + +@@ -2924,7 +2929,7 @@ u32 sta_get_expected_throughput(struct s + + unsigned long ieee80211_sta_last_active(struct sta_info *sta) + { +- struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta); ++ struct ieee80211_sta_rx_stats *stats = sta_get_last_rx_stats(sta, false); + + if (!sta->deflink.status_stats.last_ack || + time_after(stats->last_rx, sta->deflink.status_stats.last_ack)) diff --git a/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch index 6b5cf7f3e24660..50466d46c37880 100644 --- a/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch +++ b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch @@ -67,15 +67,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) { len = 0; goto out; -@@ -4571,7 +4573,6 @@ netdev_tx_t ieee80211_subif_start_xmit(s - #ifdef CPTCFG_MAC80211_NSS_SUPPORT - ieee80211_xmit_nss_fixup(skb, dev); - #endif -- skb->fast_xmit = 0; - - if (likely(!is_multicast_ether_addr(eth->h_dest))) - goto normal; -@@ -4715,7 +4716,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4714,7 +4716,7 @@ static void ieee80211_8023_xmit(struct i } } @@ -84,27 +76,6 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) return; -@@ -4835,6 +4836,7 @@ void ieee80211_8023_xmit_ap(struct ieee8 - netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, - struct net_device *dev) - { -+#ifdef CPTCFG_MAC80211_SFE_SUPPORT - struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_tx_control control = {}; -@@ -4869,9 +4871,10 @@ out: - } - - return NETDEV_TX_OK; -- } else { -- return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); - } -+#endif -+ return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); -+ - } - - netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -2267,6 +2267,10 @@ int ieee80211_if_add(struct ieee80211_lo diff --git a/target/linux/qualcommax/config-6.6 b/target/linux/qualcommax/config-6.6 index 71b54041c50e59..bbe5009473ae10 100644 --- a/target/linux/qualcommax/config-6.6 +++ b/target/linux/qualcommax/config-6.6 @@ -504,6 +504,11 @@ CONFIG_SERIAL_MSM=y CONFIG_SERIAL_MSM_CONSOLE=y CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y +# CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE is not set +# CONFIG_DEBUG_OBJECTS_SKBUFF is not set +CONFIG_SKB_RECYCLER=y +CONFIG_SKB_RECYCLER_MULTI_CPU=y +# CONFIG_SKB_FAST_RECYCLABLE_DEBUG_ENABLE is not set CONFIG_SMP=y # CONFIG_SM_CAMCC_6350 is not set # CONFIG_SM_CAMCC_8450 is not set diff --git a/target/linux/qualcommax/files/net/core/skbuff_debug.c b/target/linux/qualcommax/files/net/core/skbuff_debug.c new file mode 100644 index 00000000000000..50d06759210995 --- /dev/null +++ b/target/linux/qualcommax/files/net/core/skbuff_debug.c @@ -0,0 +1,332 @@ +/* + * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include +#include +#include +#include + +#include "skbuff_debug.h" +#include "skbuff_notifier.h" +#include "skbuff_recycle.h" + +static int skbuff_debugobj_enabled __read_mostly = 1; + +static int skbuff_debug_event_handler(struct notifier_block *nb, + unsigned long action, void *data); +static struct notifier_block skbuff_debug_notify = { + .notifier_call = skbuff_debug_event_handler, + .priority = 0 +}; + +inline u32 skbuff_debugobj_sum(struct sk_buff *skb) +{ + int pos = offsetof(struct sk_buff, free_addr); + u32 sum = 0; + + while (pos--) + sum += ((u8 *)skb)[pos]; + + return sum; +} + +struct skbuff_debugobj_walking { + int pos; + void **d; +}; + +#ifdef CONFIG_ARM +static int skbuff_debugobj_walkstack(struct stackframe *frame, void *p) { + struct skbuff_debugobj_walking *w = (struct skbuff_debugobj_walking *)p; + unsigned long pc = frame->pc; + + if (w->pos < DEBUG_OBJECTS_SKBUFF_STACKSIZE - 1) { + w->d[w->pos++] = (void *)pc; + return 0; + } + + return -ENOENT; +} +#else +static bool skbuff_debugobj_walkstack(void *p, unsigned long pc) +{ + struct skbuff_debugobj_walking *w = (struct skbuff_debugobj_walking *)p; + + if (w->pos < DEBUG_OBJECTS_SKBUFF_STACKSIZE - 1) { + w->d[w->pos++] = (void *)pc; + return true; + } + + return false; +} +#endif + +#if defined(CONFIG_ARM) || defined(CONFIG_ARM64) +static void skbuff_debugobj_get_stack(void **ret) +{ + struct skbuff_debugobj_walking w = {0, ret}; + void *p = &w; + +#ifdef CONFIG_ARM + struct stackframe frame; + register unsigned long current_sp asm ("sp"); + + frame.lr = (unsigned long)__builtin_return_address(0); + frame.fp = (unsigned long)__builtin_frame_address(0); + frame.sp = current_sp; + frame.pc = (unsigned long)skbuff_debugobj_get_stack; + + walk_stackframe(&frame, skbuff_debugobj_walkstack, p); +#else + arch_stack_walk(skbuff_debugobj_walkstack, p, current, NULL); +#endif + + ret[w.pos] = NULL; +} +#else +#error +static void skbuff_debugobj_get_stack(void **ret) +{ + /* not supported */ + ret[0] = 0xdeadbeef; +} +#endif + +void skbuff_debugobj_print_stack(void *const *stack) +{ + int i; + + for (i = 0; stack[i]; i++) + pr_emerg("\t %pS (0x%p)\n", stack[i], stack[i]); +} + +static const char *skbuff_debugobj_state_name(const struct sk_buff *skb) +{ + int obj_state; + + obj_state = debug_object_get_state((struct sk_buff *)skb); + switch (obj_state) { + case ODEBUG_STATE_NONE: + return "none"; + case ODEBUG_STATE_INIT: + return "init"; + case ODEBUG_STATE_INACTIVE: + return "inactive"; + case ODEBUG_STATE_ACTIVE: + return "active"; + case ODEBUG_STATE_DESTROYED: + return "destroyed"; + case ODEBUG_STATE_NOTAVAILABLE: + return "not available"; + default: + return "invalid"; + } +} + +void skbuff_debugobj_print_skb(const struct sk_buff *skb) +{ + pr_emerg("skb_debug: current process = %s (pid %i)\n", + current->comm, current->pid); + pr_emerg("skb_debug: skb 0x%p, next 0x%p, prev 0x%p, state = %s\n", skb, + skb->next, skb->prev, skbuff_debugobj_state_name(skb)); + pr_emerg("skb_debug: free stack:\n"); + skbuff_debugobj_print_stack(skb->free_addr); + pr_emerg("skb_debug: alloc stack:\n"); + skbuff_debugobj_print_stack(skb->alloc_addr); +} +EXPORT_SYMBOL(skbuff_debugobj_print_skb); + +/* skbuff_debugobj_fixup(): + * Called when an error is detected in the state machine for + * the objects + */ +static bool skbuff_debugobj_fixup(void *addr, enum debug_obj_state state) +{ + struct sk_buff *skb = (struct sk_buff *)addr; + ftrace_dump(DUMP_ALL); + WARN(1, "skb_debug: state = %d, skb = 0x%p sum = %d (now %d)\n", + state, skb, skb->sum, skbuff_debugobj_sum(skb)); + skb_recycler_notifier_send_event(SKB_RECYCLER_NOTIFIER_FSM, skb); + + return true; +} + +static struct debug_obj_descr skbuff_debug_descr = { + .name = "sk_buff_struct", + .fixup_init = skbuff_debugobj_fixup, + .fixup_activate = skbuff_debugobj_fixup, + .fixup_destroy = skbuff_debugobj_fixup, + .fixup_free = skbuff_debugobj_fixup, +}; + +inline void skbuff_debugobj_activate(struct sk_buff *skb) +{ + int ret = 0; + + if (!skbuff_debugobj_enabled) + return; + + skbuff_debugobj_get_stack(skb->alloc_addr); + ret = debug_object_activate(skb, &skbuff_debug_descr); + if (ret) + goto err_act; + + skbuff_debugobj_sum_validate(skb); + + return; + +err_act: + ftrace_dump(DUMP_ALL); + WARN(1, "skb_debug: failed to activate err = %d skb = 0x%p sum = %d (now %d)\n", + ret, skb, skb->sum, skbuff_debugobj_sum(skb)); + skb_recycler_notifier_send_event(SKB_RECYCLER_NOTIFIER_DBLALLOC, skb); +} + +inline void skbuff_debugobj_init_and_activate(struct sk_buff *skb) +{ + if (!skbuff_debugobj_enabled) + return; + + /* if we're coming from the slab, the skb->sum might + * be invalid anyways + */ + skb->sum = skbuff_debugobj_sum(skb); + + debug_object_init(skb, &skbuff_debug_descr); + skbuff_debugobj_activate(skb); +} + +inline void skbuff_debugobj_deactivate(struct sk_buff *skb) +{ + int obj_state; + + if (!skbuff_debugobj_enabled) + return; + + skb->sum = skbuff_debugobj_sum(skb); + + obj_state = debug_object_get_state(skb); + + if (obj_state == ODEBUG_STATE_ACTIVE) { + debug_object_deactivate(skb, &skbuff_debug_descr); + skbuff_debugobj_get_stack(skb->free_addr); + return; + } + + ftrace_dump(DUMP_ALL); + WARN(1, "skb_debug: deactivating inactive object skb=0x%p state=%d sum = %d (now %d)\n", + skb, obj_state, skb->sum, skbuff_debugobj_sum(skb)); + skb_recycler_notifier_send_event(SKB_RECYCLER_NOTIFIER_DBLFREE, skb); +} + +inline void _skbuff_debugobj_sum_validate(struct sk_buff *skb, + const char *var, const char *src, + int line, const char *fxn) +{ + if (!skbuff_debugobj_enabled || !skb) + return; + + if (skb->sum == skbuff_debugobj_sum(skb)) + return; + + ftrace_dump(DUMP_ALL); + WARN(1, "skb_debug: skb sum changed skb = 0x%p sum = %d (now %d)\n", + skb, skb->sum, skbuff_debugobj_sum(skb)); + pr_emerg("skb_debug: %s() checking %s in %s:%d\n", fxn, var, src, line); + skb_recycler_notifier_send_event(SKB_RECYCLER_NOTIFIER_SUMERR, skb); +} + +inline void skbuff_debugobj_sum_update(struct sk_buff *skb) +{ + if (!skbuff_debugobj_enabled || !skb) + return; + + skb->sum = skbuff_debugobj_sum(skb); +} + +inline void skbuff_debugobj_destroy(struct sk_buff *skb) +{ + if (!skbuff_debugobj_enabled) + return; + + debug_object_destroy(skb, &skbuff_debug_descr); +} + +static int __init disable_object_debug(char *str) +{ + skbuff_debugobj_enabled = 0; + + pr_info("skb_debug: debug objects is disabled\n"); + return 0; +} + +early_param("no_skbuff_debug_objects", disable_object_debug); + +void skbuff_debugobj_print_skb_list(const struct sk_buff *skb_list, + const char *list_title, int cpu) +{ + int count; + struct sk_buff *skb_i = (struct sk_buff *)skb_list; + u32 sum_i, sum_now; + int obj_state; + + if (cpu < 0) { + cpu = get_cpu(); + put_cpu(); + } + pr_emerg("skb_debug: start skb list '%s' [CPU#%d]\n", list_title, cpu); + count = 0; + if (skb_list) { + do { + obj_state = + debug_object_get_state(skb_i); + if (obj_state < ODEBUG_STATE_NOTAVAILABLE) { + sum_i = skb_i->sum; + sum_now = skbuff_debugobj_sum(skb_i); + } else { + sum_i = 0; + sum_now = 0; + } + if (sum_i != sum_now) { + pr_emerg("skb_debug: [%02d] skb 0x%p, next 0x%p, prev 0x%p, state %d (%s), sum %d (now %d)\n", + count, skb_i, skb_i->next, skb_i->prev, + obj_state, skbuff_debugobj_state_name(skb_i), + sum_i, sum_now); + } + skb_i = skb_i->next; + count++; + } while (skb_list != skb_i); + } + pr_emerg("skb_debug: end skb list '%s'. In total %d skbs iterated.\n", list_title, count); +} + +void skbuff_debugobj_register_callback(void) +{ + skb_recycler_notifier_register(&skbuff_debug_notify); +} + +int skbuff_debug_event_handler(struct notifier_block *nb, unsigned long action, + void *data) +{ + struct sk_buff *skb = (struct sk_buff *)data; + + pr_emerg("skb_debug: notifier event %lu\n", action); + skbuff_debugobj_print_skb(skb); + skb_recycler_print_all_lists(); + + return NOTIFY_DONE; +} diff --git a/target/linux/qualcommax/files/net/core/skbuff_debug.h b/target/linux/qualcommax/files/net/core/skbuff_debug.h new file mode 100644 index 00000000000000..43e37ba43b645e --- /dev/null +++ b/target/linux/qualcommax/files/net/core/skbuff_debug.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +#ifndef _LINUX_SKBBUFF_DEBUG_OBJECTS +#define _LINUX_SKBBUFF_DEBUG_OBJECTS + +#ifdef CONFIG_DEBUG_OBJECTS_SKBUFF +void skbuff_debugobj_init_and_activate(struct sk_buff *skb); +void skbuff_debugobj_activate(struct sk_buff *skb); +void skbuff_debugobj_deactivate(struct sk_buff *skb); +void skbuff_debugobj_destroy(struct sk_buff *skb); +#define skbuff_debugobj_sum_validate(skb) _skbuff_debugobj_sum_validate(skb, \ + #skb, __FILE__, __LINE__, __func__) +void _skbuff_debugobj_sum_validate(struct sk_buff *skb, const char *var, + const char *src, int line, const char *fxn); +void skbuff_debugobj_sum_update(struct sk_buff *skb); +void skbuff_debugobj_print_skb(const struct sk_buff *skb); + +void skbuff_debugobj_print_skb_list(const struct sk_buff *skb_list, + const char *list_title, int cpu); +void skbuff_debugobj_register_callback(void); + +#else +static inline void skbuff_debugobj_init_and_activate(struct sk_buff *skb) { } +static inline void skbuff_debugobj_activate(struct sk_buff *skb) { } +static inline void skbuff_debugobj_deactivate(struct sk_buff *skb) { } +static inline void skbuff_debugobj_destroy(struct sk_buff *skb) { } +static inline void skbuff_debugobj_sum_validate(struct sk_buff *skb) { } +static inline void skbuff_debugobj_sum_update(struct sk_buff *skb) { } +static inline void skbuff_debugobj_print_skb(const struct sk_buff *skb) { } + +static inline void skbuff_debugobj_print_skb_list + (const struct sk_buff *skb_list, const char *list_title, int cpu) { } +static inline void skbuff_debugobj_register_callback(void) { } +#endif + +#endif /* _LINUX_SKBBUFF_DEBUG_OBJECTS */ diff --git a/target/linux/qualcommax/files/net/core/skbuff_notifier.c b/target/linux/qualcommax/files/net/core/skbuff_notifier.c new file mode 100644 index 00000000000000..8c59476db7fe38 --- /dev/null +++ b/target/linux/qualcommax/files/net/core/skbuff_notifier.c @@ -0,0 +1,42 @@ +/* + * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +/* Notifier interface for the SKB Recycler */ + +#include "skbuff_notifier.h" + +static BLOCKING_NOTIFIER_HEAD(skb_recycler_notifier); + +int skb_recycler_notifier_register(struct notifier_block *nb) +{ + return blocking_notifier_chain_register(&skb_recycler_notifier, nb); +} +EXPORT_SYMBOL(skb_recycler_notifier_register); + +int skb_recycler_notifier_unregister(struct notifier_block *nb) +{ + return blocking_notifier_chain_unregister(&skb_recycler_notifier, nb); +} +EXPORT_SYMBOL(skb_recycler_notifier_unregister); + +int skb_recycler_notifier_send_event(unsigned long action, struct sk_buff *skb) +{ + int ret; + + ret = blocking_notifier_call_chain(&skb_recycler_notifier, action, skb); + + return 0; +} diff --git a/target/linux/qualcommax/files/net/core/skbuff_notifier.h b/target/linux/qualcommax/files/net/core/skbuff_notifier.h new file mode 100644 index 00000000000000..3d8bfa586fc94b --- /dev/null +++ b/target/linux/qualcommax/files/net/core/skbuff_notifier.h @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2016, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef SKBUFF_NOTIFIER_H +#define SKBUFF_NOTIFIER_H + +#include +#include + +/* notifier events */ +#define SKB_RECYCLER_NOTIFIER_SUMERR 0x0001 +#define SKB_RECYCLER_NOTIFIER_DBLFREE 0x0002 +#define SKB_RECYCLER_NOTIFIER_DBLALLOC 0x0004 +#define SKB_RECYCLER_NOTIFIER_FSM 0x0008 + +#if defined(CONFIG_DEBUG_OBJECTS_SKBUFF) +int skb_recycler_notifier_register(struct notifier_block *nb); +int skb_recycler_notifier_unregister(struct notifier_block *nb); +int skb_recycler_notifier_send_event(unsigned long action, + struct sk_buff *skb); +#else +static inline int skb_recycler_notifier_register(struct notifier_block *nb) +{ + return 0; +} + +static inline int skb_recycler_notifier_unregister(struct notifier_block *nb) +{ + return 0; +} + +static inline int skb_recycler_notifier_send_event(unsigned long action, + struct sk_buff *skb) +{ + return 1; +} +#endif /* CONFIG_DEBUG_OBJECTS_SKBUFF */ + +#endif /* SKBUFF_NOTIFIER_H */ diff --git a/target/linux/qualcommax/files/net/core/skbuff_recycle.c b/target/linux/qualcommax/files/net/core/skbuff_recycle.c new file mode 100644 index 00000000000000..41add8d3098fca --- /dev/null +++ b/target/linux/qualcommax/files/net/core/skbuff_recycle.c @@ -0,0 +1,729 @@ +/* + * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ +/* Generic skb recycler */ + +#include "skbuff_recycle.h" +#include +#include + +#include "skbuff_debug.h" + +static struct proc_dir_entry *proc_net_skbrecycler; + +static DEFINE_PER_CPU(struct sk_buff_head, recycle_list); +static int skb_recycle_max_skbs = SKB_RECYCLE_MAX_SKBS; + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU +static DEFINE_PER_CPU(struct sk_buff_head, recycle_spare_list); +static struct global_recycler glob_recycler; +static int skb_recycle_spare_max_skbs = SKB_RECYCLE_SPARE_MAX_SKBS; +#endif + +inline struct sk_buff *skb_recycler_alloc(struct net_device *dev, + unsigned int length) +{ + unsigned long flags; + struct sk_buff_head *h; + struct sk_buff *skb = NULL; + struct sk_buff *ln = NULL; + + if (unlikely(length > SKB_RECYCLE_SIZE)) + return NULL; + + h = &get_cpu_var(recycle_list); + local_irq_save(flags); + skb = skb_peek(h); + if (skb) { + ln = skb_peek_next(skb, h); + skbuff_debugobj_activate(skb); + /* Recalculate the sum for skb->next as next and prev pointers + * of skb->next will be updated in __skb_unlink + */ + skbuff_debugobj_sum_validate(ln); + __skb_unlink(skb, h); + skbuff_debugobj_sum_update(ln); + } +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + if (unlikely(!skb)) { + u8 head; + + spin_lock(&glob_recycler.lock); + /* If global recycle list is not empty, use global buffers */ + head = glob_recycler.head; + if (unlikely(head == glob_recycler.tail)) { + spin_unlock(&glob_recycler.lock); + } else { + struct sk_buff *gn = glob_recycler.pool[head].next; + struct sk_buff *gp = glob_recycler.pool[head].prev; + + /* Move SKBs from global list to CPU pool */ + skbuff_debugobj_sum_validate(gn); + skbuff_debugobj_sum_validate(gp); + skb_queue_splice_init(&glob_recycler.pool[head], h); + skbuff_debugobj_sum_update(gn); + skbuff_debugobj_sum_update(gp); + + head = (head + 1) & SKB_RECYCLE_MAX_SHARED_POOLS_MASK; + glob_recycler.head = head; + spin_unlock(&glob_recycler.lock); + /* We have refilled the CPU pool - dequeue */ + skb = skb_peek(h); + if (skb) { + /* Recalculate the sum for skb->next as next and + * prev pointers of skb->next will be updated + * in __skb_unlink + */ + ln = skb_peek_next(skb, h); + skbuff_debugobj_activate(skb); + skbuff_debugobj_sum_validate(ln); + __skb_unlink(skb, h); + skbuff_debugobj_sum_update(ln); + } + } + } +#endif + local_irq_restore(flags); + put_cpu_var(recycle_list); + + if (likely(skb)) { + struct skb_shared_info *shinfo; + + /* We're about to write a large amount to the skb to + * zero most of the structure so prefetch the start + * of the shinfo region now so it's in the D-cache + * before we start to write that. + */ + shinfo = skb_shinfo(skb); + prefetchw(shinfo); + + zero_struct(skb, offsetof(struct sk_buff, tail)); + refcount_set(&skb->users, 1); + skb->mac_header = (typeof(skb->mac_header))~0U; + skb->transport_header = (typeof(skb->transport_header))~0U; + zero_struct(shinfo, offsetof(struct skb_shared_info, dataref)); + atomic_set(&shinfo->dataref, 1); + + skb->data = skb->head + NET_SKB_PAD; + skb_reset_tail_pointer(skb); + + skb->dev = dev; + } + + return skb; +} + +inline bool skb_recycler_consume(struct sk_buff *skb) +{ + unsigned long flags; + struct sk_buff_head *h; + struct sk_buff *ln = NULL; + /* Can we recycle this skb? If not, simply return that we cannot */ + if (unlikely(!consume_skb_can_recycle(skb, SKB_RECYCLE_MIN_SIZE, + SKB_RECYCLE_MAX_SIZE))) + return false; + + /* If we can, then it will be much faster for us to recycle this one + * later than to allocate a new one from scratch. + */ + h = &get_cpu_var(recycle_list); + local_irq_save(flags); + /* Attempt to enqueue the CPU hot recycle list first */ + if (likely(skb_queue_len(h) < skb_recycle_max_skbs)) { + ln = skb_peek(h); + /* Recalculate the sum for peek of list as next and prev + * pointers of skb->next will be updated in __skb_queue_head + */ + skbuff_debugobj_sum_validate(ln); + __skb_queue_head(h, skb); + skbuff_debugobj_deactivate(skb); + skbuff_debugobj_sum_update(ln); + local_irq_restore(flags); + preempt_enable(); + return true; + } +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + h = this_cpu_ptr(&recycle_spare_list); + + /* The CPU hot recycle list was full; if the spare list is also full, + * attempt to move the spare list to the global list for other CPUs to + * use. + */ + if (unlikely(skb_queue_len(h) >= skb_recycle_spare_max_skbs)) { + u8 cur_tail, next_tail; + + spin_lock(&glob_recycler.lock); + cur_tail = glob_recycler.tail; + next_tail = (cur_tail + 1) & SKB_RECYCLE_MAX_SHARED_POOLS_MASK; + if (next_tail != glob_recycler.head) { + struct sk_buff_head *p = &glob_recycler.pool[cur_tail]; + struct sk_buff *hn = h->next, *hp = h->prev; + + /* Move SKBs from CPU pool to Global pool*/ + skbuff_debugobj_sum_validate(hp); + skbuff_debugobj_sum_validate(hn); + skb_queue_splice_init(h, p); + skbuff_debugobj_sum_update(hp); + skbuff_debugobj_sum_update(hn); + + /* Done with global list init */ + glob_recycler.tail = next_tail; + spin_unlock(&glob_recycler.lock); + + /* Recalculate the sum for peek of list as next and prev + * pointers of skb->next will be updated in + * __skb_queue_head + */ + ln = skb_peek(h); + skbuff_debugobj_sum_validate(ln); + /* We have now cleared room in the spare; + * Initialize and enqueue skb into spare + */ + __skb_queue_head(h, skb); + skbuff_debugobj_sum_update(ln); + skbuff_debugobj_deactivate(skb); + + local_irq_restore(flags); + preempt_enable(); + return true; + } + /* We still have a full spare because the global is also full */ + spin_unlock(&glob_recycler.lock); + } else { + /* We have room in the spare list; enqueue to spare list */ + ln = skb_peek(h); + /* Recalculate the sum for peek of list as next and prev + * pointers of skb->next will be updated in __skb_queue_head + */ + skbuff_debugobj_sum_validate(ln); + __skb_queue_head(h, skb); + skbuff_debugobj_deactivate(skb); + skbuff_debugobj_sum_update(ln); + local_irq_restore(flags); + preempt_enable(); + return true; + } +#endif + + local_irq_restore(flags); + preempt_enable(); + + return false; +} + +/** + * skb_recycler_consume_list_fast - free a list of skbs + * @skb_list: head of the buffer list + * + * Add the list of given SKBs to CPU list. Assumption is that these buffers + * have been allocated originally from recycler and have been transmitted through + * a controlled fast xmit path, thus removing the need for additional checks + * before recycling the buffers back to pool + */ +#ifdef CONFIG_DEBUG_OBJECTS_SKBUFF +inline bool skb_recycler_consume_list_fast(struct sk_buff_head *skb_list) +{ + struct sk_buff *skb = NULL, *next = NULL; + + skb_queue_walk_safe(skb_list, skb, next) { + if (skb) { + __skb_unlink(skb, skb_list); + skb_recycler_consume(skb); + } + } + + return true; +} +#else +inline bool skb_recycler_consume_list_fast(struct sk_buff_head *skb_list) +{ + unsigned long flags; + struct sk_buff_head *h; + + h = &get_cpu_var(recycle_list); + local_irq_save(flags); + /* Attempt to enqueue the CPU hot recycle list first */ + if (likely(skb_queue_len(h) < skb_recycle_max_skbs)) { + skb_queue_splice(skb_list,h); + local_irq_restore(flags); + preempt_enable(); + return true; + } + + local_irq_restore(flags); + preempt_enable(); + + return false; +} +#endif + +static void skb_recycler_free_skb(struct sk_buff_head *list) +{ + struct sk_buff *skb = NULL, *next = NULL; + unsigned long flags; + + spin_lock_irqsave(&list->lock, flags); + while ((skb = skb_peek(list)) != NULL) { + skbuff_debugobj_activate(skb); + next = skb->next; + __skb_unlink(skb, list); + skb_release_data(skb); + kfree_skbmem(skb); + /* + * Update the skb->sum for next due to skb_link operation + */ + if (next) { + skbuff_debugobj_sum_update(next); + } + } + spin_unlock_irqrestore(&list->lock, flags); +} + +static int skb_cpu_callback(unsigned int ocpu) +{ + unsigned long oldcpu = (unsigned long)ocpu; + + skb_recycler_free_skb(&per_cpu(recycle_list, oldcpu)); +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + spin_lock(&glob_recycler.lock); + skb_recycler_free_skb(&per_cpu(recycle_spare_list, oldcpu)); + spin_unlock(&glob_recycler.lock); +#endif + + return NOTIFY_DONE; +} + +#ifdef CONFIG_SKB_RECYCLER_PREALLOC +static int __init skb_prealloc_init_list(void) +{ + int i; + struct sk_buff *skb; + + for (i = 0; i < SKB_RECYCLE_MAX_PREALLOC_SKBS; i++) { + skb = __alloc_skb(SKB_RECYCLE_MAX_SIZE + NET_SKB_PAD, + GFP_KERNEL, 0, NUMA_NO_NODE); + if (unlikely(!skb)) + return -ENOMEM; + + skb_reserve(skb, NET_SKB_PAD); + + skb_recycler_consume(skb); + } + return 0; +} +#endif + +/* procfs: count + * Show skb counts + */ +static int proc_skb_count_show(struct seq_file *seq, void *v) +{ + int cpu; + int len; + int total; +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + unsigned int i; + unsigned long flags; +#endif + + total = 0; + + for_each_online_cpu(cpu) { + len = skb_queue_len(&per_cpu(recycle_list, cpu)); + seq_printf(seq, "recycle_list[%d]: %d\n", cpu, len); + total += len; + } + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + for_each_online_cpu(cpu) { + len = skb_queue_len(&per_cpu(recycle_spare_list, cpu)); + seq_printf(seq, "recycle_spare_list[%d]: %d\n", cpu, len); + total += len; + } + + for (i = 0; i < SKB_RECYCLE_MAX_SHARED_POOLS; i++) { + spin_lock_irqsave(&glob_recycler.lock, flags); + len = skb_queue_len(&glob_recycler.pool[i]); + spin_unlock_irqrestore(&glob_recycler.lock, flags); + seq_printf(seq, "global_list[%d]: %d\n", i, len); + total += len; + } +#endif + + seq_printf(seq, "total: %d\n", total); + return 0; +} + +static int proc_skb_count_open(struct inode *inode, struct file *file) +{ + return single_open(file, proc_skb_count_show, pde_data(inode)); +} + +static const struct proc_ops proc_skb_count_fops = { + .proc_open = proc_skb_count_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = single_release, +}; + +/* procfs: flush + * Flush skbs + */ +static void skb_recycler_flush_task(struct work_struct *work) +{ + unsigned long flags; + struct sk_buff_head *h; + struct sk_buff_head tmp; + struct sk_buff *skb = NULL; + + skb_queue_head_init(&tmp); + + h = &get_cpu_var(recycle_list); + local_irq_save(flags); + skb_queue_splice_init(h, &tmp); + /* + * Update the sum for first skb present in tmp list. + * Since the skb is changed in splice init + */ + skb = skb_peek(&tmp); + skbuff_debugobj_sum_update(skb); + local_irq_restore(flags); + put_cpu_var(recycle_list); + skb_recycler_free_skb(&tmp); + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + h = &get_cpu_var(recycle_spare_list); + local_irq_save(flags); + skb_queue_splice_init(h, &tmp); + skb = skb_peek(&tmp); + skbuff_debugobj_sum_update(skb); + local_irq_restore(flags); + put_cpu_var(recycle_spare_list); + skb_recycler_free_skb(&tmp); +#endif +} + +static ssize_t proc_skb_flush_write(struct file *file, + const char __user *buf, + size_t count, + loff_t *ppos) +{ +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + unsigned int i; + unsigned long flags; +#endif + schedule_on_each_cpu(&skb_recycler_flush_task); + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + spin_lock_irqsave(&glob_recycler.lock, flags); + for (i = 0; i < SKB_RECYCLE_MAX_SHARED_POOLS; i++) + skb_recycler_free_skb(&glob_recycler.pool[i]); + glob_recycler.head = 0; + glob_recycler.tail = 0; + spin_unlock_irqrestore(&glob_recycler.lock, flags); +#endif + return count; +} + +static const struct proc_ops proc_skb_flush_fops = { + .proc_write = proc_skb_flush_write, + .proc_open = simple_open, + .proc_lseek = noop_llseek, +}; + +/* procfs: max_skbs + * Show max skbs + */ +static int proc_skb_max_skbs_show(struct seq_file *seq, void *v) +{ + seq_printf(seq, "%d\n", skb_recycle_max_skbs); + return 0; +} + +static int proc_skb_max_skbs_open(struct inode *inode, struct file *file) +{ + return single_open(file, proc_skb_max_skbs_show, pde_data(inode)); +} + +static ssize_t proc_skb_max_skbs_write(struct file *file, + const char __user *buf, + size_t count, + loff_t *ppos) +{ + int ret; + int max; + char buffer[13]; + + memset(buffer, 0, sizeof(buffer)); + if (count > sizeof(buffer) - 1) + count = sizeof(buffer) - 1; + if (copy_from_user(buffer, buf, count) != 0) + return -EFAULT; + ret = kstrtoint(strstrip(buffer), 10, &max); + if (ret == 0 && max >= 0) + skb_recycle_max_skbs = max; + + return count; +} + +static const struct proc_ops proc_skb_max_skbs_fops = { + .proc_open = proc_skb_max_skbs_open, + .proc_read = seq_read, + .proc_write = proc_skb_max_skbs_write, + .proc_release = single_release, +}; + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU +/* procfs: max_spare_skbs + * Show max spare skbs + */ +static int proc_skb_max_spare_skbs_show(struct seq_file *seq, void *v) +{ + seq_printf(seq, "%d\n", skb_recycle_spare_max_skbs); + return 0; +} + +static int proc_skb_max_spare_skbs_open(struct inode *inode, struct file *file) +{ + return single_open(file, + proc_skb_max_spare_skbs_show, + pde_data(inode)); +} + +static ssize_t +proc_skb_max_spare_skbs_write(struct file *file, + const char __user *buf, + size_t count, + loff_t *ppos) +{ + int ret; + int max; + char buffer[13]; + + memset(buffer, 0, sizeof(buffer)); + if (count > sizeof(buffer) - 1) + count = sizeof(buffer) - 1; + if (copy_from_user(buffer, buf, count) != 0) + return -EFAULT; + ret = kstrtoint(strstrip(buffer), 10, &max); + if (ret == 0 && max >= 0) + skb_recycle_spare_max_skbs = max; + + return count; +} + +static const struct proc_ops proc_skb_max_spare_skbs_fops = { + .proc_open = proc_skb_max_spare_skbs_open, + .proc_read = seq_read, + .proc_write = proc_skb_max_spare_skbs_write, + .proc_release = single_release, +}; +#endif /* CONFIG_SKB_RECYCLER_MULTI_CPU */ + +static void skb_recycler_init_procfs(void) +{ + proc_net_skbrecycler = proc_mkdir("skb_recycler", init_net.proc_net); + if (!proc_net_skbrecycler) { + pr_err("cannot create skb_recycle proc dir"); + return; + } + + if (!proc_create("count", + S_IRUGO, + proc_net_skbrecycler, + &proc_skb_count_fops)) + pr_err("cannot create proc net skb_recycle held\n"); + + if (!proc_create("flush", + S_IWUGO, + proc_net_skbrecycler, + &proc_skb_flush_fops)) + pr_err("cannot create proc net skb_recycle flush\n"); + + if (!proc_create("max_skbs", + S_IRUGO | S_IWUGO, + proc_net_skbrecycler, + &proc_skb_max_skbs_fops)) + pr_err("cannot create proc net skb_recycle max_skbs\n"); + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + if (!proc_create("max_spare_skbs", + S_IRUGO | S_IWUGO, + proc_net_skbrecycler, + &proc_skb_max_spare_skbs_fops)) + pr_err("cannot create proc net skb_recycle max_spare_skbs\n"); +#endif +} + +void __init skb_recycler_init(void) +{ + int cpu; +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + unsigned int i; +#endif + + for_each_possible_cpu(cpu) { + skb_queue_head_init(&per_cpu(recycle_list, cpu)); + } + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + for_each_possible_cpu(cpu) { + skb_queue_head_init(&per_cpu(recycle_spare_list, cpu)); + } + + spin_lock_init(&glob_recycler.lock); + + for (i = 0; i < SKB_RECYCLE_MAX_SHARED_POOLS; i++) + skb_queue_head_init(&glob_recycler.pool[i]); + glob_recycler.head = 0; + glob_recycler.tail = 0; +#endif + +#ifdef CONFIG_SKB_RECYCLER_PREALLOC + if (skb_prealloc_init_list()) + pr_err("Failed to preallocate SKBs for recycle list\n"); +#endif + cpuhp_setup_state_nocalls(CPUHP_SKB_RECYCLER_DEAD, "net/skbuff_recycler:dead:",NULL, skb_cpu_callback); + skbuff_debugobj_register_callback(); + skb_recycler_init_procfs(); +} + +void skb_recycler_print_all_lists(void) +{ + unsigned long flags; + int cpu; +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU + int i; + struct sk_buff_head *h; + + cpu = get_cpu(); + spin_lock_irqsave(&glob_recycler.lock, flags); + for (i = 0; i < SKB_RECYCLE_MAX_SHARED_POOLS; i++) + skbuff_debugobj_print_skb_list((&glob_recycler.pool[i])->next, + "Global Pool", -1); + spin_unlock_irqrestore(&glob_recycler.lock, flags); + + preempt_disable(); + local_irq_save(flags); + + h = &per_cpu(recycle_spare_list, cpu); + skbuff_debugobj_print_skb_list(h->next, "Recycle Spare", cpu); + + local_irq_restore(flags); + preempt_enable(); +#endif + + preempt_disable(); + local_irq_save(flags); + h = &per_cpu(recycle_list, cpu); + skbuff_debugobj_print_skb_list(h->next, "Recycle List", cpu); + + local_irq_restore(flags); + preempt_enable(); +} + +#ifdef SKB_FAST_RECYCLABLE_DEBUG_ENABLE +/** + * consume_skb_can_fast_recycle_debug - Debug API to flag any sanity check + * failures on a fast recycled skb + * @skb: buffer to be checked + * @min_skb_size: minimum skb size allowed + * @max_skb_size: maximum skb size allowed + * + * Returns false with warning message if any of the checks fail + */ +static inline bool consume_skb_can_fast_recycle_debug(const struct sk_buff *skb, + int min_skb_size, int max_skb_size) +{ + if (unlikely(irqs_disabled())) { + WARN(1, "skb_debug: irqs_disabled for skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_DEV_ZEROCOPY)) { + WARN(1, "skb_debug: ZEROCOPY flag set for skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb_is_nonlinear(skb))) { + WARN(1, "skb_debug: non-linear skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb_shinfo(skb)->frag_list)) { + WARN(1, "skb_debug: set frag_list for skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb_shinfo(skb)->nr_frags)) { + WARN(1, "skb_debug: set nr_frags for skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb->fclone != SKB_FCLONE_UNAVAILABLE)) { + WARN(1, "skb_debug: FCLONE available for skb = 0x%p \n", skb); + return false; + } + min_skb_size = SKB_DATA_ALIGN(min_skb_size + NET_SKB_PAD); + if (unlikely(skb_end_pointer(skb) - skb->head < min_skb_size)) { + WARN(1, "skb_debug: invalid min size for skb = 0x%p \n", skb); + return false; + } + max_skb_size = SKB_DATA_ALIGN(max_skb_size + NET_SKB_PAD); + if (unlikely(skb_end_pointer(skb) - skb->head > max_skb_size)) { + WARN(1, "skb_debug: invalid max size for skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb_cloned(skb))) { + WARN(1, "skb_debug: cloned skb = 0x%p \n", skb); + return false; + } + if (unlikely(skb_pfmemalloc(skb))) { + WARN(1, "skb_debug: enabled pfmemalloc for skb = 0x%p \n", skb); + return false; + } + if (skb->_skb_refdst) { + WARN(1, "skb_debug: _skb_refdst flag enabled = 0x%p \n", skb); + return false; + } + if (skb->destructor) { + WARN(1, "skb_debug: destructor flag enabled = 0x%p \n", skb); + return false; + } + if (skb->active_extensions) { + WARN(1, "skb_debug: active_extensions flag enabled = 0x%p \n", + skb); + return false; + } +#if IS_ENABLED(CONFIG_NF_CONNTRACK) + if (skb->_nfct & NFCT_PTRMASK) { + WARN(1, "skb_debug: nfctinfo bits set for skb = 0x%p \n", skb); + return false; + } +#endif + return true; +} + +/** + * check_skb_fast_recyclable - Debug API to flag any sanity check failures + * on a fast recycled skb + * @skb: buffer to be checked + * + * Checks skb recyclability + */ +void check_skb_fast_recyclable(struct sk_buff *skb) +{ + bool check = true; + check = consume_skb_can_fast_recycle_debug(skb, SKB_RECYCLE_MIN_SIZE, SKB_RECYCLE_MAX_SIZE); + if (!check) + BUG_ON(1); +} +EXPORT_SYMBOL(check_skb_fast_recyclable); +#endif diff --git a/target/linux/qualcommax/files/net/core/skbuff_recycle.h b/target/linux/qualcommax/files/net/core/skbuff_recycle.h new file mode 100644 index 00000000000000..cbbc3ee1f0d6ee --- /dev/null +++ b/target/linux/qualcommax/files/net/core/skbuff_recycle.h @@ -0,0 +1,178 @@ +/* + * Copyright (c) 2013-2017, The Linux Foundation. All rights reserved. + * + * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + * + */ +/* Definitions for the skb recycler functions */ + +#ifndef _LINUX_SKBUFF_RECYCLE_H +#define _LINUX_SKBUFF_RECYCLE_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#ifdef CONFIG_NET_CLS_ACT +#include +#endif +#include +#include +#include +#include +#include +#include + +#define SKB_RECYCLE_SIZE 2304 +#define SKB_RECYCLE_MIN_SIZE SKB_RECYCLE_SIZE +#define SKB_RECYCLE_MAX_SIZE SKB_RECYCLE_SIZE +#define SKB_RECYCLE_MAX_SKBS 1024 + +#define SKB_RECYCLE_SPARE_MAX_SKBS 256 + +#ifdef CONFIG_SKB_RECYCLER_PREALLOC +#define SKB_RECYCLE_MAX_PREALLOC_SKBS CONFIG_SKB_RECYCLE_MAX_PREALLOC_SKBS +#define SKB_RECYCLE_MAX_SHARED_POOLS \ + DIV_ROUND_UP(SKB_RECYCLE_MAX_PREALLOC_SKBS, \ + SKB_RECYCLE_SPARE_MAX_SKBS) +#else +#define SKB_RECYCLE_MAX_SHARED_POOLS 8 +#endif + +#define SKB_RECYCLE_MAX_SHARED_POOLS_MASK \ + (SKB_RECYCLE_MAX_SHARED_POOLS - 1) + +#ifdef CONFIG_SKB_RECYCLER_MULTI_CPU +struct global_recycler { + /* Global circular list which holds the shared skb pools */ + struct sk_buff_head pool[SKB_RECYCLE_MAX_SHARED_POOLS]; + u8 head; /* head of the circular list */ + u8 tail; /* tail of the circular list */ + spinlock_t lock; +}; +#endif + +static __always_inline void zero_struct(void *v, int size) +{ + u32 *s = (u32 *)v; + + /* We assume that size is word aligned; in fact, it's constant */ + WARN_ON((size & 3) != 0); + + /* This looks odd but we "know" size is a constant, and so the + * compiler can fold away all of the conditionals. The compiler is + * pretty smart here, and can fold away the loop, too! + */ + while (size > 0) { + if (size >= 4) + s[0] = 0; + if (size >= 8) + s[1] = 0; + if (size >= 12) + s[2] = 0; + if (size >= 16) + s[3] = 0; + if (size >= 20) + s[4] = 0; + if (size >= 24) + s[5] = 0; + if (size >= 28) + s[6] = 0; + if (size >= 32) + s[7] = 0; + if (size >= 36) + s[8] = 0; + if (size >= 40) + s[9] = 0; + if (size >= 44) + s[10] = 0; + if (size >= 48) + s[11] = 0; + if (size >= 52) + s[12] = 0; + if (size >= 56) + s[13] = 0; + if (size >= 60) + s[14] = 0; + if (size >= 64) + s[15] = 0; + size -= 64; + s += 16; + } +} + +static inline bool consume_skb_can_recycle(const struct sk_buff *skb, + int min_skb_size, int max_skb_size) +{ + if (unlikely(irqs_disabled())) + return false; + + if (unlikely(skb_shinfo(skb)->tx_flags & SKBFL_ZEROCOPY_ENABLE)) + return false; + + if (unlikely(skb->head_frag)) + return false; + + if (unlikely(skb_is_nonlinear(skb))) + return false; + + if (unlikely(skb_shinfo(skb)->frag_list)) + return false; + + if (unlikely(skb_shinfo(skb)->nr_frags)) + return false; + + if (unlikely(skb->fclone != SKB_FCLONE_UNAVAILABLE)) + return false; + + min_skb_size = SKB_DATA_ALIGN(min_skb_size + NET_SKB_PAD); + if (unlikely(skb_end_pointer(skb) - skb->head < min_skb_size)) + return false; + + max_skb_size = SKB_DATA_ALIGN(max_skb_size + NET_SKB_PAD); + if (unlikely(skb_end_pointer(skb) - skb->head > max_skb_size)) + return false; + + if (unlikely(skb_cloned(skb))) + return false; + + if (unlikely(skb_pfmemalloc(skb))) + return false; + + return true; +} + +#ifdef CONFIG_SKB_RECYCLER +void __init skb_recycler_init(void); +struct sk_buff *skb_recycler_alloc(struct net_device *dev, unsigned int length); +bool skb_recycler_consume(struct sk_buff *skb); +bool skb_recycler_consume_list_fast(struct sk_buff_head *skb_list); +void skb_recycler_print_all_lists(void); +#else +#define skb_recycler_init() {} +#define skb_recycler_alloc(dev, len) NULL +#define skb_recycler_consume(skb) false +#define skb_recycler_consume_list_fast(skb_list) false +#define skb_recycler_print_all_lists() false +#endif +#endif From 83ee649ecbfc6034a2eb502b8967d0986b798463 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 24 Mar 2024 21:33:21 -0400 Subject: [PATCH 68/80] qualcommax: Move QCE to user selectable module The performance of Qualcomm Crypto Engine is 10x slower than kernel based encryption via ARMv8 crypto extensions. Rather than building it into the kernel allow users to select it as module which can be tested with other HW based crypto APIs via cryptodev-linux. --- package/kernel/linux/modules/crypto.mk | 17 +++++++++++++++++ target/linux/qualcommax/config-6.6 | 12 ++++++------ 2 files changed, 23 insertions(+), 6 deletions(-) diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk index 4a8a283d377321..f448ea4cb7900f 100644 --- a/package/kernel/linux/modules/crypto.mk +++ b/package/kernel/linux/modules/crypto.mk @@ -1159,3 +1159,20 @@ endef $(eval $(call KernelPackage,crypto-xts)) +define KernelPackage/crypto-qce + TITLE:=QTI Crypto Engine (QCE) + KCONFIG:= \ + CONFIG_CRYPTO_DEV_QCE \ + CONFIG_CRYPTO_DEV_QCE_AEAD=y \ + CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y \ + CONFIG_CRYPTO_DEV_QCE_SHA=y \ + CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y \ + CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512 + FILES:= \ + $(LINUX_DIR)/drivers/crypto/qce/qcrypto.ko + AUTOLOAD:=$(call AutoLoad,09,qcrypto) + DEPENDS:=@TARGET_qualcommax +kmod-crypto-manager +kmod-crypto-hash +kmod-crypto-des + $(call AddDepends/crypto) +endef + +$(eval $(call KernelPackage,crypto-qce)) diff --git a/target/linux/qualcommax/config-6.6 b/target/linux/qualcommax/config-6.6 index bbe5009473ae10..ca90fd924ed187 100644 --- a/target/linux/qualcommax/config-6.6 +++ b/target/linux/qualcommax/config-6.6 @@ -101,15 +101,15 @@ CONFIG_CRC8=y CONFIG_CRYPTO_AUTHENC=y CONFIG_CRYPTO_CBC=y CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_DEV_QCE=y -CONFIG_CRYPTO_DEV_QCE_AEAD=y +# CONFIG_CRYPTO_DEV_QCE=y +# CONFIG_CRYPTO_DEV_QCE_AEAD=y # CONFIG_CRYPTO_DEV_QCE_ENABLE_AEAD is not set -CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y +# CONFIG_CRYPTO_DEV_QCE_ENABLE_ALL=y # CONFIG_CRYPTO_DEV_QCE_ENABLE_SHA is not set # CONFIG_CRYPTO_DEV_QCE_ENABLE_SKCIPHER is not set -CONFIG_CRYPTO_DEV_QCE_SHA=y -CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y -CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512 +# CONFIG_CRYPTO_DEV_QCE_SHA=y +# CONFIG_CRYPTO_DEV_QCE_SKCIPHER=y +# CONFIG_CRYPTO_DEV_QCE_SW_MAX_LEN=512 CONFIG_CRYPTO_DEV_QCOM_RNG=y CONFIG_CRYPTO_ECB=y CONFIG_CRYPTO_HASH_INFO=y From 70d5b9f12bbb2de3bdc7610851f73a3077bd6672 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 24 Mar 2024 22:44:54 -0400 Subject: [PATCH 69/80] qualcommax: NSS: kernel 6.6 support --- package/kernel/linux/modules/netfilter.mk | 1 + target/linux/qualcommax/config-6.6 | 22 +- .../files/net/core/skbuff_recycle.c | 5 + ...added-for-necessary-clocks-and-reset.patch | 311 +++++++ ...-gcc_snoc_bus_timeout_ahb_clk-offset.patch | 44 + ...074-Fix-gcc_blsp1_ahb_clk-properties.patch | 41 + .../0600-1-qca-nss-ecm-support-CORE.patch | 865 +++++++++++++++++ ...x-IPv6-user-route-change-event-calls.patch | 87 ++ ...-2-qca-nss-ecm-support-PPPOE-offload.patch | 600 ++++++++++++ ...00-3-qca-nss-ecm-support-net-bonding.patch | 46 + ...pport-net-bonding-over-LAG-interface.patch | 685 ++++++++++++++ .../0600-5-qca-nss-ecm-support-macvlan.patch | 96 ++ ...nss-ecm-support-netfilter-DSCPREMARK.patch | 154 +++ ...601-1-qca-add-nss-bridge-mgr-support.patch | 92 ++ ...0602-1-qca-nss-drv-add-qdisc-support.patch | 25 + ...-1-qca-nss-clients-add-qdisc-support.patch | 463 +++++++++ ...3-2-qca-nss-clients-add-l2tp-support.patch | 46 + ...3-3-qca-nss-clients-add-PPTP-support.patch | 478 ++++++++++ ...qca-nss-clients-add-iptunnel-support.patch | 77 ++ ...-5-qca-nss-clients-add-vxlan-support.patch | 103 ++ ...-clients-add-l2tp-offloading-support.patch | 368 ++++++++ ...a-nss-clients-iptunnel-lock-this-cpu.patch | 22 + ...-qca-nss-clients-add-tls-mgr-support.patch | 24 + .../0604-1-qca-add-mcs-support.patch | 876 ++++++++++++++++++ .../0605-1-qca-nss-cfi-support.patch | 111 +++ ..._ecache-Fix-NSS-ECM-BRK-kernel-panic.patch | 10 + .../9990-1-qca-skb_recycler-support.patch | 396 ++++++++ ...-api-disallow-identical-driver-names.patch | 10 + .../9999-silence-UBI-NAND-warnings.patch | 13 + 29 files changed, 6067 insertions(+), 4 deletions(-) create mode 100644 target/linux/qualcommax/patches-6.6/0170-clk-qcom-ipq8074-Support-added-for-necessary-clocks-and-reset.patch create mode 100644 target/linux/qualcommax/patches-6.6/0171-1-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-offset.patch create mode 100644 target/linux/qualcommax/patches-6.6/0171-2-clk-qcom-ipq8074-Fix-gcc_blsp1_ahb_clk-properties.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-PPPOE-offload.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-3-qca-nss-ecm-support-net-bonding.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-4-qca-nss-ecm-support-net-bonding-over-LAG-interface.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-5-qca-nss-ecm-support-macvlan.patch create mode 100644 target/linux/qualcommax/patches-6.6/0600-6-qca-nss-ecm-support-netfilter-DSCPREMARK.patch create mode 100644 target/linux/qualcommax/patches-6.6/0601-1-qca-add-nss-bridge-mgr-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0602-1-qca-nss-drv-add-qdisc-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-1-qca-nss-clients-add-qdisc-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-2-qca-nss-clients-add-l2tp-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-3-qca-nss-clients-add-PPTP-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-4-qca-nss-clients-add-iptunnel-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-5-qca-nss-clients-add-vxlan-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-6-qca-nss-clients-add-l2tp-offloading-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-7-qca-nss-clients-iptunnel-lock-this-cpu.patch create mode 100644 target/linux/qualcommax/patches-6.6/0603-8-qca-nss-clients-add-tls-mgr-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch create mode 100644 target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch create mode 100644 target/linux/qualcommax/patches-6.6/9999-revert-crypto-api-disallow-identical-driver-names.patch create mode 100644 target/linux/qualcommax/patches-6.6/9999-silence-UBI-NAND-warnings.patch diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index da3e69e49ac6f1..42d29d485a3915 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -312,6 +312,7 @@ $(eval $(call KernelPackage,ipt-offload)) define KernelPackage/ipt-ipopt TITLE:=Modules for matching/changing IP packet options KCONFIG:=$(KCONFIG_IPT_IPOPT) + DEPENDS:=+PACKAGE_kmod-nf-conntrack:kmod-nf-conntrack FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_IPOPT-m))) $(call AddDepends/ipt) diff --git a/target/linux/qualcommax/config-6.6 b/target/linux/qualcommax/config-6.6 index ca90fd924ed187..8b6c100be8eb12 100644 --- a/target/linux/qualcommax/config-6.6 +++ b/target/linux/qualcommax/config-6.6 @@ -44,6 +44,8 @@ CONFIG_ARM64_WORKAROUND_TSB_FLUSH_FAILURE=y CONFIG_ARM_AMBA=y CONFIG_ARM_ARCH_TIMER=y CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +# CONFIG_ARM_SMMU_V3_PMU is not set +# CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_PMU is not set CONFIG_ARM_GIC=y CONFIG_ARM_GIC_V2M=y CONFIG_ARM_GIC_V3=y @@ -78,11 +80,11 @@ CONFIG_COREDUMP=y CONFIG_CPUFREQ_DT=y CONFIG_CPUFREQ_DT_PLATDEV=y CONFIG_CPU_FREQ=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set CONFIG_CPU_FREQ_GOV_ATTR_SET=y # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_ONDEMAND=y CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y @@ -125,6 +127,8 @@ CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_SHA256=y +# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set +# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set CONFIG_CRYPTO_XTS=y CONFIG_CRYPTO_ZSTD=y CONFIG_DCACHE_WORD_ACCESS=y @@ -192,6 +196,11 @@ CONFIG_HAS_IOPORT=y CONFIG_HAS_IOPORT_MAP=y CONFIG_HWSPINLOCK=y CONFIG_HWSPINLOCK_QCOM=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_MSM=y +CONFIG_HZ=1000 +# CONFIG_HZ_100 is not set +CONFIG_HZ_1000=y CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_CHARDEV=y @@ -375,7 +384,12 @@ CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y CONFIG_POWER_RESET=y # CONFIG_POWER_RESET_MSM is not set CONFIG_POWER_SUPPLY=y -CONFIG_PREEMPT_NONE_BUILD=y +CONFIG_PREEMPT=y +CONFIG_PREEMPT_COUNT=y +# CONFIG_PREEMPT_DYNAMIC is not set +# CONFIG_PREEMPT_NONE_BUILD is not set +# CONFIG_PREEMPT_NONE is not set +CONFIG_PREEMPT_RCU=y CONFIG_PRINTK_TIME=y CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_QCA807X_PHY=y diff --git a/target/linux/qualcommax/files/net/core/skbuff_recycle.c b/target/linux/qualcommax/files/net/core/skbuff_recycle.c index 41add8d3098fca..cbcbc46c70d0a5 100644 --- a/target/linux/qualcommax/files/net/core/skbuff_recycle.c +++ b/target/linux/qualcommax/files/net/core/skbuff_recycle.c @@ -18,6 +18,7 @@ #include "skbuff_recycle.h" #include #include +#include #include "skbuff_debug.h" @@ -279,7 +280,11 @@ static void skb_recycler_free_skb(struct sk_buff_head *list) skbuff_debugobj_activate(skb); next = skb->next; __skb_unlink(skb, list); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,2,0) + skb_release_data(skb, SKB_CONSUMED, false); +#else skb_release_data(skb); +#endif kfree_skbmem(skb); /* * Update the skb->sum for next due to skb_link operation diff --git a/target/linux/qualcommax/patches-6.6/0170-clk-qcom-ipq8074-Support-added-for-necessary-clocks-and-reset.patch b/target/linux/qualcommax/patches-6.6/0170-clk-qcom-ipq8074-Support-added-for-necessary-clocks-and-reset.patch new file mode 100644 index 00000000000000..76cc8caac9a412 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0170-clk-qcom-ipq8074-Support-added-for-necessary-clocks-and-reset.patch @@ -0,0 +1,311 @@ +From 6504bc9edeb1a2a54d813f4bb5d0267e7bf827f9 Mon Sep 17 00:00:00 2001 +From: Praveenkumar I +Date: Thu, 6 Feb 2020 17:35:42 +0530 +Subject: [PATCH 4/8] clk: ipq8074: Support added for necessary clocks and + reset + +Change-Id: I21a76a44185f766e9b6dcba274392ea8e599718b +Signed-off-by: Praveenkumar I +Signed-off-by: Rajkumar Ayyasamy +--- + drivers/clk/qcom/gcc-ipq8074.c | 238 ++++++++++++++++++- + include/dt-bindings/clock/qcom,gcc-ipq8074.h | 35 ++- + 2 files changed, 258 insertions(+), 15 deletions(-) + +--- a/drivers/clk/qcom/gcc-ipq8074.c ++++ b/drivers/clk/qcom/gcc-ipq8074.c +@@ -48,6 +48,22 @@ enum { + P_UNIPHY2_TX, + }; + ++static const char * const gcc_xo_gpll4_gpll0_gpll6_gpll0_div2[] = { ++ "xo", ++ "gpll4", ++ "gpll0", ++ "gpll6", ++ "gpll0_out_main_div2", ++}; ++ ++static const struct parent_map gcc_xo_gpll4_gpll0_gpll6_gpll0_div2_map[] = { ++ { P_XO, 0 }, ++ { P_GPLL4, 1 }, ++ { P_GPLL0, 2 }, ++ { P_GPLL6, 3 }, ++ { P_GPLL0_DIV2, 4 }, ++}; ++ + static struct clk_alpha_pll gpll0_main = { + .offset = 0x21000, + .regs = clk_alpha_pll_regs[CLK_ALPHA_PLL_TYPE_DEFAULT], +@@ -629,6 +645,12 @@ static const struct freq_tbl ftbl_pcie_a + { } + }; + ++struct freq_tbl ftbl_pcie_rchng_clk_src[] = { ++ F(19200000, P_XO, 1, 0, 0), ++ F(100000000, P_GPLL0, 8, 0, 0), ++ { } ++}; ++ + static struct clk_rcg2 pcie0_axi_clk_src = { + .cmd_rcgr = 0x75054, + .freq_tbl = ftbl_pcie_axi_clk_src, +@@ -2029,6 +2051,78 @@ static struct clk_rcg2 gp3_clk_src = { + }, + }; + ++struct freq_tbl ftbl_qdss_tsctr_clk_src[] = { ++ F(160000000, P_GPLL0_DIV2, 2.5, 0, 0), ++ F(320000000, P_GPLL0, 2.5, 0, 0), ++ F(600000000, P_GPLL6, 2, 0, 0), ++ { } ++}; ++ ++struct clk_rcg2 qdss_tsctr_clk_src = { ++ .cmd_rcgr = 0x29064, ++ .freq_tbl = ftbl_qdss_tsctr_clk_src, ++ .hid_width = 5, ++ .parent_map = gcc_xo_gpll4_gpll0_gpll6_gpll0_div2_map, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .name = "qdss_tsctr_clk_src", ++ .parent_names = gcc_xo_gpll4_gpll0_gpll6_gpll0_div2, ++ .num_parents = 5, ++ .ops = &clk_rcg2_ops, ++ }, ++}; ++ ++static struct clk_fixed_factor qdss_dap_sync_clk_src = { ++ .mult = 1, ++ .div = 4, ++ .hw.init = &(struct clk_init_data){ ++ .name = "qdss_dap_sync_clk_src", ++ .parent_names = (const char *[]){ ++ "qdss_tsctr_clk_src" ++ }, ++ .num_parents = 1, ++ .ops = &clk_fixed_factor_ops, ++ }, ++}; ++ ++struct freq_tbl ftbl_qdss_at_clk_src[] = { ++ F(66670000, P_GPLL0_DIV2, 6, 0, 0), ++ F(240000000, P_GPLL6, 6, 0, 0), ++ { } ++}; ++ ++struct clk_rcg2 qdss_at_clk_src = { ++ .cmd_rcgr = 0x2900c, ++ .freq_tbl = ftbl_qdss_at_clk_src, ++ .hid_width = 5, ++ .parent_map = gcc_xo_gpll4_gpll0_gpll6_gpll0_div2_map, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .name = "qdss_at_clk_src", ++ .parent_names = gcc_xo_gpll4_gpll0_gpll6_gpll0_div2, ++ .num_parents = 5, ++ .ops = &clk_rcg2_ops, ++ }, ++}; ++ ++ ++struct freq_tbl ftbl_adss_pwm_clk_src[] = { ++ F(19200000, P_XO, 1, 0, 0), ++ F(200000000, P_GPLL0, 4, 0, 0), ++ { } ++}; ++ ++struct clk_rcg2 adss_pwm_clk_src = { ++ .cmd_rcgr = 0x1c008, ++ .freq_tbl = ftbl_adss_pwm_clk_src, ++ .hid_width = 5, ++ .parent_map = gcc_xo_gpll0_map, ++ .clkr.hw.init = &(struct clk_init_data){ ++ .name = "adss_pwm_clk_src", ++ .parent_data = gcc_xo_gpll0, ++ .num_parents = 2, ++ .ops = &clk_rcg2_ops, ++ }, ++}; ++ + static struct clk_branch gcc_blsp1_ahb_clk = { + .halt_reg = 0x01008, + .clkr = { +@@ -4224,13 +4318,7 @@ static struct clk_branch gcc_gp3_clk = { + }, + }; + +-static const struct freq_tbl ftbl_pcie_rchng_clk_src[] = { +- F(19200000, P_XO, 1, 0, 0), +- F(100000000, P_GPLL0, 8, 0, 0), +- { } +-}; +- +-static struct clk_rcg2 pcie0_rchng_clk_src = { ++struct clk_rcg2 pcie0_rchng_clk_src = { + .cmd_rcgr = 0x75070, + .freq_tbl = ftbl_pcie_rchng_clk_src, + .hid_width = 5, +@@ -4322,6 +4410,114 @@ static const struct alpha_pll_config nss + .alpha_en_mask = BIT(24), + }; + ++static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = { ++ .halt_reg = 0x4700c, ++ .halt_bit = 31, ++ .clkr = { ++ .enable_reg = 0x4700c, ++ .enable_mask = BIT(0), ++ .hw.init = &(struct clk_init_data){ ++ .name = "gcc_snoc_bus_timeout2_ahb_clk", ++ .parent_names = (const char *[]){ ++ "usb0_master_clk_src" ++ }, ++ .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, ++ .ops = &clk_branch2_ops, ++ }, ++ }, ++}; ++ ++static struct clk_branch gcc_snoc_bus_timeout3_ahb_clk = { ++ .halt_reg = 0x47014, ++ .halt_bit = 31, ++ .clkr = { ++ .enable_reg = 0x47014, ++ .enable_mask = BIT(0), ++ .hw.init = &(struct clk_init_data){ ++ .name = "gcc_snoc_bus_timeout3_ahb_clk", ++ .parent_names = (const char *[]){ ++ "usb1_master_clk_src" ++ }, ++ .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, ++ .ops = &clk_branch2_ops, ++ }, ++ }, ++}; ++ ++static struct clk_branch gcc_dcc_clk = { ++ .halt_reg = 0x77004, ++ .halt_bit = 31, ++ .clkr = { ++ .enable_reg = 0x77004, ++ .enable_mask = BIT(0), ++ .hw.init = &(struct clk_init_data){ ++ .name = "gcc_dcc_clk", ++ .parent_names = (const char *[]){ ++ "pcnoc_clk_src" ++ }, ++ .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, ++ .ops = &clk_branch2_ops, ++ }, ++ }, ++}; ++ ++static struct clk_branch gcc_qdss_at_clk = { ++ .halt_reg = 0x29024, ++ .halt_bit = 31, ++ .clkr = { ++ .enable_reg = 0x29024, ++ .enable_mask = BIT(0), ++ .hw.init = &(struct clk_init_data){ ++ .name = "gcc_qdss_at_clk", ++ .parent_names = (const char *[]){ ++ "qdss_at_clk_src" ++ }, ++ .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, ++ .ops = &clk_branch2_ops, ++ }, ++ }, ++}; ++ ++static struct clk_branch gcc_qdss_dap_clk = { ++ .halt_reg = 0x29084, ++ .halt_bit = 31, ++ .clkr = { ++ .enable_reg = 0x29084, ++ .enable_mask = BIT(0), ++ .hw.init = &(struct clk_init_data){ ++ .name = "gcc_qdss_dap_clk", ++ .parent_names = (const char *[]){ ++ "qdss_dap_sync_clk_src" ++ }, ++ .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, ++ .ops = &clk_branch2_ops, ++ }, ++ }, ++}; ++ ++static struct clk_branch gcc_adss_pwm_clk = { ++ .halt_reg = 0x1c020, ++ .halt_bit = 31, ++ .clkr = { ++ .enable_reg = 0x1c020, ++ .enable_mask = BIT(0), ++ .hw.init = &(struct clk_init_data){ ++ .name = "gcc_adss_pwm_clk", ++ .parent_names = (const char *[]){ ++ "adss_pwm_clk_src" ++ }, ++ .num_parents = 1, ++ .flags = CLK_SET_RATE_PARENT, ++ .ops = &clk_branch2_ops, ++ }, ++ }, ++}; ++ + static struct clk_hw *gcc_ipq8074_hws[] = { + &gpll0_out_main_div2.hw, + &gpll6_out_main_div2.hw, +@@ -4330,6 +4526,7 @@ static struct clk_hw *gcc_ipq8074_hws[] + &gcc_xo_div4_clk_src.hw, + &nss_noc_clk_src.hw, + &nss_ppe_cdiv_clk_src.hw, ++ &qdss_dap_sync_clk_src.hw, + }; + + static struct clk_regmap *gcc_ipq8074_clks[] = { +@@ -4561,6 +4758,15 @@ static struct clk_regmap *gcc_ipq8074_cl + [GCC_PCIE0_RCHNG_CLK] = &gcc_pcie0_rchng_clk.clkr, + [GCC_PCIE0_AXI_S_BRIDGE_CLK] = &gcc_pcie0_axi_s_bridge_clk.clkr, + [GCC_CRYPTO_PPE_CLK] = &gcc_crypto_ppe_clk.clkr, ++ [GCC_SNOC_BUS_TIMEOUT2_AHB_CLK] = &gcc_snoc_bus_timeout2_ahb_clk.clkr, ++ [GCC_SNOC_BUS_TIMEOUT3_AHB_CLK] = &gcc_snoc_bus_timeout3_ahb_clk.clkr, ++ [GCC_DCC_CLK] = &gcc_dcc_clk.clkr, ++ [QDSS_TSCTR_CLK_SRC] = &qdss_tsctr_clk_src.clkr, ++ [QDSS_AT_CLK_SRC] = &qdss_at_clk_src.clkr, ++ [GCC_QDSS_AT_CLK] = &gcc_qdss_at_clk.clkr, ++ [GCC_QDSS_DAP_CLK] = &gcc_qdss_dap_clk.clkr, ++ [ADSS_PWM_CLK_SRC] = &adss_pwm_clk_src.clkr, ++ [GCC_ADSS_PWM_CLK] = &gcc_adss_pwm_clk.clkr, + }; + + static const struct qcom_reset_map gcc_ipq8074_resets[] = { +--- a/include/dt-bindings/clock/qcom,gcc-ipq8074.h ++++ b/include/dt-bindings/clock/qcom,gcc-ipq8074.h +@@ -230,10 +230,19 @@ + #define GCC_GP1_CLK 221 + #define GCC_GP2_CLK 222 + #define GCC_GP3_CLK 223 +-#define GCC_PCIE0_AXI_S_BRIDGE_CLK 224 +-#define GCC_PCIE0_RCHNG_CLK_SRC 225 +-#define GCC_PCIE0_RCHNG_CLK 226 +-#define GCC_CRYPTO_PPE_CLK 227 ++#define GCC_CRYPTO_PPE_CLK 224 ++#define GCC_PCIE0_RCHNG_CLK_SRC 225 ++#define GCC_PCIE0_RCHNG_CLK 226 ++#define GCC_PCIE0_AXI_S_BRIDGE_CLK 227 ++#define GCC_SNOC_BUS_TIMEOUT2_AHB_CLK 228 ++#define GCC_SNOC_BUS_TIMEOUT3_AHB_CLK 229 ++#define GCC_DCC_CLK 230 ++#define ADSS_PWM_CLK_SRC 231 ++#define GCC_ADSS_PWM_CLK 232 ++#define QDSS_TSCTR_CLK_SRC 233 ++#define QDSS_AT_CLK_SRC 234 ++#define GCC_QDSS_AT_CLK 235 ++#define GCC_QDSS_DAP_CLK 236 + + #define GCC_BLSP1_BCR 0 + #define GCC_BLSP1_QUP1_BCR 1 diff --git a/target/linux/qualcommax/patches-6.6/0171-1-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-offset.patch b/target/linux/qualcommax/patches-6.6/0171-1-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-offset.patch new file mode 100644 index 00000000000000..b1393fc9ad43c2 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0171-1-clk-qcom-ipq8074-Fix-gcc_snoc_bus_timeout_ahb_clk-offset.patch @@ -0,0 +1,44 @@ +From 462aa0c53397ec5bf78e3e7f68aa8a3ca300f4ba Mon Sep 17 00:00:00 2001 +From: Selvam Sathappan Periakaruppan +Date: Tue, 24 Mar 2020 19:09:38 +0530 +Subject: [PATCH 5/8] clk: qcom: ipq8074: Fix gcc_snoc_bus_timeout_ahb_clk + offset + +By default, the ipq8074 V2 clks are provided in the gcc driver. +Updating the gcc_snoc_bus_timeout_ahb_clk offsets also as needed +in ipq8074 V2. + +Change-Id: I5a6e98d002f5c3354a804e55dd9ebb1f83f7f974 +Signed-off-by: Selvam Sathappan Periakaruppan +--- + drivers/clk/qcom/gcc-ipq8074.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +--- a/drivers/clk/qcom/gcc-ipq8074.c ++++ b/drivers/clk/qcom/gcc-ipq8074.c +@@ -4411,10 +4411,10 @@ static const struct alpha_pll_config nss + }; + + static struct clk_branch gcc_snoc_bus_timeout2_ahb_clk = { +- .halt_reg = 0x4700c, ++ .halt_reg = 0x47014, + .halt_bit = 31, + .clkr = { +- .enable_reg = 0x4700c, ++ .enable_reg = 0x47014, + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data){ + .name = "gcc_snoc_bus_timeout2_ahb_clk", +@@ -4429,10 +4429,10 @@ static struct clk_branch gcc_snoc_bus_ti + }; + + static struct clk_branch gcc_snoc_bus_timeout3_ahb_clk = { +- .halt_reg = 0x47014, ++ .halt_reg = 0x4701C, + .halt_bit = 31, + .clkr = { +- .enable_reg = 0x47014, ++ .enable_reg = 0x4701C, + .enable_mask = BIT(0), + .hw.init = &(struct clk_init_data){ + .name = "gcc_snoc_bus_timeout3_ahb_clk", diff --git a/target/linux/qualcommax/patches-6.6/0171-2-clk-qcom-ipq8074-Fix-gcc_blsp1_ahb_clk-properties.patch b/target/linux/qualcommax/patches-6.6/0171-2-clk-qcom-ipq8074-Fix-gcc_blsp1_ahb_clk-properties.patch new file mode 100644 index 00000000000000..a7abddd5fddf18 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0171-2-clk-qcom-ipq8074-Fix-gcc_blsp1_ahb_clk-properties.patch @@ -0,0 +1,41 @@ +From 52315bec6ed633b6a71f28b746029602f8bd70b9 Mon Sep 17 00:00:00 2001 +From: Balaji Prakash J +Date: Wed, 22 Apr 2020 20:35:30 +0530 +Subject: [PATCH] clk: ipq8074: fix gcc_blsp1_ahb_clk properties + +All the voting enabled clocks does not support the enable +from CBCR register. So, updated gcc_blsp1_ahb_clk enable +register and mask to enable bit in APCS_CLOCK_BRANCH_ENA_VOTE. + +Also, the voting controlled clocks are shared among multiple +components like APSS, RPM, NSS, TZ, etc. So, turning the +voting off from APSS does not make the clock off if it has +been voted from another component. Added the flag +BRANCH_HALT_VOTED in order to skip checking the clock +disable status. + +This change is referred from the below commits, +1. 246b4fb3af9bd65d8af794aac2f0e7b1ed9cc2dd +2. c8374157d5ae91d3b3e0d513d62808a798b32d3a + +Signed-off-by: Balaji Prakash J +Change-Id: I505cb560b31ad27a02c165fbe13bb33a2fc7d230 +--- + drivers/clk/qcom/gcc-ipq8074.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +--- a/drivers/clk/qcom/gcc-ipq8074.c ++++ b/drivers/clk/qcom/gcc-ipq8074.c +@@ -2125,9 +2125,10 @@ struct clk_rcg2 adss_pwm_clk_src = { + + static struct clk_branch gcc_blsp1_ahb_clk = { + .halt_reg = 0x01008, ++ .halt_check = BRANCH_HALT_VOTED, + .clkr = { +- .enable_reg = 0x01008, +- .enable_mask = BIT(0), ++ .enable_reg = 0x0b004, ++ .enable_mask = BIT(10), + .hw.init = &(struct clk_init_data){ + .name = "gcc_blsp1_ahb_clk", + .parent_hws = (const struct clk_hw *[]){ diff --git a/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch b/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch new file mode 100644 index 00000000000000..21006721e11666 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch @@ -0,0 +1,865 @@ +--- a/include/linux/if_bridge.h ++++ b/include/linux/if_bridge.h +@@ -71,6 +71,9 @@ void brioctl_set(int (*hook)(struct net + void __user *uarg)); + int br_ioctl_call(struct net *net, struct net_bridge *br, unsigned int cmd, + struct ifreq *ifr, void __user *uarg); ++extern void br_dev_update_stats(struct net_device *dev, ++ struct rtnl_link_stats64 *nlstats); ++extern bool br_is_hairpin_enabled(struct net_device *dev); + + #if IS_ENABLED(CONFIG_BRIDGE) && IS_ENABLED(CONFIG_BRIDGE_IGMP_SNOOPING) + int br_multicast_list_adjacent(struct net_device *dev, +@@ -213,4 +216,42 @@ static inline clock_t br_get_ageing_time + } + #endif + ++/* QCA NSS ECM support - Start */ ++extern struct net_device *br_port_dev_get(struct net_device *dev, ++ unsigned char *addr, ++ struct sk_buff *skb, ++ unsigned int cookie); ++extern void br_refresh_fdb_entry(struct net_device *dev, const char *addr); ++extern void br_fdb_entry_refresh(struct net_device *dev, const char *addr, __u16 vid); ++extern struct net_bridge_fdb_entry *br_fdb_has_entry(struct net_device *dev, ++ const char *addr, ++ __u16 vid); ++extern void br_fdb_update_register_notify(struct notifier_block *nb); ++extern void br_fdb_update_unregister_notify(struct notifier_block *nb); ++ ++typedef struct net_bridge_port *br_port_dev_get_hook_t(struct net_device *dev, ++ struct sk_buff *skb, ++ unsigned char *addr, ++ unsigned int cookie); ++extern br_port_dev_get_hook_t __rcu *br_port_dev_get_hook; ++ ++#define BR_FDB_EVENT_ADD 0x01 ++#define BR_FDB_EVENT_DEL 0x02 ++ ++struct br_fdb_event { ++ struct net_device *dev; ++ unsigned char addr[6]; ++ unsigned char is_local; ++ struct net_bridge *br; ++ struct net_device *orig_dev; ++}; ++extern void br_fdb_register_notify(struct notifier_block *nb); ++extern void br_fdb_unregister_notify(struct notifier_block *nb); ++ ++typedef struct net_bridge_port *br_get_dst_hook_t( ++ const struct net_bridge_port *src, ++ struct sk_buff **skb); ++extern br_get_dst_hook_t __rcu *br_get_dst_hook; ++/* QCA NSS ECM support - End */ ++ + #endif +--- a/include/linux/if_vlan.h ++++ b/include/linux/if_vlan.h +@@ -143,7 +143,10 @@ extern struct net_device *__vlan_find_de + extern int vlan_for_each(struct net_device *dev, + int (*action)(struct net_device *dev, int vid, + void *arg), void *arg); ++extern void __vlan_dev_update_accel_stats(struct net_device *dev, ++ struct rtnl_link_stats64 *stats); /* QCA NSS ECM support */ + extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); ++extern struct net_device *vlan_dev_next_dev(const struct net_device *dev); /* QCA NSS ECM support */ + extern u16 vlan_dev_vlan_id(const struct net_device *dev); + extern __be16 vlan_dev_vlan_proto(const struct net_device *dev); + +@@ -236,6 +239,12 @@ extern void vlan_vids_del_by_dev(struct + extern bool vlan_uses_dev(const struct net_device *dev); + + #else ++static inline void __vlan_dev_update_accel_stats(struct net_device *dev, ++ struct rtnl_link_stats64 *stats) ++{ ++ ++} /* QCA NSS ECM support */ ++ + static inline struct net_device * + __vlan_find_dev_deep_rcu(struct net_device *real_dev, + __be16 vlan_proto, u16 vlan_id) +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -2936,6 +2936,10 @@ enum netdev_cmd { + NETDEV_OFFLOAD_XSTATS_REPORT_USED, + NETDEV_OFFLOAD_XSTATS_REPORT_DELTA, + NETDEV_XDP_FEAT_CHANGE, ++ /* QCA NSS ECM Support - Start */ ++ NETDEV_BR_JOIN, ++ NETDEV_BR_LEAVE, ++ /* QCA NSS ECM Support - End */ + }; + const char *netdev_cmd_to_name(enum netdev_cmd cmd); + +--- a/include/net/ip6_route.h ++++ b/include/net/ip6_route.h +@@ -207,6 +207,11 @@ void rt6_multipath_rebalance(struct fib6 + void rt6_uncached_list_add(struct rt6_info *rt); + void rt6_uncached_list_del(struct rt6_info *rt); + ++/* QCA NSS ECM support - Start */ ++int rt6_register_notifier(struct notifier_block *nb); ++int rt6_unregister_notifier(struct notifier_block *nb); ++/* QCA NSS ECM support - End */ ++ + static inline const struct rt6_info *skb_rt6_info(const struct sk_buff *skb) + { + const struct dst_entry *dst = skb_dst(skb); +--- a/include/net/neighbour.h ++++ b/include/net/neighbour.h +@@ -249,6 +249,13 @@ static inline int neigh_parms_family(str + return p->tbl->family; + } + ++/* QCA NSS ECM support - Start */ ++struct neigh_mac_update { ++ unsigned char old_mac[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))]; ++ unsigned char update_mac[ALIGN(MAX_ADDR_LEN, sizeof(unsigned long))]; ++}; ++/* QCA NSS ECM support - End */ ++ + #define NEIGH_PRIV_ALIGN sizeof(long long) + #define NEIGH_ENTRY_SIZE(size) ALIGN((size), NEIGH_PRIV_ALIGN) + +@@ -395,6 +402,11 @@ void __neigh_for_each_release(struct nei + int (*cb)(struct neighbour *)); + int neigh_xmit(int fam, struct net_device *, const void *, struct sk_buff *); + ++/* QCA NSS ECM support - Start */ ++extern void neigh_mac_update_register_notify(struct notifier_block *nb); ++extern void neigh_mac_update_unregister_notify(struct notifier_block *nb); ++/* QCA NSS ECM support - End */ ++ + struct neigh_seq_state { + struct seq_net_private p; + struct neigh_table *tbl; +@@ -600,4 +612,5 @@ static inline void neigh_update_is_route + *notify = 1; + } + } ++ + #endif +--- a/include/net/route.h ++++ b/include/net/route.h +@@ -237,6 +237,11 @@ struct rtable *rt_dst_alloc(struct net_d + unsigned int flags, u16 type, bool noxfrm); + struct rtable *rt_dst_clone(struct net_device *dev, struct rtable *rt); + ++/* QCA NSS ECM support - Start */ ++int ip_rt_register_notifier(struct notifier_block *nb); ++int ip_rt_unregister_notifier(struct notifier_block *nb); ++/* QCA NSS ECM support - End */ ++ + struct in_ifaddr; + void fib_add_ifaddr(struct in_ifaddr *); + void fib_del_ifaddr(struct in_ifaddr *, struct in_ifaddr *); +--- a/net/bridge/br_private.h ++++ b/net/bridge/br_private.h +@@ -2266,4 +2266,6 @@ void br_do_suppress_nd(struct sk_buff *s + u16 vid, struct net_bridge_port *p, struct nd_msg *msg); + struct nd_msg *br_is_nd_neigh_msg(struct sk_buff *skb, struct nd_msg *m); + bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid); ++#define __br_get(__hook, __default, __args ...) \ ++ (__hook ? (__hook(__args)) : (__default)) /* QCA NSS ECM support */ + #endif +--- a/net/8021q/vlan_core.c ++++ b/net/8021q/vlan_core.c +@@ -72,6 +72,28 @@ bool vlan_do_receive(struct sk_buff **sk + return true; + } + ++/* QCA NSS ECM support - Start */ ++/* Update the VLAN device with statistics from network offload engines */ ++void __vlan_dev_update_accel_stats(struct net_device *dev, ++ struct rtnl_link_stats64 *nlstats) ++{ ++ struct vlan_pcpu_stats *stats; ++ ++ if (!is_vlan_dev(dev)) ++ return; ++ ++ stats = per_cpu_ptr(vlan_dev_priv(dev)->vlan_pcpu_stats, 0); ++ ++ u64_stats_update_begin(&stats->syncp); ++ u64_stats_add(&stats->rx_packets, nlstats->rx_packets); ++ u64_stats_add(&stats->rx_bytes, nlstats->rx_bytes); ++ u64_stats_add(&stats->tx_packets, nlstats->tx_packets); ++ u64_stats_add(&stats->tx_bytes, nlstats->tx_bytes); ++ u64_stats_update_end(&stats->syncp); ++} ++EXPORT_SYMBOL(__vlan_dev_update_accel_stats); ++/* QCA NSS ECM support - End */ ++ + /* Must be invoked with rcu_read_lock. */ + struct net_device *__vlan_find_dev_deep_rcu(struct net_device *dev, + __be16 vlan_proto, u16 vlan_id) +@@ -110,6 +132,15 @@ struct net_device *vlan_dev_real_dev(con + } + EXPORT_SYMBOL(vlan_dev_real_dev); + ++/* QCA NSS ECM support - Start */ ++/* Caller is responsible to hold the reference of the returned device */ ++struct net_device *vlan_dev_next_dev(const struct net_device *dev) ++{ ++ return vlan_dev_priv(dev)->real_dev; ++} ++EXPORT_SYMBOL(vlan_dev_next_dev); ++/* QCA NSS ECM support - End */ ++ + u16 vlan_dev_vlan_id(const struct net_device *dev) + { + return vlan_dev_priv(dev)->vlan_id; +--- a/net/bridge/br_fdb.c ++++ b/net/bridge/br_fdb.c +@@ -33,6 +33,20 @@ static const struct rhashtable_params br + + static struct kmem_cache *br_fdb_cache __read_mostly; + ++ATOMIC_NOTIFIER_HEAD(br_fdb_notifier_list); ++ ++void br_fdb_register_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_register(&br_fdb_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(br_fdb_register_notify); ++ ++void br_fdb_unregister_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_unregister(&br_fdb_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(br_fdb_unregister_notify); ++ + int __init br_fdb_init(void) + { + br_fdb_cache = kmem_cache_create("bridge_fdb_cache", +@@ -195,6 +209,25 @@ static void fdb_notify(struct net_bridge + if (swdev_notify) + br_switchdev_fdb_notify(br, fdb, type); + ++ /* QCA NSS ECM support - Start */ ++ if (fdb->dst) { ++ int event; ++ struct br_fdb_event fdb_event; ++ ++ if (type == RTM_NEWNEIGH) ++ event = BR_FDB_EVENT_ADD; ++ else ++ event = BR_FDB_EVENT_DEL; ++ ++ fdb_event.dev = fdb->dst->dev; ++ ether_addr_copy(fdb_event.addr, fdb->key.addr.addr); ++ fdb_event.is_local = test_bit(BR_FDB_LOCAL, &fdb->flags); ++ atomic_notifier_call_chain(&br_fdb_notifier_list, ++ event, ++ (void *)&fdb_event); ++ } ++ /* QCA NSS ECM support - End */ ++ + skb = nlmsg_new(fdb_nlmsg_size(), GFP_ATOMIC); + if (skb == NULL) + goto errout; +@@ -519,6 +552,22 @@ out: + spin_unlock_bh(&br->hash_lock); + } + ++/* QCA NSS ECM support - Start */ ++ATOMIC_NOTIFIER_HEAD(br_fdb_update_notifier_list); ++ ++void br_fdb_update_register_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_register(&br_fdb_update_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(br_fdb_update_register_notify); ++ ++void br_fdb_update_unregister_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_unregister(&br_fdb_update_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(br_fdb_update_unregister_notify); ++/* QCA NSS ECM support - End */ ++ + void br_fdb_cleanup(struct work_struct *work) + { + struct net_bridge *br = container_of(work, struct net_bridge, +@@ -527,6 +576,7 @@ void br_fdb_cleanup(struct work_struct * + unsigned long delay = hold_time(br); + unsigned long work_delay = delay; + unsigned long now = jiffies; ++ u8 mac_addr[6]; /* QCA NSS ECM support */ + + /* this part is tricky, in order to avoid blocking learning and + * consequently forwarding, we rely on rcu to delete objects with +@@ -553,8 +603,15 @@ void br_fdb_cleanup(struct work_struct * + work_delay = min(work_delay, this_timer - now); + } else { + spin_lock_bh(&br->hash_lock); +- if (!hlist_unhashed(&f->fdb_node)) ++ if (!hlist_unhashed(&f->fdb_node)) { ++ ether_addr_copy(mac_addr, f->key.addr.addr); + fdb_delete(br, f, true); ++ /* QCA NSS ECM support - Start */ ++ atomic_notifier_call_chain( ++ &br_fdb_update_notifier_list, 0, ++ (void *)mac_addr); ++ /* QCA NSS ECM support - End */ ++ } + spin_unlock_bh(&br->hash_lock); + } + } +@@ -891,6 +948,12 @@ void br_fdb_update(struct net_bridge *br + */ + if (unlikely(test_bit(BR_FDB_LOCKED, &fdb->flags))) + clear_bit(BR_FDB_LOCKED, &fdb->flags); ++ ++ /* QCA NSS ECM support - Start */ ++ atomic_notifier_call_chain( ++ &br_fdb_update_notifier_list, ++ 0, (void *)addr); ++ /* QCA NSS ECM support - End */ + } + + if (unlikely(test_bit(BR_FDB_ADDED_BY_USER, &flags))) +@@ -914,6 +977,64 @@ void br_fdb_update(struct net_bridge *br + } + } + ++/* QCA NSS ECM support - Start */ ++/* Refresh FDB entries for bridge packets being forwarded by offload engines */ ++void br_refresh_fdb_entry(struct net_device *dev, const char *addr) ++{ ++ struct net_bridge_port *p = br_port_get_rcu(dev); ++ ++ if (!p || p->state == BR_STATE_DISABLED) ++ return; ++ ++ if (!is_valid_ether_addr(addr)) { ++ pr_info("bridge: Attempt to refresh with invalid ether address %pM\n", ++ addr); ++ return; ++ } ++ ++ rcu_read_lock(); ++ br_fdb_update(p->br, p, addr, 0, true); ++ rcu_read_unlock(); ++} ++EXPORT_SYMBOL_GPL(br_refresh_fdb_entry); ++ ++/* Update timestamp of FDB entries for bridge packets being forwarded by offload engines */ ++void br_fdb_entry_refresh(struct net_device *dev, const char *addr, __u16 vid) ++{ ++ struct net_bridge_fdb_entry *fdb; ++ struct net_bridge_port *p = br_port_get_rcu(dev); ++ ++ if (!p || p->state == BR_STATE_DISABLED) ++ return; ++ ++ rcu_read_lock(); ++ fdb = fdb_find_rcu(&p->br->fdb_hash_tbl, addr, vid); ++ if (likely(fdb)) { ++ fdb->updated = jiffies; ++ } ++ rcu_read_unlock(); ++} ++EXPORT_SYMBOL_GPL(br_fdb_entry_refresh); ++ ++/* Look up the MAC address in the device's bridge fdb table */ ++struct net_bridge_fdb_entry *br_fdb_has_entry(struct net_device *dev, ++ const char *addr, __u16 vid) ++{ ++ struct net_bridge_port *p = br_port_get_rcu(dev); ++ struct net_bridge_fdb_entry *fdb; ++ ++ if (!p || p->state == BR_STATE_DISABLED) ++ return NULL; ++ ++ rcu_read_lock(); ++ fdb = fdb_find_rcu(&p->br->fdb_hash_tbl, addr, vid); ++ rcu_read_unlock(); ++ ++ return fdb; ++} ++EXPORT_SYMBOL_GPL(br_fdb_has_entry); ++ ++/* QCA NSS ECM support - End */ + /* Dump information about entries, in response to GETNEIGH */ + int br_fdb_dump(struct sk_buff *skb, + struct netlink_callback *cb, +--- a/net/bridge/br_if.c ++++ b/net/bridge/br_if.c +@@ -26,6 +26,12 @@ + + #include "br_private.h" + ++/* QCA NSS ECM support - Start */ ++/* Hook for external forwarding logic */ ++br_port_dev_get_hook_t __rcu *br_port_dev_get_hook __read_mostly; ++EXPORT_SYMBOL_GPL(br_port_dev_get_hook); ++/* QCA NSS ECM support - End */ ++ + /* + * Determine initial path cost based on speed. + * using recommendations from 802.1d standard +@@ -697,6 +703,8 @@ int br_add_if(struct net_bridge *br, str + + kobject_uevent(&p->kobj, KOBJ_ADD); + ++ call_netdevice_notifiers(NETDEV_BR_JOIN, dev); /* QCA NSS ECM support */ ++ + return 0; + + err6: +@@ -732,6 +740,8 @@ int br_del_if(struct net_bridge *br, str + if (!p || p->br != br) + return -EINVAL; + ++ call_netdevice_notifiers(NETDEV_BR_LEAVE, dev); /* QCA NSS ECM support */ ++ + /* Since more than one interface can be attached to a bridge, + * there still maybe an alternate path for netconsole to use; + * therefore there is no reason for a NETDEV_RELEASE event. +@@ -775,3 +785,97 @@ bool br_port_flag_is_set(const struct ne + return p->flags & flag; + } + EXPORT_SYMBOL_GPL(br_port_flag_is_set); ++ ++/* br_port_dev_get() ++ * If a skb is provided, and the br_port_dev_get_hook_t hook exists, ++ * use that to try and determine the egress port for that skb. ++ * If not, or no egress port could be determined, use the given addr ++ * to identify the port to which it is reachable, ++ * returing a reference to the net device associated with that port. ++ * ++ * NOTE: Return NULL if given dev is not a bridge or the mac has no ++ * associated port. ++ */ ++struct net_device *br_port_dev_get(struct net_device *dev, unsigned char *addr, ++ struct sk_buff *skb, ++ unsigned int cookie) ++{ ++ struct net_bridge_fdb_entry *fdbe; ++ struct net_bridge *br; ++ struct net_device *netdev = NULL; ++ ++ /* Is this a bridge? */ ++ if (!(dev->priv_flags & IFF_EBRIDGE)) ++ return NULL; ++ ++ rcu_read_lock(); ++ ++ /* If the hook exists and the skb isn't NULL, try and get the port */ ++ if (skb) { ++ br_port_dev_get_hook_t *port_dev_get_hook; ++ ++ port_dev_get_hook = rcu_dereference(br_port_dev_get_hook); ++ if (port_dev_get_hook) { ++ struct net_bridge_port *pdst = ++ __br_get(port_dev_get_hook, NULL, dev, skb, ++ addr, cookie); ++ if (pdst) { ++ dev_hold(pdst->dev); ++ netdev = pdst->dev; ++ goto out; ++ } ++ } ++ } ++ ++ /* Either there is no hook, or can't ++ * determine the port to use - fall back to using FDB ++ */ ++ ++ br = netdev_priv(dev); ++ ++ /* Lookup the fdb entry and get reference to the port dev */ ++ fdbe = br_fdb_find_rcu(br, addr, 0); ++ if (fdbe && fdbe->dst) { ++ netdev = fdbe->dst->dev; /* port device */ ++ dev_hold(netdev); ++ } ++out: ++ rcu_read_unlock(); ++ return netdev; ++} ++EXPORT_SYMBOL_GPL(br_port_dev_get); ++ ++/* Update bridge statistics for bridge packets processed by offload engines */ ++void br_dev_update_stats(struct net_device *dev, ++ struct rtnl_link_stats64 *nlstats) ++{ ++ struct pcpu_sw_netstats *tstats; ++ ++ /* Is this a bridge? */ ++ if (!(dev->priv_flags & IFF_EBRIDGE)) ++ return; ++ ++ tstats = this_cpu_ptr(dev->tstats); ++ ++ u64_stats_update_begin(&tstats->syncp); ++ u64_stats_add(&tstats->rx_packets, nlstats->rx_packets); ++ u64_stats_add(&tstats->rx_bytes, nlstats->rx_bytes); ++ u64_stats_add(&tstats->tx_packets, nlstats->tx_packets); ++ u64_stats_add(&tstats->tx_bytes, nlstats->tx_bytes); ++ u64_stats_update_end(&tstats->syncp); ++} ++EXPORT_SYMBOL_GPL(br_dev_update_stats); ++ ++/* QCA NSS ECM support - Start */ ++/* API to know if hairpin feature is enabled/disabled on this bridge port */ ++bool br_is_hairpin_enabled(struct net_device *dev) ++{ ++ struct net_bridge_port *port = br_port_get_check_rcu(dev); ++ ++ if (likely(port)) ++ return port->flags & BR_HAIRPIN_MODE; ++ return false; ++} ++EXPORT_SYMBOL_GPL(br_is_hairpin_enabled); ++ ++/* QCA NSS ECM support - End */ +--- a/net/core/neighbour.c ++++ b/net/core/neighbour.c +@@ -1275,6 +1275,22 @@ static void neigh_update_hhs(struct neig + } + } + ++/* QCA NSS ECM support - Start */ ++ATOMIC_NOTIFIER_HEAD(neigh_mac_update_notifier_list); ++ ++void neigh_mac_update_register_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_register(&neigh_mac_update_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(neigh_mac_update_register_notify); ++ ++void neigh_mac_update_unregister_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_unregister(&neigh_mac_update_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(neigh_mac_update_unregister_notify); ++/* QCA NSS ECM support - End */ ++ + /* Generic update routine. + -- lladdr is new lladdr or NULL, if it is not supplied. + -- new is new state. +@@ -1303,6 +1319,7 @@ static int __neigh_update(struct neighbo + struct net_device *dev; + int err, notify = 0; + u8 old; ++ struct neigh_mac_update nmu; /* QCA NSS ECM support */ + + trace_neigh_update(neigh, lladdr, new, flags, nlmsg_pid); + +@@ -1317,7 +1334,10 @@ static int __neigh_update(struct neighbo + new = old; + goto out; + } +- if (!(flags & NEIGH_UPDATE_F_ADMIN) && ++ ++ memset(&nmu, 0, sizeof(struct neigh_mac_update)); /* QCA NSS ECM support */ ++ ++ if (!(flags & NEIGH_UPDATE_F_ADMIN) && + (old & (NUD_NOARP | NUD_PERMANENT))) + goto out; + +@@ -1354,7 +1374,12 @@ static int __neigh_update(struct neighbo + - compare new & old + - if they are different, check override flag + */ +- if ((old & NUD_VALID) && ++ /* QCA NSS ECM update - Start */ ++ memcpy(nmu.old_mac, neigh->ha, dev->addr_len); ++ memcpy(nmu.update_mac, lladdr, dev->addr_len); ++ /* QCA NSS ECM update - End */ ++ ++ if ((old & NUD_VALID) && + !memcmp(lladdr, neigh->ha, dev->addr_len)) + lladdr = neigh->ha; + } else { +@@ -1476,8 +1501,11 @@ out: + neigh_update_gc_list(neigh); + if (managed_update) + neigh_update_managed_list(neigh); +- if (notify) ++ if (notify) { + neigh_update_notify(neigh, nlmsg_pid); ++ atomic_notifier_call_chain(&neigh_mac_update_notifier_list, 0, ++ (struct neigh_mac_update *)&nmu); /* QCA NSS ECM support */ ++ } + trace_neigh_update_done(neigh, err); + return err; + } +--- a/net/ipv4/fib_trie.c ++++ b/net/ipv4/fib_trie.c +@@ -1211,6 +1211,9 @@ static bool fib_valid_key_len(u32 key, u + static void fib_remove_alias(struct trie *t, struct key_vector *tp, + struct key_vector *l, struct fib_alias *old); + ++/* Define route change notification chain. */ ++static BLOCKING_NOTIFIER_HEAD(iproute_chain); /* QCA NSS ECM support */ ++ + /* Caller must hold RTNL. */ + int fib_table_insert(struct net *net, struct fib_table *tb, + struct fib_config *cfg, struct netlink_ext_ack *extack) +@@ -1404,6 +1407,9 @@ int fib_table_insert(struct net *net, st + rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, new_fa->tb_id, + &cfg->fc_nlinfo, nlflags); + succeeded: ++ blocking_notifier_call_chain(&iproute_chain, ++ RTM_NEWROUTE, fi); ++ + return 0; + + out_remove_new_fa: +@@ -1775,6 +1781,9 @@ int fib_table_delete(struct net *net, st + if (fa_to_delete->fa_state & FA_S_ACCESSED) + rt_cache_flush(cfg->fc_nlinfo.nl_net); + ++ blocking_notifier_call_chain(&iproute_chain, ++ RTM_DELROUTE, fa_to_delete->fa_info); ++ + fib_release_info(fa_to_delete->fa_info); + alias_free_mem_rcu(fa_to_delete); + return 0; +@@ -2407,6 +2416,20 @@ void __init fib_trie_init(void) + 0, SLAB_PANIC | SLAB_ACCOUNT, NULL); + } + ++/* QCA NSS ECM support - Start */ ++int ip_rt_register_notifier(struct notifier_block *nb) ++{ ++ return blocking_notifier_chain_register(&iproute_chain, nb); ++} ++EXPORT_SYMBOL(ip_rt_register_notifier); ++ ++int ip_rt_unregister_notifier(struct notifier_block *nb) ++{ ++ return blocking_notifier_chain_unregister(&iproute_chain, nb); ++} ++EXPORT_SYMBOL(ip_rt_unregister_notifier); ++/* QCA NSS ECM support - End */ ++ + struct fib_table *fib_trie_table(u32 id, struct fib_table *alias) + { + struct fib_table *tb; +--- a/net/ipv6/ndisc.c ++++ b/net/ipv6/ndisc.c +@@ -666,6 +666,7 @@ void ndisc_send_ns(struct net_device *de + if (skb) + ndisc_send_skb(skb, daddr, saddr); + } ++EXPORT_SYMBOL(ndisc_send_ns); + + void ndisc_send_rs(struct net_device *dev, const struct in6_addr *saddr, + const struct in6_addr *daddr) +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -197,6 +197,9 @@ static void rt6_uncached_list_flush_dev( + } + } + ++/* Define route change notification chain. */ ++ATOMIC_NOTIFIER_HEAD(ip6route_chain); /* QCA NSS ECM support */ ++ + static inline const void *choose_neigh_daddr(const struct in6_addr *p, + struct sk_buff *skb, + const void *daddr) +@@ -3864,6 +3867,10 @@ int ip6_route_add(struct fib6_config *cf + return PTR_ERR(rt); + + err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack); ++ if (!err) ++ atomic_notifier_call_chain(&ip6route_chain, ++ RTM_NEWROUTE, rt); ++ + fib6_info_release(rt); + + return err; +@@ -3885,6 +3892,9 @@ static int __ip6_del_rt(struct fib6_info + err = fib6_del(rt, info); + spin_unlock_bh(&table->tb6_lock); + ++ if (!err) ++ atomic_notifier_call_chain(&ip6route_chain, ++ RTM_DELROUTE, rt); + out: + fib6_info_release(rt); + return err; +@@ -6329,6 +6339,20 @@ static int ip6_route_dev_notify(struct n + return NOTIFY_OK; + } + ++/* QCA NSS ECM support - Start */ ++int rt6_register_notifier(struct notifier_block *nb) ++{ ++ return atomic_notifier_chain_register(&ip6route_chain, nb); ++} ++EXPORT_SYMBOL(rt6_register_notifier); ++ ++int rt6_unregister_notifier(struct notifier_block *nb) ++{ ++ return atomic_notifier_chain_unregister(&ip6route_chain, nb); ++} ++EXPORT_SYMBOL(rt6_unregister_notifier); ++/* QCA NSS ECM support - End */ ++ + /* + * /proc + */ +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -1673,6 +1673,7 @@ const char *netdev_cmd_to_name(enum netd + N(PRE_CHANGEADDR) N(OFFLOAD_XSTATS_ENABLE) N(OFFLOAD_XSTATS_DISABLE) + N(OFFLOAD_XSTATS_REPORT_USED) N(OFFLOAD_XSTATS_REPORT_DELTA) + N(XDP_FEAT_CHANGE) ++ N(BR_JOIN) N(BR_LEAVE) + } + #undef N + return "UNKNOWN_NETDEV_EVENT"; +--- a/net/ipv6/addrconf.c ++++ b/net/ipv6/addrconf.c +@@ -1002,6 +1002,7 @@ void inet6_ifa_finish_destroy(struct ine + + kfree_rcu(ifp, rcu); + } ++EXPORT_SYMBOL(inet6_ifa_finish_destroy); + + static void + ipv6_link_dev_addr(struct inet6_dev *idev, struct inet6_ifaddr *ifp) +--- a/include/net/vxlan.h ++++ b/include/net/vxlan.h +@@ -440,6 +440,15 @@ static inline __be32 vxlan_compute_rco(u + return vni_field; + } + ++/* ++ * vxlan_get_vni() ++ * Returns the vni corresponding to tunnel ++ */ ++static inline u32 vxlan_get_vni(struct vxlan_dev *vxlan_tun) ++{ ++ return be32_to_cpu(vxlan_tun->cfg.vni); ++} ++ + static inline unsigned short vxlan_get_sk_family(struct vxlan_sock *vs) + { + return vs->sock->sk->sk_family; +--- a/include/uapi/linux/in.h ++++ b/include/uapi/linux/in.h +@@ -63,6 +63,8 @@ enum { + #define IPPROTO_MTP IPPROTO_MTP + IPPROTO_BEETPH = 94, /* IP option pseudo header for BEET */ + #define IPPROTO_BEETPH IPPROTO_BEETPH ++ IPPROTO_ETHERIP = 97, /* ETHERIP protocol number */ ++#define IPPROTO_ETHERIP IPPROTO_ETHERIP + IPPROTO_ENCAP = 98, /* Encapsulation Header */ + #define IPPROTO_ENCAP IPPROTO_ENCAP + IPPROTO_PIM = 103, /* Protocol Independent Multicast */ +@@ -327,7 +329,7 @@ struct sockaddr_in { + #endif + + /* contains the htonl type stuff.. */ +-#include ++#include + + + #endif /* _UAPI_LINUX_IN_H */ +--- a/tools/include/uapi/linux/in.h ++++ b/tools/include/uapi/linux/in.h +@@ -63,6 +63,8 @@ enum { + #define IPPROTO_MTP IPPROTO_MTP + IPPROTO_BEETPH = 94, /* IP option pseudo header for BEET */ + #define IPPROTO_BEETPH IPPROTO_BEETPH ++ IPPROTO_ETHERIP = 97, /* ETHERIP protocol number */ ++#define IPPROTO_ETHERIP IPPROTO_ETHERIP + IPPROTO_ENCAP = 98, /* Encapsulation Header */ + #define IPPROTO_ENCAP IPPROTO_ENCAP + IPPROTO_PIM = 103, /* Protocol Independent Multicast */ +@@ -327,7 +329,7 @@ struct sockaddr_in { + #endif + + /* contains the htonl type stuff.. */ +-#include ++#include + + + #endif /* _UAPI_LINUX_IN_H */ +--- a/include/net/netns/conntrack.h ++++ b/include/net/netns/conntrack.h +@@ -26,6 +26,7 @@ struct nf_tcp_net { + unsigned int timeouts[TCP_CONNTRACK_TIMEOUT_MAX]; + u8 tcp_loose; + u8 tcp_be_liberal; ++ u8 tcp_no_window_check; + u8 tcp_max_retrans; + u8 tcp_ignore_invalid_rst; + #if IS_ENABLED(CONFIG_NF_FLOW_TABLE) +--- a/net/netfilter/nf_conntrack_proto_tcp.c ++++ b/net/netfilter/nf_conntrack_proto_tcp.c +@@ -515,11 +515,15 @@ tcp_in_window(struct nf_conn *ct, enum i + struct ip_ct_tcp *state = &ct->proto.tcp; + struct ip_ct_tcp_state *sender = &state->seen[dir]; + struct ip_ct_tcp_state *receiver = &state->seen[!dir]; ++ const struct nf_tcp_net *tn = nf_tcp_pernet(nf_ct_net(ct)); + __u32 seq, ack, sack, end, win, swin; + bool in_recv_win, seq_ok; + s32 receiver_offset; + u16 win_raw; + ++ if (tn->tcp_no_window_check) ++ return NFCT_TCP_ACCEPT; ++ + /* + * Get the required data from the packet. + */ +@@ -1285,7 +1289,7 @@ int nf_conntrack_tcp_packet(struct nf_co + IP_CT_TCP_FLAG_DATA_UNACKNOWLEDGED && + timeouts[new_state] > timeouts[TCP_CONNTRACK_UNACK]) + timeout = timeouts[TCP_CONNTRACK_UNACK]; +- else if (ct->proto.tcp.last_win == 0 && ++ else if (!tn->tcp_no_window_check && ct->proto.tcp.last_win == 0 && + timeouts[new_state] > timeouts[TCP_CONNTRACK_RETRANS]) + timeout = timeouts[TCP_CONNTRACK_RETRANS]; + else +@@ -1601,6 +1605,9 @@ void nf_conntrack_tcp_init_net(struct ne + */ + tn->tcp_be_liberal = 0; + ++ /* Skip Windows Check */ ++ tn->tcp_no_window_check = 0; ++ + /* If it's non-zero, we turn off RST sequence number check */ + tn->tcp_ignore_invalid_rst = 0; + +--- a/net/netfilter/nf_conntrack_standalone.c ++++ b/net/netfilter/nf_conntrack_standalone.c +@@ -633,6 +633,7 @@ enum nf_ct_sysctl_index { + #endif + NF_SYSCTL_CT_PROTO_TCP_LOOSE, + NF_SYSCTL_CT_PROTO_TCP_LIBERAL, ++ NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK, + NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST, + NF_SYSCTL_CT_PROTO_TCP_MAX_RETRANS, + NF_SYSCTL_CT_PROTO_TIMEOUT_UDP, +@@ -840,6 +841,14 @@ static struct ctl_table nf_ct_sysctl_tab + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, ++ [NF_SYSCTL_CT_PROTO_TCP_NO_WINDOW_CHECK] = { ++ .procname = "nf_conntrack_tcp_no_window_check", ++ .maxlen = sizeof(u8), ++ .mode = 0644, ++ .proc_handler = proc_dou8vec_minmax, ++ .extra1 = SYSCTL_ZERO, ++ .extra2 = SYSCTL_ONE, ++ }, + [NF_SYSCTL_CT_PROTO_TCP_IGNORE_INVALID_RST] = { + .procname = "nf_conntrack_tcp_ignore_invalid_rst", + .maxlen = sizeof(u8), +@@ -1050,6 +1059,7 @@ static void nf_conntrack_standalone_init + + XASSIGN(LOOSE, &tn->tcp_loose); + XASSIGN(LIBERAL, &tn->tcp_be_liberal); ++ XASSIGN(NO_WINDOW_CHECK, &tn->tcp_no_window_check); + XASSIGN(MAX_RETRANS, &tn->tcp_max_retrans); + XASSIGN(IGNORE_INVALID_RST, &tn->tcp_ignore_invalid_rst); + #undef XASSIGN diff --git a/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch b/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch new file mode 100644 index 00000000000000..e3081a79aafdbe --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch @@ -0,0 +1,87 @@ +From ce18a6fdff6a39a01111d74f513d2ef66142047c Mon Sep 17 00:00:00 2001 +From: Murat Sezgin +Date: Wed, 5 Aug 2020 13:21:27 -0700 +Subject: [PATCH 246/281] net:ipv6: Fix IPv6 user route change event calls + +These events should be called only when the route table is +changed by the userspace. So, we should call them in the +ioctl and the netlink message handler function. + +Change-Id: If7ec615014cfc79d5fa72878e49eaf99c2560c32 +Signed-off-by: Murat Sezgin +--- + net/ipv6/route.c | 31 +++++++++++++++++++++---------- + 1 file changed, 21 insertions(+), 10 deletions(-) + +--- a/net/ipv6/route.c ++++ b/net/ipv6/route.c +@@ -3867,10 +3867,6 @@ int ip6_route_add(struct fib6_config *cf + return PTR_ERR(rt); + + err = __ip6_ins_rt(rt, &cfg->fc_nlinfo, extack); +- if (!err) +- atomic_notifier_call_chain(&ip6route_chain, +- RTM_NEWROUTE, rt); +- + fib6_info_release(rt); + + return err; +@@ -3892,9 +3888,6 @@ static int __ip6_del_rt(struct fib6_info + err = fib6_del(rt, info); + spin_unlock_bh(&table->tb6_lock); + +- if (!err) +- atomic_notifier_call_chain(&ip6route_chain, +- RTM_DELROUTE, rt); + out: + fib6_info_release(rt); + return err; +@@ -4500,6 +4493,10 @@ int ipv6_route_ioctl(struct net *net, un + break; + } + rtnl_unlock(); ++ if (!err) ++ atomic_notifier_call_chain(&ip6route_chain, ++ (cmd == SIOCADDRT) ? RTM_NEWROUTE : RTM_DELROUTE, &cfg); ++ + return err; + } + +@@ -5518,11 +5515,17 @@ static int inet6_rtm_delroute(struct sk_ + } + + if (cfg.fc_mp) +- return ip6_route_multipath_del(&cfg, extack); ++ err = ip6_route_multipath_del(&cfg, extack); + else { + cfg.fc_delete_all_nh = 1; +- return ip6_route_del(&cfg, extack); ++ err = ip6_route_del(&cfg, extack); + } ++ ++ if (!err) ++ atomic_notifier_call_chain(&ip6route_chain, ++ RTM_DELROUTE, &cfg); ++ ++ return err; + } + + static int inet6_rtm_newroute(struct sk_buff *skb, struct nlmsghdr *nlh, +@@ -5539,9 +5542,15 @@ static int inet6_rtm_newroute(struct sk_ + cfg.fc_metric = IP6_RT_PRIO_USER; + + if (cfg.fc_mp) +- return ip6_route_multipath_add(&cfg, extack); ++ err = ip6_route_multipath_add(&cfg, extack); + else +- return ip6_route_add(&cfg, GFP_KERNEL, extack); ++ err = ip6_route_add(&cfg, GFP_KERNEL, extack); ++ ++ if (!err) ++ atomic_notifier_call_chain(&ip6route_chain, ++ RTM_NEWROUTE, &cfg); ++ ++ return err; + } + + /* add the overhead of this fib6_nh to nexthop_len */ diff --git a/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-PPPOE-offload.patch b/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-PPPOE-offload.patch new file mode 100644 index 00000000000000..e59290878db29e --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-PPPOE-offload.patch @@ -0,0 +1,600 @@ +--- a/drivers/net/ppp/ppp_generic.c ++++ b/drivers/net/ppp/ppp_generic.c +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -254,6 +255,25 @@ struct ppp_net { + #define seq_before(a, b) ((s32)((a) - (b)) < 0) + #define seq_after(a, b) ((s32)((a) - (b)) > 0) + ++ ++/* ++ * Registration/Unregistration methods ++ * for PPP channel connect and disconnect event notifications. ++ */ ++RAW_NOTIFIER_HEAD(ppp_channel_connection_notifier_list); ++ ++void ppp_channel_connection_register_notify(struct notifier_block *nb) ++{ ++ raw_notifier_chain_register(&ppp_channel_connection_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(ppp_channel_connection_register_notify); ++ ++void ppp_channel_connection_unregister_notify(struct notifier_block *nb) ++{ ++ raw_notifier_chain_unregister(&ppp_channel_connection_notifier_list, nb); ++} ++EXPORT_SYMBOL_GPL(ppp_channel_connection_unregister_notify); ++ + /* Prototypes. */ + static int ppp_unattached_ioctl(struct net *net, struct ppp_file *pf, + struct file *file, unsigned int cmd, unsigned long arg); +@@ -3453,7 +3473,10 @@ ppp_connect_channel(struct channel *pch, + struct ppp_net *pn; + int ret = -ENXIO; + int hdrlen; ++ int ppp_proto; ++ int version; + ++ int notify = 0; + pn = ppp_pernet(pch->chan_net); + + mutex_lock(&pn->all_ppp_mutex); +@@ -3485,13 +3508,40 @@ ppp_connect_channel(struct channel *pch, + ++ppp->n_channels; + pch->ppp = ppp; + refcount_inc(&ppp->file.refcnt); ++ ++ /* Set the netdev priv flag if the prototype ++ * is L2TP or PPTP. Return success in all cases ++ */ ++ if (!pch->chan) ++ goto out2; ++ ++ ppp_proto = ppp_channel_get_protocol(pch->chan); ++ if (ppp_proto == PX_PROTO_PPTP) { ++ ppp->dev->priv_flags_ext |= IFF_EXT_PPP_PPTP; ++ } else if (ppp_proto == PX_PROTO_OL2TP) { ++ version = ppp_channel_get_proto_version(pch->chan); ++ if (version == 2) ++ ppp->dev->priv_flags_ext |= IFF_EXT_PPP_L2TPV2; ++ else if (version == 3) ++ ppp->dev->priv_flags_ext |= IFF_EXT_PPP_L2TPV3; ++ } ++ notify = 1; ++ ++ out2: + ppp_unlock(ppp); + ret = 0; +- + outl: + write_unlock_bh(&pch->upl); + out: + mutex_unlock(&pn->all_ppp_mutex); ++ ++ if (notify && ppp && ppp->dev) { ++ dev_hold(ppp->dev); ++ raw_notifier_call_chain(&ppp_channel_connection_notifier_list, ++ PPP_CHANNEL_CONNECT, ppp->dev); ++ dev_put(ppp->dev); ++ } ++ + return ret; + } + +@@ -3509,6 +3559,13 @@ ppp_disconnect_channel(struct channel *p + pch->ppp = NULL; + write_unlock_bh(&pch->upl); + if (ppp) { ++ if (ppp->dev) { ++ dev_hold(ppp->dev); ++ raw_notifier_call_chain(&ppp_channel_connection_notifier_list, ++ PPP_CHANNEL_DISCONNECT, ppp->dev); ++ dev_put(ppp->dev); ++ } ++ + /* remove it from the ppp unit's list */ + ppp_lock(ppp); + list_del(&pch->clist); +@@ -3588,6 +3645,222 @@ static void *unit_find(struct idr *p, in + return idr_find(p, n); + } + ++/* Updates the PPP interface statistics. */ ++void ppp_update_stats(struct net_device *dev, unsigned long rx_packets, ++ unsigned long rx_bytes, unsigned long tx_packets, ++ unsigned long tx_bytes, unsigned long rx_errors, ++ unsigned long tx_errors, unsigned long rx_dropped, ++ unsigned long tx_dropped) ++{ ++ struct ppp *ppp; ++ ++ if (!dev) ++ return; ++ ++ if (dev->type != ARPHRD_PPP) ++ return; ++ ++ ppp = netdev_priv(dev); ++ ++ ppp_xmit_lock(ppp); ++ ppp->stats64.tx_packets += tx_packets; ++ ppp->stats64.tx_bytes += tx_bytes; ++ ppp->dev->stats.tx_errors += tx_errors; ++ ppp->dev->stats.tx_dropped += tx_dropped; ++ if (tx_packets) ++ ppp->last_xmit = jiffies; ++ ppp_xmit_unlock(ppp); ++ ++ ppp_recv_lock(ppp); ++ ppp->stats64.rx_packets += rx_packets; ++ ppp->stats64.rx_bytes += rx_bytes; ++ ppp->dev->stats.rx_errors += rx_errors; ++ ppp->dev->stats.rx_dropped += rx_dropped; ++ if (rx_packets) ++ ppp->last_recv = jiffies; ++ ppp_recv_unlock(ppp); ++} ++ ++/* Returns >0 if the device is a multilink PPP netdevice, 0 if not or < 0 if ++ * the device is not PPP. ++ */ ++int ppp_is_multilink(struct net_device *dev) ++{ ++ struct ppp *ppp; ++ unsigned int flags; ++ ++ if (!dev) ++ return -1; ++ ++ if (dev->type != ARPHRD_PPP) ++ return -1; ++ ++ ppp = netdev_priv(dev); ++ ppp_lock(ppp); ++ flags = ppp->flags; ++ ppp_unlock(ppp); ++ ++ if (flags & SC_MULTILINK) ++ return 1; ++ ++ return 0; ++} ++EXPORT_SYMBOL(ppp_is_multilink); ++ ++/* ppp_channel_get_protocol() ++ * Call this to obtain the underlying protocol of the PPP channel, ++ * e.g. PX_PROTO_OE ++ * ++ * NOTE: Some channels do not use PX sockets so the protocol value may be very ++ * different for them. ++ * NOTE: -1 indicates failure. ++ * NOTE: Once you know the channel protocol you may then either cast 'chan' to ++ * its sub-class or use the channel protocol specific API's as provided by that ++ * channel sub type. ++ */ ++int ppp_channel_get_protocol(struct ppp_channel *chan) ++{ ++ if (!chan->ops->get_channel_protocol) ++ return -1; ++ ++ return chan->ops->get_channel_protocol(chan); ++} ++EXPORT_SYMBOL(ppp_channel_get_protocol); ++ ++/* ppp_channel_get_proto_version() ++ * Call this to get channel protocol version ++ */ ++int ppp_channel_get_proto_version(struct ppp_channel *chan) ++{ ++ if (!chan->ops->get_channel_protocol_ver) ++ return -1; ++ ++ return chan->ops->get_channel_protocol_ver(chan); ++} ++EXPORT_SYMBOL(ppp_channel_get_proto_version); ++ ++/* ppp_channel_hold() ++ * Call this to hold a channel. ++ * ++ * Returns true on success or false if the hold could not happen. ++ * ++ * NOTE: chan must be protected against destruction during this call - ++ * either by correct locking etc. or because you already have an implicit ++ * or explicit hold to the channel already and this is an additional hold. ++ */ ++bool ppp_channel_hold(struct ppp_channel *chan) ++{ ++ if (!chan->ops->hold) ++ return false; ++ ++ chan->ops->hold(chan); ++ return true; ++} ++EXPORT_SYMBOL(ppp_channel_hold); ++ ++/* ppp_channel_release() ++ * Call this to release a hold you have upon a channel ++ */ ++void ppp_channel_release(struct ppp_channel *chan) ++{ ++ chan->ops->release(chan); ++} ++EXPORT_SYMBOL(ppp_channel_release); ++ ++/* Check if ppp xmit lock is on hold */ ++bool ppp_is_xmit_locked(struct net_device *dev) ++{ ++ struct ppp *ppp; ++ ++ if (!dev) ++ return false; ++ ++ if (dev->type != ARPHRD_PPP) ++ return false; ++ ++ ppp = netdev_priv(dev); ++ if (!ppp) ++ return false; ++ ++ if (spin_is_locked(&(ppp)->wlock)) ++ return true; ++ ++ return false; ++} ++EXPORT_SYMBOL(ppp_is_xmit_locked); ++ ++/* ppp_hold_channels() ++ * Returns the PPP channels of the PPP device, storing each one into ++ * channels[]. ++ * ++ * channels[] has chan_sz elements. ++ * This function returns the number of channels stored, up to chan_sz. ++ * It will return < 0 if the device is not PPP. ++ * ++ * You MUST release the channels using ppp_release_channels(). ++ */ ++int ppp_hold_channels(struct net_device *dev, struct ppp_channel *channels[], ++ unsigned int chan_sz) ++{ ++ struct ppp *ppp; ++ int c; ++ struct channel *pch; ++ ++ if (!dev) ++ return -1; ++ ++ if (dev->type != ARPHRD_PPP) ++ return -1; ++ ++ ppp = netdev_priv(dev); ++ ++ c = 0; ++ ppp_lock(ppp); ++ list_for_each_entry(pch, &ppp->channels, clist) { ++ struct ppp_channel *chan; ++ ++ if (!pch->chan) { ++ /* Channel is going / gone away */ ++ continue; ++ } ++ ++ if (c == chan_sz) { ++ /* No space to record channel */ ++ ppp_unlock(ppp); ++ return c; ++ } ++ ++ /* Hold the channel, if supported */ ++ chan = pch->chan; ++ if (!chan->ops->hold) ++ continue; ++ ++ chan->ops->hold(chan); ++ ++ /* Record the channel */ ++ channels[c++] = chan; ++ } ++ ppp_unlock(ppp); ++ return c; ++} ++EXPORT_SYMBOL(ppp_hold_channels); ++ ++/* ppp_release_channels() ++ * Releases channels ++ */ ++void ppp_release_channels(struct ppp_channel *channels[], unsigned int chan_sz) ++{ ++ unsigned int c; ++ ++ for (c = 0; c < chan_sz; ++c) { ++ struct ppp_channel *chan; ++ ++ chan = channels[c]; ++ chan->ops->release(chan); ++ } ++} ++EXPORT_SYMBOL(ppp_release_channels); ++ + /* Module/initialization stuff */ + + module_init(ppp_init); +@@ -3604,6 +3877,7 @@ EXPORT_SYMBOL(ppp_input_error); + EXPORT_SYMBOL(ppp_output_wakeup); + EXPORT_SYMBOL(ppp_register_compressor); + EXPORT_SYMBOL(ppp_unregister_compressor); ++EXPORT_SYMBOL(ppp_update_stats); + MODULE_LICENSE("GPL"); + MODULE_ALIAS_CHARDEV(PPP_MAJOR, 0); + MODULE_ALIAS_RTNL_LINK("ppp"); +--- a/drivers/net/ppp/pppoe.c ++++ b/drivers/net/ppp/pppoe.c +@@ -62,6 +62,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -87,7 +88,7 @@ + static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb); + + static const struct proto_ops pppoe_ops; +-static const struct ppp_channel_ops pppoe_chan_ops; ++static const struct pppoe_channel_ops pppoe_chan_ops; + + /* per-net private data for this module */ + static unsigned int pppoe_net_id __read_mostly; +@@ -692,7 +693,7 @@ static int pppoe_connect(struct socket * + + po->chan.mtu = dev->mtu - sizeof(struct pppoe_hdr) - 2; + po->chan.private = sk; +- po->chan.ops = &pppoe_chan_ops; ++ po->chan.ops = (struct ppp_channel_ops *)&pppoe_chan_ops; + + error = ppp_register_net_channel(dev_net(dev), &po->chan); + if (error) { +@@ -995,9 +996,80 @@ static int pppoe_fill_forward_path(struc + return 0; + } + +-static const struct ppp_channel_ops pppoe_chan_ops = { +- .start_xmit = pppoe_xmit, +- .fill_forward_path = pppoe_fill_forward_path, ++/************************************************************************ ++ * ++ * function called by generic PPP driver to hold channel ++ * ++ ***********************************************************************/ ++static void pppoe_hold_chan(struct ppp_channel *chan) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ ++ sock_hold(sk); ++} ++ ++/************************************************************************ ++ * ++ * function called by generic PPP driver to release channel ++ * ++ ***********************************************************************/ ++static void pppoe_release_chan(struct ppp_channel *chan) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ ++ sock_put(sk); ++} ++ ++/************************************************************************ ++ * ++ * function called to get the channel protocol type ++ * ++ ***********************************************************************/ ++static int pppoe_get_channel_protocol(struct ppp_channel *chan) ++{ ++ return PX_PROTO_OE; ++} ++ ++/************************************************************************ ++ * ++ * function called to get the PPPoE channel addressing ++ * NOTE: This function returns a HOLD to the netdevice ++ * ++ ***********************************************************************/ ++static int pppoe_get_addressing(struct ppp_channel *chan, ++ struct pppoe_opt *addressing) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ struct pppox_sock *po = pppox_sk(sk); ++ int err = 0; ++ ++ *addressing = po->proto.pppoe; ++ if (!addressing->dev) ++ return -ENODEV; ++ ++ dev_hold(addressing->dev); ++ return err; ++} ++ ++/* pppoe_channel_addressing_get() ++ * Return PPPoE channel specific addressing information. ++ */ ++int pppoe_channel_addressing_get(struct ppp_channel *chan, ++ struct pppoe_opt *addressing) ++{ ++ return pppoe_get_addressing(chan, addressing); ++} ++EXPORT_SYMBOL(pppoe_channel_addressing_get); ++ ++static const struct pppoe_channel_ops pppoe_chan_ops = { ++ /* PPPoE specific channel ops */ ++ .get_addressing = pppoe_get_addressing, ++ /* General ppp channel ops */ ++ .ops.start_xmit = pppoe_xmit, ++ .ops.get_channel_protocol = pppoe_get_channel_protocol, ++ .ops.hold = pppoe_hold_chan, ++ .ops.release = pppoe_release_chan, ++ .ops.fill_forward_path = pppoe_fill_forward_path, + }; + + static int pppoe_recvmsg(struct socket *sock, struct msghdr *m, +--- a/include/linux/if_pppox.h ++++ b/include/linux/if_pppox.h +@@ -91,4 +91,17 @@ enum { + PPPOX_DEAD = 16 /* dead, useless, please clean me up!*/ + }; + ++/* ++ * PPPoE Channel specific operations ++ */ ++struct pppoe_channel_ops { ++ /* Must be first - general to all PPP channels */ ++ struct ppp_channel_ops ops; ++ int (*get_addressing)(struct ppp_channel *, struct pppoe_opt *); ++}; ++ ++/* Return PPPoE channel specific addressing information */ ++extern int pppoe_channel_addressing_get(struct ppp_channel *chan, ++ struct pppoe_opt *addressing); ++ + #endif /* !(__LINUX_IF_PPPOX_H) */ +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -1762,6 +1762,36 @@ enum netdev_priv_flags { + IFF_NO_IP_ALIGN = BIT_ULL(34), + }; + ++/** ++ * enum netdev_priv_flags_ext - &struct net_device priv_flags_ext ++ * ++ * These flags are used to check for device type and can be ++ * set and used by the drivers ++ * ++ * @IFF_EXT_TUN_TAP: device is a TUN/TAP device ++ * @IFF_EXT_PPP_L2TPV2: device is a L2TPV2 device ++ * @IFF_EXT_PPP_L2TPV3: device is a L2TPV3 device ++ * @IFF_EXT_PPP_PPTP: device is a PPTP device ++ * @IFF_EXT_GRE_V4_TAP: device is a GRE IPv4 TAP device ++ * @IFF_EXT_GRE_V6_TAP: device is a GRE IPv6 TAP device ++ * @IFF_EXT_IFB: device is an IFB device ++ * @IFF_EXT_MAPT: device is an MAPT device ++ * @IFF_EXT_HW_NO_OFFLOAD: device is an NON Offload device ++ * @IFF_EXT_L2TPV3: device is a L2TPV3 Ethernet device ++ */ ++enum netdev_priv_flags_ext { ++ IFF_EXT_TUN_TAP = 1<<0, ++ IFF_EXT_PPP_L2TPV2 = 1<<1, ++ IFF_EXT_PPP_L2TPV3 = 1<<2, ++ IFF_EXT_PPP_PPTP = 1<<3, ++ IFF_EXT_GRE_V4_TAP = 1<<4, ++ IFF_EXT_GRE_V6_TAP = 1<<5, ++ IFF_EXT_IFB = 1<<6, ++ IFF_EXT_MAPT = 1<<7, ++ IFF_EXT_HW_NO_OFFLOAD = 1<<8, ++ IFF_EXT_ETH_L2TPV3 = 1<<9, ++}; ++ + #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN + #define IFF_EBRIDGE IFF_EBRIDGE + #define IFF_BONDING IFF_BONDING +@@ -2127,6 +2157,7 @@ struct net_device { + unsigned int flags; + xdp_features_t xdp_features; + unsigned long long priv_flags; ++ unsigned int priv_flags_ext; + const struct net_device_ops *netdev_ops; + const struct xdp_metadata_ops *xdp_metadata_ops; + int ifindex; +--- a/include/linux/ppp_channel.h ++++ b/include/linux/ppp_channel.h +@@ -19,6 +19,10 @@ + #include + #include + #include ++#include ++ ++#define PPP_CHANNEL_DISCONNECT 0 ++#define PPP_CHANNEL_CONNECT 1 + + struct net_device_path; + struct net_device_path_ctx; +@@ -30,9 +34,19 @@ struct ppp_channel_ops { + int (*start_xmit)(struct ppp_channel *, struct sk_buff *); + /* Handle an ioctl call that has come in via /dev/ppp. */ + int (*ioctl)(struct ppp_channel *, unsigned int, unsigned long); ++ /* Get channel protocol type, one of PX_PROTO_XYZ or specific to ++ * the channel subtype ++ */ ++ int (*get_channel_protocol)(struct ppp_channel *); ++ /* Get channel protocol version */ ++ int (*get_channel_protocol_ver)(struct ppp_channel *); ++ /* Hold the channel from being destroyed */ ++ void (*hold)(struct ppp_channel *); ++ /* Release hold on the channel */ ++ void (*release)(struct ppp_channel *); + int (*fill_forward_path)(struct net_device_path_ctx *, +- struct net_device_path *, +- const struct ppp_channel *); ++ struct net_device_path *, ++ const struct ppp_channel *); + }; + + struct ppp_channel { +@@ -76,6 +90,51 @@ extern int ppp_unit_number(struct ppp_ch + /* Get the device name associated with a channel, or NULL if none */ + extern char *ppp_dev_name(struct ppp_channel *); + ++/* Call this to obtain the underlying protocol of the PPP channel, ++ * e.g. PX_PROTO_OE ++ */ ++extern int ppp_channel_get_protocol(struct ppp_channel *); ++ ++/* Call this get protocol version */ ++extern int ppp_channel_get_proto_version(struct ppp_channel *); ++ ++/* Call this to hold a channel */ ++extern bool ppp_channel_hold(struct ppp_channel *); ++ ++/* Call this to release a hold you have upon a channel */ ++extern void ppp_channel_release(struct ppp_channel *); ++ ++/* Release hold on PPP channels */ ++extern void ppp_release_channels(struct ppp_channel *channels[], ++ unsigned int chan_sz); ++ ++/* Hold PPP channels for the PPP device */ ++extern int ppp_hold_channels(struct net_device *dev, ++ struct ppp_channel *channels[], ++ unsigned int chan_sz); ++ ++/* Test if ppp xmit lock is locked */ ++extern bool ppp_is_xmit_locked(struct net_device *dev); ++ ++/* Test if the ppp device is a multi-link ppp device */ ++extern int ppp_is_multilink(struct net_device *dev); ++ ++/* Register the PPP channel connect notifier */ ++extern void ppp_channel_connection_register_notify(struct notifier_block *nb); ++ ++/* Unregister the PPP channel connect notifier */ ++extern void ppp_channel_connection_unregister_notify(struct notifier_block *nb); ++ ++/* Update statistics of the PPP net_device by incrementing related ++ * statistics field value with corresponding parameter ++ */ ++extern void ppp_update_stats(struct net_device *dev, unsigned long rx_packets, ++ unsigned long rx_bytes, unsigned long tx_packets, ++ unsigned long tx_bytes, unsigned long rx_errors, ++ unsigned long tx_errors, unsigned long rx_dropped, ++ unsigned long tx_dropped); ++ ++ + /* + * SMP locking notes: + * The channel code must ensure that when it calls ppp_unregister_channel, diff --git a/target/linux/qualcommax/patches-6.6/0600-3-qca-nss-ecm-support-net-bonding.patch b/target/linux/qualcommax/patches-6.6/0600-3-qca-nss-ecm-support-net-bonding.patch new file mode 100644 index 00000000000000..4e683e3a3e7e8e --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-3-qca-nss-ecm-support-net-bonding.patch @@ -0,0 +1,46 @@ +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -210,6 +210,7 @@ atomic_t netpoll_block_tx = ATOMIC_INIT( + #endif + + unsigned int bond_net_id __read_mostly; ++static unsigned long bond_id_mask = 0xFFFFFFF0; /* QCA NSS ECM bonding support */ + + static const struct flow_dissector_key flow_keys_bonding_keys[] = { + { +@@ -5872,6 +5873,11 @@ static void bond_destructor(struct net_d + if (bond->wq) + destroy_workqueue(bond->wq); + ++ /* QCA NSS ECM bonding support - Start */ ++ if (bond->id != (~0U)) ++ clear_bit(bond->id, &bond_id_mask); ++ /* QCA NSS ECM bonding support - End */ ++ + free_percpu(bond->rr_tx_counter); + } + +@@ -6421,6 +6427,13 @@ int bond_create(struct net *net, const c + + bond_work_init_all(bond); + ++ /* QCA NSS ECM bonding support - Start */ ++ bond->id = ~0U; ++ if (bond_id_mask != (~0UL)) { ++ bond->id = (u32)ffz(bond_id_mask); ++ set_bit(bond->id, &bond_id_mask); ++ } ++ /* QCA NSS ECM bonding support - End */ + out: + rtnl_unlock(); + return res; +--- a/include/net/bonding.h ++++ b/include/net/bonding.h +@@ -261,6 +261,7 @@ struct bonding { + spinlock_t ipsec_lock; + #endif /* CONFIG_XFRM_OFFLOAD */ + struct bpf_prog *xdp_prog; ++ u32 id;/* QCA NSS ECM bonding support */ + }; + + #define bond_slave_get_rcu(dev) \ diff --git a/target/linux/qualcommax/patches-6.6/0600-4-qca-nss-ecm-support-net-bonding-over-LAG-interface.patch b/target/linux/qualcommax/patches-6.6/0600-4-qca-nss-ecm-support-net-bonding-over-LAG-interface.patch new file mode 100644 index 00000000000000..e02e9090db8c4e --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-4-qca-nss-ecm-support-net-bonding-over-LAG-interface.patch @@ -0,0 +1,685 @@ +--- a/drivers/net/bonding/bond_3ad.c ++++ b/drivers/net/bonding/bond_3ad.c +@@ -116,6 +116,40 @@ static void ad_marker_response_received( + struct port *port); + static void ad_update_actor_keys(struct port *port, bool reset); + ++/* QCA NSS ECM bonding support - Start */ ++struct bond_cb __rcu *bond_cb; ++ ++int bond_register_cb(struct bond_cb *cb) ++{ ++ struct bond_cb *lag_cb; ++ ++ lag_cb = kzalloc(sizeof(*lag_cb), GFP_ATOMIC | __GFP_NOWARN); ++ if (!lag_cb) { ++ return -1; ++ } ++ ++ memcpy((void *)lag_cb, (void *)cb, sizeof(*cb)); ++ ++ rcu_read_lock(); ++ rcu_assign_pointer(bond_cb, lag_cb); ++ rcu_read_unlock(); ++ return 0; ++} ++EXPORT_SYMBOL(bond_register_cb); ++ ++void bond_unregister_cb(void) ++{ ++ struct bond_cb *lag_cb_main; ++ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ rcu_assign_pointer(bond_cb, NULL); ++ rcu_read_unlock(); ++ ++ kfree(lag_cb_main); ++} ++EXPORT_SYMBOL(bond_unregister_cb); ++/* QCA NSS ECM bonding support - End */ + + /* ================= api to bonding and kernel code ================== */ + +@@ -1073,7 +1107,31 @@ static void ad_mux_machine(struct port * + ad_disable_collecting_distributing(port, + update_slave_arr); + port->ntt = true; ++ ++ /* QCA NSS ECM bonding support - Start */ ++ /* Send a notificaton about change in state of this ++ * port. We only want to handle case where port moves ++ * from AD_MUX_COLLECTING_DISTRIBUTING -> ++ * AD_MUX_ATTACHED. ++ */ ++ if (bond_slave_is_up(port->slave) && ++ (last_state == AD_MUX_COLLECTING_DISTRIBUTING)) { ++ struct bond_cb *lag_cb_main; ++ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ if (lag_cb_main && ++ lag_cb_main->bond_cb_link_down) { ++ struct net_device *dev; ++ ++ dev = port->slave->dev; ++ lag_cb_main->bond_cb_link_down(dev); ++ } ++ rcu_read_unlock(); ++ } ++ + break; ++ /* QCA NSS ECM bonding support - End */ + case AD_MUX_COLLECTING_DISTRIBUTING: + port->actor_oper_port_state |= LACP_STATE_COLLECTING; + port->actor_oper_port_state |= LACP_STATE_DISTRIBUTING; +@@ -1917,6 +1975,7 @@ static void ad_enable_collecting_distrib + bool *update_slave_arr) + { + if (port->aggregator->is_active) { ++ struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */ + slave_dbg(port->slave->bond->dev, port->slave->dev, + "Enabling port %d (LAG %d)\n", + port->actor_port_number, +@@ -1924,6 +1983,16 @@ static void ad_enable_collecting_distrib + __enable_port(port); + /* Slave array needs update */ + *update_slave_arr = true; ++ ++ /* QCA NSS ECM bonding support - Start */ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ ++ if (lag_cb_main && lag_cb_main->bond_cb_link_up) ++ lag_cb_main->bond_cb_link_up(port->slave->dev); ++ ++ rcu_read_unlock(); ++ /* QCA NSS ECM bonding support - End */ + } + } + +@@ -2683,6 +2752,104 @@ int bond_3ad_get_active_agg_info(struct + return ret; + } + ++/* QCA NSS ECM bonding support - Start */ ++/* bond_3ad_get_tx_dev - Calculate egress interface for a given packet, ++ * for a LAG that is configured in 802.3AD mode ++ * @skb: pointer to skb to be egressed ++ * @src_mac: pointer to source L2 address ++ * @dst_mac: pointer to destination L2 address ++ * @src: pointer to source L3 address ++ * @dst: pointer to destination L3 address ++ * @protocol: L3 protocol id from L2 header ++ * @bond_dev: pointer to bond master device ++ * ++ * If @skb is NULL, bond_xmit_hash is used to calculate hash using L2/L3 ++ * addresses. ++ * ++ * Returns: Either valid slave device, or NULL otherwise ++ */ ++struct net_device *bond_3ad_get_tx_dev(struct sk_buff *skb, u8 *src_mac, ++ u8 *dst_mac, void *src, ++ void *dst, u16 protocol, ++ struct net_device *bond_dev, ++ __be16 *layer4hdr) ++{ ++ struct bonding *bond = netdev_priv(bond_dev); ++ struct aggregator *agg; ++ struct ad_info ad_info; ++ struct list_head *iter; ++ struct slave *slave; ++ struct slave *first_ok_slave = NULL; ++ u32 hash = 0; ++ int slaves_in_agg; ++ int slave_agg_no = 0; ++ int agg_id; ++ ++ if (__bond_3ad_get_active_agg_info(bond, &ad_info)) { ++ pr_debug("%s: Error: __bond_3ad_get_active_agg_info failed\n", ++ bond_dev->name); ++ return NULL; ++ } ++ ++ slaves_in_agg = ad_info.ports; ++ agg_id = ad_info.aggregator_id; ++ ++ if (slaves_in_agg == 0) { ++ pr_debug("%s: Error: active aggregator is empty\n", ++ bond_dev->name); ++ return NULL; ++ } ++ ++ if (skb) { ++ hash = bond_xmit_hash(bond, skb); ++ slave_agg_no = hash % slaves_in_agg; ++ } else { ++ if (bond->params.xmit_policy != BOND_XMIT_POLICY_LAYER23 && ++ bond->params.xmit_policy != BOND_XMIT_POLICY_LAYER2 && ++ bond->params.xmit_policy != BOND_XMIT_POLICY_LAYER34) { ++ pr_debug("%s: Error: Unsupported hash policy for 802.3AD fast path\n", ++ bond_dev->name); ++ return NULL; ++ } ++ ++ hash = bond_xmit_hash_without_skb(src_mac, dst_mac, ++ src, dst, protocol, ++ bond_dev, layer4hdr); ++ slave_agg_no = hash % slaves_in_agg; ++ } ++ ++ bond_for_each_slave_rcu(bond, slave, iter) { ++ agg = SLAVE_AD_INFO(slave)->port.aggregator; ++ if (!agg || agg->aggregator_identifier != agg_id) ++ continue; ++ ++ if (slave_agg_no >= 0) { ++ if (!first_ok_slave && bond_slave_can_tx(slave)) ++ first_ok_slave = slave; ++ slave_agg_no--; ++ continue; ++ } ++ ++ if (bond_slave_can_tx(slave)) ++ return slave->dev; ++ } ++ ++ if (slave_agg_no >= 0) { ++ pr_err("%s: Error: Couldn't find a slave to tx on for aggregator ID %d\n", ++ bond_dev->name, agg_id); ++ return NULL; ++ } ++ ++ /* we couldn't find any suitable slave after the agg_no, so use the ++ * first suitable found, if found. ++ */ ++ if (first_ok_slave) ++ return first_ok_slave->dev; ++ ++ return NULL; ++} ++/* QCA NSS ECM bonding support - End */ ++ + int bond_3ad_lacpdu_recv(const struct sk_buff *skb, struct bonding *bond, + struct slave *slave) + { +--- a/drivers/net/bonding/bond_main.c ++++ b/drivers/net/bonding/bond_main.c +@@ -288,6 +288,21 @@ const char *bond_mode_name(int mode) + return names[mode]; + } + ++/* QCA NSS ECM bonding support */ ++int bond_get_id(struct net_device *bond_dev) ++{ ++ struct bonding *bond; ++ ++ if (!((bond_dev->priv_flags & IFF_BONDING) && ++ (bond_dev->flags & IFF_MASTER))) ++ return -EINVAL; ++ ++ bond = netdev_priv(bond_dev); ++ return bond->id; ++} ++EXPORT_SYMBOL(bond_get_id); ++/* QCA NSS ECM bonding support */ ++ + /** + * bond_dev_queue_xmit - Prepare skb for xmit. + * +@@ -1189,6 +1204,23 @@ void bond_change_active_slave(struct bon + if (BOND_MODE(bond) == BOND_MODE_8023AD) + bond_3ad_handle_link_change(new_active, BOND_LINK_UP); + ++ /* QCA NSS ECM bonding support - Start */ ++ if (bond->params.mode == BOND_MODE_XOR) { ++ struct bond_cb *lag_cb_main; ++ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ if (lag_cb_main && ++ lag_cb_main->bond_cb_link_up) { ++ struct net_device *dev; ++ ++ dev = new_active->dev; ++ lag_cb_main->bond_cb_link_up(dev); ++ } ++ rcu_read_unlock(); ++ } ++ /* QCA NSS ECM bonding support - End */ ++ + if (bond_is_lb(bond)) + bond_alb_handle_link_change(bond, new_active, BOND_LINK_UP); + } else { +@@ -1833,6 +1865,7 @@ int bond_enslave(struct net_device *bond + const struct net_device_ops *slave_ops = slave_dev->netdev_ops; + struct slave *new_slave = NULL, *prev_slave; + struct sockaddr_storage ss; ++ struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */ + int link_reporting; + int res = 0, i; + +@@ -2278,6 +2311,15 @@ int bond_enslave(struct net_device *bond + bond_is_active_slave(new_slave) ? "an active" : "a backup", + new_slave->link != BOND_LINK_DOWN ? "an up" : "a down"); + ++ /* QCA NSS ECM bonding support - Start */ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ if (lag_cb_main && lag_cb_main->bond_cb_enslave) ++ lag_cb_main->bond_cb_enslave(slave_dev); ++ ++ rcu_read_unlock(); ++ /* QCA NSS ECM bonding support - End */ ++ + /* enslave is successful */ + bond_queue_slave_event(new_slave); + return 0; +@@ -2343,6 +2385,15 @@ err_undo_flags: + } + } + ++ /* QCA NSS ECM bonding support - Start */ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ if (lag_cb_main && lag_cb_main->bond_cb_enslave) ++ lag_cb_main->bond_cb_enslave(slave_dev); ++ ++ rcu_read_unlock(); ++ /* QCA NSS ECM bonding support - End */ ++ + return res; + } + +@@ -2364,6 +2415,7 @@ static int __bond_release_one(struct net + struct bonding *bond = netdev_priv(bond_dev); + struct slave *slave, *oldcurrent; + struct sockaddr_storage ss; ++ struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */ + int old_flags = bond_dev->flags; + netdev_features_t old_features = bond_dev->features; + +@@ -2386,6 +2438,15 @@ static int __bond_release_one(struct net + + bond_set_slave_inactive_flags(slave, BOND_SLAVE_NOTIFY_NOW); + ++ /* QCA NSS ECM bonding support - Start */ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ if (lag_cb_main && lag_cb_main->bond_cb_release) ++ lag_cb_main->bond_cb_release(slave_dev); ++ ++ rcu_read_unlock(); ++ /* QCA NSS ECM bonding support - End */ ++ + bond_sysfs_slave_del(slave); + + /* recompute stats just before removing the slave */ +@@ -2708,6 +2769,8 @@ static void bond_miimon_commit(struct bo + struct slave *slave, *primary, *active; + bool do_failover = false; + struct list_head *iter; ++ struct net_device *slave_dev = NULL; /* QCA NSS ECM bonding support */ ++ struct bond_cb *lag_cb_main; /* QCA NSS ECM bonding support */ + + ASSERT_RTNL(); + +@@ -2747,6 +2810,12 @@ static void bond_miimon_commit(struct bo + bond_set_active_slave(slave); + } + ++ /* QCA NSS ECM bonding support - Start */ ++ if ((bond->params.mode == BOND_MODE_XOR) && ++ (!slave_dev)) ++ slave_dev = slave->dev; ++ /* QCA NSS ECM bonding support - End */ ++ + slave_info(bond->dev, slave->dev, "link status definitely up, %u Mbps %s duplex\n", + slave->speed == SPEED_UNKNOWN ? 0 : slave->speed, + slave->duplex ? "full" : "half"); +@@ -2795,6 +2864,16 @@ static void bond_miimon_commit(struct bo + unblock_netpoll_tx(); + } + ++ /* QCA NSS ECM bonding support - Start */ ++ rcu_read_lock(); ++ lag_cb_main = rcu_dereference(bond_cb); ++ ++ if (slave_dev && lag_cb_main && lag_cb_main->bond_cb_link_up) ++ lag_cb_main->bond_cb_link_up(slave_dev); ++ ++ rcu_read_unlock(); ++ /* QCA NSS ECM bonding support - End */ ++ + bond_set_carrier(bond); + } + +@@ -4047,8 +4126,219 @@ static inline u32 bond_eth_hash(struct s + return 0; + + ep = (struct ethhdr *)(data + mhoff); +- return ep->h_dest[5] ^ ep->h_source[5] ^ be16_to_cpu(ep->h_proto); ++ return ep->h_dest[5] ^ ep->h_source[5]; /* QCA NSS ECM bonding support */ ++} ++ ++/* QCA NSS ECM bonding support - Start */ ++/* Extract the appropriate headers based on bond's xmit policy */ ++static bool bond_flow_dissect_without_skb(struct bonding *bond, ++ u8 *src_mac, u8 *dst_mac, ++ void *psrc, void *pdst, ++ u16 protocol, __be16 *layer4hdr, ++ struct flow_keys *fk) ++{ ++ u32 *src = NULL; ++ u32 *dst = NULL; ++ ++ fk->ports.ports = 0; ++ src = (uint32_t *)psrc; ++ dst = (uint32_t *)pdst; ++ ++ if (protocol == htons(ETH_P_IP)) { ++ /* V4 addresses and address type*/ ++ fk->addrs.v4addrs.src = src[0]; ++ fk->addrs.v4addrs.dst = dst[0]; ++ fk->control.addr_type = FLOW_DISSECTOR_KEY_IPV4_ADDRS; ++ } else if (protocol == htons(ETH_P_IPV6)) { ++ /* V6 addresses and address type*/ ++ memcpy(&fk->addrs.v6addrs.src, src, sizeof(struct in6_addr)); ++ memcpy(&fk->addrs.v6addrs.dst, dst, sizeof(struct in6_addr)); ++ fk->control.addr_type = FLOW_DISSECTOR_KEY_IPV6_ADDRS; ++ } else { ++ return false; ++ } ++ if ((bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER34) && ++ (layer4hdr)) ++ fk->ports.ports = *layer4hdr; ++ ++ return true; ++} ++ ++/* bond_xmit_hash_without_skb - Applies load balancing algorithm for a packet, ++ * to calculate hash for a given set of L2/L3 addresses. Does not ++ * calculate egress interface. ++ */ ++uint32_t bond_xmit_hash_without_skb(u8 *src_mac, u8 *dst_mac, ++ void *psrc, void *pdst, u16 protocol, ++ struct net_device *bond_dev, ++ __be16 *layer4hdr) ++{ ++ struct bonding *bond = netdev_priv(bond_dev); ++ struct flow_keys flow; ++ u32 hash = 0; ++ ++ if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER2 || ++ !bond_flow_dissect_without_skb(bond, src_mac, dst_mac, psrc, ++ pdst, protocol, layer4hdr, &flow)) ++ return (dst_mac[5] ^ src_mac[5]); ++ ++ if (bond->params.xmit_policy == BOND_XMIT_POLICY_LAYER23) ++ hash = dst_mac[5] ^ src_mac[5]; ++ else if (layer4hdr) ++ hash = (__force u32)flow.ports.ports; ++ ++ hash ^= (__force u32)flow_get_u32_dst(&flow) ^ ++ (__force u32)flow_get_u32_src(&flow); ++ hash ^= (hash >> 16); ++ hash ^= (hash >> 8); ++ ++ return hash; ++} ++ ++/* bond_xor_get_tx_dev - Calculate egress interface for a given packet for a LAG ++ * that is configured in balance-xor mode ++ * @skb: pointer to skb to be egressed ++ * @src_mac: pointer to source L2 address ++ * @dst_mac: pointer to destination L2 address ++ * @src: pointer to source L3 address in network order ++ * @dst: pointer to destination L3 address in network order ++ * @protocol: L3 protocol ++ * @bond_dev: pointer to bond master device ++ * ++ * If @skb is NULL, bond_xmit_hash_without_skb is used to calculate hash using ++ * L2/L3 addresses. ++ * ++ * Returns: Either valid slave device, or NULL otherwise ++ */ ++static struct net_device *bond_xor_get_tx_dev(struct sk_buff *skb, ++ u8 *src_mac, u8 *dst_mac, ++ void *src, void *dst, ++ u16 protocol, ++ struct net_device *bond_dev, ++ __be16 *layer4hdr) ++{ ++ struct bonding *bond = netdev_priv(bond_dev); ++ int slave_cnt = READ_ONCE(bond->slave_cnt); ++ int slave_id = 0, i = 0; ++ u32 hash; ++ struct list_head *iter; ++ struct slave *slave; ++ ++ if (slave_cnt == 0) { ++ pr_debug("%s: Error: No slave is attached to the interface\n", ++ bond_dev->name); ++ return NULL; ++ } ++ ++ if (skb) { ++ hash = bond_xmit_hash(bond, skb); ++ slave_id = hash % slave_cnt; ++ } else { ++ if (bond->params.xmit_policy != BOND_XMIT_POLICY_LAYER23 && ++ bond->params.xmit_policy != BOND_XMIT_POLICY_LAYER2 && ++ bond->params.xmit_policy != BOND_XMIT_POLICY_LAYER34) { ++ pr_debug("%s: Error: Unsupported hash policy for balance-XOR fast path\n", ++ bond_dev->name); ++ return NULL; ++ } ++ ++ hash = bond_xmit_hash_without_skb(src_mac, dst_mac, src, ++ dst, protocol, bond_dev, ++ layer4hdr); ++ slave_id = hash % slave_cnt; ++ } ++ ++ i = slave_id; ++ ++ /* Here we start from the slave with slave_id */ ++ bond_for_each_slave_rcu(bond, slave, iter) { ++ if (--i < 0) { ++ if (bond_slave_can_tx(slave)) ++ return slave->dev; ++ } ++ } ++ ++ /* Here we start from the first slave up to slave_id */ ++ i = slave_id; ++ bond_for_each_slave_rcu(bond, slave, iter) { ++ if (--i < 0) ++ break; ++ if (bond_slave_can_tx(slave)) ++ return slave->dev; ++ } ++ ++ return NULL; ++} ++ ++/* bond_get_tx_dev - Calculate egress interface for a given packet. ++ * ++ * Supports 802.3AD and balance-xor modes ++ * ++ * @skb: pointer to skb to be egressed, if valid ++ * @src_mac: pointer to source L2 address ++ * @dst_mac: pointer to destination L2 address ++ * @src: pointer to source L3 address in network order ++ * @dst: pointer to destination L3 address in network order ++ * @protocol: L3 protocol id from L2 header ++ * @bond_dev: pointer to bond master device ++ * ++ * Returns: Either valid slave device, or NULL for un-supported LAG modes ++ */ ++struct net_device *bond_get_tx_dev(struct sk_buff *skb, uint8_t *src_mac, ++ u8 *dst_mac, void *src, ++ void *dst, u16 protocol, ++ struct net_device *bond_dev, ++ __be16 *layer4hdr) ++{ ++ struct bonding *bond; ++ ++ if (!bond_dev) ++ return NULL; ++ ++ if (!((bond_dev->priv_flags & IFF_BONDING) && ++ (bond_dev->flags & IFF_MASTER))) ++ return NULL; ++ ++ bond = netdev_priv(bond_dev); ++ ++ switch (bond->params.mode) { ++ case BOND_MODE_XOR: ++ return bond_xor_get_tx_dev(skb, src_mac, dst_mac, ++ src, dst, protocol, ++ bond_dev, layer4hdr); ++ case BOND_MODE_8023AD: ++ return bond_3ad_get_tx_dev(skb, src_mac, dst_mac, ++ src, dst, protocol, ++ bond_dev, layer4hdr); ++ default: ++ return NULL; ++ } + } ++EXPORT_SYMBOL(bond_get_tx_dev); ++ ++/* In bond_xmit_xor() , we determine the output device by using a pre- ++ * determined xmit_hash_policy(), If the selected device is not enabled, ++ * find the next active slave. ++ */ ++static int bond_xmit_xor(struct sk_buff *skb, struct net_device *dev) ++{ ++ struct bonding *bond = netdev_priv(dev); ++ struct net_device *outdev; ++ ++ outdev = bond_xor_get_tx_dev(skb, NULL, NULL, NULL, ++ NULL, 0, dev, NULL); ++ if (!outdev) ++ goto out; ++ ++ bond_dev_queue_xmit(bond, skb, outdev); ++ goto final; ++out: ++ /* no suitable interface, frame not sent */ ++ dev_kfree_skb(skb); ++final: ++ return NETDEV_TX_OK; ++} ++/* QCA NSS ECM bonding support - End */ + + static bool bond_flow_ip(struct sk_buff *skb, struct flow_keys *fk, const void *data, + int hlen, __be16 l2_proto, int *nhoff, int *ip_proto, bool l34) +@@ -5177,15 +5467,18 @@ static netdev_tx_t bond_3ad_xor_xmit(str + struct net_device *dev) + { + struct bonding *bond = netdev_priv(dev); +- struct bond_up_slave *slaves; +- struct slave *slave; ++ /* QCA NSS ECM bonding support - Start */ ++ struct net_device *outdev = NULL; + +- slaves = rcu_dereference(bond->usable_slaves); +- slave = bond_xmit_3ad_xor_slave_get(bond, skb, slaves); +- if (likely(slave)) +- return bond_dev_queue_xmit(bond, skb, slave->dev); ++ outdev = bond_3ad_get_tx_dev(skb, NULL, NULL, NULL, ++ NULL, 0, dev, NULL); ++ if (!outdev) { ++ dev_kfree_skb(skb); ++ return NETDEV_TX_OK; ++ } + +- return bond_tx_drop(dev, skb); ++ return bond_dev_queue_xmit(bond, skb, outdev); ++ /* QCA NSS ECM bonding support - End */ + } + + /* in broadcast mode, we send everything to all usable interfaces. */ +@@ -5435,8 +5728,9 @@ static netdev_tx_t __bond_start_xmit(str + return bond_xmit_roundrobin(skb, dev); + case BOND_MODE_ACTIVEBACKUP: + return bond_xmit_activebackup(skb, dev); +- case BOND_MODE_8023AD: + case BOND_MODE_XOR: ++ return bond_xmit_xor(skb, dev); /* QCA NSS ECM bonding support */ ++ case BOND_MODE_8023AD: + return bond_3ad_xor_xmit(skb, dev); + case BOND_MODE_BROADCAST: + return bond_xmit_broadcast(skb, dev); +--- a/include/net/bond_3ad.h ++++ b/include/net/bond_3ad.h +@@ -302,8 +302,15 @@ int bond_3ad_lacpdu_recv(const struct sk + struct slave *slave); + int bond_3ad_set_carrier(struct bonding *bond); + void bond_3ad_update_lacp_rate(struct bonding *bond); ++/* QCA NSS ECM bonding support */ ++struct net_device *bond_3ad_get_tx_dev(struct sk_buff *skb, uint8_t *src_mac, ++ uint8_t *dst_mac, void *src, ++ void *dst, uint16_t protocol, ++ struct net_device *bond_dev, ++ __be16 *layer4hdr); ++/* QCA NSS ECM bonding support */ ++ + void bond_3ad_update_ad_actor_settings(struct bonding *bond); + int bond_3ad_stats_fill(struct sk_buff *skb, struct bond_3ad_stats *stats); + size_t bond_3ad_stats_size(void); + #endif /* _NET_BOND_3AD_H */ +- +--- a/include/net/bonding.h ++++ b/include/net/bonding.h +@@ -90,6 +90,8 @@ + #define BOND_XFRM_FEATURES (NETIF_F_HW_ESP | NETIF_F_HW_ESP_TX_CSUM | \ + NETIF_F_GSO_ESP) + ++extern struct bond_cb __rcu *bond_cb; /* QCA NSS ECM bonding support */ ++ + #ifdef CONFIG_NET_POLL_CONTROLLER + extern atomic_t netpoll_block_tx; + +@@ -653,6 +655,7 @@ struct bond_net { + + int bond_rcv_validate(const struct sk_buff *skb, struct bonding *bond, struct slave *slave); + netdev_tx_t bond_dev_queue_xmit(struct bonding *bond, struct sk_buff *skb, struct net_device *slave_dev); ++int bond_get_id(struct net_device *bond_dev); /* QCA NSS ECM bonding support */ + int bond_create(struct net *net, const char *name); + int bond_create_sysfs(struct bond_net *net); + void bond_destroy_sysfs(struct bond_net *net); +@@ -684,6 +687,13 @@ struct bond_vlan_tag *bond_verify_device + int level); + int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave); + void bond_slave_arr_work_rearm(struct bonding *bond, unsigned long delay); ++/* QCA NSS ECM bonding support - Start */ ++uint32_t bond_xmit_hash_without_skb(uint8_t *src_mac, uint8_t *dst_mac, ++ void *psrc, void *pdst, uint16_t protocol, ++ struct net_device *bond_dev, ++ __be16 *layer4hdr); ++/* QCA NSS ECM bonding support - End */ ++ + void bond_work_init_all(struct bonding *bond); + + #ifdef CONFIG_PROC_FS +@@ -788,4 +798,18 @@ static inline netdev_tx_t bond_tx_drop(s + return NET_XMIT_DROP; + } + ++/* QCA NSS ECM bonding support - Start */ ++struct bond_cb { ++ void (*bond_cb_link_up)(struct net_device *slave); ++ void (*bond_cb_link_down)(struct net_device *slave); ++ void (*bond_cb_enslave)(struct net_device *slave); ++ void (*bond_cb_release)(struct net_device *slave); ++ void (*bond_cb_delete_by_slave)(struct net_device *slave); ++ void (*bond_cb_delete_by_mac)(uint8_t *mac_addr); ++}; ++ ++extern int bond_register_cb(struct bond_cb *cb); ++extern void bond_unregister_cb(void); ++/* QCA NSS ECM bonding support - End */ ++ + #endif /* _NET_BONDING_H */ diff --git a/target/linux/qualcommax/patches-6.6/0600-5-qca-nss-ecm-support-macvlan.patch b/target/linux/qualcommax/patches-6.6/0600-5-qca-nss-ecm-support-macvlan.patch new file mode 100644 index 00000000000000..29f7e96d791328 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-5-qca-nss-ecm-support-macvlan.patch @@ -0,0 +1,96 @@ +--- a/include/linux/if_macvlan.h ++++ b/include/linux/if_macvlan.h +@@ -15,6 +15,13 @@ struct macvlan_port; + #define MACVLAN_MC_FILTER_BITS 8 + #define MACVLAN_MC_FILTER_SZ (1 << MACVLAN_MC_FILTER_BITS) + ++/* QCA NSS ECM Support - Start */ ++/* ++ * Callback for updating interface statistics for macvlan flows offloaded from host CPU. ++ */ ++typedef void (*macvlan_offload_stats_update_cb_t)(struct net_device *dev, struct rtnl_link_stats64 *stats, bool update_mcast_rx_stats); ++/* QCA NSS ECM Support - End */ ++ + struct macvlan_dev { + struct net_device *dev; + struct list_head list; +@@ -35,6 +42,7 @@ struct macvlan_dev { + #ifdef CONFIG_NET_POLL_CONTROLLER + struct netpoll *netpoll; + #endif ++ macvlan_offload_stats_update_cb_t offload_stats_update; /* QCA NSS ECM support */ + }; + + static inline void macvlan_count_rx(const struct macvlan_dev *vlan, +@@ -107,4 +115,26 @@ static inline int macvlan_release_l2fw_o + macvlan->accel_priv = NULL; + return dev_uc_add(macvlan->lowerdev, dev->dev_addr); + } ++ ++/* QCA NSS ECM Support - Start */ ++#if IS_ENABLED(CONFIG_MACVLAN) ++static inline void ++macvlan_offload_stats_update(struct net_device *dev, ++ struct rtnl_link_stats64 *stats, ++ bool update_mcast_rx_stats) ++{ ++ struct macvlan_dev *macvlan = netdev_priv(dev); ++ ++ macvlan->offload_stats_update(dev, stats, update_mcast_rx_stats); ++} ++ ++static inline enum ++macvlan_mode macvlan_get_mode(struct net_device *dev) ++{ ++ struct macvlan_dev *macvlan = netdev_priv(dev); ++ ++ return macvlan->mode; ++} ++#endif ++/* QCA NSS ECM Support - End */ + #endif /* _LINUX_IF_MACVLAN_H */ +--- a/drivers/net/macvlan.c ++++ b/drivers/net/macvlan.c +@@ -960,6 +960,34 @@ static void macvlan_uninit(struct net_de + macvlan_port_destroy(port->dev); + } + ++/* QCA NSS ECM Support - Start */ ++/* Update macvlan statistics processed by offload engines */ ++static void macvlan_dev_update_stats(struct net_device *dev, ++ struct rtnl_link_stats64 *offl_stats, ++ bool update_mcast_rx_stats) ++{ ++ struct vlan_pcpu_stats *stats; ++ struct macvlan_dev *macvlan; ++ ++ /* Is this a macvlan? */ ++ if (!netif_is_macvlan(dev)) ++ return; ++ ++ macvlan = netdev_priv(dev); ++ stats = this_cpu_ptr(macvlan->pcpu_stats); ++ u64_stats_update_begin(&stats->syncp); ++ u64_stats_add(&stats->rx_packets, offl_stats->rx_packets); ++ u64_stats_add(&stats->rx_bytes, offl_stats->rx_bytes); ++ u64_stats_add(&stats->tx_packets, offl_stats->tx_packets); ++ u64_stats_add(&stats->tx_bytes, offl_stats->tx_bytes); ++ /* Update multicast statistics */ ++ if (unlikely(update_mcast_rx_stats)) { ++ u64_stats_add(&stats->rx_multicast, offl_stats->rx_packets); ++ } ++ u64_stats_update_end(&stats->syncp); ++} ++/* QCA NSS ECM Support - End */ ++ + static void macvlan_dev_get_stats64(struct net_device *dev, + struct rtnl_link_stats64 *stats) + { +@@ -1506,6 +1534,7 @@ int macvlan_common_newlink(struct net *s + vlan->dev = dev; + vlan->port = port; + vlan->set_features = MACVLAN_FEATURES; ++ vlan->offload_stats_update = macvlan_dev_update_stats; /* QCA NSS ECM Support */ + + vlan->mode = MACVLAN_MODE_VEPA; + if (data && data[IFLA_MACVLAN_MODE]) diff --git a/target/linux/qualcommax/patches-6.6/0600-6-qca-nss-ecm-support-netfilter-DSCPREMARK.patch b/target/linux/qualcommax/patches-6.6/0600-6-qca-nss-ecm-support-netfilter-DSCPREMARK.patch new file mode 100644 index 00000000000000..27650731a69612 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0600-6-qca-nss-ecm-support-netfilter-DSCPREMARK.patch @@ -0,0 +1,154 @@ +--- a/net/netfilter/Kconfig ++++ b/net/netfilter/Kconfig +@@ -174,6 +174,13 @@ config NF_CONNTRACK_TIMEOUT + + If unsure, say `N'. + ++config NF_CONNTRACK_DSCPREMARK_EXT ++ bool 'Connection tracking extension for dscp remark target' ++ depends on NETFILTER_ADVANCED ++ help ++ This option enables support for connection tracking extension ++ for dscp remark. ++ + config NF_CONNTRACK_TIMESTAMP + bool 'Connection tracking timestamping' + depends on NETFILTER_ADVANCED +--- a/include/net/netfilter/nf_conntrack_extend.h ++++ b/include/net/netfilter/nf_conntrack_extend.h +@@ -31,6 +31,10 @@ enum nf_ct_ext_id { + #if IS_ENABLED(CONFIG_NET_ACT_CT) + NF_CT_EXT_ACT_CT, + #endif ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ NF_CT_EXT_DSCPREMARK, /* QCA NSS ECM support */ ++#endif ++ + NF_CT_EXT_NUM, + }; + +--- a/net/netfilter/nf_conntrack_extend.c ++++ b/net/netfilter/nf_conntrack_extend.c +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + #include + + #define NF_CT_EXT_PREALLOC 128u /* conntrack events are on by default */ +@@ -54,6 +55,9 @@ static const u8 nf_ct_ext_type_len[NF_CT + #if IS_ENABLED(CONFIG_NET_ACT_CT) + [NF_CT_EXT_ACT_CT] = sizeof(struct nf_conn_act_ct_ext), + #endif ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ [NF_CT_EXT_DSCPREMARK] = sizeof(struct nf_ct_dscpremark_ext), ++#endif + }; + + static __always_inline unsigned int total_extension_size(void) +@@ -86,6 +90,9 @@ static __always_inline unsigned int tota + #if IS_ENABLED(CONFIG_NET_ACT_CT) + + sizeof(struct nf_conn_act_ct_ext) + #endif ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ + sizeof(struct nf_ct_dscpremark_ext) ++#endif + ; + } + +--- a/net/netfilter/Makefile ++++ b/net/netfilter/Makefile +@@ -15,6 +15,7 @@ nf_conntrack-$(CONFIG_NF_CONNTRACK_OVS) + nf_conntrack-$(CONFIG_NF_CT_PROTO_DCCP) += nf_conntrack_proto_dccp.o + nf_conntrack-$(CONFIG_NF_CT_PROTO_SCTP) += nf_conntrack_proto_sctp.o + nf_conntrack-$(CONFIG_NF_CT_PROTO_GRE) += nf_conntrack_proto_gre.o ++nf_conntrack-$(CONFIG_NF_CONNTRACK_DSCPREMARK_EXT) += nf_conntrack_dscpremark_ext.o + ifeq ($(CONFIG_NF_CONNTRACK),m) + nf_conntrack-$(CONFIG_DEBUG_INFO_BTF_MODULES) += nf_conntrack_bpf.o + else ifeq ($(CONFIG_NF_CONNTRACK),y) +--- a/net/netfilter/nf_conntrack_core.c ++++ b/net/netfilter/nf_conntrack_core.c +@@ -45,6 +45,9 @@ + #include + #include + #include ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++#include ++#endif + #include + #include + #include +@@ -1740,6 +1743,9 @@ init_conntrack(struct net *net, struct n + nf_ct_acct_ext_add(ct, GFP_ATOMIC); + nf_ct_tstamp_ext_add(ct, GFP_ATOMIC); + nf_ct_labels_ext_add(ct); ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ nf_ct_dscpremark_ext_add(ct, GFP_ATOMIC); ++#endif + + #ifdef CONFIG_NF_CONNTRACK_EVENTS + ecache = tmpl ? nf_ct_ecache_find(tmpl) : NULL; +--- a/net/netfilter/xt_DSCP.c ++++ b/net/netfilter/xt_DSCP.c +@@ -15,6 +15,9 @@ + + #include + #include ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++#include ++#endif + + MODULE_AUTHOR("Harald Welte "); + MODULE_DESCRIPTION("Xtables: DSCP/TOS field modification"); +@@ -31,6 +34,10 @@ dscp_tg(struct sk_buff *skb, const struc + { + const struct xt_DSCP_info *dinfo = par->targinfo; + u_int8_t dscp = ipv4_get_dsfield(ip_hdr(skb)) >> XT_DSCP_SHIFT; ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ struct nf_conn *ct; ++ enum ip_conntrack_info ctinfo; ++#endif + + if (dscp != dinfo->dscp) { + if (skb_ensure_writable(skb, sizeof(struct iphdr))) +@@ -39,6 +46,13 @@ dscp_tg(struct sk_buff *skb, const struc + ipv4_change_dsfield(ip_hdr(skb), XT_DSCP_ECN_MASK, + dinfo->dscp << XT_DSCP_SHIFT); + ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ ct = nf_ct_get(skb, &ctinfo); ++ if (!ct) ++ return XT_CONTINUE; ++ ++ nf_conntrack_dscpremark_ext_set_dscp_rule_valid(ct); ++#endif + } + return XT_CONTINUE; + } +@@ -48,13 +62,24 @@ dscp_tg6(struct sk_buff *skb, const stru + { + const struct xt_DSCP_info *dinfo = par->targinfo; + u_int8_t dscp = ipv6_get_dsfield(ipv6_hdr(skb)) >> XT_DSCP_SHIFT; +- ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ struct nf_conn *ct; ++ enum ip_conntrack_info ctinfo; ++#endif + if (dscp != dinfo->dscp) { + if (skb_ensure_writable(skb, sizeof(struct ipv6hdr))) + return NF_DROP; + + ipv6_change_dsfield(ipv6_hdr(skb), XT_DSCP_ECN_MASK, + dinfo->dscp << XT_DSCP_SHIFT); ++ ++#ifdef CONFIG_NF_CONNTRACK_DSCPREMARK_EXT ++ ct = nf_ct_get(skb, &ctinfo); ++ if (!ct) ++ return XT_CONTINUE; ++ ++ nf_conntrack_dscpremark_ext_set_dscp_rule_valid(ct); ++#endif + } + return XT_CONTINUE; + } diff --git a/target/linux/qualcommax/patches-6.6/0601-1-qca-add-nss-bridge-mgr-support.patch b/target/linux/qualcommax/patches-6.6/0601-1-qca-add-nss-bridge-mgr-support.patch new file mode 100644 index 00000000000000..dcfd78d5932a6a --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0601-1-qca-add-nss-bridge-mgr-support.patch @@ -0,0 +1,92 @@ +From 3c17a0e1112be70071e98d5208da5b55dcec20a6 Mon Sep 17 00:00:00 2001 +From: Simon Casey +Date: Wed, 2 Feb 2022 19:37:29 +0100 +Subject: [PATCH] Update 607-qca-add-add-nss-bridge-mgr-support.patch for kernel 5.15 + +--- + include/linux/if_bridge.h | 4 ++++ + net/bridge/br_fdb.c | 25 +++++++++++++++++++++---- + 2 files changed, 25 insertions(+), 4 deletions(-) + +--- a/include/linux/if_bridge.h ++++ b/include/linux/if_bridge.h +@@ -254,4 +254,8 @@ typedef struct net_bridge_port *br_get_d + extern br_get_dst_hook_t __rcu *br_get_dst_hook; + /* QCA NSS ECM support - End */ + ++/* QCA NSS bridge-mgr support - Start */ ++extern struct net_device *br_fdb_bridge_dev_get_and_hold(struct net_bridge *br); ++/* QCA NSS bridge-mgr support - End */ ++ + #endif +--- a/net/bridge/br_fdb.c ++++ b/net/bridge/br_fdb.c +@@ -576,7 +576,7 @@ void br_fdb_cleanup(struct work_struct * + unsigned long delay = hold_time(br); + unsigned long work_delay = delay; + unsigned long now = jiffies; +- u8 mac_addr[6]; /* QCA NSS ECM support */ ++ struct br_fdb_event fdb_event; /* QCA NSS bridge-mgr support */ + + /* this part is tricky, in order to avoid blocking learning and + * consequently forwarding, we rely on rcu to delete objects with +@@ -604,12 +604,13 @@ void br_fdb_cleanup(struct work_struct * + } else { + spin_lock_bh(&br->hash_lock); + if (!hlist_unhashed(&f->fdb_node)) { +- ether_addr_copy(mac_addr, f->key.addr.addr); ++ memset(&fdb_event, 0, sizeof(fdb_event)); ++ ether_addr_copy(fdb_event.addr, f->key.addr.addr); + fdb_delete(br, f, true); + /* QCA NSS ECM support - Start */ + atomic_notifier_call_chain( + &br_fdb_update_notifier_list, 0, +- (void *)mac_addr); ++ (void *)&fdb_event); + /* QCA NSS ECM support - End */ + } + spin_unlock_bh(&br->hash_lock); +@@ -907,10 +908,21 @@ static bool __fdb_mark_active(struct net + test_and_clear_bit(BR_FDB_NOTIFY_INACTIVE, &fdb->flags)); + } + ++/* QCA NSS bridge-mgr support - Start */ ++/* Get the bridge device */ ++struct net_device *br_fdb_bridge_dev_get_and_hold(struct net_bridge *br) ++{ ++ dev_hold(br->dev); ++ return br->dev; ++} ++EXPORT_SYMBOL_GPL(br_fdb_bridge_dev_get_and_hold); ++/* QCA NSS bridge-mgr support - End */ ++ + void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, + const unsigned char *addr, u16 vid, unsigned long flags) + { + struct net_bridge_fdb_entry *fdb; ++ struct br_fdb_event fdb_event; /* QCA NSS bridge-mgr support */ + + /* some users want to always flood. */ + if (hold_time(br) == 0) +@@ -936,6 +948,12 @@ void br_fdb_update(struct net_bridge *br + if (unlikely(source != READ_ONCE(fdb->dst) && + !test_bit(BR_FDB_STICKY, &fdb->flags))) { + br_switchdev_fdb_notify(br, fdb, RTM_DELNEIGH); ++ /* QCA NSS bridge-mgr support - Start */ ++ ether_addr_copy(fdb_event.addr, addr); ++ fdb_event.br = br; ++ fdb_event.orig_dev = fdb->dst->dev; ++ fdb_event.dev = source->dev; ++ /* QCA NSS bridge-mgr support - End */ + WRITE_ONCE(fdb->dst, source); + fdb_modified = true; + /* Take over HW learned entry */ +@@ -952,7 +970,7 @@ void br_fdb_update(struct net_bridge *br + /* QCA NSS ECM support - Start */ + atomic_notifier_call_chain( + &br_fdb_update_notifier_list, +- 0, (void *)addr); ++ 0, (void *)&fdb_event); + /* QCA NSS ECM support - End */ + } + diff --git a/target/linux/qualcommax/patches-6.6/0602-1-qca-nss-drv-add-qdisc-support.patch b/target/linux/qualcommax/patches-6.6/0602-1-qca-nss-drv-add-qdisc-support.patch new file mode 100644 index 00000000000000..2926faacefebd7 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0602-1-qca-nss-drv-add-qdisc-support.patch @@ -0,0 +1,25 @@ +--- a/include/uapi/linux/pkt_cls.h ++++ b/include/uapi/linux/pkt_cls.h +@@ -139,6 +139,7 @@ enum tca_id { + TCA_ID_MPLS, + TCA_ID_CT, + TCA_ID_GATE, ++ TCA_ID_MIRRED_NSS, /* QCA NSS Qdisc IGS Support */ + /* other actions go here */ + __TCA_ID_MAX = 255 + }; +@@ -817,4 +818,14 @@ enum { + TCF_EM_OPND_LT + }; + ++/* QCA NSS Qdisc Support - Start */ ++#define _TC_MAKE32(x) ((x)) ++#define _TC_MAKEMASK1(n) (_TC_MAKE32(1) << _TC_MAKE32(n)) ++ ++#define TC_NCLS _TC_MAKEMASK1(8) ++#define TC_NCLS_NSS _TC_MAKEMASK1(12) ++#define SET_TC_NCLS_NSS(v) ( TC_NCLS_NSS | ((v) & ~TC_NCLS_NSS)) ++#define CLR_TC_NCLS_NSS(v) ( (v) & ~TC_NCLS_NSS) ++/* QCA NSS Qdisc Support - End */ ++ + #endif diff --git a/target/linux/qualcommax/patches-6.6/0603-1-qca-nss-clients-add-qdisc-support.patch b/target/linux/qualcommax/patches-6.6/0603-1-qca-nss-clients-add-qdisc-support.patch new file mode 100644 index 00000000000000..9220aca1c78be7 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-1-qca-nss-clients-add-qdisc-support.patch @@ -0,0 +1,463 @@ +--- a/include/linux/timer.h ++++ b/include/linux/timer.h +@@ -17,6 +17,7 @@ struct timer_list { + unsigned long expires; + void (*function)(struct timer_list *); + u32 flags; ++ unsigned long cust_data; + + #ifdef CONFIG_LOCKDEP + struct lockdep_map lockdep_map; +--- a/drivers/net/ifb.c ++++ b/drivers/net/ifb.c +@@ -151,6 +151,31 @@ resched: + + } + ++void ifb_update_offload_stats(struct net_device *dev, struct pcpu_sw_netstats *offload_stats) ++{ ++ struct ifb_dev_private *dp; ++ struct ifb_q_private *txp; ++ ++ if (!dev || !offload_stats) { ++ return; ++ } ++ ++ if (!(dev->priv_flags_ext & IFF_EXT_IFB)) { ++ return; ++ } ++ ++ dp = netdev_priv(dev); ++ txp = dp->tx_private; ++ ++ u64_stats_update_begin(&txp->rx_stats.sync); ++ txp->rx_stats.packets += u64_stats_read(&offload_stats->rx_packets); ++ txp->rx_stats.bytes += u64_stats_read(&offload_stats->rx_bytes); ++ txp->tx_stats.packets += u64_stats_read(&offload_stats->tx_packets); ++ txp->tx_stats.bytes += u64_stats_read(&offload_stats->tx_bytes); ++ u64_stats_update_end(&txp->rx_stats.sync); ++} ++EXPORT_SYMBOL(ifb_update_offload_stats); ++ + static void ifb_stats64(struct net_device *dev, + struct rtnl_link_stats64 *stats) + { +@@ -326,6 +351,7 @@ static void ifb_setup(struct net_device + dev->flags |= IFF_NOARP; + dev->flags &= ~IFF_MULTICAST; + dev->priv_flags &= ~IFF_TX_SKB_SHARING; ++ dev->priv_flags_ext |= IFF_EXT_IFB; /* Mark the device as an IFB device. */ + netif_keep_dst(dev); + eth_hw_addr_random(dev); + dev->needs_free_netdev = true; +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h +@@ -4696,6 +4696,15 @@ void dev_uc_flush(struct net_device *dev + void dev_uc_init(struct net_device *dev); + + /** ++ * ifb_update_offload_stats - Update the IFB interface stats ++ * @dev: IFB device to update the stats ++ * @offload_stats: per CPU stats structure ++ * ++ * Allows update of IFB stats when flows are offloaded to an accelerator. ++ **/ ++void ifb_update_offload_stats(struct net_device *dev, struct pcpu_sw_netstats *offload_stats); ++ ++/** + * __dev_uc_sync - Synchonize device's unicast list + * @dev: device to sync + * @sync: function to call if address should be added +@@ -5222,6 +5231,11 @@ static inline bool netif_is_failover_sla + return dev->priv_flags & IFF_FAILOVER_SLAVE; + } + ++static inline bool netif_is_ifb_dev(const struct net_device *dev) ++{ ++ return dev->priv_flags_ext & IFF_EXT_IFB; ++} ++ + /* This device needs to keep skb dst for qdisc enqueue or ndo_start_xmit() */ + static inline void netif_keep_dst(struct net_device *dev) + { +--- a/include/uapi/linux/pkt_sched.h ++++ b/include/uapi/linux/pkt_sched.h +@@ -1306,4 +1306,248 @@ enum { + + #define TCA_ETS_MAX (__TCA_ETS_MAX - 1) + ++/* QCA NSS Clients Support - Start */ ++enum { ++ TCA_NSS_ACCEL_MODE_NSS_FW, ++ TCA_NSS_ACCEL_MODE_PPE, ++ TCA_NSS_ACCEL_MODE_MAX ++}; ++ ++/* NSSFIFO section */ ++ ++enum { ++ TCA_NSSFIFO_UNSPEC, ++ TCA_NSSFIFO_PARMS, ++ __TCA_NSSFIFO_MAX ++}; ++ ++#define TCA_NSSFIFO_MAX (__TCA_NSSFIFO_MAX - 1) ++ ++struct tc_nssfifo_qopt { ++ __u32 limit; /* Queue length: bytes for bfifo, packets for pfifo */ ++ __u8 set_default; /* Sets qdisc to be the default qdisc for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSWRED section */ ++ ++enum { ++ TCA_NSSWRED_UNSPEC, ++ TCA_NSSWRED_PARMS, ++ __TCA_NSSWRED_MAX ++}; ++ ++#define TCA_NSSWRED_MAX (__TCA_NSSWRED_MAX - 1) ++#define NSSWRED_CLASS_MAX 6 ++struct tc_red_alg_parameter { ++ __u32 min; /* qlen_avg < min: pkts are all enqueued */ ++ __u32 max; /* qlen_avg > max: pkts are all dropped */ ++ __u32 probability;/* Drop probability at qlen_avg = max */ ++ __u32 exp_weight_factor;/* exp_weight_factor for calculate qlen_avg */ ++}; ++ ++struct tc_nsswred_traffic_class { ++ __u32 limit; /* Queue length */ ++ __u32 weight_mode_value; /* Weight mode value */ ++ struct tc_red_alg_parameter rap;/* Parameters for RED alg */ ++}; ++ ++/* ++ * Weight modes for WRED ++ */ ++enum tc_nsswred_weight_modes { ++ TC_NSSWRED_WEIGHT_MODE_DSCP = 0,/* Weight mode is DSCP */ ++ TC_NSSWRED_WEIGHT_MODES, /* Must be last */ ++}; ++ ++struct tc_nsswred_qopt { ++ __u32 limit; /* Queue length */ ++ enum tc_nsswred_weight_modes weight_mode; ++ /* Weight mode */ ++ __u32 traffic_classes; /* How many traffic classes: DPs */ ++ __u32 def_traffic_class; /* Default traffic if no match: def_DP */ ++ __u32 traffic_id; /* The traffic id to be configured: DP */ ++ __u32 weight_mode_value; /* Weight mode value */ ++ struct tc_red_alg_parameter rap;/* RED algorithm parameters */ ++ struct tc_nsswred_traffic_class tntc[NSSWRED_CLASS_MAX]; ++ /* Traffic settings for dumpping */ ++ __u8 ecn; /* Setting ECN bit or dropping */ ++ __u8 set_default; /* Sets qdisc to be the default for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSCODEL section */ ++ ++enum { ++ TCA_NSSCODEL_UNSPEC, ++ TCA_NSSCODEL_PARMS, ++ __TCA_NSSCODEL_MAX ++}; ++ ++#define TCA_NSSCODEL_MAX (__TCA_NSSCODEL_MAX - 1) ++ ++struct tc_nsscodel_qopt { ++ __u32 target; /* Acceptable queueing delay */ ++ __u32 limit; /* Max number of packets that can be held in the queue */ ++ __u32 interval; /* Monitoring interval */ ++ __u32 flows; /* Number of flow buckets */ ++ __u32 quantum; /* Weight (in bytes) used for DRR of flow buckets */ ++ __u8 ecn; /* 0 - disable ECN, 1 - enable ECN */ ++ __u8 set_default; /* Sets qdisc to be the default qdisc for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++struct tc_nsscodel_xstats { ++ __u32 peak_queue_delay; /* Peak delay experienced by a dequeued packet */ ++ __u32 peak_drop_delay; /* Peak delay experienced by a dropped packet */ ++}; ++ ++/* NSSFQ_CODEL section */ ++ ++struct tc_nssfq_codel_xstats { ++ __u32 new_flow_count; /* Total number of new flows seen */ ++ __u32 new_flows_len; /* Current number of new flows */ ++ __u32 old_flows_len; /* Current number of old flows */ ++ __u32 ecn_mark; /* Number of packets marked with ECN */ ++ __u32 drop_overlimit; /* Number of packets dropped due to overlimit */ ++ __u32 maxpacket; /* The largest packet seen so far in the queue */ ++}; ++ ++/* NSSTBL section */ ++ ++enum { ++ TCA_NSSTBL_UNSPEC, ++ TCA_NSSTBL_PARMS, ++ __TCA_NSSTBL_MAX ++}; ++ ++#define TCA_NSSTBL_MAX (__TCA_NSSTBL_MAX - 1) ++ ++struct tc_nsstbl_qopt { ++ __u32 burst; /* Maximum burst size */ ++ __u32 rate; /* Limiting rate of TBF */ ++ __u32 peakrate; /* Maximum rate at which TBF is allowed to send */ ++ __u32 mtu; /* Max size of packet, or minumim burst size */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSPRIO section */ ++ ++#define TCA_NSSPRIO_MAX_BANDS 256 ++ ++enum { ++ TCA_NSSPRIO_UNSPEC, ++ TCA_NSSPRIO_PARMS, ++ __TCA_NSSPRIO_MAX ++}; ++ ++#define TCA_NSSPRIO_MAX (__TCA_NSSPRIO_MAX - 1) ++ ++struct tc_nssprio_qopt { ++ __u32 bands; /* Number of bands */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSBF section */ ++ ++enum { ++ TCA_NSSBF_UNSPEC, ++ TCA_NSSBF_CLASS_PARMS, ++ TCA_NSSBF_QDISC_PARMS, ++ __TCA_NSSBF_MAX ++}; ++ ++#define TCA_NSSBF_MAX (__TCA_NSSBF_MAX - 1) ++ ++struct tc_nssbf_class_qopt { ++ __u32 burst; /* Maximum burst size */ ++ __u32 rate; /* Allowed bandwidth for this class */ ++ __u32 mtu; /* MTU of the associated interface */ ++ __u32 quantum; /* Quantum allocation for DRR */ ++}; ++ ++struct tc_nssbf_qopt { ++ __u16 defcls; /* Default class value */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSWRR section */ ++ ++enum { ++ TCA_NSSWRR_UNSPEC, ++ TCA_NSSWRR_CLASS_PARMS, ++ TCA_NSSWRR_QDISC_PARMS, ++ __TCA_NSSWRR_MAX ++}; ++ ++#define TCA_NSSWRR_MAX (__TCA_NSSWRR_MAX - 1) ++ ++struct tc_nsswrr_class_qopt { ++ __u32 quantum; /* Weight associated to this class */ ++}; ++ ++struct tc_nsswrr_qopt { ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSWFQ section */ ++ ++enum { ++ TCA_NSSWFQ_UNSPEC, ++ TCA_NSSWFQ_CLASS_PARMS, ++ TCA_NSSWFQ_QDISC_PARMS, ++ __TCA_NSSWFQ_MAX ++}; ++ ++#define TCA_NSSWFQ_MAX (__TCA_NSSWFQ_MAX - 1) ++ ++struct tc_nsswfq_class_qopt { ++ __u32 quantum; /* Weight associated to this class */ ++}; ++ ++struct tc_nsswfq_qopt { ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSHTB section */ ++ ++enum { ++ TCA_NSSHTB_UNSPEC, ++ TCA_NSSHTB_CLASS_PARMS, ++ TCA_NSSHTB_QDISC_PARMS, ++ __TCA_NSSHTB_MAX ++}; ++ ++#define TCA_NSSHTB_MAX (__TCA_NSSHTB_MAX - 1) ++ ++struct tc_nsshtb_class_qopt { ++ __u32 burst; /* Allowed burst size */ ++ __u32 rate; /* Allowed bandwidth for this class */ ++ __u32 cburst; /* Maximum burst size */ ++ __u32 crate; /* Maximum bandwidth for this class */ ++ __u32 quantum; /* Quantum allocation for DRR */ ++ __u32 priority; /* Priority value associated with this class */ ++ __u32 overhead; /* Overhead in bytes per packet */ ++}; ++ ++struct tc_nsshtb_qopt { ++ __u32 r2q; /* Rate to quantum ratio */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++ ++/* NSSBLACKHOLE section */ ++ ++enum { ++ TCA_NSSBLACKHOLE_UNSPEC, ++ TCA_NSSBLACKHOLE_PARMS, ++ __TCA_NSSBLACKHOLE_MAX ++}; ++ ++#define TCA_NSSBLACKHOLE_MAX (__TCA_NSSBLACKHOLE_MAX - 1) ++ ++struct tc_nssblackhole_qopt { ++ __u8 set_default; /* Sets qdisc to be the default qdisc for enqueue */ ++ __u8 accel_mode; /* Dictates which data plane offloads the qdisc */ ++}; ++/* QCA NSS Clients Support - End */ + #endif +--- a/net/sched/sch_api.c ++++ b/net/sched/sch_api.c +@@ -314,6 +314,7 @@ struct Qdisc *qdisc_lookup(struct net_de + out: + return q; + } ++EXPORT_SYMBOL(qdisc_lookup); + + struct Qdisc *qdisc_lookup_rcu(struct net_device *dev, u32 handle) + { +@@ -2389,4 +2390,26 @@ static int __init pktsched_init(void) + return 0; + } + ++/* QCA NSS Qdisc Support - Start */ ++bool tcf_destroy(struct tcf_proto *tp, bool force) ++{ ++ tp->ops->destroy(tp, force, NULL); ++ module_put(tp->ops->owner); ++ kfree_rcu(tp, rcu); ++ ++ return true; ++} ++ ++void tcf_destroy_chain(struct tcf_proto __rcu **fl) ++{ ++ struct tcf_proto *tp; ++ ++ while ((tp = rtnl_dereference(*fl)) != NULL) { ++ RCU_INIT_POINTER(*fl, tp->next); ++ tcf_destroy(tp, true); ++ } ++} ++EXPORT_SYMBOL(tcf_destroy_chain); ++/* QCA NSS Qdisc Support - End */ ++ + subsys_initcall(pktsched_init); +--- a/net/sched/sch_generic.c ++++ b/net/sched/sch_generic.c +@@ -1069,6 +1069,7 @@ static void __qdisc_destroy(struct Qdisc + + call_rcu(&qdisc->rcu, qdisc_free_cb); + } ++EXPORT_SYMBOL(qdisc_destroy); + + void qdisc_destroy(struct Qdisc *qdisc) + { +--- a/include/net/sch_generic.h ++++ b/include/net/sch_generic.h +@@ -94,6 +94,7 @@ struct Qdisc { + #define TCQ_F_INVISIBLE 0x80 /* invisible by default in dump */ + #define TCQ_F_NOLOCK 0x100 /* qdisc does not require locking */ + #define TCQ_F_OFFLOADED 0x200 /* qdisc is offloaded to HW */ ++#define TCQ_F_NSS 0x1000 /* NSS qdisc flag. */ + u32 limit; + const struct Qdisc_ops *ops; + struct qdisc_size_table __rcu *stab; +@@ -751,6 +752,42 @@ static inline bool skb_skip_tc_classify( + return false; + } + ++/* QCA NSS Qdisc Support - Start */ ++/* ++ * Set skb classify bit field. ++ */ ++static inline void skb_set_tc_classify_offload(struct sk_buff *skb) ++{ ++#ifdef CONFIG_NET_CLS_ACT ++ skb->tc_skip_classify_offload = 1; ++#endif ++} ++ ++/* ++ * Clear skb classify bit field. ++ */ ++static inline void skb_clear_tc_classify_offload(struct sk_buff *skb) ++{ ++#ifdef CONFIG_NET_CLS_ACT ++ skb->tc_skip_classify_offload = 0; ++#endif ++} ++ ++/* ++ * Skip skb processing if sent from ifb dev. ++ */ ++static inline bool skb_skip_tc_classify_offload(struct sk_buff *skb) ++{ ++#ifdef CONFIG_NET_CLS_ACT ++ if (skb->tc_skip_classify_offload) { ++ skb_clear_tc_classify_offload(skb); ++ return true; ++ } ++#endif ++ return false; ++} ++/* QCA NSS Qdisc Support - End */ ++ + /* Reset all TX qdiscs greater than index of a device. */ + static inline void qdisc_reset_all_tx_gt(struct net_device *dev, unsigned int i) + { +@@ -1323,4 +1360,9 @@ static inline void qdisc_synchronize(con + msleep(1); + } + ++/* QCA NSS Qdisc Support - Start */ ++void qdisc_destroy(struct Qdisc *qdisc); ++void tcf_destroy_chain(struct tcf_proto __rcu **fl); ++/* QCA NSS Qdisc Support - End */ ++ + #endif +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -764,6 +764,7 @@ typedef unsigned char *sk_buff_data_t; + * @offload_fwd_mark: Packet was L2-forwarded in hardware + * @offload_l3_fwd_mark: Packet was L3-forwarded in hardware + * @tc_skip_classify: do not classify packet. set by IFB device ++ * @tc_skip_classify_offload: do not classify packet set by offload IFB device + * @tc_at_ingress: used within tc_classify to distinguish in/egress + * @redirected: packet was redirected by packet classifier + * @from_ingress: packet was redirected from the ingress path +@@ -945,6 +946,9 @@ struct sk_buff { + __u8 tc_at_ingress:1; /* See TC_AT_INGRESS_MASK */ + __u8 tc_skip_classify:1; + #endif ++#ifdef CONFIG_NET_CLS_ACT ++ __u8 tc_skip_classify_offload:1; /* QCA NSS Qdisc Support */ ++#endif + __u8 remcsum_offload:1; + __u8 csum_complete_sw:1; + __u8 csum_level:2; diff --git a/target/linux/qualcommax/patches-6.6/0603-2-qca-nss-clients-add-l2tp-support.patch b/target/linux/qualcommax/patches-6.6/0603-2-qca-nss-clients-add-l2tp-support.patch new file mode 100644 index 00000000000000..7fa9184df25155 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-2-qca-nss-clients-add-l2tp-support.patch @@ -0,0 +1,46 @@ +--- a/net/l2tp/l2tp_core.c ++++ b/net/l2tp/l2tp_core.c +@@ -398,6 +398,31 @@ err_tlock: + } + EXPORT_SYMBOL_GPL(l2tp_session_register); + ++void l2tp_stats_update(struct l2tp_tunnel *tunnel, ++ struct l2tp_session *session, ++ struct l2tp_stats *stats) ++{ ++ atomic_long_add(atomic_long_read(&stats->rx_packets), ++ &tunnel->stats.rx_packets); ++ atomic_long_add(atomic_long_read(&stats->rx_bytes), ++ &tunnel->stats.rx_bytes); ++ atomic_long_add(atomic_long_read(&stats->tx_packets), ++ &tunnel->stats.tx_packets); ++ atomic_long_add(atomic_long_read(&stats->tx_bytes), ++ &tunnel->stats.tx_bytes); ++ ++ atomic_long_add(atomic_long_read(&stats->rx_packets), ++ &session->stats.rx_packets); ++ atomic_long_add(atomic_long_read(&stats->rx_bytes), ++ &session->stats.rx_bytes); ++ atomic_long_add(atomic_long_read(&stats->tx_packets), ++ &session->stats.tx_packets); ++ atomic_long_add(atomic_long_read(&stats->tx_bytes), ++ &session->stats.tx_bytes); ++} ++EXPORT_SYMBOL_GPL(l2tp_stats_update); ++ ++ + /***************************************************************************** + * Receive data handling + *****************************************************************************/ +--- a/net/l2tp/l2tp_core.h ++++ b/net/l2tp/l2tp_core.h +@@ -232,6 +232,9 @@ struct l2tp_session *l2tp_session_get_nt + struct l2tp_session *l2tp_session_get_by_ifname(const struct net *net, + const char *ifname); + ++void l2tp_stats_update(struct l2tp_tunnel *tunnel, struct l2tp_session *session, ++ struct l2tp_stats *stats); ++ + /* Tunnel and session lifetime management. + * Creation of a new instance is a two-step process: create, then register. + * Destruction is triggered using the *_delete functions, and completes asynchronously. diff --git a/target/linux/qualcommax/patches-6.6/0603-3-qca-nss-clients-add-PPTP-support.patch b/target/linux/qualcommax/patches-6.6/0603-3-qca-nss-clients-add-PPTP-support.patch new file mode 100644 index 00000000000000..5fb9917bc9067e --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-3-qca-nss-clients-add-PPTP-support.patch @@ -0,0 +1,478 @@ +--- a/include/linux/if_pppox.h ++++ b/include/linux/if_pppox.h +@@ -36,6 +36,7 @@ struct pptp_opt { + u32 ack_sent, ack_recv; + u32 seq_sent, seq_recv; + int ppp_flags; ++ bool pptp_offload_mode; + }; + #include + +@@ -100,8 +101,40 @@ struct pppoe_channel_ops { + int (*get_addressing)(struct ppp_channel *, struct pppoe_opt *); + }; + ++/* PPTP client callback */ ++typedef int (*pptp_gre_seq_offload_callback_t)(struct sk_buff *skb, ++ struct net_device *pptp_dev); ++ + /* Return PPPoE channel specific addressing information */ + extern int pppoe_channel_addressing_get(struct ppp_channel *chan, + struct pppoe_opt *addressing); + ++/* Lookup PPTP session info and return PPTP session using sip, dip and local call id */ ++extern int pptp_session_find_by_src_callid(struct pptp_opt *opt, __be16 src_call_id, ++ __be32 daddr, __be32 saddr); ++ ++/* Lookup PPTP session info and return PPTP session using dip and peer call id */ ++extern int pptp_session_find(struct pptp_opt *opt, __be16 peer_call_id, ++ __be32 peer_ip_addr); ++ ++/* Return PPTP session information given the channel */ ++extern void pptp_channel_addressing_get(struct pptp_opt *opt, ++ struct ppp_channel *chan); ++ ++/* Enable the PPTP session offload flag */ ++extern int pptp_session_enable_offload_mode(__be16 peer_call_id, ++ __be32 peer_ip_addr); ++ ++/* Disable the PPTP session offload flag */ ++extern int pptp_session_disable_offload_mode(__be16 peer_call_id, ++ __be32 peer_ip_addr); ++ ++/* Register the PPTP GRE packets sequence number offload callback */ ++extern int ++pptp_register_gre_seq_offload_callback(pptp_gre_seq_offload_callback_t ++ pptp_client_cb); ++ ++/* Unregister the PPTP GRE packets sequence number offload callback */ ++extern void pptp_unregister_gre_seq_offload_callback(void); ++ + #endif /* !(__LINUX_IF_PPPOX_H) */ +--- a/drivers/net/ppp/ppp_generic.c ++++ b/drivers/net/ppp/ppp_generic.c +@@ -2973,6 +2973,20 @@ char *ppp_dev_name(struct ppp_channel *c + return name; + } + ++/* Return the PPP net device index */ ++int ppp_dev_index(struct ppp_channel *chan) ++{ ++ struct channel *pch = chan->ppp; ++ int ifindex = 0; ++ ++ if (pch) { ++ read_lock_bh(&pch->upl); ++ if (pch->ppp && pch->ppp->dev) ++ ifindex = pch->ppp->dev->ifindex; ++ read_unlock_bh(&pch->upl); ++ } ++ return ifindex; ++} + + /* + * Disconnect a channel from the generic layer. +@@ -3681,6 +3695,28 @@ void ppp_update_stats(struct net_device + ppp_recv_unlock(ppp); + } + ++/* Returns true if Compression is enabled on PPP device ++ */ ++bool ppp_is_cp_enabled(struct net_device *dev) ++{ ++ struct ppp *ppp; ++ bool flag = false; ++ ++ if (!dev) ++ return false; ++ ++ if (dev->type != ARPHRD_PPP) ++ return false; ++ ++ ppp = netdev_priv(dev); ++ ppp_lock(ppp); ++ flag = !!(ppp->xstate & SC_COMP_RUN) || !!(ppp->rstate & SC_DECOMP_RUN); ++ ppp_unlock(ppp); ++ ++ return flag; ++} ++EXPORT_SYMBOL(ppp_is_cp_enabled); ++ + /* Returns >0 if the device is a multilink PPP netdevice, 0 if not or < 0 if + * the device is not PPP. + */ +@@ -3872,6 +3908,7 @@ EXPORT_SYMBOL(ppp_unregister_channel); + EXPORT_SYMBOL(ppp_channel_index); + EXPORT_SYMBOL(ppp_unit_number); + EXPORT_SYMBOL(ppp_dev_name); ++EXPORT_SYMBOL(ppp_dev_index); + EXPORT_SYMBOL(ppp_input); + EXPORT_SYMBOL(ppp_input_error); + EXPORT_SYMBOL(ppp_output_wakeup); +--- a/include/linux/ppp_channel.h ++++ b/include/linux/ppp_channel.h +@@ -84,6 +84,9 @@ extern void ppp_unregister_channel(struc + /* Get the channel number for a channel */ + extern int ppp_channel_index(struct ppp_channel *); + ++/* Get the device index associated with a channel, or 0, if none */ ++extern int ppp_dev_index(struct ppp_channel *); ++ + /* Get the unit number associated with a channel, or -1 if none */ + extern int ppp_unit_number(struct ppp_channel *); + +@@ -116,6 +119,7 @@ extern int ppp_hold_channels(struct net_ + /* Test if ppp xmit lock is locked */ + extern bool ppp_is_xmit_locked(struct net_device *dev); + ++bool ppp_is_cp_enabled(struct net_device *dev); + /* Test if the ppp device is a multi-link ppp device */ + extern int ppp_is_multilink(struct net_device *dev); + +--- a/drivers/net/ppp/pptp.c ++++ b/drivers/net/ppp/pptp.c +@@ -50,6 +50,8 @@ static struct proto pptp_sk_proto __read + static const struct ppp_channel_ops pptp_chan_ops; + static const struct proto_ops pptp_ops; + ++static pptp_gre_seq_offload_callback_t __rcu pptp_gre_offload_xmit_cb; ++ + static struct pppox_sock *lookup_chan(u16 call_id, __be32 s_addr) + { + struct pppox_sock *sock; +@@ -91,6 +93,79 @@ static int lookup_chan_dst(u16 call_id, + return i < MAX_CALLID; + } + ++/* Search a pptp session based on local call id, local and remote ip address */ ++static int lookup_session_src(struct pptp_opt *opt, u16 call_id, __be32 daddr, __be32 saddr) ++{ ++ struct pppox_sock *sock; ++ int i = 1; ++ ++ rcu_read_lock(); ++ for_each_set_bit_from(i, callid_bitmap, MAX_CALLID) { ++ sock = rcu_dereference(callid_sock[i]); ++ if (!sock) ++ continue; ++ ++ if (sock->proto.pptp.src_addr.call_id == call_id && ++ sock->proto.pptp.dst_addr.sin_addr.s_addr == daddr && ++ sock->proto.pptp.src_addr.sin_addr.s_addr == saddr) { ++ sock_hold(sk_pppox(sock)); ++ memcpy(opt, &sock->proto.pptp, sizeof(struct pptp_opt)); ++ sock_put(sk_pppox(sock)); ++ rcu_read_unlock(); ++ return 0; ++ } ++ } ++ rcu_read_unlock(); ++ return -EINVAL; ++} ++ ++/* Search a pptp session based on peer call id and peer ip address */ ++static int lookup_session_dst(struct pptp_opt *opt, u16 call_id, __be32 d_addr) ++{ ++ struct pppox_sock *sock; ++ int i = 1; ++ ++ rcu_read_lock(); ++ for_each_set_bit_from(i, callid_bitmap, MAX_CALLID) { ++ sock = rcu_dereference(callid_sock[i]); ++ if (!sock) ++ continue; ++ ++ if (sock->proto.pptp.dst_addr.call_id == call_id && ++ sock->proto.pptp.dst_addr.sin_addr.s_addr == d_addr) { ++ sock_hold(sk_pppox(sock)); ++ memcpy(opt, &sock->proto.pptp, sizeof(struct pptp_opt)); ++ sock_put(sk_pppox(sock)); ++ rcu_read_unlock(); ++ return 0; ++ } ++ } ++ rcu_read_unlock(); ++ return -EINVAL; ++} ++ ++/* If offload mode set then this function sends all packets to ++ * offload module instead of network stack ++ */ ++static int pptp_client_skb_xmit(struct sk_buff *skb, ++ struct net_device *pptp_dev) ++{ ++ pptp_gre_seq_offload_callback_t pptp_gre_offload_cb_f; ++ int ret; ++ ++ rcu_read_lock(); ++ pptp_gre_offload_cb_f = rcu_dereference(pptp_gre_offload_xmit_cb); ++ ++ if (!pptp_gre_offload_cb_f) { ++ rcu_read_unlock(); ++ return -1; ++ } ++ ++ ret = pptp_gre_offload_cb_f(skb, pptp_dev); ++ rcu_read_unlock(); ++ return ret; ++} ++ + static int add_chan(struct pppox_sock *sock, + struct pptp_addr *sa) + { +@@ -136,7 +211,7 @@ static struct rtable *pptp_route_output( + struct net *net; + + net = sock_net(sk); +- flowi4_init_output(fl4, sk->sk_bound_dev_if, sk->sk_mark, 0, ++ flowi4_init_output(fl4, 0, sk->sk_mark, 0, + RT_SCOPE_UNIVERSE, IPPROTO_GRE, 0, + po->proto.pptp.dst_addr.sin_addr.s_addr, + po->proto.pptp.src_addr.sin_addr.s_addr, +@@ -163,8 +238,11 @@ static int pptp_xmit(struct ppp_channel + + struct rtable *rt; + struct net_device *tdev; ++ struct net_device *pptp_dev; + struct iphdr *iph; + int max_headroom; ++ int pptp_ifindex; ++ int ret; + + if (sk_pppox(po)->sk_state & PPPOX_DEAD) + goto tx_error; +@@ -258,7 +336,32 @@ static int pptp_xmit(struct ppp_channel + ip_select_ident(net, skb, NULL); + ip_send_check(iph); + +- ip_local_out(net, skb->sk, skb); ++ pptp_ifindex = ppp_dev_index(chan); ++ ++ /* set incoming interface as the ppp interface */ ++ if (skb->skb_iif) ++ skb->skb_iif = pptp_ifindex; ++ ++ /* If the PPTP GRE seq number offload module is not enabled yet ++ * then sends all PPTP GRE packets through linux network stack ++ */ ++ if (!opt->pptp_offload_mode) { ++ ip_local_out(net, skb->sk, skb); ++ return 1; ++ } ++ ++ pptp_dev = dev_get_by_index(&init_net, pptp_ifindex); ++ if (!pptp_dev) ++ goto tx_error; ++ ++ /* If PPTP offload module is enabled then forward all PPTP GRE ++ * packets to PPTP GRE offload module ++ */ ++ ret = pptp_client_skb_xmit(skb, pptp_dev); ++ dev_put(pptp_dev); ++ if (ret < 0) ++ goto tx_error; ++ + return 1; + + tx_error: +@@ -314,6 +417,13 @@ static int pptp_rcv_core(struct sock *sk + goto drop; + + payload = skb->data + headersize; ++ ++ /* If offload is enabled, we expect the offload module ++ * to handle PPTP GRE sequence number checks ++ */ ++ if (opt->pptp_offload_mode) ++ goto allow_packet; ++ + /* check for expected sequence number */ + if (seq < opt->seq_recv + 1 || WRAPPED(opt->seq_recv, seq)) { + if ((payload[0] == PPP_ALLSTATIONS) && (payload[1] == PPP_UI) && +@@ -371,6 +481,7 @@ static int pptp_rcv(struct sk_buff *skb) + if (po) { + skb_dst_drop(skb); + nf_reset_ct(skb); ++ skb->skb_iif = ppp_dev_index(&po->chan); + return sk_receive_skb(sk_pppox(po), skb, 0); + } + drop: +@@ -473,7 +584,7 @@ static int pptp_connect(struct socket *s + + opt->dst_addr = sp->sa_addr.pptp; + sk->sk_state |= PPPOX_CONNECTED; +- ++ opt->pptp_offload_mode = false; + end: + release_sock(sk); + return error; +@@ -603,9 +714,169 @@ static int pptp_ppp_ioctl(struct ppp_cha + return err; + } + ++/* pptp_channel_addressing_get() ++ * Return PPTP channel specific addressing information. ++ */ ++void pptp_channel_addressing_get(struct pptp_opt *opt, struct ppp_channel *chan) ++{ ++ struct sock *sk; ++ struct pppox_sock *po; ++ ++ if (!opt) ++ return; ++ ++ sk = (struct sock *)chan->private; ++ if (!sk) ++ return; ++ ++ sock_hold(sk); ++ ++ /* This is very unlikely, but check the socket is connected state */ ++ if (unlikely(sock_flag(sk, SOCK_DEAD) || ++ !(sk->sk_state & PPPOX_CONNECTED))) { ++ sock_put(sk); ++ return; ++ } ++ ++ po = pppox_sk(sk); ++ memcpy(opt, &po->proto.pptp, sizeof(struct pptp_opt)); ++ sock_put(sk); ++} ++EXPORT_SYMBOL(pptp_channel_addressing_get); ++ ++/* pptp_session_find() ++ * Search and return a PPTP session info based on peer callid and IP ++ * address. The function accepts the parameters in network byte order. ++ */ ++int pptp_session_find(struct pptp_opt *opt, __be16 peer_call_id, ++ __be32 peer_ip_addr) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ return lookup_session_dst(opt, ntohs(peer_call_id), peer_ip_addr); ++} ++EXPORT_SYMBOL(pptp_session_find); ++ ++/* pptp_session_find_by_src_callid() ++ * Search and return a PPTP session info based on src callid and IP ++ * address. The function accepts the parameters in network byte order. ++ */ ++int pptp_session_find_by_src_callid(struct pptp_opt *opt, __be16 src_call_id, ++ __be32 daddr, __be32 saddr) ++{ ++ if (!opt) ++ return -EINVAL; ++ ++ return lookup_session_src(opt, ntohs(src_call_id), daddr, saddr); ++} ++EXPORT_SYMBOL(pptp_session_find_by_src_callid); ++ ++ /* Function to change the offload mode true/false for a PPTP session */ ++static int pptp_set_offload_mode(bool accel_mode, ++ __be16 peer_call_id, __be32 peer_ip_addr) ++{ ++ struct pppox_sock *sock; ++ int i = 1; ++ ++ rcu_read_lock(); ++ for_each_set_bit_from(i, callid_bitmap, MAX_CALLID) { ++ sock = rcu_dereference(callid_sock[i]); ++ if (!sock) ++ continue; ++ ++ if (sock->proto.pptp.dst_addr.call_id == peer_call_id && ++ sock->proto.pptp.dst_addr.sin_addr.s_addr == peer_ip_addr) { ++ sock_hold(sk_pppox(sock)); ++ sock->proto.pptp.pptp_offload_mode = accel_mode; ++ sock_put(sk_pppox(sock)); ++ rcu_read_unlock(); ++ return 0; ++ } ++ } ++ rcu_read_unlock(); ++ return -EINVAL; ++} ++ ++/* Enable the PPTP session offload flag */ ++int pptp_session_enable_offload_mode(__be16 peer_call_id, __be32 peer_ip_addr) ++{ ++ return pptp_set_offload_mode(true, peer_call_id, peer_ip_addr); ++} ++EXPORT_SYMBOL(pptp_session_enable_offload_mode); ++ ++/* Disable the PPTP session offload flag */ ++int pptp_session_disable_offload_mode(__be16 peer_call_id, __be32 peer_ip_addr) ++{ ++ return pptp_set_offload_mode(false, peer_call_id, peer_ip_addr); ++} ++EXPORT_SYMBOL(pptp_session_disable_offload_mode); ++ ++/* Register the offload callback function on behalf of the module which ++ * will own the sequence and acknowledgment number updates for all ++ * PPTP GRE packets. All PPTP GRE packets are then transmitted to this ++ * module after encapsulation in order to ensure the correct seq/ack ++ * fields are set in the packets before transmission. This is required ++ * when PPTP flows are offloaded to acceleration engines, in-order to ++ * ensure consistency in sequence and ack numbers between PPTP control ++ * (PPP LCP) and data packets ++ */ ++int pptp_register_gre_seq_offload_callback(pptp_gre_seq_offload_callback_t ++ pptp_gre_offload_cb) ++{ ++ pptp_gre_seq_offload_callback_t pptp_gre_offload_cb_f; ++ ++ rcu_read_lock(); ++ pptp_gre_offload_cb_f = rcu_dereference(pptp_gre_offload_xmit_cb); ++ ++ if (pptp_gre_offload_cb_f) { ++ rcu_read_unlock(); ++ return -1; ++ } ++ ++ rcu_assign_pointer(pptp_gre_offload_xmit_cb, pptp_gre_offload_cb); ++ rcu_read_unlock(); ++ return 0; ++} ++EXPORT_SYMBOL(pptp_register_gre_seq_offload_callback); ++ ++/* Unregister the PPTP GRE packets sequence number offload callback */ ++void pptp_unregister_gre_seq_offload_callback(void) ++{ ++ rcu_assign_pointer(pptp_gre_offload_xmit_cb, NULL); ++} ++EXPORT_SYMBOL(pptp_unregister_gre_seq_offload_callback); ++ ++/* pptp_hold_chan() */ ++static void pptp_hold_chan(struct ppp_channel *chan) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ ++ sock_hold(sk); ++} ++ ++/* pptp_release_chan() */ ++static void pptp_release_chan(struct ppp_channel *chan) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ ++ sock_put(sk); ++} ++ ++/* pptp_get_channel_protocol() ++ * Return the protocol type of the PPTP over PPP protocol ++ */ ++static int pptp_get_channel_protocol(struct ppp_channel *chan) ++{ ++ return PX_PROTO_PPTP; ++} ++ + static const struct ppp_channel_ops pptp_chan_ops = { + .start_xmit = pptp_xmit, + .ioctl = pptp_ppp_ioctl, ++ .get_channel_protocol = pptp_get_channel_protocol, ++ .hold = pptp_hold_chan, ++ .release = pptp_release_chan, + }; + + static struct proto pptp_sk_proto __read_mostly = { diff --git a/target/linux/qualcommax/patches-6.6/0603-4-qca-nss-clients-add-iptunnel-support.patch b/target/linux/qualcommax/patches-6.6/0603-4-qca-nss-clients-add-iptunnel-support.patch new file mode 100644 index 00000000000000..c9fc33686480ec --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-4-qca-nss-clients-add-iptunnel-support.patch @@ -0,0 +1,77 @@ +--- a/include/net/ip6_tunnel.h ++++ b/include/net/ip6_tunnel.h +@@ -36,6 +36,7 @@ struct __ip6_tnl_parm { + __u8 proto; /* tunnel protocol */ + __u8 encap_limit; /* encapsulation limit for tunnel */ + __u8 hop_limit; /* hop limit for tunnel */ ++ __u8 draft03; /* FMR using draft03 of map-e - QCA NSS Clients Support */ + bool collect_md; + __be32 flowinfo; /* traffic class and flowlabel for tunnel */ + __u32 flags; /* tunnel flags */ +--- a/include/net/ip_tunnels.h ++++ b/include/net/ip_tunnels.h +@@ -558,4 +558,9 @@ static inline void ip_tunnel_info_opts_s + + #endif /* CONFIG_INET */ + ++/* QCA NSS Clients Support - Start */ ++void ipip6_update_offload_stats(struct net_device *dev, void *ptr); ++void ip6_update_offload_stats(struct net_device *dev, void *ptr); ++/* QCA NSS Clients Support - End */ ++ + #endif /* __NET_IP_TUNNELS_H */ +--- a/net/ipv6/ip6_tunnel.c ++++ b/net/ipv6/ip6_tunnel.c +@@ -2411,6 +2411,26 @@ nla_put_failure: + return -EMSGSIZE; + } + ++/* QCA NSS Client Support - Start */ ++/* ++ * Update offload stats ++ */ ++void ip6_update_offload_stats(struct net_device *dev, void *ptr) ++{ ++ struct pcpu_sw_netstats *tstats = per_cpu_ptr(dev->tstats, 0); ++ const struct pcpu_sw_netstats *offload_stats = ++ (struct pcpu_sw_netstats *)ptr; ++ ++ u64_stats_update_begin(&tstats->syncp); ++ u64_stats_add(&tstats->tx_packets, u64_stats_read(&offload_stats->tx_packets)); ++ u64_stats_add(&tstats->tx_bytes, u64_stats_read(&offload_stats->tx_bytes)); ++ u64_stats_add(&tstats->rx_packets, u64_stats_read(&offload_stats->rx_packets)); ++ u64_stats_add(&tstats->rx_bytes, u64_stats_read(&offload_stats->rx_bytes)); ++ u64_stats_update_end(&tstats->syncp); ++} ++EXPORT_SYMBOL(ip6_update_offload_stats); ++/* QCA NSS Client Support - End */ ++ + struct net *ip6_tnl_get_link_net(const struct net_device *dev) + { + struct ip6_tnl *tunnel = netdev_priv(dev); +--- a/net/ipv6/sit.c ++++ b/net/ipv6/sit.c +@@ -1733,6 +1733,23 @@ nla_put_failure: + return -EMSGSIZE; + } + ++/* QCA NSS Clients Support - Start */ ++void ipip6_update_offload_stats(struct net_device *dev, void *ptr) ++{ ++ struct pcpu_sw_netstats *tstats = per_cpu_ptr(dev->tstats, 0); ++ const struct pcpu_sw_netstats *offload_stats = ++ (struct pcpu_sw_netstats *)ptr; ++ ++ u64_stats_update_begin(&tstats->syncp); ++ u64_stats_add(&tstats->tx_packets, u64_stats_read(&offload_stats->tx_packets)); ++ u64_stats_add(&tstats->tx_bytes, u64_stats_read(&offload_stats->tx_bytes)); ++ u64_stats_add(&tstats->rx_packets, u64_stats_read(&offload_stats->rx_packets)); ++ u64_stats_add(&tstats->rx_bytes, u64_stats_read(&offload_stats->rx_bytes)); ++ u64_stats_update_end(&tstats->syncp); ++} ++EXPORT_SYMBOL(ipip6_update_offload_stats); ++/* QCA NSS Clients Support - End */ ++ + static const struct nla_policy ipip6_policy[IFLA_IPTUN_MAX + 1] = { + [IFLA_IPTUN_LINK] = { .type = NLA_U32 }, + [IFLA_IPTUN_LOCAL] = { .type = NLA_U32 }, diff --git a/target/linux/qualcommax/patches-6.6/0603-5-qca-nss-clients-add-vxlan-support.patch b/target/linux/qualcommax/patches-6.6/0603-5-qca-nss-clients-add-vxlan-support.patch new file mode 100644 index 00000000000000..7d05fd1aff619c --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-5-qca-nss-clients-add-vxlan-support.patch @@ -0,0 +1,103 @@ +--- a/drivers/net/vxlan/vxlan_core.c ++++ b/drivers/net/vxlan/vxlan_core.c +@@ -29,6 +29,20 @@ + #include + #include + ++ATOMIC_NOTIFIER_HEAD(vxlan_fdb_notifier_list); ++ ++void vxlan_fdb_register_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_register(&vxlan_fdb_notifier_list, nb); ++} ++EXPORT_SYMBOL(vxlan_fdb_register_notify); ++ ++void vxlan_fdb_unregister_notify(struct notifier_block *nb) ++{ ++ atomic_notifier_chain_unregister(&vxlan_fdb_notifier_list, nb); ++} ++EXPORT_SYMBOL(vxlan_fdb_unregister_notify); ++ + #if IS_ENABLED(CONFIG_IPV6) + #include + #include +@@ -260,6 +274,7 @@ static void __vxlan_fdb_notify(struct vx + { + struct net *net = dev_net(vxlan->dev); + struct sk_buff *skb; ++ struct vxlan_fdb_event vfe; + int err = -ENOBUFS; + + skb = nlmsg_new(vxlan_nlmsg_size(), GFP_ATOMIC); +@@ -275,6 +290,10 @@ static void __vxlan_fdb_notify(struct vx + } + + rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC); ++ vfe.dev = vxlan->dev; ++ vfe.rdst = rd; ++ ether_addr_copy(vfe.eth_addr, fdb->eth_addr); ++ atomic_notifier_call_chain(&vxlan_fdb_notifier_list, type, (void *)&vfe); + return; + errout: + if (err < 0) +@@ -441,6 +460,18 @@ static struct vxlan_fdb *vxlan_find_mac( + return f; + } + ++/* Find and update age of fdb entry corresponding to MAC. */ ++void vxlan_fdb_update_mac(struct vxlan_dev *vxlan, const u8 *mac, uint32_t vni) ++{ ++ u32 hash_index; ++ ++ hash_index = fdb_head_index(vxlan, mac, vni); ++ spin_lock_bh(&vxlan->hash_lock[hash_index]); ++ vxlan_find_mac(vxlan, mac, vni); ++ spin_unlock_bh(&vxlan->hash_lock[hash_index]); ++} ++EXPORT_SYMBOL(vxlan_fdb_update_mac); ++ + /* caller should hold vxlan->hash_lock */ + static struct vxlan_rdst *vxlan_fdb_find_rdst(struct vxlan_fdb *f, + union vxlan_addr *ip, __be16 port, +@@ -2581,6 +2612,9 @@ void vxlan_xmit_one(struct sk_buff *skb, + goto out_unlock; + } + ++ /* Reset the skb_iif to Tunnels interface index */ ++ skb->skb_iif = dev->ifindex; ++ + tos = ip_tunnel_ecn_encap(tos, old_iph, skb); + ttl = ttl ? : ip4_dst_hoplimit(&rt->dst); + err = vxlan_build_skb(skb, ndst, sizeof(struct iphdr), +@@ -2652,6 +2686,9 @@ void vxlan_xmit_one(struct sk_buff *skb, + if (err < 0) + goto tx_error; + ++ /* Reset the skb_iif to Tunnels interface index */ ++ skb->skb_iif = dev->ifindex; ++ + udp_tunnel6_xmit_skb(ndst, sock6->sock->sk, skb, dev, + &local_ip.sin6.sin6_addr, + &dst->sin6.sin6_addr, tos, ttl, +--- a/include/net/vxlan.h ++++ b/include/net/vxlan.h +@@ -352,6 +352,19 @@ struct vxlan_dev { + VXLAN_F_VNIFILTER | \ + VXLAN_F_LOCALBYPASS) + ++/* ++ * Application data for fdb notifier event ++ */ ++struct vxlan_fdb_event { ++ struct net_device *dev; ++ struct vxlan_rdst *rdst; ++ u8 eth_addr[ETH_ALEN]; ++}; ++ ++extern void vxlan_fdb_register_notify(struct notifier_block *nb); ++extern void vxlan_fdb_unregister_notify(struct notifier_block *nb); ++extern void vxlan_fdb_update_mac(struct vxlan_dev *vxlan, const u8 *mac, uint32_t vni); ++ + struct net_device *vxlan_dev_create(struct net *net, const char *name, + u8 name_assign_type, struct vxlan_config *conf); + diff --git a/target/linux/qualcommax/patches-6.6/0603-6-qca-nss-clients-add-l2tp-offloading-support.patch b/target/linux/qualcommax/patches-6.6/0603-6-qca-nss-clients-add-l2tp-offloading-support.patch new file mode 100644 index 00000000000000..4032eb3c227134 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-6-qca-nss-clients-add-l2tp-offloading-support.patch @@ -0,0 +1,368 @@ +--- a/include/linux/ppp_channel.h ++++ b/include/linux/ppp_channel.h +@@ -61,6 +61,51 @@ struct ppp_channel { + }; + + #ifdef __KERNEL__ ++/* Call this to obtain the underlying protocol of the PPP channel, ++ * e.g. PX_PROTO_OE ++ */ ++extern int ppp_channel_get_protocol(struct ppp_channel *); ++ ++/* Call this to hold a channel */ ++extern bool ppp_channel_hold(struct ppp_channel *); ++ ++/* Call this to release a hold you have upon a channel */ ++extern void ppp_channel_release(struct ppp_channel *); ++ ++/* Release hold on PPP channels */ ++extern void ppp_release_channels(struct ppp_channel *channels[], ++ unsigned int chan_sz); ++ ++/* Test if ppp xmit lock is locked */ ++extern bool ppp_is_xmit_locked(struct net_device *dev); ++ ++/* Call this get protocol version */ ++extern int ppp_channel_get_proto_version(struct ppp_channel *); ++ ++/* Get the device index associated with a channel, or 0, if none */ ++extern int ppp_dev_index(struct ppp_channel *); ++ ++/* Hold PPP channels for the PPP device */ ++extern int ppp_hold_channels(struct net_device *dev, ++ struct ppp_channel *channels[], ++ unsigned int chan_sz); ++extern int __ppp_hold_channels(struct net_device *dev, ++ struct ppp_channel *channels[], ++ unsigned int chan_sz); ++ ++/* Test if the ppp device is a multi-link ppp device */ ++extern int ppp_is_multilink(struct net_device *dev); ++extern int __ppp_is_multilink(struct net_device *dev); ++ ++/* Update statistics of the PPP net_device by incrementing related ++ * statistics field value with corresponding parameter ++ */ ++extern void ppp_update_stats(struct net_device *dev, unsigned long rx_packets, ++ unsigned long rx_bytes, unsigned long tx_packets, ++ unsigned long tx_bytes, unsigned long rx_errors, ++ unsigned long tx_errors, unsigned long rx_dropped, ++ unsigned long tx_dropped); ++ + /* Called by the channel when it can send some more data. */ + extern void ppp_output_wakeup(struct ppp_channel *); + +@@ -148,5 +193,17 @@ extern void ppp_update_stats(struct net_ + * that ppp_unregister_channel returns. + */ + ++/* QCA NSS Clients Support - Start */ ++/* PPP channel connection event types */ ++#define PPP_CHANNEL_DISCONNECT 0 ++#define PPP_CHANNEL_CONNECT 1 ++ ++/* Register the PPP channel connect notifier */ ++extern void ppp_channel_connection_register_notify(struct notifier_block *nb); ++ ++/* Unregister the PPP channel connect notifier */ ++extern void ppp_channel_connection_unregister_notify(struct notifier_block *nb); ++/* QCA NSS Clients Support - End */ ++ + #endif /* __KERNEL__ */ + #endif +--- a/include/linux/if_pppol2tp.h ++++ b/include/linux/if_pppol2tp.h +@@ -12,4 +12,30 @@ + #include + #include + ++/* QCA NSS ECM support - Start */ ++/* ++ * Holds L2TP channel info ++ */ ++struct pppol2tp_common_addr { ++ int tunnel_version; /* v2 or v3 */ ++ __u32 local_tunnel_id, remote_tunnel_id; /* tunnel id */ ++ __u32 local_session_id, remote_session_id; /* session id */ ++ struct sockaddr_in local_addr, remote_addr; /* ip address and port */ ++}; ++ ++/* ++ * L2TP channel operations ++ */ ++struct pppol2tp_channel_ops { ++ struct ppp_channel_ops ops; /* ppp channel ops */ ++}; ++ ++/* ++ * exported function which calls pppol2tp channel's get addressing ++ * function ++ */ ++extern int pppol2tp_channel_addressing_get(struct ppp_channel *, ++ struct pppol2tp_common_addr *); ++/* QCA NSS ECM support - End */ ++ + #endif +--- a/net/l2tp/l2tp_ppp.c ++++ b/net/l2tp/l2tp_ppp.c +@@ -123,9 +123,17 @@ struct pppol2tp_session { + }; + + static int pppol2tp_xmit(struct ppp_channel *chan, struct sk_buff *skb); +- +-static const struct ppp_channel_ops pppol2tp_chan_ops = { +- .start_xmit = pppol2tp_xmit, ++static int pppol2tp_get_channel_protocol(struct ppp_channel *); ++static int pppol2tp_get_channel_protocol_ver(struct ppp_channel *); ++static void pppol2tp_hold_chan(struct ppp_channel *); ++static void pppol2tp_release_chan(struct ppp_channel *); ++ ++static const struct pppol2tp_channel_ops pppol2tp_chan_ops = { ++ .ops.start_xmit = pppol2tp_xmit, ++ .ops.get_channel_protocol = pppol2tp_get_channel_protocol, ++ .ops.get_channel_protocol_ver = pppol2tp_get_channel_protocol_ver, ++ .ops.hold = pppol2tp_hold_chan, ++ .ops.release = pppol2tp_release_chan, + }; + + static const struct proto_ops pppol2tp_ops; +@@ -373,6 +381,13 @@ static int pppol2tp_xmit(struct ppp_chan + skb->data[0] = PPP_ALLSTATIONS; + skb->data[1] = PPP_UI; + ++ /* QCA NSS ECM support - start */ ++ /* set incoming interface as the ppp interface */ ++ if ((skb->protocol == htons(ETH_P_IP)) || ++ (skb->protocol == htons(ETH_P_IPV6))) ++ skb->skb_iif = ppp_dev_index(chan); ++ /* QCA NSS ECM support - End */ ++ + local_bh_disable(); + l2tp_xmit_skb(session, skb); + local_bh_enable(); +@@ -818,7 +833,7 @@ static int pppol2tp_connect(struct socke + po->chan.hdrlen = PPPOL2TP_L2TP_HDR_SIZE_NOSEQ; + + po->chan.private = sk; +- po->chan.ops = &pppol2tp_chan_ops; ++ po->chan.ops = (struct ppp_channel_ops *)&pppol2tp_chan_ops.ops; + po->chan.mtu = pppol2tp_tunnel_mtu(tunnel); + + error = ppp_register_net_channel(sock_net(sk), &po->chan); +@@ -1732,6 +1747,109 @@ static void __exit pppol2tp_exit(void) + unregister_pernet_device(&pppol2tp_net_ops); + } + ++/* QCA NSS ECM support - Start */ ++/* pppol2tp_hold_chan() */ ++static void pppol2tp_hold_chan(struct ppp_channel *chan) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ ++ sock_hold(sk); ++} ++ ++/* pppol2tp_release_chan() */ ++static void pppol2tp_release_chan(struct ppp_channel *chan) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ ++ sock_put(sk); ++} ++ ++/* pppol2tp_get_channel_protocol() ++ * Return the protocol type of the L2TP over PPP protocol ++ */ ++static int pppol2tp_get_channel_protocol(struct ppp_channel *chan) ++{ ++ return PX_PROTO_OL2TP; ++} ++ ++/* pppol2tp_get_channel_protocol_ver() ++ * Return the protocol version of the L2TP over PPP protocol ++ */ ++static int pppol2tp_get_channel_protocol_ver(struct ppp_channel *chan) ++{ ++ struct sock *sk; ++ struct l2tp_session *session; ++ struct l2tp_tunnel *tunnel; ++ int version = 0; ++ ++ if (chan && chan->private) ++ sk = (struct sock *)chan->private; ++ else ++ return -1; ++ ++ /* Get session and tunnel contexts from the socket */ ++ session = pppol2tp_sock_to_session(sk); ++ if (!session) ++ return -1; ++ ++ tunnel = session->tunnel; ++ if (!tunnel) { ++ sock_put(sk); ++ return -1; ++ } ++ ++ version = tunnel->version; ++ ++ sock_put(sk); ++ ++ return version; ++} ++ ++/* pppol2tp_get_addressing() */ ++static int pppol2tp_get_addressing(struct ppp_channel *chan, ++ struct pppol2tp_common_addr *addr) ++{ ++ struct sock *sk = (struct sock *)chan->private; ++ struct l2tp_session *session; ++ struct l2tp_tunnel *tunnel; ++ struct inet_sock *isk = NULL; ++ int err = -ENXIO; ++ ++ /* Get session and tunnel contexts from the socket */ ++ session = pppol2tp_sock_to_session(sk); ++ if (!session) ++ return err; ++ ++ tunnel = session->tunnel; ++ if (!tunnel) { ++ sock_put(sk); ++ return err; ++ } ++ isk = inet_sk(tunnel->sock); ++ ++ addr->local_tunnel_id = tunnel->tunnel_id; ++ addr->remote_tunnel_id = tunnel->peer_tunnel_id; ++ addr->local_session_id = session->session_id; ++ addr->remote_session_id = session->peer_session_id; ++ ++ addr->local_addr.sin_port = isk->inet_sport; ++ addr->remote_addr.sin_port = isk->inet_dport; ++ addr->local_addr.sin_addr.s_addr = isk->inet_saddr; ++ addr->remote_addr.sin_addr.s_addr = isk->inet_daddr; ++ ++ sock_put(sk); ++ return 0; ++} ++ ++/* pppol2tp_channel_addressing_get() */ ++int pppol2tp_channel_addressing_get(struct ppp_channel *chan, ++ struct pppol2tp_common_addr *addr) ++{ ++ return pppol2tp_get_addressing(chan, addr); ++} ++EXPORT_SYMBOL(pppol2tp_channel_addressing_get); ++/* QCA NSS ECM support - End */ ++ + module_init(pppol2tp_init); + module_exit(pppol2tp_exit); + +--- a/drivers/net/ppp/ppp_generic.c ++++ b/drivers/net/ppp/ppp_generic.c +@@ -3743,6 +3743,32 @@ int ppp_is_multilink(struct net_device * + } + EXPORT_SYMBOL(ppp_is_multilink); + ++/* __ppp_is_multilink() ++ * Returns >0 if the device is a multilink PPP netdevice, 0 if not or < 0 ++ * if the device is not PPP. Caller should acquire ppp_lock before calling ++ * this function ++ */ ++int __ppp_is_multilink(struct net_device *dev) ++{ ++ struct ppp *ppp; ++ unsigned int flags; ++ ++ if (!dev) ++ return -1; ++ ++ if (dev->type != ARPHRD_PPP) ++ return -1; ++ ++ ppp = netdev_priv(dev); ++ flags = ppp->flags; ++ ++ if (flags & SC_MULTILINK) ++ return 1; ++ ++ return 0; ++} ++EXPORT_SYMBOL(__ppp_is_multilink); ++ + /* ppp_channel_get_protocol() + * Call this to obtain the underlying protocol of the PPP channel, + * e.g. PX_PROTO_OE +@@ -3881,6 +3907,59 @@ int ppp_hold_channels(struct net_device + } + EXPORT_SYMBOL(ppp_hold_channels); + ++/* __ppp_hold_channels() ++ * Returns the PPP channels of the PPP device, storing each one into ++ * channels[]. ++ * ++ * channels[] has chan_sz elements. ++ * This function returns the number of channels stored, up to chan_sz. ++ * It will return < 0 if the device is not PPP. ++ * ++ * You MUST release the channels using ppp_release_channels(). ++ */ ++int __ppp_hold_channels(struct net_device *dev, struct ppp_channel *channels[], ++ unsigned int chan_sz) ++{ ++ struct ppp *ppp; ++ int c; ++ struct channel *pch; ++ ++ if (!dev) ++ return -1; ++ ++ if (dev->type != ARPHRD_PPP) ++ return -1; ++ ++ ppp = netdev_priv(dev); ++ ++ c = 0; ++ list_for_each_entry(pch, &ppp->channels, clist) { ++ struct ppp_channel *chan; ++ ++ if (!pch->chan) { ++ /* Channel is going / gone away */ ++ continue; ++ } ++ ++ if (c == chan_sz) { ++ /* No space to record channel */ ++ return c; ++ } ++ ++ /* Hold the channel, if supported */ ++ chan = pch->chan; ++ if (!chan->ops->hold) ++ continue; ++ ++ chan->ops->hold(chan); ++ ++ /* Record the channel */ ++ channels[c++] = chan; ++ } ++ return c; ++} ++EXPORT_SYMBOL(__ppp_hold_channels); ++ + /* ppp_release_channels() + * Releases channels + */ +--- a/net/l2tp/l2tp_core.h ++++ b/net/l2tp/l2tp_core.h +@@ -235,6 +235,9 @@ struct l2tp_session *l2tp_session_get_by + void l2tp_stats_update(struct l2tp_tunnel *tunnel, struct l2tp_session *session, + struct l2tp_stats *stats); + ++void l2tp_stats_update(struct l2tp_tunnel *tunnel, struct l2tp_session *session, ++ struct l2tp_stats *stats); ++ + /* Tunnel and session lifetime management. + * Creation of a new instance is a two-step process: create, then register. + * Destruction is triggered using the *_delete functions, and completes asynchronously. diff --git a/target/linux/qualcommax/patches-6.6/0603-7-qca-nss-clients-iptunnel-lock-this-cpu.patch b/target/linux/qualcommax/patches-6.6/0603-7-qca-nss-clients-iptunnel-lock-this-cpu.patch new file mode 100644 index 00000000000000..e4ed49ea4c21fb --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-7-qca-nss-clients-iptunnel-lock-this-cpu.patch @@ -0,0 +1,22 @@ +--- a/net/ipv6/ip6_tunnel.c ++++ b/net/ipv6/ip6_tunnel.c +@@ -2417,7 +2417,7 @@ nla_put_failure: + */ + void ip6_update_offload_stats(struct net_device *dev, void *ptr) + { +- struct pcpu_sw_netstats *tstats = per_cpu_ptr(dev->tstats, 0); ++ struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); + const struct pcpu_sw_netstats *offload_stats = + (struct pcpu_sw_netstats *)ptr; + +--- a/net/ipv6/sit.c ++++ b/net/ipv6/sit.c +@@ -1736,7 +1736,7 @@ nla_put_failure: + /* QCA NSS Clients Support - Start */ + void ipip6_update_offload_stats(struct net_device *dev, void *ptr) + { +- struct pcpu_sw_netstats *tstats = per_cpu_ptr(dev->tstats, 0); ++ struct pcpu_sw_netstats *tstats = this_cpu_ptr(dev->tstats); + const struct pcpu_sw_netstats *offload_stats = + (struct pcpu_sw_netstats *)ptr; + diff --git a/target/linux/qualcommax/patches-6.6/0603-8-qca-nss-clients-add-tls-mgr-support.patch b/target/linux/qualcommax/patches-6.6/0603-8-qca-nss-clients-add-tls-mgr-support.patch new file mode 100644 index 00000000000000..0499e237f6be88 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0603-8-qca-nss-clients-add-tls-mgr-support.patch @@ -0,0 +1,24 @@ +--- /dev/null ++++ b/include/uapi/linux/tlshdr.h +@@ -0,0 +1,21 @@ ++#ifndef _UAPI_LINUX_TLSHDR_H ++#define _UAPI_LINUX_TLSHDR_H ++ ++#include ++ ++struct tlshdr { ++ __u8 type; ++ __be16 version; ++ __be16 len; ++} __attribute__((packed)); ++ ++#define TLSHDR_REC_TYPE_CCS 20 /* TLS packet is change cipher specification */ ++#define TLSHDR_REC_TYPE_ALERT 21 /* TLS packet is Alert */ ++#define TLSHDR_REC_TYPE_HANDSHAKE 22 /* TLS packet is Handshake */ ++#define TLSHDR_REC_TYPE_DATA 23 /* TLS packet is Application data */ ++ ++#define TLSHDR_VERSION_1_1 0x0302 /* TLS Header Version(tls 1.1) */ ++#define TLSHDR_VERSION_1_2 0x0303 /* TLS Header Version(tls 1.2) */ ++#define TLSHDR_VERSION_1_3 0x0304 /* TLS Header Version(tls 1.3) */ ++ ++#endif /* _UAPI_LINUX_TLSHDR_H */ diff --git a/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch b/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch new file mode 100644 index 00000000000000..edf21700c3e94c --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch @@ -0,0 +1,876 @@ +--- a/include/linux/if_bridge.h ++++ b/include/linux/if_bridge.h +@@ -258,4 +258,17 @@ extern br_get_dst_hook_t __rcu *br_get_d + extern struct net_device *br_fdb_bridge_dev_get_and_hold(struct net_bridge *br); + /* QCA NSS bridge-mgr support - End */ + ++/* QCA qca-mcs support - Start */ ++typedef struct net_bridge_port *br_get_dst_hook_t(const struct net_bridge_port *src, ++ struct sk_buff **skb); ++extern br_get_dst_hook_t __rcu *br_get_dst_hook; ++ ++typedef int (br_multicast_handle_hook_t)(const struct net_bridge_port *src, ++ struct sk_buff *skb); ++extern br_multicast_handle_hook_t __rcu *br_multicast_handle_hook; ++ ++typedef void (br_notify_hook_t)(int group, int event, const void *ptr); ++extern br_notify_hook_t __rcu *br_notify_hook; ++/* QCA qca-mcs support - End */ ++ + #endif +--- a/net/bridge/br_fdb.c ++++ b/net/bridge/br_fdb.c +@@ -239,6 +239,8 @@ static void fdb_notify(struct net_bridge + kfree_skb(skb); + goto errout; + } ++ ++ __br_notify(RTNLGRP_NEIGH, type, fdb); /* QCA qca-mcs support */ + rtnl_notify(skb, net, 0, RTNLGRP_NEIGH, NULL, GFP_ATOMIC); + return; + errout: +@@ -305,6 +307,7 @@ struct net_bridge_fdb_entry *br_fdb_find + { + return fdb_find_rcu(&br->fdb_hash_tbl, addr, vid); + } ++EXPORT_SYMBOL_GPL(br_fdb_find_rcu); /* QCA qca-mcs support */ + + /* When a static FDB entry is added, the mac address from the entry is + * added to the bridge private HW address list and all required ports +--- a/net/bridge/br_private.h ++++ b/net/bridge/br_private.h +@@ -906,6 +906,7 @@ void br_manage_promisc(struct net_bridge + int nbp_backup_change(struct net_bridge_port *p, struct net_device *backup_dev); + + /* br_input.c */ ++int br_pass_frame_up(struct sk_buff *skb); /* QCA qca-mcs support */ + int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb); + rx_handler_func_t *br_get_rx_handler(const struct net_device *dev); + +@@ -2268,4 +2269,14 @@ struct nd_msg *br_is_nd_neigh_msg(struct + bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid); + #define __br_get(__hook, __default, __args ...) \ + (__hook ? (__hook(__args)) : (__default)) /* QCA NSS ECM support */ ++ ++/* QCA qca-mcs support - Start */ ++static inline void __br_notify(int group, int type, const void *data) ++{ ++ br_notify_hook_t *notify_hook = rcu_dereference(br_notify_hook); ++ ++ if (notify_hook) ++ notify_hook(group, type, data); ++} ++/* QCA qca-mcs support - End */ + #endif +--- a/net/bridge/br_netlink.c ++++ b/net/bridge/br_netlink.c +@@ -656,6 +656,7 @@ void br_info_notify(int event, const str + kfree_skb(skb); + goto errout; + } ++ __br_notify(RTNLGRP_LINK, event, port); /* QCA qca-mcs support */ + rtnl_notify(skb, net, 0, RTNLGRP_LINK, NULL, GFP_ATOMIC); + return; + errout: +--- a/net/bridge/br.c ++++ b/net/bridge/br.c +@@ -472,6 +472,12 @@ static void __exit br_deinit(void) + br_fdb_fini(); + } + ++/* QCA qca-mcs support - Start */ ++/* Hook for bridge event notifications */ ++br_notify_hook_t __rcu *br_notify_hook __read_mostly; ++EXPORT_SYMBOL_GPL(br_notify_hook); ++/* QCA qca-mcs support - End */ ++ + module_init(br_init) + module_exit(br_deinit) + MODULE_LICENSE("GPL"); +--- a/net/bridge/br_device.c ++++ b/net/bridge/br_device.c +@@ -83,6 +83,13 @@ netdev_tx_t br_dev_xmit(struct sk_buff * + if (is_broadcast_ether_addr(dest)) { + br_flood(br, skb, BR_PKT_BROADCAST, false, true, vid); + } else if (is_multicast_ether_addr(dest)) { ++ /* QCA qca-mcs support - Start */ ++ br_multicast_handle_hook_t *multicast_handle_hook = ++ rcu_dereference(br_multicast_handle_hook); ++ if (!__br_get(multicast_handle_hook, true, NULL, skb)) ++ goto out; ++ /* QCA qca-mcs support - End */ ++ + if (unlikely(netpoll_tx_running(dev))) { + br_flood(br, skb, BR_PKT_MULTICAST, false, true, vid); + goto out; +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c +@@ -30,7 +30,17 @@ br_netif_receive_skb(struct net *net, st + return netif_receive_skb(skb); + } + +-static int br_pass_frame_up(struct sk_buff *skb) ++/* QCA qca-mcs support - Start */ ++/* Hook for external Multicast handler */ ++br_multicast_handle_hook_t __rcu *br_multicast_handle_hook __read_mostly; ++EXPORT_SYMBOL_GPL(br_multicast_handle_hook); ++ ++/* Hook for external forwarding logic */ ++br_get_dst_hook_t __rcu *br_get_dst_hook __read_mostly; ++EXPORT_SYMBOL_GPL(br_get_dst_hook); ++/* QCA qca-mcs support - End */ ++ ++int br_pass_frame_up(struct sk_buff *skb) + { + struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev; + struct net_bridge *br = netdev_priv(brdev); +@@ -69,6 +79,7 @@ static int br_pass_frame_up(struct sk_bu + dev_net(indev), NULL, skb, indev, NULL, + br_netif_receive_skb); + } ++EXPORT_SYMBOL_GPL(br_pass_frame_up); /* QCA qca-mcs support */ + + /* note: already called with rcu_read_lock */ + int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb) +@@ -82,6 +93,11 @@ int br_handle_frame_finish(struct net *n + struct net_bridge_mcast *brmctx; + struct net_bridge_vlan *vlan; + struct net_bridge *br; ++ /* QCA qca-mcs support - Start */ ++ br_multicast_handle_hook_t *multicast_handle_hook; ++ struct net_bridge_port *pdst = NULL; ++ br_get_dst_hook_t *get_dst_hook = rcu_dereference(br_get_dst_hook); ++ /* QCA qca-mcs support - End */ + u16 vid = 0; + u8 state; + +@@ -175,6 +191,12 @@ int br_handle_frame_finish(struct net *n + + switch (pkt_type) { + case BR_PKT_MULTICAST: ++ /* QCA qca-mcs support - Start */ ++ multicast_handle_hook = rcu_dereference(br_multicast_handle_hook); ++ if (!__br_get(multicast_handle_hook, true, p, skb)) ++ goto out; ++ /* QCA qca-mcs support - End */ ++ + mdst = br_mdb_get(brmctx, skb, vid); + if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) && + br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) { +@@ -190,8 +212,15 @@ int br_handle_frame_finish(struct net *n + } + break; + case BR_PKT_UNICAST: +- dst = br_fdb_find_rcu(br, eth_hdr(skb)->h_dest, vid); +- break; ++ /* QCA qca-mcs support - Start */ ++ pdst = __br_get(get_dst_hook, NULL, p, &skb); ++ if (pdst) { ++ if (!skb) ++ goto out; ++ } else { ++ /* QCA qca-mcs support - End */ ++ dst = br_fdb_find_rcu(br, eth_hdr(skb)->h_dest, vid); ++ } + default: + break; + } +@@ -206,6 +235,13 @@ int br_handle_frame_finish(struct net *n + dst->used = now; + br_forward(dst->dst, skb, local_rcv, false); + } else { ++ /* QCA qca-mcs support - Start */ ++ if (pdst) { ++ br_forward(pdst, skb, local_rcv, false); ++ goto out; ++ } ++ /* QCA qca-mcs support - End */ ++ + if (!mcast_hit) + br_flood(br, skb, pkt_type, local_rcv, false, vid); + else +--- a/include/linux/mroute.h ++++ b/include/linux/mroute.h +@@ -92,4 +92,44 @@ struct rtmsg; + int ipmr_get_route(struct net *net, struct sk_buff *skb, + __be32 saddr, __be32 daddr, + struct rtmsg *rtm, u32 portid); ++ ++/* QCA ECM qca-mcs support - Start */ ++#define IPMR_MFC_EVENT_UPDATE 1 ++#define IPMR_MFC_EVENT_DELETE 2 ++ ++/* ++ * Callback to registered modules in the event of updates to a multicast group ++ */ ++typedef void (*ipmr_mfc_event_offload_callback_t)(__be32 origin, __be32 group, ++ u32 max_dest_dev, ++ u32 dest_dev_idx[], ++ u8 op); ++ ++/* ++ * Register the callback used to inform offload modules when updates occur to ++ * MFC. The callback is registered by offload modules ++ */ ++extern bool ipmr_register_mfc_event_offload_callback( ++ ipmr_mfc_event_offload_callback_t mfc_offload_cb); ++ ++/* ++ * De-Register the callback used to inform offload modules when updates occur ++ * to MFC ++ */ ++extern void ipmr_unregister_mfc_event_offload_callback(void); ++ ++/* ++ * Find the destination interface list, given a multicast group and source ++ */ ++extern int ipmr_find_mfc_entry(struct net *net, __be32 origin, __be32 group, ++ u32 max_dst_cnt, u32 dest_dev[]); ++ ++/* ++ * Out-of-band multicast statistics update for flows that are offloaded from ++ * Linux ++ */ ++extern int ipmr_mfc_stats_update(struct net *net, __be32 origin, __be32 group, ++ u64 pkts_in, u64 bytes_in, ++ u64 pkts_out, u64 bytes_out); ++/* QCA ECM qca-mcs support - End */ + #endif +--- a/include/linux/mroute6.h ++++ b/include/linux/mroute6.h +@@ -137,4 +137,47 @@ static inline int ip6mr_sk_ioctl(struct + return 1; + } + #endif ++ ++/* QCA qca-mcs support - Start */ ++#define IP6MR_MFC_EVENT_UPDATE 1 ++#define IP6MR_MFC_EVENT_DELETE 2 ++ ++/* ++ * Callback to registered modules in the event of updates to a multicast group ++ */ ++typedef void (*ip6mr_mfc_event_offload_callback_t)(struct in6_addr *origin, ++ struct in6_addr *group, ++ u32 max_dest_dev, ++ u32 dest_dev_idx[], ++ uint8_t op); ++ ++/* ++ * Register the callback used to inform offload modules when updates occur ++ * to MFC. The callback is registered by offload modules ++ */ ++extern bool ip6mr_register_mfc_event_offload_callback( ++ ip6mr_mfc_event_offload_callback_t mfc_offload_cb); ++ ++/* ++ * De-Register the callback used to inform offload modules when updates occur ++ * to MFC ++ */ ++extern void ip6mr_unregister_mfc_event_offload_callback(void); ++ ++/* ++ * Find the destination interface list given a multicast group and source ++ */ ++extern int ip6mr_find_mfc_entry(struct net *net, struct in6_addr *origin, ++ struct in6_addr *group, u32 max_dst_cnt, ++ u32 dest_dev[]); ++ ++/* ++ * Out-of-band multicast statistics update for flows that are offloaded from ++ * Linux ++ */ ++extern int ip6mr_mfc_stats_update(struct net *net, struct in6_addr *origin, ++ struct in6_addr *group, uint64_t pkts_in, ++ uint64_t bytes_in, uint64_t pkts_out, ++ uint64_t bytes_out); ++/* QCA qca-mcs support - End */ + #endif +--- a/net/ipv4/ipmr.c ++++ b/net/ipv4/ipmr.c +@@ -89,6 +89,9 @@ static struct net_device *vif_dev_read(c + /* Special spinlock for queue of unresolved entries */ + static DEFINE_SPINLOCK(mfc_unres_lock); + ++/* spinlock for offload */ ++static DEFINE_SPINLOCK(lock); /* QCA ECM qca-mcs support */ ++ + /* We return to original Alan's scheme. Hash table of resolved + * entries is changed only in process context and protected + * with weak lock mrt_lock. Queue of unresolved entries is protected +@@ -112,6 +115,9 @@ static void mroute_netlink_event(struct + static void igmpmsg_netlink_event(const struct mr_table *mrt, struct sk_buff *pkt); + static void mroute_clean_tables(struct mr_table *mrt, int flags); + static void ipmr_expire_process(struct timer_list *t); ++static struct mfc_cache *ipmr_cache_find(struct mr_table *mrt, __be32 origin, ++ __be32 mcastgrp); ++static ipmr_mfc_event_offload_callback_t __rcu ipmr_mfc_event_offload_callback; /* QCA ECM qca-mcs support */ + + #ifdef CONFIG_IP_MROUTE_MULTIPLE_TABLES + #define ipmr_for_each_table(mrt, net) \ +@@ -223,6 +229,80 @@ static int ipmr_rule_fill(struct fib_rul + return 0; + } + ++/* QCA ECM qca-mcs support - Start */ ++/* ipmr_sync_entry_update() ++ * Call the registered offload callback to report an update to a multicast ++ * route entry. The callback receives the list of destination interfaces and ++ * the interface count ++ */ ++static void ipmr_sync_entry_update(struct mr_table *mrt, ++ struct mfc_cache *cache) ++{ ++ int vifi, dest_if_count = 0; ++ u32 dest_dev[MAXVIFS]; ++ __be32 origin; ++ __be32 group; ++ ipmr_mfc_event_offload_callback_t offload_update_cb_f; ++ ++ memset(dest_dev, 0, sizeof(dest_dev)); ++ ++ origin = cache->mfc_origin; ++ group = cache->mfc_mcastgrp; ++ ++ spin_lock(&mrt_lock); ++ for (vifi = 0; vifi < cache->_c.mfc_un.res.maxvif; vifi++) { ++ if (!((cache->_c.mfc_un.res.ttls[vifi] > 0) && ++ (cache->_c.mfc_un.res.ttls[vifi] < 255))) { ++ continue; ++ } ++ if (dest_if_count == MAXVIFS) { ++ spin_unlock(&mrt_lock); ++ return; ++ } ++ ++ if (!VIF_EXISTS(mrt, vifi)) { ++ spin_unlock(&mrt_lock); ++ return; ++ } ++ dest_dev[dest_if_count] = mrt->vif_table[vifi].dev->ifindex; ++ dest_if_count++; ++ } ++ spin_unlock(&mrt_lock); ++ ++ rcu_read_lock(); ++ offload_update_cb_f = rcu_dereference(ipmr_mfc_event_offload_callback); ++ ++ if (!offload_update_cb_f) { ++ rcu_read_unlock(); ++ return; ++ } ++ ++ offload_update_cb_f(group, origin, dest_if_count, dest_dev, ++ IPMR_MFC_EVENT_UPDATE); ++ rcu_read_unlock(); ++} ++ ++/* ipmr_sync_entry_delete() ++ * Call the registered offload callback to inform of a multicast route entry ++ * delete event ++ */ ++static void ipmr_sync_entry_delete(u32 origin, u32 group) ++{ ++ ipmr_mfc_event_offload_callback_t offload_update_cb_f; ++ ++ rcu_read_lock(); ++ offload_update_cb_f = rcu_dereference(ipmr_mfc_event_offload_callback); ++ ++ if (!offload_update_cb_f) { ++ rcu_read_unlock(); ++ return; ++ } ++ ++ offload_update_cb_f(group, origin, 0, NULL, IPMR_MFC_EVENT_DELETE); ++ rcu_read_unlock(); ++} ++/* QCA ECM qca-mcs support - End */ ++ + static const struct fib_rules_ops __net_initconst ipmr_rules_ops_template = { + .family = RTNL_FAMILY_IPMR, + .rule_size = sizeof(struct ipmr_rule), +@@ -236,6 +316,156 @@ static const struct fib_rules_ops __net_ + .owner = THIS_MODULE, + }; + ++/* QCA ECM qca-mcs support - Start */ ++/* ipmr_register_mfc_event_offload_callback() ++ * Register the IPv4 Multicast update offload callback with IPMR ++ */ ++bool ipmr_register_mfc_event_offload_callback( ++ ipmr_mfc_event_offload_callback_t mfc_offload_cb) ++{ ++ ipmr_mfc_event_offload_callback_t offload_update_cb_f; ++ ++ rcu_read_lock(); ++ offload_update_cb_f = rcu_dereference(ipmr_mfc_event_offload_callback); ++ ++ if (offload_update_cb_f) { ++ rcu_read_unlock(); ++ return false; ++ } ++ rcu_read_unlock(); ++ ++ spin_lock(&lock); ++ rcu_assign_pointer(ipmr_mfc_event_offload_callback, mfc_offload_cb); ++ spin_unlock(&lock); ++ synchronize_rcu(); ++ return true; ++} ++EXPORT_SYMBOL(ipmr_register_mfc_event_offload_callback); ++ ++/* ipmr_unregister_mfc_event_offload_callback() ++ * De-register the IPv4 Multicast update offload callback with IPMR ++ */ ++void ipmr_unregister_mfc_event_offload_callback(void) ++{ ++ spin_lock(&lock); ++ rcu_assign_pointer(ipmr_mfc_event_offload_callback, NULL); ++ spin_unlock(&lock); ++ synchronize_rcu(); ++} ++EXPORT_SYMBOL(ipmr_unregister_mfc_event_offload_callback); ++ ++/* ipmr_find_mfc_entry() ++ * Returns destination interface list for a particular multicast flow, and ++ * the number of interfaces in the list ++ */ ++int ipmr_find_mfc_entry(struct net *net, __be32 origin, __be32 group, ++ u32 max_dest_cnt, u32 dest_dev[]) ++{ ++ int vifi, dest_if_count = 0; ++ struct mr_table *mrt; ++ struct mfc_cache *cache; ++ ++ mrt = ipmr_get_table(net, RT_TABLE_DEFAULT); ++ if (!mrt) ++ return -ENOENT; ++ ++ rcu_read_lock(); ++ cache = ipmr_cache_find(mrt, origin, group); ++ if (!cache) { ++ rcu_read_unlock(); ++ return -ENOENT; ++ } ++ ++ spin_lock(&mrt_lock); ++ for (vifi = 0; vifi < cache->_c.mfc_un.res.maxvif; vifi++) { ++ if (!((cache->_c.mfc_un.res.ttls[vifi] > 0) && ++ (cache->_c.mfc_un.res.ttls[vifi] < 255))) { ++ continue; ++ } ++ ++ /* We have another valid destination interface entry. Check if ++ * the number of the destination interfaces for the route is ++ * exceeding the size of the array given to us ++ */ ++ if (dest_if_count == max_dest_cnt) { ++ spin_unlock(&mrt_lock); ++ rcu_read_unlock(); ++ return -EINVAL; ++ } ++ ++ if (!VIF_EXISTS(mrt, vifi)) { ++ spin_unlock(&mrt_lock); ++ rcu_read_unlock(); ++ return -EINVAL; ++ } ++ ++ dest_dev[dest_if_count] = mrt->vif_table[vifi].dev->ifindex; ++ dest_if_count++; ++ } ++ spin_unlock(&mrt_lock); ++ rcu_read_unlock(); ++ ++ return dest_if_count; ++} ++EXPORT_SYMBOL(ipmr_find_mfc_entry); ++ ++/* ipmr_mfc_stats_update() ++ * Update the MFC/VIF statistics for offloaded flows ++ */ ++int ipmr_mfc_stats_update(struct net *net, __be32 origin, __be32 group, ++ u64 pkts_in, u64 bytes_in, ++ u64 pkts_out, u64 bytes_out) ++{ ++ int vif, vifi; ++ struct mr_table *mrt; ++ struct mfc_cache *cache; ++ ++ mrt = ipmr_get_table(net, RT_TABLE_DEFAULT); ++ if (!mrt) ++ return -ENOENT; ++ ++ rcu_read_lock(); ++ cache = ipmr_cache_find(mrt, origin, group); ++ if (!cache) { ++ rcu_read_unlock(); ++ return -ENOENT; ++ } ++ ++ vif = cache->_c.mfc_parent; ++ ++ spin_lock(&mrt_lock); ++ if (!VIF_EXISTS(mrt, vif)) { ++ spin_unlock(&mrt_lock); ++ rcu_read_unlock(); ++ return -EINVAL; ++ } ++ ++ mrt->vif_table[vif].pkt_in += pkts_in; ++ mrt->vif_table[vif].bytes_in += bytes_in; ++ cache->_c.mfc_un.res.pkt += pkts_out; ++ cache->_c.mfc_un.res.bytes += bytes_out; ++ ++ for (vifi = cache->_c.mfc_un.res.minvif; ++ vifi < cache->_c.mfc_un.res.maxvif; vifi++) { ++ if ((cache->_c.mfc_un.res.ttls[vifi] > 0) && ++ (cache->_c.mfc_un.res.ttls[vifi] < 255)) { ++ if (!VIF_EXISTS(mrt, vifi)) { ++ spin_unlock(&mrt_lock); ++ rcu_read_unlock(); ++ return -EINVAL; ++ } ++ mrt->vif_table[vifi].pkt_out += pkts_out; ++ mrt->vif_table[vifi].bytes_out += bytes_out; ++ } ++ } ++ spin_unlock(&mrt_lock); ++ rcu_read_unlock(); ++ ++ return 0; ++} ++EXPORT_SYMBOL(ipmr_mfc_stats_update); ++/* QCA ECM qca-mcs support - End */ ++ + static int __net_init ipmr_rules_init(struct net *net) + { + struct fib_rules_ops *ops; +@@ -1191,6 +1421,10 @@ static int ipmr_mfc_delete(struct mr_tab + call_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_DEL, c, mrt->id); + mroute_netlink_event(mrt, c, RTM_DELROUTE); + mr_cache_put(&c->_c); ++ /* QCA ECM qca-mcs support - Start */ ++ /* Inform offload modules of the delete event */ ++ ipmr_sync_entry_delete(c->mfc_origin, c->mfc_mcastgrp); ++ /* QCA ECM qca-mcs support - End */ + + return 0; + } +@@ -1221,6 +1455,10 @@ static int ipmr_mfc_add(struct net *net, + call_ipmr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, c, + mrt->id); + mroute_netlink_event(mrt, c, RTM_NEWROUTE); ++ /* QCA ECM qca-mcs support - Start */ ++ /* Inform offload modules of the update event */ ++ ipmr_sync_entry_update(mrt, c); ++ /* QCA ECM qca-mcs support - End */ + return 0; + } + +--- a/net/ipv6/ip6mr.c ++++ b/net/ipv6/ip6mr.c +@@ -74,6 +74,9 @@ static struct net_device *vif_dev_read(c + /* Special spinlock for queue of unresolved entries */ + static DEFINE_SPINLOCK(mfc_unres_lock); + ++/* Spinlock for offload */ ++static DEFINE_SPINLOCK(lock); /* QCA qca-mcs support */ ++ + /* We return to original Alan's scheme. Hash table of resolved + entries is changed only in process context and protected + with weak lock mrt_lock. Queue of unresolved entries is protected +@@ -101,6 +104,13 @@ static int ip6mr_rtm_dumproute(struct sk + struct netlink_callback *cb); + static void mroute_clean_tables(struct mr_table *mrt, int flags); + static void ipmr_expire_process(struct timer_list *t); ++/* QCA qca-mcs support - Start */ ++static struct mfc6_cache *ip6mr_cache_find(struct mr_table *mrt, ++ const struct in6_addr *origin, ++ const struct in6_addr *mcastgrp); ++static ip6mr_mfc_event_offload_callback_t __rcu ++ ip6mr_mfc_event_offload_callback; ++/* QCA qca-mcs support - End */ + + #ifdef CONFIG_IPV6_MROUTE_MULTIPLE_TABLES + #define ip6mr_for_each_table(mrt, net) \ +@@ -375,6 +385,84 @@ static struct mfc6_cache_cmp_arg ip6mr_m + .mf6c_mcastgrp = IN6ADDR_ANY_INIT, + }; + ++/* QCA qca-mcs support - Start */ ++/* ip6mr_sync_entry_update() ++ * Call the registered offload callback to report an update to a multicast ++ * route entry. The callback receives the list of destination interfaces and ++ * the interface count ++ */ ++static void ip6mr_sync_entry_update(struct mr_table *mrt, ++ struct mfc6_cache *cache) ++{ ++ int vifi, dest_if_count = 0; ++ u32 dest_dev[MAXMIFS]; ++ struct in6_addr mc_origin, mc_group; ++ ip6mr_mfc_event_offload_callback_t offload_update_cb_f; ++ ++ memset(dest_dev, 0, sizeof(dest_dev)); ++ ++ spin_lock(&mrt_lock); ++ ++ for (vifi = 0; vifi < cache->_c.mfc_un.res.maxvif; vifi++) { ++ if (!((cache->_c.mfc_un.res.ttls[vifi] > 0) && ++ (cache->_c.mfc_un.res.ttls[vifi] < 255))) { ++ continue; ++ } ++ ++ if (dest_if_count == MAXMIFS) { ++ spin_unlock(&mrt_lock); ++ return; ++ } ++ ++ if (!VIF_EXISTS(mrt, vifi)) { ++ spin_unlock(&mrt_lock); ++ return; ++ } ++ ++ dest_dev[dest_if_count] = mrt->vif_table[vifi].dev->ifindex; ++ dest_if_count++; ++ } ++ ++ memcpy(&mc_origin, &cache->mf6c_origin, sizeof(struct in6_addr)); ++ memcpy(&mc_group, &cache->mf6c_mcastgrp, sizeof(struct in6_addr)); ++ spin_unlock(&mrt_lock); ++ ++ rcu_read_lock(); ++ offload_update_cb_f = rcu_dereference(ip6mr_mfc_event_offload_callback); ++ ++ if (!offload_update_cb_f) { ++ rcu_read_unlock(); ++ return; ++ } ++ ++ offload_update_cb_f(&mc_group, &mc_origin, dest_if_count, dest_dev, ++ IP6MR_MFC_EVENT_UPDATE); ++ rcu_read_unlock(); ++} ++ ++/* ip6mr_sync_entry_delete() ++ * Call the registered offload callback to inform of a multicast route entry ++ * delete event ++ */ ++static void ip6mr_sync_entry_delete(struct in6_addr *mc_origin, ++ struct in6_addr *mc_group) ++{ ++ ip6mr_mfc_event_offload_callback_t offload_update_cb_f; ++ ++ rcu_read_lock(); ++ offload_update_cb_f = rcu_dereference(ip6mr_mfc_event_offload_callback); ++ ++ if (!offload_update_cb_f) { ++ rcu_read_unlock(); ++ return; ++ } ++ ++ offload_update_cb_f(mc_group, mc_origin, 0, NULL, ++ IP6MR_MFC_EVENT_DELETE); ++ rcu_read_unlock(); ++} ++/* QCA qca-mcs support - End */ ++ + static struct mr_table_ops ip6mr_mr_table_ops = { + .rht_params = &ip6mr_rht_params, + .cmparg_any = &ip6mr_mr_table_ops_cmparg_any, +@@ -697,6 +785,151 @@ static int call_ip6mr_mfc_entry_notifier + &mfc->_c, tb_id, &net->ipv6.ipmr_seq); + } + ++/* QCA qca-mcs support - Start */ ++/* ip6mr_register_mfc_event_offload_callback() ++ * Register the IPv6 multicast update callback for offload modules ++ */ ++bool ip6mr_register_mfc_event_offload_callback( ++ ip6mr_mfc_event_offload_callback_t mfc_offload_cb) ++{ ++ ip6mr_mfc_event_offload_callback_t offload_update_cb_f; ++ ++ rcu_read_lock(); ++ offload_update_cb_f = rcu_dereference(ip6mr_mfc_event_offload_callback); ++ ++ if (offload_update_cb_f) { ++ rcu_read_unlock(); ++ return false; ++ } ++ rcu_read_unlock(); ++ ++ spin_lock(&lock); ++ rcu_assign_pointer(ip6mr_mfc_event_offload_callback, mfc_offload_cb); ++ spin_unlock(&lock); ++ synchronize_rcu(); ++ return true; ++} ++EXPORT_SYMBOL(ip6mr_register_mfc_event_offload_callback); ++ ++/* ip6mr_unregister_mfc_event_offload_callback() ++ * De-register the IPv6 multicast update callback for offload modules ++ */ ++void ip6mr_unregister_mfc_event_offload_callback(void) ++{ ++ spin_lock(&lock); ++ rcu_assign_pointer(ip6mr_mfc_event_offload_callback, NULL); ++ spin_unlock(&lock); ++ synchronize_rcu(); ++} ++EXPORT_SYMBOL(ip6mr_unregister_mfc_event_offload_callback); ++ ++/* ip6mr_find_mfc_entry() ++ * Return the destination interface list for a particular multicast flow, and ++ * the number of interfaces in the list ++ */ ++int ip6mr_find_mfc_entry(struct net *net, struct in6_addr *origin, ++ struct in6_addr *group, u32 max_dest_cnt, ++ u32 dest_dev[]) ++{ ++ int vifi, dest_if_count = 0; ++ struct mr_table *mrt; ++ struct mfc6_cache *cache; ++ ++ mrt = ip6mr_get_table(net, RT6_TABLE_DFLT); ++ if (!mrt) ++ return -ENOENT; ++ ++ spin_lock(&mrt_lock); ++ cache = ip6mr_cache_find(mrt, origin, group); ++ if (!cache) { ++ spin_unlock(&mrt_lock); ++ return -ENOENT; ++ } ++ ++ for (vifi = 0; vifi < cache->_c.mfc_un.res.maxvif; vifi++) { ++ if (!((cache->_c.mfc_un.res.ttls[vifi] > 0) && ++ (cache->_c.mfc_un.res.ttls[vifi] < 255))) { ++ continue; ++ } ++ ++ /* We have another valid destination interface entry. Check if ++ * the number of the destination interfaces for the route is ++ * exceeding the size of the array given to us ++ */ ++ if (dest_if_count == max_dest_cnt) { ++ spin_unlock(&mrt_lock); ++ return -EINVAL; ++ } ++ ++ if (!VIF_EXISTS(mrt, vifi)) { ++ spin_unlock(&mrt_lock); ++ return -EINVAL; ++ } ++ ++ dest_dev[dest_if_count] = mrt->vif_table[vifi].dev->ifindex; ++ dest_if_count++; ++ } ++ spin_unlock(&mrt_lock); ++ ++ return dest_if_count; ++} ++EXPORT_SYMBOL(ip6mr_find_mfc_entry); ++ ++/* ip6mr_mfc_stats_update() ++ * Update the MFC/VIF statistics for offloaded flows ++ */ ++int ip6mr_mfc_stats_update(struct net *net, struct in6_addr *origin, ++ struct in6_addr *group, u64 pkts_in, ++ u64 bytes_in, uint64_t pkts_out, ++ u64 bytes_out) ++{ ++ int vif, vifi; ++ struct mr_table *mrt; ++ struct mfc6_cache *cache; ++ ++ mrt = ip6mr_get_table(net, RT6_TABLE_DFLT); ++ ++ if (!mrt) ++ return -ENOENT; ++ ++ spin_lock(&mrt_lock); ++ cache = ip6mr_cache_find(mrt, origin, group); ++ if (!cache) { ++ spin_unlock(&mrt_lock); ++ return -ENOENT; ++ } ++ ++ vif = cache->_c.mfc_parent; ++ ++ if (!VIF_EXISTS(mrt, vif)) { ++ spin_unlock(&mrt_lock); ++ return -EINVAL; ++ } ++ ++ mrt->vif_table[vif].pkt_in += pkts_in; ++ mrt->vif_table[vif].bytes_in += bytes_in; ++ cache->_c.mfc_un.res.pkt += pkts_out; ++ cache->_c.mfc_un.res.bytes += bytes_out; ++ ++ for (vifi = cache->_c.mfc_un.res.minvif; ++ vifi < cache->_c.mfc_un.res.maxvif; vifi++) { ++ if ((cache->_c.mfc_un.res.ttls[vifi] > 0) && ++ (cache->_c.mfc_un.res.ttls[vifi] < 255)) { ++ if (!VIF_EXISTS(mrt, vifi)) { ++ spin_unlock(&mrt_lock); ++ return -EINVAL; ++ } ++ mrt->vif_table[vifi].pkt_out += pkts_out; ++ mrt->vif_table[vifi].bytes_out += bytes_out; ++ } ++ } ++ ++ spin_unlock(&mrt_lock); ++ return 0; ++} ++EXPORT_SYMBOL(ip6mr_mfc_stats_update); ++/* QCA qca-mcs support - End */ ++ + /* Delete a VIF entry */ + static int mif6_delete(struct mr_table *mrt, int vifi, int notify, + struct list_head *head) +@@ -1221,6 +1454,7 @@ static int ip6mr_mfc_delete(struct mr_ta + int parent) + { + struct mfc6_cache *c; ++ struct in6_addr mc_origin, mc_group; /* QCA qca-mcs support */ + + /* The entries are added/deleted only under RTNL */ + rcu_read_lock(); +@@ -1229,6 +1463,11 @@ static int ip6mr_mfc_delete(struct mr_ta + rcu_read_unlock(); + if (!c) + return -ENOENT; ++ ++ /* QCA qca-mcs support - Start */ ++ memcpy(&mc_origin, &c->mf6c_origin, sizeof(struct in6_addr)); ++ memcpy(&mc_group, &c->mf6c_mcastgrp, sizeof(struct in6_addr)); ++ /* QCA qca-mcs support - End */ + rhltable_remove(&mrt->mfc_hash, &c->_c.mnode, ip6mr_rht_params); + list_del_rcu(&c->_c.list); + +@@ -1236,6 +1475,11 @@ static int ip6mr_mfc_delete(struct mr_ta + FIB_EVENT_ENTRY_DEL, c, mrt->id); + mr6_netlink_event(mrt, c, RTM_DELROUTE); + mr_cache_put(&c->_c); ++ /* QCA qca-mcs support - Start */ ++ /* Inform offload modules of the delete event */ ++ ip6mr_sync_entry_delete(&mc_origin, &mc_group); ++ /* QCA qca-mcs support - End */ ++ + return 0; + } + +@@ -1457,6 +1701,10 @@ static int ip6mr_mfc_add(struct net *net + call_ip6mr_mfc_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, + c, mrt->id); + mr6_netlink_event(mrt, c, RTM_NEWROUTE); ++ /* QCA qca-mcs support - Start */ ++ /* Inform offload modules of the update event */ ++ ip6mr_sync_entry_update(mrt, c); ++ /* QCA qca-mcs support - End */ + return 0; + } + diff --git a/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch b/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch new file mode 100644 index 00000000000000..f6a439ba5306a6 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch @@ -0,0 +1,111 @@ +--- a/crypto/authenc.c ++++ b/crypto/authenc.c +@@ -415,6 +415,8 @@ static int crypto_authenc_create(struct + enc->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME) + goto err_free_inst; + ++ inst->alg.base.cra_flags |= (auth_base->cra_flags | ++ enc->base.cra_flags) & CRYPTO_ALG_NOSUPP_SG; + inst->alg.base.cra_priority = enc->base.cra_priority * 10 + + auth_base->cra_priority; + inst->alg.base.cra_blocksize = enc->base.cra_blocksize; +--- a/include/linux/crypto.h ++++ b/include/linux/crypto.h +@@ -86,6 +86,11 @@ + #define CRYPTO_NOLOAD 0x00008000 + + /* ++ * Set this flag if algorithm does not support SG list transforms ++ */ ++#define CRYPTO_ALG_NOSUPP_SG 0x0000c000 ++ ++/* + * The algorithm may allocate memory during request processing, i.e. during + * encryption, decryption, or hashing. Users can request an algorithm with this + * flag unset if they can't handle memory allocation failures. +--- a/net/ipv4/esp4.c ++++ b/net/ipv4/esp4.c +@@ -658,6 +658,7 @@ static int esp_output(struct xfrm_state + struct ip_esp_hdr *esph; + struct crypto_aead *aead; + struct esp_info esp; ++ bool nosupp_sg; + + esp.inplace = true; + +@@ -669,6 +670,11 @@ static int esp_output(struct xfrm_state + aead = x->data; + alen = crypto_aead_authsize(aead); + ++ nosupp_sg = crypto_tfm_alg_type(&aead->base) & CRYPTO_ALG_NOSUPP_SG; ++ if (nosupp_sg && skb_linearize(skb)) { ++ return -ENOMEM; ++ } ++ + esp.tfclen = 0; + if (x->tfcpad) { + struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb); +@@ -890,6 +896,7 @@ static int esp_input(struct xfrm_state * + u8 *iv; + struct scatterlist *sg; + int err = -EINVAL; ++ bool nosupp_sg; + + if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) + goto out; +@@ -897,6 +904,12 @@ static int esp_input(struct xfrm_state * + if (elen <= 0) + goto out; + ++ nosupp_sg = crypto_tfm_alg_type(&aead->base) & CRYPTO_ALG_NOSUPP_SG; ++ if (nosupp_sg && skb_linearize(skb)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ + assoclen = sizeof(struct ip_esp_hdr); + seqhilen = 0; + +--- a/net/ipv6/esp6.c ++++ b/net/ipv6/esp6.c +@@ -696,6 +696,7 @@ static int esp6_output(struct xfrm_state + struct ip_esp_hdr *esph; + struct crypto_aead *aead; + struct esp_info esp; ++ bool nosupp_sg; + + esp.inplace = true; + +@@ -707,6 +708,11 @@ static int esp6_output(struct xfrm_state + aead = x->data; + alen = crypto_aead_authsize(aead); + ++ nosupp_sg = crypto_tfm_alg_type(&aead->base) & CRYPTO_ALG_NOSUPP_SG; ++ if (nosupp_sg && skb_linearize(skb)) { ++ return -ENOMEM; ++ } ++ + esp.tfclen = 0; + if (x->tfcpad) { + struct xfrm_dst *dst = (struct xfrm_dst *)skb_dst(skb); +@@ -934,6 +940,7 @@ static int esp6_input(struct xfrm_state + __be32 *seqhi; + u8 *iv; + struct scatterlist *sg; ++ bool nosupp_sg; + + if (!pskb_may_pull(skb, sizeof(struct ip_esp_hdr) + ivlen)) { + ret = -EINVAL; +@@ -945,6 +952,12 @@ static int esp6_input(struct xfrm_state + goto out; + } + ++ nosupp_sg = crypto_tfm_alg_type(&aead->base) & CRYPTO_ALG_NOSUPP_SG; ++ if (nosupp_sg && skb_linearize(skb)) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ + assoclen = sizeof(struct ip_esp_hdr); + seqhilen = 0; + diff --git a/target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch b/target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch new file mode 100644 index 00000000000000..4b9ee21f2f8545 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch @@ -0,0 +1,10 @@ +--- a/net/netfilter/nf_conntrack_ecache.c ++++ b/net/netfilter/nf_conntrack_ecache.c +@@ -266,7 +266,6 @@ void nf_conntrack_register_notifier(stru + mutex_lock(&nf_ct_ecache_mutex); + notify = rcu_dereference_protected(net->ct.nf_conntrack_event_cb, + lockdep_is_held(&nf_ct_ecache_mutex)); +- WARN_ON_ONCE(notify); + rcu_assign_pointer(net->ct.nf_conntrack_event_cb, new); + mutex_unlock(&nf_ct_ecache_mutex); + } diff --git a/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch b/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch new file mode 100644 index 00000000000000..886bc92fe2e26a --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch @@ -0,0 +1,396 @@ +diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h +index 624d4a3..5aa8808 100644 +--- a/include/linux/cpuhotplug.h ++++ b/include/linux/cpuhotplug.h +@@ -94,6 +94,7 @@ enum cpuhp_state { + CPUHP_RADIX_DEAD, + CPUHP_PAGE_ALLOC, + CPUHP_NET_DEV_DEAD, ++ CPUHP_SKB_RECYCLER_DEAD, + CPUHP_PCI_XGENE_DEAD, + CPUHP_IOMMU_IOVA_DEAD, + CPUHP_LUSTRE_CFS_DEAD, +diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h +index 83cced8..b6ee509 100644 +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h +@@ -1065,6 +1065,10 @@ struct sk_buff { + /* only useable after checking ->active_extensions != 0 */ + struct skb_ext *extensions; + #endif ++ ++#ifdef CONFIG_DEBUG_OBJECTS_SKBUFF ++ void *free_addr; ++#endif + }; + + /* if you move pkt_type around you also must adapt those constants */ +@@ -1250,7 +1254,7 @@ static inline void kfree_skb_list(struct sk_buff *segs) + kfree_skb_list_reason(segs, SKB_DROP_REASON_NOT_SPECIFIED); + } + +-#ifdef CONFIG_TRACEPOINTS ++#ifdef CONFIG_SKB_RECYCLER + void consume_skb(struct sk_buff *skb); + #else + static inline void consume_skb(struct sk_buff *skb) +@@ -1262,6 +1266,9 @@ static inline void consume_skb(struct sk_buff *skb) + void __consume_stateless_skb(struct sk_buff *skb); + void __kfree_skb(struct sk_buff *skb); + extern struct kmem_cache *skbuff_cache; ++extern void kfree_skbmem(struct sk_buff *skb); ++extern void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason, ++ bool napi_safe); + + void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); + bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, +diff --git a/net/Kconfig b/net/Kconfig +index 61eac93..e0c8bf0 100644 +--- a/net/Kconfig ++++ b/net/Kconfig +@@ -369,6 +369,27 @@ config NET_FLOW_LIMIT + with many clients some protection against DoS by a single (spoofed) + flow that greatly exceeds average workload. + ++config SKB_RECYCLER ++ bool "Generic skb recycling" ++ default y ++ help ++ SKB_RECYCLER is used to implement RX-to-RX skb recycling. ++ This config enables the recycling scheme for bridging and ++ routing workloads. It can reduce skbuff freeing or ++ reallocation overhead. ++ ++config SKB_RECYCLER_MULTI_CPU ++ bool "Cross-CPU recycling for CPU-locked workloads" ++ depends on SMP && SKB_RECYCLER ++ default n ++ ++config ALLOC_SKB_PAGE_FRAG_DISABLE ++ bool "Disable page fragment based skbuff payload allocations" ++ depends on !SKB_RECYCLER ++ default n ++ help ++ Disable page fragment based allocations for skbuff payloads. ++ + menu "Network testing" + + config NET_PKTGEN +diff --git a/net/core/Makefile b/net/core/Makefile +index 5c9fc1f..e90878c 100644 +--- a/net/core/Makefile ++++ b/net/core/Makefile +@@ -41,3 +41,4 @@ obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o + obj-$(CONFIG_BPF_SYSCALL) += sock_map.o + obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o + obj-$(CONFIG_OF) += of_net.o ++obj-$(CONFIG_SKB_RECYCLER) += skbuff_recycle.o +diff --git a/net/core/dev.c b/net/core/dev.c +index 85a1038..c6994ab 100644 +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -6016,10 +6016,16 @@ static int process_backlog(struct napi_struct *napi, int quota) + + napi->weight = READ_ONCE(dev_rx_weight); + while (again) { +- struct sk_buff *skb; ++ struct sk_buff *skb, *next_skb; + + while ((skb = __skb_dequeue(&sd->process_queue))) { + rcu_read_lock(); ++ ++ next_skb = skb_peek(&sd->process_queue); ++ if (likely(next_skb)) { ++ prefetch(next_skb->data); ++ } ++ + __netif_receive_skb(skb); + rcu_read_unlock(); + input_queue_head_incr(sd); +diff --git a/net/core/skbuff.c b/net/core/skbuff.c +index bcfa460..eaf8bcb 100644 +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c +@@ -87,6 +87,31 @@ + + #include "dev.h" + #include "sock_destructor.h" ++#include "skbuff_recycle.h" ++ ++struct kmem_cache *skb_data_cache; ++/* ++ * For low memory profile, NSS_SKB_FIXED_SIZE_2K is enabled and ++ * CONFIG_SKB_RECYCLER is disabled. For premium and enterprise profile ++ * CONFIG_SKB_RECYCLER is enabled and NSS_SKB_FIXED_SIZE_2K is disabled. ++ * Irrespective of NSS_SKB_FIXED_SIZE_2K enabled/disabled, the ++ * CONFIG_SKB_RECYCLER and __LP64__ determines the value of SKB_DATA_CACHE_SIZE ++ */ ++#if defined(CONFIG_SKB_RECYCLER) ++/* ++ * 2688 for 64bit arch, 2624 for 32bit arch ++ */ ++#define SKB_DATA_CACHE_SIZE (SKB_DATA_ALIGN(SKB_RECYCLE_SIZE + NET_SKB_PAD) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) ++#else ++/* ++ * 2368 for 64bit arch, 2176 for 32bit arch ++ */ ++#if defined(__LP64__) ++#define SKB_DATA_CACHE_SIZE ((SKB_DATA_ALIGN(1984 + NET_SKB_PAD)) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) ++#else ++#define SKB_DATA_CACHE_SIZE ((SKB_DATA_ALIGN(1856 + NET_SKB_PAD)) + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) ++#endif ++#endif + + struct kmem_cache *skbuff_cache __ro_after_init; + static struct kmem_cache *skbuff_fclone_cache __ro_after_init; +@@ -551,21 +576,20 @@ static void *kmalloc_reserve(unsigned int *size, gfp_t flags, int node, + bool *pfmemalloc) + { + bool ret_pfmemalloc = false; +- size_t obj_size; ++ unsigned int obj_size = *size; + void *obj; + + obj_size = SKB_HEAD_ALIGN(*size); +- if (obj_size <= SKB_SMALL_HEAD_CACHE_SIZE && +- !(flags & KMALLOC_NOT_NORMAL_BITS)) { +- obj = kmem_cache_alloc_node(skb_small_head_cache, +- flags | __GFP_NOMEMALLOC | __GFP_NOWARN, +- node); +- *size = SKB_SMALL_HEAD_CACHE_SIZE; ++ if (obj_size > SZ_2K && obj_size <= SKB_DATA_CACHE_SIZE) { ++ obj = kmem_cache_alloc_node(skb_data_cache, ++ flags | __GFP_NOMEMALLOC | __GFP_NOWARN, ++ node); ++ *size = SKB_DATA_CACHE_SIZE; + if (obj || !(gfp_pfmemalloc_allowed(flags))) + goto out; + /* Try again but now we are using pfmemalloc reserves */ + ret_pfmemalloc = true; +- obj = kmem_cache_alloc_node(skb_small_head_cache, flags, node); ++ obj = kmem_cache_alloc_node(skb_data_cache, flags, node); + goto out; + } + +@@ -648,10 +671,12 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, + * aligned memory blocks, unless SLUB/SLAB debug is enabled. + * Both skb->head and skb_shared_info are cache line aligned. + */ ++ size = SKB_DATA_ALIGN(size); ++ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); + data = kmalloc_reserve(&size, gfp_mask, node, &pfmemalloc); + if (unlikely(!data)) + goto nodata; +- /* kmalloc_size_roundup() might give us more room than requested. ++ /* kmalloc_reserve(size) might give us more room than requested. + * Put skb_shared_info exactly at the end of allocated zone, + * to allow max possible filling before reallocation. + */ +@@ -686,7 +711,7 @@ EXPORT_SYMBOL(__alloc_skb); + /** + * __netdev_alloc_skb - allocate an skbuff for rx on a specific device + * @dev: network device to receive on +- * @len: length to allocate ++ * @length: length to allocate + * @gfp_mask: get_free_pages mask, passed to alloc_skb + * + * Allocate a new &sk_buff and assign it a usage count of one. The +@@ -696,29 +721,53 @@ EXPORT_SYMBOL(__alloc_skb); + * + * %NULL is returned if there is no free memory. + */ +-struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len, +- gfp_t gfp_mask) ++struct sk_buff *__netdev_alloc_skb(struct net_device *dev, ++ unsigned int length, gfp_t gfp_mask) + { +- struct page_frag_cache *nc; + struct sk_buff *skb; ++ unsigned int len = length; ++ ++#ifdef CONFIG_SKB_RECYCLER ++ skb = skb_recycler_alloc(dev, length); ++ if (likely(skb)) ++ return skb; ++ ++ len = SKB_RECYCLE_SIZE; ++ if (unlikely(length > SKB_RECYCLE_SIZE)) ++ len = length; ++ ++ skb = __alloc_skb(len + NET_SKB_PAD, gfp_mask, ++ SKB_ALLOC_RX, NUMA_NO_NODE); ++ if (!skb) ++ goto skb_fail; ++ goto skb_success; ++#else ++ struct page_frag_cache *nc; + bool pfmemalloc; ++ bool page_frag_alloc_enable = true; + void *data; + + len += NET_SKB_PAD; + ++ ++#ifdef CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE ++ page_frag_alloc_enable = false; ++#endif + /* If requested length is either too small or too big, + * we use kmalloc() for skb->head allocation. + */ + if (len <= SKB_WITH_OVERHEAD(1024) || + len > SKB_WITH_OVERHEAD(PAGE_SIZE) || +- (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA))) { ++ (gfp_mask & (__GFP_DIRECT_RECLAIM | GFP_DMA)) || ++ !page_frag_alloc_enable) { + skb = __alloc_skb(len, gfp_mask, SKB_ALLOC_RX, NUMA_NO_NODE); + if (!skb) + goto skb_fail; + goto skb_success; + } + +- len = SKB_HEAD_ALIGN(len); ++ len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); ++ len = SKB_DATA_ALIGN(len); + + if (sk_memalloc_socks()) + gfp_mask |= __GFP_MEMALLOC; +@@ -747,6 +796,7 @@ struct sk_buff *__netdev_alloc_skb(struct net_device *dev, unsigned int len, + if (pfmemalloc) + skb->pfmemalloc = 1; + skb->head_frag = 1; ++#endif + + skb_success: + skb_reserve(skb, NET_SKB_PAD); +@@ -817,7 +867,8 @@ struct sk_buff *__napi_alloc_skb(struct napi_struct *napi, unsigned int len, + data = page_frag_alloc_1k(&nc->page_small, gfp_mask); + pfmemalloc = NAPI_SMALL_PAGE_PFMEMALLOC(nc->page_small); + } else { +- len = SKB_HEAD_ALIGN(len); ++ len += SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); ++ len = SKB_DATA_ALIGN(len); + + data = page_frag_alloc(&nc->page, len, gfp_mask); + pfmemalloc = nc->page.pfmemalloc; +@@ -975,7 +1026,7 @@ static void skb_free_head(struct sk_buff *skb, bool napi_safe) + } + } + +-static void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason, ++void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason, + bool napi_safe) + { + struct skb_shared_info *shinfo = skb_shinfo(skb); +@@ -1018,7 +1069,7 @@ static void skb_release_data(struct sk_buff *skb, enum skb_drop_reason reason, + /* + * Free an skbuff by memory without cleaning the state. + */ +-static void kfree_skbmem(struct sk_buff *skb) ++void kfree_skbmem(struct sk_buff *skb) + { + struct sk_buff_fclones *fclones; + +@@ -1282,7 +1333,6 @@ void skb_tx_error(struct sk_buff *skb) + } + EXPORT_SYMBOL(skb_tx_error); + +-#ifdef CONFIG_TRACEPOINTS + /** + * consume_skb - free an skbuff + * @skb: buffer to free +@@ -1291,13 +1341,48 @@ EXPORT_SYMBOL(skb_tx_error); + * Functions identically to kfree_skb, but kfree_skb assumes that the frame + * is being dropped after a failure and notes that + */ ++#ifdef CONFIG_SKB_RECYCLER + void consume_skb(struct sk_buff *skb) + { + if (!skb_unref(skb)) + return; ++ prefetch(&skb->destructor); ++ ++ /*Tian: Not sure if we need to continue using this since ++ * since unref does the work in 5.4 ++ */ ++ ++ /* ++ if (likely(atomic_read(&skb->users) == 1)) ++ smp_rmb(); ++ else if (likely(!atomic_dec_and_test(&skb->users))) ++ return; ++ */ + ++ /* If possible we'd like to recycle any skb rather than just free it, ++ * but in order to do that we need to release any head state too. ++ * We don't want to do this later because we'll be in a pre-emption ++ * disabled state. ++ */ ++ skb_release_head_state(skb); ++ ++ /* Can we recycle this skb? If we can then it will be much faster ++ * for us to recycle this one later than to allocate a new one ++ * from scratch. ++ */ ++ if (likely(skb->head) && likely(skb_recycler_consume(skb))) ++ return; ++ ++#ifdef CONFIG_TRACEPOINTS + trace_consume_skb(skb, __builtin_return_address(0)); +- __kfree_skb(skb); ++#endif ++ /* We're not recycling so now we need to do the rest of what we would ++ * have done in __kfree_skb (above and beyond the skb_release_head_state ++ * that we already did). ++ */ ++ if (likely(skb->head)) ++ skb_release_data(skb, SKB_CONSUMED, false); ++ kfree_skbmem(skb); + } + EXPORT_SYMBOL(consume_skb); + #endif +@@ -2107,6 +2192,8 @@ int pskb_expand_head(struct sk_buff *skb, int nhead, int ntail, + if (skb_pfmemalloc(skb)) + gfp_mask |= __GFP_MEMALLOC; + ++ size = SKB_DATA_ALIGN(size); ++ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); + data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL); + if (!data) + goto nodata; +@@ -4854,6 +4941,10 @@ static void skb_extensions_init(void) {} + + void __init skb_init(void) + { ++ skb_data_cache = kmem_cache_create_usercopy("skb_data_cache", ++ SKB_DATA_CACHE_SIZE, ++ 0, SLAB_PANIC, 0, SKB_DATA_CACHE_SIZE, ++ NULL); + skbuff_cache = kmem_cache_create_usercopy("skbuff_head_cache", + sizeof(struct sk_buff), + 0, +@@ -4879,6 +4970,7 @@ void __init skb_init(void) + SKB_SMALL_HEAD_HEADROOM, + NULL); + skb_extensions_init(); ++ skb_recycler_init(); + } + + static int +@@ -6382,6 +6474,8 @@ static int pskb_carve_inside_header(struct sk_buff *skb, const u32 off, + if (skb_pfmemalloc(skb)) + gfp_mask |= __GFP_MEMALLOC; + ++ size = SKB_DATA_ALIGN(size); ++ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); + data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL); + if (!data) + return -ENOMEM; +@@ -6498,6 +6592,8 @@ static int pskb_carve_inside_nonlinear(struct sk_buff *skb, const u32 off, + if (skb_pfmemalloc(skb)) + gfp_mask |= __GFP_MEMALLOC; + ++ size = SKB_DATA_ALIGN(size); ++ size += SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); + data = kmalloc_reserve(&size, gfp_mask, NUMA_NO_NODE, NULL); + if (!data) + return -ENOMEM; diff --git a/target/linux/qualcommax/patches-6.6/9999-revert-crypto-api-disallow-identical-driver-names.patch b/target/linux/qualcommax/patches-6.6/9999-revert-crypto-api-disallow-identical-driver-names.patch new file mode 100644 index 00000000000000..3f7f58dfee5af2 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/9999-revert-crypto-api-disallow-identical-driver-names.patch @@ -0,0 +1,10 @@ +--- a/crypto/algapi.c ++++ b/crypto/algapi.c +@@ -341,7 +341,6 @@ __crypto_register_alg(struct crypto_alg + } + + if (!strcmp(q->cra_driver_name, alg->cra_name) || +- !strcmp(q->cra_driver_name, alg->cra_driver_name) || + !strcmp(q->cra_name, alg->cra_driver_name)) + goto err; + } diff --git a/target/linux/qualcommax/patches-6.6/9999-silence-UBI-NAND-warnings.patch b/target/linux/qualcommax/patches-6.6/9999-silence-UBI-NAND-warnings.patch new file mode 100644 index 00000000000000..646e683dc8df70 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/9999-silence-UBI-NAND-warnings.patch @@ -0,0 +1,13 @@ +--- a/drivers/mtd/mtdblock.c ++++ b/drivers/mtd/mtdblock.c +@@ -261,10 +261,6 @@ static int mtdblock_open(struct mtd_blkt + return 0; + } + +- if (mtd_type_is_nand(mbd->mtd)) +- pr_warn_ratelimited("%s: MTD device '%s' is NAND, please consider using UBI block devices instead.\n", +- mbd->tr->name, mbd->mtd->name); +- + /* OK, it's not open. Create cache info for it */ + mtdblk->count = 1; + mutex_init(&mtdblk->cache_mutex); From 64fc747e83c0cee4d2ac72165b4d17101a5482f0 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 24 Mar 2024 23:20:41 -0400 Subject: [PATCH 70/80] ath11k_nss: set pbuf to 'auto' Since SKB recycler was merged into main nss-wifi branch, it is not necessary to manually tinker with pbuf script. Memory is now properly managed between NSS driver allocating/deallocating SKBs. For optimal wifi performance, especially upload, it is advised to leave the script to 'auto'. Users who use sysupgrade should manually set the uci config '/etc/config/pbuf' as it will not overwrite existing configuration. --- package/kernel/mac80211/files/pbuf.uci | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/files/pbuf.uci b/package/kernel/mac80211/files/pbuf.uci index 2b277e11f02f4d..4e01048e9bee0e 100644 --- a/package/kernel/mac80211/files/pbuf.uci +++ b/package/kernel/mac80211/files/pbuf.uci @@ -1,6 +1,6 @@ config general opt - option memory_profile 'off' - # option memory_profile 'auto' + # option memory_profile 'off' + option memory_profile 'auto' # option memory_profile '1gb' # option memory_profile '512mb' # option memory_profile '256mb' From 0b447d1dc5e4f2af28596e3e20ed8628f2e17b9a Mon Sep 17 00:00:00 2001 From: Qosmio Date: Sun, 24 Mar 2024 23:37:32 -0400 Subject: [PATCH 71/80] cryptodev-linux: Add hooks for QCA NSS --- package/kernel/cryptodev-linux/Makefile | 11 ++- .../patches/0005-add-qca-nss.patch | 99 +++++++++++++++++++ 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 package/kernel/cryptodev-linux/patches/0005-add-qca-nss.patch diff --git a/package/kernel/cryptodev-linux/Makefile b/package/kernel/cryptodev-linux/Makefile index ea1bd241617b7d..6fc511133f9439 100644 --- a/package/kernel/cryptodev-linux/Makefile +++ b/package/kernel/cryptodev-linux/Makefile @@ -40,13 +40,22 @@ define KernelPackage/cryptodev/description hardware ciphers by user-space applications. endef +ifneq ($(CONFIG_PACKAGE_kmod-crypto-qce),) +EXTRA_CFLAGS+=-DQCA +endif + +ifneq ($(CONFIG_PACKAGE_kmod-qca-nss-crypto),) +EXTRA_CFLAGS+=-DQCANSS +endif + define Build/Configure endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ $(KERNEL_MAKE_FLAGS) \ - KERNEL_DIR="$(LINUX_DIR)" + KERNEL_DIR="$(LINUX_DIR)" \ + EXTRA_CFLAGS="$(EXTRA_CFLAGS)" endef define Build/InstallDev diff --git a/package/kernel/cryptodev-linux/patches/0005-add-qca-nss.patch b/package/kernel/cryptodev-linux/patches/0005-add-qca-nss.patch new file mode 100644 index 00000000000000..4f467a18773467 --- /dev/null +++ b/package/kernel/cryptodev-linux/patches/0005-add-qca-nss.patch @@ -0,0 +1,99 @@ +--- a/ioctl.c ++++ b/ioctl.c +@@ -829,29 +829,37 @@ static inline void tfm_info_to_alg_info( + "%s", crypto_tfm_alg_driver_name(tfm)); + } + +-#ifndef CRYPTO_ALG_KERN_DRIVER_ONLY ++#if defined(QCANSS) || defined(QCA) || defined(MT7621) || defined(MT7622) || defined(LANTIQ) || defined(BCM675X) || defined(BCM49XX) || defined(MT798X) + static unsigned int is_known_accelerated(struct crypto_tfm *tfm) + { + const char *name = crypto_tfm_alg_driver_name(tfm); + + if (name == NULL) +- return 1; /* assume accelerated */ ++ return 0; + + /* look for known crypto engine names */ +- if (strstr(name, "-talitos") || +- !strncmp(name, "mv-", 3) || +- !strncmp(name, "atmel-", 6) || +- strstr(name, "geode") || +- strstr(name, "hifn") || +- strstr(name, "-ixp4xx") || +- strstr(name, "-omap") || +- strstr(name, "-picoxcell") || +- strstr(name, "-s5p") || +- strstr(name, "-ppc4xx") || +- strstr(name, "-caam") || +- strstr(name, "-n2")) ++#if defined(QCANSS) ++ if (!strncmp(name, "nss-", 4)) + return 1; +- ++#elif defined(QCA) ++ if (!strncmp(name, "qcrypto", 7)) ++ return 1; ++#elif defined(MT7621) ++ if (strstr(name, "eip93")) ++ return 1; ++#elif defined(MT7622) ++ if (strstr(name, "mtk")) ++ return 1; ++#elif defined(MT798X) ++ if (strstr(name, "safexcel-")) ++ return 1; ++#elif defined(LANTIQ) ++ if (strstr(name, "ltq-crypto")) ++ return 1; ++#elif defined(BCM675X) || defined(BCM49XX) ++ if (strstr(name, "-iproc")) ++ return 1; ++#endif + return 0; + } + #endif +@@ -876,22 +884,22 @@ static int get_session_info(struct fcryp + else + tfm = crypto_aead_tfm(ses_ptr->cdata.async.as); + tfm_info_to_alg_info(&siop->cipher_info, tfm); +-#ifdef CRYPTO_ALG_KERN_DRIVER_ONLY +- if (tfm->__crt_alg->cra_flags & CRYPTO_ALG_KERN_DRIVER_ONLY) ++#if defined(QCANSS) || defined(QCA) || defined(MT7621) || defined(MT7622) || defined(LANTIQ) || defined(BCM675X) || defined(BCM49XX) || defined(MT798X) ++ if (is_known_accelerated(tfm)) + siop->flags |= SIOP_FLAG_KERNEL_DRIVER_ONLY; + #else +- if (is_known_accelerated(tfm)) ++ if (tfm->__crt_alg->cra_flags & CRYPTO_ALG_KERN_DRIVER_ONLY) + siop->flags |= SIOP_FLAG_KERNEL_DRIVER_ONLY; + #endif + } + if (ses_ptr->hdata.init) { + tfm = crypto_ahash_tfm(ses_ptr->hdata.async.s); + tfm_info_to_alg_info(&siop->hash_info, tfm); +-#ifdef CRYPTO_ALG_KERN_DRIVER_ONLY +- if (tfm->__crt_alg->cra_flags & CRYPTO_ALG_KERN_DRIVER_ONLY) ++#if defined(QCANSS) || defined(QCA) || defined(MT7621) || defined(MT7622) || defined(LANTIQ) || defined(BCM675X) || defined(BCM49XX) || defined(MT798X) ++ if (is_known_accelerated(tfm)) + siop->flags |= SIOP_FLAG_KERNEL_DRIVER_ONLY; + #else +- if (is_known_accelerated(tfm)) ++ if (tfm->__crt_alg->cra_flags & CRYPTO_ALG_KERN_DRIVER_ONLY) + siop->flags |= SIOP_FLAG_KERNEL_DRIVER_ONLY; + #endif + } +--- a/main.c ++++ b/main.c +@@ -168,6 +168,12 @@ __crypto_run_zc(struct csession *ses_ptr + struct crypt_op *cop = &kcop->cop; + int ret = 0; + ++#if defined(QCANSS) ++//openssl bug!!! ++ if (unlikely(cop->src != cop->dst)) { ++ return __crypto_run_std(ses_ptr, cop); ++ } ++#endif + ret = get_userbuf(ses_ptr, cop->src, cop->len, cop->dst, cop->len, + kcop->task, kcop->mm, &src_sg, &dst_sg); + if (unlikely(ret)) { From 569941f6e3d037394afd2b5d02b54de70f33d680 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Mon, 25 Mar 2024 00:07:45 -0400 Subject: [PATCH 72/80] feeds: NSS: point to 6.x branch This will now be the default NSS branch, and will cover both kernel 6.1 and 6.6 related changes going forward. qualcommax: NSS: fix up 'nss_region' --- feeds.conf.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds.conf.default b/feeds.conf.default index 4527c3215a827e..68c55d271c0819 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -2,7 +2,7 @@ src-git packages https://git.openwrt.org/feed/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git -src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.4-K6.1 +src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.4-K6.x src-git sqm_scripts_nss https://github.com/qosmio/sqm-scripts-nss.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git From f63b37210acee40ff4e6b93dc3262d5fb34b7cc5 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Mon, 25 Mar 2024 13:31:04 -0400 Subject: [PATCH 73/80] ath11k_nss: refresh and fixup patches, increment release version --- package/kernel/mac80211/Makefile | 8 +- ...91-ath11k-add-mgmt-and-data-ack-rssi.patch | 2 +- .../199-003-ath11k-add-nss-support.patch | 4 +- ...-ath11k-Add-support-for-dynamic-vlan.patch | 2 +- ...pport-for-WDS-offload-in-NSS-offload.patch | 28 ++--- ...-dynamic-VLAN-support-in-NSS-offload.patch | 36 +++--- ...ow-fast-rx-by-bypassing-stats-update.patch | 2 +- .../nss/ath11k/244-ath11k-dp-tx-perf.patch | 4 +- .../patches/nss/ath11k/270-iphone-issue.patch | 2 +- .../300-ath11k-nss-mesh-offload-support.patch | 8 +- ...lookup-failure-in-mgmt-tx-completion.patch | 2 +- ...30-ath11k-sync-wds_ast_entry-updates.patch | 4 +- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 2 +- ...rt-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch | 2 +- ...-fix-clear-peer-keys-during-disassoc.patch | 4 +- ...ix-mutex-dead-lock-and-q6-dump-crash.patch | 4 +- ...agement-frames-to-firmware-before-wa.patch | 7 +- ...oid-memset-of-ppdu-info-for-next-skb.patch | 6 +- ...a_map_single-to-virt_to_phys-in-rx-r.patch | 4 +- ...11k-remove-invalid-peer-create-logic.patch | 4 +- ...th11k-rename-ath11k_start_vdev_delay.patch | 6 +- ...ation-of-ath11k_mac_start_vdev_delay.patch | 8 +- ...ailure-due-to-unexpected-peer-delete.patch | 14 +-- ...k-make-debugfs-sta-htt-stats-modular.patch | 6 +- ...11k-Disable-rx_header-tlv-for-2K-SKB.patch | 52 ++++----- ...d-ampdu-id-in-802.11-radiotap-header.patch | 6 +- ...999-336-0001-ath11k-idr-optimization.patch | 10 +- .../999-336-0002-ath11k-Use-idr_replace.patch | 22 ++-- ...k-skb_headroom-before-using-skb_push.patch | 6 +- .../subsys/007-fix_compilation_issue.patch | 10 +- ...-when-using-encapsulation-offloading.patch | 2 +- .../199-001-mac80211-add-nss-support.patch | 26 ++--- ...t-callback-when-hwencap-enable-in-st.patch | 2 +- ...03-mac80211-ath11k-fw-dynamic-muedca.patch | 4 +- ...-ath11k-Add-support-for-dynamic-vlan.patch | 4 +- ...07-mac80211-add-nss-redirect-support.patch | 6 +- ...N-iftype-support-on-NSS-offload-case.patch | 6 +- ...-dynamic-VLAN-support-on-NSS-offload.patch | 6 +- .../nss/subsys/245-compilation_fix.patch | 106 +++--------------- .../300-ath11k-nss-mesh-offload-support.patch | 34 +++--- ...TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch | 4 +- ...-0005-mac80211-simple-tx-for-AP-mode.patch | 4 +- ...mac80211-fix-unconditional-sta-usage.patch | 4 +- ...unused-RX_FLAGS-from-mac80211_rx_fla.patch | 4 +- ...ncapsulation-of-EAPOL-frames-if-OFFL.patch | 24 ++-- ...fix-RCU-stall-in-mesh-fast-xmit-path.patch | 2 +- ...id-last_rate-for-rx_bitrate-from-cpu.patch | 12 +- ...se-HW-checksum-offload-only-for-ethm.patch | 4 +- ...1-Add-mac-hw-flag-to-avoid-queue-skb.patch | 24 ++-- ...x-memory-corruption-during-mesh-beac.patch | 2 +- 50 files changed, 237 insertions(+), 318 deletions(-) diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index 6b36819f75cc4d..cf9c743eb3d198 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=6.6.15 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING @@ -433,9 +433,9 @@ endef ifdef CONFIG_ATH11K_NSS_SUPPORT define KernelPackage/ath11k/install - $(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config - $(INSTALL_BIN) ./files/qca-nss-pbuf.init $(1)/etc/init.d/qca-nss-pbuf - $(INSTALL_BIN) ./files/pbuf.uci $(1)/etc/config/pbuf + $(INSTALL_DIR) $(1)/etc/init.d $(1)/etc/config + $(INSTALL_BIN) ./files/qca-nss-pbuf.init $(1)/etc/init.d/qca-nss-pbuf + $(INSTALL_BIN) ./files/pbuf.uci $(1)/etc/config/pbuf endef endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch b/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch index 22cdb4dccb4d5d..466dacd1006768 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/191-ath11k-add-mgmt-and-data-ack-rssi.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9579,6 +9579,8 @@ static int __ath11k_mac_register(struct +@@ -9580,6 +9580,8 @@ static int __ath11k_mac_register(struct wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); diff --git a/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch b/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch index 2234cb6bc4cc1d..e30b5d761d3378 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/199-003-ath11k-add-nss-support.patch @@ -747,7 +747,7 @@ Signed-off-by: Sriram R .configure_filter = ath11k_mac_op_configure_filter, .hw_scan = ath11k_mac_op_hw_scan, .cancel_hw_scan = ath11k_mac_op_cancel_hw_scan, -@@ -9529,7 +9637,8 @@ static int __ath11k_mac_register(struct +@@ -9530,7 +9638,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW); ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER); ieee80211_hw_set(ar->hw, SUPPORTS_AMSDU_IN_AMPDU); @@ -757,7 +757,7 @@ Signed-off-by: Sriram R } ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; -@@ -9644,6 +9753,9 @@ static int __ath11k_mac_register(struct +@@ -9645,6 +9754,9 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; diff --git a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch index 54a6d1528422db..a765d1a292c60c 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -369,7 +369,7 @@ Signed-off-by: Seevalamuthu Mariappan int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9770,6 +9770,9 @@ static int __ath11k_mac_register(struct +@@ -9771,6 +9771,9 @@ static int __ath11k_mac_register(struct */ ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); diff --git a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch index 729ee80199b9a2..1730beea85dfc0 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/235-003-ath11k-add-AP_VLAN-vif-support-for-WDS-offload-in-NSS-offload.patch @@ -43,7 +43,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif_iter { --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4744,6 +4744,11 @@ static void ath11k_sta_rc_update_wk(stru +@@ -4739,6 +4739,11 @@ static void ath11k_sta_rc_update_wk(stru arvif = arsta->arvif; ar = arvif->ar; @@ -55,7 +55,7 @@ Signed-off-by: Sathishkumar Muruganandam if (WARN_ON(ath11k_mac_vif_chan(arvif->vif, &def))) return; -@@ -4915,17 +4920,28 @@ err_rc_bw_changed: +@@ -4910,17 +4915,28 @@ err_rc_bw_changed: static void ath11k_sta_set_4addr_wk(struct work_struct *wk) { struct ath11k *ar; @@ -86,7 +86,7 @@ Signed-off-by: Sathishkumar Muruganandam "setting USE_4ADDR for peer %pM\n", sta->addr); ret = ath11k_wmi_set_peer_param(ar, sta->addr, -@@ -4933,8 +4949,93 @@ static void ath11k_sta_set_4addr_wk(stru +@@ -4928,8 +4944,93 @@ static void ath11k_sta_set_4addr_wk(stru WMI_PEER_USE_4ADDR, 1); if (ret) @@ -181,7 +181,7 @@ Signed-off-by: Sathishkumar Muruganandam } static int ath11k_mac_inc_num_stations(struct ath11k_vif *arvif, -@@ -5264,9 +5365,32 @@ static void ath11k_mac_op_sta_set_4addr( +@@ -5259,9 +5360,32 @@ static void ath11k_mac_op_sta_set_4addr( struct ieee80211_sta *sta, bool enabled) { struct ath11k *ar = hw->priv; @@ -214,7 +214,7 @@ Signed-off-by: Sathishkumar Muruganandam ieee80211_queue_work(ar->hw, &arsta->set_4addr_wk); arsta->use_4addr_set = true; } -@@ -6646,6 +6770,9 @@ static int ath11k_mac_op_update_vif_offl +@@ -6641,6 +6765,9 @@ static int ath11k_mac_op_update_vif_offl u32 param_id, param_value; int ret; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; if (ath11k_frame_mode != ATH11K_HW_TXRX_ETHERNET || (vif->type != NL80211_IFTYPE_STATION && -@@ -6866,7 +6993,8 @@ static int ath11k_mac_op_add_interface(s +@@ -6861,7 +6988,8 @@ static int ath11k_mac_op_add_interface(s goto err; } @@ -234,7 +234,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_warn(ab, "failed to create vdev %u, reached max vdev limit %d\n", ar->num_created_vdevs, TARGET_NUM_VDEVS(ab)); ret = -EBUSY; -@@ -6886,6 +7014,28 @@ static int ath11k_mac_op_add_interface(s +@@ -6881,6 +7009,28 @@ static int ath11k_mac_op_add_interface(s arvif->vif = vif; INIT_LIST_HEAD(&arvif->list); @@ -263,7 +263,7 @@ Signed-off-by: Sathishkumar Muruganandam INIT_DELAYED_WORK(&arvif->connection_loss_work, ath11k_mac_vif_sta_connection_loss_work); -@@ -6915,6 +7065,7 @@ static int ath11k_mac_op_add_interface(s +@@ -6910,6 +7060,7 @@ static int ath11k_mac_op_add_interface(s fallthrough; case NL80211_IFTYPE_AP: arvif->vdev_type = WMI_VDEV_TYPE_AP; @@ -271,7 +271,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case NL80211_IFTYPE_MONITOR: arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; -@@ -7137,13 +7288,30 @@ static void ath11k_mac_op_remove_interfa +@@ -7132,13 +7283,30 @@ static void ath11k_mac_op_remove_interfa struct ath11k *ar = hw->priv; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); struct ath11k_base *ab = ar->ab; @@ -304,7 +304,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_dbg(ab, ATH11K_DBG_MAC, "remove interface (vdev %d)\n", arvif->vdev_id); -@@ -7160,6 +7328,14 @@ static void ath11k_mac_op_remove_interfa +@@ -7155,6 +7323,14 @@ static void ath11k_mac_op_remove_interfa if (ret) ath11k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", arvif->vdev_id, ret); @@ -319,7 +319,7 @@ Signed-off-by: Sathishkumar Muruganandam } ret = ath11k_mac_vdev_delete(ar, arvif); -@@ -7203,8 +7379,7 @@ err_vdev_del: +@@ -7198,8 +7374,7 @@ err_vdev_del: ath11k_debugfs_remove_interface(arvif); @@ -329,7 +329,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); } -@@ -7264,16 +7439,17 @@ static int ath11k_mac_op_ampdu_action(st +@@ -7259,16 +7434,17 @@ static int ath11k_mac_op_ampdu_action(st struct ieee80211_ampdu_params *params) { struct ath11k *ar = hw->priv; @@ -349,7 +349,7 @@ Signed-off-by: Sathishkumar Muruganandam break; case IEEE80211_AMPDU_TX_START: case IEEE80211_AMPDU_TX_STOP_CONT: -@@ -8796,6 +8972,7 @@ static void ath11k_mac_op_sta_statistics +@@ -8791,6 +8967,7 @@ static void ath11k_mac_op_sta_statistics { struct ath11k_sta *arsta = ath11k_sta_to_arsta(sta); struct ath11k *ar = arsta->arvif->ar; @@ -357,7 +357,7 @@ Signed-off-by: Sathishkumar Muruganandam s8 signal; bool db2dbm = test_bit(WMI_TLV_SERVICE_HW_DB2DBM_CONVERSION_SUPPORT, ar->ab->wmi_ab.svc_map); -@@ -8852,7 +9029,8 @@ static void ath11k_mac_op_sta_statistics +@@ -8847,7 +9024,8 @@ static void ath11k_mac_op_sta_statistics ATH11K_DEFAULT_NOISE_FLOOR; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); diff --git a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch index 80b8a5fc67d7ea..750fd2b239d548 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/236-003-ath11k-add-dynamic-VLAN-support-in-NSS-offload.patch @@ -83,7 +83,7 @@ Signed-off-by: Sathishkumar Muruganandam struct ath11k_vif_iter { --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -351,6 +351,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n +@@ -346,6 +346,10 @@ enum nl80211_he_gi ath11k_mac_he_gi_to_n return ret; } @@ -94,7 +94,7 @@ Signed-off-by: Sathishkumar Muruganandam u8 ath11k_mac_bw_to_mac80211_bw(u8 bw) { u8 ret = 0; -@@ -723,6 +727,33 @@ u8 ath11k_mac_get_target_pdev_id(struct +@@ -718,6 +722,33 @@ u8 ath11k_mac_get_target_pdev_id(struct return ar->ab->target_pdev_ids[0].pdev_id; } @@ -128,7 +128,7 @@ Signed-off-by: Sathishkumar Muruganandam static void ath11k_pdev_caps_update(struct ath11k *ar) { struct ath11k_base *ab = ar->ab; -@@ -4172,6 +4203,9 @@ static int ath11k_install_key(struct ath +@@ -4167,6 +4198,9 @@ static int ath11k_install_key(struct ath if (test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) return 0; @@ -138,7 +138,7 @@ Signed-off-by: Sathishkumar Muruganandam if (cmd == DISABLE_KEY) { arg.key_cipher = WMI_CIPHER_NONE; arg.key_data = NULL; -@@ -4261,15 +4295,40 @@ static int ath11k_clear_peer_keys(struct +@@ -4256,15 +4290,40 @@ static int ath11k_clear_peer_keys(struct return first_errno; } @@ -181,7 +181,7 @@ Signed-off-by: Sathishkumar Muruganandam const u8 *peer_addr; int ret = 0; u32 flags = 0; -@@ -4287,17 +4346,38 @@ static int ath11k_mac_op_set_key(struct +@@ -4282,17 +4341,38 @@ static int ath11k_mac_op_set_key(struct if (key->keyidx > WMI_MAX_KEY_INDEX) return -ENOSPC; @@ -224,7 +224,7 @@ Signed-off-by: Sathishkumar Muruganandam /* the peer should not disappear in mid-way (unless FW goes awry) since * we already hold conf_mutex. we just make sure its there now. */ -@@ -4342,6 +4422,74 @@ static int ath11k_mac_op_set_key(struct +@@ -4337,6 +4417,74 @@ static int ath11k_mac_op_set_key(struct goto exit; } @@ -299,7 +299,7 @@ Signed-off-by: Sathishkumar Muruganandam spin_lock_bh(&ab->base_lock); peer = ath11k_peer_find(ab, arvif->vdev_id, peer_addr); -@@ -4364,6 +4512,27 @@ static int ath11k_mac_op_set_key(struct +@@ -4359,6 +4507,27 @@ static int ath11k_mac_op_set_key(struct goto unlock; } @@ -327,7 +327,7 @@ Signed-off-by: Sathishkumar Muruganandam if (peer && cmd == SET_KEY) { peer->keys[key->keyidx] = key; if (key->flags & IEEE80211_KEY_FLAG_PAIRWISE) { -@@ -4373,18 +4542,23 @@ static int ath11k_mac_op_set_key(struct +@@ -4368,18 +4537,23 @@ static int ath11k_mac_op_set_key(struct peer->mcast_keyidx = key->keyidx; peer->sec_type_grp = ath11k_dp_tx_get_encrypt_type(key->cipher); } @@ -354,7 +354,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (key->cipher) { case WLAN_CIPHER_SUITE_TKIP: -@@ -5191,6 +5365,33 @@ static u32 ath11k_mac_ieee80211_sta_bw_t +@@ -5186,6 +5360,33 @@ static u32 ath11k_mac_ieee80211_sta_bw_t return bw; } @@ -388,7 +388,7 @@ Signed-off-by: Sathishkumar Muruganandam static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -5300,6 +5501,34 @@ static int ath11k_mac_op_sta_state(struc +@@ -5295,6 +5496,34 @@ static int ath11k_mac_op_sta_state(struc if (ret) ath11k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", sta->addr, arvif->vdev_id, ret); @@ -423,7 +423,7 @@ Signed-off-by: Sathishkumar Muruganandam } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { -@@ -7018,7 +7247,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7013,7 +7242,7 @@ static int ath11k_mac_op_add_interface(s if ((vif->type == NL80211_IFTYPE_AP_VLAN || vif->type == NL80211_IFTYPE_STATION) && ab->nss.enabled) { if (ath11k_frame_mode == ATH11K_HW_TXRX_ETHERNET && @@ -432,7 +432,7 @@ Signed-off-by: Sathishkumar Muruganandam vif->offload_flags |= IEEE80211_OFFLOAD_ENCAP_4ADDR; arvif->nss.encap = ATH11K_HW_TXRX_ETHERNET; arvif->nss.decap = ATH11K_HW_TXRX_ETHERNET; -@@ -7031,6 +7260,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7026,6 +7255,7 @@ static int ath11k_mac_op_add_interface(s vif->addr, ret); goto err; } @@ -440,7 +440,7 @@ Signed-off-by: Sathishkumar Muruganandam mutex_unlock(&ar->conf_mutex); return ret; } -@@ -7055,6 +7285,20 @@ static int ath11k_mac_op_add_interface(s +@@ -7050,6 +7280,20 @@ static int ath11k_mac_op_add_interface(s arvif->vdev_id = bit; arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; @@ -461,7 +461,7 @@ Signed-off-by: Sathishkumar Muruganandam switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_STATION: -@@ -7095,7 +7339,7 @@ static int ath11k_mac_op_add_interface(s +@@ -7090,7 +7334,7 @@ static int ath11k_mac_op_add_interface(s if (ret) { ath11k_warn(ab, "failed to create WMI vdev %d: %d\n", arvif->vdev_id, ret); @@ -470,7 +470,7 @@ Signed-off-by: Sathishkumar Muruganandam } ar->num_created_vdevs++; -@@ -7254,7 +7498,7 @@ err_peer_del: +@@ -7249,7 +7493,7 @@ err_peer_del: if (fbret) { ath11k_warn(ar->ab, "fallback fail to delete peer addr %pM vdev_id %d ret %d\n", vif->addr, arvif->vdev_id, fbret); @@ -479,7 +479,7 @@ Signed-off-by: Sathishkumar Muruganandam } } -@@ -7265,6 +7509,8 @@ err_vdev_del: +@@ -7260,6 +7504,8 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -488,7 +488,7 @@ Signed-off-by: Sathishkumar Muruganandam err: mutex_unlock(&ar->conf_mutex); -@@ -7362,6 +7608,7 @@ err_vdev_del: +@@ -7357,6 +7603,7 @@ err_vdev_del: list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); @@ -496,7 +496,7 @@ Signed-off-by: Sathishkumar Muruganandam ath11k_peer_cleanup(ar, arvif->vdev_id); idr_for_each(&ar->txmgmt_idr, -@@ -9960,8 +10207,11 @@ static int __ath11k_mac_register(struct +@@ -9956,8 +10203,11 @@ static int __ath11k_mac_register(struct ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; diff --git a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch index 61077309338ffb..d25e43ec0b3998 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/237-006-ath11k-Allow-fast-rx-by-bypassing-stats-update.patch @@ -328,7 +328,7 @@ Signed-off-by: P Praneesh bool (*rx_desc_get_mpdu_fc_valid)(struct hal_rx_desc *desc); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -5532,6 +5532,14 @@ static int ath11k_mac_op_sta_state(struc +@@ -5527,6 +5527,14 @@ static int ath11k_mac_op_sta_state(struc } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { diff --git a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch index 1c9a6ebd1d41ac..c4042611d3d9ea 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/244-ath11k-dp-tx-perf.patch @@ -430,7 +430,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6669,12 +6669,22 @@ static void ath11k_mac_op_tx(struct ieee +@@ -6664,12 +6664,22 @@ static void ath11k_mac_op_tx(struct ieee if (control->sta) arsta = ath11k_sta_to_arsta(control->sta); @@ -454,7 +454,7 @@ Signed-off-by: P Praneesh ieee80211_free_txskb(ar->hw, skb); return; } -@@ -7622,7 +7632,7 @@ err_vdev_del: +@@ -7617,7 +7627,7 @@ err_vdev_del: idr_for_each(&ar->txmgmt_idr, ath11k_mac_vif_txmgmt_idr_remove, vif); diff --git a/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch b/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch index 4260d0e5337451..717c11bdfe39e1 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/270-iphone-issue.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6267,6 +6267,8 @@ static int ath11k_mac_copy_he_cap(struct +@@ -6262,6 +6262,8 @@ static int ath11k_mac_copy_he_cap(struct memcpy(he_cap_elem->phy_cap_info, band_cap->he_cap_phy_info, sizeof(he_cap_elem->phy_cap_info)); diff --git a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch index b31809f689548b..30848b8f6164ac 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/300-ath11k-nss-mesh-offload-support.patch @@ -1238,7 +1238,7 @@ Signed-off-by: Vasanthakumar Thiagarajan --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -3474,6 +3474,18 @@ static void ath11k_mac_op_nss_bss_info_c +@@ -3469,6 +3469,18 @@ static void ath11k_mac_op_nss_bss_info_c ath11k_warn(ar->ab, "failed to set ap_isolate in nss %d\n", ret); } @@ -1257,7 +1257,7 @@ Signed-off-by: Vasanthakumar Thiagarajan mutex_unlock(&ar->conf_mutex); } -@@ -9714,6 +9726,28 @@ err_fallback: +@@ -9709,6 +9721,28 @@ err_fallback: return 0; } @@ -1286,7 +1286,7 @@ Signed-off-by: Vasanthakumar Thiagarajan static const struct ieee80211_ops ath11k_ops = { .tx = ath11k_mac_op_tx, .wake_tx_queue = ieee80211_handle_wake_tx_queue, -@@ -9771,6 +9805,9 @@ static const struct ieee80211_ops ath11k +@@ -9766,6 +9800,9 @@ static const struct ieee80211_ops ath11k .set_sar_specs = ath11k_mac_op_set_bios_sar_specs, .remain_on_channel = ath11k_mac_op_remain_on_channel, .cancel_remain_on_channel = ath11k_mac_op_cancel_remain_on_channel, @@ -1296,7 +1296,7 @@ Signed-off-by: Vasanthakumar Thiagarajan }; static void ath11k_mac_update_ch_list(struct ath11k *ar, -@@ -10231,6 +10268,8 @@ static int __ath11k_mac_register(struct +@@ -10227,6 +10264,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, SUPPORTS_NSS_OFFLOAD); wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_VLAN_OFFLOAD); diff --git a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch index cb4fba0a2ffdcd..6edfd5f9208e97 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/314-ath11k-Fix-peer-lookup-failure-in-mgmt-tx-completion.patch @@ -23,7 +23,7 @@ Signed-off-by: Rameshkumar Sundaram --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7643,8 +7643,10 @@ err_vdev_del: +@@ -7638,8 +7638,10 @@ err_vdev_del: kfree(arvif->vlan_keyid_map); ath11k_peer_cleanup(ar, arvif->vdev_id); diff --git a/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch index 361c9064148acd..01ccc6003fc0cf 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/330-ath11k-sync-wds_ast_entry-updates.patch @@ -56,7 +56,7 @@ Signed-off-by: Rameshkumar Sundaram static void ath11k_ahb_free_resources(struct ath11k_base *ab) --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -2212,6 +2212,7 @@ struct ath11k_base *ath11k_core_alloc(st +@@ -2211,6 +2211,7 @@ struct ath11k_base *ath11k_core_alloc(st mutex_init(&ab->core_lock); mutex_init(&ab->tbl_mtx_lock); @@ -64,7 +64,7 @@ Signed-off-by: Rameshkumar Sundaram spin_lock_init(&ab->base_lock); mutex_init(&ab->vdev_id_11d_lock); init_completion(&ab->reset_complete); -@@ -2225,6 +2226,8 @@ struct ath11k_base *ath11k_core_alloc(st +@@ -2224,6 +2225,8 @@ struct ath11k_base *ath11k_core_alloc(st INIT_WORK(&ab->restart_work, ath11k_core_restart); INIT_WORK(&ab->update_11d_work, ath11k_update_11d); INIT_WORK(&ab->reset_work, ath11k_core_reset); diff --git a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index 3c3e436c75ce41..8e018e619f12f8 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -58,7 +58,7 @@ Signed-off-by: Venkateswara Naralasetty tcl_cmd.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_DSCP_TID_TABLE_IDX, --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10154,6 +10154,8 @@ static int __ath11k_mac_register(struct +@@ -10150,6 +10150,8 @@ static int __ath11k_mac_register(struct ieee80211_hw_set(ar->hw, USES_RSS); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch b/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch index dbd8dd904c022d..9a3c95a9df3c40 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/341-ath11k-fix-support-for-ext-vdev-in-NSS-for-AP_VLAN-v.patch @@ -38,7 +38,7 @@ Signed-off-by: Aditya Kumar Singh --- a/drivers/net/wireless/ath/ath11k/core.c +++ b/drivers/net/wireless/ath/ath11k/core.c -@@ -1838,6 +1838,11 @@ static int ath11k_core_reconfigure_on_cr +@@ -1837,6 +1837,11 @@ static int ath11k_core_reconfigure_on_cr clear_bit(ATH11K_FLAG_CRASH_FLUSH, &ab->dev_flags); diff --git a/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch b/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch index 15a8afde61ef4f..4c7fefbba155d7 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/357-ath11k-fix-clear-peer-keys-during-disassoc.patch @@ -17,7 +17,7 @@ Signed-off-by: Karthikeyan Kathirvel --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -4899,12 +4899,6 @@ static int ath11k_station_disassoc(struc +@@ -4894,12 +4894,6 @@ static int ath11k_station_disassoc(struc return ret; } @@ -30,7 +30,7 @@ Signed-off-by: Karthikeyan Kathirvel return 0; } -@@ -5495,6 +5489,17 @@ static int ath11k_mac_op_sta_state(struc +@@ -5490,6 +5484,17 @@ static int ath11k_mac_op_sta_state(struc arsta->bw = ath11k_mac_ieee80211_sta_bw_to_wmi(ar, sta); arsta->bw_prev = arsta->bw; spin_unlock_bh(&ar->data_lock); diff --git a/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch b/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch index 1f66f72a4a4851..ceeb15c8cbea65 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/401-ath11k-Fix-mutex-dead-lock-and-q6-dump-crash.patch @@ -36,7 +36,7 @@ Signed-off-by: Rajat Soni --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -8001,7 +8001,9 @@ static int ath11k_mac_op_start(struct ie +@@ -6786,7 +6786,9 @@ static int ath11k_mac_op_start(struct ie break; case ATH11K_STATE_RESTARTING: ar->state = ATH11K_STATE_RESTARTED; @@ -48,7 +48,7 @@ Signed-off-by: Rajat Soni case ATH11K_STATE_WEDGED: --- a/drivers/net/wireless/ath/ath11k/qmi.c +++ b/drivers/net/wireless/ath/ath11k/qmi.c -@@ -2960,6 +2960,8 @@ static int ath11k_qmi_assign_target_mem_ +@@ -2061,6 +2061,8 @@ static int ath11k_qmi_assign_target_mem_ if (!ab->qmi.target_mem[idx].iaddr) return -EIO; diff --git a/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch b/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch index 7d413afec97b3d..90982924fe29f7 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/453-ath11k-flush-management-frames-to-firmware-before-wa.patch @@ -25,11 +25,9 @@ Signed-off-by: Hari Chandrakanthan drivers/net/wireless/ath/ath11k/mac.c | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c -index 28c9908ef816..dbdb7aa5c498 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -10266,6 +10266,8 @@ static int ath11k_mac_flush_tx_complete(struct ath11k *ar) +@@ -8464,6 +8464,8 @@ static int ath11k_mac_flush_tx_complete( ret = -ETIMEDOUT; } @@ -38,6 +36,3 @@ index 28c9908ef816..dbdb7aa5c498 100644 time_left = wait_event_timeout(ar->txmgmt_empty_waitq, (atomic_read(&ar->num_pending_mgmt_tx) == 0), ATH11K_FLUSH_TIMEOUT); --- -2.7.4 - diff --git a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch index c23b6cb3c858b4..21a92296da38a1 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/457-wifi-ath11k-Avoid-memset-of-ppdu-info-for-next-skb.patch @@ -48,7 +48,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -6090,7 +6090,9 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6089,7 +6089,9 @@ int ath11k_dp_rx_process_mon_status(stru if (!num_buffs_reaped) goto exit; @@ -59,7 +59,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; while ((skb = __skb_dequeue(&skb_list))) { -@@ -6108,7 +6110,6 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6107,7 +6109,6 @@ int ath11k_dp_rx_process_mon_status(stru if (log_type != ATH11K_PKTLOG_TYPE_INVALID) trace_ath11k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); @@ -67,7 +67,7 @@ Signed-off-by: Yuvasree Sivasankaran ppdu_info->peer_id = HAL_INVALID_PEERID; hal_status = ath11k_hal_rx_parse_mon_status(ab, ppdu_info, skb); -@@ -6136,6 +6137,7 @@ int ath11k_dp_rx_process_mon_status(stru +@@ -6135,6 +6136,7 @@ int ath11k_dp_rx_process_mon_status(stru if ((ppdu_info->peer_id == HAL_INVALID_PEERID || hal_status != HAL_RX_MON_STATUS_PPDU_DONE)) { dev_kfree_skb_any(skb); diff --git a/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch b/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch index fe767b6a33de2a..06cee635f3e79b 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/669-ath11k-change-dma_map_single-to-virt_to_phys-in-rx-r.patch @@ -40,7 +40,7 @@ Signed-off-by: Balamurugan Selvarajan --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -427,9 +427,9 @@ int ath11k_dp_rxbufs_replenish(struct at +@@ -392,9 +392,9 @@ int ath11k_dp_rxbufs_replenish(struct at skb->data); } @@ -53,7 +53,7 @@ Signed-off-by: Balamurugan Selvarajan if (dma_mapping_error(ab->dev, paddr)) goto fail_free_skb; -@@ -465,8 +465,8 @@ fail_idr_remove: +@@ -430,8 +430,8 @@ fail_idr_remove: idr_remove(&rx_ring->bufs_idr, buf_id); spin_unlock_bh(&rx_ring->idr_lock); fail_dma_unmap: diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch index b471fb326a5b48..4d8f9f28e3a1e3 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-01-wifi-ath11k-remove-invalid-peer-create-logic.patch @@ -26,7 +26,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -8221,7 +8221,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8218,7 +8218,6 @@ ath11k_mac_op_assign_vif_chanctx(struct struct ath11k_base *ab = ar->ab; struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); int ret; @@ -34,7 +34,7 @@ Acked-by: Jeff Johnson mutex_lock(&ar->conf_mutex); -@@ -8244,21 +8243,6 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -8241,21 +8240,6 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch index 2fb2cdfd429b11..7d04e371edd5fa 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-02-wifi-ath11k-rename-ath11k_start_vdev_delay.patch @@ -19,7 +19,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -261,8 +261,8 @@ static const u32 ath11k_smps_map[] = { +@@ -256,8 +256,8 @@ static const u32 ath11k_smps_map[] = { [WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE, }; @@ -30,7 +30,7 @@ Acked-by: Jeff Johnson enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) { -@@ -5319,7 +5319,7 @@ static int ath11k_mac_station_add(struct +@@ -5314,7 +5314,7 @@ static int ath11k_mac_station_add(struct if (ab->hw_params.vdev_start_delay && !arvif->is_started && arvif->vdev_type != WMI_VDEV_TYPE_AP) { @@ -39,7 +39,7 @@ Acked-by: Jeff Johnson if (ret) { ath11k_warn(ab, "failed to delay vdev start: %d\n", ret); goto free_tx_stats; -@@ -8164,8 +8164,8 @@ unlock: +@@ -8161,8 +8161,8 @@ unlock: mutex_unlock(&ar->conf_mutex); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch index 4d83d0f0ed9029..f928d851a678d7 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-03-wifi-ath11k-avoid-forward-declaration-of-ath11k_mac_start_vdev_delay.patch @@ -18,7 +18,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -261,9 +261,6 @@ static const u32 ath11k_smps_map[] = { +@@ -256,9 +256,6 @@ static const u32 ath11k_smps_map[] = { [WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE, }; @@ -28,7 +28,7 @@ Acked-by: Jeff Johnson enum nl80211_he_ru_alloc ath11k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) { enum nl80211_he_ru_alloc ret; -@@ -5249,100 +5246,6 @@ static void ath11k_mac_dec_num_stations( +@@ -5244,100 +5241,6 @@ static void ath11k_mac_dec_num_stations( ar->num_stations--; } @@ -129,7 +129,7 @@ Acked-by: Jeff Johnson static u32 ath11k_mac_ieee80211_sta_bw_to_wmi(struct ath11k *ar, struct ieee80211_sta *sta) { -@@ -5398,187 +5301,6 @@ static int ath11k_mac_cfg_dyn_vlan(struc +@@ -5393,187 +5296,6 @@ static int ath11k_mac_cfg_dyn_vlan(struc return ret; } @@ -317,7 +317,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_set_txpwr(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta) -@@ -9739,6 +9461,281 @@ ath11k_mac_op_config_mesh_offload_path(s +@@ -9738,6 +9460,281 @@ ath11k_mac_op_config_mesh_offload_path(s } #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch index d1b462519c91e8..010825fd16656e 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/907-04-wifi-ath11k-fix-connection-failure-due-to-unexpected-peer-delete.patch @@ -52,7 +52,7 @@ Acked-by: Jeff Johnson --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -7933,6 +7933,30 @@ static int ath11k_mac_start_vdev_delay(s +@@ -7930,6 +7930,30 @@ static int ath11k_mac_start_vdev_delay(s return 0; } @@ -83,7 +83,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -@@ -7977,15 +8001,17 @@ ath11k_mac_op_assign_vif_chanctx(struct +@@ -7974,15 +7998,17 @@ ath11k_mac_op_assign_vif_chanctx(struct goto out; } @@ -109,7 +109,7 @@ Acked-by: Jeff Johnson if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && test_bit(ATH11K_FLAG_MONITOR_VDEV_CREATED, &ar->monitor_flags)) { -@@ -8025,8 +8051,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8022,8 +8048,6 @@ ath11k_mac_op_unassign_vif_chanctx(struc "chanctx unassign ptr %p vdev_id %i\n", ctx, arvif->vdev_id); @@ -118,7 +118,7 @@ Acked-by: Jeff Johnson if (ab->hw_params.vdev_start_delay && arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { spin_lock_bh(&ab->base_lock); -@@ -8050,24 +8074,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc +@@ -8047,24 +8071,13 @@ ath11k_mac_op_unassign_vif_chanctx(struc return; } @@ -149,7 +149,7 @@ Acked-by: Jeff Johnson } if (ab->hw_params.vdev_start_delay && -@@ -9555,6 +9568,46 @@ exit: +@@ -9554,6 +9567,46 @@ exit: return ret; } @@ -196,7 +196,7 @@ Acked-by: Jeff Johnson static int ath11k_mac_op_sta_state(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, -@@ -9590,31 +9643,15 @@ static int ath11k_mac_op_sta_state(struc +@@ -9589,31 +9642,15 @@ static int ath11k_mac_op_sta_state(struc sta->addr, arvif->vdev_id); } else if ((old_state == IEEE80211_STA_NONE && new_state == IEEE80211_STA_NOTEXIST)) { @@ -233,7 +233,7 @@ Acked-by: Jeff Johnson ath11k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", vif->addr, arvif->vdev_id); ath11k_peer_rhash_delete(ar->ab, peer); -@@ -9625,12 +9662,6 @@ static int ath11k_mac_op_sta_state(struc +@@ -9624,12 +9661,6 @@ static int ath11k_mac_op_sta_state(struc } spin_unlock_bh(&ar->ab->base_lock); mutex_unlock(&ar->ab->tbl_mtx_lock); diff --git a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch index 2362820dc9e838..4276e64cc30364 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/908-ath11k-make-debugfs-sta-htt-stats-modular.patch @@ -153,7 +153,7 @@ #include "hw.h" #include "peer.h" #include "mac.h" -@@ -551,7 +553,9 @@ static void ath11k_dp_tx_cache_peer_stat +@@ -550,7 +552,9 @@ static void ath11k_dp_tx_cache_peer_stat void ath11k_dp_tx_update_txcompl(struct ath11k *ar, struct hal_tx_status *ts) { struct ath11k_base *ab = ar->ab; @@ -163,7 +163,7 @@ enum hal_tx_rate_stats_pkt_type pkt_type; enum hal_tx_rate_stats_sgi sgi; enum hal_tx_rate_stats_bw bw; -@@ -640,8 +644,10 @@ void ath11k_dp_tx_update_txcompl(struct +@@ -639,8 +643,10 @@ void ath11k_dp_tx_update_txcompl(struct ath11k_mac_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones); } @@ -176,7 +176,7 @@ spin_unlock_bh(&ab->base_lock); --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -9812,7 +9812,7 @@ static const struct ieee80211_ops ath11k +@@ -9811,7 +9811,7 @@ static const struct ieee80211_ops ath11k .set_wakeup = ath11k_wow_op_set_wakeup, #endif diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch b/package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch index 85562dc463a211..322698f0ea8d84 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-233-ath11k-Disable-rx_header-tlv-for-2K-SKB.patch @@ -49,7 +49,7 @@ Signed-off-by: Ramya Gnanasekar * |-------------------------------------------------------------------| * | rsvd2 | ring_buffer_size | * |-------------------------------------------------------------------| -@@ -686,6 +691,14 @@ enum htt_stats_internal_ppdu_frametype { +@@ -686,6 +687,14 @@ enum htt_stats_internal_ppdu_frametype { * |-------------------------------------------------------------------| * | tlv_filter_in_flags | * |-------------------------------------------------------------------| @@ -64,7 +64,7 @@ Signed-off-by: Ramya Gnanasekar * Where: * PS = pkt_swap * SS = status_swap -@@ -699,7 +712,10 @@ enum htt_stats_internal_ppdu_frametype { +@@ -699,7 +708,10 @@ enum htt_stats_internal_ppdu_frametype { * More details can be got from enum htt_srng_ring_id * b'24 - status_swap: 1 is to swap status TLV * b'25 - pkt_swap: 1 is to swap packet TLV @@ -76,7 +76,7 @@ Signed-off-by: Ramya Gnanasekar * dword1 - b'0:16 - ring_buffer_size: size of buffers referenced by rx ring, * in byte units. * Valid only for HW_TO_SW_RING and SW_TO_HW_RING -@@ -728,6 +744,42 @@ enum htt_stats_internal_ppdu_frametype { +@@ -728,6 +740,42 @@ enum htt_stats_internal_ppdu_frametype { * dword6 - b'0:31 - tlv_filter_in_flags: * Filter in Attention/MPDU/PPDU/Header/User tlvs * Refer to CFG_TLV_FILTER_IN_FLAG defs @@ -119,7 +119,7 @@ Signed-off-by: Ramya Gnanasekar */ #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_MSG_TYPE GENMASK(7, 0) -@@ -735,8 +787,16 @@ enum htt_stats_internal_ppdu_frametype { +@@ -735,8 +783,16 @@ enum htt_stats_internal_ppdu_frametype { #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID GENMASK(23, 16) #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS BIT(24) #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS BIT(25) @@ -136,7 +136,7 @@ Signed-off-by: Ramya Gnanasekar enum htt_rx_filter_tlv_flags { HTT_RX_FILTER_TLV_FLAGS_MPDU_START = BIT(0), -@@ -1040,6 +1100,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { +@@ -1040,6 +1096,14 @@ enum htt_rx_data_pkt_filter_tlv_flasg3 { HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ HTT_RX_FILTER_TLV_FLAGS_ATTENTION) @@ -151,7 +151,7 @@ Signed-off-by: Ramya Gnanasekar struct htt_rx_ring_selection_cfg_cmd { u32 info0; u32 info1; -@@ -1048,6 +1116,10 @@ struct htt_rx_ring_selection_cfg_cmd { +@@ -1048,6 +1112,10 @@ struct htt_rx_ring_selection_cfg_cmd { u32 pkt_type_en_flags2; u32 pkt_type_en_flags3; u32 rx_filter_tlv; @@ -162,7 +162,7 @@ Signed-off-by: Ramya Gnanasekar } __packed; struct htt_rx_ring_tlv_filter { -@@ -1056,6 +1128,14 @@ struct htt_rx_ring_tlv_filter { +@@ -1056,6 +1124,14 @@ struct htt_rx_ring_tlv_filter { u32 pkt_filter_flags1; /* MGMT */ u32 pkt_filter_flags2; /* CTRL */ u32 pkt_filter_flags3; /* DATA */ @@ -228,7 +228,7 @@ Signed-off-by: Ramya Gnanasekar static void ath11k_dp_service_mon_ring(struct timer_list *t) { struct ath11k_base *ab = from_timer(ab, t, mon_reap_timer); -@@ -2387,6 +2422,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a +@@ -2389,6 +2424,49 @@ int ath11k_dp_rx_crypto_icv_len(struct a return 0; } @@ -278,7 +278,7 @@ Signed-off-by: Ramya Gnanasekar static void ath11k_dp_rx_h_undecap_nwifi(struct ath11k *ar, struct sk_buff *msdu, u8 *first_hdr, -@@ -2400,7 +2478,8 @@ static void ath11k_dp_rx_h_undecap_nwifi +@@ -2402,7 +2480,8 @@ static void ath11k_dp_rx_h_undecap_nwifi u8 da[ETH_ALEN]; u8 sa[ETH_ALEN]; u16 qos_ctl = 0; @@ -288,7 +288,7 @@ Signed-off-by: Ramya Gnanasekar /* copy SA & DA and pull decapped header */ hdr = (struct ieee80211_hdr *)msdu->data; -@@ -2409,7 +2488,7 @@ static void ath11k_dp_rx_h_undecap_nwifi +@@ -2411,7 +2490,7 @@ static void ath11k_dp_rx_h_undecap_nwifi ether_addr_copy(sa, ieee80211_get_SA(hdr)); skb_pull(msdu, ieee80211_hdrlen(hdr->frame_control)); @@ -297,7 +297,7 @@ Signed-off-by: Ramya Gnanasekar /* original 802.11 header is valid for the first msdu * hence we can reuse the same header */ -@@ -2439,16 +2518,23 @@ static void ath11k_dp_rx_h_undecap_nwifi +@@ -2441,16 +2520,23 @@ static void ath11k_dp_rx_h_undecap_nwifi /* copy decap header before overwriting for reuse below */ memcpy(decap_hdr, (uint8_t *)hdr, hdr_len); @@ -326,7 +326,7 @@ Signed-off-by: Ramya Gnanasekar memcpy(skb_push(msdu, IEEE80211_QOS_CTL_LEN), &qos_ctl, IEEE80211_QOS_CTL_LEN); -@@ -2564,6 +2650,20 @@ static void ath11k_dp_rx_h_undecap_eth(s +@@ -2566,6 +2652,20 @@ static void ath11k_dp_rx_h_undecap_eth(s u8 da[ETH_ALEN]; u8 sa[ETH_ALEN]; void *rfc1042; @@ -347,7 +347,7 @@ Signed-off-by: Ramya Gnanasekar rfc1042 = ath11k_dp_rx_h_find_rfc1042(ar, msdu, enctype); if (WARN_ON_ONCE(!rfc1042)) -@@ -2592,6 +2692,7 @@ static void ath11k_dp_rx_h_undecap_eth(s +@@ -2594,6 +2694,7 @@ static void ath11k_dp_rx_h_undecap_eth(s memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); @@ -355,7 +355,7 @@ Signed-off-by: Ramya Gnanasekar /* original 802.11 header has a different DA and in * case of 4addr it may also have different SA */ -@@ -2610,6 +2711,7 @@ static void ath11k_dp_rx_h_undecap_snap( +@@ -2612,6 +2713,7 @@ static void ath11k_dp_rx_h_undecap_snap( size_t hdr_len; u8 l3_pad_bytes; struct hal_rx_desc *rx_desc; @@ -363,7 +363,7 @@ Signed-off-by: Ramya Gnanasekar /* Delivered decapped frame: * [amsdu header] <-- replaced with 802.11 hdr -@@ -2623,6 +2725,11 @@ static void ath11k_dp_rx_h_undecap_snap( +@@ -2625,6 +2727,11 @@ static void ath11k_dp_rx_h_undecap_snap( skb_put(msdu, l3_pad_bytes); skb_pull(msdu, sizeof(struct ath11k_dp_amsdu_subframe_hdr) + l3_pad_bytes); @@ -375,7 +375,7 @@ Signed-off-by: Ramya Gnanasekar hdr = (struct ieee80211_hdr *)first_hdr; hdr_len = ieee80211_hdrlen(hdr->frame_control); -@@ -3097,6 +3204,20 @@ static int ath11k_dp_rx_process_msdu(str +@@ -3098,6 +3205,20 @@ static int ath11k_dp_rx_process_msdu(str goto free_out; } @@ -396,7 +396,7 @@ Signed-off-by: Ramya Gnanasekar rxcb = ATH11K_SKB_RXCB(msdu); rxcb->rx_desc = rx_desc; msdu_len = ath11k_dp_rx_h_msdu_start_msdu_len(ab, rx_desc); -@@ -3109,8 +3230,9 @@ static int ath11k_dp_rx_process_msdu(str +@@ -3110,8 +3231,9 @@ static int ath11k_dp_rx_process_msdu(str hdr_status = ath11k_dp_rx_h_80211_hdr(ab, rx_desc); ret = -EINVAL; ath11k_warn(ab, "invalid msdu len %u\n", msdu_len); @@ -408,7 +408,7 @@ Signed-off-by: Ramya Gnanasekar ath11k_dbg_dump(ab, ATH11K_DBG_DATA, NULL, "", rx_desc, sizeof(struct hal_rx_desc)); goto free_out; -@@ -4069,6 +4191,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi +@@ -4070,6 +4192,7 @@ static int ath11k_dp_rx_h_verify_tkip_mi hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); hdr_len = ieee80211_hdrlen(hdr->frame_control); @@ -416,7 +416,7 @@ Signed-off-by: Ramya Gnanasekar head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN; tail_len = IEEE80211_CCMP_MIC_LEN + IEEE80211_TKIP_ICV_LEN + FCS_LEN; -@@ -4349,8 +4472,8 @@ static void ath11k_dp_rx_h_sort_frags(st +@@ -4350,8 +4473,8 @@ static void ath11k_dp_rx_h_sort_frags(st static u64 ath11k_dp_rx_h_get_pn(struct ath11k *ar, struct sk_buff *skb) { @@ -426,7 +426,7 @@ Signed-off-by: Ramya Gnanasekar u8 *ehdr; u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; -@@ -4580,8 +4703,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 +@@ -4581,8 +4704,9 @@ ath11k_dp_process_rx_err_buf(struct ath1 if ((msdu_len + hal_rx_desc_sz) > DP_RX_BUFFER_SIZE) { hdr_status = ath11k_dp_rx_h_80211_hdr(ar->ab, rx_desc); ath11k_warn(ar->ab, "invalid msdu leng %u", msdu_len); @@ -438,7 +438,7 @@ Signed-off-by: Ramya Gnanasekar ath11k_dbg_dump(ar->ab, ATH11K_DBG_DATA, NULL, "", rx_desc, sizeof(struct hal_rx_desc)); dev_kfree_skb_any(msdu); -@@ -5206,6 +5330,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 +@@ -5207,6 +5331,47 @@ void ath11k_dp_rx_pdev_free(struct ath11 ath11k_dp_rxdma_pdev_buf_free(ar); } @@ -486,7 +486,7 @@ Signed-off-by: Ramya Gnanasekar int ath11k_dp_rx_pdev_alloc(struct ath11k_base *ab, int mac_id) { struct ath11k *ar = ab->pdevs[mac_id].ar; -@@ -5299,6 +5464,12 @@ config_refill_ring: +@@ -5300,6 +5465,12 @@ config_refill_ring: } } @@ -501,7 +501,7 @@ Signed-off-by: Ramya Gnanasekar --- a/drivers/net/wireless/ath/ath11k/dp_tx.c +++ b/drivers/net/wireless/ath/ath11k/dp_tx.c -@@ -1264,6 +1264,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str +@@ -1263,6 +1263,8 @@ int ath11k_dp_tx_htt_rx_filter_setup(str !!(params.flags & HAL_SRNG_FLAGS_MSI_SWAP)); cmd->info0 |= FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS, !!(params.flags & HAL_SRNG_FLAGS_DATA_TLV_SWAP)); @@ -510,7 +510,7 @@ Signed-off-by: Ramya Gnanasekar cmd->info1 = FIELD_PREP(HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE, rx_buf_size); -@@ -1273,6 +1275,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str +@@ -1272,6 +1274,26 @@ int ath11k_dp_tx_htt_rx_filter_setup(str cmd->pkt_type_en_flags3 = tlv_filter->pkt_filter_flags3; cmd->rx_filter_tlv = tlv_filter->rx_filter; @@ -537,7 +537,7 @@ Signed-off-by: Ramya Gnanasekar ret = ath11k_htc_send(&ab->htc, ab->dp.eid, skb); if (ret) goto err_free; -@@ -1351,6 +1373,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c +@@ -1350,6 +1372,7 @@ int ath11k_dp_tx_htt_monitor_mode_ring_c } ring_id = dp->rxdma_mon_buf_ring.refill_buf_ring.ring_id; @@ -933,7 +933,7 @@ Signed-off-by: Ramya Gnanasekar extern const struct ath11k_hw_ops ipq8074_ops; --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c -@@ -6455,6 +6455,7 @@ static int ath11k_mac_config_mon_status_ +@@ -6450,6 +6450,7 @@ static int ath11k_mac_config_mon_status_ tlv_filter.rx_filter = ath11k_debugfs_rx_filter(ar); } diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch b/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch index 1f554ae95ccc69..12a035bf4e5790 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch @@ -25,7 +25,7 @@ Signed-off-by: P Praneesh --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -5994,6 +5994,7 @@ static void ath11k_update_radiotap(struc +@@ -5995,6 +5995,7 @@ static void ath11k_update_radiotap(struc { struct ieee80211_supported_band *sband; u8 *ptr = NULL; @@ -33,7 +33,7 @@ Signed-off-by: P Praneesh rxs->flag |= RX_FLAG_MACTIME_START; rxs->signal = ppduinfo->rssi_comb + ATH11K_DEFAULT_NOISE_FLOOR; -@@ -6001,6 +6002,11 @@ static void ath11k_update_radiotap(struc +@@ -6002,6 +6003,11 @@ static void ath11k_update_radiotap(struc if (ppduinfo->nss) rxs->nss = ppduinfo->nss; @@ -128,7 +128,7 @@ Signed-off-by: P Praneesh struct hal_rx_rxpcu_classification_overview { --- a/drivers/net/wireless/ath/ath11k/hw.h +++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -306,6 +306,7 @@ struct ath11k_hw_ops { +@@ -307,6 +307,7 @@ struct ath11k_hw_ops { void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, u8 *crypto_hdr, enum hal_encrypt_type enctype); diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch b/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch index 499f720caba8cb..ef01c639a266b4 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-336-0001-ath11k-idr-optimization.patch @@ -28,7 +28,7 @@ Signed-off-by: Tamizh Chelvam } --- a/drivers/net/wireless/ath/ath11k/dp_rx.c +++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -3336,18 +3336,16 @@ try_again: +@@ -3385,18 +3385,16 @@ try_again: ar = ab->pdevs[mac_id].ar; rx_ring = &ar->dp.rx_refill_buf_ring; spin_lock_bh(&rx_ring->idr_lock); @@ -50,7 +50,7 @@ Signed-off-by: Tamizh Chelvam dma_unmap_single(ab->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu), DMA_FROM_DEVICE); -@@ -4574,17 +4572,14 @@ ath11k_dp_process_rx_err_buf(struct ath1 +@@ -4667,17 +4665,14 @@ ath11k_dp_process_rx_err_buf(struct ath1 u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; spin_lock_bh(&rx_ring->idr_lock); @@ -70,7 +70,7 @@ Signed-off-by: Tamizh Chelvam rxcb = ATH11K_SKB_RXCB(msdu); dma_unmap_single(ar->ab->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu), -@@ -5005,18 +5000,16 @@ int ath11k_dp_rx_process_wbm_err(struct +@@ -5083,18 +5078,16 @@ int ath11k_dp_rx_process_wbm_err(struct rx_ring = &ar->dp.rx_refill_buf_ring; spin_lock_bh(&rx_ring->idr_lock); @@ -92,7 +92,7 @@ Signed-off-by: Tamizh Chelvam dma_unmap_single(ab->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu), DMA_FROM_DEVICE); -@@ -5131,16 +5124,14 @@ int ath11k_dp_process_rxdma_err(struct a +@@ -5209,16 +5202,14 @@ int ath11k_dp_process_rxdma_err(struct a msdu_cookies[i]); spin_lock_bh(&rx_ring->idr_lock); @@ -111,7 +111,7 @@ Signed-off-by: Tamizh Chelvam rxcb = ATH11K_SKB_RXCB(skb); dma_unmap_single(ab->dev, rxcb->paddr, -@@ -6399,16 +6390,14 @@ ath11k_dp_rx_full_mon_mpdu_pop(struct at +@@ -6429,16 +6420,14 @@ ath11k_dp_rx_full_mon_mpdu_pop(struct at msdu_list.sw_cookie[i]); spin_lock_bh(&rx_ring->idr_lock); diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch b/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch index c5134fca93a867..974de141070d63 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-336-0002-ath11k-Use-idr_replace.patch @@ -114,7 +114,7 @@ Signed-off-by: Tamizh Chelvam return 0; } -@@ -3346,11 +3365,14 @@ int ath11k_dp_process_rx(struct ath11k_b +@@ -3347,11 +3366,14 @@ int ath11k_dp_process_rx(struct ath11k_b struct ath11k *ar; struct hal_reo_dest_ring *desc; enum hal_reo_dest_ring_push_reason push_reason; @@ -130,7 +130,7 @@ Signed-off-by: Tamizh Chelvam srng = &ab->hal.srng_list[dp->reo_dst_ring[ring_id].ring_id]; -@@ -3385,8 +3407,15 @@ try_again: +@@ -3384,8 +3406,15 @@ try_again: ar = ab->pdevs[mac_id].ar; rx_ring = &ar->dp.rx_refill_buf_ring; @@ -147,7 +147,7 @@ Signed-off-by: Tamizh Chelvam spin_unlock_bh(&rx_ring->idr_lock); if (unlikely(!msdu)) { ath11k_warn(ab, "frame rx with invalid buf_id %d\n", -@@ -3464,9 +3493,12 @@ try_again: +@@ -3463,9 +3492,12 @@ try_again: rx_ring = &ar->dp.rx_refill_buf_ring; ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i], @@ -161,7 +161,7 @@ Signed-off-by: Tamizh Chelvam return total_msdu_reaped; } -@@ -4831,7 +4864,7 @@ exit: +@@ -4827,7 +4859,7 @@ exit: rx_ring = &ar->dp.rx_refill_buf_ring; ath11k_dp_rxbufs_replenish(ab, i, rx_ring, n_bufs_reaped[i], @@ -170,7 +170,7 @@ Signed-off-by: Tamizh Chelvam } return tot_n_bufs_reaped; -@@ -5047,14 +5080,17 @@ int ath11k_dp_rx_process_wbm_err(struct +@@ -5043,14 +5075,17 @@ int ath11k_dp_rx_process_wbm_err(struct struct sk_buff *msdu; struct sk_buff_head msdu_list[MAX_RADIOS]; struct ath11k_skb_rxcb *rxcb; @@ -189,7 +189,7 @@ Signed-off-by: Tamizh Chelvam srng = &ab->hal.srng_list[dp->rx_rel_ring.ring_id]; -@@ -5077,9 +5112,15 @@ int ath11k_dp_rx_process_wbm_err(struct +@@ -5076,9 +5111,15 @@ int ath11k_dp_rx_process_wbm_err(struct ar = ab->pdevs[mac_id].ar; rx_ring = &ar->dp.rx_refill_buf_ring; @@ -206,7 +206,7 @@ Signed-off-by: Tamizh Chelvam spin_unlock_bh(&rx_ring->idr_lock); if (!msdu) { ath11k_warn(ab, "frame rx with invalid buf_id %d pdev %d\n", -@@ -5124,7 +5165,7 @@ int ath11k_dp_rx_process_wbm_err(struct +@@ -5123,7 +5164,7 @@ int ath11k_dp_rx_process_wbm_err(struct rx_ring = &ar->dp.rx_refill_buf_ring; ath11k_dp_rxbufs_replenish(ab, i, rx_ring, num_buffs_reaped[i], @@ -215,7 +215,7 @@ Signed-off-by: Tamizh Chelvam } rcu_read_lock(); -@@ -5151,6 +5187,8 @@ int ath11k_dp_rx_process_wbm_err(struct +@@ -5145,6 +5186,8 @@ int ath11k_dp_rx_process_wbm_err(struct } rcu_read_unlock(); done: @@ -224,7 +224,7 @@ Signed-off-by: Tamizh Chelvam return total_num_buffs_reaped; } -@@ -5238,7 +5276,7 @@ int ath11k_dp_process_rxdma_err(struct a +@@ -5230,7 +5273,7 @@ int ath11k_dp_process_rxdma_err(struct a if (num_buf_freed) ath11k_dp_rxbufs_replenish(ab, mac_id, rx_ring, num_buf_freed, @@ -233,7 +233,7 @@ Signed-off-by: Tamizh Chelvam return budget - quota; } -@@ -6184,12 +6222,12 @@ static void ath11k_dp_rx_mon_dest_proces +@@ -6182,12 +6225,12 @@ static void ath11k_dp_rx_mon_dest_proces ath11k_dp_rxbufs_replenish(ar->ab, dp->mac_id, &dp->rxdma_mon_buf_ring, rx_bufs_used, @@ -248,7 +248,7 @@ Signed-off-by: Tamizh Chelvam } } -@@ -6701,7 +6739,7 @@ next_entry: +@@ -6697,7 +6740,7 @@ next_entry: ath11k_dp_rxbufs_replenish(ar->ab, dp->mac_id, &dp->rxdma_mon_buf_ring, rx_bufs_used, diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch b/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch index b58b13eebe1d40..988717c1dbc257 100644 --- a/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch +++ b/package/kernel/mac80211/patches/nss/ath11k/999-374-ath11k-Check-skb_headroom-before-using-skb_push.patch @@ -217,7 +217,7 @@ Signed-off-by: Tamizh Chelvam Raja memcpy(skb_push(msdu, hdr_len), hdr, hdr_len); } -@@ -2890,7 +2954,7 @@ static void ath11k_dp_rx_h_mpdu(struct a +@@ -2889,7 +2953,7 @@ static void ath11k_dp_rx_h_mpdu(struct a struct ieee80211_rx_status *rx_status, bool *fast_rx) { @@ -226,7 +226,7 @@ Signed-off-by: Tamizh Chelvam Raja enum hal_encrypt_type enctype; bool is_decrypted = false; struct ath11k_skb_rxcb *rxcb; -@@ -3123,10 +3187,16 @@ static void ath11k_dp_rx_deliver_msdu(st +@@ -3122,10 +3186,16 @@ static void ath11k_dp_rx_deliver_msdu(st u8 decap = DP_RX_DECAP_TYPE_RAW; bool is_mcbc = rxcb->is_mcbc; bool is_eapol = rxcb->is_eapol; @@ -243,7 +243,7 @@ Signed-off-by: Tamizh Chelvam Raja he = skb_push(msdu, sizeof(known)); memcpy(he, &known, sizeof(known)); status->flag |= RX_FLAG_RADIOTAP_HE; -@@ -3182,6 +3252,7 @@ static void ath11k_dp_rx_deliver_msdu(st +@@ -3181,6 +3251,7 @@ static void ath11k_dp_rx_deliver_msdu(st !(is_mcbc && rx_status->flag & RX_FLAG_DECRYPTED)) rx_status->flag |= RX_FLAG_8023; diff --git a/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch b/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch index d89cfbe51cb8ab..7a9b58411d0e1c 100644 --- a/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch +++ b/package/kernel/mac80211/patches/nss/subsys/007-fix_compilation_issue.patch @@ -50,7 +50,7 @@ } --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -4780,7 +4780,7 @@ void ieee80211_color_collision_detection +@@ -4779,7 +4779,7 @@ void ieee80211_color_collision_detection struct ieee80211_sub_if_data *sdata = link->sdata; sdata_lock(sdata); @@ -72,7 +72,7 @@ sdata->debugfs.subdir_stations = debugfs_create_dir("stations", --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -1410,18 +1410,6 @@ static void __sta_info_destroy_part2(str +@@ -1414,18 +1414,6 @@ static void __sta_info_destroy_part2(str WARN_ON_ONCE(ret); } @@ -93,7 +93,7 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -19472,7 +19472,7 @@ void cfg80211_ch_switch_started_notify(s +@@ -19484,7 +19484,7 @@ void cfg80211_ch_switch_started_notify(s } EXPORT_SYMBOL(cfg80211_ch_switch_started_notify); @@ -102,7 +102,7 @@ enum nl80211_commands cmd, u8 count, u64 color_bitmap) { -@@ -19486,7 +19486,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19498,7 +19498,7 @@ int cfg80211_bss_color_notify(struct net trace_cfg80211_bss_color_notify(dev, cmd, count, color_bitmap); @@ -111,7 +111,7 @@ if (!msg) return -ENOMEM; -@@ -19509,7 +19509,7 @@ int cfg80211_bss_color_notify(struct net +@@ -19521,7 +19521,7 @@ int cfg80211_bss_color_notify(struct net genlmsg_end(msg, hdr); return genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), diff --git a/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch b/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch index a5da9e91eae835..86b2f2169bb79f 100644 --- a/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch +++ b/package/kernel/mac80211/patches/nss/subsys/146-mac80211-enable-TKIP-when-using-encapsulation-offloading.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4688,8 +4688,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4689,8 +4689,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 if (!key) key = rcu_dereference(sdata->default_unicast_key); diff --git a/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch index fc8fec0660f352..ecdf4d15c0c896 100644 --- a/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/199-001-mac80211-add-nss-support.patch @@ -53,7 +53,7 @@ Signed-off-by: Sriram R }; /** -@@ -1408,7 +1424,7 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1410,7 +1426,7 @@ ieee80211_tx_info_clear_status(struct ie * @RX_FLAG_AMPDU_EOF_BIT_KNOWN: The EOF value is known * @RX_FLAG_RADIOTAP_HE: HE radiotap data is present * (&struct ieee80211_radiotap_he, mac80211 will fill in @@ -62,7 +62,7 @@ Signed-off-by: Sriram R * - DATA3_DATA_MCS * - DATA3_DATA_DCM * - DATA3_CODING -@@ -1416,7 +1432,7 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1418,7 +1434,7 @@ ieee80211_tx_info_clear_status(struct ie * - DATA5_DATA_BW_RU_ALLOC * - DATA6_NSTS * - DATA3_STBC @@ -71,7 +71,7 @@ Signed-off-by: Sriram R * from the RX info data, so leave those zeroed when building this data) * @RX_FLAG_RADIOTAP_HE_MU: HE MU radiotap data is present * (&struct ieee80211_radiotap_he_mu) -@@ -1989,6 +2005,16 @@ static inline bool lockdep_vif_mutex_hel +@@ -1991,6 +2007,16 @@ static inline bool lockdep_vif_mutex_hel lockdep_vif_mutex_held(vif)) /** @@ -88,7 +88,7 @@ Signed-off-by: Sriram R * enum ieee80211_key_flags - key flags * * These flags are used for communication about keys between the driver -@@ -2680,6 +2706,8 @@ struct ieee80211_txq { +@@ -2682,6 +2708,8 @@ struct ieee80211_txq { * @IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX: Hardware/driver handles transmitting * multicast frames on all links, mac80211 should not do that. * @@ -97,7 +97,7 @@ Signed-off-by: Sriram R * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2737,6 +2765,7 @@ enum ieee80211_hw_flags { +@@ -2739,6 +2767,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_CONC_MON_RX_DECAP, IEEE80211_HW_DETECTS_COLOR_COLLISION, IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, @@ -105,7 +105,7 @@ Signed-off-by: Sriram R /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS -@@ -3749,6 +3778,10 @@ struct ieee80211_prep_tx_info { +@@ -3751,6 +3780,10 @@ struct ieee80211_prep_tx_info { * non-MLO connections. * The callback can sleep. * @@ -116,7 +116,7 @@ Signed-off-by: Sriram R * @prepare_multicast: Prepare for multicast filter configuration. * This callback is optional, and its return value is passed * to configure_filter(). This callback must be atomic. -@@ -4300,7 +4333,9 @@ struct ieee80211_ops { +@@ -4302,7 +4335,9 @@ struct ieee80211_ops { struct ieee80211_vif *vif, struct ieee80211_bss_conf *info, u64 changed); @@ -127,7 +127,7 @@ Signed-off-by: Sriram R int (*start_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *link_conf); void (*stop_ap)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, -@@ -4605,7 +4640,7 @@ struct ieee80211_ops { +@@ -4607,7 +4642,7 @@ struct ieee80211_ops { int (*reset_tid_config)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, u8 tids); @@ -225,7 +225,7 @@ Signed-off-by: Sriram R return -EINVAL; --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -2370,6 +2370,9 @@ sta_get_last_rx_stats(struct sta_info *s +@@ -2390,6 +2390,9 @@ sta_get_last_rx_stats(struct sta_info *s struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; int cpu; @@ -272,7 +272,7 @@ Signed-off-by: Sriram R info_id = ieee80211_store_ack_skb(local, skb, &info_flags, cookie); -@@ -4641,13 +4655,16 @@ static void ieee80211_8023_xmit(struct i +@@ -4642,13 +4656,16 @@ static void ieee80211_8023_xmit(struct i } if (unlikely(skb->sk && @@ -306,7 +306,7 @@ Signed-off-by: Sriram R gfp); --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2679,7 +2679,7 @@ static int ieee80211_change_bss(struct w +@@ -2678,7 +2678,7 @@ static int ieee80211_change_bss(struct w struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_link_data *link; struct ieee80211_supported_band *sband; @@ -315,7 +315,7 @@ Signed-off-by: Sriram R link = ieee80211_link_or_deflink(sdata, params->link_id, true); if (IS_ERR(link)) -@@ -2729,6 +2729,8 @@ static int ieee80211_change_bss(struct w +@@ -2728,6 +2728,8 @@ static int ieee80211_change_bss(struct w sdata->flags |= IEEE80211_SDATA_DONT_BRIDGE_PACKETS; else sdata->flags &= ~IEEE80211_SDATA_DONT_BRIDGE_PACKETS; @@ -324,7 +324,7 @@ Signed-off-by: Sriram R ieee80211_check_fast_rx_iface(sdata); } -@@ -2757,6 +2759,8 @@ static int ieee80211_change_bss(struct w +@@ -2756,6 +2758,8 @@ static int ieee80211_change_bss(struct w ieee80211_link_info_change_notify(sdata, link, changed); diff --git a/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch b/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch index fffe171334c9a4..01740e29803580 100644 --- a/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch +++ b/package/kernel/mac80211/patches/nss/subsys/199-mac80211-fix-xmit-callback-when-hwencap-enable-in-st.patch @@ -18,7 +18,7 @@ Signed-off-by: P Praneesh --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -6215,7 +6215,13 @@ start_xmit: +@@ -6216,7 +6216,13 @@ start_xmit: mutex_lock(&local->mtx); local_bh_disable(); diff --git a/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch b/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch index bd9c1c024b1e5d..d4410bd712f669 100644 --- a/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch +++ b/package/kernel/mac80211/patches/nss/subsys/203-mac80211-ath11k-fw-dynamic-muedca.patch @@ -49,7 +49,7 @@ Signed-off-by: Muna Sinada #endif /* __NET_CFG80211_H */ --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -7361,6 +7361,20 @@ u32 ieee80211_calc_rx_airtime(struct iee +@@ -7363,6 +7363,20 @@ u32 ieee80211_calc_rx_airtime(struct iee int len); /** @@ -158,7 +158,7 @@ Signed-off-by: Muna Sinada #undef TRACE_INCLUDE_PATH --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -20199,6 +20199,42 @@ nla_put_failure: +@@ -20211,6 +20211,42 @@ nla_put_failure: } EXPORT_SYMBOL(cfg80211_update_owe_info_event); diff --git a/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch b/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch index 15d796071fa077..5ae1ba64bba9d5 100644 --- a/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch +++ b/package/kernel/mac80211/patches/nss/subsys/207-ath11k-Add-support-for-dynamic-vlan.patch @@ -29,7 +29,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* misc utils */ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, -@@ -4270,6 +4273,8 @@ void __ieee80211_subif_start_xmit(struct +@@ -4271,6 +4274,8 @@ void __ieee80211_subif_start_xmit(struct struct sta_info *sta; struct sk_buff *next; int len = skb->len; @@ -38,7 +38,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { kfree_skb(skb); -@@ -4291,6 +4296,19 @@ void __ieee80211_subif_start_xmit(struct +@@ -4292,6 +4297,19 @@ void __ieee80211_subif_start_xmit(struct if (IS_ERR(sta)) sta = NULL; diff --git a/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch b/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch index a4895803b38ba0..38d737dc37d96a 100644 --- a/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/207-mac80211-add-nss-redirect-support.patch @@ -209,7 +209,7 @@ Signed-off-by: Sowmiya Sree Elavalagan --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4503,6 +4503,35 @@ static void ieee80211_mlo_multicast_tx(s +@@ -4504,6 +4504,35 @@ static void ieee80211_mlo_multicast_tx(s kfree_skb(skb); } @@ -245,7 +245,7 @@ Signed-off-by: Sowmiya Sree Elavalagan /** * ieee80211_subif_start_xmit - netif start_xmit function for 802.3 vifs * @skb: packet to be sent -@@ -4516,6 +4545,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s +@@ -4517,6 +4546,10 @@ netdev_tx_t ieee80211_subif_start_xmit(s struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); const struct ethhdr *eth = (void *)skb->data; @@ -256,7 +256,7 @@ Signed-off-by: Sowmiya Sree Elavalagan if (likely(!is_multicast_ether_addr(eth->h_dest))) goto normal; -@@ -4702,6 +4735,9 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4703,6 +4736,9 @@ netdev_tx_t ieee80211_subif_start_xmit_8 struct ieee80211_key *key; struct sta_info *sta; diff --git a/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch b/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch index 55e2fff1560fb8..3d543d714122dd 100644 --- a/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch +++ b/package/kernel/mac80211/patches/nss/subsys/235-001-mac80211-add-AP_VLAN-iftype-support-on-NSS-offload-case.patch @@ -21,7 +21,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -5098,6 +5098,17 @@ void ieee80211_sta_pspoll(struct ieee802 +@@ -5100,6 +5100,17 @@ void ieee80211_sta_pspoll(struct ieee802 */ void ieee80211_sta_uapsd_trigger(struct ieee80211_sta *sta, u8 tid); @@ -137,7 +137,7 @@ Signed-off-by: Sathishkumar Muruganandam { --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4297,8 +4297,13 @@ void __ieee80211_subif_start_xmit(struct +@@ -4298,8 +4298,13 @@ void __ieee80211_subif_start_xmit(struct sta = NULL; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { @@ -153,7 +153,7 @@ Signed-off-by: Sathishkumar Muruganandam if (ap_sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED && !is_multicast_ether_addr(skb->data)) { if (sta) -@@ -4688,7 +4693,8 @@ static void ieee80211_8023_xmit(struct i +@@ -4689,7 +4694,8 @@ static void ieee80211_8023_xmit(struct i info->hw_queue = sdata->vif.hw_queue[queue]; diff --git a/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch b/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch index 803ee900bfdcc1..542ab4e6a93831 100644 --- a/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch +++ b/package/kernel/mac80211/patches/nss/subsys/236-001-mac80211-add-dynamic-VLAN-support-on-NSS-offload.patch @@ -24,7 +24,7 @@ Signed-off-by: Sathishkumar Muruganandam --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2086,6 +2086,8 @@ enum ieee80211_key_flags { +@@ -2088,6 +2088,8 @@ enum ieee80211_key_flags { * @tx_pn: PN used for TX keys, may be used by the driver as well if it * needs to do software PN assignment by itself (e.g. due to TSO) * @flags: key flags, see &enum ieee80211_key_flags. @@ -33,7 +33,7 @@ Signed-off-by: Sathishkumar Muruganandam * @keyidx: the key index (0-3) * @keylen: key material length * @key: key material. For ALG_TKIP the key is encoded as a 256-bit (32 byte) -@@ -2105,6 +2107,7 @@ struct ieee80211_key_conf { +@@ -2107,6 +2109,7 @@ struct ieee80211_key_conf { u8 hw_key_idx; s8 keyidx; u16 flags; @@ -102,7 +102,7 @@ Signed-off-by: Sathishkumar Muruganandam key->conf.cipher = cipher; --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4649,16 +4649,25 @@ static void ieee80211_8023_xmit(struct i +@@ -4650,16 +4650,25 @@ static void ieee80211_8023_xmit(struct i struct ieee80211_key *key, struct sk_buff *skb) { struct ieee80211_tx_info *info; diff --git a/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch b/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch index 46b716419a7cd8..0e92c0f1332b7d 100644 --- a/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch +++ b/package/kernel/mac80211/patches/nss/subsys/245-compilation_fix.patch @@ -18,17 +18,6 @@ Signed-off-by: Gautham Kumar Senthilkumaran net/mac80211/tx.c | 54 ++++++++++++++++++++++---------- 7 files changed, 40 insertions(+), 23 deletions(-) ---- a/include/linux/backport-refcount.h -+++ b/include/linux/backport-refcount.h -@@ -247,7 +247,7 @@ static inline __must_check bool refcount - - static inline void __refcount_inc(refcount_t *r, int *oldp) - { -- __refcount_add(1, r, oldp); -+ refcount_add(1, r); - } - - /** --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -207,6 +207,7 @@ enum ieee80211_rx_flags { @@ -39,45 +28,9 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct list_head *list; struct sk_buff *skb; struct ieee80211_local *local; -@@ -292,6 +293,7 @@ struct unsol_bcast_probe_resp_data { - u8 data[]; - }; - -+ - struct ps_data { - /* yes, this looks ugly, but guarantees that we can later use - * bitmap_empty :) ---- a/net/mac80211/iface.c -+++ b/net/mac80211/iface.c -@@ -1705,7 +1705,6 @@ static void ieee80211_iface_work(struct - - /* first process frames */ - while ((skb = skb_dequeue(&sdata->skb_queue))) { -- kcov_remote_start_common(skb_get_kcov_handle(skb)); - - if (skb->protocol == cpu_to_be16(ETH_P_TDLS)) - ieee80211_process_tdls_channel_switch(sdata, skb); -@@ -1713,17 +1712,14 @@ static void ieee80211_iface_work(struct - ieee80211_iface_process_skb(local, sdata, skb); - - kfree_skb(skb); -- kcov_remote_stop(); - } - - /* process status queue */ - while ((skb = skb_dequeue(&sdata->status_queue))) { -- kcov_remote_start_common(skb_get_kcov_handle(skb)); - - ieee80211_iface_process_status(sdata, skb); - kfree_skb(skb); - -- kcov_remote_stop(); - } - - /* then other type-dependent work */ --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4678,19 +4678,21 @@ static void ieee80211_8023_xmit(struct i +@@ -4679,19 +4679,21 @@ static void ieee80211_8023_xmit(struct i ieee80211_aggr_check(sdata, sta, skb); @@ -111,7 +64,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran } skb = ieee80211_tx_skb_fixup(skb, ieee80211_sdata_netdev_features(sdata)); -@@ -4747,7 +4749,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4748,7 +4750,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ethhdr *ehdr = (struct ethhdr *)skb->data; @@ -120,7 +73,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct sta_info *sta; #ifdef CPTCFG_MAC80211_NSS_SUPPORT -@@ -4765,9 +4767,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4766,9 +4768,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto out; } @@ -137,7 +90,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); -@@ -4778,6 +4784,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4779,6 +4785,7 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto skip_offload; sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); @@ -145,47 +98,18 @@ Signed-off-by: Gautham Kumar Senthilkumaran ieee80211_8023_xmit(sdata, dev, sta, key, skb); goto out; -@@ -6284,13 +6291,7 @@ start_xmit: +@@ -6285,13 +6292,7 @@ start_xmit: mutex_lock(&local->mtx); - if (pubsta) { - sta = container_of(pubsta, struct sta_info, sta); -- if (sta && napi) { -+ if (sta) { - if (!(status->flag & RX_FLAG_ONLY_MONITOR)) - atomic_inc(&sta->rx_drv_pkts); - } -@@ -5442,8 +5442,6 @@ void ieee80211_rx_list(struct ieee80211_ - - status->rx_flags = 0; - -- kcov_remote_start_common(skb_get_kcov_handle(skb)); + local_bh_disable(); - - /* - * Frames with failed FCS/PLCP checksum are not returned, - * all other frames are returned without radiotap header -@@ -5463,7 +5461,6 @@ void ieee80211_rx_list(struct ieee80211_ - __ieee80211_rx_handle_packet(hw, pubsta, skb, list); - } - -- kcov_remote_stop(); - return; - drop: - kfree_skb(skb); ---- a/backport-include/linux/skbuff.h -+++ b/backport-include/linux/skbuff.h -@@ -24,14 +24,6 @@ static inline void *backport___skb_push( - } - #define __skb_push LINUX_BACKPORT(__skb_push) - --static inline void *__skb_put_zero(struct sk_buff *skb, unsigned int len) --{ -- void *tmp = __skb_put(skb, len); -- -- memset(tmp, 0, len); -- return tmp; --} +- /* added hardware encap check for ethernet mode */ +- if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) +- ieee80211_subif_start_xmit_8023(skb, skb->dev); +- else +- __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); - - static inline void *skb_put_zero(struct sk_buff *skb, unsigned int len) - { - void *tmp = skb_put(skb, len); ++ __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); + local_bh_enable(); + + mutex_unlock(&local->mtx); diff --git a/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch b/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch index 55ad36baf69aa4..e1b46836c6b4c5 100644 --- a/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch +++ b/package/kernel/mac80211/patches/nss/subsys/300-ath11k-nss-mesh-offload-support.patch @@ -78,7 +78,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran bool eht_mu_beamformer; bool nss_ap_isolate; }; -@@ -1273,6 +1287,8 @@ struct ieee80211_rate_status { +@@ -1275,6 +1289,8 @@ struct ieee80211_rate_status { * @ack_hwtstamp: Hardware timestamp of the received ack in nanoseconds * Only needed for Timing measurement and Fine timing measurement action * frames. Only reported by devices that have timestamping enabled. @@ -87,7 +87,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran */ struct ieee80211_tx_status { struct ieee80211_sta *sta; -@@ -1283,6 +1299,8 @@ struct ieee80211_tx_status { +@@ -1285,6 +1301,8 @@ struct ieee80211_tx_status { u8 n_rates; struct list_head *free_list; @@ -96,7 +96,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran }; /** -@@ -1775,6 +1793,7 @@ struct ieee80211_channel_switch { +@@ -1777,6 +1795,7 @@ struct ieee80211_channel_switch { * this is not pure P2P vif. * @IEEE80211_VIF_DISABLE_SMPS_OVERRIDE: disable user configuration of * SMPS mode via debugfs. @@ -104,7 +104,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran */ enum ieee80211_vif_flags { IEEE80211_VIF_BEACON_FILTER = BIT(0), -@@ -1782,6 +1801,7 @@ enum ieee80211_vif_flags { +@@ -1784,6 +1803,7 @@ enum ieee80211_vif_flags { IEEE80211_VIF_SUPPORTS_UAPSD = BIT(2), IEEE80211_VIF_GET_NOA_UPDATE = BIT(3), IEEE80211_VIF_DISABLE_SMPS_OVERRIDE = BIT(4), @@ -112,7 +112,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran }; -@@ -2769,6 +2789,7 @@ enum ieee80211_hw_flags { +@@ -2771,6 +2791,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_DETECTS_COLOR_COLLISION, IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, @@ -120,7 +120,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS -@@ -4269,6 +4290,8 @@ struct ieee80211_prep_tx_info { +@@ -4271,6 +4292,8 @@ struct ieee80211_prep_tx_info { * @set_sar_specs: Update the SAR (TX power) settings. * @sta_set_decap_offload: Called to notify the driver when a station is allowed * to use rx decapsulation offload @@ -129,7 +129,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran * @add_twt_setup: Update hw with TWT agreement parameters received from the peer. * This callback allows the hw to check if requested parameters * are supported and if there is enough room for a new agreement. -@@ -4652,6 +4675,12 @@ struct ieee80211_ops { +@@ -4654,6 +4677,12 @@ struct ieee80211_ops { void (*sta_set_decap_offload)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, bool enabled); @@ -142,7 +142,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran void (*add_twt_setup)(struct ieee80211_hw *hw, struct ieee80211_sta *sta, struct ieee80211_twt_setup *twt); -@@ -7510,4 +7539,100 @@ int ieee80211_set_active_links(struct ie +@@ -7512,4 +7541,100 @@ int ieee80211_set_active_links(struct ie void ieee80211_set_active_links_async(struct ieee80211_vif *vif, u16 active_links); @@ -245,7 +245,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran #endif /* MAC80211_H */ --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2523,6 +2523,7 @@ static int ieee80211_update_mesh_config( +@@ -2522,6 +2522,7 @@ static int ieee80211_update_mesh_config( struct mesh_config *conf; struct ieee80211_sub_if_data *sdata; struct ieee80211_if_mesh *ifmsh; @@ -253,7 +253,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran sdata = IEEE80211_DEV_TO_SUB_IF(dev); ifmsh = &sdata->u.mesh; -@@ -2539,8 +2540,11 @@ static int ieee80211_update_mesh_config( +@@ -2538,8 +2539,11 @@ static int ieee80211_update_mesh_config( conf->dot11MeshMaxPeerLinks = nconf->dot11MeshMaxPeerLinks; if (_chg_mesh_attr(NL80211_MESHCONF_MAX_RETRIES, mask)) conf->dot11MeshMaxRetries = nconf->dot11MeshMaxRetries; @@ -266,7 +266,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_ELEMENT_TTL, mask)) conf->element_ttl = nconf->element_ttl; if (_chg_mesh_attr(NL80211_MESHCONF_AUTO_OPEN_PLINKS, mask)) { -@@ -2554,8 +2558,12 @@ static int ieee80211_update_mesh_config( +@@ -2553,8 +2557,12 @@ static int ieee80211_update_mesh_config( if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_MAX_PREQ_RETRIES, mask)) conf->dot11MeshHWMPmaxPREQretries = nconf->dot11MeshHWMPmaxPREQretries; @@ -280,7 +280,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_MIN_DISCOVERY_TIMEOUT, mask)) conf->min_discovery_timeout = nconf->min_discovery_timeout; if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_ACTIVE_PATH_TIMEOUT, mask)) -@@ -2590,8 +2598,12 @@ static int ieee80211_update_mesh_config( +@@ -2589,8 +2597,12 @@ static int ieee80211_update_mesh_config( if (_chg_mesh_attr(NL80211_MESHCONF_HWMP_RANN_INTERVAL, mask)) conf->dot11MeshHWMPRannInterval = nconf->dot11MeshHWMPRannInterval; @@ -294,7 +294,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran if (_chg_mesh_attr(NL80211_MESHCONF_RSSI_THRESHOLD, mask)) { /* our RSSI threshold implementation is supported only for * devices that report signal in dBm. -@@ -2633,6 +2645,7 @@ static int ieee80211_update_mesh_config( +@@ -2632,6 +2644,7 @@ static int ieee80211_update_mesh_config( conf->dot11MeshConnectedToAuthServer = nconf->dot11MeshConnectedToAuthServer; ieee80211_mbss_info_change_notify(sdata, BSS_CHANGED_BEACON); @@ -379,7 +379,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran #endif /* __MAC80211_DRIVER_OPS */ --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h -@@ -315,6 +315,10 @@ void mesh_rx_path_sel_frame(struct ieee8 +@@ -320,6 +320,10 @@ void mesh_rx_path_sel_frame(struct ieee8 struct ieee80211_mgmt *mgmt, size_t len); struct mesh_path * mesh_path_add(struct ieee80211_sub_if_data *sdata, const u8 *dst); @@ -390,7 +390,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran int mesh_path_add_gate(struct mesh_path *mpath); int mesh_path_send_to_gates(struct mesh_path *mpath); -@@ -356,6 +360,7 @@ void mesh_path_discard_frame(struct ieee +@@ -361,6 +365,7 @@ void mesh_path_discard_frame(struct ieee void mesh_path_tx_root_frame(struct ieee80211_sub_if_data *sdata); bool mesh_action_is_path_sel(struct ieee80211_mgmt *mgmt); @@ -1221,7 +1221,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran info->ack_frame_id = info_id; info->band = band; -@@ -4274,6 +4284,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4275,6 +4285,7 @@ void __ieee80211_subif_start_xmit(struct struct sk_buff *next; int len = skb->len; struct ieee80211_key *key = NULL; @@ -1229,7 +1229,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran struct ieee80211_sub_if_data *ap_sdata; if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { -@@ -4350,9 +4361,15 @@ void __ieee80211_subif_start_xmit(struct +@@ -4351,9 +4362,15 @@ void __ieee80211_subif_start_xmit(struct goto out; } diff --git a/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch b/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch index f78d7ce6e09304..0704e8fcf7da86 100644 --- a/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch +++ b/package/kernel/mac80211/patches/nss/subsys/335-0003-ath11k-skip-HAL_TCL_DATA_CMD_INFO2_TID_OVERWRITE-con.patch @@ -16,7 +16,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2731,6 +2731,8 @@ struct ieee80211_txq { +@@ -2733,6 +2733,8 @@ struct ieee80211_txq { * * @IEEE80211_HW_SUPPORTS_NSS_OFFLOAD: Hardware/driver supports NSS offload * @@ -25,7 +25,7 @@ Signed-off-by: Gautham Kumar Senthilkumaran * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2790,6 +2792,7 @@ enum ieee80211_hw_flags { +@@ -2792,6 +2794,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, diff --git a/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch b/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch index 63373b7751f9eb..314bcbe549af97 100644 --- a/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch +++ b/package/kernel/mac80211/patches/nss/subsys/335-0005-mac80211-simple-tx-for-AP-mode.patch @@ -14,7 +14,7 @@ Signed-off-by: Aloka Dixit --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4761,6 +4761,67 @@ out_free: +@@ -4762,6 +4762,67 @@ out_free: kfree_skb(skb); } @@ -82,7 +82,7 @@ Signed-off-by: Aloka Dixit netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, struct net_device *dev) { -@@ -4800,6 +4861,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4801,6 +4862,11 @@ netdev_tx_t ieee80211_subif_start_xmit_8 if (key && (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE))) goto skip_offload; diff --git a/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch b/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch index 0cb2a1e95244e3..c8d719006d170f 100644 --- a/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch +++ b/package/kernel/mac80211/patches/nss/subsys/342-mac80211-fix-unconditional-sta-usage.patch @@ -33,7 +33,7 @@ Signed-off-by: Tamizh Chelvam --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -4695,7 +4695,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4696,7 +4696,7 @@ static void ieee80211_8023_xmit(struct i ieee80211_aggr_check(sdata, sta, skb); @@ -42,7 +42,7 @@ Signed-off-by: Tamizh Chelvam tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK; tid_tx = rcu_dereference(sta->ampdu_mlme.tid_tx[tid]); if (tid_tx) { -@@ -4746,7 +4746,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4747,7 +4747,7 @@ static void ieee80211_8023_xmit(struct i &info->flags, NULL); dev_sw_netstats_tx_add(dev, skbs, len); diff --git a/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch b/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch index 2cb2ebe6f58f76..55380f59d3826c 100644 --- a/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch +++ b/package/kernel/mac80211/patches/nss/subsys/640-006-01-mac80211-Remove-unused-RX_FLAGS-from-mac80211_rx_fla.patch @@ -14,7 +14,7 @@ Signed-off-by: P Praneesh --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -1405,8 +1405,6 @@ ieee80211_tx_info_clear_status(struct ie +@@ -1407,8 +1407,6 @@ ieee80211_tx_info_clear_status(struct ie * @RX_FLAG_AMPDU_IS_LAST: this subframe is the last subframe of the A-MPDU * @RX_FLAG_AMPDU_DELIM_CRC_ERROR: A delimiter CRC error has been detected * on this subframe @@ -23,7 +23,7 @@ Signed-off-by: P Praneesh * @RX_FLAG_MIC_STRIPPED: The mic was stripped of this packet. Decryption was * done by the hardware * @RX_FLAG_ONLY_MONITOR: Report frame only to monitor interfaces without -@@ -1478,22 +1476,21 @@ enum mac80211_rx_flags { +@@ -1480,22 +1478,21 @@ enum mac80211_rx_flags { RX_FLAG_AMPDU_LAST_KNOWN = BIT(12), RX_FLAG_AMPDU_IS_LAST = BIT(13), RX_FLAG_AMPDU_DELIM_CRC_ERROR = BIT(14), diff --git a/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch b/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch index a947728fc661f1..13977ab665862e 100644 --- a/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch +++ b/package/kernel/mac80211/patches/nss/subsys/657-mac80211-Avoid-encapsulation-of-EAPOL-frames-if-OFFL.patch @@ -44,7 +44,7 @@ Signed-off-by: Aaradhana Sahu /* misc utils */ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, -@@ -4319,7 +4320,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4320,7 +4321,7 @@ void __ieee80211_subif_start_xmit(struct !is_multicast_ether_addr(skb->data)) { if (sta) key = rcu_dereference(sta->ptk[sta->ptk_idx]); @@ -53,7 +53,7 @@ Signed-off-by: Aaradhana Sahu rcu_read_unlock(); return; } -@@ -4365,7 +4366,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4366,7 +4367,7 @@ void __ieee80211_subif_start_xmit(struct if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { if (sta) key = rcu_dereference(sta->ptk[sta->ptk_idx]); @@ -62,7 +62,7 @@ Signed-off-by: Aaradhana Sahu } else { dev_sw_netstats_tx_add(dev, 1, skb->len); ieee80211_xmit(sdata, sta, skb); -@@ -4663,7 +4664,8 @@ static bool ieee80211_tx_8023(struct iee +@@ -4664,7 +4665,8 @@ static bool ieee80211_tx_8023(struct iee static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, @@ -72,7 +72,7 @@ Signed-off-by: Aaradhana Sahu { struct ieee80211_tx_info *info; struct ethhdr *ehdr = (struct ethhdr *)skb->data; -@@ -4719,6 +4721,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4720,6 +4722,7 @@ static void ieee80211_8023_xmit(struct i info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); @@ -80,7 +80,7 @@ Signed-off-by: Aaradhana Sahu info->hw_queue = sdata->vif.hw_queue[queue]; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && -@@ -4739,11 +4742,12 @@ static void ieee80211_8023_xmit(struct i +@@ -4740,11 +4743,12 @@ static void ieee80211_8023_xmit(struct i memcpy(IEEE80211_SKB_CB(seg), info, sizeof(*info)); } @@ -96,7 +96,7 @@ Signed-off-by: Aaradhana Sahu dev_sw_netstats_tx_add(dev, skbs, len); if (!ieee80211_hw_check(&local->hw, SUPPORTS_NSS_OFFLOAD) && sta) { -@@ -4763,7 +4767,8 @@ out_free: +@@ -4764,7 +4768,8 @@ out_free: void ieee80211_8023_xmit_ap(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, @@ -106,7 +106,7 @@ Signed-off-by: Aaradhana Sahu { struct ieee80211_tx_info *info; struct ieee80211_local *local = sdata->local; -@@ -4772,6 +4777,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4773,6 +4778,9 @@ void ieee80211_8023_xmit_ap(struct ieee8 unsigned long flags; int q; u16 q_map; @@ -116,7 +116,7 @@ Signed-off-by: Aaradhana Sahu /* * If the skb is shared we need to obtain our own copy. -@@ -4783,11 +4791,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4784,11 +4792,13 @@ void ieee80211_8023_xmit_ap(struct ieee8 info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); @@ -133,7 +133,7 @@ Signed-off-by: Aaradhana Sahu info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; info->control.vif = &sdata->vif; -@@ -4821,14 +4831,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 +@@ -4822,14 +4832,23 @@ void ieee80211_8023_xmit_ap(struct ieee8 drv_tx(local, &control, skb); } @@ -158,7 +158,7 @@ Signed-off-by: Aaradhana Sahu #ifdef CPTCFG_MAC80211_NSS_SUPPORT ieee80211_xmit_nss_fixup(skb, dev); -@@ -4844,14 +4863,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4845,14 +4864,15 @@ netdev_tx_t ieee80211_subif_start_xmit_8 kfree_skb(skb); goto out; } @@ -176,7 +176,7 @@ Signed-off-by: Aaradhana Sahu goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); -@@ -4862,13 +4882,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 +@@ -4863,13 +4883,13 @@ netdev_tx_t ieee80211_subif_start_xmit_8 goto skip_offload; if (sdata->vif.type == NL80211_IFTYPE_AP) { @@ -192,7 +192,7 @@ Signed-off-by: Aaradhana Sahu goto out; skip_offload: -@@ -6374,7 +6394,10 @@ start_xmit: +@@ -6375,7 +6395,10 @@ start_xmit: mutex_lock(&local->mtx); local_bh_disable(); diff --git a/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch b/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch index 7ffaf99158b90e..62916f15eddb56 100644 --- a/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch +++ b/package/kernel/mac80211/patches/nss/subsys/686-mac80211-fix-RCU-stall-in-mesh-fast-xmit-path.patch @@ -72,7 +72,7 @@ Signed-off-by: P Praneesh --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -2350,7 +2350,7 @@ static void mpath_set_pinfo(struct mesh_ +@@ -2349,7 +2349,7 @@ static void mpath_set_pinfo(struct mesh_ if (mpath->flags & MESH_PATH_RESOLVED) pinfo->flags |= NL80211_MPATH_FLAG_RESOLVED; pinfo->hop_count = mpath->hop_count; diff --git a/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch b/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch index 098767aa3f36db..ea83021014ad26 100644 --- a/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch +++ b/package/kernel/mac80211/patches/nss/subsys/751-mac80211-Get-valid-last_rate-for-rx_bitrate-from-cpu.patch @@ -16,7 +16,7 @@ Signed-off-by: Maharaja Kennadyrajan --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c -@@ -2396,7 +2396,7 @@ void ieee80211_sta_update_pending_airtim +@@ -2385,7 +2385,7 @@ void ieee80211_sta_update_pending_airtim } static struct ieee80211_sta_rx_stats * @@ -25,7 +25,7 @@ Signed-off-by: Maharaja Kennadyrajan { struct ieee80211_sta_rx_stats *stats = &sta->deflink.rx_stats; int cpu; -@@ -2409,8 +2409,13 @@ sta_get_last_rx_stats(struct sta_info *s +@@ -2398,8 +2398,13 @@ sta_get_last_rx_stats(struct sta_info *s for_each_possible_cpu(cpu) { struct ieee80211_sta_rx_stats *cpustats; @@ -39,7 +39,7 @@ Signed-off-by: Maharaja Kennadyrajan if (time_after(cpustats->last_rx, stats->last_rx)) stats = cpustats; -@@ -2480,7 +2485,7 @@ static void sta_stats_decode_rate(struct +@@ -2476,7 +2481,7 @@ static void sta_stats_decode_rate(struct static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) { @@ -48,16 +48,16 @@ Signed-off-by: Maharaja Kennadyrajan if (rate == STA_STATS_RATE_INVALID) return -EINVAL; -@@ -2680,7 +2685,7 @@ void sta_set_sinfo(struct sta_info *sta, +@@ -2576,7 +2581,7 @@ void sta_set_sinfo(struct sta_info *sta, + int i, ac, cpu; struct ieee80211_sta_rx_stats *last_rxstats; - struct link_sta_info *link_sta = NULL; - last_rxstats = sta_get_last_rx_stats(sta); + last_rxstats = sta_get_last_rx_stats(sta, false); sinfo->generation = sdata->local->sta_generation; -@@ -2924,7 +2929,7 @@ u32 sta_get_expected_throughput(struct s +@@ -2859,7 +2864,7 @@ u32 sta_get_expected_throughput(struct s unsigned long ieee80211_sta_last_active(struct sta_info *sta) { diff --git a/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch index 50466d46c37880..6be28b6ac56663 100644 --- a/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch +++ b/package/kernel/mac80211/patches/nss/subsys/780-mac80211-Advertise-HW-checksum-offload-only-for-ethm.patch @@ -58,7 +58,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) return true; -@@ -4343,7 +4345,7 @@ void __ieee80211_subif_start_xmit(struct +@@ -4344,7 +4346,7 @@ void __ieee80211_subif_start_xmit(struct * things so we cannot really handle checksum or GSO offload. * fix it up in software before we handle anything else. */ @@ -67,7 +67,7 @@ Signed-off-by: Tamizh Chelvam Raja if (!skb) { len = 0; goto out; -@@ -4714,7 +4716,7 @@ static void ieee80211_8023_xmit(struct i +@@ -4715,7 +4717,7 @@ static void ieee80211_8023_xmit(struct i } } diff --git a/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch b/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch index b76692a6f9500c..c2846abf7e5961 100644 --- a/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch +++ b/package/kernel/mac80211/patches/nss/subsys/785-wifi-mac80211-Add-mac-hw-flag-to-avoid-queue-skb.patch @@ -23,7 +23,7 @@ Signed-off-by: Yuvasree Sivasankaran --- a/include/net/mac80211.h +++ b/include/net/mac80211.h -@@ -2730,6 +2730,9 @@ struct ieee80211_txq { +@@ -2732,6 +2732,9 @@ struct ieee80211_txq { * * @IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD: Hardware suports tid calssification offload. * @@ -33,7 +33,7 @@ Signed-off-by: Yuvasree Sivasankaran * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays */ enum ieee80211_hw_flags { -@@ -2790,6 +2793,7 @@ enum ieee80211_hw_flags { +@@ -2792,6 +2795,7 @@ enum ieee80211_hw_flags { IEEE80211_HW_SUPPORTS_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_MESH_NSS_OFFLOAD, IEEE80211_HW_SUPPORTS_TID_CLASS_OFFLOAD, @@ -83,7 +83,7 @@ Signed-off-by: Yuvasree Sivasankaran return false; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) -@@ -4328,7 +4335,8 @@ void __ieee80211_subif_start_xmit(struct +@@ -4329,7 +4336,8 @@ void __ieee80211_subif_start_xmit(struct } } @@ -93,7 +93,7 @@ Signed-off-by: Yuvasree Sivasankaran ieee80211_aggr_check(sdata, sta, skb); if (sta) { -@@ -4680,8 +4688,10 @@ static void ieee80211_8023_xmit(struct i +@@ -4681,8 +4689,10 @@ static void ieee80211_8023_xmit(struct i bool multicast; u8 tid; @@ -106,7 +106,7 @@ Signed-off-by: Yuvasree Sivasankaran multicast = is_multicast_ether_addr(ra); -@@ -6416,9 +6426,12 @@ int ieee80211_tx_control_port(struct wip +@@ -6379,9 +6389,12 @@ int ieee80211_tx_control_port(struct wip } if (!IS_ERR(sta)) { @@ -123,7 +123,7 @@ Signed-off-by: Yuvasree Sivasankaran * for MLO STA, the SA should be the AP MLD address, but --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c -@@ -4525,6 +4525,9 @@ static int ieee80211_get_txq_stats(struc +@@ -4524,6 +4524,9 @@ static int ieee80211_get_txq_stats(struc struct ieee80211_sub_if_data *sdata; int ret = 0; @@ -205,7 +205,7 @@ Signed-off-by: Yuvasree Sivasankaran int i; sta = kzalloc(sizeof(*sta) + hw->sta_data_size, gfp); -@@ -607,18 +609,22 @@ __sta_info_alloc(struct ieee80211_sub_if +@@ -611,18 +613,22 @@ __sta_info_alloc(struct ieee80211_sub_if sta->last_connected = ktime_get_seconds(); @@ -237,7 +237,7 @@ Signed-off-by: Yuvasree Sivasankaran } if (sta_prepare_rate_control(local, sta, gfp)) -@@ -692,7 +698,8 @@ __sta_info_alloc(struct ieee80211_sub_if +@@ -696,7 +702,8 @@ __sta_info_alloc(struct ieee80211_sub_if return sta; free_txq: @@ -247,7 +247,7 @@ Signed-off-by: Yuvasree Sivasankaran free: sta_info_free_link(&sta->deflink); #ifdef CPTCFG_MAC80211_MESH -@@ -1687,11 +1694,13 @@ void ieee80211_sta_ps_deliver_wakeup(str +@@ -1691,11 +1698,13 @@ void ieee80211_sta_ps_deliver_wakeup(str if (!ieee80211_hw_check(&local->hw, AP_LINK_PS)) drv_sta_notify(local, sdata, STA_NOTIFY_AWAKE, &sta->sta); @@ -265,7 +265,7 @@ Signed-off-by: Yuvasree Sivasankaran } skb_queue_head_init(&pending); -@@ -2106,6 +2115,9 @@ ieee80211_sta_ps_deliver_response(struct +@@ -2110,6 +2119,9 @@ ieee80211_sta_ps_deliver_response(struct * TIM recalculation. */ @@ -275,7 +275,7 @@ Signed-off-by: Yuvasree Sivasankaran for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) { if (!sta->sta.txq[tid] || !(driver_release_tids & BIT(tid)) || -@@ -2521,7 +2533,7 @@ static void sta_set_tidstats(struct sta_ +@@ -2546,7 +2558,7 @@ static void sta_set_tidstats(struct sta_ tidstats->tx_msdu_failed = sta->deflink.status_stats.msdu_failed[tid]; } @@ -284,7 +284,7 @@ Signed-off-by: Yuvasree Sivasankaran spin_lock_bh(&local->fq.lock); rcu_read_lock(); -@@ -2849,6 +2861,9 @@ unsigned long ieee80211_sta_last_active( +@@ -2874,6 +2886,9 @@ unsigned long ieee80211_sta_last_active( static void sta_update_codel_params(struct sta_info *sta, u32 thr) { diff --git a/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch b/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch index e3d8db5815fe88..0f8289a892d4a4 100644 --- a/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch +++ b/package/kernel/mac80211/patches/nss/subsys/902-wifi-mac80211-Fix-memory-corruption-during-mesh-beac.patch @@ -25,7 +25,7 @@ Signed-off-by: Manish Dharanenthiran --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -683,7 +683,7 @@ struct ieee80211_if_mesh { +@@ -682,7 +682,7 @@ struct ieee80211_if_mesh { struct timer_list mesh_path_root_timer; unsigned long wrkq_flags; From bb449d0fbdc8b69887858ff122cb69b062c6c4c0 Mon Sep 17 00:00:00 2001 From: Qosmio Date: Mon, 25 Mar 2024 18:27:34 -0400 Subject: [PATCH 74/80] qualcommax: consolidate symbols, revert built-in Symbols for crypto, ktls, netfilter are removed from from being compiled into the kernel and instead left up to the user to compile as modules, as is the case upstream. Other unused qca features were also removed as they don't apply to ipq807x/6018 and are not upstream. Common symbols between 6.1/6.6 that are required for NSS related features have been consolidated into 'config-default'. There is an average 300kb of savings in the final kernel image as well decreased compile time. qualcommax: NSS: consolidate patches and align with 6.1 Update nss-cfi to kernel 6.6 --- .../linux/qualcommax/ipq807x/config-default | 104 +++--------------- .../0600-1-qca-nss-ecm-support-CORE.patch | 10 ++ ...-IPv6-user-route-change-event-calls.patch} | 0 .../0605-1-qca-nss-cfi-support.patch | 20 +++- ..._ecache-Fix-NSS-ECM-BRK-kernel-panic.patch | 10 -- .../9990-1-qca-skb_recycler-support.patch | 12 -- 6 files changed, 41 insertions(+), 115 deletions(-) rename target/linux/qualcommax/patches-6.6/{0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch => 0600-7-qca-nss-ecm-fix-IPv6-user-route-change-event-calls.patch} (100%) delete mode 100644 target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch diff --git a/target/linux/qualcommax/ipq807x/config-default b/target/linux/qualcommax/ipq807x/config-default index 68a750e6edb4ac..eeb86e850f04f8 100644 --- a/target/linux/qualcommax/ipq807x/config-default +++ b/target/linux/qualcommax/ipq807x/config-default @@ -1,92 +1,21 @@ CONFIG_ARM_PSCI_CPUIDLE_DOMAIN=y CONFIG_ARM_QCOM_CPUFREQ_HW=y -CONFIG_ASN1=y -CONFIG_ASN1_ENCODER=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ASYMMETRIC_KEY_TYPE=y -# CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE is not set -CONFIG_AT803X_PHY=y -CONFIG_BPFILTER=y -CONFIG_BPFILTER_UMH=m -CONFIG_CLZ_TAB=y CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set -CONFIG_CRYPTO_AES_ARM64=y -CONFIG_CRYPTO_AES_ARM64_BS=y -CONFIG_CRYPTO_AES_ARM64_CE=y -CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -CONFIG_CRYPTO_AES_ARM64_CE_CCM=y -CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y -CONFIG_CRYPTO_ANSI_CPRNG=y -CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y -CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y -CONFIG_CRYPTO_BLAKE2B=y -CONFIG_CRYPTO_BLAKE2S=y -CONFIG_CRYPTO_CFB=y -CONFIG_CRYPTO_CHACHA20=y -CONFIG_CRYPTO_CHACHA20POLY1305=y -CONFIG_CRYPTO_CHACHA20_NEON=y -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_CRCT10DIF=y -CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=y -CONFIG_CRYPTO_CRYPTD=y -CONFIG_CRYPTO_CURVE25519=y -CONFIG_CRYPTO_DH=y -CONFIG_CRYPTO_DH_RFC7919_GROUPS=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_ECC=y -CONFIG_CRYPTO_ECDH=y -CONFIG_CRYPTO_ECDSA=y -CONFIG_CRYPTO_ECRDSA=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH_ARM64_CE=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_KEYWRAP=y -CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y -CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y -CONFIG_CRYPTO_LIB_POLY1305_GENERIC=y -CONFIG_CRYPTO_LIB_SM4=y -CONFIG_CRYPTO_LRW=y -CONFIG_CRYPTO_MD4=y -CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_NHPOLY1305_NEON=y -CONFIG_CRYPTO_OFB=y -CONFIG_CRYPTO_POLY1305=y -CONFIG_CRYPTO_POLY1305_NEON=y -CONFIG_CRYPTO_POLYVAL_ARM64_CE=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_SHA1_ARM64_CE=y -CONFIG_CRYPTO_SHA2_ARM64_CE=y -CONFIG_CRYPTO_SHA256_ARM64=y -CONFIG_CRYPTO_SHA3=y -CONFIG_CRYPTO_SHA3_ARM64=y -CONFIG_CRYPTO_SHA512=y -CONFIG_CRYPTO_SHA512_ARM64=y -CONFIG_CRYPTO_SHA512_ARM64_CE=y -CONFIG_CRYPTO_SIMD=y -CONFIG_CRYPTO_SM2=y -CONFIG_CRYPTO_SM3=y -CONFIG_CRYPTO_SM3_ARM64_CE=y -CONFIG_CRYPTO_SM3_NEON=y -CONFIG_CRYPTO_SM4_ARM64_CE=y -CONFIG_CRYPTO_SM4_ARM64_CE_BLK=y -CONFIG_CRYPTO_SM4_ARM64_NEON_BLK=y -CONFIG_CRYPTO_STREEBOG=y -CONFIG_CRYPTO_XXHASH=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_DT_IDLE_GENPD=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_MSM=y +CONFIG_HZ=1000 +# CONFIG_HZ_100 is not set +CONFIG_HZ_1000=y CONFIG_IP6_NF_TARGET_MASQUERADE=y CONFIG_IP_NF_TARGET_MASQUERADE=y CONFIG_IPQ_GCC_8074=y # CONFIG_MFD_HI6421_SPMI is not set CONFIG_MFD_SPMI_PMIC=y -CONFIG_MPILIB=y # CONFIG_NVMEM_SPMI_SDAM is not set -CONFIG_OID_REGISTRY=y CONFIG_PINCTRL_IPQ8074=y CONFIG_PINCTRL_QCOM_SPMI_PMIC=y # CONFIG_PM8916_WATCHDOG is not set @@ -95,15 +24,11 @@ CONFIG_PM_GENERIC_DOMAINS_OF=y # CONFIG_POWER_RESET_QCOM_PON is not set CONFIG_QCOM_APM=y # CONFIG_QCOM_COINCELL is not set +CONFIG_QCOM_CPR=y CONFIG_QCOM_GDSC=y -# CONFIG_QCOM_IPA is not set -CONFIG_QCOM_QFPROM=y -# CONFIG_QCOM_QMI_HELPERS is not set CONFIG_QCOM_SPMI_ADC5=y # CONFIG_QCOM_SPMI_RRADC is not set CONFIG_QCOM_VADC_COMMON=y -CONFIG_QCOM_WCNSS_CTRL=y -CONFIG_QCOM_WCNSS_PIL=y CONFIG_REGMAP_SPMI=y CONFIG_REGULATOR_CPR3=y # CONFIG_REGULATOR_CPR3_NPU is not set @@ -111,16 +36,13 @@ CONFIG_REGULATOR_CPR4_APSS=y # CONFIG_REGULATOR_QCOM_LABIBB is not set CONFIG_REGULATOR_QCOM_SPMI=y # CONFIG_REGULATOR_QCOM_USB_VBUS is not set -CONFIG_RESET_QCOM_AOSS=y -CONFIG_RESET_QCOM_PDC=y CONFIG_RTC_DRV_PM8XXX=y -# CONFIG_SCHED_CLUSTER is not set -CONFIG_SCHED_CORE=y +# CONFIG_ALLOC_SKB_PAGE_FRAG_DISABLE is not set +# CONFIG_DEBUG_OBJECTS_SKBUFF is not set +CONFIG_SKB_RECYCLER=y +CONFIG_SKB_RECYCLER_MULTI_CPU=y +# CONFIG_SKB_FAST_RECYCLABLE_DEBUG_ENABLE is not set CONFIG_SPMI=y # CONFIG_SPMI_HISI3670 is not set CONFIG_SPMI_MSM_PMIC_ARB=y # CONFIG_SPMI_PMIC_CLKDIV is not set -CONFIG_TLS=y -CONFIG_TLS_DEVICE=y -# CONFIG_TLS_TOE is not set -CONFIG_XOR_BLOCKS=y diff --git a/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch b/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch index 21006721e11666..c49b9564044716 100644 --- a/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch +++ b/target/linux/qualcommax/patches-6.6/0600-1-qca-nss-ecm-support-CORE.patch @@ -783,6 +783,16 @@ #endif /* _UAPI_LINUX_IN_H */ +--- a/net/netfilter/nf_conntrack_ecache.c ++++ b/net/netfilter/nf_conntrack_ecache.c +@@ -266,7 +266,6 @@ void nf_conntrack_register_notifier(stru + mutex_lock(&nf_ct_ecache_mutex); + notify = rcu_dereference_protected(net->ct.nf_conntrack_event_cb, + lockdep_is_held(&nf_ct_ecache_mutex)); +- WARN_ON_ONCE(notify); + rcu_assign_pointer(net->ct.nf_conntrack_event_cb, new); + mutex_unlock(&nf_ct_ecache_mutex); + } --- a/include/net/netns/conntrack.h +++ b/include/net/netns/conntrack.h @@ -26,6 +26,7 @@ struct nf_tcp_net { diff --git a/target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch b/target/linux/qualcommax/patches-6.6/0600-7-qca-nss-ecm-fix-IPv6-user-route-change-event-calls.patch similarity index 100% rename from target/linux/qualcommax/patches-6.6/0600-2-qca-nss-ecm-support-CORE-Fix-IPv6-user-route-change-event-calls.patch rename to target/linux/qualcommax/patches-6.6/0600-7-qca-nss-ecm-fix-IPv6-user-route-change-event-calls.patch diff --git a/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch b/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch index f6a439ba5306a6..a0ed16e38f242e 100644 --- a/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch +++ b/target/linux/qualcommax/patches-6.6/0605-1-qca-nss-cfi-support.patch @@ -1,6 +1,6 @@ --- a/crypto/authenc.c +++ b/crypto/authenc.c -@@ -415,6 +415,8 @@ static int crypto_authenc_create(struct +@@ -417,6 +417,8 @@ static int crypto_authenc_create(struct enc->base.cra_driver_name) >= CRYPTO_MAX_ALG_NAME) goto err_free_inst; @@ -11,7 +11,7 @@ inst->alg.base.cra_blocksize = enc->base.cra_blocksize; --- a/include/linux/crypto.h +++ b/include/linux/crypto.h -@@ -86,6 +86,11 @@ +@@ -101,6 +101,11 @@ #define CRYPTO_NOLOAD 0x00008000 /* @@ -25,6 +25,14 @@ * flag unset if they can't handle memory allocation failures. --- a/net/ipv4/esp4.c +++ b/net/ipv4/esp4.c +@@ -3,6 +3,7 @@ + + #include + #include ++#include + #include + #include + #include @@ -658,6 +658,7 @@ static int esp_output(struct xfrm_state struct ip_esp_hdr *esph; struct crypto_aead *aead; @@ -68,6 +76,14 @@ --- a/net/ipv6/esp6.c +++ b/net/ipv6/esp6.c +@@ -15,6 +15,7 @@ + + #include + #include ++#include + #include + #include + #include @@ -696,6 +696,7 @@ static int esp6_output(struct xfrm_state struct ip_esp_hdr *esph; struct crypto_aead *aead; diff --git a/target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch b/target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch deleted file mode 100644 index 4b9ee21f2f8545..00000000000000 --- a/target/linux/qualcommax/patches-6.6/0610-netfilter-nf_conntrack_ecache-Fix-NSS-ECM-BRK-kernel-panic.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/net/netfilter/nf_conntrack_ecache.c -+++ b/net/netfilter/nf_conntrack_ecache.c -@@ -266,7 +266,6 @@ void nf_conntrack_register_notifier(stru - mutex_lock(&nf_ct_ecache_mutex); - notify = rcu_dereference_protected(net->ct.nf_conntrack_event_cb, - lockdep_is_held(&nf_ct_ecache_mutex)); -- WARN_ON_ONCE(notify); - rcu_assign_pointer(net->ct.nf_conntrack_event_cb, new); - mutex_unlock(&nf_ct_ecache_mutex); - } diff --git a/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch b/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch index 886bc92fe2e26a..e59b5e5398aea4 100644 --- a/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch +++ b/target/linux/qualcommax/patches-6.6/9990-1-qca-skb_recycler-support.patch @@ -1,5 +1,3 @@ -diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h -index 624d4a3..5aa8808 100644 --- a/include/linux/cpuhotplug.h +++ b/include/linux/cpuhotplug.h @@ -94,6 +94,7 @@ enum cpuhp_state { @@ -10,8 +8,6 @@ index 624d4a3..5aa8808 100644 CPUHP_PCI_XGENE_DEAD, CPUHP_IOMMU_IOVA_DEAD, CPUHP_LUSTRE_CFS_DEAD, -diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h -index 83cced8..b6ee509 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1065,6 +1065,10 @@ struct sk_buff { @@ -44,8 +40,6 @@ index 83cced8..b6ee509 100644 void kfree_skb_partial(struct sk_buff *skb, bool head_stolen); bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, -diff --git a/net/Kconfig b/net/Kconfig -index 61eac93..e0c8bf0 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -369,6 +369,27 @@ config NET_FLOW_LIMIT @@ -76,8 +70,6 @@ index 61eac93..e0c8bf0 100644 menu "Network testing" config NET_PKTGEN -diff --git a/net/core/Makefile b/net/core/Makefile -index 5c9fc1f..e90878c 100644 --- a/net/core/Makefile +++ b/net/core/Makefile @@ -41,3 +41,4 @@ obj-$(CONFIG_NET_SOCK_MSG) += skmsg.o @@ -85,8 +77,6 @@ index 5c9fc1f..e90878c 100644 obj-$(CONFIG_BPF_SYSCALL) += bpf_sk_storage.o obj-$(CONFIG_OF) += of_net.o +obj-$(CONFIG_SKB_RECYCLER) += skbuff_recycle.o -diff --git a/net/core/dev.c b/net/core/dev.c -index 85a1038..c6994ab 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -6016,10 +6016,16 @@ static int process_backlog(struct napi_struct *napi, int quota) @@ -107,8 +97,6 @@ index 85a1038..c6994ab 100644 __netif_receive_skb(skb); rcu_read_unlock(); input_queue_head_incr(sd); -diff --git a/net/core/skbuff.c b/net/core/skbuff.c -index bcfa460..eaf8bcb 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -87,6 +87,31 @@ From 33879e552078e12bebe15d44ce2439f7d6b84a4b Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Sun, 31 Mar 2024 19:16:29 -0400 Subject: [PATCH 75/80] qualcommax: disable swiotlb for 64mb in saving. Disable software input output translation lookaside buffer (swiotlb) as it wastes memory on low memory platforms (512m or less) qualcommax: only disable swiotlb for platforms <= 512M Disabling swiotlb is only required for platforms with 512M or less to save 64mb. --- ...com-disable-swiotlb-for-64mb-savings.patch | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) create mode 100644 target/linux/qualcommax/patches-6.6/9991-arm64-dts-qcom-disable-swiotlb-for-64mb-savings.patch diff --git a/target/linux/qualcommax/patches-6.6/9991-arm64-dts-qcom-disable-swiotlb-for-64mb-savings.patch b/target/linux/qualcommax/patches-6.6/9991-arm64-dts-qcom-disable-swiotlb-for-64mb-savings.patch new file mode 100644 index 00000000000000..bb610079aad154 --- /dev/null +++ b/target/linux/qualcommax/patches-6.6/9991-arm64-dts-qcom-disable-swiotlb-for-64mb-savings.patch @@ -0,0 +1,99 @@ +--- a/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts ++++ b/arch/arm64/boot/dts/qcom/ipq6010-wax214.dts +@@ -25,7 +25,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_1"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_1"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts ++++ b/arch/arm64/boot/dts/qcom/ipq8070-cax1800.dts +@@ -27,7 +27,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_1"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_1"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts ++++ b/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts +@@ -32,7 +32,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_1"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_1"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi ++++ b/arch/arm64/boot/dts/qcom/ipq8071-ax3600.dtsi +@@ -20,7 +20,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_0"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_0"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts ++++ b/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts +@@ -24,7 +24,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_0"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_0"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts ++++ b/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts +@@ -29,7 +29,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_1"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_1"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts ++++ b/arch/arm64/boot/dts/qcom/ipq8072-wax218.dts +@@ -27,7 +27,7 @@ + * Netgear's U-Boot adds "ubi.mtd=rootfs root=mtd:ubi_rootfs" + * That fails to create a UBI block device, so add it here. + */ +- bootargs-append = " ubi.block=0,rootfs root=/dev/ubiblock0_1"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce ubi.block=0,rootfs root=/dev/ubiblock0_1"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts ++++ b/arch/arm64/boot/dts/qcom/ipq8072-wpq873.dts +@@ -31,7 +31,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_1"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_1"; + }; + + keys { +--- a/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi ++++ b/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi +@@ -29,7 +29,7 @@ + + chosen { + stdout-path = "serial0:115200n8"; +- bootargs-append = " root=/dev/ubiblock0_0"; ++ bootargs-append = " coherent_pool=2M swiotlb=noforce root=/dev/ubiblock0_0"; + }; + + keys { From ff9f7d0c05dfb499f7a073ff0891864f6be16d82 Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Mon, 29 Apr 2024 21:50:56 -0400 Subject: [PATCH 76/80] qualcommax: qca-mcs support for kernel >= 6.6.29 Signed-off-by: Sean Khan --- .../0604-1-qca-add-mcs-support.patch | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch b/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch index edf21700c3e94c..4b87366d84966a 100644 --- a/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch +++ b/target/linux/qualcommax/patches-6.6/0604-1-qca-add-mcs-support.patch @@ -39,15 +39,15 @@ * added to the bridge private HW address list and all required ports --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h -@@ -906,6 +906,7 @@ void br_manage_promisc(struct net_bridge +@@ -907,6 +907,7 @@ void br_manage_promisc(struct net_bridge int nbp_backup_change(struct net_bridge_port *p, struct net_device *backup_dev); /* br_input.c */ -+int br_pass_frame_up(struct sk_buff *skb); /* QCA qca-mcs support */ ++int br_pass_frame_up(struct sk_buff *skb, bool promisc); /* QCA qca-mcs support */ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb); rx_handler_func_t *br_get_rx_handler(const struct net_device *dev); -@@ -2268,4 +2269,14 @@ struct nd_msg *br_is_nd_neigh_msg(struct +@@ -2269,4 +2270,14 @@ struct nd_msg *br_is_nd_neigh_msg(struct bool br_is_neigh_suppress_enabled(const struct net_bridge_port *p, u16 vid); #define __br_get(__hook, __default, __args ...) \ (__hook ? (__hook(__args)) : (__default)) /* QCA NSS ECM support */ @@ -109,7 +109,7 @@ return netif_receive_skb(skb); } --static int br_pass_frame_up(struct sk_buff *skb) +-static int br_pass_frame_up(struct sk_buff *skb, bool promisc) +/* QCA qca-mcs support - Start */ +/* Hook for external Multicast handler */ +br_multicast_handle_hook_t __rcu *br_multicast_handle_hook __read_mostly; @@ -120,11 +120,11 @@ +EXPORT_SYMBOL_GPL(br_get_dst_hook); +/* QCA qca-mcs support - End */ + -+int br_pass_frame_up(struct sk_buff *skb) ++int br_pass_frame_up(struct sk_buff *skb, bool promisc) { struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev; struct net_bridge *br = netdev_priv(brdev); -@@ -69,6 +79,7 @@ static int br_pass_frame_up(struct sk_bu +@@ -71,6 +81,7 @@ static int br_pass_frame_up(struct sk_bu dev_net(indev), NULL, skb, indev, NULL, br_netif_receive_skb); } @@ -132,7 +132,7 @@ /* note: already called with rcu_read_lock */ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb) -@@ -82,6 +93,11 @@ int br_handle_frame_finish(struct net *n +@@ -84,6 +95,11 @@ int br_handle_frame_finish(struct net *n struct net_bridge_mcast *brmctx; struct net_bridge_vlan *vlan; struct net_bridge *br; @@ -141,10 +141,10 @@ + struct net_bridge_port *pdst = NULL; + br_get_dst_hook_t *get_dst_hook = rcu_dereference(br_get_dst_hook); + /* QCA qca-mcs support - End */ + bool promisc; u16 vid = 0; u8 state; - -@@ -175,6 +191,12 @@ int br_handle_frame_finish(struct net *n +@@ -180,6 +196,12 @@ int br_handle_frame_finish(struct net *n switch (pkt_type) { case BR_PKT_MULTICAST: @@ -157,7 +157,7 @@ mdst = br_mdb_get(brmctx, skb, vid); if ((mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) && br_multicast_querier_exists(brmctx, eth_hdr(skb), mdst)) { -@@ -190,8 +212,15 @@ int br_handle_frame_finish(struct net *n +@@ -195,8 +217,15 @@ int br_handle_frame_finish(struct net *n } break; case BR_PKT_UNICAST: @@ -175,7 +175,7 @@ default: break; } -@@ -206,6 +235,13 @@ int br_handle_frame_finish(struct net *n +@@ -211,6 +240,13 @@ int br_handle_frame_finish(struct net *n dst->used = now; br_forward(dst->dst, skb, local_rcv, false); } else { From 8fedaeaa55ecb31613c509ec13cd5d093d5ad69e Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Sun, 5 May 2024 00:59:15 -0400 Subject: [PATCH 77/80] feeds: nss-packages: switch to branch 12.5-6.x --- feeds.conf.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feeds.conf.default b/feeds.conf.default index 68c55d271c0819..5e40f047d6b5f4 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -2,7 +2,7 @@ src-git packages https://git.openwrt.org/feed/packages.git src-git luci https://git.openwrt.org/project/luci.git src-git routing https://git.openwrt.org/feed/routing.git src-git telephony https://git.openwrt.org/feed/telephony.git -src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.4-K6.x +src-git nss_packages https://github.com/qosmio/nss-packages.git;NSS-12.5-K6.x src-git sqm_scripts_nss https://github.com/qosmio/sqm-scripts-nss.git #src-git video https://github.com/openwrt/video.git #src-git targets https://github.com/openwrt/targets.git From f1eae2f90d24833797aed7c4a715aa36f8d0679b Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Sun, 5 May 2024 01:02:03 -0400 Subject: [PATCH 78/80] ath11k_nss: fix invalid access to memory In ath11k_dp_rx_msdu_coalesce(), rxcb is fetched from skb and bool is_continuation is part of rxcb. Currently, after freeing the skb, the rxcb->is_continuation accessed again which is wrong since the memory is already freed. Hence fix the issue by locally defining bool is_continuation from rxcb, so that after freeing skb also we can use is_continuation. Signed-off-by: Sean Khan --- ...-ath11k-fix-invalid-access-to-memory.patch | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 package/kernel/mac80211/patches/nss/ath11k/909-wifi-ath11k-fix-invalid-access-to-memory.patch diff --git a/package/kernel/mac80211/patches/nss/ath11k/909-wifi-ath11k-fix-invalid-access-to-memory.patch b/package/kernel/mac80211/patches/nss/ath11k/909-wifi-ath11k-fix-invalid-access-to-memory.patch new file mode 100644 index 00000000000000..da069c0de63163 --- /dev/null +++ b/package/kernel/mac80211/patches/nss/ath11k/909-wifi-ath11k-fix-invalid-access-to-memory.patch @@ -0,0 +1,47 @@ +From cea94c73e068ce4e015327bf251f782545d8e365 Mon Sep 17 00:00:00 2001 +From: Sarika Sharma +Date: Mon, 29 Jan 2024 16:01:23 +0530 +Subject: [PATCH] wifi: ath11k: fix invalid access to memory + +In ath11k_dp_rx_msdu_coalesce(), rxcb is fetched from skb and bool +is_continuation is part of rxcb. +Currently, after freeing the skb, the rxcb->is_continuation accessed +again which is wrong since the memory is already freed. + +Hence fix the issue by locally defining bool is_continuation from rxcb, +so that after freeing skb also we can use is_continuation. + +Signed-off-by: Sarika Sharma +--- + drivers/net/wireless/ath/ath11k/dp_rx.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/drivers/net/wireless/ath/ath11k/dp_rx.c ++++ b/drivers/net/wireless/ath/ath11k/dp_rx.c +@@ -2202,6 +2202,7 @@ static int ath11k_dp_rx_msdu_coalesce(st + struct hal_rx_desc *ldesc; + int space_extra, rem_len, buf_len; + u32 hal_rx_desc_sz = ar->ab->hw_params.hal_desc_sz; ++ bool is_continuation; + + /* As the msdu is spread across multiple rx buffers, + * find the offset to the start of msdu for computing +@@ -2250,7 +2251,8 @@ static int ath11k_dp_rx_msdu_coalesce(st + rem_len = msdu_len - buf_first_len; + while ((skb = __skb_dequeue(msdu_list)) != NULL && rem_len > 0) { + rxcb = ATH11K_SKB_RXCB(skb); +- if (rxcb->is_continuation) ++ is_continuation = rxcb->is_continuation; ++ if (is_continuation) + buf_len = DP_RX_BUFFER_SIZE - hal_rx_desc_sz; + else + buf_len = rem_len; +@@ -2268,7 +2270,7 @@ static int ath11k_dp_rx_msdu_coalesce(st + dev_kfree_skb_any(skb); + + rem_len -= buf_len; +- if (!rxcb->is_continuation) ++ if (!is_continuation) + break; + } + From 7a94dba243152c277cb1225878a2a164bdac1480 Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Tue, 7 May 2024 02:31:32 -0400 Subject: [PATCH 79/80] qualcommax: NSS: Add support for all ipq807x targets NSS offload feature should be available for all IPQ807x/IPQ817x targets. * Arcadyan AW1000 * CMCC RM2-6 * Linksys MX4200 V1/V2 * Linksys MX5300 * Sagemcom Fast 5285 Spectrum SAXV1V1S * Yuncore AX880 * ZBT Z800AX * ZTE MF269 Signed-off-by: Sean Khan --- .../qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts | 1 + .../qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts | 1 + .../qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts | 1 + .../qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts | 1 + .../qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts | 1 + .../files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts | 1 + .../files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts | 1 + .../files/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi | 1 + 8 files changed, 8 insertions(+) diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts index d935e19ad248c4..882930512847ba 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8070-rm2-6.dts @@ -5,6 +5,7 @@ #include "ipq8074-512m.dtsi" #include "ipq8074-ac-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts index 3ca92a7a8f3f13..f20c325024a1dd 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8071-mf269.dts @@ -5,6 +5,7 @@ #include "ipq8074-512m.dtsi" #include "ipq8074-ac-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts index c85e9f1993aa33..fbad0e79e5010c 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-aw1000.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts index 23e89a9ae42d31..af5a497b39acac 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-ax880.dts @@ -6,6 +6,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts index 9d28f2ad0d4aec..6e2e95c00a3de8 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-mx5300.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts index 01ac1c5fd68b70..7c92f845cf86aa 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-sax1v1k.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts index c352b725676ba8..121a06fa995d2e 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8072-zbt-z800ax.dts @@ -5,6 +5,7 @@ #include "ipq8074.dtsi" #include "ipq8074-hk-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi index 13ce8d16016860..741c00bdcb9f56 100644 --- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi +++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq8174-mx4200.dtsi @@ -4,6 +4,7 @@ #include "ipq8074.dtsi" #include "ipq8074-ac-cpu.dtsi" #include "ipq8074-ess.dtsi" +#include "ipq8074-nss.dtsi" #include #include #include From c99d63642e5d77b7485c746294ed74050a67f58d Mon Sep 17 00:00:00 2001 From: Sean Khan Date: Wed, 15 May 2024 02:02:31 -0400 Subject: [PATCH 80/80] ath11k_nss: revert AMPDU in radiotap header Causes issues with rate stats on IPQ9074 Signed-off-by: Sean Khan --- package/kernel/mac80211/Makefile | 2 +- ...d-ampdu-id-in-802.11-radiotap-header.patch | 279 ------------------ 2 files changed, 1 insertion(+), 280 deletions(-) delete mode 100644 package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile index cf9c743eb3d198..0a3b91f10ec542 100644 --- a/package/kernel/mac80211/Makefile +++ b/package/kernel/mac80211/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=mac80211 PKG_VERSION:=6.6.15 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_LICENSE:=GPL-2.0-only PKG_LICENSE_FILES:=COPYING diff --git a/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch b/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch deleted file mode 100644 index 12a035bf4e5790..00000000000000 --- a/package/kernel/mac80211/patches/nss/ath11k/999-312-ath11k-add-ampdu-id-in-802.11-radiotap-header.patch +++ /dev/null @@ -1,279 +0,0 @@ -From 3f962ed9a4079964c48e321fd928a2719038d881 Mon Sep 17 00:00:00 2001 -From: P Praneesh -Date: Fri, 28 May 2021 23:53:57 +0530 -Subject: [PATCH] ath11k: add ampdu id in 802.11 radiotap header - -AMPDU aggregate reference number is generated by -driver internally which is same across each -subframe of an ampdu. - -For fetching AMPDU-ID, we need to concatenate -ppdu_id from mpdu_info and tlv_usr from tlv heder. -while parsing monitor TLV data with HAL_RX_MPDU_START -TLV tag, ampdu id is fetched from mpdu_info and -updated to corresponding mac80211 structure during -ath11k_update_radiotap. - -Signed-off-by: P Praneesh ---- - drivers/net/wireless/ath/ath11k/dp_rx.c | 6 ++++++ - drivers/net/wireless/ath/ath11k/hal_rx.c | 13 ++++++++++++ - drivers/net/wireless/ath/ath11k/hal_rx.h | 16 ++++++++------ - drivers/net/wireless/ath/ath11k/hw.c | 36 +++++++++++++++++++++++++------- - drivers/net/wireless/ath/ath11k/hw.h | 1 + - 5 files changed, 58 insertions(+), 14 deletions(-) - ---- a/drivers/net/wireless/ath/ath11k/dp_rx.c -+++ b/drivers/net/wireless/ath/ath11k/dp_rx.c -@@ -5995,6 +5995,7 @@ static void ath11k_update_radiotap(struc - { - struct ieee80211_supported_band *sband; - u8 *ptr = NULL; -+ u16 ampdu_id = ppduinfo->ampdu_id[ppduinfo->userid]; - - rxs->flag |= RX_FLAG_MACTIME_START; - rxs->signal = ppduinfo->rssi_comb + ATH11K_DEFAULT_NOISE_FLOOR; -@@ -6002,6 +6003,11 @@ static void ath11k_update_radiotap(struc - if (ppduinfo->nss) - rxs->nss = ppduinfo->nss; - -+ if (ampdu_id) { -+ rxs->flag |= RX_FLAG_AMPDU_DETAILS; -+ rxs->ampdu_reference = ampdu_id; -+ } -+ - if (ppduinfo->he_mu_flags) { - rxs->flag |= RX_FLAG_RADIOTAP_HE_MU; - rxs->encoding = RX_ENC_HE; ---- a/drivers/net/wireless/ath/ath11k/hal_rx.c -+++ b/drivers/net/wireless/ath/ath11k/hal_rx.c -@@ -873,6 +873,13 @@ static u16 ath11k_hal_rx_mpduinfo_get_pe - return ab->hw_params.hw_ops->mpdu_info_get_peerid(mpdu_info); - } - -+static -+u16 ath11k_hal_rxdesc_get_hal_mpdu_ppdu_id(struct ath11k_base *ab, -+ struct hal_rx_mpdu_info *mpdu_info) -+{ -+ return ab->hw_params.hw_ops->rx_desc_get_hal_ppdu_id(mpdu_info); -+} -+ - static enum hal_rx_mon_status - ath11k_hal_rx_parse_mon_status_tlv(struct ath11k_base *ab, - struct hal_rx_mon_ppdu_info *ppdu_info, -@@ -1546,6 +1553,12 @@ ath11k_hal_rx_parse_mon_status_tlv(struc - - ppdu_info->mpdu_len += ab->hw_params.hw_ops->rx_desc_get_hal_mpdu_len(mpdu_info); - -+ if (userid < HAL_MAX_UL_MU_USERS) { -+ ppdu_info->userid = userid; -+ ppdu_info->ampdu_id[userid] = -+ ath11k_hal_rxdesc_get_hal_mpdu_ppdu_id(ab, mpdu_info); -+ } -+ - break; - } - case HAL_RXPCU_PPDU_END_INFO: { ---- a/drivers/net/wireless/ath/ath11k/hal_rx.h -+++ b/drivers/net/wireless/ath/ath11k/hal_rx.h -@@ -221,6 +221,8 @@ struct hal_rx_mon_ppdu_info { - u32 num_users; - u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; - struct hal_rx_user_status userstats[HAL_MAX_UL_MU_USERS]; -+ u8 userid; -+ u16 ampdu_id[HAL_MAX_UL_MU_USERS]; - bool ppdu_continuation; - }; - -@@ -460,20 +462,22 @@ struct hal_rx_phyrx_rssi_legacy_info { - #define HAL_RX_MPDU_INFO_INFO0_PEERID GENMASK(31, 16) - #define HAL_RX_MPDU_INFO_INFO0_PEERID_WCN6855 GENMASK(15, 0) - #define HAL_RX_MPDU_INFO_INFO1_MPDU_LEN GENMASK(13, 0) -+#define HAL_RX_MPDU_INFO_INFO0_PPDU_ID GENMASK(31, 16) - - struct hal_rx_mpdu_info_ipq8074 { -- __le32 rsvd0; - __le32 info0; -- __le32 rsvd1[11]; - __le32 info1; -+ __le32 rsvd1[11]; -+ __le32 info2; - __le32 rsvd2[9]; - } __packed; - - struct hal_rx_mpdu_info_qcn9074 { -- __le32 rsvd0[10]; -+ __le32 rsvd0[9]; - __le32 info0; -- __le32 rsvd1[2]; - __le32 info1; -+ __le32 rsvd1[2]; -+ __le32 info2; - __le32 rsvd2[9]; - } __packed; - -@@ -493,9 +497,11 @@ struct hal_rx_mpdu_info { - - #define HAL_RX_PPDU_END_DURATION GENMASK(23, 0) - struct hal_rx_ppdu_end_duration { -- __le32 rsvd0[9]; -+ __le32 rsvd0[2]; - __le32 info0; -- __le32 rsvd1[4]; -+ __le32 rsvd1[6]; -+ __le32 info1; -+ __le32 rsvd2[4]; - } __packed; - - struct hal_rx_rxpcu_classification_overview { ---- a/drivers/net/wireless/ath/ath11k/hw.h -+++ b/drivers/net/wireless/ath/ath11k/hw.h -@@ -307,6 +307,7 @@ struct ath11k_hw_ops { - void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, - u8 *crypto_hdr, - enum hal_encrypt_type enctype); -+ u16 (*rx_desc_get_hal_ppdu_id) (struct hal_rx_mpdu_info *mpdu_info); - }; - - extern const struct ath11k_hw_ops ipq8074_ops; ---- a/drivers/net/wireless/ath/ath11k/hw.c -+++ b/drivers/net/wireless/ath/ath11k/hw.c -@@ -13,6 +13,7 @@ - #include "hif.h" - #include "hal.h" - #include "hw.h" -+#include "hal_rx.h" - - /* Map from pdev index to hw mac index */ - static u8 ath11k_hw_ipq8074_mac_from_pdev_id(int pdev_idx) -@@ -717,17 +718,6 @@ static u8 *ath11k_hw_qcn9074_rx_desc_get - return &desc->u.qcn9074.msdu_payload[0]; - } - --static bool ath11k_hw_ipq9074_rx_desc_mac_addr2_valid(struct hal_rx_desc *desc) --{ -- return __le32_to_cpu(desc->u.qcn9074.mpdu_start.info11) & -- RX_MPDU_START_INFO11_MAC_ADDR2_VALID; --} -- --static u8 *ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2(struct hal_rx_desc *desc) --{ -- return desc->u.qcn9074.mpdu_start.addr2; --} -- - static bool ath11k_hw_wcn6855_rx_desc_get_first_msdu(struct hal_rx_desc *desc) - { - return !!FIELD_GET(RX_MSDU_END_INFO2_FIRST_MSDU_WCN6855, -@@ -1085,12 +1075,27 @@ static void ath11k_hw_ipq5018_reo_setup( - } - - static u16 -+ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id(struct hal_rx_mpdu_info *mpdu_info) -+{ -+ -+ return FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PPDU_ID, -+ __le32_to_cpu(mpdu_info->u.ipq8074.info0)); -+} -+ -+static -+u16 ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id(struct hal_rx_mpdu_info *mpdu_info) -+{ -+ -+ return FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PPDU_ID, -+ __le32_to_cpu(mpdu_info->u.qcn9074.info0)); -+} -+ -+static u16 - ath11k_hw_ipq8074_mpdu_info_get_peerid(struct hal_rx_mpdu_info *mpdu_info) - { - u16 peer_id = 0; -- - peer_id = FIELD_GET(HAL_RX_MPDU_INFO_INFO0_PEERID, -- __le32_to_cpu(mpdu_info->u.ipq8074.info0)); -+ __le32_to_cpu(mpdu_info->u.ipq8074.info1)); - - return peer_id; - } -@@ -1196,6 +1201,7 @@ const struct ath11k_hw_ops ipq8074_ops = - .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq8074_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, - .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, - #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M - .rx_desc_get_offset = ath11k_hw_ipq8074_rx_desc_get_offset, - #endif -@@ -1219,6 +1225,7 @@ const struct ath11k_hw_ops ipq6018_ops = - .rx_desc_get_encrypt_type = ath11k_hw_ipq8074_rx_desc_get_encrypt_type, - .rx_desc_get_decap_type = ath11k_hw_ipq8074_rx_desc_get_decap_type, - .rx_desc_get_mesh_ctl = ath11k_hw_ipq8074_rx_desc_get_mesh_ctl, -+ .rx_desc_get_ip_valid = ath11k_hw_ipq8074_rx_desc_get_ip_valid, - .rx_desc_get_ldpc_support = ath11k_hw_ipq8074_rx_desc_get_ldpc_support, - .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_ipq8074_rx_desc_get_mpdu_seq_ctl_vld, - .rx_desc_get_mpdu_fc_valid = ath11k_hw_ipq8074_rx_desc_get_mpdu_fc_valid, -@@ -1251,6 +1258,7 @@ const struct ath11k_hw_ops ipq6018_ops = - .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, - .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, - .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, - }; - - const struct ath11k_hw_ops qca6390_ops = { -@@ -1300,6 +1308,7 @@ const struct ath11k_hw_ops qca6390_ops = - .rx_desc_dot11_hdr_fields_valid = ath11k_hw_ipq8074_rx_desc_dot11_hdr_fields_valid, - .rx_desc_get_dot11_hdr = ath11k_hw_ipq8074_rx_desc_get_dot11_hdr, - .rx_desc_get_crypto_header = ath11k_hw_ipq8074_rx_desc_get_crypto_hdr, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, - }; - - const struct ath11k_hw_ops qcn9074_ops = { -@@ -1341,6 +1350,7 @@ const struct ath11k_hw_ops qcn9074_ops = - .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, - .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id, - #ifdef CPTCFG_ATH11K_MEM_PROFILE_512M - .rx_desc_get_offset = ath11k_hw_qcn9074_rx_desc_get_offset, - #endif -@@ -1389,6 +1399,7 @@ const struct ath11k_hw_ops wcn6855_ops = - .rx_desc_mpdu_start_addr2 = ath11k_hw_wcn6855_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, - .rx_desc_get_hal_mpdu_len = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_len, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_ipq8074_rx_desc_get_hal_mpdu_ppdu_id, - }; - - const struct ath11k_hw_ops wcn6750_ops = { -@@ -1405,6 +1416,7 @@ const struct ath11k_hw_ops wcn6750_ops = - .rx_desc_get_encrypt_type = ath11k_hw_qcn9074_rx_desc_get_encrypt_type, - .rx_desc_get_decap_type = ath11k_hw_qcn9074_rx_desc_get_decap_type, - .rx_desc_get_mesh_ctl = ath11k_hw_qcn9074_rx_desc_get_mesh_ctl, -+ .rx_desc_get_ip_valid = ath11k_hw_qcn9074_rx_desc_get_ip_valid, - .rx_desc_get_ldpc_support = ath11k_hw_qcn9074_rx_desc_get_ldpc_support, - .rx_desc_get_mpdu_seq_ctl_vld = ath11k_hw_qcn9074_rx_desc_get_mpdu_seq_ctl_vld, - .rx_desc_get_mpdu_fc_valid = ath11k_hw_qcn9074_rx_desc_get_mpdu_fc_valid, -@@ -1426,9 +1438,10 @@ const struct ath11k_hw_ops wcn6750_ops = - .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, - .reo_setup = ath11k_hw_wcn6855_reo_setup, - .mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid, -- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, -- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, -+ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, -+ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_wcn6750_get_tcl_ring_selector, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id, - }; - - /* IPQ5018 hw ops is similar to QCN9074 except for the dest ring remap */ -@@ -1468,10 +1481,11 @@ const struct ath11k_hw_ops ipq5018_ops = - .reo_setup = ath11k_hw_ipq5018_reo_setup, - .rx_desc_get_msdu_payload = ath11k_hw_qcn9074_rx_desc_get_msdu_payload, - .mpdu_info_get_peerid = ath11k_hw_ipq8074_mpdu_info_get_peerid, -- .rx_desc_mac_addr2_valid = ath11k_hw_ipq9074_rx_desc_mac_addr2_valid, -- .rx_desc_mpdu_start_addr2 = ath11k_hw_ipq9074_rx_desc_mpdu_start_addr2, -+ .rx_desc_mac_addr2_valid = ath11k_hw_qcn9074_rx_desc_mac_addr2_valid, -+ .rx_desc_mpdu_start_addr2 = ath11k_hw_qcn9074_rx_desc_mpdu_start_addr2, - .get_ring_selector = ath11k_hw_ipq8074_get_tcl_ring_selector, - .rx_desc_get_hal_mpdu_len = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_len, -+ .rx_desc_get_hal_ppdu_id = ath11k_hw_qcn9074_rx_desc_get_hal_mpdu_ppdu_id, - }; - - #define ATH11K_TX_RING_MASK_0 BIT(0)