OpenWrt v24.10.0-rc3: adjust config defaults

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>

feeds.conf.default

@@ -1,4 +1,4 @@
-src-git packages https://git.openwrt.org/feed/packages.git^b5f11b79d2b0538d57103a8da05e7a7a87981ff3
-src-git luci https://git.openwrt.org/project/luci.git^094507c19372268d13679d2e6ad4325e08a333e2
-src-git routing https://git.openwrt.org/feed/routing.git^3f15699240c076d5ee9ed697fa5ef45355423f6f
+src-git packages https://git.openwrt.org/feed/packages.git^81d22b35c467bf0b7e75b9840e7bb4b32e4e89d8
+src-git luci https://git.openwrt.org/project/luci.git^f92e07253f22bd492345ae25dce1060b5ea33a98
+src-git routing https://git.openwrt.org/feed/routing.git^84d97e684bcb6a63dbfdfbfd9ec7407192861239
 src-git telephony https://git.openwrt.org/feed/telephony.git^fd605af7143165a2490681ec1752f259873b9147

include/feeds.mk

@@ -37,7 +37,7 @@ define FeedSourcesAppendOPKG
   echo 'src/gz %d_core %U/targets/%S/packages'; \
   $(strip $(if $(CONFIG_PER_FEED_REPO), \
 	echo 'src/gz %d_base %U/packages/%A/base'; \
-	$(if $(filter %SNAPSHOT-y,$(VERSION_NUMBER)-$(CONFIG_BUILDBOT)), \
+	$(if $(CONFIG_BUILDBOT), \
 		echo 'src/gz %d_kmods %U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \
@@ -51,7 +51,7 @@ 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)), \
+	$(if $(CONFIG_BUILDBOT), \
 		echo '%U/targets/%S/kmods/$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)/packages.adb';) \
 	$(foreach feed,$(FEEDS_AVAILABLE), \
 		$(if $(CONFIG_FEED_$(feed)), \

include/kernel-6.6

@@ -1,2 +1,2 @@
-LINUX_VERSION-6.6 = .63
-LINUX_KERNEL_HASH-6.6.63 = d1054ab4803413efe2850f50f1a84349c091631ec50a1cf9e891d1b1f9061835
+LINUX_VERSION-6.6 = .66
+LINUX_KERNEL_HASH-6.6.66 = 9d757937c4661c2f512c62641b74ef74eff9bb13dc5dbcbaaa108c21152f1e52

include/version.mk

@@ -23,13 +23,13 @@ PKG_CONFIG_DEPENDS += \
 sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
 
 VERSION_NUMBER:=$(call qstrip,$(CONFIG_VERSION_NUMBER))
-VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),24.10.0-rc1)
+VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),24.10.0-rc3)
 
 VERSION_CODE:=$(call qstrip,$(CONFIG_VERSION_CODE))
-VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r28158-d276b4c91a)
+VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),r28202-8667ca841b)
 
 VERSION_REPO:=$(call qstrip,$(CONFIG_VERSION_REPO))
-VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/24.10.0-rc1)
+VERSION_REPO:=$(if $(VERSION_REPO),$(VERSION_REPO),https://downloads.openwrt.org/releases/24.10.0-rc3)
 
 VERSION_DIST:=$(call qstrip,$(CONFIG_VERSION_DIST))
 VERSION_DIST:=$(if $(VERSION_DIST),$(VERSION_DIST),OpenWrt)

package/base-files/files/etc/rc.common

@@ -100,10 +100,6 @@ service_triggers() {
 	return 0
 }
 
-service_data() {
-	return 0
-}
-
 service_running() {
 	local instance="${1:-*}"
 

package/base-files/image-config.in

@@ -190,7 +190,7 @@ if VERSIONOPT
 	config VERSION_REPO
 		string
 		prompt "Release repository"
-		default "https://downloads.openwrt.org/releases/24.10.0-rc1"
+		default "https://downloads.openwrt.org/releases/24.10.0-rc3"
 		help
 			This is the repository address embedded in the image, it defaults
 			to the trunk snapshot repo; the url may contain the following placeholders:

package/boot/arm-trusted-firmware-mediatek/Makefile

@@ -352,6 +352,15 @@ define Trusted-Firmware-A/mt7986-spim-nand-ddr3
   DDR_TYPE:=ddr3
 endef
 
+define Trusted-Firmware-A/mt7986-spim-nand-ubi-ddr3
+  NAME:=MediaTek MT7986 (SPI-NAND via SPIM using UBI, DDR3)
+  BOOT_DEVICE:=spim-nand
+  BUILD_SUBTARGET:=filogic
+  PLAT:=mt7986
+  DDR_TYPE:=ddr3
+  USE_UBI:=1
+endef
+
 define Trusted-Firmware-A/mt7988-nor-ddr3
   NAME:=MediaTek MT7988 (SPI-NOR, DDR3)
   BOOT_DEVICE:=nor
@@ -531,6 +540,7 @@ TFA_TARGETS:= \
 	mt7986-sdmmc-ddr3 \
 	mt7986-snand-ddr3 \
 	mt7986-spim-nand-ddr3 \
+	mt7986-spim-nand-ubi-ddr3 \
 	mt7986-ram-ddr4 \
 	mt7986-emmc-ddr4 \
 	mt7986-nor-ddr4 \
@@ -570,6 +580,7 @@ TFA_MAKE_FLAGS += \
 	$(if $(RAM_BOOT_UART_DL),RAM_BOOT_UART_DL=1) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7622,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x80000)) \
 	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7981,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x100000)) \
+	$(if $(USE_UBI),UBI=1 $(if $(findstring mt7986,$(PLAT)),OVERRIDE_UBI_START_ADDR=0x200000)) \
 	$(if $(RAM_BOOT_UART_DL),bl2,all)
 
 define Package/trusted-firmware-a-ram/install

package/boot/uboot-envtools/files/mediatek_filogic

@@ -36,6 +36,7 @@ case "$board" in
 abt,asr3000|\
 h3c,magic-nx30-pro|\
 jcg,q30-pro|\
+mercusys,mr90x-v1-ubi|\
 netcore,n60|\
 nokia,ea0326gmp|\
 qihoo,360t7|\

package/boot/uboot-mediatek/Makefile

@@ -570,6 +570,18 @@ define U-Boot/mt7986_jdcloud_re-cp-03
   DEPENDS:=+trusted-firmware-a-mt7986-emmc-ddr4
 endef
 
+define U-Boot/mt7986_mercusys_mr90x-v1
+  NAME:=MERCUSYS MR90X v1
+  BUILD_SUBTARGET:=filogic
+  BUILD_DEVICES:=mercusys_mr90x-v1-ubi
+  UBOOT_CONFIG:=mt7986_mercusys_mr90x-v1
+  UBOOT_IMAGE:=u-boot.fip
+  BL2_BOOTDEV:=spim-nand-ubi
+  BL2_SOC:=mt7986
+  BL2_DDRTYPE:=ddr3
+  DEPENDS:=+trusted-firmware-a-mt7986-spim-nand-ubi-ddr3
+endef
+
 define U-Boot/mt7986_netcore_n60
   NAME:=Netcore N60
   BUILD_SUBTARGET:=filogic
@@ -847,6 +859,7 @@ UBOOT_TARGETS := \
 	mt7986_bananapi_bpi-r3-mini-snand \
 	mt7986_glinet_gl-mt6000 \
 	mt7986_jdcloud_re-cp-03 \
+	mt7986_mercusys_mr90x-v1 \
 	mt7986_netcore_n60 \
 	mt7986_tplink_tl-xdr4288 \
 	mt7986_tplink_tl-xdr6086 \

package/boot/uboot-mediatek/patches/459-add-mercusys-mr90x-v1.patch

@@ -0,0 +1,343 @@
+--- /dev/null
++++ b/configs/mt7986_mercusys_mr90x-v1_defconfig
+@@ -0,0 +1,107 @@
++CONFIG_ARM=y
++CONFIG_SYS_HAS_NONCACHED_MEMORY=y
++CONFIG_POSITION_INDEPENDENT=y
++CONFIG_ARCH_MEDIATEK=y
++CONFIG_TEXT_BASE=0x41e00000
++CONFIG_SYS_MALLOC_F_LEN=0x4000
++CONFIG_NR_DRAM_BANKS=1
++CONFIG_DEFAULT_DEVICE_TREE="mt7986b-mercusys_mr90x-v1"
++CONFIG_OF_LIBFDT_OVERLAY=y
++CONFIG_TARGET_MT7986=y
++CONFIG_PRE_CON_BUF_ADDR=0x4007ef00
++CONFIG_DEBUG_UART_BASE=0x11002000
++CONFIG_DEBUG_UART_CLOCK=40000000
++CONFIG_SYS_LOAD_ADDR=0x46000000
++CONFIG_DEBUG_UART=y
++CONFIG_FIT=y
++CONFIG_BOOTDELAY=30
++CONFIG_AUTOBOOT_KEYED=y
++CONFIG_AUTOBOOT_MENU_SHOW=y
++CONFIG_DEFAULT_FDT_FILE="mediatek/mt7986b-mercusys_mr90x-v1.dtb"
++CONFIG_LOGLEVEL=7
++CONFIG_PRE_CONSOLE_BUFFER=y
++CONFIG_LOG=y
++CONFIG_BOARD_LATE_INIT=y
++CONFIG_HUSH_PARSER=y
++CONFIG_SYS_PROMPT="MT7986> "
++CONFIG_CMD_CPU=y
++CONFIG_CMD_LICENSE=y
++CONFIG_CMD_BOOTMENU=y
++CONFIG_CMD_ASKENV=y
++CONFIG_CMD_ERASEENV=y
++CONFIG_CMD_ENV_FLAGS=y
++CONFIG_CMD_STRINGS=y
++CONFIG_CMD_DM=y
++CONFIG_CMD_GPIO=y
++CONFIG_CMD_MTD=y
++CONFIG_CMD_DHCP=y
++CONFIG_CMD_TFTPSRV=y
++CONFIG_CMD_RARP=y
++CONFIG_CMD_PING=y
++CONFIG_CMD_CDP=y
++CONFIG_CMD_SNTP=y
++CONFIG_CMD_DNS=y
++CONFIG_CMD_LINK_LOCAL=y
++CONFIG_CMD_PXE=y
++CONFIG_CMD_CACHE=y
++CONFIG_CMD_PSTORE=y
++CONFIG_CMD_PSTORE_MEM_ADDR=0x42ff0000
++CONFIG_CMD_UUID=y
++CONFIG_CMD_HASH=y
++CONFIG_CMD_SMC=y
++CONFIG_CMD_UBI=y
++CONFIG_CMD_UBI_RENAME=y
++CONFIG_OF_EMBED=y
++CONFIG_ENV_OVERWRITE=y
++CONFIG_ENV_IS_IN_UBI=y
++CONFIG_SYS_REDUNDAND_ENVIRONMENT=y
++CONFIG_ENV_UBI_PART="ubi"
++CONFIG_ENV_UBI_VOLUME="ubootenv"
++CONFIG_ENV_UBI_VOLUME_REDUND="ubootenv2"
++CONFIG_SYS_RELOC_GD_ENV_ADDR=y
++CONFIG_USE_DEFAULT_ENV_FILE=y
++CONFIG_DEFAULT_ENV_FILE="mercusys_mr90x-v1_env"
++CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y
++CONFIG_VERSION_VARIABLE=y
++CONFIG_NET_RANDOM_ETHADDR=y
++CONFIG_NETCONSOLE=y
++CONFIG_USE_IPADDR=y
++CONFIG_IPADDR="192.168.1.1"
++CONFIG_USE_SERVERIP=y
++CONFIG_SERVERIP="192.168.1.254"
++CONFIG_REGMAP=y
++CONFIG_SYSCON=y
++CONFIG_BUTTON=y
++CONFIG_BUTTON_GPIO=y
++CONFIG_CLK=y
++CONFIG_GPIO_HOG=y
++# CONFIG_I2C is not set
++# CONFIG_MMC is not set
++CONFIG_LED=y
++CONFIG_LED_BLINK=y
++CONFIG_LED_GPIO=y
++CONFIG_MTD=y
++CONFIG_DM_MTD=y
++CONFIG_MTD_SPI_NAND=y
++CONFIG_MTD_UBI_FASTMAP=y
++CONFIG_PHY_FIXED=y
++CONFIG_MEDIATEK_ETH=y
++CONFIG_PHY=y
++CONFIG_PINCTRL=y
++CONFIG_PINCONF=y
++CONFIG_PINCTRL_MT7986=y
++CONFIG_POWER_DOMAIN=y
++CONFIG_MTK_POWER_DOMAIN=y
++CONFIG_DM_REGULATOR=y
++CONFIG_DM_REGULATOR_FIXED=y
++CONFIG_DM_REGULATOR_GPIO=y
++CONFIG_RAM=y
++CONFIG_DM_SERIAL=y
++CONFIG_MTK_SERIAL=y
++CONFIG_SPI=y
++CONFIG_DM_SPI=y
++CONFIG_MTK_SPIM=y
++CONFIG_RANDOM_UUID=y
++CONFIG_ZSTD=y
++CONFIG_HEXDUMP=y
++CONFIG_LMB_MAX_REGIONS=64
+--- /dev/null
++++ b/arch/arm/dts/mt7986b-mercusys_mr90x-v1.dts
+@@ -0,0 +1,174 @@
++// SPDX-License-Identifier: GPL-2.0
++/*
++ * Copyright (c) 2024
++ * Author: Mikhail Zhilkin <csharper2005@gmail.com>
++ */
++
++/dts-v1/;
++#include "mt7986.dtsi"
++#include <dt-bindings/gpio/gpio.h>
++#include <dt-bindings/input/linux-event-codes.h>
++
++/ {
++	#address-cells = <1>;
++	#size-cells = <1>;
++	model = "MERCUSYS MR90X v1";
++	compatible = "mediatek,mt7986", "mediatek,mt7986-rfb";
++
++	chosen {
++		stdout-path = &uart0;
++		tick-timer = &timer0;
++	};
++
++	memory@40000000 {
++		device_type = "memory";
++		reg = <0x40000000 0x20000000>;
++	};
++
++	keys {
++		compatible = "gpio-keys";
++
++		reset {
++			label = "reset";
++			linux,code = <KEY_RESTART>;
++			gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
++		};
++	};
++
++	leds {
++		compatible = "gpio-leds";
++
++		led-0 {
++			label = "green:lan2";
++			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
++		};
++
++		led-1 {
++			label = "green:lan1";
++			gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
++		};
++
++		led-2 {
++			label = "green:lan0";
++			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
++		};
++
++		led-3 {
++			label = "green:wan";
++			gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
++		};
++
++		led-4 {
++			label = "amber:status";
++			gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
++		};
++
++		led_status_green: led-5 {
++			label = "green:status";
++			gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;
++		};
++	};
++};
++
++&uart0 {
++	status = "okay";
++};
++
++&uart1 {
++	pinctrl-names = "default";
++	pinctrl-0 = <&uart1_pins>;
++	status = "disabled";
++};
++
++&eth {
++	status = "okay";
++	mediatek,gmac-id = <0>;
++	phy-mode = "2500base-x";
++	mediatek,switch = "mt7531";
++	reset-gpios = <&gpio 5 GPIO_ACTIVE_HIGH>;
++
++	fixed-link {
++		speed = <2500>;
++		full-duplex;
++	};
++};
++
++&pinctrl {
++	spi_flash_pins: spi0-pins-func-1 {
++		mux {
++			function = "flash";
++			groups = "spi0", "spi0_wp_hold";
++		};
++
++		conf-pu {
++			pins = "SPI2_CS", "SPI2_HOLD", "SPI2_WP";
++			drive-strength = <MTK_DRIVE_8mA>;
++			bias-pull-up = <MTK_PUPD_SET_R1R0_00>;
++		};
++
++		conf-pd {
++			pins = "SPI2_CLK", "SPI2_MOSI", "SPI2_MISO";
++			drive-strength = <MTK_DRIVE_8mA>;
++			bias-pull-down = <MTK_PUPD_SET_R1R0_00>;
++		};
++	};
++
++	spic_pins: spi1-pins-func-1 {
++		mux {
++			function = "spi";
++			groups = "spi1_2";
++		};
++	};
++
++	uart1_pins: spi1-pins-func-3 {
++		mux {
++			function = "uart";
++			groups = "uart1_2";
++		};
++	};
++};
++
++&spi0 {
++	#address-cells = <1>;
++	#size-cells = <0>;
++	pinctrl-names = "default";
++	pinctrl-0 = <&spi_flash_pins>;
++	status = "okay";
++	must_tx;
++	enhance_timing;
++	dma_ext;
++	ipm_design;
++	tick_dly = <2>;
++	sample_sel = <0>;
++
++	spi_nand@1 {
++		compatible = "spi-nand";
++		reg = <1>;
++		spi-max-frequency = <20000000>;
++
++		partitions {
++			compatible = "fixed-partitions";
++			#address-cells = <1>;
++			#size-cells = <1>;
++
++			partition@0 {
++				reg = <0x0 0x100000>;
++				label = "bl2";
++			};
++
++			partition@100000 {
++				reg = <0x100000 0x100000>;
++				label = "factory";
++			};
++
++			partition@200000 {
++				reg = <0x200000 0x7e00000>;
++				label = "ubi";
++			};
++		};
++	};
++};
++
++&watchdog {
++	status = "disabled";
++};
+--- /dev/null
++++ b/mercusys_mr90x-v1_env
+@@ -0,0 +1,53 @@
++ipaddr=192.168.1.1
++serverip=192.168.1.254
++loadaddr=0x46000000
++console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
++bootargs=console=ttyS0,115200n8 console_msg_format=syslog
++bootcmd=run check_buttons ; run boot_production ; run boot_recovery
++bootconf=config-1
++bootdelay=0
++bootfile=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-initramfs-recovery.itb
++bootfile_bl2=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-preloader.bin
++bootfile_fip=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-bl31-uboot.fip
++bootfile_upg=openwrt-mediatek-filogic-mercusys_mr90x-v1-ubi-squashfs-sysupgrade.itb
++bootmenu_confirm_return=askenv - Press ENTER to return to menu ; bootmenu 60
++bootmenu_default=0
++bootmenu_delay=0
++bootmenu_title=      ( ( ( OpenWrt ) ) )  [SPI-NAND]
++bootmenu_0=Initialize environment.=run _firstboot
++bootmenu_0d=Run default boot command.=run boot_default
++bootmenu_1=Boot system via TFTP.=run boot_tftp ; run bootmenu_confirm_return
++bootmenu_2=Boot production system from NAND.=run boot_production ; run bootmenu_confirm_return
++bootmenu_3=Boot recovery system from NAND.=run boot_recovery ; run bootmenu_confirm_return
++bootmenu_4=Load production system via TFTP then write to NAND.=noboot=1 ; replacevol=1 ; run boot_tftp_production ; noboot= ; replacevol= ; run bootmenu_confirm_return
++bootmenu_5=Load recovery system via TFTP then write to NAND.=noboot=1 ; replacevol=1 ; run boot_tftp_recovery ; noboot= ; replacevol= ; run bootmenu_confirm_return
++bootmenu_6=Load BL31+U-Boot FIP via TFTP then write to NAND.=run boot_tftp_write_fip ; run bootmenu_confirm_return
++bootmenu_7=Load BL2 preloader via TFTP then write to NAND.=run boot_tftp_write_bl2 ; run bootmenu_confirm_return
++bootmenu_8=Reboot.=reset
++bootmenu_9=Reset all settings to factory defaults.=run reset_factory ; reset
++boot_default=run led_boot ; run bootcmd ; run boot_recovery ; replacevol=1 ; run boot_tftp_forever
++boot_production=run led_boot ; run ubi_read_production && bootm $loadaddr#$bootconf
++boot_recovery=run led_boot ; run ubi_read_recovery && bootm $loadaddr#$bootconf
++boot_tftp=run led_boot ; tftpboot $loadaddr $bootfile && bootm $loadaddr#$bootconf
++boot_tftp_forever=run led_boot ; while true ; do run boot_tftp ; sleep 1 ; done
++boot_tftp_production=run led_boot ; tftpboot $loadaddr $bootfile_upg && test $replacevol = 1 && iminfo $loadaddr && run ubi_write_production ; if test $noboot = 1 ; then else bootm $loadaddr#$bootconf ; fi
++boot_tftp_recovery=run led_boot ; tftpboot $loadaddr $bootfile && test $replacevol = 1 && iminfo $loadaddr && run ubi_write_recovery ; if test $noboot = 1 ; then else bootm $loadaddr#$bootconf ; fi
++boot_tftp_write_fip=run led_boot ; tftpboot $loadaddr $bootfile_fip && run ubi_write_fip && run reset_factory
++boot_tftp_write_bl2=run led_boot ; tftpboot $loadaddr $bootfile_bl2 && run snand_write_bl2
++check_buttons=if button reset ; then run boot_tftp ; fi
++ethaddr_factory=mtd read factory 0x40080000 0x0 0x20000 && env readmem -b ethaddr 0x40088000 0x6 ; setenv ethaddr_factory
++led_boot=led green:status off ; led amber:status on
++reset_factory=mw $loadaddr 0xff 0x1f000 ; ubi write $loadaddr ubootenv 0x1f000 ; ubi write $loadaddr ubootenv2 0x1f000 ; ubi remove rootfs_data
++snand_write_bl2=mtd erase bl2 && mtd write bl2 $loadaddr 0x0 0x40000
++ubi_create_env=ubi check ubootenv || ubi create ubootenv 0x1f000 dynamic ; ubi check ubootenv2 || ubi create ubootenv2 0x1f000 dynamic
++ubi_prepare_rootfs=if ubi check rootfs_data ; then else if env exists rootfs_data_max ; then ubi create rootfs_data $rootfs_data_max dynamic || ubi create rootfs_data - dynamic ; else ubi create rootfs_data - dynamic ; fi ; fi
++ubi_read_production=ubi read $loadaddr fit && iminfo $loadaddr && run ubi_prepare_rootfs
++ubi_read_recovery=ubi check recovery && ubi read $loadaddr recovery
++ubi_remove_rootfs=ubi check rootfs_data && ubi remove rootfs_data
++ubi_write_fip=run ubi_remove_rootfs ; ubi check fip && ubi remove fip ; ubi create fip $filesize static && ubi write $loadaddr fip $filesize
++ubi_write_production=ubi check fit && ubi remove fit ; run ubi_remove_rootfs ; ubi create fit $filesize dynamic && ubi write $loadaddr fit $filesize
++ubi_write_recovery=ubi check recovery && ubi remove recovery ; run ubi_remove_rootfs ; ubi create recovery $filesize dynamic && ubi write $loadaddr recovery $filesize
++_init_env=setenv _init_env ; run ubi_create_env ; saveenv ; saveenv
++_firstboot=setenv _firstboot ; run ethaddr_factory ; run _switch_to_menu ; run _init_env ; bootmenu
++_switch_to_menu=setenv _switch_to_menu ; setenv bootdelay 3 ; setenv bootmenu_delay 3 ; setenv bootmenu_0 $bootmenu_0d ; setenv bootmenu_0d ; run _bootmenu_update_title
++_bootmenu_update_title=setenv _bootmenu_update_title ; setenv bootmenu_title "$bootmenu_title       $ver"

package/firmware/lantiq/dsl-vrx200-firmware-xdsl/Makefile

@@ -40,7 +40,7 @@ define Package/dsl-vrx200-firmware-xdsl-a
   CATEGORY:=Firmware
   TITLE:=VRX200 / VR9 CPE xDSL Annex A firmware
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy)
 endef
 
 define Package/dsl-vrx200-firmware-xdsl-a/description
@@ -52,7 +52,7 @@ define Package/dsl-vrx200-firmware-xdsl-b
   CATEGORY:=Firmware
   TITLE:=VRX200 / VR9 CPE xDSL Annex B firmware
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy)
 endef
 
 define Package/dsl-vrx200-firmware-xdsl-b/description
@@ -64,7 +64,7 @@ define Package/dsl-vrx200-firmware-xdsl-a-patch
   CATEGORY:=Firmware
   TITLE:=VRX200 / VR9 CPE xDSL Annex B to Annex A firmware patch
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200 +dsl-vrx200-firmware-xdsl-b +bspatch
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +dsl-vrx200-firmware-xdsl-b +bspatch
 endef
 
 define Package/dsl-vrx200-firmware-xdsl-a-patch/description
@@ -76,7 +76,7 @@ define Package/dsl-vrx200-firmware-xdsl-b-patch
   CATEGORY:=Firmware
   TITLE:=VRX200 / VR9 CPE xDSL Annex A to Annex B firmware patch
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200 +dsl-vrx200-firmware-xdsl-a +bspatch
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +dsl-vrx200-firmware-xdsl-a +bspatch
 endef
 
 define Package/dsl-vrx200-firmware-xdsl-b-patch/description

package/firmware/linux-firmware/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=linux-firmware
-PKG_VERSION:=20241017
+PKG_VERSION:=20241110
 PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=a26c38ef5a83272f2b98ce8bf8ca1865a852a3deea49ce5a8dd804b914351273
+PKG_HASH:=32e6d3eb5c7fcb69fe5d58976c6deafa0d6552719c6e74835064aff049d25bd7
 
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 

package/firmware/linux-firmware/qca_ath11k.mk

@@ -10,7 +10,11 @@ Package/ath11k-firmware-wcn6750 = $(call Package/firmware-default,WCN6750 ath11k
 define Package/ath11k-firmware-wcn6750/install
 	$(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6750/hw1.0
 	$(INSTALL_DATA) \
-		$(PKG_BUILD_DIR)/ath11k/WCN6750/hw1.0/* $(1)/lib/firmware/ath11k/WCN6750/hw1.0/
+		$(PKG_BUILD_DIR)/ath11k/WCN6750/hw1.0/board-2.bin $(1)/lib/firmware/ath11k/WCN6750/hw1.0/
+	$(INSTALL_DATA) \
+		$(PKG_BUILD_DIR)/ath11k/WCN6750/hw1.0/Notice.txt $(1)/lib/firmware/ath11k/WCN6750/hw1.0/
+	$(INSTALL_DATA) \
+	        $(PKG_BUILD_DIR)/ath11k/WCN6750/hw1.0/sc7280/wpss.mbn $(1)/lib/firmware/ath11k/WCN6750/hw1.0/
 endef
 $(eval $(call BuildPackage,ath11k-firmware-wcn6750))
 

package/firmware/linux-firmware/realtek.mk

@@ -140,6 +140,20 @@ define Package/rtl8761bu-firmware/install
 endef
 $(eval $(call BuildPackage,rtl8761bu-firmware))
 
+Package/rtl8812a-firmware = $(call Package/firmware-default,RealTek RTL8812AU firmware)
+define Package/rtl8812a-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/rtw88
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtw88/rtw8812a_fw.bin $(1)/lib/firmware/rtw88
+endef
+$(eval $(call BuildPackage,rtl8812a-firmware))
+
+Package/rtl8821a-firmware = $(call Package/firmware-default,RealTek RTL8821AU firmware)
+define Package/rtl8821a-firmware/install
+	$(INSTALL_DIR) $(1)/lib/firmware/rtw88
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/rtw88/rtw8821a_fw.bin $(1)/lib/firmware/rtw88
+endef
+$(eval $(call BuildPackage,rtl8821a-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

package/kernel/lantiq/ltq-atm/Makefile

@@ -33,7 +33,7 @@ endef
 KernelPackage/ltq-atm-danube=$(call KernelPackage/ltq-atm-template,danube,(TARGET_lantiq_xway||TARGET_lantiq_xway_legacy))
 KernelPackage/ltq-atm-ar9=$(call KernelPackage/ltq-atm-template,ar9,TARGET_lantiq_xway)
 KernelPackage/ltq-atm-ase=$(call KernelPackage/ltq-atm-template,ase,TARGET_lantiq_ase)
-KernelPackage/ltq-atm-vr9=$(call KernelPackage/ltq-atm-template,vr9,TARGET_lantiq_xrx200)
+KernelPackage/ltq-atm-vr9=$(call KernelPackage/ltq-atm-template,vr9,(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy))
 
 define Build/Configure
 endef

package/kernel/lantiq/ltq-deu/Makefile

@@ -21,14 +21,14 @@ define KernelPackage/ltq-deu-template
   TITLE:=deu driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_$(2) +kmod-crypto-manager +kmod-crypto-des
+  DEPENDS:=@$(2) +kmod-crypto-manager +kmod-crypto-des
   FILES:=$(PKG_BUILD_DIR)/ltq_deu_$(1).ko
   AUTOLOAD:=$(call AutoProbe,ltq_deu_$(1))
 endef
 
-KernelPackage/ltq-deu-danube=$(call KernelPackage/ltq-deu-template,danube,xway)
-KernelPackage/ltq-deu-ar9=$(call KernelPackage/ltq-deu-template,ar9,xway)
-KernelPackage/ltq-deu-vr9=$(call KernelPackage/ltq-deu-template,vr9,xrx200)
+KernelPackage/ltq-deu-danube=$(call KernelPackage/ltq-deu-template,danube,TARGET_lantiq_xway)
+KernelPackage/ltq-deu-ar9=$(call KernelPackage/ltq-deu-template,ar9,TARGET_lantiq_xway)
+KernelPackage/ltq-deu-vr9=$(call KernelPackage/ltq-deu-template,vr9,(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy))
 
 define Build/Configure
 endef

package/kernel/lantiq/ltq-ptm/Makefile

@@ -22,7 +22,7 @@ define KernelPackage/ltq-ptm-template
   TITLE:=ptm driver for $(1)
   URL:=http://www.lantiq.com/
   VARIANT:=$(1)
-  DEPENDS:=@TARGET_lantiq_$(2)
+  DEPENDS:=@$(2)
 ifeq ($(1),vr9)
   DEPENDS+= +PACKAGE_kmod-ltq-ptm-$(1):kmod-ltq-vdsl-vr9-mei
 else
@@ -34,10 +34,10 @@ endif
   FILES:=$(PKG_BUILD_DIR)/ltq_ptm_$(1).ko 
 endef
 
-KernelPackage/ltq-ptm-danube=$(call KernelPackage/ltq-ptm-template,danube,xway)
-KernelPackage/ltq-ptm-ar9=$(call KernelPackage/ltq-ptm-template,ar9,xway)
-KernelPackage/ltq-ptm-ase=$(call KernelPackage/ltq-ptm-template,ase,ase)
-KernelPackage/ltq-ptm-vr9=$(call KernelPackage/ltq-ptm-template,vr9,xrx200)
+KernelPackage/ltq-ptm-danube=$(call KernelPackage/ltq-ptm-template,danube,TARGET_lantiq_xway)
+KernelPackage/ltq-ptm-ar9=$(call KernelPackage/ltq-ptm-template,ar9,TARGET_lantiq_xway)
+KernelPackage/ltq-ptm-ase=$(call KernelPackage/ltq-ptm-template,ase,TARGET_lantiq_ase)
+KernelPackage/ltq-ptm-vr9=$(call KernelPackage/ltq-ptm-template,vr9,(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy))
 
 define Build/Configure
 endef

package/kernel/lantiq/ltq-vdsl-fw/Makefile

@@ -19,7 +19,7 @@ define Package/ltq-vdsl-vr9-vectoring-fw-installer
   TITLE:=VDSL2 Vectoring Firmware installer
   SECTION:=net
   CATEGORY:=Network
-  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-vdsl-vr9
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +kmod-ltq-vdsl-vr9
 endef
 
 define Build/Prepare

package/kernel/lantiq/ltq-vdsl-vr9-mei/Makefile

@@ -29,7 +29,7 @@ define KernelPackage/ltq-vdsl-vr9-mei
   TITLE:=mei driver for vdsl
   SECTION:=sys
   SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-ifxos +kmod-ltq-vectoring
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +kmod-ltq-ifxos +kmod-ltq-vectoring
   FILES:=$(PKG_BUILD_DIR)/src/drv_mei_cpe.ko
   AUTOLOAD:=$(call AutoLoad,50,drv_mei_cpe)
 endef
@@ -44,7 +44,7 @@ define Package/ltq-vdsl-vr9-mei-test
   CATEGORY:=Network
   TITLE:=Lantiq mei driver test tool
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy)
 endef
 
 define Package/ltq-vdsl-vr9-mei-test/description

package/kernel/lantiq/ltq-vdsl-vr9/Makefile

@@ -29,7 +29,7 @@ define KernelPackage/ltq-vdsl-vr9
   TITLE:=vdsl driver
   SECTION:=sys
   SUBMENU:=Network Devices
-  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-vdsl-vr9-mei
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +kmod-ltq-vdsl-vr9-mei
   FILES:=$(PKG_BUILD_DIR)/src/drv_dsl_cpe_api.ko
   AUTOLOAD:=$(call AutoLoad,51,drv_dsl_cpe_api)
 endef

package/kernel/lantiq/ltq-vectoring/Makefile

@@ -20,7 +20,7 @@ define KernelPackage/ltq-vectoring
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=driver for sending vectoring error samples
-  DEPENDS:=@TARGET_lantiq_xrx200
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy)
   FILES:=$(PKG_BUILD_DIR)/$(MAKE_PATH)/ltq_vectoring.ko
   AUTOLOAD:=$(call AutoLoad,49,ltq_vectoring)
 endef
@@ -38,7 +38,7 @@ define KernelPackage/ltq-vectoring-test
   CATEGORY:=Kernel modules
   SUBMENU:=Network Devices
   TITLE:=driver for testing the vectoring driver
-  DEPENDS:=@TARGET_lantiq_xrx200 +kmod-ltq-vectoring
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +kmod-ltq-vectoring
   FILES:=$(PKG_BUILD_DIR)/$(MAKE_PATH)/ltq_vectoring_test.ko
 endef
 

package/kernel/mac80211/patches/rtl/001-v6.12-wifi-rtw88-Set-efuse-ext_lna_5g-fix-typo.patch

@@ -0,0 +1,30 @@
+From 8fbcaa308591b91e9037ab6a8d733873b749a70d Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Sat, 6 Jul 2024 01:40:58 +0300
+Subject: [PATCH] wifi: rtw88: Set efuse->ext_lna_5g - fix typo
+
+efuse->ext_lna_2g is set twice and efuse->ext_lna_5g is not set at all.
+Set each one once.
+
+Nothing uses these members right now. They will be used by the RTL8821AU
+and RTL8812AU drivers.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/8ccc9e13-0d45-417d-8f88-93a0ad294f77@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -2006,7 +2006,7 @@ static int rtw_chip_efuse_info_setup(str
+ 	efuse->ext_pa_2g = efuse->pa_type_2g & BIT(4) ? 1 : 0;
+ 	efuse->ext_lna_2g = efuse->lna_type_2g & BIT(3) ? 1 : 0;
+ 	efuse->ext_pa_5g = efuse->pa_type_5g & BIT(0) ? 1 : 0;
+-	efuse->ext_lna_2g = efuse->lna_type_5g & BIT(3) ? 1 : 0;
++	efuse->ext_lna_5g = efuse->lna_type_5g & BIT(3) ? 1 : 0;
+ 
+ 	if (!is_valid_ether_addr(efuse->addr)) {
+ 		eth_random_addr(efuse->addr);

package/kernel/mac80211/patches/rtl/002-v6.12-wifi-rtw88-usb-Support-USB-3-with-RTL8822CU-RTL8822B.patch

@@ -0,0 +1,284 @@
+From 315c23a64e99552502dd4d18d6ddc073fad9a7c3 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Thu, 11 Jul 2024 01:11:33 +0300
+Subject: [PATCH] wifi: rtw88: usb: Support USB 3 with RTL8822CU/RTL8822BU
+
+The Realtek wifi 5 devices which support USB 3 are weird: when first
+plugged in, they pretend to be USB 2. The driver needs to send some
+commands to the device, which make it disappear and come back as a
+USB 3 device.
+
+Implement the required commands in rtw88.
+
+When a USB 3 device is plugged into a USB 2 port, rtw88 will try to
+switch it to USB 3 mode only once. The device will disappear and come
+back still in USB 2 mode, of course.
+
+Some people experience heavy interference in the 2.4 GHz band in
+USB 3 mode, so add a module parameter switch_usb_mode with the
+default value 1 to let people disable the switching.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/77906c62-5674-426f-bde1-1b2a12a0339d@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/debug.h    |  1 +
+ drivers/net/wireless/realtek/rtw88/main.h     |  2 +
+ drivers/net/wireless/realtek/rtw88/reg.h      | 11 +++
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822b.h |  4 +-
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.h | 24 +++---
+ drivers/net/wireless/realtek/rtw88/usb.c      | 84 +++++++++++++++++++
+ 8 files changed, 116 insertions(+), 12 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/debug.h
++++ b/drivers/net/wireless/realtek/rtw88/debug.h
+@@ -25,6 +25,7 @@ enum rtw_debug_mask {
+ 	RTW_DBG_HW_SCAN		= 0x00010000,
+ 	RTW_DBG_STATE		= 0x00020000,
+ 	RTW_DBG_SDIO		= 0x00040000,
++	RTW_DBG_USB		= 0x00080000,
+ 
+ 	RTW_DBG_UNEXP		= 0x80000000,
+ 	RTW_DBG_ALL		= 0xffffffff
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1785,6 +1785,8 @@ struct rtw_efuse {
+ 	bool share_ant;
+ 	u8 bt_setting;
+ 
++	u8 usb_mode_switch;
++
+ 	struct {
+ 		u8 hci;
+ 		u8 bw;
+--- a/drivers/net/wireless/realtek/rtw88/reg.h
++++ b/drivers/net/wireless/realtek/rtw88/reg.h
+@@ -15,6 +15,7 @@
+ #define BIT_WLOCK_1C_B6		BIT(5)
+ #define REG_SYS_PW_CTRL		0x0004
+ #define BIT_PFM_WOWL		BIT(3)
++#define BIT_APFM_OFFMAC		BIT(9)
+ #define REG_SYS_CLK_CTRL	0x0008
+ #define BIT_CPU_CLK_EN		BIT(14)
+ 
+@@ -133,6 +134,14 @@
+ #define REG_PMC_DBG_CTRL1	0xa8
+ #define BITS_PMC_BT_IQK_STS	GENMASK(22, 21)
+ 
++#define REG_PAD_CTRL2		0x00C4
++#define BIT_RSM_EN_V1		BIT(16)
++#define BIT_NO_PDN_CHIPOFF_V1	BIT(17)
++#define BIT_MASK_USB23_SW_MODE_V1	GENMASK(19, 18)
++#define BIT_USB3_USB2_TRANSITION	BIT(20)
++#define BIT_USB_MODE_U2		1
++#define BIT_USB_MODE_U3		2
++
+ #define REG_EFUSE_ACCESS	0x00CF
+ #define EFUSE_ACCESS_ON		0x69
+ #define EFUSE_ACCESS_OFF	0x00
+@@ -568,6 +577,8 @@
+ #define BIT_WL_SECURITY_CLK	BIT(15)
+ #define BIT_DDMA_EN		BIT(8)
+ 
++#define REG_SW_MDIO		0x10C0
++
+ #define REG_H2C_PKT_READADDR	0x10D0
+ #define REG_H2C_PKT_WRITEADDR	0x10D4
+ #define REG_FW_DBG6		0x10F8
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -46,6 +46,7 @@ static int rtw8822b_read_efuse(struct rt
+ 
+ 	map = (struct rtw8822b_efuse *)log_map;
+ 
++	efuse->usb_mode_switch = u8_get_bits(map->usb_mode, BIT(7));
+ 	efuse->rfe_option = map->rfe_option;
+ 	efuse->rf_board_option = map->rf_board_option;
+ 	efuse->crystal_cap = map->xtal_k;
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.h
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.h
+@@ -72,7 +72,9 @@ struct rtw8822bs_efuse {
+ 
+ struct rtw8822b_efuse {
+ 	__le16 rtl_id;
+-	u8 res0[0x0e];
++	u8 res0[4];
++	u8 usb_mode;
++	u8 res1[0x09];
+ 
+ 	/* power index for four RF paths */
+ 	struct rtw_txpwr_idx txpwr_idx_table[4];
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -49,6 +49,7 @@ static int rtw8822c_read_efuse(struct rt
+ 
+ 	map = (struct rtw8822c_efuse *)log_map;
+ 
++	efuse->usb_mode_switch = u8_get_bits(map->usb_mode, BIT(7));
+ 	efuse->rfe_option = map->rfe_option;
+ 	efuse->rf_board_option = map->rf_board_option;
+ 	efuse->crystal_cap = map->xtal_k & XCAP_MASK;
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.h
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.h
+@@ -59,16 +59,18 @@ struct rtw8822ce_efuse {
+ 
+ struct rtw8822c_efuse {
+ 	__le16 rtl_id;
+-	u8 res0[0x0e];
++	u8 res0[4];
++	u8 usb_mode;
++	u8 res1[0x09];
+ 
+ 	/* power index for four RF paths */
+ 	struct rtw_txpwr_idx txpwr_idx_table[4];
+ 
+ 	u8 channel_plan;		/* 0xb8 */
+ 	u8 xtal_k;
+-	u8 res1;
++	u8 res2;
+ 	u8 iqk_lck;
+-	u8 res2[5];			/* 0xbc */
++	u8 res3[5];			/* 0xbc */
+ 	u8 rf_board_option;
+ 	u8 rf_feature_option;
+ 	u8 rf_bt_setting;
+@@ -80,21 +82,21 @@ struct rtw8822c_efuse {
+ 	u8 rf_antenna_option;		/* 0xc9 */
+ 	u8 rfe_option;
+ 	u8 country_code[2];
+-	u8 res3[3];
++	u8 res4[3];
+ 	u8 path_a_thermal;		/* 0xd0 */
+ 	u8 path_b_thermal;
+-	u8 res4[2];
++	u8 res5[2];
+ 	u8 rx_gain_gap_2g_ofdm;
+-	u8 res5;
+-	u8 rx_gain_gap_2g_cck;
+ 	u8 res6;
+-	u8 rx_gain_gap_5gl;
++	u8 rx_gain_gap_2g_cck;
+ 	u8 res7;
+-	u8 rx_gain_gap_5gm;
++	u8 rx_gain_gap_5gl;
+ 	u8 res8;
+-	u8 rx_gain_gap_5gh;
++	u8 rx_gain_gap_5gm;
+ 	u8 res9;
+-	u8 res10[0x42];
++	u8 rx_gain_gap_5gh;
++	u8 res10;
++	u8 res11[0x42];
+ 	union {
+ 		struct rtw8822ce_efuse e;
+ 		struct rtw8822cu_efuse u;
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -14,6 +14,11 @@
+ #include "ps.h"
+ #include "usb.h"
+ 
++static bool rtw_switch_usb_mode = true;
++module_param_named(switch_usb_mode, rtw_switch_usb_mode, bool, 0644);
++MODULE_PARM_DESC(switch_usb_mode,
++		 "Set to N to disable switching to USB 3 mode to avoid potential interference in the 2.4 GHz band (default: Y)");
++
+ #define RTW_USB_MAX_RXQ_LEN	512
+ 
+ struct rtw_usb_txcb {
+@@ -841,6 +846,77 @@ static void rtw_usb_intf_deinit(struct r
+ 	usb_set_intfdata(intf, NULL);
+ }
+ 
++static int rtw_usb_switch_mode_new(struct rtw_dev *rtwdev)
++{
++	enum usb_device_speed cur_speed;
++	u8 id = rtwdev->chip->id;
++	bool can_switch;
++	u32 pad_ctrl2;
++
++	if (rtw_read8(rtwdev, REG_SYS_CFG2 + 3) == 0x20)
++		cur_speed = USB_SPEED_SUPER;
++	else
++		cur_speed = USB_SPEED_HIGH;
++
++	if (cur_speed == USB_SPEED_SUPER)
++		return 0;
++
++	pad_ctrl2 = rtw_read32(rtwdev, REG_PAD_CTRL2);
++
++	can_switch = !!(pad_ctrl2 & (BIT_MASK_USB23_SW_MODE_V1 |
++				     BIT_USB3_USB2_TRANSITION));
++
++	if (!can_switch) {
++		rtw_dbg(rtwdev, RTW_DBG_USB,
++			"Switching to USB 3 mode unsupported by the chip\n");
++		return 0;
++	}
++
++	/* At this point cur_speed is USB_SPEED_HIGH. If we already tried
++	 * to switch don't try again - it's a USB 2 port.
++	 */
++	if (u32_get_bits(pad_ctrl2, BIT_MASK_USB23_SW_MODE_V1) == BIT_USB_MODE_U3)
++		return 0;
++
++	/* Enable IO wrapper timeout */
++	if (id == RTW_CHIP_TYPE_8822B || id == RTW_CHIP_TYPE_8821C)
++		rtw_write8_clr(rtwdev, REG_SW_MDIO + 3, BIT(0));
++
++	u32p_replace_bits(&pad_ctrl2, BIT_USB_MODE_U3, BIT_MASK_USB23_SW_MODE_V1);
++	pad_ctrl2 |= BIT_RSM_EN_V1;
++
++	rtw_write32(rtwdev, REG_PAD_CTRL2, pad_ctrl2);
++	rtw_write8(rtwdev, REG_PAD_CTRL2 + 1, 4);
++
++	rtw_write16_set(rtwdev, REG_SYS_PW_CTRL, BIT_APFM_OFFMAC);
++	usleep_range(1000, 1001);
++	rtw_write32_set(rtwdev, REG_PAD_CTRL2, BIT_NO_PDN_CHIPOFF_V1);
++
++	return 1;
++}
++
++static int rtw_usb_switch_mode(struct rtw_dev *rtwdev)
++{
++	u8 id = rtwdev->chip->id;
++
++	if (id != RTW_CHIP_TYPE_8822C && id != RTW_CHIP_TYPE_8822B)
++		return 0;
++
++	if (!rtwdev->efuse.usb_mode_switch) {
++		rtw_dbg(rtwdev, RTW_DBG_USB,
++			"Switching to USB 3 mode disabled by chip's efuse\n");
++		return 0;
++	}
++
++	if (!rtw_switch_usb_mode) {
++		rtw_dbg(rtwdev, RTW_DBG_USB,
++			"Switching to USB 3 mode disabled by module parameter\n");
++		return 0;
++	}
++
++	return rtw_usb_switch_mode_new(rtwdev);
++}
++
+ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)
+ {
+ 	struct rtw_dev *rtwdev;
+@@ -896,6 +972,14 @@ int rtw_usb_probe(struct usb_interface *
+ 		goto err_destroy_rxwq;
+ 	}
+ 
++	ret = rtw_usb_switch_mode(rtwdev);
++	if (ret) {
++		/* Not a fail, but we do need to skip rtw_register_hw. */
++		rtw_dbg(rtwdev, RTW_DBG_USB, "switching to USB 3 mode\n");
++		ret = 0;
++		goto err_destroy_rxwq;
++	}
++
+ 	ret = rtw_register_hw(rtwdev, rtwdev->hw);
+ 	if (ret) {
+ 		rtw_err(rtwdev, "failed to register hw\n");

package/kernel/mac80211/patches/rtl/004-v6.12-wifi-rtw88-debugfs-support-multiple-adapters-debuggi.patch

@@ -0,0 +1,454 @@
+From 8db6c1ca64664ef9b071e6eeb646023ac5b240a8 Mon Sep 17 00:00:00 2001
+From: Ping-Ke Shih <pkshih@realtek.com>
+Date: Thu, 18 Jul 2024 14:41:55 +0800
+Subject: [PATCH] wifi: rtw88: debugfs: support multiple adapters debugging
+
+Originally in order to read partial registers from large area, we write
+a range value stored into a static variable and read registers according
+to the static variable.
+
+However, if we install more than one adapters supported by this driver,
+the static variables will be overwritten by latter adapters. To resolve
+the problem, move the static variables to struct rtw_dev for each adapter.
+
+With changes, smatch spends too much time to parse rtw_debugfs_init():
+    debug.c:1289 rtw_debugfs_init() parse error: turning off implications
+    after 60 seconds
+Move stuffs of adding debugfs entries to three rtw_debugfs_add_xxx()
+functions.
+
+Reported-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Closes: https://lore.kernel.org/linux-wireless/cd6a2acf3c2c36d938b40140b52a779516f446a9.camel@realtek.com/T/#m27662022c70d9f893ba96f6c6a8dd8fce2434dfe
+Tested-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/20240718064155.38955-1-pkshih@realtek.com
+---
+ drivers/net/wireless/realtek/rtw88/debug.c | 303 ++++++++++++---------
+ drivers/net/wireless/realtek/rtw88/debug.h |   2 +
+ drivers/net/wireless/realtek/rtw88/main.c  |   1 +
+ drivers/net/wireless/realtek/rtw88/main.h  |   3 +-
+ 4 files changed, 180 insertions(+), 129 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/debug.c
++++ b/drivers/net/wireless/realtek/rtw88/debug.c
+@@ -43,6 +43,62 @@ struct rtw_debugfs_priv {
+ 	};
+ };
+ 
++struct rtw_debugfs {
++	struct rtw_debugfs_priv mac_0;
++	struct rtw_debugfs_priv mac_1;
++	struct rtw_debugfs_priv mac_2;
++	struct rtw_debugfs_priv mac_3;
++	struct rtw_debugfs_priv mac_4;
++	struct rtw_debugfs_priv mac_5;
++	struct rtw_debugfs_priv mac_6;
++	struct rtw_debugfs_priv mac_7;
++	struct rtw_debugfs_priv mac_10;
++	struct rtw_debugfs_priv mac_11;
++	struct rtw_debugfs_priv mac_12;
++	struct rtw_debugfs_priv mac_13;
++	struct rtw_debugfs_priv mac_14;
++	struct rtw_debugfs_priv mac_15;
++	struct rtw_debugfs_priv mac_16;
++	struct rtw_debugfs_priv mac_17;
++	struct rtw_debugfs_priv bb_8;
++	struct rtw_debugfs_priv bb_9;
++	struct rtw_debugfs_priv bb_a;
++	struct rtw_debugfs_priv bb_b;
++	struct rtw_debugfs_priv bb_c;
++	struct rtw_debugfs_priv bb_d;
++	struct rtw_debugfs_priv bb_e;
++	struct rtw_debugfs_priv bb_f;
++	struct rtw_debugfs_priv bb_18;
++	struct rtw_debugfs_priv bb_19;
++	struct rtw_debugfs_priv bb_1a;
++	struct rtw_debugfs_priv bb_1b;
++	struct rtw_debugfs_priv bb_1c;
++	struct rtw_debugfs_priv bb_1d;
++	struct rtw_debugfs_priv bb_1e;
++	struct rtw_debugfs_priv bb_1f;
++	struct rtw_debugfs_priv bb_2c;
++	struct rtw_debugfs_priv bb_2d;
++	struct rtw_debugfs_priv bb_40;
++	struct rtw_debugfs_priv bb_41;
++	struct rtw_debugfs_priv rf_dump;
++	struct rtw_debugfs_priv tx_pwr_tbl;
++	struct rtw_debugfs_priv write_reg;
++	struct rtw_debugfs_priv h2c;
++	struct rtw_debugfs_priv rf_write;
++	struct rtw_debugfs_priv rf_read;
++	struct rtw_debugfs_priv read_reg;
++	struct rtw_debugfs_priv fix_rate;
++	struct rtw_debugfs_priv dump_cam;
++	struct rtw_debugfs_priv rsvd_page;
++	struct rtw_debugfs_priv phy_info;
++	struct rtw_debugfs_priv coex_enable;
++	struct rtw_debugfs_priv coex_info;
++	struct rtw_debugfs_priv edcca_enable;
++	struct rtw_debugfs_priv fw_crash;
++	struct rtw_debugfs_priv force_lowest_basic_rate;
++	struct rtw_debugfs_priv dm_cap;
++};
++
+ static const char * const rtw_dm_cap_strs[] = {
+ 	[RTW_DM_CAP_NA] = "NA",
+ 	[RTW_DM_CAP_TXGAPK] = "TXGAPK",
+@@ -524,7 +580,7 @@ static int rtw_debug_get_bb_page(struct
+ 	return 0;
+ }
+ 
+-static int rtw_debug_get_rf_dump(struct seq_file *m, void *v)
++static int rtw_debugfs_get_rf_dump(struct seq_file *m, void *v)
+ {
+ 	struct rtw_debugfs_priv *debugfs_priv = m->private;
+ 	struct rtw_dev *rtwdev = debugfs_priv->rtwdev;
+@@ -1074,139 +1130,102 @@ static int rtw_debugfs_get_dm_cap(struct
+ 	return 0;
+ }
+ 
+-#define rtw_debug_impl_mac(page, addr)				\
+-static struct rtw_debugfs_priv rtw_debug_priv_mac_ ##page = {	\
++#define rtw_debug_priv_mac(addr)				\
++{								\
+ 	.cb_read = rtw_debug_get_mac_page,			\
+ 	.cb_data = addr,					\
+ }
+ 
+-rtw_debug_impl_mac(0, 0x0000);
+-rtw_debug_impl_mac(1, 0x0100);
+-rtw_debug_impl_mac(2, 0x0200);
+-rtw_debug_impl_mac(3, 0x0300);
+-rtw_debug_impl_mac(4, 0x0400);
+-rtw_debug_impl_mac(5, 0x0500);
+-rtw_debug_impl_mac(6, 0x0600);
+-rtw_debug_impl_mac(7, 0x0700);
+-rtw_debug_impl_mac(10, 0x1000);
+-rtw_debug_impl_mac(11, 0x1100);
+-rtw_debug_impl_mac(12, 0x1200);
+-rtw_debug_impl_mac(13, 0x1300);
+-rtw_debug_impl_mac(14, 0x1400);
+-rtw_debug_impl_mac(15, 0x1500);
+-rtw_debug_impl_mac(16, 0x1600);
+-rtw_debug_impl_mac(17, 0x1700);
+-
+-#define rtw_debug_impl_bb(page, addr)			\
+-static struct rtw_debugfs_priv rtw_debug_priv_bb_ ##page = {	\
++#define rtw_debug_priv_bb(addr)					\
++{								\
+ 	.cb_read = rtw_debug_get_bb_page,			\
+ 	.cb_data = addr,					\
+ }
+ 
+-rtw_debug_impl_bb(8, 0x0800);
+-rtw_debug_impl_bb(9, 0x0900);
+-rtw_debug_impl_bb(a, 0x0a00);
+-rtw_debug_impl_bb(b, 0x0b00);
+-rtw_debug_impl_bb(c, 0x0c00);
+-rtw_debug_impl_bb(d, 0x0d00);
+-rtw_debug_impl_bb(e, 0x0e00);
+-rtw_debug_impl_bb(f, 0x0f00);
+-rtw_debug_impl_bb(18, 0x1800);
+-rtw_debug_impl_bb(19, 0x1900);
+-rtw_debug_impl_bb(1a, 0x1a00);
+-rtw_debug_impl_bb(1b, 0x1b00);
+-rtw_debug_impl_bb(1c, 0x1c00);
+-rtw_debug_impl_bb(1d, 0x1d00);
+-rtw_debug_impl_bb(1e, 0x1e00);
+-rtw_debug_impl_bb(1f, 0x1f00);
+-rtw_debug_impl_bb(2c, 0x2c00);
+-rtw_debug_impl_bb(2d, 0x2d00);
+-rtw_debug_impl_bb(40, 0x4000);
+-rtw_debug_impl_bb(41, 0x4100);
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_rf_dump = {
+-	.cb_read = rtw_debug_get_rf_dump,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_tx_pwr_tbl = {
+-	.cb_read = rtw_debugfs_get_tx_pwr_tbl,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_write_reg = {
+-	.cb_write = rtw_debugfs_set_write_reg,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_h2c = {
+-	.cb_write = rtw_debugfs_set_h2c,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_rf_write = {
+-	.cb_write = rtw_debugfs_set_rf_write,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_rf_read = {
+-	.cb_write = rtw_debugfs_set_rf_read,
+-	.cb_read = rtw_debugfs_get_rf_read,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_read_reg = {
+-	.cb_write = rtw_debugfs_set_read_reg,
+-	.cb_read = rtw_debugfs_get_read_reg,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_fix_rate = {
+-	.cb_write = rtw_debugfs_set_fix_rate,
+-	.cb_read = rtw_debugfs_get_fix_rate,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_dump_cam = {
+-	.cb_write = rtw_debugfs_set_single_input,
+-	.cb_read = rtw_debugfs_get_dump_cam,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_rsvd_page = {
+-	.cb_write = rtw_debugfs_set_rsvd_page,
+-	.cb_read = rtw_debugfs_get_rsvd_page,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_phy_info = {
+-	.cb_read = rtw_debugfs_get_phy_info,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_coex_enable = {
+-	.cb_write = rtw_debugfs_set_coex_enable,
+-	.cb_read = rtw_debugfs_get_coex_enable,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_coex_info = {
+-	.cb_read = rtw_debugfs_get_coex_info,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_edcca_enable = {
+-	.cb_write = rtw_debugfs_set_edcca_enable,
+-	.cb_read = rtw_debugfs_get_edcca_enable,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_fw_crash = {
+-	.cb_write = rtw_debugfs_set_fw_crash,
+-	.cb_read = rtw_debugfs_get_fw_crash,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_force_lowest_basic_rate = {
+-	.cb_write = rtw_debugfs_set_force_lowest_basic_rate,
+-	.cb_read = rtw_debugfs_get_force_lowest_basic_rate,
+-};
+-
+-static struct rtw_debugfs_priv rtw_debug_priv_dm_cap = {
+-	.cb_write = rtw_debugfs_set_dm_cap,
+-	.cb_read = rtw_debugfs_get_dm_cap,
++#define rtw_debug_priv_get(name)				\
++{								\
++	.cb_read = rtw_debugfs_get_ ##name,			\
++}
++
++#define rtw_debug_priv_set(name)				\
++{								\
++	.cb_write = rtw_debugfs_set_ ##name,			\
++}
++
++#define rtw_debug_priv_set_and_get(name)			\
++{								\
++	.cb_write = rtw_debugfs_set_ ##name,			\
++	.cb_read = rtw_debugfs_get_ ##name,			\
++}
++
++#define rtw_debug_priv_set_single_and_get(name)			\
++{								\
++	.cb_write = rtw_debugfs_set_single_input,		\
++	.cb_read = rtw_debugfs_get_ ##name,			\
++}
++
++static const struct rtw_debugfs rtw_debugfs_templ = {
++	.mac_0 = rtw_debug_priv_mac(0x0000),
++	.mac_1 = rtw_debug_priv_mac(0x0100),
++	.mac_2 = rtw_debug_priv_mac(0x0200),
++	.mac_3 = rtw_debug_priv_mac(0x0300),
++	.mac_4 = rtw_debug_priv_mac(0x0400),
++	.mac_5 = rtw_debug_priv_mac(0x0500),
++	.mac_6 = rtw_debug_priv_mac(0x0600),
++	.mac_7 = rtw_debug_priv_mac(0x0700),
++	.mac_10 = rtw_debug_priv_mac(0x1000),
++	.mac_11 = rtw_debug_priv_mac(0x1100),
++	.mac_12 = rtw_debug_priv_mac(0x1200),
++	.mac_13 = rtw_debug_priv_mac(0x1300),
++	.mac_14 = rtw_debug_priv_mac(0x1400),
++	.mac_15 = rtw_debug_priv_mac(0x1500),
++	.mac_16 = rtw_debug_priv_mac(0x1600),
++	.mac_17 = rtw_debug_priv_mac(0x1700),
++	.bb_8 = rtw_debug_priv_bb(0x0800),
++	.bb_9 = rtw_debug_priv_bb(0x0900),
++	.bb_a = rtw_debug_priv_bb(0x0a00),
++	.bb_b = rtw_debug_priv_bb(0x0b00),
++	.bb_c = rtw_debug_priv_bb(0x0c00),
++	.bb_d = rtw_debug_priv_bb(0x0d00),
++	.bb_e = rtw_debug_priv_bb(0x0e00),
++	.bb_f = rtw_debug_priv_bb(0x0f00),
++	.bb_18 = rtw_debug_priv_bb(0x1800),
++	.bb_19 = rtw_debug_priv_bb(0x1900),
++	.bb_1a = rtw_debug_priv_bb(0x1a00),
++	.bb_1b = rtw_debug_priv_bb(0x1b00),
++	.bb_1c = rtw_debug_priv_bb(0x1c00),
++	.bb_1d = rtw_debug_priv_bb(0x1d00),
++	.bb_1e = rtw_debug_priv_bb(0x1e00),
++	.bb_1f = rtw_debug_priv_bb(0x1f00),
++	.bb_2c = rtw_debug_priv_bb(0x2c00),
++	.bb_2d = rtw_debug_priv_bb(0x2d00),
++	.bb_40 = rtw_debug_priv_bb(0x4000),
++	.bb_41 = rtw_debug_priv_bb(0x4100),
++	.rf_dump = rtw_debug_priv_get(rf_dump),
++	.tx_pwr_tbl = rtw_debug_priv_get(tx_pwr_tbl),
++	.write_reg = rtw_debug_priv_set(write_reg),
++	.h2c = rtw_debug_priv_set(h2c),
++	.rf_write = rtw_debug_priv_set(rf_write),
++	.rf_read = rtw_debug_priv_set_and_get(rf_read),
++	.read_reg = rtw_debug_priv_set_and_get(read_reg),
++	.fix_rate = rtw_debug_priv_set_and_get(fix_rate),
++	.dump_cam = rtw_debug_priv_set_single_and_get(dump_cam),
++	.rsvd_page = rtw_debug_priv_set_and_get(rsvd_page),
++	.phy_info = rtw_debug_priv_get(phy_info),
++	.coex_enable = rtw_debug_priv_set_and_get(coex_enable),
++	.coex_info = rtw_debug_priv_get(coex_info),
++	.edcca_enable = rtw_debug_priv_set_and_get(edcca_enable),
++	.fw_crash = rtw_debug_priv_set_and_get(fw_crash),
++	.force_lowest_basic_rate = rtw_debug_priv_set_and_get(force_lowest_basic_rate),
++	.dm_cap = rtw_debug_priv_set_and_get(dm_cap),
+ };
+ 
+ #define rtw_debugfs_add_core(name, mode, fopname, parent)		\
+ 	do {								\
+-		rtw_debug_priv_ ##name.rtwdev = rtwdev;			\
++		struct rtw_debugfs_priv *priv = &rtwdev->debugfs->name;	\
++		priv->rtwdev = rtwdev;					\
+ 		if (IS_ERR(debugfs_create_file(#name, mode,		\
+-					 parent, &rtw_debug_priv_ ##name,\
++					 parent, priv,			\
+ 					 &file_ops_ ##fopname)))	\
+ 			pr_debug("Unable to initialize debugfs:%s\n",	\
+ 			       #name);					\
+@@ -1219,12 +1238,9 @@ static struct rtw_debugfs_priv rtw_debug
+ #define rtw_debugfs_add_r(name)						\
+ 	rtw_debugfs_add_core(name, S_IFREG | 0444, single_r, debugfs_topdir)
+ 
+-void rtw_debugfs_init(struct rtw_dev *rtwdev)
++static
++void rtw_debugfs_add_basic(struct rtw_dev *rtwdev, struct dentry *debugfs_topdir)
+ {
+-	struct dentry *debugfs_topdir;
+-
+-	debugfs_topdir = debugfs_create_dir("rtw88",
+-					    rtwdev->hw->wiphy->debugfsdir);
+ 	rtw_debugfs_add_w(write_reg);
+ 	rtw_debugfs_add_rw(read_reg);
+ 	rtw_debugfs_add_w(rf_write);
+@@ -1236,6 +1252,17 @@ void rtw_debugfs_init(struct rtw_dev *rt
+ 	rtw_debugfs_add_r(coex_info);
+ 	rtw_debugfs_add_rw(coex_enable);
+ 	rtw_debugfs_add_w(h2c);
++	rtw_debugfs_add_r(rf_dump);
++	rtw_debugfs_add_r(tx_pwr_tbl);
++	rtw_debugfs_add_rw(edcca_enable);
++	rtw_debugfs_add_rw(fw_crash);
++	rtw_debugfs_add_rw(force_lowest_basic_rate);
++	rtw_debugfs_add_rw(dm_cap);
++}
++
++static
++void rtw_debugfs_add_sec0(struct rtw_dev *rtwdev, struct dentry *debugfs_topdir)
++{
+ 	rtw_debugfs_add_r(mac_0);
+ 	rtw_debugfs_add_r(mac_1);
+ 	rtw_debugfs_add_r(mac_2);
+@@ -1252,6 +1279,11 @@ void rtw_debugfs_init(struct rtw_dev *rt
+ 	rtw_debugfs_add_r(bb_d);
+ 	rtw_debugfs_add_r(bb_e);
+ 	rtw_debugfs_add_r(bb_f);
++}
++
++static
++void rtw_debugfs_add_sec1(struct rtw_dev *rtwdev, struct dentry *debugfs_topdir)
++{
+ 	rtw_debugfs_add_r(mac_10);
+ 	rtw_debugfs_add_r(mac_11);
+ 	rtw_debugfs_add_r(mac_12);
+@@ -1274,14 +1306,29 @@ void rtw_debugfs_init(struct rtw_dev *rt
+ 		rtw_debugfs_add_r(bb_40);
+ 		rtw_debugfs_add_r(bb_41);
+ 	}
+-	rtw_debugfs_add_r(rf_dump);
+-	rtw_debugfs_add_r(tx_pwr_tbl);
+-	rtw_debugfs_add_rw(edcca_enable);
+-	rtw_debugfs_add_rw(fw_crash);
+-	rtw_debugfs_add_rw(force_lowest_basic_rate);
+-	rtw_debugfs_add_rw(dm_cap);
+ }
+ 
++void rtw_debugfs_init(struct rtw_dev *rtwdev)
++{
++	struct dentry *debugfs_topdir;
++
++	rtwdev->debugfs = kmemdup(&rtw_debugfs_templ, sizeof(rtw_debugfs_templ),
++				  GFP_KERNEL);
++	if (!rtwdev->debugfs)
++		return;
++
++	debugfs_topdir = debugfs_create_dir("rtw88",
++					    rtwdev->hw->wiphy->debugfsdir);
++
++	rtw_debugfs_add_basic(rtwdev, debugfs_topdir);
++	rtw_debugfs_add_sec0(rtwdev, debugfs_topdir);
++	rtw_debugfs_add_sec1(rtwdev, debugfs_topdir);
++}
++
++void rtw_debugfs_deinit(struct rtw_dev *rtwdev)
++{
++	kfree(rtwdev->debugfs);
++}
+ #endif /* CPTCFG_RTW88_DEBUGFS */
+ 
+ #ifdef CPTCFG_RTW88_DEBUG
+--- a/drivers/net/wireless/realtek/rtw88/debug.h
++++ b/drivers/net/wireless/realtek/rtw88/debug.h
+@@ -34,11 +34,13 @@ enum rtw_debug_mask {
+ #ifdef CPTCFG_RTW88_DEBUGFS
+ 
+ void rtw_debugfs_init(struct rtw_dev *rtwdev);
++void rtw_debugfs_deinit(struct rtw_dev *rtwdev);
+ void rtw_debugfs_get_simple_phy_info(struct seq_file *m);
+ 
+ #else
+ 
+ static inline void rtw_debugfs_init(struct rtw_dev *rtwdev) {}
++static inline void rtw_debugfs_deinit(struct rtw_dev *rtwdev) {}
+ 
+ #endif /* CPTCFG_RTW88_DEBUGFS */
+ 
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -2300,6 +2300,7 @@ void rtw_unregister_hw(struct rtw_dev *r
+ 
+ 	ieee80211_unregister_hw(hw);
+ 	rtw_unset_supported_band(hw, chip);
++	rtw_debugfs_deinit(rtwdev);
+ }
+ EXPORT_SYMBOL(rtw_unregister_hw);
+ 
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -50,6 +50,7 @@ extern const struct ieee80211_ops rtw_op
+ #define RTW_MAX_CHANNEL_NUM_5G 49
+ 
+ struct rtw_dev;
++struct rtw_debugfs;
+ 
+ enum rtw_hci_type {
+ 	RTW_HCI_TYPE_PCIE,
+@@ -2053,7 +2054,7 @@ struct rtw_dev {
+ 	bool beacon_loss;
+ 	struct completion lps_leave_check;
+ 
+-	struct dentry *debugfs;
++	struct rtw_debugfs *debugfs;
+ 
+ 	u8 sta_cnt;
+ 	u32 rts_threshold;

package/kernel/mac80211/patches/rtl/005-v6.12-wifi-rtw88-select-WANT_DEV_COREDUMP.patch

@@ -0,0 +1,25 @@
+From 7e989b0c1e33210c07340bf5228aa83ea52515b5 Mon Sep 17 00:00:00 2001
+From: Zong-Zhe Yang <kevin_yang@realtek.com>
+Date: Thu, 18 Jul 2024 15:06:15 +0800
+Subject: [PATCH] wifi: rtw88: select WANT_DEV_COREDUMP
+
+We have invoked device coredump when fw crash.
+Should select WANT_DEV_COREDUMP by ourselves.
+
+Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/20240718070616.42217-1-pkshih@realtek.com
+---
+ drivers/net/wireless/realtek/rtw88/Kconfig | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/Kconfig
++++ b/drivers/net/wireless/realtek/rtw88/Kconfig
+@@ -14,6 +14,7 @@ if RTW88
+ config RTW88_CORE
+ 	tristate
+ 	depends on m
++	select BPAUTO_WANT_DEV_COREDUMP
+ 
+ config RTW88_PCI
+ 	tristate

package/kernel/mac80211/patches/rtl/008-v6.12-wifi-rtw88-8822c-Parse-channel-from-IE-to-correct-in.patch

@@ -0,0 +1,151 @@
+From 53ed4b25a79aeec5991c2dc579e635b136ef7676 Mon Sep 17 00:00:00 2001
+From: Po-Hao Huang <phhuang@realtek.com>
+Date: Wed, 24 Jul 2024 13:05:01 +0800
+Subject: [PATCH] wifi: rtw88: 8822c: Parse channel from IE to correct invalid
+ hardware reports
+
+For CCK packets we could get incorrect reports from hardware.
+And this causes wrong frequencies being reported. Parse the channel
+information from IE if provided by AP to fix this.
+
+Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/20240724050501.7550-1-pkshih@realtek.com
+---
+ drivers/net/wireless/realtek/rtw88/main.h     |  1 +
+ drivers/net/wireless/realtek/rtw88/pci.c      |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c |  7 ++--
+ drivers/net/wireless/realtek/rtw88/rx.c       | 41 +++++++++++++++++++
+ drivers/net/wireless/realtek/rtw88/rx.h       | 13 ++++++
+ drivers/net/wireless/realtek/rtw88/sdio.c     |  1 +
+ drivers/net/wireless/realtek/rtw88/usb.c      |  2 +
+ 7 files changed, 63 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -623,6 +623,7 @@ struct rtw_rx_pkt_stat {
+ 	bool crc_err;
+ 	bool decrypted;
+ 	bool is_c2h;
++	bool channel_invalid;
+ 
+ 	s32 signal_power;
+ 	u16 pkt_len;
+--- a/drivers/net/wireless/realtek/rtw88/pci.c
++++ b/drivers/net/wireless/realtek/rtw88/pci.c
+@@ -1088,6 +1088,7 @@ static u32 rtw_pci_rx_napi(struct rtw_de
+ 			/* remove rx_desc */
+ 			skb_pull(new, pkt_offset);
+ 
++			rtw_update_rx_freq_for_invalid(rtwdev, new, &rx_status, &pkt_stat);
+ 			rtw_rx_stats(rtwdev, pkt_stat.vif, new);
+ 			memcpy(new->cb, &rx_status, sizeof(rx_status));
+ 			ieee80211_rx_napi(rtwdev->hw, NULL, new, napi);
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -2576,9 +2576,10 @@ static void query_phy_status_page0(struc
+ 	rx_power[RF_PATH_B] -= 110;
+ 
+ 	channel = GET_PHY_STAT_P0_CHANNEL(phy_status);
+-	if (channel == 0)
+-		channel = rtwdev->hal.current_channel;
+-	rtw_set_rx_freq_band(pkt_stat, channel);
++	if (channel != 0)
++		rtw_set_rx_freq_band(pkt_stat, channel);
++	else
++		pkt_stat->channel_invalid = true;
+ 
+ 	pkt_stat->rx_power[RF_PATH_A] = rx_power[RF_PATH_A];
+ 	pkt_stat->rx_power[RF_PATH_B] = rx_power[RF_PATH_B];
+--- a/drivers/net/wireless/realtek/rtw88/rx.c
++++ b/drivers/net/wireless/realtek/rtw88/rx.c
+@@ -146,6 +146,47 @@ static void rtw_set_rx_freq_by_pktstat(s
+ 	rx_status->band = pkt_stat->band;
+ }
+ 
++void rtw_update_rx_freq_from_ie(struct rtw_dev *rtwdev, struct sk_buff *skb,
++				struct ieee80211_rx_status *rx_status,
++				struct rtw_rx_pkt_stat *pkt_stat)
++{
++	struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)skb->data;
++	int channel = rtwdev->hal.current_channel;
++	size_t hdr_len, ielen;
++	int channel_number;
++	u8 *variable;
++
++	if (!test_bit(RTW_FLAG_SCANNING, rtwdev->flags))
++		goto fill_rx_status;
++
++	if (ieee80211_is_beacon(mgmt->frame_control)) {
++		variable = mgmt->u.beacon.variable;
++		hdr_len = offsetof(struct ieee80211_mgmt,
++				   u.beacon.variable);
++	} else if (ieee80211_is_probe_resp(mgmt->frame_control)) {
++		variable = mgmt->u.probe_resp.variable;
++		hdr_len = offsetof(struct ieee80211_mgmt,
++				   u.probe_resp.variable);
++	} else {
++		goto fill_rx_status;
++	}
++
++	if (skb->len > hdr_len)
++		ielen = skb->len - hdr_len;
++	else
++		goto fill_rx_status;
++
++	channel_number = cfg80211_get_ies_channel_number(variable, ielen,
++							 NL80211_BAND_2GHZ);
++	if (channel_number != -1)
++		channel = channel_number;
++
++fill_rx_status:
++	rtw_set_rx_freq_band(pkt_stat, channel);
++	rtw_set_rx_freq_by_pktstat(pkt_stat, rx_status);
++}
++EXPORT_SYMBOL(rtw_update_rx_freq_from_ie);
++
+ void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
+ 			   struct rtw_rx_pkt_stat *pkt_stat,
+ 			   struct ieee80211_hdr *hdr,
+--- a/drivers/net/wireless/realtek/rtw88/rx.h
++++ b/drivers/net/wireless/realtek/rtw88/rx.h
+@@ -50,5 +50,18 @@ void rtw_rx_fill_rx_status(struct rtw_de
+ 			   struct ieee80211_hdr *hdr,
+ 			   struct ieee80211_rx_status *rx_status,
+ 			   u8 *phy_status);
++void rtw_update_rx_freq_from_ie(struct rtw_dev *rtwdev, struct sk_buff *skb,
++				struct ieee80211_rx_status *rx_status,
++				struct rtw_rx_pkt_stat *pkt_stat);
++
++static inline
++void rtw_update_rx_freq_for_invalid(struct rtw_dev *rtwdev, struct sk_buff *skb,
++				    struct ieee80211_rx_status *rx_status,
++				    struct rtw_rx_pkt_stat *pkt_stat)
++{
++	if (pkt_stat->channel_invalid)
++		rtw_update_rx_freq_from_ie(rtwdev, skb, rx_status, pkt_stat);
++}
++
+ 
+ #endif
+--- a/drivers/net/wireless/realtek/rtw88/sdio.c
++++ b/drivers/net/wireless/realtek/rtw88/sdio.c
+@@ -948,6 +948,7 @@ static void rtw_sdio_rx_skb(struct rtw_d
+ 	skb_put(skb, pkt_stat->pkt_len);
+ 	skb_reserve(skb, pkt_offset);
+ 
++	rtw_update_rx_freq_for_invalid(rtwdev, skb, rx_status, pkt_stat);
+ 	rtw_rx_stats(rtwdev, pkt_stat->vif, skb);
+ 
+ 	ieee80211_rx_irqsafe(rtwdev->hw, skb);
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -579,6 +579,8 @@ static void rtw_usb_rx_handler(struct wo
+ 
+ 		skb_put(skb, pkt_stat.pkt_len);
+ 		skb_reserve(skb, pkt_offset);
++
++		rtw_update_rx_freq_for_invalid(rtwdev, skb, &rx_status, &pkt_stat);
+ 		memcpy(skb->cb, &rx_status, sizeof(rx_status));
+ 		ieee80211_rx_irqsafe(rtwdev->hw, skb);
+ 	}

package/kernel/mac80211/patches/rtl/010-v6.12-wifi-rtw88-usb-Init-RX-burst-length-according-to-USB.patch

@@ -0,0 +1,73 @@
+From fbbd8cb347e25b68d25c4f3871821afc495ee7a9 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Thu, 8 Aug 2024 01:19:36 +0300
+Subject: [PATCH] wifi: rtw88: usb: Init RX burst length according to USB speed
+
+This is needed in order to make USB RX aggregation work with RTL8811CU
+(and presumably RTL8822BU and RTL8822CU also).
+
+I don't know what BIT_DMA_BURST_CNT, BIT_DMA_MODE, and BIT_DROP_DATA_EN
+are doing.
+
+Tested with RTL8822CU, RTL8811CU, and RTL8723DU.
+
+The RX speed is unchanged in my tests.
+
+Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/ac569c6f-7129-4341-b523-901fe10cabff@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/reg.h |  6 ++++++
+ drivers/net/wireless/realtek/rtw88/usb.c | 23 ++++++++++++++++++++++-
+ 2 files changed, 28 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/reg.h
++++ b/drivers/net/wireless/realtek/rtw88/reg.h
+@@ -322,6 +322,12 @@
+ #define REG_RXDMA_DPR		0x028C
+ #define REG_RXDMA_MODE		0x0290
+ #define BIT_DMA_MODE		BIT(1)
++#define BIT_DMA_BURST_CNT	GENMASK(3, 2)
++#define BIT_DMA_BURST_SIZE	GENMASK(5, 4)
++#define BIT_DMA_BURST_SIZE_64	2
++#define BIT_DMA_BURST_SIZE_512	1
++#define BIT_DMA_BURST_SIZE_1024	0
++
+ #define REG_RXPKTNUM		0x02B0
+ 
+ #define REG_INT_MIG		0x0304
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -720,9 +720,30 @@ static void rtw_usb_link_ps(struct rtw_d
+ 	/* empty function for rtw_hci_ops */
+ }
+ 
++static void rtw_usb_init_burst_pkt_len(struct rtw_dev *rtwdev)
++{
++	struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev);
++	enum usb_device_speed speed = rtwusb->udev->speed;
++	u8 rxdma, burst_size;
++
++	rxdma = BIT_DMA_BURST_CNT | BIT_DMA_MODE;
++
++	if (speed == USB_SPEED_SUPER)
++		burst_size = BIT_DMA_BURST_SIZE_1024;
++	else if (speed == USB_SPEED_HIGH)
++		burst_size = BIT_DMA_BURST_SIZE_512;
++	else
++		burst_size = BIT_DMA_BURST_SIZE_64;
++
++	u8p_replace_bits(&rxdma, burst_size, BIT_DMA_BURST_SIZE);
++
++	rtw_write8(rtwdev, REG_RXDMA_MODE, rxdma);
++	rtw_write16_set(rtwdev, REG_TXDMA_OFFSET_CHK, BIT_DROP_DATA_EN);
++}
++
+ static void rtw_usb_interface_cfg(struct rtw_dev *rtwdev)
+ {
+-	/* empty function for rtw_hci_ops */
++	rtw_usb_init_burst_pkt_len(rtwdev);
+ }
+ 
+ static struct rtw_hci_ops rtw_usb_ops = {

package/kernel/mac80211/patches/rtl/011-v6.12-wifi-rtw88-usb-Update-the-RX-stats-after-every-frame.patch

@@ -0,0 +1,31 @@
+From 38ea04a79ad0f8cc30bb5e9ad98d665e4ae5060c Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Thu, 8 Aug 2024 01:20:36 +0300
+Subject: [PATCH] wifi: rtw88: usb: Update the RX stats after every frame
+
+Update the number of received unicast data frames and bytes every time
+a frame is received. This is what the PCI and SDIO drivers do.
+
+This has an influence on the power saving, bluetooth coexistence, and
+(in a future patch) the use of RX aggregation.
+
+Tested with RTL8822CU, RTL8811CU, and RTL8723DU.
+
+Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/75a2ca52-8f01-45c5-926f-d3a68ae3b284@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -581,6 +581,7 @@ static void rtw_usb_rx_handler(struct wo
+ 		skb_reserve(skb, pkt_offset);
+ 
+ 		rtw_update_rx_freq_for_invalid(rtwdev, skb, &rx_status, &pkt_stat);
++		rtw_rx_stats(rtwdev, pkt_stat.vif, skb);
+ 		memcpy(skb->cb, &rx_status, sizeof(rx_status));
+ 		ieee80211_rx_irqsafe(rtwdev->hw, skb);
+ 	}

package/kernel/mac80211/patches/rtl/012-v6.12-wifi-rtw88-usb-Support-RX-aggregation.patch

@@ -0,0 +1,118 @@
+From df3d8f463b1dfc7cb8f4fb52b1b81d290b850d03 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Thu, 8 Aug 2024 01:21:36 +0300
+Subject: [PATCH] wifi: rtw88: usb: Support RX aggregation
+
+The chips can be configured to aggregate several frames into a single
+USB transfer. Modify rtw_usb_rx_handler() to support this case.
+
+RX aggregation improves the RX speed of RTL8811CU on certain ARM
+systems, like the NanoPi NEO Core2. It also improves the RX speed of
+RTL8822CU on some x86_64 systems.
+
+Currently none of the chips are configured to aggregate frames.
+
+Tested with RTL8822CU, RTL8811CU, and RTL8723DU.
+
+Reviewed-by: Sascha Hauer <s.hauer@pengutronix.de>
+Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/f845826d-de71-492d-9a22-e48c07989a1f@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 61 ++++++++++++++++--------
+ 1 file changed, 40 insertions(+), 21 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -546,11 +546,12 @@ static void rtw_usb_rx_handler(struct wo
+ 	struct rtw_usb *rtwusb = container_of(work, struct rtw_usb, rx_work);
+ 	struct rtw_dev *rtwdev = rtwusb->rtwdev;
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+-	struct rtw_rx_pkt_stat pkt_stat;
++	u32 pkt_desc_sz = chip->rx_pkt_desc_sz;
+ 	struct ieee80211_rx_status rx_status;
++	u32 pkt_offset, next_pkt, urb_len;
++	struct rtw_rx_pkt_stat pkt_stat;
++	struct sk_buff *next_skb;
+ 	struct sk_buff *skb;
+-	u32 pkt_desc_sz = chip->rx_pkt_desc_sz;
+-	u32 pkt_offset;
+ 	u8 *rx_desc;
+ 	int limit;
+ 
+@@ -559,31 +560,48 @@ static void rtw_usb_rx_handler(struct wo
+ 		if (!skb)
+ 			break;
+ 
+-		rx_desc = skb->data;
+-		chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat,
+-					 &rx_status);
+-		pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +
+-			     pkt_stat.shift;
+-
+-		if (pkt_stat.is_c2h) {
+-			skb_put(skb, pkt_stat.pkt_len + pkt_offset);
+-			rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb);
+-			continue;
+-		}
+-
+ 		if (skb_queue_len(&rtwusb->rx_queue) >= RTW_USB_MAX_RXQ_LEN) {
+ 			dev_dbg_ratelimited(rtwdev->dev, "failed to get rx_queue, overflow\n");
+ 			dev_kfree_skb_any(skb);
+ 			continue;
+ 		}
+ 
+-		skb_put(skb, pkt_stat.pkt_len);
+-		skb_reserve(skb, pkt_offset);
++		urb_len = skb->len;
++
++		do {
++			rx_desc = skb->data;
++			chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat,
++						 &rx_status);
++			pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +
++				     pkt_stat.shift;
++
++			next_pkt = round_up(pkt_stat.pkt_len + pkt_offset, 8);
++
++			if (urb_len >= next_pkt + pkt_desc_sz)
++				next_skb = skb_clone(skb, GFP_KERNEL);
++			else
++				next_skb = NULL;
++
++			if (pkt_stat.is_c2h) {
++				skb_trim(skb, pkt_stat.pkt_len + pkt_offset);
++				rtw_fw_c2h_cmd_rx_irqsafe(rtwdev, pkt_offset, skb);
++			} else {
++				skb_pull(skb, pkt_offset);
++				skb_trim(skb, pkt_stat.pkt_len);
++				rtw_update_rx_freq_for_invalid(rtwdev, skb,
++							       &rx_status,
++							       &pkt_stat);
++				rtw_rx_stats(rtwdev, pkt_stat.vif, skb);
++				memcpy(skb->cb, &rx_status, sizeof(rx_status));
++				ieee80211_rx_irqsafe(rtwdev->hw, skb);
++			}
++
++			skb = next_skb;
++			if (skb)
++				skb_pull(skb, next_pkt);
+ 
+-		rtw_update_rx_freq_for_invalid(rtwdev, skb, &rx_status, &pkt_stat);
+-		rtw_rx_stats(rtwdev, pkt_stat.vif, skb);
+-		memcpy(skb->cb, &rx_status, sizeof(rx_status));
+-		ieee80211_rx_irqsafe(rtwdev->hw, skb);
++			urb_len -= next_pkt;
++		} while (skb);
+ 	}
+ }
+ 
+@@ -627,6 +645,7 @@ static void rtw_usb_read_port_complete(s
+ 			if (skb)
+ 				dev_kfree_skb_any(skb);
+ 		} else {
++			skb_put(skb, urb->actual_length);
+ 			skb_queue_tail(&rtwusb->rx_queue, skb);
+ 			queue_work(rtwusb->rxwq, &rtwusb->rx_work);
+ 		}

package/kernel/mac80211/patches/rtl/013-v6.12-wifi-rtw88-Enable-USB-RX-aggregation-for-8822c-8822b.patch

@@ -0,0 +1,168 @@
+From 002a5db9a52a0e7af0fa9a450d31049748435748 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Thu, 8 Aug 2024 01:23:06 +0300
+Subject: [PATCH] wifi: rtw88: Enable USB RX aggregation for 8822c/8822b/8821c
+
+Enable USB RX aggregation when there is at least 1 Mbps RX or TX
+traffic, otherwise disable it.
+
+USB RX aggregation improves the RX speed of RTL8811CU on certain ARM
+systems, like the NanoPi NEO Core2. Before: 28 Mbps, after: 231 Mbps.
+
+It also improves the RX speed of RTL8822CU on some x86_64 systems.
+Before: ~200 Mbps, after: ~300 Mbps.
+
+The official drivers for these chips use the same logic for SDIO, but
+for some reason the SDIO driver in rtw88 always enables RX aggregation,
+so this patch only toggles aggregation for USB devices.
+
+RTL8703B is likely not found in USB devices, and RTL8723DU doesn't like
+aggregation.
+
+Tested-by: Sascha Hauer <s.hauer@pengutronix.de>
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/b4c0d54c-6755-4b0f-9dd7-f9196fd74b68@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/hci.h  |  7 ++++
+ drivers/net/wireless/realtek/rtw88/main.c | 13 +++++---
+ drivers/net/wireless/realtek/rtw88/pci.c  |  1 +
+ drivers/net/wireless/realtek/rtw88/sdio.c |  1 +
+ drivers/net/wireless/realtek/rtw88/usb.c  | 40 +++++++++++++++++++++++
+ 5 files changed, 58 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/hci.h
++++ b/drivers/net/wireless/realtek/rtw88/hci.h
+@@ -18,6 +18,7 @@ struct rtw_hci_ops {
+ 	void (*deep_ps)(struct rtw_dev *rtwdev, bool enter);
+ 	void (*link_ps)(struct rtw_dev *rtwdev, bool enter);
+ 	void (*interface_cfg)(struct rtw_dev *rtwdev);
++	void (*dynamic_rx_agg)(struct rtw_dev *rtwdev, bool enable);
+ 
+ 	int (*write_data_rsvd_page)(struct rtw_dev *rtwdev, u8 *buf, u32 size);
+ 	int (*write_data_h2c)(struct rtw_dev *rtwdev, u8 *buf, u32 size);
+@@ -72,6 +73,12 @@ static inline void rtw_hci_interface_cfg
+ 	rtwdev->hci.ops->interface_cfg(rtwdev);
+ }
+ 
++static inline void rtw_hci_dynamic_rx_agg(struct rtw_dev *rtwdev, bool enable)
++{
++	if (rtwdev->hci.ops->dynamic_rx_agg)
++		rtwdev->hci.ops->dynamic_rx_agg(rtwdev, enable);
++}
++
+ static inline int
+ rtw_hci_write_data_rsvd_page(struct rtw_dev *rtwdev, u8 *buf, u32 size)
+ {
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -212,6 +212,7 @@ static void rtw_watch_dog_work(struct wo
+ 	struct rtw_traffic_stats *stats = &rtwdev->stats;
+ 	struct rtw_watch_dog_iter_data data = {};
+ 	bool busy_traffic = test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);
++	u32 tx_unicast_mbps, rx_unicast_mbps;
+ 	bool ps_active;
+ 
+ 	mutex_lock(&rtwdev->mutex);
+@@ -236,10 +237,11 @@ static void rtw_watch_dog_work(struct wo
+ 	else
+ 		ps_active = false;
+ 
+-	ewma_tp_add(&stats->tx_ewma_tp,
+-		    (u32)(stats->tx_unicast >> RTW_TP_SHIFT));
+-	ewma_tp_add(&stats->rx_ewma_tp,
+-		    (u32)(stats->rx_unicast >> RTW_TP_SHIFT));
++	tx_unicast_mbps = stats->tx_unicast >> RTW_TP_SHIFT;
++	rx_unicast_mbps = stats->rx_unicast >> RTW_TP_SHIFT;
++
++	ewma_tp_add(&stats->tx_ewma_tp, tx_unicast_mbps);
++	ewma_tp_add(&stats->rx_ewma_tp, rx_unicast_mbps);
+ 	stats->tx_throughput = ewma_tp_read(&stats->tx_ewma_tp);
+ 	stats->rx_throughput = ewma_tp_read(&stats->rx_ewma_tp);
+ 
+@@ -259,6 +261,9 @@ static void rtw_watch_dog_work(struct wo
+ 
+ 	rtw_phy_dynamic_mechanism(rtwdev);
+ 
++	rtw_hci_dynamic_rx_agg(rtwdev,
++			       tx_unicast_mbps >= 1 || rx_unicast_mbps >= 1);
++
+ 	data.rtwdev = rtwdev;
+ 	/* rtw_iterate_vifs internally uses an atomic iterator which is needed
+ 	 * to avoid taking local->iflist_mtx mutex
+--- a/drivers/net/wireless/realtek/rtw88/pci.c
++++ b/drivers/net/wireless/realtek/rtw88/pci.c
+@@ -1601,6 +1601,7 @@ static struct rtw_hci_ops rtw_pci_ops =
+ 	.deep_ps = rtw_pci_deep_ps,
+ 	.link_ps = rtw_pci_link_ps,
+ 	.interface_cfg = rtw_pci_interface_cfg,
++	.dynamic_rx_agg = NULL,
+ 
+ 	.read8 = rtw_pci_read8,
+ 	.read16 = rtw_pci_read16,
+--- a/drivers/net/wireless/realtek/rtw88/sdio.c
++++ b/drivers/net/wireless/realtek/rtw88/sdio.c
+@@ -1157,6 +1157,7 @@ static struct rtw_hci_ops rtw_sdio_ops =
+ 	.deep_ps = rtw_sdio_deep_ps,
+ 	.link_ps = rtw_sdio_link_ps,
+ 	.interface_cfg = rtw_sdio_interface_cfg,
++	.dynamic_rx_agg = NULL,
+ 
+ 	.read8 = rtw_sdio_read8,
+ 	.read16 = rtw_sdio_read16,
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -766,6 +766,45 @@ static void rtw_usb_interface_cfg(struct
+ 	rtw_usb_init_burst_pkt_len(rtwdev);
+ }
+ 
++static void rtw_usb_dynamic_rx_agg_v1(struct rtw_dev *rtwdev, bool enable)
++{
++	u8 size, timeout;
++	u16 val16;
++
++	rtw_write32_set(rtwdev, REG_RXDMA_AGG_PG_TH, BIT_EN_PRE_CALC);
++	rtw_write8_set(rtwdev, REG_TXDMA_PQ_MAP, BIT_RXDMA_AGG_EN);
++	rtw_write8_clr(rtwdev, REG_RXDMA_AGG_PG_TH + 3, BIT(7));
++
++	if (enable) {
++		size = 0x5;
++		timeout = 0x20;
++	} else {
++		size = 0x0;
++		timeout = 0x1;
++	}
++	val16 = u16_encode_bits(size, BIT_RXDMA_AGG_PG_TH) |
++		u16_encode_bits(timeout, BIT_DMA_AGG_TO_V1);
++
++	rtw_write16(rtwdev, REG_RXDMA_AGG_PG_TH, val16);
++}
++
++static void rtw_usb_dynamic_rx_agg(struct rtw_dev *rtwdev, bool enable)
++{
++	switch (rtwdev->chip->id) {
++	case RTW_CHIP_TYPE_8822C:
++	case RTW_CHIP_TYPE_8822B:
++	case RTW_CHIP_TYPE_8821C:
++		rtw_usb_dynamic_rx_agg_v1(rtwdev, enable);
++		break;
++	case RTW_CHIP_TYPE_8723D:
++		/* Doesn't like aggregation. */
++		break;
++	case RTW_CHIP_TYPE_8703B:
++		/* Likely not found in USB devices. */
++		break;
++	}
++}
++
+ static struct rtw_hci_ops rtw_usb_ops = {
+ 	.tx_write = rtw_usb_tx_write,
+ 	.tx_kick_off = rtw_usb_tx_kick_off,
+@@ -775,6 +814,7 @@ static struct rtw_hci_ops rtw_usb_ops =
+ 	.deep_ps = rtw_usb_deep_ps,
+ 	.link_ps = rtw_usb_link_ps,
+ 	.interface_cfg = rtw_usb_interface_cfg,
++	.dynamic_rx_agg = rtw_usb_dynamic_rx_agg,
+ 
+ 	.write8  = rtw_usb_write8,
+ 	.write16 = rtw_usb_write16,

package/kernel/mac80211/patches/rtl/016-v6.12-wifi-rtw88-assign-mac_id-for-vif-sta-and-update-to-T.patch

@@ -0,0 +1,231 @@
+From 902cb7b11f9a7ff07233cc4c626b54c3e4703149 Mon Sep 17 00:00:00 2001
+From: Ping-Ke Shih <pkshih@realtek.com>
+Date: Mon, 19 Aug 2024 10:52:48 +0800
+Subject: [PATCH] wifi: rtw88: assign mac_id for vif/sta and update to TX desc
+
+A mac_id as an instance in firmware has to be assigned for each station
+including AP and connected stations. Firmware will use the mac_id to
+control TX rate and do statistics.
+
+Assignment rule is to assign mac_id to each vif when adding vif.
+For station mode, sta->mac_id will reuse vif->mac_id. For AP mode,
+dynamically allocate an sta->mac_id to a station, and vif->mac_id is
+used to send broadcast/multicast packets which are not belong to
+a station. For example,
+
+                  vif->mac_id      sta->mac_id
+vif0 (STA mode)        0               0
+vif1 (AP mode)         1               2...
+
+By the way, remove unused RTW_BC_MC_MACID, which was planed to send
+broadcast/multicast packets on fixed mac_id.
+
+Tested-on RTL8822CE with STA + AP SCC mode.
+
+Link: https://lore.kernel.org/linux-wireless/e4be0a75-43b2-4ae5-9aab-5c4a88e78097@gmail.com/
+Cc: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/20240819025248.17939-1-pkshih@realtek.com
+---
+ drivers/net/wireless/realtek/rtw88/mac80211.c | 13 ++++++--
+ drivers/net/wireless/realtek/rtw88/main.c     | 30 ++++++++-----------
+ drivers/net/wireless/realtek/rtw88/main.h     | 14 +++++++--
+ drivers/net/wireless/realtek/rtw88/tx.c       | 11 +++++--
+ drivers/net/wireless/realtek/rtw88/tx.h       |  1 +
+ 5 files changed, 44 insertions(+), 25 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
++++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
+@@ -167,6 +167,12 @@ static int rtw_ops_add_interface(struct
+ 
+ 	mutex_lock(&rtwdev->mutex);
+ 
++	rtwvif->mac_id = rtw_acquire_macid(rtwdev);
++	if (rtwvif->mac_id >= RTW_MAX_MAC_ID_NUM) {
++		mutex_unlock(&rtwdev->mutex);
++		return -ENOSPC;
++	}
++
+ 	port = find_first_zero_bit(rtwdev->hw_port, RTW_PORT_NUM);
+ 	if (port >= RTW_PORT_NUM) {
+ 		mutex_unlock(&rtwdev->mutex);
+@@ -214,7 +220,8 @@ static int rtw_ops_add_interface(struct
+ 
+ 	mutex_unlock(&rtwdev->mutex);
+ 
+-	rtw_dbg(rtwdev, RTW_DBG_STATE, "start vif %pM on port %d\n", vif->addr, rtwvif->port);
++	rtw_dbg(rtwdev, RTW_DBG_STATE, "start vif %pM mac_id %d on port %d\n",
++		vif->addr, rtwvif->mac_id, rtwvif->port);
+ 	return 0;
+ }
+ 
+@@ -225,7 +232,8 @@ static void rtw_ops_remove_interface(str
+ 	struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;
+ 	u32 config = 0;
+ 
+-	rtw_dbg(rtwdev, RTW_DBG_STATE, "stop vif %pM on port %d\n", vif->addr, rtwvif->port);
++	rtw_dbg(rtwdev, RTW_DBG_STATE, "stop vif %pM mac_id %d on port %d\n",
++		vif->addr, rtwvif->mac_id, rtwvif->port);
+ 
+ 	mutex_lock(&rtwdev->mutex);
+ 
+@@ -242,6 +250,7 @@ static void rtw_ops_remove_interface(str
+ 	config |= PORT_SET_BCN_CTRL;
+ 	rtw_vif_port_config(rtwdev, rtwvif, config);
+ 	clear_bit(rtwvif->port, rtwdev->hw_port);
++	rtw_release_macid(rtwdev, rtwvif->mac_id);
+ 	rtw_recalc_lps(rtwdev, NULL);
+ 
+ 	mutex_unlock(&rtwdev->mutex);
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -311,17 +311,6 @@ static void rtw_ips_work(struct work_str
+ 	mutex_unlock(&rtwdev->mutex);
+ }
+ 
+-static u8 rtw_acquire_macid(struct rtw_dev *rtwdev)
+-{
+-	unsigned long mac_id;
+-
+-	mac_id = find_first_zero_bit(rtwdev->mac_id_map, RTW_MAX_MAC_ID_NUM);
+-	if (mac_id < RTW_MAX_MAC_ID_NUM)
+-		set_bit(mac_id, rtwdev->mac_id_map);
+-
+-	return mac_id;
+-}
+-
+ static void rtw_sta_rc_work(struct work_struct *work)
+ {
+ 	struct rtw_sta_info *si = container_of(work, struct rtw_sta_info,
+@@ -340,12 +329,14 @@ int rtw_sta_add(struct rtw_dev *rtwdev,
+ 	struct rtw_vif *rtwvif = (struct rtw_vif *)vif->drv_priv;
+ 	int i;
+ 
+-	si->mac_id = rtw_acquire_macid(rtwdev);
+-	if (si->mac_id >= RTW_MAX_MAC_ID_NUM)
+-		return -ENOSPC;
++	if (vif->type == NL80211_IFTYPE_STATION) {
++		si->mac_id = rtwvif->mac_id;
++	} else {
++		si->mac_id = rtw_acquire_macid(rtwdev);
++		if (si->mac_id >= RTW_MAX_MAC_ID_NUM)
++			return -ENOSPC;
++	}
+ 
+-	if (vif->type == NL80211_IFTYPE_STATION && vif->cfg.assoc == 0)
+-		rtwvif->mac_id = si->mac_id;
+ 	si->rtwdev = rtwdev;
+ 	si->sta = sta;
+ 	si->vif = vif;
+@@ -370,11 +361,13 @@ void rtw_sta_remove(struct rtw_dev *rtwd
+ 		    bool fw_exist)
+ {
+ 	struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv;
++	struct ieee80211_vif *vif = si->vif;
+ 	int i;
+ 
+ 	cancel_work_sync(&si->rc_work);
+ 
+-	rtw_release_macid(rtwdev, si->mac_id);
++	if (vif->type != NL80211_IFTYPE_STATION)
++		rtw_release_macid(rtwdev, si->mac_id);
+ 	if (fw_exist)
+ 		rtw_fw_media_status_report(rtwdev, si->mac_id, false);
+ 
+@@ -614,6 +607,8 @@ static void rtw_reset_vif_iter(void *dat
+ 	rtw_bf_disassoc(rtwdev, vif, NULL);
+ 	rtw_vif_assoc_changed(rtwvif, NULL);
+ 	rtw_txq_cleanup(rtwdev, vif->txq);
++
++	rtw_release_macid(rtwdev, rtwvif->mac_id);
+ }
+ 
+ void rtw_fw_recovery(struct rtw_dev *rtwdev)
+@@ -2139,7 +2134,6 @@ int rtw_core_init(struct rtw_dev *rtwdev
+ 	rtwdev->sec.total_cam_num = 32;
+ 	rtwdev->hal.current_channel = 1;
+ 	rtwdev->dm_info.fix_rate = U8_MAX;
+-	set_bit(RTW_BC_MC_MACID, rtwdev->mac_id_map);
+ 
+ 	rtw_stats_init(rtwdev);
+ 
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -742,7 +742,6 @@ struct rtw_txq {
+ 	unsigned long flags;
+ };
+ 
+-#define RTW_BC_MC_MACID 1
+ DECLARE_EWMA(rssi, 10, 16);
+ 
+ struct rtw_sta_info {
+@@ -805,7 +804,7 @@ struct rtw_bf_info {
+ struct rtw_vif {
+ 	enum rtw_net_type net_type;
+ 	u16 aid;
+-	u8 mac_id; /* for STA mode only */
++	u8 mac_id;
+ 	u8 mac_addr[ETH_ALEN];
+ 	u8 bssid[ETH_ALEN];
+ 	u8 port;
+@@ -2131,6 +2130,17 @@ static inline bool rtw_chip_has_tx_stbc(
+ 	return rtwdev->chip->tx_stbc;
+ }
+ 
++static inline u8 rtw_acquire_macid(struct rtw_dev *rtwdev)
++{
++	unsigned long mac_id;
++
++	mac_id = find_first_zero_bit(rtwdev->mac_id_map, RTW_MAX_MAC_ID_NUM);
++	if (mac_id < RTW_MAX_MAC_ID_NUM)
++		set_bit(mac_id, rtwdev->mac_id_map);
++
++	return mac_id;
++}
++
+ static inline void rtw_release_macid(struct rtw_dev *rtwdev, u8 mac_id)
+ {
+ 	clear_bit(mac_id, rtwdev->mac_id_map);
+--- a/drivers/net/wireless/realtek/rtw88/tx.c
++++ b/drivers/net/wireless/realtek/rtw88/tx.c
+@@ -46,7 +46,8 @@ void rtw_tx_fill_tx_desc(struct rtw_tx_p
+ 		      le32_encode_bits(pkt_info->ls, RTW_TX_DESC_W0_LS) |
+ 		      le32_encode_bits(pkt_info->dis_qselseq, RTW_TX_DESC_W0_DISQSELSEQ);
+ 
+-	tx_desc->w1 = le32_encode_bits(pkt_info->qsel, RTW_TX_DESC_W1_QSEL) |
++	tx_desc->w1 = le32_encode_bits(pkt_info->mac_id, RTW_TX_DESC_W1_MACID) |
++		      le32_encode_bits(pkt_info->qsel, RTW_TX_DESC_W1_QSEL) |
+ 		      le32_encode_bits(pkt_info->rate_id, RTW_TX_DESC_W1_RATE_ID) |
+ 		      le32_encode_bits(pkt_info->sec_type, RTW_TX_DESC_W1_SEC_TYPE) |
+ 		      le32_encode_bits(pkt_info->pkt_offset, RTW_TX_DESC_W1_PKT_OFFSET) |
+@@ -401,14 +402,18 @@ void rtw_tx_pkt_info_update(struct rtw_d
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+ 	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
+ 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
++	struct ieee80211_vif *vif = info->control.vif;
+ 	struct rtw_sta_info *si;
+-	struct ieee80211_vif *vif = NULL;
++	struct rtw_vif *rtwvif;
+ 	__le16 fc = hdr->frame_control;
+ 	bool bmc;
+ 
+ 	if (sta) {
+ 		si = (struct rtw_sta_info *)sta->drv_priv;
+-		vif = si->vif;
++		pkt_info->mac_id = si->mac_id;
++	} else if (vif) {
++		rtwvif = (struct rtw_vif *)vif->drv_priv;
++		pkt_info->mac_id = rtwvif->mac_id;
+ 	}
+ 
+ 	if (ieee80211_is_mgmt(fc) || ieee80211_is_nullfunc(fc))
+--- a/drivers/net/wireless/realtek/rtw88/tx.h
++++ b/drivers/net/wireless/realtek/rtw88/tx.h
+@@ -27,6 +27,7 @@ struct rtw_tx_desc {
+ #define RTW_TX_DESC_W0_BMC BIT(24)
+ #define RTW_TX_DESC_W0_LS BIT(26)
+ #define RTW_TX_DESC_W0_DISQSELSEQ BIT(31)
++#define RTW_TX_DESC_W1_MACID GENMASK(7, 0)
+ #define RTW_TX_DESC_W1_QSEL GENMASK(12, 8)
+ #define RTW_TX_DESC_W1_RATE_ID GENMASK(20, 16)
+ #define RTW_TX_DESC_W1_SEC_TYPE GENMASK(23, 22)

package/kernel/mac80211/patches/rtl/017-v6.13-wifi-rtw88-Constify-some-arrays-and-structs.patch

@@ -0,0 +1,374 @@
+From 140403599b74839b0a57c5397b7e8579e5332364 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 18 Sep 2024 01:53:55 +0300
+Subject: [PATCH] wifi: rtw88: Constify some arrays and structs
+
+These are never modified, so make them const:
+
+card_enable_flow_8703b
+card_disable_flow_8703b
+rtw8703b_ops
+
+rtw8723d_ops
+card_enable_flow_8723d
+card_disable_flow_8723d
+
+trans_carddis_to_cardemu_8821c
+trans_cardemu_to_act_8821c
+trans_act_to_cardemu_8821c
+trans_cardemu_to_carddis_8821c
+card_enable_flow_8821c
+card_disable_flow_8821c
+rtw8821c_dig
+page_table_8821c
+rqpn_table_8821c
+prioq_addrs_8821c
+rtw8821c_ops
+
+card_enable_flow_8822b
+card_disable_flow_8822b
+prioq_addrs_8822b
+rtw8822b_ops
+rtw8822b_edcca_th
+
+card_enable_flow_8822c
+card_disable_flow_8822c
+prioq_addrs_8822c
+rtw8822c_ops
+rtw8822c_edcca_th
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/dae7994f-3491-40de-b537-ebf68df084bb@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/fw.c       |  2 +-
+ drivers/net/wireless/realtek/rtw88/mac.c      |  4 ++--
+ drivers/net/wireless/realtek/rtw88/main.h     |  8 +++----
+ drivers/net/wireless/realtek/rtw88/phy.c      |  2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c |  6 ++---
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c |  6 ++---
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 22 +++++++++----------
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 10 ++++-----
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 10 ++++-----
+ 9 files changed, 35 insertions(+), 35 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/fw.c
++++ b/drivers/net/wireless/realtek/rtw88/fw.c
+@@ -267,7 +267,7 @@ static void rtw_fw_scan_result(struct rt
+ static void rtw_fw_adaptivity_result(struct rtw_dev *rtwdev, u8 *payload,
+ 				     u8 length)
+ {
+-	struct rtw_hw_reg_offset *edcca_th = rtwdev->chip->edcca_th;
++	const struct rtw_hw_reg_offset *edcca_th = rtwdev->chip->edcca_th;
+ 	struct rtw_c2h_adaptivity *result = (struct rtw_c2h_adaptivity *)payload;
+ 
+ 	rtw_dbg(rtwdev, RTW_DBG_ADAPTIVITY,
+--- a/drivers/net/wireless/realtek/rtw88/mac.c
++++ b/drivers/net/wireless/realtek/rtw88/mac.c
+@@ -228,7 +228,7 @@ static int rtw_sub_pwr_seq_parser(struct
+ }
+ 
+ static int rtw_pwr_seq_parser(struct rtw_dev *rtwdev,
+-			      const struct rtw_pwr_seq_cmd **cmd_seq)
++			      const struct rtw_pwr_seq_cmd * const *cmd_seq)
+ {
+ 	u8 cut_mask;
+ 	u8 intf_mask;
+@@ -271,7 +271,7 @@ static int rtw_pwr_seq_parser(struct rtw
+ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
+ {
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+-	const struct rtw_pwr_seq_cmd **pwr_seq;
++	const struct rtw_pwr_seq_cmd * const *pwr_seq;
+ 	u32 imr = 0;
+ 	u8 rpwm;
+ 	bool cur_pwr;
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1167,7 +1167,7 @@ enum rtw_fwcd_item {
+ 
+ /* hardware configuration for each IC */
+ struct rtw_chip_info {
+-	struct rtw_chip_ops *ops;
++	const struct rtw_chip_ops *ops;
+ 	u8 id;
+ 
+ 	const char *fw_name;
+@@ -1209,8 +1209,8 @@ struct rtw_chip_info {
+ 
+ 	/* init values */
+ 	u8 sys_func_en;
+-	const struct rtw_pwr_seq_cmd **pwr_on_seq;
+-	const struct rtw_pwr_seq_cmd **pwr_off_seq;
++	const struct rtw_pwr_seq_cmd * const *pwr_on_seq;
++	const struct rtw_pwr_seq_cmd * const *pwr_off_seq;
+ 	const struct rtw_rqpn *rqpn_table;
+ 	const struct rtw_prioq_addrs *prioq_addrs;
+ 	const struct rtw_page_table *page_table;
+@@ -1242,7 +1242,7 @@ struct rtw_chip_info {
+ 	u8 bfer_su_max_num;
+ 	u8 bfer_mu_max_num;
+ 
+-	struct rtw_hw_reg_offset *edcca_th;
++	const struct rtw_hw_reg_offset *edcca_th;
+ 	s8 l2h_th_ini_cs;
+ 	s8 l2h_th_ini_ad;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/phy.c
++++ b/drivers/net/wireless/realtek/rtw88/phy.c
+@@ -123,7 +123,7 @@ static void rtw_phy_cck_pd_init(struct r
+ 
+ void rtw_phy_set_edcca_th(struct rtw_dev *rtwdev, u8 l2h, u8 h2l)
+ {
+-	struct rtw_hw_reg_offset *edcca_th = rtwdev->chip->edcca_th;
++	const struct rtw_hw_reg_offset *edcca_th = rtwdev->chip->edcca_th;
+ 
+ 	rtw_write32_mask(rtwdev,
+ 			 edcca_th[EDCCA_TH_L2H_IDX].hw_reg.addr,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -481,14 +481,14 @@ static const struct rtw_pwr_seq_cmd tran
+ 	{TRANS_SEQ_END},
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_enable_flow_8703b[] = {
++static const struct rtw_pwr_seq_cmd * const card_enable_flow_8703b[] = {
+ 	trans_pre_enable_8703b,
+ 	trans_carddis_to_cardemu_8703b,
+ 	trans_cardemu_to_act_8703b,
+ 	NULL
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_disable_flow_8703b[] = {
++static const struct rtw_pwr_seq_cmd * const card_disable_flow_8703b[] = {
+ 	trans_act_to_lps_8703b,
+ 	trans_act_to_reset_mcu_8703b,
+ 	trans_act_to_cardemu_8703b,
+@@ -1941,7 +1941,7 @@ static const struct coex_tdma_para tdma_
+ 	{ {0x61, 0x08, 0x03, 0x11, 0x11} },
+ };
+ 
+-static struct rtw_chip_ops rtw8703b_ops = {
++static const struct rtw_chip_ops rtw8703b_ops = {
+ 	.mac_init		= rtw8723x_mac_init,
+ 	.dump_fw_crash		= NULL,
+ 	.shutdown		= NULL,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -1430,7 +1430,7 @@ static void rtw8723d_pwr_track(struct rt
+ 	dm_info->pwr_trk_triggered = false;
+ }
+ 
+-static struct rtw_chip_ops rtw8723d_ops = {
++static const struct rtw_chip_ops rtw8723d_ops = {
+ 	.phy_set_param		= rtw8723d_phy_set_param,
+ 	.read_efuse		= rtw8723x_read_efuse,
+ 	.query_rx_desc		= rtw8723d_query_rx_desc,
+@@ -1788,7 +1788,7 @@ static const struct rtw_pwr_seq_cmd tran
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_enable_flow_8723d[] = {
++static const struct rtw_pwr_seq_cmd * const card_enable_flow_8723d[] = {
+ 	trans_carddis_to_cardemu_8723d,
+ 	trans_cardemu_to_act_8723d,
+ 	NULL
+@@ -2004,7 +2004,7 @@ static const struct rtw_pwr_seq_cmd tran
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_disable_flow_8723d[] = {
++static const struct rtw_pwr_seq_cmd * const card_disable_flow_8723d[] = {
+ 	trans_act_to_lps_8723d,
+ 	trans_act_to_pre_carddis_8723d,
+ 	trans_act_to_cardemu_8723d,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -1254,7 +1254,7 @@ static void rtw8821c_fill_txdesc_checksu
+ 	fill_txdesc_checksum_common(txdesc, 16);
+ }
+ 
+-static struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8821c[] = {
++static const struct rtw_pwr_seq_cmd trans_carddis_to_cardemu_8821c[] = {
+ 	{0x0086,
+ 	 RTW_PWR_CUT_ALL_MSK,
+ 	 RTW_PWR_INTF_SDIO_MSK,
+@@ -1292,7 +1292,7 @@ static struct rtw_pwr_seq_cmd trans_card
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static struct rtw_pwr_seq_cmd trans_cardemu_to_act_8821c[] = {
++static const struct rtw_pwr_seq_cmd trans_cardemu_to_act_8821c[] = {
+ 	{0x0020,
+ 	 RTW_PWR_CUT_ALL_MSK,
+ 	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,
+@@ -1396,7 +1396,7 @@ static struct rtw_pwr_seq_cmd trans_card
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static struct rtw_pwr_seq_cmd trans_act_to_cardemu_8821c[] = {
++static const struct rtw_pwr_seq_cmd trans_act_to_cardemu_8821c[] = {
+ 	{0x0093,
+ 	 RTW_PWR_CUT_ALL_MSK,
+ 	 RTW_PWR_INTF_ALL_MSK,
+@@ -1454,7 +1454,7 @@ static struct rtw_pwr_seq_cmd trans_act_
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8821c[] = {
++static const struct rtw_pwr_seq_cmd trans_cardemu_to_carddis_8821c[] = {
+ 	{0x0007,
+ 	 RTW_PWR_CUT_ALL_MSK,
+ 	 RTW_PWR_INTF_USB_MSK | RTW_PWR_INTF_SDIO_MSK,
+@@ -1567,13 +1567,13 @@ static struct rtw_pwr_seq_cmd trans_card
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_enable_flow_8821c[] = {
++static const struct rtw_pwr_seq_cmd * const card_enable_flow_8821c[] = {
+ 	trans_carddis_to_cardemu_8821c,
+ 	trans_cardemu_to_act_8821c,
+ 	NULL
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_disable_flow_8821c[] = {
++static const struct rtw_pwr_seq_cmd * const card_disable_flow_8821c[] = {
+ 	trans_act_to_cardemu_8821c,
+ 	trans_cardemu_to_carddis_8821c,
+ 	NULL
+@@ -1629,7 +1629,7 @@ static const struct rtw_rfe_def rtw8821c
+ 	[6] = RTW_DEF_RFE(8821c, 0, 0),
+ };
+ 
+-static struct rtw_hw_reg rtw8821c_dig[] = {
++static const struct rtw_hw_reg rtw8821c_dig[] = {
+ 	[0] = { .addr = 0xc50, .mask = 0x7f },
+ };
+ 
+@@ -1639,7 +1639,7 @@ static const struct rtw_ltecoex_addr rtw
+ 	.rdata = LTECOEX_READ_DATA,
+ };
+ 
+-static struct rtw_page_table page_table_8821c[] = {
++static const struct rtw_page_table page_table_8821c[] = {
+ 	/* not sure what [0] stands for */
+ 	{16, 16, 16, 14, 1},
+ 	{16, 16, 16, 14, 1},
+@@ -1648,7 +1648,7 @@ static struct rtw_page_table page_table_
+ 	{16, 16, 16, 14, 1},
+ };
+ 
+-static struct rtw_rqpn rqpn_table_8821c[] = {
++static const struct rtw_rqpn rqpn_table_8821c[] = {
+ 	/* not sure what [0] stands for */
+ 	{RTW_DMA_MAPPING_NORMAL, RTW_DMA_MAPPING_NORMAL,
+ 	 RTW_DMA_MAPPING_LOW, RTW_DMA_MAPPING_LOW,
+@@ -1667,7 +1667,7 @@ static struct rtw_rqpn rqpn_table_8821c[
+ 	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},
+ };
+ 
+-static struct rtw_prioq_addrs prioq_addrs_8821c = {
++static const struct rtw_prioq_addrs prioq_addrs_8821c = {
+ 	.prio[RTW_DMA_MAPPING_EXTRA] = {
+ 		.rsvd = REG_FIFOPAGE_INFO_4, .avail = REG_FIFOPAGE_INFO_4 + 2,
+ 	},
+@@ -1683,7 +1683,7 @@ static struct rtw_prioq_addrs prioq_addr
+ 	.wsize = true,
+ };
+ 
+-static struct rtw_chip_ops rtw8821c_ops = {
++static const struct rtw_chip_ops rtw8821c_ops = {
+ 	.phy_set_param		= rtw8821c_phy_set_param,
+ 	.read_efuse		= rtw8821c_read_efuse,
+ 	.query_rx_desc		= rtw8821c_query_rx_desc,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -1978,13 +1978,13 @@ static const struct rtw_pwr_seq_cmd tran
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_enable_flow_8822b[] = {
++static const struct rtw_pwr_seq_cmd * const card_enable_flow_8822b[] = {
+ 	trans_carddis_to_cardemu_8822b,
+ 	trans_cardemu_to_act_8822b,
+ 	NULL
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_disable_flow_8822b[] = {
++static const struct rtw_pwr_seq_cmd * const card_disable_flow_8822b[] = {
+ 	trans_act_to_cardemu_8822b,
+ 	trans_cardemu_to_carddis_8822b,
+ 	NULL
+@@ -2156,7 +2156,7 @@ static const struct rtw_rqpn rqpn_table_
+ 	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},
+ };
+ 
+-static struct rtw_prioq_addrs prioq_addrs_8822b = {
++static const struct rtw_prioq_addrs prioq_addrs_8822b = {
+ 	.prio[RTW_DMA_MAPPING_EXTRA] = {
+ 		.rsvd = REG_FIFOPAGE_INFO_4, .avail = REG_FIFOPAGE_INFO_4 + 2,
+ 	},
+@@ -2172,7 +2172,7 @@ static struct rtw_prioq_addrs prioq_addr
+ 	.wsize = true,
+ };
+ 
+-static struct rtw_chip_ops rtw8822b_ops = {
++static const struct rtw_chip_ops rtw8822b_ops = {
+ 	.phy_set_param		= rtw8822b_phy_set_param,
+ 	.read_efuse		= rtw8822b_read_efuse,
+ 	.query_rx_desc		= rtw8822b_query_rx_desc,
+@@ -2521,7 +2521,7 @@ static const struct rtw_reg_domain coex_
+ 	{0xc50,  MASKBYTE0, RTW_REG_DOMAIN_MAC8},
+ };
+ 
+-static struct rtw_hw_reg_offset rtw8822b_edcca_th[] = {
++static const struct rtw_hw_reg_offset rtw8822b_edcca_th[] = {
+ 	[EDCCA_TH_L2H_IDX] = {{.addr = 0x8a4, .mask = MASKBYTE0}, .offset = 0},
+ 	[EDCCA_TH_H2L_IDX] = {{.addr = 0x8a4, .mask = MASKBYTE1}, .offset = 0},
+ };
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -4874,13 +4874,13 @@ static const struct rtw_pwr_seq_cmd tran
+ 	 RTW_PWR_CMD_END, 0, 0},
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_enable_flow_8822c[] = {
++static const struct rtw_pwr_seq_cmd * const card_enable_flow_8822c[] = {
+ 	trans_carddis_to_cardemu_8822c,
+ 	trans_cardemu_to_act_8822c,
+ 	NULL
+ };
+ 
+-static const struct rtw_pwr_seq_cmd *card_disable_flow_8822c[] = {
++static const struct rtw_pwr_seq_cmd * const card_disable_flow_8822c[] = {
+ 	trans_act_to_cardemu_8822c,
+ 	trans_cardemu_to_carddis_8822c,
+ 	NULL
+@@ -4972,7 +4972,7 @@ static const struct rtw_rqpn rqpn_table_
+ 	 RTW_DMA_MAPPING_EXTRA, RTW_DMA_MAPPING_HIGH},
+ };
+ 
+-static struct rtw_prioq_addrs prioq_addrs_8822c = {
++static const struct rtw_prioq_addrs prioq_addrs_8822c = {
+ 	.prio[RTW_DMA_MAPPING_EXTRA] = {
+ 		.rsvd = REG_FIFOPAGE_INFO_4, .avail = REG_FIFOPAGE_INFO_4 + 2,
+ 	},
+@@ -4988,7 +4988,7 @@ static struct rtw_prioq_addrs prioq_addr
+ 	.wsize = true,
+ };
+ 
+-static struct rtw_chip_ops rtw8822c_ops = {
++static const struct rtw_chip_ops rtw8822c_ops = {
+ 	.phy_set_param		= rtw8822c_phy_set_param,
+ 	.read_efuse		= rtw8822c_read_efuse,
+ 	.query_rx_desc		= rtw8822c_query_rx_desc,
+@@ -5301,7 +5301,7 @@ static const struct rtw_pwr_track_tbl rt
+ 	.pwrtrk_2g_ccka_p = rtw8822c_pwrtrk_2g_cck_a_p,
+ };
+ 
+-static struct rtw_hw_reg_offset rtw8822c_edcca_th[] = {
++static const struct rtw_hw_reg_offset rtw8822c_edcca_th[] = {
+ 	[EDCCA_TH_L2H_IDX] = {
+ 		{.addr = 0x84c, .mask = MASKBYTE2}, .offset = 0x80
+ 	},

package/kernel/mac80211/patches/rtl/019-v6.13-wifi-rtw88-Parse-the-RX-descriptor-with-a-single-fun.patch

@@ -0,0 +1,560 @@
+From bbb6f9be7f99464d5ab7e2f321fa728d33eeec9a Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Fri, 20 Sep 2024 22:27:30 +0300
+Subject: [PATCH] wifi: rtw88: Parse the RX descriptor with a single function
+
+rtw8703b_query_rx_desc(), rtw8723d_query_rx_desc(),
+rtw8821c_query_rx_desc(), rtw8822b_query_rx_desc(), and
+rtw8822c_query_rx_desc() are almost identical, so replace them all with
+a single function, rtw_rx_query_rx_desc().
+
+Also, access the RX descriptor using a struct with __le32 members and
+le32_get_bits().
+
+Tested with RTL8811CU, RTL8811AU, and RTL8812AU.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Tested-by: Ping-Ke Shih <pkshih@realtek.com> # RTL8723DE and RTL8822CE
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/913f1747-38fc-4409-85a4-57bb9cee506b@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.h     |  5 +-
+ drivers/net/wireless/realtek/rtw88/pci.c      |  2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 56 +--------------
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 43 +-----------
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 43 +-----------
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 43 +-----------
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 44 +-----------
+ drivers/net/wireless/realtek/rtw88/rx.c       | 70 +++++++++++++++++--
+ drivers/net/wireless/realtek/rtw88/rx.h       | 64 ++++++++---------
+ drivers/net/wireless/realtek/rtw88/sdio.c     |  3 +-
+ drivers/net/wireless/realtek/rtw88/usb.c      |  4 +-
+ 11 files changed, 106 insertions(+), 271 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -848,9 +848,8 @@ struct rtw_chip_ops {
+ 	void (*phy_set_param)(struct rtw_dev *rtwdev);
+ 	void (*set_channel)(struct rtw_dev *rtwdev, u8 channel,
+ 			    u8 bandwidth, u8 primary_chan_idx);
+-	void (*query_rx_desc)(struct rtw_dev *rtwdev, u8 *rx_desc,
+-			      struct rtw_rx_pkt_stat *pkt_stat,
+-			      struct ieee80211_rx_status *rx_status);
++	void (*query_phy_status)(struct rtw_dev *rtwdev, u8 *phy_status,
++				 struct rtw_rx_pkt_stat *pkt_stat);
+ 	u32 (*read_rf)(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,
+ 		       u32 addr, u32 mask);
+ 	bool (*write_rf)(struct rtw_dev *rtwdev, enum rtw_rf_path rf_path,
+--- a/drivers/net/wireless/realtek/rtw88/pci.c
++++ b/drivers/net/wireless/realtek/rtw88/pci.c
+@@ -1065,7 +1065,7 @@ static u32 rtw_pci_rx_napi(struct rtw_de
+ 		dma_sync_single_for_cpu(rtwdev->dev, dma, RTK_PCI_RX_BUF_SIZE,
+ 					DMA_FROM_DEVICE);
+ 		rx_desc = skb->data;
+-		chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat, &rx_status);
++		rtw_rx_query_rx_desc(rtwdev, rx_desc, &pkt_stat, &rx_status);
+ 
+ 		/* offset from rx_desc to payload */
+ 		pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -29,9 +29,6 @@
+ #define TBTT_PROHIBIT_HOLD_TIME 0x80
+ #define TBTT_PROHIBIT_HOLD_TIME_STOP_BCN 0x64
+ 
+-/* raw pkt_stat->drv_info_sz is in unit of 8-bytes */
+-#define RX_DRV_INFO_SZ_UNIT_8703B 8
+-
+ #define TRANS_SEQ_END			\
+ 	0xFFFF,				\
+ 	RTW_PWR_CUT_ALL_MSK,		\
+@@ -1032,57 +1029,6 @@ static void query_phy_status(struct rtw_
+ 		query_phy_status_ofdm(rtwdev, phy_status, pkt_stat);
+ }
+ 
+-static void rtw8703b_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,
+-				   struct rtw_rx_pkt_stat *pkt_stat,
+-				   struct ieee80211_rx_status *rx_status)
+-{
+-	struct ieee80211_hdr *hdr;
+-	u32 desc_sz = rtwdev->chip->rx_pkt_desc_sz;
+-	u8 *phy_status = NULL;
+-
+-	memset(pkt_stat, 0, sizeof(*pkt_stat));
+-
+-	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);
+-	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);
+-	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);
+-	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&
+-			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;
+-	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);
+-	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);
+-	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);
+-	pkt_stat->shift = GET_RX_DESC_SHIFT(rx_desc);
+-	pkt_stat->rate = GET_RX_DESC_RX_RATE(rx_desc);
+-	pkt_stat->cam_id = GET_RX_DESC_MACID(rx_desc);
+-	pkt_stat->ppdu_cnt = 0;
+-	pkt_stat->tsf_low = GET_RX_DESC_TSFL(rx_desc);
+-
+-	pkt_stat->drv_info_sz *= RX_DRV_INFO_SZ_UNIT_8703B;
+-
+-	if (pkt_stat->is_c2h)
+-		return;
+-
+-	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat->shift +
+-				       pkt_stat->drv_info_sz);
+-
+-	pkt_stat->bw = GET_RX_DESC_BW(rx_desc);
+-
+-	if (pkt_stat->phy_status) {
+-		phy_status = rx_desc + desc_sz + pkt_stat->shift;
+-		query_phy_status(rtwdev, phy_status, pkt_stat);
+-	}
+-
+-	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);
+-
+-	/* Rtl8723cs driver checks for size < 14 or size > 8192 and
+-	 * simply drops the packet. Maybe this should go into
+-	 * rtw_rx_fill_rx_status()?
+-	 */
+-	if (pkt_stat->pkt_len == 0) {
+-		rx_status->flag |= RX_FLAG_NO_PSDU;
+-		rtw_dbg(rtwdev, RTW_DBG_RX, "zero length packet");
+-	}
+-}
+-
+ #define ADDA_ON_VAL_8703B 0x03c00014
+ 
+ static
+@@ -1948,7 +1894,7 @@ static const struct rtw_chip_ops rtw8703
+ 	.read_efuse		= rtw8703b_read_efuse,
+ 	.phy_set_param		= rtw8703b_phy_set_param,
+ 	.set_channel		= rtw8703b_set_channel,
+-	.query_rx_desc		= rtw8703b_query_rx_desc,
++	.query_phy_status	= query_phy_status,
+ 	.read_rf		= rtw_phy_read_rf_sipi,
+ 	.write_rf		= rtw_phy_write_rf_reg_sipi,
+ 	.set_tx_power_index	= rtw8723x_set_tx_power_index,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -227,47 +227,6 @@ static void query_phy_status(struct rtw_
+ 	}
+ }
+ 
+-static void rtw8723d_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,
+-				   struct rtw_rx_pkt_stat *pkt_stat,
+-				   struct ieee80211_rx_status *rx_status)
+-{
+-	struct ieee80211_hdr *hdr;
+-	u32 desc_sz = rtwdev->chip->rx_pkt_desc_sz;
+-	u8 *phy_status = NULL;
+-
+-	memset(pkt_stat, 0, sizeof(*pkt_stat));
+-
+-	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);
+-	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);
+-	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);
+-	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&
+-			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;
+-	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);
+-	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);
+-	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);
+-	pkt_stat->shift = GET_RX_DESC_SHIFT(rx_desc);
+-	pkt_stat->rate = GET_RX_DESC_RX_RATE(rx_desc);
+-	pkt_stat->cam_id = GET_RX_DESC_MACID(rx_desc);
+-	pkt_stat->ppdu_cnt = 0;
+-	pkt_stat->tsf_low = GET_RX_DESC_TSFL(rx_desc);
+-
+-	/* drv_info_sz is in unit of 8-bytes */
+-	pkt_stat->drv_info_sz *= 8;
+-
+-	/* c2h cmd pkt's rx/phy status is not interested */
+-	if (pkt_stat->is_c2h)
+-		return;
+-
+-	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat->shift +
+-				       pkt_stat->drv_info_sz);
+-	if (pkt_stat->phy_status) {
+-		phy_status = rx_desc + desc_sz + pkt_stat->shift;
+-		query_phy_status(rtwdev, phy_status, pkt_stat);
+-	}
+-
+-	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);
+-}
+-
+ static bool rtw8723d_check_spur_ov_thres(struct rtw_dev *rtwdev,
+ 					 u8 channel, u32 thres)
+ {
+@@ -1433,7 +1392,7 @@ static void rtw8723d_pwr_track(struct rt
+ static const struct rtw_chip_ops rtw8723d_ops = {
+ 	.phy_set_param		= rtw8723d_phy_set_param,
+ 	.read_efuse		= rtw8723x_read_efuse,
+-	.query_rx_desc		= rtw8723d_query_rx_desc,
++	.query_phy_status	= query_phy_status,
+ 	.set_channel		= rtw8723d_set_channel,
+ 	.mac_init		= rtw8723x_mac_init,
+ 	.shutdown		= rtw8723d_shutdown,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -679,47 +679,6 @@ static void query_phy_status(struct rtw_
+ 	}
+ }
+ 
+-static void rtw8821c_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,
+-				   struct rtw_rx_pkt_stat *pkt_stat,
+-				   struct ieee80211_rx_status *rx_status)
+-{
+-	struct ieee80211_hdr *hdr;
+-	u32 desc_sz = rtwdev->chip->rx_pkt_desc_sz;
+-	u8 *phy_status = NULL;
+-
+-	memset(pkt_stat, 0, sizeof(*pkt_stat));
+-
+-	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);
+-	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);
+-	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);
+-	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&
+-			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;
+-	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);
+-	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);
+-	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);
+-	pkt_stat->shift = GET_RX_DESC_SHIFT(rx_desc);
+-	pkt_stat->rate = GET_RX_DESC_RX_RATE(rx_desc);
+-	pkt_stat->cam_id = GET_RX_DESC_MACID(rx_desc);
+-	pkt_stat->ppdu_cnt = GET_RX_DESC_PPDU_CNT(rx_desc);
+-	pkt_stat->tsf_low = GET_RX_DESC_TSFL(rx_desc);
+-
+-	/* drv_info_sz is in unit of 8-bytes */
+-	pkt_stat->drv_info_sz *= 8;
+-
+-	/* c2h cmd pkt's rx/phy status is not interested */
+-	if (pkt_stat->is_c2h)
+-		return;
+-
+-	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat->shift +
+-				       pkt_stat->drv_info_sz);
+-	if (pkt_stat->phy_status) {
+-		phy_status = rx_desc + desc_sz + pkt_stat->shift;
+-		query_phy_status(rtwdev, phy_status, pkt_stat);
+-	}
+-
+-	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);
+-}
+-
+ static void
+ rtw8821c_set_tx_power_index_by_rate(struct rtw_dev *rtwdev, u8 path, u8 rs)
+ {
+@@ -1686,7 +1645,7 @@ static const struct rtw_prioq_addrs prio
+ static const struct rtw_chip_ops rtw8821c_ops = {
+ 	.phy_set_param		= rtw8821c_phy_set_param,
+ 	.read_efuse		= rtw8821c_read_efuse,
+-	.query_rx_desc		= rtw8821c_query_rx_desc,
++	.query_phy_status	= query_phy_status,
+ 	.set_channel		= rtw8821c_set_channel,
+ 	.mac_init		= rtw8821c_mac_init,
+ 	.read_rf		= rtw_phy_read_rf,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -934,47 +934,6 @@ static void query_phy_status(struct rtw_
+ 	}
+ }
+ 
+-static void rtw8822b_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,
+-				   struct rtw_rx_pkt_stat *pkt_stat,
+-				   struct ieee80211_rx_status *rx_status)
+-{
+-	struct ieee80211_hdr *hdr;
+-	u32 desc_sz = rtwdev->chip->rx_pkt_desc_sz;
+-	u8 *phy_status = NULL;
+-
+-	memset(pkt_stat, 0, sizeof(*pkt_stat));
+-
+-	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);
+-	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);
+-	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);
+-	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&
+-			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;
+-	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);
+-	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);
+-	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);
+-	pkt_stat->shift = GET_RX_DESC_SHIFT(rx_desc);
+-	pkt_stat->rate = GET_RX_DESC_RX_RATE(rx_desc);
+-	pkt_stat->cam_id = GET_RX_DESC_MACID(rx_desc);
+-	pkt_stat->ppdu_cnt = GET_RX_DESC_PPDU_CNT(rx_desc);
+-	pkt_stat->tsf_low = GET_RX_DESC_TSFL(rx_desc);
+-
+-	/* drv_info_sz is in unit of 8-bytes */
+-	pkt_stat->drv_info_sz *= 8;
+-
+-	/* c2h cmd pkt's rx/phy status is not interested */
+-	if (pkt_stat->is_c2h)
+-		return;
+-
+-	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat->shift +
+-				       pkt_stat->drv_info_sz);
+-	if (pkt_stat->phy_status) {
+-		phy_status = rx_desc + desc_sz + pkt_stat->shift;
+-		query_phy_status(rtwdev, phy_status, pkt_stat);
+-	}
+-
+-	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);
+-}
+-
+ static void
+ rtw8822b_set_tx_power_index_by_rate(struct rtw_dev *rtwdev, u8 path, u8 rs)
+ {
+@@ -2175,7 +2134,7 @@ static const struct rtw_prioq_addrs prio
+ static const struct rtw_chip_ops rtw8822b_ops = {
+ 	.phy_set_param		= rtw8822b_phy_set_param,
+ 	.read_efuse		= rtw8822b_read_efuse,
+-	.query_rx_desc		= rtw8822b_query_rx_desc,
++	.query_phy_status	= query_phy_status,
+ 	.set_channel		= rtw8822b_set_channel,
+ 	.mac_init		= rtw8822b_mac_init,
+ 	.read_rf		= rtw_phy_read_rf,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -2690,48 +2690,6 @@ static void query_phy_status(struct rtw_
+ 	}
+ }
+ 
+-static void rtw8822c_query_rx_desc(struct rtw_dev *rtwdev, u8 *rx_desc,
+-				   struct rtw_rx_pkt_stat *pkt_stat,
+-				   struct ieee80211_rx_status *rx_status)
+-{
+-	struct ieee80211_hdr *hdr;
+-	u32 desc_sz = rtwdev->chip->rx_pkt_desc_sz;
+-	u8 *phy_status = NULL;
+-
+-	memset(pkt_stat, 0, sizeof(*pkt_stat));
+-
+-	pkt_stat->phy_status = GET_RX_DESC_PHYST(rx_desc);
+-	pkt_stat->icv_err = GET_RX_DESC_ICV_ERR(rx_desc);
+-	pkt_stat->crc_err = GET_RX_DESC_CRC32(rx_desc);
+-	pkt_stat->decrypted = !GET_RX_DESC_SWDEC(rx_desc) &&
+-			      GET_RX_DESC_ENC_TYPE(rx_desc) != RX_DESC_ENC_NONE;
+-	pkt_stat->is_c2h = GET_RX_DESC_C2H(rx_desc);
+-	pkt_stat->pkt_len = GET_RX_DESC_PKT_LEN(rx_desc);
+-	pkt_stat->drv_info_sz = GET_RX_DESC_DRV_INFO_SIZE(rx_desc);
+-	pkt_stat->shift = GET_RX_DESC_SHIFT(rx_desc);
+-	pkt_stat->rate = GET_RX_DESC_RX_RATE(rx_desc);
+-	pkt_stat->cam_id = GET_RX_DESC_MACID(rx_desc);
+-	pkt_stat->ppdu_cnt = GET_RX_DESC_PPDU_CNT(rx_desc);
+-	pkt_stat->tsf_low = GET_RX_DESC_TSFL(rx_desc);
+-
+-	/* drv_info_sz is in unit of 8-bytes */
+-	pkt_stat->drv_info_sz *= 8;
+-
+-	/* c2h cmd pkt's rx/phy status is not interested */
+-	if (pkt_stat->is_c2h)
+-		return;
+-
+-	hdr = (struct ieee80211_hdr *)(rx_desc + desc_sz + pkt_stat->shift +
+-				       pkt_stat->drv_info_sz);
+-	pkt_stat->hdr = hdr;
+-	if (pkt_stat->phy_status) {
+-		phy_status = rx_desc + desc_sz + pkt_stat->shift;
+-		query_phy_status(rtwdev, phy_status, pkt_stat);
+-	}
+-
+-	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status, phy_status);
+-}
+-
+ static void
+ rtw8822c_set_write_tx_power_ref(struct rtw_dev *rtwdev, u8 *tx_pwr_ref_cck,
+ 				u8 *tx_pwr_ref_ofdm)
+@@ -4991,7 +4949,7 @@ static const struct rtw_prioq_addrs prio
+ static const struct rtw_chip_ops rtw8822c_ops = {
+ 	.phy_set_param		= rtw8822c_phy_set_param,
+ 	.read_efuse		= rtw8822c_read_efuse,
+-	.query_rx_desc		= rtw8822c_query_rx_desc,
++	.query_phy_status	= query_phy_status,
+ 	.set_channel		= rtw8822c_set_channel,
+ 	.mac_init		= rtw8822c_mac_init,
+ 	.dump_fw_crash		= rtw8822c_dump_fw_crash,
+--- a/drivers/net/wireless/realtek/rtw88/rx.c
++++ b/drivers/net/wireless/realtek/rtw88/rx.c
+@@ -187,11 +187,10 @@ fill_rx_status:
+ }
+ EXPORT_SYMBOL(rtw_update_rx_freq_from_ie);
+ 
+-void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
+-			   struct rtw_rx_pkt_stat *pkt_stat,
+-			   struct ieee80211_hdr *hdr,
+-			   struct ieee80211_rx_status *rx_status,
+-			   u8 *phy_status)
++static void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
++				  struct rtw_rx_pkt_stat *pkt_stat,
++				  struct ieee80211_hdr *hdr,
++				  struct ieee80211_rx_status *rx_status)
+ {
+ 	struct ieee80211_hw *hw = rtwdev->hw;
+ 	u8 path;
+@@ -242,5 +241,64 @@ void rtw_rx_fill_rx_status(struct rtw_de
+ 	}
+ 
+ 	rtw_rx_addr_match(rtwdev, pkt_stat, hdr);
++
++	/* Rtl8723cs driver checks for size < 14 or size > 8192 and
++	 * simply drops the packet.
++	 */
++	if (rtwdev->chip->id == RTW_CHIP_TYPE_8703B && pkt_stat->pkt_len == 0) {
++		rx_status->flag |= RX_FLAG_NO_PSDU;
++		rtw_dbg(rtwdev, RTW_DBG_RX, "zero length packet");
++	}
++}
++
++void rtw_rx_query_rx_desc(struct rtw_dev *rtwdev, void *rx_desc8,
++			  struct rtw_rx_pkt_stat *pkt_stat,
++			  struct ieee80211_rx_status *rx_status)
++{
++	u32 desc_sz = rtwdev->chip->rx_pkt_desc_sz;
++	struct rtw_rx_desc *rx_desc = rx_desc8;
++	struct ieee80211_hdr *hdr;
++	u32 enc_type, swdec;
++	void *phy_status;
++
++	memset(pkt_stat, 0, sizeof(*pkt_stat));
++
++	pkt_stat->pkt_len = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_PKT_LEN);
++	pkt_stat->crc_err = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_CRC32);
++	pkt_stat->icv_err = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_ICV_ERR);
++	pkt_stat->drv_info_sz = le32_get_bits(rx_desc->w0,
++					      RTW_RX_DESC_W0_DRV_INFO_SIZE);
++	enc_type = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_ENC_TYPE);
++	pkt_stat->shift = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_SHIFT);
++	pkt_stat->phy_status = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_PHYST);
++	swdec = le32_get_bits(rx_desc->w0, RTW_RX_DESC_W0_SWDEC);
++	pkt_stat->decrypted = !swdec && enc_type != RX_DESC_ENC_NONE;
++
++	pkt_stat->cam_id = le32_get_bits(rx_desc->w1, RTW_RX_DESC_W1_MACID);
++
++	pkt_stat->is_c2h = le32_get_bits(rx_desc->w2, RTW_RX_DESC_W2_C2H);
++	pkt_stat->ppdu_cnt = le32_get_bits(rx_desc->w2, RTW_RX_DESC_W2_PPDU_CNT);
++
++	pkt_stat->rate = le32_get_bits(rx_desc->w3, RTW_RX_DESC_W3_RX_RATE);
++
++	pkt_stat->bw = le32_get_bits(rx_desc->w4, RTW_RX_DESC_W4_BW);
++
++	pkt_stat->tsf_low = le32_get_bits(rx_desc->w5, RTW_RX_DESC_W5_TSFL);
++
++	/* drv_info_sz is in unit of 8-bytes */
++	pkt_stat->drv_info_sz *= 8;
++
++	/* c2h cmd pkt's rx/phy status is not interested */
++	if (pkt_stat->is_c2h)
++		return;
++
++	phy_status = rx_desc8 + desc_sz + pkt_stat->shift;
++	hdr = phy_status + pkt_stat->drv_info_sz;
++	pkt_stat->hdr = hdr;
++
++	if (pkt_stat->phy_status)
++		rtwdev->chip->ops->query_phy_status(rtwdev, phy_status, pkt_stat);
++
++	rtw_rx_fill_rx_status(rtwdev, pkt_stat, hdr, rx_status);
+ }
+-EXPORT_SYMBOL(rtw_rx_fill_rx_status);
++EXPORT_SYMBOL(rtw_rx_query_rx_desc);
+--- a/drivers/net/wireless/realtek/rtw88/rx.h
++++ b/drivers/net/wireless/realtek/rtw88/rx.h
+@@ -14,42 +14,40 @@ enum rtw_rx_desc_enc {
+ 	RX_DESC_ENC_WEP104	= 5,
+ };
+ 
+-#define GET_RX_DESC_PHYST(rxdesc)                                              \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(26))
+-#define GET_RX_DESC_ICV_ERR(rxdesc)                                            \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(15))
+-#define GET_RX_DESC_CRC32(rxdesc)                                              \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(14))
+-#define GET_RX_DESC_SWDEC(rxdesc)                                              \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), BIT(27))
+-#define GET_RX_DESC_C2H(rxdesc)                                                \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x02), BIT(28))
+-#define GET_RX_DESC_PKT_LEN(rxdesc)                                            \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(13, 0))
+-#define GET_RX_DESC_DRV_INFO_SIZE(rxdesc)                                      \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(19, 16))
+-#define GET_RX_DESC_SHIFT(rxdesc)                                              \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(25, 24))
+-#define GET_RX_DESC_ENC_TYPE(rxdesc)                                           \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x00), GENMASK(22, 20))
+-#define GET_RX_DESC_RX_RATE(rxdesc)                                            \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x03), GENMASK(6, 0))
+-#define GET_RX_DESC_MACID(rxdesc)                                              \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x01), GENMASK(6, 0))
+-#define GET_RX_DESC_PPDU_CNT(rxdesc)                                           \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x02), GENMASK(30, 29))
+-#define GET_RX_DESC_TSFL(rxdesc)                                               \
+-	le32_get_bits(*((__le32 *)(rxdesc) + 0x05), GENMASK(31, 0))
+-#define GET_RX_DESC_BW(rxdesc)                                                 \
+-	(le32_get_bits(*((__le32 *)(rxdesc) + 0x04), GENMASK(5, 4)))
++struct rtw_rx_desc {
++	__le32 w0;
++	__le32 w1;
++	__le32 w2;
++	__le32 w3;
++	__le32 w4;
++	__le32 w5;
++} __packed;
++
++#define RTW_RX_DESC_W0_PKT_LEN		GENMASK(13, 0)
++#define RTW_RX_DESC_W0_CRC32		BIT(14)
++#define RTW_RX_DESC_W0_ICV_ERR		BIT(15)
++#define RTW_RX_DESC_W0_DRV_INFO_SIZE	GENMASK(19, 16)
++#define RTW_RX_DESC_W0_ENC_TYPE		GENMASK(22, 20)
++#define RTW_RX_DESC_W0_SHIFT		GENMASK(25, 24)
++#define RTW_RX_DESC_W0_PHYST		BIT(26)
++#define RTW_RX_DESC_W0_SWDEC		BIT(27)
++
++#define RTW_RX_DESC_W1_MACID		GENMASK(6, 0)
++
++#define RTW_RX_DESC_W2_C2H		BIT(28)
++#define RTW_RX_DESC_W2_PPDU_CNT		GENMASK(30, 29)
++
++#define RTW_RX_DESC_W3_RX_RATE		GENMASK(6, 0)
++
++#define RTW_RX_DESC_W4_BW		GENMASK(5, 4)
++
++#define RTW_RX_DESC_W5_TSFL		GENMASK(31, 0)
+ 
+ void rtw_rx_stats(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
+ 		  struct sk_buff *skb);
+-void rtw_rx_fill_rx_status(struct rtw_dev *rtwdev,
+-			   struct rtw_rx_pkt_stat *pkt_stat,
+-			   struct ieee80211_hdr *hdr,
+-			   struct ieee80211_rx_status *rx_status,
+-			   u8 *phy_status);
++void rtw_rx_query_rx_desc(struct rtw_dev *rtwdev, void *rx_desc8,
++			  struct rtw_rx_pkt_stat *pkt_stat,
++			  struct ieee80211_rx_status *rx_status);
+ void rtw_update_rx_freq_from_ie(struct rtw_dev *rtwdev, struct sk_buff *skb,
+ 				struct ieee80211_rx_status *rx_status,
+ 				struct rtw_rx_pkt_stat *pkt_stat);
+--- a/drivers/net/wireless/realtek/rtw88/sdio.c
++++ b/drivers/net/wireless/realtek/rtw88/sdio.c
+@@ -981,8 +981,7 @@ static void rtw_sdio_rxfifo_recv(struct
+ 
+ 	while (true) {
+ 		rx_desc = skb->data;
+-		chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat,
+-					 &rx_status);
++		rtw_rx_query_rx_desc(rtwdev, rx_desc, &pkt_stat, &rx_status);
+ 		pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +
+ 			     pkt_stat.shift;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -570,8 +570,8 @@ static void rtw_usb_rx_handler(struct wo
+ 
+ 		do {
+ 			rx_desc = skb->data;
+-			chip->ops->query_rx_desc(rtwdev, rx_desc, &pkt_stat,
+-						 &rx_status);
++			rtw_rx_query_rx_desc(rtwdev, rx_desc, &pkt_stat,
++					     &rx_status);
+ 			pkt_offset = pkt_desc_sz + pkt_stat.drv_info_sz +
+ 				     pkt_stat.shift;
+ 

package/kernel/mac80211/patches/rtl/020-v6.12-wifi-rtw88-Fix-the-RX-aggregation-in-USB-3-mode.patch

@@ -0,0 +1,70 @@
+From 4aefde403da7af30757915e0462d88398c9388c5 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Tue, 8 Oct 2024 21:44:02 +0300
+Subject: [PATCH] wifi: rtw88: Fix the RX aggregation in USB 3 mode
+
+RTL8822CU, RTL8822BU, and RTL8821CU don't need BIT_EN_PRE_CALC.
+In fact, RTL8822BU in USB 3 mode doesn't pass all the frames to the
+driver, resulting in much lower download speed than normal:
+
+$ iperf3 -c 192.168.0.1 -R
+Connecting to host 192.168.0.1, port 5201
+Reverse mode, remote host 192.168.0.1 is sending
+[  5] local 192.168.0.50 port 43062 connected to 192.168.0.1 port 5201
+[ ID] Interval           Transfer     Bitrate
+[  5]   0.00-1.00   sec  26.9 MBytes   225 Mbits/sec
+[  5]   1.00-2.00   sec  7.50 MBytes  62.9 Mbits/sec
+[  5]   2.00-3.00   sec  8.50 MBytes  71.3 Mbits/sec
+[  5]   3.00-4.00   sec  8.38 MBytes  70.3 Mbits/sec
+[  5]   4.00-5.00   sec  7.75 MBytes  65.0 Mbits/sec
+[  5]   5.00-6.00   sec  8.00 MBytes  67.1 Mbits/sec
+[  5]   6.00-7.00   sec  8.00 MBytes  67.1 Mbits/sec
+[  5]   7.00-8.00   sec  7.75 MBytes  65.0 Mbits/sec
+[  5]   8.00-9.00   sec  7.88 MBytes  66.1 Mbits/sec
+[  5]   9.00-10.00  sec  7.88 MBytes  66.1 Mbits/sec
+- - - - - - - - - - - - - - - - - - - - - - - - -
+[ ID] Interval           Transfer     Bitrate         Retr
+[  5]   0.00-10.02  sec   102 MBytes  85.1 Mbits/sec  224             sender
+[  5]   0.00-10.00  sec  98.6 MBytes  82.7 Mbits/sec                  receiver
+
+Don't set BIT_EN_PRE_CALC. Then the speed is much better:
+
+% iperf3 -c 192.168.0.1 -R
+Connecting to host 192.168.0.1, port 5201
+Reverse mode, remote host 192.168.0.1 is sending
+[  5] local 192.168.0.50 port 39000 connected to 192.168.0.1 port 5201
+[ ID] Interval           Transfer     Bitrate
+[  5]   0.00-1.00   sec  52.8 MBytes   442 Mbits/sec
+[  5]   1.00-2.00   sec  71.9 MBytes   603 Mbits/sec
+[  5]   2.00-3.00   sec  74.8 MBytes   627 Mbits/sec
+[  5]   3.00-4.00   sec  75.9 MBytes   636 Mbits/sec
+[  5]   4.00-5.00   sec  76.0 MBytes   638 Mbits/sec
+[  5]   5.00-6.00   sec  74.1 MBytes   622 Mbits/sec
+[  5]   6.00-7.00   sec  74.0 MBytes   621 Mbits/sec
+[  5]   7.00-8.00   sec  76.0 MBytes   638 Mbits/sec
+[  5]   8.00-9.00   sec  74.4 MBytes   624 Mbits/sec
+[  5]   9.00-10.00  sec  63.9 MBytes   536 Mbits/sec
+- - - - - - - - - - - - - - - - - - - - - - - - -
+[ ID] Interval           Transfer     Bitrate         Retr
+[  5]   0.00-10.00  sec   717 MBytes   601 Mbits/sec   24             sender
+[  5]   0.00-10.00  sec   714 MBytes   599 Mbits/sec                  receiver
+
+Fixes: 002a5db9a52a ("wifi: rtw88: Enable USB RX aggregation for 8822c/8822b/8821c")
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Kalle Valo <kvalo@kernel.org>
+Link: https://patch.msgid.link/afb94a82-3d18-459e-97fc-1a217608cdf0@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -771,7 +771,6 @@ static void rtw_usb_dynamic_rx_agg_v1(st
+ 	u8 size, timeout;
+ 	u16 val16;
+ 
+-	rtw_write32_set(rtwdev, REG_RXDMA_AGG_PG_TH, BIT_EN_PRE_CALC);
+ 	rtw_write8_set(rtwdev, REG_TXDMA_PQ_MAP, BIT_RXDMA_AGG_EN);
+ 	rtw_write8_clr(rtwdev, REG_RXDMA_AGG_PG_TH + 3, BIT(7));
+ 

package/kernel/mac80211/patches/rtl/022-v6.13-wifi-rtw88-Refactor-looping-in-rtw_phy_store_tx_powe.patch

@@ -0,0 +1,34 @@
+From 7846f0b63562f4db45f712cc7dab091985baf07b Mon Sep 17 00:00:00 2001
+From: Mohammed Anees <pvmohammedanees2003@gmail.com>
+Date: Thu, 17 Oct 2024 13:36:38 +0530
+Subject: [PATCH] wifi: rtw88: Refactor looping in
+ rtw_phy_store_tx_power_by_rate
+
+The previous implementation included an unnecessary else
+condition paired with a continue statement. Since a check
+is already performed to determine if the band is either
+2G or 5G, the else condition will never be triggered.
+We can remove this check.
+
+Signed-off-by: Mohammed Anees <pvmohammedanees2003@gmail.com>
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/20241017080638.13074-1-pvmohammedanees2003@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/phy.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/phy.c
++++ b/drivers/net/wireless/realtek/rtw88/phy.c
+@@ -1470,10 +1470,8 @@ static void rtw_phy_store_tx_power_by_ra
+ 		rate = rates[i];
+ 		if (band == PHY_BAND_2G)
+ 			hal->tx_pwr_by_rate_offset_2g[rfpath][rate] = offset;
+-		else if (band == PHY_BAND_5G)
+-			hal->tx_pwr_by_rate_offset_5g[rfpath][rate] = offset;
+ 		else
+-			continue;
++			hal->tx_pwr_by_rate_offset_5g[rfpath][rate] = offset;
+ 	}
+ }
+ 

package/kernel/mac80211/patches/rtl/023-v6.13-wifi-rtw88-Report-the-signal-strength-only-if-it-s-k.patch

@@ -0,0 +1,39 @@
+From 47f754b3f838205f3b25c4839f74801d180995bf Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Tue, 22 Oct 2024 20:20:26 +0300
+Subject: [PATCH] wifi: rtw88: Report the signal strength only if it's known
+
+RTL8811CU doesn't report the signal strength for many (any?) data
+frames. When the signal strength is not known, set
+RX_FLAG_NO_SIGNAL_VAL in order to avoid reporting a signal
+strength of 0.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Acked-by: Ping-Ke Shih <pkshih@realtek.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/f7e1e448-2c9b-498f-b8b1-a14dd967d7d3@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/rx.c | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/rx.c
++++ b/drivers/net/wireless/realtek/rtw88/rx.c
+@@ -234,10 +234,14 @@ static void rtw_rx_fill_rx_status(struct
+ 	else
+ 		rx_status->bw = RATE_INFO_BW_20;
+ 
+-	rx_status->signal = pkt_stat->signal_power;
+-	for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
+-		rx_status->chains |= BIT(path);
+-		rx_status->chain_signal[path] = pkt_stat->rx_power[path];
++	if (pkt_stat->phy_status) {
++		rx_status->signal = pkt_stat->signal_power;
++		for (path = 0; path < rtwdev->hal.rf_path_num; path++) {
++			rx_status->chains |= BIT(path);
++			rx_status->chain_signal[path] = pkt_stat->rx_power[path];
++		}
++	} else {
++		rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL;
+ 	}
+ 
+ 	rtw_rx_addr_match(rtwdev, pkt_stat, hdr);

package/kernel/mac80211/patches/rtl/024-v6.13-wifi-rtw88-Add-some-definitions-for-RTL8821AU-RTL881.patch

@@ -0,0 +1,490 @@
+From d12722830ea4f562e91586927ec21b64d0369544 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:00:59 +0300
+Subject: [PATCH] wifi: rtw88: Add some definitions for RTL8821AU/RTL8812AU
+
+Add 8821A and 8812A chip type enums.
+
+Add cck_high_power member to struct rtw_hal. This will be used to
+calculate the RX signal strength of RTL8812AU.
+
+Add various register definitions which will be used by the new drivers.
+
+Move some existing register definitions from rtw8821c.h and rtw8822b.h.
+They were duplicated in those headers and will also be used by the new
+drivers.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/9279a9cd-6f86-4dc3-a095-7c36cb9b9d06@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.h     |   3 +
+ drivers/net/wireless/realtek/rtw88/reg.h      | 174 ++++++++++++++++++
+ drivers/net/wireless/realtek/rtw88/rtw8821c.h |  24 ---
+ drivers/net/wireless/realtek/rtw88/rtw8822b.h |  12 --
+ 4 files changed, 177 insertions(+), 36 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -189,6 +189,8 @@ enum rtw_chip_type {
+ 	RTW_CHIP_TYPE_8723D,
+ 	RTW_CHIP_TYPE_8821C,
+ 	RTW_CHIP_TYPE_8703B,
++	RTW_CHIP_TYPE_8821A,
++	RTW_CHIP_TYPE_8812A,
+ };
+ 
+ enum rtw_tx_queue_type {
+@@ -1934,6 +1936,7 @@ struct rtw_hal {
+ 	u32 antenna_rx;
+ 	u8 bfee_sts_cap;
+ 	bool txrx_1ss;
++	bool cck_high_power;
+ 
+ 	/* protect tx power section */
+ 	struct mutex tx_power_mutex;
+--- a/drivers/net/wireless/realtek/rtw88/reg.h
++++ b/drivers/net/wireless/realtek/rtw88/reg.h
+@@ -9,6 +9,7 @@
+ #define BIT_FEN_EN_25_1		BIT(13)
+ #define BIT_FEN_ELDR		BIT(12)
+ #define BIT_FEN_CPUEN		BIT(2)
++#define BIT_FEN_USBA		BIT(2)
+ #define BIT_FEN_BB_GLB_RST	BIT(1)
+ #define BIT_FEN_BB_RSTB		BIT(0)
+ #define BIT_R_DIS_PRST		BIT(6)
+@@ -16,6 +17,10 @@
+ #define REG_SYS_PW_CTRL		0x0004
+ #define BIT_PFM_WOWL		BIT(3)
+ #define BIT_APFM_OFFMAC		BIT(9)
++#define REG_APS_FSMCO		0x0004
++#define APS_FSMCO_MAC_ENABLE	BIT(8)
++#define APS_FSMCO_MAC_OFF	BIT(9)
++#define APS_FSMCO_HW_POWERDOWN	BIT(15)
+ #define REG_SYS_CLK_CTRL	0x0008
+ #define BIT_CPU_CLK_EN		BIT(14)
+ 
+@@ -58,6 +63,8 @@
+ #define BIT_SHIFT_LDO25_VOLTAGE	4
+ #define BIT_LDO25_EN		BIT(7)
+ 
++#define REG_ACLK_MON		0x3e
++
+ #define REG_GPIO_MUXCFG		0x0040
+ #define BIT_FSPI_EN		BIT(19)
+ #define BIT_EN_SIC		BIT(12)
+@@ -90,6 +97,8 @@
+ #define BIT_USB_SUS_DIS		BIT(8)
+ #define BIT_SDIO_PAD_E5		BIT(18)
+ 
++#define REG_RF_B_CTRL		0x76
++
+ #define REG_AFE_CTRL_4		0x0078
+ #define BIT_CK320M_AFE_EN	BIT(4)
+ #define BIT_EN_SYN		BIT(15)
+@@ -134,6 +143,11 @@
+ #define REG_PMC_DBG_CTRL1	0xa8
+ #define BITS_PMC_BT_IQK_STS	GENMASK(22, 21)
+ 
++#define REG_HIMR0		0xb0
++#define REG_HISR0		0xb4
++#define REG_HIMR1		0xb8
++#define REG_HISR1		0xbc
++
+ #define REG_PAD_CTRL2		0x00C4
+ #define BIT_RSM_EN_V1		BIT(16)
+ #define BIT_NO_PDN_CHIPOFF_V1	BIT(17)
+@@ -185,6 +199,15 @@
+ #define MAC_TRX_ENABLE	(BIT_HCI_TXDMA_EN | BIT_HCI_RXDMA_EN | BIT_TXDMA_EN | \
+ 			BIT_RXDMA_EN | BIT_PROTOCOL_EN | BIT_SCHEDULE_EN | \
+ 			BIT_MACTXEN | BIT_MACRXEN)
++#define REG_PBP			0x104
++#define PBP_RX_MASK		0x0f
++#define PBP_TX_MASK		0xf0
++#define PBP_64			0x0
++#define PBP_128			0x1
++#define PBP_256			0x2
++#define PBP_512			0x3
++#define PBP_1024		0x4
++
+ #define BIT_SHIFT_TXDMA_VOQ_MAP	4
+ #define BIT_MASK_TXDMA_VOQ_MAP	0x3
+ #define BIT_TXDMA_VOQ_MAP(x)                                                   \
+@@ -256,6 +279,8 @@
+ #define REG_HMEBOX1		0x01D4
+ #define REG_HMEBOX2		0x01D8
+ #define REG_HMEBOX3		0x01DC
++#define REG_LLT_INIT		0x01E0
++#define BIT_LLT_WRITE_ACCESS	BIT(30)
+ #define REG_HMEBOX0_EX		0x01F0
+ #define REG_HMEBOX1_EX		0x01F4
+ #define REG_HMEBOX2_EX		0x01F8
+@@ -298,6 +323,7 @@
+ 
+ #define REG_AUTO_LLT		0x0224
+ #define BIT_AUTO_INIT_LLT	BIT(16)
++#define REG_DWBCN1_CTRL		0x0228
+ #define REG_RQPN_CTRL_1		0x0228
+ #define REG_RQPN_CTRL_2		0x022C
+ #define BIT_LD_RQPN		BIT(31)
+@@ -329,6 +355,7 @@
+ #define BIT_DMA_BURST_SIZE_1024	0
+ 
+ #define REG_RXPKTNUM		0x02B0
++#define REG_EARLY_MODE_CONTROL	0x02BC
+ 
+ #define REG_INT_MIG		0x0304
+ #define REG_HCI_MIX_CFG		0x03FC
+@@ -336,6 +363,7 @@
+ 
+ #define REG_BCNQ_INFO		0x0418
+ #define BIT_MGQ_CPU_EMPTY	BIT(24)
++#define REG_TXPKT_EMPTY		0x041A
+ #define REG_FWHW_TXQ_CTRL	0x0420
+ #define BIT_EN_BCNQ_DL		BIT(22)
+ #define BIT_EN_WR_FREE_TAIL	BIT(20)
+@@ -362,10 +390,12 @@
+ #define REG_AMPDU_MAX_TIME_V1	0x0455
+ #define REG_BCNQ1_BDNY_V1	0x0456
+ #define REG_AMPDU_MAX_TIME	0x0456
++#define REG_AMPDU_MAX_LENGTH	0x0458
+ #define REG_WMAC_LBK_BF_HD	0x045D
+ #define REG_TX_HANG_CTRL	0x045E
+ #define BIT_EN_GNT_BT_AWAKE	BIT(3)
+ #define BIT_EN_EOF_V1		BIT(2)
++#define REG_FAST_EDCA_CTRL	0x0460
+ #define REG_DATA_SC		0x0483
+ #define REG_ARFR2_V1		0x048C
+ #define REG_ARFRH2_V1		0x0490
+@@ -390,6 +420,8 @@
+ #define REG_PRECNT_CTRL		0x04E5
+ #define BIT_BTCCA_CTRL		(BIT(0) | BIT(1))
+ #define BIT_EN_PRECNT		BIT(11)
++#define REG_TX_RPT_CTRL		0x04EC
++#define REG_TX_RPT_TIME		0x04F0
+ #define REG_DUMMY_PAGE4_V1	0x04FC
+ 
+ #define REG_EDCA_VO_PARAM	0x0500
+@@ -400,6 +432,7 @@
+ #define BIT_MASK_CWMAX		GENMASK(15, 12)
+ #define BIT_MASK_CWMIN		GENMASK(11, 8)
+ #define BIT_MASK_AIFS		GENMASK(7, 0)
++#define REG_BCNTCFG		0x0510
+ #define REG_PIFS		0x0512
+ #define REG_SIFS		0x0514
+ #define BIT_SHIFT_SIFS_OFDM_CTX	8
+@@ -526,6 +559,8 @@
+ #define REG_BT_COEX_V2		0x0762
+ #define BIT_GNT_BT_POLARITY	BIT(12)
+ #define BIT_LTE_COEX_EN		BIT(7)
++#define REG_GNT_BT		0x0765
++#define BIT_PTA_SW_CTL		GENMASK(4, 3)
+ #define REG_BT_COEX_ENH_INTR_CTRL	0x76E
+ #define BIT_R_GRANTALL_WLMASK	BIT(3)
+ #define BIT_STATIS_BT_EN	BIT(2)
+@@ -543,14 +578,43 @@
+ #define REG_FPGA0_RFMOD		0x0800
+ #define BIT_CCKEN		BIT(24)
+ #define BIT_OFDMEN		BIT(25)
++#define REG_CCK_RPT_FORMAT	0x0804
++#define BIT_CCK_RPT_FORMAT	BIT(16)
++#define REG_RXPSEL		0x0808
++#define BIT_RX_PSEL_RST		(BIT(28) | BIT(29))
++#define REG_TXPSEL		0x080C
+ #define REG_RX_GAIN_EN		0x081c
++#define REG_CCASEL		0x082C
++#define REG_PDMFTH		0x0830
++#define REG_BWINDICATION	0x0834
++#define REG_CCA2ND		0x0838
++#define REG_L1PKTH		0x0848
++#define REG_CLKTRK		0x0860
++#define REG_ADCCLK		0x08AC
++#define REG_HSSI_READ		0x08B0
++#define REG_FPGA0_XCD_RF_PARA	0x08B4
++#define REG_RX_MCS_LIMIT	0x08BC
++#define REG_ADC160		0x08C4
++#define REG_ANTSEL_SW		0x0900
++#define REG_DAC_RSTB		0x090c
++#define REG_SINGLE_TONE_CONT_TX	0x0914
+ 
+ #define REG_RFE_CTRL_E		0x0974
+ #define REG_2ND_CCA_CTRL	0x0976
++#define REG_IQK_COM00		0x0978
++#define REG_IQK_COM32		0x097c
++#define REG_IQK_COM64		0x0980
++#define REG_IQK_COM96		0x0984
++
++#define REG_FAS			0x09a4
++#define REG_RXSB		0x0a00
++#define REG_CCK_RX		0x0a04
++#define REG_CCK_PD_TH		0x0a0a
+ 
+ #define REG_CCK0_FAREPORT	0xa2c
+ #define BIT_CCK0_2RX		BIT(18)
+ #define BIT_CCK0_MRC		BIT(22)
++#define REG_FA_CCK		0x0a5c
+ 
+ #define REG_DIS_DPD		0x0a70
+ #define DIS_DPD_MASK		GENMASK(9, 0)
+@@ -566,13 +630,109 @@
+ #define DIS_DPD_RATEVHT2SS_MCS1	BIT(9)
+ #define DIS_DPD_RATEALL		GENMASK(9, 0)
+ 
++#define REG_CNTRST		0x0b58
++
++#define REG_3WIRE_SWA		0x0c00
++#define REG_RX_IQC_AB_A		0x0c10
++#define REG_TXSCALE_A		0x0c1c
++#define BB_SWING_MASK		GENMASK(31, 21)
++#define REG_TX_AGC_A_CCK_11_CCK_1		0xc20
++#define REG_TX_AGC_A_OFDM18_OFDM6		0xc24
++#define REG_TX_AGC_A_OFDM54_OFDM24		0xc28
++#define REG_TX_AGC_A_MCS3_MCS0			0xc2c
++#define REG_TX_AGC_A_MCS7_MCS4			0xc30
++#define REG_TX_AGC_A_MCS11_MCS8			0xc34
++#define REG_TX_AGC_A_MCS15_MCS12		0xc38
++#define REG_TX_AGC_A_NSS1_INDEX3_NSS1_INDEX0	0xc3c
++#define REG_TX_AGC_A_NSS1_INDEX7_NSS1_INDEX4	0xc40
++#define REG_TX_AGC_A_NSS2_INDEX1_NSS1_INDEX8	0xc44
++#define REG_TX_AGC_A_NSS2_INDEX5_NSS2_INDEX2	0xc48
++#define REG_TX_AGC_A_NSS2_INDEX9_NSS2_INDEX6	0xc4c
++#define REG_RXIGI_A		0x0c50
++#define REG_TX_PWR_TRAINING_A	0x0c54
++#define REG_CK_MONHA		0x0c5c
++#define REG_AFE_PWR1_A		0x0c60
++#define REG_AFE_PWR2_A		0x0c64
++#define REG_RX_WAIT_CCA_TX_CCK_RFON_A	0x0c68
++#define REG_OFDM0_XA_TX_IQ_IMBALANCE	0x0c80
++#define REG_OFDM0_A_TX_AFE	0x0c84
++#define REG_OFDM0_XB_TX_IQ_IMBALANCE	0x0c88
++#define REG_TSSI_TRK_SW		0x0c8c
++#define REG_LSSI_WRITE_A	0x0c90
++#define REG_PREDISTA		0x0c90
++#define REG_TXAGCIDX		0x0c94
++
++#define REG_RFE_PINMUX_A	0x0cb0
++#define REG_RFE_INV_A		0x0cb4
+ #define REG_RFE_CTRL8		0x0cb4
+ #define BIT_MASK_RFE_SEL89	GENMASK(7, 0)
++#define PTA_CTRL_PIN		0x66
++#define DPDT_CTRL_PIN		0x77
++#define RFE_INV_MASK		0x3ff00000
++#define REG_RFECTL_A		0x0cb8
+ #define REG_RFE_INV8		0x0cbd
+ #define BIT_MASK_RFE_INV89	GENMASK(1, 0)
+ #define REG_RFE_INV16		0x0cbe
+ #define BIT_RFE_BUF_EN		BIT(3)
+ 
++#define REG_IQK_DPD_CFG		0x0cc4
++#define REG_CFG_PMPD		0x0cc8
++#define REG_IQC_Y		0x0ccc
++#define REG_IQC_X		0x0cd4
++#define REG_INTPO_SETA		0x0ce8
++
++#define REG_IQKA_END		0x0d00
++#define REG_PI_READ_A		0x0d04
++#define REG_SI_READ_A		0x0d08
++#define REG_IQKB_END		0x0d40
++#define REG_PI_READ_B		0x0d44
++#define REG_SI_READ_B		0x0d48
++
++#define REG_3WIRE_SWB		0x0e00
++#define REG_RX_IQC_AB_B		0x0e10
++#define REG_TXSCALE_B		0x0e1c
++#define REG_TX_AGC_B_CCK_11_CCK_1		0xe20
++#define REG_TX_AGC_B_OFDM18_OFDM6		0xe24
++#define REG_TX_AGC_B_OFDM54_OFDM24		0xe28
++#define REG_TX_AGC_B_MCS3_MCS0			0xe2c
++#define REG_TX_AGC_B_MCS7_MCS4			0xe30
++#define REG_TX_AGC_B_MCS11_MCS8			0xe34
++#define REG_TX_AGC_B_MCS15_MCS12		0xe38
++#define REG_TX_AGC_B_NSS1_INDEX3_NSS1_INDEX0	0xe3c
++#define REG_TX_AGC_B_NSS1_INDEX7_NSS1_INDEX4	0xe40
++#define REG_TX_AGC_B_NSS2_INDEX1_NSS1_INDEX8	0xe44
++#define REG_TX_AGC_B_NSS2_INDEX5_NSS2_INDEX2	0xe48
++#define REG_TX_AGC_B_NSS2_INDEX9_NSS2_INDEX6	0xe4c
++#define REG_RXIGI_B		0x0e50
++#define REG_TX_PWR_TRAINING_B	0x0e54
++#define REG_CK_MONHB		0x0e5c
++#define REG_AFE_PWR1_B		0x0e60
++#define REG_AFE_PWR2_B		0x0e64
++#define REG_RX_WAIT_CCA_TX_CCK_RFON_B	0x0e68
++#define REG_TXTONEB		0x0e80
++#define REG_RXTONEB		0x0e84
++#define REG_TXPITMB		0x0e88
++#define REG_RXPITMB		0x0e8c
++#define REG_LSSI_WRITE_B	0x0e90
++#define REG_PREDISTB		0x0e90
++#define REG_INIDLYB		0x0e94
++#define REG_RFE_PINMUX_B	0x0eb0
++#define REG_RFE_INV_B		0x0eb4
++#define REG_RFECTL_B		0x0eb8
++#define REG_BPBDB		0x0ec4
++#define REG_PHYTXONB		0x0ec8
++#define REG_IQKYB		0x0ecc
++#define REG_IQKXB		0x0ed4
++#define REG_INTPO_SETB		0x0ee8
++
++#define REG_CRC_CCK		0x0f04
++#define REG_CCA_OFDM		0x0f08
++#define REG_CRC_VHT		0x0f0c
++#define REG_CRC_HT		0x0f10
++#define REG_CRC_OFDM		0x0f14
++#define REG_FA_OFDM		0x0f48
++#define REG_CCA_CCK		0x0fcc
++
+ #define REG_ANAPARSW_MAC_0	0x1010
+ #define BIT_CF_L_V2		GENMASK(29, 28)
+ 
+@@ -709,6 +869,10 @@
+ 
+ #define REG_IGN_GNTBT4	0x4160
+ 
++#define REG_USB_MOD	0xf008
++#define REG_USB3_RXITV	0xf050
++#define REG_USB_HRPWM	0xfe58
++
+ #define RF_MODE		0x00
+ #define RF_MODOPT	0x01
+ #define RF_WLINT	0x01
+@@ -716,7 +880,13 @@
+ #define RF_DTXLOK	0x08
+ #define RF_CFGCH	0x18
+ #define BIT_BAND	GENMASK(18, 16)
++#define RF18_BAND_MASK	(BIT(16) | BIT(9) | BIT(8))
++#define RF18_CHANNEL_MASK	(MASKBYTE0)
++#define RF18_RFSI_MASK	(BIT(18) | BIT(17))
+ #define RF_RCK		0x1d
++#define RF_MODE_TABLE_ADDR	0x30
++#define RF_MODE_TABLE_DATA0	0x31
++#define RF_MODE_TABLE_DATA1	0x32
+ #define RF_LUTWA	0x33
+ #define RF_LUTWD1	0x3e
+ #define RF_LUTWD0	0x3f
+@@ -725,10 +895,14 @@
+ #define RF_T_METER	0x42
+ #define RF_BSPAD	0x54
+ #define RF_GAINTX	0x56
++#define RF_TXMOD	0x58
+ #define RF_TXATANK	0x64
++#define RF_TXA_PREPAD	0x65
+ #define RF_TRXIQ	0x66
+ #define RF_RXIQGEN	0x8d
++#define RF_RXBB2	0x8f
+ #define RF_SYN_PFD	0xb0
++#define RF_LCK		0xb4
+ #define RF_XTALX2	0xb8
+ #define RF_SYN_CTRL	0xbb
+ #define RF_MALSEL	0xbe
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.h
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.h
+@@ -214,19 +214,10 @@ extern const struct rtw_chip_info rtw882
+ #define BIT_FEN_EN	BIT(26)
+ #define REG_INIRTS_RATE_SEL 0x0480
+ #define REG_HTSTFWT	0x800
+-#define REG_RXPSEL	0x808
+-#define BIT_RX_PSEL_RST		(BIT(28) | BIT(29))
+-#define REG_TXPSEL	0x80c
+ #define REG_RXCCAMSK	0x814
+-#define REG_CCASEL	0x82c
+-#define REG_PDMFTH	0x830
+-#define REG_CCA2ND	0x838
+ #define REG_L1WT	0x83c
+ #define REG_L1PKWT	0x840
+ #define REG_MRC		0x850
+-#define REG_CLKTRK	0x860
+-#define REG_ADCCLK	0x8ac
+-#define REG_ADC160	0x8c4
+ #define REG_ADC40	0x8c8
+ #define REG_CHFIR	0x8f0
+ #define REG_CDDTXP	0x93c
+@@ -234,14 +225,11 @@ extern const struct rtw_chip_info rtw882
+ #define REG_ACBB0	0x948
+ #define REG_ACBBRXFIR	0x94c
+ #define REG_ACGG2TBL	0x958
+-#define REG_FAS		0x9a4
+-#define REG_RXSB	0xa00
+ #define REG_ADCINI	0xa04
+ #define REG_PWRTH	0xa08
+ #define REG_CCA_FLTR	0xa20
+ #define REG_TXSF2	0xa24
+ #define REG_TXSF6	0xa28
+-#define REG_FA_CCK	0xa5c
+ #define REG_RXDESC	0xa2c
+ #define REG_ENTXCCK	0xa80
+ #define BTG_LNA		0xfc84
+@@ -252,12 +240,8 @@ extern const struct rtw_chip_info rtw882
+ #define REG_PWRTH2	0xaa8
+ #define REG_CSRATIO	0xaaa
+ #define REG_TXFILTER	0xaac
+-#define REG_CNTRST	0xb58
+ #define REG_AGCTR_A	0xc08
+-#define REG_TXSCALE_A	0xc1c
+ #define REG_TXDFIR	0xc20
+-#define REG_RXIGI_A	0xc50
+-#define REG_TXAGCIDX	0xc94
+ #define REG_TRSW	0xca0
+ #define REG_RFESEL0	0xcb0
+ #define REG_RFESEL8	0xcb4
+@@ -269,14 +253,6 @@ extern const struct rtw_chip_info rtw882
+ #define B_WLA_SWITCH	BIT(23)
+ #define REG_RFEINV	0xcbc
+ #define REG_AGCTR_B	0xe08
+-#define REG_RXIGI_B	0xe50
+-#define REG_CRC_CCK	0xf04
+-#define REG_CRC_OFDM	0xf14
+-#define REG_CRC_HT	0xf10
+-#define REG_CRC_VHT	0xf0c
+-#define REG_CCA_OFDM	0xf08
+-#define REG_FA_OFDM	0xf48
+-#define REG_CCA_CCK	0xfcc
+ #define REG_DMEM_CTRL	0x1080
+ #define BIT_WL_RST	BIT(16)
+ #define REG_ANTWT	0x1904
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.h
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.h
+@@ -151,21 +151,12 @@ _rtw_write32s_mask(struct rtw_dev *rtwde
+ #define RTW8822B_EDCCA_MAX	0x7f
+ #define RTW8822B_EDCCA_SRC_DEF	1
+ #define REG_HTSTFWT	0x800
+-#define REG_RXPSEL	0x808
+-#define BIT_RX_PSEL_RST		(BIT(28) | BIT(29))
+-#define REG_TXPSEL	0x80c
+ #define REG_RXCCAMSK	0x814
+-#define REG_CCASEL	0x82c
+-#define REG_PDMFTH	0x830
+-#define REG_CCA2ND	0x838
+ #define REG_L1WT	0x83c
+ #define REG_L1PKWT	0x840
+ #define REG_MRC		0x850
+-#define REG_CLKTRK	0x860
+ #define REG_EDCCA_POW_MA	0x8a0
+ #define BIT_MA_LEVEL	GENMASK(1, 0)
+-#define REG_ADCCLK	0x8ac
+-#define REG_ADC160	0x8c4
+ #define REG_ADC40	0x8c8
+ #define REG_EDCCA_DECISION	0x8dc
+ #define BIT_EDCCA_OPTION	BIT(5)
+@@ -176,7 +167,6 @@ _rtw_write32s_mask(struct rtw_dev *rtwde
+ #define REG_ACBB0	0x948
+ #define REG_ACBBRXFIR	0x94c
+ #define REG_ACGG2TBL	0x958
+-#define REG_RXSB	0xa00
+ #define REG_ADCINI	0xa04
+ #define REG_TXSF2	0xa24
+ #define REG_TXSF6	0xa28
+@@ -184,14 +174,12 @@ _rtw_write32s_mask(struct rtw_dev *rtwde
+ #define REG_ENTXCCK	0xa80
+ #define REG_AGCTR_A	0xc08
+ #define REG_TXDFIR	0xc20
+-#define REG_RXIGI_A	0xc50
+ #define REG_TRSW	0xca0
+ #define REG_RFESEL0	0xcb0
+ #define REG_RFESEL8	0xcb4
+ #define REG_RFECTL	0xcb8
+ #define REG_RFEINV	0xcbc
+ #define REG_AGCTR_B	0xe08
+-#define REG_RXIGI_B	0xe50
+ #define REG_ANTWT	0x1904
+ #define REG_IQKFAILMSK	0x1bf0
+ 

package/kernel/mac80211/patches/rtl/025-v6.13-wifi-rtw88-Dump-the-HW-features-only-for-some-chips.patch

@@ -0,0 +1,93 @@
+From 87341ca1eac9a3bac23bd41f6e24f3c93b77452f Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:02:05 +0300
+Subject: [PATCH] wifi: rtw88: Dump the HW features only for some chips
+
+RTL8821AU and RTL8812AU don't support this. They hit the "failed to read
+hw feature report" error.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/8becd851-8760-4480-8e8c-c4869ce72507@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.c     | 3 +++
+ drivers/net/wireless/realtek/rtw88/main.h     | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 +
+ 7 files changed, 9 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -1917,6 +1917,9 @@ static int rtw_dump_hw_feature(struct rt
+ 	u8 bw;
+ 	int i;
+ 
++	if (!rtwdev->chip->hw_feature_report)
++		return 0;
++
+ 	id = rtw_read8(rtwdev, REG_C2HEVT);
+ 	if (id != C2H_HW_FEATURE_REPORT) {
+ 		rtw_err(rtwdev, "failed to read hw feature report\n");
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1200,6 +1200,7 @@ struct rtw_chip_info {
+ 	const struct rtw_fwcd_segs *fwcd_segs;
+ 
+ 	u8 usb_tx_agg_desc_num;
++	bool hw_feature_report;
+ 
+ 	u8 default_1ss_tx_path;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -1960,6 +1960,7 @@ const struct rtw_chip_info rtw8703b_hw_s
+ 	.max_power_index = 0x3f,
+ 	.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+ 	.usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */
++	.hw_feature_report = true,
+ 
+ 	.path_div_supported = false,
+ 	.ht_supported = true,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -2131,6 +2131,7 @@ const struct rtw_chip_info rtw8723d_hw_s
+ 	.page_size = TX_PAGE_SIZE,
+ 	.dig_min = 0x20,
+ 	.usb_tx_agg_desc_num = 1,
++	.hw_feature_report = true,
+ 	.ht_supported = true,
+ 	.vht_supported = false,
+ 	.lps_deep_mode_supported = 0,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -1968,6 +1968,7 @@ const struct rtw_chip_info rtw8821c_hw_s
+ 	.page_size = TX_PAGE_SIZE,
+ 	.dig_min = 0x1c,
+ 	.usb_tx_agg_desc_num = 3,
++	.hw_feature_report = true,
+ 	.ht_supported = true,
+ 	.vht_supported = true,
+ 	.lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -2509,6 +2509,7 @@ const struct rtw_chip_info rtw8822b_hw_s
+ 	.page_size = TX_PAGE_SIZE,
+ 	.dig_min = 0x1c,
+ 	.usb_tx_agg_desc_num = 3,
++	.hw_feature_report = true,
+ 	.ht_supported = true,
+ 	.vht_supported = true,
+ 	.lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -5329,6 +5329,7 @@ const struct rtw_chip_info rtw8822c_hw_s
+ 	.page_size = TX_PAGE_SIZE,
+ 	.dig_min = 0x20,
+ 	.usb_tx_agg_desc_num = 3,
++	.hw_feature_report = true,
+ 	.default_1ss_tx_path = BB_PATH_A,
+ 	.path_div_supported = true,
+ 	.ht_supported = true,

package/kernel/mac80211/patches/rtl/026-v6.13-wifi-rtw88-Allow-different-C2H-RA-report-sizes.patch

@@ -0,0 +1,175 @@
+From d9018f4373517d4560ce2ebf12684f77f5fbdad6 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:06:14 +0300
+Subject: [PATCH] wifi: rtw88: Allow different C2H RA report sizes
+
+The RTL8821AU and RTL8812AU have smaller RA report size, only 4 bytes.
+Avoid the "invalid ra report c2h length" error.
+
+Also, use a struct and u8_get_bits() to access the RA report C2H.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/c3e73c3a-fb2f-4013-9f06-d5274211e282@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/fw.c       | 21 +++++++++++++------
+ drivers/net/wireless/realtek/rtw88/fw.h       | 17 +++++++++++----
+ drivers/net/wireless/realtek/rtw88/main.h     |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c |  1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c |  1 +
+ 8 files changed, 34 insertions(+), 10 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/fw.c
++++ b/drivers/net/wireless/realtek/rtw88/fw.c
+@@ -139,25 +139,30 @@ static u16 get_max_amsdu_len(u32 bit_rat
+ struct rtw_fw_iter_ra_data {
+ 	struct rtw_dev *rtwdev;
+ 	u8 *payload;
++	u8 length;
+ };
+ 
+ static void rtw_fw_ra_report_iter(void *data, struct ieee80211_sta *sta)
+ {
+ 	struct rtw_fw_iter_ra_data *ra_data = data;
++	struct rtw_c2h_ra_rpt *ra_rpt = (struct rtw_c2h_ra_rpt *)ra_data->payload;
+ 	struct rtw_sta_info *si = (struct rtw_sta_info *)sta->drv_priv;
+ 	u8 mac_id, rate, sgi, bw;
+ 	u8 mcs, nss;
+ 	u32 bit_rate;
+ 
+-	mac_id = GET_RA_REPORT_MACID(ra_data->payload);
++	mac_id = ra_rpt->mac_id;
+ 	if (si->mac_id != mac_id)
+ 		return;
+ 
+ 	si->ra_report.txrate.flags = 0;
+ 
+-	rate = GET_RA_REPORT_RATE(ra_data->payload);
+-	sgi = GET_RA_REPORT_SGI(ra_data->payload);
+-	bw = GET_RA_REPORT_BW(ra_data->payload);
++	rate = u8_get_bits(ra_rpt->rate_sgi, RTW_C2H_RA_RPT_RATE);
++	sgi = u8_get_bits(ra_rpt->rate_sgi, RTW_C2H_RA_RPT_SGI);
++	if (ra_data->length >= offsetofend(typeof(*ra_rpt), bw))
++		bw = ra_rpt->bw;
++	else
++		bw = si->bw_mode;
+ 
+ 	if (rate < DESC_RATEMCS0) {
+ 		si->ra_report.txrate.legacy = rtw_desc_to_bitrate(rate);
+@@ -197,14 +202,18 @@ legacy:
+ static void rtw_fw_ra_report_handle(struct rtw_dev *rtwdev, u8 *payload,
+ 				    u8 length)
+ {
++	struct rtw_c2h_ra_rpt *ra_rpt = (struct rtw_c2h_ra_rpt *)payload;
+ 	struct rtw_fw_iter_ra_data ra_data;
+ 
+-	if (WARN(length < 7, "invalid ra report c2h length\n"))
++	if (WARN(length < rtwdev->chip->c2h_ra_report_size,
++		 "invalid ra report c2h length %d\n", length))
+ 		return;
+ 
+-	rtwdev->dm_info.tx_rate = GET_RA_REPORT_RATE(payload);
++	rtwdev->dm_info.tx_rate = u8_get_bits(ra_rpt->rate_sgi,
++					      RTW_C2H_RA_RPT_RATE);
+ 	ra_data.rtwdev = rtwdev;
+ 	ra_data.payload = payload;
++	ra_data.length = length;
+ 	rtw_iterate_stas_atomic(rtwdev, rtw_fw_ra_report_iter, &ra_data);
+ }
+ 
+--- a/drivers/net/wireless/realtek/rtw88/fw.h
++++ b/drivers/net/wireless/realtek/rtw88/fw.h
+@@ -85,6 +85,19 @@ struct rtw_c2h_adaptivity {
+ 	u8 option;
+ } __packed;
+ 
++struct rtw_c2h_ra_rpt {
++	u8 rate_sgi;
++	u8 mac_id;
++	u8 byte2;
++	u8 status;
++	u8 byte4;
++	u8 ra_ratio;
++	u8 bw;
++} __packed;
++
++#define RTW_C2H_RA_RPT_RATE	GENMASK(6, 0)
++#define RTW_C2H_RA_RPT_SGI	BIT(7)
++
+ struct rtw_h2c_register {
+ 	u32 w0;
+ 	u32 w1;
+@@ -364,10 +377,6 @@ struct rtw_fw_hdr_legacy {
+ #define GET_CHAN_SWITCH_CENTRAL_CH(c2h_payload)	(c2h_payload[2])
+ #define GET_CHAN_SWITCH_ID(c2h_payload)		(c2h_payload[3])
+ #define GET_CHAN_SWITCH_STATUS(c2h_payload)	(c2h_payload[4])
+-#define GET_RA_REPORT_RATE(c2h_payload)		(c2h_payload[0] & 0x7f)
+-#define GET_RA_REPORT_SGI(c2h_payload)		((c2h_payload[0] & 0x80) >> 7)
+-#define GET_RA_REPORT_BW(c2h_payload)		(c2h_payload[6])
+-#define GET_RA_REPORT_MACID(c2h_payload)	(c2h_payload[1])
+ 
+ #define GET_BCN_FILTER_NOTIFY_TYPE(c2h_payload)	(c2h_payload[1] & 0xf)
+ #define GET_BCN_FILTER_NOTIFY_EVENT(c2h_payload)	(c2h_payload[1] & 0x10)
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1201,6 +1201,7 @@ struct rtw_chip_info {
+ 
+ 	u8 usb_tx_agg_desc_num;
+ 	bool hw_feature_report;
++	u8 c2h_ra_report_size;
+ 
+ 	u8 default_1ss_tx_path;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -1961,6 +1961,7 @@ const struct rtw_chip_info rtw8703b_hw_s
+ 	.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+ 	.usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */
+ 	.hw_feature_report = true,
++	.c2h_ra_report_size = 7,
+ 
+ 	.path_div_supported = false,
+ 	.ht_supported = true,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -2132,6 +2132,7 @@ const struct rtw_chip_info rtw8723d_hw_s
+ 	.dig_min = 0x20,
+ 	.usb_tx_agg_desc_num = 1,
+ 	.hw_feature_report = true,
++	.c2h_ra_report_size = 7,
+ 	.ht_supported = true,
+ 	.vht_supported = false,
+ 	.lps_deep_mode_supported = 0,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -1969,6 +1969,7 @@ const struct rtw_chip_info rtw8821c_hw_s
+ 	.dig_min = 0x1c,
+ 	.usb_tx_agg_desc_num = 3,
+ 	.hw_feature_report = true,
++	.c2h_ra_report_size = 7,
+ 	.ht_supported = true,
+ 	.vht_supported = true,
+ 	.lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -2510,6 +2510,7 @@ const struct rtw_chip_info rtw8822b_hw_s
+ 	.dig_min = 0x1c,
+ 	.usb_tx_agg_desc_num = 3,
+ 	.hw_feature_report = true,
++	.c2h_ra_report_size = 7,
+ 	.ht_supported = true,
+ 	.vht_supported = true,
+ 	.lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -5330,6 +5330,7 @@ const struct rtw_chip_info rtw8822c_hw_s
+ 	.dig_min = 0x20,
+ 	.usb_tx_agg_desc_num = 3,
+ 	.hw_feature_report = true,
++	.c2h_ra_report_size = 7,
+ 	.default_1ss_tx_path = BB_PATH_A,
+ 	.path_div_supported = true,
+ 	.ht_supported = true,

package/kernel/mac80211/patches/rtl/027-v6.13-wifi-rtw88-Extend-the-init-table-parsing-for-RTL8812.patch

@@ -0,0 +1,165 @@
+From 95a772e30b60e7954d03f3372268722475aa303f Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:08:24 +0300
+Subject: [PATCH] wifi: rtw88: Extend the init table parsing for RTL8812AU
+
+The chips supported so far only use the first condition, and so the
+parsing code ignores the second condition. RTL8812AU's init tables use
+the second condition also. Make the parsing code check it.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/1bee6b74-6eab-44a3-9f40-794ca006c72d@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.h | 15 ++++++
+ drivers/net/wireless/realtek/rtw88/phy.c  | 62 ++++++++++++++++++++---
+ 2 files changed, 69 insertions(+), 8 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1835,6 +1835,20 @@ struct rtw_phy_cond {
+ 	#define BRANCH_ENDIF	3
+ };
+ 
++struct rtw_phy_cond2 {
++#ifdef __LITTLE_ENDIAN
++	u8 type_glna;
++	u8 type_gpa;
++	u8 type_alna;
++	u8 type_apa;
++#else
++	u8 type_apa;
++	u8 type_alna;
++	u8 type_gpa;
++	u8 type_glna;
++#endif
++};
++
+ struct rtw_fifo_conf {
+ 	/* tx fifo information */
+ 	u16 rsvd_boundary;
+@@ -1916,6 +1930,7 @@ struct rtw_hal {
+ 	u8 oem_id;
+ 	u8 pkg_type;
+ 	struct rtw_phy_cond phy_cond;
++	struct rtw_phy_cond2 phy_cond2;
+ 	bool rfe_btg;
+ 
+ 	u8 ps_mode;
+--- a/drivers/net/wireless/realtek/rtw88/phy.c
++++ b/drivers/net/wireless/realtek/rtw88/phy.c
+@@ -18,7 +18,10 @@ struct phy_cfg_pair {
+ };
+ 
+ union phy_table_tile {
+-	struct rtw_phy_cond cond;
++	struct {
++		struct rtw_phy_cond cond;
++		struct rtw_phy_cond2 cond2;
++	} __packed;
+ 	struct phy_cfg_pair cfg;
+ };
+ 
+@@ -1041,7 +1044,8 @@ void rtw_phy_setup_phy_cond(struct rtw_d
+ {
+ 	struct rtw_hal *hal = &rtwdev->hal;
+ 	struct rtw_efuse *efuse = &rtwdev->efuse;
+-	struct rtw_phy_cond cond = {0};
++	struct rtw_phy_cond cond = {};
++	struct rtw_phy_cond2 cond2 = {};
+ 
+ 	cond.cut = hal->cut_version ? hal->cut_version : 15;
+ 	cond.pkg = pkg ? pkg : 15;
+@@ -1061,15 +1065,34 @@ void rtw_phy_setup_phy_cond(struct rtw_d
+ 		break;
+ 	}
+ 
++	if (rtwdev->chip->id == RTW_CHIP_TYPE_8812A ||
++	    rtwdev->chip->id == RTW_CHIP_TYPE_8821A) {
++		cond.rfe = 0;
++		cond.rfe |= efuse->ext_lna_2g;
++		cond.rfe |= efuse->ext_pa_2g  << 1;
++		cond.rfe |= efuse->ext_lna_5g << 2;
++		cond.rfe |= efuse->ext_pa_5g  << 3;
++		cond.rfe |= efuse->btcoex     << 4;
++
++		cond2.type_alna = efuse->alna_type;
++		cond2.type_glna = efuse->glna_type;
++		cond2.type_apa = efuse->apa_type;
++		cond2.type_gpa = efuse->gpa_type;
++	}
++
+ 	hal->phy_cond = cond;
++	hal->phy_cond2 = cond2;
+ 
+-	rtw_dbg(rtwdev, RTW_DBG_PHY, "phy cond=0x%08x\n", *((u32 *)&hal->phy_cond));
++	rtw_dbg(rtwdev, RTW_DBG_PHY, "phy cond=0x%08x cond2=0x%08x\n",
++		*((u32 *)&hal->phy_cond), *((u32 *)&hal->phy_cond2));
+ }
+ 
+-static bool check_positive(struct rtw_dev *rtwdev, struct rtw_phy_cond cond)
++static bool check_positive(struct rtw_dev *rtwdev, struct rtw_phy_cond cond,
++			   struct rtw_phy_cond2 cond2)
+ {
+ 	struct rtw_hal *hal = &rtwdev->hal;
+ 	struct rtw_phy_cond drv_cond = hal->phy_cond;
++	struct rtw_phy_cond2 drv_cond2 = hal->phy_cond2;
+ 
+ 	if (cond.cut && cond.cut != drv_cond.cut)
+ 		return false;
+@@ -1080,8 +1103,29 @@ static bool check_positive(struct rtw_de
+ 	if (cond.intf && cond.intf != drv_cond.intf)
+ 		return false;
+ 
+-	if (cond.rfe != drv_cond.rfe)
+-		return false;
++	if (rtwdev->chip->id == RTW_CHIP_TYPE_8812A ||
++	    rtwdev->chip->id == RTW_CHIP_TYPE_8821A) {
++		if (!(cond.rfe & 0x0f))
++			return true;
++
++		if ((cond.rfe & drv_cond.rfe) != cond.rfe)
++			return false;
++
++		if ((cond.rfe & BIT(0)) && cond2.type_glna != drv_cond2.type_glna)
++			return false;
++
++		if ((cond.rfe & BIT(1)) && cond2.type_gpa != drv_cond2.type_gpa)
++			return false;
++
++		if ((cond.rfe & BIT(2)) && cond2.type_alna != drv_cond2.type_alna)
++			return false;
++
++		if ((cond.rfe & BIT(3)) && cond2.type_apa != drv_cond2.type_apa)
++			return false;
++	} else {
++		if (cond.rfe != drv_cond.rfe)
++			return false;
++	}
+ 
+ 	return true;
+ }
+@@ -1090,7 +1134,8 @@ void rtw_parse_tbl_phy_cond(struct rtw_d
+ {
+ 	const union phy_table_tile *p = tbl->data;
+ 	const union phy_table_tile *end = p + tbl->size / 2;
+-	struct rtw_phy_cond pos_cond = {0};
++	struct rtw_phy_cond pos_cond = {};
++	struct rtw_phy_cond2 pos_cond2 = {};
+ 	bool is_matched = true, is_skipped = false;
+ 
+ 	BUILD_BUG_ON(sizeof(union phy_table_tile) != sizeof(struct phy_cfg_pair));
+@@ -1109,11 +1154,12 @@ void rtw_parse_tbl_phy_cond(struct rtw_d
+ 			case BRANCH_ELIF:
+ 			default:
+ 				pos_cond = p->cond;
++				pos_cond2 = p->cond2;
+ 				break;
+ 			}
+ 		} else if (p->cond.neg) {
+ 			if (!is_skipped) {
+-				if (check_positive(rtwdev, pos_cond)) {
++				if (check_positive(rtwdev, pos_cond, pos_cond2)) {
+ 					is_matched = true;
+ 					is_skipped = true;
+ 				} else {

package/kernel/mac80211/patches/rtl/028-v6.13-wifi-rtw88-Allow-rtw_chip_info.ltecoex_addr-to-be-NU.patch

@@ -0,0 +1,58 @@
+From 7c5bbeba7c36575a3a57ef4be775b2f3fb68c3f9 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:09:04 +0300
+Subject: [PATCH] wifi: rtw88: Allow rtw_chip_info.ltecoex_addr to be NULL
+
+RTL8821A doesn't have this. Trying to use it results in error messages,
+so don't try if ltecoex_addr is NULL.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/d1004817-1760-41d1-9136-3d799757c444@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/coex.c | 14 +++++++++++---
+ 1 file changed, 11 insertions(+), 3 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/coex.c
++++ b/drivers/net/wireless/realtek/rtw88/coex.c
+@@ -950,12 +950,18 @@ static void rtw_coex_coex_ctrl_owner(str
+ 
+ static void rtw_coex_set_gnt_bt(struct rtw_dev *rtwdev, u8 state)
+ {
++	if (!rtwdev->chip->ltecoex_addr)
++		return;
++
+ 	rtw_coex_write_indirect_reg(rtwdev, LTE_COEX_CTRL, 0xc000, state);
+ 	rtw_coex_write_indirect_reg(rtwdev, LTE_COEX_CTRL, 0x0c00, state);
+ }
+ 
+ static void rtw_coex_set_gnt_wl(struct rtw_dev *rtwdev, u8 state)
+ {
++	if (!rtwdev->chip->ltecoex_addr)
++		return;
++
+ 	rtw_coex_write_indirect_reg(rtwdev, LTE_COEX_CTRL, 0x3000, state);
+ 	rtw_coex_write_indirect_reg(rtwdev, LTE_COEX_CTRL, 0x0300, state);
+ }
+@@ -3904,7 +3910,7 @@ void rtw_coex_display_coex_info(struct r
+ 	u8 sys_lte;
+ 	u16 score_board_WB, score_board_BW;
+ 	u32 wl_reg_6c0, wl_reg_6c4, wl_reg_6c8, wl_reg_778, wl_reg_6cc;
+-	u32 lte_coex, bt_coex;
++	u32 lte_coex = 0, bt_coex = 0;
+ 	int i;
+ 
+ 	score_board_BW = rtw_coex_read_scbd(rtwdev);
+@@ -3916,8 +3922,10 @@ void rtw_coex_display_coex_info(struct r
+ 	wl_reg_778 = rtw_read8(rtwdev, REG_BT_STAT_CTRL);
+ 
+ 	sys_lte = rtw_read8(rtwdev, 0x73);
+-	lte_coex = rtw_coex_read_indirect_reg(rtwdev, 0x38);
+-	bt_coex = rtw_coex_read_indirect_reg(rtwdev, 0x54);
++	if (rtwdev->chip->ltecoex_addr) {
++		lte_coex = rtw_coex_read_indirect_reg(rtwdev, 0x38);
++		bt_coex = rtw_coex_read_indirect_reg(rtwdev, 0x54);
++	}
+ 
+ 	if (!coex_stat->wl_under_ips &&
+ 	    (!coex_stat->wl_under_lps || coex_stat->wl_force_lps_ctrl) &&

package/kernel/mac80211/patches/rtl/029-v6.13-wifi-rtw88-Let-each-driver-control-the-power-on-off-.patch

@@ -0,0 +1,272 @@
+From fbb5e1b3637a720c83c91a7b1476ab0429bfc747 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:09:47 +0300
+Subject: [PATCH] wifi: rtw88: Let each driver control the power on/off process
+
+RTL8821AU and RTL8812AU have to do some things differently, so let
+them have full control.
+
+The other chips use the same functions as before.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/98ab839f-9100-44ae-9551-9af743a4aa3a@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/coex.c     |  3 +++
+ drivers/net/wireless/realtek/rtw88/mac.c      | 11 +++++++----
+ drivers/net/wireless/realtek/rtw88/mac.h      |  3 +++
+ drivers/net/wireless/realtek/rtw88/main.c     | 13 ++++++++-----
+ drivers/net/wireless/realtek/rtw88/main.h     |  5 +++++
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c |  2 ++
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c |  2 ++
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c |  2 ++
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c |  2 ++
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c |  2 ++
+ 10 files changed, 36 insertions(+), 9 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/coex.c
++++ b/drivers/net/wireless/realtek/rtw88/coex.c
+@@ -2753,16 +2753,19 @@ void rtw_coex_power_on_setting(struct rt
+ 	rtw_write8(rtwdev, 0xff1a, 0x0);
+ 	rtw_coex_set_gnt_debug(rtwdev);
+ }
++EXPORT_SYMBOL(rtw_coex_power_on_setting);
+ 
+ void rtw_coex_power_off_setting(struct rtw_dev *rtwdev)
+ {
+ 	rtw_write16(rtwdev, REG_WIFI_BT_INFO, BIT_BT_INT_EN);
+ }
++EXPORT_SYMBOL(rtw_coex_power_off_setting);
+ 
+ void rtw_coex_init_hw_config(struct rtw_dev *rtwdev, bool wifi_only)
+ {
+ 	__rtw_coex_init_hw_config(rtwdev, wifi_only);
+ }
++EXPORT_SYMBOL(rtw_coex_init_hw_config);
+ 
+ void rtw_coex_ips_notify(struct rtw_dev *rtwdev, u8 type)
+ {
+--- a/drivers/net/wireless/realtek/rtw88/mac.c
++++ b/drivers/net/wireless/realtek/rtw88/mac.c
+@@ -227,8 +227,8 @@ static int rtw_sub_pwr_seq_parser(struct
+ 	return 0;
+ }
+ 
+-static int rtw_pwr_seq_parser(struct rtw_dev *rtwdev,
+-			      const struct rtw_pwr_seq_cmd * const *cmd_seq)
++int rtw_pwr_seq_parser(struct rtw_dev *rtwdev,
++		       const struct rtw_pwr_seq_cmd * const *cmd_seq)
+ {
+ 	u8 cut_mask;
+ 	u8 intf_mask;
+@@ -267,6 +267,7 @@ static int rtw_pwr_seq_parser(struct rtw
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(rtw_pwr_seq_parser);
+ 
+ static int rtw_mac_power_switch(struct rtw_dev *rtwdev, bool pwr_on)
+ {
+@@ -994,6 +995,7 @@ int rtw_download_firmware(struct rtw_dev
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(rtw_download_firmware);
+ 
+ static u32 get_priority_queues(struct rtw_dev *rtwdev, u32 queues)
+ {
+@@ -1127,7 +1129,7 @@ static int txdma_queue_mapping(struct rt
+ 	return 0;
+ }
+ 
+-static int set_trx_fifo_info(struct rtw_dev *rtwdev)
++int rtw_set_trx_fifo_info(struct rtw_dev *rtwdev)
+ {
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+ 	struct rtw_fifo_conf *fifo = &rtwdev->fifo;
+@@ -1179,6 +1181,7 @@ static int set_trx_fifo_info(struct rtw_
+ 
+ 	return 0;
+ }
++EXPORT_SYMBOL(rtw_set_trx_fifo_info);
+ 
+ static int __priority_queue_cfg(struct rtw_dev *rtwdev,
+ 				const struct rtw_page_table *pg_tbl,
+@@ -1256,7 +1259,7 @@ static int priority_queue_cfg(struct rtw
+ 	u16 pubq_num;
+ 	int ret;
+ 
+-	ret = set_trx_fifo_info(rtwdev);
++	ret = rtw_set_trx_fifo_info(rtwdev);
+ 	if (ret)
+ 		return ret;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/mac.h
++++ b/drivers/net/wireless/realtek/rtw88/mac.h
+@@ -30,11 +30,14 @@
+ 
+ void rtw_set_channel_mac(struct rtw_dev *rtwdev, u8 channel, u8 bw,
+ 			 u8 primary_ch_idx);
++int rtw_pwr_seq_parser(struct rtw_dev *rtwdev,
++		       const struct rtw_pwr_seq_cmd * const *cmd_seq);
+ int rtw_mac_power_on(struct rtw_dev *rtwdev);
+ void rtw_mac_power_off(struct rtw_dev *rtwdev);
+ int rtw_download_firmware(struct rtw_dev *rtwdev, struct rtw_fw_state *fw);
+ int rtw_mac_init(struct rtw_dev *rtwdev);
+ void rtw_mac_flush_queues(struct rtw_dev *rtwdev, u32 queues, bool drop);
++int rtw_set_trx_fifo_info(struct rtw_dev *rtwdev);
+ int rtw_ddma_to_fw_fifo(struct rtw_dev *rtwdev, u32 ocp_src, u32 size);
+ 
+ static inline void rtw_mac_flush_all_queues(struct rtw_dev *rtwdev, bool drop)
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -1309,7 +1309,7 @@ void rtw_update_sta_info(struct rtw_dev
+ 	rtw_fw_send_ra_info(rtwdev, si, reset_ra_mask);
+ }
+ 
+-static int rtw_wait_firmware_completion(struct rtw_dev *rtwdev)
++int rtw_wait_firmware_completion(struct rtw_dev *rtwdev)
+ {
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+ 	struct rtw_fw_state *fw;
+@@ -1329,6 +1329,7 @@ static int rtw_wait_firmware_completion(
+ 
+ 	return ret;
+ }
++EXPORT_SYMBOL(rtw_wait_firmware_completion);
+ 
+ static enum rtw_lps_deep_mode rtw_update_lps_deep_mode(struct rtw_dev *rtwdev,
+ 						       struct rtw_fw_state *fw)
+@@ -1350,7 +1351,7 @@ static enum rtw_lps_deep_mode rtw_update
+ 	return LPS_DEEP_MODE_NONE;
+ }
+ 
+-static int rtw_power_on(struct rtw_dev *rtwdev)
++int rtw_power_on(struct rtw_dev *rtwdev)
+ {
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+ 	struct rtw_fw_state *fw = &rtwdev->fw;
+@@ -1413,6 +1414,7 @@ err_off:
+ err:
+ 	return ret;
+ }
++EXPORT_SYMBOL(rtw_power_on);
+ 
+ void rtw_core_fw_scan_notify(struct rtw_dev *rtwdev, bool start)
+ {
+@@ -1485,7 +1487,7 @@ int rtw_core_start(struct rtw_dev *rtwde
+ {
+ 	int ret;
+ 
+-	ret = rtw_power_on(rtwdev);
++	ret = rtwdev->chip->ops->power_on(rtwdev);
+ 	if (ret)
+ 		return ret;
+ 
+@@ -1505,12 +1507,13 @@ int rtw_core_start(struct rtw_dev *rtwde
+ 	return 0;
+ }
+ 
+-static void rtw_power_off(struct rtw_dev *rtwdev)
++void rtw_power_off(struct rtw_dev *rtwdev)
+ {
+ 	rtw_hci_stop(rtwdev);
+ 	rtw_coex_power_off_setting(rtwdev);
+ 	rtw_mac_power_off(rtwdev);
+ }
++EXPORT_SYMBOL(rtw_power_off);
+ 
+ void rtw_core_stop(struct rtw_dev *rtwdev)
+ {
+@@ -1535,7 +1538,7 @@ void rtw_core_stop(struct rtw_dev *rtwde
+ 
+ 	mutex_lock(&rtwdev->mutex);
+ 
+-	rtw_power_off(rtwdev);
++	rtwdev->chip->ops->power_off(rtwdev);
+ }
+ 
+ static void rtw_init_ht_cap(struct rtw_dev *rtwdev,
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -843,6 +843,8 @@ struct rtw_regd {
+ };
+ 
+ struct rtw_chip_ops {
++	int (*power_on)(struct rtw_dev *rtwdev);
++	void (*power_off)(struct rtw_dev *rtwdev);
+ 	int (*mac_init)(struct rtw_dev *rtwdev);
+ 	int (*dump_fw_crash)(struct rtw_dev *rtwdev);
+ 	void (*shutdown)(struct rtw_dev *rtwdev);
+@@ -2209,6 +2211,7 @@ void rtw_core_scan_start(struct rtw_dev
+ void rtw_core_scan_complete(struct rtw_dev *rtwdev, struct ieee80211_vif *vif,
+ 			    bool hw_scan);
+ int rtw_core_start(struct rtw_dev *rtwdev);
++void rtw_power_off(struct rtw_dev *rtwdev);
+ void rtw_core_stop(struct rtw_dev *rtwdev);
+ int rtw_chip_info_setup(struct rtw_dev *rtwdev);
+ int rtw_core_init(struct rtw_dev *rtwdev);
+@@ -2223,6 +2226,8 @@ int rtw_sta_add(struct rtw_dev *rtwdev,
+ void rtw_sta_remove(struct rtw_dev *rtwdev, struct ieee80211_sta *sta,
+ 		    bool fw_exist);
+ void rtw_fw_recovery(struct rtw_dev *rtwdev);
++int rtw_wait_firmware_completion(struct rtw_dev *rtwdev);
++int rtw_power_on(struct rtw_dev *rtwdev);
+ void rtw_core_fw_scan_notify(struct rtw_dev *rtwdev, bool start);
+ int rtw_dump_fw(struct rtw_dev *rtwdev, const u32 ocp_src, u32 size,
+ 		u32 fwcd_item);
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -1888,6 +1888,8 @@ static const struct coex_tdma_para tdma_
+ };
+ 
+ static const struct rtw_chip_ops rtw8703b_ops = {
++	.power_on		= rtw_power_on,
++	.power_off		= rtw_power_off,
+ 	.mac_init		= rtw8723x_mac_init,
+ 	.dump_fw_crash		= NULL,
+ 	.shutdown		= NULL,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -1390,6 +1390,8 @@ static void rtw8723d_pwr_track(struct rt
+ }
+ 
+ static const struct rtw_chip_ops rtw8723d_ops = {
++	.power_on		= rtw_power_on,
++	.power_off		= rtw_power_off,
+ 	.phy_set_param		= rtw8723d_phy_set_param,
+ 	.read_efuse		= rtw8723x_read_efuse,
+ 	.query_phy_status	= query_phy_status,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -1643,6 +1643,8 @@ static const struct rtw_prioq_addrs prio
+ };
+ 
+ static const struct rtw_chip_ops rtw8821c_ops = {
++	.power_on		= rtw_power_on,
++	.power_off		= rtw_power_off,
+ 	.phy_set_param		= rtw8821c_phy_set_param,
+ 	.read_efuse		= rtw8821c_read_efuse,
+ 	.query_phy_status	= query_phy_status,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -2132,6 +2132,8 @@ static const struct rtw_prioq_addrs prio
+ };
+ 
+ static const struct rtw_chip_ops rtw8822b_ops = {
++	.power_on		= rtw_power_on,
++	.power_off		= rtw_power_off,
+ 	.phy_set_param		= rtw8822b_phy_set_param,
+ 	.read_efuse		= rtw8822b_read_efuse,
+ 	.query_phy_status	= query_phy_status,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -4947,6 +4947,8 @@ static const struct rtw_prioq_addrs prio
+ };
+ 
+ static const struct rtw_chip_ops rtw8822c_ops = {
++	.power_on		= rtw_power_on,
++	.power_off		= rtw_power_off,
+ 	.phy_set_param		= rtw8822c_phy_set_param,
+ 	.read_efuse		= rtw8822c_read_efuse,
+ 	.query_phy_status	= query_phy_status,

package/kernel/mac80211/patches/rtl/030-v6.13-wifi-rtw88-Enable-data-rate-fallback-for-older-chips.patch

@@ -0,0 +1,194 @@
+From c7706b1173c77185a2ef40c7d1811021566563f3 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:10:32 +0300
+Subject: [PATCH] wifi: rtw88: Enable data rate fallback for older chips
+
+RTL8811AU fails to perform the 4-way handshake when the AP is too far
+because it transmits the EAPOL frames at MCS9 and when that doesn't
+work it retries 48 times with the same rate, to no avail.
+
+Retrying 48 times with the same rate seems pointless. Set the
+appropriate field in the TX descriptor to allow it to use lower rates
+when retrying.
+
+Set it for RTL8723D and RTL8703B because they interpret this field the
+same way as RTL8811A.
+
+The newer RTL8822C, RTL8822B, RTL8821C seem to interpret this field in
+the TX descriptor differently, so leave it alone for those chips.
+
+Tested with RTL8811AU and RTL8723DU.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/2b3e3e6f-541b-4a3b-8ca3-65b267e6a95a@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/fw.c       | 2 +-
+ drivers/net/wireless/realtek/rtw88/main.h     | 1 +
+ drivers/net/wireless/realtek/rtw88/pci.c      | 2 +-
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 1 +
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 1 +
+ drivers/net/wireless/realtek/rtw88/sdio.c     | 2 +-
+ drivers/net/wireless/realtek/rtw88/tx.c       | 6 +++++-
+ drivers/net/wireless/realtek/rtw88/tx.h       | 4 +++-
+ drivers/net/wireless/realtek/rtw88/usb.c      | 4 ++--
+ 12 files changed, 19 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/fw.c
++++ b/drivers/net/wireless/realtek/rtw88/fw.c
+@@ -1290,7 +1290,7 @@ static void rtw_fill_rsvd_page_desc(stru
+ 	rtw_tx_rsvd_page_pkt_info_update(rtwdev, &pkt_info, skb, type);
+ 	pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz);
+ 	memset(pkt_desc, 0, chip->tx_pkt_desc_sz);
+-	rtw_tx_fill_tx_desc(&pkt_info, skb);
++	rtw_tx_fill_tx_desc(rtwdev, &pkt_info, skb);
+ }
+ 
+ static inline u8 rtw_len_to_page(unsigned int len, u8 page_size)
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1204,6 +1204,7 @@ struct rtw_chip_info {
+ 	u8 usb_tx_agg_desc_num;
+ 	bool hw_feature_report;
+ 	u8 c2h_ra_report_size;
++	bool old_datarate_fb_limit;
+ 
+ 	u8 default_1ss_tx_path;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/pci.c
++++ b/drivers/net/wireless/realtek/rtw88/pci.c
+@@ -824,7 +824,7 @@ static int rtw_pci_tx_write_data(struct
+ 	pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz);
+ 	memset(pkt_desc, 0, tx_pkt_desc_sz);
+ 	pkt_info->qsel = rtw_pci_get_tx_qsel(skb, queue);
+-	rtw_tx_fill_tx_desc(pkt_info, skb);
++	rtw_tx_fill_tx_desc(rtwdev, pkt_info, skb);
+ 	dma = dma_map_single(&rtwpci->pdev->dev, skb->data, skb->len,
+ 			     DMA_TO_DEVICE);
+ 	if (dma_mapping_error(&rtwpci->pdev->dev, dma))
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -1964,6 +1964,7 @@ const struct rtw_chip_info rtw8703b_hw_s
+ 	.usb_tx_agg_desc_num = 1, /* Not sure if this chip has USB interface */
+ 	.hw_feature_report = true,
+ 	.c2h_ra_report_size = 7,
++	.old_datarate_fb_limit = true,
+ 
+ 	.path_div_supported = false,
+ 	.ht_supported = true,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -2135,6 +2135,7 @@ const struct rtw_chip_info rtw8723d_hw_s
+ 	.usb_tx_agg_desc_num = 1,
+ 	.hw_feature_report = true,
+ 	.c2h_ra_report_size = 7,
++	.old_datarate_fb_limit = true,
+ 	.ht_supported = true,
+ 	.vht_supported = false,
+ 	.lps_deep_mode_supported = 0,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -1972,6 +1972,7 @@ const struct rtw_chip_info rtw8821c_hw_s
+ 	.usb_tx_agg_desc_num = 3,
+ 	.hw_feature_report = true,
+ 	.c2h_ra_report_size = 7,
++	.old_datarate_fb_limit = false,
+ 	.ht_supported = true,
+ 	.vht_supported = true,
+ 	.lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -2513,6 +2513,7 @@ const struct rtw_chip_info rtw8822b_hw_s
+ 	.usb_tx_agg_desc_num = 3,
+ 	.hw_feature_report = true,
+ 	.c2h_ra_report_size = 7,
++	.old_datarate_fb_limit = false,
+ 	.ht_supported = true,
+ 	.vht_supported = true,
+ 	.lps_deep_mode_supported = BIT(LPS_DEEP_MODE_LCLK),
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -5333,6 +5333,7 @@ const struct rtw_chip_info rtw8822c_hw_s
+ 	.usb_tx_agg_desc_num = 3,
+ 	.hw_feature_report = true,
+ 	.c2h_ra_report_size = 7,
++	.old_datarate_fb_limit = false,
+ 	.default_1ss_tx_path = BB_PATH_A,
+ 	.path_div_supported = true,
+ 	.ht_supported = true,
+--- a/drivers/net/wireless/realtek/rtw88/sdio.c
++++ b/drivers/net/wireless/realtek/rtw88/sdio.c
+@@ -864,7 +864,7 @@ static void rtw_sdio_tx_skb_prepare(stru
+ 
+ 	pkt_info->qsel = rtw_sdio_get_tx_qsel(rtwdev, skb, queue);
+ 
+-	rtw_tx_fill_tx_desc(pkt_info, skb);
++	rtw_tx_fill_tx_desc(rtwdev, pkt_info, skb);
+ 	rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, pkt_desc);
+ }
+ 
+--- a/drivers/net/wireless/realtek/rtw88/tx.c
++++ b/drivers/net/wireless/realtek/rtw88/tx.c
+@@ -32,7 +32,8 @@ void rtw_tx_stats(struct rtw_dev *rtwdev
+ 	}
+ }
+ 
+-void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb)
++void rtw_tx_fill_tx_desc(struct rtw_dev *rtwdev,
++			 struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb)
+ {
+ 	struct rtw_tx_desc *tx_desc = (struct rtw_tx_desc *)skb->data;
+ 	bool more_data = false;
+@@ -67,6 +68,9 @@ void rtw_tx_fill_tx_desc(struct rtw_tx_p
+ 
+ 	tx_desc->w4 = le32_encode_bits(pkt_info->rate, RTW_TX_DESC_W4_DATARATE);
+ 
++	if (rtwdev->chip->old_datarate_fb_limit)
++		tx_desc->w4 |= le32_encode_bits(0x1f, RTW_TX_DESC_W4_DATARATE_FB_LIMIT);
++
+ 	tx_desc->w5 = le32_encode_bits(pkt_info->short_gi, RTW_TX_DESC_W5_DATA_SHORT) |
+ 		      le32_encode_bits(pkt_info->bw, RTW_TX_DESC_W5_DATA_BW) |
+ 		      le32_encode_bits(pkt_info->ldpc, RTW_TX_DESC_W5_DATA_LDPC) |
+--- a/drivers/net/wireless/realtek/rtw88/tx.h
++++ b/drivers/net/wireless/realtek/rtw88/tx.h
+@@ -44,6 +44,7 @@ struct rtw_tx_desc {
+ #define RTW_TX_DESC_W3_NAVUSEHDR BIT(15)
+ #define RTW_TX_DESC_W3_MAX_AGG_NUM GENMASK(21, 17)
+ #define RTW_TX_DESC_W4_DATARATE GENMASK(6, 0)
++#define RTW_TX_DESC_W4_DATARATE_FB_LIMIT GENMASK(12, 8)
+ #define RTW_TX_DESC_W4_RTSRATE GENMASK(28, 24)
+ #define RTW_TX_DESC_W5_DATA_SHORT BIT(4)
+ #define RTW_TX_DESC_W5_DATA_BW GENMASK(6, 5)
+@@ -94,7 +95,8 @@ void rtw_tx_pkt_info_update(struct rtw_d
+ 			    struct rtw_tx_pkt_info *pkt_info,
+ 			    struct ieee80211_sta *sta,
+ 			    struct sk_buff *skb);
+-void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb);
++void rtw_tx_fill_tx_desc(struct rtw_dev *rtwdev,
++			 struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb);
+ void rtw_tx_report_enqueue(struct rtw_dev *rtwdev, struct sk_buff *skb, u8 sn);
+ void rtw_tx_report_handle(struct rtw_dev *rtwdev, struct sk_buff *skb, int src);
+ void rtw_tx_rsvd_page_pkt_info_update(struct rtw_dev *rtwdev,
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -457,7 +457,7 @@ static int rtw_usb_write_data(struct rtw
+ 	skb_put_data(skb, buf, size);
+ 	skb_push(skb, chip->tx_pkt_desc_sz);
+ 	memset(skb->data, 0, chip->tx_pkt_desc_sz);
+-	rtw_tx_fill_tx_desc(pkt_info, skb);
++	rtw_tx_fill_tx_desc(rtwdev, pkt_info, skb);
+ 	rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data);
+ 
+ 	ret = rtw_usb_write_port(rtwdev, qsel, skb,
+@@ -524,7 +524,7 @@ static int rtw_usb_tx_write(struct rtw_d
+ 	pkt_desc = skb_push(skb, chip->tx_pkt_desc_sz);
+ 	memset(pkt_desc, 0, chip->tx_pkt_desc_sz);
+ 	ep = qsel_to_ep(rtwusb, pkt_info->qsel);
+-	rtw_tx_fill_tx_desc(pkt_info, skb);
++	rtw_tx_fill_tx_desc(rtwdev, pkt_info, skb);
+ 	rtw_tx_fill_txdesc_checksum(rtwdev, pkt_info, skb->data);
+ 	tx_data = rtw_usb_get_tx_data(skb);
+ 	tx_data->sn = pkt_info->sn;

package/kernel/mac80211/patches/rtl/031-v6.13-wifi-rtw88-Make-txagc_remnant_ofdm-an-array.patch

@@ -0,0 +1,85 @@
+From abb0f19492ba6289ffba6ec1057c0426240958af Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:10:54 +0300
+Subject: [PATCH] wifi: rtw88: Make txagc_remnant_ofdm an array
+
+txagc_remnant_ofdm member of struct rtw_dm_info should be different for
+each RF path, so make it an array of size RTW_RF_PATH_MAX (4).
+
+Until now all the chips using this had only one RF path, but RTL8812AU
+has two, and RTL8814AU has four.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/68571ba9-e504-4b2d-bfa1-62f468753649@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.h     | 2 +-
+ drivers/net/wireless/realtek/rtw88/phy.c      | 4 ++--
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 4 ++--
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 4 ++--
+ 4 files changed, 7 insertions(+), 7 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1715,7 +1715,7 @@ struct rtw_dm_info {
+ 	bool pwr_trk_init_trigger;
+ 	struct ewma_thermal avg_thermal[RTW_RF_PATH_MAX];
+ 	s8 txagc_remnant_cck;
+-	s8 txagc_remnant_ofdm;
++	s8 txagc_remnant_ofdm[RTW_RF_PATH_MAX];
+ 	u8 rx_cck_agc_report_type;
+ 
+ 	/* backup dack results for each path and I/Q */
+--- a/drivers/net/wireless/realtek/rtw88/phy.c
++++ b/drivers/net/wireless/realtek/rtw88/phy.c
+@@ -2169,8 +2169,8 @@ void rtw_get_tx_power_params(struct rtw_
+ 
+ 	*limit = rtw_phy_get_tx_power_limit(rtwdev, band, bw, path,
+ 					    rate, ch, regd);
+-	*remnant = (rate <= DESC_RATE11M ? dm_info->txagc_remnant_cck :
+-		    dm_info->txagc_remnant_ofdm);
++	*remnant = rate <= DESC_RATE11M ? dm_info->txagc_remnant_cck :
++					  dm_info->txagc_remnant_ofdm[path];
+ 	*sar = rtw_phy_get_tx_power_sar(rtwdev, hal->sar_band, path, rate);
+ }
+ 
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -637,7 +637,7 @@ static void rtw8703b_pwrtrack_init(struc
+ 	dm_info->pwr_trk_init_trigger = true;
+ 	dm_info->thermal_meter_k = rtwdev->efuse.thermal_meter_k;
+ 	dm_info->txagc_remnant_cck = 0;
+-	dm_info->txagc_remnant_ofdm = 0;
++	dm_info->txagc_remnant_ofdm[RF_PATH_A] = 0;
+ }
+ 
+ static void rtw8703b_phy_set_param(struct rtw_dev *rtwdev)
+@@ -1589,7 +1589,7 @@ static void rtw8703b_pwrtrack_set_ofdm_p
+ {
+ 	struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+ 
+-	dm_info->txagc_remnant_ofdm = txagc_idx;
++	dm_info->txagc_remnant_ofdm[RF_PATH_A] = txagc_idx;
+ 
+ 	/* Only path A is calibrated for rtl8703b */
+ 	rtw8703b_set_iqk_matrix(rtwdev, swing_idx, RF_PATH_A);
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -79,7 +79,7 @@ static void rtw8723d_pwrtrack_init(struc
+ 	dm_info->pwr_trk_init_trigger = true;
+ 	dm_info->thermal_meter_k = rtwdev->efuse.thermal_meter_k;
+ 	dm_info->txagc_remnant_cck = 0;
+-	dm_info->txagc_remnant_ofdm = 0;
++	dm_info->txagc_remnant_ofdm[RF_PATH_A] = 0;
+ }
+ 
+ static void rtw8723d_phy_set_param(struct rtw_dev *rtwdev)
+@@ -1265,7 +1265,7 @@ static void rtw8723d_pwrtrack_set_ofdm_p
+ {
+ 	struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+ 
+-	dm_info->txagc_remnant_ofdm = txagc_idx;
++	dm_info->txagc_remnant_ofdm[RF_PATH_A] = txagc_idx;
+ 
+ 	rtw8723d_set_iqk_matrix(rtwdev, swing_idx, RF_PATH_A);
+ 	rtw8723d_set_iqk_matrix(rtwdev, swing_idx, RF_PATH_B);

package/kernel/mac80211/patches/rtl/032-v6.13-wifi-rtw88-Support-TX-page-sizes-bigger-than-128.patch

@@ -0,0 +1,115 @@
+From 82a617413e8545775ec03a1970809ac5f549ef32 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:12:06 +0300
+Subject: [PATCH] wifi: rtw88: Support TX page sizes bigger than 128
+
+All the chips supported so far have a TX page size of 128 bytes.
+
+Change the type of the page_size member of struct rtw_chip_info from u8
+to u16 in order to support RTL8821AU (page size of 256 bytes) and
+RTL8812AU (page size of 512 bytes). Also change the types of several
+related variables and function parameters from u8 to u16.
+
+The TX page size is used, among other things, to construct the beacon,
+null data, QOS null data, and PS poll templates which are uploaded to
+the chip's reserved page. Each template needs to be aligned on a
+multiple of the TX page size. Power saving can't work if the TX page
+size is wrong.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/acdefbb1-3daf-4349-9e03-9472754d5f1e@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/debug.c |  2 +-
+ drivers/net/wireless/realtek/rtw88/fw.c    | 21 +++++++++++----------
+ drivers/net/wireless/realtek/rtw88/mac.c   |  2 +-
+ drivers/net/wireless/realtek/rtw88/main.h  |  2 +-
+ 4 files changed, 14 insertions(+), 13 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/debug.c
++++ b/drivers/net/wireless/realtek/rtw88/debug.c
+@@ -308,7 +308,7 @@ static int rtw_debugfs_get_rsvd_page(str
+ {
+ 	struct rtw_debugfs_priv *debugfs_priv = m->private;
+ 	struct rtw_dev *rtwdev = debugfs_priv->rtwdev;
+-	u8 page_size = rtwdev->chip->page_size;
++	u16 page_size = rtwdev->chip->page_size;
+ 	u32 buf_size = debugfs_priv->rsvd_page.page_num * page_size;
+ 	u32 offset = debugfs_priv->rsvd_page.page_offset * page_size;
+ 	u8 *buf;
+--- a/drivers/net/wireless/realtek/rtw88/fw.c
++++ b/drivers/net/wireless/realtek/rtw88/fw.c
+@@ -1293,13 +1293,13 @@ static void rtw_fill_rsvd_page_desc(stru
+ 	rtw_tx_fill_tx_desc(rtwdev, &pkt_info, skb);
+ }
+ 
+-static inline u8 rtw_len_to_page(unsigned int len, u8 page_size)
++static inline u8 rtw_len_to_page(unsigned int len, u16 page_size)
+ {
+ 	return DIV_ROUND_UP(len, page_size);
+ }
+ 
+-static void rtw_rsvd_page_list_to_buf(struct rtw_dev *rtwdev, u8 page_size,
+-				      u8 page_margin, u32 page, u8 *buf,
++static void rtw_rsvd_page_list_to_buf(struct rtw_dev *rtwdev, u16 page_size,
++				      u16 page_margin, u32 page, u8 *buf,
+ 				      struct rtw_rsvd_page *rsvd_pkt)
+ {
+ 	struct sk_buff *skb = rsvd_pkt->skb;
+@@ -1601,13 +1601,13 @@ static int  __rtw_build_rsvd_page_from_v
+ 
+ static u8 *rtw_build_rsvd_page(struct rtw_dev *rtwdev, u32 *size)
+ {
+-	struct ieee80211_hw *hw = rtwdev->hw;
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+-	struct sk_buff *iter;
++	struct ieee80211_hw *hw = rtwdev->hw;
+ 	struct rtw_rsvd_page *rsvd_pkt;
+-	u32 page = 0;
++	struct sk_buff *iter;
++	u16 page_size, page_margin, tx_desc_sz;
+ 	u8 total_page = 0;
+-	u8 page_size, page_margin, tx_desc_sz;
++	u32 page = 0;
+ 	u8 *buf;
+ 	int ret;
+ 
+@@ -2013,12 +2013,13 @@ static int _rtw_hw_scan_update_probe_req
+ {
+ 	const struct rtw_chip_info *chip = rtwdev->chip;
+ 	struct sk_buff *skb, *tmp;
+-	u8 page_offset = 1, *buf, page_size = chip->page_size;
+ 	u16 pg_addr = rtwdev->fifo.rsvd_h2c_info_addr, loc;
+-	u16 buf_offset = page_size * page_offset;
+ 	u8 tx_desc_sz = chip->tx_pkt_desc_sz;
+-	u8 page_cnt, pages;
++	u16 page_size = chip->page_size;
++	u8 page_offset = 1, *buf;
++	u16 buf_offset = page_size * page_offset;
+ 	unsigned int pkt_len;
++	u8 page_cnt, pages;
+ 	int ret;
+ 
+ 	if (rtw_fw_feature_ext_check(&rtwdev->fw, FW_FEATURE_EXT_OLD_PAGE_NUM))
+--- a/drivers/net/wireless/realtek/rtw88/mac.c
++++ b/drivers/net/wireless/realtek/rtw88/mac.c
+@@ -1138,7 +1138,7 @@ int rtw_set_trx_fifo_info(struct rtw_dev
+ 
+ 	/* config rsvd page num */
+ 	fifo->rsvd_drv_pg_num = chip->rsvd_drv_pg_num;
+-	fifo->txff_pg_num = chip->txff_size >> 7;
++	fifo->txff_pg_num = chip->txff_size / chip->page_size;
+ 	if (rtw_chip_wcpu_11n(rtwdev))
+ 		fifo->rsvd_pg_num = fifo->rsvd_drv_pg_num;
+ 	else
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1187,7 +1187,7 @@ struct rtw_chip_info {
+ 	u32 fw_rxff_size;
+ 	u16 rsvd_drv_pg_num;
+ 	u8 band;
+-	u8 page_size;
++	u16 page_size;
+ 	u8 csi_buf_pg_num;
+ 	u8 dig_max;
+ 	u8 dig_min;

package/kernel/mac80211/patches/rtl/033-v6.13-wifi-rtw88-Move-pwr_track_tbl-to-struct-rtw_rfe_def.patch

@@ -0,0 +1,297 @@
+From 67d915604e6993ff627ac001983a2de63ff71b13 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:12:39 +0300
+Subject: [PATCH] wifi: rtw88: Move pwr_track_tbl to struct rtw_rfe_def
+
+RTL8812AU uses one set of TX power tracking tables for RFE 3, and
+another set for everything else.
+
+Move pwr_track_tbl from struct rtw_chip_info to struct rtw_rfe_def in
+order to load the right set of tables for each RFE (RF front end) type.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/904d0ab1-c046-40cd-a3a3-d4fdcf663c9d@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.h     |  8 ++++---
+ drivers/net/wireless/realtek/rtw88/phy.c      |  3 ++-
+ drivers/net/wireless/realtek/rtw88/rtw8703b.c | 12 +++++-----
+ drivers/net/wireless/realtek/rtw88/rtw8723d.c | 12 +++++-----
+ drivers/net/wireless/realtek/rtw88/rtw8723x.c |  3 ++-
+ drivers/net/wireless/realtek/rtw88/rtw8821c.c | 17 +++++++-------
+ drivers/net/wireless/realtek/rtw88/rtw8822b.c | 15 ++++++------
+ drivers/net/wireless/realtek/rtw88/rtw8822c.c | 23 +++++++++----------
+ 8 files changed, 47 insertions(+), 46 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1099,17 +1099,20 @@ enum rtw_rfe_fem {
+ struct rtw_rfe_def {
+ 	const struct rtw_table *phy_pg_tbl;
+ 	const struct rtw_table *txpwr_lmt_tbl;
++	const struct rtw_pwr_track_tbl *pwr_track_tbl;
+ 	const struct rtw_table *agc_btg_tbl;
+ };
+ 
+-#define RTW_DEF_RFE(chip, bb_pg, pwrlmt) {				  \
++#define RTW_DEF_RFE(chip, bb_pg, pwrlmt, track) {				  \
+ 	.phy_pg_tbl = &rtw ## chip ## _bb_pg_type ## bb_pg ## _tbl,	  \
+ 	.txpwr_lmt_tbl = &rtw ## chip ## _txpwr_lmt_type ## pwrlmt ## _tbl, \
++	.pwr_track_tbl = &rtw ## chip ## _pwr_track_type ## track ## _tbl, \
+ 	}
+ 
+-#define RTW_DEF_RFE_EXT(chip, bb_pg, pwrlmt, btg) {			  \
++#define RTW_DEF_RFE_EXT(chip, bb_pg, pwrlmt, track, btg) {			  \
+ 	.phy_pg_tbl = &rtw ## chip ## _bb_pg_type ## bb_pg ## _tbl,	  \
+ 	.txpwr_lmt_tbl = &rtw ## chip ## _txpwr_lmt_type ## pwrlmt ## _tbl, \
++	.pwr_track_tbl = &rtw ## chip ## _pwr_track_type ## track ## _tbl, \
+ 	.agc_btg_tbl = &rtw ## chip ## _agc_btg_type ## btg ## _tbl, \
+ 	}
+ 
+@@ -1243,7 +1246,6 @@ struct rtw_chip_info {
+ 	u16 dpd_ratemask;
+ 	u8 iqk_threshold;
+ 	u8 lck_threshold;
+-	const struct rtw_pwr_track_tbl *pwr_track_tbl;
+ 
+ 	u8 bfer_su_max_num;
+ 	u8 bfer_mu_max_num;
+--- a/drivers/net/wireless/realtek/rtw88/phy.c
++++ b/drivers/net/wireless/realtek/rtw88/phy.c
+@@ -2384,7 +2384,8 @@ void rtw_phy_init_tx_power(struct rtw_de
+ void rtw_phy_config_swing_table(struct rtw_dev *rtwdev,
+ 				struct rtw_swing_table *swing_table)
+ {
+-	const struct rtw_pwr_track_tbl *tbl = rtwdev->chip->pwr_track_tbl;
++	const struct rtw_rfe_def *rfe_def = rtw_get_rfe_def(rtwdev);
++	const struct rtw_pwr_track_tbl *tbl = rfe_def->pwr_track_tbl;
+ 	u8 channel = rtwdev->hal.current_channel;
+ 
+ 	if (IS_CH_2G_BAND(channel)) {
+--- a/drivers/net/wireless/realtek/rtw88/rtw8703b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8703b.c
+@@ -493,11 +493,6 @@ static const struct rtw_pwr_seq_cmd * co
+ 	NULL
+ };
+ 
+-static const struct rtw_rfe_def rtw8703b_rfe_defs[] = {
+-	[0] = { .phy_pg_tbl	= &rtw8703b_bb_pg_tbl,
+-		.txpwr_lmt_tbl	= &rtw8703b_txpwr_lmt_tbl,},
+-};
+-
+ static const struct rtw_page_table page_table_8703b[] = {
+ 	{12, 2, 2, 0, 1},
+ 	{12, 2, 2, 0, 1},
+@@ -1818,6 +1813,12 @@ static const struct rtw_pwr_track_tbl rt
+ 	.pwrtrk_xtal_p = rtw8703b_pwrtrk_xtal_p,
+ };
+ 
++static const struct rtw_rfe_def rtw8703b_rfe_defs[] = {
++	[0] = { .phy_pg_tbl	= &rtw8703b_bb_pg_tbl,
++		.txpwr_lmt_tbl	= &rtw8703b_txpwr_lmt_tbl,
++		.pwr_track_tbl	= &rtw8703b_rtw_pwr_track_tbl, },
++};
++
+ /* Shared-Antenna Coex Table */
+ static const struct coex_table_para table_sant_8703b[] = {
+ 	{0xffffffff, 0xffffffff}, /* case-0 */
+@@ -1997,7 +1998,6 @@ const struct rtw_chip_info rtw8703b_hw_s
+ 	.rfe_defs_size = ARRAY_SIZE(rtw8703b_rfe_defs),
+ 
+ 	.iqk_threshold = 8,
+-	.pwr_track_tbl = &rtw8703b_rtw_pwr_track_tbl,
+ 
+ 	/* WOWLAN firmware exists, but not implemented yet */
+ 	.wow_fw_name = "rtw88/rtw8703b_wow_fw.bin",
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723d.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723d.c
+@@ -2020,11 +2020,6 @@ static const struct rtw_intf_phy_para_ta
+ 	.n_gen1_para	= ARRAY_SIZE(pcie_gen1_param_8723d),
+ };
+ 
+-static const struct rtw_rfe_def rtw8723d_rfe_defs[] = {
+-	[0] = { .phy_pg_tbl	= &rtw8723d_bb_pg_tbl,
+-		.txpwr_lmt_tbl	= &rtw8723d_txpwr_lmt_tbl,},
+-};
+-
+ static const u8 rtw8723d_pwrtrk_2gb_n[] = {
+ 	0, 0, 1, 1, 1, 2, 2, 3, 4, 4, 4, 4, 5, 5, 5,
+ 	6, 6, 7, 7, 8, 8, 8, 9, 9, 9, 10, 10, 10, 10, 10
+@@ -2088,6 +2083,12 @@ static const struct rtw_pwr_track_tbl rt
+ 	.pwrtrk_xtal_n = rtw8723d_pwrtrk_xtal_n,
+ };
+ 
++static const struct rtw_rfe_def rtw8723d_rfe_defs[] = {
++	[0] = { .phy_pg_tbl	= &rtw8723d_bb_pg_tbl,
++		.txpwr_lmt_tbl	= &rtw8723d_txpwr_lmt_tbl,
++		.pwr_track_tbl	= &rtw8723d_rtw_pwr_track_tbl, },
++};
++
+ static const struct rtw_reg_domain coex_info_hw_regs_8723d[] = {
+ 	{0x948, MASKDWORD, RTW_REG_DOMAIN_MAC32},
+ 	{0x67, BIT(7), RTW_REG_DOMAIN_MAC8},
+@@ -2159,7 +2160,6 @@ const struct rtw_chip_info rtw8723d_hw_s
+ 	.rfe_defs = rtw8723d_rfe_defs,
+ 	.rfe_defs_size = ARRAY_SIZE(rtw8723d_rfe_defs),
+ 	.rx_ldpc = false,
+-	.pwr_track_tbl = &rtw8723d_rtw_pwr_track_tbl,
+ 	.iqk_threshold = 8,
+ 	.ampdu_density = IEEE80211_HT_MPDU_DENSITY_16,
+ 	.max_scan_ie_len = IEEE80211_MAX_DATA_LEN,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8723x.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8723x.c
+@@ -595,7 +595,8 @@ void __rtw8723x_pwrtrack_set_xtal(struct
+ 				  u8 delta)
+ {
+ 	struct rtw_dm_info *dm_info = &rtwdev->dm_info;
+-	const struct rtw_pwr_track_tbl *tbl = rtwdev->chip->pwr_track_tbl;
++	const struct rtw_rfe_def *rfe_def = rtw_get_rfe_def(rtwdev);
++	const struct rtw_pwr_track_tbl *tbl = rfe_def->pwr_track_tbl;
+ 	const s8 *pwrtrk_xtal;
+ 	s8 xtal_cap;
+ 
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821c.c
+@@ -1581,13 +1581,6 @@ static const struct rtw_intf_phy_para_ta
+ 	.n_gen2_para	= ARRAY_SIZE(pcie_gen2_param_8821c),
+ };
+ 
+-static const struct rtw_rfe_def rtw8821c_rfe_defs[] = {
+-	[0] = RTW_DEF_RFE(8821c, 0, 0),
+-	[2] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2),
+-	[4] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2),
+-	[6] = RTW_DEF_RFE(8821c, 0, 0),
+-};
+-
+ static const struct rtw_hw_reg rtw8821c_dig[] = {
+ 	[0] = { .addr = 0xc50, .mask = 0x7f },
+ };
+@@ -1899,7 +1892,7 @@ static const u8 rtw8821c_pwrtrk_2g_cck_a
+ 	5, 6, 6, 7, 7, 7, 8, 8, 9, 9, 9, 9, 9, 9
+ };
+ 
+-static const struct rtw_pwr_track_tbl rtw8821c_rtw_pwr_track_tbl = {
++static const struct rtw_pwr_track_tbl rtw8821c_pwr_track_type0_tbl = {
+ 	.pwrtrk_5gb_n[0] = rtw8821c_pwrtrk_5gb_n[0],
+ 	.pwrtrk_5gb_n[1] = rtw8821c_pwrtrk_5gb_n[1],
+ 	.pwrtrk_5gb_n[2] = rtw8821c_pwrtrk_5gb_n[2],
+@@ -1922,6 +1915,13 @@ static const struct rtw_pwr_track_tbl rt
+ 	.pwrtrk_2g_ccka_p = rtw8821c_pwrtrk_2g_cck_a_p,
+ };
+ 
++static const struct rtw_rfe_def rtw8821c_rfe_defs[] = {
++	[0] = RTW_DEF_RFE(8821c, 0, 0, 0),
++	[2] = RTW_DEF_RFE_EXT(8821c, 0, 0, 0, 2),
++	[4] = RTW_DEF_RFE_EXT(8821c, 0, 0, 0, 2),
++	[6] = RTW_DEF_RFE(8821c, 0, 0, 0),
++};
++
+ static const struct rtw_reg_domain coex_info_hw_regs_8821c[] = {
+ 	{0xCB0, MASKDWORD, RTW_REG_DOMAIN_MAC32},
+ 	{0xCB4, MASKDWORD, RTW_REG_DOMAIN_MAC32},
+@@ -1994,7 +1994,6 @@ const struct rtw_chip_info rtw8821c_hw_s
+ 	.rfe_defs = rtw8821c_rfe_defs,
+ 	.rfe_defs_size = ARRAY_SIZE(rtw8821c_rfe_defs),
+ 	.rx_ldpc = false,
+-	.pwr_track_tbl = &rtw8821c_rtw_pwr_track_tbl,
+ 	.iqk_threshold = 8,
+ 	.bfer_su_max_num = 2,
+ 	.bfer_mu_max_num = 1,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822b.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822b.c
+@@ -2072,12 +2072,6 @@ static const struct rtw_intf_phy_para_ta
+ 	.n_gen2_para	= ARRAY_SIZE(pcie_gen2_param_8822b),
+ };
+ 
+-static const struct rtw_rfe_def rtw8822b_rfe_defs[] = {
+-	[2] = RTW_DEF_RFE(8822b, 2, 2),
+-	[3] = RTW_DEF_RFE(8822b, 3, 0),
+-	[5] = RTW_DEF_RFE(8822b, 5, 5),
+-};
+-
+ static const struct rtw_hw_reg rtw8822b_dig[] = {
+ 	[0] = { .addr = 0xc50, .mask = 0x7f },
+ 	[1] = { .addr = 0xe50, .mask = 0x7f },
+@@ -2432,7 +2426,7 @@ static const u8 rtw8822b_pwrtrk_2g_cck_a
+ 	10, 11, 11, 12, 12, 13, 13, 14, 14, 15
+ };
+ 
+-static const struct rtw_pwr_track_tbl rtw8822b_rtw_pwr_track_tbl = {
++static const struct rtw_pwr_track_tbl rtw8822b_pwr_track_type0_tbl = {
+ 	.pwrtrk_5gb_n[RTW_PWR_TRK_5G_1] = rtw8822b_pwrtrk_5gb_n[RTW_PWR_TRK_5G_1],
+ 	.pwrtrk_5gb_n[RTW_PWR_TRK_5G_2] = rtw8822b_pwrtrk_5gb_n[RTW_PWR_TRK_5G_2],
+ 	.pwrtrk_5gb_n[RTW_PWR_TRK_5G_3] = rtw8822b_pwrtrk_5gb_n[RTW_PWR_TRK_5G_3],
+@@ -2455,6 +2449,12 @@ static const struct rtw_pwr_track_tbl rt
+ 	.pwrtrk_2g_ccka_p = rtw8822b_pwrtrk_2g_cck_a_p,
+ };
+ 
++static const struct rtw_rfe_def rtw8822b_rfe_defs[] = {
++	[2] = RTW_DEF_RFE(8822b, 2, 2, 0),
++	[3] = RTW_DEF_RFE(8822b, 3, 0, 0),
++	[5] = RTW_DEF_RFE(8822b, 5, 5, 0),
++};
++
+ static const struct rtw_reg_domain coex_info_hw_regs_8822b[] = {
+ 	{0xcb0, MASKDWORD, RTW_REG_DOMAIN_MAC32},
+ 	{0xcb4, MASKDWORD, RTW_REG_DOMAIN_MAC32},
+@@ -2535,7 +2535,6 @@ const struct rtw_chip_info rtw8822b_hw_s
+ 	.rf_tbl = {&rtw8822b_rf_a_tbl, &rtw8822b_rf_b_tbl},
+ 	.rfe_defs = rtw8822b_rfe_defs,
+ 	.rfe_defs_size = ARRAY_SIZE(rtw8822b_rfe_defs),
+-	.pwr_track_tbl = &rtw8822b_rtw_pwr_track_tbl,
+ 	.iqk_threshold = 8,
+ 	.bfer_su_max_num = 2,
+ 	.bfer_mu_max_num = 1,
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822c.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822c.c
+@@ -4883,16 +4883,6 @@ static const struct rtw_intf_phy_para_ta
+ 	.n_gen2_para	= ARRAY_SIZE(pcie_gen2_param_8822c),
+ };
+ 
+-static const struct rtw_rfe_def rtw8822c_rfe_defs[] = {
+-	[0] = RTW_DEF_RFE(8822c, 0, 0),
+-	[1] = RTW_DEF_RFE(8822c, 0, 0),
+-	[2] = RTW_DEF_RFE(8822c, 0, 0),
+-	[3] = RTW_DEF_RFE(8822c, 0, 0),
+-	[4] = RTW_DEF_RFE(8822c, 0, 0),
+-	[5] = RTW_DEF_RFE(8822c, 0, 5),
+-	[6] = RTW_DEF_RFE(8822c, 0, 0),
+-};
+-
+ static const struct rtw_hw_reg rtw8822c_dig[] = {
+ 	[0] = { .addr = 0x1d70, .mask = 0x7f },
+ 	[1] = { .addr = 0x1d70, .mask = 0x7f00 },
+@@ -5238,7 +5228,7 @@ static const u8 rtw8822c_pwrtrk_2g_cck_a
+ 	18, 18, 19, 20, 21, 22, 23, 24, 24, 25
+ };
+ 
+-static const struct rtw_pwr_track_tbl rtw8822c_rtw_pwr_track_tbl = {
++static const struct rtw_pwr_track_tbl rtw8822c_pwr_track_type0_tbl = {
+ 	.pwrtrk_5gb_n[RTW_PWR_TRK_5G_1] = rtw8822c_pwrtrk_5gb_n[RTW_PWR_TRK_5G_1],
+ 	.pwrtrk_5gb_n[RTW_PWR_TRK_5G_2] = rtw8822c_pwrtrk_5gb_n[RTW_PWR_TRK_5G_2],
+ 	.pwrtrk_5gb_n[RTW_PWR_TRK_5G_3] = rtw8822c_pwrtrk_5gb_n[RTW_PWR_TRK_5G_3],
+@@ -5261,6 +5251,16 @@ static const struct rtw_pwr_track_tbl rt
+ 	.pwrtrk_2g_ccka_p = rtw8822c_pwrtrk_2g_cck_a_p,
+ };
+ 
++static const struct rtw_rfe_def rtw8822c_rfe_defs[] = {
++	[0] = RTW_DEF_RFE(8822c, 0, 0, 0),
++	[1] = RTW_DEF_RFE(8822c, 0, 0, 0),
++	[2] = RTW_DEF_RFE(8822c, 0, 0, 0),
++	[3] = RTW_DEF_RFE(8822c, 0, 0, 0),
++	[4] = RTW_DEF_RFE(8822c, 0, 0, 0),
++	[5] = RTW_DEF_RFE(8822c, 0, 5, 0),
++	[6] = RTW_DEF_RFE(8822c, 0, 0, 0),
++};
++
+ static const struct rtw_hw_reg_offset rtw8822c_edcca_th[] = {
+ 	[EDCCA_TH_L2H_IDX] = {
+ 		{.addr = 0x84c, .mask = MASKBYTE2}, .offset = 0x80
+@@ -5360,7 +5360,6 @@ const struct rtw_chip_info rtw8822c_hw_s
+ 	.rfe_defs_size = ARRAY_SIZE(rtw8822c_rfe_defs),
+ 	.en_dis_dpd = true,
+ 	.dpd_ratemask = DIS_DPD_RATEALL,
+-	.pwr_track_tbl = &rtw8822c_rtw_pwr_track_tbl,
+ 	.iqk_threshold = 8,
+ 	.lck_threshold = 8,
+ 	.bfer_su_max_num = 2,

package/kernel/mac80211/patches/rtl/034-v6.13-wifi-rtw88-usb-Set-pkt_info.ls-for-the-reserved-page.patch

@@ -0,0 +1,27 @@
+From 85bf3041a0ea40a60b5295749268e179f056546a Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:13:10 +0300
+Subject: [PATCH] wifi: rtw88: usb: Set pkt_info.ls for the reserved page
+
+"ls" meaning "last segment". Without this RTL8812AU can't upload the
+reserved page in USB 2 mode. (Somehow it's fine in USB 3 mode.)
+
+Also tested with RTL8822CU, RTL8812BU, RTL8811CU, RTL8723DU, RTL8811AU.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/e443f5d9-4b53-4f64-985c-64313ec80bef@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -477,6 +477,7 @@ static int rtw_usb_write_data_rsvd_page(
+ 	pkt_info.tx_pkt_size = size;
+ 	pkt_info.qsel = TX_DESC_QSEL_BEACON;
+ 	pkt_info.offset = chip->tx_pkt_desc_sz;
++	pkt_info.ls = true;
+ 
+ 	return rtw_usb_write_data(rtwdev, &pkt_info, buf);
+ }

package/kernel/mac80211/patches/rtl/035-v6.13-wifi-rtw88-Detect-beacon-loss-with-chips-other-than-.patch

@@ -0,0 +1,63 @@
+From 57289d30cd2ae315ab9b28213d63d1dbf8570cf3 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:13:45 +0300
+Subject: [PATCH] wifi: rtw88: Detect beacon loss with chips other than 8822c
+
+The driver is supposed to avoid entering LPS (power saving) when there
+is beacon loss, but only RTL8822C detects the beacon loss (because it
+has beacon filtering in the firmware).
+
+Detect beacon loss with the other chips by checking if we received less
+than half the expected number of beacons in the last 2-second interval.
+
+This gets rid of the occasional "failed to get tx report from firmware"
+warnings with RTL8821AU. It may also avoid some disconnections.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/f52b2fcf-bf94-48bc-89bd-e55ebc3a2f2d@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/main.c | 18 ++++++++++++++++++
+ 1 file changed, 18 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -202,6 +202,21 @@ static void rtw_vif_watch_dog_iter(void
+ 	rtwvif->stats.rx_cnt = 0;
+ }
+ 
++static void rtw_sw_beacon_loss_check(struct rtw_dev *rtwdev,
++				     struct rtw_vif *rtwvif, int received_beacons)
++{
++	int watchdog_delay = 2000000 / 1024; /* TU */
++	int beacon_int, expected_beacons;
++
++	if (rtw_fw_feature_check(&rtwdev->fw, FW_FEATURE_BCN_FILTER) || !rtwvif)
++		return;
++
++	beacon_int = rtwvif_to_vif(rtwvif)->bss_conf.beacon_int;
++	expected_beacons = DIV_ROUND_UP(watchdog_delay, beacon_int);
++
++	rtwdev->beacon_loss = received_beacons < expected_beacons / 2;
++}
++
+ /* process TX/RX statistics periodically for hardware,
+  * the information helps hardware to enhance performance
+  */
+@@ -212,6 +227,7 @@ static void rtw_watch_dog_work(struct wo
+ 	struct rtw_traffic_stats *stats = &rtwdev->stats;
+ 	struct rtw_watch_dog_iter_data data = {};
+ 	bool busy_traffic = test_bit(RTW_FLAG_BUSY_TRAFFIC, rtwdev->flags);
++	int received_beacons = rtwdev->dm_info.cur_pkt_count.num_bcn_pkt;
+ 	u32 tx_unicast_mbps, rx_unicast_mbps;
+ 	bool ps_active;
+ 
+@@ -270,6 +286,8 @@ static void rtw_watch_dog_work(struct wo
+ 	 */
+ 	rtw_iterate_vifs(rtwdev, rtw_vif_watch_dog_iter, &data);
+ 
++	rtw_sw_beacon_loss_check(rtwdev, data.rtwvif, received_beacons);
++
+ 	/* fw supports only one station associated to enter lps, if there are
+ 	 * more than two stations associated to the AP, then we can not enter
+ 	 * lps, because fw does not handle the overlapped beacon interval

package/kernel/mac80211/patches/rtl/036-v6.13-wifi-rtw88-coex-Support-chips-without-a-scoreboard.patch

@@ -0,0 +1,66 @@
+From b19840afc05121293ae59f017cb9924814eb5d77 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:14:12 +0300
+Subject: [PATCH] wifi: rtw88: coex: Support chips without a scoreboard
+
+All the chips currently supported have a "scoreboard": the chip keeps
+track of certain things related to bluetooth, for example, whether
+bluetooth is active. The information can be read from register 0xaa.
+
+RTL8821AU doesn't have this. Implement bluetooth activity detection in
+rtw_coex_monitor_bt_enable() based on the bluetooth TX/RX counters.
+
+This is mostly important for RTL8811AU, the version of RTL8821AU without
+bluetooth. Without this change, the driver thinks bluetooth is active
+and the wifi speeds are low.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/5058f23d-2086-42cd-82ad-eef31a348467@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/coex.c | 18 ++++++++++++++++++
+ drivers/net/wireless/realtek/rtw88/main.h |  1 +
+ 2 files changed, 19 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/coex.c
++++ b/drivers/net/wireless/realtek/rtw88/coex.c
+@@ -494,11 +494,29 @@ static void rtw_coex_monitor_bt_enable(s
+ 	struct rtw_coex_stat *coex_stat = &coex->stat;
+ 	struct rtw_coex_dm *coex_dm = &coex->dm;
+ 	bool bt_disabled = false;
++	bool bt_active = true;
+ 	u16 score_board;
+ 
+ 	if (chip->scbd_support) {
+ 		score_board = rtw_coex_read_scbd(rtwdev);
+ 		bt_disabled = !(score_board & COEX_SCBD_ONOFF);
++	} else {
++		if (coex_stat->hi_pri_tx == 0 && coex_stat->hi_pri_rx == 0 &&
++		    coex_stat->lo_pri_tx == 0 && coex_stat->lo_pri_rx == 0)
++			bt_active = false;
++
++		if (coex_stat->hi_pri_tx == 0xffff && coex_stat->hi_pri_rx == 0xffff &&
++		    coex_stat->lo_pri_tx == 0xffff && coex_stat->lo_pri_rx == 0xffff)
++			bt_active = false;
++
++		if (bt_active) {
++			coex_stat->bt_disable_cnt = 0;
++			bt_disabled = false;
++		} else {
++			coex_stat->bt_disable_cnt++;
++			if (coex_stat->bt_disable_cnt >= 10)
++				bt_disabled = true;
++		}
+ 	}
+ 
+ 	if (coex_stat->bt_disabled != bt_disabled) {
+--- a/drivers/net/wireless/realtek/rtw88/main.h
++++ b/drivers/net/wireless/realtek/rtw88/main.h
+@@ -1494,6 +1494,7 @@ struct rtw_coex_stat {
+ 	u8 bt_hid_slot;
+ 	u8 bt_a2dp_bitpool;
+ 	u8 bt_iqk_state;
++	u8 bt_disable_cnt;
+ 
+ 	u16 wl_beacon_interval;
+ 	u8 wl_noisy_level;

package/kernel/mac80211/patches/rtl/037-v6.13-wifi-rtw88-8821a-Regularly-ask-for-BT-info-updates.patch

@@ -0,0 +1,67 @@
+From bfcee5ee924fc5f706d20f5dc31586ca47912304 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:14:45 +0300
+Subject: [PATCH] wifi: rtw88: 8821a: Regularly ask for BT info updates
+
+The RTL8821AU firmware sends C2H_BT_INFO by itself when bluetooth
+headphones are connected, but not when they are disconnected. This leads
+to the coexistence code still using the A2DP algorithm long after the
+headphones are disconnected, which means the wifi speeds are much lower
+than they should be. Work around this by asking for updates every two
+seconds if the chip is RTL8821AU.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/358acdd2-6aae-46c1-9c66-fcce4e700b96@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/coex.c |  2 +-
+ drivers/net/wireless/realtek/rtw88/coex.h | 11 +++++++++++
+ drivers/net/wireless/realtek/rtw88/main.c |  1 +
+ 3 files changed, 13 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/coex.c
++++ b/drivers/net/wireless/realtek/rtw88/coex.c
+@@ -446,7 +446,7 @@ static void rtw_coex_check_rfk(struct rt
+ 	}
+ }
+ 
+-static void rtw_coex_query_bt_info(struct rtw_dev *rtwdev)
++void rtw_coex_query_bt_info(struct rtw_dev *rtwdev)
+ {
+ 	struct rtw_coex *coex = &rtwdev->coex;
+ 	struct rtw_coex_stat *coex_stat = &coex->stat;
+--- a/drivers/net/wireless/realtek/rtw88/coex.h
++++ b/drivers/net/wireless/realtek/rtw88/coex.h
+@@ -384,6 +384,7 @@ u32 rtw_coex_read_indirect_reg(struct rt
+ void rtw_coex_write_indirect_reg(struct rtw_dev *rtwdev, u16 addr,
+ 				 u32 mask, u32 val);
+ void rtw_coex_write_scbd(struct rtw_dev *rtwdev, u16 bitpos, bool set);
++void rtw_coex_query_bt_info(struct rtw_dev *rtwdev);
+ 
+ void rtw_coex_bt_relink_work(struct work_struct *work);
+ void rtw_coex_bt_reenable_work(struct work_struct *work);
+@@ -419,4 +420,14 @@ static inline bool rtw_coex_disabled(str
+ 	return coex_stat->bt_disabled;
+ }
+ 
++static inline void rtw_coex_active_query_bt_info(struct rtw_dev *rtwdev)
++{
++	/* The RTL8821AU firmware doesn't send C2H_BT_INFO by itself
++	 * when bluetooth headphones are disconnected, so we have to
++	 * ask for it regularly.
++	 */
++	if (rtwdev->chip->id == RTW_CHIP_TYPE_8821A && rtwdev->efuse.btcoex)
++		rtw_coex_query_bt_info(rtwdev);
++}
++
+ #endif
+--- a/drivers/net/wireless/realtek/rtw88/main.c
++++ b/drivers/net/wireless/realtek/rtw88/main.c
+@@ -274,6 +274,7 @@ static void rtw_watch_dog_work(struct wo
+ 	rtw_leave_lps(rtwdev);
+ 	rtw_coex_wl_status_check(rtwdev);
+ 	rtw_coex_query_bt_hid_list(rtwdev);
++	rtw_coex_active_query_bt_info(rtwdev);
+ 
+ 	rtw_phy_dynamic_mechanism(rtwdev);
+ 

package/kernel/mac80211/patches/rtl/038-v6.13-wifi-rtw88-8812a-Mitigate-beacon-loss.patch

@@ -0,0 +1,37 @@
+From f9e0189cbc2d6447dde392944c769546cdf48140 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 23 Oct 2024 17:15:13 +0300
+Subject: [PATCH] wifi: rtw88: 8812a: Mitigate beacon loss
+
+The RTL8812AU has a reception problem, maybe only in the 5 GHz band.
+Sometimes, in some positions, it stops receiving anything even though
+the distance to the AP is only ~3 meters and there are no obstacles.
+Moving it a few centimeters fixes it.
+
+Switch the initial gain to maximum coverage when there is beacon loss.
+This only helps sometimes. This is similar to what the official driver
+does.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/203f5043-4fe1-4f35-8b8f-d3b6f44e1fd9@gmail.com
+---
+ drivers/net/wireless/realtek/rtw88/phy.c | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/phy.c
++++ b/drivers/net/wireless/realtek/rtw88/phy.c
+@@ -530,6 +530,13 @@ static void rtw_phy_dig(struct rtw_dev *
+ 	 */
+ 	rtw_phy_dig_recorder(dm_info, cur_igi, fa_cnt);
+ 
++	/* Mitigate beacon loss and connectivity issues, mainly (only?)
++	 * in the 5 GHz band
++	 */
++	if (rtwdev->chip->id == RTW_CHIP_TYPE_8812A && rtwdev->beacon_loss &&
++	    linked && dm_info->total_fa_cnt < DIG_PERF_FA_TH_EXTRA_HIGH)
++		cur_igi = DIG_CVRG_MIN;
++
+ 	if (cur_igi != pre_igi)
+ 		rtw_phy_dig_write(rtwdev, cur_igi);
+ }

package/kernel/mac80211/patches/rtl/044-v6.13-wifi-rtw88-Add-rtw8821au.c-and-rtw8812au.c.patch

@@ -0,0 +1,80 @@
+From 8f82bb2cfaf7b8992e0e8493cb765138254f87c9 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 30 Oct 2024 20:29:28 +0200
+Subject: [PATCH] wifi: rtw88: Add rtw8821au.c and rtw8812au.c
+
+These are the entry points for the new modules rtw88_8821au
+(RTL8821AU/RTL8811AU) and rtw88_8812au (RTL8812AU).
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/91c495f8-a607-429b-8bc0-5a45d3c1393e@gmail.com
+---
+ .../net/wireless/realtek/rtw88/rtw8812au.c    | 28 +++++++++++++++++++
+ .../net/wireless/realtek/rtw88/rtw8821au.c    | 28 +++++++++++++++++++
+ 2 files changed, 56 insertions(+)
+ create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8812au.c
+ create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8821au.c
+
+--- /dev/null
++++ b/drivers/net/wireless/realtek/rtw88/rtw8812au.c
+@@ -0,0 +1,28 @@
++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
++/* Copyright(c) 2024  Realtek Corporation
++ */
++
++#include <linux/module.h>
++#include <linux/usb.h>
++#include "main.h"
++#include "rtw8812a.h"
++#include "usb.h"
++
++static const struct usb_device_id rtw_8812au_id_table[] = {
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2604, 0x0012, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) },
++	{},
++};
++MODULE_DEVICE_TABLE(usb, rtw_8812au_id_table);
++
++static struct usb_driver rtw_8812au_driver = {
++	.name = "rtw_8812au",
++	.id_table = rtw_8812au_id_table,
++	.probe = rtw_usb_probe,
++	.disconnect = rtw_usb_disconnect,
++};
++module_usb_driver(rtw_8812au_driver);
++
++MODULE_AUTHOR("Bitterblue Smith <rtl8821cerfe2@gmail.com>");
++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8812au driver");
++MODULE_LICENSE("Dual BSD/GPL");
+--- /dev/null
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821au.c
+@@ -0,0 +1,28 @@
++// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause
++/* Copyright(c) 2024  Realtek Corporation
++ */
++
++#include <linux/module.h>
++#include <linux/usb.h>
++#include "main.h"
++#include "rtw8821a.h"
++#include "usb.h"
++
++static const struct usb_device_id rtw_8821au_id_table[] = {
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x011e, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{},
++};
++MODULE_DEVICE_TABLE(usb, rtw_8821au_id_table);
++
++static struct usb_driver rtw_8821au_driver = {
++	.name = "rtw_8821au",
++	.id_table = rtw_8821au_id_table,
++	.probe = rtw_usb_probe,
++	.disconnect = rtw_usb_disconnect,
++};
++module_usb_driver(rtw_8821au_driver);
++
++MODULE_AUTHOR("Bitterblue Smith <rtl8821cerfe2@gmail.com>");
++MODULE_DESCRIPTION("Realtek 802.11ac wireless 8821au/8811au driver");
++MODULE_LICENSE("Dual BSD/GPL");

package/kernel/mac80211/patches/rtl/045-v6.13-wifi-rtw88-Enable-the-new-RTL8821AU-RTL8812AU-driver.patch

@@ -0,0 +1,153 @@
+From 0e3e8284f8e1bf2fc0f7bf247194efe5cfc568c1 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Wed, 30 Oct 2024 20:31:28 +0200
+Subject: [PATCH] wifi: rtw88: Enable the new RTL8821AU/RTL8812AU drivers
+
+These are older Wifi 5 chips. RTL8821AU is 1x1, with or without
+Bluetooth. RTL8812AU is 2x2, without Bluetooth.
+
+Beamforming is not implemented. It looks like these chips need a
+different implementation than what is in bf.c.
+
+Speed tests with RTL8821AU: 137 Mbps download, 144 Mbps upload.
+Speed tests with RTL8812AU: 344 Mbps download, 387 Mbps upload.
+
+Station mode and AP mode were tested.
+
+Bluetooth coexistence works. I used my Bluetooth headphones for
+several days, listening to music and watching videos. There is only
+a problem with the wifi speeds with one router:
+
+With ISP's HG6544C router:
+Official driver: 3/5 Mbps.
+rtw88: a bit more, but not steady at all. Not enough to watch a 1080p
+Youtube video.
+
+With my D-Link Eagle R32 router running Openwrt, on the same channel:
+Official driver: 6/10 Mbps.
+rtw88: download starts around 30, climbs to 50 / upload is 10 Mbps.
+I can watch a 1080p Youtube video.
+
+The music doesn't cut out during any speed tests.
+
+I also tested transferring files to and from my phone. I don't have
+other types of Bluetooth devices to test.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
+Link: https://patch.msgid.link/0b8e8093-8103-4999-86bf-0055ec52ea64@gmail.com
+---
+Kconfig.local                               | 15 ++++++++
+ drivers/net/wireless/realtek/rtw88/Kconfig  | 40 ++++++++++++++++++++-
+ drivers/net/wireless/realtek/rtw88/Makefile | 15 ++++++++
+ 3 files changed, 69 insertions(+), 1 deletion(-)
+
+--- a/Kconfig.local
++++ b/Kconfig.local
+@@ -1144,6 +1144,15 @@ config BACKPORTED_RTW88_8723D
+ config BACKPORTED_RTW88_8821C
+ 	tristate
+ 	default RTW88_8821C
++config BACKPORTED_RTW88_88XXA
++	tristate
++	default RTW88_88XXA
++config BACKPORTED_RTW88_8821A
++	tristate
++	default RTW88_8821A
++config BACKPORTED_RTW88_8812A
++	tristate
++	default RTW88_8812A
+ config BACKPORTED_RTW88_8822BE
+ 	tristate
+ 	default RTW88_8822BE
+@@ -1183,6 +1192,12 @@ config BACKPORTED_RTW88_8821CS
+ config BACKPORTED_RTW88_8821CU
+ 	tristate
+ 	default RTW88_8821CU
++config BACKPORTED_RTW88_8821AU
++	tristate
++	default RTW88_8821AU
++config BACKPORTED_RTW88_8812AU
++	tristate
++	default RTW88_8812AU
+ config BACKPORTED_RTW88_DEBUG
+ 	tristate
+ 	default RTW88_DEBUG
+--- a/drivers/net/wireless/realtek/rtw88/Kconfig
++++ b/drivers/net/wireless/realtek/rtw88/Kconfig
+@@ -54,6 +54,20 @@ config RTW88_8821C
+ 	tristate
+ 	depends on m
+ 
++config RTW88_88XXA
++	tristate
++	depends on m
++
++config RTW88_8821A
++	tristate
++	depends on m
++	select RTW88_88XXA
++
++config RTW88_8812A
++	tristate
++	depends on m
++	select RTW88_88XXA
++
+ config RTW88_8822BE
+ 	tristate "Realtek 8822BE PCI wireless network adapter"
+ 	depends on m
+@@ -213,6 +227,30 @@ config RTW88_8821CU
+ 
+ 	  802.11ac USB wireless network adapter
+ 
++config RTW88_8821AU
++	tristate "Realtek 8821AU/8811AU USB wireless network adapter"
++	depends on m
++	depends on USB
++	select RTW88_CORE
++	select RTW88_USB
++	select RTW88_8821A
++	help
++	  Select this option will enable support for 8821AU and 8811AU chipset
++
++	  802.11ac USB wireless network adapter
++
++config RTW88_8812AU
++	tristate "Realtek 8812AU USB wireless network adapter"
++	depends on m
++	depends on USB
++	select RTW88_CORE
++	select RTW88_USB
++	select RTW88_8812A
++	help
++	  Select this option will enable support for 8812AU chipset
++
++	  802.11ac USB wireless network adapter
++
+ config RTW88_DEBUG
+ 	bool "Realtek rtw88 debug support"
+ 	depends on RTW88_CORE
+--- a/drivers/net/wireless/realtek/rtw88/Makefile
++++ b/drivers/net/wireless/realtek/rtw88/Makefile
+@@ -77,6 +77,21 @@ rtw88_8821cs-objs		:= rtw8821cs.o
+ obj-$(CPTCFG_RTW88_8821CU)	+= rtw88_8821cu.o
+ rtw88_8821cu-objs		:= rtw8821cu.o
+ 
++obj-$(CPTCFG_RTW88_88XXA)	+= rtw88_88xxa.o
++rtw88_88xxa-objs		:= rtw88xxa.o
++
++obj-$(CPTCFG_RTW88_8821A)	+= rtw88_8821a.o
++rtw88_8821a-objs		:= rtw8821a.o rtw8821a_table.o
++
++obj-$(CPTCFG_RTW88_8812A)	+= rtw88_8812a.o
++rtw88_8812a-objs		:= rtw8812a.o rtw8812a_table.o
++
++obj-$(CPTCFG_RTW88_8821AU)	+= rtw88_8821au.o
++rtw88_8821au-objs		:= rtw8821au.o
++
++obj-$(CPTCFG_RTW88_8812AU)	+= rtw88_8812au.o
++rtw88_8812au-objs		:= rtw8812au.o
++
+ obj-$(CPTCFG_RTW88_PCI)		+= rtw88_pci.o
+ rtw88_pci-objs			:= pci.o
+ 

package/kernel/mac80211/patches/rtl/046-wifi-rtw88-8821au-Add-additional-devices-to-the-USB_.patch

@@ -0,0 +1,77 @@
+From ff5a1c94e53c0d24f610c2c30add82f75b728737 Mon Sep 17 00:00:00 2001
+From: Larry Finger <Larry.Finger@gmail.com>
+Date: Wed, 6 Nov 2024 15:55:31 +0200
+Subject: [PATCH 1/6] wifi: rtw88: 8821au: Add additional devices to the
+ USB_DEVICE list
+
+These are the entries that Nick Morrow provided. From
+https://github.com/morrownr/8821au-20210708
+
+Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+---
+ .../net/wireless/realtek/rtw88/rtw8821au.c    | 52 ++++++++++++++++++-
+ 1 file changed, 51 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/rtw8821au.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8821au.c
+@@ -9,8 +9,58 @@
+ #include "usb.h"
+ 
+ static const struct usb_device_id rtw_8821au_id_table[] = {
+-	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x011e, 0xff, 0xff, 0xff),
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x0811, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x0820, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x0821, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8822, 0xff, 0xff, 0xff),
+ 	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x0823, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xa811, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0411, 0x0242, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Buffalo */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0411, 0x029b, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Buffalo */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x04bb, 0x0953, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* I-O DATA */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x056e, 0x4007, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* ELECOM */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x056e, 0x400e, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* ELECOM */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x056e, 0x400f, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* ELECOM */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9052, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Netgear */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0e66, 0x0023, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* HAWKING */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3314, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* D-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3318, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* D-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xab32, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Planex */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x804b, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* TRENDnet */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x011e, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* TP Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x011f, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* TP Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0120, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* TP Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x3823, 0x6249, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Obihai */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xa811, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Edimax */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xa812, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Edimax */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xa813, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Edimax */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xb611, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8821a_hw_spec) }, /* Edimax */
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(usb, rtw_8821au_id_table);

package/kernel/mac80211/patches/rtl/047-wifi-rtw88-8812au-Add-more-device-IDs.patch

@@ -0,0 +1,91 @@
+From d21ad2e4edfb64d3f32685607a457576eea3c5cd Mon Sep 17 00:00:00 2001
+From: Nick Morrow <usbwifi2024@gmail.com>
+Date: Wed, 6 Nov 2024 15:57:10 +0200
+Subject: [PATCH 2/6] wifi: rtw88: 8812au: Add more device IDs
+
+From https://github.com/morrownr/8812au-20210820.
+
+Signed-off-by: Nick Morrow <usbwifi2024@gmail.com>
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+---
+ .../net/wireless/realtek/rtw88/rtw8812au.c    | 68 ++++++++++++++++++-
+ 1 file changed, 67 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/rtw8812au.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8812au.c
+@@ -9,8 +9,74 @@
+ #include "usb.h"
+ 
+ static const struct usb_device_id rtw_8812au_id_table[] = {
+-	{ USB_DEVICE_AND_INTERFACE_INFO(0x2604, 0x0012, 0xff, 0xff, 0xff),
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8812, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x881a, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x881b, 0xff, 0xff, 0xff),
+ 	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x881c, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) },
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0409, 0x0408, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* NEC */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0411, 0x025d, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Buffalo */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x04bb, 0x0952, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* I-O DATA */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x1106, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Belkin */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x1109, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Belkin */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0586, 0x3426, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* ZyXEL */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0789, 0x016e, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Logitec */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x07b8, 0x8812, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Abocom */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0846, 0x9051, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Netgear */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0b05, 0x17d2, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* ASUS */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0df6, 0x0074, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Sitecom */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x0e66, 0x0022, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Hawking */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x1058, 0x0632, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* WD */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x13b1, 0x003f, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Linksys */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x148f, 0x9097, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Amped Wireless */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x1740, 0x0100, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* EnGenius */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x330e, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* D-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3313, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* D-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3315, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* D-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3316, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* D-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xab30, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Planex */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x805b, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TRENDnet */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0101, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TP-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0103, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TP-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x010d, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TP-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x010e, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TP-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x010f, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TP-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2357, 0x0122, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* TP-Link */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2604, 0x0012, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Tenda */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xa822, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8812a_hw_spec) }, /* Edimax */
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(usb, rtw_8812au_id_table);

package/kernel/mac80211/patches/rtl/048-wifi-rtw88-usb-Support-USB-3-with-RTL8812AU.patch

@@ -0,0 +1,69 @@
+From 213dfa630285bb0241f3eaeb778db8ff128f10ba Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Fri, 8 Nov 2024 01:41:08 +0200
+Subject: [PATCH 3/6] wifi: rtw88: usb: Support USB 3 with RTL8812AU
+
+Add the function to automatically switch the RTL8812AU into USB 3 mode.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 34 ++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -929,6 +929,32 @@ static void rtw_usb_intf_deinit(struct r
+ 	usb_set_intfdata(intf, NULL);
+ }
+ 
++static int rtw_usb_switch_mode_old(struct rtw_dev *rtwdev)
++{
++	struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev);
++	enum usb_device_speed cur_speed = rtwusb->udev->speed;
++	u8 hci_opt;
++
++	if (cur_speed == USB_SPEED_HIGH) {
++		hci_opt = rtw_read8(rtwdev, REG_HCI_OPT_CTRL);
++
++		if ((hci_opt & (BIT(2) | BIT(3))) != BIT(3)) {
++			rtw_write8(rtwdev, REG_HCI_OPT_CTRL, 0x8);
++			rtw_write8(rtwdev, REG_SYS_SDIO_CTRL, 0x2);
++			rtw_write8(rtwdev, REG_ACLK_MON, 0x1);
++			rtw_write8(rtwdev, 0x3d, 0x3);
++			/* usb disconnect */
++			rtw_write8(rtwdev, REG_SYS_PW_CTRL + 1, 0x80);
++			return 1;
++		}
++	} else if (cur_speed == USB_SPEED_SUPER) {
++		rtw_write8_clr(rtwdev, REG_SYS_SDIO_CTRL, BIT(1));
++		rtw_write8_clr(rtwdev, REG_ACLK_MON, BIT(0));
++	}
++
++	return 0;
++}
++
+ static int rtw_usb_switch_mode_new(struct rtw_dev *rtwdev)
+ {
+ 	enum usb_device_speed cur_speed;
+@@ -982,7 +1008,8 @@ static int rtw_usb_switch_mode(struct rt
+ {
+ 	u8 id = rtwdev->chip->id;
+ 
+-	if (id != RTW_CHIP_TYPE_8822C && id != RTW_CHIP_TYPE_8822B)
++	if (id != RTW_CHIP_TYPE_8822C && id != RTW_CHIP_TYPE_8822B &&
++	    id != RTW_CHIP_TYPE_8812A)
+ 		return 0;
+ 
+ 	if (!rtwdev->efuse.usb_mode_switch) {
+@@ -997,7 +1024,10 @@ static int rtw_usb_switch_mode(struct rt
+ 		return 0;
+ 	}
+ 
+-	return rtw_usb_switch_mode_new(rtwdev);
++	if (id == RTW_CHIP_TYPE_8812A)
++		return rtw_usb_switch_mode_old(rtwdev);
++	else /* RTL8822CU, RTL8822BU */
++		return rtw_usb_switch_mode_new(rtwdev);
+ }
+ 
+ int rtw_usb_probe(struct usb_interface *intf, const struct usb_device_id *id)

package/kernel/mac80211/patches/rtl/049-wifi-rtw88-usb-Enable-RX-aggregation-for-8821au-8812.patch

@@ -0,0 +1,65 @@
+From 2b38362bd3b8e0a3691f0a8e82444a54f702e384 Mon Sep 17 00:00:00 2001
+From: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+Date: Fri, 8 Nov 2024 01:43:50 +0200
+Subject: [PATCH 4/6] wifi: rtw88: usb: Enable RX aggregation for 8821au/8812au
+
+USB RX aggregation improves the RX speed on certain ARM systems, like
+the NanoPi NEO Core2. With RTL8811AU, before: 30 Mbps, after: 224 Mbps.
+
+The out-of-tree driver uses aggregation size of 7 in USB 3 mode, but
+that doesn't work here. rtw88 advertises support for receiving AMSDU
+in AMPDU, so the AP sends larger frames, up to ~5100 bytes. With a size
+of 7 RTL8812AU frequently tries to aggregate more frames than will fit
+in 32768 bytes. Use a size of 6 instead.
+
+Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
+---
+ drivers/net/wireless/realtek/rtw88/usb.c | 30 ++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/usb.c
++++ b/drivers/net/wireless/realtek/rtw88/usb.c
+@@ -788,6 +788,32 @@ static void rtw_usb_dynamic_rx_agg_v1(st
+ 	rtw_write16(rtwdev, REG_RXDMA_AGG_PG_TH, val16);
+ }
+ 
++static void rtw_usb_dynamic_rx_agg_v2(struct rtw_dev *rtwdev, bool enable)
++{
++	struct rtw_usb *rtwusb = rtw_get_usb_priv(rtwdev);
++	u8 size, timeout;
++	u16 val16;
++
++	if (rtwusb->udev->speed == USB_SPEED_SUPER) {
++		size = 0x6;
++		timeout = 0x1a;
++	} else {
++		size = 0x5;
++		timeout = 0x20;
++	}
++
++	if (!enable) {
++		size = 0x0;
++		timeout = 0x1;
++	}
++
++	val16 = u16_encode_bits(size, BIT_RXDMA_AGG_PG_TH) |
++		u16_encode_bits(timeout, BIT_DMA_AGG_TO_V1);
++
++	rtw_write16(rtwdev, REG_RXDMA_AGG_PG_TH, val16);
++	rtw_write8_set(rtwdev, REG_TXDMA_PQ_MAP, BIT_RXDMA_AGG_EN);
++}
++
+ static void rtw_usb_dynamic_rx_agg(struct rtw_dev *rtwdev, bool enable)
+ {
+ 	switch (rtwdev->chip->id) {
+@@ -796,6 +822,10 @@ static void rtw_usb_dynamic_rx_agg(struc
+ 	case RTW_CHIP_TYPE_8821C:
+ 		rtw_usb_dynamic_rx_agg_v1(rtwdev, enable);
+ 		break;
++	case RTW_CHIP_TYPE_8821A:
++	case RTW_CHIP_TYPE_8812A:
++		rtw_usb_dynamic_rx_agg_v2(rtwdev, enable);
++		break;
+ 	case RTW_CHIP_TYPE_8723D:
+ 		/* Doesn't like aggregation. */
+ 		break;

package/kernel/mac80211/patches/rtl/050-wifi-rtlwifi-rtl8821ae-phy-restore-removed-code-to-f.patch

@@ -0,0 +1,32 @@
+From 927dcd0ab53f39ee00a2d1f204b5aac77e28fcf9 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.i.king@gmail.com>
+Date: Wed, 6 Nov 2024 15:46:42 +0000
+Subject: [PATCH 5/6] wifi: rtlwifi: rtl8821ae: phy: restore removed code to
+ fix infinite loop
+
+A previous clean-up fix removed the assignment of v2 inside a while loop
+that turned it into an infinite loop. Fix this by restoring the assignment
+of v2 from array[] so that v2 is updated inside the loop.
+
+Fixes: cda37445718d ("wifi: rtlwifi: rtl8821ae: phy: remove some useless code")
+Signed-off-by: Colin Ian King <colin.i.king@gmail.com>
+Tested-by: Ping-Ke Shih <pkshih@realtek.com>
+Reviewed-by: Su Hui <suhui@nfschina.com>
+---
+ drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
++++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
+@@ -2033,8 +2033,10 @@ static bool _rtl8821ae_phy_config_bb_wit
+ 			if (!_rtl8821ae_check_condition(hw, v1)) {
+ 				i += 2; /* skip the pair of expression*/
+ 				v2 = array[i+1];
+-				while (v2 != 0xDEAD)
++				while (v2 != 0xDEAD) {
+ 					i += 3;
++					v2 = array[i + 1];
++				}
+ 			}
+ 		}
+ 	}

package/kernel/mac80211/patches/rtl/051-wifi-rtw88-Add-additional-USB-IDs-for-RTL8812BU.patch

@@ -0,0 +1,31 @@
+From acadf3a63b39ad03167a633fa3cea8c0fc2ab87f Mon Sep 17 00:00:00 2001
+From: Nick Morrow <usbwifi2024@gmail.com>
+Date: Thu, 7 Nov 2024 08:28:46 +0800
+Subject: [PATCH 6/6] wifi: rtw88: Add additional USB IDs for RTL8812BU
+
+Add three additional USB IDs found in
+https://github.com/morrownr/88x2bu-20210702
+to support more RTL8812BU devices.
+
+Signed-off-by: Nick Morrow <usbwifi2024@gmail.com>
+Signed-off-by: Zenm Chen <zenmchen@gmail.com>
+Signed-off-by: Mikhail Novosyolov <m.novosyolov@rosalinux.ru>
+---
+ drivers/net/wireless/realtek/rtw88/rtw8822bu.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/net/wireless/realtek/rtw88/rtw8822bu.c
++++ b/drivers/net/wireless/realtek/rtw88/rtw8822bu.c
+@@ -67,6 +67,12 @@ static const struct usb_device_id rtw_88
+ 	  .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* LiteOn */
+ 	{ USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x808a, 0xff, 0xff, 0xff),
+ 	  .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TRENDnet TEW-808UBM */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x805a, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* TRENDnet TEW-805UBH */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x056e, 0x4011, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* ELECOM WDB-867DU3S */
++	{ USB_DEVICE_AND_INTERFACE_INFO(0x2c4e, 0x0107, 0xff, 0xff, 0xff),
++	  .driver_info = (kernel_ulong_t)&(rtw8822b_hw_spec) }, /* Mercusys MA30H */
+ 	{},
+ };
+ MODULE_DEVICE_TABLE(usb, rtw_8822bu_id_table);

package/kernel/mac80211/realtek.mk

@@ -4,6 +4,7 @@ PKG_DRIVERS += \
 	rtl8723bs rtl8821ae rtl8xxxu rtw88 rtw88-pci rtw88-usb rtw88-sdio rtw88-8821c \
 	rtw88-8822b rtw88-8822c rtw88-8723x rtw88-8723d rtw88-8821ce rtw88-8821cu \
 	rtw88-8822be rtw88-8822bu rtw88-8822ce rtw88-8822cu rtw88-8723de rtw88-8723ds \
+	rtw88-88xxa rtw88-8821a rtw88-8812a rtw88-8821au rtw88-8812au \
 	rtw88-8723du rtw89 rtw89-pci rtw89-8851be rtw89-8852ae rtw89-8852b-common \
 	rtw89-8852be rtw89-8852ce rtw89-8922ae
 
@@ -48,6 +49,11 @@ config-$(call config_package,rtw88-8723d) += RTW88_8723D
 config-$(call config_package,rtw88-8723de) += RTW88_8723DE
 config-$(call config_package,rtw88-8723ds) += RTW88_8723DS
 config-$(call config_package,rtw88-8723du) += RTW88_8723DU
+config-$(call config_package,rtw88-88xxa) += RTW88_88XXA
+config-$(call config_package,rtw88-8821a) += RTW88_8821A
+config-$(call config_package,rtw88-8812a) += RTW88_8812A
+config-$(call config_package,rtw88-8821au) += RTW88_8821AU
+config-$(call config_package,rtw88-8812au) += RTW88_8812AU
 config-$(CONFIG_PACKAGE_RTW88_DEBUG) += RTW88_DEBUG
 config-$(CONFIG_PACKAGE_RTW88_DEBUGFS) += RTW88_DEBUGFS
 
@@ -255,6 +261,33 @@ define KernelPackage/rtw88-usb
   HIDDEN:=1
 endef
 
+define KernelPackage/rtw88-88xxa
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8812A/RTL8821A family support
+  DEPENDS+= +@DRIVER_11AC_SUPPORT +kmod-rtw88-usb
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_88xxa.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_88xxa)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8821a
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8821A family support
+  DEPENDS+= +kmod-rtw88-88xxa
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821a.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8821a)
+  HIDDEN:=1
+endef
+
+define KernelPackage/rtw88-8812a
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8812A family support
+  DEPENDS+= +kmod-rtw88-88xxa
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8812a.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8812a)
+  HIDDEN:=1
+endef
+
 define KernelPackage/rtw88-8821c
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8821C family support
@@ -300,6 +333,22 @@ define KernelPackage/rtw88-8723d
   HIDDEN:=1
 endef
 
+define KernelPackage/rtw88-8821au
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8821AU support
+  DEPENDS+= +kmod-rtw88-8821a +rtl8821a-firmware
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8821au.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8821au)
+endef
+
+define KernelPackage/rtw88-8812au
+  $(call KernelPackage/mac80211/Default)
+  TITLE:=Realtek RTL8812AU support
+  DEPENDS+= +kmod-rtw88-8812a +rtl8812a-firmware
+  FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/realtek/rtw88/rtw88_8812au.ko
+  AUTOLOAD:=$(call AutoProbe,rtw88_8812au)
+endef
+
 define KernelPackage/rtw88-8821ce
   $(call KernelPackage/mac80211/Default)
   TITLE:=Realtek RTL8821CE support

package/network/config/firewall4/Makefile

@@ -9,9 +9,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/firewall4.git
-PKG_SOURCE_DATE:=2024-05-21
-PKG_SOURCE_VERSION:=4c01d1ebf99e8ecfa69758a9b4f450ecef7b93cd
-PKG_MIRROR_HASH:=bbc5622bc03e3b43116fcc86e3fa2d2372bfc07b3a00d2b3a6efac4f7454a403
+PKG_SOURCE_DATE:=2024-12-18
+PKG_SOURCE_VERSION:=18fc0ead19faf06b8ce7ec5be84957278e942dfa
+PKG_MIRROR_HASH:=123d1b5d00cdbbfa77813b3eb694d00949171037a0fa26e6d36a75a37066ba48
 PKG_MAINTAINER:=Jo-Philipp Wich <jo@mein.io>
 PKG_LICENSE:=ISC
 

package/network/config/ltq-vdsl-vr9-app/Makefile

@@ -29,7 +29,7 @@ define Package/ltq-vdsl-vr9-app
   CATEGORY:=Network
   TITLE:=Lantiq VDSL userland tool
   URL:=http://www.lantiq.com/
-  DEPENDS:=@TARGET_lantiq_xrx200 +libpthread +librt +ltq-dsl-base +libubox +libubus
+  DEPENDS:=@(TARGET_lantiq_xrx200||TARGET_lantiq_xrx200_legacy) +libpthread +librt +ltq-dsl-base +libubox +libubus
   PROVIDES:=ltq-dsl-app
 endef
 

package/network/config/netifd/Makefile

@@ -5,9 +5,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/netifd.git
-PKG_SOURCE_DATE:=2024-11-08
-PKG_SOURCE_VERSION:=34eb11eb6f5c62de480d6192f0ca840093127fee
-PKG_MIRROR_HASH:=c4c2bc626426d2cd73c9ece54b22ada6ed6254afa992f51b8725312aca240cfd
+PKG_SOURCE_DATE:=2024-12-17
+PKG_SOURCE_VERSION:=ea01ed41f3212ecbe000422f3c122a01b93fe874
+PKG_MIRROR_HASH:=dbaad26c1f9b15d0caff6ccdf80d85b34d96bda72cbd2b1dc188a04136d96c28
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
 
 PKG_LICENSE:=GPL-2.0

package/network/config/netifd/files/etc/init.d/network

@@ -30,12 +30,12 @@ reload_service() {
 
 	init_switch
 	ubus call network reload || rv=1
-	/sbin/wifi reload_legacy
+	[ -x /sbin/wifi ] && /sbin/wifi reload_legacy
 	return $rv
 }
 
 stop_service() {
-	/sbin/wifi down
+	[ -x /sbin/wifi ] && /sbin/wifi down
 	ifdown -a
 	sleep 1
 }

package/network/config/wifi-scripts/files/lib/netifd/hostapd.sh

@@ -697,7 +697,7 @@ hostapd_set_bss_options() {
 				append bss_conf "wpa_psk=$key" "$N"
 			elif [ ${#key} -ge 8 ] && [ ${#key} -le 63 ]; then
 				append bss_conf "wpa_passphrase=$key" "$N"
-			elif [ -n "$key" ] || [ -z "$wpa_psk_file" ]; then
+			elif [ -n "$key" ]; then
 				wireless_setup_vif_failed INVALID_WPA_PSK
 				return 1
 			fi

package/network/config/wifi-scripts/files/lib/netifd/wireless/mac80211.sh

@@ -1017,7 +1017,7 @@ mac80211_setup_vif() {
 			json_get_vars $MP_CONFIG_INT $MP_CONFIG_BOOL $MP_CONFIG_STRING
 			wireless_vif_parse_encryption
 			[ -z "$htmode" ] && htmode="NOHT";
-			if wpa_supplicant -vmesh; then
+			if [ -x /usr/sbin/wpa_supplicant ] && wpa_supplicant -vmesh; then
 				mac80211_setup_supplicant || failed=1
 			else
 				mac80211_setup_mesh

package/network/services/hostapd/files/hostapd.uc

@@ -186,7 +186,7 @@ function __iface_pending_next(pending, state, ret, data)
 
 		pending.call("wpa_supplicant", "phy_status", {
 			phy: phydev.phy,
-			radio: phydev.radio,
+			radio: phydev.radio ?? -1,
 		});
 		return "check_phy";
 	case "check_phy":
@@ -199,7 +199,7 @@ function __iface_pending_next(pending, state, ret, data)
 		}
 		pending.call("wpa_supplicant", "phy_set_state", {
 			phy: phydev.phy,
-			radio: phydev.radio,
+			radio: phydev.radio ?? -1,
 			stop: true
 		});
 		return "wpas_stopped";
@@ -208,7 +208,7 @@ function __iface_pending_next(pending, state, ret, data)
 			hostapd.printf(`hostapd.add_iface failed for phy ${phy} ifname=${bss.ifname}`);
 		pending.call("wpa_supplicant", "phy_set_state", {
 			phy: phydev.phy,
-			radio: phydev.radio,
+			radio: phydev.radio ?? -1,
 			stop: false
 		});
 		return null;
@@ -827,7 +827,7 @@ let main_obj = {
 			let phy_list = req.args.phy ? [ phy_name(req.args.phy, req.args.radio) ] : keys(hostapd.data.config);
 			for (let phy_name in phy_list) {
 				let phy = hostapd.data.config[phy_name];
-				let config = iface_load_config(phy.phy, radio, phy.orig_file);
+				let config = iface_load_config(phy.phy, phy.radio_idx, phy.orig_file);
 				iface_set_config(phy_name, config);
 			}
 

package/network/services/unetd/Makefile

@@ -10,9 +10,9 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=unetd
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/unetd.git
-PKG_SOURCE_DATE:=2024-03-31
-PKG_SOURCE_VERSION:=806457664ab6e952a7f4febb82e891f596fe577c
-PKG_MIRROR_HASH:=f469d65fd83721a8da0e5253d1ba871a6734233da6f23b631009b17b3af82455
+PKG_SOURCE_DATE:=2024-12-17
+PKG_SOURCE_VERSION:=a0a2d80f3459425182a9f0e665d8ca8eff97c82f
+PKG_MIRROR_HASH:=a6f07d91da40152b2af5b5b9d1d67d87a9991943147e47be6921c092ad7b49a3
 
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

package/network/services/unetd/files/unetd.init

@@ -13,5 +13,20 @@ start_service() {
 	procd_set_param command "$PROG" -h /var/run/unetd/hosts -u /var/run/unetd/socket
 	procd_set_param respawn
 	procd_set_param limits core="unlimited"
+
+	procd_open_data
+	json_add_array firewall
+
+	json_add_object ""
+	json_add_string type rule
+	json_add_string proto udp
+	json_add_string src "*"
+	json_add_int dest_port 51819
+	json_add_string target ACCEPT
+	json_close_object
+
+	json_close_array
+	procd_close_data
+
 	procd_close_instance
 }

package/network/utils/bpftool/Makefile

@@ -97,7 +97,7 @@ HOST_MAKE_FLAGS += \
 	$(if $(findstring c,$(OPENWRT_VERBOSE)),V=1,V='') \
 	check_feat=0 \
 	feature-clang-bpf-co-re=0 \
-	feature-libbfd=1 \
+	feature-libbfd=0 \
 	feature-llvm=0 \
 	feature-libcap=0 \
 	feature-disassembler-four-args=1 \

package/system/procd/Makefile

@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL=$(PROJECT_GIT)/project/procd.git
-PKG_MIRROR_HASH:=56c5f71da3f68036c63ae59d01992785e74027726da5973297895985cd27c215
-PKG_SOURCE_DATE:=2024-11-13
-PKG_SOURCE_VERSION:=7330fa55c5211eb7b3c675d1c7b8281b69b53553
+PKG_MIRROR_HASH:=99139ce325d73f5b250d115703540acfac3bcdc8ee202f2d3aacf3083042bc70
+PKG_SOURCE_DATE:=2024-12-17
+PKG_SOURCE_VERSION:=fd01fb852302a2683d09ee1c2193d7c51e2b0ba8
 CMAKE_INSTALL:=1
 
 PKG_LICENSE:=GPL-2.0

package/system/procd/files/procd.sh

@@ -101,9 +101,11 @@ _procd_close_service() {
 	_procd_open_trigger
 	service_triggers
 	_procd_close_trigger
-	_procd_open_data
-	service_data
-	_procd_close_data
+	type service_data >/dev/null 2>&1 && {
+		_procd_open_data
+		service_data
+		_procd_close_data
+	}
 	_procd_ubus_call ${1:-set}
 }
 
@@ -306,6 +308,36 @@ _procd_add_reload_interface_trigger() {
 	_procd_close_trigger
 }
 
+_procd_add_data_trigger() {
+	json_add_array
+	_procd_add_array_data "service.data.update"
+
+	json_add_array
+	_procd_add_array_data "if"
+
+	json_add_array
+	_procd_add_array_data "eq" "name" "$1"
+	shift
+	json_close_array
+
+	json_add_array
+	_procd_add_array_data "run_script" "$@"
+	json_close_array
+
+	json_close_array
+	_procd_add_timeout
+	json_close_array
+}
+
+_procd_add_reload_data_trigger() {
+	local script=$(readlink "$initscript")
+	local name=$(basename ${script:-$initscript})
+
+	_procd_open_trigger
+	_procd_add_data_trigger $1 /etc/init.d/$name reload
+	_procd_close_trigger
+}
+
 _procd_add_config_trigger() {
 	json_add_array
 	_procd_add_array_data "$1"
@@ -659,6 +691,7 @@ _procd_wrapper \
 	procd_add_interface_trigger \
 	procd_add_mount_trigger \
 	procd_add_reload_trigger \
+	procd_add_reload_data_trigger \
 	procd_add_reload_interface_trigger \
 	procd_add_action_mount_trigger \
 	procd_add_reload_mount_trigger \

target/linux/airoha/patches-6.6/019-01-v6.11-clk-en7523-Add-reset-controller-support-for-EN7581-S.patch

@@ -139,7 +139,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  		return PTR_ERR(pb_base);
  
 @@ -428,6 +510,95 @@ static void en7523_register_clocks(struc
- 	clk_data->num = EN7523_NUM_CLOCKS;
+ 	clk_data->hws[EN7523_CLK_PCIE] = hw;
  }
  
 +static int en7523_reset_update(struct reset_controller_dev *rcdev,

target/linux/airoha/patches-6.6/033-02-v6.13-clk-en7523-move-clock_register-in-hw_init-callback.patch

@@ -51,7 +51,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  				   void __iomem *base, void __iomem *np_base)
  {
 @@ -449,6 +436,49 @@ static void en7523_register_clocks(struc
- 	clk_data->num = EN7523_NUM_CLOCKS;
+ 	clk_data->hws[EN7523_CLK_PCIE] = hw;
  }
  
 +static int en7523_clk_hw_init(struct platform_device *pdev,

target/linux/airoha/patches-6.6/033-03-v6.13-clk-en7523-introduce-chip_scu-regmap.patch

@@ -63,7 +63,7 @@ Signed-off-by: Stephen Boyd <sboyd@kernel.org>
  	val >>= desc->div_shift;
  	val &= (1 << desc->div_bits) - 1;
  
-@@ -416,9 +409,12 @@ static void en7523_register_clocks(struc
+@@ -418,9 +411,12 @@ static void en7523_register_clocks(struc
  
  	for (i = 0; i < ARRAY_SIZE(en7523_base_clks); i++) {
  		const struct en_clk_desc *desc = &en7523_base_clks[i];

target/linux/airoha/patches-6.6/901-snand-mtk-bmt-support.patch

@@ -8,7 +8,7 @@
  
  static int spinand_read_reg_op(struct spinand_device *spinand, u8 reg, u8 *val)
  {
-@@ -1346,6 +1347,7 @@ static int spinand_probe(struct spi_mem
+@@ -1347,6 +1348,7 @@ static int spinand_probe(struct spi_mem
  	if (ret)
  		return ret;
  
@@ -16,7 +16,7 @@
  	ret = mtd_device_register(mtd, NULL, 0);
  	if (ret)
  		goto err_spinand_cleanup;
-@@ -1353,6 +1355,7 @@ static int spinand_probe(struct spi_mem
+@@ -1354,6 +1356,7 @@ static int spinand_probe(struct spi_mem
  	return 0;
  
  err_spinand_cleanup:
@@ -24,7 +24,7 @@
  	spinand_cleanup(spinand);
  
  	return ret;
-@@ -1371,6 +1374,7 @@ static int spinand_remove(struct spi_mem
+@@ -1372,6 +1375,7 @@ static int spinand_remove(struct spi_mem
  	if (ret)
  		return ret;
  

target/linux/ath79/dts/ar7240_tplink_tl-wa.dtsi

@@ -17,7 +17,7 @@
 };
 
 &eth1 {
-	nvmem-cells = <&macaddr_uboot_1fc00>;
+	nvmem-cells = <&macaddr_uboot_1fc00 0>;
 	nvmem-cell-names = "mac-address";
 };
 

target/linux/ath79/dts/ar9132_buffalo_wzr-hp-g300nh.dtsi

@@ -145,7 +145,7 @@
 					#size-cells = <1>;
 
 					cal_art_11000: calibration@11000 {
-						reg = <0x11000 0x440>;
+						reg = <0x11000 0xeb8>;
 					};
 
 					macaddr_art_1120c: macaddr@1120c {

target/linux/ath79/dts/ar9132_tplink_tl-wa901nd-v2.dts

@@ -104,7 +104,7 @@
 					#size-cells = <1>;
 
 					cal_art_1000: calibration@1000 {
-						reg = <0x1000 0x440>;
+						reg = <0x1000 0xeb8>;
 					};
 				};
 			};

target/linux/ath79/dts/ar9132_tplink_tl-wr1043nd-v1.dts

@@ -131,7 +131,7 @@
 					#size-cells = <1>;
 
 					cal_art_1000: calibration@1000 {
-						reg = <0x1000 0x440>;
+						reg = <0x1000 0xeb8>;
 					};
 				};
 			};

target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts

@@ -153,7 +153,7 @@
 					#size-cells = <1>;
 
 					cal_art_1000: calibration@1000 {
-						reg = <0x1000 0x440>;
+						reg = <0x1000 0xeb8>;
 					};
 				};
 			};

target/linux/ath79/dts/qca9563_kuwfi_n650.dts

@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qca956x.dtsi"
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/leds/common.h>
+#include <dt-bindings/mtd/partitions/uimage.h>
+
+/ {
+	model = "KuWFi N650";
+	compatible = "kuwfi,n650", "qca,qca9563";
+
+	aliases {
+		label-mac-device = &eth0;
+		led-boot = &led_green;
+		led-running = &led_green;
+		led-failsafe = &led_blue;
+		led-upgrade = &led_blue;
+	};
+
+	virtual_flash {
+		compatible = "mtd-concat";
+		devices = <&fwconcat0 &fwconcat1>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x0 0x0>;
+				label = "firmware";
+				compatible = "openwrt,uimage", "denx,uimage";
+				openwrt,ih-magic = <IH_MAGIC_OKLI>;
+			};
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			label = "Reset button";
+			linux,code = <KEY_RESTART>;
+			gpios = <&gpio 2 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
+		};
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_blue: blue {
+			function = LED_FUNCTION_DEBUG;
+			color = <LED_COLOR_ID_BLUE>;
+			gpios = <&gpio 7 GPIO_ACTIVE_LOW>;
+		};
+
+		led_green: green {
+			function = LED_FUNCTION_POWER;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&gpio 8 GPIO_ACTIVE_LOW>;
+		};
+	};
+};
+
+&spi {
+	status = "okay";
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				label = "u-boot";
+				reg = <0x000000 0x030000>;
+				read-only;
+			};
+
+			partition@30000 {
+				label = "u-boot-env";
+				reg = <0x030000 0x010000>;
+			};
+
+			fwconcat0: partition@40000 {
+				label = "fwconcat0";
+				reg = <0x040000 0xd40000>;
+			};
+
+			partition@d80000 {
+				label = "loader";
+				reg = <0xd80000 0x10000>;
+			};
+
+			fwconcat1: partition@d90000 {
+				label = "fwconcat1";
+				reg = <0xd90000 0x160000>;
+			};
+
+			partition@ef0000 {
+				label = "log";
+				reg = <0xef0000 0x0f0000>;
+				read-only;
+			};
+
+			partition@fe0000 {
+				label = "nvram";
+				reg = <0xfe0000 0x010000>;
+				read-only;
+			};
+
+			partition@ff0000 {
+				label = "art";
+				reg = <0xff0000 0x10000>;
+				read-only;
+
+				nvmem-layout {
+					compatible = "fixed-layout";
+					#address-cells = <1>;
+					#size-cells = <1>;
+
+					macaddr_art_0: macaddr@0 {
+						compatible = "mac-base";
+						reg = <0x0 0x6>;
+						#nvmem-cell-cells = <1>;
+					};
+
+					precal_art_5000: pre-calibration@5000 {
+						reg = <0x5000 0x2f20>;
+					};
+				};
+			};
+		};
+	};
+};
+
+&mdio0 {
+	status = "okay";
+
+	phy0: ethernet-phy@0 {
+		reg = <0>;
+		phy-mode = "sgmii";
+		reset-gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+		qca,mib-poll-interval = <500>;
+
+		qca,ar8327-initvals = <
+			0x04 0x00080080 /* PORT0 PAD MODE CTRL */
+			0x7c 0x0000007e /* PORT0_STATUS */
+		>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	nvmem-cells = <&macaddr_art_0 0>;
+	nvmem-cell-names = "mac-address";
+	phy-handle = <&phy0>;
+	phy-mode = "sgmii";
+};
+
+&pcie {
+	status = "okay";
+
+	wifi@0,0 {
+		compatible = "pci168c,0056";
+		reg = <0x0000 0 0 0 0>;
+		nvmem-cells = <&precal_art_5000>, <&macaddr_art_0 1>;
+		nvmem-cell-names = "pre-calibration", "mac-address";
+	};
+};

target/linux/ath79/generic/base-files/etc/board.d/02_network

@@ -401,6 +401,10 @@ ath79_setup_interfaces()
 		ucidef_add_switch "switch0" \
 			"0@eth0" "1:lan:2" "4:lan:1"
 		;;
+	kuwfi,n650)
+		ucidef_add_switch "switch0" \
+			"0@eth0" "2:lan:1" "3:lan:2"
+		;;
 	letv,lba-047-ch)
 		ucidef_set_interface_wan "eth0"
 		ucidef_add_switch "switch0" \

target/linux/ath79/image/generic.mk

@@ -1963,6 +1963,25 @@ define Device/kuwfi_c910
 endef
 TARGET_DEVICES += kuwfi_c910
 
+define Device/kuwfi_n650
+  $(Device/loader-okli-uimage)
+  SOC := qca9563
+  DEVICE_VENDOR := KuWFi
+  DEVICE_MODEL := N650
+  DEVICE_PACKAGES += kmod-ath10k-ct ath10k-firmware-qca9888-ct
+  FACTORY_SIZE := 13632k
+  LOADER_FLASH_OFFS := 0x40000
+  KERNEL := kernel-bin | append-dtb | lzma | uImage lzma -M 0x4f4b4c49
+  IMAGE_SIZE := 15040k
+  IMAGES += factory.bin
+  IMAGE/factory.bin := append-kernel | pad-to $$$$(BLOCKSIZE) | \
+    append-rootfs | pad-rootfs | check-size | pad-to 13568k | \
+    append-loader-okli-uimage $(1) | pad-to 64k | check-size $$$$(FACTORY_SIZE)
+  ARTIFACTS := loader.bin
+  ARTIFACT/loader.bin := append-loader-okli-uimage $(1) | pad-to 64k
+endef
+TARGET_DEVICES += kuwfi_n650
+
 define Device/letv_lba-047-ch
   $(Device/loader-okli-uimage)
   SOC := qca9531

target/linux/ath79/patches-6.6/900-unaligned_access_hacks.patch

@@ -259,7 +259,7 @@ SVN-Revision: 35130
  #include <linux/uaccess.h>
  #include <linux/ipv6.h>
  #include <linux/icmpv6.h>
-@@ -893,10 +894,10 @@ static void tcp_v6_send_response(const s
+@@ -891,10 +892,10 @@ static void tcp_v6_send_response(const s
  	topt = (__be32 *)(t1 + 1);
  
  	if (tsecr) {
@@ -337,7 +337,7 @@ SVN-Revision: 35130
  #endif /* _LINUX_TYPES_H */
 --- a/net/ipv4/af_inet.c
 +++ b/net/ipv4/af_inet.c
-@@ -1508,8 +1508,8 @@ struct sk_buff *inet_gro_receive(struct
+@@ -1506,8 +1506,8 @@ struct sk_buff *inet_gro_receive(struct
  		goto out;
  
  	NAPI_GRO_CB(skb)->proto = proto;

target/linux/bcm27xx/patches-6.6/950-0007-drm-vc4-Add-firmware-kms-mode.patch

@@ -220,7 +220,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
  	struct vc4_hang_state *hang_state;
  
-@@ -963,6 +967,9 @@ extern struct platform_driver vc4_dsi_dr
+@@ -964,6 +968,9 @@ extern struct platform_driver vc4_dsi_dr
  /* vc4_fence.c */
  extern const struct dma_fence_ops vc4_fence_ops;
  

target/linux/bcm27xx/patches-6.6/950-0008-drm-vc4-Add-support-for-gamma-on-BCM2711.patch

@@ -83,7 +83,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
  struct drm_device;
  struct drm_gem_object;
-@@ -494,6 +495,17 @@ struct drm_encoder *vc4_find_encoder_by_
+@@ -495,6 +496,17 @@ struct drm_encoder *vc4_find_encoder_by_
  	return NULL;
  }
  
@@ -101,7 +101,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  struct vc4_crtc_data {
  	const char *name;
  
-@@ -538,9 +550,19 @@ struct vc4_crtc {
+@@ -539,9 +551,19 @@ struct vc4_crtc {
  	/* Timestamp at start of vblank irq - unaffected by lock delays. */
  	ktime_t t_vblank;
  
@@ -126,7 +126,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -243,7 +243,8 @@ static void vc4_hvs_lut_load(struct vc4_
+@@ -248,7 +248,8 @@ static void vc4_hvs_lut_load(struct vc4_
  static void vc4_hvs_update_gamma_lut(struct vc4_hvs *hvs,
  				     struct vc4_crtc *vc4_crtc)
  {
@@ -136,7 +136,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	struct drm_color_lut *lut = crtc_state->gamma_lut->data;
  	u32 length = drm_color_lut_size(crtc_state->gamma_lut);
  	u32 i;
-@@ -257,6 +258,81 @@ static void vc4_hvs_update_gamma_lut(str
+@@ -262,6 +263,81 @@ static void vc4_hvs_update_gamma_lut(str
  	vc4_hvs_lut_load(hvs, vc4_crtc);
  }
  
@@ -218,7 +218,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  u8 vc4_hvs_get_fifo_frame_count(struct vc4_hvs *hvs, unsigned int fifo)
  {
  	struct drm_device *drm = &hvs->vc4->base;
-@@ -400,7 +476,10 @@ static int vc4_hvs_init_channel(struct v
+@@ -405,7 +481,10 @@ static int vc4_hvs_init_channel(struct v
  	/* Reload the LUT, since the SRAMs would have been disabled if
  	 * all CRTCs had SCALER_DISPBKGND_GAMMA unset at once.
  	 */
@@ -230,7 +230,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
  	drm_dev_exit(idx);
  
-@@ -646,7 +725,11 @@ void vc4_hvs_atomic_flush(struct drm_crt
+@@ -649,7 +728,11 @@ void vc4_hvs_atomic_flush(struct drm_crt
  		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
  
  		if (crtc->state->gamma_lut) {

target/linux/bcm27xx/patches-6.6/950-0009-drm-vc4-Add-debugfs-node-that-dumps-the-vc5-gamma-PW.patch

@@ -17,7 +17,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -143,6 +143,85 @@ static int vc4_hvs_debugfs_dlist(struct
+@@ -145,6 +145,85 @@ static int vc4_hvs_debugfs_dlist(struct
  	return 0;
  }
  
@@ -103,7 +103,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  /* The filter kernel is composed of dwords each containing 3 9-bit
   * signed integers packed next to each other.
   */
-@@ -850,11 +929,15 @@ int vc4_hvs_debugfs_init(struct drm_mino
+@@ -854,11 +933,15 @@ int vc4_hvs_debugfs_init(struct drm_mino
  	if (!vc4->hvs)
  		return -ENODEV;
  

target/linux/bcm27xx/patches-6.6/950-0010-drm-vc4-hvs-Force-modeset-on-gamma-lut-change.patch

@@ -45,7 +45,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  	struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -613,6 +613,9 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
+@@ -614,6 +614,9 @@ vc4_crtc_to_vc4_pv_data(const struct vc4
  	return container_of_const(data, struct vc4_pv_data, base);
  }
  
@@ -57,7 +57,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -596,6 +596,36 @@ out:
+@@ -599,6 +599,36 @@ out:
  	drm_dev_exit(idx);
  }
  
@@ -94,7 +94,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state)
  {
  	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
-@@ -626,7 +656,7 @@ int vc4_hvs_atomic_check(struct drm_crtc
+@@ -629,7 +659,7 @@ int vc4_hvs_atomic_check(struct drm_crtc
  	if (ret)
  		return ret;
  

target/linux/bcm27xx/patches-6.6/950-0014-drm-vc4-Enable-gamma-block-only-when-required.patch

@@ -20,7 +20,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -548,8 +548,11 @@ static int vc4_hvs_init_channel(struct v
+@@ -553,8 +553,11 @@ static int vc4_hvs_init_channel(struct v
  	dispbkgndx &= ~SCALER_DISPBKGND_GAMMA;
  	dispbkgndx &= ~SCALER_DISPBKGND_INTERLACE;
  
@@ -33,7 +33,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  		  (interlace ? SCALER_DISPBKGND_INTERLACE : 0));
  
  	/* Reload the LUT, since the SRAMs would have been disabled if
-@@ -834,18 +837,25 @@ void vc4_hvs_atomic_flush(struct drm_crt
+@@ -837,18 +840,25 @@ void vc4_hvs_atomic_flush(struct drm_crt
  		u32 dispbkgndx = HVS_READ(SCALER_DISPBKGNDX(channel));
  
  		if (crtc->state->gamma_lut) {

target/linux/bcm27xx/patches-6.6/950-0016-drm-vc4-Validate-the-size-of-the-gamma_lut.patch

@@ -13,7 +13,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
 
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -614,6 +614,16 @@ static int vc4_hvs_gamma_check(struct dr
+@@ -617,6 +617,16 @@ static int vc4_hvs_gamma_check(struct dr
  	if (!crtc_state->color_mgmt_changed)
  		return 0;
  

target/linux/bcm27xx/patches-6.6/950-0020-vc4-drm-vc4_plane-Keep-fractional-source-coords-insi.patch

@@ -12,7 +12,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
 
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -408,7 +408,7 @@ struct vc4_plane_state {
+@@ -409,7 +409,7 @@ struct vc4_plane_state {
  
  	/* Clipped coordinates of the plane on the display. */
  	int crtc_x, crtc_y, crtc_w, crtc_h;

target/linux/bcm27xx/patches-6.6/950-0024-drm-vc4-Force-trigger-of-dlist-update-on-margins-cha.patch

@@ -42,7 +42,7 @@ Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  
 --- a/drivers/gpu/drm/vc4/vc4_drv.h
 +++ b/drivers/gpu/drm/vc4/vc4_drv.h
-@@ -626,12 +626,7 @@ struct vc4_crtc_state {
+@@ -627,12 +627,7 @@ struct vc4_crtc_state {
  	bool txp_armed;
  	unsigned int assigned_channel;
  

target/linux/bcm27xx/patches-6.6/950-0027-drm-vc4-hvs-Skip-DebugFS-Registration-for-FKMS.patch

@@ -13,7 +13,7 @@ Signed-off-by: Maxime Ripard <maxime@cerno.tech>
 
 --- a/drivers/gpu/drm/vc4/vc4_hvs.c
 +++ b/drivers/gpu/drm/vc4/vc4_hvs.c
-@@ -976,6 +976,9 @@ int vc4_hvs_debugfs_init(struct drm_mino
+@@ -980,6 +980,9 @@ int vc4_hvs_debugfs_init(struct drm_mino
  	struct vc4_dev *vc4 = to_vc4_dev(drm);
  	struct vc4_hvs *hvs = vc4->hvs;
  

target/linux/bcm27xx/patches-6.6/950-0028-drm-vc4_hdmi-Allow-hotplug-detect-to-be-forced.patch

@@ -45,7 +45,7 @@ Signed-off-by: Dom Cobley <popcornmix@gmail.com>
  static const char * const output_format_str[] = {
  	[VC4_HDMI_OUTPUT_RGB]		= "RGB",
  	[VC4_HDMI_OUTPUT_YUV420]	= "YUV 4:2:0",
-@@ -478,7 +484,9 @@ static int vc4_hdmi_connector_detect_ctx
+@@ -482,7 +488,9 @@ static int vc4_hdmi_connector_detect_ctx
  		return connector_status_unknown;
  	}