diff -ruw linux-6.4/Makefile linux-6.4-fbx/Makefile --- linux-6.4/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/Makefile 2024-04-22 14:27:53.144992032 +0200 @@ -386,6 +386,8 @@ # CROSS_COMPILE can be set on the command line # make CROSS_COMPILE=ia64-linux- # Alternatively CROSS_COMPILE can be set in the environment. +# A third alternative is to store a setting in .config so that plain +# "make" in the configured kernel build directory always uses that. # Default value for CROSS_COMPILE is not to prefix executables # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile ARCH ?= $(SUBARCH) @@ -423,6 +425,9 @@ KCONFIG_CONFIG ?= .config export KCONFIG_CONFIG +CONFIG_CROSS_COMPILE := $(shell grep ^CONFIG_CROSS_COMPILE= $(KCONFIG_CONFIG) | cut -f 2 -d = | tr -d '"') +CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) + # SHELL used by kbuild CONFIG_SHELL := sh @@ -1366,7 +1371,7 @@ quiet_cmd_headers_install = INSTALL $(INSTALL_HDR_PATH)/include cmd_headers_install = \ mkdir -p $(INSTALL_HDR_PATH); \ - rsync -mrl --include='*/' --include='*\.h' --exclude='*' \ + rsync -cmrl --include='*/' --include='*\.h' --exclude='*' \ usr/include $(INSTALL_HDR_PATH) PHONY += headers_install diff -ruw linux-6.4/arch/arm64/Kconfig linux-6.4-fbx/arch/arm64/Kconfig --- linux-6.4/arch/arm64/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/Kconfig 2024-04-22 14:27:53.144992032 +0200 @@ -2327,4 +2327,3 @@ source "drivers/acpi/Kconfig" source "arch/arm64/kvm/Kconfig" - diff -ruw linux-6.4/arch/arm64/Kconfig.platforms linux-6.4-fbx/arch/arm64/Kconfig.platforms --- linux-6.4/arch/arm64/Kconfig.platforms 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/Kconfig.platforms 2024-04-22 13:40:45.251731154 +0200 @@ -63,6 +63,8 @@ config ARCH_BCMBCA bool "Broadcom Broadband Carrier Access (BCA) origin SoC" select GPIOLIB + select PINCTRL + select PINCTRL_BCM63138 help Say Y if you intend to run the kernel on a Broadcom Broadband ARM-based BCA chipset. @@ -78,6 +80,14 @@ help This enables support for Broadcom's ARMv8 Set Top Box SoCs +config ARCH_BCM63XX_SHARED_OSH + bool "Make shared pages and translation table walks outer shareable" + depends on ARCH_BCMBCA + default y + help + This is required for HW coherency on bcm63158. Say Y here if + you are compiling a kernel for a bcm63158 board. + endif config ARCH_BERLIN @@ -243,6 +253,16 @@ help This enables support for the ARMv8 based Qualcomm chipsets. +config ARCH_QCOM_DTB + bool "build qualcomm platforms DTB" + depends on ARCH_QCOM + default y + +config ARCH_QCOM_FBX_DTB + bool "build freebox DTB on qualcomm platform" + depends on ARCH_QCOM + default y + config ARCH_REALTEK bool "Realtek Platforms" select RESET_CONTROLLER diff -ruw linux-6.4/arch/arm64/boot/Makefile linux-6.4-fbx/arch/arm64/boot/Makefile --- linux-6.4/arch/arm64/boot/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/boot/Makefile 2024-04-22 13:40:45.251731154 +0200 @@ -48,3 +48,5 @@ $(NM) vmlinux|grep _kernel_codesize|cut -d' ' -f1) include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot + +subdir-y += dts/ diff -ruw linux-6.4/arch/arm64/boot/dts/amlogic/Makefile linux-6.4-fbx/arch/arm64/boot/dts/amlogic/Makefile --- linux-6.4/arch/arm64/boot/dts/amlogic/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/Makefile 2024-04-22 13:40:45.259731373 +0200 @@ -1,8 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 +fbx-boards += \ + fbxwmr.dtb \ + fbxwmr-r1.dtb fbxwmr-r2.dtb \ + fbxwmr-r3.dtb fbxwmr-r4.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb +DTC_FLAGS += -@ +dtb-$(CONFIG_ARCH_MESON) += $(fbx-boards) dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-radxa-zero.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb diff -ruw linux-6.4/arch/arm64/boot/dts/amlogic/meson-axg.dtsi linux-6.4-fbx/arch/arm64/boot/dts/amlogic/meson-axg.dtsi --- linux-6.4/arch/arm64/boot/dts/amlogic/meson-axg.dtsi 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/meson-axg.dtsi 2024-04-22 13:40:45.259731373 +0200 @@ -177,7 +177,7 @@ compatible = "amlogic,axg-pcie", "snps,dw-pcie"; reg = <0x0 0xf9800000 0x0 0x400000>, <0x0 0xff646000 0x0 0x2000>, - <0x0 0xf9f00000 0x0 0x100000>; + <0x0 0xf9c00000 0x0 0x100000>; reg-names = "elbi", "cfg", "config"; interrupts = ; #interrupt-cells = <1>; @@ -187,7 +187,7 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - ranges = <0x82000000 0 0xf9c00000 0x0 0xf9c00000 0 0x00300000>; + ranges = <0x82000000 0 0xf9d00000 0x0 0xf9d00000 0 0x00300000>; clocks = <&clkc CLKID_USB>, <&clkc CLKID_PCIE_A>, <&clkc CLKID_PCIE_CML_EN0>; clock-names = "general", "pclk", "port"; @@ -1937,7 +1937,7 @@ }; }; - timer { + timer: timer { compatible = "arm,armv8-timer"; interrupts = , diff -ruw linux-6.4/arch/arm64/boot/dts/broadcom/Makefile linux-6.4-fbx/arch/arm64/boot/dts/broadcom/Makefile --- linux-6.4/arch/arm64/boot/dts/broadcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/boot/dts/broadcom/Makefile 2024-04-22 13:40:45.275731810 +0200 @@ -11,3 +11,4 @@ subdir-y += bcmbca subdir-y += northstar2 subdir-y += stingray +subdir-y += bcm63xx diff -ruw linux-6.4/arch/arm64/boot/dts/marvell/Makefile linux-6.4-fbx/arch/arm64/boot/dts/marvell/Makefile --- linux-6.4/arch/arm64/boot/dts/marvell/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/boot/dts/marvell/Makefile 2024-04-22 13:40:45.315732903 +0200 @@ -27,3 +27,19 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp1_dsl_lte.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp1_ftth_p2p.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp2_ftth_p2p.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp2_ftth_pon.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp1_test_module.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp2_test_module.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_pcie_pine_pericom.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_pcie_pine_asmedia.dtb + +dtb-$(CONFIG_ARCH_MVEBU) += jbxgw7r.dtb +dtb-$(CONFIG_ARCH_MVEBU) += jbxgw7r_exp1_ftth_p2p.dtb +dtb-$(CONFIG_ARCH_MVEBU) += jbxgw7r_exp2_ftth_p2p.dtb + +# export symbols in DTBs file to allow overlay usage +DTC_FLAGS += -@ diff -ruw linux-6.4/arch/arm64/boot/dts/qcom/Makefile linux-6.4-fbx/arch/arm64/boot/dts/qcom/Makefile --- linux-6.4/arch/arm64/boot/dts/qcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/boot/dts/qcom/Makefile 2024-04-22 13:40:45.339733559 +0200 @@ -1,204 +1,208 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-mi01.2.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-al02-c7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-gplus-fl8005a.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e5.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-grandmax.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt510.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt58.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5x.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-tissot.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-vince.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8956-sony-xperia-loire-kugo.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8956-sony-xperia-loire-suzu.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-10.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-101.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-octagon-talkman.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-xiaomi-libra.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-huawei-angler-rev-101.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-msft-lumia-octagon-cityman.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-ivy.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-karin.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-satsuki.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-sumire.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-suzuran.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-oneplus3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-oneplus3t.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-sony-xperia-tone-dora.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-sony-xperia-tone-kagura.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-sony-xperia-tone-keyaki.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-xiaomi-gemini.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996pro-xiaomi-natrium.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996pro-xiaomi-scorpio.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-asus-novago-tp370ql.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-fxtec-pro1.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-hp-envy-x2.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-lenovo-miix-630.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-oneplus-cheeseburger.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-oneplus-dumpling.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-lilac.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-maple.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5-vision-mezzanine.dtb -dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-ti.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel360-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel360-wifi.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-quackingstick-r0.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-quackingstick-r0-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-inx.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd-pro.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-lenovo-thinkpad-x13s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm450-motorola-ali.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-discovery.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-pioneer.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-voyager.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm632-fairphone-fp3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm632-motorola-ocean.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm636-sony-xperia-ganges-mermaid.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm660-xiaomi-lavender.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm670-google-sargo.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c-navigation-mezzanine.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyln.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-oneplus-enchilada.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-oneplus-fajita.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-samsung-starqltechn.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-akari.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-akatsuki.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-apollo.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-beryllium-ebbg.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-beryllium-tianma.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-polaris.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-shift-axolotl.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx203.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx206.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish-boe.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish-csot.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-microsoft-surface-duo2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-sony-xperia-sagami-pdx214.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-sony-xperia-sagami-pdx215.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx223.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx224.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-sbc.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8094-sony-xperia-kitakami-karin_windy.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8096-db820c.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8096-ifc6640.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-mi01.2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp468.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq6018-cp01-c1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq8074-hk01.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq8074-hk10-c1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq8074-hk10-c2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp418.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp433.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp449.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp454.dtb +dtb-$(CONFIG_ARCH_QCOM_FBX_DTB) += fbxgw9r.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-acer-a1-724.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-alcatel-idol347.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-asus-z00l.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-gplus-fl8005a.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-huawei-g7.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-longcheer-l8150.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-longcheer-l8910.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-a3u-eur.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-a5u-eur.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-e5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-e7.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-grandmax.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-gt510.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-gt58.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-j5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-j5x.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-serranove.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-thwc-uf896.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-thwc-ufi001c.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-wingtech-wt88047.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-yiming-uz801v3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-motorola-potter.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-daisy.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-mido.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-tissot.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-vince.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8956-sony-xperia-loire-kugo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8956-sony-xperia-loire-suzu.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-lg-bullhead-rev-10.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-lg-bullhead-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-msft-lumia-octagon-talkman.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-xiaomi-libra.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-huawei-angler-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-msft-lumia-octagon-cityman.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-ivy.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-karin.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-satsuki.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-sumire.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-suzuran.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-oneplus3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-oneplus3t.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-sony-xperia-tone-dora.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-sony-xperia-tone-kagura.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-sony-xperia-tone-keyaki.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-xiaomi-gemini.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996pro-xiaomi-natrium.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996pro-xiaomi-scorpio.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-asus-novago-tp370ql.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-fxtec-pro1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-hp-envy-x2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-lenovo-miix-630.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-oneplus-cheeseburger.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-oneplus-dumpling.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-sony-xperia-yoshino-lilac.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-sony-xperia-yoshino-maple.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-sony-xperia-yoshino-poplar.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-xiaomi-sagit.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-1000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-4000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qdu1000-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb2210-rb1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb4210-rb2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb5165-rb5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb5165-rb5-vision-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qru1000-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8155p-adp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8295p-adp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8540p-ride.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8775p-ride.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-homestar-r2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-homestar-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-homestar-r4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-kingoftown.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r1-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r3-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r9.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r9-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r9-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-r4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-r9.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-lte-parade.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-lte-ti.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-parade.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-ti.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel360-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel360-wifi.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r2-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-quackingstick-r0.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-quackingstick-r0-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-boe.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-inx.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-crd-pro.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-evoker.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-evoker-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-herobrine-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-villager-r0.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-villager-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-villager-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie-nvme.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie-nvme-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-idp2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-crd-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-lenovo-thinkpad-x13s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sda660-inforce-ifc6560.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm450-motorola-ali.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-ganges-kirin.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-nile-discovery.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-nile-pioneer.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-nile-voyager.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm632-fairphone-fp3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm632-motorola-ocean.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm636-sony-xperia-ganges-mermaid.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm660-xiaomi-lavender.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm670-google-sargo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-cheza-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-cheza-r2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-cheza-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-db845c.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-db845c-navigation-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-lg-judyln.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-lg-judyp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-oneplus-enchilada.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-oneplus-fajita.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-samsung-starqltechn.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-sony-xperia-tama-akari.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-sony-xperia-tama-akatsuki.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-sony-xperia-tama-apollo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-xiaomi-beryllium-ebbg.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-xiaomi-beryllium-tianma.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-xiaomi-polaris.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-shift-axolotl.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm850-lenovo-yoga-c630.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm850-samsung-w737.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm4250-oneplus-billie2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6115p-lenovo-j606f.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6125-sony-xperia-seine-pdx201.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6125-xiaomi-laurel-sprout.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6350-sony-xperia-lena-pdx213.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6375-sony-xperia-murray-pdx225.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7225-fairphone-fp4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-microsoft-surface-duo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-sony-xperia-kumano-bahamut.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-sony-xperia-kumano-griffin.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-sony-xperia-edo-pdx203.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-sony-xperia-edo-pdx206.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-xiaomi-elish-boe.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-xiaomi-elish-csot.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-microsoft-surface-duo2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-sony-xperia-sagami-pdx214.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-sony-xperia-sagami-pdx215.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-sony-xperia-nagara-pdx223.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-sony-xperia-nagara-pdx224.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-qrd.dtb diff -ruw linux-6.4/arch/arm64/include/asm/assembler.h linux-6.4-fbx/arch/arm64/include/asm/assembler.h --- linux-6.4/arch/arm64/include/asm/assembler.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/include/asm/assembler.h 2024-04-22 13:40:45.447736509 +0200 @@ -428,6 +428,45 @@ /* * Macro to perform a data cache maintenance for the interval + * [kaddr, kaddr + size) + * This macro does not do "data synchronization barrier". Caller should + * do "dsb" after transaction. + * + * op: operation passed to dc instruction + * kaddr: starting virtual address of the region + * size: size of the region + * Corrupts: kaddr, size, tmp1, tmp2 + */ + .macro dcache_by_line_op_no_dsb op, kaddr, size, tmp1, tmp2 + dcache_line_size \tmp1, \tmp2 + add \size, \kaddr, \size + sub \tmp2, \tmp1, #1 + bic \kaddr, \kaddr, \tmp2 +9998: + .ifc \op, cvau + __dcache_op_workaround_clean_cache \op, \kaddr + .else + .ifc \op, cvac + __dcache_op_workaround_clean_cache \op, \kaddr + .else + .ifc \op, cvap + sys 3, c7, c12, 1, \kaddr // dc cvap + .else + .ifc \op, cvadp + sys 3, c7, c13, 1, \kaddr // dc cvadp + .else + dc \op, \kaddr + .endif + .endif + .endif + .endif + add \kaddr, \kaddr, \tmp1 + cmp \kaddr, \size + b.lo 9998b + .endm + +/* + * Macro to perform a data cache maintenance for the interval * [start, end) * * op: operation passed to dc instruction diff -ruw linux-6.4/arch/arm64/include/asm/cacheflush.h linux-6.4-fbx/arch/arm64/include/asm/cacheflush.h --- linux-6.4/arch/arm64/include/asm/cacheflush.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/include/asm/cacheflush.h 2024-04-22 13:40:45.447736509 +0200 @@ -79,6 +79,17 @@ extern long caches_clean_inval_user_pou(unsigned long start, unsigned long end); extern void sync_icache_aliases(unsigned long start, unsigned long end); +extern void dmac_flush_range(const void *start, const void *end); +extern void dmac_inv_range(const void *start, const void *end); +extern void dmac_clean_range(const void *start, const void *end); +extern void __dma_flush_area_no_dsb(const void *start, size_t size); +extern void __dma_inv_area_no_dsb(const void *start, size_t size); +extern void __dma_clean_area_no_dsb(const void *start, size_t size); + +extern void dmac_flush_range_no_dsb(const void *start, const void *end); +extern void dmac_inv_range_no_dsb(const void *start, const void *end); +extern void dmac_clean_range_no_dsb(const void *start, const void *end); + static inline void flush_icache_range(unsigned long start, unsigned long end) { caches_clean_inval_pou(start, end); diff -ruw linux-6.4/arch/arm64/include/asm/memory.h linux-6.4-fbx/arch/arm64/include/asm/memory.h --- linux-6.4/arch/arm64/include/asm/memory.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/include/asm/memory.h 2024-04-22 13:40:45.455736728 +0200 @@ -74,7 +74,7 @@ #define KASAN_SHADOW_END ((UL(1) << (64 - KASAN_SHADOW_SCALE_SHIFT)) \ + KASAN_SHADOW_OFFSET) #define PAGE_END (KASAN_SHADOW_END - (1UL << (vabits_actual - KASAN_SHADOW_SCALE_SHIFT))) -#define KASAN_THREAD_SHIFT 1 +#define KASAN_THREAD_SHIFT 2 #else #define KASAN_THREAD_SHIFT 0 #define PAGE_END (_PAGE_END(VA_BITS_MIN)) diff -ruw linux-6.4/arch/arm64/include/asm/pgtable-hwdef.h linux-6.4-fbx/arch/arm64/include/asm/pgtable-hwdef.h --- linux-6.4/arch/arm64/include/asm/pgtable-hwdef.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/include/asm/pgtable-hwdef.h 2024-04-22 13:40:45.455736728 +0200 @@ -146,7 +146,11 @@ #define PTE_TABLE_BIT (_AT(pteval_t, 1) << 1) #define PTE_USER (_AT(pteval_t, 1) << 6) /* AP[1] */ #define PTE_RDONLY (_AT(pteval_t, 1) << 7) /* AP[2] */ +#ifdef CONFIG_ARCH_BCM63XX_SHARED_OSH +#define PTE_SHARED (_AT(pteval_t, 2) << 8) /* SH[1:0], outer shareable */ +#else #define PTE_SHARED (_AT(pteval_t, 3) << 8) /* SH[1:0], inner shareable */ +#endif #define PTE_AF (_AT(pteval_t, 1) << 10) /* Access Flag */ #define PTE_NG (_AT(pteval_t, 1) << 11) /* nG */ #define PTE_GP (_AT(pteval_t, 1) << 50) /* BTI guarded */ @@ -242,12 +246,19 @@ #define TCR_SH0_SHIFT 12 #define TCR_SH0_MASK (UL(3) << TCR_SH0_SHIFT) +#define TCR_SH0_OUTER (UL(2) << TCR_SH0_SHIFT) #define TCR_SH0_INNER (UL(3) << TCR_SH0_SHIFT) #define TCR_SH1_SHIFT 28 #define TCR_SH1_MASK (UL(3) << TCR_SH1_SHIFT) +#define TCR_SH1_OUTER (UL(2) << TCR_SH1_SHIFT) #define TCR_SH1_INNER (UL(3) << TCR_SH1_SHIFT) + +#ifdef CONFIG_ARCH_BCM63XX_SHARED_OSH +#define TCR_SHARED (TCR_SH0_OUTER | TCR_SH1_OUTER) +#else #define TCR_SHARED (TCR_SH0_INNER | TCR_SH1_INNER) +#endif #define TCR_TG0_SHIFT 14 #define TCR_TG0_MASK (UL(3) << TCR_TG0_SHIFT) diff -ruw linux-6.4/arch/arm64/mm/cache.S linux-6.4-fbx/arch/arm64/mm/cache.S --- linux-6.4/arch/arm64/mm/cache.S 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/mm/cache.S 2024-04-22 13:40:45.503738039 +0200 @@ -164,6 +164,64 @@ SYM_FUNC_ALIAS(dcache_inval_poc, __pi_dcache_inval_poc) /* + * __dma_inv_area_no_dsb(start, size) + * + * This macro does not do "data synchronization barrier". Caller should + * do "dsb" after transaction. + * + * start - virtual start address of region + * size - size in question + */ +SYM_FUNC_START(__dma_inv_area_no_dsb) + add x1, x1, x0 + dcache_line_size x2, x3 + sub x3, x2, #1 + tst x1, x3 // end cache line aligned? + bic x1, x1, x3 + b.eq 1f + dc civac, x1 // clean & invalidate D / U line +1: tst x0, x3 // start cache line aligned? + bic x0, x0, x3 + b.eq 2f + dc civac, x0 // clean & invalidate D / U line + b 3f +2: dc ivac, x0 // invalidate D / U line +3: add x0, x0, x2 + cmp x0, x1 + b.lo 2b + ret +SYM_FUNC_END(__dma_inv_area_no_dsb) + +/* + * __dma_clean_area_no_dsb(start, size) + * + * his macro does not do "data synchronization barrier". Caller should + * o "dsb" after transaction. + * + * start - virtual start address of region + * size - size in question + */ +SYM_FUNC_START(__dma_clean_area_no_dsb) + dcache_by_line_op_no_dsb cvac, x0, x1, x2, x3 + ret +SYM_FUNC_END(__dma_clean_area_no_dsb) + +/* + * __dma_flush_area_no_dsb(start, size) + * + * clean & invalidate D / U line + * his macro does not do "data synchronization barrier". Caller should + * o "dsb" after transaction. + * + * start - virtual start address of region + * size - size in question + */ +SYM_FUNC_START(__dma_flush_area_no_dsb) + dcache_by_line_op_no_dsb civac, x0, x1, x2, x3 + ret +SYM_FUNC_END(__dma_flush_area_no_dsb) + +/* * dcache_clean_poc(start, end) * * Ensure that any D-cache lines for the interval [start, end) diff -ruw linux-6.4/arch/arm64/mm/flush.c linux-6.4-fbx/arch/arm64/mm/flush.c --- linux-6.4/arch/arm64/mm/flush.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/arch/arm64/mm/flush.c 2024-04-22 13:40:45.503738039 +0200 @@ -107,3 +107,39 @@ } EXPORT_SYMBOL_GPL(arch_invalidate_pmem); #endif + +void dmac_flush_range(const void *start, const void *end) +{ + dcache_clean_inval_poc((unsigned long)start, (unsigned long)end); +} +EXPORT_SYMBOL(dmac_flush_range); + +void dmac_flush_range_no_dsb(const void *start, const void *end) +{ + __dma_flush_area_no_dsb(start, (void *)(end) - (void *)(start)); +} +EXPORT_SYMBOL(dmac_flush_range_no_dsb); + +void dmac_inv_range(const void *start, const void *end) +{ + dcache_inval_poc((unsigned long)start, (unsigned long)(end)); +} +EXPORT_SYMBOL(dmac_inv_range); + +void dmac_inv_range_no_dsb(const void *start, const void *end) +{ + __dma_inv_area_no_dsb(start, (void *)(end) - (void *)(start)); +} +EXPORT_SYMBOL(dmac_inv_range_no_dsb); + +void dmac_clean_range(const void *start, const void *end) +{ + dcache_clean_poc((unsigned long)start, (unsigned long)end); +} +EXPORT_SYMBOL(dmac_clean_range); + +void dmac_clean_range_no_dsb(const void *start, const void *end) +{ + __dma_clean_area_no_dsb(start, (void *)(end) - (void *)(start)); +} +EXPORT_SYMBOL(dmac_clean_range_no_dsb); diff -ruw linux-6.4/block/blk-flush.c linux-6.4-fbx/block/blk-flush.c --- linux-6.4/block/blk-flush.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/blk-flush.c 2024-04-22 13:40:46.151755744 +0200 @@ -172,10 +172,21 @@ rq->flush.seq |= seq; cmd_flags = rq->cmd_flags; - if (likely(!error)) + if (likely(!error)) { seq = blk_flush_cur_seq(rq); - else + } else { seq = REQ_FSEQ_DONE; + printk_once(KERN_ERR "%s: flush failed: data integrity problem\n", + rq->q->disk ? rq->q->disk->disk_name : "?"); + /* + * returning an error to the FS is wrong: the data is all + * there, it just might not be written out in the expected + * order and thus have a window where the integrity is suspect + * in a crash. Given the small likelihood of actually + * crashing, we should just log a warning here. + */ + error = 0; + } switch (seq) { case REQ_FSEQ_PREFLUSH: diff -ruw linux-6.4/block/blk-mq.c linux-6.4-fbx/block/blk-mq.c --- linux-6.4/block/blk-mq.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/blk-mq.c 2024-04-22 13:40:46.155755853 +0200 @@ -955,7 +955,7 @@ } EXPORT_SYMBOL_GPL(blk_update_request); -static inline void blk_account_io_done(struct request *req, u64 now) +static inline void blk_account_io_done(struct request *req, u64 now, blk_status_t error) { /* * Account IO completion. flush_rq isn't accounted as a @@ -970,6 +970,8 @@ update_io_ticks(req->part, jiffies, true); part_stat_inc(req->part, ios[sgrp]); part_stat_add(req->part, nsecs[sgrp], now - req->start_time_ns); + if (error) + part_stat_inc(req->part, io_errors[rq_data_dir(req)]); part_stat_unlock(); } } @@ -994,19 +996,19 @@ } } -static inline void __blk_mq_end_request_acct(struct request *rq, u64 now) +static inline void __blk_mq_end_request_acct(struct request *rq, u64 now, blk_status_t error) { if (rq->rq_flags & RQF_STATS) blk_stat_add(rq, now); blk_mq_sched_completed_request(rq, now); - blk_account_io_done(rq, now); + blk_account_io_done(rq, now, error); } inline void __blk_mq_end_request(struct request *rq, blk_status_t error) { if (blk_mq_need_time_stamp(rq)) - __blk_mq_end_request_acct(rq, ktime_get_ns()); + __blk_mq_end_request_acct(rq, ktime_get_ns(), error); if (rq->end_io) { rq_qos_done(rq->q, rq); @@ -1060,7 +1062,7 @@ blk_complete_request(rq); if (iob->need_ts) - __blk_mq_end_request_acct(rq, now); + __blk_mq_end_request_acct(rq, now, 0); rq_qos_done(rq->q, rq); @@ -3049,7 +3051,7 @@ blk_mq_run_dispatch_ops(q, ret = blk_mq_request_issue_directly(rq, true)); if (ret) - blk_account_io_done(rq, ktime_get_ns()); + blk_account_io_done(rq, ktime_get_ns(), 0); return ret; } EXPORT_SYMBOL_GPL(blk_insert_cloned_request); diff -ruw linux-6.4/block/blk.h linux-6.4-fbx/block/blk.h --- linux-6.4/block/blk.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/blk.h 2024-04-22 13:40:46.159755962 +0200 @@ -404,6 +404,7 @@ #define ADDPART_FLAG_NONE 0 #define ADDPART_FLAG_RAID 1 #define ADDPART_FLAG_WHOLEDISK 2 +#define ADDPART_FLAG_RO 4 int bdev_add_partition(struct gendisk *disk, int partno, sector_t start, sector_t length); int bdev_del_partition(struct gendisk *disk, int partno); diff -ruw linux-6.4/block/genhd.c linux-6.4-fbx/block/genhd.c --- linux-6.4/block/genhd.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/genhd.c 2024-04-22 13:40:46.163756072 +0200 @@ -984,6 +984,7 @@ "%8u %8u %8u " "%8lu %8lu %8llu %8u " "%8lu %8u" + "%8lu %8lu" "\n", stat.ios[STAT_READ], stat.merges[STAT_READ], @@ -1005,7 +1006,9 @@ (unsigned long long)stat.sectors[STAT_DISCARD], (unsigned int)div_u64(stat.nsecs[STAT_DISCARD], NSEC_PER_MSEC), stat.ios[STAT_FLUSH], - (unsigned int)div_u64(stat.nsecs[STAT_FLUSH], NSEC_PER_MSEC)); + (unsigned int)div_u64(stat.nsecs[STAT_FLUSH], NSEC_PER_MSEC), + part_stat_read(bdev, io_errors[READ]), + part_stat_read(bdev, io_errors[WRITE])); } ssize_t part_inflight_show(struct device *dev, struct device_attribute *attr, diff -ruw linux-6.4/block/partitions/Kconfig linux-6.4-fbx/block/partitions/Kconfig --- linux-6.4/block/partitions/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/partitions/Kconfig 2024-04-22 13:40:46.163756072 +0200 @@ -270,4 +270,12 @@ Say Y here if you want to read the partition table from bootargs. The format for the command line is just like mtdparts. +config OF_PARTITION + bool "Device tree partition support" if PARTITION_ADVANCED + depends on OF + +config OF_PARTITION_IGNORE_RO + bool "ignore read-only flag" + depends on OF_PARTITION + endmenu diff -ruw linux-6.4/block/partitions/Makefile linux-6.4-fbx/block/partitions/Makefile --- linux-6.4/block/partitions/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/partitions/Makefile 2023-02-24 19:09:45.669973308 +0100 @@ -20,3 +20,4 @@ obj-$(CONFIG_EFI_PARTITION) += efi.o obj-$(CONFIG_KARMA_PARTITION) += karma.o obj-$(CONFIG_SYSV68_PARTITION) += sysv68.o +obj-$(CONFIG_OF_PARTITION) += dt.o diff -ruw linux-6.4/block/partitions/check.h linux-6.4-fbx/block/partitions/check.h --- linux-6.4/block/partitions/check.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/partitions/check.h 2024-04-22 13:40:46.163756072 +0200 @@ -67,3 +67,4 @@ int sun_partition(struct parsed_partitions *state); int sysv68_partition(struct parsed_partitions *state); int ultrix_partition(struct parsed_partitions *state); +int dt_partition(struct parsed_partitions *); diff -ruw linux-6.4/block/partitions/core.c linux-6.4-fbx/block/partitions/core.c --- linux-6.4/block/partitions/core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/block/partitions/core.c 2024-04-22 13:40:46.163756072 +0200 @@ -13,6 +13,10 @@ #include "check.h" static int (*check_part[])(struct parsed_partitions *) = { +#ifdef CONFIG_OF_PARTITION + dt_partition, +#endif + /* * Probe partition formats with tables at disk address 0 * that also have an ADFS boot block at 0xdc0. @@ -341,6 +345,7 @@ bdev->bd_start_sect = start; bdev_set_nr_sectors(bdev, len); + bdev->bd_read_only = (flags & ADDPART_FLAG_RO); pdev = &bdev->bd_device; dname = dev_name(ddev); diff -ruw linux-6.4/drivers/Kconfig linux-6.4-fbx/drivers/Kconfig --- linux-6.4/drivers/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/Kconfig 2024-04-22 13:40:46.207757274 +0200 @@ -21,6 +21,8 @@ source "drivers/gnss/Kconfig" +source "drivers/fbxprocfs/Kconfig" + source "drivers/mtd/Kconfig" source "drivers/of/Kconfig" @@ -77,6 +79,10 @@ source "drivers/gpio/Kconfig" +source "drivers/fbxgpio/Kconfig" + +source "drivers/fbxjtag/Kconfig" + source "drivers/w1/Kconfig" source "drivers/power/Kconfig" @@ -85,6 +91,8 @@ source "drivers/thermal/Kconfig" +source "drivers/fbxwatchdog/Kconfig" + source "drivers/watchdog/Kconfig" source "drivers/ssb/Kconfig" diff -ruw linux-6.4/drivers/Makefile linux-6.4-fbx/drivers/Makefile --- linux-6.4/drivers/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/Makefile 2024-04-22 13:40:46.207757274 +0200 @@ -21,7 +21,9 @@ obj-$(CONFIG_GPIOLIB) += gpio/ obj-y += pwm/ +obj-$(CONFIG_FREEBOX_GPIO) += fbxgpio/ obj-y += pci/ +obj-$(CONFIG_FREEBOX_JTAG) += fbxjtag/ obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_RAPIDIO) += rapidio/ @@ -121,6 +123,7 @@ obj-y += power/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ +obj-$(CONFIG_FREEBOX_WATCHDOG) += fbxwatchdog/ obj-$(CONFIG_WATCHDOG) += watchdog/ obj-$(CONFIG_MD) += md/ obj-$(CONFIG_BT) += bluetooth/ @@ -195,3 +198,5 @@ obj-$(CONFIG_HTE) += hte/ obj-$(CONFIG_DRM_ACCEL) += accel/ obj-$(CONFIG_CDX_BUS) += cdx/ + +obj-$(CONFIG_FREEBOX_PROCFS) += fbxprocfs/ diff -ruw linux-6.4/drivers/base/regmap/internal.h linux-6.4-fbx/drivers/base/regmap/internal.h --- linux-6.4/drivers/base/regmap/internal.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/base/regmap/internal.h 2024-04-22 13:40:46.391762301 +0200 @@ -326,5 +326,6 @@ #define regmap_init_ram(config, data) \ __regmap_lockdep_wrapper(__regmap_init_ram, #config, config, data) +void *regmap_mmio_ctx_get_base(const void *priv); #endif diff -ruw linux-6.4/drivers/base/regmap/regmap-mmio.c linux-6.4-fbx/drivers/base/regmap/regmap-mmio.c --- linux-6.4/drivers/base/regmap/regmap-mmio.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/base/regmap/regmap-mmio.c 2024-04-22 13:40:46.395762410 +0200 @@ -633,4 +633,10 @@ } EXPORT_SYMBOL_GPL(regmap_mmio_detach_clk); +void *regmap_mmio_ctx_get_base(const void *priv) +{ + struct regmap_mmio_context *ctx = (struct regmap_mmio_context *)priv; + return ctx->regs; +} + MODULE_LICENSE("GPL v2"); diff -ruw linux-6.4/drivers/base/regmap/regmap.c linux-6.4-fbx/drivers/base/regmap/regmap.c --- linux-6.4/drivers/base/regmap/regmap.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/base/regmap/regmap.c 2024-04-22 13:40:46.395762410 +0200 @@ -3542,6 +3542,15 @@ } EXPORT_SYMBOL_GPL(regmap_parse_val); +#ifdef CONFIG_REGMAP_MMIO +void *regmap_get_mmio_base_address(struct regmap *map) +{ + return regmap_mmio_ctx_get_base(map->bus_context); +} + +EXPORT_SYMBOL_GPL(regmap_get_mmio_base_address); +#endif + static int __init regmap_initcall(void) { regmap_debugfs_initcall(); diff -ruw linux-6.4/drivers/bluetooth/btrtl.c linux-6.4-fbx/drivers/bluetooth/btrtl.c --- linux-6.4/drivers/bluetooth/btrtl.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/bluetooth/btrtl.c 2024-04-22 13:40:46.427763285 +0200 @@ -188,6 +188,15 @@ .fw_name = "rtl_bt/rtl8821cs_fw.bin", .cfg_name = "rtl_bt/rtl8821cs_config" }, + /* 8761BTV */ + { .match_flags = IC_MATCH_FL_LMPSUBV | IC_MATCH_FL_HCIREV, + .lmp_subver = RTL_ROM_LMP_8761A, + .hci_rev = 0xb, + .config_needed = false, + .has_rom_version = true, + .fw_name = "rtl_bt/rtl8761b_fw.bin", + .cfg_name = "rtl_bt/rtl8761b_config" }, + /* 8761A */ { IC_INFO(RTL_ROM_LMP_8761A, 0xa, 0x6, HCI_USB), .config_needed = false, @@ -945,6 +954,27 @@ return 0; } +void btrtl_show_version(struct hci_dev *hdev) +{ + + struct sk_buff *skb; + struct hci_rp_read_local_version *resp; + + skb = btrtl_read_local_version(hdev); + if (IS_ERR(skb)) + return; + + resp = (struct hci_rp_read_local_version *)skb->data; + rtl_dev_info(hdev, + "rtl: hci_ver=%02x hci_rev=%04x lmp_ver=%02x lmp_subver=%04x", + resp->hci_ver, + le16_to_cpu(resp->hci_rev), + resp->lmp_ver, + le16_to_cpu(resp->lmp_subver)); + kfree_skb(skb); +} +EXPORT_SYMBOL_GPL(btrtl_show_version); + void btrtl_free(struct btrtl_device_info *btrtl_dev) { struct rtl_subsection *entry, *tmp; @@ -1371,6 +1401,8 @@ MODULE_FIRMWARE("rtl_bt/rtl8723ds_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8761a_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8761a_config.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8761b_fw.bin"); +MODULE_FIRMWARE("rtl_bt/rtl8761b_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8821a_fw.bin"); MODULE_FIRMWARE("rtl_bt/rtl8821a_config.bin"); MODULE_FIRMWARE("rtl_bt/rtl8822b_fw.bin"); diff -ruw linux-6.4/drivers/bluetooth/btrtl.h linux-6.4-fbx/drivers/bluetooth/btrtl.h --- linux-6.4/drivers/bluetooth/btrtl.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/bluetooth/btrtl.h 2024-04-22 13:40:46.427763285 +0200 @@ -140,6 +140,7 @@ unsigned int *controller_baudrate, u32 *device_baudrate, bool *flow_control); +void btrtl_show_version(struct hci_dev *hdev); #else static inline struct btrtl_device_info *btrtl_initialize(struct hci_dev *hdev, diff -ruw linux-6.4/drivers/bluetooth/hci_h5.c linux-6.4-fbx/drivers/bluetooth/hci_h5.c --- linux-6.4/drivers/bluetooth/hci_h5.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/bluetooth/hci_h5.c 2024-04-22 13:40:46.431763394 +0200 @@ -98,6 +98,7 @@ const struct h5_vnd *vnd; const char *id; + struct gpio_desc *reset_gpio; struct gpio_desc *enable_gpio; struct gpio_desc *device_wake_gpio; }; @@ -849,6 +850,9 @@ return -ENODEV; h5->vnd = data->vnd; + + of_property_read_string(serdev->dev.of_node, + "firmware-postfix", &h5->id); } if (data->driver_info & H5_INFO_WAKEUP_DISABLE) @@ -863,6 +867,10 @@ if (IS_ERR(h5->device_wake_gpio)) return PTR_ERR(h5->device_wake_gpio); + h5->reset_gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(h5->reset_gpio)) + return PTR_ERR(h5->reset_gpio); + return hci_uart_register_device(&h5->serdev_hu, &h5p); } @@ -941,6 +949,8 @@ if (err) goto out_free; + /* show version after download */ + btrtl_show_version(h5->hu->hdev); btrtl_set_quirks(h5->hu->hdev, btrtl_dev); out_free: @@ -977,8 +987,15 @@ gpiod_set_value_cansleep(h5->device_wake_gpio, 0); msleep(100); + /* make sure reset is held */ + gpiod_set_value_cansleep(h5->reset_gpio, 1); + msleep(10); + /* The controller needs up to 500ms to wakeup */ gpiod_set_value_cansleep(h5->enable_gpio, 1); + /* Take it out of reset */ + gpiod_set_value_cansleep(h5->reset_gpio, 0); + msleep(100); gpiod_set_value_cansleep(h5->device_wake_gpio, 1); msleep(500); } @@ -989,6 +1006,7 @@ pm_runtime_disable(&h5->hu->serdev->dev); gpiod_set_value_cansleep(h5->device_wake_gpio, 0); + gpiod_set_value_cansleep(h5->reset_gpio, 1); gpiod_set_value_cansleep(h5->enable_gpio, 0); } @@ -1063,7 +1081,7 @@ {}, }; -static struct h5_vnd rtl_vnd = { +static __maybe_unused struct h5_vnd rtl_vnd = { .setup = h5_btrtl_setup, .open = h5_btrtl_open, .close = h5_btrtl_close, @@ -1108,6 +1126,8 @@ .data = (const void *)&h5_data_rtl8723bs }, { .compatible = "realtek,rtl8723ds-bt", .data = (const void *)&h5_data_rtl8723bs }, + { .compatible = "realtek,rtl8761btv-bt", + .data = (const void *)&h5_data_rtl8822cs }, #endif { }, }; diff -ruw linux-6.4/drivers/char/Kconfig linux-6.4-fbx/drivers/char/Kconfig --- linux-6.4/drivers/char/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/char/Kconfig 2024-04-22 13:40:46.443763722 +0200 @@ -315,6 +315,15 @@ memory. When in doubt, say "Y". +config DEVPHYSMEM + bool "/dev/physmem virtual device support" + default n + help + Say Y here if you want to support the /dev/physmem device. The + /dev/physmem device allows unprivileged access to physical memory + unused by the kernel. + When in doubt, say "N". + config NVRAM tristate "/dev/nvram support" depends on X86 || HAVE_ARCH_NVRAM_OPS @@ -422,3 +431,5 @@ driver include crash and makedumpfile. endmenu + +source "drivers/char/diag/Kconfig" diff -ruw linux-6.4/drivers/char/Makefile linux-6.4-fbx/drivers/char/Makefile --- linux-6.4/drivers/char/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/char/Makefile 2024-04-22 13:40:46.443763722 +0200 @@ -44,3 +44,5 @@ obj-$(CONFIG_XILLYBUS_CLASS) += xillybus/ obj-$(CONFIG_POWERNV_OP_PANEL) += powernv-op-panel.o obj-$(CONFIG_ADI) += adi.o + +obj-$(CONFIG_DIAG_CHAR) += diag/ diff -ruw linux-6.4/drivers/char/hw_random/Kconfig linux-6.4-fbx/drivers/char/hw_random/Kconfig --- linux-6.4/drivers/char/hw_random/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/char/hw_random/Kconfig 2024-04-22 13:40:46.451763940 +0200 @@ -98,6 +98,11 @@ If unsure, say Y. +config HW_RANDOM_BCM63XX + tristate "Broadcom BCM63xx Random Number Generator support" + depends on ARCH_BCMBCA || BCM63XX + default HW_RANDOM + config HW_RANDOM_IPROC_RNG200 tristate "Broadcom iProc/STB RNG200 support" depends on ARCH_BCM_IPROC || ARCH_BCM2835 || ARCH_BRCMSTB || COMPILE_TEST @@ -559,6 +564,13 @@ To compile this driver as a module, choose M here. The module will be called jh7110-trng. +config HW_RANDOM_QCOM + tristate "Qualcomm Random Number Generator Driver" + depends on ARCH_QCOM || COMPILE_TEST + help + This driver provides support for the Random Number + Generator hardware found on Qualcomm SoCs. + endif # HW_RANDOM config UML_RANDOM diff -ruw linux-6.4/drivers/char/hw_random/Makefile linux-6.4-fbx/drivers/char/hw_random/Makefile --- linux-6.4/drivers/char/hw_random/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/char/hw_random/Makefile 2024-04-22 13:40:46.451763940 +0200 @@ -30,6 +30,7 @@ obj-$(CONFIG_HW_RANDOM_POWERNV) += powernv-rng.o obj-$(CONFIG_HW_RANDOM_HISI) += hisi-rng.o obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o +obj-$(CONFIG_HW_RANDOM_BCM63XX) += bcm63xx-rng.o obj-$(CONFIG_HW_RANDOM_IPROC_RNG200) += iproc-rng200.o obj-$(CONFIG_HW_RANDOM_ST) += st-rng.o obj-$(CONFIG_HW_RANDOM_XGENE) += xgene-rng.o @@ -48,3 +49,4 @@ obj-$(CONFIG_HW_RANDOM_CN10K) += cn10k-rng.o obj-$(CONFIG_HW_RANDOM_POLARFIRE_SOC) += mpfs-rng.o obj-$(CONFIG_HW_RANDOM_JH7110) += jh7110-trng.o +obj-$(CONFIG_HW_RANDOM_QCOM) += qcom-rng.o diff -ruw linux-6.4/drivers/char/mem.c linux-6.4-fbx/drivers/char/mem.c --- linux-6.4/drivers/char/mem.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/char/mem.c 2024-04-22 13:40:46.459764159 +0200 @@ -28,6 +28,8 @@ #include #include #include +#include + #include #include @@ -402,6 +404,14 @@ return 0; } +static int mmap_physmem(struct file * file, struct vm_area_struct * vma) +{ + if (vma->vm_pgoff < max_pfn && !capable(CAP_SYS_RAWIO)) + return -EPERM; + + return mmap_mem(file, vma); +} + static ssize_t read_port(struct file *file, char __user *buf, size_t count, loff_t *ppos) { @@ -643,6 +653,11 @@ return 0; } +static int open_physmem(struct inode * inode, struct file * filp) +{ + return 0; +} + #define zero_lseek null_lseek #define full_lseek null_lseek #define write_zero write_null @@ -697,6 +712,14 @@ .write = write_full, }; +static const struct file_operations __maybe_unused physmem_fops = { + .mmap = mmap_physmem, + .open = open_physmem, +#ifndef CONFIG_MMU + .get_unmapped_area = get_unmapped_area_mem, +#endif +}; + static const struct memdev { const char *name; umode_t mode; @@ -717,6 +740,9 @@ #ifdef CONFIG_PRINTK [11] = { "kmsg", 0644, &kmsg_fops, 0 }, #endif +#ifdef CONFIG_DEVPHYSMEM + [16] = { "physmem", 0, &physmem_fops, FMODE_UNSIGNED_OFFSET }, +#endif }; static int memory_open(struct inode *inode, struct file *filp) diff -ruw linux-6.4/drivers/clk/meson/clk-pll.c linux-6.4-fbx/drivers/clk/meson/clk-pll.c --- linux-6.4/drivers/clk/meson/clk-pll.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/clk/meson/clk-pll.c 2024-04-22 13:40:46.527766017 +0200 @@ -65,6 +65,10 @@ (1 << pll->frac.width)); } + /* Avoid by zero division */ + if (n == 0) + return 0; + return DIV_ROUND_UP_ULL(rate, n); } diff -ruw linux-6.4/drivers/clk/qcom/Kconfig linux-6.4-fbx/drivers/clk/qcom/Kconfig --- linux-6.4/drivers/clk/qcom/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/clk/qcom/Kconfig 2024-04-22 13:40:46.531766126 +0200 @@ -189,6 +189,12 @@ i2c, USB, SD/eMMC, etc. Select this for the root clock of ipq9574. +config IPQ_NSSCC_9574 + tristate "IPQ9574 NSS Clock Controller" + depends on IPQ_GCC_9574 + help + Support for NSS clock controller on ipq9574 devices. + config MSM_GCC_8660 tristate "MSM8660 Global Clock Controller" help diff -ruw linux-6.4/drivers/clk/qcom/Makefile linux-6.4-fbx/drivers/clk/qcom/Makefile --- linux-6.4/drivers/clk/qcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/clk/qcom/Makefile 2024-04-22 13:40:46.531766126 +0200 @@ -29,6 +29,7 @@ obj-$(CONFIG_IPQ_GCC_806X) += gcc-ipq806x.o obj-$(CONFIG_IPQ_GCC_8074) += gcc-ipq8074.o obj-$(CONFIG_IPQ_GCC_9574) += gcc-ipq9574.o +obj-$(CONFIG_IPQ_NSSCC_9574) += nsscc-ipq9574.o obj-$(CONFIG_IPQ_LCC_806X) += lcc-ipq806x.o obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o obj-$(CONFIG_MDM_GCC_9615) += gcc-mdm9615.o diff -ruw linux-6.4/drivers/cpufreq/Kconfig linux-6.4-fbx/drivers/cpufreq/Kconfig --- linux-6.4/drivers/cpufreq/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/cpufreq/Kconfig 2024-04-22 13:40:46.655769514 +0200 @@ -311,5 +311,10 @@ This adds the CPUFreq driver support for Freescale QorIQ SoCs which are capable of changing the CPU's frequency dynamically. +config BCM63158_CPUFREQ + tristate "CPU frequency scaling driver for BCM63158 SoC" + depends on ARCH_BCMBCA + endif + endmenu diff -ruw linux-6.4/drivers/cpufreq/Makefile linux-6.4-fbx/drivers/cpufreq/Makefile --- linux-6.4/drivers/cpufreq/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/cpufreq/Makefile 2024-04-22 13:40:46.655769514 +0200 @@ -107,3 +107,5 @@ obj-$(CONFIG_SH_CPU_FREQ) += sh-cpufreq.o obj-$(CONFIG_SPARC_US2E_CPUFREQ) += sparc-us2e-cpufreq.o obj-$(CONFIG_SPARC_US3_CPUFREQ) += sparc-us3-cpufreq.o + +obj-$(CONFIG_BCM63158_CPUFREQ) += bcm63158-cpufreq.o diff -ruw linux-6.4/drivers/gpio/Kconfig linux-6.4-fbx/drivers/gpio/Kconfig --- linux-6.4/drivers/gpio/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/gpio/Kconfig 2024-04-22 13:40:46.831774323 +0200 @@ -1018,6 +1018,11 @@ enough to represent all pins, but the driver will assume a register layout for 64 pins (8 registers). +config GPIO_FBXGWR_PMU + tristate "Freebox PMU I2C GPIO expander" + depends on MFD_FBXGWR_PMU + select GPIOLIB_IRQCHIP + config GPIO_FXL6408 tristate "FXL6408 I2C GPIO expander" select GPIO_REGMAP diff -ruw linux-6.4/drivers/gpio/Makefile linux-6.4-fbx/drivers/gpio/Makefile --- linux-6.4/drivers/gpio/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/gpio/Makefile 2024-04-22 13:40:46.831774323 +0200 @@ -60,6 +60,7 @@ obj-$(CONFIG_GPIO_EP93XX) += gpio-ep93xx.o obj-$(CONFIG_GPIO_EXAR) += gpio-exar.o obj-$(CONFIG_GPIO_F7188X) += gpio-f7188x.o +obj-$(CONFIG_GPIO_FBXGWR_PMU) += gpio-fbxgwr-pmu.o obj-$(CONFIG_GPIO_FTGPIO010) += gpio-ftgpio010.o obj-$(CONFIG_GPIO_FXL6408) += gpio-fxl6408.o obj-$(CONFIG_GPIO_GE_FPGA) += gpio-ge.o diff -ruw linux-6.4/drivers/hid/Kconfig linux-6.4-fbx/drivers/hid/Kconfig --- linux-6.4/drivers/hid/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/hid/Kconfig 2024-04-22 13:40:48.607822846 +0200 @@ -484,6 +484,11 @@ Adds support for side buttons of Xiaomi Mi Dual Mode Wireless Mouse Silent Edition. +config HID_FBX_REMOTE_AUDIO + tristate "Freebox BLE remote audio driver" + depends on HID && SND + select SND_PCM + config HID_GYRATION tristate "Gyration remote control" help diff -ruw linux-6.4/drivers/hid/Makefile linux-6.4-fbx/drivers/hid/Makefile --- linux-6.4/drivers/hid/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/hid/Makefile 2024-04-22 13:40:48.611822955 +0200 @@ -57,6 +57,7 @@ obj-$(CONFIG_HID_GOOGLE_HAMMER) += hid-google-hammer.o obj-$(CONFIG_HID_VIVALDI) += hid-vivaldi.o obj-$(CONFIG_HID_GT683R) += hid-gt683r.o +obj-$(CONFIG_HID_FBX_REMOTE_AUDIO) += hid-fbx-remote-audio.o obj-$(CONFIG_HID_GYRATION) += hid-gyration.o obj-$(CONFIG_HID_HOLTEK) += hid-holtek-kbd.o obj-$(CONFIG_HID_HOLTEK) += hid-holtek-mouse.o diff -ruw linux-6.4/drivers/hid/hid-quirks.c linux-6.4-fbx/drivers/hid/hid-quirks.c --- linux-6.4/drivers/hid/hid-quirks.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/hid/hid-quirks.c 2024-04-22 13:40:48.623823283 +0200 @@ -719,6 +719,7 @@ #if IS_ENABLED(CONFIG_HID_ZYDACRON) { HID_USB_DEVICE(USB_VENDOR_ID_ZYDACRON, USB_DEVICE_ID_ZYDACRON_REMOTE_CONTROL) }, #endif + { HID_BLUETOOTH_DEVICE(0x10eb, 0x0023) }, { } }; diff -ruw linux-6.4/drivers/hwmon/Kconfig linux-6.4-fbx/drivers/hwmon/Kconfig --- linux-6.4/drivers/hwmon/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/hwmon/Kconfig 2024-04-22 13:40:48.647823939 +0200 @@ -344,6 +344,10 @@ This driver can also be built as a module. If so, the module will be called fam15h_power. +config SENSORS_FBXGWR_PMU + tristate "Freebox GWR PMU hardware monitoring driver" + depends on MFD_FBXGWR_PMU + config SENSORS_APPLESMC tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)" depends on INPUT && X86 @@ -2359,6 +2363,17 @@ sensors monitor various telemetry data of different components on the card, e.g. board temperature, FPGA core temperature/voltage/current. +config SENSORS_KIRKWOOD_CORETEMP + tristate "Kirkwood core temperature censor" + depends on MACH_KIRKWOOD + +config SENSORS_LD6710_FBX + tristate "LD6710 hardware monitoring driver (as seen on Freebox hardware)" + depends on I2C + +config SENSORS_AP806 + tristate "Marvell AP806/CP110 hardware monitoring driver" + if ACPI comment "ACPI drivers" diff -ruw linux-6.4/drivers/hwmon/Makefile linux-6.4-fbx/drivers/hwmon/Makefile --- linux-6.4/drivers/hwmon/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/hwmon/Makefile 2024-04-22 13:40:48.647823939 +0200 @@ -74,6 +74,7 @@ obj-$(CONFIG_SENSORS_F71805F) += f71805f.o obj-$(CONFIG_SENSORS_F71882FG) += f71882fg.o obj-$(CONFIG_SENSORS_F75375S) += f75375s.o +obj-$(CONFIG_SENSORS_FBXGWR_PMU) += fbxgwr_pmu_hwmon.o obj-$(CONFIG_SENSORS_FAM15H_POWER) += fam15h_power.o obj-$(CONFIG_SENSORS_FSCHMD) += fschmd.o obj-$(CONFIG_SENSORS_FTSTEUTATES) += ftsteutates.o @@ -102,6 +103,7 @@ obj-$(CONFIG_SENSORS_K8TEMP) += k8temp.o obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o obj-$(CONFIG_SENSORS_LAN966X) += lan966x-hwmon.o +obj-$(CONFIG_SENSORS_LD6710_FBX) += ld6710-fbx.o obj-$(CONFIG_SENSORS_LINEAGE) += lineage-pem.o obj-$(CONFIG_SENSORS_LOCHNAGAR) += lochnagar-hwmon.o obj-$(CONFIG_SENSORS_LM63) += lm63.o @@ -218,6 +220,8 @@ obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o obj-$(CONFIG_SENSORS_XGENE) += xgene-hwmon.o +obj-$(CONFIG_SENSORS_KIRKWOOD_CORETEMP)+= kirkwood-coretemp.o +obj-$(CONFIG_SENSORS_AP806) += ap806-hwmon.o obj-$(CONFIG_SENSORS_OCC) += occ/ obj-$(CONFIG_SENSORS_PECI) += peci/ diff -ruw linux-6.4/drivers/i2c/busses/Kconfig linux-6.4-fbx/drivers/i2c/busses/Kconfig --- linux-6.4/drivers/i2c/busses/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/i2c/busses/Kconfig 2024-04-22 13:40:48.707825578 +0200 @@ -1433,6 +1433,10 @@ to SLIMpro (On chip coprocessor) mailbox mechanism. If unsure, say N. +config I2C_WP3 + tristate "Wintegra WP3 I2C controll" + depends on WINTEGRA_WINPATH3 + config SCx200_ACB tristate "Geode ACCESS.bus support" depends on X86_32 && PCI diff -ruw linux-6.4/drivers/i2c/busses/Makefile linux-6.4-fbx/drivers/i2c/busses/Makefile --- linux-6.4/drivers/i2c/busses/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/i2c/busses/Makefile 2024-04-22 13:40:48.707825578 +0200 @@ -129,6 +129,7 @@ obj-$(CONFIG_I2C_XLP9XX) += i2c-xlp9xx.o obj-$(CONFIG_I2C_RCAR) += i2c-rcar.o obj-$(CONFIG_I2C_GXP) += i2c-gxp.o +obj-$(CONFIG_I2C_WP3) += i2c-wp3.o # External I2C/SMBus adapter drivers obj-$(CONFIG_I2C_DIOLAN_U2C) += i2c-diolan-u2c.o diff -ruw linux-6.4/drivers/i2c/i2c-core-base.c linux-6.4-fbx/drivers/i2c/i2c-core-base.c --- linux-6.4/drivers/i2c/i2c-core-base.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/i2c/i2c-core-base.c 2024-04-22 13:40:48.727826125 +0200 @@ -249,12 +249,14 @@ bri->set_sda(adap, scl); ndelay(RECOVERY_NDELAY / 2); + if (0) { if (scl) { ret = i2c_generic_bus_free(adap); if (ret == 0) break; } } + } /* If we can't check bus status, assume recovery worked */ if (ret == -EOPNOTSUPP) diff -ruw linux-6.4/drivers/input/misc/Kconfig linux-6.4-fbx/drivers/input/misc/Kconfig --- linux-6.4/drivers/input/misc/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/input/misc/Kconfig 2024-04-22 13:40:48.951832245 +0200 @@ -939,4 +939,9 @@ To compile this driver as a module, choose M here: the module will be called stpmic1_onkey. +config INPUT_SMSC_CAP1066 + tristate "SMSC CAP1066 capacitive sensor driver" + select I2C + select INPUT_POLLDEV + endif diff -ruw linux-6.4/drivers/input/misc/Makefile linux-6.4-fbx/drivers/input/misc/Makefile --- linux-6.4/drivers/input/misc/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/input/misc/Makefile 2024-04-22 13:40:48.951832245 +0200 @@ -90,3 +90,4 @@ obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o obj-$(CONFIG_INPUT_YEALINK) += yealink.o obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o +obj-$(CONFIG_INPUT_SMSC_CAP1066) += smsc_cap1066.o diff -ruw linux-6.4/drivers/leds/Kconfig linux-6.4-fbx/drivers/leds/Kconfig --- linux-6.4/drivers/leds/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/leds/Kconfig 2024-04-22 13:40:49.047834868 +0200 @@ -328,6 +328,10 @@ defined as platform devices and/or OpenFirmware platform devices. The code to use these bindings can be selected below. +config LEDS_FBXGWR_PMU + tristate "Freebox GWR PMU LED controller" + depends on MFD_FBXGWR_PMU + config LEDS_LP3944 tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip" depends on LEDS_CLASS @@ -710,6 +714,13 @@ LED controllers. They are I2C devices with multiple constant-current channels, each with independent 256-level PWM control. +config LEDS_IS31FL3299 + tristate "LED support for ISSI IS31FL3299 I2C LED controller" + depends on LEDS_CLASS && I2C && OF + select REGMAP_I2C + help + This option enables support for the IS31FL3299 LED driver. + config LEDS_SC27XX_BLTC tristate "LED support for the SC27xx breathing light controller" depends on LEDS_CLASS && MFD_SC27XX_PMIC @@ -859,6 +870,17 @@ This option enables support for the Power Button LED of Acer Iconia Tab A500. +config LEDS_LED1202 + tristate "LED support for STMicroElectronics LED1202" + depends on LEDS_CLASS && I2C && OF + select REGMAP_I2C + help + This option enables support for the LED1202 12-channel + LED driver. + + To compile this driver as a module, choose M here: the module + will be called leds-led1202. + source "drivers/leds/blink/Kconfig" comment "Flash and Torch LED drivers" diff -ruw linux-6.4/drivers/leds/Makefile linux-6.4-fbx/drivers/leds/Makefile --- linux-6.4/drivers/leds/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/leds/Makefile 2024-04-22 13:40:49.047834868 +0200 @@ -28,12 +28,14 @@ obj-$(CONFIG_LEDS_DA9052) += leds-da9052.o obj-$(CONFIG_LEDS_GPIO) += leds-gpio.o obj-$(CONFIG_LEDS_GPIO_REGISTER) += leds-gpio-register.o +obj-$(CONFIG_LEDS_FBXGWR_PMU) += leds-fbxgwr-pmu.o obj-$(CONFIG_LEDS_HP6XX) += leds-hp6xx.o obj-$(CONFIG_LEDS_INTEL_SS4200) += leds-ss4200.o obj-$(CONFIG_LEDS_IP30) += leds-ip30.o obj-$(CONFIG_LEDS_IPAQ_MICRO) += leds-ipaq-micro.o obj-$(CONFIG_LEDS_IS31FL319X) += leds-is31fl319x.o obj-$(CONFIG_LEDS_IS31FL32XX) += leds-is31fl32xx.o +obj-$(CONFIG_LEDS_IS31FL3299) += leds-is31fl3299.o obj-$(CONFIG_LEDS_LM3530) += leds-lm3530.o obj-$(CONFIG_LEDS_LM3532) += leds-lm3532.o obj-$(CONFIG_LEDS_LM3533) += leds-lm3533.o @@ -85,6 +87,7 @@ obj-$(CONFIG_LEDS_WM831X_STATUS) += leds-wm831x-status.o obj-$(CONFIG_LEDS_WM8350) += leds-wm8350.o obj-$(CONFIG_LEDS_WRAP) += leds-wrap.o +obj-$(CONFIG_LEDS_LED1202) += leds-led1202.o # LED SPI Drivers obj-$(CONFIG_LEDS_CR0014114) += leds-cr0014114.o diff -ruw linux-6.4/drivers/leds/trigger/ledtrig-pattern.c linux-6.4-fbx/drivers/leds/trigger/ledtrig-pattern.c --- linux-6.4/drivers/leds/trigger/ledtrig-pattern.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/leds/trigger/ledtrig-pattern.c 2024-04-22 13:40:49.059835196 +0200 @@ -31,6 +31,7 @@ int repeat; int last_repeat; int delta_t; + unsigned long last_expire; bool is_indefinite; bool is_hw_pattern; struct timer_list timer; @@ -83,8 +84,9 @@ /* Step change of brightness */ led_set_brightness(data->led_cdev, data->curr->brightness); - mod_timer(&data->timer, - jiffies + msecs_to_jiffies(data->curr->delta_t)); + data->last_expire += + msecs_to_jiffies(data->curr->delta_t); + mod_timer(&data->timer, data->last_expire); if (!data->next->delta_t) { /* Skip the tuple with zero duration */ pattern_trig_update_patterns(data); @@ -106,8 +108,9 @@ led_set_brightness(data->led_cdev, pattern_trig_compute_brightness(data)); - mod_timer(&data->timer, - jiffies + msecs_to_jiffies(UPDATE_INTERVAL)); + data->last_expire += + msecs_to_jiffies(UPDATE_INTERVAL); + mod_timer(&data->timer, data->last_expire); /* Accumulate the gradual dimming time */ data->delta_t += UPDATE_INTERVAL; @@ -137,6 +140,7 @@ data->curr = data->patterns; data->next = data->patterns + 1; data->timer.expires = jiffies; + data->last_expire = jiffies; add_timer(&data->timer); return 0; diff -ruw linux-6.4/drivers/media/rc/keymaps/Makefile linux-6.4-fbx/drivers/media/rc/keymaps/Makefile --- linux-6.4/drivers/media/rc/keymaps/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/media/rc/keymaps/Makefile 2024-04-22 13:40:49.327842518 +0200 @@ -103,6 +103,7 @@ rc-purpletv.o \ rc-pv951.o \ rc-rc6-mce.o \ + rc-rc6-freebox.o \ rc-real-audio-220-32-keys.o \ rc-reddo.o \ rc-snapstream-firefly.o \ diff -ruw linux-6.4/drivers/mfd/Kconfig linux-6.4-fbx/drivers/mfd/Kconfig --- linux-6.4/drivers/mfd/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mfd/Kconfig 2024-04-22 13:40:49.399844485 +0200 @@ -2052,6 +2052,24 @@ additional drivers must be enabled in order to use the functionality of the device. +config MFD_FBXGW7R_PANEL + tristate "Freebox fbxgw7r panel support" + depends on FB + depends on SPI_MASTER + depends on OF + select FB_SYS_FOPS + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_DEFERRED_IO + +config MFD_FBXGWR_PMU + tristate "Freebox fbxgwr PMU" + depends on I2C + depends on OF + select MFD_CORE + select REGMAP_I2C + config MFD_WCD934X tristate "Support for WCD9340/WCD9341 Codec" depends on SLIMBUS diff -ruw linux-6.4/drivers/mfd/Makefile linux-6.4-fbx/drivers/mfd/Makefile --- linux-6.4/drivers/mfd/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mfd/Makefile 2024-04-22 13:40:49.399844485 +0200 @@ -270,6 +270,8 @@ obj-$(CONFIG_MFD_ATC260X) += atc260x-core.o obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o +obj-$(CONFIG_MFD_FBXGW7R_PANEL) += fbxgw7r-panel.o +obj-$(CONFIG_MFD_FBXGWR_PMU) += fbxgwr-pmu.o rsmu-i2c-objs := rsmu_core.o rsmu_i2c.o rsmu-spi-objs := rsmu_core.o rsmu_spi.o diff -ruw linux-6.4/drivers/misc/Kconfig linux-6.4-fbx/drivers/misc/Kconfig --- linux-6.4/drivers/misc/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/misc/Kconfig 2024-04-22 13:40:49.423845141 +0200 @@ -5,6 +5,9 @@ menu "Misc devices" +config WINTEGRA_MMAP + bool "wintegra mmap driver" + config SENSORS_LIS3LV02D tristate depends on INPUT @@ -403,6 +406,18 @@ To compile this driver as a module, choose M here: the module will be called vmw_balloon. +config INTELCE_PIC16PMU + tristate "PIC16 PMU, LED, hwmon support" + select INPUT_POLLDEV + select NEW_LEDS + select I2C + select HWMON + select ARCH_REQUIRE_GPIOLIB + help + Freebox v6 HD PIC16 PMU interface support, enables + control of the on-board LEDs and reports the power status, + reset status and button status. + config PCH_PHUB tristate "Intel EG20T PCH/LAPIS Semicon IOH(ML7213/ML7223/ML7831) PHUB" select GENERIC_NET_UTILS @@ -424,6 +439,11 @@ To compile this driver as a module, choose M here: the module will be called pch_phub. +config FBXSERIAL_OF + bool "read fbxserial through DT chosen node" + depends on OF + select ARCH_HAS_FBXSERIAL + config LATTICE_ECP3_CONFIG tristate "Lattice ECP3 FPGA bitstream configuration via SPI" depends on SPI && SYSFS @@ -538,6 +558,9 @@ Say N here unless you know what you are doing. +config DGASP + bool "dying gasp infrastructure" + source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" @@ -555,4 +578,6 @@ source "drivers/misc/uacce/Kconfig" source "drivers/misc/pvpanic/Kconfig" source "drivers/misc/mchp_pci1xxxx/Kconfig" +source "drivers/misc/remoti/Kconfig" +source "drivers/misc/hdmi-cec/Kconfig" endmenu diff -ruw linux-6.4/drivers/misc/Makefile linux-6.4-fbx/drivers/misc/Makefile --- linux-6.4/drivers/misc/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/misc/Makefile 2024-04-22 13:40:49.427845250 +0200 @@ -3,6 +3,7 @@ # Makefile for misc devices that really don't fit anywhere else. # +obj-$(CONFIG_WINTEGRA_MMAP) += wintegra_mmap.o obj-$(CONFIG_IBM_ASM) += ibmasm/ obj-$(CONFIG_IBMVMC) += ibmvmc.o obj-$(CONFIG_AD525X_DPOT) += ad525x_dpot.o @@ -21,7 +22,9 @@ obj-$(CONFIG_SENSORS_APDS990X) += apds990x.o obj-$(CONFIG_ENCLOSURE_SERVICES) += enclosure.o obj-$(CONFIG_KGDB_TESTS) += kgdbts.o +obj-$(CONFIG_FBXSERIAL_OF) += fbxserial_of.o obj-$(CONFIG_SGI_XP) += sgi-xp/ +obj-$(CONFIG_INTELCE_PIC16PMU) += pic16-pmu.o obj-$(CONFIG_SGI_GRU) += sgi-gru/ obj-$(CONFIG_SMPRO_ERRMON) += smpro-errmon.o obj-$(CONFIG_SMPRO_MISC) += smpro-misc.o @@ -39,6 +42,7 @@ obj-y += cb710/ obj-$(CONFIG_VMWARE_BALLOON) += vmw_balloon.o obj-$(CONFIG_PCH_PHUB) += pch_phub.o +obj-y += hdmi-cec/ obj-y += ti-st/ obj-y += lis3lv02d/ obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ @@ -65,3 +69,5 @@ obj-$(CONFIG_VCPU_STALL_DETECTOR) += vcpu_stall_detector.o obj-$(CONFIG_TMR_MANAGER) += xilinx_tmr_manager.o obj-$(CONFIG_TMR_INJECT) += xilinx_tmr_inject.o +obj-y += remoti/ +obj-$(CONFIG_DGASP) += dgasp.o diff -ruw linux-6.4/drivers/misc/eeprom/Kconfig linux-6.4-fbx/drivers/misc/eeprom/Kconfig --- linux-6.4/drivers/misc/eeprom/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/misc/eeprom/Kconfig 2024-04-22 13:40:49.435845469 +0200 @@ -131,4 +131,8 @@ This driver can also be built as a module. If so, the module will be called ee1004. +config EEPROM_EE1004_RAW + tristate "SPD EEPROMs on DDR4 memory modules (non smbus)" + depends on I2C && SYSFS + endmenu diff -ruw linux-6.4/drivers/misc/eeprom/Makefile linux-6.4-fbx/drivers/misc/eeprom/Makefile --- linux-6.4/drivers/misc/eeprom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/misc/eeprom/Makefile 2023-03-09 16:41:54.887957334 +0100 @@ -8,3 +8,4 @@ obj-$(CONFIG_EEPROM_DIGSY_MTC_CFG) += digsy_mtc_eeprom.o obj-$(CONFIG_EEPROM_IDT_89HPESX) += idt_89hpesx.o obj-$(CONFIG_EEPROM_EE1004) += ee1004.o +obj-$(CONFIG_EEPROM_EE1004_RAW) += ee1004_raw.o diff -ruw linux-6.4/drivers/misc/eeprom/at24.c linux-6.4-fbx/drivers/misc/eeprom/at24.c --- linux-6.4/drivers/misc/eeprom/at24.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/misc/eeprom/at24.c 2024-04-22 13:40:49.435845469 +0200 @@ -594,7 +594,6 @@ bool full_power; struct regmap *regmap; bool writable; - u8 test_byte; int err; i2c_fn_i2c = i2c_check_functionality(client->adapter, I2C_FUNC_I2C); @@ -615,8 +614,10 @@ page_size = 1; flags = cdata->flags; +#ifndef CONFIG_NVMEM_IGNORE_RO if (device_property_present(dev, "read-only")) flags |= AT24_FLAG_READONLY; +#endif if (device_property_present(dev, "no-read-rollover")) flags |= AT24_FLAG_NO_RDROL; @@ -764,21 +765,6 @@ return PTR_ERR(at24->nvmem); } - /* - * Perform a one-byte test read to verify that the chip is functional, - * unless powering on the device is to be avoided during probe (i.e. - * it's powered off right now). - */ - if (full_power) { - err = at24_read(at24, 0, &test_byte, 1); - if (err) { - pm_runtime_disable(dev); - if (!pm_runtime_status_suspended(dev)) - regulator_disable(at24->vcc_reg); - return -ENODEV; - } - } - pm_runtime_idle(dev); if (writable) diff -ruw linux-6.4/drivers/mmc/core/block.c linux-6.4-fbx/drivers/mmc/core/block.c --- linux-6.4/drivers/mmc/core/block.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mmc/core/block.c 2024-04-22 13:40:49.455846015 +0200 @@ -2463,7 +2463,7 @@ md->disk->private_data = md; md->parent = parent; set_disk_ro(md->disk, md->read_only || default_ro); - if (area_type & (MMC_BLK_DATA_AREA_RPMB | MMC_BLK_DATA_AREA_BOOT)) + if (area_type & (MMC_BLK_DATA_AREA_RPMB)) md->disk->flags |= GENHD_FL_NO_PART; /* diff -ruw linux-6.4/drivers/mmc/host/Kconfig linux-6.4-fbx/drivers/mmc/host/Kconfig --- linux-6.4/drivers/mmc/host/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mmc/host/Kconfig 2024-04-22 13:40:49.463846234 +0200 @@ -997,7 +997,7 @@ config MMC_SDHCI_BRCMSTB tristate "Broadcom SDIO/SD/MMC support" - depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST + depends on ARCH_BRCMSTB || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST depends on MMC_SDHCI_PLTFM select MMC_CQHCI default ARCH_BRCMSTB || BMIPS_GENERIC diff -ruw linux-6.4/drivers/mtd/Kconfig linux-6.4-fbx/drivers/mtd/Kconfig --- linux-6.4/drivers/mtd/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mtd/Kconfig 2023-02-24 19:08:06.439275900 +0100 @@ -23,6 +23,9 @@ WARNING: some of the tests will ERASE entire MTD device which they test. Do not use these tests unless you really know what you do. +config MTD_ERASE_PRINTK + bool "write to kernel log when a block is erased" + menu "Partition parsers" source "drivers/mtd/parsers/Kconfig" endmenu diff -ruw linux-6.4/drivers/mtd/nand/raw/Kconfig linux-6.4-fbx/drivers/mtd/nand/raw/Kconfig --- linux-6.4/drivers/mtd/nand/raw/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mtd/nand/raw/Kconfig 2024-04-22 13:40:49.499847217 +0200 @@ -12,6 +12,14 @@ comment "Raw/parallel NAND flash controllers" +config MTD_FORCE_BAD_BLOCK_ERASE + bool "Force erase on bad blocks (useful for bootloader parts)" + default n + help + Enable this option only when you need to force an erase on + blocks being marked as "bad" by Linux (i.e: other ECC/bad block + marker layout). + config MTD_NAND_DENALI tristate @@ -31,6 +39,18 @@ Enable the driver for NAND flash on platforms using a Denali NAND controller as a DT device. +config MTD_NAND_DENALI_FBX + tristate "NAND Denali controller support" + depends on PCI + select BCH_CONST_PARAMS + +if MTD_NAND_DENALI_FBX + config BCH_CONST_M + default 13 + config BCH_CONST_T + default 4 +endif + config MTD_NAND_AMS_DELTA tristate "Amstrad E3 NAND controller" depends on MACH_AMS_DELTA || COMPILE_TEST diff -ruw linux-6.4/drivers/mtd/nand/raw/Makefile linux-6.4-fbx/drivers/mtd/nand/raw/Makefile --- linux-6.4/drivers/mtd/nand/raw/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mtd/nand/raw/Makefile 2024-04-22 13:40:49.499847217 +0200 @@ -8,6 +8,7 @@ obj-$(CONFIG_MTD_NAND_DENALI) += denali.o obj-$(CONFIG_MTD_NAND_DENALI_PCI) += denali_pci.o obj-$(CONFIG_MTD_NAND_DENALI_DT) += denali_dt.o +obj-$(CONFIG_MTD_NAND_DENALI_FBX) += denali_nand.o obj-$(CONFIG_MTD_NAND_AU1550) += au1550nd.o obj-$(CONFIG_MTD_NAND_S3C2410) += s3c2410.o obj-$(CONFIG_MTD_NAND_DAVINCI) += davinci_nand.o diff -ruw linux-6.4/drivers/mtd/parsers/Kconfig linux-6.4-fbx/drivers/mtd/parsers/Kconfig --- linux-6.4/drivers/mtd/parsers/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mtd/parsers/Kconfig 2024-04-22 13:40:49.523847873 +0200 @@ -96,6 +96,10 @@ two "firmware" partitions. Currently used firmware has to be detected using CFE environment variable. +config MTD_OF_PARTS_IGNORE_RO + bool "ignore read-only flag" + depends on MTD_OF_PARTS + config MTD_PARSER_IMAGETAG tristate "Parser for BCM963XX Image Tag format partitions" depends on BCM63XX || BMIPS_GENERIC || COMPILE_TEST @@ -220,3 +224,14 @@ partition map. This partition table contains real partition offsets, which may differ from device to device depending on the number and location of bad blocks on NAND. + +config MTD_FBX6HD_PARTS + tristate "Freebox V6 HD partitioning support" + help + Freebox V6 HD partitioning support + +config MTD_FBX6HD_PARTS_WRITE_ALL + bool "make all partitions writeable" + depends on MTD_FBX6HD_PARTS + help + Freebox V6 HD partitions support diff -ruw linux-6.4/drivers/mtd/parsers/Makefile linux-6.4-fbx/drivers/mtd/parsers/Makefile --- linux-6.4/drivers/mtd/parsers/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/mtd/parsers/Makefile 2024-04-22 13:40:49.523847873 +0200 @@ -16,3 +16,4 @@ obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_QCOMSMEM_PARTS) += qcomsmempart.o +obj-$(CONFIG_MTD_FBX6HD_PARTS) += fbx6hd-mtdparts.o diff -ruw linux-6.4/drivers/net/ethernet/Kconfig linux-6.4-fbx/drivers/net/ethernet/Kconfig --- linux-6.4/drivers/net/ethernet/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/Kconfig 2024-04-22 13:40:49.599849949 +0200 @@ -190,6 +190,7 @@ source "drivers/net/ethernet/via/Kconfig" source "drivers/net/ethernet/wangxun/Kconfig" source "drivers/net/ethernet/wiznet/Kconfig" +source "drivers/net/ethernet/wintegra/Kconfig" source "drivers/net/ethernet/xilinx/Kconfig" source "drivers/net/ethernet/xircom/Kconfig" diff -ruw linux-6.4/drivers/net/ethernet/Makefile linux-6.4-fbx/drivers/net/ethernet/Makefile --- linux-6.4/drivers/net/ethernet/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/Makefile 2024-04-22 13:40:49.599849949 +0200 @@ -100,6 +100,7 @@ obj-$(CONFIG_NET_VENDOR_VIA) += via/ obj-$(CONFIG_NET_VENDOR_WANGXUN) += wangxun/ obj-$(CONFIG_NET_VENDOR_WIZNET) += wiznet/ +obj-$(CONFIG_NET_VENDOR_WINTEGRA) += wintegra/ obj-$(CONFIG_NET_VENDOR_XILINX) += xilinx/ obj-$(CONFIG_NET_VENDOR_XIRCOM) += xircom/ obj-$(CONFIG_NET_VENDOR_SYNOPSYS) += synopsys/ diff -ruw linux-6.4/drivers/net/ethernet/broadcom/Kconfig linux-6.4-fbx/drivers/net/ethernet/broadcom/Kconfig --- linux-6.4/drivers/net/ethernet/broadcom/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/broadcom/Kconfig 2024-04-22 13:40:49.631850824 +0200 @@ -68,6 +68,39 @@ This driver supports the ethernet MACs in the Broadcom 63xx MIPS chipset family (BCM63XX). +config BCM63XX_ENET_RUNNER + tristate "Broadcom 63xx (63138) runner ethernet support" + select MII + select FIXED_PHY + select PHYLIB + select BCM7XXX_PHY + select BROADCOM_PHY + select SOC_BCM63XX_RDP + +config BCM63158_SF2 + tristate "Broadcom 63158 SF2 support" + select MII + select PHYLINK + select BCM7XXX_PHY + select BROADCOM_PHY + select NET_DSA + select NET_DSA_TAG_BRCM_FBX + +config BCM63158_ENET_RUNNER + tristate "Broadcom 63158 runner ethernet support" + select MII + select PHYLINK + select SOC_BCM63XX_XRDP + +config BCM63158_ENET_RUNNER_FF + bool "fastpath support for freebox boards" + depends on BCM63158_ENET_RUNNER + select IP_FFN + select IPV6_FFN + select IPV6_SIT_6RD + select BRIDGE + select FBXBRIDGE + config BCMGENET tristate "Broadcom GENET internal MAC support" depends on HAS_IOMEM diff -ruw linux-6.4/drivers/net/ethernet/broadcom/Makefile linux-6.4-fbx/drivers/net/ethernet/broadcom/Makefile --- linux-6.4/drivers/net/ethernet/broadcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/broadcom/Makefile 2023-03-09 15:06:11.356234011 +0100 @@ -17,3 +17,5 @@ obj-$(CONFIG_BGMAC_PLATFORM) += bgmac-platform.o obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o obj-$(CONFIG_BNXT) += bnxt/ +obj-$(CONFIG_BCM63XX_ENET_RUNNER) += bcm63xx_enet_runner/ +obj-y += bcm63158/ diff -ruw linux-6.4/drivers/net/ethernet/marvell/Kconfig linux-6.4-fbx/drivers/net/ethernet/marvell/Kconfig --- linux-6.4/drivers/net/ethernet/marvell/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/marvell/Kconfig 2024-04-22 13:40:49.859857053 +0200 @@ -23,6 +23,7 @@ depends on INET select PHYLIB select MVMDIO + select MII help This driver supports the gigabit ethernet MACs in the Marvell Discovery PPC/MIPS chipset family (MV643XX) and @@ -31,6 +32,15 @@ Some boards that use the Discovery chipset are the Momenco Ocelot C and Jaguar ATX and Pegasos II. +config MV643XX_ETH_FBX_FF + bool "fastpath support for freebox boards" + depends on MV643XX_ETH + select IP_FFN + select IPV6_FFN + select IPV6_SIT_6RD + select BRIDGE + select FBXBRIDGE + config MVMDIO tristate "Marvell MDIO interface support" depends on HAS_IOMEM @@ -90,6 +100,7 @@ select MVMDIO select PHYLINK select PAGE_POOL + select MII help This driver supports the network interface units in the Marvell ARMADA 375, 7K and 8K SoCs. @@ -99,6 +110,15 @@ depends on (PTP_1588_CLOCK = y && MVPP2 = y) || \ (PTP_1588_CLOCK && MVPP2 = m) +config MVPP2_FBX_FF + bool "fastpath support for freebox boards" + depends on MVPP2 + select IP_FFN + select IPV6_FFN + select IPV6_SIT_6RD + select BRIDGE + select FBXBRIDGE + config PXA168_ETH tristate "Marvell pxa168 ethernet support" depends on HAS_IOMEM diff -ruw linux-6.4/drivers/net/ethernet/qualcomm/Kconfig linux-6.4-fbx/drivers/net/ethernet/qualcomm/Kconfig --- linux-6.4/drivers/net/ethernet/qualcomm/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/qualcomm/Kconfig 2024-04-22 13:40:50.059862517 +0200 @@ -62,5 +62,6 @@ Precision Clock Synchronization Protocol. source "drivers/net/ethernet/qualcomm/rmnet/Kconfig" +source "drivers/net/ethernet/qualcomm/ipq95xx/Kconfig" endif # NET_VENDOR_QUALCOMM diff -ruw linux-6.4/drivers/net/ethernet/qualcomm/Makefile linux-6.4-fbx/drivers/net/ethernet/qualcomm/Makefile --- linux-6.4/drivers/net/ethernet/qualcomm/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/qualcomm/Makefile 2024-04-22 13:40:50.059862517 +0200 @@ -12,3 +12,4 @@ obj-y += emac/ obj-$(CONFIG_RMNET) += rmnet/ +obj-y += ipq95xx/ diff -ruw linux-6.4/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c linux-6.4-fbx/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c --- linux-6.4/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c 2024-04-22 13:40:50.131864484 +0200 @@ -500,7 +500,8 @@ } if (priv->eee_active && !priv->eee_enabled) { - timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, 0); + timer_setup(&priv->eee_ctrl_timer, stmmac_eee_ctrl_timer, + TIMER_IRQSAFE); stmmac_set_eee_timer(priv, priv->hw, STMMAC_DEFAULT_LIT_LS, eee_tw_timer); if (priv->hw->xpcs) @@ -5934,33 +5935,6 @@ return IRQ_HANDLED; } -#ifdef CONFIG_NET_POLL_CONTROLLER -/* Polling receive - used by NETCONSOLE and other diagnostic tools - * to allow network I/O with interrupts disabled. - */ -static void stmmac_poll_controller(struct net_device *dev) -{ - struct stmmac_priv *priv = netdev_priv(dev); - int i; - - /* If adapter is down, do nothing */ - if (test_bit(STMMAC_DOWN, &priv->state)) - return; - - if (priv->plat->multi_msi_en) { - for (i = 0; i < priv->plat->rx_queues_to_use; i++) - stmmac_msi_intr_rx(0, &priv->dma_conf.rx_queue[i]); - - for (i = 0; i < priv->plat->tx_queues_to_use; i++) - stmmac_msi_intr_tx(0, &priv->dma_conf.tx_queue[i]); - } else { - disable_irq(dev->irq); - stmmac_interrupt(dev->irq, dev); - enable_irq(dev->irq); - } -} -#endif - /** * stmmac_ioctl - Entry point for the Ioctl * @dev: Device pointer. @@ -6796,9 +6770,6 @@ .ndo_eth_ioctl = stmmac_ioctl, .ndo_setup_tc = stmmac_setup_tc, .ndo_select_queue = stmmac_select_queue, -#ifdef CONFIG_NET_POLL_CONTROLLER - .ndo_poll_controller = stmmac_poll_controller, -#endif .ndo_set_mac_address = stmmac_set_mac_address, .ndo_vlan_rx_add_vid = stmmac_vlan_rx_add_vid, .ndo_vlan_rx_kill_vid = stmmac_vlan_rx_kill_vid, diff -ruw linux-6.4/drivers/net/macvlan.c linux-6.4-fbx/drivers/net/macvlan.c --- linux-6.4/drivers/net/macvlan.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/macvlan.c 2024-04-22 13:40:50.187866014 +0200 @@ -43,6 +43,7 @@ struct macvlan_port { struct net_device *dev; struct hlist_head vlan_hash[MACVLAN_HASH_SIZE]; + struct hlist_head promisc; struct list_head vlans; struct sk_buff_head bc_queue; struct work_struct bc_work; @@ -179,9 +180,15 @@ { struct macvlan_port *port = vlan->port; const unsigned char *addr = vlan->dev->dev_addr; - u32 idx = macvlan_eth_hash(addr); + struct hlist_head *head = &port->promisc; + u32 idx; + + if (!(port->dev->flags & IFF_PROMISC)) { + idx = macvlan_eth_hash(addr); + head = &port->vlan_hash[idx]; + } - hlist_add_head_rcu(&vlan->hlist, &port->vlan_hash[idx]); + hlist_add_head_rcu(&vlan->hlist, head); } static void macvlan_hash_del_source(struct macvlan_source_entry *entry) @@ -259,6 +266,28 @@ return hash_32(val, MACVLAN_MC_FILTER_BITS); } +static void _macvlan_broadcast(struct sk_buff *skb, + const struct macvlan_dev *vlan, + const struct ethhdr *eth, bool local) +{ + struct sk_buff *nskb; + int err = NET_RX_DROP; + + nskb = skb_clone(skb, GFP_ATOMIC); + if (unlikely(!nskb)) + goto out; + + err = macvlan_broadcast_one(nskb, vlan, eth, local); + if (err) + goto out; + + netif_rx(nskb); + +out: + macvlan_count_rx(vlan, skb->len + ETH_HLEN, + err == NET_RX_SUCCESS, true); +} + static void macvlan_broadcast(struct sk_buff *skb, const struct macvlan_port *port, struct net_device *src, @@ -266,9 +295,7 @@ { const struct ethhdr *eth = eth_hdr(skb); const struct macvlan_dev *vlan; - struct sk_buff *nskb; unsigned int i; - int err; unsigned int hash; if (skb->protocol == htons(ETH_P_PAUSE)) @@ -282,15 +309,11 @@ if (!test_bit(hash, vlan->mc_filter)) continue; - err = NET_RX_DROP; - nskb = skb_clone(skb, GFP_ATOMIC); - if (likely(nskb)) - err = macvlan_broadcast_one(nskb, vlan, eth, - mode == MACVLAN_MODE_BRIDGE) ?: - netif_rx(nskb); - macvlan_count_rx(vlan, skb->len + ETH_HLEN, - err == NET_RX_SUCCESS, true); + _macvlan_broadcast(skb, vlan, eth, mode == MACVLAN_MODE_BRIDGE); } + + hlist_for_each_entry_rcu(vlan, &port->promisc, hlist) + _macvlan_broadcast(skb, vlan, eth, mode == MACVLAN_MODE_BRIDGE); } static void macvlan_multicast_rx(const struct macvlan_port *port, @@ -395,7 +418,7 @@ vlan->macaddr_count = 0; } -static void macvlan_forward_source_one(struct sk_buff *skb, +static void macvlan_forward_one(struct sk_buff *skb, struct macvlan_dev *vlan) { struct sk_buff *nskb; @@ -434,13 +457,23 @@ if (ether_addr_equal_64bits(entry->addr, addr)) { if (entry->vlan->flags & MACVLAN_FLAG_NODST) consume = true; - macvlan_forward_source_one(skb, entry->vlan); + macvlan_forward_one(skb, entry->vlan); } } return consume; } +static void macvlan_forward_promisc(struct sk_buff *skb, + struct macvlan_port *port) +{ + struct macvlan_dev *vlan; + struct hlist_head *h = &port->promisc; + + hlist_for_each_entry_rcu(vlan, h, hlist) + macvlan_forward_one(skb, vlan); +} + /* called under rcu_read_lock() from netif_receive_skb */ static rx_handler_result_t macvlan_handle_frame(struct sk_buff **pskb) { @@ -500,8 +533,10 @@ struct macvlan_dev, list); else vlan = macvlan_hash_lookup(port, eth->h_dest); - if (!vlan || vlan->mode == MACVLAN_MODE_SOURCE) + if (!vlan || vlan->mode == MACVLAN_MODE_SOURCE) { + macvlan_forward_promisc(skb, port); return RX_HANDLER_PASS; + } dev = vlan->dev; if (unlikely(!(dev->flags & IFF_UP))) { @@ -780,10 +815,12 @@ if (dev->flags & IFF_UP) { if (change & IFF_ALLMULTI) dev_set_allmulti(lowerdev, dev->flags & IFF_ALLMULTI ? 1 : -1); - if (change & IFF_PROMISC) + if (change & IFF_PROMISC) { dev_set_promiscuity(lowerdev, dev->flags & IFF_PROMISC ? 1 : -1); - + macvlan_hash_del(vlan, true); + macvlan_hash_add(vlan); + } } } @@ -1268,6 +1305,7 @@ INIT_HLIST_HEAD(&port->vlan_hash[i]); for (i = 0; i < MACVLAN_HASH_SIZE; i++) INIT_HLIST_HEAD(&port->vlan_source_hash[i]); + INIT_HLIST_HEAD(&port->promisc); port->bc_queue_len_used = 0; port->bc_cutoff = 1; diff -ruw linux-6.4/drivers/net/mdio/of_mdio.c linux-6.4-fbx/drivers/net/mdio/of_mdio.c --- linux-6.4/drivers/net/mdio/of_mdio.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/mdio/of_mdio.c 2024-04-22 13:40:50.191866124 +0200 @@ -173,6 +173,8 @@ mdio->reset_post_delay_us = 0; of_property_read_u32(np, "reset-post-delay-us", &mdio->reset_post_delay_us); + mdio->keep_broken_phy = of_property_read_bool(np, "keep-broken-phy"); + /* Register the MDIO bus */ rc = __mdiobus_register(mdio, owner); if (rc) diff -ruw linux-6.4/drivers/net/phy/Kconfig linux-6.4-fbx/drivers/net/phy/Kconfig --- linux-6.4/drivers/net/phy/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/Kconfig 2024-04-22 13:40:50.195866233 +0200 @@ -309,6 +309,12 @@ Currently supports the AR8030, AR8031, AR8033, AR8035 and internal QCA8337(Internal qca8k PHY) model +config QCA807X_PHY + tristate "Qualcomm QCA870x PHYs" + +config QCA8084_PHY + tristate "Qualcomm QCA8084 Quad-PHY" + config QSEMI_PHY tristate "Quality Semiconductor PHYs" help diff -ruw linux-6.4/drivers/net/phy/Makefile linux-6.4-fbx/drivers/net/phy/Makefile --- linux-6.4/drivers/net/phy/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/Makefile 2024-04-22 13:40:50.195866233 +0200 @@ -82,7 +82,13 @@ obj-$(CONFIG_NXP_C45_TJA11XX_PHY) += nxp-c45-tja11xx.o obj-$(CONFIG_NXP_CBTX_PHY) += nxp-cbtx.o obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o +obj-$(CONFIG_QCA807X_PHY) += qca807x.o +obj-$(CONFIG_QCA8084_PHY) += qca8084.o obj-$(CONFIG_QSEMI_PHY) += qsemi.o +realtek-objs += realtek.o +ifdef CONFIG_HWMON +realtek-objs += realtek-hwmon.o +endif obj-$(CONFIG_REALTEK_PHY) += realtek.o obj-$(CONFIG_RENESAS_PHY) += uPD60620.o obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o diff -ruw linux-6.4/drivers/net/phy/mdio_bus.c linux-6.4-fbx/drivers/net/phy/mdio_bus.c --- linux-6.4/drivers/net/phy/mdio_bus.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/mdio_bus.c 2024-04-22 13:40:50.199866342 +0200 @@ -650,7 +650,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) { struct mdio_device *mdiodev; - struct gpio_desc *gpiod; + struct gpio_descs *gpiod; bool prevent_c45_scan; int i, err; @@ -696,7 +696,7 @@ mutex_init(&bus->shared_lock); /* assert bus level PHY GPIO reset */ - gpiod = devm_gpiod_get_optional(&bus->dev, "reset", GPIOD_OUT_HIGH); + gpiod = devm_gpiod_get_array_optional(&bus->dev, "reset", GPIOD_OUT_HIGH); if (IS_ERR(gpiod)) { err = dev_err_probe(&bus->dev, PTR_ERR(gpiod), "mii_bus %s couldn't get reset GPIO\n", @@ -706,7 +706,8 @@ } else if (gpiod) { bus->reset_gpiod = gpiod; fsleep(bus->reset_delay_us); - gpiod_set_value_cansleep(gpiod, 0); + for (i = 0; i < gpiod->ndescs; i++) + gpiod_set_value_cansleep(gpiod->desc[i], 0); if (bus->reset_post_delay_us > 0) fsleep(bus->reset_post_delay_us); } @@ -748,8 +749,10 @@ } error_reset_gpiod: /* Put PHYs in RESET to save power */ - if (bus->reset_gpiod) - gpiod_set_value_cansleep(bus->reset_gpiod, 1); + if (bus->reset_gpiod) { + for (i = 0; i < bus->reset_gpiod->ndescs; i++) + gpiod_set_value_cansleep(bus->reset_gpiod->desc[i], 1); + } device_del(&bus->dev); return err; @@ -778,8 +781,10 @@ } /* Put PHYs in RESET to save power */ - if (bus->reset_gpiod) - gpiod_set_value_cansleep(bus->reset_gpiod, 1); + if (bus->reset_gpiod) { + for (i = 0; i < bus->reset_gpiod->ndescs; i++) + gpiod_set_value_cansleep(bus->reset_gpiod->desc[i], 1); + } device_del(&bus->dev); } diff -ruw linux-6.4/drivers/net/phy/phy-c45.c linux-6.4-fbx/drivers/net/phy/phy-c45.c --- linux-6.4/drivers/net/phy/phy-c45.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/phy-c45.c 2024-04-22 13:40:50.203866452 +0200 @@ -748,6 +748,16 @@ mii_10base_t1_adv_mod_linkmode_t(adv, val); } + if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->supported_eee)) { + val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_ADV2); + if (val < 0) + return val; + + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + adv, val & MDIO_EEE_2_5GT); + } + return 0; } @@ -784,6 +794,16 @@ mii_10base_t1_adv_mod_linkmode_t(lpa, val); } + if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + phydev->supported_eee)) { + val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_EEE_LPABLE2); + if (val < 0) + return val; + + linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, + lpa, val & MDIO_EEE_2_5GT); + } + return 0; } @@ -1477,3 +1497,25 @@ .name = "Generic Clause 45 PHY", .read_status = genphy_c45_read_status, }; + +static int genphy_broken_c45_get_tunable(struct phy_device *phydev, + struct ethtool_tunable *tuna, + void *data) +{ + switch (tuna->id) { + case ETHTOOL_PHY_BROKEN: + *(u8*)data = 1; + return 0; + default: + return -ENOTSUPP; + } + return 0; +} + +struct phy_driver genphy_broken_c45_driver = { + .phy_id = 0xffffffff, + .phy_id_mask = 0xffffffff, + .name = "Generic Broken Clause 45 PHY", + .read_status = genphy_c45_read_status, + .get_tunable = genphy_broken_c45_get_tunable, +}; diff -ruw linux-6.4/drivers/net/phy/phy-core.c linux-6.4-fbx/drivers/net/phy/phy-core.c --- linux-6.4/drivers/net/phy/phy-core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/phy-core.c 2024-04-22 13:40:50.203866452 +0200 @@ -13,7 +13,7 @@ */ const char *phy_speed_to_str(int speed) { - BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 102, + BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 108, "Enum ethtool_link_mode_bit_indices and phylib are out of sync. " "If a speed or mode has been added please update phy_speed_to_str " "and the PHY settings array.\n"); @@ -138,10 +138,19 @@ case PHY_INTERFACE_MODE_RXAUI: case PHY_INTERFACE_MODE_XAUI: case PHY_INTERFACE_MODE_1000BASEKX: + case PHY_INTERFACE_MODE_1000BASEPX_D: + case PHY_INTERFACE_MODE_1000BASEPX_U: + case PHY_INTERFACE_MODE_10000BASEPR_D: + case PHY_INTERFACE_MODE_10000BASEPR_U: + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_D: + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_U: return 1; case PHY_INTERFACE_MODE_QSGMII: case PHY_INTERFACE_MODE_QUSGMII: + case PHY_INTERFACE_MODE_10G_QXGMII: return 4; + case PHY_INTERFACE_MODE_PSGMII: + return 5; case PHY_INTERFACE_MODE_MAX: WARN_ONCE(1, "PHY_INTERFACE_MODE_MAX isn't a valid interface mode"); return 0; @@ -230,6 +239,10 @@ PHY_SETTING( 20000, FULL, 20000baseKR2_Full ), PHY_SETTING( 20000, FULL, 20000baseMLD2_Full ), /* 10G */ + PHY_SETTING( 10000, FULL, 10000_1000basePRX_D_Full ), + PHY_SETTING( 10000, FULL, 10000_1000basePRX_U_Full ), + PHY_SETTING( 10000, FULL, 10000basePR_D_Full ), + PHY_SETTING( 10000, FULL, 10000basePR_U_Full ), PHY_SETTING( 10000, FULL, 10000baseCR_Full ), PHY_SETTING( 10000, FULL, 10000baseER_Full ), PHY_SETTING( 10000, FULL, 10000baseKR_Full ), @@ -245,6 +258,8 @@ PHY_SETTING( 2500, FULL, 2500baseT_Full ), PHY_SETTING( 2500, FULL, 2500baseX_Full ), /* 1G */ + PHY_SETTING( 1000, FULL, 1000basePX_D_Full ), + PHY_SETTING( 1000, FULL, 1000basePX_U_Full ), PHY_SETTING( 1000, FULL, 1000baseT_Full ), PHY_SETTING( 1000, HALF, 1000baseT_Half ), PHY_SETTING( 1000, FULL, 1000baseT1_Full ), diff -ruw linux-6.4/drivers/net/phy/phy.c linux-6.4-fbx/drivers/net/phy/phy.c --- linux-6.4/drivers/net/phy/phy.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/phy.c 2024-04-22 13:40:50.203866452 +0200 @@ -36,7 +36,7 @@ #include #include -#define PHY_STATE_TIME HZ +#define PHY_STATE_TIME (HZ / 2) #define PHY_STATE_STR(_state) \ case PHY_##_state: \ diff -ruw linux-6.4/drivers/net/phy/phy_device.c linux-6.4-fbx/drivers/net/phy/phy_device.c --- linux-6.4/drivers/net/phy/phy_device.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/phy_device.c 2024-04-22 13:40:50.207866561 +0200 @@ -812,7 +812,8 @@ return -EIO; } - if ((devs_in_pkg & 0x1fffffff) == 0x1fffffff) { + if ((devs_in_pkg & 0x1fffffff) == 0x1fffffff || + !devs_in_pkg) { /* If mostly Fs, there is no device there, then let's probe * MMD 0, as some 10G PHYs have zero Devices In package, * e.g. Cortina CS4315/CS4340 PHY. @@ -822,9 +823,13 @@ return -EIO; /* no device there, let's get out of here */ - if ((devs_in_pkg & 0x1fffffff) == 0x1fffffff) + if ((devs_in_pkg & 0x1fffffff) == 0x1fffffff || + !devs_in_pkg) { + if (bus->keep_broken_phy) + return 0; return -ENODEV; } + } /* Now probe Device Identifiers for each device present. */ for (i = 1; i < num_ids; i++) { @@ -1454,6 +1459,9 @@ */ if (!d->driver) { if (phydev->is_c45) + if (!phydev->c45_ids.mmds_present) + d->driver = &genphy_broken_c45_driver.mdiodrv.driver; + else d->driver = &genphy_c45_driver.mdiodrv.driver; else d->driver = &genphy_driver.mdiodrv.driver; @@ -3463,9 +3471,15 @@ if (rc) goto err_c45; + rc = phy_driver_register(&genphy_broken_c45_driver, THIS_MODULE); + if (rc) + goto err_c45_broken; + rc = phy_driver_register(&genphy_driver, THIS_MODULE); if (rc) { phy_driver_unregister(&genphy_c45_driver); +err_c45_broken: + phy_driver_unregister(&genphy_broken_c45_driver); err_c45: mdio_bus_exit(); } @@ -3475,6 +3489,7 @@ static void __exit phy_exit(void) { + phy_driver_unregister(&genphy_broken_c45_driver); phy_driver_unregister(&genphy_c45_driver); phy_driver_unregister(&genphy_driver); mdio_bus_exit(); diff -ruw linux-6.4/drivers/net/phy/phylink.c linux-6.4-fbx/drivers/net/phy/phylink.c --- linux-6.4/drivers/net/phy/phylink.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/phylink.c 2024-04-22 13:40:50.207866561 +0200 @@ -191,9 +191,13 @@ case PHY_INTERFACE_MODE_QUSGMII: case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_GMII: + case PHY_INTERFACE_MODE_PSGMII: + case PHY_INTERFACE_MODE_1000BASEPX_D: + case PHY_INTERFACE_MODE_1000BASEPX_U: return SPEED_1000; case PHY_INTERFACE_MODE_2500BASEX: + case PHY_INTERFACE_MODE_10G_QXGMII: return SPEED_2500; case PHY_INTERFACE_MODE_5GBASER: @@ -205,6 +209,10 @@ case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GKR: case PHY_INTERFACE_MODE_USXGMII: + case PHY_INTERFACE_MODE_10000BASEPR_D: + case PHY_INTERFACE_MODE_10000BASEPR_U: + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_D: + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_U: return SPEED_10000; case PHY_INTERFACE_MODE_25GBASER: @@ -213,6 +221,7 @@ case PHY_INTERFACE_MODE_XLGMII: return SPEED_40000; + case PHY_INTERFACE_MODE_INTERNAL: case PHY_INTERFACE_MODE_NA: case PHY_INTERFACE_MODE_MAX: @@ -445,7 +454,11 @@ switch (interface) { case PHY_INTERFACE_MODE_USXGMII: - caps |= MAC_10000FD | MAC_5000FD | MAC_2500FD; + caps |= MAC_10000FD | MAC_5000FD; + fallthrough; + + case PHY_INTERFACE_MODE_10G_QXGMII: + caps |= MAC_2500FD; fallthrough; case PHY_INTERFACE_MODE_RGMII_TXID: @@ -456,6 +469,7 @@ case PHY_INTERFACE_MODE_QUSGMII: case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_GMII: + case PHY_INTERFACE_MODE_PSGMII: caps |= MAC_1000HD | MAC_1000FD; fallthrough; @@ -479,6 +493,8 @@ fallthrough; case PHY_INTERFACE_MODE_1000BASEKX: case PHY_INTERFACE_MODE_TRGMII: + case PHY_INTERFACE_MODE_1000BASEPX_D: + case PHY_INTERFACE_MODE_1000BASEPX_U: caps |= MAC_1000FD; break; @@ -495,6 +511,10 @@ case PHY_INTERFACE_MODE_XAUI: case PHY_INTERFACE_MODE_10GBASER: case PHY_INTERFACE_MODE_10GKR: + case PHY_INTERFACE_MODE_10000BASEPR_D: + case PHY_INTERFACE_MODE_10000BASEPR_U: + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_D: + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_U: caps |= MAC_10000FD; break; @@ -507,10 +527,10 @@ break; case PHY_INTERFACE_MODE_INTERNAL: + case PHY_INTERFACE_MODE_NA: caps |= ~0; break; - case PHY_INTERFACE_MODE_NA: case PHY_INTERFACE_MODE_MAX: break; } @@ -846,8 +866,13 @@ pl->cfg_link_an_mode = MLO_AN_INBAND; switch (pl->link_config.interface) { + case PHY_INTERFACE_MODE_10G_QXGMII: + phylink_set(pl->supported, 2500baseT_Full); + phylink_set(pl->supported, 2500baseX_Full); + fallthrough; case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_QSGMII: + case PHY_INTERFACE_MODE_PSGMII: case PHY_INTERFACE_MODE_QUSGMII: case PHY_INTERFACE_MODE_RGMII: case PHY_INTERFACE_MODE_RGMII_ID: @@ -930,6 +955,25 @@ phylink_set(pl->supported, 100000baseDR2_Full); break; + case PHY_INTERFACE_MODE_1000BASEPX_D: + phylink_set(pl->supported, 1000basePX_D_Full); + break; + case PHY_INTERFACE_MODE_1000BASEPX_U: + phylink_set(pl->supported, 1000basePX_U_Full); + break; + case PHY_INTERFACE_MODE_10000BASEPR_D: + phylink_set(pl->supported, 10000basePR_D_Full); + break; + case PHY_INTERFACE_MODE_10000BASEPR_U: + phylink_set(pl->supported, 10000basePR_U_Full); + break; + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_D: + phylink_set(pl->supported, 10000_1000basePRX_D_Full); + break; + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_U: + phylink_set(pl->supported, 10000_1000basePRX_U_Full); + break; + default: phylink_err(pl, "incorrect link mode %s for in-band status\n", @@ -1916,12 +1960,13 @@ * desired link mode(s) and negotiation style. This should be called from the * network device driver's &struct net_device_ops ndo_open() method. */ -void phylink_start(struct phylink *pl) +static void __phylink_start(struct phylink *pl, bool silent) { bool poll = false; ASSERT_RTNL(); + if (!silent) phylink_info(pl, "configuring for %s/%s link mode\n", phylink_an_mode_str(pl->cur_link_an_mode), phy_modes(pl->link_config.interface)); @@ -1976,6 +2021,18 @@ } EXPORT_SYMBOL_GPL(phylink_start); +void phylink_start(struct phylink *pl) +{ + return __phylink_start(pl, false); +} + +void phylink_start_silent(struct phylink *pl) +{ + return __phylink_start(pl, true); +} + +EXPORT_SYMBOL_GPL(phylink_start_silent); + /** * phylink_stop() - stop a phylink instance * @pl: a pointer to a &struct phylink returned from phylink_create() @@ -2946,10 +3003,10 @@ phy_interface_t iface; int ret; - linkmode_copy(support, phy->supported); + linkmode_copy(support, pl->sfp_support); memset(&config, 0, sizeof(config)); - linkmode_copy(config.advertising, phy->advertising); + linkmode_copy(config.advertising, pl->sfp_support); config.interface = PHY_INTERFACE_MODE_NA; config.speed = SPEED_UNKNOWN; config.duplex = DUPLEX_UNKNOWN; @@ -3370,6 +3427,7 @@ case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_QSGMII: + case PHY_INTERFACE_MODE_PSGMII: phylink_decode_sgmii_word(state, lpa); break; case PHY_INTERFACE_MODE_QUSGMII: @@ -3551,6 +3609,121 @@ } EXPORT_SYMBOL_GPL(phylink_mii_c45_pcs_get_state); +/* + * designed to be called from userland to override current link + * interface, used for both testing and to handle SFP from userland. + * + * While it could theoritically be used on phylink instance with a + * phy, phylink_of_phy_connect() or equivalent is called at netdevice + * probe time, so it's too late to override phy_interface, thus we + * restrict this to instances without phydev. + * + * For the same reasons, we don't allow this to be set on instance + * attached to an SFP bus, since the kernel will do the right thing + * when an SFP is plugged. + * + * The an_enabled has to be given because some devices either don't or + * only support autoneg for some interface, so we cannot rely on + * further ethtool call to enable/disable it, both the interface and + * autoneg have to be changed atomically. + */ +int phylink_set_interface(struct phylink *pl, + phy_interface_t interface, + bool an_enabled) +{ + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); + __ETHTOOL_DECLARE_LINK_MODE_MASK(supported1); + struct phylink_link_state config; + bool changed, changed_intf; + int ret; + + if (pl->phydev) + return -ENOTSUPP; + + if (pl->sfp_bus && pl->sfp_port) + return -ENOTSUPP; + + memset(&config, 0, sizeof(config)); + config.interface = PHY_INTERFACE_MODE_NA; + config.speed = SPEED_UNKNOWN; + config.duplex = DUPLEX_UNKNOWN; + config.pause = MLO_PAUSE_AN; + bitmap_fill(supported, __ETHTOOL_LINK_MODE_MASK_NBITS); + linkmode_copy(config.advertising, supported); + + if (!an_enabled) + phylink_clear(config.advertising, Autoneg); + + phylink_validate(pl, supported, &config); + + config.interface = interface; + linkmode_copy(supported1, supported); + + ret = phylink_validate(pl, supported1, &config); + if (ret) { + phylink_err(pl, + "validation of %s/%s with support %*pb failed: %d\n", + phylink_an_mode_str(pl->cfg_link_an_mode), + phy_modes(config.interface), + __ETHTOOL_LINK_MODE_MASK_NBITS, supported, ret); + return ret; + } + + changed = !linkmode_equal(pl->supported, supported1) || + !linkmode_equal(pl->link_config.advertising, + config.advertising); + + if (changed) { + linkmode_copy(pl->supported, supported1); + linkmode_copy(pl->link_config.advertising, config.advertising); + } + + changed_intf = (pl->link_config.interface != config.interface); + + if (changed || changed_intf) { + if (pl->old_link_state) { + phylink_link_down(pl); + pl->old_link_state = false; + } + } + + if (changed_intf) { + pl->link_config.interface = config.interface; + phylink_info(pl, "switched to %s/%s link mode (userland)\n", + phylink_an_mode_str(pl->cur_link_an_mode), + phy_modes(pl->link_config.interface)); + } + + if ((changed || changed_intf) && + !test_bit(PHYLINK_DISABLE_STOPPED, + &pl->phylink_disable_state)) { + cancel_work_sync(&pl->resolve); + phylink_mac_initial_config(pl, false); + phylink_run_resolve(pl); + } + + return 0; + +} + +EXPORT_SYMBOL_GPL(phylink_set_interface); + +/* + * retrieve current interface & mode + */ +void phylink_get_interface(struct phylink *pl, + phy_interface_t *interface, + int *an_en, + int *mode) +{ + *interface = pl->link_config.interface; + *an_en = linkmode_test_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, + pl->link_config.advertising); + *mode = pl->cfg_link_an_mode; +} + +EXPORT_SYMBOL_GPL(phylink_get_interface); + static int __init phylink_init(void) { for (int i = 0; i < ARRAY_SIZE(phylink_sfp_interface_preference); ++i) diff -ruw linux-6.4/drivers/net/phy/realtek.c linux-6.4-fbx/drivers/net/phy/realtek.c --- linux-6.4/drivers/net/phy/realtek.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/realtek.c 2024-04-22 13:40:50.207866561 +0200 @@ -12,6 +12,10 @@ #include #include #include +#include +#include + +#include "realtek.h" #define RTL821x_PHYSR 0x11 #define RTL821x_PHYSR_DUPLEX BIT(13) @@ -72,6 +76,75 @@ #define RTL_GENERIC_PHYID 0x001cc800 #define RTL_8211FVD_PHYID 0x001cc878 +#define RTL8221B_SERDES_OPT_REG 0x697a +#define RTL8221B_SERDES_OPT_MODE_MASK 0x3f +#define RTL8221B_SERDES_OPT_MODE_2G5_SGMII 0x00 +#define RTL8221B_SERDES_OPT_MODE_HISGMII_SGMII 0x01 +#define RTL8221B_SERDES_OPT_MODE_2G5_ONLY 0x02 +#define RTL8221B_SERDES_OPT_MODE_HISGMII_ONLY 0x03 + +#define RTL8221B_SERDES_CTRL3_REG 0x7580 +#define RTL8221B_SERDES_CTRL3_MODE_MASK 0x1f +#define RTL8221B_SERDES_CTRL3_MODE_SGMII 0x02 +#define RTL8221B_SERDES_CTRL3_MODE_HISGMII 0x12 +#define RTL8221B_SERDES_CTRL3_MODE_2G5BX 0x16 +#define RTL8221B_SERDES_CTRL3_MODE_OFF 0x1f + +#define RTL8221B_SERDES_CTRL5_REG 0x7582 +#define RTL8221B_SERDES_CTRL5_FDPX (1 << 2) +#define RTL8221B_SERDES_CTRL5_SPEED_MASK 0x3003 +#define RTL8221B_SERDES_CTRL5_SPEED_10 0x0000 +#define RTL8221B_SERDES_CTRL5_SPEED_100 0x0001 +#define RTL8221B_SERDES_CTRL5_SPEED_1000 0x0002 +#define RTL8221B_SERDES_CTRL5_SPEED_2G5 0x1001 +#define RTL8221B_SERDES_CTRL5_SPEED_2G5LITE 0x1003 + +#define RTL8221B_FEDCR_REG 0xa400 +#define RTL8221B_FEDCR_PCS_LB_EN (1 << 14) + +#define RTL8221B_GBCR_REG 0xa412 +#define RTL8221B_GBCR_ADV_1000BaseT (1 << 9) + +#define RTL8221B_GANLPAR_REG 0xa414 +#define RTL8221B_GANLPAR_LP_1000BaseTFD (1 << 11) +#define RTL8221B_GANLPAR_LP_1000BaseTHD (1 << 10) + +#define RTL8221B_LCR4_REG 0xd036 +#define LCR4_SELECT_2G5 (1 << 5) +#define LCR4_SELECT_1G (1 << 2) +#define LCR4_SELECT_100M (1 << 1) +#define LCR4_SELECT_10M (1 << 0) + +#define RTL8221B_LCR6_REG 0xd040 +#define LCR6_BLINK_FREQ_MASK (0x3 << 8) +#define LCR6_BLINK_FREQ_20MS (0x0 << 8) +#define LCR6_BLINK_FREQ_40MS (0x1 << 8) +#define LCR6_BLINK_FREQ_60MS (0x2 << 8) +#define LCR6_BLINK_PATTERN_MODE_B (0x1 << 5) + +#define RTL8221B_LCR7_REG 0xd044 +#define LCR7_LED_EN_MASK(led) (1 << (4 + (led))) +#define LCR7_LED_POL_HI_MASK(led) (1 << (led)) + +#define RTL8221B_RX_STATS_SELECT_REG 0xc800 +#define RX_STATS_SELECT_UTP 0x5a02 +#define RX_STATS_SELECT_SERDES 0x5a06 + +#define RTL8221B_RX_STATS_CLEAR_REG 0xc802 +#define RX_STATS_CLEAR_VAL 0x0073 + +#define RTL8221B_RX_STATS_GOOD_PKT_LSB 0xc810 +#define RTL8221B_RX_STATS_GOOD_PKT_MSB 0xc812 +#define RTL8221B_RX_STATS_CRC_PKT 0xc814 + +#define RTL8221B_UNKOWN_0xc40a 0xc40a +#define RTL8221B_UNKOWN_0xc466 0xc466 + +#define RTL8211F_LCR_PAGE 0xd04 +#define RTL8211F_LCR_REG 0x10 +#define RTL8211F_LED_MODE_MASK(num) (0x1b << ((num) * 5)) +#define RTL8211F_LED_MODE_SEL(num, mode) ((mode) << ((num) * 5)) + MODULE_DESCRIPTION("Realtek PHY driver"); MODULE_AUTHOR("Johnson Leung"); MODULE_LICENSE("GPL"); @@ -80,6 +153,8 @@ u16 phycr1; u16 phycr2; bool has_phycr2; +#define MAX_LEDS 3 + u8 leds_mode[MAX_LEDS]; }; static int rtl821x_read_page(struct phy_device *phydev) @@ -335,12 +410,27 @@ CTL1000_ENABLE_MASTER | CTL1000_AS_MASTER); } +static void rtl8211f_config_led(struct phy_device *phydev) +{ + struct rtl821x_priv *priv = phydev->priv; + size_t i; + + /* Configure led */ + for (i = 0; i < MAX_LEDS; ++i) { + phy_modify_paged(phydev, RTL8211F_LCR_PAGE, RTL8211F_LCR_REG, + RTL8211F_LED_MODE_MASK(i), + RTL8211F_LED_MODE_SEL(i, priv->leds_mode[i])); + } +} + static int rtl8211f_config_init(struct phy_device *phydev) { struct rtl821x_priv *priv = phydev->priv; struct device *dev = &phydev->mdio.dev; - u16 val_txdly, val_rxdly; int ret; + u16 val_txdly, val_rxdly; + + rtl8211f_config_led(phydev); ret = phy_modify_paged_changed(phydev, 0xa43, RTL8211F_PHYCR1, RTL8211F_ALDPS_PLL_OFF | RTL8211F_ALDPS_ENABLE | RTL8211F_ALDPS_XTAL_OFF, @@ -432,6 +522,70 @@ return 0; } +#ifdef CONFIG_OF_MDIO +static int rtl8211f_dt_led_modes_get(struct phy_device *phydev) +{ + struct device *dev = &phydev->mdio.dev; + struct device_node *of_node = dev->of_node; + struct rtl821x_priv *priv = phydev->priv; + int nr, i, ret; + char *led_dt_prop = "rtl8211f,led-mode"; + uint8_t mode[MAX_LEDS << 1]; + + if (!of_node) + return -ENODEV; + + nr = of_property_read_variable_u8_array(of_node, led_dt_prop, mode, 0, + ARRAY_SIZE(mode)); + + /* nr should be even */ + if (nr & 0x1) + return -EINVAL; + + ret = -EINVAL; + for (i = 0; i < nr; i += 2) { + if (mode[i] >= MAX_LEDS) + goto out; + if ((mode[i + 1] & ~RTL8211F_LED_MODE_MASK(0)) != 0) + goto out; + priv->leds_mode[mode[i]] = mode[i + 1]; + } + + ret = 0; + +out: + return ret; +} + + +#else +static int rtl8211f_dt_led_modes_get(struct phy_device *phydev) +{ + return 0; +} +#endif /* CONFIG_OF_MDIO */ + +static int rtl8211f_probe(struct phy_device *phydev) +{ + struct rtl821x_priv *priv; + int error; + u8 default_mode[MAX_LEDS] = { + [0] = RTL8211F_LED_MODE_10M | RTL8211F_LED_MODE_100M | + RTL8211F_LED_MODE_1000M | RTL8211F_LED_MODE_ACT, + [1] = RTL8211F_LED_MODE_10M | RTL8211F_LED_MODE_100M | + RTL8211F_LED_MODE_1000M, + [2] = RTL8211F_LED_MODE_1000M | RTL8211F_LED_MODE_ACT, + }; + + error = rtl821x_probe(phydev); + if (error) + return error; + + priv = phydev->priv; + memcpy(priv->leds_mode, default_mode, sizeof(priv->leds_mode)); + return rtl8211f_dt_led_modes_get(phydev); +} + static int rtl8211e_config_init(struct phy_device *phydev) { int ret = 0, oldpage; @@ -849,6 +1003,311 @@ return IRQ_HANDLED; } +enum { + RTL8221B_SERDES_STATS_RX_GOOD_PACKETS, + RTL8221B_SERDES_STATS_RX_BAD_CRC_PACKETS, + + RTL8221B_SERDES_STATS_COUNT, +}; + +struct rtl8221b_stat { + u64 v; +}; + +struct rtl8221b_priv { + struct rtl8221b_stat stats[RTL8221B_SERDES_STATS_COUNT]; +}; + +static int rtl8221b_get_sset_count(struct phy_device *phydev) +{ + return RTL8221B_SERDES_STATS_COUNT; +} + +struct rtl8221b_stat_desc { + const char *name; + int reg; + int size; +}; + +enum { + E_STAT_SIZE_U16, + E_STAT_SIZE_U32, +}; + +struct rtl8221b_stat_desc rtl8221b_stats[RTL8221B_SERDES_STATS_COUNT] = { + { + .name = "sgmii_rx_good_frames", + .reg = RTL8221B_RX_STATS_GOOD_PKT_LSB, + .size = E_STAT_SIZE_U32 + }, + { + .name = "sgmii_rx_crc_frames", + .reg = RTL8221B_RX_STATS_CRC_PKT, + .size = E_STAT_SIZE_U16 + }, +}; + +static void rtl8221b_get_strings(struct phy_device *phydev, u8 *data) +{ + size_t i; + + for (i = 0; i < ARRAY_SIZE(rtl8221b_stats); ++i) { + strscpy(data + i * ETH_GSTRING_LEN, rtl8221b_stats[i].name, + ETH_GSTRING_LEN); + } +} + +static void rtl8221b_get_stats(struct phy_device *phydev, + struct ethtool_stats *stats, + u64 *data) +{ + struct rtl8221b_priv *priv = phydev->priv; + size_t i; + + for (i = 0; i < ARRAY_SIZE(rtl8221b_stats); ++i) { + struct rtl8221b_stat_desc *st_desc = &rtl8221b_stats[i]; + struct rtl8221b_stat *st = &priv->stats[i]; + u32 v; + + switch (st_desc->size) { + case E_STAT_SIZE_U16: + default: + v = phy_read_mmd(phydev, MDIO_MMD_VEND2, st_desc->reg); + break; + case E_STAT_SIZE_U32: + v = phy_read_mmd(phydev, MDIO_MMD_VEND2, st_desc->reg) | + (phy_read_mmd(phydev, MDIO_MMD_VEND2, + st_desc->reg + 2) << 16); + break; + } + + st->v += v; + data[i] = st->v; + } + + /* + * FIXME: ask for autoclear feature of counters. clear + * counters explicitely in the mean time. + */ + phy_write_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_RX_STATS_CLEAR_REG, + RX_STATS_CLEAR_VAL); +} + +static int rtl8221b_probe(struct phy_device *phydev) +{ + phydev->priv = devm_kzalloc(&phydev->mdio.dev, + sizeof (struct rtl8221b_priv), GFP_KERNEL); + if (!phydev->priv) + return -ENOMEM; + + return realtek_hwmon_probe(phydev); +} + +static int rtl8221b_config_init(struct phy_device *phydev) +{ + /* + * reset autoneg and PMA/PMD MMD. + */ + phy_set_bits_mmd(phydev, MDIO_MMD_AN, MII_BMCR, BMCR_RESET); + phy_set_bits_mmd(phydev, MDIO_MMD_PMAPMD, MII_BMCR, BMCR_RESET); + + + /* + * configure serdes side of the phy so that its speed is + * chosen depending on the copper side autonegotiation. + */ + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND1, 0x75f3, BIT(0)); + phy_modify_mmd(phydev, MDIO_MMD_VEND1, RTL8221B_SERDES_OPT_REG, + RTL8221B_SERDES_OPT_MODE_MASK, + RTL8221B_SERDES_OPT_MODE_2G5_SGMII); + + /* + * serdes mode change will be considered once copper link goes + * down. make it go down by briefly activating the PCS + * loopback feature. + */ + phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_FEDCR_REG, + RTL8221B_FEDCR_PCS_LB_EN); + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_FEDCR_REG, + RTL8221B_FEDCR_PCS_LB_EN); + + /* + * led configuration: enable only LED 2, active low. + */ + phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_LCR7_REG, + LCR7_LED_EN_MASK(2)); + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_LCR7_REG, + LCR7_LED_POL_HI_MASK(2)); + phy_clear_bits_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_LCR7_REG, + LCR7_LED_EN_MASK(1) | LCR7_LED_EN_MASK(0)); + + /* + * led blink frequency: 60 ms. + */ + phy_modify_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_LCR6_REG, + LCR6_BLINK_FREQ_MASK, LCR6_BLINK_FREQ_60MS); + + /* + * led2 selects all possible speeds + */ + phy_set_bits_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_LCR4_REG, + LCR4_SELECT_10M | LCR4_SELECT_100M | LCR4_SELECT_1G | + LCR4_SELECT_2G5); + + /* + * select SerDes side for RX stats. + */ + phy_write_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_RX_STATS_SELECT_REG, + RX_STATS_SELECT_SERDES); + phy_write_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_RX_STATS_CLEAR_REG, + RX_STATS_CLEAR_VAL); + + return 0; +} + +static int rtl8221b_get_features(struct phy_device *phydev) +{ + int err; + + err = genphy_c45_pma_read_abilities(phydev); + if (err) + return err; + + phy_set_max_speed(phydev, SPEED_2500); + + return 0; +} + +static int rtl8221b_config_aneg(struct phy_device *phydev) +{ + bool changed = false; + int err; + u16 v; + + if (phydev->autoneg == AUTONEG_DISABLE) + return genphy_c45_pma_setup_forced(phydev); + + err = genphy_c45_an_config_aneg(phydev); + if (err < 0) + return err; + changed = (err > 0) || changed; + + if (err > 0) + changed = true; + + /* + * 802.3-C45 doesn't provide a standardised way of advertising + * 1000Base-T support, we have to use use vendor registers for + * this. + */ + v = 0; + if (linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + phydev->advertising) || + linkmode_test_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, + phydev->advertising)) + v |= RTL8221B_GBCR_ADV_1000BaseT; + + err = phy_modify_mmd_changed(phydev, MDIO_MMD_VEND2, RTL8221B_GBCR_REG, + RTL8221B_GBCR_ADV_1000BaseT, v); + if (err < 0) + return err; + changed = (err > 0) || changed; + + return genphy_c45_check_and_restart_aneg(phydev, changed); +} + +static int rtl8221b_read_status(struct phy_device *phydev) +{ + int err; + int v; + bool fdpx; + + if (phydev->autoneg == AUTONEG_ENABLE) { + /* + * 802.3-C45 doesn't provide a standardised way of + * getting LPA 1000Base-T support, we have to use use + * vendor registers for this. + */ + v = phy_read_mmd(phydev, MDIO_MMD_VEND2, RTL8221B_GANLPAR_REG); + if (v < 0) + return v; + } + + linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, + phydev->lp_advertising, + v & RTL8221B_GANLPAR_LP_1000BaseTFD); + linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, + phydev->lp_advertising, + v & RTL8221B_GANLPAR_LP_1000BaseTHD); + + + err = genphy_c45_read_status(phydev); + if (err) + return err; + + + if (!phydev->link || phydev->autoneg == AUTONEG_DISABLE) + return 0; + + /* + * sort out phydev interface depending on the current mode of + * the SERDES on the PHY side. + */ + v = phy_read_mmd(phydev, MDIO_MMD_VEND1, RTL8221B_SERDES_CTRL3_REG); + v &= RTL8221B_SERDES_CTRL3_MODE_MASK; + + switch (v) { + case RTL8221B_SERDES_CTRL3_MODE_SGMII: + phydev->interface = PHY_INTERFACE_MODE_SGMII; + break; + case RTL8221B_SERDES_CTRL3_MODE_2G5BX: + phydev->interface = PHY_INTERFACE_MODE_2500BASEX; + break; + default: + phydev_warn(phydev, "invalid SERDES mode: %u\n", v); + return -EIO; + } + + v = phy_read_mmd(phydev, MDIO_MMD_VEND1, RTL8221B_SERDES_CTRL5_REG); + fdpx = !!(v & RTL8221B_SERDES_CTRL5_FDPX); + v &= RTL8221B_SERDES_CTRL5_SPEED_MASK; + + switch (v) { + case RTL8221B_SERDES_CTRL5_SPEED_2G5: + phydev->speed = SPEED_2500; + break; + case RTL8221B_SERDES_CTRL5_SPEED_1000: + phydev->speed = SPEED_1000; + break; + case RTL8221B_SERDES_CTRL5_SPEED_100: + phydev->speed = SPEED_100; + break; + case RTL8221B_SERDES_CTRL5_SPEED_10: + phydev->speed = SPEED_10; + break; + default: + phydev_warn(phydev, "invalid device speed: %04x\n", v); + } + + /* + * XXX: as recommended by realtek for SerDes RX stats. + */ + if (phydev->speed == 2500) { + phy_write_mmd(phydev, MDIO_MMD_VEND2, + RTL8221B_UNKOWN_0xc40a, 0x0); + phy_write_mmd(phydev, MDIO_MMD_VEND2, + RTL8221B_UNKOWN_0xc466, 0x2); + } else { + phy_write_mmd(phydev, MDIO_MMD_VEND2, + RTL8221B_UNKOWN_0xc40a, 0x0); + phy_write_mmd(phydev, MDIO_MMD_VEND2, + RTL8221B_UNKOWN_0xc466, 0x0); + } + + phydev->duplex = fdpx ? DUPLEX_FULL : DUPLEX_HALF; + return 0; +} + static struct phy_driver realtek_drvs[] = { { PHY_ID_MATCH_EXACT(0x00008201), @@ -922,7 +1381,7 @@ }, { PHY_ID_MATCH_EXACT(0x001cc916), .name = "RTL8211F Gigabit Ethernet", - .probe = rtl821x_probe, + .probe = &rtl8211f_probe, .config_init = &rtl8211f_config_init, .read_status = rtlgen_read_status, .config_intr = &rtl8211f_config_intr, @@ -998,6 +1457,7 @@ .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, }, { +#if 0 PHY_ID_MATCH_EXACT(0x001cc849), .name = "RTL8221B-VB-CG 2.5Gbps PHY", .get_features = rtl822x_get_features, @@ -1008,6 +1468,7 @@ .read_page = rtl821x_read_page, .write_page = rtl821x_write_page, }, { +#endif PHY_ID_MATCH_EXACT(0x001cc84a), .name = "RTL8221B-VM-CG 2.5Gbps PHY", .get_features = rtl822x_get_features, @@ -1051,6 +1512,19 @@ .handle_interrupt = genphy_handle_interrupt_no_ack, .suspend = genphy_suspend, .resume = genphy_resume, + }, { + PHY_ID_MATCH_EXACT(0x001cc849), + .name = "RTL8221B 2.5 Gigabit Ethernet", + .probe = rtl8221b_probe, + .config_init = rtl8221b_config_init, + .suspend = genphy_suspend, + .resume = genphy_resume, + .config_aneg = rtl8221b_config_aneg, + .read_status = rtl8221b_read_status, + .get_features = rtl8221b_get_features, + .get_sset_count = rtl8221b_get_sset_count, + .get_strings = rtl8221b_get_strings, + .get_stats = rtl8221b_get_stats, }, }; diff -ruw linux-6.4/drivers/net/phy/sfp.h linux-6.4-fbx/drivers/net/phy/sfp.h --- linux-6.4/drivers/net/phy/sfp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/sfp.h 2024-04-22 13:40:50.207866561 +0200 @@ -25,6 +25,7 @@ int (*module_eeprom_by_page)(struct sfp *sfp, const struct ethtool_module_eeprom *page, struct netlink_ext_ack *extack); + int (*get_sfp_state)(struct sfp *sfp, struct ethtool_sfp_state *st); }; int sfp_add_phy(struct sfp_bus *bus, struct phy_device *phydev); diff -ruw linux-6.4/drivers/net/phy/swphy.c linux-6.4-fbx/drivers/net/phy/swphy.c --- linux-6.4/drivers/net/phy/swphy.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/phy/swphy.c 2023-03-09 15:06:11.372234439 +0100 @@ -29,6 +29,7 @@ SWMII_SPEED_10 = 0, SWMII_SPEED_100, SWMII_SPEED_1000, + SWMII_SPEED_2500, SWMII_DUPLEX_HALF = 0, SWMII_DUPLEX_FULL, }; @@ -51,6 +52,10 @@ .lpagb = LPA_1000FULL | LPA_1000HALF, .estat = ESTATUS_1000_TFULL | ESTATUS_1000_THALF, }, + [SWMII_SPEED_2500] = { + .bmsr = BMSR_ESTATEN, + .lpagb = LPA_1000FULL | LPA_1000HALF, + }, }; static const struct swmii_regs duplex[] = { @@ -71,6 +76,8 @@ static int swphy_decode_speed(int speed) { switch (speed) { + case 2500: + return SWMII_SPEED_2500; case 1000: return SWMII_SPEED_1000; case 100: diff -ruw linux-6.4/drivers/net/tun.c linux-6.4-fbx/drivers/net/tun.c --- linux-6.4/drivers/net/tun.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/tun.c 2024-04-22 13:40:50.215866779 +0200 @@ -77,6 +77,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -163,6 +167,31 @@ unsigned long updated ____cacheline_aligned_in_smp; }; +/* + * smalltun definitions + */ +#define SMALLTUN_MAGIC 0x6660 +#define SMALLTUN_VERSION 0x1 + +#define TYPE_MASK 0xf +#define TYPE_CLT (1 << 3) + +#define TYPE_TRIGGER 0x0 +#define TYPE_CHALLENGE 0x1 +#define TYPE_CLIENT_HELLO 0x2 +#define TYPE_SERVER_HELLO 0x3 + +#define TYPE_CLT_DATA (TYPE_CLT | 0x0) +#define TYPE_CLT_GET_PARAMS (TYPE_CLT | 0x1) +#define TYPE_CLT_PARAMS (TYPE_CLT | 0x2) + +struct smalltun_pkt_hdr { + u16 magic; + u8 version; + u8 flag_type; + u8 data[0]; +}; + #define TUN_NUM_FLOW_ENTRIES 1024 #define TUN_MASK_FLOW_ENTRIES (TUN_NUM_FLOW_ENTRIES - 1) @@ -182,6 +211,11 @@ kuid_t owner; kgid_t group; + struct smalltun_fp smalltun_fps[4]; + unsigned int smalltun_valid_count; + unsigned int smalltun_valid[4]; + struct rtable *smalltun_rt_cache[4]; + struct net_device *dev; netdev_features_t set_features; #define TUN_USER_FEATURES (NETIF_F_HW_CSUM|NETIF_F_TSO_ECN|NETIF_F_TSO| \ @@ -1035,6 +1069,184 @@ return 0; } +static int smalltun_is_fastpath(struct tun_struct *tun, + struct sk_buff *skb) +{ + struct iphdr *iph; + const struct smalltun_fp *fp; + struct rtable **prt_cache, *rt_cache; + struct flowi4 fl; + bool match; + size_t i; + + if (!tun->smalltun_valid_count) + return 0; + + if (skb->protocol != htons(ETH_P_IP)) + return 0; + + if (!pskb_may_pull(skb, sizeof(struct iphdr))) + return 0; + + iph = ip_hdr(skb); + + /* lookup smalltun fastpath */ + fp = NULL; + rt_cache = NULL; + for (i = 0; i < ARRAY_SIZE(tun->smalltun_fps); i++) { + if (!tun->smalltun_valid[i]) + continue; + + if (iph->daddr == tun->smalltun_fps[i].inner_dst) { + fp = &tun->smalltun_fps[i]; + prt_cache = &tun->smalltun_rt_cache[i]; + break; + } + } + + if (!fp) + return 0; + + if (fp->af != AF_INET) { + /* FIXME: implement IPv6 transport */ + return 0; + } + + if (!pskb_may_pull(skb, iph->ihl * 4)) + return 0; + + match = false; + for (i = 0; i < fp->rule_count; i++) { + const struct smalltun_rule *r = &fp->rules[i]; + unsigned int sport, dport; + + if (iph->protocol != r->proto) + continue; + + switch (iph->protocol) { + case IPPROTO_UDP: + { + const struct udphdr *udp; + udp = (struct udphdr *)((u8 *)iph + (iph->ihl << 2)); + sport = ntohs(udp->source); + dport = ntohs(udp->dest); + break; + } + case IPPROTO_TCP: + { + const struct tcphdr *tcp; + tcp = (struct tcphdr *)((u8 *)iph + (iph->ihl << 2)); + sport = ntohs(tcp->source); + dport = ntohs(tcp->dest); + break; + } + default: + match = true; + break; + } + + if (match) + break; + + if (r->src_port_start && r->src_port_end) { + if (sport < ntohs(r->src_port_start) || + sport > ntohs(r->src_port_end)) + continue; + } + + if (r->dst_port_start && r->dst_port_end) { + if (dport < ntohs(r->dst_port_start) || + dport > ntohs(r->dst_port_end)) + continue; + } + match = true; + } + + if (!match) + return 0; + + if (fp->af == AF_INET) { + struct iphdr *oiph; + struct udphdr *oudph; + struct smalltun_pkt_hdr *pkt; + unsigned int payload_len; + + payload_len = skb->len; + + if (skb_cow_head(skb, + sizeof (struct iphdr) + + sizeof (struct udphdr) + + sizeof (struct smalltun_pkt_hdr))) + return 0; + + pkt = skb_push(skb, sizeof (struct smalltun_pkt_hdr)); + oudph = skb_push(skb, sizeof (struct udphdr)); + skb_reset_transport_header(skb); + oiph = skb_push(skb, sizeof (struct iphdr)); + skb_reset_network_header(skb); + + /* ip */ + oiph->version = 4; + oiph->tos = 0; + oiph->id = 0; + oiph->ihl = 5; + oiph->frag_off = 0; + oiph->ttl = 64; + oiph->protocol = IPPROTO_UDP; + memcpy(&oiph->saddr, fp->outer_src, 4); + memcpy(&oiph->daddr, fp->outer_dst, 4); + + /* udp */ + oudph->source = fp->outer_src_port; + oudph->dest = fp->outer_dst_port; + oudph->len = htons(payload_len + sizeof (*oudph) + + sizeof (*pkt)); + oudph->check = 0; + + /* smalltun */ + pkt->magic = htons(SMALLTUN_MAGIC); + pkt->version = SMALLTUN_VERSION; + pkt->flag_type = TYPE_CLT_DATA; + + memset(&fl, 0x00, sizeof (fl)); + memcpy(&fl.saddr, fp->outer_src, 4); + memcpy(&fl.daddr, fp->outer_dst, 4); + + if (*prt_cache && (*prt_cache)->dst.obsolete > 0) { + rt_cache = *prt_cache; + *prt_cache = NULL; + ip_rt_put(rt_cache); + } + + rt_cache = *prt_cache; + if (!rt_cache) { + rt_cache = ip_route_output_key(&init_net, &fl); + if (IS_ERR(rt_cache)) { + pr_err("ip_route_output_key(%pI4): %li\n", + &fl.daddr, PTR_ERR(rt_cache)); + return 0; + } + + if (!rt_cache->dst.dev) { + pr_err("ip_route_output_key(%pI4): no dev\n", + &fl.daddr); + return 0; + } + + *prt_cache = rt_cache; + } + + skb_dst_set(skb, dst_clone(&rt_cache->dst)); + skb->dev = skb_dst(skb)->dev; + ip_local_out(&init_net, NULL, skb); + return 1; + } + + /* find route */ + + return 0; +} + /* Net device start xmit */ static void tun_automq_xmit(struct tun_struct *tun, struct sk_buff *skb) { @@ -1127,6 +1339,11 @@ */ skb_orphan(skb); + if (smalltun_is_fastpath(tun, skb)) { + rcu_read_unlock(); + return NETDEV_TX_OK; + } + nf_reset_ct(skb); if (ptr_ring_produce(&tfile->tx_ring, skb)) { @@ -3377,6 +3594,104 @@ ret = open_related_ns(&net->ns, get_net_ns); break; + case TUNSMALLTUNSETFP: + { + struct smalltun_fp fp; + unsigned int i; + int free_idx; + + ret = -EFAULT; + if (copy_from_user(&fp, argp, sizeof(fp))) + break; + + /* look for duplicate */ + ret = 0; + free_idx = -1; + for (i = 0; i < ARRAY_SIZE(tun->smalltun_fps); i++) { + if (!tun->smalltun_valid[i]) { + if (free_idx == -1) + free_idx = i; + continue; + } + + if (fp.inner_src == tun->smalltun_fps[i].inner_src && + fp.inner_dst == tun->smalltun_fps[i].inner_dst) { + ret = -EEXIST; + break; + } + } + + if (ret) + break; + + if (free_idx == -1) { + ret = -ENOSPC; + break; + } + + memcpy(&tun->smalltun_fps[free_idx], &fp, sizeof (fp)); + tun->smalltun_valid[free_idx] = 1; + tun->smalltun_valid_count++; + netif_info(tun, tx_queued, tun->dev, + "new fp rule for %pI4 <=> %pI4 (%u rules)\n", + &fp.inner_src, + &fp.inner_dst, + fp.rule_count); + + if (fp.af == AF_INET) { + netif_info(tun, tx_queued, tun->dev, + "outer %pI4:%u <=> %pI4:%u\n", + fp.outer_src, + ntohs(fp.outer_src_port), + fp.outer_dst, + ntohs(fp.outer_dst_port)); + } else { + netif_info(tun, tx_queued, tun->dev, + "outer %pI6:%u <=> %pI6:%u\n", + fp.outer_src, + ntohs(fp.outer_src_port), + fp.outer_dst, + ntohs(fp.outer_dst_port)); + } + break; + } + + case TUNSMALLTUNDELFP: + { + struct smalltun_fp fp; + unsigned int i; + + ret = -EFAULT; + if (copy_from_user(&fp, argp, sizeof(fp))) + break; + + /* lookup */ + ret = -ENOENT; + for (i = 0; i < ARRAY_SIZE(tun->smalltun_fps); i++) { + if (fp.inner_src == tun->smalltun_fps[i].inner_src && + fp.inner_dst == tun->smalltun_fps[i].inner_dst) { + ret = 0; + break; + } + } + + if (ret) + break; + + tun->smalltun_valid[i] = 0; + tun->smalltun_valid_count--; + if (tun->smalltun_rt_cache[i]) { + ip_rt_put(tun->smalltun_rt_cache[i]); + tun->smalltun_rt_cache[i] = NULL; + } + + netif_info(tun, tx_queued, tun->dev, + "removed fp rule for %pI4 <=> %pI4\n", + &fp.inner_src, + &fp.inner_dst); + break; + } + default: ret = -EINVAL; break; diff -ruw linux-6.4/drivers/net/usb/r8152.c linux-6.4-fbx/drivers/net/usb/r8152.c --- linux-6.4/drivers/net/usb/r8152.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/usb/r8152.c 2024-04-22 13:40:50.223866998 +0200 @@ -27,6 +27,7 @@ #include #include #include +#include /* Information for net-next */ #define NETNEXT_VERSION "12" diff -ruw linux-6.4/drivers/net/wireguard/device.c linux-6.4-fbx/drivers/net/wireguard/device.c --- linux-6.4/drivers/net/wireguard/device.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireguard/device.c 2024-04-22 13:40:50.235867326 +0200 @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff -ruw linux-6.4/drivers/net/wireless/ath/Kconfig linux-6.4-fbx/drivers/net/wireless/ath/Kconfig --- linux-6.4/drivers/net/wireless/ath/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/Kconfig 2024-04-22 13:40:50.239867435 +0200 @@ -37,6 +37,9 @@ This option enables tracepoints for atheros wireless drivers. Currently, ath9k makes use of this facility. +config ATH_REG_IGNORE + bool "ignore all eeprom regulation" + config ATH_REG_DYNAMIC_USER_REG_HINTS bool "Atheros dynamic user regulatory hints" depends on CFG80211_CERTIFICATION_ONUS diff -ruw linux-6.4/drivers/net/wireless/ath/ath.h linux-6.4-fbx/drivers/net/wireless/ath/ath.h --- linux-6.4/drivers/net/wireless/ath/ath.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath.h 2024-04-22 13:40:50.239867435 +0200 @@ -47,6 +47,7 @@ u32 rx_busy; u32 rx_frame; u32 tx_frame; + u32 rx_bss_frame; }; enum ath_device_state { @@ -186,6 +187,8 @@ int last_rssi; struct ieee80211_supported_band sbands[NUM_NL80211_BANDS]; + + int dfs_pulse_valid_diff_ts; }; static inline const struct ath_ps_ops *ath_ps_ops(struct ath_common *common) diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/core.c linux-6.4-fbx/drivers/net/wireless/ath/ath10k/core.c --- linux-6.4/drivers/net/wireless/ath/ath10k/core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/core.c 2024-04-22 13:40:50.239867435 +0200 @@ -83,8 +83,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -95,6 +94,7 @@ .hw_filter_reset_required = true, .fw_diag_ce_download = false, .credit_size_workaround = false, + .uart_pin_workaround = true, .tx_stats_over_pktlog = true, .dynamic_sar_support = false, .hw_restart_disconnect = false, @@ -123,8 +123,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -164,8 +163,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -240,8 +238,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -280,8 +277,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -320,8 +316,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -363,8 +358,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -410,8 +404,7 @@ .decap_align_bytes = 1, .spectral_bin_discard = 4, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 11, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -463,8 +456,9 @@ /* Can do only 2x2 VHT160 or 80+80. 1560Mbps is 4x4 80Mhz * or 2x2 160Mhz, long-guard-interval. */ - .vht160_mcs_rx_highest = 1560, - .vht160_mcs_tx_highest = 1560, + .vht_need_ext_nss = true, + .vht_over_supp_chan_width = 0, + .vht_over_ext_nss_bw = 2, .n_cipher_suites = 11, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -513,8 +507,9 @@ /* Can do only 1x1 VHT160 or 80+80. 780Mbps is 2x2 80Mhz or * 1x1 160Mhz, long-guard-interval. */ - .vht160_mcs_rx_highest = 780, - .vht160_mcs_tx_highest = 780, + .vht_need_ext_nss = true, + .vht_over_supp_chan_width = 0, + .vht_over_ext_nss_bw = 2, .n_cipher_suites = 11, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -553,8 +548,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -595,8 +589,7 @@ .decap_align_bytes = 4, .spectral_bin_discard = 0, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 8, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -675,8 +668,7 @@ .decap_align_bytes = 1, .spectral_bin_discard = 4, .spectral_bin_offset = 0, - .vht160_mcs_rx_highest = 0, - .vht160_mcs_tx_highest = 0, + .vht_need_ext_nss = false, .n_cipher_suites = 11, .ast_skid_limit = 0x10, .num_wds_entries = 0x20, @@ -1241,6 +1233,7 @@ static int ath10k_fetch_cal_file(struct ath10k *ar) { char filename[100]; + unsigned int i; /* pre-cal--.bin */ scnprintf(filename, sizeof(filename), "pre-cal-%s-%s.bin", @@ -1254,6 +1247,11 @@ scnprintf(filename, sizeof(filename), "cal-%s-%s.bin", ath10k_bus_str(ar->hif.bus), dev_name(ar->dev)); + for (i = 0; filename[i]; i++) { + if (filename[i] == ':') + filename[i] = '_'; + } + ar->cal_file = ath10k_fetch_fw_file(ar, ATH10K_FW_DIR, filename); if (IS_ERR(ar->cal_file)) /* calibration file is optional, don't print any warnings */ @@ -1465,6 +1463,7 @@ const char *boardname, const char *fallback_boardname1, const char *fallback_boardname2, + const char *pci_boardname, const char *filename) { size_t len, magic_len; @@ -1509,7 +1508,11 @@ data += magic_len; len -= magic_len; - /* attempt to find boardname in the IE list */ + /* attempt to find pci_boardname in the IE list */ + ret = ath10k_core_search_bd(ar, pci_boardname, data, len); + + /* if we didn't find it try board name that */ + if (ret == -ENOENT) ret = ath10k_core_search_bd(ar, boardname, data, len); /* if we didn't find it and have a fallback name, try that */ @@ -1521,8 +1524,8 @@ if (ret == -ENOENT) { ath10k_err(ar, - "failed to fetch board data for %s from %s/%s\n", - boardname, ar->hw_params.fw.dir, filename); + "failed to fetch board data for %s or %s from %s/%s\n", + boardname, pci_boardname, ar->hw_params.fw.dir, filename); ret = -ENODATA; } @@ -1538,7 +1541,8 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name, size_t name_len, bool with_variant, - bool with_chip_id) + bool with_chip_id, + bool force_pci_id) { /* strlen(',variant=') + strlen(ar->id.bdf_ext) */ char variant[9 + ATH10K_SMBIOS_BDF_EXT_STR_LENGTH] = { 0 }; @@ -1547,7 +1551,7 @@ scnprintf(variant, sizeof(variant), ",variant=%s", ar->id.bdf_ext); - if (ar->id.bmi_ids_valid) { + if (ar->id.bmi_ids_valid && !force_pci_id) { scnprintf(name, name_len, "bus=%s,bmi-chip-id=%d,bmi-board-id=%d%s", ath10k_bus_str(ar->hif.bus), @@ -1556,7 +1560,7 @@ goto out; } - if (ar->id.qmi_ids_valid) { + if (ar->id.qmi_ids_valid && !force_pci_id) { if (with_chip_id) scnprintf(name, name_len, "bus=%s,qmi-board-id=%x,qmi-chip-id=%x%s", @@ -1601,14 +1605,15 @@ int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type) { - char boardname[100], fallback_boardname1[100], fallback_boardname2[100]; + char boardname[100], fallback_boardname1[100], fallback_boardname2[100], + pci_boardname[100]; int ret; if (bd_ie_type == ATH10K_BD_IE_BOARD) { /* With variant and chip id */ ret = ath10k_core_create_board_name(ar, boardname, sizeof(boardname), true, - true); + true, false); if (ret) { ath10k_err(ar, "failed to create board name: %d", ret); return ret; @@ -1617,7 +1622,7 @@ /* Without variant and only chip-id */ ret = ath10k_core_create_board_name(ar, fallback_boardname1, sizeof(boardname), false, - true); + true, false); if (ret) { ath10k_err(ar, "failed to create 1st fallback board name: %d", ret); @@ -1627,12 +1632,20 @@ /* Without variant and without chip-id */ ret = ath10k_core_create_board_name(ar, fallback_boardname2, sizeof(boardname), false, - false); + false, false); if (ret) { ath10k_err(ar, "failed to create 2nd fallback board name: %d", ret); return ret; } + + ret = ath10k_core_create_board_name(ar, pci_boardname, + sizeof(pci_boardname), + false, false, true); + if (ret) { + ath10k_err(ar, "failed to create pci board name: %d", ret); + return ret; + } } else if (bd_ie_type == ATH10K_BD_IE_BOARD_EXT) { ret = ath10k_core_create_eboard_name(ar, boardname, sizeof(boardname)); @@ -1646,6 +1659,7 @@ ret = ath10k_core_fetch_board_data_api_n(ar, boardname, fallback_boardname1, fallback_boardname2, + pci_boardname, ATH10K_BOARD_API2_FILE); if (!ret) goto success; @@ -2540,6 +2554,7 @@ switch (ar->state) { case ATH10K_STATE_ON: + case ATH10K_STATE_PRE_ON: ar->state = ATH10K_STATE_RESTARTING; ath10k_halt(ar); ath10k_scan_finish(ar); diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/core.h linux-6.4-fbx/drivers/net/wireless/ath/ath10k/core.h --- linux-6.4/drivers/net/wireless/ath/ath10k/core.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/core.h 2024-04-22 13:40:50.239867435 +0200 @@ -698,10 +698,12 @@ void *cal_data; u32 enable_extd_tx_stats; u8 fw_dbglog_mode; + u32 burst_dur[4]; }; enum ath10k_state { ATH10K_STATE_OFF = 0, + ATH10K_STATE_PRE_ON, ATH10K_STATE_ON, /* When doing firmware recovery the device is first powered down. @@ -1018,6 +1020,7 @@ void *vaddr; } msa; u8 mac_addr[ETH_ALEN]; + const char *fem_name; enum ath10k_hw_rev hw_rev; u16 dev_id; @@ -1203,6 +1206,8 @@ struct work_struct restart_work; struct work_struct bundle_tx_work; struct work_struct tx_complete_work; + struct work_struct powerup_work; + bool powerup_pending; /* cycle count is reported twice for each visited channel during scan. * access protected by data_lock diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/debug.c linux-6.4-fbx/drivers/net/wireless/ath/ath10k/debug.c --- linux-6.4/drivers/net/wireless/ath/ath10k/debug.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/debug.c 2024-04-22 13:40:50.243867544 +0200 @@ -2513,6 +2513,79 @@ .llseek = default_llseek, }; +static ssize_t ath10k_write_burst_dur(struct file *file, const char __user *user_buf, + size_t count, loff_t *ppos) +{ + + struct ath10k *ar = file->private_data; + u32 dur[4]; + int ret; + int ac; + char buf[128]; + + simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count); + + /* make sure that buf is null terminated */ + buf[sizeof(buf) - 1] = 0; + + ret = sscanf(buf, "%u %u %u %u", &dur[0], &dur[1], &dur[2], &dur[3]); + + if (!ret) + return -EINVAL; + + mutex_lock(&ar->conf_mutex); + + if (ar->state != ATH10K_STATE_ON && + ar->state != ATH10K_STATE_RESTARTED) { + ret = -ENETDOWN; + goto exit; + } + + for (ac = 0; ac < 4; ac++) { + if (dur[ac] < MIN_BURST_DUR || dur[ac] > MAX_BURST_DUR) { + ret = -EINVAL; + goto exit; + } + + ret = ath10k_wmi_pdev_set_param(ar, ar->wmi.pdev_param->aggr_burst, + (SM(ac, ATH10K_AGGR_BURST_AC) | + SM(dur[ac], ATH10K_AGGR_BURST_DUR))); + if (ret) { + ath10k_warn(ar, "failed to set aggr burst duration for ac %d: %d\n", ac, ret); + goto exit; + } + ar->debug.burst_dur[ac] = dur[ac]; + } + + ret = count; + +exit: + mutex_unlock(&ar->conf_mutex); + return ret; +} + +static ssize_t ath10k_read_burst_dur(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath10k *ar = file->private_data; + int len = 0; + char buf[128]; + + len = scnprintf(buf, sizeof(buf) - len, "%u %u %u %u\n", + ar->debug.burst_dur[0], ar->debug.burst_dur[1], + ar->debug.burst_dur[2], ar->debug.burst_dur[3]); + + return simple_read_from_buffer(user_buf, count, ppos, buf, len); +} + +static const struct file_operations fops_burst_dur = { + .read = ath10k_read_burst_dur, + .write = ath10k_write_burst_dur, + .open = simple_open, + .owner = THIS_MODULE, + .llseek = default_llseek, +}; + int ath10k_debug_create(struct ath10k *ar) { ar->debug.cal_data = vzalloc(ATH10K_DEBUG_CAL_DATA_LEN); @@ -2600,6 +2673,9 @@ debugfs_create_file("ani_enable", 0600, ar->debug.debugfs_phy, ar, &fops_ani_enable); + debugfs_create_file("burst_dur", S_IRUSR | S_IWUSR, + ar->debug.debugfs_phy, ar, &fops_burst_dur); + if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) { debugfs_create_file("dfs_simulate_radar", 0200, ar->debug.debugfs_phy, ar, &fops_simulate_radar); diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/debug.h linux-6.4-fbx/drivers/net/wireless/ath/ath10k/debug.h --- linux-6.4/drivers/net/wireless/ath/ath10k/debug.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/debug.h 2023-02-27 20:52:16.423384193 +0100 @@ -81,6 +81,15 @@ __printf(2, 3) void ath10k_err(struct ath10k *ar, const char *fmt, ...); __printf(2, 3) void ath10k_warn(struct ath10k *ar, const char *fmt, ...); +#define ATH10K_AGGR_BURST_AC_MASK 0xff000000 +#define ATH10K_AGGR_BURST_AC_LSB 24 +#define ATH10K_AGGR_BURST_DUR_MASK 0x00ffffff +#define ATH10K_AGGR_BURST_DUR_LSB 0 + +/* burst duration in usec */ +#define MIN_BURST_DUR 0 +#define MAX_BURST_DUR 8000 + void ath10k_debug_print_hwfw_info(struct ath10k *ar); void ath10k_debug_print_board_info(struct ath10k *ar); void ath10k_debug_print_boot_info(struct ath10k *ar); diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/hw.h linux-6.4-fbx/drivers/net/wireless/ath/ath10k/hw.h --- linux-6.4/drivers/net/wireless/ath/ath10k/hw.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/hw.h 2024-04-22 13:40:50.243867544 +0200 @@ -579,11 +579,14 @@ /* Number of bytes to be discarded for each FFT sample */ int spectral_bin_discard; - /* The board may have a restricted NSS for 160 or 80+80 vs what it - * can do for 80Mhz. + /* The board may have a restricted NSS for 160 or 80+80 vs + * what it can do for 80Mhz. To handle this, we have to use + * Extended NSS support and overrides VHT capabilities from + * firmware */ - int vht160_mcs_rx_highest; - int vht160_mcs_tx_highest; + bool vht_need_ext_nss; + u32 vht_over_supp_chan_width; + u32 vht_over_ext_nss_bw; /* Number of ciphers supported (i.e First N) in cipher_suites array */ int n_cipher_suites; diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/mac.c linux-6.4-fbx/drivers/net/wireless/ath/ath10k/mac.c --- linux-6.4/drivers/net/wireless/ath/ath10k/mac.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/mac.c 2024-04-22 13:40:50.247867654 +0200 @@ -2524,30 +2524,6 @@ return tx_mcs_set; } -static u32 get_160mhz_nss_from_maxrate(int rate) -{ - u32 nss; - - switch (rate) { - case 780: - nss = 1; - break; - case 1560: - nss = 2; - break; - case 2106: - nss = 3; /* not support MCS9 from spec*/ - break; - case 3120: - nss = 4; - break; - default: - nss = 1; - } - - return nss; -} - static void ath10k_peer_assoc_h_vht(struct ath10k *ar, struct ieee80211_vif *vif, struct ieee80211_sta *sta, @@ -2555,13 +2531,16 @@ { const struct ieee80211_sta_vht_cap *vht_cap = &sta->deflink.vht_cap; struct ath10k_vif *arvif = (void *)vif->drv_priv; - struct ath10k_hw_params *hw = &ar->hw_params; + enum ieee80211_vht_chanwidth bw; struct cfg80211_chan_def def; enum nl80211_band band; const u16 *vht_mcs_mask; u8 ampdu_factor; - u8 max_nss, vht_mcs; - int i; + u8 rx_nss; + struct ieee80211_vht_cap ieee_vht_cap = { + .vht_cap_info = cpu_to_le32(vht_cap->cap), + .supp_mcs = vht_cap->vht_mcs, + }; if (WARN_ON(ath10k_mac_vif_chan(vif, &def))) return; @@ -2604,15 +2583,20 @@ /* Calculate peer NSS capability from VHT capabilities if STA * supports VHT. */ - for (i = 0, max_nss = 0, vht_mcs = 0; i < NL80211_VHT_NSS_MAX; i++) { - vht_mcs = __le16_to_cpu(vht_cap->vht_mcs.rx_mcs_map) >> - (2 * i) & 3; - - if ((vht_mcs != IEEE80211_VHT_MCS_NOT_SUPPORTED) && - vht_mcs_mask[i]) - max_nss = i + 1; + switch (arg->peer_phymode) { + case MODE_11AC_VHT160: + bw = IEEE80211_VHT_CHANWIDTH_160MHZ; + break; + case MODE_11AC_VHT80_80: + bw = IEEE80211_VHT_CHANWIDTH_80P80MHZ; + break; + default: + bw = IEEE80211_VHT_CHANWIDTH_80MHZ; + break; } - arg->peer_num_spatial_streams = min(sta->deflink.rx_nss, max_nss); + + rx_nss = ieee80211_get_vht_max_nss(&ieee_vht_cap, bw, 0, true, 0); + arg->peer_num_spatial_streams = rx_nss; arg->peer_vht_rates.rx_max_rate = __le16_to_cpu(vht_cap->vht_mcs.rx_highest); arg->peer_vht_rates.rx_mcs_set = @@ -2627,20 +2611,6 @@ */ if (arg->peer_phymode == MODE_11AC_VHT160 || arg->peer_phymode == MODE_11AC_VHT80_80) { - u32 rx_nss; - u32 max_rate; - - max_rate = arg->peer_vht_rates.rx_max_rate; - rx_nss = get_160mhz_nss_from_maxrate(max_rate); - - if (rx_nss == 0) - rx_nss = arg->peer_num_spatial_streams; - else - rx_nss = min(arg->peer_num_spatial_streams, rx_nss); - - max_rate = hw->vht160_mcs_tx_highest; - rx_nss = min(rx_nss, get_160mhz_nss_from_maxrate(max_rate)); - arg->peer_bw_rxnss_override = FIELD_PREP(WMI_PEER_NSS_MAP_ENABLE, 1) | FIELD_PREP(WMI_PEER_NSS_160MHZ_MASK, (rx_nss - 1)); @@ -4904,14 +4874,18 @@ vht_cap.vht_mcs.tx_mcs_map = cpu_to_le16(mcs_map); /* If we are supporting 160Mhz or 80+80, then the NIC may be able to do - * a restricted NSS for 160 or 80+80 vs what it can do for 80Mhz. Give - * user-space a clue if that is the case. + * a restricted NSS for 160 or 80+80 vs what it can do for 80Mhz. */ if ((vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) && - (hw->vht160_mcs_rx_highest != 0 || - hw->vht160_mcs_tx_highest != 0)) { - vht_cap.vht_mcs.rx_highest = cpu_to_le16(hw->vht160_mcs_rx_highest); - vht_cap.vht_mcs.tx_highest = cpu_to_le16(hw->vht160_mcs_tx_highest); + hw->vht_need_ext_nss) { + vht_cap.cap &= ~(IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK | + IEEE80211_VHT_CAP_EXT_NSS_BW_MASK); + vht_cap.cap |= hw->vht_over_supp_chan_width << + IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_SHIFT; + vht_cap.cap |= hw->vht_over_ext_nss_bw << + IEEE80211_VHT_CAP_EXT_NSS_BW_SHIFT; + vht_cap.vht_mcs.tx_highest |= + cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE); } return vht_cap; @@ -5064,13 +5038,18 @@ const char *fem_name; int ret; + if (ar->fem_name) + fem_name = ar->fem_name; + else { node = ar->dev->of_node; if (!node) return -ENOENT; - ret = of_property_read_string_index(node, "ext-fem-name", 0, &fem_name); + ret = of_property_read_string_index(node, "ext-fem-name", + 0, &fem_name); if (ret) return -ENOENT; + } /* * If external Front End module used in hardware, then default base band timing @@ -5146,12 +5125,83 @@ return 0; } +static int ath10k_get_powered(struct ieee80211_hw *hw, bool *up, bool *busy) +{ + struct ath10k *ar = hw->priv; + *up = (ar->state == ATH10K_STATE_ON || + ar->state == ATH10K_STATE_PRE_ON); + *busy = ar->powerup_pending; + return 0; +} + +static int ath10k_set_powered(struct ieee80211_hw *hw) +{ + struct ath10k *ar = hw->priv; + + switch (ar->state) { + case ATH10K_STATE_OFF: + case ATH10K_STATE_PRE_ON: + break; + default: + return 0; + } + + if (ar->powerup_pending) + return 0; + + queue_work(ar->workqueue, &ar->powerup_work); + ar->powerup_pending = true; + return 0; +} + +static void ath10k_powerup_work(struct work_struct *work) +{ + struct ath10k *ar = container_of(work, struct ath10k, powerup_work); + int ret; + + mutex_lock(&ar->conf_mutex); + + if (ar->state != ATH10K_STATE_OFF) { + mutex_unlock(&ar->conf_mutex); + return; + } + + ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); + if (ret) { + ath10k_err(ar, "Could not init hif: %d\n", ret); + goto err_off; + } + + ret = ath10k_core_start(ar, ATH10K_FIRMWARE_MODE_NORMAL, + &ar->normal_mode_fw); + if (ret) { + ath10k_err(ar, "Could not init core: %d\n", ret); + goto err_power_down; + } + + ar->state = ATH10K_STATE_PRE_ON; + ar->powerup_pending = false; + mutex_unlock(&ar->conf_mutex); + return; + +err_power_down: + ath10k_hif_power_down(ar); + +err_off: + ar->state = ATH10K_STATE_OFF; + + ar->powerup_pending = false; + mutex_unlock(&ar->conf_mutex); + return; +} + static int ath10k_start(struct ieee80211_hw *hw) { struct ath10k *ar = hw->priv; u32 param; int ret = 0; struct wmi_bb_timing_cfg_arg bb_timing = {0}; + bool skip_core_start = false; /* * This makes sense only when restarting hw. It is harmless to call @@ -5166,6 +5216,10 @@ case ATH10K_STATE_OFF: ar->state = ATH10K_STATE_ON; break; + case ATH10K_STATE_PRE_ON: + skip_core_start = true; + ar->state = ATH10K_STATE_ON; + break; case ATH10K_STATE_RESTARTING: ar->state = ATH10K_STATE_RESTARTED; break; @@ -5190,6 +5244,7 @@ spin_unlock_bh(&ar->data_lock); + if (!skip_core_start) { ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); if (ret) { ath10k_err(ar, "Could not init hif: %d\n", ret); @@ -5202,6 +5257,7 @@ ath10k_err(ar, "Could not init core: %d\n", ret); goto err_power_down; } + } if (ar->sys_cap_info & WMI_TLV_SYS_CAP_INFO_RFKILL) { ret = ath10k_mac_rfkill_config(ar); @@ -5370,6 +5426,9 @@ ath10k_drain_tx(ar); + cancel_work_sync(&ar->powerup_work); + ar->powerup_pending = false; + mutex_lock(&ar->conf_mutex); if (ar->state != ATH10K_STATE_OFF) { if (!ar->hw_rfkill_on) { @@ -9412,6 +9471,8 @@ static const struct ieee80211_ops ath10k_ops = { .tx = ath10k_mac_op_tx, .wake_tx_queue = ath10k_mac_op_wake_tx_queue, + .get_powered = ath10k_get_powered, + .set_powered = ath10k_set_powered, .start = ath10k_start, .stop = ath10k_stop, .config = ath10k_config, @@ -9626,6 +9687,7 @@ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) | BIT(NL80211_CHAN_WIDTH_20) | BIT(NL80211_CHAN_WIDTH_40) | + BIT(NL80211_CHAN_WIDTH_160) | BIT(NL80211_CHAN_WIDTH_80), #endif }, @@ -9809,6 +9871,8 @@ #define WRD_METHOD "WRDD" #define WRDD_WIFI (0x07) +#define ATH10K_DFS_PULSE_VALID_DIFF_TS 100 + static u32 ath10k_mac_wrdd_get_mcc(struct ath10k *ar, union acpi_object *wrdd) { union acpi_object *mcc_pkg; @@ -10022,11 +10086,13 @@ ieee80211_hw_set(ar->hw, SUPPORT_FAST_XMIT); ieee80211_hw_set(ar->hw, CONNECTION_MONITOR); ieee80211_hw_set(ar->hw, SUPPORTS_PER_STA_GTK); + ieee80211_hw_set(ar->hw, APVLAN_NEED_MCAST_TO_UCAST); ieee80211_hw_set(ar->hw, WANT_MONITOR_VIF); ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA); ieee80211_hw_set(ar->hw, QUEUE_CONTROL); ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); + ieee80211_hw_set(ar->hw, SUPPORTS_VHT_EXT_NSS_BW); if (!test_bit(ATH10K_FLAG_RAW_MODE, &ar->dev_flags)) ieee80211_hw_set(ar->hw, SW_CRYPTO_CONTROL); @@ -10219,6 +10285,8 @@ if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED)) { /* Init ath dfs pattern detector */ ar->ath_common.debug_mask = ATH_DBG_DFS; + ar->ath_common.dfs_pulse_valid_diff_ts = + ATH10K_DFS_PULSE_VALID_DIFF_TS; ar->dfs_detector = dfs_pattern_detector_init(&ar->ath_common, NL80211_DFS_UNSET); @@ -10266,6 +10334,9 @@ ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; + INIT_WORK(&ar->powerup_work, ath10k_powerup_work); + ar->powerup_pending = false; + ret = ieee80211_register_hw(ar->hw); if (ret) { ath10k_err(ar, "failed to register ieee80211: %d\n", ret); @@ -10277,6 +10348,7 @@ ar->hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN); } +#ifndef CONFIG_ATH_REG_IGNORE if (!ath_is_world_regd(&ar->ath_common.reg_world_copy) && !ath_is_world_regd(&ar->ath_common.regulatory)) { ret = regulatory_hint(ar->hw->wiphy, @@ -10284,10 +10356,13 @@ if (ret) goto err_unregister; } +#endif return 0; +#ifndef CONFIG_ATH_REG_IGNORE err_unregister: +#endif ieee80211_unregister_hw(ar->hw); err_dfs_detector_exit: @@ -10305,6 +10380,7 @@ void ath10k_mac_unregister(struct ath10k *ar) { ieee80211_unregister_hw(ar->hw); + cancel_work_sync(&ar->powerup_work); if (IS_ENABLED(CONFIG_ATH10K_DFS_CERTIFIED) && ar->dfs_detector) ar->dfs_detector->exit(ar->dfs_detector); diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/pci.c linux-6.4-fbx/drivers/net/wireless/ath/ath10k/pci.c --- linux-6.4/drivers/net/wireless/ath/ath10k/pci.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/pci.c 2024-04-22 13:40:50.247867654 +0200 @@ -9,6 +9,7 @@ #include #include #include +#include #include "core.h" #include "debug.h" @@ -30,6 +31,7 @@ static unsigned int ath10k_pci_irq_mode = ATH10K_PCI_IRQ_AUTO; static unsigned int ath10k_pci_reset_mode = ATH10K_PCI_RESET_AUTO; +static char *fem_name; module_param_named(irq_mode, ath10k_pci_irq_mode, uint, 0644); MODULE_PARM_DESC(irq_mode, "0: auto, 1: legacy, 2: msi (default: 0)"); @@ -37,6 +39,9 @@ module_param_named(reset_mode, ath10k_pci_reset_mode, uint, 0644); MODULE_PARM_DESC(reset_mode, "0: auto, 1: warm only (default: 0)"); +module_param(fem_name, charp, 0660); +MODULE_PARM_DESC(fem_name, "force FEM type"); + /* how long wait to wait for target to initialise, in ms */ #define ATH10K_PCI_TARGET_WAIT 3000 #define ATH10K_PCI_NUM_WARM_RESET_ATTEMPTS 3 @@ -714,7 +719,8 @@ /* Check if the shared legacy irq is for us */ cause = ath10k_pci_read32(ar, SOC_CORE_BASE_ADDRESS + PCIE_INTR_CAUSE_ADDRESS); - if (cause & (PCIE_INTR_FIRMWARE_MASK | PCIE_INTR_CE_MASK_ALL)) + if (cause & (PCIE_INTR_FIRMWARE_MASK | PCIE_INTR_CE_MASK_ALL) && + cause != 0xdeadbeef) return true; return false; @@ -2655,12 +2661,6 @@ return 0; } -static int ath10k_pci_qca99x0_soft_chip_reset(struct ath10k *ar) -{ - ath10k_pci_irq_disable(ar); - return ath10k_pci_qca99x0_chip_reset(ar); -} - static int ath10k_pci_safe_chip_reset(struct ath10k *ar) { struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); @@ -3524,7 +3524,7 @@ .get_num_banks = ath10k_pci_get_num_banks, }; -static int ath10k_pci_probe(struct pci_dev *pdev, +static int __ath10k_pci_probe(struct pci_dev *pdev, const struct pci_device_id *pci_dev) { int ret = 0; @@ -3565,21 +3565,21 @@ case QCA99X0_2_0_DEVICE_ID: hw_rev = ATH10K_HW_QCA99X0; pci_ps = false; - pci_soft_reset = ath10k_pci_qca99x0_soft_chip_reset; + pci_soft_reset = NULL;; pci_hard_reset = ath10k_pci_qca99x0_chip_reset; targ_cpu_to_ce_addr = ath10k_pci_qca99x0_targ_cpu_to_ce_addr; break; case QCA9984_1_0_DEVICE_ID: hw_rev = ATH10K_HW_QCA9984; pci_ps = false; - pci_soft_reset = ath10k_pci_qca99x0_soft_chip_reset; + pci_soft_reset = NULL;; pci_hard_reset = ath10k_pci_qca99x0_chip_reset; targ_cpu_to_ce_addr = ath10k_pci_qca99x0_targ_cpu_to_ce_addr; break; case QCA9888_2_0_DEVICE_ID: hw_rev = ATH10K_HW_QCA9888; pci_ps = false; - pci_soft_reset = ath10k_pci_qca99x0_soft_chip_reset; + pci_soft_reset = NULL;; pci_hard_reset = ath10k_pci_qca99x0_chip_reset; targ_cpu_to_ce_addr = ath10k_pci_qca99x0_targ_cpu_to_ce_addr; break; @@ -3618,6 +3618,7 @@ ar_pci->targ_cpu_to_ce_addr = targ_cpu_to_ce_addr; ar->ce_priv = &ar_pci->ce; + ar->fem_name = fem_name; ar->id.vendor = pdev->vendor; ar->id.device = pdev->device; ar->id.subsystem_vendor = pdev->subsystem_vendor; @@ -3776,6 +3777,23 @@ ath10k_pci_pm_suspend, ath10k_pci_pm_resume); +static int ath10k_pci_probe(struct pci_dev *pdev, + const struct pci_device_id *pci_dev) +{ + int cnt = 0; + int rv; + do { + rv = __ath10k_pci_probe(pdev, pci_dev); + if (rv == 0) + return rv; + + pr_err("ath10k: failed to probe PCI : %d, retry-count: %d\n", rv, cnt); + mdelay(10); /* let the ath10k firmware gerbil take a small break */ + } while (cnt++ < 3); + + return rv; +} + static struct pci_driver ath10k_pci_driver = { .name = "ath10k_pci", .id_table = ath10k_pci_id_table, diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/thermal.c linux-6.4-fbx/drivers/net/wireless/ath/ath10k/thermal.c --- linux-6.4/drivers/net/wireless/ath/ath10k/thermal.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/thermal.c 2024-04-22 13:40:50.251867763 +0200 @@ -160,7 +160,9 @@ if (!test_bit(WMI_SERVICE_THERM_THROT, ar->wmi.svc_map)) return 0; - cdev = thermal_cooling_device_register("ath10k_thermal", ar, + cdev = thermal_cooling_device_register_with_parent(ar->dev, + "ath10k_thermal", + ar, &ath10k_thermal_ops); if (IS_ERR(cdev)) { diff -ruw linux-6.4/drivers/net/wireless/ath/ath10k/wmi.c linux-6.4-fbx/drivers/net/wireless/ath/ath10k/wmi.c --- linux-6.4/drivers/net/wireless/ath/ath10k/wmi.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath10k/wmi.c 2024-04-22 13:40:50.255867872 +0200 @@ -5815,12 +5815,14 @@ survey->noise = noise_floor; survey->time = div_u64(total, cc_freq_hz); survey->time_busy = div_u64(busy, cc_freq_hz); - survey->time_rx = div_u64(rx_bss, cc_freq_hz); + survey->time_rx = div_u64(rx, cc_freq_hz); survey->time_tx = div_u64(tx, cc_freq_hz); + survey->time_bss_rx = div_u64(rx_bss, cc_freq_hz); survey->filled |= (SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME | SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX | + SURVEY_INFO_TIME_BSS_RX | SURVEY_INFO_TIME_TX); exit: spin_unlock_bh(&ar->data_lock); diff -ruw linux-6.4/drivers/net/wireless/ath/ath11k/Kconfig linux-6.4-fbx/drivers/net/wireless/ath/ath11k/Kconfig --- linux-6.4/drivers/net/wireless/ath/ath11k/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath11k/Kconfig 2023-05-22 20:06:42.199799433 +0200 @@ -57,3 +57,15 @@ Enable ath11k spectral scan support Say Y to enable access to the FFT/spectral data via debugfs. + +config ATH11K_SMALL_DP_RINGS + bool "ath11k small datapath DMA rings for memory challenged platforms" + depends on ATH11K + help + Select this to lower the memory requirements for DMA rings + in the datapath code. This can free up to 17 MiB of RAM per + chip. + +config ATH11K_QCN9074_FIXED_MEM_REGION + bool "QCA ath11k fixed memory region mode on QCN9074" + depends on ATH11K diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/Kconfig linux-6.4-fbx/drivers/net/wireless/ath/ath12k/Kconfig --- linux-6.4/drivers/net/wireless/ath/ath12k/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/Kconfig 2024-04-22 13:40:50.275868419 +0200 @@ -32,3 +32,11 @@ If unsure, say Y to make it easier to debug problems. But if you want optimal performance choose N. + +config ATH12K_DEBUGFS + bool "ath12k custom debugfs support" + depends on ATH12K + +config ATH12K_MEM_PROFILE_512M + bool "ath12k low memory profile" + depends on ATH12K diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/Makefile linux-6.4-fbx/drivers/net/wireless/ath/ath12k/Makefile --- linux-6.4/drivers/net/wireless/ath/ath12k/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/Makefile 2024-04-22 13:40:50.275868419 +0200 @@ -18,10 +18,23 @@ dbring.o \ hw.o \ mhi.o \ + pcic.o \ pci.o \ - dp_mon.o + dp_mon.o \ + vendor.o \ + umac_reset.o +ath12k-$(CONFIG_ATH12K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o +ath12k-$(CONFIG_NL80211_TESTMODE) += testmode.o ath12k-$(CONFIG_ATH12K_TRACING) += trace.o +ath12k-$(CONFIG_THERMAL) += thermal.o +ath12k-$(CONFIG_ATH12K_SPECTRAL) += spectral.o +ath12k-$(CONFIG_WANT_DEV_COREDUMP) += coredump.o +ath12k-$(CONFIG_ATH12K_PKTLOG) += pktlog.o +ath12k-$(CONFIG_ATH12K_AHB) += ahb.o +ath12k-$(CONFIG_ATH12K_PPE_DS_SUPPORT) += ppe.o +ath12k-$(CONFIG_ATH12K_BONDED_DS_SUPPORT) += bondif.o +ath12k-$(CONFIG_ATH12K_SAWF) += sawf.o telemetry.o telemetry_agent_if.o # for tracing framework to find trace.h CFLAGS_trace.o := -I$(src) diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/ce.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/ce.c --- linux-6.4/drivers/net/wireless/ath/ath12k/ce.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/ce.c 2024-04-22 13:40:50.279868528 +0200 @@ -41,6 +41,7 @@ .src_nentries = 32, .src_sz_max = 2048, .dest_nentries = 0, + .send_cb = ath12k_htc_tx_completion_handler, }, /* CE4: host->target HTT */ @@ -74,6 +75,7 @@ .src_nentries = 32, .src_sz_max = 2048, .dest_nentries = 0, + .send_cb = ath12k_htc_tx_completion_handler, }, /* CE8: target autonomous hif_memcpy */ @@ -140,6 +142,14 @@ .src_sz_max = 0, .dest_nentries = 0, }, + + /* CE15: reserved for customer use */ + { + .flags = (CE_ATTR_FLAGS | CE_ATTR_DIS_INTR), + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, }; const struct ce_attr ath12k_host_ce_config_wcn7850[] = { @@ -219,6 +229,98 @@ }; +const struct ce_attr ath12k_host_ce_config_ipq5332[] = { + /* CE0: host->target HTC control and raw streams */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 16, + .src_sz_max = 2048, + .dest_nentries = 0, + }, + /* CE1: target->host HTT + HTC control */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + /* CE2: target->host WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 128, + .recv_cb = ath12k_htc_rx_completion_handler, + }, + /* CE3: host->target WMI */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 32, + .src_sz_max = 2048, + .dest_nentries = 0, + .send_cb = ath12k_htc_tx_completion_handler, + }, + /* CE4: host->target HTT */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 2048, + .src_sz_max = 256, + .dest_nentries = 0, + }, + /* CE5: target -> host PKTLOG */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 512, + .recv_cb = ath12k_dp_htt_htc_t2h_msg_handler, + }, + /* CE6: Target autonomous HIF_memcpy */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + /* CE7: CV Prefetch */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + .send_cb = ath12k_htc_tx_completion_handler, + }, + /* CE8: Target HIF memcpy (Generic HIF memcypy) */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + /* CE9: WMI logging/CFR/Spectral/Radar */ + { + .flags = CE_ATTR_FLAGS, + .src_nentries = 0, + .src_sz_max = 2048, + .dest_nentries = 128, + }, + /* CE10: Unused */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, + /* CE11: Unused */ + { + .flags = CE_ATTR_FLAGS | CE_ATTR_DIS_INTR, + .src_nentries = 0, + .src_sz_max = 0, + .dest_nentries = 0, + }, +}; + static int ath12k_ce_rx_buf_enqueue_pipe(struct ath12k_ce_pipe *pipe, struct sk_buff *skb, dma_addr_t paddr) { @@ -447,18 +549,31 @@ return skb; } -static void ath12k_ce_send_done_cb(struct ath12k_ce_pipe *pipe) +static void ath12k_ce_tx_process_cb(struct ath12k_ce_pipe *pipe) { struct ath12k_base *ab = pipe->ab; struct sk_buff *skb; + struct sk_buff_head list; + __skb_queue_head_init(&list); while (!IS_ERR(skb = ath12k_ce_completed_send_next(pipe))) { if (!skb) continue; dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr, skb->len, DMA_TO_DEVICE); + if ((!pipe->send_cb) || ab->hw_params->credit_flow) { dev_kfree_skb_any(skb); + continue; + } + + __skb_queue_tail(&list, skb); + } + + while ((skb = __skb_dequeue(&list))) { + ath12k_dbg(ab, ATH12K_DBG_PCI, "tx ce pipe %d len %d\n", + pipe->pipe_num, skb->len); + pipe->send_cb(ab, skb); } } @@ -484,6 +599,9 @@ ring_params->msi_addr = addr_lo; ring_params->msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) << 32); + if (ab->hif.bus == ATH12K_BUS_HYBRID) + ring_params->msi_data = ab->ipci.ce_msi_data[ce_id]; + else ring_params->msi_data = (msi_data_idx % msi_data_count) + msi_data_start; ring_params->flags |= HAL_SRNG_FLAGS_MSI_INTR; } @@ -528,7 +646,7 @@ /* TODO: Init other params needed by HAL to init the ring */ - ret = ath12k_hal_srng_setup(ab, type, ce_id, 0, ¶ms); + ret = ath12k_hal_srng_setup_idx(ab, type, ce_id, 0, ¶ms, 0); if (ret < 0) { ath12k_warn(ab, "failed to setup srng: %d ring_id %d\n", ret, ce_id); @@ -588,7 +706,7 @@ pipe->attr_flags = attr->flags; if (attr->src_nentries) { - pipe->send_cb = ath12k_ce_send_done_cb; + pipe->send_cb = attr->send_cb; nentries = roundup_pow_of_two(attr->src_nentries); desc_sz = ath12k_hal_ce_get_desc_size(HAL_CE_DESC_SRC); ring = ath12k_ce_alloc_ring(ab, nentries, desc_sz); @@ -619,9 +737,10 @@ void ath12k_ce_per_engine_service(struct ath12k_base *ab, u16 ce_id) { struct ath12k_ce_pipe *pipe = &ab->ce.ce_pipe[ce_id]; + const struct ce_attr *attr = &ab->hw_params->host_ce_config[ce_id]; - if (pipe->send_cb) - pipe->send_cb(pipe); + if (attr->src_nentries) + ath12k_ce_tx_process_cb(pipe); if (pipe->recv_cb) ath12k_ce_recv_process_cb(pipe); @@ -630,9 +749,33 @@ void ath12k_ce_poll_send_completed(struct ath12k_base *ab, u8 pipe_id) { struct ath12k_ce_pipe *pipe = &ab->ce.ce_pipe[pipe_id]; + const struct ce_attr *attr = &ab->hw_params->host_ce_config[pipe_id]; - if ((pipe->attr_flags & CE_ATTR_DIS_INTR) && pipe->send_cb) - pipe->send_cb(pipe); + if ((pipe->attr_flags & CE_ATTR_DIS_INTR) && attr->src_nentries) + ath12k_ce_tx_process_cb(pipe); +} + +#define CE_RING_FULL_THRESHOLD_TIME_MS 500 +#define ATH12K_MAX_CE_MANUAL_RETRY 3 +/* Ths function is called from ce_send path. Returns true If there is no buffer + * to send packet via HTC, then check if interrupts are not processed from that + * CE for last 500ms. If so, poll manually to reap available entries. + */ +static bool ath12k_is_manual_ce_poll_needed(struct ath12k_base *ab, struct ath12k_ce_pipe *pipe, struct hal_srng *srng) +{ + if (!ab->hw_params->support_ce_manual_poll) + return false; + + if (time_after + (jiffies, pipe->timestamp + msecs_to_jiffies(CE_RING_FULL_THRESHOLD_TIME_MS)) && + (srng->u.src_ring.hp == srng->u.src_ring.reap_hp) && + (srng->u.src_ring.reap_hp == *srng->u.src_ring.tp_addr)) { + pipe->ce_manual_poll_count++; + pipe->last_ce_manual_poll_ts = jiffies; + return true; + } + + return false; } int ath12k_ce_send(struct ath12k_base *ab, struct sk_buff *skb, u8 pipe_id, @@ -645,7 +788,7 @@ unsigned int nentries_mask; int ret = 0; u8 byte_swap_data = 0; - int num_used; + int num_used, retry = 0; /* Check if some entries could be regained by handling tx completion if * the CE has interrupts disabled and the used entries is more than the @@ -671,7 +814,7 @@ if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags)) return -ESHUTDOWN; - +retry: spin_lock_bh(&ab->ce.ce_lock); write_index = pipe->src_ring->write_index; @@ -692,9 +835,18 @@ desc = ath12k_hal_srng_src_get_next_reaped(ab, srng); if (!desc) { ath12k_hal_srng_access_end(ab, srng); + if (retry++ < ATH12K_MAX_CE_MANUAL_RETRY && + ath12k_is_manual_ce_poll_needed(ab, pipe, srng)) { + spin_unlock_bh(&srng->lock); + spin_unlock_bh(&ab->ce.ce_lock); + + ath12k_ce_tx_process_cb(pipe); + goto retry; + } else { ret = -ENOBUFS; goto unlock; } + } if (pipe->attr_flags & CE_ATTR_BYTE_SWAP_DATA) byte_swap_data = 1; @@ -880,6 +1032,8 @@ } } + ab->ce_pipe_init_done = true; + return 0; } @@ -926,6 +1080,8 @@ pipe->status_ring = NULL; } } + + ab->ce_pipe_init_done = false; } int ath12k_ce_alloc_pipes(struct ath12k_base *ab) diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/ce.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/ce.h --- linux-6.4/drivers/net/wireless/ath/ath12k/ce.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/ce.h 2024-04-22 13:40:50.279868528 +0200 @@ -8,6 +8,8 @@ #define ATH12K_CE_H #define CE_COUNT_MAX 16 +#define ATH12K_QCN6432_CE_COUNT 12 +#define ATH12K_QCN6432_EXT_IRQ_GRP_NUM_MAX 12 /* Byte swap data words */ #define CE_ATTR_BYTE_SWAP_DATA 2 @@ -39,8 +41,8 @@ #define PIPEDIR_INOUT_H2H 4 /* bidirectional, host to host */ /* CE address/mask */ -#define CE_HOST_IE_ADDRESS 0x00A1803C -#define CE_HOST_IE_2_ADDRESS 0x00A18040 +#define CE_HOST_IE_ADDRESS 0x75804c +#define CE_HOST_IE_2_ADDRESS 0x758050 #define CE_HOST_IE_3_ADDRESS CE_HOST_IE_ADDRESS #define CE_HOST_IE_3_SHIFT 0xC @@ -76,6 +78,17 @@ __le32 reserved; }; +struct ce_ie_addr { + u32 ie1_reg_addr; + u32 ie2_reg_addr; + u32 ie3_reg_addr; +}; + +struct ce_remap { + u32 base; + u32 size; +}; + struct ce_attr { /* CE_ATTR_* values */ unsigned int flags; @@ -92,6 +105,8 @@ unsigned int dest_nentries; void (*recv_cb)(struct ath12k_base *ab, struct sk_buff *skb); + + void (*send_cb)(struct ath12k_base *, struct sk_buff *); }; #define CE_DESC_RING_ALIGN 8 @@ -145,14 +160,16 @@ unsigned int buf_sz; unsigned int rx_buf_needed; - void (*send_cb)(struct ath12k_ce_pipe *pipe); + void (*send_cb)(struct ath12k_base *, struct sk_buff *); void (*recv_cb)(struct ath12k_base *ab, struct sk_buff *skb); struct tasklet_struct intr_tq; struct ath12k_ce_ring *src_ring; struct ath12k_ce_ring *dest_ring; struct ath12k_ce_ring *status_ring; - u64 timestamp; + unsigned long timestamp; + u32 ce_manual_poll_count; + u64 last_ce_manual_poll_ts; }; struct ath12k_ce { @@ -164,6 +181,7 @@ extern const struct ce_attr ath12k_host_ce_config_qcn9274[]; extern const struct ce_attr ath12k_host_ce_config_wcn7850[]; +extern const struct ce_attr ath12k_host_ce_config_ipq5332[]; void ath12k_ce_cleanup_pipes(struct ath12k_base *ab); void ath12k_ce_rx_replenish_retry(struct timer_list *t); diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/core.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/core.c --- linux-6.4/drivers/net/wireless/ath/ath12k/core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/core.c 2024-04-22 13:40:50.279868528 +0200 @@ -8,17 +8,364 @@ #include #include #include +#include #include +#include + +#include "peer.h" #include "core.h" +#include "coredump.h" #include "dp_tx.h" #include "dp_rx.h" #include "debug.h" #include "hif.h" +#include "sawf.h" +#include "ppe.h" +#include "ahb.h" +#include "telemetry.h" +#include "peer.h" + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#include +#include "bondif.h" +#endif unsigned int ath12k_debug_mask; module_param_named(debug_mask, ath12k_debug_mask, uint, 0644); MODULE_PARM_DESC(debug_mask, "Debugging mask"); +static unsigned int ath12k_crypto_mode; +module_param_named(crypto_mode, ath12k_crypto_mode, uint, 0644); +MODULE_PARM_DESC(crypto_mode, "crypto mode: 0-hardware, 1-software"); + +/* frame mode values are mapped as per enum ath12k_hw_txrx_mode */ +unsigned int ath12k_frame_mode = ATH12K_HW_TXRX_ETHERNET; +module_param_named(frame_mode, ath12k_frame_mode, uint, 0644); +MODULE_PARM_DESC(frame_mode, + "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)"); + +unsigned int ath12k_ftm_mode; +module_param_named(ftm_mode, ath12k_ftm_mode, uint, 0444); +MODULE_PARM_DESC(ftm_mode, "Boots up in factory test mode"); + +unsigned int ath12k_mlo_capable = 0; +module_param_named(mlo_capable, ath12k_mlo_capable, uint, 0644); +MODULE_PARM_DESC(mlo_capable, "mlo capable: 0-disable, 1-enable"); + +static unsigned int ath12k_en_fwlog = true; +module_param_named(en_fwlog, ath12k_en_fwlog, uint, 0644); +MODULE_PARM_DESC(en_fwlog, "fwlog: 0-disable, 1-enable"); + +unsigned int ath12k_ppe_ds_enabled = false; +module_param_named(ppe_ds_enable, ath12k_ppe_ds_enabled, uint, 0644); +MODULE_PARM_DESC(ppe_ds_enable, "ppe_ds_enable: 0-disable, 1-enable"); + +unsigned int ath12k_ssr_failsafe_mode = true; +module_param_named(ssr_failsafe_mode, ath12k_ssr_failsafe_mode, uint, 0644); +MODULE_PARM_DESC(ssr_failsafe_mode, "ssr failsafe mode: 0-disable, 1-enable"); + +bool ath12k_mgmt_rx_reordering = false; +module_param_named(mgmt_rx_reorder, ath12k_mgmt_rx_reordering, bool, 0644); +MODULE_PARM_DESC(mgmt_rx_reorder, "Mgmt Rx Re-Ordering (0 - disable, 1 - enable)"); + +bool ath12k_debug_critical = false; +module_param_named(debug_critical, ath12k_debug_critical, bool, 0644); +MODULE_PARM_DESC(debug_critical, "Debug critical issue (0 - disable, 1 - enable)"); + +static char *ath12k_board_variant; +module_param_named(board_variant, ath12k_board_variant, charp, 0444); +MODULE_PARM_DESC(board_variant, "board variant to use for bdf lookup"); + +bool ath12k_en_shutdown; +module_param_named(en_shutdown, ath12k_en_shutdown, bool, 0644); +MODULE_PARM_DESC(en_shutdown, "enable pcie shutdown callback"); + +bool ath12k_stats_disable; +module_param_named(stats_disable, ath12k_stats_disable, bool, 0644); +MODULE_PARM_DESC(stats_disable, "disable all HTT stats"); + +static DEFINE_MUTEX(ath12k_hw_lock); +static struct list_head ath12k_hw_groups = LIST_HEAD_INIT(ath12k_hw_groups); + +extern struct ath12k_coredump_info ath12k_coredump_ram_info; + +/* This function needs to be used only when dt has multi chip grouping information */ +static struct ath12k_hw_group *ath12k_core_hw_group_find_by_id(u8 group_id) +{ + struct ath12k_hw_group *ag; + + lockdep_assert_held(&ath12k_hw_lock); + + /* group ids will be unique only for multi chip group */ + list_for_each_entry(ag, &ath12k_hw_groups, list) { + if (group_id == ag->id && ag->num_chip > 1) + return ag; + } + + return NULL; +} + +static void ath12k_core_hw_group_free(struct ath12k_hw_group *ag) +{ + mutex_lock(&ath12k_hw_lock); + + list_del(&ag->list); + kfree(ag); + + mutex_unlock(&ath12k_hw_lock); +} + +void ath12k_core_put_hw_group(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + u8 chip_id = ab->chip_id; + int num_probed; + + if (!ag) + return; + + mutex_lock(&ag->mutex_lock); + + if (chip_id >= ag->num_chip) { + ath12k_err(ab, "failed to put Invalid chip id %d in the group id %d max chip %d\n", + chip_id, ag->id, ag->num_chip); + + return; + } + + if (ag->ab[chip_id] != ab) { + ath12k_err(ab, "failed to put chip id %d in the group id %d\n", + chip_id, ag->id); + + return; + } + + ag->ab[chip_id] = NULL; + ab->ag = NULL; + ab->chip_id = ATH12K_INVALID_CHIP_ID; + + if (ag->num_probed) + ag->num_probed--; + + num_probed = ag->num_probed; + + mutex_unlock(&ag->mutex_lock); + + if (!num_probed) + ath12k_core_hw_group_free(ag); + +} + +static void ath12k_core_hw_group_reset(struct work_struct *work) +{ + struct ath12k_hw_group *ag = container_of(work, struct ath12k_hw_group, reset_work); + struct ath12k_base *ab; + int i; + + if (ag->recovery_mode != ATH12K_MLO_RECOVERY_MODE0) + return; + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + if (ab->hif.bus == ATH12K_BUS_PCI) { + ag->crash_type = ATH12K_RPROC_ROOTPD_AHB_CRASH; + continue; + } + + if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags))) { + set_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags); + set_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); + queue_work(ab->workqueue_aux, &ab->reset_work); + } + + ath12k_hal_dump_srng_stats(ab); + } +} + +static struct ath12k_hw_group * +ath12k_core_hw_group_alloc(u8 id, u8 max_chip) +{ + struct ath12k_hw_group *ag = NULL; + + lockdep_assert_held(&ath12k_hw_lock); + + ag = kzalloc(sizeof(*ag), GFP_KERNEL); + if (!ag) + return NULL; + + ag->id = id; + ag->num_chip = max_chip; + ag->mlo_capable = !!ath12k_mlo_capable; + atomic_set(&ag->num_dp_tx_pending, 0); + list_add(&ag->list, &ath12k_hw_groups); + mutex_init(&ag->mutex_lock); + mutex_init(&ag->mlomem_arena.mutex_lock); + spin_lock_init(&ag->mlo_umac_reset.lock); + ag->hw_queues_stopped = false; + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; + INIT_WORK(&ag->reset_work, ath12k_core_hw_group_reset); + + return ag; +} + +static struct ath12k_hw_group *ath12k_core_get_hw_group(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = NULL; + struct device_node *mlo; + struct device *dev = ab->dev; + u32 group_id, num_chips; + int ret; + + lockdep_assert_held(&ath12k_hw_lock); + + /* If there is no grouping info in the dt, we don't enable + * multi soc hw grouping and registration, rather the single + * soc is added to hw group and based on the number of links + * within the soc, all links are combined into a single wiphy. + */ + mlo = of_parse_phandle(dev->of_node, "qcom,wsi", 0); + if (mlo && ath12k_mlo_capable && !ath12k_ftm_mode) { + ret = of_property_read_u32(mlo, "id", &group_id); + if (ret) + group_id = ATH12K_INVALID_GRP_ID; + } else { + group_id = ATH12K_INVALID_GRP_ID; + } + +again: + if (group_id == ATH12K_INVALID_GRP_ID) { + ath12k_info(ab, "Grouping of multiple SoC not done\n"); + + ag = ath12k_core_hw_group_alloc(group_id, 1); + + if (!ag) { + ath12k_warn(ab, "unable to create new hw group\n"); + return NULL; + } + + if (ab->hw_params->support_umac_reset) + spin_lock_init(&ag->mlo_umac_reset.lock); + } else { + if (of_property_read_u32(mlo, "num_chip", &num_chips)) { + ath12k_err(ab, "num_chip is not configured\n"); + group_id = ATH12K_INVALID_GRP_ID; + goto again; + } + + if (num_chips > ATH12K_MAX_SOCS) { + ath12k_warn(ab, "num_chip advertised %d is more than limit %d\n", + num_chips, ATH12K_MAX_SOCS); + group_id = ATH12K_INVALID_GRP_ID; + goto again; + } + + /* currently only one group of multiple socs are supported, + * since we use group id ATH12K_INVALID_GRP_ID for single + * chip group which didn't have dt entry, there could be many + * groups with same group id, i.e ATH12K_INVALID_GRP_ID. So + * default group id of ATH12K_INVALID_GRP_ID combined with + * num chips in ath12k_hw_group determines if the group is + * multisoc or single soc group + */ + ag = ath12k_core_hw_group_find_by_id(group_id); + if (!ag) { + ag = ath12k_core_hw_group_alloc(group_id, num_chips); + + if (!ag) { + ath12k_warn(ab, "unable to create new hw group\n"); + return NULL; + } + + if (ab->hw_params->support_umac_reset) + spin_lock_init(&ag->mlo_umac_reset.lock); + + } else if (test_bit(ATH12K_FLAG_UNREGISTERING, &ag->dev_flags)) { + ath12k_dbg(ab, ATH12K_DBG_BOOT, "group id %d in unregister state\n", + ag->id); + group_id = ATH12K_INVALID_GRP_ID; + goto again; + } + } + + if (ag->num_probed >= ag->num_chip) { + ath12k_warn(ab, "unable to add new chip to group, max limit reached\n"); + group_id = ATH12K_INVALID_GRP_ID; + goto again; + } + + ab->chip_id = ag->num_probed; + ag->ab[ag->num_probed++] = ab; + ab->ag = ag; + return ag; +} + +static inline +bool ath12k_core_hw_group_create_ready(struct ath12k_hw_group *ag) +{ + lockdep_assert_held(&ag->mutex_lock); + + return (ag->num_probed == ag->num_chip); +} + +static inline +bool ath12k_core_hw_group_start_ready(struct ath12k_hw_group *ag) +{ + lockdep_assert_held(&ag->mutex_lock); + + return (ag->num_started == ag->num_chip); +} + +void ath12k_fw_stats_pdevs_free(struct list_head *head) +{ + struct ath12k_fw_stats_pdev *i, *tmp; + + list_for_each_entry_safe(i, tmp, head, list) { + list_del(&i->list); + kfree(i); + } +} + +static void ath12k_fw_stats_vdevs_free(struct list_head *head) +{ + struct ath12k_fw_stats_vdev *i, *tmp; + + list_for_each_entry_safe(i, tmp, head, list) { + list_del(&i->list); + kfree(i); + } +} + +void ath12k_fw_stats_bcn_free(struct list_head *head) +{ + struct ath12k_fw_stats_bcn *i, *tmp; + + list_for_each_entry_safe(i, tmp, head, list) { + list_del(&i->list); + kfree(i); + } +} + +void ath12k_fw_stats_init(struct ath12k *ar) +{ + INIT_LIST_HEAD(&ar->fw_stats.vdevs); + INIT_LIST_HEAD(&ar->fw_stats.pdevs); + INIT_LIST_HEAD(&ar->fw_stats.bcn); + init_completion(&ar->fw_stats_complete); +} + +void ath12k_fw_stats_reset(struct ath12k *ar) +{ + ath12k_fw_stats_pdevs_free(&ar->fw_stats.pdevs); + ath12k_fw_stats_vdevs_free(&ar->fw_stats.vdevs); +} + +void ath12k_fw_stats_free(struct ath12k_fw_stats *stats) +{ + ath12k_fw_stats_pdevs_free(&stats->pdevs); + ath12k_fw_stats_vdevs_free(&stats->vdevs); + ath12k_fw_stats_bcn_free(&stats->bcn); +} + int ath12k_core_suspend(struct ath12k_base *ab) { int ret; @@ -83,23 +430,87 @@ return 0; } -static int ath12k_core_create_board_name(struct ath12k_base *ab, char *name, - size_t name_len) +int ath12k_core_check_dt(struct ath12k_base *ab) +{ + size_t max_len = sizeof(ab->qmi.target.bdf_ext); + const char *variant = NULL; + struct device_node *node; + + node = ab->dev->of_node; + if (!node) + return -ENOENT; + + of_property_read_string(node, "qcom,ath12k-calibration-variant", + &variant); + if (!variant) + return -ENODATA; + + if (strscpy(ab->qmi.target.bdf_ext, variant, max_len) < 0) + ath12k_dbg(ab, ATH12K_DBG_BOOT, + "bdf variant string is longer than the buffer can accommodate (variant: %s)\n", + variant); + + return 0; +} + +static int ath12k_core_create_board_name(struct ath12k_base *ab, + char *boardname, + char *defaultboardname) { /* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */ char variant[9 + ATH12K_QMI_BDF_EXT_STR_LENGTH] = { 0 }; - if (ab->qmi.target.bdf_ext[0] != '\0') + if (ath12k_board_variant) + scnprintf(variant, sizeof(variant), ",variant=%s", + ath12k_board_variant); + else if (ab->qmi.target.bdf_ext[0] != '\0') scnprintf(variant, sizeof(variant), ",variant=%s", ab->qmi.target.bdf_ext); + switch (ab->id.bdf_search) { + case ATH12K_BDF_SEARCH_BUS_AND_BOARD: + snprintf(boardname, BOARD_NAME_SIZE, + "bus=%s,vendor=%04x,device=%04x," + "subsystem-vendor=%04x," + "subsystem-device=%04x," + "qmi-chip-id=%d,qmi-board-id=%d%s", + ath12k_bus_str(ab->hif.bus), + ab->id.vendor, ab->id.device, + ab->id.subsystem_vendor, + ab->id.subsystem_device, + ab->qmi.target.chip_id, + ab->qmi.target.board_id, variant); - scnprintf(name, name_len, + snprintf(defaultboardname, BOARD_NAME_SIZE, + "bus=%s,vendor=%04x,device=%04x," + "subsystem-vendor=%04x," + "subsystem-device=%04x," + "qmi-chip-id=%d,qmi-board-id=%d%s", + ath12k_bus_str(ab->hif.bus), + ab->id.vendor, ab->id.device, + ab->id.subsystem_vendor, + ab->id.subsystem_device, + ab->qmi.target.chip_id, + ab->qmi.target.board_id, + variant); + break; + default: + snprintf(boardname, BOARD_NAME_SIZE, "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s", ath12k_bus_str(ab->hif.bus), ab->qmi.target.chip_id, ab->qmi.target.board_id, variant); - ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot using board name '%s'\n", name); + snprintf(defaultboardname, BOARD_NAME_SIZE, + "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s", + ath12k_bus_str(ab->hif.bus), + ab->qmi.target.chip_id, + ATH12K_DEFAULT_ID, variant); + break; + } + + ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot using board name : '%s'\t" + "default boardname : '%s'\n", boardname, + defaultboardname); return 0; } @@ -128,17 +539,15 @@ void ath12k_core_free_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) { - if (!IS_ERR(bd->fw)) + if (!IS_ERR(bd->fw)) { release_firmware(bd->fw); - - memset(bd, 0, sizeof(*bd)); + bd->fw = NULL; + } } static int ath12k_core_parse_bd_ie_board(struct ath12k_base *ab, struct ath12k_board_data *bd, - const void *buf, size_t buf_len, - const char *boardname, - int bd_ie_type) + const void *buf, size_t buf_len) { const struct ath12k_fw_ie *hdr; bool name_match_found; @@ -148,7 +557,7 @@ name_match_found = false; - /* go through ATH12K_BD_IE_BOARD_ elements */ + /* go through ATH12K_BD_IE_BOARD_/ATH12K_BD_IE_REGDB_ elements */ while (buf_len > sizeof(struct ath12k_fw_ie)) { hdr = buf; board_ie_id = le32_to_cpu(hdr->id); @@ -159,48 +568,51 @@ buf += sizeof(*hdr); if (buf_len < ALIGN(board_ie_len, 4)) { - ath12k_err(ab, "invalid ATH12K_BD_IE_BOARD length: %zu < %zu\n", + ath12k_err(ab, "invalid %s length: %zu < %zu\n", + ath12k_bd_ie_type_str(bd->ie_id), buf_len, ALIGN(board_ie_len, 4)); ret = -EINVAL; goto out; } - switch (board_ie_id) { - case ATH12K_BD_IE_BOARD_NAME: + if (board_ie_id == bd->name_id) { ath12k_dbg_dump(ab, ATH12K_DBG_BOOT, "board name", "", board_ie_data, board_ie_len); - if (board_ie_len != strlen(boardname)) - break; + if (board_ie_len != strlen(bd->boardname)) + goto next; - ret = memcmp(board_ie_data, boardname, strlen(boardname)); + ret = memcmp(board_ie_data, bd->boardname, strlen(bd->boardname)); if (ret) - break; + goto next; name_match_found = true; ath12k_dbg(ab, ATH12K_DBG_BOOT, - "boot found match for name '%s'", - boardname); - break; - case ATH12K_BD_IE_BOARD_DATA: + "boot found match %s for name '%s'", + ath12k_bd_ie_type_str(bd->ie_id), + bd->boardname); + } else if (board_ie_id == bd->data_id) { if (!name_match_found) /* no match found */ - break; + goto next; ath12k_dbg(ab, ATH12K_DBG_BOOT, - "boot found board data for '%s'", boardname); + "boot found %s for '%s'", + ath12k_bd_ie_type_str(bd->ie_id), + bd->boardname); bd->data = board_ie_data; bd->len = board_ie_len; ret = 0; goto out; - default: - ath12k_warn(ab, "unknown ATH12K_BD_IE_BOARD found: %d\n", + } else { + ath12k_warn(ab, "unknown %s id found: %d\n", + ath12k_bd_ie_type_str(bd->ie_id), board_ie_id); - break; } +next: /* jump over the padding */ board_ie_len = ALIGN(board_ie_len, 4); @@ -216,8 +628,7 @@ } static int ath12k_core_fetch_board_data_api_n(struct ath12k_base *ab, - struct ath12k_board_data *bd, - const char *boardname) + struct ath12k_board_data *bd) { size_t len, magic_len; const u8 *data; @@ -282,15 +693,12 @@ goto err; } - switch (ie_id) { - case ATH12K_BD_IE_BOARD: + if (ie_id == bd->ie_id) { ret = ath12k_core_parse_bd_ie_board(ab, bd, data, - ie_len, - boardname, - ATH12K_BD_IE_BOARD); + ie_len); if (ret == -ENOENT) /* no match found, continue */ - break; + goto next; else if (ret) /* there was an error, bail out */ goto err; @@ -298,6 +706,7 @@ goto out; } +next: /* jump over the padding */ ie_len = ALIGN(ie_len, 4); @@ -307,9 +716,10 @@ out: if (!bd->data || !bd->len) { - ath12k_err(ab, - "failed to fetch board data for %s from %s\n", - boardname, filepath); + ath12k_dbg(ab, ATH12K_DBG_BOOT, + "failed to fetch %s for %s from %s\n", + ath12k_bd_ie_type_str(bd->ie_id), + bd->boardname, filepath); ret = -ENODATA; goto err; } @@ -326,6 +736,7 @@ char *filename) { bd->fw = ath12k_core_firmware_request(ab, filename); + if (IS_ERR(bd->fw)) return PTR_ERR(bd->fw); @@ -335,41 +746,179 @@ return 0; } -#define BOARD_NAME_SIZE 100 int ath12k_core_fetch_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd) { - char boardname[BOARD_NAME_SIZE]; + char boardname[BOARD_NAME_SIZE] = {}; + char defaultboardname[BOARD_NAME_SIZE] = {}; + u8 bd_api; int ret; - ret = ath12k_core_create_board_name(ab, boardname, BOARD_NAME_SIZE); + ret = ath12k_core_create_board_name(ab, boardname, defaultboardname); if (ret) { ath12k_err(ab, "failed to create board name: %d", ret); return ret; } - ab->bd_api = 2; - ret = ath12k_core_fetch_board_data_api_n(ab, bd, boardname); + bd_api = 2; + bd->ie_id = ATH12K_BD_IE_BOARD; + bd->name_id = ATH12K_BD_IE_BOARD_NAME; + bd->data_id = ATH12K_BD_IE_BOARD_DATA; + memcpy(bd->boardname, boardname, BOARD_NAME_SIZE); + + ret = ath12k_core_fetch_board_data_api_n(ab, bd); if (!ret) goto success; - ab->bd_api = 1; + memcpy(bd->boardname, defaultboardname, BOARD_NAME_SIZE); + + ret = ath12k_core_fetch_board_data_api_n(ab, bd); + if (!ret) + goto success; + + bd_api = 1; ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_DEFAULT_BOARD_FILE); if (ret) { - ath12k_err(ab, "failed to fetch board-2.bin or board.bin from %s\n", + ath12k_err(ab, "failed to fetch board-2.bin from %s\n", + ab->hw_params->fw.dir); + } else { + ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_BOARD_API2_FILE); + if (ret) + ath12k_err(ab, "failed to fetch board-2.bin from %s\n", ab->hw_params->fw.dir); return ret; } success: - ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %d\n", ab->bd_api); + ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %hhu\n", bd_api); + return 0; +} + +int ath12k_core_fetch_regdb(struct ath12k_base *ab, struct ath12k_board_data *bd) +{ + char regdbname[BOARD_NAME_SIZE] = {}; + char defaultregdbname[BOARD_NAME_SIZE] = {}; + u8 bd_api; + int ret; + + ret = ath12k_core_create_board_name(ab, regdbname, defaultregdbname); + if (ret) { + ath12k_err(ab, "failed to create regdb name: %d", ret); + return ret; + } + + bd_api = 2; + bd->ie_id = ATH12K_BD_IE_REGDB; + bd->name_id = ATH12K_BD_IE_REGDB_NAME; + bd->data_id = ATH12K_BD_IE_REGDB_DATA; + memcpy(bd->boardname, regdbname, BOARD_NAME_SIZE); + + ret = ath12k_core_fetch_board_data_api_n(ab, bd); + if (!ret) + goto success; + + memcpy(bd->boardname, defaultregdbname, BOARD_NAME_SIZE); + + ret = ath12k_core_fetch_board_data_api_n(ab, bd); + if (!ret) + goto success; + + bd_api = 1; + ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_REGDB_FILE_NAME); + if (ret) { + ath12k_err(ab, "failed to fetch %s file from %s\n", + ATH12K_REGDB_FILE_NAME, ab->hw_params->fw.dir); + return ret; + } + +success: + ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %hhu\n", bd_api); + return 0; +} + +int ath12k_core_fetch_fw_cfg(struct ath12k_base *ab, + struct ath12k_board_data *bd) +{ + int ret; + + ret = ath12k_core_fetch_board_data_api_1(ab, bd, ATH12K_FW_CFG_FILE); + if (ret) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "failed to fetch %s from %s\n", + ATH12K_FW_CFG_FILE, ab->hw_params->fw.dir); + return -ENOENT; + } + + ath12k_info(ab, "fetching %s from %s\n", ATH12K_FW_CFG_FILE, + ab->hw_params->fw.dir); + + return 0; +} + +int ath12k_core_fetch_rxgainlut(struct ath12k_base *ab, struct ath12k_board_data *bd) +{ + char rxgainlutname[BOARD_NAME_SIZE] = {}; + char rxgainlutdefaultname[BOARD_NAME_SIZE] = {}; + int ret; + u8 bd_api; + + ret = ath12k_core_create_board_name(ab, rxgainlutname, + rxgainlutdefaultname); + if (ret) { + ath12k_err(ab, "failed to create rxgainlut name: %d", ret); + return ret; + } + + bd_api = 2; + bd->ie_id = ATH12K_BD_IE_RXGAINLUT; + bd->name_id = ATH12K_BD_IE_RXGAINLUT_NAME; + bd->data_id = ATH12K_BD_IE_RXGAINLUT_DATA; + memcpy(bd->boardname, rxgainlutname, BOARD_NAME_SIZE); + + ret = ath12k_core_fetch_board_data_api_n(ab, bd); + + if (!ret) + goto success; + + memcpy(bd->boardname, rxgainlutdefaultname, BOARD_NAME_SIZE); + + ret = ath12k_core_fetch_board_data_api_n(ab, bd); + + if (!ret) + goto success; + + bd_api = 1; + snprintf(rxgainlutname, sizeof(rxgainlutname), "%s%04x", + ATH12K_RXGAINLUT_FILE_PREFIX, ab->qmi.target.board_id); + + ret = ath12k_core_fetch_board_data_api_1(ab, bd, rxgainlutname); + if (ret) { + ath12k_dbg(ab, ATH12K_DBG_BOOT, "failed to fetch %s from %s\n", + rxgainlutname, ab->hw_params->fw.dir); + + ret = ath12k_core_fetch_board_data_api_1(ab, bd, + ATH12K_RXGAINLUT_FILE); + if (ret) { + ath12k_warn(ab, "failed to fetch default %s from %s\n", + ATH12K_RXGAINLUT_FILE, ab->hw_params->fw.dir); + return -ENOENT; + } + } + +success: + ath12k_dbg(ab, ATH12K_DBG_BOOT, "using board api %hhu\n", bd_api); return 0; } static void ath12k_core_stop(struct ath12k_base *ab) { + lockdep_assert_held(&ab->ag->mutex_lock); + lockdep_assert_held(&ab->core_lock); + + ab->ag->num_started--; + if (!test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags)) ath12k_qmi_firmware_stop(ab); + ath12k_mgmt_rx_reo_deinit_context(ab); ath12k_hif_stop(ab); ath12k_wmi_detach(ab); ath12k_dp_rx_pdev_reo_cleanup(ab); @@ -381,6 +930,11 @@ { int ret; + if (ath12k_ftm_mode) { + ab->fw_mode = ATH12K_FIRMWARE_MODE_FTM; + ath12k_info(ab, "Booting in ftm mode\n"); + } + ret = ath12k_qmi_init_service(ab); if (ret) { ath12k_err(ab, "failed to initialize qmi :%d\n", ret); @@ -402,40 +956,397 @@ static void ath12k_core_soc_destroy(struct ath12k_base *ab) { - ath12k_dp_free(ab); - ath12k_reg_free(ab); ath12k_qmi_deinit_service(ab); } +/** + * ath12k_core_mgmt_rx_reo_init_ss_params() - Initialize a given snapshot + * params object + * @snapshot_params: Pointer to snapshot params object + * + * Return: void + */ +static void +ath12k_core_mgmt_rx_reo_init_ss_params( + struct ath12k_mgmt_rx_reo_snapshot_params *snapshot_params) +{ + snapshot_params->valid = false; + snapshot_params->mgmt_pkt_ctr = 0; + snapshot_params->global_timestamp = 0; +} + +/** + * ath12k_core_rx_reo_init_ss_value() - Initialize management Rx reorder + * snapshot values for a given pdev + * @pdev: pointer to pdev object + * + * Return: 0 for success, non-zero for failure + */ +static int +ath12k_core_rx_reo_init_ss_value(struct ath12k *ar) +{ + enum ath12k_mgmt_rx_reo_shared_snapshot_id snapshot_id; + struct ath12k_mgmt_rx_reo_pdev_info *mgmt_rx_reo_pdev_ctx; + + mgmt_rx_reo_pdev_ctx = &ar->rx_reo_pdev_ctx; + snapshot_id = 0; + while (snapshot_id < ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX) { + ath12k_core_mgmt_rx_reo_init_ss_params + (&mgmt_rx_reo_pdev_ctx->last_valid_shared_snapshot + [snapshot_id]); + snapshot_id++; + } + + /* Initialize Host snapshot params */ + ath12k_core_mgmt_rx_reo_init_ss_params + (&mgmt_rx_reo_pdev_ctx->host_snapshot); + + return 0; +} + +void *ath12k_core_mgmt_rx_reo_get_ss_address( + struct ath12k_base *ab, + u8 link_id, + enum ath12k_mgmt_rx_reo_shared_snapshot_id snapshot_id) +{ + struct ath12k_host_mlo_mem_arena *mlomem_arena_ctx; + struct ath12k_host_mlo_glb_rx_reo_snapshot_info *snapshot_info; + struct ath12k_host_mlo_glb_rx_reo_per_link_info *snapshot_link_info; + u8 link; + + if (snapshot_id >= ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX) { + ath12k_err(ab, "Invalid snapshot ID: %d\n", snapshot_id); + return NULL; + } + + mlomem_arena_ctx = &ab->ag->mlomem_arena; + snapshot_info = &mlomem_arena_ctx->rx_reo_snapshot_info; + + for (link = 0; link < snapshot_info->num_links; ++link) { + snapshot_link_info = &snapshot_info->link_info[link]; + + if (link_id == snapshot_link_info->link_id) + break; + } + + if (link == snapshot_info->num_links) { + ath12k_err(ab, "Couldn't find the snapshot link info corresponding to the link %d\n", + link_id); + return NULL; + } + + switch (snapshot_id) { + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW: + return snapshot_link_info->hw_forwarded; + + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED: + return snapshot_link_info->fw_consumed; + + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED: + return snapshot_link_info->fw_forwarded; + + default: + WARN_ON(1); + } + + return NULL; +} + +static int ath12k_mgmt_rx_reo_get_snapshot_version(struct ath12k_base *ab, + enum ath12k_mgmt_rx_reo_shared_snapshot_id id) +{ + struct ath12k_host_mlo_mem_arena *mlomem_arena_ctx; + struct ath12k_host_mlo_glb_rx_reo_snapshot_info *snapshot_info; + int snapshot_version; + + if (id >= ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX) { + ath12k_err(ab, "Invalid snapshot ID: %d\n", id); + return ATH12K_MGMT_RX_REO_INVALID_SNAPSHOT_VERSION; + } + + mlomem_arena_ctx = &ab->ag->mlomem_arena; + snapshot_info = &mlomem_arena_ctx->rx_reo_snapshot_info; + + switch (id) { + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW: + snapshot_version = snapshot_info->hw_forwarded_snapshot_ver; + break; + + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED: + snapshot_version = snapshot_info->fw_consumed_snapshot_ver; + break; + + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED: + snapshot_version = snapshot_info->fw_forwarded_snapshot_ver; + break; + + default: + snapshot_version = ATH12K_MGMT_RX_REO_INVALID_SNAPSHOT_VERSION; + break; + } + + return snapshot_version; +} + +static int +ath12k_core_mgmt_rx_reo_get_snapshot_info + (struct ath12k *ar, + enum ath12k_mgmt_rx_reo_shared_snapshot_id id, + struct ath12k_mgmt_rx_reo_snapshot_info *snapshot_info) +{ + u8 link_id; + u8 snapshot_version; + struct ath12k_base *ab; + + ab = ar->ab; + + if (id >= ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX) { + ath12k_err(ab, "Mgmt RX REO snapshot id invalid %d\n", id); + return -EINVAL; + } + + if (!snapshot_info) { + ath12k_err(ab, "Ref to mgmt RX REO snapshot info is null\n"); + return -EINVAL; + } + + link_id = ar->pdev->hw_link_id; + + snapshot_info->address = + ath12k_core_mgmt_rx_reo_get_ss_address(ab, link_id, id); + if (!snapshot_info->address) { + ath12k_err(ab, "NULL snapshot address\n"); + return -EINVAL; + } + + snapshot_version = ath12k_mgmt_rx_reo_get_snapshot_version(ab, id); + if (snapshot_version < 0) { + ath12k_err(ab, "Invalid snapshot version %d\n", + snapshot_version); + return -EINVAL; + } + + snapshot_info->version = snapshot_version; + + return 0; +} + +/** + * ath12k_mgmt_rx_reo_initialize_snapshot_address() - Initialize management Rx reorder + * snapshot addresses for a given pdev + * @pdev: pointer to pdev object + * + * Return: 0 for success, non-zero for failure + */ +static int +ath12k_core_mgmt_rx_reo_init_ss_address(struct ath12k *ar) +{ + enum ath12k_mgmt_rx_reo_shared_snapshot_id snapshot_id; + struct ath12k_mgmt_rx_reo_pdev_info *mgmt_rx_reo_pdev_ctx; + int status; + + mgmt_rx_reo_pdev_ctx = &ar->rx_reo_pdev_ctx; + snapshot_id = 0; + while (snapshot_id < ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX) { + struct ath12k_mgmt_rx_reo_snapshot_info *snapshot_info; + + snapshot_info = + &mgmt_rx_reo_pdev_ctx->host_target_shared_snapshot_info + [snapshot_id]; + status = ath12k_core_mgmt_rx_reo_get_snapshot_info + (ar, snapshot_id, snapshot_info); + if (status) { + ath12k_err(ar->ab, "Get snapshot info failed, id = %u\n", + snapshot_id); + return status; + } + + snapshot_id++; + } + + return 0; +} + +static int ath12k_core_mgmt_rx_reordering_init(struct ath12k_base *ab) +{ + int i, ret; + struct ath12k *ar; + struct ath12k_pdev *pdev; + struct ath12k_hw_group *ag = ab->ag; + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + return 0; + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + ar = pdev->ar; + if (!ar) + continue; + ret = ath12k_core_rx_reo_init_ss_value(ar); + if (ret) { + ath12k_err(ab, "Failed to initialize snapshot value\n"); + return ret; + } + + ret = ath12k_core_mgmt_rx_reo_init_ss_address(ar); + if (ret) { + ath12k_err(ab, "Failed to initialize snapshot address\n"); + return ret; + } + + ar->rx_reo_pdev_ctx.init_complete = true; + } + + return 0; +} + +static int ath12k_core_mlo_shmem_per_chip_crash_info_addresses( + struct ath12k_base *ab, + struct ath12k_host_mlo_glb_chip_crash_info *global_chip_crash_info, + int chip_id) +{ + int i; + struct ath12k_host_mlo_glb_per_chip_crash_info *per_chip_crash_info = NULL; + + for (i = 0; i < global_chip_crash_info->no_of_chips; i++) + { + per_chip_crash_info = &global_chip_crash_info->per_chip_crash_info[i]; + + if (!per_chip_crash_info) + return -EINVAL; + + if (chip_id == per_chip_crash_info->chip_id) + break; + } + + if (i >= global_chip_crash_info->no_of_chips) { + ath12k_err(ab, "error in chip id:%d\n", chip_id); + return 0; + } + + if (!per_chip_crash_info || + !per_chip_crash_info->crash_reason || + !per_chip_crash_info->recovery_mode) { + ath12k_err(ab, "crash_reason address is null\n"); + return 0; + } + + ab->crash_info_address = per_chip_crash_info->crash_reason; + ab->recovery_mode_address = per_chip_crash_info->recovery_mode; + + return 0; +} + +static int ath12k_core_mlo_shmem_crash_info_init(struct ath12k_base *ab, int index) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_host_mlo_mem_arena *mlomem_arena_ctx; + struct ath12k_host_mlo_glb_chip_crash_info *global_chip_crash_info; + + mlomem_arena_ctx = &ab->ag->mlomem_arena; + + if (!(ag->mlo_mem.is_mlo_mem_avail)) + return 0; + + global_chip_crash_info = &mlomem_arena_ctx->global_chip_crash_info; + + if (ath12k_core_mlo_shmem_per_chip_crash_info_addresses(ab, + global_chip_crash_info, + index) < 0) { + ath12k_warn(ab, "per_chip_crash_info is not set\n"); + return -EINVAL; + } + + return 0; +} + +static int ath12k_core_pdev_init(struct ath12k_base *ab) +{ + int ret; + + ret = ath12k_thermal_register(ab); + if (ret) { + ath12k_err(ab, "could not register thermal device: %d\n", + ret); + return ret; + } + + ret = ath12k_spectral_init(ab); + if (ret) { + ath12k_err(ab, "failed to init spectral %d\n", ret); + goto err_thermal_unregister; + } + + ret = ath12k_core_mgmt_rx_reordering_init(ab); + if (ret) { + ath12k_err(ab, "failed to rx reo reordering %d\n", ret); + goto err_spectral_deinit; + } + + ath12k_sawf_init(ab); + ath12k_telemetry_init(ab); + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ret = ath12k_dp_ppeds_start(ab); + if (ret) { + ath12k_err(ab, "failed to start DP PPEDS \n"); + goto err_dp_ppeds_stop; + } +#endif + return 0; + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +err_dp_ppeds_stop: + ath12k_dp_ppeds_stop(ab); +#endif +err_spectral_deinit: + ath12k_spectral_deinit(ab); +err_thermal_unregister: + ath12k_thermal_unregister(ab); + return ret; +} + +static void ath12k_core_pdev_deinit(struct ath12k_base *ab) +{ +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ath12k_dp_ppeds_stop(ab); +#endif + ath12k_spectral_deinit(ab); + ath12k_thermal_unregister(ab); + ath12k_telemetry_deinit(ab); + ath12k_sawf_deinit(ab); +} + static int ath12k_core_pdev_create(struct ath12k_base *ab) { int ret; - ret = ath12k_mac_register(ab); + ret = ath12k_debugfs_pdev_create(ab); if (ret) { - ath12k_err(ab, "failed register the radio with mac80211: %d\n", ret); + ath12k_err(ab, "failed to create core pdev debugfs: %d\n", ret); + /* Free any previously allocated ab info */ return ret; } ret = ath12k_dp_pdev_alloc(ab); if (ret) { ath12k_err(ab, "failed to attach DP pdev: %d\n", ret); - goto err_mac_unregister; + /* Free current debugfs and any previously allocated info */ + goto err_debugfs_pdev; } return 0; -err_mac_unregister: - ath12k_mac_unregister(ab); +err_debugfs_pdev: + ath12k_debugfs_pdev_destroy(ab); return ret; } static void ath12k_core_pdev_destroy(struct ath12k_base *ab) { - ath12k_mac_unregister(ab); - ath12k_hif_irq_disable(ab); ath12k_dp_pdev_free(ab); + ath12k_debugfs_pdev_destroy(ab); } static int ath12k_core_start(struct ath12k_base *ab, @@ -443,6 +1354,9 @@ { int ret; + lockdep_assert_held(&ab->ag->mutex_lock); + lockdep_assert_held(&ab->core_lock); + ret = ath12k_wmi_attach(ab); if (ret) { ath12k_err(ab, "failed to attach wmi: %d\n", ret); @@ -492,21 +1406,12 @@ goto err_hif_stop; } - ret = ath12k_mac_allocate(ab); - if (ret) { - ath12k_err(ab, "failed to create new hw device with mac80211 :%d\n", - ret); - goto err_hif_stop; - } - ath12k_dp_cc_config(ab); - ath12k_dp_pdev_pre_alloc(ab); - ret = ath12k_dp_rx_pdev_reo_setup(ab); if (ret) { ath12k_err(ab, "failed to initialize reo destination rings: %d\n", ret); - goto err_mac_destroy; + goto err_hif_stop; } ret = ath12k_wmi_cmd_init(ab); @@ -522,6 +1427,8 @@ goto err_reo_cleanup; } + WARN_ON(test_bit(ATH12K_FLAG_WMI_INIT_DONE, &ab->dev_flags)); + set_bit(ATH12K_FLAG_WMI_INIT_DONE, &ab->dev_flags); /* put hardware to DBS mode */ if (ab->hw_params->single_pdev_only) { ret = ath12k_wmi_set_hw_mode(ab, WMI_HOST_HW_MODE_DBS); @@ -538,12 +1445,13 @@ goto err_reo_cleanup; } + /* Indicate the core start in the appropriate group */ + ab->ag->num_started++; + return 0; err_reo_cleanup: ath12k_dp_rx_pdev_reo_cleanup(ab); -err_mac_destroy: - ath12k_mac_destroy(ab); err_hif_stop: ath12k_hif_stop(ab); err_wmi_detach: @@ -551,6 +1459,225 @@ return ret; } +static int ath12k_core_mlo_teardown(struct ath12k_hw_group *ag) +{ + struct ath12k_hw *ah; + int ret; + int i; + + if (!ag->mlo_capable) + return 0; + + for (i = ag->num_hw - 1; i >= 0; i--) { + ah = ag->ah[i]; + if (!ah) + continue; + + ret = ath12k_mac_mlo_teardown(ah); + if (ret) + goto out; + } + +out: + return ret; +} + +static int ath12k_core_mlo_setup(struct ath12k_hw_group *ag) +{ + struct ath12k_hw *ah; + int ret; + int i; + + if (!ag->mlo_capable) + return 0; + + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; + + ret = ath12k_mac_mlo_setup(ah); + if (ret) + goto err_setup; + } + + for (i = 0; i < ag->num_chip; i++) + ath12k_dp_partner_cc_init(ag->ab[i]); + + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; + + ret = ath12k_mac_mlo_ready(ah); + if (ret) + goto err_ready; + } + + return 0; + +err_ready: + i = ag->num_hw; +err_setup: + for (i = i - 1; i >= 0; i--) { + ah = ag->ah[i]; + if (!ah) + continue; + + ath12k_mac_mlo_teardown(ah); + } + + return ret; +} + +static int ath12k_core_hw_group_start(struct ath12k_hw_group *ag) +{ + struct ath12k_base *ab = ag->ab[0]; + int ret, i; + bool is_registered = false; + + lockdep_assert_held(&ag->mutex_lock); + + /* Check If already registered or not, since same flow + * execute for HW restart case. + */ + if (test_bit(ATH12K_FLAG_REGISTERED, &ag->dev_flags)) + is_registered = true; + + if (!is_registered) { + ret = ath12k_mac_allocate(ag); + if (ret) { + ath12k_err(ab, "failed to create new hw device with mac80211 :%d\n", + ret); + return ret; + } + } + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + /* pdev create needs to be done only for recovered + * ab during Mode1 scenario + */ + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1 && !ab->recovery_start) + continue; + + mutex_lock(&ab->core_lock); + ret = ath12k_core_pdev_create(ab); + if (ret) { + mutex_unlock(&ab->core_lock); + ath12k_err(ab, "failed to create pdev core %d\n", ret); + goto err_pdev_destroy; + } + mutex_unlock(&ab->core_lock); + } + + ret = ath12k_core_mlo_setup(ag); + if (ret) { + ath12k_err(NULL, "failed to setup MLO: %d\n", ret); + goto err_pdev_destroy; + } + + if (!is_registered) { + ret = ath12k_mac_register(ag); + if (ret) { + ath12k_err(ab, "failed register the radio with mac80211: %d\n", ret); + goto err_mlo_teardown; + } + } + + /* Setup pdev features for all ab */ + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + /* pdev init needs to be done only for recovered + * ab during Mode1 scenario + */ + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1 && !ab->recovery_start) + continue; + + mutex_lock(&ab->core_lock); + + ret = ath12k_core_pdev_init(ab); + if (ret) { + mutex_unlock(&ab->core_lock); + ath12k_err(ab, "failed to init pdev features\n"); + goto pdev_cleanup; + } + ath12k_hif_irq_enable(ab); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ath12k_hif_ppeds_irq_enable(ab, PPEDS_IRQ_PPE2TCL); + ath12k_hif_ppeds_irq_enable(ab, PPEDS_IRQ_REO2PPE); + ath12k_hif_ppeds_irq_enable(ab, PPEDS_IRQ_PPE_WBM2SW_REL); +#endif + if (ab->hw_params->en_qdsslog) { + ath12k_info(ab, "QDSS trace enabled\n"); + ath12k_config_qdss(ab); + } + + if (ath12k_en_fwlog == true) { + ret = ath12k_enable_fwlog(ab); + if (ret < 0) { + mutex_unlock(&ab->core_lock); + ath12k_err(ab, "failed to enable fwlog: %d\n", ret); + goto pdev_cleanup; + } + } + + ret = ath12k_dp_umac_reset_init(ab); + if (ret) { + mutex_unlock(&ab->core_lock); + ath12k_warn(ab, "Failed to initialize UMAC RESET: %d\n", ret); + goto pdev_cleanup; + } + + ret = ath12k_core_mlo_shmem_crash_info_init(ab, i); + if (ret) { + ath12k_err(ab, "failed to parse crash info %d\n", ret); + } + + set_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags); + + mutex_unlock(&ab->core_lock); + } + + if (!is_registered) { + set_bit(ATH12K_FLAG_REGISTERED, &ag->dev_flags); + init_completion(&ag->umac_reset_complete); + } + + return 0; + +pdev_cleanup: + for (i = i - 1; i >= 0; i--) { + ab = ag->ab[i]; + + mutex_lock(&ab->core_lock); + + ath12k_core_pdev_deinit(ab); + ath12k_hif_irq_disable(ab); + ath12k_dp_umac_reset_deinit(ab); + + mutex_unlock(&ab->core_lock); + } + + ath12k_mac_unregister(ag); +err_mlo_teardown: + ath12k_core_mlo_teardown(ag); + i = ag->num_chip; +err_pdev_destroy: + for (i = i - 1; i >= 0; i--) { + ab = ag->ab[i]; + + mutex_lock(&ab->core_lock); + ath12k_core_pdev_destroy(ab); + mutex_unlock(&ab->core_lock); + } + + ath12k_mac_destroy(ag); + return ret; +} + static int ath12k_core_start_firmware(struct ath12k_base *ab, enum ath12k_firmware_mode mode) { @@ -568,11 +1695,37 @@ return ret; } +static void ath12k_core_trigger_partner(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_base *partner_ab; + int i; + bool found = false; + + lockdep_assert_held(&ag->mutex_lock); + + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (!partner_ab) + continue; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "QMI Trigger Host Cap AB:%p Partner AB:%p Found:%d Num Radios: %d ag->num_chip:%d\n", + ab, partner_ab, found, + ab->qmi.num_radios, ag->num_chip); + + if (found) + ath12k_qmi_trigger_host_cap(partner_ab); + + found = (partner_ab == ab) ? true : false; + } +} + int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab) { + struct ath12k_hw_group *ag; int ret; - ret = ath12k_core_start_firmware(ab, ATH12K_FIRMWARE_MODE_NORMAL); + ret = ath12k_core_start_firmware(ab, ab->fw_mode); if (ret) { ath12k_err(ab, "failed to start firmware: %d\n", ret); return ret; @@ -584,47 +1737,329 @@ goto err_firmware_stop; } +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + if (ath12k_ppe_ds_enabled) { + if (ath12k_frame_mode != ATH12K_HW_TXRX_ETHERNET) { + ath12k_warn(ab, + "Force enabling Ethernet frame mode in PPE DS for" \ + " AP and STA modes.\n"); + /* MESH and WDS VAPs will still use NATIVE_WIFI mode + * @ath12k_mac_update_vif_offload() + * TODO: add device capability check + */ + ath12k_frame_mode = ATH12K_HW_TXRX_ETHERNET; + } + if (ab->hif.bus == ATH12K_BUS_PCI || ab->hif.bus == ATH12K_BUS_HYBRID) + set_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags); + } +#endif + ret = ath12k_dp_alloc(ab); if (ret) { ath12k_err(ab, "failed to init DP: %d\n", ret); goto err_firmware_stop; } + ag = ab->ag; + + switch (ath12k_crypto_mode) { + case ATH12K_CRYPT_MODE_SW: + set_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ag->dev_flags); + set_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags); + break; + case ATH12K_CRYPT_MODE_HW: + clear_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ag->dev_flags); + clear_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags); + break; + default: + ath12k_info(ab, "invalid crypto_mode: %d\n", ath12k_crypto_mode); + return -EINVAL; + } + + if (ath12k_frame_mode == ATH12K_HW_TXRX_RAW) + set_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags); + + mutex_lock(&ag->mutex_lock); mutex_lock(&ab->core_lock); - ret = ath12k_core_start(ab, ATH12K_FIRMWARE_MODE_NORMAL); + + /* This should be the last function, add core related + * initializations within this function + */ + ret = ath12k_core_start(ab, ab->fw_mode); if (ret) { ath12k_err(ab, "failed to start core: %d\n", ret); goto err_dp_free; } - ret = ath12k_core_pdev_create(ab); + set_bit(ATH12K_FLAG_CORE_REGISTERED, &ab->dev_flags); + mutex_unlock(&ab->core_lock); + + if (ath12k_core_hw_group_start_ready(ag)) { + + /* initialize the mgmt rx re-order after + * mlo mem is available + */ + ath12k_mgmt_rx_reo_init_context(ab); + ath12k_qmi_mlo_global_snapshot_mem_init(ab); + + ret = ath12k_core_hw_group_start(ag); if (ret) { - ath12k_err(ab, "failed to create pdev core: %d\n", ret); + ath12k_warn(ab, "unable to start hw group\n"); goto err_core_stop; } - ath12k_hif_irq_enable(ab); - mutex_unlock(&ab->core_lock); + ath12k_dbg(ab, ATH12K_DBG_BOOT, "group %d started\n", ag->id); + } else { + ath12k_core_trigger_partner(ab); + } + + mutex_unlock(&ag->mutex_lock); + + /* Add code here carefully */ return 0; err_core_stop: + mutex_lock(&ab->core_lock); ath12k_core_stop(ab); - ath12k_mac_destroy(ab); + clear_bit(ATH12K_FLAG_CORE_REGISTERED, &ab->dev_flags); err_dp_free: ath12k_dp_free(ab); mutex_unlock(&ab->core_lock); + mutex_unlock(&ag->mutex_lock); err_firmware_stop: ath12k_qmi_firmware_stop(ab); return ret; } +#define ATH12K_COLLECT_DUMP_TIMEOUT (120 * HZ) + +void ath12k_core_wait_dump_collect(struct ath12k_base *ab) +{ + int timeout; + + if (ab->collect_dump) { + timeout = wait_event_timeout(ab->ssr_dump_wq, + (ab->collect_dump == false), + ATH12K_COLLECT_DUMP_TIMEOUT); + if (timeout <= 0) + ath12k_warn(ab, "dump collection timed out\n"); + } + return; +} +EXPORT_SYMBOL(ath12k_core_wait_dump_collect); + +void ath12k_core_issue_bug_on(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + + if (ab->in_panic) + goto out; + + /* set in_panic to true to avoid multiple rddm download during + * firmware crash + */ + ab->in_panic = true; + + if (!ag->mlo_capable) + BUG_ON(1); + + if (atomic_read(&ath12k_coredump_ram_info.num_chip) >= ab->ag->num_started) + BUG_ON(1); + else + goto out; + +out: + ath12k_info(ab, + "%d chip dump collected and waiting for partner chips\n", + atomic_read(&ath12k_coredump_ram_info.num_chip)); + +} + +static void ath12k_coredump_download_ahb(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + int dump_count; + struct ath12k_ahb *ab_ahb = ath12k_ahb_priv(ab); + struct ath12k_base *partner_ab; + int i; + + /* Crash the system once all the stats are dumped */ + if (ab->fw_recovery_support && !ab->in_panic) + return; + + if (ag->mlo_capable ) { + dump_count = atomic_read(&ath12k_coredump_ram_info.num_chip); + if (dump_count >= ATH12K_MAX_SOCS) { + ath12k_err(ab, "invalid chip number %d\n", + dump_count); + return; + } + } + if (ab_ahb->tgt_rrproc->state == RPROC_CRASHED && ab->multi_pd_arch) { + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (partner_ab->multi_pd_arch) + atomic_inc(&ath12k_coredump_ram_info.num_chip); + } + } else { + atomic_inc(&ath12k_coredump_ram_info.num_chip); + } + + ath12k_core_issue_bug_on(ab); +} + +/* Print the driver stats and crash the system on receiving this notification */ +static int ath12k_core_ssr_notifier_cb(struct notifier_block *nb, + const unsigned long event, + void *data) +{ + struct ath12k_base *ab = container_of(nb, struct ath12k_base, ssr_nb); + + if (ab->collect_dump && event == ATH12K_SSR_POWERUP) { + ab->collect_dump = false; + wake_up(&ab->ssr_dump_wq); + return NOTIFY_OK; + } + + return NOTIFY_DONE; +} + +static int ath12k_core_rpd_ssr_notifier_cb(struct notifier_block *nb, + const unsigned long event, + void *data) +{ + struct ath12k_base *ab = container_of(nb, struct ath12k_base, rpd_ssr_nb); + + if (ab->collect_dump && event == ATH12K_SSR_POWERUP) { + ab->collect_dump = false; + wake_up(&ab->ssr_dump_wq); + return NOTIFY_OK; + } + + return NOTIFY_DONE; +} + +static int ath12k_core_check_ssr_notifier_as_expected(struct ath12k_base *ab, + void *data, + const char *node) +{ + phandle rproc_phandle; + struct device *dev = ab->dev; + struct platform_device *pdev; + struct device_node *rproc_node; + struct platform_device *ssr_pdev = data; + + if (of_property_read_u32(dev->of_node, node, &rproc_phandle)) + return -EINVAL; + + rproc_node = of_find_node_by_phandle(rproc_phandle); + if (!rproc_node) { + ath12k_warn(ab, "ssr notification failed to get rproc_node\n"); + return -EINVAL; + } + + pdev = of_find_device_by_node(rproc_node); + if (!pdev) { + ath12k_warn(ab, "Failed to get pdev from device node\n"); + return -EINVAL; + } + + if (!ab->in_panic && (strcmp(ssr_pdev->name, pdev->name) != 0)) { + ath12k_warn(ab, "SSR notification mismatch %s pdev name:%s\n", + ssr_pdev->name, pdev->name); + return -EINVAL; + } + + return 0; +} + +static int ath12k_core_atomic_ssr_notifier_cb(struct notifier_block *nb, + const unsigned long event, + void *data) +{ + struct ath12k_base *ab = container_of(nb, struct ath12k_base, atomic_ssr_nb); + struct ath12k_ahb *ab_ahb = ath12k_ahb_priv(ab); + struct platform_device *ssr_pdev = data; + int ret; + + if (event != ATH12K_SSR_PREPARE_SHUTDOWN) + return NOTIFY_DONE; + + if (!test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)) + return NOTIFY_DONE; + + ab->collect_dump = true; + + ret = ath12k_core_check_ssr_notifier_as_expected(ab, data, "qcom,rproc"); + if (ret) + return NOTIFY_DONE; + + if (strcmp(ssr_pdev->name, ab_ahb->tgt_rproc->name) == 0) { + ab->ag->crash_type = ATH12K_RPROC_USERPD_HYBRID_CRASH; + ab_ahb->tgt_rproc->state = RPROC_CRASHED; + } + + if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags))) { + set_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags); + set_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); + queue_work(ab->workqueue_aux, &ab->reset_work); + } + + ath12k_hal_dump_srng_stats(ab); + + return NOTIFY_OK; +} + +/* Print the driver stats and crash the system on receiving this notification */ +static int ath12k_core_rpd_atomic_ssr_notifier_cb(struct notifier_block *nb, + const unsigned long event, + void *data) +{ + struct ath12k_base *ab = container_of(nb, struct ath12k_base, rpd_atomic_ssr_nb); + struct ath12k_hw_group *ag = ab->ag; + struct platform_device *ssr_pdev = data; + struct ath12k_ahb *ab_ahb = ath12k_ahb_priv(ab); + int ret; + + if (event != ATH12K_SSR_PREPARE_SHUTDOWN) + return NOTIFY_DONE; + + if (!test_bit(ATH12K_FLAG_REGISTERED, &ag->dev_flags)) + return NOTIFY_DONE; + + ab->collect_dump = true; + + ret = ath12k_core_check_ssr_notifier_as_expected(ab, data, "qcom,rproc_rpd"); + if (ret) + return NOTIFY_DONE; + + /* Changing the rrpoc->state to crashed disabled the + * remoteproc module to do the recovery process. + * This module will take care of the rrproc recovery process. + */ + if (strcmp(ssr_pdev->name, ab_ahb->tgt_rrproc->name) == 0) { + ag->crash_type = ATH12K_RPROC_ROOTPD_HYBRID_CRASH; + ab_ahb->tgt_rrproc->state = RPROC_CRASHED; + } + + if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ag->dev_flags))) { + set_bit(ATH12K_FLAG_RECOVERY, &ag->dev_flags); + set_bit(ATH12K_FLAG_CRASH_FLUSH, &ag->dev_flags); + queue_work(ab->workqueue_aux, &ag->reset_work); + } + + /* TODO Add more driver stats */ + + return NOTIFY_OK; +} + static int ath12k_core_reconfigure_on_crash(struct ath12k_base *ab) { int ret; mutex_lock(&ab->core_lock); - ath12k_hif_irq_disable(ab); + ath12k_core_pdev_deinit(ab); ath12k_dp_pdev_free(ab); ath12k_hif_stop(ab); ath12k_wmi_detach(ab); @@ -633,21 +2068,20 @@ ath12k_dp_free(ab); ath12k_hal_srng_deinit(ab); + ath12k_dp_umac_reset_deinit(ab); + ath12k_umac_reset_completion(ab); ab->free_vdev_map = (1LL << (ab->num_radios * TARGET_NUM_VDEVS)) - 1; + ab->num_db_cap = 0; ret = ath12k_hal_srng_init(ab); if (ret) return ret; - clear_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); - ret = ath12k_core_qmi_firmware_ready(ab); if (ret) goto err_hal_srng_deinit; - clear_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags); - return 0; err_hal_srng_deinit: @@ -655,61 +2089,99 @@ return ret; } -void ath12k_core_halt(struct ath12k *ar) +static void ath12k_core_mlo_hw_queues_stop(struct ath12k_hw_group *ag, + struct ath12k_base *block_ab) { - struct ath12k_base *ab = ar->ab; + struct ath12k_base *ab; + struct ath12k_hw *ah; + int i; - lockdep_assert_held(&ar->conf_mutex); + lockdep_assert_held(&ag->mutex_lock); - ar->num_created_vdevs = 0; - ar->allocated_vdev_map = 0; + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; - ath12k_mac_scan_finish(ar); - ath12k_mac_peer_cleanup_all(ar); - cancel_delayed_work_sync(&ar->scan.timeout); - cancel_work_sync(&ar->regd_update_work); + ieee80211_stop_queues(ah->hw); + } + ag->hw_queues_stopped = true; - rcu_assign_pointer(ab->pdevs_active[ar->pdev_idx], NULL); - synchronize_rcu(); - INIT_LIST_HEAD(&ar->arvifs); - idr_init(&ar->txmgmt_idr); + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) { + block_ab->qmi.num_radios = ATH12K_QMI_INVALID_RADIO; + clear_bit(ATH12K_FLAG_QMI_HOST_CAP_SENT, &block_ab->dev_flags); + return; + } + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + /* + * In Mode0, partner chips are expected to be asserted, hence reset + * qmi.num_radios count to ensure avoiding duplicate host cap triggers. + */ + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) { + ab->qmi.num_radios = ATH12K_QMI_INVALID_RADIO; + clear_bit(ATH12K_FLAG_QMI_HOST_CAP_SENT, &ab->dev_flags); + } + } } static void ath12k_core_pre_reconfigure_recovery(struct ath12k_base *ab) { struct ath12k *ar; struct ath12k_pdev *pdev; + struct ath12k_link_vif *arvif; + struct ath12k_mac_tx_mgmt_free_arg arg; int i; spin_lock_bh(&ab->base_lock); ab->stats.fw_crash_counter++; spin_unlock_bh(&ab->base_lock); + if (ab->is_reset) + set_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); + for (i = 0; i < ab->num_radios; i++) { pdev = &ab->pdevs[i]; ar = pdev->ar; if (!ar || ar->state == ATH12K_STATE_OFF) continue; - ieee80211_stop_queues(ar->hw); - ath12k_mac_drain_tx(ar); + list_for_each_entry(arvif, &ar->arvifs, list) + if (arvif->is_started) + ath12k_debugfs_remove_interface(arvif); + + ath12k_mac_radio_drain_tx(ar); complete(&ar->scan.started); complete(&ar->scan.completed); + complete(&ar->scan.on_channel); complete(&ar->peer_assoc_done); complete(&ar->peer_delete_done); + if (!list_empty(&ab->neighbor_peers)) + ath12k_debugfs_nrp_cleanup_all(ar); complete(&ar->install_key_done); complete(&ar->vdev_setup_done); complete(&ar->vdev_delete_done); complete(&ar->bss_survey_done); + complete(&ar->thermal.wmi_sync); - wake_up(&ar->dp.tx_empty_waitq); + memset(&arg, 0, sizeof(arg)); + arg.ar = ar; + arg.type = u8_encode_bits(true, ATH12K_MAC_TX_MGMT_FREE_TYPE_PDEV); idr_for_each(&ar->txmgmt_idr, - ath12k_mac_tx_mgmt_pending_free, ar); + ath12k_mac_tx_mgmt_pending_free, &arg); idr_destroy(&ar->txmgmt_idr); + wake_up(&ar->tx_empty_waitq); + + ar->monitor_vdev_id = -1; + clear_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags); + clear_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags); } wake_up(&ab->wmi_ab.tx_credits_wq); wake_up(&ab->peer_mapping_wq); + } static void ath12k_core_post_reconfigure_recovery(struct ath12k_base *ab) @@ -721,7 +2193,8 @@ for (i = 0; i < ab->num_radios; i++) { pdev = &ab->pdevs[i]; ar = pdev->ar; - if (!ar || ar->state == ATH12K_STATE_OFF) + if (!ar || ar->state == ATH12K_STATE_OFF || + ar->state == ATH12K_STATE_TM) continue; mutex_lock(&ar->conf_mutex); @@ -729,8 +2202,15 @@ switch (ar->state) { case ATH12K_STATE_ON: ar->state = ATH12K_STATE_RESTARTING; + if (ar->scan.state == ATH12K_SCAN_RUNNING || + ar->scan.state == ATH12K_SCAN_STARTING) + ar->scan.state = ATH12K_SCAN_ABORTING; + ath12k_mac_scan_finish(ar); + mutex_unlock(&ar->conf_mutex); + cancel_delayed_work_sync(&ar->scan.timeout); + cancel_work_sync(&ar->scan.vdev_del_wk); + mutex_lock(&ar->conf_mutex); ath12k_core_halt(ar); - ieee80211_restart_hw(ar->hw); break; case ATH12K_STATE_OFF: ath12k_warn(ab, @@ -738,6 +2218,7 @@ i); break; case ATH12K_STATE_RESTARTING: + ar->state = ATH12K_STATE_RESTARTED; break; case ATH12K_STATE_RESTARTED: ar->state = ATH12K_STATE_WEDGED; @@ -746,16 +2227,901 @@ ath12k_warn(ab, "device is wedged, will not restart radio %d\n", i); break; + case ATH12K_STATE_TM: + ath12k_warn(ab, "fw mode reset done radio %d\n", i); + break; } mutex_unlock(&ar->conf_mutex); } - complete(&ab->driver_recovery); +} + +void ath12k_core_halt(struct ath12k *ar) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_hw_group *ag = ab->ag; + + lockdep_assert_held(&ar->conf_mutex); + + ar->num_created_vdevs = 0; + ar->allocated_vdev_map = 0; + + ath12k_mac_peer_cleanup_all(ar); + cancel_work_sync(&ar->regd_update_work); + rcu_assign_pointer(ab->pdevs_active[ar->pdev_idx], NULL); + + if(!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags))) + synchronize_rcu(); + + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) + INIT_LIST_HEAD(&ar->arvifs); + + idr_init(&ar->txmgmt_idr); +} + +static void ath12k_core_mode1_recovery_sta_list(void *data, + struct ieee80211_sta *sta) +{ + struct ath12k_link_sta *arsta; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_link_vif *arvif = (struct ath12k_link_vif *)data; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; + struct ath12k *ar = arvif->ar; + struct ath12k_base *ab = arvif->ab; + struct ath12k_key_conf *key_conf = NULL; + struct ath12k_peer *peer; + struct ieee80211_key_conf *key; + int ret = -1, key_idx; + u8 link_id = arvif->link_id; + enum ieee80211_sta_state state, prev_state; + bool sta_added = false; + + if (ahsta->ahvif != arvif->ahvif) + return; + + /* Check if there is a link sta in the vif link */ + if (!(BIT(link_id) & ahsta->links_map)) + return; + + /* From iterator, rcu_read_lock is acquired. Will be revisited + * later to use local list + */ + arsta = ahsta->link[link_id]; + + key_conf = container_of((void *)sta, struct ath12k_key_conf, sta); + + if (vif->type != NL80211_IFTYPE_AP && + vif->type != NL80211_IFTYPE_AP_VLAN && + vif->type != NL80211_IFTYPE_STATION && + vif->type != NL80211_IFTYPE_MESH_POINT) + return; + + peer = ath12k_peer_find(ar->ab, arvif->vdev_id, arsta->addr); + if (peer) { + sta_added = true; + goto key_add; + } + + prev_state = arsta->state; + for (state = IEEE80211_STA_NOTEXIST; + state < prev_state; state++) { + /* all station set case */ + /* TODO: Iterator API is called with rcu lock + * hence need for this unlock/lock statement. + * Need to revisit in next version + */ + rcu_read_unlock(); + ath12k_mac_update_sta_state(ar->ah->hw, arvif->ahvif->vif, sta, + state, (state + 1)); + rcu_read_lock(); + sta_added = true; + } + +key_add: + if (sta_added) + for (key_idx = 0; key_idx < WMI_MAX_KEY_INDEX; key_idx++) { + key = arsta->keys[key_idx]; + + if (key) { + /* BIP needs to be done in software */ + if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC || + key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 || + key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256 || + key->cipher == WLAN_CIPHER_SUITE_BIP_CMAC_256) { + ret = 1; + goto out; + } + + if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ab->ag->dev_flags)) { + ret = 1; + goto out; + } + + if (!arvif->is_created) { + key_conf = kzalloc(sizeof(*key_conf), GFP_ATOMIC); + + if (!key_conf) { + goto out; + } + + key_conf->cmd = SET_KEY; + key_conf->sta = sta; + key_conf->key = key; + + list_add_tail(&key_conf->list, + &ahvif->cache[link_id].key_conf.list); + + ath12k_info(ab, "set key param cached since vif not assign to radio\n"); + goto out; + } + + if (sta->mlo) { + unsigned long links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + if (WARN_ON(!arvif || !arsta)) + continue; + + /* TODO: Iterator API is called with rcu lock + * hence need for this unlock/lock statement. + * Need to revisit in next version + */ + rcu_read_unlock(); + ret = ath12k_mac_set_key(arvif->ar, SET_KEY, arvif, arsta, key); + rcu_read_lock(); + if (ret) + break; + arsta->keys[key->keyidx] = key; + } + } else { + arsta = &ahsta->deflink; + arvif = arsta->arvif; + if (WARN_ON(!arvif)) + goto out; + + /* TODO: Iterator API is called with rcu lock + * hence need for this unlock/lock statement. + * Need to revisit in next version + */ + rcu_read_unlock(); + ret = ath12k_mac_set_key(arvif->ar, SET_KEY, arvif, arsta, key); + rcu_read_lock(); + arsta->keys[key->keyidx] = key; + } + } + } + + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "Recovered sta:%pM link_id:%d, num_sta:%d\n", + arsta->addr, arsta->link_id, arvif->ar->num_stations); + + ret = 0; +out: + return; +} + +static void ath12k_core_iterate_sta_list(struct ath12k *ar, + struct ath12k_link_vif *arvif) +{ + /* unlock ar mutex here as the iterator will be called + * within rcu lock. + */ + mutex_unlock(&ar->conf_mutex); + ieee80211_iterate_stations_atomic(ar->ah->hw, + ath12k_core_mode1_recovery_sta_list, + arvif); + mutex_lock(&ar->conf_mutex); +} + +static void ath12k_core_ml_sta_add(struct ath12k *ar) +{ + struct ath12k_link_vif *arvif, *tmp; + struct ieee80211_bss_conf *info; + struct ath12k_vif *ahvif; + struct ieee80211_vif *vif; + + mutex_lock(&ar->conf_mutex); + list_for_each_entry_safe_reverse(arvif, tmp, &ar->arvifs, list) { + ahvif = arvif->ahvif; + + if (!ahvif) + continue; + + vif = ahvif->vif; + if (ahvif->vdev_type != WMI_VDEV_TYPE_STA) + continue; + + if (!vif->valid_links) + continue; + + ath12k_core_iterate_sta_list(ar, arvif); + + info = vif->link_conf[arvif->link_id]; + /* Set is_up to false as we will do + * recovery for that vif in the + * upcoming executions + */ + arvif->is_up = false; + if (vif->cfg.assoc && info) + ath12k_bss_assoc(ar, arvif, info); + else + ath12k_bss_disassoc(ar, arvif, false); + ath12k_dbg(ar->ab, ATH12K_DBG_MODE1_RECOVERY, + "station vif:%pM recovered\n", + arvif->addr); + } + mutex_unlock(&ar->conf_mutex); +} + +/* API to recovery station VIF enabled in non-asserted links */ +static void ath12k_core_mlo_recover_station(struct ath12k_hw_group *ag, + struct ath12k_base *assert_ab) +{ + struct ath12k_base *ab; + struct ath12k_pdev *pdev; + struct ath12k *ar; + int i, j; + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + if (ab == assert_ab) + continue; + + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + if (list_empty(&ar->arvifs)) + continue; + + /* Re-add all MLD station VIF which are + * in non-asserted link + */ + ath12k_core_ml_sta_add(ar); + } + } +} + +static int ath12k_mlo_recovery_link_vif_reconfig(struct ath12k *ar, + struct ath12k_vif *ahvif, + struct ath12k_link_vif *arvif, + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf) +{ + int i; + int link_id = arvif->link_id; + struct ath12k_hw *ah = ar->ah; + struct ieee80211_tx_queue_params params; + struct wmi_wmm_params_arg *p = NULL; + struct ieee80211_bss_conf *info; + u64 changed = 0; + + switch (vif->type) { + case NL80211_IFTYPE_AP_VLAN: + case NL80211_IFTYPE_MONITOR: + break; + case NL80211_IFTYPE_ADHOC: + fallthrough; + default: + ieee80211_iterate_stations_atomic(ar->ah->hw, + ath12k_core_mode1_recovery_sta_list, + arvif); + fallthrough; + case NL80211_IFTYPE_AP: /* AP stations are handled later */ + for (i = 0; i < IEEE80211_NUM_ACS; i++) { + + if ((vif->active_links && + !(vif->active_links & BIT(link_id))) || + link_id >= IEEE80211_MLD_MAX_NUM_LINKS) + break; + + switch (i) { + case IEEE80211_AC_VO: + p = &arvif->wmm_params.ac_vo; + break; + case IEEE80211_AC_VI: + p = &arvif->wmm_params.ac_vi; + break; + case IEEE80211_AC_BE: + p = &arvif->wmm_params.ac_be; + break; + case IEEE80211_AC_BK: + p = &arvif->wmm_params.ac_bk; + break; + } + + params.cw_min = p->cwmin; + params.cw_max = p->cwmax; + params.aifs = p->aifs; + params.txop = p->txop; + + mutex_lock(&ar->conf_mutex); + ath12k_mac_conf_tx(ar, arvif, i, ¶ms); + mutex_unlock(&ar->conf_mutex); + } + break; + } + + mutex_lock(&ah->conf_mutex); + + /* common change flags for all interface types */ + changed = BSS_CHANGED_ERP_CTS_PROT | + BSS_CHANGED_ERP_PREAMBLE | + BSS_CHANGED_ERP_SLOT | + BSS_CHANGED_HT | + BSS_CHANGED_BASIC_RATES | + BSS_CHANGED_BEACON_INT | + BSS_CHANGED_BSSID | + BSS_CHANGED_CQM | + BSS_CHANGED_QOS | + BSS_CHANGED_TXPOWER | + BSS_CHANGED_MCAST_RATE; + + if (link_conf->mu_mimo_owner) + changed |= BSS_CHANGED_MU_GROUPS; + + switch (vif->type) { +#ifdef CONFIG_MAC80211_BONDED_SUPPORT + case NL80211_IFTYPE_DUMMY: + mutex_unlock(&ah->conf_mutex); + return 0; +#endif + case NL80211_IFTYPE_STATION: + if (!vif->valid_links) { + /* Set this only for legacy stations */ + changed |= BSS_CHANGED_ASSOC | + BSS_CHANGED_ARP_FILTER | + BSS_CHANGED_PS; + + /* Assume re-send beacon info report to the driver */ + changed |= BSS_CHANGED_BEACON_INFO; + + if (link_conf->max_idle_period || + link_conf->protected_keep_alive) + changed |= BSS_CHANGED_KEEP_ALIVE; + + if (!arvif->is_created) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "bss info parameter changes %llx cached to apply after vdev create on channel assign\n", + changed); + ahvif->cache[link_id].bss_conf_changed |= changed; + + mutex_unlock(&ah->conf_mutex); + return 0; + } + } + + mutex_lock(&ar->conf_mutex); + /* Set is_up to false as we will do + * recovery for that vif in the + * upcoming executions + */ + arvif->is_up = false; + ath12k_mac_bss_info_changed(ar, arvif, link_conf, changed); + if (vif->valid_links) { + info = vif->link_conf[link_id]; + if (vif->cfg.assoc) { + if (info) + ath12k_bss_assoc(ar, arvif, info); + } else { + ath12k_bss_disassoc(ar, arvif, false); + } + } + mutex_unlock(&ar->conf_mutex); + break; + case NL80211_IFTYPE_OCB: + changed |= BSS_CHANGED_OCB; + + mutex_lock(&ar->conf_mutex); + ath12k_mac_bss_info_changed(ar, arvif, link_conf, changed); + mutex_unlock(&ar->conf_mutex); + break; + case NL80211_IFTYPE_ADHOC: + changed |= BSS_CHANGED_IBSS; + fallthrough; + case NL80211_IFTYPE_AP: + changed |= BSS_CHANGED_P2P_PS; + + if (vif->type == NL80211_IFTYPE_AP) { + changed |= BSS_CHANGED_AP_PROBE_RESP; + ahvif->u.ap.ssid_len = vif->cfg.ssid_len; + if (vif->cfg.ssid_len) + memcpy(ahvif->u.ap.ssid, vif->cfg.ssid, vif->cfg.ssid_len); + } + fallthrough; + case NL80211_IFTYPE_MESH_POINT: + if (link_conf->enable_beacon) { + changed |= BSS_CHANGED_BEACON | + BSS_CHANGED_BEACON_ENABLED; + + mutex_lock(&ar->conf_mutex); + ath12k_mac_bss_info_changed(ar, arvif, link_conf, + changed & ~BSS_CHANGED_IDLE); + mutex_unlock(&ar->conf_mutex); + + } + break; + case NL80211_IFTYPE_NAN: + case NL80211_IFTYPE_AP_VLAN: + case NL80211_IFTYPE_MONITOR: + case NL80211_IFTYPE_P2P_DEVICE: + /* nothing to do */ + break; + case NL80211_IFTYPE_UNSPECIFIED: + case NUM_NL80211_IFTYPES: + case NL80211_IFTYPE_P2P_CLIENT: + case NL80211_IFTYPE_P2P_GO: + case NL80211_IFTYPE_WDS: + WARN_ON(1); + break; + } + + mutex_unlock(&ah->conf_mutex); + ath12k_dbg(ar->ab, ATH12K_DBG_MODE1_RECOVERY, + "Reconfig link vif done:type:%d\n", vif->type); + + return 0; +} + +static int ath12k_mlo_core_recovery_reconfig_link_bss(struct ath12k *ar, + struct ieee80211_bss_conf *link_conf, + struct ath12k_vif *ahvif, + struct ath12k_link_vif *arvif) +{ + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k_base *ab = ar->ab; + struct ath12k_hw *ah = ar->ah; + enum ieee80211_ap_reg_power power_type; + struct ath12k_wmi_peer_create_arg param; + struct ieee80211_chanctx_conf *ctx = &arvif->chanctx; + int ret = -1; + u8 link_id = link_conf->link_id; + + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "Recovering: link_id:%d [vif->link_id:%d] type:%d\n", + link_id, arvif->link_id, vif->type); + + mutex_lock(&ah->conf_mutex); + + if (vif->type == NL80211_IFTYPE_AP && + ar->num_peers > (ar->max_num_peers - 1)) { + ath12k_err(ab, "Error in peers:%d\n", + ar->num_peers); + goto exit; + } + + if (ar->num_created_vdevs > (TARGET_NUM_VDEVS - 1)) { + ath12k_err(ab, "failed to create vdev, reached max vdev limit %d[%d]\n", + ar->num_created_vdevs, + TARGET_NUM_VDEVS); + goto exit; + } + + mutex_lock(&ar->conf_mutex); + + ret = ath12k_mac_vdev_create(ar, arvif); + if (!ret) + ath12k_mac_vif_cache_flush(ar, vif, arvif->link_id); + + if (ar->supports_6ghz && ctx->def.chan->band == NL80211_BAND_6GHZ && + (ahvif->vdev_type == WMI_VDEV_TYPE_STA || + ahvif->vdev_type == WMI_VDEV_TYPE_AP)) { + power_type = link_conf->power_type; + ath12k_dbg(ab, ATH12K_DBG_MAC, "mac chanctx power type %d\n", + power_type); + if (power_type == IEEE80211_REG_UNSET_AP) + power_type = IEEE80211_REG_LPI_AP; + + /* TODO: Transmit Power Envelope specification for 320 is not + * available yet. Need to add TPE 320 support when spec is ready + */ + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA && + ctx->def.width != NL80211_CHAN_WIDTH_320) { + ath12k_mac_parse_tx_pwr_env(ar, arvif, ctx); + } + } + + /* for some targets bss peer must be created before vdev_start */ + if (ab->hw_params->vdev_start_delay && + ahvif->vdev_type != WMI_VDEV_TYPE_AP && + ahvif->vdev_type != WMI_VDEV_TYPE_MONITOR && + !ath12k_peer_find_by_vdev_id(ab, arvif->vdev_id)) { + ret = 0; + goto exit; + } + + if (ab->hw_params->vdev_start_delay && + (ahvif->vdev_type == WMI_VDEV_TYPE_AP || + ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR)) { + param.vdev_id = arvif->vdev_id; + param.peer_type = WMI_PEER_TYPE_DEFAULT; + param.peer_addr = ar->mac_addr; + + ret = ath12k_peer_create(ar, arvif, NULL, ¶m); + if (ret) { + ath12k_warn(ab, "failed to create peer after vdev start delay: %d", + ret); + goto exit; + } + } + + if (ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + ret = ath12k_mac_monitor_start(ar); + if (ret) + goto exit; + arvif->is_started = true; + goto exit; + } + + ret = ath12k_mac_vdev_start(arvif, &ctx->def, ctx->radar_enabled); + if (ret) { + ath12k_err(ab, "vdev start failed during recovery\n"); + goto exit; + } + + if (ahvif->vdev_type != WMI_VDEV_TYPE_MONITOR && + test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) + ath12k_mac_monitor_start(ar); + + arvif->is_started = true; + arvif->is_created = true; + + ret = 0; +exit: + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "ret:%d No. of vdev created:%d, links_map:%lu, flag:%d\n", + ret, + ahvif->num_vdev_created, + ahvif->links_map, + arvif->is_created); + + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + + return ret; +} + +static void ath12k_core_peer_disassoc(struct ath12k_hw_group *ag, + struct ath12k_base *assert_ab) +{ + struct ath12k_base *ab; + struct ath12k_peer *peer, *tmp; + struct ath12k_sta *ahsta; + struct ieee80211_sta *sta; + int i; + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + list_for_each_entry_safe(peer, tmp, &ab->peers, list) { + if (!peer->sta || !peer->vif) + continue; + + /* Allow sending disassoc to legacy peer + * only for asserted radio + */ + if (!peer->mlo && ab != assert_ab) + continue; + + sta = peer->sta; + ahsta = (struct ath12k_sta *)sta->drv_priv; + + /* Send low ack to disassoc the MLD station + * Need to check on the sequence as FW has + * discarded the management packet at this + * sequence. + */ + if (!ahsta->low_ack_sent) { + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "sending low ack for/disassoc:%pM\n", + sta->addr); + /* set num of packets to maximum so + * that we distinguish in the hostapd + * to send disassoc irrespective of + * hostapd conf + */ + ieee80211_report_low_ack(sta, 0xFFFF); + /* Using this flag to avoid certain + * known warnings which will be + * triggerred when umac reset is + * happening + */ + ahsta->low_ack_sent = true; + } + } + } +} + +/* Wrapper function for recovery after crash */ +int ath12k_mode1_recovery_reconfig(struct ath12k_base *ab) +{ + struct ath12k *ar = NULL; + struct ath12k_pdev *pdev; + struct ath12k_link_vif *arvif, *tmp; + struct ath12k_vif *ahvif ; + struct ieee80211_bss_conf *link; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_base *partner_ab; + struct ath12k_hw *ah; + struct ieee80211_key_conf *key; + int i, j, key_idx; + int ret = -EINVAL; + bool started = false; + + + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + if (WARN_ON(!ar)) + continue; + + if (!ath12k_ftm_mode) { + if (ath12k_mac_radio_start(ar)) { + ath12k_err(ab, "mac radio start failed\n"); + return ret; + } + ar->ah->in_recovery = true; + started = true; + } + + if (list_empty(&ar->arvifs)) + continue; + + /* Decrement number of vdev created for all the arvif + * under a ar + */ + list_for_each_entry_safe_reverse(arvif, tmp, &ar->arvifs, list) { + arvif->ahvif->num_vdev_created--; + } + } + + /* add chanctx/hw_config/filter part */ + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + mutex_lock(&ar->conf_mutex); + + list_for_each_entry_safe_reverse(arvif, tmp, &ar->arvifs, list) { + ahvif = arvif->ahvif; + + if (!ahvif) + continue; + + arvif->is_started = false; + arvif->is_created = false; + + rcu_read_lock(); + link = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]); + + /* Not expected */ + if (WARN_ON(!link)) { + rcu_read_unlock(); + continue; + } + rcu_read_unlock(); + spin_lock_bh(&ar->data_lock); + + ar->rx_channel = link->chandef.chan; + spin_unlock_bh(&ar->data_lock); + + /* hw_config */ + if (ar->ah->hw->conf.flags & IEEE80211_CONF_MONITOR) { + set_bit(MONITOR_CONF_ENABLED, &ar->monitor_flags); + + if (test_bit(MONITOR_VDEV_CREATED, + &ar->monitor_flags)) { + ret = ath12k_mac_monitor_vdev_create(ar); + if (!ret && ath12k_mac_monitor_start(ar)) { + ath12k_err(ab, "unable to start monitor vdev\n"); + ath12k_mac_monitor_vdev_delete(ar); + } else { + ath12k_err(ab, "unable to create monitor vdev\n"); + } + } + } else { + clear_bit(MONITOR_CONF_ENABLED, &ar->monitor_flags); + if (test_bit(MONITOR_VDEV_CREATED, + &ar->monitor_flags)) { + ret = ath12k_mac_monitor_stop(ar); + if (!ret && ath12k_mac_monitor_vdev_delete(ar)) + ath12k_err(ab, "monitor vdev delete failed\n"); + else + ath12k_err(ab, "failed to stop monitor stop\n"); + } + } + + + /* configure filter - we can use the same flag*/ + } + mutex_unlock(&ar->conf_mutex); + } + + /* assign chanctx part */ + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + mutex_lock(&ar->conf_mutex); + + list_for_each_entry_safe_reverse(arvif, tmp, &ar->arvifs, list) { + ahvif = arvif->ahvif; + + if (!ahvif) + continue; + + rcu_read_lock(); + link = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]); + + /* Not expected */ + if (WARN_ON(!link)) { + rcu_read_unlock(); + continue; + } + rcu_read_unlock(); + + /* unlock ar mutex here since we will take ah mutex in + * the reconfig link API thus maintaining same order + * as we use in other places. + */ + mutex_unlock(&ar->conf_mutex); + ret = ath12k_mlo_core_recovery_reconfig_link_bss(ar, link, ahvif, arvif); + if (ret) { + ath12k_err(ab, "ERROR in reconfig link:%d\n", + ret); + return ret; + } + mutex_lock(&ar->conf_mutex); + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "vdev_created getting incremented:%d\n", + ahvif->num_vdev_created); + } + mutex_unlock(&ar->conf_mutex); + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, "assign chanctx is completed\n"); + } + + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + + clear_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &partner_ab->dev_flags); + } + + /* reconfig_link_bss */ + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + mutex_lock(&ar->conf_mutex); + + list_for_each_entry_safe_reverse(arvif, tmp, &ar->arvifs, list) { + ahvif = arvif->ahvif; + + if (!ahvif) + continue; + + rcu_read_lock(); + link = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]); + + /* Not expected */ + if (WARN_ON(!link)) { + rcu_read_unlock(); + } + rcu_read_unlock(); + + /* unlock ar mutex here since we will take ah mutex in + * the reconfig link API thus maintaining same order + * as we use in other places. + */ + mutex_unlock(&ar->conf_mutex); + ret = ath12k_mlo_recovery_link_vif_reconfig(ar, ahvif, + arvif, + arvif->ahvif->vif, + link); + if (ret) { + ath12k_err(ab, "Failed to update reconfig_bss\n"); + return ret; + } + mutex_lock(&ar->conf_mutex); + } + mutex_unlock(&ar->conf_mutex); + } + + /* recover station VIF enabled in non-asserted links */ + ath12k_core_mlo_recover_station(ag, ab); + + /* sta state part */ + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + + for (j = 0; j < partner_ab->num_radios; j++) { + pdev = &partner_ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + mutex_lock(&ar->conf_mutex); + + if (list_empty(&ar->arvifs)) { + mutex_unlock(&ar->conf_mutex); + continue; + } + list_for_each_entry_safe_reverse(arvif, tmp, &ar->arvifs, list) { + ahvif = arvif->ahvif; + + if (!ahvif) + continue; + + /* unlock ar mutex here as the iterator will be called + * within rcu lock. + */ + if (ahvif->vdev_type != WMI_VDEV_TYPE_STA) { + ath12k_core_iterate_sta_list(ar, arvif); + } + + for (key_idx = 0; key_idx < WMI_MAX_KEY_INDEX; key_idx++) { + key = arvif->keys[key_idx]; + if (key) { + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "key:%p cipher:%d idx:%d flags:%d\n", + key, key->cipher, key->keyidx, key->flags); + ret = ath12k_mac_set_key(arvif->ar, SET_KEY, arvif, NULL, key); + } + } + } + mutex_unlock(&ar->conf_mutex); + ar->ah->in_recovery = false; + } + } + + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; + + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + ath12k_mac_reconfig_complete(ah->hw, + IEEE80211_RECONFIG_TYPE_RESTART, + ar); + } + } + + /* Send disassoc to MLD STA */ + ath12k_core_peer_disassoc(ag, ab); + ab->recovery_start = false; + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, "Mode1 recovery completed\n"); + return ret; } static void ath12k_core_restart(struct work_struct *work) { struct ath12k_base *ab = container_of(work, struct ath12k_base, restart_work); + struct ath12k_hw_group *ag = ab->ag; int ret; + struct ath12k_hw *ah; + struct ath12k *ar; + int i; if (!ab->is_reset) ath12k_core_pre_reconfigure_recovery(ab); @@ -763,38 +3129,402 @@ ret = ath12k_core_reconfigure_on_crash(ab); if (ret) { ath12k_err(ab, "failed to reconfigure driver on crash recovery\n"); + /* + * If for any reason, reconfiguration fails, issue bug on for + * Mode 0 + */ + if (ath12k_ssr_failsafe_mode && ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) + BUG_ON(1); return; } - if (ab->is_reset) - complete_all(&ab->reconfigure_complete); + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "ab->is_reset[%d]\n", ab->is_reset); + ar = ab->pdevs[0].ar; if (!ab->is_reset) ath12k_core_post_reconfigure_recovery(ab); + + if (ath12k_core_hw_group_start_ready(ag) && + ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) { + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; + + mutex_lock(&ah->conf_mutex); + ieee80211_restart_hw(ah->hw); + mutex_unlock(&ah->conf_mutex); + } + } +#ifdef CONFIG_ATH12K_SAWF + if (ath12k_sawf_reconfigure_on_crash(ab)) + ath12k_warn(ab, "SAWF SLA reconfiguring failed\n"); +#endif /* CONFIG_ATH12K_SAWF */ + + if (ath12k_core_hw_group_start_ready(ag) && + ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) { + queue_work(ab->workqueue_aux, &ab->recovery_work); + } +} + +static void ath12k_core_mode1_recovery_work(struct work_struct *work) +{ + struct ath12k_base *ab = container_of(work, struct ath12k_base, recovery_work); + + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "queued recovery work\n"); + ath12k_mode1_recovery_reconfig(ab); +} + +static int ath12k_core_rproc_stop(struct rproc *rproc) +{ + int ret = 0; + + if (!rproc) + return ret; + + if (rproc->state != RPROC_OFFLINE) { + ret = rproc_shutdown(rproc); + if (ret < 0) { + ath12k_err(NULL, "rproc:%s stop failed:%d\n", + rproc->name, ret); + } + } + return ret; } +static int ath12k_core_rproc_start(struct rproc *rproc) +{ + const struct firmware *firmware_p = NULL; + struct device *dev; + int ret = 0; + + if (rproc && rproc->state != RPROC_RUNNING) { + dev = &rproc->dev; + ret = request_firmware(&firmware_p, rproc->firmware, dev); + if (ret < 0) { + ath12k_err(NULL, "rproc:%s request_firmware failed: %d\n", + rproc->name, ret); + return ret; + } + ret = rproc_boot(rproc); + if (ret < 0) { + ath12k_err(NULL, "rproc:%s start failed: %d\n", + rproc->name, ret); + } + release_firmware(firmware_p); + } + return ret; +} + +static void ath12k_core_rproc_coredump(struct ath12k_base *ab, + struct rproc *rproc) +{ + if (rproc) { + ath12k_info(ab, "WLAN target is restarting"); + rproc->ops->coredump(rproc); + } +} + +/* Asserted target's reboot handling for crash type ATH12K_RPROC_ROOTPD_AHB_CRASH */ +static void ath12k_core_rproc_boot_recovery(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_ahb *ab_ahb = ath12k_ahb_priv(ab); + + if (ag->crash_type != ATH12K_RPROC_ROOTPD_AHB_CRASH) + return; + + /* + * Stop user pd + * Collect coredump using user pd if enabled + * Stop root pd + * Collect coredump using root pd + * Free Target memory chunk + * Start root pd, then start user pd + */ + + ab_ahb->tgt_rproc->state = RPROC_CRASHED; + ath12k_core_rproc_stop(ab_ahb->tgt_rproc); + + ab_ahb->tgt_rproc->state = RPROC_SUSPENDED; + ath12k_core_rproc_coredump(ab, ab_ahb->tgt_rproc); + + ab_ahb->tgt_rrproc->state = RPROC_RUNNING; + ath12k_core_rproc_stop(ab_ahb->tgt_rrproc); + ath12k_core_rproc_coredump(ab, ab_ahb->tgt_rrproc); + + ath12k_qmi_free_target_mem_chunk(ab); + + ath12k_core_rproc_start(ab_ahb->tgt_rrproc); + ath12k_core_rproc_start(ab_ahb->tgt_rproc); + ag->crash_type = ATH12K_NO_CRASH; + ath12k_core_wait_dump_collect(ab); +} + +/* Asserted target's reboot handling for crash type ATH12K_RPROC_USERPD_HYBRID_CRASH */ +static void ath12k_core_upd_rproc_boot_recovery(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_ahb *ab_ahb = ath12k_ahb_priv(ab); + + if (ag->crash_type != ATH12K_RPROC_USERPD_HYBRID_CRASH) + return; + + /* + * Stop user pd + * Collect coredump using user pd + * Free Target memory chunk + * Start root pd + */ + ath12k_core_rproc_stop(ab_ahb->tgt_rproc); + ath12k_core_rproc_coredump(ab, ab_ahb->tgt_rproc); + ath12k_qmi_free_target_mem_chunk(ab); + ath12k_core_rproc_start(ab_ahb->tgt_rproc); + ag->crash_type = ATH12K_NO_CRASH; + ath12k_core_wait_dump_collect(ab); +} + +/* Asserted target's reboot handling for crash type ATH12K_RPROC_ROOTPD_HYBRID_CRASH */ +static void ath12k_core_rpd_rproc_boot_recovery(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_ahb *ab_ahb = ath12k_ahb_priv(ab); + struct rproc *rootpd_rproc = ab_ahb->tgt_rrproc; + struct rproc *txtpd_rproc = ab_ahb->tgt_text_rproc; + struct rproc *usrpd_rproc = ab_ahb->tgt_rproc; + struct ath12k_base *tmp_ab; + int user_pd, ret; + + if (ag->crash_type != ATH12K_RPROC_ROOTPD_HYBRID_CRASH) + return; + + if (!rootpd_rproc || !usrpd_rproc) { + ath12k_err(ab, "rproc(s) are null\n"); + return; + } + + if (rootpd_rproc->state == RPROC_OFFLINE) { + ath12k_err(ab, "rootpd rproc:%s is already stopped.\n", + rootpd_rproc->name); + return; + } + + if (usrpd_rproc->state == RPROC_OFFLINE) { + ath12k_err(ab, "userpd rproc:%s is already stopped.\n", + usrpd_rproc->name); + return; + } + + usrpd_rproc->state = RPROC_CRASHED; + ret = ath12k_core_rproc_stop(usrpd_rproc); + if (ret) + ath12k_err(ab, "failed to stop user_pd:%s ret:%d\n", + usrpd_rproc->name, ret); + + /* Reboot Sequence of all remoteproc pds + * 1. Stop all user pds + * 2. In case of text device present, stop text pd + * 3. Stop the root pd + * 4. Do the coredump using root pd handle once all user pds and root + * pd are stopped: + * Root pd handle coredump will take care of all the userpd data + * collection as part of the coredump + * 5. Free Target memory chunk + * 6. Power up the remote processor again as per below sequence + * Start the rootpd device + * Start textpd device if present + * Start all userpd devices + */ + if (!ag->num_started) { + if (txtpd_rproc && txtpd_rproc->state != RPROC_OFFLINE) { + txtpd_rproc->state = RPROC_CRASHED; + ret = ath12k_core_rproc_stop(txtpd_rproc); + if (ret) + ath12k_err(ab, "failed to stop text_pd:%s ret:%d\n", + txtpd_rproc->name, ret); + } + rootpd_rproc->state = RPROC_RUNNING; + ret = ath12k_core_rproc_stop(rootpd_rproc); + if (ret) + ath12k_err(ab, "failed to stop root_pd:%s ret:%d\n", + rootpd_rproc->name, ret); + + ath12k_core_rproc_coredump(ab, rootpd_rproc); + } + + ath12k_qmi_free_target_mem_chunk(ab); + + if (!ag->num_started) { + ret = ath12k_core_rproc_start(rootpd_rproc); + if (ret) + ath12k_err(ab, "failed to start root_pd:%s ret:%d\n", + rootpd_rproc->name, ret); + + ath12k_core_wait_dump_collect(ab); + + if (txtpd_rproc) { + ret = ath12k_core_rproc_start(txtpd_rproc); + if (ret) + ath12k_err(ab, "failed to start text_pd:%s ret:%d\n", + txtpd_rproc->name, ret); + } + + for (user_pd = 0; user_pd < ag->num_chip; user_pd++) { + tmp_ab = ag->ab[user_pd]; + if (tmp_ab->hif.bus == ATH12K_BUS_PCI) + continue; + + ab_ahb = ath12k_ahb_priv(tmp_ab); + usrpd_rproc = ab_ahb->tgt_rproc; + ret = ath12k_core_rproc_start(usrpd_rproc); + if (ret) { + ath12k_err(tmp_ab, "failed to start user_pd:%s ret:%d\n", + usrpd_rproc->name, ret); + } + } + + ag->crash_type = ATH12K_NO_CRASH; + } +} + +/* + * Trigger umac_reset with umac_reset flag set. This is a + * waiting function which will return only after UMAC reset + * is complete on non-asserted chip set. UMAC reset completion + * is identified by waiting for MLO Teardown complete for all + * chipsets + */ +static int ath12k_core_trigger_umac_reset(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + long time_left; + int ret = 0; + + reinit_completion(&ag->umac_reset_complete); + + ath12k_mac_mlo_teardown_with_umac_reset(ab); + + time_left = wait_for_completion_timeout(&ag->umac_reset_complete, + msecs_to_jiffies(ATH12K_UMAC_RESET_TIMEOUT_IN_MS)); + + if (!time_left) { + ath12k_warn(ab, "UMAC reset didn't get completed within 200 ms\n"); + ret = -ETIMEDOUT; + } + + ag->trigger_umac_reset = false; + return ret; +} + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +static void ath12k_core_disable_ppe_rtnl_bond_release(struct ath12k_base *ab) +{ + struct ath12k *ar; + struct ath12k_pdev *pdev; + struct ath12k_link_vif *arvif; + struct net_device *link_ndev; + int i; + + rtnl_lock(); + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + ar = pdev->ar; + + if (!ar || ar->state == ATH12K_STATE_OFF) + continue; + + mutex_lock(&ar->conf_mutex); + list_for_each_entry(arvif, &ar->arvifs, list) { + if (arvif->ndev_pvt) { + link_ndev = arvif->ndev_pvt->link_ndev; + if (arvif->ndev_pvt->bond_dev && + arvif->ndev_pvt->bond_dev->flags & IFF_UP) { + netif_tx_stop_all_queues(arvif->ndev_pvt->bond_dev); + arvif->ndev_pvt->bond_dev->flags &= ~IFF_UP; + } + + if (link_ndev) { + netif_tx_stop_all_queues(link_ndev); + if (ab->ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) { + ath12k_bond_link_release(arvif); + ath12k_disable_ppe_for_link_netdev(ab, + arvif, + link_ndev); + } + } + } + } + mutex_unlock(&ar->conf_mutex); + } + + rtnl_unlock(); +} +#endif + static void ath12k_core_reset(struct work_struct *work) { struct ath12k_base *ab = container_of(work, struct ath12k_base, reset_work); - int reset_count, fail_cont_count; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_hw *ah; + struct ath12k_base *partner_ab; +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + struct ath12k_pdev *pdev; + struct ath12k *ar; + int j; +#endif + int reset_count, fail_cont_count, i; long time_left; + bool teardown = false; - if (!(test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags))) { - ath12k_warn(ab, "ignore reset dev flags 0x%lx\n", ab->dev_flags); - return; + if (ab->recovery_mode_address) { + switch (*ab->recovery_mode_address) { + case ATH12K_MLO_RECOVERY_MODE1: + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE1; + break; + case ATH12K_MLO_RECOVERY_MODE0: + fallthrough; + default: + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; } + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "mode:%d\n", ag->recovery_mode); + } else { + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; + } + ath12k_info(ab, "Recovery is initiated with Mode%s\n", + (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0 ? "0" : "1")); + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (!ab->is_reset) { + ath12k_hif_ppeds_irq_disable(ab, PPEDS_IRQ_PPE2TCL); + ath12k_hif_ppeds_irq_disable(ab, PPEDS_IRQ_REO2PPE); + ath12k_hif_ppeds_irq_disable(ab, PPEDS_IRQ_PPE_WBM2SW_REL); + ath12k_core_disable_ppe_rtnl_bond_release(ab); + } +#endif /* Sometimes the recovery will fail and then the next all recovery fail, - * this is to avoid infinite recovery since it can not recovery success + * this is to avoid infinite recovery since it can not recovery success. */ fail_cont_count = atomic_read(&ab->fail_cont_count); - if (fail_cont_count >= ATH12K_RESET_MAX_FAIL_COUNT_FINAL) + if (fail_cont_count >= ATH12K_RESET_MAX_FAIL_COUNT_FINAL) { + ath12k_warn(ab, "Recovery Failed, Fail count:%d MAX_FAIL_COUNT final:%d\n", + fail_cont_count, + ATH12K_RESET_MAX_FAIL_COUNT_FINAL); return; + } if (fail_cont_count >= ATH12K_RESET_MAX_FAIL_COUNT_FIRST && - time_before(jiffies, ab->reset_fail_timeout)) + time_before(jiffies, ab->reset_fail_timeout)) { + ath12k_warn(ab, "Recovery Failed, Fail count:%d MAX_FAIL_COUNT first:%d\n", + fail_cont_count, + ATH12K_RESET_MAX_FAIL_COUNT_FIRST); return; + } reset_count = atomic_inc_return(&ab->reset_count); @@ -805,6 +3535,9 @@ */ ath12k_warn(ab, "already resetting count %d\n", reset_count); + if (ath12k_ssr_failsafe_mode && ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) + BUG_ON(1); + reinit_completion(&ab->reset_complete); time_left = wait_for_completion_timeout(&ab->reset_complete, ATH12K_RESET_TIMEOUT_HZ); @@ -816,32 +3549,286 @@ ab->reset_fail_timeout = jiffies + ATH12K_RESET_FAIL_TIMEOUT_HZ; /* Record the continuous recovery fail count when recovery failed*/ - fail_cont_count = atomic_inc_return(&ab->fail_cont_count); + atomic_inc(&ab->fail_cont_count); } ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset starting\n"); + ab->recovery_start_time = jiffies; + + mutex_lock(&ag->mutex_lock); + + if (!ab->is_reset) + ath12k_hif_irq_disable(ab); ab->is_reset = true; atomic_set(&ab->recovery_count, 0); + /* Incase recovery fails and FW asserts again, this is to prevent invalid operation. */ + if (ag->num_started && ab->fw_recovery_support) + ag->num_started--; + + if (!ag->hw_queues_stopped) { + ath12k_core_mlo_hw_queues_stop(ag, ab); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) { + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (ab == partner_ab) + continue; + for (j = 0; j < partner_ab->num_radios; j++) { + pdev = &partner_ab->pdevs[j]; + ar = pdev->ar; + if (!ar) + continue; + ath12k_ppeds_partner_link_stop_queues(ar); + } + } + } +#endif + } + + + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (ab == partner_ab) + continue; + + teardown = false; + /* Need to check partner_ab flag to select recovery mode + * as Mode0, if continuous reset has happened + */ + + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) { + if (test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &partner_ab->dev_flags) || + test_bit(ATH12K_FLAG_RECOVERY, &partner_ab->dev_flags)) { + /* On receiving MHI Interrupt for pdev which is + * already in UMAC Recovery, then fallback to + * MODE0 + */ + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; + } else if ((!test_bit(ATH12K_FLAG_RECOVERY, &partner_ab->dev_flags)) && + (!(test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &partner_ab->dev_flags)))) { + /* Set dev flags to UMAC recovery START + * and set flag to send teardown later + */ + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "setting teardown to true\n"); + set_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &partner_ab->dev_flags); + teardown = true; + continue; + } else { + /* if one of the ab is already in recovery, or + * in UMAC recovery start phase + * then fall back to MODE0 + */ + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; + } + ath12k_info(ab, "Recovery is falling back to Mode0 as one of the partner chip is already in recovery\n"); + } + } + + if (teardown) { + if (ath12k_core_trigger_umac_reset(ab) || + ath12k_mac_partner_peer_cleanup(ab)) { + /* Fallback to Mode0 if umac reset/peer_cleanup is + * failed + */ + ag->recovery_mode = ATH12K_MLO_RECOVERY_MODE0; +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_core_disable_ppe_rtnl_bond_release(ab); +#endif + ath12k_info(ab, "Recovery is falling back to Mode0\n"); + } else { + /* wake queues here as ping should continue for + * legacy clients in non-asserted chipsets + */ + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; + + ieee80211_wake_queues(ah->hw); + } +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (ab == partner_ab) + continue; + for (j = 0; j < partner_ab->num_radios; j++) { + pdev = &partner_ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + ath12k_ppeds_partner_link_start_queues(ar); + } + } +#endif + ath12k_dbg(ab, ATH12K_DBG_MODE1_RECOVERY, + "Queues are started as umac reset is completed for partner chipset\n"); + } + } + + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (ab == partner_ab) + continue; + + /* issue FW Hang command on partner chips for Mode0. This is a fool proof + * method to ensure recovery of all partner chips in MODE0 instead of + * relying on firmware to crash partner chips + */ + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0 && + !test_bit(ATH12K_FLAG_RECOVERY, &partner_ab->dev_flags)) { + ath12k_info(ab, "sending fw_hang cmd to partner chipset(s)\n"); + ath12k_wmi_force_fw_hang_cmd(partner_ab->pdevs[0].ar, + ATH12K_WMI_FW_HANG_ASSERT_TYPE, + ATH12K_WMI_FW_HANG_DELAY, true); + } + } + ath12k_core_pre_reconfigure_recovery(ab); - reinit_completion(&ab->reconfigure_complete); ath12k_core_post_reconfigure_recovery(ab); - reinit_completion(&ab->recovery_start); - atomic_set(&ab->recovery_start_count, 0); - - ath12k_dbg(ab, ATH12K_DBG_BOOT, "waiting recovery start...\n"); + /* reset host fixed mem off to zero */ + ab->host_ddr_fixed_mem_off = 0; - time_left = wait_for_completion_timeout(&ab->recovery_start, - ATH12K_RECOVER_START_TIMEOUT_HZ); + /* prepare coredump when bus is PCI + * In case of AHB, the coredump occurs in rproc module + */ + if (ab->hif.bus == ATH12K_BUS_PCI) { + ath12k_coredump_download_rddm(ab); + } else if (ab->hif.bus == ATH12K_BUS_AHB || ab->hif.bus == ATH12K_BUS_HYBRID) { + ath12k_coredump_download_ahb(ab); + } + if (ab->is_qdss_tracing) + ab->is_qdss_tracing = false; + if (ab->fw_recovery_support) { + if (ab->hif.bus == ATH12K_BUS_PCI) { ath12k_hif_power_down(ab); ath12k_hif_power_up(ab); - + } else if (ab->hif.bus == ATH12K_BUS_AHB || + ab->hif.bus == ATH12K_BUS_HYBRID) { + if (IS_ENABLED(CONFIG_REMOTEPROC)) { + /* When crash type ATH12K_RPROC_USERPD_HYBRID_CRASH is set */ + ath12k_core_upd_rproc_boot_recovery(ab); + /* When crash type ATH12K_RPROC_ROOTPD_AHB_CRASH is set */ + ath12k_core_rproc_boot_recovery(ab); + /* When crash type ATH12K_RPROC_ROOTPD_HYBRID_CRASH is set */ + ath12k_core_rpd_rproc_boot_recovery(ab); + } + } ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset started\n"); } + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) + ab->recovery_start = true; + + ab->recovery_mode_address = NULL; + ab->crash_info_address = NULL; + + mutex_unlock(&ag->mutex_lock); +} + +static int load_board_id_override(struct ath12k_base *ab) +{ + struct ath12k_bid_override *ov, *tmp; + const struct firmware *fw; + const char *p, *end; + size_t len; + int ret, count; + + fw = ath12k_core_firmware_request(ab, ATH12K_BOARD_OVERRIDE_FILE); + if (IS_ERR(fw)) { + /* file is optional */ + if (PTR_ERR(fw) == -ENOENT) + return 0; + return PTR_ERR(fw); + } + + /* format is = [...] */ + p = fw->data; + len = fw->size; + end = p + len; + count = 0; + + while (1) { + const char *pstart; + char *ppath, *pbid, endc; + unsigned int seg, bus, slot, func; + u16 board_id; + + while (p != end && isspace(*p)) + p++; + if (p == end) + break; + + pstart = p; + while (p != end && !isspace(*p)) + p++; + + if (p == end) { + ret = -EINVAL; + goto fail; + } + + ppath = kstrndup(pstart, p - pstart, GFP_KERNEL); + if (!pstart) { + ret = -ENOMEM; + goto fail; + } + + pbid = strchr(ppath, '='); + if (!pbid) { + ath12k_err(ab, "bad key=value in override file\n"); + ret = -EINVAL; + kfree(ppath); + goto fail; + } + + *pbid++ = 0; + + ret = sscanf(ppath, "pci:%x:%x:%x.%x%c", &seg, &bus, &slot, + &func, &endc); + if (ret != 4) { + ath12k_err(ab, "invalid pci dev in override file\n"); + kfree(ppath); + ret = -EINVAL; + goto fail; + } + + if (kstrtou16(pbid, 0, &board_id)) { + ath12k_err(ab, "invalid board-id in override file\n"); + kfree(ppath); + ret = -EINVAL; + goto fail; + } + + ov = kzalloc(sizeof (*ov), GFP_KERNEL); + ov->domain = seg; + ov->bus_nr = bus; + ov->slot = slot; + ov->func = func; + ov->board_id = board_id; + list_add_tail(&ov->next, &ab->board_id_overrides); + count++; + } + + if (count) + ath12k_info(ab, "loaded %d entries from board-id " + "override file\n", count); + release_firmware(fw); + return 0; + +fail: + ath12k_err(ab, "invalid board-id override file content\n"); + release_firmware(fw); + list_for_each_entry_safe(ov, tmp, &ab->board_id_overrides, next) + kfree(ov); + INIT_LIST_HEAD(&ab->board_id_overrides); + return ret; +} int ath12k_core_pre_init(struct ath12k_base *ab) { @@ -853,45 +3840,289 @@ return ret; } + ret = load_board_id_override(ab); + if (ret) + return ret; + return 0; } -int ath12k_core_init(struct ath12k_base *ab) +static int ath12k_core_get_chip(struct ath12k_hw_group *ag, + struct ath12k_base **ab, + u8 max_ab, u8 *num_ab) { - int ret; + int i; + + lockdep_assert_held(&ag->mutex_lock); + + if (ag->num_chip != ag->num_probed) + return -EINVAL; + + if (max_ab < ag->num_probed) + return -ENOMEM; + + *num_ab = 0; + for (i = 0; i < ag->num_probed; i++) { + ab[i] = ag->ab[i]; + *num_ab = *num_ab + 1; + } + + return 0; +} + +static int ath12k_core_hw_group_create(struct ath12k_base **ab_group, u8 num_ab) +{ + int i, ret = 0; + struct ath12k_base *ab; + + for(i = 0; i < num_ab; i++) { + ab = ab_group[i]; + mutex_lock(&ab->core_lock); ret = ath12k_core_soc_create(ab); if (ret) { + mutex_unlock(&ab->core_lock); ath12k_err(ab, "failed to create soc core: %d\n", ret); + goto out; + } + set_bit(ATH12K_FLAG_HW_GROUP_ATTACHED, &ab->dev_flags); + mutex_unlock(&ab->core_lock); + + ath12k_qmi_fwreset_from_cold_boot(ab); + + } + +out: return ret; } +int ath12k_core_init(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag; + struct ath12k_base *ab_group[ATH12K_MAX_SOCS]; + bool is_ready = false; + u8 num_ab; + int ret; + + /* Register a notifier after core init + * to be called on fw crash + */ + init_waitqueue_head(&ab->ipci.gic_msi_waitq); + ab->ssr_nb.notifier_call = ath12k_core_ssr_notifier_cb; + ab->atomic_ssr_nb.notifier_call = ath12k_core_atomic_ssr_notifier_cb; + ab->rpd_ssr_nb.notifier_call = ath12k_core_rpd_ssr_notifier_cb; + ab->rpd_atomic_ssr_nb.notifier_call = ath12k_core_rpd_atomic_ssr_notifier_cb; + + ret = ath12k_hif_ssr_notifier_reg(ab); + if (ret) { + ath12k_err(ab, "failed to register ssr notifier callback\n"); + return ret; + } + ab->multi_pd_arch = of_property_read_bool(ab->dev->of_node, "qcom,multipd_arch"); + ret = ath12k_debugfs_soc_create(ab); + if (ret) { + ath12k_err(ab, "failed to create debugfs\n"); + return ret; + } + + mutex_lock(&ath12k_hw_lock); + + ag = ath12k_core_get_hw_group(ab); + if (!ag) { + mutex_unlock(&ath12k_hw_lock); + ath12k_err(ab, "unable to get hw group\n"); + goto err_debugfs; + } + mutex_unlock(&ath12k_hw_lock); + + mutex_lock(&ag->mutex_lock); + + ath12k_dbg(ab, ATH12K_DBG_BOOT, "num chips in group %d, num probed %d\n", + ag->num_chip, ag->num_probed); + + is_ready = ath12k_core_hw_group_create_ready(ag); + if (is_ready) { + ret = ath12k_core_get_chip(ag, ab_group, ATH12K_MAX_SOCS, &num_ab); + if (ret) { + mutex_unlock(&ag->mutex_lock); + ath12k_err(ab, "unable to get chip from hw group %d\n", ret); + goto err_debugfs; + } + } + + mutex_unlock(&ag->mutex_lock); + + if (is_ready) { + ret = ath12k_core_hw_group_create(ab_group, num_ab); + if (ret) { + ath12k_warn(ab, "unable to create hw group\n"); + goto err_hw_group; + } + } + + ag->mgmt_rx_reorder = ath12k_mgmt_rx_reordering; + return 0; + +err_hw_group: + ath12k_core_put_hw_group(ab); +err_debugfs: + ath12k_debugfs_soc_destroy(ab); + return ret; } -void ath12k_core_deinit(struct ath12k_base *ab) +static void ath12k_core_hw_group_destroy(struct ath12k_hw_group *ag) +{ + struct ath12k_base *ab; + int i; + + lockdep_assert_held(&ag->mutex_lock); + + for(i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + mutex_lock(&ab->core_lock); + if (test_bit(ATH12K_FLAG_HW_GROUP_ATTACHED, &ab->dev_flags)) { + clear_bit(ATH12K_FLAG_HW_GROUP_ATTACHED, &ab->dev_flags); + ath12k_reg_free(ab); + ath12k_dp_free(ab); + ath12k_core_soc_destroy(ab); + } + mutex_unlock(&ab->core_lock); + } +} + +static void ath12k_core_hw_group_stop(struct ath12k_hw_group *ag) { + struct ath12k_base *ab; + struct ath12k_dp *dp; + u32 address; + int i; + + lockdep_assert_held(&ag->mutex_lock); + + if (!test_bit(ATH12K_FLAG_REGISTERED, &ag->dev_flags)) + return; + + clear_bit(ATH12K_FLAG_REGISTERED, &ag->dev_flags); + + for (i = ag->num_chip - 1; i >= 0; i--) { + ab = ag->ab[i]; + + mutex_lock(&ab->core_lock); + + ath12k_core_pdev_deinit(ab); + + mutex_unlock(&ab->core_lock); + } + + ath12k_mac_unregister(ag); + + ath12k_core_mlo_teardown(ag); + + for (i = ag->num_chip - 1; i >= 0; i--) { + ab = ag->ab[i]; + mutex_lock(&ab->core_lock); + ath12k_hif_irq_disable(ab); ath12k_core_pdev_destroy(ab); ath12k_core_stop(ab); + ath12k_dp_umac_reset_deinit(ab); + clear_bit(ATH12K_FLAG_CORE_REGISTERED, &ab->dev_flags); + + mutex_unlock(&ab->core_lock); + } + + for (i = ag->num_chip - 1; i >= 0; i--) { + ab = ag->ab[i]; + dp = &ab->dp; + + mutex_lock(&ab->core_lock); + + if (!ab->hw_params->reoq_lut_support) + break; + + if (!dp->reoq_lut.vaddr) + break; + + if (dp->reoq_lut.vaddr) { + address = HAL_SEQ_WCSS_UMAC_REO_REG +\ + HAL_REO1_QDESC_LUT_BASE0(ab); + ath12k_hif_write32(ab, address, 0); + } + + if (dp->ml_reoq_lut.vaddr) { + address = HAL_SEQ_WCSS_UMAC_REO_REG +\ + HAL_REO1_QDESC_LUT_BASE1(ab); + ath12k_hif_write32(ab, address, 0); + } + + ath12k_hif_power_down(ab); mutex_unlock(&ab->core_lock); + } + ath12k_mac_destroy(ag); + + ath12k_core_hw_group_destroy(ag); +} + +void ath12k_core_deinit(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + int ret; + + mutex_lock(&ag->mutex_lock); + if (test_bit(ATH12K_FLAG_REGISTERED, &ag->dev_flags)) { + ath12k_core_hw_group_stop(ag); + } else if (test_bit(ATH12K_FLAG_HW_GROUP_ATTACHED, &ab->dev_flags)) { + mutex_lock(&ab->core_lock); + + clear_bit(ATH12K_FLAG_HW_GROUP_ATTACHED, &ab->dev_flags); + if (test_bit(ATH12K_FLAG_CORE_REGISTERED, &ab->dev_flags)) { + ath12k_core_stop(ab); + ath12k_reg_free(ab); + ath12k_dp_free(ab); + clear_bit(ATH12K_FLAG_CORE_REGISTERED, &ab->dev_flags); + } ath12k_hif_power_down(ab); - ath12k_mac_destroy(ab); ath12k_core_soc_destroy(ab); + + mutex_unlock(&ab->core_lock); + } + + ath12k_debugfs_soc_destroy(ab); + + /* Unregister the ssr notifier as we are not intersted + * in receving these notifications after mac is unregistered. + */ + ret = ath12k_hif_ssr_notifier_unreg(ab); + if (ret) + ath12k_err(ab, "failed to un-register ssr notifier callback\n"); + + mutex_unlock(&ag->mutex_lock); + + ath12k_core_put_hw_group(ab); } void ath12k_core_free(struct ath12k_base *ab) { + struct ath12k_bid_override *ov, *tmp; + del_timer_sync(&ab->rx_replenish_retry); + flush_workqueue(ab->workqueue_aux); destroy_workqueue(ab->workqueue_aux); + + flush_workqueue(ab->workqueue); destroy_workqueue(ab->workqueue); + list_for_each_entry_safe(ov, tmp, &ab->board_id_overrides, next) + kfree(ov); kfree(ab); } struct ath12k_base *ath12k_core_alloc(struct device *dev, size_t priv_size, - enum ath12k_bus bus) + enum ath12k_bus bus, + const struct ath12k_bus_params *bus_params) { struct ath12k_base *ab; @@ -899,8 +4130,6 @@ if (!ab) return NULL; - init_completion(&ab->driver_recovery); - ab->workqueue = create_singlethread_workqueue("ath12k_wq"); if (!ab->workqueue) goto err_sc_free; @@ -909,23 +4138,34 @@ if (!ab->workqueue_aux) goto err_free_wq; + ab->stats_disable = ath12k_stats_disable; mutex_init(&ab->core_lock); + mutex_init(&ab->tbl_mtx_lock); spin_lock_init(&ab->base_lock); init_completion(&ab->reset_complete); - init_completion(&ab->reconfigure_complete); - init_completion(&ab->recovery_start); + INIT_LIST_HEAD(&ab->board_id_overrides); INIT_LIST_HEAD(&ab->peers); + INIT_LIST_HEAD(&ab->neighbor_peers); init_waitqueue_head(&ab->peer_mapping_wq); init_waitqueue_head(&ab->wmi_ab.tx_credits_wq); + init_waitqueue_head(&ab->qmi.cold_boot_waitq); + init_waitqueue_head(&ab->ssr_dump_wq); INIT_WORK(&ab->restart_work, ath12k_core_restart); INIT_WORK(&ab->reset_work, ath12k_core_reset); + INIT_WORK(&ab->recovery_work, ath12k_core_mode1_recovery_work); timer_setup(&ab->rx_replenish_retry, ath12k_ce_rx_replenish_retry, 0); init_completion(&ab->htc_suspend); + init_completion(&ab->rddm_reset_done); ab->dev = dev; + ab->bus_params = *bus_params; ab->hif.bus = bus; + ab->qmi.num_radios = ATH12K_QMI_INVALID_RADIO; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ab->ppeds_node_idx = -1; +#endif return ab; err_free_wq: @@ -935,5 +4175,174 @@ return NULL; } -MODULE_DESCRIPTION("Core module for Qualcomm Atheros 802.11be wireless LAN cards."); +#ifdef CONFIG_ATH12K_SAWF + +int ath12k_send_sawf_configs_soc(struct ath12k_sawf_svc_params *new_param) +{ + struct ath12k_hw_group *ag; + struct ath12k_base *ab; + struct ath12k *ar; + int soc, ret = 0; + + mutex_lock(&ath12k_hw_lock); + list_for_each_entry(ag, &ath12k_hw_groups, list) { + if (!ag) { + ath12k_warn(NULL, "unable to fetch hw group\n"); + mutex_unlock(&ath12k_hw_lock); + return -ENODEV; + } + for (soc = ag->num_probed; soc > 0; soc--) { + ab = ag->ab[soc - 1]; + ar = ab->pdevs[0].ar; + if (!ar) { + /* Control should not reach here */ + ath12k_info(ab, "Radio not initialized in the SOC\n"); + continue; + } + ret = ath12k_wmi_svc_config_send(ar, new_param); + if (ret) { + mutex_unlock(&ath12k_hw_lock); + return ret; + } + } + } + mutex_unlock(&ath12k_hw_lock); + return ret; +} + +int ath12k_sawf_send_disable_soc(u8 svc_id) +{ + struct ath12k_hw_group *ag; + struct ath12k_base *ab; + struct ath12k *ar; + int soc, ret = 0; + + mutex_lock(&ath12k_hw_lock); + list_for_each_entry(ag, &ath12k_hw_groups, list) { + if (!ag) { + ath12k_warn(NULL, "unable to fetch hw group\n"); + mutex_unlock(&ath12k_hw_lock); + return -ENODEV; + } + for (soc = ag->num_probed; soc > 0; soc--) { + ab = ag->ab[soc - 1]; + ar = ab->pdevs[0].ar; + if (!ar) { + /* Control should not reach here */ + ath12k_info(ab, "Radio not initialized in the SOC\n"); + continue; + } + ret = ath12k_wmi_svc_send_disable(ar, svc_id); + if (ret) { + mutex_unlock(&ath12k_hw_lock); + return ret; + } + } + } + mutex_unlock(&ath12k_hw_lock); + return ret; +} + +int ath12k_core_sawf_ul_config(struct net_device *dev, struct ath12k_sawf_wmi_peer_latency_param *latency_info) +{ + struct ath12k_base *ab; + u16 peer_id; + int ret = -EOPNOTSUPP; + + if (!latency_info) + return -EINVAL; + + ab = ath12k_sawf_get_ab_from_netdev(dev, latency_info->peer_mac, &peer_id); + if (ab) + ret = ath12k_sawf_wmi_config_ul(ab, latency_info); + return ret; +} + +void *ath12k_get_ab_nd_peer_from_peer_mac(u8 *peer_mac, struct ath12k_base **ab_ref) +{ + struct ath12k_hw_group *ag = NULL; + struct ath12k_base *ab = NULL; + void *peer = NULL; + int soc; + + mutex_lock(&ath12k_hw_lock); + list_for_each_entry(ag, &ath12k_hw_groups, list) { + if (!ag) { + ath12k_warn(NULL, "unable to fetch hw group\n"); + mutex_unlock(&ath12k_hw_lock); + return -ENODEV; + } + for (soc = ag->num_probed; soc > 0; soc--) { + + ab = ag->ab[soc - 1]; + if (!ab) { + /* Control should not reach here */ + ath12k_info(NULL, "SOC not initialized\n"); + continue; + } + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_addr(ab, peer_mac); + spin_unlock_bh(&ab->base_lock); + if (peer) { + mutex_unlock(&ath12k_hw_lock); + *ab_ref = ab; + return peer; + } + ab = NULL; + } + } + mutex_unlock(&ath12k_hw_lock); + return peer; +} + +#endif /* CONFIG_ATH12K_SAWF */ + +static int ath12k_init(void) +{ + int ret; + + ret = ath12k_debugfs_create(); + if (ret) { + pr_err("Failed to register debugfs ath12k driver: %d\n", ret); + return ret; + } + + ret = ath12k_ahb_init(); + if (ret) { + ret = -ENODEV; + pr_err("Failed to initialize ath12k AHB device: %d\n", ret); + goto error; + } + + ret = ath12k_pci_init(); + if (ret) { + ret = -ENODEV; + pr_err("Failed to initialize ath12k PCI device: %d\n", ret); + goto error_ahb; + } + + return 0; + +error_ahb: + ath12k_ahb_exit(); +error: + ath12k_debugfs_destroy(); + + return ret; +} + +static void ath12k_exit(void) +{ + ath12k_pci_exit(); + ath12k_ahb_exit(); + ath12k_debugfs_destroy(); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_bond_disable_ppe_ds(); +#endif +} + +module_init(ath12k_init) +module_exit(ath12k_exit) + +MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11be WLAN PCIe/AHB devices"); MODULE_LICENSE("Dual BSD/GPL"); diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/core.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/core.h --- linux-6.4/drivers/net/wireless/ath/ath12k/core.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/core.h 2024-04-22 13:55:38.344131333 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_CORE_H @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include "qmi.h" #include "htc.h" #include "wmi.h" @@ -21,10 +23,22 @@ #include "hw.h" #include "hal_rx.h" #include "reg.h" +#include "thermal.h" #include "dbring.h" +#include "spectral.h" +#include "pktlog.h" +#include "sawf.h" +#include "vendor.h" +#include "telemetry_agent_if.h" +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#include +#include +#endif #define SM(_v, _f) (((_v) << _f##_LSB) & _f##_MASK) +#define ATH12K_MAX_NUM_PWR_LEVEL 16 + #define ATH12K_TX_MGMT_NUM_PENDING_MAX 512 #define ATH12K_TX_MGMT_TARGET_MAX_SUPPORT_WMI 64 @@ -33,16 +47,35 @@ #define ATH12K_PRB_RSP_DROP_THRESHOLD ((ATH12K_TX_MGMT_TARGET_MAX_SUPPORT_WMI * 3) / 4) #define ATH12K_INVALID_HW_MAC_ID 0xFF +#define ATH12K_CONNECTION_LOSS_HZ (3 * HZ) #define ATH12K_RX_RATE_TABLE_NUM 320 #define ATH12K_RX_RATE_TABLE_11AX_NUM 576 +extern unsigned int ath12k_frame_mode; + + +extern bool ath12k_debug_critical; #define ATH12K_MON_TIMER_INTERVAL 10 -#define ATH12K_RESET_TIMEOUT_HZ (20 * HZ) +#define ATH12K_RESET_TIMEOUT_HZ (180 * HZ) #define ATH12K_RESET_MAX_FAIL_COUNT_FIRST 3 #define ATH12K_RESET_MAX_FAIL_COUNT_FINAL 5 #define ATH12K_RESET_FAIL_TIMEOUT_HZ (20 * HZ) #define ATH12K_RECONFIGURE_TIMEOUT_HZ (10 * HZ) #define ATH12K_RECOVER_START_TIMEOUT_HZ (20 * HZ) +#define ATH12K_UMAC_RESET_TIMEOUT_IN_MS 200 + +#define INVALID_CIPHER 0xFFFFFFFF + +#define ATH12K_MAX_MLO_PEERS 256 +#define ATH12K_MLO_PEER_ID_INVALID 0xFFFF + +#define ATH12K_SSR_POWERUP QCOM_SSR_AFTER_POWERUP +#define ATH12K_SSR_PREPARE_SHUTDOWN 5 + +enum ath12k_bdf_search { + ATH12K_BDF_SEARCH_DEFAULT, + ATH12K_BDF_SEARCH_BUS_AND_BOARD, +}; enum wme_ac { WME_AC_BE, @@ -53,8 +86,10 @@ }; #define ATH12K_HT_MCS_MAX 7 -#define ATH12K_VHT_MCS_MAX 9 +#define ATH12K_VHT_MCS_MAX 11 #define ATH12K_HE_MCS_MAX 11 +#define ATH12K_HE_EXTRA_MCS_MAX 13 +#define ATH12K_EHT_MCS_MAX 15 enum ath12k_crypt_mode { /* Only use hardware crypto engine */ @@ -74,15 +109,19 @@ enum ath12k_skb_flags { ATH12K_SKB_HW_80211_ENCAP = BIT(0), ATH12K_SKB_CIPHER_SET = BIT(1), + ATH12K_SKB_TX_STATUS = BIT(2), + ATH12K_SKB_MGMT_LINK_AGNOSTIC = BIT(3), }; struct ath12k_skb_cb { dma_addr_t paddr; - struct ath12k *ar; + u8 eid; struct ieee80211_vif *vif; dma_addr_t paddr_ext_desc; u32 cipher; u8 flags; + u8 link_id; + u16 pkt_offset; }; struct ath12k_skb_rxcb { @@ -92,32 +131,44 @@ bool is_continuation; bool is_mcbc; bool is_eapol; + bool is_end_of_ppdu; struct hal_rx_desc *rx_desc; u8 err_rel_src; u8 err_code; - u8 mac_id; + u8 hw_link_id; u8 unmapped; u8 is_frag; u8 tid; u16 peer_id; + struct napi_struct *napi; }; enum ath12k_hw_rev { - ATH12K_HW_QCN9274_HW10, + ATH12K_HW_QCN9274_HW10 = 0, ATH12K_HW_QCN9274_HW20, - ATH12K_HW_WCN7850_HW20 + ATH12K_HW_WCN7850_HW20, + ATH12K_HW_IPQ5332_HW10, + ATH12K_HW_QCN6432_HW10, }; +#define ATH12K_DIAG_HW_ID_OFFSET 16 + enum ath12k_firmware_mode { /* the default mode, standard 802.11 functionality */ ATH12K_FIRMWARE_MODE_NORMAL, /* factory tests etc */ ATH12K_FIRMWARE_MODE_FTM, + + /* Cold boot calibration */ + ATH12K_FIRMWARE_MODE_COLD_BOOT = 7, }; +extern bool ath12k_cold_boot_cal; + #define ATH12K_IRQ_NUM_MAX 57 #define ATH12K_EXT_IRQ_NUM_MAX 16 +#define ATH12K_MAX_TCL_RING_NUM 3 struct ath12k_ext_irq_grp { struct ath12k_base *ab; @@ -125,6 +176,7 @@ u32 num_irq; u32 grp_id; u64 timestamp; + bool napi_enabled; struct napi_struct napi; struct net_device napi_ndev; }; @@ -137,6 +189,11 @@ #define HE_PPET16_PPET8_SIZE 8 +enum ath12k_msi_supported_hw { + ATH12K_MSI_CONFIG_PCI, + ATH12K_MSI_CONFIG_IPCI, +}; + /* 802.11ax PPE (PPDU packet Extension) threshold */ struct he_ppe_threshold { u32 numss_m1; @@ -154,6 +211,11 @@ }; #define MAX_RADIOS 3 +#define ATH12K_MAX_SOCS 3 +#define ATH12K_GROUP_MAX_RADIO (ATH12K_MAX_SOCS * MAX_RADIOS) +#define ATH12K_INVALID_GRP_ID 0xFF +#define ATH12K_INVALID_CHIP_ID 0xFF +#define ATH12K_MAX_MLO_PEER 0x100 enum { WMI_HOST_TP_SCALE_MAX = 0, @@ -173,40 +235,239 @@ enum ath12k_dev_flags { ATH12K_CAC_RUNNING, + ATH12K_FLAG_CORE_REGISTERED, ATH12K_FLAG_CRASH_FLUSH, ATH12K_FLAG_RAW_MODE, ATH12K_FLAG_HW_CRYPTO_DISABLED, + ATH12K_FLAG_BTCOEX, ATH12K_FLAG_RECOVERY, ATH12K_FLAG_UNREGISTERING, ATH12K_FLAG_REGISTERED, ATH12K_FLAG_QMI_FAIL, ATH12K_FLAG_HTC_SUSPEND_COMPLETE, + ATH12K_FLAG_QMI_FW_READY_COMPLETE, + ATH12K_FLAG_QMI_HOST_CAP_SENT, + ATH12K_FLAG_HW_GROUP_ATTACHED, + ATH12K_FLAG_FTM_SEGMENTED, + ATH12K_FLAG_PPE_DS_ENABLED, + ATH12K_FLAG_WMI_INIT_DONE, + ATH12K_FLAG_UMAC_PRERESET_START, + ATH12K_FLAG_UMAC_RESET_COMPLETE, + ATH12K_FLAG_UMAC_RECOVERY_START, }; enum ath12k_monitor_flags { ATH12K_FLAG_MONITOR_ENABLED, + MONITOR_VDEV_CREATED, + MONITOR_VDEV_STARTED, + MONITOR_CONF_ENABLED, +}; + +struct ath12k_fw_vdev_ol_stats { + u64 rx_msdu_byte_cnt; + u64 rx_msdu_pkt_cnt; + u64 tx_msdu_byte_cnt; + u64 tx_msdu_pkt_cnt; + u64 tx_retry_byte_cnt; + u64 tx_retry_pkt_cnt; + u64 tx_drop_byte_cnt; + u64 tx_drop_pkt_cnt; + u64 tx_msdu_ttl_byte_cnt; + u64 tx_msdu_ttl_pkt_cnt; +}; + +/** + * struct chan_power_info - TPE containing power info per channel chunk + * @chan_cfreq: channel center freq (MHz) + * e.g. + * channel 37/20MHz, it is 6135 + * channel 37/40MHz, it is 6125 + * channel 37/80MHz, it is 6145 + * channel 37/160MHz, it is 6185 + * @tx_power: transmit power (dBm) + */ +struct chan_power_info { + u16 chan_cfreq; + s8 tx_power; }; -struct ath12k_vif { +/** + * struct reg_tpc_power_info - regulatory TPC power info + * @is_psd_power: is PSD power or not + * @eirp_power: Maximum EIRP power (dBm), valid only if power is PSD + * @power_type_6g: type of power (SP/LPI/VLP) + * @num_pwr_levels: number of power levels + * @reg_max: Array of maximum TX power (dBm) per PSD value + * @ap_constraint_power: AP constraint power (dBm) + * @tpe: TPE values processed from TPE IE + * @chan_power_info: power info to send to FW + */ +struct ath12k_reg_tpc_power_info { + bool is_psd_power; + u8 eirp_power; + enum wmi_reg_6g_ap_type power_type_6g; + u8 num_pwr_levels; + u8 reg_max[ATH12K_MAX_NUM_PWR_LEVEL]; + u8 ap_constraint_power; + s8 tpe[ATH12K_MAX_NUM_PWR_LEVEL]; + struct chan_power_info chan_power_info[ATH12K_MAX_NUM_PWR_LEVEL]; +}; + +#define ATH12K_STATS_MGMT_FRM_TYPE_MAX 16 + +struct ath12k_mgmt_frame_stats { + u32 tx_succ_cnt[ATH12K_STATS_MGMT_FRM_TYPE_MAX]; + u32 tx_fail_cnt[ATH12K_STATS_MGMT_FRM_TYPE_MAX]; + u32 rx_cnt[ATH12K_STATS_MGMT_FRM_TYPE_MAX]; + u32 tx_compl_succ[ATH12K_STATS_MGMT_FRM_TYPE_MAX]; + u32 tx_compl_fail[ATH12K_STATS_MGMT_FRM_TYPE_MAX]; +}; + +struct ath12k_tx_conf { + bool changed; + u16 ac; + struct ieee80211_tx_queue_params tx_queue_params; +}; + +struct ath12k_key_conf { + enum set_key_cmd cmd; + struct list_head list; + struct ieee80211_sta *sta; + struct ieee80211_key_conf *key; +}; + +struct ath12k_recovery_cache { + struct ath12k_tx_conf tx_conf; + struct ath12k_key_conf key_conf; + struct list_head recovery_sta_list; + u64 bss_conf_changed; +}; + +struct ath12k_vif_cache { + struct ath12k_tx_conf tx_conf; + struct ath12k_key_conf key_conf; + u64 bss_conf_changed; +}; + +struct ath12k_vif_tcl_desc_template { + u32 info0; + u32 info1; + u32 info2; + u32 info3; + u32 info4; +}; + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +struct ath12k_link_vif_pvt { + struct ath12k_base *ab; + struct ath12k_link_vif *arvif; + struct net_device *link_ndev; + struct net_device *bond_dev; + struct ieee80211_hw *hw; + bool is_started; + bool is_bond_enslaved; + int ppe_vp_profile_idx; + int vp_num; +}; +#endif + +struct ath12k_peer_ch_width_switch_data { + int count; + struct wmi_chan_width_peer_arg peer_arg[]; +}; + +struct ath12k_prb_resp_tmpl_ml_info { + u32 hw_link_id; + u32 cu_vdev_map_cat1_lo; + u32 cu_vdev_map_cat1_hi; + u32 cu_vdev_map_cat2_lo; + u32 cu_vdev_map_cat2_hi; +}; + +struct ath12k_link_vif { + struct ath12k_base *ab; + struct ath12k_dp *dp; + struct ath12k_vif_tcl_desc_template desc; + struct ieee80211_vif *vif; + struct device *dev; + struct ath12k *ar; + bool assoc_link; + bool vdev_stop_notify_done; + u8 pdev_idx; u32 vdev_id; - enum wmi_vdev_type vdev_type; - enum wmi_vdev_subtype vdev_subtype; u32 beacon_interval; u32 dtim_period; + u8 addr[ETH_ALEN]; u16 ast_hash; u16 ast_idx; u16 tcl_metadata; u8 hal_addr_search_flags; u8 search_type; - - struct ath12k *ar; - struct ieee80211_vif *vif; - int bank_id; u8 vdev_id_check_en; + bool beacon_prot; struct wmi_wmm_params_all_arg wmm_params; struct list_head list; + + bool is_created; + bool is_started; + bool is_scan_vif; + bool is_up; + bool pending_up; + bool pending_stop; + bool spectral_enabled; + u8 bssid[ETH_ALEN]; + struct cfg80211_bitrate_mask bitrate_mask; + struct delayed_work connection_loss_work; + int num_legacy_stations; + int rtscts_prot_mode; + int txpower; + struct ieee80211_chanctx_conf chanctx; + struct ath12k_reg_tpc_power_info reg_tpc_info; + u8 vdev_stats_id; + struct ath12k_fw_vdev_ol_stats vdev_stats; + struct host_link_stats link_stats; + bool bcca_zero_sent; + bool do_not_send_tmpl; + u32 vht_cap; +#ifdef CONFIG_ATH12K_DEBUGFS + struct dentry *debugfs_twt; + struct dentry *debugfs_rtsthreshold; +#endif /* CONFIG_ATH12K_DEBUGFS */ + struct work_struct update_bcn_template_work; + u64 obss_color_bitmap; + struct work_struct update_obss_color_notify_work; + u32 tx_vdev_id; + u8 link_id; + struct ath12k_vif *ahvif; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + struct ath12k_link_vif_pvt *ndev_pvt; + struct net_device *link_ndev; + int ppe_vp_type; + int ppe_vp_num; +#endif + + bool mvr_processing; + bool pending_csa_up; + int num_stations; + + struct completion peer_ch_width_switch_send; + struct work_struct peer_ch_width_switch_work; + struct ath12k_peer_ch_width_switch_data *peer_ch_width_switch_data; + struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; + struct ath12k_prb_resp_tmpl_ml_info ml_info; +}; + +struct ath12k_vif { + enum wmi_vdev_type vdev_type; + enum wmi_vdev_subtype vdev_subtype; + struct ieee80211_vif *vif; + struct ath12k_hw *ah; + bool rsnie_present; + bool wpaie_present; + u8 tx_encap_type; + u32 key_cipher; union { struct { u32 uapsd; @@ -224,25 +485,30 @@ } ap; } u; - bool is_started; - bool is_up; + struct ath12k_link_vif deflink; + struct ath12k_link_vif *link[ATH12K_NUM_MAX_LINKS]; + /* indicates bitmap of link vdev created in FW */ + unsigned long links_map; u32 aid; - u8 bssid[ETH_ALEN]; - struct cfg80211_bitrate_mask bitrate_mask; - int num_legacy_stations; - int rtscts_prot_mode; - int txpower; - bool rsnie_present; - bool wpaie_present; - struct ieee80211_chanctx_conf chanctx; - u32 key_cipher; - u8 tx_encap_type; - u8 vdev_stats_id; + struct ath12k_mgmt_frame_stats mgmt_stats; + u8 num_vdev_created; + u16 mcbc_gsn; + spinlock_t mcbc_gsn_lock; /* Protect mcbc_gsn */ + struct ath12k_vif_cache cache[IEEE80211_MLD_MAX_NUM_LINKS]; + u8 last_scan_link; + u8 primary_link_id; +#ifdef CONFIG_ATH12K_DEBUGFS + struct dentry *debugfs_linkstats; + struct dentry *debugfs_primary_link; +#endif /* CONFIG_ATH12K_DEBUGFS */ + bool mcast_to_ucast_en; + bool chanctx_peer_del_done; }; struct ath12k_vif_iter { u32 vdev_id; - struct ath12k_vif *arvif; + struct ath12k *ar; + struct ath12k_link_vif *arvif; }; #define HAL_AST_IDX_INVALID 0xFFFF @@ -250,20 +516,23 @@ #define HAL_RX_MAX_MCS_HT 31 #define HAL_RX_MAX_MCS_VHT 9 #define HAL_RX_MAX_MCS_HE 11 +#define HAL_RX_MAX_MCS_BE 15 #define HAL_RX_MAX_NSS 8 #define HAL_RX_MAX_NUM_LEGACY_RATES 12 #define ATH12K_RX_RATE_TABLE_11AX_NUM 576 #define ATH12K_RX_RATE_TABLE_NUM 320 +#define ATH12K_STATS_MGMT_FRM_TYPE_MAX 16 struct ath12k_rx_peer_rate_stats { u64 ht_mcs_count[HAL_RX_MAX_MCS_HT + 1]; u64 vht_mcs_count[HAL_RX_MAX_MCS_VHT + 1]; u64 he_mcs_count[HAL_RX_MAX_MCS_HE + 1]; + u64 be_mcs_count[HAL_RX_MAX_MCS_BE + 1]; u64 nss_count[HAL_RX_MAX_NSS]; u64 bw_count[HAL_RX_BW_MAX]; u64 gi_count[HAL_RX_GI_MAX]; u64 legacy_count[HAL_RX_MAX_NUM_LEGACY_RATES]; - u64 rx_rate[ATH12K_RX_RATE_TABLE_11AX_NUM]; + u64 rx_rate[HAL_RX_BW_MAX][HAL_RX_GI_MAX][HAL_RX_MAX_NSS][HAL_RX_MAX_MCS_HT + 1]; }; struct ath12k_rx_peer_stats { @@ -293,6 +562,7 @@ }; #define ATH12K_HE_MCS_NUM 12 +#define ATH12K_EHT_MCS_NUM 16 #define ATH12K_VHT_MCS_NUM 10 #define ATH12K_BW_NUM 5 #define ATH12K_NSS_NUM 4 @@ -347,6 +617,7 @@ u64 ht[ATH12K_COUNTER_TYPE_MAX][ATH12K_HT_MCS_NUM]; u64 vht[ATH12K_COUNTER_TYPE_MAX][ATH12K_VHT_MCS_NUM]; u64 he[ATH12K_COUNTER_TYPE_MAX][ATH12K_HE_MCS_NUM]; + u64 eht[ATH12K_COUNTER_TYPE_MAX][ATH12K_EHT_MCS_NUM]; u64 bw[ATH12K_COUNTER_TYPE_MAX][ATH12K_BW_NUM]; u64 nss[ATH12K_COUNTER_TYPE_MAX][ATH12K_NSS_NUM]; u64 gi[ATH12K_COUNTER_TYPE_MAX][ATH12K_GI_NUM]; @@ -373,36 +644,112 @@ u32 retry_bytes; }; +DECLARE_EWMA(avg_rssi, 10, 8) + struct ath12k_wbm_tx_stats { u64 wbm_tx_comp_stats[HAL_WBM_REL_HTT_TX_COMP_STATUS_MAX]; }; -struct ath12k_sta { - struct ath12k_vif *arvif; +struct ath12k_driver_tx_pkts_flow { + atomic_t pkts_in; + atomic_t pkts_out; +}; + +struct ath12k_driver_rx_pkts_flow { + atomic_t pkts_frm_hw; + atomic_t pkts_out; +}; + +struct ath12k_link_sta { + struct ath12k_link_vif *arvif; + struct ath12k_sta *ahsta; + /* link address similar to ieee80211_link_sta */ + u8 addr[ETH_ALEN]; /* the following are protected by ar->data_lock */ u32 changed; /* IEEE80211_RC_* */ u32 bw; u32 nss; u32 smps; - enum hal_pn_type pn_type; struct work_struct update_wk; struct rate_info txrate; + u32 peer_nss; struct rate_info last_txrate; u64 rx_duration; u64 tx_duration; u8 rssi_comb; + struct ewma_avg_rssi avg_rssi; + + struct ath12k_htt_tx_stats *tx_stats; struct ath12k_rx_peer_stats *rx_stats; + struct ath12k_driver_tx_pkts_flow drv_tx_pkts; + struct ath12k_driver_rx_pkts_flow drv_rx_pkts; struct ath12k_wbm_tx_stats *wbm_tx_stats; u32 bw_prev; + + u16 tcl_metadata; + u8 link_id; /* IEEE link id */ + u8 link_idx; /* for fw use only */ + u32 last_tx_pkt_bw; + + /* For now the assoc link will be considered primary */ + bool is_assoc_link; + + /* For check disable fixed rate check for peer */ + bool disable_fixed_rate; + u8 sawf_svc_id; + /* will be saved to use during recovery */ + struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; + enum ieee80211_sta_state state; +}; + +struct ath12k_sta { + struct ath12k_vif *ahvif; + #ifdef CONFIG_MAC80211_DEBUGFS + /* protected by conf_mutex */ + bool aggr_mode; + #endif + bool use_4addr_set; + struct work_struct set_4addr_wk; + enum hal_pn_type pn_type; + + struct ath12k_link_sta deflink; + struct ath12k_link_sta *link[IEEE80211_MLD_MAX_NUM_LINKS]; + /* indicates bitmap of link sta created in FW */ + unsigned long links_map; + u16 ml_peer_id; + u8 assoc_link_id; + u8 primary_link_id; + u8 num_peer; + /* Indicates whether disassoc is sent after recovery + * ONLY used currently in recovery case + */ + bool low_ack_sent; }; -#define ATH12K_MIN_5G_FREQ 4150 -#define ATH12K_MIN_6G_FREQ 5945 -#define ATH12K_MAX_6G_FREQ 7115 -#define ATH12K_NUM_CHANS 100 -#define ATH12K_MAX_5G_CHAN 173 +#define ATH12K_HALF_20MHZ_BW 10 +#define ATH12K_2G_MIN_CENTER 2412 +#define ATH12K_2G_MAX_CENTER 2484 +#define ATH12K_5G_MIN_CENTER 4900 +#define ATH12K_5G_MAX_CENTER 5920 +#define ATH12K_6G_MIN_CENTER 5935 +#define ATH12K_6G_MAX_CENTER 7115 +#define ATH12K_MIN_2G_FREQ (ATH12K_2G_MIN_CENTER - ATH12K_HALF_20MHZ_BW - 1) +#define ATH12K_MAX_2G_FREQ (ATH12K_2G_MAX_CENTER + ATH12K_HALF_20MHZ_BW + 1) +#define ATH12K_MIN_5G_FREQ (ATH12K_5G_MIN_CENTER - ATH12K_HALF_20MHZ_BW) +#define ATH12K_MAX_5G_FREQ (ATH12K_5G_MAX_CENTER + ATH12K_HALF_20MHZ_BW) +#define ATH12K_MIN_6G_FREQ (ATH12K_6G_MIN_CENTER - ATH12K_HALF_20MHZ_BW) +#define ATH12K_MAX_6G_FREQ (ATH12K_6G_MAX_CENTER + ATH12K_HALF_20MHZ_BW) + +#define ATH12K_MAX_5G_LOW_BAND_FREQ 5330 +#define ATH12K_MIN_5G_HIGH_BAND_FREQ 5490 + +#define ATH12K_NUM_CHANS 102 +#define ATH12K_MIN_5G_CHAN 36 +#define ATH12K_MAX_5G_CHAN 177 +#define ATH12K_MIN_2G_CHAN 1 +#define ATH12K_MAX_2G_CHAN 11 enum ath12k_state { ATH12K_STATE_OFF, @@ -410,20 +757,69 @@ ATH12K_STATE_RESTARTING, ATH12K_STATE_RESTARTED, ATH12K_STATE_WEDGED, + ATH12K_STATE_TM, /* Add other states as required */ }; /* Antenna noise floor */ #define ATH12K_DEFAULT_NOISE_FLOOR -95 +struct ath12k_ftm_event_obj { + u32 data_pos; + u32 expected_seq; + u8 *eventdata; +}; + struct ath12k_fw_stats { + struct dentry *debugfs_fwstats; u32 pdev_id; u32 stats_id; struct list_head pdevs; struct list_head vdevs; struct list_head bcn; + bool en_vdev_stats_ol; }; +struct ath12k_dbg_htt_stats { + u32 type; + u32 cfg_param[4]; + u8 reset; + struct debug_htt_stats_req *stats_req; + /* protects shared stats req buffer */ + spinlock_t lock; +}; + +#define ATH12K_MAX_COEX_PRIORITY_LEVEL 3 + +struct ath12k_debug { + struct dentry *debugfs_pdev; + struct ath12k_dbg_htt_stats htt_stats; + u32 extd_tx_stats; + u32 extd_rx_stats; +#ifdef CONFIG_ATH12K_SAWF + u32 sawf_stats; +#endif + u32 pktlog_filter; + u32 pktlog_mode; + u32 pktlog_peer_valid; + u8 pktlog_peer_addr[ETH_ALEN]; +#ifdef CONFIG_ATH12K_PKTLOG + struct dentry *debugfs_pktlog; + struct ath12k_pktlog pktlog; + bool is_pkt_logging; +#endif + u32 rx_filter; + struct list_head wmi_list; + struct completion wmi_ctrl_path_stats_rcvd; + u32 wmi_ctrl_path_stats_tagid; + struct dentry *debugfs_nrp; + u32 coex_priority_level[ATH12K_MAX_COEX_PRIORITY_LEVEL]; +}; + +int ath12k_pktlog_rx_filter_setting(struct ath12k *ar, + struct htt_rx_ring_tlv_filter + *tlv_filter); + struct ath12k_per_peer_tx_stats { u32 succ_bytes; u32 retry_bytes; @@ -441,17 +837,73 @@ bool is_ampdu; }; +struct ath12k_btcoex_info { + bool coex_support; + u32 pta_num; + u32 coex_mode; + u32 bt_active_time_slot; + u32 bt_priority_time_slot; + u32 coex_algo_type; + u32 pta_priority; + u32 pta_algorithm; + u32 wlan_prio_mask; + u32 wlan_weight; + u32 bt_weight; + u32 duty_cycle; + u32 wlan_duration; + u32 wlan_pkt_type; + u32 wlan_pkt_type_continued; +}; + +enum btcoex_algo { + COEX_ALGO_UNCONS_FREERUN = 0, + COEX_ALGO_FREERUN, + COEX_ALGO_OCS, + COEX_ALGO_MAX_SUPPORTED, +}; + +enum ath12k_ap_ps_state { + ATH12K_AP_PS_STATE_OFF, + ATH12K_AP_PS_STATE_ON, +}; + +enum ath12k_fw_recovery_option { + ATH12K_FW_RECOVERY_DISABLE = 0, + ATH12K_FW_RECOVERY_ENABLE_AUTO, /* Automatically recover after FW assert */ + ATH12K_FW_RECOVERY_ENABLE_MODE1_AUTO, /* Automatically recover after FW assert through Mode1 */ + /* Enable only recovery. Send MPD SSR WMI */ + /* command to unlink UserPD assert from RootPD */ + ATH12K_FW_RECOVERY_ENABLE_SSR_ONLY, +}; + +struct ath12k_chan_info { + u32 low_freq; + u32 high_freq; + u32 num_channels; +}; + +struct ath12k_wmm_stats { + int tx_type; + int rx_type; + u64 total_wmm_tx_pkts[WME_NUM_AC]; + u64 total_wmm_rx_pkts[WME_NUM_AC]; + u64 total_wmm_tx_drop[WME_NUM_AC]; + u64 total_wmm_rx_drop[WME_NUM_AC]; +}; + +#define ATH12K_DSCP_PRIORITY 7 + #define ATH12K_FLUSH_TIMEOUT (5 * HZ) #define ATH12K_VDEV_DELETE_TIMEOUT_HZ (5 * HZ) struct ath12k { struct ath12k_base *ab; + struct ath12k_hw *ah; struct ath12k_pdev *pdev; - struct ieee80211_hw *hw; - struct ieee80211_ops *ops; struct ath12k_wmi_pdev *wmi; struct ath12k_pdev_dp dp; u8 mac_addr[ETH_ALEN]; + struct ath12k_chan_info chan_info; u32 ht_cap_info; u32 vht_cap_info; struct ath12k_he ar_he; @@ -467,6 +919,7 @@ int vdev_id; int roc_freq; bool roc_notify; + struct work_struct vdev_del_wk; } scan; struct { @@ -482,6 +935,7 @@ u32 max_tx_power; u32 txpower_limit_2g; u32 txpower_limit_5g; + u32 txpower_limit_6g; u32 txpower_scale; u32 power_scale; u32 chan_tx_pwr; @@ -512,6 +966,8 @@ /* pdev_idx starts from 0 whereas pdev->pdev_id starts with 1 */ u8 pdev_idx; u8 lmac_id; + /* link_idx unique across the group of hw used to lookup in ah */ + u8 link_idx; struct completion peer_assoc_done; struct completion peer_delete_done; @@ -522,6 +978,7 @@ int last_wmi_vdev_start_status; struct completion vdev_setup_done; struct completion vdev_delete_done; + struct ath12k_wmm_stats wmm_stats; int num_peers; int max_num_peers; @@ -532,7 +989,9 @@ struct idr txmgmt_idr; /* protects txmgmt_idr data */ spinlock_t txmgmt_idr_lock; + atomic_t flush_request; atomic_t num_pending_mgmt_tx; + wait_queue_head_t tx_empty_waitq; /* cycle count is reported twice for each visited channel during scan. * access protected by data_lock @@ -562,12 +1021,93 @@ struct ath12k_per_peer_tx_stats cached_stats; u32 last_ppdu_id; u32 cached_ppdu_id; - +#ifdef CONFIG_ATH12K_DEBUGFS + struct ath12k_debug debug; + struct dentry *wmi_ctrl_stat; + /* To protect wmi_list manipulation */ + struct mutex wmi_ctrl_path_stats_lock; + /* TODO: Add mac_filter, ampdu_aggr_size and wbm_tx_completion_stats stats*/ +#endif + struct ath12k_btcoex_info coex; + +#ifdef CONFIG_ATH12K_SPECTRAL + struct ath12k_spectral spectral; +#endif bool dfs_block_radar_events; - bool monitor_conf_enabled; - bool monitor_vdev_created; - bool monitor_started; + struct ath12k_thermal thermal; int monitor_vdev_id; + u8 twt_enabled; + s8 max_allowed_tx_power; + struct completion fw_mode_reset; + u8 ftm_msgref; + bool ap_ps_enabled; + enum ath12k_ap_ps_state ap_ps_state; + + struct cfg80211_chan_def awgn_chandef; + u32 chan_bw_interference_bitmap; + bool awgn_intf_handling_in_prog; + + struct wmi_rssi_dbm_conv_offsets rssi_offsets; + + u8 tpc_stats_type; + /* tpc_stats ptr is protected by data lock */ + struct wmi_tpc_stats_event *tpc_stats; + struct completion tpc_complete; + bool tpc_request; + + struct completion mlo_setup_done; + u32 mlo_setup_status; + + struct ath12k_fw_stats fw_stats; + struct completion fw_stats_complete; + bool fw_stats_done; + + unsigned long last_tx_power_update; + + struct completion mvr_complete; + struct cfg80211_chan_def agile_chandef; + struct ath12k_mgmt_rx_reo_pdev_info rx_reo_pdev_ctx; + + u64 delta_tsf2; + u64 delta_tqm; + + bool mlo_complete_event; + + bool ani_enabled; + u32 ani_poll_period; + u32 ani_listen_period; + int ani_ofdm_level; + struct completion ani_ofdm_event; +}; + +struct ath12k_hw { + struct ieee80211_hw *hw; + const struct ieee80211_ops *ops; + struct ath12k_hw_group *ag; + + /* To synchronize concurrent synchronous mac80211 callback operations, + * concurrent debugfs configuration and concurrent FW statistics events. + */ + struct mutex conf_mutex; + bool regd_updated; + u8 supported_band_mask; + u8 num_radio; + DECLARE_BITMAP(free_ml_peer_id_map, ATH12K_MAX_MLO_PEERS); + + /* Used for protecting objects used at ah level, ex. ath12k_ml_peer */ + spinlock_t data_lock; + + /* protected by ah->data_lock */ + struct list_head ml_peers; + bool in_recovery; + struct ath12k radio[0] __aligned(sizeof(void *)); +}; + +struct ath12k_mlo_memory { + struct target_mem_chunk chunk[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01]; + struct reserved_mem *rsv; + bool init_done; + bool is_mlo_mem_avail; }; struct ath12k_band_cap { @@ -579,6 +1119,14 @@ u32 he_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE]; struct ath12k_wmi_ppe_threshold_arg he_ppet; u16 he_6ghz_capa; + u32 eht_cap_mac_info[PSOC_HOST_MAX_MAC_SIZE]; + u32 eht_cap_phy_info[PSOC_HOST_MAX_PHY_SIZE]; + u32 eht_mcs_20_only; + u32 eht_mcs_80; + u32 eht_mcs_160; + u32 eht_mcs_320; + struct ath12k_ppe_threshold eht_ppet; + u32 eht_cap_info_internal; }; struct ath12k_pdev_cap { @@ -591,7 +1139,14 @@ u32 rx_chain_mask; u32 tx_chain_mask_shift; u32 rx_chain_mask_shift; + u32 chainmask_table_id; + unsigned long adfs_chain_mask; struct ath12k_band_cap band[NUM_NL80211_BANDS]; + bool nss_ratio_enabled; + u8 nss_ratio_info; + u32 ru_punct_supp_bw; + u32 eml_cap; + u32 mld_cap; }; struct mlo_timestamp { @@ -607,21 +1162,70 @@ struct ath12k_pdev { struct ath12k *ar; - u32 pdev_id; + u16 pdev_id; + u16 hw_link_id; struct ath12k_pdev_cap cap; u8 mac_addr[ETH_ALEN]; struct mlo_timestamp timestamp; }; +struct pmm_remap { + u32 base; + u32 size; +}; + +struct cmem_remap { + u32 base; + u32 size; +}; + +#define BOARD_NAME_SIZE 100 + struct ath12k_board_data { const struct firmware *fw; const void *data; size_t len; + char boardname[BOARD_NAME_SIZE]; + u32 ie_id; + u32 name_id; + u32 data_id; +}; + +struct ath12k_bp_stats { + /* Head Pointer reported by the last HTT Backpressure event for the ring */ + u16 hp; + + /* Tail Pointer reported by the last HTT Backpressure event for the ring */ + u16 tp; + + /* Number of Backpressure events received for the ring */ + u32 count; + + /* Last recorded event timestamp */ + unsigned long jiffies; +}; + +struct ath12k_dp_ring_bp_stats { + struct ath12k_bp_stats umac_ring_bp_stats[HTT_SW_UMAC_RING_IDX_MAX]; + struct ath12k_bp_stats lmac_ring_bp_stats[HTT_SW_LMAC_RING_IDX_MAX][MAX_RADIOS]; +}; + +struct ath12k_bus_params { + bool fixed_bdf_addr; + bool fixed_mem_region; }; struct ath12k_soc_dp_tx_err_stats { /* TCL Ring Descriptor unavailable */ u32 desc_na[DP_TCL_NUM_RING_MAX]; + /* TCL Ring Buffers unavailable */ + u32 txbuf_na[DP_TCL_NUM_RING_MAX]; + + u32 peers_not_present; + + u32 pdev_threshold_limit; + u32 group_threshold_limit; + /* Other failures during dp_tx due to mem allocation failure * idr unavailable etc. */ @@ -632,28 +1236,209 @@ u32 err_ring_pkts; u32 invalid_rbm; u32 rxdma_error[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX]; + u32 rxdma_error_drop[HAL_REO_ENTR_RING_RXDMA_ECODE_MAX]; u32 reo_error[HAL_REO_DEST_RING_ERROR_CODE_MAX]; + u32 reo_error_drop[HAL_REO_DEST_RING_ERROR_CODE_MAX]; u32 hal_reo_error[DP_REO_DST_RING_MAX]; + u32 mon_drop_desc; + u32 hal_reo_cmd_drain; + u32 reo_cmd_cache_error; + u32 mcast_enqueued; + u32 ucast_enqueued; + u32 mcast_reinject; + u32 tx_wbm_rel_source[HAL_WBM_REL_SRC_MODULE_MAX]; + u32 tqm_rel_reason[MAX_TQM_RELEASE_REASON]; + u32 fw_tx_status[MAX_FW_TX_STATUS]; + u32 tx_enqueued[MAX_TCL_RING]; + u32 tx_completed[MAX_TCL_RING]; + u32 null_tx_complete[MAX_TCL_RING]; + u32 bond_tx_ucast_enqueued[MAX_TCL_RING]; + u32 bond_tx_mcast_enqueued[MAX_TCL_RING]; + u32 bond_tx_ucast_dropped[MAX_TCL_RING]; + u32 bond_tx_mcast_dropped[MAX_TCL_RING]; + /* Number of frames successfully converted to ucast from mcast */ + u32 bond_mcast2ucast_converted[MAX_TCL_RING]; + /* Number of mcast frames tried for ucast conversion*/ + u32 bond_mcast2ucast_tried[MAX_TCL_RING]; + /* Number of times mcast to ucast conversion failed*/ + u32 bond_mcast2ucast_drop[MAX_TCL_RING]; + u32 reo_rx[DP_REO_DST_RING_MAX] [ATH12K_MAX_SOCS]; + u32 fast_rx[DP_REO_DST_RING_MAX] [ATH12K_MAX_SOCS]; + u32 non_fast_rx[DP_REO_DST_RING_MAX] [ATH12K_MAX_SOCS]; + u32 rx_wbm_rel_source[HAL_WBM_REL_SRC_MODULE_MAX] [ATH12K_MAX_SOCS]; + struct ath12k_soc_dp_tx_err_stats tx_err; + struct ath12k_dp_ring_bp_stats bp_stats; + u32 reo_cmd_update_rx_queue_error; + u32 first_and_last_msdu_bit_miss; + u32 reo_excep_msdu_buf_type; +}; + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +struct ath12k_ppeds_stats { + u32 tcl_prod_cnt; + u32 tcl_cons_cnt; + u32 reo_prod_cnt; + u32 reo_cons_cnt; + u32 get_tx_desc_cnt; + u32 tx_desc_allocated; + u32 tx_desc_freed; + u32 fw2wbm_pkt_drops; + u32 enable_intr_cnt; + u32 disable_intr_cnt; + u32 release_tx_single_cnt; + u32 release_rx_desc_cnt; + u32 num_rx_desc_freed; + u32 num_rx_desc_realloc; +}; + +struct ath12k_ppeds_napi { + struct napi_struct napi; + struct net_device ndev; +}; +#endif + +struct ath12k_reg_freq { + u32 start_freq; + u32 end_freq; +}; + +struct vendor_info { + enum ath12k_bdf_search bdf_search; + u32 vendor; + u32 device; + u32 subsystem_vendor; + u32 subsystem_device; +}; + +/* Fatal error notification type based on specific platform type */ +enum ath12k_core_crash_type { + /* Fatal error notification unknown or fatal error notification + * is honored. + */ + ATH12K_NO_CRASH, + + /* Fatal error notification from MHI message */ + ATH12K_MHI_CRASH, + + /* Fatal error notification from remoteproc user pd for ahb based + * internal radio + */ + ATH12K_RPROC_USERPD_AHB_CRASH, + + /* Fatal error notification from remoteproc user pd for platform with + * ahb based internal radio and pcic based external radios + */ + ATH12K_RPROC_USERPD_HYBRID_CRASH, + + /* Fatal error notification from remoteproc root pd for ahb based + * internal radio + */ + ATH12K_RPROC_ROOTPD_AHB_CRASH, + + /* Fatal error notification from remoteproc root pd for platform with + * ahb based internal radio and pcic based external radios + */ + ATH12K_RPROC_ROOTPD_HYBRID_CRASH +}; + +enum ath12k_mlo_recovery_mode { + ATH12K_MLO_RECOVERY_MODE0 = 1, + ATH12K_MLO_RECOVERY_MODE1 = 2, +}; + +struct ath12k_internal_pci { + bool gic_enabled; + wait_queue_head_t gic_msi_waitq; + u32 dp_msi_data[ATH12K_QCN6432_EXT_IRQ_GRP_NUM_MAX]; + u32 ce_msi_data[ATH12K_QCN6432_CE_COUNT]; + u32 dp_irq_num[ATH12K_QCN6432_EXT_IRQ_GRP_NUM_MAX]; +}; + +struct ath12k_mlo_dp_umac_reset { + atomic_t response_chip; + spinlock_t lock; + u8 umac_reset_info; + u8 initiator_chip; + u8 is_intr_bkup; + struct ath12k_hw_ring_mask intr_bkup; +}; + +#define ATH12K_UMAC_RESET_IPC 451 +#define ATH12K_IS_UMAC_RESET_IN_PROGRESS BIT(0) + +/* Holds info on the group of SOCs that are registered as a single wiphy + * or single SOC where each radio registered as separate wiphy in non-MLO + */ +struct ath12k_hw_group { + /* Keep this always as first member */ + struct list_head list; + u8 id; + u8 num_chip; + u8 num_probed; + u8 num_started; + u8 num_hw; + bool mlo_capable; + bool hw_queues_stopped; + bool mgmt_rx_reorder; + unsigned long dev_flags; + enum ath12k_mlo_recovery_mode recovery_mode; + enum ath12k_core_crash_type crash_type; + struct ath12k_hw *ah[ATH12K_GROUP_MAX_RADIO]; + struct ath12k_base *ab[ATH12K_MAX_SOCS]; + struct ath12k __rcu *hw_links[ATH12K_GROUP_MAX_RADIO]; + struct ath12k_mlo_memory mlo_mem; + struct mutex mutex_lock; + struct ath12k_mgmt_rx_reo_context rx_reo; + struct ath12k_host_mlo_mem_arena mlomem_arena; + atomic_t num_dp_tx_pending; + u64 mlo_tstamp_offset; + struct work_struct reset_work; + struct work_struct recovery_work; + struct ath12k_mlo_dp_umac_reset mlo_umac_reset; + struct completion umac_reset_complete; + bool trigger_umac_reset; +}; + +struct ath12k_bid_override { + unsigned int domain; + unsigned int bus_nr; + unsigned int slot; + unsigned int func; + u16 board_id; + struct list_head next; }; /* Master structure to hold the hw data which may be used in core module */ struct ath12k_base { enum ath12k_hw_rev hw_rev; + enum ath12k_firmware_mode fw_mode; struct platform_device *pdev; struct device *dev; + struct ath12k_hw_group *ag; struct ath12k_qmi qmi; struct ath12k_wmi_base wmi_ab; struct completion fw_ready; int num_radios; + u8 chip_id; /* HW channel counters frequency value in hertz common to all MACs */ u32 cc_freq_hz; + struct list_head board_id_overrides; struct ath12k_htc htc; struct ath12k_dp dp; void __iomem *mem; + void __iomem *mem_ce; + void __iomem *mem_cmem; + void __iomem *mem_pmm; + u32 ce_remap_base_addr; + u32 cmem_remap_base_addr; + u32 pmm_remap_base_addr; + bool ce_remap; + bool cmem_remap; + bool pmm_remap; unsigned long mem_len; struct { @@ -673,13 +1458,25 @@ struct ath12k_wmi_hal_reg_capabilities_ext_arg hal_reg_cap[MAX_RADIOS]; unsigned long long free_vdev_map; unsigned long long free_vdev_stats_id_map; + + /* To synchronize rhash tbl write operation */ + struct mutex tbl_mtx_lock; + + /* The rhashtable containing struct ath12k_peer keyed by mac addr */ + struct rhashtable *rhead_peer_addr; + struct rhashtable_params rhash_peer_addr_param; + + /* The rhashtable containing struct ath12k_peer keyed by id */ + struct rhashtable *rhead_peer_id; + struct rhashtable_params rhash_peer_id_param; + struct list_head peers; wait_queue_head_t peer_mapping_wq; u8 mac_addr[ETH_ALEN]; bool wmi_ready; u32 wlan_init_status; int irq_num[ATH12K_IRQ_NUM_MAX]; - struct ath12k_ext_irq_grp ext_irq_grp[ATH12K_EXT_IRQ_GRP_NUM_MAX]; + struct ath12k_ext_irq_grp ext_irq_grp[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; struct napi_struct *napi; struct ath12k_wmi_target_cap_arg target_caps; u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE]; @@ -687,6 +1484,8 @@ int bd_api; const struct ath12k_hw_params *hw_params; + struct ath12k_bus_params bus_params; + bool is_qdss_tracing; const struct firmware *cal_file; @@ -698,10 +1497,20 @@ /* This regd is set during dynamic country setting * This may or may not be used during the runtime */ + bool regd_change_user_request[MAX_RADIOS]; struct ieee80211_regdomain *new_regd[MAX_RADIOS]; /* Current DFS Regulatory */ enum ath12k_dfs_region dfs_region; + struct ath12k_reg_freq reg_freq_2g; + struct ath12k_reg_freq reg_freq_5g; + struct ath12k_reg_freq reg_freq_6g; +#ifdef CONFIG_ATH12K_DEBUGFS + struct dentry *debugfs_soc; +#endif + struct list_head neighbor_peers; + int num_nrps; + struct ath12k_soc_dp_stats soc_stats; unsigned long dev_flags; @@ -710,20 +1519,35 @@ struct work_struct restart_work; struct workqueue_struct *workqueue_aux; struct work_struct reset_work; - atomic_t reset_count; + struct work_struct recovery_work; atomic_t recovery_count; - atomic_t recovery_start_count; + atomic_t reset_count; bool is_reset; struct completion reset_complete; + wait_queue_head_t ssr_dump_wq; + bool collect_dump; + struct notifier_block ssr_nb; + struct notifier_block atomic_ssr_nb; + struct notifier_block rpd_ssr_nb; + struct notifier_block rpd_atomic_ssr_nb; + void *ssr_upd_handle; + void *ssr_txt_handle; + void *ssr_rpd_handle; + void *ssr_atomic_rpd_handle; + void *ssr_atomic_txt_handle; + void *ssr_atomic_upd_handle; struct completion reconfigure_complete; - struct completion recovery_start; + unsigned long reset_fail_timeout; /* continuous recovery fail count */ atomic_t fail_cont_count; - unsigned long reset_fail_timeout; + u32 recovery_start_time; struct { /* protected by data_lock */ u32 fw_crash_counter; + u32 last_recovery_time; } stats; + bool ftm_segment_handler; + struct ath12k_ftm_event_obj ftm_event_obj; u32 pktlog_defs_checksum; struct ath12k_dbring_cap *db_caps; @@ -733,35 +1557,247 @@ struct completion htc_suspend; + enum ath12k_fw_recovery_option fw_recovery_support; + + u32 fw_dbglog_param; + u64 fw_dbglog_val; + u64 fw_soc_drop_count; bool static_window_map; + struct completion rddm_reset_done; + + struct device_node *hremote_node; + u32 host_ddr_fixed_mem_off; + bool stats_disable; + u32 rx_hash_ix2; + u32 rx_hash_ix3; + + struct vendor_info id; + u32 max_msduq_per_tid; + u32 default_msduq_per_tid; + bool in_panic; + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ppe_ds_wlan_handle_t *ppeds_handle; + /* used for per node enumeration*/ + int ppeds_node_idx; + int ppe_vp_tbl_registered[PPE_VP_ENTRIES_MAX]; + int ppe_vp_search_idx_tbl_set[PPE_VP_ENTRIES_MAX]; + struct ath12k_ppeds_napi ppeds_napi_ctxt; + struct mutex ppe_vp_tbl_lock; + u8 num_ppe_vp_profiles; + u8 num_ppe_vp_search_idx_entries; + u8 num_ppe_vp_entries; + u8 ppeds_int_mode_enabled; + u8 ppeds_stopped; + struct ath12k_ppeds_stats ppeds_stats; + u16 *ppeds_rx_idx[ATH12K_MAX_SOCS]; + u16 ppeds_rx_num_elem; +#endif + + int userpd_id; + struct { + const struct ath12k_msi_config *config; + u32 ep_base_data; + u32 irqs[32]; + u32 addr_lo; + u32 addr_hi; + } msi; + + struct ath12k_internal_pci ipci; + u32 chwidth_num_peer_caps; + struct ath12k_dp_umac_reset dp_umac_reset; + + u32 *crash_info_address; + u32 *recovery_mode_address; + + /* to identify multipd_architecture */ + bool multi_pd_arch; + /* Mode1 specific flag to identify recovering pdev */ + bool recovery_start; + bool fw_cfg_support; + bool ce_pipe_init_done; + bool rxgainlut_support; /* must be last */ u8 drv_priv[] __aligned(sizeof(void *)); }; +struct ath12k_fw_stats_pdev { + struct list_head list; + + /* PDEV stats */ + s32 ch_noise_floor; + /* Cycles spent transmitting frames */ + u32 tx_frame_count; + /* Cycles spent receiving frames */ + u32 rx_frame_count; + /* Total channel busy time, evidently */ + u32 rx_clear_count; + /* Total on-channel time */ + u32 cycle_count; + u32 phy_err_count; + u32 chan_tx_power; + u32 ack_rx_bad; + u32 rts_bad; + u32 rts_good; + u32 fcs_bad; + u32 no_beacons; + u32 mib_int_count; + + /* PDEV TX stats */ + /* Num HTT cookies queued to dispatch list */ + s32 comp_queued; + /* Num HTT cookies dispatched */ + s32 comp_delivered; + /* Num MSDU queued to WAL */ + s32 msdu_enqued; + /* Num MPDU queue to WAL */ + s32 mpdu_enqued; + /* Num MSDUs dropped by WMM limit */ + s32 wmm_drop; + /* Num Local frames queued */ + s32 local_enqued; + /* Num Local frames done */ + s32 local_freed; + /* Num queued to HW */ + s32 hw_queued; + /* Num PPDU reaped from HW */ + s32 hw_reaped; + /* Num underruns */ + s32 underrun; + /* Num PPDUs cleaned up in TX abort */ + s32 tx_abort; + /* Num MPDUs requeued by SW */ + s32 mpdus_requed; + /* excessive retries */ + u32 tx_ko; + /* data hw rate code */ + u32 data_rc; + /* Scheduler self triggers */ + u32 self_triggers; + /* frames dropped due to excessive sw retries */ + u32 sw_retry_failure; + /* illegal rate phy errors */ + u32 illgl_rate_phy_err; + /* wal pdev continuous xretry */ + u32 pdev_cont_xretry; + /* wal pdev tx timeouts */ + u32 pdev_tx_timeout; + /* wal pdev resets */ + u32 pdev_resets; + /* frames dropped due to non-availability of stateless TIDs */ + u32 stateless_tid_alloc_failure; + /* PhY/BB underrun */ + u32 phy_underrun; + /* MPDU is more than txop limit */ + u32 txop_ovf; + + /* PDEV RX stats */ + /* Cnts any change in ring routing mid-ppdu */ + s32 mid_ppdu_route_change; + /* Total number of statuses processed */ + s32 status_rcvd; + /* Extra frags on rings 0-3 */ + s32 r0_frags; + s32 r1_frags; + s32 r2_frags; + s32 r3_frags; + /* MSDUs / MPDUs delivered to HTT */ + s32 htt_msdus; + s32 htt_mpdus; + /* MSDUs / MPDUs delivered to local stack */ + s32 loc_msdus; + s32 loc_mpdus; + /* AMSDUs that have more MSDUs than the status ring size */ + s32 oversize_amsdu; + /* Number of PHY errors */ + s32 phy_errs; + /* Number of PHY errors drops */ + s32 phy_err_drop; + /* Number of mpdu errors - FCS, MIC, ENC etc. */ + s32 mpdu_errs; +}; + +struct ath12k_fw_stats_vdev { + struct list_head list; + + u32 vdev_id; + u32 beacon_snr; + u32 data_snr; + u32 num_tx_frames[WLAN_MAX_AC]; + u32 num_rx_frames; + u32 num_tx_frames_retries[WLAN_MAX_AC]; + u32 num_tx_frames_failures[WLAN_MAX_AC]; + u32 num_rts_fail; + u32 num_rts_success; + u32 num_rx_err; + u32 num_rx_discard; + u32 num_tx_not_acked; + u32 tx_rate_history[MAX_TX_RATE_VALUES]; + u32 beacon_rssi_history[MAX_TX_RATE_VALUES]; +}; + +struct ath12k_fw_stats_bcn { + struct list_head list; + + u32 vdev_id; + u32 tx_bcn_succ_cnt; + u32 tx_bcn_outage_cnt; +}; + int ath12k_core_qmi_firmware_ready(struct ath12k_base *ab); int ath12k_core_pre_init(struct ath12k_base *ab); int ath12k_core_init(struct ath12k_base *ath12k); void ath12k_core_deinit(struct ath12k_base *ath12k); struct ath12k_base *ath12k_core_alloc(struct device *dev, size_t priv_size, - enum ath12k_bus bus); + enum ath12k_bus bus, + const struct ath12k_bus_params *bus_params); void ath12k_core_free(struct ath12k_base *ath12k); int ath12k_core_fetch_board_data_api_1(struct ath12k_base *ab, struct ath12k_board_data *bd, char *filename); int ath12k_core_fetch_bdf(struct ath12k_base *ath12k, struct ath12k_board_data *bd); +int ath12k_core_fetch_regdb(struct ath12k_base *ath12k, + struct ath12k_board_data *bd); +int ath12k_core_fetch_fw_cfg(struct ath12k_base *ath12k, + struct ath12k_board_data *bd); +int ath12k_core_fetch_rxgainlut(struct ath12k_base *ath12k, + struct ath12k_board_data *bd); void ath12k_core_free_bdf(struct ath12k_base *ab, struct ath12k_board_data *bd); int ath12k_core_check_dt(struct ath12k_base *ath12k); void ath12k_core_halt(struct ath12k *ar); int ath12k_core_resume(struct ath12k_base *ab); int ath12k_core_suspend(struct ath12k_base *ab); +int ath12k_config_qdss(struct ath12k_base *ab); + +void ath12k_core_put_hw_group(struct ath12k_base *ab); const struct firmware *ath12k_core_firmware_request(struct ath12k_base *ab, const char *filename); +void ath12k_core_wait_dump_collect(struct ath12k_base *ab); +void ath12k_core_issue_bug_on(struct ath12k_base *ab); + +void ath12k_fw_stats_init(struct ath12k *ar); +void ath12k_fw_stats_pdevs_free(struct list_head *head); +void ath12k_fw_stats_bcn_free(struct list_head *head); +void ath12k_fw_stats_reset(struct ath12k *ar); +void ath12k_fw_stats_free(struct ath12k_fw_stats *stats); +#ifdef CONFIG_ATH12K_SAWF +int ath12k_send_sawf_configs_soc(struct ath12k_sawf_svc_params *new_param); +int ath12k_sawf_send_disable_soc(u8 svc_id); +int ath12k_core_sawf_ul_config(struct net_device *dev, struct ath12k_sawf_wmi_peer_latency_param *latency_info); +void *ath12k_get_ab_nd_peer_from_peer_mac(u8 *peer_mac, struct ath12k_base **ab_ref); +#endif /* CONFIG_ATH12K_SAWF */ +void ath12k_dp_umac_reset_handle(struct ath12k_base *ab); +int ath12k_dp_umac_reset_init(struct ath12k_base *ab); +void ath12k_dp_umac_reset_deinit(struct ath12k_base *ab); +void ath12k_umac_reset_completion(struct ath12k_base *ab); +void ath12k_umac_reset_notify_pre_reset_done(struct ath12k_base *ab); + static inline const char *ath12k_scan_state_str(enum ath12k_scan_state state) { switch (state) { @@ -791,11 +1827,16 @@ return (struct ath12k_skb_rxcb *)skb->cb; } -static inline struct ath12k_vif *ath12k_vif_to_arvif(struct ieee80211_vif *vif) +static inline struct ath12k_vif *ath12k_vif_to_ahvif(struct ieee80211_vif *vif) { return (struct ath12k_vif *)vif->drv_priv; } +static inline struct ath12k_sta *ath12k_sta_to_ahsta(struct ieee80211_sta *sta) +{ + return (struct ath12k_sta *)sta->drv_priv; +} + static inline struct ath12k *ath12k_ab_to_ar(struct ath12k_base *ab, int mac_id) { @@ -815,9 +1856,27 @@ switch (bus) { case ATH12K_BUS_PCI: return "pci"; + case ATH12K_BUS_AHB: + return "ahb"; + case ATH12K_BUS_HYBRID: + return "ahb"; } return "unknown"; } +int ath12k_pci_init(void); +void ath12k_pci_exit(void); +#ifdef CONFIG_ATH12K_AHB +int ath12k_ahb_init(void); +void ath12k_ahb_exit(void); +#else +static inline int ath12k_ahb_init(void) +{ + return 0; +}; + +static inline void ath12k_ahb_exit(void) {}; +#endif + #endif /* _CORE_H_ */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dbring.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dbring.c --- linux-6.4/drivers/net/wireless/ath/ath12k/dbring.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dbring.c 2024-04-22 13:40:50.279868528 +0200 @@ -7,6 +7,34 @@ #include "core.h" #include "debug.h" +#define ATH12K_DB_MAGIC_VALUE 0xdeadbeaf + +int ath12k_dbring_validate_buffer(struct ath12k *ar, void *buffer, u32 size) +{ + u32 *temp; + int idx; + size = size >> 2; + + for (idx = 0, temp = buffer; idx < size; idx++, temp++) { + if (*temp == ATH12K_DB_MAGIC_VALUE) + return -EINVAL; + } + + return 0; +} + +static void ath12k_dbring_fill_magic_value(struct ath12k *ar, + void *buffer, u32 size) +{ + /* memset32 function fills buffer payload with the ATH12K_DB_MAGIC_VALUE + * and the variable size is expected to be the number of u32 values + * to be stored, not the number of bytes. + */ + size = size / sizeof(u32); + + memset32(buffer, ATH12K_DB_MAGIC_VALUE, size); +} + static int ath12k_dbring_bufs_replenish(struct ath12k *ar, struct ath12k_dbring *ring, struct ath12k_dbring_element *buff, @@ -28,6 +56,7 @@ ptr_unaligned = buff->payload; ptr_aligned = PTR_ALIGN(ptr_unaligned, ring->buf_align); + ath12k_dbring_fill_magic_value(ar, ptr_aligned, ring->buf_sz); paddr = dma_map_single(ab->dev, ptr_aligned, ring->buf_sz, DMA_FROM_DEVICE); @@ -51,8 +80,9 @@ buff->paddr = paddr; - cookie = u32_encode_bits(ar->pdev_idx, DP_RXDMA_BUF_COOKIE_PDEV_ID) | - u32_encode_bits(buf_id, DP_RXDMA_BUF_COOKIE_BUF_ID); + dma_sync_single_for_device(ab->dev, paddr, ring->buf_sz, DMA_FROM_DEVICE); + cookie = u32_encode_bits(ar->pdev_idx, DP_DIR_BUF_COOKIE_PDEV_ID) | + u32_encode_bits(buf_id, DP_DIR_BUF_COOKIE_BUF_ID); ath12k_hal_rx_buf_addr_info_set(desc, paddr, cookie, 0); @@ -178,7 +208,7 @@ ring->hp_addr = ath12k_hal_srng_get_hp_addr(ab, srng); ring->tp_addr = ath12k_hal_srng_get_tp_addr(ab, srng); - ret = ath12k_dbring_fill_bufs(ar, ring, GFP_KERNEL); + ret = ath12k_dbring_fill_bufs(ar, ring, GFP_ATOMIC); return ret; } @@ -270,6 +300,7 @@ switch (ev->fixed.module_id) { case WMI_DIRECT_BUF_SPECTRAL: + ring = ath12k_spectral_get_dbring(ar); break; default: ring = NULL; @@ -299,7 +330,7 @@ ath12k_hal_rx_buf_addr_info_get(&desc, &paddr, &cookie, &rbm); - buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID); + buf_id = u32_get_bits(cookie, DP_DIR_BUF_COOKIE_BUF_ID); spin_lock_bh(&ring->idr_lock); buff = idr_find(&ring->bufs_idr, buf_id); diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dbring.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dbring.h --- linux-6.4/drivers/net/wireless/ath/ath12k/dbring.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dbring.h 2024-04-22 13:40:50.279868528 +0200 @@ -31,6 +31,20 @@ u32 num_meta; }; +struct wmi_pdev_sscan_fw_param_event { + struct ath12k_wmi_pdev_sscan_fw_cmd_fixed_param fixed; + struct ath12k_wmi_pdev_sscan_fft_bin_index *bin; + struct ath12k_wmi_pdev_sscan_chan_info ch_info; + struct ath12k_wmi_pdev_sscan_per_detector_info *det_info; +}; + +struct wmi_spectral_capabilities_event { + struct ath12k_wmi_spectral_scan_bw_capabilities *sscan_bw_caps; + struct ath12k_wmi_spectral_fft_size_capabilities *fft_size_caps; + u32 num_bw_caps_entry; + u32 num_fft_size_caps_entry; +}; + struct ath12k_dbring_cap { u32 pdev_id; enum wmi_direct_buffer_module id; @@ -77,4 +91,5 @@ struct ath12k_dbring_cap *db_cap); void ath12k_dbring_srng_cleanup(struct ath12k *ar, struct ath12k_dbring *ring); void ath12k_dbring_buf_cleanup(struct ath12k *ar, struct ath12k_dbring *ring); +int ath12k_dbring_validate_buffer(struct ath12k *ar, void *data, u32 size); #endif /* ATH12K_DBRING_H */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/debug.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/debug.c --- linux-6.4/drivers/net/wireless/ath/ath12k/debug.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/debug.c 2024-04-22 13:40:50.279868528 +0200 @@ -4,6 +4,7 @@ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ +#define DEBUG #include #include "core.h" #include "debug.h" @@ -17,7 +18,10 @@ va_start(args, fmt); vaf.va = &args; + if (ab) dev_info(ab->dev, "%pV", &vaf); + else + pr_info("ath12k: %pV", &vaf); /* TODO: Trace the log */ va_end(args); } @@ -31,7 +35,10 @@ va_start(args, fmt); vaf.va = &args; + if (ab) dev_err(ab->dev, "%pV", &vaf); + else + pr_err("ath12k: %pV", &vaf); /* TODO: Trace the log */ va_end(args); } @@ -45,7 +52,10 @@ va_start(args, fmt); vaf.va = &args; + if (ab) dev_warn_ratelimited(ab->dev, "%pV", &vaf); + else + pr_warn_ratelimited("ath12k: %pV", &vaf); /* TODO: Trace the log */ va_end(args); } @@ -55,6 +65,10 @@ void __ath12k_dbg(struct ath12k_base *ab, enum ath12k_debug_mask mask, const char *fmt, ...) { +#define LEVEL_MASK GENMASK(31,28) +#define debug_mask GENMASK(27,0) + u32 local_mask_level = mask & LEVEL_MASK; + u32 global_mask_level = ath12k_debug_mask & LEVEL_MASK; struct va_format vaf; va_list args; @@ -63,8 +77,15 @@ vaf.fmt = fmt; vaf.va = &args; - if (ath12k_debug_mask & mask) + if ((mask & debug_mask) & ath12k_debug_mask) { + if (((local_mask_level) && (global_mask_level >= local_mask_level)) || + (!global_mask_level && (local_mask_level == ATH12K_DBG_L0))) { + if (ab) dev_dbg(ab->dev, "%pV", &vaf); + else + pr_devel("ath12k: %pV", &vaf); + } + } /* TODO: trace log */ @@ -99,4 +120,35 @@ } } +void ath12k_err_dump(struct ath12k_base *ab, const char *msg, + const char *prefix, const void *buf, + size_t len, struct hal_srng *srng) +{ + char linebuf[512]; + size_t linebuflen; + const void *ptr; + + if (msg) + ath12k_err(ab, msg); + + for (ptr = buf; (ptr - buf) < len; ptr += 16) { + linebuflen = 0; + linebuflen += scnprintf(linebuf + linebuflen, + sizeof(linebuf) - linebuflen, + "%s%08x: ", + (prefix ? prefix : ""), + (unsigned int)(ptr - buf)); + hex_dump_to_buffer(ptr, len - (ptr - buf), 16, 1, + linebuf + linebuflen, + sizeof(linebuf) - linebuflen, true); + dev_err(ab->dev, "%s\n", linebuf); + } + + if (srng && srng->ring_dir == HAL_SRNG_DIR_DST) + dev_err(ab->dev, "ring_base_vaddr=%px tp=0x%X size=0x%X cached_hp=0x%X", + srng->ring_base_vaddr, + srng->u.dst_ring.tp, + srng->ring_size, + srng->u.dst_ring.cached_hp); +} #endif /* CONFIG_ATH12K_DEBUG */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/debug.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/debug.h --- linux-6.4/drivers/net/wireless/ath/ath12k/debug.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/debug.h 2024-04-22 13:40:50.279868528 +0200 @@ -8,6 +8,7 @@ #define _ATH12K_DEBUG_H_ #include "trace.h" +#include "debugfs.h" enum ath12k_debug_mask { ATH12K_DBG_AHB = 0x00000001, @@ -25,14 +26,32 @@ ATH12K_DBG_PCI = 0x00001000, ATH12K_DBG_DP_TX = 0x00002000, ATH12K_DBG_DP_RX = 0x00004000, + ATH12K_DBG_OFFSET = 0x00008000, + ATH12K_DBG_RX_REO = 0x00010000, + ATH12K_DBG_PEER = 0x00020000, + + /* keep last*/ + ATH12K_DBG_SAWF = 0x00040000, + ATH12K_DBG_PPE = 0x00080000, + ATH12K_DBG_DP_UMAC_RESET = 0x00100000, + ATH12K_DBG_MODE1_RECOVERY = 0x00200000, ATH12K_DBG_ANY = 0xffffffff, }; +enum ath12k_debug_mask_level { + ATH12K_DBG_L0 = 0x00000000, + ATH12K_DBG_L1 = 0x10000000, + ATH12K_DBG_L2 = 0x20000000, + ATH12K_DBG_L3 = 0x30000000, +}; + __printf(2, 3) void ath12k_info(struct ath12k_base *ab, const char *fmt, ...); __printf(2, 3) void ath12k_err(struct ath12k_base *ab, const char *fmt, ...); __printf(2, 3) void ath12k_warn(struct ath12k_base *ab, const char *fmt, ...); extern unsigned int ath12k_debug_mask; +extern unsigned int ath12k_ftm_mode; +extern bool ath12k_en_shutdown; #ifdef CONFIG_ATH12K_DEBUG __printf(3, 4) void __ath12k_dbg(struct ath12k_base *ab, @@ -42,6 +61,9 @@ enum ath12k_debug_mask mask, const char *msg, const char *prefix, const void *buf, size_t len); +void ath12k_err_dump(struct ath12k_base *ab, const char *msg, + const char *prefix, const void *buf, + size_t len, struct hal_srng *srng); #else /* CONFIG_ATH12K_DEBUG */ static inline void __ath12k_dbg(struct ath12k_base *ab, enum ath12k_debug_mask dbg_mask, @@ -55,8 +77,16 @@ const void *buf, size_t len) { } + +static inline void ath12k_err_dump(struct ath12k_base *ab, const char *msg, + const char *prefix, const void *buf, + size_t len, struct hal_srng *srng) +{ +} #endif /* CONFIG_ATH12K_DEBUG */ +#define ATH12K_DBG_SET(mask, level) ATH12K_DBG_##mask | ATH12K_DBG_##level + #define ath12k_dbg(ar, dbg_mask, fmt, ...) \ do { \ typeof(dbg_mask) mask = (dbg_mask); \ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp.c --- linux-6.4/drivers/net/wireless/ath/ath12k/dp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp.c 2024-04-22 13:40:50.283868637 +0200 @@ -13,6 +13,17 @@ #include "dp_rx.h" #include "peer.h" #include "dp_mon.h" +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#include "ppe.h" +#endif + +#define ATH12K_DP_LMAC_PEER_ID_LEGACY 2 +#define ATH12K_DP_LMAC_PEER_ID_MLO 3 +#define ATH12K_DP_PEER_ROUTING_LMAC_ID_MASK GENMASK(7,6) + +#ifdef CONFIG_MAC80211_BONDED_SUPPORT +extern int g_bonded_interface_model; +#endif static void ath12k_dp_htt_htc_tx_complete(struct ath12k_base *ab, struct sk_buff *skb) @@ -36,63 +47,118 @@ return; } + if (!peer->primary_link) { + spin_unlock_bh(&ab->base_lock); + return; + } + ath12k_dp_rx_peer_tid_cleanup(ar, peer); crypto_free_shash(peer->tfm_mmic); + peer->dp_setup_done = false; spin_unlock_bh(&ab->base_lock); } -int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr) +int ath12k_dp_peer_default_route_setup(struct ath12k *ar, struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) { struct ath12k_base *ab = ar->ab; - struct ath12k_peer *peer; - u32 reo_dest; - int ret = 0, tid; + struct ieee80211_sta *sta; + u32 reo_dest, param_value; + u32 lmac_peer_routing_id = ATH12K_DP_LMAC_PEER_ID_LEGACY; + int ret; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + struct ath12k_vif *ahvif = arvif->ahvif; +#endif + + sta = container_of((void *)arsta->ahsta, struct ieee80211_sta, drv_priv); /* NOTE: reo_dest ring id starts from 1 unlike mac_id which starts from 0 */ reo_dest = ar->dp.mac_id + 1; - ret = ath12k_wmi_set_peer_param(ar, addr, vdev_id, - WMI_PEER_SET_DEFAULT_ROUTING, - DP_RX_HASH_ENABLE | (reo_dest << 1)); + param_value = (reo_dest << 1 | DP_RX_HASH_ENABLE); + + /* For MLO supported peers and it has multi link capablity, use MLO conf */ + if (hweight16(sta->valid_links) > 1) + lmac_peer_routing_id = ATH12K_DP_LMAC_PEER_ID_MLO; + + param_value |= FIELD_PREP(ATH12K_DP_PEER_ROUTING_LMAC_ID_MASK, + lmac_peer_routing_id); + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, + WMI_PEER_SET_DEFAULT_ROUTING, param_value); if (ret) { ath12k_warn(ab, "failed to set default routing %d peer :%pM vdev_id :%d\n", - ret, addr, vdev_id); + ret, arsta->addr, arvif->vdev_id); return ret; } + ath12k_dbg(ab, ATH12K_DBG_DP_RX, "peer %pM set def route id %d sta_link %d\n", + arsta->addr, lmac_peer_routing_id, + hweight16(sta->valid_links)); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + /* keep last - override any PPE DS specific routing config */ + if ((ahvif->vdev_type == WMI_VDEV_TYPE_AP) && !((ahvif->vdev_type == WMI_VDEV_TYPE_AP) && (ahvif->vdev_subtype == WMI_VDEV_SUBTYPE_MESH_11S))) + ath12k_dp_peer_ppeds_route_setup(ar, arvif, arsta); +#endif + + return 0; +} + +int ath12k_dp_peer_setup(struct ath12k *ar, struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_peer *peer; + struct crypto_shash *tfm; + int ret = 0, tid; + + tfm = crypto_alloc_shash("michael_mic", 0, 0); + if (IS_ERR(tfm)) + return PTR_ERR(tfm); + + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find(ab, arvif->vdev_id, arsta->addr); + if (!peer) { + ath12k_warn(ab, "failed to lookup peer %pM on vdev %d\n", + arsta->addr, arvif->vdev_id); + ret = -ENOENT; + goto free_shash; + } + + if (peer->mlo && peer->link_id != arsta->ahsta->primary_link_id) { + ret = 0; + peer->primary_link = false; + goto free_shash; + } + + peer->primary_link = true; + for (tid = 0; tid <= IEEE80211_NUM_TIDS; tid++) { - ret = ath12k_dp_rx_peer_tid_setup(ar, addr, vdev_id, tid, 1, 0, - HAL_PN_TYPE_NONE); + ret = ath12k_dp_rx_peer_tid_setup(ar, tid, 1, 0, HAL_PN_TYPE_NONE, peer); if (ret) { ath12k_warn(ab, "failed to setup rxd tid queue for tid %d: %d\n", tid, ret); - goto peer_clean; + goto peer_tid_clean; } } - ret = ath12k_dp_rx_peer_frag_setup(ar, addr, vdev_id); + ret = ath12k_dp_rx_peer_frag_setup(ar, peer, tfm); if (ret) { ath12k_warn(ab, "failed to setup rx defrag context\n"); - goto peer_clean; + goto peer_tid_clean; } /* TODO: Setup other peer specific resource used in data path */ - return 0; - -peer_clean: - spin_lock_bh(&ab->base_lock); - - peer = ath12k_peer_find(ab, vdev_id, addr); - if (!peer) { - ath12k_warn(ab, "failed to find the peer to del rx tid\n"); spin_unlock_bh(&ab->base_lock); - return -ENOENT; - } - for (; tid >= 0; tid--) + return 0; + +peer_tid_clean: + for (tid--; tid >= 0; tid--) ath12k_dp_rx_peer_tid_delete(ar, peer, tid); +free_shash: + crypto_free_shash(tfm); spin_unlock_bh(&ab->base_lock); return ret; @@ -103,6 +169,9 @@ if (!ring->vaddr_unaligned) return; + if (ring->cached) + kfree(ring->vaddr_unaligned); + else dma_free_coherent(ab->dev, ring->size, ring->vaddr_unaligned, ring->paddr_unaligned); @@ -114,7 +183,7 @@ int ext_group_num; u8 mask = 1 << ring_num; - for (ext_group_num = 0; ext_group_num < ATH12K_EXT_IRQ_GRP_NUM_MAX; + for (ext_group_num = 0; ext_group_num < ATH12K_EXT_IRQ_DP_NUM_VECTORS; ext_group_num++) { if (mask & grp_mask[ext_group_num]) return ext_group_num; @@ -123,38 +192,76 @@ return -ENOENT; } +bool ath12k_dp_umac_reset_in_progress(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_mlo_dp_umac_reset *mlo_umac_reset = &ag->mlo_umac_reset; + bool umac_in_progress = false; + + if (!ab->hw_params->support_umac_reset) + return umac_in_progress; + + spin_lock_bh(&mlo_umac_reset->lock); + if (mlo_umac_reset->umac_reset_info & + ATH12K_IS_UMAC_RESET_IN_PROGRESS) + umac_in_progress = true; + spin_unlock_bh(&mlo_umac_reset->lock); + + return umac_in_progress; +} + static int ath12k_dp_srng_calculate_msi_group(struct ath12k_base *ab, enum hal_ring_type type, int ring_num) { const u8 *grp_mask; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_mlo_dp_umac_reset *umac_reset; + struct ath12k_hw_ring_mask *ring_mask; + + umac_reset = &ag->mlo_umac_reset; + if (ath12k_dp_umac_reset_in_progress(ab) && umac_reset) + ring_mask = &umac_reset->intr_bkup; + else + ring_mask = ab->hw_params->ring_mask; switch (type) { case HAL_WBM2SW_RELEASE: if (ring_num == HAL_WBM2SW_REL_ERR_RING_NUM) { - grp_mask = &ab->hw_params->ring_mask->rx_wbm_rel[0]; + grp_mask = &ring_mask->rx_wbm_rel[0]; ring_num = 0; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + } else if (ring_num == HAL_WBM2SW_PPEDS_TX_CMPLN_RING_NUM) { + grp_mask = &ring_mask->wbm2sw6_ppeds_tx_cmpln[0]; + ring_num = 0; +#endif } else { - grp_mask = &ab->hw_params->ring_mask->tx[0]; + grp_mask = &ring_mask->tx[0]; } break; case HAL_REO_EXCEPTION: - grp_mask = &ab->hw_params->ring_mask->rx_err[0]; + grp_mask = &ring_mask->rx_err[0]; break; case HAL_REO_DST: - grp_mask = &ab->hw_params->ring_mask->rx[0]; + grp_mask = &ring_mask->rx[0]; break; case HAL_REO_STATUS: - grp_mask = &ab->hw_params->ring_mask->reo_status[0]; + grp_mask = &ring_mask->reo_status[0]; break; case HAL_RXDMA_MONITOR_STATUS: case HAL_RXDMA_MONITOR_DST: - grp_mask = &ab->hw_params->ring_mask->rx_mon_dest[0]; + grp_mask = &ring_mask->rx_mon_dest[0]; break; case HAL_TX_MONITOR_DST: - grp_mask = &ab->hw_params->ring_mask->tx_mon_dest[0]; + grp_mask = &ring_mask->tx_mon_dest[0]; break; case HAL_RXDMA_BUF: - grp_mask = &ab->hw_params->ring_mask->host2rxdma[0]; + grp_mask = &ring_mask->host2rxdma[0]; + break; + case HAL_PPE2TCL: + grp_mask = &ring_mask->ppe2tcl[0]; + break; + case HAL_REO2PPE: + grp_mask = &ring_mask->reo2ppe[0]; break; case HAL_RXDMA_MONITOR_BUF: case HAL_TCL_DATA: @@ -181,6 +288,7 @@ int msi_group_number, msi_data_count; u32 msi_data_start, msi_irq_start, addr_lo, addr_hi; int ret; + int vector; ret = ath12k_hif_get_user_msi_vector(ab, "DP", &msi_data_count, &msi_data_start, @@ -209,11 +317,197 @@ ring_params->msi_addr = addr_lo; ring_params->msi_addr |= (dma_addr_t)(((uint64_t)addr_hi) << 32); + if (ab->hif.bus == ATH12K_BUS_HYBRID) + ring_params->msi_data = ab->ipci.dp_msi_data[msi_group_number]; + else ring_params->msi_data = (msi_group_number % msi_data_count) + msi_data_start; ring_params->flags |= HAL_SRNG_FLAGS_MSI_INTR; + + vector = msi_irq_start + (msi_group_number % msi_data_count); + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + /* Interrupt will not be freed for non-asserted chips + * during UMAC reset + */ + if (!ath12k_dp_umac_reset_in_progress(ab)) + ath12k_hif_ppeds_register_interrupts(ab, type, vector, ring_num); +#endif +} + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +static int ath12k_dp_srng_alloc(struct ath12k_base *ab, struct dp_srng *ring, + enum hal_ring_type type, int ring_num, + int num_entries) +{ + int entry_sz = ath12k_hal_srng_get_entrysize(ab, type); + int max_entries = ath12k_hal_srng_get_max_entries(ab, type); + bool cached = false; + + if (max_entries < 0 || entry_sz < 0) + return -EINVAL; + + if (num_entries > max_entries) + num_entries = max_entries; + + ring->size = (num_entries * entry_sz) + HAL_RING_BASE_ALIGN - 1; + if (ab->hw_params->alloc_cacheable_memory) { + /* Allocate the reo dst and tx completion rings from cacheable memory */ + switch (type) { + case HAL_REO_DST: + case HAL_WBM2SW_RELEASE: + cached = true; + break; + default: + cached = false; + } + + if (cached) { + ring->vaddr_unaligned = kzalloc(ring->size, GFP_KERNEL); + ring->paddr_unaligned = virt_to_phys(ring->vaddr_unaligned); + } + } + if (!cached) + ring->vaddr_unaligned = dma_alloc_coherent(ab->dev, ring->size, + &ring->paddr_unaligned, + GFP_KERNEL); + if (!ring->vaddr_unaligned) + return -ENOMEM; + + memset(ring->vaddr_unaligned, 0, ring->size); + ring->vaddr = PTR_ALIGN(ring->vaddr_unaligned, HAL_RING_BASE_ALIGN); + ring->paddr = ring->paddr_unaligned + ((unsigned long)ring->vaddr - + (unsigned long)ring->vaddr_unaligned); + + return 0; } +static int ath12k_dp_srng_init_idx(struct ath12k_base *ab, struct dp_srng *ring, + enum hal_ring_type type, int ring_num, + int mac_id, + int num_entries, u32 idx) +{ + struct hal_srng_params params = { 0 }; + bool cached = false; + int ret; + + params.ring_base_vaddr = ring->vaddr; + params.ring_base_paddr = ring->paddr; + params.num_entries = num_entries; + ath12k_dp_srng_msi_setup(ab, ¶ms, type, ring_num + mac_id); + + switch (type) { + case HAL_REO_DST: + case HAL_REO2PPE: + params.intr_batch_cntr_thres_entries = + HAL_SRNG_INT_BATCH_THRESHOLD_RX; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; + break; + case HAL_RXDMA_BUF: + params.intr_batch_cntr_thres_entries = 0; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; + break; + case HAL_RXDMA_MONITOR_BUF: + case HAL_RXDMA_MONITOR_STATUS: + if (type == HAL_RXDMA_MONITOR_BUF) + params.low_threshold = DP_RX_MONITOR_BUF_LOW_TH; + else + params.low_threshold = num_entries >> 3; + + params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN; + + params.intr_batch_cntr_thres_entries = 0; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; + break; + case HAL_TX_MONITOR_BUF: + case HAL_TX_MONITOR_DST: + params.low_threshold = DP_TX_MONITOR_BUF_SIZE_MAX >> 3; + params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN; + params.intr_batch_cntr_thres_entries = 0; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; + break; + case HAL_WBM2SW_RELEASE: + if (ab->hw_params->hw_ops->dp_srng_is_tx_comp_ring(ring_num)) { + params.intr_batch_cntr_thres_entries = + HAL_SRNG_INT_BATCH_THRESHOLD_TX; + params.intr_timer_thres_us = + HAL_SRNG_INT_TIMER_THRESHOLD_TX; + break; + } + /* follow through when ring_num != HAL_WBM2SW_REL_ERR_RING_NUM */ + fallthrough; + case HAL_REO_EXCEPTION: + case HAL_REO_REINJECT: + case HAL_REO_CMD: + case HAL_REO_STATUS: + case HAL_TCL_DATA: + case HAL_TCL_CMD: + case HAL_TCL_STATUS: + case HAL_WBM_IDLE_LINK: + case HAL_SW2WBM_RELEASE: + case HAL_RXDMA_DST: + case HAL_RXDMA_MONITOR_DST: + params.intr_batch_cntr_thres_entries = + HAL_SRNG_INT_BATCH_THRESHOLD_OTHER; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_OTHER; + break; + case HAL_RXDMA_DIR_BUF: + break; + case HAL_PPE2TCL: + params.intr_batch_cntr_thres_entries = + HAL_SRNG_INT_BATCH_THRESHOLD_PPE2TCL; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_PPE2TCL; + break; + default: + ath12k_warn(ab, "Not a valid ring type in dp :%d\n", type); + return -EINVAL; + } + + if (cached) { + params.flags |= HAL_SRNG_FLAGS_CACHED; + ring->cached = 1; + } + + ret = ath12k_hal_srng_setup_idx(ab, type, ring_num, mac_id, ¶ms, idx); + if (ret < 0) { + ath12k_warn(ab, "failed to setup srng: %d ring_id %d\n", + ret, ring_num); + return ret; + } + + ring->ring_id = ret; + + return 0; + +} + +int ath12k_ppeds_dp_srng_alloc(struct ath12k_base *ab, struct dp_srng *ring, + enum hal_ring_type type, int ring_num, + int num_entries) +{ + int ret; + + ret = ath12k_dp_srng_alloc(ab, ring, type, ring_num, num_entries); + if (ret != 0) + ath12k_warn(ab, "Failed to allocate dp srng ring.\n"); + + return 0; +} + +int ath12k_ppeds_dp_srng_init(struct ath12k_base *ab, struct dp_srng *ring, + enum hal_ring_type type, int ring_num, + int mac_id, int num_entries, u32 idx) +{ + int ret; + + ret = ath12k_dp_srng_init_idx(ab, ring, type, ring_num, mac_id, num_entries, idx); + if (ret != 0) + ath12k_warn(ab, "Failed to initialize dp srng ring.\n"); + + return 0; +} +#endif + int ath12k_dp_srng_setup(struct ath12k_base *ab, struct dp_srng *ring, enum hal_ring_type type, int ring_num, int mac_id, int num_entries) @@ -222,6 +516,7 @@ int entry_sz = ath12k_hal_srng_get_entrysize(ab, type); int max_entries = ath12k_hal_srng_get_max_entries(ab, type); int ret; + bool cached = false; if (max_entries < 0 || entry_sz < 0) return -EINVAL; @@ -230,9 +525,30 @@ num_entries = max_entries; ring->size = (num_entries * entry_sz) + HAL_RING_BASE_ALIGN - 1; + if (ab->hw_params->alloc_cacheable_memory) { + /* Allocate the reo dst and tx completion rings from cacheable memory */ + switch (type) { + case HAL_REO_DST: + case HAL_WBM2SW_RELEASE: + cached = true; + break; + default: + cached = false; + } + } + + if (ath12k_dp_umac_reset_in_progress(ab)) + goto skip_dma_alloc; + + if (cached) { + ring->vaddr_unaligned = kzalloc(ring->size, GFP_KERNEL); + ring->paddr_unaligned = virt_to_phys(ring->vaddr_unaligned); + } else { ring->vaddr_unaligned = dma_alloc_coherent(ab->dev, ring->size, &ring->paddr_unaligned, GFP_KERNEL); + } + if (!ring->vaddr_unaligned) return -ENOMEM; @@ -240,6 +556,8 @@ ring->paddr = ring->paddr_unaligned + ((unsigned long)ring->vaddr - (unsigned long)ring->vaddr_unaligned); +skip_dma_alloc: + memset(ring->vaddr_unaligned, 0, ring->size); params.ring_base_vaddr = ring->vaddr; params.ring_base_paddr = ring->paddr; params.num_entries = num_entries; @@ -247,18 +565,28 @@ switch (type) { case HAL_REO_DST: + case HAL_REO2PPE: params.intr_batch_cntr_thres_entries = HAL_SRNG_INT_BATCH_THRESHOLD_RX; params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; break; case HAL_RXDMA_BUF: + params.intr_batch_cntr_thres_entries = 0; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; + break; case HAL_RXDMA_MONITOR_BUF: case HAL_RXDMA_MONITOR_STATUS: + if (type == HAL_RXDMA_MONITOR_BUF) + params.low_threshold = DP_RX_MONITOR_BUF_LOW_TH; + else params.low_threshold = num_entries >> 3; + params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN; + params.intr_batch_cntr_thres_entries = 0; params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_RX; break; + case HAL_TX_MONITOR_BUF: case HAL_TX_MONITOR_DST: params.low_threshold = DP_TX_MONITOR_BUF_SIZE_MAX >> 3; params.flags |= HAL_SRNG_FLAGS_LOW_THRESH_INTR_EN; @@ -272,6 +600,12 @@ params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_TX; break; + } else if (ring_num == HAL_WBM2SW_PPEDS_TX_CMPLN_RING_NUM) { + params.intr_batch_cntr_thres_entries = + HAL_SRNG_INT_BATCH_THRESHOLD_PPE_WBM2SW_REL; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_TX; + + break; } /* follow through when ring_num != HAL_WBM2SW_REL_ERR_RING_NUM */ fallthrough; @@ -286,19 +620,28 @@ case HAL_SW2WBM_RELEASE: case HAL_RXDMA_DST: case HAL_RXDMA_MONITOR_DST: - case HAL_RXDMA_MONITOR_DESC: params.intr_batch_cntr_thres_entries = HAL_SRNG_INT_BATCH_THRESHOLD_OTHER; params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_OTHER; break; case HAL_RXDMA_DIR_BUF: break; + case HAL_PPE2TCL: + params.intr_batch_cntr_thres_entries = + HAL_SRNG_INT_BATCH_THRESHOLD_PPE2TCL; + params.intr_timer_thres_us = HAL_SRNG_INT_TIMER_THRESHOLD_PPE2TCL; + break; default: ath12k_warn(ab, "Not a valid ring type in dp :%d\n", type); return -EINVAL; } - ret = ath12k_hal_srng_setup(ab, type, ring_num, mac_id, ¶ms); + if (cached) { + params.flags |= HAL_SRNG_FLAGS_CACHED; + ring->cached = 1; + } + + ret = ath12k_hal_srng_setup_idx(ab, type, ring_num, mac_id, ¶ms, 0); if (ret < 0) { ath12k_warn(ab, "failed to setup srng: %d ring_id %d\n", ret, ring_num); @@ -311,26 +654,36 @@ } static -u32 ath12k_dp_tx_get_vdev_bank_config(struct ath12k_base *ab, struct ath12k_vif *arvif) +u32 ath12k_dp_tx_get_vdev_bank_config(struct ath12k_base *ab, struct ath12k_link_vif *arvif) { + struct ath12k_vif *ahvif = arvif->ahvif; u32 bank_config = 0; + struct ath12k_hw_group *ag = ab->ag; + enum hal_encrypt_type encrypt_type = 0; /* Only valid for raw frames with HW crypto enabled. * With SW crypto, mac80211 sets key per packet */ - if (arvif->tx_encap_type == HAL_TCL_ENCAP_TYPE_RAW && - test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ab->dev_flags)) - bank_config |= - u32_encode_bits(ath12k_dp_tx_get_encrypt_type(arvif->key_cipher), + if (ahvif->tx_encap_type == HAL_TCL_ENCAP_TYPE_RAW && + test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ag->dev_flags) && + ahvif->key_cipher != INVALID_CIPHER) + encrypt_type = ath12k_dp_tx_get_encrypt_type(ahvif->key_cipher); + else + encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + + bank_config |= u32_encode_bits(ahvif->tx_encap_type, + HAL_TX_BANK_CONFIG_ENCAP_TYPE) | + u32_encode_bits(encrypt_type, HAL_TX_BANK_CONFIG_ENCRYPT_TYPE); - bank_config |= u32_encode_bits(arvif->tx_encap_type, - HAL_TX_BANK_CONFIG_ENCAP_TYPE); bank_config |= u32_encode_bits(0, HAL_TX_BANK_CONFIG_SRC_BUFFER_SWAP) | u32_encode_bits(0, HAL_TX_BANK_CONFIG_LINK_META_SWAP) | u32_encode_bits(0, HAL_TX_BANK_CONFIG_EPD); /* only valid if idx_lookup_override is not set in tcl_data_cmd */ + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA) + bank_config |= u32_encode_bits(1, HAL_TX_BANK_CONFIG_INDEX_LOOKUP_EN); + else bank_config |= u32_encode_bits(0, HAL_TX_BANK_CONFIG_INDEX_LOOKUP_EN); bank_config |= u32_encode_bits(arvif->hal_addr_search_flags & HAL_TX_ADDRX_EN, @@ -339,7 +692,7 @@ HAL_TX_ADDRY_EN), HAL_TX_BANK_CONFIG_ADDRY_EN); - bank_config |= u32_encode_bits(ieee80211_vif_is_mesh(arvif->vif) ? 3 : 0, + bank_config |= u32_encode_bits(ieee80211_vif_is_mesh(ahvif->vif) ? 3 : 0, HAL_TX_BANK_CONFIG_MESH_EN) | u32_encode_bits(arvif->vdev_id_check_en, HAL_TX_BANK_CONFIG_VDEV_ID_CHECK_EN); @@ -349,7 +702,7 @@ return bank_config; } -static int ath12k_dp_tx_get_bank_profile(struct ath12k_base *ab, struct ath12k_vif *arvif, +static int ath12k_dp_tx_get_bank_profile(struct ath12k_base *ab, struct ath12k_link_vif *arvif, struct ath12k_dp *dp) { int bank_id = DP_INVALID_BANK_ID; @@ -406,6 +759,20 @@ spin_unlock_bh(&dp->tx_bank_lock); } +void ath12k_dp_tx_update_bank_profile(struct ath12k_link_vif *arvif) +{ + struct ath12k_base *ab = arvif->ar->ab; + struct ath12k_dp *dp = &ab->dp; + + ath12k_dp_tx_put_bank_profile(dp, arvif->bank_id); + arvif->bank_id = ath12k_dp_tx_get_bank_profile(ab, arvif, dp); + arvif->desc.info0 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_BANK_ID, + arvif->bank_id); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ath12k_dp_ppeds_update_vp_entry(arvif->ar, arvif); +#endif +} + static void ath12k_dp_deinit_bank_profiles(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; @@ -437,6 +804,49 @@ return 0; } +static void ath12k_dp_srng_hw_disable(struct ath12k_base *ab, struct dp_srng *ring) +{ + struct hal_srng *srng = &ab->hal.srng_list[ring->ring_id]; + u32 reg_base, val, addr; + + reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R0]; + if (srng->ring_dir == HAL_SRNG_DIR_SRC) { + if (srng->ring_id == HAL_SRNG_RING_ID_WBM_IDLE_LINK) + addr = HAL_SEQ_WCSS_UMAC_WBM_REG + + HAL_WBM_IDLE_LINK_RING_MISC_ADDR(ab); + else + addr = reg_base + HAL_TCL1_RING_MISC_OFFSET(ab); + val = ath12k_hif_read32(ab, addr); + val &= ~HAL_TCL1_RING_MISC_SRNG_ENABLE; + ath12k_hif_write32(ab, addr, val); + } else { + val = ath12k_hif_read32(ab, reg_base + HAL_REO1_RING_MISC_OFFSET); + val &= ~HAL_REO1_RING_MISC_SRNG_ENABLE; + ath12k_hif_write32(ab , reg_base + HAL_REO1_RING_MISC_OFFSET, val); + } +} + +void ath12k_dp_srng_hw_ring_disable(struct ath12k_base *ab) +{ + struct ath12k_dp *dp = &ab->dp; + int i; + + for (i = 0; i < DP_REO_DST_RING_MAX; i++) + ath12k_dp_srng_hw_disable(ab, &dp->reo_dst_ring[i]); + ath12k_dp_srng_hw_disable(ab, &dp->wbm_desc_rel_ring); + + for(i = 0; i < ab->hw_params->max_tx_ring; i++) { + ath12k_dp_srng_hw_disable(ab, &dp->tx_ring[i].tcl_data_ring); + ath12k_dp_srng_hw_disable(ab, &dp->tx_ring[i].tcl_comp_ring); + } + ath12k_dp_srng_hw_disable(ab, &dp->reo_reinject_ring); + ath12k_dp_srng_hw_disable(ab, &dp->rx_rel_ring); + ath12k_dp_srng_hw_disable(ab, &dp->reo_except_ring); + ath12k_dp_srng_hw_disable(ab, &dp->reo_cmd_ring); + ath12k_dp_srng_hw_disable(ab, &dp->reo_status_ring); + ath12k_dp_srng_hw_disable(ab, &dp->wbm_idle_ring); +} + static void ath12k_dp_srng_common_cleanup(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; @@ -451,9 +861,11 @@ ath12k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_comp_ring); ath12k_dp_srng_cleanup(ab, &dp->tx_ring[i].tcl_data_ring); } - ath12k_dp_srng_cleanup(ab, &dp->tcl_status_ring); - ath12k_dp_srng_cleanup(ab, &dp->tcl_cmd_ring); ath12k_dp_srng_cleanup(ab, &dp->wbm_desc_rel_ring); + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ath12k_dp_srng_ppeds_cleanup(ab); +#endif } static int ath12k_dp_srng_common_setup(struct ath12k_base *ab) @@ -463,6 +875,7 @@ struct hal_srng *srng; int i, ret, tx_comp_ring_num; u32 ring_hash_map; + u8 rbm_id; ret = ath12k_dp_srng_setup(ab, &dp->wbm_desc_rel_ring, HAL_SW2WBM_RELEASE, 0, 0, @@ -473,23 +886,10 @@ goto err; } - ret = ath12k_dp_srng_setup(ab, &dp->tcl_cmd_ring, HAL_TCL_CMD, 0, 0, - DP_TCL_CMD_RING_SIZE); - if (ret) { - ath12k_warn(ab, "failed to set up tcl_cmd ring :%d\n", ret); - goto err; - } - - ret = ath12k_dp_srng_setup(ab, &dp->tcl_status_ring, HAL_TCL_STATUS, - 0, 0, DP_TCL_STATUS_RING_SIZE); - if (ret) { - ath12k_warn(ab, "failed to set up tcl_status ring :%d\n", ret); - goto err; - } - for (i = 0; i < ab->hw_params->max_tx_ring; i++) { map = ab->hw_params->hal_ops->tcl_to_wbm_rbm_map; tx_comp_ring_num = map[i].wbm_ring_num; + rbm_id = ab->hw_params->hal_ops->tcl_to_wbm_rbm_map[i].rbm_id; ret = ath12k_dp_srng_setup(ab, &dp->tx_ring[i].tcl_data_ring, HAL_TCL_DATA, i, 0, @@ -499,6 +899,7 @@ i, ret); goto err; } + ath12k_hal_tx_config_rbm_mapping(ab, i, rbm_id, HAL_TCL_DATA); ret = ath12k_dp_srng_setup(ab, &dp->tx_ring[i].tcl_comp_ring, HAL_WBM2SW_RELEASE, tx_comp_ring_num, 0, @@ -551,6 +952,9 @@ goto err; } + if (ath12k_dp_umac_reset_in_progress(ab)) + goto skip_reo_setup; + /* When hash based routing of rx packet is enabled, 32 entries to map * the hash values to the ring will be configured. Each hash entry uses * four bits to map to a particular ring. The ring mapping will be @@ -568,6 +972,15 @@ ath12k_hal_reo_hw_setup(ab, ring_hash_map); +skip_reo_setup: +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ret = ath12k_dp_srng_ppeds_setup(ab); + if (ret) { + ath12k_warn(ab, "failed to set up ppe-ds srngs :%d\n", ret); + goto err; + } +#endif + return 0; err: @@ -610,6 +1023,7 @@ int i; int ret = 0; u32 end_offset, cookie; + u8 rbm_id; n_entries_per_buf = HAL_WBM_IDLE_SCATTER_BUF_SIZE / ath12k_hal_srng_get_entrysize(ab, HAL_WBM_IDLE_LINK); @@ -618,6 +1032,7 @@ if (num_scatter_buf > DP_IDLE_SCATTER_BUFS_MAX) return -EINVAL; + if (!ath12k_dp_umac_reset_in_progress(ab)) { for (i = 0; i < num_scatter_buf; i++) { slist[i].vaddr = dma_alloc_coherent(ab->dev, HAL_WBM_IDLE_SCATTER_BUF_SIZE_MAX, @@ -627,10 +1042,12 @@ goto err; } } + } scatter_idx = 0; scatter_buf = slist[scatter_idx].vaddr; rem_entries = n_entries_per_buf; + rbm_id = dp->idle_link_rbm_id; for (i = 0; i < n_link_desc_bank; i++) { align_bytes = link_desc_banks[i].vaddr - @@ -640,7 +1057,8 @@ paddr = link_desc_banks[i].paddr; while (n_entries) { cookie = DP_LINK_DESC_COOKIE_SET(n_entries, i); - ath12k_hal_set_link_desc_addr(scatter_buf, cookie, paddr); + ath12k_hal_set_link_desc_addr(scatter_buf, cookie, + paddr, rbm_id); n_entries--; paddr += HAL_LINK_DESC_SIZE; if (rem_entries) { @@ -729,12 +1147,9 @@ u32 ring_type, struct dp_srng *ring) { ath12k_dp_link_desc_bank_free(ab, desc_bank); - - if (ring_type != HAL_RXDMA_MONITOR_DESC) { ath12k_dp_srng_cleanup(ab, ring); ath12k_dp_scatter_idle_link_desc_cleanup(ab); } -} static int ath12k_wbm_idle_ring_setup(struct ath12k_base *ab, u32 *n_link_desc) { @@ -784,6 +1199,7 @@ u32 paddr; int i, ret; u32 cookie; + u8 rbm_id; tot_mem_sz = n_link_desc * HAL_LINK_DESC_SIZE; tot_mem_sz += HAL_LINK_DESC_ALIGN; @@ -806,18 +1222,20 @@ if (n_link_desc_bank > DP_LINK_DESC_BANKS_MAX) return -EINVAL; + if (!ath12k_dp_umac_reset_in_progress(ab)) { ret = ath12k_dp_link_desc_bank_alloc(ab, link_desc_banks, n_link_desc_bank, last_bank_sz); if (ret) return ret; + } /* Setup link desc idle list for HW internal usage */ entry_sz = ath12k_hal_srng_get_entrysize(ab, ring_type); tot_mem_sz = entry_sz * n_link_desc; + rbm_id = ab->dp.idle_link_rbm_id; /* Setup scatter desc list when the total memory requirement is more */ - if (tot_mem_sz > DP_LINK_DESC_ALLOC_SIZE_THRESH && - ring_type != HAL_RXDMA_MONITOR_DESC) { + if (tot_mem_sz > DP_LINK_DESC_ALLOC_SIZE_THRESH) { ret = ath12k_dp_scatter_idle_link_desc_setup(ab, tot_mem_sz, n_link_desc_bank, n_link_desc, @@ -845,7 +1263,7 @@ (desc = ath12k_hal_srng_src_get_next_entry(ab, srng))) { cookie = DP_LINK_DESC_COOKIE_SET(n_entries, i); ath12k_hal_set_link_desc_addr(desc, - cookie, paddr); + cookie, paddr, rbm_id); n_entries--; paddr += HAL_LINK_DESC_SIZE; } @@ -873,16 +1291,35 @@ int i = 0, j; int tot_work_done = 0; enum dp_monitor_mode monitor_mode; - u8 ring_mask; + u8 ring_mask_val; + struct ath12k_hw_ring_mask *ring_mask = ab->hw_params->ring_mask; + u8 tx_mask = ring_mask->tx[grp_id]; + u8 rx_err_mask = ring_mask->rx_err[grp_id]; + u8 rx_wbm_rel_mask = ring_mask->rx_wbm_rel[grp_id]; + u8 rx_mask = ring_mask->rx[grp_id]; + u8 reo_status_mask = ring_mask->reo_status[grp_id]; + u8 host2rxdma_mask = ring_mask->host2rxdma[grp_id]; + u8 rx_mon_dest_mask = ring_mask->rx_mon_dest[grp_id]; + u8 tx_mon_dest_mask = ring_mask->tx_mon_dest[grp_id]; + u8 misc_intr_mask = rx_mon_dest_mask | + tx_mon_dest_mask | + reo_status_mask | + host2rxdma_mask; while (i < ab->hw_params->max_tx_ring) { - if (ab->hw_params->ring_mask->tx[grp_id] & - BIT(ab->hw_params->hal_ops->tcl_to_wbm_rbm_map[i].wbm_ring_num)) - ath12k_dp_tx_completion_handler(ab, i); + if (tx_mask & + BIT(ab->hw_params->hal_ops->tcl_to_wbm_rbm_map[i].wbm_ring_num)) { + work_done = ath12k_dp_tx_completion_handler(ab, i, + budget); + budget -= work_done; + tot_work_done += work_done; + if (budget <= 0) + goto done; + } i++; } - if (ab->hw_params->ring_mask->rx_err[grp_id]) { + if (rx_err_mask) { work_done = ath12k_dp_rx_process_err(ab, napi, budget); budget -= work_done; tot_work_done += work_done; @@ -890,7 +1327,7 @@ goto done; } - if (ab->hw_params->ring_mask->rx_wbm_rel[grp_id]) { + if (rx_wbm_rel_mask) { work_done = ath12k_dp_rx_process_wbm_err(ab, napi, budget); @@ -901,8 +1338,9 @@ goto done; } - if (ab->hw_params->ring_mask->rx[grp_id]) { - i = fls(ab->hw_params->ring_mask->rx[grp_id]) - 1; + while (rx_mask) { + i = fls(rx_mask) - 1; + rx_mask ^= 1 << i; work_done = ath12k_dp_rx_process(ab, i, napi, budget); budget -= work_done; @@ -911,14 +1349,17 @@ goto done; } - if (ab->hw_params->ring_mask->rx_mon_dest[grp_id]) { + if (!misc_intr_mask) + goto done; + + if (rx_mon_dest_mask) { monitor_mode = ATH12K_DP_RX_MONITOR_MODE; - ring_mask = ab->hw_params->ring_mask->rx_mon_dest[grp_id]; + ring_mask_val = ab->hw_params->ring_mask->rx_mon_dest[grp_id]; for (i = 0; i < ab->num_radios; i++) { for (j = 0; j < ab->hw_params->num_rxmda_per_pdev; j++) { int id = i * ab->hw_params->num_rxmda_per_pdev + j; - if (ring_mask & BIT(id)) { + if (ring_mask_val & BIT(id)) { work_done = ath12k_dp_mon_process_ring(ab, id, napi, budget, monitor_mode); @@ -932,14 +1373,14 @@ } } - if (ab->hw_params->ring_mask->tx_mon_dest[grp_id]) { + if (tx_mon_dest_mask) { monitor_mode = ATH12K_DP_TX_MONITOR_MODE; - ring_mask = ab->hw_params->ring_mask->tx_mon_dest[grp_id]; + ring_mask_val = ab->hw_params->ring_mask->tx_mon_dest[grp_id]; for (i = 0; i < ab->num_radios; i++) { for (j = 0; j < ab->hw_params->num_rxmda_per_pdev; j++) { int id = i * ab->hw_params->num_rxmda_per_pdev + j; - if (ring_mask & BIT(id)) { + if (ring_mask_val & BIT(id)) { work_done = ath12k_dp_mon_process_ring(ab, id, napi, budget, monitor_mode); @@ -953,16 +1394,15 @@ } } - if (ab->hw_params->ring_mask->reo_status[grp_id]) + if (reo_status_mask) ath12k_dp_rx_process_reo_status(ab); - if (ab->hw_params->ring_mask->host2rxdma[grp_id]) { + if (host2rxdma_mask) { struct ath12k_dp *dp = &ab->dp; struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring; + LIST_HEAD(list); - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, 0, - ab->hw_params->hal_params->rx_buf_rbm, - true); + ath12k_dp_rx_bufs_replenish(ab, rx_ring, &list, 0); } /* TODO: Implement handler for other interrupts */ @@ -973,12 +1413,18 @@ void ath12k_dp_pdev_free(struct ath12k_base *ab) { + struct ath12k *ar; int i; del_timer_sync(&ab->mon_reap_timer); - for (i = 0; i < ab->num_radios; i++) + for (i = 0; i < ab->num_radios; i++) { + ar = ab->pdevs[i].ar; ath12k_dp_rx_pdev_free(ab, i); + ath12k_dp_rx_pdev_mon_detach(ab, i); + ath12k_fw_stats_free(&ar->fw_stats); + ath12k_debugfs_unregister(ar); + } } void ath12k_dp_pdev_pre_alloc(struct ath12k_base *ab) @@ -992,7 +1438,7 @@ dp = &ar->dp; dp->mac_id = i; atomic_set(&dp->num_tx_pending, 0); - init_waitqueue_head(&dp->tx_empty_waitq); + atomic_set(&ar->flush_request, 0); /* TODO: Add any RXDMA setup required per pdev */ } @@ -1013,11 +1459,38 @@ static void ath12k_dp_mon_reap_timer_init(struct ath12k_base *ab) { + timer_setup(&ab->mon_reap_timer, ath12k_dp_service_mon_ring, 0); + if (ab->hw_params->rxdma1_enable) return; +} - timer_setup(&ab->mon_reap_timer, ath12k_dp_service_mon_ring, 0); +#ifdef CONFIG_MAC80211_BONDED_SUPPORT +static int ath12k_dp_ppe_rxole_rxdma_cfg(struct ath12k_base *ab) +{ + struct ath12k_dp_htt_rxdma_ppe_cfg_param param = {0}; + int ret; + + if (!g_bonded_interface_model) + return 0; + + param.override = 1; + param.reo_dst_ind = HAL_REO2PPE_DST_IND; + param.multi_buffer_msdu_override_en = 0; + + /* Override use_ppe to 0 in RxOLE for the following cases */ + param.intra_bss_override = 1; + param.decap_raw_override = 1; + param.decap_nwifi_override = 1; + param.ip_frag_override = 1; + + ret = ath12k_dp_rx_htt_rxdma_rxole_ppe_cfg_set(ab, ¶m); + if (ret) + ath12k_err(ab, "RxOLE and RxDMA PPE config failed %d\n", ret); + + return ret; } +#endif int ath12k_dp_pdev_alloc(struct ath12k_base *ab) { @@ -1025,6 +1498,15 @@ int ret; int i; +#ifdef CONFIG_MAC80211_BONDED_SUPPORT + ret = ath12k_dp_ppe_rxole_rxdma_cfg(ab); + if (ret) { + ath12k_err(ab, "Failed to send htt RxOLE and RxDMA messages to target :%d\n", + ret); + goto out; + } +#endif + ret = ath12k_dp_rx_htt_setup(ab); if (ret) goto out; @@ -1077,15 +1559,14 @@ return 0; } -static void ath12k_dp_update_vdev_search(struct ath12k_vif *arvif) +static void ath12k_dp_update_vdev_search(struct ath12k_link_vif *arvif) { - switch (arvif->vdev_type) { + struct ath12k_vif *ahvif = arvif->ahvif; + + switch (ahvif->vdev_type) { case WMI_VDEV_TYPE_STA: - /* TODO: Verify the search type and flags since ast hash - * is not part of peer mapv3 - */ - arvif->hal_addr_search_flags = HAL_TX_ADDRY_EN; - arvif->search_type = HAL_TX_ADDR_SEARCH_DEFAULT; + arvif->hal_addr_search_flags = HAL_TX_ADDRX_EN; + arvif->search_type = HAL_TX_ADDR_SEARCH_INDEX; break; case WMI_VDEV_TYPE_AP: case WMI_VDEV_TYPE_IBSS: @@ -1098,14 +1579,14 @@ } } -void ath12k_dp_vdev_tx_attach(struct ath12k *ar, struct ath12k_vif *arvif) +void ath12k_dp_vdev_tx_attach(struct ath12k *ar, struct ath12k_link_vif *arvif) { struct ath12k_base *ab = ar->ab; - arvif->tcl_metadata |= u32_encode_bits(1, HTT_TCL_META_DATA_TYPE) | - u32_encode_bits(arvif->vdev_id, + arvif->tcl_metadata = HTT_TCL_META_DATA_GET(1, HTT_TCL_META_DATA_TYPE) | + HTT_TCL_META_DATA_GET(arvif->vdev_id, HTT_TCL_META_DATA_VDEV_ID) | - u32_encode_bits(ar->pdev->pdev_id, + HTT_TCL_META_DATA_GET(ar->pdev->pdev_id, HTT_TCL_META_DATA_PDEV_ID); /* set HTT extension valid bit to 0 by default */ @@ -1115,20 +1596,109 @@ arvif->vdev_id_check_en = true; arvif->bank_id = ath12k_dp_tx_get_bank_profile(ab, arvif, &ab->dp); + arvif->desc.info0 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO0_BANK_ID, + arvif->bank_id); + arvif->desc.info1 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_CMD_NUM, + arvif->tcl_metadata); + arvif->desc.info3 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_PMAC_ID, + ar->lmac_id) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO3_VDEV_ID, + arvif->vdev_id); + arvif->desc.info4 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO4_SEARCH_INDEX, + arvif->ast_idx) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO4_CACHE_SET_NUM, + arvif->ast_hash); + /* TODO: error path for bank id failure */ if (arvif->bank_id == DP_INVALID_BANK_ID) { ath12k_err(ar->ab, "Failed to initialize DP TX Banks"); return; } + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + ath12k_dp_ppeds_update_vp_entry(ar, arvif); +#endif +} + +void ath12k_dp_umac_txrx_desc_cleanup(struct ath12k_base *ab) +{ + struct ath12k_rx_desc_info *desc_info; + struct ath12k_tx_desc_info *tx_desc_info; + struct ath12k_dp *dp = &ab->dp; + struct sk_buff *skb; + int i, j, k; + u32 tx_spt_page; + + /* RX Descriptor cleanup */ + spin_lock_bh(&dp->rx_desc_lock); + + for (i = 0; i < ATH12K_NUM_RX_SPT_PAGES; i++) { + desc_info = dp->spt_info->rxbaddr[i]; + + for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) { + if (!desc_info[j].in_use) + continue; + + skb = desc_info[j].skb; + desc_info[j].skb = NULL; + desc_info[j].paddr = 0; + desc_info[j].in_use = false; + list_add_tail(&desc_info[j].list, &dp->rx_desc_free_list); + + if (!skb) + continue; + + dma_unmap_single(ab->dev, ATH12K_SKB_RXCB(skb)->paddr, + skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); + dev_kfree_skb_any(skb); + } + } + + spin_unlock_bh(&dp->rx_desc_lock); + + /* TX Descriptor cleanup */ + for (i = 0; i < ATH12K_HW_MAX_QUEUES; i++) { + spin_lock_bh(&dp->tx_desc_lock[i]); + + for (j = 0; j < ATH12K_TX_SPT_PAGES_PER_POOL; j++) { + tx_spt_page = j + i * ATH12K_TX_SPT_PAGES_PER_POOL; + tx_desc_info = dp->spt_info->txbaddr[tx_spt_page]; + + for (k = 0; k < ATH12K_MAX_SPT_ENTRIES; k++) { + if (!tx_desc_info[k].in_use) + continue; + + skb = tx_desc_info[k].skb; + if (!skb) + continue; + + tx_desc_info[k].skb = NULL; + tx_desc_info[k].skb_ext_desc = NULL; + tx_desc_info[k].in_use = false; + list_add_tail(&tx_desc_info[k].list, &dp->tx_desc_free_list[i]); + dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr, + skb->len, DMA_TO_DEVICE); + if (tx_desc_info[k].skb_ext_desc) { + dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr_ext_desc, + tx_desc_info[k].skb_ext_desc->len, DMA_TO_DEVICE); + dev_kfree_skb_any(tx_desc_info[k].skb_ext_desc); + } + dev_kfree_skb_any(skb); + } + } + + spin_unlock_bh(&dp->tx_desc_lock[i]); + } } static void ath12k_dp_cc_cleanup(struct ath12k_base *ab) { - struct ath12k_rx_desc_info *desc_info, *tmp; - struct ath12k_tx_desc_info *tx_desc_info, *tmp1; + struct ath12k_rx_desc_info *desc_info; + struct ath12k_tx_desc_info *tx_desc_info; struct ath12k_dp *dp = &ab->dp; struct sk_buff *skb; - int i; + int i, j, k; + u32 pool_id, tx_spt_page; if (!dp->spt_info) return; @@ -1136,10 +1706,16 @@ /* RX Descriptor cleanup */ spin_lock_bh(&dp->rx_desc_lock); - list_for_each_entry_safe(desc_info, tmp, &dp->rx_desc_used_list, list) { - list_del(&desc_info->list); - skb = desc_info->skb; + for (i = 0; i < ATH12K_NUM_RX_SPT_PAGES; i++) { + desc_info = dp->spt_info->rxbaddr[i]; + for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) { + if (!desc_info[j].in_use) { + list_del(&desc_info[j].list); + continue; + } + + skb = desc_info[j].skb; if (!skb) continue; @@ -1147,6 +1723,14 @@ skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); dev_kfree_skb_any(skb); } + } + + for (i = 0; i < ATH12K_NUM_RX_SPT_PAGES; i++) { + if (!dp->spt_info->rxbaddr[i]) + continue; + + kfree(dp->spt_info->rxbaddr[i]); + } spin_unlock_bh(&dp->rx_desc_lock); @@ -1154,22 +1738,53 @@ for (i = 0; i < ATH12K_HW_MAX_QUEUES; i++) { spin_lock_bh(&dp->tx_desc_lock[i]); - list_for_each_entry_safe(tx_desc_info, tmp1, &dp->tx_desc_used_list[i], - list) { - list_del(&tx_desc_info->list); - skb = tx_desc_info->skb; + for (j = 0; j < ATH12K_TX_SPT_PAGES_PER_POOL; j++) { + tx_spt_page = j + i * ATH12K_TX_SPT_PAGES_PER_POOL; + tx_desc_info = dp->spt_info->txbaddr[tx_spt_page]; + for (k = 0; k < ATH12K_MAX_SPT_ENTRIES; k++) { + if (!tx_desc_info[k].in_use) + continue; + + skb = tx_desc_info[k].skb; if (!skb) continue; + tx_desc_info[k].skb = NULL; dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr, skb->len, DMA_TO_DEVICE); + + if (tx_desc_info[k].skb_ext_desc) { + dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr_ext_desc, + tx_desc_info[k].skb_ext_desc->len, DMA_TO_DEVICE); + dev_kfree_skb_any(tx_desc_info[k].skb_ext_desc); + } dev_kfree_skb_any(skb); } + } spin_unlock_bh(&dp->tx_desc_lock[i]); } + for (pool_id = 0; pool_id < ATH12K_HW_MAX_QUEUES; pool_id++) { + spin_lock_bh(&dp->tx_desc_lock[pool_id]); + + for (i = 0; i < ATH12K_TX_SPT_PAGES_PER_POOL; i++) { + tx_spt_page = i + pool_id * ATH12K_TX_SPT_PAGES_PER_POOL; + if (!dp->spt_info->txbaddr[tx_spt_page]) + continue; + + kfree(dp->spt_info->txbaddr[tx_spt_page]); + } + + spin_unlock_bh(&dp->tx_desc_lock[pool_id]); + } + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + if (test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags)) + ath12k_ppeds_detach(ab); +#endif + /* unmap SPT pages */ for (i = 0; i < dp->num_spt_pages; i++) { if (!dp->spt_info[i].vaddr) @@ -1193,18 +1808,22 @@ if (!dp->reoq_lut.vaddr) return; + if (dp->reoq_lut.vaddr) { dma_free_coherent(ab->dev, DP_REOQ_LUT_SIZE, dp->reoq_lut.vaddr, dp->reoq_lut.paddr); dp->reoq_lut.vaddr = NULL; + } - ath12k_hif_write32(ab, - HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_LUT_BASE0(ab), 0); + if (dp->ml_reoq_lut.vaddr) { + dma_free_coherent(ab->dev, DP_REOQ_LUT_SIZE, + dp->ml_reoq_lut.vaddr, dp->ml_reoq_lut.paddr); + dp->ml_reoq_lut.vaddr = NULL; + } } void ath12k_dp_free(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; - int i; ath12k_dp_link_desc_cleanup(ab, dp->link_desc_banks, HAL_WBM_IDLE_LINK, &dp->wbm_idle_ring); @@ -1216,9 +1835,6 @@ ath12k_dp_rx_reo_cmd_list_cleanup(ab); - for (i = 0; i < ab->hw_params->max_tx_ring; i++) - kfree(dp->tx_ring[i].tx_status); - ath12k_dp_rx_free(ab); /* Deinit any SOC level resource */ } @@ -1230,6 +1846,9 @@ u32 wbm_base = HAL_SEQ_WCSS_UMAC_WBM_REG; u32 val = 0; + if (ath12k_ftm_mode) + return; + ath12k_hif_write32(ab, reo_base + HAL_REO1_SW_COOKIE_CFG0(ab), cmem_base); val |= u32_encode_bits(ATH12K_CMEM_ADDR_MSB, @@ -1283,12 +1902,13 @@ { struct ath12k_dp *dp = &ab->dp; - return dp->spt_info[ppt_idx].vaddr + spt_idx; + return dp->spt_info[ppt_idx].vaddr + (spt_idx * sizeof(u64)); } struct ath12k_rx_desc_info *ath12k_dp_get_rx_desc(struct ath12k_base *ab, u32 cookie) { + struct ath12k_dp *dp = &ab->dp; struct ath12k_rx_desc_info **desc_addr_ptr; u16 ppt_idx, spt_idx; @@ -1299,6 +1919,11 @@ spt_idx > ATH12K_MAX_SPT_ENTRIES) return NULL; + if (WARN_ON(spt_idx < dp->rx_spt_base)) + return NULL; + + spt_idx = spt_idx - dp->rx_spt_base; + desc_addr_ptr = ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, spt_idx); return *desc_addr_ptr; @@ -1323,16 +1948,270 @@ return *desc_addr_ptr; } +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +static u8 *ath12k_dp_cc_find_desc(struct ath12k_base *ab, u32 cookie, bool is_rx) +{ + struct ath12k_dp *dp = &ab->dp; + u16 spt_page_id, spt_idx; + u8 *spt_va; + spt_idx = u32_get_bits(cookie, ATH12k_DP_CC_COOKIE_SPT); + spt_page_id = u32_get_bits(cookie, ATH12K_DP_CC_COOKIE_PPT); + if (is_rx) { + if (WARN_ON(spt_page_id < dp->rx_spt_base)) + return NULL; + spt_page_id = spt_page_id - dp->rx_spt_base; + } + spt_va = (u8 *)dp->spt_info[spt_page_id].vaddr; + return (spt_va + spt_idx * sizeof(u64)); +} + +struct ath12k_ppeds_tx_desc_info *ath12k_dp_get_ppeds_tx_desc(struct ath12k_base *ab, + u32 desc_id) +{ + u8 *desc_addr_ptr; + + desc_addr_ptr = ath12k_dp_cc_find_desc(ab, desc_id, false); + return *(struct ath12k_ppeds_tx_desc_info **)desc_addr_ptr; +} +#endif + +static void ath12k_dp_tx_cmem_init(struct ath12k_base *ab, struct ath12k_dp *dp) +{ + u32 cmem_base; + int i; + + cmem_base = ab->qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start; + + for (i = ATH12K_TX_SPT_PAGE_OFFSET; + i < (ATH12K_TX_SPT_PAGE_OFFSET + ATH12K_NUM_TX_SPT_PAGES); i++) { + /* Write to PPT in CMEM */ + if (ab->hif.ops->cmem_write32) + ath12k_hif_cmem_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), + dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); + else + ath12k_hif_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), + dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); + } +} + +static void ath12k_dp_rx_cmem_init(struct ath12k_base *ab, struct ath12k_dp *dp) +{ + u32 cmem_base; + int i; + + cmem_base = ab->qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start; + cmem_base += ATH12K_PPT_ADDR_OFFSET(dp->rx_spt_base); + + for (i = ATH12K_RX_SPT_PAGE_OFFSET; + i < (ATH12K_RX_SPT_PAGE_OFFSET + ATH12K_NUM_RX_SPT_PAGES); i++) { + /* Write to PPT in CMEM */ + if (ab->hif.ops->cmem_write32) + ath12k_hif_cmem_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), + dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); + else + ath12k_hif_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), + dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); + } +} + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +void ath12k_dp_ppeds_tx_cmem_init(struct ath12k_base *ab, struct ath12k_dp *dp) +{ + u32 cmem_base; + int i; + + cmem_base = ab->qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start; + + for (i = ATH12K_PPEDS_TX_SPT_PAGE_OFFSET; + i < (ATH12K_PPEDS_TX_SPT_PAGE_OFFSET + ATH12K_NUM_PPEDS_TX_SPT_PAGES); i++) { + /* Write to PPT in CMEM */ + if (ab->hif.ops->cmem_write32) + ath12k_hif_cmem_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), + dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); + else + ath12k_hif_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), + dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); + } +} + +static void ath12k_dp_ppeds_tx_desc_cleanup(struct ath12k_base *ab) +{ + struct ath12k_ppeds_tx_desc_info *ppeds_tx_desc_info, *tmp2; + struct ath12k_dp *dp = &ab->dp; + struct sk_buff *skb; + int i; + + /* PPEDS TX Descriptor cleanup */ + for (i = 0; i < ATH12K_HW_MAX_QUEUES_PPEDS; i++) { + spin_lock_bh(&dp->ppeds_tx_desc_lock[i]); + + /* clean up used desc list */ + list_for_each_entry_safe(ppeds_tx_desc_info, tmp2, + &dp->ppeds_tx_desc_used_list[i], + list) { + list_move_tail(&ppeds_tx_desc_info->list, + &dp->ppeds_tx_desc_free_list[i]); + skb = ppeds_tx_desc_info->skb; + ppeds_tx_desc_info->skb = NULL; + if (!skb) { + WARN_ON_ONCE(1); + continue; + } + dma_unmap_single_attrs(ab->dev, ATH12K_SKB_CB(skb)->paddr, + skb->len, DMA_TO_DEVICE, + DMA_ATTR_SKIP_CPU_SYNC); + dev_kfree_skb_any(skb); + } + + /* clean up descriptors and skbs from reuse list */ + list_for_each_entry_safe(ppeds_tx_desc_info, tmp2, + &dp->ppeds_tx_desc_reuse_list[i], + list) { + list_move_tail(&ppeds_tx_desc_info->list, + &dp->ppeds_tx_desc_free_list[i]); + skb = ppeds_tx_desc_info->skb; + ppeds_tx_desc_info->skb = NULL; + if (!skb) { + WARN_ON_ONCE(1); + continue; + } + dma_unmap_single_attrs(ab->dev, ppeds_tx_desc_info->paddr, + skb->len, DMA_TO_DEVICE, + DMA_ATTR_SKIP_CPU_SYNC); + dev_kfree_skb_any(skb); + } + dp->ppeds_tx_desc_reuse_list_len[i] = 0; + + spin_unlock_bh(&dp->ppeds_tx_desc_lock[i]); + } +} + +int ath12k_dp_cc_ppeds_desc_cleanup(struct ath12k_base *ab) +{ + struct ath12k_ppeds_tx_desc_info *ppeds_tx_desc_info, *tmp2; + struct ath12k_dp *dp = &ab->dp; + struct sk_buff *skb; + int i; + u32 pool_id, ppeds_tx_spt_page; + + if (!dp->spt_info) { + ath12k_err(ab,"ath12k_dp_cc_ppeds_desc_cleanup failed"); + return -EINVAL; + } + + /* PPEDS TX Descriptor cleanup */ + for (i = 0; i < ATH12K_HW_MAX_QUEUES_PPEDS; i++) { + spin_lock_bh(&dp->ppeds_tx_desc_lock[i]); + + /* clean up used desc list */ + list_for_each_entry_safe(ppeds_tx_desc_info, tmp2, + &dp->ppeds_tx_desc_used_list[i], + list) { + list_del(&ppeds_tx_desc_info->list); + skb = ppeds_tx_desc_info->skb; + if (!skb) + continue; + + dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr, + skb->len, DMA_TO_DEVICE); + dev_kfree_skb_any(skb); + } + + /* clean up descriptors and skbs from reuse list */ + list_for_each_entry_safe(ppeds_tx_desc_info, tmp2, + &dp->ppeds_tx_desc_reuse_list[i], + list) { + list_del(&ppeds_tx_desc_info->list); + skb = ppeds_tx_desc_info->skb; + if (!skb) + continue; + + dma_unmap_single(ab->dev, ppeds_tx_desc_info->paddr, + skb->len, DMA_TO_DEVICE); + dev_kfree_skb_any(skb); + } + + spin_unlock_bh(&dp->ppeds_tx_desc_lock[i]); + } + + for (pool_id = 0; pool_id < ATH12K_HW_MAX_QUEUES_PPEDS; pool_id++) { + spin_lock_bh(&dp->ppeds_tx_desc_lock[pool_id]); + + for (i = 0; i < ATH12K_PPEDS_TX_SPT_PAGES_PER_POOL; i++) { + ppeds_tx_spt_page = i + pool_id * ATH12K_PPEDS_TX_SPT_PAGES_PER_POOL; + if (!dp->spt_info->ppedstxbaddr[ppeds_tx_spt_page]) + continue; + + kfree(dp->spt_info->ppedstxbaddr[ppeds_tx_spt_page]); + } + + spin_unlock_bh(&dp->ppeds_tx_desc_lock[pool_id]); + } + ath12k_dbg(ab, ATH12K_DBG_PPE, "ath12k_dp_cc_ppeds_desc_cleanup success\n"); + + return 0; +} + +int ath12k_dp_cc_ppeds_desc_init(struct ath12k_base *ab) +{ + struct ath12k_dp *dp = &ab->dp; + struct ath12k_ppeds_tx_desc_info *ppeds_tx_descs; + struct ath12k_spt_info *ppeds_tx_spt_pages; + u32 i, j, pool_id, ppeds_tx_spt_page; + u32 ppt_idx; + + /* pointer to start of TX pages */ + ppeds_tx_spt_pages = &dp->spt_info[ATH12K_PPEDS_TX_SPT_PAGE_OFFSET]; + + for (pool_id = 0; pool_id < ATH12K_HW_MAX_QUEUES_PPEDS; pool_id++) { + spin_lock_bh(&dp->ppeds_tx_desc_lock[pool_id]); + for (i = 0; i < ATH12K_PPEDS_TX_SPT_PAGES_PER_POOL; i++) { + ppeds_tx_descs = kcalloc(ATH12K_MAX_SPT_ENTRIES, sizeof(*ppeds_tx_descs), + GFP_ATOMIC); + + if (!ppeds_tx_descs) { + spin_unlock_bh(&dp->ppeds_tx_desc_lock[pool_id]); + ath12k_dp_cc_ppeds_desc_cleanup(ab); + return -ENOMEM; + } + + ppeds_tx_spt_page = i + pool_id * ATH12K_PPEDS_TX_SPT_PAGES_PER_POOL; + dp->spt_info->ppedstxbaddr[ppeds_tx_spt_page] = &ppeds_tx_descs[0]; + + for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) { + ppt_idx = ATH12K_PPEDS_TX_SPT_PAGE_OFFSET + ppeds_tx_spt_page; + ppeds_tx_descs[j].desc_id = ath12k_dp_cc_cookie_gen(ppt_idx, j); + ppeds_tx_descs[j].pool_id = pool_id; + list_add_tail(&ppeds_tx_descs[j].list, + &dp->ppeds_tx_desc_free_list[pool_id]); + + /* Update descriptor VA in SPT */ + *(struct ath12k_ppeds_tx_desc_info **) + ((u8 *)ppeds_tx_spt_pages[ppeds_tx_spt_page].vaddr + + (j * sizeof(u64))) = &ppeds_tx_descs[j]; + } + } + spin_unlock_bh(&dp->ppeds_tx_desc_lock[pool_id]); + } + ath12k_dbg(ab, ATH12K_DBG_PPE, "ath12k_dp_cc_ppeds_desc_init success\n"); + + return 0; +} +#endif + static int ath12k_dp_cc_desc_init(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; - struct ath12k_rx_desc_info *rx_descs, **rx_desc_addr; - struct ath12k_tx_desc_info *tx_descs, **tx_desc_addr; + struct ath12k_rx_desc_info *rx_descs; + struct ath12k_tx_desc_info *tx_descs; + struct ath12k_spt_info *tx_spt_pages, *rx_spt_pages; u32 i, j, pool_id, tx_spt_page; u32 ppt_idx; spin_lock_bh(&dp->rx_desc_lock); + rx_spt_pages = &dp->spt_info[ATH12K_RX_SPT_PAGE_OFFSET]; + /* First ATH12K_NUM_RX_SPT_PAGES of allocated SPT pages are used for RX */ for (i = 0; i < ATH12K_NUM_RX_SPT_PAGES; i++) { rx_descs = kcalloc(ATH12K_MAX_SPT_ENTRIES, sizeof(*rx_descs), @@ -1343,19 +2222,26 @@ return -ENOMEM; } + dp->spt_info->rxbaddr[i] = &rx_descs[0]; + ppt_idx = dp->rx_spt_base + ATH12K_RX_SPT_PAGE_OFFSET + i; + for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) { - rx_descs[j].cookie = ath12k_dp_cc_cookie_gen(i, j); + rx_descs[j].cookie = ath12k_dp_cc_cookie_gen(ppt_idx, j); rx_descs[j].magic = ATH12K_DP_RX_DESC_MAGIC; + rx_descs[j].chip_id = ab->chip_id; list_add_tail(&rx_descs[j].list, &dp->rx_desc_free_list); /* Update descriptor VA in SPT */ - rx_desc_addr = ath12k_dp_cc_get_desc_addr_ptr(ab, i, j); - *rx_desc_addr = &rx_descs[j]; + *(struct ath12k_rx_desc_info **)((u8 *)rx_spt_pages[i].vaddr + + (j * sizeof(u64))) = &rx_descs[j]; } } spin_unlock_bh(&dp->rx_desc_lock); + /* pointer to start of TX pages */ + tx_spt_pages = &dp->spt_info[ATH12K_TX_SPT_PAGE_OFFSET]; + for (pool_id = 0; pool_id < ATH12K_HW_MAX_QUEUES; pool_id++) { spin_lock_bh(&dp->tx_desc_lock[pool_id]); for (i = 0; i < ATH12K_TX_SPT_PAGES_PER_POOL; i++) { @@ -1368,18 +2254,20 @@ return -ENOMEM; } - for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) { tx_spt_page = i + pool_id * ATH12K_TX_SPT_PAGES_PER_POOL; - ppt_idx = ATH12K_NUM_RX_SPT_PAGES + tx_spt_page; + dp->spt_info->txbaddr[tx_spt_page] = &tx_descs[0]; + + for (j = 0; j < ATH12K_MAX_SPT_ENTRIES; j++) { + ppt_idx = ATH12K_TX_SPT_PAGE_OFFSET + tx_spt_page; tx_descs[j].desc_id = ath12k_dp_cc_cookie_gen(ppt_idx, j); tx_descs[j].pool_id = pool_id; list_add_tail(&tx_descs[j].list, &dp->tx_desc_free_list[pool_id]); /* Update descriptor VA in SPT */ - tx_desc_addr = - ath12k_dp_cc_get_desc_addr_ptr(ab, ppt_idx, j); - *tx_desc_addr = &tx_descs[j]; + *(struct ath12k_tx_desc_info **) + ((u8 *)tx_spt_pages[tx_spt_page].vaddr + + (j * sizeof(u64))) = &tx_descs[j]; } } spin_unlock_bh(&dp->tx_desc_lock[pool_id]); @@ -1387,6 +2275,23 @@ return 0; } +void ath12k_dp_partner_cc_init(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_base *partner_ab; + struct ath12k_dp *dp; + int i; + + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + if (partner_ab == ab) + continue; + + dp = &partner_ab->dp; + ath12k_dp_rx_cmem_init(ab, dp); + } +} + static int ath12k_dp_cc_init(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; @@ -1394,7 +2299,6 @@ u32 cmem_base; INIT_LIST_HEAD(&dp->rx_desc_free_list); - INIT_LIST_HEAD(&dp->rx_desc_used_list); spin_lock_init(&dp->rx_desc_lock); for (i = 0; i < ATH12K_HW_MAX_QUEUES; i++) { @@ -1415,6 +2319,7 @@ return -ENOMEM; } + dp->rx_spt_base = ab->chip_id * ATH12K_NUM_RX_SPT_PAGES; cmem_base = ab->qmi.dev_mem[ATH12K_QMI_DEVMEM_CMEM_INDEX].start; for (i = 0; i < dp->num_spt_pages; i++) { @@ -1433,18 +2338,31 @@ ret = -EINVAL; goto free; } - - /* Write to PPT in CMEM */ - ath12k_hif_write32(ab, cmem_base + ATH12K_PPT_ADDR_OFFSET(i), - dp->spt_info[i].paddr >> ATH12K_SPT_4K_ALIGN_OFFSET); } + ath12k_dp_tx_cmem_init(ab, dp); + + ath12k_dp_rx_cmem_init(ab, dp); + ret = ath12k_dp_cc_desc_init(ab); if (ret) { ath12k_warn(ab, "HW CC desc init failed %d", ret); goto free; } +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + if (test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags)) { + for (i = 0; i < ATH12K_HW_MAX_QUEUES_PPEDS; i++) { + INIT_LIST_HEAD(&dp->ppeds_tx_desc_free_list[i]); + INIT_LIST_HEAD(&dp->ppeds_tx_desc_reuse_list[i]); + INIT_LIST_HEAD(&dp->ppeds_tx_desc_used_list[i]); + spin_lock_init(&dp->ppeds_tx_desc_lock[i]); + dp->ppeds_tx_desc_reuse_list_len[i] = 0; + } + ath12k_ppeds_attach(ab); + } +#endif + return 0; free: ath12k_dp_cc_cleanup(ab); @@ -1454,6 +2372,7 @@ static int ath12k_dp_reoq_lut_setup(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; + u32 val; if (!ab->hw_params->reoq_lut_support) return 0; @@ -1467,8 +2386,38 @@ return -ENOMEM; } + dp->ml_reoq_lut.vaddr = dma_alloc_coherent(ab->dev, + DP_REOQ_LUT_SIZE, + &dp->ml_reoq_lut.paddr, + GFP_KERNEL); + + if (!dp->ml_reoq_lut.vaddr) { + ath12k_warn(ab, "failed to allocate memory for ML reoq table"); + + /* cleanup non-ML REOQ LUT allocated above */ + dma_free_coherent(ab->dev, DP_REOQ_LUT_SIZE, + dp->reoq_lut.vaddr, dp->reoq_lut.paddr); + dp->reoq_lut.vaddr = NULL; + return -ENOMEM; + } + + memset(dp->reoq_lut.vaddr, 0, DP_REOQ_LUT_SIZE); + memset(dp->ml_reoq_lut.vaddr, 0, DP_REOQ_LUT_SIZE); + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_LUT_BASE0(ab), - dp->reoq_lut.paddr); + dp->reoq_lut.paddr >> 8); + + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_LUT_BASE1(ab), + dp->ml_reoq_lut.paddr >> 8); + + val = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_ADDR_READ(ab)); + + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_ADDR_READ(ab), + val | HAL_REO_QDESC_ADDR_READ_LUT_ENABLE); + + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO1_QDESC_MAX_PEERID(ab), + HAL_REO_QDESC_MAX_PEERID); + return 0; } @@ -1480,14 +2429,19 @@ u32 n_link_desc = 0; int ret; int i; + u8 chip_id; dp->ab = ab; INIT_LIST_HEAD(&dp->reo_cmd_list); INIT_LIST_HEAD(&dp->reo_cmd_cache_flush_list); + INIT_LIST_HEAD(&dp->reo_cmd_update_rx_queue_list); spin_lock_init(&dp->reo_cmd_lock); + spin_lock_init(&dp->reo_cmd_update_rx_queue_lock); dp->reo_cmd_cache_flush_count = 0; + chip_id = (ab->ag->mlo_capable) ? ab->chip_id : 0; + dp->idle_link_rbm_id = HAL_RX_BUF_RBM_WBM_CHIP0_IDLE_DESC_LIST + chip_id; ret = ath12k_wbm_idle_ring_setup(ab, &n_link_desc); if (ret) { @@ -1530,17 +2484,6 @@ for (i = 0; i < ab->hw_params->max_tx_ring; i++) { dp->tx_ring[i].tcl_data_ring_id = i; - - dp->tx_ring[i].tx_status_head = 0; - dp->tx_ring[i].tx_status_tail = DP_TX_COMP_RING_SIZE - 1; - dp->tx_ring[i].tx_status = kmalloc(size, GFP_KERNEL); - if (!dp->tx_ring[i].tx_status) { - ret = -ENOMEM; - /* FIXME: The allocated tx status is not freed - * properly here - */ - goto fail_cmn_reoq_cleanup; - } } for (i = 0; i < HAL_DSCP_TID_MAP_TBL_NUM_ENTRIES_MAX; i++) @@ -1556,8 +2499,6 @@ fail_dp_rx_free: ath12k_dp_rx_free(ab); - -fail_cmn_reoq_cleanup: ath12k_dp_reoq_lut_cleanup(ab); fail_cmn_srng_cleanup: @@ -1575,3 +2516,81 @@ return ret; } + +int ath12k_dp_rxdma_ring_setup(struct ath12k_base *ab) +{ + struct ath12k_dp *dp = &ab->dp; + int ret; + struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring; + LIST_HEAD(list); + + ret = ath12k_dp_srng_setup(ab, + &dp->rx_refill_buf_ring.refill_buf_ring, + HAL_RXDMA_BUF, 0, 0, + DP_RXDMA_BUF_RING_SIZE); + + if (ret) { + ath12k_warn(ab, "failed to setup rx_refill_buf_ring\n"); + return ret; + } + + ath12k_dp_rx_bufs_replenish(ab, rx_ring, &list, 0); + return 0; +} + +void ath12k_umac_reset_handle_post_reset_start(struct ath12k_base *ab) +{ + struct ath12k_dp *dp = &ab->dp; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_mlo_dp_umac_reset *mlo_umac_reset = &ag->mlo_umac_reset; + int i, n_link_desc, ret; + struct hal_srng *srng = NULL; + unsigned long end; + + ath12k_dp_srng_hw_ring_disable(ab); + + /* Busy wait for 2 ms to make sure the rings are + * in idle state before enabling it + */ + end = jiffies + msecs_to_jiffies(2); + while (time_before(jiffies, end)) + ; + + ret = ath12k_wbm_idle_ring_setup(ab, &n_link_desc); + + if (ret) + ath12k_warn(ab, "failed to setup wbm_idle_ring: %d\n", ret); + + srng = &ab->hal.srng_list[dp->wbm_idle_ring.ring_id]; + + ret = ath12k_dp_link_desc_setup(ab, dp->link_desc_banks, + HAL_WBM_IDLE_LINK, srng, n_link_desc); + if (ret) + ath12k_warn(ab, "failed to setup link desc: %d\n", ret); + + ath12k_dp_srng_common_setup(ab); + ath12k_dp_umac_txrx_desc_cleanup(ab); + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + if (ab->ppeds_handle) + ath12k_dp_ppeds_tx_desc_cleanup(ab); +#endif + ath12k_dp_rxdma_ring_setup(ab); + + for (i = 0; i < DP_REO_DST_RING_MAX; i++) { + ret = ath12k_dp_srng_setup(ab, &dp->reo_dst_ring[i], + HAL_REO_DST, i, 0, + DP_REO_DST_RING_SIZE); + if (ret) + ath12k_warn(ab, "failed to setup reo_dst_ring\n"); + } + + ath12k_dp_rx_reo_cmd_list_cleanup(ab); + + ath12k_dp_tid_cleanup(ab); + + atomic_inc(&mlo_umac_reset->response_chip); + ath12k_umac_reset_notify_target_sync_and_send(ab, ATH12K_UMAC_RESET_TX_CMD_POST_RESET_START_DONE); + + return; +} diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp.h --- linux-6.4/drivers/net/wireless/ath/ath12k/dp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp.h 2024-04-22 13:40:50.283868637 +0200 @@ -6,7 +6,7 @@ #ifndef ATH12K_DP_H #define ATH12K_DP_H - +#include "core.h" #include "hal_rx.h" #include "hw.h" @@ -15,7 +15,8 @@ struct ath12k_base; struct ath12k_peer; struct ath12k_dp; -struct ath12k_vif; +struct ath12k_link_vif; +struct ath12k_link_sta; struct hal_tcl_status_ring; struct ath12k_ext_irq_grp; @@ -29,6 +30,7 @@ dma_addr_t paddr; int size; u32 ring_id; + u8 cached; }; struct dp_rxdma_ring { @@ -39,15 +41,19 @@ int bufs_max; }; -#define ATH12K_TX_COMPL_NEXT(x) (((x) + 1) % DP_TX_COMP_RING_SIZE) +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +struct dp_ppeds_tx_comp_ring { + struct dp_srng ppe_wbm2sw_ring; + struct hal_wbm_completion_ring_tx *tx_status; + int tx_status_head; + int tx_status_tail; +}; +#endif struct dp_tx_ring { u8 tcl_data_ring_id; struct dp_srng tcl_data_ring; struct dp_srng tcl_comp_ring; - struct hal_wbm_completion_ring_tx *tx_status; - int tx_status_head; - int tx_status_tail; }; struct ath12k_pdev_mon_stats { @@ -127,12 +133,11 @@ struct ath12k_pdev_dp { u32 mac_id; atomic_t num_tx_pending; - wait_queue_head_t tx_empty_waitq; struct dp_srng rxdma_mon_dst_ring[MAX_RXDMA_PER_PDEV]; struct dp_srng tx_mon_dst_ring[MAX_RXDMA_PER_PDEV]; struct ieee80211_rx_status rx_status; - struct ath12k_mon_data mon_data; + struct ath12k_mon_data *mon_data; }; #define DP_NUM_CLIENTS_MAX 64 @@ -145,32 +150,51 @@ #define DP_RX_HASH_ENABLE 1 /* Enable hash based Rx steering */ -#define DP_BA_WIN_SZ_MAX 256 +#define DP_BA_WIN_SZ_MAX 1024 #define DP_TCL_NUM_RING_MAX 4 #define DP_IDLE_SCATTER_BUFS_MAX 16 +#ifdef CONFIG_ATH12K_MEM_PROFILE_512M + +#define DP_TX_COMP_RING_SIZE 8192 +#define DP_RXDMA_MON_STATUS_RING_SIZE 512 +#define DP_RXDMA_MONITOR_BUF_RING_SIZE 256 +#define DP_RXDMA_MONITOR_DST_RING_SIZE 512 +#define ATH12K_NUM_POOL_TX_DESC 8192 +#define DP_REO2PPE_RING_SIZE 2048 +/* TODO revisit this count during testing */ +#define ATH12K_RX_DESC_COUNT (4096) + +#else +#define DP_TX_COMP_RING_SIZE 32768 +#define DP_RXDMA_MON_STATUS_RING_SIZE 2048 +#define DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 +#define DP_RXDMA_MONITOR_DST_RING_SIZE 8192 +#define ATH12K_NUM_POOL_TX_DESC 32768 +#define DP_REO2PPE_RING_SIZE 16384 +/* TODO revisit this count during testing */ +#define ATH12K_RX_DESC_COUNT (12288) +#endif + #define DP_WBM_RELEASE_RING_SIZE 64 #define DP_TCL_DATA_RING_SIZE 512 -#define DP_TX_COMP_RING_SIZE 32768 #define DP_TX_IDR_SIZE DP_TX_COMP_RING_SIZE #define DP_TCL_CMD_RING_SIZE 32 #define DP_TCL_STATUS_RING_SIZE 32 -#define DP_REO_DST_RING_MAX 8 +#define DP_REO_DST_RING_MAX 4 #define DP_REO_DST_RING_SIZE 2048 #define DP_REO_REINJECT_RING_SIZE 32 -#define DP_RX_RELEASE_RING_SIZE 1024 +#define DP_RX_RELEASE_RING_SIZE 4096 #define DP_REO_EXCEPTION_RING_SIZE 128 -#define DP_REO_CMD_RING_SIZE 128 +#define DP_REO_CMD_RING_SIZE 256 #define DP_REO_STATUS_RING_SIZE 2048 -#define DP_RXDMA_BUF_RING_SIZE 4096 +#define DP_RXDMA_BUF_RING_SIZE 8192 #define DP_RXDMA_REFILL_RING_SIZE 2048 #define DP_RXDMA_ERR_DST_RING_SIZE 1024 -#define DP_RXDMA_MON_STATUS_RING_SIZE 1024 -#define DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 -#define DP_RXDMA_MONITOR_DST_RING_SIZE 2048 -#define DP_RXDMA_MONITOR_DESC_RING_SIZE 4096 +#define DP_RXDMA_MONITOR_DESC_RING_SIZE 8192 +#define DP_RX_MONITOR_BUF_LOW_TH 32 #define DP_TX_MONITOR_BUF_RING_SIZE 4096 #define DP_TX_MONITOR_DEST_RING_SIZE 2048 @@ -182,8 +206,14 @@ #define DP_RX_BUFFER_SIZE_LITE 1024 #define DP_RX_BUFFER_ALIGN_SIZE 128 -#define DP_RXDMA_BUF_COOKIE_BUF_ID GENMASK(17, 0) -#define DP_RXDMA_BUF_COOKIE_PDEV_ID GENMASK(19, 18) +#define DP_PPE2TCL_RING_SIZE 2048 +#define DP_PPE_WBM2SW_RING_SIZE 8192 +#define HAL_REO2PPE_DST_IND 6 + +#define DP_DIR_BUF_COOKIE_BUF_ID GENMASK(17, 0) +#define DP_DIR_BUF_COOKIE_PDEV_ID GENMASK(19, 18) + +#define DP_RXDMA_BUF_COOKIE_BUF_ID GENMASK(19, 0) #define DP_HW2SW_MACID(mac_id) ({ typeof(mac_id) x = (mac_id); x ? x - 1 : 0; }) #define DP_SW2HW_MACID(mac_id) ((mac_id) + 1) @@ -195,10 +225,11 @@ #define ATH12K_SHADOW_DP_TIMER_INTERVAL 20 #define ATH12K_SHADOW_CTRL_TIMER_INTERVAL 10 -#define ATH12K_NUM_POOL_TX_DESC 32768 - -/* TODO: revisit this count during testing */ -#define ATH12K_RX_DESC_COUNT (12288) +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#define ATH12K_NUM_POOL_PPEDS_TX_DESC 0x10000 +#else +#define ATH12K_NUM_POOL_PPEDS_TX_DESC 0 +#endif #define ATH12K_PAGE_SIZE PAGE_SIZE @@ -215,7 +246,19 @@ #define ATH12K_TX_SPT_PAGES_PER_POOL (ATH12K_NUM_POOL_TX_DESC / \ ATH12K_MAX_SPT_ENTRIES) #define ATH12K_NUM_TX_SPT_PAGES (ATH12K_TX_SPT_PAGES_PER_POOL * ATH12K_HW_MAX_QUEUES) -#define ATH12K_NUM_SPT_PAGES (ATH12K_NUM_RX_SPT_PAGES + ATH12K_NUM_TX_SPT_PAGES) + +#define ATH12K_PPEDS_TX_SPT_PAGE_OFFSET 0 +#define ATH12K_TX_SPT_PAGE_OFFSET ATH12K_NUM_PPEDS_TX_SPT_PAGES +#define ATH12K_RX_SPT_PAGE_OFFSET ATH12K_NUM_PPEDS_TX_SPT_PAGES + ATH12K_NUM_TX_SPT_PAGES + + +#define ATH12K_PPEDS_TX_SPT_PAGES_PER_POOL (ATH12K_NUM_POOL_PPEDS_TX_DESC / \ + ATH12K_MAX_SPT_ENTRIES) +#define ATH12K_NUM_PPEDS_TX_SPT_PAGES (ATH12K_PPEDS_TX_SPT_PAGES_PER_POOL *\ + ATH12K_HW_MAX_QUEUES_PPEDS) + +#define ATH12K_NUM_SPT_PAGES (ATH12K_NUM_TX_SPT_PAGES + ATH12K_NUM_RX_SPT_PAGES + \ + ATH12K_NUM_PPEDS_TX_SPT_PAGES) /* The SPT pages are divided for RX and TX, first block for RX * and remaining for TX @@ -245,6 +288,9 @@ #define DP_REO_QREF_NUM GENMASK(31, 16) #define DP_MAX_PEER_ID 2047 +#define ATH12K_DP_PDEV_TX_LIMIT 24000 +#define ATH12K_DP_GROUP_TX_LIMIT 32000 + /* Total size of the LUT is based on 2K peers, each having reference * for 17tids, note each entry is of type ath12k_reo_queue_ref * hence total size is 2048 * 17 * 8 = 278528 @@ -254,6 +300,10 @@ /* Invalid TX Bank ID value */ #define DP_INVALID_BANK_ID -1 +#define MAX_TQM_RELEASE_REASON 15 +#define MAX_FW_TX_STATUS 7 +#define MAX_TCL_RING 4 + struct ath12k_dp_tx_bank_profile { u8 is_configured; u32 num_users; @@ -273,22 +323,44 @@ struct ath12k_rx_desc_info { struct list_head list; - struct sk_buff *skb; u32 cookie; + dma_addr_t paddr; + u8 chip_id : 3, + in_use : 1; + struct sk_buff *skb; u32 magic; }; struct ath12k_tx_desc_info { struct list_head list; struct sk_buff *skb; + struct sk_buff *skb_ext_desc; + u32 desc_id; /* Cookie */ + u8 mac_id : 5, + in_use : 1; + u8 pool_id; + u8 recycler_fast_xmit; + ktime_t timestamp; +}; + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +struct ath12k_ppeds_tx_desc_info { + struct list_head list; + struct sk_buff *skb; + dma_addr_t paddr; u32 desc_id; /* Cookie */ u8 mac_id; u8 pool_id; + u8 flags; }; +#endif struct ath12k_spt_info { dma_addr_t paddr; u64 *vaddr; + struct ath12k_rx_desc_info *rxbaddr[ATH12K_NUM_RX_SPT_PAGES]; + struct ath12k_tx_desc_info *txbaddr[ATH12K_NUM_TX_SPT_PAGES]; + struct ath12k_ppeds_tx_desc_info *ppedstxbaddr[ATH12K_NUM_PPEDS_TX_SPT_PAGES]; }; struct ath12k_reo_queue_ref { @@ -301,6 +373,32 @@ u32 *vaddr; }; +struct host_link_stats { + u32 tx_enqueued; + u32 tx_completed; + u32 tx_bcast_mcast; + u32 tx_dropped; + u32 tx_encap_type[HAL_TCL_ENCAP_TYPE_MAX]; + u32 tx_encrypt_type[HAL_ENCRYPT_TYPE_MAX]; + u32 tx_desc_type[HAL_TCL_DESC_TYPE_MAX]; +}; + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#define PPE_VP_ENTRIES_MAX 32 +#define MAX_PPEDS_IRQ_NAME_LEN 20 +#define MAX_PPEDS_IRQS 3 +struct ath12k_dp_ppe_vp_profile { + bool is_configured; + u8 vp_num; + u8 ppe_vp_num_idx; + u8 search_idx_reg_num; + u8 drop_prec_enable; + u8 to_fw; + u8 use_ppe_int_pri; + struct ath12k_link_vif *arvif; +}; +#endif + struct ath12k_dp { struct ath12k_base *ab; u8 num_bank_profiles; @@ -312,14 +410,18 @@ u8 htt_tgt_ver_major; u8 htt_tgt_ver_minor; struct dp_link_desc_bank link_desc_banks[DP_LINK_DESC_BANKS_MAX]; + u8 idle_link_rbm_id; struct dp_srng wbm_idle_ring; struct dp_srng wbm_desc_rel_ring; - struct dp_srng tcl_cmd_ring; - struct dp_srng tcl_status_ring; struct dp_srng reo_reinject_ring; struct dp_srng rx_rel_ring; struct dp_srng reo_except_ring; struct dp_srng reo_cmd_ring; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + struct dp_srng reo2ppe_ring; + struct dp_srng ppe2tcl_ring; + struct dp_ppeds_tx_comp_ring ppeds_comp_ring; +#endif struct dp_srng reo_status_ring; struct dp_srng reo_dst_ring[DP_REO_DST_RING_MAX]; struct dp_tx_ring tx_ring[DP_TCL_NUM_RING_MAX]; @@ -334,12 +436,19 @@ * - reo_cmd_cache_flush_count */ spinlock_t reo_cmd_lock; + struct list_head reo_cmd_update_rx_queue_list; + /** + * protects access to below field, + * - reo_cmd_update_rx_queue_list + */ + spinlock_t reo_cmd_update_rx_queue_lock; struct ath12k_hp_update_timer reo_cmd_timer; struct ath12k_hp_update_timer tx_ring_timer[DP_TCL_NUM_RING_MAX]; struct ath12k_spt_info *spt_info; u32 num_spt_pages; + u32 rx_spt_base; struct list_head rx_desc_free_list; - struct list_head rx_desc_used_list; + struct list_head rx_ppeds_reuse_list; /* protects the free and used desc list */ spinlock_t rx_desc_lock; @@ -348,30 +457,72 @@ /* protects the free and used desc lists */ spinlock_t tx_desc_lock[ATH12K_HW_MAX_QUEUES]; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + struct list_head ppeds_tx_desc_free_list[ATH12K_HW_MAX_QUEUES_PPEDS]; + struct list_head ppeds_tx_desc_reuse_list[ATH12K_HW_MAX_QUEUES_PPEDS]; + struct list_head ppeds_tx_desc_used_list[ATH12K_HW_MAX_QUEUES_PPEDS]; + int ppeds_tx_desc_reuse_list_len[ATH12K_HW_MAX_QUEUES_PPEDS]; + /* protects the free and used desc lists */ + spinlock_t ppeds_tx_desc_lock[ATH12K_HW_MAX_QUEUES_PPEDS]; + + struct ath12k_dp_ppe_vp_profile ppe_vp_profile[PPE_VP_ENTRIES_MAX]; + char ppeds_irq_name[MAX_PPEDS_IRQS][MAX_PPEDS_IRQ_NAME_LEN]; + int ppeds_irq[MAX_PPEDS_IRQS]; +#endif + struct dp_rxdma_ring rx_refill_buf_ring; struct dp_srng rx_mac_buf_ring[MAX_RXDMA_PER_PDEV]; struct dp_srng rxdma_err_dst_ring[MAX_RXDMA_PER_PDEV]; struct dp_rxdma_ring rxdma_mon_buf_ring; struct dp_rxdma_ring tx_mon_buf_ring; struct ath12k_reo_q_addr_lut reoq_lut; + struct ath12k_reo_q_addr_lut ml_reoq_lut; + unsigned long ppeds_service_running; }; /* HTT definitions */ +#define HTT_TAG_TCL_METADATA_VERSION 5 + +#define HTT_TCL_META_DATA_TYPE_FTM BIT(0) +#define HTT_TCL_META_DATA_TYPE_MISSION GENMASK(1, 0) -#define HTT_TCL_META_DATA_TYPE BIT(0) -#define HTT_TCL_META_DATA_VALID_HTT BIT(1) +#define HTT_TCL_META_DATA_VALID_HTT_FTM BIT(1) +#define HTT_TCL_META_DATA_VALID_HTT_MISSION BIT(2) + +#define HTT_TCL_META_DATA_VALID_HTT \ + (ath12k_ftm_mode ? HTT_TCL_META_DATA_VALID_HTT_FTM : \ + HTT_TCL_META_DATA_VALID_HTT_MISSION) /* vdev meta data */ -#define HTT_TCL_META_DATA_VDEV_ID GENMASK(9, 2) -#define HTT_TCL_META_DATA_PDEV_ID GENMASK(11, 10) -#define HTT_TCL_META_DATA_HOST_INSPECTED BIT(12) +#define HTT_TCL_META_DATA_VDEV_ID_FTM GENMASK(9, 2) +#define HTT_TCL_META_DATA_PDEV_ID_FTM GENMASK(11, 10) +#define HTT_TCL_META_DATA_HOST_INSPECTED_FTM BIT(12) +#define HTT_TCL_META_DATA_VDEV_ID_MISSION GENMASK(10, 3) +#define HTT_TCL_META_DATA_PDEV_ID_MISSION GENMASK(12, 11) +#define HTT_TCL_META_DATA_HOST_INSPECTED_MISSION BIT(13) /* peer meta data */ -#define HTT_TCL_META_DATA_PEER_ID GENMASK(15, 2) +#define HTT_TCL_META_DATA_PEER_ID_FTM GENMASK(15, 2) +#define HTT_TCL_META_DATA_PEER_ID_MISSION GENMASK(15, 3) + +#define HTT_TCL_META_DATA_GET(_val, _mask) \ + (ath12k_ftm_mode ? u32_encode_bits(_val, _mask##_FTM) : \ + u32_encode_bits(_val, _mask##_MISSION)) #define HTT_TX_WBM_COMP_STATUS_OFFSET 8 -/* HTT tx completion is overlaid in wbm_release_ring */ +/* Global sequence number */ +#define HTT_TCL_META_DATA_TYPE_GLOBAL_SEQ_NUM 3 +#define HTT_TCL_META_DATA_GLOBAL_SEQ_HOST_INSPECTED BIT(2) +#define HTT_TCL_META_DATA_GLOBAL_SEQ_NUM GENMASK(14, 3) +#define HTT_TX_MLO_MCAST_HOST_REINJECT_BASE_VDEV_ID 128 + +/* Service Class meta data */ +#define HTT_TCL_META_DATA_TYPE_SVC_ID_BASED 2 +#define HTT_TCL_META_DATA_SAWF_SVC_ID GENMASK(10, 3) +#define HTT_TCL_META_DATA_SAWF_TID_OVERRIDE BIT(12) + +/* HTT tx completion is overlayed in wbm_release_ring v3 version */ #define HTT_TX_WBM_COMP_INFO0_STATUS GENMASK(16, 13) #define HTT_TX_WBM_COMP_INFO1_REINJECT_REASON GENMASK(3, 0) #define HTT_TX_WBM_COMP_INFO1_EXCEPTION_FRAME BIT(4) @@ -379,7 +530,6 @@ #define HTT_TX_WBM_COMP_INFO2_ACK_RSSI GENMASK(31, 24) struct htt_tx_wbm_completion { - __le32 rsvd0[2]; __le32 info0; __le32 info1; __le32 info2; @@ -395,14 +545,27 @@ HTT_H2T_MSG_TYPE_RX_RING_SELECTION_CFG = 0xc, HTT_H2T_MSG_TYPE_EXT_STATS_CFG = 0x10, HTT_H2T_MSG_TYPE_PPDU_STATS_CFG = 0x11, + HTT_H2T_MSG_TYPE_RXDMA_RXOLE_PPE_CFG = 0x19, HTT_H2T_MSG_TYPE_VDEV_TXRX_STATS_CFG = 0x1a, HTT_H2T_MSG_TYPE_TX_MONITOR_CFG = 0x1b, + HTT_H2T_MSG_TYPE_SAWF_DEF_Q_MAP_REQ = 0x1c, + HTT_H2T_MSG_TYPE_SAWF_DEF_Q_UNMAP_REQ = 0x1d, + HTT_H2T_MSG_TYPE_SAWF_DEF_Q_MAP_REPORT_REQ = 0x1e, + HTT_H2T_MSG_TYPE_STREAMING_STATS_REQ = 0x20, + HTT_H2T_MSG_TYPE_UMAC_RESET_PREREQUISITE_SETUP = 0x21, + HTT_H2T_MSG_TYPE_UMAC_RESET_START_PRE_RESET = 0x22, }; #define HTT_VER_REQ_INFO_MSG_ID GENMASK(7, 0) +#define HTT_OPTION_TCL_METADATA_VER_V2 2 +#define HTT_OPTION_TAG GENMASK(7, 0) +#define HTT_OPTION_LEN GENMASK(15, 8) +#define HTT_OPTION_VALUE GENMASK(31, 16) +#define HTT_TCL_METADATA_VER_SZ 4 struct htt_ver_req_cmd { __le32 ver_reg_info; + __le32 tcl_metadata_version; } __packed; enum htt_srng_ring_type { @@ -417,11 +580,14 @@ HTT_RXDMA_MONITOR_BUF_RING, HTT_RXDMA_MONITOR_DESC_RING, HTT_RXDMA_MONITOR_DEST_RING, + HTT_RXDMA_HOST_BUF_RING2, HTT_HOST1_TO_FW_RXBUF_RING, HTT_HOST2_TO_FW_RXBUF_RING, HTT_RXDMA_NON_MONITOR_DEST_RING, HTT_TX_MON_HOST2MON_BUF_RING, HTT_TX_MON_MON2HOST_DEST_RING, + HTT_RX_MON_HOST2MON_BUF_RING, + HTT_RX_MON_MON2HOST_DEST_RING, }; /* host -> target HTT_SRING_SETUP message @@ -747,8 +913,15 @@ #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_RING_ID GENMASK(23, 16) #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_SS BIT(24) #define HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS BIT(25) + #define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE GENMASK(15, 0) +#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_MGMT GENMASK(18, 16) +#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_CTRL GENMASK(21, 19) +#define HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_DATA GENMASK(24, 22) + #define HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID BIT(26) +#define HTT_RX_RING_SELECTION_CFG_CMD_DROP_THRES_VAL BIT(27) +#define HTT_RX_RING_SELECTION_CFG_CMD_RXMON_GCONF_EN BIT(28) #define HTT_RX_RING_SELECTION_CFG_RX_PACKET_OFFSET GENMASK(15, 0) #define HTT_RX_RING_SELECTION_CFG_RX_HEADER_OFFSET GENMASK(31, 16) @@ -758,6 +931,11 @@ #define HTT_RX_RING_SELECTION_CFG_RX_MSDU_START_OFFSET GENMASK(31, 16) #define HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET GENMASK(15, 0) +#define HTT_RX_RING_SELECTION_CFG_WORD_MASK_COMPACTION_ENABLE_SET BIT(23) +#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_MASK GENMASK(15, 0) +#define HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_MASK GENMASK(18, 16) +#define HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_MASK GENMASK(16, 0) + enum htt_rx_filter_tlv_flags { HTT_RX_FILTER_TLV_FLAGS_MPDU_START = BIT(0), HTT_RX_FILTER_TLV_FLAGS_MSDU_START = BIT(1), @@ -772,6 +950,7 @@ HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS = BIT(10), HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT = BIT(11), HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE = BIT(12), + HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO = BIT(13), }; enum htt_rx_mgmt_pkt_filter_tlv_flags0 { @@ -1060,6 +1239,21 @@ HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ HTT_RX_FILTER_TLV_FLAGS_ATTENTION) +#define HTT_RX_MON_FILTER_TLV_FLAGS_MON_DEST_RING \ + (HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \ + HTT_RX_FILTER_TLV_FLAGS_MSDU_START | \ + HTT_RX_FILTER_TLV_FLAGS_RX_PACKET | \ + HTT_RX_FILTER_TLV_FLAGS_MSDU_END | \ + HTT_RX_FILTER_TLV_FLAGS_MPDU_END | \ + HTT_RX_FILTER_TLV_FLAGS_PACKET_HEADER | \ + HTT_RX_FILTER_TLV_FLAGS_PER_MSDU_HEADER | \ + HTT_RX_FILTER_TLV_FLAGS_PPDU_START | \ + HTT_RX_FILTER_TLV_FLAGS_PPDU_END | \ + HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS | \ + HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT | \ + HTT_RX_FILTER_TLV_FLAGS_PPDU_END_STATUS_DONE | \ + HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO) + /* msdu start. mpdu end, attention, rx hdr tlv's are not subscribed */ #define HTT_RX_TLV_FLAGS_RXDMA_RING \ (HTT_RX_FILTER_TLV_FLAGS_MPDU_START | \ @@ -1081,8 +1275,25 @@ __le32 rx_mpdu_offset; __le32 rx_msdu_offset; __le32 rx_attn_offset; + __le32 info2; + __le32 reserved[2]; + __le16 rx_mpdu_start_word_mask; + __le16 rx_mpdu_end_word_mask; + __le32 rx_msdu_end_word_mask; + __le32 info3; } __packed; +#define HTT_RX_TLV_FILTER_INFO0_RX_DROP_THRESHOLD GENMASK(9, 0) +#define HTT_RX_TLV_FILTER_INFO0_EN_MSDU_MPDU_LOG_MGMT_TYPE BIT(17) +#define HTT_RX_TLV_FILTER_INFO0_EN_MSDU_MPDU_LOG_CTRL_TYPE BIT(18) +#define HTT_RX_TLV_FILTER_INFO0_EN_MSDU_MPDU_LOG_DATA_TYPE BIT(19) +#define HTT_RX_TLV_FILTER_INFO1_EN_RX_TLV_PKT_OFFSET BIT(0) +#define HTT_RX_TLV_FILTER_INFO1_RX_PKT_TLV_OFFSET GENMASK(14, 1) + +#define HTT_RX_RING_TLV_DROP_THRESHOLD_VALUE 32 +#define HTT_RX_RING_DEFAULT_DMA_LENGTH 0x7 +#define HTT_RX_RING_PKT_TLV_OFFSET 0x1 + struct htt_rx_ring_tlv_filter { u32 rx_filter; /* see htt_rx_filter_tlv_flags */ u32 pkt_filter_flags0; /* MGMT */ @@ -1097,6 +1308,17 @@ u16 rx_msdu_end_offset; u16 rx_msdu_start_offset; u16 rx_attn_offset; + u32 rx_drop_threshold; + u32 conf_len_ctrl; + u32 conf_len_mgmt; + u32 conf_len_data; + u32 info0; + u32 info1; + bool drop_threshold_valid; + bool rxmon_disable; + u16 rx_mpdu_start_wmask; + u16 rx_mpdu_end_wmask; + u32 rx_msdu_end_wmask; }; #define HTT_STATS_FRAME_CTRL_TYPE_MGMT 0x0 @@ -1195,8 +1417,13 @@ HTT_T2H_MSG_TYPE_EXT_STATS_CONF = 0x1c, HTT_T2H_MSG_TYPE_BKPRESSURE_EVENT_IND = 0x24, HTT_T2H_MSG_TYPE_MLO_TIMESTAMP_OFFSET_IND = 0x28, + HTT_T2H_MSG_TYPE_MLO_RX_PEER_MAP = 0x29, + HTT_T2H_MSG_TYPE_MLO_RX_PEER_UNMAP = 0x2a, HTT_T2H_MSG_TYPE_PEER_MAP3 = 0x2b, HTT_T2H_MSG_TYPE_VDEV_TXRX_STATS_PERIODIC_IND = 0x2c, + HTT_T2H_MSG_TYPE_SAWF_DEF_QUEUES_MAP_REPORT_CONF = 0x2d, + HTT_T2H_MSG_TYPE_SAWF_MSDUQ_INFO_IND = 0x2e, + HTT_T2H_MSG_TYPE_STREAMING_STATS_IND = 0x2f, }; #define HTT_TARGET_VERSION_MAJOR 3 @@ -1214,6 +1441,8 @@ #define HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16 GENMASK(15, 0) #define HTT_T2H_PEER_MAP_INFO1_HW_PEER_ID GENMASK(31, 16) #define HTT_T2H_PEER_MAP_INFO2_AST_HASH_VAL GENMASK(15, 0) +#define HTT_T2H_PEER_MAP3_INFO2_HW_PEER_ID GENMASK(15, 0) +#define HTT_T2H_PEER_MAP3_INFO2_AST_HASH_VAL GENMASK(31, 16) #define HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_M BIT(16) #define HTT_T2H_PEER_MAP_INFO2_NEXT_HOP_S 16 @@ -1249,8 +1478,7 @@ (((u64)__le32_to_cpu(msg_u32) << 32) | (__le32_to_cpu(msg_l32))) #define HTT_T2H_VDEV_STATS_PERIODIC_MSG_TYPE GENMASK(7, 0) #define HTT_T2H_VDEV_STATS_PERIODIC_PDEV_ID GENMASK(15, 8) -#define HTT_T2H_VDEV_STATS_PERIODIC_NUM_VDEV GENMASK(23, 16) -#define HTT_T2H_VDEV_STATS_PERIODIC_PAYLOAD_BYTES GENMASK(15, 0) +#define HTT_T2H_VDEV_STATS_PERIODIC_PAYLOAD_BYTES GENMASK(23, 16) #define HTT_VDEV_TXRX_STATS_COMMON_TLV 0 #define HTT_VDEV_TXRX_STATS_HW_STATS_TLV 1 @@ -1283,6 +1511,124 @@ __le32 soc_drop_count_hi; } __packed; +#define HTT_BACKPRESSURE_EVENT_PDEV_ID_M GENMASK(15, 8) +#define HTT_BACKPRESSURE_EVENT_RING_TYPE_M GENMASK(23, 16) +#define HTT_BACKPRESSURE_EVENT_RING_ID_M GENMASK(31, 24) + +#define HTT_BACKPRESSURE_EVENT_HP_M GENMASK(15, 0) +#define HTT_BACKPRESSURE_EVENT_TP_M GENMASK(31, 16) + +#define HTT_BACKPRESSURE_UMAC_RING_TYPE 0 +#define HTT_BACKPRESSURE_LMAC_RING_TYPE 1 + +enum htt_backpressure_umac_ringid { + HTT_SW_RING_IDX_REO_REO2SW1_RING, + HTT_SW_RING_IDX_REO_REO2SW2_RING, + HTT_SW_RING_IDX_REO_REO2SW3_RING, + HTT_SW_RING_IDX_REO_REO2SW4_RING, + HTT_SW_RING_IDX_REO_WBM2REO_LINK_RING, + HTT_SW_RING_IDX_REO_REO2TCL_RING, + HTT_SW_RING_IDX_REO_REO2FW_RING, + HTT_SW_RING_IDX_REO_REO_RELEASE_RING, + HTT_SW_RING_IDX_WBM_PPE_RELEASE_RING, + HTT_SW_RING_IDX_TCL_TCL2TQM_RING, + HTT_SW_RING_IDX_WBM_TQM_RELEASE_RING, + HTT_SW_RING_IDX_WBM_REO_RELEASE_RING, + HTT_SW_RING_IDX_WBM_WBM2SW0_RELEASE_RING, + HTT_SW_RING_IDX_WBM_WBM2SW1_RELEASE_RING, + HTT_SW_RING_IDX_WBM_WBM2SW2_RELEASE_RING, + HTT_SW_RING_IDX_WBM_WBM2SW3_RELEASE_RING, + HTT_SW_RING_IDX_REO_REO_CMD_RING, + HTT_SW_RING_IDX_REO_REO_STATUS_RING, + HTT_SW_UMAC_RING_IDX_MAX, +}; + +enum htt_backpressure_lmac_ringid { + HTT_SW_RING_IDX_FW2RXDMA_BUF_RING, + HTT_SW_RING_IDX_FW2RXDMA_STATUS_RING, + HTT_SW_RING_IDX_FW2RXDMA_LINK_RING, + HTT_SW_RING_IDX_SW2RXDMA_BUF_RING, + HTT_SW_RING_IDX_WBM2RXDMA_LINK_RING, + HTT_SW_RING_IDX_RXDMA2FW_RING, + HTT_SW_RING_IDX_RXDMA2SW_RING, + HTT_SW_RING_IDX_RXDMA2RELEASE_RING, + HTT_SW_RING_IDX_RXDMA2REO_RING, + HTT_SW_RING_IDX_MONITOR_STATUS_RING, + HTT_SW_RING_IDX_MONITOR_BUF_RING, + HTT_SW_RING_IDX_MONITOR_DESC_RING, + HTT_SW_RING_IDX_MONITOR_DEST_RING, + HTT_SW_LMAC_RING_IDX_MAX, +}; + +/* MSG_TYPE => HTT_T2H_SAWF_MSDUQ_INFO_IND + * + * @details + * When SAWF is enabled and a flow is mapped to a policy during the traffic + * flow if the flow is seen the associated service class is conveyed to the + * target via TCL Data Command. Target on the other hand internally creates the + * MSDUQ. Once the target creates the MSDUQ the target sends the information + * of the newly created MSDUQ and some other identifiers to uniquely identity + * the newly created MSDUQ + * + * |31 27| 24|23 16|15|14 11|10|9 8|7 4|3 0| + * |------------------------------+------------------------+--------------| + * | peer ID | HTT qtype | msg type | + * |---------------------------------+--------------+--+---+-------+------| + * | reserved |AST list index|FO|WC | HLOS | remap| + * | | | | | TID | TID | + * |---------------------+------------------------------------------------| + * | reserved1 | tgt_opaque_id | + * |---------------------+------------------------------------------------| + * + * Header fields: + * + * info0 - b'7:0 - msg_type: This will be set to + * 0x2e (HTT_T2H_SAWF_MSDUQ_INFO_IND) + * b'15:8 - HTT qtype + * b'31:16 - peer ID + * + * info1 - b'3:0 - remap TID, as assigned in firmware + * b'7:4 - HLOS TID, as sent by host in TCL Data Command + * hlos_tid : Common to Lithium and Beryllium + * b'9:8 - who_classify_info_sel (WC), as sent by host in + * TCL Data Command : Beryllium + * b10 - flow_override (FO), as sent by host in + * TCL Data Command: Beryllium + * b11:14 - ast_list_idx + * Array index into the list of extension AST entries + * (not the actual AST 16-bit index). + * The ast_list_idx is one-based, with the following + * range of values: + * - legacy targets supporting 16 user-defined + * MSDU queues: 1-2 + * - legacy targets supporting 48 user-defined + * MSDU queues: 1-6 + * - new targets: 0 (peer_id is used instead) + * Note that since ast_list_idx is one-based, + * the host will need to subtract 1 to use it as an + * index into a list of extension AST entries. + * b15:31 - reserved + * + * info2 - b'23:0 - tgt_opaque_id Opaque Tx flow number which is a + * unique MSDUQ id in firmware + * b'24:31 - reserved1 + */ + +#define HTT_T2H_SAWF_MSDUQ_INFO_0_IND_HTT_QTYPE_ID GENMASK(15, 8) +#define HTT_T2H_SAWF_MSDUQ_INFO_0_IND_PEER_ID GENMASK(31, 16) +#define HTT_T2H_SAWF_MSDUQ_INFO_1_IND_REMAP_TID_ID GENMASK(3, 0) +#define HTT_T2H_SAWF_MSDUQ_INFO_1_IND_HLOS_TID_ID GENMASK(7, 4) +#define HTT_T2H_SAWF_MSDUQ_INFO_1_IND_WHO_CLSFY_INFO_SEL_ID GENMASK(9, 8) +#define HTT_T2H_SAWF_MSDUQ_INFO_1_IND_FLOW_OVERRIDE_ID BIT(10) +#define HTT_T2H_SAWF_MSDUQ_INFO_1_IND_AST_INDEX_ID GENMASK(14, 11) +#define HTT_T2H_SAWF_MSDUQ_INFO_2_IND_TGT_OPAQUE_ID GENMASK(23, 0) + +struct htt_t2h_sawf_info_ind { + __le32 info0; + __le32 info1; + __le32 info2; +} __packed; + /* ppdu stats * * @details @@ -1352,6 +1698,8 @@ HTT_PPDU_STATS_BANDWIDTH_80MHZ = 4, HTT_PPDU_STATS_BANDWIDTH_160MHZ = 5, /* includes 80+80 */ HTT_PPDU_STATS_BANDWIDTH_DYN = 6, + HTT_PPDU_STATS_BANDWIDTH_DYN_PATTERNS = 7, + HTT_PPDU_STATS_BANDWIDTH_320MHZ = 8, }; #define HTT_PPDU_STATS_CMN_FLAGS_FRAME_TYPE_M GENMASK(7, 0) @@ -1386,6 +1734,7 @@ #define HTT_PPDU_STATS_USER_RATE_INFO0_USER_POS_M GENMASK(3, 0) #define HTT_PPDU_STATS_USER_RATE_INFO0_MU_GROUP_ID_M GENMASK(11, 4) +#define HTT_PPDU_STATS_USER_RATE_INFO0_RU_SIZE GENMASK(15, 12) enum HTT_PPDU_STATS_PPDU_TYPE { HTT_PPDU_STATS_PPDU_TYPE_SU, @@ -1400,7 +1749,12 @@ HTT_PPDU_STATS_PPDU_TYPE_MAX }; -#define HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALD_M BIT(0) +enum HTT_PPDU_STATS_RESP_PPDU_TYPE { + HTT_PPDU_STATS_RESP_PPDU_TYPE_MU_MIMO_UL, + HTT_PPDU_STATS_RESP_PPDU_TYPE_MU_OFDMA_UL, +}; + +#define HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALID BIT(0) #define HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M GENMASK(5, 1) #define HTT_PPDU_STATS_USER_RATE_FLAGS_LTF_SIZE_M GENMASK(1, 0) @@ -1427,6 +1781,8 @@ le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_GI_M) #define HTT_USR_RATE_DCM(_val) \ le32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_FLAGS_DCM_M) +#define HTT_USR_RATE_PPDU_TYPE(_val) \ + u32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_INFO1_PPDU_TYPE_M) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LTF_SIZE_M GENMASK(1, 0) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_STBC_M BIT(2) @@ -1439,6 +1795,10 @@ #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_GI_M GENMASK(27, 24) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_DCM_M BIT(28) #define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_LDPC_M BIT(29) +#define HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_PPDU_TYPE GENMASK(31, 30) + +#define HTT_USR_RESP_RATE_PPDU_TYPE(_val) \ + u32_get_bits(_val, HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_PPDU_TYPE) struct htt_ppdu_stats_user_rate { u8 tid_num; @@ -1453,6 +1813,8 @@ __le32 rate_flags; /* %HTT_PPDU_STATS_USER_RATE_FLAGS_ */ /* Note: resp_rate_info is only valid for if resp_type is UL */ __le32 resp_rate_flags; /* %HTT_PPDU_STATS_USER_RATE_RESP_FLAGS_ */ + __le16 punctured; + __le16 reserved1; } __packed; #define HTT_PPDU_STATS_TX_INFO_FLAGS_RATECODE_M GENMASK(7, 0) @@ -1519,6 +1881,7 @@ #define HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM GENMASK(31, 25) #define HTT_PPDU_STATS_NON_QOS_TID 16 +#define HTT_PPDU_STATS_PPDU_ID GENMASK(24, 0) struct htt_ppdu_stats_usr_cmpltn_ack_ba_status { __le32 ppdu_id; @@ -1559,6 +1922,44 @@ struct list_head list; }; +/* @brief target -> host packet log message + * + * @details + * The following field definitions describe the format of the packet log + * message sent from the target to the host. + * The message consists of a 4-octet header,followed by a variable number + * of 32-bit character values. + * + * |31 16|15 12|11 10|9 8|7 0| + * |------------------------------------------------------------------| + * | payload_size | rsvd |pdev_id|mac_id| msg type | + * |------------------------------------------------------------------| + * | payload | + * |------------------------------------------------------------------| + * - MSG_TYPE + * Bits 7:0 + * Purpose: identifies this as a pktlog message + * Value: HTT_T2H_MSG_TYPE_PKTLOG + * - mac_id + * Bits 9:8 + * Purpose: identifies which MAC/PHY instance generated this pktlog info + * Value: 0-3 + * - pdev_id + * Bits 11:10 + * Purpose: pdev_id + * Value: 0-3 + * 0 (for rings at SOC level), + * 1/2/3 PDEV -> 0/1/2 + * - payload_size + * Bits 31:16 + * Purpose: explicitly specify the payload size + * Value: payload size in bytes (payload size is a multiple of 4 bytes) + */ +struct htt_pktlog_msg { + u32 hdr; + u8 payload[0]; +}; + /* @brief target -> host MLO offset indiciation message * * @details @@ -1756,12 +2157,13 @@ * 4 bit htt_tx_tid_stats_tlv/htt_tx_tid_stats_v1_tlv * 5 bit htt_rx_tid_stats_tlv * 6 bit htt_msdu_flow_stats_tlv + * 7 bit htt_peer_sched_stats_tlv * @config_param2: [Bit31 : Bit0] mac_addr31to0 * @config_param3: [Bit15 : Bit0] mac_addr47to32 * [Bit31 : Bit16] reserved */ #define HTT_STAT_PEER_INFO_MAC_ADDR BIT(0) -#define HTT_STAT_DEFAULT_PEER_REQ_TYPE 0x7f +#define HTT_STAT_DEFAULT_PEER_REQ_TYPE 0xff /* Used to set different configs to the specified stats type.*/ struct htt_ext_stats_cfg_params { @@ -1771,10 +2173,128 @@ u32 cfg3; }; -enum vdev_stats_offload_timer_duration { - ATH12K_STATS_TIMER_DUR_500MS = 1, - ATH12K_STATS_TIMER_DUR_1SEC = 2, - ATH12K_STATS_TIMER_DUR_2SEC = 3, +struct htt_h2t_msg_type_vdev_txrx_stats_req { + u32 hdr; + u32 vdev_id_lo_bitmask; + u32 vdev_id_hi_bitmask; +}; + +#define HTT_H2T_RXOLE_PPE_CFG_MSG_TYPE GENMASK(7, 0) +#define HTT_H2T_RXOLE_PPE_CFG_OVERRIDE BIT(8) +#define HTT_H2T_RXOLE_PPE_CFG_REO_DST_IND GENMASK(13, 9) +#define HTT_H2T_RXOLE_PPE_CFG_MULTI_BUF_MSDU_OVRD_EN BIT(14) +#define HTT_H2T_RXOLE_PPE_CFG_INTRA_BUS_OVRD BIT(15) +#define HTT_H2T_RXOLE_PPE_CFG_DECAP_RAW_OVRD BIT(16) +#define HTT_H2T_RXOLE_PPE_CFG_NWIFI_OVRD BIT(17) +#define HTT_H2T_RXOLE_PPE_CFG_IP_FRAG_OVRD BIT(18) + +struct htt_h2t_msg_type_rxdma_rxole_ppe_cfg { + u32 info0; +}; + +#define HTT_H2T_VDEV_TXRX_HDR_MSG_TYPE GENMASK(7, 0) +#define HTT_H2T_VDEV_TXRX_HDR_PDEV_ID GENMASK(15, 8) +#define HTT_H2T_VDEV_TXRX_HDR_ENABLE BIT(16) +#define HTT_H2T_VDEV_TXRX_HDR_INTERVAL GENMASK(24, 17) +#define HTT_H2T_VDEV_TXRX_HDR_RESET_STATS GENMASK(26, 25) +#define HTT_H2T_VDEV_TXRX_LO_BITMASK GENMASK(31, 0) +#define HTT_H2T_VDEV_TXRX_HI_BITMASK GENMASK_ULL(63, 32) + +#define ATH12K_STATS_TIMER_DUR_1SEC 1000 +/* @brief target -> host extended statistics upload + * + * @details + * The following field definitions describe the format of the HTT target + * to host stats upload confirmation message. + * The message contains a cookie echoed from the HTT host->target stats + * upload request, which identifies which request the confirmation is + * for, and a single stats can span over multiple HTT stats indication + * due to the HTT message size limitation so every HTT ext stats indication + * will have tag-length-value stats information elements. + * The tag-length header for each HTT stats IND message also includes a + * status field, to indicate whether the request for the stat type in + * question was fully met, partially met, unable to be met, or invalid + * (if the stat type in question is disabled in the target). + * A Done bit 1's indicate the end of the of stats info elements. + * + * + * |31 16|15 12|11|10 8|7 5|4 0| + * |--------------------------------------------------------------| + * | reserved | msg type | + * |--------------------------------------------------------------| + * | cookie LSBs | + * |--------------------------------------------------------------| + * | cookie MSBs | + * |--------------------------------------------------------------| + * | stats entry length | rsvd | D| S | stat type | + * |--------------------------------------------------------------| + * | type-specific stats info | + * | (see htt_stats.h) | + * |--------------------------------------------------------------| + * Header fields: + * - MSG_TYPE + * Bits 7:0 + * Purpose: Identifies this is a extended statistics upload confirmation + * message. + * Value: 0x1c + * - COOKIE_LSBS + * Bits 31:0 + * Purpose: Provide a mechanism to match a target->host stats confirmation + * message with its preceding host->target stats request message. + * Value: LSBs of the opaque cookie specified by the host-side requestor + * - COOKIE_MSBS + * Bits 31:0 + * Purpose: Provide a mechanism to match a target->host stats confirmation + * message with its preceding host->target stats request message. + * Value: MSBs of the opaque cookie specified by the host-side requestor + * + * Stats Information Element tag-length header fields: + * - STAT_TYPE + * Bits 7:0 + * Purpose: identifies the type of statistics info held in the + * following information element + * Value: htt_dbg_ext_stats_type + * - STATUS + * Bits 10:8 + * Purpose: indicate whether the requested stats are present + * Value: htt_dbg_ext_stats_status + * - DONE + * Bits 11 + * Purpose: + * Indicates the completion of the stats entry, this will be the last + * stats conf HTT segment for the requested stats type. + * Value: + * 0 -> the stats retrieval is ongoing + * 1 -> the stats retrieval is complete + * - LENGTH + * Bits 31:16 + * Purpose: indicate the stats information size + * Value: This field specifies the number of bytes of stats information + * that follows the element tag-length header. + * It is expected but not required that this length is a multiple of + * 4 bytes. + */ + +#define HTT_T2H_EXT_STATS_INFO1_DONE BIT(11) +#define HTT_T2H_EXT_STATS_INFO1_LENGTH GENMASK(31, 16) + +struct ath12k_htt_extd_stats_msg { + u32 info0; + u64 cookie; + u32 info1; + u8 data[0]; +} __packed; + +#define HTT_MAC_ADDR_L32_0 GENMASK(7, 0) +#define HTT_MAC_ADDR_L32_1 GENMASK(15, 8) +#define HTT_MAC_ADDR_L32_2 GENMASK(23, 16) +#define HTT_MAC_ADDR_L32_3 GENMASK(31, 24) +#define HTT_MAC_ADDR_H16_0 GENMASK(7, 0) +#define HTT_MAC_ADDR_H16_1 GENMASK(15, 8) + +struct htt_mac_addr { + u32 mac_addr_l32; + u32 mac_addr_h16; }; static inline void ath12k_dp_get_mac_addr(u32 addr_l32, u16 addr_h16, u8 *addr) @@ -1783,20 +2303,287 @@ memcpy(addr + 4, &addr_h16, ETH_ALEN - 4); } +#define ATH12K_ML_PEER_ID GENMASK(13, 0) +#define ATH12K_ML_PEER_ID_VALID BIT(13) + +#define ATH12K_PEER_ID_INVALID 0x3FFF + +#define ATH12K_HTT_MLO_PEER_MAP_TLV_LINK_INFO_TAG 0 +#define ATH12K_HTT_MAX_MLO_LINKS 3 +#define ATH12K_HTT_MLO_CHIP_ID GENMASK(2, 0) + +struct ath11k_htt_mlo_link_peer_info { + struct htt_tlv tlv_hdr; + u16 sw_peer_id; + u8 vdev_id; + u8 chip_id; +} __packed; + +#define ATH12K_HTT_MLO_PEER_MAP_INFO0_PEER_ID GENMASK(23, 8) +#define ATH12K_HTT_MLO_PEER_MAP_MAC_ADDR_H16 GENMASK(15, 0) + +struct ath11k_htt_mlo_peer_map_msg { + u32 info0; + struct htt_mac_addr mac_addr; + u32 info1; + u32 info2; + u32 info3; + u32 rsvd0; + u32 rsvd1; + struct ath11k_htt_mlo_link_peer_info link_peer[ATH12K_HTT_MAX_MLO_LINKS]; +} __packed; + +#define ATH12K_HTT_MLO_PEER_UNMAP_PEER_ID GENMASK(23, 8) +struct ath11k_htt_mlo_peer_unmap_msg { + u32 info0; +} __packed; + +/** + * struct ath12k_dp_htt_rxdma_ppe_cfg_param - Rx DMA and RxOLE PPE config + * @override: RxDMA override to override the reo_destinatoin_indication + * @reo_dst_ind: REO destination indication value + * @multi_buffer_msdu_override_en: Override the indication for SG + * @intra_bss_override: Rx OLE IntraBSS override + * @decap_raw_override: Rx Decap Raw override + * @decap_nwifi_override: Rx Native override + * @ip_frag_override: IP fragments override + */ +struct ath12k_dp_htt_rxdma_ppe_cfg_param { + u8 override; + u8 reo_dst_ind; + u8 multi_buffer_msdu_override_en; + u8 intra_bss_override; + u8 decap_raw_override; + u8 decap_nwifi_override; + u8 ip_frag_override; +}; + +#define HTT_ATH12K_UMAC_RESET_T2H_DO_PRE_RESET BIT(0) +#define HTT_ATH12K_UMAC_RESET_T2H_DO_POST_RESET_START BIT(1) +#define HTT_ATH12K_UMAC_RESET_T2H_DO_POST_RESET_COMPLETE BIT(2) +#define HTT_ATH12K_UMAC_RESET_T2H_INIT_UMAC_RECOVERY BIT(3) +#define HTT_ATH12K_UMAC_RESET_T2H_INIT_TARGET_RECOVERY_SYNC_USING_UMAC BIT(4) + +enum dp_umac_reset_recover_action { + ATH12K_UMAC_RESET_RX_EVENT_NONE, + ATH12K_UMAC_RESET_INIT_UMAC_RECOVERY, + ATH12K_UMAC_RESET_INIT_TARGET_RECOVERY_SYNC_USING_UMAC, + ATH12K_UMAC_RESET_DO_PRE_RESET, + ATH12K_UMAC_RESET_DO_POST_RESET_START, + ATH12K_UMAC_RESET_DO_POST_RESET_COMPLETE, +}; + +enum dp_umac_reset_tx_cmd { + ATH12K_UMAC_RESET_TX_CMD_TRIGGER_DONE, + ATH12K_UMAC_RESET_TX_CMD_PRE_RESET_DONE, + ATH12K_UMAC_RESET_TX_CMD_POST_RESET_START_DONE, + ATH12K_UMAC_RESET_TX_CMD_POST_RESET_COMPLETE_DONE, +}; + +#define ATH12K_HTT_UMAC_RESET_MSG_SHMEM_PRE_RESET_DONE_SET BIT(0) +#define ATH12K_HTT_UMAC_RESET_MSG_SHMEM_POST_RESET_START_DONE_SET BIT(1) +#define ATH12K_HTT_UMAC_RESET_MSG_SHMEM_POST_RESET_COMPLETE_DONE BIT(2) + +struct ath12k_dp_htt_umac_reset_recovery_msg_shmem_t { + u32 magic_num; + union { + /* + * BIT [0] :- T2H msg to do pre-reset + * BIT [1] :- T2H msg to do post-reset start + * BIT [2] :- T2H msg to do post-reset complete + * BIT [3] :- T2H msg to indicate to Host that + * a trigger request for MLO UMAC Recovery + * is received for UMAC hang. + * BIT [4] :- T2H msg to indicate to Host that + * a trigger request for MLO UMAC Recovery + * is received for Mode-1 Target Recovery. + * BIT [31 : 5] :- reserved + */ + u32 t2h_msg; + u32 recovery_action; + }; + union { + /* + * BIT [0] :- H2T msg to send pre-reset done + * BIT [1] :- H2T msg to send post-reset start done + * BIT [2] :- H2T msg to send post-reset complete done + * BIT [3] :- H2T msg to start pre-reset. This is deprecated. + * BIT [31 : 4] :- reserved + */ + u32 h2t_msg; + u32 recovery_action_done; + }; +}; + +struct ath12k_umac_reset_ts { + u64 trigger_start; + u64 trigger_done; + u64 pre_reset_start; + u64 pre_reset_done; + u64 post_reset_start; + u64 post_reset_done; + u64 post_reset_complete_start; + u64 post_reset_complete_done; +}; + +struct ath12k_dp_umac_reset { + struct ath12k_base *ab; + dma_addr_t shmem_paddr_unaligned; + void *shmem_vaddr_unaligned; + dma_addr_t shmem_paddr_aligned; + struct ath12k_dp_htt_umac_reset_recovery_msg_shmem_t *shmem_vaddr_aligned; + size_t shmem_size; + uint32_t magic_num; + int intr_offset; + struct tasklet_struct intr_tq; + int irq_num; + struct ath12k_umac_reset_ts ts; + bool umac_pre_reset_in_prog; +}; + +struct ath12k_htt_umac_reset_setup_cmd_params { + uint32_t msi_data; + uint32_t addr_lo; + uint32_t addr_hi; +}; + +struct htt_h2t_paddr_size { + u32 size; + u32 addr_lo; + u32 addr_hi; +}; + +#define HTT_H2T_MSG_TYPE_SET GENMASK(7, 0) +#define HTT_H2T_MSG_METHOD GENMASK(11, 8) +#define HTT_T2H_MSG_METHOD GENMASK(15, 12) + +#define ATH12K_DP_UMAC_RESET_SHMEM_MAGIC_NUM 0xDEADBEEF +#define ATH12K_DP_UMAC_RESET_SHMEM_ALIGN 8 + +/** + * @brief HTT_H2T_MSG_TYPE_UMAC_RESET_PREREQUISITE_SETUP message + * + * @details + * The HTT_H2T_MSG_TYPE_UMAC_HANG_RECOVERY_PREREQUISITE_SETUP message is sent + * by the host to provide prerequisite info to target for the UMAC hang + * recovery feature. + * The info sent in this H2T message are T2H message method, H2T message + * method, T2H MSI interrupt number and physical start address, size of + * the shared memory (refers to the shared memory dedicated for messaging + * between host and target when the DUT is in UMAC hang recovery mode). + * This H2T message is expected to be only sent if the WMI service bit + * WMI_SERVICE_UMAC_HANG_RECOVERY_SUPPORT was firstly indicated by the target. + * + * |31 16|15 12|11 8|7 0| + * |-------------------------------+--------------+--------------+------------| + * | reserved |h2t msg method|t2h msg method| msg_type | + * |--------------------------------------------------------------------------| + * | t2h msi interrupt number | + * |--------------------------------------------------------------------------| + * | shared memory area size | + * |--------------------------------------------------------------------------| + * | shared memory area physical address low | + * |--------------------------------------------------------------------------| + * | shared memory area physical address high | + * |--------------------------------------------------------------------------| + * The message is interpreted as follows: + * dword0 - b'0:7 - msg_type + * (HTT_H2T_MSG_TYPE_UMAC_RESET_PREREQUISITE_SETUP) + * b'8:11 - t2h_msg_method: indicates method to be used for + * T2H communication in UMAC hang recovery mode. + * Value zero indicates MSI interrupt (default method). + * Refer to htt_umac_hang_recovery_msg_method enum. + * b'12:15 - h2t_msg_method: indicates method to be used for + * H2T communication in UMAC hang recovery mode. + * Value zero indicates polling by target for this h2t msg + * during UMAC hang recovery mode. + * Refer to htt_umac_hang_recovery_msg_method enum. + * b'16:31 - reserved. + * dword1 - b'0:31 - t2h_msi_data: MSI data to be used for + * T2H communication in UMAC hang recovery mode. + * dword2 - b'0:31 - size: size of shared memory dedicated for messaging + * only when in UMAC hang recovery mode. + * This refers to size in bytes. + * dword3 - b'0:31 - physical_address_lo: lower 32 bit physical address + * of the shared memory dedicated for messaging only when + * in UMAC hang recovery mode. + * dword4 - b'0:31 - physical_address_hi: higher 32 bit physical address + * of the shared memory dedicated for messaging only when + * in UMAC hang recovery mode. + */ + +struct htt_dp_umac_reset_setup_req_cmd { + u32 msg_info; + u32 msi_data; + struct htt_h2t_paddr_size msg_shared_mem; +}__packed; + +/** + * @brief HTT_H2T_MSG_TYPE_UMAC_RESET_START_PRE_RESET message + * + * @details + * The HTT_H2T_MSG_TYPE_UMAC_HANG_RECOVERY_SOC_START_PRE_RESET is a SOC level + * HTT message sent by the host to indicate that the target needs to start the + * UMAC hang recovery feature from the point of pre-reset routine. + * The purpose of this H2T message is to have host synchronize and trigger + * UMAC recovery across all targets. + * The info sent in this H2T message is the flag to indicate whether the + * target needs to execute UMAC-recovery in context of the Initiator or + * Non-Initiator. + * This H2T message is expected to be sent as response to the + * initiate_umac_recovery indication from the Initiator target attached to + * this same host. + * This H2T message is expected to be only sent if the WMI service bit + * WMI_SERVICE_UMAC_HANG_RECOVERY_SUPPORT was firstly indicated by the target + * and HTT_H2T_MSG_TYPE_UMAC_HANG_RECOVERY_PREREQUISITE_SETUP was sent + * beforehand. + * + * |31 10|9|8|7 0| + * |-----------------------------------------------------------| + * | reserved |U|I| msg_type | + * |-----------------------------------------------------------| + * Where: + * I = is_initiator + * U = is_umac_hang + * + * The message is interpreted as follows: + * dword0 - b'0:7 - msg_type + * (HTT_H2T_MSG_TYPE_UMAC_RESET_START_PRE_RESET) + * b'8 - is_initiator: indicates whether the target needs to + * execute the UMAC-recovery in context of the Initiator or + * Non-Initiator. + * The value zero indicates this target is Non-Initiator. + * b'9 - is_umac_hang: indicates whether MLO UMAC recovery + * executed in context of UMAC hang or Target recovery. + * b'10:31 - reserved. + */ +struct h2t_umac_hang_recovery_start_pre_reset { + u8 hdr; +} __packed; + +#define HTT_H2T_UMAC_RESET_MSG_TYPE GENMASK(7, 0) +#define HTT_H2T_UMAC_RESET_IS_INITIATOR_SET BIT(8) +#define HTT_H2T_UMAC_RESET_IS_TARGET_RECOVERY_SET BIT(9) + int ath12k_dp_service_srng(struct ath12k_base *ab, struct ath12k_ext_irq_grp *irq_grp, int budget); int ath12k_dp_htt_connect(struct ath12k_dp *dp); -void ath12k_dp_vdev_tx_attach(struct ath12k *ar, struct ath12k_vif *arvif); +void ath12k_dp_vdev_tx_attach(struct ath12k *ar, struct ath12k_link_vif *arvif); void ath12k_dp_free(struct ath12k_base *ab); int ath12k_dp_alloc(struct ath12k_base *ab); void ath12k_dp_cc_config(struct ath12k_base *ab); +void ath12k_dp_partner_cc_init(struct ath12k_base *ab); int ath12k_dp_pdev_alloc(struct ath12k_base *ab); void ath12k_dp_pdev_pre_alloc(struct ath12k_base *ab); void ath12k_dp_pdev_free(struct ath12k_base *ab); int ath12k_dp_tx_htt_srng_setup(struct ath12k_base *ab, u32 ring_id, int mac_id, enum hal_ring_type ring_type); -int ath12k_dp_peer_setup(struct ath12k *ar, int vdev_id, const u8 *addr); +int ath12k_dp_peer_default_route_setup(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta); +int ath12k_dp_peer_setup(struct ath12k *ar, struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta); void ath12k_dp_peer_cleanup(struct ath12k *ar, int vdev_id, const u8 *addr); void ath12k_dp_srng_cleanup(struct ath12k_base *ab, struct dp_srng *ring); int ath12k_dp_srng_setup(struct ath12k_base *ab, struct dp_srng *ring, @@ -1813,4 +2600,24 @@ u32 cookie); struct ath12k_tx_desc_info *ath12k_dp_get_tx_desc(struct ath12k_base *ab, u32 desc_id); +void ath12k_dp_tx_update_bank_profile(struct ath12k_link_vif *arvif); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +int ath12k_ppeds_dp_srng_alloc(struct ath12k_base *ab, struct dp_srng *ring, + enum hal_ring_type type, int ring_num, + int num_entries); +int ath12k_ppeds_dp_srng_init(struct ath12k_base *ab, struct dp_srng *ring, + enum hal_ring_type type, int ring_num, + int mac_id, int num_entries, u32 idx); +struct ath12k_ppeds_tx_desc_info *ath12k_dp_get_ppeds_tx_desc(struct ath12k_base *ab, + u32 desc_id); +int ath12k_dp_cc_ppeds_desc_init(struct ath12k_base *ab); +int ath12k_dp_cc_ppeds_desc_cleanup(struct ath12k_base *ab); +void ath12k_dp_ppeds_tx_cmem_init(struct ath12k_base *ab, struct ath12k_dp *dp); +#endif +void ath12k_umac_reset_handle_post_reset_start(struct ath12k_base *ab); +void ath12k_umac_reset_notify_target_sync_and_send(struct ath12k_base *ab, + enum dp_umac_reset_tx_cmd tx_event); +void ath12k_dp_reset_interrupt_mask(struct ath12k_base *ab); +void ath12k_dp_restore_interrupt_mask(struct ath12k_base *ab); +bool ath12k_dp_umac_reset_in_progress(struct ath12k_base *ab); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp_mon.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_mon.c --- linux-6.4/drivers/net/wireless/ath/ath12k/dp_mon.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_mon.c 2024-04-22 13:40:50.283868637 +0200 @@ -10,6 +10,22 @@ #include "dp_tx.h" #include "peer.h" +#define ATH12K_LE32_DEC_ENC(value, decode_bits, encode_bits) \ + le32_encode_bits(le32_get_bits(value, decode_bits), encode_bits) + +#define ATH12K_LE64_DEC_ENC(value, decode_bits, encode_bits) \ + le64_encode_bits(le64_get_bits(value, decode_bits), encode_bits) + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +extern int g_bonded_interface_model; +#endif + +#define LE32_DEC_ENC(value, dec_bits, enc_bits) \ + le32_encode_bits(le32_get_bits(value, dec_bits), enc_bits) + +#define LE64_DEC_ENC(value, dec_bits, enc_bits) \ + le64_encode_bits(le64_get_bits(value, dec_bits), enc_bits) + static void ath12k_dp_mon_rx_handle_ofdma_info(void *rx_tlv, struct hal_rx_user_status *rx_user_status) { @@ -33,10 +49,10 @@ rx_user_status->mpdu_ok_byte_count = u32_get_bits(mpdu_ok_byte_count, - HAL_RX_PPDU_END_USER_STATS_MPDU_DELIM_OK_BYTE_COUNT); + HAL_RX_PPDU_END_USER_STATS_INFO7_MPDU_OK_BYTE_COUNT); rx_user_status->mpdu_err_byte_count = u32_get_bits(mpdu_err_byte_count, - HAL_RX_PPDU_END_USER_STATS_MPDU_DELIM_ERR_BYTE_COUNT); + HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_ERR_BYTE_COUNT); } static void @@ -107,15 +123,11 @@ if (ppdu_info->is_stbc && nsts > 0) nsts = ((nsts + 1) >> 1) - 1; - ppdu_info->nss = u32_get_bits(nsts, VHT_SIG_SU_NSS_MASK); + ppdu_info->nss = u32_get_bits(nsts, VHT_SIG_SU_NSS_MASK) + 1; ppdu_info->bw = u32_get_bits(info0, HAL_RX_VHT_SIG_A_INFO_INFO0_BW); ppdu_info->beamformed = u32_get_bits(info1, HAL_RX_VHT_SIG_A_INFO_INFO1_BEAMFORMED); group_id = u32_get_bits(info0, HAL_RX_VHT_SIG_A_INFO_INFO0_GROUP_ID); - if (group_id == 0 || group_id == 63) - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; - else - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO; ppdu_info->vht_flag_values5 = group_id; ppdu_info->vht_flag_values3[0] = (((ppdu_info->mcs) << 4) | ppdu_info->nss); @@ -137,8 +149,7 @@ ppdu_info->is_stbc = u32_get_bits(info1, HAL_RX_HT_SIG_INFO_INFO1_STBC); ppdu_info->ldpc = u32_get_bits(info1, HAL_RX_HT_SIG_INFO_INFO1_FEC_CODING); ppdu_info->gi = u32_get_bits(info1, HAL_RX_HT_SIG_INFO_INFO1_GI); - ppdu_info->nss = (ppdu_info->mcs >> 3); - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; + ppdu_info->nss = (ppdu_info->mcs >> 3) + 1; } static void ath12k_dp_mon_parse_l_sig_b(u8 *tlv_data, @@ -172,7 +183,6 @@ ppdu_info->rate = rate; ppdu_info->cck_flag = 1; - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; } static void ath12k_dp_mon_parse_l_sig_a(u8 *tlv_data, @@ -214,7 +224,6 @@ } ppdu_info->rate = rate; - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; } static void ath12k_dp_mon_parse_he_sig_b2_ofdma(u8 *tlv_data, @@ -249,10 +258,9 @@ value = value << HE_STA_ID_SHIFT; ppdu_info->he_data4 |= value; - ppdu_info->nss = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS); + ppdu_info->nss = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS) + 1; ppdu_info->beamformed = u32_get_bits(info0, HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF); - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA; } static void ath12k_dp_mon_parse_he_sig_b2_mu(u8 *tlv_data, @@ -279,7 +287,7 @@ value = value << HE_STA_ID_SHIFT; ppdu_info->he_data4 |= value; - ppdu_info->nss = u32_get_bits(info0, HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS); + ppdu_info->nss = u32_get_bits(info0, HAL_RX_HE_SIG_B2_MU_INFO_INFO0_STA_NSTS) + 1; } static void ath12k_dp_mon_parse_he_sig_b1_mu(u8 *tlv_data, @@ -292,9 +300,8 @@ ru_tones = u32_get_bits(info0, HAL_RX_HE_SIG_B1_MU_INFO_INFO0_RU_ALLOCATION); - ppdu_info->ru_alloc = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones); + ppdu_info->ru_alloc = ath12k_mac_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones); ppdu_info->he_RU[0] = ru_tones; - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO; } static void ath12k_dp_mon_parse_he_sig_mu(u8 *tlv_data, @@ -429,7 +436,6 @@ ppdu_info->is_stbc = info1 & HAL_RX_HE_SIG_A_MU_DL_INFO1_STBC; - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO; } static void ath12k_dp_mon_parse_he_sig_su(u8 *tlv_data, @@ -577,18 +583,877 @@ ppdu_info->is_stbc = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_STBC); ppdu_info->beamformed = u32_get_bits(info1, HAL_RX_HE_SIG_A_SU_INFO_INFO1_TXBF); dcm = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_DCM); - ppdu_info->nss = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS); + ppdu_info->nss = u32_get_bits(info0, HAL_RX_HE_SIG_A_SU_INFO_INFO0_NSTS) + 1; ppdu_info->dcm = dcm; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_u_sig_cmn(u8 *rx_tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv; + struct hal_mon_usig_cmn *usig_1 = &usig->usig_1; + + ppdu_info->usig_common |= + IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER_KNOWN | + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_KNOWN | + IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL_KNOWN | + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN | + IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN | + ATH12K_LE32_DEC_ENC(usig->usig_2.tb.info0, + HAL_RX_USIG_TB_INFO0_RX_INTEG_CHECK_PASS, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC) | + ATH12K_LE32_DEC_ENC(usig_1->info0, + HAL_RX_USIG_CMN_INFO0_PHY_VERSION, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER) | + ATH12K_LE32_DEC_ENC(usig_1->info0, + HAL_RX_USIG_CMN_INFO0_BW, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW) | + ATH12K_LE32_DEC_ENC(usig_1->info0, + HAL_RX_USIG_CMN_INFO0_UL_DL, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL) | + ATH12K_LE32_DEC_ENC(usig_1->info0, + HAL_RX_USIG_CMN_INFO0_BSS_COLOR, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR) | + ATH12K_LE32_DEC_ENC(usig_1->info0, + HAL_RX_USIG_CMN_INFO0_TXOP, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP); + + ppdu_info->u_sig_info.bw = le32_get_bits(usig_1->info0, + HAL_RX_USIG_CMN_INFO0_BW); + + ppdu_info->bw = ppdu_info->u_sig_info.bw; + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + + +static inline u32 +ath12k_dp_mon_hal_rx_parse_u_sig_tb(u8 *rx_tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv; + struct hal_mon_usig_tb *usig_tb = &usig->usig_2.tb; + + ppdu_info->usig_mask |= + IEEE80211_RADIOTAP_EHT_USIG1_TB_B20_B25_DISREGARD | + ATH12K_LE32_DEC_ENC(usig_tb->info0, + HAL_RX_USIG_TB_INFO0_PPDU_TYPE_COMP_MODE, + IEEE80211_RADIOTAP_EHT_USIG2_TB_B0_B1_PPDU_TYPE) | + IEEE80211_RADIOTAP_EHT_USIG2_TB_B2_VALIDATE | + ATH12K_LE32_DEC_ENC(usig_tb->info0, + HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_1, + IEEE80211_RADIOTAP_EHT_USIG2_TB_B3_B6_SPATIAL_REUSE_1) | + ATH12K_LE32_DEC_ENC(usig_tb->info0, + HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_2, + IEEE80211_RADIOTAP_EHT_USIG2_TB_B7_B10_SPATIAL_REUSE_2) | + IEEE80211_RADIOTAP_EHT_USIG2_TB_B11_B15_DISREGARD | + ATH12K_LE32_DEC_ENC(usig_tb->info0, + HAL_RX_USIG_TB_INFO0_CRC, + IEEE80211_RADIOTAP_EHT_USIG2_TB_B16_B19_CRC) | + ATH12K_LE32_DEC_ENC(usig_tb->info0, + HAL_RX_USIG_TB_INFO0_TAIL, + IEEE80211_RADIOTAP_EHT_USIG2_TB_B20_B25_TAIL); + + ppdu_info->u_sig_info.ppdu_type_comp_mode = + le32_get_bits(usig_tb->info0, + HAL_RX_USIG_TB_INFO0_PPDU_TYPE_COMP_MODE); + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline uint32_t +ath12k_dp_mon_hal_rx_parse_u_sig_mu(u8 *rx_tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv; + struct hal_mon_usig_mu *usig_mu = &usig->usig_2.mu; + + ppdu_info->usig_mask |= + IEEE80211_RADIOTAP_EHT_USIG1_MU_B20_B24_DISREGARD | + IEEE80211_RADIOTAP_EHT_USIG1_MU_B25_VALIDATE | + ATH12K_LE32_DEC_ENC(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_PPDU_TYPE_COMP_MODE, + IEEE80211_RADIOTAP_EHT_USIG2_MU_B0_B1_PPDU_TYPE) | + IEEE80211_RADIOTAP_EHT_USIG2_MU_B2_VALIDATE | + ATH12K_LE32_DEC_ENC(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_PUNC_CH_INFO, + IEEE80211_RADIOTAP_EHT_USIG2_MU_B3_B7_PUNCTURED_INFO) | + IEEE80211_RADIOTAP_EHT_USIG2_MU_B8_VALIDATE | + ATH12K_LE32_DEC_ENC(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_EHT_SIG_MCS, + IEEE80211_RADIOTAP_EHT_USIG2_MU_B9_B10_SIG_MCS) | + ATH12K_LE32_DEC_ENC(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_NUM_EHT_SIG_SYM, + IEEE80211_RADIOTAP_EHT_USIG2_MU_B11_B15_EHT_SIG_SYMBOLS) | + ATH12K_LE32_DEC_ENC(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_CRC, + IEEE80211_RADIOTAP_EHT_USIG2_MU_B16_B19_CRC) | + ATH12K_LE32_DEC_ENC(usig_mu->info0, + HAL_RX_USIG_TB_INFO0_TAIL, + IEEE80211_RADIOTAP_EHT_USIG2_MU_B20_B25_TAIL); + + ppdu_info->u_sig_info.ppdu_type_comp_mode = + le32_get_bits(usig_mu->info0, + HAL_RX_USIG_TB_INFO0_PPDU_TYPE_COMP_MODE); + ppdu_info->u_sig_info.eht_sig_mcs = + le32_get_bits(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_EHT_SIG_MCS); + ppdu_info->u_sig_info.num_eht_sig_sym = + le32_get_bits(usig_mu->info0, + HAL_RX_USIG_MU_INFO0_NUM_EHT_SIG_SYM); + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_u_sig_hdr(u8 *rx_tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_mon_usig_hdr *usig = (struct hal_mon_usig_hdr *)rx_tlv; + struct hal_mon_usig_cmn *usig_cmn = &usig->usig_1; + u8 comp_mode; + bool ul_dl; + + ppdu_info->usig_flags = 1; + + ath12k_dp_mon_hal_rx_parse_u_sig_cmn(rx_tlv, ppdu_info); + + ul_dl = u32_get_bits(__le32_to_cpu(usig_cmn->info0), HAL_RX_USIG_CMN_INFO0_UL_DL); + + comp_mode = u32_get_bits(__le32_to_cpu(usig->usig_2.mu.info0), + HAL_RX_USIG_MU_INFO0_PPDU_TYPE_COMP_MODE); + + if (comp_mode == 0 && ul_dl) + return ath12k_dp_mon_hal_rx_parse_u_sig_tb(rx_tlv, ppdu_info); + else + return ath12k_dp_mon_hal_rx_parse_u_sig_mu(rx_tlv, ppdu_info); +} + +static enum hal_rx_mon_status +ath12k_dp_mon_hal_aggr_tlv(struct hal_rx_mon_ppdu_info *ppdu_info, + u16 tlv_len, u8 *tlv_data) +{ + if (tlv_len <= HAL_RX_MON_MAX_AGGR_SIZE - ppdu_info->tlv_aggr.cur_len) { + memcpy(ppdu_info->tlv_aggr.buf + ppdu_info->tlv_aggr.cur_len, + tlv_data, tlv_len); + ppdu_info->tlv_aggr.cur_len += tlv_len; + } + + return HAL_RX_MON_STATUS_PPDU_NOT_DONE; +} + +static inline bool +ath12k_dp_mon_hal_rx_is_mu_mimo_user(struct hal_rx_mon_ppdu_info *ppdu_info) +{ + if (ppdu_info->u_sig_info.ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_SU && + ppdu_info->u_sig_info.ul_dl == 1) + return true; + + return false; +} + +static inline bool +ath12k_dp_mon_hal_rx_is_frame_type_ndp(struct hal_rx_mon_ppdu_info *ppdu_info) +{ + if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 1 && + ppdu_info->u_sig_info.eht_sig_mcs == 0 && + ppdu_info->u_sig_info.num_eht_sig_sym == 0) + return true; + + return false; +} + +static inline bool +ath12k_dp_mon_hal_rx_is_non_ofdma(struct hal_rx_mon_ppdu_info *ppdu_info) +{ + u32 ppdu_type_comp_mode = ppdu_info->u_sig_info.ppdu_type_comp_mode; + u32 ul_dl = ppdu_info->u_sig_info.ul_dl; + + if ((ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_MU_MIMO && ul_dl == 0) || + (ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_MU_OFDMA && ul_dl == 0) || + (ppdu_type_comp_mode == HAL_RX_RECEPTION_TYPE_MU_MIMO && ul_dl == 1)) + return true; + + return false; +} + +static inline bool +ath12k_dp_mon_hal_rx_is_ofdma(struct hal_rx_mon_ppdu_info *ppdu_info) +{ + if (ppdu_info->u_sig_info.ppdu_type_comp_mode == 0 && + ppdu_info->u_sig_info.ul_dl == 0) + return true; + + return false; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_eht_sig_ndp(u8 *tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_eht_sig_ndp_cmn_eb *eht_sig_ndp = + (struct hal_eht_sig_ndp_cmn_eb *)tlv; + + ppdu_info->eht_known |= + IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE | + IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF | + IEEE80211_RADIOTAP_EHT_KNOWN_NSS_S | + IEEE80211_RADIOTAP_EHT_KNOWN_BEAMFORMED_S | + IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_S | + IEEE80211_RADIOTAP_EHT_KNOWN_CRC1 | + IEEE80211_RADIOTAP_EHT_KNOWN_TAIL1; + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(eht_sig_ndp->info0, + HAL_RX_EHT_SIG_NDP_CMN_INFO0_SPATIAL_REUSE, + IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE); + /* + * GI and LTF size are separately indicated in radiotap header + * and hence will be parsed from other TLV + */ + + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(eht_sig_ndp->info0, + HAL_RX_EHT_SIG_NDP_CMN_INFO0_NUM_LTF_SYM, + IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF); + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(eht_sig_ndp->info0, + HAL_RX_EHT_SIG_NDP_CMN_INFO0_CRC, + IEEE80211_RADIOTAP_EHT_DATA0_CRC1_O); + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(eht_sig_ndp->info0, + HAL_RX_EHT_SIG_NDP_CMN_INFO0_DISREGARD, + IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_S); + + ppdu_info->eht_data[7] |= + ATH12K_LE32_DEC_ENC(eht_sig_ndp->info0, + HAL_RX_EHT_SIG_NDP_CMN_INFO0_NSS, + IEEE80211_RADIOTAP_EHT_DATA7_NSS_S); + + ppdu_info->eht_data[7] |= + ATH12K_LE32_DEC_ENC(eht_sig_ndp->info0, + HAL_RX_EHT_SIG_NDP_CMN_INFO0_BEAMFORMED, + IEEE80211_RADIOTAP_EHT_DATA7_BEAMFORMED_S); + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_usig_overflow(u8 *tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_eht_sig_cc_usig_overflow *usig_ovflow = + (struct hal_eht_sig_cc_usig_overflow *)tlv; + + ppdu_info->eht_known |= + IEEE80211_RADIOTAP_EHT_KNOWN_SPATIAL_REUSE | + IEEE80211_RADIOTAP_EHT_KNOWN_EHT_LTF | + IEEE80211_RADIOTAP_EHT_KNOWN_LDPC_EXTRA_SYM_OM | + IEEE80211_RADIOTAP_EHT_KNOWN_PRE_PADD_FACOR_OM | + IEEE80211_RADIOTAP_EHT_KNOWN_PE_DISAMBIGUITY_OM | + IEEE80211_RADIOTAP_EHT_KNOWN_DISREGARD_O; + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(usig_ovflow->info0, + HAL_RX_EHT_SIG_OVERFLOW_INFO0_SPATIAL_REUSE, + IEEE80211_RADIOTAP_EHT_DATA0_SPATIAL_REUSE); + + /* + * GI and LTF size are separately indicated in radiotap header + * and hence will be parsed from other TLV + */ + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(usig_ovflow->info0, + HAL_RX_EHT_SIG_OVERFLOW_INFO0_NUM_LTF_SYM, + IEEE80211_RADIOTAP_EHT_DATA0_EHT_LTF); + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(usig_ovflow->info0, + HAL_RX_EHT_SIG_OVERFLOW_INFO0_LDPC_EXTA_SYM, + IEEE80211_RADIOTAP_EHT_DATA0_LDPC_EXTRA_SYM_OM); + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(usig_ovflow->info0, + HAL_RX_EHT_SIG_OVERFLOW_INFO0_PRE_FEC_PAD_FACTOR, + IEEE80211_RADIOTAP_EHT_DATA0_PRE_PADD_FACOR_OM); + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(usig_ovflow->info0, + HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISAMBIGUITY, + IEEE80211_RADIOTAP_EHT_DATA0_PE_DISAMBIGUITY_OM); + + ppdu_info->eht_data[0] |= + ATH12K_LE32_DEC_ENC(usig_ovflow->info0, + HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISREGARD, + IEEE80211_RADIOTAP_EHT_DATA0_DISREGARD_O); + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_ru_allocation(u8 *tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + u64 *ehtsig_tlv = (u64 *)tlv; + struct hal_eht_sig_ofdma_cmn_eb1 *ofdma_cmn_eb1; + struct hal_eht_sig_ofdma_cmn_eb2 *ofdma_cmn_eb2; + + ofdma_cmn_eb1 = (struct hal_eht_sig_ofdma_cmn_eb1 *)ehtsig_tlv; + ofdma_cmn_eb2 = (struct hal_eht_sig_ofdma_cmn_eb2 *)(ehtsig_tlv + 1); + +/*FIX ME to get CC2 values*/ + + switch (ppdu_info->u_sig_info.bw) { + case HAL_EHT_BW_320_2: + case HAL_EHT_BW_320_1: + /* CC1 2::3 */ + ppdu_info->eht_data[4] |= + IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2->info0, + HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_3, + IEEE80211_RADIOTAP_EHT_DATA4_RU_ALLOC_CC_1_2_3); + + /* CC1 2::4 */ + ppdu_info->eht_data[5] |= + IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2->info0, + HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_4, + IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_4); + + /* CC1 2::5 */ + ppdu_info->eht_data[5] |= + IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2->info0, + HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_5, + IEEE80211_RADIOTAP_EHT_DATA5_RU_ALLOC_CC_1_2_5); + + /* CC1 2::6 */ + ppdu_info->eht_data[6] |= + IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2->info0, + HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_6, + IEEE80211_RADIOTAP_EHT_DATA6_RU_ALLOC_CC_1_2_6); + + /* fallthrough */ + fallthrough; + + case HAL_EHT_BW_160: + /* CC1 2::1 */ + ppdu_info->eht_data[3] |= + IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2->info0, + HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_1, + IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_1); + /* CC1 2::2 */ + ppdu_info->eht_data[3] |= + IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb2->info0, + HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_2, + IEEE80211_RADIOTAP_EHT_DATA3_RU_ALLOC_CC_1_2_2); + + /* fallthrough */ + fallthrough; + + case HAL_EHT_BW_80: + /* CC1 1::2 */ + ppdu_info->eht_data[2] |= + IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb1->info0, + HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_2, + IEEE80211_RADIOTAP_EHT_DATA2_RU_ALLOC_CC_1_1_2); + + /* fallthrough */ + fallthrough; + + case HAL_EHT_BW_40: + fallthrough; + case HAL_EHT_BW_20: + /* CC1 1::1 */ + ppdu_info->eht_data[1] |= + IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1_KNOWN | + ATH12K_LE64_DEC_ENC(ofdma_cmn_eb1->info0, + HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_1, + IEEE80211_RADIOTAP_EHT_DATA1_RU_ALLOC_CC_1_1_1); + break; + default: + break; + } + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline uint32_t +ath12k_dp_mon_hal_rx_parse_non_ofdma_users(u8 *tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_eht_sig_non_ofdma_cmn_eb *non_ofdma_cmn_eb = + (struct hal_eht_sig_non_ofdma_cmn_eb *)tlv; + + ppdu_info->eht_known |= IEEE80211_RADIOTAP_EHT_KNOWN_NR_NON_OFDMA_USERS_M; + ppdu_info->eht_data[7] |= + ATH12K_LE32_DEC_ENC(non_ofdma_cmn_eb->info0, + HAL_RX_EHT_SIG_NON_OFDMA_INFO0_NUM_USERS, + IEEE80211_RADIOTAP_EHT_DATA7_NUM_OF_NON_OFDMA_USERS); + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_eht_sig_mumimo_user_info(u8 *tlv, + struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_eht_sig_mu_mimo_user_info *user_info; + u32 user_idx = ppdu_info->num_eht_user_info_valid; + + if (ppdu_info->num_eht_user_info_valid >= ARRAY_SIZE(ppdu_info->eht_user_info)) + return HAL_TLV_STATUS_PPDU_NOT_DONE; + + user_info = (struct hal_eht_sig_mu_mimo_user_info *)tlv; + + ppdu_info->eht_user_info[user_idx] |= + IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN | + IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN | + IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN | + IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_KNOWN_M | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_STA_ID, + IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_CODING, + IEEE80211_RADIOTAP_EHT_USER_INFO_CODING) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_MCS, + IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_SPATIAL_CODING, + IEEE80211_RADIOTAP_EHT_USER_INFO_SPATIAL_CONFIG_M); + + ppdu_info->mcs = le32_get_bits(user_info->info0, + HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_MCS); + + /* FIXME: get USER_ENCODING_BLOCK_CRC */ + + ppdu_info->num_eht_user_info_valid++; + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_eht_sig_non_mumimo_user(u8 *tlv, + struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_eht_sig_non_mu_mimo_user_info *user_info; + u32 user_idx = ppdu_info->num_eht_user_info_valid; + + if (ppdu_info->num_eht_user_info_valid >= ARRAY_SIZE(ppdu_info->eht_user_info)) + return HAL_TLV_STATUS_PPDU_NOT_DONE; + + user_info = (struct hal_eht_sig_non_mu_mimo_user_info *)tlv; + + ppdu_info->eht_user_info[user_idx] |= + IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID_KNOWN | + IEEE80211_RADIOTAP_EHT_USER_INFO_MCS_KNOWN | + IEEE80211_RADIOTAP_EHT_USER_INFO_CODING_KNOWN | + IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_KNOWN_O | + IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_KNOWN_O | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_STA_ID, + IEEE80211_RADIOTAP_EHT_USER_INFO_STA_ID) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_CODING, + IEEE80211_RADIOTAP_EHT_USER_INFO_CODING) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_MCS, + IEEE80211_RADIOTAP_EHT_USER_INFO_MCS) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_NSS, + IEEE80211_RADIOTAP_EHT_USER_INFO_NSS_O) | + ATH12K_LE32_DEC_ENC(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_BEAMFORMED, + IEEE80211_RADIOTAP_EHT_USER_INFO_BEAMFORMING_O); + + ppdu_info->mcs = le32_get_bits(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_MCS); + + ppdu_info->nss = le32_get_bits(user_info->info0, + HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_NSS) + 1; + + ppdu_info->num_eht_user_info_valid++; + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_eht_sig_non_ofdma(u8 *tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + void *user_info = (void *)((u8 *)tlv + HTT_TLV_HDR_LEN); + + ath12k_dp_mon_hal_rx_parse_usig_overflow(tlv, ppdu_info); + ath12k_dp_mon_hal_rx_parse_non_ofdma_users(tlv, ppdu_info); + + if (ath12k_dp_mon_hal_rx_is_mu_mimo_user(ppdu_info)) + ath12k_dp_mon_hal_rx_parse_eht_sig_mumimo_user_info(user_info, + ppdu_info); + else + ath12k_dp_mon_hal_rx_parse_eht_sig_non_mumimo_user(user_info, + ppdu_info); + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline u32 +ath12k_dp_mon_hal_rx_parse_eht_sig_ofdma(u8 *tlv, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + u64 *eht_sig_tlv = (u64 *)tlv; + void *user_info = (void *)(eht_sig_tlv + 2); + + ath12k_dp_mon_hal_rx_parse_usig_overflow(tlv, ppdu_info); + ath12k_dp_mon_hal_rx_parse_ru_allocation (tlv, ppdu_info); + ath12k_dp_mon_hal_rx_parse_eht_sig_non_mumimo_user(user_info, + ppdu_info); + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static void +ath12k_dp_mon_parse_eht_sig_hdr(struct hal_rx_mon_ppdu_info *ppdu_info, + u8 *tlv_data) +{ + ppdu_info->eht_flags = 1; + + if (ath12k_dp_mon_hal_rx_is_frame_type_ndp(ppdu_info)) + ath12k_dp_mon_hal_rx_parse_eht_sig_ndp(tlv_data, ppdu_info); + else if (ath12k_dp_mon_hal_rx_is_non_ofdma(ppdu_info)) + ath12k_dp_mon_hal_rx_parse_eht_sig_non_ofdma(tlv_data, ppdu_info); + else if (ath12k_dp_mon_hal_rx_is_ofdma(ppdu_info)) + ath12k_dp_mon_hal_rx_parse_eht_sig_ofdma(tlv_data, ppdu_info); +} + +static u32 +ath12k_dp_mon_hal_rx_status_process_aggr_tlv(struct hal_rx_mon_ppdu_info *ppdu_info) +{ + u32 aggr_tlv_tag = ppdu_info->tlv_aggr.tlv_tag; + + if (aggr_tlv_tag == HAL_PHYRX_GENERIC_EHT_SIG) + ath12k_dp_mon_parse_eht_sig_hdr(ppdu_info, ppdu_info->tlv_aggr.buf); + + ppdu_info->tlv_aggr.in_progress = 0; + ppdu_info->tlv_aggr.cur_len = 0; + + return HAL_TLV_STATUS_PPDU_NOT_DONE; +} + +static inline enum ath12k_eht_ru_size +hal_rx_mon_hal_ru_size_to_ath12k_ru_size(u32 hal_ru_size) +{ + switch (hal_ru_size) { + case HAL_EHT_RU_26: + return ATH12K_EHT_RU_26; + case HAL_EHT_RU_52: + return ATH12K_EHT_RU_52; + case HAL_EHT_RU_78: + return ATH12K_EHT_RU_52_26; + case HAL_EHT_RU_106: + return ATH12K_EHT_RU_106; + case HAL_EHT_RU_132: + return ATH12K_EHT_RU_106_26; + case HAL_EHT_RU_242: + return ATH12K_EHT_RU_242; + case HAL_EHT_RU_484: + return ATH12K_EHT_RU_484; + case HAL_EHT_RU_726: + return ATH12K_EHT_RU_484_242; + case HAL_EHT_RU_996: + return ATH12K_EHT_RU_996; + case HAL_EHT_RU_996x2: + return ATH12K_EHT_RU_996x2; + case HAL_EHT_RU_996x3: + return ATH12K_EHT_RU_996x3; + case HAL_EHT_RU_996x4: + return ATH12K_EHT_RU_996x4; + case HAL_EHT_RU_NONE: + return ATH12K_EHT_RU_INVALID; + case HAL_EHT_RU_996_484: + return ATH12K_EHT_RU_996_484; + case HAL_EHT_RU_996x2_484: + return ATH12K_EHT_RU_996x2_484; + case HAL_EHT_RU_996x3_484: + return ATH12K_EHT_RU_996x3_484; + case HAL_EHT_RU_996_484_242: + return ATH12K_EHT_RU_996_484_242; + default: + return ATH12K_EHT_RU_INVALID; + } +} + +static inline void hal_rx_ul_ofdma_ru_size_to_width(u32 ru_size, u32 *ru_width) +{ + uint32_t width = 0; + + switch (ru_size) { + case ATH12K_EHT_RU_26: + width = RU_26; + break; + case ATH12K_EHT_RU_52: + width = RU_52; + break; + case ATH12K_EHT_RU_52_26: + width = RU_52_26; + break; + case ATH12K_EHT_RU_106: + width = RU_106; + break; + case ATH12K_EHT_RU_106_26: + width = RU_106_26; + break; + case ATH12K_EHT_RU_242: + width = RU_242; + break; + case ATH12K_EHT_RU_484: + width = RU_484; + break; + case ATH12K_EHT_RU_484_242: + width = RU_484_242; + break; + case ATH12K_EHT_RU_996: + width = RU_996; + break; + case ATH12K_EHT_RU_996_484: + width = RU_996_484; + break; + case ATH12K_EHT_RU_996_484_242: + width = RU_996_484_242; + break; + case ATH12K_EHT_RU_996x2: + width = RU_2X996; + break; + case ATH12K_EHT_RU_996x2_484: + width = RU_2X996_484; + break; + case ATH12K_EHT_RU_996x3: + width = RU_3X996; + break; + case ATH12K_EHT_RU_996x3_484: + width = RU_3X996_484; + break; + case ATH12K_EHT_RU_996x4: + width = RU_4X996; + break; + default: + break; + } + + *ru_width = width; +} + +static u32 +ath12k_dp_mon_hal_rx_parse_receive_user_info(u8 *tlv, u16 user_id, + struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct hal_receive_user_info *rx_usr_info = (struct hal_receive_user_info *)tlv; + struct hal_rx_user_status *mon_rx_user_status = NULL; + u64 ru_index_320mhz = 0; + u32 ru_index_per80mhz; + u32 ru_size = 0, num_80mhz_with_ru = 0, ru_start_index_80_0; + u32 ru_index = HAL_EHT_RU_INVALID; + u32 rtap_ru_size = ATH12K_EHT_RU_INVALID; + u32 ru_width, reception_type, ru_type_80_0; + u32 ru_type_80_1, ru_start_index_80_1, ru_type_80_2, ru_start_index_80_2; + u32 ru_type_80_3, ru_start_index_80_3; + + reception_type = u32_get_bits(__le32_to_cpu(rx_usr_info->info0), + HAL_RX_USR_INFO0_RECEPTION_TYPE); + + switch (reception_type) { + case HAL_RECEPTION_TYPE_SU: ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; + break; + case HAL_RECEPTION_TYPE_DL_MU_MIMO: + case HAL_RECEPTION_TYPE_UL_MU_MIMO: + ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO; + break; + case HAL_RECEPTION_TYPE_DL_MU_OFMA: + case HAL_RECEPTION_TYPE_UL_MU_OFDMA: + ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA; + break; + case HAL_RECEPTION_TYPE_DL_MU_OFDMA_MIMO: + case HAL_RECEPTION_TYPE_UL_MU_OFDMA_MIMO: + ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO; + } + + ppdu_info->is_stbc = u32_get_bits(__le32_to_cpu(rx_usr_info->info0), + HAL_RX_USR_INFO0_STBC); + ppdu_info->ldpc = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_LDPC); + ppdu_info->dcm = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_STA_DCM); + ppdu_info->bw = u32_get_bits(__le32_to_cpu(rx_usr_info->info1), + HAL_RX_USR_INFO1_RX_BW); + ppdu_info->mcs = u32_get_bits(__le32_to_cpu(rx_usr_info->info1), + HAL_RX_USR_INFO1_MCS); + ppdu_info->nss = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_NSS) + 1; + + if (user_id < HAL_MAX_UL_MU_USERS) { + mon_rx_user_status = + &ppdu_info->userstats[user_id]; + mon_rx_user_status->mcs = ppdu_info->mcs; + mon_rx_user_status->nss = ppdu_info->nss; + } + + if (!(ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_MIMO || + ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA || + ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_MU_OFDMA_MIMO)) + return HAL_TLV_STATUS_PPDU_NOT_DONE; + + /* RU allocation present only for OFDMA reception */ + ru_type_80_0 = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_RU_TYPE_80_0); + ru_start_index_80_0 = u32_get_bits(__le32_to_cpu(rx_usr_info->info3), + HAL_RX_USR_INFO3_RU_START_IDX_80_0); + if (ru_type_80_0 != HAL_EHT_RU_NONE) { + ru_size += ru_type_80_0; + ru_index = ru_index_per80mhz = ru_start_index_80_0; + HAL_SET_RU_PER80(ru_index_320mhz, ru_type_80_0, ru_index_per80mhz, 0); + num_80mhz_with_ru++; + } + + ru_type_80_1 = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_RU_TYPE_80_1); + ru_start_index_80_1 = u32_get_bits(__le32_to_cpu(rx_usr_info->info3), + HAL_RX_USR_INFO3_RU_START_IDX_80_1); + if (ru_type_80_1 != HAL_EHT_RU_NONE) { + ru_size += ru_type_80_1; + ru_index = ru_index_per80mhz = ru_start_index_80_1; + HAL_SET_RU_PER80(ru_index_320mhz, ru_type_80_1, ru_index_per80mhz, 1); + num_80mhz_with_ru++; + } + + ru_type_80_2 = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_RU_TYPE_80_2); + ru_start_index_80_2 = u32_get_bits(__le32_to_cpu(rx_usr_info->info3), + HAL_RX_USR_INFO3_RU_START_IDX_80_2); + if (ru_type_80_2 != HAL_EHT_RU_NONE) { + ru_size += ru_type_80_2; + ru_index = ru_index_per80mhz = ru_start_index_80_2; + HAL_SET_RU_PER80(ru_index_320mhz, ru_type_80_2, ru_index_per80mhz, 2); + num_80mhz_with_ru++; + } + + ru_type_80_3 = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO2_RU_TYPE_80_3); + ru_start_index_80_3 = u32_get_bits(__le32_to_cpu(rx_usr_info->info2), + HAL_RX_USR_INFO3_RU_START_IDX_80_3); + if (ru_type_80_3 != HAL_EHT_RU_NONE) { + ru_size += ru_type_80_3; + ru_index = ru_index_per80mhz = ru_start_index_80_3; + HAL_SET_RU_PER80(ru_index_320mhz, ru_type_80_3, ru_index_per80mhz, 3); + num_80mhz_with_ru++; + } + + if (num_80mhz_with_ru > 1) { + /* Calculate the MRU index */ + switch (ru_index_320mhz) { + case HAL_EHT_RU_996_484_0: + case HAL_EHT_RU_996x2_484_0: + case HAL_EHT_RU_996x3_484_0: + ru_index = 0; + break; + case HAL_EHT_RU_996_484_1: + case HAL_EHT_RU_996x2_484_1: + case HAL_EHT_RU_996x3_484_1: + ru_index = 1; + break; + case HAL_EHT_RU_996_484_2: + case HAL_EHT_RU_996x2_484_2: + case HAL_EHT_RU_996x3_484_2: + ru_index = 2; + break; + case HAL_EHT_RU_996_484_3: + case HAL_EHT_RU_996x2_484_3: + case HAL_EHT_RU_996x3_484_3: + ru_index = 3; + break; + case HAL_EHT_RU_996_484_4: + case HAL_EHT_RU_996x2_484_4: + case HAL_EHT_RU_996x3_484_4: + ru_index = 4; + break; + case HAL_EHT_RU_996_484_5: + case HAL_EHT_RU_996x2_484_5: + case HAL_EHT_RU_996x3_484_5: + ru_index = 5; + break; + case HAL_EHT_RU_996_484_6: + case HAL_EHT_RU_996x2_484_6: + case HAL_EHT_RU_996x3_484_6: + ru_index = 6; + break; + case HAL_EHT_RU_996_484_7: + case HAL_EHT_RU_996x2_484_7: + case HAL_EHT_RU_996x3_484_7: + ru_index = 7; + break; + case HAL_EHT_RU_996x2_484_8: + ru_index = 8; + break; + case HAL_EHT_RU_996x2_484_9: + ru_index = 9; + break; + case HAL_EHT_RU_996x2_484_10: + ru_index = 10; + break; + case HAL_EHT_RU_996x2_484_11: + ru_index = 11; + break; + default: + ru_index = HAL_EHT_RU_INVALID; + break; + } + + ru_size += 4; + } + + rtap_ru_size = hal_rx_mon_hal_ru_size_to_ath12k_ru_size(ru_size); + if (rtap_ru_size != ATH12K_EHT_RU_INVALID) { + ppdu_info->eht_known |= IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_SIZE_OM; + ppdu_info->eht_data[1] |= + le32_encode_bits(rtap_ru_size, + IEEE80211_RADIOTAP_EHT_DATA1_RU_SIZE); + } + + if (ru_index != HAL_EHT_RU_INVALID) { + ppdu_info->eht_known |= IEEE80211_RADIOTAP_EHT_KNOWN_RU_MRU_INDEX_OM; + ppdu_info->eht_data[1] |= + le32_encode_bits(rtap_ru_size, + IEEE80211_RADIOTAP_EHT_DATA1_RU_INDEX); + } + + if (mon_rx_user_status && ru_index != HAL_EHT_RU_INVALID && + rtap_ru_size != ATH12K_EHT_RU_INVALID) { + mon_rx_user_status->ul_ofdma_ru_start_index = ru_index; + mon_rx_user_status->ul_ofdma_ru_size = rtap_ru_size; + hal_rx_ul_ofdma_ru_size_to_width(rtap_ru_size, &ru_width); + mon_rx_user_status->ul_ofdma_ru_width = ru_width; + mon_rx_user_status->ofdma_info_valid = 1; + } + + return HAL_TLV_STATUS_PPDU_NOT_DONE; } static enum hal_rx_mon_status ath12k_dp_mon_rx_parse_status_tlv(struct ath12k_base *ab, - struct ath12k_mon_data *pmon, - u32 tlv_tag, u8 *tlv_data, u32 userid) + struct hal_rx_mon_ppdu_info *ppdu_info, + struct hal_tlv_parsed_hdr *tlv_parsed_hdr) { - struct hal_rx_mon_ppdu_info *ppdu_info = &pmon->mon_ppdu_info; u32 info[7]; + u16 tlv_tag = tlv_parsed_hdr->tlv_tag; + u16 tlv_len = tlv_parsed_hdr->tlv_len; + u16 userid = tlv_parsed_hdr->tlv_userid; + u8 *tlv_data = tlv_parsed_hdr->tlv_data; + + if (ppdu_info->tlv_aggr.in_progress) { + if (ppdu_info->tlv_aggr.tlv_tag == tlv_tag) { + return ath12k_dp_mon_hal_aggr_tlv(ppdu_info, + tlv_len, tlv_data); + } else { + ath12k_dp_mon_hal_rx_status_process_aggr_tlv(ppdu_info); + } + } switch (tlv_tag) { case HAL_RX_PPDU_START: { @@ -596,11 +1461,16 @@ (struct hal_rx_ppdu_start *)tlv_data; info[0] = __le32_to_cpu(ppdu_start->info0); - ppdu_info->ppdu_id = u32_get_bits(info[0], HAL_RX_PPDU_START_INFO0_PPDU_ID); - ppdu_info->chan_num = __le32_to_cpu(ppdu_start->chan_num); - ppdu_info->ppdu_ts = __le32_to_cpu(ppdu_start->ppdu_start_ts); + + info[1] = __le32_to_cpu(ppdu_start->info1); + ppdu_info->chan_num = u32_get_bits(info[1], + HAL_RX_PPDU_START_INFO1_CHAN_NUM); + ppdu_info->freq = u32_get_bits(info[1], + HAL_RX_PPDU_START_INFO1_CHAN_FREQ); + ppdu_info->ppdu_ts = ((__le32_to_cpu(ppdu_start->ppdu_start_ts_31_0) | + (__le32_to_cpu(ppdu_start->ppdu_start_ts_63_32) << 31))); if (ppdu_info->ppdu_id != ppdu_info->last_ppdu_id) { ppdu_info->last_ppdu_id = ppdu_info->ppdu_id; @@ -628,8 +1498,8 @@ u32_get_bits(info[1], HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID); ppdu_info->tid = ffs(u32_get_bits(info[6], - HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP) - - 1); + HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP)) + - 1; ppdu_info->tcp_msdu_count = u32_get_bits(info[4], HAL_RX_PPDU_END_USER_STATS_INFO4_TCP_MSDU_CNT); @@ -651,6 +1521,12 @@ ppdu_info->num_mpdu_fcs_err = u32_get_bits(info[0], HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR); + ppdu_info->peer_id = + u32_get_bits(info[0], HAL_RX_PPDU_END_USER_STATS_INFO0_PEER_ID); + + if ((ppdu_info->num_mpdu_fcs_ok | ppdu_info->num_mpdu_fcs_err) > 1) + ppdu_info->userstats[userid].ampdu_present = true; + switch (ppdu_info->preamble_type) { case HAL_RX_PREAMBLE_11N: ppdu_info->ht_flags = 1; @@ -661,6 +1537,9 @@ case HAL_RX_PREAMBLE_11AX: ppdu_info->he_flags = 1; break; + case HAL_RX_PREAMBLE_11BE: + ppdu_info->eht_flags = 1; + break; default: break; } @@ -728,10 +1607,9 @@ case HAL_PHYRX_RSSI_LEGACY: { struct hal_rx_phyrx_rssi_legacy_info *rssi = (struct hal_rx_phyrx_rssi_legacy_info *)tlv_data; - u32 reception_type = 0; - u32 rssi_legacy_info = __le32_to_cpu(rssi->rsvd[0]); + u32 rssi_legacy_info = __le32_to_cpu(rssi->info0); - info[0] = __le32_to_cpu(rssi->info0); + info[0] = __le32_to_cpu(rssi->info1); /* TODO: Please note that the combined rssi will not be accurate * in MU case. Rssi in MU needs to be retrieved from @@ -739,22 +1617,9 @@ */ ppdu_info->rssi_comb = u32_get_bits(info[0], - HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB); - reception_type = - u32_get_bits(rssi_legacy_info, - HAL_RX_PHYRX_RSSI_LEGACY_INFO_RSVD1_RECEPTION); - - switch (reception_type) { - case HAL_RECEPTION_TYPE_ULOFMDA: - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_OFDMA; - break; - case HAL_RECEPTION_TYPE_ULMIMO: - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_MU_MIMO; - break; - default: - ppdu_info->reception_type = HAL_RX_RECEPTION_TYPE_SU; - break; - } + HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB); + ppdu_info->bw = u32_get_bits(rssi_legacy_info, + HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RX_BW); break; } case HAL_RXPCU_PPDU_END_INFO: { @@ -772,9 +1637,9 @@ case HAL_RX_MPDU_START: { struct hal_rx_mpdu_start *mpdu_start = (struct hal_rx_mpdu_start *)tlv_data; - struct dp_mon_mpdu *mon_mpdu = pmon->mon_mpdu; u16 peer_id; + info[0] = __le32_to_cpu(mpdu_start->info0); info[1] = __le32_to_cpu(mpdu_start->info1); peer_id = u32_get_bits(info[1], HAL_RX_MPDU_START_INFO1_PEERID); if (peer_id) @@ -783,73 +1648,52 @@ ppdu_info->mpdu_len += u32_get_bits(info[1], HAL_RX_MPDU_START_INFO2_MPDU_LEN); if (userid < HAL_MAX_UL_MU_USERS) { - info[0] = __le32_to_cpu(mpdu_start->info0); + info[1] = __le32_to_cpu(mpdu_start->info1); ppdu_info->userid = userid; - ppdu_info->ampdu_id[userid] = - u32_get_bits(info[0], HAL_RX_MPDU_START_INFO1_PEERID); + ppdu_info->userstats[userid].ampdu_id = + u32_get_bits(info[0], HAL_RX_MPDU_START_INFO0_PPDU_ID); } - mon_mpdu = kzalloc(sizeof(*mon_mpdu), GFP_ATOMIC); - if (!mon_mpdu) - return HAL_RX_MON_STATUS_PPDU_NOT_DONE; - break; } - case HAL_RX_MSDU_START: - /* TODO: add msdu start parsing logic */ + case HAL_RX_PPDU_START_USER_INFO: { + ath12k_dp_mon_hal_rx_parse_receive_user_info(tlv_data, userid, ppdu_info); break; - case HAL_MON_BUF_ADDR: { - struct dp_rxdma_ring *buf_ring = &ab->dp.rxdma_mon_buf_ring; - struct dp_mon_packet_info *packet_info = - (struct dp_mon_packet_info *)tlv_data; - int buf_id = u32_get_bits(packet_info->cookie, - DP_RXDMA_BUF_COOKIE_BUF_ID); - struct sk_buff *msdu; - struct dp_mon_mpdu *mon_mpdu = pmon->mon_mpdu; - struct ath12k_skb_rxcb *rxcb; - - spin_lock_bh(&buf_ring->idr_lock); - msdu = idr_remove(&buf_ring->bufs_idr, buf_id); - spin_unlock_bh(&buf_ring->idr_lock); - - if (unlikely(!msdu)) { - ath12k_warn(ab, "monitor destination with invalid buf_id %d\n", - buf_id); - return HAL_RX_MON_STATUS_PPDU_NOT_DONE; } - - rxcb = ATH12K_SKB_RXCB(msdu); - dma_unmap_single(ab->dev, rxcb->paddr, - msdu->len + skb_tailroom(msdu), - DMA_FROM_DEVICE); - - if (mon_mpdu->tail) - mon_mpdu->tail->next = msdu; - else - mon_mpdu->tail = msdu; - - ath12k_dp_mon_buf_replenish(ab, buf_ring, 1); - + case HAL_PHYRX_OTHER_RECEIVE_INFO: { + struct phyrx_common_user_info *cmn_usr_info = + (struct phyrx_common_user_info *)tlv_data; + ppdu_info->gi = u32_get_bits(__le32_to_cpu(cmn_usr_info->info0), + HAL_RX_PHY_CMN_USER_INFO0_GI); break; } - case HAL_RX_MSDU_END: { - struct rx_msdu_end_qcn9274 *msdu_end = - (struct rx_msdu_end_qcn9274 *)tlv_data; - bool is_first_msdu_in_mpdu; - u16 msdu_end_info; - - msdu_end_info = __le16_to_cpu(msdu_end->info5); - is_first_msdu_in_mpdu = u32_get_bits(msdu_end_info, - RX_MSDU_END_INFO5_FIRST_MSDU); - if (is_first_msdu_in_mpdu) { - pmon->mon_mpdu->head = pmon->mon_mpdu->tail; - pmon->mon_mpdu->tail = NULL; - } + case HAL_MON_DROP: + /* TODO: Drop mpdu counts for the current ppdu can be recorded for + * statistics + */ break; - } + case HAL_MON_BUF_ADDR: + return HAL_RX_MON_STATUS_BUF_ADDR; case HAL_RX_MPDU_END: - list_add_tail(&pmon->mon_mpdu->list, &pmon->dp_rx_mon_mpdu_list); + return HAL_RX_MON_STATUS_MPDU_END; + case HAL_PHYRX_GENERIC_U_SIG: + ath12k_dp_mon_hal_rx_parse_u_sig_hdr(tlv_data, ppdu_info); + break; + case HAL_PHYRX_GENERIC_EHT_SIG: { + /* + * Handle the case where aggregation is in progress + * or the current TLV is one of the TLVs which should be + * aggregated + */ + ppdu_info->tlv_aggr.in_progress = 1; + ppdu_info->tlv_aggr.tlv_tag = tlv_tag; + ppdu_info->tlv_aggr.cur_len = 0; + ppdu_info->eht_flags = 1; + + ath12k_dp_mon_hal_aggr_tlv(ppdu_info, tlv_len, tlv_data); + break; + } case HAL_DUMMY: return HAL_RX_MON_STATUS_BUF_DONE; case HAL_RX_PPDU_END_STATUS_DONE: @@ -862,25 +1706,152 @@ return HAL_RX_MON_STATUS_PPDU_NOT_DONE; } -static void ath12k_dp_mon_rx_msdus_set_payload(struct ath12k *ar, struct sk_buff *msdu) +static void +ath12k_dp_mon_fill_rx_rate(struct ath12k *ar, struct hal_rx_mon_ppdu_info *ppdu_info, + struct ieee80211_rx_status *rx_status) +{ + struct ieee80211_supported_band *sband; + enum rx_msdu_start_pkt_type pkt_type; + u8 rate_mcs, nss, sgi; + bool is_cck; + + pkt_type = ppdu_info->preamble_type; + rate_mcs = ppdu_info->rate; + nss = ppdu_info->nss; + sgi = ppdu_info->gi; + + switch (pkt_type) { + case RX_MSDU_START_PKT_TYPE_11A: + case RX_MSDU_START_PKT_TYPE_11B: + is_cck = (pkt_type == RX_MSDU_START_PKT_TYPE_11B); + if (rx_status->band < NUM_NL80211_BANDS) { + sband = &ar->mac.sbands[rx_status->band]; + rx_status->rate_idx = ath12k_mac_hw_rate_to_idx(sband, rate_mcs, + is_cck); + } + break; + case RX_MSDU_START_PKT_TYPE_11N: + rx_status->encoding = RX_ENC_HT; + if (rate_mcs > ATH12K_HT_MCS_MAX) { + ath12k_warn(ar->ab, + "Received with invalid mcs in HT mode %d\n", + rate_mcs); + break; + } + rx_status->rate_idx = rate_mcs + (8 * (nss - 1)); + if (sgi) + rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI; + break; + case RX_MSDU_START_PKT_TYPE_11AC: + rx_status->encoding = RX_ENC_VHT; + rx_status->rate_idx = rate_mcs; + if (rate_mcs > ATH12K_VHT_MCS_MAX) { + ath12k_warn(ar->ab, + "Received with invalid mcs in VHT mode %d\n", + rate_mcs); + break; + } + if (sgi) + rx_status->enc_flags |= RX_ENC_FLAG_SHORT_GI; + break; + case RX_MSDU_START_PKT_TYPE_11AX: + rx_status->rate_idx = rate_mcs; + if (rate_mcs > ATH12K_HE_MCS_MAX) { + ath12k_warn(ar->ab, + "Received with invalid mcs in HE mode %d\n", + rate_mcs); + break; + } + rx_status->encoding = RX_ENC_HE; + rx_status->he_gi = ath12k_mac_he_gi_to_nl80211_he_gi(sgi); + break; + case RX_MSDU_START_PKT_TYPE_11BE: + rx_status->rate_idx = rate_mcs; + if (rate_mcs > ATH12K_EHT_MCS_MAX) { + ath12k_warn(ar->ab, + "Received with invalid mcs in EHT mode %d\n", + rate_mcs); + break; + } + rx_status->encoding = RX_ENC_EHT; + rx_status->he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi); + break; + default: + ath12k_dbg(ar->ab, ATH12K_DBG_DATA, + "monitor receives invalid preamble type %d" + ,pkt_type); + break; + } +} + +static void +ath12k_dp_mon_fill_rx_stats(struct ath12k *ar, struct hal_rx_mon_ppdu_info *ppdu_info, + struct ieee80211_rx_status *rx_status) { - u32 rx_pkt_offset, l2_hdr_offset; + struct ieee80211_channel *channel; + u32 center_freq; + u8 channel_num; + + rx_status->freq = ppdu_info->freq; + rx_status->bw = ath12k_mac_bw_to_mac80211_bw(ppdu_info->bw); + rx_status->nss = ppdu_info->nss; + rx_status->rate_idx = 0; + rx_status->encoding = RX_ENC_LEGACY; + + rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL; + + channel_num = ppdu_info->chan_num; + center_freq = ppdu_info->freq; + + rx_status->band = NUM_NL80211_BANDS; + + if (center_freq >= ATH12K_MIN_6G_FREQ && + center_freq <= ATH12K_MAX_6G_FREQ) { + rx_status->band = NL80211_BAND_6GHZ; + rx_status->freq = center_freq; + } else if (channel_num >= ATH12K_MIN_2G_CHAN && + channel_num <= ATH12K_MAX_2G_CHAN) { + rx_status->band = NL80211_BAND_2GHZ; + } else if (channel_num >= ATH12K_MIN_5G_CHAN && + channel_num <= ATH12K_MAX_5G_CHAN) { + rx_status->band = NL80211_BAND_5GHZ; + } + + if (unlikely(rx_status->band == NUM_NL80211_BANDS || + !ar->ah->hw->wiphy->bands[rx_status->band])) { + ath12k_dbg(ar->ab, ATH12K_DBG_DATA, + "sband is NULL for status band 1 %d channel_num %d center_freq %d pdev_id %d\n", + rx_status->band, channel_num, center_freq, ar->pdev_idx); + spin_lock_bh(&ar->data_lock); + channel = ar->rx_channel; + if (channel) { + rx_status->band = channel->band; + channel_num = + ieee80211_frequency_to_channel(channel->center_freq); + } else { + ath12k_err(ar->ab, "unable to determine channel, band for rx packet"); + } + spin_unlock_bh(&ar->data_lock); + } + + if (rx_status->band < NUM_NL80211_BANDS) + rx_status->freq = ieee80211_channel_to_frequency(channel_num, + rx_status->band); - rx_pkt_offset = ar->ab->hw_params->hal_desc_sz; - l2_hdr_offset = ath12k_dp_rx_h_l3pad(ar->ab, - (struct hal_rx_desc *)msdu->data); - skb_pull(msdu, rx_pkt_offset + l2_hdr_offset); + ath12k_dp_mon_fill_rx_rate(ar, ppdu_info, rx_status); } +#define DP_MON_RX_PKT_OFFSET 8 +#define DP_MON_RX_L2_HDR_OFFSET 2 + static struct sk_buff * -ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, - u32 mac_id, struct sk_buff *head_msdu, - struct ieee80211_rx_status *rxs, bool *fcs_err) +ath12k_dp_mon_rx_merg_msdus(struct ath12k *ar, u32 mpdu_idx, + struct sk_buff *head_msdu, struct ieee80211_rx_status *rxs, + bool *fcs_err, struct hal_rx_mon_ppdu_info *ppdu_info) { struct ath12k_base *ab = ar->ab; struct sk_buff *msdu, *mpdu_buf, *prev_buf; - struct hal_rx_desc *rx_desc; - u8 *hdr_desc, *dest, decap_format; + u8 *dest, *msdu_payload, decap_format; struct ieee80211_hdr_3addr *wh; u32 err_bitmap; @@ -889,24 +1860,23 @@ if (!head_msdu) goto err_merge_fail; - rx_desc = (struct hal_rx_desc *)head_msdu->data; - err_bitmap = ath12k_dp_rx_h_mpdu_err(ab, rx_desc); + err_bitmap = ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_idx].msdu_info[0].errmap; if (err_bitmap & HAL_RX_MPDU_ERR_FCS) *fcs_err = true; - decap_format = ath12k_dp_rx_h_decap_type(ab, rx_desc); + decap_format = ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_idx].msdu_info[0].decap_format; - ath12k_dp_rx_h_ppdu(ar, rx_desc, rxs); + ath12k_dp_mon_fill_rx_stats(ar, ppdu_info, rxs); if (decap_format == DP_RX_DECAP_TYPE_RAW) { - ath12k_dp_mon_rx_msdus_set_payload(ar, head_msdu); + skb_pull(head_msdu, DP_MON_RX_PKT_OFFSET); prev_buf = head_msdu; msdu = head_msdu->next; while (msdu) { - ath12k_dp_mon_rx_msdus_set_payload(ar, msdu); + skb_pull(msdu, DP_MON_RX_PKT_OFFSET); prev_buf = msdu; msdu = msdu->next; @@ -914,15 +1884,14 @@ prev_buf->next = NULL; - skb_trim(prev_buf, prev_buf->len - HAL_RX_FCS_LEN); + skb_trim(prev_buf, prev_buf->len); } else if (decap_format == DP_RX_DECAP_TYPE_NATIVE_WIFI) { u8 qos_pkt = 0; - rx_desc = (struct hal_rx_desc *)head_msdu->data; - hdr_desc = ab->hw_params->hal_ops->rx_desc_get_msdu_payload(rx_desc); + msdu_payload = head_msdu->data; /* Base size */ - wh = (struct ieee80211_hdr_3addr *)hdr_desc; + wh = (struct ieee80211_hdr_3addr *)msdu_payload; if (ieee80211_is_data_qos(wh->frame_control)) qos_pkt = 1; @@ -930,12 +1899,13 @@ msdu = head_msdu; while (msdu) { - ath12k_dp_mon_rx_msdus_set_payload(ar, msdu); + skb_pull(msdu, DP_MON_RX_L2_HDR_OFFSET); if (qos_pkt) { dest = skb_push(msdu, sizeof(__le16)); if (!dest) goto err_merge_fail; - memcpy(dest, hdr_desc, sizeof(struct ieee80211_qos_hdr)); + memcpy(dest, msdu_payload, + sizeof(struct ieee80211_qos_hdr)); } prev_buf = msdu; msdu = msdu->next; @@ -1014,6 +1984,88 @@ rtap_buf[rtap_len] = rx_status->he_RU[3]; } +static enum nl80211_eht_ru_alloc +ath12k_dp_mon_rx_mon_ru_size_to_nl_ru_size(u32 ru_size) +{ + switch(ru_size) { + case ATH12K_EHT_RU_26: + return NL80211_RATE_INFO_EHT_RU_ALLOC_26; + case ATH12K_EHT_RU_52: + return NL80211_RATE_INFO_EHT_RU_ALLOC_52; + case ATH12K_EHT_RU_52_26: + return NL80211_RATE_INFO_EHT_RU_ALLOC_52P26; + case ATH12K_EHT_RU_106: + return NL80211_RATE_INFO_EHT_RU_ALLOC_106; + case ATH12K_EHT_RU_106_26: + return NL80211_RATE_INFO_EHT_RU_ALLOC_106P26; + case ATH12K_EHT_RU_242: + return NL80211_RATE_INFO_EHT_RU_ALLOC_242; + case ATH12K_EHT_RU_484: + return NL80211_RATE_INFO_EHT_RU_ALLOC_484; + case ATH12K_EHT_RU_484_242: + return NL80211_RATE_INFO_EHT_RU_ALLOC_484P242; + case ATH12K_EHT_RU_996: + return NL80211_RATE_INFO_EHT_RU_ALLOC_996; + case ATH12K_EHT_RU_996x2: + return NL80211_RATE_INFO_EHT_RU_ALLOC_2x996; + case ATH12K_EHT_RU_996x3: + return NL80211_RATE_INFO_EHT_RU_ALLOC_3x996; + case ATH12K_EHT_RU_996x4: + return NL80211_RATE_INFO_EHT_RU_ALLOC_4x996; + case ATH12K_EHT_RU_996_484: + return NL80211_RATE_INFO_EHT_RU_ALLOC_996P484; + case ATH12K_EHT_RU_996x2_484: + return NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484; + case ATH12K_EHT_RU_996x3_484: + return NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484; + case ATH12K_EHT_RU_996_484_242: + return NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242; + default: + return NL80211_RATE_INFO_EHT_RU_ALLOC_26; + } +} + +static void +ath12k_dp_mon_rx_update_radiotap_u_sig(struct hal_rx_mon_ppdu_info *rx_status, + u8 *rtap_buf) +{ + u32 rtap_len = 0; + + put_unaligned_le32(rx_status->usig_common, &rtap_buf[rtap_len]); + rtap_len += 4; + + put_unaligned_le32(rx_status->usig_value, &rtap_buf[rtap_len]); + rtap_len += 4; + + put_unaligned_le32(rx_status->usig_mask, &rtap_buf[rtap_len]); +} + +static void +ath12k_dp_mon_rx_update_radiotap_eht(struct hal_rx_mon_ppdu_info *rx_status, + u8 *rtap_buf) +{ + u32 rtap_len = 0, user, i; + + put_unaligned_le32(rx_status->eht_known, &rtap_buf[rtap_len]); + rtap_len += 4; + + for (i = 0; i < ARRAY_SIZE(rx_status->eht_data); i++) { + put_unaligned_le32(rx_status->eht_data[i], + &rtap_buf[rtap_len]); + rtap_len += 4; + } + + if (rx_status->num_eht_user_info_valid > EHT_MAX_USER_INFO) + return; + + for (user = 0; user < rx_status->num_eht_user_info_valid; user++) { + put_unaligned_le32(rx_status->eht_user_info[user], + &rtap_buf[rtap_len]); + rtap_len += 4; + } +} + + static void ath12k_dp_mon_update_radiotap(struct ath12k *ar, struct hal_rx_mon_ppdu_info *ppduinfo, struct sk_buff *mon_skb, @@ -1022,24 +2074,67 @@ struct ieee80211_supported_band *sband; u8 *ptr = NULL; u16 ampdu_id = ppduinfo->ampdu_id[ppduinfo->userid]; + u32 ru_size; + bool ampdu_present = ppduinfo->userstats[ppduinfo->userid].ampdu_present; rxs->flag |= RX_FLAG_MACTIME_START; - rxs->signal = ppduinfo->rssi_comb + ATH12K_DEFAULT_NOISE_FLOOR; + rxs->signal = ppduinfo->rssi_comb + ar->rssi_offsets.rssi_offset; rxs->nss = ppduinfo->nss + 1; - if (ampdu_id) { + if (ampdu_present) { rxs->flag |= RX_FLAG_AMPDU_DETAILS; rxs->ampdu_reference = ampdu_id; } - if (ppduinfo->he_mu_flags) { + if (ppduinfo->usig_flags) { + struct ieee80211_radiotap_tlv *tlv; + struct ieee80211_radiotap_eht_usig *usig; + int usig_len = sizeof (*usig); + int len; + + if (!(rxs->flag & RX_FLAG_RADIOTAP_TLV_AT_END)) + skb_reset_mac_header(mon_skb); + rxs->flag |= RX_FLAG_RADIOTAP_TLV_AT_END; + rxs->encoding = RX_ENC_EHT; + len = sizeof(*tlv) + ALIGN(usig_len, 4); + tlv = skb_push(mon_skb, len); + memset(tlv, 0, len); + tlv->type = cpu_to_le16(IEEE80211_RADIOTAP_EHT_USIG); + tlv->len = cpu_to_le16(usig_len); + ptr = tlv->data; + ath12k_dp_mon_rx_update_radiotap_u_sig(ppduinfo, ptr); + } + + if (ppduinfo->eht_flags) { + struct ieee80211_radiotap_tlv *tlv; + struct ieee80211_radiotap_eht *eht; + int eht_len = struct_size(eht, user_info, + ppduinfo->num_eht_user_info_valid); + int len; + + rxs->flag |= RX_FLAG_RADIOTAP_TLV_AT_END; + rxs->encoding = RX_ENC_EHT; + + len = sizeof(*tlv) + ALIGN(eht_len, 4); + skb_reset_mac_header(mon_skb); + tlv = skb_push(mon_skb, len); + memset(tlv, 0, len); + tlv->type = cpu_to_le16(IEEE80211_RADIOTAP_EHT); + tlv->len = cpu_to_le16(eht_len); + ptr = tlv->data; + ath12k_dp_mon_rx_update_radiotap_eht(ppduinfo, ptr); + } else if (ppduinfo->he_mu_flags) { rxs->flag |= RX_FLAG_RADIOTAP_HE_MU; rxs->encoding = RX_ENC_HE; - ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he_mu)); + ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he_mu)) +; ath12k_dp_mon_rx_update_radiotap_he_mu(ppduinfo, ptr); + rxs->ampdu_reference = ampdu_id; } else if (ppduinfo->he_flags) { rxs->flag |= RX_FLAG_RADIOTAP_HE; rxs->encoding = RX_ENC_HE; + ru_size = ppduinfo->userstats[ppduinfo->userid].ul_ofdma_ru_size; + rxs->eht.ru = ath12k_dp_mon_rx_mon_ru_size_to_nl_ru_size(ru_size); ptr = skb_push(mon_skb, sizeof(struct ieee80211_radiotap_he)); ath12k_dp_mon_rx_update_radiotap_he(ppduinfo, ptr); rxs->rate_idx = ppduinfo->rate; @@ -1060,15 +2155,16 @@ } static void ath12k_dp_mon_rx_deliver_msdu(struct ath12k *ar, struct napi_struct *napi, - struct sk_buff *msdu, - struct ieee80211_rx_status *status) + struct sk_buff *msdu, u32 mpdu_idx, + struct hal_rx_mon_ppdu_info *ppduinfo, + struct ath12k_dp_rx_info *rx_info) { static const struct ieee80211_radiotap_he known = { .data1 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA1_DATA_MCS_KNOWN | IEEE80211_RADIOTAP_HE_DATA1_BW_RU_ALLOC_KNOWN), .data2 = cpu_to_le16(IEEE80211_RADIOTAP_HE_DATA2_GI_KNOWN), }; - struct ieee80211_rx_status *rx_status; + struct ieee80211_rx_status *rx_status, *status = rx_info->rx_status; struct ieee80211_radiotap_he *he = NULL; struct ieee80211_sta *pubsta = NULL; struct ath12k_peer *peer; @@ -1084,16 +2180,24 @@ status->flag |= RX_FLAG_RADIOTAP_HE; } + status->link_valid = 0; + status->link_id = 0; + if (!(status->flag & RX_FLAG_ONLY_MONITOR)) - decap = ath12k_dp_rx_h_decap_type(ar->ab, rxcb->rx_desc); + decap = ppduinfo->cmn_mpdu_info.mon_mpdu[mpdu_idx].msdu_info[0].decap_format; spin_lock_bh(&ar->ab->base_lock); - peer = ath12k_dp_rx_h_find_peer(ar->ab, msdu); - if (peer && peer->sta) + peer = ath12k_peer_find_by_id(ar->ab, ppduinfo->peer_id); + if (peer && peer->sta) { pubsta = peer->sta; + if (pubsta->valid_links) { + status->link_valid = 1; + status->link_id = peer->link_id; + } + } spin_unlock_bh(&ar->ab->base_lock); ath12k_dbg(ar->ab, ATH12K_DBG_DATA, - "rx skb %pK len %u peer %pM %u %s %s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n", + "rx skb %pK len %u peer %pM %u %s %s%s%s%s%s%s%s%s %srate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n", msdu, msdu->len, peer ? peer->addr : NULL, @@ -1106,6 +2210,7 @@ (status->bw == RATE_INFO_BW_40) ? "40" : "", (status->bw == RATE_INFO_BW_80) ? "80" : "", (status->bw == RATE_INFO_BW_160) ? "160" : "", + (status->bw == RATE_INFO_BW_320) ? "320" : "", status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "", status->rate_idx, status->nss, @@ -1131,10 +2236,10 @@ !(is_mcbc && rx_status->flag & RX_FLAG_DECRYPTED)) rx_status->flag |= RX_FLAG_8023; - ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); + ieee80211_rx_napi(ar->ah->hw, pubsta, msdu, napi); } -static int ath12k_dp_mon_rx_deliver(struct ath12k *ar, u32 mac_id, +static int ath12k_dp_mon_rx_deliver(struct ath12k *ar, u32 mpdu_idx, struct sk_buff *head_msdu, struct hal_rx_mon_ppdu_info *ppduinfo, struct napi_struct *napi) @@ -1142,10 +2247,14 @@ struct ath12k_pdev_dp *dp = &ar->dp; struct sk_buff *mon_skb, *skb_next, *header; struct ieee80211_rx_status *rxs = &dp->rx_status; + struct ath12k_dp_rx_info rx_info; bool fcs_err = false; - mon_skb = ath12k_dp_mon_rx_merg_msdus(ar, mac_id, head_msdu, - rxs, &fcs_err); + rx_info.filled = 0; + rx_info.rx_status = rxs; + + mon_skb = ath12k_dp_mon_rx_merg_msdus(ar, mpdu_idx, head_msdu, + rxs, &fcs_err, ppduinfo); if (!mon_skb) goto mon_deliver_fail; @@ -1170,7 +2279,8 @@ } rxs->flag |= RX_FLAG_ONLY_MONITOR; ath12k_dp_mon_update_radiotap(ar, ppduinfo, mon_skb, rxs); - ath12k_dp_mon_rx_deliver_msdu(ar, napi, mon_skb, rxs); + ath12k_dp_mon_rx_deliver_msdu(ar, napi, mon_skb, mpdu_idx, + ppduinfo, &rx_info); mon_skb = skb_next; } while (mon_skb); rxs->flag = 0; @@ -1187,24 +2297,159 @@ return -EINVAL; } +static int ath12k_dp_pkt_set_pktlen(struct sk_buff *skb, u32 len) +{ + if (skb->len > len) { + skb_trim(skb, len); + } else { + if (skb_tailroom(skb) < len - skb->len) { + if ((pskb_expand_head(skb, 0, + len - skb->len - skb_tailroom(skb), + GFP_ATOMIC))) { + dev_kfree_skb_any(skb); + return -ENOMEM; + } + } + + skb_put(skb, (len - skb->len)); + } + + return 0; +} + +static void +ath12k_dp_mon_parse_rx_msdu_end(u8 *tlv_data, struct hal_rx_mon_ppdu_info *ppdu_info) +{ + struct rx_msdu_end_qcn9274 *msdu_end = + (struct rx_msdu_end_qcn9274 *)tlv_data; + u32 info = __le32_to_cpu(msdu_end->info13); + u32 errmap = 0, mpdu_idx, msdu_idx, decap_format; + + if (info & RX_MSDU_END_INFO13_FCS_ERR) + errmap |= HAL_RX_MPDU_ERR_FCS; + + if (info & RX_MSDU_END_INFO13_DECRYPT_ERR) + errmap |= HAL_RX_MPDU_ERR_DECRYPT; + + if (info & RX_MSDU_END_INFO13_TKIP_MIC_ERR) + errmap |= HAL_RX_MPDU_ERR_TKIP_MIC; + + if (info & RX_MSDU_END_INFO13_A_MSDU_ERROR) + errmap |= HAL_RX_MPDU_ERR_AMSDU_ERR; + + if (info & RX_MSDU_END_INFO13_OVERFLOW_ERR) + errmap |= HAL_RX_MPDU_ERR_OVERFLOW; + + if (info & RX_MSDU_END_INFO13_MSDU_LEN_ERR) + errmap |= HAL_RX_MPDU_ERR_MSDU_LEN; + + if (info & RX_MSDU_END_INFO13_MPDU_LEN_ERR) + errmap |= HAL_RX_MPDU_ERR_MPDU_LEN; + + decap_format = u32_get_bits(info, RX_MSDU_END_INFO11_DECAP_FORMAT); + + mpdu_idx = ppdu_info->cmn_mpdu_info.mpdu_count; + msdu_idx = ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_idx].msdu_count; + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_idx].msdu_info[msdu_idx].errmap = errmap; + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_idx].msdu_info[msdu_idx].decap_format = decap_format; +} + +static void +ath12k_dp_mon_parse_rx_dest_tlv(struct ath12k *ar, + struct hal_rx_mon_ppdu_info *ppdu_info, + enum hal_rx_mon_status hal_status, u8 *tlv_data) +{ + int offset; + + if (ppdu_info->cmn_mpdu_info.mpdu_count > HAL_RX_MAX_MPDU) { + ath12k_warn(ar->ab, "MPDU count reached max limit\n"); + return; + } + + switch (hal_status) { + case HAL_RX_MON_STATUS_BUF_ADDR: { + struct dp_mon_packet_info *packet_info = + (struct dp_mon_packet_info *)tlv_data; + int buf_id = u32_get_bits(packet_info->cookie, + DP_RXDMA_BUF_COOKIE_BUF_ID); + struct sk_buff *msdu; + struct ath12k_skb_rxcb *rxcb; + struct dp_rxdma_ring *buf_ring; + struct ath12k_dp *dp = &ar->ab->dp; + u16 msdu_count, mpdu_count; + + buf_ring = &dp->rxdma_mon_buf_ring; + spin_lock_bh(&buf_ring->idr_lock); + msdu = idr_remove(&buf_ring->bufs_idr, buf_id); + spin_unlock_bh(&buf_ring->idr_lock); + + if (unlikely(!msdu)) { + ath12k_warn(ar->ab, + "mon buf_addr: dest desc with inval buf_id %d\n", + buf_id); + return; + } + + rxcb = ATH12K_SKB_RXCB(msdu); + dma_unmap_single(ar->ab->dev, rxcb->paddr, + msdu->len + skb_tailroom(msdu), + DMA_FROM_DEVICE); + + offset = packet_info->dma_length + ATH12K_WIFIRX_DOT11_OFFSET; + + mpdu_count = ppdu_info->cmn_mpdu_info.mpdu_count; + msdu_count = ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].msdu_count; + if (ath12k_dp_pkt_set_pktlen(msdu, offset) || + msdu_count >= HAL_RX_MAX_MSDU) { + dev_kfree_skb_any(msdu); + return; + } + + if (!msdu_count) + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].head_msdu = msdu; + else + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].tail_msdu->next = msdu; + + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].tail_msdu = msdu; + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].msdu_count++; + + ath12k_dp_mon_buf_replenish(ar->ab, buf_ring, 1); + break; + } + case HAL_RX_MON_STATUS_MPDU_END: { + u16 mpdu_count = ppdu_info->cmn_mpdu_info.mpdu_count; + + if (ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].msdu_count) + ppdu_info->cmn_mpdu_info.mon_mpdu[mpdu_count].tail_msdu->next = NULL; + ppdu_info->cmn_mpdu_info.mpdu_count++; + break; + } + case HAL_RX_MON_STATUS_MSDU_END: + ath12k_dp_mon_parse_rx_msdu_end(tlv_data, ppdu_info); + default: + break; + } +} + static enum hal_rx_mon_status -ath12k_dp_mon_parse_rx_dest(struct ath12k_base *ab, struct ath12k_mon_data *pmon, +ath12k_dp_mon_parse_rx_dest(struct ath12k *ar, struct hal_rx_mon_ppdu_info *ppdu_info, struct sk_buff *skb) { - struct hal_rx_mon_ppdu_info *ppdu_info = &pmon->mon_ppdu_info; - struct hal_tlv_hdr *tlv; - enum hal_rx_mon_status hal_status; + struct hal_tlv_64_hdr *tlv; + struct hal_tlv_parsed_hdr tlv_parsed_hdr = {0}; + struct ath12k_skb_rxcb *rxcb; + enum hal_rx_mon_status hal_status = HAL_RX_MON_STATUS_BUF_DONE; u32 tlv_userid = 0; u16 tlv_tag, tlv_len; u8 *ptr = skb->data; - memset(ppdu_info, 0, sizeof(struct hal_rx_mon_ppdu_info)); + bool montior_started = test_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags); do { - tlv = (struct hal_tlv_hdr *)ptr; - tlv_tag = le32_get_bits(tlv->tl, HAL_TLV_HDR_TAG); - tlv_len = le32_get_bits(tlv->tl, HAL_TLV_HDR_LEN); - tlv_userid = le32_get_bits(tlv->tl, HAL_TLV_USR_ID); + tlv = (struct hal_tlv_64_hdr *)ptr; + tlv_tag = u64_get_bits(tlv->tl, HAL_TLV_64_HDR_TAG); + tlv_len = u64_get_bits(tlv->tl, HAL_TLV_64_HDR_LEN); + tlv_userid = u64_get_bits(tlv->tl, HAL_TLV_USR_ID); ptr += sizeof(*tlv); /* The actual length of PPDU_END is the combined length of many PHY @@ -1216,46 +2461,62 @@ if (tlv_tag == HAL_RX_PPDU_END) tlv_len = sizeof(struct hal_rx_rxpcu_classification_overview); - hal_status = ath12k_dp_mon_rx_parse_status_tlv(ab, pmon, - tlv_tag, ptr, tlv_userid); + tlv_parsed_hdr.tlv_tag = tlv_tag; + tlv_parsed_hdr.tlv_len = tlv_len; + tlv_parsed_hdr.tlv_userid = tlv_userid; + tlv_parsed_hdr.tlv_data = ptr; + + hal_status = ath12k_dp_mon_rx_parse_status_tlv(ar->ab, ppdu_info, + &tlv_parsed_hdr); + + if (montior_started) + ath12k_dp_mon_parse_rx_dest_tlv(ar, ppdu_info, + hal_status, ptr); + ptr += tlv_len; - ptr = PTR_ALIGN(ptr, HAL_TLV_ALIGN); + ptr = PTR_ALIGN(ptr, HAL_TLV_64_ALIGN); - if ((ptr - skb->data) >= DP_RX_BUFFER_SIZE) + if ((ptr - skb->data) >= skb->len + 1) break; - } while (hal_status == HAL_RX_MON_STATUS_PPDU_NOT_DONE); + } while ((hal_status == HAL_RX_MON_STATUS_PPDU_NOT_DONE) || + (hal_status == HAL_RX_MON_STATUS_BUF_ADDR) || + (hal_status == HAL_RX_MON_STATUS_MPDU_END) || + (hal_status == HAL_RX_MON_STATUS_MSDU_END)); + + rxcb = ATH12K_SKB_RXCB(skb); + if (rxcb->is_end_of_ppdu) + hal_status = HAL_RX_MON_STATUS_PPDU_DONE; return hal_status; } enum hal_rx_mon_status ath12k_dp_mon_rx_parse_mon_status(struct ath12k *ar, - struct ath12k_mon_data *pmon, + struct hal_rx_mon_ppdu_info *ppdu_info, int mac_id, struct sk_buff *skb, struct napi_struct *napi) { - struct ath12k_base *ab = ar->ab; - struct hal_rx_mon_ppdu_info *ppdu_info = &pmon->mon_ppdu_info; - struct dp_mon_mpdu *tmp; - struct dp_mon_mpdu *mon_mpdu = pmon->mon_mpdu; - struct sk_buff *head_msdu, *tail_msdu; + struct mon_mpdu_data *mon_mpdu; + struct sk_buff *head_msdu; enum hal_rx_mon_status hal_status = HAL_RX_MON_STATUS_BUF_DONE; + int i; - ath12k_dp_mon_parse_rx_dest(ab, pmon, skb); + hal_status = ath12k_dp_mon_parse_rx_dest(ar, ppdu_info, skb); + if (hal_status != HAL_RX_MON_STATUS_PPDU_DONE) + return hal_status; - list_for_each_entry_safe(mon_mpdu, tmp, &pmon->dp_rx_mon_mpdu_list, list) { - list_del(&mon_mpdu->list); - head_msdu = mon_mpdu->head; - tail_msdu = mon_mpdu->tail; + for (i = 0; i < ppdu_info->cmn_mpdu_info.mpdu_count; i++) { + mon_mpdu = &ppdu_info->cmn_mpdu_info.mon_mpdu[i]; + if (!mon_mpdu) + continue; - if (head_msdu && tail_msdu) { - ath12k_dp_mon_rx_deliver(ar, mac_id, head_msdu, - ppdu_info, napi); - } + head_msdu = mon_mpdu->head_msdu; - kfree(mon_mpdu); + if (head_msdu) + ath12k_dp_mon_rx_deliver(ar, i, head_msdu, + ppdu_info, napi); } return hal_status; } @@ -1312,6 +2573,7 @@ mon_buf->paddr_lo = cpu_to_le32(lower_32_bits(paddr)); mon_buf->paddr_hi = cpu_to_le32(upper_32_bits(paddr)); mon_buf->cookie = cpu_to_le64(cookie); + mon_buf->magic = DP_MON_MAGIC_VALUE; req_entries--; } @@ -1604,6 +2866,9 @@ tx_ppdu_info = ath12k_dp_mon_hal_tx_ppdu_info(pmon, tlv_tag); + if (tlv_tag == HAL_MON_BUF_ADDR && !ab->hw_params->supports_tx_monitor) + return status; + switch (tlv_tag) { case HAL_TX_FES_SETUP: { struct hal_tx_fes_setup *tx_fes_setup = @@ -2056,163 +3321,122 @@ return tlv_status; } -int ath12k_dp_mon_srng_process(struct ath12k *ar, int mac_id, int *budget, - enum dp_monitor_mode monitor_mode, - struct napi_struct *napi) +static void +ath12k_dp_mon_rx_update_peer_rate_table_stats(struct ath12k_rx_peer_stats *rx_stats, + struct hal_rx_mon_ppdu_info *ppdu_info, + struct hal_rx_user_status *user_stats, + u32 num_msdu) { - struct hal_mon_dest_desc *mon_dst_desc; - struct ath12k_pdev_dp *pdev_dp = &ar->dp; - struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&pdev_dp->mon_data; - struct ath12k_base *ab = ar->ab; - struct ath12k_dp *dp = &ab->dp; - struct sk_buff *skb; - struct ath12k_skb_rxcb *rxcb; - struct dp_srng *mon_dst_ring; - struct hal_srng *srng; - struct dp_rxdma_ring *buf_ring; - u64 cookie; - u32 ppdu_id; - int num_buffs_reaped = 0, srng_id, buf_id; - u8 dest_idx = 0, i; - bool end_of_ppdu; - struct hal_rx_mon_ppdu_info *ppdu_info; - struct ath12k_peer *peer = NULL; + u32 mcs_idx = (user_stats) ? user_stats->mcs : ppdu_info->mcs; + u32 nss_idx = (user_stats) ? user_stats->nss - 1 : ppdu_info->nss - 1; + u32 bw_idx = ppdu_info->bw; + u32 gi_idx = ppdu_info->gi; - ppdu_info = &pmon->mon_ppdu_info; - memset(ppdu_info, 0, sizeof(*ppdu_info)); - ppdu_info->peer_id = HAL_INVALID_PEERID; + if (mcs_idx > HAL_RX_MAX_MCS_BE || nss_idx >= HAL_RX_MAX_NSS || + bw_idx >= HAL_RX_BW_MAX || gi_idx >= HAL_RX_GI_MAX) { + return; + } - srng_id = ath12k_hw_mac_id_to_srng_id(ab->hw_params, mac_id); + if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AX || + ppdu_info->preamble_type == HAL_RX_PREAMBLE_11BE) + gi_idx = ath12k_he_gi_to_nl80211_he_gi(ppdu_info->gi); - if (monitor_mode == ATH12K_DP_RX_MONITOR_MODE) { - mon_dst_ring = &pdev_dp->rxdma_mon_dst_ring[srng_id]; - buf_ring = &dp->rxdma_mon_buf_ring; - } else { - mon_dst_ring = &pdev_dp->tx_mon_dst_ring[srng_id]; - buf_ring = &dp->tx_mon_buf_ring; + rx_stats->pkt_stats.rx_rate[bw_idx][gi_idx][nss_idx][mcs_idx] += num_msdu; + if (user_stats) + rx_stats->byte_stats.rx_rate[bw_idx][gi_idx][nss_idx][mcs_idx] += user_stats->mpdu_ok_byte_count; + else + rx_stats->byte_stats.rx_rate[bw_idx][gi_idx][nss_idx][mcs_idx] += ppdu_info->mpdu_len; } - srng = &ab->hal.srng_list[mon_dst_ring->ring_id]; - - spin_lock_bh(&srng->lock); - ath12k_hal_srng_access_begin(ab, srng); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +static void ath12k_dp_mon_rx_update_peer_stats_bonded(struct ath12k *ar, + struct ath12k_link_sta *arsta, + struct hal_rx_mon_ppdu_info *ppdu_info, + struct ieee80211_rx_status *rx_status) +{ + struct ieee80211_rx_status status; + struct ieee80211_sta *sta; + u32 uid; - while (likely(*budget)) { - *budget -= 1; - mon_dst_desc = ath12k_hal_srng_dst_peek(ab, srng); - if (unlikely(!mon_dst_desc)) - break; + if (ar->ab->stats_disable || !g_bonded_interface_model || + !test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ar->ab->dev_flags)) + return; - cookie = le32_to_cpu(mon_dst_desc->cookie); - buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID); + memset(&status, 0 , sizeof(status)); - spin_lock_bh(&buf_ring->idr_lock); - skb = idr_remove(&buf_ring->bufs_idr, buf_id); - spin_unlock_bh(&buf_ring->idr_lock); + lockdep_assert_held(&ar->ab->base_lock); + if (arsta) { // SU stats + if (arsta->arvif && (arsta->arvif->ppe_vp_num == -1 || + (arsta->arvif->ahvif && + hweight16(arsta->arvif->ahvif->links_map) <= 1))) + return; - if (unlikely(!skb)) { - ath12k_warn(ab, "monitor destination with invalid buf_id %d\n", - buf_id); - goto move_next; + if (!rx_status) { + ath12k_dp_mon_fill_rx_stats(ar, ppdu_info, &status); + rx_status = &status; } - rxcb = ATH12K_SKB_RXCB(skb); - dma_unmap_single(ab->dev, rxcb->paddr, - skb->len + skb_tailroom(skb), - DMA_FROM_DEVICE); - - pmon->dest_skb_q[dest_idx] = skb; - dest_idx++; - ppdu_id = le32_to_cpu(mon_dst_desc->ppdu_id); - end_of_ppdu = le32_get_bits(mon_dst_desc->info0, - HAL_MON_DEST_INFO0_END_OF_PPDU); - if (!end_of_ppdu) - continue; + sta = container_of((void *)arsta->ahsta, struct ieee80211_sta, drv_priv); + ieee80211_rx_update_stats(ar->ah->hw, sta, arsta->link_id, + ppdu_info->mpdu_len, rx_status); + return; + } - for (i = 0; i < dest_idx; i++) { - skb = pmon->dest_skb_q[i]; + for (uid = 0; uid < ppdu_info->num_users; uid++) { // MU stats + struct ath12k_peer *peer; - if (monitor_mode == ATH12K_DP_RX_MONITOR_MODE) - ath12k_dp_mon_rx_parse_mon_status(ar, pmon, mac_id, - skb, napi); - else - ath12k_dp_mon_tx_parse_mon_status(ar, pmon, mac_id, - skb, napi, ppdu_id); + if (uid == HAL_MAX_UL_MU_USERS) + break; - peer = ath12k_peer_find_by_id(ab, ppdu_info->peer_id); + if (ppdu_info->peer_id == HAL_INVALID_PEERID) + return; + peer = ath12k_peer_find_by_id(ar->ab, ppdu_info->peer_id); - if (!peer || !peer->sta) { - ath12k_dbg(ab, ATH12K_DBG_DATA, - "failed to find the peer with peer_id %d\n", + if (!peer) { + ath12k_warn(ar->ab, "peer with peer id %d can't be found\n", ppdu_info->peer_id); - dev_kfree_skb_any(skb); continue; } - dev_kfree_skb_any(skb); - pmon->dest_skb_q[i] = NULL; - } - - dest_idx = 0; -move_next: - ath12k_dp_mon_buf_replenish(ab, buf_ring, 1); - ath12k_hal_srng_src_get_next_entry(ab, srng); - num_buffs_reaped++; - } - - ath12k_hal_srng_access_end(ab, srng); - spin_unlock_bh(&srng->lock); - - return num_buffs_reaped; + arsta = ath12k_peer_get_link_sta(ar->ab, peer); + if (!arsta) { + ath12k_warn(ar->ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + continue; } -static void -ath12k_dp_mon_rx_update_peer_rate_table_stats(struct ath12k_rx_peer_stats *rx_stats, - struct hal_rx_mon_ppdu_info *ppdu_info, - struct hal_rx_user_status *user_stats, - u32 num_msdu) -{ - u32 rate_idx = 0; - u32 mcs_idx = (user_stats) ? user_stats->mcs : ppdu_info->mcs; - u32 nss_idx = (user_stats) ? user_stats->nss - 1 : ppdu_info->nss - 1; - u32 bw_idx = ppdu_info->bw; - u32 gi_idx = ppdu_info->gi; + if (arsta->arvif && (arsta->arvif->ppe_vp_num == -1 || + (arsta->arvif->ahvif && + hweight16(arsta->arvif->ahvif->links_map) <= 1))) + continue; - if ((mcs_idx > HAL_RX_MAX_MCS_HE) || (nss_idx >= HAL_RX_MAX_NSS) || - (bw_idx >= HAL_RX_BW_MAX) || (gi_idx >= HAL_RX_GI_MAX)) { - return; + if (!rx_status) { + ath12k_dp_mon_fill_rx_stats(ar, ppdu_info, &status); + rx_status = &status; } - if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11N || - ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AC) { - rate_idx = mcs_idx * 8 + 8 * 10 * nss_idx; - rate_idx += bw_idx * 2 + gi_idx; - } else if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11AX) { - gi_idx = ath12k_he_gi_to_nl80211_he_gi(ppdu_info->gi); - rate_idx = mcs_idx * 12 + 12 * 12 * nss_idx; - rate_idx += bw_idx * 3 + gi_idx; - } else { - return; + sta = container_of((void *)arsta->ahsta, struct ieee80211_sta, drv_priv); + ieee80211_rx_update_stats(ar->ah->hw, sta, arsta->link_id, + ppdu_info->mpdu_len, rx_status); } - - rx_stats->pkt_stats.rx_rate[rate_idx] += num_msdu; - if (user_stats) - rx_stats->byte_stats.rx_rate[rate_idx] += user_stats->mpdu_ok_byte_count; - else - rx_stats->byte_stats.rx_rate[rate_idx] += ppdu_info->mpdu_len; } +#endif /* CONFIG_ATH12K_BONDED_DS_SUPPORT */ static void ath12k_dp_mon_rx_update_peer_su_stats(struct ath12k *ar, - struct ath12k_sta *arsta, + struct ath12k_link_sta *arsta, struct hal_rx_mon_ppdu_info *ppdu_info) { struct ath12k_rx_peer_stats *rx_stats = arsta->rx_stats; u32 num_msdu; + u32 bw_offset; - if (!rx_stats) - return; - + arsta->last_tx_pkt_bw = ppdu_info->bw; + bw_offset = arsta->last_tx_pkt_bw * 3; arsta->rssi_comb = ppdu_info->rssi_comb; + ewma_avg_rssi_add(&arsta->avg_rssi, ppdu_info->rssi_comb + bw_offset); + + if (!ath12k_debugfs_is_extd_rx_stats_enabled(ar) || !rx_stats) + return; num_msdu = ppdu_info->tcp_msdu_count + ppdu_info->tcp_ack_msdu_count + ppdu_info->udp_msdu_count + ppdu_info->other_msdu_count; @@ -2285,6 +3509,12 @@ rx_stats->byte_stats.he_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; } + if (ppdu_info->preamble_type == HAL_RX_PREAMBLE_11BE && + ppdu_info->mcs <= HAL_RX_MAX_MCS_BE) { + rx_stats->pkt_stats.be_mcs_count[ppdu_info->mcs] += num_msdu; + rx_stats->byte_stats.be_mcs_count[ppdu_info->mcs] += ppdu_info->mpdu_len; + } + if ((ppdu_info->preamble_type == HAL_RX_PREAMBLE_11A || ppdu_info->preamble_type == HAL_RX_PREAMBLE_11B) && ppdu_info->rate < HAL_RX_LEGACY_RATE_INVALID) { @@ -2359,26 +3589,31 @@ struct hal_rx_mon_ppdu_info *ppdu_info, u32 uid) { - struct ath12k_sta *arsta = NULL; + struct ath12k_link_sta *arsta; struct ath12k_rx_peer_stats *rx_stats = NULL; struct hal_rx_user_status *user_stats = &ppdu_info->userstats[uid]; struct ath12k_peer *peer; u32 num_msdu; - if (user_stats->ast_index == 0 || user_stats->ast_index == 0xFFFF) + if (ppdu_info->peer_id == HAL_INVALID_PEERID) return; - peer = ath12k_peer_find_by_ast(ar->ab, user_stats->ast_index); + peer = ath12k_peer_find_by_id(ar->ab, ppdu_info->peer_id); if (!peer) { - ath12k_warn(ar->ab, "peer ast idx %d can't be found\n", - user_stats->ast_index); + ath12k_warn(ar->ab, "peer with peer id %d can't be found\n", + ppdu_info->peer_id); return; } - arsta = (struct ath12k_sta *)peer->sta->drv_priv; - rx_stats = arsta->rx_stats; + arsta = ath12k_peer_get_link_sta(ar->ab, peer); + if (!arsta) { + ath12k_warn(ar->ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + return; + } + rx_stats = arsta->rx_stats; if (!rx_stats) return; @@ -2461,6 +3696,9 @@ { u32 num_users, i; + if (!ath12k_debugfs_is_extd_rx_stats_enabled(ar)) + return; + num_users = ppdu_info->num_users; if (num_users > HAL_MAX_UL_MU_USERS) num_users = HAL_MAX_UL_MU_USERS; @@ -2469,12 +3707,213 @@ ath12k_dp_mon_rx_update_user_stats(ar, ppdu_info, i); } +static inline void +ath12k_dp_mon_rx_memset_ppdu_info(struct hal_rx_mon_ppdu_info *ppdu_info) +{ + int i, len; + + len = (sizeof(struct hal_rx_mon_ppdu_info) - + sizeof(struct hal_rx_mon_cmn_mpdu_info)); + + memset(ppdu_info, 0, len); + for (i = 0; i < ppdu_info->cmn_mpdu_info.mpdu_count; i++) { + ppdu_info->cmn_mpdu_info.mon_mpdu[i].msdu_count = 0; + ppdu_info->cmn_mpdu_info.mon_mpdu[i].head_msdu = NULL; + ppdu_info->cmn_mpdu_info.mon_mpdu[i].tail_msdu = NULL; + } + ppdu_info->cmn_mpdu_info.mpdu_count = 0; +} + +int ath12k_dp_mon_srng_process(struct ath12k *ar, int mac_id, int *budget, + enum dp_monitor_mode dp_mon_mode, struct napi_struct *napi) +{ + struct hal_mon_dest_desc *mon_dst_desc; + struct ath12k_pdev_dp *pdev_dp = &ar->dp; + struct ath12k_mon_data *pmon = pdev_dp->mon_data; + struct ath12k_base *ab = ar->ab; + struct ath12k_dp *dp = &ab->dp; + struct sk_buff *skb; + struct ath12k_skb_rxcb *rxcb; + struct dp_srng *mon_dst_ring; + struct hal_srng *srng; + struct dp_rxdma_ring *buf_ring; + struct hal_rx_mon_ppdu_info *ppdu_info = &pmon->mon_ppdu_info; + struct sk_buff_head skb_list; + struct ath12k_peer *peer = NULL; + struct ath12k_link_sta *arsta; + u64 cookie; + u32 hal_status, end_reason, ppdu_id, end_offset; + int num_buffs_reaped = 0, srng_id, buf_id; + char buf[64] = {0}; + + __skb_queue_head_init(&skb_list); + + srng_id = ath12k_hw_mac_id_to_srng_id(ab->hw_params, mac_id); + + if (dp_mon_mode == ATH12K_DP_RX_MONITOR_MODE) { + mon_dst_ring = &pdev_dp->rxdma_mon_dst_ring[srng_id]; + buf_ring = &dp->rxdma_mon_buf_ring; + } else { + if (!ab->hw_params->supports_tx_monitor) + return 0; + + mon_dst_ring = &pdev_dp->tx_mon_dst_ring[srng_id]; + buf_ring = &dp->tx_mon_buf_ring; + } + + srng = &ab->hal.srng_list[mon_dst_ring->ring_id]; + spin_lock_bh(&srng->lock); + ath12k_hal_srng_access_begin(ab, srng); + + while (likely(*budget)) { + mon_dst_desc = (struct hal_mon_dest_desc *) + ath12k_hal_srng_dst_peek(ab, srng); + if (unlikely(!mon_dst_desc)) + break; + + if (u32_get_bits(mon_dst_desc->info0, HAL_MON_DEST_INFO0_EMPTY_DESC)) { + ab->soc_stats.mon_drop_desc++; + goto move_next; + } + + if (unlikely(mon_dst_desc->magic != DP_MON_MAGIC_VALUE)) { + scnprintf(buf, sizeof(buf), "invalid mon dest desc in mon srng process\n"); + ath12k_err_dump(ab, buf, "mon dest desc: ", mon_dst_desc, + sizeof(*mon_dst_desc), srng); + BUG_ON(1); + } + + cookie = mon_dst_desc->cookie; + ppdu_id = mon_dst_desc->ppdu_id; + buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID); + + spin_lock_bh(&buf_ring->idr_lock); + skb = idr_remove(&buf_ring->bufs_idr, buf_id); + spin_unlock_bh(&buf_ring->idr_lock); + + if (unlikely(!skb)) { + ath12k_warn(ab, "mon: dest desc with inval buf_id %d\n", + buf_id); + goto move_next; + } + + rxcb = ATH12K_SKB_RXCB(skb); + dma_unmap_single(ab->dev, rxcb->paddr, + skb->len + skb_tailroom(skb), + DMA_FROM_DEVICE); + end_reason = u32_get_bits(mon_dst_desc->info0, + HAL_MON_DEST_INFO0_END_REASON); + if ((end_reason == HAL_MON_FLUSH_DETECTED) || + (end_reason == HAL_MON_PPDU_TRUNCATED)) { + ath12k_dbg(ab, ATH12K_DBG_DATA, + "Monitor dest descriptor end reason %d", end_reason); + dev_kfree_skb_any(skb); + goto move_next; + } + + if (end_reason == HAL_MON_END_OF_PPDU) { + *budget -= 1; + rxcb->is_end_of_ppdu = true; + } + + end_offset = u32_get_bits(mon_dst_desc->info0, + HAL_MON_DEST_INFO0_END_OFFSET); + + if (likely(end_offset < DP_RX_BUFFER_SIZE)) { + skb_put(skb, end_offset); + } else { + ath12k_warn(ab, "invalid offset received from mon dest %u\n", + end_offset); + skb_put(skb, DP_RX_BUFFER_SIZE); + } + + __skb_queue_tail(&skb_list, skb); +move_next: + ath12k_dp_mon_buf_replenish(ab, buf_ring, 1); + ath12k_hal_srng_dst_get_next_entry(ab, srng); + num_buffs_reaped++; + } + + ath12k_hal_srng_access_end(ab, srng); + spin_unlock_bh(&srng->lock); + + if (!num_buffs_reaped) + return 0; + + if (!ppdu_info->ppdu_continuation) + ath12k_dp_mon_rx_memset_ppdu_info(ppdu_info); + + while ((skb = __skb_dequeue(&skb_list))) { + if (dp_mon_mode == ATH12K_DP_RX_MONITOR_MODE) + hal_status = + ath12k_dp_mon_rx_parse_mon_status(ar, ppdu_info, mac_id, + skb, napi); + else + hal_status = + ath12k_dp_mon_tx_parse_mon_status(ar, pmon, mac_id, + skb, napi, ppdu_id); + + if (hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { + ppdu_info->ppdu_continuation = true; + dev_kfree_skb_any(skb); + continue; + } + + if (ppdu_info->peer_id == HAL_INVALID_PEERID) + goto free_skb; + + rcu_read_lock(); + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_id(ab, ppdu_info->peer_id); + if (!peer || !peer->sta) { + ath12k_dbg(ab, ATH12K_DBG_DATA, + "failed to find the peer with link id %d peer_id %d\n", + peer ? peer->link_id : -1, ppdu_info->peer_id); + goto next_skb; + } + + if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { + arsta = ath12k_peer_get_link_sta(ar->ab, peer); + if (!arsta) { + ath12k_warn(ar->ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + goto next_skb; + } + + ath12k_dp_mon_rx_update_peer_su_stats(ar, arsta, + ppdu_info); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_dp_mon_rx_update_peer_stats_bonded(ar, arsta, ppdu_info, + &ar->dp.rx_status); +#endif /* CONFIG_ATH12K_BONDED_DS_SUPPORT */ + } else if ((ppdu_info->fc_valid) && + (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { + ath12k_dp_mon_rx_process_ulofdma(ppdu_info); + ath12k_dp_mon_rx_update_peer_mu_stats(ar, ppdu_info); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_dp_mon_rx_update_peer_stats_bonded(ar, NULL, ppdu_info, + &ar->dp.rx_status); +#endif /* CONFIG_ATH12K_BONDED_DS_SUPPORT */ + } + +next_skb: + spin_unlock_bh(&ab->base_lock); + rcu_read_unlock(); +free_skb: + dev_kfree_skb_any(skb); + ath12k_dp_mon_rx_memset_ppdu_info(ppdu_info); + ppdu_info->peer_id = HAL_INVALID_PEERID; + } + + return num_buffs_reaped; +} + int ath12k_dp_mon_rx_process_stats(struct ath12k *ar, int mac_id, struct napi_struct *napi, int *budget) { struct ath12k_base *ab = ar->ab; struct ath12k_pdev_dp *pdev_dp = &ar->dp; - struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&pdev_dp->mon_data; + struct ath12k_mon_data *pmon = pdev_dp->mon_data; struct hal_rx_mon_ppdu_info *ppdu_info = &pmon->mon_ppdu_info; struct ath12k_dp *dp = &ab->dp; struct hal_mon_dest_desc *mon_dst_desc; @@ -2483,13 +3922,17 @@ struct dp_srng *mon_dst_ring; struct hal_srng *srng; struct dp_rxdma_ring *buf_ring; - struct ath12k_sta *arsta = NULL; + struct ath12k_link_sta *arsta = NULL; struct ath12k_peer *peer; + struct sk_buff_head skb_list; + struct ath12k_neighbor_peer *nrp, *tmp; u64 cookie; int num_buffs_reaped = 0, srng_id, buf_id; - u8 dest_idx = 0, i; - bool end_of_ppdu; - u32 hal_status; + u32 hal_status, end_reason, end_offset, rx_buf_sz; + char buf[64] = {0}; + u16 log_type = 0; + + __skb_queue_head_init(&skb_list); srng_id = ath12k_hw_mac_id_to_srng_id(ab->hw_params, mac_id); mon_dst_ring = &pdev_dp->rxdma_mon_dst_ring[srng_id]; @@ -2500,10 +3943,22 @@ ath12k_hal_srng_access_begin(ab, srng); while (likely(*budget)) { - *budget -= 1; mon_dst_desc = ath12k_hal_srng_dst_peek(ab, srng); if (unlikely(!mon_dst_desc)) break; + + if (u32_get_bits(mon_dst_desc->info0, HAL_MON_DEST_INFO0_EMPTY_DESC)) { + ab->soc_stats.mon_drop_desc++; + goto move_next; + } + + if (unlikely(mon_dst_desc->magic != DP_MON_MAGIC_VALUE)) { + scnprintf(buf, sizeof(buf), "invalid mon dest desc in mon stats process\n"); + ath12k_err_dump(ab, buf, "mon dest desc: ", mon_dst_desc, + sizeof(*mon_dst_desc), srng); + BUG_ON(1); + } + cookie = le32_to_cpu(mon_dst_desc->cookie); buf_id = u32_get_bits(cookie, DP_RXDMA_BUF_COOKIE_BUF_ID); @@ -2512,7 +3967,7 @@ spin_unlock_bh(&buf_ring->idr_lock); if (unlikely(!skb)) { - ath12k_warn(ab, "monitor destination with invalid buf_id %d\n", + ath12k_warn(ab, "mon stats: dest ring with inval buf_id %d\n", buf_id); goto move_next; } @@ -2521,62 +3976,132 @@ dma_unmap_single(ab->dev, rxcb->paddr, skb->len + skb_tailroom(skb), DMA_FROM_DEVICE); - pmon->dest_skb_q[dest_idx] = skb; - dest_idx++; - end_of_ppdu = le32_get_bits(mon_dst_desc->info0, - HAL_MON_DEST_INFO0_END_OF_PPDU); - if (!end_of_ppdu) - continue; + end_reason = u32_get_bits(mon_dst_desc->info0, + HAL_MON_DEST_INFO0_END_REASON); + if ((end_reason == HAL_MON_FLUSH_DETECTED) || + (end_reason == HAL_MON_PPDU_TRUNCATED)) { + ath12k_dbg(ab, ATH12K_DBG_DATA, + "Monitor dest descriptor end reason %d", end_reason); + dev_kfree_skb_any(skb); + goto move_next; + } - for (i = 0; i < dest_idx; i++) { - skb = pmon->dest_skb_q[i]; - hal_status = ath12k_dp_mon_parse_rx_dest(ab, pmon, skb); + if (end_reason == HAL_MON_END_OF_PPDU) + *budget -= 1; - if (ppdu_info->peer_id == HAL_INVALID_PEERID || - hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { + end_offset = u32_get_bits(mon_dst_desc->info0, + HAL_MON_DEST_INFO0_END_OFFSET); + + if (likely(end_offset < DP_RX_BUFFER_SIZE)) { + skb_put(skb, end_offset); + } else { + ath12k_warn(ab, "invalid offset received on mon stats dest %u\n", + end_offset); + skb_put(skb, DP_RX_BUFFER_SIZE); + } + + __skb_queue_tail(&skb_list, skb); +move_next: + ath12k_dp_mon_buf_replenish(ab, buf_ring, 1); + ath12k_hal_srng_dst_get_next_entry(ab, srng); + num_buffs_reaped++; + } + + ath12k_hal_srng_access_end(ab, srng); + spin_unlock_bh(&srng->lock); + if (!num_buffs_reaped) + return 0; + + if (!ppdu_info->ppdu_continuation) + ath12k_dp_mon_rx_memset_ppdu_info(ppdu_info); + + while ((skb = __skb_dequeue(&skb_list))) { + if (ath12k_debugfs_is_pktlog_lite_mode_enabled(ar)) { + log_type = ATH12K_PKTLOG_TYPE_LITE_RX; + rx_buf_sz = DP_RX_BUFFER_SIZE_LITE; + } else if (ath12k_debugfs_is_pktlog_rx_stats_enabled(ar)) { + log_type = ATH12K_PKTLOG_TYPE_RX_STATBUF; + rx_buf_sz = DP_RX_BUFFER_SIZE; + ath12k_rx_stats_buf_pktlog_process(ar, skb->data, log_type, + rx_buf_sz); + } + if (log_type) + trace_ath12k_htt_rxdesc(ar, skb->data, log_type, + rx_buf_sz); + + hal_status = ath12k_dp_mon_parse_rx_dest(ar, ppdu_info, skb); + if (hal_status != HAL_RX_MON_STATUS_PPDU_DONE) { + ppdu_info->ppdu_continuation = true; dev_kfree_skb_any(skb); continue; } + if (ppdu_info->peer_id == HAL_INVALID_PEERID) + goto free_skb; + rcu_read_lock(); spin_lock_bh(&ab->base_lock); peer = ath12k_peer_find_by_id(ab, ppdu_info->peer_id); + if (!list_empty(&ab->neighbor_peers)) { + if (peer && !peer->sta) { + list_for_each_entry_safe(nrp, tmp, &ab->neighbor_peers, list) { + if (nrp->is_filter_on && ether_addr_equal(nrp->addr, peer->addr)) { + nrp->rssi = ppdu_info->rssi_comb + + ar->rssi_offsets.rssi_offset; + nrp->timestamp = ktime_to_ms(ktime_get_real()); + complete(&nrp->filter_done); + } + } + goto next_skb; + } + } + if (!peer || !peer->sta) { ath12k_dbg(ab, ATH12K_DBG_DATA, - "failed to find the peer with peer_id %d\n", - ppdu_info->peer_id); - spin_unlock_bh(&ab->base_lock); - rcu_read_unlock(); - dev_kfree_skb_any(skb); - continue; + "failed to find the peer with monitor link id %d peer_id %d\n", + peer ? peer->link_id : -1, ppdu_info->peer_id); + goto next_skb; } if (ppdu_info->reception_type == HAL_RX_RECEPTION_TYPE_SU) { - arsta = (struct ath12k_sta *)peer->sta->drv_priv; + arsta = ath12k_peer_get_link_sta(ar->ab, peer); + if (!arsta) { + ath12k_warn(ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + goto next_skb; + } + ath12k_dp_mon_rx_update_peer_su_stats(ar, arsta, ppdu_info); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_dp_mon_rx_update_peer_stats_bonded(ar, arsta, ppdu_info, + NULL); +#endif /* CONFIG_ATH12K_BONDED_DS_SUPPORT */ } else if ((ppdu_info->fc_valid) && (ppdu_info->ast_index != HAL_AST_IDX_INVALID)) { ath12k_dp_mon_rx_process_ulofdma(ppdu_info); ath12k_dp_mon_rx_update_peer_mu_stats(ar, ppdu_info); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_dp_mon_rx_update_peer_stats_bonded(ar, NULL, ppdu_info, + NULL); +#endif /* CONFIG_ATH12K_BONDED_DS_SUPPORT */ + } + + if (ath12k_debugfs_is_pktlog_peer_valid(ar, peer->addr)) { + trace_ath12k_htt_rxdesc(ar, skb->data, log_type, rx_buf_sz); + ath12k_rx_stats_buf_pktlog_process(ar, skb->data, log_type, + rx_buf_sz); } +next_skb: spin_unlock_bh(&ab->base_lock); rcu_read_unlock(); +free_skb: dev_kfree_skb_any(skb); - memset(ppdu_info, 0, sizeof(*ppdu_info)); + ath12k_dp_mon_rx_memset_ppdu_info(ppdu_info); ppdu_info->peer_id = HAL_INVALID_PEERID; } - dest_idx = 0; -move_next: - ath12k_dp_mon_buf_replenish(ab, buf_ring, 1); - ath12k_hal_srng_src_get_next_entry(ab, srng); - num_buffs_reaped++; - } - - ath12k_hal_srng_access_end(ab, srng); - spin_unlock_bh(&srng->lock); return num_buffs_reaped; } @@ -2587,8 +4112,9 @@ struct ath12k *ar = ath12k_ab_to_ar(ab, mac_id); int num_buffs_reaped = 0; - if (!ar->monitor_started) - ath12k_dp_mon_rx_process_stats(ar, mac_id, napi, &budget); + if (!test_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags)) + num_buffs_reaped = ath12k_dp_mon_rx_process_stats(ar, mac_id, + napi, &budget); else num_buffs_reaped = ath12k_dp_mon_srng_process(ar, mac_id, &budget, monitor_mode, napi); diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp_mon.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_mon.h --- linux-6.4/drivers/net/wireless/ath/ath12k/dp_mon.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_mon.h 2024-04-22 13:40:50.283868637 +0200 @@ -8,12 +8,17 @@ #define ATH12K_DP_MON_H #include "core.h" +#include "debugfs_htt_stats.h" enum dp_monitor_mode { ATH12K_DP_TX_MONITOR_MODE, ATH12K_DP_RX_MONITOR_MODE }; +#define ATH12K_WIFIRX_DOT11_OFFSET 5 + +#define DP_MON_MAGIC_VALUE 0xDECAFEED + enum dp_mon_tx_ppdu_info_type { DP_MON_TX_PROT_PPDU_INFO, DP_MON_TX_DATA_PPDU_INFO @@ -76,7 +81,7 @@ enum hal_rx_mon_status ath12k_dp_mon_rx_parse_mon_status(struct ath12k *ar, - struct ath12k_mon_data *pmon, + struct hal_rx_mon_ppdu_info *ppdu_info, int mac_id, struct sk_buff *skb, struct napi_struct *napi); int ath12k_dp_mon_buf_replenish(struct ath12k_base *ab, diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp_rx.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_rx.c --- linux-6.4/drivers/net/wireless/ath/ath12k/dp_rx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_rx.c 2024-04-22 13:40:50.287868747 +0200 @@ -1,15 +1,18 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include #include #include +#include #include "core.h" #include "debug.h" +#include "debugfs_htt_stats.h" +#include "debugfs_sta.h" #include "hal_desc.h" #include "hw.h" #include "dp_rx.h" @@ -17,9 +20,19 @@ #include "dp_tx.h" #include "peer.h" #include "dp_mon.h" +#include "hif.h" +#include "sawf.h" +#ifdef CONFIG_MAC80211_PPE_SUPPORT +#include +#include +#endif + #define ATH12K_DP_RX_FRAGMENT_TIMEOUT_MS (2 * HZ) +static void ath12k_dp_rx_tid_del_func(struct ath12k_dp *dp, void *ctx, + enum hal_reo_cmd_status status); + static enum hal_encrypt_type ath12k_dp_rx_h_enctype(struct ath12k_base *ab, struct hal_rx_desc *desc) { @@ -83,18 +96,6 @@ return ab->hw_params->hal_ops->dp_rx_h_msdu_done(desc); } -static bool ath12k_dp_rx_h_l4_cksum_fail(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->dp_rx_h_l4_cksum_fail(desc); -} - -static bool ath12k_dp_rx_h_ip_cksum_fail(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->dp_rx_h_ip_cksum_fail(desc); -} - static bool ath12k_dp_rx_h_is_decrypted(struct ath12k_base *ab, struct hal_rx_desc *desc) { @@ -113,42 +114,6 @@ return ab->hw_params->hal_ops->rx_desc_get_msdu_len(desc); } -static u8 ath12k_dp_rx_h_sgi(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->rx_desc_get_msdu_sgi(desc); -} - -static u8 ath12k_dp_rx_h_rate_mcs(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->rx_desc_get_msdu_rate_mcs(desc); -} - -static u8 ath12k_dp_rx_h_rx_bw(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->rx_desc_get_msdu_rx_bw(desc); -} - -static u32 ath12k_dp_rx_h_freq(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->rx_desc_get_msdu_freq(desc); -} - -static u8 ath12k_dp_rx_h_pkt_type(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return ab->hw_params->hal_ops->rx_desc_get_msdu_pkt_type(desc); -} - -static u8 ath12k_dp_rx_h_nss(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return hweight8(ab->hw_params->hal_ops->rx_desc_get_msdu_nss(desc)); -} - static u8 ath12k_dp_rx_h_tid(struct ath12k_base *ab, struct hal_rx_desc *desc) { @@ -193,17 +158,11 @@ ab->hw_params->hal_ops->rx_desc_set_msdu_len(desc, len); } -static bool ath12k_dp_rx_h_is_mcbc(struct ath12k_base *ab, - struct hal_rx_desc *desc) -{ - return (ath12k_dp_rx_h_first_msdu(ab, desc) && - ab->hw_params->hal_ops->rx_desc_is_mcbc(desc)); -} - static bool ath12k_dp_rxdesc_mac_addr2_valid(struct ath12k_base *ab, struct hal_rx_desc *desc) { - return ab->hw_params->hal_ops->rx_desc_mac_addr2_valid(desc); + return (ath12k_dp_rx_h_first_msdu(ab, desc) && + ab->hw_params->hal_ops->rx_desc_mac_addr2_valid(desc)); } static u8 *ath12k_dp_rxdesc_get_mpdu_start_addr2(struct ath12k_base *ab, @@ -227,10 +186,20 @@ ab->hw_params->hal_ops->rx_desc_get_crypto_header(desc, crypto_hdr, enctype); } -static u16 ath12k_dp_rxdesc_get_mpdu_frame_ctrl(struct ath12k_base *ab, +static inline u8 ath12k_dp_rx_h_msdu_end_ip_valid(struct ath12k_base *ab, + struct hal_rx_desc *desc) +{ + return ab->hw_params->hal_ops->rx_desc_get_ip_valid(desc); +} + +static inline u8 ath12k_dp_rx_get_msdu_src_link(struct ath12k_base *ab, struct hal_rx_desc *desc) { - return ab->hw_params->hal_ops->rx_desc_get_mpdu_frame_ctl(desc); + /* If the ops unassigned, return the first pdev idx */ + if (!ab->hw_params->hal_ops->rx_desc_get_msdu_src_link_id) + return 0; + + return ab->hw_params->hal_ops->rx_desc_get_msdu_src_link_id(desc); } static int ath12k_dp_purge_mon_ring(struct ath12k_base *ab) @@ -255,23 +224,70 @@ return -ETIMEDOUT; } +static size_t ath12k_dp_list_cut_nodes(struct list_head *list, + struct list_head *head, + size_t count) +{ + struct list_head *cur; + struct ath12k_rx_desc_info *rx_desc; + size_t nodes = 0; + + if (!count) { + INIT_LIST_HEAD(list); + goto out; + } + + list_for_each(cur, head) { + if (!count) + break; + + rx_desc = list_entry(cur, struct ath12k_rx_desc_info, list); + rx_desc->in_use = true; + + count--; + nodes++; + } + + list_cut_before(list, head, cur); +out: + return nodes; +} + +static void ath12k_dp_rx_enqueue_free(struct ath12k_dp *dp, + struct list_head *used_list) +{ + struct list_head *cur; + struct ath12k_rx_desc_info *rx_desc; + + spin_lock_bh(&dp->rx_desc_lock); + + /* Reset the use flag */ + list_for_each(cur, used_list) { + rx_desc = list_entry(cur, struct ath12k_rx_desc_info, list); + rx_desc->in_use = false; + } + + list_splice_tail(used_list, &dp->rx_desc_free_list); + + spin_unlock_bh(&dp->rx_desc_lock); +} + /* Returns number of Rx buffers replenished */ -int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, int mac_id, +int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, struct dp_rxdma_ring *rx_ring, - int req_entries, - enum hal_rx_buf_return_buf_manager mgr, - bool hw_cc) + struct list_head *used_list, + int req_entries) { struct ath12k_buffer_addr *desc; struct hal_srng *srng; struct sk_buff *skb; int num_free; int num_remain; - int buf_id; u32 cookie; dma_addr_t paddr; struct ath12k_dp *dp = &ab->dp; struct ath12k_rx_desc_info *rx_desc; + enum hal_rx_buf_return_buf_manager mgr = ab->hw_params->hal_params->rx_buf_rbm; req_entries = min(req_entries, rx_ring->bufs_max); @@ -288,10 +304,23 @@ req_entries = min(num_free, req_entries); num_remain = req_entries; + if (!num_remain) + goto skip_replenish; + + /* Get the descriptor from free list */ + if (list_empty(used_list)) { + spin_lock_bh(&dp->rx_desc_lock); + req_entries = ath12k_dp_list_cut_nodes(used_list, + &dp->rx_desc_free_list, + num_remain); + spin_unlock_bh(&dp->rx_desc_lock); + num_remain = req_entries; + } + while (num_remain > 0) { skb = dev_alloc_skb(DP_RX_BUFFER_SIZE + DP_RX_BUFFER_ALIGN_SIZE); - if (!skb) + if (unlikely(!skb)) break; if (!IS_ALIGNED((unsigned long)skb->data, @@ -301,52 +330,27 @@ skb->data); } - paddr = dma_map_single(ab->dev, skb->data, + paddr = dma_map_single_attrs(ab->dev, skb->data, skb->len + skb_tailroom(skb), - DMA_FROM_DEVICE); + DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); if (dma_mapping_error(ab->dev, paddr)) goto fail_free_skb; - if (hw_cc) { - spin_lock_bh(&dp->rx_desc_lock); - - /* Get desc from free list and store in used list - * for cleanup purposes - * - * TODO: pass the removed descs rather than - * add/read to optimize - */ - rx_desc = list_first_entry_or_null(&dp->rx_desc_free_list, + rx_desc = list_first_entry_or_null(used_list, struct ath12k_rx_desc_info, list); - if (!rx_desc) { - spin_unlock_bh(&dp->rx_desc_lock); + if (!rx_desc) goto fail_dma_unmap; - } rx_desc->skb = skb; + rx_desc->paddr = paddr; cookie = rx_desc->cookie; - list_del(&rx_desc->list); - list_add_tail(&rx_desc->list, &dp->rx_desc_used_list); - - spin_unlock_bh(&dp->rx_desc_lock); - } else { - spin_lock_bh(&rx_ring->idr_lock); - buf_id = idr_alloc(&rx_ring->bufs_idr, skb, 0, - rx_ring->bufs_max * 3, GFP_ATOMIC); - spin_unlock_bh(&rx_ring->idr_lock); - if (buf_id < 0) - goto fail_dma_unmap; - cookie = u32_encode_bits(mac_id, - DP_RXDMA_BUF_COOKIE_PDEV_ID) | - u32_encode_bits(buf_id, - DP_RXDMA_BUF_COOKIE_BUF_ID); - } desc = ath12k_hal_srng_src_get_next_entry(ab, srng); if (!desc) - goto fail_buf_unassign; + goto fail_dma_unmap; + list_del(&rx_desc->list); ATH12K_SKB_RXCB(skb)->paddr = paddr; num_remain--; @@ -354,32 +358,27 @@ ath12k_hal_rx_buf_addr_info_set(desc, paddr, cookie, mgr); } +skip_replenish: ath12k_hal_srng_access_end(ab, srng); + if (!list_empty(used_list)) + ath12k_dp_rx_enqueue_free(dp, used_list); + spin_unlock_bh(&srng->lock); return req_entries - num_remain; -fail_buf_unassign: - if (hw_cc) { - spin_lock_bh(&dp->rx_desc_lock); - list_del(&rx_desc->list); - list_add_tail(&rx_desc->list, &dp->rx_desc_free_list); - rx_desc->skb = NULL; - spin_unlock_bh(&dp->rx_desc_lock); - } else { - spin_lock_bh(&rx_ring->idr_lock); - idr_remove(&rx_ring->bufs_idr, buf_id); - spin_unlock_bh(&rx_ring->idr_lock); - } fail_dma_unmap: - dma_unmap_single(ab->dev, paddr, skb->len + skb_tailroom(skb), - DMA_FROM_DEVICE); + dma_unmap_single_attrs(ab->dev, paddr, skb->len + skb_tailroom(skb), + DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); fail_free_skb: dev_kfree_skb_any(skb); ath12k_hal_srng_access_end(ab, srng); + if (!list_empty(used_list)) + ath12k_dp_rx_enqueue_free(dp, used_list); + spin_unlock_bh(&srng->lock); return req_entries - num_remain; @@ -418,8 +417,10 @@ rx_ring = &dp->rxdma_mon_buf_ring; ath12k_dp_rxdma_buf_ring_free(ab, rx_ring); + if (ab->hw_params->supports_tx_monitor) { rx_ring = &dp->tx_mon_buf_ring; ath12k_dp_rxdma_buf_ring_free(ab, rx_ring); + } return 0; } @@ -428,6 +429,7 @@ struct dp_rxdma_ring *rx_ring, u32 ringtype) { + LIST_HEAD(list); int num_entries; num_entries = rx_ring->refill_buf_ring.size / @@ -437,9 +439,7 @@ if ((ringtype == HAL_RXDMA_MONITOR_BUF) || (ringtype == HAL_TX_MONITOR_BUF)) ath12k_dp_mon_buf_replenish(ab, rx_ring, num_entries); else - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_entries, - ab->hw_params->hal_params->rx_buf_rbm, - ringtype == HAL_RXDMA_BUF); + ath12k_dp_rx_bufs_replenish(ab, rx_ring, &list, 0); return 0; } @@ -467,6 +467,7 @@ return ret; } + if (ab->hw_params->supports_tx_monitor) { rx_ring = &dp->tx_mon_buf_ring; ret = ath12k_dp_rxdma_ring_buf_setup(ab, rx_ring, HAL_TX_MONITOR_BUF); @@ -476,6 +477,7 @@ return ret; } } + } return 0; } @@ -488,6 +490,7 @@ for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) { ath12k_dp_srng_cleanup(ab, &dp->rxdma_mon_dst_ring[i]); + if (ab->hw_params->supports_tx_monitor) ath12k_dp_srng_cleanup(ab, &dp->tx_mon_dst_ring[i]); } } @@ -545,6 +548,7 @@ return ret; } + if (ab->hw_params->supports_tx_monitor) { ret = ath12k_dp_srng_setup(ar->ab, &dp->tx_mon_dst_ring[i], HAL_TX_MONITOR_DST, @@ -556,50 +560,56 @@ return ret; } } + } return 0; } -void ath12k_dp_rx_reo_cmd_list_cleanup(struct ath12k_base *ab) +static void ath12k_peer_rx_tid_qref_reset(struct ath12k_base *ab, u16 peer_id, u16 tid) { + struct ath12k_reo_queue_ref *qref; struct ath12k_dp *dp = &ab->dp; - struct ath12k_dp_rx_reo_cmd *cmd, *tmp; - struct ath12k_dp_rx_reo_cache_flush_elem *cmd_cache, *tmp_cache; + bool ml_peer = false; - spin_lock_bh(&dp->reo_cmd_lock); - list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { - list_del(&cmd->list); - dma_unmap_single(ab->dev, cmd->data.paddr, - cmd->data.size, DMA_BIDIRECTIONAL); - kfree(cmd->data.vaddr); - kfree(cmd); - } + if (!ab->hw_params->reoq_lut_support) + return; - list_for_each_entry_safe(cmd_cache, tmp_cache, - &dp->reo_cmd_cache_flush_list, list) { - list_del(&cmd_cache->list); - dp->reo_cmd_cache_flush_count--; - dma_unmap_single(ab->dev, cmd_cache->data.paddr, - cmd_cache->data.size, DMA_BIDIRECTIONAL); - kfree(cmd_cache->data.vaddr); - kfree(cmd_cache); + if (peer_id & ATH12K_ML_PEER_ID_VALID) { + peer_id &= ~ATH12K_ML_PEER_ID_VALID; + ml_peer = true; } - spin_unlock_bh(&dp->reo_cmd_lock); + + if (ml_peer) + qref = (struct ath12k_reo_queue_ref *)dp->ml_reoq_lut.vaddr + + (peer_id * (IEEE80211_NUM_TIDS + 1) + tid); + else + qref = (struct ath12k_reo_queue_ref *)dp->reoq_lut.vaddr + + (peer_id * (IEEE80211_NUM_TIDS + 1) + tid); + + qref->info0 = u32_encode_bits(0, BUFFER_ADDR_INFO0_ADDR); + qref->info1 = u32_encode_bits(0, BUFFER_ADDR_INFO1_ADDR); } -static void ath12k_dp_reo_cmd_free(struct ath12k_dp *dp, void *ctx, - enum hal_reo_cmd_status status) +void ath12k_dp_tid_cleanup(struct ath12k_base *ab) { - struct ath12k_dp_rx_tid *rx_tid = ctx; - - if (status != HAL_REO_CMD_SUCCESS) - ath12k_warn(dp->ab, "failed to flush rx tid hw desc, tid %d status %d\n", - rx_tid->tid, status); + struct ath12k_peer *peer; + struct ath12k_dp_rx_tid *rx_tid; + int tid; + void *vaddr; + u32 *addr_aligned; - dma_unmap_single(dp->ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; + spin_lock_bh(&ab->base_lock); + list_for_each_entry(peer, &ab->peers, list) { + for (tid = 0; tid <= IEEE80211_NUM_TIDS; tid++) { + rx_tid = &peer->rx_tid[tid]; + if (rx_tid->active) { + vaddr = rx_tid->vaddr; + addr_aligned = PTR_ALIGN(vaddr, HAL_LINK_DESC_ALIGN); + ath12k_dp_reset_rx_reo_tid_q(addr_aligned, rx_tid->ba_win_sz, tid); + } + } + } + spin_unlock_bh(&ab->base_lock); } static int ath12k_dp_reo_cmd_send(struct ath12k_base *ab, struct ath12k_dp_rx_tid *rx_tid, @@ -613,6 +623,10 @@ struct hal_srng *cmd_ring; int cmd_num; + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags) || + test_bit(ATH12K_FLAG_UMAC_PRERESET_START, &ab->dev_flags)) + return -ESHUTDOWN; + cmd_ring = &ab->hal.srng_list[dp->reo_cmd_ring.ring_id]; cmd_num = ath12k_hal_reo_cmd_send(ab, cmd_ring, type, cmd); @@ -647,54 +661,137 @@ return 0; } -static void ath12k_dp_reo_cache_flush(struct ath12k_base *ab, - struct ath12k_dp_rx_tid *rx_tid) +static int ath12k_peer_rx_tid_delete_handler(struct ath12k_base *ab, + struct ath12k_dp_rx_tid *rx_tid, u8 tid) { struct ath12k_hal_reo_cmd cmd = {0}; - unsigned long tot_desc_sz, desc_sz; - int ret; + struct ath12k_dp *dp = &ab->dp; - tot_desc_sz = rx_tid->size; - desc_sz = ath12k_hal_reo_qdesc_size(0, HAL_DESC_REO_NON_QOS_TID); + lockdep_assert_held(&dp->reo_cmd_update_rx_queue_lock); - while (tot_desc_sz > desc_sz) { - tot_desc_sz -= desc_sz; - cmd.addr_lo = lower_32_bits(rx_tid->paddr + tot_desc_sz); + rx_tid->active = false; + cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS; + cmd.addr_lo = lower_32_bits(rx_tid->paddr); cmd.addr_hi = upper_32_bits(rx_tid->paddr); - ret = ath12k_dp_reo_cmd_send(ab, rx_tid, - HAL_REO_CMD_FLUSH_CACHE, &cmd, - NULL); - if (ret) - ath12k_warn(ab, - "failed to send HAL_REO_CMD_FLUSH_CACHE, tid %d (%d)\n", - rx_tid->tid, ret); + cmd.upd0 |= HAL_REO_CMD_UPD0_VLD; + cmd.upd0 |= HAL_REO_CMD_UPD0_BA_WINDOW_SIZE; + cmd.ba_window_size = (tid == HAL_DESC_REO_NON_QOS_TID) ? + rx_tid->ba_win_sz : DP_BA_WIN_SZ_MAX; + cmd.upd1 |= HAL_REO_CMD_UPD1_VLD; + + return ath12k_dp_reo_cmd_send(ab, rx_tid, + HAL_REO_CMD_UPDATE_RX_QUEUE, &cmd, + ath12k_dp_rx_tid_del_func); +} + +void ath12k_dp_rx_reo_cmd_list_cleanup(struct ath12k_base *ab) +{ + struct ath12k_dp *dp = &ab->dp; + struct ath12k_dp_rx_reo_cmd *cmd, *tmp; + struct ath12k_dp_rx_reo_cache_flush_elem *cmd_cache, *tmp_cache; + struct dp_reo_update_rx_queue_elem *cmd_queue, *tmp_queue; + struct ath12k_dp_rx_tid *rx_tid; + + spin_lock_bh(&dp->reo_cmd_update_rx_queue_lock); + list_for_each_entry_safe(cmd_queue, tmp_queue, &dp->reo_cmd_update_rx_queue_list, + list) { + list_del(&cmd_queue->list); + rx_tid = &cmd_queue->data; + if (rx_tid->vaddr) { + dma_unmap_single(ab->dev, rx_tid->paddr, + rx_tid->size, DMA_BIDIRECTIONAL); + kfree(rx_tid->vaddr); + rx_tid->vaddr = NULL; + } + kfree(cmd_queue); + } + spin_unlock_bh(&dp->reo_cmd_update_rx_queue_lock); + + spin_lock_bh(&dp->reo_cmd_lock); + list_for_each_entry_safe(cmd, tmp, &dp->reo_cmd_list, list) { + list_del(&cmd->list); + rx_tid = &cmd->data; + if (rx_tid->vaddr) { + dma_unmap_single(ab->dev, rx_tid->paddr, + rx_tid->size, DMA_BIDIRECTIONAL); + kfree(rx_tid->vaddr); + rx_tid->vaddr = NULL; + } + kfree(cmd); + } + + list_for_each_entry_safe(cmd_cache, tmp_cache, + &dp->reo_cmd_cache_flush_list, list) { + list_del(&cmd_cache->list); + dp->reo_cmd_cache_flush_count--; + rx_tid = &cmd_cache->data; + if (rx_tid->vaddr) { + dma_unmap_single(ab->dev, rx_tid->paddr, + rx_tid->size, DMA_BIDIRECTIONAL); + kfree(rx_tid->vaddr); + rx_tid->vaddr = NULL; + } + kfree(cmd_cache); } + spin_unlock_bh(&dp->reo_cmd_lock); +} + +static void ath12k_dp_reo_cmd_free(struct ath12k_dp *dp, void *ctx, + enum hal_reo_cmd_status status) +{ + struct ath12k_dp_rx_tid *rx_tid = ctx; + + if (status != HAL_REO_CMD_SUCCESS) + ath12k_warn(dp->ab, "failed to flush rx tid hw desc, tid %d status %d\n", + rx_tid->tid, status); + + ath12k_hal_reo_shared_qaddr_cache_clear(dp->ab); + + if (rx_tid->vaddr) { + dma_unmap_single(dp->ab->dev, rx_tid->paddr, rx_tid->size, + DMA_BIDIRECTIONAL); + kfree(rx_tid->vaddr); + rx_tid->vaddr = NULL; + } +} + +static int ath12k_dp_reo_cache_flush(struct ath12k_base *ab, + struct ath12k_dp_rx_tid *rx_tid) +{ + struct ath12k_hal_reo_cmd cmd = {0}; + int ret; memset(&cmd, 0, sizeof(cmd)); cmd.addr_lo = lower_32_bits(rx_tid->paddr); cmd.addr_hi = upper_32_bits(rx_tid->paddr); - cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS; + cmd.flag |= HAL_REO_CMD_FLG_NEED_STATUS | + HAL_REO_CMD_FLG_FLUSH_FWD_ALL_MPDUS; + + /* For all NON_QOS tid, driver allocates max window + * size of 1024. For this, driver can send flush 1K Desc + * in one command instead of sending 11 cmd for + * single NON_QOS tid(s). + */ + if (rx_tid->tid != HAL_DESC_REO_NON_QOS_TID) + cmd.flag |= HAL_REO_CMD_FLG_FLUSH_QUEUE_1K_DESC; + ret = ath12k_dp_reo_cmd_send(ab, rx_tid, HAL_REO_CMD_FLUSH_CACHE, &cmd, ath12k_dp_reo_cmd_free); - if (ret) { - ath12k_err(ab, "failed to send HAL_REO_CMD_FLUSH_CACHE cmd, tid %d (%d)\n", - rx_tid->tid, ret); - dma_unmap_single(ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; - } + + return ret; } static void ath12k_dp_rx_tid_del_func(struct ath12k_dp *dp, void *ctx, enum hal_reo_cmd_status status) { struct ath12k_base *ab = dp->ab; - struct ath12k_dp_rx_tid *rx_tid = ctx; + struct ath12k_dp_rx_tid *rx_tid = ctx, *update_rx_tid; struct ath12k_dp_rx_reo_cache_flush_elem *elem, *tmp; + struct dp_reo_update_rx_queue_elem *qelem, *qtmp; if (status == HAL_REO_CMD_DRAIN) { + ab->soc_stats.hal_reo_cmd_drain++; goto free_desc; } else if (status != HAL_REO_CMD_SUCCESS) { /* Shouldn't happen! Cleanup in case of other failure? */ @@ -703,10 +800,39 @@ return; } + /* Check if there is any pending rx_queue, if yes then update it */ + spin_lock_bh(&dp->reo_cmd_update_rx_queue_lock); + list_for_each_entry_safe(qelem, qtmp, &dp->reo_cmd_update_rx_queue_list, + list) { + if (qelem->reo_cmd_update_rx_queue_resend_flag && + qelem->data.active) { + update_rx_tid = &qelem->data; + + if (ath12k_peer_rx_tid_delete_handler(ab, update_rx_tid, qelem->tid)) { + update_rx_tid->active = true; + break; + } + ath12k_peer_rx_tid_qref_reset(ab, + qelem->is_ml_peer ? qelem->ml_peer_id : qelem->peer_id, + qelem->tid); + ath12k_hal_reo_shared_qaddr_cache_clear(ab); + update_rx_tid->vaddr = NULL; + update_rx_tid->paddr = 0; + update_rx_tid->size = 0; + update_rx_tid->pending_desc_size = 0; + + list_del(&qelem->list); + kfree(qelem); + } + } + spin_unlock_bh(&dp->reo_cmd_update_rx_queue_lock); + elem = kzalloc(sizeof(*elem), GFP_ATOMIC); - if (!elem) + if (!elem) { + ath12k_warn(ab, "failed to alloc reo_cache_flush_elem, rx tid %d\n", + rx_tid->tid); goto free_desc; - + } elem->ts = jiffies; memcpy(&elem->data, rx_tid, sizeof(*rx_tid)); @@ -720,9 +846,6 @@ if (dp->reo_cmd_cache_flush_count > ATH12K_DP_RX_REO_DESC_FREE_THRES || time_after(jiffies, elem->ts + msecs_to_jiffies(ATH12K_DP_RX_REO_DESC_FREE_TIMEOUT_MS))) { - list_del(&elem->list); - dp->reo_cmd_cache_flush_count--; - /* Unlock the reo_cmd_lock before using ath12k_dp_reo_cmd_send() * within ath12k_dp_reo_cache_flush. The reo_cmd_cache_flush_list * is used in only two contexts, one is in this function called @@ -732,10 +855,18 @@ * delete to this list. Hence unlock-lock is safe here. */ spin_unlock_bh(&dp->reo_cmd_lock); - - ath12k_dp_reo_cache_flush(ab, &elem->data); - kfree(elem); + if (ath12k_dp_reo_cache_flush(ab, &elem->data)) { + ab->soc_stats.reo_cmd_cache_error++; + /* In failure case, just update the timestamp + * for flush cache elem and continue */ + spin_lock_bh(&dp->reo_cmd_lock); + elem->ts = jiffies; + break; + } spin_lock_bh(&dp->reo_cmd_lock); + list_del(&elem->list); + dp->reo_cmd_cache_flush_count--; + kfree(elem); } } spin_unlock_bh(&dp->reo_cmd_lock); @@ -753,13 +884,20 @@ { struct ath12k_reo_queue_ref *qref; struct ath12k_dp *dp = &ab->dp; + bool ml_peer = false; if (!ab->hw_params->reoq_lut_support) return; - /* TODO: based on ML peer or not, select the LUT. below assumes non - * ML peer - */ + if (peer_id & ATH12K_ML_PEER_ID_VALID) { + peer_id &= ~ATH12K_ML_PEER_ID_VALID; + ml_peer = true; + } + + if (ml_peer) + qref = (struct ath12k_reo_queue_ref *)dp->ml_reoq_lut.vaddr + + (peer_id * (IEEE80211_NUM_TIDS + 1) + tid); + else qref = (struct ath12k_reo_queue_ref *)dp->reoq_lut.vaddr + (peer_id * (IEEE80211_NUM_TIDS + 1) + tid); @@ -768,56 +906,63 @@ qref->info1 = u32_encode_bits(upper_32_bits(paddr), BUFFER_ADDR_INFO1_ADDR) | u32_encode_bits(tid, DP_REO_QREF_NUM); -} - -static void ath12k_peer_rx_tid_qref_reset(struct ath12k_base *ab, u16 peer_id, u16 tid) -{ - struct ath12k_reo_queue_ref *qref; - struct ath12k_dp *dp = &ab->dp; - if (!ab->hw_params->reoq_lut_support) - return; - - /* TODO: based on ML peer or not, select the LUT. below assumes non - * ML peer - */ - qref = (struct ath12k_reo_queue_ref *)dp->reoq_lut.vaddr + - (peer_id * (IEEE80211_NUM_TIDS + 1) + tid); - - qref->info0 = u32_encode_bits(0, BUFFER_ADDR_INFO0_ADDR); - qref->info1 = u32_encode_bits(0, BUFFER_ADDR_INFO1_ADDR) | - u32_encode_bits(tid, DP_REO_QREF_NUM); + ath12k_hal_reo_shared_qaddr_cache_clear(ab); } void ath12k_dp_rx_peer_tid_delete(struct ath12k *ar, struct ath12k_peer *peer, u8 tid) { - struct ath12k_hal_reo_cmd cmd = {0}; struct ath12k_dp_rx_tid *rx_tid = &peer->rx_tid[tid]; - int ret; + struct dp_reo_update_rx_queue_elem *elem, *tmp; + struct ath12k_base *ab = ar->ab; + struct ath12k_dp *dp = &ab->dp; if (!rx_tid->active) return; - cmd.flag = HAL_REO_CMD_FLG_NEED_STATUS; - cmd.addr_lo = lower_32_bits(rx_tid->paddr); - cmd.addr_hi = upper_32_bits(rx_tid->paddr); - cmd.upd0 = HAL_REO_CMD_UPD0_VLD; - ret = ath12k_dp_reo_cmd_send(ar->ab, rx_tid, - HAL_REO_CMD_UPDATE_RX_QUEUE, &cmd, - ath12k_dp_rx_tid_del_func); - if (ret) { - ath12k_err(ar->ab, "failed to send HAL_REO_CMD_UPDATE_RX_QUEUE cmd, tid %d (%d)\n", - tid, ret); - dma_unmap_single(ar->ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; + elem = kzalloc(sizeof(*elem), GFP_ATOMIC); + if (!elem) { + ath12k_warn(ar->ab, "failed to alloc reo_update_rx_queue_elem, rx tid %d\n", + rx_tid->tid); + return; } + elem->reo_cmd_update_rx_queue_resend_flag = false; + elem->peer_id = peer->peer_id; + elem->tid = tid; + elem->is_ml_peer = peer->mlo ? true : false; + elem->ml_peer_id = peer->ml_peer_id; + + memcpy(&elem->data, rx_tid, sizeof(*rx_tid)); - ath12k_peer_rx_tid_qref_reset(ar->ab, peer->peer_id, tid); + spin_lock_bh(&dp->reo_cmd_update_rx_queue_lock); + list_add_tail(&elem->list, &dp->reo_cmd_update_rx_queue_list); - rx_tid->active = false; + list_for_each_entry_safe(elem, tmp, &dp->reo_cmd_update_rx_queue_list, + list) { + rx_tid = &elem->data; + + if (ath12k_peer_rx_tid_delete_handler(ab, rx_tid, elem->tid)) { + rx_tid->active = true; + ab->soc_stats.reo_cmd_update_rx_queue_error++; + elem->reo_cmd_update_rx_queue_resend_flag = true; + break; + } + ath12k_peer_rx_tid_qref_reset(ab, + elem->is_ml_peer ? elem->ml_peer_id : elem->peer_id, + elem->tid); + ath12k_hal_reo_shared_qaddr_cache_clear(ab); + rx_tid->vaddr = NULL; + rx_tid->paddr = 0; + rx_tid->size = 0; + rx_tid->pending_desc_size = 0; + + list_del(&elem->list); + kfree(elem); + } + spin_unlock_bh(&dp->reo_cmd_update_rx_queue_lock); + + return; } /* TODO: it's strange (and ugly) that struct hal_reo_dest_ring is converted @@ -889,14 +1034,13 @@ ath12k_dp_rx_peer_tid_delete(ar, peer, i); ath12k_dp_rx_frags_cleanup(rx_tid, true); - spin_unlock_bh(&ar->ab->base_lock); del_timer_sync(&rx_tid->frag_timer); spin_lock_bh(&ar->ab->base_lock); } } -static int ath12k_peer_rx_tid_reo_update(struct ath12k *ar, +static int ath12k_peer_rx_tid_reo_update(struct ath12k_base *ab, struct ath12k_peer *peer, struct ath12k_dp_rx_tid *rx_tid, u32 ba_win_sz, u16 ssn, @@ -916,11 +1060,11 @@ cmd.upd2 = u32_encode_bits(ssn, HAL_REO_CMD_UPD2_SSN); } - ret = ath12k_dp_reo_cmd_send(ar->ab, rx_tid, + ret = ath12k_dp_reo_cmd_send(ab, rx_tid, HAL_REO_CMD_UPDATE_RX_QUEUE, &cmd, NULL); if (ret) { - ath12k_warn(ar->ab, "failed to update rx tid queue, tid %d (%d)\n", + ath12k_warn(ab, "failed to update rx tid queue, tid %d (%d)\n", rx_tid->tid, ret); return ret; } @@ -930,31 +1074,79 @@ return 0; } -int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id, - u8 tid, u32 ba_win_sz, u16 ssn, - enum hal_pn_type pn_type) +void ath12k_dp_peer_reo_tid_setup(struct ath12k_base *ab, + struct ath12k_link_sta *arsta) +{ + struct ath12k_dp_rx_tid *rx_tid; + struct ath12k_peer *peer; + u8 tid; + int ret; + + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_addr(ab, arsta->addr); + if (peer) { + for (tid = 0; tid <= IEEE80211_NUM_TIDS; tid++) { + rx_tid = &peer->rx_tid[tid]; + if (rx_tid->active) { + ret = ath12k_peer_rx_tid_reo_update(ab, peer, rx_tid, + rx_tid->ba_win_sz, 0, false); + if (ret) { + ath12k_warn(ab, "failed to update reo for peer %pM rx tid %d\n", + peer->addr, tid); + } + } + } + } + spin_unlock_bh(&ab->base_lock); +} + +void ath12k_dp_tid_setup(void *data, struct ieee80211_sta *sta) +{ + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_base *ab = data; + struct ath12k_link_sta *arsta; + struct ath12k_link_vif *arvif; + u8 link_id; + + if (sta->mlo) + return; + + for_each_set_bit(link_id, &ahsta->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arsta = ahsta->link[link_id]; + if (!arsta) + continue; + arvif = arsta->arvif; + if (arvif->ab == ab) + ath12k_dp_peer_reo_tid_setup(ab, arsta); + } +} + +void ath12k_dp_peer_tid_setup(struct ath12k_base *ab) +{ + struct ath12k *ar; + int i; + + for (i = 0; i < ab->num_radios; i++) { + ar = ab->pdevs[i].ar; + ieee80211_iterate_stations_atomic(ar->ah->hw, + ath12k_dp_tid_setup, + ab); + } +} + +int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, u8 tid, u32 ba_win_sz, u16 ssn, + enum hal_pn_type pn_type, struct ath12k_peer *peer) { struct ath12k_base *ab = ar->ab; struct ath12k_dp *dp = &ab->dp; struct hal_rx_reo_queue *addr_aligned; - struct ath12k_peer *peer; struct ath12k_dp_rx_tid *rx_tid; u32 hw_desc_sz; void *vaddr; dma_addr_t paddr; int ret; - spin_lock_bh(&ab->base_lock); - - peer = ath12k_peer_find(ab, vdev_id, peer_mac); - if (!peer) { - spin_unlock_bh(&ab->base_lock); - ath12k_warn(ab, "failed to find the peer to set up rx tid\n"); - return -ENOENT; - } - - if (ab->hw_params->reoq_lut_support && !dp->reoq_lut.vaddr) { - spin_unlock_bh(&ab->base_lock); + if (ab->hw_params->reoq_lut_support && (!dp->reoq_lut.vaddr || !dp->ml_reoq_lut.vaddr)) { ath12k_warn(ab, "reo qref table is not setup\n"); return -EINVAL; } @@ -962,7 +1154,6 @@ if (peer->peer_id > DP_MAX_PEER_ID || tid > IEEE80211_NUM_TIDS) { ath12k_warn(ab, "peer id of peer %d or tid %d doesn't allow reoq setup\n", peer->peer_id, tid); - spin_unlock_bh(&ab->base_lock); return -EINVAL; } @@ -970,16 +1161,28 @@ /* Update the tid queue if it is already setup */ if (rx_tid->active) { paddr = rx_tid->paddr; - ret = ath12k_peer_rx_tid_reo_update(ar, peer, rx_tid, + ret = ath12k_peer_rx_tid_reo_update(ab, peer, rx_tid, ba_win_sz, ssn, true); - spin_unlock_bh(&ab->base_lock); if (ret) { - ath12k_warn(ab, "failed to update reo for rx tid %d\n", tid); + ath12k_warn(ab, "failed to update reo for peer %pM rx tid %d\n", + peer->addr, tid); return ret; } + if (!ab->hw_params->reoq_lut_support) { + ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, peer->vdev_id, + peer->addr, + paddr, tid, 1, + ba_win_sz); + if (ret) { + ath12k_warn(ab, "failed to setup peer rx reorder queuefor tid %d: %d\n", + tid, ret); return ret; } + } + + return 0; + } rx_tid->tid = tid; @@ -995,7 +1198,6 @@ vaddr = kzalloc(hw_desc_sz + HAL_LINK_DESC_ALIGN - 1, GFP_ATOMIC); if (!vaddr) { - spin_unlock_bh(&ab->base_lock); return -ENOMEM; } @@ -1009,7 +1211,8 @@ ret = dma_mapping_error(ab->dev, paddr); if (ret) { - spin_unlock_bh(&ab->base_lock); + ath12k_warn(ab, "failed to dma map for peer %pM rx tid :%d setup\n", + peer->addr, tid); goto err_mem_free; } @@ -1022,52 +1225,87 @@ /* Update the REO queue LUT at the corresponding peer id * and tid with qaddr. */ + if (peer->mlo) + ath12k_peer_rx_tid_qref_setup(ab, peer->ml_peer_id, tid, paddr); + else ath12k_peer_rx_tid_qref_setup(ab, peer->peer_id, tid, paddr); - spin_unlock_bh(&ab->base_lock); } else { spin_unlock_bh(&ab->base_lock); - ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id, peer_mac, + ret = ath12k_wmi_peer_rx_reorder_queue_setup(ar, peer->vdev_id, peer->addr, paddr, tid, 1, ba_win_sz); + spin_lock_bh(&ab->base_lock); } return ret; err_mem_free: - kfree(vaddr); - + kfree(rx_tid->vaddr); + rx_tid->vaddr = NULL; return ret; } int ath12k_dp_rx_ampdu_start(struct ath12k *ar, - struct ieee80211_ampdu_params *params) + struct ieee80211_ampdu_params *params, + u8 link_id) { struct ath12k_base *ab = ar->ab; - struct ath12k_sta *arsta = (void *)params->sta->drv_priv; - int vdev_id = arsta->arvif->vdev_id; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(params->sta); + struct ath12k_link_sta *arsta; + struct ath12k_peer *peer; + int vdev_id; int ret; - ret = ath12k_dp_rx_peer_tid_setup(ar, params->sta->addr, vdev_id, - params->tid, params->buf_size, - params->ssn, arsta->pn_type); + arsta = ahsta->link[link_id]; + + if (!arsta) + return -ENOENT; + + vdev_id = arsta->arvif->vdev_id; + + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find(ab, vdev_id, arsta->addr); + if (!peer) { + ath12k_warn(ab, "failed to lookup peer %pM on vdev %d\n", + arsta->addr, vdev_id); + spin_unlock_bh(&ab->base_lock); + return -ENOENT; + } + + if (!peer->primary_link) { + spin_unlock_bh(&ab->base_lock); + return 0; + } + + ret = ath12k_dp_rx_peer_tid_setup(ar, params->tid, params->buf_size, + params->ssn, ahsta->pn_type, peer); if (ret) ath12k_warn(ab, "failed to setup rx tid %d\n", ret); + spin_unlock_bh(&ab->base_lock); return ret; } int ath12k_dp_rx_ampdu_stop(struct ath12k *ar, - struct ieee80211_ampdu_params *params) + struct ieee80211_ampdu_params *params, + u8 link_id) { struct ath12k_base *ab = ar->ab; struct ath12k_peer *peer; - struct ath12k_sta *arsta = (void *)params->sta->drv_priv; - int vdev_id = arsta->arvif->vdev_id; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(params->sta); + struct ath12k_link_sta *arsta; + int vdev_id; bool active; int ret; + arsta = ahsta->link[link_id]; + + if (!arsta) + return -ENOENT; + + vdev_id = arsta->arvif->vdev_id; spin_lock_bh(&ab->base_lock); - peer = ath12k_peer_find(ab, vdev_id, params->sta->addr); + peer = ath12k_peer_find(ab, vdev_id, arsta->addr); if (!peer) { spin_unlock_bh(&ab->base_lock); ath12k_warn(ab, "failed to find the peer to stop rx aggregation\n"); @@ -1081,7 +1319,7 @@ return 0; } - ret = ath12k_peer_rx_tid_reo_update(ar, peer, peer->rx_tid, 1, 0, false); + ret = ath12k_peer_rx_tid_reo_update(ab, peer, peer->rx_tid, 1, 0, false); spin_unlock_bh(&ab->base_lock); if (ret) { ath12k_warn(ab, "failed to update reo for rx tid %d: %d\n", @@ -1092,7 +1330,7 @@ return ret; } -int ath12k_dp_rx_peer_pn_replay_config(struct ath12k_vif *arvif, +int ath12k_dp_rx_peer_pn_replay_config(struct ath12k_link_vif *arvif, const u8 *peer_addr, enum set_key_cmd key_cmd, struct ieee80211_key_conf *key) @@ -1182,6 +1420,26 @@ return -EINVAL; } +static void ath12k_htt_pktlog(struct ath12k_base *ab, struct sk_buff *skb) +{ + struct htt_pktlog_msg *data = (struct htt_pktlog_msg *)skb->data; + struct ath12k_pktlog_hdr *hdr = (struct ath12k_pktlog_hdr *)data; + struct ath12k *ar; + u8 pdev_id; + + pdev_id = u32_get_bits(data->hdr, HTT_T2H_PPDU_STATS_INFO_PDEV_ID); + ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id); + if (!ar) { + ath12k_warn(ab, "invalid pdev id %d on htt pktlog\n", pdev_id); + return; + } + hdr->m_timestamp = ar->pdev->timestamp; + + trace_ath12k_htt_pktlog(ar, data->payload, hdr->size, + ar->ab->pktlog_defs_checksum); + ath12k_htt_pktlog_process(ar, (u8 *)data->payload); +} + static int ath12k_htt_tlv_ppdu_stats_parse(struct ath12k_base *ab, u16 tag, u16 len, const void *ptr, void *data) @@ -1193,6 +1451,7 @@ struct htt_ppdu_user_stats *user_stats; int cur_user; u16 peer_id; + u32 ppdu_id; ppdu_info = data; @@ -1223,7 +1482,7 @@ user_stats->is_valid_peer_id = true; memcpy(&user_stats->rate, ptr, sizeof(struct htt_ppdu_stats_user_rate)); - user_stats->tlv_flags |= BIT(tag); + ppdu_info->tlv_bitmap |= BIT(tag); break; case HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON: if (len < sizeof(struct htt_ppdu_stats_usr_cmpltn_cmn)) { @@ -1243,7 +1502,7 @@ user_stats->is_valid_peer_id = true; memcpy(&user_stats->cmpltn_cmn, ptr, sizeof(struct htt_ppdu_stats_usr_cmpltn_cmn)); - user_stats->tlv_flags |= BIT(tag); + ppdu_info->tlv_bitmap |= BIT(tag); break; case HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS: if (len < @@ -1254,6 +1513,8 @@ } ba_status = ptr; + ppdu_id = + ((struct htt_ppdu_stats_usr_cmpltn_ack_ba_status *)ptr)->ppdu_id; peer_id = le16_to_cpu(ba_status->sw_peer_id); cur_user = ath12k_get_ppdu_user_index(&ppdu_info->ppdu_stats, peer_id); @@ -1262,24 +1523,34 @@ user_stats = &ppdu_info->ppdu_stats.user_stats[cur_user]; user_stats->peer_id = peer_id; user_stats->is_valid_peer_id = true; + ppdu_info->ppdu_id = FIELD_GET(HTT_PPDU_STATS_PPDU_ID, ppdu_id); memcpy(&user_stats->ack_ba, ptr, sizeof(struct htt_ppdu_stats_usr_cmpltn_ack_ba_status)); - user_stats->tlv_flags |= BIT(tag); + ppdu_info->tlv_bitmap |= BIT(tag); + break; + case HTT_PPDU_STATS_TAG_SCH_CMD_STATUS: + ppdu_info->tlv_bitmap |= BIT(tag); break; } return 0; } -static int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len, +int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len, int (*iter)(struct ath12k_base *ar, u16 tag, u16 len, const void *ptr, void *data), void *data) { + struct htt_ppdu_stats_info *ppdu_info = NULL; const struct htt_tlv *tlv; const void *begin = ptr; u16 tlv_tag, tlv_len; int ret = -EINVAL; + if (!data) + return ret; + + ppdu_info = (struct htt_ppdu_stats_info *)data; + while (len > 0) { if (len < sizeof(*tlv)) { ath12k_err(ab, "htt tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n", @@ -1297,7 +1568,7 @@ tlv_tag, ptr - begin, len, tlv_len); return -EINVAL; } - ret = iter(ab, tlv_tag, tlv_len, ptr, data); + ret = iter(ab, tlv_tag, tlv_len, ptr, ppdu_info); if (ret == -ENOMEM) return ret; @@ -1307,68 +1578,162 @@ return 0; } +static u32 ath12k_dp_rx_ru_alloc_from_ru_size(u16 ru_size) +{ + u32 width = 0; + + switch (ru_size) { + case HTT_PPDU_STATS_RU_26: + width = NL80211_RATE_INFO_HE_RU_ALLOC_26; + break; + case HTT_PPDU_STATS_RU_52: + width = NL80211_RATE_INFO_HE_RU_ALLOC_52; + break; + case HTT_PPDU_STATS_RU_106: + width = NL80211_RATE_INFO_HE_RU_ALLOC_106; + break; + case HTT_PPDU_STATS_RU_242: + width = NL80211_RATE_INFO_HE_RU_ALLOC_242; + break; + case HTT_PPDU_STATS_RU_484: + width = NL80211_RATE_INFO_HE_RU_ALLOC_484; + break; + case HTT_PPDU_STATS_RU_996: + width = NL80211_RATE_INFO_HE_RU_ALLOC_996; + break; + default: + width = NL80211_RATE_INFO_HE_RU_ALLOC_26; + break; + } + + return width; +} + +/* Align bw value as per host data structures */ +static u8 ath12k_htt_bw_to_mac_bw(u32 rate_flags) +{ + u8 bw = HTT_USR_RATE_BW(rate_flags); + + switch (bw) { + case HTT_PPDU_STATS_BANDWIDTH_320MHZ: + bw = ATH12K_BW_320; + break; + case HTT_PPDU_STATS_BANDWIDTH_160MHZ: + bw = ATH12K_BW_160; + break; + case HTT_PPDU_STATS_BANDWIDTH_80MHZ: + bw = ATH12K_BW_80; + break; + case HTT_PPDU_STATS_BANDWIDTH_40MHZ: + bw = ATH12K_BW_40; + break; + default: + bw = ATH12K_BW_20; + break; + } + + return bw; +} + static void ath12k_update_per_peer_tx_stats(struct ath12k *ar, - struct htt_ppdu_stats *ppdu_stats, u8 user) + struct htt_ppdu_stats_info *ppdu_info, u8 user) { struct ath12k_base *ab = ar->ab; struct ath12k_peer *peer; struct ieee80211_sta *sta; - struct ath12k_sta *arsta; + struct ath12k_link_sta *arsta; struct htt_ppdu_stats_user_rate *user_rate; + struct htt_ppdu_stats *ppdu_stats = &ppdu_info->ppdu_stats; struct ath12k_per_peer_tx_stats *peer_stats = &ar->peer_tx_stats; struct htt_ppdu_user_stats *usr_stats = &ppdu_stats->user_stats[user]; struct htt_ppdu_stats_common *common = &ppdu_stats->common; int ret; u8 flags, mcs, nss, bw, sgi, dcm, rate_idx = 0; - u32 v, succ_bytes = 0; - u16 tones, rate = 0, succ_pkts = 0; - u32 tx_duration = 0; + u32 v, succ_bytes = 0, ppdu_type; + u16 rate = 0, succ_pkts = 0, ru_start, ru_end; + u32 tx_duration = 0, ru_tones, ru_format, tlv_bitmap, rate_flags; + bool is_ampdu = false, resp_type_valid; + u8 tid = HTT_PPDU_STATS_NON_QOS_TID; - bool is_ampdu = false; if (!usr_stats) return; - if (!(usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_RATE))) + tlv_bitmap = ppdu_info->tlv_bitmap; + + if (!(tlv_bitmap & BIT(HTT_PPDU_STATS_TAG_USR_RATE))) return; - if (usr_stats->tlv_flags & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) + if (tlv_bitmap & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_COMMON)) { is_ampdu = HTT_USR_CMPLTN_IS_AMPDU(usr_stats->cmpltn_cmn.flags); + if (tlv_bitmap & BIT(HTT_PPDU_STATS_TAG_SCH_CMD_STATUS)) { + succ_pkts = usr_stats->cmpltn_cmn.mpdu_success; + tid = usr_stats->cmpltn_cmn.tid_num; + } + } - if (usr_stats->tlv_flags & - BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) { + if (tlv_bitmap & BIT(HTT_PPDU_STATS_TAG_USR_COMPLTN_ACK_BA_STATUS)) { succ_bytes = le32_to_cpu(usr_stats->ack_ba.success_bytes); succ_pkts = le32_get_bits(usr_stats->ack_ba.info, HTT_PPDU_STATS_ACK_BA_INFO_NUM_MSDU_M); tid = le32_get_bits(usr_stats->ack_ba.info, HTT_PPDU_STATS_ACK_BA_INFO_TID_NUM); + ar->wmm_stats.tx_type = ath12k_tid_to_ac(tid > ATH12K_DSCP_PRIORITY ? 0: tid); + ar->wmm_stats.total_wmm_tx_pkts[ar->wmm_stats.tx_type]++; } if (common->fes_duration_us) tx_duration = le32_to_cpu(common->fes_duration_us); user_rate = &usr_stats->rate; - flags = HTT_USR_RATE_PREAMBLE(user_rate->rate_flags); - bw = HTT_USR_RATE_BW(user_rate->rate_flags) - 2; - nss = HTT_USR_RATE_NSS(user_rate->rate_flags) + 1; - mcs = HTT_USR_RATE_MCS(user_rate->rate_flags); - sgi = HTT_USR_RATE_GI(user_rate->rate_flags); - dcm = HTT_USR_RATE_DCM(user_rate->rate_flags); + ppdu_type = HTT_USR_RATE_PPDU_TYPE(user_rate->info1); + + resp_type_valid = u32_get_bits(user_rate->info1, + HTT_PPDU_STATS_USER_RATE_INFO1_RESP_TYPE_VALID); + if (resp_type_valid) { + rate_flags = user_rate->resp_rate_flags; + ru_start = user_rate->resp_ru_start; + ru_end = user_rate->ru_end; + ppdu_type = HTT_USR_RESP_RATE_PPDU_TYPE(user_rate->resp_rate_flags); + if (ppdu_type == HTT_PPDU_STATS_RESP_PPDU_TYPE_MU_OFDMA_UL) + ppdu_type = HTT_PPDU_STATS_PPDU_TYPE_MU_OFDMA; + else + ppdu_type = HTT_PPDU_STATS_PPDU_TYPE_MU_MIMO; + } else { + rate_flags = user_rate->rate_flags; + ru_start = user_rate->ru_start; + ru_end = user_rate->ru_end; + } + + flags = HTT_USR_RATE_PREAMBLE(rate_flags); + bw = ath12k_htt_bw_to_mac_bw(rate_flags); + nss = HTT_USR_RATE_NSS(rate_flags) + 1; + mcs = HTT_USR_RATE_MCS(rate_flags); + sgi = HTT_USR_RATE_GI(rate_flags); + dcm = HTT_USR_RATE_DCM(rate_flags); + ru_format = FIELD_GET(HTT_PPDU_STATS_USER_RATE_INFO0_RU_SIZE, + user_rate->info0); + if (ru_format == 1) + ru_tones = ath12k_dp_rx_ru_alloc_from_ru_size(ru_start); + else if (!ru_format) + ru_tones = ru_end - ru_start + 1; + else + ru_tones = ath12k_dp_rx_ru_alloc_from_ru_size(HTT_PPDU_STATS_RU_26); /* Note: If host configured fixed rates and in some other special * cases, the broadcast/management frames are sent in different rates. * Firmware rate's control to be skipped for this? */ - if (flags == WMI_RATE_PREAMBLE_HE && mcs > 11) { + if (flags == WMI_RATE_PREAMBLE_HE && mcs > ATH12K_HE_MCS_MAX) { ath12k_warn(ab, "Invalid HE mcs %d peer stats", mcs); return; } - if (flags == WMI_RATE_PREAMBLE_HE && mcs > ATH12K_HE_MCS_MAX) { - ath12k_warn(ab, "Invalid HE mcs %d peer stats", mcs); + if (flags == WMI_RATE_PREAMBLE_EHT && mcs > ATH12K_EHT_MCS_MAX) { + ath12k_warn(ab, "Invalid EHT mcs %d peer stats", mcs); return; } @@ -1403,7 +1768,12 @@ } sta = peer->sta; - arsta = (struct ath12k_sta *)sta->drv_priv; + arsta = ath12k_peer_get_link_sta(ab, peer); + if (!arsta) { + spin_unlock_bh(&ab->base_lock); + rcu_read_unlock(); + return; + } memset(&arsta->txrate, 0, sizeof(arsta->txrate)); @@ -1431,10 +1801,21 @@ arsta->txrate.flags = RATE_INFO_FLAGS_HE_MCS; arsta->txrate.he_dcm = dcm; arsta->txrate.he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi); - tones = le16_to_cpu(user_rate->ru_end) - - le16_to_cpu(user_rate->ru_start) + 1; - v = ath12k_he_ru_tones_to_nl80211_he_ru_alloc(tones); - arsta->txrate.he_ru_alloc = v; + arsta->txrate.he_ru_alloc = ru_tones; + peer_stats->ru_tones = arsta->txrate.he_ru_alloc; + break; + case WMI_RATE_PREAMBLE_EHT: + arsta->txrate.mcs = mcs; + arsta->txrate.flags = RATE_INFO_FLAGS_EHT_MCS; + arsta->txrate.he_dcm = dcm; + arsta->txrate.eht_gi = ath12k_eht_gi_to_nl80211_eht_gi(sgi); + v = ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc((ru_end - + ru_start) + 1); + arsta->txrate.eht_ru_alloc = v; + ru_tones = v; + peer_stats->ru_tones = arsta->txrate.eht_ru_alloc; + break; + default: break; } @@ -1452,9 +1833,13 @@ peer_stats->succ_bytes = succ_bytes; peer_stats->is_ampdu = is_ampdu; peer_stats->duration = tx_duration; + peer_stats->ru_tones = ru_tones; peer_stats->ba_fails = HTT_USR_CMPLTN_LONG_RETRY(usr_stats->cmpltn_cmn.flags) + HTT_USR_CMPLTN_SHORT_RETRY(usr_stats->cmpltn_cmn.flags); + peer_stats->ppdu_type = ppdu_type; + if (ath12k_debugfs_is_extd_tx_stats_enabled(ar)) + ath12k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); } spin_unlock_bh(&ab->base_lock); @@ -1462,12 +1847,12 @@ } static void ath12k_htt_update_ppdu_stats(struct ath12k *ar, - struct htt_ppdu_stats *ppdu_stats) + struct htt_ppdu_stats_info *ppdu_info) { u8 user; for (user = 0; user < HTT_PPDU_STATS_MAX_USERS - 1; user++) - ath12k_update_per_peer_tx_stats(ar, ppdu_stats, user); + ath12k_update_per_peer_tx_stats(ar, ppdu_info, user); } static @@ -1488,7 +1873,7 @@ typeof(*ppdu_info), list); list_del(&ppdu_info->list); ar->ppdu_stat_list_depth--; - ath12k_htt_update_ppdu_stats(ar, &ppdu_info->ppdu_stats); + ath12k_htt_update_ppdu_stats(ar, ppdu_info); kfree(ppdu_info); } } @@ -1558,6 +1943,11 @@ goto exit; } + if (ath12k_debugfs_is_pktlog_lite_mode_enabled(ar)) { + trace_ath12k_htt_ppdu_stats(ar, skb->data, len); + ath12k_htt_ppdu_pktlog_process(ar, (u8 *)skb->data, DP_RX_BUFFER_SIZE); + } + spin_lock_bh(&ar->data_lock); ppdu_info = ath12k_dp_htt_get_ppdu_desc(ar, ppdu_id); if (!ppdu_info) { @@ -1623,23 +2013,72 @@ return ret; } +static void ath12k_htt_backpressure_event_handler(struct ath12k_base *ab, + struct sk_buff *skb) +{ + u32 *data = (u32 *)skb->data; + u8 pdev_id, ring_type, ring_id, pdev_idx; + u16 hp, tp; + u32 backpressure_time; + struct ath12k_bp_stats *bp_stats; + + pdev_id = u32_get_bits(*data, HTT_BACKPRESSURE_EVENT_PDEV_ID_M); + ring_type = u32_get_bits(*data, HTT_BACKPRESSURE_EVENT_RING_TYPE_M); + ring_id = u32_get_bits(*data, HTT_BACKPRESSURE_EVENT_RING_ID_M); + ++data; + + hp = u32_get_bits(*data, HTT_BACKPRESSURE_EVENT_HP_M); + tp = u32_get_bits(*data, HTT_BACKPRESSURE_EVENT_TP_M); + ++data; + + backpressure_time = *data; + + ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "htt backpressure event, pdev %d, ring type %d,ring id %d, hp %d tp %d, backpressure time %d\n", + pdev_id, ring_type, ring_id, hp, tp, backpressure_time); + + if (ring_type == HTT_BACKPRESSURE_UMAC_RING_TYPE) { + if (ring_id >= HTT_SW_UMAC_RING_IDX_MAX) + return; + + bp_stats = &ab->soc_stats.bp_stats.umac_ring_bp_stats[ring_id]; + } else if (ring_type == HTT_BACKPRESSURE_LMAC_RING_TYPE) { + pdev_idx = DP_HW2SW_MACID(pdev_id); + + if (ring_id >= HTT_SW_LMAC_RING_IDX_MAX || pdev_idx >= MAX_RADIOS) + return; + + bp_stats = &ab->soc_stats.bp_stats.lmac_ring_bp_stats[ring_id][pdev_idx]; + } else { + ath12k_warn(ab, "unknown ring type received in htt bp event %d\n", + ring_type); + return; + } + + spin_lock_bh(&ab->base_lock); + bp_stats->hp = hp; + bp_stats->tp = tp; + bp_stats->count++; + bp_stats->jiffies = jiffies; + spin_unlock_bh(&ab->base_lock); +} + static void ath12k_htt_mlo_offset_event_handler(struct ath12k_base *ab, struct sk_buff *skb) { struct ath12k_htt_mlo_offset_msg *msg; + struct ath12k_hw_group *ag = ab->ag; struct ath12k_pdev *pdev; struct ath12k *ar; u8 pdev_id; + int i, j; msg = (struct ath12k_htt_mlo_offset_msg *)skb->data; pdev_id = u32_get_bits(__le32_to_cpu(msg->info), HTT_T2H_MLO_OFFSET_INFO_PDEV_ID); ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id); - if (!ar) { - ath12k_warn(ab, "invalid pdev id %d on htt mlo offset\n", pdev_id); + if (!ar) return; - } spin_lock_bh(&ar->data_lock); pdev = ar->pdev; @@ -1653,9 +2092,160 @@ pdev->timestamp.mlo_comp_clks = __le32_to_cpu(msg->mlo_comp_clks); pdev->timestamp.mlo_comp_timer = __le32_to_cpu(msg->mlo_comp_timer); + ag->mlo_tstamp_offset = ((u64)pdev->timestamp.mlo_offset_hi << 32 | pdev->timestamp.mlo_offset_lo); + + /* MLO TSAMP OFFSET is common for all chips and + * fetch delta_tsf2 for all the radios for this event + */ + for (i = 0; i < ag->num_chip; i++) { + struct ath12k_base *tmp_ab = ag->ab[i]; + + for (j = 0; j < tmp_ab->num_radios; j++) { + struct ath12k *tmp_ar; + + pdev = &tmp_ab->pdevs[j]; + tmp_ar = pdev->ar; + if (!tmp_ar) + continue; + + if (tmp_ab->hw_params->hal_ops->hal_get_tsf2_scratch_reg) + tmp_ab->hw_params->hal_ops->hal_get_tsf2_scratch_reg(tmp_ab, tmp_ar->lmac_id, + &tmp_ar->delta_tsf2); + } + } + + spin_unlock_bh(&ar->data_lock); } +static void ath12k_htt_vdev_txrx_stats_handler(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct htt_t2h_vdev_txrx_stats_ind *vdev_tlv; + struct htt_t2h_vdev_common_stats_tlv *soc_tlv; + struct ath12k_link_vif *arvif; + u32 *data = (u32 *)skb->data; + u32 vdev_id; + u16 payload_bytes, tlv_tag, tlv_len; + + payload_bytes = u32_get_bits(*data, HTT_T2H_VDEV_STATS_PERIODIC_PAYLOAD_BYTES); + data += 3; + + if (payload_bytes > skb->len) + return; + + while (payload_bytes > 0) { + tlv_tag = u32_get_bits(*data, HAL_TLV_HDR_TAG); + tlv_len = u32_get_bits(*data, HAL_TLV_HDR_LEN); + data++; + + if (tlv_tag == HTT_VDEV_TXRX_STATS_HW_STATS_TLV) { + vdev_tlv = (struct htt_t2h_vdev_txrx_stats_ind *)data; + vdev_id = __le32_to_cpu(vdev_tlv->vdev_id); + arvif = ath12k_mac_get_arvif_by_vdev_id(ab, vdev_id); + + arvif->vdev_stats.rx_msdu_byte_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->rx_msdu_byte_cnt_lo, + vdev_tlv->rx_msdu_byte_cnt_hi); + arvif->vdev_stats.rx_msdu_pkt_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->rx_msdu_cnt_lo, + vdev_tlv->rx_msdu_cnt_hi); + arvif->vdev_stats.tx_msdu_byte_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->tx_msdu_byte_cnt_lo, + vdev_tlv->tx_msdu_byte_cnt_hi); + arvif->vdev_stats.tx_msdu_pkt_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->tx_msdu_cnt_lo, + vdev_tlv->tx_msdu_cnt_hi); + arvif->vdev_stats.tx_retry_byte_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->tx_retry_byte_cnt_lo, + vdev_tlv->tx_retry_byte_cnt_hi); + arvif->vdev_stats.tx_retry_pkt_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->tx_retry_cnt_lo, + vdev_tlv->tx_retry_cnt_hi); + arvif->vdev_stats.tx_drop_byte_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->tx_drop_byte_cnt_lo, + vdev_tlv->tx_drop_byte_cnt_hi); + arvif->vdev_stats.tx_msdu_ttl_byte_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->msdu_ttl_byte_cnt_lo, + vdev_tlv->msdu_ttl_byte_cnt_hi); + arvif->vdev_stats.tx_msdu_ttl_pkt_cnt = + HTT_VDEV_GET_STATS_U64(vdev_tlv->msdu_ttl_cnt_lo, + vdev_tlv->msdu_ttl_cnt_hi); + } + + if (tlv_tag == HTT_VDEV_TXRX_STATS_COMMON_TLV) { + soc_tlv = (struct htt_t2h_vdev_common_stats_tlv *)data; + ab->fw_soc_drop_count = + HTT_VDEV_GET_STATS_U64(soc_tlv->soc_drop_count_lo, + soc_tlv->soc_drop_count_hi); + } + data += tlv_len >> 2; + payload_bytes -= tlv_len; + } +} + +#ifdef CONFIG_ATH12K_SAWF +static void ath12k_htt_sawf_info_ind_handler(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct htt_t2h_sawf_info_ind *resp = (struct htt_t2h_sawf_info_ind *)skb->data; + struct ath12k_peer *peer = NULL; + u32 htt_qtype, remapped_tid, peer_id, default_msduq_per_tid, default_msduq_max, sawf_msduq_per_tid; + u32 hlos_tid, flow_or, ast_idx, who_cl, tgt_opaque_id, sawf_msduq_max; + u8 msduq_index; + + htt_qtype = u32_get_bits(__le32_to_cpu(resp->info0), + HTT_T2H_SAWF_MSDUQ_INFO_0_IND_HTT_QTYPE_ID); + peer_id = u32_get_bits(__le32_to_cpu(resp->info0), + HTT_T2H_SAWF_MSDUQ_INFO_0_IND_PEER_ID); + + remapped_tid = u32_get_bits(__le32_to_cpu(resp->info1), + HTT_T2H_SAWF_MSDUQ_INFO_1_IND_REMAP_TID_ID); + hlos_tid = u32_get_bits(__le32_to_cpu(resp->info1), + HTT_T2H_SAWF_MSDUQ_INFO_1_IND_HLOS_TID_ID); + who_cl = u32_get_bits(__le32_to_cpu(resp->info1), + HTT_T2H_SAWF_MSDUQ_INFO_1_IND_WHO_CLSFY_INFO_SEL_ID); + flow_or = u32_get_bits(__le32_to_cpu(resp->info1), + HTT_T2H_SAWF_MSDUQ_INFO_1_IND_FLOW_OVERRIDE_ID); + ast_idx = u32_get_bits(__le32_to_cpu(resp->info1), + HTT_T2H_SAWF_MSDUQ_INFO_1_IND_AST_INDEX_ID); + + tgt_opaque_id = u32_get_bits(__le32_to_cpu(resp->info2), + HTT_T2H_SAWF_MSDUQ_INFO_2_IND_TGT_OPAQUE_ID); + + ath12k_dbg(ab, ATH12K_DBG_SAWF, "Sawf Info ind:\n"); + ath12k_dbg(ab, ATH12K_DBG_SAWF, + "htt_qtype[0x%x]Peer_Id[0x%x]Remp_Tid[0x%x]Hlos_Tid[0x%x]\n", + htt_qtype, + peer_id, + remapped_tid, + hlos_tid); + ath12k_dbg(ab, ATH12K_DBG_SAWF, + "who_cl[0x%x]flow_or[0x%x]Ast[0x%x]Op[0x%x]\n", + who_cl, + flow_or, + ast_idx, + tgt_opaque_id); + spin_lock_bh(&ab->base_lock); + + default_msduq_per_tid = ab->default_msduq_per_tid; + sawf_msduq_per_tid = ab->max_msduq_per_tid - ab->default_msduq_per_tid; + default_msduq_max = default_msduq_per_tid * ATH12K_SAWF_MAX_TID_SUPPORT; + sawf_msduq_max = sawf_msduq_per_tid * ATH12K_SAWF_MAX_TID_SUPPORT; + msduq_index = ((who_cl * default_msduq_max) + + (flow_or * ATH12K_SAWF_MAX_TID_SUPPORT) + hlos_tid) - + default_msduq_max; + + peer = ath12k_peer_find_by_id(ab, peer_id); + if ((msduq_index < sawf_msduq_max) && peer) { + if (peer->sawf_ctx_peer.telemetry_peer_ctx) + ath12k_telemetry_update_tid_msduq(peer->sawf_ctx_peer.telemetry_peer_ctx, + msduq_index ,remapped_tid, + (htt_qtype - default_msduq_per_tid)); + } + spin_unlock_bh(&ab->base_lock); +} +#endif /* CONFIG_ATH12K_SAWF */ void ath12k_dp_htt_htc_t2h_msg_handler(struct ath12k_base *ab, struct sk_buff *skb) { @@ -1691,6 +2281,8 @@ HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16); ath12k_dp_get_mac_addr(le32_to_cpu(resp->peer_map_ev.mac_addr_l32), peer_mac_h16, mac_addr); + ast_hash = FIELD_GET(HTT_T2H_PEER_MAP_INFO2_AST_HASH_VAL, + resp->peer_map_ev.info2); ath12k_peer_map_event(ab, vdev_id, peer_id, mac_addr, 0, 0); break; case HTT_T2H_MSG_TYPE_PEER_MAP2: @@ -1718,8 +2310,12 @@ HTT_T2H_PEER_MAP_INFO1_MAC_ADDR_H16); ath12k_dp_get_mac_addr(le32_to_cpu(resp->peer_map_ev.mac_addr_l32), peer_mac_h16, mac_addr); + ast_hash = FIELD_GET(HTT_T2H_PEER_MAP3_INFO2_AST_HASH_VAL, + resp->peer_map_ev.info2); + hw_peer_id = FIELD_GET(HTT_T2H_PEER_MAP3_INFO2_HW_PEER_ID, + resp->peer_map_ev.info2); ath12k_peer_map_event(ab, vdev_id, peer_id, mac_addr, ast_hash, - peer_id); + hw_peer_id); break; case HTT_T2H_MSG_TYPE_PEER_UNMAP: case HTT_T2H_MSG_TYPE_PEER_UNMAP2: @@ -1727,14 +2323,41 @@ HTT_T2H_PEER_UNMAP_INFO_PEER_ID); ath12k_peer_unmap_event(ab, peer_id); break; + case HTT_T2H_MSG_TYPE_MLO_RX_PEER_MAP: + ath12k_peer_mlo_map_event(ab, skb); + break; + case HTT_T2H_MSG_TYPE_MLO_RX_PEER_UNMAP: + ath12k_peer_mlo_unmap_event(ab, skb); + break; case HTT_T2H_MSG_TYPE_PPDU_STATS_IND: ath12k_htt_pull_ppdu_stats(ab, skb); break; case HTT_T2H_MSG_TYPE_EXT_STATS_CONF: + ath12k_debugfs_htt_ext_stats_handler(ab, skb); + break; + case HTT_T2H_MSG_TYPE_BKPRESSURE_EVENT_IND: + ath12k_htt_backpressure_event_handler(ab, skb); + break; + case HTT_T2H_MSG_TYPE_PKTLOG: + ath12k_htt_pktlog(ab, skb); break; case HTT_T2H_MSG_TYPE_MLO_TIMESTAMP_OFFSET_IND: ath12k_htt_mlo_offset_event_handler(ab, skb); break; + case HTT_T2H_MSG_TYPE_VDEV_TXRX_STATS_PERIODIC_IND: + ath12k_htt_vdev_txrx_stats_handler(ab, skb); + break; +#ifdef CONFIG_ATH12K_SAWF + case HTT_T2H_MSG_TYPE_SAWF_MSDUQ_INFO_IND: + ath12k_htt_sawf_info_ind_handler(ab, skb); + break; + case HTT_T2H_MSG_TYPE_SAWF_DEF_QUEUES_MAP_REPORT_CONF: + ath12k_htt_sawf_def_q_map_report_handler(ab, skb); + break; + case HTT_T2H_MSG_TYPE_STREAMING_STATS_IND: + ath12k_htt_sawf_streaming_stats_ind_handler(ab, skb); + break; +#endif /* CONFIG_ATH12K_SAWF */ default: ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "dp_htt event %d not handled\n", type); @@ -1747,7 +2370,8 @@ static int ath12k_dp_rx_msdu_coalesce(struct ath12k *ar, struct sk_buff_head *msdu_list, struct sk_buff *first, struct sk_buff *last, - u8 l3pad_bytes, int msdu_len) + u8 l3pad_bytes, int msdu_len, + struct ath12k_dp_rx_info *rx_info) { struct ath12k_base *ab = ar->ab; struct sk_buff *skb; @@ -1756,6 +2380,7 @@ struct hal_rx_desc *ldesc; int space_extra, rem_len, buf_len; u32 hal_rx_desc_sz = ar->ab->hw_params->hal_desc_sz; + bool is_continuation; /* As the msdu is spread across multiple rx buffers, * find the offset to the start of msdu for computing @@ -1771,8 +2396,9 @@ } ldesc = (struct hal_rx_desc *)last->data; - rxcb->is_first_msdu = ath12k_dp_rx_h_first_msdu(ab, ldesc); - rxcb->is_last_msdu = ath12k_dp_rx_h_last_msdu(ab, ldesc); + ab->hw_params->hal_ops->rx_desc_get_first_last_msdu(ldesc, rx_info); + rxcb->is_first_msdu = rx_info->is_first_msdu; + rxcb->is_last_msdu = rx_info->is_last_msdu; /* MSDU spans over multiple buffers because the length of the MSDU * exceeds DP_RX_BUFFER_SIZE - HAL_RX_DESC_SIZE. So assume the data @@ -1804,7 +2430,8 @@ rem_len = msdu_len - buf_first_len; while ((skb = __skb_dequeue(msdu_list)) != NULL && rem_len > 0) { rxcb = ATH12K_SKB_RXCB(skb); - if (rxcb->is_continuation) + is_continuation = rxcb->is_continuation; + if (is_continuation) buf_len = DP_RX_BUFFER_SIZE - hal_rx_desc_sz; else buf_len = rem_len; @@ -1822,8 +2449,15 @@ dev_kfree_skb_any(skb); rem_len -= buf_len; - if (!rxcb->is_continuation) + if (!is_continuation) break; + + skb = msdu_list->next; + if (likely(skb)) { + prefetch(skb); + prefetch(skb->data + 64); + prefetch(skb->data + 128); + } } return 0; @@ -1847,14 +2481,13 @@ return NULL; } -static void ath12k_dp_rx_h_csum_offload(struct ath12k *ar, struct sk_buff *msdu) +static void ath12k_dp_rx_h_csum_offload(struct ath12k *ar, struct sk_buff *msdu, + struct ath12k_dp_rx_info *rx_info) { - struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); - struct ath12k_base *ab = ar->ab; bool ip_csum_fail, l4_csum_fail; - ip_csum_fail = ath12k_dp_rx_h_ip_cksum_fail(ab, rxcb->rx_desc); - l4_csum_fail = ath12k_dp_rx_h_l4_cksum_fail(ab, rxcb->rx_desc); + ip_csum_fail = rx_info->ip_csum_fail; + l4_csum_fail = rx_info->l4_csum_fail; msdu->ip_summed = (ip_csum_fail || l4_csum_fail) ? CHECKSUM_NONE : CHECKSUM_UNNECESSARY; @@ -2000,7 +2633,9 @@ if (!rxcb->is_first_msdu || !(rxcb->is_first_msdu && rxcb->is_last_msdu)) { - WARN_ON_ONCE(1); + /* TODO: Change below stats increment back to WARN_ON_ONCE(1) + */ + ar->ab->soc_stats.first_and_last_msdu_bit_miss++; return; } @@ -2055,10 +2690,9 @@ struct hal_rx_desc *rx_desc = rxcb->rx_desc; struct ath12k_base *ab = ar->ab; size_t hdr_len, crypto_len; - struct ieee80211_hdr *hdr; + struct ieee80211_hdr hdr; + u8 *crypto_hdr, mesh_ctrl; u16 qos_ctl; - __le16 fc; - u8 *crypto_hdr; if (!(status->flag & RX_FLAG_IV_STRIPPED)) { crypto_len = ath12k_dp_rx_crypto_param_len(ar, enctype); @@ -2066,26 +2700,25 @@ ath12k_dp_rx_desc_get_crypto_header(ab, rx_desc, crypto_hdr, enctype); } - fc = cpu_to_le16(ath12k_dp_rxdesc_get_mpdu_frame_ctrl(ab, rx_desc)); - hdr_len = ieee80211_hdrlen(fc); - skb_push(msdu, hdr_len); - hdr = (struct ieee80211_hdr *)msdu->data; - hdr->frame_control = fc; - /* Get wifi header from rx_desc */ - ath12k_dp_rx_desc_get_dot11_hdr(ab, rx_desc, hdr); + ath12k_dp_rx_desc_get_dot11_hdr(ab, rx_desc, &hdr); + + hdr_len = ieee80211_hdrlen(hdr.frame_control); + mesh_ctrl = ath12k_dp_rx_h_mesh_ctl_present(ab, rx_desc); + skb_push(msdu, hdr_len); + memcpy(msdu->data, &hdr, min(hdr_len, sizeof(hdr))); if (rxcb->is_mcbc) status->flag &= ~RX_FLAG_PN_VALIDATED; /* Add QOS header */ - if (ieee80211_is_data_qos(hdr->frame_control)) { + if (ieee80211_is_data_qos(hdr.frame_control)) { qos_ctl = rxcb->tid; - if (ath12k_dp_rx_h_mesh_ctl_present(ab, rx_desc)) + if (mesh_ctrl) qos_ctl |= IEEE80211_QOS_CTL_MESH_CONTROL_PRESENT; /* TODO: Add other QoS ctl fields when required */ - memcpy(msdu->data + (hdr_len - IEEE80211_QOS_CTL_LEN), + memcpy(ieee80211_get_qos_ctl((struct ieee80211_hdr *)msdu->data), &qos_ctl, IEEE80211_QOS_CTL_LEN); } } @@ -2143,7 +2776,8 @@ ehdr = (struct ethhdr *)msdu->data; /* mac80211 allows fast path only for authorized STA */ - if (ehdr->h_proto == cpu_to_be16(ETH_P_PAE)) { + if (ehdr->h_proto == cpu_to_be16(ETH_P_PAE) || + enctype == HAL_ENCRYPT_TYPE_TKIP_MIC) { ATH12K_SKB_RXCB(msdu)->is_eapol = true; ath12k_dp_rx_h_undecap_eth(ar, msdu, enctype, status); break; @@ -2159,10 +2793,12 @@ /* TODO: Handle undecap for these formats */ break; } + ar->wmm_stats.total_wmm_rx_pkts[ar->wmm_stats.rx_type]++; } struct ath12k_peer * -ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu) +ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu, + struct ath12k_dp_rx_info *rx_info) { struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); struct hal_rx_desc *rx_desc = rxcb->rx_desc; @@ -2176,19 +2812,83 @@ if (peer) return peer; - if (!rx_desc || !(ath12k_dp_rxdesc_mac_addr2_valid(ab, rx_desc))) - return NULL; - - peer = ath12k_peer_find_by_addr(ab, + if (!(rx_info->filled & BIT_ULL(ATH12K_RX_INFO_ADDR2))) { + if (rx_desc && ath12k_dp_rxdesc_mac_addr2_valid(ab, rx_desc)) { + ether_addr_copy(rx_info->addr2, ath12k_dp_rxdesc_get_mpdu_start_addr2(ab, rx_desc)); + rx_info->filled |= BIT_ULL(ATH12K_RX_INFO_ADDR2); + } else { + return NULL; + } + } + + peer = ath12k_peer_find_by_addr(ab, rx_info->addr2); return peer; } +static bool ath12k_dp_rx_check_fast_rx(struct ath12k *ar, + struct sk_buff *msdu, + struct hal_rx_desc *rx_desc, + struct ath12k_peer *peer, + struct ath12k_dp_rx_info *rx_info) +{ + struct ethhdr *ehdr; + struct ath12k_peer *f_peer; + struct ath12k_skb_rxcb *rxcb; + u8 decap; + bool ip_is_valid; + + lockdep_assert_held(&ar->ab->base_lock); + + decap = rx_info->decap_type; + ip_is_valid = rx_info->ip_is_valid; + + rxcb = ATH12K_SKB_RXCB(msdu); + + if (unlikely(!ar->ab->stats_disable || + decap != DP_RX_DECAP_TYPE_ETHERNET2_DIX || + peer->vif->type != NL80211_IFTYPE_AP)) + return false; + + /* mcbc packets go through mac80211 for PN validation */ + if (unlikely(rxcb->is_mcbc)) + return false; + + if (unlikely(!peer->is_authorized)) + return false; + + if (unlikely(!ip_is_valid)) + return false; + + /* fast rx is supported only on ethernet decap, so + * we can directly gfet the ethernet header + */ + ehdr = (struct ethhdr *)msdu->data; + + /* requires rebroadcast from mac80211 */ + if (is_multicast_ether_addr(ehdr->h_dest)) + return false; + + /* TODO: make use of hw assisted intra-bss bit in msdu_end + * to skip peer lookup and forward frames directly. + */ + + /* check if the msdu needs to be bridged to our connected peer */ + f_peer = ath12k_peer_find_by_addr(ar->ab, ehdr->h_dest); + + if (f_peer && f_peer != peer) + return false; + + /* allow direct rx */ + return true; +} + static void ath12k_dp_rx_h_mpdu(struct ath12k *ar, struct sk_buff *msdu, struct hal_rx_desc *rx_desc, - struct ieee80211_rx_status *rx_status) + struct ath12k_dp_rx_info *rx_info, + bool *fast_rx) { bool fill_crypto_hdr; struct ath12k_base *ab = ar->ab; @@ -2197,19 +2897,62 @@ bool is_decrypted = false; struct ieee80211_hdr *hdr; struct ath12k_peer *peer; + struct ieee80211_rx_status *rx_status = rx_info->rx_status; u32 err_bitmap; + struct ath12k_dp_rx_tid *rx_tid; + u8 tid; +#if defined(CONFIG_MAC80211_PPE_SUPPORT) || defined(CONFIG_ATH12K_BONDED_DS_SUPPORT) + int vp; +#endif + struct wireless_dev *wdev = NULL; /* PN for multicast packets will be checked in mac80211 */ rxcb = ATH12K_SKB_RXCB(msdu); - fill_crypto_hdr = ath12k_dp_rx_h_is_mcbc(ar->ab, rx_desc); + fill_crypto_hdr = rx_info->is_mcbc; rxcb->is_mcbc = fill_crypto_hdr; if (rxcb->is_mcbc) - rxcb->peer_id = ath12k_dp_rx_h_peer_id(ar->ab, rx_desc); + rxcb->peer_id = rx_info->peer_id; spin_lock_bh(&ar->ab->base_lock); - peer = ath12k_dp_rx_h_find_peer(ar->ab, msdu); + peer = ath12k_dp_rx_h_find_peer(ar->ab, msdu, rx_info); if (peer) { + /* If the pkt is a valid IP packet and peer supports + * fast rx, deliver directly to net, also note that + * pkts with crypto error are not expected to arrive in this + * path, so its safe to skip checking errors here */ + if (*fast_rx && + ath12k_dp_rx_check_fast_rx(ar, msdu, rx_desc, peer, rx_info)) { + wdev = ieee80211_vif_to_wdev(peer->vif); + if (wdev) { +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + vp = peer->ppe_vp_num; + if (unlikely(wdev->bond_netdev)) + msdu->dev = wdev->bond_netdev; + else +#endif + msdu->dev = wdev->netdev; + + spin_unlock_bh(&ar->ab->base_lock); + ath12k_dp_rx_h_csum_offload(ar, msdu, rx_info); +#if defined(CONFIG_MAC80211_PPE_SUPPORT) || defined(CONFIG_ATH12K_BONDED_DS_SUPPORT) + if (vp > 0) { + if (likely(ppe_vp_tx_to_ppe(vp, msdu))) + return; + } +#endif + msdu->protocol = eth_type_trans(msdu, msdu->dev); + netif_receive_skb(msdu); + return; + } + } + + tid = rx_info->tid; + rx_tid = &peer->rx_tid[tid]; + ar->wmm_stats.rx_type = + ath12k_tid_to_ac(rx_tid->tid > ATH12K_DSCP_PRIORITY ? 0: rx_tid->tid); + ar->wmm_stats.total_wmm_rx_pkts[ar->wmm_stats.rx_type]++; + if (rxcb->is_mcbc) enctype = peer->sec_type_grp; else @@ -2219,6 +2962,16 @@ } spin_unlock_bh(&ar->ab->base_lock); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (peer) { + wdev = ieee80211_vif_to_wdev(peer->vif); + if (wdev && wdev->bond_netdev) + msdu->dev = wdev->bond_netdev; + } +#endif + + *fast_rx = false; + err_bitmap = ath12k_dp_rx_h_mpdu_err(ab, rx_desc); if (enctype != HAL_ENCRYPT_TYPE_OPEN && !err_bitmap) is_decrypted = ath12k_dp_rx_h_is_decrypted(ab, rx_desc); @@ -2246,36 +2999,43 @@ RX_FLAG_PN_VALIDATED; } - ath12k_dp_rx_h_csum_offload(ar, msdu); + ath12k_dp_rx_h_csum_offload(ar, msdu, rx_info); ath12k_dp_rx_h_undecap(ar, msdu, rx_desc, enctype, rx_status, is_decrypted); if (!is_decrypted || fill_crypto_hdr) return; - if (ath12k_dp_rx_h_decap_type(ar->ab, rx_desc) != - DP_RX_DECAP_TYPE_ETHERNET2_DIX) { + if (rx_info->decap_type != DP_RX_DECAP_TYPE_ETHERNET2_DIX) { hdr = (void *)msdu->data; hdr->frame_control &= ~__cpu_to_le16(IEEE80211_FCTL_PROTECTED); } } -static void ath12k_dp_rx_h_rate(struct ath12k *ar, struct hal_rx_desc *rx_desc, - struct ieee80211_rx_status *rx_status) +static void ath12k_dp_rx_h_rate(struct ath12k *ar, struct ath12k_dp_rx_info *rx_info) { - struct ath12k_base *ab = ar->ab; + struct ieee80211_rx_status *rx_status = rx_info->rx_status; struct ieee80211_supported_band *sband; - enum rx_msdu_start_pkt_type pkt_type; - u8 bw; - u8 rate_mcs, nss; - u8 sgi; + enum rx_msdu_start_pkt_type pkt_type = RX_MSDU_START_PKT_TYPE_11A; + u8 bw = 0; + u8 rate_mcs = 0, nss = 0; + u8 sgi = 0; bool is_cck; - pkt_type = ath12k_dp_rx_h_pkt_type(ab, rx_desc); - bw = ath12k_dp_rx_h_rx_bw(ab, rx_desc); - rate_mcs = ath12k_dp_rx_h_rate_mcs(ab, rx_desc); - nss = ath12k_dp_rx_h_nss(ab, rx_desc); - sgi = ath12k_dp_rx_h_sgi(ab, rx_desc); + if (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_PKT_TYPE)) + pkt_type = rx_info->pkt_type; + + if (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_BW)) + bw = rx_info->bw; + + if (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_RATE_MCS)) + rate_mcs = rx_info->rate_mcs; + + if (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_NSS)) + nss = rx_info->nss; + + if (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_SGI)) + sgi = rx_info->sgi; switch (pkt_type) { case RX_MSDU_START_PKT_TYPE_11A: @@ -2322,18 +3082,55 @@ } rx_status->encoding = RX_ENC_HE; rx_status->nss = nss; + rx_status->he_gi = ath12k_mac_he_gi_to_nl80211_he_gi(sgi); + rx_status->bw = ath12k_mac_bw_to_mac80211_bw(bw); + break; + case RX_MSDU_START_PKT_TYPE_11BE: + rx_status->rate_idx = rate_mcs; + if (rate_mcs > ATH12K_EHT_MCS_MAX) { + ath12k_warn(ar->ab, + "Received with invalid mcs in EHT mode %d\n", + rate_mcs); + break; + } + rx_status->encoding = RX_ENC_EHT; + rx_status->nss = nss; rx_status->he_gi = ath12k_he_gi_to_nl80211_he_gi(sgi); rx_status->bw = ath12k_mac_bw_to_mac80211_bw(bw); break; + default: + break; } } -void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, - struct ieee80211_rx_status *rx_status) +static void ath12k_dp_rx_h_fetch_info(struct ath12k_base *ab, + struct hal_rx_desc *rx_desc, + struct ath12k_dp_rx_info *rx_info) { - struct ath12k_base *ab = ar->ab; + ab->hw_params->hal_ops->rx_get_desc_info(rx_desc, rx_info); + rx_info->filled |= BIT_ULL(ATH12K_RX_INFO_PHY_META_DATA) | + BIT_ULL(ATH12K_RX_INFO_DECAP_TYPE) | + BIT_ULL(ATH12K_RX_INFO_PKT_TYPE) | + BIT_ULL(ATH12K_RX_INFO_SGI) | + BIT_ULL(ATH12K_RX_INFO_RATE_MCS) | + BIT_ULL(ATH12K_RX_INFO_BW) | + BIT_ULL(ATH12K_RX_INFO_NSS); + + if (ab->stats_disable) + return; + + if (ath12k_dp_rxdesc_mac_addr2_valid(ab, rx_desc)) { + ether_addr_copy(rx_info->addr2, + ath12k_dp_rxdesc_get_mpdu_start_addr2(ab, rx_desc)); + rx_info->filled |= BIT_ULL(ATH12K_RX_INFO_ADDR2); + } +} + +void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct ath12k_dp_rx_info *rx_info) +{ + struct ieee80211_rx_status *rx_status = rx_info->rx_status; u8 channel_num; - u32 center_freq, meta_data; + u32 center_freq, meta_data = 0; struct ieee80211_channel *channel; rx_status->freq = 0; @@ -2345,38 +3142,52 @@ rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL; - meta_data = ath12k_dp_rx_h_freq(ab, rx_desc); + if (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_PHY_META_DATA)) + meta_data = rx_info->phy_meta_data; + channel_num = meta_data; center_freq = meta_data >> 16; - if (center_freq >= 5935 && center_freq <= 7105) { + rx_status->band = NUM_NL80211_BANDS; + + if (center_freq >= ATH12K_MIN_6G_FREQ && + center_freq <= ATH12K_MAX_6G_FREQ) { rx_status->band = NL80211_BAND_6GHZ; - } else if (channel_num >= 1 && channel_num <= 14) { + rx_status->freq = center_freq; + } else if (channel_num >= ATH12K_MIN_2G_CHAN && + channel_num <= ATH12K_MAX_2G_CHAN) { rx_status->band = NL80211_BAND_2GHZ; - } else if (channel_num >= 36 && channel_num <= 173) { + } else if (channel_num >= ATH12K_MIN_5G_CHAN && + channel_num <= ATH12K_MAX_5G_CHAN) { rx_status->band = NL80211_BAND_5GHZ; - } else { + } + + if (unlikely(rx_status->band == NUM_NL80211_BANDS || !ar->ah->hw->wiphy->bands[rx_status->band])) { + ath12k_err(ar->ab, "sband is NULL for status band %d channel_num %d center_freq %d pdev_id %d\n", + rx_status->band, channel_num, center_freq, ar->pdev_idx); + spin_lock_bh(&ar->data_lock); channel = ar->rx_channel; if (channel) { rx_status->band = channel->band; channel_num = ieee80211_frequency_to_channel(channel->center_freq); + } else { + ath12k_err(ar->ab, "unable to determine channel, band for rx packet"); } spin_unlock_bh(&ar->data_lock); - ath12k_dbg_dump(ar->ab, ATH12K_DBG_DATA, NULL, "rx_desc: ", - rx_desc, sizeof(*rx_desc)); } + if (rx_status->band != NL80211_BAND_6GHZ) rx_status->freq = ieee80211_channel_to_frequency(channel_num, rx_status->band); - ath12k_dp_rx_h_rate(ar, rx_desc, rx_status); + ath12k_dp_rx_h_rate(ar, rx_info); } static void ath12k_dp_rx_deliver_msdu(struct ath12k *ar, struct napi_struct *napi, struct sk_buff *msdu, - struct ieee80211_rx_status *status) + struct ath12k_dp_rx_info *rx_info) { struct ath12k_base *ab = ar->ab; static const struct ieee80211_radiotap_he known = { @@ -2386,12 +3197,14 @@ }; struct ieee80211_radiotap_he *he; struct ieee80211_rx_status *rx_status; - struct ieee80211_sta *pubsta; - struct ath12k_peer *peer; + struct ieee80211_sta *pubsta = NULL; + struct ath12k_peer *peer = NULL; struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); u8 decap = DP_RX_DECAP_TYPE_RAW; bool is_mcbc = rxcb->is_mcbc; bool is_eapol = rxcb->is_eapol; + struct ath12k_link_sta *arsta = NULL; + struct ieee80211_rx_status *status = rx_info->rx_status; if (status->encoding == RX_ENC_HE && !(status->flag & RX_FLAG_RADIOTAP_HE) && !(status->flag & RX_FLAG_SKIP_MONITOR)) { @@ -2400,31 +3213,42 @@ status->flag |= RX_FLAG_RADIOTAP_HE; } - if (!(status->flag & RX_FLAG_ONLY_MONITOR)) - decap = ath12k_dp_rx_h_decap_type(ab, rxcb->rx_desc); + if (!(status->flag & RX_FLAG_ONLY_MONITOR) && + rx_info->filled & BIT_ULL(ATH12K_RX_INFO_DECAP_TYPE)) + decap = rx_info->decap_type; spin_lock_bh(&ab->base_lock); - peer = ath12k_dp_rx_h_find_peer(ab, msdu); + if (rxcb->peer_id) + peer = ath12k_peer_find_by_id(ab, rxcb->peer_id); + if (!peer && (rx_info->filled & BIT_ULL(ATH12K_RX_INFO_ADDR2))) + peer = ath12k_peer_find_by_addr(ab, rx_info->addr2); - pubsta = peer ? peer->sta : NULL; + if (peer && peer->sta) { + pubsta = peer->sta; + if (pubsta->valid_links) { + status->link_valid = 1; + status->link_id = peer->link_id; + } + } spin_unlock_bh(&ab->base_lock); ath12k_dbg(ab, ATH12K_DBG_DATA, - "rx skb %pK len %u peer %pM %d %s sn %u %s%s%s%s%s%s%s%s rate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n", + "rx skb %pK len %u peer %pM %d %s %s%s%s%s%s%s%s%s%s%s rate_idx %u vht_nss %u freq %u band %u flag 0x%x fcs-err %i mic-err %i amsdu-more %i\n", msdu, msdu->len, peer ? peer->addr : NULL, rxcb->tid, is_mcbc ? "mcast" : "ucast", - ath12k_dp_rx_h_seq_no(ab, rxcb->rx_desc), (status->encoding == RX_ENC_LEGACY) ? "legacy" : "", (status->encoding == RX_ENC_HT) ? "ht" : "", (status->encoding == RX_ENC_VHT) ? "vht" : "", (status->encoding == RX_ENC_HE) ? "he" : "", + (status->encoding == RX_ENC_EHT) ? "eht" : "", (status->bw == RATE_INFO_BW_40) ? "40" : "", (status->bw == RATE_INFO_BW_80) ? "80" : "", (status->bw == RATE_INFO_BW_160) ? "160" : "", + (status->bw == RATE_INFO_BW_320) ? "320" : "", status->enc_flags & RX_ENC_FLAG_SHORT_GI ? "sgi " : "", status->rate_idx, status->nss, @@ -2451,13 +3275,47 @@ !(is_mcbc && rx_status->flag & RX_FLAG_DECRYPTED)) rx_status->flag |= RX_FLAG_8023; - ieee80211_rx_napi(ar->hw, pubsta, msdu, napi); + ieee80211_rx_napi(ar->ah->hw, pubsta, msdu, napi); + + if (ath12k_debugfs_is_extd_rx_stats_enabled(ar)) { + if (!(status->flag & RX_FLAG_ONLY_MONITOR)) { + spin_lock_bh(&ar->ab->base_lock); + if (peer && peer->sta) + arsta = ath12k_peer_get_link_sta(ar->ab, peer); + spin_unlock_bh(&ar->ab->base_lock); + if (arsta) + atomic_inc(&arsta->drv_rx_pkts.pkts_out); + } + } +} + +static bool ath12k_dp_rx_check_max_nwifi_hdr_len(struct ath12k_base *ab, + struct hal_rx_desc *rx_desc, + struct sk_buff *msdu, + const char *msg) +{ + struct ieee80211_hdr *hdr; + u32 hdr_len; + + hdr = (struct ieee80211_hdr *)msdu->data; + hdr_len = ieee80211_hdrlen(hdr->frame_control); + if (unlikely(hdr_len > DP_MAX_NWIFI_HDR_LEN)) { + ab->soc_stats.invalid_rbm++; + ath12k_err_dump(ab, msg, "msdu_data: ", msdu->data, msdu->len, + NULL); + ath12k_err_dump(ab, NULL, "rx_desc: ", rx_desc, sizeof(*rx_desc), + NULL); + return true; + } + + return false; } static int ath12k_dp_rx_process_msdu(struct ath12k *ar, struct sk_buff *msdu, struct sk_buff_head *msdu_list, - struct ieee80211_rx_status *rx_status) + struct ath12k_dp_rx_info *rx_info, + bool *fast_rx) { struct ath12k_base *ab = ar->ab; struct hal_rx_desc *rx_desc, *lrx_desc; @@ -2478,7 +3336,8 @@ rx_desc = (struct hal_rx_desc *)msdu->data; lrx_desc = (struct hal_rx_desc *)last_buf->data; - if (!ath12k_dp_rx_h_msdu_done(ab, lrx_desc)) { + ab->hw_params->hal_ops->rx_get_desc_msdulen_l3pad(lrx_desc, rx_info); + if (!rx_info->msdu_done) { ath12k_warn(ab, "msdu_done bit in msdu_end is not set\n"); ret = -EIO; goto free_out; @@ -2486,8 +3345,8 @@ rxcb = ATH12K_SKB_RXCB(msdu); rxcb->rx_desc = rx_desc; - msdu_len = ath12k_dp_rx_h_msdu_len(ab, lrx_desc); - l3_pad_bytes = ath12k_dp_rx_h_l3pad(ab, lrx_desc); + msdu_len = rx_info->msdu_len; + l3_pad_bytes = rx_info->l3_pad_bytes; if (rxcb->is_frag) { skb_pull(msdu, hal_rx_desc_sz); @@ -2504,7 +3363,8 @@ } else { ret = ath12k_dp_rx_msdu_coalesce(ar, msdu_list, msdu, last_buf, - l3_pad_bytes, msdu_len); + l3_pad_bytes, msdu_len, + rx_info); if (ret) { ath12k_warn(ab, "failed to coalesce msdu rx buffer%d\n", ret); @@ -2512,10 +3372,23 @@ } } - ath12k_dp_rx_h_ppdu(ar, rx_desc, rx_status); - ath12k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_status); + ath12k_dp_rx_h_fetch_info(ab, rx_desc, rx_info); + + if (rx_info->decap_type == DP_RX_DECAP_TYPE_NATIVE_WIFI && + ath12k_dp_rx_check_max_nwifi_hdr_len(ab, rx_desc, msdu, + "Invalid len in Rx\n")) { + WARN_ON_ONCE(1); + ret = -EINVAL; + goto free_out; + } + + ath12k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_info, fast_rx); + if (*fast_rx) + return 0; + + ath12k_dp_rx_h_ppdu(ar, rx_info); - rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; + rx_info->rx_status->flag |= RX_FLAG_SKIP_MONITOR | RX_FLAG_DUP_VALIDATED; return 0; @@ -2530,131 +3403,255 @@ { struct ieee80211_rx_status rx_status = {0}; struct ath12k_skb_rxcb *rxcb; + struct ath12k_dp_rx_info rx_info; struct sk_buff *msdu; struct ath12k *ar; - u8 mac_id; + u8 mac_id, hw_link_id; int ret; + bool fast_rx; + struct sk_buff *skb; if (skb_queue_empty(msdu_list)) return; + rx_info.filled = 0; + rx_info.rx_status = &rx_status; + rcu_read_lock(); while ((msdu = __skb_dequeue(msdu_list))) { + skb = msdu_list->next; + if (likely(skb)) { + prefetch(skb); + prefetch(&skb->protocol); + prefetch(&skb->data); + prefetch(skb->data); + prefetch(skb->data + 64); + prefetch(skb->data + 128); + } rxcb = ATH12K_SKB_RXCB(msdu); - mac_id = rxcb->mac_id; - ar = ab->pdevs[mac_id].ar; - if (!rcu_dereference(ab->pdevs_active[mac_id])) { + /* Enable fast rx by default, the value will cahnge based on peer cap + * and packet type */ + fast_rx = true; + rxcb->napi = napi; + + hw_link_id = rxcb->hw_link_id; + if (hw_link_id >= ATH12K_GROUP_MAX_RADIO) { dev_kfree_skb_any(msdu); + ath12k_warn(ab, "invalid hw link id %d\n", hw_link_id); continue; } - if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) { + ar = rcu_dereference(ab->ag->hw_links[hw_link_id]); + if (!ar) { + dev_kfree_skb_any(msdu); + ath12k_warn(ab, "invalid pdev for hw link id %d\n", hw_link_id); + continue; + } + + mac_id = ar->pdev_idx; + if (!rcu_dereference(ar->ab->pdevs_active[mac_id])) { + dev_kfree_skb_any(msdu); + continue; + } + + if (unlikely(test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags))) { dev_kfree_skb_any(msdu); continue; } - ret = ath12k_dp_rx_process_msdu(ar, msdu, msdu_list, &rx_status); + ret = ath12k_dp_rx_process_msdu(ar, msdu, msdu_list, &rx_info, + &fast_rx); if (ret) { ath12k_dbg(ab, ATH12K_DBG_DATA, - "Unable to process msdu %d", ret); + "Unable to process %s chip_id %d msdu %d", + (ab != ar->ab) ? "partner" : "own", + ar->ab->chip_id, ret); dev_kfree_skb_any(msdu); continue; } - ath12k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_status); + if (!fast_rx) { + ab->soc_stats.non_fast_rx[ring_id][ar->ab->chip_id]++; + ath12k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_info); + } else { + ab->soc_stats.fast_rx[ring_id][ar->ab->chip_id]++; + } } rcu_read_unlock(); } +/* Sends WMI config to filter packets to route packets to WBM release ring */ +int ath12k_dp_rx_pkt_type_filter(struct ath12k *ar, + enum ath12k_routing_pkt_type pkt_type, + u32 meta_data) +{ + struct ath12k_wmi_pkt_route_param param; + int ret; + + /* Routing Eapol/ARP packets to CCE is only allowed now */ + if (pkt_type != ATH12K_PKT_TYPE_EAP && + pkt_type != ATH12K_PKT_TYPE_ARP_IPV4) + return -EINVAL; + + param.opcode = ATH12K_WMI_PKTROUTE_ADD; + param.meta_data = meta_data; + param.dst_ring = ATH12K_ROUTE_WBM_RELEASE(ar->ab); + param.dst_ring_handler = ATH12K_WMI_PKTROUTE_USE_CCE; + param.route_type_bmap = 1 << pkt_type; + + ret = ath12k_wmi_send_pdev_pkt_route(ar, ¶m); + if (ret) + ath12k_warn(ar->ab, "failed to configure pkt route %d", ret); + + return ret; +} + int ath12k_dp_rx_process(struct ath12k_base *ab, int ring_id, struct napi_struct *napi, int budget) { + struct ath12k_base *src_ab; struct ath12k_rx_desc_info *desc_info; struct ath12k_dp *dp = &ab->dp; struct dp_rxdma_ring *rx_ring = &dp->rx_refill_buf_ring; - struct hal_reo_dest_ring *desc; - int num_buffs_reaped = 0; + int i, num_buffs_reaped[ATH12K_MAX_SOCS] = { }; struct sk_buff_head msdu_list; struct ath12k_skb_rxcb *rxcb; int total_msdu_reaped = 0; struct hal_srng *srng; struct sk_buff *msdu; + u32 *rx_desc; bool done = false; - int mac_id; u64 desc_va; + struct ath12k_link_sta *arsta = NULL; + struct ath12k_peer *peer = NULL; + struct ath12k *ar; + u8 hw_link_id, chip_id; + int valid_entries; + struct list_head rx_desc_used_list[ATH12K_MAX_SOCS]; __skb_queue_head_init(&msdu_list); + for (i = 0; i < ATH12K_MAX_SOCS; i++) + INIT_LIST_HEAD(&rx_desc_used_list[i]); + srng = &ab->hal.srng_list[dp->reo_dst_ring[ring_id].ring_id]; spin_lock_bh(&srng->lock); try_again: ath12k_hal_srng_access_begin(ab, srng); + valid_entries = ath12k_hal_srng_dst_num_free(ab, srng, false); + if (unlikely(!valid_entries)) { + ath12k_hal_srng_access_end(ab, srng); + spin_unlock_bh(&srng->lock); + return -EINVAL; + } + ath12k_hal_srng_dst_invalidate_entry(ab, srng, valid_entries); - while ((desc = ath12k_hal_srng_dst_get_next_entry(ab, srng))) { + while (likely((rx_desc = ath12k_hal_srng_dst_get_next_cache_entry(ab, srng)))) { + struct hal_reo_dest_ring desc = *(struct hal_reo_dest_ring *)rx_desc; enum hal_reo_dest_ring_push_reason push_reason; u32 cookie; - cookie = le32_get_bits(desc->buf_addr_info.info1, + cookie = le32_get_bits(desc.buf_addr_info.info1, BUFFER_ADDR_INFO1_SW_COOKIE); - mac_id = le32_get_bits(desc->info0, - HAL_REO_DEST_RING_INFO0_SRC_LINK_ID); - desc_va = ((u64)le32_to_cpu(desc->buf_va_hi) << 32 | - le32_to_cpu(desc->buf_va_lo)); + hw_link_id = le32_get_bits(desc.info0, + HAL_REO_DEST_RING_INFO0_SRC_LINK_ID); + desc_va = ((u64)le32_to_cpu(desc.buf_va_hi) << 32 | + le32_to_cpu(desc.buf_va_lo)); desc_info = (struct ath12k_rx_desc_info *)((unsigned long)desc_va); + rcu_read_lock(); + + if (hw_link_id < ATH12K_GROUP_MAX_RADIO) + ar = rcu_dereference(ab->ag->hw_links[hw_link_id]); + else + ar = NULL; + + if (!ar) { + rcu_read_unlock(); + + ab->soc_stats.hal_reo_error[ring_id]++; + ath12k_warn(ab, "Rx with invalid/inactive hw_link_id %d cookie 0x%x\n", hw_link_id, cookie); + + if (desc_info) { + dev_kfree_skb_any(desc_info->skb); + desc_info->skb = NULL; + } + continue; + } + + src_ab = ar->ab; + rcu_read_unlock(); + /* retry manual desc retrieval */ + if (unlikely(!desc_info)) { + desc_info = ath12k_dp_get_rx_desc(src_ab, cookie); if (!desc_info) { - desc_info = ath12k_dp_get_rx_desc(ab, cookie); - if (!desc_info) { - ath12k_warn(ab, "Invalid cookie in manual desc retrieval"); + ath12k_warn(ab, "Invalid cookie in manual desc retrieval cookie 0x%x", cookie); continue; } } - if (desc_info->magic != ATH12K_DP_RX_DESC_MAGIC) + if (unlikely(desc_info->magic != ATH12K_DP_RX_DESC_MAGIC)) ath12k_warn(ab, "Check HW CC implementation"); + chip_id = src_ab->chip_id; + msdu = desc_info->skb; desc_info->skb = NULL; + desc_info->paddr = 0; - spin_lock_bh(&dp->rx_desc_lock); - list_move_tail(&desc_info->list, &dp->rx_desc_free_list); - spin_unlock_bh(&dp->rx_desc_lock); + list_add_tail(&desc_info->list, &rx_desc_used_list[chip_id]); rxcb = ATH12K_SKB_RXCB(msdu); - dma_unmap_single(ab->dev, rxcb->paddr, + dmac_inv_range_no_dsb(msdu->data, msdu->data + (msdu->len + skb_tailroom(msdu))); + dma_unmap_single_attrs(src_ab->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu), - DMA_FROM_DEVICE); + DMA_FROM_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); - num_buffs_reaped++; + num_buffs_reaped[chip_id]++; + ab->soc_stats.reo_rx[ring_id][chip_id]++; - push_reason = le32_get_bits(desc->info0, + push_reason = le32_get_bits(desc.info0, HAL_REO_DEST_RING_INFO0_PUSH_REASON); - if (push_reason != - HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION) { + if (unlikely(push_reason != + HAL_REO_DEST_RING_PUSH_REASON_ROUTING_INSTRUCTION)) { dev_kfree_skb_any(msdu); - ab->soc_stats.hal_reo_error[dp->reo_dst_ring[ring_id].ring_id]++; + ab->soc_stats.hal_reo_error[ring_id]++; continue; } - rxcb->is_first_msdu = !!(le32_to_cpu(desc->rx_msdu_info.info0) & + rxcb->is_first_msdu = !!(le32_to_cpu(desc.rx_msdu_info.info0) & RX_MSDU_DESC_INFO0_FIRST_MSDU_IN_MPDU); - rxcb->is_last_msdu = !!(le32_to_cpu(desc->rx_msdu_info.info0) & + rxcb->is_last_msdu = !!(le32_to_cpu(desc.rx_msdu_info.info0) & RX_MSDU_DESC_INFO0_LAST_MSDU_IN_MPDU); - rxcb->is_continuation = !!(le32_to_cpu(desc->rx_msdu_info.info0) & + rxcb->is_continuation = !!(le32_to_cpu(desc.rx_msdu_info.info0) & RX_MSDU_DESC_INFO0_MSDU_CONTINUATION); - rxcb->mac_id = mac_id; - rxcb->peer_id = le32_get_bits(desc->rx_mpdu_info.peer_meta_data, + rxcb->hw_link_id = hw_link_id; + rxcb->peer_id = le32_get_bits(desc.rx_mpdu_info.peer_meta_data, RX_MPDU_DESC_META_DATA_PEER_ID); - rxcb->tid = le32_get_bits(desc->rx_mpdu_info.info0, + rxcb->tid = le32_get_bits(desc.rx_mpdu_info.info0, RX_MPDU_DESC_INFO0_TID); + ar->wmm_stats.rx_type = ath12k_tid_to_ac(rxcb->tid > ATH12K_DSCP_PRIORITY ? 0: rxcb->tid); + + if (ath12k_debugfs_is_extd_rx_stats_enabled(ar) && rxcb->peer_id) { + rcu_read_lock(); + spin_lock_bh(&src_ab->base_lock); + peer = ath12k_peer_find_by_id(src_ab, rxcb->peer_id); + if (peer && peer->sta) + arsta = ath12k_peer_get_link_sta(src_ab, peer); + spin_unlock_bh(&src_ab->base_lock); + if (arsta) + atomic_inc(&arsta->drv_rx_pkts.pkts_frm_hw); + rcu_read_unlock(); + } + __skb_queue_tail(&msdu_list, msdu); if (!rxcb->is_continuation) { @@ -2683,12 +3680,23 @@ spin_unlock_bh(&srng->lock); - if (!total_msdu_reaped) + if (unlikely(!total_msdu_reaped)) goto exit; - /* TODO: Move to implicit BM? */ - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_buffs_reaped, - ab->hw_params->hal_params->rx_buf_rbm, true); + for (i = 0; i < ab->ag->num_chip; i++) { + if (!num_buffs_reaped[i]) + continue; + + src_ab = ab->ag->ab[i]; + if (!src_ab) + continue; + + rx_ring = &src_ab->dp.rx_refill_buf_ring; + + ath12k_dp_rx_bufs_replenish(src_ab, rx_ring, + &rx_desc_used_list[i], + num_buffs_reaped[i]); + } ath12k_dp_rx_process_received_packets(ab, napi, &msdu_list, ring_id); @@ -2711,27 +3719,13 @@ spin_unlock_bh(&rx_tid->ab->base_lock); } -int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id) +int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, struct ath12k_peer *peer, + struct crypto_shash *tfm) { struct ath12k_base *ab = ar->ab; - struct crypto_shash *tfm; - struct ath12k_peer *peer; struct ath12k_dp_rx_tid *rx_tid; int i; - tfm = crypto_alloc_shash("michael_mic", 0, 0); - if (IS_ERR(tfm)) - return PTR_ERR(tfm); - - spin_lock_bh(&ab->base_lock); - - peer = ath12k_peer_find(ab, vdev_id, peer_mac); - if (!peer) { - spin_unlock_bh(&ab->base_lock); - ath12k_warn(ab, "failed to find the peer to set up fragment info\n"); - return -ENOENT; - } - for (i = 0; i <= IEEE80211_NUM_TIDS; i++) { rx_tid = &peer->rx_tid[i]; rx_tid->ab = ab; @@ -2740,7 +3734,7 @@ } peer->tfm_mmic = tfm; - spin_unlock_bh(&ab->base_lock); + peer->dp_setup_done = true; return 0; } @@ -2795,6 +3789,7 @@ struct ieee80211_key_conf *key_conf; struct ieee80211_hdr *hdr; u8 mic[IEEE80211_CCMP_MIC_LEN]; + struct ath12k_dp_rx_info rx_info; int head_len, tail_len, ret; size_t data_len; u32 hdr_len, hal_rx_desc_sz = ar->ab->hw_params->hal_desc_sz; @@ -2804,6 +3799,9 @@ if (ath12k_dp_rx_h_enctype(ab, rx_desc) != HAL_ENCRYPT_TYPE_TKIP_MIC) return 0; + rx_info.filled = 0; + rx_info.rx_status = rxs; + hdr = (struct ieee80211_hdr *)(msdu->data + hal_rx_desc_sz); hdr_len = ieee80211_hdrlen(hdr->frame_control); head_len = hdr_len + hal_rx_desc_sz + IEEE80211_TKIP_IV_LEN; @@ -2830,14 +3828,23 @@ (ATH12K_SKB_RXCB(msdu))->is_first_msdu = true; (ATH12K_SKB_RXCB(msdu))->is_last_msdu = true; + ath12k_dp_rx_h_fetch_info(ab, rx_desc, &rx_info); + rxs->flag |= RX_FLAG_MMIC_ERROR | RX_FLAG_MMIC_STRIPPED | RX_FLAG_IV_STRIPPED | RX_FLAG_DECRYPTED; skb_pull(msdu, hal_rx_desc_sz); - ath12k_dp_rx_h_ppdu(ar, rx_desc, rxs); + if (rx_info.decap_type == DP_RX_DECAP_TYPE_NATIVE_WIFI && + ath12k_dp_rx_check_max_nwifi_hdr_len(ab, rx_desc, msdu, + "Invalid len in verify tkip\n")) { + WARN_ON_ONCE(1); + return -EINVAL; + } + + ath12k_dp_rx_h_ppdu(ar, &rx_info); ath12k_dp_rx_h_undecap(ar, msdu, rx_desc, HAL_ENCRYPT_TYPE_TKIP_MIC, rxs, true); - ieee80211_rx(ar->hw, msdu); + ieee80211_rx(ar->ah->hw, msdu); return -EINVAL; } @@ -2992,7 +3999,7 @@ buf_paddr = dma_map_single(ab->dev, defrag_skb->data, defrag_skb->len + skb_tailroom(defrag_skb), - DMA_FROM_DEVICE); + DMA_TO_DEVICE); if (dma_mapping_error(ab->dev, buf_paddr)) return -ENOMEM; @@ -3008,9 +4015,9 @@ } desc_info->skb = defrag_skb; + desc_info->in_use = true; list_del(&desc_info->list); - list_add_tail(&desc_info->list, &dp->rx_desc_used_list); spin_unlock_bh(&dp->rx_desc_lock); ATH12K_SKB_RXCB(defrag_skb)->paddr = buf_paddr; @@ -3036,7 +4043,7 @@ ath12k_hal_rx_buf_addr_info_set(&reo_ent_ring->buf_addr_info, link_paddr, cookie, - HAL_RX_BUF_RBM_WBM_CHIP0_IDLE_DESC_LIST); + dp->idle_link_rbm_id); mpdu_info = u32_encode_bits(1, RX_MPDU_DESC_INFO0_MSDU_COUNT) | u32_encode_bits(0, RX_MPDU_DESC_INFO0_FRAG_FLAG) | @@ -3072,13 +4079,13 @@ err_free_desc: spin_lock_bh(&dp->rx_desc_lock); - list_del(&desc_info->list); - list_add_tail(&desc_info->list, &dp->rx_desc_free_list); desc_info->skb = NULL; + desc_info->in_use = false; + list_add_tail(&desc_info->list, &dp->rx_desc_free_list); spin_unlock_bh(&dp->rx_desc_lock); err_unmap_dma: dma_unmap_single(ab->dev, buf_paddr, defrag_skb->len + skb_tailroom(defrag_skb), - DMA_FROM_DEVICE); + DMA_TO_DEVICE); return ret; } @@ -3206,6 +4213,14 @@ ret = -ENOENT; goto out_unlock; } + + if (!peer->dp_setup_done) { + ath12k_warn(ab, "The peer %pM [%d] has not initialized its datapath\n", + peer->addr, peer_id); + ret = -ENOENT; + goto out_unlock; + } + rx_tid = &peer->rx_tid[tid]; if ((!skb_queue_empty(&rx_tid->rx_frags) && seqno != rx_tid->cur_sn) || @@ -3221,7 +4236,7 @@ goto out_unlock; } - if (frag_no > __fls(rx_tid->rx_frag_bitmap)) + if (!rx_tid->rx_frag_bitmap || (frag_no > __fls(rx_tid->rx_frag_bitmap))) __skb_queue_tail(&rx_tid->rx_frags, msdu); else ath12k_dp_rx_h_sort_frags(ab, &rx_tid->rx_frags, msdu); @@ -3283,7 +4298,8 @@ static int ath12k_dp_process_rx_err_buf(struct ath12k *ar, struct hal_reo_dest_ring *desc, - bool drop, u32 cookie) + bool drop, u32 cookie, + struct list_head *list) { struct ath12k_base *ab = ar->ab; struct sk_buff *msdu; @@ -3302,7 +4318,7 @@ if (!desc_info) { desc_info = ath12k_dp_get_rx_desc(ab, cookie); if (!desc_info) { - ath12k_warn(ab, "Invalid cookie in manual desc retrieval"); + ath12k_warn(ab, "Invalid cookie in manual desc retrieval cookie 0x%x", cookie); return -EINVAL; } } @@ -3312,9 +4328,7 @@ msdu = desc_info->skb; desc_info->skb = NULL; - spin_lock_bh(&ab->dp.rx_desc_lock); - list_move_tail(&desc_info->list, &ab->dp.rx_desc_free_list); - spin_unlock_bh(&ab->dp.rx_desc_lock); + list_add_tail(&desc_info->list, list); rxcb = ATH12K_SKB_RXCB(msdu); dma_unmap_single(ar->ab->dev, rxcb->paddr, @@ -3359,11 +4373,46 @@ return 0; } +static int ath12k_dp_h_msdu_buffer_type(struct ath12k_base *ab, + struct hal_reo_dest_ring *desc, + struct list_head *list) +{ + struct ath12k_rx_desc_info *desc_info; + struct sk_buff *msdu; + struct ath12k_skb_rxcb *rxcb; + u64 desc_va; + + ab->soc_stats.reo_excep_msdu_buf_type++; + + desc_va = ((u64)desc->buf_va_hi << 32 | desc->buf_va_lo); + desc_info = (struct ath12k_rx_desc_info *)(uintptr_t)desc_va; + if (!desc_info) { + ath12k_warn(ab, " rx exception, hw cookie conversion failed"); + return -EINVAL; + } + + if (desc_info->magic != ATH12K_DP_RX_DESC_MAGIC) { + ath12k_warn(ab, " rx exception, magic check failed"); + return -EINVAL; + } + + msdu = desc_info->skb; + desc_info->skb = NULL; + list_add_tail(&desc_info->list, list); + rxcb = ATH12K_SKB_RXCB(msdu); + dma_unmap_single(ab->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu), + DMA_FROM_DEVICE); + dev_kfree_skb_any(msdu); + + return 0; +} + int ath12k_dp_rx_process_err(struct ath12k_base *ab, struct napi_struct *napi, int budget) { u32 msdu_cookies[HAL_NUM_RX_MSDUS_PER_LINK_DESC]; struct dp_link_desc_bank *link_desc_banks; + struct ath12k_base *src_ab; enum hal_rx_buf_return_buf_manager rbm; struct hal_rx_msdu_link *link_desc_va; int tot_n_bufs_reaped, quota, ret, i; @@ -3373,18 +4422,22 @@ u32 desc_bank, num_msdus; struct hal_srng *srng; struct ath12k_dp *dp; - int mac_id; - struct ath12k *ar; + struct ath12k *ar = NULL; dma_addr_t paddr; - bool is_frag; - bool drop = false; + bool is_frag, drop; + char buf[64] = {0}; + u8 hw_link_id, chip_id; + int num_buffs_reaped[ATH12K_MAX_SOCS] = { }; + struct list_head rx_desc_used_list[ATH12K_MAX_SOCS]; tot_n_bufs_reaped = 0; quota = budget; dp = &ab->dp; reo_except = &dp->reo_except_ring; - link_desc_banks = dp->link_desc_banks; + + for (i = 0; i < ATH12K_MAX_SOCS; i++) + INIT_LIST_HEAD(&rx_desc_used_list[i]); srng = &ab->hal.srng_list[reo_except->ring_id]; @@ -3398,20 +4451,61 @@ ret = ath12k_hal_desc_reo_parse_err(ab, reo_desc, &paddr, &desc_bank); if (ret) { - ath12k_warn(ab, "failed to parse error reo desc %d\n", - ret); - continue; + scnprintf(buf, sizeof(buf), "failed to parse error reo desc %d\n", ret); + ath12k_err_dump(ab, buf, "rx err desc: ", reo_desc, + sizeof(*reo_desc), srng); + BUG_ON(1); } + + hw_link_id = u32_get_bits(reo_desc->info0, + HAL_REO_DEST_RING_INFO0_SRC_LINK_ID); + + rcu_read_lock(); + if (hw_link_id < ATH12K_GROUP_MAX_RADIO) + ar = rcu_dereference(ab->ag->hw_links[hw_link_id]); + else + ar = NULL; + rcu_read_unlock(); + + if (!ar) { + ath12k_err(ab, "invalid src link id %d on chip id %d err process\n", + hw_link_id, ab->chip_id); + + ath12k_err_dump(ab, NULL, "rx err desc: ", reo_desc, + sizeof(*reo_desc), srng); + BUG_ON(1); + } + + src_ab = ar->ab; + chip_id = src_ab->chip_id; + + /* Below case is added to handle data packet from un-associated clients. + * As it is expected that AST lookup will fail for + * un-associated station's data packets. + */ + if (u32_get_bits(reo_desc->info0, HAL_REO_DEST_RING_INFO0_BUFFER_TYPE) == + HAL_REO_DEST_RING_BUFFER_TYPE_MSDU) { + if (!ath12k_dp_h_msdu_buffer_type(src_ab, reo_desc, + &rx_desc_used_list[chip_id])) { + num_buffs_reaped[chip_id]++; + tot_n_bufs_reaped++; + } + + goto end_loop; + } + + dp = &src_ab->dp; + link_desc_banks = dp->link_desc_banks; link_desc_va = link_desc_banks[desc_bank].vaddr + (paddr - link_desc_banks[desc_bank].paddr); ath12k_hal_rx_msdu_link_info_get(link_desc_va, &num_msdus, msdu_cookies, &rbm); - if (rbm != HAL_RX_BUF_RBM_WBM_CHIP0_IDLE_DESC_LIST && + if (rbm != dp->idle_link_rbm_id && rbm != HAL_RX_BUF_RBM_SW3_BM && - rbm != ab->hw_params->hal_params->rx_buf_rbm) { + rbm != src_ab->hw_params->hal_params->rx_buf_rbm) { ab->soc_stats.invalid_rbm++; ath12k_warn(ab, "invalid return buffer manager %d\n", rbm); - ath12k_dp_rx_link_desc_return(ab, reo_desc, + ath12k_dp_rx_link_desc_return(src_ab, reo_desc, HAL_WBM_REL_BM_ACT_REL_MSDU); continue; } @@ -3421,25 +4515,31 @@ /* Process only rx fragments with one msdu per link desc below, and drop * msdu's indicated due to error reasons. + * Dynamic fragmentation not supported in Multi-link client, so drop. */ - if (!is_frag || num_msdus > 1) { + if (!is_frag || num_msdus > 1 || src_ab != ab) drop = true; + else + drop = false; + + if (drop) { /* Return the link desc back to wbm idle list */ - ath12k_dp_rx_link_desc_return(ab, reo_desc, + ath12k_dp_rx_link_desc_return(src_ab, reo_desc, HAL_WBM_REL_BM_ACT_PUT_IN_IDLE); + + ar->wmm_stats.total_wmm_rx_drop[ar->wmm_stats.rx_type] += num_msdus; } for (i = 0; i < num_msdus; i++) { - mac_id = le32_get_bits(reo_desc->info0, - HAL_REO_DEST_RING_INFO0_SRC_LINK_ID); - - ar = ab->pdevs[mac_id].ar; - if (!ath12k_dp_process_rx_err_buf(ar, reo_desc, drop, - msdu_cookies[i])) + msdu_cookies[i], + &rx_desc_used_list[chip_id])) { + num_buffs_reaped[chip_id]++; tot_n_bufs_reaped++; } + } +end_loop: if (tot_n_bufs_reaped >= quota) { tot_n_bufs_reaped = quota; goto exit; @@ -3453,10 +4553,20 @@ spin_unlock_bh(&srng->lock); - rx_ring = &dp->rx_refill_buf_ring; + for (i = 0; i < ab->ag->num_chip; i++) { + if (!num_buffs_reaped[i]) + continue; - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, tot_n_bufs_reaped, - ab->hw_params->hal_params->rx_buf_rbm, true); + src_ab = ab->ag->ab[i]; + if (!src_ab) + continue; + + rx_ring = &src_ab->dp.rx_refill_buf_ring; + + ath12k_dp_rx_bufs_replenish(src_ab, rx_ring, + &rx_desc_used_list[i], + num_buffs_reaped[i]); + } return tot_n_bufs_reaped; } @@ -3486,7 +4596,7 @@ } static int ath12k_dp_rx_h_null_q_desc(struct ath12k *ar, struct sk_buff *msdu, - struct ieee80211_rx_status *status, + struct ath12k_dp_rx_info *rx_info, struct sk_buff_head *msdu_list) { struct ath12k_base *ab = ar->ab; @@ -3495,19 +4605,13 @@ u8 l3pad_bytes; struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); u32 hal_rx_desc_sz = ar->ab->hw_params->hal_desc_sz; + bool fast_rx; + struct ath12k_link_sta *arsta = NULL; + struct ath12k_peer *peer = NULL; msdu_len = ath12k_dp_rx_h_msdu_len(ab, desc); peer_id = ath12k_dp_rx_h_peer_id(ab, desc); - spin_lock(&ab->base_lock); - if (!ath12k_peer_find_by_id(ab, peer_id)) { - spin_unlock(&ab->base_lock); - ath12k_dbg(ab, ATH12K_DBG_DATA, "invalid peer id received in wbm err pkt%d\n", - peer_id); - return -EINVAL; - } - spin_unlock(&ab->base_lock); - if (!rxcb->is_frag && ((msdu_len + hal_rx_desc_sz) > DP_RX_BUFFER_SIZE)) { /* First buffer will be freed by the caller, so deduct it's length */ msdu_len = msdu_len - (DP_RX_BUFFER_SIZE - hal_rx_desc_sz); @@ -3549,9 +4653,19 @@ skb_put(msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len); skb_pull(msdu, hal_rx_desc_sz + l3pad_bytes); } - ath12k_dp_rx_h_ppdu(ar, desc, status); - ath12k_dp_rx_h_mpdu(ar, msdu, desc, status); + ath12k_dp_rx_h_fetch_info(ab, desc, rx_info); + + if (rx_info->decap_type == DP_RX_DECAP_TYPE_NATIVE_WIFI && + ath12k_dp_rx_check_max_nwifi_hdr_len(ab, desc, msdu, + "Invalid len in Null queue\n")) { + WARN_ON_ONCE(1); + return -EINVAL; + } + + ath12k_dp_rx_h_ppdu(ar, rx_info); + fast_rx = false; + ath12k_dp_rx_h_mpdu(ar, msdu, desc, rx_info, &fast_rx); rxcb->tid = ath12k_dp_rx_h_tid(ab, desc); @@ -3559,21 +4673,31 @@ * rx with mac80211. Need not worry about cleaning up amsdu_list. */ + if (ath12k_debugfs_is_extd_rx_stats_enabled(ar)) { + peer_id = ath12k_dp_rx_h_peer_id(ar->ab, desc); + spin_lock_bh(&ar->ab->base_lock); + if (peer_id) + peer = ath12k_peer_find_by_id(ar->ab, rxcb->peer_id); + if (peer && peer->sta) + arsta = ath12k_peer_get_link_sta(ar->ab, peer); + spin_unlock_bh(&ar->ab->base_lock); + if (arsta) + atomic_inc(&arsta->drv_rx_pkts.pkts_frm_hw); + } + return 0; } static bool ath12k_dp_rx_h_reo_err(struct ath12k *ar, struct sk_buff *msdu, - struct ieee80211_rx_status *status, + struct ath12k_dp_rx_info *rx_info, struct sk_buff_head *msdu_list) { struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); bool drop = false; - ar->ab->soc_stats.reo_error[rxcb->err_code]++; - switch (rxcb->err_code) { case HAL_REO_DEST_RING_ERROR_CODE_DESC_ADDR_ZERO: - if (ath12k_dp_rx_h_null_q_desc(ar, msdu, status, msdu_list)) + if (ath12k_dp_rx_h_null_q_desc(ar, msdu, rx_info, msdu_list)) drop = true; break; case HAL_REO_DEST_RING_ERROR_CODE_PN_CHECK_FAILED: @@ -3590,11 +4714,16 @@ break; } + if (drop) + ar->ab->soc_stats.reo_error_drop[rxcb->err_code]++; + else + ar->ab->soc_stats.reo_error[rxcb->err_code]++; + return drop; } -static void ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu, - struct ieee80211_rx_status *status) +static bool ath12k_dp_rx_h_tkip_mic_err(struct ath12k *ar, struct sk_buff *msdu, + struct ath12k_dp_rx_info *rx_info) { struct ath12k_base *ab = ar->ab; u16 msdu_len; @@ -3608,20 +4737,94 @@ l3pad_bytes = ath12k_dp_rx_h_l3pad(ab, desc); msdu_len = ath12k_dp_rx_h_msdu_len(ab, desc); + + if ((hal_rx_desc_sz + l3pad_bytes + msdu_len) > DP_RX_BUFFER_SIZE) { + ath12k_warn(ab, "invalid msdu len in tkip mirc err %u\n", msdu_len); + ath12k_dbg_dump(ab, ATH12K_DBG_DATA, NULL, "", desc, + sizeof(struct hal_rx_desc)); + return true; + } + skb_put(msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len); skb_pull(msdu, hal_rx_desc_sz + l3pad_bytes); - ath12k_dp_rx_h_ppdu(ar, desc, status); + if (rx_info->decap_type == DP_RX_DECAP_TYPE_NATIVE_WIFI && + ath12k_dp_rx_check_max_nwifi_hdr_len(ab, desc, msdu, + "Invalid len in tkip mic err\n")) { + WARN_ON_ONCE(1); + return true; + } + + ath12k_dp_rx_h_ppdu(ar, rx_info); - status->flag |= (RX_FLAG_MMIC_STRIPPED | RX_FLAG_MMIC_ERROR | + rx_info->rx_status->flag |= (RX_FLAG_MMIC_STRIPPED | RX_FLAG_MMIC_ERROR | RX_FLAG_DECRYPTED); ath12k_dp_rx_h_undecap(ar, msdu, desc, - HAL_ENCRYPT_TYPE_TKIP_MIC, status, false); + HAL_ENCRYPT_TYPE_TKIP_MIC, rx_info->rx_status, false); + return false; +} + +static bool ath12k_dp_rx_h_4addr_null_frame_handler(struct ath12k *ar, + struct sk_buff *msdu, + struct ath12k_dp_rx_info *rx_info) +{ + struct ath12k_base *ab = ar->ab; + u16 msdu_len, peer_id; + u8 l3pad_bytes; + struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); + struct hal_rx_desc *rx_desc = (struct hal_rx_desc*)msdu->data; + u32 hal_rx_desc_sz = ar->ab->hw_params->hal_desc_sz; + struct ieee80211_hdr *hdr; + size_t hdr_len; + struct ath12k_dp_rx_rfc1042_hdr *llc; + bool drop = false; + bool fast_rx = false; + + msdu_len = ath12k_dp_rx_h_msdu_len(ab, rx_desc); + peer_id = ath12k_dp_rx_h_peer_id(ab, rx_desc); + + spin_lock_bh(&ab->base_lock); + if(!ath12k_peer_find_by_id(ab, peer_id)) { + spin_unlock_bh(&ab->base_lock); + ath12k_dbg(ab, ATH12K_DBG_DATA, "invalid peer id received in wbm err pkt%d\n", + peer_id); + return -EINVAL; + } + spin_unlock_bh(&ab->base_lock); + l3pad_bytes = ath12k_dp_rx_h_l3pad(ab, rx_desc); + + if ((hal_rx_desc_sz + l3pad_bytes + msdu_len) > DP_RX_BUFFER_SIZE) + return -EINVAL; + + skb_put(msdu, hal_rx_desc_sz + l3pad_bytes + msdu_len); + skb_pull(msdu, hal_rx_desc_sz + l3pad_bytes); + + if (rx_info->decap_type == DP_RX_DECAP_TYPE_NATIVE_WIFI && + ath12k_dp_rx_check_max_nwifi_hdr_len(ab, rx_desc, msdu, + "Invalid len in 4addr Null frame\n")) { + WARN_ON_ONCE(1); + return true; } + ath12k_dp_rx_h_ppdu(ar, rx_info); + + ath12k_dp_rx_h_mpdu(ar, msdu, rx_desc, rx_info, &fast_rx); + + rxcb->tid = ath12k_dp_rx_h_tid(ab, rx_desc); + + hdr = (struct ieee80211_hdr *)msdu->data; + hdr_len = ieee80211_hdrlen(hdr->frame_control); + llc = (struct ath12k_dp_rx_rfc1042_hdr *)(msdu->data + hdr_len); + + if (!(llc->snap_type == cpu_to_be16(ETH_P_PAE) || + ieee80211_is_qos_nullfunc(hdr->frame_control))) + drop = true; + + return drop; +} static bool ath12k_dp_rx_h_rxdma_err(struct ath12k *ar, struct sk_buff *msdu, - struct ieee80211_rx_status *status) + struct ath12k_dp_rx_info *rx_info) { struct ath12k_base *ab = ar->ab; struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); @@ -3629,14 +4832,19 @@ bool drop = false; u32 err_bitmap; - ar->ab->soc_stats.rxdma_error[rxcb->err_code]++; - switch (rxcb->err_code) { + case HAL_REO_ENTR_RING_RXDMA_ECODE_UNAUTH_WDS_ERR: + ath12k_dp_rx_h_fetch_info(ab, rx_desc, rx_info); + + drop = ath12k_dp_rx_h_4addr_null_frame_handler(ar, msdu, rx_info); + break; case HAL_REO_ENTR_RING_RXDMA_ECODE_DECRYPT_ERR: case HAL_REO_ENTR_RING_RXDMA_ECODE_TKIP_MIC_ERR: err_bitmap = ath12k_dp_rx_h_mpdu_err(ab, rx_desc); if (err_bitmap & HAL_RX_MPDU_ERR_TKIP_MIC) { - ath12k_dp_rx_h_tkip_mic_err(ar, msdu, status); + ath12k_dp_rx_h_fetch_info(ab, rx_desc, rx_info); + + drop = ath12k_dp_rx_h_tkip_mic_err(ar, msdu, rx_info); break; } fallthrough; @@ -3648,6 +4856,11 @@ break; } + if (drop) + ar->ab->soc_stats.rxdma_error_drop[rxcb->err_code]++; + else + ar->ab->soc_stats.rxdma_error[rxcb->err_code]++; + return drop; } @@ -3658,14 +4871,18 @@ { struct ath12k_skb_rxcb *rxcb = ATH12K_SKB_RXCB(msdu); struct ieee80211_rx_status rxs = {0}; + struct ath12k_dp_rx_info rx_info; bool drop = true; + rx_info.filled = 0; + rx_info.rx_status = &rxs; + switch (rxcb->err_rel_src) { case HAL_WBM_REL_SRC_MODULE_REO: - drop = ath12k_dp_rx_h_reo_err(ar, msdu, &rxs, msdu_list); + drop = ath12k_dp_rx_h_reo_err(ar, msdu, &rx_info, msdu_list); break; case HAL_WBM_REL_SRC_MODULE_RXDMA: - drop = ath12k_dp_rx_h_rxdma_err(ar, msdu, &rxs); + drop = ath12k_dp_rx_h_rxdma_err(ar, msdu, &rx_info); break; default: /* msdu will get freed */ @@ -3677,31 +4894,38 @@ return; } - ath12k_dp_rx_deliver_msdu(ar, napi, msdu, &rxs); + ath12k_dp_rx_deliver_msdu(ar, napi, msdu, &rx_info); } int ath12k_dp_rx_process_wbm_err(struct ath12k_base *ab, struct napi_struct *napi, int budget) { struct ath12k *ar; + struct ath12k_base *src_ab; struct ath12k_dp *dp = &ab->dp; struct dp_rxdma_ring *rx_ring; struct hal_rx_wbm_rel_info err_info; struct hal_srng *srng; struct sk_buff *msdu; - struct sk_buff_head msdu_list[MAX_RADIOS]; + struct sk_buff_head msdu_list, scatter_msdu_list; struct ath12k_skb_rxcb *rxcb; void *rx_desc; - int mac_id; - int num_buffs_reaped = 0; + int i, num_buffs_reaped[ATH12K_MAX_SOCS] = { 0 }; struct ath12k_rx_desc_info *desc_info; - int ret, i; + struct ath12k_soc_dp_stats *soc_stats = &ab->soc_stats; + int total_num_buffs_reaped = 0; + int ret; + u8 hw_link_id, chip_id; + char buf[64] = {0}; + struct list_head rx_desc_used_list[ATH12K_MAX_SOCS]; + + __skb_queue_head_init(&msdu_list); + __skb_queue_head_init(&scatter_msdu_list); - for (i = 0; i < ab->num_radios; i++) - __skb_queue_head_init(&msdu_list[i]); + for (i = 0; i < ATH12K_MAX_SOCS; i++) + INIT_LIST_HEAD(&rx_desc_used_list[i]); srng = &ab->hal.srng_list[dp->rx_rel_ring.ring_id]; - rx_ring = &dp->rx_refill_buf_ring; spin_lock_bh(&srng->lock); @@ -3714,10 +4938,10 @@ ret = ath12k_hal_wbm_desc_parse_err(ab, rx_desc, &err_info); if (ret) { - ath12k_warn(ab, - "failed to parse rx error in wbm_rel ring desc %d\n", - ret); - continue; + scnprintf(buf, sizeof(buf), "failed to parse rx error in wbm_rel ring desc %d\n", ret); + ath12k_err_dump(ab, buf, "wbm err desc: ", rx_desc, + sizeof(struct hal_wbm_release_ring), srng); + BUG_ON(1); } desc_info = (struct ath12k_rx_desc_info *)err_info.rx_desc; @@ -3726,32 +4950,29 @@ if (!desc_info) { desc_info = ath12k_dp_get_rx_desc(ab, err_info.cookie); if (!desc_info) { - ath12k_warn(ab, "Invalid cookie in manual desc retrieval"); + ath12k_warn(ab, "Invalid cookie in manual desc retrieval cookie 0x%x", err_info.cookie); continue; } } - /* FIXME: Extract mac id correctly. Since descs are not tied - * to mac, we can extract from vdev id in ring desc. - */ - mac_id = 0; - if (desc_info->magic != ATH12K_DP_RX_DESC_MAGIC) ath12k_warn(ab, "WBM RX err, Check HW CC implementation"); msdu = desc_info->skb; desc_info->skb = NULL; + src_ab = ab->ag->ab[desc_info->chip_id]; + dp = &src_ab->dp; + chip_id = src_ab->chip_id; - spin_lock_bh(&dp->rx_desc_lock); - list_move_tail(&desc_info->list, &dp->rx_desc_free_list); - spin_unlock_bh(&dp->rx_desc_lock); + list_add_tail(&desc_info->list, &rx_desc_used_list[chip_id]); rxcb = ATH12K_SKB_RXCB(msdu); - dma_unmap_single(ab->dev, rxcb->paddr, + dma_unmap_single(src_ab->dev, rxcb->paddr, msdu->len + skb_tailroom(msdu), DMA_FROM_DEVICE); - num_buffs_reaped++; + num_buffs_reaped[chip_id]++; + total_num_buffs_reaped++; if (!err_info.continuation) budget--; @@ -3764,44 +4985,101 @@ rxcb->err_rel_src = err_info.err_rel_src; rxcb->err_code = err_info.err_code; - rxcb->rx_desc = (struct hal_rx_desc *)msdu->data; - __skb_queue_tail(&msdu_list[mac_id], msdu); - rxcb->is_first_msdu = err_info.first_msdu; rxcb->is_last_msdu = err_info.last_msdu; rxcb->is_continuation = err_info.continuation; + rxcb->rx_desc = (struct hal_rx_desc *)msdu->data; + + if (!err_info.continuation) { + hw_link_id = ath12k_dp_rx_get_msdu_src_link(src_ab, (struct hal_rx_desc *)msdu->data); + if (hw_link_id >= ATH12K_GROUP_MAX_RADIO) { + if (ath12k_debug_critical) { + ath12k_err(ab, "WBM Err: invalid hw link id %d\n", + hw_link_id); + ath12k_err_dump(ab, NULL, "WBM err desc: ", rx_desc, + sizeof(struct hal_wbm_release_ring_cc_rx), srng); + ath12k_err_dump(ab, NULL, "WBM Rx TLV: ", msdu->data, + sizeof(struct hal_rx_desc), srng); + dev_kfree_skb_any(msdu); + BUG_ON(1); + } else { + dev_kfree_skb_any(msdu); + } + continue; + } + + if (!skb_queue_empty(&scatter_msdu_list)) { + __skb_queue_tail(&scatter_msdu_list, msdu); + + skb_queue_walk(&scatter_msdu_list, msdu) { + rxcb = ATH12K_SKB_RXCB(msdu); + rxcb->hw_link_id = hw_link_id; + } + + skb_queue_splice_tail_init(&scatter_msdu_list, &msdu_list); + } else { + rxcb->hw_link_id = hw_link_id; + __skb_queue_tail(&msdu_list, msdu); + } + } else { + __skb_queue_tail(&scatter_msdu_list, msdu); + } } ath12k_hal_srng_access_end(ab, srng); spin_unlock_bh(&srng->lock); - if (!num_buffs_reaped) + if (!total_num_buffs_reaped) goto done; - ath12k_dp_rx_bufs_replenish(ab, 0, rx_ring, num_buffs_reaped, - ab->hw_params->hal_params->rx_buf_rbm, true); + for (i = 0; i < ab->ag->num_chip; i++) { + if (!num_buffs_reaped[i]) + continue; + + src_ab = ab->ag->ab[i]; + if (!src_ab) + continue; + + rx_ring = &src_ab->dp.rx_refill_buf_ring; + + ath12k_dp_rx_bufs_replenish(src_ab, rx_ring, + &rx_desc_used_list[i], + num_buffs_reaped[i]); + } rcu_read_lock(); - for (i = 0; i < ab->num_radios; i++) { - if (!rcu_dereference(ab->pdevs_active[i])) { - __skb_queue_purge(&msdu_list[i]); + while ((msdu = __skb_dequeue(&msdu_list)) != NULL) { + + rxcb = ATH12K_SKB_RXCB(msdu); + hw_link_id = rxcb->hw_link_id; + + ar = rcu_dereference(ab->ag->hw_links[hw_link_id]); + if (!ar) { + dev_kfree_skb_any(msdu); + ath12k_warn(ab, "WBM Rx: invalid pdev for hw link id %d\n", + hw_link_id); continue; } - ar = ab->pdevs[i].ar; + if (!rcu_dereference(ar->ab->pdevs_active[ar->pdev_idx])) { + dev_kfree_skb_any(msdu); + continue; + } if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) { - __skb_queue_purge(&msdu_list[i]); + dev_kfree_skb_any(msdu); continue; } - while ((msdu = __skb_dequeue(&msdu_list[i])) != NULL) - ath12k_dp_rx_wbm_err(ar, napi, msdu, &msdu_list[i]); + if (rxcb->err_rel_src < HAL_WBM_REL_SRC_MODULE_MAX) + soc_stats->rx_wbm_rel_source[rxcb->err_rel_src][ar->ab->chip_id]++; + + ath12k_dp_rx_wbm_err(ar, napi, msdu, &msdu_list); } rcu_read_unlock(); done: - return num_buffs_reaped; + return total_num_buffs_reaped; } void ath12k_dp_rx_process_reo_status(struct ath12k_base *ab) @@ -3899,6 +5177,8 @@ ath12k_dp_srng_cleanup(ab, &dp->rxdma_err_dst_ring[i]); ath12k_dp_srng_cleanup(ab, &dp->rxdma_mon_buf_ring.refill_buf_ring); + + if (ab->hw_params->supports_tx_monitor) ath12k_dp_srng_cleanup(ab, &dp->tx_mon_buf_ring.refill_buf_ring); ath12k_dp_rxdma_buf_free(ab); @@ -3934,10 +5214,18 @@ tlv_filter.rx_msdu_end_offset = ab->hw_params->hal_ops->rx_desc_get_msdu_end_offset(); - /* TODO: Selectively subscribe to required qwords within msdu_end - * and mpdu_start and setup the mask in below msg - * and modify the rx_desc struct - */ + if (ab->hw_params->compact_rx_tlv) { + if (ab->hw_params->hal_ops->rxdma_ring_wmask_rx_mpdu_start) + tlv_filter.rx_mpdu_start_wmask = + ab->hw_params->hal_ops->rxdma_ring_wmask_rx_mpdu_start(); + if (ab->hw_params->hal_ops->rxdma_ring_wmask_rx_msdu_end) + tlv_filter.rx_msdu_end_wmask = + ab->hw_params->hal_ops->rxdma_ring_wmask_rx_msdu_end(); + ath12k_dbg(ab, ATH12K_DBG_DATA, + "Configuring compact tlv masks rx_mpdu_start_wmask 0x%x rx_msdu_end_wmask 0x%x\n", + tlv_filter.rx_mpdu_start_wmask, tlv_filter.rx_msdu_end_wmask); + } + ret = ath12k_dp_tx_htt_rx_filter_setup(ab, ring_id, 0, HAL_RXDMA_BUF, DP_RXDMA_REFILL_RING_SIZE, @@ -3988,6 +5276,55 @@ return ret; } +int +ath12k_dp_rx_htt_rxdma_rxole_ppe_cfg_set(struct ath12k_base *ab, + struct ath12k_dp_htt_rxdma_ppe_cfg_param *param) +{ + struct htt_h2t_msg_type_rxdma_rxole_ppe_cfg *cmd; + struct ath12k_dp *dp = &ab->dp; + struct sk_buff *skb; + int len = sizeof(*cmd), ret, val; + + skb = ath12k_htc_alloc_skb(ab, len); + if (!skb) + return -ENOMEM; + + skb_put(skb, len); + + cmd = (struct htt_h2t_msg_type_rxdma_rxole_ppe_cfg *)skb->data; + memset(cmd, 0, sizeof(*cmd)); + + cmd->info0 = + u32_encode_bits(HTT_H2T_MSG_TYPE_RXDMA_RXOLE_PPE_CFG, + HTT_H2T_RXOLE_PPE_CFG_MSG_TYPE) | + u32_encode_bits(param->override, HTT_H2T_RXOLE_PPE_CFG_OVERRIDE) | + u32_encode_bits(param->reo_dst_ind, + HTT_H2T_RXOLE_PPE_CFG_REO_DST_IND) | + u32_encode_bits(param->multi_buffer_msdu_override_en, + HTT_H2T_RXOLE_PPE_CFG_MULTI_BUF_MSDU_OVRD_EN) | + u32_encode_bits(param->intra_bss_override, + HTT_H2T_RXOLE_PPE_CFG_INTRA_BUS_OVRD) | + u32_encode_bits(param->decap_raw_override, + HTT_H2T_RXOLE_PPE_CFG_DECAP_RAW_OVRD) | + u32_encode_bits(param->decap_nwifi_override, + HTT_H2T_RXOLE_PPE_CFG_NWIFI_OVRD) | + u32_encode_bits(param->ip_frag_override, + HTT_H2T_RXOLE_PPE_CFG_IP_FRAG_OVRD); + + val = cmd->info0; + ret = ath12k_htc_send(&ab->htc, dp->eid, skb); + if(ret) { + ath12k_warn(ab, "failed to send htt type H2T rx ole ppe config request: %d", + ret); + dev_kfree_skb_any(skb); + return ret; + } + + ath12k_dbg(ab, ATH12K_DBG_PPE, "RXOLE ppe config request sent val 0x%x\n", val); + + return 0; +} + int ath12k_dp_rx_htt_setup(struct ath12k_base *ab) { struct ath12k_dp *dp = &ab->dp; @@ -4037,6 +5374,7 @@ return ret; } + if (ab->hw_params->supports_tx_monitor) { ring_id = dp->tx_mon_buf_ring.refill_buf_ring.ring_id; ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id, 0, HAL_TX_MONITOR_BUF); @@ -4046,6 +5384,7 @@ return ret; } } + } ret = ab->hw_params->hw_ops->rxdma_ring_sel_config(ab); if (ret) { @@ -4067,8 +5406,10 @@ idr_init(&dp->rxdma_mon_buf_ring.bufs_idr); spin_lock_init(&dp->rxdma_mon_buf_ring.idr_lock); + if (ab->hw_params->supports_tx_monitor) { idr_init(&dp->tx_mon_buf_ring.bufs_idr); spin_lock_init(&dp->tx_mon_buf_ring.idr_lock); + } ret = ath12k_dp_srng_setup(ab, &dp->rx_refill_buf_ring.refill_buf_ring, @@ -4113,6 +5454,7 @@ return ret; } + if (ab->hw_params->supports_tx_monitor) { ret = ath12k_dp_srng_setup(ab, &dp->tx_mon_buf_ring.refill_buf_ring, HAL_TX_MONITOR_BUF, 0, 0, @@ -4122,6 +5464,7 @@ return ret; } } + } ret = ath12k_dp_rxdma_buf_setup(ab); if (ret) { @@ -4161,6 +5504,7 @@ return ret; } + if (ab->hw_params->supports_tx_monitor) { ring_id = dp->tx_mon_dst_ring[i].ring_id; ret = ath12k_dp_tx_htt_srng_setup(ab, ring_id, mac_id + i, @@ -4172,14 +5516,39 @@ return ret; } } + } out: return 0; } +static int ath12k_dp_rx_pdev_mon_status_detach(struct ath12k *ar) +{ + struct ath12k_pdev_dp *dp = &ar->dp; + struct ath12k_mon_data *pmon = dp->mon_data; + + if (!pmon) { + ath12k_err(ar->ab, "pmon is NULL\n"); + return -EINVAL; + } + + vfree(pmon); + dp->mon_data = NULL; + + return 0; +} + static int ath12k_dp_rx_pdev_mon_status_attach(struct ath12k *ar) { struct ath12k_pdev_dp *dp = &ar->dp; - struct ath12k_mon_data *pmon = (struct ath12k_mon_data *)&dp->mon_data; + struct ath12k_mon_data *pmon; + + pmon = vzalloc(sizeof(*pmon)); + if (!pmon) { + ath12k_warn(ar->ab, "pmon allocation failed \n"); + return -ENOMEM; + } + + dp->mon_data = pmon; skb_queue_head_init(&pmon->rx_status_q); @@ -4193,7 +5562,6 @@ int ath12k_dp_rx_pdev_mon_attach(struct ath12k *ar) { struct ath12k_pdev_dp *dp = &ar->dp; - struct ath12k_mon_data *pmon = &dp->mon_data; int ret = 0; ret = ath12k_dp_rx_pdev_mon_status_attach(ar); @@ -4208,13 +5576,23 @@ if (!ar->ab->hw_params->rxdma1_enable) return 0; - pmon->mon_last_linkdesc_paddr = 0; - pmon->mon_last_buf_cookie = DP_RX_DESC_COOKIE_MAX + 1; - spin_lock_init(&pmon->mon_lock); + dp->mon_data->mon_last_linkdesc_paddr = 0; + dp->mon_data->mon_last_buf_cookie = DP_RX_DESC_COOKIE_MAX + 1; + spin_lock_init(&dp->mon_data->mon_lock); return 0; } +void ath12k_dp_rx_pdev_mon_detach(struct ath12k_base *ab, const int pdev_idx) +{ + struct ath12k *ar = ab->pdevs[pdev_idx].ar; + int ret; + + ret = ath12k_dp_rx_pdev_mon_status_detach(ar); + if (ret) + ath12k_warn(ar->ab, "pdev_mon_status_detach() failed %d\n", ret); +} + int ath12k_dp_rx_pktlog_start(struct ath12k_base *ab) { /* start reap timer */ @@ -4240,3 +5618,4 @@ return 0; } + diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp_rx.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_rx.h --- linux-6.4/drivers/net/wireless/ath/ath12k/dp_rx.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_rx.h 2024-04-22 13:40:50.287868747 +0200 @@ -9,14 +9,47 @@ #include "core.h" #include "rx_desc.h" #include "debug.h" +#include "crypto/hash.h" #define DP_MAX_NWIFI_HDR_LEN 30 + +/* different supported pkt types for routing */ +enum ath12k_routing_pkt_type { + ATH12K_PKT_TYPE_ARP_IPV4, + ATH12K_PKT_TYPE_NS_IPV6, + ATH12K_PKT_TYPE_IGMP_IPV4, + ATH12K_PKT_TYPE_MLD_IPV6, + ATH12K_PKT_TYPE_DHCP_IPV4, + ATH12K_PKT_TYPE_DHCP_IPV6, + ATH12K_PKT_TYPE_DNS_TCP_IPV4, + ATH12K_PKT_TYPE_DNS_TCP_IPV6, + ATH12K_PKT_TYPE_DNS_UDP_IPV4, + ATH12K_PKT_TYPE_DNS_UDP_IPV6, + ATH12K_PKT_TYPE_ICMP_IPV4, + ATH12K_PKT_TYPE_ICMP_IPV6, + ATH12K_PKT_TYPE_TCP_IPV4, + ATH12K_PKT_TYPE_TCP_IPV6, + ATH12K_PKT_TYPE_UDP_IPV4, + ATH12K_PKT_TYPE_UDP_IPV6, + ATH12K_PKT_TYPE_IPV4, + ATH12K_PKT_TYPE_IPV6, + ATH12K_PKT_TYPE_EAP, + ATH12K_PKT_TYPE_MAX +}; + +#define ATH12K_RX_PROTOCOL_TAG_START_OFFSET 128 +#define ATH12K_ROUTE_WBM_RELEASE(ab) \ + ((ab)->hw_params->route_wbm_release) +#define ATH12K_ROUTE_EAP_METADATA (ATH12K_RX_PROTOCOL_TAG_START_OFFSET + ATH12K_PKT_TYPE_EAP) +#define ATH12K_ROUTE_ARP_METADATA (ATH12K_RX_PROTOCOL_TAG_START_OFFSET + ATH12K_PKT_TYPE_ARP_IPV4) + struct ath12k_dp_rx_tid { u8 tid; u32 *vaddr; dma_addr_t paddr; u32 size; + u32 pending_desc_size; u32 ba_win_sz; bool active; @@ -39,6 +72,16 @@ unsigned long ts; }; +struct dp_reo_update_rx_queue_elem { + struct list_head list; + struct ath12k_dp_rx_tid data; + int peer_id; + u8 tid; + bool reo_cmd_update_rx_queue_resend_flag; + bool is_ml_peer; + u16 ml_peer_id; +}; + struct ath12k_dp_rx_reo_cmd { struct list_head list; struct ath12k_dp_rx_tid data; @@ -65,6 +108,45 @@ __be16 snap_type; } __packed; +enum ath12k_dp_rx_info_type { + ATH12K_RX_INFO_DECAP_TYPE, + ATH12K_RX_INFO_PKT_TYPE, + ATH12K_RX_INFO_SGI, + ATH12K_RX_INFO_RATE_MCS, + ATH12K_RX_INFO_BW, + ATH12K_RX_INFO_NSS, + ATH12K_RX_INFO_PHY_META_DATA, + ATH12K_RX_INFO_ADDR2, + + /* keep last */ + ATH12K_RX_INFO_MAX +}; + +struct ath12k_dp_rx_info { + u64 filled; + u8 decap_type; + u8 pkt_type; + u8 sgi; + u8 rate_mcs; + u8 bw; + u8 nss; + u32 phy_meta_data; + u8 addr2[ETH_ALEN]; + bool ip_csum_fail; + bool l4_csum_fail; + u8 ip_is_valid; + u8 decap; + u16 peer_id; + bool is_mcbc; + u8 l3_pad_bytes; + u16 msdu_len; + u8 tid; + bool msdu_done; + bool is_first_msdu; + bool is_last_msdu; + struct ieee80211_rx_status *rx_status; +}; + static inline u32 ath12k_he_gi_to_nl80211_he_gi(u8 sgi) { u32 ret = 0; @@ -84,20 +166,40 @@ return ret; } +static inline u32 ath12k_eht_gi_to_nl80211_eht_gi(u8 sgi) +{ + u32 ret = 0; + + switch (sgi) { + case RX_MSDU_START_SGI_0_8_US: + ret = NL80211_RATE_INFO_EHT_GI_0_8; + break; + case RX_MSDU_START_SGI_1_6_US: + ret = NL80211_RATE_INFO_EHT_GI_1_6; + break; + case RX_MSDU_START_SGI_3_2_US: + ret = NL80211_RATE_INFO_EHT_GI_3_2; + break; + } + + return ret; +} + int ath12k_dp_rx_ampdu_start(struct ath12k *ar, - struct ieee80211_ampdu_params *params); + struct ieee80211_ampdu_params *params, + u8 link_id); int ath12k_dp_rx_ampdu_stop(struct ath12k *ar, - struct ieee80211_ampdu_params *params); -int ath12k_dp_rx_peer_pn_replay_config(struct ath12k_vif *arvif, + struct ieee80211_ampdu_params *params, + u8 link_id); +int ath12k_dp_rx_peer_pn_replay_config(struct ath12k_link_vif *arvif, const u8 *peer_addr, enum set_key_cmd key_cmd, struct ieee80211_key_conf *key); void ath12k_dp_rx_peer_tid_cleanup(struct ath12k *ar, struct ath12k_peer *peer); void ath12k_dp_rx_peer_tid_delete(struct ath12k *ar, struct ath12k_peer *peer, u8 tid); -int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id, - u8 tid, u32 ba_win_sz, u16 ssn, - enum hal_pn_type pn_type); +int ath12k_dp_rx_peer_tid_setup(struct ath12k *ar, u8 tid, u32 ba_win_sz, u16 ssn, + enum hal_pn_type pn_type, struct ath12k_peer *peer); void ath12k_dp_htt_htc_t2h_msg_handler(struct ath12k_base *ab, struct sk_buff *skb); int ath12k_dp_rx_pdev_reo_setup(struct ath12k_base *ab); @@ -116,30 +218,43 @@ int ath12k_dp_rx_process(struct ath12k_base *ab, int mac_id, struct napi_struct *napi, int budget); -int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, int mac_id, +int ath12k_dp_rx_bufs_replenish(struct ath12k_base *ab, struct dp_rxdma_ring *rx_ring, - int req_entries, - enum hal_rx_buf_return_buf_manager mgr, - bool hw_cc); + struct list_head *used_list, + int req_entries); int ath12k_dp_rx_pdev_mon_attach(struct ath12k *ar); -int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, const u8 *peer_mac, int vdev_id); - +void ath12k_dp_rx_pdev_mon_detach(struct ath12k_base *ab, const int pdev_idx); +int ath12k_dp_rx_peer_frag_setup(struct ath12k *ar, struct ath12k_peer *peer, + struct crypto_shash *tfm); int ath12k_dp_rx_pktlog_start(struct ath12k_base *ab); int ath12k_dp_rx_pktlog_stop(struct ath12k_base *ab, bool stop_timer); u8 ath12k_dp_rx_h_l3pad(struct ath12k_base *ab, struct hal_rx_desc *desc); struct ath12k_peer * -ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu); +ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu, + struct ath12k_dp_rx_info *rx_info); u8 ath12k_dp_rx_h_decap_type(struct ath12k_base *ab, struct hal_rx_desc *desc); u32 ath12k_dp_rx_h_mpdu_err(struct ath12k_base *ab, struct hal_rx_desc *desc); -void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct hal_rx_desc *rx_desc, - struct ieee80211_rx_status *rx_status); -struct ath12k_peer * -ath12k_dp_rx_h_find_peer(struct ath12k_base *ab, struct sk_buff *msdu); +void ath12k_dp_rx_h_ppdu(struct ath12k *ar, struct ath12k_dp_rx_info *rx_info); int ath12k_dp_rxdma_ring_sel_config_qcn9274(struct ath12k_base *ab); int ath12k_dp_rxdma_ring_sel_config_wcn7850(struct ath12k_base *ab); - +int ath12k_dp_htt_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len, + int (*iter)(struct ath12k_base *ar, u16 tag, u16 len, + const void *ptr, void *data), + void *data); +int +ath12k_dp_rx_htt_rxdma_rxole_ppe_cfg_set(struct ath12k_base *ab, + struct ath12k_dp_htt_rxdma_ppe_cfg_param *param); +int ath12k_dp_rx_pkt_type_filter(struct ath12k *ar, + enum ath12k_routing_pkt_type pkt_type, + u32 meta_data); +void ath12k_dp_tid_cleanup(struct ath12k_base *ab); +void ath12k_dp_peer_tid_setup(struct ath12k_base *ab); +void ath12k_dp_peer_reo_tid_setup(struct ath12k_base *ab, struct ath12k_link_sta *arsta); +void ath12k_dp_tid_setup(void *data, struct ieee80211_sta *sta); +void ath12k_dp_reset_rx_reo_tid_q(void *vaddr, u32 ba_window_size, + u8 tid); #endif /* ATH12K_DP_RX_H */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp_tx.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_tx.c --- linux-6.4/drivers/net/wireless/ath/ath12k/dp_tx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_tx.c 2024-04-22 13:55:38.344131333 +0200 @@ -7,15 +7,52 @@ #include "core.h" #include "dp_tx.h" #include "debug.h" +#include "debugfs_sta.h" #include "hw.h" +#include "peer.h" +#include "ppe.h" +#include +#include +#ifdef CONFIG_ATH12K_SAWF +static inline u32 ath12k_sawf_get_tcl_metadata_update(u32 sk_buff_mark) +{ + u32 tcl_metadata = 0; + u32 svc_id = u32_get_bits(sk_buff_mark, SAWF_SERVICE_CLASS_ID); + + tcl_metadata = u32_encode_bits(HTT_TCL_META_DATA_TYPE_SVC_ID_BASED, + HTT_TCL_META_DATA_TYPE_MISSION) | + u32_encode_bits(1, HTT_TCL_META_DATA_SAWF_TID_OVERRIDE) | + u32_encode_bits(svc_id - 1, HTT_TCL_META_DATA_SAWF_SVC_ID); + return tcl_metadata; +} + +static inline u32 ath12k_sawf_get_tcl_cmd_info3_update(u32 msduq_id) +{ + u32 tid, flow_override, who_classify_info_sel, update = 0; + + tid = u32_get_bits(msduq_id, TID_FROM_Q_ID); + flow_override = u32_get_bits(msduq_id, FLOW_OVERRIDE_FROM_Q_ID); + who_classify_info_sel = u32_get_bits(msduq_id, WHO_CLASSIFY_INFO_FROM_Q_ID); + + update = u32_encode_bits(tid, HAL_TCL_DATA_CMD_INFO3_TID) | + u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO3_TID_OVERWRITE) | + u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO3_FLOW_OVERRIDE_EN) | + u32_encode_bits(who_classify_info_sel, + HAL_TCL_DATA_CMD_INFO3_CLASSIFY_INFO_SEL) | + u32_encode_bits(flow_override, + HAL_TCL_DATA_CMD_INFO3_FLOW_OVERRIDE); + + return update; +} + +#endif /* CONFIG_ATH12K_SAWF */ static enum hal_tcl_encap_type -ath12k_dp_tx_get_encap_type(struct ath12k_vif *arvif, struct sk_buff *skb) +ath12k_dp_tx_get_encap_type(struct ath12k_base *ab, struct sk_buff *skb) { struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb); - struct ath12k_base *ab = arvif->ar->ab; - if (test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) + if (test_bit(ATH12K_FLAG_RAW_MODE, &ab->ag->dev_flags)) return HAL_TCL_ENCAP_TYPE_RAW; if (tx_info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) @@ -41,19 +78,6 @@ hdr->frame_control &= ~__cpu_to_le16(IEEE80211_STYPE_QOS_DATA); } -static u8 ath12k_dp_tx_get_tid(struct sk_buff *skb) -{ - struct ieee80211_hdr *hdr = (void *)skb->data; - struct ath12k_skb_cb *cb = ATH12K_SKB_CB(skb); - - if (cb->flags & ATH12K_SKB_HW_80211_ENCAP) - return skb->priority & IEEE80211_QOS_CTL_TID_MASK; - else if (!ieee80211_is_data_qos(hdr->frame_control)) - return HAL_DESC_REO_NON_QOS_TID; - else - return skb->priority & IEEE80211_QOS_CTL_TID_MASK; -} - enum hal_encrypt_type ath12k_dp_tx_get_encrypt_type(u32 cipher) { switch (cipher) { @@ -76,31 +100,104 @@ } } +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#define ATH12K_PPEDS_HOTLIST_LEN_MAX 1024 +struct sk_buff * +ath12k_dp_ppeds_tx_release_desc_nolock(struct ath12k_dp *dp, + struct ath12k_ppeds_tx_desc_info *tx_desc, + u8 ring_id) +{ + struct sk_buff *skb = NULL; + + lockdep_assert_held(&dp->ppeds_tx_desc_lock[ATH12K_PPEDS_DEFAULT_POOL_ID]); + if (dp->ppeds_tx_desc_reuse_list_len[ring_id] < ATH12K_PPEDS_HOTLIST_LEN_MAX && + tx_desc->skb) { + list_move_tail(&tx_desc->list, &dp->ppeds_tx_desc_reuse_list[ring_id]); + dp->ppeds_tx_desc_reuse_list_len[ring_id]++; + } else { + skb = tx_desc->skb; + tx_desc->skb = NULL; + list_move_tail(&tx_desc->list, &dp->ppeds_tx_desc_free_list[ring_id]); + } + + return skb; +} + +struct ath12k_ppeds_tx_desc_info * +ath12k_dp_ppeds_tx_assign_desc_nolock(struct ath12k_dp *dp, + u8 ring_id) +{ + struct ath12k_ppeds_tx_desc_info *desc, *next; + + lockdep_assert_held(&dp->ppeds_tx_desc_lock[ATH12K_PPEDS_DEFAULT_POOL_ID]); + /* first try to fetch descriptor from hotlist if not use free list */ + desc = list_first_entry_or_null(&dp->ppeds_tx_desc_reuse_list[ring_id], + struct ath12k_ppeds_tx_desc_info, + list); + if (desc) { + list_move_tail(&desc->list, &dp->ppeds_tx_desc_used_list[ring_id]); + dp->ppeds_tx_desc_reuse_list_len[ring_id]--; + /* Prefetch next hotlist descriptor */ + if (dp->ppeds_tx_desc_reuse_list_len[ring_id]) + next = list_first_entry_or_null(&dp->ppeds_tx_desc_reuse_list[ring_id], + struct ath12k_ppeds_tx_desc_info, + list); + else + next = list_first_entry_or_null(&dp->ppeds_tx_desc_free_list[ring_id], + struct ath12k_ppeds_tx_desc_info, + list); + prefetch(next); + + return desc; + } + + /* Fetch desc from Freelist if hotlist is empty */ + desc = list_first_entry_or_null(&dp->ppeds_tx_desc_free_list[ring_id], + struct ath12k_ppeds_tx_desc_info, + list); + if (unlikely(!desc)) { + ath12k_warn(dp->ab, "failed to allocate data Tx buffer\n"); + return NULL; + } + + list_move_tail(&desc->list, &dp->ppeds_tx_desc_used_list[ring_id]); + + return desc; +} + +#endif + static void ath12k_dp_tx_release_txbuf(struct ath12k_dp *dp, struct ath12k_tx_desc_info *tx_desc, - u8 pool_id) + u8 ring_id) { - spin_lock_bh(&dp->tx_desc_lock[pool_id]); - list_move_tail(&tx_desc->list, &dp->tx_desc_free_list[pool_id]); - spin_unlock_bh(&dp->tx_desc_lock[pool_id]); + tx_desc->skb = NULL; + tx_desc->skb_ext_desc = NULL; + spin_lock_bh(&dp->tx_desc_lock[ring_id]); + tx_desc->in_use = false; + list_add_tail(&tx_desc->list, &dp->tx_desc_free_list[ring_id]); + spin_unlock_bh(&dp->tx_desc_lock[ring_id]); } -static struct ath12k_tx_desc_info *ath12k_dp_tx_assign_buffer(struct ath12k_dp *dp, +static inline +struct ath12k_tx_desc_info *ath12k_dp_tx_assign_buffer(struct ath12k_dp *dp, u8 pool_id) { - struct ath12k_tx_desc_info *desc; + struct ath12k_tx_desc_info *desc = NULL; spin_lock_bh(&dp->tx_desc_lock[pool_id]); desc = list_first_entry_or_null(&dp->tx_desc_free_list[pool_id], struct ath12k_tx_desc_info, list); if (!desc) { + ath12k_dbg(dp->ab, ATH12K_DBG_DP_TX, "failed to allocate data Tx desc\n"); spin_unlock_bh(&dp->tx_desc_lock[pool_id]); - ath12k_warn(dp->ab, "failed to allocate data Tx buffer\n"); return NULL; } - list_move_tail(&desc->list, &dp->tx_desc_used_list[pool_id]); + prefetch(desc); + list_del(&desc->list); + desc->in_use = true; spin_unlock_bh(&dp->tx_desc_lock[pool_id]); return desc; @@ -118,21 +215,222 @@ le32_encode_bits(ti->data_len, HAL_TX_MSDU_EXT_INFO1_BUF_LEN); - tcl_ext_cmd->info1 = le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) | + tcl_ext_cmd->info1 |= le32_encode_bits(1, HAL_TX_MSDU_EXT_INFO1_EXTN_OVERRIDE) | le32_encode_bits(ti->encap_type, HAL_TX_MSDU_EXT_INFO1_ENCAP_TYPE) | le32_encode_bits(ti->encrypt_type, HAL_TX_MSDU_EXT_INFO1_ENCRYPT_TYPE); } -int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif, - struct sk_buff *skb) +#define HTT_META_DATA_ALIGNMENT 0x8 + +static void *ath12k_dp_metadata_align_skb(struct sk_buff *skb, u8 tail_len) +{ + struct sk_buff *tail; + void *metadata; + + if (unlikely(skb_cow_data(skb, tail_len, &tail) < 0)) + return NULL; + + metadata = pskb_put(skb, tail, tail_len); + memset(metadata, 0, tail_len); + return metadata; +} + +/* Preparing HTT Metadata when utilized with ext MSDU */ +static int ath12k_dp_prepare_htt_metadata(struct sk_buff *skb) +{ + struct htt_tx_msdu_desc_ext *desc_ext; + void *metadata; + u8 htt_desc_size; + /* Size rounded of multiple of 8 bytes */ + u8 htt_desc_size_aligned; + + + htt_desc_size = sizeof(struct htt_tx_msdu_desc_ext); + htt_desc_size_aligned = ALIGN(htt_desc_size, HTT_META_DATA_ALIGNMENT); + + metadata = ath12k_dp_metadata_align_skb(skb, htt_desc_size_aligned); + if (!metadata) + return -ENOMEM; + + desc_ext = (struct htt_tx_msdu_desc_ext *)metadata; + desc_ext->valid_encrypt_type = 1; + desc_ext->encrypt_type = HAL_ENCRYPT_TYPE_WEP_40; + desc_ext->host_tx_desc_pool = 1; + + return 0; +} + + +int ath12k_dp_tx_direct(struct ath12k_link_vif *arvif, struct sk_buff *skb) { + struct ath12k *ar = arvif->ar; + struct ath12k_base *ab = arvif->ab; + struct ath12k_dp *dp = arvif->dp; + struct ath12k_tx_desc_info *tx_desc = NULL; + struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb); + struct hal_srng *tcl_ring; + struct dp_tx_ring *tx_ring; + struct device *dev = arvif->dev; + void *hal_tcl_desc; + struct hal_tcl_data_cmd tcl_desc; + u8 hal_ring_id, ring_id; +#ifdef CONFIG_ATH12K_SAWF + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct ath12k_peer *peer; +#endif + dma_addr_t paddr; + int ret; +#ifdef CONFIG_MAC80211_SFE_SUPPORT + int len = skb->fast_xmit ? 256 : skb->len; +#elif defined(CONFIG_IP_FFN) + int len = skb->ffn_ff_done ? skb->ffn_ff_dirty_len : skb->len; +#else + int len = skb->len; +#endif + + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) + return -ESHUTDOWN; + + ring_id = smp_processor_id(); + + tx_ring = &dp->tx_ring[ring_id]; + + tx_desc = ath12k_dp_tx_assign_buffer(dp, ring_id); + if (unlikely(!tx_desc)) { + ab->soc_stats.tx_err.txbuf_na[ring_id]++; + return -ENOSPC; + } + + dmac_clean_range_no_dsb(skb->data, skb->data + len); + paddr = dma_map_single_attrs(dev, skb->data, len, + DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + if (unlikely(dma_mapping_error(dev, paddr))) { + atomic_inc(&ab->soc_stats.tx_err.misc_fail); + ath12k_warn(ab, "failed to DMA map data Tx buffer\n"); + ret = -ENOMEM; + goto fail_remove_tx_buf; + } + + tx_desc->skb = skb; + tx_desc->mac_id = arvif->pdev_idx; + tx_desc->recycler_fast_xmit = 0; + tx_desc->timestamp = ktime_get_real(); + +#ifdef CONFIG_MAC80211_SFE_SUPPORT + /* the edma driver uses this flags to optimize the cache invalidation */ + skb->fast_recycled = 1; + if (skb->is_from_recycler) + tx_desc->recycler_fast_xmit = 1; +#elif defined(CONFIG_IP_FFN) + /* mark it so page pool recycler will remember this */ + if (skb->ffn_ff_done) + skb->ffn_ff_done |= BIT(1); +#endif + + skb_cb->vif = arvif->ahvif->vif; + skb_cb->paddr = paddr; + + hal_ring_id = ring_id + HAL_SRNG_RING_ID_SW2TCL1; + tcl_ring = &ab->hal.srng_list[hal_ring_id]; + spin_lock_bh(&tcl_ring->lock); + ath12k_hal_srng_access_src_ring_begin_nolock(tcl_ring); + + hal_tcl_desc = (void *)ath12k_hal_srng_src_get_next_entry_nolock(ab, tcl_ring); + if (unlikely(!hal_tcl_desc)) { + /* NOTE: It is highly unlikely we'll be running out of tcl_ring + * desc because the desc is directly enqueued onto hw queue. + */ + ath12k_hal_srng_access_umac_src_ring_end_nolock(tcl_ring); + spin_unlock_bh(&tcl_ring->lock); + ab->soc_stats.tx_err.desc_na[ring_id]++; + ret = -ENOMEM; + goto fail_unmap_dma; + } + + ab->soc_stats.tx_enqueued[ring_id]++; + + tcl_desc.buf_addr_info.info0 = (u32)paddr; + tcl_desc.buf_addr_info.info1 = (tx_desc->desc_id << 12); + tcl_desc.info0 = arvif->desc.info0; + tcl_desc.info1 = arvif->desc.info1; + tcl_desc.info2 = skb->len; + + if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) + tcl_desc.info2 |= TX_IP_CHECKSUM; + + tcl_desc.info3 = arvif->desc.info3; + tcl_desc.info4 = arvif->desc.info4; + tcl_desc.info5 = 0; +#ifdef CONFIG_ATH12K_SAWF + /* SAWF */ + if (u32_get_bits(skb->mark, SAWF_TAG_ID) == SAWF_VALID_TAG) { + u32 msduq_id = u32_get_bits(skb->mark, SAWF_MSDUQ_ID); + + if (msduq_id < (ab->max_msduq_per_tid * ATH12K_SAWF_MAX_TID_SUPPORT)) { + u32 meta_data_flags; + tcl_desc.info3 |= ath12k_sawf_get_tcl_cmd_info3_update(msduq_id); + meta_data_flags = + ath12k_sawf_get_tcl_metadata_update(skb->mark); + tcl_desc.info1 = u32_encode_bits(meta_data_flags, + HAL_TCL_DATA_CMD_INFO1_CMD_NUM); + } + + if (unlikely(ath12k_debugfs_is_sawf_stats_enabled(ar) & ATH12K_SAWF_STATS_BASIC)) { + u16 peer_id = u32_get_bits(skb->mark, SAWF_PEER_ID); + u32 len = skb_headlen(skb); + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_id(ab, peer_id); + if (unlikely(!peer || !peer->sta)) + ath12k_dbg(ab, ATH12K_DBG_SAWF, + "peer_id %u not found \n", peer_id); + else + ath12k_sawf_tx_enqueue_peer_stats(ab, peer, msduq_id, len); + spin_unlock_bh(&ab->base_lock); + } + /* Store the NWDELAY to skb->mark which can be fetched + * during tx completion + */ + if (info->sawf.nw_delay > SAWF_NW_DELAY_MAX) + info->sawf.nw_delay = SAWF_NW_DELAY_MAX; + skb->mark = (SAWF_VALID_TAG << SAWF_TAG_SHIFT) | (info->sawf.nw_delay << SAWF_NW_DELAY_SHIFT) | msduq_id; + } +#endif + memcpy(hal_tcl_desc, &tcl_desc, sizeof(tcl_desc)); + dsb(st); + ath12k_hal_srng_access_umac_src_ring_end_nolock(tcl_ring); + spin_unlock_bh(&tcl_ring->lock); + + atomic_inc(&ar->dp.num_tx_pending); + atomic_inc(&ab->ag->num_dp_tx_pending); + + return 0; + +fail_unmap_dma: + dma_unmap_single(ab->dev, skb_cb->paddr, 256, DMA_TO_DEVICE); + +fail_remove_tx_buf: + ath12k_dp_tx_release_txbuf(dp, tx_desc, ring_id); + + return ret; +} +EXPORT_SYMBOL(ath12k_dp_tx_direct); + +int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, + struct ath12k_sta *ahsta, struct sk_buff *skb, + bool gsn_valid, int mcbc_gsn) +{ + struct ath12k_vif *ahvif = arvif->ahvif; struct ath12k_base *ab = ar->ab; + struct ath12k_hw_group *ag = ab->ag; struct ath12k_dp *dp = &ab->dp; + struct ath12k_peer *peer; struct hal_tx_info ti = {0}; struct ath12k_tx_desc_info *tx_desc; +#ifdef CONFIG_ATH12K_SAWF struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); +#endif struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb); struct hal_tcl_data_cmd *hal_tcl_desc; struct hal_tx_msdu_ext_desc *msg; @@ -140,92 +438,107 @@ struct hal_srng *tcl_ring; struct ieee80211_hdr *hdr = (void *)skb->data; struct dp_tx_ring *tx_ring; - u8 pool_id; + struct hal_tcl_data_cmd *tcl_cmd; u8 hal_ring_id; int ret; - u8 ring_selector, ring_map = 0; - bool tcl_ring_retry; + u16 peer_id; bool msdu_ext_desc = false; + bool is_diff_encap = false, is_qos_null = false; + bool add_htt_metadata = false; - if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags)) + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags)) || + unlikely(test_bit(ATH12K_FLAG_UMAC_PRERESET_START, &ab->dev_flags))) return -ESHUTDOWN; - if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && - !ieee80211_is_data(hdr->frame_control)) + if (unlikely(!(skb_cb->flags & ATH12K_SKB_HW_80211_ENCAP) && + !ieee80211_is_data(hdr->frame_control))) return -ENOTSUPP; - pool_id = skb_get_queue_mapping(skb) & (ATH12K_HW_MAX_QUEUES - 1); - - /* Let the default ring selection be based on current processor - * number, where one of the 3 tcl rings are selected based on - * the smp_processor_id(). In case that ring - * is full/busy, we resort to other available rings. - * If all rings are full, we drop the packet. - * TODO: Add throttling logic when all rings are full - */ - ring_selector = ab->hw_params->hw_ops->get_ring_selector(skb); - -tcl_ring_sel: - tcl_ring_retry = false; - ti.ring_id = ring_selector % ab->hw_params->max_tx_ring; - - ring_map |= BIT(ti.ring_id); - ti.rbm_id = ab->hw_params->hal_ops->tcl_to_wbm_rbm_map[ti.ring_id].rbm_id; + ti.ring_id = + ab->hw_params->hw_ops->get_ring_selector(skb); tx_ring = &dp->tx_ring[ti.ring_id]; - tx_desc = ath12k_dp_tx_assign_buffer(dp, pool_id); - if (!tx_desc) + tx_desc = ath12k_dp_tx_assign_buffer(dp, ti.ring_id); + if (unlikely(!tx_desc)) { + ab->soc_stats.tx_err.txbuf_na[ti.ring_id]++; return -ENOMEM; + } ti.bank_id = arvif->bank_id; - ti.meta_data_flags = arvif->tcl_metadata; - if (arvif->tx_encap_type == HAL_TCL_ENCAP_TYPE_RAW && - test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) { - if (skb_cb->flags & ATH12K_SKB_CIPHER_SET) { - ti.encrypt_type = - ath12k_dp_tx_get_encrypt_type(skb_cb->cipher); + if (ieee80211_has_a4(hdr->frame_control) && + is_multicast_ether_addr(hdr->addr3) && ahsta && + ahsta->use_4addr_set) { + if (unlikely(!ahsta->link[ahsta->primary_link_id])) { + ath12k_err(ab, "arsta not found on primary link"); + ret = -EINVAL; + goto fail_remove_tx_buf; + } + ti.meta_data_flags = ahsta->link[ahsta->primary_link_id]->tcl_metadata; + ti.flags0 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TO_FW, 1); + spin_lock_bh(&ab->base_lock); + peer_id = FIELD_GET(HTT_TCL_META_DATA_PEER_ID_MISSION, + ti.meta_data_flags); + peer = ath12k_peer_find_by_id(ab, peer_id); + if (!peer || !peer->sta) { + spin_unlock_bh(&ab->base_lock); + ath12k_dbg(ab, ATH12K_DBG_DP_TX, + "Dropped packet with non existent peer id %u\n", peer_id); + ret = -EINVAL; + goto fail_remove_tx_buf; + } + spin_unlock_bh(&ab->base_lock); - if (ieee80211_has_protected(hdr->frame_control)) - skb_put(skb, IEEE80211_CCMP_MIC_LEN); } else { - ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + ti.meta_data_flags = arvif->tcl_metadata; } - msdu_ext_desc = true; + /* TCL Meta data flags are shared for both SAWF and Global Seq Number updates. + * SAWF and Global Seq Number are mutually exclusive. + * Global Seq Number - Multicast, SAWF - Unicast + */ +#ifdef CONFIG_ATH12K_SAWF + if (u32_get_bits(skb->mark, SAWF_TAG_ID) == SAWF_VALID_TAG) { + u32 msduq_id = u32_get_bits(skb->mark, SAWF_MSDUQ_ID); + if (msduq_id < (ab->max_msduq_per_tid * ATH12K_SAWF_MAX_TID_SUPPORT)) { + ti.meta_data_flags = + ath12k_sawf_get_tcl_metadata_update(skb->mark); + } + } else if (gsn_valid) { +#else + if (gsn_valid) { +#endif /* CONFIG_ATH12K_SAWF */ + ti.meta_data_flags = u32_encode_bits(HTT_TCL_META_DATA_TYPE_GLOBAL_SEQ_NUM, + HTT_TCL_META_DATA_TYPE_MISSION) | + u32_encode_bits(mcbc_gsn, HTT_TCL_META_DATA_GLOBAL_SEQ_NUM); + ti.vdev_id = arvif->vdev_id + + HTT_TX_MLO_MCAST_HOST_REINJECT_BASE_VDEV_ID; + } else { + ti.vdev_id = arvif->vdev_id; } - ti.encap_type = ath12k_dp_tx_get_encap_type(arvif, skb); + ti.encap_type = ath12k_dp_tx_get_encap_type(ab, skb); ti.addr_search_flags = arvif->hal_addr_search_flags; ti.search_type = arvif->search_type; ti.type = HAL_TCL_DESC_TYPE_BUFFER; - ti.pkt_offset = 0; - ti.lmac_id = ar->lmac_id; - ti.vdev_id = arvif->vdev_id; - ti.bss_ast_hash = arvif->ast_hash; - ti.bss_ast_idx = arvif->ast_idx; - ti.dscp_tid_tbl_idx = 0; - - if (skb->ip_summed == CHECKSUM_PARTIAL && - ti.encap_type != HAL_TCL_ENCAP_TYPE_RAW) { - ti.flags0 |= u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_IP4_CKSUM_EN) | - u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_UDP4_CKSUM_EN) | - u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_UDP6_CKSUM_EN) | - u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_TCP4_CKSUM_EN) | - u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO2_TCP6_CKSUM_EN); - } - ti.flags1 |= u32_encode_bits(1, HAL_TCL_DATA_CMD_INFO3_TID_OVERWRITE); - - ti.tid = ath12k_dp_tx_get_tid(skb); + if (likely(skb->ip_summed == CHECKSUM_PARTIAL && + ti.encap_type != HAL_TCL_ENCAP_TYPE_RAW)) { + ti.flags0 |= TX_IP_CHECKSUM; + } switch (ti.encap_type) { case HAL_TCL_ENCAP_TYPE_NATIVE_WIFI: + if ((ahvif->vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) && + (skb->protocol == cpu_to_be16(ETH_P_PAE) || + (is_qos_null = ieee80211_is_qos_nullfunc(hdr->frame_control)))) + is_diff_encap = true; + else ath12k_dp_tx_encap_nwifi(skb); break; case HAL_TCL_ENCAP_TYPE_RAW: - if (!test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) { + if (!test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) { ret = -EINVAL; goto fail_remove_tx_buf; } @@ -241,8 +554,55 @@ goto fail_remove_tx_buf; } + if (unlikely((ahvif->tx_encap_type == HAL_TCL_ENCAP_TYPE_ETHERNET && + !(skb_cb->flags & ATH12K_SKB_HW_80211_ENCAP)))) { + msdu_ext_desc = true; + + if (skb->protocol == cpu_to_be16(ETH_P_PAE)) { + ti.encap_type = HAL_TCL_ENCAP_TYPE_RAW; + ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + } + } + + if (unlikely(ahvif->tx_encap_type == HAL_TCL_ENCAP_TYPE_RAW)) { + if (skb->protocol == cpu_to_be16(ETH_P_ARP)) { + ti.encap_type = HAL_TCL_ENCAP_TYPE_RAW; + ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + msdu_ext_desc = true; + } + + if (skb_cb->flags & ATH12K_SKB_CIPHER_SET) { + ti.encrypt_type = + ath12k_dp_tx_get_encrypt_type(skb_cb->cipher); + + if (ieee80211_has_protected(hdr->frame_control)) + skb_put(skb, IEEE80211_CCMP_MIC_LEN); + } else { + ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + } + } + + if ((!test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->ag->dev_flags) && + !(skb_cb->flags & ATH12K_SKB_HW_80211_ENCAP) && + !(skb_cb->flags & ATH12K_SKB_CIPHER_SET) && + ieee80211_has_protected(hdr->frame_control)) || + is_diff_encap) { + if (is_qos_null && msdu_ext_desc) + goto skip_htt_meta; + + /* Add metadata for sw encrypted vlan group traffic */ + add_htt_metadata = true; + msdu_ext_desc = true; + + ti.meta_data_flags |= HTT_TCL_META_DATA_VALID_HTT; +skip_htt_meta: + ti.flags0 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO2_TO_FW, 1); + ti.encap_type = HAL_TCL_ENCAP_TYPE_RAW; + ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + } + ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); - if (dma_mapping_error(ab->dev, ti.paddr)) { + if (unlikely(dma_mapping_error(ab->dev, ti.paddr))) { atomic_inc(&ab->soc_stats.tx_err.misc_fail); ath12k_warn(ab, "failed to DMA map data Tx buffer\n"); ret = -ENOMEM; @@ -251,13 +611,14 @@ tx_desc->skb = skb; tx_desc->mac_id = ar->pdev_idx; + tx_desc->recycler_fast_xmit = 0; + tx_desc->timestamp = ktime_get_real(); ti.desc_id = tx_desc->desc_id; ti.data_len = skb->len; skb_cb->paddr = ti.paddr; - skb_cb->vif = arvif->vif; - skb_cb->ar = ar; + skb_cb->vif = ahvif->vif; - if (msdu_ext_desc) { + if (unlikely(msdu_ext_desc)) { skb_ext_desc = dev_alloc_skb(sizeof(struct hal_tx_msdu_ext_desc)); if (!skb_ext_desc) { ret = -ENOMEM; @@ -270,11 +631,22 @@ msg = (struct hal_tx_msdu_ext_desc *)skb_ext_desc->data; ath12k_hal_tx_cmd_ext_desc_setup(ab, msg, &ti); + if (add_htt_metadata) { + ret = ath12k_dp_prepare_htt_metadata(skb_ext_desc); + if (ret < 0) { + ath12k_dbg(ab, ATH12K_DBG_DP_TX, + "Failed to add HTT meta data, dropping packet\n"); + goto fail_unmap_dma; + } + } + ti.paddr = dma_map_single(ab->dev, skb_ext_desc->data, skb_ext_desc->len, DMA_TO_DEVICE); ret = dma_mapping_error(ab->dev, ti.paddr); if (ret) { - kfree_skb(skb_ext_desc); + atomic_inc(&ab->soc_stats.tx_err.misc_fail); + ath12k_warn(ab, "Failed to DMA map data Tx buffer\n"); + dev_kfree_skb_any(skb_ext_desc); goto fail_unmap_dma; } @@ -282,115 +654,270 @@ ti.type = HAL_TCL_DESC_TYPE_EXT_DESC; skb_cb->paddr_ext_desc = ti.paddr; + tx_desc->skb_ext_desc = skb_ext_desc; } hal_ring_id = tx_ring->tcl_data_ring.ring_id; tcl_ring = &ab->hal.srng_list[hal_ring_id]; - spin_lock_bh(&tcl_ring->lock); - - ath12k_hal_srng_access_begin(ab, tcl_ring); - + ath12k_hal_srng_access_src_ring_begin_nolock(tcl_ring); hal_tcl_desc = ath12k_hal_srng_src_get_next_entry(ab, tcl_ring); - if (!hal_tcl_desc) { + if (unlikely(!hal_tcl_desc)) { /* NOTE: It is highly unlikely we'll be running out of tcl_ring * desc because the desc is directly enqueued onto hw queue. */ - ath12k_hal_srng_access_end(ab, tcl_ring); - ab->soc_stats.tx_err.desc_na[ti.ring_id]++; + ath12k_hal_srng_access_umac_src_ring_end_nolock(tcl_ring); spin_unlock_bh(&tcl_ring->lock); + ab->soc_stats.tx_err.desc_na[ti.ring_id]++; ret = -ENOMEM; - /* Checking for available tcl descritors in another ring in - * case of failure due to full tcl ring now, is better than - * checking this ring earlier for each pkt tx. - * Restart ring selection if some rings are not checked yet. - */ - if (ring_map != (BIT(ab->hw_params->max_tx_ring) - 1) && - ab->hw_params->tcl_ring_retry) { - tcl_ring_retry = true; - ring_selector++; - } - - goto fail_unmap_dma; + goto fail_unmap_dma_ext_desc; } - ath12k_hal_tx_cmd_desc_setup(ab, hal_tcl_desc, &ti); + ab->soc_stats.tx_enqueued[ti.ring_id]++; + arvif->link_stats.tx_encap_type[ti.encap_type]++; + arvif->link_stats.tx_encrypt_type[ti.encrypt_type]++; + arvif->link_stats.tx_desc_type[ti.type]++; + tcl_cmd = (struct hal_tcl_data_cmd *)hal_tcl_desc; + + tcl_cmd->buf_addr_info.info0 = (u32)ti.paddr; + /* TODO: Copy the upper 8 bits here */ + tcl_cmd->buf_addr_info.info1 = (ti.desc_id << 12); + tcl_cmd->info0 = (ti.type << 1) | arvif->desc.info0; + tcl_cmd->info1 = ti.meta_data_flags << 16; + tcl_cmd->info2 = ti.flags0 | ti.data_len; - ath12k_hal_srng_access_end(ab, tcl_ring); + /* In tcl_cmd->info3, Bit 24 to 31 represents vdev_id + * LSH 24 times to add updated vdev_id to info3 + */ + tcl_cmd->info3 = (ti.vdev_id << 24) | arvif->desc.info3; + tcl_cmd->info4 = arvif->desc.info4; + tcl_cmd->info5 = 0; + +#ifdef CONFIG_ATH12K_SAWF + /* SAWF */ + if (u32_get_bits(skb->mark, SAWF_TAG_ID) == SAWF_VALID_TAG) { + u32 msduq_id = u32_get_bits(skb->mark, SAWF_MSDUQ_ID); + + if (msduq_id < (ab->max_msduq_per_tid * ATH12K_SAWF_MAX_TID_SUPPORT)) { + tcl_cmd->info3 |= + ath12k_sawf_get_tcl_cmd_info3_update(msduq_id); + } + if (unlikely(ath12k_debugfs_is_sawf_stats_enabled(ar) & ATH12K_SAWF_STATS_BASIC)) { + peer_id = u32_get_bits(skb->mark, SAWF_PEER_ID); + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_id(ab, peer_id); + if (unlikely(!peer || !peer->sta)) + ath12k_dbg(ab, ATH12K_DBG_SAWF, + "peer_id %u not found\n", peer_id); + else + ath12k_sawf_tx_enqueue_peer_stats(ab, peer, msduq_id, ti.data_len); + spin_unlock_bh(&ab->base_lock); + } + /* Store the NWDELAY to skb->mark which can be fetched + * during tx completion + */ + if (info->sawf.nw_delay > SAWF_NW_DELAY_MAX) + info->sawf.nw_delay = SAWF_NW_DELAY_MAX; + skb->mark = (SAWF_VALID_TAG << SAWF_TAG_SHIFT) | (info->sawf.nw_delay << SAWF_NW_DELAY_SHIFT) | msduq_id; + } +#endif /* CONFIG_ATH12K_SAWF */ + dsb(st); + ath12k_hal_srng_access_umac_src_ring_end_nolock(tcl_ring); spin_unlock_bh(&tcl_ring->lock); ath12k_dbg_dump(ab, ATH12K_DBG_DP_TX, NULL, "dp tx msdu: ", skb->data, skb->len); + if (gsn_valid) + arvif->link_stats.tx_bcast_mcast++; + else + arvif->link_stats.tx_enqueued++; + atomic_inc(&ar->dp.num_tx_pending); + atomic_inc(&ab->ag->num_dp_tx_pending); return 0; +fail_unmap_dma_ext_desc: + if (unlikely(msdu_ext_desc)) { + dma_unmap_single(ab->dev, ti.paddr, + skb_ext_desc->len, DMA_TO_DEVICE); + dev_kfree_skb_any(skb_ext_desc); + } + fail_unmap_dma: - dma_unmap_single(ab->dev, ti.paddr, ti.data_len, DMA_TO_DEVICE); - dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + dma_unmap_single(ab->dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE); fail_remove_tx_buf: - ath12k_dp_tx_release_txbuf(dp, tx_desc, pool_id); - if (tcl_ring_retry) - goto tcl_ring_sel; + ath12k_dp_tx_release_txbuf(dp, tx_desc, ti.ring_id); + + arvif->link_stats.tx_dropped++; return ret; } +static inline void ath12k_dp_tx_decrement(struct ath12k *ar) +{ + atomic_dec(&ar->ab->ag->num_dp_tx_pending); + + if (atomic_read(&ar->flush_request)) { + if (atomic_dec_and_test(&ar->dp.num_tx_pending)) + wake_up(&ar->tx_empty_waitq); + } else { + atomic_dec(&ar->dp.num_tx_pending); + } +} + static void ath12k_dp_tx_free_txbuf(struct ath12k_base *ab, struct sk_buff *msdu, u8 mac_id, - struct dp_tx_ring *tx_ring) + struct dp_tx_ring *tx_ring, + struct sk_buff *skb_ext_desc) { - struct ath12k *ar; struct ath12k_skb_cb *skb_cb; + struct ath12k *ar; skb_cb = ATH12K_SKB_CB(msdu); + ar = ab->pdevs[mac_id].ar; - dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); - if (skb_cb->paddr_ext_desc) - dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + dma_unmap_single_attrs(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE, + DMA_ATTR_SKIP_CPU_SYNC); + if (unlikely(skb_ext_desc)) { + dma_unmap_single_attrs(ab->dev, skb_cb->paddr_ext_desc, + skb_ext_desc->len, + DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + dev_kfree_skb_any(skb_ext_desc); + } - dev_kfree_skb_any(msdu); + ieee80211_free_txskb(ar->ah->hw, msdu); - ar = ab->pdevs[mac_id].ar; - if (atomic_dec_and_test(&ar->dp.num_tx_pending)) - wake_up(&ar->dp.tx_empty_waitq); + ath12k_dp_tx_decrement(ar); +} + +static inline void ath12k_dp_tx_status_parse(struct ath12k_base *ab, + struct hal_wbm_completion_ring_tx *desc, + struct hal_tx_status *ts) +{ + ts->buf_rel_source = + FIELD_GET(HAL_WBM_COMPL_TX_INFO0_REL_SRC_MODULE, desc->info0); + if (ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW && + ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM) + return; + + if (ts->buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW) + return; + + ts->status = FIELD_GET(HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON, + desc->info0); + ts->ppdu_id = FIELD_GET(HAL_WBM_COMPL_TX_INFO1_TQM_STATUS_NUMBER, + desc->info1); + ts->ack_rssi = FIELD_GET(HAL_WBM_COMPL_TX_INFO2_ACK_FRAME_RSSI, + desc->info2); + if (desc->rate_stats.info0 & HAL_TX_RATE_STATS_INFO0_VALID) + ts->rate_stats = desc->rate_stats.info0; + else + ts->rate_stats = 0; + ts->tid = FIELD_GET(HAL_WBM_RELEASE_TX_INFO3_TID, desc->info3); + + ts->peer_id = FIELD_GET(HAL_WBM_RELEASE_TX_INFO3_PEER_ID, desc->info3); + ts->flags = FIELD_GET(HAL_WBM_RELEASE_TX_INFO2_FIRST_MSDU, desc->info2) | + FIELD_GET(HAL_WBM_RELEASE_TX_INFO2_LAST_MSDU, desc->info2); + ts->buffer_timestamp = FIELD_GET(HAL_WBM_RELEASE_TX_INFO2_BUFFER_TIMESTAMP, + desc->info2); + ts->tsf = desc->rate_stats.tsf; } static void ath12k_dp_tx_htt_tx_complete_buf(struct ath12k_base *ab, struct sk_buff *msdu, struct dp_tx_ring *tx_ring, - struct ath12k_dp_htt_wbm_tx_status *ts) + struct ath12k_dp_htt_wbm_tx_status *ts, + struct sk_buff *skb_ext_desc, u8 mac_id, + void *desc, ktime_t timestamp) { struct ieee80211_tx_info *info; struct ath12k_skb_cb *skb_cb; struct ath12k *ar; + struct ieee80211_vif *vif; + struct ath12k_vif *ahvif; + struct ath12k_peer *peer; + struct hal_tx_status ts_status = { 0 }; + unsigned long attrs = 0; + u8 flags = 0; + bool drop_disable = false; skb_cb = ATH12K_SKB_CB(msdu); info = IEEE80211_SKB_CB(msdu); - ar = skb_cb->ar; + ar = ab->pdevs[mac_id].ar; + ab->soc_stats.tx_completed[tx_ring->tcl_data_ring_id]++; - if (atomic_dec_and_test(&ar->dp.num_tx_pending)) - wake_up(&ar->dp.tx_empty_waitq); + ath12k_dp_tx_decrement(ar); + + flags = skb_cb->flags; + drop_disable = (ab->stats_disable && !(flags & ATH12K_SKB_TX_STATUS)); + + /* If drop disable case, avoid cpu_sync since we are not passed + * the skb to mac80211 + */ + if (drop_disable) + attrs |= DMA_ATTR_SKIP_CPU_SYNC; + + dma_unmap_single_attrs(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE, attrs); - dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); - if (skb_cb->paddr_ext_desc) - dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + if (unlikely(skb_ext_desc)) { + dma_unmap_single_attrs(ab->dev, skb_cb->paddr_ext_desc, + skb_ext_desc->len, DMA_TO_DEVICE, attrs); + dev_kfree_skb_any(skb_ext_desc); + } + + /* Free skb here if stats is disabled */ + if (drop_disable) { + if (skb_cb->vif) { + ahvif = (void *)skb_cb->vif->drv_priv; + if (ahvif->links_map & BIT(skb_cb->link_id)) { + if (ahvif->link[skb_cb->link_id]) + ahvif->link[skb_cb->link_id]->link_stats.tx_completed++; + } else { + ath12k_warn(ab, + "invalid linkid 0x%X in htt tx complete buf linkmap %lu\n", + skb_cb->link_id, + ahvif->links_map); + } + } + + if (msdu->destructor) { + msdu->wifi_acked_valid = 1; + msdu->wifi_acked = ts->acked; + } + ieee80211_free_txskb(ar->ah->hw, msdu); + return; + } + + if (unlikely(!skb_cb->vif)) { + ieee80211_free_txskb(ar->ah->hw, msdu); + return; + } + + vif = skb_cb->vif; + ahvif = (void *)vif->drv_priv; + if (ahvif->links_map & BIT(skb_cb->link_id)) { + if (ahvif->link[skb_cb->link_id]) + ahvif->link[skb_cb->link_id]->link_stats.tx_completed++; + } else { + ath12k_warn(ab, + "invalid linkid 0x%X in htt tx complete buf linkmap %lu\n", + skb_cb->link_id, + ahvif->links_map); + } memset(&info->status, 0, sizeof(info->status)); if (ts->acked) { if (!(info->flags & IEEE80211_TX_CTL_NO_ACK)) { info->flags |= IEEE80211_TX_STAT_ACK; - info->status.ack_signal = ATH12K_DEFAULT_NOISE_FLOOR + + info->status.ack_signal = ar->rssi_offsets.rssi_offset + ts->ack_rssi; info->status.flags = IEEE80211_TX_STATUS_ACK_SIGNAL_VALID; } else { @@ -398,36 +925,58 @@ } } - ieee80211_tx_status(ar->hw, msdu); + if (unlikely(ath12k_debugfs_is_sawf_stats_enabled(ar))) { + spin_lock_bh(&ab->base_lock); + ath12k_dp_tx_status_parse(ab, desc, &ts_status); + peer = ath12k_peer_find_by_id(ab, ts_status.peer_id); + if (unlikely(!peer || !peer->sta)) + ath12k_dbg(ab, ATH12K_DBG_DATA, + "dp_tx: failed to find the peer with peer_id %d\n", + ts_status.peer_id); + else + ath12k_sawf_stats_update(ar, msdu, &ts_status, peer, timestamp); + spin_unlock_bh(&ab->base_lock); + } + + if ((!flags & ATH12K_SKB_HW_80211_ENCAP)) + ieee80211_tx_status_8023(ar->ah->hw, vif, msdu); + else + ieee80211_tx_status(ar->ah->hw, msdu); } static void ath12k_dp_tx_process_htt_tx_complete(struct ath12k_base *ab, void *desc, u8 mac_id, struct sk_buff *msdu, - struct dp_tx_ring *tx_ring) + struct dp_tx_ring *tx_ring, + struct sk_buff *skb_ext_desc, + ktime_t timestamp) { struct htt_tx_wbm_completion *status_desc; struct ath12k_dp_htt_wbm_tx_status ts = {0}; - enum hal_wbm_htt_tx_comp_status wbm_status; + int htt_status; status_desc = desc + HTT_TX_WBM_COMP_STATUS_OFFSET; - wbm_status = le32_get_bits(status_desc->info0, + htt_status = le32_get_bits(status_desc->info0, HTT_TX_WBM_COMP_INFO0_STATUS); - switch (wbm_status) { + ab->soc_stats.fw_tx_status[htt_status]++; + + switch (htt_status) { case HAL_WBM_REL_HTT_TX_COMP_STATUS_OK: - case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP: - case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL: - ts.acked = (wbm_status == HAL_WBM_REL_HTT_TX_COMP_STATUS_OK); + ts.acked = (htt_status == HAL_WBM_REL_HTT_TX_COMP_STATUS_OK); ts.ack_rssi = le32_get_bits(status_desc->info2, HTT_TX_WBM_COMP_INFO2_ACK_RSSI); - ath12k_dp_tx_htt_tx_complete_buf(ab, msdu, tx_ring, &ts); + ath12k_dp_tx_htt_tx_complete_buf(ab, msdu, tx_ring, &ts, skb_ext_desc, mac_id, desc, timestamp); + break; + case HAL_WBM_REL_HTT_TX_COMP_STATUS_DROP: + case HAL_WBM_REL_HTT_TX_COMP_STATUS_TTL: case HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ: case HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT: - ath12k_dp_tx_free_txbuf(ab, msdu, mac_id, tx_ring); + case HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH: + ath12k_dp_tx_free_txbuf(ab, msdu, mac_id, tx_ring, skb_ext_desc); break; case HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY: /* This event is to be handled only when the driver decides to @@ -435,41 +984,195 @@ */ break; default: - ath12k_warn(ab, "Unknown htt tx status %d\n", wbm_status); + ath12k_warn(ab, "Unknown htt tx status %d\n", htt_status); break; } } -static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, +static void ath12k_dp_tx_cache_peer_stats(struct ath12k *ar, struct sk_buff *msdu, struct hal_tx_status *ts) { + struct ath12k_per_peer_tx_stats *peer_stats = &ar->cached_stats; + + if (ts->try_cnt > 1) { + peer_stats->retry_pkts += ts->try_cnt - 1; + peer_stats->retry_bytes += (ts->try_cnt - 1) * msdu->len; + + if (ts->status != HAL_WBM_TQM_REL_REASON_FRAME_ACKED) { + peer_stats->failed_pkts += 1; + peer_stats->failed_bytes += msdu->len; + } + } +} + +void ath12k_dp_tx_update_txcompl(struct ath12k *ar, struct hal_tx_status *ts) +{ struct ath12k_base *ab = ar->ab; - struct ieee80211_tx_info *info; - struct ath12k_skb_cb *skb_cb; + struct ath12k_per_peer_tx_stats *peer_stats = &ar->cached_stats; + enum hal_tx_rate_stats_pkt_type pkt_type; + enum hal_tx_rate_stats_sgi sgi; + enum hal_tx_rate_stats_bw bw; + struct ath12k_peer *peer; + struct ath12k_link_sta *arsta; + u16 rate, ru_tones; + u8 mcs, rate_idx, ofdma; + int ret; - if (WARN_ON_ONCE(ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM)) { - /* Must not happen */ - return; + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_id(ab, ts->peer_id); + if (!peer || !peer->sta) { + ath12k_dbg(ab, ATH12K_DBG_DP_TX, + "failed to find the peer by id %u\n", ts->peer_id); + goto err_out; + } + + arsta = ath12k_peer_get_link_sta(ab, peer); + if (!arsta) { + ath12k_warn(ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + goto err_out; + } + + memset(&arsta->txrate, 0, sizeof(arsta->txrate)); + pkt_type = FIELD_GET(HAL_TX_RATE_STATS_INFO0_PKT_TYPE, + ts->rate_stats); + mcs = FIELD_GET(HAL_TX_RATE_STATS_INFO0_MCS, + ts->rate_stats); + sgi = FIELD_GET(HAL_TX_RATE_STATS_INFO0_SGI, + ts->rate_stats); + bw = FIELD_GET(HAL_TX_RATE_STATS_INFO0_BW, ts->rate_stats); + ru_tones = FIELD_GET(HAL_TX_RATE_STATS_INFO0_TONES_IN_RU, ts->rate_stats); + ofdma = FIELD_GET(HAL_TX_RATE_STATS_INFO0_OFDMA_TX, ts->rate_stats); + + /* This is to prefer choose the real NSS value arsta->last_txrate.nss, + * if it is invalid, then choose the NSS value while assoc. + */ + if (arsta->last_txrate.nss) + arsta->txrate.nss = arsta->last_txrate.nss; + else + arsta->txrate.nss = arsta->peer_nss; + + if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11A || + pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11B) { + ret = ath12k_mac_hw_ratecode_to_legacy_rate(mcs, + pkt_type, + &rate_idx, + &rate); + if (ret < 0) + goto err_out; + arsta->txrate.legacy = rate; + } else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11N) { + if (mcs > 7) { + ath12k_warn(ab, "Invalid HT mcs index %d\n", mcs); + goto err_out; + } + + if (arsta->txrate.nss != 0) + arsta->txrate.mcs = mcs + 8 * (arsta->txrate.nss - 1); + arsta->txrate.flags = RATE_INFO_FLAGS_MCS; + if (sgi) + arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; + } else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AC) { + if (mcs > 9) { + ath12k_warn(ab, "Invalid VHT mcs index %d\n", mcs); + goto err_out; + } + + arsta->txrate.mcs = mcs; + arsta->txrate.flags = RATE_INFO_FLAGS_VHT_MCS; + if (sgi) + arsta->txrate.flags |= RATE_INFO_FLAGS_SHORT_GI; + } else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) { + if (mcs > 11) { + ath12k_warn(ab, "Invalid HE mcs index %d\n", mcs); + goto err_out; + } + + arsta->txrate.mcs = mcs; + arsta->txrate.flags = RATE_INFO_FLAGS_HE_MCS; + arsta->txrate.he_gi = ath12k_mac_he_gi_to_nl80211_he_gi(sgi); + } else if (pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11BE) { + if (mcs > 13) { + ath12k_warn(ab, "Invalid EHT mcs index %d\n", mcs); + goto err_out; + } + + arsta->txrate.mcs = mcs; + arsta->txrate.flags = RATE_INFO_FLAGS_EHT_MCS; + arsta->txrate.he_gi = ath12k_mac_he_gi_to_nl80211_he_gi(sgi); + } + + arsta->txrate.bw = ath12k_mac_bw_to_mac80211_bw(bw); + if (ofdma && pkt_type == HAL_TX_RATE_STATS_PKT_TYPE_11AX) { + arsta->txrate.bw = RATE_INFO_BW_HE_RU; + arsta->txrate.he_ru_alloc = + ath12k_mac_he_ru_tones_to_nl80211_he_ru_alloc(ru_tones); + } + + if (ath12k_debugfs_is_extd_tx_stats_enabled(ar)) + ath12k_debugfs_sta_add_tx_stats(arsta, peer_stats, rate_idx); + +err_out: + spin_unlock_bh(&ab->base_lock); } +static void ath12k_dp_tx_complete_msdu(struct ath12k *ar, + struct sk_buff *msdu, + struct hal_wbm_release_ring *tx_status, + enum hal_wbm_rel_src_module buf_rel_source, + int ring, ktime_t timestamp) +{ + struct ieee80211_tx_status status = { 0 }; + struct ieee80211_rate_status status_rate = { 0 }; + struct ath12k_base *ab = ar->ab; + struct ieee80211_tx_info *info; + struct ath12k_skb_cb *skb_cb; + struct ath12k_peer *peer; + struct ath12k_link_sta *arsta; + struct rate_info rate; + struct hal_tx_status ts = { 0 }; + enum hal_wbm_htt_tx_comp_status wbm_status; + struct ieee80211_vif *vif; + struct ath12k_vif *ahvif; + u8 flags = 0; + skb_cb = ATH12K_SKB_CB(msdu); + ab->soc_stats.tx_completed[ring]++; - dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); - if (skb_cb->paddr_ext_desc) - dma_unmap_single(ab->dev, skb_cb->paddr_ext_desc, - sizeof(struct hal_tx_msdu_ext_desc), DMA_TO_DEVICE); + flags = skb_cb->flags; - rcu_read_lock(); + if (unlikely(!rcu_access_pointer(ab->pdevs_active[ar->pdev_idx]))) { + ieee80211_free_txskb(ar->ah->hw, msdu); + return; + } - if (!rcu_dereference(ab->pdevs_active[ar->pdev_idx])) { - dev_kfree_skb_any(msdu); - goto exit; + if (unlikely(!skb_cb->vif)) { + ieee80211_free_txskb(ar->ah->hw, msdu); + return; } - if (!skb_cb->vif) { - dev_kfree_skb_any(msdu); - goto exit; + ath12k_dp_tx_status_parse(ab, (struct hal_wbm_completion_ring_tx *)tx_status, &ts); + + ar->wmm_stats.tx_type = ath12k_tid_to_ac(ts.tid > ATH12K_DSCP_PRIORITY ? 0:ts.tid); + if (ar->wmm_stats.tx_type) { + if (ts.status != HAL_WBM_TQM_REL_REASON_FRAME_ACKED) + ar->wmm_stats.total_wmm_tx_drop[ar->wmm_stats.tx_type]++; + } + + wbm_status = FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, + tx_status->info0); + + vif = skb_cb->vif; + ahvif = (void *)vif->drv_priv; + if (ahvif->links_map & BIT(skb_cb->link_id)) { + if (ahvif->link[skb_cb->link_id]) + ahvif->link[skb_cb->link_id]->link_stats.tx_completed++; + } else { + ath12k_warn(ar->ab, + "invalid linkid 0x%X in tx complete msdu linkmap %lu\n", + skb_cb->link_id, + ahvif->links_map); } info = IEEE80211_SKB_CB(msdu); @@ -478,142 +1181,520 @@ /* skip tx rate update from ieee80211_status*/ info->status.rates[0].idx = -1; - if (ts->status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED && + if (ts.status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED && !(info->flags & IEEE80211_TX_CTL_NO_ACK)) { info->flags |= IEEE80211_TX_STAT_ACK; - info->status.ack_signal = ATH12K_DEFAULT_NOISE_FLOOR + - ts->ack_rssi; + info->status.ack_signal = ar->rssi_offsets.rssi_offset + + ts.ack_rssi; info->status.flags = IEEE80211_TX_STATUS_ACK_SIGNAL_VALID; } - if (ts->status == HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX && + if (ts.status == HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX && (info->flags & IEEE80211_TX_CTL_NO_ACK)) info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; - /* NOTE: Tx rate status reporting. Tx completion status does not have - * necessary information (for example nss) to build the tx rate. - * Might end up reporting it out-of-band from HTT stats. - */ + if (ts.status != HAL_WBM_TQM_REL_REASON_FRAME_ACKED) { + switch (ts.status) { + case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_MPDU: + case HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD: + case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_AGED_FRAMES: + case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX: + if (unlikely(ath12k_debugfs_is_sawf_stats_enabled(ar))) { + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_id(ab, ts.peer_id); + if (unlikely(!peer || !peer->sta)) + ath12k_dbg(ab, ATH12K_DBG_DATA, + "dp_tx: failed to find the peer with peer_id %d\n", + ts.peer_id); + else + ath12k_sawf_stats_update(ar, msdu, &ts, peer, timestamp); + spin_unlock_bh(&ab->base_lock); + } + ieee80211_free_txskb(ar->ah->hw, msdu); + return; + default: + //TODO: Remove this print and add as a stats + ath12k_dbg(ab, ATH12K_DBG_DP_TX, "tx frame is not acked status %d\n", ts.status); + } + } - ieee80211_tx_status(ar->hw, msdu); + if (unlikely(ath12k_debugfs_is_extd_tx_stats_enabled(ar)) || + ab->hw_params->single_pdev_only) { + if (ts.flags & HAL_TX_STATUS_FLAGS_FIRST_MSDU) { + if (ar->last_ppdu_id == 0) { + ar->last_ppdu_id = ts.ppdu_id; + } else if (ar->last_ppdu_id == ts.ppdu_id || + ar->cached_ppdu_id == ar->last_ppdu_id) { + ar->cached_ppdu_id = ar->last_ppdu_id; + ar->cached_stats.is_ampdu = true; + ath12k_dp_tx_update_txcompl(ar, &ts); + memset(&ar->cached_stats, 0, + sizeof(struct ath12k_per_peer_tx_stats)); + } else { + ar->cached_stats.is_ampdu = false; + ath12k_dp_tx_update_txcompl(ar, &ts); + memset(&ar->cached_stats, 0, + sizeof(struct ath12k_per_peer_tx_stats)); + } + ar->last_ppdu_id = ts.ppdu_id; + } -exit: - rcu_read_unlock(); + ath12k_dp_tx_cache_peer_stats(ar, msdu, &ts); } -static void ath12k_dp_tx_status_parse(struct ath12k_base *ab, - struct hal_wbm_completion_ring_tx *desc, - struct hal_tx_status *ts) -{ - ts->buf_rel_source = - le32_get_bits(desc->info0, HAL_WBM_COMPL_TX_INFO0_REL_SRC_MODULE); - if (ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_FW && - ts->buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM) + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_by_id(ab, ts.peer_id); + if (unlikely(!peer || !peer->sta)) { + ath12k_dbg(ab, ATH12K_DBG_DATA, + "dp_tx: failed to find the peer with peer_id %d\n", + ts.peer_id); + spin_unlock_bh(&ab->base_lock); + ieee80211_free_txskb(ar->ah->hw, msdu); return; + } - if (ts->buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW) + arsta = ath12k_peer_get_link_sta(ab, peer); + if (!arsta) { + ath12k_warn(ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + + spin_unlock_bh(&ab->base_lock); + ieee80211_free_txskb(ar->ah->hw, msdu); return; + } + + status.sta = peer->sta; + status.skb = msdu; + status.info = info; + rate = arsta->last_txrate; + + status_rate.rate_idx = rate; + status_rate.try_count = 1; - ts->status = le32_get_bits(desc->info0, - HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON); + status.rates = &status_rate; + status.n_rates = 1; - ts->ppdu_id = le32_get_bits(desc->info1, - HAL_WBM_COMPL_TX_INFO1_TQM_STATUS_NUMBER); - if (le32_to_cpu(desc->rate_stats.info0) & HAL_TX_RATE_STATS_INFO0_VALID) - ts->rate_stats = le32_to_cpu(desc->rate_stats.info0); + + if (unlikely(ath12k_debugfs_is_extd_tx_stats_enabled(ar))) { + if(arsta->wbm_tx_stats && wbm_status < HAL_WBM_REL_HTT_TX_COMP_STATUS_MAX) + arsta->wbm_tx_stats->wbm_tx_comp_stats[wbm_status]++; + } + + if (unlikely(ath12k_debugfs_is_sawf_stats_enabled(ar))) + ath12k_sawf_stats_update(ar, msdu, &ts, peer, timestamp); + + spin_unlock_bh(&ab->base_lock); + + if (flags & ATH12K_SKB_HW_80211_ENCAP) + ieee80211_tx_status_8023(ar->ah->hw, vif, msdu); else - ts->rate_stats = 0; + ieee80211_tx_status_ext(ar->ah->hw, &status); } -void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id) +static inline bool ath12k_dp_tx_completion_valid(struct hal_wbm_release_ring *desc) +{ + struct htt_tx_wbm_completion *status_desc; + + if (FIELD_GET(HAL_WBM_COMPL_TX_INFO0_REL_SRC_MODULE, desc->info0) == + HAL_WBM_REL_SRC_MODULE_FW) { + status_desc = (struct htt_tx_wbm_completion *)(((u8 *)desc) + HTT_TX_WBM_COMP_STATUS_OFFSET); + + /* Dont consider HTT_TX_COMP_STATUS_MEC_NOTIFY */ + if (FIELD_GET(HTT_TX_WBM_COMP_INFO0_STATUS, status_desc->info0) == + HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY) + return false; + } + return true; +} + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +static void ath12k_ppeds_tx_update_stats(struct ath12k *ar, struct sk_buff *msdu, + struct hal_wbm_release_ring *tx_status) +{ + struct ath12k_base *ab = ar->ab; + struct ieee80211_tx_info *info; + struct ath12k_peer *peer; + struct ath12k_link_sta *arsta; + struct hal_tx_status ts = { 0 }; + + info = IEEE80211_SKB_CB(msdu); + memset(&info->status, 0, sizeof(info->status)); + info->status.rates[0].idx = -1; + + ath12k_dp_tx_status_parse(ab, (struct hal_wbm_completion_ring_tx *)tx_status, &ts); + if (ts.status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED && + !(info->flags & IEEE80211_TX_CTL_NO_ACK)) { + info->flags |= IEEE80211_TX_STAT_ACK; + info->status.ack_signal = ATH12K_DEFAULT_NOISE_FLOOR + + ts.ack_rssi; + info->status.flags = IEEE80211_TX_STATUS_ACK_SIGNAL_VALID; + } + + if (ts.status == HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX && + (info->flags & IEEE80211_TX_CTL_NO_ACK)) + info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; + + if (ts.status != HAL_WBM_TQM_REL_REASON_FRAME_ACKED) { + switch (ts.status) { + case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_MPDU: + case HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD: + case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_AGED_FRAMES: + case HAL_WBM_TQM_REL_REASON_CMD_REMOVE_TX: + return; + default: + //TODO: Remove this print and add as a stats + ath12k_dbg(ab, ATH12K_DBG_DP_TX, "tx frame is not acked status %d\n", ts.status); + } + } + + spin_lock_bh(&ab->base_lock); + + peer = ath12k_peer_find_by_id(ab, ts.peer_id); + if (unlikely(!peer || !peer->sta)) { + ath12k_dbg(ab, ATH12K_DBG_DATA, + "dp_tx: failed to find the peer with peer_id %d\n", + ts.peer_id); + spin_unlock_bh(&ab->base_lock); + return; + } + + arsta = ath12k_peer_get_link_sta(ab, peer); + if (!arsta) { + ath12k_warn(ab, "link sta not found on peer %pM id %d\n", + peer->addr, peer->peer_id); + spin_unlock_bh(&ab->base_lock); + return; + } + + ieee80211_ppeds_tx_update_stats(ar->ah->hw, peer->sta, info, arsta->txrate, + peer->link_id, msdu->len); + + spin_unlock_bh(&ab->base_lock); +} + +static inline +void ath12k_dp_ppeds_tx_comp_get_desc(struct ath12k_base *ab, + struct hal_wbm_completion_ring_tx *tx_status, + struct ath12k_ppeds_tx_desc_info **tx_desc) +{ + u64 desc_va = 0; + u32 desc_id; + + if (likely(HAL_WBM_COMPL_TX_INFO0_CC_DONE & tx_status->info0)) { + /* HW done cookie conversion */ + desc_va = ((u64)tx_status->buf_va_hi << 32 | + tx_status->buf_va_lo); + *tx_desc = (struct ath12k_ppeds_tx_desc_info *)((unsigned long)desc_va); + } else { + /* SW does cookie conversion to VA */ + desc_id = u32_get_bits(tx_status->buf_va_hi, + BUFFER_ADDR_INFO1_SW_COOKIE); + + *tx_desc = ath12k_dp_get_ppeds_tx_desc(ab, desc_id); + } +} + +int ath12k_ppeds_tx_completion_handler(struct ath12k_base *ab, int budget) { - struct ath12k *ar; struct ath12k_dp *dp = &ab->dp; - int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id; + struct dp_ppeds_tx_comp_ring *tx_ring = &dp->ppeds_comp_ring.ppe_wbm2sw_ring; + int hal_ring_id = tx_ring->ppe_wbm2sw_ring.ring_id; struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id]; - struct ath12k_tx_desc_info *tx_desc = NULL; + struct ath12k_ppeds_tx_desc_info *tx_desc = NULL; struct sk_buff *msdu; - struct hal_tx_status ts = { 0 }; - struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; - struct hal_wbm_release_ring *desc; + u32 *desc; u8 mac_id; - u64 desc_va; + int valid_entries, count = 0, i = 0; + struct hal_wbm_completion_ring_tx *tx_status; + struct htt_tx_wbm_completion *status_desc; + enum hal_wbm_rel_src_module buf_rel_source; + struct sk_buff_head free_list_head; + int work_done = 0, htt_status; + size_t stat_size; + + if (likely(ab->stats_disable)) + /* only need buf_addr_info and info0 */ + stat_size = 3 * sizeof(u32); + else + stat_size = sizeof(struct hal_wbm_release_ring); spin_lock_bh(&status_ring->lock); - ath12k_hal_srng_access_begin(ab, status_ring); + ath12k_hal_srng_access_dst_ring_begin_nolock(ab, status_ring); + + valid_entries = ath12k_hal_srng_dst_num_free(ab, status_ring, false); + if (!valid_entries) { + ath12k_hal_srng_access_dst_ring_end_nolock(status_ring); + spin_unlock_bh(&status_ring->lock); + return work_done; + } + + if (valid_entries >= budget) + valid_entries = budget; + + ath12k_hal_srng_ppeds_dst_inv_entry(ab, status_ring, valid_entries); + skb_queue_head_init(&free_list_head); - while (ATH12K_TX_COMPL_NEXT(tx_ring->tx_status_head) != tx_ring->tx_status_tail) { - desc = ath12k_hal_srng_dst_get_next_entry(ab, status_ring); - if (!desc) + while (likely(valid_entries--)) { + desc = (struct hal_wbm_completion_ring_tx *)ath12k_hal_srng_dst_get_next_cache_entry(ab, status_ring); + if (!desc || !ath12k_dp_tx_completion_valid(desc)) + continue; + + memcpy(&tx_ring->tx_status[count], desc, stat_size); + count++; + + if (count == valid_entries) break; + } + + ath12k_hal_srng_access_dst_ring_end_nolock(status_ring); + + spin_lock_bh(&dp->ppeds_tx_desc_lock[ATH12K_PPEDS_DEFAULT_POOL_ID]); + spin_unlock_bh(&status_ring->lock); + + while (count--) { + tx_status = &tx_ring->tx_status[i++]; - memcpy(&tx_ring->tx_status[tx_ring->tx_status_head], - desc, sizeof(*desc)); - tx_ring->tx_status_head = - ATH12K_TX_COMPL_NEXT(tx_ring->tx_status_head); + ath12k_dp_ppeds_tx_comp_get_desc(ab, tx_status, &tx_desc); + if (unlikely(!tx_desc)) { + ath12k_warn(ab, "unable to retrieve ppe ds tx_desc!"); + continue; } - if (ath12k_hal_srng_dst_peek(ab, status_ring) && - (ATH12K_TX_COMPL_NEXT(tx_ring->tx_status_head) == tx_ring->tx_status_tail)) { - /* TODO: Process pending tx_status messages when kfifo_is_full() */ - ath12k_warn(ab, "Unable to process some of the tx_status ring desc because status_fifo is full\n"); + mac_id = tx_desc->mac_id; + + if (unlikely(!ab->stats_disable)) + ath12k_ppeds_tx_update_stats(ab->pdevs[mac_id].ar, tx_desc->skb, + tx_status); + + /* Release descriptor as soon as extracting necessary info + * to reduce contention + */ + msdu = ath12k_dp_ppeds_tx_release_desc_nolock(dp, tx_desc, + ATH12K_PPEDS_DEFAULT_POOL_ID); + buf_rel_source = FIELD_GET(HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE, + tx_status->info0); + if (unlikely(buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) { + status_desc = ((void *)tx_status) + HTT_TX_WBM_COMP_STATUS_OFFSET; + htt_status = u32_get_bits(status_desc->info0, + HTT_TX_WBM_COMP_INFO0_STATUS); + if (htt_status != HAL_WBM_REL_HTT_TX_COMP_STATUS_OK && + !ab->stats_disable) { + ab->ppeds_stats.fw2wbm_pkt_drops++; + } + dev_kfree_skb_any(msdu); + ath12k_warn(ab, "ath12k: Frame received from unexpected source %d status %d!\n", + buf_rel_source, htt_status); + continue; } - ath12k_hal_srng_access_end(ab, status_ring); + /* is skb is being reused, avoid freeing it */ + if (!msdu) + continue; - spin_unlock_bh(&status_ring->lock); + if (skb_has_frag_list(msdu)) { + kfree_skb_list(skb_shinfo(msdu)->frag_list); + skb_shinfo(msdu)->frag_list = NULL; + } - while (ATH12K_TX_COMPL_NEXT(tx_ring->tx_status_tail) != tx_ring->tx_status_head) { - struct hal_wbm_completion_ring_tx *tx_status; +#ifdef CONFIG_MAC80211_SFE_SUPPORT + if (likely(msdu->is_from_recycler)) { + __skb_queue_head(&free_list_head, msdu); + } else { + dev_kfree_skb(msdu); + } +#else + dev_kfree_skb(msdu); +#endif + + work_done++; + } + spin_unlock_bh(&dp->ppeds_tx_desc_lock[ATH12K_PPEDS_DEFAULT_POOL_ID]); + dev_kfree_skb_list_fast(&free_list_head); + + return work_done; +} +#endif + +int ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id, + int budget) +{ + struct ath12k *ar; + struct ath12k_dp *dp = &ab->dp; + int hal_ring_id = dp->tx_ring[ring_id].tcl_comp_ring.ring_id; + struct hal_srng *status_ring = &ab->hal.srng_list[hal_ring_id]; + struct ath12k_tx_desc_info *tx_desc = NULL; + struct list_head desc_free_list, *cur; + struct sk_buff *msdu, *skb_ext_desc; + struct ath12k_skb_cb *skb_cb; + struct dp_tx_ring *tx_ring = &dp->tx_ring[ring_id]; + u8 mac_id; + u64 desc_va; + struct ath12k_vif *ahvif; u32 desc_id; + u8 flags = 0; + int valid_entries; + int orig_budget = budget; + struct hal_wbm_completion_ring_tx *tx_status; + ktime_t timestamp; + enum hal_wbm_rel_src_module buf_rel_source; + enum hal_wbm_tqm_rel_reason rel_status; + struct sk_buff_head free_list_head; + int recycler_fast_xmit; + + + INIT_LIST_HEAD(&desc_free_list); + + ath12k_hal_srng_access_dst_ring_begin_nolock(ab, status_ring); + + valid_entries = ath12k_hal_srng_dst_num_free(ab, status_ring, false); + if (!valid_entries) { + ath12k_hal_srng_access_dst_ring_end_nolock(status_ring); + return 0; + } + + if (valid_entries > budget) + valid_entries = budget; - tx_ring->tx_status_tail = - ATH12K_TX_COMPL_NEXT(tx_ring->tx_status_tail); - tx_status = &tx_ring->tx_status[tx_ring->tx_status_tail]; - ath12k_dp_tx_status_parse(ab, tx_status, &ts); + ath12k_hal_srng_dst_invalidate_entry(ab, status_ring, valid_entries); + skb_queue_head_init(&free_list_head); - if (le32_get_bits(tx_status->info0, HAL_WBM_COMPL_TX_INFO0_CC_DONE)) { + while (budget && (tx_status = (struct hal_wbm_completion_ring_tx *)ath12k_hal_srng_dst_get_next_cache_entry(ab, status_ring))) { + budget--; + if (!ath12k_dp_tx_completion_valid((struct hal_wbm_release_ring *)tx_status)) + continue; + + if (likely(HAL_WBM_COMPL_TX_INFO0_CC_DONE & tx_status->info0)) { /* HW done cookie conversion */ - desc_va = ((u64)le32_to_cpu(tx_status->buf_va_hi) << 32 | - le32_to_cpu(tx_status->buf_va_lo)); + desc_va = ((u64)tx_status->buf_va_hi << 32 | + tx_status->buf_va_lo); tx_desc = (struct ath12k_tx_desc_info *)((unsigned long)desc_va); } else { /* SW does cookie conversion to VA */ - desc_id = le32_get_bits(tx_status->buf_va_hi, + desc_id = u32_get_bits(tx_status->buf_va_hi, BUFFER_ADDR_INFO1_SW_COOKIE); tx_desc = ath12k_dp_get_tx_desc(ab, desc_id); } - if (!tx_desc) { + if (unlikely(!tx_desc)) { ath12k_warn(ab, "unable to retrieve tx_desc!"); continue; } msdu = tx_desc->skb; mac_id = tx_desc->mac_id; + recycler_fast_xmit = tx_desc->recycler_fast_xmit; + skb_ext_desc = tx_desc->skb_ext_desc; + timestamp = tx_desc->timestamp; /* Release descriptor as soon as extracting necessary info * to reduce contention */ - ath12k_dp_tx_release_txbuf(dp, tx_desc, tx_desc->pool_id); - if (ts.buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW) { + list_add_tail(&tx_desc->list, &desc_free_list); + + if (unlikely(!msdu)) { + ab->soc_stats.null_tx_complete[tx_ring->tcl_data_ring_id]++; + + ath12k_err_dump(ab, "Null msdu\n", "Tx compl Desc: ", tx_status, + sizeof(*tx_status), NULL); + + if (ath12k_debug_critical) + BUG_ON(1); + + continue; + } + + prefetch(msdu); + prefetch( (u8 *) msdu + 64); + + /* Find the HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE value */ + buf_rel_source = tx_status->info0 & HAL_WBM_RELEASE_INFO0_REL_SRC_MASK; + ab->soc_stats.tx_wbm_rel_source[buf_rel_source]++; + + rel_status = FIELD_GET(HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON, + tx_status->info0); + ab->soc_stats.tqm_rel_reason[rel_status]++; + + if (unlikely(buf_rel_source == HAL_WBM_REL_SRC_MODULE_FW)) { ath12k_dp_tx_process_htt_tx_complete(ab, (void *)tx_status, mac_id, msdu, - tx_ring); + tx_ring, + skb_ext_desc, + timestamp); continue; } - ar = ab->pdevs[mac_id].ar; - if (atomic_dec_and_test(&ar->dp.num_tx_pending)) - wake_up(&ar->dp.tx_empty_waitq); + ath12k_dp_tx_decrement(ar); + + if (unlikely(WARN_ON_ONCE(buf_rel_source != HAL_WBM_REL_SRC_MODULE_TQM))) { + /* Must not happen */ + continue; + } + + skb_cb = (struct ath12k_skb_cb *)&IEEE80211_SKB_CB(msdu)->driver_data; + flags = skb_cb->flags; + dma_unmap_single_attrs(ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE, + DMA_ATTR_SKIP_CPU_SYNC); + if (unlikely(skb_ext_desc)) { + dma_unmap_single_attrs(ab->dev, skb_cb->paddr_ext_desc, + skb_ext_desc->len, + DMA_TO_DEVICE, DMA_ATTR_SKIP_CPU_SYNC); + dev_kfree_skb_any(skb_ext_desc); + } + /* Free skb here if stats is disabled */ + if (ab->stats_disable && !(flags & ATH12K_SKB_TX_STATUS)) { + ar->ab->soc_stats.tx_completed[tx_ring->tcl_data_ring_id]++; + + if (skb_cb->vif) { + ahvif = (void *)skb_cb->vif->drv_priv; + if (ahvif->links_map & BIT(skb_cb->link_id)) { + if (ahvif->link[skb_cb->link_id]) + ahvif->link[skb_cb->link_id]->link_stats.tx_completed++; + } else { + ath12k_warn(ab, + "invalid linkid 0x%X in tx completion handler for linkmap %lu\n", + skb_cb->link_id, + ahvif->links_map); + } + } + + if (unlikely(msdu->destructor)) { + msdu->wifi_acked_valid = 1; + msdu->wifi_acked = rel_status == HAL_WBM_TQM_REL_REASON_FRAME_ACKED; + } + if (unlikely(skb_has_frag_list(msdu))) { + kfree_skb_list(skb_shinfo(msdu)->frag_list); + skb_shinfo(msdu)->frag_list = NULL; + } + if (likely(recycler_fast_xmit)) { + __skb_queue_head(&free_list_head, msdu); + } else { + dev_kfree_skb(msdu); + } + } else { - ath12k_dp_tx_complete_msdu(ar, msdu, &ts); + ath12k_dp_tx_complete_msdu(ar, msdu, (struct hal_wbm_release_ring *)tx_status, + buf_rel_source, + tx_ring->tcl_data_ring_id, timestamp); } } + spin_lock_bh(&dp->tx_desc_lock[ring_id]); + list_for_each(cur, &desc_free_list) { + tx_desc = list_entry(cur, struct ath12k_tx_desc_info, list); + tx_desc->skb = NULL; + tx_desc->skb_ext_desc = NULL; + tx_desc->in_use = false; + } + list_splice_tail(&desc_free_list, &dp->tx_desc_free_list[ring_id]); + spin_unlock_bh(&dp->tx_desc_lock[ring_id]); + + ath12k_hal_srng_access_dst_ring_end_nolock(status_ring); + return (orig_budget - budget); +} + static int ath12k_dp_tx_get_ring_id_type(struct ath12k_base *ab, int mac_id, u32 ring_id, @@ -623,6 +1704,10 @@ { int ret = 0; + if ((ring_type == HAL_TX_MONITOR_BUF || ring_type == HAL_TX_MONITOR_DST) && + !ab->hw_params->supports_tx_monitor) + return ret; + switch (ring_type) { case HAL_RXDMA_BUF: /* for some targets, host fills rx buffer to fw and fw fills to @@ -650,7 +1735,7 @@ *htt_ring_type = HTT_HW_TO_SW_RING; break; case HAL_RXDMA_MONITOR_BUF: - *htt_ring_id = HTT_RXDMA_MONITOR_BUF_RING; + *htt_ring_id = HTT_RX_MON_HOST2MON_BUF_RING; *htt_ring_type = HTT_SW_TO_HW_RING; break; case HAL_RXDMA_MONITOR_STATUS: @@ -658,13 +1743,9 @@ *htt_ring_type = HTT_SW_TO_HW_RING; break; case HAL_RXDMA_MONITOR_DST: - *htt_ring_id = HTT_RXDMA_MONITOR_DEST_RING; + *htt_ring_id = HTT_RX_MON_MON2HOST_DEST_RING; *htt_ring_type = HTT_HW_TO_SW_RING; break; - case HAL_RXDMA_MONITOR_DESC: - *htt_ring_id = HTT_RXDMA_MONITOR_DESC_RING; - *htt_ring_type = HTT_SW_TO_HW_RING; - break; case HAL_TX_MONITOR_BUF: *htt_ring_id = HTT_TX_MON_HOST2MON_BUF_RING; *htt_ring_type = HTT_SW_TO_HW_RING; @@ -815,7 +1896,16 @@ skb_put(skb, len); cmd = (struct htt_ver_req_cmd *)skb->data; cmd->ver_reg_info = le32_encode_bits(HTT_H2T_MSG_TYPE_VERSION_REQ, - HTT_VER_REQ_INFO_MSG_ID); + HTT_OPTION_TAG); + + if (!ath12k_ftm_mode) { + cmd->tcl_metadata_version = u32_encode_bits(HTT_TAG_TCL_METADATA_VERSION, + HTT_OPTION_TAG); + cmd->tcl_metadata_version |= u32_encode_bits(HTT_TCL_METADATA_VER_SZ, + HTT_OPTION_LEN); + cmd->tcl_metadata_version |= u32_encode_bits(HTT_OPTION_TCL_METADATA_VER_V2, + HTT_OPTION_VALUE); + } ret = ath12k_htc_send(&ab->htc, dp->eid, skb); if (ret) { @@ -860,7 +1950,7 @@ cmd->msg = le32_encode_bits(HTT_H2T_MSG_TYPE_PPDU_STATS_CFG, HTT_PPDU_STATS_CFG_MSG_TYPE); - pdev_mask = 1 << (i + 1); + pdev_mask = DP_SW2HW_MACID(ar->pdev_idx) + i; cmd->msg |= le32_encode_bits(pdev_mask, HTT_PPDU_STATS_CFG_PDEV_ID); cmd->msg |= le32_encode_bits(mask, HTT_PPDU_STATS_CFG_TLV_TYPE_BITMASK); @@ -922,13 +2012,27 @@ HTT_RX_RING_SELECTION_CFG_CMD_INFO0_PS); cmd->info0 |= le32_encode_bits(tlv_filter->offset_valid, HTT_RX_RING_SELECTION_CFG_CMD_OFFSET_VALID); + cmd->info0 |= u32_encode_bits(tlv_filter->drop_threshold_valid, + HTT_RX_RING_SELECTION_CFG_CMD_DROP_THRES_VAL); + if (!tlv_filter->rxmon_disable) + cmd->info0 |= u32_encode_bits(true, + HTT_RX_RING_SELECTION_CFG_CMD_RXMON_GCONF_EN); + cmd->info1 = le32_encode_bits(rx_buf_size, HTT_RX_RING_SELECTION_CFG_CMD_INFO1_BUF_SIZE); + cmd->info1 |= u32_encode_bits(tlv_filter->conf_len_mgmt, + HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_MGMT); + cmd->info1 |= u32_encode_bits(tlv_filter->conf_len_ctrl, + HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_CTRL); + cmd->info1 |= u32_encode_bits(tlv_filter->conf_len_data, + HTT_RX_RING_SELECTION_CFG_CMD_INFO1_CONF_LEN_DATA); cmd->pkt_type_en_flags0 = cpu_to_le32(tlv_filter->pkt_filter_flags0); cmd->pkt_type_en_flags1 = cpu_to_le32(tlv_filter->pkt_filter_flags1); cmd->pkt_type_en_flags2 = cpu_to_le32(tlv_filter->pkt_filter_flags2); cmd->pkt_type_en_flags3 = cpu_to_le32(tlv_filter->pkt_filter_flags3); cmd->rx_filter_tlv = cpu_to_le32(tlv_filter->rx_filter); + cmd->info2 = tlv_filter->info0; + cmd->info3 = tlv_filter->info1; if (tlv_filter->offset_valid) { cmd->rx_packet_offset = @@ -960,6 +2064,25 @@ HTT_RX_RING_SELECTION_CFG_RX_ATTENTION_OFFSET); } + if (tlv_filter->rx_mpdu_start_wmask > 0 && + tlv_filter->rx_msdu_end_wmask > 0) { + cmd->info2 |= + u32_encode_bits(true, + HTT_RX_RING_SELECTION_CFG_WORD_MASK_COMPACTION_ENABLE_SET); + cmd->rx_mpdu_start_word_mask = + u32_encode_bits(tlv_filter->rx_mpdu_start_wmask, + HTT_RX_RING_SELECTION_CFG_RX_MPDU_START_MASK); + /* mpdu_end is not used for any hardwares so far + * please assign it in future if any chip is + * using through hal ops + */ + cmd->rx_mpdu_end_word_mask = + u32_encode_bits(tlv_filter->rx_mpdu_end_wmask, + HTT_RX_RING_SELECTION_CFG_RX_MPDU_END_MASK); + cmd->rx_msdu_end_word_mask = + u32_encode_bits(tlv_filter->rx_msdu_end_wmask, + HTT_RX_RING_SELECTION_CFG_RX_MSDU_END_MASK); + } ret = ath12k_htc_send(&ab->htc, ab->dp.eid, skb); if (ret) goto err_free; @@ -973,6 +2096,49 @@ } int +ath12k_dp_tx_htt_h2t_vdev_stats_ol_req(struct ath12k *ar, u64 reset_bitmask) +{ + struct ath12k_base *ab = ar->ab; + struct htt_h2t_msg_type_vdev_txrx_stats_req *cmd; + struct ath12k_dp *dp = &ab->dp; + struct sk_buff *skb; + int len = sizeof(*cmd), ret; + + skb = ath12k_htc_alloc_skb(ab, len); + if (!skb) + return -ENOMEM; + + skb_put(skb, len); + cmd = (struct htt_h2t_msg_type_vdev_txrx_stats_req *)skb->data; + memset(cmd, 0, sizeof(*cmd)); + cmd->hdr = FIELD_PREP(HTT_H2T_VDEV_TXRX_HDR_MSG_TYPE, + HTT_H2T_MSG_TYPE_VDEV_TXRX_STATS_CFG); + cmd->hdr |= FIELD_PREP(HTT_H2T_VDEV_TXRX_HDR_PDEV_ID, + ar->pdev->pdev_id); + cmd->hdr |= FIELD_PREP(HTT_H2T_VDEV_TXRX_HDR_ENABLE, true); + + /* Periodic interval is calculated as 1 units = 8 ms. + * Ex: 125 -> 1000 ms + */ + cmd->hdr |= FIELD_PREP(HTT_H2T_VDEV_TXRX_HDR_INTERVAL, + (ATH12K_STATS_TIMER_DUR_1SEC >> 3)); + cmd->hdr |= FIELD_PREP(HTT_H2T_VDEV_TXRX_HDR_RESET_STATS, true); + cmd->vdev_id_lo_bitmask = (reset_bitmask & HTT_H2T_VDEV_TXRX_LO_BITMASK); + cmd->vdev_id_hi_bitmask = ((reset_bitmask & + HTT_H2T_VDEV_TXRX_HI_BITMASK) >> 32); + + ret = ath12k_htc_send(&ab->htc, dp->eid, skb); + if (ret) { + ath12k_warn(ab, "failed to send htt type vdev stats offload request: %d", + ret); + dev_kfree_skb_any(skb); + return ret; + } + + return 0; +} + +int ath12k_dp_tx_htt_h2t_ext_stats_req(struct ath12k *ar, u8 type, struct htt_ext_stats_cfg_params *cfg_params, u64 cookie) @@ -1020,13 +2186,15 @@ struct ath12k_base *ab = ar->ab; int ret; + if (ab->hw_params->supports_tx_monitor) { ret = ath12k_dp_tx_htt_tx_monitor_mode_ring_config(ar, reset); if (ret) { ath12k_err(ab, "failed to setup tx monitor filter %d\n", ret); return ret; } + } - ret = ath12k_dp_tx_htt_tx_monitor_mode_ring_config(ar, reset); + ret = ath12k_dp_tx_htt_rx_monitor_mode_ring_config(ar, reset); if (ret) { ath12k_err(ab, "failed to setup rx monitor filter %d\n", ret); return ret; @@ -1038,15 +2206,13 @@ int ath12k_dp_tx_htt_rx_monitor_mode_ring_config(struct ath12k *ar, bool reset) { struct ath12k_base *ab = ar->ab; - struct ath12k_dp *dp = &ab->dp; struct htt_rx_ring_tlv_filter tlv_filter = {0}; - int ret, ring_id; + int ret = 0, ring_id = 0, i; - ring_id = dp->rxdma_mon_buf_ring.refill_buf_ring.ring_id; tlv_filter.offset_valid = false; if (!reset) { - tlv_filter.rx_filter = HTT_RX_MON_FILTER_TLV_FLAGS_MON_BUF_RING; + tlv_filter.rx_filter = HTT_RX_MON_FILTER_TLV_FLAGS_MON_DEST_RING; tlv_filter.pkt_filter_flags0 = HTT_RX_MON_FP_MGMT_FILTER_FLAGS0 | HTT_RX_MON_MO_MGMT_FILTER_FLAGS0; @@ -1061,11 +2227,38 @@ HTT_RX_MON_MO_CTRL_FILTER_FLASG3 | HTT_RX_MON_FP_DATA_FILTER_FLASG3 | HTT_RX_MON_MO_DATA_FILTER_FLASG3; + + tlv_filter.drop_threshold_valid = true; + tlv_filter.info0 = + u32_encode_bits(HTT_RX_RING_TLV_DROP_THRESHOLD_VALUE, + HTT_RX_TLV_FILTER_INFO0_RX_DROP_THRESHOLD); + tlv_filter.info0 |= + u32_encode_bits(true, + HTT_RX_TLV_FILTER_INFO0_EN_MSDU_MPDU_LOG_MGMT_TYPE); + tlv_filter.info0 |= + u32_encode_bits(true, + HTT_RX_TLV_FILTER_INFO0_EN_MSDU_MPDU_LOG_CTRL_TYPE); + tlv_filter.info0 |= + u32_encode_bits(true, + HTT_RX_TLV_FILTER_INFO0_EN_MSDU_MPDU_LOG_DATA_TYPE); + + tlv_filter.conf_len_ctrl = HTT_RX_RING_DEFAULT_DMA_LENGTH; + tlv_filter.conf_len_mgmt = HTT_RX_RING_DEFAULT_DMA_LENGTH; + tlv_filter.conf_len_data = HTT_RX_RING_DEFAULT_DMA_LENGTH; + + tlv_filter.info1 = + FIELD_PREP(HTT_RX_TLV_FILTER_INFO1_EN_RX_TLV_PKT_OFFSET, + true); + tlv_filter.info1 |= + FIELD_PREP(HTT_RX_TLV_FILTER_INFO1_RX_PKT_TLV_OFFSET, + HTT_RX_RING_PKT_TLV_OFFSET); } - if (ab->hw_params->rxdma1_enable) { - ret = ath12k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, 0, - HAL_RXDMA_MONITOR_BUF, + for (i = 0; i < ar->ab->hw_params->num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rxdma_mon_dst_ring[i].ring_id; + + ret = ath12k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, ar->dp.mac_id + i, + HAL_RXDMA_MONITOR_DST, DP_RXDMA_REFILL_RING_SIZE, &tlv_filter); if (ret) { diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/dp_tx.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_tx.h --- linux-6.4/drivers/net/wireless/ath/ath12k/dp_tx.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/dp_tx.h 2024-04-22 13:41:34.453075384 +0200 @@ -15,11 +15,217 @@ int ack_rssi; }; -int ath12k_dp_tx_htt_h2t_ver_req_msg(struct ath12k_base *ab); -int ath12k_dp_tx(struct ath12k *ar, struct ath12k_vif *arvif, - struct sk_buff *skb); -void ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id); +/* htt_tx_msdu_desc_ext + * + * valid_pwr + * if set, tx pwr spec is valid + * + * valid_mcs_mask + * if set, tx MCS mask is valid + * + * valid_nss_mask + * if set, tx Nss mask is valid + * + * valid_preamble_type + * if set, tx preamble spec is valid + * + * valid_retries + * if set, tx retries spec is valid + * + * valid_bw_info + * if set, tx dyn_bw and bw_mask are valid + * + * valid_guard_interval + * if set, tx guard intv spec is valid + * + * valid_chainmask + * if set, tx chainmask is valid + * + * valid_encrypt_type + * if set, encrypt type is valid + * + * valid_key_flags + * if set, key flags is valid + * + * valid_expire_tsf + * if set, tx expire TSF spec is valid + * + * valid_chanfreq + * if set, chanfreq is valid + * + * is_dsrc + * if set, MSDU is a DSRC frame + * + * guard_interval + * 0.4us, 0.8us, 1.6us, 3.2us + * + * encrypt_type + * 0 = NO_ENCRYPT, + * 1 = ENCRYPT, + * 2 ~ 3 - Reserved + * + * retry_limit + * Specify the maximum number of transmissions, including the + * initial transmission, to attempt before giving up if no ack + * is received. + * If the tx rate is specified, then all retries shall use the + * same rate as the initial transmission. + * If no tx rate is specified, the target can choose whether to + * retain the original rate during the retransmissions, or to + * fall back to a more robust rate. + * + * use_dcm_11ax + * If set, Use Dual subcarrier modulation. + * Valid only for 11ax preamble types HE_SU + * and HE_EXT_SU + * + * ltf_subtype_11ax + * Takes enum values of htt_11ax_ltf_subtype_t + * Valid only for 11ax preamble types HE_SU + * and HE_EXT_SU + * + * dyn_bw + * 0 = static bw, 1 = dynamic bw + * + * bw_mask + * Valid only if dyn_bw == 0 (static bw). + * + * host_tx_desc_pool + * If set, Firmware allocates tx_descriptors + * in WAL_BUFFERID_TX_HOST_DATA_EXP,instead + * of WAL_BUFFERID_TX_TCL_DATA_EXP. + * Use cases: + * Any time firmware uses TQM-BYPASS for Data + * TID, firmware expect host to set this bit. + * + * power + * unit of the power field is 0.5 dbm + * signed value ranging from -64dbm to 63.5 dbm + * + * mcs_mask + * mcs bit mask of 0 ~ 11 + * Setting more than one MCS isn't currently + * supported by the target (but is supported + * in the interface in case in the future + * the target supports specifications of + * a limited set of MCS values. + * + * nss_mask + * Nss bit mask 0 ~ 7 + * Setting more than one Nss isn't currently + * supported by the target (but is supported + * in the interface in case in the future + * the target supports specifications of + * a limited set of Nss values. + * + * pream_type + * Preamble types + * + * update_peer_cache + * When set these custom values will be + * used for all packets, until the next + * update via this ext header. + * This is to make sure not all packets + * need to include this header. + * + * chain_mask + * specify which chains to transmit from + * + * key_flags + * Key Index and related flags - used in mesh mode + * + * chanfreq + * Channel frequency: This identifies the desired channel + * frequency (in MHz) for tx frames. This is used by FW to help + * determine when it is safe to transmit or drop frames for + * off-channel operation. + * The default value of zero indicates to FW that the corresponding + * VDEV's home channel (if there is one) is the desired channel + * frequency. + * + * expire_tsf_lo + * tx expiry time (TSF) LSBs + * + * expire_tsf_hi + * tx expiry time (TSF) MSBs + * + * learning_frame + * When this flag is set, this frame will be dropped by FW + * rather than being enqueued to the Transmit Queue Manager (TQM) HW. + * + * send_as_standalone + * This will indicate if the msdu needs to be sent as a singleton PPDU, + * i.e. with no A-MSDU or A-MPDU aggregation. + * The scope is extended to other use-cases. + * + * is_host_opaque_valid + * set this bit to 1 if the host_opaque_cookie is populated + * with valid information. + * + * host_opaque_cookie + * Host opaque cookie for special frames + */ + +struct htt_tx_msdu_desc_ext { + u32 + valid_pwr : 1, + valid_mcs_mask : 1, + valid_nss_mask : 1, + valid_preamble_type : 1, + valid_retries : 1, + valid_bw_info : 1, + valid_guard_interval : 1, + valid_chainmask : 1, + valid_encrypt_type : 1, + valid_key_flags : 1, + valid_expire_tsf : 1, + valid_chanfreq : 1, + is_dsrc : 1, + guard_interval : 2, + encrypt_type : 2, + retry_limit : 4, + use_dcm_11ax : 1, + ltf_subtype_11ax : 2, + dyn_bw : 1, + bw_mask : 6, + host_tx_desc_pool : 1; + u32 + power : 8, + mcs_mask : 12, + nss_mask : 8, + pream_type : 3, + update_peer_cache : 1; + u32 + chain_mask : 8, + key_flags : 8, + chanfreq : 16; + + u32 expire_tsf_lo; + u32 expire_tsf_hi; + u32 + learning_frame : 1, + send_as_standalone : 1, + is_host_opaque_valid : 1, + rsvd0 : 29; + u32 + host_opaque_cookie : 16, + rsvd1 : 16; +} __packed; + +void ath12k_dp_tx_update_txcompl(struct ath12k *ar, struct hal_tx_status *ts); +int ath12k_dp_tx_htt_h2t_ver_req_msg(struct ath12k_base *ab); +int ath12k_dp_tx(struct ath12k *ar, struct ath12k_link_vif *arvif, + struct ath12k_sta *ahsta, struct sk_buff *skb, + bool gsn_valid, int mcbc_gsn); +int ath12k_dp_tx_completion_handler(struct ath12k_base *ab, int ring_id, + int tx_comp_budget); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +int ath12k_ppeds_tx_completion_handler(struct ath12k_base *ab, int ring_id); +struct ath12k_ppeds_tx_desc_info * +ath12k_dp_ppeds_tx_assign_desc_nolock(struct ath12k_dp *dp, + u8 ring_id); +#endif int ath12k_dp_tx_htt_h2t_ppdu_stats_req(struct ath12k *ar, u32 mask); int ath12k_dp_tx_htt_h2t_ext_stats_req(struct ath12k *ar, u8 type, @@ -38,4 +244,6 @@ struct htt_tx_ring_tlv_filter *htt_tlv_filter); int ath12k_dp_tx_htt_tx_monitor_mode_ring_config(struct ath12k *ar, bool reset); int ath12k_dp_tx_htt_monitor_mode_ring_config(struct ath12k *ar, bool reset); +int ath12k_dp_tx_htt_h2t_vdev_stats_ol_req(struct ath12k *ar, u64 reset_bitmask); +int ath12k_dp_tx_direct(struct ath12k_link_vif *arvif, struct sk_buff *skb); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal.c --- linux-6.4/drivers/net/wireless/ath/ath12k/hal.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal.c 2024-04-22 13:40:50.287868747 +0200 @@ -4,11 +4,17 @@ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. */ #include +#include #include "hal_tx.h" #include "hal_rx.h" #include "debug.h" #include "hal_desc.h" #include "hif.h" +#include "dp_rx.h" + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#define RING_HALT_TIMEOUT 10 +#endif static const struct hal_srng_config hw_srng_config_template[] = { /* TODO: max_rings can populated by querying HW capabilities */ @@ -57,6 +63,14 @@ .ring_dir = HAL_SRNG_DIR_DST, .max_size = HAL_REO_STATUS_RING_BASE_MSB_RING_SIZE, }, + [HAL_REO2PPE] = { + .start_ring_id = HAL_SRNG_RING_ID_REO2PPE, + .max_rings = 1, + .entry_size = sizeof(struct hal_reo_dest_ring) >> 2, + .mac_type = ATH12K_HAL_SRNG_UMAC, + .ring_dir = HAL_SRNG_DIR_DST, + .max_size = HAL_REO2PPE_RING_BASE_MSB_RING_SIZE, + }, [HAL_TCL_DATA] = { .start_ring_id = HAL_SRNG_RING_ID_SW2TCL1, .max_rings = 6, @@ -147,7 +161,7 @@ .max_size = HAL_RXDMA_RING_MAX_SIZE_BE, }, [HAL_RXDMA_MONITOR_BUF] = { - .start_ring_id = HAL_SRNG_SW2RXMON_BUF0, + .start_ring_id = HAL_SRNG_SW2RXMON_BUF0, /* HAL_SRNG_RING_ID_WMAC1_SW2RXDMA2_BUF, */ .max_rings = 1, .entry_size = sizeof(struct hal_mon_buf_ring) >> 2, .mac_type = ATH12K_HAL_SRNG_PMAC, @@ -168,20 +182,20 @@ .start_ring_id = HAL_SRNG_RING_ID_PPE2TCL1, .max_rings = 1, .entry_size = sizeof(struct hal_tcl_entrance_from_ppe_ring) >> 2, - .mac_type = ATH12K_HAL_SRNG_PMAC, + .mac_type = ATH12K_HAL_SRNG_UMAC, .ring_dir = HAL_SRNG_DIR_SRC, - .max_size = HAL_SW2TCL1_RING_BASE_MSB_RING_SIZE, + .max_size = HAL_PPE2TCL_RING_BASE_MSB_RING_SIZE, }, [HAL_PPE_RELEASE] = { .start_ring_id = HAL_SRNG_RING_ID_WBM_PPE_RELEASE, .max_rings = 1, .entry_size = sizeof(struct hal_wbm_release_ring) >> 2, - .mac_type = ATH12K_HAL_SRNG_PMAC, + .mac_type = ATH12K_HAL_SRNG_UMAC, .ring_dir = HAL_SRNG_DIR_SRC, .max_size = HAL_WBM2PPE_RELEASE_RING_BASE_MSB_RING_SIZE, }, [HAL_TX_MONITOR_BUF] = { - .start_ring_id = HAL_SRNG_SW2TXMON_BUF0, + .start_ring_id = HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0, .max_rings = 1, .entry_size = sizeof(struct hal_mon_buf_ring) >> 2, .mac_type = ATH12K_HAL_SRNG_PMAC, @@ -394,9 +408,16 @@ RX_MSDU_END_INFO5_TID); } +static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_intra_bss_bit(struct hal_rx_desc *desc) +{ + /* TODO - msdu_end info9 */ + return 0; +} + static u16 ath12k_hw_qcn9274_rx_desc_get_mpdu_peer_id(struct hal_rx_desc *desc) { - return __le16_to_cpu(desc->u.qcn9274.mpdu_start.sw_peer_id); + return le16_get_bits(desc->u.qcn9274.mpdu_start.sw_peer_id, + RX_MPDU_START_SW_PEER_ID_PEER); } static void ath12k_hw_qcn9274_rx_desc_copy_end_tlv(struct hal_rx_desc *fdesc, @@ -447,7 +468,7 @@ return desc->u.qcn9274.mpdu_start.addr2; } -static bool ath12k_hw_qcn9274_rx_desc_is_mcbc(struct hal_rx_desc *desc) +static bool ath12k_hw_qcn9274_rx_desc_is_da_mcbc(struct hal_rx_desc *desc) { return __le32_to_cpu(desc->u.qcn9274.mpdu_start.info6) & RX_MPDU_START_INFO6_MCAST_BCAST; @@ -511,9 +532,91 @@ crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.qcn9274.mpdu_start.pn[1]); } -static u16 ath12k_hw_qcn9274_rx_desc_get_mpdu_frame_ctl(struct hal_rx_desc *desc) +static u8 ath12k_hal_qcn9274_rx_desc_get_ip_valid(struct hal_rx_desc *desc) +{ + bool ipv4, ipv6; + ipv4 = FIELD_GET(RX_MSDU_END_INFO11_IPV4, + __le32_to_cpu(desc->u.qcn9274.msdu_end.info11)); + ipv6 = FIELD_GET(RX_MSDU_END_INFO11_IPV6, + __le32_to_cpu(desc->u.qcn9274.msdu_end.info11)); + return (ipv4 || ipv6); +} + +#define MPDU_START_WMASK 0x7FC +#define MSDU_END_WMASK 0x13441 + +static inline u16 ath12k_hal_rx_mpdu_start_wmask_get(void) +{ + return MPDU_START_WMASK; +} + +static inline u32 ath12k_hal_rx_msdu_end_wmask_get(void) +{ + return MSDU_END_WMASK; +} + +static u8 ath12k_hw_qcn9274_rx_desc_get_msdu_src_link(struct hal_rx_desc *desc) +{ + return le64_get_bits(desc->u.qcn9274.msdu_end.msdu_end_tag, + RX_MSDU_END_64_TLV_SRC_LINK_ID); +} + +#define PMM_REG_OFFSET 4 + +static void ath12k_hal_get_tsf_reg(u8 mac_id, enum hal_scratch_reg_enum *tsf_enum_low, + enum hal_scratch_reg_enum *tsf_enum_hi) +{ + if (!mac_id) { + *tsf_enum_low = PMM_MAC0_TSF2_OFFSET_LO_US; + *tsf_enum_hi = PMM_MAC0_TSF2_OFFSET_HI_US; + } else if (mac_id == 1) { + *tsf_enum_low = PMM_MAC1_TSF2_OFFSET_LO_US; + *tsf_enum_hi = PMM_MAC1_TSF2_OFFSET_HI_US; + } +} + +static void ath12k_hal_qcn9274_get_tsf2_scratch_reg(struct ath12k_base *ab, + u8 mac_id, u64 *value) +{ + enum hal_scratch_reg_enum enum_lo, enum_hi; + u32 offset_lo, offset_hi; + + ath12k_hal_get_tsf_reg(mac_id, &enum_lo, &enum_hi); + + if (ab->hif.ops->pmm_read32) { + offset_lo = ath12k_hif_pmm_read32(ab, ATH12K_PPT_ADDR_OFFSET(enum_lo)); + offset_hi = ath12k_hif_pmm_read32(ab, ATH12K_PPT_ADDR_OFFSET(enum_hi)); + } else if (ab->hw_rev == ATH12K_HW_QCN6432_HW10) { + offset_lo = ath12k_hif_cmem_read32(ab, PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(enum_lo)); + offset_hi = ath12k_hif_cmem_read32(ab, PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(enum_hi)); + } else { + offset_lo = ath12k_hif_read32(ab, PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(enum_lo)); + offset_hi = ath12k_hif_read32(ab, PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(enum_hi)); + } + + *value = ((u64)(offset_hi) << 32 | offset_lo); +} + +static void ath12k_hal_qcn9274_get_tqm_scratch_reg(struct ath12k_base *ab, u64 *value) { - return __le16_to_cpu(desc->u.qcn9274.mpdu_start.frame_ctrl); + u32 offset_lo, offset_hi; + + if (ab->hif.ops->pmm_read32) { + offset_lo = ath12k_hif_pmm_read32(ab, ATH12K_PPT_ADDR_OFFSET(PMM_TQM_CLOCK_OFFSET_LO_US)); + offset_hi = ath12k_hif_pmm_read32(ab, ATH12K_PPT_ADDR_OFFSET(PMM_TQM_CLOCK_OFFSET_HI_US)); + } else if (ab->hw_rev == ATH12K_HW_QCN6432_HW10) { + offset_lo = ath12k_hif_cmem_read32(ab, + PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(PMM_TQM_CLOCK_OFFSET_LO_US)); + offset_hi = ath12k_hif_cmem_read32(ab, + PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(PMM_TQM_CLOCK_OFFSET_HI_US)); + } else { + offset_lo = ath12k_hif_read32(ab, + PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(PMM_TQM_CLOCK_OFFSET_LO_US)); + offset_hi = ath12k_hif_read32(ab, + PMM_REG_BASE_QCN9224 + ATH12K_PPT_ADDR_OFFSET(PMM_TQM_CLOCK_OFFSET_HI_US)); + } + + *value = ((u64)(offset_hi) << 32 | offset_lo); } static int ath12k_hal_srng_create_config_qcn9274(struct ath12k_base *ab) @@ -551,10 +654,16 @@ s->reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_RING_BASE_LSB(ab); s->reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO_STATUS_HP; + s = &hal->srng_config[HAL_REO2PPE]; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO2PPE_RING_BASE_LSB(ab); + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_REO_REG + HAL_REO2PPE_HP; + s->reg_size[0] = HAL_REO2_RING_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab); + s->reg_size[1] = HAL_REO2_RING_HP - HAL_REO1_RING_HP; + s = &hal->srng_config[HAL_TCL_DATA]; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB(ab); s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_HP; - s->reg_size[0] = HAL_TCL2_RING_BASE_LSB - HAL_TCL1_RING_BASE_LSB; + s->reg_size[0] = HAL_TCL2_RING_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab); s->reg_size[1] = HAL_TCL2_RING_HP - HAL_TCL1_RING_HP; s = &hal->srng_config[HAL_TCL_CMD]; @@ -566,29 +675,29 @@ s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_STATUS_RING_HP; s = &hal->srng_config[HAL_CE_SRC]; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_BASE_LSB; - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_HP; - s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - - HAL_SEQ_WCSS_UMAC_CE0_SRC_REG; - s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - - HAL_SEQ_WCSS_UMAC_CE0_SRC_REG; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB; + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP; + s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab); + s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab); s = &hal->srng_config[HAL_CE_DST]; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_BASE_LSB; - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_HP; - s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; - s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB; + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP; + s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); + s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); s = &hal->srng_config[HAL_CE_DST_STATUS]; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_BASE_LSB; - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_STATUS_RING_HP; - s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; - s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP; + s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); + s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); s = &hal->srng_config[HAL_WBM_IDLE_LINK]; s->reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab); @@ -615,14 +724,9 @@ * RXDMA_RX_MONITOR_BUF, TX_MONITOR_BUF, TX_MONITOR_DST, SW2RXDMA */ s = &hal->srng_config[HAL_PPE2TCL]; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_PPE2TCL1_RING_BASE_LSB; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_PPE2TCL1_RING_BASE_LSB(ab); s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL_PPE2TCL1_RING_HP; - s = &hal->srng_config[HAL_PPE_RELEASE]; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + - HAL_WBM_PPE_RELEASE_RING_BASE_LSB(ab); - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_PPE_RELEASE_RING_HP; - return 0; } @@ -680,6 +784,59 @@ return errmap; } +static void ath12k_hw_qcn9274_get_rx_first_last_msdu(struct hal_rx_desc *desc, + struct ath12k_dp_rx_info *rx_info) +{ + rx_info->is_first_msdu = !!le16_get_bits(desc->u.qcn9274.msdu_end.info5, + RX_MSDU_END_INFO5_FIRST_MSDU); + rx_info->is_last_msdu = !!le16_get_bits(desc->u.qcn9274.msdu_end.info5, + RX_MSDU_END_INFO5_LAST_MSDU); +} + +static void ath12k_hw_qcn9274_get_rx_msdulen_l3pad(struct hal_rx_desc *desc, + struct ath12k_dp_rx_info *rx_info) +{ + + rx_info->msdu_done = !!le32_get_bits(desc->u.qcn9274.msdu_end.info14, + RX_MSDU_END_INFO14_MSDU_DONE); + rx_info->msdu_len = le32_get_bits(desc->u.qcn9274.msdu_end.info10, + RX_MSDU_END_INFO10_MSDU_LENGTH); + rx_info->l3_pad_bytes = le16_get_bits(desc->u.qcn9274.msdu_end.info5, + RX_MSDU_END_INFO5_L3_HDR_PADDING); +} + +static void ath12k_hw_qcn9274_get_rx_desc_info(struct hal_rx_desc *desc, + struct ath12k_dp_rx_info *rx_info) +{ + __le32 info12 = desc->u.qcn9274.msdu_end.info12; + __le32 info13 = desc->u.qcn9274.msdu_end.info13; + __le32 info11 = desc->u.qcn9274.msdu_end.info11; + + rx_info->pkt_type = le32_get_bits(info12, RX_MSDU_END_INFO12_PKT_TYPE); + rx_info->sgi = le32_get_bits(info12, RX_MSDU_END_INFO12_SGI); + rx_info->rate_mcs = le32_get_bits(info12, RX_MSDU_END_INFO12_RATE_MCS); + rx_info->bw = le32_get_bits(info12, RX_MSDU_END_INFO12_RECV_BW); + rx_info->nss = hweight8(le32_get_bits(info12, RX_MSDU_END_INFO12_MIMO_SS_BITMAP)); + rx_info->phy_meta_data = __le32_to_cpu(desc->u.qcn9274.msdu_end.phy_meta_data); + + rx_info->ip_csum_fail = !!le32_get_bits(info13, RX_MSDU_END_INFO13_IP_CKSUM_FAIL); + rx_info->l4_csum_fail = !!le32_get_bits(info13, RX_MSDU_END_INFO13_TCP_UDP_CKSUM_FAIL); + rx_info->ip_is_valid = (le32_get_bits(__le32_to_cpu(info11), RX_MSDU_END_INFO11_IPV4) || + le32_get_bits(__le32_to_cpu(info11), RX_MSDU_END_INFO11_IPV6)); + + rx_info->decap_type = le32_get_bits(info11, RX_MSDU_END_INFO11_DECAP_FORMAT); + + rx_info->is_mcbc = ((!!le16_get_bits(desc->u.qcn9274.msdu_end.info5, + RX_MSDU_END_INFO5_FIRST_MSDU)) && + (__le32_to_cpu(desc->u.qcn9274.mpdu_start.info6) & + RX_MPDU_START_INFO6_MCAST_BCAST)); + + rx_info->peer_id = le16_get_bits(desc->u.qcn9274.mpdu_start.sw_peer_id, + RX_MPDU_START_SW_PEER_ID_PEER); + rx_info->tid = le16_get_bits(desc->u.qcn9274.msdu_end.info5, + RX_MSDU_END_INFO5_TID); +} + const struct hal_ops hal_qcn9274_ops = { .rx_desc_get_first_msdu = ath12k_hw_qcn9274_rx_desc_get_first_msdu, .rx_desc_get_last_msdu = ath12k_hw_qcn9274_rx_desc_get_last_msdu, @@ -706,12 +863,12 @@ .rx_desc_get_msdu_payload = ath12k_hw_qcn9274_rx_desc_get_msdu_payload, .rx_desc_get_mpdu_start_offset = ath12k_hw_qcn9274_rx_desc_get_mpdu_start_offset, .rx_desc_get_msdu_end_offset = ath12k_hw_qcn9274_rx_desc_get_msdu_end_offset, + .rx_desc_get_msdu_intra_bss_bit = ath12k_hw_qcn9274_rx_desc_get_msdu_intra_bss_bit, .rx_desc_mac_addr2_valid = ath12k_hw_qcn9274_rx_desc_mac_addr2_valid, .rx_desc_mpdu_start_addr2 = ath12k_hw_qcn9274_rx_desc_mpdu_start_addr2, - .rx_desc_is_mcbc = ath12k_hw_qcn9274_rx_desc_is_mcbc, + .rx_desc_is_da_mcbc = ath12k_hw_qcn9274_rx_desc_is_da_mcbc, .rx_desc_get_dot11_hdr = ath12k_hw_qcn9274_rx_desc_get_dot11_hdr, .rx_desc_get_crypto_header = ath12k_hw_qcn9274_rx_desc_get_crypto_hdr, - .rx_desc_get_mpdu_frame_ctl = ath12k_hw_qcn9274_rx_desc_get_mpdu_frame_ctl, .create_srng_config = ath12k_hal_srng_create_config_qcn9274, .tcl_to_wbm_rbm_map = ath12k_hal_qcn9274_tcl_to_wbm_rbm_map, .dp_rx_h_msdu_done = ath12k_hw_qcn9274_dp_rx_h_msdu_done, @@ -719,6 +876,65 @@ .dp_rx_h_ip_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_ip_cksum_fail, .dp_rx_h_is_decrypted = ath12k_hw_qcn9274_dp_rx_h_is_decrypted, .dp_rx_h_mpdu_err = ath12k_hw_qcn9274_dp_rx_h_mpdu_err, + .rx_desc_get_ip_valid = ath12k_hal_qcn9274_rx_desc_get_ip_valid, + .rxdma_ring_wmask_rx_mpdu_start = ath12k_hal_rx_mpdu_start_wmask_get, + .rxdma_ring_wmask_rx_msdu_end = ath12k_hal_rx_msdu_end_wmask_get, + .rx_desc_get_msdu_src_link_id = ath12k_hw_qcn9274_rx_desc_get_msdu_src_link, + .rx_get_desc_info = ath12k_hw_qcn9274_get_rx_desc_info, + .rx_get_desc_msdulen_l3pad = ath12k_hw_qcn9274_get_rx_msdulen_l3pad, + .rx_desc_get_first_last_msdu = ath12k_hw_qcn9274_get_rx_first_last_msdu, + .hal_get_tsf2_scratch_reg = ath12k_hal_qcn9274_get_tsf2_scratch_reg, + .hal_get_tqm_scratch_reg = ath12k_hal_qcn9274_get_tqm_scratch_reg, +}; + +const struct hal_ops hal_qcn6432_ops = { + .rx_desc_get_first_msdu = ath12k_hw_qcn9274_rx_desc_get_first_msdu, + .rx_desc_get_last_msdu = ath12k_hw_qcn9274_rx_desc_get_last_msdu, + .rx_desc_get_l3_pad_bytes = ath12k_hw_qcn9274_rx_desc_get_l3_pad_bytes, + .rx_desc_encrypt_valid = ath12k_hw_qcn9274_rx_desc_encrypt_valid, + .rx_desc_get_encrypt_type = ath12k_hw_qcn9274_rx_desc_get_encrypt_type, + .rx_desc_get_decap_type = ath12k_hw_qcn9274_rx_desc_get_decap_type, + .rx_desc_get_mesh_ctl = ath12k_hw_qcn9274_rx_desc_get_mesh_ctl, + .rx_desc_get_mpdu_seq_ctl_vld = ath12k_hw_qcn9274_rx_desc_get_mpdu_seq_ctl_vld, + .rx_desc_get_mpdu_fc_valid = ath12k_hw_qcn9274_rx_desc_get_mpdu_fc_valid, + .rx_desc_get_mpdu_start_seq_no = ath12k_hw_qcn9274_rx_desc_get_mpdu_start_seq_no, + .rx_desc_get_msdu_len = ath12k_hw_qcn9274_rx_desc_get_msdu_len, + .rx_desc_get_msdu_sgi = ath12k_hw_qcn9274_rx_desc_get_msdu_sgi, + .rx_desc_get_msdu_rate_mcs = ath12k_hw_qcn9274_rx_desc_get_msdu_rate_mcs, + .rx_desc_get_msdu_rx_bw = ath12k_hw_qcn9274_rx_desc_get_msdu_rx_bw, + .rx_desc_get_msdu_freq = ath12k_hw_qcn9274_rx_desc_get_msdu_freq, + .rx_desc_get_msdu_pkt_type = ath12k_hw_qcn9274_rx_desc_get_msdu_pkt_type, + .rx_desc_get_msdu_nss = ath12k_hw_qcn9274_rx_desc_get_msdu_nss, + .rx_desc_get_mpdu_tid = ath12k_hw_qcn9274_rx_desc_get_mpdu_tid, + .rx_desc_get_mpdu_peer_id = ath12k_hw_qcn9274_rx_desc_get_mpdu_peer_id, + .rx_desc_copy_end_tlv = ath12k_hw_qcn9274_rx_desc_copy_end_tlv, + .rx_desc_get_mpdu_ppdu_id = ath12k_hw_qcn9274_rx_desc_get_mpdu_ppdu_id, + .rx_desc_set_msdu_len = ath12k_hw_qcn9274_rx_desc_set_msdu_len, + .rx_desc_get_msdu_payload = ath12k_hw_qcn9274_rx_desc_get_msdu_payload, + .rx_desc_get_mpdu_start_offset = ath12k_hw_qcn9274_rx_desc_get_mpdu_start_offset, + .rx_desc_get_msdu_end_offset = ath12k_hw_qcn9274_rx_desc_get_msdu_end_offset, + .rx_desc_get_msdu_intra_bss_bit = ath12k_hw_qcn9274_rx_desc_get_msdu_intra_bss_bit, + .rx_desc_mac_addr2_valid = ath12k_hw_qcn9274_rx_desc_mac_addr2_valid, + .rx_desc_mpdu_start_addr2 = ath12k_hw_qcn9274_rx_desc_mpdu_start_addr2, + .rx_desc_is_da_mcbc = ath12k_hw_qcn9274_rx_desc_is_da_mcbc, + .rx_desc_get_dot11_hdr = ath12k_hw_qcn9274_rx_desc_get_dot11_hdr, + .rx_desc_get_crypto_header = ath12k_hw_qcn9274_rx_desc_get_crypto_hdr, + .create_srng_config = ath12k_hal_srng_create_config_qcn9274, + .tcl_to_wbm_rbm_map = ath12k_hal_qcn9274_tcl_to_wbm_rbm_map, + .dp_rx_h_msdu_done = ath12k_hw_qcn9274_dp_rx_h_msdu_done, + .dp_rx_h_l4_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_l4_cksum_fail, + .dp_rx_h_ip_cksum_fail = ath12k_hw_qcn9274_dp_rx_h_ip_cksum_fail, + .dp_rx_h_is_decrypted = ath12k_hw_qcn9274_dp_rx_h_is_decrypted, + .dp_rx_h_mpdu_err = ath12k_hw_qcn9274_dp_rx_h_mpdu_err, + .rx_desc_get_ip_valid = ath12k_hal_qcn9274_rx_desc_get_ip_valid, + .rxdma_ring_wmask_rx_mpdu_start = ath12k_hal_rx_mpdu_start_wmask_get, + .rxdma_ring_wmask_rx_msdu_end = ath12k_hal_rx_msdu_end_wmask_get, + .rx_desc_get_msdu_src_link_id = ath12k_hw_qcn9274_rx_desc_get_msdu_src_link, + .rx_get_desc_info = ath12k_hw_qcn9274_get_rx_desc_info, + .rx_get_desc_msdulen_l3pad = ath12k_hw_qcn9274_get_rx_msdulen_l3pad, + .rx_desc_get_first_last_msdu = ath12k_hw_qcn9274_get_rx_first_last_msdu, + .hal_get_tsf2_scratch_reg = ath12k_hal_qcn9274_get_tsf2_scratch_reg, + .hal_get_tqm_scratch_reg = ath12k_hal_qcn9274_get_tqm_scratch_reg, }; static bool ath12k_hw_wcn7850_rx_desc_get_first_msdu(struct hal_rx_desc *desc) @@ -887,10 +1103,10 @@ return desc->u.wcn7850.mpdu_start.addr2; } -static bool ath12k_hw_wcn7850_rx_desc_is_mcbc(struct hal_rx_desc *desc) +static bool ath12k_hw_wcn7850_rx_desc_is_da_mcbc(struct hal_rx_desc *desc) { - return __le32_to_cpu(desc->u.wcn7850.mpdu_start.info6) & - RX_MPDU_START_INFO6_MCAST_BCAST; + return __le16_to_cpu(desc->u.wcn7850.msdu_end.info5) & + RX_MSDU_END_INFO5_DA_IS_MCBC; } static void ath12k_hw_wcn7850_rx_desc_get_dot11_hdr(struct hal_rx_desc *desc, @@ -951,11 +1167,6 @@ crypto_hdr[7] = HAL_RX_MPDU_INFO_PN_GET_BYTE2(desc->u.wcn7850.mpdu_start.pn[1]); } -static u16 ath12k_hw_wcn7850_rx_desc_get_mpdu_frame_ctl(struct hal_rx_desc *desc) -{ - return __le16_to_cpu(desc->u.wcn7850.mpdu_start.frame_ctrl); -} - static int ath12k_hal_srng_create_config_wcn7850(struct ath12k_base *ab) { struct ath12k_hal *hal = &ab->hal; @@ -992,9 +1203,9 @@ s = &hal->srng_config[HAL_TCL_DATA]; s->max_rings = 5; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_BASE_LSB(ab); s->reg_start[1] = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_HP; - s->reg_size[0] = HAL_TCL2_RING_BASE_LSB - HAL_TCL1_RING_BASE_LSB; + s->reg_size[0] = HAL_TCL2_RING_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab); s->reg_size[1] = HAL_TCL2_RING_HP - HAL_TCL1_RING_HP; s = &hal->srng_config[HAL_TCL_CMD]; @@ -1007,31 +1218,31 @@ s = &hal->srng_config[HAL_CE_SRC]; s->max_rings = 12; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_BASE_LSB; - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG + HAL_CE_DST_RING_HP; - s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - - HAL_SEQ_WCSS_UMAC_CE0_SRC_REG; - s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG - - HAL_SEQ_WCSS_UMAC_CE0_SRC_REG; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_BASE_LSB; + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) + HAL_CE_DST_RING_HP; + s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab); + s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab); s = &hal->srng_config[HAL_CE_DST]; s->max_rings = 12; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_BASE_LSB; - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_RING_HP; - s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; - s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_BASE_LSB; + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_RING_HP; + s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); + s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); s = &hal->srng_config[HAL_CE_DST_STATUS]; s->max_rings = 12; - s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + + s->reg_start[0] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_BASE_LSB; - s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG + HAL_CE_DST_STATUS_RING_HP; - s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; - s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG - - HAL_SEQ_WCSS_UMAC_CE0_DST_REG; + s->reg_start[1] = HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) + HAL_CE_DST_STATUS_RING_HP; + s->reg_size[0] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); + s->reg_size[1] = HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) - + HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab); s = &hal->srng_config[HAL_WBM_IDLE_LINK]; s->reg_start[0] = HAL_SEQ_WCSS_UMAC_WBM_REG + HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab); @@ -1163,10 +1374,9 @@ .rx_desc_get_msdu_end_offset = ath12k_hw_wcn7850_rx_desc_get_msdu_end_offset, .rx_desc_mac_addr2_valid = ath12k_hw_wcn7850_rx_desc_mac_addr2_valid, .rx_desc_mpdu_start_addr2 = ath12k_hw_wcn7850_rx_desc_mpdu_start_addr2, - .rx_desc_is_mcbc = ath12k_hw_wcn7850_rx_desc_is_mcbc, + .rx_desc_is_da_mcbc = ath12k_hw_wcn7850_rx_desc_is_da_mcbc, .rx_desc_get_dot11_hdr = ath12k_hw_wcn7850_rx_desc_get_dot11_hdr, .rx_desc_get_crypto_header = ath12k_hw_wcn7850_rx_desc_get_crypto_hdr, - .rx_desc_get_mpdu_frame_ctl = ath12k_hw_wcn7850_rx_desc_get_mpdu_frame_ctl, .create_srng_config = ath12k_hal_srng_create_config_wcn7850, .tcl_to_wbm_rbm_map = ath12k_hal_wcn7850_tcl_to_wbm_rbm_map, .dp_rx_h_msdu_done = ath12k_hw_wcn7850_dp_rx_h_msdu_done, @@ -1251,7 +1461,8 @@ } static void ath12k_hal_srng_dst_hw_init(struct ath12k_base *ab, - struct hal_srng *srng) + struct hal_srng *srng, + u32 idx) { struct ath12k_hal *hal = &ab->hal; u32 val; @@ -1260,6 +1471,12 @@ reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R0]; + val = ath12k_hif_read32(ab, reg_base + HAL_REO1_RING_MISC_OFFSET) & + ~HAL_REO1_RING_MISC_SRNG_ENABLE; + + ath12k_hif_write32(ab, reg_base + HAL_REO1_RING_MISC_OFFSET, val); + val = 0; + if (srng->flags & HAL_SRNG_FLAGS_MSI_INTR) { ath12k_hif_write32(ab, reg_base + ath12k_hal_reo1_ring_msi1_base_lsb_offset(ab), @@ -1309,9 +1526,10 @@ /* Initialize head and tail pointers to indicate ring is empty */ reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R2]; - ath12k_hif_write32(ab, reg_base, 0); - ath12k_hif_write32(ab, reg_base + HAL_REO1_RING_TP_OFFSET, 0); - *srng->u.dst_ring.hp_addr = 0; + ath12k_hif_write32(ab, reg_base, idx * srng->entry_size); + ath12k_hif_write32(ab, reg_base + HAL_REO1_RING_TP_OFFSET, idx * srng->entry_size); + *srng->u.dst_ring.hp_addr = idx * srng->entry_size; + srng->u.dst_ring.tp = idx * srng->entry_size; reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R0]; val = 0; @@ -1327,7 +1545,8 @@ } static void ath12k_hal_srng_src_hw_init(struct ath12k_base *ab, - struct hal_srng *srng) + struct hal_srng *srng, + u32 idx) { struct ath12k_hal *hal = &ab->hal; u32 val; @@ -1336,6 +1555,12 @@ reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R0]; + val = ath12k_hif_read32(ab, reg_base + HAL_TCL1_RING_MISC_OFFSET(ab)) & + ~HAL_TCL1_RING_MISC_SRNG_ENABLE; + + ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_MISC_OFFSET(ab), val); + val = 0; + if (srng->flags & HAL_SRNG_FLAGS_MSI_INTR) { ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET(ab), @@ -1397,9 +1622,10 @@ /* Initialize head and tail pointers to indicate ring is empty */ reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R2]; - ath12k_hif_write32(ab, reg_base, 0); - ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_TP_OFFSET, 0); - *srng->u.src_ring.tp_addr = 0; + ath12k_hif_write32(ab, reg_base, idx * srng->entry_size); + ath12k_hif_write32(ab, reg_base + HAL_TCL1_RING_TP_OFFSET, idx * srng->entry_size); + *srng->u.src_ring.tp_addr = idx * srng->entry_size; + srng->u.src_ring.hp = idx * srng->entry_size; reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R0]; val = 0; @@ -1422,12 +1648,13 @@ } static void ath12k_hal_srng_hw_init(struct ath12k_base *ab, - struct hal_srng *srng) + struct hal_srng *srng, + u32 idx) { if (srng->ring_dir == HAL_SRNG_DIR_SRC) - ath12k_hal_srng_src_hw_init(ab, srng); + ath12k_hal_srng_src_hw_init(ab, srng, idx); else - ath12k_hal_srng_dst_hw_init(ab, srng); + ath12k_hal_srng_dst_hw_init(ab, srng, idx); } static int ath12k_hal_srng_get_ring_id(struct ath12k_base *ab, @@ -1572,14 +1799,14 @@ } void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie, - dma_addr_t paddr) + dma_addr_t paddr, u8 rbm_id) { desc->buf_addr_info.info0 = le32_encode_bits((paddr & HAL_ADDR_LSB_REG_MASK), BUFFER_ADDR_INFO0_ADDR); desc->buf_addr_info.info1 = le32_encode_bits(((u64)paddr >> HAL_ADDR_MSB_REG_SHIFT), BUFFER_ADDR_INFO1_ADDR) | - le32_encode_bits(1, BUFFER_ADDR_INFO1_RET_BUF_MGR) | + u32_encode_bits(rbm_id, BUFFER_ADDR_INFO1_RET_BUF_MGR) | le32_encode_bits(cookie, BUFFER_ADDR_INFO1_SW_COOKIE); } @@ -1593,6 +1820,21 @@ return NULL; } +void ath12k_hal_srng_prefetch_desc(struct ath12k_base *ab, + struct hal_srng *srng) +{ + u32 *desc; + + /* prefetch only if desc is available */ + desc = ath12k_hal_srng_dst_peek(ab, srng); + if (likely(desc)) { + dma_sync_single_for_cpu(ab->dev, virt_to_phys(desc), + (srng->entry_size * sizeof(u32)), + DMA_FROM_DEVICE); + prefetch(desc); + } +} + void *ath12k_hal_srng_dst_get_next_entry(struct ath12k_base *ab, struct hal_srng *srng) { @@ -1605,12 +1847,108 @@ desc = srng->ring_base_vaddr + srng->u.dst_ring.tp; - srng->u.dst_ring.tp = (srng->u.dst_ring.tp + srng->entry_size) % - srng->ring_size; + srng->u.dst_ring.tp = (srng->u.dst_ring.tp + srng->entry_size); + + /* wrap around to start of ring*/ + if (srng->u.dst_ring.tp == srng->ring_size) + srng->u.dst_ring.tp = 0; + + /* Try to prefetch the next descriptor in the ring */ + if (srng->flags & HAL_SRNG_FLAGS_CACHED) + ath12k_hal_srng_prefetch_desc(ab, srng); return desc; } +u32 *ath12k_hal_srng_dst_get_next_cache_entry(struct ath12k_base *ab, + struct hal_srng *srng) +{ + u32 *desc,*desc_next; + lockdep_assert_held(&srng->lock); + + if (srng->u.dst_ring.tp == srng->u.dst_ring.cached_hp) + return NULL; + + desc = srng->ring_base_vaddr + srng->u.dst_ring.tp; + + srng->u.dst_ring.tp = (srng->u.dst_ring.tp + srng->entry_size); + + /* wrap around to start of ring*/ + if (srng->u.dst_ring.tp == srng->ring_size) + srng->u.dst_ring.tp = 0; + + /* Try to prefetch the next descriptor in the ring */ + if (srng->u.dst_ring.tp != srng->u.dst_ring.cached_hp) { + /* prefetch only if desc is available */ + desc_next = srng->ring_base_vaddr + srng->u.dst_ring.tp; + prefetch(desc_next); + } + return desc; +} + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +void ath12k_hal_srng_ppeds_dst_inv_entry(struct ath12k_base *ab, + struct hal_srng *srng, int entries) +{ + u32 *desc, *last_desc; + u32 tp, hp; + u32 remaining_entries; + + if (!(srng->flags & HAL_SRNG_FLAGS_CACHED) || !entries) + return; + + tp = srng->u.dst_ring.tp; + hp = srng->u.dst_ring.cached_hp; + + desc = srng->ring_base_vaddr + tp; + if (hp > tp) { + last_desc = ((void *)desc + entries * srng->entry_size * sizeof(u32)); + dmac_inv_range_no_dsb((void *)desc, + (void *)last_desc); + } else { + remaining_entries = srng->ring_size - tp; + last_desc = ((void *)desc + remaining_entries * sizeof(u32)); + dmac_inv_range_no_dsb((void *)desc, (void *)last_desc); + + last_desc = ((void *)srng->ring_base_vaddr + hp * sizeof(u32)); + dmac_inv_range_no_dsb((void *)srng->ring_base_vaddr, (void *)last_desc); + } + + dsb(st); +} +#endif + +void ath12k_hal_srng_dst_invalidate_entry(struct ath12k_base *ab, + struct hal_srng *srng, int entries) +{ + u32 *desc; + u32 tp, hp; + + + if (!(srng->flags & HAL_SRNG_FLAGS_CACHED) || !entries) + return; + + tp = srng->u.dst_ring.tp; + hp = srng->u.dst_ring.cached_hp; + + desc = srng->ring_base_vaddr + tp; + if (hp > tp) { + dma_sync_single_for_cpu(ab->dev, virt_to_phys(desc), + entries * srng->entry_size * sizeof(u32), + DMA_FROM_DEVICE); + } else { + entries = srng->ring_size - tp; + dma_sync_single_for_cpu(ab->dev, virt_to_phys(desc), + entries * sizeof(u32), + DMA_FROM_DEVICE); + + entries = hp; + dma_sync_single_for_cpu(ab->dev, virt_to_phys(srng->ring_base_vaddr), + entries * sizeof(u32), + DMA_FROM_DEVICE); + } +} + int ath12k_hal_srng_dst_num_free(struct ath12k_base *ab, struct hal_srng *srng, bool sync_hw_ptr) { @@ -1730,11 +2068,15 @@ { lockdep_assert_held(&srng->lock); - if (srng->ring_dir == HAL_SRNG_DIR_SRC) + if (srng->ring_dir == HAL_SRNG_DIR_SRC) { srng->u.src_ring.cached_tp = *(volatile u32 *)srng->u.src_ring.tp_addr; - else + } else { srng->u.dst_ring.cached_hp = *srng->u.dst_ring.hp_addr; + /* Try to prefetch the next descriptor in the ring */ + if (srng->flags & HAL_SRNG_FLAGS_CACHED) + ath12k_hal_srng_prefetch_desc(ab, srng); + } } /* Update cached ring head/tail pointers to HW. ath12k_hal_srng_access_begin() @@ -1883,9 +2225,65 @@ val); } -int ath12k_hal_srng_setup(struct ath12k_base *ab, enum hal_ring_type type, +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +static void hal_tx_ppe2tcl_ring_halt_set(struct ath12k_base *ab) +{ + u32 cmn_reg_addr; + u32 regval; + + cmn_reg_addr = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_CMN_CTRL_REG; + regval = ath12k_hif_read32(ab, cmn_reg_addr); + + regval |= (1 << HWIO_TCL_R0_CONS_RING_CMN_CTRL_REG_PPE2TCL1_RNG_HALT_SHFT); + + /* Enable ring halt for the ppe2tcl ring */ + ath12k_hif_write32(ab, cmn_reg_addr, regval); +} + +static void hal_tx_ppe2tcl_ring_halt_reset(struct ath12k_base *ab) +{ + u32 cmn_reg_addr; + u32 regval; + + cmn_reg_addr = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_CMN_CTRL_REG; + regval = ath12k_hif_read32(ab, cmn_reg_addr); + + regval &= ~(1 << HWIO_TCL_R0_CONS_RING_CMN_CTRL_REG_PPE2TCL1_RNG_HALT_SHFT); + + /* Disable ring halt for the ppe2tcl ring */ + ath12k_hif_write32(ab, cmn_reg_addr, regval); +} + +static bool hal_tx_ppe2tcl_ring_halt_done(struct ath12k_base *ab) +{ + u32 cmn_reg_addr; + u32 regval; + + cmn_reg_addr = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_CMN_CTRL_REG; + + regval = ath12k_hif_read32(ab, cmn_reg_addr); + + regval &= (1 << HWIO_TCL_R0_CONS_RING_CMN_CTRL_REG_PPE2TCL1_RNG_HALT_STAT_SHFT); + + return !!regval; +} + +static bool hal_tx_ppe2tcl_ring_halt_get(struct ath12k_base *ab) +{ + u32 cmn_reg_addr; + u32 regval; + + cmn_reg_addr = HAL_SEQ_WCSS_UMAC_TCL_REG + HAL_TCL1_RING_CMN_CTRL_REG; + regval = ath12k_hif_read32(ab, cmn_reg_addr); + + return (regval & + 1 << HWIO_TCL_R0_CONS_RING_CMN_CTRL_REG_PPE2TCL1_RNG_HALT_SHFT); +} +#endif + +int ath12k_hal_srng_setup_idx(struct ath12k_base *ab, enum hal_ring_type type, int ring_num, int mac_id, - struct hal_srng_params *params) + struct hal_srng_params *params, u32 res_idx) { struct ath12k_hal *hal = &ab->hal; struct hal_srng_config *srng_config = &ab->hal.srng_config[type]; @@ -1894,6 +2292,9 @@ u32 idx; int i; u32 reg_base; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + u32 retry_count = 0; +#endif ring_id = ath12k_hal_srng_get_ring_id(ab, type, ring_num, mac_id); if (ring_id < 0) @@ -1928,6 +2329,12 @@ memset(srng->ring_base_vaddr, 0, (srng->entry_size * srng->num_entries) << 2); + if (srng->flags & HAL_SRNG_FLAGS_CACHED) { + dmac_inv_range_no_dsb(srng->ring_base_vaddr, + srng->ring_base_vaddr + + ((srng->entry_size * srng->num_entries))); + } + reg_base = srng->hwreg_base[HAL_SRNG_REG_GRP_R2]; if (srng->ring_dir == HAL_SRNG_DIR_SRC) { @@ -1937,21 +2344,42 @@ srng->u.src_ring.tp_addr = (void *)(hal->rdp.vaddr + ring_id); srng->u.src_ring.low_threshold = params->low_threshold * srng->entry_size; + + if (srng->u.src_ring.tp_addr) + *srng->u.src_ring.tp_addr = 0; + if (srng_config->mac_type == ATH12K_HAL_SRNG_UMAC) { - if (!ab->hw_params->supports_shadow_regs) + if (!ab->hw_params->supports_shadow_regs) { srng->u.src_ring.hp_addr = (u32 *)((unsigned long)ab->mem + reg_base); - else + if (type == HAL_TCL_DATA) { + if (ab->hif.bus == ATH12K_BUS_PCI || + ab->hif.bus == ATH12K_BUS_HYBRID){ + srng->u.src_ring.hp_addr_direct = + (u32 *)((unsigned long)ab->mem + + HAL_DP_REG_WINDOW_OFFSET + + (reg_base & WINDOW_RANGE_MASK)); + } else { + srng->u.src_ring.hp_addr_direct = + srng->u.src_ring.hp_addr; + } + } + } else { ath12k_dbg(ab, ATH12K_DBG_HAL, "hal type %d ring_num %d reg_base 0x%x shadow 0x%lx\n", type, ring_num, reg_base, (unsigned long)srng->u.src_ring.hp_addr - (unsigned long)ab->mem); + } } else { idx = ring_id - HAL_SRNG_RING_ID_DMAC_CMN_ID_START; srng->u.src_ring.hp_addr = (void *)(hal->wrp.vaddr + idx); + + if (srng->u.src_ring.hp_addr) + *srng->u.src_ring.hp_addr = 0; + srng->flags |= HAL_SRNG_FLAGS_LMAC_RING; } } else { @@ -1967,18 +2395,36 @@ srng->u.dst_ring.tp = 0; srng->u.dst_ring.cached_hp = 0; srng->u.dst_ring.hp_addr = (void *)(hal->rdp.vaddr + ring_id); + + if (srng->u.dst_ring.hp_addr) + *srng->u.dst_ring.hp_addr = 0; + if (srng_config->mac_type == ATH12K_HAL_SRNG_UMAC) { - if (!ab->hw_params->supports_shadow_regs) + if (!ab->hw_params->supports_shadow_regs) { srng->u.dst_ring.tp_addr = (u32 *)((unsigned long)ab->mem + reg_base + (HAL_REO1_RING_TP - HAL_REO1_RING_HP)); - else + if (type == HAL_WBM2SW_RELEASE) { + if (ab->hif.bus == ATH12K_BUS_PCI || + ab->hif.bus == ATH12K_BUS_HYBRID) { + srng->u.dst_ring.tp_addr_direct = + (u32 *)((unsigned long)ab->mem + + (reg_base & WINDOW_RANGE_MASK) + + HAL_DP_REG_WINDOW_OFFSET + + (HAL_REO1_RING_TP - HAL_REO1_RING_HP)); + } else { + srng->u.dst_ring.tp_addr_direct = + srng->u.dst_ring.tp_addr; + } + } + } else { ath12k_dbg(ab, ATH12K_DBG_HAL, "type %d ring_num %d target_reg 0x%x shadow 0x%lx\n", type, ring_num, reg_base + HAL_REO1_RING_TP - HAL_REO1_RING_HP, (unsigned long)srng->u.dst_ring.tp_addr - (unsigned long)ab->mem); + } } else { /* For PMAC & DMAC rings, tail pointer updates will be done * through FW by writing to a shared memory location @@ -1986,6 +2432,10 @@ idx = ring_id - HAL_SRNG_RING_ID_DMAC_CMN_ID_START; srng->u.dst_ring.tp_addr = (void *)(hal->wrp.vaddr + idx); + + if (srng->u.dst_ring.tp_addr) + *srng->u.dst_ring.tp_addr = 0; + srng->flags |= HAL_SRNG_FLAGS_LMAC_RING; } } @@ -1993,8 +2443,41 @@ if (srng_config->mac_type != ATH12K_HAL_SRNG_UMAC) return ring_id; - ath12k_hal_srng_hw_init(ab, srng); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + if (res_idx) { + /* During UMAC reset Tx ring halt is set + * by Wi-Fi FW during pre-reset stage. + * Hence skip halting the rings again + */ + if (ath12k_dp_umac_reset_in_progress(ab)) { + if (!(hal_tx_ppe2tcl_ring_halt_get(ab))) { + ath12k_warn(ab, "TX ring halt not set\n"); + WARN_ON(1); + } + ath12k_hal_srng_hw_init(ab, srng, res_idx); + } else { + hal_tx_ppe2tcl_ring_halt_set(ab); + do { + ath12k_warn(ab, "Waiting for ring reset, retried count: %d\n", + retry_count); + mdelay(RING_HALT_TIMEOUT); + retry_count++; + } while (!(hal_tx_ppe2tcl_ring_halt_done(ab)) && + (retry_count < RNG_HALT_STAT_RETRY_COUNT)); + + if (retry_count >= RNG_HALT_STAT_RETRY_COUNT) + ath12k_err(ab, "Ring halt is failed, retried count: %d\n", + retry_count); + ath12k_hal_srng_hw_init(ab, srng, res_idx); + hal_tx_ppe2tcl_ring_halt_reset(ab); + } + } + else + ath12k_hal_srng_hw_init(ab, srng, 0); +#else + ath12k_hal_srng_hw_init(ab, srng, 0); +#endif if (type == HAL_CE_DST) { srng->u.dst_ring.max_buffer_length = params->max_buffer_len; ath12k_hal_ce_dst_setup(ab, srng, ring_num); @@ -2088,6 +2571,15 @@ } } +void ath12k_hal_reo_config_reo2ppe_dest_info(struct ath12k_base *ab) +{ + u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; + u32 val = HAL_REO1_REO2PPE_DST_VAL; + + ath12k_hif_write32(ab, reo_base + HAL_REO1_REO2PPE_DST_INFO, + val); +} + void ath12k_hal_srng_get_shadow_config(struct ath12k_base *ab, u32 **cfg, u32 *len) { @@ -2183,13 +2675,16 @@ if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) continue; - ath12k_err(ab, "CE_id %d pipe_num %d %ums before\n", + ath12k_err(ab,"CE_id %d pipe_num %d %ums before ce_manual_poll_count %d " + "ce_last_manual_tasklet_schedule_ts %ums before\n", i, ce_pipe->pipe_num, - jiffies_to_msecs(jiffies - ce_pipe->timestamp)); + jiffies_to_msecs(jiffies - ce_pipe->timestamp), + ce_pipe->ce_manual_poll_count, + jiffies_to_msecs(jiffies - ce_pipe->last_ce_manual_poll_ts)); } ath12k_err(ab, "\nLast interrupt received for each group:\n"); - for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { + for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX(ab); i++) { irq_grp = &ab->ext_irq_grp[i]; ath12k_err(ab, "group_id %d %ums before\n", irq_grp->grp_id, @@ -2220,3 +2715,67 @@ jiffies_to_msecs(jiffies - srng->timestamp)); } } + +ssize_t ath12k_debugfs_hal_dump_srng_stats(struct ath12k_base *ab, char *buf, int size) +{ + struct hal_srng *srng; + struct ath12k_ext_irq_grp *irq_grp; + struct ath12k_ce_pipe *ce_pipe; + unsigned int len = 0; + int i; + + len += scnprintf(buf + len, size - len, "Last interrupt received for each CE:\n"); + for (i = 0; i < ab->hw_params->ce_count; i++) { + ce_pipe = &ab->ce.ce_pipe[i]; + + if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) + continue; + + spin_lock_bh(&ab->ce.ce_lock); + len += scnprintf(buf + len, size - len, + "CE_id %d pipe_num %d %ums before ce_manual_poll_count %d ce_last_manual_tasklet_schedule_ts %ums before\n", + i, ce_pipe->pipe_num, + jiffies_to_msecs(jiffies - ce_pipe->timestamp), + ce_pipe->ce_manual_poll_count, + jiffies_to_msecs(jiffies - ce_pipe->last_ce_manual_poll_ts)); + spin_unlock_bh(&ab->ce.ce_lock); + } + + len += scnprintf(buf + len, size - len, "\nLast interrupt received for each group:\n"); + for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX(ab); i++) { + irq_grp = &ab->ext_irq_grp[i]; + len += scnprintf(buf + len, size - len, "group_id %d %ums before\n", + irq_grp->grp_id, + jiffies_to_msecs(jiffies - irq_grp->timestamp)); + } + + for (i = 0; i < HAL_SRNG_RING_ID_MAX; i++) { + srng = &ab->hal.srng_list[i]; + + spin_lock_bh(&srng->lock); + if (!srng->initialized) { + spin_unlock_bh(&srng->lock); + continue; + } + + if (srng->ring_dir == HAL_SRNG_DIR_SRC) + len += scnprintf(buf + len, size - len, + "src srng id %u hp %u, reap_hp %u, cur tp %u, cached tp %u last tp %u napi processed before %ums\n", + srng->ring_id, srng->u.src_ring.hp, + srng->u.src_ring.reap_hp, + *srng->u.src_ring.tp_addr, srng->u.src_ring.cached_tp, + srng->u.src_ring.last_tp, + jiffies_to_msecs(jiffies - srng->timestamp)); + else if (srng->ring_dir == HAL_SRNG_DIR_DST) + len += scnprintf(buf + len, size - len, + "dst srng id %u tp %u, cur hp %u, cached hp %u last hp %u napi processed before %ums\n", + srng->ring_id, srng->u.dst_ring.tp, + *srng->u.dst_ring.hp_addr, + srng->u.dst_ring.cached_hp, + srng->u.dst_ring.last_hp, + jiffies_to_msecs(jiffies - srng->timestamp)); + spin_unlock_bh(&srng->lock); + } + + return len; +} diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal.h --- linux-6.4/drivers/net/wireless/ath/ath12k/hal.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal.h 2024-04-22 13:40:50.287868747 +0200 @@ -9,8 +9,11 @@ #include "hal_desc.h" #include "rx_desc.h" +#include "core.h" struct ath12k_base; +struct ath12k_dp_rx_info; +#define HAL_CE_REMAP_REG_BASE (ab->ce_remap_base_addr) #define HAL_LINK_DESC_SIZE (32 << 2) #define HAL_LINK_DESC_ALIGN 128 @@ -40,25 +43,42 @@ #define HAL_SHADOW_REG(x) (HAL_SHADOW_BASE_ADDR + (4 * (x))) +#define HAL_REO_QDESC_MAX_PEERID 8191 + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +#define HWIO_TCL_R0_CONS_RING_CMN_CTRL_REG_PPE2TCL1_RNG_HALT_SHFT 10 +#define HWIO_TCL_R0_CONS_RING_CMN_CTRL_REG_PPE2TCL1_RNG_HALT_STAT_SHFT 18 +#define RNG_HALT_STAT_RETRY_COUNT 10 +#endif + /* WCSS Relative address */ #define HAL_SEQ_WCSS_UMAC_OFFSET 0x00a00000 #define HAL_SEQ_WCSS_UMAC_REO_REG 0x00a38000 #define HAL_SEQ_WCSS_UMAC_TCL_REG 0x00a44000 -#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG 0x01b80000 -#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG 0x01b81000 -#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG 0x01b82000 -#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG 0x01b83000 + +#define HAL_SEQ_WCSS_UMAC_CE0_SRC_REG(ab) \ + ((ab)->hw_params->regs->hal_umac_ce0_src_reg_base) +#define HAL_SEQ_WCSS_UMAC_CE0_DST_REG(ab) \ + ((ab)->hw_params->regs->hal_umac_ce0_dest_reg_base) +#define HAL_SEQ_WCSS_UMAC_CE1_SRC_REG(ab) \ + ((ab)->hw_params->regs->hal_umac_ce1_src_reg_base) +#define HAL_SEQ_WCSS_UMAC_CE1_DST_REG(ab) \ + ((ab)->hw_params->regs->hal_umac_ce1_dest_reg_base) + #define HAL_SEQ_WCSS_UMAC_WBM_REG 0x00a34000 #define HAL_CE_WFSS_CE_REG_BASE 0x01b80000 +#define HAL_DP_REG_WINDOW_OFFSET 0x180000 #define HAL_TCL_SW_CONFIG_BANK_ADDR 0x00a4408c /* SW2TCL(x) R0 ring configuration address */ #define HAL_TCL1_RING_CMN_CTRL_REG 0x00000020 #define HAL_TCL1_RING_DSCP_TID_MAP 0x00000240 -#define HAL_TCL1_RING_BASE_LSB 0x00000900 -#define HAL_TCL1_RING_BASE_MSB 0x00000904 +#define HAL_TCL1_RING_BASE_LSB(ab) \ + ((ab)->hw_params->regs->hal_tcl1_ring_base_lsb) +#define HAL_TCL1_RING_BASE_MSB(ab) \ + ((ab)->hw_params->regs->hal_tcl1_ring_base_msb) #define HAL_TCL1_RING_ID(ab) ((ab)->hw_params->regs->hal_tcl1_ring_id) #define HAL_TCL1_RING_MISC(ab) \ ((ab)->hw_params->regs->hal_tcl1_ring_misc) @@ -76,30 +96,31 @@ ((ab)->hw_params->regs->hal_tcl1_ring_msi1_base_msb) #define HAL_TCL1_RING_MSI1_DATA(ab) \ ((ab)->hw_params->regs->hal_tcl1_ring_msi1_data) -#define HAL_TCL2_RING_BASE_LSB 0x00000978 +#define HAL_TCL2_RING_BASE_LSB(ab) \ + ((ab)->hw_params->regs->hal_tcl2_ring_base_lsb) #define HAL_TCL_RING_BASE_LSB(ab) \ ((ab)->hw_params->regs->hal_tcl_ring_base_lsb) #define HAL_TCL1_RING_MSI1_BASE_LSB_OFFSET(ab) \ - (HAL_TCL1_RING_MSI1_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_MSI1_BASE_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_MSI1_BASE_MSB_OFFSET(ab) \ - (HAL_TCL1_RING_MSI1_BASE_MSB(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_MSI1_BASE_MSB(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_MSI1_DATA_OFFSET(ab) \ - (HAL_TCL1_RING_MSI1_DATA(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_MSI1_DATA(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_BASE_MSB_OFFSET \ - (HAL_TCL1_RING_BASE_MSB - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_BASE_MSB(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_ID_OFFSET(ab) \ - (HAL_TCL1_RING_ID(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_ID(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_CONSR_INT_SETUP_IX0_OFFSET(ab) \ - (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX0(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX0(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_CONSR_INT_SETUP_IX1_OFFSET(ab) \ - (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX1(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_CONSUMER_INT_SETUP_IX1(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_TP_ADDR_LSB_OFFSET(ab) \ - (HAL_TCL1_RING_TP_ADDR_LSB(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_TP_ADDR_LSB(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_TP_ADDR_MSB_OFFSET(ab) \ - (HAL_TCL1_RING_TP_ADDR_MSB(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_TP_ADDR_MSB(ab) - HAL_TCL1_RING_BASE_LSB(ab)) #define HAL_TCL1_RING_MISC_OFFSET(ab) \ - (HAL_TCL1_RING_MISC(ab) - HAL_TCL1_RING_BASE_LSB) + (HAL_TCL1_RING_MISC(ab) - HAL_TCL1_RING_BASE_LSB(ab)) /* SW2TCL(x) R2 ring pointers (head/tail) address */ #define HAL_TCL1_RING_HP 0x00002000 @@ -110,20 +131,22 @@ #define HAL_TCL1_RING_TP_OFFSET \ (HAL_TCL1_RING_TP - HAL_TCL1_RING_HP) +#define HAL_TCL_RBM_MAPPING0_ADDR_OFFSET 0x00000088 +#define HAL_TCL_RBM_MAPPING_SHFT 4 +#define HAL_TCL_RBM_MAPPING_BMSK 0xF +#define HAL_TCL_RBM_MAPPING_PPE2TCL_OFFSET 7 +#define HAL_TCL_RBM_MAPPING_TCL_CMD_CREDIT_OFFSET 6 + /* TCL STATUS ring address */ #define HAL_TCL_STATUS_RING_BASE_LSB(ab) \ ((ab)->hw_params->regs->hal_tcl_status_ring_base_lsb) #define HAL_TCL_STATUS_RING_HP 0x00002048 /* PPE2TCL1 Ring address */ -#define HAL_TCL_PPE2TCL1_RING_BASE_LSB 0x00000c48 +#define HAL_TCL_PPE2TCL1_RING_BASE_LSB(ab) \ + ((ab)->hw_params->regs->hal_tcl_ppe2tcl_ring_base_lsb) #define HAL_TCL_PPE2TCL1_RING_HP 0x00002038 -/* WBM PPE Release Ring address */ -#define HAL_WBM_PPE_RELEASE_RING_BASE_LSB(ab) \ - ((ab)->hw_params->regs->hal_ppe_rel_ring_base) -#define HAL_WBM_PPE_RELEASE_RING_HP 0x00003020 - /* REO2SW(x) R0 ring configuration address */ #define HAL_REO1_GEN_ENABLE 0x00000000 #define HAL_REO1_MISC_CTRL_ADDR(ab) \ @@ -132,6 +155,8 @@ #define HAL_REO1_DEST_RING_CTRL_IX_1 0x00000008 #define HAL_REO1_DEST_RING_CTRL_IX_2 0x0000000c #define HAL_REO1_DEST_RING_CTRL_IX_3 0x00000010 +#define HAL_REO1_QDESC_ADDR_READ(ab) (ab)->hw_params->regs->hal_reo1_qdesc_addr_read +#define HAL_REO1_QDESC_MAX_PEERID(ab) (ab)->hw_params->regs->hal_reo1_qdesc_max_peerid #define HAL_REO1_SW_COOKIE_CFG0(ab) ((ab)->hw_params->regs->hal_reo1_sw_cookie_cfg0) #define HAL_REO1_SW_COOKIE_CFG1(ab) ((ab)->hw_params->regs->hal_reo1_sw_cookie_cfg1) #define HAL_REO1_QDESC_LUT_BASE0(ab) ((ab)->hw_params->regs->hal_reo1_qdesc_lut_base0) @@ -155,6 +180,28 @@ #define HAL_REO1_AGING_THRESH_IX_2(ab) ((ab)->hw_params->regs->hal_reo1_aging_thres_ix2) #define HAL_REO1_AGING_THRESH_IX_3(ab) ((ab)->hw_params->regs->hal_reo1_aging_thres_ix3) +#define HAL_REO1_REO2PPE_DST_VAL 0x2000 +#define HAL_REO1_REO2PPE_DST_INFO 0x00000cf0 + +#define HAL_REO1_RING_MSI1_BASE_LSB_OFFSET \ + (HAL_REO1_RING_MSI1_BASE_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_MSI1_BASE_MSB_OFFSET \ + (HAL_REO1_RING_MSI1_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_MSI1_DATA_OFFSET \ + (HAL_REO1_RING_MSI1_DATA(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_BASE_MSB_OFFSET \ + (HAL_REO1_RING_BASE_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_ID_OFFSET(ab) (HAL_REO1_RING_ID(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_PRODUCER_INT_SETUP_OFFSET \ + (HAL_REO1_RING_PRODUCER_INT_SETUP(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_HP_ADDR_LSB_OFFSET \ + (HAL_REO1_RING_HP_ADDR_LSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_HP_ADDR_MSB_OFFSET \ + (HAL_REO1_RING_HP_ADDR_MSB(ab) - HAL_REO1_RING_BASE_LSB(ab)) +#define HAL_REO1_RING_MISC_OFFSET \ + (HAL_REO1_RING_MISC(ab) - HAL_REO1_RING_BASE_LSB(ab)) + +/* REO2SW(x) R2 ring pointers (head/tail) address */ /* REO2SW(x) R2 ring pointers (head/tail) address */ #define HAL_REO1_RING_HP 0x00003048 #define HAL_REO1_RING_TP 0x0000304c @@ -201,6 +248,12 @@ ((ab)->hw_params->regs->hal_reo_status_ring_base) #define HAL_REO_STATUS_HP 0x000030a8 + +/* REO2PPE address */ +#define HAL_REO2PPE_RING_BASE_LSB(ab) \ + ((ab)->hw_params->regs->hal_reo2ppe_ring_base) +#define HAL_REO2PPE_HP 0x00003090 + /* WBM Idle R0 address */ #define HAL_WBM_IDLE_LINK_RING_BASE_LSB(ab) \ ((ab)->hw_params->regs->hal_wbm_idle_ring_base_lsb) @@ -268,6 +321,7 @@ #define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN BIT(3) #define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN BIT(4) #define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN BIT(5) +#define HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW6_EN BIT(7) #define HAL_WBM_SW_COOKIE_CONV_CFG_GLOBAL_EN BIT(8) /* TCL ring field mask and offset */ @@ -319,6 +373,8 @@ #define HAL_REO1_SW_COOKIE_CFG_ALIGN BIT(18) #define HAL_REO1_SW_COOKIE_CFG_ENABLE BIT(19) #define HAL_REO1_SW_COOKIE_CFG_GLOBAL_ENABLE BIT(20) +#define HAL_REO_QDESC_ADDR_READ_LUT_ENABLE BIT(7) +#define HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY BIT(6) /* CE ring bit field mask and shift */ #define HAL_CE_DST_R0_DEST_CTRL_MAX_LEN GENMASK(15, 0) @@ -347,6 +403,8 @@ #define HAL_REO_SW2REO_RING_BASE_MSB_RING_SIZE 0x0000ffff #define HAL_REO_CMD_RING_BASE_MSB_RING_SIZE 0x0000ffff #define HAL_REO_STATUS_RING_BASE_MSB_RING_SIZE 0x0000ffff +#define HAL_REO2PPE_RING_BASE_MSB_RING_SIZE 0xffffffff +#define HAL_PPE2TCL_RING_BASE_MSB_RING_SIZE 0x000fffff #define HAL_SW2TCL1_RING_BASE_MSB_RING_SIZE 0x000fffff #define HAL_SW2TCL1_CMD_RING_BASE_MSB_RING_SIZE 0x000fffff #define HAL_TCL_STATUS_RING_BASE_MSB_RING_SIZE 0x0000ffff @@ -358,13 +416,32 @@ #define HAL_WBM2SW_RELEASE_RING_BASE_MSB_RING_SIZE 0x000fffff #define HAL_RXDMA_RING_MAX_SIZE 0x0000ffff #define HAL_RXDMA_RING_MAX_SIZE_BE 0x000fffff -#define HAL_WBM2PPE_RELEASE_RING_BASE_MSB_RING_SIZE 0x000fffff +#define HAL_WBM2PPE_RELEASE_RING_BASE_MSB_RING_SIZE 0x0000ffff #define HAL_WBM2SW_REL_ERR_RING_NUM 3 +#define HAL_WBM2SW_PPEDS_TX_CMPLN_MAP_ID 11 +#define HAL_WBM2SW_PPEDS_TX_CMPLN_RING_NUM 6 /* Add any other errors here and return them in * ath12k_hal_rx_desc_get_err(). */ +#define HAL_IPQ5332_CE_WFSS_REG_BASE 0x740000 +#define HAL_IPQ5332_CE_SIZE 0x200000 + +#define HAL_IPQ5332_CMEM_REG_BASE 0xC100000 +#define HAL_IPQ5332_CMEM_SIZE 0x40000 +#define HAL_IPQ5332_CMEM_BASE 0x100000 + +#define HAL_IPQ5332_PMM_REG_BASE 0xCB500FC +#define HAL_IPQ5332_PMM_SIZE 0x100 + +#define HAL_QCN6432_CE_WFSS_REG_BASE 0x1B80000 +#define HAL_QCN6432_CE_SIZE 0x200000 + +#define HAL_QCN6432_CMEM_REG_BASE 0x00100000 +#define HAL_QCN6432_CMEM_SIZE 0x40000 +#define HAL_QCN6432_CMEM_BASE 0x100000 + enum hal_srng_ring_id { HAL_SRNG_RING_ID_REO2SW0 = 0, HAL_SRNG_RING_ID_REO2SW1, @@ -485,8 +562,8 @@ HAL_SRNG_RING_ID_WMAC1_RXMON2SW0 = HAL_SRNG_RING_ID_WMAC1_RXDMA2SW1, HAL_SRNG_RING_ID_WMAC1_SW2RXDMA1_DESC, HAL_SRNG_RING_ID_RXDMA_DIR_BUF, - HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0, HAL_SRNG_RING_ID_WMAC1_TXMON2SW0_BUF0, + HAL_SRNG_RING_ID_WMAC1_SW2TXMON_BUF0, HAL_SRNG_RING_ID_PMAC1_ID_END, }; @@ -512,6 +589,7 @@ HAL_REO_REINJECT, HAL_REO_CMD, HAL_REO_STATUS, + HAL_REO2PPE, HAL_TCL_DATA, HAL_TCL_CMD, HAL_TCL_STATUS, @@ -523,18 +601,41 @@ HAL_WBM2SW_RELEASE, HAL_RXDMA_BUF, HAL_RXDMA_DST, - HAL_RXDMA_MONITOR_BUF, - HAL_RXDMA_MONITOR_STATUS, - HAL_RXDMA_MONITOR_DST, HAL_RXDMA_MONITOR_DESC, + HAL_RXDMA_MONITOR_STATUS, HAL_RXDMA_DIR_BUF, HAL_PPE2TCL, HAL_PPE_RELEASE, + HAL_RXDMA_MONITOR_BUF, HAL_TX_MONITOR_BUF, + HAL_RXDMA_MONITOR_DST, HAL_TX_MONITOR_DST, HAL_MAX_RING_TYPES, }; +#define PMM_REG_BASE_QCN9224 0xB500FC + +enum hal_scratch_reg_enum { + PMM_QTIMER_GLOBAL_OFFSET_LO_US, + PMM_QTIMER_GLOBAL_OFFSET_HI_US, + PMM_MAC0_TSF1_OFFSET_LO_US, + PMM_MAC0_TSF1_OFFSET_HI_US, + PMM_MAC0_TSF2_OFFSET_LO_US, + PMM_MAC0_TSF2_OFFSET_HI_US, + PMM_MAC1_TSF1_OFFSET_LO_US, + PMM_MAC1_TSF1_OFFSET_HI_US, + PMM_MAC1_TSF2_OFFSET_LO_US, + PMM_MAC1_TSF2_OFFSET_HI_US, + PMM_MLO_OFFSET_LO_US, + PMM_MLO_OFFSET_HI_US, + PMM_TQM_CLOCK_OFFSET_LO_US, + PMM_TQM_CLOCK_OFFSET_HI_US, + PMM_Q6_CRASH_REASON, + PMM_SCRATCH_TWT_OFFSET, + PMM_PMM_REG_MAX +}; + +#define WINDOW_RANGE_MASK GENMASK(18, 0) #define HAL_RX_MAX_BA_WINDOW 256 #define HAL_DEFAULT_BE_BK_VI_REO_TIMEOUT_USEC (100 * 1000) @@ -613,6 +714,7 @@ #define HAL_SRNG_FLAGS_MSI_INTR 0x00020000 #define HAL_SRNG_FLAGS_HIGH_THRESH_INTR_EN 0x00080000 #define HAL_SRNG_FLAGS_LMAC_RING 0x80000000 +#define HAL_SRNG_FLAGS_CACHED 0x20000000 #define HAL_SRNG_TLV_HDR_TAG GENMASK(9, 1) #define HAL_SRNG_TLV_HDR_LEN GENMASK(25, 10) @@ -699,6 +801,7 @@ * accessed through SW structure */ u32 *tp_addr; + u32 *tp_addr_direct; /* Current SW loop cnt */ u32 loop_cnt; @@ -728,6 +831,7 @@ * through SW structure */ u32 *hp_addr; + u32 *hp_addr_direct; /* Low threshold - in number of ring entries */ u32 low_threshold; @@ -739,13 +843,16 @@ }; /* Interrupt mitigation - Batch threshold in terms of number of frames */ -#define HAL_SRNG_INT_BATCH_THRESHOLD_TX 256 -#define HAL_SRNG_INT_BATCH_THRESHOLD_RX 128 +#define HAL_SRNG_INT_BATCH_THRESHOLD_PPE_WBM2SW_REL 256 +#define HAL_SRNG_INT_BATCH_THRESHOLD_TX 64 +#define HAL_SRNG_INT_BATCH_THRESHOLD_RX 64 +#define HAL_SRNG_INT_BATCH_THRESHOLD_PPE2TCL 0 #define HAL_SRNG_INT_BATCH_THRESHOLD_OTHER 1 /* Interrupt mitigation - timer threshold in us */ -#define HAL_SRNG_INT_TIMER_THRESHOLD_TX 1000 -#define HAL_SRNG_INT_TIMER_THRESHOLD_RX 500 +#define HAL_SRNG_INT_TIMER_THRESHOLD_TX 200 +#define HAL_SRNG_INT_TIMER_THRESHOLD_RX 200 +#define HAL_SRNG_INT_TIMER_THRESHOLD_PPE2TCL 30 #define HAL_SRNG_INT_TIMER_THRESHOLD_OTHER 256 enum hal_srng_mac_type { @@ -812,6 +919,7 @@ #define HAL_REO_CMD_FLG_FLUSH_ALL BIT(6) #define HAL_REO_CMD_FLG_UNBLK_RESOURCE BIT(7) #define HAL_REO_CMD_FLG_UNBLK_CACHE BIT(8) +#define HAL_REO_CMD_FLG_FLUSH_QUEUE_1K_DESC BIT(9) /* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* fields */ #define HAL_REO_CMD_UPD0_RX_QUEUE_NUM BIT(8) @@ -1061,12 +1169,12 @@ u8 *(*rx_desc_get_msdu_payload)(struct hal_rx_desc *desc); u32 (*rx_desc_get_mpdu_start_offset)(void); u32 (*rx_desc_get_msdu_end_offset)(void); + u8 (*rx_desc_get_msdu_intra_bss_bit)(struct hal_rx_desc *desc); bool (*rx_desc_mac_addr2_valid)(struct hal_rx_desc *desc); u8* (*rx_desc_mpdu_start_addr2)(struct hal_rx_desc *desc); - bool (*rx_desc_is_mcbc)(struct hal_rx_desc *desc); + bool (*rx_desc_is_da_mcbc)(struct hal_rx_desc *desc); void (*rx_desc_get_dot11_hdr)(struct hal_rx_desc *desc, struct ieee80211_hdr *hdr); - u16 (*rx_desc_get_mpdu_frame_ctl)(struct hal_rx_desc *desc); void (*rx_desc_get_crypto_header)(struct hal_rx_desc *desc, u8 *crypto_hdr, enum hal_encrypt_type enctype); @@ -1076,11 +1184,25 @@ bool (*dp_rx_h_ip_cksum_fail)(struct hal_rx_desc *desc); bool (*dp_rx_h_is_decrypted)(struct hal_rx_desc *desc); u32 (*dp_rx_h_mpdu_err)(struct hal_rx_desc *desc); + u8 (*rx_desc_get_ip_valid)(struct hal_rx_desc *desc); const struct ath12k_hal_tcl_to_wbm_rbm_map *tcl_to_wbm_rbm_map; + u16 (*rxdma_ring_wmask_rx_mpdu_start)(void); + u32 (*rxdma_ring_wmask_rx_msdu_end)(void); + u8 (*rx_desc_get_msdu_src_link_id)(struct hal_rx_desc *desc); + void (*rx_get_desc_info)(struct hal_rx_desc *desc, + struct ath12k_dp_rx_info *info); + void (*rx_get_desc_msdulen_l3pad)(struct hal_rx_desc *desc, + struct ath12k_dp_rx_info *info); + void (*rx_desc_get_first_last_msdu)(struct hal_rx_desc *desc, + struct ath12k_dp_rx_info *info); + void (*hal_get_tsf2_scratch_reg)(struct ath12k_base *ab, u8 mac_id, + u64 *value); + void (*hal_get_tqm_scratch_reg)(struct ath12k_base *ab, u64 *value); }; extern const struct hal_ops hal_qcn9274_ops; extern const struct hal_ops hal_wcn7850_ops; +extern const struct hal_ops hal_qcn6432_ops; u32 ath12k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid); void ath12k_hal_reo_qdesc_setup(struct hal_rx_reo_queue *qdesc, @@ -1098,8 +1220,8 @@ struct hal_srng *srng); dma_addr_t ath12k_hal_srng_get_hp_addr(struct ath12k_base *ab, struct hal_srng *srng); -void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, u32 cookie, - dma_addr_t paddr); +void ath12k_hal_set_link_desc_addr(struct hal_wbm_link_desc *desc, + u32 cookie, dma_addr_t paddr, u8 rbm_id); u32 ath12k_hal_ce_get_desc_size(enum hal_ce_desc type); void ath12k_hal_ce_src_set_desc(struct hal_ce_srng_src_desc *desc, dma_addr_t paddr, u32 len, u32 id, u8 byte_swap_data); @@ -1125,9 +1247,9 @@ void ath12k_hal_srng_access_begin(struct ath12k_base *ab, struct hal_srng *srng); void ath12k_hal_srng_access_end(struct ath12k_base *ab, struct hal_srng *srng); -int ath12k_hal_srng_setup(struct ath12k_base *ab, enum hal_ring_type type, +int ath12k_hal_srng_setup_idx(struct ath12k_base *ab, enum hal_ring_type type, int ring_num, int mac_id, - struct hal_srng_params *params); + struct hal_srng_params *params, u32 idx); int ath12k_hal_srng_init(struct ath12k_base *ath12k); void ath12k_hal_srng_deinit(struct ath12k_base *ath12k); void ath12k_hal_dump_srng_stats(struct ath12k_base *ab); @@ -1139,4 +1261,95 @@ void ath12k_hal_srng_shadow_config(struct ath12k_base *ab); void ath12k_hal_srng_shadow_update_hp_tp(struct ath12k_base *ab, struct hal_srng *srng); +u32 *ath12k_hal_srng_dst_get_next_cache_entry(struct ath12k_base *ab, + struct hal_srng *srng); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +void ath12k_hal_srng_ppeds_dst_inv_entry(struct ath12k_base *ab, + struct hal_srng *srng, int entries); +#endif +void ath12k_hal_srng_dst_invalidate_entry(struct ath12k_base *ab, + struct hal_srng *srng, int entries); +void ath12k_hal_reo_ring_ctrl_hash_ix3_setup(struct ath12k_base *ab, + u32 ring_hash_map); +void ath12k_hal_reo_ring_ctrl_hash_ix2_setup(struct ath12k_base *ab, + u32 ring_hash_map); +void ath12k_hal_reo_shared_qaddr_cache_clear(struct ath12k_base *ab); +void ath12k_hal_srng_prefetch_desc(struct ath12k_base *ab, + struct hal_srng *srng); +void ath12k_hal_reo_config_reo2ppe_dest_info(struct ath12k_base *ab); + +static inline +u32 *ath12k_hal_srng_src_get_next_entry_nolock(struct ath12k_base *ab, + struct hal_srng *srng) +{ + u32 *desc; + u32 next_hp; + + /* TODO: Using % is expensive, but we have to do this since size of some + * SRNG rings is not power of 2 (due to descriptor sizes). Need to see + * if separate function is defined for rings having power of 2 ring size + * (TCL2SW, REO2SW, SW2RXDMA and CE rings) so that we can avoid the + * overhead of % by using mask (with &). + */ + next_hp = (srng->u.src_ring.hp + srng->entry_size) % srng->ring_size; + + if (next_hp == srng->u.src_ring.cached_tp) + return NULL; + + desc = srng->ring_base_vaddr + srng->u.src_ring.hp; + srng->u.src_ring.hp = next_hp; + + /* TODO: Reap functionality is not used by all rings. If particular + * ring does not use reap functionality, we need not update reap_hp + * with next_hp pointer. Need to make sure a separate function is used + * before doing any optimization by removing below code updating + * reap_hp. + */ + srng->u.src_ring.reap_hp = next_hp; + + return desc; +} + +static inline +void ath12k_hal_srng_access_src_ring_begin_nolock(struct hal_srng *srng) +{ + srng->u.src_ring.cached_tp = *(volatile u32 *)srng->u.src_ring.tp_addr; +} + +static inline +void ath12k_hal_srng_access_dst_ring_begin_nolock(struct ath12k_base *ab, + struct hal_srng *srng) +{ + srng->u.dst_ring.cached_hp = *srng->u.dst_ring.hp_addr; + /* Try to prefetch the next descriptor in the ring */ + if (srng->flags & HAL_SRNG_FLAGS_CACHED) + ath12k_hal_srng_prefetch_desc(ab, srng); +} + +static inline +void ath12k_hal_srng_access_umac_src_ring_end_nolock(struct hal_srng *srng) +{ + srng->u.src_ring.last_tp = + *(volatile u32 *)srng->u.src_ring.tp_addr; + writel_relaxed(srng->u.src_ring.hp, srng->u.src_ring.hp_addr_direct); + srng->timestamp = jiffies; +} + +static inline +void ath12k_hal_srng_access_dst_ring_end_nolock(struct hal_srng *srng) +{ + srng->u.dst_ring.last_hp = *srng->u.dst_ring.hp_addr; + writel_relaxed(srng->u.dst_ring.tp, srng->u.dst_ring.tp_addr_direct); + srng->timestamp = jiffies; +} + +static inline +void ath12k_hal_srng_access_lmac_src_ring_end_nolock(struct hal_srng *srng) +{ + srng->u.src_ring.last_tp = *(volatile u32 *)srng->u.src_ring.tp_addr; + *srng->u.src_ring.hp_addr = srng->u.src_ring.hp; +} + + +ssize_t ath12k_debugfs_hal_dump_srng_stats(struct ath12k_base *ab, char *buf, int size); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal_desc.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_desc.h --- linux-6.4/drivers/net/wireless/ath/ath12k/hal_desc.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_desc.h 2024-04-22 13:40:50.287868747 +0200 @@ -522,7 +522,7 @@ HAL_PHYRXHT_SIG_USR_SU = 468 /* 0x1d4 */, HAL_PHYRXHT_SIG_USR_MU_MIMO = 469 /* 0x1d5 */, HAL_PHYRX_GENERIC_U_SIG = 470 /* 0x1d6 */, - HAL_PHYRX_GENERICHT_SIG = 471 /* 0x1d7 */, + HAL_PHYRX_GENERIC_EHT_SIG = 471 /* 0x1d7 */, HAL_OVERWRITE_RESP_START = 472 /* 0x1d8 */, HAL_OVERWRITE_RESP_PREAMBLE_INFO = 473 /* 0x1d9 */, HAL_OVERWRITE_RESP_FRAME_INFO = 474 /* 0x1da */, @@ -580,11 +580,20 @@ #define HAL_TLV_64_HDR_TAG GENMASK(9, 1) #define HAL_TLV_64_HDR_LEN GENMASK(21, 10) +#define HAL_TLV_64_ALIGN 8 + struct hal_tlv_64_hdr { u64 tl; u8 value[]; } __packed; +struct hal_tlv_parsed_hdr { + u16 tlv_tag; + u16 tlv_len; + u16 tlv_userid; + u8 *tlv_data; +}; + #define RX_MPDU_DESC_INFO0_MSDU_COUNT GENMASK(7, 0) #define RX_MPDU_DESC_INFO0_FRAG_FLAG BIT(8) #define RX_MPDU_DESC_INFO0_MPDU_RETRY BIT(9) @@ -597,8 +606,7 @@ #define RX_MPDU_DESC_INFO0_MPDU_QOS_CTRL_VALID BIT(27) #define RX_MPDU_DESC_INFO0_TID GENMASK(31, 28) -/* TODO revisit after meta data is concluded */ -#define RX_MPDU_DESC_META_DATA_PEER_ID GENMASK(15, 0) +#define RX_MPDU_DESC_META_DATA_PEER_ID GENMASK(13, 0) struct rx_mpdu_desc { __le32 info0; /* %RX_MPDU_DESC_INFO */ @@ -915,53 +923,6 @@ * this ring has looped around the ring. */ -#define HAL_REO_TO_PPE_RING_INFO0_DATA_LENGTH GENMASK(15, 0) -#define HAL_REO_TO_PPE_RING_INFO0_DATA_OFFSET GENMASK(23, 16) -#define HAL_REO_TO_PPE_RING_INFO0_POOL_ID GENMASK(28, 24) -#define HAL_REO_TO_PPE_RING_INFO0_PREHEADER BIT(29) -#define HAL_REO_TO_PPE_RING_INFO0_TSO_EN BIT(30) -#define HAL_REO_TO_PPE_RING_INFO0_MORE BIT(31) - -struct hal_reo_to_ppe_ring { - __le32 buffer_addr; - __le32 info0; /* %HAL_REO_TO_PPE_RING_INFO0_ */ -} __packed; - -/* hal_reo_to_ppe_ring - * - * Producer: REO - * Consumer: PPE - * - * buf_addr_info - * Details of the physical address of a buffer or MSDU - * link descriptor. - * - * data_length - * Length of valid data in bytes - * - * data_offset - * Offset to the data from buffer pointer. Can be used to - * strip header in the data for tunnel termination etc. - * - * pool_id - * REO has global configuration register for this field. - * It may have several free buffer pools, each - * RX-Descriptor ring can fetch free buffer from specific - * buffer pool; pool id will indicate which pool the buffer - * will be released to; POOL_ID Zero returned to SW - * - * preheader - * Disabled: 0 (Default) - * Enabled: 1 - * - * tso_en - * Disabled: 0 (Default) - * Enabled: 1 - * - * more - * More Segments followed - */ - enum hal_reo_entr_rxdma_push_reason { HAL_REO_ENTR_RING_RXDMA_PUSH_REASON_ERR_DETECTED, HAL_REO_ENTR_RING_RXDMA_PUSH_REASON_ROUTING_INSTRUCTION, @@ -984,6 +945,10 @@ HAL_REO_ENTR_RING_RXDMA_ECODE_FLOW_TIMEOUT_ERR, HAL_REO_ENTR_RING_RXDMA_ECODE_FLUSH_REQUEST_ERR, HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_FRAG_ERR, + HAL_REO_ENTR_RING_RXDMA_ECODE_MULTICAST_ECHO_ERR, + HAL_REO_ENTR_RING_RXDMA_ECODE_AMSDU_ADDR_MISMATCH_ERR, + HAL_REO_ENTR_RING_RXDMA_ECODE_UNAUTH_WDS_ERR, + HAL_REO_ENTR_RING_RXDMA_ECODE_GROUPCAST_AMSDU_OR_WDS_ERR, HAL_REO_ENTR_RING_RXDMA_ECODE_MAX, }; @@ -1197,6 +1162,7 @@ #define HAL_REO_FLUSH_CACHE_INFO0_FLUSH_WO_INVALIDATE BIT(12) #define HAL_REO_FLUSH_CACHE_INFO0_BLOCK_CACHE_USAGE BIT(13) #define HAL_REO_FLUSH_CACHE_INFO0_FLUSH_ALL BIT(14) +#define HAL_REO_FLUSH_CACHE_INFO0_FLUSH_QUEUE_1K_DESC BIT(15) struct hal_reo_flush_cache { struct hal_reo_cmd_hdr cmd; @@ -1239,6 +1205,7 @@ #define HAL_TCL_DATA_CMD_INFO5_RING_ID GENMASK(27, 20) #define HAL_TCL_DATA_CMD_INFO5_LOOPING_COUNT GENMASK(31, 28) +#define HAL_ENCRYPT_TYPE_MAX 12 enum hal_encrypt_type { HAL_ENCRYPT_TYPE_WEP_40, @@ -1260,11 +1227,13 @@ HAL_TCL_ENCAP_TYPE_NATIVE_WIFI, HAL_TCL_ENCAP_TYPE_ETHERNET, HAL_TCL_ENCAP_TYPE_802_3 = 3, + HAL_TCL_ENCAP_TYPE_MAX }; enum hal_tcl_desc_type { HAL_TCL_DESC_TYPE_BUFFER, HAL_TCL_DESC_TYPE_EXT_DESC, + HAL_TCL_DESC_TYPE_MAX, }; enum hal_wbm_htt_tx_comp_status { @@ -1274,9 +1243,16 @@ HAL_WBM_REL_HTT_TX_COMP_STATUS_REINJ, HAL_WBM_REL_HTT_TX_COMP_STATUS_INSPECT, HAL_WBM_REL_HTT_TX_COMP_STATUS_MEC_NOTIFY, + HAL_WBM_REL_HTT_TX_COMP_STATUS_VDEVID_MISMATCH, HAL_WBM_REL_HTT_TX_COMP_STATUS_MAX, }; +#define TX_IP_CHECKSUM (HAL_TCL_DATA_CMD_INFO2_IP4_CKSUM_EN | \ + HAL_TCL_DATA_CMD_INFO2_UDP4_CKSUM_EN | \ + HAL_TCL_DATA_CMD_INFO2_UDP6_CKSUM_EN | \ + HAL_TCL_DATA_CMD_INFO2_TCP4_CKSUM_EN | \ + HAL_TCL_DATA_CMD_INFO2_TCP6_CKSUM_EN) + struct hal_tcl_data_cmd { struct ath12k_buffer_addr buf_addr_info; __le32 info0; @@ -1782,6 +1758,7 @@ HAL_WBM_REL_SRC_MODULE_REO, HAL_WBM_REL_SRC_MODULE_FW, HAL_WBM_REL_SRC_MODULE_SW, + HAL_WBM_REL_SRC_MODULE_MAX, }; enum hal_wbm_rel_desc_type { @@ -1863,7 +1840,7 @@ #define HAL_WBM_COMPL_TX_INFO0_TQM_RELEASE_REASON GENMASK(16, 13) #define HAL_WBM_COMPL_TX_INFO0_RBM_OVERRIDE_VLD BIT(17) #define HAL_WBM_COMPL_TX_INFO0_SW_COOKIE_LO GENMASK(29, 18) -#define HAL_WBM_COMPL_TX_INFO0_CC_DONE BIT(30) +#define HAL_WBM_COMPL_TX_INFO0_CC_DONE 0x40000000 #define HAL_WBM_COMPL_TX_INFO0_WBM_INTERNAL_ERROR BIT(31) #define HAL_WBM_COMPL_TX_INFO1_TQM_STATUS_NUMBER GENMASK(23, 0) @@ -1960,6 +1937,7 @@ __le32 info1; } __packed; +#define HAL_WBM_RELEASE_INFO0_REL_SRC_MASK 0x7 #define HAL_WBM_RELEASE_INFO0_REL_SRC_MODULE GENMASK(2, 0) #define HAL_WBM_RELEASE_INFO0_BM_ACTION GENMASK(5, 3) #define HAL_WBM_RELEASE_INFO0_DESC_TYPE GENMASK(8, 6) @@ -2048,6 +2026,19 @@ * fw with fw_reason2. * @HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON3: Remove command initiated by * fw with fw_reason3. + * @HAL_WBM_TQM_REL_REASON_CMD_DISABLE_QUEUE: Remove command initiated by + * fw with disable queue. + * @HAL_WBM_TQM_REL_REASON_CMD_TILL_NONMATCHING: Remove command initiated by + * fw to remove all mpdu until 1st non-match. + * @HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD: Dropped due to drop threshold + * criteria + * @HAL_WBM_TQM_REL_REASON_DROP_LINK_DESC_UNAVAIL: Dropped due to link desc + * not available + * @HAL_WBM_TQM_REL_REASON_DROP_OR_INVALID_MSDU: Dropped due drop bit set or + * null flow + * @HAL_WBM_TQM_REL_REASON_MULTICAST_DROP: Dropped due mcast drop set for VDEV + * @HAL_WBM_TQM_REL_REASON_VDEV_MISMATCH_DROP: Dropped due to being set with + * 'TCL_drop_reason' */ enum hal_wbm_tqm_rel_reason { HAL_WBM_TQM_REL_REASON_FRAME_ACKED, @@ -2058,6 +2049,16 @@ HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON1, HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON2, HAL_WBM_TQM_REL_REASON_CMD_REMOVE_RESEAON3, + HAL_WBM_TQM_REL_REASON_CMD_DISABLE_QUEUE, + HAL_WBM_TQM_REL_REASON_CMD_TILL_NONMATCHING, + HAL_WBM_TQM_REL_REASON_DROP_THRESHOLD, + HAL_WBM_TQM_REL_REASON_DROP_LINK_DESC_UNAVAIL, + HAL_WBM_TQM_REL_REASON_DROP_OR_INVALID_MSDU, + HAL_WBM_TQM_REL_REASON_MULTICAST_DROP, + HAL_WBM_TQM_REL_REASON_VDEV_MISMATCH_DROP, + + /* Keep Last */ + HAL_WBM_TQM_REL_REASON_MAX, }; struct hal_wbm_buffer_ring { @@ -2314,6 +2315,34 @@ struct hal_rx_mpdu_link_ptr mpdu_link[15]; } __packed; +struct hal_rx_reo_queue_1k { + struct hal_desc_header desc_hdr; + u32 rx_bitmap_319_288; + u32 rx_bitmap_351_320; + u32 rx_bitmap_383_352; + u32 rx_bitmap_415_384; + u32 rx_bitmap_447_416; + u32 rx_bitmap_479_448; + u32 rx_bitmap_511_480; + u32 rx_bitmap_543_512; + u32 rx_bitmap_575_544; + u32 rx_bitmap_607_576; + u32 rx_bitmap_639_608; + u32 rx_bitmap_671_640; + u32 rx_bitmap_703_672; + u32 rx_bitmap_735_704; + u32 rx_bitmap_767_736; + u32 rx_bitmap_799_768; + u32 rx_bitmap_831_800; + u32 rx_bitmap_863_832; + u32 rx_bitmap_895_864; + u32 rx_bitmap_927_896; + u32 rx_bitmap_959_928; + u32 rx_bitmap_991_960; + u32 rx_bitmap_1023_992; + u32 rsvd[8]; +}__packed; + /* hal_rx_reo_queue_ext * Consumer: REO * Producer: REO @@ -2500,13 +2529,13 @@ #define HAL_REO_UPD_RX_QUEUE_INFO1_PN_HANDLE_ENABLE BIT(30) #define HAL_REO_UPD_RX_QUEUE_INFO1_IGNORE_AMPDU_FLG BIT(31) -#define HAL_REO_UPD_RX_QUEUE_INFO2_BA_WINDOW_SIZE GENMASK(7, 0) -#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_SIZE GENMASK(9, 8) -#define HAL_REO_UPD_RX_QUEUE_INFO2_SVLD BIT(10) -#define HAL_REO_UPD_RX_QUEUE_INFO2_SSN GENMASK(22, 11) -#define HAL_REO_UPD_RX_QUEUE_INFO2_SEQ_2K_ERR BIT(23) -#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_ERR BIT(24) -#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_VALID BIT(25) +#define HAL_REO_UPD_RX_QUEUE_INFO2_BA_WINDOW_SIZE GENMASK(9, 0) +#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_SIZE GENMASK(11, 10) +#define HAL_REO_UPD_RX_QUEUE_INFO2_SVLD BIT(12) +#define HAL_REO_UPD_RX_QUEUE_INFO2_SSN GENMASK(24, 13) +#define HAL_REO_UPD_RX_QUEUE_INFO2_SEQ_2K_ERR BIT(25) +#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_ERR BIT(26) +#define HAL_REO_UPD_RX_QUEUE_INFO2_PN_VALID BIT(27) struct hal_reo_update_rx_queue { struct hal_reo_cmd_hdr cmd; @@ -2883,24 +2912,22 @@ * entries into this Ring has looped around the ring. */ -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_DATA_LENGTH GENMASK(13, 0) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_L4_CSUM_STATUS BIT(14) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_L3_CSUM_STATUS BIT(15) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_PID GENMASK(27, 24) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_QDISC BIT(28) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_MULTICAST BIT(29) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_MORE BIT(30) -#define HAL_TCL_ENTRANCE_FROM_PPE_RING_INFO0_VALID_TOGGLE BIT(31) - struct hal_tcl_entrance_from_ppe_ring { __le32 buffer_addr; __le32 info0; + __le32 opaque_lo; + __le32 opaque_hi; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 info4; } __packed; struct hal_mon_buf_ring { __le32 paddr_lo; __le32 paddr_hi; - __le64 cookie; + __le32 cookie; + __le32 magic; }; /* hal_mon_buf_ring @@ -2918,9 +2945,8 @@ #define HAL_MON_DEST_COOKIE_BUF_ID GENMASK(17, 0) -#define HAL_MON_DEST_INFO0_END_OFFSET GENMASK(15, 0) -#define HAL_MON_DEST_INFO0_FLUSH_DETECTED BIT(16) -#define HAL_MON_DEST_INFO0_END_OF_PPDU BIT(17) +#define HAL_MON_DEST_INFO0_END_OFFSET GENMASK(11, 0) +#define HAL_MON_DEST_INFO0_END_REASON GENMASK(17, 16) #define HAL_MON_DEST_INFO0_INITIATOR BIT(18) #define HAL_MON_DEST_INFO0_EMPTY_DESC BIT(19) #define HAL_MON_DEST_INFO0_RING_ID GENMASK(27, 20) @@ -2928,7 +2954,7 @@ struct hal_mon_dest_desc { __le32 cookie; - __le32 reserved; + __le32 magic; __le32 ppdu_id; __le32 info0; }; diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal_rx.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_rx.c --- linux-6.4/drivers/net/wireless/ath/ath12k/hal_rx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_rx.c 2024-04-22 13:40:50.287868747 +0200 @@ -89,6 +89,9 @@ if (cmd->flag & HAL_REO_CMD_FLG_FLUSH_ALL) desc->info0 |= cpu_to_le32(HAL_REO_FLUSH_CACHE_INFO0_FLUSH_ALL); + if (cmd->flag & HAL_REO_CMD_FLG_FLUSH_QUEUE_1K_DESC) + desc->info0 |= HAL_REO_FLUSH_CACHE_INFO0_FLUSH_QUEUE_1K_DESC; + return le32_get_bits(desc->cmd.info0, HAL_REO_CMD_HDR_INFO0_CMD_NUMBER); } @@ -320,7 +323,7 @@ { enum hal_reo_dest_ring_push_reason push_reason; enum hal_reo_dest_ring_error_code err_code; - u32 cookie, val; + u32 cookie; push_reason = le32_get_bits(desc->info0, HAL_REO_DEST_RING_INFO0_PUSH_REASON); @@ -335,12 +338,6 @@ return -EINVAL; } - val = le32_get_bits(desc->info0, HAL_REO_DEST_RING_INFO0_BUFFER_TYPE); - if (val != HAL_REO_DEST_RING_BUFFER_TYPE_LINK_DESC) { - ath12k_warn(ab, "expected buffer type link_desc"); - return -EINVAL; - } - ath12k_hal_rx_reo_ent_paddr_get(ab, &desc->buf_addr_info, paddr, &cookie); *desc_bank = u32_get_bits(cookie, DP_LINK_DESC_BANK_MASK); @@ -689,6 +686,7 @@ u32 ath12k_hal_reo_qdesc_size(u32 ba_window_size, u8 tid) { u32 num_ext_desc; + u32 num_1k_desc = 0; if (ba_window_size <= 1) { if (tid != HAL_DESC_REO_NON_QOS_TID) @@ -699,12 +697,16 @@ num_ext_desc = 1; } else if (ba_window_size <= 210) { num_ext_desc = 2; - } else { + } else if (ba_window_size <= 256) { num_ext_desc = 3; + } else { + num_ext_desc = 10; + num_1k_desc = 1; } return sizeof(struct hal_rx_reo_queue) + - (num_ext_desc * sizeof(struct hal_rx_reo_queue_ext)); + (num_ext_desc * sizeof(struct hal_rx_reo_queue_ext)) + + (num_1k_desc * sizeof(struct hal_rx_reo_queue_1k)); } void ath12k_hal_reo_qdesc_setup(struct hal_rx_reo_queue *qdesc, @@ -813,6 +815,38 @@ } } +void ath12k_hal_reo_ring_ctrl_hash_ix0_setup(struct ath12k_base *ab) +{ + u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; + u32 curr, val; + + curr = ath12k_hif_read32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0); + val = curr & ~(REO_DEST_CTRL_IX_0_RING6_MAP_MASK << + REO_DEST_CTRL_IX_0_RING6_MAP_SHFT); + val |= (REO2PPE_DST_RING_MAP << REO_DEST_CTRL_IX_0_RING6_MAP_SHFT); + + ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_0, + val); +} + +void ath12k_hal_reo_ring_ctrl_hash_ix2_setup(struct ath12k_base *ab, + u32 ring_hash_map) +{ + u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; + + ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, + ring_hash_map); +} + +void ath12k_hal_reo_ring_ctrl_hash_ix3_setup(struct ath12k_base *ab, + u32 ring_hash_map) +{ + u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; + + ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, + ring_hash_map); +} + void ath12k_hal_reo_hw_setup(struct ath12k_base *ab, u32 ring_hash_map) { u32 reo_base = HAL_SEQ_WCSS_UMAC_REO_REG; @@ -843,8 +877,75 @@ ath12k_hif_write32(ab, reo_base + HAL_REO1_AGING_THRESH_IX_3(ab), HAL_DEFAULT_VO_REO_TIMEOUT_USEC); - ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_2, - ring_hash_map); - ath12k_hif_write32(ab, reo_base + HAL_REO1_DEST_RING_CTRL_IX_3, - ring_hash_map); + ath12k_hal_reo_ring_ctrl_hash_ix0_setup(ab); + ath12k_hal_reo_ring_ctrl_hash_ix2_setup(ab, ring_hash_map); + ath12k_hal_reo_ring_ctrl_hash_ix3_setup(ab, ring_hash_map); +} + +/* + * Setting CLEAR_DESC_ARRAY field of WCSS_UMAC_REO_R0_QDESC_ADDR_READ + * and resetting back, to erase stale entries in reo storage. + */ +void ath12k_hal_reo_shared_qaddr_cache_clear(struct ath12k_base *ab) +{ + u32 val; + + val = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + + HAL_REO1_QDESC_ADDR_READ(ab)); + + val |= u32_encode_bits(1, HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY); + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + + HAL_REO1_QDESC_ADDR_READ(ab), val); + + val &= ~HAL_REO_QDESC_ADDR_READ_CLEAR_QDESC_ARRAY; + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_REO_REG + + HAL_REO1_QDESC_ADDR_READ(ab), val); +} + +void ath12k_dp_reset_rx_reo_tid_q(void *vaddr, u32 ba_window_size, + u8 tid) +{ + struct hal_rx_reo_queue *qdesc = (struct hal_rx_reo_queue *)vaddr; + struct hal_rx_reo_queue_ext *ext_desc; + u32 size, info0, info1, rx_queue_num; + + size = ath12k_hal_reo_qdesc_size(ba_window_size, tid); + + rx_queue_num = qdesc->rx_queue_num; + info0 = qdesc->info0; + info1 = qdesc->info1; + + memset(qdesc, 0, size); + + ath12k_hal_reo_set_desc_hdr(&qdesc->desc_hdr, HAL_DESC_REO_OWNED, + HAL_DESC_REO_QUEUE_DESC, + REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_0); + + qdesc->rx_queue_num = rx_queue_num; + qdesc->info0 = info0; + qdesc->info1 = info1; + + qdesc->info1 |= u32_encode_bits(0, HAL_RX_REO_QUEUE_INFO1_SVLD); + qdesc->info1 |= u32_encode_bits(0, + HAL_RX_REO_QUEUE_INFO1_SSN); + + if (tid == HAL_DESC_REO_NON_QOS_TID) + return; + + ext_desc = qdesc->ext_desc; + memset(ext_desc, 0, 3 * sizeof(*ext_desc)); + + ath12k_hal_reo_set_desc_hdr(&ext_desc->desc_hdr, HAL_DESC_REO_OWNED, + HAL_DESC_REO_QUEUE_EXT_DESC, + REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_1); + ext_desc++; + + ath12k_hal_reo_set_desc_hdr(&ext_desc->desc_hdr, HAL_DESC_REO_OWNED, + HAL_DESC_REO_QUEUE_EXT_DESC, + REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_2); + ext_desc++; + + ath12k_hal_reo_set_desc_hdr(&ext_desc->desc_hdr, HAL_DESC_REO_OWNED, + HAL_DESC_REO_QUEUE_EXT_DESC, + REO_QUEUE_DESC_MAGIC_DEBUG_PATTERN_3); } diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal_rx.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_rx.h --- linux-6.4/drivers/net/wireless/ath/ath12k/hal_rx.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_rx.h 2024-04-22 13:40:50.287868747 +0200 @@ -19,7 +19,7 @@ bool hw_cc_done; }; -#define HAL_INVALID_PEERID 0xffff +#define HAL_INVALID_PEERID 0x3fff #define VHT_SIG_SU_NSS_MASK 0x7 #define HAL_RX_MAX_MCS 12 @@ -61,6 +61,8 @@ HAL_RX_BW_40MHZ, HAL_RX_BW_80MHZ, HAL_RX_BW_160MHZ, + HAL_RX_BW_240MHZ, + HAL_RX_BW_320MHZ, HAL_RX_BW_MAX, }; @@ -70,6 +72,7 @@ HAL_RX_PREAMBLE_11N, HAL_RX_PREAMBLE_11AC, HAL_RX_PREAMBLE_11AX, + HAL_RX_PREAMBLE_11BE = 6, HAL_RX_PREAMBLE_MAX, }; @@ -107,9 +110,12 @@ HAL_RX_MON_STATUS_PPDU_NOT_DONE, HAL_RX_MON_STATUS_PPDU_DONE, HAL_RX_MON_STATUS_BUF_DONE, + HAL_RX_MON_STATUS_BUF_ADDR, + HAL_RX_MON_STATUS_MPDU_END, + HAL_RX_MON_STATUS_MSDU_END, }; -#define HAL_RX_MAX_MPDU 256 +#define HAL_RX_MAX_MPDU 1024 #define HAL_RX_NUM_WORDS_PER_PPDU_BITMAP (HAL_RX_MAX_MPDU >> 5) struct hal_rx_user_status { @@ -142,9 +148,48 @@ u32 mpdu_fcs_ok_bitmap[HAL_RX_NUM_WORDS_PER_PPDU_BITMAP]; u32 mpdu_ok_byte_count; u32 mpdu_err_byte_count; + u32 ampdu_id; + bool ampdu_present; +}; + +struct msdu_info { + u32 errmap; + u32 decap_format; }; #define HAL_MAX_UL_MU_USERS 37 +#define HAL_RX_MAX_MSDU 256 + +struct mon_mpdu_data { + struct sk_buff *head_msdu; + struct sk_buff *tail_msdu; + struct msdu_info msdu_info[HAL_RX_MAX_MSDU]; + u16 msdu_count; +}; + +#define HAL_RX_MON_MAX_AGGR_SIZE 128 + +struct hal_rx_tlv_aggr_info { + u8 in_progress; + u8 cur_len; + u16 tlv_tag; + u8 buf[HAL_RX_MON_MAX_AGGR_SIZE]; +}; + +struct hal_rx_u_sig_info { + bool ul_dl; + u8 bw; + u8 ppdu_type_comp_mode; + u8 eht_sig_mcs; + u8 num_eht_sig_sym; +}; + +struct hal_rx_mon_cmn_mpdu_info { + struct mon_mpdu_data mon_mpdu[HAL_RX_MAX_MPDU]; + u16 mpdu_count; +}; + +#define EHT_MAX_USER_INFO 4 struct hal_rx_mon_ppdu_info { u32 ppdu_id; @@ -155,6 +200,7 @@ u32 preamble_type; u32 mpdu_len; u16 chan_num; + u16 freq; u16 tcp_msdu_count; u16 tcp_ack_msdu_count; u16 udp_msdu_count; @@ -229,23 +275,43 @@ bool first_msdu_in_mpdu; bool is_ampdu; u8 medium_prot_type; + bool ppdu_continuation; + struct hal_rx_tlv_aggr_info tlv_aggr; + u16 usig_flags; + u16 eht_flags; + u8 num_eht_user_info_valid; + u16 punctured_pattern; + u32 usig_common; + u32 usig_value; + u32 usig_mask; + u32 eht_known; + u32 eht_data[9]; + u32 eht_user_info[EHT_MAX_USER_INFO]; + struct hal_rx_u_sig_info u_sig_info; + struct hal_rx_mon_cmn_mpdu_info cmn_mpdu_info; }; #define HAL_RX_PPDU_START_INFO0_PPDU_ID GENMASK(15, 0) +#define HAL_RX_PPDU_START_INFO1_CHAN_NUM GENMASK(15, 0) +#define HAL_RX_PPDU_START_INFO1_CHAN_FREQ GENMASK(31, 16) struct hal_rx_ppdu_start { __le32 info0; - __le32 chan_num; - __le32 ppdu_start_ts; + __le32 info1; + __le32 ppdu_start_ts_31_0; + __le32 ppdu_start_ts_63_32; + __le32 reserverd[2]; } __packed; -#define HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR GENMASK(25, 16) - -#define HAL_RX_PPDU_END_USER_STATS_INFO1_MPDU_CNT_FCS_OK GENMASK(8, 0) -#define HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID BIT(9) -#define HAL_RX_PPDU_END_USER_STATS_INFO1_QOS_CTRL_VALID BIT(10) -#define HAL_RX_PPDU_END_USER_STATS_INFO1_HT_CTRL_VALID BIT(11) -#define HAL_RX_PPDU_END_USER_STATS_INFO1_PKT_TYPE GENMASK(23, 20) +#define HAL_RX_PPDU_END_USER_STATS_INFO0_PEER_ID GENMASK(13, 0) +#define HAL_RX_PPDU_END_USER_STATS_INFO0_CHIP_ID GENMASK(15, 14) +#define HAL_RX_PPDU_END_USER_STATS_INFO0_MPDU_CNT_FCS_ERR GENMASK(26, 16) + +#define HAL_RX_PPDU_END_USER_STATS_INFO1_MPDU_CNT_FCS_OK GENMASK(10, 0) +#define HAL_RX_PPDU_END_USER_STATS_INFO1_FC_VALID BIT(11) +#define HAL_RX_PPDU_END_USER_STATS_INFO1_QOS_CTRL_VALID BIT(12) +#define HAL_RX_PPDU_END_USER_STATS_INFO1_HT_CTRL_VALID BIT(13) +#define HAL_RX_PPDU_END_USER_STATS_INFO1_PKT_TYPE GENMASK(24, 21) #define HAL_RX_PPDU_END_USER_STATS_INFO2_AST_INDEX GENMASK(15, 0) #define HAL_RX_PPDU_END_USER_STATS_INFO2_FRAME_CTRL GENMASK(31, 16) @@ -261,8 +327,8 @@ #define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_BITMAP GENMASK(15, 0) #define HAL_RX_PPDU_END_USER_STATS_INFO6_TID_EOSP_BITMAP GENMASK(31, 16) -#define HAL_RX_PPDU_END_USER_STATS_MPDU_DELIM_OK_BYTE_COUNT GENMASK(24, 0) -#define HAL_RX_PPDU_END_USER_STATS_MPDU_DELIM_ERR_BYTE_COUNT GENMASK(24, 0) +#define HAL_RX_PPDU_END_USER_STATS_INFO7_MPDU_OK_BYTE_COUNT GENMASK(24, 0) +#define HAL_RX_PPDU_END_USER_STATS_INFO8_MPDU_ERR_BYTE_COUNT GENMASK(24, 0) struct hal_rx_ppdu_end_user_stats { __le32 rsvd0[2]; @@ -293,6 +359,7 @@ __le32 info4; __le32 info5; __le32 info6; + __le32 rsvd; } __packed; #define HAL_RX_HT_SIG_INFO_INFO0_MCS GENMASK(6, 0) @@ -389,11 +456,9 @@ #define HAL_RX_HE_SIG_A_MU_DL_INFO0_DOPPLER_INDICATION BIT(25) #define HAL_RX_HE_SIG_A_MU_DL_INFO1_TXOP_DURATION GENMASK(6, 0) -#define HAL_RX_HE_SIG_A_MU_DL_INFO1_CODING BIT(7) #define HAL_RX_HE_SIG_A_MU_DL_INFO1_NUM_LTF_SYMB GENMASK(10, 8) #define HAL_RX_HE_SIG_A_MU_DL_INFO1_LDPC_EXTRA BIT(11) #define HAL_RX_HE_SIG_A_MU_DL_INFO1_STBC BIT(12) -#define HAL_RX_HE_SIG_A_MU_DL_INFO1_TXBF BIT(10) #define HAL_RX_HE_SIG_A_MU_DL_INFO1_PKT_EXT_FACTOR GENMASK(14, 13) #define HAL_RX_HE_SIG_A_MU_DL_INFO1_PKT_EXT_PE_DISAM BIT(15) @@ -419,7 +484,7 @@ #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_ID GENMASK(10, 0) #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_NSTS GENMASK(13, 11) -#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF BIT(19) +#define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_TXBF BIT(14) #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_MCS GENMASK(18, 15) #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_DCM BIT(19) #define HAL_RX_HE_SIG_B2_OFDMA_INFO_INFO0_STA_CODING BIT(20) @@ -435,30 +500,35 @@ HAL_RECEPTION_TYPE_FRAMELESS }; -#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RSSI_COMB GENMASK(15, 8) -#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_RSVD1_RECEPTION GENMASK(3, 0) +#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RECEPTION GENMASK(3, 0) +#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO0_RX_BW GENMASK(7, 5) +#define HAL_RX_PHYRX_RSSI_LEGACY_INFO_INFO1_RSSI_COMB GENMASK(15, 8) struct hal_rx_phyrx_rssi_legacy_info { - __le32 rsvd[35]; __le32 info0; + __le32 rsvd0[39]; + __le32 info1; + __le32 rsvd2; } __packed; #define HAL_RX_MPDU_START_INFO0_PPDU_ID GENMASK(31, 16) -#define HAL_RX_MPDU_START_INFO1_PEERID GENMASK(31, 16) +#define HAL_RX_MPDU_START_INFO1_PEERID GENMASK(29, 16) +#define HAL_RX_MPDU_START_INFO1_CHIPID GENMASK(31, 30) #define HAL_RX_MPDU_START_INFO2_MPDU_LEN GENMASK(13, 0) struct hal_rx_mpdu_start { + __le32 rsvd0[9]; __le32 info0; __le32 info1; - __le32 rsvd1[11]; + __le32 rsvd1[2]; __le32 info2; - __le32 rsvd2[9]; + __le32 rsvd2[16]; } __packed; #define HAL_RX_PPDU_END_DURATION GENMASK(23, 0) struct hal_rx_ppdu_end_duration { __le32 rsvd0[9]; __le32 info0; - __le32 rsvd1[4]; + __le32 rsvd1[18]; } __packed; struct hal_rx_rxpcu_classification_overview { @@ -629,35 +699,435 @@ #define HAL_RX_MPDU_ERR_MPDU_LEN BIT(6) #define HAL_RX_MPDU_ERR_UNENCRYPTED_FRAME BIT(7) -static inline -enum nl80211_he_ru_alloc ath12k_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones) -{ - enum nl80211_he_ru_alloc ret; - - switch (ru_tones) { - case RU_52: - ret = NL80211_RATE_INFO_HE_RU_ALLOC_52; - break; - case RU_106: - ret = NL80211_RATE_INFO_HE_RU_ALLOC_106; - break; - case RU_242: - ret = NL80211_RATE_INFO_HE_RU_ALLOC_242; - break; - case RU_484: - ret = NL80211_RATE_INFO_HE_RU_ALLOC_484; - break; - case RU_996: - ret = NL80211_RATE_INFO_HE_RU_ALLOC_996; - break; - case RU_26: - fallthrough; - default: - ret = NL80211_RATE_INFO_HE_RU_ALLOC_26; - break; - } - return ret; -} +#define HAL_RX_PHY_CMN_USER_INFO0_GI GENMASK(17, 16) +struct phyrx_common_user_info { + __le32 rsvd[2]; + __le32 info0; + __le32 rsvd1; +}; + +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_SPATIAL_REUSE GENMASK(3, 0) +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_GI_LTF GENMASK(5, 4) +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_NUM_LTF_SYM GENMASK(8, 6) +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_NSS GENMASK(10, 7) +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_BEAMFORMED BIT(11) +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_DISREGARD GENMASK(13, 12) +#define HAL_RX_EHT_SIG_NDP_CMN_INFO0_CRC GENMASK(17, 14) + +struct hal_eht_sig_ndp_cmn_eb { + __le32 info0; +} __packed; + +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_SPATIAL_REUSE GENMASK(3, 0) +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_GI_LTF GENMASK(5, 4) +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_NUM_LTF_SYM GENMASK(8, 6) +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_LDPC_EXTA_SYM BIT(9) +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_PRE_FEC_PAD_FACTOR GENMASK(11, 10) +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISAMBIGUITY BIT(12) +#define HAL_RX_EHT_SIG_OVERFLOW_INFO0_DISREGARD GENMASK(16, 13) + +struct hal_eht_sig_cc_usig_overflow { + __le32 info0; +} __packed; + +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_STA_ID GENMASK(10, 0) +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_MCS GENMASK(14, 11) +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_VALIDATE BIT(15) +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_NSS GENMASK(19, 16) +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_BEAMFORMED BIT(20) +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_CODING BIT(21) +#define HAL_RX_EHT_SIG_NON_MUMIMO_USER_INFO0_CRC GENMASK(25, 22) + +struct hal_eht_sig_non_mu_mimo_user_info { + __le32 info0; +} __packed; + +#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_STA_ID GENMASK(10, 0) +#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_MCS GENMASK(14, 11) +#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_CODING BIT(15) +#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_SPATIAL_CODING GENMASK(22, 16) +#define HAL_RX_EHT_SIG_MUMIMO_USER_INFO0_CRC GENMASK(26, 23) + +struct hal_eht_sig_mu_mimo_user_info { + __le32 info0; +} __packed; + +union hal_eht_sig_user_field { + struct hal_eht_sig_mu_mimo_user_info mu_mimo_usr; + struct hal_eht_sig_non_mu_mimo_user_info non_mu_mimo_usr; +}; + +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_SPATIAL_REUSE GENMASK(3, 0) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_GI_LTF GENMASK(5, 4) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_NUM_LTF_SYM GENMASK(8, 6) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_LDPC_EXTA_SYM BIT(9) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_PRE_FEC_PAD_FACTOR GENMASK(11, 10) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_DISAMBIGUITY BIT(12) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_DISREGARD GENMASK(16, 13) +#define HAL_RX_EHT_SIG_NON_OFDMA_INFO0_NUM_USERS GENMASK(19, 17) + +struct hal_eht_sig_non_ofdma_cmn_eb { + __le32 info0; + union hal_eht_sig_user_field user_field; +} __packed; + +#define HAL_RX_EHT_SIG_OFDMA_EB1_SPATIAL_REUSE GENMASK_ULL(3, 0) +#define HAL_RX_EHT_SIG_OFDMA_EB1_GI_LTF GENMASK_ULL(5, 4) +#define HAL_RX_EHT_SIG_OFDMA_EB1_NUM_LFT_SYM GENMASK_ULL(8, 6) +#define HAL_RX_EHT_SIG_OFDMA_EB1_LDPC_EXTRA_SYM BIT(9) +#define HAL_RX_EHT_SIG_OFDMA_EB1_PRE_FEC_PAD_FACTOR GENMASK_ULL(11, 10) +#define HAL_RX_EHT_SIG_OFDMA_EB1_PRE_DISAMBIGUITY BIT(12) +#define HAL_RX_EHT_SIG_OFDMA_EB1_DISREGARD GENMASK_ULL(16, 13) +#define HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_1 GENMASK_ULL(25, 17) +#define HAL_RX_EHT_SIG_OFDMA_EB1_RU_ALLOC_1_2 GENMASK_ULL(34, 26) +#define HAL_RX_EHT_SIG_OFDMA_EB1_CRC GENMASK_ULL(30, 27) + +struct hal_eht_sig_ofdma_cmn_eb1 { + __le64 info0; +} __packed; + +#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_1 GENMASK_ULL(8, 0) +#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_2 GENMASK_ULL(17, 9) +#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_3 GENMASK_ULL(26, 18) +#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_4 GENMASK_ULL(35, 27) +#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_5 GENMASK_ULL(44, 36) +#define HAL_RX_EHT_SIG_OFDMA_EB2_RU_ALLOC_2_6 GENMASK_ULL(53, 45) +#define HAL_RX_EHT_SIG_OFDMA_EB2_MCS GNEMASK_ULL(57, 54) + +struct hal_eht_sig_ofdma_cmn_eb2 { + __le64 info0; +} __packed; + +enum hal_eht_bw { + HAL_EHT_BW_20, + HAL_EHT_BW_40, + HAL_EHT_BW_80, + HAL_EHT_BW_160, + HAL_EHT_BW_320_1, + HAL_EHT_BW_320_2, +}; + +#define HAL_RX_USIG_CMN_INFO0_PHY_VERSION GENMASK(2, 0) +#define HAL_RX_USIG_CMN_INFO0_BW GENMASK(5, 3) +#define HAL_RX_USIG_CMN_INFO0_UL_DL BIT(6) +#define HAL_RX_USIG_CMN_INFO0_BSS_COLOR GENMASK(12, 7) +#define HAL_RX_USIG_CMN_INFO0_TXOP GENMASK(19, 13) +#define HAL_RX_USIG_CMN_INFO0_DISREGARD GENMASK(25, 20) +#define HAL_RX_USIG_CMN_INFO0_VALIDATE BIT(26) + +struct hal_mon_usig_cmn { + __le32 info0; +} __packed; + +#define HAL_RX_USIG_TB_INFO0_PPDU_TYPE_COMP_MODE GENMASK(1, 0) +#define HAL_RX_USIG_TB_INFO0_VALIDATE BIT(2) +#define HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_1 GENMASK(6, 3) +#define HAL_RX_USIG_TB_INFO0_SPATIAL_REUSE_2 GENMASK(10, 7) +#define HAL_RX_USIG_TB_INFO0_DISREGARD_1 GENMASK(15, 11) +#define HAL_RX_USIG_TB_INFO0_CRC GENMASK(19, 16) +#define HAL_RX_USIG_TB_INFO0_TAIL GENMASK(25, 20) +#define HAL_RX_USIG_TB_INFO0_RX_INTEG_CHECK_PASS BIT(31) + +struct hal_mon_usig_tb { + __le32 info0; +} __packed; + +#define HAL_RX_USIG_MU_INFO0_PPDU_TYPE_COMP_MODE GENMASK(1, 0) +#define HAL_RX_USIG_MU_INFO0_VALIDATE_1 BIT(2) +#define HAL_RX_USIG_MU_INFO0_PUNC_CH_INFO GENMASK(7, 3) +#define HAL_RX_USIG_MU_INFO0_VALIDATE_2 BIT(8) +#define HAL_RX_USIG_MU_INFO0_EHT_SIG_MCS GENMASK(10, 9) +#define HAL_RX_USIG_MU_INFO0_NUM_EHT_SIG_SYM GENMASK(15, 11) +#define HAL_RX_USIG_MU_INFO0_CRC GENMASK(20, 16) +#define HAL_RX_USIG_MU_INFO0_TAIL GENMASK(26, 21) +#define HAL_RX_USIG_MU_INFO0_RX_INTEG_CHECK_PASS BIT(31) + +struct hal_mon_usig_mu { + __le32 info0; +} __packed; + +union hal_mon_usig_non_cmn { + struct hal_mon_usig_tb tb; + struct hal_mon_usig_mu mu; +}; + +struct hal_mon_usig_hdr { + struct hal_mon_usig_cmn usig_1; + union hal_mon_usig_non_cmn usig_2; +} __packed; + +#define HAL_RX_USR_INFO0_PHY_PPDU_ID GENMASK(15, 0) +#define HAL_RX_USR_INFO0_USR_RSSI GENMASK(23, 16) +#define HAL_RX_USR_INFO0_PKT_TYPE GENMASK(27, 24) +#define HAL_RX_USR_INFO0_STBC BIT(28) +#define HAL_RX_USR_INFO0_RECEPTION_TYPE GENMASK(31, 29) + +#define HAL_RX_USR_INFO1_MCS GENMASK(3, 0) +#define HAL_RX_USR_INFO1_SGI GENMASK(5, 4) +#define HAL_RX_USR_INFO1_HE_RANGING_NDP BIT(6) +#define HAL_RX_USR_INFO1_MIMO_SS_BITMAP GENMASK(15, 8) +#define HAL_RX_USR_INFO1_RX_BW GENMASK(18, 16) +#define HAL_RX_USR_INFO1_DL_OFMDA_USR_IDX GENMASK(31, 24) + +#define HAL_RX_USR_INFO2_DL_OFDMA_CONTENT_CHAN BIT(0) +#define HAL_RX_USR_INFO2_NSS GENMASK(10, 8) +#define HAL_RX_USR_INFO2_STREAM_OFFSET GENMASK(13, 11) +#define HAL_RX_USR_INFO2_STA_DCM BIT(14) +#define HAL_RX_USR_INFO2_LDPC BIT(15) +#define HAL_RX_USR_INFO2_RU_TYPE_80_0 GENMASK(19, 16) +#define HAL_RX_USR_INFO2_RU_TYPE_80_1 GENMASK(23, 20) +#define HAL_RX_USR_INFO2_RU_TYPE_80_2 GENMASK(27, 24) +#define HAL_RX_USR_INFO2_RU_TYPE_80_3 GENMASK(31, 28) + +#define HAL_RX_USR_INFO3_RU_START_IDX_80_0 GENMASK(5, 0) +#define HAL_RX_USR_INFO3_RU_START_IDX_80_1 GENMASK(13, 8) +#define HAL_RX_USR_INFO3_RU_START_IDX_80_2 GENMASK(21, 16) +#define HAL_RX_USR_INFO3_RU_START_IDX_80_3 GENMASK(29, 24) + +struct hal_receive_user_info { + __le32 info0; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 user_fd_rssi_seg0; + __le32 user_fd_rssi_seg1; + __le32 user_fd_rssi_seg2; + __le32 user_fd_rssi_seg3; +} __packed; + +enum hal_mon_reception_type{ + HAL_RECEPTION_TYPE_SU, + HAL_RECEPTION_TYPE_DL_MU_MIMO, + HAL_RECEPTION_TYPE_DL_MU_OFMA, + HAL_RECEPTION_TYPE_DL_MU_OFDMA_MIMO, + HAL_RECEPTION_TYPE_UL_MU_MIMO, + HAL_RECEPTION_TYPE_UL_MU_OFDMA, + HAL_RECEPTION_TYPE_UL_MU_OFDMA_MIMO, +}; +/* Different allowed RU in 11BE */ +#define HAL_EHT_RU_26 0ULL +#define HAL_EHT_RU_52 1ULL +#define HAL_EHT_RU_78 2ULL +#define HAL_EHT_RU_106 3ULL +#define HAL_EHT_RU_132 4ULL +#define HAL_EHT_RU_242 5ULL +#define HAL_EHT_RU_484 6ULL +#define HAL_EHT_RU_726 7ULL +#define HAL_EHT_RU_996 8ULL +#define HAL_EHT_RU_996x2 9ULL +#define HAL_EHT_RU_996x3 10ULL +#define HAL_EHT_RU_996x4 11ULL +#define HAL_EHT_RU_NONE 15ULL +#define HAL_EHT_RU_INVALID 31ULL +/* + * MRUs spanning above 80Mhz + * HAL_EHT_RU_996_484 = HAL_EHT_RU_484 + HAL_EHT_RU_996 + 4 (reserved) + */ +#define HAL_EHT_RU_996_484 18ULL +#define HAL_EHT_RU_996x2_484 28ULL +#define HAL_EHT_RU_996x3_484 40ULL +#define HAL_EHT_RU_996_484_242 23ULL + +#define NUM_RU_BITS_PER80 16 +#define NUM_RU_BITS_PER20 4 + +/* Different per_80Mhz band in 320Mhz bandwidth */ +#define HAL_80_0 0 +#define HAL_80_1 1 +#define HAL_80_2 2 +#define HAL_80_3 3 + +#define HAL_RU_SHIFT(num_80mhz_band, ru_index_per_80) \ + ((NUM_RU_BITS_PER80 * (num_80mhz_band)) + \ + (NUM_RU_BITS_PER20 * (ru_index_per_80))) + +/* MRU-996+484 */ +#define HAL_EHT_RU_996_484_0 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_0, 1)) | \ + (HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_1, 0))) +#define HAL_EHT_RU_996_484_1 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_1, 0))) +#define HAL_EHT_RU_996_484_2 ((HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 1))) +#define HAL_EHT_RU_996_484_3 ((HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 0))) +#define HAL_EHT_RU_996_484_4 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 1)) | \ + (HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996_484_5 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996_484_6 ((HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_3, 1))) +#define HAL_EHT_RU_996_484_7 ((HAL_EHT_RU_996 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_3, 0))) + +/* MRU-996x2+484 */ +#define HAL_EHT_RU_996x2_484_0 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_0, 1)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0))) +#define HAL_EHT_RU_996x2_484_1 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0))) +#define HAL_EHT_RU_996x2_484_2 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 1)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0))) +#define HAL_EHT_RU_996x2_484_3 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0))) +#define HAL_EHT_RU_996x2_484_4 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 1))) +#define HAL_EHT_RU_996x2_484_5 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 0))) +#define HAL_EHT_RU_996x2_484_6 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 1)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x2_484_7 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x2_484_8 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 1)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x2_484_9 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x2_484_10 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_3, 1))) +#define HAL_EHT_RU_996x2_484_11 ((HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x2 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_3, 0))) + +/* MRU-996x3+484 */ +#define HAL_EHT_RU_996x3_484_0 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_0, 1)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x3_484_1 ((HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x3_484_2 ((HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 1)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x3_484_3 ((HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x3_484_4 ((HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 1)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x3_484_5 ((HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_3, 0))) +#define HAL_EHT_RU_996x3_484_6 ((HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_3, 1))) +#define HAL_EHT_RU_996x3_484_7 ((HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_0, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_1, 0)) | \ + (HAL_EHT_RU_996x3 << HAL_RU_SHIFT(HAL_80_2, 0)) | \ + (HAL_EHT_RU_484 << HAL_RU_SHIFT(HAL_80_3, 0))) + +#define HAL_SET_RU_PER80(ru_320mhz, ru_per80, ru_idx_per80mhz, num_80mhz) \ + ((ru_320mhz) |= ((uint64_t)(ru_per80) << \ + (((num_80mhz) * NUM_RU_BITS_PER80) + \ + ((ru_idx_per80mhz) * NUM_RU_BITS_PER20)))) + +#define RU_26 1 +#define RU_52 2 +#define RU_106 4 +#define RU_242 9 +#define RU_484 18 +#define RU_996 37 +#define RU_2X996 74 +#define RU_3X996 111 +#define RU_4X996 148 +#define RU_52_26 RU_52 + RU_26 +#define RU_106_26 RU_106 + RU_26 +#define RU_484_242 RU_484 + RU_242 +#define RU_996_484 RU_996 + RU_484 +#define RU_996_484_242 RU_996 + RU_484_242 +#define RU_2X996_484 RU_2X996 + RU_484 +#define RU_3X996_484 RU_3X996 + RU_484 + +enum ath12k_eht_ru_size { + ATH12K_EHT_RU_26, + ATH12K_EHT_RU_52, + ATH12K_EHT_RU_106, + ATH12K_EHT_RU_242, + ATH12K_EHT_RU_484, + ATH12K_EHT_RU_996, + ATH12K_EHT_RU_996x2, + ATH12K_EHT_RU_996x4, + ATH12K_EHT_RU_52_26, + ATH12K_EHT_RU_106_26, + ATH12K_EHT_RU_484_242, + ATH12K_EHT_RU_996_484, + ATH12K_EHT_RU_996_484_242, + ATH12K_EHT_RU_996x2_484, + ATH12K_EHT_RU_996x3, + ATH12K_EHT_RU_996x3_484, + ATH12K_EHT_RU_INVALID, +}; + +#define REO2PPE_DST_RING_MAP 11 +#define REO_DEST_CTRL_IX_0_RING6_MAP_MASK 0xF +#define REO_DEST_CTRL_IX_0_RING6_MAP_SHFT 24 + +#define REO2PPE_DST_RING_MAP 11 +#define REO_DEST_CTRL_IX_0_RING6_MAP_MASK 0xF +#define REO_DEST_CTRL_IX_0_RING6_MAP_SHFT 24 + +/* U-SIG Common Mask */ +#define USIG_PHY_VERSION_KNOWN 0x00000001 +#define USIG_BW_KNOWN 0x00000002 +#define USIG_UL_DL_KNOWN 0x00000004 +#define USIG_BSS_COLOR_KNOWN 0x00000008 +#define USIG_TXOP_KNOWN 0x00000010 + +#define USIG_PHY_VERSION_SHIFT 12 +#define USIG_BW_SHIFT 15 +#define USIG_UL_DL_SHIFT 18 +#define USIG_BSS_COLOR_SHIFT 19 +#define USIG_TXOP_SHIFT 25 + +/* U-SIG MU/TB Value */ +#define USIG_DISREGARD_SHIFT 0 +#define USIG_PPDU_TYPE_N_COMP_MODE_SHIFT 6 +#define USIG_VALIDATE_SHIFT 8 + +#define USIG_MU_VALIDATE1_SHIFT 5 +#define USIG_MU_PUNCTURE_CH_INFO_SHIFT 9 +#define USIG_MU_VALIDATE2_SHIFT 12 +#define USIG_MU_EHT_SIG_MCS_SHIFT 15 +#define USIG_MU_NUM_EHT_SIG_SYM_SHIFT 17 + +#define USIG_TB_SPATIAL_REUSE_1_SHIFT 9 +#define USIG_TB_SPATIAL_REUSE_2_SHIFT 13 +#define USIG_TB_DISREGARD1_SHIFT 17 + +#define USIG_CRC_SHIFT 22 +#define USIG_TAIL_SHIFT 26 + +/* U-SIG MU/TB Mask */ +#define USIG_DISREGARD_KNOWN 0x00000001 +#define USIG_PPDU_TYPE_N_COMP_MODE_KNOWN 0x00000004 +#define USIG_VALIDATE_KNOWN 0x00000008 + +#define USIG_MU_VALIDATE1_KNOWN 0x00000002 +#define USIG_MU_PUNCTURE_CH_INFO_KNOWN 0x00000010 +#define USIG_MU_VALIDATE2_KNOWN 0x00000020 +#define USIG_MU_EHT_SIG_MCS_KNOWN 0x00000040 +#define USIG_MU_NUM_EHT_SIG_SYM_KNOWN 0x00000080 +#define USIG_TB_SPATIAL_REUSE_1_KNOWN 0x00000010 +#define USIG_TB_SPATIAL_REUSE_2_KNOWN 0x00000020 +#define USIG_TB_DISREGARD1_KNOWN 0x00000040 + +#define USIG_CRC_KNOWN 0x00000100 +#define USIG_TAIL_KNOWN 0x00000200 void ath12k_hal_reo_status_queue_stats(struct ath12k_base *ab, struct hal_tlv_64_hdr *tlv, diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal_tx.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_tx.c --- linux-6.4/drivers/net/wireless/ath/ath12k/hal_tx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_tx.c 2024-04-22 13:40:50.287868747 +0200 @@ -29,43 +29,6 @@ return dscp >> 3; } -void ath12k_hal_tx_cmd_desc_setup(struct ath12k_base *ab, - struct hal_tcl_data_cmd *tcl_cmd, - struct hal_tx_info *ti) -{ - tcl_cmd->buf_addr_info.info0 = - le32_encode_bits(ti->paddr, BUFFER_ADDR_INFO0_ADDR); - tcl_cmd->buf_addr_info.info1 = - le32_encode_bits(((uint64_t)ti->paddr >> HAL_ADDR_MSB_REG_SHIFT), - BUFFER_ADDR_INFO1_ADDR); - tcl_cmd->buf_addr_info.info1 |= - le32_encode_bits((ti->rbm_id), BUFFER_ADDR_INFO1_RET_BUF_MGR) | - le32_encode_bits(ti->desc_id, BUFFER_ADDR_INFO1_SW_COOKIE); - - tcl_cmd->info0 = - le32_encode_bits(ti->type, HAL_TCL_DATA_CMD_INFO0_DESC_TYPE) | - le32_encode_bits(ti->bank_id, HAL_TCL_DATA_CMD_INFO0_BANK_ID); - - tcl_cmd->info1 = - le32_encode_bits(ti->meta_data_flags, - HAL_TCL_DATA_CMD_INFO1_CMD_NUM); - - tcl_cmd->info2 = cpu_to_le32(ti->flags0) | - le32_encode_bits(ti->data_len, HAL_TCL_DATA_CMD_INFO2_DATA_LEN) | - le32_encode_bits(ti->pkt_offset, HAL_TCL_DATA_CMD_INFO2_PKT_OFFSET); - - tcl_cmd->info3 = cpu_to_le32(ti->flags1) | - le32_encode_bits(ti->tid, HAL_TCL_DATA_CMD_INFO3_TID) | - le32_encode_bits(ti->lmac_id, HAL_TCL_DATA_CMD_INFO3_PMAC_ID) | - le32_encode_bits(ti->vdev_id, HAL_TCL_DATA_CMD_INFO3_VDEV_ID); - - tcl_cmd->info4 = le32_encode_bits(ti->bss_ast_idx, - HAL_TCL_DATA_CMD_INFO4_SEARCH_INDEX) | - le32_encode_bits(ti->bss_ast_hash, - HAL_TCL_DATA_CMD_INFO4_CACHE_SET_NUM); - tcl_cmd->info5 = 0; -} - void ath12k_hal_tx_set_dscp_tid_map(struct ath12k_base *ab, int id) { u32 ctrl_reg_val; @@ -143,3 +106,36 @@ ath12k_hif_write32(ab, HAL_TCL_SW_CONFIG_BANK_ADDR + 4 * bank_id, bank_config); } + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +void ath12k_hal_tx_set_ppe_vp_entry(struct ath12k_base *ab, u32 ppe_vp_config, + u32 ppe_vp_idx) +{ + ath12k_hif_write32(ab, HAL_TX_PPE_VP_CONFIG_TABLE_ADDR + + HAL_TX_PPE_VP_CONFIG_TABLE_OFFSET * ppe_vp_idx, + ppe_vp_config); +} +#endif + +void ath12k_hal_tx_config_rbm_mapping(struct ath12k_base *ab,u8 ring_num, + u8 rbm_id, int ring_type) +{ + u32 curr_map, new_map; + + if (ring_type == HAL_PPE2TCL) + ring_num = ring_num + HAL_TCL_RBM_MAPPING_PPE2TCL_OFFSET; + else if (ring_type == HAL_TCL_CMD) + ring_num = ring_num + HAL_TCL_RBM_MAPPING_TCL_CMD_CREDIT_OFFSET; + + curr_map = ath12k_hif_read32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG + + HAL_TCL_RBM_MAPPING0_ADDR_OFFSET); + + /* Protect the other values and clear the specific fields to be updated */ + curr_map &= (~(HAL_TCL_RBM_MAPPING_BMSK << + (HAL_TCL_RBM_MAPPING_SHFT * ring_num))); + new_map = curr_map | ((HAL_TCL_RBM_MAPPING_BMSK & rbm_id) << + (HAL_TCL_RBM_MAPPING_SHFT * ring_num)); + + ath12k_hif_write32(ab, HAL_SEQ_WCSS_UMAC_TCL_REG + + HAL_TCL_RBM_MAPPING0_ADDR_OFFSET, new_map); +} diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hal_tx.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_tx.h --- linux-6.4/drivers/net/wireless/ath/ath12k/hal_tx.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hal_tx.h 2024-04-22 13:40:50.287868747 +0200 @@ -64,6 +64,8 @@ u8 tid; u16 peer_id; u32 rate_stats; + u32 buffer_timestamp; + u32 tsf; }; #define HAL_TX_PHY_DESC_INFO0_BF_TYPE GENMASK(17, 16) @@ -182,13 +184,28 @@ /* STA mode will have MCAST_PKT_CTRL instead of DSCP_TID_MAP bitfield */ #define HAL_TX_BANK_CONFIG_DSCP_TIP_MAP_ID GENMASK(22, 17) -void ath12k_hal_tx_cmd_desc_setup(struct ath12k_base *ab, - struct hal_tcl_data_cmd *tcl_cmd, - struct hal_tx_info *ti); +#define HAL_TX_PPE_VP_CONFIG_TABLE_ADDR 0x00a44194 +#define HAL_TX_PPE_VP_CONFIG_TABLE_OFFSET 4 + +#define HAL_TX_PPE_VP_CFG_VP_NUM GENMASK(7, 0) +#define HAL_TX_PPE_VP_CFG_PMAC_ID GENMASK(9, 8) +#define HAL_TX_PPE_VP_CFG_BANK_ID GENMASK(15, 10) +#define HAL_TX_PPE_VP_CFG_VDEV_ID GENMASK(23, 16) +#define HAL_TX_PPE_VP_CFG_SRCH_IDX_REG_NUM GENMASK(26, 24) +#define HAL_TX_PPE_VP_CFG_USE_PPE_INT_PRI BIT(27) +#define HAL_TX_PPE_VP_CFG_TO_FW BIT(28) +#define HAL_TX_PPE_VP_CFG_DROP_PREC_EN BIT(29) + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +void ath12k_hal_tx_set_ppe_vp_entry(struct ath12k_base *ab, u32 ppe_vp_config, + u32 ppe_vp_index); +#endif void ath12k_hal_tx_set_dscp_tid_map(struct ath12k_base *ab, int id); int ath12k_hal_reo_cmd_send(struct ath12k_base *ab, struct hal_srng *srng, enum hal_reo_cmd_type type, struct ath12k_hal_reo_cmd *cmd); void ath12k_hal_tx_configure_bank_register(struct ath12k_base *ab, u32 bank_config, u8 bank_id); +void ath12k_hal_tx_config_rbm_mapping(struct ath12k_base *ab,u8 ring_num, + u8 rbm_id, int ring_type); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hif.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hif.h --- linux-6.4/drivers/net/wireless/ath/ath12k/hif.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hif.h 2024-04-22 13:40:50.291868856 +0200 @@ -8,10 +8,14 @@ #define ATH12K_HIF_H #include "core.h" +#include "pci.h" struct ath12k_hif_ops { u32 (*read32)(struct ath12k_base *sc, u32 address); void (*write32)(struct ath12k_base *sc, u32 address, u32 data); + u32 (*cmem_read32)(struct ath12k_base *sc, u32 address); + void (*cmem_write32)(struct ath12k_base *sc, u32 address, u32 data); + u32 (*pmm_read32)(struct ath12k_base *sc, u32 address); void (*irq_enable)(struct ath12k_base *sc); void (*irq_disable)(struct ath12k_base *sc); int (*start)(struct ath12k_base *sc); @@ -30,8 +34,64 @@ void (*ce_irq_enable)(struct ath12k_base *ab); void (*ce_irq_disable)(struct ath12k_base *ab); void (*get_ce_msi_idx)(struct ath12k_base *ab, u32 ce_id, u32 *msi_idx); + int (*ssr_notifier_reg)(struct ath12k_base *ab); + int (*ssr_notifier_unreg)(struct ath12k_base *ab); + void (*config_static_window)(struct ath12k_base *ab); + int (*get_msi_irq)(struct ath12k_base *ab, unsigned int vector); + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + int (*ppeds_register_interrupts)(struct ath12k_base *ab, int type, int vector, + int ring_num); + void (*ppeds_free_interrupts)(struct ath12k_base *ab); + void (*ppeds_irq_enable)(struct ath12k_base *ab, enum ppeds_irq_type type); + void (*ppeds_irq_disable)(struct ath12k_base *ab, enum ppeds_irq_type type); +#endif + int (*dp_umac_reset_irq_config)(struct ath12k_base *ab); + void (*dp_umac_reset_enable_irq)(struct ath12k_base *ab); + void (*dp_umac_reset_free_irq)(struct ath12k_base *ab); }; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +static inline int ath12k_hif_ppeds_register_interrupts(struct ath12k_base *ab, int type, int vector, + int ring_num) +{ + if (!test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags)) + return 0; + + if (ab->hif.ops->ppeds_register_interrupts) + return ab->hif.ops->ppeds_register_interrupts(ab, type, vector, + ring_num); + return 0; +} + +static inline void ath12k_hif_ppeds_free_interrupts(struct ath12k_base *ab) +{ + if (!test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags)) + return; + + if (ab->hif.ops->ppeds_register_interrupts) + ab->hif.ops->ppeds_free_interrupts(ab); +} + +static inline void ath12k_hif_ppeds_irq_enable(struct ath12k_base *ab, enum ppeds_irq_type type) +{ + if (!test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags)) + return; + + if (ab->hif.ops->ppeds_irq_enable) + ab->hif.ops->ppeds_irq_enable(ab, type); +} + +static inline void ath12k_hif_ppeds_irq_disable(struct ath12k_base *ab, enum ppeds_irq_type type) +{ + if (!test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ab->dev_flags)) + return; + + if (ab->hif.ops->ppeds_irq_disable) + ab->hif.ops->ppeds_irq_disable(ab, type); +} +#endif + static inline int ath12k_hif_map_service_to_pipe(struct ath12k_base *ab, u16 service_id, u8 *ul_pipe, u8 *dl_pipe) { @@ -72,6 +132,22 @@ *msi_data_idx = ce_id; } +static inline int ath12k_hif_ssr_notifier_reg(struct ath12k_base *ab) +{ + if (!ab->hif.ops->ssr_notifier_reg) + return 0; + + return ab->hif.ops->ssr_notifier_reg(ab); +} + +static inline int ath12k_hif_ssr_notifier_unreg(struct ath12k_base *ab) +{ + if (!ab->hif.ops->ssr_notifier_unreg) + return 0; + + return ab->hif.ops->ssr_notifier_unreg(ab); +} + static inline void ath12k_hif_ce_irq_enable(struct ath12k_base *ab) { if (ab->hif.ops->ce_irq_enable) @@ -131,6 +207,23 @@ ab->hif.ops->write32(ab, address, data); } +static inline u32 ath12k_hif_cmem_read32(struct ath12k_base *ab, u32 address) +{ + return ab->hif.ops->cmem_read32(ab, address); +} + +static inline u32 ath12k_hif_pmm_read32(struct ath12k_base *ab, u32 offset) +{ + return ab->hif.ops->pmm_read32(ab, offset); +} + +static inline void ath12k_hif_cmem_write32(struct ath12k_base *ab, u32 address, + u32 data) +{ + ab->hif.ops->cmem_write32(ab, address, data); +} + + static inline int ath12k_hif_power_up(struct ath12k_base *ab) { return ab->hif.ops->power_up(ab); @@ -141,4 +234,43 @@ ab->hif.ops->power_down(ab); } +static inline void ath12k_hif_config_static_window(struct ath12k_base *ab) +{ + if (!ab->hif.ops->config_static_window) + return; + + ab->hif.ops->config_static_window(ab); +} + +static inline int ath12k_hif_get_msi_irq(struct ath12k_base *ab, unsigned int vector) +{ + if (!ab->hif.ops->get_msi_irq) + return -EOPNOTSUPP; + + return ab->hif.ops->get_msi_irq(ab, vector); +} + +static inline int ath12k_hif_dp_umac_reset_irq_config(struct ath12k_base *ab) +{ + if (ab->hif.ops->dp_umac_reset_irq_config) + return ab->hif.ops->dp_umac_reset_irq_config(ab); + + return 0; +} + +static inline void ath12k_hif_dp_umac_reset_enable_irq(struct ath12k_base *ab) +{ + if (ab->hif.ops->dp_umac_reset_enable_irq) + return ab->hif.ops->dp_umac_reset_enable_irq(ab); + + return; +} + +static inline void ath12k_hif_dp_umac_reset_free_irq(struct ath12k_base *ab) +{ + if (ab->hif.ops->dp_umac_reset_free_irq) + return ab->hif.ops->dp_umac_reset_free_irq(ab); + + return; +} #endif /* ATH12K_HIF_H */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/htc.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/htc.c --- linux-6.4/drivers/net/wireless/ath/ath12k/htc.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/htc.c 2024-04-22 13:40:50.291868856 +0200 @@ -81,6 +81,8 @@ struct ath12k_base *ab = htc->ab; int credits = 0; int ret; + bool credit_flow_enabled = (ab->hw_params->credit_flow && + ep->tx_credit_flow_enabled); if (eid >= ATH12K_HTC_EP_COUNT) { ath12k_warn(ab, "Invalid endpoint id: %d\n", eid); @@ -89,7 +91,7 @@ skb_push(skb, sizeof(struct ath12k_htc_hdr)); - if (ep->tx_credit_flow_enabled) { + if (credit_flow_enabled) { credits = DIV_ROUND_UP(skb->len, htc->target_credit_size); spin_lock_bh(&htc->tx_lock); if (ep->tx_credits < credits) { @@ -109,6 +111,7 @@ ath12k_htc_prepare_tx_skb(ep, skb); + skb_cb->eid = eid; skb_cb->paddr = dma_map_single(dev, skb->data, skb->len, DMA_TO_DEVICE); ret = dma_mapping_error(dev, skb_cb->paddr); if (ret) { @@ -125,7 +128,7 @@ err_unmap: dma_unmap_single(dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE); err_credits: - if (ep->tx_credit_flow_enabled) { + if (credit_flow_enabled) { spin_lock_bh(&htc->tx_lock); ep->tx_credits += credits; ath12k_dbg(ab, ATH12K_DBG_HTC, @@ -202,6 +205,7 @@ break; } + if (ab->hw_params->credit_flow) { switch (record->hdr.id) { case ATH12K_HTC_RECORD_CREDITS: len = sizeof(struct ath12k_htc_credit_report); @@ -220,6 +224,7 @@ record->hdr.id, record->hdr.len); break; } + } if (status) break; @@ -244,6 +249,29 @@ complete(&ab->htc_suspend); } +void ath12k_htc_tx_completion_handler(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct ath12k_htc *htc = &ab->htc; + struct ath12k_htc_ep *ep; + void (*ep_tx_complete)(struct ath12k_base *, struct sk_buff *); + u8 eid; + + eid = ATH12K_SKB_CB(skb)->eid; + if (eid >= ATH12K_HTC_EP_COUNT) + return; + + ep = &htc->endpoint[eid]; + spin_lock_bh(&htc->tx_lock); + ep_tx_complete = ep->ep_ops.ep_tx_complete; + spin_unlock_bh(&htc->tx_lock); + if (!ep_tx_complete) { + dev_kfree_skb_any(skb); + return; + } + ep_tx_complete(htc->ab, skb); +} + void ath12k_htc_rx_completion_handler(struct ath12k_base *ab, struct sk_buff *skb) { @@ -606,12 +634,19 @@ disable_credit_flow_ctrl = true; } + if (!ab->hw_params->credit_flow) { + flags |= ATH12K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL; + disable_credit_flow_ctrl = true; + } + req_msg->flags_len = le32_encode_bits(flags, HTC_SVC_MSG_CONNECTIONFLAGS); req_msg->msg_svc_id |= le32_encode_bits(conn_req->service_id, HTC_SVC_MSG_SERVICE_ID); reinit_completion(&htc->ctl_resp); + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags)) + clear_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); status = ath12k_htc_send(htc, ATH12K_HTC_EP_0, skb); if (status) { kfree_skb(skb); @@ -730,7 +765,10 @@ msg->msg_id = le32_encode_bits(ATH12K_HTC_MSG_SETUP_COMPLETE_EX_ID, HTC_MSG_MESSAGEID); + if (ab->hw_params->credit_flow) ath12k_dbg(ab, ATH12K_DBG_HTC, "HTC is using TX credit flow control\n"); + else + msg->flags |= ATH12K_GLOBAL_DISABLE_CREDIT_FLOW; status = ath12k_htc_send(htc, ATH12K_HTC_EP_0, skb); if (status) { diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/htc.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/htc.h --- linux-6.4/drivers/net/wireless/ath/ath12k/htc.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/htc.h 2024-04-22 13:40:50.291868856 +0200 @@ -81,6 +81,8 @@ ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_ONE_HALF, ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_THREE_FOURTHS, ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_UNITY, + ATH12K_HTC_CONN_FLAGS_REDUCE_CREDIT_DRIBBLE = 0x4, + ATH12K_HTC_CONN_FLAGS_DISABLE_CREDIT_FLOW_CTRL = 0x8, }; #define ATH12K_HTC_CONN_FLAGS_THRESHOLD_LEVEL_MASK GENMASK(1, 0) @@ -117,6 +119,8 @@ __le32 svc_meta_pad; } __packed; +#define ATH12K_GLOBAL_DISABLE_CREDIT_FLOW BIT(1) + struct ath12k_htc_setup_complete_extended { __le32 msg_id; __le32 flags; @@ -312,5 +316,7 @@ struct sk_buff *ath12k_htc_alloc_skb(struct ath12k_base *ar, int size); void ath12k_htc_rx_completion_handler(struct ath12k_base *ar, struct sk_buff *skb); +void ath12k_htc_tx_completion_handler(struct ath12k_base *ab, + struct sk_buff *skb); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hw.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hw.c --- linux-6.4/drivers/net/wireless/ath/ath12k/hw.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hw.c 2024-04-22 13:41:34.453075384 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -45,6 +45,37 @@ return false; } +static u8 ath12k_hw_ipq5332_mac_from_pdev_id(int pdev_idx) +{ + return pdev_idx; +} + +static int ath12k_hw_mac_id_to_pdev_id_ipq5332(const struct ath12k_hw_params *hw, + int mac_id) +{ + return mac_id; +} + +static int ath12k_hw_mac_id_to_srng_id_ipq5332(const struct ath12k_hw_params *hw, + int mac_id) +{ + return 0; +} + +static u8 ath12k_hw_get_ring_selector_ipq5332(struct sk_buff *skb) +{ + return smp_processor_id(); +} + +static bool ath12k_dp_srng_is_comp_ring_ipq5332(int ring_num) +{ + if (ring_num < 3 || ring_num == 4) + return true; + + return false; +} + + static int ath12k_hw_mac_id_to_pdev_id_wcn7850(const struct ath12k_hw_params *hw, int mac_id) { @@ -88,10 +119,24 @@ .dp_srng_is_tx_comp_ring = ath12k_dp_srng_is_comp_ring_wcn7850, }; +static const struct ath12k_hw_ops ipq5332_ops = { + .get_hw_mac_from_pdev_id = ath12k_hw_ipq5332_mac_from_pdev_id, + .mac_id_to_pdev_id = ath12k_hw_mac_id_to_pdev_id_ipq5332, + .mac_id_to_srng_id = ath12k_hw_mac_id_to_srng_id_ipq5332, + .rxdma_ring_sel_config = ath12k_dp_rxdma_ring_sel_config_qcn9274, + .get_ring_selector = ath12k_hw_get_ring_selector_ipq5332, + .dp_srng_is_tx_comp_ring = ath12k_dp_srng_is_comp_ring_ipq5332, +}; + + #define ATH12K_TX_RING_MASK_0 0x1 #define ATH12K_TX_RING_MASK_1 0x2 #define ATH12K_TX_RING_MASK_2 0x4 #define ATH12K_TX_RING_MASK_3 0x8 +/* ATH12K_TX_RING_MASK_4 corresponds to the interrupt mask + * for the 4th TX Data ring which uses WBM2SW4RELEASE and + * hence uses the mask with 4th bit set + */ #define ATH12K_TX_RING_MASK_4 0x10 #define ATH12K_RX_RING_MASK_0 0x1 @@ -106,6 +151,8 @@ #define ATH12K_REO_STATUS_RING_MASK_0 0x1 #define ATH12K_HOST2RXDMA_RING_MASK_0 0x1 +#define ATH12K_HOST2RXDMA_RING_MASK_1 0x2 +#define ATH12K_HOST2RXDMA_RING_MASK_2 0x4 #define ATH12K_RX_MON_RING_MASK_0 0x1 #define ATH12K_RX_MON_RING_MASK_1 0x2 @@ -114,6 +161,12 @@ #define ATH12K_TX_MON_RING_MASK_0 0x1 #define ATH12K_TX_MON_RING_MASK_1 0x2 +#define ATH12K_PPE2TCL_RING_MASK_0 0x1 +#define ATH12K_REO2PPE_RING_MASK_0 0x1 +#define ATH12K_PPE_WBM2SW_RELEASE_RING_MASK_0 0x1 +#define ATH12K_PPE_WBM2SW_RELEASE_RING_MASK_0 0x1 +#define ATH12K_UMAC_RESET_INTR_MASK_0 0x1 + /* Target firmware's Copy Engine configuration. */ static const struct ce_pipe_config ath12k_target_ce_config_wlan_qcn9274[] = { /* CE0: host->target HTC control and raw streams */ @@ -531,18 +584,304 @@ }, }; -static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = { +static const struct ce_pipe_config ath12k_target_ce_config_wlan_ipq5332[] = { + /* host->target HTC control and raw streams */ + { + .pipenum = __cpu_to_le32(0), + .pipedir = __cpu_to_le32(PIPEDIR_OUT), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* target->host HTT */ + { + .pipenum = __cpu_to_le32(1), + .pipedir = __cpu_to_le32(PIPEDIR_IN), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* target->host WMI + HTC control */ + { + .pipenum = __cpu_to_le32(2), + .pipedir = __cpu_to_le32(PIPEDIR_IN), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* host->target WMI */ + { + .pipenum = __cpu_to_le32(3), + .pipedir = __cpu_to_le32(PIPEDIR_OUT), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* host->target HTT */ + { + .pipenum = __cpu_to_le32(4), + .pipedir = __cpu_to_le32(PIPEDIR_OUT), + .nentries = __cpu_to_le32(256), + .nbytes_max = __cpu_to_le32(256), + .flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR), + .reserved = __cpu_to_le32(0), + }, + /* Target -> host PKTLOG */ + { + .pipenum = __cpu_to_le32(5), + .pipedir = __cpu_to_le32(PIPEDIR_IN), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* Reserved for target autonomous HIF_memcpy */ + { + .pipenum = __cpu_to_le32(6), + .pipedir = __cpu_to_le32(PIPEDIR_INOUT), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(16384), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* CE7 Reserved for CV Prefetch */ + { + .pipenum = __cpu_to_le32(7), + .pipedir = __cpu_to_le32(PIPEDIR_OUT), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* CE8 Reserved for target generic HIF memcpy */ + { + .pipenum = __cpu_to_le32(8), + .pipedir = __cpu_to_le32(PIPEDIR_INOUT), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(16384), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* CE9 WMI logging/CFR/Spectral/Radar/ */ + { + .pipenum = __cpu_to_le32(9), + .pipedir = __cpu_to_le32(PIPEDIR_IN), + .nentries = __cpu_to_le32(32), + .nbytes_max = __cpu_to_le32(2048), + .flags = __cpu_to_le32(CE_ATTR_FLAGS), + .reserved = __cpu_to_le32(0), + }, + /* Unused TBD */ + { + .pipenum = __cpu_to_le32(10), + .pipedir = __cpu_to_le32(PIPEDIR_NONE), + .nentries = __cpu_to_le32(0), + .nbytes_max = __cpu_to_le32(0), + .flags = __cpu_to_le32(0), + .reserved = __cpu_to_le32(0), + }, + /* Unused TBD */ + { + .pipenum = __cpu_to_le32(11), + .pipedir = __cpu_to_le32(PIPEDIR_NONE), + .nentries = __cpu_to_le32(0), + .nbytes_max = __cpu_to_le32(0), + .flags = __cpu_to_le32(0), + .reserved = __cpu_to_le32(0), + }, +}; + +static const struct service_to_pipe ath12k_target_service_to_ce_map_wlan_ipq5332[] = { + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(3), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VO), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(2), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(3), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BK), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(2), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(3), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_BE), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(2), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(3), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_DATA_VI), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(2), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(3), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(2), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(0), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_RSVD_CTRL), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(1), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(0), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_TEST_RAW_STREAMS), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(1), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG), + __cpu_to_le32(PIPEDIR_OUT), + __cpu_to_le32(4), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_HTT_DATA_MSG), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(1), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_PKT_LOG), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(5), + }, + { + __cpu_to_le32(ATH12K_HTC_SVC_ID_WMI_CONTROL_DIAG), + __cpu_to_le32(PIPEDIR_IN), + __cpu_to_le32(9), + }, + /* (Additions here) */ + + { /* must be last */ + __cpu_to_le32(0), + __cpu_to_le32(0), + __cpu_to_le32(0), + }, +}; + +static struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn9274 = { .tx = { ATH12K_TX_RING_MASK_0, ATH12K_TX_RING_MASK_1, ATH12K_TX_RING_MASK_2, - ATH12K_TX_RING_MASK_3, + 0, 0, 0, 0, 0, 0, 0, 0, + ATH12K_TX_RING_MASK_4, + 0, 0, 0 }, .rx_mon_dest = { - 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, ATH12K_RX_MON_RING_MASK_0, ATH12K_RX_MON_RING_MASK_1, ATH12K_RX_MON_RING_MASK_2, + 0, 0, 0, 0 + }, + .rx = { + 0, 0, 0, 0, + ATH12K_RX_RING_MASK_0, + ATH12K_RX_RING_MASK_1, + ATH12K_RX_RING_MASK_2, + ATH12K_RX_RING_MASK_3, + 0, 0, 0, 0, + 0, 0, 0 + }, + .rx_err = { + 0, 0, 0, + ATH12K_RX_ERR_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0 + }, + .rx_wbm_rel = { + 0, 0, 0, + ATH12K_RX_WBM_REL_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0 + }, + .reo_status = { + 0, 0, 0, + ATH12K_REO_STATUS_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0 + }, + .host2rxdma = { + 0, 0, 0, + ATH12K_HOST2RXDMA_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0 + }, + .tx_mon_dest = { + ATH12K_TX_MON_RING_MASK_0, + ATH12K_TX_MON_RING_MASK_1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0 + }, + .ppe2tcl = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + ATH12K_PPE2TCL_RING_MASK_0, 0, 0 + }, + .reo2ppe = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, ATH12K_REO2PPE_RING_MASK_0, 0 + }, +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + .wbm2sw6_ppeds_tx_cmpln = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, ATH12K_PPE_WBM2SW_RELEASE_RING_MASK_0 + }, +#endif + .umac_dp_reset = { + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + ATH12K_UMAC_RESET_INTR_MASK_0 + }, +}; + +static struct ath12k_hw_ring_mask ath12k_hw_ring_mask_ipq5332 = { + .tx = { + ATH12K_TX_RING_MASK_0, + ATH12K_TX_RING_MASK_1, + ATH12K_TX_RING_MASK_2, + ATH12K_TX_RING_MASK_4, + 0, 0, 0, 0, 0, 0, 0, 0, + }, + .rx_mon_dest = { + 0, 0, 0, 0, 0, 0, 0, 0, + ATH12K_RX_MON_RING_MASK_0, + 0, 0, 0, }, .rx = { 0, 0, 0, 0, @@ -550,30 +889,36 @@ ATH12K_RX_RING_MASK_1, ATH12K_RX_RING_MASK_2, ATH12K_RX_RING_MASK_3, + 0, 0, 0, 0, }, .rx_err = { 0, 0, 0, ATH12K_RX_ERR_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, }, .rx_wbm_rel = { 0, 0, 0, ATH12K_RX_WBM_REL_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, }, .reo_status = { 0, 0, 0, ATH12K_REO_STATUS_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, }, .host2rxdma = { 0, 0, 0, ATH12K_HOST2RXDMA_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, }, .tx_mon_dest = { ATH12K_TX_MON_RING_MASK_0, ATH12K_TX_MON_RING_MASK_1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, }; -static const struct ath12k_hw_ring_mask ath12k_hw_ring_mask_wcn7850 = { +static struct ath12k_hw_ring_mask ath12k_hw_ring_mask_wcn7850 = { .tx = { ATH12K_TX_RING_MASK_0, ATH12K_TX_RING_MASK_2, @@ -603,6 +948,70 @@ }, }; +static struct ath12k_hw_ring_mask ath12k_hw_ring_mask_qcn6432 = { + .tx = { + ATH12K_TX_RING_MASK_0, + ATH12K_TX_RING_MASK_1, + ATH12K_TX_RING_MASK_2 | ATH12K_TX_RING_MASK_4, + 0, 0, 0, 0, 0, 0, 0, 0, + }, + .rx_mon_dest = { + 0, 0, + ATH12K_RX_MON_RING_MASK_0, + ATH12K_RX_MON_RING_MASK_1, + ATH12K_RX_MON_RING_MASK_2, + 0, 0, 0, 0, 0, 0, 0, + }, + .rx = { + 0, 0, 0, + ATH12K_RX_RING_MASK_0, + ATH12K_RX_RING_MASK_1, + ATH12K_RX_RING_MASK_2 | ATH12K_RX_RING_MASK_3, + 0, 0, 0, 0, 0, 0, + }, + .rx_err = { + 0, 0, + ATH12K_RX_ERR_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + .rx_wbm_rel = { + 0, 0, + ATH12K_RX_WBM_REL_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + .reo_status = { + 0, 0, + ATH12K_REO_STATUS_RING_MASK_0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, + .host2rxdma = { + 0, 0, + ATH12K_HOST2RXDMA_RING_MASK_0, + ATH12K_HOST2RXDMA_RING_MASK_1, + ATH12K_HOST2RXDMA_RING_MASK_2, + 0, 0, 0, 0, 0, 0, 0, + }, + .tx_mon_dest = { + ATH12K_TX_MON_RING_MASK_0, + ATH12K_TX_MON_RING_MASK_1, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + }, +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + .ppe2tcl = { + 0, 0, 0, 0, + 0, 0, ATH12K_PPE2TCL_RING_MASK_0, 0, 0, 0, 0, 0, + }, + .reo2ppe = { + 0, 0, 0, 0, + 0, 0, 0, ATH12K_REO2PPE_RING_MASK_0, 0, 0, 0, 0, + }, + .wbm2sw6_ppeds_tx_cmpln = { + 0, 0, 0, 0, + 0, 0, 0, 0, ATH12K_PPE_WBM2SW_RELEASE_RING_MASK_0, 0, 0, 0, + }, +#endif +}; + static const struct ath12k_hw_regs qcn9274_v1_regs = { /* SW2TCL(x) R0 ring configuration address */ .hal_tcl1_ring_id = 0x00000908, @@ -615,34 +1024,14 @@ .hal_tcl1_ring_msi1_base_msb = 0x0000094c, .hal_tcl1_ring_msi1_data = 0x00000950, .hal_tcl_ring_base_lsb = 0x00000b58, + .hal_tcl1_ring_base_lsb = 0x00000900, + .hal_tcl1_ring_base_msb = 0x00000904, + .hal_tcl2_ring_base_lsb = 0x00000978, + /* TCL STATUS ring address */ .hal_tcl_status_ring_base_lsb = 0x00000d38, - .hal_wbm_idle_ring_base_lsb = 0x00000d0c, - .hal_wbm_idle_ring_misc_addr = 0x00000d1c, - .hal_wbm_r0_idle_list_cntl_addr = 0x00000210, - .hal_wbm_r0_idle_list_size_addr = 0x00000214, - .hal_wbm_scattered_ring_base_lsb = 0x00000220, - .hal_wbm_scattered_ring_base_msb = 0x00000224, - .hal_wbm_scattered_desc_head_info_ix0 = 0x00000230, - .hal_wbm_scattered_desc_head_info_ix1 = 0x00000234, - .hal_wbm_scattered_desc_tail_info_ix0 = 0x00000240, - .hal_wbm_scattered_desc_tail_info_ix1 = 0x00000244, - .hal_wbm_scattered_desc_ptr_hp_addr = 0x0000024c, - - .hal_wbm_sw_release_ring_base_lsb = 0x0000034c, - .hal_wbm_sw1_release_ring_base_lsb = 0x000003c4, - .hal_wbm0_release_ring_base_lsb = 0x00000dd8, - .hal_wbm1_release_ring_base_lsb = 0x00000e50, - - /* PCIe base address */ - .pcie_qserdes_sysclk_en_sel = 0x01e0c0a8, - .pcie_pcs_osc_dtct_config_base = 0x01e0d45c, - - /* PPE release ring address */ - .hal_ppe_rel_ring_base = 0x0000043c, - /* REO DEST ring address */ .hal_reo2_ring_base = 0x0000055c, .hal_reo1_misc_ctrl_addr = 0x00000b7c, @@ -650,6 +1039,8 @@ .hal_reo1_sw_cookie_cfg1 = 0x00000054, .hal_reo1_qdesc_lut_base0 = 0x00000058, .hal_reo1_qdesc_lut_base1 = 0x0000005c, + .hal_reo1_qdesc_addr_read = 0x00000060, + .hal_reo1_ring_base_lsb = 0x000004e4, .hal_reo1_ring_base_msb = 0x000004e8, .hal_reo1_ring_id = 0x000004ec, @@ -677,6 +1068,43 @@ /* REO status ring address */ .hal_reo_status_ring_base = 0x00000a84, + + /* WBM idle link ring address */ + .hal_wbm_idle_ring_base_lsb = 0x00000d0c, + .hal_wbm_idle_ring_misc_addr = 0x00000d1c, + .hal_wbm_r0_idle_list_cntl_addr = 0x00000210, + .hal_wbm_r0_idle_list_size_addr = 0x00000214, + .hal_wbm_scattered_ring_base_lsb = 0x00000220, + .hal_wbm_scattered_ring_base_msb = 0x00000224, + .hal_wbm_scattered_desc_head_info_ix0 = 0x00000230, + .hal_wbm_scattered_desc_head_info_ix1 = 0x00000234, + .hal_wbm_scattered_desc_tail_info_ix0 = 0x00000240, + .hal_wbm_scattered_desc_tail_info_ix1 = 0x00000244, + .hal_wbm_scattered_desc_ptr_hp_addr = 0x0000024c, + + /* SW2WBM release ring address */ + .hal_wbm_sw_release_ring_base_lsb = 0x0000034c, + .hal_wbm_sw1_release_ring_base_lsb = 0x000003c4, + + /* WBM2SW release ring address */ + .hal_wbm0_release_ring_base_lsb = 0x00000dd8, + .hal_wbm1_release_ring_base_lsb = 0x00000e50, + + /* reo2ppe ring address */ + .hal_reo2ppe_ring_base = 0x00000938, + + /* ppe2tcl ring base address */ + .hal_tcl_ppe2tcl_ring_base_lsb = 0x00000c48, + + /* PCIe base address */ + .pcie_qserdes_sysclk_en_sel = 0x01e0c0a8, + .pcie_pcs_osc_dtct_config_base = 0x01e0d45c, + + /* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01b80000, + .hal_umac_ce0_dest_reg_base = 0x01b81000, + .hal_umac_ce1_src_reg_base = 0x01b82000, + .hal_umac_ce1_dest_reg_base = 0x01b83000, }; static const struct ath12k_hw_regs qcn9274_v2_regs = { @@ -691,10 +1119,52 @@ .hal_tcl1_ring_msi1_base_msb = 0x0000094c, .hal_tcl1_ring_msi1_data = 0x00000950, .hal_tcl_ring_base_lsb = 0x00000b58, + .hal_tcl1_ring_base_lsb = 0x00000900, + .hal_tcl1_ring_base_msb = 0x00000904, + .hal_tcl2_ring_base_lsb = 0x00000978, /* TCL STATUS ring address */ .hal_tcl_status_ring_base_lsb = 0x00000d38, + /* REO DEST ring address */ + .hal_reo2_ring_base = 0x00000578, + .hal_reo1_misc_ctrl_addr = 0x00000b9c, + .hal_reo1_sw_cookie_cfg0 = 0x0000006c, + .hal_reo1_sw_cookie_cfg1 = 0x00000070, + .hal_reo1_qdesc_lut_base0 = 0x00000074, + .hal_reo1_qdesc_lut_base1 = 0x00000078, + .hal_reo1_qdesc_addr_read = 0x0000007c, + .hal_reo1_qdesc_max_peerid = 0x00000088, + .hal_reo1_ring_base_lsb = 0x00000500, + .hal_reo1_ring_base_msb = 0x00000504, + .hal_reo1_ring_id = 0x00000508, + .hal_reo1_ring_misc = 0x00000510, + .hal_reo1_ring_hp_addr_lsb = 0x00000514, + .hal_reo1_ring_hp_addr_msb = 0x00000518, + .hal_reo1_ring_producer_int_setup = 0x00000524, + .hal_reo1_ring_msi1_base_lsb = 0x00000548, + .hal_reo1_ring_msi1_base_msb = 0x0000054C, + .hal_reo1_ring_msi1_data = 0x00000550, + .hal_reo1_aging_thres_ix0 = 0x00000B28, + .hal_reo1_aging_thres_ix1 = 0x00000B2C, + .hal_reo1_aging_thres_ix2 = 0x00000B30, + .hal_reo1_aging_thres_ix3 = 0x00000B34, + + /* REO Exception ring address */ + .hal_reo2_sw0_ring_base = 0x000008c0, + + /* REO Reinject ring address */ + .hal_sw2reo_ring_base = 0x00000320, + .hal_sw2reo1_ring_base = 0x00000398, + + /* REO cmd ring address */ + .hal_reo_cmd_ring_base = 0x000002A8, + + /* REO status ring address */ + .hal_reo_status_ring_base = 0x00000aa0, + + .hal_reo1_qdesc_addr_read = 0x0000007c, + /* WBM idle link ring address */ .hal_wbm_idle_ring_base_lsb = 0x00000d3c, .hal_wbm_idle_ring_misc_addr = 0x00000d4c, @@ -716,12 +1186,41 @@ .hal_wbm0_release_ring_base_lsb = 0x00000e08, .hal_wbm1_release_ring_base_lsb = 0x00000e80, + /* reo2ppe ring base address */ + .hal_reo2ppe_ring_base = 0x00000938, + + /* ppe2tcl ring base address */ + .hal_tcl_ppe2tcl_ring_base_lsb = 0x00000c48, + /* PCIe base address */ .pcie_qserdes_sysclk_en_sel = 0x01e0c0a8, .pcie_pcs_osc_dtct_config_base = 0x01e0d45c, - /* PPE release ring address */ - .hal_ppe_rel_ring_base = 0x0000046c, + /* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01b80000, + .hal_umac_ce0_dest_reg_base = 0x01b81000, + .hal_umac_ce1_src_reg_base = 0x01b82000, + .hal_umac_ce1_dest_reg_base = 0x01b83000, +}; + +const struct ath12k_hw_regs ipq5332_regs = { + /* SW2TCL(x) R0 ring configuration address */ + .hal_tcl1_ring_id = 0x00000918, + .hal_tcl1_ring_misc = 0x00000920, + .hal_tcl1_ring_tp_addr_lsb = 0x0000092c, + .hal_tcl1_ring_tp_addr_msb = 0x00000930, + .hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000940, + .hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000944, + .hal_tcl1_ring_msi1_base_lsb = 0x00000958, + .hal_tcl1_ring_msi1_base_msb = 0x0000095c, + .hal_tcl1_ring_base_lsb = 0x00000910, + .hal_tcl1_ring_base_msb = 0x00000914, + .hal_tcl1_ring_msi1_data = 0x00000960, + .hal_tcl2_ring_base_lsb = 0x00000988, + .hal_tcl_ring_base_lsb = 0x00000b68, + + /* TCL STATUS ring address */ + .hal_tcl_status_ring_base_lsb = 0x00000d48, /* REO DEST ring address */ .hal_reo2_ring_base = 0x00000578, @@ -730,6 +1229,8 @@ .hal_reo1_sw_cookie_cfg1 = 0x00000070, .hal_reo1_qdesc_lut_base0 = 0x00000074, .hal_reo1_qdesc_lut_base1 = 0x00000078, + .hal_reo1_qdesc_addr_read = 0x0000007c, + .hal_reo1_qdesc_max_peerid = 0x00000088, .hal_reo1_ring_base_lsb = 0x00000500, .hal_reo1_ring_base_msb = 0x00000504, .hal_reo1_ring_id = 0x00000508, @@ -757,6 +1258,33 @@ /* REO status ring address */ .hal_reo_status_ring_base = 0x00000aa0, + + /* WBM idle link ring address */ + .hal_wbm_idle_ring_base_lsb = 0x00000d3c, + .hal_wbm_idle_ring_misc_addr = 0x00000d4c, + .hal_wbm_r0_idle_list_cntl_addr = 0x00000240, + .hal_wbm_r0_idle_list_size_addr = 0x00000244, + .hal_wbm_scattered_ring_base_lsb = 0x00000250, + .hal_wbm_scattered_ring_base_msb = 0x00000254, + .hal_wbm_scattered_desc_head_info_ix0 = 0x00000260, + .hal_wbm_scattered_desc_head_info_ix1 = 0x00000264, + .hal_wbm_scattered_desc_tail_info_ix0 = 0x00000270, + .hal_wbm_scattered_desc_tail_info_ix1 = 0x00000274, + .hal_wbm_scattered_desc_ptr_hp_addr = 0x0000027c, + + /* SW2WBM release ring address */ + .hal_wbm_sw_release_ring_base_lsb = 0x0000037c, + + /* WBM2SW release ring address */ + .hal_wbm0_release_ring_base_lsb = 0x00000e08, + .hal_wbm1_release_ring_base_lsb = 0x00000e80, + + /* CE base address */ + .hal_umac_ce0_src_reg_base = 0x00740000, + .hal_umac_ce0_dest_reg_base = 0x00741000, + .hal_umac_ce1_src_reg_base = 0x00742000, + .hal_umac_ce1_dest_reg_base = 0x00743000, + }; static const struct ath12k_hw_regs wcn7850_regs = { @@ -771,6 +1299,9 @@ .hal_tcl1_ring_msi1_base_msb = 0x0000094c, .hal_tcl1_ring_msi1_data = 0x00000950, .hal_tcl_ring_base_lsb = 0x00000b58, + .hal_tcl1_ring_base_lsb = 0x00000900, + .hal_tcl1_ring_base_msb = 0x00000904, + .hal_tcl2_ring_base_lsb = 0x00000978, /* TCL STATUS ring address */ .hal_tcl_status_ring_base_lsb = 0x00000d38, @@ -796,9 +1327,6 @@ .pcie_qserdes_sysclk_en_sel = 0x01e0e0a8, .pcie_pcs_osc_dtct_config_base = 0x01e0f45c, - /* PPE release ring address */ - .hal_ppe_rel_ring_base = 0x0000043c, - /* REO DEST ring address */ .hal_reo2_ring_base = 0x0000055c, .hal_reo1_misc_ctrl_addr = 0x00000b7c, @@ -833,6 +1361,105 @@ /* REO status ring address */ .hal_reo_status_ring_base = 0x00000a84, + + /* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01b80000, + .hal_umac_ce0_dest_reg_base = 0x01b81000, + .hal_umac_ce1_src_reg_base = 0x01b82000, + .hal_umac_ce1_dest_reg_base = 0x01b83000, +}; + +const struct ath12k_hw_regs qcn6432_regs = { + /* SW2TCL(x) R0 ring configuration address */ + .hal_tcl1_ring_id = 0x00000918, + .hal_tcl1_ring_misc = 0x00000920, + .hal_tcl1_ring_tp_addr_lsb = 0x0000092c, + .hal_tcl1_ring_tp_addr_msb = 0x00000930, + .hal_tcl1_ring_consumer_int_setup_ix0 = 0x00000940, + .hal_tcl1_ring_consumer_int_setup_ix1 = 0x00000944, + .hal_tcl1_ring_msi1_base_lsb = 0x00000958, + .hal_tcl1_ring_msi1_base_msb = 0x0000095c, + .hal_tcl1_ring_base_lsb = 0x00000910, + .hal_tcl1_ring_base_msb = 0x00000914, + .hal_tcl1_ring_msi1_data = 0x00000960, + .hal_tcl2_ring_base_lsb = 0x00000988, + .hal_tcl_ring_base_lsb = 0x00000b68, + + /* TCL STATUS ring address */ + .hal_tcl_status_ring_base_lsb = 0x00000d48, + + /* REO DEST ring address */ + .hal_reo2_ring_base = 0x00000578, + .hal_reo1_misc_ctrl_addr = 0x00000b9c, + .hal_reo1_sw_cookie_cfg0 = 0x0000006c, + .hal_reo1_sw_cookie_cfg1 = 0x00000070, + .hal_reo1_qdesc_lut_base0 = 0x00000074, + .hal_reo1_qdesc_lut_base1 = 0x00000078, + .hal_reo1_qdesc_addr_read = 0x0000007c, + .hal_reo1_qdesc_max_peerid = 0x00000088, + .hal_reo1_ring_base_lsb = 0x00000500, + .hal_reo1_ring_base_msb = 0x00000504, + .hal_reo1_ring_id = 0x00000508, + .hal_reo1_ring_misc = 0x00000510, + .hal_reo1_ring_hp_addr_lsb = 0x00000514, + .hal_reo1_ring_hp_addr_msb = 0x00000518, + .hal_reo1_ring_producer_int_setup = 0x00000524, + .hal_reo1_ring_msi1_base_lsb = 0x00000548, + .hal_reo1_ring_msi1_base_msb = 0x0000054C, + .hal_reo1_ring_msi1_data = 0x00000550, + .hal_reo1_aging_thres_ix0 = 0x00000B28, + .hal_reo1_aging_thres_ix1 = 0x00000B2C, + .hal_reo1_aging_thres_ix2 = 0x00000B30, + .hal_reo1_aging_thres_ix3 = 0x00000B34, + + /* REO Exception ring address */ + .hal_reo2_sw0_ring_base = 0x000008c0, + + /* REO Reinject ring address */ + .hal_sw2reo_ring_base = 0x00000320, + .hal_sw2reo1_ring_base = 0x00000398, + + /* REO cmd ring address */ + .hal_reo_cmd_ring_base = 0x000002A8, + + /* REO status ring address */ + .hal_reo_status_ring_base = 0x00000aa0, + + /* WBM idle link ring address */ + .hal_wbm_idle_ring_base_lsb = 0x00000d3c, + .hal_wbm_idle_ring_misc_addr = 0x00000d4c, + .hal_wbm_r0_idle_list_cntl_addr = 0x00000240, + .hal_wbm_r0_idle_list_size_addr = 0x00000244, + .hal_wbm_scattered_ring_base_lsb = 0x00000250, + .hal_wbm_scattered_ring_base_msb = 0x00000254, + .hal_wbm_scattered_desc_head_info_ix0 = 0x00000260, + .hal_wbm_scattered_desc_head_info_ix1 = 0x00000264, + .hal_wbm_scattered_desc_tail_info_ix0 = 0x00000270, + .hal_wbm_scattered_desc_tail_info_ix1 = 0x00000274, + .hal_wbm_scattered_desc_ptr_hp_addr = 0x0000027c, + + /* SW2WBM release ring address */ + .hal_wbm_sw_release_ring_base_lsb = 0x0000037c, + + /* WBM2SW release ring address */ + .hal_wbm0_release_ring_base_lsb = 0x00000e08, + .hal_wbm1_release_ring_base_lsb = 0x00000e80, + + /* reo2ppe ring base address */ + .hal_reo2ppe_ring_base = 0x00000938, + + /* ppe2tcl ring base address */ + .hal_tcl_ppe2tcl_ring_base_lsb = 0x00000c58, + + /* PCIe base address */ + .pcie_qserdes_sysclk_en_sel = 0x01e0c0a8, + .pcie_pcs_osc_dtct_config_base = 0x01e0d45c, + + /* CE base address */ + .hal_umac_ce0_src_reg_base = 0x01B80000, + .hal_umac_ce0_dest_reg_base = 0x01B81000, + .hal_umac_ce1_src_reg_base = 0x01B82000, + .hal_umac_ce1_dest_reg_base = 0x01B83000, }; static const struct ath12k_hw_hal_params ath12k_hw_hal_params_qcn9274 = { @@ -841,7 +1468,8 @@ HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW1_EN | HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN | HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN | - HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN, + HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN | + HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW6_EN, }; static const struct ath12k_hw_hal_params ath12k_hw_hal_params_wcn7850 = { @@ -852,12 +1480,42 @@ HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN, }; -static const struct ath12k_hw_params ath12k_hw_params[] = { +const struct ce_ie_addr ath12k_ce_ie_addr_ipq5332 = { + .ie1_reg_addr = CE_HOST_IE_ADDRESS, + .ie2_reg_addr = CE_HOST_IE_2_ADDRESS, + .ie3_reg_addr = CE_HOST_IE_3_ADDRESS, +}; + +const struct ce_remap ath12k_ce_remap_ipq5332 = { + .base = HAL_IPQ5332_CE_WFSS_REG_BASE, + .size = HAL_IPQ5332_CE_SIZE, +}; + +const struct cmem_remap ath12k_cmem_ipq5332 = { + .base = HAL_IPQ5332_CMEM_REG_BASE, + .size = HAL_IPQ5332_CMEM_SIZE, +}; + +const struct pmm_remap ath12k_pmm_ipq5332 = { + .base = HAL_IPQ5332_PMM_REG_BASE, + .size = HAL_IPQ5332_PMM_SIZE, +}; + +static const struct ath12k_hw_hal_params ath12k_hw_hal_params_ipq5332 = { + .rx_buf_rbm = HAL_RX_BUF_RBM_SW3_BM, + .wbm2sw_cc_enable = HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW0_EN | + HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW1_EN | + HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW2_EN | + HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW3_EN | + HAL_WBM_SW_COOKIE_CONV_CFG_WBM2SW4_EN, +}; + +static struct ath12k_hw_params ath12k_hw_params[] = { { .name = "qcn9274 hw1.0", .hw_rev = ATH12K_HW_QCN9274_HW10, .fw = { - .dir = "QCN9274/hw1.0", + .dir = "QCN92XX/hw1.0", .board_size = 256 * 1024, .cal_offset = 128 * 1024, }, @@ -869,6 +1527,8 @@ .hw_ops = &qcn9274_ops, .ring_mask = &ath12k_hw_ring_mask_qcn9274, .regs = &qcn9274_v1_regs, + .ext_irq_grp_num_max = 12, + .route_wbm_release = 3, .host_ce_config = ath12k_host_ce_config_qcn9274, .ce_count = 16, @@ -879,21 +1539,25 @@ .hal_params = &ath12k_hw_hal_params_qcn9274, - .rxdma1_enable = false, + .rxdma1_enable = true, .num_rxmda_per_pdev = 1, .num_rxdma_dst_ring = 0, .rx_mac_buf_ring = false, .vdev_start_delay = false, .interface_modes = BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP), - .supports_monitor = false, + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_MESH_POINT), +#ifndef CONFIG_ATH12K_MEM_PROFILE_512M + .supports_monitor = true, +#endif .idle_ps = false, + .cold_boot_calib = false, .download_calib = true, .supports_suspend = false, .tcl_ring_retry = true, - .reoq_lut_support = false, + .reoq_lut_support = true, .supports_shadow_regs = false, .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9274), @@ -906,6 +1570,31 @@ .hal_ops = &hal_qcn9274_ops, + .qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01), + + .fix_l1ss = false, + + .supports_ap_ps = true, + .alloc_cacheable_memory = true, + .spectral = { + .fft_sz = 0, + .fft_pad_sz = 0, + .summary_pad_sz = 0, + .fft_hdr_len = 0, + .max_fft_bins = 0, + .fragment_160mhz = false, + }, + .max_mlo_peer = ATH12K_MAX_MLO_PEER, + .num_local_link = 0, + .m3_fw_support = true, + .compact_rx_tlv = true, + .send_platform_model = false, + .en_fwlog = true, + .support_umac_reset = false, + .en_qdsslog = true, + .supports_tx_monitor = false, + .fw_mem_mode = ATH12K_QMI_TARGET_MEM_MODE, + .is_plink_preferable = true, }, { .name = "wcn7850 hw2.0", @@ -925,6 +1614,8 @@ .hw_ops = &wcn7850_ops, .ring_mask = &ath12k_hw_ring_mask_wcn7850, .regs = &wcn7850_regs, + .ext_irq_grp_num_max = 12, + .route_wbm_release = 3, .host_ce_config = ath12k_host_ce_config_wcn7850, .ce_count = 9, @@ -960,6 +1651,22 @@ .wmi_init = ath12k_wmi_init_wcn7850, .hal_ops = &hal_wcn7850_ops, + + .qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01) | + BIT(CNSS_PCIE_PERST_NO_PULL_V01), + + .fix_l1ss = false, + .supports_ap_ps = true, + .credit_flow = false, + .m3_fw_support = true, + .compact_rx_tlv = false, + .send_platform_model = false, + .en_fwlog = true, + .support_umac_reset = false, + .en_qdsslog = true, + .supports_tx_monitor = false, + .fw_mem_mode = ATH12K_QMI_TARGET_MEM_MODE, + .is_plink_preferable = true, }, { .name = "qcn9274 hw2.0", @@ -969,7 +1676,7 @@ .board_size = 256 * 1024, .cal_offset = 128 * 1024, }, - .max_radios = 1, + .max_radios = 2, .single_pdev_only = false, .qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9274, .internal_sleep_clock = false, @@ -977,6 +1684,8 @@ .hw_ops = &qcn9274_ops, .ring_mask = &ath12k_hw_ring_mask_qcn9274, .regs = &qcn9274_v2_regs, + .ext_irq_grp_num_max = 12, + .route_wbm_release = 3, .host_ce_config = ath12k_host_ce_config_qcn9274, .ce_count = 16, @@ -987,21 +1696,25 @@ .hal_params = &ath12k_hw_hal_params_qcn9274, - .rxdma1_enable = false, + .rxdma1_enable = true, .num_rxmda_per_pdev = 1, .num_rxdma_dst_ring = 0, .rx_mac_buf_ring = false, .vdev_start_delay = false, .interface_modes = BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_AP), - .supports_monitor = false, + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_MESH_POINT), +#ifndef CONFIG_ATH12K_MEM_PROFILE_512M + .supports_monitor = true, +#endif .idle_ps = false, + .cold_boot_calib = true, .download_calib = true, .supports_suspend = false, .tcl_ring_retry = true, - .reoq_lut_support = false, + .reoq_lut_support = true, .supports_shadow_regs = false, .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9274), @@ -1013,9 +1726,265 @@ .wmi_init = ath12k_wmi_init_qcn9274, .hal_ops = &hal_qcn9274_ops, + + .qmi_cnss_feature_bitmap = BIT(CNSS_QDSS_CFG_MISS_V01), + + .fix_l1ss = false, + .supports_ap_ps = true, + .credit_flow = false, + .alloc_cacheable_memory = true, + .spectral = { + .fft_sz = 7, + .fft_pad_sz = 0, + .summary_pad_sz = 16, + .fft_hdr_len = 24, + .max_fft_bins = 512, + .fragment_160mhz = true, + }, + .max_mlo_peer = ATH12K_MAX_MLO_PEER, + .num_local_link = 0, + .m3_fw_support = true, + .compact_rx_tlv = true, + .send_platform_model = false, + .en_fwlog = true, + .support_umac_reset = true, + .en_qdsslog = false, + .supports_tx_monitor = false, + .fw_mem_mode = ATH12K_QMI_TARGET_MEM_MODE, + .is_plink_preferable = true, + }, + { + .name = "ipq5332 hw1.0", + .hw_rev = ATH12K_HW_IPQ5332_HW10, + .bdf_addr = 0x4B500000, + .fw = { + .dir = "IPQ5332/hw1.0", + .board_size = 256 * 1024, + .cal_offset = 128 * 1024, + }, + .max_radios = 1, + .single_pdev_only = false, + .qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ5332, + .internal_sleep_clock = false, + + .hw_ops = &ipq5332_ops, + .regs = &ipq5332_regs, + .ext_irq_grp_num_max = 12, + .ring_mask = &ath12k_hw_ring_mask_ipq5332, + .route_wbm_release = 3, + + .host_ce_config = ath12k_host_ce_config_ipq5332, + .ce_count = 12, + .target_ce_config = ath12k_target_ce_config_wlan_ipq5332, + .target_ce_count = 12, + .svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_ipq5332, + .svc_to_ce_map_len = 19, + + .hal_params = &ath12k_hw_hal_params_ipq5332, + + .rxdma1_enable = true, + .num_rxmda_per_pdev = 1, + .num_rxdma_dst_ring = 0, + .rx_mac_buf_ring = false, + .vdev_start_delay = false, + .fixed_fw_mem = false, + .smp2p_wow_exit = false, + + .interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_MESH_POINT), +#ifndef CONFIG_ATH12K_MEM_PROFILE_512M + .supports_monitor = true, +#endif + + .idle_ps = false, + .cold_boot_calib = true, + .download_calib = true, + .supports_suspend = false, + .tcl_ring_retry = true, + .reoq_lut_support = true, + .supports_shadow_regs = false, + + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9274), + .num_tcl_banks = 48, + .max_tx_ring = 4, + + + .wmi_init = ath12k_wmi_init_ipq5332, + + .hal_ops = &hal_qcn9274_ops, + + .supports_ap_ps = true, + .credit_flow = false, + .alloc_cacheable_memory = true, + .spectral = { + .fft_sz = 7, + .fft_pad_sz = 0, + .summary_pad_sz = 16, + .fft_hdr_len = 24, + .max_fft_bins = 512, + .fragment_160mhz = false, + }, + .max_mlo_peer = ATH12K_MAX_MLO_PEER, + .num_local_link = 0, + .m3_fw_support = false, + .compact_rx_tlv = true, + .ce_ie_addr = &ath12k_ce_ie_addr_ipq5332, + .ce_remap = &ath12k_ce_remap_ipq5332, + .cmem_remap = &ath12k_cmem_ipq5332, + .pmm_remap = &ath12k_pmm_ipq5332, + .send_platform_model = true, + .en_fwlog = true, + .support_umac_reset = false, + .support_ce_manual_poll=true, + .en_qdsslog = true, + .supports_tx_monitor = false, + .fw_mem_mode = ATH12K_QMI_TARGET_MEM_MODE, + .is_plink_preferable = false, + }, + { + .name = "qcn6432 hw1.0", + .hw_rev = ATH12K_HW_QCN6432_HW10, + .fw = { + .dir = "QCN6432/hw1.0", + .board_size = 256 * 1024, + .cal_offset = 128 * 1024, + }, + .max_radios = 1, + .single_pdev_only = false, + .qmi_service_ins_id = ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN6432, + .internal_sleep_clock = false, + + .hw_ops = &ipq5332_ops, + .regs = &qcn6432_regs, + .ext_irq_grp_num_max = 6, + .ring_mask = &ath12k_hw_ring_mask_qcn6432, + .route_wbm_release = 2, + + .host_ce_config = ath12k_host_ce_config_ipq5332, + .ce_count = 12, + .target_ce_config = ath12k_target_ce_config_wlan_ipq5332, + .target_ce_count = 12, + .svc_to_ce_map = ath12k_target_service_to_ce_map_wlan_ipq5332, + .svc_to_ce_map_len = 19, + + .hal_params = &ath12k_hw_hal_params_ipq5332, + + .rxdma1_enable = true, + .num_rxmda_per_pdev = 1, + .num_rxdma_dst_ring = 0, + .rx_mac_buf_ring = false, + .vdev_start_delay = false, + .fixed_fw_mem = false, + .smp2p_wow_exit = false, + + .interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_MESH_POINT), +#ifndef CONFIG_ATH12K_MEM_PROFILE_512M + .supports_monitor = true, +#endif + + .idle_ps = false, + .cold_boot_calib = true, + .download_calib = true, + .supports_suspend = false, + .tcl_ring_retry = true, + .reoq_lut_support = true, + .supports_shadow_regs = false, + + .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9274), + .num_tcl_banks = 48, + .max_tx_ring = 4, + .static_window_map = true, + + .wmi_init = ath12k_wmi_init_ipq5332, + + .hal_ops = &hal_qcn6432_ops, + + .supports_ap_ps = true, + .credit_flow = false, + .alloc_cacheable_memory = true, + .spectral = { + .fft_sz = 7, + .fft_pad_sz = 0, + .summary_pad_sz = 16, + .fft_hdr_len = 24, + .max_fft_bins = 512, + .fragment_160mhz = false, + }, + .max_mlo_peer = ATH12K_MAX_MLO_PEER, + .num_local_link = 0, + .m3_fw_support = false, + .compact_rx_tlv = true, + .send_platform_model = true, + .en_fwlog = false, + .support_umac_reset = false, + .en_qdsslog = true, + .fw_mem_mode = ATH12K_QMI_TARGET_MEM_MODE, + .is_plink_preferable = true, }, }; +void ath12k_dp_reset_interrupt_mask(struct ath12k_base *ab) +{ + struct ath12k_hw_ring_mask *ring_mask = ab->hw_params->ring_mask; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_mlo_dp_umac_reset *umac_reset = &ag->mlo_umac_reset; + int i; + + if (ag->mlo_umac_reset.is_intr_bkup) + return; + + for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX(ab); i++) { + umac_reset->intr_bkup.tx[i] = ring_mask->tx[i]; + + umac_reset->intr_bkup.rx_mon_dest[i] = ring_mask->rx_mon_dest[i]; + umac_reset->intr_bkup.rx[i] = ring_mask->rx[i]; + umac_reset->intr_bkup.rx_err[i] = ring_mask->rx_err[i]; + umac_reset->intr_bkup.rx_wbm_rel[i] = ring_mask->rx_wbm_rel[i]; + umac_reset->intr_bkup.reo_status[i] = ring_mask->reo_status[i]; + umac_reset->intr_bkup.host2rxdma[i] = ring_mask->host2rxdma[i]; + umac_reset->intr_bkup.tx_mon_dest[i] = ring_mask->tx_mon_dest[i]; + + ring_mask->tx[i] = 0; + ring_mask->rx_mon_dest[i] = 0; + ring_mask->rx[i] = 0; + ring_mask->rx_err[i] = 0; + ring_mask->rx_wbm_rel[i] = 0; + ring_mask->reo_status[i] = 0; + ring_mask->host2rxdma[i] = 0; + ring_mask->tx_mon_dest[i] = 0; + } + + ag->mlo_umac_reset.is_intr_bkup = true; +} + +void ath12k_dp_restore_interrupt_mask(struct ath12k_base *ab) +{ + struct ath12k_hw_ring_mask *ring_mask = ab->hw_params->ring_mask; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_mlo_dp_umac_reset *umac_reset = &ag->mlo_umac_reset; + int i; + + if (!ag->mlo_umac_reset.is_intr_bkup) + return; + + for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX(ab); i++) { + ring_mask->tx[i] = umac_reset->intr_bkup.tx[i]; + ring_mask->rx_mon_dest[i] = umac_reset->intr_bkup.rx_mon_dest[i]; + ring_mask->rx[i] = umac_reset->intr_bkup.rx[i]; + ring_mask->rx_err[i] = umac_reset->intr_bkup.rx_err[i]; + ring_mask->rx_wbm_rel[i] = umac_reset->intr_bkup.rx_wbm_rel[i]; + ring_mask->reo_status[i] = umac_reset->intr_bkup.reo_status[i]; + ring_mask->host2rxdma[i] = umac_reset->intr_bkup.host2rxdma[i]; + ring_mask->tx_mon_dest[i] = umac_reset->intr_bkup.tx_mon_dest[i]; + } + + ag->mlo_umac_reset.is_intr_bkup = false; + +} + int ath12k_hw_init(struct ath12k_base *ab) { const struct ath12k_hw_params *hw_params = NULL; @@ -1039,3 +2008,4 @@ return 0; } + diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/hw.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hw.h --- linux-6.4/drivers/net/wireless/ath/ath12k/hw.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/hw.h 2024-04-22 13:40:50.291868856 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_HW_H @@ -14,10 +14,17 @@ /* Target configuration defines */ +#ifdef CONFIG_ATH12K_MEM_PROFILE_512M +/* Num VDEVS per radio */ +#define TARGET_NUM_VDEVS (8 + 1) +#define ATH12K_QMI_TARGET_MEM_MODE ATH12K_QMI_TARGET_MEM_MODE_512M +#else /* Num VDEVS per radio */ #define TARGET_NUM_VDEVS (16 + 1) +#define ATH12K_QMI_TARGET_MEM_MODE ATH12K_QMI_TARGET_MEM_MODE_DEFAULT +#endif -#define TARGET_NUM_PEERS_PDEV (512 + TARGET_NUM_VDEVS) +#define TARGET_NUM_PEERS_PDEV (TARGET_NUM_STATIONS + TARGET_NUM_VDEVS) /* Num of peers for Single Radio mode */ #define TARGET_NUM_PEERS_SINGLE (TARGET_NUM_PEERS_PDEV) @@ -29,7 +36,7 @@ #define TARGET_NUM_PEERS_DBS_SBS (3 * TARGET_NUM_PEERS_PDEV) /* Max num of stations (per radio) */ -#define TARGET_NUM_STATIONS 512 +#define TARGET_NUM_STATIONS 128 #define TARGET_NUM_PEERS(x) TARGET_NUM_PEERS_##x #define TARGET_NUM_PEER_KEYS 2 @@ -66,8 +73,14 @@ #define TARGET_NUM_WDS_ENTRIES 32 #define TARGET_DMA_BURST_SIZE 1 #define TARGET_RX_BATCHMODE 1 +#define TARGET_EMA_MAX_PROFILE_PERIOD 8 +#define TARGET_RX_PEER_METADATA_VER_V1A 2 +#define TARGET_RX_PEER_METADATA_VER_V1B 3 + +#define ATH12K_HW_DEFAULT_QUEUE 0 #define ATH12K_HW_MAX_QUEUES 4 +#define ATH12K_HW_MAX_QUEUES_PPEDS 1 #define ATH12K_QUEUE_LEN 4096 #define ATH12K_HW_RATECODE_CCK_SHORT_PREAM_MASK 0x4 @@ -76,11 +89,20 @@ #define ATH12K_BOARD_MAGIC "QCA-ATH12K-BOARD" #define ATH12K_BOARD_API2_FILE "board-2.bin" +#define ATH12K_BOARD_OVERRIDE_FILE "board-id-override.txt" #define ATH12K_DEFAULT_BOARD_FILE "board.bin" #define ATH12K_DEFAULT_CAL_FILE "caldata.bin" +#define ATH12K_QMI_DEF_CAL_FILE_PREFIX "caldata_" +#define ATH12K_QMI_DEF_CAL_FILE_SUFFIX ".bin" #define ATH12K_AMSS_FILE "amss.bin" +#define ATH12K_AMSS_DUALMAC_FILE "amss_dualmac.bin" #define ATH12K_M3_FILE "m3.bin" #define ATH12K_REGDB_FILE_NAME "regdb.bin" +#define ATH12K_REGDB_BINARY "regdb" +#define ATH12K_RXGAINLUT_FILE_PREFIX "rxgainlut.b" +#define ATH12K_RXGAINLUT_FILE "rxgainlut.bin" +#define ATH12K_DEFAULT_ID 255 +#define ATH12K_FW_CFG_FILE "firmware.dat" enum ath12k_hw_rate_cck { ATH12K_HW_RATE_CCK_LP_11M = 0, @@ -105,24 +127,34 @@ enum ath12k_bus { ATH12K_BUS_PCI, + ATH12K_BUS_AHB, + ATH12K_BUS_HYBRID, }; -#define ATH12K_EXT_IRQ_GRP_NUM_MAX 11 - +/* Regular 12 Host DP interrupts + 3 PPEDS interrupts + 1 DP UMAC RESET interrupt*/ +#define ATH12K_EXT_IRQ_DP_NUM_VECTORS 16 +#define ATH12K_EXT_IRQ_GRP_NUM_MAX(ab)\ + ((ab)->hw_params->ext_irq_grp_num_max) struct hal_rx_desc; struct hal_tcl_data_cmd; struct htt_rx_ring_tlv_filter; enum hal_encrypt_type; struct ath12k_hw_ring_mask { - u8 tx[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 rx_mon_dest[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 rx[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 rx_err[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 rx_wbm_rel[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 reo_status[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 host2rxdma[ATH12K_EXT_IRQ_GRP_NUM_MAX]; - u8 tx_mon_dest[ATH12K_EXT_IRQ_GRP_NUM_MAX]; + u8 tx[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 rx_mon_dest[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 rx[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 rx_err[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 rx_wbm_rel[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 reo_status[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 host2rxdma[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 tx_mon_dest[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 ppe2tcl[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; + u8 reo2ppe[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + u8 wbm2sw6_ppeds_tx_cmpln[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; +#endif + u8 umac_dp_reset[ATH12K_EXT_IRQ_DP_NUM_VECTORS]; }; struct ath12k_hw_hal_params { @@ -133,6 +165,7 @@ struct ath12k_hw_params { const char *name; u16 hw_rev; + u32 bdf_addr; struct { const char *dir; @@ -146,8 +179,10 @@ bool internal_sleep_clock:1; const struct ath12k_hw_ops *hw_ops; - const struct ath12k_hw_ring_mask *ring_mask; + struct ath12k_hw_ring_mask *ring_mask; const struct ath12k_hw_regs *regs; + u8 ext_irq_grp_num_max; + u8 route_wbm_release; const struct ce_attr *host_ce_config; u32 ce_count; @@ -164,10 +199,21 @@ bool rx_mac_buf_ring:1; bool vdev_start_delay:1; + struct { + u8 fft_sz; + u8 fft_pad_sz; + u8 summary_pad_sz; + u8 fft_hdr_len; + u16 max_fft_bins; + bool fragment_160mhz; + } spectral; + u16 interface_modes; bool supports_monitor:1; + bool supports_tx_monitor; bool idle_ps:1; + bool cold_boot_calib:1; bool download_calib:1; bool supports_suspend:1; bool tcl_ring_retry:1; @@ -177,6 +223,7 @@ u32 hal_desc_sz; u32 num_tcl_banks; u32 max_tx_ring; + bool static_window_map; const struct mhi_controller_config *mhi_config; @@ -184,6 +231,30 @@ struct ath12k_wmi_resource_config_arg *config); const struct hal_ops *hal_ops; + + u64 qmi_cnss_feature_bitmap; + + bool fix_l1ss; + bool supports_ap_ps; + bool credit_flow; + bool alloc_cacheable_memory; + u16 max_mlo_peer; + u8 num_local_link; + const struct ce_ie_addr *ce_ie_addr; + bool smp2p_wow_exit; + bool fixed_fw_mem; + bool m3_fw_support; + bool send_platform_model; + bool en_fwlog; + bool en_qdsslog; + const struct ce_remap *ce_remap; + const struct cmem_remap *cmem_remap; + bool compact_rx_tlv; + bool support_ce_manual_poll; + const struct pmm_remap *pmm_remap; + bool support_umac_reset; + int fw_mem_mode; + bool is_plink_preferable; }; struct ath12k_hw_ops { @@ -234,12 +305,40 @@ ATH12K_BD_IE_BOARD_DATA = 1, }; +enum ath12k_bd_ie_regdb_type { + ATH12K_BD_IE_REGDB_NAME = 0, + ATH12K_BD_IE_REGDB_DATA = 1, +}; + +enum ath12k_bd_ie_rxgainlut_type { + ATH12K_BD_IE_RXGAINLUT_NAME = 0, + ATH12K_BD_IE_RXGAINLUT_DATA = 1, +}; + enum ath12k_bd_ie_type { /* contains sub IEs of enum ath12k_bd_ie_board_type */ ATH12K_BD_IE_BOARD = 0, - ATH12K_BD_IE_BOARD_EXT = 1, + ATH12K_BD_IE_REGDB = 1, + ATH12K_BD_IE_BOARD_EXT = 2, + ATH12K_BD_IE_RXGAINLUT = 3, }; +static inline const char *ath12k_bd_ie_type_str(enum ath12k_bd_ie_type type) +{ + switch (type) { + case ATH12K_BD_IE_BOARD: + return "board data"; + case ATH12K_BD_IE_REGDB: + return "regdb data"; + case ATH12K_BD_IE_BOARD_EXT: + return "board data ext"; + case ATH12K_BD_IE_RXGAINLUT: + return "rxgainlut data"; + } + + return "unknown"; +} + struct ath12k_hw_regs { u32 hal_tcl1_ring_id; u32 hal_tcl1_ring_misc; @@ -251,9 +350,16 @@ u32 hal_tcl1_ring_msi1_base_msb; u32 hal_tcl1_ring_msi1_data; u32 hal_tcl_ring_base_lsb; + u32 hal_tcl1_ring_base_lsb; + u32 hal_tcl1_ring_base_msb; + u32 hal_tcl2_ring_base_lsb; u32 hal_tcl_status_ring_base_lsb; + u32 hal_reo1_qdesc_addr_read; + u32 hal_reo1_qdesc_max_peerid; + u32 hal_ppe_rel_ring_base; + u32 hal_wbm_idle_ring_base_lsb; u32 hal_wbm_idle_ring_misc_addr; u32 hal_wbm_r0_idle_list_cntl_addr; @@ -274,9 +380,14 @@ u32 pcie_qserdes_sysclk_en_sel; u32 pcie_pcs_osc_dtct_config_base; - u32 hal_ppe_rel_ring_base; + u32 hal_umac_ce0_src_reg_base; + u32 hal_umac_ce0_dest_reg_base; + u32 hal_umac_ce1_src_reg_base; + u32 hal_umac_ce1_dest_reg_base; u32 hal_reo2_ring_base; + u32 hal_reo2ppe_ring_base; + u32 hal_tcl_ppe2tcl_ring_base_lsb; u32 hal_reo1_misc_ctrl_addr; u32 hal_reo1_sw_cookie_cfg0; u32 hal_reo1_sw_cookie_cfg1; diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/mac.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mac.c --- linux-6.4/drivers/net/wireless/ath/ath12k/mac.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mac.c 2024-04-22 13:55:38.348131443 +0200 @@ -5,7 +5,15 @@ */ #include +#include #include +#include +#include +#include +#include +#include +#include + #include "mac.h" #include "core.h" #include "debug.h" @@ -13,7 +21,19 @@ #include "hw.h" #include "dp_tx.h" #include "dp_rx.h" +#include "testmode.h" #include "peer.h" +#include "debugfs_sta.h" +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +#include "bondif.h" +#endif + +#define IEEE80211_EHT_PPE_THRES_NSS_POS 0 +#define IEEE80211_EHT_PPE_THRES_NSS_MASK 0xf +#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK 0x1f0 +#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_POS 4 +#define IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE 3 +#define IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE 9 #define CHAN2G(_channel, _freq, _flags) { \ .band = NL80211_BAND_2GHZ, \ @@ -42,6 +62,16 @@ .max_power = 30, \ } +static void ath12k_mac_remove_link_interface(struct ieee80211_hw *hw, + struct ath12k_link_vif *arvif); + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +int ath12k_mac_op_change_vif_links(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + u16 old_links, u16 new_links, + struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS]); +extern int g_bonded_interface_model; +#endif static const struct ieee80211_channel ath12k_2ghz_channels[] = { CHAN2G(1, 2412, 0), CHAN2G(2, 2417, 0), @@ -87,10 +117,12 @@ CHAN5G(165, 5825, 0), CHAN5G(169, 5845, 0), CHAN5G(173, 5865, 0), + CHAN5G(177, 5885, 0), }; static const struct ieee80211_channel ath12k_6ghz_channels[] = { CHAN6G(1, 5955, 0), + CHAN6G(2, 5935, 0), CHAN6G(5, 5975, 0), CHAN6G(9, 5995, 0), CHAN6G(13, 6015, 0), @@ -182,32 +214,35 @@ [NL80211_BAND_2GHZ] = { [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11AX_HE20_2G, - [NL80211_CHAN_WIDTH_20] = MODE_11AX_HE20_2G, - [NL80211_CHAN_WIDTH_40] = MODE_11AX_HE40_2G, - [NL80211_CHAN_WIDTH_80] = MODE_11AX_HE80_2G, + [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11BE_EHT20_2G, + [NL80211_CHAN_WIDTH_20] = MODE_11BE_EHT20_2G, + [NL80211_CHAN_WIDTH_40] = MODE_11BE_EHT40_2G, + [NL80211_CHAN_WIDTH_80] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_80P80] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_160] = MODE_UNKNOWN, + [NL80211_CHAN_WIDTH_320] = MODE_UNKNOWN, }, [NL80211_BAND_5GHZ] = { [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11AX_HE20, - [NL80211_CHAN_WIDTH_20] = MODE_11AX_HE20, - [NL80211_CHAN_WIDTH_40] = MODE_11AX_HE40, - [NL80211_CHAN_WIDTH_80] = MODE_11AX_HE80, - [NL80211_CHAN_WIDTH_160] = MODE_11AX_HE160, - [NL80211_CHAN_WIDTH_80P80] = MODE_11AX_HE80_80, + [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11BE_EHT20, + [NL80211_CHAN_WIDTH_20] = MODE_11BE_EHT20, + [NL80211_CHAN_WIDTH_40] = MODE_11BE_EHT40, + [NL80211_CHAN_WIDTH_80] = MODE_11BE_EHT80, + [NL80211_CHAN_WIDTH_160] = MODE_11BE_EHT160, + [NL80211_CHAN_WIDTH_80P80] = MODE_11BE_EHT80_80, + [NL80211_CHAN_WIDTH_320] = MODE_11BE_EHT320, }, [NL80211_BAND_6GHZ] = { [NL80211_CHAN_WIDTH_5] = MODE_UNKNOWN, [NL80211_CHAN_WIDTH_10] = MODE_UNKNOWN, - [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11AX_HE20, - [NL80211_CHAN_WIDTH_20] = MODE_11AX_HE20, - [NL80211_CHAN_WIDTH_40] = MODE_11AX_HE40, - [NL80211_CHAN_WIDTH_80] = MODE_11AX_HE80, - [NL80211_CHAN_WIDTH_160] = MODE_11AX_HE160, - [NL80211_CHAN_WIDTH_80P80] = MODE_11AX_HE80_80, + [NL80211_CHAN_WIDTH_20_NOHT] = MODE_11BE_EHT20, + [NL80211_CHAN_WIDTH_20] = MODE_11BE_EHT20, + [NL80211_CHAN_WIDTH_40] = MODE_11BE_EHT40, + [NL80211_CHAN_WIDTH_80] = MODE_11BE_EHT80, + [NL80211_CHAN_WIDTH_160] = MODE_11BE_EHT160, + [NL80211_CHAN_WIDTH_80P80] = MODE_11BE_EHT80_80, + [NL80211_CHAN_WIDTH_320] = MODE_11BE_EHT320, }, }; @@ -238,8 +273,162 @@ [WLAN_HT_CAP_SM_PS_DISABLED] = WMI_PEER_SMPS_PS_NONE, }; -static int ath12k_start_vdev_delay(struct ieee80211_hw *hw, +static int ath12k_start_vdev_delay(struct ath12k *ar, struct ieee80211_vif *vif); +static void ath12k_update_bcn_template_work(struct work_struct *work); +static void ath12k_update_obss_color_notify_work(struct work_struct *work); +static void ath12k_mac_remove_link_interface(struct ieee80211_hw *hw, + struct ath12k_link_vif *arvif); +static int ath12k_fw_stats_request(struct ath12k *ar, + struct stats_request_params *req_param); + +enum nl80211_he_ru_alloc ath12k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy) +{ + enum nl80211_he_ru_alloc ret; + + switch (ru_phy) { + case RU_26: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_26; + break; + case RU_52: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_52; + break; + case RU_106: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_106; + break; + case RU_242: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_242; + break; + case RU_484: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_484; + break; + case RU_996: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_996; + break; + default: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_26; + break; + } + + return ret; +} + +enum nl80211_he_ru_alloc ath12k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones) +{ + enum nl80211_he_ru_alloc ret; + + switch (ru_tones) { + case 26: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_26; + break; + case 52: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_52; + break; + case 106: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_106; + break; + case 242: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_242; + break; + case 484: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_484; + break; + case 996: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_996; + break; + case (996 * 2): + ret = NL80211_RATE_INFO_HE_RU_ALLOC_2x996; + break; + default: + ret = NL80211_RATE_INFO_HE_RU_ALLOC_26; + break; + } + + return ret; +} + +enum nl80211_eht_ru_alloc ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(u16 ru_tones) +{ + enum nl80211_eht_ru_alloc ret; + + switch (ru_tones) { + case 26: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_26; + break; + case 52: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_52; + break; + case (52 + 26): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_52P26; + break; + case 106: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_106; + break; + case (106 + 26): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_106P26; + break; + case 242: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_242; + break; + case 484: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_484; + break; + case (484 + 242): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_484P242; + break; + case 996: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_996; + break; + case (996 + 484): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_996P484; + break; + case (996 + 484 + 242): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_996P484P242; + break; + case (996 * 2): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_2x996; + break; + case (996 * 2 + 484): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_2x996P484; + break; + case (996 * 3): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_3x996; + break; + case (996 * 3 + 484): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_3x996P484; + break; + case (996 * 4): + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_4x996; + break; + default: + ret = NL80211_RATE_INFO_EHT_RU_ALLOC_26; + break; + } + + return ret; +} + +enum nl80211_he_gi ath12k_mac_he_gi_to_nl80211_he_gi(u8 sgi) +{ + enum nl80211_he_gi ret; + + switch (sgi) { + case RX_MSDU_START_SGI_0_8_US: + ret = NL80211_RATE_INFO_HE_GI_0_8; + break; + case RX_MSDU_START_SGI_1_6_US: + ret = NL80211_RATE_INFO_HE_GI_1_6; + break; + case RX_MSDU_START_SGI_3_2_US: + ret = NL80211_RATE_INFO_HE_GI_3_2; + break; + default: + ret = NL80211_RATE_INFO_HE_GI_0_8; + break; + } + + return ret; +} static const char *ath12k_mac_phymode_str(enum wmi_phy_mode mode) { @@ -292,6 +481,24 @@ return "11ax-he40-2g"; case MODE_11AX_HE80_2G: return "11ax-he80-2g"; + case MODE_11BE_EHT20: + return "11be-eht20"; + case MODE_11BE_EHT40: + return "11be-eht40"; + case MODE_11BE_EHT80: + return "11be-eht80"; + case MODE_11BE_EHT80_80: + return "11be-eht80+80"; + case MODE_11BE_EHT160: + return "11be-eht160"; + case MODE_11BE_EHT160_160: + return "11be-eht160+160"; + case MODE_11BE_EHT320: + return "11be-eht320"; + case MODE_11BE_EHT20_2G: + return "11be-eht20-2g"; + case MODE_11BE_EHT40_2G: + return "11be-eht40-2g"; case MODE_UNKNOWN: /* skip */ break; @@ -322,6 +529,8 @@ case ATH12K_BW_160: ret = RATE_INFO_BW_160; break; + case ATH12K_BW_320: + ret = RATE_INFO_BW_320; } return ret; @@ -338,6 +547,8 @@ return ATH12K_BW_80; case RATE_INFO_BW_160: return ATH12K_BW_160; + case RATE_INFO_BW_320: + return ATH12K_BW_320; default: return ATH12K_BW_20; } @@ -368,6 +579,19 @@ return -EINVAL; } +static int get_num_chains(u32 mask) +{ + int num_chains = 0; + + while (mask) { + if (mask & BIT(0)) + num_chains++; + mask >>= 1; + } + + return num_chains; +} + u8 ath12k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband, u32 bitrate) { @@ -381,7 +605,7 @@ } static u32 -ath12k_mac_max_ht_nss(const u8 ht_mcs_mask[IEEE80211_HT_MCS_MASK_LEN]) +ath12k_mac_max_ht_nss(const u8 *ht_mcs_mask) { int nss; @@ -393,7 +617,7 @@ } static u32 -ath12k_mac_max_vht_nss(const u16 vht_mcs_mask[NL80211_VHT_NSS_MAX]) +ath12k_mac_max_vht_nss(const u16 *vht_mcs_mask) { int nss; @@ -404,6 +628,42 @@ return 1; } +static u32 +ath12k_mac_max_he_nss(const u16 he_mcs_mask[NL80211_HE_NSS_MAX]) +{ + int nss; + + for (nss = NL80211_HE_NSS_MAX - 1; nss >= 0; nss--) + if (he_mcs_mask[nss]) + return nss + 1; + + return 1; +} + +static u32 +ath12k_mac_max_eht_nss(const u16 eht_mcs_mask[NL80211_EHT_NSS_MAX]) +{ + int nss; + + for (nss = NL80211_EHT_NSS_MAX - 1; nss >= 0; nss--) + if (eht_mcs_mask[nss]) + return nss + 1; + + return 1; +} + +static u32 +ath12k_mac_max_eht_mcs_nss(const u8 *eht_mcs, int eht_mcs_set_size) +{ + int i; + u8 nss = 0; + + for (i = 0; i < eht_mcs_set_size; i++) + nss = max(nss, u8_get_bits(eht_mcs[i], IEEE80211_EHT_MCS_NSS_RX)); + + return nss; +} + static u8 ath12k_parse_mpdudensity(u8 mpdudensity) { /* From IEEE Std 802.11-2020 defined values for "Minimum MPDU Start Spacing": @@ -440,12 +700,26 @@ } static int ath12k_mac_vif_chan(struct ieee80211_vif *vif, - struct cfg80211_chan_def *def) + struct cfg80211_chan_def *def, + u8 link_id) { + struct ieee80211_bss_conf *link_conf; struct ieee80211_chanctx_conf *conf; + /* non-MLO connection, link id 0 pointer to def link */ + if (!vif->link_conf[link_id]) + return -ENOENT; + rcu_read_lock(); - conf = rcu_dereference(vif->bss_conf.chanctx_conf); + + link_conf = rcu_dereference(vif->link_conf[link_id]); + + if (!link_conf) { + rcu_read_unlock(); + return -ENOENT; + } + + conf = rcu_dereference(link_conf->chanctx_conf); if (!conf) { rcu_read_unlock(); return -ENOENT; @@ -457,6 +731,72 @@ return 0; } +static int ath12k_mac_get_max_he_mcs_map(u16 mcs_map, int nss) +{ + switch ((mcs_map >> (2 * nss)) & 0x3) { + case IEEE80211_HE_MCS_SUPPORT_0_7: return BIT(8) - 1; + case IEEE80211_HE_MCS_SUPPORT_0_9: return BIT(10) - 1; + case IEEE80211_HE_MCS_SUPPORT_0_11: return BIT(12) - 1; + } + return 0; +} + +static u16 ath12k_peer_assoc_h_he_limit(u16 tx_mcs_set, + const u16 he_mcs_limit[NL80211_HE_NSS_MAX]) +{ + int idx_limit; + int nss; + u16 mcs_map; + u16 mcs; + + for (nss = 0; nss < NL80211_HE_NSS_MAX; nss++) { + mcs_map = ath12k_mac_get_max_he_mcs_map(tx_mcs_set, nss) & + he_mcs_limit[nss]; + + if (mcs_map) + idx_limit = fls(mcs_map) - 1; + else + idx_limit = -1; + + switch (idx_limit) { + case 0 ... 7: + mcs = IEEE80211_HE_MCS_SUPPORT_0_7; + break; + case 8: + case 9: + mcs = IEEE80211_HE_MCS_SUPPORT_0_9; + break; + case 10: + case 11: + mcs = IEEE80211_HE_MCS_SUPPORT_0_11; + break; + default: + WARN_ON(1); + fallthrough; + case -1: + mcs = IEEE80211_HE_MCS_NOT_SUPPORTED; + break; + } + + tx_mcs_set &= ~(0x3 << (nss * 2)); + tx_mcs_set |= mcs << (nss * 2); + } + + return tx_mcs_set; +} + +static bool +ath12k_peer_assoc_h_he_masked(const u16 he_mcs_mask[NL80211_HE_NSS_MAX]) +{ + int nss; + + for (nss = 0; nss < NL80211_HE_NSS_MAX; nss++) + if (he_mcs_mask[nss]) + return false; + + return true; +} + static bool ath12k_mac_bitrate_is_cck(int bitrate) { switch (bitrate) { @@ -498,46 +838,94 @@ (ath12k_mac_bitrate_is_cck(bitrate) ? BIT(7) : 0); } +struct +ieee80211_bss_conf *ath12k_get_link_bss_conf(struct ath12k_link_vif *arvif) +{ + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ieee80211_bss_conf *link_conf = NULL; + + WARN_ON(!rcu_read_lock_held()); + + if (arvif->link_id > IEEE80211_MLD_MAX_NUM_LINKS) + return NULL; + + link_conf = rcu_dereference(vif->link_conf[arvif->link_id]); + + return link_conf; +} + +static struct +ieee80211_link_sta *ath12k_get_link_sta(struct ath12k_link_sta *arsta) +{ + struct ieee80211_sta *sta; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + WARN_ON(!rcu_read_lock_held()); + + if (arsta->link_id > IEEE80211_MLD_MAX_NUM_LINKS) + return NULL; + + link_sta = rcu_dereference(sta->link[arsta->link_id]); + + return link_sta; +} + static void ath12k_get_arvif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) { struct ath12k_vif_iter *arvif_iter = data; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + u8 link_id; + + /* TODO Revisit lock usage for ahvif->link. Currently this is + * used with vif protected by rcu lock and since the ahvif->links_map + * or link wont be modified it is safe to access below without its mutex + */ + for_each_set_bit(link_id, &ahvif->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; - if (arvif->vdev_id == arvif_iter->vdev_id) + if (WARN_ON(arvif == NULL)) + continue; + + if ((arvif->vdev_id == arvif_iter->vdev_id) && + (arvif->ar == arvif_iter->ar)) { arvif_iter->arvif = arvif; + break; + } + } } -struct ath12k_vif *ath12k_mac_get_arvif(struct ath12k *ar, u32 vdev_id) +struct ath12k_link_vif *ath12k_mac_get_arvif(struct ath12k *ar, u32 vdev_id) { struct ath12k_vif_iter arvif_iter = {}; u32 flags; arvif_iter.vdev_id = vdev_id; + arvif_iter.ar = ar; flags = IEEE80211_IFACE_ITER_RESUME_ALL; - ieee80211_iterate_active_interfaces_atomic(ar->hw, + ieee80211_iterate_active_interfaces_atomic(ar->ah->hw, flags, ath12k_get_arvif_iter, &arvif_iter); - if (!arvif_iter.arvif) { - ath12k_warn(ar->ab, "No VIF found for vdev %d\n", vdev_id); - return NULL; - } - return arvif_iter.arvif; } -struct ath12k_vif *ath12k_mac_get_arvif_by_vdev_id(struct ath12k_base *ab, +struct ath12k_link_vif *ath12k_mac_get_arvif_by_vdev_id(struct ath12k_base *ab, u32 vdev_id) { int i; struct ath12k_pdev *pdev; - struct ath12k_vif *arvif; + struct ath12k_link_vif *arvif; for (i = 0; i < ab->num_radios; i++) { pdev = rcu_dereference(ab->pdevs_active[i]); - if (pdev && pdev->ar) { + if (pdev && pdev->ar && + (pdev->ar->allocated_vdev_map & (1LL << vdev_id))) { arvif = ath12k_mac_get_arvif(pdev->ar, vdev_id); if (arvif) return arvif; @@ -547,6 +935,80 @@ return NULL; } +static struct ath12k *ath12k_mac_get_ar_by_agile_chandef(struct ieee80211_hw *hw, + enum nl80211_band band) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + int i; + + if (band != NL80211_BAND_5GHZ) + return NULL; + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + if (!ar->agile_chandef.chan) + continue; + if (ar->agile_chandef.chan->center_freq > ar->chan_info.low_freq && + ar->agile_chandef.chan->center_freq < ar->chan_info.high_freq) + return ar; + ar++; + } + return NULL; +} + +static struct ath12k *ath12k_mac_get_ar_by_chan(struct ieee80211_hw *hw, + struct ieee80211_channel *channel) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + int i; + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + if (channel->center_freq >= ar->chan_info.low_freq && + channel->center_freq <= ar->chan_info.high_freq) + return ar; + ar++; + } + return NULL; +} + +static struct ath12k *ath12k_get_ar_by_ctx(struct ieee80211_hw *hw, + struct ieee80211_chanctx_conf *ctx) +{ + if (!ctx) + return NULL; + + return ath12k_mac_get_ar_by_chan(hw, ctx->def.chan); +} + +struct ath12k *ath12k_get_ar_by_vif(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + u8 link_id) +{ + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar = NULL; + + lockdep_assert_held(&ah->conf_mutex); + + if (!vif) + return NULL; + + ahvif = ath12k_vif_to_ahvif(vif); + + if (!(ahvif->links_map & BIT(link_id))) + return NULL; + + arvif = ahvif->link[link_id]; + + if (arvif && arvif->is_created) + ar = arvif->ar; + + return ar; +} + struct ath12k *ath12k_mac_get_ar_by_vdev_id(struct ath12k_base *ab, u32 vdev_id) { int i; @@ -577,6 +1039,9 @@ return NULL; for (i = 0; i < ab->num_radios; i++) { + if (ab->fw_mode == ATH12K_FIRMWARE_MODE_FTM) + pdev = &ab->pdevs[i]; + else pdev = rcu_dereference(ab->pdevs_active[i]); if (pdev && pdev->pdev_id == pdev_id) @@ -586,6 +1051,19 @@ return NULL; } +bool ath12k_mac_is_ml_arvif(struct ath12k_link_vif *arvif) +{ + struct ath12k *ar = arvif->ar; + struct ath12k_vif *ahvif = arvif->ahvif; + + lockdep_assert_held(&ar->conf_mutex); + + if (ahvif->vif->valid_links & BIT(arvif->link_id)) + return true; + + return false; +} + static void ath12k_pdev_caps_update(struct ath12k *ar) { struct ath12k_base *ab = ar->ab; @@ -601,13 +1079,14 @@ ar->txpower_limit_2g = ar->max_tx_power; ar->txpower_limit_5g = ar->max_tx_power; + ar->txpower_limit_6g = ar->max_tx_power; ar->txpower_scale = WMI_HOST_TP_SCALE_MAX; } static int ath12k_mac_txpower_recalc(struct ath12k *ar) { struct ath12k_pdev *pdev = ar->pdev; - struct ath12k_vif *arvif; + struct ath12k_link_vif *arvif; int ret, txpower = -1; u32 param; @@ -653,6 +1132,16 @@ ar->txpower_limit_5g = txpower; } + if ((ar->ah->hw->wiphy->bands[NL80211_BAND_6GHZ]) && + ar->txpower_limit_6g != txpower) { + param = WMI_PDEV_PARAM_TXPOWER_LIMIT5G; + ret = ath12k_wmi_pdev_set_param(ar, param, + txpower, ar->pdev->pdev_id); + if (ret) + goto fail; + ar->txpower_limit_6g = txpower; + } + return 0; fail: @@ -661,7 +1150,7 @@ return ret; } -static int ath12k_recalc_rtscts_prot(struct ath12k_vif *arvif) +static int ath12k_recalc_rtscts_prot(struct ath12k_link_vif *arvif) { struct ath12k *ar = arvif->ar; u32 vdev_param, rts_cts; @@ -700,7 +1189,7 @@ return ret; } -static int ath12k_mac_set_kickout(struct ath12k_vif *arvif) +static int ath12k_mac_set_kickout(struct ath12k_link_vif *arvif) { struct ath12k *ar = arvif->ar; u32 param; @@ -745,23 +1234,130 @@ return 0; } +static void ath12k_mac_dec_num_stations(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k *ar = arvif->ar; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + lockdep_assert_held(&ar->conf_mutex); + + if (!ar->num_stations) + return; + + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA && !sta->tdls) + return; + + ar->num_stations--; +} + +int ath12k_mac_partner_peer_cleanup(struct ath12k_base *ab) +{ + + struct ath12k_base *partner_ab; + struct ath12k *ar; + struct ath12k_hw_group *ag; + struct ath12k_link_vif *arvif; + struct ath12k_vif *ahvif; + struct ieee80211_sta *sta; + struct ieee80211_vif *vif; + struct ath12k_sta *ahsta; + struct ath12k_link_sta *arsta; + struct ath12k_peer *peer, *tmp; + int idx, ret = 0; + u8 link_id; + + ag = ab->ag; + + for (idx = 0; idx < ag->num_chip; idx++) { + partner_ab = ag->ab[idx]; + + if (ab == partner_ab) + continue; + + list_for_each_entry_safe(peer, tmp, &partner_ab->peers, list) { + if (!peer->sta || !peer->mlo || !peer->vif) + continue; + + link_id = peer->link_id; + /* get arsta */ + sta = peer->sta; + ahsta = ath12k_sta_to_ahsta(sta); + arsta = ahsta->link[link_id]; + + /* get arvif */ + vif = peer->vif; + ahvif = (struct ath12k_vif *)vif->drv_priv; + arvif = ahvif->link[link_id]; + + ar = arvif->ar; + if (!ar) + continue; + + mutex_lock(&ar->conf_mutex); + ret = ath12k_peer_delete_send(ar, arvif->vdev_id, arsta->addr); + if (ret) { + mutex_unlock(&ar->conf_mutex); + ath12k_warn(ar->ab, + "failed to delete peer vdev_id %d addr %pM ret %d\n", + arvif->vdev_id, arsta->addr, ret); + continue; + } + ret = ath12k_wait_for_peer_delete_done(ar, arvif->vdev_id, arsta->addr); + if (ret) { + mutex_unlock(&ar->conf_mutex); + continue; + } + + ar->num_peers--; + arvif->num_stations--; + ath12k_mac_dec_num_stations(arvif, arsta); + mutex_unlock(&ar->conf_mutex); + cancel_work_sync(&arsta->update_wk); + } + } + return ret; +} + void ath12k_mac_peer_cleanup_all(struct ath12k *ar) { struct ath12k_peer *peer, *tmp; struct ath12k_base *ab = ar->ab; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_link_vif *arvif, *tmp_vif; lockdep_assert_held(&ar->conf_mutex); + mutex_lock(&ab->tbl_mtx_lock); spin_lock_bh(&ab->base_lock); list_for_each_entry_safe(peer, tmp, &ab->peers, list) { ath12k_dp_rx_peer_tid_cleanup(ar, peer); + ath12k_peer_rhash_delete(ab, peer); list_del(&peer->list); +#ifdef CONFIG_ATH12K_SAWF + if (peer->sawf_ctx_peer.telemetry_peer_ctx) + ath12k_telemetry_peer_ctx_free(peer->sawf_ctx_peer.telemetry_peer_ctx); +#endif kfree(peer); } spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); + + if (!list_empty(&ab->neighbor_peers)) + ath12k_debugfs_nrp_cleanup_all(ar); ar->num_peers = 0; ar->num_stations = 0; + + if (ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) { + list_for_each_entry_safe_reverse(arvif, tmp_vif, &ar->arvifs, list) + arvif->num_stations = 0; + } + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "ath12k mac peer cleanup done\n"); } static int ath12k_mac_vdev_setup_sync(struct ath12k *ar) @@ -771,9 +1367,14 @@ if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags)) return -ESHUTDOWN; + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "ath12k vdev setup timeout %d\n", + ATH12K_VDEV_SETUP_TIMEOUT_HZ); + if (!wait_for_completion_timeout(&ar->vdev_setup_done, - ATH12K_VDEV_SETUP_TIMEOUT_HZ)) + ATH12K_VDEV_SETUP_TIMEOUT_HZ)){ + WARN_ON(1); return -ETIMEDOUT; + } return ar->last_wmi_vdev_start_status ? -EINVAL : 0; } @@ -781,8 +1382,11 @@ static int ath12k_monitor_vdev_up(struct ath12k *ar, int vdev_id) { int ret; + struct vdev_up_params params = { 0 }; - ret = ath12k_wmi_vdev_up(ar, vdev_id, 0, ar->mac_addr); + params.vdev_id = vdev_id; + params.bssid = ar->mac_addr; + ret = ath12k_wmi_vdev_up(ar, ¶ms); if (ret) { ath12k_warn(ar->ab, "failed to put up monitor vdev %i: %d\n", vdev_id, ret); @@ -800,26 +1404,30 @@ struct ieee80211_channel *channel; struct wmi_vdev_start_req_arg arg = {}; int ret; + struct vdev_up_params params = { 0 }; lockdep_assert_held(&ar->conf_mutex); channel = chandef->chan; arg.vdev_id = vdev_id; - arg.freq = channel->center_freq; - arg.band_center_freq1 = chandef->center_freq1; - arg.band_center_freq2 = chandef->center_freq2; - arg.mode = ath12k_phymodes[chandef->chan->band][chandef->width]; - arg.chan_radar = !!(channel->flags & IEEE80211_CHAN_RADAR); - - arg.min_power = 0; - arg.max_power = channel->max_power; - arg.max_reg_power = channel->max_reg_power; - arg.max_antenna_gain = channel->max_antenna_gain; + arg.channel.freq = channel->center_freq; + arg.channel.band_center_freq1 = chandef->center_freq1; + arg.channel.band_center_freq2 = chandef->center_freq2; + arg.channel.mode = ath12k_phymodes[chandef->chan->band][chandef->width]; + arg.channel.chan_radar = + !!(channel->flags & IEEE80211_CHAN_RADAR); + + arg.channel.min_power = 0; + arg.channel.max_power = channel->max_power; + arg.channel.max_reg_power = channel->max_reg_power; + arg.channel.max_antenna_gain = channel->max_antenna_gain; arg.pref_tx_streams = ar->num_tx_chains; arg.pref_rx_streams = ar->num_rx_chains; - arg.passive |= !!(chandef->chan->flags & IEEE80211_CHAN_NO_IR); + arg.channel.passive |= !!(chandef->chan->flags & IEEE80211_CHAN_NO_IR); + + arg.ru_punct_bitmap = 0xFFFFFFFF; reinit_completion(&ar->vdev_setup_done); reinit_completion(&ar->vdev_delete_done); @@ -838,7 +1446,9 @@ return ret; } - ret = ath12k_wmi_vdev_up(ar, vdev_id, 0, ar->mac_addr); + params.vdev_id = vdev_id; + params.bssid = ar->mac_addr; + ret = ath12k_wmi_vdev_up(ar, ¶ms); if (ret) { ath12k_warn(ar->ab, "failed to put up monitor vdev %i: %d\n", vdev_id, ret); @@ -885,17 +1495,16 @@ return ret; } -static int ath12k_mac_monitor_vdev_create(struct ath12k *ar) +int ath12k_mac_monitor_vdev_create(struct ath12k *ar) { struct ath12k_pdev *pdev = ar->pdev; struct ath12k_wmi_vdev_create_arg arg = {}; int bit, ret; - u8 tmp_addr[6]; u16 nss; lockdep_assert_held(&ar->conf_mutex); - if (ar->monitor_vdev_created) + if (test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) return 0; if (ar->ab->free_vdev_map == 0) { @@ -903,7 +1512,10 @@ return -ENOMEM; } + spin_lock_bh(&ar->ab->base_lock); bit = __ffs64(ar->ab->free_vdev_map); + ar->ab->free_vdev_map &= ~(1LL << bit); + spin_unlock_bh(&ar->ab->base_lock); ar->monitor_vdev_id = bit; @@ -923,10 +1535,13 @@ arg.chains[NL80211_BAND_5GHZ].rx = ar->num_rx_chains; } - ret = ath12k_wmi_vdev_create(ar, tmp_addr, &arg); + ret = ath12k_wmi_vdev_create(ar, ar->mac_addr, &arg); if (ret) { ath12k_warn(ar->ab, "failed to request monitor vdev %i creation: %d\n", ar->monitor_vdev_id, ret); + spin_lock_bh(&ar->ab->base_lock); + ar->ab->free_vdev_map |= 1LL << (ar->monitor_vdev_id); + spin_unlock_bh(&ar->ab->base_lock); ar->monitor_vdev_id = -1; return ret; } @@ -945,23 +1560,23 @@ return ret; ar->allocated_vdev_map |= 1LL << ar->monitor_vdev_id; - ar->ab->free_vdev_map &= ~(1LL << ar->monitor_vdev_id); ar->num_created_vdevs++; - ar->monitor_vdev_created = true; + set_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac monitor vdev %d created\n", ar->monitor_vdev_id); return 0; } -static int ath12k_mac_monitor_vdev_delete(struct ath12k *ar) +int ath12k_mac_monitor_vdev_delete(struct ath12k *ar) { int ret; unsigned long time_left; lockdep_assert_held(&ar->conf_mutex); - if (!ar->monitor_vdev_created) + if (!test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) return 0; reinit_completion(&ar->vdev_delete_done); @@ -979,42 +1594,55 @@ ath12k_warn(ar->ab, "Timeout in receiving vdev delete response\n"); } else { ar->allocated_vdev_map &= ~(1LL << ar->monitor_vdev_id); + spin_lock_bh(&ar->ab->base_lock); ar->ab->free_vdev_map |= 1LL << (ar->monitor_vdev_id); ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac monitor vdev %d deleted\n", ar->monitor_vdev_id); + spin_unlock_bh(&ar->ab->base_lock); ar->num_created_vdevs--; ar->monitor_vdev_id = -1; - ar->monitor_vdev_created = false; + clear_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags); } return ret; } -static void +void ath12k_mac_get_any_chandef_iter(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *conf, void *data) { - struct cfg80211_chan_def **def = data; + struct ath12k_mac_any_chandef_arg *arg = + (struct ath12k_mac_any_chandef_arg *)data; + struct ath12k *ctx_ar, *ar = arg->ar; + + ctx_ar = ath12k_get_ar_by_ctx(ar->ah->hw, conf); - *def = &conf->def; + if (ctx_ar == ar) + arg->def = &conf->def; } -static int ath12k_mac_monitor_start(struct ath12k *ar) +int ath12k_mac_monitor_start(struct ath12k *ar) { - struct cfg80211_chan_def *chandef = NULL; + struct cfg80211_chan_def *chandef; + struct ath12k_mac_any_chandef_arg arg = { .ar = ar, .def = NULL}; int ret; lockdep_assert_held(&ar->conf_mutex); - if (ar->monitor_started) + if (test_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags)) return 0; - ieee80211_iter_chan_contexts_atomic(ar->hw, + ieee80211_iter_chan_contexts_atomic(ar->ah->hw, ath12k_mac_get_any_chandef_iter, - &chandef); + &arg); + chandef = arg.def; if (!chandef) - return 0; + return -EINVAL; + + /* TODO 5G low high split changes */ + if (!ar->mac.sbands[chandef->chan->band].channels) + return -EINVAL; ret = ath12k_mac_monitor_vdev_start(ar, ar->monitor_vdev_id, chandef); if (ret) { @@ -1023,21 +1651,28 @@ return ret; } - ar->monitor_started = true; - ar->num_started_vdevs++; ret = ath12k_dp_tx_htt_monitor_mode_ring_config(ar, false); + if (ret) { + ath12k_warn(ar->ab, + "fail to set monitor filter: %d\n", ret); + return ret; + } + + set_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags); + ar->num_started_vdevs++; + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac monitor started ret %d\n", ret); return ret; } -static int ath12k_mac_monitor_stop(struct ath12k *ar) +int ath12k_mac_monitor_stop(struct ath12k *ar) { int ret; lockdep_assert_held(&ar->conf_mutex); - if (!ar->monitor_started) + if (!test_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags)) return 0; ret = ath12k_mac_monitor_vdev_stop(ar); @@ -1046,7 +1681,7 @@ return ret; } - ar->monitor_started = false; + clear_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags); ar->num_started_vdevs--; ret = ath12k_dp_tx_htt_monitor_mode_ring_config(ar, true); ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac monitor stopped ret %d\n", ret); @@ -1055,92 +1690,421 @@ static int ath12k_mac_op_config(struct ieee80211_hw *hw, u32 changed) { - struct ath12k *ar = hw->priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; struct ieee80211_conf *conf = &hw->conf; - int ret = 0; + int ret, i; - mutex_lock(&ar->conf_mutex); + mutex_lock(&ah->conf_mutex); + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + mutex_lock(&ar->conf_mutex); if (changed & IEEE80211_CONF_CHANGE_MONITOR) { - ar->monitor_conf_enabled = conf->flags & IEEE80211_CONF_MONITOR; - if (ar->monitor_conf_enabled) { - if (ar->monitor_vdev_created) - goto exit; + if (conf->flags & IEEE80211_CONF_MONITOR) { + set_bit(MONITOR_CONF_ENABLED, &ar->monitor_flags); + if (test_bit(MONITOR_VDEV_CREATED, + &ar->monitor_flags)) + goto out; + ret = ath12k_mac_monitor_vdev_create(ar); if (ret) - goto exit; + goto out; ret = ath12k_mac_monitor_start(ar); - if (ret) - goto err_mon_del; + if (ret) { + ath12k_mac_monitor_vdev_delete(ar); + goto out; + } } else { - if (!ar->monitor_vdev_created) - goto exit; + clear_bit(MONITOR_CONF_ENABLED, &ar->monitor_flags); + if (!test_bit(MONITOR_VDEV_CREATED, + &ar->monitor_flags)) + goto out; + ret = ath12k_mac_monitor_stop(ar); if (ret) - goto exit; + goto out; + ath12k_mac_monitor_vdev_delete(ar); } } - -exit: +out: mutex_unlock(&ar->conf_mutex); - return ret; + ar++; + } + + mutex_unlock(&ah->conf_mutex); -err_mon_del: - ath12k_mac_monitor_vdev_delete(ar); - mutex_unlock(&ar->conf_mutex); return ret; } -static int ath12k_mac_setup_bcn_tmpl(struct ath12k_vif *arvif) +static void ath12k_mac_setup_bcn_tmpl_vif_params(struct ath12k_link_vif *arvif, + struct sk_buff *bcn) { - struct ath12k *ar = arvif->ar; - struct ath12k_base *ab = ar->ab; - struct ieee80211_hw *hw = ar->hw; - struct ieee80211_vif *vif = arvif->vif; - struct ieee80211_mutable_offsets offs = {}; - struct sk_buff *bcn; struct ieee80211_mgmt *mgmt; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vht_cap *vht_cap; u8 *ies; - int ret; + const u8 *vht_cap_ie; - if (arvif->vdev_type != WMI_VDEV_TYPE_AP) - return 0; + ies = bcn->data + ieee80211_get_hdrlen_from_skb(bcn); + mgmt = (struct ieee80211_mgmt *)bcn->data; + ies += sizeof(mgmt->u.beacon); - bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0); - if (!bcn) { - ath12k_warn(ab, "failed to get beacon template from mac80211\n"); - return -EPERM; + /* avoid ie parsing if already done for this ahvif */ + if (!ahvif->rsnie_present && + cfg80211_find_ie(WLAN_EID_RSN, ies, (skb_tail_pointer(bcn) - ies))) + ahvif->rsnie_present = true; + + vht_cap_ie = cfg80211_find_ie(WLAN_EID_VHT_CAPABILITY, ies, (skb_tail_pointer(bcn) - ies)); + if (vht_cap_ie && vht_cap_ie[1] >= sizeof(*vht_cap)) { + vht_cap = (void *)(vht_cap_ie + 2); + arvif->vht_cap = vht_cap->vht_cap_info; + } + + /* avoid ie parsing if already done for this ahvif */ + if (!ahvif->wpaie_present && + cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, + WLAN_OUI_TYPE_MICROSOFT_WPA, + ies, (skb_tail_pointer(bcn) - ies))) + ahvif->wpaie_present = true; } +static bool ath12k_mac_setup_bcn_tmpl_nontx_vif_params(struct ath12k_link_vif *tx_arvif, + struct ath12k_link_vif *arvif, + struct sk_buff *bcn) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_mgmt *mgmt; + const u8 *ies, *profile, *next_profile; + int ies_len; + + if (arvif == tx_arvif) + return true; + + ahvif->rsnie_present = ahvif->rsnie_present; + ies = bcn->data + ieee80211_get_hdrlen_from_skb(bcn); ies += sizeof(mgmt->u.beacon); + ies_len = skb_tail_pointer(bcn) - ies; - if (cfg80211_find_ie(WLAN_EID_RSN, ies, (skb_tail_pointer(bcn) - ies))) - arvif->rsnie_present = true; + ies = cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ies, ies_len); - if (cfg80211_find_vendor_ie(WLAN_OUI_MICROSOFT, - WLAN_OUI_TYPE_MICROSOFT_WPA, - ies, (skb_tail_pointer(bcn) - ies))) - arvif->wpaie_present = true; + while (ies) { + u8 mbssid_len; - ret = ath12k_wmi_bcn_tmpl(ar, arvif->vdev_id, &offs, bcn); + ies_len -= (2 + ies[1]); + mbssid_len = ies[1] - 1; + profile = &ies[3]; + + while (mbssid_len) { + u8 profile_len, nie_len; + const u8 *nie; + + profile_len = profile[1]; + next_profile = profile + (2 + profile_len); + mbssid_len -= (2 + profile_len); + + profile += 2; + profile_len -= (2 + profile[1]); + profile += (2 + profile[1]); /* nontx capabilities */ + profile_len -= (2 + profile[1]); + profile += (2 + profile[1]); /* SSID */ + if (profile[2] == ahvif->vif->bss_conf.bssid_index) { + profile_len -= 5; + profile = profile + 5; + + if (cfg80211_find_ie(WLAN_EID_RSN, profile, + profile_len)) + ahvif->rsnie_present = true; + else if (ahvif->rsnie_present) { + nie = cfg80211_find_ext_ie(WLAN_EID_EXT_NON_INHERITANCE, + profile, + profile_len); + if (nie) { + int i; - kfree_skb(bcn); + nie_len = nie[1]; + nie += 2; + for (i = 0; i < nie_len; i++) { + if (nie[i] == + WLAN_EID_RSN) { + ahvif->rsnie_present = false; + break; + } + } + } + } + return true; + } + profile = next_profile; + } + ies = cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, profile, + ies_len); + } + + return false; +} + +static int __ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif, + struct sk_buff *bcn, + struct ieee80211_mutable_offsets offs, + int ema_idx, int ema_cnt) +{ + struct ath12k *ar = arvif->ar; + u32 ema_param = 0; + + if (ema_cnt) { + ema_param = (ema_cnt << WMI_BEACON_EMA_PARAM_PERIODICITY_SHIFT); + ema_param |= (ema_idx << WMI_BEACON_EMA_PARAM_TMPL_IDX_SHIFT); + ema_param |= ((!ema_idx ? 1 : 0) << + WMI_BEACON_EMA_PARAM_FIRST_TMPL_SHIFT); + ema_param |= ((ema_idx + 1 == ema_cnt ? 1 : 0) << + WMI_BEACON_EMA_PARAM_LAST_TMPL_SHIFT); + } + + return ath12k_wmi_bcn_tmpl(ar, arvif->vdev_id, &offs, bcn, ema_param); +} + +static int ath12k_mac_setup_bcn_tmpl_ema(struct ath12k_link_vif *arvif) +{ + struct ath12k_link_vif *tx_arvif; + struct ath12k_vif *tx_ahvif, *ahvif = arvif->ahvif; + struct ieee80211_ema_beacons *beacons; + struct ieee80211_bss_conf *link; + u8 i = 0; + int ret = 0; + bool found_vdev = false; + rcu_read_lock(); + link = ath12k_get_link_bss_conf(arvif); + if (!link->mbssid_tx_vif) { + rcu_read_unlock(); + return -1; + } + tx_ahvif = (void *)link->mbssid_tx_vif->drv_priv; + if (!tx_ahvif) { + rcu_read_unlock(); + return -ENOLINK; + } + /* both TX an NON_TX arvif's should be under same ar and hw + * hence current acquired lock's should suffice for opertaing + * with tx arvif also + */ + lockdep_assert_held(&tx_ahvif->ah->conf_mutex); + tx_arvif = tx_ahvif->link[link->mbssid_tx_vif_linkid]; + if (!tx_arvif) { + rcu_read_unlock(); + return -ENOLINK; + } + + if (arvif != tx_arvif && !tx_arvif->is_started) { + rcu_read_unlock(); + ath12k_warn(arvif->ar->ab, + "Transmit vif is not started before this non Tx beacon setup for vdev %d\n", + arvif->vdev_id); + return -EINVAL; + } + + lockdep_assert_held(&tx_arvif->ar->conf_mutex); + beacons = ieee80211_beacon_get_template_ema_list(tx_arvif->ar->ah->hw, + tx_ahvif->vif, + tx_arvif->link_id); + rcu_read_unlock(); + if (!beacons || !beacons->cnt) { + ath12k_warn(arvif->ar->ab, + "failed to get ema beacon templates from mac80211\n"); + return -EPERM; + } + + if (tx_arvif == arvif) { + ath12k_mac_setup_bcn_tmpl_vif_params(tx_arvif, + beacons->bcn[0].skb); + found_vdev = true; + } else { + ahvif->wpaie_present = ahvif->wpaie_present; + } + + for (i = 0; i < beacons->cnt; i++) { + if (found_vdev == false) + found_vdev = + ath12k_mac_setup_bcn_tmpl_nontx_vif_params(tx_arvif, + arvif, + beacons->bcn[i].skb); + + ret = __ath12k_mac_setup_bcn_tmpl(tx_arvif, beacons->bcn[i].skb, + beacons->bcn[i].offs, + i, beacons->cnt); + if (ret) { + ath12k_warn(arvif->ar->ab, + "failed to set ema beacon template id %i error %d\n", + i, ret); + break; + } + } + + ieee80211_beacon_free_ema_list(beacons); + return ret; +} + +static int ath12k_mac_setup_bcn_tmpl_non_ema(struct ath12k_link_vif *arvif) +{ + struct ath12k_link_vif *tx_arvif = arvif; + struct ath12k_vif *tx_ahvif = arvif->ahvif; + struct ieee80211_mutable_offsets offs = {}; + struct sk_buff *bcn; + struct ieee80211_bss_conf *link; + int ret; + + rcu_read_lock(); + link = ath12k_get_link_bss_conf(arvif); + if (!link) { + rcu_read_unlock(); + return -ENOLINK; + } + + if (link->mbssid_tx_vif) { + tx_ahvif = (void *)link->mbssid_tx_vif->drv_priv; + if (!tx_ahvif) { + rcu_read_unlock(); + return -ENOLINK; + } + lockdep_assert_held(&tx_ahvif->ah->conf_mutex); + tx_arvif = tx_ahvif->link[link->mbssid_tx_vif_linkid]; + } + + if (!tx_arvif) { + rcu_read_unlock(); + return -ENOLINK; + } + + if (arvif != tx_arvif && !tx_arvif->is_started) { + rcu_read_unlock(); + ath12k_warn(arvif->ar->ab, + "Transmit vif is not started before this non Tx beacon setup for vdev %d\n", + arvif->vdev_id); + return -EINVAL; + } + + lockdep_assert_held(&tx_arvif->ar->conf_mutex); + bcn = ieee80211_beacon_get_template(tx_arvif->ar->ah->hw, tx_ahvif->vif, + &offs, tx_arvif->link_id); + rcu_read_unlock(); + if (!bcn) { + ath12k_warn(arvif->ar->ab, + "failed to get beacon template from mac80211\n"); + return -EPERM; + } + + if (tx_arvif == arvif) + ath12k_mac_setup_bcn_tmpl_vif_params(tx_arvif, bcn); + else + (void) ath12k_mac_setup_bcn_tmpl_nontx_vif_params(tx_arvif, + arvif, + bcn); + + ret = __ath12k_mac_setup_bcn_tmpl(tx_arvif, bcn, offs, 0, 0); if (ret) - ath12k_warn(ab, "failed to submit beacon template command: %d\n", + ath12k_warn(tx_arvif->ar->ab, + "failed to submit beacon template command: %d\n", ret); + kfree_skb(bcn); return ret; } -static void ath12k_control_beaconing(struct ath12k_vif *arvif, +static int ath12k_mac_setup_bcn_tmpl(struct ath12k_link_vif *arvif) +{ + struct ath12k_vif *tx_ahvif, *ahvif = arvif->ahvif; + struct ieee80211_bss_conf *link; + bool is_ema; + + if (ahvif->vdev_type != WMI_VDEV_TYPE_AP) + return 0; + + rcu_read_lock(); + link = ath12k_get_link_bss_conf(arvif); + if (!link) { + rcu_read_unlock(); + return -ENOLINK; + } + if (link->mbssid_tx_vif) { + tx_ahvif = (void *)link->mbssid_tx_vif->drv_priv; + if (ahvif != tx_ahvif && arvif->is_up) { + rcu_read_unlock(); + return 0; + } + } + is_ema = link->ema_ap; + rcu_read_unlock(); + + if (is_ema) + return ath12k_mac_setup_bcn_tmpl_ema(arvif); + else + return ath12k_mac_setup_bcn_tmpl_non_ema(arvif); +} + + +void ath12k_mac_bcn_tx_event(struct ath12k_link_vif *arvif) +{ + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k *ar = arvif->ar; + struct ieee80211_bss_conf* link_conf; + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + ath12k_warn(ar->ab, "unable to access bss link conf in bcn tx event\n"); + return; + } + + if (!link_conf->color_change_active && !arvif->bcca_zero_sent) + return; + + if (link_conf->color_change_active && + ieee80211_beacon_cntdwn_is_complete_mlo(vif, arvif->link_id)) { + arvif->bcca_zero_sent = true; + ieee80211_color_change_finish_mlo(vif, arvif->link_id); + return; + } + + arvif->bcca_zero_sent = false; + + if (link_conf->color_change_active && !link_conf->ema_ap) + ieee80211_beacon_update_cntdwn_mlo(vif, arvif->link_id); + ieee80211_queue_work(ar->ah->hw, &arvif->update_bcn_template_work); +} + +static void ath12k_control_beaconing(struct ath12k_link_vif *arvif, struct ieee80211_bss_conf *info) { struct ath12k *ar = arvif->ar; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_vif *tx_ahvif = NULL; + struct ath12k_link_vif *tx_arvif = NULL; + struct ieee80211_bss_conf *link; int ret; + struct vdev_up_params params = { 0 }; + + rcu_read_lock(); + link = ath12k_get_link_bss_conf(arvif); + if (!link) { + rcu_read_unlock(); + return; + } + if (link->mbssid_tx_vif) { + tx_ahvif = (void *)link->mbssid_tx_vif->drv_priv; + if (tx_ahvif) { + lockdep_assert_held(&tx_ahvif->ah->conf_mutex); + tx_arvif = tx_ahvif->link[link->mbssid_tx_vif_linkid]; + if (tx_arvif) + lockdep_assert_held(&tx_arvif->ar->conf_mutex); + } + } + + rcu_read_unlock(); lockdep_assert_held(&arvif->ar->conf_mutex); if (!info->enable_beacon) { @@ -1150,6 +2114,7 @@ arvif->vdev_id, ret); arvif->is_up = false; + return; } @@ -1161,12 +2126,19 @@ return; } - arvif->aid = 0; + ahvif->aid = 0; - ether_addr_copy(arvif->bssid, info->bssid); + ether_addr_copy(arvif->bssid, info->addr); - ret = ath12k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid, - arvif->bssid); + params.vdev_id = arvif->vdev_id; + params.aid = ahvif->aid; + params.bssid = arvif->bssid; + if (tx_arvif) { + params.tx_bssid = tx_arvif->bssid; + params.profile_idx = info->bssid_index; + params.profile_count = BIT(info->bssid_indicator); + } + ret = ath12k_wmi_vdev_up(arvif->ar, ¶ms); if (ret) { ath12k_warn(ar->ab, "failed to bring up vdev %d: %i\n", arvif->vdev_id, ret); @@ -1178,13 +2150,87 @@ ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %d up\n", arvif->vdev_id); } +static void ath12k_mac_handle_beacon_iter(void *data, u8 *mac, + struct ieee80211_vif *vif) +{ + struct sk_buff *skb = data; + struct ieee80211_mgmt *mgmt = (void *)skb->data; + struct ath12k_vif *arvif = (void *)vif->drv_priv; + + if (vif->type != NL80211_IFTYPE_STATION) + return; + + if (!ether_addr_equal(mgmt->bssid, vif->bss_conf.bssid)) + return; + + cancel_delayed_work(&arvif->deflink.connection_loss_work); + +} + +void ath12k_mac_handle_beacon(struct ath12k *ar, struct sk_buff *skb) { + ieee80211_iterate_active_interfaces_atomic(ar->ah->hw, + IEEE80211_IFACE_ITER_NORMAL, + ath12k_mac_handle_beacon_iter, + skb); +} + +static void ath12k_mac_handle_beacon_miss_iter(void *data, u8 *mac, + struct ieee80211_vif *vif) +{ + u32 *vdev_id = data; + struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k *ar = arvif->deflink.ar; + struct ieee80211_hw *hw = ar->ah->hw; + + if (arvif->deflink.vdev_id != *vdev_id) + return; + + if (!arvif->deflink.is_up) + return; + + ieee80211_beacon_loss(vif); + + /* Firmware doesn't report beacon loss events repeatedly. If AP probe + * (done by mac80211) succeeds but beacons do not resume then it + * doesn't make sense to continue operation. Queue connection loss work + * which can be cancelled when beacon is received. + */ + ieee80211_queue_delayed_work(hw, &arvif->deflink.connection_loss_work, + ATH12K_CONNECTION_LOSS_HZ); +} + +void ath12k_mac_handle_beacon_miss(struct ath12k *ar, u32 vdev_id) { + ieee80211_iterate_active_interfaces_atomic(ar->ah->hw, + IEEE80211_IFACE_ITER_NORMAL, + ath12k_mac_handle_beacon_miss_iter, + &vdev_id); +} + +static void ath12k_mac_vif_sta_connection_loss_work(struct work_struct + *work) +{ + struct ath12k_link_vif *arvif = container_of(work, struct ath12k_link_vif, + connection_loss_work.work); + struct ieee80211_vif *vif = arvif->vif; + + if (!arvif->is_up) + return; + + ieee80211_connection_loss(vif); +} + + static void ath12k_peer_assoc_h_basic(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ieee80211_vif *vif = arvif->ahvif->vif; u32 aid; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); @@ -1193,44 +2239,58 @@ else aid = sta->aid; - ether_addr_copy(arg->peer_mac, sta->addr); + ether_addr_copy(arg->peer_mac, arsta->addr); arg->vdev_id = arvif->vdev_id; arg->peer_associd = aid; arg->auth_flag = true; /* TODO: STA WAR in ath10k for listen interval required? */ - arg->peer_listen_intval = ar->hw->conf.listen_interval; + arg->peer_listen_intval = ar->ah->hw->conf.listen_interval; arg->peer_nss = 1; arg->peer_caps = vif->bss_conf.assoc_capability; } static void ath12k_peer_assoc_h_crypto(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - struct ieee80211_bss_conf *info = &vif->bss_conf; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_bss_conf *info; struct cfg80211_chan_def def; struct cfg80211_bss *bss; - struct ath12k_vif *arvif = (struct ath12k_vif *)vif->drv_priv; const u8 *rsnie = NULL; const u8 *wpaie = NULL; + struct ieee80211_hw *hw; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); - if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + info = ath12k_get_link_bss_conf(arvif); + + if (!info) { + ath12k_warn(ar->ab, "unable to access bss link conf for peer assoc send\n"); + return; + } + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) return; - bss = cfg80211_get_bss(ar->hw->wiphy, def.chan, info->bssid, NULL, 0, + hw = ar->ah->hw; + bss = cfg80211_get_bss(hw->wiphy, def.chan, info->bssid, NULL, 0, IEEE80211_BSS_TYPE_ANY, IEEE80211_PRIVACY_ANY); - if (arvif->rsnie_present || arvif->wpaie_present) { + if (ahvif->rsnie_present || ahvif->wpaie_present) { arg->need_ptk_4_way = true; - if (arvif->wpaie_present) + if (ahvif->wpaie_present) arg->need_gtk_2_way = true; } else if (bss) { const struct cfg80211_bss_ies *ies; - rcu_read_lock(); rsnie = ieee80211_bss_get_ie(bss, WLAN_EID_RSN); ies = rcu_dereference(bss->ies); @@ -1239,12 +2299,11 @@ WLAN_OUI_TYPE_MICROSOFT_WPA, ies->data, ies->len); - rcu_read_unlock(); - cfg80211_put_bss(ar->hw->wiphy, bss); + cfg80211_put_bss(hw->wiphy, bss); } /* FIXME: base on RSN IE/WPA IE is a correct idea? */ - if (rsnie || wpaie) { + if (ar->supports_6ghz || rsnie || wpaie) { ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "%s: rsn ie found\n", __func__); arg->need_ptk_4_way = true; @@ -1264,12 +2323,100 @@ /* TODO: safe_mode_enabled (bypass 4-way handshake) flag req? */ } +static enum ieee80211_sta_rx_bandwidth +ath12k_get_radio_max_bw_caps(struct ath12k *ar, + enum nl80211_band band, + enum ieee80211_sta_rx_bandwidth sta_bw, + enum nl80211_iftype iftype) +{ + struct ieee80211_supported_band *sband; + struct ieee80211_sband_iftype_data *iftype_data; + const struct ieee80211_sta_eht_cap *eht_cap; + const struct ieee80211_sta_he_cap *he_cap; + int i, idx = 0; + + sband = &ar->mac.sbands[band]; + iftype_data = ar->mac.iftype[band]; + + if (!sband || !iftype_data) { + WARN_ONCE(1, "Invalid band specified :%d\n", band); + return sta_bw; + } + + for (i = 0; i < NUM_NL80211_IFTYPES && i != iftype; i++) { + switch(i) { + case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_MESH_POINT: + idx++; + break; + default: + break; + } + } + + eht_cap = &iftype_data[idx].eht_cap; + he_cap = &iftype_data[idx].he_cap; + + if (!eht_cap || !he_cap) + return sta_bw; + + /* EHT Caps */ + if (band != NL80211_BAND_2GHZ && eht_cap->has_eht && + (eht_cap->eht_cap_elem.phy_cap_info[0] & + IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ)) + return IEEE80211_STA_RX_BW_320; + + /* HE Caps */ + switch (band) { + case NL80211_BAND_5GHZ: + case NL80211_BAND_6GHZ: + if (he_cap->has_he) { + if (he_cap->he_cap_elem.phy_cap_info[0] & + (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)) { + return IEEE80211_STA_RX_BW_160; + } else if (he_cap->he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G) { + return IEEE80211_STA_RX_BW_80; + } + } + break; + case NL80211_BAND_2GHZ: + if (he_cap->has_he && + (he_cap->he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G)) + return IEEE80211_STA_RX_BW_40; + break; + default: + break; + } + + if (sband->vht_cap.vht_supported) { + switch (sband->vht_cap.cap & + IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) { + case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: + case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160_80PLUS80MHZ: + return IEEE80211_STA_RX_BW_160; + default: + return sta_bw; + } + } + + /* Keep Last */ + if (sband->ht_cap.ht_supported && + (sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)) + return IEEE80211_STA_RX_BW_40; + + return sta_bw; +} + static void ath12k_peer_assoc_h_rates(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ieee80211_vif *vif = arvif->ahvif->vif; struct wmi_rate_set_arg *rateset = &arg->peer_legacy_rates; struct cfg80211_chan_def def; const struct ieee80211_supported_band *sband; @@ -1278,15 +2425,28 @@ u32 ratemask; u8 rate; int i; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); - if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) + return; + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc rate set\n"); return; + } band = def.chan->band; - sband = ar->hw->wiphy->bands[band]; - ratemask = sta->deflink.supp_rates[band]; + sband = ar->ah->hw->wiphy->bands[band]; + ratemask = link_sta->supp_rates[band]; ratemask &= arvif->bitrate_mask.control[band].legacy; rates = sband->bitrates; @@ -1303,7 +2463,7 @@ } static bool -ath12k_peer_assoc_h_ht_masked(const u8 ht_mcs_mask[IEEE80211_HT_MCS_MASK_LEN]) +ath12k_peer_assoc_h_ht_masked(const u8 *ht_mcs_mask) { int nss; @@ -1315,7 +2475,7 @@ } static bool -ath12k_peer_assoc_h_vht_masked(const u16 vht_mcs_mask[NL80211_VHT_NSS_MAX]) +ath12k_peer_assoc_h_vht_masked(const u16 *vht_mcs_mask) { int nss; @@ -1327,22 +2487,37 @@ } static void ath12k_peer_assoc_h_ht(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - const struct ieee80211_sta_ht_cap *ht_cap = &sta->deflink.ht_cap; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + const struct ieee80211_sta_ht_cap *ht_cap; + struct ieee80211_vif *vif = arvif->ahvif->vif; struct cfg80211_chan_def def; enum nl80211_band band; const u8 *ht_mcs_mask; int i, n; u8 max_nss; u32 stbc; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc ht set\n"); + return; + } + + ht_cap = &link_sta->ht_cap; lockdep_assert_held(&ar->conf_mutex); - if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) return; if (!ht_cap->ht_supported) @@ -1368,11 +2543,19 @@ if (ht_cap->cap & IEEE80211_HT_CAP_LDPC_CODING) arg->ldpc_flag = true; - if (sta->deflink.bandwidth >= IEEE80211_STA_RX_BW_40) { + if (link_sta->bandwidth >= IEEE80211_STA_RX_BW_40) { arg->bw_40 = true; arg->peer_rate_caps |= WMI_HOST_RC_CW40_FLAG; } + /* As firmware handles this two flags (IEEE80211_HT_CAP_SGI_20 + * and IEEE80211_HT_CAP_SGI_40) for enabling SGI, we reset + * both flags if guard interval is Default GI + */ + if (arvif->bitrate_mask.control[band].gi == NL80211_TXRATE_DEFAULT_GI) + arg->peer_ht_caps &= ~(IEEE80211_HT_CAP_SGI_20 | + IEEE80211_HT_CAP_SGI_40); + if (arvif->bitrate_mask.control[band].gi != NL80211_TXRATE_FORCE_LGI) { if (ht_cap->cap & (IEEE80211_HT_CAP_SGI_20 | IEEE80211_HT_CAP_SGI_40)) @@ -1418,7 +2601,7 @@ arg->peer_ht_rates.rates[i] = i; } else { arg->peer_ht_rates.num_rates = n; - arg->peer_nss = min(sta->deflink.rx_nss, max_nss); + arg->peer_nss = min(link_sta->rx_nss, max_nss); } ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac ht peer %pM mcs cnt %d nss %d\n", @@ -1487,23 +2670,66 @@ return tx_mcs_set; } +static u8 ath12k_get_nss_160mhz(struct ath12k *ar, + u8 max_nss) +{ + u8 nss_ratio_info = ar->pdev->cap.nss_ratio_info; + u8 max_sup_nss = 0; + + switch (nss_ratio_info) { + case WMI_NSS_RATIO_1BY2_NSS: + max_sup_nss = max_nss >> 1; + break; + case WMI_NSS_RATIO_3BY4_NSS: + ath12k_warn(ar->ab, "WMI_NSS_RATIO_3BY4_NSS not supported\n"); + break; + case WMI_NSS_RATIO_1_NSS: + max_sup_nss = max_nss; + break; + case WMI_NSS_RATIO_2_NSS: + ath12k_warn(ar->ab, "WMI_NSS_RATIO_2_NSS not supported\n"); + break; + default: + ath12k_warn(ar->ab, "invalid nss ratio received from fw\n"); + break; + } + + return max_sup_nss; +} + static void ath12k_peer_assoc_h_vht(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - const struct ieee80211_sta_vht_cap *vht_cap = &sta->deflink.vht_cap; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + const struct ieee80211_sta_vht_cap *vht_cap; + struct ieee80211_vif *vif = arvif->ahvif->vif; struct cfg80211_chan_def def; enum nl80211_band band; - const u16 *vht_mcs_mask; + u16 *vht_mcs_mask; u16 tx_mcs_map; u8 ampdu_factor; u8 max_nss, vht_mcs; - int i; + int i, vht_nss, nss_idx; + bool user_rate_valid = true; + u32 rx_nss, tx_nss, nss_160; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + link_sta = ath12k_get_link_sta(arsta); - if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc vht set\n"); return; + } + vht_cap = &link_sta->vht_cap; + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) { + return; + } if (!vht_cap->vht_supported) return; @@ -1537,12 +2763,31 @@ (1U << (IEEE80211_HT_MAX_AMPDU_FACTOR + ampdu_factor)) - 1); - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_80) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_80) arg->bw_80 = true; - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160) arg->bw_160 = true; + vht_nss = ath12k_mac_max_vht_nss(vht_mcs_mask); + + if (vht_nss > link_sta->rx_nss) { + user_rate_valid = false; + for (nss_idx = link_sta->rx_nss - 1; nss_idx >= 0; nss_idx--) { + if (vht_mcs_mask[nss_idx]) { + user_rate_valid = true; + break; + } + } + } + + if (!user_rate_valid) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Setting vht range MCS value to peer supported nss:%d for peer %pM\n", + link_sta->rx_nss, arsta->addr); + vht_mcs_mask[link_sta->rx_nss - 1] = vht_mcs_mask[vht_nss - 1]; + } + /* Calculate peer NSS capability from VHT capabilities if STA * supports VHT. */ @@ -1554,7 +2799,7 @@ vht_mcs_mask[i]) max_nss = i + 1; } - arg->peer_nss = min(sta->deflink.rx_nss, max_nss); + arg->peer_nss = min(link_sta->rx_nss, max_nss); arg->rx_max_rate = __le16_to_cpu(vht_cap->vht_mcs.rx_highest); arg->rx_mcs_set = __le16_to_cpu(vht_cap->vht_mcs.rx_mcs_map); arg->tx_max_rate = __le16_to_cpu(vht_cap->vht_mcs.tx_highest); @@ -1576,27 +2821,91 @@ /* TODO: Check */ arg->tx_max_mcs_nss = 0xFF; - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vht peer %pM max_mpdu %d flags 0x%x\n", - sta->addr, arg->peer_max_mpdu, arg->peer_flags); + if (arg->peer_phymode == MODE_11AC_VHT160 || + arg->peer_phymode == MODE_11AC_VHT80_80) { + tx_nss = ath12k_get_nss_160mhz(ar, max_nss); + rx_nss = min(arg->peer_nss, tx_nss); + arg->peer_bw_rxnss_override = ATH12K_BW_NSS_MAP_ENABLE; + + if (!rx_nss) { + ath12k_warn(ar->ab, "invalid max_nss\n"); + return; + } + + if (arg->peer_phymode == MODE_11AC_VHT160) + nss_160 = FIELD_PREP(ATH12K_PEER_RX_NSS_160MHZ, rx_nss - 1); + else + nss_160 = FIELD_PREP(ATH12K_PEER_RX_NSS_80_80MHZ, rx_nss - 1); + + arg->peer_bw_rxnss_override |= nss_160; + } - /* TODO: rxnss_override */ + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac vht peer %pM max_mpdu %d flags 0x%x nss_override 0x%x\n", + arsta->addr, arg->peer_max_mpdu, arg->peer_flags, + arg->peer_bw_rxnss_override); } static void ath12k_peer_assoc_h_he(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - const struct ieee80211_sta_he_cap *he_cap = &sta->deflink.he_cap; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct cfg80211_chan_def def; + const struct ieee80211_sta_he_cap *he_cap; int i; u8 ampdu_factor, rx_mcs_80, rx_mcs_160, max_nss; u16 mcs_160_map, mcs_80_map; bool support_160; - u16 v; + enum nl80211_band band; + u16 *he_mcs_mask; + u8 he_mcs; + u16 he_tx_mcs = 0, v = 0; + int he_nss, nss_idx; + bool user_rate_valid = true; + u32 rx_nss, tx_nss, nss_160; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_bss_conf* link_conf; + struct ieee80211_link_sta *link_sta; + u32 peer_he_ops; + enum ieee80211_sta_rx_bandwidth radio_max_bw_caps; + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + ath12k_warn(ar->ab, "unable to access bss link conf in peer assoc\n"); + return; + } + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc he set\n"); + return; + } + + peer_he_ops = link_conf->he_oper.params; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + he_cap = &link_sta->he_cap; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) + return; if (!he_cap->has_he) return; + band = def.chan->band; + he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs; + radio_max_bw_caps = ath12k_get_radio_max_bw_caps(ar, band, link_sta->bandwidth, + vif->type); + + if (ath12k_peer_assoc_h_he_masked(he_mcs_mask)) + return; + arg->he_flag = true; support_160 = !!(he_cap->he_cap_elem.phy_cap_info[0] & @@ -1631,13 +2940,15 @@ else max_nss = rx_mcs_80; - arg->peer_nss = min(sta->deflink.rx_nss, max_nss); + arg->peer_nss = min(link_sta->rx_nss, max_nss); memcpy(&arg->peer_he_cap_macinfo, he_cap->he_cap_elem.mac_cap_info, sizeof(arg->peer_he_cap_macinfo)); memcpy(&arg->peer_he_cap_phyinfo, he_cap->he_cap_elem.phy_cap_info, sizeof(arg->peer_he_cap_phyinfo)); - arg->peer_he_ops = vif->bss_conf.he_oper.params; + + arg->peer_he_ops = peer_he_ops; + /* the top most byte is used to indicate BSS color info */ arg->peer_he_ops &= 0xffffff; @@ -1659,10 +2970,10 @@ IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK; if (ampdu_factor) { - if (sta->deflink.vht_cap.vht_supported) + if (link_sta->vht_cap.vht_supported) arg->peer_max_mpdu = (1 << (IEEE80211_HE_VHT_MAX_AMPDU_FACTOR + ampdu_factor)) - 1; - else if (sta->deflink.ht_cap.ht_supported) + else if (link_sta->ht_cap.ht_supported) arg->peer_max_mpdu = (1 << (IEEE80211_HE_HT_MAX_AMPDU_FACTOR + ampdu_factor)) - 1; } @@ -1703,25 +3014,49 @@ if (he_cap->he_cap_elem.mac_cap_info[0] & IEEE80211_HE_MAC_CAP0_TWT_REQ) arg->twt_requester = true; - switch (sta->deflink.bandwidth) { + he_nss = ath12k_mac_max_he_nss(he_mcs_mask); + + if (he_nss > link_sta->rx_nss) { + user_rate_valid = false; + for (nss_idx = link_sta->rx_nss - 1; nss_idx >= 0; nss_idx--) { + if (he_mcs_mask[nss_idx]) { + user_rate_valid = true; + break; + } + } + } + + if (!user_rate_valid) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Setting he range MCS value to peer supported nss:%d for peer %pM\n", + link_sta->rx_nss, arsta->addr); + he_mcs_mask[link_sta->rx_nss - 1] = he_mcs_mask[he_nss - 1]; + } + + switch (min(link_sta->sta_max_bandwidth, radio_max_bw_caps)) { case IEEE80211_STA_RX_BW_160: if (he_cap->he_cap_elem.phy_cap_info[0] & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) { v = le16_to_cpu(he_cap->he_mcs_nss_supp.rx_mcs_80p80); + v = ath12k_peer_assoc_h_he_limit(v, he_mcs_mask); arg->peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80_80] = v; v = le16_to_cpu(he_cap->he_mcs_nss_supp.tx_mcs_80p80); arg->peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80_80] = v; arg->peer_he_mcs_count++; + he_tx_mcs = v; } v = le16_to_cpu(he_cap->he_mcs_nss_supp.rx_mcs_160); arg->peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160] = v; v = le16_to_cpu(he_cap->he_mcs_nss_supp.tx_mcs_160); + v = ath12k_peer_assoc_h_he_limit(v, he_mcs_mask); arg->peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_160] = v; arg->peer_he_mcs_count++; + if (!he_tx_mcs) + he_tx_mcs = v; fallthrough; default: @@ -1729,24 +3064,463 @@ arg->peer_he_rx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80] = v; v = le16_to_cpu(he_cap->he_mcs_nss_supp.tx_mcs_80); + v = ath12k_peer_assoc_h_he_limit(v, he_mcs_mask); arg->peer_he_tx_mcs_set[WMI_HECAP_TXRX_MCS_NSS_IDX_80] = v; arg->peer_he_mcs_count++; + if (!he_tx_mcs) + he_tx_mcs = v; break; } + + /* Calculate peer NSS capability from HE capabilities if STA + * supports HE. + */ + for (i = 0, max_nss = 0, he_mcs = 0; i < NL80211_HE_NSS_MAX; i++) { + he_mcs = he_tx_mcs >> (2 * i) & 3; + + /* In case of fixed rates, MCS Range in he_tx_mcs might have + * unsupported range, with he_mcs_mask set, so check either of them + * to find nss. + */ + if (he_mcs != IEEE80211_HE_MCS_NOT_SUPPORTED || + he_mcs_mask[i]) + max_nss = i + 1; } + arg->peer_nss = min(link_sta->rx_nss, max_nss); + + if (arg->peer_phymode == MODE_11AX_HE160 || + arg->peer_phymode == MODE_11AX_HE80_80) { + tx_nss = ath12k_get_nss_160mhz(ar, ar->num_tx_chains); + rx_nss = min(arg->peer_nss, tx_nss); -static void ath12k_peer_assoc_h_smps(struct ieee80211_sta *sta, + arg->peer_nss = min(link_sta->rx_nss, ar->num_rx_chains); + arg->peer_bw_rxnss_override = ATH12K_BW_NSS_MAP_ENABLE; + + if (!rx_nss) { + ath12k_warn(ar->ab, "invalid max_nss\n"); + return; + } + + if (arg->peer_phymode == MODE_11AX_HE160) + nss_160 = FIELD_PREP(ATH12K_PEER_RX_NSS_160MHZ, rx_nss - 1); + else + nss_160 = FIELD_PREP(ATH12K_PEER_RX_NSS_80_80MHZ, rx_nss - 1); + + arg->peer_bw_rxnss_override |= nss_160; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac he peer %pM nss %d mcs cnt %d nss_override 0x%x\n", + arsta->addr, arg->peer_nss, + arg->peer_he_mcs_count, + arg->peer_bw_rxnss_override); +} + +static void ath12k_peer_assoc_h_he_6ghz(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - const struct ieee80211_sta_ht_cap *ht_cap = &sta->deflink.ht_cap; + struct ieee80211_vif *vif = arvif->ahvif->vif; + const struct ieee80211_sta_he_cap *he_cap; + struct cfg80211_chan_def def; + enum nl80211_band band; + u8 ampdu_factor; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc he-6ghz set\n"); + return; + } + he_cap = &link_sta->he_cap; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) + return; + + band = def.chan->band; + + if (!arg->he_flag || band != NL80211_BAND_6GHZ || !link_sta->he_6ghz_capa.capa) + return; + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) + arg->bw_40 = true; + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_80) + arg->bw_80 = true; + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160) + arg->bw_160 = true; + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_320) + arg->bw_320 = true; + + arg->peer_he_caps_6ghz = le16_to_cpu(link_sta->he_6ghz_capa.capa); + arg->peer_mpdu_density = + ath12k_parse_mpdudensity(FIELD_GET(IEEE80211_HE_6GHZ_CAP_MIN_MPDU_START, + arg->peer_he_caps_6ghz)); + + /* From IEEE Std 802.11ax-2021 - Section 10.12.2: An HE STA shall be capable of + * receiving A-MPDU where the A-MPDU pre-EOF padding length is up to the value + * indicated by the Maximum A-MPDU Length Exponent Extension field in the HE + * Capabilities element and the Maximum A-MPDU Length Exponent field in HE 6 GHz + * Band Capabilities element in the 6 GHz band. + * + * Here, we are extracting the Max A-MPDU Exponent Extension from HE caps and + * factor is the Maximum A-MPDU Length Exponent from HE 6 GHZ Band capability. + */ + ampdu_factor = FIELD_GET(IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_MASK, + he_cap->he_cap_elem.mac_cap_info[3]) + + FIELD_GET(IEEE80211_HE_6GHZ_CAP_MAX_AMPDU_LEN_EXP, + arg->peer_he_caps_6ghz); + + arg->peer_max_mpdu = (1u << (IEEE80211_HE_6GHZ_MAX_AMPDU_FACTOR + + ampdu_factor)) - 1; +} + +static void +ath12k_mac_set_eht_mcs_nss_bitmap_20mhz_only( + const struct ieee80211_eht_mcs_nss_supp_20mhz_only *mcsnss, + u32 *rx_mcs, u32 *tx_mcs, + const u16 eht_mcs_limit[NL80211_EHT_NSS_MAX]) +{ + int nss; + u8 mcs_7 = 0, mcs_9 = 0, mcs_11 = 0, mcs_13 = 0; + u8 peer_mcs_7 = 0, peer_mcs_9 = 0, peer_mcs_11 = 0, peer_mcs_13 = 0; + + for (nss = 0; nss < NL80211_EHT_NSS_MAX; nss++) { + if (eht_mcs_limit[nss] & 0x00FF) + mcs_7++; + if (eht_mcs_limit[nss] & 0x0300) + mcs_9++; + if (eht_mcs_limit[nss] & 0x0C00) + mcs_11++; + if (eht_mcs_limit[nss] & 0x3000) + mcs_13++; + } + + peer_mcs_7 = u8_get_bits(mcsnss->rx_tx_mcs7_max_nss, IEEE80211_EHT_MCS_NSS_RX); + peer_mcs_9 = u8_get_bits(mcsnss->rx_tx_mcs9_max_nss, IEEE80211_EHT_MCS_NSS_RX); + peer_mcs_11 = u8_get_bits(mcsnss->rx_tx_mcs11_max_nss, IEEE80211_EHT_MCS_NSS_RX); + peer_mcs_13 = u8_get_bits(mcsnss->rx_tx_mcs13_max_nss, IEEE80211_EHT_MCS_NSS_RX); + + *rx_mcs = FIELD_PREP(WMI_MCS_NSS_MAP_0_7, min(peer_mcs_7, mcs_7)) | + FIELD_PREP(WMI_MCS_NSS_MAP_8_9, min(peer_mcs_9, mcs_9)) | + FIELD_PREP(WMI_MCS_NSS_MAP_10_11, min(peer_mcs_11, mcs_11)) | + FIELD_PREP(WMI_MCS_NSS_MAP_12_13, min (peer_mcs_13, mcs_13)); + + peer_mcs_7 = u8_get_bits(mcsnss->rx_tx_mcs7_max_nss, IEEE80211_EHT_MCS_NSS_TX); + peer_mcs_9 = u8_get_bits(mcsnss->rx_tx_mcs9_max_nss, IEEE80211_EHT_MCS_NSS_TX); + peer_mcs_11 = u8_get_bits(mcsnss->rx_tx_mcs11_max_nss, IEEE80211_EHT_MCS_NSS_TX); + peer_mcs_13 = u8_get_bits(mcsnss->rx_tx_mcs13_max_nss, IEEE80211_EHT_MCS_NSS_TX); + + *tx_mcs = FIELD_PREP(WMI_MCS_NSS_MAP_0_7, min(peer_mcs_7, mcs_7)) | + FIELD_PREP(WMI_MCS_NSS_MAP_8_9, min(peer_mcs_9, mcs_9)) | + FIELD_PREP(WMI_MCS_NSS_MAP_10_11, min(peer_mcs_11, mcs_11)) | + FIELD_PREP(WMI_MCS_NSS_MAP_12_13, min (peer_mcs_13, mcs_13)); +} + +static void +ath12k_mac_set_eht_mcs_nss_bitmap(const struct ieee80211_eht_mcs_nss_supp_bw *mcsnss, + u32 *rx_mcs, u32 *tx_mcs, + const u16 eht_mcs_limit[NL80211_EHT_NSS_MAX]) +{ + int nss; + u8 mcs_7 = 0, mcs_9 = 0, mcs_11 = 0, mcs_13 = 0; + u8 peer_mcs_7 = 0, peer_mcs_9 = 0, peer_mcs_11 = 0, peer_mcs_13 = 0; + + for (nss = 0; nss < NL80211_EHT_NSS_MAX; nss++) { + if (eht_mcs_limit[nss] & 0x00FF) + mcs_7++; + if (eht_mcs_limit[nss] & 0x0300) + mcs_9++; + if (eht_mcs_limit[nss] & 0x0C00) + mcs_11++; + if (eht_mcs_limit[nss] & 0x3000) + mcs_13++; + } + + peer_mcs_7 = u8_get_bits(mcsnss->rx_tx_mcs9_max_nss, IEEE80211_EHT_MCS_NSS_RX); + peer_mcs_9 = u8_get_bits(mcsnss->rx_tx_mcs9_max_nss, IEEE80211_EHT_MCS_NSS_RX); + peer_mcs_11 = u8_get_bits(mcsnss->rx_tx_mcs11_max_nss, IEEE80211_EHT_MCS_NSS_RX); + peer_mcs_13 = u8_get_bits(mcsnss->rx_tx_mcs13_max_nss, IEEE80211_EHT_MCS_NSS_RX); + + *rx_mcs = FIELD_PREP(WMI_MCS_NSS_MAP_0_7, min(peer_mcs_7, mcs_7)) | + FIELD_PREP(WMI_MCS_NSS_MAP_8_9, min(peer_mcs_9, mcs_9)) | + FIELD_PREP(WMI_MCS_NSS_MAP_10_11, min(peer_mcs_11, mcs_11)) | + FIELD_PREP(WMI_MCS_NSS_MAP_12_13, min (peer_mcs_13, mcs_13)); + + peer_mcs_7 = u8_get_bits(mcsnss->rx_tx_mcs9_max_nss, IEEE80211_EHT_MCS_NSS_TX); + peer_mcs_9 = u8_get_bits(mcsnss->rx_tx_mcs9_max_nss, IEEE80211_EHT_MCS_NSS_TX); + peer_mcs_11 = u8_get_bits(mcsnss->rx_tx_mcs11_max_nss, IEEE80211_EHT_MCS_NSS_TX); + peer_mcs_13 = u8_get_bits(mcsnss->rx_tx_mcs13_max_nss, IEEE80211_EHT_MCS_NSS_TX); + + *tx_mcs = FIELD_PREP(WMI_MCS_NSS_MAP_0_7, min(peer_mcs_7, mcs_7)) | + FIELD_PREP(WMI_MCS_NSS_MAP_8_9, min(peer_mcs_9, mcs_9)) | + FIELD_PREP(WMI_MCS_NSS_MAP_10_11, min(peer_mcs_11, mcs_11)) | + FIELD_PREP(WMI_MCS_NSS_MAP_12_13, min (peer_mcs_13, mcs_13)); +} + +static void ath12k_mac_set_eht_ppe_threshold(const u8 *ppe_thres, + struct ath12k_ppe_threshold *ppet) +{ + u32 bit_pos = IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE; + u8 nss; + + ppet->numss_m1 = ppe_thres[0] & IEEE80211_EHT_PPE_THRES_NSS_MASK; + ppet->ru_bit_mask = FIELD_GET(IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK, + __cpu_to_le16(ppe_thres[0])); + + for (nss = 0; nss <= ppet->numss_m1; nss++) { + u8 ru; + + for (ru = 0; + ru < hweight8(IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK); + ru++) { + u32 val = 0; + u8 i; + + if ((ppet->ru_bit_mask & BIT(ru)) == 0) + continue; + + for (i = 0; i < IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE; + i++) { + val >>= 1; + val |= ((ppe_thres[bit_pos / 8] >> + (bit_pos % 8)) & 0x1) << 5; + bit_pos++; + } + ppet->ppet16_ppet8_ru3_ru0[nss] |= + (val << + (ru * IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE)); + } + } +} + +static bool +ath12k_peer_assoc_h_eht_masked(const u16 eht_mcs_mask[NL80211_EHT_NSS_MAX]) +{ + int nss; + + for (nss = 0; nss < NL80211_EHT_NSS_MAX; nss++) + if (eht_mcs_mask[nss]) + return false; + + return true; +} + +static void ath12k_peer_assoc_h_eht(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, + struct ath12k_wmi_peer_assoc_arg *arg) +{ + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct cfg80211_chan_def def; + const struct ieee80211_sta_eht_cap *eht_cap; + const struct ieee80211_eht_mcs_nss_supp *mcs_nss; + const struct ieee80211_eht_mcs_nss_supp_bw *mcs_nss_supp_bw; + u8 mcs_idx = WMI_EHTCAP_TXRX_MCS_NSS_IDX_80; + enum nl80211_band band; + u16 *eht_mcs_mask; + u8 max_nss; + int eht_nss, nss_idx; + bool user_rate_valid = true; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_bss_conf* link_conf; + struct ieee80211_link_sta *link_sta; + const struct ieee80211_sta_eht_cap *own_eht_cap; + const struct ieee80211_eht_mcs_nss_supp *own_eht_mcs_nss_supp; + enum ieee80211_sta_rx_bandwidth radio_max_bw_caps; + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + ath12k_warn(ar->ab, "unable to access bss link conf in peer assoc\n"); + return; + } + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc eht set\n"); + return; + } + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + eht_cap = &link_sta->eht_cap; + mcs_nss = &eht_cap->eht_mcs_nss_supp; + mcs_nss_supp_bw = &mcs_nss->bw._80; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) + return; + + band = def.chan->band; + eht_mcs_mask = arvif->bitrate_mask.control[band].eht_mcs; + + radio_max_bw_caps = ath12k_get_radio_max_bw_caps(ar, band, link_sta->bandwidth, + vif->type); + + own_eht_cap = &ar->mac.sbands[band].iftype_data->eht_cap; + own_eht_mcs_nss_supp = &own_eht_cap->eht_mcs_nss_supp; + + if (ath12k_peer_assoc_h_eht_masked((const u16*) eht_mcs_mask)) + return; + + if (!link_sta->he_cap.has_he || !eht_cap->has_eht) + return; + + arg->eht_flag = true; + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_320) { + arg->bw_40 = true; + arg->bw_80 = true; + arg->bw_160 = true; + arg->bw_320 = true; + } + if (eht_cap->eht_cap_elem.phy_cap_info[5] & + IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT && + eht_cap->eht_ppe_thres[0] != 0) + ath12k_mac_set_eht_ppe_threshold(eht_cap->eht_ppe_thres, + &arg->peer_eht_ppet); + memcpy(arg->peer_eht_cap_mac, eht_cap->eht_cap_elem.mac_cap_info, + sizeof(eht_cap->eht_cap_elem.mac_cap_info)); + memcpy(arg->peer_eht_cap_phy, eht_cap->eht_cap_elem.phy_cap_info, + sizeof(eht_cap->eht_cap_elem.phy_cap_info)); + arg->peer_eht_ops = 0; + + eht_nss = ath12k_mac_max_eht_mcs_nss((void *)own_eht_mcs_nss_supp, + sizeof(*own_eht_mcs_nss_supp)); + + if (eht_nss > link_sta->rx_nss) { + user_rate_valid = false; + for (nss_idx = (link_sta->rx_nss - 1); nss_idx >= 0; nss_idx--) { + if (eht_mcs_mask[nss_idx]) { + user_rate_valid = true; + break; + } + } + } + + if (!user_rate_valid) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Setting eht range MCS value to peer supported nss:%d for peer %pM\n", + link_sta->rx_nss, arsta->addr); + eht_mcs_mask[link_sta->rx_nss - 1] = eht_mcs_mask[eht_nss - 1]; + } + + switch (min(link_sta->sta_max_bandwidth, radio_max_bw_caps)) { + case IEEE80211_STA_RX_BW_320: + mcs_nss_supp_bw = &mcs_nss->bw._320; + mcs_idx = WMI_EHTCAP_TXRX_MCS_NSS_IDX_320; + arg->peer_eht_mcs_count++; + ath12k_mac_set_eht_mcs_nss_bitmap(&mcs_nss->bw._320, + &arg->peer_eht_rx_mcs_set[mcs_idx], + &arg->peer_eht_tx_mcs_set[mcs_idx], + eht_mcs_mask); + fallthrough; + + case IEEE80211_STA_RX_BW_160: + mcs_nss_supp_bw = &mcs_nss->bw._160; + mcs_idx = WMI_EHTCAP_TXRX_MCS_NSS_IDX_160; + arg->peer_eht_mcs_count++; + ath12k_mac_set_eht_mcs_nss_bitmap(&mcs_nss->bw._160, + &arg->peer_eht_rx_mcs_set[mcs_idx], + &arg->peer_eht_tx_mcs_set[mcs_idx], + eht_mcs_mask); + fallthrough; + + default: + if (arg->peer_phymode == MODE_11BE_EHT20) { + mcs_idx = WMI_EHTCAP_TXRX_MCS_NSS_IDX_80; + ath12k_mac_set_eht_mcs_nss_bitmap_20mhz_only(&mcs_nss->only_20mhz, + &arg->peer_eht_rx_mcs_set[mcs_idx], + &arg->peer_eht_tx_mcs_set[mcs_idx], + eht_mcs_mask); + } else { + mcs_idx = WMI_EHTCAP_TXRX_MCS_NSS_IDX_80; + ath12k_mac_set_eht_mcs_nss_bitmap(&mcs_nss->bw._80, + &arg->peer_eht_rx_mcs_set[mcs_idx], + &arg->peer_eht_tx_mcs_set[mcs_idx], + eht_mcs_mask); + } + + arg->peer_eht_mcs_count++; + break; + } + + if (!(link_sta->he_cap.he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) { + if (mcs_nss->only_20mhz.rx_tx_mcs13_max_nss) + max_nss = mcs_nss->only_20mhz.rx_tx_mcs13_max_nss; + else if (mcs_nss->only_20mhz.rx_tx_mcs11_max_nss) + max_nss = mcs_nss->only_20mhz.rx_tx_mcs11_max_nss; + else if (mcs_nss->only_20mhz.rx_tx_mcs9_max_nss) + max_nss = mcs_nss->only_20mhz.rx_tx_mcs9_max_nss; + else + max_nss = mcs_nss->only_20mhz.rx_tx_mcs7_max_nss; + } else { + if (mcs_nss_supp_bw->rx_tx_mcs13_max_nss) + max_nss = u8_get_bits(mcs_nss_supp_bw->rx_tx_mcs13_max_nss, + IEEE80211_EHT_MCS_NSS_RX); + if (mcs_nss_supp_bw->rx_tx_mcs11_max_nss) + max_nss = max(max_nss, u8_get_bits(mcs_nss_supp_bw->rx_tx_mcs11_max_nss, + IEEE80211_EHT_MCS_NSS_RX)); + if (mcs_nss_supp_bw->rx_tx_mcs9_max_nss) + max_nss = max(max_nss, u8_get_bits(mcs_nss_supp_bw->rx_tx_mcs9_max_nss, + IEEE80211_EHT_MCS_NSS_RX)); + } + + max_nss = min(max_nss, (uint8_t)eht_nss); + + arg->peer_nss = min(link_sta->rx_nss, max_nss); + arg->ru_punct_bitmap = ~def.ru_punct_bitmap; + if (ieee80211_vif_is_mesh(vif) && link_sta->ru_punct_bitmap) + arg->ru_punct_bitmap = ~link_sta->ru_punct_bitmap; + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac eht peer %pM nss %d mcs cnt %d ru_punct_bitmap 0x%x\n", + arsta->addr, arg->peer_nss, arg->peer_eht_mcs_count, arg->ru_punct_bitmap); +} + +static void ath12k_peer_assoc_h_smps(struct ath12k_link_sta *arsta, + struct ath12k_wmi_peer_assoc_arg *arg) +{ + const struct ieee80211_sta_ht_cap *ht_cap; int smps; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + struct ath12k *ar = arsta->arvif->ar; - if (!ht_cap->ht_supported) + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc smps set\n"); + return; + } + + ht_cap = &link_sta->ht_cap; + + if (!ht_cap->ht_supported && !link_sta->he_6ghz_capa.capa) return; + if (ht_cap->ht_supported) { smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS; smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT; + } else { + smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS, + le16_to_cpu(link_sta->he_6ghz_capa.capa)); + } switch (smps) { case WLAN_HT_CAP_SM_PS_STATIC: @@ -1764,13 +3538,17 @@ } static void ath12k_peer_assoc_h_qos(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); - switch (arvif->vdev_type) { + switch (ahvif->vdev_type) { case WMI_VDEV_TYPE_AP: if (sta->wme) { /* TODO: Check WME vs QoS */ @@ -1796,17 +3574,78 @@ } ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac peer %pM qos %d\n", - sta->addr, arg->qos_flag); + arsta->addr, arg->qos_flag); +} + +static void ath12k_peer_assoc_h_mlo(struct ath12k_link_sta *arsta, + struct ath12k_wmi_peer_assoc_arg *arg) +{ + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta_p; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + unsigned long links; + struct peer_assoc_mlo_params *ml = &arg->ml; + u8 i = 0, link_id; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + if (!sta->mlo || ahsta->ml_peer_id == ATH12K_MLO_PEER_ID_INVALID) + return; + + ml->enabled = true; + ml->assoc_link = arsta->is_assoc_link; + if (arsta->link_id == ahsta->primary_link_id) + ml->primary_umac = true; + else + ml->primary_umac = false; + ml->peer_id_valid = true; + ml->logical_link_idx_valid = true; + + ether_addr_copy(ml->mld_addr, sta->addr); + ml->logical_link_idx = arsta->link_idx; + ml->ml_peer_id = ahsta->ml_peer_id; + ml->ieee_link_id = arsta->link_id; + ml->num_partner_links = 0; + /*emlsr */ + /* ml->eml_caps = sta->eml_cap; */ + ml->eml_caps = 0; + + links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + if (i > ATH12K_WMI_MLO_MAX_LINKS) + break; + arsta_p = ahsta->link[link_id]; + arvif = arsta_p->arvif; + + if (arsta_p == arsta) + continue; + ml->partner_info[i].vdev_id = arvif->vdev_id; + ml->partner_info[i].hw_link_id = arvif->ar->pdev->hw_link_id; + ml->partner_info[i].assoc_link = arsta_p->is_assoc_link; + if (arsta_p->link_id == ahsta->primary_link_id) + ml->partner_info[i].primary_umac = true; + else + ml->partner_info[i].primary_umac = false; + ml->partner_info[i].logical_link_idx_valid = true; + ml->partner_info[i].logical_link_idx = arsta_p->link_idx; + ml->num_partner_links++; + i++; + } } static int ath12k_peer_assoc_qos_ap(struct ath12k *ar, - struct ath12k_vif *arvif, - struct ieee80211_sta *sta) + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) { struct ath12k_wmi_ap_ps_arg arg; u32 max_sp; u32 uapsd; int ret; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); @@ -1835,26 +3674,26 @@ arg.param = WMI_AP_PS_PEER_PARAM_UAPSD; arg.value = uapsd; - ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, sta->addr, &arg); + ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta->addr, &arg); if (ret) goto err; arg.param = WMI_AP_PS_PEER_PARAM_MAX_SP; arg.value = max_sp; - ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, sta->addr, &arg); + ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta->addr, &arg); if (ret) goto err; /* TODO: revisit during testing */ arg.param = WMI_AP_PS_PEER_PARAM_SIFS_RESP_FRMTYPE; arg.value = DISABLE_SIFS_RESPONSE_TRIGGER; - ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, sta->addr, &arg); + ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta->addr, &arg); if (ret) goto err; arg.param = WMI_AP_PS_PEER_PARAM_SIFS_RESP_UAPSD; arg.value = DISABLE_SIFS_RESPONSE_TRIGGER; - ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, sta->addr, &arg); + ret = ath12k_wmi_send_set_ap_ps_param_cmd(ar, arsta->addr, &arg); if (ret) goto err; @@ -1866,17 +3705,29 @@ return ret; } -static bool ath12k_mac_sta_has_ofdm_only(struct ieee80211_sta *sta) +static bool ath12k_mac_sta_has_ofdm_only(struct ath12k_link_sta *arsta) { - return sta->deflink.supp_rates[NL80211_BAND_2GHZ] >> + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + struct ath12k *ar = arsta->arvif->ar; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in ofdm rate check\n"); + return false; + } + return link_sta->supp_rates[NL80211_BAND_2GHZ] >> ATH12K_MAC_FIRST_OFDM_RATE_IDX; } -static enum wmi_phy_mode ath12k_mac_get_phymode_vht(struct ath12k *ar, - struct ieee80211_sta *sta) +static enum wmi_phy_mode ath12k_mac_get_phymode_vht(struct ieee80211_link_sta *link_sta) { - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) { - switch (sta->deflink.vht_cap.cap & + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160) { + switch (link_sta->vht_cap.cap & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) { case IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ: return MODE_11AC_VHT160; @@ -1888,85 +3739,137 @@ } } - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_80) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_80) return MODE_11AC_VHT80; - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) return MODE_11AC_VHT40; - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_20) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_20) return MODE_11AC_VHT20; return MODE_UNKNOWN; } -static enum wmi_phy_mode ath12k_mac_get_phymode_he(struct ath12k *ar, - struct ieee80211_sta *sta) +static enum wmi_phy_mode ath12k_mac_get_phymode_he(struct ieee80211_link_sta *link_sta) { - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_160) { - if (sta->deflink.he_cap.he_cap_elem.phy_cap_info[0] & + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160) { + if (link_sta->he_cap.he_cap_elem.phy_cap_info[0] & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G) return MODE_11AX_HE160; - else if (sta->deflink.he_cap.he_cap_elem.phy_cap_info[0] & + else if (link_sta->he_cap.he_cap_elem.phy_cap_info[0] & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) return MODE_11AX_HE80_80; /* not sure if this is a valid case? */ return MODE_11AX_HE160; } - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_80) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_80) return MODE_11AX_HE80; - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) return MODE_11AX_HE40; - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_20) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_20) return MODE_11AX_HE20; return MODE_UNKNOWN; } +static enum wmi_phy_mode ath12k_mac_get_phymode_eht(struct ieee80211_link_sta *link_sta) +{ + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_320) + if (link_sta->eht_cap.eht_cap_elem.phy_cap_info[0] & + IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ) + return MODE_11BE_EHT320; + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_160) { + if (link_sta->he_cap.he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G) + return MODE_11BE_EHT160; + else if (link_sta->he_cap.he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) + return MODE_11BE_EHT80_80; + /* not sure if this is a valid case? */ + return MODE_11BE_EHT160; + } + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_80) + return MODE_11BE_EHT80; + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) + return MODE_11BE_EHT40; + + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_20) + return MODE_11BE_EHT20; + + return MODE_UNKNOWN; +} + static void ath12k_peer_assoc_h_phymode(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ieee80211_vif *vif = arvif->ahvif->vif; struct cfg80211_chan_def def; enum nl80211_band band; const u8 *ht_mcs_mask; const u16 *vht_mcs_mask; + const u16 *he_mcs_mask; + const u16 *eht_mcs_mask; enum wmi_phy_mode phymode = MODE_UNKNOWN; + u8 link_id = arvif->link_id; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); - if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) return; + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer assoc phymode set\n"); + return; + } + band = def.chan->band; ht_mcs_mask = arvif->bitrate_mask.control[band].ht_mcs; vht_mcs_mask = arvif->bitrate_mask.control[band].vht_mcs; + he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs; + eht_mcs_mask = arvif->bitrate_mask.control[band].eht_mcs; switch (band) { case NL80211_BAND_2GHZ: - if (sta->deflink.he_cap.has_he) { - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_80) + if (link_sta->eht_cap.has_eht && + !ath12k_peer_assoc_h_eht_masked(eht_mcs_mask)) { + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) + phymode = MODE_11BE_EHT40_2G; + else + phymode = MODE_11BE_EHT20_2G; + } else if (link_sta->he_cap.has_he && + !ath12k_peer_assoc_h_he_masked(he_mcs_mask)) { + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_80) phymode = MODE_11AX_HE80_2G; - else if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) + else if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) phymode = MODE_11AX_HE40_2G; else phymode = MODE_11AX_HE20_2G; - } else if (sta->deflink.vht_cap.vht_supported && + } else if (link_sta->vht_cap.vht_supported && !ath12k_peer_assoc_h_vht_masked(vht_mcs_mask)) { - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) phymode = MODE_11AC_VHT40; else phymode = MODE_11AC_VHT20; - } else if (sta->deflink.ht_cap.ht_supported && + } else if (link_sta->ht_cap.ht_supported && !ath12k_peer_assoc_h_ht_masked(ht_mcs_mask)) { - if (sta->deflink.bandwidth == IEEE80211_STA_RX_BW_40) + if (link_sta->bandwidth == IEEE80211_STA_RX_BW_40) phymode = MODE_11NG_HT40; else phymode = MODE_11NG_HT20; - } else if (ath12k_mac_sta_has_ofdm_only(sta)) { + } else if (ath12k_mac_sta_has_ofdm_only(arsta)) { phymode = MODE_11G; } else { phymode = MODE_11B; @@ -1974,15 +3877,19 @@ break; case NL80211_BAND_5GHZ: case NL80211_BAND_6GHZ: - /* Check HE first */ - if (sta->deflink.he_cap.has_he) { - phymode = ath12k_mac_get_phymode_he(ar, sta); - } else if (sta->deflink.vht_cap.vht_supported && + /* Check EHT first */ + if (link_sta->eht_cap.has_eht && + !ath12k_peer_assoc_h_eht_masked(eht_mcs_mask)) { + phymode = ath12k_mac_get_phymode_eht(link_sta); + } else if (link_sta->he_cap.has_he && + !ath12k_peer_assoc_h_he_masked(he_mcs_mask)) { + phymode = ath12k_mac_get_phymode_he(link_sta); + } else if (link_sta->vht_cap.vht_supported && !ath12k_peer_assoc_h_vht_masked(vht_mcs_mask)) { - phymode = ath12k_mac_get_phymode_vht(ar, sta); - } else if (sta->deflink.ht_cap.ht_supported && + phymode = ath12k_mac_get_phymode_vht(link_sta); + } else if (link_sta->ht_cap.ht_supported && !ath12k_peer_assoc_h_ht_masked(ht_mcs_mask)) { - if (sta->deflink.bandwidth >= IEEE80211_STA_RX_BW_40) + if (link_sta->bandwidth >= IEEE80211_STA_RX_BW_40) phymode = MODE_11NA_HT40; else phymode = MODE_11NA_HT20; @@ -1995,15 +3902,15 @@ } ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac peer %pM phymode %s\n", - sta->addr, ath12k_mac_phymode_str(phymode)); + arsta->addr, ath12k_wmi_phymode_str(phymode)); arg->peer_phymode = phymode; WARN_ON(phymode == MODE_UNKNOWN); } static void ath12k_peer_assoc_prepare(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ath12k_wmi_peer_assoc_arg *arg, bool reassoc) { @@ -2014,30 +3921,41 @@ reinit_completion(&ar->peer_assoc_done); arg->peer_new_assoc = !reassoc; - ath12k_peer_assoc_h_basic(ar, vif, sta, arg); - ath12k_peer_assoc_h_crypto(ar, vif, sta, arg); - ath12k_peer_assoc_h_rates(ar, vif, sta, arg); - ath12k_peer_assoc_h_ht(ar, vif, sta, arg); - ath12k_peer_assoc_h_vht(ar, vif, sta, arg); - ath12k_peer_assoc_h_he(ar, vif, sta, arg); - ath12k_peer_assoc_h_qos(ar, vif, sta, arg); - ath12k_peer_assoc_h_phymode(ar, vif, sta, arg); - ath12k_peer_assoc_h_smps(sta, arg); + + ath12k_peer_assoc_h_basic(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_crypto(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_rates(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_phymode(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_ht(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_vht(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_he(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_he_6ghz(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_eht(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_qos(ar, arvif, arsta, arg); + ath12k_peer_assoc_h_smps(arsta, arg); + ath12k_peer_assoc_h_mlo(arsta, arg); + + arsta->peer_nss = arg->peer_nss; /* TODO: amsdu_disable req? */ } -static int ath12k_setup_peer_smps(struct ath12k *ar, struct ath12k_vif *arvif, +static int ath12k_setup_peer_smps(struct ath12k *ar, struct ath12k_link_vif *arvif, const u8 *addr, - const struct ieee80211_sta_ht_cap *ht_cap) + const struct ieee80211_sta_ht_cap *ht_cap, + u16 he_6ghz_capa) { int smps; - if (!ht_cap->ht_supported) + if (!ht_cap->ht_supported && !he_6ghz_capa) return 0; + if (ht_cap->ht_supported) { smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS; smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT; + } else { + smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS, he_6ghz_capa); + } if (smps >= ARRAY_SIZE(ath12k_smps_map)) return -EINVAL; @@ -2047,26 +3965,246 @@ ath12k_smps_map[smps]); } -static void ath12k_bss_assoc(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, +static bool ath12k_mac_set_he_txbf_conf(struct ath12k_link_vif *arvif) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k *ar = arvif->ar; + u32 param = WMI_VDEV_PARAM_SET_HEMU_MODE; + u32 value = 0; + int ret; + struct ieee80211_bss_conf* link_conf; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf in txbf conf\n"); + return false; + } + + if (!link_conf->he_support) { + rcu_read_unlock(); + return true; + } + + if (link_conf->he_su_beamformer) { + value |= FIELD_PREP(HE_MODE_SU_TX_BFER, HE_SU_BFER_ENABLE); + if (link_conf->he_mu_beamformer && + ahvif->vdev_type == WMI_VDEV_TYPE_AP) + value |= FIELD_PREP(HE_MODE_MU_TX_BFER, HE_MU_BFER_ENABLE); + } + + if (ahvif->vif->type != NL80211_IFTYPE_MESH_POINT) { + value |= FIELD_PREP(HE_MODE_DL_OFDMA, HE_DL_MUOFDMA_ENABLE) | + FIELD_PREP(HE_MODE_UL_OFDMA, HE_UL_MUOFDMA_ENABLE); + + if (link_conf->he_full_ul_mumimo) + value |= FIELD_PREP(HE_MODE_UL_MUMIMO, HE_UL_MUMIMO_ENABLE); + + if (link_conf->he_su_beamformee) + value |= FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE); + } + + rcu_read_unlock(); + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param, value); + if (ret) { + ath12k_warn(ar->ab, "failed to set vdev %d HE MU mode: %d\n", + arvif->vdev_id, ret); + return false; + } + + param = WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE; + value = + FIELD_PREP(HE_VHT_SOUNDING_MODE, HE_VHT_SOUNDING_MODE_ENABLE) | + FIELD_PREP(HE_TRIG_NONTRIG_SOUNDING_MODE, + HE_TRIG_NONTRIG_SOUNDING_MODE_ENABLE); + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + param, value); + if (ret) { + ath12k_warn(ar->ab, "failed to set vdev %d sounding mode: %d\n", + arvif->vdev_id, ret); + return false; + } + return true; +} + +static bool ath12k_mac_vif_recalc_sta_he_txbf(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_sta_he_cap *he_cap) +{ + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ieee80211_he_cap_elem he_cap_elem = {0}; + struct ieee80211_sta_he_cap *cap_band; + struct cfg80211_chan_def def; + u32 param = WMI_VDEV_PARAM_SET_HEMU_MODE; + u32 hemode = 0; + int ret; + u8 link_id = arvif->link_id; + struct ieee80211_bss_conf* link_conf; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf in recalc txbf conf\n"); + return false; + } + + if (!link_conf->he_support) { + rcu_read_unlock(); + return true; + } + + rcu_read_unlock(); + + if (vif->type != NL80211_IFTYPE_STATION) + return false; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) + return false; + + if (def.chan->band == NL80211_BAND_2GHZ) + cap_band = &ar->mac.iftype[NL80211_BAND_2GHZ][vif->type].he_cap; + else + cap_band = &ar->mac.iftype[NL80211_BAND_5GHZ][vif->type].he_cap; + + memcpy(&he_cap_elem, &cap_band->he_cap_elem, sizeof(he_cap_elem)); + + if (he_cap_elem.phy_cap_info[HE_PHYCAP_BYTE_4] & + IEEE80211_HE_PHY_CAP4_SU_BEAMFORMEE) { + if (he_cap->he_cap_elem.phy_cap_info[HE_PHYCAP_BYTE_3] & + IEEE80211_HE_PHY_CAP3_SU_BEAMFORMER) + hemode |= FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE); + if (he_cap->he_cap_elem.phy_cap_info[HE_PHYCAP_BYTE_4] & + IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER) { + hemode |= FIELD_PREP(HE_MODE_MU_TX_BFEE, HE_MU_BFEE_ENABLE); + } + } + + if (vif->type != NL80211_IFTYPE_MESH_POINT) { + hemode |= FIELD_PREP(HE_MODE_DL_OFDMA, HE_DL_MUOFDMA_ENABLE) | + FIELD_PREP(HE_MODE_UL_OFDMA, HE_UL_MUOFDMA_ENABLE); + + if (he_cap_elem.phy_cap_info[HE_PHYCAP_BYTE_2] & + IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO) + if (he_cap->he_cap_elem.phy_cap_info[HE_PHYCAP_BYTE_2] & + IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO) + hemode |= FIELD_PREP(HE_MODE_UL_MUMIMO, HE_UL_MUMIMO_ENABLE); + + if (FIELD_GET(HE_MODE_MU_TX_BFEE, hemode)) + hemode |= FIELD_PREP(HE_MODE_SU_TX_BFEE, HE_SU_BFEE_ENABLE); + + if (FIELD_GET(HE_MODE_MU_TX_BFER, hemode)) + hemode |= FIELD_PREP(HE_MODE_SU_TX_BFER, HE_SU_BFER_ENABLE); + } + + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param, hemode); + if (ret) { + ath12k_warn(ar->ab, "failed to submit vdev param txbf 0x%x: %d\n", + hemode, ret); + return false; + } + + return true; +} + +static bool ath12k_mac_set_eht_txbf_conf(struct ath12k_link_vif *arvif) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k *ar = arvif->ar; + u32 param = WMI_VDEV_PARAM_SET_EHT_MU_MODE; + u32 value = 0; + int ret; + struct ieee80211_bss_conf* link_conf; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf in eht txbf conf\n"); + return false; + } + + if (!link_conf->eht_support) { + rcu_read_unlock(); + return true; + } + + if (link_conf->eht_su_beamformer) { + value |= FIELD_PREP(EHT_MODE_SU_TX_BFER, EHT_SU_BFER_ENABLE); + if (link_conf->eht_mu_beamformer && + ahvif->vdev_type == WMI_VDEV_TYPE_AP) + value |= FIELD_PREP(EHT_MODE_MU_TX_BFER, EHT_MU_BFER_ENABLE) | + FIELD_PREP(EHT_MODE_DL_OFDMA_MUMIMO, EHT_DL_MUOFDMA_ENABLE) | + FIELD_PREP(EHT_MODE_UL_OFDMA_MUMIMO, EHT_UL_MUOFDMA_ENABLE); + } + + if (ahvif->vif->type != NL80211_IFTYPE_MESH_POINT) { + value |= FIELD_PREP(EHT_MODE_DL_OFDMA, EHT_DL_MUOFDMA_ENABLE) | + FIELD_PREP(EHT_MODE_UL_OFDMA, EHT_UL_MUOFDMA_ENABLE); + + if (link_conf->eht_80mhz_full_bw_ul_mumimo) + value |= FIELD_PREP(EHT_MODE_MUMIMO, EHT_UL_MUMIMO_ENABLE); + + if (link_conf->eht_su_beamformee) + value |= FIELD_PREP(EHT_MODE_SU_TX_BFEE, EHT_SU_BFEE_ENABLE); + } + + rcu_read_unlock(); + + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param, value); + if (ret) { + ath12k_warn(ar->ab, "failed to set vdev %d EHT MU mode: %d\n", + arvif->vdev_id, ret); + return false; + } + + return true; +} + +void ath12k_bss_assoc(struct ath12k *ar, + struct ath12k_link_vif *arvif, struct ieee80211_bss_conf *bss_conf) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; struct ath12k_wmi_peer_assoc_arg peer_arg; struct ieee80211_sta *ap_sta; + struct ath12k_link_sta *arsta; + struct ath12k_sta *ahsta; struct ath12k_peer *peer; + struct ieee80211_sta_he_cap he_cap; bool is_auth = false; int ret; + struct vdev_up_params params = { 0 }; + u8 link_id; + u16 he_6ghz_capa; lockdep_assert_held(&ar->conf_mutex); - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %i assoc bssid %pM aid %d\n", - arvif->vdev_id, arvif->bssid, arvif->aid); + if (!arvif) + return; + + link_id = bss_conf->link_id; + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %i link_id:%d assoc bssid %pM aid %d\n", + arvif->vdev_id, link_id, arvif->bssid, ahvif->aid); rcu_read_lock(); - ap_sta = ieee80211_find_sta(vif, bss_conf->bssid); +// ap_sta = ieee80211_find_sta(vif, bss_conf->bssid); + /* TODO, need check correct or not while debug later. + * ieee80211_sta should find by MLO address for MLO + * or bssid for non-MLO. + */ + ap_sta = ieee80211_find_sta(vif,vif->cfg.ap_addr); + if (!ap_sta) { ath12k_warn(ar->ab, "failed to find station entry for bss %pM vdev %i\n", bss_conf->bssid, arvif->vdev_id); @@ -2074,10 +4212,17 @@ return; } - ath12k_peer_assoc_prepare(ar, vif, ap_sta, &peer_arg, false); + ahsta = ath12k_sta_to_ahsta(ap_sta); + arsta = ahsta->link[link_id]; + + /* he_cap here is updated at assoc success for sta mode only */ + he_cap = ap_sta->link[link_id]->he_cap; + + ath12k_peer_assoc_prepare(ar, arvif, arsta, &peer_arg, false); rcu_read_unlock(); + peer_arg.is_assoc = true; ret = ath12k_wmi_send_peer_assoc_cmd(ar, &peer_arg); if (ret) { ath12k_warn(ar->ab, "failed to run peer assoc for %pM vdev %i: %d\n", @@ -2091,26 +4236,53 @@ return; } + he_6ghz_capa = ap_sta->link[link_id]->he_6ghz_capa.capa; + ret = ath12k_setup_peer_smps(ar, arvif, bss_conf->bssid, - &ap_sta->deflink.ht_cap); + &ap_sta->link[link_id]->ht_cap, + le16_to_cpu(he_6ghz_capa)); if (ret) { ath12k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n", arvif->vdev_id, ret); return; } + if (!ath12k_mac_vif_recalc_sta_he_txbf(ar, arvif, &he_cap)) { + ath12k_warn(ar->ab, "failed to recalc he txbf for vdev %i on bss %pM\n", + arvif->vdev_id, bss_conf->bssid); + return; + } + WARN_ON(arvif->is_up); - arvif->aid = vif->cfg.aid; + ahvif->aid = vif->cfg.aid; ether_addr_copy(arvif->bssid, bss_conf->bssid); - ret = ath12k_wmi_vdev_up(ar, arvif->vdev_id, arvif->aid, arvif->bssid); + params.vdev_id = arvif->vdev_id; + params.aid = ahvif->aid; + params.bssid = arvif->bssid; + + if (bss_conf->nontransmitted) { + params.profile_idx = bss_conf->bssid_index; + params.profile_count = BIT(bss_conf->bssid_indicator) - 1; + params.tx_bssid = bss_conf->transmitter_bssid; + } + + if (ar->ab->ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1 && + !ar->ab->is_reset) + /* Skip sending vdev up for non-asserted links while + * recovering station vif type + */ + goto skip_vdev_up; + + ret = ath12k_wmi_vdev_up(ar, ¶ms); if (ret) { ath12k_warn(ar->ab, "failed to set vdev %d up: %d\n", arvif->vdev_id, ret); return; } +skip_vdev_up: arvif->is_up = true; ath12k_dbg(ar->ab, ATH12K_DBG_MAC, @@ -2142,15 +4314,23 @@ arvif->vdev_id, ret); } -static void ath12k_bss_disassoc(struct ieee80211_hw *hw, - struct ieee80211_vif *vif) -{ - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = (void *)vif->drv_priv; +void ath12k_bss_disassoc(struct ath12k *ar, + struct ath12k_link_vif *arvif, + bool do_vdev_down) +{ + struct ath12k_vif *tx_ahvif; + struct ath12k_link_vif *tx_arvif; + struct ieee80211_bss_conf *link; int ret; lockdep_assert_held(&ar->conf_mutex); + if (do_vdev_down) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %i disassoc bssid %pM\n", + arvif->vdev_id, arvif->bssid); + return; + } + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev %i disassoc bssid %pM\n", arvif->vdev_id, arvif->bssid); @@ -2161,7 +4341,26 @@ arvif->is_up = false; - /* TODO: cancel connection_loss_work */ + rcu_read_lock(); + link = ath12k_get_link_bss_conf(arvif); + if (!link) + goto unlock; + + if (link->mbssid_tx_vif) { + tx_ahvif = (void *)link->mbssid_tx_vif->drv_priv; + if (!tx_ahvif) + goto unlock; + lockdep_assert_held(&tx_ahvif->ah->conf_mutex); + tx_arvif = tx_ahvif->link[link->mbssid_tx_vif_linkid]; + if (!tx_arvif) + goto unlock; + lockdep_assert_held(&tx_arvif->ar->conf_mutex); + } + + cancel_delayed_work(&arvif->connection_loss_work); + +unlock: + rcu_read_unlock(); } static u32 ath12k_mac_get_rate_hw_value(int bitrate) @@ -2190,10 +4389,10 @@ } static void ath12k_recalculate_mgmt_rate(struct ath12k *ar, - struct ieee80211_vif *vif, - struct cfg80211_chan_def *def) + struct ath12k_link_vif *arvif, + struct cfg80211_chan_def *def, + struct ieee80211_bss_conf *link_conf) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; const struct ieee80211_supported_band *sband; u8 basic_rate_idx; int hw_rate_code; @@ -2203,8 +4402,10 @@ lockdep_assert_held(&ar->conf_mutex); - sband = ar->hw->wiphy->bands[def->chan->band]; - basic_rate_idx = ffs(vif->bss_conf.basic_rates) - 1; + sband = ar->ah->hw->wiphy->bands[def->chan->band]; + basic_rate_idx = ffs(link_conf->basic_rates); + if (basic_rate_idx) + basic_rate_idx -= 1; bitrate = sband->bitrates[basic_rate_idx].bitrate; hw_rate_code = ath12k_mac_get_rate_hw_value(bitrate); @@ -2226,11 +4427,13 @@ ath12k_warn(ar->ab, "failed to set beacon tx rate %d\n", ret); } -static int ath12k_mac_fils_discovery(struct ath12k_vif *arvif, +static int ath12k_mac_fils_discovery(struct ath12k_link_vif *arvif, struct ieee80211_bss_conf *info) { + struct ath12k_vif *ahvif = arvif->ahvif; struct ath12k *ar = arvif->ar; struct sk_buff *tmpl; + struct ath12k_hw *ah = ar->ah; int ret; u32 interval; bool unsol_bcast_probe_resp_enabled = false; @@ -2238,7 +4441,8 @@ if (info->fils_discovery.max_interval) { interval = info->fils_discovery.max_interval; - tmpl = ieee80211_get_fils_discovery_tmpl(ar->hw, arvif->vif); + tmpl = ieee80211_get_fils_discovery_tmpl_mlo(ah->hw, ahvif->vif, + info->link_id); if (tmpl) ret = ath12k_wmi_fils_discovery_tmpl(ar, arvif->vdev_id, tmpl); @@ -2246,8 +4450,9 @@ unsol_bcast_probe_resp_enabled = 1; interval = info->unsol_bcast_probe_resp_interval; - tmpl = ieee80211_get_unsol_bcast_probe_resp_tmpl(ar->hw, - arvif->vif); + tmpl = ieee80211_get_unsol_bcast_probe_resp_tmpl_mlo(ah->hw, + ahvif->vif, + info->link_id); if (tmpl) ret = ath12k_wmi_probe_resp_tmpl(ar, arvif->vdev_id, tmpl); @@ -2272,14 +4477,192 @@ return ret; } -static void ath12k_mac_op_bss_info_changed(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, +static void ath12k_mac_non_srg_th_config(struct ath12k *ar, + struct ieee80211_he_obss_pd *he_obss_pd, + u32 *param_val) +{ + s8 non_srg_th = ATH12K_OBSS_PD_THRESHOLD_DISABLED; + + if (he_obss_pd->sr_ctrl & + IEEE80211_HE_SPR_NON_SRG_OBSS_PD_SR_DISALLOWED) { + non_srg_th = ATH12K_OBSS_PD_MAX_THRESHOLD; + } else { + if (he_obss_pd->sr_ctrl & + IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT) + non_srg_th = (ATH12K_OBSS_PD_MAX_THRESHOLD + + he_obss_pd->non_srg_max_offset); + + *param_val |= ATH12K_OBSS_PD_NON_SRG_EN; + } + + if (!test_bit(WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT, + ar->ab->wmi_ab.svc_map)) { + if (non_srg_th != ATH12K_OBSS_PD_THRESHOLD_DISABLED) + non_srg_th -= ATH12K_DEFAULT_NOISE_FLOOR; + } + + *param_val |= (non_srg_th & GENMASK(7, 0)); +} + +static void ath12k_mac_srg_th_config(struct ath12k *ar, + struct ieee80211_he_obss_pd *he_obss_pd, + u32 *param_val) +{ + s8 srg_th = 0; + + if (he_obss_pd->sr_ctrl & IEEE80211_HE_SPR_SRG_INFORMATION_PRESENT) { + srg_th = ATH12K_OBSS_PD_MAX_THRESHOLD + he_obss_pd->max_offset; + *param_val |= ATH12K_OBSS_PD_SRG_EN; + } + + if (test_bit(WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT, + ar->ab->wmi_ab.svc_map)) { + *param_val |= ATH12K_OBSS_PD_THRESHOLD_IN_DBM; + *param_val |= FIELD_PREP(GENMASK(15, 8), srg_th); + } else { + /* SRG not supported and threshold in dB */ + *param_val &= ~(ATH12K_OBSS_PD_SRG_EN | + ATH12K_OBSS_PD_THRESHOLD_IN_DBM); + } +} + +static int ath12k_mac_config_obss_pd(struct ath12k *ar, + struct ieee80211_he_obss_pd *he_obss_pd) +{ + u32 bitmap[2], param_id, param_val, pdev_id; + int ret; + + pdev_id = ar->pdev->pdev_id; + + /* Set and enable SRG/non-SRG OBSS PD Threshold */ + param_id = WMI_PDEV_PARAM_SET_CMD_OBSS_PD_THRESHOLD; + if (test_bit(MONITOR_CONF_ENABLED, &ar->monitor_flags)) { + ret = ath12k_wmi_pdev_set_param(ar, param_id, 0, pdev_id); + if (ret) + ath12k_warn(ar->ab, + "Failed to set obss_pd_threshold for pdev: %u\n", + pdev_id); + return ret; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "OBSS PD Params: sr_ctrl %x non_srg_thres %u srg_max %u\n", + he_obss_pd->sr_ctrl, he_obss_pd->non_srg_max_offset, + he_obss_pd->max_offset); + + param_val = 0; + + /* Preparing non-SRG OBSS PD Threshold Configurations */ + ath12k_mac_non_srg_th_config(ar, he_obss_pd, ¶m_val); + + /* Preparing SRG OBSS PD Threshold Configurations */ + ath12k_mac_srg_th_config(ar, he_obss_pd, ¶m_val); + + ret = ath12k_wmi_pdev_set_param(ar, param_id, param_val, pdev_id); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set obss_pd_threshold for pdev: %u\n", + pdev_id); + return ret; + } + + /* Enable OBSS PD for all access category */ + param_id = WMI_PDEV_PARAM_SET_CMD_OBSS_PD_PER_AC; + param_val = 0xf; + ret = ath12k_wmi_pdev_set_param(ar, param_id, param_val, pdev_id); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set obss_pd_per_ac for pdev: %u\n", + pdev_id); + return ret; + } + + /* Set SR Prohibit */ + param_id = WMI_PDEV_PARAM_ENABLE_SR_PROHIBIT; + param_val = !!(he_obss_pd->sr_ctrl & + IEEE80211_HE_SPR_HESIGA_SR_VAL15_ALLOWED); + ret = ath12k_wmi_pdev_set_param(ar, param_id, param_val, pdev_id); + if (ret) { + ath12k_warn(ar->ab, "Failed to set sr_prohibit for pdev: %u\n", + pdev_id); + return ret; + } + + if (!test_bit(WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT, + ar->ab->wmi_ab.svc_map)) + return 0; + + /* Set SRG BSS Color Bitmap */ + memcpy(bitmap, he_obss_pd->bss_color_bitmap, sizeof(bitmap)); + ret = ath12k_wmi_pdev_set_srg_bss_color_bitmap(ar, bitmap); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set bss_color_bitmap for pdev: %u\n", + pdev_id); + return ret; + } + + /* Set SRG Partial BSSID Bitmap */ + memcpy(bitmap, he_obss_pd->partial_bssid_bitmap, sizeof(bitmap)); + ret = ath12k_wmi_pdev_set_srg_patial_bssid_bitmap(ar, bitmap); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set partial_bssid_bitmap for pdev: %u\n", + pdev_id); + return ret; + } + + memset(bitmap, 0xff, sizeof(bitmap)); + + /* Enable all BSS Colors for SRG */ + ret = ath12k_wmi_pdev_srg_obss_color_enable_bitmap(ar, bitmap); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set srg_color_en_bitmap pdev: %u\n", + pdev_id); + return ret; + } + + /* Enable all patial BSSID mask for SRG */ + ret = ath12k_wmi_pdev_srg_obss_bssid_enable_bitmap(ar, bitmap); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set srg_bssid_en_bitmap pdev: %u\n", + pdev_id); + return ret; + } + + /* Enable all BSS Colors for non-SRG */ + ret = ath12k_wmi_pdev_non_srg_obss_color_enable_bitmap(ar, bitmap); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set non_srg_color_en_bitmap pdev: %u\n", + pdev_id); + return ret; + } + + /* Enable all patial BSSID mask for non-SRG */ + ret = ath12k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(ar, bitmap); + if (ret) { + ath12k_warn(ar->ab, + "Failed to set non_srg_bssid_en_bitmap pdev: %u\n", + pdev_id); + return ret; + } + + return 0; +} + +void ath12k_mac_bss_info_changed(struct ath12k *ar, + struct ath12k_link_vif *arvif, struct ieee80211_bss_conf *info, u64 changed) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_vif *ahvif = arvif->ahvif, *tx_ahvif; + struct ath12k_link_vif *tx_arvif; + struct ieee80211_vif *vif = ahvif->vif; struct cfg80211_chan_def def; + struct vdev_up_params params = { 0 }; u32 param_id, param_value; enum nl80211_band band; u32 vdev_param; @@ -2290,8 +4673,13 @@ int ret; u8 rateidx; u32 rate; + bool color_collision_detect; + u8 link_id = arvif->link_id; - mutex_lock(&ar->conf_mutex); + lockdep_assert_held(&ar->conf_mutex); + + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) + return; if (changed & BSS_CHANGED_BEACON_INT) { arvif->beacon_interval = info->beacon_int; @@ -2311,7 +4699,7 @@ if (changed & BSS_CHANGED_BEACON) { param_id = WMI_PDEV_PARAM_BEACON_TX_MODE; - param_value = WMI_BEACON_STAGGERED_MODE; + param_value = WMI_BEACON_BURST_MODE; ret = ath12k_wmi_pdev_set_param(ar, param_id, param_value, ar->pdev->pdev_id); if (ret) @@ -2322,10 +4710,87 @@ "Set staggered beacon mode for VDEV: %d\n", arvif->vdev_id); + if ((!arvif->do_not_send_tmpl || !arvif->bcca_zero_sent) && + arvif->is_started) { + /* need to install Transmitting vif's template first */ + ret = ath12k_mac_setup_bcn_tmpl(arvif); if (ret) ath12k_warn(ar->ab, "failed to update bcn template: %d\n", ret); + + if (!arvif->pending_csa_up) + goto skip_pending_cs_up; + + memset(¶ms, 0, sizeof(params)); + params.vdev_id = arvif->vdev_id; + params.aid = ahvif->aid; + params.bssid = arvif->bssid; + + if (info->mbssid_tx_vif) { + tx_ahvif = (void *)info->mbssid_tx_vif->drv_priv; + tx_arvif = tx_ahvif->link[info->mbssid_tx_vif_linkid]; + params.tx_bssid = tx_arvif->bssid; + params.profile_idx = ahvif->vif->bss_conf.bssid_index; + params.profile_count = BIT(info->bssid_indicator); + } + + if (info->mbssid_tx_vif && arvif != tx_arvif && + tx_arvif->pending_csa_up) { + /* skip non tx vif's */ + goto skip_pending_cs_up; + } + ret = ath12k_wmi_vdev_up(arvif->ar, ¶ms); + if (ret) + ath12k_warn(ar->ab, "failed to bring vdev up %d: %d\n", + arvif->vdev_id, ret); + + arvif->pending_csa_up = false; + + if (info->mbssid_tx_vif && arvif == tx_arvif) { + struct ath12k_link_vif *arvif_itr; + list_for_each_entry(arvif_itr, &ar->arvifs, list) { + if (!arvif_itr->pending_csa_up) + continue; + + memset(¶ms, 0, sizeof(params)); + params.vdev_id = arvif_itr->vdev_id; + params.aid = ahvif->aid; + params.bssid = arvif_itr->bssid; + params.tx_bssid = tx_arvif->bssid; + params.profile_idx = + ahvif->vif->bss_conf.bssid_index; + params.profile_count = + BIT(info->bssid_indicator); + ret = ath12k_wmi_vdev_up(arvif_itr->ar, ¶ms); + if (ret) + ath12k_warn(ar->ab, "failed to bring vdev up %d: %d\n", + arvif_itr->vdev_id, ret); + arvif_itr->pending_csa_up = false; + } + } + } +skip_pending_cs_up: + if (arvif->bcca_zero_sent) + arvif->do_not_send_tmpl = true; + else + arvif->do_not_send_tmpl = false; + + if (arvif->is_up && info->he_support) { + param_id = WMI_VDEV_PARAM_BA_MODE; + + if (info->eht_support) + param_value = WMI_BA_MODE_BUFFER_SIZE_1024; + else + param_value = WMI_BA_MODE_BUFFER_SIZE_256; + + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + param_id, param_value); + if (ret) + ath12k_warn(ar->ab, + "failed to set BA BUFFER SIZE %d for vdev: %d\n", + param_value, arvif->vdev_id); + } } if (changed & (BSS_CHANGED_BEACON_INFO | BSS_CHANGED_BEACON)) { @@ -2347,31 +4812,31 @@ if (changed & BSS_CHANGED_SSID && vif->type == NL80211_IFTYPE_AP) { - arvif->u.ap.ssid_len = vif->cfg.ssid_len; + ahvif->u.ap.ssid_len = vif->cfg.ssid_len; if (vif->cfg.ssid_len) - memcpy(arvif->u.ap.ssid, vif->cfg.ssid, vif->cfg.ssid_len); - arvif->u.ap.hidden_ssid = info->hidden_ssid; + memcpy(ahvif->u.ap.ssid, vif->cfg.ssid, vif->cfg.ssid_len); + ahvif->u.ap.hidden_ssid = info->hidden_ssid; } - if (changed & BSS_CHANGED_BSSID && !is_zero_ether_addr(info->bssid)) + if (changed & BSS_CHANGED_BSSID && info->bssid && !is_zero_ether_addr(info->bssid)) ether_addr_copy(arvif->bssid, info->bssid); - if (changed & BSS_CHANGED_BEACON_ENABLED) { + /* pending_up is not needed for recovered ab during Mode1 scenario */ + if (changed & BSS_CHANGED_BEACON_ENABLED && !arvif->is_started && !ar->ab->recovery_start) + arvif->pending_up = true; + + if (changed & BSS_CHANGED_BEACON_ENABLED && arvif->is_started) { + if (info->enable_beacon) { + ath12k_mac_set_he_txbf_conf(arvif); + ath12k_mac_set_eht_txbf_conf(arvif); + } ath12k_control_beaconing(arvif, info); - if (arvif->is_up && vif->bss_conf.he_support && - vif->bss_conf.he_oper.params) { - /* TODO: Extend to support 1024 BA Bitmap size */ - ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, - WMI_VDEV_PARAM_BA_MODE, - WMI_BA_MODE_BUFFER_SIZE_256); - if (ret) - ath12k_warn(ar->ab, - "failed to set BA BUFFER SIZE 256 for vdev: %d\n", - arvif->vdev_id); + if (arvif->is_up && info->he_support) { + if (info->he_oper.params) { param_id = WMI_VDEV_PARAM_HEOPS_0_31; - param_value = vif->bss_conf.he_oper.params; + param_value = info->he_oper.params; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param_id, param_value); ath12k_dbg(ar->ab, ATH12K_DBG_MAC, @@ -2381,6 +4846,8 @@ if (ret) ath12k_warn(ar->ab, "Failed to set he oper params %x for VDEV %d: %i\n", param_value, arvif->vdev_id, ret); + + } } } @@ -2447,28 +4914,30 @@ if (changed & BSS_CHANGED_ASSOC) { if (vif->cfg.assoc) - ath12k_bss_assoc(hw, vif, info); + ath12k_bss_assoc(ar, arvif, info); else - ath12k_bss_disassoc(hw, vif); + ath12k_bss_disassoc(ar, arvif, false); } if (changed & BSS_CHANGED_TXPOWER) { ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac vdev_id %i txpower %d\n", arvif->vdev_id, info->txpower); - arvif->txpower = info->txpower; ath12k_mac_txpower_recalc(ar); } if (changed & BSS_CHANGED_MCAST_RATE && - !ath12k_mac_vif_chan(arvif->vif, &def)) { + !ath12k_mac_vif_chan(ahvif->vif, &def, link_id)) { band = def.chan->band; - mcast_rate = vif->bss_conf.mcast_rate[band]; + mcast_rate = info->mcast_rate[band]; - if (mcast_rate > 0) + if (mcast_rate > 0) { rateidx = mcast_rate - 1; - else - rateidx = ffs(vif->bss_conf.basic_rates) - 1; + } else { + rateidx = ffs(info->basic_rates); + if (rateidx) + rateidx -= 1; + } if (ar->pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP) rateidx += ATH12K_MAC_FIRST_OFDM_RATE_IDX; @@ -2505,8 +4974,8 @@ } if (changed & BSS_CHANGED_BASIC_RATES && - !ath12k_mac_vif_chan(arvif->vif, &def)) - ath12k_recalculate_mgmt_rate(ar, vif, &def); + !ath12k_mac_vif_chan(ahvif->vif, &def, link_id)) + ath12k_recalculate_mgmt_rate(ar, arvif, &def, info); if (changed & BSS_CHANGED_TWT) { if (info->twt_requester || info->twt_responder) @@ -2516,19 +4985,39 @@ } if (changed & BSS_CHANGED_HE_OBSS_PD) - ath12k_wmi_send_obss_spr_cmd(ar, arvif->vdev_id, - &info->he_obss_pd); + ath12k_mac_config_obss_pd(ar, &info->he_obss_pd); if (changed & BSS_CHANGED_HE_BSS_COLOR) { + color_collision_detect = (info->he_bss_color.enabled && + info->he_bss_color.collision_detection_enabled); if (vif->type == NL80211_IFTYPE_AP) { ret = ath12k_wmi_obss_color_cfg_cmd(ar, arvif->vdev_id, info->he_bss_color.color, ATH12K_BSS_COLOR_AP_PERIODS, - info->he_bss_color.enabled); + info->nontransmitted ? + 0 : color_collision_detect); if (ret) ath12k_warn(ar->ab, "failed to set bss color collision on vdev %i: %d\n", arvif->vdev_id, ret); + + param_id = WMI_VDEV_PARAM_BSS_COLOR; + param_value = info->he_bss_color.color << IEEE80211_HE_OPERATION_BSS_COLOR_OFFSET; + + if (!info->he_bss_color.enabled) + param_value |= IEEE80211_HE_OPERATION_BSS_COLOR_DISABLED; + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + param_id, + param_value); + if (ret) + ath12k_warn(ar->ab, + "failed to set bss color param on vdev %i: %d\n", + arvif->vdev_id, ret); + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "bss color param 0x%x set on vdev %i\n", + param_value, arvif->vdev_id); + } else if (vif->type == NL80211_IFTYPE_STATION) { ret = ath12k_wmi_send_bss_color_change_enable_cmd(ar, arvif->vdev_id, @@ -2550,12 +5039,330 @@ if (changed & BSS_CHANGED_FILS_DISCOVERY || changed & BSS_CHANGED_UNSOL_BCAST_PROBE_RESP) ath12k_mac_fils_discovery(arvif, info); +} + +static void ath12k_mac_op_vif_cfg_changed(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + u64 changed) +{ + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_link_vif *arvif; + struct ath12k *ar; + unsigned long link_id; + struct ieee80211_bss_conf *info; + + if (changed & BSS_CHANGED_SSID && + vif->type == NL80211_IFTYPE_AP) { + ahvif->u.ap.ssid_len = vif->cfg.ssid_len; + if (vif->cfg.ssid_len) + memcpy(ahvif->u.ap.ssid, vif->cfg.ssid, vif->cfg.ssid_len); + } + + link_id = ahvif->deflink.link_id; + + if (changed & BSS_CHANGED_ASSOC) { + for_each_set_bit(link_id, &ahvif->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + info = vif->link_conf[link_id]; + ar = arvif->ar; + if (vif->cfg.assoc) { + if (info) + ath12k_bss_assoc(ar, arvif, info); + } else { + ath12k_bss_disassoc(ar, arvif, false); + } + } + } +} + +static void ath12k_mac_op_bss_info_changed(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *info, + u64 changed) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_link_vif *arvif; + struct ath12k *ar; + u8 link_id = info->link_id; + + mutex_lock(&ah->conf_mutex); + arvif = ahvif->link[link_id]; + + if (arvif == NULL || !arvif->is_created) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "bss info parameter changes %llx cached to apply after vdev create on channel assign\n", + changed); + + ahvif->cache[link_id].bss_conf_changed |= changed; + mutex_unlock(&ah->conf_mutex); + return; + } + + ar = arvif->ar; + + if (!ar) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "bss info parameter changes %llx cached to apply after vdev create on channel assign\n", + changed); + ahvif->cache[link_id].bss_conf_changed |= changed; + mutex_unlock(&ah->conf_mutex); + return; + } + + mutex_lock(&ar->conf_mutex); + + ath12k_mac_bss_info_changed(ar, arvif, info, changed); mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); +} + +static int ath12k_mac_vdev_delete(struct ath12k *ar, struct ath12k_link_vif *arvif) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + unsigned long time_left; + int ret = 0; + + lockdep_assert_held(&ar->conf_mutex); + + reinit_completion(&ar->vdev_delete_done); + + ret = ath12k_wmi_vdev_delete(ar, arvif->vdev_id); + if (ret) { + ath12k_warn(ar->ab, "failed to delete WMI scan vdev %d: %d\n", + arvif->vdev_id, ret); + goto clean_up; + } + + time_left = wait_for_completion_timeout(&ar->vdev_delete_done, + ATH12K_VDEV_DELETE_TIMEOUT_HZ); + if (time_left == 0) { + ath12k_warn(ar->ab, "Timeout in receiving vdev delete response vdev_id : %d\n", + arvif->vdev_id); + ret = -ETIMEDOUT; + goto clean_up; + } + + spin_lock_bh(&ar->ab->base_lock); + ar->ab->free_vdev_map |= 1LL << arvif->vdev_id; + spin_unlock_bh(&ar->ab->base_lock); + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (arvif->link_id != ATH12K_DEFAULT_SCAN_LINK && arvif->ndev_pvt) { + if (arvif->ndev_pvt->is_bond_enslaved) + ath12k_bond_link_release(arvif); + ath12k_disable_ppe_for_link_netdev(ar->ab, arvif, + arvif->ndev_pvt->link_ndev); + } +#endif + ar->allocated_vdev_map &= ~(1LL << arvif->vdev_id); + ar->ab->free_vdev_stats_id_map &= ~(1LL << arvif->vdev_stats_id); + ar->num_created_vdevs--; + arvif->ahvif->num_vdev_created--; + + ath12k_dbg(ar->ab, ATH12K_DBG_SET(MAC, L1), "mac vdev delete id %d type %d subtype %d map %llx\n", + arvif->vdev_id, ahvif->vdev_type, ahvif->vdev_subtype, + ar->ab->free_vdev_map); +clean_up: + arvif->is_created = false; + arvif->is_scan_vif = false; + arvif->ar = NULL; + spin_lock_bh(&ar->data_lock); + list_del(&arvif->list); + spin_unlock_bh(&ar->data_lock); + + return ret; +} + +static int ath12k_mac_vdev_stop(struct ath12k_link_vif *arvif) +{ + struct ath12k *ar = arvif->ar; + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + if (!arvif->vdev_stop_notify_done) { + reinit_completion(&ar->vdev_setup_done); + + ret = ath12k_wmi_vdev_stop(ar, arvif->vdev_id); + if (ret) { + ath12k_warn(ar->ab, "failed to stop WMI vdev %i: %d\n", + arvif->vdev_id, ret); + return ret; + } + arvif->vdev_stop_notify_done = true; + + ret = ath12k_mac_vdev_setup_sync(ar); + if (ret) { + ath12k_warn(ar->ab, "failed to synchronize setup for vdev %i: %d\n", + arvif->vdev_id, ret); + return ret; + } + } + + memset(&ar->wmm_stats, 0, sizeof(struct ath12k_wmm_stats)); + WARN_ON(ar->num_started_vdevs == 0); + + ar->num_started_vdevs--; + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "vdev %pM stopped, vdev_id %d\n", + arvif->addr, arvif->vdev_id); + + if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) { + clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "CAC Stopped for vdev %d\n", + arvif->vdev_id); + } + + return 0; +} + +static int +ath12k_mac_find_link_id_by_freq(struct ieee80211_vif *vif, struct ath12k *ar, u32 freq) +{ + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + u16 link_id; + + lockdep_assert_held(&ahvif->ah->conf_mutex); + + if (!vif->valid_links) + return 0; + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { + if (!(ahvif->links_map & BIT(link_id)) || + !ahvif->link[link_id]->ar) + continue; + if (freq >= ahvif->link[link_id]->ar->chan_info.low_freq && + freq <= ahvif->link[link_id]->ar->chan_info.high_freq) + return link_id; + } + + /* Use a default link for scan purpose in driver if the request + * cannot be mapped to any of the active links(channel assigned) + */ + return ATH12K_DEFAULT_SCAN_LINK; +} + +void ath12k_mac_unassign_link_vif(struct ath12k_link_vif *arvif) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_hw *ah = ahvif->ah; + + lockdep_assert_held(&ah->conf_mutex); + + ahvif->link[arvif->link_id] = NULL; + ahvif->links_map &= ~BIT(arvif->link_id); + + if (arvif != &ahvif->deflink) + kfree(arvif); + else + memset(arvif->addr, 0, ETH_ALEN); +} + +struct ath12k_link_vif * +ath12k_mac_assign_link_vif( struct ath12k_hw *ah, struct ieee80211_vif *vif, u8 link_id) +{ + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + int i; + + lockdep_assert_held(&ah->conf_mutex); + + if(ahvif->link[link_id]) + return ahvif->link[link_id]; + + /* Not a ML vif */ + if (!vif->valid_links) { + link_id = 0; + arvif = &ahvif->deflink; + } else { + /* first link vif is fetched from deflink except for scan arvifs */ + if (!ahvif->links_map && link_id != ATH12K_DEFAULT_SCAN_LINK) { + arvif = &ahvif->deflink; + } else { + arvif = (struct ath12k_link_vif *) + kzalloc(sizeof(struct ath12k_link_vif), + GFP_KERNEL); + + if (arvif == NULL) + return NULL; + + INIT_LIST_HEAD(&arvif->list); + INIT_WORK(&arvif->update_obss_color_notify_work, + ath12k_update_obss_color_notify_work); + INIT_WORK(&arvif->update_bcn_template_work, + ath12k_update_bcn_template_work); + arvif->num_stations = 0; + init_completion(&arvif->peer_ch_width_switch_send); + INIT_WORK(&arvif->peer_ch_width_switch_work, + ath12k_wmi_peer_chan_width_switch_work); + } + } + + ahvif->link[link_id] = arvif; + arvif->ahvif = ahvif; + arvif->link_id = link_id; + ahvif->links_map |= BIT(link_id); + + for (i = 0; i < ARRAY_SIZE(arvif->bitrate_mask.control); i++) { + arvif->bitrate_mask.control[i].legacy = 0xffffffff; + arvif->bitrate_mask.control[i].gi = NL80211_TXRATE_FORCE_SGI; + memset(arvif->bitrate_mask.control[i].ht_mcs, 0xff, + sizeof(arvif->bitrate_mask.control[i].ht_mcs)); + memset(arvif->bitrate_mask.control[i].vht_mcs, 0xff, + sizeof(arvif->bitrate_mask.control[i].vht_mcs)); + memset(arvif->bitrate_mask.control[i].he_mcs, 0xff, + sizeof(arvif->bitrate_mask.control[i].he_mcs)); + memset(arvif->bitrate_mask.control[i].eht_mcs, 0xff, + sizeof(arvif->bitrate_mask.control[i].eht_mcs)); + } + + return arvif; +} + +static struct ath12k* +ath12k_mac_select_scan_device(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + u32 center_freq) +{ + struct ath12k_hw *ah = hw->priv; + enum nl80211_band band; + struct ath12k *ar; + int i; + + /* Loop through first channel and determine the scan radio + * NOTE: There could be 5G low/high channels in that case + * split the hw request and perform multiple scans + */ + + if (center_freq < ATH12K_MIN_5G_FREQ) + band = NL80211_BAND_2GHZ; + else if (center_freq < ATH12K_MIN_6G_FREQ) + band = NL80211_BAND_5GHZ; + else + band = NL80211_BAND_6GHZ; + + ar = ah->radio; + + for (i = 0; i < ah->num_radio; i++) { + if (band == NL80211_BAND_5GHZ) { + if (center_freq > ar->chan_info.low_freq && + center_freq < ar->chan_info.high_freq) + if (ar->mac.sbands[band].channels) + return ar; + } else if (ar->mac.sbands[band].channels) { + return ar; + } + ar++; + } + + return NULL; } void __ath12k_mac_scan_finish(struct ath12k *ar) { + struct ath12k_hw *ah = ar->ah; + lockdep_assert_held(&ar->data_lock); switch (ar->scan.state) { @@ -2563,23 +5370,26 @@ break; case ATH12K_SCAN_RUNNING: case ATH12K_SCAN_ABORTING: + if (ar->scan.is_roc && ar->scan.roc_notify) + ieee80211_remain_on_channel_expired(ah->hw); + fallthrough; + case ATH12K_SCAN_STARTING: if (!ar->scan.is_roc) { struct cfg80211_scan_info info = { - .aborted = (ar->scan.state == - ATH12K_SCAN_ABORTING), + .aborted = ((ar->scan.state == + ATH12K_SCAN_ABORTING) || + (ar->scan.state == + ATH12K_SCAN_STARTING)) }; - ieee80211_scan_completed(ar->hw, &info); - } else if (ar->scan.roc_notify) { - ieee80211_remain_on_channel_expired(ar->hw); + ieee80211_scan_completed(ah->hw, &info); } - fallthrough; - case ATH12K_SCAN_STARTING: ar->scan.state = ATH12K_SCAN_IDLE; ar->scan_channel = NULL; ar->scan.roc_freq = 0; cancel_delayed_work(&ar->scan.timeout); complete(&ar->scan.completed); + ieee80211_queue_work(ah->hw, &ar->scan.vdev_del_wk); break; } } @@ -2679,6 +5489,51 @@ mutex_unlock(&ar->conf_mutex); } +static void ath12k_scan_vdev_del_work(struct work_struct *work) +{ + struct ath12k *ar = container_of(work, struct ath12k, + scan.vdev_del_wk); + struct ath12k_hw *ah = ar->ah; + struct ath12k_link_vif *arvif; + + if (unlikely(test_bit(ATH12K_FLAG_RECOVERY, &ar->ab->dev_flags))) + return; + + mutex_lock(&ah->conf_mutex); + mutex_lock(&ar->conf_mutex); + /* scan vdev got deleted already. This can happen when on same vif, new + * scan request was requested with different frequeny which leads to + * movement of scan arvif from one radio to another radio */ + if (ar->scan.vdev_id == -1) + goto work_complete; + + mutex_unlock(&ar->conf_mutex); + + arvif = ath12k_mac_get_arvif(ar, ar->scan.vdev_id); + /* should not happen */ + if (!arvif) { + ath12k_warn(ar->ab, "mac scan vdev del on unknow vdev_id %d\n", + ar->scan.vdev_id); + mutex_unlock(&ah->conf_mutex); + return; + } + + if (arvif->is_started) { + mutex_lock(&ar->conf_mutex); + ar->scan.vdev_id = -1; + goto work_complete; + } + + ath12k_mac_remove_link_interface(ah->hw, arvif); + ath12k_mac_unassign_link_vif(arvif); + + mutex_lock(&ar->conf_mutex); + ar->scan.vdev_id = -1; +work_complete: + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); +} + static int ath12k_start_scan(struct ath12k *ar, struct ath12k_wmi_scan_req_arg *arg) { @@ -2686,6 +5541,9 @@ lockdep_assert_held(&ar->conf_mutex); + if (ath12k_spectral_get_mode(ar) == ATH12K_SPECTRAL_BACKGROUND) + ath12k_spectral_reset_buffer(ar); + ret = ath12k_wmi_send_scan_start_cmd(ar, arg); if (ret) return ret; @@ -2717,12 +5575,92 @@ struct ieee80211_vif *vif, struct ieee80211_scan_request *hw_req) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_hw *ah = hw->priv; + struct ath12k_link_vif *arvif; + struct ath12k *ar; struct cfg80211_scan_request *req = &hw_req->req; struct ath12k_wmi_scan_req_arg arg = {}; int ret; - int i; + int i, link_id; + bool create = true; + + mutex_lock(&ah->conf_mutex); + + /* Since the targeted scan device could depend on the frequency + * requested in the hw_req, select the corresponding radio + */ + ar = ath12k_mac_select_scan_device(hw, vif, hw_req->req.channels[0]->center_freq); + if (!ar) { + ath12k_err(NULL, "unable to select device for scan\n"); + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + + if (unlikely(test_bit(ATH12K_FLAG_RECOVERY, &ar->ab->dev_flags))) { + mutex_unlock(&ah->conf_mutex); + return -ESHUTDOWN; + } + + link_id = ath12k_mac_find_link_id_by_freq(vif, ar, + hw_req->req.channels[0]->center_freq); + + arvif = ath12k_mac_assign_link_vif(ah, vif, link_id); + /* If the vif is already assigned to a specific vdev of an ar, + * check whether its already started, vdev which is started + * are not allowed to switch to a new radio. + * If the vdev is not started, but was earlier created on a + * different ar, delete that vdev and create a new one. We don't + * delete at the scan stop as an optimization to avoid redundant + * delete-create vdev's for the same ar, in case the request is + * always on the same band for the vif + */ + if (!arvif) { + mutex_unlock(&ah->conf_mutex); + return -ENOMEM; + } + + if (arvif->link_id == ATH12K_DEFAULT_SCAN_LINK && + (!is_broadcast_ether_addr(req->bssid) && + !is_zero_ether_addr(req->bssid))) { + memcpy(arvif->addr, req->bssid, ETH_ALEN); + } + + if (arvif->is_created) { + if (ar != arvif->ar && arvif->is_started) { + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } else if (ar != arvif->ar) { + if (!arvif->ar) { + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + mutex_lock(&arvif->ar->conf_mutex); + if (arvif->ar->scan.vdev_id != -1) + arvif->ar->scan.vdev_id = -1; + mutex_unlock(&arvif->ar->conf_mutex); + + ath12k_mac_remove_link_interface(hw, arvif); + ath12k_mac_unassign_link_vif(arvif); + } else { + create = false; + } + } + + if (create) { + arvif = ath12k_mac_assign_link_vif(ah, vif, link_id); + mutex_lock(&ar->conf_mutex); + ret = ath12k_mac_vdev_create(ar, arvif); + if (ret) { + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + ath12k_warn(ar->ab, "unable to create scan vdev %d\n", ret); + return -EINVAL; + } + mutex_unlock(&ar->conf_mutex); + } + + mutex_unlock(&ah->conf_mutex); mutex_lock(&ar->conf_mutex); @@ -2767,6 +5705,14 @@ if (req->n_channels) { arg.num_chan = req->n_channels; + arg.chan_list = kcalloc(arg.num_chan, sizeof(*arg.chan_list), + GFP_KERNEL); + + if (!arg.chan_list) { + ret = -ENOMEM; + goto exit; + } + for (i = 0; i < arg.num_chan; i++) arg.chan_list[i] = req->channels[i]->center_freq; } @@ -2779,12 +5725,21 @@ spin_unlock_bh(&ar->data_lock); } + /* As per cfg80211/mac80211 scan design, it allows only + * scan at a time. Hence last_scan link id is used for + * tracking the link id on which the scan is been done + * on this vif + */ + ahvif->last_scan_link = arvif->link_id; + /* Add a margin to account for event/command processing */ - ieee80211_queue_delayed_work(ar->hw, &ar->scan.timeout, + ieee80211_queue_delayed_work(ar->ah->hw, &ar->scan.timeout, msecs_to_jiffies(arg.max_scan_time + ATH12K_MAC_SCAN_TIMEOUT_MSECS)); exit: + kfree(arg.chan_list); + if (req->ie_len) kfree(arg.extraie.ptr); @@ -2795,7 +5750,35 @@ static void ath12k_mac_op_cancel_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { - struct ath12k *ar = hw->priv; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_link_vif *arvif; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + u8 link_id = ahvif->last_scan_link; + + mutex_lock(&ah->conf_mutex); + + if (!(ahvif->links_map & BIT(link_id))) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(NULL, "unable to select device to cancel scan\n"); + return; + } + + arvif = ahvif->link[link_id]; + + if (!arvif->is_created) { + ath12k_err(NULL, "unable to select device to cancel scan\n"); + mutex_unlock(&ah->conf_mutex); + return; + } + + ar = arvif->ar; + if (!ar) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(NULL, "unable to select device to cancel scan\n"); + return; + } + mutex_unlock(&ah->conf_mutex); mutex_lock(&ar->conf_mutex); ath12k_scan_abort(ar); @@ -2804,13 +5787,15 @@ cancel_delayed_work_sync(&ar->scan.timeout); } -static int ath12k_install_key(struct ath12k_vif *arvif, +static int ath12k_install_key(struct ath12k_link_vif *arvif, struct ieee80211_key_conf *key, enum set_key_cmd cmd, const u8 *macaddr, u32 flags) { int ret; + struct ath12k_vif *ahvif = arvif->ahvif; struct ath12k *ar = arvif->ar; + struct ath12k_hw_group *ag = ar->ab->ag; struct wmi_vdev_install_key_arg arg = { .vdev_id = arvif->vdev_id, .key_idx = key->keyidx, @@ -2824,7 +5809,7 @@ reinit_completion(&ar->install_key_done); - if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) + if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ag->dev_flags)) return 0; if (cmd == DISABLE_KEY) { @@ -2852,13 +5837,24 @@ case WLAN_CIPHER_SUITE_GCMP: case WLAN_CIPHER_SUITE_GCMP_256: arg.key_cipher = WMI_CIPHER_AES_GCM; + key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV_MGMT; + break; + case WLAN_CIPHER_SUITE_AES_CMAC: + arg.key_cipher = WMI_CIPHER_AES_CMAC; + break; + case WLAN_CIPHER_SUITE_BIP_GMAC_128: + case WLAN_CIPHER_SUITE_BIP_GMAC_256: + arg.key_cipher = WMI_CIPHER_AES_GMAC; + break; + case WLAN_CIPHER_SUITE_BIP_CMAC_256: + arg.key_cipher = WMI_CIPHER_NONE; break; default: ath12k_warn(ar->ab, "cipher %d is not supported\n", key->cipher); return -EOPNOTSUPP; } - if (test_bit(ATH12K_FLAG_RAW_MODE, &ar->ab->dev_flags)) + if (test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV | IEEE80211_KEY_FLAG_RESERVE_TAILROOM; @@ -2871,13 +5867,15 @@ if (!wait_for_completion_timeout(&ar->install_key_done, 1 * HZ)) return -ETIMEDOUT; - if (ether_addr_equal(macaddr, arvif->vif->addr)) - arvif->key_cipher = key->cipher; + if (ether_addr_equal(macaddr, arvif->addr)) { + ahvif->key_cipher = key->cipher; + ath12k_dp_tx_update_bank_profile(arvif); + } return ar->install_key_status ? -EINVAL : 0; } -static int ath12k_clear_peer_keys(struct ath12k_vif *arvif, +static int ath12k_clear_peer_keys(struct ath12k_link_vif *arvif, const u8 *addr) { struct ath12k *ar = arvif->ar; @@ -2919,40 +5917,52 @@ return first_errno; } -static int ath12k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, - struct ieee80211_vif *vif, struct ieee80211_sta *sta, +int ath12k_mac_set_key(struct ath12k *ar, enum set_key_cmd cmd, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, struct ieee80211_key_conf *key) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_base *ab; struct ath12k_peer *peer; - struct ath12k_sta *arsta; + struct ath12k_sta *ahsta = NULL; const u8 *peer_addr; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; + struct ieee80211_bss_conf *link_conf; int ret = 0; u32 flags = 0; + u8 link_id = arvif->link_id; + struct ieee80211_sta *sta = NULL; - /* BIP needs to be done in software */ - if (key->cipher == WLAN_CIPHER_SUITE_AES_CMAC || - key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_128 || - key->cipher == WLAN_CIPHER_SUITE_BIP_GMAC_256 || - key->cipher == WLAN_CIPHER_SUITE_BIP_CMAC_256) - return 1; + if (arsta) { + ahsta = arsta->ahsta; + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + } - if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags)) - return 1; + if (sta && sta->mlo && + (test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &ar->ab->dev_flags))) + return 0; - if (key->keyidx > WMI_MAX_KEY_INDEX) - return -ENOSPC; + lockdep_assert_held(&ar->ah->conf_mutex); - mutex_lock(&ar->conf_mutex); + rcu_read_lock(); + link_conf = rcu_dereference(vif->link_conf[link_id]); + + if (!link_conf) { + rcu_read_unlock(); + return -EINVAL; + } + + ab = ar->ab; if (sta) - peer_addr = sta->addr; - else if (arvif->vdev_type == WMI_VDEV_TYPE_STA) - peer_addr = vif->bss_conf.bssid; + peer_addr = arsta->addr; + else if (ahvif->vdev_type == WMI_VDEV_TYPE_STA) + peer_addr = link_conf->bssid; else - peer_addr = vif->addr; + peer_addr = link_conf->addr; + + rcu_read_unlock(); key->hw_key_idx = key->keyidx; @@ -2968,12 +5978,12 @@ ath12k_warn(ab, "cannot install key for non-existent peer %pM\n", peer_addr); ret = -EOPNOTSUPP; - goto exit; + goto out; } else { /* if the peer doesn't exist there is no key to disable * anymore */ - goto exit; + goto out; } } @@ -2984,14 +5994,15 @@ ret = ath12k_install_key(arvif, key, cmd, peer_addr, flags); if (ret) { - ath12k_warn(ab, "ath12k_install_key failed (%d)\n", ret); - goto exit; + ath12k_warn(ab, "ath12k_install_key cmd %d failed (%d) for peer %pM on vdev %d (link id %d)\n", + cmd, ret, peer_addr, arvif->vdev_id, link_id); + goto out; } ret = ath12k_dp_rx_peer_pn_replay_config(arvif, peer_addr, cmd, key); if (ret) { ath12k_warn(ab, "failed to offload PN replay detection %d\n", ret); - goto exit; + goto out; } spin_lock_bh(&ab->base_lock); @@ -3016,8 +6027,6 @@ ath12k_warn(ab, "peer %pM disappeared!\n", peer_addr); if (sta) { - arsta = (struct ath12k_sta *)sta->drv_priv; - switch (key->cipher) { case WLAN_CIPHER_SUITE_TKIP: case WLAN_CIPHER_SUITE_CCMP: @@ -3025,23 +6034,145 @@ case WLAN_CIPHER_SUITE_GCMP: case WLAN_CIPHER_SUITE_GCMP_256: if (cmd == SET_KEY) - arsta->pn_type = HAL_PN_TYPE_WPA; + ahsta->pn_type = HAL_PN_TYPE_WPA; else - arsta->pn_type = HAL_PN_TYPE_NONE; + ahsta->pn_type = HAL_PN_TYPE_NONE; break; default: - arsta->pn_type = HAL_PN_TYPE_NONE; + ahsta->pn_type = HAL_PN_TYPE_NONE; break; } } spin_unlock_bh(&ab->base_lock); -exit: - mutex_unlock(&ar->conf_mutex); +out: return ret; } +static int ath12k_mac_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, + struct ieee80211_vif *vif, struct ieee80211_sta *sta, + struct ieee80211_key_conf *key) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_hw_group *ag = ah->ag; + struct ath12k_key_conf *key_conf = NULL; + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta = NULL; + struct ath12k_sta *ahsta; + int ret = -ENOLINK; + u8 link_id; + + mutex_lock(&ah->conf_mutex); + + /* IGTK needs to be done in host software */ + if (key->keyidx == 4 || key->keyidx == 5) { + ret = 1; + goto out; + } + + if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ag->dev_flags)) { + ret = 1; + goto out; + } + + if (key->keyidx > WMI_MAX_KEY_INDEX) { + ret = -ENOSPC; + goto out; + } + + if (sta) { + ahsta = ath12k_sta_to_ahsta(sta); + if (sta->mlo) { + unsigned long links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + if (WARN_ON(!arvif || !arsta)) + continue; + mutex_lock(&arvif->ar->conf_mutex); + ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, arsta, key); + mutex_unlock(&arvif->ar->conf_mutex); + if (ret) + break; + arsta->keys[key->keyidx] = key; + } + } else { + arsta = &ahsta->deflink; + arvif = arsta->arvif; + if (WARN_ON(!arvif)) + goto out; + mutex_lock(&arvif->ar->conf_mutex); + ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, arsta, key); + mutex_unlock(&arvif->ar->conf_mutex); + arsta->keys[key->keyidx] = key; + } + } else { + if (key->link_id >= 0 && key->link_id < IEEE80211_MLD_MAX_NUM_LINKS) + arvif = ahvif->link[key->link_id]; + else + arvif = &ahvif->deflink; + + if (!arvif || !arvif->is_created) { + key_conf = kzalloc(sizeof(*key_conf), GFP_ATOMIC); + + if (!key_conf) { + ath12k_info(NULL, "failed to alloc cache key config\n"); + goto out; + } + + key_conf->cmd = cmd; + key_conf->sta = sta; + key_conf->key = key; + + list_add_tail(&key_conf->list, + &ahvif->cache[link_id].key_conf.list); + + ath12k_dbg(NULL, ATH12K_DBG_MAC, "set key param cached since vif not assign to radio\n"); + mutex_unlock(&ah->conf_mutex); + + return 0; + } + + if (!(arvif && arvif->ar)) { + ath12k_err(NULL, "Failed to set key.\n"); + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &arvif->ar->ab->dev_flags)) { + ath12k_dbg(arvif->ar->ab, ATH12K_DBG_MODE1_RECOVERY, + "cmd:%d called for crash flush set ab\n", cmd); + mutex_unlock(&ah->conf_mutex); + return 0; + } + + mutex_lock(&arvif->ar->conf_mutex); + ret = ath12k_mac_set_key(arvif->ar, cmd, arvif, arsta, key); + /* if sta is null, consider it has self peer */ + arvif->keys[key->keyidx] = key; + mutex_unlock(&arvif->ar->conf_mutex); + } +out: + mutex_unlock(&ah->conf_mutex); + return ret; +} + +static int +ath12k_mac_bitrate_mask_num_ht_rates(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int num_rates = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++) + num_rates += hweight16(mask->control[band].ht_mcs[i]); + + return num_rates; +} + static int ath12k_mac_bitrate_mask_num_vht_rates(struct ath12k *ar, enum nl80211_band band, @@ -3057,8 +6188,50 @@ } static int -ath12k_mac_set_peer_vht_fixed_rate(struct ath12k_vif *arvif, - struct ieee80211_sta *sta, +ath12k_mac_bitrate_mask_num_he_rates(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int num_rates = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].he_mcs); i++) + num_rates += hweight16(mask->control[band].he_mcs[i]); + + return num_rates; +} + +static int +ath12k_mac_bitrate_mask_num_he_ul_rates(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int num_rates = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].he_ul_mcs); i++) + num_rates += hweight16(mask->control[band].he_ul_mcs[i]); + + return num_rates; +} + +static int +ath12k_mac_bitrate_mask_num_eht_rates(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int num_rates = 0; + int i; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].eht_mcs); i++) + num_rates += hweight16(mask->control[band].eht_mcs[i]); + + return num_rates; +} + +static int +ath12k_mac_set_peer_vht_fixed_rate(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, const struct cfg80211_bitrate_mask *mask, enum nl80211_band band) { @@ -3066,6 +6239,11 @@ u8 vht_rate, nss; u32 rate_code; int ret, i; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); @@ -3080,73 +6258,332 @@ if (!nss) { ath12k_warn(ar->ab, "No single VHT Fixed rate found to set for %pM", - sta->addr); + arsta->addr); + return -EINVAL; + } + + /* Avoid updating invalid nss as fixed rate*/ + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[arsta->link_id]); + + if (!link_sta || nss > link_sta->rx_nss) { + rcu_read_unlock(); return -EINVAL; } + rcu_read_unlock(); ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "Setting Fixed VHT Rate for peer %pM. Device will not switch to any other selected rates", - sta->addr); + arsta->addr); rate_code = ATH12K_HW_RATE_CODE(vht_rate, nss - 1, WMI_RATE_PREAMBLE_VHT); - ret = ath12k_wmi_set_peer_param(ar, sta->addr, + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, + WMI_PEER_PARAM_FIXED_RATE, + rate_code); + if (ret) + ath12k_warn(ar->ab, + "failed to update STA %pM Fixed Rate %d: %d\n", + arsta->addr, rate_code, ret); + + return ret; +} + +static int +ath12k_mac_set_peer_he_fixed_rate(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, + const struct cfg80211_bitrate_mask *mask, + enum nl80211_band band) +{ + struct ath12k *ar = arvif->ar; + u8 he_rate, nss; + u32 rate_code; + int ret, i; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + lockdep_assert_held(&ar->conf_mutex); + + nss = 0; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].he_mcs); i++) { + if (hweight16(mask->control[band].he_mcs[i]) == 1) { + nss = i + 1; + he_rate = ffs(mask->control[band].he_mcs[i]) - 1; + } + } + + if (!nss) { + ath12k_warn(ar->ab, "No single HE Fixed rate found to set for %pM", + arsta->addr); + return -EINVAL; + } + + /* Avoid updating invalid nss as fixed rate*/ + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[arsta->link_id]); + + if (!link_sta || nss > link_sta->rx_nss) { + rcu_read_unlock(); + return -EINVAL; + } + + rcu_read_unlock(); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Setting Fixed HE Rate for peer %pM. Device will not switch to any other selected rates", + arsta->addr); + + rate_code = ATH12K_HW_RATE_CODE(he_rate, nss - 1, + WMI_RATE_PREAMBLE_HE); + + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_PARAM_FIXED_RATE, rate_code); if (ret) ath12k_warn(ar->ab, "failed to update STA %pM Fixed Rate %d: %d\n", + arsta->addr, rate_code, ret); + + return ret; +} + +static int +ath12k_mac_set_peer_ht_fixed_rate(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, + const struct cfg80211_bitrate_mask *mask, + enum nl80211_band band) +{ + struct ath12k *ar = arvif->ar; + u8 ht_rate, nss; + u32 rate_code; + int ret, i; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + lockdep_assert_held(&ar->conf_mutex); + + nss = 0; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++) { + if (hweight16(mask->control[band].ht_mcs[i]) == 1) { + nss = i + 1; + ht_rate = ffs(mask->control[band].ht_mcs[i]) - 1; + } + } + + if (!nss) { + ath12k_warn(ar->ab, "No single HT Fixed rate found to set for %pM", + sta->addr); + return -EINVAL; + } + + /* Avoid updating invalid nss as fixed rate*/ + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[arsta->link_id]); + + if (!link_sta || nss > link_sta->rx_nss) { + rcu_read_unlock(); + return -EINVAL; + } + + rcu_read_unlock(); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Setting Fixed HT Rate for peer %pM. Device will not switch to any other selected rates", + sta->addr); + + rate_code = ATH12K_HW_RATE_CODE(ht_rate, nss - 1, + WMI_RATE_PREAMBLE_HT); + ret = ath12k_wmi_set_peer_param(ar, sta->addr, + arvif->vdev_id, + WMI_PEER_PARAM_FIXED_RATE, + rate_code); + + if (ret) + ath12k_warn(ar->ab, + "failed to update STA %pM HT Fixed Rate %d: %d\n", sta->addr, rate_code, ret); return ret; } +static int +ath12k_mac_set_peer_eht_fixed_rate(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, + const struct cfg80211_bitrate_mask *mask, + enum nl80211_band band) +{ + struct ath12k *ar = arvif->ar; + u8 eht_rate, nss; + u32 rate_code; + int ret, i; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + lockdep_assert_held(&ar->conf_mutex); + + nss = 0; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].eht_mcs); i++) { + if (hweight16(mask->control[band].eht_mcs[i]) == 1) { + nss = i + 1; + eht_rate = ffs(mask->control[band].eht_mcs[i]) - 1; + } + } + + if (!nss) { + ath12k_warn(ar->ab, "No single EHT Fixed rate found to set for %pM", + arsta->addr); + return -EINVAL; + } + + /* Avoid updating invalid nss as fixed rate*/ + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[arsta->link_id]); + + if (!link_sta || nss > link_sta->rx_nss) { + rcu_read_unlock(); + return -EINVAL; + } + + rcu_read_unlock(); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Setting Fixed EHT Rate for peer %pM. Device will not switch to any other selected rates", + arsta->addr); + + rate_code = ATH12K_HW_RATE_CODE(eht_rate, nss - 1, + WMI_RATE_PREAMBLE_EHT); + + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, + WMI_PEER_PARAM_FIXED_RATE, + rate_code); + if (ret) + ath12k_warn(ar->ab, + "failed to update STA %pM Fixed Rate %d: %d\n", + arsta->addr, rate_code, ret); + + return ret; +} + static int ath12k_station_assoc(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, bool reassoc) { - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_vif *vif = ahvif->vif; + struct ieee80211_sta *sta; + struct ieee80211_link_sta *link_sta; struct ath12k_wmi_peer_assoc_arg peer_arg; int ret; struct cfg80211_chan_def def; enum nl80211_band band; struct cfg80211_bitrate_mask *mask; - u8 num_vht_rates; + u8 num_vht_rates, num_he_rates, num_eht_rates, num_ht_rates; + u8 link_id = arvif->link_id; + bool ht_supp, vht_supp, has_he, has_eht; + struct ieee80211_sta_ht_cap ht_cap; + enum ieee80211_sta_rx_bandwidth bandwidth; + u16 he_6ghz_capa; + lockdep_assert_held(&ar->conf_mutex); - if (WARN_ON(ath12k_mac_vif_chan(vif, &def))) + if (!arvif) + return -EINVAL; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, link_id))) return -EPERM; + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + if (WARN_ON(rcu_access_pointer(sta->link[link_id]) == NULL)) + return -EINVAL; + band = def.chan->band; mask = &arvif->bitrate_mask; - ath12k_peer_assoc_prepare(ar, vif, sta, &peer_arg, reassoc); + ahsta = ath12k_sta_to_ahsta(sta); + arsta = ahsta->link[link_id]; + if (WARN_ON(!arsta)) + return -EINVAL; + + rcu_read_lock(); + + link_sta = ath12k_get_link_sta(arsta); + + if (!link_sta) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access link sta in station assoc\n"); + return -EINVAL; + } + + he_6ghz_capa = le16_to_cpu(link_sta->he_6ghz_capa.capa); + bandwidth = link_sta->bandwidth; + ht_cap = link_sta->ht_cap; + ht_supp = link_sta->ht_cap.ht_supported; + vht_supp = link_sta->vht_cap.vht_supported; + has_he = link_sta->he_cap.has_he; + has_eht = link_sta->eht_cap.has_eht; + bandwidth = link_sta->bandwidth; + + ath12k_peer_assoc_prepare(ar, arvif, arsta, &peer_arg, reassoc); + + rcu_read_unlock(); + peer_arg.is_assoc = true; ret = ath12k_wmi_send_peer_assoc_cmd(ar, &peer_arg); if (ret) { ath12k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n", - sta->addr, arvif->vdev_id, ret); + arsta->addr, arvif->vdev_id, ret); return ret; } if (!wait_for_completion_timeout(&ar->peer_assoc_done, 1 * HZ)) { ath12k_warn(ar->ab, "failed to get peer assoc conf event for %pM vdev %i\n", - sta->addr, arvif->vdev_id); + arsta->addr, arvif->vdev_id); return -ETIMEDOUT; } num_vht_rates = ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask); - - /* If single VHT rate is configured (by set_bitrate_mask()), - * peer_assoc will disable VHT. This is now enabled by a peer specific - * fixed param. + num_he_rates = ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask); + num_eht_rates = ath12k_mac_bitrate_mask_num_eht_rates(ar, band, mask); + num_ht_rates = ath12k_mac_bitrate_mask_num_ht_rates(ar, band, mask); + + /* If single VHT/HE/EHT rate is configured (by set_bitrate_mask()), + * peer_assoc will disable VHT/HE/EHT. This is now enabled by a peer + * specific fixed param. * Note that all other rates and NSS will be disabled for this peer. */ - if (sta->deflink.vht_cap.vht_supported && num_vht_rates == 1) { - ret = ath12k_mac_set_peer_vht_fixed_rate(arvif, sta, mask, + if (vht_supp && num_vht_rates == 1) { + ret = ath12k_mac_set_peer_vht_fixed_rate(arvif, arsta, mask, + band); + if (ret) + return ret; + } else if (has_he && num_he_rates == 1) { + ret = ath12k_mac_set_peer_he_fixed_rate(arvif, arsta, mask, + band); + if (ret) + return ret; + } else if (has_eht && num_eht_rates == 1) { + ret = ath12k_mac_set_peer_eht_fixed_rate(arvif, arsta, mask, + band); + if (ret) + return ret; + } else if (ht_supp && num_ht_rates == 1) { + ret = ath12k_mac_set_peer_ht_fixed_rate(arvif, arsta, mask, band); if (ret) return ret; @@ -3158,14 +6595,24 @@ if (reassoc) return 0; - ret = ath12k_setup_peer_smps(ar, arvif, sta->addr, - &sta->deflink.ht_cap); + ret = ath12k_setup_peer_smps(ar, arvif, arsta->addr, + &ht_cap, + he_6ghz_capa); if (ret) { ath12k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n", arvif->vdev_id, ret); return ret; } +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ret = ath12k_wmi_set_peer_intra_bss_cmd(ar, arvif->vdev_id, arsta->addr, 1); + if (ret) { + ath12k_warn(ar->ab, "failed to set vdev %i intra bss enable: %d\n", + arvif->vdev_id, ret); + return ret; + } +#endif + if (!sta->wme) { arvif->num_legacy_stations++; ret = ath12k_recalc_rtscts_prot(arvif); @@ -3174,26 +6621,62 @@ } if (sta->wme && sta->uapsd_queues) { - ret = ath12k_peer_assoc_qos_ap(ar, arvif, sta); + ret = ath12k_peer_assoc_qos_ap(ar, arvif, arsta); if (ret) { ath12k_warn(ar->ab, "failed to set qos params for STA %pM for vdev %i: %d\n", - sta->addr, arvif->vdev_id, ret); + arsta->addr, arvif->vdev_id, ret); return ret; } } + spin_lock_bh(&ar->data_lock); + + /* Set arsta bw and prev bw */ + arsta->bw = bandwidth; + arsta->bw_prev = bandwidth; + + arvif->num_stations++; + + ath12k_dbg(ar->ab, ATH12K_DBG_MODE1_RECOVERY, + "mac station %pM connected to vdev %u. num_stations=%u\n", + arsta->addr, arvif->vdev_id, arvif->num_stations); + + + spin_unlock_bh(&ar->data_lock); + return 0; } static int ath12k_station_disassoc(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta) + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; int ret; lockdep_assert_held(&ar->conf_mutex); + if (!arvif) + return -EINVAL; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + spin_lock_bh(&arvif->ar->data_lock); + + if (!arvif->num_stations) { + ath12k_warn(ar->ab, + "mac station disassoc for vdev %u which does not have any station connected\n", + arvif->vdev_id); + } else { + arvif->num_stations--; + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac station %pM disconnected from vdev %u. num_stations=%u\n", + arsta->addr, arvif->vdev_id, arvif->num_stations); + } + + spin_unlock_bh(&arvif->ar->data_lock); + if (!sta->wme) { arvif->num_legacy_stations--; ret = ath12k_recalc_rtscts_prot(arvif); @@ -3201,42 +6684,201 @@ return ret; } - ret = ath12k_clear_peer_keys(arvif, sta->addr); - if (ret) { + return 0; +} + +static int ath12k_station_authorize(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) +{ + struct ath12k_peer *peer; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + int ret = 0; + + lockdep_assert_held(&ar->conf_mutex); + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + spin_lock_bh(&ar->ab->base_lock); + + peer = ath12k_peer_find(ar->ab, arvif->vdev_id, arsta->addr); + if (peer) + peer->is_authorized = true; + + spin_unlock_bh(&ar->ab->base_lock); + + if (ahvif->vif->type == NL80211_IFTYPE_STATION && arvif->is_up) { + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, + WMI_PEER_AUTHORIZE, + 1); + if (ret) + ath12k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", + arsta->addr, arvif->vdev_id, ret); + } + + return ret; +} + +static int ath12k_station_unauthorize(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) +{ + struct ath12k_peer *peer; + int ret = 0; + + lockdep_assert_held(&ar->conf_mutex); + spin_lock_bh(&ar->ab->base_lock); + + peer = ath12k_peer_find(ar->ab, arvif->vdev_id, arsta->addr); + if (peer) + peer->is_authorized = false; + + spin_unlock_bh(&ar->ab->base_lock); + + /* Driver should clear the peer keys during mac80211's ref ptr + * gets cleared in __sta_info_destroy_part2 (trans from + * IEEE80211_STA_AUTHORIZED to IEEE80211_STA_ASSOC) + */ + ret = ath12k_clear_peer_keys(arvif, arsta->addr); + if (ret) ath12k_warn(ar->ab, "failed to clear all peer keys for vdev %i: %d\n", arvif->vdev_id, ret); + return ret; } + +static int ath12k_mac_set_peer_ch_switch_data(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, + enum wmi_phy_mode peer_phymode, + bool is_upgrade) +{ + struct ath12k *ar = arvif->ar; + struct ath12k_peer_ch_width_switch_data *peer_data; + struct wmi_chan_width_peer_arg *peer_arg; + struct ieee80211_link_sta *link_sta; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct cfg80211_chan_def def; + u16 ru_punct_bitmap; + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + if (!ar->ab->chwidth_num_peer_caps) + return -EOPNOTSUPP; + + if (WARN_ON(ath12k_mac_vif_chan(vif, &def, arvif->link_id))) + return -EINVAL; + + peer_data = arvif->peer_ch_width_switch_data; + + if (!peer_data) { + peer_data = kzalloc(struct_size(peer_data, peer_arg, + arvif->num_stations), + GFP_KERNEL); + if (!peer_data) + return -ENOMEM; + + peer_data->count = 0; + arvif->peer_ch_width_switch_data = peer_data; + } + + /* before adding to the list, if its BW upgrade, phymode should be updated. + * We update now and check because if we fail to update the phymode, no + * point is setting the bandwidth */ + if (is_upgrade) { + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, WMI_PEER_PHYMODE, + peer_phymode); + if (ret) { + ath12k_warn(ar->ab, "failed to update STA %pM peer phymode %d: %d\n", + arsta->addr, peer_phymode, ret); + + if (peer_data->count == 0) { + kfree(peer_data); + arvif->peer_ch_width_switch_data = NULL; + } + + return -EINVAL; + } + } + + peer_arg = &peer_data->peer_arg[peer_data->count++]; + + + ru_punct_bitmap = 0; + + rcu_read_lock(); + link_sta = ath12k_get_link_sta(arsta); + + if (link_sta) { + if (link_sta->he_cap.has_he && link_sta->eht_cap.has_eht) + ru_punct_bitmap = def.ru_punct_bitmap; + + if (ieee80211_vif_is_mesh(vif) && link_sta->ru_punct_bitmap) + ru_punct_bitmap = link_sta->ru_punct_bitmap; + } + + rcu_read_unlock(); + + spin_lock_bh(&ar->data_lock); + ether_addr_copy(peer_arg->mac_addr.addr, arsta->addr); + peer_arg->chan_width = arsta->bw; + peer_arg->puncture_20mhz_bitmap = ~ru_punct_bitmap; + peer_arg->peer_phymode = peer_phymode; + peer_arg->is_upgrade = is_upgrade; + spin_unlock_bh(&ar->data_lock); + + if (peer_data->count == 1) { + reinit_completion(&arvif->peer_ch_width_switch_send); + ieee80211_queue_work(ar->ah->hw, &arvif->peer_ch_width_switch_work); + } + + if (peer_data->count == arvif->num_stations) + complete(&arvif->peer_ch_width_switch_send); + return 0; } static void ath12k_sta_rc_update_wk(struct work_struct *wk) { struct ath12k *ar; - struct ath12k_vif *arvif; - struct ath12k_sta *arsta; + struct ath12k_link_vif *arvif; + struct ath12k_vif *ahvif; + struct ath12k_link_sta *arsta; struct ieee80211_sta *sta; struct cfg80211_chan_def def; enum nl80211_band band; const u8 *ht_mcs_mask; const u16 *vht_mcs_mask; + const u16 *he_mcs_mask; + const u16 *eht_mcs_mask; u32 changed, bw, nss, smps, bw_prev; - int err, num_vht_rates; + int err, num_vht_rates, num_he_rates, num_eht_rates, num_ht_rates; const struct cfg80211_bitrate_mask *mask; struct ath12k_wmi_peer_assoc_arg peer_arg; enum wmi_phy_mode peer_phymode; - - arsta = container_of(wk, struct ath12k_sta, update_wk); - sta = container_of((void *)arsta, struct ieee80211_sta, drv_priv); + struct ath12k_sta *ahsta; + struct ieee80211_link_sta *link_sta = NULL; + bool ht_supp, vht_supp, has_he, has_eht; + + arsta = container_of(wk, struct ath12k_link_sta, update_wk); + ahsta = arsta->ahsta; + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); arvif = arsta->arvif; + ahvif = arvif->ahvif; ar = arvif->ar; - if (WARN_ON(ath12k_mac_vif_chan(arvif->vif, &def))) + if (WARN_ON(ath12k_mac_vif_chan(ahvif->vif, &def, arsta->link_id))) return; band = def.chan->band; ht_mcs_mask = arvif->bitrate_mask.control[band].ht_mcs; vht_mcs_mask = arvif->bitrate_mask.control[band].vht_mcs; + he_mcs_mask = arvif->bitrate_mask.control[band].he_mcs; + eht_mcs_mask = arvif->bitrate_mask.control[band].eht_mcs; spin_lock_bh(&ar->data_lock); @@ -3253,13 +6895,20 @@ mutex_lock(&ar->conf_mutex); nss = max_t(u32, 1, nss); - nss = min(nss, max(ath12k_mac_max_ht_nss(ht_mcs_mask), - ath12k_mac_max_vht_nss(vht_mcs_mask))); + nss = min(nss, max(max(max(ath12k_mac_max_ht_nss(ht_mcs_mask), + ath12k_mac_max_vht_nss(vht_mcs_mask)), + ath12k_mac_max_he_nss(he_mcs_mask)), + ath12k_mac_max_eht_nss(eht_mcs_mask))); if (changed & IEEE80211_RC_BW_CHANGED) { - ath12k_peer_assoc_h_phymode(ar, arvif->vif, sta, &peer_arg); + ath12k_peer_assoc_h_phymode(ar, arvif, arsta, &peer_arg); peer_phymode = peer_arg.peer_phymode; + err = ath12k_mac_set_peer_ch_switch_data(arvif, arsta, peer_phymode, + bw > bw_prev ? true : false); + if (!err || err == -EINVAL) + goto err_rc_bw_changed; + if (bw > bw_prev) { /* Phymode shows maximum supported channel width, if we * upgrade bandwidth then due to sanity check of firmware, @@ -3267,13 +6916,13 @@ * WMI_PEER_CHWIDTH */ ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac bandwidth upgrade for sta %pM new %d old %d\n", - sta->addr, bw, bw_prev); - err = ath12k_wmi_set_peer_param(ar, sta->addr, + arsta->addr, bw, bw_prev); + err = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_PHYMODE, peer_phymode); if (err) { ath12k_warn(ar->ab, "failed to update STA %pM to peer phymode %d: %d\n", - sta->addr, peer_phymode, err); + arsta->addr, peer_phymode, err); goto err_rc_bw_changed; } err = ath12k_wmi_set_peer_param(ar, sta->addr, @@ -3281,57 +6930,75 @@ bw); if (err) ath12k_warn(ar->ab, "failed to update STA %pM to peer bandwidth %d: %d\n", - sta->addr, bw, err); + arsta->addr, bw, err); } else { /* When we downgrade bandwidth this will conflict with phymode * and cause to trigger firmware crash. In this case we send * WMI_PEER_CHWIDTH followed by WMI_PEER_PHYMODE */ ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac bandwidth downgrade for sta %pM new %d old %d\n", - sta->addr, bw, bw_prev); - err = ath12k_wmi_set_peer_param(ar, sta->addr, + arsta->addr, bw, bw_prev); + err = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_CHWIDTH, bw); if (err) { ath12k_warn(ar->ab, "failed to update STA %pM peer to bandwidth %d: %d\n", - sta->addr, bw, err); + arsta->addr, bw, err); goto err_rc_bw_changed; } - err = ath12k_wmi_set_peer_param(ar, sta->addr, + err = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_PHYMODE, peer_phymode); if (err) ath12k_warn(ar->ab, "failed to update STA %pM to peer phymode %d: %d\n", - sta->addr, peer_phymode, err); + arsta->addr, peer_phymode, err); } } if (changed & IEEE80211_RC_NSS_CHANGED) { - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac update sta %pM nss %d\n", - sta->addr, nss); + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, "mac update sta %pM nss %d\n", + arsta->addr, nss); - err = ath12k_wmi_set_peer_param(ar, sta->addr, arvif->vdev_id, + err = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_NSS, nss); if (err) ath12k_warn(ar->ab, "failed to update STA %pM nss %d: %d\n", - sta->addr, nss, err); + arsta->addr, nss, err); } if (changed & IEEE80211_RC_SMPS_CHANGED) { - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac update sta %pM smps %d\n", - sta->addr, smps); + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, "mac update sta %pM smps %d\n", + arsta->addr, smps); - err = ath12k_wmi_set_peer_param(ar, sta->addr, arvif->vdev_id, + err = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_MIMO_PS_STATE, smps); if (err) ath12k_warn(ar->ab, "failed to update STA %pM smps %d: %d\n", - sta->addr, smps, err); + arsta->addr, smps, err); } if (changed & IEEE80211_RC_SUPP_RATES_CHANGED) { + if (arsta->disable_fixed_rate) { + err = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, + WMI_PEER_PARAM_FIXED_RATE, + WMI_FIXED_RATE_NONE); + if (err) + ath12k_warn(ar->ab, + "failed to disable peer fixed rate for STA %pM ret %d\n", + arsta->addr, err); + + arsta->disable_fixed_rate = false; + } mask = &arvif->bitrate_mask; + num_ht_rates = ath12k_mac_bitrate_mask_num_ht_rates(ar, band, + mask); num_vht_rates = ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask); + num_he_rates = ath12k_mac_bitrate_mask_num_he_rates(ar, band, + mask); + num_eht_rates = ath12k_mac_bitrate_mask_num_eht_rates(ar, band, + mask); /* Peer_assoc_prepare will reject vht rates in * bitrate_mask if its not available in range format and @@ -3344,39 +7011,110 @@ * TODO: Check RATEMASK_CMDID to support auto rates selection * across HT/VHT and for multiple VHT MCS support. */ - if (sta->deflink.vht_cap.vht_supported && num_vht_rates == 1) { - ath12k_mac_set_peer_vht_fixed_rate(arvif, sta, mask, + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[arsta->link_id]); + + if (!link_sta) { + rcu_read_unlock(); + goto err_rc_bw_changed; + } + + ht_supp = link_sta->ht_cap.ht_supported; + vht_supp = link_sta->vht_cap.vht_supported; + has_he = link_sta->he_cap.has_he; + has_eht = link_sta->eht_cap.has_eht; + rcu_read_unlock(); + + if (vht_supp && num_vht_rates == 1) { + + ath12k_mac_set_peer_vht_fixed_rate(arvif, arsta, mask, + band); + } else if (has_he && num_he_rates == 1) { + ath12k_mac_set_peer_he_fixed_rate(arvif, arsta, mask, + band); + } else if (has_eht && num_eht_rates == 1) { + ath12k_mac_set_peer_eht_fixed_rate(arvif, arsta, mask, + band); + } else if (ht_supp && num_ht_rates == 1) { + ath12k_mac_set_peer_ht_fixed_rate(arvif, arsta, mask, band); } else { - /* If the peer is non-VHT or no fixed VHT rate - * is provided in the new bitrate mask we set the - * other rates using peer_assoc command. + /* If the peer is non-VHT/HE/EHT or no fixed VHT/HE/EHT + * rate is provided in the new bitrate mask we set the + * other rates using peer_assoc command. Also clear + * the peer fixed rate settings as it has higher proprity + * than peer assoc */ - ath12k_peer_assoc_prepare(ar, arvif->vif, sta, + + err = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, + WMI_PEER_PARAM_FIXED_RATE, + WMI_FIXED_RATE_NONE); + if (err) + ath12k_warn(ar->ab, + "failed to disable peer fixed rate for STA %pM ret %d\n", + arsta->addr, err); + ath12k_peer_assoc_prepare(ar, arvif, arsta, &peer_arg, true); + peer_arg.is_assoc = false; err = ath12k_wmi_send_peer_assoc_cmd(ar, &peer_arg); if (err) ath12k_warn(ar->ab, "failed to run peer assoc for STA %pM vdev %i: %d\n", - sta->addr, arvif->vdev_id, err); + arsta->addr, arvif->vdev_id, err); if (!wait_for_completion_timeout(&ar->peer_assoc_done, 1 * HZ)) ath12k_warn(ar->ab, "failed to get peer assoc conf event for %pM vdev %i\n", - sta->addr, arvif->vdev_id); + arsta->addr, arvif->vdev_id); } } err_rc_bw_changed: mutex_unlock(&ar->conf_mutex); } -static int ath12k_mac_inc_num_stations(struct ath12k_vif *arvif, - struct ieee80211_sta *sta) +static void ath12k_sta_set_4addr_wk(struct work_struct *wk) { + struct ath12k *ar; + struct ath12k_link_vif *arvif; + struct ath12k_sta *ahsta; + struct ath12k_link_sta *arsta; + struct ieee80211_sta *sta; + int ret = 0; + u8 link_id; + + ahsta = container_of(wk, struct ath12k_sta, set_4addr_wk); + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + for_each_set_bit(link_id, &ahsta->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arsta = ahsta->link[link_id]; + arvif = arsta->arvif; + ar = arvif->ar; + + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, + "setting USE_4ADDR for peer %pM\n", arsta->addr); + + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, + arvif->vdev_id, + WMI_PEER_USE_4ADDR, 1); + if (ret) + ath12k_warn(ar->ab, "failed to set peer %pM 4addr capability: %d\n", + arsta->addr, ret); + } +} + +static int ath12k_mac_inc_num_stations(struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) +{ + struct ath12k_vif *ahvif = arvif->ahvif; struct ath12k *ar = arvif->ar; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); - if (arvif->vdev_type == WMI_VDEV_TYPE_STA && !sta->tdls) + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA && !sta->tdls) return 0; if (ar->num_stations >= ar->max_num_stations) @@ -3384,95 +7122,226 @@ ar->num_stations++; + ath12k_dbg(ar->ab, ATH12K_DBG_MODE1_RECOVERY, + "num_stat incremented:%d\n", ar->num_stations); return 0; } -static void ath12k_mac_dec_num_stations(struct ath12k_vif *arvif, - struct ieee80211_sta *sta) +static void ath12k_mac_station_post_remove(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) { - struct ath12k *ar = arvif->ar; + struct ath12k_peer *peer; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; + bool skip_peer_delete; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + ath12k_mac_dec_num_stations(arvif, arsta); + + mutex_lock(&ar->ab->tbl_mtx_lock); + spin_lock_bh(&ar->ab->base_lock); + skip_peer_delete = ar->ab->hw_params->vdev_start_delay && + vif->type == NL80211_IFTYPE_STATION; + + peer = ath12k_peer_find(ar->ab, arvif->vdev_id, arsta->addr); + if (skip_peer_delete && peer) { + peer->sta = NULL; + } else if (peer && peer->sta == sta) { + ath12k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", + arsta->addr, arvif->vdev_id); + ath12k_peer_rhash_delete(ar->ab, peer); + peer->sta = NULL; + list_del(&peer->list); +#ifdef CONFIG_ATH12K_SAWF + if (peer->sawf_ctx_peer.telemetry_peer_ctx) + ath12k_telemetry_peer_ctx_free(peer->sawf_ctx_peer.telemetry_peer_ctx); +#endif + kfree(peer); + ar->num_peers--; + } + spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); + + kfree(arsta->tx_stats); + arsta->tx_stats = NULL; + + kfree(arsta->rx_stats); + arsta->rx_stats = NULL; + ath12k_mac_ap_ps_recalc(ar); + ahsta->ahvif = NULL; +} + +static int ath12k_mac_station_remove(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) +{ + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + int ret; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; + bool skip_peer_delete; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); lockdep_assert_held(&ar->conf_mutex); - if (arvif->vdev_type == WMI_VDEV_TYPE_STA && !sta->tdls) - return; + ath12k_dp_peer_cleanup(ar, arvif->vdev_id, arsta->addr); - ar->num_stations--; + skip_peer_delete = ar->ab->hw_params->vdev_start_delay && + vif->type == NL80211_IFTYPE_STATION; + + if (!skip_peer_delete) { + ret = ath12k_peer_delete(ar, arvif->vdev_id, arsta->addr); + if (ret) + ath12k_warn(ar->ab, "Failed to delete peer: %pM for VDEV: %d\n", + arsta->addr, arvif->vdev_id); + else + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, "Removed peer: %pM for VDEV: %d\n", + arsta->addr, arvif->vdev_id); + + ath12k_mac_station_post_remove(ar, arvif, arsta); + } + + return ret; } static int ath12k_mac_station_add(struct ath12k *ar, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta) + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta) { struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); - struct ath12k_sta *arsta = (struct ath12k_sta *)sta->drv_priv; - struct ath12k_wmi_peer_create_arg peer_param; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; + struct ath12k_wmi_peer_create_arg peer_param = {0}; + struct ath12k_neighbor_peer *nrp, *tmp; + int nvdev_id; int ret; + bool del_nrp = false; lockdep_assert_held(&ar->conf_mutex); - ret = ath12k_mac_inc_num_stations(arvif, sta); + if (!arvif) + return -EINVAL; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + ath12k_mac_inc_num_stations(arvif, arsta); if (ret) { ath12k_warn(ab, "refusing to associate station: too many connected already (%d)\n", ar->max_num_stations); goto exit; } + if (ath12k_debugfs_is_extd_rx_stats_enabled(ar) && !arsta->rx_stats) { arsta->rx_stats = kzalloc(sizeof(*arsta->rx_stats), GFP_KERNEL); if (!arsta->rx_stats) { ret = -ENOMEM; goto dec_num_station; } + } peer_param.vdev_id = arvif->vdev_id; - peer_param.peer_addr = sta->addr; + peer_param.peer_addr = arsta->addr; peer_param.peer_type = WMI_PEER_TYPE_DEFAULT; + peer_param.ml_enabled = sta->mlo; + + /* + * When the neighbor peer associates with this AP and successfully + * becomes a station, check and clear the corresponding MAC from + * NRP list and failing to do so would inadvertently cause the + * STA association(peer creation for STA) to fail due to the NRP + * having created a peer already for the same MAC address + */ + if (!list_empty(&ab->neighbor_peers)) { + spin_lock_bh(&ab->base_lock); + list_for_each_entry_safe(nrp, tmp, &ab->neighbor_peers, list) { + if (ether_addr_equal(nrp->addr, arsta->addr)) { + nvdev_id = nrp->vdev_id; + list_del(&nrp->list); + kfree(nrp); + del_nrp = true; + break; + } + } + spin_unlock_bh(&ab->base_lock); + + if (del_nrp) { + ath12k_peer_delete(ar, nvdev_id, arsta->addr); + ath12k_debugfs_nrp_clean(ar, arsta->addr); + } + } ret = ath12k_peer_create(ar, arvif, sta, &peer_param); if (ret) { ath12k_warn(ab, "Failed to add peer: %pM for VDEV: %d\n", - sta->addr, arvif->vdev_id); + arsta->addr, arvif->vdev_id); + goto free_rx_stats; + } + + ath12k_dbg(ab, ATH12K_DBG_PEER, "Added peer: %pM for VDEV: %d num_stations : %d\n", + arsta->addr, arvif->vdev_id, ar->num_stations); + + if (ath12k_debugfs_is_extd_tx_stats_enabled(ar) && (!arsta->tx_stats)) { + arsta->tx_stats = kzalloc(sizeof(*arsta->tx_stats), + GFP_KERNEL); + if (!arsta->tx_stats) { + ret = -ENOMEM; goto free_peer; } - ath12k_dbg(ab, ATH12K_DBG_MAC, "Added peer: %pM for VDEV: %d\n", - sta->addr, arvif->vdev_id); + arsta->wbm_tx_stats = kzalloc(sizeof(*arsta->wbm_tx_stats), GFP_KERNEL); + if(!arsta->wbm_tx_stats) { + ret = -ENOMEM; + goto free_peer; + } + } if (ieee80211_vif_is_mesh(vif)) { - ret = ath12k_wmi_set_peer_param(ar, sta->addr, + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_USE_4ADDR, 1); if (ret) { ath12k_warn(ab, "failed to STA %pM 4addr capability: %d\n", - sta->addr, ret); - goto free_peer; + arsta->addr, ret); + goto free_tx_stats; } } - ret = ath12k_dp_peer_setup(ar, arvif->vdev_id, sta->addr); - if (ret) { - ath12k_warn(ab, "failed to setup dp for peer %pM on vdev %i (%d)\n", - sta->addr, arvif->vdev_id, ret); - goto free_peer; - } - if (ab->hw_params->vdev_start_delay && !arvif->is_started && - arvif->vdev_type != WMI_VDEV_TYPE_AP) { - ret = ath12k_start_vdev_delay(ar->hw, vif); + ahvif->vdev_type != WMI_VDEV_TYPE_AP) { + ret = ath12k_start_vdev_delay(ar, vif); if (ret) { ath12k_warn(ab, "failed to delay vdev start: %d\n", ret); - goto free_peer; + goto free_tx_stats; } } + INIT_WORK(&arsta->update_wk, ath12k_sta_rc_update_wk); + + ahsta->ahvif = ahvif; + ewma_avg_rssi_init(&arsta->avg_rssi); return 0; +free_tx_stats: + kfree(arsta->tx_stats); + arsta->tx_stats = NULL; + kfree(arsta->wbm_tx_stats); + arsta->wbm_tx_stats = NULL; free_peer: - ath12k_peer_delete(ar, arvif->vdev_id, sta->addr); + ath12k_peer_delete(ar, arvif->vdev_id, arsta->addr); +free_rx_stats: + kfree(arsta->rx_stats); + arsta->rx_stats = NULL; dec_num_station: - ath12k_mac_dec_num_stations(arvif, sta); + ath12k_mac_dec_num_stations(arvif, arsta); exit: return ret; } @@ -3495,6 +7364,9 @@ case IEEE80211_STA_RX_BW_160: bw = WMI_PEER_CHWIDTH_160MHZ; break; + case IEEE80211_STA_RX_BW_320: + bw = WMI_PEER_CHWIDTH_320MHZ; + break; default: ath12k_warn(ar->ab, "Invalid bandwidth %d in rc update for %pM\n", sta->deflink.bandwidth, sta->addr); @@ -3505,118 +7377,258 @@ return bw; } -static int ath12k_mac_op_sta_state(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, - struct ieee80211_sta *sta, +static int ath12k_mac_assign_link_sta(struct ath12k_hw *ah, + struct ath12k_sta *ahsta, + struct ath12k_link_sta *arsta, + struct ath12k_vif *ahvif, + u8 link_id) +{ + struct ieee80211_link_sta *link_sta; + struct ieee80211_sta *sta; + + lockdep_assert_held(&ah->conf_mutex); + + if (!arsta || link_id > IEEE80211_MLD_MAX_NUM_LINKS) + return -EINVAL; + + if (WARN_ON(!ahvif->link[link_id])) + return -EINVAL; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + memset(arsta, 0, sizeof(*arsta)); + + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[link_id]); + if (!link_sta) { + rcu_read_unlock(); + return -EINVAL; + } + ether_addr_copy(arsta->addr, link_sta->addr); + rcu_read_unlock(); + + /* logical index of the link sta in order of creation */ + arsta->link_idx = ahsta->num_peer++; + + ahsta->link[link_id] = arsta; + ahsta->links_map |= BIT(link_id); + arsta->arvif = ahvif->link[link_id]; + arsta->ahsta = ahsta; + arsta->link_id = link_id; + arsta->state = IEEE80211_STA_NONE; + + return 0; +} + +static int ath12k_mac_unassign_link_sta(struct ath12k_hw *ah, + struct ath12k_sta *ahsta, + u8 link_id) +{ + lockdep_assert_held(&ah->conf_mutex); + + if (link_id > IEEE80211_MLD_MAX_NUM_LINKS) + return -EINVAL; + + ahsta->link[link_id] = NULL; + ahsta->links_map &= ~BIT(link_id); + + return 0; +} + +static struct ath12k_link_sta * +ath12k_mac_alloc_assign_link_sta(struct ath12k_hw *ah, struct ath12k_sta *ahsta, + struct ath12k_vif *ahvif, u8 link_id) +{ + struct ath12k_link_sta *arsta; + + lockdep_assert_held(&ah->conf_mutex); + + if (link_id > IEEE80211_MLD_MAX_NUM_LINKS) + return NULL; + + if (ahsta->link[link_id]) { + WARN_ON(1); + return NULL; + } + + arsta = kzalloc(sizeof(*arsta), GFP_KERNEL); + if (!arsta) + return NULL; + + if (ath12k_mac_assign_link_sta(ah, ahsta, arsta, ahvif, link_id)) { + kfree(arsta); + return NULL; + } + + return arsta; +} + +static int ath12k_mac_free_unassign_link_sta(struct ath12k_hw *ah, + struct ath12k_sta *ahsta, + u8 link_id) +{ + struct ath12k_link_sta *arsta; + + lockdep_assert_held(&ah->conf_mutex); + + if (link_id > IEEE80211_MLD_MAX_NUM_LINKS) + return -EINVAL; + + arsta = ahsta->link[link_id]; + + WARN_ON(arsta == NULL); + + ath12k_mac_unassign_link_sta(ah, ahsta, link_id); + + if (arsta != &ahsta->deflink) + kfree(arsta); + + return 0; +} + +static void ath12k_mac_ml_station_remove(struct ath12k_vif *ahvif, + struct ath12k_sta *ahsta) +{ + struct ieee80211_sta *sta; + struct ath12k_hw *ah = ahvif->ah; + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta; + struct ath12k *ar; + unsigned long links; + u8 link_id; + + lockdep_assert_held(&ah->conf_mutex); + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + ath12k_ml_link_peers_delete(ahvif, ahsta); + + /* validate link station removal and clear arsta links */ + links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + if (!arvif || !arsta) + continue; + + ar = arvif->ar; + + mutex_lock(&ar->conf_mutex); + + ath12k_mac_station_post_remove(ar, arvif, arsta); + mutex_unlock(&ar->conf_mutex); + + ath12k_mac_free_unassign_link_sta(ah, ahsta, link_id); + } + ath12k_ml_peer_delete(ah, sta); +} + +static int ath12k_mac_handle_link_sta_state(struct ieee80211_hw *hw, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, enum ieee80211_sta_state old_state, enum ieee80211_sta_state new_state) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); - struct ath12k_sta *arsta = (struct ath12k_sta *)sta->drv_priv; - struct ath12k_peer *peer; + struct ath12k *ar = arvif->ar; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k_sta *ahsta = arsta->ahsta; + struct ieee80211_sta *sta; int ret = 0; - /* cancel must be done outside the mutex to avoid deadlock */ + if (!ar) { + ath12k_err(NULL, "unable to determine device to set sta state\n"); + return -EINVAL; + } + + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) + return -ESHUTDOWN; + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + if (sta->mlo && + (test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &ar->ab->dev_flags))) + /* Shouldn't allow MLO STA assoc until UMAC_RECOVERY bit is cleared */ + return 0; + + /* cancel must be done outside the ar mutex to avoid deadlock */ if ((old_state == IEEE80211_STA_NONE && - new_state == IEEE80211_STA_NOTEXIST)) + new_state == IEEE80211_STA_NOTEXIST)) { + /* ML sta needs separate handling */ + if (sta->mlo) + return 0; cancel_work_sync(&arsta->update_wk); + } mutex_lock(&ar->conf_mutex); if (old_state == IEEE80211_STA_NOTEXIST && new_state == IEEE80211_STA_NONE) { - memset(arsta, 0, sizeof(*arsta)); - arsta->arvif = arvif; - INIT_WORK(&arsta->update_wk, ath12k_sta_rc_update_wk); - - ret = ath12k_mac_station_add(ar, vif, sta); + ret = ath12k_mac_station_add(ar, arvif, arsta); if (ret) ath12k_warn(ar->ab, "Failed to add station: %pM for VDEV: %d\n", - sta->addr, arvif->vdev_id); + arsta->addr, arvif->vdev_id); + ahsta->low_ack_sent = false; } else if ((old_state == IEEE80211_STA_NONE && new_state == IEEE80211_STA_NOTEXIST)) { - ath12k_dp_peer_cleanup(ar, arvif->vdev_id, sta->addr); - ret = ath12k_peer_delete(ar, arvif->vdev_id, sta->addr); + ret = ath12k_mac_station_remove(ar, arvif, arsta); if (ret) - ath12k_warn(ar->ab, "Failed to delete peer: %pM for VDEV: %d\n", - sta->addr, arvif->vdev_id); - else - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "Removed peer: %pM for VDEV: %d\n", - sta->addr, arvif->vdev_id); + ath12k_warn(ar->ab, "Failed to remove station: %pM for VDEV: %d\n", + arsta->addr, arvif->vdev_id); + if (sta->valid_links) + ath12k_mac_free_unassign_link_sta(arvif->ahvif->ah, + arsta->ahsta, arsta->link_id); + } else if (old_state == IEEE80211_STA_AUTH && + new_state == IEEE80211_STA_ASSOC) { - ath12k_mac_dec_num_stations(arvif, sta); - spin_lock_bh(&ar->ab->base_lock); - peer = ath12k_peer_find(ar->ab, arvif->vdev_id, sta->addr); - if (peer && peer->sta == sta) { - ath12k_warn(ar->ab, "Found peer entry %pM n vdev %i after it was supposedly removed\n", - vif->addr, arvif->vdev_id); - peer->sta = NULL; - list_del(&peer->list); - kfree(peer); - ar->num_peers--; - } - spin_unlock_bh(&ar->ab->base_lock); + ret = ath12k_dp_peer_setup(ar, arvif, arsta); + if (ret) + ath12k_warn(ar->ab, "failed to setup dp for peer %pM on vdev %i (%d)\n", + arsta->addr, arvif->vdev_id, ret); - kfree(arsta->rx_stats); - arsta->rx_stats = NULL; - } else if (old_state == IEEE80211_STA_AUTH && - new_state == IEEE80211_STA_ASSOC && - (vif->type == NL80211_IFTYPE_AP || + ath12k_dp_peer_default_route_setup(ar, arvif, arsta); + + if (vif->type == NL80211_IFTYPE_AP || vif->type == NL80211_IFTYPE_MESH_POINT || - vif->type == NL80211_IFTYPE_ADHOC)) { - ret = ath12k_station_assoc(ar, vif, sta, false); + vif->type == NL80211_IFTYPE_ADHOC) { + ret = ath12k_station_assoc(ar, arvif, arsta, false); if (ret) ath12k_warn(ar->ab, "Failed to associate station: %pM\n", - sta->addr); - - spin_lock_bh(&ar->data_lock); - - arsta->bw = ath12k_mac_ieee80211_sta_bw_to_wmi(ar, sta); - arsta->bw_prev = sta->deflink.bandwidth; - - spin_unlock_bh(&ar->data_lock); + arsta->addr); + } } else if (old_state == IEEE80211_STA_ASSOC && new_state == IEEE80211_STA_AUTHORIZED) { - spin_lock_bh(&ar->ab->base_lock); - - peer = ath12k_peer_find(ar->ab, arvif->vdev_id, sta->addr); - if (peer) - peer->is_authorized = true; - - spin_unlock_bh(&ar->ab->base_lock); - - if (vif->type == NL80211_IFTYPE_STATION && arvif->is_up) { - ret = ath12k_wmi_set_peer_param(ar, sta->addr, - arvif->vdev_id, - WMI_PEER_AUTHORIZE, - 1); + ret = ath12k_station_authorize(ar, arvif, arsta); + } else if (old_state == IEEE80211_STA_AUTHORIZED && + new_state == IEEE80211_STA_ASSOC) { + ath12k_station_unauthorize(ar, arvif, arsta); + } else if (old_state == IEEE80211_STA_ASSOC && + new_state == IEEE80211_STA_AUTHORIZED) { + ret = ath12k_station_authorize(ar, arvif, arsta); if (ret) ath12k_warn(ar->ab, "Unable to authorize peer %pM vdev %d: %d\n", sta->addr, arvif->vdev_id, ret); - } } else if (old_state == IEEE80211_STA_AUTHORIZED && new_state == IEEE80211_STA_ASSOC) { - spin_lock_bh(&ar->ab->base_lock); - - peer = ath12k_peer_find(ar->ab, arvif->vdev_id, sta->addr); - if (peer) - peer->is_authorized = false; - - spin_unlock_bh(&ar->ab->base_lock); + ath12k_station_unauthorize(ar, arvif, arsta); } else if (old_state == IEEE80211_STA_ASSOC && new_state == IEEE80211_STA_AUTH && (vif->type == NL80211_IFTYPE_AP || vif->type == NL80211_IFTYPE_MESH_POINT || vif->type == NL80211_IFTYPE_ADHOC)) { - ret = ath12k_station_disassoc(ar, vif, sta); + ret = ath12k_station_disassoc(ar, arvif, arsta); if (ret) ath12k_warn(ar->ab, "Failed to disassociate station: %pM\n", - sta->addr); + arsta->addr); } + arsta->state = new_state; mutex_unlock(&ar->conf_mutex); + + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, "mac sta %pM old state %d new state :%d\n", + arsta->addr, old_state, new_state); + return ret; } @@ -3624,64 +7636,458 @@ struct ieee80211_vif *vif, struct ieee80211_sta *sta) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta; int ret; s16 txpwr; + /* TODO use link id from op after support is available */ + u8 link_id = 0; + + mutex_lock(&ah->conf_mutex); + + /* TODO get arvif based on link id */ + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + if (!arvif) { + ath12k_err(NULL, "unable to determine device to set sta txpwr\n"); + ret = -EINVAL; + goto out; + } + + ar = ath12k_get_ar_by_vif(hw, vif, link_id); + if (!ar) { + ath12k_err(NULL, "unable to determine device to set sta txpwr\n"); + ret = -EINVAL; + goto out; + } if (sta->deflink.txpwr.type == NL80211_TX_POWER_AUTOMATIC) { txpwr = 0; } else { txpwr = sta->deflink.txpwr.power; - if (!txpwr) - return -EINVAL; + if (!txpwr) { + ret = -EINVAL; + goto out; + } } - if (txpwr > ATH12K_TX_POWER_MAX_VAL || txpwr < ATH12K_TX_POWER_MIN_VAL) - return -EINVAL; + if (txpwr > ATH12K_TX_POWER_MAX_VAL || txpwr < ATH12K_TX_POWER_MIN_VAL) { + ret = -EINVAL; + goto out; + } mutex_lock(&ar->conf_mutex); - ret = ath12k_wmi_set_peer_param(ar, sta->addr, arvif->vdev_id, + ret = ath12k_wmi_set_peer_param(ar, arsta->addr, arvif->vdev_id, WMI_PEER_USE_FIXED_PWR, txpwr); if (ret) { ath12k_warn(ar->ab, "failed to set tx power for station ret: %d\n", ret); - goto out; + goto err; } +err: + mutex_unlock(&ar->conf_mutex); out: + mutex_unlock(&ah->conf_mutex); + return ret; +} + +static inline void ath12k_vdev_stop_notify(struct ath12k_link_vif *arvif) +{ + int ret = 0; + if (WARN_ON(!arvif || !arvif->ar)) + return; + + mutex_lock(&arvif->ar->conf_mutex); + reinit_completion(&arvif->ar->vdev_setup_done); + ret = ath12k_wmi_vdev_stop(arvif->ar, arvif->vdev_id); + + if (ret) { + ath12k_warn(arvif->ar->ab, + "failed to stop WMI vdev %i: %d\n", + arvif->vdev_id, ret); + goto exit; + } + + ret = ath12k_mac_vdev_setup_sync(arvif->ar); + if (ret) + ath12k_warn(arvif->ar->ab, + "failed to synchronize setup for vdev %i: %d\n", + arvif->vdev_id, ret); +exit: + if (!ret) + arvif->vdev_stop_notify_done = true; + + mutex_unlock(&arvif->ar->conf_mutex); +} + +int ath12k_mac_update_sta_state(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, + enum ieee80211_sta_state old_state, + enum ieee80211_sta_state new_state) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + unsigned long links; + int ret = 0; + u8 link_id = 0, link; + + mutex_lock(&ah->conf_mutex); + + if (vif->valid_links && sta->valid_links) { + if (!sta->mlo) + WARN_ON(hweight16(sta->valid_links) != 1); + link_id = ffs(sta->valid_links) - 1; + } + + if ((old_state == IEEE80211_STA_NONE && + new_state == IEEE80211_STA_NOTEXIST)) { + cancel_work_sync(&ahsta->set_4addr_wk); + } + + if ((old_state == IEEE80211_STA_NOTEXIST && + new_state == IEEE80211_STA_NONE)) { + INIT_WORK(&ahsta->set_4addr_wk, ath12k_sta_set_4addr_wk); + if (!sta->mlo) { + ret = ath12k_mac_assign_link_sta(ah, ahsta, &ahsta->deflink, + ahvif, link_id); + if (ret) + goto exit; + } + } + + if (!sta->mlo) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + if (WARN_ON(arvif == NULL || arsta == NULL)) { + ret = -EINVAL; + goto exit; + } + if (new_state == IEEE80211_STA_NOTEXIST && + old_state == IEEE80211_STA_NONE && + ahvif->vdev_type == WMI_VDEV_TYPE_STA) + ath12k_vdev_stop_notify(arvif); + + ret = ath12k_mac_handle_link_sta_state(hw, arvif, arsta, + old_state, new_state); + if (arvif->ar && + test_bit(ATH12K_FLAG_RECOVERY, &arvif->ar->ab->dev_flags)) + ret = 0; + + mutex_unlock(&ah->conf_mutex); + return ret; + } + + if (!sta->valid_links && !vif->valid_links) + WARN_ON(1); + + /* assign default link to the first link sta */ + if (!ahsta->links_map && hweight16(sta->valid_links) == 1 && + new_state == IEEE80211_STA_NONE && old_state == IEEE80211_STA_NOTEXIST) { + /* add case to prevent MLO assoc from happening when UMAC recovery + * happens + */ + for_each_set_bit(link, &ahvif->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link]; + + if (!arvif || !arvif->ar || + (test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, + &arvif->ar->ab->dev_flags))){ + ret = -EINVAL; + goto exit; + } + } + + ret = ath12k_ml_peer_create(ah, sta); + if (ret) { + ath12k_err(NULL, "unable to create ML peer for sta %pM", sta->addr); + mutex_unlock(&ah->conf_mutex); + return ret; + } + + ath12k_mac_assign_link_sta(ah, ahsta, &ahsta->deflink, + ahvif, link_id); + + ahsta->deflink.is_assoc_link = true; + ahsta->assoc_link_id = link_id; + ahsta->primary_link_id = link_id; + } + + if (new_state == IEEE80211_STA_NOTEXIST && old_state == IEEE80211_STA_NONE) { + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA) { + links = sta->valid_links; + for_each_set_bit(link_id, &links, + IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + ath12k_vdev_stop_notify(arvif); + } + } + ath12k_mac_ml_station_remove(ahvif, ahsta); + goto exit; + } + + /* Reconfig links of arsta during recovery */ + if (ahsta->link[ahsta->assoc_link_id]->state != IEEE80211_STA_NONE && + old_state == IEEE80211_STA_NOTEXIST && + new_state == IEEE80211_STA_NONE) { + ahsta->num_peer = 0; + + for_each_set_bit(link_id, &ahsta->links_map, + IEEE80211_MLD_MAX_NUM_LINKS) { + arsta = ahsta->link[link_id]; + arvif = ahvif->link[link_id]; + + ath12k_mac_assign_link_sta(ah, ahsta, arsta, + ahvif, link_id); + } + ahsta->deflink.is_assoc_link = true; + + if (ahsta->use_4addr_set) + ieee80211_queue_work(ah->hw, &ahsta->set_4addr_wk); + } + + links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + /* some assumptions went wrong! */ + if (WARN_ON(!arvif || !arsta)) + continue; + + ret = ath12k_mac_handle_link_sta_state(hw, arvif, arsta, + old_state, new_state); + if (ret) { + if (ret != -ESHUTDOWN) + ath12k_err(NULL, "unable to move link sta %d of sta %pM from state %d to %d", + link_id, arsta->addr, old_state, new_state); + + /* If FW recovery is ongoing, no need to move down sta states + * as FW will wake up with a clean slate. Hence we set the + * return value to 0, so that upper layers are not aware + * of the FW being in recovery state. + */ + if (old_state > new_state) { + if (!arvif->ar) + continue; + if (test_bit(ATH12K_FLAG_RECOVERY, &arvif->ar->ab->dev_flags)) + ret = 0; + } + + if (old_state == IEEE80211_STA_NOTEXIST && new_state == IEEE80211_STA_NONE && + !test_bit(ATH12K_FLAG_RECOVERY, &arvif->ar->ab->dev_flags)) { + + /* Unassign this link sta which couldnt be added to FW and + * cleanup the other link stations added earlier + */ + ath12k_mac_free_unassign_link_sta(ah, ahsta, link_id); + ath12k_mac_ml_station_remove(ahvif, ahsta); + } + + mutex_unlock(&ah->conf_mutex); + return ret; + } + } + + if (old_state == IEEE80211_STA_AUTH && new_state == IEEE80211_STA_ASSOC) { + /* TODO sync wait for ML peer map success, else clear ml peer info on + * all partners? TBD on testing + */ + } + +exit: + mutex_unlock(&ah->conf_mutex); + + return ret; +} + +static int ath12k_mac_op_sta_state(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, + enum ieee80211_sta_state old_state, + enum ieee80211_sta_state new_state) +{ + return ath12k_mac_update_sta_state(hw, vif, sta, old_state, + new_state); +} + +static int ath12k_mac_op_change_sta_links(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, + u16 old_links, u16 new_links) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + unsigned long valid_links; + u8 link_id; + int ret = 0; + + if (!sta->valid_links) + return -EINVAL; + + /* FW doesnt support removal of one of link stas. All sta would be removed during ML STA + * delete in sta_state(), hence link sta removal is not handled here. + */ + if (new_links < old_links) + return 0; + + mutex_lock(&ah->conf_mutex); + + if (ahsta->ml_peer_id == ATH12K_MLO_PEER_ID_INVALID) { + ath12k_err(NULL, "unable to add link for ml sta %pM", sta->addr); + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + + /* this op is expected only after initial sta insertion with default link */ + WARN_ON(ahsta->links_map == 0); + + valid_links = sta->valid_links; + if ((test_bit(ahvif->primary_link_id, &valid_links))) { + arvif = ahvif->link[ahvif->primary_link_id]; + if (arvif->ar->ab->hw_params->is_plink_preferable) { + ahsta->primary_link_id = ahvif->primary_link_id; + } else { + ahsta->primary_link_id = ahsta->assoc_link_id; + arvif = ahvif->link[ahsta->assoc_link_id]; + if (!arvif->ar->ab->hw_params->is_plink_preferable) { + valid_links = sta->valid_links; + for_each_set_bit(link_id, &valid_links, + IEEE80211_MLD_MAX_NUM_LINKS) { + if (link_id != ahsta->primary_link_id) { + ahsta->primary_link_id = link_id; + break; + } + } + } + } + } + + valid_links = new_links; + for_each_set_bit(link_id, &valid_links, IEEE80211_MLD_MAX_NUM_LINKS) { + if (ahsta->links_map & BIT(link_id)) + continue; + + arvif = ahvif->link[link_id]; + arsta = ath12k_mac_alloc_assign_link_sta(ah, ahsta, ahvif, link_id); + + if (!arvif || !arsta) { + ath12k_err(NULL, "Failed to alloc/assign link sta"); + continue; + } + + ar = arvif->ar; + if (!ar) { + ath12k_err(NULL, + "Failed to get ar to change sta links\n"); + continue; + } + + mutex_lock(&ar->conf_mutex); + ret = ath12k_mac_station_add(ar, arvif, arsta); + if (ret) { mutex_unlock(&ar->conf_mutex); + ath12k_warn(ar->ab, "Failed to add station: %pM for VDEV: %d\n", + arsta->addr, arvif->vdev_id); + ath12k_mac_free_unassign_link_sta(ah, ahsta, link_id); + break; + } + mutex_unlock(&ar->conf_mutex); + } + + mutex_unlock(&ah->conf_mutex); + return ret; } +static void ath12k_mac_op_sta_set_4addr(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, bool enabled) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + + if (enabled && !ahsta->use_4addr_set) { + ieee80211_queue_work(ah->hw, &ahsta->set_4addr_wk); + ahsta->use_4addr_set = true; + } +} + static void ath12k_mac_op_sta_rc_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, - u32 changed) + u32 changed /*, u8 link_id */) { - struct ath12k *ar = hw->priv; - struct ath12k_sta *arsta = (struct ath12k_sta *)sta->drv_priv; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + u8 link_id = 0; + struct ath12k *ar; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta; struct ath12k_peer *peer; u32 bw, smps; + struct ieee80211_link_sta *link_sta; + + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + if (!arsta) { + ath12k_err(NULL, "unable to determine arsta\n"); + return; + } + + if (!arvif) { + ath12k_err(NULL, "unable to determine device for sta update\n"); + return; + } + + if (arvif->is_created) + ar = arvif->ar; + + if (!ar) { + ath12k_err(NULL, "unable to determine device for sta update\n"); + return; + } spin_lock_bh(&ar->ab->base_lock); - peer = ath12k_peer_find(ar->ab, arvif->vdev_id, sta->addr); + peer = ath12k_peer_find(ar->ab, arvif->vdev_id, arsta->addr); if (!peer) { spin_unlock_bh(&ar->ab->base_lock); ath12k_warn(ar->ab, "mac sta rc update failed to find peer %pM on vdev %i\n", - sta->addr, arvif->vdev_id); + arsta->addr, arvif->vdev_id); return; } spin_unlock_bh(&ar->ab->base_lock); + rcu_read_lock(); + link_sta = rcu_dereference(sta->link[link_id]); + + if (!link_sta) { + rcu_read_unlock(); + return; + } + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac sta rc update for %pM changed %08x bw %d nss %d smps %d\n", - sta->addr, changed, sta->deflink.bandwidth, sta->deflink.rx_nss, - sta->deflink.smps_mode); + arsta->addr, changed, link_sta->bandwidth, link_sta->rx_nss, + link_sta->smps_mode); spin_lock_bh(&ar->data_lock); @@ -3692,12 +8098,12 @@ } if (changed & IEEE80211_RC_NSS_CHANGED) - arsta->nss = sta->deflink.rx_nss; + arsta->nss = link_sta->rx_nss; if (changed & IEEE80211_RC_SMPS_CHANGED) { smps = WMI_PEER_SMPS_PS_NONE; - switch (sta->deflink.smps_mode) { + switch (link_sta->smps_mode) { case IEEE80211_SMPS_AUTOMATIC: case IEEE80211_SMPS_OFF: smps = WMI_PEER_SMPS_PS_NONE; @@ -3710,7 +8116,7 @@ break; default: ath12k_warn(ar->ab, "Invalid smps %d in sta rc update for %pM\n", - sta->deflink.smps_mode, sta->addr); + link_sta->smps_mode, arsta->addr); smps = WMI_PEER_SMPS_PS_NONE; break; } @@ -3721,18 +8127,19 @@ arsta->changed |= changed; spin_unlock_bh(&ar->data_lock); + rcu_read_unlock(); ieee80211_queue_work(hw, &arsta->update_wk); } -static int ath12k_conf_tx_uapsd(struct ath12k *ar, struct ieee80211_vif *vif, +static int ath12k_conf_tx_uapsd(struct ath12k *ar, struct ath12k_link_vif *arvif, u16 ac, bool enable) { - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_vif *ahvif = arvif->ahvif; u32 value; int ret; - if (arvif->vdev_type != WMI_VDEV_TYPE_STA) + if (ahvif->vdev_type != WMI_VDEV_TYPE_STA) return 0; switch (ac) { @@ -3754,20 +8161,21 @@ break; } + /* TODO move link specific ? */ if (enable) - arvif->u.sta.uapsd |= value; + ahvif->u.sta.uapsd |= value; else - arvif->u.sta.uapsd &= ~value; + ahvif->u.sta.uapsd &= ~value; ret = ath12k_wmi_set_sta_ps_param(ar, arvif->vdev_id, WMI_STA_PS_PARAM_UAPSD, - arvif->u.sta.uapsd); + ahvif->u.sta.uapsd); if (ret) { ath12k_warn(ar->ab, "could not set uapsd params %d\n", ret); goto exit; } - if (arvif->u.sta.uapsd) + if (ahvif->u.sta.uapsd) value = WMI_STA_PS_RX_WAKE_POLICY_POLL_UAPSD; else value = WMI_STA_PS_RX_WAKE_POLICY_WAKE; @@ -3782,17 +8190,17 @@ return ret; } -static int ath12k_mac_op_conf_tx(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, - unsigned int link_id, u16 ac, +int ath12k_mac_conf_tx(struct ath12k *ar, + struct ath12k_link_vif *arvif, u16 ac, const struct ieee80211_tx_queue_params *params) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = (void *)vif->drv_priv; struct wmi_wmm_params_arg *p = NULL; int ret; - mutex_lock(&ar->conf_mutex); + lockdep_assert_held(&ar->conf_mutex); + + if (!arvif->is_created) + return -EINVAL; switch (ac) { case IEEE80211_AC_VO: @@ -3826,13 +8234,56 @@ goto exit; } - ret = ath12k_conf_tx_uapsd(ar, vif, ac, params->uapsd); + ret = ath12k_conf_tx_uapsd(ar, arvif, ac, params->uapsd); if (ret) ath12k_warn(ar->ab, "failed to set sta uapsd: %d\n", ret); exit: + return ret; +} + +static int ath12k_mac_op_conf_tx(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + unsigned int link_id, u16 ac, + const struct ieee80211_tx_queue_params *params) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + int ret; + + if (link_id >= IEEE80211_MLD_MAX_NUM_LINKS) + return -EINVAL; + + mutex_lock(&ah->conf_mutex); + arvif = ahvif->link[link_id]; + + /* If the tx config is received before a vdev is assigned to vif + * cache the info to be updated once vdev is created + */ + if (arvif == NULL || !arvif->is_created) { + ath12k_dbg(NULL, ATH12K_DBG_MAC, + "tx queue params cached since vif is not assigned to radio\n"); + ahvif->cache[link_id].tx_conf.changed = true; + ahvif->cache[link_id].tx_conf.ac = ac; + ahvif->cache[link_id].tx_conf.tx_queue_params = *params; + mutex_unlock(&ah->conf_mutex); + return 0; + } + mutex_unlock(&ah->conf_mutex); + + ar = arvif->ar; + if (!ar) { + ath12k_err(NULL, "Failed to config tx\n"); + return -EINVAL; + } + + mutex_lock(&ar->conf_mutex); + ret = ath12k_mac_conf_tx(ar, arvif, ac, params); mutex_unlock(&ar->conf_mutex); + return ret; } @@ -3902,10 +8353,11 @@ return ht_cap; } -static int ath12k_mac_set_txbf_conf(struct ath12k_vif *arvif) +static int ath12k_mac_set_txbf_conf(struct ath12k_link_vif *arvif) { u32 value = 0; struct ath12k *ar = arvif->ar; + struct ath12k_vif *ahvif = arvif->ahvif; int nsts; int sound_dim; u32 vht_cap = ar->pdev->cap.vht_cap; @@ -3933,7 +8385,7 @@ value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFER; if ((vht_cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) && - arvif->vdev_type == WMI_VDEV_TYPE_AP) + ahvif->vdev_type == WMI_VDEV_TYPE_AP) value |= WMI_VDEV_PARAM_TXBF_MU_TX_BFER; } @@ -3941,7 +8393,7 @@ value |= WMI_VDEV_PARAM_TXBF_SU_TX_BFEE; if ((vht_cap & IEEE80211_VHT_CAP_MU_BEAMFORMEE_CAPABLE) && - arvif->vdev_type == WMI_VDEV_TYPE_STA) + ahvif->vdev_type == WMI_VDEV_TYPE_STA) value |= WMI_VDEV_PARAM_TXBF_MU_TX_BFEE; } @@ -4002,12 +8454,11 @@ vht_cap.vht_supported = 1; vht_cap.cap = ar->pdev->cap.vht_cap; - ath12k_set_vht_txbf_cap(ar, &vht_cap.cap); + if (ar->pdev->cap.nss_ratio_enabled) + vht_cap.vht_mcs.tx_highest |= + cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE); - /* TODO: Enable back VHT160 mode once association issues are fixed */ - /* Disabling VHT160 and VHT80+80 modes */ - vht_cap.cap &= ~IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK; - vht_cap.cap &= ~IEEE80211_VHT_CAP_SHORT_GI_160; + ath12k_set_vht_txbf_cap(ar, &vht_cap.cap); rxmcs_map = 0; txmcs_map = 0; @@ -4029,6 +8480,12 @@ vht_cap.vht_mcs.rx_mcs_map = cpu_to_le16(rxmcs_map); vht_cap.vht_mcs.tx_mcs_map = cpu_to_le16(txmcs_map); + /* Check if the HW supports 1:1 NSS ratio and reset + * EXT NSS BW Support field to 0 to indicate 1:1 ratio + */ + if (ar->pdev->cap.nss_ratio_info == WMI_NSS_RATIO_1_NSS) + vht_cap.cap &= ~IEEE80211_VHT_CAP_EXT_NSS_BW_MASK; + return vht_cap; } @@ -4051,6 +8508,8 @@ *ht_cap_info = ht_cap; band->ht_cap = ath12k_create_ht_cap(ar, ht_cap, rate_cap_rx_chainmask); + // band->vht_cap = ath12k_create_vht_cap(ar, rate_cap_tx_chainmask, + // rate_cap_rx_chainmask); } if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP && @@ -4067,15 +8526,6 @@ } } -static int ath12k_check_chain_mask(struct ath12k *ar, u32 ant, bool is_tx_ant) -{ - /* TODO: Check the request chainmask against the supported - * chainmask table which is advertised in extented_service_ready event - */ - - return 0; -} - static void ath12k_gen_ppe_thresh(struct ath12k_wmi_ppe_threshold_arg *fw_ppet, u8 *he_ppet) { @@ -4105,6 +8555,48 @@ } } +static void ath12k_gen_eht_ppe_thresh(struct ath12k_ppe_threshold *fw_ppet, + struct ieee80211_sta_eht_cap *cap) +{ + int nss, ru; + u8 len = 0, bit = IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE; + + len = hweight8(fw_ppet->ru_bit_mask); + len *= (1 + fw_ppet->numss_m1); + + len = (len * IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE) + + IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE; + len = DIV_ROUND_UP(len, 8); + + cap->eht_ppe_thres[0] = FIELD_PREP(IEEE80211_EHT_PPE_THRES_NSS_MASK, + fw_ppet->numss_m1); + cap->eht_ppe_thres[0] |= FIELD_PREP((u8)IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK, + fw_ppet->ru_bit_mask); + cap->eht_ppe_thres[1] |= (fw_ppet->ru_bit_mask >> + (8 - IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_POS)); + + for (nss = 0; nss <= fw_ppet->numss_m1; nss++) { + for (ru = 0; + ru < hweight8(IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK); + ru++) { + u8 val; + int i; + + if ((fw_ppet->ru_bit_mask & BIT(ru)) == 0) + continue; + val = (fw_ppet->ppet16_ppet8_ru3_ru0[nss] >> (ru * 6)) & + 0x3f; + val = ((val >> 3) & 0x7) | ((val & 0x7) << 3); + for (i = (2 * IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE) - 1; + i >= 0; i--) { + cap->eht_ppe_thres[bit / 8] |= + ((val >> i) & 0x1) << ((bit % 8)); + bit++; + } + } + } +} + static void ath12k_mac_filter_he_cap_mesh(struct ieee80211_he_cap_elem *he_cap_elem) { @@ -4166,14 +8658,6 @@ IEEE80211_HE_PHY_CAP8_20MHZ_IN_160MHZ_HE_PPDU | IEEE80211_HE_PHY_CAP8_80MHZ_IN_160MHZ_HE_PPDU; he_cap_elem->phy_cap_info[8] &= ~m; - - m = IEEE80211_HE_PHY_CAP9_LONGER_THAN_16_SIGB_OFDM_SYM | - IEEE80211_HE_PHY_CAP9_NON_TRIGGERED_CQI_FEEDBACK | - IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU | - IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU | - IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_COMP_SIGB | - IEEE80211_HE_PHY_CAP9_RX_FULL_BW_SU_USING_MU_WITH_NON_COMP_SIGB; - he_cap_elem->phy_cap_info[9] &= ~m; } static __le16 ath12k_mac_setup_he_6ghz_cap(struct ath12k_pdev_cap *pcap, @@ -4206,30 +8690,62 @@ return cpu_to_le16(bcap->he_6ghz_capa); } -static int ath12k_mac_copy_he_cap(struct ath12k *ar, +static void ath12k_mac_set_hemcsmap(struct ath12k *ar, struct ath12k_pdev_cap *cap, - struct ieee80211_sband_iftype_data *data, - int band) + struct ieee80211_sta_he_cap *he_cap) { - int i, idx = 0; + u16 txmcs_map = 0, rxmcs_map = 0; + u16 txmcs_map_160 = 0, rxmcs_map_160 = 0; + u32 i = 0; + u8 maxtxnss_160 = ath12k_get_nss_160mhz(ar, ar->num_tx_chains); + u8 maxrxnss_160 = ath12k_get_nss_160mhz(ar, ar->num_rx_chains); - for (i = 0; i < NUM_NL80211_IFTYPES; i++) { - struct ieee80211_sta_he_cap *he_cap = &data[idx].he_cap; - struct ath12k_band_cap *band_cap = &cap->band[band]; - struct ieee80211_he_cap_elem *he_cap_elem = - &he_cap->he_cap_elem; + for (i = 0; i < 8; i++) { + if (i < ar->num_tx_chains && + (ar->cfg_tx_chainmask >> cap->tx_chain_mask_shift) & BIT(i)) + txmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2); + else + txmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2); - switch (i) { - case NL80211_IFTYPE_STATION: - case NL80211_IFTYPE_AP: - case NL80211_IFTYPE_MESH_POINT: - break; + if (i < ar->num_rx_chains && + (ar->cfg_rx_chainmask >> cap->tx_chain_mask_shift) & BIT(i)) + rxmcs_map |= IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2); + else + rxmcs_map |= IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2); - default: - continue; + if (i < maxtxnss_160 && + (ar->cfg_tx_chainmask >> cap->tx_chain_mask_shift) & BIT(i)) + txmcs_map_160 |= IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2); + else + txmcs_map_160 |= IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2); + + if (i < maxrxnss_160 && + (ar->cfg_tx_chainmask >> cap->tx_chain_mask_shift) & BIT(i)) + rxmcs_map_160 |= IEEE80211_HE_MCS_SUPPORT_0_11 << (i * 2); + else + rxmcs_map_160 |= IEEE80211_HE_MCS_NOT_SUPPORTED << (i * 2); } - data[idx].types_mask = BIT(i); + he_cap->he_mcs_nss_supp.rx_mcs_80 = + cpu_to_le16(rxmcs_map & 0xffff); + he_cap->he_mcs_nss_supp.tx_mcs_80 = + cpu_to_le16(txmcs_map & 0xffff); + he_cap->he_mcs_nss_supp.rx_mcs_160 = + cpu_to_le16(rxmcs_map_160 & 0xffff); + he_cap->he_mcs_nss_supp.tx_mcs_160 = + cpu_to_le16(txmcs_map_160 & 0xffff); + he_cap->he_mcs_nss_supp.rx_mcs_80p80 = + cpu_to_le16(rxmcs_map_160 & 0xffff); + he_cap->he_mcs_nss_supp.tx_mcs_80p80 = + cpu_to_le16(txmcs_map_160 & 0xffff); +} + +static void ath12k_mac_copy_he_cap(struct ath12k *ar, + struct ath12k_band_cap *band_cap, + struct ieee80211_sta_he_cap *he_cap, + struct ieee80211_he_cap_elem *he_cap_elem, + int iftype) +{ he_cap->has_he = true; memcpy(he_cap_elem->mac_cap_info, band_cap->he_cap_info, sizeof(he_cap_elem->mac_cap_info)); @@ -4238,27 +8754,25 @@ he_cap_elem->mac_cap_info[1] &= IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK; - + he_cap_elem->phy_cap_info[0] &= + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G; + he_cap_elem->phy_cap_info[0] &= + ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G; he_cap_elem->phy_cap_info[5] &= ~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK; - he_cap_elem->phy_cap_info[5] &= - ~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_MASK; he_cap_elem->phy_cap_info[5] |= ar->num_tx_chains - 1; - switch (i) { + switch (iftype) { case NL80211_IFTYPE_AP: + he_cap_elem->mac_cap_info[2] &= ~IEEE80211_HE_MAC_CAP2_BCAST_TWT; he_cap_elem->phy_cap_info[3] &= ~IEEE80211_HE_PHY_CAP3_DCM_MAX_CONST_TX_MASK; - he_cap_elem->phy_cap_info[9] |= - IEEE80211_HE_PHY_CAP9_RX_1024_QAM_LESS_THAN_242_TONE_RU; break; case NL80211_IFTYPE_STATION: - he_cap_elem->mac_cap_info[0] &= - ~IEEE80211_HE_MAC_CAP0_TWT_RES; - he_cap_elem->mac_cap_info[0] |= - IEEE80211_HE_MAC_CAP0_TWT_REQ; - he_cap_elem->phy_cap_info[9] |= - IEEE80211_HE_PHY_CAP9_TX_1024_QAM_LESS_THAN_242_TONE_RU; + he_cap_elem->mac_cap_info[0] &= ~IEEE80211_HE_MAC_CAP0_TWT_RES; + he_cap_elem->mac_cap_info[0] |= IEEE80211_HE_MAC_CAP0_TWT_REQ; break; case NL80211_IFTYPE_MESH_POINT: ath12k_mac_filter_he_cap_mesh(he_cap_elem); @@ -4278,30 +8792,192 @@ he_cap->he_mcs_nss_supp.tx_mcs_80p80 = cpu_to_le16((band_cap->he_mcs >> 16) & 0xffff); + ath12k_mac_set_hemcsmap(ar, &ar->pdev->cap, he_cap); memset(he_cap->ppe_thres, 0, sizeof(he_cap->ppe_thres)); if (he_cap_elem->phy_cap_info[6] & IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT) ath12k_gen_ppe_thresh(&band_cap->he_ppet, he_cap->ppe_thres); +} + +static void ath12k_gen_eht_mcs_nss(struct ath12k_band_cap *band_cap, + struct ieee80211_eht_mcs_nss_supp *mcs_nss, + const struct ieee80211_he_cap_elem *he_cap, + const struct ieee80211_eht_cap_elem_fixed *eht_cap) +{ + if ((he_cap->phy_cap_info[0] & + (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G)) == 0) + memcpy(&mcs_nss->only_20mhz, &band_cap->eht_mcs_20_only, + sizeof(struct ieee80211_eht_mcs_nss_supp_20mhz_only)); + + if (he_cap->phy_cap_info[0] & + (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_80MHZ_IN_5G)) + memcpy(&mcs_nss->bw._80, &band_cap->eht_mcs_80, + sizeof(struct ieee80211_eht_mcs_nss_supp_bw)); + + if (he_cap->phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G) + memcpy(&mcs_nss->bw._160, &band_cap->eht_mcs_160, + sizeof(struct ieee80211_eht_mcs_nss_supp_bw)); + + if (eht_cap->phy_cap_info[0] & IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ) + memcpy(&mcs_nss->bw._320, &band_cap->eht_mcs_320, + sizeof(struct ieee80211_eht_mcs_nss_supp_bw)); +} + +static void +ath12k_mac_filter_eht_cap_mesh(struct ieee80211_eht_cap_elem_fixed *eht_cap_elem) +{ + u8 m; + + m = IEEE80211_EHT_MAC_CAP0_EPCS_PRIO_ACCESS; + eht_cap_elem->mac_cap_info[0] &= ~m; + m = IEEE80211_EHT_MAC_CAP1_TWO_BQRS_SUPP | + IEEE80211_EHT_MAC_CAP1_EHT_LINK_ADAPTATION_SUPP; + eht_cap_elem->mac_cap_info[1] &= ~m; + + m = IEEE80211_EHT_PHY_CAP0_PARTIAL_BW_UL_MU_MIMO; + eht_cap_elem->phy_cap_info[0] &= ~m; + + m = IEEE80211_EHT_PHY_CAP3_NG_16_MU_FEEDBACK | + IEEE80211_EHT_PHY_CAP3_CODEBOOK_7_5_MU_FDBK | + IEEE80211_EHT_PHY_CAP3_TRIG_MU_BF_PART_BW_FDBK | + IEEE80211_EHT_PHY_CAP3_TRIG_CQI_FDBK; + eht_cap_elem->phy_cap_info[3] &= ~m; + + m = IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO | + IEEE80211_EHT_PHY_CAP4_PSR_SR_SUPP | + IEEE80211_EHT_PHY_CAP4_POWER_BOOST_FACT_SUPP | + IEEE80211_EHT_PHY_CAP4_EHT_MU_PPDU_4_EHT_LTF_08_GI; + eht_cap_elem->phy_cap_info[4] &= ~m; + + m = IEEE80211_EHT_PHY_CAP5_NON_TRIG_CQI_FEEDBACK | + IEEE80211_EHT_PHY_CAP5_TX_LESS_242_TONE_RU_SUPP | + IEEE80211_EHT_PHY_CAP5_RX_LESS_242_TONE_RU_SUPP | + IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK; + eht_cap_elem->phy_cap_info[5] &= ~m; + + m = IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK; + eht_cap_elem->phy_cap_info[6] &= ~m; + + m = IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ | + IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ | + IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ | + IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ | + IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ | + IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ; + eht_cap_elem->phy_cap_info[7] &= ~m; + + m = IEEE80211_EHT_PHY_CAP8_20MHZ_ONLY_CAPS | + IEEE80211_EHT_PHY_CAP8_20MHZ_ONLY_TRIGGER_MUBF_FL_BW_FB_DLMUMIMO | + IEEE80211_EHT_PHY_CAP8_20MHZ_ONLY_MRU_SUPP; + eht_cap_elem->phy_cap_info[8] &= ~m; +} + +static void ath12k_mac_copy_eht_cap(struct ath12k *ar, + struct ath12k_band_cap *band_cap, + struct ieee80211_he_cap_elem *he_cap_elem, + struct ieee80211_sta_eht_cap *eht_cap, + struct ieee80211_eht_cap_elem_fixed *eht_cap_elem, + int iftype) +{ + memset(eht_cap, 0, sizeof(struct ieee80211_sta_eht_cap)); + + eht_cap->has_eht = true; + memcpy(eht_cap_elem->mac_cap_info, band_cap->eht_cap_mac_info, + sizeof(eht_cap_elem->mac_cap_info)); + memcpy(eht_cap_elem->phy_cap_info, band_cap->eht_cap_phy_info, + sizeof(eht_cap_elem->phy_cap_info)); + + switch (iftype) { + case NL80211_IFTYPE_AP: + eht_cap_elem->phy_cap_info[0] &= + ~IEEE80211_EHT_PHY_CAP0_242_TONE_RU_GT20MHZ; + eht_cap_elem->phy_cap_info[4] &= + ~IEEE80211_EHT_PHY_CAP4_PART_BW_DL_MU_MIMO; + break; + case NL80211_IFTYPE_STATION: + eht_cap_elem->phy_cap_info[7] &= + ~(IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ | + IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_160MHZ | + IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_320MHZ); + eht_cap_elem->phy_cap_info[7] &= + ~(IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ | + IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ | + IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ); + break; + case NL80211_IFTYPE_MESH_POINT: + ath12k_mac_filter_eht_cap_mesh(eht_cap_elem); + break; + default: + break; + } + + ath12k_gen_eht_mcs_nss(band_cap, &eht_cap->eht_mcs_nss_supp, + he_cap_elem, eht_cap_elem); + + if (eht_cap_elem->phy_cap_info[5] & + IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) + ath12k_gen_eht_ppe_thresh(&band_cap->eht_ppet, eht_cap); +} + +static int ath12k_mac_copy_he_eht_cap(struct ath12k *ar, + struct ath12k_pdev_cap *cap, + struct ieee80211_sband_iftype_data *data, + int band) +{ + struct ath12k_band_cap *band_cap = &cap->band[band]; + struct ieee80211_sta_he_cap *he_cap; + struct ieee80211_he_cap_elem *he_cap_elem; + struct ieee80211_sta_eht_cap *eht_cap; + struct ieee80211_eht_cap_elem_fixed *eht_cap_elem; + int i, idx = 0; + + for (i = 0; i < NUM_NL80211_IFTYPES; i++) { + he_cap = &data[idx].he_cap; + he_cap_elem = &he_cap->he_cap_elem; + eht_cap = &data[idx].eht_cap; + eht_cap_elem = &eht_cap->eht_cap_elem; + + switch (i) { + case NL80211_IFTYPE_STATION: + case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_MESH_POINT: + break; + + default: + continue; + } + + data[idx].types_mask = BIT(i); + + ath12k_mac_copy_he_cap(ar, band_cap, he_cap, he_cap_elem, i); if (band == NL80211_BAND_6GHZ) { data[idx].he_6ghz_capa.capa = ath12k_mac_setup_he_6ghz_cap(cap, band_cap); } + ath12k_mac_copy_eht_cap(ar, band_cap, he_cap_elem, eht_cap, + eht_cap_elem, i); + idx++; } return idx; } -static void ath12k_mac_setup_he_cap(struct ath12k *ar, +static void ath12k_mac_setup_he_eht_cap(struct ath12k *ar, struct ath12k_pdev_cap *cap) { struct ieee80211_supported_band *band; int count; if (cap->supported_bands & WMI_HOST_WLAN_2G_CAP) { - count = ath12k_mac_copy_he_cap(ar, cap, + count = ath12k_mac_copy_he_eht_cap(ar, cap, ar->mac.iftype[NL80211_BAND_2GHZ], NL80211_BAND_2GHZ); band = &ar->mac.sbands[NL80211_BAND_2GHZ]; @@ -4309,8 +8985,9 @@ band->n_iftype_data = count; } - if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP) { - count = ath12k_mac_copy_he_cap(ar, cap, + if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP && + !ar->supports_6ghz) { + count = ath12k_mac_copy_he_eht_cap(ar, cap, ar->mac.iftype[NL80211_BAND_5GHZ], NL80211_BAND_5GHZ); band = &ar->mac.sbands[NL80211_BAND_5GHZ]; @@ -4320,13 +8997,14 @@ if (cap->supported_bands & WMI_HOST_WLAN_5G_CAP && ar->supports_6ghz) { - count = ath12k_mac_copy_he_cap(ar, cap, + count = ath12k_mac_copy_he_eht_cap(ar, cap, ar->mac.iftype[NL80211_BAND_6GHZ], NL80211_BAND_6GHZ); band = &ar->mac.sbands[NL80211_BAND_6GHZ]; band->iftype_data = ar->mac.iftype[NL80211_BAND_6GHZ]; band->n_iftype_data = count; } + } static int __ath12k_set_antenna(struct ath12k *ar, u32 tx_ant, u32 rx_ant) @@ -4335,15 +9013,23 @@ lockdep_assert_held(&ar->conf_mutex); - if (ath12k_check_chain_mask(ar, tx_ant, true)) - return -EINVAL; - - if (ath12k_check_chain_mask(ar, rx_ant, false)) - return -EINVAL; + /* Since we advertised the max cap of all radios combined during wiphy + * registration, ensure we dont set the antenna config higher than our + * limits + */ + tx_ant = min_t(u32, tx_ant, ar->pdev->cap.tx_chain_mask); + rx_ant = min_t(u32, rx_ant, ar->pdev->cap.rx_chain_mask); ar->cfg_tx_chainmask = tx_ant; ar->cfg_rx_chainmask = rx_ant; + ar->num_tx_chains = hweight32(tx_ant); + ar->num_rx_chains = hweight32(rx_ant); + + /* Reload HT/VHT/HE capability */ + ath12k_mac_setup_ht_vht_cap(ar, &ar->pdev->cap, NULL); + ath12k_mac_setup_he_eht_cap(ar, &ar->pdev->cap); + if (ar->state != ATH12K_STATE_ON && ar->state != ATH12K_STATE_RESTARTED) return 0; @@ -4351,79 +9037,104 @@ ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_TX_CHAIN_MASK, tx_ant, ar->pdev->pdev_id); if (ret) { - ath12k_warn(ar->ab, "failed to set tx-chainmask: %d, req 0x%x\n", + ath12k_err(ar->ab, "failed to set tx-chainmask: %d, req 0x%x\n", ret, tx_ant); return ret; } - ar->num_tx_chains = hweight32(tx_ant); - ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_RX_CHAIN_MASK, rx_ant, ar->pdev->pdev_id); if (ret) { - ath12k_warn(ar->ab, "failed to set rx-chainmask: %d, req 0x%x\n", + ath12k_err(ar->ab, "failed to set rx-chainmask: %d, req 0x%x\n", ret, rx_ant); return ret; } - ar->num_rx_chains = hweight32(rx_ant); + return 0; +} - /* Reload HT/VHT/HE capability */ - ath12k_mac_setup_ht_vht_cap(ar, &ar->pdev->cap, NULL); - ath12k_mac_setup_he_cap(ar, &ar->pdev->cap); +static void ath12k_mgmt_over_wmi_tx_drop(struct ath12k *ar, struct sk_buff *skb) +{ + int num_mgmt = 0; + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - return 0; + if (!(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) + num_mgmt = atomic_dec_if_positive(&ar->num_pending_mgmt_tx); + + ieee80211_free_txskb(ar->ah->hw, skb); + + if (num_mgmt < 0) + WARN_ON_ONCE(1); + + if (atomic_read(&ar->flush_request) && !num_mgmt) + wake_up(&ar->tx_empty_waitq); } -int ath12k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx) +static void ath12k_mac_tx_mgmt_free(struct ath12k *ar, int buf_id) { - struct sk_buff *msdu = skb; + struct sk_buff *msdu; struct ieee80211_tx_info *info; - struct ath12k *ar = ctx; - struct ath12k_base *ab = ar->ab; spin_lock_bh(&ar->txmgmt_idr_lock); - idr_remove(&ar->txmgmt_idr, buf_id); + msdu = idr_remove(&ar->txmgmt_idr, buf_id); spin_unlock_bh(&ar->txmgmt_idr_lock); - dma_unmap_single(ab->dev, ATH12K_SKB_CB(msdu)->paddr, msdu->len, + + if (!msdu) + return; + + dma_unmap_single(ar->ab->dev, ATH12K_SKB_CB(msdu)->paddr, msdu->len, DMA_TO_DEVICE); info = IEEE80211_SKB_CB(msdu); memset(&info->status, 0, sizeof(info->status)); - ieee80211_free_txskb(ar->hw, msdu); + ath12k_mgmt_over_wmi_tx_drop(ar, msdu); - return 0; } -static int ath12k_mac_vif_txmgmt_idr_remove(int buf_id, void *skb, void *ctx) +int ath12k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx) { - struct ieee80211_vif *vif = ctx; - struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb); - struct sk_buff *msdu = skb; - struct ath12k *ar = skb_cb->ar; - struct ath12k_base *ab = ar->ab; + struct ath12k_mac_tx_mgmt_free_arg *arg = ctx; + struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB((struct sk_buff *)skb); + struct ath12k *ar = NULL; - if (skb_cb->vif == vif) { - spin_lock_bh(&ar->txmgmt_idr_lock); - idr_remove(&ar->txmgmt_idr, buf_id); - spin_unlock_bh(&ar->txmgmt_idr_lock); - dma_unmap_single(ab->dev, skb_cb->paddr, msdu->len, - DMA_TO_DEVICE); + if (u8_get_bits(arg->type, ATH12K_MAC_TX_MGMT_FREE_TYPE_PDEV)) + ar = arg->ar; + + /* If radio invalid, dont proceed */ + if (!ar) + goto out; + + /* If vif valid, then free the match vif alone */ + if (u8_get_bits(arg->type, ATH12K_MAC_TX_MGMT_FREE_TYPE_VIF)) { + if (skb_cb->vif != arg->vif) + goto out; } + /* If link_id valid, then free the match link_id alone */ + if (u8_get_bits(arg->type, ATH12K_MAC_TX_MGMT_FREE_TYPE_LINK)) { + if ((skb_cb->link_id != arg->link_id) && + (skb_cb->link_id != IEEE80211_MLD_MAX_NUM_LINKS)) + goto out; + } + + ath12k_mac_tx_mgmt_free(arg->ar, buf_id); + +out: return 0; } -static int ath12k_mac_mgmt_tx_wmi(struct ath12k *ar, struct ath12k_vif *arvif, +static int ath12k_mac_mgmt_tx_wmi(struct ath12k *ar, struct ath12k_link_vif *arvif, struct sk_buff *skb) { struct ath12k_base *ab = ar->ab; + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; - struct ieee80211_tx_info *info; dma_addr_t paddr; + struct ath12k_skb_cb *skb_cb; int buf_id; int ret; + bool link_agnostic; spin_lock_bh(&ar->txmgmt_idr_lock); buf_id = idr_alloc(&ar->txmgmt_idr, skb, 0, @@ -4432,13 +9143,26 @@ if (buf_id < 0) return -ENOSPC; - info = IEEE80211_SKB_CB(skb); - if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)) { + skb_cb = ATH12K_SKB_CB(skb); + if (!(skb_cb->flags & ATH12K_SKB_HW_80211_ENCAP)) { if ((ieee80211_is_action(hdr->frame_control) || ieee80211_is_deauth(hdr->frame_control) || ieee80211_is_disassoc(hdr->frame_control)) && ieee80211_has_protected(hdr->frame_control)) { - skb_put(skb, IEEE80211_CCMP_MIC_LEN); + int mic_len; + + switch(skb_cb->cipher) { + case WLAN_CIPHER_SUITE_CCMP: + mic_len = IEEE80211_CCMP_MIC_LEN; + break; + case WLAN_CIPHER_SUITE_GCMP: + case WLAN_CIPHER_SUITE_GCMP_256: + mic_len = IEEE80211_GCMP_MIC_LEN; + break; + default: + mic_len = IEEE80211_CCMP_MIC_LEN; + } + skb_put(skb, mic_len); } } @@ -4449,9 +9173,16 @@ goto err_free_idr; } - ATH12K_SKB_CB(skb)->paddr = paddr; + skb_cb->paddr = paddr; - ret = ath12k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb); + if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN) { + ret = ath12k_wmi_offchan_mgmt_send(ar, arvif->vdev_id, buf_id, skb); + } else { + link_agnostic = ATH12K_SKB_CB(skb)->flags & ATH12K_SKB_MGMT_LINK_AGNOSTIC; + + ret = ath12k_wmi_mgmt_send(ar, arvif->vdev_id, buf_id, skb, + link_agnostic); + } if (ret) { ath12k_warn(ar->ab, "failed to send mgmt frame: %d\n", ret); goto err_unmap_buf; @@ -4460,7 +9191,7 @@ return 0; err_unmap_buf: - dma_unmap_single(ab->dev, ATH12K_SKB_CB(skb)->paddr, + dma_unmap_single(ab->dev, skb_cb->paddr, skb->len, DMA_TO_DEVICE); err_free_idr: spin_lock_bh(&ar->txmgmt_idr_lock); @@ -4475,50 +9206,262 @@ struct sk_buff *skb; while ((skb = skb_dequeue(&ar->wmi_mgmt_tx_queue)) != NULL) - ieee80211_free_txskb(ar->hw, skb); + ath12k_mgmt_over_wmi_tx_drop(ar, skb); +} + +static int ath12k_mac_mgmt_action_frame_fill_elem(struct ath12k_link_vif *arvif, + struct sk_buff *skb) +{ + struct ath12k *ar = arvif->ar; + struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb); + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + struct ieee80211_mgmt *mgmt; + struct ieee80211_bss_conf *link_conf; + struct stats_request_params req_param; + struct ath12k_fw_stats_pdev *pdev; + int ret, cur_tx_power, max_tx_power; + bool has_protected; + u8 category, *buf, iv_len; + u8 action_code, dialog_token; + + lockdep_assert_held(&ar->conf_mutex); + + /* make sure category field is present */ + if (skb->len < IEEE80211_MIN_ACTION_SIZE) { + skb_cb->flags &= ~ATH12K_SKB_MGMT_LINK_AGNOSTIC; + return -EINVAL; + } + + has_protected = ieee80211_has_protected(hdr->frame_control); + + /* SW_CRYPTO and hdr protected case (PMF), packet will be encrypted, + * we can't put in data in this case + */ + if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->ag->dev_flags) && + has_protected) { + skb_cb->flags &= ~ATH12K_SKB_MGMT_LINK_AGNOSTIC; + return -EOPNOTSUPP; + } + + mgmt = (struct ieee80211_mgmt *)hdr; + buf = (u8 *)&mgmt->u.action; + + /* FCTL_PROTECTED frame might have extra space added for HDR_LEN. Offset that + * many bytes if it is there + */ + if (has_protected) { + switch (skb_cb->cipher) { + /* Currently only for CCMP cipher suite, we asked for it via + * setting %IEEE80211_KEY_FLAG_GENERATE_IV_MGMT in key. Check + * ath12k_install_key() + */ + case WLAN_CIPHER_SUITE_CCMP: + iv_len = IEEE80211_CCMP_HDR_LEN; + break; + case WLAN_CIPHER_SUITE_TKIP: + case WLAN_CIPHER_SUITE_CCMP_256: + case WLAN_CIPHER_SUITE_GCMP: + case WLAN_CIPHER_SUITE_GCMP_256: + case WLAN_CIPHER_SUITE_AES_CMAC: + case WLAN_CIPHER_SUITE_BIP_GMAC_128: + case WLAN_CIPHER_SUITE_BIP_GMAC_256: + case WLAN_CIPHER_SUITE_BIP_CMAC_256: + iv_len = 0; + break; + default: + skb_cb->flags &= ~ATH12K_SKB_MGMT_LINK_AGNOSTIC; + return -EINVAL; + } + + buf = buf + iv_len; + } + + category = *buf++; + + switch (category) { + case WLAN_CATEGORY_RADIO_MEASUREMENT: + /* Packet Format: + * Action Code | Dialog Token | Variable Len (based on Action Code) + */ + action_code = *buf++; + dialog_token = *buf++; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf\n"); + return -EINVAL; + } + + cur_tx_power = link_conf->txpower; + max_tx_power = min(link_conf->chanctx_conf->def.chan->max_reg_power, + (int)ar->max_tx_power / 2); + + rcu_read_unlock(); + + /* fetch current tx power from FW pdev stats */ + req_param.pdev_id = ar->pdev->pdev_id; + req_param.vdev_id = 0; + req_param.stats_id = WMI_REQUEST_PDEV_STAT; + + ret = ath12k_fw_stats_request(ar, &req_param); + if (ret) { + ath12k_warn(ar->ab, "failed to request fw pdev stats: %d\n", ret); + goto check_rm_action_frame; + } + + spin_lock_bh(&ar->data_lock); + pdev = list_first_entry_or_null(&ar->fw_stats.pdevs, + struct ath12k_fw_stats_pdev, + list); + if (!pdev) { + spin_unlock_bh(&ar->data_lock); + goto check_rm_action_frame; + } + + /* Tx power is set as 2 units per dBm in FW. */ + cur_tx_power = pdev->chan_tx_power / 2; + spin_unlock_bh(&ar->data_lock); + +check_rm_action_frame: + switch (action_code) { + case WLAN_ACTION_RADIO_MSR_LINK_MSR_REQ: + /* Variable Len Format: + * Transmit Power | Max Tx Power + * We fill both of these. + */ + *buf++ = cur_tx_power; + *buf = max_tx_power; + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "RRM: Link Measurement Req dialog_token=%u, cur_tx_power=%d, max_tx_power=%d\n", + dialog_token, cur_tx_power, max_tx_power); + skb_cb->flags &= ~ATH12K_SKB_MGMT_LINK_AGNOSTIC; + break; + case WLAN_ACTION_RADIO_MSR_LINK_MSR_REP: + /* Variable Len Format: + * TPC Report | Variable Fields + * + * TPC Report Format: + * Element ID | Len | Tx Power | Link Margin + * + * We fill Tx power in the TPC Report (2nd index) + */ + buf[2] = cur_tx_power; + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "RRM: Link Measurement Resp dialog_token=%u, cur_tx_power=%d\n", + dialog_token, cur_tx_power); + skb_cb->flags &= ~ATH12K_SKB_MGMT_LINK_AGNOSTIC; + break; + default: + return -EINVAL; + } + break; + default: + /* nothing to fill */ + skb_cb->flags &= ~ATH12K_SKB_MGMT_LINK_AGNOSTIC; + return 0; + } + + return 0; +} + +static int ath12k_mac_mgmt_frame_fill_elem(struct ath12k_link_vif *arvif, + struct sk_buff *skb) +{ + struct ath12k *ar = arvif->ar; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + + lockdep_assert_held(&ar->conf_mutex); + + if (!ieee80211_is_action(hdr->frame_control)) + return 0; + + return ath12k_mac_mgmt_action_frame_fill_elem(arvif, skb); } static void ath12k_mgmt_over_wmi_tx_work(struct work_struct *work) { struct ath12k *ar = container_of(work, struct ath12k, wmi_mgmt_tx_work); struct ath12k_skb_cb *skb_cb; - struct ath12k_vif *arvif; + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif; struct sk_buff *skb; int ret; + struct ath12k_hw *ah = ar->ah; + mutex_lock(&ah->conf_mutex); while ((skb = skb_dequeue(&ar->wmi_mgmt_tx_queue)) != NULL) { skb_cb = ATH12K_SKB_CB(skb); if (!skb_cb->vif) { ath12k_warn(ar->ab, "no vif found for mgmt frame\n"); - ieee80211_free_txskb(ar->hw, skb); + ath12k_mgmt_over_wmi_tx_drop(ar, skb); + continue; + } + + ahvif = ath12k_vif_to_ahvif(skb_cb->vif); + if (!(ahvif->links_map & BIT(skb_cb->link_id))) { + ath12k_warn(ar->ab, + "invalid linkid 0x%X in mgmt over wmi tx with linkmap %lu\n", + skb_cb->link_id, + ahvif->links_map); + ath12k_mgmt_over_wmi_tx_drop(ar, skb); + continue; + } + + arvif = ahvif->link[skb_cb->link_id]; + if (!arvif) { + ath12k_warn(ar->ab, "invalid arvif for mgmt tx - link %d\n", + skb_cb->link_id); + ath12k_mgmt_over_wmi_tx_drop(ar, skb); continue; } - arvif = ath12k_vif_to_arvif(skb_cb->vif); + mutex_lock(&ar->conf_mutex); if (ar->allocated_vdev_map & (1LL << arvif->vdev_id) && arvif->is_started) { + /* Fill the data which is required to be filled in by the driver + * Example: Max Tx power in Link Measurement Request/Report + */ + ret = ath12k_mac_mgmt_frame_fill_elem(arvif, skb); + if (ret) { + /* If we couldn't fill the data due to any reason, let's not discard + * transmitting the packet. + * For ex: SW crypto and PMF case + */ + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Cant't fill in the required data for the mgmt packet. err=%d\n", + ret); + } + ret = ath12k_mac_mgmt_tx_wmi(ar, arvif, skb); if (ret) { ath12k_warn(ar->ab, "failed to tx mgmt frame, vdev_id %d :%d\n", arvif->vdev_id, ret); - ieee80211_free_txskb(ar->hw, skb); - } else { - atomic_inc(&ar->num_pending_mgmt_tx); + ath12k_mgmt_over_wmi_tx_drop(ar, skb); } } else { ath12k_warn(ar->ab, - "dropping mgmt frame for vdev %d, is_started %d\n", + "dropping mgmt frame for vdev %d, is_started %d link %d\n", arvif->vdev_id, - arvif->is_started); - ieee80211_free_txskb(ar->hw, skb); + arvif->is_started, + skb_cb->link_id); + ath12k_mgmt_over_wmi_tx_drop(ar, skb); } + mutex_unlock(&ar->conf_mutex); } + mutex_unlock(&ah->conf_mutex); } static int ath12k_mac_mgmt_tx(struct ath12k *ar, struct sk_buff *skb, bool is_prb_rsp) { struct sk_buff_head *q = &ar->wmi_mgmt_tx_queue; + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags)) return -ESHUTDOWN; @@ -4530,66 +9473,484 @@ */ if (is_prb_rsp && atomic_read(&ar->num_pending_mgmt_tx) > ATH12K_PRB_RSP_DROP_THRESHOLD) { - ath12k_warn(ar->ab, + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "dropping probe response as pending queue is almost full\n"); - return -ENOSPC; + return -EBUSY; } - if (skb_queue_len(q) == ATH12K_TX_MGMT_NUM_PENDING_MAX) { + if (skb_queue_len_lockless(q) >= ATH12K_TX_MGMT_NUM_PENDING_MAX) { ath12k_warn(ar->ab, "mgmt tx queue is full\n"); return -ENOSPC; } skb_queue_tail(q, skb); - ieee80211_queue_work(ar->hw, &ar->wmi_mgmt_tx_work); + + /* For some of the off chan frames in DPP, host will not receive tx status, + * due to that skipping incrementing pending frames for off channel frames + * only to avoid the leak + */ + if (!(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) + atomic_inc(&ar->num_pending_mgmt_tx); + + queue_work(ar->ab->workqueue_aux, &ar->wmi_mgmt_tx_work); return 0; } +static void ath12k_mlo_mcast_update_tx_link_address(struct ieee80211_vif *vif, + u8 link, struct sk_buff *skb, + u32 info_flags) +{ + struct ieee80211_bss_conf *bss_conf; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + + if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) + return; + + bss_conf = rcu_dereference(vif->link_conf[link]); + if (bss_conf) + ether_addr_copy(hdr->addr2, bss_conf->addr); +} + +/* This function should be called only for a mgmt frame to a ML STA, + * hence, such sanity checks are skipped + */ +static bool ath12k_mac_is_mgmt_link_agnostic(struct sk_buff *skb) +{ + struct ieee80211_mgmt *mgmt; + mgmt = (struct ieee80211_mgmt *)skb->data; + + if (ieee80211_is_action(mgmt->frame_control)) + return true; + + /* TODO Extend as per requirement */ + return false; +} + +static u8 ath12k_mac_get_tx_link(struct ieee80211_sta *sta, struct ieee80211_vif *vif, + u8 link, struct sk_buff *skb, u32 info_flags) +{ + struct ath12k_sta *ahsta; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ieee80211_link_sta *link_sta; + struct ieee80211_bss_conf *bss_conf; + struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; + + /* Use the link id passed or the default vif link */ + if (!sta) { + if (link != IEEE80211_LINK_UNSPECIFIED) + return link; + + return ahvif->deflink.link_id; + } + + ahsta = ath12k_sta_to_ahsta(sta); + + /* Below translation ensures we pass proper A2 & A3 for non ML clients. + * Also it assumes for now support only for MLO AP in this path + */ + if (!sta->mlo) { + link = ahsta->deflink.link_id; + + if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) + return link; + + bss_conf = rcu_dereference(vif->link_conf[link]); + if (bss_conf) { + ether_addr_copy(hdr->addr2, bss_conf->addr); + if (!ieee80211_has_tods(hdr->frame_control) && + !ieee80211_has_fromds(hdr->frame_control)) + ether_addr_copy(hdr->addr3, bss_conf->addr); + } + return link; + } + + /* enqueue eth data frames on primary link */ + if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) + return ahsta->primary_link_id; + else if (ieee80211_is_data(hdr->frame_control)) + return ahsta->primary_link_id; + + /* 802.11 frame cases */ + if (link == IEEE80211_LINK_UNSPECIFIED) + link = ahsta->deflink.link_id; + + if (ieee80211_is_mgmt(hdr->frame_control)) { + /* For MLD STA post FW recovery, sending disassoc + * in other link apart from primary link results in + * disassoc packet getting dropped always, hence as + * a workaround until FW enables it post recovery + * this is needed to send disassoc always in primary + * link + */ + if (ieee80211_is_disassoc(hdr->frame_control)) + link = ahsta->deflink.link_id; + + /* Perform address conversion for ML STA Tx */ + bss_conf = rcu_dereference(vif->link_conf[link]); + link_sta = rcu_dereference(sta->link[link]); + if (bss_conf && link_sta) { + ether_addr_copy(hdr->addr1, link_sta->addr); + ether_addr_copy(hdr->addr2, bss_conf->addr); + if (vif->type == NL80211_IFTYPE_STATION && bss_conf->bssid) + ether_addr_copy(hdr->addr3, bss_conf->bssid); + else if (vif->type == NL80211_IFTYPE_AP) + ether_addr_copy(hdr->addr3, bss_conf->addr); + } else if (bss_conf) { + /* In certain cases where a ML sta associated and added subset of links + * on which the ML AP is active, but now sends some frame (ex. Probe request) + * on a different link which is active in our MLD but was not added during + * previous association, we can still honor the Tx to that ML STA via the + * requested link. + * The control would reach here in such case only when that link address + * is same as the MLD address or in worst case clients used MLD address at TA wrongly + * which would have helped identify the ML sta object and pass it here. + * If the link address of that STA is different from MLD address, then + * the sta object would be NULL and control wont reach here but return at the + * start of the function itself with !sta check. Also this would not need any + * translation at hdr->addr1 from MLD to link address since the RA is the + * MLD address (same as that link address ideally) already. + */ + ether_addr_copy(hdr->addr2, bss_conf->addr); + if (vif->type == NL80211_IFTYPE_STATION && bss_conf->bssid) + ether_addr_copy(hdr->addr3, bss_conf->bssid); + else if (vif->type == NL80211_IFTYPE_AP) + ether_addr_copy(hdr->addr3, bss_conf->addr); + + + ath12k_dbg(NULL, ATH12K_DBG_MAC, + "unable to determine link sta addr for translation - Frame control %x link %d sta links %x ahsta links %lu\n", + hdr->frame_control, link, sta->valid_links, + ahsta->links_map); + } else { + ath12k_err(NULL, "unable to determine Tx link for frame %x link %d\n vif links %x sta links %x ahvif links %lu ahsta links %lu", + hdr->frame_control, link, vif->valid_links, + sta->valid_links, ahvif->links_map, ahsta->links_map); + link = IEEE80211_MLD_MAX_NUM_LINKS; + } + + /* Check if this mgmt frame can be queued at MLD level, in that + * case the FW can decide on which link it needs to be finally + * transmitted based on the power state of that link. + * The link param returned by this function still needs + * to be valid to get queued to one of the valid link FW + */ + if (ath12k_mac_is_mgmt_link_agnostic(skb)) { + ATH12K_SKB_CB(skb)->flags |= ATH12K_SKB_MGMT_LINK_AGNOSTIC; + /* For action frames this will be reset if not needed + * later based on action category. + */ + } + } + + return link; +} + +bool ath12k_mac_tx_check_max_limit(struct ath12k *ar, struct sk_buff *skb) +{ + struct ath12k_base *ab = ar->ab; + + /* Allow EAPOL */ + if (skb->protocol == cpu_to_be16(ETH_P_PAE)) + return false; + + if (atomic_read(&ab->ag->num_dp_tx_pending) > ATH12K_DP_GROUP_TX_LIMIT) { + ab->soc_stats.tx_err.group_threshold_limit++; + return true; + } + + if (atomic_read(&ar->dp.num_tx_pending) > ATH12K_DP_PDEV_TX_LIMIT) { + ar->ab->soc_stats.tx_err.pdev_threshold_limit++; + return true; + } + + return false; +} + static void ath12k_mac_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, struct sk_buff *skb) { - struct ath12k_skb_cb *skb_cb = ATH12K_SKB_CB(skb); - struct ath12k *ar = hw->priv; - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); - struct ieee80211_vif *vif = info->control.vif; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; - struct ieee80211_key_conf *key = info->control.hw_key; - u32 info_flags = info->flags; + struct ath12k_skb_cb *skb_cb; + struct ieee80211_tx_info *info; + struct ieee80211_vif *vif; + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif, *tmp_arvif; + struct ath12k *ar, *tmp_ar; + struct ath12k_hw *ah; + struct ieee80211_hdr *hdr; + struct ethhdr *eth = (struct ethhdr *)skb->data; + struct ieee80211_key_conf *key; + struct ath12k_mgmt_frame_stats *mgmt_stats; + struct ath12k_sta *ahsta = NULL; + struct sk_buff *msdu_copied; + struct ath12k_link_sta *arsta = NULL; + struct ieee80211_sta *sta = NULL; + struct ath12k_peer *peer; + u32 info_flags; bool is_prb_rsp; + bool is_mcast = false; + u16 frm_type = 0; + u8 link_id; + u16 mcbc_gsn; int ret; + u8 link; + + info = IEEE80211_SKB_CB(skb); + vif = info->control.vif; + ahvif = ath12k_vif_to_ahvif(vif); + link = u32_get_bits(info->control.flags, IEEE80211_TX_CTRL_MLO_LINK); + info_flags = info->flags; + + if (control) + sta = control->sta; + + if (ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + ieee80211_free_txskb(ah->hw, skb); + return; + } + skb_cb = ATH12K_SKB_CB(skb); + key = info->control.hw_key; memset(skb_cb, 0, sizeof(*skb_cb)); skb_cb->vif = vif; + /* handle only for MLO case, use deflink for non MLO case */ + if (vif->valid_links) { + link = ath12k_mac_get_tx_link(sta, vif, link, skb, info_flags); + + if (link >= IEEE80211_MLD_MAX_NUM_LINKS) { + ieee80211_free_txskb(hw, skb); + return; + } + } else { + link = 0; + } + + arvif = ahvif->link[link]; + skb_cb->link_id = link; + + if (!arvif || !arvif->ar) { + ieee80211_free_txskb(hw, skb); + return; + } + + ar = arvif->ar; + + ah = ar->ah; + + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) { + ieee80211_free_txskb(ah->hw, skb); + return; + } + +#ifdef CONFIG_MAC80211_SFE_SUPPORT + if (skb->fast_xmit) { + ret = ath12k_mac_tx_check_max_limit(ar, skb); + if (ret) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "failed fast tx due to limit check pdev idx %d\n", + ar->pdev_idx); + ieee80211_free_txskb(hw, skb); + return; + } + + skb_cb->flags = ATH12K_SKB_HW_80211_ENCAP; + ret = ath12k_dp_tx_direct(arvif, skb); + if (unlikely(ret)) { + ath12k_dbg(arvif->ar->ab, ATH12K_DBG_MAC, + "failed to transmit frame %d\n", ret); + ieee80211_free_txskb(hw, skb); + } + return; + } +#endif + +#ifdef CONFIG_IP_FFN + if (skb->ffn_ff_done) { + ret = ath12k_mac_tx_check_max_limit(ar, skb); + if (ret) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "failed fast tx due to limit check pdev idx %d\n", + ar->pdev_idx); + ieee80211_free_txskb(hw, skb); + return; + } + + skb_cb->flags = ATH12K_SKB_HW_80211_ENCAP; + ret = ath12k_dp_tx_direct(arvif, skb); + if (unlikely(ret)) { + ath12k_dbg(arvif->ar->ab, ATH12K_DBG_MAC, + "failed to transmit frame %d\n", ret); + ieee80211_free_txskb(hw, skb); + } + return; + } +#endif + if (key) { skb_cb->cipher = key->cipher; skb_cb->flags |= ATH12K_SKB_CIPHER_SET; } + hdr = (struct ieee80211_hdr *)skb->data; + if (info_flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { skb_cb->flags |= ATH12K_SKB_HW_80211_ENCAP; + is_mcast = is_multicast_ether_addr(eth->h_dest); } else if (ieee80211_is_mgmt(hdr->frame_control)) { + frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); is_prb_rsp = ieee80211_is_probe_resp(hdr->frame_control); + mgmt_stats = &ahvif->mgmt_stats; ret = ath12k_mac_mgmt_tx(ar, skb, is_prb_rsp); if (ret) { - ath12k_warn(ar->ab, "failed to queue management frame %d\n", - ret); - ieee80211_free_txskb(ar->hw, skb); + if (ret != -EBUSY) + ath12k_warn(ar->ab, "failed to queue mgmt stype 0x%x frame %d\n", frm_type, ret); + + ieee80211_free_txskb(ah->hw, skb); + spin_lock_bh(&ar->data_lock); + mgmt_stats->tx_fail_cnt[frm_type]++; + spin_unlock_bh(&ar->data_lock); + } else { + spin_lock_bh(&ar->data_lock); + mgmt_stats->tx_succ_cnt[frm_type]++; + spin_unlock_bh(&ar->data_lock); } return; - } + } else + is_mcast = is_multicast_ether_addr(hdr->addr1); - ret = ath12k_dp_tx(ar, arvif, skb); + if (sta) + ahsta = ath12k_sta_to_ahsta(control->sta); + + /* Must call mac80211 tx status handler, else when stats is disabled we + * free the skb from driver. Own tx packets on monitor will also be + * disabled. + */ + if ((info->flags & (IEEE80211_TX_CTL_REQ_TX_STATUS | + IEEE80211_TX_INTFL_NL80211_FRAME_TX)) || + info->status_data_idr || vif->type == NL80211_IFTYPE_MESH_POINT || + test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) + skb_cb->flags |= ATH12K_SKB_TX_STATUS; + + if (!vif->valid_links || !is_mcast || + test_bit(ATH12K_FLAG_RAW_MODE, &ar->ab->ag->dev_flags)) { + ret = ath12k_mac_tx_check_max_limit(ar, skb); if (ret) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "failed due to limit check pdev idx %d\n", + ar->pdev_idx); + ieee80211_free_txskb(hw, skb); + return; + } + + ret = ath12k_dp_tx(ar, arvif, ahsta, skb, false, 0); + if (unlikely(ret)) { + if (ret == -ENOMEM) + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "failed to transmit frame %d\n", ret); + else ath12k_warn(ar->ab, "failed to transmit frame %d\n", ret); - ieee80211_free_txskb(ar->hw, skb); + + ieee80211_free_txskb(ah->hw, skb); + } + if (ath12k_debugfs_is_extd_tx_stats_enabled(ar) && ahsta) { + arsta = &ahsta->deflink; + atomic_inc(&arsta->drv_tx_pkts.pkts_in); + if (!ret) + atomic_inc(&arsta->drv_tx_pkts.pkts_out); + } + } else { + spin_lock(&ahvif->mcbc_gsn_lock); + mcbc_gsn = ahvif->mcbc_gsn++; + if (ahvif->mcbc_gsn > 0xFFF) + ahvif->mcbc_gsn = 0; + spin_unlock(&ahvif->mcbc_gsn_lock); + + for_each_set_bit(link_id, &ahvif->links_map, + IEEE80211_MLD_MAX_NUM_LINKS) { + tmp_arvif = ahvif->link[link_id]; + if (!(tmp_arvif && tmp_arvif->is_up)) + continue; + + tmp_ar = tmp_arvif->ar; + + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &tmp_ar->ab->dev_flags))) + continue; + + ret = ath12k_mac_tx_check_max_limit(tmp_ar, skb); + if (ret) { + ath12k_dbg(tmp_ar->ab, ATH12K_DBG_MAC, + "failed mcast tx due to limit check pdev idx %d\n", + tmp_ar->pdev_idx); + continue; + } + + msdu_copied = skb_copy(skb, GFP_ATOMIC); + if (!msdu_copied) { + ath12k_err(ar->ab, + "skb copy failure link_id 0x%X vdevid 0x%X\n", + link_id, tmp_arvif->vdev_id); + continue; + } + + ath12k_mlo_mcast_update_tx_link_address(vif, link_id, + msdu_copied, + info_flags); + /* upper layer would not have handled the keys so + * handle it here */ + skb_cb = ATH12K_SKB_CB(msdu_copied); + skb_cb->link_id = link_id; + + /* For open mode, skip peer find logic */ + if (ahvif->key_cipher == INVALID_CIPHER) + goto skip_peer_find; + + spin_lock_bh(&tmp_ar->ab->base_lock); + peer = ath12k_peer_find_by_addr(tmp_ar->ab, tmp_arvif->addr); + if (!peer) { + spin_unlock_bh(&tmp_ar->ab->base_lock); + ath12k_warn(tmp_ar->ab, + "failed to find peer for vdev_id 0x%X addr %pM link_map %lu\n", + tmp_arvif->vdev_id, tmp_arvif->addr, + ahvif->links_map); + tmp_ar->ab->soc_stats.tx_err.peers_not_present++; + ieee80211_free_txskb(ah->hw, msdu_copied); + continue; + } + + key = peer->keys[peer->mcast_keyidx]; + if (key) { + skb_cb->cipher = key->cipher; + skb_cb->flags |= ATH12K_SKB_CIPHER_SET; + + hdr = (struct ieee80211_hdr *)msdu_copied->data; + if (!ieee80211_has_protected(hdr->frame_control)) + hdr->frame_control |= + cpu_to_le16(IEEE80211_FCTL_PROTECTED); + } + spin_unlock_bh(&tmp_ar->ab->base_lock); +skip_peer_find: + ret = ath12k_dp_tx(tmp_ar, tmp_arvif, ahsta, + msdu_copied, true, mcbc_gsn); + + if (unlikely(ret)) { + if (ret == -ENOMEM) + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "failed to transmit frame %d\n", + ret); + else + ath12k_warn(ar->ab, "failed to transmit frame %d\n", + ret); + + ieee80211_free_txskb(ah->hw, msdu_copied); + } } + ieee80211_free_txskb(ah->hw, skb); } -void ath12k_mac_drain_tx(struct ath12k *ar) +} + +void ath12k_mac_radio_drain_tx(struct ath12k *ar) { /* make sure rcu-protected mac80211 tx path itself is drained */ synchronize_net(); @@ -4600,40 +9961,227 @@ static int ath12k_mac_config_mon_status_default(struct ath12k *ar, bool enable) { - return -ENOTSUPP; - /* TODO: Need to support new monitor mode */ + struct htt_rx_ring_tlv_filter tlv_filter = {0}; + struct ath12k_base *ab = ar->ab; + int i, ret = 0; + u32 ring_id; + + if (enable) { + tlv_filter = ath12k_mac_mon_status_filter_default; + if (ath12k_debugfs_rx_filter(ar)) + tlv_filter.rx_filter = ath12k_debugfs_rx_filter(ar); + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (g_bonded_interface_model && + test_bit(ATH12K_FLAG_PPE_DS_ENABLED, &ar->ab->dev_flags)) + tlv_filter.rx_filter |= (HTT_RX_FILTER_TLV_FLAGS_PPDU_START | + HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS | + HTT_RX_FILTER_TLV_FLAGS_PPDU_END_USER_STATS_EXT | + HTT_RX_FILTER_TLV_FLAGS_PPDU_START_USER_INFO); +#endif /* CONFIG_ATH12K_BONDED_DS_SUPPORT */ + } -static void ath12k_mac_wait_reconfigure(struct ath12k_base *ab) + tlv_filter.offset_valid = false; + + for (i = 0; i < ab->hw_params->num_rxmda_per_pdev; i++) { + ring_id = ar->dp.rxdma_mon_dst_ring[i].ring_id; + ret = ath12k_dp_tx_htt_rx_filter_setup(ar->ab, ring_id, + ar->dp.mac_id + i, + HAL_RXDMA_MONITOR_DST, + DP_RXDMA_REFILL_RING_SIZE, + &tlv_filter); + } + + return ret; +} + +static int __ath12k_mac_mlo_ready(struct ath12k *ar) { - int recovery_start_count; + int ret; - if (!ab->is_reset) - return; + ret = ath12k_wmi_mlo_ready(ar); + if (ret) { + ath12k_err(ar->ab, "MLO ready failed for pdev_idx %d: %d\n", + ar->pdev_idx, ret); - recovery_start_count = atomic_inc_return(&ab->recovery_start_count); + return ret; + } - ath12k_dbg(ab, ATH12K_DBG_MAC, "recovery start count %d\n", recovery_start_count); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "MLO ready done for pdev_idx %d\n", + ar->pdev_idx); - if (recovery_start_count == ab->num_radios) { - complete(&ab->recovery_start); - ath12k_dbg(ab, ATH12K_DBG_MAC, "recovery started success\n"); + return 0; } - ath12k_dbg(ab, ATH12K_DBG_MAC, "waiting reconfigure...\n"); +int ath12k_mac_mlo_ready(struct ath12k_hw *ah) +{ + struct ath12k *ar; + int ret; + int i; - wait_for_completion_timeout(&ab->reconfigure_complete, - ATH12K_RECONFIGURE_TIMEOUT_HZ); + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + ret = __ath12k_mac_mlo_ready(ar); + if (ret) + goto out; + + ar++; } -static int ath12k_mac_op_start(struct ieee80211_hw *hw) +out: + return ret; + +} + +static int __ath12k_mac_mlo_setup(struct ath12k *ar) +{ + struct ath12k_base *partner_ab, *ab = ar->ab; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_pdev *pdev; + struct wmi_mlo_setup_params mlo_params = { 0 }; + u8 num_link = 0, partner_link_id[ATH12K_GROUP_MAX_RADIO] = { 0 }; + int chip_idx, pdev_idx, ret; + unsigned long time_left; + + lockdep_assert_held(&ag->mutex_lock); + + reinit_completion(&ar->mlo_setup_done); + for (chip_idx = 0; chip_idx < ag->num_chip; chip_idx++) { + partner_ab = ag->ab[chip_idx]; + + for (pdev_idx = 0; pdev_idx < partner_ab->num_radios; pdev_idx++) { + pdev = &partner_ab->pdevs[pdev_idx]; + + /* Avoid the self link */ + if (ar == pdev->ar) + continue; + + partner_link_id[num_link] = pdev->hw_link_id; + num_link++; + + ath12k_dbg(ab, ATH12K_DBG_MAC, + "chip_id %d pdev_idx %d link id %d num_link %d\n", + chip_idx, pdev_idx, pdev->hw_link_id, num_link); + } + } + + mlo_params.group_id = ag->id; + mlo_params.partner_link_id = partner_link_id; + mlo_params.num_partner_links = num_link; + ar->mlo_setup_status = 0; + + ath12k_dbg(ab, ATH12K_DBG_MAC, "grp id %d num_link %d\n", ag->id, num_link); + + ret = ath12k_wmi_mlo_setup(ar, &mlo_params); + if (ret) { + ath12k_err(ab, "failed to setup MLO for pdev_idx %d: %d\n", + ar->pdev_idx, ret); + return ret; + } + + time_left = wait_for_completion_timeout(&ar->mlo_setup_done, + WMI_MLO_CMD_TIMEOUT_HZ); + if (!time_left || ar->mlo_setup_status) + return ar->mlo_setup_status ? : -ETIMEDOUT; + + ath12k_dbg(ab, ATH12K_DBG_MAC, "MLO setup done for pdev_idx %d\n", + ar->pdev_idx); + return 0; +} + +static int __ath12k_mac_mlo_teardown(struct ath12k *ar, bool umac_reset) +{ + struct ath12k_base *ab = ar->ab; + int ret; + + // If we receive teardown during ab is down, then exit silently + if (test_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags)) + return 0; + + ret = ath12k_wmi_mlo_teardown(ar, umac_reset); + if (ret) { + ath12k_err(ab, "failed to teardown MLO for pdev_idx %d: %d\n", + ar->pdev_idx, ret); + return ret; + } + + ath12k_dbg(ab, ATH12K_DBG_MAC, "MLO teardown for pdev_idx %d:%d\n", + ar->pdev_idx, umac_reset); + return 0; +} + +int ath12k_mac_mlo_setup(struct ath12k_hw *ah) +{ + struct ath12k *ar; + int ret, fbret; + int i; + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + ret = __ath12k_mac_mlo_setup(ar); + if (ret) { + ath12k_err(ar->ab, "failed to setup mlo %d\n", ret); + goto err_setup; + } + + ar++; + } + + return 0; + +err_setup: + ar = ah->radio; + for (i = i - 1; i >= 0; i--) { + fbret = __ath12k_mac_mlo_teardown(ar, false); + if (fbret) + ath12k_err(ar->ab, "MLO teardown failed %d in setup cleanup\n", + fbret); + + ar++; + } + return ret; +} + +static void ath12k_mac_drain_tx(struct ath12k_hw *ah, + struct ath12k *asserted_ar) +{ + struct ath12k *ar; + int i; + + if (asserted_ar) { + /* if asserted ar is NOT NULL, consider it + * is during Mode1 recovery and drain only + * asserted pdev + */ + ath12k_mac_radio_drain_tx(asserted_ar); + return; + } + + ar = ah->radio; + + for (i = 0; i < ah->num_radio; i++) { + ath12k_mac_radio_drain_tx(ar); + ar++; + } +} + +int ath12k_mac_radio_start(struct ath12k *ar) { - struct ath12k *ar = hw->priv; struct ath12k_base *ab = ar->ab; struct ath12k_pdev *pdev = ar->pdev; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_hw *ah = ar->ah; int ret; - ath12k_mac_drain_tx(ar); + /* reo init/drain tx only needed for recovered + * ab during Mode1 scenario + */ + if (ab->recovery_start) { + ath12k_mgmt_rx_reo_init_timer(ag); + ath12k_mac_drain_tx(ah, ar); + } + mutex_lock(&ar->conf_mutex); switch (ar->state) { @@ -4642,11 +10190,11 @@ break; case ATH12K_STATE_RESTARTING: ar->state = ATH12K_STATE_RESTARTED; - ath12k_mac_wait_reconfigure(ab); break; case ATH12K_STATE_RESTARTED: case ATH12K_STATE_WEDGED: case ATH12K_STATE_ON: + case ATH12K_STATE_TM: WARN_ON(1); ret = -EINVAL; goto err; @@ -4656,14 +10204,14 @@ 1, pdev->pdev_id); if (ret) { - ath12k_err(ar->ab, "failed to enable PMF QOS: (%d\n", ret); + ath12k_err(ab, "failed to enable PMF QOS: (%d)\n", ret); goto err; } ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_DYNAMIC_BW, 1, pdev->pdev_id); if (ret) { - ath12k_err(ar->ab, "failed to enable dynamic bw: %d\n", ret); + ath12k_err(ab, "failed to enable dynamic bw: %d\n", ret); goto err; } @@ -4683,6 +10231,7 @@ } ret = ath12k_dp_tx_htt_h2t_ppdu_stats_req(ar, + ab->stats_disable ? 0 : HTT_PPDU_STATS_TAG_DEFAULT); if (ret) { ath12k_err(ab, "failed to req ppdu stats: %d\n", ret); @@ -4693,20 +10242,70 @@ 1, pdev->pdev_id); if (ret) { - ath12k_err(ar->ab, "failed to enable MESH MCAST ENABLE: (%d\n", ret); + ath12k_err(ab, "failed to enable MESH MCAST ENABLE: (%d\n", ret); goto err; } + ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_SET_CONG_CTRL_MAX_MSDUS, + ATH12K_NUM_POOL_TX_DESC, pdev->pdev_id); + + if (ret) { + ath12k_err(ab, "failed to set congestion control MAX MSDUS: %d\n", ret); + goto err; + } + /* Enable(1)/Disable(0) sub channel marking */ + if (pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP) { + ret = ath12k_wmi_pdev_set_param(ar, WMI_PDEV_PARAM_SUB_CHANNEL_MARKING, + 1, pdev->pdev_id); + if (ret) { + ath12k_err(ab, "failed to enable SUB CHANNEL MARKING: %d\n", ret); + goto err; + } + } + +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + /* program CCE rule for eapol packets to be routed to wbm release ring */ + if (g_bonded_interface_model) { + ret = ath12k_dp_rx_pkt_type_filter(ar, ATH12K_PKT_TYPE_EAP, + ATH12K_ROUTE_EAP_METADATA); + if (ret) { + ath12k_err(ar->ab, "failed to configure EAP pkt route: %d\n", ret); + goto err; + } + + ret = ath12k_dp_rx_pkt_type_filter(ar, ATH12K_PKT_TYPE_ARP_IPV4, + ATH12K_ROUTE_ARP_METADATA); + if (ret) { + ath12k_err(ar->ab, "failed to configure ARP pkt route: %d\n", ret); + goto err; + } + } +#endif + __ath12k_set_antenna(ar, ar->cfg_tx_chainmask, ar->cfg_rx_chainmask); /* TODO: Do we need to enable ANI? */ - ath12k_reg_update_chan_list(ar); + ret = ath12k_reg_update_chan_list(ar); + + /* the ar state alone can be turned off for non supported country without + * returning the error value. As we need to update the channel for the next ar + */ + if (ret) { + if (ret == -ENOTSUPP) + ret = 0; + goto err; + } ar->num_started_vdevs = 0; ar->num_created_vdevs = 0; ar->num_peers = 0; ar->allocated_vdev_map = 0; + ar->chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID; + + spin_lock_bh(&ar->data_lock); + ar->awgn_intf_handling_in_prog = false; + spin_unlock_bh(&ar->data_lock); /* Configure monitor status ring with default rx_filter to get rx status * such as rssi, rx_duration. @@ -4719,7 +10318,7 @@ } if (ret == -ENOTSUPP) - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + ath12k_dbg(ab, ATH12K_DBG_MAC, "monitor status config is not yet supported"); /* Configure the hash seed for hash based reo dest ring selection */ @@ -4740,6 +10339,9 @@ rcu_assign_pointer(ab->pdevs_active[ar->pdev_idx], &ab->pdevs[ar->pdev_idx]); + /*ani is enabled by default*/ + ar->ani_enabled = true; + return 0; err: @@ -4749,18 +10351,80 @@ return ret; } -static void ath12k_mac_op_stop(struct ieee80211_hw *hw) +int ath12k_mac_mlo_teardown(struct ath12k_hw *ah) { - struct ath12k *ar = hw->priv; - struct htt_ppdu_stats_info *ppdu_stats, *tmp; + struct ath12k *ar; int ret; + int i; + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + ret = __ath12k_mac_mlo_teardown(ar, false); + if (ret) + goto out; + + ar++; + } + +out: + return ret; +} - ath12k_mac_drain_tx(ar); +int ath12k_mac_mlo_teardown_with_umac_reset(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_base *partner_ab; + struct ath12k *ar; + struct ath12k_pdev *pdev; + int i, j, ret = 0; + bool umac_reset; + + for (i = 0; i < ag->num_chip; i++) { + partner_ab = ag->ab[i]; + + for (j = 0; j < partner_ab->num_radios; j++) { + pdev = &partner_ab->pdevs[j]; + ar = pdev->ar; + + if (!ar) + continue; + + if (ab == partner_ab) { + /* No need to send teardown event for asserted + * chip, as anyway there will be no completion + * event from FW. + */ + ar->mlo_complete_event = true; + continue; + } + + /* Need to umac_reset as 1 for only one chip */ + umac_reset = false; + if (!ag->trigger_umac_reset) { + umac_reset = true; + ag->trigger_umac_reset = true; + } + + ret = __ath12k_mac_mlo_teardown(ar, umac_reset); + if (ret) + goto out; + } + } + +out: + return ret; +} + +static void ath12k_mac_radio_stop(struct ath12k *ar) +{ + struct ath12k_base *ab = ar->ab; + struct htt_ppdu_stats_info *ppdu_stats, *tmp; + int ret; mutex_lock(&ar->conf_mutex); ret = ath12k_mac_config_mon_status_default(ar, false); if (ret && (ret != -ENOTSUPP)) - ath12k_err(ar->ab, "failed to clear rx_filter for monitor status ring: (%d)\n", + ath12k_err(ab, "failed to clear rx_filter for monitor status ring: (%d)\n", ret); clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags); @@ -4768,6 +10432,7 @@ mutex_unlock(&ar->conf_mutex); cancel_delayed_work_sync(&ar->scan.timeout); + cancel_work_sync(&ar->scan.vdev_del_wk); cancel_work_sync(&ar->regd_update_work); spin_lock_bh(&ar->data_lock); @@ -4777,15 +10442,131 @@ } spin_unlock_bh(&ar->data_lock); - rcu_assign_pointer(ar->ab->pdevs_active[ar->pdev_idx], NULL); + if (!list_empty(&ab->neighbor_peers)) + ath12k_debugfs_nrp_cleanup_all(ar); + + rcu_assign_pointer(ab->pdevs_active[ar->pdev_idx], NULL); + if(!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags))) synchronize_rcu(); atomic_set(&ar->num_pending_mgmt_tx, 0); + atomic_set(&ar->flush_request, 0); + + spin_lock_bh(&ar->data_lock); + ar->awgn_intf_handling_in_prog = false; + spin_unlock_bh(&ar->data_lock); +} + +void ath12k_mgmt_rx_reo_init_timer(struct ath12k_hw_group *ag) +{ + struct ath12k_mgmt_rx_reo_context *reo_context = &ag->rx_reo; + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + return; + + if (reo_context->timer_init_done) + return; + + mod_timer(&reo_context->reo_list.ageout_timer, jiffies + + msecs_to_jiffies(ATH12K_MGMT_RX_REO_AGEOUT_TIMER_PERIOD_MS)); + + mod_timer(&reo_context->reo_list.global_mgmt_rx_inactivity_timer, jiffies + + ATH12K_MGMT_RX_REO_GLOBAL_MGMT_RX_INACTIVITY_TIMEOUT); + + reo_context->timer_init_done = true; +} + +static void ath12k_mgmt_rx_reo_deinit_timer(struct ath12k_hw_group *ag) +{ + struct ath12k_mgmt_rx_reo_context *reo_context = &ag->rx_reo; + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + return; + + if (!reo_context->timer_init_done) + return; + + del_timer_sync(&reo_context->reo_list.global_mgmt_rx_inactivity_timer); + del_timer_sync(&reo_context->reo_list.ageout_timer); + + reo_context->timer_init_done = false; +} + +static int ath12k_mac_op_start(struct ieee80211_hw *hw) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_base *ab; + struct ath12k_hw_group *ag = ah->ag; + int i; + int ret; + + ath12k_mgmt_rx_reo_init_timer(ag); + + ath12k_mac_drain_tx(ah, NULL); + + mutex_lock(&ah->conf_mutex); + ar = ah->radio; + ab = ar->ab; + + if (ath12k_ftm_mode) { + ath12k_err(ab, "fail to start mac operations in ftm mode\n"); + mutex_unlock(&ah->conf_mutex); + return -EWOULDBLOCK; + } + + /* TODO Maintain state for ah? */ + + for (i = 0; i < ah->num_radio; i++) { + ab = ar->ab; + ret = ath12k_mac_radio_start(ar); + if (ret) { + ath12k_err(ab, "fail to start mac operations in radio %d ret %d\n", + i, ret); + goto err; + } + ar++; + } + + mutex_unlock(&ah->conf_mutex); + return 0; + +err: + ar = ah->radio; + for (i = i - 1; i >= 0; i--) { + ath12k_mac_radio_stop(ar); + ar++; + } + mutex_unlock(&ah->conf_mutex); + return ret; +} + +static void ath12k_mac_op_stop(struct ieee80211_hw *hw) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_hw_group *ag = ah->ag; + int i; + + ath12k_mgmt_rx_reo_deinit_timer(ag); + + ath12k_mac_drain_tx(ah, NULL); + + mutex_lock(&ah->conf_mutex); + ar = ah->radio; + + /* TODO Maintain state for ah? */ + for (i = ah->num_radio - 1, ar = ar + (ah->num_radio - 1); i >= 0; i--) { + ath12k_mac_radio_stop(ar); + ar--; + } + + mutex_unlock(&ah->conf_mutex); } static u8 -ath12k_mac_get_vdev_stats_id(struct ath12k_vif *arvif) +ath12k_mac_get_vdev_stats_id(struct ath12k_link_vif *arvif) { struct ath12k_base *ab = arvif->ar->ab; u8 vdev_stats_id = 0; @@ -4793,7 +10574,7 @@ do { if (ab->free_vdev_stats_id_map & (1LL << vdev_stats_id)) { vdev_stats_id++; - if (vdev_stats_id <= ATH12K_INVAL_VDEV_STATS_ID) { + if (vdev_stats_id >= ATH12K_INVAL_VDEV_STATS_ID) { vdev_stats_id = ATH12K_INVAL_VDEV_STATS_ID; break; } @@ -4807,22 +10588,107 @@ return vdev_stats_id; } -static void ath12k_mac_setup_vdev_create_arg(struct ath12k_vif *arvif, +static int ath12k_mac_setup_vdev_args_mbssid(struct ath12k_link_vif *arvif, + u32 *flags, u32 *tx_vdev_id) +{ + struct ath12k *ar = arvif->ar; + struct ath12k_link_vif *tx_arvif; + struct ath12k_vif *tx_ahvif; + struct ieee80211_vif *tx_vif; + struct ieee80211_bss_conf *link_conf; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf in mbssid params setup\n"); + return -EINVAL; + } + + *tx_vdev_id = 0; + tx_vif = link_conf->mbssid_tx_vif; + if (!tx_vif) { + /* Since a 6GHz AP is MBSS capable by default, FW expects + * Tx vdev flag to be set even in case of single bss case + * WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP is to be used for non 6GHz + * cases + */ + if (ar->supports_6ghz && arvif->ahvif->vif->type == NL80211_IFTYPE_AP) + *flags = WMI_HOST_VDEV_FLAGS_TRANSMIT_AP; + else + *flags = WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP; + rcu_read_unlock(); + return 0; + } + + tx_ahvif = ath12k_vif_to_ahvif(tx_vif); + if (!tx_ahvif) { + rcu_read_unlock(); + return -EINVAL; + } + lockdep_assert_held(&tx_ahvif->ah->conf_mutex); + tx_arvif = tx_ahvif->link[link_conf->mbssid_tx_vif_linkid]; + if (!tx_arvif) { + rcu_read_unlock(); + return -EINVAL; + } + lockdep_assert_held(&tx_arvif->ar->conf_mutex); + + if (link_conf->nontransmitted) { + if (ar->ah->hw->wiphy != ieee80211_vif_to_wdev(tx_vif)->wiphy) { + rcu_read_unlock(); + return -EINVAL; + } + + *flags = WMI_HOST_VDEV_FLAGS_NON_TRANSMIT_AP; + *tx_vdev_id = tx_arvif->vdev_id; + } else if (tx_arvif == arvif) { + *flags = WMI_HOST_VDEV_FLAGS_TRANSMIT_AP; + } else { + rcu_read_unlock(); + return -EINVAL; + } + arvif->tx_vdev_id = *tx_vdev_id; + + if (link_conf->ema_ap) + *flags |= WMI_HOST_VDEV_FLAGS_EMA_MODE; + + rcu_read_unlock(); + return 0; +} + +static int ath12k_mac_setup_vdev_create_args(struct ath12k_link_vif *arvif, struct ath12k_wmi_vdev_create_arg *arg) { + struct ath12k_vif *ahvif = arvif->ahvif; struct ath12k *ar = arvif->ar; struct ath12k_pdev *pdev = ar->pdev; + int ret; arg->if_id = arvif->vdev_id; - arg->type = arvif->vdev_type; - arg->subtype = arvif->vdev_subtype; + arg->type = ahvif->vdev_type; + arg->subtype = ahvif->vdev_subtype; arg->pdev_id = pdev->pdev_id; + arg->mbssid_flags = 0; + arg->mbssid_tx_vdev_id = 0; + + if (!test_bit(WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT, + ar->ab->wmi_ab.svc_map)) { + ret = ath12k_mac_setup_vdev_args_mbssid(arvif, + &arg->mbssid_flags, + &arg->mbssid_tx_vdev_id); + if (ret) + return ret; + } if (pdev->cap.supported_bands & WMI_HOST_WLAN_2G_CAP) { arg->chains[NL80211_BAND_2GHZ].tx = ar->num_tx_chains; arg->chains[NL80211_BAND_2GHZ].rx = ar->num_rx_chains; } - if (pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP) { + if (pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP && + !ar->supports_6ghz) { arg->chains[NL80211_BAND_5GHZ].tx = ar->num_tx_chains; arg->chains[NL80211_BAND_5GHZ].rx = ar->num_rx_chains; } @@ -4833,97 +10699,51 @@ } arg->if_stats_id = ath12k_mac_get_vdev_stats_id(arvif); -} - -static u32 -ath12k_mac_prepare_he_mode(struct ath12k_pdev *pdev, u32 viftype) -{ - struct ath12k_pdev_cap *pdev_cap = &pdev->cap; - struct ath12k_band_cap *cap_band = NULL; - u32 *hecap_phy_ptr = NULL; - u32 hemode; - if (pdev->cap.supported_bands & WMI_HOST_WLAN_2G_CAP) - cap_band = &pdev_cap->band[NL80211_BAND_2GHZ]; - else - cap_band = &pdev_cap->band[NL80211_BAND_5GHZ]; - - hecap_phy_ptr = &cap_band->he_cap_phy_info[0]; - - hemode = u32_encode_bits(HE_SU_BFEE_ENABLE, HE_MODE_SU_TX_BFEE) | - u32_encode_bits(HECAP_PHY_SUBFMR_GET(hecap_phy_ptr), - HE_MODE_SU_TX_BFER) | - u32_encode_bits(HECAP_PHY_ULMUMIMO_GET(hecap_phy_ptr), - HE_MODE_UL_MUMIMO); - - /* TODO: WDS and other modes */ - if (viftype == NL80211_IFTYPE_AP) { - hemode |= u32_encode_bits(HECAP_PHY_MUBFMR_GET(hecap_phy_ptr), - HE_MODE_MU_TX_BFER) | - u32_encode_bits(HE_DL_MUOFDMA_ENABLE, HE_MODE_DL_OFDMA) | - u32_encode_bits(HE_UL_MUOFDMA_ENABLE, HE_MODE_UL_OFDMA); - } else { - hemode |= u32_encode_bits(HE_MU_BFEE_ENABLE, HE_MODE_MU_TX_BFEE); + if (ath12k_mac_is_ml_arvif(arvif)) { + if (hweight16(ahvif->vif->valid_links) > ATH12K_WMI_MLO_MAX_LINKS) { + WARN_ON(1); + return -EINVAL; } - - return hemode; + ether_addr_copy(arg->mld_addr, ahvif->vif->addr); } -static int ath12k_set_he_mu_sounding_mode(struct ath12k *ar, - struct ath12k_vif *arvif) -{ - u32 param_id, param_value; - struct ath12k_base *ab = ar->ab; - int ret; - - param_id = WMI_VDEV_PARAM_SET_HEMU_MODE; - param_value = ath12k_mac_prepare_he_mode(ar->pdev, arvif->vif->type); - ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, - param_id, param_value); - if (ret) { - ath12k_warn(ab, "failed to set vdev %d HE MU mode: %d param_value %x\n", - arvif->vdev_id, ret, param_value); - return ret; - } - param_id = WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE; - param_value = - u32_encode_bits(HE_VHT_SOUNDING_MODE_ENABLE, HE_VHT_SOUNDING_MODE) | - u32_encode_bits(HE_TRIG_NONTRIG_SOUNDING_MODE_ENABLE, - HE_TRIG_NONTRIG_SOUNDING_MODE); - ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, - param_id, param_value); - if (ret) { - ath12k_warn(ab, "failed to set vdev %d HE MU mode: %d\n", - arvif->vdev_id, ret); - return ret; - } - return ret; + return 0; } -static void ath12k_mac_op_update_vif_offload(struct ieee80211_hw *hw, - struct ieee80211_vif *vif) +static void ath12k_mac_update_vif_offload(struct ath12k *ar, + struct ath12k_link_vif *arvif) { - struct ath12k *ar = hw->priv; struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; u32 param_id, param_value; int ret; param_id = WMI_VDEV_PARAM_TX_ENCAP_TYPE; - if (vif->type != NL80211_IFTYPE_STATION && - vif->type != NL80211_IFTYPE_AP) + if (ath12k_frame_mode != ATH12K_HW_TXRX_ETHERNET || + (vif->type != NL80211_IFTYPE_STATION && + vif->type != NL80211_IFTYPE_AP)) vif->offload_flags &= ~(IEEE80211_OFFLOAD_ENCAP_ENABLED | IEEE80211_OFFLOAD_DECAP_ENABLED); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + if (vif->type == NL80211_IFTYPE_AP && arvif->ndev_pvt + && (hweight16(vif->valid_links) > 1)) + vif->offload_flags |= (IEEE80211_OFFLOAD_ENCAP_ENABLED | + IEEE80211_OFFLOAD_DECAP_ENABLED); +#endif + if (vif->offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) - arvif->tx_encap_type = ATH12K_HW_TXRX_ETHERNET; - else if (test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) - arvif->tx_encap_type = ATH12K_HW_TXRX_RAW; + ahvif->tx_encap_type = ATH12K_HW_TXRX_ETHERNET; + else if (test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) + ahvif->tx_encap_type = ATH12K_HW_TXRX_RAW; else - arvif->tx_encap_type = ATH12K_HW_TXRX_NATIVE_WIFI; + ahvif->tx_encap_type = ATH12K_HW_TXRX_NATIVE_WIFI; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, - param_id, arvif->tx_encap_type); + param_id, ahvif->tx_encap_type); if (ret) { ath12k_warn(ab, "failed to set vdev %d tx encap mode: %d\n", arvif->vdev_id, ret); @@ -4933,7 +10753,7 @@ param_id = WMI_VDEV_PARAM_RX_DECAP_TYPE; if (vif->offload_flags & IEEE80211_OFFLOAD_DECAP_ENABLED) param_value = ATH12K_HW_TXRX_ETHERNET; - else if (test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) + else if (test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) param_value = ATH12K_HW_TXRX_RAW; else param_value = ATH12K_HW_TXRX_NATIVE_WIFI; @@ -4947,110 +10767,250 @@ } } -static int ath12k_mac_op_add_interface(struct ieee80211_hw *hw, +static void ath12k_mac_hdl_update_vif_offload(struct ath12k_link_vif *arvif) +{ + if (!arvif->ar) { + ath12k_info(NULL, + "unable to determine device to apply vif encap/decap flags, setting will be applied on channel assignment\n"); + return; + } + + ath12k_mac_update_vif_offload(arvif->ar, arvif); + ath12k_dp_tx_update_bank_profile(arvif); +} + +static void ath12k_mac_op_update_vif_offload(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { - struct ath12k *ar = hw->priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_link_vif *arvif; + int link_id; + + mutex_lock(&ah->conf_mutex); + if (vif->valid_links) { + unsigned long links = vif->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + if (!(arvif && arvif->ar)) + continue; + + ath12k_mac_hdl_update_vif_offload(arvif); + } + } else { + ath12k_mac_hdl_update_vif_offload(&ahvif->deflink); + } + mutex_unlock(&ah->conf_mutex); +} + +static void ath12k_update_bcn_template_work(struct work_struct *work) +{ + struct ath12k_link_vif *arvif = container_of(work, struct ath12k_link_vif, + update_bcn_template_work); + struct ath12k *ar = arvif->ar; + int ret = -EINVAL; + + if (!ar) + return; + + mutex_lock(&ar->conf_mutex); + if (arvif->is_created) + ret = ath12k_mac_setup_bcn_tmpl(arvif); + mutex_unlock(&ar->conf_mutex); + if (ret) + ath12k_warn(ar->ab, "failed to update bcn tmpl for vdev_id: %d ret: %d\n", + arvif->vdev_id, ret); +} + +static void ath12k_update_obss_color_notify_work(struct work_struct *work) +{ + struct ath12k_link_vif *arvif = container_of(work, struct ath12k_link_vif, + update_obss_color_notify_work); + struct ath12k *ar; + + ar = arvif->ar; + + if (!ar) + return; + + mutex_lock(&ar->conf_mutex); + if (arvif->is_created) + ieee80211_obss_color_collision_notify_mlo(arvif->ahvif->vif, + arvif->obss_color_bitmap, + GFP_KERNEL, + arvif->link_id); + arvif->obss_color_bitmap = 0; + mutex_unlock(&ar->conf_mutex); +} + + int ath12k_mac_vdev_create(struct ath12k *ar, struct ath12k_link_vif *arvif) +{ + struct ieee80211_vif *vif = arvif->ahvif->vif; struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_hw *hw = ar->ah->hw; struct ath12k_wmi_vdev_create_arg vdev_arg = {0}; - struct ath12k_wmi_peer_create_arg peer_param; + struct ath12k_wmi_peer_create_arg peer_param = {0}; + struct ieee80211_bss_conf *link_conf; u32 param_id, param_value; +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + struct wireless_dev *wdev = ieee80211_vif_to_wdev(vif); + struct net_device *link_ndev = NULL; + struct ath12k_link_vif_pvt *link_ndev_pvt = NULL; +#endif u16 nss; int i; - int ret; - int bit; + int ret, fbret, vdev_id; + u8 link_addr[ETH_ALEN]; + int txpower; + u8 link_id; - vif->driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD; + lockdep_assert_held(&ar->conf_mutex); - mutex_lock(&ar->conf_mutex); + /* If no link is active and scan vdev is requested + * use a default link conf for scan address purpose + */ + if (arvif->link_id == ATH12K_DEFAULT_SCAN_LINK && + vif->valid_links) + link_id = ffs(vif->valid_links) - 1; + else + link_id = arvif->link_id; - if (vif->type == NL80211_IFTYPE_AP && - ar->num_peers > (ar->max_num_peers - 1)) { - ath12k_warn(ab, "failed to create vdev due to insufficient peer entry resource in firmware\n"); - ret = -ENOBUFS; - goto err; - } + rcu_read_lock(); - if (ar->num_created_vdevs > (TARGET_NUM_VDEVS - 1)) { - ath12k_warn(ab, "failed to create vdev, reached max vdev limit %d\n", - TARGET_NUM_VDEVS); - ret = -EBUSY; - goto err; - } + link_conf = rcu_dereference(vif->link_conf[link_id]); - memset(arvif, 0, sizeof(*arvif)); + if (!link_conf) { + rcu_read_unlock(); + return -EINVAL; + } - arvif->ar = ar; - arvif->vif = vif; + if (arvif->link_id == ATH12K_DEFAULT_SCAN_LINK && + !is_zero_ether_addr(arvif->addr)) { + memcpy(link_addr, arvif->addr, ETH_ALEN); + } else { + memcpy(link_addr, link_conf->addr, ETH_ALEN); + memcpy(arvif->addr, link_conf->addr, ETH_ALEN); + } - INIT_LIST_HEAD(&arvif->list); + txpower = link_conf->txpower; + rcu_read_unlock(); - /* Should we initialize any worker to handle connection loss indication - * from firmware in sta mode? + /* Send vdev stats offload commands to firmware before first vdev + * creation. ie., when num_created_vdevs = 0 */ + if (ar->fw_stats.en_vdev_stats_ol && !ar->num_created_vdevs) { + ret = ath12k_dp_tx_htt_h2t_vdev_stats_ol_req(ar, 0); + if (ret) { + ath12k_warn(ar->ab, "failed to request vdev stats offload: %d\n", ret); + goto err; + } + } - for (i = 0; i < ARRAY_SIZE(arvif->bitrate_mask.control); i++) { - arvif->bitrate_mask.control[i].legacy = 0xffffffff; - memset(arvif->bitrate_mask.control[i].ht_mcs, 0xff, - sizeof(arvif->bitrate_mask.control[i].ht_mcs)); - memset(arvif->bitrate_mask.control[i].vht_mcs, 0xff, - sizeof(arvif->bitrate_mask.control[i].vht_mcs)); + spin_lock_bh(&ar->ab->base_lock); + + if (!ab->free_vdev_map) { + spin_unlock_bh(&ar->ab->base_lock); + ath12k_warn(ar->ab, "failed to create vdev. No free vdev id left.\n"); + ret = -EINVAL; + goto err; } - bit = __ffs64(ab->free_vdev_map); + vdev_id = __ffs64(ab->free_vdev_map); + ab->free_vdev_map &= ~(1LL << vdev_id); + spin_unlock_bh(&ar->ab->base_lock); - arvif->vdev_id = bit; - arvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; + arvif->vdev_id = vdev_id; + /* Assume it as non-mbssid initially, well overwrite it later. + */ + arvif->tx_vdev_id = vdev_id; + ahvif->vdev_subtype = WMI_VDEV_SUBTYPE_NONE; + arvif->ar = ar; + arvif->ab = ab; + arvif->dp = &ab->dp; + arvif->dev = ab->dev; + arvif->pdev_idx = ar->pdev_idx; +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (arvif->link_id != ATH12K_DEFAULT_SCAN_LINK) { + link_ndev = vif->link_ndev[link_id]; + if (link_ndev) { + link_ndev_pvt = netdev_priv(link_ndev); + link_ndev_pvt->ab = ab; + link_ndev_pvt->arvif = arvif; + arvif->ndev_pvt = link_ndev_pvt; + } + } +#endif switch (vif->type) { case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_STATION: - arvif->vdev_type = WMI_VDEV_TYPE_STA; + ahvif->vdev_type = WMI_VDEV_TYPE_STA; break; case NL80211_IFTYPE_MESH_POINT: - arvif->vdev_subtype = WMI_VDEV_SUBTYPE_MESH_11S; + ahvif->vdev_subtype = WMI_VDEV_SUBTYPE_MESH_11S; fallthrough; case NL80211_IFTYPE_AP: - arvif->vdev_type = WMI_VDEV_TYPE_AP; + ahvif->vdev_type = WMI_VDEV_TYPE_AP; break; case NL80211_IFTYPE_MONITOR: - arvif->vdev_type = WMI_VDEV_TYPE_MONITOR; - ar->monitor_vdev_id = bit; + ahvif->vdev_type = WMI_VDEV_TYPE_MONITOR; + ar->monitor_vdev_id = vdev_id; break; default: WARN_ON(1); break; } - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac add interface id %d type %d subtype %d map %llx\n", - arvif->vdev_id, arvif->vdev_type, arvif->vdev_subtype, + ath12k_dbg(ar->ab, ATH12K_DBG_SET(MAC, L1), "mac vdev create id %d type %d subtype %d map %llx\n", + arvif->vdev_id, ahvif->vdev_type, ahvif->vdev_subtype, ab->free_vdev_map); + /* TODO Revisit this sharing of common queues across all ar's */ vif->cab_queue = arvif->vdev_id % (ATH12K_HW_MAX_QUEUES - 1); for (i = 0; i < ARRAY_SIZE(vif->hw_queue); i++) vif->hw_queue[i] = i % (ATH12K_HW_MAX_QUEUES - 1); - ath12k_mac_setup_vdev_create_arg(arvif, &vdev_arg); + ret = ath12k_mac_setup_vdev_create_args(arvif, &vdev_arg); + if (ret) { + ath12k_warn(ab, "failed to create vdev parameters %d: %d\n", + arvif->vdev_id, ret); + goto err; + } - ret = ath12k_wmi_vdev_create(ar, vif->addr, &vdev_arg); + ret = ath12k_wmi_vdev_create(ar, vdev_arg.type == WMI_VDEV_TYPE_MONITOR ? + ar->mac_addr : link_addr, + &vdev_arg); if (ret) { ath12k_warn(ab, "failed to create WMI vdev %d: %d\n", arvif->vdev_id, ret); + spin_lock_bh(&ar->ab->base_lock); + ab->free_vdev_map |= 1LL << arvif->vdev_id; + spin_unlock_bh(&ar->ab->base_lock); + goto err; } ar->num_created_vdevs++; + ahvif->num_vdev_created++; + arvif->is_created = true; ath12k_dbg(ab, ATH12K_DBG_MAC, "vdev %pM created, vdev_id %d\n", - vif->addr, arvif->vdev_id); + link_addr, arvif->vdev_id); + ar->allocated_vdev_map |= 1LL << arvif->vdev_id; - ab->free_vdev_map &= ~(1LL << arvif->vdev_id); spin_lock_bh(&ar->data_lock); + + /* list added is not needed during mode1 recovery + * as the arvif(s) updated are from the existing + * list + */ + if (!ab->recovery_start) list_add(&arvif->list, &ar->arvifs); + spin_unlock_bh(&ar->data_lock); - ath12k_mac_op_update_vif_offload(hw, vif); + ath12k_mac_update_vif_offload(ar, arvif); nss = hweight32(ar->cfg_tx_chainmask) ? : 1; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, @@ -5061,10 +11021,10 @@ goto err_vdev_del; } - switch (arvif->vdev_type) { + switch (ahvif->vdev_type) { case WMI_VDEV_TYPE_AP: peer_param.vdev_id = arvif->vdev_id; - peer_param.peer_addr = vif->addr; + peer_param.peer_addr = link_addr; peer_param.peer_type = WMI_PEER_TYPE_DEFAULT; ret = ath12k_peer_create(ar, arvif, NULL, &peer_param); if (ret) { @@ -5079,6 +11039,22 @@ arvif->vdev_id, ret); goto err_peer_del; } +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + if (arvif->link_id != ATH12K_DEFAULT_SCAN_LINK) { + if (hweight16(vif->valid_links) <= 1 && link_ndev && !wdev->ml_netdev) { + ath12k_free_bonddev_for_sfe(wdev, vif, link_id); + arvif->ndev_pvt = NULL; + arvif->ppe_vp_num = -1; + } else if (link_ndev && !arvif->ndev_pvt->is_bond_enslaved) { + ath12k_enable_ppe_for_link_netdev(ab, arvif, + arvif->ndev_pvt->link_ndev); + netif_tx_start_all_queues(arvif->ndev_pvt->bond_dev); + netif_tx_start_all_queues(arvif->ndev_pvt->link_ndev); + arvif->ndev_pvt->bond_dev->flags |= IFF_UP; + ath12k_bond_link_enslave(arvif, arvif->ndev_pvt->link_ndev); + } + } +#endif break; case WMI_VDEV_TYPE_STA: param_id = WMI_STA_PS_PARAM_RX_WAKE_POLICY; @@ -5118,17 +11094,20 @@ goto err_peer_del; } break; + case WMI_VDEV_TYPE_MONITOR: + set_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags); + break; default: break; } - arvif->txpower = vif->bss_conf.txpower; + arvif->txpower = txpower; ret = ath12k_mac_txpower_recalc(ar); if (ret) goto err_peer_del; param_id = WMI_VDEV_PARAM_RTS_THRESHOLD; - param_value = ar->hw->wiphy->rts_threshold; + param_value = hw->wiphy->rts_threshold; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param_id, param_value); if (ret) { @@ -5138,47 +11117,243 @@ ath12k_dp_vdev_tx_attach(ar, arvif); - if (vif->type != NL80211_IFTYPE_MONITOR && ar->monitor_conf_enabled) + ath12k_mac_ap_ps_recalc(ar); + + if (vif->type != NL80211_IFTYPE_MONITOR && + test_bit(MONITOR_CONF_ENABLED, &ar->monitor_flags)) ath12k_mac_monitor_vdev_create(ar); - mutex_unlock(&ar->conf_mutex); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ret = ath12k_wmi_send_vdev_set_intra_bss_cmd(ar, arvif->vdev_id, + 1); + if (ret) { + ath12k_warn(ab, "failed to set vdev %d intra bss enable :%d\n", + arvif->vdev_id, ret); + goto err_peer_del; + } +#endif + + ath12k_debugfs_add_interface(arvif); return ret; err_peer_del: - if (arvif->vdev_type == WMI_VDEV_TYPE_AP) { - reinit_completion(&ar->peer_delete_done); - - ret = ath12k_wmi_send_peer_delete_cmd(ar, vif->addr, - arvif->vdev_id); - if (ret) { - ath12k_warn(ar->ab, "failed to delete peer vdev_id %d addr %pM\n", - arvif->vdev_id, vif->addr); + if (ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + fbret = ath12k_peer_delete(ar, arvif->vdev_id, link_addr); + if (fbret) { + ath12k_warn(ar->ab, "failed to delete peer %pM vdev_id %d ret %d\n", + link_addr, arvif->vdev_id, fbret); goto err; } - - ret = ath12k_wait_for_peer_delete_done(ar, arvif->vdev_id, - vif->addr); - if (ret) - goto err; - - ar->num_peers--; } err_vdev_del: ath12k_wmi_vdev_delete(ar, arvif->vdev_id); ar->num_created_vdevs--; + arvif->is_created = false; ar->allocated_vdev_map &= ~(1LL << arvif->vdev_id); + spin_lock_bh(&ar->ab->base_lock); ab->free_vdev_map |= 1LL << arvif->vdev_id; + spin_unlock_bh(&ar->ab->base_lock); ab->free_vdev_stats_id_map &= ~(1LL << arvif->vdev_stats_id); spin_lock_bh(&ar->data_lock); list_del(&arvif->list); spin_unlock_bh(&ar->data_lock); err: + arvif->is_created = false; + arvif->ar = NULL; + return ret; +} + +void ath12k_mac_vif_cache_flush(struct ath12k *ar, struct ieee80211_vif *vif, + u8 link_id) +{ + struct ath12k_hw *ah = ar->ah; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + struct ath12k_key_conf *key_conf, *tmp; + struct ath12k_link_sta *arsta = NULL; + struct ath12k_sta *ahsta; + struct ath12k_vif_cache *cache; + int ret; + + lockdep_assert_held(&ah->conf_mutex); + + + arvif = ahvif->link[link_id]; + + if (WARN_ON(!arvif)) + return; + + if (WARN_ON(!arvif->is_created)) + return; + + cache = &ahvif->cache[link_id]; + + if (cache->tx_conf.changed) { + ret = ath12k_mac_conf_tx(ar, arvif, cache->tx_conf.ac, + &cache->tx_conf.tx_queue_params); + if (ret) + ath12k_warn(ar->ab, + "unable to apply tx config parameters to vdev %d\n", ret); + + memset(&cache->tx_conf, 0, sizeof(struct ath12k_tx_conf)); + } + + if (cache->bss_conf_changed) { + ath12k_mac_bss_info_changed(ar, arvif, &vif->bss_conf, + cache->bss_conf_changed); + + cache->bss_conf_changed = 0; + } + + if (!list_empty(&cache->key_conf.list)) { + list_for_each_entry_safe(key_conf, tmp, &cache->key_conf.list, list) { + if (key_conf->sta) { + ahsta = ath12k_sta_to_ahsta(key_conf->sta); + arsta = ahsta->link[link_id]; + } + + ret = ath12k_mac_set_key(ar, key_conf->cmd, + arvif, arsta, + key_conf->key); + if (ret) + ath12k_warn(ar->ab, "unable to apply set key param to vdev %d ret %d\n", + arvif->vdev_id, ret); + + list_del(&key_conf->list); + kfree(key_conf); + } + } +} + +static struct ath12k *ath12k_mac_assign_vif_to_vdev(struct ieee80211_hw *hw, + struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *ctx) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_base *ab; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k_link_vif *scan_arvif; + u8 bit; + int ret; + + lockdep_assert_held(&ah->conf_mutex); + + if (arvif->ar) + goto out; + + ar = ath12k_get_ar_by_ctx(hw, ctx); + + if (!ar) { + ath12k_err(NULL, + "unable to determine device for the passed channel ctx\n"); + goto out; + } + + /* cleanup the scan vdev if we are done scan on that ar + * and now we want to create for actual usage + */ + if (vif->valid_links) { + scan_arvif = arvif->ahvif->link[ATH12K_DEFAULT_SCAN_LINK]; + + if (scan_arvif && scan_arvif->ar == ar) { + mutex_lock(&ar->conf_mutex); + ar->scan.vdev_id = -1; mutex_unlock(&ar->conf_mutex); + ath12k_mac_remove_link_interface(hw, scan_arvif); + ath12k_mac_unassign_link_vif(scan_arvif); + } + } - return ret; + ab = ar->ab; + + mutex_lock(&ar->conf_mutex); + + if (vif->type == NL80211_IFTYPE_AP && + ar->num_peers > (ar->max_num_peers - 1)) { + ath12k_warn(ab, "failed to create vdev due to insufficient peer entry resource in firmware\n"); + ret = -ENOBUFS; + goto unlock; + } + + if (ar->num_created_vdevs > (TARGET_NUM_VDEVS - 1)) { + ath12k_warn(ab, "failed to create vdev, reached max vdev limit %d\n", + TARGET_NUM_VDEVS); + ret = -EBUSY; + goto unlock; + } + + ret = ath12k_mac_vdev_create(ar, arvif); + if (ret) { + ath12k_warn(ab, "failed to create vdev %d ret %d", bit, ret); + goto unlock; + } + + /* Apply any parameters for the vdev which were received after + * add_interface, corresponding to this vif + */ + ath12k_mac_vif_cache_flush(ar, vif, arvif->link_id); + +unlock: + mutex_unlock(&ar->conf_mutex); +out: + return arvif->ar; +} + +static int ath12k_mac_op_add_interface(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) +{ + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_hw *ah = hw->priv; + int i; + + /* The ar in which this vif will be assigned can be determined since + * it depends on the channel in which the vif is brought up. + * For now, prepare the vif/arvif with common changes + * TODO Add checks to ensure at least one ar has a free vdev + * Also if the hw uses only one link/ar the vdev could be created + * here itself + */ + + mutex_lock(&ah->conf_mutex); + memset(ahvif, 0, sizeof(*ahvif)); + + ahvif->vdev_type = vif->type; + ahvif->vif = vif; + ahvif->ah = ah; + + ahvif->deflink.ahvif = ahvif; + ahvif->deflink.link_id = 0; + ahvif->mcbc_gsn = 0; + INIT_LIST_HEAD(&ahvif->deflink.list); + INIT_DELAYED_WORK(&ahvif->deflink.connection_loss_work, + ath12k_mac_vif_sta_connection_loss_work); + INIT_WORK(&ahvif->deflink.update_obss_color_notify_work, + ath12k_update_obss_color_notify_work); + INIT_WORK(&ahvif->deflink.update_bcn_template_work, + ath12k_update_bcn_template_work); + ahvif->deflink.num_stations = 0; + init_completion(&ahvif->deflink.peer_ch_width_switch_send); + INIT_WORK(&ahvif->deflink.peer_ch_width_switch_work, + ath12k_wmi_peer_chan_width_switch_work); + + ahvif->key_cipher = INVALID_CIPHER; + + /* Allocate Default Queue now and reassign during actual vdev create */ + vif->cab_queue = ATH12K_HW_DEFAULT_QUEUE; + for (i = 0; i < ARRAY_SIZE(vif->hw_queue); i++) + vif->hw_queue[i] = ATH12K_HW_DEFAULT_QUEUE; + + for (i = 0; i < IEEE80211_MLD_MAX_NUM_LINKS; i++) + INIT_LIST_HEAD(&ahvif->cache[i].key_conf.list); + + vif->driver_flags |= IEEE80211_VIF_SUPPORTS_UAPSD; + + mutex_unlock(&ah->conf_mutex); + return 0; } static void ath12k_mac_vif_unref(struct ath12k_dp *dp, struct ieee80211_vif *vif) @@ -5206,80 +11381,155 @@ } } -static void ath12k_mac_op_remove_interface(struct ieee80211_hw *hw, - struct ieee80211_vif *vif) +static void ath12k_mac_remove_link_interface(struct ieee80211_hw *hw, + struct ath12k_link_vif *arvif) { - struct ath12k *ar = hw->priv; - struct ath12k_vif *arvif = ath12k_vif_to_arvif(vif); - struct ath12k_base *ab = ar->ab; - unsigned long time_left; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_vif *vif = ahvif->vif; + struct ath12k_key_conf *key_conf, *tmp; + struct ath12k_base *ab; + struct ath12k_mac_tx_mgmt_free_arg arg = { }; int ret; + cancel_work_sync(&arvif->update_obss_color_notify_work); + cancel_work_sync(&arvif->update_bcn_template_work); + cancel_work_sync(&arvif->peer_ch_width_switch_work); + cancel_delayed_work_sync(&arvif->connection_loss_work); + + lockdep_assert_held(&ah->conf_mutex); + + ar = arvif->ar; + if (!ar) { + ath12k_dbg(NULL, ATH12K_DBG_MAC, + "unable to determine device to remove interface\n"); + return; + } + + ab = ar->ab; + mutex_lock(&ar->conf_mutex); ath12k_dbg(ab, ATH12K_DBG_MAC, "mac remove interface (vdev %d)\n", arvif->vdev_id); - if (arvif->vdev_type == WMI_VDEV_TYPE_AP) { - ret = ath12k_peer_delete(ar, arvif->vdev_id, vif->addr); + ret = ath12k_spectral_vif_stop(arvif); if (ret) - ath12k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d\n", + ath12k_warn(ab, "failed to stop spectral for vdev %i: %d\n", arvif->vdev_id, ret); - } - reinit_completion(&ar->vdev_delete_done); - - ret = ath12k_wmi_vdev_delete(ar, arvif->vdev_id); - if (ret) { - ath12k_warn(ab, "failed to delete WMI vdev %d: %d\n", - arvif->vdev_id, ret); - goto err_vdev_del; + if (ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + ret = ath12k_peer_delete(ar, arvif->vdev_id, arvif->addr); + if (ret) + ath12k_warn(ab, "failed to submit AP self-peer removal on vdev %d: %d" + " num_peer : %d\n", arvif->vdev_id, ret, ar->num_peers); } - time_left = wait_for_completion_timeout(&ar->vdev_delete_done, - ATH12K_VDEV_DELETE_TIMEOUT_HZ); - if (time_left == 0) { - ath12k_warn(ab, "Timeout in receiving vdev delete response\n"); + ret = ath12k_mac_vdev_delete(ar, arvif); + if (ret) goto err_vdev_del; - } - if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + if (ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { ar->monitor_vdev_id = -1; - ar->monitor_vdev_created = false; - } else if (ar->monitor_vdev_created && !ar->monitor_started) { + clear_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags); + } else if (test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags) && + !test_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags)) { ret = ath12k_mac_monitor_vdev_delete(ar); } - ab->free_vdev_map |= 1LL << (arvif->vdev_id); - ar->allocated_vdev_map &= ~(1LL << arvif->vdev_id); - ab->free_vdev_stats_id_map &= ~(1LL << arvif->vdev_stats_id); - ar->num_created_vdevs--; - ath12k_dbg(ab, ATH12K_DBG_MAC, "vdev %pM deleted, vdev_id %d\n", - vif->addr, arvif->vdev_id); + arvif->addr, arvif->vdev_id); err_vdev_del: + ath12k_peer_cleanup(ar, arvif->vdev_id); + spin_lock_bh(&ar->data_lock); - list_del(&arvif->list); - spin_unlock_bh(&ar->data_lock); - ath12k_peer_cleanup(ar, arvif->vdev_id); + arg.ar = ar; + arg.vif = vif; + arg.link_id = arvif->link_id; + arg.type = u8_encode_bits(true, ATH12K_MAC_TX_MGMT_FREE_TYPE_PDEV) | + u8_encode_bits(true, ATH12K_MAC_TX_MGMT_FREE_TYPE_VIF) | + u8_encode_bits(true, ATH12K_MAC_TX_MGMT_FREE_TYPE_LINK); idr_for_each(&ar->txmgmt_idr, - ath12k_mac_vif_txmgmt_idr_remove, vif); + ath12k_mac_tx_mgmt_pending_free, &arg); + + spin_unlock_bh(&ar->data_lock); ath12k_mac_vif_unref(&ab->dp, vif); ath12k_dp_tx_put_bank_profile(&ab->dp, arvif->bank_id); + ahvif->key_cipher = INVALID_CIPHER; /* Recalc txpower for remaining vdev */ ath12k_mac_txpower_recalc(ar); - clear_bit(ATH12K_FLAG_MONITOR_ENABLED, &ar->monitor_flags); + ath12k_mac_ap_ps_recalc(ar); + + ath12k_debugfs_remove_interface(arvif); + + if (arvif->link_id < IEEE80211_MLD_MAX_NUM_LINKS && + !list_empty(&ahvif->cache[arvif->link_id].key_conf.list)) { + list_for_each_entry_safe(key_conf, tmp, + &ahvif->cache[arvif->link_id].key_conf.list, + list) { + list_del(&key_conf->list); + kfree(key_conf); + } + } /* TODO: recal traffic pause state based on the available vdevs */ mutex_unlock(&ar->conf_mutex); } +static void ath12k_mac_op_remove_interface(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + struct ath12k *ar; + u8 link_id; + int ret; + + mutex_lock(&ah->conf_mutex); + + for_each_set_bit(link_id, &ahvif->links_map, ATH12K_NUM_MAX_LINKS) { + arvif = ahvif->link[link_id]; + + if (!arvif) + continue; + + ar = arvif->ar; + + if (!ar) + continue; + + if (WARN_ON(arvif->link_id != link_id)) + continue; + + if (arvif->is_scan_vif && arvif->is_started) { + mutex_lock(&ar->conf_mutex); + ret = ath12k_mac_vdev_stop(arvif); + mutex_unlock(&ar->conf_mutex); + if (ret) { + mutex_unlock(&ah->conf_mutex); + ath12k_warn(ar->ab, "failed to stop vdev %d: %d\n", + arvif->vdev_id, ret); + return; + } + arvif->is_started = false; + arvif->is_scan_vif = false; + } + + ath12k_mac_remove_link_interface(hw, arvif); + ath12k_mac_unassign_link_vif(arvif); + } + + mutex_unlock(&ah->conf_mutex); +} + /* FIXME: Has to be verified. */ #define SUPPORTED_FILTERS \ (FIF_ALLMULTI | \ @@ -5295,77 +11545,107 @@ unsigned int *total_flags, u64 multicast) { - struct ath12k *ar = hw->priv; - bool reset_flag; - int ret; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + int i; + + mutex_lock(&ah->conf_mutex); + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { mutex_lock(&ar->conf_mutex); - changed_flags &= SUPPORTED_FILTERS; *total_flags &= SUPPORTED_FILTERS; ar->filter_flags = *total_flags; - /* For monitor mode */ - reset_flag = !(ar->filter_flags & FIF_BCN_PRBRESP_PROMISC); - - ret = ath12k_dp_tx_htt_monitor_mode_ring_config(ar, reset_flag); - if (!ret) { - if (!reset_flag) - set_bit(ATH12K_FLAG_MONITOR_ENABLED, &ar->monitor_flags); - else - clear_bit(ATH12K_FLAG_MONITOR_ENABLED, &ar->monitor_flags); - } else { - ath12k_warn(ar->ab, - "fail to set monitor filter: %d\n", ret); - } - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, - "changed_flags:0x%x, total_flags:0x%x, reset_flag:%d\n", - changed_flags, *total_flags, reset_flag); - mutex_unlock(&ar->conf_mutex); + ar++; + } + mutex_unlock(&ah->conf_mutex); } +/* TODO Also support link based antenna configs, below might not be accurate */ static int ath12k_mac_op_get_antenna(struct ieee80211_hw *hw, u32 *tx_ant, u32 *rx_ant) { - struct ath12k *ar = hw->priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + int antennas_rx = 0, antennas_tx = 0, i; + + mutex_lock(&ah->conf_mutex); + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { mutex_lock(&ar->conf_mutex); - *tx_ant = ar->cfg_tx_chainmask; - *rx_ant = ar->cfg_rx_chainmask; + antennas_tx = max_t(u32, antennas_tx, ar->cfg_tx_chainmask); + antennas_rx = max_t(u32, antennas_rx, ar->cfg_rx_chainmask); mutex_unlock(&ar->conf_mutex); + ar++; + } + + *tx_ant = antennas_tx; + *rx_ant = antennas_rx; + + mutex_unlock(&ah->conf_mutex); return 0; } static int ath12k_mac_op_set_antenna(struct ieee80211_hw *hw, u32 tx_ant, u32 rx_ant) { - struct ath12k *ar = hw->priv; - int ret; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + int ret = 0, i; + mutex_lock(&ah->conf_mutex); + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { mutex_lock(&ar->conf_mutex); ret = __ath12k_set_antenna(ar, tx_ant, rx_ant); mutex_unlock(&ar->conf_mutex); + ar++; + } + + mutex_unlock(&ah->conf_mutex); + return ret; } -static int ath12k_mac_op_ampdu_action(struct ieee80211_hw *hw, +static int ath12k_mac_ampdu_action(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - struct ieee80211_ampdu_params *params) + struct ieee80211_ampdu_params *params, + u8 link_id) { - struct ath12k *ar = hw->priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; int ret = -EINVAL; + lockdep_assert_held(&ah->conf_mutex); + + ar = ath12k_get_ar_by_vif(hw, vif, link_id); + if (!ar) { + ath12k_err(NULL, "unable to determine device to set ampdu params\n"); + return -EPERM; + } + + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) + return -ESHUTDOWN; + + if (params->sta->mlo && + (test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &ar->ab->dev_flags))) + return 0; + mutex_lock(&ar->conf_mutex); switch (params->action) { case IEEE80211_AMPDU_RX_START: - ret = ath12k_dp_rx_ampdu_start(ar, params); + ret = ath12k_dp_rx_ampdu_start(ar, params, link_id); break; case IEEE80211_AMPDU_RX_STOP: - ret = ath12k_dp_rx_ampdu_stop(ar, params); + ret = ath12k_dp_rx_ampdu_stop(ar, params, link_id); break; case IEEE80211_AMPDU_TX_START: case IEEE80211_AMPDU_TX_STOP_CONT: @@ -5379,18 +11659,67 @@ break; } + if (ret) + ath12k_warn(ar->ab, "unable to perform ampdu action %d ret %d\n", + params->action, ret); + mutex_unlock(&ar->conf_mutex); return ret; } +static int ath12k_mac_op_ampdu_action(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_ampdu_params *params) +{ + struct ieee80211_sta *sta = params->sta; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_hw *ah = hw->priv; + int ret = -EINVAL; + u8 link_id; + + if (WARN_ON(!ahsta->links_map)) + return -EINVAL; + + mutex_lock(&ah->conf_mutex); + + for_each_set_bit(link_id, &ahsta->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + ret = ath12k_mac_ampdu_action(hw, vif, params, link_id); + if (ret) + break; + } + + mutex_unlock(&ah->conf_mutex); + + return ret; +} + +#ifndef CONFIG_ATH12K_BONDED_DS_SUPPORT +int ath12k_mac_op_change_vif_links(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + u16 old_links, u16 new_links, + struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS]) +{ + ath12k_info(NULL, + "link changed for MLD %pM old %d new %d\n", vif->addr, old_links, new_links); + return 0; +} +#endif + static int ath12k_mac_op_add_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *ctx) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; + struct ath12k *ar; - ath12k_dbg(ab, ATH12K_DBG_MAC, + ar = ath12k_get_ar_by_ctx(hw, ctx); + + if (!ar) { + ath12k_err(NULL, + "unable to determine device for the passed channel ctx\n"); + return -EINVAL; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac chanctx add freq %u width %d ptr %pK\n", ctx->def.chan->center_freq, ctx->def.width, ctx); @@ -5403,6 +11732,7 @@ ar->rx_channel = ctx->def.chan; spin_unlock_bh(&ar->data_lock); + ar->chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID; mutex_unlock(&ar->conf_mutex); return 0; @@ -5411,10 +11741,17 @@ static void ath12k_mac_op_remove_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *ctx) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; + struct ath12k *ar; - ath12k_dbg(ab, ATH12K_DBG_MAC, + ar = ath12k_get_ar_by_ctx(hw, ctx); + + if (!ar) { + ath12k_err(NULL, + "unable to determine device for the passed channel ctx\n"); + return; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac chanctx remove freq %u width %d ptr %pK\n", ctx->def.chan->center_freq, ctx->def.width, ctx); @@ -5427,18 +11764,186 @@ ar->rx_channel = NULL; spin_unlock_bh(&ar->data_lock); + ar->chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID; mutex_unlock(&ar->conf_mutex); } +static int ath12k_mac_set_6g_nonht_dup_conf(struct ath12k_link_vif *arvif, + const struct cfg80211_chan_def *chandef) +{ + struct ath12k *ar = arvif->ar; + int param_id, ret = 0; + uint8_t value = 0; + bool is_psc = cfg80211_channel_is_psc(chandef->chan); + enum wmi_phy_mode mode = ath12k_phymodes[chandef->chan->band][chandef->width]; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_bss_conf *link_conf; + u8 link_addr[ETH_ALEN]; + bool nontransmitted; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + return -EINVAL; + } + + memcpy(link_addr, link_conf->addr, ETH_ALEN); + nontransmitted = link_conf->nontransmitted; + rcu_read_unlock(); + + if ((ahvif->vdev_type == WMI_VDEV_TYPE_AP) && + !nontransmitted && + (chandef->chan->band == NL80211_BAND_6GHZ)) { + param_id = WMI_VDEV_PARAM_6GHZ_PARAMS; + if (mode > MODE_11AX_HE20 && !is_psc) { + value |= WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BEACON; + value |= WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BCAST_PROBE_RSP; + value |= WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_FD_FRAME; + } + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "Set 6GHz non-ht dup params for vdev %pM ,vdev_id %d param %d value %d\n", + link_addr, arvif->vdev_id, param_id, value); + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, param_id, value); + } + return ret; +} + +static void +ath12k_mac_mlo_get_vdev_args(struct ath12k_link_vif *arvif, + struct wmi_ml_arg *ml_arg) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k_link_vif *arvif_p; + u8 link_id; + struct wmi_ml_partner_info *partner_info; + struct ieee80211_bss_conf *link_conf; + + if (!ath12k_mac_is_ml_arvif(arvif)) + return; + + if (hweight16(ahvif->vif->valid_links) > ATH12K_WMI_MLO_MAX_LINKS) + return; + + rcu_read_lock(); + + ml_arg->enabled = true; + + /* We always add a new link via VDEV START, FW takes + * care of internally adding this link to existing + * link vdevs which are advertised as partners below + */ + ml_arg->link_add = true; + + /* TODO check assoc and mcast vdev for AP mode */ + + partner_info = ml_arg->partner_info; + + for_each_set_bit(link_id, &ahvif->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif_p = ahvif->link[link_id]; + + if (WARN_ON(arvif_p == NULL)) + continue; + + if (arvif == arvif_p) + continue; + + link_conf = rcu_dereference(ahvif->vif->link_conf[arvif_p->link_id]); + + if (!link_conf) + continue; + + partner_info->vdev_id = arvif_p->vdev_id; + partner_info->hw_link_id = arvif_p->ar->pdev->hw_link_id; + ether_addr_copy(partner_info->addr, link_conf->addr); + ml_arg->num_partner_links++; + partner_info++; + } + rcu_read_unlock(); +} + static int -ath12k_mac_vdev_start_restart(struct ath12k_vif *arvif, +ath12k_mac_vdev_config_after_start(struct ath12k_link_vif *arvif, + const struct cfg80211_chan_def *chandef) +{ + struct ath12k_vif *ahvif = arvif->ahvif; + struct ath12k *ar = arvif->ar; + struct ath12k_base *ab = ar->ab; + int ret; + unsigned int dfs_cac_time; + + lockdep_assert_held(&ar->conf_mutex); + + if (ar->supports_6ghz && + chandef->chan->band == NL80211_BAND_6GHZ && + (ahvif->vdev_type == WMI_VDEV_TYPE_STA || ahvif->vdev_type == WMI_VDEV_TYPE_AP) && + test_bit(WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT, ar->ab->wmi_ab.svc_map)) { + + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA) + ath12k_mac_parse_tx_pwr_env(ar, arvif, &arvif->chanctx); + + ath12k_mac_fill_reg_tpc_info(ar, arvif, &arvif->chanctx); + ath12k_wmi_send_vdev_set_tpc_power(ar, arvif->vdev_id, + &arvif->reg_tpc_info); + } + + /* Enable CAC Flag in the driver by checking all sub-channel's DFS + * state as NL80211_DFS_USABLE which indicates CAC needs to be + * done before channel usage. This flags is used to drop rx packets. + * during CAC. + */ + /* TODO Set the flag for other interface types as required */ + if (ahvif->vdev_type == WMI_VDEV_TYPE_AP && arvif->chanctx.radar_enabled && + cfg80211_chandef_dfs_usable(ar->ah->hw->wiphy, chandef)) { + set_bit(ATH12K_CAC_RUNNING, &ar->dev_flags); + dfs_cac_time = cfg80211_chandef_dfs_cac_time(ar->ah->hw->wiphy, + chandef/*, false, false */); + ath12k_dbg(ab, ATH12K_DBG_MAC, + "CAC (for %u ms) Started in center_freq %d center_freq1 %d for vdev %d\n", + dfs_cac_time, chandef->chan->center_freq, + chandef->center_freq1, arvif->vdev_id); + } + + ret = ath12k_mac_set_txbf_conf(arvif); + if (ret) + ath12k_warn(ab, "failed to set txbf conf for vdev %d: %d\n", + arvif->vdev_id, ret); + + ret = ath12k_mac_set_6g_nonht_dup_conf(arvif, chandef); + if (ret) + ath12k_warn(ab, "failed to set 6G non-ht dup conf for vdev %d: %d\n", + arvif->vdev_id, ret); + /* In case of ADFS, we have to abort ongoing backgrorund CAC */ + if ((ar->pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP) && + test_bit(ar->cfg_rx_chainmask, &ar->pdev->cap.adfs_chain_mask) && + ar->agile_chandef.chan) { + ath12k_dbg(ab, ATH12K_DBG_MAC, + "Aborting ongoing Agile DFS on freq %d", + ar->agile_chandef.chan->center_freq); + ret = ath12k_wmi_vdev_adfs_ocac_abort_cmd_send(ar,arvif->vdev_id); + if (!ret) { + memset(&ar->agile_chandef, 0, sizeof(struct cfg80211_chan_def)); + ar->agile_chandef.chan = NULL; + ath12k_mac_background_dfs_event(ar, ATH12K_BGDFS_ABORT); + } else { + ath12k_warn(ab, "failed to abort agile CAC for vdev %d", + arvif->vdev_id); + } + } + + return ret; +} + +static int ath12k_mac_vdev_start_restart(struct ath12k_link_vif *arvif, const struct cfg80211_chan_def *chandef, - bool restart) + bool restart, bool radar_enabled) { + struct ath12k_vif *ahvif = arvif->ahvif; struct ath12k *ar = arvif->ar; struct ath12k_base *ab = ar->ab; struct wmi_vdev_start_req_arg arg = {}; - int he_support = arvif->vif->bss_conf.he_support; int ret; lockdep_assert_held(&ar->conf_mutex); @@ -5449,50 +11954,66 @@ arg.dtim_period = arvif->dtim_period; arg.bcn_intval = arvif->beacon_interval; - arg.freq = chandef->chan->center_freq; - arg.band_center_freq1 = chandef->center_freq1; - arg.band_center_freq2 = chandef->center_freq2; - arg.mode = ath12k_phymodes[chandef->chan->band][chandef->width]; - - arg.min_power = 0; - arg.max_power = chandef->chan->max_power * 2; - arg.max_reg_power = chandef->chan->max_reg_power * 2; - arg.max_antenna_gain = chandef->chan->max_antenna_gain * 2; + arg.channel.freq = chandef->chan->center_freq; + arg.channel.band_center_freq1 = chandef->center_freq1; + arg.channel.band_center_freq2 = chandef->center_freq2; + arg.channel.mode = + ath12k_phymodes[chandef->chan->band][chandef->width]; + + arg.channel.min_power = 0; + arg.channel.max_power = chandef->chan->max_power; + arg.channel.max_reg_power = chandef->chan->max_reg_power; + arg.channel.max_antenna_gain = chandef->chan->max_antenna_gain; + arg.ru_punct_bitmap = ~chandef->ru_punct_bitmap; + if (test_bit(WMI_TLV_SERVICE_SW_PROG_DFS_SUPPORT, + ar->ab->wmi_ab.svc_map)) { +#if 0 + arg.width_device = chandef->width_device; + arg.center_freq_device = chandef->center_freq_device; +#endif + } arg.pref_tx_streams = ar->num_tx_chains; arg.pref_rx_streams = ar->num_rx_chains; - if (arvif->vdev_type == WMI_VDEV_TYPE_AP) { - arg.ssid = arvif->u.ap.ssid; - arg.ssid_len = arvif->u.ap.ssid_len; - arg.hidden_ssid = arvif->u.ap.hidden_ssid; + arg.mbssid_flags = 0; + arg.mbssid_tx_vdev_id = 0; + if (test_bit(WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT, + ar->ab->wmi_ab.svc_map)) { + ret = ath12k_mac_setup_vdev_args_mbssid(arvif, + &arg.mbssid_flags, + &arg.mbssid_tx_vdev_id); + if (ret) + return ret; + } + + if (ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + arg.ssid = ahvif->u.ap.ssid; + arg.ssid_len = ahvif->u.ap.ssid_len; + arg.hidden_ssid = ahvif->u.ap.hidden_ssid; /* For now allow DFS for AP mode */ - arg.chan_radar = !!(chandef->chan->flags & IEEE80211_CHAN_RADAR); + arg.channel.chan_radar = + !!(chandef->chan->flags & IEEE80211_CHAN_RADAR); + arg.channel.freq2_radar = radar_enabled; - arg.passive = arg.chan_radar; + + arg.channel.passive = arg.channel.chan_radar; spin_lock_bh(&ab->base_lock); arg.regdomain = ar->ab->dfs_region; spin_unlock_bh(&ab->base_lock); - - /* TODO: Notify if secondary 80Mhz also needs radar detection */ - if (he_support) { - ret = ath12k_set_he_mu_sounding_mode(ar, arvif); - if (ret) { - ath12k_warn(ar->ab, "failed to set he mode vdev %i\n", - arg.vdev_id); - return ret; - } - } } - arg.passive |= !!(chandef->chan->flags & IEEE80211_CHAN_NO_IR); + arg.channel.passive |= !!(chandef->chan->flags & IEEE80211_CHAN_NO_IR); + + if (!restart) + ath12k_mac_mlo_get_vdev_args(arvif, &arg.ml); ath12k_dbg(ab, ATH12K_DBG_MAC, - "mac vdev %d start center_freq %d phymode %s\n", - arg.vdev_id, arg.freq, - ath12k_mac_phymode_str(arg.mode)); + "mac vdev %d start center_freq %d punct bitmap 0x%x phymode %s\n", + arg.vdev_id, arg.channel.freq, arg.ru_punct_bitmap, + ath12k_mac_phymode_str(arg.channel.mode)); ret = ath12k_wmi_vdev_start(ar, &arg, restart); if (ret) { @@ -5507,85 +12028,198 @@ arg.vdev_id, restart ? "restart" : "start", ret); return ret; } - + arvif->vdev_stop_notify_done = false; ar->num_started_vdevs++; ath12k_dbg(ab, ATH12K_DBG_MAC, "vdev %pM started, vdev_id %d\n", - arvif->vif->addr, arvif->vdev_id); + arvif->addr, arvif->vdev_id); - /* Enable CAC Flag in the driver by checking the channel DFS cac time, - * i.e dfs_cac_ms value which will be valid only for radar channels - * and state as NL80211_DFS_USABLE which indicates CAC needs to be - * done before channel usage. This flags is used to drop rx packets. - * during CAC. - */ - /* TODO: Set the flag for other interface types as required */ - if (arvif->vdev_type == WMI_VDEV_TYPE_AP && - chandef->chan->dfs_cac_ms && - chandef->chan->dfs_state == NL80211_DFS_USABLE) { - set_bit(ATH12K_CAC_RUNNING, &ar->dev_flags); - ath12k_dbg(ab, ATH12K_DBG_MAC, - "CAC Started in chan_freq %d for vdev %d\n", - arg.freq, arg.vdev_id); - } - - ret = ath12k_mac_set_txbf_conf(arvif); + ret = ath12k_mac_vdev_config_after_start(arvif, chandef); if (ret) - ath12k_warn(ab, "failed to set txbf conf for vdev %d: %d\n", - arvif->vdev_id, ret); + ath12k_warn(ab, "failed to configure vdev %d after %s: %d\n", + arvif->vdev_id, + restart ? "restart" : "start", ret); return 0; } -static int ath12k_mac_vdev_stop(struct ath12k_vif *arvif) +int ath12k_mac_vdev_start(struct ath12k_link_vif *arvif, + const struct cfg80211_chan_def *chandef, + bool radar_enabled) { - struct ath12k *ar = arvif->ar; - int ret; + return ath12k_mac_vdev_start_restart(arvif, chandef, false, + radar_enabled); +} - lockdep_assert_held(&ar->conf_mutex); +static int ath12k_mac_vdev_restart(struct ath12k_link_vif *arvif, + const struct cfg80211_chan_def *chandef, + bool pseudo_restart, bool radar_enabled) +{ + struct ath12k_base *ab = arvif->ar->ab; + int ret; - reinit_completion(&ar->vdev_setup_done); + if(!pseudo_restart) + return ath12k_mac_vdev_start_restart(arvif, chandef, true, + radar_enabled); - ret = ath12k_wmi_vdev_stop(ar, arvif->vdev_id); + ret = ath12k_mac_vdev_stop(arvif); if (ret) { - ath12k_warn(ar->ab, "failed to stop WMI vdev %i: %d\n", + ath12k_warn(ab, "failed to stop vdev %d: %d during restart\n", arvif->vdev_id, ret); - goto err; + return ret; } - ret = ath12k_mac_vdev_setup_sync(ar); + ret = ath12k_mac_vdev_start(arvif, chandef, radar_enabled); if (ret) { - ath12k_warn(ar->ab, "failed to synchronize setup for vdev %i: %d\n", + ath12k_warn(ab, "failed to start vdev %d: %d during restart\n", arvif->vdev_id, ret); - goto err; + return ret; } - WARN_ON(ar->num_started_vdevs == 0); + return ret; +} - ar->num_started_vdevs--; - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "vdev %pM stopped, vdev_id %d\n", - arvif->vif->addr, arvif->vdev_id); +static void +ath12k_mac_update_peer_ru_punct_bitmap_iter(void *data, + struct ieee80211_sta *sta) +{ + struct ath12k_link_vif *arvif = data; + struct ath12k *ar = arvif->ar; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_link_sta *arsta; + struct ieee80211_link_sta *link_sta; + u8 link_id = arvif->link_id; - if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) { - clear_bit(ATH12K_CAC_RUNNING, &ar->dev_flags); - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "CAC Stopped for vdev %d\n", - arvif->vdev_id); + if (ahsta->ahvif != arvif->ahvif) + return; + + /* Check if there is a link sta in the vif link */ + if (!(BIT(link_id) & ahsta->links_map)) + return; + + arsta = ahsta->link[link_id]; + link_sta = ath12k_get_link_sta(arsta); + if (!link_sta) { + ath12k_warn(ar->ab, "unable to access link sta in peer ru punct bitmap update\n"); + return; } - return 0; -err: - return ret; + /* Puncturing in only applicable for EHT supported peers */ + if (!link_sta->he_cap.has_he || !link_sta->eht_cap.has_eht) + return; + + spin_lock_bh(&ar->data_lock); + /* RC_BW_CHANGED handler has infra already to send the bitmap. + * Hence we can leverage from the same flag + */ + arsta->changed |= IEEE80211_RC_BW_CHANGED; + spin_unlock_bh(&ar->data_lock); + + ieee80211_queue_work(ar->ah->hw, &arsta->update_wk); } -static int ath12k_mac_vdev_start(struct ath12k_vif *arvif, - const struct cfg80211_chan_def *chandef) +void ath12k_mac_update_ru_punct_bitmap(struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *old_ctx, + struct ieee80211_chanctx_conf *new_ctx) { - return ath12k_mac_vdev_start_restart(arvif, chandef, false); + struct ath12k *ar = arvif->ar; + struct ath12k_hw *ah = ar->ah; + + lockdep_assert_held(&ah->conf_mutex); + lockdep_assert_held(&ar->conf_mutex); + + if (old_ctx->def.ru_punct_bitmap == new_ctx->def.ru_punct_bitmap) + return; + + ieee80211_iterate_stations_atomic(ah->hw, + ath12k_mac_update_peer_ru_punct_bitmap_iter, + arvif); } -static int ath12k_mac_vdev_restart(struct ath12k_vif *arvif, - const struct cfg80211_chan_def *chandef) +static int ath12k_vdev_restart_sequence(struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *new_ctx, + u64 vif_down_failed_map, + int vdev_index) { - return ath12k_mac_vdev_start_restart(arvif, chandef, true); + struct ath12k *ar = arvif->ar; + struct ath12k_link_vif *tx_arvif; + struct ath12k_vif *tx_ahvif; + struct ieee80211_bss_conf *link; + struct ieee80211_chanctx_conf old_chanctx; + struct vdev_up_params params = { 0 }; + int ret = -EINVAL; + struct ath12k_vif *ahvif = arvif->ahvif; + + spin_lock_bh(&ar->data_lock); + old_chanctx = arvif->chanctx; + memcpy(&arvif->chanctx, new_ctx, sizeof(*new_ctx)); + spin_unlock_bh(&ar->data_lock); + + /* vdev is already restarted via mvr, need to setup + * certain config alone after restart */ + if (vdev_index == -1) { + ret = ath12k_mac_vdev_config_after_start(arvif, &new_ctx->def); + if (!ret) + goto beacon_tmpl_setup; + } else if (vif_down_failed_map & BIT_ULL(vdev_index)) { + ret = ath12k_mac_vdev_restart(arvif, &new_ctx->def, false, + new_ctx->radar_enabled); + } else { + ret = ath12k_mac_vdev_restart(arvif, &new_ctx->def, true, + new_ctx->radar_enabled); + } + + if (ret) { + ath12k_warn(ar->ab, "failed to restart vdev %d: %d\n", + arvif->vdev_id, ret); + spin_lock_bh(&ar->data_lock); + arvif->chanctx = old_chanctx; + spin_unlock_bh(&ar->data_lock); + return ret; + } + +beacon_tmpl_setup: + ath12k_mac_update_ru_punct_bitmap(arvif, &old_chanctx, new_ctx); + + if (arvif->pending_csa_up) + return 0; + + if (!arvif->is_up) + return -EOPNOTSUPP; + + ret = ath12k_mac_setup_bcn_tmpl(arvif); + if (ret) { + ath12k_warn(ar->ab, "failed to update bcn tmpl during csa: %d\n", arvif->vdev_id); + return ret; + } + + params.vdev_id = arvif->vdev_id; + params.aid = ahvif->aid; + params.bssid = arvif->bssid; + rcu_read_lock(); + link = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]); + if (link->mbssid_tx_vif) { + tx_ahvif = (void *)link->mbssid_tx_vif->drv_priv; + tx_arvif = tx_ahvif->link[link->mbssid_tx_vif_linkid]; + params.tx_bssid = tx_arvif->bssid; + params.profile_idx = ahvif->vif->bss_conf.bssid_index; + params.profile_count = BIT(link->bssid_indicator); + } + + if (ahvif->vif->type == NL80211_IFTYPE_STATION && link->nontransmitted) { + params.profile_idx = link->bssid_index; + params.profile_count = BIT(link->bssid_indicator) - 1; + params.tx_bssid = link->transmitter_bssid; + } + + rcu_read_unlock(); + ret = ath12k_wmi_vdev_up(arvif->ar, ¶ms); + if (ret) { + ath12k_warn(ar->ab, "failed to bring vdev up %d: %d\n", + arvif->vdev_id, ret); + return ret; + } + + return ret; } struct ath12k_mac_change_chanctx_arg { @@ -5593,30 +12227,74 @@ struct ieee80211_vif_chanctx_switch *vifs; int n_vifs; int next_vif; + bool csa_active; + struct ath12k *ar; }; static void ath12k_mac_change_chanctx_cnt_iter(void *data, u8 *mac, struct ieee80211_vif *vif) { + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_link_vif *arvif; struct ath12k_mac_change_chanctx_arg *arg = data; + u8 link_id; + struct ieee80211_bss_conf *link_conf; + struct ath12k_hw *ah = ahvif->ah; - if (rcu_access_pointer(vif->bss_conf.chanctx_conf) != arg->ctx) - return; + lockdep_assert_held(&ah->conf_mutex); + + for_each_set_bit(link_id, &ahvif->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + + if (WARN_ON(arvif == NULL)) + continue; + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (WARN_ON(link_conf == NULL)) + continue; + + if ((rcu_access_pointer(link_conf->chanctx_conf) != arg->ctx) || + (arvif->ar != arg->ar)) + continue; + + if (link_conf->csa_active) + arg->csa_active = true; arg->n_vifs++; } +} static void ath12k_mac_change_chanctx_fill_iter(void *data, u8 *mac, struct ieee80211_vif *vif) { + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + struct ath12k_link_vif *arvif; struct ath12k_mac_change_chanctx_arg *arg = data; struct ieee80211_chanctx_conf *ctx; + u8 link_id; + struct ieee80211_bss_conf *link_conf; + struct ath12k_hw *ah = ahvif->ah; - ctx = rcu_access_pointer(vif->bss_conf.chanctx_conf); - if (ctx != arg->ctx) - return; + lockdep_assert_held(&ah->conf_mutex); + + for_each_set_bit(link_id, &ahvif->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + + if (WARN_ON(arvif == NULL)) + continue; + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (WARN_ON(link_conf == NULL)) + continue; + + ctx = rcu_access_pointer(link_conf->chanctx_conf); + if ((ctx != arg->ctx) || + (arvif->ar != arg->ar)) + continue; if (WARN_ON(arg->next_vif == arg->n_vifs)) return; @@ -5624,8 +12302,179 @@ arg->vifs[arg->next_vif].vif = vif; arg->vifs[arg->next_vif].old_ctx = ctx; arg->vifs[arg->next_vif].new_ctx = ctx; + arg->vifs[arg->next_vif].link_conf = link_conf; arg->next_vif++; } +} + +static void ath12k_mac_num_chanctxs_iter(struct ieee80211_hw *hw, + struct ieee80211_chanctx_conf *conf, + void *data) +{ + struct ath12k_mac_num_chanctxs_arg *arg = + (struct ath12k_mac_num_chanctxs_arg *)data; + struct ath12k *ctx_ar, *ar = arg->ar; + + ctx_ar = ath12k_get_ar_by_ctx(ar->ah->hw, conf); + + if (ctx_ar == ar) + arg->num++; +} + +static int ath12k_mac_num_chanctxs(struct ath12k *ar) +{ + struct ath12k_mac_num_chanctxs_arg arg = { .ar = ar, .num = 0}; + + ieee80211_iter_chan_contexts_atomic(ar->ah->hw, + ath12k_mac_num_chanctxs_iter, + &arg); + + return arg.num; +} + +static void ath12k_mac_update_rx_channel(struct ath12k *ar, + struct ieee80211_chanctx_conf *ctx, + struct ieee80211_vif_chanctx_switch *vifs, + int n_vifs) +{ + struct ath12k_mac_any_chandef_arg arg = { .ar = ar, .def = NULL}; + + /* Both locks are required because ar->rx_channel is modified. This + * allows readers to hold either lock. + */ + lockdep_assert_held(&ar->conf_mutex); + lockdep_assert_held(&ar->data_lock); + + WARN_ON(ctx && vifs); + WARN_ON(vifs && !n_vifs); + + /* FIXME: Sort of an optimization and a workaround. Peers and vifs are + * on a linked list now. Doing a lookup peer -> vif -> chanctx for each + * ppdu on Rx may reduce performance on low-end systems. It should be + * possible to make tables/hashmaps to speed the lookup up (be vary of + * cpu data cache lines though regarding sizes) but to keep the initial + * implementation simple and less intrusive fallback to the slow lookup + * only for multi-channel cases. Single-channel cases will remain to + * use the old channel derival and thus performance should not be + * affected much. + */ + rcu_read_lock(); + if (!ctx && ath12k_mac_num_chanctxs(ar) == 1) { + ieee80211_iter_chan_contexts_atomic(ar->ah->hw, + ath12k_mac_get_any_chandef_iter, + &arg); + if (vifs) + ar->rx_channel = vifs[0].new_ctx->def.chan; + else if (arg.def) + ar->rx_channel = arg.def->chan; + else + ar->rx_channel = NULL; + } else if ((ctx && ath12k_mac_num_chanctxs(ar) == 0) || + (ctx && (ar->state == ATH12K_STATE_RESTARTED))) { + /* During driver restart due to firmware assert, since mac80211 + * already has valid channel context for given radio, channel + * context iteration return num_chanctx > 0. So fix rx_channel + * when restart is in progress. + */ + ar->rx_channel = ctx->def.chan; + } else { + ar->rx_channel = NULL; + } + rcu_read_unlock(); + ar->chan_tx_pwr = ATH12K_PDEV_TX_POWER_INVALID; +} + +static int +ath12k_mac_multi_vdev_restart(struct ath12k *ar, + const struct cfg80211_chan_def *chandef, + u32 *vdev_id, int len, + bool radar_enabled) +{ + struct ath12k_base *ab = ar->ab; + struct wmi_pdev_multiple_vdev_restart_req_arg arg = {}; + int ret, i; + + lockdep_assert_held(&ar->conf_mutex); + + arg.vdev_ids.id_len = len; + + for (i = 0; i < len; i++) + arg.vdev_ids.id[i] = vdev_id[i]; + + arg.channel.freq = chandef->chan->center_freq; + arg.channel.band_center_freq1 = chandef->center_freq1; + arg.channel.band_center_freq2 = chandef->center_freq2; + arg.channel.mode = + ath12k_phymodes[chandef->chan->band][chandef->width]; + + arg.channel.min_power = 0; + arg.channel.max_power = chandef->chan->max_power; + arg.channel.max_reg_power = chandef->chan->max_reg_power; + arg.channel.max_antenna_gain = chandef->chan->max_antenna_gain; + arg.channel.chan_radar = !!(chandef->chan->flags & IEEE80211_CHAN_RADAR); + arg.channel.passive = arg.channel.chan_radar; + arg.channel.freq2_radar = radar_enabled; + arg.channel.passive |= !!(chandef->chan->flags & IEEE80211_CHAN_NO_IR); + arg.ru_punct_bitmap = ~chandef->ru_punct_bitmap; + + if (test_bit(WMI_TLV_SERVICE_SW_PROG_DFS_SUPPORT, + ar->ab->wmi_ab.svc_map)) { +#if 0 + arg.width_device = chandef->width_device; + arg.center_freq_device = chandef->center_freq_device; +#endif + } + + ret = ath12k_wmi_pdev_multiple_vdev_restart(ar, &arg); + if (ret) + ath12k_warn(ab, "mac failed to do mvr (%d)\n", ret); + + return ret; +} + +static void +ath12k_mac_update_vif_chan_extras(struct ath12k *ar, + struct ieee80211_vif_chanctx_switch *vifs, + int n_vifs) +{ + struct ath12k_base *ab = ar->ab; + struct cfg80211_chan_def *chandef; + lockdep_assert_held(&ar->conf_mutex); + + chandef = &vifs[0].new_ctx->def; + + spin_lock_bh(&ar->data_lock); + if (ar->awgn_intf_handling_in_prog && chandef) { + if (!ar->chan_bw_interference_bitmap || + (ar->chan_bw_interference_bitmap & WMI_DCS_SEG_PRI20)) { + if (ar->awgn_chandef.chan->center_freq != + chandef->chan->center_freq) { + ar->awgn_intf_handling_in_prog = false; + ath12k_dbg(ab, ATH12K_DBG_MAC, + "AWGN : channel switch completed\n"); + } else { + ath12k_warn(ab, "AWGN : channel switch is not done, freq : %d\n", + ar->awgn_chandef.chan->center_freq); + } + } else { + if ((ar->awgn_chandef.chan->center_freq == + chandef->chan->center_freq) && + (ar->awgn_chandef.width != chandef->width)) { + ath12k_dbg(ab, ATH12K_DBG_MAC, + "AWGN : BW reduction is complete\n"); + ar->awgn_intf_handling_in_prog = false; + } else { + ath12k_warn(ab, "AWGN : awgn_freq : %d chan_freq %d" + " awgn_width %d chan_width %d\n", + ar->awgn_chandef.chan->center_freq, + chandef->chan->center_freq, + ar->awgn_chandef.width, + chandef->width); + } + } + } + spin_unlock_bh(&ar->data_lock); +} static void ath12k_mac_update_vif_chan(struct ath12k *ar, @@ -5633,18 +12482,31 @@ int n_vifs) { struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif; + struct ath12k_link_vif *arvif, *tx_arvif; + struct ath12k_vif *ahvif, *tx_ahvif = NULL; int ret; - int i; - bool monitor_vif = false; + int i, trans_vdev_index; + u64 vif_down_failed_map = 0; + struct ieee80211_vif *tx_vif; + struct ieee80211_bss_conf *link; + + /* Each vif is mapped to each bit of vif_down_failed_map. */ + if (n_vifs > sizeof(vif_down_failed_map)*__CHAR_BIT__) { + ath12k_warn(ar->ab, "%d n_vifs are not supported currently\n", + n_vifs); + return; + } lockdep_assert_held(&ar->conf_mutex); + tx_arvif = NULL; + for (i = 0; i < n_vifs; i++) { - arvif = (void *)vifs[i].vif->drv_priv; + ahvif = (void *)vifs[i].vif->drv_priv; + arvif = ahvif->link[vifs[i].link_conf->link_id]; - if (vifs[i].vif->type == NL80211_IFTYPE_MONITOR) - monitor_vif = true; + if (WARN_ON(!arvif)) + continue; ath12k_dbg(ab, ATH12K_DBG_MAC, "mac chanctx switch vdev_id %i freq %u->%u width %d->%d\n", @@ -5654,88 +12516,289 @@ vifs[i].old_ctx->def.width, vifs[i].new_ctx->def.width); - if (WARN_ON(!arvif->is_started)) + if (!arvif->is_started) { + memcpy(&arvif->chanctx, vifs[i].new_ctx, sizeof(*vifs[i].new_ctx)); continue; + } - if (WARN_ON(!arvif->is_up)) + if (!arvif->is_up) continue; + if (vifs[i].link_conf->mbssid_tx_vif && + ahvif == (struct ath12k_vif *)vifs[i].link_conf->mbssid_tx_vif->drv_priv) { + tx_vif = vifs[i].link_conf->mbssid_tx_vif; + tx_ahvif = ath12k_vif_to_ahvif(tx_vif); + tx_arvif = tx_ahvif->link[vifs[i].link_conf->mbssid_tx_vif_linkid]; + trans_vdev_index = i; + } + ret = ath12k_wmi_vdev_down(ar, arvif->vdev_id); if (ret) { + vif_down_failed_map |= BIT_ULL(i); ath12k_warn(ab, "failed to down vdev %d: %d\n", arvif->vdev_id, ret); continue; } } - /* All relevant vdevs are downed and associated channel resources - * should be available for the channel switch now. - */ + ath12k_mac_update_rx_channel(ar, NULL, vifs, n_vifs); + + if (tx_arvif) { + rcu_read_lock(); + link = rcu_dereference(tx_ahvif->vif->link_conf[tx_arvif->link_id]); + + if (link->csa_active && tx_arvif->ahvif->vdev_type == WMI_VDEV_TYPE_AP) + tx_arvif->pending_csa_up = true; - /* TODO: Update ar->rx_channel */ + rcu_read_unlock(); + + ret = ath12k_vdev_restart_sequence(tx_arvif, + vifs[trans_vdev_index].new_ctx, + vif_down_failed_map, + trans_vdev_index); + + if (ret) + ath12k_warn(ab, "failed to restart vdev:%d: %d\n", + tx_arvif->vdev_id, ret); + } for (i = 0; i < n_vifs; i++) { - arvif = (void *)vifs[i].vif->drv_priv; + ahvif = (void *)vifs[i].vif->drv_priv; + arvif = ahvif->link[vifs[i].link_conf->link_id]; - if (WARN_ON(!arvif->is_started)) + if (WARN_ON(!arvif)) continue; - if (WARN_ON(!arvif->is_up)) + if (vifs[i].link_conf->mbssid_tx_vif && + arvif == tx_arvif) continue; - ret = ath12k_mac_vdev_restart(arvif, &vifs[i].new_ctx->def); - if (ret) { - ath12k_warn(ab, "failed to restart vdev %d: %d\n", + rcu_read_lock(); + link = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]); + + if (link->csa_active && arvif->ahvif->vdev_type == WMI_VDEV_TYPE_AP) + arvif->pending_csa_up = true; + + rcu_read_unlock(); + + ret = ath12k_vdev_restart_sequence(arvif, + vifs[i].new_ctx, + vif_down_failed_map, i); + + if (ret && ret != -EOPNOTSUPP) { + ath12k_warn(ab, "failed to bring up vdev %d: %d\n", arvif->vdev_id, ret); + } + } +} + +static void +ath12k_mac_update_vif_chan_mvr(struct ath12k *ar, + struct ieee80211_vif_chanctx_switch *vifs, + int n_vifs) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_link_vif *arvif, *tx_arvif = NULL; + struct ath12k_vif *ahvif, *tx_ahvif = NULL; + struct cfg80211_chan_def *chandef; + struct ieee80211_vif *tx_vif; + int ret, i, time_left, trans_vdev_index, vdev_idx, n_vdevs = 0; + u32 vdev_ids[TARGET_NUM_VDEVS]; + struct ieee80211_bss_conf *link; + bool monitor_vif = false; + int k; + + lockdep_assert_held(&ar->conf_mutex); + + chandef = &vifs[0].new_ctx->def; + tx_arvif = NULL; + + ath12k_dbg(ab, ATH12K_DBG_MAC, "mac chanctx switch via mvr"); + + ath12k_mac_update_rx_channel(ar, NULL, vifs, n_vifs); + + for (i = 0; i < n_vifs; i++) { + ahvif = (void *)vifs[i].vif->drv_priv; + arvif = ahvif->link[vifs[i].link_conf->link_id]; + + if (WARN_ON(!arvif)) + continue; + + ath12k_dbg(ab, ATH12K_DBG_MAC, + "mac chanctx switch vdev_id %i freq %u->%u width %d->%d\n", + arvif->vdev_id, + vifs[i].old_ctx->def.chan->center_freq, + vifs[i].new_ctx->def.chan->center_freq, + vifs[i].old_ctx->def.width, + vifs[i].new_ctx->def.width); + + if (!arvif->is_started) { + memcpy(&arvif->chanctx, vifs[i].new_ctx, sizeof(*vifs[i].new_ctx)); continue; } - ret = ath12k_mac_setup_bcn_tmpl(arvif); - if (ret) - ath12k_warn(ab, "failed to update bcn tmpl during csa: %d\n", - ret); + if (vifs[i].link_conf->mbssid_tx_vif && + ahvif == (struct ath12k_vif *)vifs[i].link_conf->mbssid_tx_vif->drv_priv) { + tx_vif = vifs[i].link_conf->mbssid_tx_vif; + tx_ahvif = ath12k_vif_to_ahvif(tx_vif); + tx_arvif = tx_ahvif->link[vifs[i].link_conf->mbssid_tx_vif_linkid]; + trans_vdev_index = i; + } + + arvif->mvr_processing = true; + vdev_ids[n_vdevs++] = arvif->vdev_id; + } + + for (k = 0; k < n_vifs; k++) { + if (vifs[k].vif->type == NL80211_IFTYPE_MONITOR) { + monitor_vif = true; + break; + } + } + if (!monitor_vif && + test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) { + vdev_ids[n_vdevs++] = ar->monitor_vdev_id; + } - ret = ath12k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid, - arvif->bssid); + if (!n_vdevs) { + ath12k_dbg(ab, ATH12K_DBG_MAC, + "mac 0 vdevs available to switch chan ctx via mvr\n"); + return; + } + + reinit_completion(&ar->mvr_complete); + + ret = ath12k_mac_multi_vdev_restart(ar, chandef, vdev_ids, n_vdevs, + vifs[0].new_ctx->radar_enabled); if (ret) { - ath12k_warn(ab, "failed to bring vdev up %d: %d\n", - arvif->vdev_id, ret); - continue; + ath12k_warn(ab, "mac failed to send mvr command (%d)\n", ret); + return; } + + time_left = wait_for_completion_timeout(&ar->mvr_complete, + WMI_MVR_CMD_TIMEOUT_HZ); + if (!time_left) { + ath12k_err(ar->ab, "mac mvr cmd response timed out\n"); + /* fallback to restarting one-by-one */ + return ath12k_mac_update_vif_chan(ar, vifs, n_vifs); + } + + if (tx_arvif) { + vdev_idx = -1; + + if (tx_arvif->mvr_processing) { + /* failed to restart tx vif via mvr, fallback */ + arvif->mvr_processing = false; + vdev_idx = trans_vdev_index; + ath12k_err(ab, + "mac failed to restart mbssid tx vdev %d via mvr cmd\n", + tx_arvif->vdev_id); } - /* Restart the internal monitor vdev on new channel */ - if (!monitor_vif && ar->monitor_vdev_created) { - if (!ath12k_mac_monitor_stop(ar)) - ath12k_mac_monitor_start(ar); + rcu_read_lock(); + link = rcu_dereference(tx_ahvif->vif->link_conf[tx_arvif->link_id]); + + if (link->csa_active && tx_arvif->ahvif->vdev_type == WMI_VDEV_TYPE_AP) + tx_arvif->pending_csa_up = true; + + rcu_read_unlock(); + + ret = ath12k_vdev_restart_sequence(tx_arvif, + vifs[trans_vdev_index].new_ctx, + BIT_ULL(trans_vdev_index), + vdev_idx); + if (ret) + ath12k_warn(ab, + "mac failed to bring up mbssid tx vdev %d after mvr (%d)\n", + tx_arvif->vdev_id, ret); } + + for (i = 0; i < n_vifs; i++) { + ahvif = (void *)vifs[i].vif->drv_priv; + arvif = ahvif->link[vifs[i].link_conf->link_id]; + + if (WARN_ON(!arvif)) + continue; + + vdev_idx = -1; + + if (vifs[i].link_conf->mbssid_tx_vif && arvif == tx_arvif) + continue; + + if (arvif->mvr_processing) { + /* failed to restart vdev via mvr, fallback */ + arvif->mvr_processing = false; + vdev_idx = i; + ath12k_err(ab, "mac failed to restart vdev %d via mvr cmd\n", + arvif->vdev_id); + } + + rcu_read_lock(); + link = rcu_dereference(ahvif->vif->link_conf[arvif->link_id]); + + if (link->csa_active && arvif->ahvif->vdev_type == WMI_VDEV_TYPE_AP) + arvif->pending_csa_up = true; + + rcu_read_unlock(); + + ret = ath12k_vdev_restart_sequence(arvif, vifs[i].new_ctx, + BIT_ULL(i), vdev_idx); + if (ret && ret != -EOPNOTSUPP) + ath12k_warn(ab, "mac failed to bring up vdev %d after mvr (%d)\n", + arvif->vdev_id, ret); + } +} + +static void +ath12k_mac_process_update_vif_chan(struct ath12k *ar, + struct ieee80211_vif_chanctx_switch *vifs, + int n_vifs) +{ + struct ath12k_base *ab = ar->ab; + + lockdep_assert_held(&ar->conf_mutex); + + /* should not happen */ + if (WARN_ON(n_vifs > TARGET_NUM_VDEVS)) + return; + + if (ath12k_wmi_is_mvr_supported(ab)) + ath12k_mac_update_vif_chan_mvr(ar, vifs, n_vifs); + else + ath12k_mac_update_vif_chan(ar, vifs, n_vifs); + + ath12k_mac_update_vif_chan_extras(ar, vifs, n_vifs); } static void ath12k_mac_update_active_vif_chan(struct ath12k *ar, struct ieee80211_chanctx_conf *ctx) { - struct ath12k_mac_change_chanctx_arg arg = { .ctx = ctx }; + struct ath12k_mac_change_chanctx_arg arg = { .ctx = ctx, + .csa_active = false, + .ar = ar }; + struct ath12k_hw *ah = ar->ah; lockdep_assert_held(&ar->conf_mutex); - ieee80211_iterate_active_interfaces_atomic(ar->hw, + ieee80211_iterate_active_interfaces_atomic(ah->hw, IEEE80211_IFACE_ITER_NORMAL, ath12k_mac_change_chanctx_cnt_iter, &arg); - if (arg.n_vifs == 0) + + if (arg.n_vifs == 0 || arg.csa_active) return; arg.vifs = kcalloc(arg.n_vifs, sizeof(arg.vifs[0]), GFP_KERNEL); if (!arg.vifs) return; - ieee80211_iterate_active_interfaces_atomic(ar->hw, + ieee80211_iterate_active_interfaces_atomic(ah->hw, IEEE80211_IFACE_ITER_NORMAL, ath12k_mac_change_chanctx_fill_iter, &arg); - ath12k_mac_update_vif_chan(ar, arg.vifs, arg.n_vifs); + ath12k_mac_process_update_vif_chan(ar, arg.vifs, arg.n_vifs); kfree(arg.vifs); } @@ -5744,8 +12807,21 @@ struct ieee80211_chanctx_conf *ctx, u32 changed) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_base *ab; + + mutex_lock(&ah->conf_mutex); + + ar = ath12k_get_ar_by_ctx(hw, ctx); + + if (!ar) { + ath12k_err(NULL, "unable to determine device for the passed channel ctx\n"); + mutex_unlock(&ah->conf_mutex); + return; + } + + ab = ar->ab; mutex_lock(&ar->conf_mutex); @@ -5759,35 +12835,38 @@ if (WARN_ON(changed & IEEE80211_CHANCTX_CHANGE_CHANNEL)) goto unlock; - if (changed & IEEE80211_CHANCTX_CHANGE_WIDTH) + if (changed & IEEE80211_CHANCTX_CHANGE_WIDTH || + changed & IEEE80211_CHANCTX_CHANGE_RADAR) ath12k_mac_update_active_vif_chan(ar, ctx); /* TODO: Recalc radar detection */ unlock: mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); } -static int ath12k_start_vdev_delay(struct ieee80211_hw *hw, +static int ath12k_start_vdev_delay(struct ath12k *ar, struct ieee80211_vif *vif) { - struct ath12k *ar = hw->priv; struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif = &ahvif->deflink; int ret; if (WARN_ON(arvif->is_started)) return -EBUSY; - ret = ath12k_mac_vdev_start(arvif, &arvif->chanctx.def); + ret = ath12k_mac_vdev_start(arvif, &arvif->chanctx.def, + arvif->chanctx.radar_enabled); if (ret) { ath12k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n", - arvif->vdev_id, vif->addr, + arvif->vdev_id, arvif->addr, arvif->chanctx.def.chan->center_freq, ret); return ret; } - if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + if (ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { ret = ath12k_monitor_vdev_up(ar, arvif->vdev_id); if (ret) { ath12k_warn(ab, "failed put monitor up: %d\n", ret); @@ -5801,17 +12880,636 @@ return 0; } +static u8 ath12k_mac_get_tpe_count(u8 txpwr_intrprt, u8 txpwr_cnt) +{ + switch (txpwr_intrprt) { + /* Refer "Table 9-276-Meaning of Maximum Transmit Power Count subfield + * if the Maximum Transmit Power Interpretation subfield is 0 or 2" of + * "IEEE Std 802.11ax 2021". + */ + case IEEE80211_TPE_LOCAL_EIRP: + case IEEE80211_TPE_REG_CLIENT_EIRP: + txpwr_cnt = txpwr_cnt <= 3 ? txpwr_cnt : 3; + txpwr_cnt = txpwr_cnt + 1; + break; + /* Refer "Table 9-277-Meaning of Maximum Transmit Power Count subfield + * if Maximum Transmit Power Interpretation subfield is 1 or 3" of + * "IEEE Std 802.11ax 2021". + */ + case IEEE80211_TPE_LOCAL_EIRP_PSD: + case IEEE80211_TPE_REG_CLIENT_EIRP_PSD: + txpwr_cnt = txpwr_cnt <= 4 ? txpwr_cnt : 4; + txpwr_cnt = txpwr_cnt ? (BIT(txpwr_cnt - 1)) : 1; + break; + } + + return txpwr_cnt; +} + +static u8 ath12k_mac_get_num_pwr_levels(struct cfg80211_chan_def *chan_def) +{ + u8 num_pwr_levels; + + if (chan_def->chan->flags & IEEE80211_CHAN_PSD) { + switch (chan_def->width) { + case NL80211_CHAN_WIDTH_20: + num_pwr_levels = 1; + break; + case NL80211_CHAN_WIDTH_40: + num_pwr_levels = 2; + break; + case NL80211_CHAN_WIDTH_80: + num_pwr_levels = 4; + break; + case NL80211_CHAN_WIDTH_80P80: + case NL80211_CHAN_WIDTH_160: + num_pwr_levels = 8; + break; + case NL80211_CHAN_WIDTH_320: + num_pwr_levels = 16; + break; + default: + return 1; + } + } else { + switch (chan_def->width) { + case NL80211_CHAN_WIDTH_20: + num_pwr_levels = 1; + break; + case NL80211_CHAN_WIDTH_40: + num_pwr_levels = 2; + break; + case NL80211_CHAN_WIDTH_80: + num_pwr_levels = 3; + break; + case NL80211_CHAN_WIDTH_80P80: + case NL80211_CHAN_WIDTH_160: + num_pwr_levels = 4; + break; + case NL80211_CHAN_WIDTH_320: + num_pwr_levels = 5; + break; + default: + return 1; + } + } + + return num_pwr_levels; +} + +static u16 ath12k_mac_get_6g_start_frequency(struct cfg80211_chan_def *chan_def) +{ + u16 diff_seq; + + /* It is to get the lowest channel number's center frequency of the chan. + * For example, + * bandwidth=40MHz, center frequency is 5965, lowest channel is 1 + * with center frequency 5955, its diff is 5965 - 5955 = 10. + * bandwidth=80MHz, center frequency is 5985, lowest channel is 1 + * with center frequency 5955, its diff is 5985 - 5955 = 30. + * bandwidth=160MHz, center frequency is 6025, lowest channel is 1 + * with center frequency 5955, its diff is 6025 - 5955 = 70. + */ + switch (chan_def->width) { + case NL80211_CHAN_WIDTH_320: + diff_seq = 150; + break; + case NL80211_CHAN_WIDTH_160: + diff_seq = 70; + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_80P80: + diff_seq = 30; + break; + case NL80211_CHAN_WIDTH_40: + diff_seq = 10; + break; + default: + diff_seq = 0; + } + + return chan_def->center_freq1 - diff_seq; +} + +static u16 ath12k_mac_get_seg_freq(struct cfg80211_chan_def *chan_def, + u16 start_seq, u8 seq) +{ + u16 seg_seq; + + /* It is to get the center frequency of the specific bandwidth. + * start_seq means the lowest channel number's center freqence. + * seq 0/1/2/3 means 20MHz/40MHz/80MHz/160MHz&80P80. + * For example, + * lowest channel is 1, its center frequency 5955, + * center frequency is 5955 when bandwidth=20MHz, its diff is 5955 - 5955 = 0. + * lowest channel is 1, its center frequency 5955, + * center frequency is 5965 when bandwidth=40MHz, its diff is 5965 - 5955 = 10. + * lowest channel is 1, its center frequency 5955, + * center frequency is 5985 when bandwidth=80MHz, its diff is 5985 - 5955 = 30. + * lowest channel is 1, its center frequency 5955, + * center frequency is 6025 when bandwidth=160MHz, its diff is 6025 - 5955 = 70. + */ + if (chan_def->width == NL80211_CHAN_WIDTH_80P80 && seq == 3) + return chan_def->center_freq2; + + seg_seq = 10 * (BIT(seq) - 1); + return seg_seq + start_seq; +} + +static void ath12k_mac_get_psd_channel(struct ath12k *ar, + u16 step_freq, + u16 *start_freq, + u16 *center_freq, + u8 i, + struct ieee80211_channel **temp_chan, + s8 *tx_power, + u8 reg_6g_power_mode) +{ + /* It is to get the the center frequency for each 20MHz. + * For example, if the chan is 160MHz and center frequency is 6025, + * then it include 8 channels, they are 1/5/9/13/17/21/25/29, + * channel number 1's center frequency is 5955, it is parameter start_freq. + * parameter i is the step of the 8 channels. i is 0~7 for the 8 channels. + * the channel 1/5/9/13/17/21/25/29 maps i=0/1/2/3/4/5/6/7, + * and maps its center frequency is 5955/5975/5995/6015/6035/6055/6075/6095, + * the gap is 20 for each channel, parameter step_freq means the gap. + * after get the center frequency of each channel, it is easy to find the + * struct ieee80211_channel of it and get the max_reg_power. + */ + *center_freq = *start_freq + i * step_freq; + /* -1 to reg_6g_power_mode to make it 0 based indexing */ + *temp_chan = ieee80211_get_channel_khz(ar->ah->hw->wiphy, MHZ_TO_KHZ(*center_freq)); + *tx_power = (*temp_chan)->max_reg_power; +} + +static void ath12k_mac_get_eirp_power(struct ath12k *ar, + u16 *start_freq, + u16 *center_freq, + u8 i, + struct ieee80211_channel **temp_chan, + struct cfg80211_chan_def *def, + s8 *tx_power, + u8 reg_6g_power_mode) +{ + /* It is to get the the center frequency for 40MHz/80MHz/ + * 160MHz&80P80 bandwidth, and then plus 10 to the center frequency, + * it is the center frequency of a channel number. + * For example, when configured channel number is 1. + * center frequency is 5965 when bandwidth=40MHz, after plus 10, it is 5975, + * then it is channel number 5. + * center frequency is 5985 when bandwidth=80MHz, after plus 10, it is 5995, + * then it is channel number 9. + * center frequency is 6025 when bandwidth=160MHz, after plus 10, it is 6035, + * then it is channel number 17. + * after get the center frequency of each channel, it is easy to find the + * struct ieee80211_channel of it and get the max_reg_power. + */ + *center_freq = ath12k_mac_get_seg_freq(def, *start_freq, i); + /* For 20 MHz, no +10 offset is required */ + if (i != 0) + *center_freq += 10; + + /* -1 to reg_6g_power_mode to make it 0 based indexing */ + *temp_chan = ieee80211_get_channel_khz(ar->ah->hw->wiphy, MHZ_TO_KHZ(*center_freq)); + *tx_power = (*temp_chan)->max_reg_power; +} + +void ath12k_mac_fill_reg_tpc_info(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *ctx) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_vif *ahvif = arvif->ahvif; + struct ieee80211_bss_conf *bss_conf; + struct ath12k_reg_tpc_power_info *reg_tpc_info = &arvif->reg_tpc_info; + struct ieee80211_channel *chan, *temp_chan; + u8 pwr_lvl_idx, num_pwr_levels, pwr_reduction; + bool is_psd_power = false, is_tpe_present = false; + s8 max_tx_power[ATH12K_MAX_NUM_PWR_LEVEL], + psd_power, tx_power = 0, eirp_power = 0; + u16 oper_freq = 0, start_freq = 0, center_freq = 0; + u8 reg_6g_power_mode; + + rcu_read_lock(); + + bss_conf = ath12k_get_link_bss_conf(arvif); + + if (!bss_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf in tpc reg fill\n"); + return; + } + + /* For STA, 6g power mode will be present in the beacon, but for AP, + * AP cant parse its own beacon. Hence, we get the 6g power mode + * from the wdev corresponding to the struct ieee80211_vif + */ + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA) { + reg_6g_power_mode = bss_conf->power_type; + if (reg_6g_power_mode == IEEE80211_REG_UNSET_AP) + reg_6g_power_mode = IEEE80211_REG_LPI_AP; + } else if (ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + reg_6g_power_mode = IEEE80211_REG_LPI_AP; + } else + reg_6g_power_mode = IEEE80211_REG_LPI_AP; + + chan = ctx->def.chan; + oper_freq = ctx->def.chan->center_freq; + start_freq = ath12k_mac_get_6g_start_frequency(&ctx->def); + pwr_reduction = bss_conf->pwr_reduction; + + rcu_read_unlock(); + + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA && + arvif->reg_tpc_info.num_pwr_levels) { + is_tpe_present = true; + num_pwr_levels = arvif->reg_tpc_info.num_pwr_levels; + } else { + num_pwr_levels = ath12k_mac_get_num_pwr_levels(&ctx->def); + } + + for (pwr_lvl_idx = 0; pwr_lvl_idx < num_pwr_levels; pwr_lvl_idx++) { + /* STA received TPE IE*/ + if (is_tpe_present) { + /* local power is PSD power*/ + if (chan->flags & IEEE80211_CHAN_PSD) { + /* Connecting AP is psd power */ + if (reg_tpc_info->is_psd_power) { + is_psd_power = true; + ath12k_mac_get_psd_channel(ar, 20, + &start_freq, + ¢er_freq, + pwr_lvl_idx, + &temp_chan, + &tx_power, + reg_6g_power_mode); + psd_power = temp_chan->psd; + eirp_power = tx_power; + max_tx_power[pwr_lvl_idx] = + min_t(s8, + psd_power, + reg_tpc_info->tpe[pwr_lvl_idx]); + /* Connecting AP is not psd power */ + } else { + ath12k_mac_get_eirp_power(ar, + &start_freq, + ¢er_freq, + pwr_lvl_idx, + &temp_chan, + &ctx->def, + &tx_power, + reg_6g_power_mode); + psd_power = temp_chan->psd; + /* convert psd power to EIRP power based + * on channel width + */ + tx_power = + min_t(s8, tx_power, + psd_power + 13 + pwr_lvl_idx * 3); + max_tx_power[pwr_lvl_idx] = + min_t(s8, + tx_power, + reg_tpc_info->tpe[pwr_lvl_idx]); + } + /* local power is not PSD power */ + } else { + /* Connecting AP is psd power */ + if (reg_tpc_info->is_psd_power) { + is_psd_power = true; + ath12k_mac_get_psd_channel(ar, 20, + &start_freq, + ¢er_freq, + pwr_lvl_idx, + &temp_chan, + &tx_power, + reg_6g_power_mode); + eirp_power = tx_power; + max_tx_power[pwr_lvl_idx] = + reg_tpc_info->tpe[pwr_lvl_idx]; + /* Connecting AP is not psd power */ + } else { + ath12k_mac_get_eirp_power(ar, + &start_freq, + ¢er_freq, + pwr_lvl_idx, + &temp_chan, + &ctx->def, + &tx_power, + reg_6g_power_mode); + max_tx_power[pwr_lvl_idx] = + min_t(s8, + tx_power, + reg_tpc_info->tpe[pwr_lvl_idx]); + } + } + /* STA not received TPE IE */ + } else { + /* local power is PSD power*/ + if (chan->flags & IEEE80211_CHAN_PSD) { + is_psd_power = true; + ath12k_mac_get_psd_channel(ar, 20, + &start_freq, + ¢er_freq, + pwr_lvl_idx, + &temp_chan, + &tx_power, + reg_6g_power_mode); + psd_power = temp_chan->psd; + eirp_power = tx_power; + max_tx_power[pwr_lvl_idx] = psd_power; + } else { + ath12k_mac_get_eirp_power(ar, + &start_freq, + ¢er_freq, + pwr_lvl_idx, + &temp_chan, + &ctx->def, + &tx_power, + reg_6g_power_mode); + max_tx_power[pwr_lvl_idx] = tx_power; + } + } + + if (is_psd_power) { + /* If AP local power constraint is present */ + if (pwr_reduction) + eirp_power = eirp_power - pwr_reduction; + + /* If FW updated max tx power is non zero, then take the min of + * firmware updated ap tx power + * and max power derived from above mentioned parameters. + */ + ath12k_dbg(ab, ATH12K_DBG_MAC, + "eirp power : %d firmware report power : %d\n", + eirp_power, ar->max_allowed_tx_power); + if ((ar->max_allowed_tx_power) && (ab->hw_params->idle_ps)) + eirp_power = min_t(s8, + eirp_power, + ar->max_allowed_tx_power); + } else { + /* If AP local power constraint is present */ + if (pwr_reduction) + max_tx_power[pwr_lvl_idx] = + max_tx_power[pwr_lvl_idx] - pwr_reduction; + /* If FW updated max tx power is non zero, then take the min of + * firmware updated ap tx power + * and max power derived from above mentioned parameters. + */ + if ((ar->max_allowed_tx_power) && (ab->hw_params->idle_ps)) + max_tx_power[pwr_lvl_idx] = + min_t(s8, + max_tx_power[pwr_lvl_idx], + ar->max_allowed_tx_power); + } + reg_tpc_info->chan_power_info[pwr_lvl_idx].chan_cfreq = center_freq; + reg_tpc_info->chan_power_info[pwr_lvl_idx].tx_power = + max_tx_power[pwr_lvl_idx]; + } + + reg_tpc_info->num_pwr_levels = num_pwr_levels; + reg_tpc_info->is_psd_power = is_psd_power; + reg_tpc_info->eirp_power = eirp_power; + reg_tpc_info->power_type_6g = + ath12k_ieee80211_ap_pwr_type_convert(reg_6g_power_mode); +} + +void ath12k_mac_parse_tx_pwr_env(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *ctx) +{ + struct ath12k_base *ab = ar->ab; + struct ieee80211_bss_conf *bss_conf; + struct ieee80211_tx_pwr_env *single_tpe; + enum wmi_reg_6g_client_type client_type; + int i; + u8 pwr_count, pwr_interpret, pwr_category; + u8 psd_index = 0, non_psd_index = 0, local_tpe_count = 0, reg_tpe_count = 0; + bool use_local_tpe, non_psd_set = false, psd_set = false; + + rcu_read_lock(); + + bss_conf = ath12k_get_link_bss_conf(arvif); + + if (!bss_conf) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "unable to access bss link conf in tpc reg fill\n"); + return; + } + + client_type = WMI_REG_DEFAULT_CLIENT; + + for (i = 0; i < bss_conf->tx_pwr_env_num; i++) { + single_tpe = &bss_conf->tx_pwr_env[i]; + pwr_category = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_CATEGORY); + pwr_interpret = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_INTERPRET); + + if (pwr_category == client_type) { + if (pwr_interpret == IEEE80211_TPE_LOCAL_EIRP || + pwr_interpret == IEEE80211_TPE_LOCAL_EIRP_PSD) + local_tpe_count++; + else if (pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP || + pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP_PSD) + reg_tpe_count++; + } + } + + if (!reg_tpe_count && !local_tpe_count) { + rcu_read_unlock(); + ath12k_warn(ab, + "no transmit power envelope match client power type %d\n", + client_type); + return; + } else if (!reg_tpe_count) { + use_local_tpe = true; + } else { + use_local_tpe = false; + } + for (i = 0; i < bss_conf->tx_pwr_env_num; i++) { + single_tpe = &bss_conf->tx_pwr_env[i]; + pwr_category = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_CATEGORY); + pwr_interpret = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_INTERPRET); + + if (pwr_category != client_type) + continue; + + /* get local transmit power envelope */ + if (use_local_tpe) { + if (pwr_interpret == IEEE80211_TPE_LOCAL_EIRP) { + non_psd_index = i; + non_psd_set = true; + } else if (pwr_interpret == IEEE80211_TPE_LOCAL_EIRP_PSD) { + psd_index = i; + psd_set = true; + } + /* get regulatory transmit power envelope */ + } else { + if (pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP) { + non_psd_index = i; + non_psd_set = true; + } else if (pwr_interpret == IEEE80211_TPE_REG_CLIENT_EIRP_PSD) { + psd_index = i; + psd_set = true; + } + } + } + + if (non_psd_set && !psd_set) { + single_tpe = &bss_conf->tx_pwr_env[non_psd_index]; + pwr_count = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_COUNT); + pwr_interpret = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_INTERPRET); + arvif->reg_tpc_info.is_psd_power = false; + arvif->reg_tpc_info.eirp_power = 0; + + arvif->reg_tpc_info.num_pwr_levels = + ath12k_mac_get_tpe_count(pwr_interpret, pwr_count); + for (i = 0; i < arvif->reg_tpc_info.num_pwr_levels; i++) { + ath12k_dbg(ab, ATH12K_DBG_MAC, + "non PSD power[%d] : %d\n", + i, single_tpe->tx_power[i]); + arvif->reg_tpc_info.tpe[i] = single_tpe->tx_power[i] / 2; + } + } + if (psd_set) { + single_tpe = &bss_conf->tx_pwr_env[psd_index]; + pwr_count = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_COUNT); + pwr_interpret = u8_get_bits(single_tpe->tx_power_info, + IEEE80211_TX_PWR_ENV_INFO_INTERPRET); + arvif->reg_tpc_info.is_psd_power = true; + + if (pwr_count == 0) { + ath12k_dbg(ab, ATH12K_DBG_MAC, + "TPE PSD power : %d\n", single_tpe->tx_power[0]); + arvif->reg_tpc_info.num_pwr_levels = + ath12k_mac_get_num_pwr_levels(&ctx->def); + for (i = 0; i < arvif->reg_tpc_info.num_pwr_levels; i++) + arvif->reg_tpc_info.tpe[i] = single_tpe->tx_power[0] / 2; + } else { + arvif->reg_tpc_info.num_pwr_levels = + ath12k_mac_get_tpe_count(pwr_interpret, pwr_count); + for (i = 0; i < arvif->reg_tpc_info.num_pwr_levels; i++) { + ath12k_dbg(ab, ATH12K_DBG_MAC, + "TPE PSD power[%d] : %d\n", + i, single_tpe->tx_power[i]); + arvif->reg_tpc_info.tpe[i] = single_tpe->tx_power[i] / 2; + } + } + } + rcu_read_unlock(); +} + static int ath12k_mac_op_assign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *link_conf, struct ieee80211_chanctx_conf *ctx) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar, *arvif_ar; + struct ath12k_base *ab; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + struct ieee80211_sta *sta; + struct ath12k_sta *ahsta; + struct ath12k_link_sta *arsta; int ret; struct ath12k_wmi_peer_create_arg param; + enum ieee80211_ap_reg_power power_type; + enum ieee80211_sta_state state, prev_state; + + u8 link_id = link_conf->link_id; + + if (!ctx) + return -EINVAL; + + mutex_lock(&ah->conf_mutex); + + arvif = ath12k_mac_assign_link_vif(ah, vif, link_id); + if (!arvif) { + ath12k_err(NULL, "unable to allocate link vif\n"); + mutex_unlock(&ah->conf_mutex); + return -ENOMEM; + } + + if (!arvif->is_created) { + ar = ath12k_mac_assign_vif_to_vdev(hw, arvif, ctx); + if (!ar) { + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + }else if (vif->valid_links){ + ar = arvif->ar; + if (WARN_ON(!ar)) { + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + } else { + ar = ath12k_get_ar_by_ctx(hw, ctx); + if (!ar) { + ath12k_err(NULL, + "unable to determine device for the passed channel ctx\n"); + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + + /* TODO If vif is already assigned, but now the chan is different and belongs + * to a different ar, then delete the old vdev in different ar and create new + * This is not expected for MLO + */ + /* If VIF is created for ROC scan, stop and delete the scan vif + * before creating vdev for new connection + */ + if (ar != arvif->ar || (arvif->is_scan_vif)) { + if (!(arvif->is_scan_vif) && WARN_ON(arvif->is_started)) { + mutex_unlock(&ah->conf_mutex); + return -EBUSY; + } + + arvif_ar = arvif->ar; + if (!arvif_ar) { + mutex_unlock(&ah->conf_mutex); + ath12k_warn(NULL, "arvif_ar not found\n"); + return -EINVAL; + } + + mutex_lock(&arvif_ar->conf_mutex); + if (arvif->is_scan_vif && arvif->is_started) { + ret = ath12k_mac_vdev_stop(arvif); + if (ret) { + mutex_unlock(&arvif_ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + ath12k_warn(arvif_ar->ab, "failed to stop vdev %d: %d\n", + arvif->vdev_id, ret); + return -EINVAL; + } + arvif->is_started = false; + arvif->is_scan_vif = false; + } + + ret = ath12k_mac_vdev_delete(arvif_ar, arvif); + mutex_unlock(&arvif_ar->conf_mutex); + if (ret) + ath12k_warn(arvif_ar->ab, "unable to delete vdev %d\n", ret); + + mutex_lock(&ar->conf_mutex); + ret = ath12k_mac_vdev_create(ar, arvif); + if (ret) { + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + ath12k_warn(ar->ab, "unable to create vdev %d\n", ret); + return -EINVAL; + } + mutex_unlock(&ar->conf_mutex); + } + } + + ab = ar->ab; mutex_lock(&ar->conf_mutex); @@ -5819,10 +13517,28 @@ "mac chanctx assign ptr %pK vdev_id %i\n", ctx, arvif->vdev_id); + if (ar->supports_6ghz && ctx->def.chan->band == NL80211_BAND_6GHZ && + (ahvif->vdev_type == WMI_VDEV_TYPE_STA || + ahvif->vdev_type == WMI_VDEV_TYPE_AP)) { + power_type = link_conf->power_type; + ath12k_dbg(ab, ATH12K_DBG_MAC, "mac chanctx power type %d\n", + power_type); + if (power_type == IEEE80211_REG_UNSET_AP) + power_type = IEEE80211_REG_LPI_AP; + arvif->chanctx = *ctx; + /* TODO: Transmit Power Envelope specification for 320 is not + * available yet. Need to add TPE 320 support when spec is ready + */ + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA && + ctx->def.width != NL80211_CHAN_WIDTH_320) { + ath12k_mac_parse_tx_pwr_env(ar, arvif, ctx); + } + } + /* for some targets bss peer must be created before vdev_start */ if (ab->hw_params->vdev_start_delay && - arvif->vdev_type != WMI_VDEV_TYPE_AP && - arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && + ahvif->vdev_type != WMI_VDEV_TYPE_AP && + ahvif->vdev_type != WMI_VDEV_TYPE_MONITOR && !ath12k_peer_exist_by_vdev_id(ab, arvif->vdev_id)) { memcpy(&arvif->chanctx, ctx, sizeof(*ctx)); ret = 0; @@ -5835,8 +13551,8 @@ } if (ab->hw_params->vdev_start_delay && - (arvif->vdev_type == WMI_VDEV_TYPE_AP || - arvif->vdev_type == WMI_VDEV_TYPE_MONITOR)) { + (ahvif->vdev_type == WMI_VDEV_TYPE_AP || + ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR)) { param.vdev_id = arvif->vdev_id; param.peer_type = WMI_PEER_TYPE_DEFAULT; param.peer_addr = ar->mac_addr; @@ -5849,7 +13565,33 @@ } } - if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + if (!ab->hw_params->vdev_start_delay && + ahvif->vdev_type == WMI_VDEV_TYPE_STA && ahvif->chanctx_peer_del_done) { + rcu_read_lock(); + sta = ieee80211_find_sta(vif, vif->cfg.ap_addr); + if (!sta) { + ath12k_warn(ar->ab, "failed to find station entry for bss vdev\n"); + rcu_read_unlock(); + goto out; + } + + ahsta = ath12k_sta_to_ahsta(sta); + arsta = &ahsta->deflink; + rcu_read_unlock(); + + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + prev_state = arsta->state; + for (state = IEEE80211_STA_NOTEXIST; state < prev_state; + state++) + ath12k_mac_update_sta_state(ar->ah->hw, arvif->ahvif->vif, sta, + state, (state + 1)); + mutex_lock(&ah->conf_mutex); + mutex_lock(&ar->conf_mutex); + ahvif->chanctx_peer_del_done = false; + } + + if (ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { ret = ath12k_mac_monitor_start(ar); if (ret) goto out; @@ -5857,15 +13599,18 @@ goto out; } - ret = ath12k_mac_vdev_start(arvif, &ctx->def); + memcpy(&arvif->chanctx, ctx, sizeof(*ctx)); + + ret = ath12k_mac_vdev_start(arvif, &ctx->def, ctx->radar_enabled); if (ret) { ath12k_warn(ab, "failed to start vdev %i addr %pM on freq %d: %d\n", - arvif->vdev_id, vif->addr, + arvif->vdev_id, arvif->addr, ctx->def.chan->center_freq, ret); goto out; } - if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && ar->monitor_vdev_created) + if (ahvif->vdev_type != WMI_VDEV_TYPE_MONITOR && + test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) ath12k_mac_monitor_start(ar); arvif->is_started = true; @@ -5874,45 +13619,165 @@ out: mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); return ret; } +struct ath12k_link_vif * +ath12k_mac_get_primary_arvif(struct ath12k *ar, + struct ath12k_vif *ahvif) +{ + struct ath12k_link_vif *arvif; + + list_for_each_entry(arvif, &ar->arvifs, list) { + if (arvif->ahvif != ahvif) + continue; + + if (arvif->assoc_link) + return arvif; + } + + return NULL; +} + +static void +ath12k_mac_get_ahvif_status(struct ath12k *ar, + struct ath12k_vif *ahvif, + int *out_started_count, + int *out_up_count, + int *out_pending_stop_count) +{ + struct ath12k_link_vif *arvif; + int started_count = 0; + int up_count = 0; + int pending_stop_count = 0; + + list_for_each_entry(arvif, &ar->arvifs, list) { + if (arvif->ahvif != ahvif) + continue; + + if (arvif->is_started) + started_count++; + + if (arvif->is_up) + up_count++; + + if (arvif->pending_stop) + pending_stop_count++; + } + + *out_started_count = started_count; + *out_up_count = up_count; + *out_pending_stop_count = pending_stop_count; +} + static void ath12k_mac_op_unassign_vif_chanctx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *link_conf, struct ieee80211_chanctx_conf *ctx) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; - struct ath12k_vif *arvif = (void *)vif->drv_priv; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; + struct ath12k_link_vif *arvif; + struct ath12k_hw *ah = hw->priv; + struct ath12k_base *ab; + struct ath12k_peer *peer; + struct ath12k *ar; int ret; + bool is_pending_stop = false; + bool to_stop_primary = false; + u8 link_id = link_conf->link_id; + + mutex_lock(&ah->conf_mutex); + + arvif = ahvif->link[link_id]; + + if (!arvif) { + ath12k_err(NULL, + "unable to determine the assigned link vif on link id %d\n", + link_id); + mutex_unlock(&ah->conf_mutex); + return; + } + + ar = arvif->ar; + if (!ar) { + ath12k_err(NULL, + "unable to determine device to stop vdev during channel unassign\n"); + mutex_unlock(&ah->conf_mutex); + WARN_ON(1); + return; + } + ab = ar->ab; mutex_lock(&ar->conf_mutex); - ath12k_dbg(ab, ATH12K_DBG_MAC, + if (unlikely(test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) + goto out; + + ath12k_dbg(ab, ATH12K_DBG_SET(MAC, L2), "mac chanctx unassign ptr %pK vdev_id %i\n", ctx, arvif->vdev_id); - WARN_ON(!arvif->is_started); + if (!arvif->is_started) + goto out; if (ab->hw_params->vdev_start_delay && - arvif->vdev_type == WMI_VDEV_TYPE_MONITOR && + ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR && ath12k_peer_find_by_addr(ab, ar->mac_addr)) ath12k_peer_delete(ar, arvif->vdev_id, ar->mac_addr); - if (arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { + if (ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) { ret = ath12k_mac_monitor_stop(ar); - if (ret) { + if (ret) + goto out; + + arvif->is_started = false; mutex_unlock(&ar->conf_mutex); - return; + ath12k_mac_remove_link_interface(hw, arvif); + goto unassign_exit; } - arvif->is_started = false; + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac unassign vif links map %lu vdev id %d addr %pM assoc_link %d\n", + ahvif->links_map, arvif->vdev_id, arvif->addr, arvif->assoc_link); + + /* The primary link should be stop vdev and delete peer as last one. */ + if (hweight16(ahvif->links_map) > 1 && + ab->hw_params->vdev_start_delay && + ahvif->vdev_type == WMI_VDEV_TYPE_STA) { + int started_count = 0; + int up_count = 0; + int pending_stop_count = 0; + + ath12k_mac_get_ahvif_status(ar, ahvif, &started_count, + &up_count, + &pending_stop_count); + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac unassign vif status started %d up %d pending stop %d\n", + started_count, up_count, pending_stop_count); + + if (arvif->assoc_link && started_count != 1) + is_pending_stop = true; + + if (pending_stop_count && started_count - pending_stop_count == 1) + to_stop_primary = true; + } + + if (is_pending_stop) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac skip pending stop vdev id %d addr %pM assoc_link %d\n", + arvif->vdev_id, arvif->addr, arvif->assoc_link); + arvif->pending_stop = true; mutex_unlock(&ar->conf_mutex); + return; } +stop_primary: + ath12k_bss_disassoc(ar, arvif, true); + ret = ath12k_mac_vdev_stop(arvif); if (ret) ath12k_warn(ab, "failed to stop vdev %i: %d\n", @@ -5920,15 +13785,62 @@ arvif->is_started = false; + peer = ath12k_peer_find_by_vdev_id(ab, arvif->vdev_id); + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA && peer) { + struct ieee80211_sta *sta; + unsigned int sta_link_id = 0xff; + + if (vif->valid_links) + sta = ieee80211_find_sta_by_link_addrs(hw, peer->addr, + NULL, &sta_link_id); + else + sta = ieee80211_find_sta_by_ifaddr(hw, peer->addr, NULL); + ath12k_dbg(ab, ATH12K_DBG_MAC, + "peer delete check links 0x%x vdev id %i peer %pM link id %d sta %pK\n", + vif->valid_links, arvif->vdev_id, + peer->addr, sta_link_id, sta); + + if ((ab->hw_params->vdev_start_delay && !sta && !peer->sta) || + !ab->hw_params->vdev_start_delay) { + ret = ath12k_peer_delete(ar, arvif->vdev_id, arvif->bssid); + if (ret) { + ath12k_warn(ar->ab, + "failed to delete peer %pM for vdev %d: %d\n", + arvif->bssid, arvif->vdev_id, ret); + } else { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac removed peer %pM vdev %d\n", + arvif->bssid, arvif->vdev_id); + ahvif->chanctx_peer_del_done = true; + } + } + } + if (ab->hw_params->vdev_start_delay && - arvif->vdev_type == WMI_VDEV_TYPE_MONITOR) + ahvif->vdev_type == WMI_VDEV_TYPE_MONITOR) ath12k_wmi_vdev_down(ar, arvif->vdev_id); - if (arvif->vdev_type != WMI_VDEV_TYPE_MONITOR && - ar->num_started_vdevs == 1 && ar->monitor_vdev_created) + if (ahvif->vdev_type != WMI_VDEV_TYPE_MONITOR && + ar->num_started_vdevs == 1 && + test_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags)) ath12k_mac_monitor_stop(ar); + if (to_stop_primary) { + to_stop_primary = false; + arvif = ath12k_mac_get_primary_arvif(ar, ahvif); + WARN_ON(!arvif); + link_id = arvif->link_id; + goto stop_primary; + } + + mutex_unlock(&ar->conf_mutex); + ath12k_mac_remove_link_interface(hw, arvif); + ath12k_mac_unassign_link_vif(arvif); + goto unassign_exit; +out: mutex_unlock(&ar->conf_mutex); +unassign_exit: + mutex_unlock(&ah->conf_mutex); } static int @@ -5937,24 +13849,88 @@ int n_vifs, enum ieee80211_chanctx_switch_mode mode) { - struct ath12k *ar = hw->priv; + struct ath12k_hw *ah = hw->priv; + struct ath12k *curr_ar, *new_ar, *ar; + struct ieee80211_chanctx_conf *prev_ctx, *curr_ctx; + int i, ret = 0, idx; + + mutex_lock(&ah->conf_mutex); + + /* TODO Switching a vif between two radios require deleting of vdev + * in its current ar and creating a vdev and applying its cached params + * to the new vdev in ar. So instead of returning error, handle it? + */ + for (i = 0; i < n_vifs; i++) { + if (vifs[i].old_ctx->def.chan->band != + vifs[i].new_ctx->def.chan->band) { + WARN_ON(1); + ret = -EINVAL; + break; + } - mutex_lock(&ar->conf_mutex); + curr_ar = ath12k_get_ar_by_ctx(hw, vifs[i].old_ctx); + new_ar = ath12k_get_ar_by_ctx(hw, vifs[i].new_ctx); + if (!curr_ar || !new_ar) { + ath12k_err(NULL, + "unable to determine device for the passed channel ctx"); + ath12k_err(NULL, + "Old freq %d MHz (device %s) to new freq %d MHz (device %s)\n", + vifs[i].old_ctx->def.chan->center_freq, + curr_ar ? "valid" : "invalid", + vifs[i].new_ctx->def.chan->center_freq, + new_ar ? "valid" : "invalid"); + ret = -EINVAL; + break; + } + + /* Switching a vif between two radios is not allowed */ + if (curr_ar != new_ar) { + ath12k_dbg(curr_ar->ab, ATH12K_DBG_MAC, + "mac chanctx switch to another radio not supported."); + ret = -EOPNOTSUPP; + break; + } + } + + if (ret) + goto unlock; + + prev_ctx = vifs[0].old_ctx; + idx = 0; + + for (i = 1; i < n_vifs; i++) { + curr_ctx = vifs[i].old_ctx; + if (curr_ctx != prev_ctx) { + ar = ath12k_get_ar_by_ctx(hw, prev_ctx); + mutex_lock(&ar->conf_mutex); ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac chanctx switch n_vifs %d mode %d\n", - n_vifs, mode); - ath12k_mac_update_vif_chan(ar, vifs, n_vifs); + i - idx, mode); + ath12k_mac_process_update_vif_chan(ar, vifs + idx, i - idx); + mutex_unlock(&ar->conf_mutex); + prev_ctx = curr_ctx; + idx = i; + } + } + ar = ath12k_get_ar_by_ctx(hw, prev_ctx); + mutex_lock(&ar->conf_mutex); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac chanctx switch n_vifs %d mode %d\n", + i - idx, mode); + ath12k_mac_process_update_vif_chan(ar, vifs + idx, i - idx); mutex_unlock(&ar->conf_mutex); - return 0; +unlock: + mutex_unlock(&ah->conf_mutex); + return ret; } -static int +int ath12k_set_vdev_param_to_all_vifs(struct ath12k *ar, int param, u32 value) { - struct ath12k_vif *arvif; + struct ath12k_link_vif *arvif; int ret = 0; mutex_lock(&ar->conf_mutex); @@ -5976,13 +13952,58 @@ /* mac80211 stores device specific RTS/Fragmentation threshold value, * this is set interface specific to firmware from ath12k driver + * TODO Move to link specific config */ -static int ath12k_mac_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value) +static int ath12k_mac_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value /*, */ + /* struct ieee80211_vif *vif, int link_id */) { - struct ath12k *ar = hw->priv; + u8 link_id = 0; + struct ieee80211_vif *vif = NULL; + struct ath12k_hw *ah = hw->priv; + struct ath12k_vif *ahvif; + struct ath12k *ar; + struct ath12k_link_vif *arvif; + int ret = -1; int param_id = WMI_VDEV_PARAM_RTS_THRESHOLD; - return ath12k_set_vdev_param_to_all_vifs(ar, param_id, value); + if (vif) { + mutex_lock(&ah->conf_mutex); + ahvif = ath12k_vif_to_ahvif(vif); + arvif = ahvif->link[link_id]; + + if (arvif == NULL || !arvif->is_created) { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "bss info parameter changes %d cached to apply after vdev create on channel assign\n", + param_id); + mutex_unlock(&ah->conf_mutex); + return ret; + } + + ar = arvif->ar; + if (!ar) { + ath12k_err(NULL, + "Failed to set rts threshold for link: %d\n", + link_id); + mutex_unlock(&ah->conf_mutex); + return ret; + } + + ret = ath12k_set_vdev_param_to_all_vifs(ar, param_id, value); + if (ret) { + ath12k_warn(ar->ab, "failed to set RTS config for all vdevs of pdev %d", + ar->pdev->pdev_id); + } + + mutex_unlock(&ah->conf_mutex); + } else { + ar = ah->radio; + ret = ath12k_set_vdev_param_to_all_vifs(ar, param_id, value); + if (ret) { + ath12k_warn(ar->ab, "failed to set RTS config for all vdevs of pdev %d", + ar->pdev->pdev_id); + } + } + return ret; } static int ath12k_mac_op_set_frag_threshold(struct ieee80211_hw *hw, u32 value) @@ -6000,34 +14021,75 @@ return -EOPNOTSUPP; } -static void ath12k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - u32 queues, bool drop) +static void ath12k_mac_flush(struct ath12k *ar) { - struct ath12k *ar = hw->priv; + struct ath12k_base *ab = ar->ab; long time_left; - if (drop) + atomic_inc(&ar->flush_request); + time_left = wait_event_timeout(ar->tx_empty_waitq, + ((atomic_read(&ar->dp.num_tx_pending) == 0) && + (atomic_read(&ar->num_pending_mgmt_tx) == 0)), + ATH12K_FLUSH_TIMEOUT); + atomic_dec(&ar->flush_request); + + if (time_left == 0) { + ath12k_warn(ab, "failed to flush transmit queue pending mgmt %d data %d\n", + atomic_read(&ar->num_pending_mgmt_tx), + atomic_read(&ar->dp.num_tx_pending)); return; + } - time_left = wait_event_timeout(ar->dp.tx_empty_waitq, - (atomic_read(&ar->dp.num_tx_pending) == 0), - ATH12K_FLUSH_TIMEOUT); - if (time_left == 0) - ath12k_warn(ar->ab, "failed to flush transmit queue %ld\n", time_left); + ath12k_dbg(ab, ATH12K_DBG_SET(MAC, L3), + "mac tx flush pending mgmt %d data %d\n", + atomic_read(&ar->num_pending_mgmt_tx), + atomic_read(&ar->dp.num_tx_pending)); } -static int -ath12k_mac_bitrate_mask_num_ht_rates(struct ath12k *ar, - enum nl80211_band band, - const struct cfg80211_bitrate_mask *mask) +static void ath12k_mac_op_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta) { - int num_rates = 0; + /* There is no station specific queue, No need to do anything here */ +} + +static void ath12k_mac_op_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + u32 queues, bool drop) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_vif *ahvif; int i; + u8 link_id; - for (i = 0; i < ARRAY_SIZE(mask->control[band].ht_mcs); i++) - num_rates += hweight16(mask->control[band].ht_mcs[i]); + if (drop) + return; - return num_rates; + if (!vif) { + /* FIXME: Need to identify which radio to flush. + * Until flush all the device if vif NULL + */ + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + ath12k_mac_flush(ar); + ar++; + } + } else { + ahvif = (void *)vif->drv_priv; + + for_each_set_bit(link_id, &ahvif->links_map, ATH12K_NUM_MAX_LINKS) { + if (!ahvif->link[link_id]) + continue; + + ar = ath12k_get_ar_by_vif(hw, vif, link_id); + if (!ar) { + ath12k_err(NULL, + "unable to determine device for link_id %d tx flush\n", + link_id); + continue; + } + ath12k_mac_flush(ar); + } + } } static bool @@ -6045,9 +14107,29 @@ if (ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask)) return false; + if (ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask)) + return false; + + if (ath12k_mac_bitrate_mask_num_eht_rates(ar, band, mask)) + return false; + return num_rates == 1; } +static __le16 +ath12k_mac_get_tx_mcs_map(const struct ieee80211_sta_he_cap *he_cap) +{ + if (he_cap->he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G) + return he_cap->he_mcs_nss_supp.tx_mcs_80p80; + + if (he_cap->he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G) + return he_cap->he_mcs_nss_supp.tx_mcs_160; + + return he_cap->he_mcs_nss_supp.tx_mcs_80; +} + static bool ath12k_mac_bitrate_mask_get_single_nss(struct ath12k *ar, enum nl80211_band band, @@ -6056,8 +14138,13 @@ { struct ieee80211_supported_band *sband = &ar->mac.sbands[band]; u16 vht_mcs_map = le16_to_cpu(sband->vht_cap.vht_mcs.tx_mcs_map); + u16 he_mcs_map = 0; + u16 eht_mcs_map = 0; u8 ht_nss_mask = 0; u8 vht_nss_mask = 0; + u8 he_nss_mask = 0; + u8 eht_nss_mask = 0; + u8 mcs_nss_len; int i; /* No need to consider legacy here. Basic rates are always present @@ -6084,7 +14171,71 @@ return false; } - if (ht_nss_mask != vht_nss_mask) + he_mcs_map = le16_to_cpu(ath12k_mac_get_tx_mcs_map(&sband->iftype_data->he_cap)); + + for (i = 0; i < ARRAY_SIZE(mask->control[band].he_mcs); i++) { + if (mask->control[band].he_mcs[i] == 0) + continue; + + if (mask->control[band].he_mcs[i] == + ath12k_mac_get_max_he_mcs_map(he_mcs_map, i)) + he_nss_mask |= BIT(i); + else + return false; + } + + mcs_nss_len = ieee80211_eht_mcs_nss_size(&sband->iftype_data->he_cap.he_cap_elem, + &sband->iftype_data->eht_cap.eht_cap_elem, + false); + if (mcs_nss_len == 4) { + /* 20 MHz only STA case */ + const struct ieee80211_eht_mcs_nss_supp_20mhz_only *eht_mcs_nss = + &sband->iftype_data->eht_cap.eht_mcs_nss_supp.only_20mhz; + if (eht_mcs_nss->rx_tx_mcs13_max_nss) + eht_mcs_map = 0x1fff; + else if (eht_mcs_nss->rx_tx_mcs11_max_nss) + eht_mcs_map = 0x07ff; + else if (eht_mcs_nss->rx_tx_mcs9_max_nss) + eht_mcs_map = 0x01ff; + else + eht_mcs_map = 0x007f; + } else { + const struct ieee80211_eht_mcs_nss_supp_bw *eht_mcs_nss; + + switch (mcs_nss_len) { + case 9: + eht_mcs_nss = &sband->iftype_data->eht_cap.eht_mcs_nss_supp.bw._320; + break; + case 6: + eht_mcs_nss = &sband->iftype_data->eht_cap.eht_mcs_nss_supp.bw._160; + break; + case 3: + eht_mcs_nss = &sband->iftype_data->eht_cap.eht_mcs_nss_supp.bw._80; + break; + default: + return false; + } + + if (eht_mcs_nss->rx_tx_mcs13_max_nss) + eht_mcs_map = 0x1fff; + else if (eht_mcs_nss->rx_tx_mcs11_max_nss) + eht_mcs_map = 0x7ff; + else + eht_mcs_map = 0x1ff; + } + + for (i = 0; i < ARRAY_SIZE(mask->control[band].eht_mcs); i++) { + if (mask->control[band].eht_mcs[i] == 0) + continue; + + if (mask->control[band].eht_mcs[i] < eht_mcs_map) + eht_nss_mask |= BIT(i); + else + return false; + } + + if (ht_nss_mask != vht_nss_mask || ht_nss_mask != he_nss_mask || + ht_nss_mask != eht_nss_mask) return false; if (ht_nss_mask == 0) @@ -6131,18 +14282,157 @@ return 0; } -static int ath12k_mac_set_fixed_rate_params(struct ath12k_vif *arvif, - u32 rate, u8 nss, u8 sgi, u8 ldpc) +static int +ath12k_mac_set_fixed_rate_GI_LTF(struct ath12k_link_vif *arvif, u8 gi, u8 ltf) { + struct ieee80211_bss_conf *link_conf; struct ath12k *ar = arvif->ar; - u32 vdev_param; + int param, ret; + bool eht_support; + + /* 0.8 = 0, 1.6 = 2 and 3.2 = 3. */ + if (gi && gi != 0xFF) + gi += 1; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + rcu_read_unlock(); + return -EINVAL; + } + + eht_support = link_conf->eht_support; + + rcu_read_unlock(); + + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + WMI_VDEV_PARAM_SGI, gi); + if (ret) { + ath12k_warn(ar->ab, "failed to set HE GI:%d, error:%d\n", + gi, ret); + return ret; + } + /* start from 1 */ + if (ltf != 0xFF) + ltf += 1; + + if (eht_support) + param = WMI_VDEV_PARAM_EHT_LTF; + else + param = WMI_VDEV_PARAM_HE_LTF; + + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + param, ltf); + if (ret) { + ath12k_warn(ar->ab, "failed to set HE LTF:%d, error:%d\n", + ltf, ret); + return ret; + } + + return 0; +} + +static int +ath12k_mac_set_auto_rate_GI_LTF(struct ath12k_link_vif *arvif, u16 gi, u8 ltf) +{ + struct ath12k *ar = arvif->ar; + int ret; + u32 ar_gi_ltf = 0; + + if (gi != 0xFF) { + switch (gi) { + case NL80211_RATE_INFO_HE_GI_0_8: + gi = WMI_AUTORATE_800NS_GI; + break; + case NL80211_RATE_INFO_HE_GI_1_6: + gi = WMI_AUTORATE_1600NS_GI; + break; + case NL80211_RATE_INFO_HE_GI_3_2: + gi = WMI_AUTORATE_3200NS_GI; + break; + default: + ath12k_warn(ar->ab, "Invalid GI\n"); + return -EINVAL; + } + } + + if (ltf != 0xFF) { + switch (ltf) { + case NL80211_RATE_INFO_HE_1XLTF: + ltf = WMI_HE_AUTORATE_LTF_1X; + break; + case NL80211_RATE_INFO_HE_2XLTF: + ltf = WMI_HE_AUTORATE_LTF_2X; + break; + case NL80211_RATE_INFO_HE_4XLTF: + ltf = WMI_HE_AUTORATE_LTF_4X; + break; + default: + ath12k_warn(ar->ab, "Invalid LTF\n"); + return -EINVAL; + } + } + + ar_gi_ltf = gi | ltf; + + + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + WMI_VDEV_PARAM_AUTORATE_MISC_CFG, + ar_gi_ltf); + if (ret) { + ath12k_warn(ar->ab, + "failed to set HE autorate GI:%u, LTF:%u params, error:%d\n", + gi, ltf, ret); + return ret; + } + + return 0; +} + +static int ath12k_mac_set_rate_params(struct ath12k_link_vif *arvif, + u32 rate, u8 nss, u8 sgi, u8 ldpc, + u8 he_gi, u8 he_ltf, bool he_fixed_rate, + u8 eht_gi, u8 eht_ltf, + bool eht_fixed_rate, + int he_ul_rate, u8 he_ul_nss) +{ + struct ieee80211_bss_conf *link_conf; + struct ath12k *ar = arvif->ar; + u32 vdev_param, rate_code; int ret; + bool he_support, eht_support; lockdep_assert_held(&ar->conf_mutex); - ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac set fixed rate params vdev %i rate 0x%02x nss %u sgi %u\n", - arvif->vdev_id, rate, nss, sgi); + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + if (!link_conf) { + rcu_read_unlock(); + return -EINVAL; + } + + eht_support = link_conf->eht_support; + he_support = link_conf->he_support; + + rcu_read_unlock(); + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "mac set rate params vdev %i, rate:0x%02x, nss:0x%02x, sgi:0x%02x, ldpc:0x%02x\n", + arvif->vdev_id, rate, nss, sgi, ldpc); + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "he_gi:0x%02x, he_ltf:0x%02x, he_fixed_rate:%d\n", he_gi, + he_ltf, he_fixed_rate); + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "eht_gi:0x%02x, eht_ltf:0x%02x, eht_fixed_rate:%d\n", eht_gi, + eht_ltf, eht_fixed_rate); + + if (!he_support || !eht_support) { vdev_param = WMI_VDEV_PARAM_FIXED_RATE; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, vdev_param, rate); @@ -6151,8 +14441,10 @@ rate, ret); return ret; } + } vdev_param = WMI_VDEV_PARAM_NSS; + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, vdev_param, nss); if (ret) { @@ -6161,6 +14453,35 @@ return ret; } + ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, + WMI_VDEV_PARAM_LDPC, ldpc); + if (ret) { + ath12k_warn(ar->ab, "failed to set ldpc param %d: %d\n", + ldpc, ret); + return ret; + } + + if (eht_support) { + if (eht_fixed_rate) { + ret = ath12k_mac_set_fixed_rate_GI_LTF(arvif, eht_gi, + eht_ltf); + } else { + ret = ath12k_mac_set_auto_rate_GI_LTF(arvif, eht_gi, + eht_ltf); + } + if (ret) + return ret; + } else if (he_support) { + if (he_fixed_rate) { + ret = ath12k_mac_set_fixed_rate_GI_LTF(arvif, he_gi, + he_ltf); + } else { + ret = ath12k_mac_set_auto_rate_GI_LTF(arvif, he_gi, + he_ltf); + } + if (ret) + return ret; + } else { vdev_param = WMI_VDEV_PARAM_SGI; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, vdev_param, sgi); @@ -6169,14 +14490,21 @@ sgi, ret); return ret; } + } - vdev_param = WMI_VDEV_PARAM_LDPC; + if ((he_ul_rate < 0) || !he_ul_nss) + return 0; + + rate_code = ATH12K_HW_RATE_CODE(he_ul_rate, he_ul_nss - 1, + WMI_RATE_PREAMBLE_HE); + + vdev_param = WMI_VDEV_PARAM_UL_FIXED_RATE; ret = ath12k_wmi_vdev_set_param_cmd(ar, arvif->vdev_id, - vdev_param, ldpc); + vdev_param, rate_code); + if (ret) { - ath12k_warn(ar->ab, "failed to set ldpc param %d: %d\n", - ldpc, ret); - return ret; + ath12k_warn(ar->ab, "failed to set HE UL Fixed Rate:%d, error:%d\n", + he_ul_rate, ret); } return 0; @@ -6207,67 +14535,371 @@ return true; } +static bool +ath12k_mac_he_mcs_range_present(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int i; + u16 he_mcs; + + for (i = 0; i < NL80211_HE_NSS_MAX; i++) { + he_mcs = mask->control[band].he_mcs[i]; + + switch (he_mcs) { + case 0: + case BIT(8) - 1: + case BIT(10) - 1: + case BIT(12) - 1: + break; + default: + return false; + } + } + + return true; +} + +static bool +ath12k_mac_he_ul_mcs_present(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int i; + + for (i = 0; i < NL80211_HE_NSS_MAX; i++) { + if (mask->control[band].he_ul_mcs[i]) + return true; + } + + return false; +} + +static bool +ath12k_mac_eht_mcs_range_present(struct ath12k *ar, + enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask) +{ + int i; + u16 eht_mcs; + + for (i = 0; i < NL80211_EHT_NSS_MAX; i++) { + eht_mcs = mask->control[band].eht_mcs[i]; + + switch (eht_mcs) { + case 0: + case BIT(8) - 1: + case BIT(10) - 1: + case BIT(12) - 1: + case BIT(14) - 1: + break; + case BIT(15) - 1: + case BIT(16) - 1: + case BIT(16) - BIT(14) - 1: + if (i != 0) + return false; + break; + default: + return false; + } + } + + return true; +} + static void ath12k_mac_set_bitrate_mask_iter(void *data, struct ieee80211_sta *sta) { - struct ath12k_vif *arvif = data; - struct ath12k_sta *arsta = (struct ath12k_sta *)sta->drv_priv; + struct ath12k_link_vif *arvif = data; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_link_sta *arsta; struct ath12k *ar = arvif->ar; + u8 link_id = arvif->link_id; + + if (ahsta->ahvif != arvif->ahvif) + return; + + /* Check if there is a link sta in the vif link */ + if (!(BIT(link_id) & ahsta->links_map)) + return; + + arsta = ahsta->link[link_id]; spin_lock_bh(&ar->data_lock); arsta->changed |= IEEE80211_RC_SUPP_RATES_CHANGED; spin_unlock_bh(&ar->data_lock); - ieee80211_queue_work(ar->hw, &arsta->update_wk); + ieee80211_queue_work(ar->ah->hw, &arsta->update_wk); } static void ath12k_mac_disable_peer_fixed_rate(void *data, struct ieee80211_sta *sta) { - struct ath12k_vif *arvif = data; + struct ath12k_link_sta *arsta; + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_link_vif *arvif = data; + struct ath12k *ar; + u8 link_id = arvif->link_id; + + if (ahsta->ahvif != arvif->ahvif) + return; + + /* Check if there is a link sta in the vif link */ + if (!(BIT(link_id) & ahsta->links_map)) + return; + + arsta = ahsta->link[link_id]; + + ar = arvif->ar; + + spin_lock_bh(&ar->data_lock); + arsta->disable_fixed_rate = true; + spin_unlock_bh(&ar->data_lock); + + ieee80211_queue_work(ar->ah->hw, &arsta->update_wk); +} + +static bool +ath12k_mac_validate_fixed_rate_settings(struct ath12k *ar, enum nl80211_band band, + const struct cfg80211_bitrate_mask *mask, + unsigned int link_id) +{ + bool eht_fixed_rate = false, he_fixed_rate = false, vht_fixed_rate = false; + bool he_ul_fixed_rate = false; + struct ath12k_peer *peer, *tmp; + const u16 *vht_mcs_mask, *he_mcs_mask, *eht_mcs_mask, *he_ul_mcs_mask; + u8 vht_nss, he_nss, eht_nss, he_ul_nss; + bool ret = true; + struct ieee80211_link_sta *link_sta; + + vht_mcs_mask = mask->control[band].vht_mcs; + he_mcs_mask = mask->control[band].he_mcs; + eht_mcs_mask = mask->control[band].eht_mcs; + he_ul_mcs_mask = mask->control[band].he_ul_mcs; + + if (ath12k_mac_bitrate_mask_num_vht_rates(ar, band, mask) == 1) + vht_fixed_rate = true; + + if (ath12k_mac_bitrate_mask_num_he_rates(ar, band, mask) == 1) + he_fixed_rate = true; + + if (ath12k_mac_bitrate_mask_num_eht_rates(ar, band, mask) == 1) + eht_fixed_rate = true; + + if (ath12k_mac_bitrate_mask_num_he_ul_rates(ar, band, mask) == 1) + he_ul_fixed_rate = true; + + if (!vht_fixed_rate && !he_fixed_rate && !eht_fixed_rate && !he_ul_fixed_rate) + return true; + + vht_nss = ath12k_mac_max_vht_nss(vht_mcs_mask); + he_nss = ath12k_mac_max_he_nss(he_mcs_mask); + eht_nss = ath12k_mac_max_eht_nss(eht_mcs_mask); + he_ul_nss = ath12k_mac_max_he_nss(he_ul_mcs_mask); + + rcu_read_lock(); + spin_lock_bh(&ar->ab->base_lock); + list_for_each_entry_safe(peer, tmp, &ar->ab->peers, list) { + if (peer->sta) { + link_sta = rcu_dereference(peer->sta->link[link_id]); + + if (!link_sta) { + ret = false; + goto exit; + } + + if (vht_fixed_rate && (!link_sta->vht_cap.vht_supported || + link_sta->rx_nss < vht_nss)) { + ret = false; + goto exit; + } + if (he_fixed_rate && (!link_sta->he_cap.has_he || + link_sta->rx_nss < he_nss)) { + ret = false; + goto exit; + } + if (eht_fixed_rate && (!link_sta->eht_cap.has_eht || + link_sta->rx_nss < eht_nss)) { + ret = false; + goto exit; + } + /* TODO: + * check when UL is valid + */ + if (he_ul_fixed_rate && (!link_sta->he_cap.has_he || + link_sta->rx_nss < he_ul_nss)) { + ret = false; + goto exit; + } + } + } +exit: + spin_unlock_bh(&ar->ab->base_lock); + rcu_read_unlock(); + return ret; +} + +static bool +ath12k_mac_check_fixed_rate_settings_for_mumimo(struct ath12k_link_vif *arvif, + const u16 *vht_mcs_mask, + const u16 *he_mcs_mask) +{ struct ath12k *ar = arvif->ar; - int ret; + struct ieee80211_he_cap_elem he_cap_elem = {0}; + int nss_idx; + int he_nss; + int vht_nss; - ret = ath12k_wmi_set_peer_param(ar, sta->addr, - arvif->vdev_id, - WMI_PEER_PARAM_FIXED_RATE, - WMI_FIXED_RATE_NONE); - if (ret) - ath12k_warn(ar->ab, - "failed to disable peer fixed rate for STA %pM ret %d\n", - sta->addr, ret); + struct ieee80211_bss_conf *link_conf; + + rcu_read_lock(); + + link_conf = rcu_dereference(arvif->ahvif->vif->link_conf[arvif->link_id]); + + if (!link_conf) { + rcu_read_unlock(); + return -EINVAL; + } + + vht_nss = ath12k_mac_max_vht_nss(vht_mcs_mask); + + if (vht_nss != 1) { + for (nss_idx = vht_nss-1; nss_idx >= 0; nss_idx--) { + if (vht_mcs_mask[nss_idx]) + continue; + + if (arvif->vht_cap & IEEE80211_VHT_CAP_MU_BEAMFORMER_CAPABLE) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "vht fixed NSS rate is allowed only when MU MIMO is disabled\n"); + return false; + } + } + } + + if (!link_conf->he_support) { + rcu_read_unlock(); + return true; + } + + he_nss = ath12k_mac_max_he_nss(he_mcs_mask); + + + if (he_nss == 1) { + rcu_read_unlock(); + return true; + } + + for (nss_idx = he_nss-1; nss_idx >= 0; nss_idx--) { + if (he_mcs_mask[nss_idx]) + continue; + + if ((he_cap_elem.phy_cap_info[2] & IEEE80211_HE_PHY_CAP2_UL_MU_FULL_MU_MIMO) || + (he_cap_elem.phy_cap_info[4] & IEEE80211_HE_PHY_CAP4_MU_BEAMFORMER)) { + rcu_read_unlock(); + ath12k_warn(ar->ab, "he fixed NSS rate is allowed only when MU MIMO is disabled\n"); + return false; + + } + } + rcu_read_unlock(); + return true; } static int ath12k_mac_op_set_bitrate_mask(struct ieee80211_hw *hw, - struct ieee80211_vif *vif, + struct ieee80211_vif *vif, /* unsigned int link_id, */ const struct cfg80211_bitrate_mask *mask) { - struct ath12k_vif *arvif = (void *)vif->drv_priv; + unsigned int link_id = 0; + struct ath12k_hw *ah = hw->priv; + struct ath12k_vif *ahvif = (void *)vif->drv_priv; struct cfg80211_chan_def def; - struct ath12k *ar = arvif->ar; + struct ath12k *ar; enum nl80211_band band; const u8 *ht_mcs_mask; const u16 *vht_mcs_mask; + const u16 *he_mcs_mask; + const u16 *eht_mcs_mask; + const u16 *he_ul_mcs_mask; + u8 he_ltf = 0; + u8 he_gi = 0; + u8 eht_ltf = 0; + u8 eht_gi = 0; u32 rate; - u8 nss; + u8 nss, he_ul_nss = 0; u8 sgi; u8 ldpc; int single_nss; - int ret; + int ret, i; int num_rates; + int he_ul_rate = -1; + bool he_fixed_rate = false; + bool eht_fixed_rate = false; + struct ath12k_link_vif *arvif; - if (ath12k_mac_vif_chan(vif, &def)) + if (ath12k_mac_vif_chan(vif, &def, link_id)) return -EPERM; + mutex_lock(&ah->conf_mutex); + + arvif = ahvif->link[link_id]; + + if (!arvif) { + ret = -EINVAL; + goto out; + } + + ar = ath12k_get_ar_by_vif(hw, vif, link_id); + if (!ar) { + ath12k_err(NULL, + "unable to determine device to set bitrates, configs can be applied after device bringup\n"); + ret = -EPERM; + goto out; + } + band = def.chan->band; ht_mcs_mask = mask->control[band].ht_mcs; vht_mcs_mask = mask->control[band].vht_mcs; + he_mcs_mask = mask->control[band].he_mcs; + he_ul_mcs_mask = mask->control[band].he_ul_mcs; + eht_mcs_mask = mask->control[band].eht_mcs; ldpc = !!(ar->ht_cap_info & WMI_HT_CAP_LDPC); + if (vif->valid_links && ath12k_peer_assoc_h_eht_masked(eht_mcs_mask)) { + ath12k_warn(ar->ab, "cannot disable EHT rates on a ML bss\n"); + ret = -EINVAL; + goto out; + } + sgi = mask->control[band].gi; - if (sgi == NL80211_TXRATE_FORCE_LGI) - return -EINVAL; + if (sgi == NL80211_TXRATE_FORCE_LGI) { + ret = -EINVAL; + goto out; + } + + he_gi = mask->control[band].he_gi; + he_ltf = mask->control[band].he_ltf; + + eht_gi = 0xFF; + eht_ltf = 0xFF; + + for (i = 0; i < ARRAY_SIZE(mask->control[band].he_ul_mcs); i++) { + if (hweight16(mask->control[band].he_ul_mcs[i]) == 1) { + he_ul_nss = i + 1; + he_ul_rate = ffs((int) + mask->control[band].he_ul_mcs[i]) - 1; + break; + } + } + num_rates = ath12k_mac_bitrate_mask_num_he_ul_rates(ar, band, + mask); + if (ath12k_mac_he_ul_mcs_present(ar, band, mask) && + num_rates != 1) { + ath12k_warn(ar->ab, + "Setting HE UL MCS Fixed Rate range is not supported\n"); + ret = -EINVAL; + goto out; + } /* mac80211 doesn't support sending a fixed HT/VHT MCS alone, rather it * requires passing at least one of used basic rates along with them. @@ -6283,20 +14915,37 @@ if (ret) { ath12k_warn(ar->ab, "failed to get single legacy rate for vdev %i: %d\n", arvif->vdev_id, ret); - return ret; + goto out; } - ieee80211_iterate_stations_atomic(ar->hw, + ieee80211_iterate_stations_atomic(hw, ath12k_mac_disable_peer_fixed_rate, arvif); } else if (ath12k_mac_bitrate_mask_get_single_nss(ar, band, mask, &single_nss)) { rate = WMI_FIXED_RATE_NONE; nss = single_nss; + mutex_lock(&ar->conf_mutex); + arvif->bitrate_mask = *mask; + ieee80211_iterate_stations_atomic(hw, + ath12k_mac_set_bitrate_mask_iter, + arvif); + mutex_unlock(&ar->conf_mutex); } else { rate = WMI_FIXED_RATE_NONE; + + if (!ath12k_mac_check_fixed_rate_settings_for_mumimo(arvif, vht_mcs_mask, he_mcs_mask)) { + ret = -EINVAL; + goto out; + } + + if (!ath12k_mac_validate_fixed_rate_settings(ar, band, mask, link_id)) + ath12k_warn(ar->ab, + "could not update fixed rate settings to all peers due to mcs/nss incompaitiblity\n"); nss = min_t(u32, ar->num_tx_chains, - max(ath12k_mac_max_ht_nss(ht_mcs_mask), - ath12k_mac_max_vht_nss(vht_mcs_mask))); + max(max(max(ath12k_mac_max_ht_nss(ht_mcs_mask), + ath12k_mac_max_vht_nss(vht_mcs_mask)), + ath12k_mac_max_he_nss(he_mcs_mask)), + ath12k_mac_max_eht_nss(eht_mcs_mask))); /* If multiple rates across different preambles are given * we can reconfigure this info with all peers using PEER_ASSOC @@ -6328,17 +14977,43 @@ */ ath12k_warn(ar->ab, "Setting more than one MCS Value in bitrate mask not supported\n"); - return -EINVAL; + ret = -EINVAL; + goto out; } - ieee80211_iterate_stations_atomic(ar->hw, - ath12k_mac_disable_peer_fixed_rate, - arvif); + num_rates = ath12k_mac_bitrate_mask_num_he_rates(ar, band, + mask); + if (num_rates == 1) + he_fixed_rate = true; + + if (!ath12k_mac_he_mcs_range_present(ar, band, mask) && + num_rates > 1) { + ath12k_warn(ar->ab, + "Setting more than one HE MCS Value in bitrate mask not supported\n"); + ret = -EINVAL; + goto out; + } + + num_rates = ath12k_mac_bitrate_mask_num_eht_rates(ar, band, + mask); + if (num_rates == 1) + eht_fixed_rate = true; + + if (!ath12k_mac_eht_mcs_range_present(ar, band, mask) && + num_rates > 1) { + ath12k_warn(ar->ab, + "Setting more than one EHT MCS Value in bitrate mask not supported\n"); + ret =-EINVAL; + goto out; + } mutex_lock(&ar->conf_mutex); + ieee80211_iterate_stations_atomic(hw, + ath12k_mac_disable_peer_fixed_rate, + arvif); arvif->bitrate_mask = *mask; - ieee80211_iterate_stations_atomic(ar->hw, + ieee80211_iterate_stations_atomic(hw, ath12k_mac_set_bitrate_mask_iter, arvif); @@ -6347,56 +15022,119 @@ mutex_lock(&ar->conf_mutex); - ret = ath12k_mac_set_fixed_rate_params(arvif, rate, nss, sgi, ldpc); + ret = ath12k_mac_set_rate_params(arvif, rate, nss, sgi, ldpc, he_gi, + he_ltf, he_fixed_rate, eht_gi, eht_ltf, + eht_fixed_rate, he_ul_rate, he_ul_nss); if (ret) { ath12k_warn(ar->ab, "failed to set fixed rate params on vdev %i: %d\n", arvif->vdev_id, ret); } mutex_unlock(&ar->conf_mutex); - +out: + mutex_unlock(&ah->conf_mutex); return ret; } -static void -ath12k_mac_op_reconfig_complete(struct ieee80211_hw *hw, - enum ieee80211_reconfig_type reconfig_type) +static void ath12k_mac_sta_hw_restart_disconnect(struct ath12k *ar) { - struct ath12k *ar = hw->priv; - struct ath12k_base *ab = ar->ab; - int recovery_count; + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif; - if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART) - return; + list_for_each_entry(arvif, &ar->arvifs, list) { + ahvif = arvif->ahvif; + if (ahvif->vdev_type == WMI_VDEV_TYPE_STA) + ieee80211_hw_restart_disconnect(ahvif->vif); + } +} + +static void ath12k_mac_reconfig_completion(struct ath12k *ar, + u8 *restart_count) +{ + u8 recovery_count; mutex_lock(&ar->conf_mutex); if (ar->state == ATH12K_STATE_RESTARTED) { + if (ar->ab->ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE0) + ath12k_mac_sta_hw_restart_disconnect(ar); ath12k_warn(ar->ab, "pdev %d successfully recovered\n", ar->pdev->pdev_id); ar->state = ATH12K_STATE_ON; - ieee80211_wake_queues(ar->hw); + *restart_count += 1; + } - if (ab->is_reset) { - recovery_count = atomic_inc_return(&ab->recovery_count); - ath12k_dbg(ab, ATH12K_DBG_BOOT, "recovery count %d\n", - recovery_count); + if (ar->ab->is_reset) { + recovery_count = atomic_inc_return(&ar->ab->recovery_count); + ath12k_dbg(ar->ab, ATH12K_DBG_BOOT, + "recovery count %d\n", recovery_count); /* When there are multiple radios in an SOC, * the recovery has to be done for each radio */ - if (recovery_count == ab->num_radios) { - atomic_dec(&ab->reset_count); - complete(&ab->reset_complete); - ab->is_reset = false; - atomic_set(&ab->fail_cont_count, 0); - ath12k_dbg(ab, ATH12K_DBG_BOOT, "reset success\n"); - } + if (recovery_count == ar->ab->num_radios) { + atomic_dec(&ar->ab->reset_count); + complete(&ar->ab->reset_complete); + ar->ab->is_reset = false; + ar->ab->recovery_start = false; + atomic_set(&ar->ab->fail_cont_count, 0); + clear_bit(ATH12K_FLAG_RECOVERY, &ar->ab->dev_flags); + spin_lock_bh(&ar->ab->base_lock); + ar->ab->stats.last_recovery_time = + jiffies_to_msecs(jiffies - + ar->ab->recovery_start_time); + spin_unlock_bh(&ar->ab->base_lock); + ath12k_dbg(ar->ab, ATH12K_DBG_BOOT, "reset success\n"); } } mutex_unlock(&ar->conf_mutex); } +void +ath12k_mac_reconfig_complete(struct ieee80211_hw *hw, + enum ieee80211_reconfig_type reconfig_type, + struct ath12k *asserted_radio) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + u8 restart_count = 0; + int i; + + if (reconfig_type != IEEE80211_RECONFIG_TYPE_RESTART) + return; + + mutex_lock(&ah->conf_mutex); + + ar = ah->radio; + + if (asserted_radio) { + ath12k_mac_reconfig_completion(asserted_radio, &restart_count); + goto out; + } + + for (i = 0; i < ah->num_radio; i++) { + ath12k_mac_reconfig_completion(ar, &restart_count); + ar++; + } + +out: + /* If is_one_radio flag is set, then assume other radios + * are up and running and wake queues once the reconfig is + * done + */ + if (restart_count == ah->num_radio) + ieee80211_wake_queues(ah->hw); + + mutex_unlock(&ah->conf_mutex); + ah->ag->hw_queues_stopped = false; +} + +static void ath12k_mac_op_reconfig_complete(struct ieee80211_hw *hw, + enum ieee80211_reconfig_type reconfig_type) +{ + ath12k_mac_reconfig_complete(hw, reconfig_type, NULL); +} + static void ath12k_mac_update_bss_chan_survey(struct ath12k *ar, struct ieee80211_channel *channel) @@ -6432,32 +15170,59 @@ static int ath12k_mac_op_get_survey(struct ieee80211_hw *hw, int idx, struct survey_info *survey) { - struct ath12k *ar = hw->priv; + struct ath12k *ar; struct ieee80211_supported_band *sband; struct survey_info *ar_survey; int ret = 0; + enum nl80211_band band; if (idx >= ATH12K_NUM_CHANS) return -ENOENT; - ar_survey = &ar->survey[idx]; - - mutex_lock(&ar->conf_mutex); - + band = NL80211_BAND_2GHZ; sband = hw->wiphy->bands[NL80211_BAND_2GHZ]; if (sband && idx >= sband->n_channels) { idx -= sband->n_channels; sband = NULL; } - if (!sband) + if (!sband) { sband = hw->wiphy->bands[NL80211_BAND_5GHZ]; + band = NL80211_BAND_5GHZ; + } + + if (sband && idx >= sband->n_channels) { + idx -= sband->n_channels; + sband = NULL; + } + + if (!sband) { + sband = hw->wiphy->bands[NL80211_BAND_6GHZ]; + band = NL80211_BAND_6GHZ; + } if (!sband || idx >= sband->n_channels) { ret = -ENOENT; goto exit; } + ar = ath12k_mac_get_ar_by_chan(hw, &sband->channels[idx]); + if (!ar) { + if (sband->channels[idx].flags & IEEE80211_CHAN_DISABLED) { + ret = 0; + /* Flushing out the old survey results if any */ + memset(survey, 0, sizeof(*survey)); + goto exit; + } else { + ret = -ENOENT; + goto exit; + } + } + + ar_survey = &ar->survey[idx]; + + mutex_lock(&ar->conf_mutex); + ath12k_mac_update_bss_chan_survey(ar, &sband->channels[idx]); spin_lock_bh(&ar->data_lock); @@ -6469,27 +15234,68 @@ if (ar->rx_channel == survey->channel) survey->filled |= SURVEY_INFO_IN_USE; -exit: mutex_unlock(&ar->conf_mutex); + +exit: return ret; } +void ath12k_mac_ap_ps_recalc(struct ath12k *ar) { + struct ath12k_link_vif *arvif; + enum ath12k_ap_ps_state state = ATH12K_AP_PS_STATE_OFF; + int ret; + bool allow_ap_ps = true; + + lockdep_assert_held(&ar->conf_mutex); + list_for_each_entry(arvif, &ar->arvifs, list) { + if (arvif->ahvif->vdev_type != WMI_VDEV_TYPE_AP) { + allow_ap_ps = false; + break; + } + } + + if (!allow_ap_ps) + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "ap ps is not" + "allowed\n"); + + if (allow_ap_ps && !ar->num_stations && ar->ap_ps_enabled) + state = ATH12K_AP_PS_STATE_ON; + + if (ar->ap_ps_state == state) + return; + + ret = ath12k_wmi_pdev_ap_ps_cmd_send(ar, ar->pdev->pdev_id, state); + if (!ret) + ar->ap_ps_state = state; + else + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "failed to send ap ps command pdev_id %u state %u\n", + ar->pdev->pdev_id, state); +} + static void ath12k_mac_op_sta_statistics(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta, struct station_info *sinfo) { - struct ath12k_sta *arsta = (struct ath12k_sta *)sta->drv_priv; - + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_link_sta *arsta = &ahsta->deflink; + struct ath12k *ar = arsta->arvif->ar; + + /* TODO accumulate link sta stats here? */ + + if (!ar) { + ath12k_err(NULL, + "unable to determine sta statistics \n"); + return; + } sinfo->rx_duration = arsta->rx_duration; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_RX_DURATION); sinfo->tx_duration = arsta->tx_duration; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_DURATION); - if (!arsta->txrate.legacy && !arsta->txrate.nss) - return; - + if (arsta->txrate.legacy || arsta->txrate.nss) { if (arsta->txrate.legacy) { sinfo->txrate.legacy = arsta->txrate.legacy; } else { @@ -6502,10 +15308,686 @@ } sinfo->txrate.flags = arsta->txrate.flags; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); + } - /* TODO: Use real NF instead of default one. */ - sinfo->signal = arsta->rssi_comb + ATH12K_DEFAULT_NOISE_FLOOR; + sinfo->signal = arsta->rssi_comb + ar->rssi_offsets.rssi_offset; sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL); + + sinfo->signal_avg = ewma_avg_rssi_read(&arsta->avg_rssi) + + ar->rssi_offsets.rssi_offset; + + sinfo->filled |= BIT_ULL(NL80211_STA_INFO_SIGNAL_AVG); +} + +int ath12k_mac_btcoex_config(struct ath12k *ar, struct ath12k_link_vif *arvif, + int coex, u32 wlan_prio_mask, u8 wlan_weight) +{ + struct coex_config_arg coex_config; + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + if (coex == BTCOEX_CONFIGURE_DEFAULT || (test_bit(ATH12K_FLAG_BTCOEX, &ar->dev_flags) ^ coex)) { + goto next; + } + + coex_config.vdev_id = arvif->vdev_id; + if (coex == BTCOEX_ENABLE) { + coex_config.config_type = WMI_COEX_CONFIG_PTA_INTERFACE; + coex_config.pta_num = ar->coex.pta_num; + coex_config.coex_mode = ar->coex.coex_mode; + coex_config.bt_txrx_time = ar->coex.bt_active_time_slot; + coex_config.bt_priority_time = ar->coex.bt_priority_time_slot; + coex_config.pta_algorithm = ar->coex.coex_algo_type; + coex_config.pta_priority = ar->coex.pta_priority; + ret = ath12k_send_coex_config_cmd(ar, &coex_config); + if (ret) { + ath12k_warn(ar->ab, + "failed to set coex config vdev_id %d ret %d\n", + coex_config.vdev_id, ret); + goto out; + } + } + + memset(&coex_config, 0, sizeof(struct coex_config_arg)); + coex_config.vdev_id = arvif->vdev_id; + coex_config.config_type = WMI_COEX_CONFIG_BTC_ENABLE; + coex_config.coex_enable = coex; + ret = ath12k_send_coex_config_cmd(ar, &coex_config); + if (ret) { + ath12k_warn(ar->ab, + "failed to set coex config vdev_id %d ret %d\n", + coex_config.vdev_id, ret); + goto out; + } + +next: + if (!coex) { + ret = 0; + goto out; + } + + memset(&coex_config, 0, sizeof(struct coex_config_arg)); + coex_config.vdev_id = arvif->vdev_id; + coex_config.config_type = WMI_COEX_CONFIG_WLAN_PKT_PRIORITY; + coex_config.wlan_pkt_type = wlan_prio_mask; + coex_config.wlan_pkt_weight = wlan_weight; + ret = ath12k_send_coex_config_cmd(ar, &coex_config); + if (ret) { + ath12k_warn(ar->ab, + "failed to set coex config vdev_id %d ret %d\n", + coex_config.vdev_id, ret); + } + +out: + return ret; +} + +static int ath12k_fw_stats_request(struct ath12k *ar, + struct stats_request_params *req_param) +{ + struct ath12k_base *ab = ar->ab; + unsigned long time_left; + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + spin_lock_bh(&ar->data_lock); + ar->fw_stats_done = false; + ath12k_fw_stats_pdevs_free(&ar->fw_stats.pdevs); + spin_unlock_bh(&ar->data_lock); + + reinit_completion(&ar->fw_stats_complete); + + ret = ath12k_wmi_send_stats_request_cmd(ar, req_param->stats_id, + req_param->vdev_id, req_param->pdev_id); + if (ret) { + ath12k_warn(ab, "could not request fw stats (%d)\n", + ret); + return ret; + } + + time_left = + wait_for_completion_timeout(&ar->fw_stats_complete, + 1 * HZ); + + if (!time_left) + return -ETIMEDOUT; + + return 0; +} + +static int ath12k_mac_op_get_txpower(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + /* unsigned int link_id, */int *dbm) +{ + unsigned int link_id = 0; + struct ath12k_hw *ah = hw->priv; + struct stats_request_params req_param; + struct ath12k_fw_stats_pdev *pdev; + struct ath12k *ar; + struct ath12k_base *ab; + int ret; + struct ieee80211_bss_conf *link_conf; + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif; + + /* Final Tx power is minimum of Target Power, CTL power, Regulatory + * Power, PSD EIRP Power. We just know the Regulatory power from the + * regulatory rules obtained. FW knows all these power and sets the min + * of these. Hence, we request the FW pdev stats in which FW reports + * the minimum of all vdev's channel Tx power. + */ + mutex_lock(&ah->conf_mutex); + + ar = ath12k_get_ar_by_vif(hw, vif, link_id); + if (!ar) { + goto err_fallback; + } + + ab = ar->ab; + if (ar->state != ATH12K_STATE_ON) { + goto err_fallback; + } + + mutex_lock(&ar->conf_mutex); + if (test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) { + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + *dbm = 0; + return 0; + } + + /* Limit the requests to Firmware for fetching the tx power */ + if (ar->chan_tx_pwr != ATH12K_PDEV_TX_POWER_INVALID && + time_before(jiffies, msecs_to_jiffies(ATH12K_PDEV_TX_POWER_REFRESH_TIME_MSECS) + + ar->last_tx_power_update)) + goto get_tx_power; + + req_param.pdev_id = ar->pdev->pdev_id; + req_param.vdev_id = 0; + req_param.stats_id = WMI_REQUEST_PDEV_STAT; + + ret = ath12k_fw_stats_request(ar, &req_param); + if (ret) { + ath12k_warn(ab, "failed to request fw pdev stats: %d\n", ret); + mutex_unlock(&ar->conf_mutex); + goto err_fallback; + } + + spin_lock_bh(&ar->data_lock); + pdev = list_first_entry_or_null(&ar->fw_stats.pdevs, + struct ath12k_fw_stats_pdev, + list); + if (!pdev) { + spin_unlock_bh(&ar->data_lock); + mutex_unlock(&ar->conf_mutex); + goto err_fallback; + } + + /* tx power is set as 2 units per dBm in FW. */ + ar->chan_tx_pwr = pdev->chan_tx_power/2; + ar->last_tx_power_update = jiffies; + + spin_unlock_bh(&ar->data_lock); + +get_tx_power: + *dbm = ar->chan_tx_pwr; + + mutex_unlock(&ar->conf_mutex); + mutex_unlock(&ah->conf_mutex); + + ath12k_dbg(ab, ATH12K_DBG_MAC, "txpower reported %d dBm\n", *dbm); + return 0; + +err_fallback: + ahvif = ath12k_vif_to_ahvif(vif); + arvif = ahvif->link[link_id]; + + if (!arvif) { + *dbm = 0; + mutex_unlock(&ah->conf_mutex); + return 0; + } + + rcu_read_lock(); + + /* We didn't get txpower from FW. Hence, relying on link_conf->txpower */ + link_conf = ath12k_get_link_bss_conf(arvif); + + if (!link_conf) { + *dbm = 0; + rcu_read_unlock(); + mutex_unlock(&ah->conf_mutex); + return 0; + } + + *dbm = link_conf->txpower; + rcu_read_unlock(); + mutex_unlock(&ah->conf_mutex); + ath12k_dbg(NULL, ATH12K_DBG_MAC, "txpower from firmware NaN, reported %d dBm\n", + *dbm); + return 0; +} + +/* + * Cancel remain on channel scan. This API will be called when remain on + * channel timer expires or when ROC scan required to be cancelled by + * mac layer even before ROC timer expires. + */ +static int ath12k_mac_op_cancel_remain_on_channel(struct ieee80211_hw *hw, + struct ieee80211_vif *vif) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + struct ath12k_vif *ahvif = ath12k_vif_to_ahvif(vif); + u8 link_id = ahvif->last_scan_link; + struct ath12k_link_vif *arvif; + + mutex_lock(&ah->conf_mutex); + if (!(ahvif->links_map & BIT(link_id))) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(NULL, "unable to cancel scan. Link id %d not found\n", + link_id); + return -EINVAL; + } + + arvif = ahvif->link[link_id]; + + if (!arvif || !arvif->is_created) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(NULL, "unable to cancel scan. arvif interface is not created\n"); + return -EINVAL; + } + + ar = arvif->ar; + if (!ar) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(NULL, "unable to select device to cancel scan\n"); + return -EINVAL; + } + mutex_unlock(&ah->conf_mutex); + + mutex_lock(&ar->conf_mutex); + + spin_lock_bh(&ar->data_lock); + ar->scan.roc_notify = false; + spin_unlock_bh(&ar->data_lock); + + ath12k_scan_abort(ar); + + mutex_unlock(&ar->conf_mutex); + + cancel_delayed_work_sync(&ar->scan.timeout); + + return 0; +} + +/* + * Initiate remain on channel scan. When AP required to go to scan + * on off-channel, remain on channel will be called. This will + * start the scan in the requested channel + */ +static int ath12k_mac_op_remain_on_channel(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_channel *chan, + int duration, + enum ieee80211_roc_type type) +{ + struct ath12k_hw *ah = hw->priv; + struct ath12k_link_vif *arvif; + struct ath12k *ar; + struct ath12k_wmi_scan_req_arg arg = {0}; + struct cfg80211_chan_def chandef = {}; + struct ath12k_vif *ahvif; + int ret = 0, link_id; + u32 scan_time_msec; + bool create = true; + + mutex_lock(&ah->conf_mutex); + + ar = ath12k_mac_select_scan_device(hw, vif, chan->center_freq); + if (!ar) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(NULL, "unable to select device for scan\n"); + return -EINVAL; + } + if (unlikely(test_bit(ATH12K_FLAG_RECOVERY, &ar->ab->dev_flags))) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(ar->ab, "Recovery is in progress, cannot perform scan\n"); + return -ESHUTDOWN; + } + + link_id = ath12k_mac_find_link_id_by_freq(vif, ar, + chan->center_freq); + + arvif = ath12k_mac_assign_link_vif(ah, vif, link_id); + + if (!arvif) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(ar->ab, "arvif device is not found, link_id:%d, chan:%d, band:%d\n", + link_id, chan->center_freq, chan->band); + return -ENOMEM; + } + + if (arvif->is_created) { + if (ar != arvif->ar) { + if (arvif->is_started) { + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + if (!arvif->ar) { + mutex_unlock(&ah->conf_mutex); + return -EINVAL; + } + mutex_lock(&arvif->ar->conf_mutex); + arvif->ar->scan.vdev_id = -1; + mutex_unlock(&arvif->ar->conf_mutex); + + ath12k_mac_remove_link_interface(hw, arvif); + ath12k_mac_unassign_link_vif(arvif); + } else { + create = false; + } + } + + if (create) { + mutex_lock(&ar->conf_mutex); + ret = ath12k_mac_vdev_create(ar, arvif); + mutex_unlock(&ar->conf_mutex); + if (ret) { + mutex_unlock(&ah->conf_mutex); + ath12k_warn(ar->ab, "unable to create scan vdev %d\n", ret); + return -EINVAL; + } + } + + ahvif = arvif->ahvif; + if (!arvif->is_started && ahvif->vdev_type == WMI_VDEV_TYPE_STA) { + chandef.chan = chan; + chandef.center_freq1 = chan->center_freq; + ret = ath12k_mac_vdev_start(arvif, &chandef, 0); + if (ret) { + mutex_unlock(&ah->conf_mutex); + ath12k_err(ar->ab, "vdev start failed sta roc\n"); + return -EINVAL; + } + arvif->is_started = true; + arvif->is_scan_vif = true; + } + + mutex_unlock(&ah->conf_mutex); + + mutex_lock(&ar->conf_mutex); + spin_lock_bh(&ar->data_lock); + switch (ar->scan.state) { + case ATH12K_SCAN_IDLE: + reinit_completion(&ar->scan.started); + reinit_completion(&ar->scan.completed); + reinit_completion(&ar->scan.on_channel); + ar->scan.state = ATH12K_SCAN_STARTING; + ar->scan.is_roc = true; + ar->scan.vdev_id = arvif->vdev_id; + ar->scan.roc_freq = chan->center_freq; + ar->scan.roc_notify = true; + ret = 0; + break; + case ATH12K_SCAN_STARTING: + case ATH12K_SCAN_RUNNING: + case ATH12K_SCAN_ABORTING: + ret = -EBUSY; + break; + } + spin_unlock_bh(&ar->data_lock); + + if (ret) { + mutex_unlock(&ar->conf_mutex); + ath12k_err(ar->ab, "Unable to start scan. scan_state:%d\n", ar->scan.state); + return ret; + } + + if (duration <= 0) + scan_time_msec = ah->hw->wiphy->max_remain_on_channel_duration * 2; + else + scan_time_msec = duration; + + ath12k_wmi_start_scan_init(ar, &arg); + + arg.num_chan = 1; + arg.chan_list = kcalloc(arg.num_chan, sizeof(*arg.chan_list), + GFP_KERNEL); + if (!arg.chan_list) { + mutex_unlock(&ar->conf_mutex); + ath12k_err(ar->ab, "chan list memory allocation failed\n"); + return -ENOMEM; + } + arg.chan_list[0] = chan->center_freq; + + arg.vdev_id = arvif->vdev_id; + arg.scan_id = ATH12K_SCAN_ID; + arg.dwell_time_active = scan_time_msec; + arg.dwell_time_passive = scan_time_msec; + arg.max_scan_time = scan_time_msec; + arg.dwell_time_active_6g = scan_time_msec; + arg.dwell_time_passive_6g = scan_time_msec; + + /* Set required scan flags*/ + arg.scan_f_passive = 1; + arg.scan_f_filter_prb_req = 1; + + /*these flags enables fw to tx offchan frame to unknown STA*/ + arg.scan_f_offchan_mgmt_tx = 1; + arg.scan_f_offchan_data_tx = 1; + arg.burst_duration = duration; + + ret = ath12k_start_scan(ar, &arg); + if (ret) { + ath12k_warn(ar->ab, "failed to start roc scan: %d\n", ret); + spin_lock_bh(&ar->data_lock); + ar->scan.state = ATH12K_SCAN_IDLE; + spin_unlock_bh(&ar->data_lock); + goto exit; + } + + ret = wait_for_completion_timeout(&ar->scan.on_channel, 3 * HZ); + if (ret == 0) { + ath12k_warn(ar->ab, "failed to switch to channel for roc scan\n"); + ret = ath12k_scan_stop(ar); + if (ret) + ath12k_warn(ar->ab, "failed to stop scan: %d\n", ret); + ret = -ETIMEDOUT; + goto exit; + } + + ieee80211_queue_delayed_work(ah->hw, &ar->scan.timeout, + msecs_to_jiffies(duration + + ATH12K_MAC_SCAN_TIMEOUT_MSECS)); + + ret = 0; + +exit: + kfree(arg.chan_list); + mutex_unlock(&ar->conf_mutex); + return ret; +} + +/* Note: only half bandwidth agile is supported */ +bool ath12k_is_supported_agile_bandwidth(enum nl80211_chan_width conf_bw, + enum nl80211_chan_width agile_bw) +{ + bool is_supported = false; + + switch (conf_bw) { + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_20: + case NL80211_CHAN_WIDTH_40: + if (agile_bw <= conf_bw) + is_supported = true; + break; + case NL80211_CHAN_WIDTH_80: + if (agile_bw == conf_bw || + agile_bw == NL80211_CHAN_WIDTH_40) + is_supported = true; + break; + case NL80211_CHAN_WIDTH_160: + if (agile_bw == conf_bw || + agile_bw == NL80211_CHAN_WIDTH_80) + is_supported = true; + break; + case NL80211_CHAN_WIDTH_320: + if (agile_bw == conf_bw || + agile_bw == NL80211_CHAN_WIDTH_160) + is_supported = true; + break; + default: + break; + } + + return is_supported; +} + +/* Note: caller should call rcu_read_lock before getting the peer mac. + */ +static u8 *ath12k_get_peer_mac(struct ieee80211_vif *vif, u8 *addr, u8 *link_id) +{ + struct ieee80211_sta *ap_sta; + struct ath12k_sta *ahsta; + struct ath12k_link_sta *arsta; + u8 link, *peer_addr = NULL; + + ap_sta = ieee80211_find_sta(vif, addr); + if (!ap_sta) + return NULL; + + ahsta = ath12k_sta_to_ahsta(ap_sta); + + for_each_set_bit(link, &ahsta->links_map, IEEE80211_MLD_MAX_NUM_LINKS) { + arsta = ahsta->link[link]; + if (!arsta) + continue; + + *link_id = link; + peer_addr = arsta->addr; + break; + } + return peer_addr; +} + +int ath12k_mac_op_set_scs(struct wireless_dev *wdev, + struct ath12k_latency_params *params) +{ + struct ieee80211_vif *vif; + struct ath12k *ar; + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif; + u8 *peer_mac; + int ret = 0; + u8 link_id; + + if (!wdev || !params) + return -EINVAL; + + vif = wdev_to_ieee80211_vif(wdev); + if (!vif) + return -EINVAL; + + ahvif = ath12k_vif_to_ahvif(vif); + if (!ahvif) + return -EINVAL; + + rcu_read_lock(); + peer_mac = ath12k_get_peer_mac(vif, params->peer_mac, &link_id); + if (!peer_mac) { + rcu_read_unlock(); + return -EINVAL; + } + memcpy(params->peer_mac, peer_mac, ETH_ALEN); + rcu_read_unlock(); + + arvif = ahvif->link[link_id]; + if (WARN_ON(!arvif)) + return -EINVAL; + + ar = arvif->ar; + if (!ar) + return -EINVAL; + + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "link id %d\n", link_id); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "service interval %d\n", params->service_interval); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "burst size %d\n", params->burst_size); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "delay bound %d\n", params->delay_bound); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "min data rate %d\n", params->min_data_rate); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "user priority %d\n", params->user_priority); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "req type %d\n", params->req_type); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "access category %d\n", params->ac); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "direction %d\n", params->direction); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "peer mac %pM\n", params->peer_mac); + + ret = ath12k_wmi_set_latency(ar, params); + return ret; +} + +static int ath12k_mac_op_set_radar_background(struct ieee80211_hw *hw, + struct cfg80211_chan_def *def) +{ + struct ath12k *ar; + struct ath12k_link_vif *arvif; + struct ath12k_vif *ahvif; + bool arvif_found = false; + int ret; + struct cfg80211_chan_def conf_def; + + if (def) + ar = ath12k_mac_get_ar_by_chan(hw, def->chan); + else + ar = ath12k_mac_get_ar_by_agile_chandef(hw, NL80211_BAND_5GHZ); + + if (!ar) + return -EINVAL; + + mutex_lock(&ar->conf_mutex); + + if (ar->ab->dfs_region == ATH12K_DFS_REG_UNSET) { + ret = -EINVAL; + goto exit; + } + + if (!test_bit(ar->cfg_rx_chainmask, &ar->pdev->cap.adfs_chain_mask) && + !test_bit(WMI_TLV_SERVICE_SW_PROG_DFS_SUPPORT, ar->ab->wmi_ab.svc_map)) { + ret = -EINVAL; + goto exit; + } + + list_for_each_entry(arvif, &ar->arvifs, list) { + ahvif = arvif->ahvif; + if (arvif->is_started && ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + arvif_found = true; + break; + } + } + + if (!arvif_found) { + ret = -EINVAL; + goto exit; + } + + if (!def) { + ret = ath12k_wmi_vdev_adfs_ocac_abort_cmd_send(ar,arvif->vdev_id); + if (!ret) { + memset(&ar->agile_chandef, 0, sizeof(struct cfg80211_chan_def)); + ar->agile_chandef.chan = NULL; + } + } else { + if (!cfg80211_chandef_valid(def)) { + ret = -EINVAL; + goto exit; + } + + if (WARN_ON(ath12k_mac_vif_chan(ahvif->vif, &conf_def, arvif->link_id))) { + ret = -EINVAL; + goto exit; + } + + if (cfg80211_chandef_identical(&conf_def, def) /* && + cfg80211_chandef_device_present(def) */) { + if (!test_bit(WMI_TLV_SERVICE_SW_PROG_DFS_SUPPORT, + ar->ab->wmi_ab.svc_map)) + ret = -EINVAL; + else + ret = 0; + goto exit; + } + + if (!(def->chan->flags & IEEE80211_CHAN_RADAR)) { + ret = -EINVAL; + goto exit; + } + + /* Note: Only Half width and full bandwidth is supported */ + if(!(ath12k_is_supported_agile_bandwidth(conf_def.width, + def->width))) { + ret = -EINVAL; + goto exit; + } + + if (conf_def.center_freq1 == def->center_freq1) { + ret = -EINVAL; + goto exit; + } + + ret = ath12k_wmi_vdev_adfs_ch_cfg_cmd_send(ar, arvif->vdev_id, def); + if (!ret) { + memcpy(&ar->agile_chandef, def, sizeof(struct cfg80211_chan_def)); + } else { + memset(&ar->agile_chandef, 0, sizeof(struct cfg80211_chan_def)); + ar->agile_chandef.chan = NULL; + } + } + +exit: + mutex_unlock(&ar->conf_mutex); + return ret; } static const struct ieee80211_ops ath12k_ops = { @@ -6518,12 +16000,15 @@ .remove_interface = ath12k_mac_op_remove_interface, .update_vif_offload = ath12k_mac_op_update_vif_offload, .config = ath12k_mac_op_config, - .bss_info_changed = ath12k_mac_op_bss_info_changed, + .link_info_changed = ath12k_mac_op_bss_info_changed, + .vif_cfg_changed = ath12k_mac_op_vif_cfg_changed, + .change_vif_links = ath12k_mac_op_change_vif_links, .configure_filter = ath12k_mac_op_configure_filter, .hw_scan = ath12k_mac_op_hw_scan, .cancel_hw_scan = ath12k_mac_op_cancel_hw_scan, .set_key = ath12k_mac_op_set_key, .sta_state = ath12k_mac_op_sta_state, + .sta_set_4addr = ath12k_mac_op_sta_set_4addr, .sta_set_txpwr = ath12k_mac_op_sta_set_txpwr, .sta_rc_update = ath12k_mac_op_sta_rc_update, .conf_tx = ath12k_mac_op_conf_tx, @@ -6541,7 +16026,21 @@ .set_bitrate_mask = ath12k_mac_op_set_bitrate_mask, .get_survey = ath12k_mac_op_get_survey, .flush = ath12k_mac_op_flush, + .flush_sta = ath12k_mac_op_flush_sta, .sta_statistics = ath12k_mac_op_sta_statistics, + .change_sta_links = ath12k_mac_op_change_sta_links, + CFG80211_TESTMODE_CMD(ath12k_tm_cmd) +#ifdef CONFIG_ATH12K_DEBUGFS + .sta_add_debugfs = ath12k_debugfs_sta_op_add, + .link_sta_add_debugfs = ath12k_debugfs_link_sta_op_add, +#endif + .remain_on_channel = ath12k_mac_op_remain_on_channel, + .cancel_remain_on_channel = ath12k_mac_op_cancel_remain_on_channel, + .get_txpower = ath12k_mac_op_get_txpower, + .set_radar_background = ath12k_mac_op_set_radar_background, +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + .set_multicast_to_unicast = ath12k_mac_op_set_multicast_to_unicast, +#endif }; static void ath12k_mac_update_ch_list(struct ath12k *ar, @@ -6560,6 +16059,65 @@ } } +/* During MLO split mac scenario, both the supporting channel list of same band + * should be updated in same wiphy->band[] place. We update the later incoming + * pdev supported channel list (new_band) into wiphy->band[] (orig_band) + */ +static int ath12k_mac_update_band(struct ath12k *ar, + struct ieee80211_supported_band *orig_band, + struct ieee80211_supported_band *new_band) +{ + struct ath12k_base *ab = ar->ab; + int i; + + if (!orig_band || !new_band) + return -EINVAL; + + if (orig_band->band != new_band->band) + return -EINVAL; + + if (WARN_ON(!ab->ag->mlo_capable)) + return -EOPNOTSUPP; + + for (i = 0; i < new_band->n_channels; i++) { + if (new_band->channels[i].flags & IEEE80211_CHAN_DISABLED) + continue; + + /* An enabled channel in new_band should not be already enabled + * in the orig_band + */ + if (WARN_ON(!(orig_band->channels[i].flags & + IEEE80211_CHAN_DISABLED))) + return -ENOTRECOVERABLE; + + orig_band->channels[i].flags &= ~IEEE80211_CHAN_DISABLED; + } + + return 0; +} + +#define ATH12K_5_9_MIN_FREQ 5845 +#define ATH12K_5_9_MAX_FREQ 5885 + +static void ath12k_mac_update_5_9_ch_list(struct ath12k *ar, + struct ieee80211_supported_band *band) +{ + int i; + + if (test_bit(WMI_TLV_SERVICE_5_9GHZ_SUPPORT, + ar->ab->wmi_ab.svc_map)) + return; + + if (ar->ab->dfs_region != ATH12K_DFS_REG_FCC) + return; + + for (i = 0; i < band->n_channels; i++) { + if (band->channels[i].center_freq >= ATH12K_5_9_MIN_FREQ && + band->channels[i].center_freq <= ATH12K_5_9_MAX_FREQ) + band->channels[i].flags |= IEEE80211_CHAN_DISABLED; + } +} + static u32 ath12k_get_phy_id(struct ath12k *ar, u32 band) { struct ath12k_pdev *pdev = ar->pdev; @@ -6579,17 +16137,21 @@ static int ath12k_mac_setup_channels_rates(struct ath12k *ar, u32 supported_bands) { + struct ath12k_base *ab = ar->ab; + struct ath12k_hw *ah = ar->ah; struct ieee80211_supported_band *band; - struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap; + struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap, *temp_reg_cap; void *channels; - u32 phy_id; + u32 phy_id, freq_low, freq_high; + int ret; BUILD_BUG_ON((ARRAY_SIZE(ath12k_2ghz_channels) + ARRAY_SIZE(ath12k_5ghz_channels) + ARRAY_SIZE(ath12k_6ghz_channels)) != ATH12K_NUM_CHANS); - reg_cap = &ar->ab->hal_reg_cap[ar->pdev_idx]; + reg_cap = &ab->hal_reg_cap[ar->pdev_idx]; + temp_reg_cap = reg_cap; if (supported_bands & WMI_HOST_WLAN_2G_CAP) { channels = kmemdup(ath12k_2ghz_channels, @@ -6604,46 +16166,55 @@ band->channels = channels; band->n_bitrates = ath12k_g_rates_size; band->bitrates = ath12k_g_rates; - ar->hw->wiphy->bands[NL80211_BAND_2GHZ] = band; - if (ar->ab->hw_params->single_pdev_only) { + if (ab->hw_params->single_pdev_only) { phy_id = ath12k_get_phy_id(ar, WMI_HOST_WLAN_2G_CAP); - reg_cap = &ar->ab->hal_reg_cap[phy_id]; + temp_reg_cap = &ab->hal_reg_cap[phy_id]; } ath12k_mac_update_ch_list(ar, band, - reg_cap->low_2ghz_chan, - reg_cap->high_2ghz_chan); - } + temp_reg_cap->low_2ghz_chan, + temp_reg_cap->high_2ghz_chan); - if (supported_bands & WMI_HOST_WLAN_5G_CAP) { - if (reg_cap->high_5ghz_chan >= ATH12K_MAX_6G_FREQ) { - channels = kmemdup(ath12k_6ghz_channels, - sizeof(ath12k_6ghz_channels), GFP_KERNEL); - if (!channels) { - kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); - return -ENOMEM; - } + freq_low = max(temp_reg_cap->low_2ghz_chan, + ab->reg_freq_2g.start_freq); + freq_high = min(temp_reg_cap->high_2ghz_chan, + ab->reg_freq_2g.end_freq); + + ar->chan_info.low_freq = freq_low; + ar->chan_info.high_freq = freq_high; + ar->chan_info.num_channels = ath12k_reg_get_num_chans_in_band(ar, band, + freq_low, + freq_high); + + if (!ah->hw->wiphy->bands[NL80211_BAND_2GHZ]) { + ah->hw->wiphy->bands[NL80211_BAND_2GHZ] = band; + ah->supported_band_mask |= BIT(NL80211_BAND_2GHZ); + } else { + /* Split mac in same band under same wiphy during MLO */ + ret = ath12k_mac_update_band(ar, + ah->hw->wiphy->bands[NL80211_BAND_2GHZ], + band); + if (ret) + return ret; - ar->supports_6ghz = true; - band = &ar->mac.sbands[NL80211_BAND_6GHZ]; - band->band = NL80211_BAND_6GHZ; - band->n_channels = ARRAY_SIZE(ath12k_6ghz_channels); - band->channels = channels; - band->n_bitrates = ath12k_a_rates_size; - band->bitrates = ath12k_a_rates; - ar->hw->wiphy->bands[NL80211_BAND_6GHZ] = band; - ath12k_mac_update_ch_list(ar, band, - reg_cap->low_5ghz_chan, - reg_cap->high_5ghz_chan); + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac pdev %u identified as 2 GHz split mac during MLO\n", + ar->pdev->pdev_id); + } } - if (reg_cap->low_5ghz_chan < ATH12K_MIN_6G_FREQ) { + if (supported_bands & WMI_HOST_WLAN_5G_CAP) { + /* If 5g end and 6g start overlaps, decide band based on + * the difference between target limit and ATH12K_5G_MAX_CENTER. + */ + if ((reg_cap->low_5ghz_chan >= ATH12K_MIN_5G_FREQ) && + ((reg_cap->high_5ghz_chan < ATH12K_MAX_5G_FREQ) || + ((reg_cap->high_5ghz_chan - ATH12K_5G_MAX_CENTER) < (ATH12K_HALF_20MHZ_BW * 2)))) { channels = kmemdup(ath12k_5ghz_channels, sizeof(ath12k_5ghz_channels), GFP_KERNEL); if (!channels) { kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); - kfree(ar->mac.sbands[NL80211_BAND_6GHZ].channels); + ar->mac.sbands[NL80211_BAND_2GHZ].channels = NULL; return -ENOMEM; } @@ -6653,34 +16224,120 @@ band->channels = channels; band->n_bitrates = ath12k_a_rates_size; band->bitrates = ath12k_a_rates; - ar->hw->wiphy->bands[NL80211_BAND_5GHZ] = band; if (ar->ab->hw_params->single_pdev_only) { phy_id = ath12k_get_phy_id(ar, WMI_HOST_WLAN_5G_CAP); - reg_cap = &ar->ab->hal_reg_cap[phy_id]; + temp_reg_cap = &ab->hal_reg_cap[phy_id]; } + ath12k_mac_update_ch_list(ar, band, + temp_reg_cap->low_5ghz_chan, + temp_reg_cap->high_5ghz_chan); + + ath12k_mac_update_5_9_ch_list(ar, band); + + freq_low = max(temp_reg_cap->low_5ghz_chan, + ab->reg_freq_5g.start_freq); + freq_high = min(temp_reg_cap->high_5ghz_chan, + ab->reg_freq_5g.end_freq); + + ar->chan_info.low_freq = freq_low; + ar->chan_info.high_freq = freq_high; + ar->chan_info.num_channels = + ath12k_reg_get_num_chans_in_band(ar, band, + freq_low, + freq_high); + + if (!ah->hw->wiphy->bands[NL80211_BAND_5GHZ]) { + ah->hw->wiphy->bands[NL80211_BAND_5GHZ] = band; + ah->supported_band_mask |= BIT(NL80211_BAND_5GHZ); + } else { + /* Split mac in same band under same wiphy during MLO */ + ret = ath12k_mac_update_band(ar, + ah->hw->wiphy->bands[NL80211_BAND_5GHZ], + band); + if (ret) + return ret; + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac pdev %u identified as 5 GHz split mac during MLO\n", + ar->pdev->pdev_id); + } + } else if (reg_cap->low_5ghz_chan >= ATH12K_MIN_6G_FREQ && + reg_cap->high_5ghz_chan <= ATH12K_MAX_6G_FREQ) { + band = &ar->mac.sbands[NL80211_BAND_6GHZ]; + band->band = NL80211_BAND_6GHZ; + channels = kmemdup(ath12k_6ghz_channels, + sizeof(ath12k_6ghz_channels), + GFP_KERNEL); + if (!channels) { + kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); + ar->mac.sbands[NL80211_BAND_2GHZ].channels = NULL; + return -ENOMEM; + } + + band = &ar->mac.sbands[NL80211_BAND_6GHZ]; + band->band = NL80211_BAND_6GHZ; + band->n_channels = ARRAY_SIZE(ath12k_6ghz_channels); + band->channels = channels; + band->n_bitrates = ath12k_a_rates_size; + band->bitrates = ath12k_a_rates; + ar->supports_6ghz = true; ath12k_mac_update_ch_list(ar, band, - reg_cap->low_5ghz_chan, - reg_cap->high_5ghz_chan); + temp_reg_cap->low_5ghz_chan, + temp_reg_cap->high_5ghz_chan); + + freq_low = max(temp_reg_cap->low_5ghz_chan, + ab->reg_freq_6g.start_freq); + freq_high = min(temp_reg_cap->high_5ghz_chan, + ab->reg_freq_6g.end_freq); + + ar->chan_info.low_freq = freq_low; + ar->chan_info.high_freq = freq_high; + ar->chan_info.num_channels = + ath12k_reg_get_num_chans_in_band(ar, band, + freq_low, + freq_high); + + if (!ah->hw->wiphy->bands[NL80211_BAND_6GHZ]) { + ah->hw->wiphy->bands[NL80211_BAND_6GHZ] = band; + ah->supported_band_mask |= BIT(NL80211_BAND_6GHZ); + } else { + /* Split mac in same band under same wiphy during MLO */ + ret = ath12k_mac_update_band(ar, + ah->hw->wiphy->bands[NL80211_BAND_6GHZ], + band); + if (ret) + return ret; + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac pdev %u identified as 6 GHz split mac during MLO\n", + ar->pdev->pdev_id); + } } } + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "mac pdev %u freq limits %u->%u MHz no. of channels %u\n", + ar->pdev->pdev_id, ar->chan_info.low_freq, + ar->chan_info.high_freq, ar->chan_info.num_channels); return 0; } -static int ath12k_mac_setup_iface_combinations(struct ath12k *ar) +static int ath12k_mac_setup_iface_combinations(struct ath12k_hw *ah) { - struct ath12k_base *ab = ar->ab; + struct ieee80211_hw *hw = ah->hw; struct ieee80211_iface_combination *combinations; struct ieee80211_iface_limit *limits; + struct ath12k_base *ab_dflt; + struct ath12k *ar; int n_limits, max_interfaces; bool ap, mesh; - ap = ab->hw_params->interface_modes & BIT(NL80211_IFTYPE_AP); + ar = ah->radio; + ab_dflt = ar->ab; + + ap = ab_dflt->hw_params->interface_modes & BIT(NL80211_IFTYPE_AP); mesh = IS_ENABLED(CONFIG_MAC80211_MESH) && - ab->hw_params->interface_modes & BIT(NL80211_IFTYPE_MESH_POINT); + ab_dflt->hw_params->interface_modes & BIT(NL80211_IFTYPE_MESH_POINT); combinations = kzalloc(sizeof(*combinations), GFP_KERNEL); if (!combinations) @@ -6720,32 +16377,93 @@ combinations[0].radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) | BIT(NL80211_CHAN_WIDTH_20) | BIT(NL80211_CHAN_WIDTH_40) | - BIT(NL80211_CHAN_WIDTH_80); + BIT(NL80211_CHAN_WIDTH_80) | + BIT(NL80211_CHAN_WIDTH_80P80) | + BIT(NL80211_CHAN_WIDTH_160); - ar->hw->wiphy->iface_combinations = combinations; - ar->hw->wiphy->n_iface_combinations = 1; + hw->wiphy->iface_combinations = combinations; + hw->wiphy->n_iface_combinations = 1; return 0; } +static void ath12k_mac_fetch_coex_info(struct ath12k *ar) +{ + struct ath12k_pdev_cap *cap = &ar->pdev->cap; + struct ath12k_base *ab = ar->ab; + struct device *dev = ab->dev; + + ar->coex.coex_support = false; + + if (!(cap->supported_bands & WMI_HOST_WLAN_2G_CAP)) + return; + + if (of_property_read_u32(dev->of_node, "qcom,pta-num", + &ar->coex.pta_num)) { + /* ath12k_err(ab, "No qcom,pta_num entry in dev-tree.\n"); */ + } + + if (of_property_read_u32(dev->of_node, "qcom,coex-mode", + &ar->coex.coex_mode)) { + /* ath12k_err(ab, "No qcom,coex_mode entry in dev-tree.\n"); */ + } + + if (of_property_read_u32(dev->of_node, "qcom,bt-active-time", + &ar->coex.bt_active_time_slot)) { + /* ath12k_err(ab, "No qcom,bt-active-time entry in dev-tree.\n"); */ + } + + if (of_property_read_u32(dev->of_node, "qcom,bt-priority-time", + &ar->coex.bt_priority_time_slot)) { + /* ath12k_err(ab, "No qcom,bt-priority-time entry in dev-tree.\n"); */ + } + + if (of_property_read_u32(dev->of_node, "qcom,coex-algo", + &ar->coex.coex_algo_type)) { + /* ath12k_err(ab, "No qcom,coex-algo entry in dev-tree.\n"); */ + } + + if (of_property_read_u32(dev->of_node, "qcom,pta-priority", + &ar->coex.pta_priority)) { + /* ath12k_err(ab, "No qcom,pta-priority entry in dev-tree.\n"); */ + } + + if (ar->coex.coex_algo_type == COEX_ALGO_OCS) { + ar->coex.duty_cycle = 100000; + ar->coex.wlan_duration = 80000; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, "coex pta_num %u coex_mode %u" + " bt_active_time_slot %u bt_priority_time_slot %u" + " coex_algorithm %u pta_priority %u\n", ar->coex.pta_num, + ar->coex.coex_mode, ar->coex.bt_active_time_slot, + ar->coex.bt_priority_time_slot, ar->coex.coex_algo_type, + ar->coex.pta_priority); + ar->coex.coex_support = true; +} + static const u8 ath12k_if_types_ext_capa[] = { [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, + [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, }; static const u8 ath12k_if_types_ext_capa_sta[] = { [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, + [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, [9] = WLAN_EXT_CAPA10_TWT_REQUESTER_SUPPORT, }; static const u8 ath12k_if_types_ext_capa_ap[] = { [0] = WLAN_EXT_CAPA1_EXT_CHANNEL_SWITCHING, + [2] = WLAN_EXT_CAPA3_MULTI_BSSID_SUPPORT, [7] = WLAN_EXT_CAPA8_OPMODE_NOTIF, [9] = WLAN_EXT_CAPA10_TWT_RESPONDER_SUPPORT, + [10] = WLAN_EXT_CAPA11_EMA_SUPPORT, }; -static const struct wiphy_iftype_ext_capab ath12k_iftypes_ext_capa[] = { +static struct wiphy_iftype_ext_capab ath12k_iftypes_ext_capa[] = { { .extended_capabilities = ath12k_if_types_ext_capa, .extended_capabilities_mask = ath12k_if_types_ext_capa, @@ -6762,48 +16480,158 @@ .extended_capabilities_mask = ath12k_if_types_ext_capa_ap, .extended_capabilities_len = sizeof(ath12k_if_types_ext_capa_ap), + .eml_capabilities = 0, + .mld_capa_and_ops = 0, }, }; -static void __ath12k_mac_unregister(struct ath12k *ar) +static void __ath12k_mac_pre_unregister(struct ath12k *ar) { cancel_work_sync(&ar->regd_update_work); +} - ieee80211_unregister_hw(ar->hw); +static void __ath12k_mac_post_unregister(struct ath12k *ar) +{ + struct ath12k_mac_tx_mgmt_free_arg arg = { }; - idr_for_each(&ar->txmgmt_idr, ath12k_mac_tx_mgmt_pending_free, ar); + arg.ar = ar; + arg.type = u8_encode_bits(true, ATH12K_MAC_TX_MGMT_FREE_TYPE_PDEV); + idr_for_each(&ar->txmgmt_idr, ath12k_mac_tx_mgmt_pending_free, &arg); idr_destroy(&ar->txmgmt_idr); kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); kfree(ar->mac.sbands[NL80211_BAND_5GHZ].channels); kfree(ar->mac.sbands[NL80211_BAND_6GHZ].channels); - kfree(ar->hw->wiphy->iface_combinations[0].limits); - kfree(ar->hw->wiphy->iface_combinations); - - SET_IEEE80211_DEV(ar->hw, NULL); + ar->mac.sbands[NL80211_BAND_2GHZ].channels = NULL; + ar->mac.sbands[NL80211_BAND_5GHZ].channels = NULL; + ar->mac.sbands[NL80211_BAND_6GHZ].channels = NULL; } -void ath12k_mac_unregister(struct ath12k_base *ab) +static void __ath12k_mac_unregister(struct ath12k *ar) + { + __ath12k_mac_pre_unregister(ar); + __ath12k_mac_post_unregister(ar); +} +static void ath12k_mac_hw_unregister(struct ath12k_hw *ah) { struct ath12k *ar; - struct ath12k_pdev *pdev; int i; - for (i = 0; i < ab->num_radios; i++) { - pdev = &ab->pdevs[i]; - ar = pdev->ar; - if (!ar) + ar = ah->radio; + + for (i = 0; i < ah->num_radio; i++) { + __ath12k_mac_pre_unregister(ar); + ar++; + } + + ieee80211_unregister_hw(ah->hw); + + ar = ah->radio; + for (i = 0; i < ah->num_radio; i++) { + __ath12k_mac_post_unregister(ar); + ar++; + } + + kfree(ah->hw->wiphy->iface_combinations[0].limits); + kfree(ah->hw->wiphy->iface_combinations); + + SET_IEEE80211_DEV(ah->hw, NULL); +} + +void ath12k_mac_unregister(struct ath12k_hw_group *ag) +{ + struct ath12k_hw *ah; + int i; + + for (i = ag->num_hw - 1; i >= 0; i--) { + ah = ag->ah[i]; + if (!ah) continue; - __ath12k_mac_unregister(ar); + ath12k_mac_hw_unregister(ah); } } static int __ath12k_mac_register(struct ath12k *ar) { - struct ath12k_base *ab = ar->ab; - struct ath12k_pdev_cap *cap = &ar->pdev->cap; + struct ieee80211_hw *hw; + struct ath12k_pdev_cap *cap; + int ret; + u32 ht_cap = 0; + + hw = ar->ah->hw; + init_waitqueue_head(&ar->tx_empty_waitq); + idr_init(&ar->txmgmt_idr); + spin_lock_init(&ar->txmgmt_idr_lock); + + cap = &ar->pdev->cap; + + ret = ath12k_mac_setup_channels_rates(ar, + cap->supported_bands); + if (ret) + return ret; + + ath12k_mac_setup_ht_vht_cap(ar, cap, &ht_cap); + ath12k_mac_setup_he_eht_cap(ar, cap); + + ar->rssi_offsets.rssi_offset = ATH12K_DEFAULT_NOISE_FLOOR; + + hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN); + hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN); + + ath12k_pdev_caps_update(ar); + + ar->max_num_stations = TARGET_NUM_STATIONS; + ar->max_num_peers = TARGET_NUM_PEERS_PDEV; + + if (cap->nss_ratio_enabled) + ieee80211_hw_set(hw, SUPPORTS_VHT_EXT_NSS_BW); + + ieee80211_hw_set(hw, AMPDU_AGGREGATION); + ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW); + ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER); + ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU); + ieee80211_hw_set(hw, USES_RSS); + + /* TODO: Check if HT capability advertised from firmware is different + * for each band for a dual band capable radio. It will be tricky to + * handle it when the ht capability different for each band. + */ + if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS || ar->supports_6ghz) + hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS; + + if (ar->supports_6ghz) { + wiphy_ext_feature_set(hw->wiphy, + NL80211_EXT_FEATURE_FILS_DISCOVERY); + wiphy_ext_feature_set(hw->wiphy, + NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP); + } + + if (ar->pdev->cap.supported_bands & WMI_HOST_WLAN_5G_CAP) { + if (test_bit(ar->cfg_rx_chainmask, &cap->adfs_chain_mask)) { + wiphy_ext_feature_set(hw->wiphy, + NL80211_EXT_FEATURE_RADAR_BACKGROUND); + } else if (test_bit(WMI_TLV_SERVICE_SW_PROG_DFS_SUPPORT, + ar->ab->wmi_ab.svc_map)) { + wiphy_ext_feature_set(hw->wiphy, + NL80211_EXT_FEATURE_RADAR_BACKGROUND); + } + } + + return 0; +} +static int ath12k_mac_hw_register(struct ath12k_hw *ah) +{ + struct ieee80211_hw *hw; + struct ath12k_pdev_cap *cap; + struct ath12k_base *ab, *ab_dflt; + struct ath12k *ar; + struct ath12k_hw_group *ag; + struct ath12k_pdev *pdev; + int i, j, ret; + u32 antennas_rx, antennas_tx; + bool unregister = false; static const u32 cipher_suites[] = { WLAN_CIPHER_SUITE_TKIP, WLAN_CIPHER_SUITE_CCMP, @@ -6815,239 +16643,312 @@ WLAN_CIPHER_SUITE_GCMP_256, WLAN_CIPHER_SUITE_CCMP_256, }; - int ret; - u32 ht_cap = 0; - ath12k_pdev_caps_update(ar); + hw = ah->hw; - SET_IEEE80211_PERM_ADDR(ar->hw, ar->mac_addr); + hw->wiphy->max_ap_assoc_sta = 0; + antennas_rx = 0; + antennas_tx = 0; + + ar = ah->radio; + ab = ar->ab; + ag = ab->ag; + hw->wiphy->dev_port = ar->pdev_idx; - SET_IEEE80211_DEV(ar->hw, ab->dev); + /* Use the first chip in group to advertise some features/info + * these are expected to be similar for chips in group + */ + ab_dflt = ab; - ret = ath12k_mac_setup_channels_rates(ar, - cap->supported_bands); + for (i = 0; i < ah->num_radio; i++) { + ab = ar->ab; + pdev = ar->pdev; + cap = &ar->pdev->cap; + if (ab->pdevs_macaddr_valid) { + ether_addr_copy(ar->mac_addr, pdev->mac_addr); + } else { + ether_addr_copy(ar->mac_addr, ab->mac_addr); + ar->mac_addr[4] += i; + } + + ret = __ath12k_mac_register(ar); if (ret) - goto err; + goto err_cleanup; - ath12k_mac_setup_ht_vht_cap(ar, cap, &ht_cap); - ath12k_mac_setup_he_cap(ar, cap); + /* Advertise the max antenna support of all radios, driver can handle + * per pdev specific antenna setting based on pdev cap when antenna changes + * are made + */ + antennas_rx = max_t(u32, antennas_rx, cap->rx_chain_mask); + antennas_tx = max_t(u32, antennas_tx, cap->tx_chain_mask); - ret = ath12k_mac_setup_iface_combinations(ar); - if (ret) { - ath12k_err(ar->ab, "failed to setup interface combinations: %d\n", ret); - goto err_free_channels; - } + hw->wiphy->max_ap_assoc_sta += ar->max_num_stations; + SET_IEEE80211_PERM_ADDR(hw, ar->mac_addr); - ar->hw->wiphy->available_antennas_rx = cap->rx_chain_mask; - ar->hw->wiphy->available_antennas_tx = cap->tx_chain_mask; - - ar->hw->wiphy->interface_modes = ab->hw_params->interface_modes; - - ieee80211_hw_set(ar->hw, SIGNAL_DBM); - ieee80211_hw_set(ar->hw, SUPPORTS_PS); - ieee80211_hw_set(ar->hw, SUPPORTS_DYNAMIC_PS); - ieee80211_hw_set(ar->hw, MFP_CAPABLE); - ieee80211_hw_set(ar->hw, REPORTS_TX_ACK_STATUS); - ieee80211_hw_set(ar->hw, HAS_RATE_CONTROL); - ieee80211_hw_set(ar->hw, AP_LINK_PS); - ieee80211_hw_set(ar->hw, SPECTRUM_MGMT); - ieee80211_hw_set(ar->hw, CONNECTION_MONITOR); - ieee80211_hw_set(ar->hw, SUPPORTS_PER_STA_GTK); - ieee80211_hw_set(ar->hw, CHANCTX_STA_CSA); - ieee80211_hw_set(ar->hw, QUEUE_CONTROL); - ieee80211_hw_set(ar->hw, SUPPORTS_TX_FRAG); - ieee80211_hw_set(ar->hw, REPORTS_LOW_ACK); - - if (ht_cap & WMI_HT_CAP_ENABLED) { - ieee80211_hw_set(ar->hw, AMPDU_AGGREGATION); - ieee80211_hw_set(ar->hw, TX_AMPDU_SETUP_IN_HW); - ieee80211_hw_set(ar->hw, SUPPORTS_REORDERING_BUFFER); - ieee80211_hw_set(ar->hw, SUPPORTS_AMSDU_IN_AMPDU); - ieee80211_hw_set(ar->hw, USES_RSS); + ar++; } - ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; - ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; + hw->wiphy->available_antennas_rx = antennas_rx; + hw->wiphy->available_antennas_tx = antennas_tx; - /* TODO: Check if HT capability advertised from firmware is different - * for each band for a dual band capable radio. It will be tricky to - * handle it when the ht capability different for each band. + /* TODO: Add link/ar specific iface combinations + * For now, setting up combination once for the wiphy (ah) */ - if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS) - ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS; + ret = ath12k_mac_setup_iface_combinations(ah); + if (ret) { + ath12k_err(NULL, "failed to setup interface combinations: %d\n", + ret); + goto err_cleanup; + } + + SET_IEEE80211_DEV(hw, ab_dflt->dev); - ar->hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID; - ar->hw->wiphy->max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN; + /* Iface modes are expected to be similar for partner chips */ + hw->wiphy->interface_modes = ab_dflt->hw_params->interface_modes; - ar->hw->max_listen_interval = ATH12K_MAX_HW_LISTEN_INTERVAL; + hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN); + hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN); - ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; - ar->hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; - ar->hw->wiphy->max_remain_on_channel_duration = 5000; + ieee80211_hw_set(hw, SIGNAL_DBM); + ieee80211_hw_set(hw, SUPPORTS_PS); + ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS); + ieee80211_hw_set(hw, MFP_CAPABLE); + ieee80211_hw_set(hw, REPORTS_TX_ACK_STATUS); + ieee80211_hw_set(hw, HAS_RATE_CONTROL); + ieee80211_hw_set(hw, AP_LINK_PS); + ieee80211_hw_set(hw, SPECTRUM_MGMT); + ieee80211_hw_set(hw, CONNECTION_MONITOR); + ieee80211_hw_set(hw, WANT_MONITOR_VIF); + ieee80211_hw_set(hw, SUPPORTS_PER_STA_GTK); + ieee80211_hw_set(hw, CHANCTX_STA_CSA); + ieee80211_hw_set(hw, QUEUE_CONTROL); + ieee80211_hw_set(hw, SUPPORTS_TX_FRAG); + ieee80211_hw_set(hw, REPORTS_LOW_ACK); + ieee80211_hw_set(hw, AMPDU_AGGREGATION); + ieee80211_hw_set(hw, TX_AMPDU_SETUP_IN_HW); + ieee80211_hw_set(hw, SUPPORTS_REORDERING_BUFFER); + ieee80211_hw_set(hw, SUPPORTS_AMSDU_IN_AMPDU); + ieee80211_hw_set(hw, USES_RSS); + ieee80211_hw_set(hw, SUPPORTS_MULTI_BSSID); + + if (ath12k_frame_mode == ATH12K_HW_TXRX_ETHERNET) { + ieee80211_hw_set(hw, SUPPORTS_TX_ENCAP_OFFLOAD); + ieee80211_hw_set(hw, SUPPORTS_RX_DECAP_OFFLOAD); + } + + hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; + hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; + + hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID; + hw->wiphy->max_scan_ie_len = WLAN_SCAN_PARAMS_MAX_IE_LEN; + + hw->max_listen_interval = ATH12K_MAX_HW_LISTEN_INTERVAL; + + hw->wiphy->flags |= WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL; + hw->wiphy->flags |= WIPHY_FLAG_HAS_CHANNEL_SWITCH; + hw->wiphy->max_remain_on_channel_duration = 5000; - ar->hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; - ar->hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE | + hw->wiphy->flags |= WIPHY_FLAG_AP_UAPSD; + hw->wiphy->features |= NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE | NL80211_FEATURE_AP_SCAN; - ar->max_num_stations = TARGET_NUM_STATIONS; - ar->max_num_peers = TARGET_NUM_PEERS_PDEV; + hw->wiphy->features |= NL80211_FEATURE_TX_POWER_INSERTION; - ar->hw->wiphy->max_ap_assoc_sta = ar->max_num_stations; + if (ag->mlo_capable) + hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_MLO; - ar->hw->queues = ATH12K_HW_MAX_QUEUES; - ar->hw->wiphy->tx_queue_len = ATH12K_QUEUE_LEN; - ar->hw->offchannel_tx_hw_queue = ATH12K_HW_MAX_QUEUES - 1; - ar->hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_HE; + /* TODO Split queues per chip */ + hw->queues = ATH12K_HW_MAX_QUEUES; + hw->wiphy->tx_queue_len = ATH12K_QUEUE_LEN; + hw->offchannel_tx_hw_queue = ATH12K_HW_MAX_QUEUES - 1; + hw->max_rx_aggregation_subframes = IEEE80211_MAX_AMPDU_BUF_EHT; - ar->hw->vif_data_size = sizeof(struct ath12k_vif); - ar->hw->sta_data_size = sizeof(struct ath12k_sta); + hw->vif_data_size = sizeof(struct ath12k_vif); + hw->sta_data_size = sizeof(struct ath12k_sta); - wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); - wiphy_ext_feature_set(ar->hw->wiphy, NL80211_EXT_FEATURE_STA_TX_PWR); + wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_CQM_RSSI_LIST); + wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_STA_TX_PWR); + wiphy_ext_feature_set(hw->wiphy, NL80211_EXT_FEATURE_ACK_SIGNAL_SUPPORT); - ar->hw->wiphy->cipher_suites = cipher_suites; - ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites); + if (test_bit(WMI_TLV_SERVICE_BSS_COLOR_OFFLOAD, ab->wmi_ab.svc_map)) + wiphy_ext_feature_set(hw->wiphy, + NL80211_EXT_FEATURE_BSS_COLOR); - ar->hw->wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa; - ar->hw->wiphy->num_iftype_ext_capab = - ARRAY_SIZE(ath12k_iftypes_ext_capa); + hw->wiphy->cipher_suites = cipher_suites; + hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites); - if (ar->supports_6ghz) { - wiphy_ext_feature_set(ar->hw->wiphy, - NL80211_EXT_FEATURE_FILS_DISCOVERY); - wiphy_ext_feature_set(ar->hw->wiphy, - NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP); + /* Copy over MLO related capabilities received from + * WMI_SERVICE_READY_EXT2_EVENT if mlo_capable is set + */ + if (ag->mlo_capable) { + ath12k_iftypes_ext_capa[2].eml_capabilities = cap->eml_cap; + ath12k_iftypes_ext_capa[2].mld_capa_and_ops = cap->mld_cap; + if (!test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) + ieee80211_hw_set(hw, MLO_MCAST_MULTI_LINK_TX); } + hw->wiphy->iftype_ext_capab = ath12k_iftypes_ext_capa; + hw->wiphy->num_iftype_ext_capab = ARRAY_SIZE(ath12k_iftypes_ext_capa); + + hw->wiphy->mbssid_max_interfaces = ah->num_radio * TARGET_NUM_VDEVS; + hw->wiphy->ema_max_profile_periodicity = TARGET_EMA_MAX_PROFILE_PERIOD; + + ah->hw->wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED; + ah->hw->wiphy->reg_notifier = ath12k_reg_notifier; - ath12k_reg_init(ar); + ath12k_vendor_register(ah); - if (!test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) { - ar->hw->netdev_features = NETIF_F_HW_CSUM; - ieee80211_hw_set(ar->hw, SW_CRYPTO_CONTROL); - ieee80211_hw_set(ar->hw, SUPPORT_FAST_XMIT); + if (!test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) { + ieee80211_hw_set(hw, SW_CRYPTO_CONTROL); + ieee80211_hw_set(hw, SUPPORT_FAST_XMIT); } - ret = ieee80211_register_hw(ar->hw); + hw->netdev_features |= NETIF_F_LLTX; + + ret = ieee80211_register_hw(hw); if (ret) { - ath12k_err(ar->ab, "ieee80211 registration failed: %d\n", ret); - goto err_free_if_combs; + ath12k_err(NULL, "ieee80211 registration failed: %d\n", ret); + goto err_full_cleanup; } - if (!ab->hw_params->supports_monitor) + if (!ab_dflt->hw_params->supports_monitor) /* There's a race between calling ieee80211_register_hw() * and here where the monitor mode is enabled for a little * while. But that time is so short and in practise it make * a difference in real life. */ - ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); + hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); + + ar = ah->radio; + ab = ar->ab; - /* Apply the regd received during initialization */ + for (i = 0; i < ah->num_radio; i++) { ret = ath12k_regd_update(ar, true); if (ret) { ath12k_err(ar->ab, "ath12k regd update failed: %d\n", ret); goto err_unregister_hw; } + /* fw stats init is separately required since fw pdev stats is also used + * in get_txpower mac ops hence it is handled separately from debugfs + */ + ath12k_fw_stats_init(ar); + + ret = ath12k_debugfs_register(ar); + if (ret) { + ath12k_err(ar->ab, "debugfs registration failed: %d\n", ret); + goto err_unregister_hw; + } + ar++; + } + return 0; err_unregister_hw: - ieee80211_unregister_hw(ar->hw); - -err_free_if_combs: - kfree(ar->hw->wiphy->iface_combinations[0].limits); - kfree(ar->hw->wiphy->iface_combinations); + ar = ah->radio; + for (j = 0; j < i; j++) { + ath12k_fw_stats_free(&ar->fw_stats); + ath12k_debugfs_unregister(ar); + ar++; + } + unregister = true; +err_full_cleanup: + kfree(hw->wiphy->iface_combinations[0].limits); + kfree(hw->wiphy->iface_combinations); + i = ah->num_radio; +err_cleanup: + ar = ah->radio; + for (j = 0; j < i; j++) { + __ath12k_mac_unregister(ar); + ar++; + } -err_free_channels: - kfree(ar->mac.sbands[NL80211_BAND_2GHZ].channels); - kfree(ar->mac.sbands[NL80211_BAND_5GHZ].channels); - kfree(ar->mac.sbands[NL80211_BAND_6GHZ].channels); + if (unregister) { + ieee80211_unregister_hw(hw); + SET_IEEE80211_DEV(hw, NULL); + } -err: - SET_IEEE80211_DEV(ar->hw, NULL); return ret; } -int ath12k_mac_register(struct ath12k_base *ab) +int ath12k_mac_register(struct ath12k_hw_group *ag) { - struct ath12k *ar; - struct ath12k_pdev *pdev; - int i; - int ret; - - if (test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)) - return 0; + struct ath12k_hw *ah; + int ret, i; - for (i = 0; i < ab->num_radios; i++) { - pdev = &ab->pdevs[i]; - ar = pdev->ar; - if (ab->pdevs_macaddr_valid) { - ether_addr_copy(ar->mac_addr, pdev->mac_addr); - } else { - ether_addr_copy(ar->mac_addr, ab->mac_addr); - ar->mac_addr[4] += i; - } + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; - ret = __ath12k_mac_register(ar); + ret = ath12k_mac_hw_register(ah); if (ret) - goto err_cleanup; - - idr_init(&ar->txmgmt_idr); - spin_lock_init(&ar->txmgmt_idr_lock); + goto err_mac_unregister; } - /* Initialize channel counters frequency value in hertz */ - ab->cc_freq_hz = 320000; - ab->free_vdev_map = (1LL << (ab->num_radios * TARGET_NUM_VDEVS)) - 1; - return 0; -err_cleanup: +err_mac_unregister: for (i = i - 1; i >= 0; i--) { - pdev = &ab->pdevs[i]; - ar = pdev->ar; - __ath12k_mac_unregister(ar); + ah = ag->ah[i]; + if (!ah) + continue; + + ath12k_mac_hw_unregister(ah); } return ret; } -int ath12k_mac_allocate(struct ath12k_base *ab) +static inline struct ath12k *ath12k_mac_get_ar(struct ath12k_hw *ah, + u8 link_idx) +{ + struct ath12k *ar = ah->radio; + + if (link_idx >= ah->num_radio) + return NULL; + + return ar + link_idx; +} + +static int ath12k_mac_setup(struct ath12k_hw *ah, u8 link_id, + struct ath12k_base *ab, int mac_id) { - struct ieee80211_hw *hw; struct ath12k *ar; struct ath12k_pdev *pdev; - int ret; - int i; + struct ath12k_hw_group *ag = ab->ag; + u16 hw_link_id; - if (test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)) - return 0; + pdev = &ab->pdevs[mac_id]; + hw_link_id = pdev->hw_link_id; - for (i = 0; i < ab->num_radios; i++) { - pdev = &ab->pdevs[i]; - hw = ieee80211_alloc_hw(sizeof(struct ath12k), &ath12k_ops); - if (!hw) { - ath12k_warn(ab, "failed to allocate mac80211 hw device\n"); - ret = -ENOMEM; - goto err_free_mac; + if (hw_link_id >= ATH12K_GROUP_MAX_RADIO) { + ath12k_err(ab, "HW link id %d is not supported\n", hw_link_id); + return -ENOENT; } - ar = hw->priv; - ar->hw = hw; + ar = ath12k_mac_get_ar(ah, link_id); + if (!ar) + return -EINVAL; + ar->ab = ab; + ar->ah = ah; ar->pdev = pdev; - ar->pdev_idx = i; - ar->lmac_id = ath12k_hw_get_mac_from_pdev_id(ab->hw_params, i); + ar->pdev_idx = mac_id; + ar->lmac_id = ath12k_hw_get_mac_from_pdev_id(ab->hw_params, mac_id); + ar->link_idx = link_id; - ar->wmi = &ab->wmi_ab.wmi[i]; - /* FIXME: wmi[0] is already initialized during attach, + ar->wmi = &ab->wmi_ab.wmi[mac_id]; + /* FIXME wmi[0] is already initialized during attach, * Should we do this again? */ - ath12k_wmi_pdev_attach(ab, i); + ath12k_wmi_pdev_attach(ab, mac_id); + + ath12k_mac_fetch_coex_info(ar); ar->cfg_tx_chainmask = pdev->cap.tx_chain_mask; ar->cfg_rx_chainmask = pdev->cap.rx_chain_mask; - ar->num_tx_chains = hweight32(pdev->cap.tx_chain_mask); - ar->num_rx_chains = hweight32(pdev->cap.rx_chain_mask); + ar->num_tx_chains = get_num_chains(pdev->cap.tx_chain_mask); + ar->num_rx_chains = get_num_chains(pdev->cap.rx_chain_mask); pdev->ar = ar; spin_lock_init(&ar->data_lock); @@ -7062,36 +16963,248 @@ init_completion(&ar->bss_survey_done); init_completion(&ar->scan.started); init_completion(&ar->scan.completed); + init_completion(&ar->thermal.wmi_sync); + init_completion(&ar->mlo_setup_done); + init_completion(&ar->mvr_complete); + init_completion(&ar->scan.on_channel); INIT_DELAYED_WORK(&ar->scan.timeout, ath12k_scan_timeout_work); + INIT_WORK(&ar->scan.vdev_del_wk, ath12k_scan_vdev_del_work); + ar->scan.vdev_id = -1; INIT_WORK(&ar->regd_update_work, ath12k_regd_update_work); INIT_WORK(&ar->wmi_mgmt_tx_work, ath12k_mgmt_over_wmi_tx_work); skb_queue_head_init(&ar->wmi_mgmt_tx_queue); - clear_bit(ATH12K_FLAG_MONITOR_ENABLED, &ar->monitor_flags); - } + clear_bit(MONITOR_VDEV_STARTED, &ar->monitor_flags); + ar->monitor_vdev_id = -1; + clear_bit(MONITOR_VDEV_CREATED, &ar->monitor_flags); + rcu_assign_pointer(ag->hw_links[hw_link_id], ar); return 0; +} + +int ath12k_mac_allocate(struct ath12k_hw_group *ag) +{ + struct ieee80211_hw *hw; + struct ath12k_base *ab; + struct ath12k_hw *ah; + struct ieee80211_ops *ops; + size_t len; + int i, j, total_radio, num_radios, ret; + int mac_id, chip_id; + u8 link_id, num_hw; + + total_radio = 0; + for (i = 0; i < ag->num_chip; i++) + total_radio += ag->ab[i]->num_radios; + + /* All pdev get combined and register as single wiphy if MLO capable + * is enabled. where as in other group, each pdev get register separately. + */ + if (ag->mlo_capable) + num_radios = total_radio; + else + num_radios = 1; + + num_hw = total_radio / num_radios; -err_free_mac: - ath12k_mac_destroy(ab); + if (num_hw >= ATH12K_GROUP_MAX_RADIO) { + ath12k_err(NULL, "HW count %d is not supported\n", num_hw); + return -ENOSPC; + } + + ag->num_hw = 0; + mac_id = 0; + chip_id = 0; + for (i = 0; i < num_hw; i++) { + ops = kmemdup(&ath12k_ops, sizeof(ath12k_ops), GFP_KERNEL); + if (!ops) { + ret = -ENOMEM; + goto err_mac_destroy; + } + + len = sizeof(struct ath12k_hw) + (num_radios * sizeof(struct ath12k)); + hw = ieee80211_alloc_hw(len, ops); + if (!hw) { + kfree(ops); + ret = -ENOMEM; + goto err_mac_destroy; + } + +#ifdef CONFIG_MAC80211_BONDED_SUPPORT + ieee80211_enable_bond_dev(hw); +#endif + ah = hw->priv; + ah->hw = hw; + ah->ops = ops; + ah->num_radio = num_radios; + ag->ah[i] = ah; + ah->ag = ag; + + ath12k_info(NULL, + "ath12k hw device created with %d radios in group %d with %d chips\n", + ah->num_radio, ag->id, ag->num_chip); + + mutex_init(&ah->conf_mutex); + INIT_LIST_HEAD(&ah->ml_peers); + spin_lock_init(&ah->data_lock); + + link_id = 0; + for (j = 0; j < num_radios; j++) { + ab = ag->ab[chip_id]; + ret = ath12k_mac_setup(ah, link_id, ab, mac_id); + if (ret) { + ieee80211_free_hw(ah->hw); + kfree(ops); + ag->ah[i] = NULL; + + ath12k_err(ab, "failed to setup mac %d for chip %d group %d\n", + mac_id, chip_id, ag->id); + goto err_mac_destroy; + } + link_id++; + mac_id++; + + /* If mac_id falls beyond the current chip MACs then + * move to next chip + */ + if (mac_id >= ab->num_radios) { + chip_id++; + mac_id = 0; + + /* Initialize channel counters frequency value in hertz */ + ab->cc_freq_hz = 320000; + + spin_lock_bh(&ab->base_lock); + ab->free_vdev_map = (1LL << (ab->num_radios * TARGET_NUM_VDEVS)) - 1; + spin_unlock_bh(&ab->base_lock); + ret = ath12k_peer_rhash_tbl_init(ab); + if (ret) + goto err_mac_destroy; + + ath12k_dp_pdev_pre_alloc(ab); + } + } + + ag->num_hw++; + } + + return 0; + +err_mac_destroy: + ath12k_mac_destroy(ag); return ret; } -void ath12k_mac_destroy(struct ath12k_base *ab) +void ath12k_mac_destroy(struct ath12k_hw_group *ag) { + struct ath12k_base *ab; + struct ath12k_hw *ah; struct ath12k *ar; struct ath12k_pdev *pdev; - int i; + const struct ieee80211_ops *ops; + int i, j; + u16 hw_link_id; + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + if (!ab) + continue; + + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + hw_link_id = pdev->hw_link_id; + + if (hw_link_id < ATH12K_GROUP_MAX_RADIO) { + rcu_assign_pointer(ag->hw_links[hw_link_id], NULL); + + if(!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags))) + synchronize_rcu(); + } - for (i = 0; i < ab->num_radios; i++) { - pdev = &ab->pdevs[i]; ar = pdev->ar; if (!ar) continue; - ieee80211_free_hw(ar->hw); pdev->ar = NULL; } + ath12k_peer_rhash_tbl_destroy(ab); + } + + for (i = 0; i < ag->num_hw; i++) { + ah = ag->ah[i]; + if (!ah) + continue; + + ops = ah->ops; + ieee80211_free_hw(ah->hw); + kfree(ops); + ag->ah[i] = NULL; + } +} + +u16 ath12k_calculate_subchannel_count(enum nl80211_chan_width width) { + u16 width_num = 0; + + switch (width) { + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_20: + width_num = 20; + break; + case NL80211_CHAN_WIDTH_40: + width_num = 40; + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_80P80: + width_num = 80; + break; + case NL80211_CHAN_WIDTH_160: + width_num = 160; + break; + case NL80211_CHAN_WIDTH_320: + width_num = 320; + break; + default: + break; + } + return width_num/20; +} + +void ath12k_mac_background_dfs_event(struct ath12k *ar, + enum ath12k_background_dfs_events ev) +{ + struct ath12k_vif *ahvif; + struct ath12k_link_vif *arvif; + bool arvif_found = false; + int ret = 0; + + list_for_each_entry(arvif, &ar->arvifs, list) { + ahvif = arvif->ahvif; + if (arvif->is_started && + ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + arvif_found = true; + break; + } + } + + if (!arvif_found) + return; + + if (ev == ATH12K_BGDFS_RADAR) { + cfg80211_background_radar_event(ar->ah->hw->wiphy, &ar->agile_chandef, GFP_ATOMIC); + lockdep_assert_held(&ar->conf_mutex); + ret = ath12k_wmi_vdev_adfs_ocac_abort_cmd_send(ar, arvif->vdev_id); + } else if (ev == ATH12K_BGDFS_ABORT) { + cfg80211_background_cac_abort(ar->ah->hw->wiphy); + } + + if (!ret) { + memset(&ar->agile_chandef, 0, sizeof(struct cfg80211_chan_def)); + ar->agile_chandef.chan = NULL; + } else { + ath12k_dbg(ar->ab, ATH12K_DBG_MAC, + "ADFS state can't be reset (ret=%d)\n", + ret); + } } diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/mac.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mac.h --- linux-6.4/drivers/net/wireless/ath/ath12k/mac.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mac.h 2024-04-22 13:55:38.348131443 +0200 @@ -12,12 +12,56 @@ struct ath12k; struct ath12k_base; +struct ath12k_hw; +struct ath12k_hw_group; +struct ath12k_link_sta; struct ath12k_generic_iter { struct ath12k *ar; int ret; }; +struct ath12k_mac_any_chandef_arg { + struct ath12k *ar; + struct cfg80211_chan_def *def; +}; + +struct ath12k_mac_num_chanctxs_arg { + struct ath12k *ar; + int num; +}; + +#define ATH12K_MAC_TX_MGMT_FREE_TYPE_PDEV BIT(0) +#define ATH12K_MAC_TX_MGMT_FREE_TYPE_VIF BIT(1) +#define ATH12K_MAC_TX_MGMT_FREE_TYPE_LINK BIT(2) + +struct ath12k_mac_tx_mgmt_free_arg { + u8 type; + struct ath12k *ar; + struct ieee80211_vif *vif; + u8 link_id; +}; + +struct ath12k_latency_params { + u32 service_interval; + u32 burst_size; + u32 delay_bound; + u32 min_data_rate; + u8 user_priority; + u8 req_type; + u8 ac; + u8 direction; + u8 peer_mac[6]; +}; + +#define ATH12K_LATENCY_PARAM_SIZE sizeof(struct ath12k_latency_params) + +/* Default link after the IEEE802.11 defined Max link id limit + * for driver usage purpose + */ +#define ATH12K_DEFAULT_SCAN_LINK IEEE80211_MLD_MAX_NUM_LINKS +#define ATH12K_NUM_MAX_LINKS (IEEE80211_MLD_MAX_NUM_LINKS + 1) + /* number of failed packets (20 packets with 16 sw reties each) */ #define ATH12K_KICKOUT_THRESHOLD (20 * 16) @@ -33,7 +77,16 @@ #define IEEE80211_VHT_MCS_SUPPORT_0_11_MASK GENMASK(23, 16) #define IEEE80211_DISABLE_VHT_MCS_SUPPORT_0_11 BIT(24) -#define ATH12K_CHAN_WIDTH_NUM 8 +#define ATH12K_CHAN_WIDTH_NUM 14 +#define ATH12K_BW_NSS_MAP_ENABLE BIT(31) +#define ATH12K_PEER_RX_NSS_160MHZ GENMASK(2, 0) +#define ATH12K_PEER_RX_NSS_80_80MHZ GENMASK(5, 3) + +#define ATH12K_OBSS_PD_MAX_THRESHOLD -82 +#define ATH12K_OBSS_PD_THRESHOLD_DISABLED -128 +#define ATH12K_OBSS_PD_THRESHOLD_IN_DBM BIT(29) +#define ATH12K_OBSS_PD_SRG_EN BIT(30) +#define ATH12K_OBSS_PD_NON_SRG_EN BIT(31) #define ATH12K_TX_POWER_MAX_VAL 70 #define ATH12K_TX_POWER_MIN_VAL 0 @@ -43,14 +96,28 @@ ATH12K_BW_40 = 1, ATH12K_BW_80 = 2, ATH12K_BW_160 = 3, + ATH12K_BW_320 = 4, }; +#define ATH12K_PDEV_TX_POWER_INVALID (-1) +#define ATH12K_PDEV_TX_POWER_REFRESH_TIME_MSECS 5000 /* msecs */ + +enum ath12k_background_dfs_events { + ATH12K_BGDFS_SUCCESS, + ATH12K_BGDFS_ABORT, + ATH12K_BGDFS_RADAR, +}; + +#define ATH12K_WLAN_PRIO_MAX 0x63 +#define ATH12K_WLAN_PRIO_WEIGHT 0xff + extern const struct htt_rx_ring_tlv_filter ath12k_mac_mon_status_filter_default; -void ath12k_mac_destroy(struct ath12k_base *ab); -void ath12k_mac_unregister(struct ath12k_base *ab); -int ath12k_mac_register(struct ath12k_base *ab); -int ath12k_mac_allocate(struct ath12k_base *ab); +void ath12k_mac_ap_ps_recalc(struct ath12k *ar); +void ath12k_mac_destroy(struct ath12k_hw_group *ag); +void ath12k_mac_unregister(struct ath12k_hw_group *ag); +int ath12k_mac_register(struct ath12k_hw_group *ag); +int ath12k_mac_allocate(struct ath12k_hw_group *ag); int ath12k_mac_hw_ratecode_to_legacy_rate(u8 hw_rc, u8 preamble, u8 *rateidx, u16 *rate); u8 ath12k_mac_bitrate_to_idx(const struct ieee80211_supported_band *sband, @@ -61,16 +128,87 @@ void __ath12k_mac_scan_finish(struct ath12k *ar); void ath12k_mac_scan_finish(struct ath12k *ar); -struct ath12k_vif *ath12k_mac_get_arvif(struct ath12k *ar, u32 vdev_id); -struct ath12k_vif *ath12k_mac_get_arvif_by_vdev_id(struct ath12k_base *ab, +struct ath12k_link_vif *ath12k_mac_get_arvif(struct ath12k *ar, u32 vdev_id); +struct ath12k_link_vif *ath12k_mac_get_arvif_by_vdev_id(struct ath12k_base *ab, u32 vdev_id); +int ath12k_mac_btcoex_config(struct ath12k *ar, struct ath12k_link_vif *arvif, + int coex, u32 wlan_prio_mask, u8 wlan_weight); struct ath12k *ath12k_mac_get_ar_by_vdev_id(struct ath12k_base *ab, u32 vdev_id); struct ath12k *ath12k_mac_get_ar_by_pdev_id(struct ath12k_base *ab, u32 pdev_id); -void ath12k_mac_drain_tx(struct ath12k *ar); +void ath12k_mac_fill_reg_tpc_info(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *ctx); +void ath12k_mac_radio_drain_tx(struct ath12k *ar); void ath12k_mac_peer_cleanup_all(struct ath12k *ar); int ath12k_mac_tx_mgmt_pending_free(int buf_id, void *skb, void *ctx); enum rate_info_bw ath12k_mac_bw_to_mac80211_bw(enum ath12k_supported_bw bw); +u32 ath12k_mac_he_gi_to_nl80211_he_gi(u8 sgi); +enum nl80211_he_ru_alloc ath12k_mac_phy_he_ru_to_nl80211_he_ru_alloc(u16 ru_phy); +enum nl80211_he_ru_alloc ath12k_mac_he_ru_tones_to_nl80211_he_ru_alloc(u16 ru_tones); +enum nl80211_eht_ru_alloc ath12k_mac_eht_ru_tones_to_nl80211_eht_ru_alloc(u16 ru_tones); enum ath12k_supported_bw ath12k_mac_mac80211_bw_to_ath12k_bw(enum rate_info_bw bw); enum hal_encrypt_type ath12k_dp_tx_get_encrypt_type(u32 cipher); +void ath12k_mac_handle_beacon(struct ath12k *ar, struct sk_buff *skb); +void ath12k_mac_handle_beacon_miss(struct ath12k *ar, u32 vdev_id); +void ath12k_mac_get_any_chandef_iter(struct ieee80211_hw *hw, + struct ieee80211_chanctx_conf *conf, + void *data); +struct ath12k *ath12k_get_ar_by_vif(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + u8 link_id); +int ath12k_mac_mlo_setup(struct ath12k_hw *ah); +int ath12k_mac_mlo_ready(struct ath12k_hw *ah); +int ath12k_mac_mlo_teardown(struct ath12k_hw *ah); +struct ieee80211_bss_conf *ath12k_get_link_bss_conf(struct ath12k_link_vif *arvif); +bool ath12k_mac_is_ml_arvif(struct ath12k_link_vif *arvif); +u16 ath12k_calculate_subchannel_count(enum nl80211_chan_width width); +void ath12k_mac_background_dfs_event(struct ath12k *ar, + enum ath12k_background_dfs_events ev); +bool ath12k_mac_tx_check_max_limit(struct ath12k *ar, struct sk_buff *skb); +int ath12k_mac_mlo_teardown_with_umac_reset(struct ath12k_base *ab); +void ath12k_mac_bss_info_changed(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_bss_conf *info, + u64 changed); +int ath12k_mac_radio_start(struct ath12k *ar); +int ath12k_mac_conf_tx(struct ath12k *ar, + struct ath12k_link_vif *arvif, u16 ac, + const struct ieee80211_tx_queue_params *params); +int ath12k_mac_set_key(struct ath12k *ar, + enum set_key_cmd cmd, + struct ath12k_link_vif *arvif, + struct ath12k_link_sta *arsta, + struct ieee80211_key_conf *key); + +int ath12k_mac_update_sta_state(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta, + enum ieee80211_sta_state old_state, + enum ieee80211_sta_state new_state); +void ath12k_mgmt_rx_reo_init_timer(struct ath12k_hw_group *ag); +int ath12k_mac_vdev_create(struct ath12k *ar, struct ath12k_link_vif *arvif); +void ath12k_mac_vif_cache_flush(struct ath12k *ar, struct ieee80211_vif *vif, + u8 link_id); +void ath12k_mac_parse_tx_pwr_env(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_chanctx_conf *ctx); +int ath12k_mac_monitor_start(struct ath12k *ar); +int ath12k_mac_mlo_vdev_start(struct ath12k_link_vif *arvif, bool flag); +int ath12k_mac_vdev_start(struct ath12k_link_vif *arvif, + const struct cfg80211_chan_def *chandef, + bool radar_enabled); +int ath12k_mac_monitor_vdev_create(struct ath12k *ar); +int ath12k_mac_monitor_vdev_delete(struct ath12k *ar); +int ath12k_mac_monitor_stop(struct ath12k *ar); +int ath12k_set_vdev_param_to_all_vifs(struct ath12k *ar, int param, u32 value); +void ath12k_mac_reconfig_complete(struct ieee80211_hw *hw, + enum ieee80211_reconfig_type reconfig_type, + struct ath12k *asserted_radio); +int ath12k_mac_partner_peer_cleanup(struct ath12k_base *ab); +void ath12k_bss_assoc(struct ath12k *ar, + struct ath12k_link_vif *arvif, + struct ieee80211_bss_conf *bss_conf); +void ath12k_bss_disassoc(struct ath12k *ar, struct ath12k_link_vif *arvif, + bool do_vdev_down); +int ath12k_mac_op_set_scs(struct wireless_dev *wdev, struct ath12k_latency_params *params); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/mhi.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mhi.c --- linux-6.4/drivers/net/wireless/ath/ath12k/mhi.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mhi.c 2024-04-22 13:40:50.291868856 +0200 @@ -6,13 +6,20 @@ #include #include +#include +#include +#include #include "core.h" #include "debug.h" #include "mhi.h" #include "pci.h" +#include "pcic.h" +#include "hif.h" #define MHI_TIMEOUT_DEFAULT_MS 90000 +#define OTP_INVALID_BOARD_ID 0xFFFF +#define OTP_VALID_BOARD_ID_MASK 0x1000 static const struct mhi_channel_config ath12k_mhi_channels_qcn9274[] = { { @@ -252,7 +259,7 @@ int ret, num_vectors, i; int *irq; - ret = ath12k_pci_get_user_msi_assignment(ab, + ret = ath12k_pcic_get_user_msi_assignment(ab, "MHI", &num_vectors, &user_base_data, &base_vector); if (ret) @@ -266,7 +273,7 @@ return -ENOMEM; for (i = 0; i < num_vectors; i++) - irq[i] = ath12k_pci_get_msi_irq(ab->dev, + irq[i] = ath12k_hif_get_msi_irq(ab, base_vector + i); ab_pci->mhi_ctrl->irq = irq; @@ -310,21 +317,76 @@ } } +static char *ath12k_mhi_state_to_str(enum ath12k_mhi_state mhi_state) +{ + switch (mhi_state) { + case ATH12K_MHI_INIT: + return "INIT"; + case ATH12K_MHI_DEINIT: + return "DEINIT"; + case ATH12K_MHI_POWER_ON: + return "POWER_ON"; + case ATH12K_MHI_POWER_OFF: + return "POWER_OFF"; + case ATH12K_MHI_FORCE_POWER_OFF: + return "FORCE_POWER_OFF"; + case ATH12K_MHI_SUSPEND: + return "SUSPEND"; + case ATH12K_MHI_RESUME: + return "RESUME"; + case ATH12K_MHI_TRIGGER_RDDM: + return "TRIGGER_RDDM"; + case ATH12K_MHI_RDDM_DONE: + return "RDDM_DONE"; + case ATH12K_MHI_SOC_RESET: + return "SOC_RESET"; + default: + return "UNKNOWN"; + } +}; + static void ath12k_mhi_op_status_cb(struct mhi_controller *mhi_cntrl, enum mhi_callback cb) { struct ath12k_base *ab = dev_get_drvdata(mhi_cntrl->cntrl_dev); + struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); - ath12k_dbg(ab, ATH12K_DBG_BOOT, "mhi notify status reason %s\n", - ath12k_mhi_op_callback_to_str(cb)); + ath12k_dbg(ab, ATH12K_DBG_BOOT, "mhi notify status reason %s mhi_state:%s (0x%lx)\n", + ath12k_mhi_op_callback_to_str(cb), + ath12k_mhi_state_to_str(ab_pci->mhi_state), ab_pci->mhi_state); switch (cb) { case MHI_CB_SYS_ERROR: ath12k_warn(ab, "firmware crashed: MHI_CB_SYS_ERROR\n"); break; case MHI_CB_EE_RDDM: - if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags))) + /* check duplicate RDDM received from MHI */ + if (mhi_get_exec_env(ab_pci->mhi_ctrl) == mhi_cntrl->ee) { + ath12k_dbg(ab, ATH12K_DBG_BOOT, "Ignore duplicate status cb %s(%d) received from MHI\n", + ath12k_mhi_op_callback_to_str(cb), + cb); + return; + } + + /* In-case of rddm for mhi soc reset */ + if(test_bit(ATH12K_MHI_SOC_RESET, &ab_pci->mhi_state)) { + ath12k_dbg(ab, ATH12K_DBG_BOOT, "Triggering RDDM from mhi soc reset\n"); + clear_bit(ATH12K_MHI_SOC_RESET, &ab_pci->mhi_state); + complete(&ab->rddm_reset_done); + return; + } + + /* In-case of rddm for fatal error and ab is registered. */ + if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags))) { + set_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); + set_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags); queue_work(ab->workqueue_aux, &ab->reset_work); + ath12k_dbg(ab, ATH12K_DBG_BOOT, "Schedule SSR Recovery reset work queue\n"); + ath12k_hal_dump_srng_stats(ab); + } else { + BUG_ON(1); + } + ath12k_hal_dump_srng_stats(ab); break; default: break; @@ -347,17 +409,77 @@ writel(val, addr); } +static int ath12k_mhi_read_addr_from_dt(struct mhi_controller *mhi_ctrl) +{ + struct device_node *np; + struct resource res; + int ret; + + np = of_find_node_by_type(NULL, "memory"); + if (!np) + return -ENOENT; + + ret = of_address_to_resource(np, 0, &res); + if (ret) + return ret; + + mhi_ctrl->iova_start = res.start + 0x1000000; + mhi_ctrl->iova_stop = res.end; + + return 0; +} + int ath12k_mhi_register(struct ath12k_pci *ab_pci) { struct ath12k_base *ab = ab_pci->ab; + struct device *dev = ab->dev; struct mhi_controller *mhi_ctrl; + unsigned int board_id, otp_board_id; + const char *filename = ATH12K_AMSS_FILE; int ret; mhi_ctrl = mhi_alloc_controller(); if (!mhi_ctrl) return -ENOMEM; - ath12k_core_create_firmware_path(ab, ATH12K_AMSS_FILE, + otp_board_id = ath12k_pci_read32(ab, QCN9224_QFPROM_RAW_RFA_PDET_ROW13_LSB); + + board_id = FIELD_GET(OTP_BOARD_ID_MASK, otp_board_id); + if (!board_id || (board_id == OTP_INVALID_BOARD_ID)) { + if (of_property_read_u32(dev->of_node, "qcom,board_id", &board_id)) { + ath12k_warn(ab, "failed to read board id\n"); + } + } + + if (!board_id || (board_id == OTP_INVALID_BOARD_ID)) { + u16 ov_board_id; + + /* look for override */ + if (ath12k_pci_has_board_id_override(ab, &ov_board_id)) { + board_id = ov_board_id; + ath12k_info(ab, + "overriding board-id to 0x%x (%d)\n", + board_id, board_id); + } else { + ath12k_err(ab, + "device has invalid board-id (0x%04x), " + "to use this card you need to setup " + "%s/%s/%s file with " + "this line:\n pci:%s=\n", + board_id, + ATH12K_FW_DIR, ab->hw_params->fw.dir, + ATH12K_BOARD_OVERRIDE_FILE, + pci_name(ab_pci->pdev)); + return -EIO; + } + } + if (board_id & OTP_VALID_BOARD_ID_MASK) { + filename = ATH12K_AMSS_DUALMAC_FILE; + ath12k_dbg(ab, ATH12K_DBG_BOOT, + "dualmac fw selected for board id: %x\n", board_id); + } + + ath12k_core_create_firmware_path(ab, filename, ab_pci->amss_path, sizeof(ab_pci->amss_path)); @@ -367,6 +489,8 @@ mhi_ctrl->regs = ab->mem; mhi_ctrl->reg_len = ab->mem_len; + mhi_ctrl->rddm_size = ATH12K_PCI_FW_RDDM_SZ; + ret = ath12k_mhi_get_msi(ab_pci); if (ret) { ath12k_err(ab, "failed to get msi for mhi\n"); @@ -374,6 +498,15 @@ return ret; } + if (ab->bus_params.fixed_mem_region) { + ret = ath12k_mhi_read_addr_from_dt(mhi_ctrl); + if (ret < 0) + return ret; + } else { + mhi_ctrl->iova_start = 0; + mhi_ctrl->iova_stop = 0xFFFFFFFF; + } + mhi_ctrl->iova_start = 0; mhi_ctrl->iova_stop = 0xffffffff; mhi_ctrl->sbl_size = SZ_512K; @@ -405,32 +538,6 @@ ab_pci->mhi_ctrl = NULL; } -static char *ath12k_mhi_state_to_str(enum ath12k_mhi_state mhi_state) -{ - switch (mhi_state) { - case ATH12K_MHI_INIT: - return "INIT"; - case ATH12K_MHI_DEINIT: - return "DEINIT"; - case ATH12K_MHI_POWER_ON: - return "POWER_ON"; - case ATH12K_MHI_POWER_OFF: - return "POWER_OFF"; - case ATH12K_MHI_FORCE_POWER_OFF: - return "FORCE_POWER_OFF"; - case ATH12K_MHI_SUSPEND: - return "SUSPEND"; - case ATH12K_MHI_RESUME: - return "RESUME"; - case ATH12K_MHI_TRIGGER_RDDM: - return "TRIGGER_RDDM"; - case ATH12K_MHI_RDDM_DONE: - return "RDDM_DONE"; - default: - return "UNKNOWN"; - } -}; - static void ath12k_mhi_set_state_bit(struct ath12k_pci *ab_pci, enum ath12k_mhi_state mhi_state) { @@ -464,6 +571,9 @@ case ATH12K_MHI_RDDM_DONE: set_bit(ATH12K_MHI_RDDM_DONE, &ab_pci->mhi_state); break; + case ATH12K_MHI_SOC_RESET: + set_bit(ATH12K_MHI_SOC_RESET, &ab_pci->mhi_state); + break; default: ath12k_err(ab, "unhandled mhi state (%d)\n", mhi_state); } @@ -506,6 +616,8 @@ break; case ATH12K_MHI_RDDM_DONE: return 0; + case ATH12K_MHI_SOC_RESET: + return 0; default: ath12k_err(ab, "unhandled mhi state: %s(%d)\n", ath12k_mhi_state_to_str(mhi_state), mhi_state); @@ -518,7 +630,7 @@ return -EINVAL; } -static int ath12k_mhi_set_state(struct ath12k_pci *ab_pci, +int ath12k_mhi_set_state(struct ath12k_pci *ab_pci, enum ath12k_mhi_state mhi_state) { struct ath12k_base *ab = ab_pci->ab; @@ -561,6 +673,9 @@ break; case ATH12K_MHI_RDDM_DONE: break; + case ATH12K_MHI_SOC_RESET: + mhi_soc_reset(ab_pci->mhi_ctrl); + break; default: ath12k_err(ab, "unhandled MHI state (%d)\n", mhi_state); ret = -EINVAL; @@ -614,3 +729,8 @@ { ath12k_mhi_set_state(ab_pci, ATH12K_MHI_RESUME); } + +void ath12k_mhi_coredump(struct mhi_controller *mhi_ctrl, bool state) +{ + mhi_download_rddm_image(mhi_ctrl, state); +} diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/mhi.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mhi.h --- linux-6.4/drivers/net/wireless/ath/ath12k/mhi.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/mhi.h 2024-04-22 13:40:50.291868856 +0200 @@ -16,6 +16,7 @@ #define MHISTATUS 0x48 #define MHICTRL 0x38 #define MHICTRL_RESET_MASK 0x2 +#define ATH12K_PCI_FW_RDDM_SZ 0x600000 enum ath12k_mhi_state { ATH12K_MHI_INIT, @@ -28,6 +29,7 @@ ATH12K_MHI_TRIGGER_RDDM, ATH12K_MHI_RDDM, ATH12K_MHI_RDDM_DONE, + ATH12K_MHI_SOC_RESET, }; extern const struct mhi_controller_config ath12k_mhi_config_qcn9274; @@ -42,5 +44,7 @@ void ath12k_mhi_suspend(struct ath12k_pci *ar_pci); void ath12k_mhi_resume(struct ath12k_pci *ar_pci); - +void ath12k_mhi_coredump(struct mhi_controller *mhi_ctrl, bool state); +int ath12k_mhi_set_state(struct ath12k_pci *ab_pci, + enum ath12k_mhi_state mhi_state); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/pci.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/pci.c --- linux-6.4/drivers/net/wireless/ath/ath12k/pci.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/pci.c 2024-04-22 13:40:50.295868965 +0200 @@ -5,31 +5,23 @@ */ #include -#include -#include +#include #include "pci.h" -#include "core.h" -#include "hif.h" #include "mhi.h" #include "debug.h" +#include "ppe.h" +#include "bondif.h" +#include "pcic.h" #define ATH12K_PCI_BAR_NUM 0 #define ATH12K_PCI_DMA_MASK 32 -#define ATH12K_PCI_IRQ_CE0_OFFSET 3 - -#define WINDOW_ENABLE_BIT 0x40000000 -#define WINDOW_REG_ADDRESS 0x310c -#define WINDOW_VALUE_MASK GENMASK(24, 19) -#define WINDOW_START 0x80000 -#define WINDOW_RANGE_MASK GENMASK(18, 0) #define WINDOW_STATIC_MASK GENMASK(31, 6) #define TCSR_SOC_HW_VERSION 0x1B00000 #define TCSR_SOC_HW_VERSION_MAJOR_MASK GENMASK(11, 8) #define TCSR_SOC_HW_VERSION_MINOR_MASK GENMASK(7, 4) - /* BAR0 + 4k is always accessible, and no * need to force wakeup. * 4K - 32 = 0xFE0 @@ -39,6 +31,16 @@ #define QCN9274_DEVICE_ID 0x1109 #define WCN7850_DEVICE_ID 0x1107 +#define PCIE_PCIE_LOCAL_REG_PCIE_LOCAL_RSV0 0x1E03164 +#define QRTR_INSTANCE_MASK 0x000000FF +#define ATH12K_MAX_PCI_DOMAINS 0x5 + + +unsigned int ath12k_fw_mem_seg; +EXPORT_SYMBOL(ath12k_fw_mem_seg); +module_param_named(fw_mem_seg, ath12k_fw_mem_seg, uint, 0644); +MODULE_PARM_DESC(fw_mem_seg, "Enable/Disable FW segmentted memory"); + static const struct pci_device_id ath12k_pci_id_table[] = { { PCI_VDEVICE(QCOM, QCN9274_DEVICE_ID) }, { PCI_VDEVICE(QCOM, WCN7850_DEVICE_ID) }, @@ -47,76 +49,8 @@ MODULE_DEVICE_TABLE(pci, ath12k_pci_id_table); -/* TODO: revisit IRQ mapping for new SRNG's */ -static const struct ath12k_msi_config ath12k_msi_config[] = { - { - .total_vectors = 16, - .total_users = 3, - .users = (struct ath12k_msi_user[]) { - { .name = "MHI", .num_vectors = 3, .base_vector = 0 }, - { .name = "CE", .num_vectors = 5, .base_vector = 3 }, - { .name = "DP", .num_vectors = 8, .base_vector = 8 }, - }, - }, -}; - -static const char *irq_name[ATH12K_IRQ_NUM_MAX] = { - "bhi", - "mhi-er0", - "mhi-er1", - "ce0", - "ce1", - "ce2", - "ce3", - "ce4", - "ce5", - "ce6", - "ce7", - "ce8", - "ce9", - "ce10", - "ce11", - "ce12", - "ce13", - "ce14", - "ce15", - "host2wbm-desc-feed", - "host2reo-re-injection", - "host2reo-command", - "host2rxdma-monitor-ring3", - "host2rxdma-monitor-ring2", - "host2rxdma-monitor-ring1", - "reo2ost-exception", - "wbm2host-rx-release", - "reo2host-status", - "reo2host-destination-ring4", - "reo2host-destination-ring3", - "reo2host-destination-ring2", - "reo2host-destination-ring1", - "rxdma2host-monitor-destination-mac3", - "rxdma2host-monitor-destination-mac2", - "rxdma2host-monitor-destination-mac1", - "ppdu-end-interrupts-mac3", - "ppdu-end-interrupts-mac2", - "ppdu-end-interrupts-mac1", - "rxdma2host-monitor-status-ring-mac3", - "rxdma2host-monitor-status-ring-mac2", - "rxdma2host-monitor-status-ring-mac1", - "host2rxdma-host-buf-ring-mac3", - "host2rxdma-host-buf-ring-mac2", - "host2rxdma-host-buf-ring-mac1", - "rxdma2host-destination-ring-mac3", - "rxdma2host-destination-ring-mac2", - "rxdma2host-destination-ring-mac1", - "host2tcl-input-ring4", - "host2tcl-input-ring3", - "host2tcl-input-ring2", - "host2tcl-input-ring1", - "wbm2host-tx-completions-ring4", - "wbm2host-tx-completions-ring3", - "wbm2host-tx-completions-ring2", - "wbm2host-tx-completions-ring1", - "tcl2host-status-ring", +static const struct ath12k_bus_params ath12k_pci_bus_params = { + .fixed_bdf_addr = false, }; static int ath12k_pci_bus_wake_up(struct ath12k_base *ab) @@ -164,8 +98,9 @@ } } -static void ath12k_pci_select_static_window(struct ath12k_pci *ab_pci) +static void ath12k_pci_select_static_window(struct ath12k_base *ab) { + struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); u32 umac_window = u32_get_bits(HAL_SEQ_WCSS_UMAC_OFFSET, WINDOW_VALUE_MASK); u32 ce_window = u32_get_bits(HAL_CE_WFSS_CE_REG_BASE, WINDOW_VALUE_MASK); u32 window; @@ -176,30 +111,7 @@ ab_pci->register_window = window; spin_unlock_bh(&ab_pci->window_lock); - iowrite32(WINDOW_ENABLE_BIT | window, ab_pci->ab->mem + WINDOW_REG_ADDRESS); -} - -static u32 ath12k_pci_get_window_start(struct ath12k_base *ab, - u32 offset) -{ - u32 window_start; - - /* If offset lies within DP register range, use 3rd window */ - if ((offset ^ HAL_SEQ_WCSS_UMAC_OFFSET) < WINDOW_RANGE_MASK) - window_start = 3 * WINDOW_START; - /* If offset lies within CE register range, use 2nd window */ - else if ((offset ^ HAL_CE_WFSS_CE_REG_BASE) < WINDOW_RANGE_MASK) - window_start = 2 * WINDOW_START; - /* If offset lies within PCI_BAR_WINDOW0_BASE and within PCI_SOC_PCI_REG_BASE - * use 0th window - */ - else if (((offset ^ PCI_BAR_WINDOW0_BASE) < WINDOW_RANGE_MASK) && - !((offset ^ PCI_SOC_PCI_REG_BASE) < PCI_SOC_RANGE_MASK)) - window_start = 0; - else - window_start = WINDOW_START; - - return window_start; + iowrite32(WINDOW_ENABLE_BIT | window, ab->mem + WINDOW_REG_ADDRESS); } static void ath12k_pci_soc_global_reset(struct ath12k_base *ab) @@ -313,10 +225,15 @@ static void ath12k_pci_sw_reset(struct ath12k_base *ab, bool power_on) { + mdelay(100); + if (power_on) { ath12k_pci_enable_ltssm(ab); ath12k_pci_clear_all_intrs(ab); ath12k_pci_set_wlaon_pwr_ctrl(ab); + + if (ab->hw_params->fix_l1ss) + ath12k_dbg(ab, ATH12K_DBG_PCI, "L1ss fix required\n"); } ath12k_mhi_clear_vector(ab); @@ -325,294 +242,160 @@ ath12k_mhi_set_mhictrl_reset(ab); } -static void ath12k_pci_free_ext_irq(struct ath12k_base *ab) -{ - int i, j; - - for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { - struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; - - for (j = 0; j < irq_grp->num_irq; j++) - free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); - - netif_napi_del(&irq_grp->napi); - } -} - -static void ath12k_pci_free_irq(struct ath12k_base *ab) -{ - int i, irq_idx; - - for (i = 0; i < ab->hw_params->ce_count; i++) { - if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) - continue; - irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i; - free_irq(ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]); - } - - ath12k_pci_free_ext_irq(ab); -} - -static void ath12k_pci_ce_irq_enable(struct ath12k_base *ab, u16 ce_id) -{ - u32 irq_idx; - - irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_id; - enable_irq(ab->irq_num[irq_idx]); -} - -static void ath12k_pci_ce_irq_disable(struct ath12k_base *ab, u16 ce_id) -{ - u32 irq_idx; - - irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + ce_id; - disable_irq_nosync(ab->irq_num[irq_idx]); -} - -static void ath12k_pci_ce_irqs_disable(struct ath12k_base *ab) -{ - int i; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +int ath12k_pci_ppeds_register_interrupts(struct ath12k_base *ab, int type, int vector, + int ring_num) +{ + struct ath12k_pci *ar_pci = (struct ath12k_pci *)ab->drv_priv; + int irq; + u8 bus_id = pci_domain_nr(ar_pci->pdev->bus); + int ret; - for (i = 0; i < ab->hw_params->ce_count; i++) { - if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) - continue; - ath12k_pci_ce_irq_disable(ab, i); - } + if (ab->ppeds_node_idx == -1) { + ath12k_err(ab, "invalid ppeds_node_idx in ppeds_register_interrupts\n"); + return -EINVAL; } -static void ath12k_pci_sync_ce_irqs(struct ath12k_base *ab) -{ - int i; - int irq_idx; - - for (i = 0; i < ab->hw_params->ce_count; i++) { - if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) - continue; + irq = ath12k_hif_get_msi_irq(ab, vector); - irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i; - synchronize_irq(ab->irq_num[irq_idx]); - } + irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY); + if (type == HAL_PPE2TCL) { + snprintf(&ab->dp.ppeds_irq_name[PPEDS_IRQ_PPE2TCL], sizeof(ab->dp.ppeds_irq_name), + "pci%d_ppe2tcl_%d", bus_id, ab->ppeds_node_idx); + ret = request_irq(irq, ath12k_ds_ppe2tcl_irq_handler, + IRQF_SHARED, + ab->dp.ppeds_irq_name[PPEDS_IRQ_PPE2TCL], (void *)ath12k_dp_get_ppe_ds_ctxt(ab)); + if (ret) + goto irq_fail; + ab->dp.ppeds_irq[PPEDS_IRQ_PPE2TCL] = irq; + } else if (type == HAL_REO2PPE) { + snprintf(&ab->dp.ppeds_irq_name[PPEDS_IRQ_REO2PPE], sizeof(ab->dp.ppeds_irq_name), + "pci%d_reo2ppe_%d", bus_id, ab->ppeds_node_idx); + ret = request_irq(irq, ath12k_ds_reo2ppe_irq_handler, + IRQF_SHARED, + ab->dp.ppeds_irq_name[PPEDS_IRQ_REO2PPE], (void *)ath12k_dp_get_ppe_ds_ctxt(ab)); + if (ret) + goto irq_fail; + ab->dp.ppeds_irq[PPEDS_IRQ_REO2PPE] = irq; + } else if (type == HAL_WBM2SW_RELEASE && ring_num == HAL_WBM2SW_PPEDS_TX_CMPLN_RING_NUM) { + snprintf(&ab->dp.ppeds_irq_name[PPEDS_IRQ_PPE_WBM2SW_REL], sizeof(ab->dp.ppeds_irq_name), + "pci%d_ppe_wbm_rel_%d", bus_id, ab->ppeds_node_idx); + ret = request_irq(irq, ath12k_dp_ppeds_handle_tx_comp, + IRQF_SHARED, + ab->dp.ppeds_irq_name[PPEDS_IRQ_PPE_WBM2SW_REL],(void *)ab); + if (ret) + goto irq_fail; + ab->dp.ppeds_irq[PPEDS_IRQ_PPE_WBM2SW_REL] = irq; + } else { + return 0; } + disable_irq_nosync(irq); -static void ath12k_pci_ce_tasklet(struct tasklet_struct *t) -{ - struct ath12k_ce_pipe *ce_pipe = from_tasklet(ce_pipe, t, intr_tq); - - ath12k_ce_per_engine_service(ce_pipe->ab, ce_pipe->pipe_num); + return 0; - ath12k_pci_ce_irq_enable(ce_pipe->ab, ce_pipe->pipe_num); +irq_fail: + return ret; } -static irqreturn_t ath12k_pci_ce_interrupt_handler(int irq, void *arg) +void ath12k_pci_ppeds_irq_disable(struct ath12k_base *ab, enum ppeds_irq_type type) { - struct ath12k_ce_pipe *ce_pipe = arg; - - /* last interrupt received for this CE */ - ce_pipe->timestamp = jiffies; - - ath12k_pci_ce_irq_disable(ce_pipe->ab, ce_pipe->pipe_num); - tasklet_schedule(&ce_pipe->intr_tq); - - return IRQ_HANDLED; + disable_irq_nosync(ab->dp.ppeds_irq[type]); } -static void ath12k_pci_ext_grp_disable(struct ath12k_ext_irq_grp *irq_grp) +void ath12k_pci_ppeds_irq_enable(struct ath12k_base *ab, enum ppeds_irq_type type) { - int i; - - for (i = 0; i < irq_grp->num_irq; i++) - disable_irq_nosync(irq_grp->ab->irq_num[irq_grp->irqs[i]]); + enable_irq(ab->dp.ppeds_irq[type]); } -static void __ath12k_pci_ext_irq_disable(struct ath12k_base *sc) +void ath12k_pci_ppeds_free_interrupts(struct ath12k_base *ab) { - int i; - - for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { - struct ath12k_ext_irq_grp *irq_grp = &sc->ext_irq_grp[i]; + disable_irq_nosync(ab->dp.ppeds_irq[PPEDS_IRQ_PPE2TCL]); + free_irq(ab->dp.ppeds_irq[PPEDS_IRQ_PPE2TCL], ath12k_dp_get_ppe_ds_ctxt(ab)); - ath12k_pci_ext_grp_disable(irq_grp); + disable_irq_nosync(ab->dp.ppeds_irq[PPEDS_IRQ_REO2PPE]); + free_irq(ab->dp.ppeds_irq[PPEDS_IRQ_REO2PPE], ath12k_dp_get_ppe_ds_ctxt(ab)); - napi_synchronize(&irq_grp->napi); - napi_disable(&irq_grp->napi); + disable_irq_nosync(ab->dp.ppeds_irq[PPEDS_IRQ_PPE_WBM2SW_REL]); + free_irq(ab->dp.ppeds_irq[PPEDS_IRQ_PPE_WBM2SW_REL], ab); } -} - -static void ath12k_pci_ext_grp_enable(struct ath12k_ext_irq_grp *irq_grp) -{ - int i; +#endif - for (i = 0; i < irq_grp->num_irq; i++) - enable_irq(irq_grp->ab->irq_num[irq_grp->irqs[i]]); -} - -static void ath12k_pci_sync_ext_irqs(struct ath12k_base *ab) +int ath12k_pci_get_msi_irq(struct ath12k_base *ab, unsigned int vector) { - int i, j, irq_idx; - - for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { - struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + struct device *dev = ab->dev; + struct pci_dev *pci_dev = to_pci_dev(dev); - for (j = 0; j < irq_grp->num_irq; j++) { - irq_idx = irq_grp->irqs[j]; - synchronize_irq(ab->irq_num[irq_idx]); - } - } + return pci_irq_vector(pci_dev, vector); } -static int ath12k_pci_ext_grp_napi_poll(struct napi_struct *napi, int budget) +static void ath12k_umac_reset_tasklet_handler(struct tasklet_struct *t) { - struct ath12k_ext_irq_grp *irq_grp = container_of(napi, - struct ath12k_ext_irq_grp, - napi); - struct ath12k_base *ab = irq_grp->ab; - int work_done; + struct ath12k_dp_umac_reset *umac_reset = from_tasklet(umac_reset, t, intr_tq); + struct ath12k_base *ab = container_of(umac_reset, struct ath12k_base, dp_umac_reset); - work_done = ath12k_dp_service_srng(ab, irq_grp, budget); - if (work_done < budget) { - napi_complete_done(napi, work_done); - ath12k_pci_ext_grp_enable(irq_grp); + ath12k_dp_umac_reset_handle(ab); + enable_irq(umac_reset->irq_num); } - if (work_done > budget) - work_done = budget; - - return work_done; -} - -static irqreturn_t ath12k_pci_ext_interrupt_handler(int irq, void *arg) +static irqreturn_t ath12k_dp_umac_reset_interrupt_handler(int irq, void *arg) { - struct ath12k_ext_irq_grp *irq_grp = arg; - - ath12k_dbg(irq_grp->ab, ATH12K_DBG_PCI, "ext irq:%d\n", irq); - - /* last interrupt received for this group */ - irq_grp->timestamp = jiffies; - - ath12k_pci_ext_grp_disable(irq_grp); - - napi_schedule(&irq_grp->napi); + struct ath12k_base *ab = arg; + struct ath12k_dp_umac_reset *umac_reset = &ab->dp_umac_reset; + disable_irq_nosync(umac_reset->irq_num); + tasklet_schedule(&umac_reset->intr_tq); return IRQ_HANDLED; } -static int ath12k_pci_ext_irq_config(struct ath12k_base *ab) +static void ath12k_dp_umac_reset_enable_irq(struct ath12k_base *ab) { - int i, j, ret, num_vectors = 0; - u32 user_base_data = 0, base_vector = 0, base_idx; - - base_idx = ATH12K_PCI_IRQ_CE0_OFFSET + CE_COUNT_MAX; - ret = ath12k_pci_get_user_msi_assignment(ab, "DP", - &num_vectors, - &user_base_data, - &base_vector); - if (ret < 0) - return ret; - - for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { - struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; - u32 num_irq = 0; - - irq_grp->ab = ab; - irq_grp->grp_id = i; - init_dummy_netdev(&irq_grp->napi_ndev); - netif_napi_add(&irq_grp->napi_ndev, &irq_grp->napi, - ath12k_pci_ext_grp_napi_poll); - - if (ab->hw_params->ring_mask->tx[i] || - ab->hw_params->ring_mask->rx[i] || - ab->hw_params->ring_mask->rx_err[i] || - ab->hw_params->ring_mask->rx_wbm_rel[i] || - ab->hw_params->ring_mask->reo_status[i] || - ab->hw_params->ring_mask->host2rxdma[i] || - ab->hw_params->ring_mask->rx_mon_dest[i]) { - num_irq = 1; - } - - irq_grp->num_irq = num_irq; - irq_grp->irqs[0] = base_idx + i; - - for (j = 0; j < irq_grp->num_irq; j++) { - int irq_idx = irq_grp->irqs[j]; - int vector = (i % num_vectors) + base_vector; - int irq = ath12k_pci_get_msi_irq(ab->dev, vector); + struct ath12k_dp_umac_reset *umac_reset = &ab->dp_umac_reset; - ab->irq_num[irq_idx] = irq; - - ath12k_dbg(ab, ATH12K_DBG_PCI, - "irq:%d group:%d\n", irq, i); - - irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY); - ret = request_irq(irq, ath12k_pci_ext_interrupt_handler, - IRQF_SHARED, - "DP_EXT_IRQ", irq_grp); - if (ret) { - ath12k_err(ab, "failed request irq %d: %d\n", - vector, ret); - return ret; - } - - disable_irq_nosync(ab->irq_num[irq_idx]); - } - } - - return 0; + enable_irq(umac_reset->irq_num); } -static int ath12k_pci_config_irq(struct ath12k_base *ab) +static int ath12k_dp_umac_pci_config_irq(struct ath12k_base *ab) { - struct ath12k_ce_pipe *ce_pipe; - u32 msi_data_start; - u32 msi_data_count, msi_data_idx; - u32 msi_irq_start; + u32 msi_data_start, msi_data_count, msi_irq_start; unsigned int msi_data; - int irq, i, ret, irq_idx; + int irq, ret; + struct ath12k_dp_umac_reset *umac_reset = &ab->dp_umac_reset; - ret = ath12k_pci_get_user_msi_assignment(ab, - "CE", &msi_data_count, + ret = ath12k_pcic_get_user_msi_assignment(ab, "DP", &msi_data_count, &msi_data_start, &msi_irq_start); if (ret) return ret; - /* Configure CE irqs */ + msi_data = (umac_reset->intr_offset % msi_data_count) + msi_irq_start; + irq = ath12k_pci_get_msi_irq(ab, msi_data); + umac_reset->irq_num = irq; + tasklet_setup(&umac_reset->intr_tq, ath12k_umac_reset_tasklet_handler); - for (i = 0, msi_data_idx = 0; i < ab->hw_params->ce_count; i++) { - if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) - continue; - - msi_data = (msi_data_idx % msi_data_count) + msi_irq_start; - irq = ath12k_pci_get_msi_irq(ab->dev, msi_data); - ce_pipe = &ab->ce.ce_pipe[i]; - - irq_idx = ATH12K_PCI_IRQ_CE0_OFFSET + i; - - tasklet_setup(&ce_pipe->intr_tq, ath12k_pci_ce_tasklet); - - ret = request_irq(irq, ath12k_pci_ce_interrupt_handler, - IRQF_SHARED, irq_name[irq_idx], - ce_pipe); + ret = request_irq(irq, ath12k_dp_umac_reset_interrupt_handler, + IRQF_NO_SUSPEND, "umac_dp_reset", ab); if (ret) { - ath12k_err(ab, "failed to request irq %d: %d\n", - irq_idx, ret); + ath12k_err(ab, "failed to request irq for umac dp reset %d\n", ret); return ret; } - ab->irq_num[irq_idx] = irq; - msi_data_idx++; + disable_irq_nosync(umac_reset->irq_num); - ath12k_pci_ce_irq_disable(ab, i); + return 0; } - ret = ath12k_pci_ext_irq_config(ab); - if (ret) - return ret; +static void ath12k_dp_umac_reset_free_irq(struct ath12k_base *ab) +{ + struct ath12k_dp_umac_reset *umac_reset = &ab->dp_umac_reset; - return 0; + disable_irq_nosync(umac_reset->irq_num); + free_irq(umac_reset->irq_num, ab); } static void ath12k_pci_init_qmi_ce_config(struct ath12k_base *ab) { struct ath12k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg; + struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); + struct pci_bus *bus = ab_pci->pdev->bus; cfg->tgt_ce = ab->hw_params->target_ce_config; cfg->tgt_ce_len = ab->hw_params->target_ce_count; @@ -620,17 +403,10 @@ cfg->svc_to_ce_map = ab->hw_params->svc_to_ce_map; cfg->svc_to_ce_map_len = ab->hw_params->svc_to_ce_map_len; ab->qmi.service_ins_id = ab->hw_params->qmi_service_ins_id; -} - -static void ath12k_pci_ce_irqs_enable(struct ath12k_base *ab) -{ - int i; - for (i = 0; i < ab->hw_params->ce_count; i++) { - if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) - continue; - ath12k_pci_ce_irq_enable(ab, i); - } + ab_pci->instance = (((pci_domain_nr(bus) & 0xF) << 4) | + (bus->number & 0xF)) & QRTR_INSTANCE_MASK; + ab->qmi.service_ins_id += ab_pci->instance; } static void ath12k_pci_msi_config(struct ath12k_pci *ab_pci, bool enable) @@ -661,7 +437,7 @@ static int ath12k_pci_msi_alloc(struct ath12k_pci *ab_pci) { struct ath12k_base *ab = ab_pci->ab; - const struct ath12k_msi_config *msi_config = ab_pci->msi_config; + const struct ath12k_msi_config *msi_config = ab->msi.config; struct msi_desc *msi_desc; int num_vectors; int ret; @@ -689,11 +465,11 @@ goto free_msi_vector; } - ab_pci->msi_ep_base_data = msi_desc->msg.data; + ab->msi.ep_base_data = msi_desc->msg.data; if (msi_desc->pci.msi_attrib.is_64) set_bit(ATH12K_PCI_FLAG_IS_MSI_64, &ab_pci->flags); - ath12k_dbg(ab, ATH12K_DBG_PCI, "msi base data is %d\n", ab_pci->msi_ep_base_data); + ath12k_dbg(ab, ATH12K_DBG_PCI, "msi base data is %d\n", ab->msi.ep_base_data); return 0; @@ -800,110 +576,32 @@ set_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags); } -static void ath12k_pci_aspm_restore(struct ath12k_pci *ab_pci) -{ - if (test_and_clear_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags)) - pcie_capability_write_word(ab_pci->pdev, PCI_EXP_LNKCTL, - ab_pci->link_ctl); -} - -static void ath12k_pci_kill_tasklets(struct ath12k_base *ab) -{ - int i; - - for (i = 0; i < ab->hw_params->ce_count; i++) { - struct ath12k_ce_pipe *ce_pipe = &ab->ce.ce_pipe[i]; - - if (ath12k_ce_get_attr_flags(ab, i) & CE_ATTR_DIS_INTR) - continue; - - tasklet_kill(&ce_pipe->intr_tq); - } -} - -static void ath12k_pci_ce_irq_disable_sync(struct ath12k_base *ab) -{ - ath12k_pci_ce_irqs_disable(ab); - ath12k_pci_sync_ce_irqs(ab); - ath12k_pci_kill_tasklets(ab); -} - -int ath12k_pci_map_service_to_pipe(struct ath12k_base *ab, u16 service_id, - u8 *ul_pipe, u8 *dl_pipe) -{ - const struct service_to_pipe *entry; - bool ul_set = false, dl_set = false; - int i; - - for (i = 0; i < ab->hw_params->svc_to_ce_map_len; i++) { - entry = &ab->hw_params->svc_to_ce_map[i]; - - if (__le32_to_cpu(entry->service_id) != service_id) - continue; - - switch (__le32_to_cpu(entry->pipedir)) { - case PIPEDIR_NONE: - break; - case PIPEDIR_IN: - WARN_ON(dl_set); - *dl_pipe = __le32_to_cpu(entry->pipenum); - dl_set = true; - break; - case PIPEDIR_OUT: - WARN_ON(ul_set); - *ul_pipe = __le32_to_cpu(entry->pipenum); - ul_set = true; - break; - case PIPEDIR_INOUT: - WARN_ON(dl_set); - WARN_ON(ul_set); - *dl_pipe = __le32_to_cpu(entry->pipenum); - *ul_pipe = __le32_to_cpu(entry->pipenum); - dl_set = true; - ul_set = true; - break; - } - } - - if (WARN_ON(!ul_set || !dl_set)) - return -ENOENT; - - return 0; -} - -int ath12k_pci_get_msi_irq(struct device *dev, unsigned int vector) -{ - struct pci_dev *pci_dev = to_pci_dev(dev); - - return pci_irq_vector(pci_dev, vector); -} - -int ath12k_pci_get_user_msi_assignment(struct ath12k_base *ab, char *user_name, - int *num_vectors, u32 *user_base_data, - u32 *base_vector) +static void ath12k_pci_update_qrtr_node_id(struct ath12k_base *ab) { struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); - const struct ath12k_msi_config *msi_config = ab_pci->msi_config; - int idx; + u32 reg; - for (idx = 0; idx < msi_config->total_users; idx++) { - if (strcmp(user_name, msi_config->users[idx].name) == 0) { - *num_vectors = msi_config->users[idx].num_vectors; - *user_base_data = msi_config->users[idx].base_vector - + ab_pci->msi_ep_base_data; - *base_vector = msi_config->users[idx].base_vector; - - ath12k_dbg(ab, ATH12K_DBG_PCI, "Assign MSI to user: %s, num_vectors: %d, user_base_data: %u, base_vector: %u\n", - user_name, *num_vectors, *user_base_data, - *base_vector); + /* + * On platforms with two or more identical mhi devices, qmi service run + * with identical qrtr-node-id. Because of this identical ID qrtr-lookup + * cannot register more than one qmi service with identical node ID. + * + * This generates a unique instance ID from PCIe domain number and bus number, + * writes to the given register, it is available for firmware when the QMI service + * is spawned. + */ + reg = PCIE_PCIE_LOCAL_REG_PCIE_LOCAL_RSV0 & WINDOW_RANGE_MASK; + ath12k_pci_write32(ab, reg, ab_pci->instance); - return 0; - } + ath12k_dbg(ab, ATH12K_DBG_PCI, "pci reg 0x%x instance 0x%x read val 0x%x\n", + reg, ab_pci->instance, ath12k_pci_read32(ab, reg)); } - ath12k_err(ab, "Failed to find MSI assignment for %s!\n", user_name); - - return -EINVAL; +static void ath12k_pci_aspm_restore(struct ath12k_pci *ab_pci) +{ + if (test_and_clear_bit(ATH12K_PCI_ASPM_RESTORE, &ab_pci->flags)) + pcie_capability_write_word(ab_pci->pdev, PCI_EXP_LNKCTL, + ab_pci->link_ctl); } void ath12k_pci_get_msi_address(struct ath12k_base *ab, u32 *msi_addr_lo, @@ -942,30 +640,12 @@ void ath12k_pci_hif_ce_irq_enable(struct ath12k_base *ab) { - ath12k_pci_ce_irqs_enable(ab); + ath12k_pcic_ce_irqs_enable(ab); } void ath12k_pci_hif_ce_irq_disable(struct ath12k_base *ab) { - ath12k_pci_ce_irq_disable_sync(ab); -} - -void ath12k_pci_ext_irq_enable(struct ath12k_base *ab) -{ - int i; - - for (i = 0; i < ATH12K_EXT_IRQ_GRP_NUM_MAX; i++) { - struct ath12k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; - - napi_enable(&irq_grp->napi); - ath12k_pci_ext_grp_enable(irq_grp); - } -} - -void ath12k_pci_ext_irq_disable(struct ath12k_base *ab) -{ - __ath12k_pci_ext_irq_disable(ab); - ath12k_pci_sync_ext_irqs(ab); + ath12k_pcic_ce_irq_disable_sync(ab); } int ath12k_pci_hif_suspend(struct ath12k_base *ab) @@ -986,12 +666,6 @@ return 0; } -void ath12k_pci_stop(struct ath12k_base *ab) -{ - ath12k_pci_ce_irq_disable_sync(ab); - ath12k_ce_cleanup_pipes(ab); -} - int ath12k_pci_start(struct ath12k_base *ab) { struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); @@ -1000,17 +674,25 @@ ath12k_pci_aspm_restore(ab_pci); - ath12k_pci_ce_irqs_enable(ab); - ath12k_ce_rx_post_buf(ab); - + ath12k_pcic_start(ab); return 0; } +#define PCI_BAR_WINDOW0_BASE 0x1E00000 +#define PCI_BAR_WINDOW0_END 0x1E7FFFC +#define PCI_SOC_PCI_REG_BASE 0x1E04000 +#define PCI_SOC_PCI_REG_END 0x1E07FFC +#define PCI_PARF_BASE 0x1E08000 +#define PCI_PARF_END 0x1E0BFFC +#define PCI_MHIREGLEN_REG 0x1E0E100 +#define PCI_MHI_REGION_END 0x1E0EFFC + u32 ath12k_pci_read32(struct ath12k_base *ab, u32 offset) { struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); u32 val, window_start; int ret = 0; + bool is_window0; /* for offset beyond BAR + 4K - 32, may * need to wakeup MHI to access. @@ -1023,22 +705,30 @@ val = ioread32(ab->mem + offset); } else { if (ab->static_window_map) - window_start = ath12k_pci_get_window_start(ab, offset); + window_start = ath12k_pcic_get_window_start(ab, offset); else window_start = WINDOW_START; if (window_start == WINDOW_START) { spin_lock_bh(&ab_pci->window_lock); ath12k_pci_select_window(ab_pci, offset); + + is_window0 = ((offset >= PCI_BAR_WINDOW0_BASE && + offset <= PCI_BAR_WINDOW0_END) && + (offset >= PCI_MHIREGLEN_REG && + offset <= PCI_MHI_REGION_END)); + + if (is_window0) { + offset = offset - PCI_MHIREGLEN_REG; + + val = ioread32(ab->mem + (offset & WINDOW_RANGE_MASK)); + + } else { val = ioread32(ab->mem + window_start + (offset & WINDOW_RANGE_MASK)); + } spin_unlock_bh(&ab_pci->window_lock); } else { - if ((!window_start) && - (offset >= PCI_MHIREGLEN_REG && - offset <= PCI_MHI_REGION_END)) - offset = offset - PCI_MHIREGLEN_REG; - val = ioread32(ab->mem + window_start + (offset & WINDOW_RANGE_MASK)); } @@ -1056,6 +746,7 @@ struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); u32 window_start; int ret = 0; + bool is_window0; /* for offset beyond BAR + 4K - 32, may * need to wakeup MHI to access. @@ -1068,22 +759,30 @@ iowrite32(value, ab->mem + offset); } else { if (ab->static_window_map) - window_start = ath12k_pci_get_window_start(ab, offset); + window_start = ath12k_pcic_get_window_start(ab, offset); else window_start = WINDOW_START; if (window_start == WINDOW_START) { spin_lock_bh(&ab_pci->window_lock); ath12k_pci_select_window(ab_pci, offset); + + is_window0 = ((offset >= PCI_BAR_WINDOW0_BASE && + offset <= PCI_BAR_WINDOW0_END) && + (offset >= PCI_MHIREGLEN_REG && + offset <= PCI_MHI_REGION_END)); + + if (is_window0) { + offset = offset - PCI_MHIREGLEN_REG; + + iowrite32(value, ab->mem + + (offset & WINDOW_RANGE_MASK)); + } else { iowrite32(value, ab->mem + window_start + (offset & WINDOW_RANGE_MASK)); + } spin_unlock_bh(&ab_pci->window_lock); } else { - if ((!window_start) && - (offset >= PCI_MHIREGLEN_REG && - offset <= PCI_MHI_REGION_END)) - offset = offset - PCI_MHIREGLEN_REG; - iowrite32(value, ab->mem + window_start + (offset & WINDOW_RANGE_MASK)); } @@ -1111,6 +810,8 @@ ath12k_pci_msi_enable(ab_pci); + ath12k_pci_update_qrtr_node_id(ab); + ret = ath12k_mhi_start(ab_pci); if (ret) { ath12k_err(ab, "failed to start mhi: %d\n", ret); @@ -1118,7 +819,7 @@ } if (ab->static_window_map) - ath12k_pci_select_static_window(ab_pci); + ath12k_pci_select_static_window(ab); return 0; } @@ -1127,35 +828,81 @@ { struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); + + ath12k_mhi_set_state(ab_pci, ATH12K_MHI_SOC_RESET); + if (!wait_for_completion_timeout(&ab->rddm_reset_done, msecs_to_jiffies(200))) { + ath12k_warn(ab, "failed to set RDDM mode\n"); + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags)) { + ath12k_warn(ab, "failed to clear MHI SOC RESET as mhi already in rddm state due to recovery in progress, clearing it here\n"); + clear_bit(ATH12K_MHI_SOC_RESET, &ab_pci->mhi_state); + reinit_completion(&ab->rddm_reset_done); + } + } + if (!(test_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags))) { + ath12k_qmi_free_target_mem_chunk(ab); + } /* restore aspm in case firmware bootup fails */ ath12k_pci_aspm_restore(ab_pci); + clear_bit(ATH12K_PCI_FLAG_INIT_DONE, &ab_pci->flags); ath12k_pci_force_wake(ab_pci->ab); ath12k_pci_msi_disable(ab_pci); ath12k_mhi_stop(ab_pci); - clear_bit(ATH12K_PCI_FLAG_INIT_DONE, &ab_pci->flags); ath12k_pci_sw_reset(ab_pci->ab, false); } static const struct ath12k_hif_ops ath12k_pci_hif_ops = { .start = ath12k_pci_start, - .stop = ath12k_pci_stop, + .stop = ath12k_pcic_stop, .read32 = ath12k_pci_read32, .write32 = ath12k_pci_write32, .power_down = ath12k_pci_power_down, .power_up = ath12k_pci_power_up, .suspend = ath12k_pci_hif_suspend, .resume = ath12k_pci_hif_resume, - .irq_enable = ath12k_pci_ext_irq_enable, - .irq_disable = ath12k_pci_ext_irq_disable, + .irq_enable = ath12k_pcic_ext_irq_enable, + .irq_disable = ath12k_pcic_ext_irq_disable, .get_msi_address = ath12k_pci_get_msi_address, - .get_user_msi_vector = ath12k_pci_get_user_msi_assignment, - .map_service_to_pipe = ath12k_pci_map_service_to_pipe, + .get_user_msi_vector = ath12k_pcic_get_user_msi_assignment, + .map_service_to_pipe = ath12k_pcic_map_service_to_pipe, .ce_irq_enable = ath12k_pci_hif_ce_irq_enable, .ce_irq_disable = ath12k_pci_hif_ce_irq_disable, .get_ce_msi_idx = ath12k_pci_get_ce_msi_idx, +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT + .ppeds_register_interrupts = ath12k_pci_ppeds_register_interrupts, + .ppeds_free_interrupts = ath12k_pci_ppeds_free_interrupts, + .ppeds_irq_enable = ath12k_pci_ppeds_irq_enable, + .ppeds_irq_disable = ath12k_pci_ppeds_irq_disable, +#endif + .dp_umac_reset_irq_config = ath12k_dp_umac_pci_config_irq, + .dp_umac_reset_enable_irq = ath12k_dp_umac_reset_enable_irq, + .dp_umac_reset_free_irq = ath12k_dp_umac_reset_free_irq, + .get_msi_irq = ath12k_pci_get_msi_irq, }; +bool ath12k_pci_has_board_id_override(struct ath12k_base *ab, + u16 *ov_board_id) +{ + struct ath12k_pci *ab_pci = ath12k_pci_priv(ab); + struct pci_dev *pdev = ab_pci->pdev; + const struct ath12k_bid_override *ov; + + list_for_each_entry(ov, &ab->board_id_overrides, next) { + if (ov->domain != pci_domain_nr(pdev->bus)) + continue; + + if (ov->bus_nr != pdev->bus->number) + continue; + + if (pdev->devfn != PCI_DEVFN(ov->slot, ov->func)) + continue; + + *ov_board_id = ov->board_id; + return true; + } + return false; +} + static void ath12k_pci_read_hw_version(struct ath12k_base *ab, u32 *major, u32 *minor) { @@ -1178,9 +925,13 @@ struct ath12k_base *ab; struct ath12k_pci *ab_pci; u32 soc_hw_version_major, soc_hw_version_minor; + u32 addr; int ret; - - ab = ath12k_core_alloc(&pdev->dev, sizeof(*ab_pci), ATH12K_BUS_PCI); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + ath12k_bond_enable_ppe_ds(); +#endif + ab = ath12k_core_alloc(&pdev->dev, sizeof(*ab_pci), ATH12K_BUS_PCI, + &ath12k_pci_bus_params); if (!ab) { dev_err(&pdev->dev, "failed to allocate ath12k base\n"); return -ENOMEM; @@ -1193,9 +944,21 @@ ab_pci->ab = ab; ab_pci->pdev = pdev; ab->hif.ops = &ath12k_pci_hif_ops; + ab->fw_mode = ATH12K_FIRMWARE_MODE_NORMAL; pci_set_drvdata(pdev, ab); spin_lock_init(&ab_pci->window_lock); + /* Set fixed_mem_region to true for platforms support reserved memory + * from DT. If memory is reserved from DT for FW, ath11k driver need not + * allocate memory. + */ + if (!of_property_read_u32(ab->dev->of_node, "memory-region", &addr)) + ab->bus_params.fixed_mem_region = true; + + /* This is HACK to bring up the qcn9224 with segemnted memory */ + if (ath12k_fw_mem_seg) + ab->bus_params.fixed_mem_region = false; + ret = ath12k_pci_claim(ab_pci, pdev); if (ret) { ath12k_err(ab, "failed to claim device: %d\n", ret); @@ -1204,7 +967,7 @@ switch (pci_dev->device) { case QCN9274_DEVICE_ID: - ab_pci->msi_config = &ath12k_msi_config[0]; + ab->msi.config = &ath12k_msi_config[ATH12K_MSI_CONFIG_PCI]; ab->static_window_map = true; ab_pci->pci_ops = &ath12k_pci_ops_qcn9274; ath12k_pci_read_hw_version(ab, &soc_hw_version_major, @@ -1225,10 +988,22 @@ } break; case WCN7850_DEVICE_ID: - ab_pci->msi_config = &ath12k_msi_config[0]; + ab->msi.config = &ath12k_msi_config[ATH12K_MSI_CONFIG_PCI]; ab->static_window_map = false; - ab->hw_rev = ATH12K_HW_WCN7850_HW20; ab_pci->pci_ops = &ath12k_pci_ops_wcn7850; + ath12k_pci_read_hw_version(ab, &soc_hw_version_major, + &soc_hw_version_minor); + switch (soc_hw_version_major) { + case ATH12K_PCI_SOC_HW_VERSION_2: + ab->hw_rev = ATH12K_HW_WCN7850_HW20; + break; + default: + dev_err(&pdev->dev, + "Unknown hardware version found for WCN7850: 0x%x\n", + soc_hw_version_major); + ret = -EOPNOTSUPP; + goto err_pci_free_region; + } break; default: @@ -1266,7 +1041,7 @@ ath12k_pci_init_qmi_ce_config(ab); - ret = ath12k_pci_config_irq(ab); + ret = ath12k_pcic_config_irq(ab); if (ret) { ath12k_err(ab, "failed to config irq: %d\n", ret); goto err_ce_free; @@ -1277,10 +1052,11 @@ ath12k_err(ab, "failed to init core: %d\n", ret); goto err_free_irq; } + return 0; err_free_irq: - ath12k_pci_free_irq(ab); + ath12k_pcic_free_irq(ab); err_ce_free: ath12k_ce_free_pipes(ab); @@ -1310,11 +1086,13 @@ if (test_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags)) { ath12k_pci_power_down(ab); + ath12k_debugfs_soc_destroy(ab); ath12k_qmi_deinit_service(ab); + ath12k_core_put_hw_group(ab); goto qmi_fail; } - set_bit(ATH12K_FLAG_UNREGISTERING, &ab->dev_flags); + set_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags); cancel_work_sync(&ab->reset_work); ath12k_core_deinit(ab); @@ -1322,7 +1100,7 @@ qmi_fail: ath12k_mhi_unregister(ab_pci); - ath12k_pci_free_irq(ab); + ath12k_pcic_free_irq(ab); ath12k_pci_msi_free(ab_pci); ath12k_pci_free_region(ab_pci); @@ -1335,7 +1113,16 @@ { struct ath12k_base *ab = pci_get_drvdata(pdev); - ath12k_pci_power_down(ab); + if (!ath12k_en_shutdown) + return + + set_bit(ATH12K_FLAG_UNREGISTERING, &ab->ag->dev_flags); + if (test_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags)) { + ath12k_warn(ab, "SSR recovery in progress, interrupting ssr recovery due to shutdown request\n"); + return; + } + cancel_work_sync(&ab->reset_work); + ath12k_core_deinit(ab); } static __maybe_unused int ath12k_pci_pm_suspend(struct device *dev) @@ -1375,7 +1162,7 @@ .driver.pm = &ath12k_pci_pm_ops, }; -static int ath12k_pci_init(void) +int ath12k_pci_init(void) { int ret; @@ -1383,19 +1170,12 @@ if (ret) { pr_err("failed to register ath12k pci driver: %d\n", ret); - return ret; } - return 0; + return ret; } -module_init(ath12k_pci_init); -static void ath12k_pci_exit(void) +void ath12k_pci_exit(void) { pci_unregister_driver(&ath12k_pci_driver); } - -module_exit(ath12k_pci_exit); - -MODULE_DESCRIPTION("Driver support for Qualcomm Technologies 802.11be WLAN PCIe devices"); -MODULE_LICENSE("Dual BSD/GPL"); diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/pci.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/pci.h --- linux-6.4/drivers/net/wireless/ath/ath12k/pci.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/pci.h 2024-04-22 13:40:50.295868965 +0200 @@ -53,6 +53,9 @@ #define WLAON_QFPROM_PWR_CTRL_REG 0x01f8031c #define QFPROM_PWR_CTRL_VDD4BLOW_MASK 0x4 +#define QCN9224_QFPROM_RAW_RFA_PDET_ROW13_LSB 0x1E20338 +#define OTP_BOARD_ID_MASK GENMASK(15,0) + #define PCI_BAR_WINDOW0_BASE 0x1E00000 #define PCI_BAR_WINDOW0_END 0x1E7FFFC #define PCI_SOC_RANGE_MASK 0x3FFF @@ -68,6 +71,12 @@ #define ATH12K_PCI_SOC_HW_VERSION_1 1 #define ATH12K_PCI_SOC_HW_VERSION_2 2 +enum ppeds_irq_type { + PPEDS_IRQ_PPE2TCL, + PPEDS_IRQ_REO2PPE, + PPEDS_IRQ_PPE_WBM2SW_REL, +}; + struct ath12k_msi_user { const char *name; int num_vectors; @@ -108,6 +117,7 @@ /* enum ath12k_pci_flags */ unsigned long flags; u16 link_ctl; + u32 instance; const struct ath12k_pci_ops *pci_ops; }; @@ -116,10 +126,12 @@ return (struct ath12k_pci *)ab->drv_priv; } +bool ath12k_pci_has_board_id_override(struct ath12k_base *ab, + u16 *ov_board_id); int ath12k_pci_get_user_msi_assignment(struct ath12k_base *ab, char *user_name, int *num_vectors, u32 *user_base_data, u32 *base_vector); -int ath12k_pci_get_msi_irq(struct device *dev, unsigned int vector); +int ath12k_pci_get_msi_irq(struct ath12k_base *ab, unsigned int vector); void ath12k_pci_write32(struct ath12k_base *ab, u32 offset, u32 value); u32 ath12k_pci_read32(struct ath12k_base *ab, u32 offset); int ath12k_pci_map_service_to_pipe(struct ath12k_base *ab, u16 service_id, @@ -138,4 +150,11 @@ int ath12k_pci_start(struct ath12k_base *ab); int ath12k_pci_power_up(struct ath12k_base *ab); void ath12k_pci_power_down(struct ath12k_base *ab); +void ath12k_pci_ppeds_free_interrupts(struct ath12k_base *ab); +int ath12k_pci_ppeds_register_interrupts(struct ath12k_base *ab, int type, + int vector, int ring_num); +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +void ath12k_pci_ppeds_irq_enable(struct ath12k_base *ab, enum ppeds_irq_type type); +void ath12k_pci_ppeds_irq_disable(struct ath12k_base *ab, enum ppeds_irq_type type); +#endif #endif /* ATH12K_PCI_H */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/peer.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/peer.c --- linux-6.4/drivers/net/wireless/ath/ath12k/peer.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/peer.c 2024-04-22 13:40:50.295868965 +0200 @@ -8,6 +8,23 @@ #include "peer.h" #include "debug.h" +static struct ath12k_ml_peer *ath12k_ml_peer_find(struct ath12k_hw *ah, + const u8 *addr) +{ + struct ath12k_ml_peer *ml_peer; + + lockdep_assert_held(&ah->data_lock); + + list_for_each_entry(ml_peer, &ah->ml_peers, list) { + if (!ether_addr_equal(ml_peer->addr, addr)) + continue; + + return ml_peer; + } + + return NULL; +} + struct ath12k_peer *ath12k_peer_find(struct ath12k_base *ab, int vdev_id, const u8 *addr) { @@ -49,33 +66,71 @@ struct ath12k_peer *ath12k_peer_find_by_addr(struct ath12k_base *ab, const u8 *addr) { - struct ath12k_peer *peer; lockdep_assert_held(&ab->base_lock); - list_for_each_entry(peer, &ab->peers, list) { - if (!ether_addr_equal(peer->addr, addr)) - continue; + if (!ab->rhead_peer_addr) + return NULL; + + return rhashtable_lookup_fast(ab->rhead_peer_addr, addr, + ab->rhash_peer_addr_param); - return peer; } +static struct ath12k_peer *ath12k_peer_find_by_ml_id(struct ath12k_base *ab, + int ml_peer_id) +{ + struct ath12k_peer *peer; + + lockdep_assert_held(&ab->base_lock); + + list_for_each_entry(peer, &ab->peers, list) + if (ml_peer_id == peer->ml_peer_id) + return peer; + return NULL; } -struct ath12k_peer *ath12k_peer_find_by_id(struct ath12k_base *ab, +struct ath12k_peer *ath12k_peer_find_list_by_id(struct ath12k_base *ab, int peer_id) { struct ath12k_peer *peer; lockdep_assert_held(&ab->base_lock); - list_for_each_entry(peer, &ab->peers, list) - if (peer_id == peer->peer_id) + if (peer_id == ATH12K_PEER_ID_INVALID) + return NULL; + + if (peer_id & ATH12K_ML_PEER_ID_VALID) { + return ath12k_peer_find_by_ml_id(ab, peer_id); + } else { + list_for_each_entry(peer, &ab->peers, list) { + if (peer->peer_id == peer_id) return peer; + } return NULL; } +} + +struct ath12k_peer *ath12k_peer_find_by_id(struct ath12k_base *ab, + int peer_id) +{ + lockdep_assert_held(&ab->base_lock); + + if (peer_id == ATH12K_PEER_ID_INVALID) + return NULL; + + if (peer_id & ATH12K_ML_PEER_ID_VALID) { + return ath12k_peer_find_by_ml_id(ab, peer_id); + } else { + if (!ab->rhead_peer_id) + return NULL; + + return rhashtable_lookup_fast(ab->rhead_peer_id, &peer_id, + ab->rhash_peer_id_param); + } +} bool ath12k_peer_exist_by_vdev_id(struct ath12k_base *ab, int vdev_id) { @@ -92,18 +147,20 @@ spin_unlock_bh(&ab->base_lock); return false; } - -struct ath12k_peer *ath12k_peer_find_by_ast(struct ath12k_base *ab, - int ast_hash) +struct ath12k_peer *ath12k_peer_find_by_vdev_id(struct ath12k_base *ab, + int vdev_id) { struct ath12k_peer *peer; - lockdep_assert_held(&ab->base_lock); + spin_lock_bh(&ab->base_lock); - list_for_each_entry(peer, &ab->peers, list) - if (ast_hash == peer->ast_hash) + list_for_each_entry(peer, &ab->peers, list) { + if (vdev_id == peer->vdev_id) { + spin_unlock_bh(&ab->base_lock); return peer; - + } + } + spin_unlock_bh(&ab->base_lock); return NULL; } @@ -113,17 +170,21 @@ spin_lock_bh(&ab->base_lock); - peer = ath12k_peer_find_by_id(ab, peer_id); + peer = ath12k_peer_find_list_by_id(ab, peer_id); if (!peer) { ath12k_warn(ab, "peer-unmap-event: unknown peer id %d\n", peer_id); goto exit; } - ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "htt peer unmap vdev %d peer %pM id %d\n", + ath12k_dbg(ab, ATH12K_DBG_PEER, "htt peer unmap vdev %d peer %pM id %d\n", peer->vdev_id, peer->addr, peer_id); list_del(&peer->list); +#ifdef CONFIG_ATH12K_SAWF + if (peer->sawf_ctx_peer.telemetry_peer_ctx) + ath12k_telemetry_peer_ctx_free(peer->sawf_ctx_peer.telemetry_peer_ctx); +#endif kfree(peer); wake_up(&ab->peer_mapping_wq); @@ -148,17 +209,75 @@ peer->ast_hash = ast_hash; peer->hw_peer_id = hw_peer_id; ether_addr_copy(peer->addr, mac_addr); +#ifdef CONFIG_ATH12K_SAWF + if (ath12k_sawf_enable) + ath12k_sdwf_fill_hbucket_type(peer); +#endif list_add(&peer->list, &ab->peers); wake_up(&ab->peer_mapping_wq); } - ath12k_dbg(ab, ATH12K_DBG_DP_HTT, "htt peer map vdev %d peer %pM id %d\n", + ath12k_dbg(ab, ATH12K_DBG_PEER, "htt peer map vdev %d peer %pM id %d\n", vdev_id, mac_addr, peer_id); exit: spin_unlock_bh(&ab->base_lock); } +void ath12k_peer_mlo_map_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + struct ath11k_htt_mlo_peer_map_msg *msg; + u16 ml_peer_id; + struct ath12k_peer *peer; + u16 mld_mac_h16; + u8 mld_addr[ETH_ALEN]; + + msg = (struct ath11k_htt_mlo_peer_map_msg *)skb->data; + + ml_peer_id = FIELD_GET(ATH12K_HTT_MLO_PEER_MAP_INFO0_PEER_ID, msg->info0); + + ml_peer_id |= ATH12K_ML_PEER_ID_VALID; + + spin_lock_bh(&ab->base_lock); + peer = ath12k_peer_find_list_by_id(ab, ml_peer_id); + + /* TODO a sync wait to check ml peer map success or delete + * ml peer info in all link peers and make peer assoc failure + * TBA after testing basic changes + */ + if (!peer) { + ath12k_warn(ab, "peer corresponding to ml peer id %d not found", ml_peer_id); + spin_unlock_bh(&ab->base_lock); + return; + } + mld_mac_h16 = FIELD_GET(ATH12K_HTT_MLO_PEER_MAP_MAC_ADDR_H16, + msg->mac_addr.mac_addr_h16); + ath12k_dp_get_mac_addr(msg->mac_addr.mac_addr_l32, mld_mac_h16, mld_addr); + + WARN_ON(memcmp(mld_addr, peer->ml_addr, ETH_ALEN)); + + spin_unlock_bh(&ab->base_lock); + + ath12k_dbg(ab, ATH12K_DBG_PEER, "htt MLO peer map peer %pM id %d\n", + mld_addr, ml_peer_id); + + /* TODO rx queue setup for the ML peer */ +} + +void ath12k_peer_mlo_unmap_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + struct ath11k_htt_mlo_peer_unmap_msg *msg; + u16 ml_peer_id; + + msg = (struct ath11k_htt_mlo_peer_unmap_msg *)skb->data; + + ml_peer_id = FIELD_GET(ATH12K_HTT_MLO_PEER_UNMAP_PEER_ID, msg->info0); + + ml_peer_id |= ATH12K_ML_PEER_ID_VALID; + + ath12k_dbg(ab, ATH12K_DBG_PEER, "htt MLO peer unmap peer ml id %d\n", ml_peer_id); +} + static int ath12k_wait_for_peer_common(struct ath12k_base *ab, int vdev_id, const u8 *addr, bool expect_mapped) { @@ -181,6 +300,80 @@ return 0; } +static inline int ath12k_peer_rhash_insert(struct ath12k_base *ab, + struct rhashtable *rtbl, + struct rhash_head *rhead, + struct rhashtable_params *params, + void *key) +{ + struct ath12k_peer *tmp; + + lockdep_assert_held(&ab->tbl_mtx_lock); + + tmp = rhashtable_lookup_get_insert_fast(rtbl, rhead, *params); + + if (!tmp) + return 0; + else if (IS_ERR(tmp)) + return PTR_ERR(tmp); + else + return -EEXIST; +} +static inline int ath12k_peer_rhash_remove(struct ath12k_base *ab, + struct rhashtable *rtbl, + struct rhash_head *rhead, + struct rhashtable_params *params) +{ + int ret; + + lockdep_assert_held(&ab->tbl_mtx_lock); + + ret = rhashtable_remove_fast(rtbl, rhead, *params); + if (ret && ret != -ENOENT) + return ret; + + return 0; +} + +static int ath12k_peer_rhash_add(struct ath12k_base *ab, struct ath12k_peer *peer) +{ + int ret; + + lockdep_assert_held(&ab->base_lock); + lockdep_assert_held(&ab->tbl_mtx_lock); + + if (!ab->rhead_peer_id || !ab->rhead_peer_addr) + return -EPERM; + + if (peer->rhash_done) + return 0; + + ret = ath12k_peer_rhash_insert(ab, ab->rhead_peer_id, &peer->rhash_id, + &ab->rhash_peer_id_param, &peer->peer_id); + if (ret) { + ath12k_warn(ab, "failed to add peer %pM with id %d in rhash_id ret %d\n", + peer->addr, peer->peer_id, ret); + return ret; + } + + ret = ath12k_peer_rhash_insert(ab, ab->rhead_peer_addr, &peer->rhash_addr, + &ab->rhash_peer_addr_param, &peer->addr); + if (ret) { + ath12k_warn(ab, "failed to add peer %pM with id %d in rhash_addr ret %d\n", + peer->addr, peer->peer_id, ret); + goto err_clean; + } + + peer->rhash_done = true; + return 0; + +err_clean: + ath12k_peer_rhash_remove(ab, ab->rhead_peer_id, &peer->rhash_id, + &ab->rhash_peer_id_param); + return ret; +} + + void ath12k_peer_cleanup(struct ath12k *ar, u32 vdev_id) { struct ath12k_peer *peer, *tmp; @@ -188,6 +381,7 @@ lockdep_assert_held(&ar->conf_mutex); + mutex_lock(&ab->tbl_mtx_lock); spin_lock_bh(&ab->base_lock); list_for_each_entry_safe(peer, tmp, &ab->peers, list) { if (peer->vdev_id != vdev_id) @@ -195,13 +389,18 @@ ath12k_warn(ab, "removing stale peer %pM from vdev_id %d\n", peer->addr, vdev_id); - + ath12k_peer_rhash_delete(ab, peer); list_del(&peer->list); +#ifdef CONFIG_ATH12K_SAWF + if (peer->sawf_ctx_peer.telemetry_peer_ctx) + ath12k_telemetry_peer_ctx_free(peer->sawf_ctx_peer.telemetry_peer_ctx); +#endif kfree(peer); ar->num_peers--; } spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); } static int ath12k_wait_for_peer_deleted(struct ath12k *ar, int vdev_id, const u8 *addr) @@ -217,72 +416,251 @@ ret = ath12k_wait_for_peer_deleted(ar, vdev_id, addr); if (ret) { - ath12k_warn(ar->ab, "failed wait for peer deleted"); + ath12k_warn(ar->ab, "failed wait for peer deleted peer_addr : %pM\n", addr); return ret; } time_left = wait_for_completion_timeout(&ar->peer_delete_done, 3 * HZ); if (time_left == 0) { - ath12k_warn(ar->ab, "Timeout in receiving peer delete response\n"); + ath12k_warn(ar->ab, "Timeout in receiving peer delete response peer_addr : %pM\n", + addr); return -ETIMEDOUT; } return 0; } -int ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, u8 *addr) +int ath12k_peer_delete_send(struct ath12k *ar, u32 vdev_id, const u8 *addr) { + struct ath12k_peer *peer; + struct ath12k_base *ab = ar->ab; int ret; lockdep_assert_held(&ar->conf_mutex); + mutex_lock(&ab->tbl_mtx_lock); + spin_lock_bh(&ab->base_lock); + + peer = ath12k_peer_find_by_addr(ab, addr); + if (peer && peer->vdev_id == vdev_id) + ath12k_peer_rhash_delete(ab, peer); + + if (!peer) + peer = ath12k_peer_find(ab, vdev_id, addr); + + if (!peer) { + spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); + + ath12k_warn(ab, + "failed to find peer vdev_id %d addr %pM in delete\n", + vdev_id, addr); + return -EINVAL; + } + + spin_unlock_bh(&ab->base_lock); + mutex_unlock(&ab->tbl_mtx_lock); + + reinit_completion(&ar->peer_delete_done); ret = ath12k_wmi_send_peer_delete_cmd(ar, addr, vdev_id); if (ret) { - ath12k_warn(ar->ab, + ath12k_warn(ab, "failed to delete peer vdev_id %d addr %pM ret %d\n", vdev_id, addr, ret); return ret; } + return 0; +} + +static int __ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, const u8 *addr) +{ + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + ret = ath12k_peer_delete_send(ar, vdev_id, addr); + if (ret) + return ret; + ret = ath12k_wait_for_peer_delete_done(ar, vdev_id, addr); if (ret) return ret; + return 0; +} + +int ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, const u8 *addr) +{ + int ret; + + lockdep_assert_held(&ar->conf_mutex); + + ret = __ath12k_peer_delete(ar, vdev_id, addr); + if (ret) + return ret; + ar->num_peers--; return 0; } +int ath12k_ml_link_peers_delete(struct ath12k_vif *ahvif, struct ath12k_sta *ahsta) +{ + struct ath12k_link_vif *arvif; + struct ath12k_link_sta *arsta; + struct ieee80211_sta *sta; + struct ath12k *ar; + int ret, err_ret = 0; + u8 link_id = 0; + struct ath12k_hw *ah = ahvif->ah; + unsigned long links; + + lockdep_assert_held(&ah->conf_mutex); + + sta = container_of((void *)ahsta, struct ieee80211_sta, drv_priv); + + if (!sta->mlo) + return -EINVAL; + + /* FW expects delete of all link peers at once before waiting for reception + * of peer unmap or delete responses + */ + links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + if (!arvif || !arsta) + continue; + + ar = arvif->ar; + + if (!ar) + continue; + cancel_work_sync(&arsta->update_wk); + + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags) || + test_bit(ATH12K_FLAG_RECOVERY, &ar->ab->dev_flags) || + test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &ar->ab->dev_flags)) + continue; + + cancel_work_sync(&arsta->update_wk); + mutex_lock(&ar->conf_mutex); + ath12k_dp_peer_cleanup(ar, arvif->vdev_id, arsta->addr); + + ret = ath12k_peer_delete_send(ar, arvif->vdev_id, arsta->addr); + if (ret) { + mutex_unlock(&ar->conf_mutex); + ath12k_warn(ar->ab, + "failed to delete peer vdev_id %d addr %pM ret %d\n", + arvif->vdev_id, arsta->addr, ret); + err_ret = ret; + continue; + } + mutex_unlock(&ar->conf_mutex); + } + + /* Ensure all link peers are deleted and unmapped */ + links = sta->valid_links; + for_each_set_bit(link_id, &links, IEEE80211_MLD_MAX_NUM_LINKS) { + arvif = ahvif->link[link_id]; + arsta = ahsta->link[link_id]; + + if (!arvif || !arsta) + continue; + + ar = arvif->ar; + + if (!ar) + continue; + + if (test_bit(ATH12K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags) || + test_bit(ATH12K_FLAG_RECOVERY, &ar->ab->dev_flags) || + test_bit(ATH12K_FLAG_UMAC_RECOVERY_START, &ar->ab->dev_flags)) + continue; + mutex_lock(&ar->conf_mutex); + ret = ath12k_wait_for_peer_delete_done(ar, arvif->vdev_id, arsta->addr); + if (ret) { + err_ret = ret; + mutex_unlock(&ar->conf_mutex); + continue; + } + ar->num_peers--; + mutex_unlock(&ar->conf_mutex); + } + + return err_ret; +} + static int ath12k_wait_for_peer_created(struct ath12k *ar, int vdev_id, const u8 *addr) { return ath12k_wait_for_peer_common(ar->ab, vdev_id, addr, true); } -int ath12k_peer_create(struct ath12k *ar, struct ath12k_vif *arvif, +int ath12k_peer_create(struct ath12k *ar, struct ath12k_link_vif *arvif, struct ieee80211_sta *sta, struct ath12k_wmi_peer_create_arg *arg) { struct ath12k_peer *peer; - int ret; + struct ath12k_sta *ahsta; + struct ath12k_link_sta *arsta; + u8 link_id = arvif->link_id; + struct ieee80211_vif *vif = arvif->ahvif->vif; + struct ath12k_ml_peer *ml_peer; + int ret, fbret; lockdep_assert_held(&ar->conf_mutex); - if (ar->num_peers > (ar->max_num_peers - 1)) { + if (ar->num_peers >= (ar->max_num_peers - 1)) { ath12k_warn(ar->ab, "failed to create peer due to insufficient peer entry resource in firmware\n"); return -ENOBUFS; } + /* Check if a ML peer with same address as this link peer already + * exists + */ + if (sta) { + ahsta = ath12k_sta_to_ahsta(sta); + spin_lock_bh(&ar->ah->data_lock); + ml_peer = ath12k_ml_peer_find(ar->ah, arg->peer_addr); + if (ml_peer && (!sta->mlo || ml_peer->id != ahsta->ml_peer_id)) { + spin_unlock_bh(&ar->ah->data_lock); + ath12k_warn(ar->ab, + "failed to create link peer %pM due to conflicting address with already associated ML peer %pM with ml peer id %d\n", + arg->peer_addr, ml_peer->addr, + ml_peer->id); + return -EINVAL; + } + spin_unlock_bh(&ar->ah->data_lock); + } + + mutex_lock(&ar->ab->tbl_mtx_lock); spin_lock_bh(&ar->ab->base_lock); peer = ath12k_peer_find_by_pdev_idx(ar->ab, ar->pdev_idx, arg->peer_addr); if (peer) { + ath12k_warn(ar->ab, "Peer %pM already found in pdev_idx %d vdev %d\n", + arg->peer_addr, ar->pdev_idx, peer->vdev_id); spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); return -EINVAL; } + + /* In case of Split PHY and roaming scenario, pdev idx + * might differ but both the pdev will share same rhash + * table. In that case update the rhash table if peer is + * already present + */ + peer = ath12k_peer_find_by_addr(ar->ab, arg->peer_addr); + if (peer) + ath12k_peer_rhash_delete(ar->ab, peer); + spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); ret = ath12k_wmi_send_peer_create_cmd(ar, arg); if (ret) { @@ -297,46 +675,385 @@ if (ret) return ret; + mutex_lock(&ar->ab->tbl_mtx_lock); spin_lock_bh(&ar->ab->base_lock); peer = ath12k_peer_find(ar->ab, arg->vdev_id, arg->peer_addr); if (!peer) { spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); ath12k_warn(ar->ab, "failed to find peer %pM on vdev %i after creation\n", arg->peer_addr, arg->vdev_id); - reinit_completion(&ar->peer_delete_done); - - ret = ath12k_wmi_send_peer_delete_cmd(ar, arg->peer_addr, - arg->vdev_id); - if (ret) { - ath12k_warn(ar->ab, "failed to delete peer vdev_id %d addr %pM\n", - arg->vdev_id, arg->peer_addr); - return ret; + goto cleanup; } - - ret = ath12k_wait_for_peer_delete_done(ar, arg->vdev_id, - arg->peer_addr); - if (ret) - return ret; - - return -ENOENT; + ret = ath12k_peer_rhash_add(ar->ab, peer); + if (ret) { + spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); + goto cleanup; } peer->pdev_idx = ar->pdev_idx; peer->sta = sta; - if (arvif->vif->type == NL80211_IFTYPE_STATION) { + if (vif->type == NL80211_IFTYPE_STATION) { arvif->ast_hash = peer->ast_hash; arvif->ast_idx = peer->hw_peer_id; + arvif->desc.info4 = FIELD_PREP(HAL_TCL_DATA_CMD_INFO4_SEARCH_INDEX, arvif->ast_idx) | + FIELD_PREP(HAL_TCL_DATA_CMD_INFO4_CACHE_SET_NUM, arvif->ast_hash); } peer->sec_type = HAL_ENCRYPT_TYPE_OPEN; peer->sec_type_grp = HAL_ENCRYPT_TYPE_OPEN; + peer->vif = vif; +#ifdef CONFIG_MAC80211_PPE_SUPPORT + peer->ppe_vp_num = peer->vif->ppe_vp_num; +#endif +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT + peer->ppe_vp_num = arvif->ppe_vp_num; +#endif + + if (sta) { + ahsta = ath12k_sta_to_ahsta(sta); + arsta = ahsta->link[link_id]; + arsta->tcl_metadata |= HTT_TCL_META_DATA_GET(0, + HTT_TCL_META_DATA_TYPE) | + HTT_TCL_META_DATA_GET(peer->peer_id, + HTT_TCL_META_DATA_PEER_ID); + peer->link_id = arsta->link_id; + + /* set HTT extension valid bit to 0 by default */ + arsta->tcl_metadata &= ~HTT_TCL_META_DATA_VALID_HTT; + + /* Fill ML info into created peer */ + if (sta->mlo) { + peer->ml_peer_id = ahsta->ml_peer_id | ATH12K_ML_PEER_ID_VALID; + ether_addr_copy(peer->ml_addr, sta->addr); + peer->mlo = true; + } else { + peer->ml_peer_id = ATH12K_MLO_PEER_ID_INVALID; + peer->mlo = false; + } + } ar->num_peers++; + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, "peer created %pM\n", arg->peer_addr); + spin_unlock_bh(&ar->ab->base_lock); + mutex_unlock(&ar->ab->tbl_mtx_lock); + + return 0; + +cleanup: + fbret = __ath12k_peer_delete(ar, arg->vdev_id, arg->peer_addr); + if (fbret) + ath12k_warn(ar->ab, "failed peer %pM delete vdev_id %d fallback ret %d\n", + arg->peer_addr, arg->vdev_id, fbret); + + return ret; + +} + +static u16 ath12k_mac_alloc_ml_peer_id(struct ath12k_hw *ah) +{ + + u16 ml_peer_id; + + lockdep_assert_held(&ah->conf_mutex); + + for (ml_peer_id = 0; ml_peer_id < ATH12K_MAX_MLO_PEERS; ml_peer_id++) { + if (test_bit(ml_peer_id, ah->free_ml_peer_id_map)) + continue; + + set_bit(ml_peer_id, ah->free_ml_peer_id_map); + break; + } + + if (ml_peer_id == ATH12K_MAX_MLO_PEERS) + ml_peer_id = ATH12K_MLO_PEER_ID_INVALID; + + ath12k_dbg(NULL, ATH12K_DBG_PEER, "Allocated ml_peer_id:%d", ml_peer_id); + + return ml_peer_id; +} + +int ath12k_ml_peer_create(struct ath12k_hw *ah, struct ieee80211_sta *sta) +{ + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_ml_peer *ml_peer; + + lockdep_assert_held(&ah->conf_mutex); + + if (!sta->mlo) + return -EINVAL; + + spin_lock_bh(&ah->data_lock); + ml_peer = ath12k_ml_peer_find(ah, sta->addr); + if (ml_peer) { + spin_unlock_bh(&ah->data_lock); + ath12k_err(NULL, "ML peer(id=%d) exists already, unable to add new entry for %pM", + ml_peer->id, sta->addr); + return -EEXIST; + } + + ml_peer = kzalloc(sizeof(*ml_peer), GFP_ATOMIC); + if (!ml_peer) { + spin_unlock_bh(&ah->data_lock); + ath12k_err(NULL, "unable to allocate new ML peer for %pM", + sta->addr); + return -ENOMEM; + } + + ahsta->ml_peer_id = ath12k_mac_alloc_ml_peer_id(ah); + + if (ahsta->ml_peer_id == ATH12K_MLO_PEER_ID_INVALID) { + kfree(ml_peer); + spin_unlock_bh(&ah->data_lock); + ath12k_err(NULL, "unable to allocate ml peer id for sta %pM", sta->addr); + return -ENOMEM; + } + + ether_addr_copy(ml_peer->addr, sta->addr); + ml_peer->id = ahsta->ml_peer_id; + list_add(&ml_peer->list, &ah->ml_peers); + spin_unlock_bh(&ah->data_lock); + + ath12k_dbg(NULL, ATH12K_DBG_PEER, "ML peer created for %pM id %d\n", + sta->addr, ahsta->ml_peer_id); + return 0; +} + +int ath12k_ml_peer_delete(struct ath12k_hw *ah, struct ieee80211_sta *sta) +{ + struct ath12k_sta *ahsta = ath12k_sta_to_ahsta(sta); + struct ath12k_ml_peer *ml_peer; + + lockdep_assert_held(&ah->conf_mutex); + if (!sta->mlo) + return -EINVAL; + + clear_bit(ahsta->ml_peer_id, ah->free_ml_peer_id_map); + ahsta->ml_peer_id = ATH12K_MLO_PEER_ID_INVALID; + + spin_lock_bh(&ah->data_lock); + ml_peer = ath12k_ml_peer_find(ah, sta->addr); + if (!ml_peer) { + spin_unlock_bh(&ah->data_lock); + ath12k_err(NULL, "ML peer for %pM not found", sta->addr); + return -EINVAL; + } + + list_del(&ml_peer->list); + kfree(ml_peer); + spin_unlock_bh(&ah->data_lock); + + ath12k_dbg(NULL, ATH12K_DBG_PEER, "ML peer deleted for %pM\n", + sta->addr); + return 0; +} + +int ath12k_peer_rhash_delete(struct ath12k_base *ab, struct ath12k_peer *peer) +{ + int ret; + + lockdep_assert_held(&ab->base_lock); + lockdep_assert_held(&ab->tbl_mtx_lock); + + if (!ab->rhead_peer_id || !ab->rhead_peer_addr) + return -EPERM; + if (!peer->rhash_done) return 0; + + ret = ath12k_peer_rhash_remove(ab, ab->rhead_peer_addr, &peer->rhash_addr, + &ab->rhash_peer_addr_param); + if (ret) { + ath12k_warn(ab, "failed to remove peer %pM id %d in rhash_addr ret %d\n", + peer->addr, peer->peer_id, ret); + return ret; + } + + ret = ath12k_peer_rhash_remove(ab, ab->rhead_peer_id, &peer->rhash_id, + &ab->rhash_peer_id_param); + if (ret) { + ath12k_warn(ab, "failed to remove peer %pM id %d in rhash_id ret %d\n", + peer->addr, peer->peer_id, ret); + return ret; + } + + peer->rhash_done = false; + + return 0; +} + +static int ath12k_peer_rhash_id_tbl_init(struct ath12k_base *ab) +{ + struct rhashtable_params *param; + struct rhashtable *rhash_id_tbl; + int ret; + size_t size; + + lockdep_assert_held(&ab->tbl_mtx_lock); + + if (ab->rhead_peer_id) + return 0; + + size = sizeof(*ab->rhead_peer_id); + rhash_id_tbl = kzalloc(size, GFP_KERNEL); + if (!rhash_id_tbl) { + ath12k_warn(ab, "failed to init rhash id table due to no mem (size %zu)\n", + size); + return -ENOMEM; + } + + param = &ab->rhash_peer_id_param; + + param->key_offset = offsetof(struct ath12k_peer, peer_id); + param->head_offset = offsetof(struct ath12k_peer, rhash_id); + param->key_len = sizeof_field(struct ath12k_peer, peer_id); + param->automatic_shrinking = true; + param->nelem_hint = ab->num_radios * TARGET_NUM_PEERS_PDEV; + + ret = rhashtable_init(rhash_id_tbl, param); + if (ret) { + ath12k_warn(ab, "failed to init peer id rhash table %d\n", ret); + goto err_free; + } + + spin_lock_bh(&ab->base_lock); + + if (!ab->rhead_peer_id) { + ab->rhead_peer_id = rhash_id_tbl; + } else { + spin_unlock_bh(&ab->base_lock); + goto cleanup_tbl; + } + + spin_unlock_bh(&ab->base_lock); + + return 0; + +cleanup_tbl: + rhashtable_destroy(rhash_id_tbl); +err_free: + kfree(rhash_id_tbl); + + return ret; +} + +static int ath12k_peer_rhash_addr_tbl_init(struct ath12k_base *ab) +{ + struct rhashtable_params *param; + struct rhashtable *rhash_addr_tbl; + int ret; + size_t size; + + lockdep_assert_held(&ab->tbl_mtx_lock); + + if (ab->rhead_peer_addr) + return 0; + + size = sizeof(*ab->rhead_peer_addr); + rhash_addr_tbl = kzalloc(size, GFP_KERNEL); + if (!rhash_addr_tbl) { + ath12k_warn(ab, "failed to init rhash addr table due to no mem (size %zu)\n", + size); + return -ENOMEM; + } + + param = &ab->rhash_peer_addr_param; + + param->key_offset = offsetof(struct ath12k_peer, addr); + param->head_offset = offsetof(struct ath12k_peer, rhash_addr); + param->key_len = sizeof_field(struct ath12k_peer, addr); + param->automatic_shrinking = true; + param->nelem_hint = ab->num_radios * TARGET_NUM_PEERS_PDEV; + + ret = rhashtable_init(rhash_addr_tbl, param); + if (ret) { + ath12k_warn(ab, "failed to init peer addr rhash table %d\n", ret); + goto err_free; } + + spin_lock_bh(&ab->base_lock); + + if (!ab->rhead_peer_addr) { + ab->rhead_peer_addr = rhash_addr_tbl; + } else { + spin_unlock_bh(&ab->base_lock); + goto cleanup_tbl; + } + + spin_unlock_bh(&ab->base_lock); + + return 0; + +cleanup_tbl: + rhashtable_destroy(rhash_addr_tbl); +err_free: + kfree(rhash_addr_tbl); + + return ret; +} + +static inline void ath12k_peer_rhash_id_tbl_destroy(struct ath12k_base *ab) +{ + lockdep_assert_held(&ab->tbl_mtx_lock); + + if (!ab->rhead_peer_id) + return; + + rhashtable_destroy(ab->rhead_peer_id); + kfree(ab->rhead_peer_id); + ab->rhead_peer_id = NULL; +} + +static inline void ath12k_peer_rhash_addr_tbl_destroy(struct ath12k_base *ab) +{ + lockdep_assert_held(&ab->tbl_mtx_lock); + + if (!ab->rhead_peer_addr) + return; + + rhashtable_destroy(ab->rhead_peer_addr); + kfree(ab->rhead_peer_addr); + ab->rhead_peer_addr = NULL; +} + +int ath12k_peer_rhash_tbl_init(struct ath12k_base *ab) +{ + int ret; + + mutex_lock(&ab->tbl_mtx_lock); + + ret = ath12k_peer_rhash_id_tbl_init(ab); + if (ret) + goto out; + + ret = ath12k_peer_rhash_addr_tbl_init(ab); + if (ret) + goto cleanup_tbl; + + mutex_unlock(&ab->tbl_mtx_lock); + + return 0; + +cleanup_tbl: + ath12k_peer_rhash_id_tbl_destroy(ab); +out: + mutex_unlock(&ab->tbl_mtx_lock); + return ret; +} + +void ath12k_peer_rhash_tbl_destroy(struct ath12k_base *ab) +{ + mutex_lock(&ab->tbl_mtx_lock); + + ath12k_peer_rhash_addr_tbl_destroy(ab); + ath12k_peer_rhash_id_tbl_destroy(ab); + + mutex_unlock(&ab->tbl_mtx_lock); +} + diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/peer.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/peer.h --- linux-6.4/drivers/net/wireless/ath/ath12k/peer.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/peer.h 2024-04-22 13:40:50.295868965 +0200 @@ -8,6 +8,7 @@ #define ATH12K_PEER_H #include "dp_rx.h" +#include "sawf.h" struct ppdu_user_delayba { u16 sw_peer_id; @@ -22,6 +23,11 @@ struct ath12k_peer { struct list_head list; struct ieee80211_sta *sta; + struct ieee80211_vif *vif; +#ifdef CONFIG_ATH12K_SAWF + struct ath12k_sawf_peer_ctx sawf_ctx_peer; + struct ath12k_sawf_stats sawf_stats; +#endif /* CONFIG_ATH12K_SAWF */ int vdev_id; u8 addr[ETH_ALEN]; int peer_id; @@ -31,8 +37,19 @@ /* protected by ab->data_lock */ struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1]; + + /* rx tid queue is setup once for primary link peer + * in case of ML and cloned into partner peer data + * but would be accessed (only if required)and safely + * by ensuring primary parner is still valid + */ struct ath12k_dp_rx_tid rx_tid[IEEE80211_NUM_TIDS + 1]; + /* peer id based rhashtable list pointer */ + struct rhash_head rhash_id; + /* peer addr based rhashtable list pointer */ + struct rhash_head rhash_addr; + /* Info used in MMIC verification of * RX fragments */ @@ -44,6 +61,38 @@ struct ppdu_user_delayba ppdu_stats_delayba; bool delayba_flag; bool is_authorized; + + /* The below flag indicates whether + * a peer has setup its datapath or not + */ + bool dp_setup_done; + + bool mlo; + u16 ml_peer_id; + /* TODO remove or fill below these info if required/not required during dp change */ + /* for reference to ath12k_link_sta */ + u8 link_id; + + /* To ensure only certain work related to dp is done once */ + bool primary_link; + + /* To check if the peer entry is part of rhash table or not */ + bool rhash_done; + + /* any other ML info common for all partners can be added + * here and would be same for all partner peers + */ + u8 ml_addr[ETH_ALEN]; +#if defined(CONFIG_MAC80211_PPE_SUPPORT) || defined(CONFIG_ATH12K_BONDED_DS_SUPPORT) + /* Duplicate PPE port number to avoid link vif lookup in rx data path */ + int ppe_vp_num; +#endif +}; + +struct ath12k_ml_peer { + struct list_head list; + u8 addr[ETH_ALEN]; + u16 id; }; void ath12k_peer_unmap_event(struct ath12k_base *ab, u16 peer_id); @@ -51,17 +100,50 @@ u8 *mac_addr, u16 ast_hash, u16 hw_peer_id); struct ath12k_peer *ath12k_peer_find(struct ath12k_base *ab, int vdev_id, const u8 *addr); +struct ath12k_peer *ath12k_peer_find_list_by_id(struct ath12k_base *ab, + int peer_id); struct ath12k_peer *ath12k_peer_find_by_addr(struct ath12k_base *ab, const u8 *addr); struct ath12k_peer *ath12k_peer_find_by_id(struct ath12k_base *ab, int peer_id); void ath12k_peer_cleanup(struct ath12k *ar, u32 vdev_id); -int ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, u8 *addr); -int ath12k_peer_create(struct ath12k *ar, struct ath12k_vif *arvif, +int ath12k_peer_delete(struct ath12k *ar, u32 vdev_id, const u8 *addr); +int ath12k_ml_link_peers_delete(struct ath12k_vif *ahvif, struct ath12k_sta *ahsta); +int ath12k_ml_peer_create(struct ath12k_hw *ah, struct ieee80211_sta *sta); +int ath12k_ml_peer_delete(struct ath12k_hw *ah, struct ieee80211_sta *sta); +int ath12k_peer_create(struct ath12k *ar, struct ath12k_link_vif *arvif, struct ieee80211_sta *sta, struct ath12k_wmi_peer_create_arg *arg); int ath12k_wait_for_peer_delete_done(struct ath12k *ar, u32 vdev_id, const u8 *addr); bool ath12k_peer_exist_by_vdev_id(struct ath12k_base *ab, int vdev_id); -struct ath12k_peer *ath12k_peer_find_by_ast(struct ath12k_base *ab, int ast_hash); - +int ath12k_peer_rhash_tbl_init(struct ath12k_base *ab); +void ath12k_peer_rhash_tbl_destroy(struct ath12k_base *ab); +int ath12k_peer_rhash_delete(struct ath12k_base *ab, struct ath12k_peer *peer); +void ath12k_peer_mlo_map_event(struct ath12k_base *ab, struct sk_buff *skb); +void ath12k_peer_mlo_unmap_event(struct ath12k_base *ab, struct sk_buff *skb); +int ath12k_peer_delete_send(struct ath12k *ar, u32 vdev_id, const u8 *addr); +struct ath12k_peer *ath12k_peer_find_by_vdev_id(struct ath12k_base *ab, + int vdev_id); +static inline +struct ath12k_link_sta *ath12k_peer_get_link_sta(struct ath12k_base *ab, + struct ath12k_peer *peer) +{ + struct ath12k_sta *ahsta; + + if (!peer->sta) + return NULL; + + ahsta = ath12k_sta_to_ahsta(peer->sta); + if (peer->ml_peer_id & ATH12K_ML_PEER_ID_VALID) { + if (!(ahsta->links_map & BIT(peer->link_id))) { + ath12k_warn(ab, "peer %pM id %d link_id %d can't found in STA link_map %lu\n", + peer->addr, peer->peer_id, peer->link_id, ahsta->links_map); + return NULL; + } + + return ahsta->link[peer->link_id]; + } else { + return &ahsta->deflink; + } +} #endif /* _PEER_H_ */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/qmi.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/qmi.c --- linux-6.4/drivers/net/wireless/ath/ath12k/qmi.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/qmi.c 2024-04-22 13:40:50.295868965 +0200 @@ -8,15 +8,141 @@ #include "qmi.h" #include "core.h" +#include "hif.h" +#include "pci.h" #include "debug.h" +#include "coredump.h" #include +#include +#include +#include #include +#include +#include #define SLEEP_CLOCK_SELECT_INTERNAL_BIT 0x02 #define HOST_CSTATE_BIT 0x04 #define PLATFORM_CAP_PCIE_GLOBAL_RESET 0x08 #define ATH12K_QMI_MAX_CHUNK_SIZE 2097152 +bool ath12k_cold_boot_cal = 0; +module_param_named(cold_boot_cal, ath12k_cold_boot_cal, bool, 0644); +MODULE_PARM_DESC(cold_boot_cal, + "Decrease the channel switch time but increase the driver load time (Default: true)"); + +static struct qmi_elem_info qmi_wlfw_qdss_trace_config_download_req_msg_v01_ei[] = { + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + total_size_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + total_size), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + seg_id_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + seg_id), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x12, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + data_valid), + }, + { + .data_type = QMI_DATA_LEN, + .elem_len = 1, + .elem_size = sizeof(u16), + .array_type = NO_ARRAY, + .tlv_type = 0x12, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + data_len), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = QMI_WLANFW_MAX_DATA_SIZE_V01, + .elem_size = sizeof(u8), + .array_type = VAR_LEN_ARRAY, + .tlv_type = 0x12, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + data), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x13, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + end_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x13, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01, + end), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_qdss_trace_config_download_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct qmi_wlanfw_qdss_trace_config_download_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static bool ath12k_skip_caldata; +module_param_named(skip_caldata, ath12k_skip_caldata, bool, 0444); +MODULE_PARM_DESC(ath12k_skip_caldata, "Skip caldata download"); + static struct qmi_elem_info wlfw_host_mlo_chip_info_s_v01_ei[] = { { .data_type = QMI_UNSIGNED_1_BYTE, @@ -61,6 +187,73 @@ }, }; +static struct qmi_elem_info qmi_wlanfw_qdss_trace_mode_req_msg_v01_ei[] = { + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_mode_req_msg_v01, + mode_valid), + }, + { + .data_type = QMI_SIGNED_4_BYTE_ENUM, + .elem_len = 1, + .elem_size = sizeof(enum qmi_wlanfw_qdss_trace_mode_enum_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_mode_req_msg_v01, + mode), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_mode_req_msg_v01, + option_valid), + }, + { + .data_type = QMI_UNSIGNED_8_BYTE, + .elem_len = 1, + .elem_size = sizeof(u64), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_mode_req_msg_v01, + option), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_qdss_trace_mode_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_mode_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + static struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = { { .data_type = QMI_OPT_FLAG, @@ -387,7 +580,7 @@ mlo_capable_valid), }, { - .data_type = QMI_OPT_FLAG, + .data_type = QMI_UNSIGNED_1_BYTE, .elem_len = 1, .elem_size = sizeof(u8), .array_type = NO_ARRAY, @@ -505,6 +698,24 @@ feature_list), }, { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x2E, + .offset = offsetof(struct qmi_wlanfw_host_cap_req_msg_v01, + fw_cfg_support_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x2E, + .offset = offsetof(struct qmi_wlanfw_host_cap_req_msg_v01, + fw_cfg_support), + }, + { .data_type = QMI_EOTI, .array_type = NO_ARRAY, .tlv_type = QMI_COMMON_TLV_TYPE, @@ -528,6 +739,192 @@ }, }; +struct qmi_elem_info wlanfw_cfg_download_req_msg_v01_ei[] = { + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + file_type_valid), + }, + { + .data_type = QMI_SIGNED_4_BYTE_ENUM, + .elem_len = 1, + .elem_size = sizeof(enum wlanfw_cfg_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + file_type), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + total_size_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + total_size), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x12, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + seg_id_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x12, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + seg_id), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x13, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + data_valid), + }, + { + .data_type = QMI_DATA_LEN, + .elem_len = 1, + .elem_size = sizeof(u16), + .array_type = NO_ARRAY, + .tlv_type = 0x13, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + data_len), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = QMI_WLANFW_MAX_DATA_SIZE_V01, + .elem_size = sizeof(u8), + .array_type = VAR_LEN_ARRAY, + .tlv_type = 0x13, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + data), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x14, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + end_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x14, + .offset = offsetof(struct wlanfw_cfg_download_req_msg_v01, + end), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +struct qmi_elem_info wlanfw_cfg_download_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct wlanfw_cfg_download_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_phy_cap_req_msg_v01_ei[] = { + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_phy_cap_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01, resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01, + num_phy_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01, + num_phy), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01, + board_id_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct qmi_wlanfw_phy_cap_resp_msg_v01, + board_id), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + static struct qmi_elem_info qmi_wlanfw_ind_register_req_msg_v01_ei[] = { { .data_type = QMI_OPT_FLAG, @@ -747,6 +1144,60 @@ cal_done_enable), }, { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x1C, + .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, + qdss_trace_req_mem_enable_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x1C, + .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, + qdss_trace_req_mem_enable), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x1D, + .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, + qdss_trace_save_enable_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x1D, + .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, + qdss_trace_save_enable), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x20, + .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, + m3_dump_upload_req_enable_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x20, + .offset = offsetof(struct qmi_wlanfw_ind_register_req_msg_v01, + m3_dump_upload_req_enable), + }, + { .data_type = QMI_EOTI, .array_type = NO_ARRAY, .tlv_type = QMI_COMMON_TLV_TYPE, @@ -983,6 +1434,68 @@ }, }; +static struct qmi_elem_info qmi_wlanfw_device_info_req_msg_v01_ei[] = { + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +struct qmi_elem_info qmi_wlanfw_device_info_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01, + bar_addr_valid), + }, + { + .data_type = QMI_UNSIGNED_8_BYTE, + .elem_len = 1, + .elem_size = sizeof(u64), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01, + bar_addr), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01, + bar_size_valid), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct qmi_wlanfw_device_info_resp_msg_v01, + bar_size), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + static struct qmi_elem_info qmi_wlanfw_rf_chip_info_s_v01_ei[] = { { .data_type = QMI_UNSIGNED_4_BYTE, @@ -1342,6 +1855,24 @@ .ei_array = qmi_wlanfw_dev_mem_info_s_v01_ei, }, { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x25, + .offset = offsetof(struct qmi_wlanfw_cap_resp_msg_v01, + rxgainlut_support_valid), + }, + { + .data_type = QMI_UNSIGNED_8_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x25, + .offset = offsetof(struct qmi_wlanfw_cap_resp_msg_v01, + rxgainlut_support), + }, + { .data_type = QMI_EOTI, .array_type = NO_ARRAY, .tlv_type = QMI_COMMON_TLV_TYPE, @@ -1879,6 +2410,85 @@ }, }; +struct qmi_elem_info qmi_wlanfw_qdss_trace_save_ind_msg_v01_ei[] = { + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x01, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + source), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + total_size), + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + mem_seg_valid), + }, + { + .data_type = QMI_DATA_LEN, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + mem_seg_len), + }, + { + .data_type = QMI_STRUCT, + .elem_len = ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01, + .elem_size = sizeof(struct qmi_wlanfw_mem_seg_resp_s_v01), + .array_type = VAR_LEN_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + mem_seg), + .ei_array = qmi_wlanfw_mem_seg_resp_s_v01_ei, + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + file_name_valid), + }, + { + .data_type = QMI_STRING, + .elem_len = QMI_WLANFW_MAX_STR_LEN_V01 + 1, + .elem_size = sizeof(char), + .array_type = NO_ARRAY, + .tlv_type = 0x11, + .offset = offsetof(struct + qmi_wlanfw_qdss_trace_save_ind_msg_v01, + file_name), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + static struct qmi_elem_info qmi_wlanfw_mem_ready_ind_msg_v01_ei[] = { { .data_type = QMI_EOTI, @@ -1893,34 +2503,649 @@ }, }; -static void ath12k_host_cap_parse_mlo(struct qmi_wlanfw_host_cap_req_msg_v01 *req) +struct qmi_elem_info wlfw_ini_req_msg_v01_ei[] = { { - req->mlo_capable_valid = 1; - req->mlo_capable = 1; - req->mlo_chip_id_valid = 1; - req->mlo_chip_id = 0; - req->mlo_group_id_valid = 1; + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct wlfw_ini_req_msg_v01, + enablefwlog_valid), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct wlfw_ini_req_msg_v01, + enablefwlog), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +struct qmi_elem_info wlfw_ini_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct wlfw_ini_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei[] = { + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + }, +}; + +struct qmi_elem_info qmi_wlanfw_mem_read_req_msg_v01_ei[] = { + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x01, + .offset = offsetof(struct qmi_wlanfw_mem_read_req_msg_v01, + offset), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct qmi_wlanfw_mem_read_req_msg_v01, + mem_type), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x03, + .offset = offsetof(struct qmi_wlanfw_mem_read_req_msg_v01, + data_len), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +struct qmi_elem_info qmi_wlanfw_mem_read_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct + qmi_wlanfw_mem_read_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_OPT_FLAG, + .elem_len = 1, + .elem_size = sizeof(u8), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_mem_read_resp_msg_v01, + data_valid), + }, + { + .data_type = QMI_DATA_LEN, + .elem_len = 1, + .elem_size = sizeof(u16), + .array_type = NO_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_mem_read_resp_msg_v01, + data_len), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = QMI_WLANFW_MAX_DATA_SIZE_V01, + .elem_size = sizeof(u8), + .array_type = VAR_LEN_ARRAY, + .tlv_type = 0x10, + .offset = offsetof(struct + qmi_wlanfw_mem_read_resp_msg_v01, + data), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +struct qmi_elem_info qmi_wlanfw_mem_write_req_msg_v01_ei[] = { + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x01, + .offset = offsetof(struct + qmi_wlanfw_mem_write_req_msg_v01, + offset), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct + qmi_wlanfw_mem_write_req_msg_v01, + mem_type), + }, + { + .data_type = QMI_DATA_LEN, + .elem_len = 1, + .elem_size = sizeof(u16), + .array_type = NO_ARRAY, + .tlv_type = 0x03, + .offset = offsetof(struct + qmi_wlanfw_mem_write_req_msg_v01, + data_len), + }, + { + .data_type = QMI_UNSIGNED_1_BYTE, + .elem_len = QMI_WLANFW_MAX_DATA_SIZE_V01, + .elem_size = sizeof(u8), + .array_type = VAR_LEN_ARRAY, + .tlv_type = 0x03, + .offset = offsetof(struct + qmi_wlanfw_mem_write_req_msg_v01, + data), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +struct qmi_elem_info qmi_wlanfw_mem_write_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct + qmi_wlanfw_mem_write_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +int ath12k_qmi_mem_read(struct ath12k_base *ab, u32 mem_addr, void *mem_value,size_t count) +{ + struct qmi_wlanfw_mem_read_req_msg_v01 *req; + struct qmi_wlanfw_mem_read_resp_msg_v01 *resp; + struct qmi_txn txn = {}; + int ret; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + resp = kzalloc(sizeof(*resp), GFP_KERNEL); + if (!resp) { + kfree(req); + return -ENOMEM; + } + + req->offset = mem_addr; + + /* Firmware uses mem type to map to various memory regions. + * If this is set to 0, firmware uses automatic mapping of regions. + * i.e, if mem address is given and mem_type is 0, firmware will + * find under which memory region that address belongs + */ + req->mem_type = QMI_MEM_REGION_TYPE; + req->data_len = count; + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_mem_read_resp_msg_v01_ei, resp); + if (ret < 0) + goto out; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_MEM_READ_REQ_V01, + QMI_WLANFW_MEM_READ_REQ_MSG_V01_MAX_MSG_LEN, + qmi_wlanfw_mem_read_req_msg_v01_ei, req); + if (ret < 0) { + qmi_txn_cancel(&txn); + ath12k_warn(ab, "Failed to send mem read request, err %d\n", + ret); + + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp->resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "qmi mem read req failed, result: %d, err: %d\n", + resp->resp.result, resp->resp.error); + ret = -EINVAL; + goto out; + } + + if (!resp->data_valid || resp->data_len != req->data_len) { + ath12k_warn(ab, "qmi mem read is invalid\n"); + ret = -EINVAL; + goto out; + } + memcpy(mem_value, resp->data, resp->data_len); + +out: + kfree(req); + kfree(resp); + return ret; +} + +int ath12k_qmi_mem_write(struct ath12k_base *ab, u32 mem_addr, void* mem_value, size_t count) +{ + struct qmi_wlanfw_mem_write_req_msg_v01 *req; + struct qmi_wlanfw_mem_write_resp_msg_v01 *resp; + struct qmi_txn txn = {}; + int ret; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + resp = kzalloc(sizeof(*resp), GFP_KERNEL); + if (!resp) { + kfree(req); + return -ENOMEM; + } + + req->offset = mem_addr; + req->mem_type = QMI_MEM_REGION_TYPE; + req->data_len = count; + memcpy(req->data, mem_value, req->data_len); + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_mem_write_resp_msg_v01_ei, resp); + if (ret < 0) + goto out; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_MEM_WRITE_REQ_V01, + QMI_WLANFW_MEM_WRITE_REQ_MSG_V01_MAX_MSG_LEN, + qmi_wlanfw_mem_write_req_msg_v01_ei, req); + if (ret < 0) { + qmi_txn_cancel(&txn); + ath12k_warn(ab, "Failed to send mem write request, err %d\n", + ret); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp->resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "qmi mem write req failed, result: %d, err: %d\n", + resp->resp.result, resp->resp.error); + ret = -EINVAL; + goto out; + } + +out: + kfree(req); + kfree(resp); + return ret; +} + +static struct qmi_elem_info qmi_wlanfw_m3_dump_upload_req_ind_msg_v01_ei[] = { + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x01, + .offset = offsetof(struct qmi_wlanfw_m3_dump_upload_req_ind_msg_v01, + pdev_id), + }, + { + .data_type = QMI_UNSIGNED_8_BYTE, + .elem_len = 1, + .elem_size = sizeof(u64), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct qmi_wlanfw_m3_dump_upload_req_ind_msg_v01, + addr), + }, + { + .data_type = QMI_UNSIGNED_8_BYTE, + .elem_len = 1, + .elem_size = sizeof(u64), + .array_type = NO_ARRAY, + .tlv_type = 0x03, + .offset = offsetof(struct qmi_wlanfw_m3_dump_upload_req_ind_msg_v01, + size), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_m3_dump_upload_done_req_msg_v01_ei[] = { + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x01, + .offset = offsetof(struct + qmi_wlanfw_m3_dump_upload_done_req_msg_v01, + pdev_id), + }, + { + .data_type = QMI_UNSIGNED_4_BYTE, + .elem_len = 1, + .elem_size = sizeof(u32), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct + qmi_wlanfw_m3_dump_upload_done_req_msg_v01, + status), + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static struct qmi_elem_info qmi_wlanfw_m3_dump_upload_done_resp_msg_v01_ei[] = { + { + .data_type = QMI_STRUCT, + .elem_len = 1, + .elem_size = sizeof(struct qmi_response_type_v01), + .array_type = NO_ARRAY, + .tlv_type = 0x02, + .offset = offsetof(struct qmi_wlanfw_m3_dump_upload_done_resp_msg_v01, + resp), + .ei_array = qmi_response_type_v01_ei, + }, + { + .data_type = QMI_EOTI, + .array_type = NO_ARRAY, + .tlv_type = QMI_COMMON_TLV_TYPE, + }, +}; + +static int ath12k_qmi_send_qdss_trace_config_download_req(struct ath12k_base *ab, + const u8 *buffer, + unsigned int buffer_len) +{ + int ret = 0; + struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01 *req; + struct qmi_wlanfw_qdss_trace_config_download_resp_msg_v01 resp; + struct qmi_txn txn; + const u8 *temp = buffer; + int max_len = QMI_WLANFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_MSG_V01_MAX_LEN; + unsigned int remaining; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + remaining = buffer_len; + while (remaining) { + memset(&resp, 0, sizeof(resp)); + req->total_size_valid = 1; + req->total_size = buffer_len; + req->seg_id_valid = 1; + req->data_valid = 1; + req->end_valid = 1; + + if (remaining > QMI_WLANFW_MAX_DATA_SIZE_V01) { + req->data_len = QMI_WLANFW_MAX_DATA_SIZE_V01; + } else { + req->data_len = remaining; + req->end = 1; + } + memcpy(req->data, temp, req->data_len); + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_qdss_trace_config_download_resp_msg_v01_ei, + &resp); + if (ret < 0) + goto out; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_V01, + max_len, + qmi_wlfw_qdss_trace_config_download_req_msg_v01_ei, + req); + if (ret < 0) { + ath12k_warn(ab, "Failed to send QDSS config download request = %d\n", + ret); + qmi_txn_cancel(&txn); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "QDSS config download request failed, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } + remaining -= req->data_len; + temp += req->data_len; + req->seg_id++; + } + +out: + kfree(req); + return ret; +} + +static int ath12k_qmi_send_qdss_config(struct ath12k_base *ab) +{ + struct device *dev = ab->dev; + const struct firmware *fw_entry; + char filename[ATH12K_QMI_MAX_QDSS_CONFIG_FILE_NAME_SIZE]; + int ret; + + snprintf(filename, sizeof(filename), + "%s/%s/%s", ATH12K_FW_DIR, ab->hw_params->fw.dir, + ATH12K_QMI_DEFAULT_QDSS_CONFIG_FILE_NAME); + ret = request_firmware(&fw_entry, filename, dev); + ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot firmware request %s size %zu\n", + filename, fw_entry->size); + if (ret) { + /* for backward compatibility */ + snprintf(filename, sizeof(filename), + "%s", ATH12K_QMI_DEFAULT_QDSS_CONFIG_FILE_NAME); + ret = request_firmware(&fw_entry, filename, dev); + ath12k_dbg(ab, ATH12K_DBG_BOOT, "boot firmware request %s size %zu\n", + filename, fw_entry->size); + if (ret) { + ath12k_warn(ab, "qmi failed to load QDSS config: %s\n", filename); + return ret; + } + } + + ret = ath12k_qmi_send_qdss_trace_config_download_req(ab, fw_entry->data, + fw_entry->size); + if (ret < 0) { + ath12k_warn(ab, "qmi failed to load QDSS config to FW: %d\n", ret); + goto out; + } +out: + release_firmware(fw_entry); + return ret; +} + +static int ath12k_qmi_fill_mlo_host_caps(struct ath12k_base *ab, + struct qmi_wlanfw_host_cap_req_msg_v01 *req) +{ + struct wlfw_host_mlo_chip_info_s_v01 *info; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_base *partner_ab; + int ret, i, j, link_id; + + mutex_lock(&ag->mutex_lock); + + if (!ag->mlo_capable) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "Skip MLO cap send for chip id %d since it's not MLO capable\n", + ab->chip_id); + mutex_unlock(&ag->mutex_lock); + return 0; + } + + if (ath12k_cold_boot_cal && ab->qmi.cal_done == 0 && + ab->hw_params->cold_boot_calib && + ab->qmi.cal_timeout == 0) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "Skip MLO cap send for chip id %d since it's in cold_boot\n", + ab->chip_id); + mutex_unlock(&ag->mutex_lock); + return 0; + } + + if (ag->id == ATH12K_INVALID_GRP_ID || !ab->qmi.num_radios) { + ag->mlo_capable = false; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "Skip MLO cap send for chip id %d due to group_id %d qmi num_radio %d\n", + ab->chip_id, ag->id, ab->qmi.num_radios); + mutex_unlock(&ag->mutex_lock); + return 0; + } + + if (ab->chip_id == ATH12K_INVALID_CHIP_ID) { + ath12k_err(ab, "failed to send MLO cap send due to Invalid chip id\n"); + + ret = -EINVAL; + goto out; + } + + req->mlo_capable = true; + req->mlo_capable_valid = true; + + req->mlo_chip_id = ab->chip_id; + req->mlo_chip_id_valid = true; + + req->mlo_group_id = ag->id; + req->mlo_group_id_valid = true; + + req->max_mlo_peer = ab->hw_params->max_mlo_peer; + req->max_mlo_peer_valid = true; + + req->mlo_num_chips = ag->num_chip; + req->mlo_num_chips_valid = true; + + link_id = 0; + for (i = 0; i < ag->num_chip; i++) { + info = &req->mlo_chip_info[i]; + partner_ab = ag->ab[i]; + + if (partner_ab->chip_id == ATH12K_INVALID_CHIP_ID) { + ret = -EINVAL; + goto chip_cleanup; + } + + info->chip_id = partner_ab->chip_id; + + info->num_local_links = partner_ab->qmi.num_radios; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "MLO chip id %d num_link %d\n", + partner_ab->chip_id, info->num_local_links); + + for (j = 0; j < info->num_local_links; j++) { + info->hw_link_id[j] = link_id; + info->valid_mlo_link_id[j] = true; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "MLO link id %d\n", + info->hw_link_id[j]); + + link_id++; + } + } + + /* Disable MLO capable if there is no Multi-link in a group */ + if (link_id <= 1) + ag->mlo_capable = false; + + req->mlo_chip_info_valid = true; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "MLO host cap chosen\n"); + + mutex_unlock(&ag->mutex_lock); + return 0; + +chip_cleanup: + for (i = i - 1; i >= 0; i--) { + info = &req->mlo_chip_info[i]; + + memset(info, 0, sizeof(*info)); + } + + req->mlo_num_chips = 0; + req->mlo_num_chips_valid = 0; + + req->max_mlo_peer = 0; + req->max_mlo_peer_valid = 0; req->mlo_group_id = 0; - req->max_mlo_peer_valid = 1; - /* Max peer number generally won't change for the same device - * but needs to be synced with host driver. - */ - req->max_mlo_peer = 32; - req->mlo_num_chips_valid = 1; - req->mlo_num_chips = 1; - req->mlo_chip_info_valid = 1; - req->mlo_chip_info[0].chip_id = 0; - req->mlo_chip_info[0].num_local_links = 2; - req->mlo_chip_info[0].hw_link_id[0] = 0; - req->mlo_chip_info[0].hw_link_id[1] = 1; - req->mlo_chip_info[0].valid_mlo_link_id[0] = 1; - req->mlo_chip_info[0].valid_mlo_link_id[1] = 1; + req->mlo_group_id_valid = 0; + req->mlo_chip_id = 0; + req->mlo_chip_id_valid = 0; + req->mlo_capable = 0; + req->mlo_capable_valid = 0; + + ag->mlo_capable = false; +out: + mutex_unlock(&ag->mutex_lock); + + return ret; } static int ath12k_qmi_host_cap_send(struct ath12k_base *ab) { struct qmi_wlanfw_host_cap_req_msg_v01 req; struct qmi_wlanfw_host_cap_resp_msg_v01 resp; + struct ath12k_board_data bd; + struct device_node *root; + const char *model = NULL; struct qmi_txn txn = {}; int ret = 0; @@ -1934,16 +3159,39 @@ req.bdf_support_valid = 1; req.bdf_support = 1; + if (ab->hw_params->m3_fw_support) { req.m3_support_valid = 1; req.m3_support = 1; req.m3_cache_support_valid = 1; req.m3_cache_support = 1; + } else { + req.m3_support_valid = 0; + req.m3_support = 0; + req.m3_cache_support_valid = 0; + req.m3_cache_support = 0; + } req.cal_done_valid = 1; req.cal_done = ab->qmi.cal_done; + if (ab->hw_params->send_platform_model) { + root = of_find_node_by_path("/"); + if (root) { + model = of_get_property(root, "model", NULL); + if (model) { + req.platform_name_valid = 1; + strlcpy(req.platform_name, model, + QMI_WLANFW_MAX_PLATFORM_NAME_LEN_V01); + ath12k_info(ab, "Platform name: %s", req.platform_name); + } + of_node_put(root); + } + } + + if (ab->hw_params->qmi_cnss_feature_bitmap) { req.feature_list_valid = 1; - req.feature_list = BIT(CNSS_QDSS_CFG_MISS_V01); + req.feature_list = ab->hw_params->qmi_cnss_feature_bitmap; + } /* BRINGUP: here we are piggybacking a lot of stuff using * internal_sleep_clock, should it be split? @@ -1961,8 +3209,20 @@ */ req.nm_modem |= SLEEP_CLOCK_SELECT_INTERNAL_BIT; req.nm_modem |= PLATFORM_CAP_PCIE_GLOBAL_RESET; + } + + ret = ath12k_core_fetch_fw_cfg(ab, &bd); + if (!ret) { + req.fw_cfg_support_valid = 1; + req.fw_cfg_support = 1; + } + ab->fw_cfg_support = !!req.fw_cfg_support; + ath12k_core_free_bdf(ab, &bd); - ath12k_host_cap_parse_mlo(&req); + ret = ath12k_qmi_fill_mlo_host_caps(ab, &req); + if (ret < 0) { + ath12k_warn(ab, "Failed to get MLO capability,err = %d\n", ret); + goto out; } ret = qmi_txn_init(&ab->qmi.handle, &txn, @@ -1994,6 +3254,53 @@ return ret; } +static int ath12k_qmi_phy_cap_send(struct ath12k_base *ab) +{ + struct qmi_wlanfw_phy_cap_req_msg_v01 req = { }; + struct qmi_wlanfw_phy_cap_resp_msg_v01 resp = { }; + struct qmi_txn txn = { }; + int ret; + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_phy_cap_resp_msg_v01_ei, &resp); + if (ret < 0) + goto out; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_PHY_CAP_REQ_V01, + QMI_WLANFW_PHY_CAP_REQ_MSG_V01_MAX_LEN, + qmi_wlanfw_phy_cap_req_msg_v01_ei, &req); + if (ret < 0) { + ath12k_warn(ab, "failed to send phy capability request, err = %d\n", ret); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ret = -EOPNOTSUPP; + goto out; + } + + if (!resp.num_phy_valid) { + ret = -ENODATA; + goto out; + } + + ab->qmi.num_radios = resp.num_phy; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "PHY capability resp valid %d num_phy %d valid %d board_id %d\n", + resp.num_phy_valid, resp.num_phy, + resp.board_id_valid, resp.board_id); + return 0; + +out: + ab->qmi.num_radios = ab->hw_params->num_local_link; + return ret; +} + static int ath12k_qmi_fw_ind_register_send(struct ath12k_base *ab) { struct qmi_wlanfw_ind_register_req_msg_v01 *req; @@ -2024,6 +3331,14 @@ req->cal_done_enable = 1; req->fw_init_done_enable_valid = 1; req->fw_init_done_enable = 1; + req->qdss_trace_req_mem_enable_valid = 1; + req->qdss_trace_req_mem_enable = 1; + req->qdss_trace_save_enable_valid = 1; + req->qdss_trace_save_enable = 1; + req->qdss_trace_free_enable_valid = 1; + req->qdss_trace_free_enable = 1; + req->m3_dump_upload_req_enable_valid = 1; + req->m3_dump_upload_req_enable = 1; req->pin_connect_result_enable_valid = 0; req->pin_connect_result_enable = 0; @@ -2082,7 +3397,7 @@ * failure to firmware and firmware then request multiple blocks of * small chunk size memory. */ - if (ab->qmi.target_mem_delayed) { + if (!ab->bus_params.fixed_mem_region && ab->qmi.target_mem_delayed) { delayed = true; ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi delays mem_request %d\n", ab->qmi.mem_seg_count); @@ -2094,8 +3409,7 @@ req->mem_seg[i].addr = ab->qmi.target_mem[i].paddr; req->mem_seg[i].size = ab->qmi.target_mem[i].size; req->mem_seg[i].type = ab->qmi.target_mem[i].type; - ath12k_dbg(ab, ATH12K_DBG_QMI, - "qmi req mem_seg[%d] %pad %u %u\n", i, + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi req mem_seg[%d] %pad %u %u\n", i, &ab->qmi.target_mem[i].paddr, ab->qmi.target_mem[i].size, ab->qmi.target_mem[i].type); @@ -2140,11 +3454,117 @@ return ret; } -static void ath12k_qmi_free_target_mem_chunk(struct ath12k_base *ab) +/** + * ath12k_free_mlo_glb_per_chip_crash_info() - Free MLO per_chip crash info + * @snapshot_info: Pointer to MLO Global crash info + * + * Return: None + */ +static void ath12k_free_mlo_glb_per_chip_crash_info( + struct ath12k_host_mlo_glb_chip_crash_info *global_chip_crash_info) { - int i; + if (global_chip_crash_info->per_chip_crash_info) { + kfree(global_chip_crash_info->per_chip_crash_info); + global_chip_crash_info->per_chip_crash_info = NULL; + } +} + +/** + * ath12k_free_mlo_mgmt_rx_reo_per_link_info() - Free Rx REO per-link info + * @snapshot_info: Pointer to MGMT Rx REO snapshot info + * + * Return: None + */ +void ath12k_free_mlo_mgmt_rx_reo_per_link_info + (struct ath12k_host_mlo_glb_rx_reo_snapshot_info *snapshot_info) +{ + if (snapshot_info && snapshot_info->link_info) { + kfree(snapshot_info->link_info); + snapshot_info->link_info = NULL; + } +} + +static void ath12k_qmi_free_mlo_mem_chunk(struct ath12k_base *ab, + struct target_mem_chunk *chunk, + int idx) +{ + struct ath12k_hw_group *ag = ab->ag; + struct target_mem_chunk *mlo_chunk; + bool fixed_mem = ab->bus_params.fixed_mem_region; + struct ath12k_host_mlo_mem_arena + *mlomem_arena_ctx = &ab->ag->mlomem_arena; + + lockdep_assert_held(&ag->mutex_lock); + + if (!ag->mlo_mem.init_done || ag->num_started) + return; + + if (idx >= ARRAY_SIZE(ag->mlo_mem.chunk)) { + ath12k_warn(ab, "invalid idx %d for MLO memory chunk free\n", idx); + return; + } + + mlo_chunk = &ag->mlo_mem.chunk[idx]; + + if (fixed_mem) { + if (mlo_chunk->v.ioaddr) { + iounmap(mlo_chunk->v.ioaddr); + mlo_chunk->v.ioaddr = NULL; + } + } else { + if (mlo_chunk->v.addr) { + dma_free_coherent(ab->dev, + mlo_chunk->size, + mlo_chunk->v.addr, + mlo_chunk->paddr); + mlo_chunk->v.addr = NULL; + } + } - for (i = 0; i < ab->qmi.mem_seg_count; i++) { + mlo_chunk->paddr = 0; + mlo_chunk->size = 0; + + if (fixed_mem) + chunk->v.ioaddr = NULL; + else + chunk->v.addr = NULL; + chunk->paddr = 0; + chunk->size = 0; + + ag->mlo_mem.is_mlo_mem_avail = false; + + /* We need to de-initialize when mlo memory is cleaned */ + mutex_lock(&mlomem_arena_ctx->mutex_lock); + if (mlomem_arena_ctx->init_done) { + mlomem_arena_ctx->init_done = false; + ath12k_free_mlo_mgmt_rx_reo_per_link_info + (&mlomem_arena_ctx->rx_reo_snapshot_info); + ath12k_free_mlo_glb_per_chip_crash_info + (&mlomem_arena_ctx->global_chip_crash_info); + } + mutex_unlock(&mlomem_arena_ctx->mutex_lock); + + return; +} + +void ath12k_qmi_free_target_mem_chunk(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + int i, mlo_idx; + + for (i = 0, mlo_idx = 0; i < ab->qmi.mem_seg_count; i++) { + if (ab->qmi.target_mem[i].type == MLO_GLOBAL_MEM_REGION_TYPE) { + ath12k_qmi_free_mlo_mem_chunk(ab, + &ab->qmi.target_mem[i], + mlo_idx); + } else { + if (ab->bus_params.fixed_mem_region) { + if (!ab->qmi.target_mem[i].v.ioaddr) + continue; + + iounmap(ab->qmi.target_mem[i].v.ioaddr); + ab->qmi.target_mem[i].v.ioaddr = NULL; + } else { if (!ab->qmi.target_mem[i].v.addr) continue; dma_free_coherent(ab->dev, @@ -2154,26 +3574,18 @@ ab->qmi.target_mem[i].v.addr = NULL; } } + } -static int ath12k_qmi_alloc_target_mem_chunk(struct ath12k_base *ab) -{ - int i; - struct target_mem_chunk *chunk; - - ab->qmi.target_mem_delayed = false; - - for (i = 0; i < ab->qmi.mem_seg_count; i++) { - chunk = &ab->qmi.target_mem[i]; + if (!ag->num_started && ag->mlo_mem.init_done) { + memset(ag->mlo_mem.chunk, 0, sizeof(ag->mlo_mem.chunk)); + ag->mlo_mem.rsv = NULL; + ag->mlo_mem.init_done = false; + } +} - /* Allocate memory for the region and the functionality supported - * on the host. For the non-supported memory region, host does not - * allocate memory, assigns NULL and FW will handle this without crashing. - */ - switch (chunk->type) { - case HOST_DDR_REGION_TYPE: - case M3_DUMP_REGION_TYPE: - case PAGEABLE_MEM_REGION_TYPE: - case CALDB_MEM_REGION_TYPE: +static int ath12k_qmi_alloc_chunk(struct ath12k_base *ab, + struct target_mem_chunk *chunk) +{ chunk->v.addr = dma_alloc_coherent(ab->dev, chunk->size, &chunk->paddr, @@ -2186,12 +3598,67 @@ chunk->size, chunk->type); ath12k_qmi_free_target_mem_chunk(ab); - return 0; + return -EAGAIN; } ath12k_warn(ab, "memory allocation failure for %u size: %d\n", chunk->type, chunk->size); return -ENOMEM; } + + return 0; +} + +static int ath12k_qmi_alloc_target_mem_chunk(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + int i, mlo_idx, ret; + struct target_mem_chunk *chunk, *mlo_chunk; + + mutex_lock(&ag->mutex_lock); + + if (!ag->mlo_mem.init_done) { + memset(ag->mlo_mem.chunk, 0, sizeof(ag->mlo_mem.chunk)); + ag->mlo_mem.init_done = true; + } + + ab->qmi.target_mem_delayed = false; + + for (i = 0, mlo_idx = 0; i < ab->qmi.mem_seg_count; i++) { + chunk = &ab->qmi.target_mem[i]; + + /* Allocate memory for the region and the functionality supported + * on the host. For the non-supported memory region, host does not + * allocate memory, assigns NULL and FW will handle this without crashing. + */ + switch (chunk->type) { + case MLO_GLOBAL_MEM_REGION_TYPE: + mlo_chunk = &ag->mlo_mem.chunk[mlo_idx]; + if (!mlo_chunk->paddr) { + mlo_chunk->size = chunk->size; + mlo_chunk->type = chunk->type; + + ret = ath12k_qmi_alloc_chunk(ab, mlo_chunk); + if (ret) { + ret = (ret == -EAGAIN) ? 0 : ret; + goto out; + } + + memset(mlo_chunk->v.addr, 0, mlo_chunk->size); + } + chunk->paddr = mlo_chunk->paddr; + chunk->v.addr = mlo_chunk->v.addr; + ag->mlo_mem.is_mlo_mem_avail = true; + mlo_idx++; + break; + case HOST_DDR_REGION_TYPE: + case M3_DUMP_REGION_TYPE: + case PAGEABLE_MEM_REGION_TYPE: + case CALDB_MEM_REGION_TYPE: + ret = ath12k_qmi_alloc_chunk(ab, chunk); + if (ret) { + ret = (ret == -EAGAIN) ? 0 : ret; + goto out; + } break; default: ath12k_warn(ab, "memory type %u not supported\n", @@ -2201,17 +3668,904 @@ break; } } + + mutex_unlock(&ag->mutex_lock); + return 0; + +out: + ath12k_qmi_free_target_mem_chunk(ab); + mutex_unlock(&ag->mutex_lock); + return ret; +} + +/** + * ath12k_mgmt_rx_reo_process_tlv_header() - Process a given TLV header + * @data: Pointer to start of the TLV + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @expected_tag: Expected TLV tag + * @tlv_len: Address of TLV length variable to be populated. This API populates + * the entire length(payload + header) of the TLV into @tlv_len + * @tlv_tag: Address of TLV Tag variable to be populated. + * + * Return: 0 on success, -1 on failure + */ +static int +ath12k_mgmt_rx_reo_process_tlv_header(struct ath12k_base *ab, + const u8 *data, size_t remaining_len, + u32 expected_tag, u32 *tlv_len, + u32 *tlv_tag) +{ + if (remaining_len < MLO_SHMEM_TLV_HDR_SIZE) { + ath12k_err(ab, "Not enough space(%zu) to read TLV header(%u)\n", + remaining_len, (u32)MLO_SHMEM_TLV_HDR_SIZE); + return -EINVAL; + } + *tlv_len = MLO_SHMEMTLV_GET_TLVLEN(MLO_SHMEMTLV_GET_HDR(data)); + *tlv_len += MLO_SHMEM_TLV_HDR_SIZE; + if (remaining_len < *tlv_len) { + ath12k_err(ab, "Not enough space(%zu) to read TLV payload(%u)\n", + remaining_len, *tlv_len); + return -EINVAL; + } + + *tlv_tag = MLO_SHMEMTLV_GET_TLVTAG(MLO_SHMEMTLV_GET_HDR(data)); + if (*tlv_tag != expected_tag) { + ath12k_err(ab, "Unexpected TLV tag: %u is seen. Expected: %u\n", + *tlv_tag, + expected_tag); + return -EINVAL; + } + return 0; } +/** + * ath12k_mgmt_rx_reo_extract_ath12k_mlo_glb_shmem_tlv() - extract ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_H_SHMEM + * TLV + * @data: Pointer to start of the TLV + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @shmem_params: Pointer to MLO Global shared memory parameters. Extracted + * information will be populated in this data structure. + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_extract_ath12k_mlo_glb_shmem_tlv(struct ath12k_base *ab, + u8 *data, size_t remaining_len, + struct ath12k_host_ath12k_mlo_glb_shmem_params *shmem_params) +{ + struct ath12k_mlo_glb_shmem *ptlv; + u32 tlv_len, tlv_tag; + u32 major_minor_version; + + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_H_SHMEM, + &tlv_len, &tlv_tag) < 0) { + ath12k_err(ab, "%s:process tlv hdr failed\n", __func__); + return -EINVAL; + } + + ptlv = (struct ath12k_mlo_glb_shmem *)data; + major_minor_version = get_field_value_in_tlv(ptlv, major_minor_version, + tlv_len); + shmem_params->major_version = + MLO_SHMEM_GLB_H_SHMEM_PARAM_MAJOR_VERSION_GET( + major_minor_version); + shmem_params->minor_version = + MLO_SHMEM_GLB_H_SHMEM_PARAM_MINOR_VERSION_GET( + major_minor_version); + + return tlv_len; +} + +/** + * ath12k_mgmt_rx_reo_extract_mlo_glb_link_info_tlv() - extract lobal link info from shmem + * @data: Pointer to the first TLV in the arena + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @link_info: Pointer to which link info needs to be copied + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_extract_mlo_glb_link_info_tlv(struct ath12k_base *ab, + u8 *data, + size_t remaining_len, + u32 *link_info) +{ + struct mlo_glb_link_info *ptlv; + u32 tlv_len, tlv_tag; + + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK_INFO, + &tlv_len, &tlv_tag) < 0) { + ath12k_err(ab, "%s:process tlv hdr failed\n", __func__); + return -EPERM; + } + + ptlv = (struct mlo_glb_link_info *)data; + + *link_info = get_field_value_in_tlv(ptlv, link_info, tlv_len); + + return tlv_len; +} + +/** + * ath12k_mgmt_rx_reo_process_mlo_glb_per_link_status_tlv() - process per link info + * @data: Pointer to the first TLV in the arena + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_process_mlo_glb_per_link_status_tlv(struct ath12k_base *ab, + u8 *data, size_t remaining_len) +{ + u32 tlv_len, tlv_tag; + + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK, + &tlv_len, &tlv_tag) < 0) { + ath12k_err(ab, "%s:process tlv hdr failed\n", __func__); + return -EPERM; + } + + return tlv_len; +} + +/** + * ath12k_mgmt_rx_reo_parse_global_link_info() - parse lobal link info + * @data: Pointer to the first TLV in the arena + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_parse_global_link_info(struct ath12k_base *ab, u8 *data, size_t remaining_len) +{ + int parsed_bytes, len; + u8 link; + u32 link_info; + u8 num_links; + + /* Extract ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK_INFO_TLV */ + len = ath12k_mgmt_rx_reo_extract_mlo_glb_link_info_tlv(ab, data, remaining_len, &link_info); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes = len; + + num_links = MLO_SHMEM_GLB_LINK_INFO_PARAM_NO_OF_LINKS_GET(link_info); + + for (link = 0; link < num_links; link++) { + len = ath12k_mgmt_rx_reo_process_mlo_glb_per_link_status_tlv(ab, data, remaining_len); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, + remaining_len); + parsed_bytes += len; + } + + return parsed_bytes; +} + +/** + * ath12k_mgmt_rx_reo_get_num_links_from_valid_link_bitmap() - Get the number of valid links + * @valid_link_bmap: Link bit map where the valid links are set to 1 + * + * Return: Number of valid links + */ +static u8 +ath12k_mgmt_rx_reo_get_num_links_from_valid_link_bitmap(u16 valid_link_bmap) +{ + u8 num_links = 0; + + /* Find the number of set bits */ + while (valid_link_bmap) { + num_links++; + valid_link_bmap &= (valid_link_bmap - 1); + } + + return num_links; +} + +static int +ath12k_mgmt_mlo_global_per_chip_crash_info_tlv(struct ath12k_base *ab, + u8 *data, + size_t remaining_len, u8 cur_chip_id, + struct ath12k_host_mlo_glb_per_chip_crash_info *per_chip_crash_info) +{ + struct mlo_glb_per_chip_crash_info *ptlv; + u32 tlv_len, tlv_tag; + u8 *crash_reason, *recovery_mode; + + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_PER_CHIP_CRASH_INFO, + &tlv_len, &tlv_tag) < 0) { + return -EPERM; + } + + ptlv = (struct mlo_glb_per_chip_crash_info *)data; + per_chip_crash_info->chip_id = cur_chip_id; + crash_reason = (u8 *)get_field_pointer_in_tlv(ptlv, crash_reason, tlv_len); + recovery_mode = (u8 *)get_field_pointer_in_tlv(ptlv, recovery_mode, tlv_len); + + per_chip_crash_info->crash_reason = (void *)crash_reason; + per_chip_crash_info->recovery_mode = (void *)recovery_mode; + + return tlv_len; +} + +static int +ath12k_mgmt_mlo_global_chip_crash_info_tlv(struct ath12k_base *ab, + u8 *data, + size_t remaining_len, + struct ath12k_host_mlo_glb_chip_crash_info *global_chip_crash_info) +{ + struct mlo_glb_chip_crash_info *ptlv; + u32 tlv_len, tlv_tag; + u32 chip_info; + u8 chip_map; + + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_CHIP_CRASH_INFO, + &tlv_len, &tlv_tag) < 0) { + return -EPERM; + } + + ptlv = (struct mlo_glb_chip_crash_info *)data; + chip_info = get_field_value_in_tlv(ptlv, chip_info, tlv_len); + global_chip_crash_info->no_of_chips = + MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_GET(chip_info); + chip_map = MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_GET(chip_info); + + memcpy(&global_chip_crash_info->valid_chip_bmap, + &chip_map, + min(sizeof(global_chip_crash_info->valid_chip_bmap), + sizeof(chip_map))); + + /* Allocate memory to extrace per chip crash info */ + global_chip_crash_info->per_chip_crash_info = kmalloc_array( + global_chip_crash_info->no_of_chips, + sizeof(*global_chip_crash_info->per_chip_crash_info), + GFP_KERNEL); + + if (!global_chip_crash_info->per_chip_crash_info) + { + ath12k_warn(ab, "Couldn't allocate memory for per chip crash info!\n"); + return -ENOBUFS; + } + + return tlv_len; +} + +static int +ath12k_mgmt_mlo_global_chip_crash_info(struct ath12k_base *ab, + u8 *data, + size_t remaining_len, + struct ath12k_host_mlo_glb_chip_crash_info *global_chip_crash_info) +{ + u8 chip_id; + s32 len,parsed_bytes; + unsigned long valid_chip_bmap, cur_chip_id; + + len = ath12k_mgmt_mlo_global_chip_crash_info_tlv(ab, data, remaining_len, + global_chip_crash_info); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes = len; + + if (len < 0) + return len; + + memcpy(&valid_chip_bmap, + &global_chip_crash_info->valid_chip_bmap, + min(sizeof(valid_chip_bmap), + sizeof(global_chip_crash_info->valid_chip_bmap))); + + /* Extract per chip crash info */ + for (chip_id = 0; chip_id < global_chip_crash_info->no_of_chips; + chip_id++) { + cur_chip_id = find_first_bit(&valid_chip_bmap, 8); + __clear_bit(cur_chip_id, &valid_chip_bmap); + + if (WARN_ON(cur_chip_id < 0)) { + /* Exit gracefully */ + return 0; + } + + len = ath12k_mgmt_mlo_global_per_chip_crash_info_tlv(ab, data, + remaining_len, cur_chip_id, + &global_chip_crash_info->per_chip_crash_info[chip_id]); + if (len < 0) { + WARN_ON(1); + return len; + } + + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + } + + return parsed_bytes; +} + +/** + * ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_snapshot_info_tlv() - extract + * ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO TLV + * @data: Pointer to start of the TLV + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @snapshot_info: Pointer to MGMT Rx REO snapshot info. Extracted information + * will be populated in this data structure. + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_snapshot_info_tlv(struct ath12k_base *ab, + u8 *data, size_t remaining_len, + struct ath12k_host_mlo_glb_rx_reo_snapshot_info *snapshot_info) +{ + struct mlo_glb_rx_reo_snapshot_info *ptlv; + u32 tlv_len, tlv_tag; + u32 link_info; + u16 valid_link_bmap; + + /* process ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO TLV */ + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO, + &tlv_len, &tlv_tag) < 0) { + ath12k_err(ab, "%s:process tlv hdr failed\n", __func__); + return -EINVAL; + } + + ptlv = (struct mlo_glb_rx_reo_snapshot_info *)data; + link_info = get_field_value_in_tlv(ptlv, link_info, tlv_len); + valid_link_bmap = + MLO_SHMEM_GLB_LINK_INFO_PARAM_VALID_LINK_BMAP_GET(link_info); + snapshot_info->valid_link_bmap = valid_link_bmap; + + if (is_field_present_in_tlv(ptlv, snapshot_ver_info, tlv_len)) { + u32 snapshot_ver_info; + + snapshot_ver_info = get_field_value_in_tlv + (ptlv, snapshot_ver_info, tlv_len); + snapshot_info->hw_forwarded_snapshot_ver = + MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_HW_FWD_SNAPSHOT_VER_GET + (snapshot_ver_info); + snapshot_info->fw_forwarded_snapshot_ver = + MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_FWD_SNAPSHOT_VER_GET + (snapshot_ver_info); + snapshot_info->fw_consumed_snapshot_ver = + MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_CONSUMED_SNAPSHOT_VER_GET + (snapshot_ver_info); + } + + snapshot_info->num_links = + ath12k_mgmt_rx_reo_get_num_links_from_valid_link_bitmap(valid_link_bmap); + snapshot_info->link_info = kmalloc_array(snapshot_info->num_links, + sizeof(*snapshot_info->link_info), + GFP_KERNEL); + if (!snapshot_info->link_info) { + ath12k_err(ab, "Couldn't allocate memory for rx_reo_per_link_info\n"); + return -EINVAL; + } + + return tlv_len; +} + +/** + * ath12k_mgmt_rx_reo_get_next_valid_link_id() - Get next valid link ID + * @valid_link_bmap: Link bit map where the valid links are set to 1 + * @prev_link_id: Previous link ID + * + * Return: Next valid link ID if there are valid links after @prev_link_id, + * else -1 + */ +static int +ath12k_mgmt_rx_reo_get_next_valid_link_id(u16 valid_link_bmap, int prev_link_id) +{ + int cur_link_id; + u16 mask; + u8 maxbits = sizeof(valid_link_bmap) * 8; + + cur_link_id = prev_link_id + 1; + mask = 1 << cur_link_id; + + while (!(valid_link_bmap & mask)) { + cur_link_id++; + if (cur_link_id == maxbits) + return -EINVAL; + mask = mask << 1; + } + + return cur_link_id; +} + +/** + * ath12k_mgmt_rx_reo_extract_mgmt_rx_reo_snapshot_tlv() - extract MGMT_RX_REO_SNAPSHOT TLV + * @data: Pointer to start of the TLV + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @address_ptr: Pointer to the snapshot address. This API will populate the + * snapshot address into the variable pointed by @address_ptr + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_extract_mgmt_rx_reo_snapshot_tlv(struct ath12k_base *ab, + u8 *data, size_t remaining_len, + void **address_ptr) +{ + struct mgmt_rx_reo_snapshot *ptlv; + u32 tlv_len, tlv_tag; + + /* process ATH12K_MLO_SHMEM_TLV_STRUCT_MGMT_RX_REO_SNAPSHOT TLV */ + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MGMT_RX_REO_SNAPSHOT, + &tlv_len, &tlv_tag) < 0) { + ath12k_err(ab, "%s:process tlv hdr failed\n", __func__); + return -EINVAL; + } + + ptlv = (struct mgmt_rx_reo_snapshot *)data; + *address_ptr = get_field_pointer_in_tlv(ptlv, mgmt_rx_reo_snapshot_low, + tlv_len); + + return tlv_len; +} + +/** + * ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_per_link_info_tlv() - extract + * RX_REO_PER_LINK_SNAPSHOT_INFO TLV + * @data: Pointer to start of the TLV + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @link_info: Pointer to MGMT Rx REO per link info. Extracted information + * will be populated in this data structure. + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_per_link_info_tlv(struct ath12k_base *ab, + u8 *data, size_t remaining_len, u8 link_id, + struct ath12k_host_mlo_glb_rx_reo_per_link_info *link_info) +{ + struct mlo_glb_rx_reo_per_link_snapshot_info *ptlv; + u32 tlv_len, tlv_tag; + int len; + u8 *fw_consumed; + int parsed_bytes; + + /* process ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_PER_LINK_SNAPSHOT_INFO TLV */ + if (ath12k_mgmt_rx_reo_process_tlv_header(ab, data, remaining_len, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_PER_LINK_SNAPSHOT_INFO, + &tlv_len, &tlv_tag) < 0) { + ath12k_err(ab, "%s:process tlv hdr failed\n", __func__); + return -EINVAL; + } + + ptlv = (struct mlo_glb_rx_reo_per_link_snapshot_info *)data; + + link_info->link_id = link_id; + + /** + * Get the pointer to the fw_consumed snapshot with in the TLV. + * Note that snapshots are nested TLVs within link_sanpshot_info TLV. + */ + data += offsetof(struct mlo_glb_rx_reo_per_link_snapshot_info, + fw_consumed); + fw_consumed = (u8 *)get_field_pointer_in_tlv(ptlv, fw_consumed, + tlv_len); + remaining_len -= offsetof(struct mlo_glb_rx_reo_per_link_snapshot_info, + fw_consumed); + parsed_bytes = offsetof(struct mlo_glb_rx_reo_per_link_snapshot_info, + fw_consumed); + + /* extract fw_consumed snapshot */ + len = ath12k_mgmt_rx_reo_extract_mgmt_rx_reo_snapshot_tlv(ab, data, remaining_len, + &link_info->fw_consumed); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + + /* extract fw_forwarded snapshot */ + len = ath12k_mgmt_rx_reo_extract_mgmt_rx_reo_snapshot_tlv(ab, data, remaining_len, + &link_info->fw_forwarded); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + + /* extract hw_forwarded snapshot */ + len = ath12k_mgmt_rx_reo_extract_mgmt_rx_reo_snapshot_tlv(ab, data, remaining_len, + &link_info->hw_forwarded); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + + /** + * Return the length of link_sanpshot_info TLV itself as the snapshots + * are nested inside link_sanpshot_info TLV and hence no need to add + * their lengths separately. + */ + return tlv_len; +} + +/** + * ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_snapshot_info() - extract MGMT Rx REO snapshot info + * @data: Pointer to start of ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO + * TLV + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @snapshot_info: Pointer to MGMT Rx REO snapshot info. Extracted information + * will be populated in this data structure. + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int +ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_snapshot_info(struct ath12k_base *ab, + u8 *data, size_t remaining_len, + struct ath12k_host_mlo_glb_rx_reo_snapshot_info *snapshot_info) +{ + int parsed_bytes, len; + u8 link; + int cur_link_id, prev_link_id = -1; + u16 valid_link_bmap; + + /* Extract ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO TLV */ + len = ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_snapshot_info_tlv(ab, data, remaining_len, + snapshot_info); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes = len; + + valid_link_bmap = snapshot_info->valid_link_bmap; + /* Foreach valid link */ + for (link = 0; link < snapshot_info->num_links; ++link) { + cur_link_id = ath12k_mgmt_rx_reo_get_next_valid_link_id(valid_link_bmap, + prev_link_id); + + BUG_ON(!(cur_link_id >= 0)); + + /* Extract per_link_info */ + len = ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_per_link_info_tlv(ab, + data, remaining_len, cur_link_id, + &snapshot_info->link_info[link]); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, + remaining_len); + parsed_bytes += len; + prev_link_id = cur_link_id; + } + + return parsed_bytes; +} + +/** + * ath12k_qmi_parse_mlo_mem_arena() - Parse MLO Global shared memory arena + * @data: Pointer to the first TLV in the arena + * @remaining_len: Length (in bytes) remaining in the arena from @data pointer + * @mlomem_arena_ctx: Pointer to MLO Global shared memory arena context. + * Extracted information will be populated in this data structure. + * + * Return: On success, the number of bytes parsed. On failure, errno is returned. + */ +static int ath12k_qmi_parse_mlo_mem_arena(struct ath12k_base *ab, + u8 *data, size_t remaining_len, + struct ath12k_host_mlo_mem_arena *mlomem_arena_ctx) +{ + int parsed_bytes; + int len; + + if (!data) + return -EINVAL; + + len = ath12k_mgmt_rx_reo_extract_ath12k_mlo_glb_shmem_tlv(ab, data, remaining_len, + &mlomem_arena_ctx->shmem_params); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes = len; + + len = ath12k_mgmt_rx_reo_extract_mlo_glb_rx_reo_snapshot_info(ab, + data, remaining_len, &mlomem_arena_ctx->rx_reo_snapshot_info); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + + len = ath12k_mgmt_rx_reo_parse_global_link_info(ab, data, remaining_len); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + + len = ath12k_mgmt_mlo_global_chip_crash_info(ab, data, remaining_len, + &mlomem_arena_ctx->global_chip_crash_info); + ATH12K_VALIDATE_PARSED_DATA_POINTER(len, data, remaining_len); + parsed_bytes += len; + + return parsed_bytes; +} + +int ath12k_qmi_mlo_global_snapshot_mem_init(struct ath12k_base *ab) +{ + struct ath12k_host_mlo_mem_arena *mlomem_arena_ctx = &ab->ag->mlomem_arena; + struct ath12k_hw_group *ag = ab->ag; + struct target_mem_chunk *mlo_chunk; + int ret = 0, mlo_idx = 0; + + if (!ag->mlo_mem.is_mlo_mem_avail) + return 0; + + mlo_chunk = &ab->ag->mlo_mem.chunk[mlo_idx]; + + /* We need to initialize only for the first invocation */ + mutex_lock(&mlomem_arena_ctx->mutex_lock); + if (mlomem_arena_ctx->init_done) { + mutex_unlock(&mlomem_arena_ctx->mutex_lock); + return 0; + } + + if (ab->bus_params.fixed_mem_region) + ret = ath12k_qmi_parse_mlo_mem_arena(ab, + mlo_chunk->v.ioaddr, + mlo_chunk->size, + mlomem_arena_ctx); + else + ret = ath12k_qmi_parse_mlo_mem_arena(ab, + mlo_chunk->v.addr, + mlo_chunk->size, + mlomem_arena_ctx); + + if (ret < 0) { + ath12k_err(ab, "parsing of mlo shared memory failed ret %d\n", ret); + ath12k_free_mlo_mgmt_rx_reo_per_link_info( + &mlomem_arena_ctx->rx_reo_snapshot_info); + ath12k_free_mlo_glb_per_chip_crash_info + (&mlomem_arena_ctx->global_chip_crash_info); + mutex_unlock(&mlomem_arena_ctx->mutex_lock); + return ret; + } + + mlomem_arena_ctx->init_done = true; + + mutex_unlock(&mlomem_arena_ctx->mutex_lock); + + return 0; +} + +#define MAX_TGT_MEM_MODES 5 +static int ath12k_qmi_assign_target_mem_chunk(struct ath12k_base *ab) +{ + struct device *dev = ab->dev; + struct ath12k_hw_group *ag = ab->ag; + struct device_node *hremote_node = NULL, *mem_node, *dev_node = NULL; + struct resource res, m3_dump; + int host_ddr_sz, mlo_ddr_sz, sz, mlo_sz = 0; + int i, idx, mlo_idx, ret; + unsigned int bdf_location[MAX_TGT_MEM_MODES], + caldb_location[MAX_TGT_MEM_MODES], + caldb_size[1]; + + sz = ab->host_ddr_fixed_mem_off; + hremote_node = of_parse_phandle(dev->of_node, "memory-region", 0); + if (!hremote_node) { + ath12k_warn(ab, "qmi fail to get hremote_node\n"); + return ret; + } + + ret = of_address_to_resource(hremote_node, 0, &res); + of_node_put(hremote_node); + if (ret) { + ath12k_warn(ab, "qmi fail to get reg from hremote\n"); + return ret; + } + + mutex_lock(&ag->mutex_lock); + + if (ag->mlo_mem.init_done) + goto skip_mlo_mem_init; + + mem_node = of_find_node_by_name(NULL, "mlo_global_mem_0"); + if (!mem_node) { + ath12k_warn(ab, "qmi fail to get MLO global memory node\n"); + ret = -EINVAL; + goto out; + } + + ag->mlo_mem.rsv = of_reserved_mem_lookup(mem_node); + of_node_put(mem_node); + if (!ag->mlo_mem.rsv) { + ath12k_warn(ab, "qmi fail to get MLO memory resource node %px\n", + ag->mlo_mem.rsv); + ret = -EINVAL; + goto out; + } + + memset(ag->mlo_mem.chunk, 0, sizeof(ag->mlo_mem.chunk)); + ag->mlo_mem.init_done = true; + +skip_mlo_mem_init: + mlo_ddr_sz = ag->mlo_mem.rsv->size; + host_ddr_sz = (res.end - res.start) + 1; + + for (i = 0, idx = 0, mlo_idx = 0; i < ab->qmi.mem_seg_count; i++) { + struct target_mem_chunk *mlo_chunk; + phys_addr_t paddr; + int remain_sz; + + if (ab->qmi.target_mem[i].type == MLO_GLOBAL_MEM_REGION_TYPE) { + paddr = ag->mlo_mem.rsv->base + mlo_sz; + remain_sz = mlo_ddr_sz - mlo_sz; + } else { + paddr = res.start + sz; + remain_sz = host_ddr_sz - sz; + } + + ab->qmi.target_mem[idx].paddr = paddr; + + if (ab->qmi.target_mem[i].size > remain_sz) { + ath12k_warn(ab, "No fixed mem to assign for type %d\n", + ab->qmi.target_mem[i].type); + ret = -EINVAL; + goto out; + } + + switch (ab->qmi.target_mem[i].type) { + case HOST_DDR_REGION_TYPE: + ab->qmi.target_mem[idx].v.ioaddr = + ioremap(ab->qmi.target_mem[idx].paddr, + ab->qmi.target_mem[i].size); + ab->qmi.target_mem[idx].size = + ab->qmi.target_mem[i].size; + ab->qmi.target_mem[idx].type = + ab->qmi.target_mem[i].type; + sz += ab->qmi.target_mem[i].size; + idx++; + break; + case CALDB_MEM_REGION_TYPE: + if (ath12k_cold_boot_cal && + ab->hw_params->cold_boot_calib) { + if (ab->hif.bus == ATH12K_BUS_AHB || + ab->hif.bus == ATH12K_BUS_HYBRID) { + if (of_property_read_u32_array(dev->of_node, + "qcom,caldb-addr", caldb_location, + ARRAY_SIZE(caldb_location))) { + ath12k_err(ab, "CALDB_MEM_REGION Not defined in device_tree\n"); + ret = -EINVAL; + goto out; + } + + if (of_property_read_u32_array(dev->of_node, + "qcom,caldb-size", caldb_size, + ARRAY_SIZE(caldb_size))) { + ath12k_err(ab, "CALDB_SIZE Not defined in device_tree\n"); + ret = -EINVAL; + goto out; + } + + ab->qmi.target_mem[idx].paddr = caldb_location[ab->hw_params->fw_mem_mode]; + ab->qmi.target_mem[i].size = caldb_size[0]; + + ab->qmi.target_mem[idx].v.ioaddr = + ioremap(ab->qmi.target_mem[idx].paddr, + ab->qmi.target_mem[i].size); + } else { + ab->qmi.target_mem[idx].v.ioaddr = + ioremap(ab->qmi.target_mem[idx].paddr, + ab->qmi.target_mem[i].size); + sz += ab->qmi.target_mem[i].size; + } + } else { + ab->qmi.target_mem[idx].paddr = 0; + ab->qmi.target_mem[idx].v.ioaddr = NULL; + } + + ab->qmi.target_mem[idx].size = + ab->qmi.target_mem[i].size; + ab->qmi.target_mem[idx].type = + ab->qmi.target_mem[i].type; + idx++; + break; + case PAGEABLE_MEM_REGION_TYPE: + ab->qmi.target_mem[idx].v.ioaddr = + ioremap(ab->qmi.target_mem[idx].paddr, + ab->qmi.target_mem[i].size); + ab->qmi.target_mem[idx].size = + ab->qmi.target_mem[i].size; + ab->qmi.target_mem[idx].type = + ab->qmi.target_mem[i].type; + sz += ab->qmi.target_mem[i].size; + if (ret < 0) + ath12k_warn(ab, + "qmi fail to update BHI table %d\n", ret); + idx++; + break; + case M3_DUMP_REGION_TYPE: + if (ab->hif.bus == ATH12K_BUS_AHB) { + dev_node = of_find_node_by_name(NULL, "m3_dump"); + if (of_address_to_resource(dev_node, 0, &m3_dump)) { + ath12k_err(ab, "M3_MEM_REGION Not defined in device_tree\n"); + ret = -EINVAL; + goto out; + } else { + ab->qmi.target_mem[idx].paddr = m3_dump.start; + } + } else if (ab->hif.bus == ATH12K_BUS_HYBRID) { + if (ab->userpd_id == USERPD_1) + dev_node = of_find_node_by_name(NULL, "m3_dump_qcn6432_1"); + else if (ab->userpd_id == USERPD_2) + dev_node = of_find_node_by_name(NULL, "m3_dump_qcn6432_2"); + + if (of_address_to_resource(dev_node, 0, &m3_dump)) { + ath12k_err(ab, "M3_MEM_REGION Not defined in device_tree\n"); + ret = -EINVAL; + goto out; + } else { + ab->qmi.target_mem[idx].paddr = m3_dump.start; + } + + } else { + sz += ab->qmi.target_mem[i].size; + } + ab->qmi.target_mem[idx].v.ioaddr = + ioremap(ab->qmi.target_mem[idx].paddr, + ab->qmi.target_mem[i].size); + ab->qmi.target_mem[idx].size = + ab->qmi.target_mem[i].size; + ab->qmi.target_mem[idx].type = + ab->qmi.target_mem[i].type; + idx++; + break; + case MLO_GLOBAL_MEM_REGION_TYPE: + mlo_chunk = &ag->mlo_mem.chunk[mlo_idx]; + if (!mlo_chunk->paddr) { + mlo_chunk->size = ab->qmi.target_mem[i].size; + mlo_chunk->type = ab->qmi.target_mem[i].type; + mlo_chunk->paddr = paddr; + mlo_chunk->v.ioaddr = ioremap(mlo_chunk->paddr, + mlo_chunk->size); + memset_io(mlo_chunk->v.ioaddr, 0, mlo_chunk->size); + } + + ab->qmi.target_mem[idx].paddr = mlo_chunk->paddr; + ab->qmi.target_mem[idx].v.ioaddr = mlo_chunk->v.ioaddr; + ab->qmi.target_mem[idx].size = mlo_chunk->size; + ab->qmi.target_mem[idx].type = mlo_chunk->type; + mlo_sz += mlo_chunk->size; + ag->mlo_mem.is_mlo_mem_avail = true; + idx++; + mlo_idx++; + break; + case BDF_MEM_REGION_TYPE: + if (of_property_read_u32_array(dev->of_node, + "qcom,bdf-addr", bdf_location, + ARRAY_SIZE(bdf_location))) { + ath12k_err(ab, "BDF_MEM_REGION Not defined in device_tree\n"); + ret = -EINVAL; + goto out; + } + ab->qmi.target_mem[idx].paddr = bdf_location[ab->hw_params->fw_mem_mode]; + ab->qmi.target_mem[idx].v.ioaddr = + ioremap(ab->qmi.target_mem[idx].paddr, + ab->qmi.target_mem[i].size); + ab->qmi.target_mem[idx].size = + ab->qmi.target_mem[i].size; + ab->qmi.target_mem[idx].type = + ab->qmi.target_mem[i].type; + idx++; + break; + default: + ath12k_warn(ab, "qmi ignore invalid mem req type %d\n", + ab->qmi.target_mem[i].type); + break; + } + + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi target mem seg idx %d i %d type %d size %d\n", + idx, i, ab->qmi.target_mem[idx - 1].type, ab->qmi.target_mem[idx - 1].size); + } + + mutex_unlock(&ag->mutex_lock); + + ab->host_ddr_fixed_mem_off = sz; + ab->qmi.mem_seg_count = idx; + + return 0; + +out: + ath12k_qmi_free_target_mem_chunk(ab); + mutex_unlock(&ag->mutex_lock); + return ret; +} + static int ath12k_qmi_request_target_cap(struct ath12k_base *ab) { struct qmi_wlanfw_cap_req_msg_v01 req; struct qmi_wlanfw_cap_resp_msg_v01 resp; struct qmi_txn txn = {}; - unsigned int board_id = ATH12K_BOARD_ID_DEFAULT; + struct device *dev = ab->dev; + unsigned int board_id; int ret = 0; - int i; + int r, i; memset(&req, 0, sizeof(req)); memset(&resp, 0, sizeof(resp)); @@ -2249,10 +4603,19 @@ ab->qmi.target.chip_family = resp.chip_info.chip_family; } - if (resp.board_info_valid) + if (!of_property_read_u32(dev->of_node, "qcom,board_id", &board_id) && + board_id != 0xFF) + ab->qmi.target.board_id = board_id; + else if (resp.board_info_valid) ab->qmi.target.board_id = resp.board_info.board_id; - else + else { + u16 ov_board_id; + + if (ab->hif.bus == ATH12K_BUS_PCI && + ath12k_pci_has_board_id_override(ab, &ov_board_id)) + board_id = ov_board_id; ab->qmi.target.board_id = board_id; + } if (resp.soc_info_valid) ab->qmi.target.soc_id = resp.soc_info.soc_id; @@ -2281,6 +4644,11 @@ } } + if (resp.rxgainlut_support_valid) + ab->rxgainlut_support = !!resp.rxgainlut_support; + + ath12k_info(ab, "rxgainlut_support %u\n", ab->rxgainlut_support); + if (resp.eeprom_caldata_read_timeout_valid) { ab->qmi.target.eeprom_caldata = resp.eeprom_caldata_read_timeout; ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi cal data supported from eeprom\n"); @@ -2295,6 +4663,10 @@ ab->qmi.target.fw_build_timestamp, ab->qmi.target.fw_build_id); + r = ath12k_core_check_dt(ab); + if (r) + ath12k_dbg(ab, ATH12K_DBG_QMI, "DT bdf variant name not set.\n"); + out: return ret; } @@ -2306,6 +4678,7 @@ struct qmi_wlanfw_bdf_download_resp_msg_v01 resp; struct qmi_txn txn = {}; const u8 *temp = data; + void __iomem *bdf_addr = NULL; int ret; u32 remaining = len; @@ -2314,6 +4687,15 @@ return -ENOMEM; memset(&resp, 0, sizeof(resp)); + if (ab->bus_params.fixed_bdf_addr) { + bdf_addr = ioremap(ab->hw_params->bdf_addr, ab->hw_params->fw.board_size); + if (!bdf_addr) { + ath12k_warn(ab, "qmi ioremap error for BDF\n"); + ret = -EIO; + goto out; + } + } + while (remaining) { req->valid = 1; req->file_id_valid = 1; @@ -2334,7 +4716,8 @@ req->end = 1; } - if (type == ATH12K_QMI_FILE_TYPE_EEPROM) { + if ((ab->bus_params.fixed_bdf_addr) || + (type == ATH12K_QMI_FILE_TYPE_EEPROM)) { req->data_valid = 0; req->end = 1; req->data_len = ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE; @@ -2342,6 +4725,13 @@ memcpy(req->data, temp, req->data_len); } + if (ab->bus_params.fixed_bdf_addr) { + if (type == ATH12K_QMI_FILE_TYPE_CALDATA) + bdf_addr += ab->hw_params->fw.cal_offset; + + memcpy_toio(bdf_addr, temp, len); + } + ret = qmi_txn_init(&ab->qmi.handle, &txn, qmi_wlanfw_bdf_download_resp_msg_v01_ei, &resp); @@ -2371,7 +4761,8 @@ goto out; } - if (type == ATH12K_QMI_FILE_TYPE_EEPROM) { + if (type == ATH12K_QMI_FILE_TYPE_EEPROM || + ab->bus_params.fixed_bdf_addr) { remaining = 0; } else { remaining -= req->data_len; @@ -2384,10 +4775,97 @@ } out: + if (ab->bus_params.fixed_bdf_addr) + iounmap(bdf_addr); kfree(req); return ret; } +static int ath12k_qmi_fw_cfg_send_sync(struct ath12k_base *ab, + const u8 *data, u32 len, + enum wlanfw_cfg_type_v01 file_type) +{ + struct wlanfw_cfg_download_req_msg_v01 *req; + struct wlanfw_cfg_download_resp_msg_v01 *resp; + struct qmi_txn txn; + int ret = 0; + const u8 *temp = data; + unsigned int remaining = len; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + resp = kzalloc(sizeof(*resp), GFP_KERNEL); + if (!resp) { + kfree(req); + return -ENOMEM; + } + + while (remaining) { + req->file_type_valid = 1; + req->file_type = file_type; + req->total_size_valid = 1; + req->total_size = remaining; + req->seg_id_valid = 1; + req->data_valid = 1; + req->end_valid = 1; + + if (remaining > QMI_WLANFW_MAX_DATA_SIZE_V01) { + req->data_len = QMI_WLANFW_MAX_DATA_SIZE_V01; + } else { + req->data_len = remaining; + req->end = 1; + } + + memcpy(req->data, temp, req->data_len); + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + wlanfw_cfg_download_resp_msg_v01_ei, + resp); + if (ret < 0) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "Failed to initialize txn for FW file download request, err: %d\n", + ret); + goto err; + } + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_CFG_DOWNLOAD_REQ_V01, + WLANFW_CFG_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN, + wlanfw_cfg_download_req_msg_v01_ei, req); + if (ret < 0) { + qmi_txn_cancel(&txn); + ath12k_dbg(ab, ATH12K_DBG_QMI, "Failed to send FW File download request, err: %d\n", + ret); + goto err; + } + + ret = qmi_txn_wait(&txn, ATH12K_QMI_WLANFW_TIMEOUT_MS); + if (ret < 0) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "Failed to wait for response of FW File download request, err: %d\n", + ret); + goto err; + } + + if (resp->resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "FW file download request failed, result: %d, err: %d\n", + resp->resp.result, resp->resp.error); + ret = -resp->resp.result; + goto err; + } + + remaining -= req->data_len; + temp += req->data_len; + req->seg_id++; + } + +err: + kfree(req); + kfree(resp); + + return ret; +} + static int ath12k_qmi_load_bdf_qmi(struct ath12k_base *ab, enum ath12k_qmi_bdf_type type) { @@ -2416,14 +4894,32 @@ break; case ATH12K_QMI_BDF_TYPE_REGDB: - ret = ath12k_core_fetch_board_data_api_1(ab, &bd, - ATH12K_REGDB_FILE_NAME); + ret = ath12k_core_fetch_regdb(ab, &bd); if (ret) { - ath12k_warn(ab, "qmi failed to load regdb bin:\n"); + ath12k_warn(ab, "qmi failed to load regdb:\n"); + goto out; + } + type = ATH12K_QMI_BDF_TYPE_REGDB; + break; + case ATH12K_QMI_BDF_TYPE_RXGAINLUT: + ret = ath12k_core_fetch_rxgainlut(ab, &bd); + if (ret < 0) { + ath12k_warn(ab, "qmi failed to load rxgainlut\n"); goto out; } break; case ATH12K_QMI_BDF_TYPE_CALIBRATION: + if (ath12k_skip_caldata) { + if (ath12k_ftm_mode) { + ath12k_warn(ab, "Skipping caldata download " + "in FTM mode\n"); + goto out; + } + ath12k_err(ab, "skip_caldata=1 module param is " + "unsupported when FTM mode is disabled.\n"); + ret = -EOPNOTSUPP; + goto out; + } if (ab->qmi.target.eeprom_caldata) { file_type = ATH12K_QMI_FILE_TYPE_EEPROM; @@ -2436,11 +4932,21 @@ snprintf(filename, sizeof(filename), "cal-%s-%s.bin", ath12k_bus_str(ab->hif.bus), dev_name(dev)); fw_entry = ath12k_core_firmware_request(ab, filename); + if (!IS_ERR(fw_entry)) goto success; - fw_entry = ath12k_core_firmware_request(ab, - ATH12K_DEFAULT_CAL_FILE); + snprintf(filename, sizeof(filename), "%s", ATH12K_DEFAULT_CAL_FILE); + + if (ab->userpd_id) { + snprintf(filename, sizeof(filename), "%s%d%s", + ATH12K_QMI_DEF_CAL_FILE_PREFIX, + ab->userpd_id, + ATH12K_QMI_DEF_CAL_FILE_SUFFIX); + } + + fw_entry = ath12k_core_firmware_request(ab, filename); + if (IS_ERR(fw_entry)) { ret = PTR_ERR(fw_entry); ath12k_warn(ab, @@ -2527,7 +5033,7 @@ { struct m3_mem_region *m3_mem = &ab->qmi.m3_mem; - if (!m3_mem->vaddr) + if (!ab->hw_params->m3_fw_support || !m3_mem->vaddr) return; dma_free_coherent(ab->dev, m3_mem->size, @@ -2546,14 +5052,18 @@ memset(&req, 0, sizeof(req)); memset(&resp, 0, sizeof(resp)); + if (ab->hw_params->m3_fw_support) { ret = ath12k_qmi_m3_load(ab); if (ret) { ath12k_err(ab, "failed to load m3 firmware: %d", ret); return ret; } - req.addr = m3_mem->paddr; req.size = m3_mem->size; + } else { + req.addr = 0; + req.size = 0; + } ret = qmi_txn_init(&ab->qmi.handle, &txn, qmi_wlanfw_m3_info_resp_msg_v01_ei, &resp); @@ -2725,6 +5235,23 @@ return ret; } +int ath12k_config_qdss(struct ath12k_base *ab) +{ + int ret; + + /* Disabling qdss trace for FTM as it causes hig evt latency in FW +*/ + if (ab->fw_mode == ATH12K_FIRMWARE_MODE_FTM) + return 0; + + ret = ath12k_qmi_send_qdss_config(ab); + if (ret < 0) + ath12k_warn(ab, + "Failed to download QDSS config to FW: %d\n", + ret); + return ret; +} + void ath12k_qmi_firmware_stop(struct ath12k_base *ab) { int ret; @@ -2756,6 +5283,162 @@ return 0; } +static int ath12k_qmi_process_coldboot_calibration(struct ath12k_base *ab) +{ + int timeout; + int ret; + + ret = ath12k_qmi_wlanfw_mode_send(ab, ATH12K_FIRMWARE_MODE_COLD_BOOT); + if (ret < 0) { + ath12k_warn(ab, "qmi failed to send wlan fw mode:%d\n", ret); + return ret; + } + + ath12k_dbg(ab, ATH12K_DBG_QMI, "Coldboot calibration wait started\n"); + + timeout = wait_event_timeout(ab->qmi.cold_boot_waitq, + (ab->qmi.cal_done == 1), + ATH12K_COLD_BOOT_FW_RESET_DELAY); + if (timeout <= 0) { + ath12k_warn(ab, "Coldboot Calibration failed - wait ended\n"); + return 0; + } + + ath12k_dbg(ab, ATH12K_DBG_QMI, "Coldboot calibration done\n"); + + return 0; +} + +int ath12k_qmi_fwreset_from_cold_boot(struct ath12k_base *ab) +{ + int timeout; + + if (ath12k_cold_boot_cal == 0 || + ab->hw_params->cold_boot_calib == 0){ + ath12k_info(ab, "Cold boot cal is not supported/enabled\n"); + return 0; + } + + ath12k_dbg(ab, ATH12K_DBG_QMI, "wait for cold boot done\n"); + + timeout = wait_event_timeout(ab->qmi.cold_boot_waitq, + (ab->qmi.cal_done == 1), + ATH12K_COLD_BOOT_FW_RESET_DELAY); + if (timeout <= 0) { + ath12k_warn(ab, "Coldboot Calibration timed out\n"); + /*set cal_timeout to switch to mission mode on firware reset*/ + ab->qmi.cal_timeout = 1; + } + + /* reset the firmware */ + ath12k_info(ab, "power down to restart firmware in mission mode\n"); + ath12k_qmi_firmware_stop(ab); + ath12k_hif_power_down(ab); + ath12k_info(ab, "power up to restart firmware in mission mode\n"); + /* reset host fixed mem off to zero */ + ab->host_ddr_fixed_mem_off = 0; + ath12k_hif_power_up(ab); + ath12k_dbg(ab, ATH12K_DBG_QMI, "exit wait for cold boot done\n"); + return 0; +} +EXPORT_SYMBOL(ath12k_qmi_fwreset_from_cold_boot); + +int ath12k_qmi_m3_dump_upload_done_ind_send(struct ath12k_base *ab, + u32 pdev_id, int status) +{ + struct qmi_wlanfw_m3_dump_upload_done_req_msg_v01 *req; + struct qmi_wlanfw_m3_dump_upload_done_resp_msg_v01 *resp; + struct qmi_txn txn; + int ret; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + resp = kzalloc(sizeof(*resp), GFP_KERNEL); + if (!resp) { + kfree(req); + return -ENOMEM; + } + + req->pdev_id = pdev_id; + req->status = status; + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_m3_dump_upload_done_resp_msg_v01_ei, resp); + if (ret < 0) + goto out; + + ret = + qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLFW_M3_DUMP_UPLOAD_DONE_REQ_V01, + QMI_WLANFW_M3_DUMP_UPLOAD_DONE_REQ_MSG_V01_MAX_MSG_LEN, + qmi_wlanfw_m3_dump_upload_done_req_msg_v01_ei, req); + if (ret < 0) { + qmi_txn_cancel(&txn); + ath12k_warn(ab, "Failed to send M3 dump upload done request, err %d\n", + ret); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp->resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "qmi M3 upload done req failed, result: %d, err: %d\n", + resp->resp.result, resp->resp.error); + ret = -EINVAL; + goto out; + } + ath12k_info(ab, "qmi m3 dump uploaded\n"); + +out: + kfree(req); + kfree(resp); + return ret; +} + +static void ath12k_qmi_event_m3_dump_upload_req(struct ath12k_qmi *qmi, + void *data) +{ + struct ath12k_base *ab = qmi->ab; + struct ath12k_qmi_m3_dump_upload_req_data *event_data = data; + + ath12k_coredump_m3_dump(ab, event_data); +} + +static void ath12k_qmi_qdss_mem_free(struct ath12k_qmi *qmi) +{ + struct ath12k_base *ab = qmi->ab; + int i; + + for (i = 0; i < ab->qmi.qdss_mem_seg_len; i++) { + if (ab->qmi.qdss_mem[i].v.ioaddr) { + iounmap(ab->qmi.qdss_mem[i].v.ioaddr); + ab->qmi.qdss_mem[i].v.ioaddr = NULL; + } + } +} + +static void ath12k_qmi_event_qdss_trace_save_hdlr(struct ath12k_qmi *qmi, + void *data) +{ + struct ath12k_qmi_event_qdss_trace_save_data *event_data = data; + struct ath12k_base *ab = qmi->ab; + + if (!ab->qmi.qdss_mem_seg_len) { + ath12k_warn(ab, "Memory for QDSS trace is not available\n"); + return; + } + + ath12k_coredump_qdss_dump(ab, event_data); + + ath12k_qmi_qdss_mem_free(qmi); + ab->qmi.qdss_mem_seg_len = 0; + ab->is_qdss_tracing = false; +} + static int ath12k_qmi_driver_event_post(struct ath12k_qmi *qmi, enum ath12k_qmi_event_type type, @@ -2779,9 +5462,75 @@ return 0; } +void ath12k_qmi_trigger_host_cap(struct ath12k_base *ab) +{ + struct ath12k_qmi *qmi = &ab->qmi; + bool block; + + spin_lock(&qmi->event_lock); + + block = ath12k_qmi_get_event_block(qmi); + if (block) + ath12k_qmi_set_event_block(qmi, false); + + spin_unlock(&qmi->event_lock); + + ath12k_dbg(ab, ATH12K_DBG_QMI, "Trigger host cap for chip id %d\n", + ab->chip_id); + + ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_HOST_CAP, NULL); +} + +static bool ath12k_qmi_hw_group_host_cap_ready(struct ath12k_hw_group *ag) +{ + struct ath12k_base *ab; + int i; + + lockdep_assert_held(&ag->mutex_lock); + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + if (!(ab && ab->qmi.num_radios != ATH12K_QMI_INVALID_RADIO)) + return false; + } + + return true; +} + +static struct ath12k_base * +ath12k_qmi_hw_group_find_blocked_chip(struct ath12k_hw_group *ag) +{ + struct ath12k_base *ab; + struct ath12k_qmi *qmi; + bool block; + int i; + + lockdep_assert_held(&ag->mutex_lock); + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + if (!ab) + continue; + + qmi = &ab->qmi; + + spin_lock(&qmi->event_lock); + block = ath12k_qmi_get_event_block(qmi); + spin_unlock(&qmi->event_lock); + + if (block) + return ab; + } + + return NULL; +} + static int ath12k_qmi_event_server_arrive(struct ath12k_qmi *qmi) { - struct ath12k_base *ab = qmi->ab; + struct ath12k_base *ab = qmi->ab, *block_ab; + struct ath12k_hw_group *ag = ab->ag; + bool host_cap_ready; int ret; ret = ath12k_qmi_fw_ind_register_send(ab); @@ -2790,11 +5539,72 @@ return ret; } + ath12k_qmi_phy_cap_send(ab); + if (ath12k_cold_boot_cal && ab->qmi.cal_done == 0 && + ab->hw_params->cold_boot_calib && + ab->qmi.cal_timeout == 0) { + /* Coldboot calibration mode */ + ath12k_qmi_trigger_host_cap(ab); + } else { + spin_lock(&qmi->event_lock); + ath12k_qmi_set_event_block(&ab->qmi, true); + spin_unlock(&qmi->event_lock); + + mutex_lock(&ag->mutex_lock); + host_cap_ready = ath12k_qmi_hw_group_host_cap_ready(ag); + if (host_cap_ready) { + block_ab = ath12k_qmi_hw_group_find_blocked_chip(ag); + if (block_ab) + ath12k_qmi_trigger_host_cap(block_ab); + } + mutex_unlock(&ag->mutex_lock); + } + + return ret; +} + +static int ath12k_qmi_fw_cfg(struct ath12k_base *ab) +{ + struct ath12k_board_data bd; + int ret; + + ret = ath12k_core_fetch_fw_cfg(ab, &bd); + if (ret < 0) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi failed to fetch FW CFG file:%d\n", ret); + goto out; + } + ret = ath12k_qmi_fw_cfg_send_sync(ab, bd.data, + bd.len, WLANFW_CFG_FILE_V01); + if (ret < 0) + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi failed to load FW CFG file\n"); + +out: + ath12k_core_free_bdf(ab, &bd); + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi FW CFG download sequence completed, ret: %d\n", + ret); + + return ret; +} + +static int ath12k_qmi_event_host_cap(struct ath12k_qmi *qmi) +{ + struct ath12k_base *ab = qmi->ab; + int ret; + ret = ath12k_qmi_host_cap_send(ab); if (ret < 0) { + clear_bit(ATH12K_FLAG_QMI_HOST_CAP_SENT, &ab->dev_flags); ath12k_warn(ab, "qmi failed to send host cap QMI:%d\n", ret); return ret; } + set_bit(ATH12K_FLAG_QMI_HOST_CAP_SENT, &ab->dev_flags); + + if (!ab->fw_cfg_support) { + ath12k_dbg(ab, ATH12K_DBG_QMI, "FW CFG file is not supported\n"); + return 0; + } + + ret = ath12k_qmi_fw_cfg(ab); return ret; } @@ -2813,6 +5623,345 @@ return ret; } +int ath12k_send_qdss_trace_mode_req(struct ath12k_base *ab, + enum qmi_wlanfw_qdss_trace_mode_enum_v01 mode) +{ + int ret; + struct qmi_txn txn; + struct qmi_wlanfw_qdss_trace_mode_req_msg_v01 req = {}; + struct qmi_wlanfw_qdss_trace_mode_resp_msg_v01 resp = {}; + + req.mode_valid = 1; + req.mode = mode; + req.option_valid = 1; + req.option = mode == QMI_WLANFW_QDSS_TRACE_OFF_V01 ? + QMI_WLANFW_QDSS_STOP_ALL_TRACE : 0; + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_qdss_trace_mode_resp_msg_v01_ei, &resp); + if (ret < 0) + return ret; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_QDSS_TRACE_MODE_REQ_V01, + QMI_WLANFW_QDSS_TRACE_MODE_REQ_MSG_V01_MAX_LEN, + qmi_wlanfw_qdss_trace_mode_req_msg_v01_ei, &req); + if (ret < 0) { + ath12k_warn(ab, "Failed to send QDSS trace mode request,err = %d\n", ret); + qmi_txn_cancel(&txn); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "QDSS trace mode request failed, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } +out: + return ret; +} + +int ath12k_qmi_pci_alloc_qdss_mem(struct ath12k_qmi *qmi) +{ + struct ath12k_base *ab = qmi->ab; + struct device *dev = ab->dev; + struct resource res; + int ret; + + if (ab->qmi.qdss_mem_seg_len > 1) { + ath12k_warn(ab, "%s: FW requests %d segments, max allowed is 1\n", + __func__, ab->qmi.qdss_mem_seg_len); + return -EINVAL; + } + + switch (ab->qmi.qdss_mem[0].type) { + case QDSS_ETR_MEM_REGION_TYPE: + if (ab->qmi.qdss_mem[0].size > QMI_Q6_QDSS_ETR_SIZE_QCN9274) { + ath12k_warn(ab, "%s: FW requests more memory 0x%x\n", + __func__, ab->qmi.qdss_mem[0].size); + return -ENOMEM; + } + + ab->hremote_node = of_parse_phandle(dev->of_node, "memory-region", 0); + if (!ab->hremote_node) { + ath12k_warn(ab, "qmi fail to get hremote_node for pci device\n"); + return ret; + } + + ret = of_address_to_resource(ab->hremote_node, 0, &res); + of_node_put(ab->hremote_node); + if (ret) { + ath12k_warn(ab, "qmi fail to get reg from hremote\n"); + return ret; + } + + if ((ab->host_ddr_fixed_mem_off + ab->qmi.qdss_mem[0].size) > + ((res.end - res.start) + 1)) { + ath12k_warn(ab, + "No Fixed mem to allocate for QDSS_ETR_MEM_REGION_TYPE"); + return -EINVAL; + } + + ab->qmi.qdss_mem[0].paddr = (phys_addr_t)res.start + ab->host_ddr_fixed_mem_off; + ab->qmi.qdss_mem[0].v.ioaddr = + ioremap(ab->qmi.qdss_mem[0].paddr, + ab->qmi.qdss_mem[0].size); + if (!ab->qmi.qdss_mem[0].v.ioaddr) { + ath12k_warn(ab, "WARNING etr-addr remap failed\n"); + return -ENOMEM; + } + ab->host_ddr_fixed_mem_off += ab->qmi.qdss_mem[0].size; + break; + default: + ath12k_warn(ab, "qmi ignore invalid qdss mem req type %d\n", + ab->qmi.qdss_mem[0].type); + return -EINVAL; + } + + return 0; +} + +static +struct device_node *ath12k_get_etr_dev_node(struct ath12k_base *ab) +{ + struct device_node *dev_node = NULL; + + if (ab->userpd_id) { + if (ab->userpd_id == USERPD_1) + dev_node = of_find_node_by_name(NULL, + "q6_qcn6432_etr_1"); + else if (ab->userpd_id == USERPD_2) + dev_node = of_find_node_by_name(NULL, + "q6_qcn6432_etr_2"); + } else { + dev_node = of_find_node_by_name(NULL, "q6_etr_dump"); + } + + return dev_node; +} + +int ath12k_qmi_qdss_mem_alloc(struct ath12k_qmi *qmi) +{ + int ret, i; + struct ath12k_base *ab = qmi->ab; + struct device_node *dev_node = NULL; + struct resource q6_etr; + + switch (ab->hif.bus) { + case ATH12K_BUS_AHB: + case ATH12K_BUS_HYBRID: + dev_node = ath12k_get_etr_dev_node(ab); + if (!dev_node) { + ath12k_err(ab, "No q6_etr_dump available in dts\n"); + return -ENODEV; + } + ret = of_address_to_resource(dev_node, 0, &q6_etr); + of_node_put(dev_node); + if (ret) { + ath12k_err(ab, "Failed to get resource for q6_etr_dump\n"); + return ret; + } + for (i = 0; i < ab->qmi.qdss_mem_seg_len; i++) { + ab->qmi.qdss_mem[i].paddr = q6_etr.start; + ab->qmi.qdss_mem[i].size = resource_size(&q6_etr); + ab->qmi.qdss_mem[i].type = QDSS_ETR_MEM_REGION_TYPE; + ab->qmi.qdss_mem[i].v.ioaddr = + ioremap(ab->qmi.qdss_mem[i].paddr, + ab->qmi.qdss_mem[i].size); + if (!ab->qmi.qdss_mem[i].v.ioaddr) { + ath12k_err(ab, "Error: etr-addr remap failed\n"); + return -ENOMEM; + } + ath12k_dbg(ab, ATH12K_DBG_QMI, + "QDSS mem addr pa 0x%x va 0x%p, size 0x%x", + (unsigned int)ab->qmi.qdss_mem[i].paddr, + ab->qmi.qdss_mem[i].v.ioaddr, + (unsigned int)ab->qmi.qdss_mem[i].size); + } + break; + case ATH12K_BUS_PCI: + ret = ath12k_qmi_pci_alloc_qdss_mem(qmi); + break; + default: + ath12k_warn(ab, "invalid bus type: %d", ab->hif.bus); + ret = -EINVAL; + break; + } + return ret; +} + +int ath12k_qmi_qdss_trace_mem_info_send_sync(struct ath12k_base *ab) +{ + struct qmi_wlanfw_respond_mem_req_msg_v01 *req; + struct qmi_wlanfw_respond_mem_resp_msg_v01 resp = {}; + struct qmi_txn txn; + int ret, i; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + req->mem_seg_len = ab->qmi.qdss_mem_seg_len; + + for (i = 0; i < req->mem_seg_len ; i++) { + req->mem_seg[i].addr = ab->qmi.qdss_mem[i].paddr; + req->mem_seg[i].size = ab->qmi.qdss_mem[i].size; + req->mem_seg[i].type = ab->qmi.qdss_mem[i].type; + } + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_respond_mem_resp_msg_v01_ei, &resp); + + if (ret < 0) { + ath12k_warn(ab, "Fail to initialize txn for QDSS trace mem request: err %d\n", + ret); + goto out; + } + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLFW_QDSS_TRACE_MEM_INFO_REQ_V01, + QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN, + qmi_wlanfw_respond_mem_req_msg_v01_ei, req); + + if (ret < 0) { + ath12k_warn(ab, "qmi failed to respond memory request, err = %d\n", + ret); + qmi_txn_cancel(&txn); + goto out; + } + + ret = qmi_txn_wait(&txn, + msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) { + ath12k_warn(ab, "qmi failed memory request, err = %d\n", ret); + goto out; + } + + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "Respond mem req failed, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } +out: + kfree(req); + return ret; +} + +static void ath12k_qmi_event_qdss_trace_req_mem_hdlr(struct ath12k_qmi *qmi) +{ + int ret; + struct ath12k_base *ab = qmi->ab; + + ret = ath12k_qmi_qdss_mem_alloc(qmi); + if (ret < 0) { + ath12k_err(ab, "failed to allocate memory for qdss:%d\n", ret); + return; + } + + ret = ath12k_qmi_qdss_trace_mem_info_send_sync(ab); + if (ret < 0) { + ath12k_warn(ab, + "qdss trace mem info send sync failed:%d\n", ret); + ath12k_qmi_qdss_mem_free(qmi); + return; + } + /* After qdss_trace_mem_info(QMI_WLFW_QDSS_TRACE_MEM_INFO_REQ_V01), + * the firmware will take one second at max + * for its configuration. We shouldn't send qdss_trace request + * before that. + */ + msleep(1000); + ret = ath12k_send_qdss_trace_mode_req(ab, QMI_WLANFW_QDSS_TRACE_ON_V01); + if (ret < 0) { + ath12k_warn(ab, "Failed to enable QDSS trace: %d\n", ret); + ath12k_qmi_qdss_mem_free(qmi); + return; + } + ab->is_qdss_tracing = true; + ath12k_dbg(ab, ATH12K_DBG_QMI, "QDSS configuration is completed and trace started\n"); +} + +static int ath12k_qmi_request_device_info(struct ath12k_base *ab) +{ + struct qmi_wlanfw_device_info_req_msg_v01 req; + struct qmi_wlanfw_device_info_resp_msg_v01 resp; + struct qmi_txn txn = {}; + void *bar_addr_va = NULL; + int ret = 0; + + /*device info message only supported for internal-PCI devices */ + if (ab->hw_rev != ATH12K_HW_QCN6432_HW10) + return 0; + + memset(&req, 0, sizeof(req)); + memset(&resp, 0, sizeof(resp)); + + ret = qmi_txn_init(&ab->qmi.handle, &txn, + qmi_wlanfw_device_info_resp_msg_v01_ei, &resp); + if (ret < 0) + goto out; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLANFW_DEVICE_INFO_REQ_V01, + QMI_WLANFW_DEVICE_INFO_REQ_MSG_V01, + qmi_wlanfw_device_info_req_msg_v01_ei, &req); + if (ret < 0) { + ath12k_warn(ab, "qmi failed to send target device info request, err = %d\n", + ret); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) { + ath12k_warn(ab, "qmi failed target device info request %d\n", ret); + goto out; + } + + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "qmi device info req failed, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } + + if (!resp.bar_addr_valid || !resp.bar_size_valid) { + ath12k_warn(ab, "qmi device info response invalid, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } + if (!resp.bar_addr || + resp.bar_size != QCN6432_DEVICE_BAR_SIZE) { + ath12k_warn(ab, "qmi device info invalid addr and size, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } + + bar_addr_va = ioremap(resp.bar_addr, resp.bar_size); + if (!bar_addr_va) { + ath12k_warn(ab, "qmi device info ioremap failed\n"); + ab->mem_len = 0; + ret = -EIO; + goto out; + } + + ab->mem = bar_addr_va; + ab->mem_len = resp.bar_size; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "Device BAR Info pa: 0x%llx, va: 0x%p, size: 0x%lx\n", + resp.bar_addr, ab->mem, ab->mem_len); + + ath12k_hif_config_static_window(ab); + return 0; +out: + return ret; +} + static int ath12k_qmi_event_load_bdf(struct ath12k_qmi *qmi) { struct ath12k_base *ab = qmi->ab; @@ -2824,11 +5973,19 @@ return ret; } + ret = ath12k_qmi_request_device_info(ab); + if (ret < 0) { + ath12k_warn(ab, "qmi failed to req device info:%d\n", ret); + return ret; + } + + if (!ab->bus_params.fixed_bdf_addr) { ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_REGDB); if (ret < 0) { ath12k_warn(ab, "qmi failed to load regdb file:%d\n", ret); return ret; } + } ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_ELF); if (ret < 0) { @@ -2836,6 +5993,12 @@ return ret; } + if (ab->rxgainlut_support) { + ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_RXGAINLUT); + if (ret < 0) + ath12k_warn(ab, "qmi failed to load rxgainlut: %d\n", ret); + } + if (ab->hw_params->download_calib) { ret = ath12k_qmi_load_bdf_qmi(ab, ATH12K_QMI_BDF_TYPE_CALIBRATION); if (ret < 0) @@ -2873,16 +6036,26 @@ for (i = 0; i < qmi->mem_seg_count ; i++) { ab->qmi.target_mem[i].type = msg->mem_seg[i].type; ab->qmi.target_mem[i].size = msg->mem_seg[i].size; + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi mem seg type %d size %d\n", msg->mem_seg[i].type, msg->mem_seg[i].size); } + if (ab->bus_params.fixed_mem_region) { + ret = ath12k_qmi_assign_target_mem_chunk(ab); + if (ret) { + ath12k_warn(ab, "qmi failed to assign target memory: %d\n", + ret); + return; + } + } else { ret = ath12k_qmi_alloc_target_mem_chunk(ab); if (ret) { ath12k_warn(ab, "qmi failed to alloc target memory: %d\n", ret); return; } + } ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_REQUEST_MEM, NULL); } @@ -2911,6 +6084,171 @@ ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_FW_READY, NULL); } +static void ath12k_qmi_msg_cold_boot_cal_done_cb(struct qmi_handle *qmi_hdl, + struct sockaddr_qrtr *sq, + struct qmi_txn *txn, + const void *decoded) +{ + struct ath12k_qmi *qmi = container_of(qmi_hdl, + struct ath12k_qmi, handle); + struct ath12k_base *ab = qmi->ab; + + ab->qmi.cal_done = 1; + wake_up(&ab->qmi.cold_boot_waitq); + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi cold boot calibration done\n"); +} + +static void ath12k_qmi_m3_dump_upload_req_ind_cb(struct qmi_handle *qmi_hdl, + struct sockaddr_qrtr *sq, + struct qmi_txn *txn, + const void *data) +{ + struct ath12k_qmi *qmi = container_of(qmi_hdl, struct ath12k_qmi, handle); + struct ath12k_base *ab = qmi->ab; + const struct qmi_wlanfw_m3_dump_upload_req_ind_msg_v01 *msg = data; + struct ath12k_qmi_m3_dump_upload_req_data *event_data; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi m3 dump memory request\n"); + + event_data = kzalloc(sizeof(*event_data), GFP_KERNEL); + if (!event_data) + return; + + event_data->pdev_id = msg->pdev_id; + event_data->addr = msg->addr; + event_data->size = msg->size; + + ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_M3_DUMP_UPLOAD_REQ, + event_data); +} + +static void ath12k_wlfw_qdss_trace_req_mem_ind_cb(struct qmi_handle *qmi_hdl, + struct sockaddr_qrtr *sq, + struct qmi_txn *txn, + const void *data) +{ + struct ath12k_qmi *qmi = container_of(qmi_hdl, + struct ath12k_qmi, + handle); + struct ath12k_base *ab = qmi->ab; + const struct qmi_wlanfw_request_mem_ind_msg_v01 *msg = data; + int i; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "qdss trace request memory from firmware\n"); + ab->qmi.qdss_mem_seg_len = msg->mem_seg_len; + + if (msg->mem_seg_len > 1) { + ath12k_warn(ab, "%s: FW requests %d segments, overwriting it with 1", + __func__, msg->mem_seg_len); + ab->qmi.qdss_mem_seg_len = 1; + } + + for (i = 0; i < ab->qmi.qdss_mem_seg_len; i++) { + ab->qmi.qdss_mem[i].type = msg->mem_seg[i].type; + ab->qmi.qdss_mem[i].size = msg->mem_seg[i].size; + ath12k_dbg(ab, ATH12K_DBG_QMI, "qmi mem seg type %d size %d\n", + msg->mem_seg[i].type, msg->mem_seg[i].size); + } + + ath12k_qmi_driver_event_post(qmi, + ATH12K_QMI_EVENT_QDSS_TRACE_REQ_MEM, + NULL); +} + +static void ath12k_wlfw_qdss_trace_save_ind_cb(struct qmi_handle *qmi_hdl, + struct sockaddr_qrtr *sq, + struct qmi_txn *txn, + const void *data) +{ + struct ath12k_qmi *qmi = container_of(qmi_hdl, + struct ath12k_qmi, + handle); + struct ath12k_base *ab = qmi->ab; + const struct qmi_wlanfw_qdss_trace_save_ind_msg_v01 *ind_msg = data; + struct ath12k_qmi_event_qdss_trace_save_data *event_data; + int i; + + if (ind_msg->source == 1) + return; + + ath12k_dbg(ab, ATH12K_DBG_QMI, "Received qdss trace save indication\n"); + event_data = kzalloc(sizeof(*event_data), GFP_KERNEL); + + if (!event_data) + return; + + if (ind_msg->mem_seg_valid) { + if (ind_msg->mem_seg_len > QDSS_TRACE_SEG_LEN_MAX) { + ath12k_err(ab, "Invalid seg len %u\n", + ind_msg->mem_seg_len); + goto free_event_data; + } + + event_data->mem_seg_len = ind_msg->mem_seg_len; + for (i = 0; i < ind_msg->mem_seg_len; i++) { + event_data->mem_seg[i].addr = ind_msg->mem_seg[i].addr; + event_data->mem_seg[i].size = ind_msg->mem_seg[i].size; + } + } + + event_data->total_size = ind_msg->total_size; + ath12k_qmi_driver_event_post(qmi, ATH12K_QMI_EVENT_QDSS_TRACE_SAVE, + event_data); + return; + +free_event_data: + kfree(event_data); +} + +int ath12k_enable_fwlog(struct ath12k_base *ab) +{ + struct wlfw_ini_req_msg_v01 *req; + struct wlfw_ini_resp_msg_v01 resp = {}; + struct qmi_txn txn = {}; + int ret = 0; + + if (!ab->hw_params->en_fwlog) + return 0; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + req->enablefwlog_valid = 1; + req->enablefwlog = 1; + + ret = qmi_txn_init(&ab->qmi.handle, &txn, wlfw_ini_resp_msg_v01_ei, &resp); + if (ret < 0) + goto out; + + ret = qmi_send_request(&ab->qmi.handle, NULL, &txn, + QMI_WLFW_INI_REQ_V01, + WLFW_INI_REQ_MSG_V01_MAX_MSG_LEN, + wlfw_ini_req_msg_v01_ei, req); + + if (ret < 0) { + ath12k_warn(ab, "Failed to send init request for enabling fwlog = %d\n", + ret); + qmi_txn_cancel(&txn); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH12K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) { + ath12k_warn(ab, "fwlog enable wait for resp failed: %d\n", ret); + goto out; + } + + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ath12k_warn(ab, "fwlog enable request failed, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + } +out: + kfree(req); + return ret; +} + static const struct qmi_msg_handler ath12k_qmi_msg_handlers[] = { { .type = QMI_INDICATION, @@ -2933,6 +6271,48 @@ .decoded_size = sizeof(struct qmi_wlanfw_fw_ready_ind_msg_v01), .fn = ath12k_qmi_msg_fw_ready_cb, }, + { + .type = QMI_INDICATION, + .msg_id = QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01, + .ei = qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei, + .decoded_size = + sizeof(struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01), + .fn = ath12k_qmi_msg_cold_boot_cal_done_cb, + }, + { + .type = QMI_INDICATION, + .msg_id = QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01, + .ei = qmi_wlanfw_cold_boot_cal_done_ind_msg_v01_ei, + .decoded_size = + sizeof(struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01), + .fn = ath12k_qmi_msg_cold_boot_cal_done_cb, + }, + { + .type = QMI_INDICATION, + .msg_id = QMI_WLFW_M3_DUMP_UPLOAD_REQ_IND_V01, + .ei = qmi_wlanfw_m3_dump_upload_req_ind_msg_v01_ei, + .decoded_size = + sizeof(struct qmi_wlanfw_m3_dump_upload_req_ind_msg_v01), + .fn = ath12k_qmi_m3_dump_upload_req_ind_cb, + }, + { + .type = QMI_INDICATION, + .msg_id = QMI_WLFW_QDSS_TRACE_REQ_MEM_IND_V01, + .ei = qmi_wlanfw_request_mem_ind_msg_v01_ei, + .decoded_size = + sizeof(struct qmi_wlanfw_request_mem_ind_msg_v01), + .fn = ath12k_wlfw_qdss_trace_req_mem_ind_cb, + }, + { + .type = QMI_INDICATION, + .msg_id = QMI_WLFW_QDSS_TRACE_SAVE_IND_V01, + .ei = qmi_wlanfw_qdss_trace_save_ind_msg_v01_ei, + .decoded_size = + sizeof(struct qmi_wlanfw_qdss_trace_save_ind_msg_v01), + .fn = ath12k_wlfw_qdss_trace_save_ind_cb, + }, + /* (Additions here) */ + { /* terminator entry */ } }; static int ath12k_qmi_ops_new_server(struct qmi_handle *qmi_hdl, @@ -2975,6 +6355,23 @@ .del_server = ath12k_qmi_ops_del_server, }; +static int ath12k_wait_for_gic_msi(struct ath12k_base *ab) +{ + int timeout; + + if (ab->hw_rev != ATH12K_HW_QCN6432_HW10) + return 0; + + timeout = wait_event_timeout(ab->ipci.gic_msi_waitq, + (ab->ipci.gic_enabled == 1), + ATH12K_RCV_GIC_MSI_HDLR_DELAY); + if (timeout <= 0) { + ath12k_warn(ab, "Receive gic msi handler timed out\n"); + return -ETIMEDOUT; + } + return 0; +} + static void ath12k_qmi_driver_event_work(struct work_struct *work) { struct ath12k_qmi *qmi = container_of(work, struct ath12k_qmi, @@ -2984,6 +6381,7 @@ int ret; spin_lock(&qmi->event_lock); + while (!list_empty(&qmi->event_list)) { event = list_first_entry(&qmi->event_list, struct ath12k_qmi_driver_event, list); @@ -3001,7 +6399,7 @@ break; case ATH12K_QMI_EVENT_SERVER_EXIT: set_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); - set_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags); + clear_bit(ATH12K_FLAG_WMI_INIT_DONE, &ab->dev_flags); break; case ATH12K_QMI_EVENT_REQUEST_MEM: ret = ath12k_qmi_event_mem_request(qmi); @@ -3015,19 +6413,53 @@ break; case ATH12K_QMI_EVENT_FW_READY: clear_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags); - if (test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)) { + if (test_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE, + &ab->dev_flags)) { ath12k_hal_dump_srng_stats(ab); queue_work(ab->workqueue, &ab->restart_work); break; } + if (ath12k_cold_boot_cal && ab->qmi.cal_done == 0 && + ab->hw_params->cold_boot_calib) { + ath12k_qmi_process_coldboot_calibration(ab); + } else { clear_bit(ATH12K_FLAG_CRASH_FLUSH, &ab->dev_flags); clear_bit(ATH12K_FLAG_RECOVERY, &ab->dev_flags); - ath12k_core_qmi_firmware_ready(ab); - set_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags); + ret = ath12k_wait_for_gic_msi(ab); + if (ret) { + ath12k_warn(ab, "failed to get qgic handler for dev %d ret: %d\n", + ab->hw_rev, ret); + break; + } + ret = ath12k_core_qmi_firmware_ready(ab); + if (ret) { + ath12k_warn(ab, "failed to init after firmware ready: %d\n", ret); + set_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags); + break; + } + set_bit(ATH12K_FLAG_QMI_FW_READY_COMPLETE, + &ab->dev_flags); + } break; + case ATH12K_QMI_EVENT_QDSS_TRACE_REQ_MEM: + ath12k_qmi_event_qdss_trace_req_mem_hdlr(qmi); + break; + case ATH12K_QMI_EVENT_QDSS_TRACE_SAVE: + ath12k_qmi_event_qdss_trace_save_hdlr(qmi, event->data); + break; + case ATH12K_QMI_EVENT_COLD_BOOT_CAL_DONE: + break; + case ATH12K_QMI_EVENT_M3_DUMP_UPLOAD_REQ: + ath12k_qmi_event_m3_dump_upload_req(qmi, event->data); + break; + case ATH12K_QMI_EVENT_HOST_CAP: + ret = ath12k_qmi_event_host_cap(qmi); + if (ret < 0) + set_bit(ATH12K_FLAG_QMI_FAIL, &ab->dev_flags); + break; default: ath12k_warn(ab, "invalid event type: %d", event->type); break; @@ -3048,7 +6480,7 @@ memset(&ab->qmi.target_mem, 0, sizeof(struct target_mem_chunk)); ab->qmi.ab = ab; - ab->qmi.target_mem_mode = ATH12K_QMI_TARGET_MEM_MODE_DEFAULT; + ab->qmi.target_mem_mode = ab->hw_params->fw_mem_mode; ret = qmi_handle_init(&ab->qmi.handle, ATH12K_QMI_RESP_LEN_MAX, &ath12k_qmi_ops, ath12k_qmi_msg_handlers); if (ret < 0) { @@ -3056,8 +6488,7 @@ return ret; } - ab->qmi.event_wq = alloc_workqueue("ath12k_qmi_driver_event", - WQ_UNBOUND, 1); + ab->qmi.event_wq = alloc_ordered_workqueue("ath12k_qmi_driver_event", 0); if (!ab->qmi.event_wq) { ath12k_err(ab, "failed to allocate workqueue\n"); return -EFAULT; diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/qmi.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/qmi.h --- linux-6.4/drivers/net/wireless/ath/ath12k/qmi.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/qmi.h 2024-04-22 13:40:50.295868965 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_QMI_H @@ -15,33 +15,61 @@ #define ATH12K_QMI_MAX_BDF_FILE_NAME_SIZE 64 #define ATH12K_QMI_CALDB_ADDRESS 0x4BA00000 #define ATH12K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 128 -#define ATH12K_QMI_WLFW_NODE_ID_BASE 0x07 #define ATH12K_QMI_WLFW_SERVICE_ID_V01 0x45 #define ATH12K_QMI_WLFW_SERVICE_VERS_V01 0x01 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01 0x02 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_WCN7850 0x1 #define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN9274 0x07 +#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ5332 0x2 +#define ATH12K_QMI_WLFW_SERVICE_INS_ID_V01_QCN6432 0x60 #define ATH12K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 32 #define ATH12K_QMI_RESP_LEN_MAX 8192 #define ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01 52 -#define ATH12K_QMI_CALDB_SIZE 0x480000 +#define ATH12K_QMI_CALDB_SIZE 0x800000 #define ATH12K_QMI_BDF_EXT_STR_LENGTH 0x20 #define ATH12K_QMI_FW_MEM_REQ_SEGMENT_CNT 3 #define ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01 4 #define ATH12K_QMI_DEVMEM_CMEM_INDEX 0 +#define ATH12K_QMI_MAX_QDSS_CONFIG_FILE_NAME_SIZE 64 +#define ATH12K_QMI_DEFAULT_QDSS_CONFIG_FILE_NAME "qdss_trace_config.bin" +#define ATH12K_QMI_M3_DUMP_SIZE 0x100000 #define QMI_WLFW_REQUEST_MEM_IND_V01 0x0035 #define QMI_WLFW_FW_MEM_READY_IND_V01 0x0037 +#define QMI_WLFW_COLD_BOOT_CAL_DONE_IND_V01 0x0021 #define QMI_WLFW_FW_READY_IND_V01 0x0038 +#define QMI_WLFW_QDSS_TRACE_REQ_MEM_IND_V01 0x003F +#define QMI_Q6_QDSS_ETR_SIZE_QCN9274 0x100000 +#define QMI_WLFW_QDSS_TRACE_SAVE_IND_V01 0x0041 +#define QMI_Q6_QDSS_ETR_OFFSET_QCN9274 0x2500000 +#define QMI_WLFW_M3_DUMP_UPLOAD_REQ_IND_V01 0x004D +#define QMI_WLFW_M3_DUMP_UPLOAD_DONE_REQ_V01 0x004E #define QMI_WLANFW_MAX_DATA_SIZE_V01 6144 #define ATH12K_FIRMWARE_MODE_OFF 4 -#define ATH12K_QMI_TARGET_MEM_MODE_DEFAULT 0 +#define ATH12K_COLD_BOOT_FW_RESET_DELAY (60 * HZ) #define ATH12K_BOARD_ID_DEFAULT 0xFF +#define ATH12K_QMI_INVALID_RADIO 0xFF +#define QCN6432_DEVICE_BAR_SIZE 0x200000 +#define ATH12K_RCV_GIC_MSI_HDLR_DELAY (3 * HZ) + +enum ath12k_target_mem_mode { + ATH12K_QMI_TARGET_MEM_MODE_DEFAULT = 0, + ATH12K_QMI_TARGET_MEM_MODE_512M, +}; + +/* userpd_id in multi pd arch */ +enum userpd_id { + USERPD_0 = 0, + USERPD_1, + USERPD_2, +}; + struct ath12k_base; +struct ath12k_host_mlo_glb_rx_reo_snapshot_info; enum ath12k_qmi_file_type { ATH12K_QMI_FILE_TYPE_BDF_GOLDEN = 0, @@ -55,6 +83,7 @@ ATH12K_QMI_BDF_TYPE_ELF = 1, ATH12K_QMI_BDF_TYPE_REGDB = 4, ATH12K_QMI_BDF_TYPE_CALIBRATION = 5, + ATH12K_QMI_BDF_TYPE_RXGAINLUT = 7, }; enum ath12k_qmi_event_type { @@ -63,12 +92,18 @@ ATH12K_QMI_EVENT_REQUEST_MEM, ATH12K_QMI_EVENT_FW_MEM_READY, ATH12K_QMI_EVENT_FW_READY, + ATH12K_QMI_EVENT_COLD_BOOT_CAL_START, + ATH12K_QMI_EVENT_COLD_BOOT_CAL_DONE, ATH12K_QMI_EVENT_REGISTER_DRIVER, ATH12K_QMI_EVENT_UNREGISTER_DRIVER, ATH12K_QMI_EVENT_RECOVERY, ATH12K_QMI_EVENT_FORCE_FW_ASSERT, ATH12K_QMI_EVENT_POWER_UP, ATH12K_QMI_EVENT_POWER_DOWN, + ATH12K_QMI_EVENT_QDSS_TRACE_REQ_MEM = 15, + ATH12K_QMI_EVENT_QDSS_TRACE_SAVE, + ATH12K_QMI_EVENT_M3_DUMP_UPLOAD_REQ = 18, + ATH12K_QMI_EVENT_HOST_CAP, ATH12K_QMI_EVENT_MAX, }; @@ -78,6 +113,13 @@ void *data; }; +struct ath12k_qmi_m3_dump_data { + u32 pdev_id; + u32 size; + u64 timestamp; + char *addr; +}; + struct ath12k_qmi_ce_cfg { const struct ce_pipe_config *tgt_ce; int tgt_ce_len; @@ -138,22 +180,90 @@ struct ath12k_qmi_ce_cfg ce_cfg; struct target_mem_chunk target_mem[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01]; u32 mem_seg_count; + struct target_mem_chunk qdss_mem[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01]; + u32 qdss_mem_seg_len; u32 target_mem_mode; bool target_mem_delayed; u8 cal_done; + u8 cal_timeout; + bool block_event; /* protect by event spinlock */ + u8 num_radios; struct target_info target; struct m3_mem_region m3_mem; unsigned int service_ins_id; + wait_queue_head_t cold_boot_waitq; struct dev_mem_info dev_mem[ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01]; }; -#define QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN 261 +struct ath12k_qmi_m3_dump_upload_req_data { + u32 pdev_id; + u64 addr; + u64 size; +}; + +#define QMI_WLANFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_MSG_V01_MAX_LEN 6167 +#define QMI_WLANFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_MSG_V01_MAX_LEN 7 +#define QMI_WLANFW_QDSS_TRACE_CONFIG_DOWNLOAD_REQ_V01 0x0044 +#define QMI_WLANFW_QDSS_TRACE_CONFIG_DOWNLOAD_RESP_V01 0x0044 + +struct qmi_wlanfw_qdss_trace_config_download_req_msg_v01 { + u8 total_size_valid; + u32 total_size; + u8 seg_id_valid; + u32 seg_id; + u8 data_valid; + u32 data_len; + u8 data[QMI_WLANFW_MAX_DATA_SIZE_V01]; + u8 end_valid; + u8 end; +}; + +struct qmi_wlanfw_qdss_trace_config_download_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + +#define QMI_WLANFW_QDSS_TRACE_MODE_REQ_V01 0x0045 +#define QMI_WLANFW_QDSS_TRACE_MODE_REQ_MSG_V01_MAX_LEN 18 +#define QMI_WLANFW_QDSS_TRACE_MODE_RESP_MSG_V01_MAX_LEN 7 +#define QMI_WLANFW_QDSS_TRACE_MODE_RESP_V01 0x0045 +#define QMI_WLANFW_QDSS_STOP_ALL_TRACE 0x01 + +enum qmi_wlanfw_qdss_trace_mode_enum_v01 { + WLFW_QDSS_TRACE_MODE_ENUM_MIN_VAL_V01 = INT_MIN, + QMI_WLANFW_QDSS_TRACE_OFF_V01 = 0, + QMI_WLANFW_QDSS_TRACE_ON_V01 = 1, + WLFW_QDSS_TRACE_MODE_ENUM_MAX_VAL_V01 = INT_MAX, +}; + +struct qmi_wlanfw_qdss_trace_mode_req_msg_v01 { + u8 mode_valid; + enum qmi_wlanfw_qdss_trace_mode_enum_v01 mode; + u8 option_valid; + u64 option; +}; + +struct qmi_wlanfw_qdss_trace_mode_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + +#define QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN 355 + +struct qmi_wlanfw_m3_dump_upload_done_req_msg_v01 { + u32 pdev_id; + u32 status; +}; + +struct qmi_wlanfw_m3_dump_upload_done_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + #define QMI_WLANFW_HOST_CAP_REQ_V01 0x0034 #define QMI_WLANFW_HOST_CAP_RESP_MSG_V01_MAX_LEN 7 #define QMI_WLFW_HOST_CAP_RESP_V01 0x0034 #define QMI_WLFW_MAX_NUM_GPIO_V01 32 #define QMI_WLANFW_MAX_PLATFORM_NAME_LEN_V01 64 #define QMI_WLANFW_MAX_HOST_DDR_RANGE_SIZE_V01 3 +#define QDSS_ETR_MEM_REGION_TYPE 0x6 struct qmi_wlanfw_host_ddr_range { u64 start; @@ -165,6 +275,7 @@ BDF_MEM_REGION_TYPE = 0x2, M3_DUMP_REGION_TYPE = 0x3, CALDB_MEM_REGION_TYPE = 0x4, + MLO_GLOBAL_MEM_REGION_TYPE = 0x8, PAGEABLE_MEM_REGION_TYPE = 0x9, }; @@ -189,6 +300,7 @@ enum ath12k_qmi_cnss_feature { CNSS_FEATURE_MIN_ENUM_VAL_V01 = INT_MIN, CNSS_QDSS_CFG_MISS_V01 = 3, + CNSS_PCIE_PERST_NO_PULL_V01 = 4, CNSS_MAX_FEATURE_V01 = 64, CNSS_FEATURE_MAX_ENUM_VAL_V01 = INT_MAX, }; @@ -243,13 +355,31 @@ struct wlfw_host_mlo_chip_info_s_v01 mlo_chip_info[QMI_WLFW_MAX_NUM_MLO_CHIPS_V01]; u8 feature_list_valid; u64 feature_list; - + u8 fw_cfg_support_valid; + u8 fw_cfg_support; }; struct qmi_wlanfw_host_cap_resp_msg_v01 { struct qmi_response_type_v01 resp; }; +#define QMI_WLANFW_PHY_CAP_REQ_MSG_V01_MAX_LEN 0 +#define QMI_WLANFW_PHY_CAP_REQ_V01 0x0057 +#define QMI_WLANFW_PHY_CAP_RESP_MSG_V01_MAX_LEN 18 +#define QMI_WLANFW_PHY_CAP_RESP_V01 0x0057 + +struct qmi_wlanfw_phy_cap_req_msg_v01 { + char placeholder; +}; + +struct qmi_wlanfw_phy_cap_resp_msg_v01 { + struct qmi_response_type_v01 resp; + u8 num_phy_valid; + u8 num_phy; + u8 board_id_valid; + u32 board_id; +}; + #define QMI_WLANFW_IND_REGISTER_REQ_MSG_V01_MAX_LEN 54 #define QMI_WLANFW_IND_REGISTER_REQ_V01 0x0020 #define QMI_WLANFW_IND_REGISTER_RESP_MSG_V01_MAX_LEN 18 @@ -281,6 +411,14 @@ u8 xo_cal_enable; u8 cal_done_enable_valid; u8 cal_done_enable; + u8 qdss_trace_req_mem_enable_valid; + u8 qdss_trace_req_mem_enable; + u8 qdss_trace_save_enable_valid; + u8 qdss_trace_save_enable; + u8 qdss_trace_free_enable_valid; + u8 qdss_trace_free_enable; + u8 m3_dump_upload_req_enable_valid; + u8 m3_dump_upload_req_enable; }; struct qmi_wlanfw_ind_register_resp_msg_v01 { @@ -296,6 +434,7 @@ #define QMI_WLANFW_RESPOND_MEM_REQ_V01 0x0036 #define QMI_WLANFW_RESPOND_MEM_RESP_V01 0x0036 #define QMI_WLANFW_MAX_NUM_MEM_CFG_V01 2 +#define QMI_WLFW_QDSS_TRACE_MEM_INFO_REQ_V01 0x0040 #define QMI_WLANFW_MAX_STR_LEN_V01 16 struct qmi_wlanfw_mem_cfg_s_v01 { @@ -312,6 +451,11 @@ QMI_WLANFW_MEM_M3_V01 = 3, QMI_WLANFW_MEM_CAL_V01 = 4, QMI_WLANFW_MEM_DPD_V01 = 5, + QMI_WLANFW_MEM_QDSS_V01 = 6, + QMI_WLANFW_MEM_HANG_DATA_V01 = 7, + QMI_WLANFW_MEM_MLO_GLOBAL_V01 = 8, + QMI_WLANFW_MEM_PAGEABLE_V01 = 9, + QMI_WLANFW_MEM_AFC_V01 = 10, WLANFW_MEM_TYPE_ENUM_MAX_VAL_V01 = INT_MAX, }; @@ -351,10 +495,16 @@ char placeholder; }; +struct qmi_wlanfw_fw_cold_cal_done_ind_msg_v01 { + char placeholder; +}; + #define QMI_WLANFW_CAP_REQ_MSG_V01_MAX_LEN 0 #define QMI_WLANFW_CAP_RESP_MSG_V01_MAX_LEN 207 #define QMI_WLANFW_CAP_REQ_V01 0x0024 #define QMI_WLANFW_CAP_RESP_V01 0x0024 +#define QMI_WLANFW_DEVICE_INFO_REQ_V01 0x004C +#define QMI_WLANFW_DEVICE_INFO_REQ_MSG_V01 0 enum qmi_wlanfw_pipedir_enum_v01 { QMI_WLFW_PIPEDIR_NONE_V01 = 0, @@ -460,12 +610,26 @@ enum qmi_wlanfw_rd_card_chain_cap_v01 rd_card_chain_cap; u8 dev_mem_info_valid; struct qmi_wlanfw_dev_mem_info_s_v01 dev_mem[ATH12K_QMI_WLFW_MAX_DEV_MEM_NUM_V01]; + u8 rxgainlut_support_valid; + u8 rxgainlut_support; }; struct qmi_wlanfw_cap_req_msg_v01 { char placeholder; }; +struct qmi_wlanfw_device_info_req_msg_v01 { + char placeholder; +}; + +struct qmi_wlanfw_device_info_resp_msg_v01 { + struct qmi_response_type_v01 resp; + u64 bar_addr; + u32 bar_size; + u8 bar_addr_valid; + u8 bar_size_valid; +}; + #define QMI_WLANFW_BDF_DOWNLOAD_REQ_MSG_V01_MAX_LEN 6182 #define QMI_WLANFW_BDF_DOWNLOAD_RESP_MSG_V01_MAX_LEN 7 #define QMI_WLANFW_BDF_DOWNLOAD_RESP_V01 0x0025 @@ -500,6 +664,8 @@ #define QMI_WLANFW_M3_INFO_RESP_V01 0x003C #define QMI_WLANFW_M3_INFO_REQ_V01 0x003C +#define QMI_WLANFW_M3_DUMP_UPLOAD_DONE_REQ_MSG_V01_MAX_MSG_LEN 14 + struct qmi_wlanfw_m3_info_req_msg_v01 { u64 addr; u32 size; @@ -558,6 +724,110 @@ struct qmi_response_type_v01 resp; }; +struct qmi_wlanfw_qdss_trace_save_ind_msg_v01 { + u32 source; + u32 total_size; + u8 mem_seg_valid; + u32 mem_seg_len; + struct qmi_wlanfw_mem_seg_resp_s_v01 + mem_seg[ATH12K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01]; + u8 file_name_valid; + char file_name[QMI_WLANFW_MAX_STR_LEN_V01 + 1]; +}; + +#define QDSS_TRACE_SEG_LEN_MAX 32 + +struct qdss_trace_mem_seg { + u64 addr; + u32 size; +}; + +struct ath12k_qmi_event_qdss_trace_save_data { + u32 total_size; + u32 mem_seg_len; + struct qdss_trace_mem_seg mem_seg[QDSS_TRACE_SEG_LEN_MAX]; +}; + +#define QMI_MEM_REGION_TYPE 0 +#define QMI_WLANFW_MEM_WRITE_REQ_V01 0x0031 +#define QMI_WLANFW_MEM_WRITE_REQ_MSG_V01_MAX_MSG_LEN 6163 +#define QMI_WLANFW_MEM_READ_REQ_V01 0x0030 +#define QMI_WLANFW_MEM_READ_REQ_MSG_V01_MAX_MSG_LEN 21 + +struct qmi_wlanfw_mem_read_req_msg_v01 { + u32 offset; + u32 mem_type; + u32 data_len; +}; + +struct qmi_wlanfw_mem_read_resp_msg_v01 { + struct qmi_response_type_v01 resp; + u8 data_valid; + u32 data_len; + u8 data[QMI_WLANFW_MAX_DATA_SIZE_V01]; +}; + +struct qmi_wlanfw_mem_write_req_msg_v01 { + u32 offset; + u32 mem_type; + u32 data_len; + u8 data[QMI_WLANFW_MAX_DATA_SIZE_V01]; +}; + +struct qmi_wlanfw_mem_write_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + +int ath12k_qmi_mem_read(struct ath12k_base *ab, u32 mem_addr, void *mem_value,size_t count); + +int ath12k_qmi_mem_write(struct ath12k_base *ab, u32 mem_addr, void* mem_value, size_t count); + +#define QMI_WLFW_INI_REQ_V01 0x002F +#define WLFW_INI_REQ_MSG_V01_MAX_MSG_LEN 4 + +struct wlfw_ini_req_msg_v01 { + u8 enablefwlog_valid; + u8 enablefwlog; +}; + +struct wlfw_ini_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + +struct qmi_wlanfw_m3_dump_upload_req_ind_msg_v01 { + u32 pdev_id; + u64 addr; + u64 size; +}; + +#define QMI_WLANFW_CFG_DOWNLOAD_REQ_V01 0x0056 +#define QMI_WLANFW_CFG_DOWNLOAD_RESP_V01 0x0056 +enum wlanfw_cfg_type_v01 { + WLANFW_CFG_TYPE_MIN_VAL_V01 = INT_MIN, + WLANFW_CFG_FILE_V01 = 0, + WLANFW_CFG_TYPE_MAX_VAL_V01 = INT_MAX, +}; + +#define WLANFW_CFG_DOWNLOAD_REQ_MSG_V01_MAX_MSG_LEN 6174 +struct wlanfw_cfg_download_req_msg_v01 { + u8 file_type_valid; + enum wlanfw_cfg_type_v01 file_type; + u8 total_size_valid; + u32 total_size; + u8 seg_id_valid; + u32 seg_id; + u8 data_valid; + u32 data_len; + u8 data[QMI_WLANFW_MAX_DATA_SIZE_V01]; + u8 end_valid; + u8 end; +}; + +#define WLANFW_CFG_DOWNLOAD_RESP_MSG_V01_MAX_MSG_LEN 7 +struct wlanfw_cfg_download_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + int ath12k_qmi_firmware_start(struct ath12k_base *ab, u32 mode); void ath12k_qmi_firmware_stop(struct ath12k_base *ab); @@ -566,4 +836,29 @@ void ath12k_qmi_deinit_service(struct ath12k_base *ab); int ath12k_qmi_init_service(struct ath12k_base *ab); +int ath12k_send_qdss_trace_mode_req(struct ath12k_base *ab, + enum qmi_wlanfw_qdss_trace_mode_enum_v01 mode); +int ath12k_qmi_fwreset_from_cold_boot(struct ath12k_base *ab); +int ath12k_enable_fwlog(struct ath12k_base *ab); +int ath12k_qmi_m3_dump_upload_done_ind_send(struct ath12k_base *ab, + u32 pdev_id, int status); +void ath12k_qmi_free_target_mem_chunk(struct ath12k_base *ab); +void ath12k_qmi_trigger_host_cap(struct ath12k_base *ab); +int ath12k_qmi_mlo_global_snapshot_mem_init(struct ath12k_base *ab); +void ath12k_free_mlo_mgmt_rx_reo_per_link_info( + struct ath12k_host_mlo_glb_rx_reo_snapshot_info *snapshot_info); + +static inline void ath12k_qmi_set_event_block(struct ath12k_qmi *qmi, bool block) +{ + lockdep_assert_held(&qmi->event_lock); + + qmi->block_event = block; +} + +static inline bool ath12k_qmi_get_event_block(struct ath12k_qmi *qmi) +{ + lockdep_assert_held(&qmi->event_lock); + + return qmi->block_event; +} #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/reg.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/reg.c --- linux-6.4/drivers/net/wireless/ath/ath12k/reg.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/reg.c 2024-04-22 13:40:50.295868965 +0200 @@ -28,11 +28,37 @@ } }; -static bool ath12k_regdom_changes(struct ath12k *ar, char *alpha2) +enum wmi_reg_6g_ap_type +ath12k_ieee80211_ap_pwr_type_convert(enum ieee80211_ap_reg_power power_type) +{ + switch (power_type) { + case IEEE80211_REG_LPI_AP: + return WMI_REG_INDOOR_AP; + case IEEE80211_REG_SP_AP: + return WMI_REG_STD_POWER_AP; + case IEEE80211_REG_VLP_AP: + return WMI_REG_VLP_AP; + default: + return WMI_REG_MAX_AP_TYPE; + } +} + +static void ath12k_copy_reg_rule(struct ath12k_reg_freq *ath12k_reg_freq, + struct ath12k_reg_rule *reg_rule) +{ + if (!ath12k_reg_freq->start_freq) + ath12k_reg_freq->start_freq = reg_rule->start_freq; + + if ((!ath12k_reg_freq->end_freq) || + (ath12k_reg_freq->end_freq < reg_rule->end_freq)) + ath12k_reg_freq->end_freq = reg_rule->end_freq; +} + +static bool ath12k_regdom_changes(struct ath12k_hw *ah, char *alpha2) { const struct ieee80211_regdomain *regd; - regd = rcu_dereference_rtnl(ar->hw->wiphy->regd); + regd = rcu_dereference_rtnl(ah->hw->wiphy->regd); /* This can happen during wiphy registration where the previous * user request is received before we update the regd received * from firmware. @@ -44,38 +70,11 @@ } static void -ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) +ath12k_reg_send_request(struct ath12k *ar, struct regulatory_request *request) { - struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); struct ath12k_wmi_init_country_arg arg; - struct ath12k *ar = hw->priv; int ret; - ath12k_dbg(ar->ab, ATH12K_DBG_REG, - "Regulatory Notification received for %s\n", wiphy_name(wiphy)); - - /* Currently supporting only General User Hints. Cell base user - * hints to be handled later. - * Hints from other sources like Core, Beacons are not expected for - * self managed wiphy's - */ - if (!(request->initiator == NL80211_REGDOM_SET_BY_USER && - request->user_reg_hint_type == NL80211_USER_REG_HINT_USER)) { - ath12k_warn(ar->ab, "Unexpected Regulatory event for this wiphy\n"); - return; - } - - if (!IS_ENABLED(CONFIG_ATH_REG_DYNAMIC_USER_REG_HINTS)) { - ath12k_dbg(ar->ab, ATH12K_DBG_REG, - "Country Setting is not allowed\n"); - return; - } - - if (!ath12k_regdom_changes(ar, request->alpha2)) { - ath12k_dbg(ar->ab, ATH12K_DBG_REG, "Country is already set\n"); - return; - } - /* Set the country code to the firmware and wait for * the WMI_REG_CHAN_LIST_CC EVENT for updating the * reg info @@ -84,18 +83,104 @@ memcpy(&arg.cc_info.alpha2, request->alpha2, 2); arg.cc_info.alpha2[2] = 0; + ar->ab->regd_change_user_request[ar->pdev_idx] = true; ret = ath12k_wmi_send_init_country_cmd(ar, &arg); if (ret) ath12k_warn(ar->ab, "INIT Country code set to fw failed : %d\n", ret); } +static bool ath12k_reg_validate_pdev_state(struct ath12k *ar) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_pdev *pdev; + struct ath12k *tmp_ar; + int i; + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + if (!pdev) + continue; + + tmp_ar = pdev->ar; + if (tmp_ar) { + mutex_lock(&tmp_ar->conf_mutex); + if ((tmp_ar->state == ATH12K_STATE_ON || + tmp_ar->state == ATH12K_STATE_RESTARTED) && + tmp_ar->num_started_vdevs) { + if (tmp_ar == ar) + ath12k_warn(ab, "%s has active interface, please bring down to set country code", + wiphy_name(ar->ah->hw->wiphy)); + mutex_unlock(&tmp_ar->conf_mutex); + return false; + } + mutex_unlock(&tmp_ar->conf_mutex); + } + } + return true; +} + +static bool ath12k_reg_validate_ah_state(struct ath12k_hw *ah) +{ + struct ath12k *ar = ah->radio; + int i; + + lockdep_assert_held(&ah->conf_mutex); + + for (i = 0; i < ah->num_radio; i++, ar++) { + /* The SET_INIT_COUNTRY command should not be sent to firmware while any vdev is active + * Also it does not make sense to give the command for certain pdev's alone. + * Hence check all the pdev's if any have an active vdev before sending the command. + */ + if (!ath12k_reg_validate_pdev_state(ar)) + return false; + } + + return true; +} + +void ath12k_reg_notifier(struct wiphy *wiphy, struct regulatory_request *request) +{ + struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy); + struct ath12k_hw *ah = hw->priv; + struct ath12k *ar; + int i; + + /* Currently supporting only General User Hints. Cell base user + * hints to be handled later. + * Hints from other sources like Core, Beacons are not expected for + * self managed wiphy's + */ + if (!(request->initiator == NL80211_REGDOM_SET_BY_USER && + request->user_reg_hint_type == NL80211_USER_REG_HINT_USER)) + return; + + if (!IS_ENABLED(CONFIG_ATH_REG_DYNAMIC_USER_REG_HINTS)) + return; + + mutex_lock(&ah->conf_mutex); + if (!ath12k_regdom_changes(ah, request->alpha2)) + goto exit; + + if (!ath12k_reg_validate_ah_state(ah)) + goto exit; + + ah->regd_updated = false; + ar = ah->radio; + + /* Send the reg change request to all the radios */ + for (i = 0; i < ah->num_radio; i++, ar++) + ath12k_reg_send_request(ar, request); +exit: + mutex_unlock(&ah->conf_mutex); +} + int ath12k_reg_update_chan_list(struct ath12k *ar) { struct ieee80211_supported_band **bands; struct ath12k_wmi_scan_chan_list_arg *arg; struct ieee80211_channel *channel; - struct ieee80211_hw *hw = ar->hw; + struct ieee80211_hw *hw = ar->ah->hw; struct ath12k_wmi_channel_arg *ch; enum nl80211_band band; int num_channels = 0; @@ -103,7 +188,7 @@ bands = hw->wiphy->bands; for (band = 0; band < NUM_NL80211_BANDS; band++) { - if (!bands[band]) + if (!(ar->mac.sbands[band].channels && bands[band])) continue; for (i = 0; i < bands[band]->n_channels; i++) { @@ -111,12 +196,20 @@ IEEE80211_CHAN_DISABLED) continue; + if (band == NL80211_BAND_5GHZ) + if (bands[band]->channels[i].center_freq < + ar->chan_info.low_freq || + bands[band]->channels[i].center_freq > + ar->chan_info.high_freq) + continue; num_channels++; } } - if (WARN_ON(!num_channels)) - return -EINVAL; + if (!num_channels) { + ath12k_warn(ar->ab, "pdev is not supported for this country\n"); + return -ENOTSUPP; + } arg = kzalloc(struct_size(arg, channel, num_channels), GFP_KERNEL); @@ -129,7 +222,7 @@ ch = arg->channel; for (band = 0; band < NUM_NL80211_BANDS; band++) { - if (!bands[band]) + if (!(ar->mac.sbands[band].channels && bands[band])) continue; for (i = 0; i < bands[band]->n_channels; i++) { @@ -138,6 +231,13 @@ if (channel->flags & IEEE80211_CHAN_DISABLED) continue; + if (band == NL80211_BAND_5GHZ) + if (bands[band]->channels[i].center_freq < + ar->chan_info.low_freq || + bands[band]->channels[i].center_freq > + ar->chan_info.high_freq) + continue; + /* TODO: Set to true/false based on some condition? */ ch->allow_ht = true; ch->allow_vht = true; @@ -197,18 +297,97 @@ sizeof(struct ieee80211_reg_rule)); } +int ath12k_reg_get_num_chans_in_band(struct ath12k *ar, + struct ieee80211_supported_band *band, + u32 freq_low, u32 freq_high) +{ + int i, count = 0; + + if (!(freq_low && freq_high) || !band) + return 0; + + for (i = 0; i < band->n_channels; i++) { + if (band->channels[i].center_freq >= freq_low && + band->channels[i].center_freq <= freq_high) + count++; + } + + return count; +} + int ath12k_regd_update(struct ath12k *ar, bool init) { struct ieee80211_regdomain *regd, *regd_copy = NULL; int ret, regd_len, pdev_id; struct ath12k_base *ab; + struct ath12k_hw *ah; + struct ath12k_wmi_hal_reg_capabilities_ext_arg *reg_cap; + int i; + u32 phy_id, freq_low, freq_high, supported_bands, band; ab = ar->ab; + ah = ar->ah; + + mutex_lock(&ah->conf_mutex); + + supported_bands = ar->pdev->cap.supported_bands; + if (supported_bands & WMI_HOST_WLAN_2G_CAP) + band = NL80211_BAND_2GHZ; + else if(supported_bands & WMI_HOST_WLAN_5G_CAP && !ar->supports_6ghz) + band = NL80211_BAND_5GHZ; + else if(supported_bands & WMI_HOST_WLAN_5G_CAP && ar->supports_6ghz) + band = NL80211_BAND_6GHZ; + + reg_cap = &ab->hal_reg_cap[ar->pdev_idx]; + + if (ab->hw_params->single_pdev_only && !ar->supports_6ghz) { + phy_id = ar->pdev->cap.band[band].phy_id; + reg_cap = &ab->hal_reg_cap[phy_id]; + } + + /* Possible that due to reg change, current limits for supported + * frequency changed. Update that + */ + if (supported_bands & WMI_HOST_WLAN_2G_CAP) { + freq_low = max(reg_cap->low_2ghz_chan, ab->reg_freq_2g.start_freq); + freq_high = min(reg_cap->high_2ghz_chan, ab->reg_freq_2g.end_freq); + } else if(supported_bands & WMI_HOST_WLAN_5G_CAP && !ar->supports_6ghz) { + freq_low = max(reg_cap->low_5ghz_chan, ab->reg_freq_5g.start_freq); + freq_high = min(reg_cap->high_5ghz_chan, ab->reg_freq_5g.end_freq); + } else if(supported_bands & WMI_HOST_WLAN_5G_CAP && ar->supports_6ghz) { + freq_low = max(reg_cap->low_5ghz_chan, ab->reg_freq_6g.start_freq); + freq_high = min(reg_cap->high_5ghz_chan, ab->reg_freq_6g.end_freq); + } + + ar->chan_info.low_freq = freq_low; + ar->chan_info.high_freq = freq_high; + ar->chan_info.num_channels = ath12k_reg_get_num_chans_in_band(ar, + &ar->mac.sbands[band], + freq_low, + freq_high); + + ath12k_dbg(ab, ATH12K_DBG_REG, "pdev %u reg updated freq limits %u->%u MHz no of channel %u\n", + ar->pdev->pdev_id, ar->chan_info.low_freq, + ar->chan_info.high_freq, ar->chan_info.num_channels); + + /* Since FW provides reg rules which are similar for 2G/5G pdev + * but since 6G pdev has superset of all rules including rules for + * all bands, we prefer 6G pdev. If 6GHz pdev was part of the + * ath12k_hw, wait for the 6GHz pdev, else pick the first pdev + * which calls this function and use its regd to update global + * hw regd. The regd_updated flag set at the end will not allow + * any further updates. + */ + if ((ah->supported_band_mask & BIT(NL80211_BAND_6GHZ)) && !ar->supports_6ghz) { + mutex_unlock(&ah->conf_mutex); + return 0; + } + pdev_id = ar->pdev_idx; spin_lock_bh(&ab->base_lock); - if (init) { + if (init && !ab->new_regd[pdev_id]) { /* Apply the regd received during init through * WMI_REG_CHAN_LIST_CC event. In case of failure to * receive the regd, initialize with a default world @@ -245,25 +424,38 @@ goto err; } - rtnl_lock(); - wiphy_lock(ar->hw->wiphy); - ret = regulatory_set_wiphy_regd_sync(ar->hw->wiphy, regd_copy); - wiphy_unlock(ar->hw->wiphy); - rtnl_unlock(); + ret = regulatory_set_wiphy_regd(ah->hw->wiphy, regd_copy); kfree(regd_copy); if (ret) goto err; + ah->regd_updated = true; + + /* Apply the new regd to all the radios, this is expected to be received only once + * since we check for ah->regd_updated and allow here only once + */ + ar = ah->radio; + ab = ar->ab; + + for (i = 0; i < ah->num_radio; i++) { + ab = ar->ab; + if (ar->state == ATH12K_STATE_ON) { ret = ath12k_reg_update_chan_list(ar); - if (ret) + if (ret && ret == -ENOTSUPP) + continue; + else if (ret) goto err; } + ar++; + } + mutex_unlock(&ah->conf_mutex); return 0; err: + mutex_unlock(&ah->conf_mutex); ath12k_warn(ab, "failed to perform regd update : %d\n", ret); return ret; } @@ -276,16 +468,45 @@ case ATH12K_DFS_REG_CN: return NL80211_DFS_FCC; case ATH12K_DFS_REG_ETSI: - case ATH12K_DFS_REG_KR: return NL80211_DFS_ETSI; case ATH12K_DFS_REG_MKK: case ATH12K_DFS_REG_MKK_N: + case ATH12K_DFS_REG_KR: return NL80211_DFS_JP; default: return NL80211_DFS_UNSET; } } +static u32 ath12k_update_bw_reg_flags(u16 max_bw) +{ + u32 flags = 0; + switch (max_bw) { + case 20: + flags = (NL80211_RRF_NO_HT40 | + NL80211_RRF_NO_80MHZ | + NL80211_RRF_NO_160MHZ | + NL80211_RRF_NO_320MHZ); + break; + case 40: + flags = (NL80211_RRF_NO_80MHZ | + NL80211_RRF_NO_160MHZ | + NL80211_RRF_NO_320MHZ ); + break; + case 80: + flags = (NL80211_RRF_NO_160MHZ | + NL80211_RRF_NO_320MHZ); + break; + case 160: + flags = NL80211_RRF_NO_320MHZ; + break; + default: + break; + } + + return flags; +} + static u32 ath12k_map_fw_reg_flags(u16 reg_flags) { u32 flags = 0; @@ -314,128 +535,22 @@ return flags; } -static bool -ath12k_reg_can_intersect(struct ieee80211_reg_rule *rule1, - struct ieee80211_reg_rule *rule2) -{ - u32 start_freq1, end_freq1; - u32 start_freq2, end_freq2; - - start_freq1 = rule1->freq_range.start_freq_khz; - start_freq2 = rule2->freq_range.start_freq_khz; - - end_freq1 = rule1->freq_range.end_freq_khz; - end_freq2 = rule2->freq_range.end_freq_khz; - - if ((start_freq1 >= start_freq2 && - start_freq1 < end_freq2) || - (start_freq2 > start_freq1 && - start_freq2 < end_freq1)) - return true; - - /* TODO: Should we restrict intersection feasibility - * based on min bandwidth of the intersected region also, - * say the intersected rule should have a min bandwidth - * of 20MHz? - */ - - return false; -} - -static void ath12k_reg_intersect_rules(struct ieee80211_reg_rule *rule1, - struct ieee80211_reg_rule *rule2, - struct ieee80211_reg_rule *new_rule) -{ - u32 start_freq1, end_freq1; - u32 start_freq2, end_freq2; - u32 freq_diff, max_bw; - - start_freq1 = rule1->freq_range.start_freq_khz; - start_freq2 = rule2->freq_range.start_freq_khz; - - end_freq1 = rule1->freq_range.end_freq_khz; - end_freq2 = rule2->freq_range.end_freq_khz; - - new_rule->freq_range.start_freq_khz = max_t(u32, start_freq1, - start_freq2); - new_rule->freq_range.end_freq_khz = min_t(u32, end_freq1, end_freq2); - - freq_diff = new_rule->freq_range.end_freq_khz - - new_rule->freq_range.start_freq_khz; - max_bw = min_t(u32, rule1->freq_range.max_bandwidth_khz, - rule2->freq_range.max_bandwidth_khz); - new_rule->freq_range.max_bandwidth_khz = min_t(u32, max_bw, freq_diff); - - new_rule->power_rule.max_antenna_gain = - min_t(u32, rule1->power_rule.max_antenna_gain, - rule2->power_rule.max_antenna_gain); - - new_rule->power_rule.max_eirp = min_t(u32, rule1->power_rule.max_eirp, - rule2->power_rule.max_eirp); - - /* Use the flags of both the rules */ - new_rule->flags = rule1->flags | rule2->flags; - - /* To be safe, lts use the max cac timeout of both rules */ - new_rule->dfs_cac_ms = max_t(u32, rule1->dfs_cac_ms, - rule2->dfs_cac_ms); -} - -static struct ieee80211_regdomain * -ath12k_regd_intersect(struct ieee80211_regdomain *default_regd, - struct ieee80211_regdomain *curr_regd) +static u32 ath12k_map_fw_phy_flags(u32 phy_flags) { - u8 num_old_regd_rules, num_curr_regd_rules, num_new_regd_rules; - struct ieee80211_reg_rule *old_rule, *curr_rule, *new_rule; - struct ieee80211_regdomain *new_regd = NULL; - u8 i, j, k; + u32 flags = 0; - num_old_regd_rules = default_regd->n_reg_rules; - num_curr_regd_rules = curr_regd->n_reg_rules; - num_new_regd_rules = 0; + if (phy_flags & ATH12K_REG_PHY_BITMAP_NO11AX) + flags |= NL80211_RRF_NO_HE; - /* Find the number of intersecting rules to allocate new regd memory */ - for (i = 0; i < num_old_regd_rules; i++) { - old_rule = default_regd->reg_rules + i; - for (j = 0; j < num_curr_regd_rules; j++) { - curr_rule = curr_regd->reg_rules + j; + if (phy_flags & ATH12K_REG_PHY_BITMAP_NO11BE) + flags |= NL80211_RRF_NO_EHT; - if (ath12k_reg_can_intersect(old_rule, curr_rule)) - num_new_regd_rules++; - } + return flags; } - if (!num_new_regd_rules) - return NULL; - - new_regd = kzalloc(sizeof(*new_regd) + (num_new_regd_rules * - sizeof(struct ieee80211_reg_rule)), - GFP_ATOMIC); - - if (!new_regd) - return NULL; - - /* We set the new country and dfs region directly and only trim - * the freq, power, antenna gain by intersecting with the - * default regdomain. Also MAX of the dfs cac timeout is selected. - */ - new_regd->n_reg_rules = num_new_regd_rules; - memcpy(new_regd->alpha2, curr_regd->alpha2, sizeof(new_regd->alpha2)); - new_regd->dfs_region = curr_regd->dfs_region; - new_rule = new_regd->reg_rules; - - for (i = 0, k = 0; i < num_old_regd_rules; i++) { - old_rule = default_regd->reg_rules + i; - for (j = 0; j < num_curr_regd_rules; j++) { - curr_rule = curr_regd->reg_rules + j; - - if (ath12k_reg_can_intersect(old_rule, curr_rule)) - ath12k_reg_intersect_rules(old_rule, curr_rule, - (new_rule + k++)); - } - } - return new_regd; -} +/* TODO: API ath12k_reg_can_intersect() to handle whether two + * ieee80211_reg_rules can intersect or not based on their + * frequency range and power mode. */ static const char * ath12k_reg_get_regdom_str(enum nl80211_dfs_regions dfs_region) @@ -473,13 +588,15 @@ static void ath12k_reg_update_rule(struct ieee80211_reg_rule *reg_rule, u32 start_freq, u32 end_freq, u32 bw, u32 ant_gain, u32 reg_pwr, - u32 reg_flags) + s8 psd, u32 reg_flags, + int pwr_mode) { reg_rule->freq_range.start_freq_khz = MHZ_TO_KHZ(start_freq); reg_rule->freq_range.end_freq_khz = MHZ_TO_KHZ(end_freq); reg_rule->freq_range.max_bandwidth_khz = MHZ_TO_KHZ(bw); reg_rule->power_rule.max_antenna_gain = DBI_TO_MBI(ant_gain); reg_rule->power_rule.max_eirp = DBM_TO_MBM(reg_pwr); + reg_rule->psd = psd; reg_rule->flags = reg_flags; } @@ -501,7 +618,7 @@ ath12k_reg_update_rule(regd->reg_rules + i, reg_rule->start_freq, ETSI_WEATHER_RADAR_BAND_LOW, bw, reg_rule->ant_gain, reg_rule->reg_power, - flags); + reg_rule->psd_eirp, flags, 0); ath12k_dbg(ab, ATH12K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n", @@ -523,7 +640,7 @@ ath12k_reg_update_rule(regd->reg_rules + i, ETSI_WEATHER_RADAR_BAND_LOW, end_freq, bw, reg_rule->ant_gain, reg_rule->reg_power, - flags); + reg_rule->psd_eirp, flags, 0); regd->reg_rules[i].dfs_cac_ms = ETSI_WEATHER_RADAR_BAND_CAC_TIMEOUT; @@ -548,7 +665,7 @@ ath12k_reg_update_rule(regd->reg_rules + i, ETSI_WEATHER_RADAR_BAND_HIGH, reg_rule->end_freq, bw, reg_rule->ant_gain, reg_rule->reg_power, - flags); + reg_rule->psd_eirp, flags, 0); ath12k_dbg(ab, ATH12K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n", @@ -562,15 +679,17 @@ struct ieee80211_regdomain * ath12k_reg_build_regd(struct ath12k_base *ab, - struct ath12k_reg_info *reg_info, bool intersect) + struct ath12k_reg_info *reg_info, + enum ieee80211_ap_reg_power power_type) { - struct ieee80211_regdomain *tmp_regd, *default_regd, *new_regd = NULL; + struct ieee80211_regdomain *new_regd = NULL; struct ath12k_reg_rule *reg_rule; u8 i = 0, j = 0, k = 0; u8 num_rules; u16 max_bw; - u32 flags; + u32 flags = 0; char alpha2[3]; + int pwr_mode; num_rules = reg_info->num_5g_reg_rules + reg_info->num_2g_reg_rules; @@ -582,50 +701,59 @@ num_rules += reg_info->num_6g_reg_rules_ap[WMI_REG_INDOOR_AP]; if (!num_rules) - goto ret; + return new_regd; /* Add max additional rules to accommodate weather radar band */ if (reg_info->dfs_region == ATH12K_DFS_REG_ETSI) num_rules += 2; - tmp_regd = kzalloc(sizeof(*tmp_regd) + + new_regd = kzalloc(sizeof(*new_regd) + (num_rules * sizeof(struct ieee80211_reg_rule)), GFP_ATOMIC); - if (!tmp_regd) - goto ret; + if (!new_regd) + return new_regd; - memcpy(tmp_regd->alpha2, reg_info->alpha2, REG_ALPHA2_LEN + 1); + memcpy(new_regd->alpha2, reg_info->alpha2, REG_ALPHA2_LEN + 1); memcpy(alpha2, reg_info->alpha2, REG_ALPHA2_LEN + 1); alpha2[2] = '\0'; - tmp_regd->dfs_region = ath12k_map_fw_dfs_region(reg_info->dfs_region); + new_regd->dfs_region = ath12k_map_fw_dfs_region(reg_info->dfs_region); ath12k_dbg(ab, ATH12K_DBG_REG, "\r\nCountry %s, CFG Regdomain %s FW Regdomain %d, num_reg_rules %d\n", - alpha2, ath12k_reg_get_regdom_str(tmp_regd->dfs_region), + alpha2, ath12k_reg_get_regdom_str(new_regd->dfs_region), reg_info->dfs_region, num_rules); /* Update reg_rules[] below. Firmware is expected to * send these rules in order(2G rules first and then 5G) */ - for (; i < num_rules; i++) { + for (i = 0, j = 0; i < num_rules; i++) { if (reg_info->num_2g_reg_rules && (i < reg_info->num_2g_reg_rules)) { reg_rule = reg_info->reg_rules_2g_ptr + i; max_bw = min_t(u16, reg_rule->max_bw, reg_info->max_bw_2g); - flags = 0; + flags = ath12k_update_bw_reg_flags(reg_info->max_bw_2g); + pwr_mode = 0; + ath12k_copy_reg_rule(&ab->reg_freq_2g, reg_rule); } else if (reg_info->num_5g_reg_rules && (j < reg_info->num_5g_reg_rules)) { reg_rule = reg_info->reg_rules_5g_ptr + j++; max_bw = min_t(u16, reg_rule->max_bw, reg_info->max_bw_5g); - + flags = NL80211_RRF_AUTO_BW | ath12k_update_bw_reg_flags(reg_info->max_bw_5g); /* FW doesn't pass NL80211_RRF_AUTO_BW flag for * BW Auto correction, we can enable this by default * for all 5G rules here. The regulatory core performs * BW correction if required and applies flags as * per other BW rule flags we pass from here */ - flags = NL80211_RRF_AUTO_BW; + if ((reg_rule->start_freq == 5490) && (reg_rule->end_freq == 5730)) + flags &= ~NL80211_RRF_NO_320MHZ; + + pwr_mode = 0; + if (reg_rule->end_freq <= ATH12K_MAX_5G_FREQ) + ath12k_copy_reg_rule(&ab->reg_freq_5g, reg_rule); + else if (reg_rule->start_freq >= ATH12K_MIN_6G_FREQ) + ath12k_copy_reg_rule(&ab->reg_freq_6g, reg_rule); } else if (reg_info->is_ext_reg_event && reg_info->num_6g_reg_rules_ap[WMI_REG_INDOOR_AP] && (k < reg_info->num_6g_reg_rules_ap[WMI_REG_INDOOR_AP])) { @@ -633,17 +761,25 @@ max_bw = min_t(u16, reg_rule->max_bw, reg_info->max_bw_6g_ap[WMI_REG_INDOOR_AP]); flags = NL80211_RRF_AUTO_BW; + if (reg_rule->psd_flag) + flags |= NL80211_RRF_PSD; + + if (reg_rule->end_freq <= ATH12K_MAX_6G_FREQ) + ath12k_copy_reg_rule(&ab->reg_freq_6g, reg_rule); + else if (reg_rule->start_freq >= ATH12K_MIN_6G_FREQ) + ath12k_copy_reg_rule(&ab->reg_freq_6g, reg_rule); } else { break; } flags |= ath12k_map_fw_reg_flags(reg_rule->flags); + flags |= ath12k_map_fw_phy_flags(reg_info->phybitmap); - ath12k_reg_update_rule(tmp_regd->reg_rules + i, + ath12k_reg_update_rule(new_regd->reg_rules + i, reg_rule->start_freq, reg_rule->end_freq, max_bw, reg_rule->ant_gain, reg_rule->reg_power, - flags); + reg_rule->psd_eirp, flags, pwr_mode); /* Update dfs cac timeout if the dfs domain is ETSI and the * new rule covers weather radar band. @@ -654,7 +790,7 @@ reg_info->dfs_region == ATH12K_DFS_REG_ETSI && (reg_rule->end_freq > ETSI_WEATHER_RADAR_BAND_LOW && reg_rule->start_freq < ETSI_WEATHER_RADAR_BAND_HIGH)){ - ath12k_reg_update_weather_radar_band(ab, tmp_regd, + ath12k_reg_update_weather_radar_band(ab, new_regd, reg_rule, &i, flags, max_bw); continue; @@ -664,37 +800,20 @@ ath12k_dbg(ab, ATH12K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d) (%d, %d)\n", i + 1, reg_rule->start_freq, reg_rule->end_freq, max_bw, reg_rule->ant_gain, reg_rule->reg_power, - tmp_regd->reg_rules[i].dfs_cac_ms, + new_regd->reg_rules[i].dfs_cac_ms, flags, reg_rule->psd_flag, reg_rule->psd_eirp); } else { ath12k_dbg(ab, ATH12K_DBG_REG, "\t%d. (%d - %d @ %d) (%d, %d) (%d ms) (FLAGS %d)\n", i + 1, reg_rule->start_freq, reg_rule->end_freq, max_bw, reg_rule->ant_gain, reg_rule->reg_power, - tmp_regd->reg_rules[i].dfs_cac_ms, + new_regd->reg_rules[i].dfs_cac_ms, flags); } } - tmp_regd->n_reg_rules = i; + new_regd->n_reg_rules = i; - if (intersect) { - default_regd = ab->default_regd[reg_info->phy_id]; - - /* Get a new regd by intersecting the received regd with - * our default regd. - */ - new_regd = ath12k_regd_intersect(default_regd, tmp_regd); - kfree(tmp_regd); - if (!new_regd) { - ath12k_warn(ab, "Unable to create intersected regdomain\n"); - goto ret; - } - } else { - new_regd = tmp_regd; - } - -ret: return new_regd; } @@ -715,12 +834,6 @@ } } -void ath12k_reg_init(struct ath12k *ar) -{ - ar->hw->wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED; - ar->hw->wiphy->reg_notifier = ath12k_reg_notifier; -} - void ath12k_reg_free(struct ath12k_base *ab) { int i; diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/reg.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/reg.h --- linux-6.4/drivers/net/wireless/ath/ath12k/reg.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/reg.h 2024-04-22 13:40:50.295868965 +0200 @@ -25,6 +25,17 @@ ATH12K_DFS_REG_UNDEF, }; +/* Phybitmap supported in Firmware */ +enum ath12k_reg_phy_bitmap { + ATH12K_REG_PHY_BITMAP_NO11A = 0x0001, + ATH12K_REG_PHY_BITMAP_NO11B = 0x0002, + ATH12K_REG_PHY_BITMAP_NO11G = 0x0004, + ATH12K_REG_PHY_BITMAP_NO11N = 0x0008, + ATH12K_REG_PHY_BITMAP_NO11AC = 0x0010, + ATH12K_REG_PHY_BITMAP_NO11AX = 0x0020, + ATH12K_REG_PHY_BITMAP_NO11BE = 0x0040, +}; + enum ath12k_reg_cc_code { REG_SET_CC_STATUS_PASS = 0, REG_CURRENT_ALPHA2_NOT_FOUND = 1, @@ -42,7 +53,7 @@ u8 ant_gain; u16 flags; bool psd_flag; - u16 psd_eirp; + s8 psd_eirp; }; struct ath12k_reg_info { @@ -83,13 +94,19 @@ [WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE]; }; -void ath12k_reg_init(struct ath12k *ar); +void ath12k_reg_notifier(struct wiphy *wiphy, + struct regulatory_request *request); void ath12k_reg_free(struct ath12k_base *ab); void ath12k_regd_update_work(struct work_struct *work); struct ieee80211_regdomain *ath12k_reg_build_regd(struct ath12k_base *ab, struct ath12k_reg_info *reg_info, - bool intersect); + enum ieee80211_ap_reg_power power_type); +enum wmi_reg_6g_ap_type +ath12k_ieee80211_ap_pwr_type_convert(enum ieee80211_ap_reg_power power_type); int ath12k_regd_update(struct ath12k *ar, bool init); int ath12k_reg_update_chan_list(struct ath12k *ar); +int ath12k_reg_get_num_chans_in_band(struct ath12k *ar, + struct ieee80211_supported_band *band, + u32 freq_low, u32 freq_high); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/rx_desc.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/rx_desc.h --- linux-6.4/drivers/net/wireless/ath/ath12k/rx_desc.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/rx_desc.h 2024-04-22 13:40:50.295868965 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_RX_DESC_H #define ATH12K_RX_DESC_H @@ -59,6 +59,8 @@ #define RX_MPDU_START_INFO3_AST_LOOKUP_VALID BIT(13) #define RX_MPDU_START_INFO3_RANGING BIT(14) +#define RX_MPDU_START_SW_PEER_ID_PEER GENMASK(13, 0) + #define RX_MPDU_START_INFO4_MPDU_FCTRL_VALID BIT(0) #define RX_MPDU_START_INFO4_MPDU_DUR_VALID BIT(1) #define RX_MPDU_START_INFO4_MAC_ADDR1_VALID BIT(2) @@ -117,6 +119,28 @@ #define RX_MPDU_START_INFO8_AUTH_TO_SEND_WDS BIT(0) struct rx_mpdu_start_qcn9274 { + __le32 info1; + __le32 pn[4]; + __le32 info2; + __le32 peer_meta_data; + __le16 info3; + __le16 phy_ppdu_id; + __le16 ast_index; + __le16 sw_peer_id; + __le32 info4; + __le32 info5; + __le32 info6; + __le16 frame_ctrl; + __le16 duration; + u8 addr1[ETH_ALEN]; + u8 addr2[ETH_ALEN]; + u8 addr3[ETH_ALEN]; + __le16 seq_ctrl; + u8 addr4[ETH_ALEN]; + __le16 qos_ctrl; +} __packed; + +struct rx_mpdu_start_wcn7850 { __le32 info0; __le32 reo_queue_desc_lo; __le32 info1; @@ -582,6 +606,8 @@ RX_MSDU_START_PKT_TYPE_11N, RX_MSDU_START_PKT_TYPE_11AC, RX_MSDU_START_PKT_TYPE_11AX, + RX_MSDU_START_PKT_TYPE_11BA, + RX_MSDU_START_PKT_TYPE_11BE, }; enum rx_msdu_start_sgi { @@ -608,6 +634,10 @@ RX_MSDU_START_RECEPTION_TYPE_UL_MU_OFDMA_MIMO, }; +#define RX_MSDU_END_64_TLV_TAG GENMASK(9, 1) +#define RX_MSDU_END_64_TLV_LEN GENMASK(21, 10) +#define RX_MSDU_END_64_TLV_SRC_LINK_ID GENMASK(24, 22) + #define RX_MSDU_END_INFO0_RXPCU_MPDU_FITLER GENMASK(1, 0) #define RX_MSDU_END_INFO0_SW_FRAME_GRP_ID GENMASK(8, 2) @@ -661,7 +691,7 @@ #define RX_MSDU_END_INFO9_SERVICE_CODE GENMASK(14, 6) #define RX_MSDU_END_INFO9_PRIORITY_VALID BIT(15) -#define RX_MSDU_END_INFO9_INRA_BSS BIT(16) +#define RX_MSDU_END_INFO9_INTRA_BSS BIT(16) #define RX_MSDU_END_INFO9_DEST_CHIP_ID GENMASK(18, 17) #define RX_MSDU_END_INFO9_MCAST_ECHO BIT(19) #define RX_MSDU_END_INFO9_WDS_LEARN_EVENT BIT(20) @@ -737,6 +767,22 @@ #define RX_MSDU_END_INFO14_MSDU_DONE BIT(31) struct rx_msdu_end_qcn9274 { + __le64 msdu_end_tag; + __le16 sa_sw_peer_id; + __le16 info5; + __le16 sa_idx; + __le16 da_idx_or_sw_peer_id; + __le32 info10; + __le32 info11; + __le32 info12; + __le32 flow_id_toeplitz; + __le32 ppdu_start_timestamp_63_32; + __le32 phy_meta_data; + __le32 info13; + __le32 info14; +} __packed; + +struct rx_msdu_end_wcn7850 { __le16 info0; __le16 phy_ppdu_id; __le16 ip_hdr_cksum; @@ -1410,10 +1456,10 @@ struct hal_rx_desc_wcn7850 { __le64 msdu_end_tag; - struct rx_msdu_end_qcn9274 msdu_end; + struct rx_msdu_end_wcn7850 msdu_end; u8 rx_padding0[RX_BE_PADDING0_BYTES]; __le64 mpdu_start_tag; - struct rx_mpdu_start_qcn9274 mpdu_start; + struct rx_mpdu_start_wcn7850 mpdu_start; struct rx_pkt_hdr_tlv pkt_hdr_tlv; u8 msdu_payload[]; }; diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/wmi.c linux-6.4-fbx/drivers/net/wireless/ath/ath12k/wmi.c --- linux-6.4/drivers/net/wireless/ath/ath12k/wmi.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/wmi.c 2024-04-22 13:55:38.348131443 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -19,6 +19,7 @@ #include "mac.h" #include "hw.h" #include "peer.h" +#include "testmode.h" struct ath12k_wmi_svc_ready_parse { bool wmi_svc_bitmap_done; @@ -38,6 +39,9 @@ u32 max_bssid_rx_filters; u32 num_hw_modes; u32 num_phy; + u32 num_chainmask_tables; + struct ath12k_chainmask_table + chainmask_table[ATH12K_MAX_CHAINMASK_TABLES]; }; struct ath12k_wmi_svc_rdy_ext_parse { @@ -56,6 +60,7 @@ bool hw_mode_done; bool mac_phy_done; bool ext_hal_reg_done; + u32 n_mac_phy_chainmask_combo; bool mac_phy_chainmask_combo_done; bool mac_phy_chainmask_cap_done; bool oem_dma_ring_cap_done; @@ -63,8 +68,11 @@ }; struct ath12k_wmi_svc_rdy_ext2_parse { + struct ath12k_service_ext2_param param; struct ath12k_wmi_dma_ring_caps_parse dma_caps_parse; bool dma_ring_cap_done; + bool spectral_bin_scaling_done; + bool mac_phy_caps_ext_done; }; struct ath12k_wmi_rdy_parse { @@ -81,6 +89,25 @@ bool meta_data_done; }; +struct wmi_pdev_sscan_fw_param_parse { + struct ath12k_wmi_pdev_sscan_fw_cmd_fixed_param fixed; + struct ath12k_wmi_pdev_sscan_fft_bin_index *bin; + struct ath12k_wmi_pdev_sscan_chan_info ch_info; + struct ath12k_wmi_pdev_sscan_per_detector_info *det_info; + bool bin_entry_done; + bool det_info_entry_done; + +}; + +struct wmi_spectral_capabilities_parse { + struct ath12k_wmi_spectral_scan_bw_capabilities *sscan_bw_caps; + struct ath12k_wmi_spectral_fft_size_capabilities *fft_size_caps; + bool sscan_bw_caps_entry_done; + bool fft_size_caps_entry_done; + u32 num_bw_caps_entry; + u32 num_fft_size_caps_entry; +}; + struct ath12k_wmi_tlv_policy { size_t min_len; }; @@ -89,11 +116,18 @@ const struct ath12k_wmi_mgmt_rx_params *fixed; const u8 *frame_buf; bool frame_buf_done; + struct ath12k_wmi_mgmt_rx_reo_params *reo_params; + struct ath12k_wmi_mgmt_rx_fw_consumed_hdr *fw_consumed_reo_params; + struct ath12k_mgmt_rx_cu_arg cu_params; + bool mgmt_ml_info_done; + bool bpcc_buf_done; }; static const struct ath12k_wmi_tlv_policy ath12k_wmi_tlv_policies[] = { [WMI_TAG_ARRAY_BYTE] = { .min_len = 0 }, [WMI_TAG_ARRAY_UINT32] = { .min_len = 0 }, + [WMI_TAG_ARRAY_STRUCT] = { .min_len = 0 }, + [WMI_TAG_ARRAY_INT16] = { .min_len = 0 }, [WMI_TAG_SERVICE_READY_EVENT] = { .min_len = sizeof(struct wmi_service_ready_event) }, [WMI_TAG_SERVICE_READY_EXT_EVENT] = { @@ -134,6 +168,8 @@ .min_len = sizeof(struct wmi_service_available_event) }, [WMI_TAG_PEER_ASSOC_CONF_EVENT] = { .min_len = sizeof(struct wmi_peer_assoc_conf_event) }, + [WMI_TAG_STATS_EVENT] = { + .min_len = sizeof(struct wmi_stats_event) }, [WMI_TAG_PDEV_CTL_FAILSAFE_CHECK_EVENT] = { .min_len = sizeof(struct wmi_pdev_ctl_failsafe_chk_event) }, [WMI_TAG_HOST_SWFDA_EVENT] = { @@ -142,8 +178,31 @@ .min_len = sizeof(struct wmi_probe_resp_tx_status_event) }, [WMI_TAG_VDEV_DELETE_RESP_EVENT] = { .min_len = sizeof(struct wmi_vdev_delete_resp_event) }, + [WMI_TAG_MUEDCA_PARAMS_CONFIG_EVENT] = { + .min_len = sizeof(struct wmi_pdev_update_muedca_event) }, + [WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT] = { + .min_len = sizeof(struct wmi_twt_add_dialog_event) }, + [WMI_TAG_OBSS_COLOR_COLLISION_EVT] = { + .min_len = sizeof(struct wmi_obss_color_collision_event) }, + [WMI_TAG_CTRL_PATH_EVENT_FIXED_PARAM] = { + .min_len = sizeof(struct wmi_cp_stats_event_fixed_param) }, + [WMI_TAG_OFFCHAN_DATA_TX_COMPL_EVENT] = { + .min_len = sizeof(struct wmi_offchan_data_tx_compl_event) }, }; +static const u32 eml_trans_timeout[EMLCAP_TIMEOUT_MAX] = { + EMLCAP_TRANSTIMEOUT_0, + EMLCAP_TRANSTIMEOUT_1, + EMLCAP_TRANSTIMEOUT_2, + EMLCAP_TRANSTIMEOUT_3, + EMLCAP_TRANSTIMEOUT_4, + EMLCAP_TRANSTIMEOUT_5, + EMLCAP_TRANSTIMEOUT_6, + EMLCAP_TRANSTIMEOUT_7, + EMLCAP_TRANSTIMEOUT_8, + EMLCAP_TRANSTIMEOUT_9, + EMLCAP_TRANSTIMEOUT_10}; + static __le32 ath12k_wmi_tlv_hdr(u32 cmd, u32 len) { return le32_encode_bits(cmd, WMI_TLV_TAG) | @@ -155,9 +214,188 @@ return ath12k_wmi_tlv_hdr(cmd, len - TLV_HDR_SIZE); } +static int ath12k_pull_svc_ready_ext2(struct ath12k_wmi_pdev *wmi_handle, + const void *ptr, + struct ath12k_service_ext2_param *param) +{ + const struct wmi_service_ready_ext2_event *ev = ptr; + + if (!ev) + return -EINVAL; + + param->reg_db_version = ev->reg_db_version; + param->hw_min_max_tx_power_2g = ev->hw_min_max_tx_power_2g; + param->hw_min_max_tx_power_5g = ev->hw_min_max_tx_power_5g; + param->chwidth_num_peer_caps = ev->chwidth_num_peer_caps; + param->ru_punct_supp_bw = ev->ru_punct_supp_bw; + param->max_user_per_ppdu_ofdma = ev->max_user_per_ppdu_ofdma; + param->max_user_per_ppdu_mumimo = ev->max_user_per_ppdu_mumimo; + param->target_cap_flags = ev->target_cap_flags; + param->max_msduq_per_tid = ev->max_num_msduq_supported_per_tid; + param->default_msduq_per_tid = ev->default_num_msduq_supported_per_tid; + return 0; +} + +static int ath12k_wmi_tlv_mac_phy_caps_ext_parse(struct ath12k_base *ab, + struct wmi_mac_phy_caps_ext *caps, + struct ath12k_pdev *pdev, + struct ath12k_wmi_svc_rdy_ext2_parse *data) +{ + struct ath12k_band_cap *cap_band; + struct ath12k_pdev_cap *pdev_cap = &pdev->cap; + + if (pdev_cap->supported_bands & WMI_HOST_WLAN_2G_CAP) { + cap_band = &pdev_cap->band[NL80211_BAND_2GHZ]; + memcpy(cap_band->eht_cap_mac_info, &caps->eht_cap_mac_info_2G, + sizeof(u32) * PSOC_HOST_MAX_MAC_SIZE); + memcpy(cap_band->eht_cap_phy_info, &caps->eht_cap_phy_info_2G, + sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE); + cap_band->eht_mcs_20_only = caps->eht_supp_mcs_ext_2G[0]; + cap_band->eht_mcs_80 = caps->eht_supp_mcs_ext_2G[1]; + cap_band->eht_mcs_160 = 0xFFFFFFFF; + cap_band->eht_mcs_320 = 0xFFFFFFFF; + memcpy(&cap_band->eht_ppet, &caps->eht_ppet2G, + sizeof(struct ath12k_ppe_threshold)); + cap_band->eht_cap_info_internal = caps->eht_cap_info_internal; + } + + if (pdev_cap->supported_bands & WMI_HOST_WLAN_5G_CAP) { + cap_band = &pdev_cap->band[NL80211_BAND_5GHZ]; + memcpy(cap_band->eht_cap_mac_info, &caps->eht_cap_mac_info_5G, + sizeof(u32) * PSOC_HOST_MAX_MAC_SIZE); + memcpy(cap_band->eht_cap_phy_info, &caps->eht_cap_phy_info_5G, + sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE); + cap_band->eht_mcs_20_only = caps->eht_supp_mcs_ext_5G[0]; + cap_band->eht_mcs_80 = caps->eht_supp_mcs_ext_5G[1]; + cap_band->eht_mcs_160 = caps->eht_supp_mcs_ext_5G[2]; + cap_band->eht_mcs_320 = caps->eht_supp_mcs_ext_5G[3]; + memcpy(&cap_band->eht_ppet, &caps->eht_ppet5G, + sizeof(struct ath12k_ppe_threshold)); + cap_band->eht_cap_info_internal = caps->eht_cap_info_internal; + + cap_band = &pdev_cap->band[NL80211_BAND_6GHZ]; + memcpy(cap_band->eht_cap_mac_info, &caps->eht_cap_mac_info_5G, + sizeof(u32) * PSOC_HOST_MAX_MAC_SIZE); + memcpy(cap_band->eht_cap_phy_info, &caps->eht_cap_phy_info_5G, + sizeof(u32) * PSOC_HOST_MAX_PHY_SIZE); + cap_band->eht_mcs_20_only = caps->eht_supp_mcs_ext_5G[0]; + cap_band->eht_mcs_80 = caps->eht_supp_mcs_ext_5G[1]; + cap_band->eht_mcs_160 = caps->eht_supp_mcs_ext_5G[2]; + cap_band->eht_mcs_320 = caps->eht_supp_mcs_ext_5G[3]; + memcpy(&cap_band->eht_ppet, &caps->eht_ppet5G, + sizeof(struct ath12k_ppe_threshold)); + cap_band->eht_cap_info_internal = caps->eht_cap_info_internal; + } + + pdev_cap->eml_cap = caps->eml_cap_u.eml_capability; + pdev_cap->mld_cap = caps->mld_cap_u.mld_capability; + + if (data) + pdev_cap->ru_punct_supp_bw = data->param.ru_punct_supp_bw; + + return 0; +} + +static int ath12k_wmi_tlv_mac_phy_caps_ext(struct ath12k_base *ab, u16 tag, + u16 len, const void *ptr, void *data) +{ + struct wmi_mac_phy_caps_ext *caps = (struct wmi_mac_phy_caps_ext *)ptr; + int i, ret; + + if (tag != WMI_TAG_MAC_PHY_CAPABILITIES_EXT) + return -EPROTO; + + for (i = 0; i < ab->num_radios; i++) { + if (ab->pdevs[i].pdev_id == caps->u.wmi_pdev_to_link_map.pdev_id) + break; + } + + if (i == ab->num_radios) + return -EINVAL; + + ret = ath12k_wmi_tlv_mac_phy_caps_ext_parse(ab, caps, &ab->pdevs[i], + data); + if (ret) { + ath12k_warn(ab, + "failed to extract mac phy caps ext, pdev_id:%d\n", + ab->pdevs[i].pdev_id); + return ret; + } + + return 0; +} + void ath12k_wmi_init_qcn9274(struct ath12k_base *ab, struct ath12k_wmi_resource_config_arg *config) { + struct ath12k_hw_group *ag = ab->ag; + + config->num_vdevs = ab->num_radios * TARGET_NUM_VDEVS; + + if (ab->num_radios == 2) { + config->num_peers = TARGET_NUM_PEERS(DBS); + config->num_tids = TARGET_NUM_TIDS(DBS); + } else if (ab->num_radios == 3) { + config->num_peers = TARGET_NUM_PEERS(DBS_SBS); + config->num_tids = TARGET_NUM_TIDS(DBS_SBS); + } else { + /* Control should not reach here */ + config->num_peers = TARGET_NUM_PEERS(SINGLE); + config->num_tids = TARGET_NUM_TIDS(SINGLE); + } + config->num_offload_peers = TARGET_NUM_OFFLD_PEERS; + config->num_offload_reorder_buffs = TARGET_NUM_OFFLD_REORDER_BUFFS; + config->num_peer_keys = TARGET_NUM_PEER_KEYS; + config->ast_skid_limit = TARGET_AST_SKID_LIMIT; + config->tx_chain_mask = (1 << ab->target_caps.num_rf_chains) - 1; + config->rx_chain_mask = (1 << ab->target_caps.num_rf_chains) - 1; + config->rx_timeout_pri[0] = TARGET_RX_TIMEOUT_LO_PRI; + config->rx_timeout_pri[1] = TARGET_RX_TIMEOUT_LO_PRI; + config->rx_timeout_pri[2] = TARGET_RX_TIMEOUT_LO_PRI; + config->rx_timeout_pri[3] = TARGET_RX_TIMEOUT_HI_PRI; + + if (test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) + config->rx_decap_mode = TARGET_DECAP_MODE_RAW; + else + config->rx_decap_mode = TARGET_DECAP_MODE_NATIVE_WIFI; + + config->scan_max_pending_req = TARGET_SCAN_MAX_PENDING_REQS; + config->bmiss_offload_max_vdev = TARGET_BMISS_OFFLOAD_MAX_VDEV; + config->roam_offload_max_vdev = TARGET_ROAM_OFFLOAD_MAX_VDEV; + config->roam_offload_max_ap_profiles = TARGET_ROAM_OFFLOAD_MAX_AP_PROFILES; + config->num_mcast_groups = TARGET_NUM_MCAST_GROUPS; + config->num_mcast_table_elems = TARGET_NUM_MCAST_TABLE_ELEMS; + config->mcast2ucast_mode = TARGET_MCAST2UCAST_MODE; + config->tx_dbg_log_size = TARGET_TX_DBG_LOG_SIZE; + config->num_wds_entries = TARGET_NUM_WDS_ENTRIES; + config->dma_burst_size = TARGET_DMA_BURST_SIZE; + config->rx_skip_defrag_timeout_dup_detection_check = + TARGET_RX_SKIP_DEFRAG_TIMEOUT_DUP_DETECTION_CHECK; + config->vow_config = TARGET_VOW_CONFIG; + config->gtk_offload_max_vdev = TARGET_GTK_OFFLOAD_MAX_VDEV; + config->num_msdu_desc = TARGET_NUM_MSDU_DESC; + config->beacon_tx_offload_max_vdev = ab->num_radios * TARGET_MAX_BCN_OFFLD; + config->rx_batchmode = TARGET_RX_BATCHMODE; + /* Indicates host supports peer map v3 and unmap v2 support */ + config->peer_map_unmap_version = 0x32; + config->twt_ap_pdev_count = ab->num_radios; + config->twt_ap_sta_count = 1000; + config->ema_max_vap_cnt = ab->num_radios; + config->ema_max_profile_period = TARGET_EMA_MAX_PROFILE_PERIOD; + config->beacon_tx_offload_max_vdev += config->ema_max_vap_cnt; + + if (test_bit(WMI_TLV_SERVICE_SAWF_LEVEL0, ab->wmi_ab.svc_map)) + config->sawf = true; + if (test_bit(WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT, ab->wmi_ab.svc_map)) + config->dp_peer_meta_data_ver = TARGET_RX_PEER_METADATA_VER_V1B; + +} + +void ath12k_wmi_init_ipq5332(struct ath12k_base *ab, + struct ath12k_wmi_resource_config_arg *config) +{ + struct ath12k_hw_group *ag = ab->ag; + config->num_vdevs = ab->num_radios * TARGET_NUM_VDEVS; if (ab->num_radios == 2) { @@ -182,7 +420,7 @@ config->rx_timeout_pri[2] = TARGET_RX_TIMEOUT_LO_PRI; config->rx_timeout_pri[3] = TARGET_RX_TIMEOUT_HI_PRI; - if (test_bit(ATH12K_FLAG_RAW_MODE, &ab->dev_flags)) + if (test_bit(ATH12K_FLAG_RAW_MODE, &ag->dev_flags)) config->rx_decap_mode = TARGET_DECAP_MODE_RAW; else config->rx_decap_mode = TARGET_DECAP_MODE_NATIVE_WIFI; @@ -208,8 +446,18 @@ config->peer_map_unmap_version = 0x32; config->twt_ap_pdev_count = ab->num_radios; config->twt_ap_sta_count = 1000; + config->ema_max_vap_cnt = ab->num_radios; + config->ema_max_profile_period = TARGET_EMA_MAX_PROFILE_PERIOD; + config->beacon_tx_offload_max_vdev += config->ema_max_vap_cnt; + + if (test_bit(WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT, ab->wmi_ab.svc_map)) + config->dp_peer_meta_data_ver = TARGET_RX_PEER_METADATA_VER_V1B; + + if (test_bit(WMI_TLV_SERVICE_SAWF_LEVEL0, ab->wmi_ab.svc_map)) + config->sawf = true; } + void ath12k_wmi_init_wcn7850(struct ath12k_base *ab, struct ath12k_wmi_resource_config_arg *config) { @@ -254,6 +502,10 @@ config->num_multicast_filter_entries = 0x20; config->num_wow_filters = 0x16; config->num_keep_alive_pattern = 0; + + if (test_bit(WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT, ab->wmi_ab.svc_map)) + config->dp_peer_meta_data_ver = TARGET_RX_PEER_METADATA_VER_V1A; + } #define PRIMAP(_hw_mode_) \ @@ -270,6 +522,69 @@ PRIMAP(WMI_HOST_HW_MODE_MAX), }; + +enum wmi_host_channel_width +ath12k_wmi_get_host_chan_width(u32 width) +{ + enum wmi_host_channel_width host_width; + + switch (width) { + case NL80211_CHAN_WIDTH_20_NOHT: + case NL80211_CHAN_WIDTH_20: + host_width = WMI_HOST_CHAN_WIDTH_20; + break; + case NL80211_CHAN_WIDTH_40: + host_width = WMI_HOST_CHAN_WIDTH_40; + break; + case NL80211_CHAN_WIDTH_80: + host_width = WMI_HOST_CHAN_WIDTH_80; + break; + case NL80211_CHAN_WIDTH_160: + host_width = WMI_HOST_CHAN_WIDTH_160; + break; + case NL80211_CHAN_WIDTH_80P80: + host_width = WMI_HOST_CHAN_WIDTH_80P80; + break; + case NL80211_CHAN_WIDTH_320: + host_width = WMI_HOST_CHAN_WIDTH_320; + break; + default: + host_width = WMI_HOST_CHAN_WIDTH_MAX; + break; + } + + return host_width; +} + +enum wmi_host_channel_width ath12k_wmi_get_host_chan_switch_width(u32 width) +{ + enum wmi_host_channel_width host_width; + + switch (width) { + case IEEE80211_STA_RX_BW_20: + host_width = WMI_HOST_CHAN_WIDTH_20; + break; + case IEEE80211_STA_RX_BW_40: + host_width = WMI_HOST_CHAN_WIDTH_40; + break; + case IEEE80211_STA_RX_BW_80: + host_width = WMI_HOST_CHAN_WIDTH_80; + break; + case IEEE80211_STA_RX_BW_160: + host_width = WMI_HOST_CHAN_WIDTH_160; + break; + case IEEE80211_STA_RX_BW_320: + host_width = WMI_HOST_CHAN_WIDTH_320; + break; + default: + ath12k_warn(NULL, "invalid bandwidth %d switching back to 20 MHz\n", width); + host_width = WMI_HOST_CHAN_WIDTH_20; + break; + } + + return host_width; +} + static int ath12k_wmi_tlv_iter(struct ath12k_base *ab, const void *ptr, size_t len, int (*iter)(struct ath12k_base *ab, u16 tag, u16 len, @@ -281,6 +596,7 @@ u16 tlv_tag, tlv_len; int ret; + while (len > 0) { if (len < sizeof(*tlv)) { ath12k_err(ab, "wmi tlv parse failure at byte %zd (%zu bytes left, %zu expected)\n", @@ -390,21 +706,41 @@ { struct ath12k_wmi_base *wmi_sc = wmi->wmi_ab; int ret = -EOPNOTSUPP; + struct ath12k_base *ab = wmi_sc->ab; + + if (!(test_bit(ATH12K_FLAG_WMI_INIT_DONE, &wmi_sc->ab->dev_flags)) && + cmd_id != WMI_INIT_CMDID) + return -ESHUTDOWN; might_sleep(); + if (ab->hw_params->credit_flow) { wait_event_timeout(wmi_sc->tx_credits_wq, ({ ret = ath12k_wmi_cmd_send_nowait(wmi, skb, cmd_id); - if (ret && test_bit(ATH12K_FLAG_CRASH_FLUSH, &wmi_sc->ab->dev_flags)) + if (ret && test_bit(ATH12K_FLAG_CRASH_FLUSH, + &wmi_sc->ab->dev_flags)) ret = -ESHUTDOWN; - (ret != -EAGAIN); }), WMI_SEND_TIMEOUT_HZ); + } else { + wait_event_timeout(wmi->tx_ce_desc_wq, ({ + ret = ath12k_wmi_cmd_send_nowait(wmi, skb, cmd_id); + if (ret && test_bit(ATH12K_FLAG_CRASH_FLUSH, + &wmi_sc->ab->dev_flags)) + ret = -ESHUTDOWN; + + (ret != -ENOBUFS); + }), WMI_SEND_TIMEOUT_HZ); + } if (ret == -EAGAIN) ath12k_warn(wmi_sc->ab, "wmi command %d timeout\n", cmd_id); + if (ret == -ENOBUFS) + ath12k_warn(wmi_sc->ab, "ce desc not available for wmi command %d\n", + cmd_id); + return ret; } @@ -472,14 +808,18 @@ mac_caps = wmi_mac_phy_caps + phy_idx; pdev->pdev_id = le32_to_cpu(mac_caps->pdev_id); + pdev->hw_link_id = mac_caps->hw_link_id; pdev_cap->supported_bands |= le32_to_cpu(mac_caps->supported_bands); pdev_cap->ampdu_density = le32_to_cpu(mac_caps->ampdu_density); + pdev_cap->chainmask_table_id = mac_caps->chainmask_table_id; /* Take non-zero tx/rx chainmask. If tx/rx chainmask differs from * band to band for a single radio, need to see how this should be * handled. */ if (le32_to_cpu(mac_caps->supported_bands) & WMI_HOST_WLAN_2G_CAP) { + pdev_cap->vht_cap = le32_to_cpu(mac_caps->vht_cap_info_2g); + pdev_cap->vht_mcs = le32_to_cpu(mac_caps->vht_supp_mcs_2g); pdev_cap->tx_chain_mask = le32_to_cpu(mac_caps->tx_chain_mask_2g); pdev_cap->rx_chain_mask = le32_to_cpu(mac_caps->rx_chain_mask_2g); } else if (le32_to_cpu(mac_caps->supported_bands) & WMI_HOST_WLAN_5G_CAP) { @@ -488,6 +828,10 @@ pdev_cap->he_mcs = le32_to_cpu(mac_caps->he_supp_mcs_5g); pdev_cap->tx_chain_mask = le32_to_cpu(mac_caps->tx_chain_mask_5g); pdev_cap->rx_chain_mask = le32_to_cpu(mac_caps->rx_chain_mask_5g); + pdev_cap->nss_ratio_enabled = + WMI_NSS_RATIO_ENABLE_DISABLE_GET(mac_caps->nss_ratio); + pdev_cap->nss_ratio_info = + WMI_NSS_RATIO_INFO_GET(mac_caps->nss_ratio); } else { return -EINVAL; } @@ -567,6 +911,225 @@ return 0; } +static void ath12k_wmi_event_mlo_setup_complete(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const void **tb; + const struct wmi_mlo_setup_complete_event_fixed_param *ev; + struct ath12k *ar = NULL; + struct ath12k_pdev *pdev; + int ret, i; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, + "failed to parse mlo setup complete event tlv %d\n", + ret); + return; + } + + ev = tb[WMI_TAG_MLO_SETUP_COMPLETE_EVENT]; + if (!ev) { + ath12k_warn(ab, "failed to fetch mlo setup complete event\n"); + kfree(tb); + return; + } + + if (ev->status) + ath12k_warn(ab, "mlo setup, pdev id %u, status %u\n", + ev->pdev_id, ev->status); + + if (ev->pdev_id > ab->num_radios) + goto skip_lookup; + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + if (pdev && pdev->pdev_id == ev->pdev_id) { + ar = pdev->ar; + break; + } + } + +skip_lookup: + if (!ar) { + ath12k_warn(ab, "invalid pdev_id %d status %u in setup complete event\n", + ev->pdev_id, ev->status); + goto out; + } + + ar->mlo_setup_status = ev->status; + if (ab->hw_params->hal_ops->hal_get_tqm_scratch_reg) + ab->hw_params->hal_ops->hal_get_tqm_scratch_reg(ab, &ar->delta_tqm); + complete(&ar->mlo_setup_done); + +out: + kfree(tb); +} + +static void ath12k_wmi_event_teardown_complete(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const void **tb; + const struct wmi_mlo_teardown_complete_fixed_param *ev; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_pdev *pdev; + struct ath12k *ar; + int ret, i, j; + bool complete_flag = true; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, + "failed to parse teardown complete event tlv %d\n", + ret); + return; + } + + ev = tb[WMI_TAG_MLO_TEARDOWN_COMPLETE]; + if (!ev) { + ath12k_warn(ab, "failed to fetch teardown complete event\n"); + kfree(tb); + return; + } + + if (ev->status) + ath12k_warn(ab, "mlo teardown, pdev id %u, status %u\n", + ev->pdev_id, ev->status); + + kfree(tb); + + ar = ath12k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + if (!ar) { + ath12k_warn(ab, "invalid pdev id in teardown complete ev %d", + ev->pdev_id); + return; + } + ar->mlo_complete_event = true; + + for (i = 0; i < ag->num_chip; i++) { + ab = ag->ab[i]; + + for (j = 0; j < ab->num_radios; j++) { + pdev = &ab->pdevs[j]; + ar = pdev->ar; + + if (!ar->mlo_complete_event) + complete_flag = false; + } + } + + if (complete_flag && ag->recovery_mode == ATH12K_MLO_RECOVERY_MODE1) + complete(&ag->umac_reset_complete); +} + +static void ath12k_wmi_process_mvr_event(struct ath12k_base *ab, u32 *vdev_id_bm, + u32 num_vdev_bm) +{ + struct ath12k *ar = NULL; + struct ath12k_link_vif *arvif = NULL; + u32 bit_pos; + unsigned long vdev_bitmap; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi mvr resp num_vdev_bm %d vdev_id_bm[0]=0x%x vdev_id_bm[1]=0x%x\n", + num_vdev_bm, vdev_id_bm[0], + (num_vdev_bm == WMI_MVR_RESP_VDEV_BM_MAX_LEN ? + vdev_id_bm[1] : 0x00)); + + /* 31-0 bits processing */ + vdev_bitmap = vdev_id_bm[0]; + + for (bit_pos = 0; bit_pos < 32; bit_pos++) { + + if (!(vdev_bitmap & BIT(bit_pos))) + continue; + + arvif = ath12k_mac_get_arvif_by_vdev_id(ab, bit_pos); + if (!arvif) { + ar = ath12k_mac_get_ar_by_vdev_id(ab, bit_pos); + if (!(ar && bit_pos == ar->monitor_vdev_id)) { + ath12k_warn(ab, "wmi mvr resp for unknown vdev %d", bit_pos); + continue; + } + } else { + arvif->mvr_processing = false; + } + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi mvr vdev %d restarted\n", bit_pos); + } + + /* TODO: 63-32 bits processing + * Add support to parse bitmap once support for + * TARGET_NUM_VDEVS > 32 is added + */ + + if (arvif) + ar = arvif->ar; + + if (ar) + complete(&ar->mvr_complete); +} + +static int ath12k_wmi_tlv_mvr_event_parse(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_pdev_mvr_resp_event_parse *parse = data; + struct wmi_pdev_mvr_resp_event_fixed_param *fixed_param; + + switch(tag) { + case WMI_TAG_MULTIPLE_VDEV_RESTART_RESPONSE_EVENT: + fixed_param = (struct wmi_pdev_mvr_resp_event_fixed_param *)ptr; + + if (fixed_param->status) { + ath12k_warn(ab, "wmi mvr resp event status %u\n", + fixed_param->status); + return -EINVAL; + } + + memcpy(&parse->fixed_param, fixed_param, + sizeof(struct wmi_pdev_mvr_resp_event_fixed_param)); + break; + case WMI_TAG_ARRAY_UINT32: + if ((len > WMI_MVR_RESP_VDEV_BM_MAX_LEN_BYTES) || (len == 0)) { + ath12k_warn(ab, "wmi invalid vdev id len in mvr resp %u\n", + len); + return -EINVAL; + } + + parse->num_vdevs_bm = len / sizeof(u32); + memcpy(parse->vdev_id_bm, ptr, len); + break; + default: + break; + } + + return 0; +} + +static void ath12k_wmi_event_mvr_response(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct wmi_pdev_mvr_resp_event_parse parse = {}; + int ret; + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_tlv_mvr_event_parse, + &parse); + if (ret) { + ath12k_warn(ab, "wmi failed to parse mvr response tlv %d\n", + ret); + return; + } + + ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi mvr resp for pdev %d\n", + parse.fixed_param.pdev_id); + + ath12k_wmi_process_mvr_event(ab, parse.vdev_id_bm, parse.num_vdevs_bm); +} + static int ath12k_pull_reg_cap_svc_rdy_ext(struct ath12k_wmi_pdev *wmi_handle, const struct ath12k_wmi_soc_hal_reg_caps_params *reg_caps, @@ -720,18 +1283,25 @@ } int ath12k_wmi_mgmt_send(struct ath12k *ar, u32 vdev_id, u32 buf_id, - struct sk_buff *frame) + struct sk_buff *frame, bool link_agnostic) { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_mgmt_send_cmd *cmd; + struct wmi_mlo_mgmt_send_params *ml_params; struct wmi_tlv *frame_tlv; struct sk_buff *skb; u32 buf_len; int ret, len; + void *ptr; + struct wmi_tlv *tlv; buf_len = min_t(int, frame->len, WMI_MGMT_SEND_DOWNLD_LEN); - len = sizeof(*cmd) + sizeof(*frame_tlv) + roundup(buf_len, 4); + len = sizeof(*cmd) + sizeof(*frame_tlv) + roundup(buf_len, sizeof(u32)); + + if (link_agnostic) + len += sizeof(struct wmi_mgmt_send_params) + + TLV_HDR_SIZE + sizeof(*ml_params); skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); if (!skb) @@ -750,10 +1320,34 @@ cmd->tx_params_valid = 0; frame_tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); - frame_tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, buf_len); + frame_tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, roundup(buf_len, sizeof(u32))); memcpy(frame_tlv->value, frame->data, buf_len); + if (!link_agnostic) + goto send; + + ptr = skb->data + sizeof(*cmd) + sizeof(*frame_tlv) + roundup(buf_len, sizeof(u32)); + + tlv = ptr; + + /* Tx params not used currently */ + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TX_SEND_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(struct wmi_mgmt_send_params) - TLV_HDR_SIZE); + ptr += sizeof(struct wmi_mgmt_send_params); + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params)); + ptr += TLV_HDR_SIZE; + + ml_params = ptr; + ml_params->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_TX_SEND_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params) - TLV_HDR_SIZE); + + ml_params->hw_link_id = WMI_MLO_MGMT_TID; + +send: ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MGMT_TX_SEND_CMDID); if (ret) { ath12k_warn(ar->ab, @@ -764,23 +1358,125 @@ return ret; } +static u32 ath12k_wmi_mgmt_get_freq(struct ath12k *ar, + struct ieee80211_tx_info *info) +{ + u32 freq = 0; + + if (ar->scan.is_roc && + (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) + freq = ar->scan.roc_freq; + + return freq; +} + +/* For Big Endian Host, Copy Engine byte_swap is enabled + * When Copy Engine does byte_swap, need to byte swap again for the + * Host to get/put buffer content in the correct byte order + */ +void ath12k_ce_byte_swap(void *mem, u32 len) +{ + int i; + + if (IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) { + if (!mem) + return; + + for (i = 0; i < (len / 4); i++) { + *(u32 *)mem = swab32(*(u32 *)mem); + mem += 4; + } + } +} + +/* Send off-channel managemnt frame to firmware. when driver receive a + * packet with off channel tx flag enabled. This API will send the + * packet to firmware with WMI command WMI_TAG_OFFCHAN_DATA_TX_SEND_CMD + * for off-chan tx. + */ +int ath12k_wmi_offchan_mgmt_send(struct ath12k *ar, u32 vdev_id, u32 buf_id, + struct sk_buff *frame) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(frame); + struct wmi_mgmt_send_cmd *cmd; + struct wmi_tlv *frame_tlv; + struct sk_buff *skb; + u32 buf_len, buf_len_padded; + int ret, len; + void *ptr; + struct wmi_tlv *tlv; + + buf_len = min(frame->len, (unsigned int)WMI_MGMT_SEND_DOWNLD_LEN); + buf_len_padded = roundup(buf_len, sizeof(u32)); + + len = sizeof(*cmd) + sizeof(*frame_tlv) + buf_len_padded + + sizeof(struct wmi_mgmt_send_params); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + ptr = skb->data; + cmd = ptr; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_OFFCHAN_DATA_TX_SEND_CMD, + sizeof(*cmd)); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->desc_id = cpu_to_le32(buf_id); + cmd->chanfreq = cpu_to_le32(ath12k_wmi_mgmt_get_freq(ar, info)); + cmd->paddr_lo = cpu_to_le32(lower_32_bits(ATH12K_SKB_CB(frame)->paddr)); + cmd->paddr_hi = cpu_to_le32(upper_32_bits(ATH12K_SKB_CB(frame)->paddr)); + cmd->frame_len = cpu_to_le32(frame->len); + cmd->buf_len = cpu_to_le32(buf_len); + cmd->tx_params_valid = 1; + ptr += sizeof(*cmd); + + frame_tlv = ptr; + frame_tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, buf_len_padded); + ptr += sizeof(*frame_tlv); + + memcpy(ptr, frame->data, buf_len); + ath12k_ce_byte_swap(ptr, buf_len); + ptr += buf_len_padded; + + tlv = ptr; + /* Tx params not used currently */ + tlv->header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_TX_SEND_PARAMS, + sizeof(struct wmi_mgmt_send_params)); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_OFFCHAN_DATA_TX_SEND_CMDID); + + if (ret) { + ath12k_warn(ar->ab, + "failed to submit WMI_OFFCHAN_DATA_TX_SEND_CMDID cmd\n"); + dev_kfree_skb(skb); + } + + return ret; +} + int ath12k_wmi_vdev_create(struct ath12k *ar, u8 *macaddr, struct ath12k_wmi_vdev_create_arg *args) { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_vdev_create_cmd *cmd; + struct wmi_vdev_create_mlo_params *ml_params; struct sk_buff *skb; struct ath12k_wmi_vdev_txrx_streams_params *txrx_streams; struct wmi_tlv *tlv; int ret, len; void *ptr; + bool is_ml_vdev; + + is_ml_vdev = is_valid_ether_addr(args->mld_addr); /* It can be optimized my sending tx/rx chain configuration * only for supported bands instead of always sending it for * both the bands. */ len = sizeof(*cmd) + TLV_HDR_SIZE + - (WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams)); + (WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams)) + + (is_ml_vdev ? TLV_HDR_SIZE + sizeof(*ml_params) : 0); skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); if (!skb) @@ -796,6 +1492,8 @@ cmd->num_cfg_txrx_streams = cpu_to_le32(WMI_NUM_SUPPORTED_BAND_MAX); cmd->pdev_id = cpu_to_le32(args->pdev_id); cmd->vdev_stats_id = cpu_to_le32(args->if_stats_id); + cmd->mbssid_flags = cpu_to_le32(args->mbssid_flags); + cmd->mbssid_tx_vdev_id = cpu_to_le32(args->mbssid_tx_vdev_id); ether_addr_copy(cmd->vdev_macaddr.addr, macaddr); ptr = skb->data + sizeof(*cmd); @@ -824,6 +1522,23 @@ txrx_streams->supported_rx_streams = args->chains[NL80211_BAND_5GHZ].rx; + if (is_ml_vdev) { + ptr = skb->data + sizeof(*cmd) + TLV_HDR_SIZE + + (WMI_NUM_SUPPORTED_BAND_MAX * sizeof(*txrx_streams)); + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params)); + + ptr += TLV_HDR_SIZE; + ml_params = ptr; + + ml_params->tlv_header = + FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_VDEV_CREATE_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(ml_params->mld_macaddr.addr)); + + ether_addr_copy(ml_params->mld_macaddr.addr, args->mld_addr); + } + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI vdev create: id %d type %d subtype %d macaddr %pM pdevid %d\n", args->if_id, args->type, args->subtype, @@ -855,7 +1570,8 @@ sizeof(*cmd)); cmd->vdev_id = cpu_to_le32(vdev_id); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI vdev delete id %d\n", vdev_id); + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI vdev delete id %d num_peers : %d\n", + vdev_id, ar->num_peers); ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_DELETE_CMDID); if (ret) { @@ -883,7 +1599,7 @@ sizeof(*cmd)); cmd->vdev_id = cpu_to_le32(vdev_id); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI vdev stop id 0x%x\n", vdev_id); + ath12k_dbg(ar->ab, ATH12K_DBG_SET(WMI, L1), "WMI vdev stop id 0x%x\n", vdev_id); ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_STOP_CMDID); if (ret) { @@ -911,55 +1627,173 @@ sizeof(*cmd)); cmd->vdev_id = cpu_to_le32(vdev_id); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI vdev down id 0x%x\n", vdev_id); + ath12k_dbg(ar->ab, ATH12K_DBG_SET(WMI, L1), "WMI vdev down id 0x%x\n", vdev_id); ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_DOWN_CMDID); if (ret) { - ath12k_warn(ar->ab, "failed to submit WMI_VDEV_DOWN cmd\n"); + ath12k_warn(ar->ab, "failed to submit WMI_VDEV_DOWN cmd vdev id : %d\n", + vdev_id); dev_kfree_skb(skb); } return ret; } +static inline bool +ath12k_wmi_check_device_present(u32 width_device, + u32 center_freq_device, + u32 center_freq_oper) +{ + return (center_freq_device && width_device && + center_freq_device != center_freq_oper); +} + +static u32 ath12k_wmi_set_ru_punc_bitmap_device(u32 oper_freq, + enum nl80211_chan_width width_device, + u32 device_freq, + u32 oper_ru_punct_bitmap) +{ + u32 device_bitmap = oper_ru_punct_bitmap; + + if (oper_freq == device_freq || oper_freq < device_freq) + return device_bitmap; + + switch (width_device) { + case NL80211_CHAN_WIDTH_160: + if (oper_freq > device_freq) + device_bitmap = (oper_ru_punct_bitmap << 4) | 0x0000FF0F; + break; + case NL80211_CHAN_WIDTH_320: + if (oper_freq > device_freq) + device_bitmap = (oper_ru_punct_bitmap << 8) | 0x000000FF; + break; + default: + return device_bitmap; + } + + return device_bitmap; +} + +static void ath12k_wmi_set_wmi_channel_device(struct ath12k_wmi_channel_params *chan_device, + struct wmi_channel_arg *channel, + u32 cf_device, u32 width_device) +{ + enum wmi_phy_mode mode_device; + + memset(chan_device, 0, sizeof(*chan_device)); + + chan_device->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_CHANNEL, + sizeof(*chan_device)); + chan_device->mhz = cpu_to_le32(channel->freq); + chan_device->band_center_freq1 = cpu_to_le32(cf_device); + + if (width_device == NL80211_CHAN_WIDTH_320) { + mode_device = MODE_11BE_EHT320; + if (channel->freq > chan_device->band_center_freq1) + chan_device->band_center_freq1 = cf_device + 80; + else + chan_device->band_center_freq1 = cf_device - 80; + chan_device->band_center_freq2 = cf_device; + } else if (width_device == NL80211_CHAN_WIDTH_160) { + mode_device = MODE_11BE_EHT160; + if (channel->freq > chan_device->band_center_freq1) + chan_device->band_center_freq1 = cf_device + 40; + else + chan_device->band_center_freq1 = cf_device - 40; + chan_device->band_center_freq2 = cf_device; + } else if (width_device == NL80211_CHAN_WIDTH_80) { + mode_device = MODE_11BE_EHT80; + } else if (width_device == NL80211_CHAN_WIDTH_40) { + mode_device = MODE_11BE_EHT40; + } else { + mode_device = MODE_UNKNOWN; + } + + chan_device->info |= le32_encode_bits(mode_device, WMI_CHAN_INFO_MODE); + if (channel->passive) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_PASSIVE); + if (channel->allow_ibss) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_ADHOC_ALLOWED); + if (channel->allow_ht) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HT); + if (channel->allow_vht) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_VHT); + if (channel->allow_he) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HE); + if (channel->ht40plus) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_HT40_PLUS); + if (channel->chan_radar) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_DFS); + if (channel->freq2_radar) + chan_device->info |= cpu_to_le32(WMI_CHAN_INFO_DFS_FREQ2); + + chan_device->reg_info_1 = le32_encode_bits(channel->max_power, + WMI_CHAN_REG_INFO1_MAX_PWR) | + le32_encode_bits(channel->max_reg_power, + WMI_CHAN_REG_INFO1_MAX_REG_PWR); + + chan_device->reg_info_2 = le32_encode_bits(channel->max_antenna_gain, + WMI_CHAN_REG_INFO2_ANT_MAX) | + le32_encode_bits(channel->max_power, + WMI_CHAN_REG_INFO2_MAX_TX_PWR); +} + static void ath12k_wmi_put_wmi_channel(struct ath12k_wmi_channel_params *chan, - struct wmi_vdev_start_req_arg *arg) + struct wmi_channel_arg chan_arg) { + u32 center_freq1 = chan_arg.band_center_freq1; memset(chan, 0, sizeof(*chan)); - chan->mhz = cpu_to_le32(arg->freq); - chan->band_center_freq1 = cpu_to_le32(arg->band_center_freq1); - if (arg->mode == MODE_11AC_VHT80_80) - chan->band_center_freq2 = cpu_to_le32(arg->band_center_freq2); + chan->mhz = chan_arg.freq; + chan->band_center_freq1 = chan_arg.band_center_freq1; + if (chan_arg.mode == MODE_11BE_EHT320) { + if (chan_arg.freq > chan_arg.band_center_freq1) + chan->band_center_freq1 = center_freq1 + 80; else + chan->band_center_freq1 = center_freq1 - 80; + + chan->band_center_freq2 = chan_arg.band_center_freq1; + + } else if (chan_arg.mode == MODE_11BE_EHT160) { + if (chan_arg.freq > chan_arg.band_center_freq1) + chan->band_center_freq1 = center_freq1 + 40; + else + chan->band_center_freq1 = center_freq1 - 40; + + chan->band_center_freq2 = chan_arg.band_center_freq1; + + } else if (chan_arg.mode == MODE_11BE_EHT80_80) { + chan->band_center_freq2 = chan_arg.band_center_freq2; + }else{ chan->band_center_freq2 = 0; + } - chan->info |= le32_encode_bits(arg->mode, WMI_CHAN_INFO_MODE); - if (arg->passive) + chan->info |= u32_encode_bits(chan_arg.mode, WMI_CHAN_INFO_MODE); + if (chan_arg.passive) chan->info |= cpu_to_le32(WMI_CHAN_INFO_PASSIVE); - if (arg->allow_ibss) + if (chan_arg.allow_ibss) chan->info |= cpu_to_le32(WMI_CHAN_INFO_ADHOC_ALLOWED); - if (arg->allow_ht) + if (chan_arg.allow_ht) chan->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HT); - if (arg->allow_vht) + if (chan_arg.allow_vht) chan->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_VHT); - if (arg->allow_he) + if (chan_arg.allow_he) chan->info |= cpu_to_le32(WMI_CHAN_INFO_ALLOW_HE); - if (arg->ht40plus) + if (chan_arg.ht40plus) chan->info |= cpu_to_le32(WMI_CHAN_INFO_HT40_PLUS); - if (arg->chan_radar) + if (chan_arg.chan_radar) chan->info |= cpu_to_le32(WMI_CHAN_INFO_DFS); - if (arg->freq2_radar) + if (chan_arg.freq2_radar) chan->info |= cpu_to_le32(WMI_CHAN_INFO_DFS_FREQ2); - chan->reg_info_1 = le32_encode_bits(arg->max_power, + chan->reg_info_1 = le32_encode_bits(chan_arg.max_power, WMI_CHAN_REG_INFO1_MAX_PWR) | - le32_encode_bits(arg->max_reg_power, + le32_encode_bits(chan_arg.max_reg_power, WMI_CHAN_REG_INFO1_MAX_REG_PWR); - chan->reg_info_2 = le32_encode_bits(arg->max_antenna_gain, + chan->reg_info_2 = le32_encode_bits(chan_arg.max_antenna_gain, WMI_CHAN_REG_INFO2_ANT_MAX) | - le32_encode_bits(arg->max_power, WMI_CHAN_REG_INFO2_MAX_TX_PWR); + le32_encode_bits(chan_arg.max_power, WMI_CHAN_REG_INFO2_MAX_TX_PWR); } int ath12k_wmi_vdev_start(struct ath12k *ar, struct wmi_vdev_start_req_arg *arg, @@ -967,16 +1801,32 @@ { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_vdev_start_request_cmd *cmd; + struct wmi_vdev_start_mlo_params *ml_params; + struct wmi_partner_link_info *partner_info; struct sk_buff *skb; struct ath12k_wmi_channel_params *chan; struct wmi_tlv *tlv; + struct ath12k_wmi_channel_params *chan_device; void *ptr; - int ret, len; + int ret, len, ml_arg_size = 0; + u8 i; + struct ath12k_hw_group *ag = ar->ab->ag; + bool device_params_present = false; if (WARN_ON(arg->ssid_len > sizeof(cmd->ssid.ssid))) return -EINVAL; - len = sizeof(*cmd) + sizeof(*chan) + TLV_HDR_SIZE; + if (!restart && arg->ml.enabled) + ml_arg_size = TLV_HDR_SIZE + sizeof(*ml_params) + + TLV_HDR_SIZE + (arg->ml.num_partner_links * sizeof(*partner_info)); + + len = sizeof(*cmd) + sizeof(*chan) + TLV_HDR_SIZE + ml_arg_size; + + device_params_present = ath12k_wmi_check_device_present(arg->width_device, + arg->center_freq_device, + arg->channel.band_center_freq1); + if (device_params_present) + len += TLV_HDR_SIZE + sizeof(*chan_device); skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); if (!skb) @@ -995,6 +1845,16 @@ cmd->cac_duration_ms = cpu_to_le32(arg->cac_duration_ms); cmd->regdomain = cpu_to_le32(arg->regdomain); cmd->he_ops = cpu_to_le32(arg->he_ops); + cmd->mbssid_flags = cpu_to_le32(arg->mbssid_flags); + cmd->mbssid_tx_vdev_id = cpu_to_le32(arg->mbssid_tx_vdev_id); + + if (device_params_present) { + arg->ru_punct_bitmap = ath12k_wmi_set_ru_punc_bitmap_device(arg->channel.freq, + arg->width_device, + arg->center_freq_device, + arg->ru_punct_bitmap); + } + cmd->ru_punct_bitmap = cpu_to_le32(arg->ru_punct_bitmap); if (!restart) { if (arg->ssid) { @@ -1009,10 +1869,13 @@ cmd->flags |= cpu_to_le32(WMI_VDEV_START_LDPC_RX_ENABLED); + if (test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, &ag->dev_flags)) + cmd->flags |= cpu_to_le32(WMI_VDEV_START_HW_ENCRYPTION_DISABLED); + ptr = skb->data + sizeof(*cmd); chan = ptr; - ath12k_wmi_put_wmi_channel(chan, arg); + ath12k_wmi_put_wmi_channel(chan, arg->channel); chan->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_CHANNEL, sizeof(*chan)); @@ -1024,12 +1887,74 @@ /* Note: This is a nested TLV containing: * [wmi_tlv][wmi_p2p_noa_descriptor][wmi_tlv].. */ - ptr += sizeof(*tlv); + if (ml_arg_size) { + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params)); + ptr += TLV_HDR_SIZE; + + ml_params = ptr; + + ml_params->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_VDEV_START_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params) - TLV_HDR_SIZE); + + ml_params->flags = FIELD_PREP(ATH12K_WMI_FLAG_MLO_ENABLED, + arg->ml.enabled) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_ASSOC_LINK, + arg->ml.assoc_link) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_MCAST_VDEV, + arg->ml.mcast_link) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_LINK_ADD, + arg->ml.link_add); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "vdev %d start ml flags 0x%x\n", + arg->vdev_id, ml_params->flags); + + ptr += sizeof(*ml_params); + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, arg->ml.num_partner_links * + sizeof(*partner_info)); + ptr += TLV_HDR_SIZE; + + partner_info = ptr; + + for (i = 0; i < arg->ml.num_partner_links; i++) { + partner_info->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_MLO_PARTNER_LINK_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*partner_info) - + TLV_HDR_SIZE); + + partner_info->vdev_id = arg->ml.partner_info[i].vdev_id; + partner_info->hw_link_id = arg->ml.partner_info[i].hw_link_id; + ether_addr_copy(partner_info->vdev_addr.addr, arg->ml.partner_info[i].addr); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "partner vdev %d hw_link_id %d macaddr%pM\n", + partner_info->vdev_id, partner_info->hw_link_id, + partner_info->vdev_addr.addr); + partner_info++; + } + } + + if (device_params_present) { + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, + sizeof(*chan_device)); + ptr += TLV_HDR_SIZE; + + chan_device = ptr; + ath12k_wmi_set_wmi_channel_device(chan_device, &arg->channel, + arg->center_freq_device, + arg->width_device); + ptr += sizeof(*chan_device); + } + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "vdev %s id 0x%x freq 0x%x mode 0x%x\n", restart ? "restart" : "start", arg->vdev_id, - arg->freq, arg->mode); + arg->channel.freq, arg->channel.mode); if (restart) ret = ath12k_wmi_cmd_send(wmi, skb, @@ -1046,7 +1971,7 @@ return ret; } -int ath12k_wmi_vdev_up(struct ath12k *ar, u32 vdev_id, u32 aid, const u8 *bssid) +int ath12k_wmi_vdev_up(struct ath12k *ar, struct vdev_up_params *params) { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_vdev_up_cmd *cmd; @@ -1061,14 +1986,17 @@ cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_UP_CMD, sizeof(*cmd)); - cmd->vdev_id = cpu_to_le32(vdev_id); - cmd->vdev_assoc_id = cpu_to_le32(aid); - - ether_addr_copy(cmd->vdev_bssid.addr, bssid); + cmd->vdev_id = cpu_to_le32(params->vdev_id); + cmd->vdev_assoc_id = cpu_to_le16(params->aid); + ether_addr_copy(cmd->vdev_bssid.addr, params->bssid); + cmd->profile_idx = cpu_to_le32(params->profile_idx); + cmd->profile_count = cpu_to_le32(params->profile_count); + if (params->tx_bssid) + ether_addr_copy(cmd->tx_vdev_bssid.addr, params->tx_bssid); ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI mgmt vdev up id 0x%x assoc id %d bssid %pM\n", - vdev_id, aid, bssid); + params->vdev_id, params->aid, params->bssid); ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_UP_CMDID); if (ret) { @@ -1085,9 +2013,14 @@ struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_peer_create_cmd *cmd; struct sk_buff *skb; - int ret; + int ret, len; + struct wmi_peer_create_mlo_params *ml_param; + void *ptr; + struct wmi_tlv *tlv; - skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + len = sizeof(*cmd) + TLV_HDR_SIZE + sizeof(*ml_param); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); if (!skb) return -ENOMEM; @@ -1099,9 +2032,22 @@ cmd->peer_type = cpu_to_le32(arg->peer_type); cmd->vdev_id = cpu_to_le32(arg->vdev_id); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, - "WMI peer create vdev_id %d peer_addr %pM\n", - arg->vdev_id, arg->peer_addr); + ptr = skb->data + sizeof(*cmd); + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_param)); + ptr += TLV_HDR_SIZE; + + ml_param = ptr; + ml_param->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_PEER_CREATE_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_param) - TLV_HDR_SIZE); + + ml_param->flags = FIELD_PREP(ATH12K_WMI_FLAG_MLO_ENABLED, arg->ml_enabled); + + + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, + "WMI peer create vdev_id %d peer_addr %pM ml_enabled %d\n", + arg->vdev_id, arg->peer_addr, arg->ml_enabled); ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_CREATE_CMDID); if (ret) { @@ -1131,13 +2077,162 @@ ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); cmd->vdev_id = cpu_to_le32(vdev_id); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, - "WMI peer delete vdev_id %d peer_addr %pM\n", - vdev_id, peer_addr); + ath12k_dbg(ar->ab, ATH12K_DBG_PEER, + "WMI peer delete vdev_id %d peer_addr %pM num_peer : %d\n", + vdev_id, peer_addr, ar->num_peers); ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_DELETE_CMDID); if (ret) { - ath12k_warn(ar->ab, "failed to send WMI_PEER_DELETE cmd\n"); + ath12k_warn(ar->ab, "failed to send WMI_PEER_DELETE cmd" + " peer_addr %pM num_peer : %d\n", + peer_addr, ar->num_peers); + dev_kfree_skb(skb); + } + + return ret; +} + +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +int ath12k_wmi_config_peer_ppeds_routing(struct ath12k *ar, + const u8 *peer_addr, u8 vdev_id, + u32 service_code, u32 priority_valid, + u32 src_info, bool ppe_routing_enable) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct sk_buff *skb; + struct wmi_peer_config_ppeds_cmd *cmd; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd =(struct wmi_peer_config_ppeds_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_CONFIG_PPEDS_ROUTING, + sizeof(*cmd)); + + ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->ppe_routing_enable = cpu_to_le32(ppe_routing_enable); + cmd->service_code = cpu_to_le32(service_code); + cmd->priority_valid = cpu_to_le32(priority_valid); + cmd->src_info = cpu_to_le32(src_info); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_CONFIG_PPE_DS_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_PEER_CONFIG_PPE_DS cmd" + " peer_addr %pM num_peer : %d\n", + peer_addr, ar->num_peers); + dev_kfree_skb(skb); + } + ath12k_dbg(ar->ab, ATH12K_DBG_PPE, + "ppe ds routing cmd peer_addr %pM vdev_id %d service_code %d " \ + "priority_valid %d src_info %d ppe_routing_enable %d \n", + peer_addr, vdev_id, service_code, priority_valid, + src_info, ppe_routing_enable); + + return ret; +} + +int +ath12k_wmi_send_vdev_set_intra_bss_cmd(struct ath12k *ar, + u32 vdev_id, u32 enable) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_vdev_set_intra_bss_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(struct ath12k_vdev_set_intra_bss_cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct ath12k_vdev_set_intra_bss_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_VDEV_SET_INTRA_BSS_PARAMS, + sizeof(*cmd)); + cmd->vdev_id = vdev_id; + cmd->enable = enable; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_SET_INTRA_BSS_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_VDEV_SET_INTRA_BSS_CMDID\n"); + dev_kfree_skb(skb); + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI vdev id 0x%x set inra bss %s\n", + vdev_id, enable?"enable":"disable"); + + return ret; +} + +int ath12k_wmi_set_peer_intra_bss_cmd(struct ath12k *ar, u32 vdev_id, const u8 *peer_addr, + u32 enable) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_peer_set_intra_bss_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_peer_set_intra_bss_param_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_SET_INTRA_BSS_PARAMS, + sizeof(*cmd)); + ether_addr_copy(cmd->peer_macaddr.addr, peer_addr); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->enable = cpu_to_le32(enable); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_SET_INTRA_BSS_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_PEER_SET_INTRA_BSS_CMD\n"); + dev_kfree_skb(skb); + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI vdev %d peer 0x%pM set intra_bss %s\n", + vdev_id, peer_addr, enable ? "enable" : "disable"); + + return ret; +} +#endif /* CONFIG_ATH12K_PPE_DS_SUPPORT */ + +int ath12k_wmi_send_pdev_pkt_route(struct ath12k *ar, + struct ath12k_wmi_pkt_route_param *param) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pdev_pkt_route_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_pkt_route_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_UPDATE_PKT_ROUTING_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + + cmd->pdev_id = ar->pdev->pdev_id; + cmd->opcode = param->opcode; + cmd->route_type_bmap = param->route_type_bmap; + cmd->dst_ring = param->dst_ring; + cmd->meta_data = param->meta_data; + cmd->dst_ring_handler = param->dst_ring_handler; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "CCE PPE WMI pdev pkt route opcode %d route_bmap %d dst_ring %d meta_data %d" \ + "dst_ring_handler %d\n", param->opcode, param->route_type_bmap, + param->dst_ring, param->meta_data, param->dst_ring_handler); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_UPDATE_PKT_ROUTING_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_PDEV_UPDATE_PKT_ROUTING cmd\n"); dev_kfree_skb(skb); } @@ -1331,7 +2426,7 @@ } int ath12k_wmi_pdev_set_param(struct ath12k *ar, u32 param_id, - u32 param_value, u8 pdev_id) + s32 param_value, u8 pdev_id) { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_pdev_set_param_cmd *cmd; @@ -1349,7 +2444,7 @@ cmd->param_id = cpu_to_le32(param_id); cmd->param_value = cpu_to_le32(param_value); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + ath12k_dbg(ar->ab, ATH12K_DBG_SET(WMI, L2), "WMI pdev set param %d pdev id %d value %d\n", param_id, pdev_id, param_value); @@ -1474,6 +2569,7 @@ cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_BSS_CHAN_INFO_REQUEST, sizeof(*cmd)); cmd->req_type = cpu_to_le32(type); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI bss chan info req type %d\n", type); @@ -1557,12 +2653,12 @@ return ret; } -int ath12k_wmi_force_fw_hang_cmd(struct ath12k *ar, u32 type, u32 delay_time_ms) +int ath12k_wmi_force_fw_hang_cmd(struct ath12k *ar, u32 type, u32 delay_time_ms, bool nowait) { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_force_fw_hang_cmd *cmd; struct sk_buff *skb; - int ret, len; + int ret = 0, len; len = sizeof(*cmd); @@ -1577,8 +2673,10 @@ cmd->type = cpu_to_le32(type); cmd->delay_time_ms = cpu_to_le32(delay_time_ms); + if (nowait) + ath12k_wmi_cmd_send_nowait(wmi, skb, WMI_FORCE_FW_HANG_CMDID); + else ret = ath12k_wmi_cmd_send(wmi, skb, WMI_FORCE_FW_HANG_CMDID); - if (ret) { ath12k_warn(ar->ab, "Failed to send WMI_FORCE_FW_HANG_CMDID"); dev_kfree_skb(skb); @@ -1620,6 +2718,142 @@ return ret; } +int ath12k_wmi_send_stats_request_cmd(struct ath12k *ar, u32 stats_id, + u32 vdev_id, u32 pdev_id) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_request_stats_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_request_stats_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_REQUEST_STATS_CMD, + sizeof(*cmd)); + + cmd->stats_id = cpu_to_le32(stats_id); + cmd->vdev_id = cpu_to_le32(vdev_id); + cmd->pdev_id = cpu_to_le32(pdev_id); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_REQUEST_STATS_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_REQUEST_STATS cmd\n"); + dev_kfree_skb(skb); + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI request stats 0x%x vdev id %d pdev id %d\n", + stats_id, vdev_id, pdev_id); + + return ret; +} + +static void ath12k_wmi_copy_coex_config(struct ath12k *ar, struct wmi_coex_config_cmd *cmd, + struct coex_config_arg *coex_config) +{ + switch (coex_config->config_type) { + case WMI_COEX_CONFIG_BTC_ENABLE: + cmd->coex_enable = coex_config->coex_enable; + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI coex config type %u vdev id %d" + " coex_enable %u\n", + coex_config->config_type, + coex_config->vdev_id, + coex_config->coex_enable); + break; + case WMI_COEX_CONFIG_WLAN_PKT_PRIORITY: + cmd->wlan_pkt_type = coex_config->wlan_pkt_type; + cmd->wlan_pkt_weight = coex_config->wlan_pkt_weight; + cmd->bt_pkt_weight = coex_config->bt_pkt_weight; + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI coex config type %u vdev id %d" + " wlan pkt type 0x%x wlan pkt weight %u" + " bt pkt weight %u\n", + coex_config->config_type, + coex_config->vdev_id, + coex_config->wlan_pkt_type, + coex_config->wlan_pkt_weight, + coex_config->bt_pkt_weight); + break; + case WMI_COEX_CONFIG_PTA_INTERFACE: + cmd->pta_num = coex_config->pta_num; + cmd->coex_mode = coex_config->coex_mode; + cmd->bt_txrx_time = coex_config->bt_txrx_time; + cmd->bt_priority_time = coex_config->bt_priority_time; + cmd->pta_algorithm = coex_config->pta_algorithm; + cmd->pta_priority = coex_config->pta_priority; + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI coex config type %u vdev id %d" + " pta num %u coex mode 0x%x" + " bt_txrx_time 0x%x" + " bt_priority_time 0x%x pta alogrithm 0x%x" + " pta priority 0x%x\n", + coex_config->config_type, + coex_config->vdev_id, + coex_config->pta_num, + coex_config->coex_mode, + coex_config->bt_txrx_time, + coex_config->bt_priority_time, + coex_config->pta_algorithm, + coex_config->pta_priority); + break; + case WMI_COEX_CONFIG_AP_TDM: + cmd->duty_cycle = coex_config->duty_cycle; + cmd->wlan_duration = coex_config->wlan_duration; + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI coex config type %u vdev id %d" + " duty_cycle %u wlan_duration %u\n", + coex_config->config_type, + coex_config->vdev_id, + coex_config->duty_cycle, + coex_config->wlan_duration); + break; + case WMI_COEX_CONFIG_FORCED_ALGO: + cmd->coex_algo = coex_config->coex_algo; + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI coex config type %u vdev id %d" + " coex_algorithm %u\n", + coex_config->config_type, + coex_config->vdev_id, + coex_config->coex_algo); + break; + default: + break; + } +} + +int ath12k_send_coex_config_cmd(struct ath12k *ar, + struct coex_config_arg *coex_config) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_coex_config_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_coex_config_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_COEX_CONFIG_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + + cmd->vdev_id = coex_config->vdev_id; + cmd->config_type = coex_config->config_type; + ath12k_wmi_copy_coex_config(ar, cmd, coex_config); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_COEX_CONFIG_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_COEX_CONFIG_CMD cmd\n"); + dev_kfree_skb(skb); + } + + return ret; +} + int ath12k_wmi_send_pdev_temperature_cmd(struct ath12k *ar) { struct ath12k_wmi_pdev *wmi = ar->wmi; @@ -1681,9 +2915,167 @@ return ret; } +static void ath12k_wmi_bcn_fill_ml_info(struct ath12k_link_vif *arvif, + struct wmi_bcn_tmpl_ml_info *ml_info, + u64 non_tx_ml_vdev_bmap) +{ + struct ath12k_base *ab = arvif->ar->ab; + struct ieee80211_bss_conf *link_conf; + /* u32 vdev_id = arvif->vdev_id; */ + unsigned long vdev_map_cat1 = 0; + unsigned long vdev_map_cat2 = 0; + + rcu_read_lock(); + + link_conf = ath12k_get_link_bss_conf(arvif); + if (!link_conf) { + rcu_read_unlock(); + goto err_fill_ml_info; + } + + rcu_read_unlock(); + + ml_info->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BCN_TMPL_ML_INFO_CMD, + sizeof(*ml_info)); + ml_info->hw_link_id = cpu_to_le32(arvif->ar->pdev->hw_link_id); + + /* if this is cu cat 1 for tx vdev, then it applies to all + * non-tx vdevs as well set all non-tx mld's vdev id in bitmap + */ + + /* FIXME: disabled to make it compile without mlo */ + WARN(1, "mlo not supported"); + /* if (link_conf->elemid_added) { */ + /* set_bit(vdev_id, &vdev_map_cat1); */ + /* vdev_map_cat1 |= non_tx_ml_vdev_bmap; */ + /* } */ + + /* if (link_conf->elemid_modified) { */ + /* set_bit(vdev_id, &vdev_map_cat2); */ + /* vdev_map_cat2 |= non_tx_ml_vdev_bmap; */ + /* } */ + +err_fill_ml_info: + ml_info->cu_vdev_map_cat1_lo = + cpu_to_le32(ATH12K_GET_LOWER_32_BITS(vdev_map_cat1)); + ml_info->cu_vdev_map_cat1_hi = + cpu_to_le32(ATH12K_GET_UPPER_32_BITS(vdev_map_cat1)); + ml_info->cu_vdev_map_cat2_lo = + cpu_to_le32(ATH12K_GET_LOWER_32_BITS(vdev_map_cat2)); + ml_info->cu_vdev_map_cat2_hi = + cpu_to_le32(ATH12K_GET_UPPER_32_BITS(vdev_map_cat2)); + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi CU filled ml info cat1_lo=0x%x cat1_hi=0x%x cat2_lo=0x%x cat2_hi=0x%x non_tx_ml_bmap=%llu\n", + ml_info->cu_vdev_map_cat1_lo, ml_info->cu_vdev_map_cat1_hi, + ml_info->cu_vdev_map_cat2_lo, ml_info->cu_vdev_map_cat2_hi, + non_tx_ml_vdev_bmap); +} + +static void ath12k_wmi_fill_cu_arg(struct ath12k_link_vif *arvif, + struct wmi_critical_update_arg *cu_arg) +{ + struct ath12k_base *ab = arvif->ar->ab; + struct ath12k_link_vif *arvif_iter; + struct wmi_bcn_tmpl_ml_info *ml_info; + int i; + unsigned long non_tx_ml_vdev_bmap = 0; + struct ath12k *ar = arvif->ar; + struct ath12k_prb_resp_tmpl_ml_info *ar_ml_info; + + list_for_each_entry(arvif_iter, &arvif->ar->arvifs, list) { + if (arvif_iter != arvif && arvif_iter->tx_vdev_id == arvif->vdev_id && + ath12k_mac_is_ml_arvif(arvif_iter)) + set_bit(arvif_iter->vdev_id, &non_tx_ml_vdev_bmap); + } + if (!ath12k_mac_is_ml_arvif(arvif) && !non_tx_ml_vdev_bmap) + return; + + /* Fill ML params + * ML params should be filled for all partner links + */ + cu_arg->num_ml_params = 0; + /* TODO: Fill ML params. Will work without this info too */ + + /* Fill ML info + * ML info should be filled for impacted link only + */ + cu_arg->num_ml_info = 1; + cu_arg->ml_info = (struct wmi_bcn_tmpl_ml_info *) + kzalloc((cu_arg->num_ml_info * sizeof(*ml_info)), + GFP_KERNEL); + + if (!cu_arg->ml_info) { + ath12k_warn(ab, "wmi failed to get memory for ml info"); + cu_arg->num_ml_info = 0; + } else { + for (i = 0; i < cu_arg->num_ml_info; i++) { + ml_info = &cu_arg->ml_info[i]; + ath12k_wmi_bcn_fill_ml_info(arvif, ml_info, non_tx_ml_vdev_bmap); + /* Retain copy of CU vdev bitmap. Which are used to + * update cu_vdev_map in 20TU probe response template. + */ + if (ar->supports_6ghz) { + ar_ml_info = &arvif->ml_info; + ar_ml_info->hw_link_id = ml_info->hw_link_id; + ar_ml_info->cu_vdev_map_cat1_lo = ml_info->cu_vdev_map_cat1_lo; + ar_ml_info->cu_vdev_map_cat1_hi = ml_info->cu_vdev_map_cat1_hi; + ar_ml_info->cu_vdev_map_cat2_lo = ml_info->cu_vdev_map_cat2_lo; + ar_ml_info->cu_vdev_map_cat2_hi = ml_info->cu_vdev_map_cat2_hi; + } + } + } +} + +static void * +ath12k_wmi_append_critical_update_params(struct ath12k *ar, u32 vdev_id, + void *ptr, + struct wmi_critical_update_arg *cu_arg) +{ + struct wmi_bcn_tmpl_ml_params *ml_params; + struct wmi_bcn_tmpl_ml_info *ml_info; + void *start = ptr; + struct wmi_tlv *tlv; + size_t ml_params_len = cu_arg->num_ml_params * sizeof(*ml_params); + size_t ml_info_len = cu_arg->num_ml_info * sizeof(*ml_info); + int i; + + /* Add ML params */ + tlv = (struct wmi_tlv *)ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, ml_params_len); + ml_params = (struct wmi_bcn_tmpl_ml_params *)tlv->value; + + for (i = 0; i < cu_arg->num_ml_params; i++) + memcpy(&ml_params[i], &cu_arg->ml_params[i], + sizeof(*ml_params)); + + if (cu_arg->num_ml_params) + kfree(cu_arg->ml_params); + + ptr += TLV_HDR_SIZE + ml_params_len; + + /* Add ML info */ + tlv = (struct wmi_tlv *)ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, ml_info_len); + ml_info = (struct wmi_bcn_tmpl_ml_info *)tlv->value; + + for (i = 0; i < cu_arg->num_ml_info; i++) + memcpy(&ml_info[i], &cu_arg->ml_info[i], + sizeof(*ml_info)); + + if (cu_arg->num_ml_info) + kfree(cu_arg->ml_info); + + ptr += TLV_HDR_SIZE + ml_info_len; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "wmi %ld bytes of additional data filled for CU\n", + (unsigned long)(ptr - start)); + return ptr; +} + int ath12k_wmi_bcn_tmpl(struct ath12k *ar, u32 vdev_id, struct ieee80211_mutable_offsets *offs, - struct sk_buff *bcn) + struct sk_buff *bcn, u32 ema_params) { struct ath12k_wmi_pdev *wmi = ar->wmi; struct wmi_bcn_tmpl_cmd *cmd; @@ -1693,12 +3085,32 @@ void *ptr; int ret, len; size_t aligned_len = roundup(bcn->len, 4); + struct ath12k_link_vif *arvif = ath12k_mac_get_arvif(ar, vdev_id); + struct wmi_critical_update_arg cu_arg = { + .num_ml_params = 0, + .ml_params = NULL, + .num_ml_info = 0, + .ml_info = NULL, + }; + + if (WARN_ON(!arvif)) + return -EINVAL; + + ath12k_wmi_fill_cu_arg(arvif, &cu_arg); - len = sizeof(*cmd) + sizeof(*bcn_prb_info) + TLV_HDR_SIZE + aligned_len; + len = sizeof(*cmd) + sizeof(*bcn_prb_info) + TLV_HDR_SIZE + aligned_len + + TLV_HDR_SIZE + (sizeof(struct wmi_bcn_tmpl_ml_params) * cu_arg.num_ml_params) + + TLV_HDR_SIZE + (sizeof(struct wmi_bcn_tmpl_ml_info) * cu_arg.num_ml_info); skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); - if (!skb) + if (!skb) { + if (cu_arg.num_ml_params) + kfree(cu_arg.ml_params); + if (cu_arg.num_ml_info) + kfree(cu_arg.ml_info); + return -ENOMEM; + } cmd = (struct wmi_bcn_tmpl_cmd *)skb->data; cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_BCN_TMPL_CMD, @@ -1707,7 +3119,12 @@ cmd->tim_ie_offset = cpu_to_le32(offs->tim_offset); cmd->csa_switch_count_offset = cpu_to_le32(offs->cntdwn_counter_offs[0]); cmd->ext_csa_switch_count_offset = cpu_to_le32(offs->cntdwn_counter_offs[1]); + cmd->csa_event_bitmap = cpu_to_le32(0xFFFFFFFF); cmd->buf_len = cpu_to_le32(bcn->len); + cmd->mbssid_ie_offset = cpu_to_le32(offs->mbssid_off); + cmd->ema_params = cpu_to_le32(ema_params); + cmd->feature_enable_bitmap = cpu_to_le32(u32_encode_bits(arvif->beacon_prot, + WMI_BEACON_PROTECTION_EN_BIT)); ptr = skb->data + sizeof(*cmd); @@ -1724,6 +3141,11 @@ tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, aligned_len); memcpy(tlv->value, bcn->data, bcn->len); + ptr += (TLV_HDR_SIZE + aligned_len); + + ptr = ath12k_wmi_append_critical_update_params(ar, vdev_id, ptr, + &cu_arg); + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_BCN_TMPL_CMDID); if (ret) { ath12k_warn(ar->ab, "failed to send WMI_BCN_TMPL_CMDID\n"); @@ -1805,6 +3227,8 @@ cmd->peer_flags |= cpu_to_le32(WMI_PEER_80MHZ); if (arg->bw_160) cmd->peer_flags |= cpu_to_le32(WMI_PEER_160MHZ); + if (arg->bw_320) + cmd->peer_flags_ext |= cpu_to_le32(WMI_PEER_EXT_320MHZ); /* Typically if STBC is enabled for VHT it should be enabled * for HT as well @@ -1832,6 +3256,8 @@ cmd->peer_flags |= cpu_to_le32(WMI_PEER_TWT_REQ); if (arg->twt_responder) cmd->peer_flags |= cpu_to_le32(WMI_PEER_TWT_RESP); + if (arg->eht_flag) + cmd->peer_flags_ext |= cpu_to_le32(WMI_PEER_EXT_EHT); } /* Suppress authorization for all AUTH modes that need 4-way handshake @@ -1842,7 +3268,7 @@ cmd->peer_flags |= cpu_to_le32(WMI_PEER_AUTH); if (arg->need_ptk_4_way) { cmd->peer_flags |= cpu_to_le32(WMI_PEER_NEED_PTK_4_WAY); - if (!hw_crypto_disabled) + if (!hw_crypto_disabled && arg->is_assoc) cmd->peer_flags &= cpu_to_le32(~WMI_PEER_AUTH); } if (arg->need_gtk_2_way) @@ -1869,19 +3295,54 @@ cmd->peer_flags &= cpu_to_le32(~WMI_PEER_HT); } +static int ath12k_wmi_get_emlsr_pad_delay(u8 emlsr_pad_delay, + u32 *emlsr_pad_delay_us) +{ + u16 pad_delay_us[EMLSR_DELAY_MAX] = {0, 32, 64, 128, 256}; + + if (!emlsr_pad_delay_us) + return -EINVAL; + + if (emlsr_pad_delay >= EMLSR_DELAY_MAX) + return -EINVAL; + + *emlsr_pad_delay_us = pad_delay_us[emlsr_pad_delay]; + return 0; +} + +static int ath12k_get_emlsr_tran_delay(u8 emlsr_trans_delay, + u32 *emlsr_trans_delay_us) +{ + u16 delay_us[EMLSR_TRANS_DELAY_MAX] = {0, 16, 32, 64, 128, 256}; + + if (!emlsr_trans_delay_us) + return -EINVAL; + + if (emlsr_trans_delay >= EMLSR_TRANS_DELAY_MAX) + return -EINVAL; + + *emlsr_trans_delay_us = delay_us[emlsr_trans_delay]; + return 0; +} + int ath12k_wmi_send_peer_assoc_cmd(struct ath12k *ar, struct ath12k_wmi_peer_assoc_arg *arg) { struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_hw_group *ag = ar->ab->ag; struct wmi_peer_assoc_complete_cmd *cmd; struct ath12k_wmi_vht_rate_set_params *mcs; struct ath12k_wmi_he_rate_set_params *he_mcs; + struct wmi_eht_rate_set *eht_mcs; + struct wmi_peer_assoc_mlo_params *ml_params; + struct wmi_peer_assoc_mlo_partner_info *partner_info; struct sk_buff *skb; struct wmi_tlv *tlv; void *ptr; u32 peer_legacy_rates_align; u32 peer_ht_rates_align; int i, ret, len; + bool emlsr_support; peer_legacy_rates_align = roundup(arg->peer_legacy_rates.num_rates, sizeof(u32)); @@ -1892,7 +3353,11 @@ TLV_HDR_SIZE + (peer_legacy_rates_align * sizeof(u8)) + TLV_HDR_SIZE + (peer_ht_rates_align * sizeof(u8)) + sizeof(*mcs) + TLV_HDR_SIZE + - (sizeof(*he_mcs) * arg->peer_he_mcs_count); + (sizeof(*he_mcs) * arg->peer_he_mcs_count) + + TLV_HDR_SIZE + (sizeof(*eht_mcs) * arg->peer_eht_mcs_count) + + TLV_HDR_SIZE + sizeof(*ml_params) + + TLV_HDR_SIZE + (arg->ml.num_partner_links * sizeof(*partner_info)); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); if (!skb) @@ -1908,10 +3373,11 @@ cmd->peer_new_assoc = cpu_to_le32(arg->peer_new_assoc); cmd->peer_associd = cpu_to_le32(arg->peer_associd); + cmd->ru_punct_bitmap = cpu_to_le32(arg->ru_punct_bitmap); ath12k_wmi_copy_peer_flags(cmd, arg, test_bit(ATH12K_FLAG_HW_CRYPTO_DISABLED, - &ar->ab->dev_flags)); + &ag->dev_flags)); ether_addr_copy(cmd->peer_macaddr.addr, arg->peer_mac); @@ -1939,6 +3405,17 @@ cmd->peer_ppet.ppet16_ppet8_ru3_ru0[i] = cpu_to_le32(arg->peer_ppet.ppet16_ppet8_ru3_ru0[i]); + /* Update 11be capabilities */ + memcpy_and_pad(cmd->peer_eht_cap_mac, sizeof(cmd->peer_eht_cap_mac), + arg->peer_eht_cap_mac, sizeof(arg->peer_eht_cap_mac), + 0); + memcpy_and_pad(cmd->peer_eht_cap_phy, sizeof(cmd->peer_eht_cap_phy), + arg->peer_eht_cap_phy, sizeof(arg->peer_eht_cap_phy), + 0); + memcpy_and_pad(&cmd->peer_eht_ppet, sizeof(cmd->peer_eht_ppet), + &arg->peer_eht_ppet, sizeof(arg->peer_eht_ppet), 0); + cmd->peer_eht_ops = arg->peer_eht_ops; + /* Update peer legacy rate information */ ptr += sizeof(*cmd); @@ -2000,13 +3477,118 @@ he_mcs->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_HE_RATE_SET, sizeof(*he_mcs)); - he_mcs->rx_mcs_set = cpu_to_le32(arg->peer_he_rx_mcs_set[i]); - he_mcs->tx_mcs_set = cpu_to_le32(arg->peer_he_tx_mcs_set[i]); + he_mcs->rx_mcs_set = cpu_to_le32(arg->peer_he_tx_mcs_set[i]); + he_mcs->tx_mcs_set = cpu_to_le32(arg->peer_he_rx_mcs_set[i]); ptr += sizeof(*he_mcs); } + /* MLO params */ + emlsr_support = FIELD_GET(IEEE80211_EML_CAP_EMLSR_SUPP, arg->ml.eml_caps); + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params)); + ptr += TLV_HDR_SIZE; + + ml_params = ptr; + ml_params->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_PEER_ASSOC_PARAMS) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*ml_params) - TLV_HDR_SIZE); + + ml_params->flags = FIELD_PREP(ATH12K_WMI_FLAG_MLO_ENABLED, + arg->ml.enabled) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_ASSOC_LINK, + arg->ml.assoc_link) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC, + arg->ml.primary_umac) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_LOGICAL_LINK_IDX_VALID, + arg->ml.logical_link_idx_valid) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_PEER_ID_VALID, + arg->ml.peer_id_valid) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_EMLSR_SUPPORT, + emlsr_support); + + ether_addr_copy(ml_params->mld_addr.addr, arg->ml.mld_addr); + ml_params->logical_link_idx = arg->ml.logical_link_idx; + ml_params->ml_peer_id = arg->ml.ml_peer_id; + ml_params->ieee_link_id = arg->ml.ieee_link_id; + + /* emlsr params */ + if (emlsr_support) { + u8 timeout; + /*get emlsr padding delay subfield, if invalid use 0us*/ + ath12k_wmi_get_emlsr_pad_delay( + FIELD_GET(IEEE80211_EML_CAP_EMLSR_PADDING_DELAY, + arg->ml.eml_caps), + &ml_params->emlsr_padding_delay_us); + /*get emlsr trans delay subfield value, if invalid use 0us*/ + ath12k_get_emlsr_tran_delay(FIELD_GET(IEEE80211_EML_CAP_EMLSR_TRANSITION_DELAY, + arg->ml.eml_caps), + &ml_params->emlsr_trans_delay_us); + + timeout = FIELD_GET(IEEE80211_EML_CAP_TRANSITION_TIMEOUT, + arg->ml.eml_caps); + if (timeout < EMLCAP_TIMEOUT_MAX) + ml_params->emlsr_trans_timeout_us = eml_trans_timeout[timeout]; + else + ath12k_warn(ar->ab, "Invalid emlsr trans timeout \n"); + } + ptr += sizeof(*ml_params); + + /* Loop through the EHT rate set. + */ + len = arg->peer_eht_mcs_count * sizeof(*eht_mcs); + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, len); + ptr += TLV_HDR_SIZE; + + for (i = 0; i < arg->peer_eht_mcs_count; i++) { + eht_mcs = ptr; + eht_mcs->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_EHT_RATE_SET) | + FIELD_PREP(WMI_TLV_LEN, + sizeof(*eht_mcs) - TLV_HDR_SIZE); + eht_mcs->rx_mcs_set = arg->peer_eht_rx_mcs_set[i]; + eht_mcs->tx_mcs_set = arg->peer_eht_tx_mcs_set[i]; + ptr += sizeof(*eht_mcs); + } + + /* fill ML Partner links */ + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, + arg->ml.num_partner_links * sizeof(*partner_info)); + ptr += TLV_HDR_SIZE; + + for (i = 0; i < arg->ml.num_partner_links; i++) { + partner_info = ptr; + partner_info->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_MLO_PARTNER_LINK_PARAMS_PEER_ASSOC) | + FIELD_PREP(WMI_TLV_LEN, + sizeof(*partner_info) - TLV_HDR_SIZE); + partner_info->vdev_id = arg->ml.partner_info[i].vdev_id; + partner_info->hw_link_id = arg->ml.partner_info[i].hw_link_id; + + partner_info->flags = FIELD_PREP(ATH12K_WMI_FLAG_MLO_ENABLED, 1) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_ASSOC_LINK, + arg->ml.partner_info[i].assoc_link) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC, + arg->ml.partner_info[i].primary_umac) | + FIELD_PREP(ATH12K_WMI_FLAG_MLO_LOGICAL_LINK_IDX_VALID, + arg->ml.partner_info[i].logical_link_idx_valid); + partner_info->logical_link_idx = arg->ml.partner_info[i].logical_link_idx; + ptr += sizeof(*partner_info); + } + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_ASSOC_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_PEER_ASSOC_CMDID\n"); + dev_kfree_skb(skb); + } + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, - "wmi peer assoc vdev id %d assoc id %d peer mac %pM peer_flags %x rate_caps %x peer_caps %x listen_intval %d ht_caps %x max_mpdu %d nss %d phymode %d peer_mpdu_density %d vht_caps %x he cap_info %x he ops %x he cap_info_ext %x he phy %x %x %x peer_bw_rxnss_override %x\n", + "wmi peer assoc vdev id %d assoc id %d peer mac %pM peer_flags %x rate_caps %x peer_caps %x listen_intval %d ht_caps %x max_mpdu %d nss %d phymode %d peer_mpdu_density %d vht_caps %x he cap_info %x he ops %x he cap_info_ext %x he phy %x %x %x peer_bw_rxnss_override %x peer_flags_ext %x eht mac_cap %x %x eht phy_cap %x %x %x eht ops %x ml flags %x mld_addr %pM logical_link_idx %u ml peer id %d ieee_link_id %u num_partner_links %d\n", cmd->vdev_id, cmd->peer_associd, arg->peer_mac, cmd->peer_flags, cmd->peer_rate_caps, cmd->peer_caps, cmd->peer_listen_intval, cmd->peer_ht_caps, @@ -2016,14 +3598,14 @@ cmd->peer_he_ops, cmd->peer_he_cap_info_ext, cmd->peer_he_cap_phy[0], cmd->peer_he_cap_phy[1], cmd->peer_he_cap_phy[2], - cmd->peer_bw_rxnss_override); - - ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_ASSOC_CMDID); - if (ret) { - ath12k_warn(ar->ab, - "failed to send WMI_PEER_ASSOC_CMDID\n"); - dev_kfree_skb(skb); - } + cmd->peer_bw_rxnss_override, cmd->peer_flags_ext, + cmd->peer_eht_cap_mac[0], cmd->peer_eht_cap_mac[1], + cmd->peer_eht_cap_phy[0], cmd->peer_eht_cap_phy[1], + cmd->peer_eht_cap_phy[2], cmd->peer_eht_ops, + ml_params->flags, ml_params->mld_addr.addr, + ml_params->logical_link_idx, ml_params->ml_peer_id, + ml_params->ieee_link_id, + arg->ml.num_partner_links); return ret; } @@ -2033,16 +3615,16 @@ { /* setup commonly used values */ arg->scan_req_id = 1; - arg->scan_priority = WMI_SCAN_PRIORITY_LOW; - arg->dwell_time_active = 50; - arg->dwell_time_active_2g = 0; + arg->scan_priority = WMI_SCAN_PRIORITY_MEDIUM; + arg->dwell_time_active = 175; + arg->dwell_time_active_2g = 175; arg->dwell_time_passive = 150; - arg->dwell_time_active_6g = 40; - arg->dwell_time_passive_6g = 30; + arg->dwell_time_active_6g = 70; + arg->dwell_time_passive_6g = 70; arg->min_rest_time = 50; arg->max_rest_time = 500; arg->repeat_probe_time = 0; - arg->probe_spacing_time = 0; + arg->probe_spacing_time = 100; arg->idle_time = 0; arg->max_scan_time = 20000; arg->probe_delay = 5; @@ -2051,7 +3633,8 @@ WMI_SCAN_EVENT_BSS_CHANNEL | WMI_SCAN_EVENT_FOREIGN_CHAN | WMI_SCAN_EVENT_DEQUEUED; - arg->scan_flags |= WMI_SCAN_CHAN_STAT_EVENT; + arg->scan_flags |= WMI_SCAN_CHAN_STAT_EVENT | + WMI_SCAN_FLAG_FORCE_ACTIVE_ON_DFS; arg->num_bssid = 1; /* fill bssid_list[0] with 0xff, otherwise bssid and RA will be @@ -2145,7 +3728,7 @@ void *ptr; int i, ret, len; u32 *tmp_ptr; - u8 extraie_len_with_pad = 0; + u16 extraie_len_with_pad = 0; struct ath12k_wmi_hint_short_ssid_arg *s_ssid = NULL; struct ath12k_wmi_hint_bssid_arg *hint_bssid = NULL; @@ -2164,7 +3747,7 @@ len += sizeof(*bssid) * arg->num_bssid; len += TLV_HDR_SIZE; - if (arg->extraie.len) + if (arg->extraie.len && arg->extraie.len <= 0xFFFF) extraie_len_with_pad = roundup(arg->extraie.len, sizeof(u32)); len += extraie_len_with_pad; @@ -2266,7 +3849,7 @@ tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, len); ptr += TLV_HDR_SIZE; - if (arg->extraie.len) + if (extraie_len_with_pad) memcpy(ptr, arg->extraie.ptr, arg->extraie.len); @@ -2311,6 +3894,69 @@ return ret; } +int ath12k_wmi_send_vdev_set_tpc_power(struct ath12k *ar, + u32 vdev_id, + struct ath12k_reg_tpc_power_info *param) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_vdev_set_tpc_power_cmd *cmd; + struct wmi_vdev_ch_power_info *ch; + struct sk_buff *skb; + struct wmi_tlv *tlv; + u8 *ptr; + int i, ret, len; + + len = sizeof(*cmd) + TLV_HDR_SIZE; + len += (sizeof(struct wmi_vdev_ch_power_info) * param->num_pwr_levels); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + ptr = skb->data; + + cmd = (struct wmi_vdev_set_tpc_power_cmd *)ptr; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_SET_TPC_POWER_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->vdev_id = vdev_id; + cmd->psd_power = param->is_psd_power; + cmd->eirp_power = param->eirp_power; + cmd->power_type_6ghz = param->power_type_6g; + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi TPC vdev_id: %d is_psd_power: %d eirp_power: %d power_type_6g: %d\n", + vdev_id, param->is_psd_power, param->eirp_power, param->power_type_6g); + + ptr += sizeof(*cmd); + tlv = (struct wmi_tlv *)ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, param->num_pwr_levels * sizeof(*ch)); + + ptr += TLV_HDR_SIZE; + ch = (struct wmi_vdev_ch_power_info *)ptr; + + for (i = 0; i < param->num_pwr_levels; i++, ch++) { + ch->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_VDEV_CH_POWER_INFO) | + FIELD_PREP(WMI_TLV_LEN, + sizeof(*ch) - TLV_HDR_SIZE); + + ch->chan_cfreq = param->chan_power_info[i].chan_cfreq; + ch->tx_power = param->chan_power_info[i].tx_power; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi TPC chan_cfreq: %d , tx_power: %d\n", + ch->chan_cfreq, ch->tx_power); + } + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_VDEV_SET_TPC_POWER_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_VDEV_SET_TPC_POWER_CMDID\n"); + dev_kfree_skb(skb); + } + return ret; +} + int ath12k_wmi_send_scan_stop_cmd(struct ath12k *ar, struct ath12k_wmi_scan_cancel_arg *arg) { @@ -2453,6 +4099,8 @@ WMI_CHAN_REG_INFO1_REG_CLS); *reg2 |= le32_encode_bits(channel_arg->antennamax, WMI_CHAN_REG_INFO2_ANT_MAX); + *reg2 |= le32_encode_bits(channel_arg->maxregpower, + WMI_CHAN_REG_INFO2_MAX_TX_PWR); ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI chan scan list chan[%d] = %u, chan_info->info %8x\n", @@ -2525,7 +4173,7 @@ wmm_param->acm = cpu_to_le32(wmi_wmm_arg->acm); wmm_param->no_ack = cpu_to_le32(wmi_wmm_arg->no_ack); - ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + ath12k_dbg(ar->ab, ATH12K_DBG_SET(WMI, L3), "wmi wmm set ac %d aifs %d cwmin %d cwmax %d txop %d acm %d no_ack %d\n", ac, wmm_param->aifs, wmm_param->cwmin, wmm_param->cwmax, wmm_param->txoplimit, @@ -2715,6 +4363,52 @@ return ret; } +int ath12k_wmi_pdev_peer_pktlog_filter(struct ath12k *ar, u8 *addr, u8 enable) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pdev_pktlog_filter_cmd *cmd; + struct wmi_pdev_pktlog_filter_info *info; + struct sk_buff *skb; + struct wmi_tlv *tlv; + void *ptr; + int ret, len; + + len = sizeof(*cmd) + sizeof(*info) + TLV_HDR_SIZE; + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_pktlog_filter_cmd *)skb->data; + + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD, + sizeof(*cmd)); + + cmd->pdev_id = cpu_to_le32(DP_HW2SW_MACID(ar->pdev->pdev_id)); + cmd->num_mac = cpu_to_le32(1); + cmd->enable = cpu_to_le32(enable); + + ptr = skb->data + sizeof(*cmd); + + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, sizeof(*info)); + + ptr += TLV_HDR_SIZE; + info = ptr; + + ether_addr_copy(info->peer_macaddr.addr, addr); + info->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO, + sizeof(*info)); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_PKTLOG_FILTER_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_PDEV_PKTLOG_ENABLE_CMDID\n"); + dev_kfree_skb(skb); + } + + return ret; +} + int ath12k_wmi_send_init_country_cmd(struct ath12k *ar, struct ath12k_wmi_init_country_arg *arg) { @@ -2768,6 +4462,125 @@ } int +ath12k_wmi_send_thermal_mitigation_cmd(struct ath12k *ar, + struct ath12k_wmi_thermal_mitigation_arg *arg) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_therm_throt_config_request_cmd *cmd; + struct wmi_therm_throt_level_config_info *lvl_conf; + struct wmi_tlv *tlv; + struct sk_buff *skb; + int i, ret, len; + + len = sizeof(*cmd) + TLV_HDR_SIZE + THERMAL_LEVELS * sizeof(*lvl_conf); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_therm_throt_config_request_cmd *)skb->data; + + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_THERM_THROT_CONFIG_REQUEST, + sizeof(*cmd)); + + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->enable = cpu_to_le32(arg->enable); + cmd->dc = cpu_to_le32(arg->dc); + cmd->dc_per_event = cpu_to_le32(arg->dc_per_event); + cmd->therm_throt_levels = cpu_to_le32(THERMAL_LEVELS); + + tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, + THERMAL_LEVELS * sizeof(*lvl_conf)); + + lvl_conf = (struct wmi_therm_throt_level_config_info *)(skb->data + + sizeof(*cmd) + + TLV_HDR_SIZE); + for (i = 0; i < THERMAL_LEVELS; i++) { + lvl_conf->tlv_header = + ath12k_wmi_tlv_cmd_hdr(WMI_TAG_THERM_THROT_LEVEL_CONFIG_INFO, + sizeof(*lvl_conf)); + + lvl_conf->temp_lwm = arg->levelconf[i].tmplwm; + lvl_conf->temp_hwm = arg->levelconf[i].tmphwm; + lvl_conf->dc_off_percent = arg->levelconf[i].dcoffpercent; + lvl_conf->prio = arg->levelconf[i].priority; + lvl_conf++; + } + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_THERM_THROT_SET_CONF_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send THERM_THROT_SET_CONF cmd\n"); + dev_kfree_skb(skb); + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "WMI vdev set thermal throt pdev_id %d enable %d dc %d dc_per_event %x levels %d\n", + ar->pdev->pdev_id, arg->enable, arg->dc, + arg->dc_per_event, THERMAL_LEVELS); + + return ret; +} + +int ath12k_wmi_pdev_pktlog_enable(struct ath12k *ar, u32 pktlog_filter) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pktlog_enable_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pktlog_enable_cmd *)skb->data; + + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_PKTLOG_ENABLE_CMD, + sizeof(*cmd)); + + cmd->pdev_id = cpu_to_le32(DP_HW2SW_MACID(ar->pdev->pdev_id)); + cmd->evlist = cpu_to_le32(pktlog_filter); + cmd->enable = cpu_to_le32(ATH12K_WMI_PKTLOG_ENABLE_FORCE); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_PKTLOG_ENABLE_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_PDEV_PKTLOG_ENABLE_CMDID\n"); + dev_kfree_skb(skb); + } + + return ret; +} + +int ath12k_wmi_pdev_pktlog_disable(struct ath12k *ar) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pktlog_disable_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pktlog_disable_cmd *)skb->data; + + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_PKTLOG_DISABLE_CMD, + sizeof(*cmd)); + + cmd->pdev_id = cpu_to_le32(DP_HW2SW_MACID(ar->pdev->pdev_id)); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_PKTLOG_DISABLE_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_PDEV_PKTLOG_ENABLE_CMDID\n"); + dev_kfree_skb(skb); + } + + return ret; +} + +int ath12k_wmi_send_twt_enable_cmd(struct ath12k *ar, u32 pdev_id) { struct ath12k_wmi_pdev *wmi = ar->wmi; @@ -2811,11 +4624,12 @@ /* TODO add MBSSID support */ cmd->mbss_support = 0; - ret = ath12k_wmi_cmd_send(wmi, skb, - WMI_TWT_ENABLE_CMDID); + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_TWT_ENABLE_CMDID); if (ret) { ath12k_warn(ab, "Failed to send WMI_TWT_ENABLE_CMDID"); dev_kfree_skb(skb); + } else { + ar->twt_enabled = 1; } return ret; } @@ -2840,11 +4654,587 @@ len); cmd->pdev_id = cpu_to_le32(pdev_id); - ret = ath12k_wmi_cmd_send(wmi, skb, - WMI_TWT_DISABLE_CMDID); + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_TWT_DISABLE_CMDID); if (ret) { ath12k_warn(ab, "Failed to send WMI_TWT_DISABLE_CMDID"); dev_kfree_skb(skb); + } else { + ar->twt_enabled = 0; + } + return ret; +} + +int ath12k_wmi_send_twt_add_dialog_cmd(struct ath12k *ar, + struct wmi_twt_add_dialog_params *params) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_twt_add_dialog_params_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_twt_add_dialog_params_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_ADD_DIALOG_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + + cmd->vdev_id = params->vdev_id; + ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + cmd->wake_intvl_us = params->wake_intvl_us; + cmd->wake_intvl_mantis = params->wake_intvl_mantis; + cmd->wake_dura_us = params->wake_dura_us; + cmd->sp_offset_us = params->sp_offset_us; + cmd->flags = params->twt_cmd; + if (params->flag_bcast) + cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_BCAST; + if (params->flag_trigger) + cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_TRIGGER; + if (params->flag_flow_type) + cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE; + if (params->flag_protection) + cmd->flags |= WMI_TWT_ADD_DIALOG_FLAG_PROTECTION; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi add twt dialog vdev %u dialog id %u wake interval %u mantissa %u wake duration %u service period offset %u flags 0x%x\n", + cmd->vdev_id, cmd->dialog_id, cmd->wake_intvl_us, + cmd->wake_intvl_mantis, cmd->wake_dura_us, cmd->sp_offset_us, + cmd->flags); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_TWT_ADD_DIALOG_CMDID); + + if (ret) { + ath12k_warn(ab, + "failed to send wmi command to add twt dialog: %d", + ret); + dev_kfree_skb(skb); + } + return ret; +} + +int +ath12k_wmi_send_wmi_ctrl_stats_cmd(struct ath12k *ar, + struct wmi_ctrl_path_stats_cmd_param *param) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + u32 pdev_id_array[2] = {0}; + int len, ret; + struct wmi_tlv *tlv; + struct sk_buff *skb; + struct wmi_ctrl_path_stats_cmd_param *cmd; + void *ptr; + u32 stats_id = 0; +#ifdef CONFIG_ATH12K_DEBUGFS + unsigned long time_left; +#endif + + switch (param->stats_id) { + case WMI_REQ_CTRL_PATH_PDEV_TX_STAT: + case WMI_REQ_CTRL_PATH_CAL_STAT: + case WMI_REQ_CTRL_PATH_BTCOEX_STAT: + pdev_id_array[0] = ar->pdev->pdev_id; + stats_id = (1 << param->stats_id); + break; + case WMI_REQ_CTRL_PATH_AWGN_STAT: + if (ar->supports_6ghz) { + pdev_id_array[0] = ar->pdev->pdev_id; + stats_id = (1 << param->stats_id); + } else { + ath12k_warn(ab, + "Stats id %d awgn stats are only supported for 6GHz", + param->stats_id); + return -EIO; + } + break; + /* Add case for newly wmi ctrl path stats here */ + default: + ath12k_warn(ab, "Unsupported stats id %d", param->stats_id); + return -EIO; + break; + } + + len = sizeof(*cmd) + + TLV_HDR_SIZE + sizeof(u32) + + TLV_HDR_SIZE + TLV_HDR_SIZE; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (void *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_CTRL_PATH_STATS_CMD_FIXED_PARAM) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->stats_id = stats_id; + cmd->req_id = param->req_id; + cmd->action = param->action; + + ptr = skb->data + sizeof(*cmd); + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | + FIELD_PREP(WMI_TLV_LEN, sizeof(u32)); + ptr += TLV_HDR_SIZE; + memcpy(ptr, pdev_id_array, sizeof(pdev_id_array)); + ptr += sizeof(u32); + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | + FIELD_PREP(WMI_TLV_LEN, 0); + ptr += TLV_HDR_SIZE; + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_FIXED_STRUCT) | + FIELD_PREP(WMI_TLV_LEN, 0); + ptr += TLV_HDR_SIZE; + +#ifdef CONFIG_ATH12K_DEBUGFS + if (param->action == WMI_REQUEST_CTRL_PATH_STAT_GET) + reinit_completion(&ar->debug.wmi_ctrl_path_stats_rcvd); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_REQUEST_CTRL_PATH_STATS_CMDID); + if (ret) { + dev_kfree_skb(skb); + ath12k_warn(ab, "Failed to send WMI_REQUEST_CTRL_PATH_STATS_CMDID: %d", ret); + } else { + if (param->action == WMI_REQUEST_CTRL_PATH_STAT_GET) { + time_left = wait_for_completion_timeout( + &ar->debug.wmi_ctrl_path_stats_rcvd, + WMI_CTRL_STATS_READY_TIMEOUT_HZ * HZ); + if (time_left == 0) { + ath12k_warn(ab, "timeout in receiving wmi ctrl path stats\n"); + return -ETIMEDOUT; + } + } + } +#endif + + return ret; +} + +int ath12k_wmi_send_twt_del_dialog_cmd(struct ath12k *ar, + struct wmi_twt_del_dialog_params *params) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_twt_del_dialog_params_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_twt_del_dialog_params_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_TWT_DEL_DIALOG_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + + cmd->vdev_id = params->vdev_id; + ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi delete twt dialog vdev %u dialog id %u\n", + cmd->vdev_id, cmd->dialog_id); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_TWT_DEL_DIALOG_CMDID); + if (ret) { + ath12k_warn(ab, + "failed to send wmi command to delete twt dialog: %d", + ret); + dev_kfree_skb(skb); + } + return ret; +} + +#ifdef CONFIG_ATH12K_DEBUGFS +void ath12k_wmi_crl_path_stats_list_free(struct ath12k *ar, struct list_head *head) +{ + struct wmi_ctrl_path_stats_list *stats, *tmp; + + lockdep_assert_held(&ar->wmi_ctrl_path_stats_lock); + list_for_each_entry_safe(stats, tmp, head, list) { + kfree(stats->stats_ptr); + list_del(&stats->list); + kfree(stats); + } +} + +int wmi_print_ctrl_path_pdev_tx_stats_tlv(struct ath12k_base *ab, u16 len, const void *ptr, void *data) +{ + struct wmi_ctrl_path_stats_ev_parse_param *stats_buff = (struct wmi_ctrl_path_stats_ev_parse_param *)data; + struct wmi_ctrl_path_pdev_stats *pdev_stats_skb = (struct wmi_ctrl_path_pdev_stats *)ptr; + struct wmi_ctrl_path_pdev_stats *pdev_stats = NULL; + struct wmi_ctrl_path_stats_list *stats = kzalloc(sizeof(struct wmi_ctrl_path_stats_list), GFP_ATOMIC); + struct ath12k *ar = NULL; + + if (!stats) + return -ENOMEM; + + pdev_stats = kzalloc(sizeof(*pdev_stats), GFP_ATOMIC); + if (!pdev_stats) { + kfree(stats); + return -ENOMEM; + } + + memcpy(pdev_stats, pdev_stats_skb, sizeof(struct wmi_ctrl_path_pdev_stats)); + stats->stats_ptr = pdev_stats; + list_add_tail(&stats->list, &stats_buff->list); + + ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_stats_skb->pdev_id + 1); + if (!ar) { + ath12k_warn(ab, "Failed to get ar for wmi ctrl stats\n"); + kfree(pdev_stats); + kfree(stats); + return -EINVAL; + } + + mutex_lock(&ar->wmi_ctrl_path_stats_lock); + ath12k_wmi_crl_path_stats_list_free(ar, &ar->debug.wmi_list); + mutex_unlock(&ar->wmi_ctrl_path_stats_lock); + ar->debug.wmi_ctrl_path_stats_tagid = WMI_CTRL_PATH_PDEV_STATS; + stats_buff->ar = ar; + return 0; +} + +int wmi_print_ctrl_path_cal_stats_tlv(struct ath12k_base *ab, u16 len, + const void *ptr, void *data) +{ + struct wmi_ctrl_path_stats_ev_parse_param *stats_buff = (struct wmi_ctrl_path_stats_ev_parse_param *)data; + struct wmi_ctrl_path_cal_stats *cal_stats_skb = (struct wmi_ctrl_path_cal_stats *)ptr; + struct wmi_ctrl_path_cal_stats *cal_stats = NULL; + struct wmi_ctrl_path_stats_list *stats = kzalloc(sizeof(struct wmi_ctrl_path_stats_list), GFP_ATOMIC); + struct ath12k *ar = NULL; + + if (!stats) + return -ENOMEM; + + cal_stats = kzalloc(sizeof(*cal_stats), GFP_ATOMIC); + if (!cal_stats) { + kfree(stats); + return -ENOMEM; + } + + memcpy(cal_stats, cal_stats_skb, sizeof(struct wmi_ctrl_path_cal_stats)); + stats->stats_ptr = cal_stats; + list_add_tail(&stats->list, &stats_buff->list); + + ar = ath12k_mac_get_ar_by_pdev_id(ab, cal_stats_skb->pdev_id + 1); + if (!ar) { + ath12k_warn(ab, "Failed to get ar for wmi ctrl cal stats\n"); + kfree(cal_stats); + kfree(stats); + return -EINVAL; + } + + mutex_lock(&ar->wmi_ctrl_path_stats_lock); + ath12k_wmi_crl_path_stats_list_free(ar, &ar->debug.wmi_list); + mutex_unlock(&ar->wmi_ctrl_path_stats_lock); + ar->debug.wmi_ctrl_path_stats_tagid = WMI_CTRL_PATH_CAL_STATS; + stats_buff->ar = ar; + return 0; +} + +int wmi_print_ctrl_path_btcoex_stats_tlv(struct ath12k_base *ab, u16 len, + const void *ptr, void *data) +{ + struct wmi_ctrl_path_stats_ev_parse_param *stats_buff = + (struct wmi_ctrl_path_stats_ev_parse_param *)data; + struct wmi_ctrl_path_btcoex_stats *btcoex_stats_skb = + (struct wmi_ctrl_path_btcoex_stats *)ptr; + struct wmi_ctrl_path_btcoex_stats *btcoex_stats = NULL; + struct wmi_ctrl_path_stats_list *stats; + struct ath12k *ar = NULL; + + stats = kzalloc(sizeof(*stats), GFP_ATOMIC); + if (!stats) + return -ENOMEM; + + btcoex_stats = kzalloc(sizeof(*btcoex_stats), GFP_ATOMIC); + if (!btcoex_stats) { + kfree(stats); + return -ENOMEM; + } + + memcpy(btcoex_stats, btcoex_stats_skb, sizeof(*btcoex_stats)); + stats->stats_ptr = btcoex_stats; + list_add_tail(&stats->list, &stats_buff->list); + + ar = ath12k_mac_get_ar_by_pdev_id(ab, btcoex_stats_skb->pdev_id + 1); + if (!ar) { + ath12k_warn(ab, "Failed to get ar for wmi ctrl cal stats\n"); + kfree(btcoex_stats); + kfree(stats); + return -EINVAL; + } + + mutex_lock(&ar->wmi_ctrl_path_stats_lock); + ath12k_wmi_crl_path_stats_list_free(ar, &ar->debug.wmi_list); + mutex_unlock(&ar->wmi_ctrl_path_stats_lock); + ar->debug.wmi_ctrl_path_stats_tagid = WMI_CTRL_PATH_BTCOEX_STATS; + stats_buff->ar = ar; + return 0; +} + +int wmi_print_ctrl_path_awgn_stats_tlv(struct ath12k_base *ab, u16 len, + const void *ptr, void *data) +{ + struct wmi_ctrl_path_stats_ev_parse_param *stats_buff = + (struct wmi_ctrl_path_stats_ev_parse_param *)data; + struct wmi_ctrl_path_awgn_stats *awgn_stats_skb, *awgn_stats = NULL; + struct wmi_ctrl_path_stats_list *stats; + struct ath12k *ar = NULL; + int i; + + awgn_stats_skb = (struct wmi_ctrl_path_awgn_stats *)ptr; + + for (i = 0; i < ATH12K_GROUP_MAX_RADIO; i++) { + ar = ab->ag->hw_links[i]; + if (!ar) { + ath12k_warn(ab, "Failed to get ar for wmi ctrl awgn stats\n"); + return -EINVAL; + } + + if (ar->supports_6ghz) + break; + } + + stats = kzalloc(sizeof(*stats), GFP_ATOMIC); + if (!stats) + return -ENOMEM; + + awgn_stats = kzalloc(sizeof(*awgn_stats), GFP_ATOMIC); + + if (!awgn_stats) { + kfree(stats); + return -ENOMEM; + } + + memcpy(awgn_stats, awgn_stats_skb, sizeof(*awgn_stats)); + stats->stats_ptr = awgn_stats; + list_add_tail(&stats->list, &stats_buff->list); + + mutex_lock(&ar->wmi_ctrl_path_stats_lock); + ath12k_wmi_crl_path_stats_list_free(ar, &ar->debug.wmi_list); + mutex_unlock(&ar->wmi_ctrl_path_stats_lock); + ar->debug.wmi_ctrl_path_stats_tagid = WMI_CTRL_PATH_AWGN_STATS; + stats_buff->ar = ar; + + return 0; +} + +static int ath12k_wmi_ctrl_stats_subtlv_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + int ret = 0; + + switch (tag) { + case WMI_CTRL_PATH_STATS_EV_FIXED_PARAM: + break; + case WMI_CTRL_PATH_PDEV_STATS: + ret = wmi_print_ctrl_path_pdev_tx_stats_tlv(ab, len, ptr, data); + break; + case WMI_CTRL_PATH_CAL_STATS: + ret = wmi_print_ctrl_path_cal_stats_tlv(ab, len, ptr, data); + break; + case WMI_CTRL_PATH_BTCOEX_STATS: + ret = wmi_print_ctrl_path_btcoex_stats_tlv(ab, len, ptr, data); + break; + case WMI_CTRL_PATH_AWGN_STATS: + ret = wmi_print_ctrl_path_awgn_stats_tlv(ab, len, ptr, data); + break; + /* Add case for newly wmi ctrl path added stats here */ + default: + ath12k_warn(ab, + "Received invalid tag for wmi ctrl path stats in subtlvs, tag : 0x%x\n", + tag); + return -EINVAL; + break; + } + + return ret; +} + +static int ath12k_wmi_ctrl_stats_event_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + int ret = 0; + + ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi ctrl path stats tag 0x%x of len %d rcvd\n", + tag, len); + + switch (tag) { + case WMI_CTRL_PATH_STATS_EV_FIXED_PARAM: + /* Fixed param is already processed*/ + break; + case WMI_TAG_ARRAY_STRUCT: + /* len 0 is expected for array of struct when there + * is no content of that type to pack inside that tlv + */ + if (len == 0) + return 0; + + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_ctrl_stats_subtlv_parser, + data); + break; + default: + ath12k_warn(ab, "Received invalid tag for wmi ctrl path stats\n"); + ret = -EINVAL; + break; + } + + return ret; +} + +static void ath12k_wmi_ctrl_path_stats_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + int ret; + const struct wmi_tlv *tlv; + struct wmi_ctrl_path_stats_ev_param *fixed_param; + u16 tlv_tag; + u8 *ptr = skb->data; + struct ath12k *ar = NULL; + struct wmi_ctrl_path_stats_ev_parse_param param; + INIT_LIST_HEAD(¶m.list); + + if (!skb->data) { + ath12k_warn(ab, "No data present in wmi ctrl stats event\n"); + return; + } + + if (skb->len < (sizeof(*fixed_param) + TLV_HDR_SIZE)) { + ath12k_warn(ab, "wmi ctrl stats event size invalid\n"); + return; + } + + param.ar = NULL; + + tlv = (struct wmi_tlv *)ptr; + tlv_tag = FIELD_GET(WMI_TLV_TAG, tlv->header); + ptr += sizeof(*tlv); + + if (tlv_tag == WMI_CTRL_PATH_STATS_EV_FIXED_PARAM) + fixed_param = (struct wmi_ctrl_path_stats_ev_param *)ptr; + else + ath12k_warn(ab, "wmi ctrl Stats received without fixed param tlv at start\n"); + + if (!fixed_param) { + ath12k_warn(ab, "wmi ctrl Stats received fixed param is NULL\n"); + goto free; + } + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_ctrl_stats_event_parser, + ¶m); + if (ret) { + ath12k_warn(ab, "failed to parse wmi_ctrl_path_stats tlv: %d\n", ret); + goto free; + } + + ar = param.ar; + if (!ar) + return; + + mutex_lock(&ar->wmi_ctrl_path_stats_lock); + list_splice_tail_init(¶m.list, &ar->debug.wmi_list); + mutex_unlock(&ar->wmi_ctrl_path_stats_lock); + + if (!fixed_param->more) { + complete(&ar->debug.wmi_ctrl_path_stats_rcvd); + ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi ctrl path stats completed"); + } +free: + ath12k_wmi_crl_path_stats_list_free(ar, ¶m.list); +} +#endif + +int ath12k_wmi_send_twt_pause_dialog_cmd(struct ath12k *ar, + struct wmi_twt_pause_dialog_params *params) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_twt_pause_dialog_params_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_twt_pause_dialog_params_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_TWT_PAUSE_DIALOG_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + + cmd->vdev_id = params->vdev_id; + ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi pause twt dialog vdev %u dialog id %u\n", + cmd->vdev_id, cmd->dialog_id); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_TWT_PAUSE_DIALOG_CMDID); + if (ret) { + ath12k_warn(ab, + "failed to send wmi command to pause twt dialog: %d", + ret); + dev_kfree_skb(skb); + } + return ret; +} + +int ath12k_wmi_send_twt_resume_dialog_cmd(struct ath12k *ar, + struct wmi_twt_resume_dialog_params *params) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_twt_resume_dialog_params_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_twt_resume_dialog_params_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_TWT_RESUME_DIALOG_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + + cmd->vdev_id = params->vdev_id; + ether_addr_copy(cmd->peer_macaddr.addr, params->peer_macaddr); + cmd->dialog_id = params->dialog_id; + cmd->sp_offset_us = params->sp_offset_us; + cmd->next_twt_size = params->next_twt_size; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi resume twt dialog vdev %u dialog id %u service period offset %u next twt subfield size %u\n", + cmd->vdev_id, cmd->dialog_id, cmd->sp_offset_us, + cmd->next_twt_size); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_TWT_RESUME_DIALOG_CMDID); + if (ret) { + ath12k_warn(ab, + "failed to send wmi command to resume twt dialog: %d", + ret); + dev_kfree_skb(skb); } return ret; } @@ -2925,6 +5315,232 @@ return ret; } +int ath12k_wmi_pdev_set_srg_bss_color_bitmap(struct ath12k *ar, u32 *bitmap) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_pdev_obss_pd_bitmap_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_SRG_BSS_COLOR_BITMAP_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "obss pd pdev_id %d bss color bitmap %08x %08x\n", + cmd->pdev_id, cmd->bitmap[0], cmd->bitmap[1]); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID); + if (ret) { + ath12k_warn(ab, + "Failed to send WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID"); + dev_kfree_skb(skb); + } + + return ret; +} + +int +ath12k_wmi_pdev_set_srg_patial_bssid_bitmap(struct ath12k *ar, u32 *bitmap) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_pdev_obss_pd_bitmap_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; + cmd->tlv_header = + FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_SRG_PARTIAL_BSSID_BITMAP_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "obss pd pdev_id %d partial bssid bitmap %08x %08x\n", + cmd->pdev_id, cmd->bitmap[0], cmd->bitmap[1]); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID); + if (ret) { + ath12k_warn(ab, + "Failed to send WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID"); + dev_kfree_skb(skb); + } + + return ret; +} + +int +ath12k_wmi_pdev_srg_obss_color_enable_bitmap(struct ath12k *ar, u32 *bitmap) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_pdev_obss_pd_bitmap_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; + cmd->tlv_header = + FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "obss pd srg pdev_id %d bss color enable bitmap %08x %08x\n", + cmd->pdev_id, cmd->bitmap[0], cmd->bitmap[1]); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID); + if (ret) { + ath12k_warn(ab, + "Failed to send WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID"); + dev_kfree_skb(skb); + } + + return ret; +} + +int +ath12k_wmi_pdev_srg_obss_bssid_enable_bitmap(struct ath12k *ar, u32 *bitmap) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_pdev_obss_pd_bitmap_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; + cmd->tlv_header = + FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "obss pd srg pdev_id %d bssid enable bitmap %08x %08x\n", + cmd->pdev_id, cmd->bitmap[0], cmd->bitmap[1]); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID); + if (ret) { + ath12k_warn(ab, + "Failed to send WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID"); + dev_kfree_skb(skb); + } + + return ret; +} + +int +ath12k_wmi_pdev_non_srg_obss_color_enable_bitmap(struct ath12k *ar, u32 *bitmap) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_pdev_obss_pd_bitmap_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; + cmd->tlv_header = + FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "obss pd non_srg pdev_id %d bss color enable bitmap %08x %08x\n", + cmd->pdev_id, cmd->bitmap[0], cmd->bitmap[1]); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID); + if (ret) { + ath12k_warn(ab, + "Failed to send WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID"); + dev_kfree_skb(skb); + } + + return ret; +} + +int +ath12k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath12k *ar, u32 *bitmap) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct ath12k_base *ab = wmi->wmi_ab->ab; + struct wmi_pdev_obss_pd_bitmap_cmd *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_obss_pd_bitmap_cmd *)skb->data; + cmd->tlv_header = + FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD) | + FIELD_PREP(WMI_TLV_LEN, len - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + memcpy(cmd->bitmap, bitmap, sizeof(cmd->bitmap)); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "obss pd non_srg pdev_id %d bssid enable bitmap %08x %08x\n", + cmd->pdev_id, cmd->bitmap[0], cmd->bitmap[1]); + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID); + if (ret) { + ath12k_warn(ab, + "Failed to send WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID"); + dev_kfree_skb(skb); + } + + return ret; +} + int ath12k_wmi_send_bss_color_change_enable_cmd(struct ath12k *ar, u32 vdev_id, bool enable) { @@ -3000,6 +5616,41 @@ return ret; } +static void * +ath12k_wmi_append_prb_resp_cu_params(struct ath12k *ar, u32 vdev_id, void *ptr) +{ + struct wmi_prb_resp_tmpl_ml_info_params *ml_info; + struct ath12k_prb_resp_tmpl_ml_info *ar_ml_info; + void *start = ptr; + struct wmi_tlv *tlv; + struct ath12k_link_vif *arvif = ath12k_mac_get_arvif(ar, vdev_id); + size_t ml_info_len = sizeof(*ml_info); + + if (!arvif) + return ptr; + + /* Add ML info */ + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, ml_info_len); + ml_info = (struct wmi_prb_resp_tmpl_ml_info_params *)tlv->value; + + ar_ml_info = &arvif->ml_info; + ml_info->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PRB_RESP_TMPL_ML_INFO_CMD, + sizeof(*ml_info)); + ml_info->hw_link_id = cpu_to_le32(ar_ml_info->hw_link_id); + ml_info->cu_vdev_map_cat1_lo = cpu_to_le32(ar_ml_info->cu_vdev_map_cat1_lo); + ml_info->cu_vdev_map_cat1_hi = cpu_to_le32(ar_ml_info->cu_vdev_map_cat1_hi); + ml_info->cu_vdev_map_cat2_lo = cpu_to_le32(ar_ml_info->cu_vdev_map_cat2_lo); + ml_info->cu_vdev_map_cat2_hi = cpu_to_le32(ar_ml_info->cu_vdev_map_cat2_hi); + + ptr += TLV_HDR_SIZE + sizeof(*ml_info); + /* Reset CU bitmap and bpcc values*/ + memset(&arvif->ml_info, 0, sizeof(arvif->ml_info)); + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "wmi %ld bytes of additional data filled for prb resp CU\n", + (unsigned long)(ptr - start)); + return ptr; +} + int ath12k_wmi_probe_resp_tmpl(struct ath12k *ar, u32 vdev_id, struct sk_buff *tmpl) { @@ -3008,18 +5659,23 @@ struct wmi_tlv *tlv; struct sk_buff *skb; void *ptr; - int ret, len; + int ret, len, mlinfo_tlv_len = 0; size_t aligned_len = roundup(tmpl->len, 4); + struct ath12k_link_vif *arvif = ath12k_mac_get_arvif(ar, vdev_id); ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI vdev %i set probe response template\n", vdev_id); - len = sizeof(*cmd) + sizeof(*probe_info) + TLV_HDR_SIZE + aligned_len; + if (ath12k_mac_is_ml_arvif(arvif)) + mlinfo_tlv_len = TLV_HDR_SIZE + sizeof(struct wmi_prb_resp_tmpl_ml_info_params); + + len = sizeof(*cmd) + sizeof(*probe_info) + TLV_HDR_SIZE + aligned_len + mlinfo_tlv_len; skb = ath12k_wmi_alloc_skb(ar->wmi->wmi_ab, len); - if (!skb) + if (!skb) { + memset(&arvif->ml_info, 0, sizeof(arvif->ml_info)); return -ENOMEM; - + } cmd = (struct wmi_probe_tmpl_cmd *)skb->data; cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PRB_TMPL_CMD, sizeof(*cmd)); @@ -3040,6 +5696,10 @@ tlv = ptr; tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_BYTE, aligned_len); memcpy(tlv->value, tmpl->data, tmpl->len); + ptr += (TLV_HDR_SIZE + aligned_len); + + if (ath12k_mac_is_ml_arvif(arvif)) + ptr = ath12k_wmi_append_prb_resp_cu_params(ar, vdev_id, ptr); ret = ath12k_wmi_cmd_send(ar->wmi, skb, WMI_PRB_TMPL_CMDID); if (ret) { @@ -3176,13 +5836,25 @@ wmi_cfg->bpf_instruction_size = cpu_to_le32(tg_cfg->bpf_instruction_size); wmi_cfg->max_bssid_rx_filters = cpu_to_le32(tg_cfg->max_bssid_rx_filters); wmi_cfg->use_pdev_id = cpu_to_le32(tg_cfg->use_pdev_id); - wmi_cfg->flag1 = cpu_to_le32(tg_cfg->atf_config); + wmi_cfg->flag1 = cpu_to_le32(tg_cfg->atf_config) | WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64; wmi_cfg->peer_map_unmap_version = cpu_to_le32(tg_cfg->peer_map_unmap_version); wmi_cfg->sched_params = cpu_to_le32(tg_cfg->sched_params); wmi_cfg->twt_ap_pdev_count = cpu_to_le32(tg_cfg->twt_ap_pdev_count); wmi_cfg->twt_ap_sta_count = cpu_to_le32(tg_cfg->twt_ap_sta_count); - wmi_cfg->host_service_flags = - cpu_to_le32(1 << WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT); + wmi_cfg->flags2 = WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET | + WMI_RSRC_CFG_FLAGS2_INTRABSS_MEC_WDS_LEARNING_DISABLE | + u32_encode_bits(tg_cfg->dp_peer_meta_data_ver, + WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION); +#ifdef CONFIG_ATH12K_SAWF + wmi_cfg->flags2 |= (tg_cfg->sawf & ath12k_sawf_enable) ? + (WMI_RSRC_CFG_FLAGS2_SAWF_CONFIG_ENABLE_SET) : (0); +#endif /* CONFIG_ATH12K_SAWF */ + wmi_cfg->host_service_flags &= ~(1 << WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT); + wmi_cfg->host_service_flags |= 1 << WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT; + wmi_cfg->host_service_flags |= 1 << WMI_RSRC_CFG_HOST_SVC_FLAG_REO_QREF_SUPPORT_BIT; + wmi_cfg->host_service_flags |= 1 << WMI_RSRC_CFG_HOST_SVC_FLAG_FULL_BW_NOL_SUPPORT_BIT; + wmi_cfg->ema_max_vap_cnt = tg_cfg->ema_max_vap_cnt; + wmi_cfg->ema_max_profile_period = tg_cfg->ema_max_profile_period; } static int ath12k_init_cmd_send(struct ath12k_wmi_pdev *wmi, @@ -3196,6 +5868,8 @@ struct ath12k_wmi_pdev_band_to_mac_params *band_to_mac; struct ath12k_wmi_host_mem_chunk_params *host_mem_chunks; struct wmi_tlv *tlv; + struct device *dev = ab->dev; + bool three_way_coex_enabled = false; size_t ret, len; void *ptr; u32 hw_mode_len = 0; @@ -3220,6 +5894,10 @@ ptr = skb->data + sizeof(*cmd); cfg = ptr; + three_way_coex_enabled = of_property_read_bool(dev->of_node, "qcom,btcoex"); + if (three_way_coex_enabled) + cfg->flag1 |= WMI_RSRC_CFG_FLAG1_THREE_WAY_COEX_CONFIG_OVERRIDE_SUPPORT; + ath12k_wmi_copy_resource_config(cfg, &arg->res_cfg); cfg->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_RESOURCE_CONFIG, @@ -3390,6 +6068,12 @@ struct ath12k_wmi_base *wmi_sc = &ab->wmi_ab; struct ath12k_wmi_init_cmd_arg arg = {}; + if (test_bit(WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT, + ab->wmi_ab.svc_map)) + arg.res_cfg.is_reg_cc_ext_event_supported = true; + if (test_bit(WMI_TLV_SERVICE_RADAR_FLAGS_SUPPORT, ab->wmi_ab.svc_map)) + arg.res_cfg.is_full_bw_nol_feature_supported = true; + ab->hw_params->wmi_init(ab, &arg.res_cfg); arg.num_mem_chunks = wmi_sc->num_mem_chunks; @@ -3509,7 +6193,7 @@ cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_DMA_RING_CFG_REQ, sizeof(*cmd)); - cmd->pdev_id = cpu_to_le32(DP_SW2HW_MACID(arg->pdev_id)); + cmd->pdev_id = cpu_to_le32(arg->pdev_id); cmd->module_id = cpu_to_le32(arg->module_id); cmd->base_paddr_lo = cpu_to_le32(arg->base_paddr_lo); cmd->base_paddr_hi = cpu_to_le32(arg->base_paddr_hi); @@ -3633,6 +6317,7 @@ struct ath12k_dbring_buf_release_event param; int ret; + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, ath12k_wmi_dma_buf_parse, &arg); @@ -3654,6 +6339,102 @@ } } + +static int ath12k_wmi_tlv_mac_phy_chainmask_caps(struct ath12k_base *soc, + u16 len, const void *ptr, void *data) +{ + struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data; + struct wmi_mac_phy_chainmask_caps *cmask_caps = (struct wmi_mac_phy_chainmask_caps *)ptr; + struct ath12k_chainmask_table *cmask_table; + struct ath12k_pdev_cap *pdev_cap; + u32 tag; + int i, j; + + if (!svc_rdy_ext->hw_mode_caps) + return -EINVAL; + + if ((!svc_rdy_ext->arg.num_chainmask_tables) || + (svc_rdy_ext->arg.num_chainmask_tables > ATH12K_MAX_CHAINMASK_TABLES)) + return -EINVAL; + + for (i = 0; i < svc_rdy_ext->arg.num_chainmask_tables; i++) { + cmask_table = &svc_rdy_ext->arg.chainmask_table[i]; + + for (j = 0; j < cmask_table->num_valid_chainmasks; j++) { + tag = FIELD_GET(WMI_TLV_TAG, cmask_caps->tlv_header); + + if (tag != WMI_TAG_MAC_PHY_CHAINMASK_CAPABILITY) + return -EPROTO; + + cmask_table->cap_list[j].chainmask = cmask_caps->chainmask; + cmask_table->cap_list[j].supported_caps = cmask_caps->supported_flags; + cmask_caps++; + ath12k_dbg(soc, ATH12K_DBG_WMI,"[id %d] chainmask %x supported_caps %x", + cmask_table->table_id, cmask_table->cap_list[j].chainmask, + cmask_table->cap_list[j].supported_caps); + } + } + + for (i = 0; i < soc->num_radios; i++) { + pdev_cap = &soc->pdevs[i].cap; + for (j = 0; j < svc_rdy_ext->n_mac_phy_chainmask_combo; j++) { + cmask_table = &svc_rdy_ext->arg.chainmask_table[j]; + if (cmask_table->table_id == pdev_cap->chainmask_table_id) + break; + } + for (j = 0; j < cmask_table->num_valid_chainmasks; j++) { + if (cmask_table->cap_list[j].supported_caps & WMI_SUPPORT_CHAIN_MASK_ADFS) + pdev_cap->adfs_chain_mask |= (1 << cmask_table->cap_list[j].chainmask); + } + ath12k_dbg(soc, ATH12K_DBG_WMI, "updated adfs chain mask %lx for pdev %d", + pdev_cap->adfs_chain_mask, i); + } + return 0; +} + +static void ath12k_wmi_free_chainmask_caps(struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext) +{ + int i; + + if (!svc_rdy_ext->arg.num_chainmask_tables) + return; + + for (i = 0; i < svc_rdy_ext->arg.num_chainmask_tables; i++) { + if (!svc_rdy_ext->arg.chainmask_table[i].cap_list) + continue; + kfree(svc_rdy_ext->arg.chainmask_table[i].cap_list); + svc_rdy_ext->arg.chainmask_table[i].cap_list = NULL; + } +} + +static int ath12k_wmi_tlv_mac_phy_chainmask_combo_parse(struct ath12k_base *soc, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct ath12k_wmi_svc_rdy_ext_parse *svc_rdy_ext = data; + struct wmi_mac_phy_chainmask_combo *cmask_combo = (struct wmi_mac_phy_chainmask_combo *) ptr; + u32 i = svc_rdy_ext->n_mac_phy_chainmask_combo; + struct ath12k_chainmask_table *cmask_table; + + if (tag != WMI_TAG_MAC_PHY_CHAINMASK_COMBO) + return -EPROTO; + + if (svc_rdy_ext->n_mac_phy_chainmask_combo >= svc_rdy_ext->arg.num_chainmask_tables) + return -ENOBUFS; + + cmask_table = &svc_rdy_ext->arg.chainmask_table[i]; + cmask_table->table_id = cmask_combo->chainmask_table_id; + cmask_table->num_valid_chainmasks = cmask_combo->num_valid_chainmask; + cmask_table->cap_list = kcalloc(cmask_combo->num_valid_chainmask, + sizeof(struct ath12k_chainmask_caps), + GFP_ATOMIC); + if (!svc_rdy_ext->arg.chainmask_table[i].cap_list) + return -ENOMEM; + + svc_rdy_ext->n_mac_phy_chainmask_combo++; + return 0; +} + static int ath12k_wmi_hw_mode_caps_parse(struct ath12k_base *soc, u16 tag, u16 len, const void *ptr, void *data) @@ -3954,6 +6735,7 @@ svc_rdy_ext->hw_caps = ptr; svc_rdy_ext->arg.num_hw_modes = le32_to_cpu(svc_rdy_ext->hw_caps->num_hw_modes); + svc_rdy_ext->arg.num_chainmask_tables = le32_to_cpu(svc_rdy_ext->hw_caps->num_chainmask_tables); break; case WMI_TAG_SOC_HAL_REG_CAPABILITIES: @@ -3988,8 +6770,21 @@ svc_rdy_ext->ext_hal_reg_done = true; } else if (!svc_rdy_ext->mac_phy_chainmask_combo_done) { + svc_rdy_ext->n_mac_phy_chainmask_combo = 0; + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_tlv_mac_phy_chainmask_combo_parse, + svc_rdy_ext); + if (ret) { + ath12k_warn(ab, "failed to parse chainmask combo tlv %d\n", ret); + return ret; + } svc_rdy_ext->mac_phy_chainmask_combo_done = true; } else if (!svc_rdy_ext->mac_phy_chainmask_cap_done) { + ret = ath12k_wmi_tlv_mac_phy_chainmask_caps(ab, len, ptr, svc_rdy_ext); + if (ret) { + ath12k_warn(ab, "failed to parse chainmask caps tlv %d\n", ret); + return ret; + } svc_rdy_ext->mac_phy_chainmask_cap_done = true; } else if (!svc_rdy_ext->oem_dma_ring_cap_done) { svc_rdy_ext->oem_dma_ring_cap_done = true; @@ -4027,9 +6822,12 @@ complete(&ab->wmi_ab.service_ready); kfree(svc_rdy_ext.mac_phy_caps); + ath12k_wmi_free_chainmask_caps(&svc_rdy_ext); return 0; err: + kfree(svc_rdy_ext.mac_phy_caps); + ath12k_wmi_free_chainmask_caps(&svc_rdy_ext); ath12k_wmi_free_dbring_caps(ab); return ret; } @@ -4038,10 +6836,23 @@ u16 tag, u16 len, const void *ptr, void *data) { + struct ath12k_wmi_pdev *wmi_handle = &ab->wmi_ab.wmi[0]; struct ath12k_wmi_svc_rdy_ext2_parse *parse = data; int ret; switch (tag) { + case WMI_TAG_SERVICE_READY_EXT2_EVENT: + ret = ath12k_pull_svc_ready_ext2(wmi_handle, ptr, + &parse->param); + if (ret) { + ath12k_warn(ab, "unable to extract ext params\n"); + return ret; + } + ab->max_msduq_per_tid = parse->param.max_msduq_per_tid; + ab->default_msduq_per_tid = parse->param.default_msduq_per_tid; + ab->chwidth_num_peer_caps = parse->param.chwidth_num_peer_caps; + break; + case WMI_TAG_ARRAY_STRUCT: if (!parse->dma_ring_cap_done) { ret = ath12k_wmi_dma_ring_caps(ab, len, ptr, @@ -4050,6 +6861,22 @@ return ret; parse->dma_ring_cap_done = true; + } else if (!parse->spectral_bin_scaling_done) { + /* To-Do: This is a place-holder as WMI tag for + * spectral scaling is before + * WMI_TAG_MAC_PHY_CAPABILITIES_EXT + */ + parse->spectral_bin_scaling_done = true; + } else if (!parse->mac_phy_caps_ext_done) { + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_tlv_mac_phy_caps_ext, + parse); + if (ret) { + ath12k_warn(ab, "failed to parse tlv %d\n", ret); + return ret; + } + + parse->mac_phy_caps_ext_done = true; } break; default: @@ -4062,7 +6889,7 @@ static int ath12k_service_ready_ext2_event(struct ath12k_base *ab, struct sk_buff *skb) { - struct ath12k_wmi_svc_rdy_ext2_parse svc_rdy_ext2 = { }; + struct ath12k_wmi_svc_rdy_ext2_parse svc_rdy_ext2 = { 0 }; int ret; ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, @@ -4152,6 +6979,140 @@ return reg_rule_ptr; } +static const char *ath12k_cc_status_to_str(enum ath12k_reg_cc_code code) +{ + switch (code) { + case REG_SET_CC_STATUS_PASS: + return "REG_SET_CC_STATUS_PASS"; + case REG_CURRENT_ALPHA2_NOT_FOUND: + return "REG_CURRENT_ALPHA2_NOT_FOUND"; + case REG_INIT_ALPHA2_NOT_FOUND: + return "REG_INIT_ALPHA2_NOT_FOUND"; + case REG_SET_CC_CHANGE_NOT_ALLOWED: + return "REG_SET_CC_CHANGE_NOT_ALLOWED"; + case REG_SET_CC_STATUS_NO_MEMORY: + return "REG_SET_CC_STATUS_NO_MEMORY"; + case REG_SET_CC_STATUS_FAIL: + return "REG_SET_CC_STATUS_FAIL"; + default: + return "unknown cc status"; + } +}; + +static const char *ath12k_super_reg_6g_to_str(enum reg_super_domain_6g domain_id) +{ + switch (domain_id) { + case FCC1_6G: + return "FCC1_6G"; + case ETSI1_6G: + return "ETSI1_6G"; + case ETSI2_6G: + return "ETSI2_6G"; + case APL1_6G: + return "APL1_6G"; + case FCC1_6G_CL: + return "FCC1_6G_CL"; + default: + return "unknown domain id"; + } +} + +static const char *ath12k_6g_client_type_to_str(enum wmi_reg_6g_client_type type) +{ + switch (type) { + case WMI_REG_DEFAULT_CLIENT: + return "DEFAULT CLIENT"; + case WMI_REG_SUBORDINATE_CLIENT: + return "SUBORDINATE CLIENT"; + default: + return "unknown client type"; + } +} + +static const char *ath12k_6g_ap_type_to_str(enum wmi_reg_6g_ap_type type) +{ + switch (type) { + case WMI_REG_INDOOR_AP: + return "INDOOR AP"; + case WMI_REG_STD_POWER_AP: + return "STANDARD POWER AP"; + case WMI_REG_VLP_AP: + return "VERY LOW POWER AP"; + default: + return "unknown AP type"; + } +} + +static const char *ath12k_sub_reg_6g_to_str(enum reg_subdomains_6g sub_id) +{ + switch (sub_id) { + case FCC1_CLIENT_LPI_REGULAR_6G: + return "FCC1_CLIENT_LPI_REGULAR_6G"; + case FCC1_CLIENT_SP_6G: + return "FCC1_CLIENT_SP_6G"; + case FCC1_AP_LPI_6G: + return "FCC1_AP_LPI_6G/FCC1_CLIENT_LPI_SUBORDINATE"; + case FCC1_AP_SP_6G: + return "FCC1_AP_SP_6G"; + case ETSI1_LPI_6G: + return "ETSI1_LPI_6G"; + case ETSI1_VLP_6G: + return "ETSI1_VLP_6G"; + case ETSI2_LPI_6G: + return "ETSI2_LPI_6G"; + case ETSI2_VLP_6G: + return "ETSI2_VLP_6G"; + case APL1_LPI_6G: + return "APL1_LPI_6G"; + case APL1_VLP_6G: + return "APL1_VLP_6G"; + case EMPTY_6G: + return "N/A"; + default: + return "unknown sub reg id"; + } +} + +static void ath12k_print_reg_rule(struct ath12k_base *ab, const char *prev, + u32 num_reg_rules, + const struct ath12k_reg_rule *reg_rule_ptr) +{ + const struct ath12k_reg_rule *reg_rule = reg_rule_ptr; + u32 count; + + ath12k_dbg(ab, ATH12K_DBG_WMI, "%s reg rules number %d\n", prev, num_reg_rules); + + for (count = 0; count < num_reg_rules; count++) { + ath12k_dbg(ab, ATH12K_DBG_WMI, + "reg rule %d: (%d - %d @ %d) (%d, %d) (FLAGS %d) (psd flag %d EIRP %d dB/MHz)\n", + count + 1, reg_rule->start_freq, reg_rule->end_freq, + reg_rule->max_bw, reg_rule->ant_gain, reg_rule->reg_power, + reg_rule->flags, reg_rule->psd_flag, reg_rule->psd_eirp); + reg_rule++; + } +} + +static u8 +ath12k_invalid_5g_reg_ext_rules_from_wmi(u32 num_reg_rules, + struct ath12k_wmi_reg_rule_ext_params *wmi_reg_rule) +{ + u8 num_invalid_5g_rules = 0; + u32 count, start_freq, end_freq; + + for (count = 0; count < num_reg_rules; count++) { + start_freq = FIELD_GET(REG_RULE_START_FREQ, + wmi_reg_rule[count].freq_info); + end_freq = FIELD_GET(REG_RULE_END_FREQ, + wmi_reg_rule[count].freq_info); + + if (start_freq >= ATH12K_MIN_6G_FREQ && + end_freq <= ATH12K_MAX_6G_FREQ) + num_invalid_5g_rules++; + } + + return num_invalid_5g_rules; +} + static int ath12k_pull_reg_chan_list_ext_update_ev(struct ath12k_base *ab, struct sk_buff *skb, struct ath12k_reg_info *reg_info) @@ -4163,9 +7124,11 @@ u32 num_6g_reg_rules_ap[WMI_REG_CURRENT_MAX_AP_TYPE]; u32 num_6g_reg_rules_cl[WMI_REG_CURRENT_MAX_AP_TYPE][WMI_REG_MAX_CLIENT_TYPE]; u32 total_reg_rules = 0; - int ret, i, j; + int ret, i, j, skip_6g_rules_in_5g_rules = 0; - ath12k_dbg(ab, ATH12K_DBG_WMI, "processing regulatory ext channel list\n"); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "%s: status_code %s", __func__, + ath12k_cc_status_to_str(reg_info->status_code)); tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); if (IS_ERR(tb)) { @@ -4190,6 +7153,18 @@ reg_info->num_6g_reg_rules_ap[WMI_REG_VLP_AP] = le32_to_cpu(ev->num_6g_reg_rules_ap_vlp); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "6g reg info client type %s rnr_tpe_usable %d unspecified_ap_usable %d AP sub domain: lpi %s , sp %s , vlp %s\n", + ath12k_6g_client_type_to_str(reg_info->client_type), + reg_info->rnr_tpe_usable, + reg_info->unspecified_ap_usable, + ath12k_sub_reg_6g_to_str + (ev->domain_code_6g_ap_lpi), + ath12k_sub_reg_6g_to_str + (ev->domain_code_6g_ap_sp), + ath12k_sub_reg_6g_to_str + (ev->domain_code_6g_ap_vlp)); + for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++) { reg_info->num_6g_reg_rules_cl[WMI_REG_INDOOR_AP][i] = le32_to_cpu(ev->num_6g_reg_rules_cl_lpi[i]); @@ -4197,6 +7172,14 @@ le32_to_cpu(ev->num_6g_reg_rules_cl_sp[i]); reg_info->num_6g_reg_rules_cl[WMI_REG_VLP_AP][i] = le32_to_cpu(ev->num_6g_reg_rules_cl_vlp[i]); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "6g AP BW: lpi %d - %d sp %d - %d vlp %d - %d\n", + ev->min_bw_6g_ap_lpi, + ev->max_bw_6g_ap_lpi, + ev->min_bw_6g_ap_sp, + ev->max_bw_6g_ap_sp, + ev->min_bw_6g_ap_vlp, + ev->max_bw_6g_ap_vlp); } num_2g_reg_rules = reg_info->num_2g_reg_rules; @@ -4255,20 +7238,6 @@ memcpy(reg_info->alpha2, &ev->alpha2, REG_ALPHA2_LEN); - /* FIXME: Currently FW includes 6G reg rule also in 5G rule - * list for country US. - * Having same 6G reg rule in 5G and 6G rules list causes - * intersect check to be true, and same rules will be shown - * multiple times in iw cmd. So added hack below to avoid - * parsing 6G rule from 5G reg rule list, and this can be - * removed later, after FW updates to remove 6G reg rule - * from 5G rules list. - */ - if (memcmp(reg_info->alpha2, "US", 2) == 0) { - reg_info->num_5g_reg_rules = REG_US_5G_NUM_REG_RULES; - num_5g_reg_rules = reg_info->num_5g_reg_rules; - } - reg_info->dfs_region = le32_to_cpu(ev->dfs_region); reg_info->phybitmap = le32_to_cpu(ev->phybitmap); reg_info->num_phy = le32_to_cpu(ev->num_phy); @@ -4326,10 +7295,15 @@ } ath12k_dbg(ab, ATH12K_DBG_WMI, - "%s:cc_ext %s dsf %d BW: min_2g %d max_2g %d min_5g %d max_5g %d", + "%s: status_code %s", __func__, + ath12k_cc_status_to_str(reg_info->status_code)); + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "%s:cc_ext %s dsf %d BW: min_2g %d max_2g %d min_5g %d max_5g %d phy_bitmap: 0x%x", __func__, reg_info->alpha2, reg_info->dfs_region, reg_info->min_bw_2g, reg_info->max_bw_2g, - reg_info->min_bw_5g, reg_info->max_bw_5g); + reg_info->min_bw_5g, reg_info->max_bw_5g, + reg_info->phybitmap); ath12k_dbg(ab, ATH12K_DBG_WMI, "num_2g_reg_rules %d num_5g_reg_rules %d", @@ -4368,10 +7342,35 @@ ath12k_warn(ab, "Unable to Allocate memory for 2g rules\n"); return -ENOMEM; } + ath12k_print_reg_rule(ab, "2g", + num_2g_reg_rules, + reg_info->reg_rules_2g_ptr); + } + ext_wmi_reg_rule += num_2g_reg_rules; + + /* FIXME: Currently FW includes 6G reg rule also in 5G rule + * list for few countries. + * Having same 6G reg rule in 5G and 6G rules list causes + * intersect check to be true, and same rules will be shown + * multiple times in iw cmd. So added logic below to avoid + * parsing 6G rule from 5G reg rule list, and this can be + * removed later, after FW updates to remove 6G reg rule + * from 5G rules list. + */ + skip_6g_rules_in_5g_rules = ath12k_invalid_5g_reg_ext_rules_from_wmi(num_5g_reg_rules, + ext_wmi_reg_rule); + + if(skip_6g_rules_in_5g_rules) { + ath12k_dbg(ab, ATH12K_DBG_WMI, + "CC: %s 5g reg rules number %d from fw, %d number of invalid 5g rules", + reg_info->alpha2, reg_info->num_5g_reg_rules, + skip_6g_rules_in_5g_rules); + + num_5g_reg_rules = num_5g_reg_rules - skip_6g_rules_in_5g_rules; + reg_info->num_5g_reg_rules = num_5g_reg_rules; } if (num_5g_reg_rules) { - ext_wmi_reg_rule += num_2g_reg_rules; reg_info->reg_rules_5g_ptr = create_ext_reg_rules_from_wmi(num_5g_reg_rules, ext_wmi_reg_rule); @@ -4381,9 +7380,18 @@ ath12k_warn(ab, "Unable to Allocate memory for 5g rules\n"); return -ENOMEM; } + ath12k_print_reg_rule(ab, "5g", + num_5g_reg_rules, + reg_info->reg_rules_5g_ptr); } - ext_wmi_reg_rule += num_5g_reg_rules; + /* We have adjusted the number of 5g reg rules via the hack above. + * Here, we adjust that many extra rules which came with 5g reg rules + * (for cc: US) + * + * NOTE: skip_6g_rules_in_5g_rules will be 0 for rest other cases. + */ + ext_wmi_reg_rule += num_5g_reg_rules + skip_6g_rules_in_5g_rules; for (i = 0; i < WMI_REG_CURRENT_MAX_AP_TYPE; i++) { reg_info->reg_rules_6g_ap_ptr[i] = @@ -4396,10 +7404,17 @@ return -ENOMEM; } + ath12k_print_reg_rule(ab, ath12k_6g_ap_type_to_str(i), + num_6g_reg_rules_ap[i], + reg_info->reg_rules_6g_ap_ptr[i]); + ext_wmi_reg_rule += num_6g_reg_rules_ap[i]; } for (j = 0; j < WMI_REG_CURRENT_MAX_AP_TYPE; j++) { + ath12k_dbg(ab, ATH12K_DBG_WMI, + "AP type %s", ath12k_6g_ap_type_to_str(j)); + for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++) { reg_info->reg_rules_6g_client_ptr[j][i] = create_ext_reg_rules_from_wmi(num_6g_reg_rules_cl[j][i], @@ -4411,6 +7426,10 @@ return -ENOMEM; } + ath12k_print_reg_rule(ab, ath12k_6g_client_type_to_str(i), + num_6g_reg_rules_cl[j][i], + reg_info->reg_rules_6g_client_ptr[j][i]); + ext_wmi_reg_rule += num_6g_reg_rules_cl[j][i]; } } @@ -4436,8 +7455,9 @@ reg_info->domain_code_6g_super_id = le32_to_cpu(ev->domain_code_6g_super_id); - ath12k_dbg(ab, ATH12K_DBG_WMI, "6g client_type: %d domain_code_6g_super_id: %d", - reg_info->client_type, reg_info->domain_code_6g_super_id); + ath12k_dbg(ab, ATH12K_DBG_WMI, "6g client type %s 6g super domain %s", + ath12k_6g_client_type_to_str(reg_info->client_type), + ath12k_super_reg_6g_to_str(reg_info->domain_code_6g_super_id)); ath12k_dbg(ab, ATH12K_DBG_WMI, "processed regulatory ext channel list\n"); @@ -4560,11 +7580,46 @@ return 0; } +static int ath12k_wmi_mgmt_rx_sub_tlv_parse(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_tlv_mgmt_rx_parse *parse = data; + struct ath12k_mgmt_rx_cu_arg *rx_cu_params; + struct ath12k_wmi_mgmt_rx_cu_params *rx_cu_params_tlv; + + switch (tag) { + case WMI_TAG_MLO_MGMT_RX_CU_PARAMS: + rx_cu_params = &parse->cu_params; + rx_cu_params_tlv = (struct ath12k_wmi_mgmt_rx_cu_params *)ptr; + rx_cu_params->cu_vdev_map[0] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_1, CU_VDEV_MAP_LB); + rx_cu_params->cu_vdev_map[1] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_1, CU_VDEV_MAP_HB); + rx_cu_params->cu_vdev_map[2] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_2, CU_VDEV_MAP_LB); + rx_cu_params->cu_vdev_map[3] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_2, CU_VDEV_MAP_HB); + rx_cu_params->cu_vdev_map[4] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_3, CU_VDEV_MAP_LB); + rx_cu_params->cu_vdev_map[5] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_3, CU_VDEV_MAP_HB); + rx_cu_params->cu_vdev_map[6] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_4, CU_VDEV_MAP_LB); + rx_cu_params->cu_vdev_map[7] = + le32_get_bits(rx_cu_params_tlv->cu_vdev_map_4, CU_VDEV_MAP_HB); + parse->mgmt_ml_info_done = true; + break; + } + return 0; +} + static int ath12k_wmi_tlv_mgmt_rx_parse(struct ath12k_base *ab, u16 tag, u16 len, const void *ptr, void *data) { struct wmi_tlv_mgmt_rx_parse *parse = data; + int ret; switch (tag) { case WMI_TAG_MGMT_RX_HDR: @@ -4574,12 +7629,130 @@ if (!parse->frame_buf_done) { parse->frame_buf = ptr; parse->frame_buf_done = true; + } else if (!parse->bpcc_buf_done) { + if (len == 0) + break; + parse->cu_params.bpcc_bufp = (void *)ptr; + parse->bpcc_buf_done = true; } break; + case WMI_TAG_MLO_MGMT_RX_REO_PARAMS: + parse->reo_params = (struct ath12k_wmi_mgmt_rx_reo_params *)ptr; + break; + case WMI_TAG_MLO_MGMT_RX_FW_CONSUMED_HDR: + parse->fw_consumed_reo_params = (struct ath12k_wmi_mgmt_rx_fw_consumed_hdr *)ptr; + break; + case WMI_TAG_ARRAY_STRUCT: + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_mgmt_rx_sub_tlv_parse, parse); + if (ret) { + ath12k_warn(ab, "failed to parse mgmt rx sub tlv %d\n", ret); + return ret; + } + break; + } + return 0; +} + +static int ath12k_pull_fw_consumed_mgmt_rx_params_tlv(struct ath12k_base *ab, + struct sk_buff *skb, + struct ath12k_wmi_mgmt_rx_arg *hdr) +{ + struct wmi_tlv_mgmt_rx_parse parse = { }; + int ret; + struct ath12k_wmi_mgmt_rx_fw_consumed_hdr *fw_con_reo_params_tlv = NULL; + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_tlv_mgmt_rx_parse, + &parse); + if (ret) { + ath12k_warn(ab, "failed to parse mgmt rx tlv %d\n", ret); + return ret; } + + + fw_con_reo_params_tlv = parse.fw_consumed_reo_params; + + if (!fw_con_reo_params_tlv) { + ret = -EINVAL; + ath12k_warn(ab, "no fw_consumed_reo_params\n"); + return ret; + } + + hdr->pdev_id = fw_con_reo_params_tlv->pdev_id; + hdr->reo_params.valid = FIELD_GET(WMI_MGMT_RX_FW_CONSUMED_PARAM_MGMT_PKT_CTR_VALID_GET, + fw_con_reo_params_tlv->mgmt_pkt_ctr_info); + hdr->reo_params.global_timestamp = fw_con_reo_params_tlv->global_timestamp; + hdr->reo_params.mgmt_pkt_ctr = FIELD_GET(WMI_MGMT_RX_FW_CONSUMED_PARAM_MGMT_PKT_CTR_GET, + fw_con_reo_params_tlv->mgmt_pkt_ctr_info); + hdr->reo_params.duration_us = fw_con_reo_params_tlv->rx_ppdu_duration_us; + hdr->reo_params.start_timestamp = hdr->reo_params.global_timestamp; + hdr->reo_params.end_timestamp = hdr->reo_params.start_timestamp + + hdr->reo_params.duration_us; + + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "FW Consumed : Mgmt Re-order ingress: valid %u global_ts %u pkt_ctr %u\n", + hdr->reo_params.valid, + hdr->reo_params.global_timestamp, + hdr->reo_params.mgmt_pkt_ctr); + return 0; } +static u32 ath12k_get_ar_next_vdev_pos(struct ath12k *ar, u32 pos) +{ + bool bit; + u32 i = 0; + + for (i = pos; i < MAX_AP_MLDS_PER_LINK; i++) { + bit = ar->allocated_vdev_map & (1LL << i); + if (bit) + break; + } + return i; +} + +static void ath12k_update_cu_params(struct ath12k_base *ab, + struct ath12k_mgmt_rx_cu_arg *cu_params) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k *ar; + struct ath12k_link_vif *arvif; + bool critical_flag; + u8 hw_link_id; + u8 *bpcc_ptr, *bpcc_bufp; + u32 vdev_id, pos = 0; + int i; + + if (!cu_params->bpcc_bufp) + return; + /* Iterate over all the valid hw links */ + for (hw_link_id = 0; hw_link_id < CU_MAX_MLO_LINKS; hw_link_id++) { + ar = rcu_dereference(ag->hw_links[hw_link_id]); + if (!ar) + continue; + pos = 0; + for (i = 0; i < ar->num_created_vdevs; i++) { + pos = ath12k_get_ar_next_vdev_pos(ar, pos); + vdev_id = pos; + pos++; + arvif = ath12k_mac_get_arvif(ar, vdev_id); + if (!arvif) + continue; + if (arvif->is_up && arvif->ahvif->vif->valid_links) { + critical_flag = cu_params->cu_vdev_map[hw_link_id] & (1 << i); + bpcc_bufp = cu_params->bpcc_bufp; + bpcc_ptr = bpcc_bufp + + ((hw_link_id * MAX_AP_MLDS_PER_LINK) + i); + WARN(1, "mlo not supported"); + /* ieee80211_critical_update(arvif->ahvif->vif, */ + /* arvif->link_id, */ + /* critical_flag, */ + /* *bpcc_ptr); */ + } + } + } +} + static int ath12k_pull_mgmt_rx_params_tlv(struct ath12k_base *ab, struct sk_buff *skb, struct ath12k_wmi_mgmt_rx_arg *hdr) @@ -4588,7 +7761,9 @@ const struct ath12k_wmi_mgmt_rx_params *ev; const u8 *frame; int i, ret; + struct ath12k_wmi_mgmt_rx_reo_params *reo_params_tlv = NULL; + memset(&parse, 0, sizeof(parse)); ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, ath12k_wmi_tlv_mgmt_rx_parse, &parse); @@ -4600,6 +7775,13 @@ ev = parse.fixed; frame = parse.frame_buf; + reo_params_tlv = parse.reo_params; + if (!reo_params_tlv) { + ret = -EINVAL; + ath12k_warn(ab, "no reo_params_tlv\n"); + return ret; + } + if (!ev || !frame) { ath12k_warn(ab, "failed to fetch mgmt rx hdr"); return -EPROTO; @@ -4620,6 +7802,29 @@ for (i = 0; i < ATH_MAX_ANTENNA; i++) hdr->rssi_ctl[i] = le32_to_cpu(ev->rssi_ctl[i]); + hdr->reo_params.pdev_id = ev->pdev_id; + + hdr->reo_params.valid = FIELD_GET(WMI_MGMT_RX_REO_PARAM_MGMT_PKT_CTR_VALID_GET, + reo_params_tlv->mgmt_pkt_ctr_link_info); + hdr->reo_params.global_timestamp = reo_params_tlv->global_timestamp; + hdr->reo_params.mgmt_pkt_ctr = FIELD_GET(WMI_MGMT_RX_REO_PARAM_MGMT_PKT_CTR_GET, + reo_params_tlv->mgmt_pkt_ctr_link_info); + hdr->reo_params.duration_us = reo_params_tlv->rx_ppdu_duration_us; + hdr->reo_params.start_timestamp = hdr->reo_params.global_timestamp; + hdr->reo_params.end_timestamp = hdr->reo_params.start_timestamp + + hdr->reo_params.duration_us; + + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Mgmt Re-order ingress: channel %d valid %u global_ts %u pkt_ctr %u\n", + hdr->channel, + hdr->reo_params.valid, + hdr->reo_params.global_timestamp, + hdr->reo_params.mgmt_pkt_ctr); + + if (parse.mgmt_ml_info_done) { + rcu_read_lock(); + ath12k_update_cu_params(ab, &parse.cu_params); + rcu_read_unlock(); + } if (skb->len < (frame - skb->data) + hdr->buf_len) { ath12k_warn(ab, "invalid length in mgmt rx hdr ev"); return -EPROTO; @@ -4635,12 +7840,20 @@ } static int wmi_process_mgmt_tx_comp(struct ath12k *ar, u32 desc_id, - u32 status) + u32 status, + u32 ack_rssi) { struct sk_buff *msdu; struct ieee80211_tx_info *info; struct ath12k_skb_cb *skb_cb; + struct ieee80211_hdr *hdr; + struct ieee80211_vif *vif; + struct ath12k_vif *ahvif; + struct ath12k_mgmt_frame_stats *mgmt_stats; + u16 frm_type; + int num_mgmt; + spin_lock_bh(&ar->data_lock); spin_lock_bh(&ar->txmgmt_idr_lock); msdu = idr_find(&ar->txmgmt_idr, desc_id); @@ -4648,6 +7861,7 @@ ath12k_warn(ar->ab, "received mgmt tx compl for invalid msdu_id: %d\n", desc_id); spin_unlock_bh(&ar->txmgmt_idr_lock); + spin_unlock_bh(&ar->data_lock); return -ENOENT; } @@ -4657,16 +7871,47 @@ skb_cb = ATH12K_SKB_CB(msdu); dma_unmap_single(ar->ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + hdr = (struct ieee80211_hdr *)msdu->data; + + if (ieee80211_is_mgmt(hdr->frame_control)) { + frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, hdr->frame_control); + vif = skb_cb->vif; + + if (!vif) { + ath12k_warn(ar->ab, "failed to find vif to update txcompl mgmt stats\n"); + goto skip_mgmt_stats; + } + + ahvif = ath12k_vif_to_ahvif(vif); + mgmt_stats = &ahvif->mgmt_stats; + + if (!status) + mgmt_stats->tx_compl_succ[frm_type]++; + else + mgmt_stats->tx_compl_fail[frm_type]++; + } + +skip_mgmt_stats: + spin_unlock_bh(&ar->data_lock); + info = IEEE80211_SKB_CB(msdu); - if ((!(info->flags & IEEE80211_TX_CTL_NO_ACK)) && !status) + if ((!(info->flags & IEEE80211_TX_CTL_NO_ACK)) && !status) { info->flags |= IEEE80211_TX_STAT_ACK; + info->status.ack_signal = ack_rssi; + info->status.flags |= IEEE80211_TX_STATUS_ACK_SIGNAL_VALID; + } + + ieee80211_tx_status_irqsafe(ar->ah->hw, msdu); - ieee80211_tx_status_irqsafe(ar->hw, msdu); + num_mgmt = atomic_dec_if_positive(&ar->num_pending_mgmt_tx); /* WARN when we received this event without doing any mgmt tx */ - if (atomic_dec_if_positive(&ar->num_pending_mgmt_tx) < 0) + if (num_mgmt < 0) WARN_ON_ONCE(1); + if (atomic_read(&ar->flush_request) && !num_mgmt) + wake_up(&ar->tx_empty_waitq); + return 0; } @@ -4695,6 +7940,70 @@ param->pdev_id = ev->pdev_id; param->desc_id = ev->desc_id; param->status = ev->status; + param->ppdu_id = ev->ppdu_id; + param->ack_rssi = ev->ack_rssi; + + kfree(tb); + return 0; +} + +static void wmi_process_offchan_tx_comp(struct ath12k *ar, u32 desc_id, + u32 status) +{ + struct sk_buff *msdu; + struct ath12k_skb_cb *skb_cb; + struct ieee80211_tx_info *info; + + spin_lock_bh(&ar->data_lock); + spin_lock_bh(&ar->txmgmt_idr_lock); + msdu = idr_find(&ar->txmgmt_idr, desc_id); + + if (!msdu) { + spin_unlock_bh(&ar->txmgmt_idr_lock); + spin_unlock_bh(&ar->data_lock); + ath12k_warn(ar->ab, "received offchan tx compl for invalid msdu_id: %d\n", + desc_id); + return; + } + + idr_remove(&ar->txmgmt_idr, desc_id); + spin_unlock_bh(&ar->txmgmt_idr_lock); + + skb_cb = ATH12K_SKB_CB(msdu); + dma_unmap_single(ar->ab->dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + + spin_unlock_bh(&ar->data_lock); + + info = IEEE80211_SKB_CB(msdu); + if (!(info->flags & IEEE80211_TX_CTL_NO_ACK) && !status) + info->flags |= IEEE80211_TX_STAT_ACK; + + ieee80211_tx_status_irqsafe(ar->ah->hw, msdu); +} + +static int ath12k_pull_offchan_tx_compl_param_tlv(struct ath12k_base *ab, + struct sk_buff *skb, + struct wmi_offchan_data_tx_compl_event *params) +{ + const void **tb; + const struct wmi_offchan_data_tx_compl_event *ev; + int ret; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse tlv: %d\n", ret); + return ret; + } + + ev = tb[WMI_TAG_OFFCHAN_DATA_TX_COMPL_EVENT]; + if (!ev) { + ath12k_warn(ab, "failed to fetch offchan tx compl ev\n"); + kfree(tb); + return -EPROTO; + } + + *params = *ev; kfree(tb); return 0; @@ -4714,6 +8023,8 @@ break; case ATH12K_SCAN_STARTING: ar->scan.state = ATH12K_SCAN_RUNNING; + if (ar->scan.is_roc) + ieee80211_ready_on_channel(ar->ah->hw); complete(&ar->scan.started); break; } @@ -4795,7 +8106,10 @@ break; case ATH12K_SCAN_RUNNING: case ATH12K_SCAN_ABORTING: - ar->scan_channel = ieee80211_get_channel(ar->hw->wiphy, freq); + ar->scan_channel = ieee80211_get_channel(ar->ah->hw->wiphy, + freq); + if (ar->scan.is_roc && ar->scan.roc_freq == freq) + complete(&ar->scan.on_channel); break; } } @@ -4896,7 +8210,9 @@ return -EPROTO; } - arg->mac_addr = ev->peer_macaddr.addr; + ether_addr_copy(arg->mac_addr, ev->peer_macaddr.addr); + arg->reason = __le32_to_cpu(ev->reason); + arg->rssi = __le32_to_cpu(ev->rssi); kfree(tb); return 0; @@ -4934,13 +8250,14 @@ static int freq_to_idx(struct ath12k *ar, int freq) { struct ieee80211_supported_band *sband; + struct ieee80211_hw *hw = ar->ah->hw; int band, ch, idx = 0; for (band = NL80211_BAND_2GHZ; band < NUM_NL80211_BANDS; band++) { if (!ar->mac.sbands[band].channels) continue; - sband = ar->hw->wiphy->bands[band]; + sband = hw->wiphy->bands[band]; if (!sband) continue; @@ -5091,31 +8408,573 @@ return 0; } -static int -ath12k_pull_pdev_temp_ev(struct ath12k_base *ab, u8 *evt_buf, - u32 len, const struct wmi_pdev_temperature_event *ev) +static void ath12k_wmi_pull_pdev_stats_base(const struct wmi_pdev_stats_base *src, + struct ath12k_fw_stats_pdev *dst) +{ + dst->ch_noise_floor = src->chan_nf; + dst->tx_frame_count = src->tx_frame_count; + dst->rx_frame_count = src->rx_frame_count; + dst->rx_clear_count = src->rx_clear_count; + dst->cycle_count = src->cycle_count; + dst->phy_err_count = src->phy_err_count; + dst->chan_tx_power = src->chan_tx_pwr; +} + +static void +ath12k_wmi_pull_pdev_stats_tx(const struct wmi_pdev_stats_tx *src, + struct ath12k_fw_stats_pdev *dst) +{ + dst->comp_queued = src->comp_queued; + dst->comp_delivered = src->comp_delivered; + dst->msdu_enqued = src->msdu_enqued; + dst->mpdu_enqued = src->mpdu_enqued; + dst->wmm_drop = src->wmm_drop; + dst->local_enqued = src->local_enqued; + dst->local_freed = src->local_freed; + dst->hw_queued = src->hw_queued; + dst->hw_reaped = src->hw_reaped; + dst->underrun = src->underrun; + dst->tx_abort = src->tx_abort; + dst->mpdus_requed = src->mpdus_requed; + dst->tx_ko = src->tx_ko; + dst->data_rc = src->data_rc; + dst->self_triggers = src->self_triggers; + dst->sw_retry_failure = src->sw_retry_failure; + dst->illgl_rate_phy_err = src->illgl_rate_phy_err; + dst->pdev_cont_xretry = src->pdev_cont_xretry; + dst->pdev_tx_timeout = src->pdev_tx_timeout; + dst->pdev_resets = src->pdev_resets; + dst->stateless_tid_alloc_failure = src->stateless_tid_alloc_failure; + dst->phy_underrun = src->phy_underrun; + dst->txop_ovf = src->txop_ovf; +} + +static void ath12k_wmi_pull_pdev_stats_rx(const struct wmi_pdev_stats_rx *src, + struct ath12k_fw_stats_pdev *dst) +{ + dst->mid_ppdu_route_change = src->mid_ppdu_route_change; + dst->status_rcvd = src->status_rcvd; + dst->r0_frags = src->r0_frags; + dst->r1_frags = src->r1_frags; + dst->r2_frags = src->r2_frags; + dst->r3_frags = src->r3_frags; + dst->htt_msdus = src->htt_msdus; + dst->htt_mpdus = src->htt_mpdus; + dst->loc_msdus = src->loc_msdus; + dst->loc_mpdus = src->loc_mpdus; + dst->oversize_amsdu = src->oversize_amsdu; + dst->phy_errs = src->phy_errs; + dst->phy_err_drop = src->phy_err_drop; + dst->mpdu_errs = src->mpdu_errs; +} + +static void +ath12k_wmi_pull_vdev_stats(const struct wmi_vdev_stats *src, + struct ath12k_fw_stats_vdev *dst) +{ + int i; + + dst->vdev_id = src->vdev_id; + dst->beacon_snr = src->beacon_snr; + dst->data_snr = src->data_snr; + dst->num_rx_frames = src->num_rx_frames; + dst->num_rts_fail = src->num_rts_fail; + dst->num_rts_success = src->num_rts_success; + dst->num_rx_err = src->num_rx_err; + dst->num_rx_discard = src->num_rx_discard; + dst->num_tx_not_acked = src->num_tx_not_acked; + + for (i = 0; i < ARRAY_SIZE(src->num_tx_frames); i++) + dst->num_tx_frames[i] = src->num_tx_frames[i]; + + for (i = 0; i < ARRAY_SIZE(src->num_tx_frames_retries); i++) + dst->num_tx_frames_retries[i] = src->num_tx_frames_retries[i]; + + for (i = 0; i < ARRAY_SIZE(src->num_tx_frames_failures); i++) + dst->num_tx_frames_failures[i] = src->num_tx_frames_failures[i]; + + for (i = 0; i < ARRAY_SIZE(src->tx_rate_history); i++) + dst->tx_rate_history[i] = src->tx_rate_history[i]; + + for (i = 0; i < ARRAY_SIZE(src->beacon_rssi_history); i++) + dst->beacon_rssi_history[i] = src->beacon_rssi_history[i]; +} + +static void +ath12k_wmi_pull_bcn_stats(const struct wmi_bcn_stats *src, + struct ath12k_fw_stats_bcn *dst) +{ + dst->vdev_id = src->vdev_id; + dst->tx_bcn_succ_cnt = src->tx_bcn_succ_cnt; + dst->tx_bcn_outage_cnt = src->tx_bcn_outage_cnt; +} + +int ath12k_wmi_pull_fw_stats(struct ath12k_base *ab, struct sk_buff *skb, + struct ath12k_fw_stats *stats) { const void **tb; - int ret; + const struct wmi_stats_event *ev; + const void *data; + int i, ret; + struct ath12k *ar; + u32 len = skb->len; - tb = ath12k_wmi_tlv_parse_alloc(ab, evt_buf, len, GFP_ATOMIC); + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, len, GFP_ATOMIC); if (IS_ERR(tb)) { ret = PTR_ERR(tb); ath12k_warn(ab, "failed to parse tlv: %d\n", ret); return ret; } - ev = tb[WMI_TAG_PDEV_TEMPERATURE_EVENT]; - if (!ev) { - ath12k_warn(ab, "failed to fetch pdev temp ev"); + ev = tb[WMI_TAG_STATS_EVENT]; + data = tb[WMI_TAG_ARRAY_BYTE]; + if (!ev || !data) { + ath12k_warn(ab, "failed to fetch update stats ev"); kfree(tb); return -EPROTO; } + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi stats update ev pdev_id %d pdev %i vdev %i bcn %i\n", + ev->pdev_id, + ev->num_pdev_stats, ev->num_vdev_stats, + ev->num_bcn_stats); + + stats->pdev_id = le32_to_cpu(ev->pdev_id); + stats->stats_id = 0; + + ar = ath12k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + + if (!ar) + return -EPROTO; + + for (i = 0; i < le32_to_cpu(ev->num_pdev_stats); i++) { + const struct wmi_pdev_stats *src; + struct ath12k_fw_stats_pdev *dst; + + src = data; + if (len < sizeof(*src)) { + kfree(tb); + return -EPROTO; + } + + stats->stats_id = WMI_REQUEST_PDEV_STAT; + + data += sizeof(*src); + len -= sizeof(*src); + + dst = kzalloc(sizeof(*dst), GFP_ATOMIC); + if (!dst) + continue; + + ath12k_wmi_pull_pdev_stats_base(&src->base, dst); + ath12k_wmi_pull_pdev_stats_tx(&src->tx, dst); + ath12k_wmi_pull_pdev_stats_rx(&src->rx, dst); + list_add_tail(&dst->list, &stats->pdevs); + } + + for (i = 0; i < le32_to_cpu(ev->num_vdev_stats); i++) { + const struct wmi_vdev_stats *src; + struct ath12k_fw_stats_vdev *dst; + + src = data; + if (len < sizeof(*src)) { + kfree(tb); + return -EPROTO; + } + + stats->stats_id = WMI_REQUEST_VDEV_STAT; + + data += sizeof(*src); + len -= sizeof(*src); + + dst = kzalloc(sizeof(*dst), GFP_ATOMIC); + if (!dst) + continue; + + ath12k_wmi_pull_vdev_stats(src, dst); + list_add_tail(&dst->list, &stats->vdevs); + } + + for (i = 0; i < le32_to_cpu(ev->num_bcn_stats); i++) { + const struct wmi_bcn_stats *src; + struct ath12k_fw_stats_bcn *dst; + + src = data; + if (len < sizeof(*src)) { + kfree(tb); + return -EPROTO; + } + + stats->stats_id = WMI_REQUEST_BCN_STAT; + + data += sizeof(*src); + len -= sizeof(*src); + + dst = kzalloc(sizeof(*dst), GFP_ATOMIC); + if (!dst) + continue; + + ath12k_wmi_pull_bcn_stats(src, dst); + list_add_tail(&dst->list, &stats->bcn); + } + kfree(tb); return 0; } +size_t ath12k_wmi_fw_stats_num_vdevs(struct list_head *head) +{ + struct ath12k_fw_stats_vdev *i; + size_t num = 0; + + list_for_each_entry(i, head, list) + ++num; + + return num; +} + +static size_t ath12k_wmi_fw_stats_num_bcn(struct list_head *head) +{ + struct ath12k_fw_stats_bcn *i; + size_t num = 0; + + list_for_each_entry(i, head, list) + ++num; + + return num; +} + +static void +ath12k_wmi_fw_pdev_base_stats_fill(const struct ath12k_fw_stats_pdev *pdev, + char *buf, u32 *length, u64 fw_soc_drop_cnt) +{ + u32 len = *length; + u32 buf_len = ATH12K_FW_STATS_BUF_SIZE; + + len += scnprintf(buf + len, buf_len - len, "\n"); + len += scnprintf(buf + len, buf_len - len, "%30s\n", + "ath12k PDEV stats"); + len += scnprintf(buf + len, buf_len - len, "%30s\n\n", + "================="); + + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Channel noise floor", pdev->ch_noise_floor); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Channel TX power", pdev->chan_tx_power); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "TX frame count", pdev->tx_frame_count); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "RX frame count", pdev->rx_frame_count); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "RX clear count", pdev->rx_clear_count); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Cycle count", pdev->cycle_count); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "PHY error count", pdev->phy_err_count); + len += scnprintf(buf + len, buf_len - len, "%30s %10llu\n", + "soc drop count", fw_soc_drop_cnt); + + *length = len; +} + +static void +ath12k_wmi_fw_pdev_tx_stats_fill(const struct ath12k_fw_stats_pdev *pdev, + char *buf, u32 *length) +{ + u32 len = *length; + u32 buf_len = ATH12K_FW_STATS_BUF_SIZE; + + len += scnprintf(buf + len, buf_len - len, "\n%30s\n", + "ath12k PDEV TX stats"); + len += scnprintf(buf + len, buf_len - len, "%30s\n\n", + "===================="); + + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "HTT cookies queued", pdev->comp_queued); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "HTT cookies disp.", pdev->comp_delivered); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MSDU queued", pdev->msdu_enqued); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MPDU queued", pdev->mpdu_enqued); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MSDUs dropped", pdev->wmm_drop); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Local enqued", pdev->local_enqued); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Local freed", pdev->local_freed); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "HW queued", pdev->hw_queued); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "PPDUs reaped", pdev->hw_reaped); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Num underruns", pdev->underrun); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "PPDUs cleaned", pdev->tx_abort); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MPDUs requeued", pdev->mpdus_requed); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Excessive retries", pdev->tx_ko); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "HW rate", pdev->data_rc); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Sched self triggers", pdev->self_triggers); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Dropped due to SW retries", + pdev->sw_retry_failure); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Illegal rate phy errors", + pdev->illgl_rate_phy_err); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "PDEV continuous xretry", pdev->pdev_cont_xretry); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "TX timeout", pdev->pdev_tx_timeout); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "PDEV resets", pdev->pdev_resets); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "Stateless TIDs alloc failures", + pdev->stateless_tid_alloc_failure); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "PHY underrun", pdev->phy_underrun); + len += scnprintf(buf + len, buf_len - len, "%30s %10u\n", + "MPDU is more than txop limit", pdev->txop_ovf); + *length = len; +} + +static void +ath12k_wmi_fw_pdev_rx_stats_fill(const struct ath12k_fw_stats_pdev *pdev, + char *buf, u32 *length) +{ + u32 len = *length; + u32 buf_len = ATH12K_FW_STATS_BUF_SIZE; + + len += scnprintf(buf + len, buf_len - len, "\n%30s\n", + "ath12k PDEV RX stats"); + len += scnprintf(buf + len, buf_len - len, "%30s\n\n", + "===================="); + + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Mid PPDU route change", + pdev->mid_ppdu_route_change); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Tot. number of statuses", pdev->status_rcvd); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Extra frags on rings 0", pdev->r0_frags); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Extra frags on rings 1", pdev->r1_frags); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Extra frags on rings 2", pdev->r2_frags); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Extra frags on rings 3", pdev->r3_frags); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MSDUs delivered to HTT", pdev->htt_msdus); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MPDUs delivered to HTT", pdev->htt_mpdus); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MSDUs delivered to stack", pdev->loc_msdus); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MPDUs delivered to stack", pdev->loc_mpdus); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "Oversized AMSUs", pdev->oversize_amsdu); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "PHY errors", pdev->phy_errs); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "PHY errors drops", pdev->phy_err_drop); + len += scnprintf(buf + len, buf_len - len, "%30s %10d\n", + "MPDU errors (FCS, MIC, ENC)", pdev->mpdu_errs); + *length = len; +} + +static void +ath12k_wmi_fw_vdev_stats_fill(struct ath12k *ar, + const struct ath12k_fw_stats_vdev *vdev, + char *buf, u32 *length) +{ + u32 len = *length; + u32 buf_len = ATH12K_FW_STATS_BUF_SIZE; + struct ath12k_link_vif *arvif = ath12k_mac_get_arvif(ar, vdev->vdev_id); + u8 *vif_macaddr; + int i; + + /* VDEV stats has all the active VDEVs of other PDEVs as well, + * ignoring those not part of requested PDEV + */ + if (!arvif) + return; + + vif_macaddr = arvif->addr; + + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "VDEV ID", vdev->vdev_id); + len += scnprintf(buf + len, buf_len - len, "%30s %pM\n", + "VDEV MAC address", vif_macaddr); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "beacon snr", vdev->beacon_snr); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "data snr", vdev->data_snr); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "num rx frames", vdev->num_rx_frames); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "num rts fail", vdev->num_rts_fail); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "num rts success", vdev->num_rts_success); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "num rx err", vdev->num_rx_err); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "num rx discard", vdev->num_rx_discard); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "num tx not acked", vdev->num_tx_not_acked); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "rx msdu byte cnt", arvif->vdev_stats.rx_msdu_byte_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "rx msdu pkt cnt", arvif->vdev_stats.rx_msdu_pkt_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "ack msdu byte cnt", arvif->vdev_stats.tx_msdu_byte_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "ack msdu pkt cnt", arvif->vdev_stats.tx_msdu_pkt_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "retry byte cnt", arvif->vdev_stats.tx_retry_byte_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "retry pkt cnt", arvif->vdev_stats.tx_retry_pkt_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "drop byte cnt", arvif->vdev_stats.tx_drop_byte_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "drop pkt cnt", arvif->vdev_stats.tx_drop_pkt_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "age out drop byte cnt", + arvif->vdev_stats.tx_msdu_ttl_byte_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %llu\n", + "age out drop pkt cnt", + arvif->vdev_stats.tx_msdu_ttl_pkt_cnt); + + for (i = 0 ; i < ARRAY_SIZE(vdev->num_tx_frames); i++) + len += scnprintf(buf + len, buf_len - len, + "%25s [%02d] %u\n", + "num tx frames", i, + vdev->num_tx_frames[i]); + + for (i = 0 ; i < ARRAY_SIZE(vdev->num_tx_frames_retries); i++) + len += scnprintf(buf + len, buf_len - len, + "%25s [%02d] %u\n", + "num tx frames retries", i, + vdev->num_tx_frames_retries[i]); + + for (i = 0 ; i < ARRAY_SIZE(vdev->num_tx_frames_failures); i++) + len += scnprintf(buf + len, buf_len - len, + "%25s [%02d] %u\n", + "num tx frames failures", i, + vdev->num_tx_frames_failures[i]); + + for (i = 0 ; i < ARRAY_SIZE(vdev->tx_rate_history); i++) + len += scnprintf(buf + len, buf_len - len, + "%25s [%02d] 0x%08x\n", + "tx rate history", i, + vdev->tx_rate_history[i]); + + for (i = 0 ; i < ARRAY_SIZE(vdev->beacon_rssi_history); i++) + len += scnprintf(buf + len, buf_len - len, + "%25s [%02d] %u\n", + "beacon rssi history", i, + vdev->beacon_rssi_history[i]); + + len += scnprintf(buf + len, buf_len - len, "\n"); + *length = len; +} + +static void +ath12k_wmi_fw_bcn_stats_fill(struct ath12k *ar, + const struct ath12k_fw_stats_bcn *bcn, + char *buf, u32 *length) +{ + u32 len = *length; + u32 buf_len = ATH12K_FW_STATS_BUF_SIZE; + struct ath12k_link_vif *arvif = ath12k_mac_get_arvif(ar, bcn->vdev_id); + u8 *vdev_macaddr; + + if (!arvif) { + ath12k_warn(ar->ab, "invalid vdev id %d in bcn stats", + bcn->vdev_id); + return; + } + + vdev_macaddr = arvif->addr; + + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "VDEV ID", bcn->vdev_id); + len += scnprintf(buf + len, buf_len - len, "%30s %pM\n", + "VDEV MAC address", vdev_macaddr); + len += scnprintf(buf + len, buf_len - len, "%30s\n\n", + "================"); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "Num of beacon tx success", bcn->tx_bcn_succ_cnt); + len += scnprintf(buf + len, buf_len - len, "%30s %u\n", + "Num of beacon tx failures", bcn->tx_bcn_outage_cnt); + + len += scnprintf(buf + len, buf_len - len, "\n"); + *length = len; +} + +void ath12k_wmi_fw_stats_fill(struct ath12k *ar, + struct ath12k_fw_stats *fw_stats, + u32 stats_id, char *buf) +{ + u32 len = 0; + u32 buf_len = ATH12K_FW_STATS_BUF_SIZE; + const struct ath12k_fw_stats_pdev *pdev; + const struct ath12k_fw_stats_vdev *vdev; + const struct ath12k_fw_stats_bcn *bcn; + size_t num_bcn; + + spin_lock_bh(&ar->data_lock); + + if (stats_id == WMI_REQUEST_PDEV_STAT) { + pdev = list_first_entry_or_null(&fw_stats->pdevs, + struct ath12k_fw_stats_pdev, list); + if (!pdev) { + ath12k_warn(ar->ab, "failed to get pdev stats\n"); + goto unlock; + } + + ath12k_wmi_fw_pdev_base_stats_fill(pdev, buf, &len, + ar->ab->fw_soc_drop_count); + ath12k_wmi_fw_pdev_tx_stats_fill(pdev, buf, &len); + ath12k_wmi_fw_pdev_rx_stats_fill(pdev, buf, &len); + } + + if (stats_id == WMI_REQUEST_VDEV_STAT) { + len += scnprintf(buf + len, buf_len - len, "\n"); + len += scnprintf(buf + len, buf_len - len, "%30s\n", + "ath12k VDEV stats"); + len += scnprintf(buf + len, buf_len - len, "%30s\n\n", + "================="); + + list_for_each_entry(vdev, &fw_stats->vdevs, list) + ath12k_wmi_fw_vdev_stats_fill(ar, vdev, buf, &len); + } + + if (stats_id == WMI_REQUEST_BCN_STAT) { + num_bcn = ath12k_wmi_fw_stats_num_bcn(&fw_stats->bcn); + + len += scnprintf(buf + len, buf_len - len, "\n"); + len += scnprintf(buf + len, buf_len - len, "%30s (%zu)\n", + "ath12k Beacon stats", num_bcn); + len += scnprintf(buf + len, buf_len - len, "%30s\n\n", + "==================="); + + list_for_each_entry(bcn, &fw_stats->bcn, list) + ath12k_wmi_fw_bcn_stats_fill(ar, bcn, buf, &len); + } + +unlock: + spin_unlock_bh(&ar->data_lock); + + if (len >= buf_len) + buf[len - 1] = 0; + else + buf[len] = 0; +} + static void ath12k_wmi_op_ep_tx_credits(struct ath12k_base *ab) { /* try to send pending beacons first. they take priority */ @@ -5125,42 +8984,47 @@ static void ath12k_wmi_htc_tx_complete(struct ath12k_base *ab, struct sk_buff *skb) { + struct ath12k_wmi_pdev *wmi = NULL; + u32 i; + u8 wmi_ep_count; + u8 eid; + + eid = ATH12K_SKB_CB(skb)->eid; dev_kfree_skb(skb); -} -static bool ath12k_reg_is_world_alpha(char *alpha) -{ - return alpha[0] == '0' && alpha[1] == '0'; -} + if (eid >= ATH12K_HTC_EP_COUNT) + return; -static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *skb) -{ - struct ath12k_reg_info *reg_info = NULL; - struct ieee80211_regdomain *regd = NULL; - bool intersect = false; - int ret = 0, pdev_idx, i, j; - struct ath12k *ar; + wmi_ep_count = ab->htc.wmi_ep_count; + if (wmi_ep_count > ab->hw_params->max_radios) + return; - reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC); - if (!reg_info) { - ret = -ENOMEM; - goto fallback; + for (i = 0; i < ab->htc.wmi_ep_count; i++) { + if (ab->wmi_ab.wmi[i].eid == eid) { + wmi = &ab->wmi_ab.wmi[i]; + break; + } } - ret = ath12k_pull_reg_chan_list_ext_update_ev(ab, skb, reg_info); - - if (ret) { - ath12k_warn(ab, "failed to extract regulatory info from received event\n"); - goto fallback; + if (wmi) + wake_up(&wmi->tx_ce_desc_wq); } +static int ath12k_reg_handle_chan_list(struct ath12k_base *ab, + struct ath12k_reg_info *reg_info, + enum ieee80211_ap_reg_power power_type) +{ + struct ieee80211_regdomain *regd; + int pdev_idx; + struct ath12k *ar; + if (reg_info->status_code != REG_SET_CC_STATUS_PASS) { /* In case of failure to set the requested ctry, * fw retains the current regd. We print a failure info * and return from here. */ ath12k_warn(ab, "Failed to set the requested Country regulatory setting\n"); - goto mem_free; + return -EINVAL; } pdev_idx = reg_info->phy_id; @@ -5172,7 +9036,7 @@ */ if (ab->hw_params->single_pdev_only && pdev_idx < ab->hw_params->num_rxmda_per_pdev) - goto mem_free; + goto retfail; else goto fallback; } @@ -5183,26 +9047,20 @@ if (ab->default_regd[pdev_idx] && !ab->new_regd[pdev_idx] && !memcmp(ab->default_regd[pdev_idx]->alpha2, reg_info->alpha2, 2)) - goto mem_free; + goto retfail; - /* Intersect new rules with default regd if a new country setting was - * requested, i.e a default regd was already set during initialization - * and the regd coming from this event has a valid country info. - */ - if (ab->default_regd[pdev_idx] && - !ath12k_reg_is_world_alpha((char *) - ab->default_regd[pdev_idx]->alpha2) && - !ath12k_reg_is_world_alpha((char *)reg_info->alpha2)) - intersect = true; + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi handle chan list power type %d\n", power_type); - regd = ath12k_reg_build_regd(ab, reg_info, intersect); + regd = ath12k_reg_build_regd(ab, reg_info, power_type); if (!regd) { ath12k_warn(ab, "failed to build regd from reg_info\n"); goto fallback; } spin_lock(&ab->base_lock); - if (test_bit(ATH12K_FLAG_REGISTERED, &ab->dev_flags)) { + if (ab->default_regd[pdev_idx] && + ab->regd_change_user_request[pdev_idx]) { /* Once mac is registered, ar is valid and all CC events from * fw is considered to be received due to user requests * currently. @@ -5213,7 +9071,8 @@ ar = ab->pdevs[pdev_idx].ar; kfree(ab->new_regd[pdev_idx]); ab->new_regd[pdev_idx] = regd; - ieee80211_queue_work(ar->hw, &ar->regd_update_work); + queue_work(ab->workqueue, &ar->regd_update_work); + } else { /* Multiple events for the same *ar is not expected. But we * can still clear any previously stored default_regd if we @@ -5227,7 +9086,7 @@ ab->dfs_region = reg_info->dfs_region; spin_unlock(&ab->base_lock); - goto mem_free; + return 0; fallback: /* Fallback to older reg (by sending previous country setting @@ -5239,17 +9098,42 @@ */ /* TODO: This is rare, but still should also be handled */ WARN_ON(1); +retfail: + return -EINVAL; +} + + +static int ath12k_reg_chan_list_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + struct ath12k_reg_info *reg_info; + int ret, i, j; + + reg_info = kzalloc(sizeof(*reg_info), GFP_ATOMIC); + if (!reg_info) + return -ENOMEM; + + ret = ath12k_pull_reg_chan_list_ext_update_ev(ab, skb, reg_info); + + if (ret) { + ath12k_warn(ab, "failed to extract regulatory info from received event\n"); + goto mem_free; + } + + ret = ath12k_reg_handle_chan_list(ab, reg_info, IEEE80211_REG_UNSET_AP); + if (ret) { + ath12k_warn(ab, "failed to process regulatory info from received event\n"); + goto mem_free; + } mem_free: if (reg_info) { kfree(reg_info->reg_rules_2g_ptr); kfree(reg_info->reg_rules_5g_ptr); if (reg_info->is_ext_reg_event) { - for (i = 0; i < WMI_REG_CURRENT_MAX_AP_TYPE; i++) + for (i = 0; i < WMI_REG_CURRENT_MAX_AP_TYPE; i++) { kfree(reg_info->reg_rules_6g_ap_ptr[i]); - - for (j = 0; j < WMI_REG_CURRENT_MAX_AP_TYPE; j++) - for (i = 0; i < WMI_REG_MAX_CLIENT_TYPE; i++) - kfree(reg_info->reg_rules_6g_client_ptr[j][i]); + for (j = 0; j < WMI_REG_MAX_CLIENT_TYPE; j++) + kfree(reg_info->reg_rules_6g_client_ptr[i][j]); + } } kfree(reg_info); } @@ -5277,7 +9161,7 @@ ether_addr_copy(ab->mac_addr, fixed_param.ready_event_min.mac_addr.addr); - ab->pktlog_defs_checksum = le32_to_cpu(fixed_param.pktlog_defs_checksum); + ab->pktlog_defs_checksum = fixed_param.pktlog_defs_checksum; ab->wmi_ready = true; break; case WMI_TAG_ARRAY_FIXED_STRUCT: @@ -5290,6 +9174,16 @@ for (i = 0; i < ab->num_radios; i++) { pdev = &ab->pdevs[i]; ether_addr_copy(pdev->mac_addr, addr_list[i].addr); + if (!memcmp(pdev->mac_addr, "\x00\x03\x7f", 3)) { + /* randomly assigned mac address + * chosen by firmware, but the problem + * is that it will chose the same one + * for all PCIe cards and we will get + * duplicate addresses, at least make + * sure to mark them locally assigned + * so userspace will override them */ + pdev->mac_addr[0] |= (1 << 1); + } } ab->pdevs_macaddr_valid = true; break; @@ -5327,7 +9221,7 @@ } rcu_read_lock(); - ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(peer_del_resp.vdev_id)); + ar = ath12k_mac_get_ar_by_vdev_id(ab, peer_del_resp.vdev_id); if (!ar) { ath12k_warn(ab, "invalid vdev id in peer delete resp ev %d", peer_del_resp.vdev_id); @@ -5337,7 +9231,7 @@ complete(&ar->peer_delete_done); rcu_read_unlock(); - ath12k_dbg(ab, ATH12K_DBG_WMI, "peer delete resp for vdev id %d addr %pM\n", + ath12k_dbg(ab, ATH12K_DBG_PEER, "peer delete resp for vdev id %d addr %pM\n", peer_del_resp.vdev_id, peer_del_resp.peer_macaddr.addr); } @@ -5380,6 +9274,14 @@ return "dfs violation"; case WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN: return "invalid regdomain"; + case WMI_VDEV_START_RESPONSE_INVALID_BAND: + return "invalid band"; + case WMI_VDEV_START_RESPONSE_INVALID_PREFERRED_TX_RX_STREAMS: + /** Invalid preferred tx/rx streams */ + return "invalid TX/RX streams"; + case WMI_VDEV_START_RESPONSE_INVALID_TX_VAP_CONFIG: + /** Invalid tx_vap config in VDEV start */ + return "invalid tx vap config"; default: return "unknown"; } @@ -5397,7 +9299,7 @@ } rcu_read_lock(); - ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(vdev_start_resp.vdev_id)); + ar = ath12k_mac_get_ar_by_vdev_id(ab, vdev_start_resp.vdev_id); if (!ar) { ath12k_warn(ab, "invalid vdev id in vdev start resp ev %d", vdev_start_resp.vdev_id); @@ -5406,8 +9308,9 @@ } ar->last_wmi_vdev_start_status = 0; + ar->max_allowed_tx_power = vdev_start_resp.max_allowed_tx_power; - status = le32_to_cpu(vdev_start_resp.status); + status = vdev_start_resp.status; if (WARN_ON_ONCE(status)) { ath12k_warn(ab, "vdev start resp error status %d (%s)\n", @@ -5425,6 +9328,7 @@ static void ath12k_bcn_tx_status_event(struct ath12k_base *ab, struct sk_buff *skb) { + struct ath12k_link_vif *arvif; u32 vdev_id, tx_status; if (ath12k_pull_bcn_tx_status_ev(ab, skb->data, skb->len, @@ -5432,6 +9336,16 @@ ath12k_warn(ab, "failed to extract bcn tx status"); return; } + + rcu_read_lock(); + arvif = ath12k_mac_get_arvif_by_vdev_id(ab, vdev_id); + if (!arvif) { + ath12k_warn(ab, "invalid vdev id %d in bcn_tx_status", + vdev_id); + rcu_read_unlock(); + return; + } + rcu_read_unlock(); } static void ath12k_vdev_stopped_event(struct ath12k_base *ab, struct sk_buff *skb) @@ -5460,52 +9374,2394 @@ ath12k_dbg(ab, ATH12K_DBG_WMI, "vdev stopped for vdev id %d", vdev_id); } +/** + * ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte() - Compare given mgmt packet counters + * @ctr1: Management packet counter1 + * @ctr2: Management packet counter2 + * + * We can't directly use the comparison operator here because the counters can + * overflow. But these counters have a property that the difference between + * them can never be greater than half the range of the data type. + * We can make use of this condition to detect which one is actually greater. + * + * Return: true if @ctr1 is greater than or equal to @ctr2, else false + */ +static inline bool +ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte(u16 ctr1, u16 ctr2) +{ + u16 delta = ctr1 - ctr2; + + return delta <= ATH12K_MGMT_RX_REO_PKT_CTR_HALF_RANGE; +} + +/** + * ath12k_mgmt_rx_reo_subtract_pkt_ctrs() - Subtract given mgmt packet counters + * @ctr1: Management packet counter1 + * @ctr2: Management packet counter2 + * + * We can't directly use the subtract operator here because the counters can + * overflow. But these counters have a property that the difference between + * them can never be greater than half the range of the data type. + * We can make use of this condition to detect whichone is actually greater and + * return the difference accordingly. + * + * Return: Difference between @ctr1 and @crt2 + */ +static inline int +ath12k_mgmt_rx_reo_subtract_pkt_ctrs(u16 ctr1, u16 ctr2) +{ + u16 delta = ctr1 - ctr2; + + /** + * if delta is greater than half the range (i.e, ctr1 is actually + * smaller than ctr2), then the result should be a negative number. + * subtracting the entire range should give the correct value. + */ + if (delta > ATH12K_MGMT_RX_REO_PKT_CTR_HALF_RANGE) + return delta - ATH12K_MGMT_RX_REO_PKT_CTR_FULL_RANGE; + + return delta; +} + +#define ATH12K_MGMT_RX_REO_GLOBAL_TS_HALF_RANGE (0x80000000) +/** + * ath12k_mgmt_rx_reo_compare_global_timestamps_gte()-Compare given global timestamps + * @ts1: Global timestamp1 + * @ts2: Global timestamp2 + * + * We can't directly use the comparison operator here because the timestamps can + * overflow. But these timestamps have a property that the difference between + * them can never be greater than half the range of the data type. + * We can make use of this condition to detect which one is actually greater. + * + * Return: true if @ts1 is greater than or equal to @ts2, else false + */ +static inline bool +ath12k_mgmt_rx_reo_compare_global_timestamps_gte(u32 ts1, u32 ts2) +{ + u32 delta = ts1 - ts2; + + return delta <= ATH12K_MGMT_RX_REO_GLOBAL_TS_HALF_RANGE; +} + +#define ATH12K_RX_REO_REORD_MAX_DELTA 0xFFFF +/** + * ath12k_wlan_mgmt_rx_reo_update_host_snapshot() - Update Host snapshot with the MGMT + * Rx REO parameters. + * @desc: pointer to frame descriptor + * + * Return: 0 on Success, Error value on failure of operation + */ +static int +ath12k_wlan_mgmt_rx_reo_update_host_snapshot(struct ath12k *ar, + struct ath12k_mgmt_rx_reo_frame_descriptor *desc) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_mgmt_rx_reo_pdev_info *rx_reo_pdev_ctx; + struct ath12k_mgmt_rx_reo_snapshot_params *host_ss; + struct ath12k_mgmt_rx_reo_params *reo_params; + int pkt_ctr_delta; + + if (!desc) { + ath12k_err(ab, "Mgmt Rx REO frame descriptor null\n"); + return -EINVAL; + } + + if (!desc->rx_params) { + ath12k_err(ab, "Mgmt Rx params NULL\n"); + return -EINVAL; + } + + reo_params = &desc->rx_params->reo_params; + + rx_reo_pdev_ctx = &ar->rx_reo_pdev_ctx; + if (!rx_reo_pdev_ctx) { + ath12k_err(ab, "Mgmt Rx REO context empty for pdev\n"); + return -EINVAL; + } + + /* FW should send valid REO parameters */ + if (!reo_params->valid) { + ath12k_err(ab, "Mgmt Rx REO params is invalid\n"); + return -EINVAL; + } + + host_ss = &rx_reo_pdev_ctx->host_snapshot; + + if (!host_ss->valid) { + desc->pkt_ctr_delta = 1; + goto update_host_ss; + } + + if (ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte(host_ss->mgmt_pkt_ctr, + reo_params->mgmt_pkt_ctr)) { + ath12k_err(ab, "Cur frame ctr < last frame ctr for link = %u", + reo_params->link_id); + goto failure_debug; + } + + pkt_ctr_delta = ath12k_mgmt_rx_reo_subtract_pkt_ctrs(reo_params->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr); + BUG_ON(!(pkt_ctr_delta > 0)); + desc->pkt_ctr_delta = pkt_ctr_delta; + + if (pkt_ctr_delta == 1) + goto update_host_ss; + + /* Under back pressure scenarios, FW may drop management Rx frame + * WMI events. So holes in the management packet counter is expected. + * Add a debug print and optional assert to track the holes. + */ + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "---- Rx reo reordering(this info is seen since pkt_ctr_delta > 0) ----\n"); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "pkt_ctr_delta = %u\n", pkt_ctr_delta); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Cur frame valid = %u, pkt_ctr = %u, ts =%u\n", + reo_params->valid, reo_params->mgmt_pkt_ctr, + reo_params->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Last frame valid = %u, pkt_ctr = %u, ts =%u\n", + host_ss->valid, host_ss->mgmt_pkt_ctr, + host_ss->global_timestamp); + + if (pkt_ctr_delta > ATH12K_RX_REO_REORD_MAX_DELTA) { + ath12k_err(ab, "pkt ctr delta %u > thresh %u for link %u", + pkt_ctr_delta, ATH12K_RX_REO_REORD_MAX_DELTA, + reo_params->link_id); + goto failure_debug; + } + +update_host_ss: + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Last frame valid = %u, pkt_ctr = %u, ts =%u\n", + host_ss->valid, host_ss->mgmt_pkt_ctr, + host_ss->global_timestamp); + + host_ss->valid = true; + host_ss->global_timestamp = reo_params->global_timestamp; + host_ss->mgmt_pkt_ctr = reo_params->mgmt_pkt_ctr; + + return 0; + +failure_debug: + ath12k_err(ab, "Cur frame valid = %u, pkt_ctr = %u, ts =%u\n", + reo_params->valid, reo_params->mgmt_pkt_ctr, + reo_params->global_timestamp); + ath12k_err(ab, "Last frame valid = %u, pkt_ctr = %u, ts =%u\n", + host_ss->valid, host_ss->mgmt_pkt_ctr, + host_ss->global_timestamp); + BUG_ON(1); + + return -EINVAL; +} + +/** + * ath12k_wmi_mgmt_rx_reo_read_snapshot_raw() - Read raw value of management + * rx-reorder snapshot + * @snapshot_address: snapshot address + * @ath12k_mgmt_rx_reo_snapshot_low: Pointer to lower 32 bits of snapshot value + * @ath12k_mgmt_rx_reo_snapshot_high: Pointer to higher 32 bits of snapshot value + * @snapshot_version: snapshot version + * + * Read raw value of management rx-reorder snapshots. + * + * Return: 0 on Success, Error value on failure + */ +static int +ath12k_wmi_mgmt_rx_reo_read_snapshot_raw + (struct ath12k_mgmt_rx_reo_shared_snapshot *snapshot_address, + u32 *ath12k_mgmt_rx_reo_snapshot_low, + u32 *ath12k_mgmt_rx_reo_snapshot_high, + u8 snapshot_version, + struct ath12k_mgmt_rx_reo_shared_snapshot *raw_snapshot) +{ + u32 prev_snapshot_low; + u32 prev_snapshot_high; + u32 cur_snapshot_low; + u32 cur_snapshot_high; + u8 retry_count = 0; + + if (snapshot_version == 1) { + *ath12k_mgmt_rx_reo_snapshot_low = + snapshot_address->u_low.ath12k_mgmt_rx_reo_snapshot_low; + *ath12k_mgmt_rx_reo_snapshot_high = + snapshot_address->u_high.ath12k_mgmt_rx_reo_snapshot_high; + raw_snapshot->u_low.ath12k_mgmt_rx_reo_snapshot_low = + *ath12k_mgmt_rx_reo_snapshot_low; + raw_snapshot->u_high.ath12k_mgmt_rx_reo_snapshot_high = + *ath12k_mgmt_rx_reo_snapshot_high; + return 0; + } + + prev_snapshot_low = snapshot_address->u_low.ath12k_mgmt_rx_reo_snapshot_low; + prev_snapshot_high = snapshot_address->u_high.ath12k_mgmt_rx_reo_snapshot_high; + raw_snapshot->u_low.ath12k_mgmt_rx_reo_snapshot_low = prev_snapshot_low; + raw_snapshot->u_high.ath12k_mgmt_rx_reo_snapshot_high = prev_snapshot_high; + + for (; retry_count < (ATH12K_MGMT_RX_REO_SNAPSHOT_B2B_READ_SWAR_RETRY_LIMIT - 1); + retry_count++) { + cur_snapshot_low = snapshot_address->u_low.ath12k_mgmt_rx_reo_snapshot_low; + cur_snapshot_high = snapshot_address->u_high.ath12k_mgmt_rx_reo_snapshot_high; + + raw_snapshot[retry_count + 1].u_low.ath12k_mgmt_rx_reo_snapshot_low = + cur_snapshot_low; + raw_snapshot[retry_count + 1].u_high.ath12k_mgmt_rx_reo_snapshot_high = + cur_snapshot_high; + + if (prev_snapshot_low == cur_snapshot_low && + prev_snapshot_high == cur_snapshot_high) + break; + + prev_snapshot_low = cur_snapshot_low; + prev_snapshot_high = cur_snapshot_high; + } + + BUG_ON(retry_count == + (ATH12K_MGMT_RX_REO_SNAPSHOT_B2B_READ_SWAR_RETRY_LIMIT - 1)); + + *ath12k_mgmt_rx_reo_snapshot_low = cur_snapshot_low; + *ath12k_mgmt_rx_reo_snapshot_high = cur_snapshot_high; + + return 0; +} + +/** + * Helper macros/functions for params GET/SET of different hw version + * of the mgmt_rx_reo_snapshot + */ + +static inline u8 +ath12k_mlo_shmem_mgmt_rx_reo_snapshot_valid_get(struct ath12k_base *ab, + u32 ath12k_mgmt_rx_reo_snapshot_low, + u8 snapshot_ver) +{ + if ((snapshot_ver != ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY) && + (snapshot_ver != ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY)) { + ath12k_err(ab, "Check this error snapshot ver %d\n", snapshot_ver); + BUG_ON(1); + } + + return ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_low, 31, 1); +} + +static inline u32 +ath12k_mlo_shmem_mgmt_rx_reo_snapshot_global_timestamp_get( + struct ath12k_base *ab, + u32 ath12k_mgmt_rx_reo_snapshot_low, + u32 ath12k_mgmt_rx_reo_snapshot_high, + u8 snapshot_ver) +{ + if (snapshot_ver == ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY) { + return ath12k_mgmt_rx_reo_snapshot_high; + } else if (snapshot_ver == ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY) { + return + ((ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_high, 15, 17) << 15) | + ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_low, 0, 15)); + } else { + ath12k_err(ab, "Check this error snapshot ver %d\n", snapshot_ver); + BUG_ON(1); + return 0; + } +} + +static inline u16 +mlo_shmem_mgmt_rx_reo_snapshot_mgmt_pkt_ctr_get( + struct ath12k_base *ab, + u32 ath12k_mgmt_rx_reo_snapshot_low, u8 snapshot_ver) +{ + if (snapshot_ver == ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY) { + return ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_low, 0, 16); + } else if (snapshot_ver == ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY) { + return ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_low, 15, 16); + } else { + ath12k_err(ab, "Check this error snapshot ver %d\n", snapshot_ver); + BUG_ON(1); + return 0; + } +} + +#define ATH12K_MLO_SHMEM_MGMT_RX_REO_SNAPSHOT_MGMT_PKT_CTR_REDUNDANT_GET( \ + ath12k_mgmt_rx_reo_snapshot_high) \ + ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_high, 0, 15) + +#define ATH12K_MLO_SHMEM_MGMT_RX_REO_SNAPSHOT_GLOBAL_TIMESTAMP_REDUNDANT_GET( \ + ath12k_mgmt_rx_reo_snapshot_low) \ + ATH12K_MLO_SHMEM_GET_BITS(ath12k_mgmt_rx_reo_snapshot_low, 16, 15) + +static inline bool +ath12k_mlo_shmem_mgmt_rx_reo_snapshot_check_consistency( + struct ath12k_base *ab, + u32 ath12k_mgmt_rx_reo_snapshot_low, + u32 ath12k_mgmt_rx_reo_snapshot_high, + u8 snapshot_ver) +{ + if (snapshot_ver == ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY) { + u32 global_timestamp; + u32 global_timestamp_redundant; + + global_timestamp = + ath12k_mlo_shmem_mgmt_rx_reo_snapshot_global_timestamp_get(ab, + ath12k_mgmt_rx_reo_snapshot_low, + ath12k_mgmt_rx_reo_snapshot_high, + snapshot_ver); + global_timestamp_redundant = + ATH12K_MLO_SHMEM_MGMT_RX_REO_SNAPSHOT_GLOBAL_TIMESTAMP_REDUNDANT_GET( + ath12k_mgmt_rx_reo_snapshot_low); + + return + (ATH12K_MLO_SHMEM_GET_BITS(global_timestamp, 0, 15) == + ATH12K_MLO_SHMEM_GET_BITS(global_timestamp_redundant, 0, 15)); + } else if (snapshot_ver == ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY) { + u16 mgmt_pkt_ctr; + u16 mgmt_pkt_ctr_redundant; + + mgmt_pkt_ctr = mlo_shmem_mgmt_rx_reo_snapshot_mgmt_pkt_ctr_get(ab, + ath12k_mgmt_rx_reo_snapshot_low, snapshot_ver); + mgmt_pkt_ctr_redundant = + ATH12K_MLO_SHMEM_MGMT_RX_REO_SNAPSHOT_MGMT_PKT_CTR_REDUNDANT_GET( + ath12k_mgmt_rx_reo_snapshot_high); + + return + (ATH12K_MLO_SHMEM_GET_BITS(mgmt_pkt_ctr, 0, 15) == + ATH12K_MLO_SHMEM_GET_BITS(mgmt_pkt_ctr_redundant, 0, 15)); + } else { + ath12k_err(ab, "Check this error snapshot ver %d\n", snapshot_ver); + BUG_ON(1); + return 0; + } +} + +/** + * ath12k_mgmt_rx_reo_snapshot_get_mgmt_pkt_ctr() - Get the management packet counter + * from an MGMT Rx REO snapshot + * @snapshot_low: lower 32-bits of the snapshot + * @snapshot_version: snapshot version + * + * Return: Management packet counter of the snapshot + */ +static u16 ath12k_mgmt_rx_reo_snapshot_get_mgmt_pkt_ctr( + struct ath12k_base *ab, + u32 mgmt_rx_reo_snapshot_low, + u8 snapshot_version) +{ + if (snapshot_version == MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY) { + return ATH12K_MLO_SHMEM_GET_BITS(mgmt_rx_reo_snapshot_low, 0, 16); + } else if (snapshot_version == MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY) { + return ATH12K_MLO_SHMEM_GET_BITS(mgmt_rx_reo_snapshot_low, 15, 16); + } else { + ath12k_err(ab, "Check this error snapshot ver %d\n", snapshot_version); + BUG_ON(1); + return 0; + } +} + +/** + * ath12k_wmi_mgmt_rx_reo_read_snapshot() - Read management rx-reorder snapshot + * @pdev: pdev pointer + * @snapshot_info: Snapshot info + * @id: Snapshot ID + * @snapshot_value: Pointer to snapshot value + * + * Read management rx-reorder snapshots from target. + * + * Return: 0 on Success, Error value on failure + */ +static int +ath12k_wmi_mgmt_rx_reo_read_snapshot( + struct ath12k *ar, + struct ath12k_mgmt_rx_reo_snapshot_info *snapshot_info, + enum ath12k_mgmt_rx_reo_shared_snapshot_id id, + struct ath12k_mgmt_rx_reo_snapshot_params *snapshot_value, + struct ath12k_mgmt_rx_reo_shared_snapshot (*raw_snapshot) + [ATH12K_MGMT_RX_REO_SNAPSHOT_B2B_READ_SWAR_RETRY_LIMIT]) +{ + struct ath12k_base *ab = ar->ab; + bool snapshot_valid; + u16 mgmt_pkt_ctr; + u32 global_timestamp; + u32 ath12k_mgmt_rx_reo_snapshot_low; + u32 ath12k_mgmt_rx_reo_snapshot_high; + u8 retry_count; + int status; + struct ath12k_mgmt_rx_reo_shared_snapshot *snapshot_address; + u8 snapshot_version; + + if (!snapshot_info) { + ath12k_err(ab, "Mgmt Rx REO snapshot info null\n"); + return -EINVAL; + } + + snapshot_address = snapshot_info->address; + if (!snapshot_address) { + ath12k_err(ab, "Mgmt Rx REO snapshot address null\n"); + return -EINVAL; + } + + snapshot_version = snapshot_info->version; + + if (!snapshot_value) { + ath12k_err(ab, "Mgmt Rx REO snapshot null\n"); + return -EINVAL; + } + + memset(snapshot_value, 0, sizeof(*snapshot_value)); + + switch (id) { + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW: + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED: + case ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED: + retry_count = 0; + for (; retry_count < ATH12K_MGMT_RX_REO_SNAPSHOT_READ_RETRY_LIMIT; + retry_count++) { + status = ath12k_wmi_mgmt_rx_reo_read_snapshot_raw + (snapshot_address, + &ath12k_mgmt_rx_reo_snapshot_low, + &ath12k_mgmt_rx_reo_snapshot_high, + snapshot_version, + raw_snapshot[retry_count]); + + if (status) { + ath12k_err(ab, "Failed to read snapshot %d status %d\n", + id, status); + return -EINVAL; + } + + snapshot_valid = ath12k_mlo_shmem_mgmt_rx_reo_snapshot_valid_get(ab, + ath12k_mgmt_rx_reo_snapshot_low, + snapshot_version); + + if (!snapshot_valid) { + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Invalid REO snapshot value"); + snapshot_value->valid = false; + snapshot_value->mgmt_pkt_ctr = + ath12k_mgmt_rx_reo_snapshot_get_mgmt_pkt_ctr + (ab, ath12k_mgmt_rx_reo_snapshot_low, + snapshot_version); + snapshot_value->global_timestamp = + ath12k_mlo_shmem_mgmt_rx_reo_snapshot_global_timestamp_get + (ab, ath12k_mgmt_rx_reo_snapshot_low, + ath12k_mgmt_rx_reo_snapshot_high, + snapshot_version); + snapshot_value->retry_count = retry_count + 1; + return 0; + } + + if (ath12k_mlo_shmem_mgmt_rx_reo_snapshot_check_consistency + (ar->ab, ath12k_mgmt_rx_reo_snapshot_low, + ath12k_mgmt_rx_reo_snapshot_high, + snapshot_version)) { + global_timestamp = + ath12k_mlo_shmem_mgmt_rx_reo_snapshot_global_timestamp_get + (ab, ath12k_mgmt_rx_reo_snapshot_low, + ath12k_mgmt_rx_reo_snapshot_high, + snapshot_version); + mgmt_pkt_ctr = + mlo_shmem_mgmt_rx_reo_snapshot_mgmt_pkt_ctr_get + (ab, ath12k_mgmt_rx_reo_snapshot_low, + snapshot_version); + break; + } + ath12k_info(ab, "Inconsistent snapshot %d, version=%u, low=0x%x, high=0x%x, retry=%u\n", + id, snapshot_version, + ath12k_mgmt_rx_reo_snapshot_low, + ath12k_mgmt_rx_reo_snapshot_high, + retry_count); + } + + if (retry_count == ATH12K_MGMT_RX_REO_SNAPSHOT_READ_RETRY_LIMIT) { + ath12k_err(ab, "Read retry limit, id = %d, ver = %u\n", + id, snapshot_version); + BUG_ON(1); + return -EINVAL; + } + + snapshot_value->valid = true; + snapshot_value->mgmt_pkt_ctr = mgmt_pkt_ctr; + snapshot_value->global_timestamp = global_timestamp; + snapshot_value->retry_count = retry_count + 1; + status = 0; + break; + + default: + ath12k_err(ab, "Invalid snapshot id %d\n", id); + status = -EINVAL; + break; + } + + return status; +} + +/** + * ath12k_mgmt_rx_reo_print_snapshots() - Print all snapshots related + * to management Rx reorder module + * @mac_hw_ss: MAC HW snapshot + * @fw_forwarded_ss: FW forwarded snapshot + * @fw_consumed_ss: FW consumed snapshot + * @host_ss: Host snapshot + * + * return: int + */ +static int +ath12k_mgmt_rx_reo_print_snapshots + (struct ath12k_base *ab, + struct ath12k_mgmt_rx_reo_snapshot_params *mac_hw_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *fw_forwarded_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *fw_consumed_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *host_ss) +{ + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "HW SS: valid = %u, ctr = %u, ts = %u\n", + mac_hw_ss->valid, mac_hw_ss->mgmt_pkt_ctr, + mac_hw_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "FW forwarded SS: valid = %u, ctr = %u, ts = %u\n", + fw_forwarded_ss->valid, + fw_forwarded_ss->mgmt_pkt_ctr, + fw_forwarded_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "FW consumed SS: valid = %u, ctr = %u, ts = %u\n", + fw_consumed_ss->valid, + fw_consumed_ss->mgmt_pkt_ctr, + fw_consumed_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "HOST SS: valid = %u, ctr = %u, ts = %u\n", + host_ss->valid, host_ss->mgmt_pkt_ctr, + host_ss->global_timestamp); + + return 0; +} + +/** + * ath12k_wmi_mgmt_rx_reo_invalidate_stale_snapshots() - Invalidate stale management + * Rx REO snapshots + * @mac_hw_ss: MAC HW snapshot + * @fw_forwarded_ss: FW forwarded snapshot + * @fw_consumed_ss: FW consumed snapshot + * @host_ss: Host snapshot + * @link: link ID + * + * return: int + */ +static int +ath12k_wmi_mgmt_rx_reo_invalidate_stale_snapshots + (struct ath12k *ar, + struct ath12k_mgmt_rx_reo_snapshot_params *mac_hw_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *fw_forwarded_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *fw_consumed_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *host_ss, + u8 link) +{ + struct ath12k_base *ab = ar->ab; + + if (!mac_hw_ss->valid) + return 0; + + if (host_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + host_ss->global_timestamp) || + !ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (mac_hw_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr)) { + ath12k_mgmt_rx_reo_print_snapshots(ab, mac_hw_ss, fw_forwarded_ss, + fw_consumed_ss, host_ss); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Invalidate host snapshot, link %u", + link); + host_ss->valid = false; + } + } + + if (fw_forwarded_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + fw_forwarded_ss->global_timestamp) || + !ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (mac_hw_ss->mgmt_pkt_ctr, + fw_forwarded_ss->mgmt_pkt_ctr)) { + ath12k_mgmt_rx_reo_print_snapshots(ab, mac_hw_ss, fw_forwarded_ss, + fw_consumed_ss, host_ss); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Invalidate FW forwarded SS, link %u\n", + link); + fw_forwarded_ss->valid = false; + } + } + + if (host_ss->valid && fw_forwarded_ss->valid && + (ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (host_ss->global_timestamp, + fw_forwarded_ss->global_timestamp) != + ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (host_ss->mgmt_pkt_ctr, + fw_forwarded_ss->mgmt_pkt_ctr))) { + ath12k_mgmt_rx_reo_print_snapshots(ab, mac_hw_ss, fw_forwarded_ss, + fw_consumed_ss, host_ss); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Invalidate FW forwarded SS, link %u", + link); + fw_forwarded_ss->valid = false; + } + + if (fw_consumed_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + fw_consumed_ss->global_timestamp) || + !ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (mac_hw_ss->mgmt_pkt_ctr, + fw_consumed_ss->mgmt_pkt_ctr)) { + ath12k_mgmt_rx_reo_print_snapshots(ab, mac_hw_ss, fw_forwarded_ss, + fw_consumed_ss, host_ss); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Invalidate FW consumed SS, link %u\n", + link); + fw_consumed_ss->valid = false; + } + if (host_ss->valid && fw_consumed_ss->valid && + (ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (host_ss->global_timestamp, + fw_consumed_ss->global_timestamp) != + ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (host_ss->mgmt_pkt_ctr, + fw_consumed_ss->mgmt_pkt_ctr))) { + ath12k_mgmt_rx_reo_print_snapshots(ab, mac_hw_ss, fw_forwarded_ss, + fw_consumed_ss, host_ss); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "Invalidate FW consumed SS, link %u", + link); + fw_consumed_ss->valid = false; + } + } + + return 0; +} + +/** + * mgmt_rx_reo_snapshots_check_sanity() - Check the sanity of management + * Rx REO snapshots + * @mac_hw_ss: MAC HW snapshot + * @fw_forwarded_ss: FW forwarded snapshot + * @fw_consumed_ss: FW consumed snapshot + * @host_ss: Host snapshot + * + * return: int + */ +static int +mgmt_rx_reo_snapshots_check_sanity + (struct ath12k *ar, + struct ath12k_mgmt_rx_reo_snapshot_params *mac_hw_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *fw_forwarded_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *fw_consumed_ss, + struct ath12k_mgmt_rx_reo_snapshot_params *host_ss) +{ + int status; + struct ath12k_base *ab = ar->ab; + + if (!mac_hw_ss->valid) { + if (fw_forwarded_ss->valid || fw_consumed_ss->valid || + host_ss->valid) { + ath12k_err(ab, "MAC HW SS is invalid\n"); + status = -EINVAL; + goto fail; + } + + return 0; + } + + if (!fw_forwarded_ss->valid && !fw_consumed_ss->valid) { + if (host_ss->valid) { + ath12k_err(ab, "FW forwarded and consumed SS invalid\n"); + status = -EINVAL; + goto fail; + } + + return 0; + } + + if (fw_forwarded_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + fw_forwarded_ss->global_timestamp)) { + ath12k_err(ab, "TS: MAC HW SS < FW forwarded SS\n"); + status = -EINVAL; + goto fail; + } + + if (!ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (mac_hw_ss->mgmt_pkt_ctr, + fw_forwarded_ss->mgmt_pkt_ctr)) { + ath12k_err(ab, "PKT CTR: MAC HW SS < FW forwarded SS\n"); + status = -EINVAL; + goto fail; + } + } + + if (fw_consumed_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + fw_consumed_ss->global_timestamp)) { + ath12k_err(ab, "TS: MAC HW SS < FW consumed SS\n"); + status = -EINVAL; + goto fail; + } + + if (!ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (mac_hw_ss->mgmt_pkt_ctr, + fw_consumed_ss->mgmt_pkt_ctr)) { + ath12k_err(ab, "PKT CTR: MAC HW SS < FW consumed SS\n"); + status = -EINVAL; + goto fail; + } + } + + if (host_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + host_ss->global_timestamp)) { + ath12k_err(ab, "TS: MAC HW SS < host SS\n"); + status = -EINVAL; + goto fail; + } + + if (!ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (mac_hw_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr)) { + ath12k_err(ab, "PKT CTR: MAC HW SS < host SS\n"); + status = -EINVAL; + goto fail; + } + + if (fw_forwarded_ss->valid && !fw_consumed_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (fw_forwarded_ss->global_timestamp, + host_ss->global_timestamp)) { + ath12k_err(ab, "TS: FW forwarded < host SS\n"); + status = -EINVAL; + goto fail; + } + + if (!ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (fw_forwarded_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr)) { + ath12k_err(ab, "CTR: FW forwarded < host SS\n"); + status = -EINVAL; + goto fail; + } + } + + if (fw_consumed_ss->valid && !fw_forwarded_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (fw_consumed_ss->global_timestamp, + host_ss->global_timestamp)) { + ath12k_err(ab, "TS: FW consumed < host SS\n"); + status = -EINVAL; + goto fail; + } + + if (!ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (fw_consumed_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr)) { + ath12k_err(ab, "CTR: FW consumed < host SS\n"); + status = -EINVAL; + goto fail; + } + } + + if (fw_forwarded_ss->valid && fw_consumed_ss->valid) { + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (fw_consumed_ss->global_timestamp, + host_ss->global_timestamp) && + !ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (fw_forwarded_ss->global_timestamp, + host_ss->global_timestamp)) { + ath12k_err(ab, "TS: FW consumed/forwarded < host\n"); + status = -EINVAL; + goto fail; + } + + if (!ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (fw_consumed_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr) && + !ath12k_mgmt_rx_reo_compare_pkt_ctrs_gte + (fw_forwarded_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr)) { + ath12k_err(ab, "CTR: FW consumed/forwarded < host\n"); + status = -EINVAL; + goto fail; + } + } + } + + return 0; + +fail: + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "HW SS: valid = %u, ctr = %u, ts = %u", + mac_hw_ss->valid, mac_hw_ss->mgmt_pkt_ctr, + mac_hw_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "FW forwarded SS: valid = %u, ctr = %u, ts = %u", + fw_forwarded_ss->valid, + fw_forwarded_ss->mgmt_pkt_ctr, + fw_forwarded_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "FW consumed SS: valid = %u, ctr = %u, ts = %u", + fw_consumed_ss->valid, + fw_consumed_ss->mgmt_pkt_ctr, + fw_consumed_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "HOST SS: valid = %u, ctr = %u, ts = %u", + host_ss->valid, host_ss->mgmt_pkt_ctr, + host_ss->global_timestamp); + + return status; +} + +/** + * ath12k_wmi_mgmt_rx_reorder_process_calculate_wait_count() - Calculates the number of + * frames an incoming frame should wait for before it gets delivered. + * @in_frame_pdev: pdev on which this frame is received + * @desc: frame Descriptor + * + * Each frame carrys a MGMT pkt number which is local to that link, and a + * timestamp which is global across all the links. MAC HW and FW also captures + * the same details of the last frame that they have seen. Host also maintains + * the details of the last frame it has seen. In total, there are 4 snapshots. + * 1. MAC HW snapshot - latest frame seen at MAC HW + * 2. FW forwarded snapshot- latest frame forwarded to the Host + * 3. FW consumed snapshot - latest frame consumed by the FW + * 4. Host/FW consumed snapshot - latest frame seen by the Host + * By using all these snapshots, this function tries to compute the wait count + * for a given incoming frame on all links. + * + * Return: 1 on success otherwise -1 on failure + */ +static int +ath12k_wmi_mgmt_rx_reorder_process_calculate_wait_count( + struct ath12k *ar, + struct ath12k_mgmt_rx_reo_frame_descriptor *desc) +{ + int status; + u8 hw_link_id; + s8 in_frame_link; + int frames_pending, delta_fwd_host; + u8 snapshot_id; + struct ath12k_base *ab = ar->ab; + struct ath12k *hw_link; + struct ath12k_mgmt_rx_reo_pdev_info *rx_reo_pdev_ctx; + struct ath12k_mgmt_rx_reo_pdev_info *in_frame_rx_reo_pdev_ctx; + struct ath12k_mgmt_rx_reo_snapshot_info *snapshot_info; + struct ath12k_mgmt_rx_reo_snapshot_params snapshot_params + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_snapshot_params *mac_hw_ss, *fw_forwarded_ss, + *fw_consumed_ss, *host_ss; + struct ath12k_mgmt_rx_reo_params *in_frame_params; + struct ath12k_mgmt_rx_reo_wait_count *wait_count; + + in_frame_params = &desc->rx_params->reo_params; + + wait_count = &desc->wait_count; + + /* Get the hw link ID of incoming frame */ + in_frame_link = ar->pdev->hw_link_id; + in_frame_rx_reo_pdev_ctx = &ar->rx_reo_pdev_ctx; + + if (!in_frame_rx_reo_pdev_ctx) { + ath12k_err(ab, "Reo context null for incoming frame\n"); + return -EINVAL; + } + memset(in_frame_rx_reo_pdev_ctx->raw_snapshots, 0, + sizeof(in_frame_rx_reo_pdev_ctx->raw_snapshots)); + + /* Iterate over all the valid hw links */ + for (hw_link_id = 0; hw_link_id < ATH12K_WMI_MLO_MAX_LINKS; hw_link_id++) { + /* No need wait for any frames on an invalid hw_link_id */ + if (!ab->ag->hw_links[hw_link_id]) { + frames_pending = 0; + goto update_pending_frames; + } + + hw_link = ab->ag->hw_links[hw_link_id]; + + /* No need to wait for any frames if the pdev is not found */ + if (!hw_link) { + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "pdev is null for hw_link_id %d\n", hw_link_id); + frames_pending = 0; + goto update_pending_frames; + } + + rx_reo_pdev_ctx = &hw_link->rx_reo_pdev_ctx; + if (!rx_reo_pdev_ctx) { + ath12k_err(ab, "Mgmt reo context empty for hw_link %pK\n", + hw_link); + return -EINVAL; + } + + if (!rx_reo_pdev_ctx->init_complete) { + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "REO init in progress for hw_link_id %d", + hw_link_id); + frames_pending = 0; + goto update_pending_frames; + } + + host_ss = &rx_reo_pdev_ctx->host_snapshot; + + desc->host_snapshot[hw_link_id] = rx_reo_pdev_ctx->host_snapshot; + + ath12k_dbg(ab, ATH12K_DBG_RX_REO, + "hw_link_id = %u HOST SS: valid = %u, ctr = %u, ts = %u", + hw_link_id, host_ss->valid, host_ss->mgmt_pkt_ctr, + host_ss->global_timestamp); + + snapshot_id = 0; + /* Read all the shared snapshots */ + while (snapshot_id < + ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX) { + snapshot_info = &rx_reo_pdev_ctx-> + host_target_shared_snapshot_info[snapshot_id]; + + memset(&snapshot_params[snapshot_id], 0, + sizeof(snapshot_params[snapshot_id])); + + status = ath12k_wmi_mgmt_rx_reo_read_snapshot( + hw_link, snapshot_info, snapshot_id, + &snapshot_params[snapshot_id], + in_frame_rx_reo_pdev_ctx->raw_snapshots + [hw_link_id][snapshot_id]); + + /* Read operation shouldn't fail */ + if (status) { + ath12k_err(ab, "snapshot(%d) read failed on hw_link_id (%d) status %d\n", + snapshot_id, hw_link_id, status); + return status; + } + + /* If snapshot is valid, save it in the pdev context */ + if (snapshot_params[snapshot_id].valid) { + rx_reo_pdev_ctx-> + last_valid_shared_snapshot[snapshot_id] = + snapshot_params[snapshot_id]; + } + desc->shared_snapshots[hw_link_id][snapshot_id] = + snapshot_params[snapshot_id]; + + snapshot_id++; + } + + mac_hw_ss = &snapshot_params + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW]; + fw_forwarded_ss = &snapshot_params + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED]; + fw_consumed_ss = &snapshot_params + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED]; + + status = ath12k_wmi_mgmt_rx_reo_invalidate_stale_snapshots(ar, mac_hw_ss, + fw_forwarded_ss, + fw_consumed_ss, + host_ss, hw_link_id); + if (status) { + ath12k_err(ab, "Failed to invalidate SS for hw_link_id %u\n", + hw_link_id); + return status; + } + + desc->shared_snapshots[hw_link_id][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW] = + *mac_hw_ss; + desc->shared_snapshots[hw_link_id][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED] = + *fw_forwarded_ss; + desc->shared_snapshots[hw_link_id][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED] = + *fw_consumed_ss; + desc->host_snapshot[hw_link_id] = *host_ss; + + status = mgmt_rx_reo_snapshots_check_sanity + (ar, mac_hw_ss, fw_forwarded_ss, fw_consumed_ss, host_ss); + if (status) { + ath12k_err(ab, "Snapshot sanity for hw_link_id %u failed\n", + hw_link_id); + return status; + } + + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "hw_link_id = %u HW SS: valid = %u, ctr = %u, ts = %u", + hw_link_id, mac_hw_ss->valid, + mac_hw_ss->mgmt_pkt_ctr, + mac_hw_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "hw_link_id = %u FW forwarded SS: valid = %u, ctr = %u, ts = %u", + hw_link_id, fw_forwarded_ss->valid, + fw_forwarded_ss->mgmt_pkt_ctr, + fw_forwarded_ss->global_timestamp); + ath12k_dbg(ab, ATH12K_DBG_RX_REO, "hw_link_id = %u FW consumed SS: valid = %u, ctr = %u, ts = %u", + hw_link_id, fw_consumed_ss->valid, + fw_consumed_ss->mgmt_pkt_ctr, + fw_consumed_ss->global_timestamp); + + /* No need wait for any frames on the same hw_link_id */ + if (hw_link_id == in_frame_link) { + frames_pending = 0; + goto update_pending_frames; + } + + /** + * If MAC HW snapshot is invalid, the hw_link_id has not started + * receiving management frames. Set wait count to zero. + */ + if (!mac_hw_ss->valid) { + frames_pending = 0; + goto update_pending_frames; + } + + /** + * If host snapshot is invalid, wait for MAX number of frames. + * When any frame in this hw_link_id arrives at host, actual wait + * counts will be updated. + */ + if (!host_ss->valid) { + wait_count->per_link_count[hw_link_id] = UINT_MAX; + wait_count->total_count += UINT_MAX; + goto print_wait_count; + } + + /** + * If MAC HW snapshot sequence number and host snapshot + * sequence number are same, all the frames received by + * this hw_link_id are processed by host. No need to wait for + * any frames from this hw_link_id. + */ + if (!ath12k_mgmt_rx_reo_subtract_pkt_ctrs(mac_hw_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr)) { + frames_pending = 0; + goto update_pending_frames; + } + + /** + * Ideally, the incoming frame has to wait for only those frames + * (on other links) which meet all the below criterion. + * 1. Frame's timestamp is less than incoming frame's + * 2. Frame is supposed to be consumed by the Host + * 3. Frame is not yet seen by the Host. + * We may not be able to compute the exact optimal wait count + * because HW/FW provides a limited assist. + * This reorder process tries to get the best estimate of wait + * count by not waiting for those frames where we have a conclusive + * evidence that we don't have to wait for those frames. + */ + + /** + * If this link has already seen a frame whose timestamp is + * greater than or equal to incoming frame's timestamp, + * then no need to wait for any frames on this link. + * If the total wait count becomes zero, then the policy on + * whether to deliver such a frame to upper layers is handled + * separately. + */ + if (ath12k_mgmt_rx_reo_compare_global_timestamps_gte( + host_ss->global_timestamp, + in_frame_params->global_timestamp)) { + frames_pending = 0; + goto update_pending_frames; + } + + /** + * For starters, we only have to wait for the frames that are + * seen by MAC HW but not yet seen by Host. The frames which + * reach MAC HW later are guaranteed to have a timestamp + * greater than incoming frame's timestamp. + */ + frames_pending = ath12k_mgmt_rx_reo_subtract_pkt_ctrs( + mac_hw_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr); + BUG_ON(!(frames_pending >= 0)); + + if (frames_pending && + ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (mac_hw_ss->global_timestamp, + in_frame_params->global_timestamp)) { + /** + * Last frame seen at MAC HW has timestamp greater than + * or equal to incoming frame's timestamp. So no need to + * wait for that last frame, but we can't conclusively + * say anything about timestamp of frames before the + * last frame, so try to wait for all of those frames. + */ + frames_pending--; + BUG_ON(!(frames_pending >= 0)); + + if (fw_consumed_ss->valid && + ath12k_mgmt_rx_reo_compare_global_timestamps_gte( + fw_consumed_ss->global_timestamp, + in_frame_params->global_timestamp)) { + /** + * Last frame consumed by the FW has timestamp + * greater than or equal to incoming frame's. + * That means all the frames from + * fw_consumed_ss->mgmt_pkt_ctr to + * mac_hw->mgmt_pkt_ctr will have timestamp + * greater than or equal to incoming frame's and + * hence, no need to wait for those frames. + * We just need to wait for frames from + * host_ss->mgmt_pkt_ctr to + * fw_consumed_ss->mgmt_pkt_ctr-1. This is a + * better estimate over the above estimate, + * so update frames_pending. + */ + frames_pending = + ath12k_mgmt_rx_reo_subtract_pkt_ctrs( + fw_consumed_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr) - 1; + + BUG_ON(!(frames_pending >= 0)); + + /** + * Last frame forwarded to Host has timestamp + * less than incoming frame's. That means all + * the frames starting from + * fw_forwarded_ss->mgmt_pkt_ctr+1 to + * fw_consumed_ss->mgmt_pkt_ctr are consumed by + * the FW and hence, no need to wait for those + * frames. We just need to wait for frames + * from host_ss->mgmt_pkt_ctr to + * fw_forwarded_ss->mgmt_pkt_ctr. This is a + * better estimate over the above estimate, + * so update frames_pending. + */ + if (fw_forwarded_ss->valid && + !ath12k_mgmt_rx_reo_compare_global_timestamps_gte( + fw_forwarded_ss->global_timestamp, + in_frame_params->global_timestamp)) { + frames_pending = + ath12k_mgmt_rx_reo_subtract_pkt_ctrs( + fw_forwarded_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr); + + /** + * frames_pending can be negative in + * cases whene there are no frames + * getting forwarded to the Host. No + * need to wait for any frames in that + * case. + */ + if (frames_pending < 0) + frames_pending = 0; + } + } + + /** + * Last frame forwarded to Host has timestamp greater + * than or equal to incoming frame's. That means all the + * frames from fw_forwarded->mgmt_pkt_ctr to + * mac_hw->mgmt_pkt_ctr will have timestamp greater than + * or equal to incoming frame's and hence, no need to + * wait for those frames. We may have to just wait for + * frames from host_ss->mgmt_pkt_ctr to + * fw_forwarded_ss->mgmt_pkt_ctr-1 + */ + if (fw_forwarded_ss->valid && + ath12k_mgmt_rx_reo_compare_global_timestamps_gte( + fw_forwarded_ss->global_timestamp, + in_frame_params->global_timestamp)) { + delta_fwd_host = + ath12k_mgmt_rx_reo_subtract_pkt_ctrs( + fw_forwarded_ss->mgmt_pkt_ctr, + host_ss->mgmt_pkt_ctr) - 1; + + BUG_ON(!(delta_fwd_host >= 0)); + + /** + * This will be a better estimate over the one + * we computed using mac_hw_ss but this may or + * may not be a better estimate over the + * one we computed using fw_consumed_ss. + * When timestamps of both fw_consumed_ss and + * fw_forwarded_ss are greater than incoming + * frame's but timestamp of fw_consumed_ss is + * smaller than fw_forwarded_ss, then + * frames_pending will be smaller than + * delta_fwd_host, the reverse will be true in + * other cases. Instead of checking for all + * those cases, just waiting for the minimum + * among these two should be sufficient. + */ + frames_pending = min(frames_pending, + delta_fwd_host); + BUG_ON(!(frames_pending >= 0)); + } + } + +update_pending_frames: + BUG_ON(!(frames_pending >= 0)); + + wait_count->per_link_count[hw_link_id] = frames_pending; + wait_count->total_count += frames_pending; + +print_wait_count: + ath12k_dbg(ab, ATH12K_DBG_RX_REO, + "hw_link_id = %u wait count: per link = 0x%x, total = 0x%llx", + hw_link_id, wait_count->per_link_count[hw_link_id], + wait_count->total_count); + } + return 0; +} + +/** + * mgmt_rx_reo_prepare_list_entry() - Prepare a list entry from the management + * frame received. + * @frame_desc: Pointer to the frame descriptor + * @entry: Pointer to the list entry + * + * This API prepares the reorder list entry corresponding to a management frame + * to be consumed by host. This entry would be inserted at the appropriate + * position in the reorder list. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_prepare_list_entry(struct ath12k_base *ab, + const struct ath12k_mgmt_rx_reo_frame_descriptor *frame_desc, + struct mgmt_rx_reo_list_entry **entry) +{ + struct mgmt_rx_reo_list_entry *list_entry; + struct ath12k_mgmt_rx_reo_params *reo_params = + &frame_desc->rx_params->reo_params; + struct ath12k *ar; + u8 link_id; + + link_id = reo_params->link_id; + + if (link_id >= ATH12K_GROUP_MAX_RADIO) { + ath12k_warn(ab, "%s:invalid hw link id %d\n", __func__, link_id); + return -EINVAL; + } + + ar = rcu_dereference(ab->ag->hw_links[link_id]); + if (!ar) { + ath12k_err(ab, "ar corresponding to link %u is null\n", + link_id); + return -EINVAL; + } + + list_entry = kmalloc(sizeof(*list_entry), GFP_ATOMIC); + if (!list_entry) + return -ENOMEM; + + list_entry->ar = ar; + list_entry->nbuf = frame_desc->nbuf; + list_entry->rx_params = frame_desc->rx_params; + list_entry->wait_count = frame_desc->wait_count; + list_entry->initial_wait_count = frame_desc->wait_count; + memcpy(list_entry->shared_snapshots, frame_desc->shared_snapshots, + min(sizeof(list_entry->shared_snapshots), + sizeof(frame_desc->shared_snapshots))); + memcpy(list_entry->host_snapshot, frame_desc->host_snapshot, + min(sizeof(list_entry->host_snapshot), + sizeof(frame_desc->host_snapshot))); + list_entry->status = 0; + if (list_entry->wait_count.total_count) + list_entry->status |= + ATH12K_MGMT_RX_REO_STATUS_WAIT_FOR_FRAME_ON_OTHER_LINKS; + + *entry = list_entry; + + return 0; +} + +/** + * ath12k_mgmt_rx_reo_is_stale_frame()- API to check whether the given management frame + * is stale + * @ts_last_released_frame: pointer to global time stamp of the last frame + * removed from the reorder list + * @frame_desc: pointer to frame descriptor + * + * This API checks whether the current management frame under processing is + * stale. Any frame older than the last frame delivered to upper layer is a + * stale frame. This could happen when we have to deliver frames out of order + * due to time out or list size limit. The frames which arrive late at host and + * with time stamp lesser than the last delivered frame are stale frames and + * they need to be handled differently. + * + * Return: 0 on success, non-zero on failure. On success "is_stale" and + * "is_parallel_rx" members of + * @frame_desc will be filled with proper values. + */ +static int +ath12k_mgmt_rx_reo_is_stale_frame(struct ath12k_base *ab, + struct ath12k_mgmt_rx_reo_global_ts_info *ts_last_released_frame, + struct ath12k_mgmt_rx_reo_frame_descriptor *frame_desc) +{ + struct ath12k_mgmt_rx_reo_params *reo_params + = &frame_desc->rx_params->reo_params; + u32 cur_frame_start_ts; + u32 cur_frame_end_ts; + + if (!ts_last_released_frame) { + ath12k_err(ab, "Last released frame time stamp info is null\n"); + return -EINVAL; + } + + if (!frame_desc) { + ath12k_err(ab, "Frame descriptor is null\n"); + return -EINVAL; + } + + frame_desc->is_stale = false; + frame_desc->is_parallel_rx = false; + + if (!ts_last_released_frame->valid) + return 0; + + cur_frame_start_ts = reo_params->start_timestamp; + cur_frame_end_ts = reo_params->end_timestamp; + + frame_desc->is_stale = + !ath12k_mgmt_rx_reo_compare_global_timestamps_gte(cur_frame_start_ts, + ts_last_released_frame->start_ts); + + if (ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (ts_last_released_frame->start_ts, cur_frame_start_ts) && + ath12k_mgmt_rx_reo_compare_global_timestamps_gte + (cur_frame_end_ts, ts_last_released_frame->end_ts)) { + frame_desc->is_parallel_rx = true; + frame_desc->is_stale = false; + } + + return 0; +} + +/** + * ath12k_mgmt_rx_reo_update_wait_count() - Update the wait count for a frame based + * on the wait count of a frame received after that on air. + * @wait_count_old_frame: Pointer to the wait count structure for the old frame. + * @wait_count_new_frame: Pointer to the wait count structure for the new frame. + * + * This API optimizes the wait count of a frame based on the wait count of + * a frame received after that on air. Old frame refers to the frame received + * first on the air and new frame refers to the frame received after that. + * We use the following fundamental idea. Wait counts for old frames can't be + * more than wait counts for the new frame. Use this to optimize the wait count + * for the old frames. Per link wait count of an old frame is minimum of the + * per link wait count of the old frame and new frame. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_update_wait_count( + struct ath12k_mgmt_rx_reo_wait_count *wait_count_old_frame, + const struct ath12k_mgmt_rx_reo_wait_count *wait_count_new_frame) +{ + u8 link_id; + + for (link_id = 0; link_id < ATH12K_WMI_MLO_MAX_LINKS; link_id++) { + if (wait_count_old_frame->per_link_count[link_id]) { + u32 temp_wait_count; + u32 wait_count_diff; + + temp_wait_count = + wait_count_old_frame->per_link_count[link_id]; + wait_count_old_frame->per_link_count[link_id] = + min(wait_count_old_frame-> + per_link_count[link_id], + wait_count_new_frame-> + per_link_count[link_id]); + wait_count_diff = temp_wait_count - + wait_count_old_frame->per_link_count[link_id]; + + wait_count_old_frame->total_count -= wait_count_diff; + } + } + + return 0; +} + +/** + * ath12k_mgmt_rx_reo_update_list() - Modify the reorder list when a frame is received + * @reo_list: Pointer to reorder list + * @frame_desc: Pointer to frame descriptor + * @is_queued: Whether this frame is queued in the REO list + * + * API to update the reorder list on every management frame reception. + * This API does the following things. + * a) Update the wait counts for all the frames in the reorder list with + * global time stamp <= current frame's global time stamp. We use the + * following principle for updating the wait count in this case. + * Let A and B be two management frames with global time stamp of A <= + * global time stamp of B. Let WAi and WBi be the wait count of A and B + * for link i, then WAi <= WBi. Hence we can optimize WAi as + * min(WAi, WBi). + * b) If the current frame is to be consumed by host, insert it in the + * reorder list such that the list is always sorted in the increasing order + * of global time stamp. Update the wait count of the current frame based + * on the frame next to it in the reorder list (if any). + * c) Update the wait count of the frames in the reorder list with global + * time stamp > current frame's global time stamp. Let the current frame + * belong to link "l". Then link "l"'s wait count can be reduced by one for + * all the frames in the reorder list with global time stamp > current + * frame's global time stamp. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_update_list( + struct ath12k_base *ab, + struct mgmt_rx_reo_list *reo_list, + struct ath12k_mgmt_rx_reo_frame_descriptor *frame_desc, + bool *is_queued) +{ + struct mgmt_rx_reo_list_entry *cur_entry; + struct mgmt_rx_reo_list_entry *least_greater_entry = NULL; + bool least_greater_entry_found = false; + int status; + u32 new_frame_global_ts; + struct mgmt_rx_reo_list_entry *new_entry = NULL; + u16 list_insertion_pos = 0; + struct ath12k_mgmt_rx_reo_params *reo_params; + + if (!is_queued) + return -EINVAL; + + *is_queued = false; + + if (!reo_list) { + ath12k_err(ab, "Mgmt Rx reo list is null\n"); + return -EINVAL; + } + + if (!frame_desc) { + ath12k_err(ab, "Mgmt frame descriptor is null\n"); + return -EINVAL; + } + + if (frame_desc->rx_params) { + reo_params = &frame_desc->rx_params->reo_params; + new_frame_global_ts = reo_params->global_timestamp; + } else { + ath12k_err(ab, "null rx_param %p\n", frame_desc->rx_params); + return -EINVAL; + } + + /* Prepare the list entry before acquiring lock */ + if (frame_desc->type == ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME && + frame_desc->reo_required) { + status = ath12k_mgmt_rx_reo_prepare_list_entry(ab, frame_desc, &new_entry); + if (status) { + ath12k_err(ab, "Failed to prepare list entry %d\n", status); + return -EINVAL; + } + } + + spin_lock_bh(&reo_list->list_lock); + + frame_desc->list_size_rx = reo_list->count; + + status = ath12k_mgmt_rx_reo_is_stale_frame(ab, &reo_list->ts_last_released_frame, + frame_desc); + if (status) + goto exit_free_entry; + + list_for_each_entry(cur_entry, &reo_list->list, node) { + u32 cur_entry_global_ts; + struct ath12k_mgmt_rx_reo_params *cur_reo_params = + &cur_entry->rx_params->reo_params; + + cur_entry_global_ts = cur_reo_params->global_timestamp; + + if (!ath12k_mgmt_rx_reo_compare_global_timestamps_gte( + new_frame_global_ts, cur_entry_global_ts)) { + least_greater_entry = cur_entry; + least_greater_entry_found = true; + break; + } + + /* if it is stale entry at this point and gts seems to be valid + * then the reordering didn't properly happened please check the + * reordering + */ + BUG_ON(!(!frame_desc->is_stale || cur_entry->is_parallel_rx)); + + list_insertion_pos++; + + status = ath12k_mgmt_rx_reo_update_wait_count( + &cur_entry->wait_count, + &frame_desc->wait_count); + if (status) + goto exit_free_entry; + + if (cur_entry->wait_count.total_count == 0) + cur_entry->status &= + ~ATH12K_MGMT_RX_REO_STATUS_WAIT_FOR_FRAME_ON_OTHER_LINKS; + } + + if (frame_desc->type == ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME && + !frame_desc->is_stale && frame_desc->reo_required) { + if (least_greater_entry_found) { + status = ath12k_mgmt_rx_reo_update_wait_count( + &new_entry->wait_count, + &least_greater_entry->wait_count); + + if (status) + goto exit_free_entry; + + frame_desc->wait_count = new_entry->wait_count; + + if (new_entry->wait_count.total_count == 0) + new_entry->status &= + ~ATH12K_MGMT_RX_REO_STATUS_WAIT_FOR_FRAME_ON_OTHER_LINKS; + } + + new_entry->insertion_ts = ktime_to_us(ktime_get()); + new_entry->ingress_timestamp = frame_desc->ingress_timestamp; + new_entry->is_parallel_rx = frame_desc->is_parallel_rx; + frame_desc->list_insertion_pos = list_insertion_pos; + + if (least_greater_entry_found) + list_add_tail(&new_entry->node, &least_greater_entry->node); + else + list_add_tail(&new_entry->node, &reo_list->list); + + reo_list->count++; + + *is_queued = true; + + if (new_entry->wait_count.total_count == 0) + frame_desc->zero_wait_count_rx = true; + + if (frame_desc->zero_wait_count_rx && + list_first_entry_or_null(&reo_list->list, + struct mgmt_rx_reo_list_entry, + node) == new_entry) + frame_desc->immediate_delivery = true; + } + + if (least_greater_entry_found) { + cur_entry = least_greater_entry; + + list_for_each_entry_from(cur_entry, &reo_list->list, node) { + u8 frame_link_id; + struct ath12k_mgmt_rx_reo_wait_count *wait_count; + + frame_link_id = reo_params->link_id; + wait_count = &cur_entry->wait_count; + if (wait_count->per_link_count[frame_link_id]) { + u32 old_wait_count; + u32 new_wait_count; + u32 wait_count_diff; + u16 pkt_ctr_delta; + + pkt_ctr_delta = frame_desc->pkt_ctr_delta; + old_wait_count = + wait_count->per_link_count[frame_link_id]; + + if (old_wait_count >= pkt_ctr_delta) + new_wait_count = old_wait_count - + pkt_ctr_delta; + else + new_wait_count = 0; + + wait_count_diff = old_wait_count - + new_wait_count; + + wait_count->per_link_count[frame_link_id] = + new_wait_count; + wait_count->total_count -= wait_count_diff; + + if (wait_count->total_count == 0) + cur_entry->status &= + ~ATH12K_MGMT_RX_REO_STATUS_WAIT_FOR_FRAME_ON_OTHER_LINKS; + } + } + } + + status = 0; + +exit_free_entry: + /* Cleanup the entry if it is not queued */ + if (new_entry && !*is_queued) { + /** + * New entry created is not inserted to reorder list, free + * the entry and release the reference + */ + kfree(new_entry); + } + + spin_unlock_bh(&reo_list->list_lock); + + return status; +} + +/** + * ath12k_mgmt_rx_reo_list_is_ready_to_send_up_entry() - API to check whether the + * list entry can be send to upper layers. + * @reo_list: Pointer to reorder list + * @entry: List entry + * + * Return: 0 on success, non-zero on failure + */ +static bool +ath12k_mgmt_rx_reo_list_is_ready_to_send_up_entry(struct mgmt_rx_reo_list *reo_list, + struct mgmt_rx_reo_list_entry *entry) +{ + if (!reo_list || !entry) + return false; + + return (reo_list->count > reo_list->max_list_size) || + !ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_WAITING_FOR_FRAME_ON_OTHER_LINK( + entry) || ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_AGED_OUT(entry) || + ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_OLDER_THAN_LATEST_AGED_OUT_FRAME + (entry); +} + +/** + * ath12k_mgmt_rx_reo_list_entry_get_release_reason() - Helper API to get the reason + * for releasing the reorder list entry to upper layer. + * reorder list. + * @entry: List entry + * + * This API expects the caller to acquire the spin lock protecting the reorder + * list. + * + * Return: Reason for releasing the frame. + */ +static u8 +ath12k_mgmt_rx_reo_list_entry_get_release_reason(struct mgmt_rx_reo_list_entry *entry) +{ + u8 release_reason = 0; + + if (!entry) + return 0; + + if (ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_MAX_SIZE_EXCEEDED(entry)) + release_reason |= + MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_LIST_MAX_SIZE_EXCEEDED; + + if (!ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_WAITING_FOR_FRAME_ON_OTHER_LINK(entry)) + release_reason |= + MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_ZERO_WAIT_COUNT; + + if (ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_AGED_OUT(entry)) + release_reason |= + MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_AGED_OUT; + + if (ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_OLDER_THAN_LATEST_AGED_OUT_FRAME(entry)) + release_reason |= + MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_OLDER_THAN_AGED_OUT_FRAME; + + return release_reason; +} + +/** + * mgmt_rx_reo_is_potential_premature_delivery() - Helper API to check + * whether the current frame getting delivered to upper layer is a premature + * delivery + * @release_reason: release reason + * + * Return: true for a premature delivery + */ +static bool +ath12k_mgmt_rx_reo_is_potential_premature_delivery(u8 release_reason) +{ + return !(release_reason & + MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_ZERO_WAIT_COUNT); +} + +/** + * ath12k_mgmt_rx_reo_list_entry_send_up() - API to send the frame to the upper layer. + * @reo_list: Pointer to reorder list + * @entry: List entry + * + * API to send the frame to the upper layer. This API has to be called only + * for entries which can be released to upper layer. It is the caller's + * responsibility to ensure that entry can be released (by using API + * mgmt_rx_reo_list_is_ready_to_send_up_entry). This API is called after + * acquiring the lock which serializes the frame delivery to the upper layers. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_list_entry_send_up(struct mgmt_rx_reo_list *reo_list, + struct mgmt_rx_reo_list_entry *entry) +{ + struct ath12k *ar = entry->ar; + u8 release_reason; + u8 link_id; + u32 entry_global_ts; + int status; + struct ath12k_mgmt_rx_reo_context *reo_context; + struct ath12k_mgmt_rx_reo_params *reo_params = + &entry->rx_params->reo_params; + + if (unlikely(!rcu_access_pointer(ar->ab->pdevs_active[ar->pdev_idx]))) { + dev_kfree_skb(entry->nbuf); + goto free; + } + + reo_context = container_of(reo_list, struct ath12k_mgmt_rx_reo_context, + reo_list); + + link_id = reo_params->link_id; + entry_global_ts = reo_params->global_timestamp; + + release_reason = ath12k_mgmt_rx_reo_list_entry_get_release_reason(entry); + + //TODO remove BUG_ON once the implementation is stablized + BUG_ON(!release_reason != 0); + + entry->is_delivered = false; + entry->is_premature_delivery = false; + entry->release_reason = release_reason; + + if (ath12k_mgmt_rx_reo_is_potential_premature_delivery(release_reason)) + entry->is_premature_delivery = true; + + ath12k_dbg(ar->ab, ATH12K_DBG_RX_REO, + "Mgmt Re-order egress: channel %d valid %u global_ts %u pkt_ctr %u is_parallel_rx %d\n", + entry->rx_params->channel, + entry->rx_params->reo_params.valid, + entry->rx_params->reo_params.global_timestamp, + entry->rx_params->reo_params.mgmt_pkt_ctr, + entry->is_parallel_rx); + + ieee80211_rx_ni(entry->ar->ah->hw, entry->nbuf); + /* believing rx stack takes care of skb */ + entry->is_delivered = true; + +free: + kfree(entry->rx_params); + /*Above ieee80211_rx_ni call frees nbuf and rx_params, make it null explicitly */ + entry->nbuf = NULL; + entry->rx_params = NULL; + status = 0; + + return status; +} + +/** + * ath12k_mgmt_rx_reo_list_release_entries() - Release entries from the reorder list + * @reo_context: Pointer to management Rx reorder context + * + * This API releases the entries from the reorder list based on the following + * conditions. + * a) Entries with total wait count equal to 0 + * b) Entries which are timed out or entries with global time stamp <= global + * time stamp of the latest frame which is timed out. We can only release + * the entries in the increasing order of the global time stamp. + * So all the entries with global time stamp <= global time stamp of the + * latest timed out frame has to be released. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_list_release_entries(struct ath12k_base *ab, + struct ath12k_mgmt_rx_reo_context *reo_context) +{ + struct mgmt_rx_reo_list *reo_list; + struct ath12k_mgmt_rx_reo_params *reo_params; + int status; + + if (!reo_context) { + ath12k_err(ab, "reo context is null\n"); + return -EINVAL; + } + + reo_list = &reo_context->reo_list; + + spin_lock(&reo_context->frame_release_lock); + + while (1) { + struct mgmt_rx_reo_list_entry *first_entry; + /* TODO yield if release_count > THRESHOLD */ + u16 release_count = 0; + struct ath12k_mgmt_rx_reo_global_ts_info *ts_last_released_frame = + &reo_list->ts_last_released_frame; + u32 entry_global_ts; + + spin_lock_bh(&reo_list->list_lock); + + first_entry = list_first_entry_or_null( + &reo_list->list, struct mgmt_rx_reo_list_entry, node); + + if (!first_entry) { + status = 0; + goto exit_unlock_list_lock; + } + + if (!ath12k_mgmt_rx_reo_list_is_ready_to_send_up_entry(reo_list, + first_entry)) { + status = 0; + goto exit_unlock_list_lock; + } + + if (reo_list->count > reo_list->max_list_size) + first_entry->status |= + ATH12K_MGMT_RX_REO_STATUS_LIST_MAX_SIZE_EXCEEDED; + + list_del_init(&first_entry->node); + reo_list->count--; + + if (status) { + status = -EINVAL; + goto exit_unlock_list_lock; + } + first_entry->removal_ts = ktime_to_us(ktime_get()); + + /** + * Last released frame global time stamp is invalid means that + * current frame is the first frame to be released to the + * upper layer from the reorder list. Blindly update the last + * released frame global time stamp to the current frame's + * global time stamp and set the valid to true. + * If the last released frame global time stamp is valid and + * current frame's global time stamp is >= last released frame + * global time stamp, deliver the current frame to upper layer + * and update the last released frame global time stamp. + */ + reo_params = &first_entry->rx_params->reo_params; + entry_global_ts = reo_params->global_timestamp; + + if (!ts_last_released_frame->valid || + ath12k_mgmt_rx_reo_compare_global_timestamps_gte( + entry_global_ts, ts_last_released_frame->global_ts)) { + ts_last_released_frame->global_ts = entry_global_ts; + ts_last_released_frame->start_ts = + reo_params->start_timestamp; + ts_last_released_frame->end_ts = + reo_params->end_timestamp; + ts_last_released_frame->valid = true; + ts_last_released_frame->expiry_time = jiffies + ATH12K_MGMT_RX_REO_GLOBAL_MGMT_RX_INACTIVITY_TIMEOUT; + + } else { + /** + * This should never happen. All the frames older than + * the last frame released from the reorder list will be + * discarded at the entry to reorder process itself. + */ + BUG_ON(!first_entry->is_parallel_rx); + } + + spin_unlock_bh(&reo_list->list_lock); + + status = ath12k_mgmt_rx_reo_list_entry_send_up(reo_list, + first_entry); + if (status) { + status = -EINVAL; + kfree(first_entry); + goto exit_unlock_frame_release_lock; + } + + kfree(first_entry); + release_count++; + } + + status = 0; + goto exit_unlock_frame_release_lock; + +exit_unlock_list_lock: + spin_unlock_bh(&reo_list->list_lock); +exit_unlock_frame_release_lock: + spin_unlock(&reo_context->frame_release_lock); + + return status; +} + +static int +ath12k_wmi_mgmt_rx_reorder_process_entry(struct ath12k *ar, + struct ath12k_mgmt_rx_reo_frame_descriptor *desc, + bool *is_queued) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_mgmt_rx_reo_context *reo_ctx; + int ret; + + if (!is_queued) + return -EINVAL; + + *is_queued = false; + + if (!desc || !desc->rx_params) { + ath12k_err(ab, "MGMT Rx REO descriptor or rx params are null\n"); + return -EINVAL; + } + + reo_ctx = &ab->ag->rx_reo; + if (!reo_ctx) { + ath12k_err(ab, "REO context is NULL\n"); + return -EINVAL; + } + + if (!reo_ctx->init_done || !reo_ctx->timer_init_done) { + ath12k_err(ab, "MGMT Rx REO timer is not initialised\n"); + return -EINVAL; + } + /** + * Critical Section = Host snapshot update + Calculation of wait + * counts + Update reorder list. Following section describes the + * motivation for making this a critical section. + * Lets take an example of 2 links (Link A & B) and each has received + * a management frame A1 and B1 such that MLO global time stamp of A1 < + * MLO global time stamp of B1. Host is concurrently executing + * "ath12k_wmi_mgmt_rx_reorder_process_entry" for A1 and B1 in 2 different CPUs. + * + * A lock less version of this API("ath12k_wmi_mgmt_rx_reorder_process_entry_v1") is + * as follows. + * + * ath12k_wmi_mgmt_rx_reorder_process_entry() + * { + * Host snapshot update + * Calculation of wait counts + * Update reorder list + * Release to upper layer + * } + * + * We may run into race conditions under the following sequence of + * operations. + * + * 1. Host snapshot update for link A in context of frame A1 + * 2. Host snapshot update for link B in context of frame B1 + * 3. Calculation of wait count for frame B1 + * link A wait count = 0 + * link B wait count = 0 + * 4. Update reorder list with frame B1 + * 5. Release B1 to upper layer + * 6. Calculation of wait count for frame A1 + * link A wait count = 0 + * link B wait count = 0 + * 7. Update reorder list with frame A1 + * 8. Release A1 to upper layer + * + * This leads to incorrect behaviour as B1 goes to upper layer before + * A1. + * + * To prevent this lets make Host snapshot update + Calculate wait count + * a critical section by adding locks. The updated version of the API + * ("ath12k_wmi_mgmt_rx_reorder_process_entry_v2") is as follows. + * + * ath12k_wmi_mgmt_rx_reorder_process_entry() + * { + * LOCK + * Host snapshot update + * Calculation of wait counts + * UNLOCK + * Update reorder list + * Release to upper layer + * } + * + * With this API also We may run into race conditions under the + * following sequence of operations. + * + * 1. Host snapshot update for link A in context of frame A1 + + * Calculation of wait count for frame A1 + * link A wait count = 0 + * link B wait count = 0 + * 2. Host snapshot update for link B in context of frame B1 + + * Calculation of wait count for frame B1 + * link A wait count = 0 + * link B wait count = 0 + * 4. Update reorder list with frame B1 + * 5. Release B1 to upper layer + * 7. Update reorder list with frame A1 + * 8. Release A1 to upper layer + * + * This also leads to incorrect behaviour as B1 goes to upper layer + * before A1. + * + * + * To prevent this, let's make Host snapshot update + Calculate wait + * count + Update reorder list a critical section by adding locks. + * The updated version of the API ("ath12k_wmi_mgmt_rx_reorder_process_entry_final") + * is as follows. + * + * ath12k_wmi_mgmt_rx_reorder_process_entry() + * { + * LOCK + * Host snapshot update + * Calculation of wait counts + * Update reorder list + * UNLOCK + * Release to upper layer + * } + */ + spin_lock_bh(&reo_ctx->rx_reorder_entry_lock); + + if (unlikely(!desc->rx_params->reo_params.valid)) { + ath12k_warn(ab, "Valid bit is not set for mgmt frame\n"); + goto failure; + } + + if ((desc->type == ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME || + desc->type == ATH12K_MGMT_RX_REO_FRAME_DESC_FW_CONSUMED_FRAME) && + !desc->rx_params->reo_params.duration_us) { + ath12k_warn(ab, "Rx reo duration of the frame is not valid %d\n", + desc->rx_params->reo_params.duration_us); + goto failure; + } + + /* Update the Host snapshot */ + ret = ath12k_wlan_mgmt_rx_reo_update_host_snapshot(ar, desc); + if (ret) + goto failure; + + /* Compute wait count for this frame/event */ + ret = ath12k_wmi_mgmt_rx_reorder_process_calculate_wait_count(ar, desc); + if (ret) + goto failure; + + /* Update the REO list */ + ret = ath12k_mgmt_rx_reo_update_list(ab, &reo_ctx->reo_list, desc, is_queued); + if (ret) + goto failure; + + spin_unlock_bh(&reo_ctx->rx_reorder_entry_lock); + /* Finally, release the entries for which pending frame is received */ + return ath12k_mgmt_rx_reo_list_release_entries(ab, reo_ctx); + +failure: + spin_unlock_bh(&reo_ctx->rx_reorder_entry_lock); + return ret; +} + +/** + * ath12k_mgmt_rx_reo_list_ageout_timer_handler() - Periodic ageout timer handler + * @arg: Argument to timer handler + * + * This is the handler for periodic ageout timer used to timeout entries in the + * reorder list. + * + * Return: void + */ +static void +ath12k_mgmt_rx_reo_list_ageout_timer_handler(struct timer_list *timer) + +{ + struct mgmt_rx_reo_list *reo_list = from_timer(reo_list, timer, ageout_timer); + struct ath12k_base *ab = reo_list->ab; + struct mgmt_rx_reo_list_entry *cur_entry; + u64 cur_ts; + int status; + struct ath12k_mgmt_rx_reo_context *reo_context = &ab->ag->rx_reo; + /** + * Stores the pointer to the entry in reorder list for the latest aged + * out frame. Latest aged out frame is the aged out frame in reorder + * list which has the largest global time stamp value. + */ + struct mgmt_rx_reo_list_entry *latest_aged_out_entry = NULL; + + spin_lock_bh(&reo_list->list_lock); + + cur_ts = ktime_to_us(ktime_get()); + + if (list_empty(&reo_list->list)) + goto out; + + list_for_each_entry(cur_entry, &reo_list->list, node) { + if (cur_ts - cur_entry->insertion_ts >= + reo_list->list_entry_timeout_us) { + latest_aged_out_entry = cur_entry; + cur_entry->status |= ATH12K_MGMT_RX_REO_STATUS_AGED_OUT; + } + } + + if (latest_aged_out_entry) { + list_for_each_entry(cur_entry, &reo_list->list, node) { + if (cur_entry == latest_aged_out_entry) + break; + cur_entry->status |= ATH12K_MGMT_RX_REO_STATUS_OLDER_THAN_LATEST_AGED_OUT_FRAME; + } + } + + +out: + spin_unlock_bh(&reo_list->list_lock); + + if (latest_aged_out_entry) { + status = ath12k_mgmt_rx_reo_list_release_entries(ab, reo_context); + if (status) { + ath12k_err(ab, "Failed to release entries, ret = %d\n", + status); + return; + } + } + + mod_timer(&reo_list->ageout_timer, jiffies + + msecs_to_jiffies(ATH12K_MGMT_RX_REO_AGEOUT_TIMER_PERIOD_MS)); +} + +/** + * ath12k_mgmt_rx_reo_global_mgmt_rx_inactivity_timer_handler() - Timer handler + * for global management Rx inactivity timer + * @arg: Argument to timer handler + * + * This is the timer handler for tracking management Rx inactivity across + * links. + * + * Return: void + */ +static void +ath12k_mgmt_rx_reo_global_mgmt_rx_inactivity_timer_handler(struct timer_list *timer) + +{ + struct mgmt_rx_reo_list *reo_list = from_timer(reo_list, timer, global_mgmt_rx_inactivity_timer); + struct ath12k_base *ab = reo_list->ab; + struct ath12k_mgmt_rx_reo_context *reo_context = &ab->ag->rx_reo; + struct ath12k_mgmt_rx_reo_global_ts_info *ts_last_released_frame; + + ts_last_released_frame = &reo_list->ts_last_released_frame; + + spin_lock(&reo_context->frame_release_lock); + spin_lock_bh(&reo_list->list_lock); + + if (time_after(jiffies, ts_last_released_frame->expiry_time)) + memset(ts_last_released_frame, 0, sizeof(*ts_last_released_frame)); + + spin_unlock_bh(&reo_list->list_lock); + spin_unlock(&reo_context->frame_release_lock); + + mod_timer(&reo_list->global_mgmt_rx_inactivity_timer, jiffies + + ATH12K_MGMT_RX_REO_GLOBAL_MGMT_RX_INACTIVITY_TIMEOUT); +} + +/** + * mgmt_rx_reo_list_init() - Initialize the management rx-reorder list + * @reo_list: Pointer to reorder list + * + * API to initialize the management rx-reorder list. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_list_init(struct ath12k_base *ab, struct mgmt_rx_reo_list *reo_list) +{ + reo_list->max_list_size = ATH12K_MGMT_RX_REO_LIST_MAX_SIZE; + reo_list->list_entry_timeout_us = ATH12K_MGMT_RX_REO_LIST_TIMEOUT_US; + reo_list->count = 0; + reo_list->ab = ab; + INIT_LIST_HEAD(&reo_list->list); + spin_lock_init(&reo_list->list_lock); + + timer_setup(&reo_list->ageout_timer, + ath12k_mgmt_rx_reo_list_ageout_timer_handler, 0); + + reo_list->ts_last_released_frame.valid = false; + + timer_setup(&reo_list->global_mgmt_rx_inactivity_timer, + ath12k_mgmt_rx_reo_global_mgmt_rx_inactivity_timer_handler, 0); + + return 0; +} + +/** + * ath12k_mgmt_rx_reo_flush_reorder_list() - Flush all entries in the reorder list + * @reo_list: Pointer to reorder list + * + * API to flush all the entries of the reorder list. This API would acquire + * the lock protecting the list. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_flush_reorder_list(struct ath12k_base *ab, struct mgmt_rx_reo_list *reo_list) +{ + struct mgmt_rx_reo_list_entry *cur_entry, *temp; + + if (!reo_list) { + ath12k_err(ab, "reorder list is null\n"); + return -EINVAL; + } + + spin_lock_bh(&reo_list->list_lock); + + list_for_each_entry_safe(cur_entry, temp, &reo_list->list, node) { + list_del(&cur_entry->node); + dev_kfree_skb(cur_entry->nbuf); + kfree(cur_entry->rx_params); + kfree(cur_entry); + } + + spin_unlock_bh(&reo_list->list_lock); + + return 0; +} + +/** + * mgmt_rx_reo_list_deinit() - De initialize the management rx-reorder list + * @reo_list: Pointer to reorder list + * + * API to de initialize the management rx-reorder list. + * + * Return: 0 on success, non-zero on failure + */ +static int +ath12k_mgmt_rx_reo_list_deinit(struct ath12k_base *ab, struct mgmt_rx_reo_list *reo_list) +{ + int status; + + status = ath12k_mgmt_rx_reo_flush_reorder_list(ab, reo_list); + if (status) { + ath12k_err(ab, "Failed to flush the reorder list\n"); + return status; + } + + return 0; +} + + +int ath12k_mgmt_rx_reo_init_context(struct ath12k_base *ab) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_mgmt_rx_reo_context *reo_context = &ag->rx_reo; + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + return 0; + + if (reo_context->init_done) + return 0; + + spin_lock_init(&reo_context->rx_reorder_entry_lock); + spin_lock_init(&reo_context->frame_release_lock); + + ath12k_mgmt_rx_reo_list_init(ab, &reo_context->reo_list); + + reo_context->init_done = true; + + return 0; +} + +int +ath12k_mgmt_rx_reo_deinit_context(struct ath12k_base *ab) +{ + int status; + struct ath12k_mgmt_rx_reo_context *reo_context = &ab->ag->rx_reo; + struct ath12k_hw_group *ag = ab->ag; + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + return 0; + + if (!reo_context->init_done) + return 0; + + status = ath12k_mgmt_rx_reo_list_deinit(ab, &reo_context->reo_list); + if (status) { + ath12k_err(ab, "Failed to de-initialize mgmt Rx reo list\n"); + return status; + } + + reo_context->init_done = false; + + return status; +} + +static void ath12k_fw_consumed_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_wmi_mgmt_rx_arg *rx_ev; + struct ath12k *ar; + struct ath12k_mgmt_rx_reo_frame_descriptor desc = {0}; + bool is_queued = false; + int ret; + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + return; + + rx_ev = kmalloc(sizeof(*rx_ev), GFP_ATOMIC); + if (!rx_ev) { + ath12k_err(ab, "failed to allocate rx event\n"); + return; + } + + if (ath12k_pull_fw_consumed_mgmt_rx_params_tlv(ab, skb, rx_ev) != 0) { + ath12k_warn(ab, "failed to extract mgmt rx event"); + kfree(rx_ev); + return; + } + + rcu_read_lock(); + ar = ath12k_mac_get_ar_by_pdev_id(ab, rx_ev->pdev_id); + + if (!ar) { + ath12k_warn(ab, "invalid pdev_id %d in mgmt_rx_event\n", + rx_ev->pdev_id); + goto exit; + } + + rx_ev->reo_params.link_id = rx_ev->pdev_id; + + /* Populate frame descriptor */ + desc.type = ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME; + desc.nbuf = NULL; /* No frame buffer */ + desc.rx_params = rx_ev; + desc.ingress_timestamp = ktime_to_us(ktime_get()); + desc.list_size_rx = -1; + desc.list_insertion_pos = -1; + + desc.frame_type = IEEE80211_FTYPE_MGMT; + desc.frame_subtype = 0xFF; + + desc.reo_required = false; + + ret = ath12k_wmi_mgmt_rx_reorder_process_entry(ar, &desc, &is_queued); + if (ret) { + ath12k_warn(ab, "Failed to execute MGMT REO reorder process\n"); + goto exit; + } + + if (is_queued) + WARN_ON(1); + +exit: + /* if the frame is queued dont free it here + * it will be taken care by the mgmt rx reorder + * process + */ + if (!is_queued) + kfree(rx_ev); + + rcu_read_unlock(); +} + static void ath12k_mgmt_rx_event(struct ath12k_base *ab, struct sk_buff *skb) { - struct ath12k_wmi_mgmt_rx_arg rx_ev = {0}; + struct ath12k_hw_group *ag = ab->ag; + struct ath12k_wmi_mgmt_rx_arg *rx_ev; struct ath12k *ar; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct ieee80211_hdr *hdr; u16 fc; struct ieee80211_supported_band *sband; + struct ath12k_peer *peer; + struct ieee80211_vif *vif; + struct ath12k_vif *ahvif; + struct ath12k_mgmt_frame_stats *mgmt_stats; + u16 frm_type = 0; + struct ath12k_mgmt_rx_reo_frame_descriptor desc = {0}; + bool is_queued = false; + int ret; - if (ath12k_pull_mgmt_rx_params_tlv(ab, skb, &rx_ev) != 0) { + rx_ev = kmalloc(sizeof(*rx_ev), GFP_ATOMIC); + if (!rx_ev) { + dev_kfree_skb(skb); + ath12k_err(ab, "failed to allocate rx event\n"); + return; + } + + + if (ath12k_pull_mgmt_rx_params_tlv(ab, skb, rx_ev) != 0) { ath12k_warn(ab, "failed to extract mgmt rx event"); dev_kfree_skb(skb); + kfree(rx_ev); return; } memset(status, 0, sizeof(*status)); ath12k_dbg(ab, ATH12K_DBG_MGMT, "mgmt rx event status %08x\n", - rx_ev.status); + rx_ev->status); rcu_read_lock(); - ar = ath12k_mac_get_ar_by_pdev_id(ab, rx_ev.pdev_id); + ar = ath12k_mac_get_ar_by_pdev_id(ab, rx_ev->pdev_id); if (!ar) { ath12k_warn(ab, "invalid pdev_id %d in mgmt_rx_event\n", - rx_ev.pdev_id); + rx_ev->pdev_id); dev_kfree_skb(skb); goto exit; } if ((test_bit(ATH12K_CAC_RUNNING, &ar->dev_flags)) || - (rx_ev.status & (WMI_RX_STATUS_ERR_DECRYPT | + (rx_ev->status & (WMI_RX_STATUS_ERR_DECRYPT | WMI_RX_STATUS_ERR_KEY_CACHE_MISS | WMI_RX_STATUS_ERR_CRC))) { dev_kfree_skb(skb); goto exit; } - if (rx_ev.status & WMI_RX_STATUS_ERR_MIC) + if (rx_ev->status & WMI_RX_STATUS_ERR_MIC) status->flag |= RX_FLAG_MMIC_ERROR; - if (rx_ev.chan_freq >= ATH12K_MIN_6G_FREQ) { + if (rx_ev->chan_freq >= ATH12K_MIN_6G_FREQ && + rx_ev->chan_freq <= ATH12K_MAX_6G_FREQ) { status->band = NL80211_BAND_6GHZ; - } else if (rx_ev.channel >= 1 && rx_ev.channel <= 14) { + status->freq = rx_ev->chan_freq; + } else if (rx_ev->channel >= 1 && rx_ev->channel <= 14) { status->band = NL80211_BAND_2GHZ; - } else if (rx_ev.channel >= 36 && rx_ev.channel <= ATH12K_MAX_5G_CHAN) { + } else if (rx_ev->channel >= 36 && rx_ev->channel <= ATH12K_MAX_5G_CHAN) { status->band = NL80211_BAND_5GHZ; } else { /* Shouldn't happen unless list of advertised channels to @@ -5516,20 +11772,50 @@ goto exit; } - if (rx_ev.phy_mode == MODE_11B && + if (rx_ev->phy_mode == MODE_11B && (status->band == NL80211_BAND_5GHZ || status->band == NL80211_BAND_6GHZ)) ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi mgmt rx 11b (CCK) on 5/6GHz, band = %d\n", status->band); sband = &ar->mac.sbands[status->band]; - status->freq = ieee80211_channel_to_frequency(rx_ev.channel, + if (status->band != NL80211_BAND_6GHZ) + status->freq = ieee80211_channel_to_frequency(rx_ev->channel, status->band); - status->signal = rx_ev.snr + ATH12K_DEFAULT_NOISE_FLOOR; - status->rate_idx = ath12k_mac_bitrate_to_idx(sband, rx_ev.rate / 100); + + status->signal = rx_ev->snr + ar->rssi_offsets.rssi_offset; + status->rate_idx = ath12k_mac_bitrate_to_idx(sband, rx_ev->rate / 100); hdr = (struct ieee80211_hdr *)skb->data; fc = le16_to_cpu(hdr->frame_control); + frm_type = FIELD_GET(IEEE80211_FCTL_STYPE, fc); + + spin_lock_bh(&ab->base_lock); + + peer = ath12k_peer_find_by_addr(ab, hdr->addr1); + if(!peer) + peer = ath12k_peer_find_by_addr(ab, hdr->addr3); + if (!peer) { + spin_unlock_bh(&ab->base_lock); + goto skip_mgmt_stats; + } + + vif = peer->vif; + + spin_unlock_bh(&ab->base_lock); + + if (!vif) + goto skip_mgmt_stats; + + spin_lock_bh(&ar->data_lock); + + ahvif = ath12k_vif_to_ahvif(vif); + mgmt_stats = &ahvif->mgmt_stats; + mgmt_stats->rx_cnt[frm_type]++; + + spin_unlock_bh(&ar->data_lock); + +skip_mgmt_stats: /* Firmware is guaranteed to report all essential management frames via * WMI while it can deliver some extra via HTT. Since there can be @@ -5551,11 +11837,46 @@ } } - /* TODO: Pending handle beacon implementation - *if (ieee80211_is_beacon(hdr->frame_control)) - * ath12k_mac_handle_beacon(ar, skb); + if (ieee80211_is_beacon(hdr->frame_control)) + ath12k_mac_handle_beacon(ar, skb); + + if (!(ag->mlo_mem.is_mlo_mem_avail && ag->mgmt_rx_reorder)) + goto pass_up; + + if (!rx_ev->reo_params.valid) { + ath12k_warn(ab, "Invalid MGMT rx REO param for link %u\n", + ar->pdev->hw_link_id); + goto pass_up; + } + + rx_ev->reo_params.link_id = ar->pdev->hw_link_id; + + /* Populate frame descriptor */ + desc.type = ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME; + desc.nbuf = skb; + desc.rx_params = rx_ev; + desc.ingress_timestamp = ktime_to_us(ktime_get()); + desc.list_size_rx = -1; + desc.list_insertion_pos = -1; + + desc.frame_type = FIELD_GET(IEEE80211_FCTL_FTYPE, fc); + desc.frame_subtype = frm_type; + + desc.reo_required = true; + ret = ath12k_wmi_mgmt_rx_reorder_process_entry(ar, &desc, &is_queued); + if (ret) { + ath12k_warn(ab, "Failed to execute MGMT REO reorder process\n"); + dev_kfree_skb(skb); + goto exit; + } + + /** + * If frame is queued, we shouldn't free up rx params */ + if (is_queued) + goto exit; +pass_up: ath12k_dbg(ab, ATH12K_DBG_MGMT, "event mgmt rx skb %pK len %d ftype %02x stype %02x\n", skb, skb->len, @@ -5566,9 +11887,16 @@ status->freq, status->band, status->signal, status->rate_idx); - ieee80211_rx_ni(ar->hw, skb); + ieee80211_rx_ni(ar->ah->hw, skb); exit: + /* if the frame is queued dont free it here + * it will be taken care by the mgmt rx reorder + * process + */ + if (!is_queued) + kfree(rx_ev); + rcu_read_unlock(); } @@ -5591,7 +11919,8 @@ } wmi_process_mgmt_tx_comp(ar, le32_to_cpu(tx_compl_param.desc_id), - le32_to_cpu(tx_compl_param.status)); + le32_to_cpu(tx_compl_param.status), + le32_to_cpu(tx_compl_param.ack_rssi)); ath12k_dbg(ab, ATH12K_DBG_MGMT, "mgmt tx compl ev pdev_id %d, desc_id %d, status %d", @@ -5602,8 +11931,42 @@ rcu_read_unlock(); } -static struct ath12k *ath12k_get_ar_on_scan_abort(struct ath12k_base *ab, - u32 vdev_id) +static void ath12k_offchan_tx_completion_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + struct wmi_offchan_data_tx_compl_event offchan_tx_cmpl_params = {0}; + u32 desc_id; + u32 pdev_id; + u32 status; + struct ath12k *ar; + + if (ath12k_pull_offchan_tx_compl_param_tlv(ab, skb, &offchan_tx_cmpl_params) != 0) { + ath12k_warn(ab, "failed to extract mgmt tx compl event"); + return; + } + status = __le32_to_cpu(offchan_tx_cmpl_params.status); + pdev_id = __le32_to_cpu(offchan_tx_cmpl_params.pdev_id); + desc_id = __le32_to_cpu(offchan_tx_cmpl_params.desc_id); + + rcu_read_lock(); + ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id); + if (!ar) { + ath12k_warn(ab, "invalid pdev id %d in offchan_tx_compl_event\n", + pdev_id); + goto exit; + } + + wmi_process_offchan_tx_comp(ar, desc_id, status); + + ath12k_dbg(ab, ATH12K_DBG_MGMT, + "off chan tx compl ev pdev_id %d, desc_id %d, status %d", + pdev_id, desc_id, status); +exit: + rcu_read_unlock(); +} + +static struct ath12k *ath12k_get_ar_on_scan_state(struct ath12k_base *ab, + u32 vdev_id, + enum ath12k_scan_state state) { int i; struct ath12k_pdev *pdev; @@ -5615,7 +11978,7 @@ ar = pdev->ar; spin_lock_bh(&ar->data_lock); - if (ar->scan.state == ATH12K_SCAN_ABORTING && + if (ar->scan.state == state && ar->scan.vdev_id == vdev_id) { spin_unlock_bh(&ar->data_lock); return ar; @@ -5645,9 +12008,13 @@ * aborting scan's vdev id matches this event info. */ if (le32_to_cpu(scan_ev.event_type) == WMI_SCAN_EVENT_COMPLETED && - le32_to_cpu(scan_ev.reason) == WMI_SCAN_REASON_CANCELLED) - ar = ath12k_get_ar_on_scan_abort(ab, le32_to_cpu(scan_ev.vdev_id)); - else + le32_to_cpu(scan_ev.reason) == WMI_SCAN_REASON_CANCELLED) { + ar = ath12k_get_ar_on_scan_state(ab, le32_to_cpu(scan_ev.vdev_id), + ATH12K_SCAN_ABORTING); + if(!ar) + ar = ath12k_get_ar_on_scan_state(ab, le32_to_cpu(scan_ev.vdev_id), + ATH12K_SCAN_RUNNING); + } else ar = ath12k_mac_get_ar_by_vdev_id(ab, le32_to_cpu(scan_ev.vdev_id)); if (!ar) { @@ -5688,6 +12055,8 @@ ath12k_wmi_event_scan_start_failed(ar); break; case WMI_SCAN_EVENT_DEQUEUED: + __ath12k_mac_scan_finish(ar); + break; case WMI_SCAN_EVENT_PREEMPTED: case WMI_SCAN_EVENT_RESTARTED: case WMI_SCAN_EVENT_FOREIGN_CHAN_EXIT: @@ -5705,7 +12074,9 @@ struct wmi_peer_sta_kickout_arg arg = {}; struct ieee80211_sta *sta; struct ath12k_peer *peer; + struct ath12k_vif *ahvif; struct ath12k *ar; + unsigned int link_id; if (ath12k_pull_peer_sta_kickout_ev(ab, skb, &arg) != 0) { ath12k_warn(ab, "failed to extract peer sta kickout event"); @@ -5725,23 +12096,39 @@ } ar = ath12k_mac_get_ar_by_vdev_id(ab, peer->vdev_id); + ahvif = ath12k_vif_to_ahvif(peer->vif); if (!ar) { ath12k_warn(ab, "invalid vdev id in peer sta kickout ev %d", peer->vdev_id); goto exit; } - sta = ieee80211_find_sta_by_ifaddr(ar->hw, + if (peer->mlo) + sta = ieee80211_find_sta_by_link_addrs(ar->ah->hw, arg.mac_addr, + NULL, &link_id); + else + sta = ieee80211_find_sta_by_ifaddr(ar->ah->hw, arg.mac_addr, NULL); if (!sta) { - ath12k_warn(ab, "Spurious quick kickout for STA %pM\n", - arg.mac_addr); + ath12k_warn(ab, "Spurious quick kickout for %sSTA %pM\n", + peer->mlo ? "MLO " : "", arg.mac_addr); goto exit; } - ath12k_dbg(ab, ATH12K_DBG_WMI, "peer sta kickout event %pM", - arg.mac_addr); + if (peer->mlo && peer->link_id != link_id) { + ath12k_warn(ab, + "Spurious quick kickout for MLO STA %pM with invalid link_id, peer: %d, sta: %d\n", + arg.mac_addr, peer->link_id, link_id); + goto exit; + } + + ath12k_dbg(ab, ATH12K_DBG_PEER, "peer sta kickout event %pM reason:%d", + arg.mac_addr, arg.reason); + if (ahvif->vif->type == NL80211_IFTYPE_STATION && + arg.reason == WMI_PEER_STA_KICKOUT_REASON_INACTIVITY) + ath12k_mac_handle_beacon_miss(ar, peer->vdev_id); + else ieee80211_report_low_ack(sta, 10); exit: @@ -5928,12 +12315,14 @@ survey->noise = le32_to_cpu(bss_ch_info_ev.noise_floor); survey->time = div_u64(total, cc_freq_hz); survey->time_busy = div_u64(busy, cc_freq_hz); - survey->time_rx = div_u64(rx_bss, cc_freq_hz); + survey->time_rx = div_u64(rx, cc_freq_hz); survey->time_tx = div_u64(tx, cc_freq_hz); + survey->time_bss_rx = div_u64(rx_bss, cc_freq_hz); survey->filled |= (SURVEY_INFO_NOISE_DBM | SURVEY_INFO_TIME | SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX | + SURVEY_INFO_TIME_BSS_RX | SURVEY_INFO_TIME_TX); exit: spin_unlock_bh(&ar->data_lock); @@ -5979,31 +12368,27 @@ rcu_read_unlock(); } -static void ath12k_service_available_event(struct ath12k_base *ab, struct sk_buff *skb) +static int ath12k_wmi_tlv_services_parser(struct ath12k_base *ab, + u16 tag, u16 tag_len, + const void *ptr, + void *data) { - const void **tb; const struct wmi_service_available_event *ev; - int ret; + u32 *wmi_ext2_service_bitmap; int i, j; + u16 expected_len; + u16 wmi_max_ext2_service_words; - tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); - if (IS_ERR(tb)) { - ret = PTR_ERR(tb); - ath12k_warn(ab, "failed to parse tlv: %d\n", ret); - return; - } - - ev = tb[WMI_TAG_SERVICE_AVAILABLE_EVENT]; - if (!ev) { - ath12k_warn(ab, "failed to fetch svc available ev"); - kfree(tb); - return; + expected_len = WMI_SERVICE_SEGMENT_BM_SIZE32 * sizeof(u32); + if (tag_len < expected_len) { + ath12k_warn(ab, "invalid length %d for the WMI services available tag 0x%x\n", + tag_len, tag); + return -EINVAL; } - /* TODO: Use wmi_service_segment_offset information to get the service - * especially when more services are advertised in multiple service - * available events. - */ + switch (tag) { + case WMI_TAG_SERVICE_AVAILABLE_EVENT: + ev = (struct wmi_service_available_event *)ptr; for (i = 0, j = WMI_MAX_SERVICE; i < WMI_SERVICE_SEGMENT_BM_SIZE32 && j < WMI_MAX_EXT_SERVICE; i++) { @@ -6015,11 +12400,42 @@ } ath12k_dbg(ab, ATH12K_DBG_WMI, - "wmi_ext_service_bitmap 0:0x%x, 1:0x%x, 2:0x%x, 3:0x%x", - ev->wmi_service_segment_bitmap[0], ev->wmi_service_segment_bitmap[1], - ev->wmi_service_segment_bitmap[2], ev->wmi_service_segment_bitmap[3]); + "wmi_ext_service_bitmap 0x%x 0x%x 0x%x 0x%x", + ev->wmi_service_segment_bitmap[0], + ev->wmi_service_segment_bitmap[1], + ev->wmi_service_segment_bitmap[2], + ev->wmi_service_segment_bitmap[3]); + break; + case WMI_TAG_ARRAY_UINT32: + wmi_ext2_service_bitmap = (u32 *)ptr; + wmi_max_ext2_service_words = tag_len / sizeof(u32); + for (i = 0, j = WMI_MAX_EXT_SERVICE; + i < wmi_max_ext2_service_words && j < WMI_MAX_EXT2_SERVICE; + i++) { + do { + if (wmi_ext2_service_bitmap[i] & + BIT(j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32)) + set_bit(j, ab->wmi_ab.svc_map); + } while (++j % WMI_AVAIL_SERVICE_BITS_IN_SIZE32); + } - kfree(tb); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi_ext2_service_bitmap 0x%04x 0x%04x 0x%04x 0x%04x", + wmi_ext2_service_bitmap[0], wmi_ext2_service_bitmap[1], + wmi_ext2_service_bitmap[2], wmi_ext2_service_bitmap[3]); + break; + } + return 0; +} + +static int ath12k_service_available_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + int ret; + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_tlv_services_parser, + NULL); + return ret; } static void ath12k_peer_assoc_conf_event(struct ath12k_base *ab, struct sk_buff *skb) @@ -6052,6 +12468,57 @@ static void ath12k_update_stats_event(struct ath12k_base *ab, struct sk_buff *skb) { + struct ath12k_fw_stats stats = {}; + struct ath12k *ar; + int ret; + + INIT_LIST_HEAD(&stats.pdevs); + INIT_LIST_HEAD(&stats.vdevs); + INIT_LIST_HEAD(&stats.bcn); + + ret = ath12k_wmi_pull_fw_stats(ab, skb, &stats); + if (ret) { + ath12k_warn(ab, "failed to pull fw stats: %d\n", ret); + goto free; + } + + rcu_read_lock(); + ar = ath12k_mac_get_ar_by_pdev_id(ab, stats.pdev_id); + if (!ar) { + rcu_read_unlock(); + ath12k_warn(ab, "failed to get ar for pdev_id %d: %d\n", + stats.pdev_id, ret); + goto free; + } + + spin_lock_bh(&ar->data_lock); + + /* WMI_REQUEST_PDEV_STAT can be requested via .get_txpower mac ops or via + * debugfs fw stats. Therfore, processing it separately. + */ + if (stats.stats_id == WMI_REQUEST_PDEV_STAT) { + list_splice_tail_init(&stats.pdevs, &ar->fw_stats.pdevs); + ar->fw_stats_done = true; + goto complete; + } + + /* WMI_REQUEST_VDEV_STAT and WMI_REQUEST_BCN_STAT are currently requested + * only via debugfs fw stats. Hence, processing these two in debugfs context + */ + ath12k_debugfs_fw_stats_process(ar, &stats); + +complete: + complete(&ar->fw_stats_complete); + rcu_read_unlock(); + spin_unlock_bh(&ar->data_lock); + + /* Since the stats's pdev, vdev and beacon list are spliced and reinitialised + * at this point, no need to free the individual list. + */ + return; + +free: + ath12k_fw_stats_free(&stats); } /* PDEV_CTL_FAILSAFE_CHECK_EVENT is received from FW when the frequency scanned @@ -6098,11 +12565,8 @@ const u32 *vdev_ids) { int i; - struct ath12k_vif *arvif; - - /* Finish CSA once the switch count becomes NULL */ - if (ev->current_switch_count) - return; + struct ath12k_link_vif *arvif; + struct ieee80211_bss_conf *link_conf; rcu_read_lock(); for (i = 0; i < le32_to_cpu(ev->num_vdevs); i++) { @@ -6113,9 +12577,24 @@ vdev_ids[i]); continue; } + link_conf = rcu_dereference(arvif->ahvif->vif->link_conf[arvif->link_id]); + + if (!link_conf) + continue; - if (arvif->is_up && arvif->vif->bss_conf.csa_active) - ieee80211_csa_finish(arvif->vif); + /* FIXME some changes are expected for ML vifs */ + if (arvif->is_up && (link_conf->csa_active || link_conf->color_change_active)) { + if (!ev->current_switch_count) { + if (link_conf->csa_active) + ieee80211_csa_finish_mlo(arvif->ahvif->vif, arvif->link_id); + } else if (ev->current_switch_count > 1) { + ieee80211_beacon_update_cntdwn_mlo(arvif->ahvif->vif, + arvif->link_id); + } else { + if (link_conf->color_change_active) + ieee80211_color_change_finish_mlo(arvif->ahvif->vif, arvif->link_id); + } + } } rcu_read_unlock(); } @@ -6198,32 +12677,530 @@ if (ar->dfs_block_radar_events) ath12k_info(ab, "DFS Radar detected, but ignored as requested\n"); else - ieee80211_radar_detected(ar->hw); + ieee80211_radar_detected(ar->ah->hw); exit: kfree(tb); } +static int ath12k_wmi_awgn_intf_subtlv_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + int ret = 0; + struct wmi_dcs_awgn_info *awgn_info; + + switch (tag) { + case WMI_TAG_DCS_AWGN_INT_TYPE: + awgn_info = (struct wmi_dcs_awgn_info *)ptr; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "AWGN Info: channel width: %d, chan freq: %d, center_freq0: %d, center_freq1: %d, bw_intf_bitmap: %d\n", + awgn_info->channel_width, awgn_info->chan_freq, awgn_info->center_freq0, awgn_info->center_freq1, + awgn_info->chan_bw_interference_bitmap); + memcpy(data, awgn_info, sizeof(*awgn_info)); + break; + default: + ath12k_warn(ab, + "Received invalid tag for wmi dcs interference in subtlvs\n"); + return -EINVAL; + break; + } + + return ret; +} + +static int ath12k_wmi_dcs_awgn_event_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + int ret = 0; + + ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi dcs awgn event tag 0x%x of len %d rcvd\n", + tag, len); + + switch (tag) { + case WMI_TAG_DCS_INTERFERENCE_EVENT: + /* Fixed param is already processed*/ + break; + case WMI_TAG_ARRAY_STRUCT: + /* len 0 is expected for array of struct when there + * is no content of that type to pack inside that tlv + */ + if (len == 0) + return 0; + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_awgn_intf_subtlv_parser, + data); + break; + default: + ath12k_warn(ab, "Received invalid tag for wmi dcs interference event\n"); + ret = -EINVAL; + break; + } + + return ret; +} + +bool ath12k_wmi_validate_dcs_awgn_info(struct ath12k *ar, struct wmi_dcs_awgn_info *awgn_info) +{ + spin_lock_bh(&ar->data_lock); + + if (!ar->rx_channel) { + spin_unlock_bh(&ar->data_lock); + return false; + } + + if (awgn_info->chan_freq != ar->rx_channel->center_freq) { + spin_unlock_bh(&ar->data_lock); + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with wrong channel %d",awgn_info->chan_freq); + return false; + } + spin_unlock_bh(&ar->data_lock); + + switch (awgn_info->channel_width) { + case WMI_HOST_CHAN_WIDTH_20: + if (awgn_info->chan_bw_interference_bitmap > WMI_DCS_SEG_PRI20) { + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with wrong chan width bmap %d for 20MHz", + awgn_info->chan_bw_interference_bitmap); + return false; + } + break; + case WMI_HOST_CHAN_WIDTH_40: + if (awgn_info->chan_bw_interference_bitmap > WMI_DCS_SEG_SEC20) { + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with wrong chan width bmap %d for 40MHz", + awgn_info->chan_bw_interference_bitmap); + return false; + } + break; + case WMI_HOST_CHAN_WIDTH_80: + if (awgn_info->chan_bw_interference_bitmap > WMI_DCS_SEG_SEC40) { + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with wrong chan width bmap %d for 80MHz", + awgn_info->chan_bw_interference_bitmap); + return false; + } + break; + case WMI_HOST_CHAN_WIDTH_160: + case WMI_HOST_CHAN_WIDTH_80P80: + if (awgn_info->chan_bw_interference_bitmap > WMI_DCS_SEG_SEC80) { + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with wrong chan width bmap %d for 80P80/160MHz", + awgn_info->chan_bw_interference_bitmap); + return false; + } + break; + case WMI_HOST_CHAN_WIDTH_320: + if (awgn_info->chan_bw_interference_bitmap > WMI_DCS_SEG_SEC160) { + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with wrong chan width bmap %d for 320MHz", + awgn_info->chan_bw_interference_bitmap); + return false; + } + break; + default: + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "dcs interference event received with unknown channel width %d", + awgn_info->channel_width); + return false; + } + return true; +} + +static void +ath12k_wmi_dcs_awgn_interference_event(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const struct wmi_dcs_interference_ev *dcs_intf_ev; + struct wmi_dcs_awgn_info awgn_info = {}; + struct cfg80211_chan_def *chandef; + struct ath12k_mac_any_chandef_arg arg; + struct ath12k *ar; + const struct wmi_tlv *tlv; + struct ath12k_hw *ah; + u16 tlv_tag; + u8 *ptr; + int ret; + + if (!test_bit(WMI_TLV_SERVICE_DCS_AWGN_INT_SUPPORT, ab->wmi_ab.svc_map)) { + ath12k_warn(ab, "firmware doesn't support awgn interference, so dropping dcs interference ev\n"); + return; + } + + ptr = skb->data; + + if (skb->len < (sizeof(*dcs_intf_ev) + TLV_HDR_SIZE)) { + ath12k_warn(ab, "dcs interference event size invalid\n"); + return; + } + + tlv = (struct wmi_tlv *)ptr; + tlv_tag = FIELD_GET(WMI_TLV_TAG, tlv->header); + ptr += sizeof(*tlv); + + if (tlv_tag == WMI_TAG_DCS_INTERFERENCE_EVENT) { + dcs_intf_ev = (struct wmi_dcs_interference_ev*)ptr; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pdev awgn detected on pdev %d, interference type %d\n", + dcs_intf_ev->pdev_id, dcs_intf_ev->interference_type); + + if (dcs_intf_ev->interference_type != WMI_DCS_AWGN_INTF) { + ath12k_warn(ab, "interference type is not awgn\n"); + return; + } + } else { + ath12k_warn(ab, "dcs interference event received with wrong tag\n"); + return; + } + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_dcs_awgn_event_parser, + &awgn_info); + if (ret) { + ath12k_warn(ab, "failed to parse awgn tlv %d\n", ret); + return; + } + + rcu_read_lock(); + ar = ath12k_mac_get_ar_by_pdev_id(ab, dcs_intf_ev->pdev_id); + if (!ar) { + ath12k_warn(ab, "awgn detected in invalid pdev id(%d)\n", + dcs_intf_ev->pdev_id); + goto exit; + } + if (!ar->supports_6ghz) { + ath12k_warn(ab, "pdev does not supports 6G, so dropping dcs interference event\n"); + goto exit; + } + + spin_lock_bh(&ar->data_lock); + if (ar->awgn_intf_handling_in_prog) { + spin_unlock_bh(&ar->data_lock); + rcu_read_unlock(); + return; + } + spin_unlock_bh(&ar->data_lock); + + if (!ath12k_wmi_validate_dcs_awgn_info(ar, &awgn_info)) { + ath12k_warn(ab, "Invalid DCS AWGN TLV - Skipping event"); + goto exit; + } + + ah = ar->ah; + + ath12k_info(ab, "Interface(pdev %d) : AWGN interference detected\n", + dcs_intf_ev->pdev_id); + + arg.ar = ar; + arg.def = NULL; + + ieee80211_iter_chan_contexts_atomic(ah->hw, ath12k_mac_get_any_chandef_iter, + &arg); + chandef = arg.def; + if (!chandef) { + ath12k_warn(ab, "chandef is not available\n"); + goto exit; + } + ar->awgn_chandef = *chandef; + + /* ieee80211_awgn_detected(ah->hw, awgn_info.chan_bw_interference_bitmap, */ + /* chandef->chan); */ + + spin_lock_bh(&ar->data_lock); + ar->awgn_intf_handling_in_prog = true; + ar->chan_bw_interference_bitmap = awgn_info.chan_bw_interference_bitmap; + spin_unlock_bh(&ar->data_lock); + + ath12k_dbg(ab, ATH12K_DBG_WMI, "AWGN : Interference handling started\n"); +exit: + rcu_read_unlock(); +} + +#ifdef CONFIG_ATH12K_PKTLOG +static void +ath12k_wmi_pktlog_decode_info(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct ath12k *ar; + const void **tb; + int ret; + struct ath_pktlog *pktlog; + struct ath_pl_fw_info *pktlog_info; + + if (!test_bit(WMI_TLV_SERVICE_PKTLOG_DECODE_INFO_SUPPORT, ab->wmi_ab.svc_map)) { + ath12k_warn(ab, "firmware doesn't support pktlog decode info support\n"); + return; + } + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse tlv: %d\n", ret); + return; + } + pktlog_info = tb[WMI_TAG_PDEV_PKTLOG_DECODE_INFO]; + if (!pktlog_info) { + ath12k_warn(ab, "failed to fetch pktlog debug info"); + kfree(tb); + return; + } + + pktlog_info->pdev_id = DP_SW2HW_MACID(pktlog_info->pdev_id); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pktlog pktlog_defs_json_version: %d", pktlog_info->pktlog_defs_json_version); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pktlog software_image: %s", pktlog_info->software_image); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pktlog chip_info: %s", pktlog_info->chip_info); + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pktlog pdev_id: %d", pktlog_info->pdev_id); + + ar = ath12k_mac_get_ar_by_pdev_id(ab, pktlog_info->pdev_id); + if (!ar) { + ath12k_warn(ab, "invalid pdev id in pktlog decode info %d", pktlog_info->pdev_id); + kfree(tb); + return; + } + pktlog = &ar->debug.pktlog; + pktlog->fw_version_record = 1; + if (pktlog->buf == NULL) { + ath12k_warn(ab, "failed to initialize, start pktlog\n"); + kfree(tb); + return; + } + pktlog->buf->bufhdr.magic_num = PKTLOG_MAGIC_NUM_FW_VERSION_SUPPORT; + memcpy(pktlog->buf->bufhdr.software_image, pktlog_info->software_image, sizeof(pktlog_info->software_image)); + memcpy(pktlog->buf->bufhdr.chip_info, pktlog_info->chip_info, sizeof(pktlog_info->chip_info)); + pktlog->buf->bufhdr.pktlog_defs_json_version = pktlog_info->pktlog_defs_json_version; + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pktlog new magic_num: 0x%x\n", pktlog->buf->bufhdr.magic_num); + kfree(tb); +} +#endif + +static int +ath12k_wmi_rssi_dbm_conv_subtlv_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_rssi_dbm_conv_offsets *rssi_offsets = + (struct wmi_rssi_dbm_conv_offsets *) data; + struct wmi_rssi_dbm_conv_param_info *param_info; + struct wmi_rssi_dbm_conv_temp_offset *temp_offset_info; + int i, ret = 0; + s8 min_nf = 0; + + switch (tag) { + case WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO: + if (len != sizeof(*param_info)) { + ath12k_warn(ab, "wmi rssi dbm conv subtlv 0x%x invalid len rcvd", + tag); + return -EINVAL; + } + param_info = (struct wmi_rssi_dbm_conv_param_info *)ptr; + + /* Using minimum pri20 Noise Floor across active chains instead + * of all sub-bands*/ + for (i = 0; i < MAX_NUM_ANTENNA; i++) { + if (param_info->curr_rx_chainmask & (0x01 << i)) + min_nf = min(param_info->nf_hw_dbm[i][0], min_nf); + } + rssi_offsets->min_nf_dbm = min_nf; + break; + case WMI_TAG_RSSI_DBM_CONVERSION_TEMP_OFFSET_INFO: + if (len != sizeof(*temp_offset_info)) { + ath12k_warn(ab, "wmi rssi dbm conv subtlv 0x%x invalid len rcvd", + tag); + return -EINVAL; + } + temp_offset_info = (struct wmi_rssi_dbm_conv_temp_offset *)ptr; + rssi_offsets->rssi_temp_offset = temp_offset_info->rssi_temp_offset; + break; + default: + ath12k_warn(ab, "Received invalid sub-tag for wmi rssi dbm conversion\n"); + ret = -EINVAL; + } + return ret; +} + +static int +ath12k_wmi_rssi_dbm_conv_event_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + int ret = 0; + + ath12k_dbg(ab, ATH12K_DBG_WMI, "wmi rssi dbm conv tag 0x%x of len %d rcvd", + tag, len); + switch (tag) { + case WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM: + /* Fixed param is already processed*/ + break; + case WMI_TAG_ARRAY_STRUCT: + /* len 0 is expected for array of struct when there + * is no content of that type inside that tlv + */ + if (len == 0) + return ret; + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_rssi_dbm_conv_subtlv_parser, + data); + break; + default: + ath12k_warn(ab, "Received invalid tag for wmi rssi dbm conv interference event\n"); + ret = -EINVAL; + break; + + } + + return ret; +} + +static struct +ath12k *ath12k_wmi_rssi_dbm_process_fixed_param( struct ath12k_base *ab, + u8 *ptr, size_t len) +{ + struct ath12k *ar; + const struct wmi_tlv *tlv; + struct wmi_rssi_dbm_conv_event_fixed_param *fixed_param; + u16 tlv_tag; + + if(!ptr) { + ath12k_warn(ab, "No data present in rssi dbm conv event\n"); + return NULL; + } + + if (len < (sizeof(*fixed_param) + TLV_HDR_SIZE)) { + ath12k_warn(ab, "rssi dbm conv event size invalid\n"); + return NULL; + } + + tlv = (struct wmi_tlv *)ptr; + tlv_tag = FIELD_GET(WMI_TLV_TAG, tlv->header); + ptr += sizeof(*tlv); + + if (tlv_tag == WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM) { + fixed_param = (struct wmi_rssi_dbm_conv_event_fixed_param *)ptr; + + ar = ath12k_mac_get_ar_by_pdev_id(ab, fixed_param->pdev_id); + if (!ar) { + ath12k_warn(ab, "Failed to get ar for rssi dbm conv event\n"); + return NULL; + } + } else { + ath12k_warn(ab, "rssi dbm conv event received without fixed param tlv at start\n"); + return NULL; + } + + return ar; +} + +static void ath12k_wmi_rssi_dbm_conversion_param_info(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct ath12k *ar; + struct wmi_rssi_dbm_conv_offsets *rssi_offsets; + int ret, i; + + /* if pdevs are not active ignore the event */ + for (i = 0; i < ab->num_radios; i++) { + if (!ab->pdevs_active[i]) + return; + } + + ar = ath12k_wmi_rssi_dbm_process_fixed_param(ab, skb->data, + skb->len); + if(!ar) { + ath12k_warn(ab, "failed to get ar from rssi dbm conversion event\n"); + return; + } + + rssi_offsets = &ar->rssi_offsets; + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_rssi_dbm_conv_event_parser, + rssi_offsets); + if (ret) { + ath12k_warn(ab, "Unable to parse rssi dbm conversion event\n"); + return; + } + + rssi_offsets->rssi_offset = rssi_offsets->min_nf_dbm + + rssi_offsets->rssi_temp_offset; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "RSSI offset updated, current offset is %d\n", + rssi_offsets->rssi_offset); +} + +static void ath12k_wmi_tm_event_segmented(struct ath12k_base *ab, u32 cmd_id, + struct sk_buff *skb) +{ + const void **tb; + const struct wmi_ftm_event_msg *ev; + u16 length; + int ret; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse ftm event tlv: %d\n", ret); + return; + } + + ev = tb[WMI_TAG_ARRAY_BYTE]; + if (!ev) { + ath12k_warn(ab, "failed to fetch ftm msg\n"); + kfree(tb); + return; + } + + length = skb->len - TLV_HDR_SIZE; + ret = ath12k_tm_process_event(ab, cmd_id, ev, length); + if (ret) + ath12k_warn(ab, "Failed to process ftm event\n"); + kfree(tb); +} static void ath12k_wmi_pdev_temperature_event(struct ath12k_base *ab, struct sk_buff *skb) { struct ath12k *ar; - struct wmi_pdev_temperature_event ev = {0}; + const void **tb; + int ret; + const struct wmi_pdev_temperature_event *ev; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse tlv: %d\n", ret); + return; + } - if (ath12k_pull_pdev_temp_ev(ab, skb->data, skb->len, &ev) != 0) { - ath12k_warn(ab, "failed to extract pdev temperature event"); + ev = tb[WMI_TAG_PDEV_TEMPERATURE_EVENT]; + if (!ev) { + ath12k_warn(ab, "failed to fetch pdev temp ev"); + kfree(tb); return; } ath12k_dbg(ab, ATH12K_DBG_WMI, - "pdev temperature ev temp %d pdev_id %d\n", ev.temp, ev.pdev_id); + "pdev temperature ev temp %d pdev_id %d\n", ev->temp, + ev->pdev_id); - ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev.pdev_id)); + ar = ath12k_mac_get_ar_by_pdev_id(ab, le32_to_cpu(ev->pdev_id)); if (!ar) { - ath12k_warn(ab, "invalid pdev id in pdev temperature ev %d", ev.pdev_id); + ath12k_warn(ab, "invalid pdev id in pdev temperature ev %d", + ev->pdev_id); return; } + + ath12k_thermal_event_temperature(ar, ev->temp); + + kfree(tb); } static void ath12k_fils_discovery_event(struct ath12k_base *ab, @@ -6288,6 +13265,1056 @@ kfree(tb); } +static int ath12k_tpc_get_reg_pwr(struct ath12k_base *ab, + struct wmi_tpc_stats_event *tpc_stats, + struct wmi_max_reg_power_fixed_param *ev) +{ + int total_size; + struct wmi_max_reg_power_allowed *reg_pwr; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "Received reg power array type %d length %d for tpc stats\n", + ev->reg_power_type, ev->reg_array_len); + + switch (ev->reg_power_type) { + case TPC_STATS_REG_PWR_ALLOWED_TYPE: + reg_pwr = &tpc_stats->max_reg_allowed_power; + break; + default: + goto out; + } + + /* Each entry is 2 byte hence multiplying the indices with 2 */ + total_size = (ev->d1 * ev->d2 * ev->d3 * ev->d4 * 2); + if (ev->reg_array_len != total_size) { + ath12k_warn(ab, + "Total size and reg_array_len doesn't match for tpc stats\n"); + return -EINVAL; + } + + memcpy(®_pwr->tpc_reg_pwr, ev, sizeof(struct wmi_max_reg_power_fixed_param)); + + reg_pwr->reg_pwr_array = kzalloc(reg_pwr->tpc_reg_pwr.reg_array_len, + GFP_ATOMIC); + if (!reg_pwr->reg_pwr_array) + return -ENOMEM; + + tpc_stats->tlvs_rcvd |= WMI_TPC_REG_PWR_ALLOWED; +out: + return 0; +} + +static int ath12k_tpc_get_rate_array(struct ath12k_base *ab, + struct wmi_tpc_stats_event *tpc_stats, + struct wmi_tpc_rates_array_fixed_param *ev) +{ + u32 flag = 0; + struct wmi_tpc_rates_array *rates_array; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "Received rates array type %d length %d for tpc stats\n", + ev->rate_array_type, ev->rate_array_len); + + switch (ev->rate_array_type) { + case ATH12K_TPC_STATS_RATES_ARRAY1: + rates_array = &tpc_stats->rates_array1; + flag = WMI_TPC_RATES_ARRAY1; + break; + case ATH12K_TPC_STATS_RATES_ARRAY2: + rates_array = &tpc_stats->rates_array2; + flag = WMI_TPC_RATES_ARRAY2; + break; + default: + ath12k_warn(ab, + "Received invalid type of rates array for tpc stats\n"); + return -EINVAL; + } + memcpy(&rates_array->tpc_rates_array, ev, sizeof(struct wmi_tpc_rates_array_fixed_param)); + rates_array->rate_array = kzalloc(rates_array->tpc_rates_array.rate_array_len, + GFP_ATOMIC); + if (!rates_array->rate_array) + return -ENOMEM; + + tpc_stats->tlvs_rcvd |= flag; + return 0; +} + +static int ath12k_tpc_get_ctl_pwr_tbl(struct ath12k_base *ab, + struct wmi_tpc_stats_event *tpc_stats, + struct wmi_tpc_ctl_pwr_fixed_param *ev) +{ + int total_size, ret = 0; + u32 flag = 0; + struct wmi_tpc_ctl_pwr_table *ctl_array; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "Received ctl array type %d length %d for tpc stats\n", + ev->ctl_array_type, ev->ctl_array_len); + + switch (ev->ctl_array_type) { + case ATH12K_TPC_STATS_CTL_ARRAY: + ctl_array = &tpc_stats->ctl_array; + flag = WMI_TPC_CTL_PWR_ARRAY; + break; + default: + ath12k_warn(ab, + "Received invalid type of ctl pwr table for tpc stats\n"); + return -EINVAL; + } + + total_size = (ev->d1 * ev->d2 * ev->d3 * ev->d4); + if (ev->ctl_array_len != total_size) { + ath12k_warn(ab, + "Total size and ctl_array_len doesn't match for tpc stats\n"); + return -EINVAL; + } + + memcpy(&ctl_array->tpc_ctl_pwr, ev, sizeof(struct wmi_tpc_ctl_pwr_fixed_param)); + + ctl_array->ctl_pwr_table = kzalloc(ctl_array->tpc_ctl_pwr.ctl_array_len, + GFP_ATOMIC); + if (!ctl_array->ctl_pwr_table) + return -ENOMEM; + + tpc_stats->tlvs_rcvd |= flag; + return ret; +} + +static int ath12k_wmi_tpc_stats_subtlv_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + int ret = 0; + struct wmi_tpc_stats_event *tpc_stats = (struct wmi_tpc_stats_event *)data; + struct wmi_tpc_configs *tpc_config; + struct wmi_max_reg_power_fixed_param *tpc_reg_pwr; + struct wmi_tpc_rates_array_fixed_param *tpc_rates_array; + struct wmi_tpc_ctl_pwr_fixed_param *tpc_ctl_pwr; + + if (!tpc_stats) { + ath12k_warn(ab, "tpc stats memory unavailable\n"); + return -EINVAL; + } + + switch (tag) { + case WMI_TAG_TPC_STATS_CONFIG_EVENT: + tpc_config = (struct wmi_tpc_configs *)ptr; + memcpy(&tpc_stats->tpc_config, tpc_config, + sizeof(struct wmi_tpc_configs)); + break; + + case WMI_TAG_TPC_STATS_REG_PWR_ALLOWED: + tpc_reg_pwr = (struct wmi_max_reg_power_fixed_param *)ptr; + ret = ath12k_tpc_get_reg_pwr(ab, tpc_stats, tpc_reg_pwr); + break; + + case WMI_TAG_TPC_STATS_RATES_ARRAY: + tpc_rates_array = (struct wmi_tpc_rates_array_fixed_param *)ptr; + ret = ath12k_tpc_get_rate_array(ab, tpc_stats, tpc_rates_array); + break; + + case WMI_TAG_TPC_STATS_CTL_PWR_TABLE_EVENT: + tpc_ctl_pwr = (struct wmi_tpc_ctl_pwr_fixed_param *)ptr; + ret = ath12k_tpc_get_ctl_pwr_tbl(ab, tpc_stats, tpc_ctl_pwr); + break; + + default: + ath12k_warn(ab, + "Received invalid tag for tpc stats in subtlvs\n"); + return -EINVAL; + } + return ret; +} + +static int ath12k_wmi_tpc_stats_copy_buffer(struct ath12k_base *ab, + const void *ptr, u16 tag, u16 len, + struct wmi_tpc_stats_event *tpc_stats) +{ + s16 *reg_rates_src; + s8 *ctl_src; + s16 *dst_ptr; + s8 *dst_ptr_ctl; + int ret = 0; + + if (tag == WMI_TAG_ARRAY_INT16) + reg_rates_src = (s16 *)ptr; + else + ctl_src = (s8 *)ptr; + + switch (tpc_stats->event_count) { + case ATH12K_TPC_STATS_CONFIG_REG_PWR_EVENT: + if (tpc_stats->tlvs_rcvd & WMI_TPC_REG_PWR_ALLOWED) { + dst_ptr = tpc_stats->max_reg_allowed_power.reg_pwr_array; + memcpy(dst_ptr, reg_rates_src, + tpc_stats->max_reg_allowed_power.tpc_reg_pwr.reg_array_len); + reg_rates_src += tpc_stats->max_reg_allowed_power.tpc_reg_pwr.reg_array_len; + } + break; + case ATH12K_TPC_STATS_RATES_EVENT1: + if (tpc_stats->tlvs_rcvd & WMI_TPC_RATES_ARRAY1) { + dst_ptr = tpc_stats->rates_array1.rate_array; + memcpy(dst_ptr, reg_rates_src, + tpc_stats->rates_array1.tpc_rates_array.rate_array_len); + reg_rates_src += tpc_stats->rates_array1.tpc_rates_array.rate_array_len; + } + break; + case ATH12K_TPC_STATS_RATES_EVENT2: + if (tpc_stats->tlvs_rcvd & WMI_TPC_RATES_ARRAY2) { + dst_ptr = tpc_stats->rates_array2.rate_array; + memcpy(dst_ptr, reg_rates_src, + tpc_stats->rates_array2.tpc_rates_array.rate_array_len); + reg_rates_src += tpc_stats->rates_array2.tpc_rates_array.rate_array_len; + } + break; + case ATH12K_TPC_STATS_CTL_TABLE_EVENT: + if (tpc_stats->tlvs_rcvd & WMI_TPC_CTL_PWR_ARRAY) { + dst_ptr_ctl = tpc_stats->ctl_array.ctl_pwr_table; + memcpy(dst_ptr_ctl, ctl_src, + tpc_stats->ctl_array.tpc_ctl_pwr.ctl_array_len); + ctl_src += tpc_stats->ctl_array.tpc_ctl_pwr.ctl_array_len; + } + break; + } + return ret; +} + +static int ath12k_wmi_tpc_stats_event_parser(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_tpc_stats_event *tpc_stats = (struct wmi_tpc_stats_event *)data; + int ret = 0; + + ath12k_dbg(ab, ATH12K_DBG_WMI, "tpc stats tag 0x%x of len %d rcvd\n", + tag, len); + switch (tag) { + case WMI_TAG_CTRL_PATH_EVENT_FIXED_PARAM: + /* Fixed param is already processed*/ + break; + + case WMI_TAG_ARRAY_STRUCT: + /* len 0 is expected for array of struct when there + * is no content of that type to pack inside that tlv + */ + if (len == 0) + return 0; + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_tpc_stats_subtlv_parser, + tpc_stats); + break; + + case WMI_TAG_ARRAY_INT16: + if (len == 0) + return 0; + ret = ath12k_wmi_tpc_stats_copy_buffer(ab, ptr, + WMI_TAG_ARRAY_INT16, + len, tpc_stats); + break; + + case WMI_TAG_ARRAY_BYTE: + if (len == 0) + return 0; + ret = ath12k_wmi_tpc_stats_copy_buffer(ab, ptr, + WMI_TAG_ARRAY_BYTE, + len, tpc_stats); + break; + + default: + ath12k_warn(ab, "Received invalid tag for tpc stats\n"); + ret = -EINVAL; + break; + } + return ret; +} + +void ath12k_wmi_free_tpc_stats_mem(struct ath12k *ar) +{ + struct wmi_tpc_stats_event *tpc_stats = ar->tpc_stats; + + lockdep_assert_held(&ar->data_lock); + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "tpc stats mem free\n"); + if (tpc_stats) { + kfree(tpc_stats->max_reg_allowed_power.reg_pwr_array); + kfree(tpc_stats->rates_array1.rate_array); + kfree(tpc_stats->rates_array2.rate_array); + kfree(tpc_stats->ctl_array.ctl_pwr_table); + kfree(tpc_stats); + ar->tpc_stats = NULL; + } +} + +static struct ath12k *ath12k_wmi_tpc_process_fixed_param(struct ath12k_base *ab, + u8 *ptr, size_t len) +{ + struct ath12k *ar; + const struct wmi_tlv *tlv; + struct wmi_cp_stats_event_fixed_param *fixed_param; + struct wmi_tpc_stats_event *tpc_stats; + u16 tlv_tag; + + if (!ptr) { + ath12k_warn(ab, "No data present in tpc stats event\n"); + return NULL; + } + + if (len < (sizeof(*fixed_param) + TLV_HDR_SIZE)) { + ath12k_warn(ab, "tpc stats event size invalid\n"); + return NULL; + } + + tlv = (struct wmi_tlv *)ptr; + tlv_tag = FIELD_GET(WMI_TLV_TAG, tlv->header); + ptr += sizeof(*tlv); + + if (tlv_tag == WMI_TAG_CTRL_PATH_EVENT_FIXED_PARAM) { + fixed_param = (struct wmi_cp_stats_event_fixed_param *)ptr; + + ar = ath12k_mac_get_ar_by_pdev_id(ab, fixed_param->pdev_id); + if (!ar) { + ath12k_warn(ab, "Failed to get ar for tpc stats\n"); + return NULL; + } + } else { + ath12k_warn(ab, "TPC Stats received without fixed param tlv at start\n"); + return NULL; + } + + spin_lock_bh(&ar->data_lock); + if (!ar->tpc_request) { + /* Event is received either without request or the + * timeout, if memory is already allocated free it + */ + if (ar->tpc_stats) { + ath12k_warn(ab, "Freeing memory for tpc_stats\n"); + ath12k_wmi_free_tpc_stats_mem(ar); + } + spin_unlock_bh(&ar->data_lock); + return NULL; + } + + if (fixed_param->event_count == 0) { + if (ar->tpc_stats) { + ath12k_warn(ab, + "Invalid tpc memory present\n"); + spin_unlock_bh(&ar->data_lock); + return NULL; + } + ar->tpc_stats = + kzalloc(sizeof(struct wmi_tpc_stats_event), + GFP_ATOMIC); + } + + if (!ar->tpc_stats) { + ath12k_warn(ab, + "Failed to allocate memory for tpc stats\n"); + spin_unlock_bh(&ar->data_lock); + return NULL; + } + + tpc_stats = ar->tpc_stats; + + if (!(fixed_param->event_count == 0)) { + if (fixed_param->event_count != tpc_stats->event_count + 1) { + ath12k_warn(ab, + "Invalid tpc event received\n"); + spin_unlock_bh(&ar->data_lock); + return NULL; + } + } + tpc_stats->pdev_id = fixed_param->pdev_id; + tpc_stats->event_count = fixed_param->event_count; + tpc_stats->end_of_event = fixed_param->end_of_event; + ath12k_dbg(ab, ATH12K_DBG_WMI, + "tpc stats event_count %d\n", + tpc_stats->event_count); + + spin_unlock_bh(&ar->data_lock); + + return ar; +} + +static void ath12k_process_tpc_stats(struct ath12k_base *ab, + struct sk_buff *skb) +{ + int ret; + struct ath12k *ar; + struct wmi_tpc_stats_event *tpc_stats = NULL; + + rcu_read_lock(); + ar = ath12k_wmi_tpc_process_fixed_param(ab, skb->data, skb->len); + if (!ar) { + ath12k_warn(ab, "Failed to get ar for tpc event\n"); + goto exit; + } + + spin_lock_bh(&ar->data_lock); + tpc_stats = ar->tpc_stats; + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_tpc_stats_event_parser, + tpc_stats); + if (ret) { + if (tpc_stats) { + ath12k_warn(ab, "Freeing memory for tpc_stats\n"); + ath12k_wmi_free_tpc_stats_mem(ar); + } + spin_unlock_bh(&ar->data_lock); + ath12k_warn(ab, "failed to parse tpc_stats tlv: %d\n", ret); + goto exit; + } + + if (tpc_stats && tpc_stats->end_of_event) + complete(&ar->tpc_complete); + + spin_unlock_bh(&ar->data_lock); + +exit: + rcu_read_unlock(); +} + +int ath12k_wmi_pdev_get_tpc_table_cmdid(struct ath12k *ar) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_request_ctrl_path_stats_cmd_fixed_param *cmd; + struct sk_buff *skb; + struct wmi_tlv *tlv; + void *ptr; + u32 *pdev_ids, buf_len; + int ret; + + buf_len = sizeof(*cmd) + sizeof(u32) + TLV_HDR_SIZE; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, buf_len); + if (!skb) + return -ENOMEM; + cmd = (struct wmi_request_ctrl_path_stats_cmd_fixed_param *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_CTRL_PATH_CMD_FIXED_PARAM) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + + cmd->stats_id_mask = WMI_REQ_CTRL_PATH_PDEV_TX_STAT; + cmd->action = WMI_REQUEST_CTRL_PATH_STAT_GET; + cmd->subid = ar->tpc_stats_type; + + ptr = skb->data + sizeof(*cmd); + + tlv = ptr; + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | + FIELD_PREP(WMI_TLV_LEN, sizeof(u32)); + + ptr += TLV_HDR_SIZE; + + pdev_ids = ptr; + pdev_ids[0] = ar->pdev->pdev_id; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_REQUEST_STATS_CTRL_PATH_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to submit WMI_REQUEST_STATS_CTRL_PATH_CMDID\n"); + dev_kfree_skb(skb); + return ret; + } + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI get TPC STATS sent on pdev %d\n", + ar->pdev->pdev_id); + + return ret; +} + +static void ath12k_wmi_diag_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + const struct wmi_tlv *tlv; + u16 tlv_tag, tlv_len; + u32 *dev_id; + u8 *data; + + tlv = (struct wmi_tlv *)skb->data; + tlv_tag = FIELD_GET(WMI_TLV_TAG, tlv->header); + tlv_len = FIELD_GET(WMI_TLV_LEN, tlv->header); + + if (tlv_tag == WMI_TAG_ARRAY_BYTE) { + data = skb->data + sizeof(struct wmi_tlv); + dev_id = (uint32_t *)data; + *dev_id = ab->hw_params->hw_rev + ATH12K_DIAG_HW_ID_OFFSET; + } else { + ath12k_warn(ab, "WMI Diag Event missing required tlv\n"); + return; + } + + ath12k_fwlog_write(ab, data, tlv_len); +} + +#define make_min_max(max,min) (u32_encode_bits(max, 0xf0) | u32_encode_bits(min, 0xf)) + +static void +ath12k_wmi_pdev_update_muedca_params_status_event(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const void **tb; + const struct wmi_pdev_update_muedca_event *ev; + struct ieee80211_mu_edca_param_set *params; + struct ath12k *ar; + int ret; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse tlv: %d\n", ret); + return; + } + + ev = tb[WMI_TAG_MUEDCA_PARAMS_CONFIG_EVENT]; + if (!ev) { + ath12k_warn(ab, "failed to fetch pdev update muedca params ev"); + goto mem_free; + } + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "Update MU-EDCA parameters for pdev:%d\n", ev->pdev_id); + + rcu_read_lock(); + ar = ath12k_mac_get_ar_by_pdev_id(ab, ev->pdev_id); + if (!ar) { + ath12k_warn(ab, "MU-EDCA parameter change in invalid pdev %d\n", + ev->pdev_id); + goto unlock; + } + + params = kzalloc(sizeof(*params), GFP_ATOMIC); + if (!params) { + ath12k_warn(ab, + "Failed to allocate memory for updated MU-EDCA Parameters"); + goto unlock; + } + + params->ac_be.aifsn = ev->aifsn[WMI_AC_BE]; + params->ac_be.ecw_min_max = make_min_max(ev->ecwmax[WMI_AC_BE], + ev->ecwmin[WMI_AC_BE]); + params->ac_be.mu_edca_timer = ev->muedca_expiration_time[WMI_AC_BE]; + + params->ac_bk.aifsn = ev->aifsn[WMI_AC_BK]; + params->ac_bk.ecw_min_max = make_min_max(ev->ecwmax[WMI_AC_BK], + ev->ecwmin[WMI_AC_BK]); + params->ac_bk.mu_edca_timer = ev->muedca_expiration_time[WMI_AC_BK]; + + params->ac_vi.aifsn = ev->aifsn[WMI_AC_VI]; + params->ac_vi.ecw_min_max = make_min_max(ev->ecwmax[WMI_AC_VI], + ev->ecwmin[WMI_AC_VI]); + params->ac_vi.mu_edca_timer = ev->muedca_expiration_time[WMI_AC_VI]; + + params->ac_vo.aifsn = ev->aifsn[WMI_AC_VO]; + params->ac_vo.ecw_min_max = make_min_max(ev->ecwmax[WMI_AC_VO], + ev->ecwmin[WMI_AC_VO]); + params->ac_vo.mu_edca_timer = ev->muedca_expiration_time[WMI_AC_VO]; + + /* cfg80211_update_muedca_params_event(ar->ah->hw->wiphy, params, GFP_ATOMIC); */ + + kfree(params); + +unlock: + rcu_read_unlock(); +mem_free: + kfree(tb); +} + +static const char *ath12k_wmi_twt_add_dialog_event_status(u32 status) +{ + switch (status) { + case WMI_ADD_TWT_STATUS_OK: + return "ok"; + case WMI_ADD_TWT_STATUS_TWT_NOT_ENABLED: + return "twt disabled"; + case WMI_ADD_TWT_STATUS_USED_DIALOG_ID: + return "dialog id in use"; + case WMI_ADD_TWT_STATUS_INVALID_PARAM: + return "invalid parameters"; + case WMI_ADD_TWT_STATUS_NOT_READY: + return "not ready"; + case WMI_ADD_TWT_STATUS_NO_RESOURCE: + return "resource unavailable"; + case WMI_ADD_TWT_STATUS_NO_ACK: + return "no ack"; + case WMI_ADD_TWT_STATUS_NO_RESPONSE: + return "no response"; + case WMI_ADD_TWT_STATUS_DENIED: + return "denied"; + case WMI_ADD_TWT_STATUS_UNKNOWN_ERROR: + fallthrough; + default: + return "unknown error"; + } +} + +int ath12k_wmi_dbglog_cfg(struct ath12k *ar, u32 param, u64 value) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_dbglog_config_cmd_fixed_param *cmd; + struct sk_buff *skb; + struct wmi_tlv *tlv; + u32 module_id_bitmap; + int ret, len; + + len = sizeof(*cmd) + TLV_HDR_SIZE + sizeof(module_id_bitmap); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + cmd = (struct wmi_dbglog_config_cmd_fixed_param *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_DEBUG_LOG_CONFIG_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->dbg_log_param = param; + + tlv = (struct wmi_tlv *)((u8 *) cmd + sizeof(*cmd)); + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | + FIELD_PREP(WMI_TLV_LEN, sizeof(u32)); + + switch (param) { + case WMI_DEBUG_LOG_PARAM_LOG_LEVEL: + case WMI_DEBUG_LOG_PARAM_VDEV_ENABLE: + case WMI_DEBUG_LOG_PARAM_VDEV_DISABLE: + case WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP: + cmd->value = value; + break; + case WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP: + case WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP: + cmd->value = value; + module_id_bitmap = value >> 32; + memcpy(tlv->value, &module_id_bitmap, sizeof(module_id_bitmap)); + break; + default: + dev_kfree_skb(skb); + return -EINVAL; + } + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_DBGLOG_CFG_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_DBGLOG_CFG_CMDID\n"); + dev_kfree_skb(skb); + } + return ret; +} + +static void ath12k_wmi_twt_add_dialog_event(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const void **tb; + const struct wmi_twt_add_dialog_event *ev; + int ret; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, + "failed to parse wmi twt add dialog status event tlv: %d\n", + ret); + return; + } + + ev = tb[WMI_TAG_TWT_ADD_DIALOG_COMPLETE_EVENT]; + if (!ev) { + ath12k_warn(ab, "failed to fetch twt add dialog wmi event\n"); + goto exit; + } + + if (ev->status) + ath12k_warn(ab, + "wmi add twt dialog event vdev %d dialog id %d status %s\n", + ev->vdev_id, ev->dialog_id, + ath12k_wmi_twt_add_dialog_event_status(ev->status)); + +exit: + kfree(tb); +} + +static void +ath12k_wmi_obss_color_collision_event(struct ath12k_base *ab, struct sk_buff *skb) +{ + const void **tb; + const struct wmi_obss_color_collision_event *ev; + struct ath12k_link_vif *arvif; + struct ath12k *ar; + int ret; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse tlv: %d\n", ret); + return; + } + + rcu_read_lock(); + ev = tb[WMI_TAG_OBSS_COLOR_COLLISION_EVT]; + if (!ev) { + ath12k_warn(ab, "failed to fetch obss color collision ev"); + goto unlock; + } + + arvif = ath12k_mac_get_arvif_by_vdev_id(ab, ev->vdev_id); + if (!arvif) + { + ath12k_warn(ab, "failed to find arvif with vedv id %d in obss_color_collision_event\n", + ev->vdev_id); + goto unlock; + } + + switch (ev->evt_type) { + case WMI_BSS_COLOR_COLLISION_DETECTION: + ar = arvif->ar; + arvif->obss_color_bitmap = ev->obss_color_bitmap; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "OBSS color collision detected vdev:%d, event:%d, bitmap:%08llx\n", + ev->vdev_id, ev->evt_type, ev->obss_color_bitmap); + rcu_read_unlock(); + ieee80211_queue_work(ar->ah->hw, &arvif->update_obss_color_notify_work); + goto exit; + case WMI_BSS_COLOR_COLLISION_DISABLE: + case WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY: + case WMI_BSS_COLOR_FREE_SLOT_AVAILABLE: + goto exit; + default: + ath12k_warn(ab, "received unknown obss color collision detetction event\n"); + goto exit; + } + +unlock: + rcu_read_unlock(); +exit: + kfree(tb); +} + +static void ath12k_process_ocac_complete_event(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const void **tb; + const struct wmi_vdev_adfs_ocac_complete_event_fixed_param *ev; + struct ath12k *ar; + int ret; + + tb = ath12k_wmi_tlv_parse_alloc(ab, skb->data, skb->len, GFP_ATOMIC); + if (IS_ERR(tb)) { + ret = PTR_ERR(tb); + ath12k_warn(ab, "failed to parse tlv: %d\n", ret); + return; + } + + ev = tb[WMI_TAG_VDEV_ADFS_OCAC_COMPLETE_EVENT]; + + if (!ev) { + ath12k_warn(ab, "failed to fetch ocac completed ev"); + kfree(tb); + return; + } + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "pdev dfs ocac complete event on pdev %d, chan freq %d," + "chan_width %d, status %d freq %d, freq1 %d, freq2 %d", + ev->vdev_id, ev->chan_freq, ev->chan_width, + ev->status, ev->center_freq, ev->center_freq1, + ev->center_freq2); + + ar = ath12k_mac_get_ar_by_vdev_id(ab, ev->vdev_id); + + if (!ar) { + ath12k_warn(ab, "OCAC complete event in invalid vdev %d\n", + ev->vdev_id); + goto exit; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI,"aDFS ocac complete event in vdev %d\n", + ev->vdev_id); + + if (ev->status) { + ath12k_mac_background_dfs_event(ar, ATH12K_BGDFS_ABORT); + } else { + memset(&ar->agile_chandef, 0, sizeof(struct cfg80211_chan_def)); + ar->agile_chandef.chan = NULL; + } +exit: + kfree(tb); +} + +static int ath12k_wmi_pdev_sscan_fft_bin_index_parse(struct ath12k_base *soc, + u16 tag, u16 len, + const void *ptr, void *data) +{ + if (tag != WMI_TAG_PDEV_SSCAN_FFT_BIN_INDEX) + return -EPROTO; + return 0; +} + +static int ath12k_wmi_pdev_sscan_per_detector_info_parse(struct ath12k_base *soc, + u16 tag, u16 len, + const void *ptr, void *data) +{ + if (tag != WMI_TAG_PDEV_SSCAN_PER_DETECTOR_INFO) + return -EPROTO; + + return 0; +} + +static int ath12k_wmi_tlv_sscan_fw_parse(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_pdev_sscan_fw_param_parse *parse = data; + int ret; + + switch (tag) { + + case WMI_TAG_PDEV_SSCAN_FW_CMD_FIXED_PARAM: + memcpy(&parse->fixed, ptr, + sizeof(struct ath12k_wmi_pdev_sscan_fw_cmd_fixed_param)); + parse->fixed.pdev_id = DP_HW2SW_MACID(parse->fixed.pdev_id); + break; + case WMI_TAG_ARRAY_STRUCT: + if (!parse->bin_entry_done) { + parse->bin = (struct ath12k_wmi_pdev_sscan_fft_bin_index *)ptr; + + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_pdev_sscan_fft_bin_index_parse, + parse); + + if (ret) { + ath12k_warn(ab, "failed to parse fft bin index %d\n", + ret); + return ret; + } + + parse->bin_entry_done = true; + } else if (!parse->det_info_entry_done) { + parse->det_info = (struct ath12k_wmi_pdev_sscan_per_detector_info *)ptr; + + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_pdev_sscan_per_detector_info_parse, + parse); + + if (ret) { + ath12k_warn(ab, "failed to parse detector info %d\n", + ret); + return ret; + } + parse->det_info_entry_done = true; + } + break; + case WMI_TAG_PDEV_SSCAN_CHAN_INFO: + memcpy(&parse->ch_info, ptr, + sizeof(struct ath12k_wmi_pdev_sscan_chan_info)); + parse->bin_entry_done = true; + break; + default: + break; + } + return 0; + +} + +static void +ath12k_wmi_pdev_sscan_fw_param_event(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct ath12k *ar; + struct wmi_pdev_sscan_fw_param_parse parse = { }; + struct wmi_pdev_sscan_fw_param_event param; + int ret; + u8 pdev_idx; + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_tlv_sscan_fw_parse, + &parse); + + if (ret) { + ath12k_warn(ab, "failed to parse padev sscan fw tlv %d\n", ret); + return; + } + + param.fixed = parse.fixed; + param.bin = parse.bin; + param.ch_info = parse.ch_info; + param.det_info = parse.det_info; + + pdev_idx = param.fixed.pdev_id; + ar = ab->pdevs[pdev_idx].ar; + +#ifdef CONFIG_ATH12K_SPECTRAL + ar->spectral.ch_width = param.ch_info.operating_bw; +#endif + +} + +static int +ath12k_wmi_spectral_scan_bw_cap_parse(struct ath12k_base *soc, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_spectral_capabilities_parse *parse = data; + if (tag != WMI_TAG_SPECTRAL_SCAN_BW_CAPABILITIES) + return -EPROTO; + parse->num_bw_caps_entry++; + return 0; +} + +static int +ath12k_wmi_spectral_fft_size_cap_parse(struct ath12k_base *soc, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_spectral_capabilities_parse *parse = data; + if (tag != WMI_TAG_SPECTRAL_FFT_SIZE_CAPABILITIES) + return -EPROTO; + + parse->num_fft_size_caps_entry++; + return 0; +} + +static int +ath12k_wmi_tlv_spectral_cap_parse(struct ath12k_base *ab, + u16 tag, u16 len, + const void *ptr, void *data) +{ + struct wmi_spectral_capabilities_parse *parse = data; + int ret; + + if (tag == WMI_TAG_ARRAY_STRUCT) { + if (!parse->sscan_bw_caps_entry_done) { + parse->num_bw_caps_entry = 0; + parse->sscan_bw_caps = (struct ath12k_wmi_spectral_scan_bw_capabilities *)ptr; + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_spectral_scan_bw_cap_parse, + parse); + if (ret) { + ath12k_warn(ab, "failed to parse scan bw cap %d\n", + ret); + return ret; + } + parse->sscan_bw_caps_entry_done = true; + } else if (!parse->fft_size_caps_entry_done) { + parse->num_fft_size_caps_entry = 0; + parse->fft_size_caps = (struct ath12k_wmi_spectral_fft_size_capabilities *)ptr; + ret = ath12k_wmi_tlv_iter(ab, ptr, len, + ath12k_wmi_spectral_fft_size_cap_parse, + parse); + if (ret) { + ath12k_warn(ab, "failed to parse fft size cap %d\n", + ret); + return ret; + } + parse->fft_size_caps_entry_done = true; + } + } + return 0; +} + +static void +ath12k_wmi_spectral_capabilities_event(struct ath12k_base *ab, + struct sk_buff *skb) +{ + struct wmi_spectral_capabilities_parse parse = { }; + struct wmi_spectral_capabilities_event param; + struct ath12k *ar = NULL; + int ret, size; + u8 pdev_id, i; + struct ath12k_pdev *pdev; + + ret = ath12k_wmi_tlv_iter(ab, skb->data, skb->len, + ath12k_wmi_tlv_spectral_cap_parse, + &parse); + if (ret) { + ath12k_warn(ab, "failed to parse spectral capabilities tlv %d\n", ret); + return; + } + + param.sscan_bw_caps = parse.sscan_bw_caps; + param.fft_size_caps = parse.fft_size_caps; + param.num_bw_caps_entry = parse.num_bw_caps_entry; + param.num_fft_size_caps_entry = parse.num_fft_size_caps_entry; + + pdev_id = param.sscan_bw_caps->pdev_id; + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + if (pdev && pdev->pdev_id == pdev_id) { + ar = pdev->ar; + break; + } + } + + if (!ar) { + ath12k_dbg(ab, ATH12K_DBG_WMI, + "ar is NULL for pdev_id %d use default spectral fft size 7", + pdev_id); + return; + } + size = sizeof(struct ath12k_wmi_spectral_fft_size_capabilities)* + param.num_fft_size_caps_entry; + +#ifdef CONFIG_ATH12K_SPECTRAL + ar->spectral.spectral_cap.fft_size_caps = kzalloc(size, GFP_ATOMIC); + if (!ar->spectral.spectral_cap.fft_size_caps) { + ath12k_warn(ab, "Failed to allocate memory"); + return; + } + memcpy(ar->spectral.spectral_cap.fft_size_caps, + param.fft_size_caps, size); + ar->spectral.spectral_cap.num_bw_caps_entry = param.num_bw_caps_entry; + ar->spectral.spectral_cap.num_fft_size_caps_entry = param.num_fft_size_caps_entry; +#endif + +} + +int ath12k_wmi_pdev_get_ani_level(struct ath12k *ar, u32 cmd_id, u8 pdev_id) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pdev_get_ani_level_cmd *cmd; + struct sk_buff *skb; + int ret; + enum wmi_tlv_tag tlv_tag; + + tlv_tag = WMI_TAG_PDEV_GET_ANI_OFDM_CONFIG_CMD; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_get_ani_level_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(tlv_tag, sizeof(*cmd)); + cmd->pdev_id = cpu_to_le32(pdev_id); + + ret = ath12k_wmi_cmd_send(wmi, skb, cmd_id); + if (ret) { + ath12k_warn(ar->ab, "failed to send WMI_PDEV_GET_ANI_CONFIG cmd\n"); + dev_kfree_skb(skb); + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "WMI_PDEV_GET_ANI_CONFIG cmdid %d for pdev_id: %d\n", + cmd_id, pdev_id); + return ret; +} + +static void ath12k_wmi_event_ani_ofdm_level(struct ath12k_base *ab, + struct sk_buff *skb) +{ + const struct wmi_pdev_ani_event *ev; + struct ath12k *ar; + u8 pdev_id; + bool pdev_id_valid; + + ev = (struct wmi_pdev_ani_event *)skb->data; + + pdev_id_valid = WMI_ANI_EVENT_PDEV_ID_VALID & le32_to_cpu(ev->pdev_id_bitmap); + if (!pdev_id_valid) { + ath12k_warn(ab, "WMI_PDEV_ANI_OFDM_LEVEL_EVENT is not supported\n"); + return; + } + + pdev_id = le32_get_bits(ev->pdev_id_bitmap, WMI_ANI_EVENT_PDEV_ID); + ar = ath12k_mac_get_ar_by_pdev_id(ab, pdev_id); + if (!ar) { + ath12k_warn(ab, "Invalid pdev_id received for ANI OFDM level\n"); + return; + } + + ar->ani_ofdm_level = le32_to_cpu(ev->ani_level); + complete(&ar->ani_ofdm_event); +} + static void ath12k_wmi_op_rx(struct ath12k_base *ab, struct sk_buff *skb) { struct wmi_cmd_hdr *cmd_hdr; @@ -6380,11 +14407,26 @@ case WMI_OFFLOAD_PROB_RESP_TX_STATUS_EVENTID: ath12k_probe_resp_tx_status_event(ab, skb); break; + case WMI_TWT_ADD_DIALOG_EVENTID: + ath12k_wmi_twt_add_dialog_event(ab, skb); + break; + case WMI_PDEV_SSCAN_FW_PARAM_EVENTID: + ath12k_wmi_pdev_sscan_fw_param_event(ab, skb); + break; + case WMI_SPECTRAL_CAPABILITIES_EVENTID: + ath12k_wmi_spectral_capabilities_event(ab, skb); + break; + case WMI_OFFCHAN_DATA_TX_COMPLETION_EVENTID: + ath12k_offchan_tx_completion_event(ab, skb); + break; /* add Unsupported events here */ case WMI_TBTTOFFSET_EXT_UPDATE_EVENTID: case WMI_PEER_OPER_MODE_CHANGE_EVENTID: case WMI_TWT_ENABLE_EVENTID: case WMI_TWT_DISABLE_EVENTID: + case WMI_TWT_DEL_DIALOG_EVENTID: + case WMI_TWT_PAUSE_DIALOG_EVENTID: + case WMI_TWT_RESUME_DIALOG_EVENTID: case WMI_PDEV_DMA_RING_CFG_RSP_EVENTID: ath12k_dbg(ab, ATH12K_DBG_WMI, "ignoring unsupported event 0x%x\n", id); @@ -6395,6 +14437,58 @@ case WMI_VDEV_DELETE_RESP_EVENTID: ath12k_vdev_delete_resp_event(ab, skb); break; + case WMI_DIAG_EVENTID: + ath12k_wmi_diag_event(ab, skb); + break; + case WMI_DCS_INTERFERENCE_EVENTID: + ath12k_wmi_dcs_awgn_interference_event(ab, skb); + break; + case WMI_PDEV_PKTLOG_DECODE_INFO_EVENTID: +#ifdef CONFIG_ATH12K_PKTLOG + ath12k_wmi_pktlog_decode_info(ab, skb); +#endif + break; + case WMI_CTRL_PATH_STATS_EVENTID: +#ifdef CONFIG_ATH12K_DEBUGFS + ath12k_wmi_ctrl_path_stats_event(ab, skb); +#endif + break; + case WMI_PDEV_RSSI_DBM_CONVERSION_PARAMS_INFO_EVENTID: + ath12k_wmi_rssi_dbm_conversion_param_info(ab, skb); + break; + case WMI_MUEDCA_PARAMS_CONFIG_EVENTID: + ath12k_wmi_pdev_update_muedca_params_status_event(ab, skb); + break; + case WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID: + ath12k_wmi_obss_color_collision_event(ab, skb); + break; + case WMI_PDEV_UTF_EVENTID: + if (test_bit(ATH12K_FLAG_FTM_SEGMENTED, &ab->dev_flags)) + ath12k_wmi_tm_event_segmented(ab, id, skb); + else + ath12k_tm_wmi_event_unsegmented(ab, id, skb); + break; + case WMI_STATS_CTRL_PATH_EVENTID: + ath12k_process_tpc_stats(ab, skb); + break; + case WMI_MLO_SETUP_COMPLETE_EVENTID: + ath12k_wmi_event_mlo_setup_complete(ab, skb); + break; + case WMI_MLO_TEARDOWN_COMPLETE_EVENTID: + ath12k_wmi_event_teardown_complete(ab, skb); + break; + case WMI_PDEV_MULTIPLE_VDEV_RESTART_RESP_EVENTID: + ath12k_wmi_event_mvr_response(ab, skb); + break; + case WMI_VDEV_ADFS_OCAC_COMPLETE_EVENTID: + ath12k_process_ocac_complete_event(ab, skb); + break; + case WMI_MGMT_RX_FW_CONSUMED_EVENTID: + ath12k_fw_consumed_mgmt_rx_event(ab, skb); + break; + case WMI_PDEV_ANI_OFDM_LEVEL_EVENTID: + ath12k_wmi_event_ani_ofdm_level(ab, skb); + break; /* TODO: Add remaining events */ default: ath12k_dbg(ab, ATH12K_DBG_WMI, "Unknown eventid: 0x%x\n", id); @@ -6433,6 +14527,7 @@ ab->wmi_ab.wmi_endpoint_id[pdev_idx] = conn_resp.eid; ab->wmi_ab.wmi[pdev_idx].eid = conn_resp.eid; ab->wmi_ab.max_msg_len[pdev_idx] = conn_resp.max_msg_len; + init_waitqueue_head(&ab->wmi_ab.wmi[pdev_idx].tx_ce_desc_wq); return 0; } @@ -6495,15 +14590,17 @@ return ret; } -int ath12k_wmi_simulate_radar(struct ath12k *ar) +int ath12k_wmi_simulate_radar(struct ath12k *ar, u32 radar_params) { - struct ath12k_vif *arvif; + struct ath12k_link_vif *arvif; + struct ath12k_vif *ahvif; u32 dfs_args[DFS_MAX_TEST_ARGS]; struct wmi_unit_test_cmd wmi_ut; bool arvif_found = false; list_for_each_entry(arvif, &ar->arvifs, list) { - if (arvif->is_started && arvif->vdev_type == WMI_VDEV_TYPE_AP) { + ahvif = arvif->ahvif; + if (arvif->is_started && ahvif->vdev_type == WMI_VDEV_TYPE_AP) { arvif_found = true; break; } @@ -6514,11 +14611,10 @@ dfs_args[DFS_TEST_CMDID] = 0; dfs_args[DFS_TEST_PDEV_ID] = ar->pdev->pdev_id; - /* Currently we could pass segment_id(b0 - b1), chirp(b2) - * freq offset (b3 - b10) to unit test. For simulation - * purpose this can be set to 0 which is valid. + /* Currently we pass segment_id(b0 - b1), chirp(b2) + * freq offset (b3 - b10), detector_id(b11 - b12) to unit test. */ - dfs_args[DFS_TEST_RADAR_PARAM] = 0; + dfs_args[DFS_TEST_RADAR_PARAM] = radar_params; wmi_ut.vdev_id = cpu_to_le32(arvif->vdev_id); wmi_ut.module_id = cpu_to_le32(DFS_UNIT_TEST_MODULE); @@ -6530,6 +14626,76 @@ return ath12k_wmi_send_unit_test_cmd(ar, wmi_ut, dfs_args); } +int ath12k_wmi_simulate_awgn(struct ath12k *ar, u32 chan_bw_interference_bitmap) +{ + struct ath12k_link_vif *arvif; + struct ath12k_vif *ahvif; + u32 awgn_args[WMI_AWGN_MAX_TEST_ARGS]; + struct wmi_unit_test_cmd wmi_ut; + bool arvif_found = false; + + if (!test_bit(WMI_TLV_SERVICE_DCS_AWGN_INT_SUPPORT, ar->ab->wmi_ab.svc_map)) { + ath12k_warn(ar->ab, "firmware doesn't support awgn interference, so can't simulate it\n"); + return -EOPNOTSUPP; + } + + list_for_each_entry(arvif, &ar->arvifs, list) { + ahvif = arvif->ahvif; + if (arvif->is_started && ahvif->vdev_type == WMI_VDEV_TYPE_AP) { + arvif_found = true; + break; + } + } + + if (!arvif_found) + return -EINVAL; + + awgn_args[WMI_AWGN_TEST_AWGN_INT] = WMI_UNIT_TEST_AWGN_INTF_TYPE; + awgn_args[WMI_AWGN_TEST_BITMAP] = chan_bw_interference_bitmap; + + wmi_ut.vdev_id = arvif->vdev_id; + wmi_ut.module_id = WMI_AWGN_UNIT_TEST_MODULE; + wmi_ut.num_args = WMI_AWGN_MAX_TEST_ARGS; + wmi_ut.diag_token = WMI_AWGN_UNIT_TEST_TOKEN; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "Triggering AWGN Simulation, interference bitmap : 0x%x\n", + chan_bw_interference_bitmap); + + return ath12k_wmi_send_unit_test_cmd(ar, wmi_ut, awgn_args); +} + +int ath12k_wmi_pdev_m3_dump_enable(struct ath12k *ar, u32 enable) +{ + struct ath12k_link_vif *arvif; + u32 m3_args[WMI_M3_MAX_TEST_ARGS]; + struct wmi_unit_test_cmd wmi_ut; + bool arvif_found = false; + + list_for_each_entry(arvif, &ar->arvifs, list) { + if (arvif->is_started) { + arvif_found = true; + break; + } + } + + if (!arvif_found) + return -EINVAL; + + m3_args[WMI_M3_TEST_CMDID] = WMI_DBG_ENABLE_M3_SSR; + m3_args[WMI_M3_TEST_ENABLE] = enable; + + wmi_ut.vdev_id = arvif->vdev_id; + wmi_ut.module_id = WMI_M3_UNIT_TEST_MODULE; + wmi_ut.num_args = WMI_M3_MAX_TEST_ARGS; + wmi_ut.diag_token = WMI_M3_UNIT_TEST_TOKEN; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "%s M3 SSR dump\n", + enable ? "Enabling" : "Disabling"); + + return ath12k_wmi_send_unit_test_cmd(ar, wmi_ut, m3_args); +} + int ath12k_wmi_connect(struct ath12k_base *ab) { u32 i; @@ -6554,14 +14720,14 @@ } int ath12k_wmi_pdev_attach(struct ath12k_base *ab, - u8 pdev_id) + u8 pdev_idx) { struct ath12k_wmi_pdev *wmi_handle; - if (pdev_id >= ab->hw_params->max_radios) + if (pdev_idx >= ab->hw_params->max_radios) return -EINVAL; - wmi_handle = &ab->wmi_ab.wmi[pdev_id]; + wmi_handle = &ab->wmi_ab.wmi[pdev_idx]; wmi_handle->wmi_ab = &ab->wmi_ab; @@ -6602,5 +14768,732 @@ for (i = 0; i < ab->htc.wmi_ep_count; i++) ath12k_wmi_pdev_detach(ab, i); + clear_bit(ATH12K_FLAG_WMI_INIT_DONE, &ab->dev_flags); ath12k_wmi_free_dbring_caps(ab); } + +int ath12k_wmi_pdev_ap_ps_cmd_send(struct ath12k *ar, u8 pdev_id, + u32 param_value) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pdev_ap_ps_cmd *cmd; + struct sk_buff *skb; + int ret; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_ap_ps_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, + WMI_TAG_PDEV_GREEN_AP_PS_ENABLE_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->pdev_id = pdev_id; + cmd->param_value = param_value; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PDEV_GREEN_AP_PS_ENABLE_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to send ap ps enable/disable cmd %d\n",ret); + dev_kfree_skb(skb); + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi pdev ap ps set pdev id %d value %d\n", + pdev_id, param_value); + + return ret; +} + +int ath12k_wmi_mlo_setup(struct ath12k *ar, + struct wmi_mlo_setup_params *mlo_params) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_mlo_setup_cmd_fixed_param *cmd; + struct sk_buff *skb; + struct wmi_tlv *tlv; + u32 *plinks; + u32 num_links; + int i, ret, len; + + num_links = mlo_params->num_partner_links; + + len = sizeof(*cmd) + TLV_HDR_SIZE + (num_links * sizeof(u32)); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_mlo_setup_cmd_fixed_param *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_SETUP_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->mld_group_id = mlo_params->group_id; + cmd->pdev_id = ar->pdev->pdev_id; + + tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); + tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_UINT32) | + FIELD_PREP(WMI_TLV_LEN, num_links); + + plinks = (u32 *)tlv->value; + for (i = 0; i < num_links; i++) + plinks[i] = mlo_params->partner_link_id[i]; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MLO_SETUP_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to submit WMI_MLO_SETUP_CMDID cmd\n"); + dev_kfree_skb(skb); + } + + return ret; +} + +int ath12k_wmi_mlo_ready(struct ath12k *ar) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_mlo_ready_cmd_fixed_param *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_mlo_ready_cmd_fixed_param *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_READY_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MLO_READY_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to submit WMI_MLO_READY_CMDID cmd\n"); + dev_kfree_skb(skb); + } + + return ret; +} + +int ath12k_wmi_mlo_teardown(struct ath12k *ar, bool umac_reset) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_mlo_teardown_fixed_param *cmd; + struct sk_buff *skb; + int ret, len; + + len = sizeof(*cmd); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_mlo_teardown_fixed_param *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_MLO_TEARDOWN_CMD) | + FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); + cmd->pdev_id = ar->pdev->pdev_id; + cmd->reason_code = WMI_MLO_TEARDOWN_SSR_REASON; + cmd->umac_reset = umac_reset; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_MLO_TEARDOWN_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to submit WMI MLO teardown cmd\n"); + dev_kfree_skb(skb); + } + + ar->mlo_complete_event = false; + return ret; +} + +bool ath12k_wmi_is_mvr_supported(struct ath12k_base *ab) +{ + struct ath12k_wmi_base *wmi_ab = &ab->wmi_ab; + + return test_bit(WMI_TLV_SERVICE_MULTIPLE_VDEV_RESTART, + wmi_ab->svc_map) && + test_bit(WMI_TLV_SERVICE_MULTIPLE_VDEV_RESTART_RESPONSE_SUPPORT, + wmi_ab->svc_map); +} + +int ath12k_wmi_pdev_multiple_vdev_restart(struct ath12k *ar, + struct wmi_pdev_multiple_vdev_restart_req_arg *arg) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_pdev_multiple_vdev_restart_request_cmd *cmd; + struct ath12k_wmi_channel_params *chan; + struct wmi_tlv *tlv; + struct ath12k_wmi_channel_params *chan_device; + u32 num_vdev_ids; + __le32 *vdev_ids; + size_t vdev_ids_len; + struct sk_buff *skb; + void *ptr; + int ret, len, i; + bool device_params_present = false; + + if (WARN_ON(arg->vdev_ids.id_len > TARGET_NUM_VDEVS)) + return -EINVAL; + + num_vdev_ids = arg->vdev_ids.id_len; + vdev_ids_len = num_vdev_ids * sizeof(__le32); + + len = sizeof(*cmd) + TLV_HDR_SIZE + vdev_ids_len + + sizeof(*chan) + TLV_HDR_SIZE + TLV_HDR_SIZE + + TLV_HDR_SIZE; + + device_params_present = ath12k_wmi_check_device_present(arg->width_device, + arg->center_freq_device, + arg->channel.band_center_freq1); + + if (device_params_present) + len += TLV_HDR_SIZE + sizeof(*chan_device); + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_pdev_multiple_vdev_restart_request_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMD, + sizeof(*cmd)); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + cmd->num_vdevs = cpu_to_le32(arg->vdev_ids.id_len); + + if (device_params_present) { + arg->ru_punct_bitmap = + ath12k_wmi_set_ru_punc_bitmap_device(arg->channel.freq, arg->width_device, + arg->center_freq_device, + arg->ru_punct_bitmap); + } + cmd->puncture_20mhz_bitmap = cpu_to_le32(arg->ru_punct_bitmap); + + cmd->flags = cpu_to_le32(WMI_MVR_RESPONSE_SUPPORT_EXPECTED); + + ptr = skb->data + sizeof(*cmd); + tlv = (struct wmi_tlv *)ptr; + + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, vdev_ids_len); + vdev_ids = (__le32 *)tlv->value; + + for (i = 0; i < num_vdev_ids; i++) + vdev_ids[i] = cpu_to_le32(arg->vdev_ids.id[i]); + + ptr += TLV_HDR_SIZE + vdev_ids_len; + chan = (struct ath12k_wmi_channel_params *)ptr; + + ath12k_wmi_put_wmi_channel(chan, arg->channel); + + chan->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_CHANNEL, sizeof(*chan)); + ptr += sizeof(*chan); + + /* Zero length TLVs for phymode_list, preferred_tx_stream_list + * and preferred_rx_stream_list which are mandatory if any of + * the following TLVs are to be sent to target. + */ + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0); + ptr += sizeof(*tlv); + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0); + ptr += sizeof(*tlv); + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_UINT32, 0); + ptr += sizeof(*tlv); + + if (device_params_present) { + tlv = ptr; + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, + sizeof(*chan_device)); + ptr += TLV_HDR_SIZE; + chan_device = ptr; + ath12k_wmi_set_wmi_channel_device(chan_device, &arg->channel, + arg->center_freq_device, + arg->width_device); + ptr += sizeof(*chan_device); + } + + ret = ath12k_wmi_cmd_send(wmi, skb, + WMI_PDEV_MULTIPLE_VDEV_RESTART_REQUEST_CMDID); + if (ret) { + ath12k_warn(ar->ab, "wmi failed to send mvr command (%d)\n", + ret); + dev_kfree_skb(skb); + return ret; + } + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi mvr cmd sent num_vdevs %d freq %d\n", + num_vdev_ids, arg->channel.freq); + + return ret; +} + +int ath12k_wmi_vdev_adfs_ch_cfg_cmd_send(struct ath12k *ar, + u32 vdev_id, + struct cfg80211_chan_def *def) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_vdev_adfs_ch_cfg_cmd *cmd; + struct sk_buff *skb; + int ret = 0; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_vdev_adfs_ch_cfg_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_ADFS_CH_CFG_CMD) | + FIELD_PREP(WMI_TLV_LEN, + sizeof(struct wmi_vdev_adfs_ch_cfg_cmd) - TLV_HDR_SIZE); + cmd->vdev_id = vdev_id; + + if (ar->ab->dfs_region == ATH12K_DFS_REG_ETSI) { + cmd->ocac_mode = WMI_ADFS_MODE_QUICK_OCAC; + cmd->min_duration_ms = cfg80211_chandef_dfs_cac_time(ar->ah->hw->wiphy, + def /*, + true, false */); + + + if (cmd->min_duration_ms == MIN_WEATHER_RADAR_CHAN_PRECAC_TIMEOUT) + cmd->max_duration_ms = MAX_WEATHER_RADAR_CHAN_PRECAC_TIMEOUT; + else + cmd->max_duration_ms = MAX_PRECAC_TIMEOUT; + } else if (ar->ab->dfs_region == ATH12K_DFS_REG_FCC) { + cmd->ocac_mode = WMI_ADFS_MODE_QUICK_RCAC; + cmd->min_duration_ms = MIN_RCAC_TIMEOUT; + cmd->max_duration_ms = MAX_RCAC_TIMEOUT; + } + + cmd->chan_freq = def->chan->center_freq; + cmd->chan_width = ath12k_wmi_get_host_chan_width(def->width); + cmd->center_freq1 = def->center_freq1; + cmd->center_freq2 = def->center_freq2; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "Send adfs channel cfg command for vdev id %d " + "mode as %d min duration %d chan_freq %d chan_width %d\n" + "center_freq1 %d center_freq2 %d", cmd->vdev_id, + cmd->ocac_mode, cmd->min_duration_ms, cmd->chan_freq, + cmd->chan_width, cmd->center_freq1, cmd->center_freq2); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_ADFS_CH_CFG_CMDID); + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_VDEV_ADFS_CH_CFG_CMDID\n"); + dev_kfree_skb(skb); + } + + return ret; +} + +int ath12k_wmi_vdev_adfs_ocac_abort_cmd_send(struct ath12k *ar, u32 vdev_id) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_vdev_adfs_ocac_abort_cmd *cmd; + struct sk_buff *skb; + int ret = 0; + + if (!ar->agile_chandef.chan) { + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "Currently, agile CAC is not active on any channel." + "Ignore abort"); + return ret; + } + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, sizeof(*cmd)); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_vdev_adfs_ocac_abort_cmd *)skb->data; + cmd->tlv_header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_VDEV_ADFS_OCAC_ABORT_CMD) | + FIELD_PREP(WMI_TLV_LEN, + sizeof(struct wmi_vdev_adfs_ocac_abort_cmd) - TLV_HDR_SIZE); + + cmd->vdev_id = vdev_id; + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_VDEV_ADFS_OCAC_ABORT_CMDID); + + if (ret) { + ath12k_warn(ar->ab, + "failed to send WMI_VDEV_ADFS_ABORT_CMD\n"); + dev_kfree_skb(skb); + return ret; + } + return ret; +} + +#ifdef CONFIG_ATH12K_SAWF + +int ath12k_wmi_svc_config_send(struct ath12k *ar, struct ath12k_sawf_svc_params *param) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_sawf_svc_cfg_cmd_fixed_param *cmd; + struct sk_buff *skb; + int len, ret; + + len = sizeof(*cmd); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_sawf_svc_cfg_cmd_fixed_param *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SAWF_SERVICE_CLASS_CFG_CMD_FIXED_PARAM, + sizeof(*cmd)); + + /* Valid svc_id advertized to user is in the range of 1 to 128. + * However, firmware is maintaining svc_id range from 0 to 127. + * So sending svc_id - 1, to address this firmware limitation. + */ + cmd->svc_class_id = cpu_to_le32(param->svc_id - 1); + cmd->min_thruput_kbps = cpu_to_le32(param->min_throughput_rate); + cmd->max_thruput_kbps = cpu_to_le32(param->max_throughput_rate); + cmd->burst_size_bytes = cpu_to_le32(param->burst_size); + cmd->svc_interval_ms = cpu_to_le32(param->service_interval); + cmd->delay_bound_ms = cpu_to_le32(param->delay_bound); + cmd->time_to_live_ms = cpu_to_le32(param->msdu_ttl); + cmd->priority = cpu_to_le32(param->priority); + cmd->tid = cpu_to_le32(param->tid); + cmd->msdu_loss_rate_ppm = cpu_to_le32(param->msdu_rate_loss); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "Service class configure: svc_id: %u, min_throughput: %u, " + "max_throughput: %u, burst_size: %u, svc_interval: %u, " + "delay_bound: %u, TTL: %u, priority: %u, tid: %u, msdu_loss_rate: %u", + cmd->svc_class_id, cmd->min_thruput_kbps, cmd->max_thruput_kbps, + cmd->burst_size_bytes, cmd->svc_interval_ms, cmd->delay_bound_ms, + cmd->time_to_live_ms, cmd->priority, cmd->tid, + cmd->msdu_loss_rate_ppm); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_SAWF_SERVICE_CLASS_CFG_CMDID); + if (ret) { + ath12k_err(ar->ab, + "failed to config/reconfig the service class param\n"); + dev_kfree_skb(skb); + } + + return ret; +} + +int ath12k_wmi_svc_send_disable(struct ath12k *ar, u32 svc_id) +{ + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_sawf_svc_disable_cmd_fixed_param *cmd; + struct sk_buff *skb; + int len, ret; + + len = sizeof(*cmd); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_sawf_svc_disable_cmd_fixed_param *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_SAWF_SERVICE_CLASS_DISABLE_CMD_FIXED_PARAM, + sizeof(*cmd)); + + /* Valid svc_id advertized to user is in the range of 1 to 128. + * However, firmware is maintaining svc_id range from 0 to 127. + * So sending svc_id - 1, to address this firmware limitation. + */ + cmd->svc_class_id = cpu_to_le32(svc_id - 1); + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, "Service class disable: svc_id: %u", + cmd->svc_class_id); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_SAWF_SERVICE_CLASS_DISABLE_CMDID); + if (ret) { + ath12k_err(ar->ab, + "failed to disable service class: %u\n", svc_id); + dev_kfree_skb(skb); + } + + return ret; +} + +#endif /* CONFIG_ATH12K_SAWF */ + +static void ath12k_wmi_put_peer_list(struct ath12k_base *ab, + struct wmi_chan_width_peer_list *peer_list, + struct wmi_chan_width_peer_arg *peer_arg, + u32 num_peers, int start_idx) +{ + struct wmi_chan_width_peer_list *itr; + struct wmi_chan_width_peer_arg *arg_itr; + int i; + u32 host_chan_width; + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi peer channel width switch command peer list\n"); + + for (i = 0; i < num_peers; i++) { + itr = &peer_list[i]; + arg_itr = &peer_arg[start_idx + i]; + + itr->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_CHAN_WIDTH_PEER_LIST, + sizeof(*itr)); + ether_addr_copy(itr->mac_addr.addr, arg_itr->mac_addr.addr); + host_chan_width = ath12k_wmi_get_host_chan_switch_width(arg_itr->chan_width); + itr->chan_width = cpu_to_le32(host_chan_width); + itr->puncture_20mhz_bitmap = cpu_to_le32(arg_itr->puncture_20mhz_bitmap); + + ath12k_dbg(ab, ATH12K_DBG_WMI, + " (%u) width %u addr %pM punct_bitmap 0x%x host chan_width: %d\n", + i + 1, arg_itr->chan_width, arg_itr->mac_addr.addr, + arg_itr->puncture_20mhz_bitmap, host_chan_width); + } +} + +static int ath12k_wmi_peer_chan_width_switch(struct ath12k *ar, + struct wmi_peer_chan_width_switch_arg *arg) +{ + struct ath12k_base *ab = ar->ab; + struct ath12k_wmi_pdev *wmi = ar->wmi; + struct wmi_peer_chan_width_switch_req_cmd *cmd; + struct wmi_chan_width_peer_list *peer_list; + struct wmi_tlv *tlv; + u32 num_peers; + size_t peer_list_len; + struct sk_buff *skb; + void *ptr; + int ret, len; + + num_peers = arg->num_peers; + + if (WARN_ON(num_peers > ab->chwidth_num_peer_caps)) + return -EINVAL; + + peer_list_len = num_peers * sizeof(*peer_list); + + len = sizeof(*cmd) + TLV_HDR_SIZE + peer_list_len; + + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) + return -ENOMEM; + + cmd = (struct wmi_peer_chan_width_switch_req_cmd *)skb->data; + cmd->tlv_header = ath12k_wmi_tlv_cmd_hdr(WMI_TAG_PEER_CHAN_WIDTH_SWITCH_CMD, + sizeof(*cmd)); + cmd->num_peers = cpu_to_le32(num_peers); + cmd->vdev_var = cpu_to_le32(arg->vdev_var); + + ptr = skb->data + sizeof(*cmd); + tlv = (struct wmi_tlv *)ptr; + + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, peer_list_len); + peer_list = (struct wmi_chan_width_peer_list *)tlv->value; + + ath12k_wmi_put_peer_list(ab, peer_list, arg->peer_arg, num_peers, + arg->start_idx); + + ptr += peer_list_len; + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_CHAN_WIDTH_SWITCH_CMDID); + if (ret) { + ath12k_warn(ab, "wmi failed to send peer chan width switch command (%d)\n", + ret); + dev_kfree_skb(skb); + return ret; + } + + ath12k_dbg(ab, ATH12K_DBG_WMI, + "wmi peer chan width switch cmd sent num_peers %d \n", + num_peers); + + return ret; +} + +void ath12k_wmi_set_peers_chan_width(struct ath12k_link_vif *arvif, + struct wmi_chan_width_peer_arg *peer_arg, + int num, u8 start_idx) +{ + struct ath12k *ar = arvif->ar; + struct wmi_chan_width_peer_arg *arg; + int i, err; + + for (i = 0; i < num; i++) { + arg = &peer_arg[start_idx + i]; + + /* for bandwidth upgrade phymode should be set already. Safe to + * to directly set channel width + */ + err = ath12k_wmi_set_peer_param(ar, arg->mac_addr.addr, + arvif->vdev_id, WMI_PEER_CHWIDTH, + arg->chan_width); + if (err) { + ath12k_warn(ar->ab, "failed to update STA %pM peer bw %d: %d\n", + arg->mac_addr.addr, arg->chan_width, err); + continue; + } + + /* for bandwidth downgrade, phymode should be set after setting + * channel width + */ + if (!arg->is_upgrade) { + err = ath12k_wmi_set_peer_param(ar, arg->mac_addr.addr, + arvif->vdev_id, WMI_PEER_PHYMODE, + arg->peer_phymode); + if (err) + ath12k_warn(ar->ab, "failed to update STA %pM peer phymode %d: %d\n", + arg->mac_addr.addr, arg->peer_phymode, err); + } + } +} + +void ath12k_wmi_peer_chan_width_switch_work(struct work_struct *work) +{ + struct ath12k_link_vif *arvif = container_of(work, struct ath12k_link_vif, + peer_ch_width_switch_work); + struct ath12k *ar = arvif->ar; + struct ath12k_peer_ch_width_switch_data *data; + struct wmi_peer_chan_width_switch_arg arg; + struct wmi_chan_width_peer_arg *peer_arg; + unsigned long time_left = 0; + int count_left, curr_count, max_count_per_cmd = ar->ab->chwidth_num_peer_caps; + int cmd_num = 0, ret, i; + + mutex_lock(&ar->conf_mutex); + + /* possible that the worker got scheduled after complete was triggered. In + * this case we don't wait for timeout */ + if (arvif->peer_ch_width_switch_data->count == arvif->num_stations) + goto send_cmd; + + mutex_unlock(&ar->conf_mutex); + + time_left = wait_for_completion_timeout(&arvif->peer_ch_width_switch_send, + ATH12K_PEER_CH_WIDTH_SWITCH_TIMEOUT_HZ); + if (time_left == 0) { + /* Even though timeout occured, we would send the command for the peers + * for which we received sta rc update event, hence not returning */ + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "timed out waiting for all peers in peer channel width switch\n"); + } + + mutex_lock(&ar->conf_mutex); + +send_cmd: + + data = arvif->peer_ch_width_switch_data; + + spin_lock_bh(&ar->data_lock); + arg.vdev_var = arvif->vdev_id; + spin_unlock_bh(&ar->data_lock); + + arg.vdev_var |= ATH12K_PEER_VALID_VDEV_ID | ATH12K_PEER_PUNCT_BITMAP_VALID; + arg.peer_arg = data->peer_arg; + + count_left = data->count; + + while (count_left > 0) { + if (count_left <= max_count_per_cmd) + curr_count = count_left; + else + curr_count = max_count_per_cmd; + + count_left -= curr_count; + + cmd_num++; + + arg.num_peers = curr_count; + arg.start_idx = (cmd_num - 1) * max_count_per_cmd; + + ath12k_dbg(ar->ab, ATH12K_DBG_WMI, + "wmi peer channel width switch command num %u\n", + cmd_num); + + ret = ath12k_wmi_peer_chan_width_switch(ar, &arg); + if (ret) { + /* fallback */ + ath12k_wmi_set_peers_chan_width(arvif, arg.peer_arg, arg.num_peers, + arg.start_idx); + } + } + + for (i = 0; i < data->count; i++) { + peer_arg = &data->peer_arg[i]; + + /* for bandwidth upgrade phymode is set from worker scheduler */ + if (peer_arg->is_upgrade) + continue; + + /* for bandwidth downgrade phymode needs to be set */ + ret = ath12k_wmi_set_peer_param(ar, peer_arg->mac_addr.addr, + arvif->vdev_id, WMI_PEER_PHYMODE, + peer_arg->peer_phymode); + if (ret) + ath12k_warn(ar->ab, "failed to update STA %pM peer phymode %d: %d\n", + peer_arg->mac_addr.addr, peer_arg->peer_phymode, ret); + } + + kfree(arvif->peer_ch_width_switch_data); + arvif->peer_ch_width_switch_data = NULL; + mutex_unlock(&ar->conf_mutex); +} + +int ath12k_wmi_set_latency(struct ath12k *ar, struct ath12k_latency_params *params) +{ + struct sk_buff *skb; + struct wmi_tlv *tlv; + struct ath12k_wmi_pdev *wmi; + struct wmi_peer_tid_latency_cmd *cmd; + struct wmi_tid_latency_params *tid_lat; + void *data; + int len, ret, num_peer = 1, sawf_ul_param = 1; + u8 dl_enable, ul_enable; + + wmi = ar->wmi; + len = sizeof(*cmd) + TLV_HDR_SIZE + (num_peer * sizeof(*tid_lat)); + skb = ath12k_wmi_alloc_skb(wmi->wmi_ab, len); + if (!skb) { + ath12k_warn(ar->ab, "Memory is not available\n"); + return -ENOMEM; + } + + if (params->direction == WMI_LATENCY_DIR_UL) { + ul_enable = 1; + dl_enable = 0; + } else if (params->direction == WMI_LATENCY_DIR_DL) { + ul_enable = 0; + dl_enable = 1; + } else { + ath12k_warn(ar->ab, "Direct link is not supported\n"); + dev_kfree_skb(skb); + return -EINVAL; + } + + data = skb->data; + cmd = data; + cmd->tlv_header = ath12k_wmi_tlv_hdr(WMI_TAG_PEER_TID_LATENCY_CONFIG_FIXED_PARAM, + (sizeof(*cmd) - TLV_HDR_SIZE)); + cmd->pdev_id = cpu_to_le32(ar->pdev->pdev_id); + + data += sizeof(*cmd); + tlv = data; + len = sizeof(*tid_lat) * num_peer; + + tlv->header = ath12k_wmi_tlv_hdr(WMI_TAG_ARRAY_STRUCT, len); + + data += TLV_HDR_SIZE; + tid_lat = data; + + tid_lat->tlv_header = ath12k_wmi_tlv_hdr(WMI_TAG_TID_LATENCY_INFO, + (sizeof(*tid_lat) - TLV_HDR_SIZE)); + + tid_lat->service_interval = cpu_to_le32(params->service_interval); + tid_lat->burst_size_diff = cpu_to_le32(params->burst_size); + tid_lat->max_latency = cpu_to_le32(params->delay_bound); + tid_lat->min_tput = cpu_to_le32(params->min_data_rate); + + ether_addr_copy(tid_lat->destmac.addr, params->peer_mac); + + tid_lat->latency_tid_info = + le32_encode_bits(params->user_priority, WMI_LATENCY_TID_INFO_SCS_TID_NUM) | + le32_encode_bits(params->ac, WMI_LATENCY_TID_INFO_SCS_AC) | + le32_encode_bits(dl_enable, WMI_LATENCY_TID_INFO_SCS_DL_EN) | + le32_encode_bits(ul_enable, WMI_LATENCY_TID_INFO_SCS_UL_EN) | + le32_encode_bits(params->req_type, WMI_LATENCY_TID_INFO_SCS_BURST_SZ_SUM) | + le32_encode_bits(sawf_ul_param, WMI_LATENCY_TID_INFO_SCS_SAWF_UL_PARAM); + + ret = ath12k_wmi_cmd_send(wmi, skb, WMI_PEER_TID_LATENCY_CONFIG_CMDID); + if (ret) { + ath12k_warn(ar->ab, "failed to submit WMI_PEER_TID_LATENCY_CONFIG_CMDID cmd %d\n", + ret); + dev_kfree_skb(skb); + } + return ret; +} diff -ruw linux-6.4/drivers/net/wireless/ath/ath12k/wmi.h linux-6.4-fbx/drivers/net/wireless/ath/ath12k/wmi.h --- linux-6.4/drivers/net/wireless/ath/ath12k/wmi.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath12k/wmi.h 2024-04-22 13:40:50.307869293 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH12K_WMI_H @@ -24,6 +24,12 @@ struct ath12k_base; struct ath12k; +struct ath12k_fw_stats; +struct ath12k_reg_tpc_power_info; +struct ath12k_sawf_svc_params; +struct ath12k_latency_params; + +#define PSOC_HOST_MAX_NUM_SS (8) /* There is no signed version of __le32, so for a temporary solution come * up with our own version. The idea is from fs/ntfs/endian.h. @@ -72,6 +78,31 @@ u8 value[]; } __packed; +struct wmi_vdev_ch_power_info { + u32 tlv_header; + u32 chan_cfreq; /* Channel center frequency (MHz) */ + /* Unit: dBm, either PSD/EIRP power for this frequency or + * incremental for non-PSD BW + */ + u32 tx_power; +} __packed; + +struct wmi_vdev_set_tpc_power_cmd { + u32 tlv_header; + u32 vdev_id; + u32 psd_power; /* Value: 0 or 1, is PSD power or not */ + u32 eirp_power; /* Maximum EIRP power (dBm units), valid only if power is PSD */ + u32 power_type_6ghz; /* Type: WMI_6GHZ_REG_TYPE, used for halphy CTL lookup */ + /* This fixed_param TLV is followed by the below TLVs: + * num_pwr_levels of wmi_vdev_ch_power_info + * For non-psd power, the power values are for 20, 40, and till + * BSS BW power levels. + * The num_pwr_levels will be checked by sw how many elements present + * in the variable-length array. + */ +} __packed; + + #define WMI_TLV_LEN GENMASK(15, 0) #define WMI_TLV_TAG GENMASK(31, 16) #define TLV_HDR_SIZE sizeof_field(struct wmi_tlv, header) @@ -175,6 +206,58 @@ #define WMI_APPEND_TO_EXISTING_CHAN_LIST_FLAG 1 #define WMI_BA_MODE_BUFFER_SIZE_256 3 +#define WMI_BA_MODE_BUFFER_SIZE_1024 6 + +#define ATH12K_VALIDATE_PARSED_DATA_POINTER(parsed_bytes, data, \ + remaining_len) \ +do { \ + if ((parsed_bytes) < 0 || (parsed_bytes > remaining_len)) { \ + ath12k_err(ab, "TLV extraction failed\n"); \ + return -EINVAL; \ + } \ + (data) += (parsed_bytes); \ + (remaining_len) -= (parsed_bytes); \ +} while (0) + +/** + * is_field_present_in_tlv() - Check whether a given field is present + * in a given TLV + * @ptlv: Pointer to start of the TLV + * @field_name: name of the field in the TLV structure + * @tlv_len: Length of the TLV + * + * Return: true if the field is present within the TLV, + * else false + */ +#define is_field_present_in_tlv(ptlv, field_name, tlv_len) \ + (offsetof(typeof(*(ptlv)), field_name) < (tlv_len) ? \ + true : false) + +/** + * get_field_value_in_tlv() - Get the value of a given field in a given TLV + * @ptlv: Pointer to start of the TLV + * @field_name: name of the field in the TLV structure + * @tlv_len: Length of the TLV + * + * Return: Value of the given field if the offset of the field with in the TLV + * structure is less than the TLV length, else 0. + */ +#define get_field_value_in_tlv(ptlv, field_name, tlv_len) \ + (offsetof(typeof(*(ptlv)), field_name) < (tlv_len) ? \ + (ptlv)->field_name : 0) + +/** + * get_field_pointer_in_tlv() - Get the address of a given field in a given TLV + * @ptlv: Pointer to start of the TLV + * @field_name: name of the field in the TLV structure + * @tlv_len: Length of the TLV + * + * Return: Address of the given field if the offset of the field with in the + * TLV structure is less than the TLV length, else NULL. + */ +#define get_field_pointer_in_tlv(ptlv, field_name, tlv_len) \ + (offsetof(typeof(*(ptlv)), field_name) < (tlv_len) ? \ + &(ptlv)->field_name : NULL) /* HW mode config type replicated from FW header * @WMI_HOST_HW_MODE_SINGLE: Only one PHY is active. @@ -227,6 +310,22 @@ WMI_HOST_WLAN_2G_5G_CAP = 3, }; +/* Parameters used for WMI_VDEV_PARAM_AUTORATE_MISC_CFG command. + * Used only for HE auto rate mode. + */ +enum { + /* HE LTF related configuration */ + WMI_HE_AUTORATE_LTF_1X = BIT(0), + WMI_HE_AUTORATE_LTF_2X = BIT(1), + WMI_HE_AUTORATE_LTF_4X = BIT(2), + + /* HE GI related configuration */ + WMI_AUTORATE_400NS_GI = BIT(8), + WMI_AUTORATE_800NS_GI = BIT(9), + WMI_AUTORATE_1600NS_GI = BIT(10), + WMI_AUTORATE_3200NS_GI = BIT(11), +}; + enum wmi_cmd_group { /* 0 to 2 are reserved */ WMI_GRP_START = 0x3, @@ -292,6 +391,9 @@ WMI_GRP_TWT = 0x3e, WMI_GRP_MOTION_DET = 0x3f, WMI_GRP_SPATIAL_REUSE = 0x40, + WMI_GRP_LATENCY = 0x47, + WMI_GRP_MLO = 0x48, + WMI_GRP_SAWF = 0x49, }; #define WMI_CMD_GRP(grp_id) (((grp_id) << 12) | 0x1) @@ -361,6 +463,17 @@ WMI_PDEV_DMA_RING_CFG_REQ_CMDID, WMI_PDEV_HE_TB_ACTION_FRM_CMDID, WMI_PDEV_PKTLOG_FILTER_CMDID, + WMI_PDEV_SET_RAP_CONFIG_CMDID, + WMI_PDEV_DSM_FILTER_CMDID, + WMI_PDEV_FRAME_INJECT_CMDID, + WMI_PDEV_TBTT_OFFSET_SYNC_CMDID, + WMI_PDEV_SET_SRG_BSS_COLOR_BITMAP_CMDID, + WMI_PDEV_SET_SRG_PARTIAL_BSSID_BITMAP_CMDID, + WMI_PDEV_SET_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID, + WMI_PDEV_SET_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID, + WMI_PDEV_SET_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMDID, + WMI_PDEV_SET_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMDID, + WMI_PDEV_GET_TPC_STATS_CMDID, WMI_VDEV_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_VDEV), WMI_VDEV_DELETE_CMDID, WMI_VDEV_START_REQUEST_CMDID, @@ -388,6 +501,38 @@ WMI_VDEV_SET_CUSTOM_AGGR_SIZE_CMDID, WMI_VDEV_ENCRYPT_DECRYPT_DATA_REQ_CMDID, WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID, + /** WMI commands related to dbg arp stats */ + WMI_VDEV_SET_ARP_STAT_CMDID, + WMI_VDEV_GET_ARP_STAT_CMDID, + /** get tx power for the current vdev */ + WMI_VDEV_GET_TX_POWER_CMDID, + /* limit STA offchannel activity */ + WMI_VDEV_LIMIT_OFFCHAN_CMDID, + /** To set custom software retries per-AC for vdev */ + WMI_VDEV_SET_CUSTOM_SW_RETRY_TH_CMDID, + /** To set chainmask configuration for vdev */ + WMI_VDEV_CHAINMASK_CONFIG_CMDID, + WMI_VDEV_GET_BCN_RECEPTION_STATS_CMDID, + /* request LTE-Coex info */ + WMI_VDEV_GET_MWS_COEX_INFO_CMDID, + /** delete all peer (excluding bss peer) */ + WMI_VDEV_DELETE_ALL_PEER_CMDID, + /* To set bss max idle time related parameters */ + WMI_VDEV_BSS_MAX_IDLE_TIME_CMDID, + /** Indicates FW to trigger Audio sync */ + WMI_VDEV_AUDIO_SYNC_TRIGGER_CMDID, + /** Gives Qtimer value to FW */ + WMI_VDEV_AUDIO_SYNC_QTIMER_CMDID, + /** Preferred channel list for each vdev */ + WMI_VDEV_SET_PCL_CMDID, + /** VDEV_GET_BIG_DATA_CMD IS DEPRECATED - DO NOT USE */ + WMI_VDEV_GET_BIG_DATA_CMDID, + /** Get per vdev BIG DATA stats phase 2 */ + WMI_VDEV_GET_BIG_DATA_P2_CMDID, + /** set TPC PSD/non-PSD power */ + WMI_VDEV_SET_TPC_POWER_CMDID, + WMI_VDEV_IGMP_OFFLOAD_CMDID, + WMI_VDEV_SET_INTRA_BSS_CMDID, WMI_PEER_CREATE_CMDID = WMI_TLV_CMD(WMI_GRP_PEER), WMI_PEER_DELETE_CMDID, WMI_PEER_FLUSH_TIDS_CMDID, @@ -410,6 +555,16 @@ WMI_PEER_REORDER_QUEUE_REMOVE_CMDID, WMI_PEER_SET_RX_BLOCKSIZE_CMDID, WMI_PEER_ANTDIV_INFO_REQ_CMDID, + WMI_PEER_RESERVED0_CMDID, + WMI_PEER_TID_MSDUQ_QDEPTH_THRESH_UPDATE_CMDID, + WMI_PEER_TID_CONFIGURATIONS_CMDID, + WMI_PEER_CFR_CAPTURE_CMDID, + WMI_PEER_CHAN_WIDTH_SWITCH_CMDID, + WMI_PEER_TX_PN_REQUEST_CMDID, + WMI_PEER_UNMAP_RESPONSE_CMDID, + WMI_PEER_CONFIG_VLAN_CMDID, + WMI_PEER_CONFIG_PPE_DS_CMDID, + WMI_PEER_SET_INTRA_BSS_CMDID, WMI_BCN_TX_CMDID = WMI_TLV_CMD(WMI_GRP_MGMT), WMI_PDEV_SEND_BCN_CMDID, WMI_BCN_TMPL_CMDID, @@ -424,6 +579,9 @@ WMI_BSS_COLOR_CHANGE_ENABLE_CMDID, WMI_VDEV_BCN_OFFLOAD_QUIET_CONFIG_CMDID, WMI_FILS_DISCOVERY_TMPL_CMDID, + WMI_QOS_NULL_FRAME_TX_SEND_CMDID, + /** WMI CMD to receive the management filter criteria from the host for RX REO */ + WMI_MGMT_RX_REO_FILTER_CONFIGURATION_CMDID, WMI_ADDBA_CLEAR_RESP_CMDID = WMI_TLV_CMD(WMI_GRP_BA_NEG), WMI_ADDBA_SEND_CMDID, WMI_ADDBA_STATUS_CMDID, @@ -519,6 +677,11 @@ WMI_REQUEST_RCPI_CMDID, WMI_REQUEST_PEER_STATS_INFO_CMDID, WMI_REQUEST_RADIO_CHAN_STATS_CMDID, + WMI_REQUEST_WLM_STATS_CMDID, + WMI_REQUEST_CTRL_PATH_STATS_CMDID, + WMI_REQUEST_UNIFIED_LL_GET_STA_CMDID, + WMI_REQUEST_THERMAL_STATS_CMDID, + WMI_REQUEST_STATS_CTRL_PATH_CMDID, WMI_SET_ARP_NS_OFFLOAD_CMDID = WMI_TLV_CMD(WMI_GRP_ARP_NS_OFL), WMI_ADD_PROACTIVE_ARP_RSP_PATTERN_CMDID, WMI_DEL_PROACTIVE_ARP_RSP_PATTERN_CMDID, @@ -669,6 +832,22 @@ WMI_PDEV_OBSS_PD_SPATIAL_REUSE_CMDID = WMI_TLV_CMD(WMI_GRP_SPATIAL_REUSE), WMI_PDEV_OBSS_PD_SPATIAL_REUSE_SET_DEF_OBSS_THRESH_CMDID, + /** WMI commands specific to Tid level Latency config **/ + /** VDEV Latency Config command */ + WMI_VDEV_TID_LATENCY_CONFIG_CMDID = WMI_TLV_CMD(WMI_GRP_LATENCY), + /** TID Latency Request command */ + WMI_PEER_TID_LATENCY_CONFIG_CMDID, + WMI_MLO_LINK_SET_ACTIVE_CMDID = WMI_TLV_CMD(WMI_GRP_MLO), + WMI_MLO_SETUP_CMDID, + WMI_MLO_READY_CMDID, + WMI_MLO_TEARDOWN_CMDID, + WMI_MLO_PEER_TID_TO_LINK_MAP_CMDID, + /** Service Aware WiFi (SAWF) **/ + /** configure or reconfigure the parameters for a service class **/ + WMI_SAWF_SERVICE_CLASS_CFG_CMDID = WMI_TLV_CMD(WMI_GRP_SAWF), + /** disable a service class **/ + WMI_SAWF_SERVICE_CLASS_DISABLE_CMDID, + }; enum wmi_tlv_event_id { @@ -676,6 +855,9 @@ WMI_READY_EVENTID, WMI_SERVICE_AVAILABLE_EVENTID, WMI_SCAN_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_SCAN), + WMI_PDEV_SSCAN_FW_PARAM_EVENTID, + WMI_SSCAN_EVT_MESSAGE_EVENTID, + WMI_SPECTRAL_CAPABILITIES_EVENTID, WMI_PDEV_TPC_CONFIG_EVENTID = WMI_TLV_CMD(WMI_GRP_PDEV), WMI_CHAN_INFO_EVENTID, WMI_PHYERR_EVENTID, @@ -710,6 +892,15 @@ WMI_PDEV_RAP_INFO_EVENTID, WMI_CHAN_RF_CHARACTERIZATION_INFO_EVENTID, WMI_SERVICE_READY_EXT2_EVENTID, + WMI_PDEV_MULTIPLE_VDEV_RESTART_RESP_EVENTID, + WMI_PDEV_GET_TPC_STATS_EVENTID, + WMI_PDEV_GET_DPD_STATUS_EVENTID, + WMI_PDEV_GET_HALPHY_CAL_STATUS_EVENTID, + WMI_PDEV_SET_HALPHY_CAL_BMAP_EVENTID, + WMI_PDEV_AOA_PHASEDELTA_EVENTID, + WMI_PDEV_FIPS_EXTEND_EVENTID, + WMI_PDEV_PKTLOG_DECODE_INFO_EVENTID, + WMI_PDEV_RSSI_DBM_CONVERSION_PARAMS_INFO_EVENTID, WMI_VDEV_START_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_VDEV), WMI_VDEV_STOPPED_EVENTID, WMI_VDEV_INSTALL_KEY_COMPLETE_EVENTID, @@ -751,6 +942,9 @@ WMI_TBTTOFFSET_EXT_UPDATE_EVENTID, WMI_OFFCHAN_DATA_TX_COMPLETION_EVENTID, WMI_HOST_FILS_DISCOVERY_EVENTID, + WMI_HOST_FILS_V2_DISCOVERY_EVENTID, + WMI_QOS_NULL_FRAME_TX_COMPLETION_EVENTID, + WMI_MGMT_RX_FW_CONSUMED_EVENTID, WMI_TX_DELBA_COMPLETE_EVENTID = WMI_TLV_CMD(WMI_GRP_BA_NEG), WMI_TX_ADDBA_COMPLETE_EVENTID, WMI_BA_RSP_SSN_EVENTID, @@ -781,6 +975,9 @@ WMI_UPDATE_RCPI_EVENTID, WMI_PEER_STATS_INFO_EVENTID, WMI_RADIO_CHAN_STATS_EVENTID, + WMI_WLM_STATS_EVENTID, + WMI_CTRL_PATH_STATS_EVENTID, + WMI_STATS_CTRL_PATH_EVENTID, WMI_NLO_MATCH_EVENTID = WMI_TLV_CMD(WMI_GRP_NLO_OFL), WMI_NLO_SCAN_COMPLETE_EVENTID, WMI_APFIND_EVENTID, @@ -817,6 +1014,7 @@ WMI_READ_DATA_FROM_FLASH_EVENTID, WMI_REPORT_RX_AGGR_FAILURE_EVENTID, WMI_PKGID_EVENTID, + WMI_MUEDCA_PARAMS_CONFIG_EVENTID = 0x1d01e, WMI_GPIO_INPUT_EVENTID = WMI_TLV_CMD(WMI_GRP_GPIO), WMI_UPLOADH_EVENTID, WMI_CAPTUREH_EVENTID, @@ -849,6 +1047,8 @@ WMI_MDNS_STATS_EVENTID = WMI_TLV_CMD(WMI_GRP_MDNS_OFL), WMI_SAP_OFL_ADD_STA_EVENTID = WMI_TLV_CMD(WMI_GRP_SAP_OFL), WMI_SAP_OFL_DEL_STA_EVENTID, + WMI_OBSS_COLOR_COLLISION_DETECTION_EVENTID = + WMI_EVT_GRP_START_ID(WMI_GRP_OBSS_OFL), WMI_OCB_SET_CONFIG_RESP_EVENTID = WMI_TLV_CMD(WMI_GRP_OCB), WMI_OCB_GET_TSF_TIMER_RESP_EVENTID, WMI_DCC_GET_STATS_RESP_EVENTID, @@ -878,6 +1078,9 @@ WMI_TWT_DEL_DIALOG_EVENTID, WMI_TWT_PAUSE_DIALOG_EVENTID, WMI_TWT_RESUME_DIALOG_EVENTID, + WMI_MLO_LINK_SET_ACTIVE_RESP_EVENTID = WMI_EVT_GRP_START_ID(WMI_GRP_MLO), + WMI_MLO_SETUP_COMPLETE_EVENTID, + WMI_MLO_TEARDOWN_COMPLETE_EVENTID, }; enum wmi_tlv_pdev_param { @@ -1024,6 +1227,12 @@ WMI_PDEV_PARAM_RADIO_CHAN_STATS_ENABLE, WMI_PDEV_PARAM_RADIO_DIAGNOSIS_ENABLE, WMI_PDEV_PARAM_MESH_MCAST_ENABLE, + WMI_PDEV_PARAM_SET_CONG_CTRL_MAX_MSDUS = 0xa6, + WMI_PDEV_PARAM_SUB_CHANNEL_MARKING = 0xb0, + WMI_PDEV_PARAM_SET_CMD_OBSS_PD_THRESHOLD = 0xbc, + WMI_PDEV_PARAM_SET_CMD_OBSS_PD_PER_AC = 0xbe, + WMI_PDEV_PARAM_ENABLE_SR_PROHIBIT = 0xc6, + WMI_PDEV_PARAM_MPD_USERPD_SSR = 0xce, }; enum wmi_tlv_vdev_param { @@ -1136,13 +1345,25 @@ WMI_VDEV_PARAM_HE_RANGE_EXT, WMI_VDEV_PARAM_ENABLE_BCAST_PROBE_RESPONSE, WMI_VDEV_PARAM_FILS_MAX_CHANNEL_GUARD_TIME, + WMI_VDEV_PARAM_HE_LTF = 0x74, WMI_VDEV_PARAM_BA_MODE = 0x7e, + WMI_VDEV_PARAM_AUTORATE_MISC_CFG = 0x80, WMI_VDEV_PARAM_SET_HE_SOUNDING_MODE = 0x87, + WMI_VDEV_PARAM_UL_FIXED_RATE, WMI_VDEV_PARAM_6GHZ_PARAMS = 0x99, WMI_VDEV_PARAM_PROTOTYPE = 0x8000, WMI_VDEV_PARAM_BSS_COLOR, WMI_VDEV_PARAM_SET_HEMU_MODE, WMI_VDEV_PARAM_HEOPS_0_31 = 0x8003, + WMI_VDEV_PARAM_OBSSPD, + WMI_VDEV_PARAM_SET_EHT_MU_MODE, + WMI_VDEV_PARAM_EHT_LTF, + WMI_VDEV_PARAM_UL_EHT_LTF, + WMI_VDEV_PARAM_EHT_DCM, + WMI_VDEV_PARAM_EHT_RANGE_EXT, + WMI_VDEV_PARAM_NON_DATA_EHT_RANGE_EXT, + WMI_VDEV_PARAM_FIXED_PUNCTURE_PATTERN, + WMI_VDEV_PARAM_EHTOPS_0_31, }; enum wmi_tlv_peer_flags { @@ -1175,6 +1396,7 @@ WMI_TAG_ARRAY_BYTE, WMI_TAG_ARRAY_STRUCT, WMI_TAG_ARRAY_FIXED_STRUCT, + WMI_TAG_ARRAY_INT16, WMI_TAG_LAST_ARRAY_ENUM = 31, WMI_TAG_SERVICE_READY_EVENT, WMI_TAG_HAL_REG_CAPABILITIES, @@ -1920,10 +2142,76 @@ /* TODO add all the missing cmds */ WMI_TAG_PDEV_PEER_PKTLOG_FILTER_CMD = 0x301, WMI_TAG_PDEV_PEER_PKTLOG_FILTER_INFO, + WMI_TAG_MUEDCA_PARAMS_CONFIG_EVENT = 0x32a, + WMI_TAG_SERVICE_READY_EXT2_EVENT = 0x334, WMI_TAG_FILS_DISCOVERY_TMPL_CMD = 0x344, + WMI_TAG_MULTIPLE_VDEV_RESTART_RESPONSE_EVENT = 0x365, WMI_TAG_MAC_PHY_CAPABILITIES_EXT = 0x36F, + WMI_TAG_PDEV_SRG_BSS_COLOR_BITMAP_CMD = 0x37b, + WMI_TAG_PDEV_SRG_PARTIAL_BSSID_BITMAP_CMD, + WMI_TAG_PDEV_SSCAN_FW_CMD_FIXED_PARAM = 0x37f, + WMI_TAG_PDEV_SSCAN_FFT_BIN_INDEX, + WMI_TAG_PDEV_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD = 0x381, + WMI_TAG_PDEV_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD, + WMI_TAG_PDEV_NON_SRG_OBSS_COLOR_ENABLE_BITMAP_CMD, + WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD, + /* TODO add all the missing cmds */ + WMI_CTRL_PATH_STATS_CMD_FIXED_PARAM = + WMI_TAG_PDEV_NON_SRG_OBSS_BSSID_ENABLE_BITMAP_CMD + 4, + WMI_CTRL_PATH_STATS_EV_FIXED_PARAM, + WMI_CTRL_PATH_PDEV_STATS, WMI_TAG_REGULATORY_RULE_EXT_STRUCT = 0x3A9, WMI_TAG_REG_CHAN_LIST_CC_EXT_EVENT, + WMI_TAG_VDEV_SET_TPC_POWER_CMD = 0x3B5, + WMI_TAG_VDEV_CH_POWER_INFO, + WMI_TAG_PEER_TID_LATENCY_CONFIG_FIXED_PARAM = 0x3B9, + WMI_TAG_TID_LATENCY_INFO, + WMI_CTRL_PATH_CAL_STATS = 0x3BC, + WMI_CTRL_PATH_BTCOEX_STATS = 0x3FD, + WMI_CTRL_PATH_AWGN_STATS = 0x3F9, + WMI_TAG_EHT_RATE_SET = 0x3C4, + WMI_TAG_DCS_AWGN_INT_TYPE = 0x3C5, + WMI_TAG_MLO_TX_SEND_PARAMS, + WMI_TAG_MLO_PARTNER_LINK_PARAMS, + WMI_TAG_MLO_PARTNER_LINK_PARAMS_PEER_ASSOC, + WMI_TAG_MLO_SETUP_CMD, + WMI_TAG_MLO_SETUP_COMPLETE_EVENT, + WMI_TAG_MLO_READY_CMD, + WMI_TAG_MLO_TEARDOWN_CMD, + WMI_TAG_MLO_TEARDOWN_COMPLETE, + WMI_TAG_MLO_PEER_ASSOC_PARAMS = 0x3D0, + WMI_TAG_MLO_MGMT_RX_REO_PARAMS = 0x3D2, + WMI_TAG_MLO_MGMT_RX_FW_CONSUMED_HDR = 0x3D3, + WMI_TAG_MLO_MGMT_RX_REO_FILTER_CFG_CMD = 0x3D4, + WMI_TAG_MLO_PEER_CREATE_PARAMS = 0x3D5, + WMI_TAG_MLO_VDEV_START_PARAMS = 0x3D6, + WMI_TAG_MLO_VDEV_CREATE_PARAMS = 0x3D7, + WMI_TAG_VDEV_SET_INTRA_BSS_PARAMS = 0x3EE, + WMI_TAG_PEER_SET_INTRA_BSS_PARAMS, + WMI_TAG_PDEV_PKTLOG_DECODE_INFO = 0x414, + WMI_TAG_TPC_STATS_GET_CMD = 0x38B, + WMI_TAG_TPC_STATS_EVENT_FIXED_PARAM, + WMI_TAG_TPC_STATS_CONFIG_EVENT, + WMI_TAG_TPC_STATS_REG_PWR_ALLOWED, + WMI_TAG_TPC_STATS_RATES_ARRAY, + WMI_TAG_TPC_STATS_CTL_PWR_TABLE_EVENT, + WMI_TAG_BCN_TMPL_ML_PARAMS_CMD = 0x3E6, + WMI_TAG_PEER_CONFIG_PPEDS_ROUTING = 0x3EA, + WMI_TAG_SAWF_SERVICE_CLASS_CFG_CMD_FIXED_PARAM = 0x40A, + WMI_TAG_SAWF_SERVICE_CLASS_DISABLE_CMD_FIXED_PARAM = 0x40B, + WMI_TAG_SPECTRAL_SCAN_BW_CAPABILITIES = 0x415, + WMI_TAG_SPECTRAL_FFT_SIZE_CAPABILITIES, + WMI_TAG_PDEV_SSCAN_CHAN_INFO = 0X417, + WMI_TAG_PDEV_SSCAN_PER_DETECTOR_INFO, + WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO_FIXED_PARAM = 0x427, + WMI_TAG_RSSI_DBM_CONVERSION_PARAMS_INFO, + WMI_TAG_RSSI_DBM_CONVERSION_TEMP_OFFSET_INFO, + WMI_TAG_BCN_TMPL_ML_INFO_CMD = 0x436, + WMI_TAG_MLO_MGMT_RX_CU_PARAMS = 0x439, + WMI_TAG_CTRL_PATH_CMD_FIXED_PARAM = 0x442, + WMI_TAG_CTRL_PATH_EVENT_FIXED_PARAM, + WMI_TAG_PDEV_DFS_RADAR_FLAGS = 0x4b4, + WMI_TAG_PRB_RESP_TMPL_ML_INFO_CMD = 0x460, WMI_TAG_MAX }; @@ -2147,8 +2435,28 @@ WMI_TLV_SERVICE_PER_PEER_HTT_STATS_RESET = 213, WMI_TLV_SERVICE_FREQINFO_IN_METADATA = 219, WMI_TLV_SERVICE_EXT2_MSG = 220, - - WMI_MAX_EXT_SERVICE + WMI_TLV_SERVICE_MULTIPLE_VDEV_RESTART_RESPONSE_SUPPORT = 235, + WMI_TLV_SERVICE_5_9GHZ_SUPPORT = 247, + WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, + + WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253, + WMI_MAX_EXT_SERVICE = 256, + + WMI_TLV_SERVICE_EXT_TPC_REG_SUPPORT = 280, + WMI_TLV_SERVICE_REG_CC_EXT_EVENT_SUPPORT = 281, + WMI_TLV_SERVICE_DCS_AWGN_INT_SUPPORT = 286, + WMI_TLV_SERVICE_BE = 289, + WMI_TLV_SERVICE_SAWF_LEVEL0 = 311, + WMI_TLV_SERVICE_PKTLOG_DECODE_INFO_SUPPORT = 320, + WMI_TLV_SERVICE_PEER_METADATA_V1A_V1B_SUPPORT = 365, + WMI_TLV_SERVICE_RADAR_FLAGS_SUPPORT = 390, + WMI_TLV_SERVICE_SW_PROG_DFS_SUPPORT = 395, + WMI_MAX_EXT2_SERVICE, +}; + +enum wmi_unit_test_cmdid { + /* TODO: Add the remaining cmd ids if needed */ + WMI_DBG_ENABLE_M3_SSR = 36, }; enum { @@ -2196,6 +2504,14 @@ WMI_VDEV_PREAMBLE_SHORT = 2, }; +/** 6GHZ params **/ +/* Control to enable/disable beacon tx in non-HT duplicate */ +#define WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BEACON BIT(0) +/* Control to enable/disable broadcast probe response tx in non-HT duplicate */ +#define WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_BCAST_PROBE_RSP BIT(1) +/* Control to enable/disable FILS discovery frame tx in non-HT duplicate */ +#define WMI_VDEV_6GHZ_BITMAP_NON_HT_DUPLICATE_FD_FRAME BIT(2) + enum wmi_peer_smps_state { WMI_PEER_SMPS_PS_NONE = 0, WMI_PEER_SMPS_STATIC = 1, @@ -2207,6 +2523,8 @@ WMI_PEER_CHWIDTH_40MHZ = 1, WMI_PEER_CHWIDTH_80MHZ = 2, WMI_PEER_CHWIDTH_160MHZ = 3, + WMI_PEER_CHWIDTH_320MHZ = 4, + WMI_PEER_CHWIDTH_MAX = 9, }; enum wmi_beacon_gen_mode { @@ -2217,11 +2535,31 @@ enum wmi_direct_buffer_module { WMI_DIRECT_BUF_SPECTRAL = 0, WMI_DIRECT_BUF_CFR = 1, + WMI_CONFIG_MODULE_CV_UPLOAD = 2, /* keep it last */ WMI_DIRECT_BUF_MAX }; +/* enum wmi_nss_ratio - NSS ratio received from FW during service ready ext + * event + * WMI_NSS_RATIO_1BY2_NSS -Max nss of 160MHz is equals to half of the max nss + * of 80MHz + * WMI_NSS_RATIO_3BY4_NSS - Max nss of 160MHz is equals to 3/4 of the max nss + * of 80MHz + * WMI_NSS_RATIO_1_NSS - Max nss of 160MHz is equals to the max nss of 80MHz + * WMI_NSS_RATIO_2_NSS - Max nss of 160MHz is equals to two times the max + * nss of 80MHz + */ + +enum wmi_nss_ratio { + WMI_NSS_RATIO_1BY2_NSS = 0x0, + WMI_NSS_RATIO_3BY4_NSS = 0x1, + WMI_NSS_RATIO_1_NSS = 0x2, + WMI_NSS_RATIO_2_NSS = 0x3, +}; + + struct ath12k_wmi_pdev_band_arg { u32 pdev_id; u32 start_freq; @@ -2234,6 +2572,7 @@ u32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS]; }; +#define PSOC_HOST_MAX_MAC_SIZE (2) #define PSOC_HOST_MAX_PHY_SIZE (3) #define ATH12K_11B_SUPPORT BIT(0) #define ATH12K_11G_SUPPORT BIT(1) @@ -2255,6 +2594,77 @@ u32 high_5ghz_chan; }; +#define WMI_MAX_EHTCAP_MAC_SIZE 2 +#define WMI_MAX_EHTCAP_PHY_SIZE 3 +#define WMI_MAX_EHTCAP_RATE_SET 3 + +enum { + WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP = 0x00000001, + WMI_HOST_VDEV_FLAGS_TRANSMIT_AP = 0x00000002, + WMI_HOST_VDEV_FLAGS_NON_TRANSMIT_AP = 0x00000004, + WMI_HOST_VDEV_FLAGS_EMA_MODE = 0x00000008, + WMI_HOST_VDEV_FLAGS_SCAN_MODE_VAP = 0x00000010, +}; + +/* HW mode MLO capability flags + * WMI_HOST_MLO_CAP_FLAG_NONE: Do not support MLO for the specific HW mode + * WMI_HOST_MLO_CAP_FLAG_NON_STR_IN_DBS: Support STR MLO when DBS for the specific HW mode + * WMI_HOST_MLO_CAP_FLAG_STR_IN_DBS: Support Non-STR MLO when DBS for the specific HW mode + * WMI_HOST_MLO_CAP_FLAG_NON_STR_IN_SBS: Support STR MLO when SBS for the specific HW mode + * WMI_HOST_MLO_CAP_FLAG_STR_IN_SBS: Support Non-STR MLO when SBS for the specific HW mode + * WMI_HOST_MLO_CAP_FLAG_STR: Support STR for the specific HW mode + * WMI_HOST_MLO_CAP_FLAG_EMLSR: Support eMLSR mode + */ +#define WMI_HOST_MLO_CAP_FLAG_NONE 0x0 +#define WMI_HOST_MLO_CAP_FLAG_NON_STR_IN_DBS 0x1 +#define WMI_HOST_MLO_CAP_FLAG_STR_IN_DBS 0x2 +#define WMI_HOST_MLO_CAP_FLAG_NON_STR_IN_SBS 0x4 +#define WMI_HOST_MLO_CAP_FLAG_STR_IN_SBS 0x8 +#define WMI_HOST_MLO_CAP_FLAG_STR 0x10 +#define WMI_HOST_MLO_CAP_FLAG_EMLSR 0x20 + +/* + * 0 – index indicated EHT-MCS map for 20Mhz only sta (4 bytes valid) + * 1 – index for <= 80MHz bw (only 3 bytes are valid and other is reserved) + * 2 – index for == 160Mhz bw (only 3 bytes are valid and other is reserved) + * 3 – index for == 320Mhz bw (only 3 bytes are valid and other is reserved) + */ +#define WMI_MAX_EHT_SUPP_MCS_2G_SIZE 2 +#define WMI_MAX_EHT_SUPP_MCS_5G_SIZE 4 + +#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_80 0 +#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_160 1 +#define WMI_EHTCAP_TXRX_MCS_NSS_IDX_320 2 + +#define WMI_MCS_NSS_MAP_0_7 GENMASK(3, 0) +#define WMI_MCS_NSS_MAP_8_9 GENMASK(7, 4) +#define WMI_MCS_NSS_MAP_10_11 GENMASK(11, 8) +#define WMI_MCS_NSS_MAP_12_13 GENMASK(15, 12) + +/* + * 0 – index indicated EHT-MCS map for 20Mhz only sta (4 bytes valid) + * 1 – index for <= 80MHz bw (only 3 bytes are valid and other is reserved) + * 2 – index for == 160Mhz bw (only 3 bytes are valid and other is reserved) + * 3 – index for == 320Mhz bw (only 3 bytes are valid and other is reserved) + */ +#define WMI_MAX_EHT_SUPP_MCS_2G_SIZE 2 +#define WMI_MAX_EHT_SUPP_MCS_5G_SIZE 4 + +struct ath12k_service_ext2_param { + u32 reg_db_version; + u32 hw_min_max_tx_power_2g; + u32 hw_min_max_tx_power_5g; + u32 chwidth_num_peer_caps; + u32 ru_punct_supp_bw; + u32 max_user_per_ppdu_ofdma; + u32 max_user_per_ppdu_mumimo; + u32 target_cap_flags; + u32 eht_cap_mac_info[WMI_MAX_EHTCAP_MAC_SIZE]; + u32 max_num_linkview_peers; + u32 max_msduq_per_tid; + u32 default_msduq_per_tid; +}; + #define WMI_HOST_MAX_PDEV 3 struct ath12k_wmi_host_mem_chunk_params { @@ -2333,6 +2743,12 @@ u32 sched_params; u32 twt_ap_pdev_count; u32 twt_ap_sta_count; + bool is_reg_cc_ext_event_supported; + u32 ema_max_vap_cnt; + u32 ema_max_profile_period; + u8 dp_peer_meta_data_ver; + bool sawf; + bool is_full_bw_nol_feature_supported; }; struct ath12k_wmi_init_cmd_arg { @@ -2367,6 +2783,34 @@ __le32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS]; } __packed; +struct ath12k_ppe_threshold { + u32 numss_m1; + u32 ru_bit_mask; + u32 ppet16_ppet8_ru3_ru0[PSOC_HOST_MAX_NUM_SS]; +}; + +struct ath12k_chainmask_caps { + u32 supported_caps; + u32 chainmask; +}; + +struct ath12k_chainmask_table { + u32 table_id; + u32 num_valid_chainmasks; + struct ath12k_chainmask_caps *cap_list; +}; + +#define ATH12K_MAX_CHAINMASK_TABLES 5 + +struct wmi_ppe_threshold { + u32 numss_m1; /** NSS - 1*/ + union { + u32 ru_count; + u32 ru_mask; + } __packed; + u32 ppet16_ppet8_ru3_ru0[WMI_MAX_NUM_SS]; +} __packed; + #define HW_BD_INFO_SIZE 5 struct ath12k_wmi_abi_version_params { @@ -2385,6 +2829,14 @@ } __packed; #define WMI_RSRC_CFG_HOST_SVC_FLAG_REG_CC_EXT_SUPPORT_BIT 4 +#define WMI_RSRC_CFG_HOST_SVC_FLAG_REO_QREF_SUPPORT_BIT 12 +#define WMI_RSRC_CFG_HOST_SVC_FLAG_FULL_BW_NOL_SUPPORT_BIT 14 +#define WMI_RSRC_CFG_FLAGS2_RX_PEER_METADATA_VERSION GENMASK(5,4) +#define WMI_RSRC_CFG_FLAGS2_CALC_NEXT_DTIM_COUNT_SET BIT(9) +#define WMI_RSRC_CFG_FLAGS2_INTRABSS_MEC_WDS_LEARNING_DISABLE BIT(15) +#define WMI_RSRC_CFG_FLAG1_THREE_WAY_COEX_CONFIG_OVERRIDE_SUPPORT BIT(25) +#define WMI_RSRC_CFG_FLAG1_BSS_CHANNEL_INFO_64 BIT(5) +#define WMI_RSRC_CFG_FLAGS2_SAWF_CONFIG_ENABLE_SET BIT(13) struct ath12k_wmi_resource_config_params { __le32 tlv_header; @@ -2516,6 +2968,9 @@ __le32 num_chainmask_tables; } __packed; +#define WMI_HW_MODE_INFO0_CONFIG_TYPE GENMASK(26, 0) +#define WMI_HW_MODE_INFO0_MLO_CAP_FLAG GENMASK(31, 27) + struct ath12k_wmi_hw_mode_cap_params { __le32 tlv_header; __le32 hw_mode_id; @@ -2523,11 +2978,30 @@ __le32 hw_mode_config_type; } __packed; +struct wmi_mac_phy_chainmask_combo { + u32 chainmask_table_id; + u32 num_valid_chainmask; +} __packed; + +struct wmi_mac_phy_chainmask_caps { + u32 tlv_header; + u32 supported_flags; + u32 chainmask; +} __packed; + + #define WMI_MAX_HECAP_PHY_SIZE (3) +#define WMI_NSS_RATIO_ENABLE_DISABLE_BITPOS BIT(0) +#define WMI_NSS_RATIO_ENABLE_DISABLE_GET(_val) \ + FIELD_GET(WMI_NSS_RATIO_ENABLE_DISABLE_BITPOS, _val) +#define WMI_NSS_RATIO_INFO_BITPOS GENMASK(4, 1) +#define WMI_NSS_RATIO_INFO_GET(_val) \ + FIELD_GET(WMI_NSS_RATIO_INFO_BITPOS, _val) struct ath12k_wmi_mac_phy_caps_params { __le32 hw_mode_id; - __le32 pdev_id; + __le16 pdev_id; + __le16 hw_link_id; __le32 phy_id; __le32 supported_flags; __le32 supported_bands; @@ -2557,6 +3031,12 @@ __le32 he_cap_info_2g_ext; __le32 he_cap_info_5g_ext; __le32 he_cap_info_internal; + __le32 wireless_modes; + __le32 low_2ghz_chan_freq; + __le32 high_2ghz_chan_freq; + __le32 low_5ghz_chan_freq; + __le32 high_5ghz_chan_freq; + __le32 nss_ratio; } __packed; struct ath12k_wmi_hal_reg_caps_ext_params { @@ -2577,6 +3057,108 @@ __le32 num_phy; } __packed; +struct wmi_service_ready_ext2_event { + u32 reg_db_version; + u32 hw_min_max_tx_power_2g; + u32 hw_min_max_tx_power_5g; + u32 chwidth_num_peer_caps; + u32 ru_punct_supp_bw; + u32 max_user_per_ppdu_ofdma; + u32 max_user_per_ppdu_mumimo; + u32 target_cap_flags; + u32 eht_cap_mac_info[WMI_MAX_EHTCAP_MAC_SIZE]; + u32 max_num_linkview_peers; + u32 max_num_msduq_supported_per_tid; + u32 default_num_msduq_supported_per_tid; +} __packed; + +enum wmi_spectral_scaling_formula_id { + NO_SCALING = 0, + AGC_GAIN_RSSI_CORR_BASED = 1, +}; + +struct wmi_spectral_bin_scaling { + u32 pdev_id; + enum wmi_spectral_scaling_formula_id formula_id; + u32 low_level_offset; + u32 high_level_offset; + u32 rssi_thr; + u32 default_agc_max_gain; +} __packed; + +enum wmi_eht_mcs_support { + WMI_EHT_MCS_SUPPORT_0_9 = 0, + WMI_EHT_MCS_SUPPORT_0_11 = 1, + WMI_EHT_MCS_SUPPORT_0_13 = 2, + WMI_EHT_MCS_NOT_SUPPORTED = 3, +}; + +#define EML_INFO_EMLSR_SUPPORT BIT(0) +#define EML_INFO_EMLSR_PADDING_DELAY GENMASK(3, 1) +#define EML_INFO_EMLSR_TRANSITION_DELAY GENMASK(6, 4) +#define EML_INFO_EMLMR_SUPPORT BIT(7) +#define EML_INFO_EMLMR_PADDING_DELAY GENMASK(10, 8) +#define EML_INFO_TRANSITION_TIMEOUT GENMASK(14, 11) + +enum wmi_mld_cap_tid_to_link_map { + WMI_MLD_MAP_TID_TO_LINK_NONE, + WMI_MLD_MAP_EACH_TID_TO_SAME_OR_DIFF_LINK_SET, + WMI_MLD_MAP_ALL_TID_TO_SAME_LINK_SET, +}; + +#define MLD_INFO_MAX_SIMULTANEOUS_LINK GENMASK(3, 0) +#define MLD_INFO_SRS_SUPPORT BIT(4) +#define MLD_INFO_TID_TO_LINK_MAP_SUPPORT GENMASK(6, 5) +#define MLD_INFO_FREQ_SEPARATION_STR GENMASK(11, 7) +#define MLD_INFO_AAR_SUPPORT BIT(12) + +struct wmi_mac_phy_caps_ext { + u32 hw_mode_id; + union { + struct { + u32 pdev_id:16, + hw_link_id:16; + } wmi_pdev_to_link_map; + u32 pdev_id; + } u; + u32 phy_id; + u32 wireless_modes_ext; + u32 eht_cap_mac_info_2G[WMI_MAX_EHTCAP_MAC_SIZE]; + u32 eht_cap_mac_info_5G[WMI_MAX_EHTCAP_MAC_SIZE]; + u32 rsvd0[2]; + u32 eht_cap_phy_info_2G[WMI_MAX_EHTCAP_PHY_SIZE]; + u32 eht_cap_phy_info_5G[WMI_MAX_EHTCAP_PHY_SIZE]; + struct wmi_ppe_threshold eht_ppet2G; + struct wmi_ppe_threshold eht_ppet5G; + u32 eht_cap_info_internal; + u32 eht_supp_mcs_ext_2G[WMI_MAX_EHT_SUPP_MCS_2G_SIZE]; + u32 eht_supp_mcs_ext_5G[WMI_MAX_EHT_SUPP_MCS_5G_SIZE]; + union { + struct { + u32 emlsr_support:1, + emlsr_padding_delay:3, + emlsr_transition_delay:3, + emlmr_support:1, + emlmr_delay:3, + transition_timeout:4, + reserved: 17; + }; + u32 eml_capability; + } eml_cap_u; + union { + struct { + u32 max_num_simultaneous_links:4, + srs_support:1, + tid_to_link_negotiation_support:2, + freq_separation_str:5, + aar_support:1, + reserved2: 19; + }; + u32 mld_capability; + } mld_cap_u; +} __packed; + + /* 2 word representation of MAC addr */ struct ath12k_wmi_mac_addr_params { u8 addr[ETH_ALEN]; @@ -2622,7 +3204,10 @@ u8 rx; } chains[NUM_NL80211_BANDS]; u32 pdev_id; + u32 mbssid_flags; + u32 mbssid_tx_vdev_id; u8 if_stats_id; + u8 mld_addr[ETH_ALEN]; }; #define ATH12K_MAX_VDEV_STATS_ID 0x30 @@ -2636,6 +3221,9 @@ struct ath12k_wmi_mac_addr_params vdev_macaddr; __le32 num_cfg_txrx_streams; __le32 pdev_id; + __le32 mbssid_flags; + __le32 mbssid_tx_vdev_id; + __le32 vdev_stats_id_valid; __le32 vdev_stats_id; } __packed; @@ -2646,19 +3234,66 @@ u32 supported_rx_streams; } __packed; +/* 2 word representation of MAC addr */ +struct wmi_mac_addr { + union { + u8 addr[6]; + struct { + u32 word0; + u32 word1; + } __packed; + } __packed; +} __packed; + +struct wmi_vdev_create_mlo_params { + u32 tlv_header; + struct wmi_mac_addr mld_macaddr; +} __packed; + +#define ATH12K_WMI_FLAG_MLO_ENABLED BIT(0) +#define ATH12K_WMI_FLAG_MLO_ASSOC_LINK BIT(1) +#define ATH12K_WMI_FLAG_MLO_PRIMARY_UMAC BIT(2) +#define ATH12K_WMI_FLAG_MLO_LOGICAL_LINK_IDX_VALID BIT(3) +#define ATH12K_WMI_FLAG_MLO_PEER_ID_VALID BIT(4) +#define ATH12K_WMI_FLAG_MLO_MCAST_VDEV BIT(5) +#define ATH12K_WMI_FLAG_MLO_EMLSR_SUPPORT BIT(6) +#define ATH12K_WMI_FLAG_MLO_FORCED_INACTIVE BIT(7) +#define ATH12K_WMI_FLAG_MLO_LINK_ADD BIT(8) + +struct wmi_vdev_start_mlo_params { + u32 tlv_header; + u32 flags; +} __packed; + +struct wmi_partner_link_info { + u32 tlv_header; + u32 vdev_id; + u32 hw_link_id; + struct wmi_mac_addr vdev_addr; +} __packed; + struct wmi_vdev_delete_cmd { __le32 tlv_header; __le32 vdev_id; } __packed; +struct vdev_up_params { + __le32 vdev_id; + __le16 aid; + const u8 *bssid; + __le32 profile_idx; + __le32 profile_count; + u8 *tx_bssid; +} __packed; + struct wmi_vdev_up_cmd { __le32 tlv_header; __le32 vdev_id; __le32 vdev_assoc_id; struct ath12k_wmi_mac_addr_params vdev_bssid; - struct ath12k_wmi_mac_addr_params trans_bssid; + struct ath12k_wmi_mac_addr_params tx_vdev_bssid; __le32 profile_idx; - __le32 profile_num; + __le32 profile_count; } __packed; struct wmi_vdev_stop_cmd { @@ -2674,6 +3309,7 @@ #define WMI_VDEV_START_HIDDEN_SSID BIT(0) #define WMI_VDEV_START_PMF_ENABLED BIT(1) #define WMI_VDEV_START_LDPC_RX_ENABLED BIT(3) +#define WMI_VDEV_START_HW_ENCRYPTION_DISABLED BIT(4) #define ATH12K_WMI_SSID_LEN 32 @@ -2682,7 +3318,7 @@ u8 ssid[ATH12K_WMI_SSID_LEN]; } __packed; -#define ATH12K_VDEV_SETUP_TIMEOUT_HZ (1 * HZ) +#define ATH12K_VDEV_SETUP_TIMEOUT_HZ (10 * HZ) struct wmi_vdev_start_request_cmd { __le32 tlv_header; @@ -2701,6 +3337,11 @@ __le32 he_ops; __le32 cac_duration_ms; __le32 regdomain; + __le32 min_data_rate; + __le32 mbssid_flags; + __le32 mbssid_tx_vdev_id; + __le32 eht_ops; + __le32 ru_punct_bitmap; } __packed; #define MGMT_TX_DL_FRM_LEN 64 @@ -2729,6 +3370,25 @@ u8 reg_class_id; }; +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +struct wmi_peer_config_ppeds_cmd { + __le32 tlv_header; + struct wmi_mac_addr peer_macaddr; + __le32 ppe_routing_enable; + __le32 service_code; + __le32 priority_valid; + __le32 src_info; + __le32 vdev_id; +}; + +enum wmi_ppeds_routing_type { + WMI_PPE_ROUTING_DISABLED = 0, + WMI_AST_USE_PPE_ENABLED = 1, + WMI_AST_USE_PPE_DISABLED = 2, + WMI_PPE_ROUTING_TYPE_MAX, +}; +#endif + enum wmi_phy_mode { MODE_11A = 0, MODE_11G = 1, /* 11b/g Mode */ @@ -2754,12 +3414,20 @@ MODE_11AX_HE20_2G = 21, MODE_11AX_HE40_2G = 22, MODE_11AX_HE80_2G = 23, - MODE_UNKNOWN = 24, - MODE_MAX = 24 + MODE_11BE_EHT20 = 24, + MODE_11BE_EHT40 = 25, + MODE_11BE_EHT80 = 26, + MODE_11BE_EHT80_80 = 27, + MODE_11BE_EHT160 = 28, + MODE_11BE_EHT160_160 = 29, + MODE_11BE_EHT320 = 30, + MODE_11BE_EHT20_2G = 31, + MODE_11BE_EHT40_2G = 32, + MODE_UNKNOWN = 33, + MODE_MAX = 33 }; -struct wmi_vdev_start_req_arg { - u32 vdev_id; +struct wmi_channel_arg { u32 freq; u32 band_center_freq1; u32 band_center_freq2; @@ -2776,6 +3444,113 @@ u32 max_reg_power; u32 max_antenna_gain; enum wmi_phy_mode mode; +}; + +static inline const char *ath12k_wmi_phymode_str(enum wmi_phy_mode mode) +{ + switch (mode) { + case MODE_11A: + return "11a"; + case MODE_11G: + return "11g"; + case MODE_11B: + return "11b"; + case MODE_11GONLY: + return "11gonly"; + case MODE_11NA_HT20: + return "11na-ht20"; + case MODE_11NG_HT20: + return "11ng-ht20"; + case MODE_11NA_HT40: + return "11na-ht40"; + case MODE_11NG_HT40: + return "11ng-ht40"; + case MODE_11AC_VHT20: + return "11ac-vht20"; + case MODE_11AC_VHT40: + return "11ac-vht40"; + case MODE_11AC_VHT80: + return "11ac-vht80"; + case MODE_11AC_VHT160: + return "11ac-vht160"; + case MODE_11AC_VHT80_80: + return "11ac-vht80+80"; + case MODE_11AC_VHT20_2G: + return "11ac-vht20-2g"; + case MODE_11AC_VHT40_2G: + return "11ac-vht40-2g"; + case MODE_11AC_VHT80_2G: + return "11ac-vht80-2g"; + case MODE_11AX_HE20: + return "11ax-he20"; + case MODE_11AX_HE40: + return "11ax-he40"; + case MODE_11AX_HE80: + return "11ax-he80"; + case MODE_11AX_HE80_80: + return "11ax-he80+80"; + case MODE_11AX_HE160: + return "11ax-he160"; + case MODE_11AX_HE20_2G: + return "11ax-he20-2g"; + case MODE_11AX_HE40_2G: + return "11ax-he40-2g"; + case MODE_11AX_HE80_2G: + return "11ax-he80-2g"; + case MODE_11BE_EHT20: + return "11be-eht20"; + case MODE_11BE_EHT40: + return "11be-eht40"; + case MODE_11BE_EHT80: + return "11be-eht80"; + case MODE_11BE_EHT80_80: + return "11be-eht80+80"; + case MODE_11BE_EHT160: + return "11be-eht160"; + case MODE_11BE_EHT160_160: + return "11be-eht160+160"; + case MODE_11BE_EHT320: + return "11be-eht320"; + case MODE_11BE_EHT20_2G: + return "11be-eht20-2g"; + case MODE_11BE_EHT40_2G: + return "11be-eht40-2g"; + case MODE_UNKNOWN: + /* skip */ + break; + + /* no default handler to allow compiler to check that the + * * enum is fully handled + * */ + } + + return ""; +} + +#define ATH12K_WMI_MLO_MAX_LINKS 3 + +struct wmi_ml_partner_info { + u32 vdev_id; + u32 hw_link_id; + u8 addr[ETH_ALEN]; + bool assoc_link; + bool primary_umac; + bool logical_link_idx_valid; + u32 logical_link_idx; +}; + +struct wmi_ml_arg { + bool enabled; + bool assoc_link; + bool mcast_link; + bool link_add; + u8 num_partner_links; + struct wmi_ml_partner_info partner_info[ATH12K_WMI_MLO_MAX_LINKS]; +}; + +struct wmi_vdev_start_req_arg { + u32 vdev_id; + struct wmi_channel_arg channel; u32 bcn_intval; u32 dtim_period; u8 *ssid; @@ -2791,12 +3566,20 @@ u32 pref_rx_streams; u32 pref_tx_streams; u32 num_noa_descriptors; + u32 min_data_rate; + u32 mbssid_flags; + u32 mbssid_tx_vdev_id; + u32 ru_punct_bitmap; + struct wmi_ml_arg ml; + u32 width_device; + u32 center_freq_device; }; struct ath12k_wmi_peer_create_arg { const u8 *peer_addr; u32 peer_type; u32 vdev_id; + bool ml_enabled; }; struct ath12k_wmi_pdev_set_regdomain_arg { @@ -2809,6 +3592,27 @@ u32 pdev_id; }; +/* Defines various options for routing policy */ +enum wmi_pdev_dest_ring_handler_type { + ATH12K_WMI_PKTROUTE_USE_CCE = 0, + ATH12K_WMI_PKTROUTE_USE_ASPT = 1, + ATH12K_WMI_PKTROUTE_USE_FSE = 2, + ATH12K_WMI_PKTROUTE_USE_CCE2 = 3, +}; + +enum ath12k_wmi_pkt_route_opcode { + ATH12K_WMI_PKTROUTE_ADD, + ATH12K_WMI_PKTROUTE_DEL, +}; + +struct ath12k_wmi_pkt_route_param { + enum ath12k_wmi_pkt_route_opcode opcode; + u32 route_type_bmap; + u32 dst_ring_handler; + u32 dst_ring; + u32 meta_data; +}; + struct ath12k_wmi_rx_reorder_queue_remove_arg { u8 *peer_macaddr; u16 vdev_id; @@ -2832,17 +3636,19 @@ #define REG_RULE_MAX_BW 0x0000ffff #define REG_RULE_REG_PWR 0x00ff0000 #define REG_RULE_ANT_GAIN 0xff000000 -#define REG_RULE_PSD_INFO BIT(2) -#define REG_RULE_PSD_EIRP 0xffff0000 +#define REG_RULE_PSD_INFO BIT(0) +#define REG_RULE_PSD_EIRP 0xff0000 #define WMI_VDEV_PARAM_TXBF_SU_TX_BFEE BIT(0) #define WMI_VDEV_PARAM_TXBF_MU_TX_BFEE BIT(1) #define WMI_VDEV_PARAM_TXBF_SU_TX_BFER BIT(2) #define WMI_VDEV_PARAM_TXBF_MU_TX_BFER BIT(3) -#define HECAP_PHYDWORD_0 0 -#define HECAP_PHYDWORD_1 1 -#define HECAP_PHYDWORD_2 2 +#define HE_PHYCAP_BYTE_0 0 +#define HE_PHYCAP_BYTE_1 1 +#define HE_PHYCAP_BYTE_2 2 +#define HE_PHYCAP_BYTE_3 3 +#define HE_PHYCAP_BYTE_4 4 #define HECAP_PHY_SU_BFER BIT(31) #define HECAP_PHY_SU_BFEE BIT(0) @@ -2876,8 +3682,31 @@ #define HE_DL_MUOFDMA_ENABLE 1 #define HE_UL_MUOFDMA_ENABLE 1 #define HE_DL_MUMIMO_ENABLE 1 +#define HE_UL_MUMIMO_ENABLE 1 #define HE_MU_BFEE_ENABLE 1 #define HE_SU_BFEE_ENABLE 1 +#define HE_MU_BFER_ENABLE 1 +#define HE_SU_BFER_ENABLE 1 + +#define EHT_MODE_SU_TX_BFEE BIT(0) +#define EHT_MODE_SU_TX_BFER BIT(1) +#define EHT_MODE_MU_TX_BFEE BIT(2) +#define EHT_MODE_MU_TX_BFER BIT(3) +#define EHT_MODE_DL_OFDMA BIT(4) +#define EHT_MODE_UL_OFDMA BIT(5) +#define EHT_MODE_MUMIMO BIT(6) +#define EHT_MODE_DL_OFDMA_TXBF BIT(7) +#define EHT_MODE_DL_OFDMA_MUMIMO BIT(8) +#define EHT_MODE_UL_OFDMA_MUMIMO BIT(9) + +#define EHT_DL_MUOFDMA_ENABLE 1 +#define EHT_UL_MUOFDMA_ENABLE 1 +#define EHT_DL_MUMIMO_ENABLE 1 +#define EHT_UL_MUMIMO_ENABLE 1 +#define EHT_MU_BFEE_ENABLE 1 +#define EHT_SU_BFEE_ENABLE 1 +#define EHT_MU_BFER_ENABLE 1 +#define EHT_SU_BFER_ENABLE 1 #define HE_VHT_SOUNDING_MODE_ENABLE 1 #define HE_SU_MU_SOUNDING_MODE_ENABLE 1 @@ -2901,6 +3730,11 @@ WMI_PEER_TYPE_TDLS = 2, }; +struct wmi_peer_create_mlo_params { + u32 tlv_header; + u32 flags; +} __packed; + struct wmi_peer_create_cmd { __le32 tlv_header; __le32 vdev_id; @@ -2938,6 +3772,18 @@ WMI_BSS_SURVEY_REQ_TYPE_READ_CLEAR, }; +struct wmi_pdev_ap_ps_cmd { + u32 tlv_header; + u32 pdev_id; + u32 param_value; +}; + +struct wmi_pdev_get_ani_level_cmd { + __le32 tlv_header; + __le32 pdev_id; + __le32 param_id; +} __packed; + struct wmi_pdev_set_param_cmd { __le32 tlv_header; __le32 pdev_id; @@ -2966,6 +3812,7 @@ __le32 tlv_header; /* ref wmi_bss_chan_info_req_type */ __le32 req_type; + __le32 pdev_id; } __packed; struct wmi_ap_ps_peer_cmd { @@ -2994,6 +3841,16 @@ __le32 dfs_domain; } __packed; +struct wmi_pdev_pkt_route_cmd { + u32 tlv_header; + u32 pdev_id; + u32 opcode; + u32 route_type_bmap; + u32 dst_ring; + u32 meta_data; + u32 dst_ring_handler; +} __packed; + struct wmi_peer_set_param_cmd { __le32 tlv_header; __le32 vdev_id; @@ -3002,6 +3859,21 @@ __le32 param_value; } __packed; +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +struct wmi_peer_set_intra_bss_cmd { + __le32 tlv_header; + struct wmi_mac_addr peer_macaddr; + __le32 vdev_id; + __le32 enable; +} __packed; + +struct ath12k_vdev_set_intra_bss_cmd { + u32 tlv_header; + u32 vdev_id; + u32 enable; +} __packed; +#endif + struct wmi_peer_flush_tids_cmd { __le32 tlv_header; __le32 vdev_id; @@ -3030,7 +3902,6 @@ #define WLAN_SCAN_MAX_NUM_SSID 10 #define WLAN_SCAN_MAX_NUM_BSSID 10 -#define WLAN_SCAN_MAX_NUM_CHANNELS 40 struct ath12k_wmi_element_info_arg { u32 len; @@ -3213,17 +4084,17 @@ scan_f_filter_prb_req:1, scan_f_bypass_dfs_chn:1, scan_f_continue_on_err:1, + scan_f_promisc_mode:1, + scan_f_force_active_dfs_chn:1, + scan_f_add_tpc_ie_in_probe:1, + scan_f_add_ds_ie_in_probe:1, + scan_f_add_spoofed_mac_in_probe:1, scan_f_offchan_mgmt_tx:1, scan_f_offchan_data_tx:1, - scan_f_promisc_mode:1, scan_f_capture_phy_err:1, scan_f_strict_passive_pch:1, scan_f_half_rate:1, scan_f_quarter_rate:1, - scan_f_force_active_dfs_chn:1, - scan_f_add_tpc_ie_in_probe:1, - scan_f_add_ds_ie_in_probe:1, - scan_f_add_spoofed_mac_in_probe:1, scan_f_add_rand_seq_in_probe:1, scan_f_en_ie_whitelist_in_probe:1, scan_f_forced:1, @@ -3239,7 +4110,7 @@ u32 num_bssid; u32 num_ssids; u32 n_probes; - u32 chan_list[WLAN_SCAN_MAX_NUM_CHANNELS]; + u32 *chan_list; u32 notify_scan_events; struct cfg80211_ssid ssid[WLAN_SCAN_MAX_NUM_SSID]; struct ath12k_wmi_mac_addr_params bssid_list[WLAN_SCAN_MAX_NUM_BSSID]; @@ -3347,6 +4218,29 @@ #define WMI_CHAN_REG_INFO2_ANT_MAX GENMASK(7, 0) #define WMI_CHAN_REG_INFO2_MAX_TX_PWR GENMASK(15, 8) +enum reg_subdomains_6g { + EMPTY_6G = 0x0, + FCC1_CLIENT_LPI_REGULAR_6G = 0x01, + FCC1_CLIENT_SP_6G = 0x02, + FCC1_AP_LPI_6G = 0x03, + FCC1_CLIENT_LPI_SUBORDINATE = FCC1_AP_LPI_6G, + FCC1_AP_SP_6G = 0x04, + ETSI1_LPI_6G = 0x10, + ETSI1_VLP_6G = 0x11, + ETSI2_LPI_6G = 0x12, + ETSI2_VLP_6G = 0x13, + APL1_LPI_6G = 0x20, + APL1_VLP_6G = 0x21, +}; + +enum reg_super_domain_6g { + FCC1_6G = 0x01, + ETSI1_6G = 0x02, + ETSI2_6G = 0x03, + APL1_6G = 0x04, + FCC1_6G_CL = 0x05, + }; + struct ath12k_wmi_channel_params { __le32 tlv_header; __le32 mhz; @@ -3369,6 +4263,12 @@ #define ATH12K_WMI_FW_HANG_ASSERT_TYPE 1 #define ATH12K_WMI_FW_HANG_DELAY 0 +enum wmi_fw_hang_recovery_mode_type { + ATH12K_WMI_DISABLE_FW_RECOVERY = 200, + ATH12K_WMI_FW_HANG_RECOVERY_MODE0, + ATH12K_WMI_FW_HANG_RECOVERY_MODE1, +}; + /* type, 0:unused 1: ASSERT 2: not respond detect command * delay_time_ms, the simulate will delay time */ @@ -3386,14 +4286,66 @@ __le32 param_value; } __packed; +enum wmi_stats_id { + WMI_REQUEST_PEER_STAT = BIT(0), + WMI_REQUEST_AP_STAT = BIT(1), + WMI_REQUEST_PDEV_STAT = BIT(2), + WMI_REQUEST_VDEV_STAT = BIT(3), + WMI_REQUEST_BCNFLT_STAT = BIT(4), + WMI_REQUEST_VDEV_RATE_STAT = BIT(5), + WMI_REQUEST_INST_STAT = BIT(6), + WMI_REQUEST_MIB_STAT = BIT(7), + WMI_REQUEST_RSSI_PER_CHAIN_STAT = BIT(8), + WMI_REQUEST_CONGESTION_STAT = BIT(9), + WMI_REQUEST_PEER_EXTD_STAT = BIT(10), + WMI_REQUEST_BCN_STAT = BIT(11), + WMI_REQUEST_BCN_STAT_RESET = BIT(12), + WMI_REQUEST_PEER_EXTD2_STAT = BIT(13), +}; + +struct wmi_request_stats_cmd { + __le32 tlv_header; + /* enum wmi_stats_id */ + __le32 stats_id; + __le32 vdev_id; + struct ath12k_wmi_mac_addr_params peer_macaddr; + __le32 pdev_id; +} __packed; + struct wmi_get_pdev_temperature_cmd { __le32 tlv_header; __le32 param; __le32 pdev_id; } __packed; +#define MAX_WMI_UTF_LEN 252 + +struct wmi_ftm_seg_hdr { + u32 len; + u32 msgref; + u32 segmentinfo; + u32 pdev_id; +} __packed; + +struct wmi_ftm_cmd { + u32 tlv_header; + struct wmi_ftm_seg_hdr seg_hdr; + u8 data[]; +} __packed; + +struct wmi_ftm_event_msg { + struct wmi_ftm_seg_hdr seg_hdr; + u8 data[]; +} __packed; #define WMI_BEACON_TX_BUFFER_SIZE 512 +#define WMI_BEACON_EMA_PARAM_PERIODICITY_SHIFT 0 +#define WMI_BEACON_EMA_PARAM_TMPL_IDX_SHIFT 8 +#define WMI_BEACON_EMA_PARAM_FIRST_TMPL_SHIFT 16 +#define WMI_BEACON_EMA_PARAM_LAST_TMPL_SHIFT 24 + +#define WMI_BEACON_PROTECTION_EN_BIT BIT(0) + struct wmi_bcn_tmpl_cmd { __le32 tlv_header; __le32 vdev_id; @@ -3404,6 +4356,11 @@ __le32 csa_event_bitmap; __le32 mbssid_ie_offset; __le32 esp_ie_offset; + __le32 csc_switch_count_offset; + __le32 csc_event_bitmap; + __le32 mu_edca_ie_offset; + __le32 feature_enable_bitmap; + __le32 ema_params; } __packed; struct wmi_vdev_install_key_cmd { @@ -3454,7 +4411,39 @@ u8 rates[WMI_MAX_SUPPORTED_RATES]; }; +#define EMLSR_DELAY_MAX 5 +#define EMLSR_TRANS_DELAY_MAX 6 +#define EMLCAP_TIMEOUT_MAX 11 +#define IEEE80211_TU_TO_USEC(x) ((x) << 10) /* (x)X1024 */ +#define EMLCAP_TRANSTIMEOUT_0 0 +#define EMLCAP_TRANSTIMEOUT_1 (1U << 7) +#define EMLCAP_TRANSTIMEOUT_2 (1U << 8) +#define EMLCAP_TRANSTIMEOUT_3 (1U << 9) +#define EMLCAP_TRANSTIMEOUT_4 IEEE80211_TU_TO_USEC(1) +#define EMLCAP_TRANSTIMEOUT_5 IEEE80211_TU_TO_USEC((1U << 1)) +#define EMLCAP_TRANSTIMEOUT_6 IEEE80211_TU_TO_USEC((1U << 2)) +#define EMLCAP_TRANSTIMEOUT_7 IEEE80211_TU_TO_USEC((1U << 3)) +#define EMLCAP_TRANSTIMEOUT_8 IEEE80211_TU_TO_USEC((1U << 4)) +#define EMLCAP_TRANSTIMEOUT_9 IEEE80211_TU_TO_USEC((1U << 5)) +#define EMLCAP_TRANSTIMEOUT_10 IEEE80211_TU_TO_USEC((1U << 6)) + +struct peer_assoc_mlo_params { + bool enabled; + bool assoc_link; + bool primary_umac; + bool peer_id_valid; + bool logical_link_idx_valid; + u8 mld_addr[ETH_ALEN]; + u32 logical_link_idx; + u32 ml_peer_id; + u32 ieee_link_id; + u8 num_partner_links; + struct wmi_ml_partner_info partner_info[ATH12K_WMI_MLO_MAX_LINKS]; + u32 eml_caps; +}; + struct ath12k_wmi_peer_assoc_arg { + struct wmi_mac_addr peer_macaddr; u32 vdev_id; u32 peer_new_assoc; u32 peer_associd; @@ -3487,6 +4476,7 @@ bool bw_40; bool bw_80; bool bw_160; + bool bw_320; bool stbc_flag; bool ldpc_flag; bool static_mimops_flag; @@ -3514,8 +4504,39 @@ bool twt_responder; bool twt_requester; struct ath12k_wmi_ppe_threshold_arg peer_ppet; + bool eht_flag; + u32 peer_eht_cap_mac[WMI_MAX_EHTCAP_MAC_SIZE]; + u32 peer_eht_cap_phy[WMI_MAX_EHTCAP_PHY_SIZE]; + u32 peer_eht_mcs_count; + u32 peer_eht_rx_mcs_set[WMI_MAX_EHTCAP_RATE_SET]; + u32 peer_eht_tx_mcs_set[WMI_MAX_EHTCAP_RATE_SET]; + u32 peer_eht_ops; + struct ath12k_ppe_threshold peer_eht_ppet; + u32 ru_punct_bitmap; + bool is_assoc; + struct peer_assoc_mlo_params ml; }; +struct wmi_peer_assoc_mlo_partner_info { + u32 tlv_header; + u32 vdev_id; + u32 hw_link_id; + u32 flags; + u32 logical_link_idx; +} __packed; + +struct wmi_peer_assoc_mlo_params { + u32 tlv_header; + u32 flags; + struct wmi_mac_addr mld_addr; + u32 logical_link_idx; + u32 ml_peer_id; + u32 ieee_link_id; + u32 emlsr_trans_timeout_us; + u32 emlsr_trans_delay_us; + u32 emlsr_padding_delay_us; +} __packed; + struct wmi_peer_assoc_complete_cmd { __le32 tlv_header; struct ath12k_wmi_mac_addr_params peer_macaddr; @@ -3545,8 +4566,23 @@ __le32 peer_he_cap_info_internal; __le32 min_data_rate; __le32 peer_he_caps_6ghz; + __le32 sta_type; + __le32 bss_max_idle_option; + __le32 auth_mode; + __le32 peer_flags_ext; + __le32 ru_punct_bitmap; + __le32 peer_eht_cap_mac[WMI_MAX_EHTCAP_MAC_SIZE]; + __le32 peer_eht_cap_phy[WMI_MAX_EHTCAP_PHY_SIZE]; + __le32 peer_eht_ops; + struct wmi_ppe_threshold peer_eht_ppet; } __packed; +struct stats_request_params { + u32 stats_id; + u32 vdev_id; + u32 pdev_id; +}; + struct wmi_stop_scan_cmd { __le32 tlv_header; __le32 requestor; @@ -3569,6 +4605,7 @@ __le32 pdev_id; } __packed; +#define WMI_MLO_MGMT_TID 0xFFFFFFFF #define WMI_MGMT_SEND_DOWNLD_LEN 64 #define WMI_TX_PARAMS_DWORD0_POWER GENMASK(7, 0) @@ -3596,6 +4633,18 @@ /* This TLV is followed by struct wmi_mgmt_frame */ /* Followed by struct wmi_mgmt_send_params */ + /* Followed by struct wmi_mlo_mgmt_send_params */ +} __packed; + +struct wmi_mlo_mgmt_send_params { + u32 tlv_header; + u32 hw_link_id; +} __packed; + +struct wmi_mgmt_send_params { + u32 tlv_header; + u32 tx_param_dword0; + u32 tx_param_dword1; } __packed; struct wmi_sta_powersave_mode_cmd { @@ -3673,6 +4722,39 @@ } cc_info; } __packed; +#define THERMAL_LEVELS 1 +struct tt_level_config { + u32 tmplwm; + u32 tmphwm; + u32 dcoffpercent; + u32 priority; +}; + +struct ath12k_wmi_thermal_mitigation_arg { + u32 pdev_id; + u32 enable; + u32 dc; + u32 dc_per_event; + struct tt_level_config levelconf[THERMAL_LEVELS]; +}; + +struct wmi_therm_throt_config_request_cmd { + __le32 tlv_header; + __le32 pdev_id; + __le32 enable; + __le32 dc; + __le32 dc_per_event; + __le32 therm_throt_levels; +} __packed; + +struct wmi_therm_throt_level_config_info { + __le32 tlv_header; + u32 temp_lwm; + u32 temp_hwm; + u32 dc_off_percent; + u32 prio; +} __packed; + struct wmi_delba_send_cmd { __le32 tlv_header; __le32 vdev_id; @@ -3704,6 +4786,36 @@ struct ath12k_wmi_mac_addr_params peer_macaddr; } __packed; +struct wmi_pdev_pktlog_filter_info { + __le32 tlv_header; + struct ath12k_wmi_mac_addr_params peer_macaddr; +} __packed; + +struct wmi_pdev_pktlog_filter_cmd { + __le32 tlv_header; + __le32 pdev_id; + __le32 enable; + __le32 filter_type; + __le32 num_mac; +} __packed; + +enum ath12k_wmi_pktlog_enable { + ATH12K_WMI_PKTLOG_ENABLE_AUTO = 0, + ATH12K_WMI_PKTLOG_ENABLE_FORCE = 1, +}; + +struct wmi_pktlog_enable_cmd { + __le32 tlv_header; + __le32 pdev_id; + __le32 evlist; /* WMI_PKTLOG_EVENT */ + __le32 enable; +} __packed; + +struct wmi_pktlog_disable_cmd { + __le32 tlv_header; + __le32 pdev_id; +} __packed; + #define DFS_PHYERR_UNIT_TEST_CMD 0 #define DFS_UNIT_TEST_MODULE 0x2b #define DFS_UNIT_TEST_TOKEN 0xAA @@ -3721,6 +4833,26 @@ u32 radar_param; }; +#define WMI_AWGN_UNIT_TEST_MODULE 0x18 +#define WMI_AWGN_UNIT_TEST_TOKEN 0 +#define WMI_UNIT_TEST_AWGN_INTF_TYPE 1 +#define WMI_UNIT_TEST_AWGN_PRIMARY_20 0x01 + +enum wmi_awgn_test_args_idx { + WMI_AWGN_TEST_AWGN_INT, + WMI_AWGN_TEST_BITMAP, + WMI_AWGN_MAX_TEST_ARGS, +}; + +#define WMI_M3_UNIT_TEST_MODULE 0x22 +#define WMI_M3_UNIT_TEST_TOKEN 0 + +enum wmi_m3_test_args_idx { + WMI_M3_TEST_CMDID, + WMI_M3_TEST_ENABLE, + WMI_M3_MAX_TEST_ARGS, +}; + struct wmi_unit_test_cmd { __le32 tlv_header; __le32 vdev_id; @@ -3757,6 +4889,9 @@ #define WMI_PEER_160MHZ 0x40000000 #define WMI_PEER_SAFEMODE_EN 0x80000000 +#define WMI_PEER_EXT_EHT 0x00000001 +#define WMI_PEER_EXT_320MHZ 0x00000002 + struct ath12k_wmi_vht_rate_set_params { __le32 tlv_header; __le32 rx_max_rate; @@ -3768,6 +4903,14 @@ struct ath12k_wmi_he_rate_set_params { __le32 tlv_header; + /* MCS at which the peer can receive */ + __le32 rx_mcs_set; + /* MCS at which the peer can transmit */ + __le32 tx_mcs_set; +} __packed; + +struct wmi_eht_rate_set { + __le32 tlv_header; __le32 rx_mcs_set; __le32 tx_mcs_set; } __packed; @@ -3775,7 +4918,6 @@ #define MAX_REG_RULES 10 #define REG_ALPHA2_LEN 2 #define MAX_6G_REG_RULES 5 -#define REG_US_5G_NUM_REG_RULES 4 enum wmi_start_event_param { WMI_VDEV_START_RESP_EVENT = 0, @@ -3796,6 +4938,7 @@ }; __le32 cfgd_tx_streams; __le32 cfgd_rx_streams; + s32 max_allowed_tx_power; } __packed; /* VDEV start response status codes */ @@ -3805,6 +4948,10 @@ WMI_VDEV_START_RESPONSE_NOT_SUPPORTED = 2, WMI_VDEV_START_RESPONSE_DFS_VIOLATION = 3, WMI_VDEV_START_RESPONSE_INVALID_REGDOMAIN = 4, + /** Band unsupported by current hw mode in VDEV start */ + WMI_VDEV_START_RESPONSE_INVALID_BAND = 5, + WMI_VDEV_START_RESPONSE_INVALID_PREFERRED_TX_RX_STREAMS = 6, /** Invalid preferred tx/rx streams */ + WMI_VDEV_START_RESPONSE_INVALID_TX_VAP_CONFIG = 7, /** Invalid tx_vap config in VDEV start */ }; enum wmi_reg_6g_ap_type { @@ -3846,6 +4993,11 @@ #define WMI_REG_CLIENT_MAX 4 +enum wmi_reg_chan_list_cmd_type { + WMI_REG_CHAN_LIST_CC_ID = 0, + WMI_REG_CHAN_LIST_CC_EXT_ID = 1, +}; + struct wmi_reg_chan_list_cc_ext_event { __le32 status_code; __le32 phy_id; @@ -3918,7 +5070,6 @@ } __packed; struct wmi_pdev_bss_chan_info_event { - __le32 pdev_id; __le32 freq; /* Units in MHz */ __le32 noise_floor; /* units are dBm */ /* rx clear - how often the channel was unused */ @@ -3936,6 +5087,7 @@ /*rx_cycle cnt for my bss in 64bits format */ __le32 rx_bss_cycle_count_low; __le32 rx_bss_cycle_count_high; + __le32 pdev_id; } __packed; #define WMI_VDEV_INSTALL_KEY_COMPL_STATUS_SUCCESS 0 @@ -3977,6 +5129,177 @@ __le32 tx_status; } __packed; +struct wmi_pdev_stats_base { + s32 chan_nf; + u32 tx_frame_count; /* Cycles spent transmitting frames */ + u32 rx_frame_count; /* Cycles spent receiving frames */ + u32 rx_clear_count; /* Total channel busy time, evidently */ + u32 cycle_count; /* Total on-channel time */ + u32 phy_err_count; + u32 chan_tx_pwr; +} __packed; + +struct wmi_pdev_stats_extra { + u32 ack_rx_bad; + u32 rts_bad; + u32 rts_good; + u32 fcs_bad; + u32 no_beacons; + u32 mib_int_count; +} __packed; + +struct wmi_pdev_stats_tx { + /* Num HTT cookies queued to dispatch list */ + s32 comp_queued; + + /* Num HTT cookies dispatched */ + s32 comp_delivered; + + /* Num MSDU queued to WAL */ + s32 msdu_enqued; + + /* Num MPDU queue to WAL */ + s32 mpdu_enqued; + + /* Num MSDUs dropped by WMM limit */ + s32 wmm_drop; + + /* Num Local frames queued */ + s32 local_enqued; + + /* Num Local frames done */ + s32 local_freed; + + /* Num queued to HW */ + s32 hw_queued; + + /* Num PPDU reaped from HW */ + s32 hw_reaped; + + /* Num underruns */ + s32 underrun; + + /* Num PPDUs cleaned up in TX abort */ + s32 tx_abort; + + /* Num MPDUs requeued by SW */ + s32 mpdus_requed; + + /* excessive retries */ + u32 tx_ko; + + /* data hw rate code */ + u32 data_rc; + + /* Scheduler self triggers */ + u32 self_triggers; + + /* frames dropped due to excessive sw retries */ + u32 sw_retry_failure; + + /* illegal rate phy errors */ + u32 illgl_rate_phy_err; + + /* wal pdev continuous xretry */ + u32 pdev_cont_xretry; + + /* wal pdev tx timeouts */ + u32 pdev_tx_timeout; + + /* wal pdev resets */ + u32 pdev_resets; + + /* frames dropped due to non-availability of stateless TIDs */ + u32 stateless_tid_alloc_failure; + + /* PhY/BB underrun */ + u32 phy_underrun; + + /* MPDU is more than txop limit */ + u32 txop_ovf; +} __packed; + +struct wmi_pdev_stats_rx { + /* Cnts any change in ring routing mid-ppdu */ + s32 mid_ppdu_route_change; + + /* Total number of statuses processed */ + s32 status_rcvd; + + /* Extra frags on rings 0-3 */ + s32 r0_frags; + s32 r1_frags; + s32 r2_frags; + s32 r3_frags; + + /* MSDUs / MPDUs delivered to HTT */ + s32 htt_msdus; + s32 htt_mpdus; + + /* MSDUs / MPDUs delivered to local stack */ + s32 loc_msdus; + s32 loc_mpdus; + + /* AMSDUs that have more MSDUs than the status ring size */ + s32 oversize_amsdu; + + /* Number of PHY errors */ + s32 phy_errs; + + /* Number of PHY errors drops */ + s32 phy_err_drop; + + /* Number of mpdu errors - FCS, MIC, ENC etc. */ + s32 mpdu_errs; +} __packed; + +struct wmi_pdev_stats { + struct wmi_pdev_stats_base base; + struct wmi_pdev_stats_tx tx; + struct wmi_pdev_stats_rx rx; +} __packed; + +#define WLAN_MAX_AC 4 +#define MAX_TX_RATE_VALUES 10 +#define MAX_TX_RATE_VALUES 10 + +struct wmi_vdev_stats { + u32 vdev_id; + u32 beacon_snr; + u32 data_snr; + u32 num_tx_frames[WLAN_MAX_AC]; + u32 num_rx_frames; + u32 num_tx_frames_retries[WLAN_MAX_AC]; + u32 num_tx_frames_failures[WLAN_MAX_AC]; + u32 num_rts_fail; + u32 num_rts_success; + u32 num_rx_err; + u32 num_rx_discard; + u32 num_tx_not_acked; + u32 tx_rate_history[MAX_TX_RATE_VALUES]; + u32 beacon_rssi_history[MAX_TX_RATE_VALUES]; +} __packed; + +struct wmi_bcn_stats { + u32 vdev_id; + u32 tx_bcn_succ_cnt; + u32 tx_bcn_outage_cnt; +} __packed; + +struct wmi_stats_event { + __le32 stats_id; + __le32 num_pdev_stats; + __le32 num_vdev_stats; + __le32 num_peer_stats; + __le32 num_bcnflt_stats; + __le32 num_chan_stats; + __le32 num_mib_stats; + __le32 pdev_id; + __le32 num_bcn_stats; + __le32 num_peer_extd_stats; + __le32 num_peer_extd2_stats; +} __packed; + struct wmi_pdev_ctl_failsafe_chk_event { __le32 pdev_id; __le32 ctl_failsafe_status; @@ -4001,10 +5324,83 @@ a_sle32 sidx; } __packed; +struct wmi_pdev_radar_flags_param { + __le32 radar_flags; +} __packed; +#define WMI_PDEV_RADAR_FLAGS_FULL_BW_NOL_MARK_BIT 0 + +#define WMI_DCS_AWGN_INTF 0x04 + +struct wmi_dcs_awgn_info { + u32 channel_width; + u32 chan_freq; + u32 center_freq0; + u32 center_freq1; + u32 chan_bw_interference_bitmap; +} __packed; + +struct wmi_dcs_interference_ev { + u32 interference_type; + u32 pdev_id; +} __packed; + +enum wmi_host_channel_width { + WMI_HOST_CHAN_WIDTH_20 = 0, + WMI_HOST_CHAN_WIDTH_40 = 1, + WMI_HOST_CHAN_WIDTH_80 = 2, + WMI_HOST_CHAN_WIDTH_160 = 3, + WMI_HOST_CHAN_WIDTH_80P80 = 4, + WMI_HOST_CHAN_WIDTH_5 = 5, + WMI_HOST_CHAN_WIDTH_10 = 6, + WMI_HOST_CHAN_WIDTH_165 = 7, + WMI_HOST_CHAN_WIDTH_160P160 = 8, + WMI_HOST_CHAN_WIDTH_320 = 9, + /*keep last */ + WMI_HOST_CHAN_WIDTH_MAX = 0xF, +}; + +enum wmi_dcs_interference_chan_segment { + WMI_DCS_SEG_PRI20 = 0x1, + WMI_DCS_SEG_SEC20 = 0x2, + WMI_DCS_SEG_SEC40_LOW = 0x4, + WMI_DCS_SEG_SEC40_UP = 0x8, + WMI_DCS_SEG_SEC40 = 0xC, + WMI_DCS_SEG_SEC80_LOW = 0x10, + WMI_DCS_SEG_SEC80_LOW_UP = 0x20, + WMI_DCS_SEG_SEC80_UP_LOW = 0x40, + WMI_DCS_SEG_SEC80_UP = 0x80, + WMI_DCS_SEG_SEC80 = 0xF0, + WMI_DCS_SEG_SEC160_LOW = 0x0100, + WMI_DCS_SEG_SEC160_LOW_UP = 0x0200, + WMI_DCS_SEG_SEC160_LOW_UP_UP = 0x0400, + WMI_DCS_SEG_SEC160_LOW_UP_UP_UP = 0x0800, + WMI_DCS_SEG_SEC160_UP_LOW_LOW_LOW = 0x1000, + WMI_DCS_SEG_SEC160_UP_LOW_LOW = 0x2000, + WMI_DCS_SEG_SEC160_UP_LOW = 0x4000, + WMI_DCS_SEG_SEC160_UP = 0x8000, + WMI_DCS_SEG_SEC160 = 0xFF00, +}; + struct wmi_pdev_temperature_event { /* temperature value in Celsius degree */ a_sle32 temp; __le32 pdev_id; + __le32 mbssid_flags; + __le32 mbssid_tx_vdev_id; +} __packed; + +#define WMI_AC_BE 0 +#define WMI_AC_BK 1 +#define WMI_AC_VI 2 +#define WMI_AC_VO 3 +#define WMI_AC_MAX 4 + +struct wmi_pdev_update_muedca_event { + u32 pdev_id; + u32 aifsn[WMI_AC_MAX]; + u32 ecwmin[WMI_AC_MAX]; + u32 ecwmax[WMI_AC_MAX]; + u32 muedca_expiration_time[WMI_AC_MAX]; } __packed; #define WMI_RX_STATUS_OK 0x00 @@ -4015,6 +5411,1000 @@ #define WLAN_MGMT_TXRX_HOST_MAX_ANTENNA 4 +/** + * ath12k_host_mlo_glb_per_chip_crash_info - per chip crash + * information in MLO global shared memory + * @chip_id: MLO chip id + * @crash_reason: Address of the crash_reason corresponding to chip_id + * recovery_mode: Address of recovery mode corressponding to chip_id + */ +struct ath12k_host_mlo_glb_per_chip_crash_info { + u8 chip_id; + void *crash_reason; + void *recovery_mode; +}; + +/** + * ath12k_host_mlo_glb_chip_crash_info - chip crash information in MLO + * global shared memory + * @no_of_chips: No of partner chip to which crash information is shared + * @valid_chip_bmap: Valid chip bitmap + * @per_chip_crash_info: pointer to per chip crash information. + */ +struct ath12k_host_mlo_glb_chip_crash_info { + u8 no_of_chips; + u8 valid_chip_bmap; + struct ath12k_host_mlo_glb_per_chip_crash_info *per_chip_crash_info; +}; + +/** + * ath12k_host_mlo_glb_rx_reo_snapshot_info - MGMT Rx REO information in MLO + * global shared memory + * @num_links: Number of valid links + * @valid_link_bmap: Valid link bitmap + * @link_info: pointer to an array of Rx REO per-link information + * @hw_forwarded_snapshot_ver: HW forwarded snapshot version + * @fw_forwarded_snapshot_ver: FW forwarded snapshot version + * @fw_consumed_snapshot_ver: FW consumed snapshot version + */ +struct ath12k_host_mlo_glb_rx_reo_snapshot_info { + u8 num_links; + u16 valid_link_bmap; + struct ath12k_host_mlo_glb_rx_reo_per_link_info *link_info; + u8 hw_forwarded_snapshot_ver; + u8 fw_forwarded_snapshot_ver; + u8 fw_consumed_snapshot_ver; +}; + +/** + * ath12k_host_ath12k_mlo_glb_shmem_params - MLO global shared memory parameters + * @major_version: Major version + * @minor_version: Minor version + */ +struct ath12k_host_ath12k_mlo_glb_shmem_params { + u16 major_version; + u16 minor_version; +}; + +/** + * ath12k_host_mlo_mem_arena - MLO Global shared memory arena context + * @shmem_params: shared memory parameters + * @rx_reo_snapshot_info: MGMT Rx REO snapshot information + * @init_done: Initialized snapshot info + */ +struct ath12k_host_mlo_mem_arena { + struct ath12k_host_ath12k_mlo_glb_shmem_params shmem_params; + struct ath12k_host_mlo_glb_rx_reo_snapshot_info rx_reo_snapshot_info; + struct ath12k_host_mlo_glb_chip_crash_info global_chip_crash_info; + bool init_done; + /* Protect the parallel initialization */ + struct mutex mutex_lock; +}; + +/** Helper Macros for tlv header of the given tlv buffer */ +/* Size of the TLV Header which is the Tag and Length fields */ +#define MLO_SHMEM_TLV_HDR_SIZE (1 * sizeof(u32)) + +/* TLV Helper macro to get the TLV Header given the pointer to the TLV buffer. */ +#define MLO_SHMEMTLV_GET_HDR(tlv_buf) (((u32 *)(tlv_buf))[0]) + +/* TLV Helper macro to set the TLV Header given the pointer to the TLV buffer. */ +#define MLO_SHMEMTLV_SET_HDR(tlv_buf, tag, len) \ + ((((u32 *)(tlv_buf))[0]) = ((tag << 16) | (len & 0x0000FFFF))) + +/* TLV Helper macro to get the TLV Tag given the TLV header. */ +#define MLO_SHMEMTLV_GET_TLVTAG(tlv_header) ((u32)((tlv_header) >> 16)) + +/* TLV Helper macro to get the TLV Buffer Length (minus TLV header size) + * given the TLV header. + */ +#define MLO_SHMEMTLV_GET_TLVLEN(tlv_header) \ + ((u32)((tlv_header) & 0x0000FFFF)) +/* TLV Helper macro to get the TLV length from TLV structure size + * by removing TLV header size. + */ +#define MLO_SHMEMTLV_GET_STRUCT_TLVLEN(tlv_struct) \ + ((u32)(sizeof(tlv_struct) - MLO_SHMEM_TLV_HDR_SIZE)) + +/* Definition of Global H SHMEM Arena */ +struct ath12k_mlo_glb_shmem { + /* TLV tag and len; tag equals ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_H_SHMEM */ + u32 tlv_header; + /** + * major_minor_version + * + * [15:0]: minor version + * [31:16]: major version + */ + u32 major_minor_version; + /* This TLV is followed by TLVs + * mlo_glb_rx_reo_snapshot_info reo_snapshot; + * struct mlo_glb_link_info glb_info; + */ +}; + +#define MLO_SHMEM_GLB_H_SHMEM_PARAM_MAJOR_VERSION_MASK GENMASK(31, 16) +#define MLO_SHMEM_GLB_H_SHMEM_PARAM_MINOR_VERSION_MASK GENMASK(15, 0) +#define MLO_SHMEM_GLB_LINK_INFO_PARAM_VALID_LINK_BMAP_MASK GENMASK(19, 4) +#define MLO_SHMEM_GLB_LINK_INFO_PARAM_NO_OF_LINKS_MASK GENMASK(3, 0) +#define MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_HW_FWD_SNAPSHOT_VER_MASK GENMASK(2, 0) +#define MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_FWD_SNAPSHOT_VER_MASK GENMASK(5, 3) +#define MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_CONSUMED_SNAPSHOT_VER_MASK GENMASK(8, 6) +#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_MASK GENMASK(1, 0) +#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_MASK GENMASK(4, 2) + +#define MLO_SHMEM_GLB_H_SHMEM_PARAM_MAJOR_VERSION_GET(major_minor_version) \ + FIELD_GET(MLO_SHMEM_GLB_H_SHMEM_PARAM_MAJOR_VERSION_MASK, major_minor_version) +#define MLO_SHMEM_GLB_H_SHMEM_PARAM_MINOR_VERSION_GET(major_minor_version) \ + FIELD_GET(MLO_SHMEM_GLB_H_SHMEM_PARAM_MINOR_VERSION_MASK, major_minor_version) + +#define MLO_SHMEM_GLB_LINK_INFO_PARAM_VALID_LINK_BMAP_GET(link_info) \ + FIELD_GET(MLO_SHMEM_GLB_LINK_INFO_PARAM_VALID_LINK_BMAP_MASK, link_info) +#define MLO_SHMEM_GLB_LINK_INFO_PARAM_NO_OF_LINKS_GET(link_info) \ + FIELD_GET(MLO_SHMEM_GLB_LINK_INFO_PARAM_NO_OF_LINKS_MASK, link_info) +#define MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_HW_FWD_SNAPSHOT_VER_GET(snapshot_ver_info) \ + FIELD_GET(MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_HW_FWD_SNAPSHOT_VER_MASK, snapshot_ver_info) +#define MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_FWD_SNAPSHOT_VER_GET(snapshot_ver_info) \ + FIELD_GET(MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_FWD_SNAPSHOT_VER_MASK, snapshot_ver_info) +#define MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_CONSUMED_SNAPSHOT_VER_GET(snapshot_ver_info) \ + FIELD_GET(MLO_SHMEM_GLB_RX_REO_SNAPSHOT_PARAM_FW_CONSUMED_SNAPSHOT_VER_MASK, snapshot_ver_info) + +#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_GET(chip_info) \ + FIELD_GET(MLO_SHMEM_CHIP_CRASH_INFO_PARAM_NO_OF_CHIPS_MASK, chip_info) +#define MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_GET(chip_info) \ + FIELD_GET(MLO_SHMEM_CHIP_CRASH_INFO_PARAM_VALID_CHIP_BMAP_MASK, chip_info) + +/** Definition of the GLB_H_SHMEM arena tlv structures */ +enum { + ATH12K_MLO_SHMEM_TLV_STRUCT_MGMT_RX_REO_SNAPSHOT, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_PER_LINK_SNAPSHOT_INFO, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK_INFO, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_H_SHMEM, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_CHIP_CRASH_INFO, + ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_PER_CHIP_CRASH_INFO, +}; + +struct mlo_glb_link_info { + /* TLV tag and len; tag equals ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_LINK_INFO */ + u32 tlv_header; + + /** + * link_info + * + * [3:0]: no_of_links + * [19:4]: valid_link_bmap + * [31:20]: reserved + */ + u32 link_info; + /* This TLV is followed by array of mlo_glb_link: + * mlo_glb_link will have multiple instances equal to num of hw links + * received by no_of_link + * mlo_glb_link glb_link_info[]; + */ +}; + +enum ath12k_mlo_chip_crash_reason { + ATH12K_MLO_SHMEM_CRASH_PARTNER_CHIPS = 1, +}; + +struct mlo_glb_chip_crash_info { + /* TLV tag and len; tag equals + * MLO_SHMEM_TLV_STRUCT_MLO_GLB_CHIP_CRASH_INFO */ + u32 tlv_header; + + /** + * [1:0]: no_of_chips + * [4:2]: valid_chip_bmap + * For number of chips beyond 3, extension fields are added. + * [9:5]: valid_chip_bmap_ext + * [15:12]: no_of_chips_ext + * [31:16]: reserved + */ + u32 chip_info; + /* + * This TLV is followed by array of mlo_glb_per_chip_crash_info: + * mlo_glb_per_chip_crash_info will have multiple instances equal to + * num of partner chips received by no_of_chips + * mlo_glb_per_chip_crash_info per_chip_crash_info[]; + */ +}; + +struct mlo_glb_per_chip_crash_info { + /* TLV tag and len; tag equals MLO_SHMEM_TLV_STRUCT_MLO_GLB_PER_CHIP_CRASH_INFO */ + u32 tlv_header; + + /* + * crash reason, takes value in enum ath12k_mlo_chip_crash_reason + */ + u32 crash_reason; + + /* + * recovery mode, takes value in enum ath12k_mlo_recovery_mode + */ + u32 recovery_mode; +}; + + +/* Definition of the complete REO snapshot info */ +struct mlo_glb_rx_reo_snapshot_info { + /* TLV tag and len; tag equals ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_SNAPSHOT_INFO */ + u32 tlv_header; + + /** + * link_info + * + * [3:0]: no_of_links + * [19:4]: valid_link_bmap + * [31:20]: reserved + */ + u32 link_info; + + /** + * snapshot_ver_info + * + * [2:0]: hw_forwarded snapshot version + * [5:3]: fw_forwarded snapshot version + * [8:6]: fw_consumed snapshot version + * [31:9]: reserved + */ + u32 snapshot_ver_info; + u32 reserved_alignment_padding; + + /* This TLV is followed by array of mlo_glb_rx_reo_per_link_snapshot_info: + * mlo_glb_rx_reo_per_link_snapshot_info will have multiple instances + * equal to num of hw links received by no_of_link + * mlo_glb_rx_reo_per_link_snapshot_info per_link_info[]; + */ +}; + +struct ath12k_host_mlo_glb_rx_reo_per_link_info { + u8 link_id; + void *fw_consumed; + void *fw_forwarded; + void *hw_forwarded; +}; + +/* REO snapshot structure */ +struct mgmt_rx_reo_snapshot { + /* TLV tag and len; tag equals ATH12K_MLO_SHMEM_TLV_STRUCT_MGMT_RX_REO_SNAPSHOT */ + u32 tlv_header; + u32 reserved_alignment_padding; + /** + * mgmt_rx_reo_snapshot_low + * + * [0]: valid + * [16:1]: mgmt_pkt_ctr + * [31:17]: global_timestamp_low + */ + u32 mgmt_rx_reo_snapshot_low; + + /** + * mgmt_rx_reo_snapshot_high + * + * [16:0]: global_timestamp_high + * [31:17]: mgmt_pkt_ctr_redundant + */ + u32 mgmt_rx_reo_snapshot_high; + +}; + +struct mlo_glb_rx_reo_per_link_snapshot_info { + /* TLV tag and len; tag equals ATH12K_MLO_SHMEM_TLV_STRUCT_MLO_GLB_RX_REO_PER_LINK_SNAPSHOT_INFO */ + u32 tlv_header; + u32 reserved_alignment_padding; + struct mgmt_rx_reo_snapshot fw_consumed; + struct mgmt_rx_reo_snapshot fw_forwarded; + struct mgmt_rx_reo_snapshot hw_forwarded; +}; + +/** + * Enum which defines different versions of management Rx reorder snapshots. + */ +enum { + /** + * DWORD Lower: + * [15:0] : Management packet counter + * [30:16] : Redundant global time stamp = Global time stamp[14:0] + * [31] : Valid + * + * DWORD Upper: + * [31:0] : Global time stamp + * + */ + ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY = 0, + + /** + * DWORD Lower: + * [14:0] : Global time stamp[14:0] + * [30:15] : Management packet counter + * [31] : Valid + * + * DWORD Upper: + * [14:0] : Redundant management packet counter = Management packet + * counter[14:0] + * [31:15] : Global time stamp[31:15] + */ + ATH12K_MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY = 1, +}; + +/** + * Macros for getting and setting the required number of bits + * from the TLV params. + */ +#define ATH12K_MLO_SHMEM_GET_BITS(_val, _index, _num_bits) \ + (((_val) >> (_index)) & ((1 << (_num_bits)) - 1)) + +/* WMI CMD to receive the management filter criteria from the host */ +struct ath12k_wmi_mgmt_rx_reo_filter_config_cmd_fixed_param { + u32 tlv_header; + u32 pdev_id; /* pdev_id for identifying the MAC */ + /* filter: + * Each bit represents the possible combination of frame type (2 bits) + * and subtype (4 bits) + * There would be 64 such combinations as per the 802.11 standard + * For Exp : We have beacon frame, we will take the type and subtype + * of this frame and concatenate the bits, it will give 6 bits + * number. We need to go to that bit position in the below + * 2 filter_low and filter_high bitmap and set the bit. + */ + u32 filter_low; + u32 filter_high; +}; + +#define WMI_MGMT_RX_FW_CONSUMED_PARAM_MGMT_PKT_CTR_VALID_GET GENMASK(15, 15) +#define WMI_MGMT_RX_FW_CONSUMED_PARAM_MGMT_PKT_CTR_GET GENMASK(31, 16) + +struct ath12k_wmi_mgmt_rx_fw_consumed_hdr { + u32 rx_tsf_l32; /* h/w assigned timestamp of the rx frame in micro sec */ + u32 rx_tsf_u32 ;/* h/w assigned timestamp of the rx frame in micro sec */ + u32 pdev_id; /* pdev_id for identifying the MAC the rx mgmt frame was received by */ + /** + * peer_info_subtype + * + * [15:0]: ml_peer_id, ML peer_id unique across chips + * [18:16]: ieee_link_id, protocol link id on which the rx frame is received + * [27:19]: reserved + * [31:28]: subtype, subtype of the received MGMT frame + */ + u32 peer_info_subtype; + u32 chan_freq; /* frequency in MHz of the channel on which this frame was received */ + /* Timestamp (in micro sec) of the last fw consumed/dropped mgmt. frame, same across chips */ + u32 global_timestamp; + /** + * mgmt_pkt_ctr_info + * + * [14:0]: reserved + * [15]: mgmt_pkt_ctr_valid + * [31:16]: mgmt_pkt_ctr, Sequence number of the last fw consumed mgmt frame + */ + u32 mgmt_pkt_ctr_info; + u32 rx_ppdu_duration_us; /* receive duration in us */ + u32 mpdu_end_timestamp; /* mpdu end timestamp in us (based on HWMLO timer) */ +}; + +#define WMI_MGMT_RX_REO_PARAM_IEEE_LINK_ID_GET GENMASK(14, 12) +#define WMI_MGMT_RX_REO_PARAM_MGMT_PKT_CTR_VALID_GET GENMASK(15, 15) +#define WMI_MGMT_RX_REO_PARAM_MGMT_PKT_CTR_GET GENMASK(31, 16) + +/** Data structure of the TLV to add in RX EVENTID for providing REO params + * like global_timestamp and mgmt_pkt_ctr + */ +struct ath12k_wmi_mgmt_rx_reo_params { + /* Timestamp (in micro sec) of the last fw forwarded mgmt. frame, same across chips */ + u32 global_timestamp; + /** + * mgmt_pkt_ctr_link_info + * + * [11:0]: reserved + * [14:12]: ieee_link_id, protocol link id on which the rx frame is received + * [15]: mgmt_pkt_ctr_valid + * [31:16]: mgmt_pkt_ctr, Sequence number of the last fw forwarded mgmt frame + */ + + u32 mgmt_pkt_ctr_link_info; + u32 rx_ppdu_duration_us; /* receive duration in us */ + u32 mpdu_end_timestamp; /* mpdu end timestamp in us (based on HWMLO timer) */ +}; + +/* struct ath12k_mgmt_rx_reo_params - MGMT Rx REO parameters + * @valid: Whether these params are valid + * @pdev_id: pdev ID for which FW consumed event is received + * @link_id: link ID for which FW consumed event is received + * @mgmt_pkt_ctr: MGMT packet counter of the frame that is consumed + * @global_timestamp: Global timestamp of the frame that is consumed + * @duration_us: duration in us + * @start_timestamp: start time stamp + * @end_timestamp: end time stamp + */ +struct ath12k_mgmt_rx_reo_params { + bool valid; + u8 pdev_id; + u8 link_id; + u8 mlo_grp_id; + u16 mgmt_pkt_ctr; + u32 global_timestamp; + u16 duration_us; + u32 start_timestamp; + u32 end_timestamp; +}; + +/* struct ath12k_mgmt_rx_reo_filter - MGMT Rx REO filter + * @filter_low: Least significant 32-bits of the filter + * @filter_high: Most significant 32-bits of the filter + */ +struct ath12k_mgmt_rx_reo_filter { + u32 low; + u32 high; +}; + +/* struct ath12k_mgmt_rx_reo_wait_count - Wait count for a mgmt frame + * @per_link_count: Array of wait counts for all MLO links. Each array entry + * holds the number of frames this mgmt frame should wait for on that + * particular link. + * @total_count: Sum of entries in @per_link_count + */ +struct ath12k_mgmt_rx_reo_wait_count { + unsigned int per_link_count[ATH12K_WMI_MLO_MAX_LINKS]; + unsigned long long total_count; +}; + +/* struct ath12k_mgmt_rx_reo_snapshot_params - Represents the simplified version of + * Management Rx Frame snapshot for Host use. Note that this is different from + * the structure shared between the Host and FW/HW + * @valid: Whether this snapshot is valid + * @retry_count: snapshot read retry count + * @mgmt_pkt_ctr: MGMT packet counter. This will be local to a particular + * HW link + * @global_timestamp: Global timestamp.This is taken from a clock which is + * common across all the HW links + */ +struct ath12k_mgmt_rx_reo_snapshot_params { + bool valid; + u8 retry_count; + u16 mgmt_pkt_ctr; + u32 global_timestamp; +}; + +/* struct ath12k_mgmt_rx_reo_shared_snapshot - Represents the management rx-reorder + * shared snapshots + * @ath12k_mgmt_rx_reo_snapshot_low: Lower 32 bits of the reo snapshot + * @ath12k_mgmt_rx_reo_snapshot_high: Higher 32 bits of the reo snapshot + */ +struct ath12k_mgmt_rx_reo_shared_snapshot { + union { + u32 ath12k_mgmt_rx_reo_snapshot_low; + u32 mgmt_pkt_ctr_ver_a:16, + global_timestamp_redundant_ver_a:15, + valid_ver_a:1; + u32 global_timestamp_low_ver_b:15, + mgmt_pkt_ctr_ver_b:16, + valid_ver_b:1; + } u_low; + + union { + u32 ath12k_mgmt_rx_reo_snapshot_high; + u32 global_timestamp_ver_a; + u32 mgmt_pkt_ctr_redundant_ver_b:15, + global_timestamp_high_ver_b:17; + } u_high; +}; + +/* struct ath12k_mgmt_rx_reo_snapshot_info - Information related to management Rx + * reorder snapshot + * @address: Snapshot address + * @version: Snapshot version + */ +struct ath12k_mgmt_rx_reo_snapshot_info { + struct ath12k_mgmt_rx_reo_shared_snapshot *address; + u8 version; +}; + +#define ATH12K_MGMT_RX_REO_SNAPSHOT_B2B_READ_SWAR_RETRY_LIMIT (11) +#define ATH12K_MGMT_RX_REO_SNAPSHOT_READ_RETRY_LIMIT (25) + +/* enum ath12k_mgmt_rx_reo_shared_snapshot_id - Represents the management + * rx-reorder snapshots shared between host and target in the host DDR. + * These snapshots are written by FW/HW and read by Host. + * @ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED: FW consumed snapshot + * @ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED: FW forwarded snapshot + * @ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW: MAC HW snapshot + * @ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX: Max number of snapshots + * @ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_INVALID: Invalid snapshot + */ +enum ath12k_mgmt_rx_reo_shared_snapshot_id { + ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_CONSUMED = 0, + ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_FW_FORWARDED = 1, + ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAC_HW = 2, + ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX = 3, + ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_INVALID, +}; + +/* struct ath12k_mgmt_rx_reo_pdev_info - Pdev information required by the Management + * Rx REO module + * @host_snapshot: Latest snapshot seen at the Host. + * It considers both MGMT Rx and MGMT FW consumed. + * @last_valid_shared_snapshot: Array of last valid snapshots(for snapshots + * shared between host and target) + * @host_target_shared_snapshot_info: Array of meta information related to + * snapshots(for snapshots shared between host and target) + * @filter: MGMT Rx REO filter + * @init_complete: Flag to indicate initialization completion of the + * ath12k_mgmt_rx_reo_pdev_info object + */ +struct ath12k_mgmt_rx_reo_pdev_info { + struct ath12k_mgmt_rx_reo_snapshot_params host_snapshot; + struct ath12k_mgmt_rx_reo_snapshot_params last_valid_shared_snapshot + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_snapshot_info host_target_shared_snapshot_info + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_filter filter; + struct ath12k_mgmt_rx_reo_shared_snapshot raw_snapshots[ATH12K_WMI_MLO_MAX_LINKS] + [ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX] + [ATH12K_MGMT_RX_REO_SNAPSHOT_READ_RETRY_LIMIT] + [ATH12K_MGMT_RX_REO_SNAPSHOT_B2B_READ_SWAR_RETRY_LIMIT]; + bool init_complete; +}; + +/* enum ath12k_mgmt_rx_reo_frame_descriptor_type - Enumeration for management frame + * descriptor type. + * @ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME: Management frame to be consumed + * by host. + * @ATH12K_MGMT_RX_REO_FRAME_DESC_FW_CONSUMED_FRAME: Management frame consumed by FW + * @ATH12K_MGMT_RX_REO_FRAME_DESC_ERROR_FRAME: Management frame which got dropped + * at host due to any error + * @ATH12K_MGMT_RX_REO_FRAME_DESC_TYPE_MAX: Maximum number of frame types + */ +enum ath12k_mgmt_rx_reo_frame_descriptor_type { + ATH12K_MGMT_RX_REO_FRAME_DESC_HOST_CONSUMED_FRAME = 0, + ATH12K_MGMT_RX_REO_FRAME_DESC_FW_CONSUMED_FRAME, + ATH12K_MGMT_RX_REO_FRAME_DESC_ERROR_FRAME, + ATH12K_MGMT_RX_REO_FRAME_DESC_TYPE_MAX, +}; + +/* struct ath12k_mgmt_rx_reo_global_ts_info - This structure holds the global time + * stamp information of a frame. + * @valid: Indicates whether global time stamp is valid + * @global_ts: Global time stamp value + * @start_ts: Start time stamp value + * @end_ts: End time stamp value + * @expiry_time: information in the structure is valid until expiry_time + */ +struct ath12k_mgmt_rx_reo_global_ts_info { + bool valid; + u32 global_ts; + u32 start_ts; + u32 end_ts; + unsigned long expiry_time; +}; + +/* struct ath12k_reo_ingress_debug_frame_info - Debug information about a frame + * entering reorder process + * @link_id: link id + * @mgmt_pkt_ctr: management packet counter + * @global_timestamp: MLO global time stamp + * @start_timestamp: start time stamp of the frame + * @end_timestamp: end time stamp of the frame + * @duration_us: duration of the frame in us + * @desc_type: Type of the frame descriptor + * @frame_type: frame type + * @frame_subtype: frame sub type + * @ingress_timestamp: Host time stamp when the frames enters the reorder + * process + * @ingress_duration: Duration in us for processing the incoming frame. + * ingress_duration = Time stamp at which reorder list update is done - + * Time stamp at which frame has entered the reorder module + * @wait_count: Wait count calculated for the current frame + * @is_queued: Indicates whether this frame is queued to reorder list + * @is_stale: Indicates whether this frame is stale. + * @is_parallel_rx: Indicates that this frame is received in parallel to the + * last frame which is delivered to the upper layer. + * @zero_wait_count_rx: Indicates whether this frame's wait count was + * zero when received by host + * @immediate_delivery: Indicates whether this frame can be delivered + * immediately to the upper layers + * @is_error: Indicates whether any error occurred during processing this frame + * @ts_last_released_frame: Stores the global time stamp for the last frame + * removed from the reorder list + * @list_size_rx: Size of the reorder list when this frame is received (before + * updating the list based on this frame). + * @list_insertion_pos: Position in the reorder list where this frame is going + * to get inserted (Applicable for only host consumed frames) + * @shared_snapshots: snapshots shared b/w host and target + * @host_snapshot: host snapshot + * @cpu_id: CPU index + * @reo_required: Indicates whether reorder is required for the current frame. + * If reorder is not required, current frame will just be used for updating the + * wait count of frames already part of the reorder list. + */ +struct ath12k_reo_ingress_debug_frame_info { + u8 link_id; + u16 mgmt_pkt_ctr; + u32 global_timestamp; + u32 start_timestamp; + u32 end_timestamp; + u32 duration_us; + enum ath12k_mgmt_rx_reo_frame_descriptor_type desc_type; + u8 frame_type; + u8 frame_subtype; + u64 ingress_timestamp; + u64 ingress_duration; + struct ath12k_mgmt_rx_reo_wait_count wait_count; + bool is_queued; + bool is_stale; + bool is_parallel_rx; + bool zero_wait_count_rx; + bool immediate_delivery; + bool is_error; + struct ath12k_mgmt_rx_reo_global_ts_info ts_last_released_frame; + s16 list_size_rx; + s16 list_insertion_pos; + struct ath12k_mgmt_rx_reo_snapshot_params shared_snapshots + [ATH12K_WMI_MLO_MAX_LINKS][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_snapshot_params host_snapshot[ATH12K_WMI_MLO_MAX_LINKS]; + int cpu_id; + bool reo_required; +}; + +/* struct ath12k_reo_ingress_frame_stats - Structure to store statistics related to + * incoming frames + * @ingress_count: Number of frames entering reo module + * @queued_count: Number of frames queued to reorder list + * @zero_wait_count_rx_count: Number of frames for which wait count is + * zero when received at host + * @immediate_delivery_count: Number of frames which can be delivered + * immediately to the upper layers without reordering. A frame can be + * immediately delivered if it has wait count of zero on reception at host + * and the global time stamp is less than or equal to the global time + * stamp of all the frames in the reorder list. Such frames would get + * inserted to the head of the reorder list and gets delivered immediately + * to the upper layers. + * @stale_count: Number of stale frames. Any frame older than the + * last frame delivered to upper layer is a stale frame. + * @error_count: Number of frames dropped due to error occurred + * within the reorder module + */ +struct ath12k_reo_ingress_frame_stats { + u64 ingress_count + [ATH12K_WMI_MLO_MAX_LINKS][ATH12K_MGMT_RX_REO_FRAME_DESC_TYPE_MAX]; + u64 queued_count[ATH12K_WMI_MLO_MAX_LINKS]; + u64 zero_wait_count_rx_count[ATH12K_WMI_MLO_MAX_LINKS]; + u64 immediate_delivery_count[ATH12K_WMI_MLO_MAX_LINKS]; + u64 stale_count[ATH12K_WMI_MLO_MAX_LINKS] + [ATH12K_MGMT_RX_REO_FRAME_DESC_TYPE_MAX]; + u64 error_count[ATH12K_WMI_MLO_MAX_LINKS] + [ATH12K_MGMT_RX_REO_FRAME_DESC_TYPE_MAX]; +}; + +#define ATH12K_MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_BOARDER_MAX_SIZE (785) + +/* struct reo_ingress_debug_info - Circular array to store the + * debug information about the frames entering the reorder process. + * @frame_list: Circular array to store the debug info about frames + * @frame_list_size: Size of circular array @frame_list + * @next_index: The index at which information about next frame will be logged + * @wrap_aroud: Flag to indicate whether wrap around occurred when logging + * debug information to @frame_list + * @stats: Stats related to incoming frames + * @boarder: boarder string + */ +struct reo_ingress_debug_info { + struct ath12k_reo_ingress_debug_frame_info *frame_list; + u16 frame_list_size; + int next_index; + bool wrap_aroud; + struct ath12k_reo_ingress_frame_stats stats; + char boarder[ATH12K_MGMT_RX_REO_INGRESS_FRAME_DEBUG_INFO_BOARDER_MAX_SIZE + 1]; +}; + +/* struct ath12k_reo_egress_debug_frame_info - Debug information about a frame + * leaving the reorder module + * @is_delivered: Indicates whether the frame is delivered to upper layers + * @is_premature_delivery: Indicates whether the frame is delivered + * prematurely + * @link_id: link id + * @mgmt_pkt_ctr: management packet counter + * @global_timestamp: MLO global time stamp + * @ingress_timestamp: Host time stamp when the frame enters the reorder module + * @insertion_ts: Host time stamp when the frame is inserted into the reorder + * list + * @egress_timestamp: Host time stamp just before delivery of the frame to upper + * layer + * @egress_duration: Duration in us taken by the upper layer to process + * the frame. + * @removal_ts: Host time stamp when this entry is removed from the list + * @initial_wait_count: Wait count when the frame is queued + * @final_wait_count: Wait count when frame is released to upper layer + * @release_reason: Reason for delivering the frame to upper layers + * @shared_snapshots: snapshots shared b/w host and target + * @host_snapshot: host snapshot + * @cpu_id: CPU index + */ +struct ath12k_reo_egress_debug_frame_info { + bool is_delivered; + bool is_premature_delivery; + u8 link_id; + u16 mgmt_pkt_ctr; + u32 global_timestamp; + u64 ingress_timestamp; + u64 insertion_ts; + u64 egress_timestamp; + u64 egress_duration; + u64 removal_ts; + struct ath12k_mgmt_rx_reo_wait_count initial_wait_count; + struct ath12k_mgmt_rx_reo_wait_count final_wait_count; + u8 release_reason; + struct ath12k_mgmt_rx_reo_snapshot_params shared_snapshots + [ATH12K_WMI_MLO_MAX_LINKS][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_snapshot_params host_snapshot[ATH12K_WMI_MLO_MAX_LINKS]; + int cpu_id; +}; + +/* Reason to release an entry from the reorder list */ +#define MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_ZERO_WAIT_COUNT (BIT(0)) +#define MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_AGED_OUT (BIT(1)) +#define MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_OLDER_THAN_AGED_OUT_FRAME (BIT(2)) +#define MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_LIST_MAX_SIZE_EXCEEDED (BIT(3)) +#define MGMT_RX_REO_RELEASE_REASON_MAX \ + (MGMT_RX_REO_LIST_ENTRY_RELEASE_REASON_LIST_MAX_SIZE_EXCEEDED << 1) + +/** + * struct reo_egress_frame_stats - Structure to store statistics related to + * outgoing frames + * @delivery_attempts_count: Number of attempts to deliver management + * frames to upper layers + * @delivery_success_count: Number of successful management frame + * deliveries to upper layer + * @premature_delivery_count: Number of frames delivered + * prematurely. Premature delivery is the delivery of a management frame + * to the upper layers even before its wait count is reaching zero. + * @delivery_count: Number frames delivered successfully for + * each link and release reason. + */ +struct reo_egress_frame_stats { + u64 delivery_attempts_count[ATH12K_WMI_MLO_MAX_LINKS]; + u64 delivery_success_count[ATH12K_WMI_MLO_MAX_LINKS]; + u64 premature_delivery_count[ATH12K_WMI_MLO_MAX_LINKS]; + u64 delivery_count[ATH12K_WMI_MLO_MAX_LINKS] + [MGMT_RX_REO_RELEASE_REASON_MAX]; +}; + +#define ATH12K_MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_BOARDER_MAX_SIZE (816) + +/** + * struct ath12k_reo_egress_debug_info - Circular array to store the + * debug information about the frames leaving the reorder module. + * @frame_list: Circular array to store the debug info + * @frame_list_size: Size of circular array @frame_list + * @next_index: The index at which information about next frame will be logged + * @wrap_aroud: Flag to indicate whether wrap around occurred when logging + * debug information to @frame_list + * @stats: Stats related to outgoing frames + * @boarder: boarder string + */ +struct ath12k_reo_egress_debug_info { + struct ath12k_reo_egress_debug_frame_info *frame_list; + u16 frame_list_size; + int next_index; + bool wrap_aroud; + struct reo_egress_frame_stats stats; + char boarder[ATH12K_MGMT_RX_REO_EGRESS_FRAME_DEBUG_INFO_BOARDER_MAX_SIZE + 1]; +}; + +/** + * struct mgmt_rx_reo_list – Linked list used to reorder the management frames + * received. Each list entry would correspond to a management frame. List + * entries would be sorted in the same order in which they are received by MAC + * HW. + * @list: List used for reordering + * @list_lock: Lock to protect the list + * @max_list_size: Maximum size of the reorder list + * @list_entry_timeout_us: Time out value(microsecond) for the reorder list + * entries + * @ageout_timer: Periodic timer to age-out the list entries + * @global_mgmt_rx_inactivity_timer: Global management Rx inactivity timer + * @ts_last_released_frame: Stores the global time stamp for the last frame + * removed from the reorder list + */ +struct mgmt_rx_reo_list { + struct ath12k_base *ab; + struct list_head list; + int count; + /* protects the list used for reordering */ + spinlock_t list_lock; + u32 max_list_size; + u32 list_entry_timeout_us; + struct timer_list ageout_timer; + struct timer_list global_mgmt_rx_inactivity_timer; + struct ath12k_mgmt_rx_reo_global_ts_info ts_last_released_frame; +}; + +/** + * struct ath12k_mgmt_rx_reo_context - This structure holds the info required for + * management rx-reordering. Reordering is done across all the psocs. + * So there should be only one instance of this structure defined. + * @reo_list: Linked list used for reordering + * @rx_reorder_entry_lock: Spin lock to protect rx reorder process entry critical + * section execution + * @frame_release_lock: Spin lock to serialize the frame delivery to the + * upper layers. This could prevent race conditions like the one given in + * the following example. + * Lets take an example of 2 links (Link A & B) and each has received + * a management frame A1(deauth) and B1(auth) such that MLO global time + * stamp of A1 < MLO global time stamp of B1. Host is concurrently + * executing "mgmt_rx_reo_list_release_entries" for A1 and B1 in + * 2 different CPUs. It is possible that frame B1 gets processed by + * upper layers before frame A1 and this could result in unwanted + * disconnection. Hence it is required to serialize the delivery + * of management frames to upper layers in the strict order of MLO + * global time stamp. + * @sim_context: Management rx-reorder simulation context + * @ingress_debug_info_init_count: Initialization count of + * object @ingress_frame_debug_info + * @ingress_frame_debug_info: Debug object to log incoming frames + * @egress_frame_debug_info: Debug object to log outgoing frames + * @egress_debug_info_init_count: Initialization count of + * object @egress_frame_debug_info + * @simulation_in_progress: Flag to indicate whether simulation is + * in progress + * @init_done: This will indicate intialization of management rx-reorder list. + * @timer_init_done: This will indicate firing of management rx-reorder timer. + */ +struct ath12k_mgmt_rx_reo_context { + struct mgmt_rx_reo_list reo_list; + /* Protects the rx reorder process entry critical section exec */ + spinlock_t rx_reorder_entry_lock; + /* Lock to Serialize the frame delivery */ + spinlock_t frame_release_lock; + atomic_t ingress_debug_info_init_count; + struct reo_ingress_debug_info ingress_frame_debug_info; + atomic_t egress_debug_info_init_count; + struct ath12k_reo_egress_debug_info egress_frame_debug_info; + bool init_done; + bool timer_init_done; +}; + +/** MGMT RX REO Changes */ +/* Macros for having versioning info for compatibility check between host and firmware */ +#define MLO_SHMEM_MAJOR_VERSION 2 +#define MLO_SHMEM_MINOR_VERSION 1 + +/** + * Enum which defines different versions of management Rx reorder snapshots. + */ +enum { + /** + * DWORD Lower: + * [15:0] : Management packet counter + * [30:16] : Redundant global time stamp = Global time stamp[14:0] + * [31] : Valid + * + * DWORD Upper: + * [31:0] : Global time stamp + * + */ + MGMT_RX_REO_SNAPSHOT_VERSION_TIMESTAMP_REDUNDANCY = 0, + + /** + * DWORD Lower: + * [14:0] : Global time stamp[14:0] + * [30:15] : Management packet counter + * [31] : Valid + * + * DWORD Upper: + * [14:0] : Redundant management packet counter = Management packet + * counter[14:0] + * [31:15] : Global time stamp[31:15] + */ + MGMT_RX_REO_SNAPSHOT_VERSION_PKT_CTR_REDUNDANCY = 1, +}; + +#define ATH12K_MGMT_RX_REO_INVALID_SNAPSHOT_VERSION (-1) + +/** + * struct mgmt_rx_reo_list_entry - Entry in the Management reorder list + * @node: List node + * @nbuf: nbuf corresponding to this frame + * @rx_params: Management rx event parameters + * @wait_count: Wait counts for the frame + * @initial_wait_count: Wait count when the frame is queued + * @insertion_ts: Host time stamp when this entry is inserted to the list. + * @removal_ts: Host time stamp when this entry is removed from the list + * @ingress_timestamp: Host time stamp when this frame has arrived reorder + * module + * @egress_timestamp: Host time stamp when this frame has exited reorder + * module + * @status: Status for this entry + * @pdev: Pointer to pdev object corresponding to this frame + * @release_reason: Release reason + * @is_delivered: Indicates whether the frame is delivered successfully + * @is_premature_delivery: Indicates whether the frame is delivered + * prematurely + * @is_parallel_rx: Indicates that this frame is received in parallel to the + * last frame which is delivered to the upper layer. + * @shared_snapshots: snapshots shared b/w host and target + * @host_snapshot: host snapshot + */ +struct mgmt_rx_reo_list_entry { + struct list_head node; + struct sk_buff *nbuf; + struct ath12k_wmi_mgmt_rx_arg *rx_params; + struct ath12k_mgmt_rx_reo_wait_count wait_count; + struct ath12k_mgmt_rx_reo_wait_count initial_wait_count; + u64 insertion_ts; + u64 removal_ts; + u64 ingress_timestamp; + u64 egress_timestamp; + u32 status; + struct ath12k *ar; + u8 release_reason; + bool is_delivered; + bool is_premature_delivery; + bool is_parallel_rx; + struct ath12k_mgmt_rx_reo_snapshot_params shared_snapshots + [ATH12K_WMI_MLO_MAX_LINKS][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_snapshot_params host_snapshot[ATH12K_WMI_MLO_MAX_LINKS]; +}; + +#define ATH12K_MGMT_RX_REO_STATUS_WAIT_FOR_FRAME_ON_OTHER_LINKS (BIT(0)) +#define ATH12K_MGMT_RX_REO_STATUS_AGED_OUT (BIT(1)) +#define ATH12K_MGMT_RX_REO_STATUS_OLDER_THAN_LATEST_AGED_OUT_FRAME (BIT(2)) +#define ATH12K_MGMT_RX_REO_STATUS_LIST_MAX_SIZE_EXCEEDED (BIT(3)) + +#define ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_WAITING_FOR_FRAME_ON_OTHER_LINK(entry) \ + ((entry)->status & ATH12K_MGMT_RX_REO_STATUS_WAIT_FOR_FRAME_ON_OTHER_LINKS) +#define ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_AGED_OUT(entry) \ + ((entry)->status & ATH12K_MGMT_RX_REO_STATUS_AGED_OUT) +#define ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_OLDER_THAN_LATEST_AGED_OUT_FRAME(entry) \ + ((entry)->status & ATH12K_MGMT_RX_REO_STATUS_OLDER_THAN_LATEST_AGED_OUT_FRAME) +#define ATH12K_MGMT_RX_REO_LIST_ENTRY_IS_MAX_SIZE_EXCEEDED(entry) \ + ((entry)->status & ATH12K_MGMT_RX_REO_STATUS_LIST_MAX_SIZE_EXCEEDED) + +#define ATH12K_MGMT_RX_REO_GLOBAL_MGMT_RX_INACTIVITY_TIMEOUT (600 * HZ) +#define ATH12K_MGMT_RX_REO_LIST_MAX_SIZE (100) +#define ATH12K_MGMT_RX_REO_LIST_TIMEOUT_US (500000) +#define ATH12K_MGMT_RX_REO_AGEOUT_TIMER_PERIOD_MS (250) + +#define ATH12K_MGMT_RX_REO_PKT_CTR_HALF_RANGE (0x8000) +#define ATH12K_MGMT_RX_REO_PKT_CTR_FULL_RANGE (ATH12K_MGMT_RX_REO_PKT_CTR_HALF_RANGE << 1) + +#define CU_VDEV_MAP_LB GENMASK(15, 0) +#define CU_VDEV_MAP_HB GENMASK(31, 16) +/* Maximum number of CU LINKS across the system. + * this is not the CU links within an AP MLD. + */ +#define CU_MAX_MLO_LINKS 8 +#define MAX_AP_MLDS_PER_LINK 16 + +struct ath12k_wmi_mgmt_rx_cu_params { + /* CU vdev map to intimate about the on-going Critical update + * per-link contains 16 VAPs at max. + */ + + /* bits : 0-15 | 16-31 + * link-id : 0 | 1 + */ + __le32 cu_vdev_map_1; + /* bits : 0-15 | 16-31 + * link-id : 2 | 3 + */ + __le32 cu_vdev_map_2; + /* bits : 0-15 | 16-31 + * link-id : 4 | 5 + */ + __le32 cu_vdev_map_3; + /* bits : 0-15 | 16-31 + * link-id : 6 | 7 + */ + __le32 cu_vdev_map_4; /* bits 63:32 */ +}; + +struct ath12k_mgmt_rx_cu_arg { + u16 cu_vdev_map[CU_MAX_MLO_LINKS]; + u8 *bpcc_bufp; +}; + struct ath12k_wmi_mgmt_rx_arg { u32 chan_freq; u32 channel; @@ -4028,6 +6418,61 @@ int rssi; u32 tsf_delta; u8 pdev_id; + struct ath12k_mgmt_rx_reo_params reo_params; +}; + +/** + * struct ath12k_mgmt_rx_reo_frame_descriptor - Frame Descriptor used to describe + * a management frame in mgmt rx reo module. + * @type: Frame descriptor type + * @frame_type: frame type + * @frame_subtype: frame subtype + * @nbuf: nbuf corresponding to this frame + * @rx_params: Management rx event parameters + * @wait_count: Wait counts for the frame + * @ingress_timestamp: Host time stamp when the frames enters the reorder + * process + * @is_stale: Indicates whether this frame is stale. Any frame older than the + * last frame delivered to upper layer is a stale frame. Stale frames should not + * be delivered to the upper layers. These frames can be discarded after + * updating the host snapshot and wait counts of entries currently residing in + * the reorder list. + * @zero_wait_count_rx: Indicates whether this frame's wait count was + * zero when received by host + * @immediate_delivery: Indicates whether this frame can be delivered + * immediately to the upper layers + * @list_size_rx: Size of the reorder list when this frame is received (before + * updating the list based on this frame). + * @list_insertion_pos: Position in the reorder list where this frame is going + * to get inserted (Applicable for only host consumed frames) + * @shared_snapshots: snapshots shared b/w host and target + * @host_snapshot: host snapshot + * @is_parallel_rx: Indicates that this frame is received in parallel to the + * last frame which is delivered to the upper layer. + * @pkt_ctr_delta: Packet counter delta of the current and last frame + * @reo_required: Indicates whether reorder is required for the current frame. + * If reorder is not required, current frame will just be used for updating the + * wait count of frames already part of the reorder list. + */ +struct ath12k_mgmt_rx_reo_frame_descriptor { + enum ath12k_mgmt_rx_reo_frame_descriptor_type type; + u8 frame_type; + u8 frame_subtype; + struct sk_buff *nbuf; + struct ath12k_wmi_mgmt_rx_arg *rx_params; + struct ath12k_mgmt_rx_reo_wait_count wait_count; + u64 ingress_timestamp; + bool is_stale; + bool zero_wait_count_rx; + bool immediate_delivery; + s16 list_size_rx; + s16 list_insertion_pos; + struct ath12k_mgmt_rx_reo_snapshot_params shared_snapshots + [ATH12K_WMI_MLO_MAX_LINKS][ATH12K_MGMT_RX_REO_SHARED_SNAPSHOT_MAX]; + struct ath12k_mgmt_rx_reo_snapshot_params host_snapshot[ATH12K_WMI_MLO_MAX_LINKS]; + bool is_parallel_rx; + int pkt_ctr_delta; + bool reo_required; }; #define ATH_MAX_ANTENNA 4 @@ -4055,6 +6500,8 @@ __le32 desc_id; __le32 status; __le32 pdev_id; + __le32 ppdu_id; + __le32 ack_rssi; } __packed; struct wmi_scan_event { @@ -4072,12 +6519,33 @@ __le32 tsf_timestamp; } __packed; +struct wmi_offchan_data_tx_compl_event { + __le32 desc_id; + __le32 status; + __le32 pdev_id; + __le32 ppdu_id; +} __packed; + +enum wmi_peer_sta_kickout_reason { + WMI_PEER_STA_KICKOUT_REASON_UNSPECIFIED = 0, + WMI_PEER_STA_KICKOUT_REASON_XRETRY = 1, + WMI_PEER_STA_KICKOUT_REASON_INACTIVITY = 2, + WMI_PEER_STA_KICKOUT_REASON_IBSS_DISCONNECT = 3, + WMI_PEER_STA_KICKOUT_REASON_TDLS_DISCONNECT = 4, + WMI_PEER_STA_KICKOUT_REASON_SA_QUERY_TIMEOUT = 5, + WMI_PEER_STA_KICKOUT_REASON_ROAMING_EVENT = 6, +}; + struct wmi_peer_sta_kickout_arg { - const u8 *mac_addr; + u8 mac_addr[ETH_ALEN]; + __le32 reason; + __le32 rssi; }; struct wmi_peer_sta_kickout_event { struct ath12k_wmi_mac_addr_params peer_macaddr; + __le32 reason; + __le32 rssi; } __packed; enum wmi_roam_reason { @@ -4138,6 +6606,7 @@ }; enum wmi_vdev_type { + WMI_VDEV_TYPE_UNSPEC = 0, WMI_VDEV_TYPE_AP = 1, WMI_VDEV_TYPE_STA = 2, WMI_VDEV_TYPE_IBSS = 3, @@ -4262,7 +6731,7 @@ #define DISABLE_SIFS_RESPONSE_TRIGGER 0 -#define WMI_MAX_KEY_INDEX 3 +#define WMI_MAX_KEY_INDEX 7 #define WMI_MAX_KEY_LEN 32 enum wmi_key_type { @@ -4304,6 +6773,7 @@ WMI_RATE_PREAMBLE_HT, WMI_RATE_PREAMBLE_VHT, WMI_RATE_PREAMBLE_HE, + WMI_RATE_PREAMBLE_EHT, }; /** @@ -4353,6 +6823,119 @@ ATH12K_HW_TXRX_ETHERNET = 2, }; +enum wmi_coex_config_type { + WMI_COEX_CONFIG_PAGE_P2P_TDM = 1, + WMI_COEX_CONFIG_PAGE_STA_TDM = 2, + WMI_COEX_CONFIG_PAGE_SAP_TDM = 3, + WMI_COEX_CONFIG_DURING_WLAN_CONN = 4, + WMI_COEX_CONFIG_BTC_ENABLE = 5, + WMI_COEX_CONFIG_COEX_DBG = 6, + WMI_COEX_CONFIG_PAGE_P2P_STA_TDM = 7, + WMI_COEX_CONFIG_INQUIRY_P2P_TDM = 8, + WMI_COEX_CONFIG_INQUIRY_STA_TDM = 9, + WMI_COEX_CONFIG_INQUIRY_SAP_TDM = 10, + WMI_COEX_CONFIG_INQUIRY_P2P_STA_TDM = 11, + WMI_COEX_CONFIG_TX_POWER = 12, + WMI_COEX_CONFIG_PTA_CONFIG = 13, + WMI_COEX_CONFIG_AP_TDM = 14, + WMI_COEX_CONFIG_WLAN_SCAN_PRIORITY = 15, + WMI_COEX_CONFIG_WLAN_PKT_PRIORITY = 16, + WMI_COEX_CONFIG_PTA_INTERFACE = 17, + WMI_COEX_CONFIG_THREE_WAY_COEX_RESET = 32, + WMI_COEX_CONFIG_THREE_WAY_COEX_START = 34, + /* WMI_COEX_CONFIG_FORCED_ALGO + * config to select coex algorithm + * coex_algo: select fixed coex algorithm + */ + WMI_COEX_CONFIG_FORCED_ALGO = 47, +}; + +struct coex_config_arg { + u32 vdev_id; + u32 config_type; + union { + struct { + u32 coex_enable; + }; + + struct { + u32 pta_num; + u32 coex_mode; + u32 bt_txrx_time; + u32 bt_priority_time; + u32 pta_algorithm; + u32 pta_priority; + }; + + struct { + u32 wlan_pkt_type; + u32 wlan_pkt_type_continued; + u32 wlan_pkt_weight; + u32 bt_pkt_weight; + }; + struct { + u32 duty_cycle; + u32 wlan_duration; + }; + struct { + u32 coex_algo; + }; + struct { + u32 priority0; + u32 priority1; + u32 priority2; + u32 config_arg4; + u32 config_arg5; + u32 config_arg6; + }; + }; +}; + +struct wmi_coex_config_cmd { + u32 tlv_header; + u32 vdev_id; + u32 config_type; + union { + struct { + u32 coex_enable; + } __packed; + + struct { + u32 pta_num; + u32 coex_mode; + u32 bt_txrx_time; + u32 bt_priority_time; + u32 pta_algorithm; + u32 pta_priority; + } __packed; + + struct { + u32 wlan_pkt_type; + u32 wlan_pkt_type_continued; + u32 wlan_pkt_weight; + u32 bt_pkt_weight; + } __packed; + + struct { + u32 duty_cycle; + u32 wlan_duration; + } __packed; + + struct { + u32 coex_algo; + } __packed; + + struct { + u32 priority0; + u32 priority1; + u32 priority2; + u32 config_arg4; + u32 config_arg5; + u32 config_arg6; + } __packed; + } __packed; +} __packed; + struct wmi_wmm_params { __le32 tlv_header; __le32 cwmin; @@ -4428,6 +7011,465 @@ __le32 pdev_id; } __packed; +enum WMI_HOST_TWT_COMMAND { + WMI_HOST_TWT_COMMAND_REQUEST_TWT = 0, + WMI_HOST_TWT_COMMAND_SUGGEST_TWT, + WMI_HOST_TWT_COMMAND_DEMAND_TWT, + WMI_HOST_TWT_COMMAND_TWT_GROUPING, + WMI_HOST_TWT_COMMAND_ACCEPT_TWT, + WMI_HOST_TWT_COMMAND_ALTERNATE_TWT, + WMI_HOST_TWT_COMMAND_DICTATE_TWT, + WMI_HOST_TWT_COMMAND_REJECT_TWT, +}; + +#define WMI_TWT_ADD_DIALOG_FLAG_BCAST BIT(8) +#define WMI_TWT_ADD_DIALOG_FLAG_TRIGGER BIT(9) +#define WMI_TWT_ADD_DIALOG_FLAG_FLOW_TYPE BIT(10) +#define WMI_TWT_ADD_DIALOG_FLAG_PROTECTION BIT(11) + +struct wmi_twt_add_dialog_params_cmd { + u32 tlv_header; + u32 vdev_id; + struct ath12k_wmi_mac_addr_params peer_macaddr; + u32 dialog_id; + u32 wake_intvl_us; + u32 wake_intvl_mantis; + u32 wake_dura_us; + u32 sp_offset_us; + u32 flags; +} __packed; + +struct wmi_twt_add_dialog_params { + u32 vdev_id; + u8 peer_macaddr[ETH_ALEN]; + u32 dialog_id; + u32 wake_intvl_us; + u32 wake_intvl_mantis; + u32 wake_dura_us; + u32 sp_offset_us; + u8 twt_cmd; + u8 flag_bcast; + u8 flag_trigger; + u8 flag_flow_type; + u8 flag_protection; +} __packed; + +enum wmi_twt_add_dialog_status { + WMI_ADD_TWT_STATUS_OK, + WMI_ADD_TWT_STATUS_TWT_NOT_ENABLED, + WMI_ADD_TWT_STATUS_USED_DIALOG_ID, + WMI_ADD_TWT_STATUS_INVALID_PARAM, + WMI_ADD_TWT_STATUS_NOT_READY, + WMI_ADD_TWT_STATUS_NO_RESOURCE, + WMI_ADD_TWT_STATUS_NO_ACK, + WMI_ADD_TWT_STATUS_NO_RESPONSE, + WMI_ADD_TWT_STATUS_DENIED, + WMI_ADD_TWT_STATUS_UNKNOWN_ERROR, +}; + +struct wmi_twt_add_dialog_event { + u32 vdev_id; + struct ath12k_wmi_mac_addr_params peer_macaddr; + u32 dialog_id; + u32 status; +} __packed; + +struct wmi_twt_del_dialog_params { + u32 vdev_id; + u8 peer_macaddr[ETH_ALEN]; + u32 dialog_id; +} __packed; + +struct wmi_twt_del_dialog_params_cmd { + u32 tlv_header; + u32 vdev_id; + struct ath12k_wmi_mac_addr_params peer_macaddr; + u32 dialog_id; +} __packed; + +struct wmi_twt_pause_dialog_params { + u32 vdev_id; + u8 peer_macaddr[ETH_ALEN]; + u32 dialog_id; +} __packed; + +struct wmi_twt_pause_dialog_params_cmd { + u32 tlv_header; + u32 vdev_id; + struct ath12k_wmi_mac_addr_params peer_macaddr; + u32 dialog_id; +} __packed; + +struct wmi_twt_resume_dialog_params { + u32 vdev_id; + u8 peer_macaddr[ETH_ALEN]; + u32 dialog_id; + u32 sp_offset_us; + u32 next_twt_size; +} __packed; + +struct wmi_twt_resume_dialog_params_cmd { + u32 tlv_header; + u32 vdev_id; + struct ath12k_wmi_mac_addr_params peer_macaddr; + u32 dialog_id; + u32 sp_offset_us; + u32 next_twt_size; +} __packed; + +struct wmi_sawf_svc_cfg_cmd_fixed_param { + u32 tlv_header; /* TLV tag and len */ + /* Tag equals WMI_TAG_SAWF_SERVICE_CLASS_CFG_CMD_FIXED_PARAM */ + u32 svc_class_id; /* which service class is being configured */ + /*----- + * The below fields specify the values for the parameters of the + * service class being configured. + * Each such service class parameter has a default value specified in the + * above WMI_SAWF_SVC_CLASS_PARAM_DEFAULTS enum. + * This default value shall be specified for service classes where + * the parameter in question is not applicable. + * For example, for service classes that have no minimum throughput + * requirement, the min_thruput_kbps field should be set to + * WMI_SAWF_SVC_CLASS_PARAM_DEFAULT_MIN_THRUPUT, i.e. 0. + *----- + */ + /* min_thruput_kbps: + * How much throughput should be "guaranteed" for each MSDU queue + * belonging to this service class. + * Units are kilobits per second. + */ + u32 min_thruput_kbps; + /* max_thruput_kbps: + * What upper limit on throughput shall be applied to MSDU queues beloning + * to this service class, if other peer-TIDs are not meeting their QoS + * service goals. + * Units are kilobits per second. + */ + u32 max_thruput_kbps; + /* burst_size_bytes: + * How much data (i.e. how many MSDUs) should be pulled from a + * MSDU queue belonging to this service class to be formed into MPDUs + * and enqueued for transmission. + * Similarly, how long should a tx op be for MPDUs containing MSDUs from + * this service class, to ensure that the necessary amount of data gets + * delivered to the peer. + * Units are bytes. + */ + u32 burst_size_bytes; + /* svc_interval_ms: + * How frequently MSDUs belonging to this service class should be + * formed into MPDUs and enqueued for transmission. + * The svc_interval_ms parameter is expected to be <= the delay_bound_ms + * parameter. + * Units are milliseconds. + */ + u32 svc_interval_ms; + /* delay_bound_ms: + * How promptly the MSDUs belonging to this service class need to be + * delivered to the recipient peer. + * Units are milliseconds. + */ + u32 delay_bound_ms; + /* time_to_live_ms: + * How long MSDUs belonging to this service class remain valid. + * If the MSDU has not been successfully transmitted before this + * time-to-live time has elapsed, the MSDU should be discarded. + * The time_to_live_ms parameter is expected to be >= the delay_bound_ms + * parameter. + * Units are milliseconds. + */ + u32 time_to_live_ms; + /* priority: + * What degree of precedence shall the WLAN FW's tx scheduler use + * when considering whether to transmit MPDUs generated from MSDUs + * belonging to this service class. + */ + u32 priority; + /* tid: + * Which WLAN TID shall be used for delivering traffic of this + * service class. + */ + u32 tid; + /* msdu_loss_rate_ppm: + * This parameter indicates the acceptable rate of MSDU loss. + * Units are parts per million. + * E.g. if it is acceptable for 1 MSDU of every 10000 to be lost, + * the msdu_loss_rate_ppm value would be 100, + * since 100 / 1000000 = 1 / 10000. + */ + u32 msdu_loss_rate_ppm; +} __packed; + +struct wmi_sawf_svc_disable_cmd_fixed_param { + u32 tlv_header; /* TLV tag and len*/ + /* Tag equals WMI_TAG_SAWF_SERVICE_CLASS_DISABLE_CMD_FIXED_PARAM*/ + u32 svc_class_id; /* which service class is being disabled */ +} __packed; + +/** + * WMI arrays of length WMI_MGMT_FRAME_SUBTYPE_MAX use the + * IEEE802.11 standard's enumeration of mgmt frame subtypes: + * 0 -> IEEE80211_STYPE_FC0_SUBTYPE_ASSOC_REQ + * 1 -> IEEE80211_STYPE_FC0_SUBTYPE_ASSOC_RESP + * 2 -> IEEE80211_STYPE_FC0_SUBTYPE_REASSOC_REQ + * 3 -> IEEE80211_STYPE_FC0_SUBTYPE_REASSOC_RESP + * 4 -> IEEE80211_STYPE_FC0_SUBTYPE_PROBE_REQ + * 5 -> IEEE80211_STYPE_FC0_SUBTYPE_PROBE_RESP + * 6 -> Reserved + * 7 -> Reserved + * 8 -> IEEE80211_STYPE_FC0_SUBTYPE_BEACON + * 9 -> IEEE80211_STYPE_FC0_SUBTYPE_ATIM + * 10 -> IEEE80211_STYPE_FC0_SUBTYPE_DISASSOC + * 11 -> IEEE80211_STYPE_FC0_SUBTYPE_AUTH + * 12 -> IEEE80211_STYPE_FC0_SUBTYPE_DEAUTH + * 13 -> IEEE80211_STYPE_FCO_SUBTYPE_ACTION + * 14 -> IEEE80211_STYPE_FC0_SUBTYPE_ACTION_NOACK + * 15 -> IEEE80211_STYPE_FC0_SUBTYPE_RESERVED + */ +#define WMI_MGMT_FRAME_SUBTYPE_MAX 16 +#define WMI_MAX_STRING_LEN 256 + +enum wmi_ctrl_path_cal_prof_id { + WMI_CTRL_PATH_STATS_CAL_PROF_COLD_BOOT_CAL = 0, + WMI_CTRL_PATH_STATS_CAL_PROF_FULL_CHAN_SWITCH, + WMI_CTRL_PATH_STATS_CAL_PROF_SCAN_CHAN_SWITCH, + WMI_CTRL_PATH_STATS_CAL_PROF_DPD_SPLIT_CAL, + WMI_CTRL_PATH_STATS_CAL_PROF_TEMP_TRIGEER_CAL, + WMI_CTRL_PATH_STATS_CAL_PROF_POWER_SAVE_WAKE_UP, + WMI_CTRL_PATH_STATS_CAL_PROF_TIMER_TRIGGER_CAL, + WMI_CTRL_PATH_STATS_CAL_PROF_FTM_TRIGGER_CAL, + WMI_CTRL_PATH_STATS_CAL_PROF_AGILE_OR_POWER_DOWN_DTIM, + WMI_CTRL_PATH_STATS_CAL_PROF_NOISY_ENV_RXDO, + /* IDs from 10 to 30 for future use*/ + WMI_CTRL_PATH_STATS_CAL_PROFILE_INVALID = 0x1F, +}; + +static inline const char * +wmi_ctrl_path_cal_prof_id_to_name(u8 prof_id) { + switch (prof_id) { + case WMI_CTRL_PATH_STATS_CAL_PROF_COLD_BOOT_CAL: + return "COLD_BOOT_CAL"; + case WMI_CTRL_PATH_STATS_CAL_PROF_FULL_CHAN_SWITCH: + return "FULL_CHAN_SWITCH"; + case WMI_CTRL_PATH_STATS_CAL_PROF_SCAN_CHAN_SWITCH: + return "SCAN_CHAN_SWITCH"; + case WMI_CTRL_PATH_STATS_CAL_PROF_DPD_SPLIT_CAL: + return "DPD_SPLIT_CAL"; + case WMI_CTRL_PATH_STATS_CAL_PROF_TEMP_TRIGEER_CAL: + return "TEMP_TRIGEER_CAL"; + case WMI_CTRL_PATH_STATS_CAL_PROF_POWER_SAVE_WAKE_UP: + return "POWER_SAVE_WAKE_UP"; + case WMI_CTRL_PATH_STATS_CAL_PROF_TIMER_TRIGGER_CAL: + return "TIMER_TRIGGER_CAL"; + case WMI_CTRL_PATH_STATS_CAL_PROF_FTM_TRIGGER_CAL: + return "FTM_TRIGGER_CAL"; + case WMI_CTRL_PATH_STATS_CAL_PROF_AGILE_OR_POWER_DOWN_DTIM: + return "AGILE_OR_POWER_DOWN_DTIM"; + case WMI_CTRL_PATH_STATS_CAL_PROF_NOISY_ENV_RXDO: + return "NOISY_ENV_RXDO"; + case WMI_CTRL_PATH_STATS_CAL_PROFILE_INVALID: + break; + } + return "UNKOWN_CAL_PROFILE"; +} + +enum wmi_ctrl_path_cal_type_id { + WMI_CTRL_PATH_STATS_CAL_TYPE_ADC = 0, + WMI_CTRL_PATH_STATS_CAL_TYPE_DAC, + WMI_CTRL_PATH_STATS_CAL_TYPE_PROCESS, + WMI_CTRL_PATH_STATS_CAL_TYPE_NOISE_FLOOR, + WMI_CTRL_PATH_STATS_CAL_TYPE_RXDCO, + WMI_CTRL_PATH_STATS_CAL_TYPE_COMB_TXLO_TXIQ_RXIQ, + WMI_CTRL_PATH_STATS_CAL_TYPE_TXLO, + WMI_CTRL_PATH_STATS_CAL_TYPE_TXIQ, + WMI_CTRL_PATH_STATS_CAL_TYPE_RXIQ, + WMI_CTRL_PATH_STATS_CAL_TYPE_IM2, + WMI_CTRL_PATH_STATS_CAL_TYPE_LNA, + WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_LP_RXDCO, + WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_LP_RXIQ, + WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_MEMORYLESS, + WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_MEMORY, + WMI_CTRL_PATH_STATS_CAL_TYPE_IBF, + WMI_CTRL_PATH_STATS_CAL_TYPE_PDET_AND_PAL, + WMI_CTRL_PATH_STATS_CAL_TYPE_RXDCO_IQ, + WMI_CTRL_PATH_STATS_CAL_TYPE_RXDCO_DTIM, + WMI_CTRL_PATH_STATS_CAL_TYPE_TPC_CAL, + WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_TIMEREQ, + WMI_CTRL_PATH_STATS_CAL_TYPE_BWFILTER, + WMI_CTRL_PATH_STATS_CAL_TYPE_PEF, + WMI_CTRL_PATH_STATS_CAL_TYPE_PADROOP, + WMI_CTRL_PATH_STATS_CAL_TYPE_SELFCALTPC, + /* IDs 25 to 254 for future use*/ + WMI_CTRL_PATH_STATS_CAL_TYPE_INVALID = 0xff, +}; + +static inline const char * +wmi_ctrl_path_cal_type_id_to_name(u8 type_id) { + switch (type_id) { + case WMI_CTRL_PATH_STATS_CAL_TYPE_ADC: + return "ADC"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_DAC: + return "DAC"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_PROCESS: + return "PROCESS"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_NOISE_FLOOR: + return "NOISE_FLOOR"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_RXDCO: + return "RXDCO"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_COMB_TXLO_TXIQ_RXIQ: + return "COMB_TXLO_TXIQ_RXIQ"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_TXLO: + return "TXLO"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_TXIQ: + return "TXIQ"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_RXIQ: + return "RXIQ"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_IM2: + return "IM2"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_LNA: + return "LNA"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_LP_RXDCO: + return "DPD_LP_RXDCO"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_LP_RXIQ: + return "DPD_LP_RXIQ"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_MEMORYLESS: + return "DPD_MEMORYLESS"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_MEMORY: + return "DPD_MEMORY"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_IBF: + return "IBF"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_PDET_AND_PAL: + return "PDET_AND_PAL"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_RXDCO_IQ: + return "RXDCO_IQ"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_RXDCO_DTIM: + return "RXDCO_DTIM"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_TPC_CAL: + return "TPC_CAL"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_DPD_TIMEREQ: + return "DPD_TIMEREQ"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_BWFILTER: + return "BWFILTER"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_PEF: + return "PEF"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_PADROOP: + return "PADROOP"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_SELFCALTPC: + return "SELFCALTPC"; + case WMI_CTRL_PATH_STATS_CAL_TYPE_INVALID: + break; + } + return "UNKNOWN_CAL_TYPE"; +} + +enum wmi_ctrl_path_periodic_cal_type_id { + WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_NOISE_FLOOR, + WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_DPD_MEMORYLESS, + WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_DPD_MEMORY, + /* IDs 3 to 254 for future use*/ + WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_INVALID = 0xFF, +}; + +static inline const char * +wmi_ctrl_path_periodic_cal_type_id_to_name(u8 type_id) { + switch (type_id) { + case WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_NOISE_FLOOR: + return "NOISE_FLOOR"; + case WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_DPD_MEMORYLESS: + return "DPD_MEMORYLESS"; + case WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_DPD_MEMORY: + return "DPD_MEMORY"; + case WMI_CTRL_PATH_STATS_PERIODIC_CAL_TYPE_INVALID: + break; + } + return "UNKNOWN_PERIODIC_CAL_TYPE"; +} + +#define WMI_CTRL_PATH_CAL_PROF_MASK GENMASK(12, 8) +#define WMI_CTRL_PATH_CAL_TYPE_MASK GENMASK(7, 0) +#define WMI_CTRL_PATH_IS_PERIODIC_CAL GENMASK(13, 13) +#define WMI_AWGN_MAX_BW 6 + +struct wmi_ctrl_path_pdev_stats { + u32 pdev_id; + u32 tx_mgmt_subtype[WMI_MGMT_FRAME_SUBTYPE_MAX]; + u32 rx_mgmt_subtype[WMI_MGMT_FRAME_SUBTYPE_MAX]; + u32 scan_fail_dfs_violation_time_ms; + u32 nol_chk_fail_last_chan_freq; + u32 nol_chk_fail_time_stamp_ms; + u32 tot_peer_create_cnt; + u32 tot_peer_del_cnt; + u32 tot_peer_del_resp_cnt; + u32 vdev_pause_fail_rt_to_sched_algo_fifo_full_cnt; +} __packed; + +struct wmi_ctrl_path_cal_stats { + u32 pdev_id; + u32 cal_info; + u32 cal_triggered_cnt; + u32 cal_fail_cnt; + u32 cal_fcs_cnt; + u32 cal_fcs_fail_cnt; +} __packed; + +struct wmi_ctrl_path_stats_cmd_param { + u32 tlv_header; + u32 stats_id; + u32 req_id; + /* get/reset/start/stop based on stats id is defined as + * a part of wmi_ctrl_path_stats_action + */ + u32 action; +} __packed; + +struct wmi_ctrl_path_stats_ev_param { + u32 req_id; + /* more flag + * 1 - More events sent after this event. + * 0 - no more events after this event. + */ + u32 more; +} __packed; + +struct wmi_ctrl_path_stats_list { + struct list_head list; + void *stats_ptr; +} __packed; + +struct wmi_ctrl_path_btcoex_stats { + u32 pdev_id; + u32 bt_tx_req_cntr; + u32 bt_rx_req_cntr; + u32 bt_req_nack_cntr; + u32 wl_tx_req_nack_schd_bt_reason_cntr; + u32 wl_tx_req_nack_current_bt_reason_cntr; + u32 wl_tx_req_nack_other_wlan_tx_reason_cntr; + u32 wl_in_tx_abort_cntr; + u32 wl_tx_auto_resp_req_cntr; + u32 wl_tx_req_ack_cntr; + u32 wl_tx_req_cntr; +} __packed; + +struct wmi_ctrl_path_awgn_stats { + u32 awgn_send_evt_cnt; + u32 awgn_pri_int_cnt; + u32 awgn_sec_int_cnt; + u32 awgn_pkt_drop_trigger_cnt; + u32 awgn_pkt_drop_trigger_reset_cnt; + u32 awgn_bw_drop_cnt; + u32 awgn_bw_drop_reset_cnt; + u32 awgn_cca_int_cnt; + u32 awgn_cca_int_reset_cnt; + u32 awgn_cca_ack_blk_cnt; + u32 awgn_cca_ack_reset_cnt; + u32 awgn_int_bw_cnt[WMI_AWGN_MAX_BW]; +} __packed; + +struct wmi_ctrl_path_stats_ev_parse_param { + struct list_head list; + struct ath12k *ar; +} __packed; + struct wmi_obss_spatial_reuse_params_cmd { __le32 tlv_header; __le32 pdev_id; @@ -4437,6 +7479,12 @@ __le32 vdev_id; } __packed; +struct wmi_pdev_obss_pd_bitmap_cmd { + u32 tlv_header; + u32 pdev_id; + u32 bitmap[2]; +} __packed; + #define ATH12K_BSS_COLOR_COLLISION_SCAN_PERIOD_MS 200 #define ATH12K_OBSS_COLOR_COLLISION_DETECTION_DISABLE 0 #define ATH12K_OBSS_COLOR_COLLISION_DETECTION 1 @@ -4444,6 +7492,13 @@ #define ATH12K_BSS_COLOR_STA_PERIODS 10000 #define ATH12K_BSS_COLOR_AP_PERIODS 5000 +enum wmi_bss_color_collision { + WMI_BSS_COLOR_COLLISION_DISABLE = 0, + WMI_BSS_COLOR_COLLISION_DETECTION, + WMI_BSS_COLOR_FREE_SLOT_TIMER_EXPIRY, + WMI_BSS_COLOR_FREE_SLOT_AVAILABLE, +}; + struct wmi_obss_color_collision_cfg_params_cmd { __le32 tlv_header; __le32 vdev_id; @@ -4461,6 +7516,12 @@ __le32 enable; } __packed; +struct wmi_obss_color_collision_event { + u32 vdev_id; + u32 evt_type; + u64 obss_color_bitmap; +} __packed; + #define ATH12K_IPV4_TH_SEED_SIZE 5 #define ATH12K_IPV6_TH_SEED_SIZE 11 @@ -4604,6 +7665,78 @@ __le32 paddr_hi; } __packed; +struct ath12k_wmi_pdev_sscan_fw_cmd_fixed_param { + u32 pdev_id; + u32 spectral_scan_mode; +} __packed; + + +struct ath12k_wmi_pdev_sscan_fft_bin_index { + u32 pri80_bins; + u32 sec80_bins; + u32 mid_5mhz_bins; +} __packed; + +struct ath12k_wmi_pdev_sscan_chan_info { + u32 operating_pri20_freq; + u32 operating_cfreq1; + u32 operating_cfreq2; + u32 operating_bw; + u32 operating_puncture_20mhz_bitmap; + u32 sscan_cfreq1; + u32 sscan_cfreq2; + u32 sscan_bw; + u32 sscan_puncture_20mhz_bitmap; +} __packed; + +struct ath12k_wmi_pdev_sscan_per_detector_info { + __le32 tlv_header; + u32 detector_id; + u32 start_freq; + u32 end_freq; +} __packed; + +struct ath12k_wmi_spectral_scan_bw_capabilities { + __le32 tlv_header; + u32 pdev_id; + u32 sscan_mode; + u32 operating_bw; + union { + struct { + u32 supports_sscan_bw_20:1, + supports_sscan_bw_40:1, + supports_sscan_bw_80:1, + supports_sscan_bw_160:1, + supports_sscan_bw_80p80:1, + supports_sscan_bw_320:1, + reserved:21; + }; + u32 supported_flags; + }; +} __packed; + +struct ath12k_wmi_spectral_fft_size_capabilities { + __le32 tlv_header; + u32 pdev_id; + u32 sscan_bw; + union { + struct { + u32 supports_fft_size_1:1, + supports_fft_size_2:1, + supports_fft_size_3:1, + supports_fft_size_4:1, + supports_fft_size_5:1, + supports_fft_size_6:1, + supports_fft_size_7:1, + supports_fft_size_8:1, + supports_fft_size_9:1, + supports_fft_size_10:1, + supports_fft_size_11:1, + reserved:21; + }; + u32 supported_flags; + }; +} __packed; #define WMI_SPECTRAL_META_INFO1_FREQ1 GENMASK(15, 0) #define WMI_SPECTRAL_META_INFO1_FREQ2 GENMASK(31, 16) @@ -4642,18 +7775,265 @@ __le32 buf_len; } __packed; +enum wmi_tpc_pream_bw { + WMI_TPC_PREAM_CCK, + WMI_TPC_PREAM_OFDM, + WMI_TPC_PREAM_HT20, + WMI_TPC_PREAM_HT40, + WMI_TPC_PREAM_VHT20, + WMI_TPC_PREAM_VHT40, + WMI_TPC_PREAM_VHT80, + WMI_TPC_PREAM_VHT160, + WMI_TPC_PREAM_HE20, + WMI_TPC_PREAM_HE40, + WMI_TPC_PREAM_HE80, + WMI_TPC_PREAM_HE160, + WMI_TPC_PREAM_EHT20, + WMI_TPC_PREAM_EHT40, + WMI_TPC_PREAM_EHT60, + WMI_TPC_PREAM_EHT80, + WMI_TPC_PREAM_EHT120, + WMI_TPC_PREAM_EHT140, + WMI_TPC_PREAM_EHT160, + WMI_TPC_PREAM_EHT200, + WMI_TPC_PREAM_EHT240, + WMI_TPC_PREAM_EHT280, + WMI_TPC_PREAM_EHT320, + WMI_TPC_PREAM_MAX +}; + +#define ATH12K_2G_MAX_FREQUENCY 2495 +#define ATH12K_5G_MAX_FREQUENCY 5920 +#define WMI_TPC_CONFIG BIT(1) +#define WMI_TPC_REG_PWR_ALLOWED BIT(2) +#define WMI_TPC_RATES_ARRAY1 BIT(3) +#define WMI_TPC_RATES_ARRAY2 BIT(4) +#define WMI_TPC_RATES_DL_OFDMA_ARRAY BIT(5) +#define WMI_TPC_CTL_PWR_ARRAY BIT(6) +#define WMI_TPC_CONFIG_PARAM 0x1 +#define ATH12K_TPC_RATE_ARRAY_MU GENMASK(15, 8) +#define ATH12K_TPC_RATE_ARRAY_SU GENMASK(7, 0) +#define ATH12K_HW_PREAMBLE(_rcode) (((_rcode) >> 8) & 0x7) +#define ATH12K_HW_NSS(_rcode) (((_rcode) >> 5) & 0x7) +#define MODULATION_LIMIT 126 +#define TPC_STATS_REG_PWR_ALLOWED_TYPE 0 +#define HE_EXTRA_MCS_SUPPORT GENMASK(31, 16) + +enum wmi_ctrl_path_stats_action { + WMI_REQUEST_CTRL_PATH_STAT_GET = 1, + WMI_REQUEST_CTRL_PATH_STAT_RESET = 2, + WMI_REQUEST_CTRL_PATH_STAT_START = 3, + WMI_REQUEST_CTRL_PATH_STAT_STOP = 4, +}; + +struct wmi_request_ctrl_path_stats_cmd_fixed_param { + u32 tlv_header; + /** Bitmask showing which of stats IDs 0-31 have been requested + * These stats ids are defined in enum wmi_ctrl_path_stats_id. + */ + u32 stats_id_mask; + /** request ID to store the cookies in wifistats */ + u32 request_id; + /** action + * get/reset/start/stop based on stats id + * defined as a part of wmi_ctrl_path_stats_action + */ + u32 action; + /** Request Halphy subid stats + * According to the requested stats_id this halphy_subid varies + * For stats_id = 1, the possible values could be enum wmi_halphy_ctrl_path_statsid + */ + u32 subid; +} __packed; + +struct wmi_cp_stats_event_fixed_param { + /** Request ID */ + u32 request_id; + /*end_of_event - single event or Multiple Event */ + u32 end_of_event; + /*event_count - If Multiple Events are send, this is to identify particular + * event out of Multiple Events that are send to host + */ + u32 event_count; + u32 pdev_id; +} __packed; + +struct wmi_tpc_configs { + u32 reg_domain; + /* current channel in MHz */ + u32 chan_freq; + /* current phy mode */ + u32 phy_mode; + /* Max antenna gain for current regulatory in 0.25 dBm steps */ + u32 twice_antenna_reduction; + /* Max transmit power allowed in regulatory domain in 0.25 dBm steps */ + u32 twice_max_reg_power; + /* User specified antenna gain in 0.25 dBm steps */ + s32 twice_antenna_gain; + /* The overall power limit in 0.25 dBm steps */ + u32 power_limit; + /* The total number of rates supported */ + u32 rate_max; + /* The total number of active chains */ + u32 num_tx_chain; + /* not used for now */ + u32 ctl; + u32 flags; + /* tells info abt BE, HE, HE_EXTRA_MCS, 160, 320, 11BE PUNC*/ + u32 caps; +} __packed; + +struct wmi_max_reg_power_fixed_param { + /* 0: maxRegAllowedPower[TX_NUM_CHAIN]; + * 1:maxRegPowerAGCDD[TX_NUM_CHAIN - 1][TX_NUM_CHAIN - 1], + * 2:maxRegPowerAGSTBC[TX_NUM_CHAIN - 1][TX_NUM_CHAIN - 1], + * 3:maxRegPowerAGTXBF([TX_NUM_CHAIN - 1][TX_NUM_CHAIN - 1] + * type 1-3 no used, for future use + */ + u32 reg_power_type; + /* Length of the regulatory power array being sent in bytes */ + u32 reg_array_len; + /* dimensions below + * d1 - [TX_NUM_CHAIN - 1] + * d2- [TX_NUM_CHAIN - 1] for cdd, stbc, txbf + * d2 = 1 for maxRegAllowedPower + * d3 = 1 d4 = 1 + */ + u32 d1; + u32 d2; + u32 d3; + u32 d4; +} __packed; + +struct wmi_max_reg_power_allowed { + struct wmi_max_reg_power_fixed_param tpc_reg_pwr; + s16 *reg_pwr_array; +}; + +struct wmi_tpc_rates_array_fixed_param { + /* 0: ratesArray[TPC_RATE_MAX], (for CCK, OFDM, HT, VHT and HE Rates info) + * 1: ratesArray2[TPC_RATE_MAX] (for EHT Rates info), + * 2: dl_ofdma rate array. Type 2 unsed, for future use + */ + u32 rate_array_type; + u32 rate_array_len; +} __packed; + +struct wmi_tpc_rates_array { + struct wmi_tpc_rates_array_fixed_param tpc_rates_array; + s16 *rate_array; +}; + +struct wmi_tpc_ctl_pwr_fixed_param { + /* 0: ctl_array; 1: ctl_160 array; 2: ctl_dlOfdma array + * Type 2 unsed, for future use + */ + u32 ctl_array_type; + /* Length of the CTL array being sent in bytes */ + u32 ctl_array_len; + /* Message MAY be split into smaller chunks to fit in the WMI svc msg + * not used for now + */ + u32 end_of_ctl_pwr; + /* Incremented for every event chunk for Host to know the sequence + * not used for now + */ + u32 ctl_pwr_count; + /* Dimensions below + * For ctl_array + * d4 = No of chains + * d3 = BF on/off = 2 + * d2 = 28 which the number of different tx modes-legacy, HT20, HT40 etc + * d1 = NSS number of spatial streams + * s8 ctl_160array[WHAL_MAX_NUM_CHAINS][pri_or_sec][bf][nss]. + * For ctl_160 array + * d4 = No of chains d3 = primary/secondary channel + * d2 = BF on/off d1 = NSS + */ + u32 d1; + u32 d2; + u32 d3; + u32 d4; +} __packed; + +struct wmi_tpc_ctl_pwr_table { + struct wmi_tpc_ctl_pwr_fixed_param tpc_ctl_pwr; + s8 *ctl_pwr_table; +}; + +struct wmi_tpc_stats_event { + u32 pdev_id; + u32 event_count; + u32 end_of_event; + /* Bitmap to set and use the received tlvs alone. Not all tlvs are + * supported for all chipset. For eg ctl_160 is not present for chipset + * which does not have 160Mhz support + */ + u32 tlvs_rcvd; + struct wmi_max_reg_power_allowed max_reg_allowed_power; + struct wmi_tpc_rates_array rates_array1; + struct wmi_tpc_rates_array rates_array2; + struct wmi_tpc_configs tpc_config; + struct wmi_tpc_ctl_pwr_table ctl_array; +}; + +enum ath12k_wmi_tpc_stats_events { + ATH12K_TPC_STATS_CONFIG_REG_PWR_EVENT, + ATH12K_TPC_STATS_RATES_EVENT1, + ATH12K_TPC_STATS_RATES_EVENT2, + ATH12K_TPC_STATS_CTL_TABLE_EVENT +}; + +enum ath12k_wmi_tpc_stats_rates_array { + ATH12K_TPC_STATS_RATES_ARRAY1, + ATH12K_TPC_STATS_RATES_ARRAY2, +}; + +enum ath12k_wmi_tpc_stats_ctl_array { + ATH12K_TPC_STATS_CTL_ARRAY, + ATH12K_TPC_STATS_CTL_160ARRAY, +}; + +enum wmi_ctrl_path_stats_id { + /* bit 0 is currently unused / reserved */ + WMI_REQ_CTRL_PATH_PDEV_TX_STAT = 1, + WMI_REQ_CTRL_PATH_VDEV_EXTD_STAT = 2, + WMI_REQ_CTRL_PATH_MEM_STAT = 3, + WMI_REQ_CTRL_PATH_CAL_STAT = 5, + WMI_REQ_CTRL_PATH_AWGN_STAT = 7, + WMI_REQ_CTRL_PATH_BTCOEX_STAT = 8, +}; + +enum wmi_dblog_param { + WMI_DEBUG_LOG_PARAM_LOG_LEVEL = 0x1, + WMI_DEBUG_LOG_PARAM_VDEV_ENABLE, + WMI_DEBUG_LOG_PARAM_VDEV_DISABLE, + WMI_DEBUG_LOG_PARAM_VDEV_ENABLE_BITMAP, + WMI_DEBUG_LOG_PARAM_MOD_ENABLE_BITMAP, + WMI_DEBUG_LOG_PARAM_WOW_MOD_ENABLE_BITMAP, +}; + +struct wmi_dbglog_config_cmd_fixed_param { + u32 tlv_header; + u32 dbg_log_param; + u32 value; +} __packed; + #define WMI_MAX_MEM_REQS 32 #define MAX_RADIOS 3 +#define WMI_MLO_CMD_TIMEOUT_HZ (5 * HZ) #define WMI_SERVICE_READY_TIMEOUT_HZ (5 * HZ) #define WMI_SEND_TIMEOUT_HZ (3 * HZ) +#define WMI_CTRL_STATS_READY_TIMEOUT_HZ (1 * HZ) struct ath12k_wmi_pdev { struct ath12k_wmi_base *wmi_ab; enum ath12k_htc_ep_id eid; const struct wmi_peer_flags_map *peer_flags; u32 rx_decap_mode; + wait_queue_head_t tx_ce_desc_wq; }; struct ath12k_wmi_base { @@ -4664,7 +8044,7 @@ struct completion service_ready; struct completion unified_ready; - DECLARE_BITMAP(svc_map, WMI_MAX_EXT_SERVICE); + DECLARE_BITMAP(svc_map, WMI_MAX_EXT2_SERVICE); wait_queue_head_t tx_credits_wq; const struct wmi_peer_flags_map *peer_flags; u32 num_mem_chunks; @@ -4676,30 +8056,312 @@ struct ath12k_wmi_target_cap_arg *targ_cap; }; +struct wmi_mlo_setup_cmd_fixed_param { + u32 tlv_header; + u32 mld_group_id; + u32 pdev_id; +} __packed; + +struct wmi_mlo_setup_params { + u32 group_id; + u8 num_partner_links; + u8 *partner_link_id; +}; + +struct wmi_mlo_ready_cmd_fixed_param { + u32 tlv_header; + u32 pdev_id; +} __packed; + +enum wmi_mlo_tear_down_reason_code_type { + WMI_MLO_TEARDOWN_SSR_REASON, +}; + +struct wmi_mlo_teardown_fixed_param { + u32 tlv_header; + u32 pdev_id; + u32 reason_code; + u32 umac_reset; +} __packed; + +struct wmi_mlo_setup_complete_event_fixed_param { + u32 pdev_id; + u32 status; +} __packed; + +struct wmi_mlo_teardown_complete_fixed_param { + u32 pdev_id; + u32 status; +} __packed; + +/* Inform FW that host expects response for multi-vdev + * restart command */ +#define WMI_MVR_RESPONSE_SUPPORT_EXPECTED 0x1 +#define WMI_MVR_CMD_TIMEOUT_HZ (2 * HZ) +#define WMI_MVR_RESP_VDEV_BM_MAX_LEN 2 +#define WMI_MVR_RESP_VDEV_BM_MAX_LEN_BYTES (WMI_MVR_RESP_VDEV_BM_MAX_LEN * 4) + +struct wmi_vdev_ids_arg { + u32 id_len; + u32 id[17]; /* TARGET_NUM_VDEVS */ +}; + +struct wmi_pdev_multiple_vdev_restart_req_arg { + struct wmi_vdev_ids_arg vdev_ids; + struct wmi_channel_arg channel; + u16 ru_punct_bitmap; + u32 width_device; + u32 center_freq_device; +}; + +struct wmi_pdev_multiple_vdev_restart_request_cmd { + __le32 tlv_header; + __le32 pdev_id; + __le32 requestor_id; + __le32 disable_hw_ack; + __le32 cac_duration_ms; + __le32 num_vdevs; + __le32 flags; + __le32 puncture_20mhz_bitmap; +} __packed; + +struct wmi_pdev_mvr_resp_event_fixed_param { + u32 pdev_id; + u32 requestor_id; + u32 status; +} __packed; + +struct wmi_pdev_mvr_resp_event_parse { + struct wmi_pdev_mvr_resp_event_fixed_param fixed_param; + u32 num_vdevs_bm; + u32 vdev_id_bm[WMI_MVR_RESP_VDEV_BM_MAX_LEN]; +} __packed; + +struct wmi_bcn_tmpl_ml_params { + __le32 tlv_header; + __le32 vdev_id; + __le32 hw_link_id; + __le32 beacon_interval; + __le32 csa_switch_count_offset; + __le32 ext_csa_switch_count_offset; + __le32 per_sta_profile_offset; + __le32 quiet_ie_offset; + __le32 is_other_ie_present; +} __packed; + +struct wmi_bcn_tmpl_ml_info { + __le32 tlv_header; + __le32 hw_link_id; + __le32 cu_vdev_map_cat1_lo; + __le32 cu_vdev_map_cat1_hi; + __le32 cu_vdev_map_cat2_lo; + __le32 cu_vdev_map_cat2_hi; +} __packed; + +struct wmi_critical_update_arg { + u16 num_ml_params; + struct wmi_bcn_tmpl_ml_params *ml_params; + u16 num_ml_info; + struct wmi_bcn_tmpl_ml_info *ml_info; +}; + +struct wmi_prb_resp_tmpl_ml_info_params { + __le32 tlv_header; + __le32 hw_link_id; + __le32 cu_vdev_map_cat1_lo; + __le32 cu_vdev_map_cat1_hi; + __le32 cu_vdev_map_cat2_lo; + __le32 cu_vdev_map_cat2_hi; +} __packed; + +#define ATH12K_LOWER_32_MASK GENMASK_ULL(31, 0) +#define ATH12K_UPPER_32_MASK GENMASK_ULL(63, 32) +#define ATH12K_GET_LOWER_32_BITS(val) (val & ATH12K_LOWER_32_MASK) +#define ATH12K_GET_UPPER_32_BITS(val) ((val & ATH12K_UPPER_32_MASK) >> 32) + + +#define WMI_ADFS_MODE_QUICK_OCAC 0 /* Agile preCAC */ +#define WMI_ADFS_MODE_QUICK_RCAC 2 /* Agile Rolling CAC */ +#define WMI_SUPPORT_CHAIN_MASK_ADFS BIT(31) + +#define MIN_PRECAC_TIMEOUT (6 * 60 * 1000) /* 6 minutes */ +#define MIN_WEATHER_RADAR_CHAN_PRECAC_TIMEOUT (6 * 10 * 60 * 1000) /* 1 hour */ +#define MAX_PRECAC_TIMEOUT (4 * 60 * 60 * 1000) /* 4 hours */ +#define MAX_WEATHER_RADAR_CHAN_PRECAC_TIMEOUT (24 * 60 * 60 * 1000) /* 24 hours */ +#define MIN_RCAC_TIMEOUT (62 * 1000) /* 62 seconds */ +#define MAX_RCAC_TIMEOUT 0xffffffff + +struct wmi_vdev_adfs_ch_cfg_cmd { + u32 tlv_header; + u32 vdev_id; + u32 ocac_mode; + u32 min_duration_ms; + u32 max_duration_ms; + u32 chan_freq; + u32 chan_width; + /* + * Two center frequencies are required since agile channel switch + * has to support 160/165 MHz for products like Pine. + * For agile which supports only up to 80MHz (HK), + * freq2 will be 0 and ignored. + */ + union { + u32 center_freq; + u32 center_freq1; + }; + u32 center_freq2; +} __packed; + +struct wmi_vdev_adfs_ocac_abort_cmd { + u32 tlv_header; + u32 vdev_id; +} __packed; + +#define WMI_DFS_RADAR_DETECTED_IN_SERVICE_CHAN 0 +#define WMI_DFS_RADAR_DETECTED_IN_OCAC_CHAN 1 + +struct wmi_vdev_adfs_ocac_complete_event_fixed_param { + u32 vdev_id; + u32 chan_freq; + u32 chan_width; + union { + u32 center_freq; + u32 center_freq1; + }; + u32 status; + u32 center_freq2; +} __packed; + +#define ATH12K_PEER_VALID_VDEV_ID (1 << 31) +#define ATH12K_PEER_PUNCT_BITMAP_VALID (1 << 30) +#define ATH12K_PEER_CH_WIDTH_SWITCH_TIMEOUT_HZ (5 * HZ) + +struct wmi_chan_width_peer_arg { + struct ath12k_wmi_mac_addr_params mac_addr; + u32 chan_width; + u32 puncture_20mhz_bitmap; + enum wmi_phy_mode peer_phymode; + bool is_upgrade; +}; + +struct wmi_peer_chan_width_switch_arg { + u32 num_peers; + u32 vdev_var; + u32 start_idx; + struct wmi_chan_width_peer_arg *peer_arg; +}; + +struct wmi_peer_chan_width_switch_req_cmd { + __le32 tlv_header; + __le32 num_peers; + __le32 vdev_var; +} __packed; + +struct wmi_chan_width_peer_list { + __le32 tlv_header; + struct ath12k_wmi_mac_addr_params mac_addr; + __le32 chan_width; + __le32 puncture_20mhz_bitmap; +} __packed; + + +#define MAX_20MHZ_SEGS 16 +#define MAX_NUM_ANTENNA 8 + +struct wmi_rssi_dbm_conv_event_fixed_param { + u32 pdev_id; +} __packed; + +struct wmi_rssi_dbm_conv_param_info { + u32 curr_bw; + u32 curr_rx_chainmask; + u32 xbar_config; + u32 xlna_bypass_offset; + u32 xlna_bypass_threshold; + s8 nf_hw_dbm[MAX_NUM_ANTENNA][MAX_20MHZ_SEGS]; +} __packed; + +struct wmi_rssi_dbm_conv_temp_offset { + s32 rssi_temp_offset; +} __packed; + +struct wmi_rssi_dbm_conv_offsets { + s32 rssi_temp_offset; + s8 min_nf_dbm; + /* rssi_offset is the sum of min_nf_dbm & rssi_temp_offset*/ + s32 rssi_offset; +}; + +#define WMI_LATENCY_TID_INFO_SCS_TID_NUM GENMASK(7, 0) +#define WMI_LATENCY_TID_INFO_SCS_AC GENMASK(9, 8) +#define WMI_LATENCY_TID_INFO_SCS_DL_EN BIT(10) +#define WMI_LATENCY_TID_INFO_SCS_UL_EN BIT(11) +#define WMI_LATENCY_TID_INFO_SCS_BURST_SZ_SUM GENMASK(13, 12) +#define WMI_LATENCY_TID_INFO_SCS_MSDUQ_ID GENMASK(17, 14) +#define WMI_LATENCY_TID_INFO_SCS_UL_OFDMA_DISABLE BIT(18) +#define WMI_LATENCY_TID_INFO_SCS_UL_MU_MIMO_DISABLE BIT(19) +#define WMI_LATENCY_TID_INFO_SCS_SAWF_UL_PARAM BIT(20) + +#define WMI_LATENCY_DIR_UL 0 +#define WMI_LATENCY_DIR_DL 1 +#define WMI_LATENCY_DIR_DIRECT 2 + +struct wmi_tid_latency_params { + __le32 tlv_header; + struct wmi_mac_addr destmac; + __le32 service_interval; + __le32 burst_size_diff; + __le32 max_latency; + __le32 max_per; + __le32 min_tput; + __le32 latency_tid_info; +} __packed; + +struct wmi_peer_tid_latency_cmd { + __le32 tlv_header; + __le32 pdev_id; +} __packed; + +#define WMI_ANI_EVENT_PDEV_ID_VALID BIT(31) +#define WMI_ANI_EVENT_PDEV_ID GENMASK(7, 0) + +struct wmi_pdev_ani_event { + __le32 tlv_header; + __s32 ani_level; + /* Bits 7:0 - pdev_id + * Bits 30:8 - reserved + * Bits 31 - pdev_id_valid - Flag to check pdev_id is valid or not + */ + __le32 pdev_id_bitmap; +} __packed; + #define ATH12K_FW_STATS_BUF_SIZE (1024 * 1024) void ath12k_wmi_init_qcn9274(struct ath12k_base *ab, struct ath12k_wmi_resource_config_arg *config); void ath12k_wmi_init_wcn7850(struct ath12k_base *ab, struct ath12k_wmi_resource_config_arg *config); +void ath12k_wmi_init_ipq5332(struct ath12k_base *ab, + struct ath12k_wmi_resource_config_arg *config); int ath12k_wmi_cmd_send(struct ath12k_wmi_pdev *wmi, struct sk_buff *skb, u32 cmd_id); struct sk_buff *ath12k_wmi_alloc_skb(struct ath12k_wmi_base *wmi_sc, u32 len); int ath12k_wmi_mgmt_send(struct ath12k *ar, u32 vdev_id, u32 buf_id, + struct sk_buff *frame, bool link_agnostic); +int ath12k_wmi_offchan_mgmt_send(struct ath12k *ar, u32 vdev_id, u32 buf_id, struct sk_buff *frame); int ath12k_wmi_bcn_tmpl(struct ath12k *ar, u32 vdev_id, struct ieee80211_mutable_offsets *offs, - struct sk_buff *bcn); + struct sk_buff *bcn, u32 ema_param); int ath12k_wmi_vdev_down(struct ath12k *ar, u8 vdev_id); -int ath12k_wmi_vdev_up(struct ath12k *ar, u32 vdev_id, u32 aid, - const u8 *bssid); +int ath12k_wmi_vdev_up(struct ath12k *ar, struct vdev_up_params *params); int ath12k_wmi_vdev_stop(struct ath12k *ar, u8 vdev_id); int ath12k_wmi_vdev_start(struct ath12k *ar, struct wmi_vdev_start_req_arg *arg, bool restart); int ath12k_wmi_set_peer_param(struct ath12k *ar, const u8 *peer_addr, u32 vdev_id, u32 param_id, u32 param_val); int ath12k_wmi_pdev_set_param(struct ath12k *ar, u32 param_id, - u32 param_value, u8 pdev_id); + s32 param_value, u8 pdev_id); int ath12k_wmi_pdev_set_ps_mode(struct ath12k *ar, int vdev_id, u32 enable); int ath12k_wmi_wait_for_unified_ready(struct ath12k_base *ab); int ath12k_wmi_cmd_init(struct ath12k_base *ab); @@ -4718,7 +8380,8 @@ int ath12k_wmi_set_sta_ps_param(struct ath12k *ar, u32 vdev_id, u32 param, u32 param_value); -int ath12k_wmi_force_fw_hang_cmd(struct ath12k *ar, u32 type, u32 delay_time_ms); +int ath12k_wmi_force_fw_hang_cmd(struct ath12k *ar, u32 type, u32 delay_time_ms, + bool nowait); int ath12k_wmi_send_peer_delete_cmd(struct ath12k *ar, const u8 *peer_addr, u8 vdev_id); int ath12k_wmi_vdev_delete(struct ath12k *ar, u8 vdev_id); @@ -4764,6 +8427,12 @@ u32 vdev_id, u32 bcn_ctrl_op); int ath12k_wmi_send_init_country_cmd(struct ath12k *ar, struct ath12k_wmi_init_country_arg *arg); +int +ath12k_wmi_send_thermal_mitigation_cmd(struct ath12k *ar, + struct ath12k_wmi_thermal_mitigation_arg *arg); +int ath12k_wmi_pdev_pktlog_enable(struct ath12k *ar, u32 pktlog_filter); +int ath12k_wmi_pdev_pktlog_disable(struct ath12k *ar); +int ath12k_wmi_pdev_peer_pktlog_filter(struct ath12k *ar, u8 *addr, u8 enable); int ath12k_wmi_peer_rx_reorder_queue_setup(struct ath12k *ar, int vdev_id, const u8 *addr, dma_addr_t paddr, u8 tid, @@ -4772,13 +8441,47 @@ int ath12k_wmi_rx_reord_queue_remove(struct ath12k *ar, struct ath12k_wmi_rx_reorder_queue_remove_arg *arg); +int ath12k_wmi_send_pdev_pkt_route(struct ath12k *ar, + struct ath12k_wmi_pkt_route_param *param); int ath12k_wmi_send_pdev_set_regdomain(struct ath12k *ar, struct ath12k_wmi_pdev_set_regdomain_arg *arg); -int ath12k_wmi_simulate_radar(struct ath12k *ar); +int ath12k_wmi_pull_fw_stats(struct ath12k_base *ab, struct sk_buff *skb, + struct ath12k_fw_stats *stats); +size_t ath12k_wmi_fw_stats_num_peers(struct list_head *head); +size_t ath12k_wmi_fw_stats_num_peers_extd(struct list_head *head); +size_t ath12k_wmi_fw_stats_num_vdevs(struct list_head *head); +void ath12k_wmi_fw_stats_fill(struct ath12k *ar, + struct ath12k_fw_stats *fw_stats, u32 stats_id, + char *buf); +int ath12k_wmi_simulate_radar(struct ath12k *ar, u32 radar_params); +int ath12k_wmi_simulate_awgn(struct ath12k *ar, u32 chan_bw_interference_bitmap); int ath12k_wmi_send_twt_enable_cmd(struct ath12k *ar, u32 pdev_id); int ath12k_wmi_send_twt_disable_cmd(struct ath12k *ar, u32 pdev_id); +int ath12k_wmi_send_twt_add_dialog_cmd(struct ath12k *ar, + struct wmi_twt_add_dialog_params *params); +int ath12k_wmi_send_twt_del_dialog_cmd(struct ath12k *ar, + struct wmi_twt_del_dialog_params *params); +int ath12k_wmi_send_twt_pause_dialog_cmd(struct ath12k *ar, + struct wmi_twt_pause_dialog_params *params); +int ath12k_wmi_send_twt_resume_dialog_cmd(struct ath12k *ar, + struct wmi_twt_resume_dialog_params *params); int ath12k_wmi_send_obss_spr_cmd(struct ath12k *ar, u32 vdev_id, struct ieee80211_he_obss_pd *he_obss_pd); +int ath12k_wmi_pdev_set_srg_bss_color_bitmap(struct ath12k *ar, u32 *bitmap); +int ath12k_wmi_pdev_set_srg_patial_bssid_bitmap(struct ath12k *ar, u32 *bitmap); +int ath12k_wmi_pdev_srg_obss_color_enable_bitmap(struct ath12k *ar, + u32 *bitmap); +int ath12k_wmi_pdev_srg_obss_bssid_enable_bitmap(struct ath12k *ar, + u32 *bitmap); +int ath12k_wmi_pdev_non_srg_obss_color_enable_bitmap(struct ath12k *ar, + u32 *bitmap); +int ath12k_wmi_pdev_non_srg_obss_bssid_enable_bitmap(struct ath12k *ar, + u32 *bitmap); +int ath12k_send_coex_config_cmd(struct ath12k *ar, + struct coex_config_arg *coex_config); +int ath12k_wmi_obss_color_cfg_cmd(struct ath12k *ar, u32 vdev_id, + u8 bss_color, u32 period, + bool enable); int ath12k_wmi_obss_color_cfg_cmd(struct ath12k *ar, u32 vdev_id, u8 bss_color, u32 period, bool enable); @@ -4799,5 +8502,49 @@ struct sk_buff *tmpl); int ath12k_wmi_set_hw_mode(struct ath12k_base *ab, enum wmi_host_hw_mode_config_type mode); - +int ath12k_wmi_send_vdev_set_tpc_power(struct ath12k *ar, + u32 vdev_id, + struct ath12k_reg_tpc_power_info *param); +int ath12k_wmi_dbglog_cfg(struct ath12k *ar, u32 param, u64 value); +int ath12k_wmi_pdev_ap_ps_cmd_send(struct ath12k *ar, u8 pdev_id, u32 value); +int ath12k_wmi_pdev_m3_dump_enable(struct ath12k *ar, u32 enable); +int ath12k_wmi_pdev_get_tpc_table_cmdid(struct ath12k *ar); +void ath12k_wmi_free_tpc_stats_mem(struct ath12k *ar); +int ath12k_wmi_send_wmi_ctrl_stats_cmd(struct ath12k *ar, + struct wmi_ctrl_path_stats_cmd_param *param); +int ath12k_wmi_mlo_setup(struct ath12k *ar, + struct wmi_mlo_setup_params *mlo_params); +int ath12k_wmi_mlo_ready(struct ath12k *ar); +int ath12k_wmi_mlo_teardown(struct ath12k *ar, bool umac_reset); +bool ath12k_wmi_is_mvr_supported(struct ath12k_base *ab); +int ath12k_wmi_pdev_multiple_vdev_restart(struct ath12k *ar, + struct wmi_pdev_multiple_vdev_restart_req_arg *arg); +int ath12k_wmi_vdev_adfs_ch_cfg_cmd_send(struct ath12k *ar,u32 vdev_id, + struct cfg80211_chan_def *chandef); +int ath12k_wmi_vdev_adfs_ocac_abort_cmd_send(struct ath12k *ar,u32 vdev_id); +int ath12k_wmi_svc_config_send(struct ath12k *ar, + struct ath12k_sawf_svc_params *param); +int ath12k_wmi_svc_send_disable(struct ath12k *ar, u32 svc_id); +int ath12k_wmi_mgmt_rx_reo_filter_config(struct ath12k *ar, + struct ath12k_mgmt_rx_reo_filter *filter); +int +ath12k_mgmt_rx_reo_init_context(struct ath12k_base *ab); +int +ath12k_mgmt_rx_reo_deinit_context(struct ath12k_base *ab); +#ifdef CONFIG_ATH12K_BONDED_DS_SUPPORT +int +ath12k_wmi_send_vdev_set_intra_bss_cmd(struct ath12k *ar, + u32 vdev_id, u32 enable); +int ath12k_wmi_set_peer_intra_bss_cmd(struct ath12k *ar, u32 vdev_id, const u8 *peer_addr, + u32 enable); +#endif +#ifdef CONFIG_ATH12K_PPE_DS_SUPPORT +int ath12k_wmi_config_peer_ppeds_routing(struct ath12k *ar, + const u8 *peer_addr, u8 vdev_id, + u32 service_code, u32 priority_valid, + u32 src_info, bool ppe_routing_enable); +#endif +void ath12k_wmi_peer_chan_width_switch_work(struct work_struct *work); +int ath12k_wmi_set_latency(struct ath12k *ar, struct ath12k_latency_params *params); +int ath12k_wmi_pdev_get_ani_level(struct ath12k *ar, u32 param_id, u8 pdev_id); #endif diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ar9003_calib.c --- linux-6.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ar9003_calib.c 2024-04-22 13:40:50.315869512 +0200 @@ -165,6 +165,8 @@ if (ret < 0) return ret; + ath9k_hw_update_cca_threshold(ah); + /* start NF calibration, without updating BB NF register */ ath9k_hw_start_nfcal(ah, false); } diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/ar9003_phy.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ar9003_phy.c --- linux-6.4/drivers/net/wireless/ath/ath9k/ar9003_phy.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ar9003_phy.c 2024-04-22 13:40:50.319869621 +0200 @@ -1918,6 +1918,116 @@ } } +/* + * Adaptive CCA threshold - Calculate and update CCA threshold periodically + * after NF calibration and at the end of initialization sequence during every + * chip reset. + * + * Step 1: Compute NF_max_primary and NF_max_extension + * If noise floor completes, + * NF_max_primary = max of noise floor read across all chains in primary channel + * NF_max_extension = max of noise floor read across all chains in extension channel + * else + * NF_max_primary = NF_max_extension = the value that is forced into HW as noise floor + * + * Step 2: Compute CCA_threshold_primary and CCA_threshold_extension + * CCA_threshold_primary = CCA_detection_level – CCA_detection_margin – NF_max_primary + * CCA_threshold_extension = CCA_detection_level – CCA_detection_margin – NF_max_extension + * + * Step 3: Program CCA thresholds + * + */ +void ar9003_update_cca_threshold(struct ath_hw *ah) +{ + struct ath9k_hw_cal_data *cal = ah->caldata; + struct ath9k_nfcal_hist *h; + u_int16_t cca_detection_margin_pri, cca_detection_margin_ext; + int16_t nf, nf_max_primary, nf_max_extension, nf_nominal, + derived_max_cca, max_cca_cap, cca_threshold_primary, + cca_threshold_extension; + u_int8_t chainmask; + int chan, chain, i, init_nf = 0; + + if (!ah->adaptive_cca_threshold_enabled) + return; + + if (!cal) + return; + + h = cal->nfCalHist; + + if (IS_CHAN_2GHZ(ah->curchan)) + nf = ah->nf_2g.max; + else + nf = ah->nf_5g.max; + + nf_max_primary = nf_max_extension = nf; + + chainmask = ah->rxchainmask & ah->caps.rx_chainmask; + + /* Compute max of noise floor read across all chains in primary channel */ + for (chan = 0; chan < 2 /*ctl,ext*/; chan++) { + ath_dbg(ath9k_hw_common(ah), CALIBRATE, "chan: %s\n", + !chan ? "ctrl" : "extn"); + + for (chain = 0; chain < AR9300_MAX_CHAINS; chain++) { + if (!((chainmask >> chain) & 0x1)) + continue; + + i = chan * AR9300_MAX_CHAINS + chain; + if (!init_nf) { + nf = h[i].privNF; + init_nf = 1; + } + + ath_dbg(ath9k_hw_common(ah), CALIBRATE, "privNF[%d]: %d\n", + i, h[i].privNF); + nf = (nf > h[i].privNF) ? nf : h[i].privNF; + } + + if (!chan) + nf_max_primary = nf; + else + nf_max_extension = nf; + } + + if (IS_CHAN_HT40(ah->curchan)) + nf_nominal = NF_NOM_40MHZ; + else + nf_nominal = NF_NOM_20MHZ; + + cca_detection_margin_pri = ah->cca_detection_margin; + if (nf_max_primary < nf_nominal) + cca_detection_margin_pri += (nf_nominal - nf_max_primary); + + cca_detection_margin_ext = ah->cca_detection_margin; + if (nf_max_extension < nf_nominal) + cca_detection_margin_ext += (nf_nominal - nf_max_extension); + + derived_max_cca = ah->cca_detection_level - ah->cca_detection_margin - BEST_CASE_NOISE_FLOOR; + max_cca_cap = derived_max_cca < MAX_CCA_THRESHOLD ? derived_max_cca : MAX_CCA_THRESHOLD; + + ath_dbg(ath9k_hw_common(ah), CALIBRATE, "derived_max_cca: %d, max_cca_cap: %d\n", + derived_max_cca, max_cca_cap); + + cca_threshold_primary = ah->cca_detection_level - cca_detection_margin_pri - nf_max_primary; + cca_threshold_primary = cca_threshold_primary < max_cca_cap ? + (cca_threshold_primary > MIN_CCA_THRESHOLD ? + cca_threshold_primary : MIN_CCA_THRESHOLD) : max_cca_cap; + cca_threshold_extension = ah->cca_detection_level - cca_detection_margin_ext - nf_max_extension; + cca_threshold_extension = cca_threshold_extension < max_cca_cap ? + (cca_threshold_extension > MIN_CCA_THRESHOLD ? + cca_threshold_extension : MIN_CCA_THRESHOLD) : max_cca_cap; + + ath_dbg(ath9k_hw_common(ah), CALIBRATE, + "nf_max_primary: %d, nf_max_extension: %d, cca_pri: %d, cca_ext: %d\n", + nf_max_primary, nf_max_extension, cca_threshold_primary, cca_threshold_extension); + + REG_RMW_FIELD(ah, AR_PHY_CCA_0, AR_PHY_CCA_THRESH62, cca_threshold_primary); + REG_RMW_FIELD(ah, AR_PHY_EXTCHN_PWRTHR1, AR_PHY_EXT_CCA0_THRESH62, cca_threshold_extension); + REG_RMW_FIELD(ah, AR_PHY_CCA_CTRL_0, AR_PHY_EXT_CCA0_THRESH62_MODE, 0x0); +} + void ar9003_hw_attach_phy_ops(struct ath_hw *ah) { struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah); @@ -1953,6 +2063,7 @@ priv_ops->ani_cache_ini_regs = ar9003_hw_ani_cache_ini_regs; priv_ops->set_radar_params = ar9003_hw_set_radar_params; priv_ops->fast_chan_change = ar9003_hw_fast_chan_change; + priv_ops->update_cca_threshold = ar9003_update_cca_threshold; ops->antdiv_comb_conf_get = ar9003_hw_antdiv_comb_conf_get; ops->antdiv_comb_conf_set = ar9003_hw_antdiv_comb_conf_set; diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/ar9003_phy.h linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ar9003_phy.h --- linux-6.4/drivers/net/wireless/ath/ath9k/ar9003_phy.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ar9003_phy.h 2024-04-22 13:40:50.319869621 +0200 @@ -399,6 +399,8 @@ #define AR_PHY_EXT_CCA0_THRESH62_S 0 #define AR_PHY_EXT_CCA0_THRESH62_1 0x000001FF #define AR_PHY_EXT_CCA0_THRESH62_1_S 0 +#define AR_PHY_EXT_CCA0_THRESH62_MODE 0x00040000 +#define AR_PHY_EXT_CCA0_THRESH62_MODE_S 18 #define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK 0x0000003F #define AR_PHY_CCK_DETECT_WEAK_SIG_THR_CCK_S 0 #define AR_PHY_CCK_DETECT_ANT_SWITCH_TIME 0x00001FC0 @@ -1326,4 +1328,10 @@ #define AR9300_DFS_FIRPWR -28 +#define BEST_CASE_NOISE_FLOOR -130 +#define MAX_CCA_THRESHOLD 90 +#define MIN_CCA_THRESHOLD 0 +#define NF_NOM_20MHZ -101 +#define NF_NOM_40MHZ -98 + #endif /* AR9003_PHY_H */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/ath9k.h linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ath9k.h --- linux-6.4/drivers/net/wireless/ath/ath9k/ath9k.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/ath9k.h 2024-04-22 13:40:50.319869621 +0200 @@ -1152,4 +1152,18 @@ static inline void ath_ahb_exit(void) {}; #endif +#ifdef CONFIG_ATH9K_TX99 +extern int ath9k_enable_tx99; + +static inline bool ath9k_tx99_enabled(void) +{ + return ath9k_enable_tx99 > 0; +} +#else +static inline bool ath9k_tx99_enabled(void) +{ + return false; +} +#endif + #endif /* ATH9K_H */ diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/calib.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/calib.c --- linux-6.4/drivers/net/wireless/ath/ath9k/calib.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/calib.c 2024-04-22 13:40:50.319869621 +0200 @@ -234,12 +234,17 @@ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_ENABLE_NF); + if (ah->adaptive_cca_threshold_enabled) { + REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), + AR_PHY_AGC_CONTROL_NO_UPDATE_NF); + } else { if (update) REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NO_UPDATE_NF); else REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NO_UPDATE_NF); + } REG_SET_BIT(ah, AR_PHY_AGC_CONTROL(ah), AR_PHY_AGC_CONTROL_NF); } @@ -476,9 +481,13 @@ * the baseband update the internal NF value itself, similar to * what is being done after a full reset. */ - if (!test_bit(NFCAL_PENDING, &caldata->cal_flags)) - ath9k_hw_start_nfcal(ah, true); - else if (!(REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) & AR_PHY_AGC_CONTROL_NF)) + if (!test_bit(NFCAL_PENDING, &caldata->cal_flags)) { + bool do_fast_recalib; + + ath9k_hw_update_cca_threshold(ah); + do_fast_recalib = !ah->adaptive_cca_threshold_enabled; + ath9k_hw_start_nfcal(ah, do_fast_recalib); + } else if (!(REG_READ(ah, AR_PHY_AGC_CONTROL(ah)) & AR_PHY_AGC_CONTROL_NF)) ath9k_hw_getnf(ah, ah->curchan); set_bit(NFCAL_INTF, &caldata->cal_flags); diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/hw-ops.h linux-6.4-fbx/drivers/net/wireless/ath/ath9k/hw-ops.h --- linux-6.4/drivers/net/wireless/ath/ath9k/hw-ops.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/hw-ops.h 2023-03-10 13:04:57.476924804 +0100 @@ -260,6 +260,14 @@ ath9k_hw_private_ops(ah)->set_radar_params(ah, &ah->radar_conf); } +static inline void ath9k_hw_update_cca_threshold(struct ath_hw *ah) +{ + if (!ath9k_hw_private_ops(ah)->update_cca_threshold) + return; + + ath9k_hw_private_ops(ah)->update_cca_threshold(ah); +} + static inline void ath9k_hw_init_cal_settings(struct ath_hw *ah) { ath9k_hw_private_ops(ah)->init_cal_settings(ah); diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/hw.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/hw.c --- linux-6.4/drivers/net/wireless/ath/ath9k/hw.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/hw.c 2024-04-22 13:40:50.327869840 +0200 @@ -395,6 +395,7 @@ { struct ath_common *common = ath9k_hw_common(ah); + ah->config.dma_beacon_response_time = 1; ah->config.sw_beacon_response_time = 6; ah->config.cwm_ignore_extcca = false; @@ -1837,6 +1838,7 @@ ar9003_mci_2g5g_switch(ah, false); ath9k_hw_loadnf(ah, ah->curchan); + ath9k_hw_update_cca_threshold(ah); ath9k_hw_start_nfcal(ah, true); if (AR_SREV_9271(ah)) @@ -2062,6 +2064,7 @@ if (AR_SREV_9300_20_OR_LATER(ah)) { ath9k_hw_loadnf(ah, chan); + ath9k_hw_update_cca_threshold(ah); ath9k_hw_start_nfcal(ah, true); } diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/hw.h linux-6.4-fbx/drivers/net/wireless/ath/ath9k/hw.h --- linux-6.4/drivers/net/wireless/ath/ath9k/hw.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/hw.h 2024-04-22 13:40:50.327869840 +0200 @@ -667,7 +667,7 @@ struct ath_hw_radar_conf *conf); int (*fast_chan_change)(struct ath_hw *ah, struct ath9k_channel *chan, u8 *ini_reloaded); - + void (*update_cca_threshold)(struct ath_hw *ah); /* ANI */ void (*ani_cache_ini_regs)(struct ath_hw *ah); @@ -988,6 +988,10 @@ bool msi_enabled; u32 msi_mask; u32 msi_reg; + + bool adaptive_cca_threshold_enabled; + s16 cca_detection_level; + u16 cca_detection_margin; }; struct ath_bus_ops { diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/init.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/init.c --- linux-6.4/drivers/net/wireless/ath/ath9k/init.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/init.c 2024-04-22 13:40:50.327869840 +0200 @@ -80,6 +80,16 @@ module_param_named(use_msi, ath9k_use_msi, int, 0444); MODULE_PARM_DESC(use_msi, "Use MSI instead of INTx if possible"); +int ath9k_use_adaptive_cca; +module_param_named(use_adaptive_cca, ath9k_use_adaptive_cca, int, 0444); +MODULE_PARM_DESC(use_adaptive_cca, "enable adaptive cca by default"); + +#ifdef CONFIG_ATH9K_TX99 +int ath9k_enable_tx99; +module_param_named(enable_tx99, ath9k_enable_tx99, int, 0444); +MODULE_PARM_DESC(enable_tx99, "Enable TX99, which will disable STA/AP mode support"); +#endif + bool is_ath9k_unloaded; #ifdef CONFIG_MAC80211_LEDS @@ -714,6 +724,9 @@ ah->hw_version.devid = devid; ah->ah_flags |= AH_USE_EEPROM; ah->led_pin = -1; + ah->cca_detection_level = -70; + ah->cca_detection_margin = 3; + ah->adaptive_cca_threshold_enabled = ath9k_use_adaptive_cca; ah->reg_ops.read = ath9k_ioread32; ah->reg_ops.multi_read = ath9k_multi_ioread32; ah->reg_ops.write = ath9k_iowrite32; @@ -742,6 +755,7 @@ common->debug_mask = ath9k_debug; common->btcoex_enabled = ath9k_btcoex_enable == 1; common->disable_ani = false; + common->dfs_pulse_valid_diff_ts = 0; /* * Platform quirks. @@ -981,7 +995,7 @@ NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE | NL80211_FEATURE_P2P_GO_CTWIN; - if (!IS_ENABLED(CONFIG_ATH9K_TX99)) { + if (!ath9k_tx99_enabled()) { hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_P2P_GO) | BIT(NL80211_IFTYPE_P2P_CLIENT) | diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/link.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/link.c --- linux-6.4/drivers/net/wireless/ath/ath9k/link.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/link.c 2023-03-15 13:36:54.470058565 +0100 @@ -523,11 +523,14 @@ survey->filled |= SURVEY_INFO_TIME | SURVEY_INFO_TIME_BUSY | SURVEY_INFO_TIME_RX | + SURVEY_INFO_TIME_BSS_RX | SURVEY_INFO_TIME_TX; survey->time += cc->cycles / div; survey->time_busy += cc->rx_busy / div; survey->time_rx += cc->rx_frame / div; survey->time_tx += cc->tx_frame / div; + /* convert rx airtime from usec to msec */ + survey->time_bss_rx += cc->rx_bss_frame / 1000; } if (cc->cycles < div) diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/main.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/main.c --- linux-6.4/drivers/net/wireless/ath/ath9k/main.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/main.c 2024-04-22 13:40:50.327869840 +0200 @@ -850,7 +850,7 @@ static bool ath9k_txq_has_key(struct ath_softc *sc, u32 keyix) { struct ath_hw *ah = sc->sc_ah; - int i; + int i, j; struct ath_txq *txq; bool key_in_use = false; @@ -868,8 +868,9 @@ if (sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_EDMA) { int idx = txq->txq_tailidx; - while (!key_in_use && - !list_empty(&txq->txq_fifo[idx])) { + for (j = 0; !key_in_use && + !list_empty(&txq->txq_fifo[idx]) && + j < ATH_TXFIFO_DEPTH; j++) { key_in_use = ath9k_txq_list_has_key( &txq->txq_fifo[idx], keyix); INCR(idx, ATH_TXFIFO_DEPTH); @@ -1336,7 +1337,7 @@ struct ath_node *an = &avp->mcast_node; mutex_lock(&sc->mutex); - if (IS_ENABLED(CONFIG_ATH9K_TX99)) { + if (ath9k_tx99_enabled()) { if (sc->cur_chan->nvifs >= 1) { mutex_unlock(&sc->mutex); return -EOPNOTSUPP; @@ -1386,7 +1387,7 @@ mutex_lock(&sc->mutex); - if (IS_ENABLED(CONFIG_ATH9K_TX99)) { + if (ath9k_tx99_enabled()) { mutex_unlock(&sc->mutex); return -EOPNOTSUPP; } @@ -1446,7 +1447,7 @@ struct ath_hw *ah = sc->sc_ah; struct ath_common *common = ath9k_hw_common(ah); - if (IS_ENABLED(CONFIG_ATH9K_TX99)) + if (ath9k_tx99_enabled()) return; sc->ps_enabled = true; @@ -1465,7 +1466,7 @@ struct ath_hw *ah = sc->sc_ah; struct ath_common *common = ath9k_hw_common(ah); - if (IS_ENABLED(CONFIG_ATH9K_TX99)) + if (ath9k_tx99_enabled()) return; sc->ps_enabled = false; @@ -1541,7 +1542,7 @@ ath_chanctx_set_channel(sc, ctx, &hw->conf.chandef); } - if (changed & IEEE80211_CONF_CHANGE_POWER) + if ((changed & IEEE80211_CONF_CHANGE_POWER) && !(ah->tpc_enabled)) ath9k_set_txpower(sc, NULL); mutex_unlock(&sc->mutex); @@ -2070,7 +2071,7 @@ unsigned long flags; int pos; - if (IS_ENABLED(CONFIG_ATH9K_TX99)) + if (ath9k_tx99_enabled()) return -EOPNOTSUPP; spin_lock_irqsave(&common->cc_lock, flags); @@ -2120,7 +2121,7 @@ struct ath_softc *sc = hw->priv; struct ath_hw *ah = sc->sc_ah; - if (IS_ENABLED(CONFIG_ATH9K_TX99)) + if (ath9k_tx99_enabled()) return; mutex_lock(&sc->mutex); @@ -2383,7 +2384,22 @@ { struct ath_softc *sc = hw->priv; struct ath_common *common = ath9k_hw_common(sc->sc_ah); + struct cfg80211_chan_def *chandef = &sc->cur_chan->chandef; + struct ieee80211_channel *chan = chandef->chan; + int pos = chan->hw_value; set_bit(ATH_OP_SCANNING, &common->op_flags); + + /* Reset current survey */ + if (!sc->cur_chan->offchannel) { + if (sc->cur_survey != &sc->survey[pos]) { + if (sc->cur_survey) + sc->cur_survey->filled &= ~SURVEY_INFO_IN_USE; + sc->cur_survey = &sc->survey[pos]; + } + + memset(sc->cur_survey, 0, sizeof(struct survey_info)); + sc->cur_survey->filled |= SURVEY_INFO_IN_USE; + } } static void ath9k_sw_scan_complete(struct ieee80211_hw *hw, diff -ruw linux-6.4/drivers/net/wireless/ath/ath9k/recv.c linux-6.4-fbx/drivers/net/wireless/ath/ath9k/recv.c --- linux-6.4/drivers/net/wireless/ath/ath9k/recv.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/ath9k/recv.c 2023-03-15 13:36:54.470058565 +0100 @@ -377,7 +377,7 @@ struct ath_common *common = ath9k_hw_common(sc->sc_ah); u32 rfilt; - if (IS_ENABLED(CONFIG_ATH9K_TX99)) + if (ath9k_tx99_enabled()) return 0; rfilt = ATH9K_RX_FILTER_UCAST | ATH9K_RX_FILTER_BCAST @@ -1018,6 +1018,7 @@ struct ieee80211_rx_status *rxs; const struct ieee80211_rate *rate; bool is_sgi, is_40, is_sp; + unsigned long flags; int phy; u16 len = rs->rs_datalen; u32 airtime = 0; @@ -1052,6 +1053,10 @@ len, rxs->rate_idx, is_sp); } + spin_lock_irqsave(&common->cc_lock, flags); + common->cc_survey.rx_bss_frame += airtime; + spin_unlock_irqrestore(&common->cc_lock, flags); + ieee80211_sta_register_airtime(sta, tidno, 0, airtime); exit: rcu_read_unlock(); diff -ruw linux-6.4/drivers/net/wireless/ath/dfs_pattern_detector.c linux-6.4-fbx/drivers/net/wireless/ath/dfs_pattern_detector.c --- linux-6.4/drivers/net/wireless/ath/dfs_pattern_detector.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/dfs_pattern_detector.c 2024-04-22 13:40:50.331869949 +0200 @@ -275,6 +275,7 @@ { u32 i; struct channel_detector *cd; + int diff_ts; /* * pulses received for a non-supported or un-initialized @@ -287,8 +288,9 @@ if (cd == NULL) return false; + diff_ts = event->ts - dpd->last_pulse_ts; /* reset detector on time stamp wraparound, caused by TSF reset */ - if (event->ts < dpd->last_pulse_ts) + if (diff_ts < dpd->common->dfs_pulse_valid_diff_ts) dpd_reset(dpd); dpd->last_pulse_ts = event->ts; diff -ruw linux-6.4/drivers/net/wireless/ath/dfs_pattern_detector.h linux-6.4-fbx/drivers/net/wireless/ath/dfs_pattern_detector.h --- linux-6.4/drivers/net/wireless/ath/dfs_pattern_detector.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/dfs_pattern_detector.h 2023-02-27 20:51:59.590934925 +0100 @@ -24,7 +24,7 @@ /* tolerated deviation of radar time stamp in usecs on both sides * TODO: this might need to be HW-dependent */ -#define PRI_TOLERANCE 16 +#define PRI_TOLERANCE 6 /** * struct ath_dfs_pool_stats - DFS Statistics for global pools diff -ruw linux-6.4/drivers/net/wireless/ath/key.c linux-6.4-fbx/drivers/net/wireless/ath/key.c --- linux-6.4/drivers/net/wireless/ath/key.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/key.c 2024-04-22 13:40:50.331869949 +0200 @@ -524,7 +524,7 @@ idx = ath_reserve_key_cache_slot(common, key->cipher); break; default: - idx = key->keyidx; + idx = ath_reserve_key_cache_slot(common, key->cipher); break; } } else if (key->keyidx) { diff -ruw linux-6.4/drivers/net/wireless/ath/regd.c linux-6.4-fbx/drivers/net/wireless/ath/regd.c --- linux-6.4/drivers/net/wireless/ath/regd.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/ath/regd.c 2023-02-27 20:46:50.166676215 +0100 @@ -345,6 +345,10 @@ struct ieee80211_channel *ch; unsigned int i; +#ifdef CONFIG_ATH_REG_IGNORE + return; +#endif + for (band = 0; band < NUM_NL80211_BANDS; band++) { if (!wiphy->bands[band]) continue; @@ -379,6 +383,10 @@ { struct ieee80211_supported_band *sband; +#ifdef CONFIG_ATH_REG_IGNORE + return; +#endif + sband = wiphy->bands[NL80211_BAND_2GHZ]; if (!sband) return; @@ -408,6 +416,9 @@ struct ieee80211_channel *ch; unsigned int i; +#ifdef CONFIG_ATH_REG_IGNORE + return; +#endif if (!wiphy->bands[NL80211_BAND_5GHZ]) return; @@ -640,6 +651,11 @@ const struct ieee80211_regdomain *regd; wiphy->reg_notifier = reg_notifier; + +#ifdef CONFIG_ATH_REG_IGNORE + return 0; +#endif + wiphy->regulatory_flags |= REGULATORY_STRICT_REG | REGULATORY_CUSTOM_REG; @@ -704,7 +720,7 @@ regdmn == CTRY_DEFAULT) { printk(KERN_DEBUG "ath: EEPROM indicates default " "country code should be used\n"); - reg->country_code = CTRY_UNITED_STATES; + reg->country_code = CTRY_FRANCE; } if (reg->country_code == CTRY_DEFAULT) { diff -ruw linux-6.4/drivers/net/wireless/marvell/Kconfig linux-6.4-fbx/drivers/net/wireless/marvell/Kconfig --- linux-6.4/drivers/net/wireless/marvell/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/marvell/Kconfig 2023-03-10 17:18:24.474042758 +0100 @@ -25,4 +25,8 @@ To compile this driver as a module, choose M here: the module will be called mwl8k. If unsure, say N. +config MWL8K_NEW + tristate "Marvell 88W8xxx PCI/PCIe NEW" + depends on MAC80211 && PCI + endif # WLAN_VENDOR_MARVELL diff -ruw linux-6.4/drivers/net/wireless/marvell/Makefile linux-6.4-fbx/drivers/net/wireless/marvell/Makefile --- linux-6.4/drivers/net/wireless/marvell/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/net/wireless/marvell/Makefile 2023-03-10 17:18:24.474042758 +0100 @@ -5,3 +5,4 @@ obj-$(CONFIG_MWIFIEX) += mwifiex/ obj-$(CONFIG_MWL8K) += mwl8k.o +obj-$(CONFIG_MWL8K_NEW) += mwl8k_new/ diff -ruw linux-6.4/drivers/nvmem/Kconfig linux-6.4-fbx/drivers/nvmem/Kconfig --- linux-6.4/drivers/nvmem/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/nvmem/Kconfig 2024-04-22 13:40:50.623877927 +0200 @@ -59,6 +59,9 @@ This driver provides support for Broadcom's NVRAM that can be accessed using I/O mapping. +config NVMEM_IGNORE_RO + bool "ignore read-only flags" + config NVMEM_IMX_IIM tristate "i.MX IC Identification Module support" depends on ARCH_MXC || COMPILE_TEST diff -ruw linux-6.4/drivers/nvmem/core.c linux-6.4-fbx/drivers/nvmem/core.c --- linux-6.4/drivers/nvmem/core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/nvmem/core.c 2024-04-22 13:40:50.623877927 +0200 @@ -930,8 +930,10 @@ if (rval) goto err_put_device; +#ifndef CONFIG_NVMEM_IGNORE_RO nvmem->read_only = device_property_present(config->dev, "read-only") || config->read_only || !nvmem->reg_write; +#endif #ifdef CONFIG_NVMEM_SYSFS nvmem->dev.groups = nvmem_dev_groups; diff -ruw linux-6.4/drivers/of/Kconfig linux-6.4-fbx/drivers/of/Kconfig --- linux-6.4/drivers/of/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/of/Kconfig 2024-04-22 13:40:50.627878036 +0200 @@ -47,6 +47,11 @@ If unsure, say N here, but this option is safe to enable. +config OF_DTB_BUILTIN_LIST + string "Link given list of DTB files into kernel" + help + Specify filename without .dtb extension + config OF_FLATTREE bool select DTC @@ -102,4 +107,11 @@ config OF_NUMA bool +config OF_CONFIGFS + bool "Device Tree Overlay ConfigFS interface" + select CONFIGFS_FS + select OF_OVERLAY + help + Enable a simple user-space driven DT overlay interface. + endif # OF diff -ruw linux-6.4/drivers/of/Makefile linux-6.4-fbx/drivers/of/Makefile --- linux-6.4/drivers/of/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/of/Makefile 2024-04-22 13:40:50.627878036 +0200 @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-y = base.o cpu.o device.o module.o platform.o property.o obj-$(CONFIG_OF_KOBJ) += kobj.o +obj-$(CONFIG_OF_CONFIGFS) += configfs.o obj-$(CONFIG_OF_DYNAMIC) += dynamic.o obj-$(CONFIG_OF_FLATTREE) += fdt.o obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o diff -ruw linux-6.4/drivers/of/fdt.c linux-6.4-fbx/drivers/of/fdt.c --- linux-6.4/drivers/of/fdt.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/of/fdt.c 2024-04-22 13:40:50.627878036 +0200 @@ -29,6 +29,7 @@ #include /* for COMMAND_LINE_SIZE */ #include +#include #include "of_private.h" @@ -787,6 +788,39 @@ return 0; } +/* + * iterate list of built-in dtb to find a compatible match + */ +const void __init *of_fdt_find_compatible_dtb(const char *name) +{ + struct fdt_header { + __be32 magic; + __be32 totalsize; + }; + const struct fdt_header *blob, *best; + unsigned int best_score = ~0; + + best = NULL; + blob = (const struct fdt_header *)__dtb_start; + while ((void *)blob < (void *)__dtb_end && + (be32_to_cpu(blob->magic) == OF_DT_HEADER)) { + unsigned int score; + u32 size; + + score = of_fdt_is_compatible(blob, 0, name); + if (score > 0 && score < best_score) { + best = blob; + best_score = score; + } + + size = be32_to_cpu(blob->totalsize); + blob = (const struct fdt_header *) + PTR_ALIGN((void *)blob + size, STRUCT_ALIGNMENT); + } + + return best; +} + /** * of_flat_dt_is_compatible - Return true if given node has compat in compatible list * @node: node to test diff -ruw linux-6.4/drivers/of/overlay.c linux-6.4-fbx/drivers/of/overlay.c --- linux-6.4/drivers/of/overlay.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/of/overlay.c 2024-04-22 13:40:50.631878145 +0200 @@ -358,7 +358,7 @@ } if (!of_node_check_flag(target->np, OF_OVERLAY)) - pr_err("WARNING: memory leak will occur if overlay removed, property: %pOF/%s\n", + pr_debug("WARNING: memory leak will occur if overlay removed, property: %pOF/%s\n", target->np, new_prop->name); if (ret) { diff -ruw linux-6.4/drivers/pci/controller/Kconfig linux-6.4-fbx/drivers/pci/controller/Kconfig --- linux-6.4/drivers/pci/controller/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/controller/Kconfig 2024-04-22 13:40:50.639878364 +0200 @@ -179,7 +179,6 @@ depends on MVEBU_MBUS depends on ARM depends on OF - depends on BROKEN select PCI_BRIDGE_EMUL help Add support for Marvell EBU PCIe controller. This PCIe controller @@ -208,6 +207,12 @@ Say Y here if you want to enable Gen3 PCIe controller support on MediaTek SoCs. +config PCIE_BCM63XX + tristate "BCM63XX SoCs PCIe endpoint driver." + depends on ARCH_BCMBCA || COMPILE_TEST + depends on OF + depends on PCI_MSI + config PCIE_MT7621 tristate "MediaTek MT7621 PCIe controller" depends on SOC_MT7621 || COMPILE_TEST diff -ruw linux-6.4/drivers/pci/controller/Makefile linux-6.4-fbx/drivers/pci/controller/Makefile --- linux-6.4/drivers/pci/controller/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/controller/Makefile 2024-04-22 13:40:50.639878364 +0200 @@ -33,6 +33,7 @@ obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o obj-$(CONFIG_PCIE_MEDIATEK_GEN3) += pcie-mediatek-gen3.o obj-$(CONFIG_PCIE_MICROCHIP_HOST) += pcie-microchip-host.o +obj-$(CONFIG_PCIE_BCM63XX) += pcie-bcm63xx.o obj-$(CONFIG_VMD) += vmd.o obj-$(CONFIG_PCIE_BRCMSTB) += pcie-brcmstb.o obj-$(CONFIG_PCI_LOONGSON) += pci-loongson.o diff -ruw linux-6.4/drivers/pci/controller/dwc/pci-meson.c linux-6.4-fbx/drivers/pci/controller/dwc/pci-meson.c --- linux-6.4/drivers/pci/controller/dwc/pci-meson.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/controller/dwc/pci-meson.c 2024-04-22 13:40:50.643878473 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include "../../pci.h" #include "pcie-designware.h" @@ -39,6 +40,8 @@ #define PM_CURRENT_STATE(x) (((x) >> 7) & 0x1) #define WAIT_LINKUP_TIMEOUT 4000 +#define LINK_UP_POLL msecs_to_jiffies(100) +#define MAX_POLL_ITER (5 * 60 * 10) /* 5 min */ #define PORT_CLK_RATE 100000000UL #define MAX_PAYLOAD_SIZE 256 #define MAX_READ_REQ_SIZE 256 @@ -71,6 +74,8 @@ struct meson_pcie_rc_reset mrst; struct gpio_desc *reset_gpio; struct phy *phy; + struct delayed_work work; + int poll_idx; }; static struct reset_control *meson_pcie_get_reset(struct meson_pcie *mp, @@ -227,8 +232,9 @@ static void meson_pcie_assert_reset(struct meson_pcie *mp) { gpiod_set_value_cansleep(mp->reset_gpio, 1); - udelay(500); + msleep(PCI_PM_D3COLD_WAIT); gpiod_set_value_cansleep(mp->reset_gpio, 0); + msleep(PCI_PM_D3COLD_WAIT); } static void meson_pcie_ltssm_enable(struct meson_pcie *mp) @@ -240,6 +246,15 @@ meson_cfg_writel(mp, val, PCIE_CFG0); } +static void meson_pcie_ltssm_disable(struct meson_pcie *mp) +{ + u32 val; + + val = meson_cfg_readl(mp, PCIE_CFG0); + val &= ~APP_LTSSM_ENABLE; + meson_cfg_writel(mp, val, PCIE_CFG0); +} + static int meson_size_to_payload(struct meson_pcie *mp, int size) { struct device *dev = mp->pci.dev; @@ -299,6 +314,14 @@ return 0; } +static void meson_pcie_stop_link(struct dw_pcie *pci) +{ + struct meson_pcie *mp = to_meson_pcie(pci); + + meson_pcie_ltssm_disable(mp); + gpiod_set_value_cansleep(mp->reset_gpio, 1); +} + static int meson_pcie_rd_own_conf(struct pci_bus *bus, u32 devfn, int where, int size, u32 *val) { @@ -331,43 +354,12 @@ .write = pci_generic_config_write, }; -static int meson_pcie_link_up(struct dw_pcie *pci) +static void meson_pcie_link_failed(struct dw_pcie *pci) { struct meson_pcie *mp = to_meson_pcie(pci); - struct device *dev = pci->dev; - u32 speed_okay = 0; - u32 cnt = 0; - u32 state12, state17, smlh_up, ltssm_up, rdlh_up; - - do { - state12 = meson_cfg_readl(mp, PCIE_CFG_STATUS12); - state17 = meson_cfg_readl(mp, PCIE_CFG_STATUS17); - smlh_up = IS_SMLH_LINK_UP(state12); - rdlh_up = IS_RDLH_LINK_UP(state12); - ltssm_up = IS_LTSSM_UP(state12); - - if (PM_CURRENT_STATE(state17) < PCIE_GEN3) - speed_okay = 1; - - if (smlh_up) - dev_dbg(dev, "smlh_link_up is on\n"); - if (rdlh_up) - dev_dbg(dev, "rdlh_link_up is on\n"); - if (ltssm_up) - dev_dbg(dev, "ltssm_up is on\n"); - if (speed_okay) - dev_dbg(dev, "speed_okay\n"); - - if (smlh_up && rdlh_up && ltssm_up && speed_okay) - return 1; - - cnt++; - udelay(10); - } while (cnt < WAIT_LINKUP_TIMEOUT); - - dev_err(dev, "error: wait linkup timeout\n"); - return 0; + dev_info(pci->dev, "Linkup timedout, lets start backup polling\n"); + mod_delayed_work(system_wq, &mp->work, LINK_UP_POLL); } static int meson_pcie_host_init(struct dw_pcie_rp *pp) @@ -388,10 +380,34 @@ }; static const struct dw_pcie_ops dw_pcie_ops = { - .link_up = meson_pcie_link_up, + .link_failed = meson_pcie_link_failed, .start_link = meson_pcie_start_link, + .stop_link = meson_pcie_stop_link, }; +static void meson_pcie_poll_link(struct work_struct *work) +{ + struct delayed_work *delayed_work; + struct meson_pcie *mp; + bool up; + + delayed_work = to_delayed_work(work); + mp = container_of(delayed_work, struct meson_pcie, work); + mp->poll_idx += 1; + + up = dw_pcie_link_up(&mp->pci); + if (up) { + dev_info(mp->pci.dev, "Link finaly UP, rescan..."); + + pci_lock_rescan_remove(); + pci_rescan_bus(mp->pci.pp.bridge->bus); + pci_unlock_rescan_remove(); + } else if (mp->poll_idx > MAX_POLL_ITER) + dev_info(mp->pci.dev, "Linkup timedout for real this time\n"); + else + mod_delayed_work(system_wq, &mp->work, LINK_UP_POLL); +} + static int meson_pcie_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; @@ -407,7 +423,9 @@ pci->dev = dev; pci->ops = &dw_pcie_ops; pci->pp.ops = &meson_pcie_host_ops; + pci->pp.num_vectors = MAX_MSI_IRQS; pci->num_lanes = 1; + INIT_DELAYED_WORK(&mp->work, meson_pcie_poll_link); mp->phy = devm_phy_get(dev, "pcie"); if (IS_ERR(mp->phy)) { @@ -466,6 +484,20 @@ return ret; } +static int meson_pcie_remove(struct platform_device *pdev) { + struct meson_pcie *mp = platform_get_drvdata(pdev); + struct dw_pcie *pci = &mp->pci; + + cancel_delayed_work_sync(&mp->work); + dw_pcie_host_deinit(&pci->pp); + meson_pcie_power_off(mp); + /* even if link_down shoud hold our link in reset, something seems to + * be drawing 100 mW if we don't do it, so lets force it for now */ + gpiod_set_value_cansleep(mp->reset_gpio, 1); + + return 0; +} + static const struct of_device_id meson_pcie_of_match[] = { { .compatible = "amlogic,axg-pcie", @@ -479,6 +511,7 @@ static struct platform_driver meson_pcie_driver = { .probe = meson_pcie_probe, + .remove = meson_pcie_remove, .driver = { .name = "meson-pcie", .of_match_table = meson_pcie_of_match, diff -ruw linux-6.4/drivers/pci/controller/dwc/pcie-designware-host.c linux-6.4-fbx/drivers/pci/controller/dwc/pcie-designware-host.c --- linux-6.4/drivers/pci/controller/dwc/pcie-designware-host.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/controller/dwc/pcie-designware-host.c 2024-04-22 13:40:50.647878582 +0200 @@ -492,7 +492,9 @@ } /* Ignore errors, the link may come up later */ - dw_pcie_wait_for_link(pci); + ret = dw_pcie_wait_for_link(pci); + if (ret == -ETIMEDOUT && pci->ops && pci->ops->link_failed) + pci->ops->link_failed(pci); bridge->sysdata = pp; diff -ruw linux-6.4/drivers/pci/controller/dwc/pcie-designware.h linux-6.4-fbx/drivers/pci/controller/dwc/pcie-designware.h --- linux-6.4/drivers/pci/controller/dwc/pcie-designware.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/controller/dwc/pcie-designware.h 2024-04-22 13:40:50.647878582 +0200 @@ -364,6 +364,7 @@ void (*write_dbi2)(struct dw_pcie *pcie, void __iomem *base, u32 reg, size_t size, u32 val); int (*link_up)(struct dw_pcie *pcie); + void (*link_failed)(struct dw_pcie *pcie); int (*start_link)(struct dw_pcie *pcie); void (*stop_link)(struct dw_pcie *pcie); }; diff -ruw linux-6.4/drivers/pci/pci-sysfs.c linux-6.4-fbx/drivers/pci/pci-sysfs.c --- linux-6.4/drivers/pci/pci-sysfs.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/pci-sysfs.c 2024-04-22 13:40:50.671879238 +0200 @@ -1149,6 +1149,7 @@ { int i; + mutex_lock(&pdev->sysfs_init_lock); for (i = 0; i < PCI_STD_NUM_BARS; i++) { struct bin_attribute *res_attr; @@ -1164,6 +1165,9 @@ kfree(res_attr); } } + + pdev->sysfs_init_done = 0; + mutex_unlock(&pdev->sysfs_init_lock); } static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) @@ -1226,6 +1230,12 @@ int i; int retval; + mutex_lock(&pdev->sysfs_init_lock); + if (pdev->sysfs_init_done) { + mutex_unlock(&pdev->sysfs_init_lock); + return 0; + } + /* Expose the PCI resources from this device as files */ for (i = 0; i < PCI_STD_NUM_BARS; i++) { @@ -1239,10 +1249,14 @@ pdev->resource[i].flags & IORESOURCE_PREFETCH) retval = pci_create_attr(pdev, i, 1); if (retval) { + mutex_unlock(&pdev->sysfs_init_lock); pci_remove_resource_files(pdev); return retval; } } + + pdev->sysfs_init_done = 1; + mutex_unlock(&pdev->sysfs_init_lock); return 0; } #else /* !(defined(HAVE_PCI_MMAP) || defined(ARCH_GENERIC_PCI_MMAP_RESOURCE)) */ diff -ruw linux-6.4/drivers/pci/pcie/portdrv.c linux-6.4-fbx/drivers/pci/pcie/portdrv.c --- linux-6.4/drivers/pci/pcie/portdrv.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/pcie/portdrv.c 2024-04-22 13:40:50.675879347 +0200 @@ -21,6 +21,8 @@ #include "../pci.h" #include "portdrv.h" +static DEFINE_MUTEX(irq_alloc_mutex); + /* * The PCIe Capability Interrupt Message Number (PCIe r3.1, sec 7.8.2) must * be one of the first 32 MSI-X entries. Per PCI r3.0, sec 6.8.3.1, MSI @@ -114,16 +116,21 @@ int nr_entries, nvec, pcie_irq; u32 pme = 0, aer = 0, dpc = 0; + mutex_lock(&irq_alloc_mutex); + /* Allocate the maximum possible number of MSI/MSI-X vectors */ nr_entries = pci_alloc_irq_vectors(dev, 1, PCIE_PORT_MAX_MSI_ENTRIES, PCI_IRQ_MSIX | PCI_IRQ_MSI); - if (nr_entries < 0) + if (nr_entries < 0) { + mutex_unlock(&irq_alloc_mutex); return nr_entries; + } /* See how many and which Interrupt Message Numbers we actually use */ nvec = pcie_message_numbers(dev, mask, &pme, &aer, &dpc); if (nvec > nr_entries) { pci_free_irq_vectors(dev); + mutex_unlock(&irq_alloc_mutex); return -EIO; } @@ -143,9 +150,13 @@ nr_entries = pci_alloc_irq_vectors(dev, nvec, nvec, PCI_IRQ_MSIX | PCI_IRQ_MSI); - if (nr_entries < 0) + if (nr_entries < 0) { + mutex_unlock(&irq_alloc_mutex); return nr_entries; } + } + + mutex_unlock(&irq_alloc_mutex); /* PME, hotplug and bandwidth notification share an MSI/MSI-X vector */ if (mask & (PCIE_PORT_SERVICE_PME | PCIE_PORT_SERVICE_HP | diff -ruw linux-6.4/drivers/pci/probe.c linux-6.4-fbx/drivers/pci/probe.c --- linux-6.4/drivers/pci/probe.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/probe.c 2024-04-22 13:40:50.675879347 +0200 @@ -2310,6 +2310,7 @@ return NULL; INIT_LIST_HEAD(&dev->bus_list); + mutex_init(&dev->sysfs_init_lock); dev->dev.type = &pci_dev_type; dev->bus = pci_bus_get(bus); dev->driver_exclusive_resource = (struct resource) { @@ -3270,6 +3271,34 @@ return max; } +/* + * Walks the PCI/PCIe tree to find the first instance of a PCIe device and + * hands off the PCIe bus to pcie_bus_configure_settings to walk the rest. + */ +static int pcie_rescan_bus_configure_settings(struct pci_dev *dev, void *data) +{ + if (pci_is_pcie(dev)) { + struct pci_bus *child, *bus = dev->bus; + + list_for_each_entry(child, &bus->children, node) + pcie_bus_configure_settings(child); + + return 1; + } + return 0; +} + +/** + * pci_bus_configure_settings - Configure bus settings + * @bus: PCI/PCIE bus to configure + * + * Currently only configures PCIe bus settings related to MPS and MRRS. + */ +static void pci_bus_configure_settings(struct pci_bus *bus) +{ + pci_walk_bus(bus, pcie_rescan_bus_configure_settings, NULL); +} + /** * pci_rescan_bus - Scan a PCI bus for devices * @bus: PCI bus to scan @@ -3285,6 +3314,7 @@ max = pci_scan_child_bus(bus); pci_assign_unassigned_bus_resources(bus); + pci_bus_configure_settings(bus); pci_bus_add_devices(bus); return max; diff -ruw linux-6.4/drivers/pci/quirks.c linux-6.4-fbx/drivers/pci/quirks.c --- linux-6.4/drivers/pci/quirks.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pci/quirks.c 2024-04-22 13:40:50.679879457 +0200 @@ -3150,6 +3150,8 @@ dev->is_hotplug_bridge = 1; } DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_HINT, 0x0020, quirk_hotplug_bridge); +DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_PERICOM, PCI_DEVICE_ID_PI7C9X20303SL, + quirk_hotplug_bridge); /* * This is a quirk for the Ricoh MMC controller found as a part of some diff -ruw linux-6.4/drivers/phy/Kconfig linux-6.4-fbx/drivers/phy/Kconfig --- linux-6.4/drivers/phy/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/phy/Kconfig 2024-04-22 13:40:50.695879894 +0200 @@ -71,6 +71,10 @@ functional modes using gpios and sets the attribute max link rate, for CAN drivers. +config XDSL_PHY_API + tristate "xDSL PHY API" + select GENERIC_PHY + source "drivers/phy/allwinner/Kconfig" source "drivers/phy/amlogic/Kconfig" source "drivers/phy/broadcom/Kconfig" diff -ruw linux-6.4/drivers/phy/Makefile linux-6.4-fbx/drivers/phy/Makefile --- linux-6.4/drivers/phy/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/phy/Makefile 2024-04-22 13:40:50.695879894 +0200 @@ -10,6 +10,8 @@ obj-$(CONFIG_PHY_XGENE) += phy-xgene.o obj-$(CONFIG_PHY_PISTACHIO_USB) += phy-pistachio-usb.o obj-$(CONFIG_USB_LGM_PHY) += phy-lgm-usb.o +obj-$(CONFIG_XDSL_PHY_API) += xdsl_phy_api.o + obj-y += allwinner/ \ amlogic/ \ broadcom/ \ diff -ruw linux-6.4/drivers/phy/broadcom/Kconfig linux-6.4-fbx/drivers/phy/broadcom/Kconfig --- linux-6.4/drivers/phy/broadcom/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/phy/broadcom/Kconfig 2024-04-22 13:40:50.695879894 +0200 @@ -39,6 +39,11 @@ help Enable this to support the Broadcom Kona USB 2.0 PHY. +config PHY_BRCM_USB_63138 + tristate "Broadcom 63138 USB 2.0/3.0 PHY Driver" + depends on ARCH_BCMBCA || COMPILE_TEST + select GENERIC_PHY + config PHY_BCM_NS_USB2 tristate "Broadcom Northstar USB 2.0 PHY Driver" depends on ARCH_BCM_IPROC || COMPILE_TEST diff -ruw linux-6.4/drivers/phy/broadcom/Makefile linux-6.4-fbx/drivers/phy/broadcom/Makefile --- linux-6.4/drivers/phy/broadcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/phy/broadcom/Makefile 2023-03-09 15:06:11.376234546 +0100 @@ -1,6 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_PHY_BCM63XX_USBH) += phy-bcm63xx-usbh.o obj-$(CONFIG_PHY_CYGNUS_PCIE) += phy-bcm-cygnus-pcie.o +obj-$(CONFIG_PHY_BRCM_USB_63138) += phy-brcm-usb-63138.o obj-$(CONFIG_BCM_KONA_USB2_PHY) += phy-bcm-kona-usb2.o obj-$(CONFIG_PHY_BCM_NS_USB2) += phy-bcm-ns-usb2.o obj-$(CONFIG_PHY_BCM_NS_USB3) += phy-bcm-ns-usb3.o diff -ruw linux-6.4/drivers/phy/marvell/Kconfig linux-6.4-fbx/drivers/phy/marvell/Kconfig --- linux-6.4/drivers/phy/marvell/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/phy/marvell/Kconfig 2023-03-09 15:22:14.035699334 +0100 @@ -136,3 +136,11 @@ components on MMP3-based boards. To compile this driver as a module, choose M here. + +config PHY_UTMI_CP110 + bool "Marvell CP110 UTMI PHY Driver" + depends on ARCH_MVEBU + depends on OF + help + Enable this to support Marvell USB2.0 PHY driver for Marvell + CP110-based SoCs (A7K and A8K). diff -ruw linux-6.4/drivers/phy/marvell/Makefile linux-6.4-fbx/drivers/phy/marvell/Makefile --- linux-6.4/drivers/phy/marvell/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/phy/marvell/Makefile 2023-03-09 15:22:14.035699334 +0100 @@ -13,3 +13,4 @@ obj-$(CONFIG_PHY_PXA_28NM_HSIC) += phy-pxa-28nm-hsic.o obj-$(CONFIG_PHY_PXA_28NM_USB2) += phy-pxa-28nm-usb2.o obj-$(CONFIG_PHY_PXA_USB) += phy-pxa-usb.o +obj-$(CONFIG_PHY_UTMI_CP110) += phy-utmi-cp110.o diff -ruw linux-6.4/drivers/pinctrl/bcm/Kconfig linux-6.4-fbx/drivers/pinctrl/bcm/Kconfig --- linux-6.4/drivers/pinctrl/bcm/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pinctrl/bcm/Kconfig 2024-04-22 13:40:50.727880768 +0200 @@ -52,6 +52,16 @@ select REGMAP select GPIO_REGMAP +config PINCTRL_BCM63138 + bool "Broadcom 63138 pinmux driver" + depends on OF && (ARCH_BCMBCA || COMPILE_TEST) + default ARCH_BCMBCA + select PINMUX + select PINCONF + select GENERIC_PINCONF + select GPIOLIB + select GPIOLIB_IRQCHIP + config PINCTRL_BCM6318 bool "Broadcom BCM6318 GPIO driver" depends on (BMIPS_GENERIC || COMPILE_TEST) diff -ruw linux-6.4/drivers/pinctrl/bcm/Makefile linux-6.4-fbx/drivers/pinctrl/bcm/Makefile --- linux-6.4/drivers/pinctrl/bcm/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/pinctrl/bcm/Makefile 2024-04-22 13:40:50.727880768 +0200 @@ -11,6 +11,7 @@ obj-$(CONFIG_PINCTRL_BCM6362) += pinctrl-bcm6362.o obj-$(CONFIG_PINCTRL_BCM6368) += pinctrl-bcm6368.o obj-$(CONFIG_PINCTRL_BCM63268) += pinctrl-bcm63268.o +obj-$(CONFIG_PINCTRL_BCM63138) += pinctrl-bcm63138.o obj-$(CONFIG_PINCTRL_IPROC_GPIO) += pinctrl-iproc-gpio.o obj-$(CONFIG_PINCTRL_CYGNUS_MUX) += pinctrl-cygnus-mux.o obj-$(CONFIG_PINCTRL_NS) += pinctrl-ns.o diff -ruw linux-6.4/drivers/platform/Kconfig linux-6.4-fbx/drivers/platform/Kconfig --- linux-6.4/drivers/platform/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/platform/Kconfig 2024-04-22 13:40:50.811883063 +0200 @@ -14,3 +14,11 @@ source "drivers/platform/surface/Kconfig" source "drivers/platform/x86/Kconfig" + +if X86_INTEL_CE +source "drivers/platform/intelce/Kconfig" +endif + +source "drivers/platform/fbxgw7r/Kconfig" + +source "drivers/platform/ipq/Kconfig" diff -ruw linux-6.4/drivers/platform/Makefile linux-6.4-fbx/drivers/platform/Makefile --- linux-6.4/drivers/platform/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/platform/Makefile 2024-04-22 13:40:50.811883063 +0200 @@ -11,3 +11,6 @@ obj-$(CONFIG_GOLDFISH) += goldfish/ obj-$(CONFIG_CHROME_PLATFORMS) += chrome/ obj-$(CONFIG_SURFACE_PLATFORMS) += surface/ +obj-$(CONFIG_X86_INTEL_CE) += intelce/ +obj-$(CONFIG_FBXGW7R_PLATFORM) += fbxgw7r/ +obj-$(CONFIG_QCOM_IPQ_PLATFORM) += ipq/ diff -ruw linux-6.4/drivers/regulator/Kconfig linux-6.4-fbx/drivers/regulator/Kconfig --- linux-6.4/drivers/regulator/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/regulator/Kconfig 2024-04-22 13:40:50.903885577 +0200 @@ -30,6 +30,12 @@ help Say yes here to enable debugging support. +config REGULATOR_FAULT_SENSING + bool "Regulator fault-sensing detection" + help + Add support for fault-sensing gpio which will cause + regulator to be forced-disabled. + config REGULATOR_FIXED_VOLTAGE tristate "Fixed voltage regulator support" help diff -ruw linux-6.4/drivers/regulator/core.c linux-6.4-fbx/drivers/regulator/core.c --- linux-6.4/drivers/regulator/core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/regulator/core.c 2024-04-22 13:41:34.461075603 +0200 @@ -2877,6 +2877,13 @@ lockdep_assert_held_once(&rdev->mutex.base); + if (IS_ENABLED(CONFIG_REGULATOR_FAULT_SENSING) && + rdev->fault_sense_gpiod && + gpiod_get_value_cansleep(rdev->fault_sense_gpiod)) { + rdev_err(rdev, "can't enable regulator, active fault\n"); + return -EIO; + } + if (rdev->use_count == 0 && rdev->supply) { ret = _regulator_enable(rdev->supply); if (ret < 0) @@ -5476,6 +5483,20 @@ .attach_regulator = generic_coupler_attach, }; +static irqreturn_t fault_sense_irq_handler(int irq, void *dev_id) +{ + struct regulator_dev *rdev = dev_id; + + if (_regulator_is_enabled(rdev) && + gpiod_get_value_cansleep(rdev->fault_sense_gpiod)) { + _regulator_force_disable(rdev); + disable_irq_nosync(irq); + rdev_err(rdev, "fault detected, force disable regulator\n"); + } + + return IRQ_HANDLED; +} + /** * regulator_register - register regulator * @dev: the device that drive the regulator @@ -5496,7 +5517,9 @@ static atomic_t regulator_no = ATOMIC_INIT(-1); struct regulator_dev *rdev; bool dangling_cfg_gpiod = false; + bool dangling_cfg_fs_gpiod = false; bool dangling_of_gpiod = false; + bool dangling_of_fs_gpiod = false; int ret, i; bool resolved_early = false; @@ -5504,6 +5527,8 @@ return ERR_PTR(-EINVAL); if (cfg->ena_gpiod) dangling_cfg_gpiod = true; + if (cfg->fault_sense_gpiod) + dangling_cfg_fs_gpiod = true; if (regulator_desc == NULL) { ret = -EINVAL; goto rinse; @@ -5581,6 +5606,8 @@ */ if (!cfg->ena_gpiod && config->ena_gpiod) dangling_of_gpiod = true; + if (!cfg->fault_sense_gpiod && config->fault_sense_gpiod) + dangling_of_fs_gpiod = true; if (!init_data) { init_data = config->init_data; rdev->dev.of_node = of_node_get(config->of_node); @@ -5656,6 +5683,30 @@ dangling_of_gpiod = false; } + if (IS_ENABLED(CONFIG_REGULATOR_FAULT_SENSING) && + config->fault_sense_gpiod) { + int irq, ret; + + irq = gpiod_to_irq(config->fault_sense_gpiod); + if (irq < 0) { + rdev_err(rdev, "failed to get irq: %d\n", irq); + goto wash; + } + + ret = devm_request_threaded_irq(dev, irq, NULL, + fault_sense_irq_handler, + IRQF_ONESHOT | + IRQF_TRIGGER_RISING, + "reg-fault-sense", rdev); + if (ret < 0) { + rdev_err(rdev, "failed to request irq: %d\n", ret); + goto wash; + } + } + dangling_cfg_fs_gpiod = false; + dangling_of_fs_gpiod = false; + rdev->fault_sense_gpiod = config->fault_sense_gpiod; + ret = set_machine_constraints(rdev); if (ret == -EPROBE_DEFER && !resolved_early) { /* Regulator might be in bypass mode and so needs its supply @@ -5733,6 +5784,8 @@ clean: if (dangling_of_gpiod) gpiod_put(config->ena_gpiod); + if (dangling_of_fs_gpiod) + gpiod_put(config->fault_sense_gpiod); if (rdev && rdev->dev.of_node) of_node_put(rdev->dev.of_node); kfree(rdev); @@ -5740,6 +5793,8 @@ rinse: if (dangling_cfg_gpiod) gpiod_put(cfg->ena_gpiod); + if (dangling_cfg_fs_gpiod) + gpiod_put(cfg->fault_sense_gpiod); return ERR_PTR(ret); } EXPORT_SYMBOL_GPL(regulator_register); @@ -5770,6 +5825,7 @@ unset_regulator_supplies(rdev); list_del(&rdev->list); regulator_ena_gpio_free(rdev); + gpiod_put(rdev->fault_sense_gpiod); device_unregister(&rdev->dev); mutex_unlock(®ulator_list_mutex); diff -ruw linux-6.4/drivers/regulator/fixed.c linux-6.4-fbx/drivers/regulator/fixed.c --- linux-6.4/drivers/regulator/fixed.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/regulator/fixed.c 2024-04-22 13:40:50.911885795 +0200 @@ -34,6 +34,7 @@ struct fixed_voltage_data { struct regulator_desc desc; struct regulator_dev *dev; + struct gpio_desc *fault_sense; struct clk *enable_clock; unsigned int enable_counter; @@ -276,6 +277,12 @@ return dev_err_probe(&pdev->dev, PTR_ERR(cfg.ena_gpiod), "can't get GPIO\n"); + cfg.fault_sense_gpiod = gpiod_get_optional(&pdev->dev, "fault-sense", + GPIOD_IN); + if (IS_ERR(cfg.fault_sense_gpiod)) + return dev_err_probe(dev, PTR_ERR(cfg.fault_sense_gpiod), + "can't get fault-sense gpio"); + cfg.dev = &pdev->dev; cfg.init_data = config->init_data; cfg.driver_data = drvdata; diff -ruw linux-6.4/drivers/rtc/Kconfig linux-6.4-fbx/drivers/rtc/Kconfig --- linux-6.4/drivers/rtc/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/rtc/Kconfig 2024-04-22 13:40:50.947886779 +0200 @@ -1391,6 +1391,15 @@ This driver can also be built as a module. If so, the module will be called rtc-meson-vrtc. +config RTC_DRV_MESON_AXG + tristate "Amlogic Meson AXG RTC + wakeup" + depends on RTC_HCTOSYS + depends on ARCH_MESON || COMPILE_TEST + default m if ARCH_MESON + help + If you say yes here you will get support for the RTC of Amlogic SoCs + as implemented in M3's firmware for AXG platform by Freebox. + config RTC_DRV_OMAP tristate "TI OMAP Real Time Clock" depends on ARCH_OMAP || ARCH_DAVINCI || COMPILE_TEST diff -ruw linux-6.4/drivers/rtc/Makefile linux-6.4-fbx/drivers/rtc/Makefile --- linux-6.4/drivers/rtc/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/rtc/Makefile 2024-04-22 13:40:50.947886779 +0200 @@ -97,6 +97,7 @@ obj-$(CONFIG_RTC_DRV_MAX8997) += rtc-max8997.o obj-$(CONFIG_RTC_DRV_MAX8998) += rtc-max8998.o obj-$(CONFIG_RTC_DRV_MESON_VRTC)+= rtc-meson-vrtc.o +obj-$(CONFIG_RTC_DRV_MESON_AXG) += rtc-meson-axg.o obj-$(CONFIG_RTC_DRV_MC13XXX) += rtc-mc13xxx.o obj-$(CONFIG_RTC_DRV_MCP795) += rtc-mcp795.o obj-$(CONFIG_RTC_DRV_MESON) += rtc-meson.o diff -ruw linux-6.4/drivers/soc/bcm/Kconfig linux-6.4-fbx/drivers/soc/bcm/Kconfig --- linux-6.4/drivers/soc/bcm/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/soc/bcm/Kconfig 2024-04-22 13:40:51.191893446 +0200 @@ -24,7 +24,8 @@ config SOC_BCM63XX bool "Broadcom 63xx SoC drivers" - depends on BMIPS_GENERIC || COMPILE_TEST + depends on BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST + select RESET_CONTROLLER help Enables drivers for the Broadcom 63xx series of chips. Drivers can be enabled individually within this menu. diff -ruw linux-6.4/drivers/soc/bcm/Makefile linux-6.4-fbx/drivers/soc/bcm/Makefile --- linux-6.4/drivers/soc/bcm/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/soc/bcm/Makefile 2024-04-22 13:40:51.191893446 +0200 @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_BCM2835_POWER) += bcm2835-power.o obj-$(CONFIG_RASPBERRYPI_POWER) += raspberrypi-power.o -obj-y += bcm63xx/ obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ +obj-$(CONFIG_SOC_BCM63XX) += bcm63xx/ diff -ruw linux-6.4/drivers/soc/bcm/bcm63xx/Kconfig linux-6.4-fbx/drivers/soc/bcm/bcm63xx/Kconfig --- linux-6.4/drivers/soc/bcm/bcm63xx/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/soc/bcm/bcm63xx/Kconfig 2024-04-22 13:40:51.191893446 +0200 @@ -9,6 +9,31 @@ This enables support for the BCM63xx power domains controller on BCM6318, BCM6328, BCM6362 and BCM63268 SoCs. +config SOC_BCM63XX_RDP + bool "rdp subsystem" + depends on ARCH_BCMBCA || COMPILE_TEST + +config SOC_BCM63XX_XRDP + tristate "xrdp subsystem" + depends on ARCH_BCMBCA || COMPILE_TEST + select UBUS4_BCM63158 + +config SOC_BCM63XX_XRDP_IOCTL + bool "ioctl interface" + depends on SOC_BCM63XX_XRDP + +config UBUS4_BCM63158 + bool "Broadcom 63158 UBUS4 driver" + depends on ARCH_BCMBCA || COMPILE_TEST + +config SOC_MEMC_BCM63158 + tristate "Broadcom 63158 MEMC driver" + depends on ARCH_BCMBCA || COMPILE_TEST + +config PROCMON_BCM63158 + bool "Broadcom 63158 PROCMON driver" + depends on ARCH_BCMBCA || COMPILE_TEST + endif # SOC_BCM63XX config BCM_PMB @@ -19,3 +44,4 @@ help This enables support for the Broadcom's PMB (Power Management Bus) that is used for disabling and enabling SoC devices. + diff -ruw linux-6.4/drivers/soc/bcm/bcm63xx/Makefile linux-6.4-fbx/drivers/soc/bcm/bcm63xx/Makefile --- linux-6.4/drivers/soc/bcm/bcm63xx/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/soc/bcm/bcm63xx/Makefile 2024-04-22 13:40:51.191893446 +0200 @@ -1,3 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_BCM63XX_POWER) += bcm63xx-power.o obj-$(CONFIG_BCM_PMB) += bcm-pmb.o + +obj-$(CONFIG_ARCH_BCMBCA) += pmc.o +obj-$(CONFIG_SOC_BCM63XX_RDP) += rdp/ +obj-$(CONFIG_SOC_BCM63XX_XRDP) += xrdp/ +obj-$(CONFIG_UBUS4_BCM63158) += ubus4-bcm63158.o +obj-$(CONFIG_PROCMON_BCM63158) += procmon-bcm63158.o +obj-$(CONFIG_SOC_MEMC_BCM63158) += memc-bcm63158.o diff -ruw linux-6.4/drivers/soc/qcom/Kconfig linux-6.4-fbx/drivers/soc/qcom/Kconfig --- linux-6.4/drivers/soc/qcom/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/soc/qcom/Kconfig 2024-04-22 13:40:51.203893773 +0200 @@ -279,4 +279,8 @@ tristate select QCOM_SCM +config QCOM_IMEM_RESET_REASON + tristate "QCOM IMEM based reset reason" + depends on ARCH_QCOM || COMPILE_TEST + endmenu diff -ruw linux-6.4/drivers/soc/qcom/Makefile linux-6.4-fbx/drivers/soc/qcom/Makefile --- linux-6.4/drivers/soc/qcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/soc/qcom/Makefile 2024-04-22 13:40:51.203893773 +0200 @@ -34,3 +34,5 @@ obj-$(CONFIG_QCOM_ICC_BWMON) += icc-bwmon.o qcom_ice-objs += ice.o obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += qcom_ice.o + +obj-$(CONFIG_QCOM_IMEM_RESET_REASON) += qcom-imem-reset-reason.o diff -ruw linux-6.4/drivers/spi/Kconfig linux-6.4-fbx/drivers/spi/Kconfig --- linux-6.4/drivers/spi/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/spi/Kconfig 2024-04-22 13:40:51.227894429 +0200 @@ -771,6 +771,12 @@ help This selects a driver for the PPC4xx SPI Controller. +config SPI_TDM_ORION + tristate "Orion TDM SPI master" + depends on PLAT_ORION + help + This enables using the TDM SPI master controller on the Orion chips. + config SPI_PXA2XX tristate "PXA2xx SSP SPI master" depends on ARCH_PXA || ARCH_MMP || PCI || ACPI || COMPILE_TEST diff -ruw linux-6.4/drivers/spi/Makefile linux-6.4-fbx/drivers/spi/Makefile --- linux-6.4/drivers/spi/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/spi/Makefile 2024-04-22 13:40:51.227894429 +0200 @@ -99,6 +99,7 @@ obj-$(CONFIG_SPI_PCI1XXXX) += spi-pci1xxxx.o obj-$(CONFIG_SPI_PIC32) += spi-pic32.o obj-$(CONFIG_SPI_PIC32_SQI) += spi-pic32-sqi.o +obj-$(CONFIG_SPI_TDM_ORION) += orion_tdm_spi.o obj-$(CONFIG_SPI_PL022) += spi-pl022.o obj-$(CONFIG_SPI_PPC4xx) += spi-ppc4xx.o spi-pxa2xx-platform-objs := spi-pxa2xx.o spi-pxa2xx-dma.o diff -ruw linux-6.4/drivers/tee/optee/smc_abi.c linux-6.4-fbx/drivers/tee/optee/smc_abi.c --- linux-6.4/drivers/tee/optee/smc_abi.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/tee/optee/smc_abi.c 2024-04-22 13:40:51.407899347 +0200 @@ -1782,9 +1782,14 @@ if (optee->smc.sec_caps & OPTEE_SMC_SEC_CAP_DYNAMIC_SHM) pr_info("dynamic shared memory is enabled\n"); + if (device_property_present(&pdev->dev, "skip-enumeration")) + optee->scan_bus_done = true; + + if (!optee->scan_bus_done) { rc = optee_enumerate_devices(PTA_CMD_GET_DEVICES); if (rc) goto err_disable_shm_cache; + } pr_info("initialized driver\n"); return 0; diff -ruw linux-6.4/drivers/thermal/thermal_core.c linux-6.4-fbx/drivers/thermal/thermal_core.c --- linux-6.4/drivers/thermal/thermal_core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/thermal/thermal_core.c 2024-04-22 13:40:51.423899784 +0200 @@ -810,6 +810,7 @@ /** * __thermal_cooling_device_register() - register a new thermal cooling device + * @dev: parent device * @np: a pointer to a device tree node. * @type: the thermal cooling device type. * @devdata: device private data. @@ -825,7 +826,7 @@ * ERR_PTR. Caller must check return value with IS_ERR*() helpers. */ static struct thermal_cooling_device * -__thermal_cooling_device_register(struct device_node *np, +__thermal_cooling_device_register(struct device *pdev, struct device_node *np, const char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { @@ -873,6 +874,7 @@ ret = dev_set_name(&cdev->device, "cooling_device%d", cdev->id); if (ret) goto out_cooling_dev; + cdev->device.parent = pdev; ret = device_register(&cdev->device); if (ret) { @@ -926,11 +928,30 @@ thermal_cooling_device_register(const char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { - return __thermal_cooling_device_register(NULL, type, devdata, ops); + return __thermal_cooling_device_register(NULL, NULL, type, devdata, ops); } EXPORT_SYMBOL_GPL(thermal_cooling_device_register); /** + * thermal_cooling_device_register_with_parent() - register a new thermal cooling device + * @pdev: parent device + * @type: the thermal cooling device type. + * @devdata: device private data. + * @ops: standard thermal cooling devices callbacks. + * + * Same as thermal_cooling_device_register but take also the parent device. + * Then, hwpath will include the parent device to uniquely identify this device + */ +struct thermal_cooling_device * +thermal_cooling_device_register_with_parent(struct device *pdev, + const char *type, void *devdata, + const struct thermal_cooling_device_ops *ops) +{ + return __thermal_cooling_device_register(pdev, NULL, type, devdata, ops); +} +EXPORT_SYMBOL_GPL(thermal_cooling_device_register_with_parent); + +/** * thermal_of_cooling_device_register() - register an OF thermal cooling device * @np: a pointer to a device tree node. * @type: the thermal cooling device type. @@ -950,7 +971,7 @@ const char *type, void *devdata, const struct thermal_cooling_device_ops *ops) { - return __thermal_cooling_device_register(np, type, devdata, ops); + return __thermal_cooling_device_register(NULL, np, type, devdata, ops); } EXPORT_SYMBOL_GPL(thermal_of_cooling_device_register); @@ -990,7 +1011,7 @@ if (!ptr) return ERR_PTR(-ENOMEM); - tcd = __thermal_cooling_device_register(np, type, devdata, ops); + tcd = __thermal_cooling_device_register(NULL, np, type, devdata, ops); if (IS_ERR(tcd)) { devres_free(ptr); return tcd; diff -ruw linux-6.4/drivers/tty/serial/Kconfig linux-6.4-fbx/drivers/tty/serial/Kconfig --- linux-6.4/drivers/tty/serial/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/tty/serial/Kconfig 2024-04-22 13:40:51.451900549 +0200 @@ -1075,6 +1075,11 @@ BCM68xx (PON) BCM7xxx (STB) - DOCSIS console +config SERIAL_BCM63XX_HS + tristate "Broadcom BCM63xx HS UART support" + select SERIAL_CORE + depends on ARCH_BCMBCA || COMPILE_TEST + config SERIAL_BCM63XX_CONSOLE bool "Console on BCM63xx serial port" depends on SERIAL_BCM63XX=y diff -ruw linux-6.4/drivers/tty/serial/Makefile linux-6.4-fbx/drivers/tty/serial/Makefile --- linux-6.4/drivers/tty/serial/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/tty/serial/Makefile 2024-04-22 13:40:51.451900549 +0200 @@ -30,6 +30,7 @@ obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o obj-$(CONFIG_SERIAL_SAMSUNG) += samsung_tty.o +obj-$(CONFIG_SERIAL_BCM63XX_HS) += bcm63xx-hs-uart.o obj-$(CONFIG_SERIAL_MAX3100) += max3100.o obj-$(CONFIG_SERIAL_MAX310X) += max310x.o obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o diff -ruw linux-6.4/drivers/usb/dwc3/host.c linux-6.4-fbx/drivers/usb/dwc3/host.c --- linux-6.4/drivers/usb/dwc3/host.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/usb/dwc3/host.c 2024-04-22 13:40:51.519902407 +0200 @@ -65,12 +65,17 @@ struct platform_device *xhci; int ret, irq; int prop_idx = 0; + u32 devid; irq = dwc3_host_get_irq(dwc); if (irq < 0) return irq; - xhci = platform_device_alloc("xhci-hcd", PLATFORM_DEVID_AUTO); + if (!dwc->dev->of_node || + of_property_read_u32(dwc->dev->of_node, "dev_id", &devid) < 0) + devid = PLATFORM_DEVID_AUTO; + + xhci = platform_device_alloc("xhci-hcd", devid); if (!xhci) { dev_err(dwc->dev, "couldn't allocate xHCI device\n"); return -ENOMEM; diff -ruw linux-6.4/drivers/usb/host/Kconfig linux-6.4-fbx/drivers/usb/host/Kconfig --- linux-6.4/drivers/usb/host/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/usb/host/Kconfig 2024-04-22 13:40:51.559903500 +0200 @@ -78,13 +78,13 @@ If unsure, say N. config USB_XHCI_MVEBU - tristate "xHCI support for Marvell Armada 375/38x/37xx" + tristate "xHCI support for Marvell Armada 375/38x/37xx/70x0/80x0" select USB_XHCI_PLATFORM depends on HAS_IOMEM depends on ARCH_MVEBU || COMPILE_TEST help Say 'Y' to enable the support for the xHCI host controller - found in Marvell Armada 375/38x/37xx ARM SOCs. + found in Marvell Armada 375/38x/37xx/70x0/80x0 ARM SOCs. config USB_XHCI_RCAR tristate "xHCI support for Renesas R-Car SoCs" @@ -690,6 +690,10 @@ If unsure, say N. +config USB_BCM63158 + tristate "Broadcom BCM63158 SoC USB host driver" + depends on ARCH_BCMBCA || COMPILE_TEST + config USB_HCD_SSB tristate "SSB usb host driver" depends on SSB diff -ruw linux-6.4/drivers/usb/host/Makefile linux-6.4-fbx/drivers/usb/host/Makefile --- linux-6.4/drivers/usb/host/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/usb/host/Makefile 2024-04-22 13:40:51.559903500 +0200 @@ -85,3 +85,4 @@ obj-$(CONFIG_USB_HCD_SSB) += ssb-hcd.o obj-$(CONFIG_USB_MAX3421_HCD) += max3421-hcd.o obj-$(CONFIG_USB_XEN_HCD) += xen-hcd.o +obj-$(CONFIG_USB_BCM63158) += usb-bcm63158.o diff -ruw linux-6.4/drivers/usb/host/xhci-plat.c linux-6.4-fbx/drivers/usb/host/xhci-plat.c --- linux-6.4/drivers/usb/host/xhci-plat.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/usb/host/xhci-plat.c 2024-04-22 13:40:51.575903937 +0200 @@ -133,6 +133,8 @@ .compatible = "marvell,armada3700-xhci", .data = &xhci_plat_marvell_armada3700, }, { + .compatible = "marvell,armada-8k-xhci", + }, { .compatible = "brcm,xhci-brcm-v2", .data = &xhci_plat_brcm, }, { @@ -294,10 +296,6 @@ xhci->shared_hcd->usb_phy = devm_usb_get_phy_by_phandle(sysdev, "usb-phy", 1); if (IS_ERR(xhci->shared_hcd->usb_phy)) { - if (PTR_ERR(xhci->shared_hcd->usb_phy) != -ENODEV) - dev_err(sysdev, "%s get usb3phy fail (ret=%d)\n", - __func__, - (int)PTR_ERR(xhci->shared_hcd->usb_phy)); xhci->shared_hcd->usb_phy = NULL; } else { ret = usb_phy_init(xhci->shared_hcd->usb_phy); diff -ruw linux-6.4/drivers/usb/host/xhci-ring.c linux-6.4-fbx/drivers/usb/host/xhci-ring.c --- linux-6.4/drivers/usb/host/xhci-ring.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/usb/host/xhci-ring.c 2024-04-22 13:40:51.575903937 +0200 @@ -1890,7 +1890,8 @@ } /* We might get interrupts after shared_hcd is removed */ - if (port->rhub == &xhci->usb3_rhub && xhci->shared_hcd == NULL) { + if (port->rhub == &xhci->usb3_rhub && xhci->shared_hcd == NULL && + !xhci_has_one_roothub(xhci)) { xhci_dbg(xhci, "ignore port event for removed USB3 hcd\n"); bogus_port_status = true; goto cleanup; diff -ruw linux-6.4/drivers/usb/storage/usb.c linux-6.4-fbx/drivers/usb/storage/usb.c --- linux-6.4/drivers/usb/storage/usb.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/usb/storage/usb.c 2024-04-22 13:40:51.615905030 +0200 @@ -67,7 +67,7 @@ MODULE_DESCRIPTION("USB Mass Storage driver for Linux"); MODULE_LICENSE("GPL"); -static unsigned int delay_use = 1; +static unsigned int delay_use = 5; module_param(delay_use, uint, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(delay_use, "seconds to delay before using a new device"); diff -ruw linux-6.4/drivers/video/Kconfig linux-6.4-fbx/drivers/video/Kconfig --- linux-6.4/drivers/video/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/video/Kconfig 2024-04-22 13:40:51.643905795 +0200 @@ -59,5 +59,4 @@ endif - endmenu diff -ruw linux-6.4/drivers/video/fbdev/Kconfig linux-6.4-fbx/drivers/video/fbdev/Kconfig --- linux-6.4/drivers/video/fbdev/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/video/fbdev/Kconfig 2024-04-22 13:40:51.655906123 +0200 @@ -2208,6 +2208,24 @@ called sm712fb. If you want to compile it as a module, say M here and read . +config FB_SSD1320 + tristate "SSD1320 OLED driver" + depends on FB && SPI + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_BACKLIGHT + +config FB_SSD1327 + tristate "SSD1327 OLED driver" + depends on FB && SPI + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS + select FB_BACKLIGHT + source "drivers/video/fbdev/omap/Kconfig" source "drivers/video/fbdev/omap2/Kconfig" source "drivers/video/fbdev/mmp/Kconfig" diff -ruw linux-6.4/drivers/video/fbdev/Makefile linux-6.4-fbx/drivers/video/fbdev/Makefile --- linux-6.4/drivers/video/fbdev/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/drivers/video/fbdev/Makefile 2024-04-22 13:40:51.655906123 +0200 @@ -126,6 +126,8 @@ obj-$(CONFIG_FB_DA8XX) += da8xx-fb.o obj-$(CONFIG_FB_SSD1307) += ssd1307fb.o obj-$(CONFIG_FB_SIMPLE) += simplefb.o +obj-$(CONFIG_FB_SSD1327) += ssd1327.o +obj-$(CONFIG_FB_SSD1320) += ssd1320.o # the test framebuffer is last obj-$(CONFIG_FB_VIRTUAL) += vfb.o diff -ruw linux-6.4/fs/Kconfig linux-6.4-fbx/fs/Kconfig --- linux-6.4/fs/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/Kconfig 2024-04-22 13:40:51.779909511 +0200 @@ -156,6 +156,7 @@ source "fs/exfat/Kconfig" source "fs/ntfs/Kconfig" source "fs/ntfs3/Kconfig" +source "fs/exfat-fbx/Kconfig" endmenu endif # BLOCK diff -ruw linux-6.4/fs/Makefile linux-6.4-fbx/fs/Makefile --- linux-6.4/fs/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/Makefile 2024-04-22 13:40:51.779909511 +0200 @@ -135,3 +135,4 @@ obj-$(CONFIG_EROFS_FS) += erofs/ obj-$(CONFIG_VBOXSF_FS) += vboxsf/ obj-$(CONFIG_ZONEFS_FS) += zonefs/ +obj-$(CONFIG_EXFAT_FS_FBX) += exfat-fbx/ diff -ruw linux-6.4/fs/exec.c linux-6.4-fbx/fs/exec.c --- linux-6.4/fs/exec.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/exec.c 2024-04-22 13:40:51.871912024 +0200 @@ -1895,6 +1895,23 @@ return PTR_ERR(filename); /* + * handle current->exec_mode: + * - if unlimited, then nothing to do. + * - if once, then set it to denied and continue (next execve + * after this one will fail). + * - if denied, then effectively fail the execve call with EPERM. + */ + switch (current->exec_mode) { + case EXEC_MODE_UNLIMITED: + break; + case EXEC_MODE_ONCE: + current->exec_mode = EXEC_MODE_DENIED; + break; + case EXEC_MODE_DENIED: + return -EPERM; + } + + /* * We move the actual failure in case of RLIMIT_NPROC excess from * set*uid() to execve() because too many poorly written programs * don't check setuid() return code. Here we additionally recheck diff -ruw linux-6.4/fs/proc/array.c linux-6.4-fbx/fs/proc/array.c --- linux-6.4/fs/proc/array.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/proc/array.c 2024-04-22 13:40:52.051916942 +0200 @@ -145,6 +145,21 @@ return task_state_array[task_state_index(tsk)]; } +static const char *const task_exec_mode_array[] = { + "0 (Denied)", + "1 (Once)", + "2 (Unlimited)", +}; + +static inline const char *get_task_exec_mode(struct task_struct *tsk) +{ + unsigned int exec_mode = tsk->exec_mode; + + if (exec_mode > EXEC_MODE_UNLIMITED) + return "? (Invalid)"; + return task_exec_mode_array[exec_mode]; +} + static inline void task_state(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *p) { @@ -403,6 +418,12 @@ seq_putc(m, '\n'); } +static inline void task_exec_mode(struct seq_file *m, + struct task_struct *p) +{ + seq_printf(m, "Exec mode: %s\n", get_task_exec_mode(p)); +} + static void task_cpus_allowed(struct seq_file *m, struct task_struct *task) { seq_printf(m, "Cpus_allowed:\t%*pb\n", @@ -455,6 +476,7 @@ task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); task_context_switch_counts(m, task); + task_exec_mode(m, task); return 0; } diff -ruw linux-6.4/fs/pstore/inode.c linux-6.4-fbx/fs/pstore/inode.c --- linux-6.4/fs/pstore/inode.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/pstore/inode.c 2024-04-22 13:40:52.059917161 +0200 @@ -371,9 +371,10 @@ goto fail; inode->i_mode = S_IFREG | 0444; inode->i_fop = &pstore_file_operations; - scnprintf(name, sizeof(name), "%s-%s-%llu%s", + scnprintf(name, sizeof(name), "%s-%s-%s%llu%s", pstore_type_to_name(record->type), - record->psi->name, record->id, + record->psi->name, record->old ? "old-" : "", + record->id, record->compressed ? ".enc.z" : ""); private = kzalloc(sizeof(*private), GFP_KERNEL); diff -ruw linux-6.4/fs/pstore/ram.c linux-6.4-fbx/fs/pstore/ram.c --- linux-6.4/fs/pstore/ram.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/pstore/ram.c 2024-04-22 13:40:52.059917161 +0200 @@ -137,6 +137,7 @@ record->type = prz->type; record->id = id; + record->old = prz->old_zone; return prz; } @@ -481,7 +482,7 @@ static int ramoops_init_przs(const char *name, struct device *dev, struct ramoops_context *cxt, struct persistent_ram_zone ***przs, - phys_addr_t *paddr, size_t mem_sz, + phys_addr_t *paddr, void *vaddr, size_t mem_sz, ssize_t record_size, unsigned int *cnt, u32 sig, u32 flags) { @@ -545,7 +546,7 @@ else label = kasprintf(GFP_KERNEL, "ramoops:%s(%d/%d)", name, i, *cnt - 1); - prz_ar[i] = persistent_ram_new(*paddr, zone_sz, sig, + prz_ar[i] = persistent_ram_new(*paddr, vaddr, zone_sz, sig, &cxt->ecc_info, cxt->memtype, flags, label); kfree(label); @@ -578,7 +579,7 @@ static int ramoops_init_prz(const char *name, struct device *dev, struct ramoops_context *cxt, struct persistent_ram_zone **prz, - phys_addr_t *paddr, size_t sz, u32 sig) + phys_addr_t *paddr, void *vaddr, size_t sz, u32 sig) { char *label; @@ -593,7 +594,7 @@ } label = kasprintf(GFP_KERNEL, "ramoops:%s", name); - *prz = persistent_ram_new(*paddr, sz, sig, &cxt->ecc_info, + *prz = persistent_ram_new(*paddr, vaddr, sz, sig, &cxt->ecc_info, cxt->memtype, PRZ_FLAG_ZAP_OLD, label); kfree(label); if (IS_ERR(*prz)) { @@ -781,17 +782,20 @@ dump_mem_sz = cxt->size - cxt->console_size - cxt->ftrace_size - cxt->pmsg_size; err = ramoops_init_przs("dmesg", dev, cxt, &cxt->dprzs, &paddr, + pdata->mem_ptr, dump_mem_sz, cxt->record_size, &cxt->max_dump_cnt, 0, 0); if (err) goto fail_init; err = ramoops_init_prz("console", dev, cxt, &cxt->cprz, &paddr, + pdata->mem_ptr, cxt->console_size, 0); if (err) goto fail_init; err = ramoops_init_prz("pmsg", dev, cxt, &cxt->mprz, &paddr, + pdata->mem_ptr, cxt->pmsg_size, 0); if (err) goto fail_init; @@ -800,6 +804,7 @@ ? nr_cpu_ids : 1; err = ramoops_init_przs("ftrace", dev, cxt, &cxt->fprzs, &paddr, + pdata->mem_ptr, cxt->ftrace_size, -1, &cxt->max_ftrace_cnt, LINUX_VERSION_CODE, (cxt->flags & RAMOOPS_FLAG_FTRACE_PER_CPU) diff -ruw linux-6.4/fs/pstore/ram_core.c linux-6.4-fbx/fs/pstore/ram_core.c --- linux-6.4/fs/pstore/ram_core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/pstore/ram_core.c 2024-04-22 13:40:52.059917161 +0200 @@ -35,6 +35,7 @@ uint32_t sig; atomic_t start; atomic_t size; + atomic_t flags; uint8_t data[]; }; @@ -394,6 +395,7 @@ { atomic_set(&prz->buffer->start, 0); atomic_set(&prz->buffer->size, 0); + atomic_set(&prz->buffer->flags, 0); persistent_ram_update_header_ecc(prz); } @@ -480,13 +482,16 @@ return va; } -static int persistent_ram_buffer_map(phys_addr_t start, phys_addr_t size, +static int persistent_ram_buffer_map(phys_addr_t start, void *vaddr, + phys_addr_t size, struct persistent_ram_zone *prz, int memtype) { prz->paddr = start; prz->size = size; - if (pfn_valid(start >> PAGE_SHIFT)) + if (vaddr) + prz->vaddr = vaddr; + else if (pfn_valid(start >> PAGE_SHIFT)) prz->vaddr = persistent_ram_vmap(start, size, memtype); else prz->vaddr = persistent_ram_iomap(start, size, memtype, @@ -533,6 +538,15 @@ pr_debug("found existing buffer, size %zu, start %zu\n", buffer_size(prz), buffer_start(prz)); persistent_ram_save_old(prz); + + if (atomic_read(&prz->buffer->flags) > 0) { + pr_info("old ramoops!\n"); + prz->old_zone = true; + } else { + pr_info("fresh ramoops!\n"); + atomic_set(&prz->buffer->flags, 1); + } + persistent_ram_update_header_ecc(prz); } } else { pr_debug("no valid data in buffer (sig = 0x%08x)\n", @@ -582,7 +596,8 @@ *_prz = NULL; } -struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, +struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, + void *vaddr, size_t size, u32 sig, struct persistent_ram_ecc_info *ecc_info, unsigned int memtype, u32 flags, char *label) { @@ -600,7 +615,7 @@ prz->flags = flags; prz->label = kstrdup(label, GFP_KERNEL); - ret = persistent_ram_buffer_map(start, size, prz, memtype); + ret = persistent_ram_buffer_map(start, vaddr, size, prz, memtype); if (ret) goto err; diff -ruw linux-6.4/fs/pstore/ram_internal.h linux-6.4-fbx/fs/pstore/ram_internal.h --- linux-6.4/fs/pstore/ram_internal.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/pstore/ram_internal.h 2024-04-22 13:40:52.059917161 +0200 @@ -55,6 +55,10 @@ * @old_log_size: * bytes contained in @old_log * + * @old_zone: + * tells whether the zone has just been freshly created, and has + * been read for the first time, this boot, or if it is old, and + * has been created many boots ago. */ struct persistent_ram_zone { phys_addr_t paddr; @@ -77,9 +81,12 @@ char *old_log; size_t old_log_size; + + bool old_zone; }; -struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, +struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, + void *addr, size_t size, u32 sig, struct persistent_ram_ecc_info *ecc_info, unsigned int memtype, u32 flags, char *label); void persistent_ram_free(struct persistent_ram_zone **_prz); diff -ruw linux-6.4/fs/smb/server/Kconfig linux-6.4-fbx/fs/smb/server/Kconfig --- linux-6.4/fs/smb/server/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/smb/server/Kconfig 2024-04-22 13:40:52.091918035 +0200 @@ -56,6 +56,16 @@ SMB Direct allows transferring SMB packets over RDMA. If unsure, say N. +config SMB_INSECURE_SERVER + bool "Support for insecure SMB1/CIFS and SMB2.0 protocols" + depends on SMB_SERVER + select CRYPTO_MD4 + default n + + help + This enables deprecated insecure protocols dialects: SMB1/CIFS + and SMB2.0 + endif config SMB_SERVER_CHECK_CAP_NET_ADMIN diff -ruw linux-6.4/fs/smb/server/Makefile linux-6.4-fbx/fs/smb/server/Makefile --- linux-6.4/fs/smb/server/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/fs/smb/server/Makefile 2024-04-22 13:40:52.091918035 +0200 @@ -18,3 +18,4 @@ $(obj)/ksmbd_spnego_negtokentarg.asn1.o: $(obj)/ksmbd_spnego_negtokentarg.asn1.c $(obj)/ksmbd_spnego_negtokentarg.asn1.h ksmbd-$(CONFIG_SMB_SERVER_SMBDIRECT) += transport_rdma.o +ksmbd-$(CONFIG_SMB_INSECURE_SERVER) += smb1pdu.o smb1ops.o smb1misc.o netmisc.o diff -ruw linux-6.4/include/asm-generic/vmlinux.lds.h linux-6.4-fbx/include/asm-generic/vmlinux.lds.h --- linux-6.4/include/asm-generic/vmlinux.lds.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/asm-generic/vmlinux.lds.h 2024-04-22 13:40:52.187920658 +0200 @@ -350,7 +350,7 @@ #define KERNEL_DTB() \ STRUCT_ALIGN(); \ __dtb_start = .; \ - KEEP(*(.dtb.init.rodata)) \ + KEEP(*(.dtb.rodata)) \ __dtb_end = .; /* @@ -462,6 +462,7 @@ . = ALIGN((align)); \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ __start_rodata = .; \ + KERNEL_DTB() \ *(.rodata) *(.rodata.*) \ SCHED_DATA \ RO_AFTER_INIT_DATA /* Read only after init */ \ @@ -703,7 +704,6 @@ TIMER_OF_TABLES() \ CPU_METHOD_OF_TABLES() \ CPUIDLE_METHOD_OF_TABLES() \ - KERNEL_DTB() \ IRQCHIP_OF_MATCH_TABLE() \ ACPI_PROBE_TABLE(irqchip) \ ACPI_PROBE_TABLE(timer) \ diff -ruw linux-6.4/include/dt-bindings/input/linux-event-codes.h linux-6.4-fbx/include/dt-bindings/input/linux-event-codes.h --- linux-6.4/include/dt-bindings/input/linux-event-codes.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/dt-bindings/input/linux-event-codes.h 2024-04-22 13:40:52.559930822 +0200 @@ -803,6 +803,18 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 +#define KEY_APP_TV 0x2f1 +#define KEY_APP_REPLAY 0x2f2 +#define KEY_APP_VIDEOCLUB 0x2f3 +#define KEY_APP_WHATSON 0x2f4 +#define KEY_APP_RECORDS 0x2f5 +#define KEY_APP_MEDIA 0x2f6 +#define KEY_APP_YOUTUBE 0x2f7 +#define KEY_APP_RADIOS 0x2f8 +#define KEY_APP_CANALVOD 0x2f9 +#define KEY_APP_PIP 0x2fa +#define KEY_APP_NETFLIX 0x2fb + /* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff diff -ruw linux-6.4/include/linux/compiler_attributes.h linux-6.4-fbx/include/linux/compiler_attributes.h --- linux-6.4/include/linux/compiler_attributes.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/compiler_attributes.h 2024-04-22 13:40:52.263922734 +0200 @@ -89,6 +89,19 @@ #endif /* + * Optional: only supported since gcc >= 14 + * Optional: only supported since clang >= 18 + * + * gcc: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=108896 + * clang: https://reviews.llvm.org/D148381 + */ +#if __has_attribute(__counted_by__) +# define __counted_by(member) __attribute__((__counted_by__(member))) +#else +# define __counted_by(member) +#endif + +/* * Optional: not supported by gcc * Optional: only supported since clang >= 14.0 * diff -ruw linux-6.4/include/linux/ethtool.h linux-6.4-fbx/include/linux/ethtool.h --- linux-6.4/include/linux/ethtool.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/ethtool.h 2024-04-22 13:40:52.275923062 +0200 @@ -912,6 +912,15 @@ int (*set_mm)(struct net_device *dev, struct ethtool_mm_cfg *cfg, struct netlink_ext_ack *extack); void (*get_mm_stats)(struct net_device *dev, struct ethtool_mm_stats *stats); + int (*set_shaper_param)(struct net_device *, + const struct ethtool_shaper_params *); + int (*get_shaper_param)(struct net_device *, + struct ethtool_shaper_params *); + int (*get_epon_param)(struct net_device *, + struct ethtool_epon_param *); + int (*set_epon_param)(struct net_device *, + const struct ethtool_epon_param *); + struct phylink *(*get_phylink)(struct net_device *); }; int ethtool_check_ops(const struct ethtool_ops *ops); diff -ruw linux-6.4/include/linux/ieee80211.h linux-6.4-fbx/include/linux/ieee80211.h --- linux-6.4/include/linux/ieee80211.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/ieee80211.h 2024-04-22 13:40:52.299923718 +0200 @@ -307,6 +307,13 @@ #define IEEE80211_TRIGGER_TYPE_BQRP 0x6 #define IEEE80211_TRIGGER_TYPE_NFRP 0x7 +/* UL-bandwidth within common_info of trigger frame */ +#define IEEE80211_TRIGGER_ULBW_MASK 0xc0000 +#define IEEE80211_TRIGGER_ULBW_20MHZ 0x0 +#define IEEE80211_TRIGGER_ULBW_40MHZ 0x1 +#define IEEE80211_TRIGGER_ULBW_80MHZ 0x2 +#define IEEE80211_TRIGGER_ULBW_160_80P80MHZ 0x3 + struct ieee80211_hdr { __le16 frame_control; __le16 duration_id; @@ -836,9 +843,14 @@ }; /** - * struct ieee80211_quiet_ie + * struct ieee80211_quiet_ie - Quiet element + * @count: Quiet Count + * @period: Quiet Period + * @duration: Quiet Duration + * @offset: Quiet Offset * - * This structure refers to "Quiet information element" + * This structure represents the payload of the "Quiet element" as + * described in IEEE Std 802.11-2020 section 9.4.2.22. */ struct ieee80211_quiet_ie { u8 count; @@ -848,9 +860,15 @@ } __packed; /** - * struct ieee80211_msrment_ie - * - * This structure refers to "Measurement Request/Report information element" + * struct ieee80211_msrment_ie - Measurement element + * @token: Measurement Token + * @mode: Measurement Report Mode + * @type: Measurement Type + * @request: Measurement Request or Measurement Report + * + * This structure represents the payload of both the "Measurement + * Request element" and the "Measurement Report element" as described + * in IEEE Std 802.11-2020 sections 9.4.2.20 and 9.4.2.21. */ struct ieee80211_msrment_ie { u8 token; @@ -860,9 +878,14 @@ } __packed; /** - * struct ieee80211_channel_sw_ie - * - * This structure refers to "Channel Switch Announcement information element" + * struct ieee80211_channel_sw_ie - Channel Switch Announcement element + * @mode: Channel Switch Mode + * @new_ch_num: New Channel Number + * @count: Channel Switch Count + * + * This structure represents the payload of the "Channel Switch + * Announcement element" as described in IEEE Std 802.11-2020 section + * 9.4.2.18. */ struct ieee80211_channel_sw_ie { u8 mode; @@ -871,9 +894,14 @@ } __packed; /** - * struct ieee80211_ext_chansw_ie + * struct ieee80211_ext_chansw_ie - Extended Channel Switch Announcement element + * @mode: Channel Switch Mode + * @new_operating_class: New Operating Class + * @new_ch_num: New Channel Number + * @count: Channel Switch Count * - * This structure represents the "Extended Channel Switch Announcement element" + * This structure represents the "Extended Channel Switch Announcement + * element" as described in IEEE Std 802.11-2020 section 9.4.2.52. */ struct ieee80211_ext_chansw_ie { u8 mode; @@ -894,8 +922,14 @@ /** * struct ieee80211_mesh_chansw_params_ie - mesh channel switch parameters IE - * - * This structure represents the "Mesh Channel Switch Paramters element" + * @mesh_ttl: Time To Live + * @mesh_flags: Flags + * @mesh_reason: Reason Code + * @mesh_pre_value: Precedence Value + * + * This structure represents the payload of the "Mesh Channel Switch + * Parameters element" as described in IEEE Std 802.11-2020 section + * 9.4.2.102. */ struct ieee80211_mesh_chansw_params_ie { u8 mesh_ttl; @@ -906,6 +940,13 @@ /** * struct ieee80211_wide_bw_chansw_ie - wide bandwidth channel switch IE + * @new_channel_width: New Channel Width + * @new_center_freq_seg0: New Channel Center Frequency Segment 0 + * @new_center_freq_seg1: New Channel Center Frequency Segment 1 + * + * This structure represents the payload of the "Wide Bandwidth + * Channel Switch element" as described in IEEE Std 802.11-2020 + * section 9.4.2.160. */ struct ieee80211_wide_bw_chansw_ie { u8 new_channel_width; @@ -913,22 +954,42 @@ } __packed; /** - * struct ieee80211_tim - * - * This structure refers to "Traffic Indication Map information element" + * struct ieee80211_tim_ie - Traffic Indication Map information element + * @dtim_count: DTIM Count + * @dtim_period: DTIM Period + * @bitmap_ctrl: Bitmap Control + * @required_octet: "Syntatic sugar" to force the struct size to the + * minimum valid size when carried in a non-S1G PPDU + * @virtual_map: Partial Virtual Bitmap + * + * This structure represents the payload of the "TIM element" as + * described in IEEE Std 802.11-2020 section 9.4.2.5. Note that this + * definition is only applicable when the element is carried in a + * non-S1G PPDU. When the TIM is carried in an S1G PPDU, the Bitmap + * Control and Partial Virtual Bitmap may not be present. */ struct ieee80211_tim_ie { u8 dtim_count; u8 dtim_period; u8 bitmap_ctrl; - /* variable size: 1 - 251 bytes */ - u8 virtual_map[1]; + union { + u8 required_octet; + DECLARE_FLEX_ARRAY(u8, virtual_map); + }; } __packed; /** - * struct ieee80211_meshconf_ie + * struct ieee80211_meshconf_ie - Mesh Configuration element + * @meshconf_psel: Active Path Selection Protocol Identifier + * @meshconf_pmetric: Active Path Selection Metric Identifier + * @meshconf_congest: Congestion Control Mode Identifier + * @meshconf_synch: Synchronization Method Identifier + * @meshconf_auth: Authentication Protocol Identifier + * @meshconf_form: Mesh Formation Info + * @meshconf_cap: Mesh Capability (see &enum mesh_config_capab_flags) * - * This structure refers to "Mesh Configuration information element" + * This structure represents the payload of the "Mesh Configuration + * element" as described in IEEE Std 802.11-2020 section 9.4.2.97. */ struct ieee80211_meshconf_ie { u8 meshconf_psel; @@ -950,6 +1011,9 @@ * is ongoing * @IEEE80211_MESHCONF_CAPAB_POWER_SAVE_LEVEL: STA is in deep sleep mode or has * neighbors in deep sleep mode + * + * Enumerates the "Mesh Capability" as described in IEEE Std + * 802.11-2020 section 9.4.2.97.7. */ enum mesh_config_capab_flags { IEEE80211_MESHCONF_CAPAB_ACCEPT_PLINKS = 0x01, @@ -960,7 +1024,7 @@ #define IEEE80211_MESHCONF_FORM_CONNECTED_TO_GATE 0x1 -/** +/* * mesh channel switch parameters element's flag indicator * */ @@ -969,9 +1033,17 @@ #define WLAN_EID_CHAN_SWITCH_PARAM_REASON BIT(2) /** - * struct ieee80211_rann_ie + * struct ieee80211_rann_ie - RANN (root announcement) element + * @rann_flags: Flags + * @rann_hopcount: Hop Count + * @rann_ttl: Element TTL + * @rann_addr: Root Mesh STA Address + * @rann_seq: HWMP Sequence Number + * @rann_interval: Interval + * @rann_metric: Metric * - * This structure refers to "Root Announcement information element" + * This structure represents the payload of the "RANN element" as + * described in IEEE Std 802.11-2020 section 9.4.2.111. */ struct ieee80211_rann_ie { u8 rann_flags; @@ -993,7 +1065,7 @@ }; /** - * enum ieee80211_opmode_bits - VHT operating mode field bits + * enum ieee80211_vht_opmode_bits - VHT operating mode field bits * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_MASK: channel width mask * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_20MHZ: 20 MHz channel width * @IEEE80211_OPMODE_NOTIF_CHANWIDTH_40MHZ: 40 MHz channel width @@ -1042,9 +1114,12 @@ #define WLAN_USER_POSITION_LEN 16 /** - * struct ieee80211_tpc_report_ie + * struct ieee80211_tpc_report_ie - TPC Report element + * @tx_power: Transmit Power + * @link_margin: Link Margin * - * This structure refers to "TPC Report element" + * This structure represents the payload of the "TPC Report element" as + * described in IEEE Std 802.11-2020 section 9.4.2.16. */ struct ieee80211_tpc_report_ie { u8 tx_power; @@ -1062,9 +1137,14 @@ } __packed; /** - * struct ieee80211_s1g_bcn_compat_ie - * - * S1G Beacon Compatibility element + * struct ieee80211_s1g_bcn_compat_ie - S1G Beacon Compatibility element + * @compat_info: Compatibility Information + * @beacon_int: Beacon Interval + * @tsf_completion: TSF Completion + * + * This structure represents the payload of the "S1G Beacon + * Compatibility element" as described in IEEE Std 802.11-2020 section + * 9.4.2.196. */ struct ieee80211_s1g_bcn_compat_ie { __le16 compat_info; @@ -1073,9 +1153,15 @@ } __packed; /** - * struct ieee80211_s1g_oper_ie + * struct ieee80211_s1g_oper_ie - S1G Operation element + * @ch_width: S1G Operation Information Channel Width + * @oper_class: S1G Operation Information Operating Class + * @primary_ch: S1G Operation Information Primary Channel Number + * @oper_ch: S1G Operation Information Channel Center Frequency + * @basic_mcs_nss: Basic S1G-MCS and NSS Set * - * S1G Operation element + * This structure represents the payload of the "S1G Operation + * element" as described in IEEE Std 802.11-2020 section 9.4.2.212. */ struct ieee80211_s1g_oper_ie { u8 ch_width; @@ -1086,9 +1172,13 @@ } __packed; /** - * struct ieee80211_aid_response_ie + * struct ieee80211_aid_response_ie - AID Response element + * @aid: AID/Group AID + * @switch_count: AID Switch Count + * @response_int: AID Response Interval * - * AID Response element + * This structure represents the payload of the "AID Response element" + * as described in IEEE Std 802.11-2020 section 9.4.2.194. */ struct ieee80211_aid_response_ie { __le16 aid; @@ -1163,6 +1253,30 @@ u8 params[]; } __packed; +#define IEEE80211_TTLM_MAX_CNT 2 +#define IEEE80211_TTLM_CONTROL_DIRECTION 0x03 +#define IEEE80211_TTLM_CONTROL_DEF_LINK_MAP 0x04 +#define IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT 0x08 +#define IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT 0x10 +#define IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE 0x20 + +#define IEEE80211_TTLM_DIRECTION_DOWN 0 +#define IEEE80211_TTLM_DIRECTION_UP 1 +#define IEEE80211_TTLM_DIRECTION_BOTH 2 + +/** + * struct ieee80211_ttlm_elem - TID-To-Link Mapping element + * + * Defined in section 9.4.2.314 in P802.11be_D4 + * + * @control: the first part of control field + * @optional: the second part of control field + */ +struct ieee80211_ttlm_elem { + u8 control; + u8 optional[]; +} __packed; + struct ieee80211_mgmt { __le16 frame_control; __le16 duration; @@ -1349,8 +1463,11 @@ /* Supported rates membership selectors */ #define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127 #define BSS_MEMBERSHIP_SELECTOR_VHT_PHY 126 -#define BSS_MEMBERSHIP_SELECTOR_HE_PHY 122 +#define BSS_MEMBERSHIP_SELECTOR_GLK 125 +#define BSS_MEMBERSHIP_SELECTOR_EPS 124 #define BSS_MEMBERSHIP_SELECTOR_SAE_H2E 123 +#define BSS_MEMBERSHIP_SELECTOR_HE_PHY 122 +#define BSS_MEMBERSHIP_SELECTOR_EHT_PHY 121 /* mgmt header + 1 byte category code */ #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u) @@ -1486,7 +1603,7 @@ /* * Peer-to-Peer IE attribute related definitions. */ -/** +/* * enum ieee80211_p2p_attr_id - identifies type of peer-to-peer attribute. */ enum ieee80211_p2p_attr_id { @@ -1536,10 +1653,16 @@ #define IEEE80211_P2P_OPPPS_CTWINDOW_MASK 0x7F /** - * struct ieee80211_bar - HT Block Ack Request + * struct ieee80211_bar - Block Ack Request frame format + * @frame_control: Frame Control + * @duration: Duration + * @ra: RA + * @ta: TA + * @control: BAR Control + * @start_seq_num: Starting Sequence Number (see Figure 9-37) * - * This structure refers to "HT BlockAckReq" as - * described in 802.11n draft section 7.2.1.7.1 + * This structure represents the "BlockAckReq frame format" + * as described in IEEE Std 802.11-2020 section 9.3.1.7. */ struct ieee80211_bar { __le16 frame_control; @@ -1560,13 +1683,17 @@ #define IEEE80211_HT_MCS_MASK_LEN 10 /** - * struct ieee80211_mcs_info - MCS information + * struct ieee80211_mcs_info - Supported MCS Set field * @rx_mask: RX mask * @rx_highest: highest supported RX rate. If set represents * the highest supported RX data rate in units of 1 Mbps. * If this field is 0 this value should not be used to * consider the highest RX data rate supported. * @tx_params: TX parameters + * @reserved: Reserved bits + * + * This structure represents the "Supported MCS Set field" as + * described in IEEE Std 802.11-2020 section 9.4.2.55.4. */ struct ieee80211_mcs_info { u8 rx_mask[IEEE80211_HT_MCS_MASK_LEN]; @@ -1585,6 +1712,8 @@ #define IEEE80211_HT_MCS_TX_MAX_STREAMS 4 #define IEEE80211_HT_MCS_TX_UNEQUAL_MODULATION 0x10 +#define IEEE80211_HT_MCS_CHAINS(mcs) ((mcs) == 32 ? 1 : (1 + ((mcs) >> 3))) + /* * 802.11n D5.0 20.3.5 / 20.6 says: * - indices 0 to 7 and 32 are single spatial stream @@ -1597,10 +1726,16 @@ (IEEE80211_HT_MCS_UNEQUAL_MODULATION_START / 8) /** - * struct ieee80211_ht_cap - HT capabilities + * struct ieee80211_ht_cap - HT capabilities element + * @cap_info: HT Capability Information + * @ampdu_params_info: A-MPDU Parameters + * @mcs: Supported MCS Set + * @extended_ht_cap_info: HT Extended Capabilities + * @tx_BF_cap_info: Transmit Beamforming Capabilities + * @antenna_selection_info: ASEL Capability * - * This structure is the "HT capabilities element" as - * described in 802.11n D5.0 7.3.2.57 + * This structure represents the payload of the "HT Capabilities + * element" as described in IEEE Std 802.11-2020 section 9.4.2.55. */ struct ieee80211_ht_cap { __le16 cap_info; @@ -1688,9 +1823,14 @@ /** * struct ieee80211_ht_operation - HT operation IE + * @primary_chan: Primary Channel + * @ht_param: HT Operation Information parameters + * @operation_mode: HT Operation Information operation mode + * @stbc_param: HT Operation Information STBC params + * @basic_set: Basic HT-MCS Set * - * This structure is the "HT operation element" as - * described in 802.11n-2009 7.3.2.57 + * This structure represents the payload of the "HT Operation + * element" as described in IEEE Std 802.11-2020 section 9.4.2.56. */ struct ieee80211_ht_operation { u8 primary_chan; @@ -1859,9 +1999,12 @@ /** * struct ieee80211_he_cap_elem - HE capabilities element + * @mac_cap_info: HE MAC Capabilities Information + * @phy_cap_info: HE PHY Capabilities Information * - * This structure is the "HE capabilities element" fixed fields as - * described in P802.11ax_D4.0 section 9.4.2.242.2 and 9.4.2.242.3 + * This structure represents the fixed fields of the payload of the + * "HE capabilities element" as described in IEEE Std 802.11ax-2021 + * sections 9.4.2.248.2 and 9.4.2.248.3. */ struct ieee80211_he_cap_elem { u8 mac_cap_info[6]; @@ -1920,35 +2063,45 @@ } __packed; /** - * struct ieee80211_he_operation - HE capabilities element + * struct ieee80211_he_operation - HE Operation element + * @he_oper_params: HE Operation Parameters + BSS Color Information + * @he_mcs_nss_set: Basic HE-MCS And NSS Set + * @optional: Optional fields VHT Operation Information, Max Co-Hosted + * BSSID Indicator, and 6 GHz Operation Information * - * This structure is the "HE operation element" fields as - * described in P802.11ax_D4.0 section 9.4.2.243 + * This structure represents the payload of the "HE Operation + * element" as described in IEEE Std 802.11ax-2021 section 9.4.2.249. */ struct ieee80211_he_operation { __le32 he_oper_params; __le16 he_mcs_nss_set; - /* Optional 0,1,3,4,5,7 or 8 bytes: depends on @he_oper_params */ u8 optional[]; } __packed; /** - * struct ieee80211_he_spr - HE spatial reuse element - * - * This structure is the "HE spatial reuse element" element as - * described in P802.11ax_D4.0 section 9.4.2.241 + * struct ieee80211_he_spr - Spatial Reuse Parameter Set element + * @he_sr_control: SR Control + * @optional: Optional fields Non-SRG OBSS PD Max Offset, SRG OBSS PD + * Min Offset, SRG OBSS PD Max Offset, SRG BSS Color + * Bitmap, and SRG Partial BSSID Bitmap + * + * This structure represents the payload of the "Spatial Reuse + * Parameter Set element" as described in IEEE Std 802.11ax-2021 + * section 9.4.2.252. */ struct ieee80211_he_spr { u8 he_sr_control; - /* Optional 0 to 19 bytes: depends on @he_sr_control */ u8 optional[]; } __packed; /** * struct ieee80211_he_mu_edca_param_ac_rec - MU AC Parameter Record field + * @aifsn: ACI/AIFSN + * @ecw_min_max: ECWmin/ECWmax + * @mu_edca_timer: MU EDCA Timer * - * This structure is the "MU AC Parameter Record" fields as - * described in P802.11ax_D4.0 section 9.4.2.245 + * This structure represents the "MU AC Parameter Record" as described + * in IEEE Std 802.11ax-2021 section 9.4.2.251, Figure 9-788p. */ struct ieee80211_he_mu_edca_param_ac_rec { u8 aifsn; @@ -1958,9 +2111,14 @@ /** * struct ieee80211_mu_edca_param_set - MU EDCA Parameter Set element + * @mu_qos_info: QoS Info + * @ac_be: MU AC_BE Parameter Record + * @ac_bk: MU AC_BK Parameter Record + * @ac_vi: MU AC_VI Parameter Record + * @ac_vo: MU AC_VO Parameter Record * - * This structure is the "MU EDCA Parameter Set element" fields as - * described in P802.11ax_D4.0 section 9.4.2.245 + * This structure represents the payload of the "MU EDCA Parameter Set + * element" as described in IEEE Std 802.11ax-2021 section 9.4.2.251. */ struct ieee80211_mu_edca_param_set { u8 mu_qos_info; @@ -1993,13 +2151,19 @@ * @rx_tx_mcs13_max_nss: indicates the maximum number of spatial streams * supported for reception and the maximum number of spatial streams * supported for transmission for MCS 12 - 13. + * @rx_tx_max_nss: array of the previous fields for easier loop access */ struct ieee80211_eht_mcs_nss_supp_20mhz_only { + union { + struct { u8 rx_tx_mcs7_max_nss; u8 rx_tx_mcs9_max_nss; u8 rx_tx_mcs11_max_nss; u8 rx_tx_mcs13_max_nss; }; + u8 rx_tx_max_nss[4]; + }; +}; /** * struct ieee80211_eht_mcs_nss_supp_bw - EHT max supported NSS per MCS (except @@ -2018,12 +2182,18 @@ * @rx_tx_mcs13_max_nss: indicates the maximum number of spatial streams * supported for reception and the maximum number of spatial streams * supported for transmission for MCS 12 - 13. + * @rx_tx_max_nss: array of the previous fields for easier loop access */ struct ieee80211_eht_mcs_nss_supp_bw { + union { + struct { u8 rx_tx_mcs9_max_nss; u8 rx_tx_mcs11_max_nss; u8 rx_tx_mcs13_max_nss; }; + u8 rx_tx_max_nss[3]; + }; +}; /** * struct ieee80211_eht_cap_elem_fixed - EHT capabilities fixed data @@ -2075,7 +2245,7 @@ */ struct ieee80211_eht_operation { u8 params; - __le32 basic_mcs_nss; + struct ieee80211_eht_mcs_nss_supp_20mhz_only basic_mcs_nss; u8 optional[]; } __packed; @@ -2162,9 +2332,9 @@ * enum ieee80211_ap_reg_power - regulatory power for a Access Point * * @IEEE80211_REG_UNSET_AP: Access Point has no regulatory power mode - * @IEEE80211_REG_LPI: Indoor Access Point - * @IEEE80211_REG_SP: Standard power Access Point - * @IEEE80211_REG_VLP: Very low power Access Point + * @IEEE80211_REG_LPI_AP: Indoor Access Point + * @IEEE80211_REG_SP_AP: Standard power Access Point + * @IEEE80211_REG_VLP_AP: Very low power Access Point * @IEEE80211_REG_AP_POWER_AFTER_LAST: internal * @IEEE80211_REG_AP_POWER_MAX: maximum value */ @@ -2552,7 +2722,7 @@ #define IEEE80211_6GHZ_CTRL_REG_SP_AP 1 /** - * ieee80211_he_6ghz_oper - HE 6 GHz operation Information field + * struct ieee80211_he_6ghz_oper - HE 6 GHz operation Information field * @primary: primary channel * @control: control flags * @ccfs0: channel center frequency segment 0 @@ -2599,9 +2769,13 @@ }; /** - * struct ieee80211_tx_pwr_env - * - * This structure represents the "Transmit Power Envelope element" + * struct ieee80211_tx_pwr_env - Transmit Power Envelope + * @tx_power_info: Transmit Power Information field + * @tx_power: Maximum Transmit Power field + * + * This structure represents the payload of the "Transmit Power + * Envelope element" as described in IEEE Std 802.11ax-2021 section + * 9.4.2.161 */ struct ieee80211_tx_pwr_env { u8 tx_power_info; @@ -2808,6 +2982,10 @@ #define IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454 2 #define IEEE80211_EHT_MAC_CAP1_MAX_AMPDU_LEN_MASK 0x01 +#define IEEE80211_EHT_MAC_CAP1_EHT_TRS 0x02 +#define IEEE80211_EHT_MAC_CAP1_TXOP_SHARE_MODE2 0x04 +#define IEEE80211_EHT_MAC_CAP1_TWO_BQRS_SUPP 0x08 +#define IEEE80211_EHT_MAC_CAP1_EHT_LINK_ADAPTATION_SUPP 0x30 /* EHT PHY capabilities as defined in P802.11be_D2.0 section 9.4.2.313.3 */ #define IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ 0x02 @@ -2856,6 +3034,7 @@ /* Maximum number of supported EHT LTF is split */ #define IEEE80211_EHT_PHY_CAP5_MAX_NUM_SUPP_EHT_LTF_MASK 0xc0 +#define IEEE80211_EHT_PHY_CAP5_SUPP_EXTRA_EHT_LTF 0x40 #define IEEE80211_EHT_PHY_CAP6_MAX_NUM_SUPP_EHT_LTF_MASK 0x07 #define IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK 0x78 @@ -2872,6 +3051,9 @@ #define IEEE80211_EHT_PHY_CAP8_RX_1024QAM_WIDER_BW_DL_OFDMA 0x01 #define IEEE80211_EHT_PHY_CAP8_RX_4096QAM_WIDER_BW_DL_OFDMA 0x02 +#define IEEE80211_EHT_PHY_CAP8_20MHZ_ONLY_CAPS 0x04 +#define IEEE80211_EHT_PHY_CAP8_20MHZ_ONLY_TRIGGER_MUBF_FL_BW_FB_DLMUMIMO 0x08 +#define IEEE80211_EHT_PHY_CAP8_20MHZ_ONLY_MRU_SUPP 0x10 /* * EHT operation channel width as defined in P802.11be_D2.0 section 9.4.2.311 @@ -2918,6 +3100,7 @@ #define IEEE80211_EHT_PPE_THRES_NSS_POS 0 #define IEEE80211_EHT_PPE_THRES_NSS_MASK 0xf #define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_MASK 0x1f0 +#define IEEE80211_EHT_PPE_THRES_RU_INDEX_BITMASK_POS 4 #define IEEE80211_EHT_PPE_THRES_INFO_PPET_SIZE 3 #define IEEE80211_EHT_PPE_THRES_INFO_HEADER_SIZE 9 @@ -2997,6 +3180,28 @@ return len >= needed; } +#define IEEE80211_BW_IND_DIS_SUBCH_PRESENT BIT(1) + +struct ieee80211_bandwidth_indication { + u8 params; + struct ieee80211_eht_operation_info info; +} __packed; + +static inline bool +ieee80211_bandwidth_indication_size_ok(const u8 *data, u8 len) +{ + const struct ieee80211_bandwidth_indication *bwi = (const void *)data; + + if (len < sizeof(*bwi)) + return false; + + if (bwi->params & IEEE80211_BW_IND_DIS_SUBCH_PRESENT && + len < sizeof(*bwi) + 2) + return false; + + return true; +} + #define LISTEN_INT_USF GENMASK(15, 14) #define LISTEN_INT_UI GENMASK(13, 0) @@ -3454,6 +3659,8 @@ WLAN_EID_EXT_EHT_OPERATION = 106, WLAN_EID_EXT_EHT_MULTI_LINK = 107, WLAN_EID_EXT_EHT_CAPABILITY = 108, + WLAN_EID_EXT_TID_TO_LINK_MAPPING = 109, + WLAN_EID_EXT_BANDWIDTH_INDICATION = 135, }; /* Action category code */ @@ -3493,6 +3700,16 @@ WLAN_ACTION_SPCT_CHL_SWITCH = 4, }; +/* RADIO_MEASUREMENT action code */ +enum ieee80211_radio_measurement_actioncode { + WLAN_ACTION_RADIO_MSR_RM_REQ = 0, + WLAN_ACTION_RADIO_MSR_RM_REP = 1, + WLAN_ACTION_RADIO_MSR_LINK_MSR_REQ = 2, + WLAN_ACTION_RADIO_MSR_LINK_MSR_REP = 3, + WLAN_ACTION_RADIO_MSR_NBOR_REP_REQ = 4, + WLAN_ACTION_RADIO_MSR_NBOR_REP_REP = 5, +}; + /* HT action codes */ enum ieee80211_ht_actioncode { WLAN_HT_ACTION_NOTIFY_CHANWIDTH = 0, @@ -4221,6 +4438,35 @@ } /** + * ieee80211_is_protected_dual_of_public_action - check if skb contains a + * protected dual of public action management frame + * @skb: the skb containing the frame, length will be checked + * + * Return: true if the skb contains a protected dual of public action + * management frame, false otherwise. + */ +static inline bool +ieee80211_is_protected_dual_of_public_action(struct sk_buff *skb) +{ + u8 action; + + if (!ieee80211_is_public_action((void *)skb->data, skb->len) || + skb->len < IEEE80211_MIN_ACTION_SIZE + 1) + return false; + + action = *(u8 *)(skb->data + IEEE80211_MIN_ACTION_SIZE); + + return action != WLAN_PUB_ACTION_20_40_BSS_COEX && + action != WLAN_PUB_ACTION_DSE_REG_LOC_ANN && + action != WLAN_PUB_ACTION_MSMT_PILOT && + action != WLAN_PUB_ACTION_TDLS_DISCOVER_RES && + action != WLAN_PUB_ACTION_LOC_TRACK_NOTI && + action != WLAN_PUB_ACTION_FTM_REQUEST && + action != WLAN_PUB_ACTION_FTM_RESPONSE && + action != WLAN_PUB_ACTION_FILS_DISCOVERY; +} + +/** * _ieee80211_is_group_privacy_action - check if frame is a group addressed * privacy action frame * @hdr: the frame @@ -4291,12 +4537,11 @@ /** * ieee80211_get_tdls_action - get tdls packet action (or -1, if not tdls packet) * @skb: the skb containing the frame, length will not be checked - * @hdr_size: the size of the ieee80211_hdr that starts at skb->data * * This function assumes the frame is a data frame, and that the network header * is in the correct place. */ -static inline int ieee80211_get_tdls_action(struct sk_buff *skb, u32 hdr_size) +static inline int ieee80211_get_tdls_action(struct sk_buff *skb) { if (!skb_is_nonlinear(skb) && skb->len > (skb_network_offset(skb) + 2)) { @@ -4462,7 +4707,7 @@ return (const u8 *)element == (const u8 *)data + datalen; } -/** +/* * RSNX Capabilities: * bits 0-3: Field length (n-1) */ @@ -4477,8 +4722,8 @@ #define IEEE80211_AP_INFO_TBTT_HDR_FILTERED 0x04 #define IEEE80211_AP_INFO_TBTT_HDR_COLOC 0x08 #define IEEE80211_AP_INFO_TBTT_HDR_COUNT 0xF0 -#define IEEE80211_TBTT_INFO_OFFSET_BSSID_BSS_PARAM 9 -#define IEEE80211_TBTT_INFO_OFFSET_BSSID_SSSID_BSS_PARAM 13 +#define IEEE80211_TBTT_INFO_TYPE_TBTT 0 +#define IEEE80211_TBTT_INFO_TYPE_MLD 1 #define IEEE80211_RNR_TBTT_PARAMS_OCT_RECOMMENDED 0x01 #define IEEE80211_RNR_TBTT_PARAMS_SAME_SSID 0x02 @@ -4488,6 +4733,9 @@ #define IEEE80211_RNR_TBTT_PARAMS_PROBE_ACTIVE 0x20 #define IEEE80211_RNR_TBTT_PARAMS_COLOC_AP 0x40 +#define IEEE80211_RNR_TBTT_PARAMS_PSD_NO_LIMIT 127 +#define IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED -128 + struct ieee80211_neighbor_ap_info { u8 tbtt_info_hdr; u8 tbtt_info_len; @@ -4502,6 +4750,42 @@ IEEE80211_RANGE_PARAMS_MAX_TOTAL_LTF_UNSPECIFIED, }; +/* + * reduced neighbor report, based on Draft P802.11be_D3.0, + * section 9.4.2.170.2. + */ +struct ieee80211_rnr_mld_params { + u8 mld_id; + __le16 params; +} __packed; + +#define IEEE80211_RNR_MLD_PARAMS_LINK_ID 0x000F +#define IEEE80211_RNR_MLD_PARAMS_BSS_CHANGE_COUNT 0x0FF0 +#define IEEE80211_RNR_MLD_PARAMS_UPDATES_INCLUDED 0x1000 +#define IEEE80211_RNR_MLD_PARAMS_DISABLED_LINK 0x2000 + +/* Format of the TBTT information element if it has 7, 8 or 9 bytes */ +struct ieee80211_tbtt_info_7_8_9 { + u8 tbtt_offset; + u8 bssid[ETH_ALEN]; + + /* The following element is optional, structure may not grow */ + u8 bss_params; + s8 psd_20; +} __packed; + +/* Format of the TBTT information element if it has >= 11 bytes */ +struct ieee80211_tbtt_info_ge_11 { + u8 tbtt_offset; + u8 bssid[ETH_ALEN]; + __le32 short_ssid; + + /* The following elements are optional, structure may grow */ + u8 bss_params; + s8 psd_20; + struct ieee80211_rnr_mld_params mld_params; +} __packed; + /* multi-link device */ #define IEEE80211_MLD_MAX_NUM_LINKS 15 @@ -4529,6 +4813,14 @@ #define IEEE80211_MED_SYNC_DELAY_SYNC_OFDM_ED_THRESH 0x0f00 #define IEEE80211_MED_SYNC_DELAY_SYNC_MAX_NUM_TXOPS 0xf000 +/* + * Described in P802.11be_D3.0 + * dot11MSDTimerDuration should default to 5484 (i.e. 171.375) + * dot11MSDOFDMEDthreshold defaults to -72 (i.e. 0) + * dot11MSDTXOPMAX defaults to 1 + */ +#define IEEE80211_MED_SYNC_DELAY_DEFAULT 0x10ac + #define IEEE80211_EML_CAP_EMLSR_SUPP 0x0001 #define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY 0x000e #define IEEE80211_EML_CAP_EMLSR_PADDING_DELAY_0US 0 @@ -4611,15 +4903,12 @@ case IEEE80211_ML_CONTROL_TYPE_BASIC: case IEEE80211_ML_CONTROL_TYPE_PREQ: case IEEE80211_ML_CONTROL_TYPE_TDLS: + case IEEE80211_ML_CONTROL_TYPE_RECONF: /* * The length is the first octet pointed by mle->variable so no * need to add anything */ break; - case IEEE80211_ML_CONTROL_TYPE_RECONF: - if (control & IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR) - common += ETH_ALEN; - return common; case IEEE80211_ML_CONTROL_TYPE_PRIO_ACCESS: if (control & IEEE80211_MLC_PRIO_ACCESS_PRES_AP_MLD_MAC_ADDR) common += ETH_ALEN; @@ -4633,6 +4922,95 @@ } /** + * ieee80211_mle_get_bss_param_ch_cnt - returns the BSS parameter change count + * @mle: the basic multi link element + * + * The element is assumed to be of the correct type (BASIC) and big enough, + * this must be checked using ieee80211_mle_type_ok(). + * + * If the BSS parameter change count value can't be found (the presence bit + * for it is clear), 0 will be returned. + */ +static inline u8 +ieee80211_mle_get_bss_param_ch_cnt(const struct ieee80211_multi_link_elem *mle) +{ + u16 control = le16_to_cpu(mle->control); + const u8 *common = mle->variable; + + /* common points now at the beginning of ieee80211_mle_basic_common_info */ + common += sizeof(struct ieee80211_mle_basic_common_info); + + if (!(control & IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT)) + return 0; + + if (control & IEEE80211_MLC_BASIC_PRES_LINK_ID) + common += 1; + + return *common; +} + +/** + * ieee80211_mle_get_eml_med_sync_delay - returns the medium sync delay + * @data: pointer to the multi link EHT IE + * + * The element is assumed to be of the correct type (BASIC) and big enough, + * this must be checked using ieee80211_mle_type_ok(). + * + * If the medium synchronization is not present, then the default value is + * returned. + */ +static inline u16 ieee80211_mle_get_eml_med_sync_delay(const u8 *data) +{ + const struct ieee80211_multi_link_elem *mle = (const void *)data; + u16 control = le16_to_cpu(mle->control); + const u8 *common = mle->variable; + + /* common points now at the beginning of ieee80211_mle_basic_common_info */ + common += sizeof(struct ieee80211_mle_basic_common_info); + + if (!(control & IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)) + return IEEE80211_MED_SYNC_DELAY_DEFAULT; + + if (control & IEEE80211_MLC_BASIC_PRES_LINK_ID) + common += 1; + if (control & IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT) + common += 1; + + return get_unaligned_le16(common); +} + +/** + * ieee80211_mle_get_eml_cap - returns the EML capability + * @data: pointer to the multi link EHT IE + * + * The element is assumed to be of the correct type (BASIC) and big enough, + * this must be checked using ieee80211_mle_type_ok(). + * + * If the EML capability is not present, 0 will be returned. + */ +static inline u16 ieee80211_mle_get_eml_cap(const u8 *data) +{ + const struct ieee80211_multi_link_elem *mle = (const void *)data; + u16 control = le16_to_cpu(mle->control); + const u8 *common = mle->variable; + + /* common points now at the beginning of ieee80211_mle_basic_common_info */ + common += sizeof(struct ieee80211_mle_basic_common_info); + + if (!(control & IEEE80211_MLC_BASIC_PRES_EML_CAPA)) + return 0; + + if (control & IEEE80211_MLC_BASIC_PRES_LINK_ID) + common += 1; + if (control & IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT) + common += 1; + if (control & IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY) + common += 2; + + return get_unaligned_le16(common); +} + +/** * ieee80211_mle_size_ok - validate multi-link element size * @data: pointer to the element data * @len: length of the containing element @@ -4700,6 +5078,28 @@ return mle->variable[0] >= common; } +/** + * ieee80211_mle_type_ok - validate multi-link element type and size + * @data: pointer to the element data + * @type: expected type of the element + * @len: length of the containing element + */ +static inline bool ieee80211_mle_type_ok(const u8 *data, u8 type, size_t len) +{ + const struct ieee80211_multi_link_elem *mle = (const void *)data; + u16 control; + + if (!ieee80211_mle_size_ok(data, len)) + return false; + + control = le16_to_cpu(mle->control); + + if (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE) == type) + return true; + + return false; +} + enum ieee80211_mle_subelems { IEEE80211_MLE_SUBELEM_PER_STA_PROFILE = 0, IEEE80211_MLE_SUBELEM_FRAGMENT = 254, @@ -4722,11 +5122,13 @@ } __packed; /** - * ieee80211_mle_sta_prof_size_ok - validate multi-link element sta profile size + * ieee80211_mle_basic_sta_prof_size_ok - validate basic multi-link element sta + * profile size * @data: pointer to the sub element data * @len: length of the containing sub element */ -static inline bool ieee80211_mle_sta_prof_size_ok(const u8 *data, size_t len) +static inline bool ieee80211_mle_basic_sta_prof_size_ok(const u8 *data, + size_t len) { const struct ieee80211_mle_per_sta_profile *prof = (const void *)data; u16 control; @@ -4746,25 +5148,196 @@ info_len += 8; if (control & IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT) info_len += 2; - if (control & IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT) - info_len += 1; - if (control & IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE && - control & IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE) { + control & IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT) { if (control & IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE) info_len += 2; else info_len += 1; } + if (control & IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT) + info_len += 1; return prof->sta_info_len >= info_len && fixed + prof->sta_info_len <= len; } +/** + * ieee80211_mle_basic_sta_prof_bss_param_ch_cnt - get per-STA profile BSS + * parameter change count + * @prof: the per-STA profile, having been checked with + * ieee80211_mle_basic_sta_prof_size_ok() for the correct length + * + * Return: The BSS parameter change count value if present, 0 otherwise. + */ +static inline u8 +ieee80211_mle_basic_sta_prof_bss_param_ch_cnt(const struct ieee80211_mle_per_sta_profile *prof) +{ + u16 control = le16_to_cpu(prof->control); + const u8 *pos = prof->variable; + + if (!(control & IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT)) + return 0; + + if (control & IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT) + pos += 6; + if (control & IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT) + pos += 2; + if (control & IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT) + pos += 8; + if (control & IEEE80211_MLE_STA_CONTROL_DTIM_INFO_PRESENT) + pos += 2; + if (control & IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE && + control & IEEE80211_MLE_STA_CONTROL_NSTR_LINK_PAIR_PRESENT) { + if (control & IEEE80211_MLE_STA_CONTROL_NSTR_BITMAP_SIZE) + pos += 2; + else + pos += 1; + } + + return *pos; +} + +#define IEEE80211_MLE_STA_RECONF_CONTROL_LINK_ID 0x000f +#define IEEE80211_MLE_STA_RECONF_CONTROL_COMPLETE_PROFILE 0x0010 +#define IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT 0x0020 +#define IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT 0x0040 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_UPDATE_TYPE 0x0780 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT 0x0800 + +/** + * ieee80211_mle_reconf_sta_prof_size_ok - validate reconfiguration multi-link + * element sta profile size. + * @data: pointer to the sub element data + * @len: length of the containing sub element + */ +static inline bool ieee80211_mle_reconf_sta_prof_size_ok(const u8 *data, + size_t len) +{ + const struct ieee80211_mle_per_sta_profile *prof = (const void *)data; + u16 control; + u8 fixed = sizeof(*prof); + u8 info_len = 1; + + if (len < fixed) + return false; + + control = le16_to_cpu(prof->control); + + if (control & IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT) + info_len += ETH_ALEN; + if (control & IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT) + info_len += 2; + if (control & IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT) + info_len += 2; + + return prof->sta_info_len >= info_len && + fixed + prof->sta_info_len - 1 <= len; +} + +static inline bool ieee80211_tid_to_link_map_size_ok(const u8 *data, size_t len) +{ + const struct ieee80211_ttlm_elem *t2l = (const void *)data; + u8 control, fixed = sizeof(*t2l), elem_len = 0; + + if (len < fixed) + return false; + + control = t2l->control; + + if (control & IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT) + elem_len += 2; + if (control & IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT) + elem_len += 3; + + if (!(control & IEEE80211_TTLM_CONTROL_DEF_LINK_MAP)) { + u8 bm_size; + + elem_len += 1; + if (len < fixed + elem_len) + return false; + + if (control & IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE) + bm_size = 1; + else + bm_size = 2; + + elem_len += hweight8(t2l->optional[0]) * bm_size; + } + + return len >= fixed + elem_len; +} + #define for_each_mle_subelement(_elem, _data, _len) \ if (ieee80211_mle_size_ok(_data, _len)) \ for_each_element(_elem, \ _data + ieee80211_mle_common_size(_data),\ _len - ieee80211_mle_common_size(_data)) +/** + * enum ieee80211_critical_updates - Critical Update (CU) flags + * + * These flags are used to indicate the type of critical update happening + * on a link in an interface. + * + * @IEEE80211_CU_INCLUDE_CSA_ELEM: critical update due to inclusion of a Channel + * Switch Announcement element. + * @IEEE80211_CU_INCLUDE_ECSA_ELEM: critical update due to inclusion of an + * Extended Channel Switch Announcement element. + * @IEEE80211_CU_MODIFY_EDCA_PARAM_ELEM: critical update due to modification of + * the EDCA parameters element. + * @IEEE80211_CU_INCLUDE_QUIET_ELEM: critical update due to inclusion of a Quiet + * element. + * @IEEE80211_CU_MODIFY_DSSS_PARAM_ELEM: critical update due to modification of + * the DSSS Parameter Set. + * @IEEE80211_CU_MODIFY_HT_OPER_ELEM: critical update due to modification of the + * HT Operation element + * @IEEE80211_CU_INCLUDE_WBCS_ELEM: critical update due to inclusion of a Wide + * Bandwidth Channel Switch element. + * @IEEE80211_CU_INCLUDE_CSW_ELEM: critical update due to inclusion of a Channel + * Switch Wrapper element. + * @IEEE80211_CU_INCLUDE_OMN_ELEM: critical update due to inclusion of an + * Operating Mode Notification element. + * @IEEE80211_CU_INCLUDE_Q_CHAN_ELEM: critical update due to inclusion of a + * Quiet Channel element. + * @IEEE80211_CU_MODIFY_VHT_OPER_ELEM: critical update due to modification of the + * VHT Operation element. + * @IEEE80211_CU_MODIFY_HE_OPER_ELEM: critical update due to modification of the + * HE Operation element. + * @IEEE80211_CU_INCLUDE_B_TWT_ELEM: critical update due to inclusion a + * Broadcast TWT element. + * @IEEE80211_CU_INCLUDE_B_TWT_EXIST_ELEM: critical update due to inclusion of a + * Broadcast TWT Parameter Set field in an existing Broadcast TWT element. + * @IEEE80211_CU_INCLUDE_BCCA_ELEM: critical update due to inclusion of the BSS + * Color Change Announcement element. + * @IEEE80211_CU_MODIFY_MU_EDCA_PARAM_ELEM: critical update due to modification + * of the MU EDCA Parameter Set element. + * @IEEE80211_CU_MODIFY_SR_PARAM_ELEM: critical update due to modification of the + * Spatial Reuse Parameter Set element. + * @IEEE80211_CU_MODIFY_UORA_PARAM_ELEM: critical update due to modification of + * the UORA Parameter Set element. + * @IEEE80211_CU_MODIFY_EHT_OPER_ELEM: critical update due to modification of the + * EHT Operation element. + */ +enum ieee80211_critical_updates { + IEEE80211_CU_INCLUDE_CSA_ELEM = 1 << 0, + IEEE80211_CU_INCLUDE_ECSA_ELEM = 1 << 1, + IEEE80211_CU_MODIFY_EDCA_PARAM_ELEM = 1 << 2, + IEEE80211_CU_INCLUDE_QUIET_ELEM = 1 << 3, + IEEE80211_CU_MODIFY_DSSS_PARAM_ELEM = 1 << 4, + IEEE80211_CU_MODIFY_HT_OPER_ELEM = 1 << 5, + IEEE80211_CU_INCLUDE_WBCS_ELEM = 1 << 6, + IEEE80211_CU_INCLUDE_CSW_ELEM = 1 << 7, + IEEE80211_CU_INCLUDE_OMN_ELEM = 1 << 8, + IEEE80211_CU_INCLUDE_Q_CHAN_ELEM = 1 << 9, + IEEE80211_CU_MODIFY_VHT_OPER_ELEM = 1 << 10, + IEEE80211_CU_MODIFY_HE_OPER_ELEM = 1 << 11, + IEEE80211_CU_INCLUDE_B_TWT_ELEM = 1 << 12, + IEEE80211_CU_INCLUDE_B_TWT_EXIST_ELEM = 1 << 13, + IEEE80211_CU_INCLUDE_BCCA_ELEM = 1 << 14, + IEEE80211_CU_MODIFY_MU_EDCA_PARAM_ELEM = 1 << 15, + IEEE80211_CU_MODIFY_SR_PARAM_ELEM = 1 << 16, + IEEE80211_CU_MODIFY_UORA_PARAM_ELEM = 1 << 17, + IEEE80211_CU_MODIFY_EHT_OPER_ELEM = 1 << 18, +}; #endif /* LINUX_IEEE80211_H */ diff -ruw linux-6.4/include/linux/if_vlan.h linux-6.4-fbx/include/linux/if_vlan.h --- linux-6.4/include/linux/if_vlan.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/if_vlan.h 2024-04-22 13:40:52.299923718 +0200 @@ -12,6 +12,7 @@ #include #include #include +#include #define VLAN_HLEN 4 /* The additional bytes required by VLAN * (in addition to the Ethernet header) @@ -144,6 +145,7 @@ int (*action)(struct net_device *dev, int vid, void *arg), void *arg); extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); +extern struct net_device *vlan_dev_upper_dev(const struct net_device *dev); extern u16 vlan_dev_vlan_id(const struct net_device *dev); extern __be16 vlan_dev_vlan_proto(const struct net_device *dev); @@ -213,7 +215,7 @@ mp = vlan_dev_priv(dev)->egress_priority_map[(skprio & 0xF)]; while (mp) { - if (mp->priority == skprio) { + if (mp->priority == (skprio & TC_H_MIN_MASK)) { return mp->vlan_qos; /* This should already be shifted * to mask correctly with the * VLAN's TCI */ @@ -257,6 +259,12 @@ return NULL; } +static inline struct net_device *vlan_dev_upper_dev(const struct net_device *dev) +{ + BUG(); + return NULL; +} + static inline u16 vlan_dev_vlan_id(const struct net_device *dev) { BUG(); @@ -317,6 +325,9 @@ switch (ethertype) { case htons(ETH_P_8021Q): case htons(ETH_P_8021AD): +#ifdef CONFIG_VLAN_FBX + case htons(ETH_P_FBXVLAN): +#endif return true; default: return false; diff -ruw linux-6.4/include/linux/in.h linux-6.4-fbx/include/linux/in.h --- linux-6.4/include/linux/in.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/in.h 2023-02-27 13:36:18.996765333 +0100 @@ -30,6 +30,9 @@ return 0; case IPPROTO_AH: /* SPI */ return 4; + case IPPROTO_IPV6: + /* third byte of ipv6 destination address */ + return 36; default: return -EINVAL; } diff -ruw linux-6.4/include/linux/miscdevice.h linux-6.4-fbx/include/linux/miscdevice.h --- linux-6.4/include/linux/miscdevice.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/miscdevice.h 2024-04-22 13:40:52.335924702 +0200 @@ -21,6 +21,7 @@ #define APOLLO_MOUSE_MINOR 7 /* unused */ #define PC110PAD_MINOR 9 /* unused */ /*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */ +#define TALDEV_MINOR 74 /* Marvell TAL device */ #define WATCHDOG_MINOR 130 /* Watchdog timer */ #define TEMP_MINOR 131 /* Temperature Sensor */ #define APM_MINOR_DEV 134 diff -ruw linux-6.4/include/linux/mm_types.h linux-6.4-fbx/include/linux/mm_types.h --- linux-6.4/include/linux/mm_types.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/mm_types.h 2024-04-22 13:40:52.343924920 +0200 @@ -123,7 +123,7 @@ */ unsigned long pp_magic; struct page_pool *pp; - unsigned long _pp_mapping_pad; + unsigned long pp_recycle_flag; unsigned long dma_addr; union { /** @@ -398,8 +398,8 @@ */ #define STRUCT_PAGE_MAX_SHIFT (order_base_2(sizeof(struct page))) -#define PAGE_FRAG_CACHE_MAX_SIZE __ALIGN_MASK(32768, ~PAGE_MASK) -#define PAGE_FRAG_CACHE_MAX_ORDER get_order(PAGE_FRAG_CACHE_MAX_SIZE) +#define PAGE_FRAG_CACHE_MAX_ORDER CONFIG_PAGE_FRAG_CACHE_ORDER +#define PAGE_FRAG_CACHE_MAX_SIZE (4096 << PAGE_FRAG_CACHE_MAX_ORDER) /* * page_private can be used on tail pages. However, PagePrivate is only @@ -432,6 +432,7 @@ */ unsigned int pagecnt_bias; bool pfmemalloc; + atomic_t pages_allocated; }; typedef unsigned long vm_flags_t; diff -ruw linux-6.4/include/linux/mtd/mtd.h linux-6.4-fbx/include/linux/mtd/mtd.h --- linux-6.4/include/linux/mtd/mtd.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/mtd/mtd.h 2024-04-22 13:40:52.347925029 +0200 @@ -287,6 +287,13 @@ */ unsigned int bitflip_threshold; + /* NAND related attributes */ + const char *nand_type; + const char *nand_manufacturer; + const char *onfi_model; + uint8_t onfi_ecc_bits; + uint8_t nand_ids[8]; + /* Kernel-only stuff starts here. */ const char *name; int index; diff -ruw linux-6.4/include/linux/netdevice.h linux-6.4-fbx/include/linux/netdevice.h --- linux-6.4/include/linux/netdevice.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/netdevice.h 2024-04-22 13:40:52.355925248 +0200 @@ -78,6 +78,20 @@ struct xdp_buff; struct xdp_md; +#ifdef CONFIG_NETRXTHREAD + +#define RXTHREAD_MAX_PKTS 512 +struct krxd { + struct sk_buff_head pkt_queue; + unsigned int stats_pkts; + unsigned int stats_dropped; + wait_queue_head_t wq; + struct task_struct *task; +}; + +extern struct krxd gkrxd[CONFIG_NETRXTHREAD_RX_QUEUE]; +#endif + void synchronize_net(void); void netdev_set_default_ethtool_ops(struct net_device *dev, const struct ethtool_ops *ops); @@ -1743,6 +1757,8 @@ IFF_NO_ADDRCONF = BIT_ULL(30), IFF_TX_SKB_NO_LINEAR = BIT_ULL(31), IFF_CHANGE_PROTO_DOWN = BIT_ULL(32), + IFF_FBXBRIDGE = BIT_ULL(33), + IFF_FBXBRIDGE_PORT = BIT_ULL(34), }; #define IFF_802_1Q_VLAN IFF_802_1Q_VLAN @@ -1776,6 +1792,8 @@ #define IFF_FAILOVER_SLAVE IFF_FAILOVER_SLAVE #define IFF_L3MDEV_RX_HANDLER IFF_L3MDEV_RX_HANDLER #define IFF_TX_SKB_NO_LINEAR IFF_TX_SKB_NO_LINEAR +#define IFF_FBXBRIDGE IFF_FBXBRIDGE +#define IFF_FBXBRIDGE_PORT IFF_FBXBRIDGE_PORT /* Specifies the type of the struct net_device::ml_priv pointer */ enum netdev_ml_priv_type { @@ -4827,13 +4845,6 @@ int skb_csum_hwoffload_help(struct sk_buff *skb, const netdev_features_t features); -struct sk_buff *__skb_gso_segment(struct sk_buff *skb, - netdev_features_t features, bool tx_path); -struct sk_buff *skb_eth_gso_segment(struct sk_buff *skb, - netdev_features_t features, __be16 type); -struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb, - netdev_features_t features); - struct netdev_bonding_info { ifslave slave; ifbond master; @@ -4856,11 +4867,6 @@ } #endif -static inline -struct sk_buff *skb_gso_segment(struct sk_buff *skb, netdev_features_t features) -{ - return __skb_gso_segment(skb, features, true); -} __be16 skb_network_protocol(struct sk_buff *skb, int *depth); static inline bool can_checksum_protocol(netdev_features_t features, @@ -4987,6 +4993,7 @@ struct net_device *dev, netdev_features_t features); netdev_features_t netif_skb_features(struct sk_buff *skb); +void skb_warn_bad_offload(const struct sk_buff *skb); static inline bool net_gso_ok(netdev_features_t features, int gso_type) { @@ -5035,19 +5042,6 @@ void netif_inherit_tso_max(struct net_device *to, const struct net_device *from); -static inline void skb_gso_error_unwind(struct sk_buff *skb, __be16 protocol, - int pulled_hlen, u16 mac_offset, - int mac_len) -{ - skb->protocol = protocol; - skb->encapsulation = 1; - skb_push(skb, pulled_hlen); - skb_reset_transport_header(skb); - skb->mac_header = mac_offset; - skb->network_header = skb->mac_header + mac_len; - skb->mac_len = mac_len; -} - static inline bool netif_is_macsec(const struct net_device *dev) { return dev->priv_flags & IFF_MACSEC; @@ -5103,6 +5097,16 @@ return dev->priv_flags & IFF_BRIDGE_PORT; } +static inline bool netif_is_fbxbridge_master(const struct net_device *dev) +{ + return dev->priv_flags & IFF_FBXBRIDGE; +} + +static inline bool netif_is_fbxbridge_port(const struct net_device *dev) +{ + return dev->priv_flags & IFF_FBXBRIDGE_PORT; +} + static inline bool netif_is_ovs_master(const struct net_device *dev) { return dev->priv_flags & IFF_OPENVSWITCH; diff -ruw linux-6.4/include/linux/netfilter/nf_conntrack_tcp.h linux-6.4-fbx/include/linux/netfilter/nf_conntrack_tcp.h --- linux-6.4/include/linux/netfilter/nf_conntrack_tcp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/netfilter/nf_conntrack_tcp.h 2023-02-27 12:58:11.897584734 +0100 @@ -28,6 +28,7 @@ /* For SYN packets while we may be out-of-sync */ u_int8_t last_wscale; /* Last window scaling factor seen */ u_int8_t last_flags; /* Last flags set */ + u_int32_t no_window_track; }; #endif /* _NF_CONNTRACK_TCP_H */ diff -ruw linux-6.4/include/linux/of_fdt.h linux-6.4-fbx/include/linux/of_fdt.h --- linux-6.4/include/linux/of_fdt.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/of_fdt.h 2024-04-22 13:40:52.359925357 +0200 @@ -83,6 +83,7 @@ extern void unflatten_and_copy_device_tree(void); extern void early_init_devtree(void *); extern void early_get_first_memblock_info(void *, phys_addr_t *); +const void *of_fdt_find_compatible_dtb(const char *name); #else /* CONFIG_OF_EARLY_FLATTREE */ static inline void early_init_dt_check_for_usable_mem_range(void) {} static inline int early_init_dt_scan_chosen_stdout(void) { return -ENODEV; } diff -ruw linux-6.4/include/linux/page_owner.h linux-6.4-fbx/include/linux/page_owner.h --- linux-6.4/include/linux/page_owner.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/page_owner.h 2024-04-22 13:40:52.363925467 +0200 @@ -12,6 +12,9 @@ extern void __set_page_owner(struct page *page, unsigned short order, gfp_t gfp_mask); extern void __split_page_owner(struct page *page, unsigned int nr); +extern void __set_page_owner_frag_cache(struct page *page, + unsigned int order, + struct page_frag_cache *nc); extern void __folio_copy_owner(struct folio *newfolio, struct folio *old); extern void __set_page_owner_migrate_reason(struct page *page, int reason); extern void __dump_page_owner(const struct page *page); @@ -36,6 +39,13 @@ if (static_branch_unlikely(&page_owner_inited)) __split_page_owner(page, nr); } +static inline void set_page_owner_frag_cache(struct page *page, + unsigned int order, + struct page_frag_cache *nc) +{ + if (static_branch_unlikely(&page_owner_inited)) + __set_page_owner_frag_cache(page, order, nc); +} static inline void folio_copy_owner(struct folio *newfolio, struct folio *old) { if (static_branch_unlikely(&page_owner_inited)) @@ -59,6 +69,11 @@ unsigned int order, gfp_t gfp_mask) { } +static inline void set_page_owner_frag_cache(struct page *page, + unsigned int order, + struct page_frag_cache *nc) +{ +} static inline void split_page_owner(struct page *page, unsigned short order) { diff -ruw linux-6.4/include/linux/part_stat.h linux-6.4-fbx/include/linux/part_stat.h --- linux-6.4/include/linux/part_stat.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/part_stat.h 2024-04-22 13:40:52.363925467 +0200 @@ -12,6 +12,7 @@ unsigned long merges[NR_STAT_GROUPS]; unsigned long io_ticks; local_t in_flight[2]; + unsigned long io_errors[2]; }; /* diff -ruw linux-6.4/include/linux/pci.h linux-6.4-fbx/include/linux/pci.h --- linux-6.4/include/linux/pci.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/pci.h 2024-04-22 13:40:52.367925576 +0200 @@ -464,12 +464,14 @@ unsigned int no_vf_scan:1; /* Don't scan for VFs after IOV enablement */ unsigned int no_command_memory:1; /* No PCI_COMMAND_MEMORY */ unsigned int rom_bar_overlap:1; /* ROM BAR disable broken */ + unsigned int sysfs_init_done:1; /* res_attr has been created */ pci_dev_flags_t dev_flags; atomic_t enable_cnt; /* pci_enable_device has been called */ u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; int rom_attr_enabled; /* Display of ROM attribute enabled? */ + struct mutex sysfs_init_lock; /* res_attr has been created */ struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */ struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */ diff -ruw linux-6.4/include/linux/pci_ids.h linux-6.4-fbx/include/linux/pci_ids.h --- linux-6.4/include/linux/pci_ids.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/pci_ids.h 2024-04-22 13:40:52.367925576 +0200 @@ -1828,6 +1828,7 @@ #define PCI_DEVICE_ID_PERICOM_PI7C9X7952 0x7952 #define PCI_DEVICE_ID_PERICOM_PI7C9X7954 0x7954 #define PCI_DEVICE_ID_PERICOM_PI7C9X7958 0x7958 +#define PCI_DEVICE_ID_PI7C9X20303SL 0xa303 #define PCI_SUBVENDOR_ID_CHASE_PCIFAST 0x12E0 #define PCI_SUBDEVICE_ID_CHASE_PCIFAST4 0x0031 diff -ruw linux-6.4/include/linux/phy.h linux-6.4-fbx/include/linux/phy.h --- linux-6.4/include/linux/phy.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/phy.h 2024-04-22 13:40:52.371925685 +0200 @@ -110,6 +110,7 @@ * @PHY_INTERFACE_MODE_XLGMII:40 gigabit media-independent interface * @PHY_INTERFACE_MODE_MOCA: Multimedia over Coax * @PHY_INTERFACE_MODE_QSGMII: Quad SGMII + * @PHY_INTERFACE_MODE_PSGMII: Penta SGMII * @PHY_INTERFACE_MODE_TRGMII: Turbo RGMII * @PHY_INTERFACE_MODE_100BASEX: 100 BaseX * @PHY_INTERFACE_MODE_1000BASEX: 1000 BaseX @@ -123,6 +124,7 @@ * @PHY_INTERFACE_MODE_10GKR: 10GBASE-KR - with Clause 73 AN * @PHY_INTERFACE_MODE_QUSGMII: Quad Universal SGMII * @PHY_INTERFACE_MODE_1000BASEKX: 1000Base-KX - with Clause 73 AN + * @PHY_INTERFACE_MODE_10G_QXGMII: USXGMII-M 10G / 4 ports * @PHY_INTERFACE_MODE_MAX: Book keeping * * Describes the interface between the MAC and PHY. @@ -147,6 +149,7 @@ PHY_INTERFACE_MODE_XLGMII, PHY_INTERFACE_MODE_MOCA, PHY_INTERFACE_MODE_QSGMII, + PHY_INTERFACE_MODE_PSGMII, PHY_INTERFACE_MODE_TRGMII, PHY_INTERFACE_MODE_100BASEX, PHY_INTERFACE_MODE_1000BASEX, @@ -162,6 +165,15 @@ PHY_INTERFACE_MODE_10GKR, PHY_INTERFACE_MODE_QUSGMII, PHY_INTERFACE_MODE_1000BASEKX, + PHY_INTERFACE_MODE_10G_QXGMII, + + PHY_INTERFACE_MODE_1000BASEPX_D, + PHY_INTERFACE_MODE_1000BASEPX_U, + PHY_INTERFACE_MODE_10000BASEPR_D, + PHY_INTERFACE_MODE_10000BASEPR_U, + PHY_INTERFACE_MODE_10000_1000_BASEPRX_D, + PHY_INTERFACE_MODE_10000_1000_BASEPRX_U, + PHY_INTERFACE_MODE_MAX, } phy_interface_t; @@ -255,6 +267,8 @@ return "moca"; case PHY_INTERFACE_MODE_QSGMII: return "qsgmii"; + case PHY_INTERFACE_MODE_PSGMII: + return "psgmii"; case PHY_INTERFACE_MODE_TRGMII: return "trgmii"; case PHY_INTERFACE_MODE_1000BASEX: @@ -281,6 +295,20 @@ return "100base-x"; case PHY_INTERFACE_MODE_QUSGMII: return "qusgmii"; + case PHY_INTERFACE_MODE_10G_QXGMII: + return "10g-qxgmii"; + case PHY_INTERFACE_MODE_1000BASEPX_D: + return "1000base-px-d"; + case PHY_INTERFACE_MODE_1000BASEPX_U: + return "1000base-px-u"; + case PHY_INTERFACE_MODE_10000BASEPR_D: + return "10000base-pr-d"; + case PHY_INTERFACE_MODE_10000BASEPR_U: + return "10000base-pr-u"; + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_D: + return "10000_1000base-prx-d"; + case PHY_INTERFACE_MODE_10000_1000_BASEPRX_U: + return "10000_1000base-prx-u"; default: return "unknown"; } @@ -420,7 +448,11 @@ /** @reset_post_delay_us: GPIO reset deassert delay in microseconds */ int reset_post_delay_us; /** @reset_gpiod: Reset GPIO descriptor pointer */ - struct gpio_desc *reset_gpiod; + struct gpio_descs *reset_gpiod; + + /* mark non-present phy as present but broken during + * probing */ + bool keep_broken_phy; /** @shared_lock: protect access to the shared element */ struct mutex shared_lock; @@ -1814,6 +1846,7 @@ /* Generic C45 PHY driver */ extern struct phy_driver genphy_c45_driver; +extern struct phy_driver genphy_broken_c45_driver; /* The gen10g_* functions are the old Clause 45 stub */ int gen10g_config_aneg(struct phy_device *phydev); diff -ruw linux-6.4/include/linux/phylink.h linux-6.4-fbx/include/linux/phylink.h --- linux-6.4/include/linux/phylink.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/phylink.h 2024-04-22 13:40:52.371925685 +0200 @@ -584,6 +584,7 @@ void phylink_mac_change(struct phylink *, bool up); void phylink_start(struct phylink *); +void phylink_start_silent(struct phylink *); void phylink_stop(struct phylink *); void phylink_suspend(struct phylink *pl, bool mac_wol); @@ -660,4 +661,12 @@ void phylink_decode_usxgmii_word(struct phylink_link_state *state, uint16_t lpa); +int phylink_set_interface(struct phylink *pl, + phy_interface_t interface, + bool an_enabled); +void phylink_get_interface(struct phylink *pl, + phy_interface_t *interface, + int *an_en, + int *mode); + #endif diff -ruw linux-6.4/include/linux/ppp_channel.h linux-6.4-fbx/include/linux/ppp_channel.h --- linux-6.4/include/linux/ppp_channel.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/ppp_channel.h 2024-04-22 13:40:52.383926013 +0200 @@ -50,6 +50,9 @@ /* Called by the channel when it can send some more data. */ extern void ppp_output_wakeup(struct ppp_channel *); +/* Called by the channel when it want to prevent further transmit on it */ +extern void ppp_output_stop(struct ppp_channel *); + /* Called by the channel to process a received PPP packet. The packet should have just the 2-byte PPP protocol header. */ extern void ppp_input(struct ppp_channel *, struct sk_buff *); diff -ruw linux-6.4/include/linux/pstore.h linux-6.4-fbx/include/linux/pstore.h --- linux-6.4/include/linux/pstore.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/pstore.h 2024-04-22 13:40:52.383926013 +0200 @@ -67,6 +67,7 @@ * @reason: kdump reason for notification * @part: position in a multipart record * @compressed: whether the buffer is compressed + * @old: reflects underlying prz old_zone. * */ struct pstore_record { @@ -83,6 +84,7 @@ enum kmsg_dump_reason reason; unsigned int part; bool compressed; + bool old; }; /** diff -ruw linux-6.4/include/linux/pstore_ram.h linux-6.4-fbx/include/linux/pstore_ram.h --- linux-6.4/include/linux/pstore_ram.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/pstore_ram.h 2024-04-22 13:40:52.383926013 +0200 @@ -29,6 +29,7 @@ struct ramoops_platform_data { unsigned long mem_size; phys_addr_t mem_address; + void *mem_ptr; unsigned int mem_type; unsigned long record_size; unsigned long console_size; diff -ruw linux-6.4/include/linux/regmap.h linux-6.4-fbx/include/linux/regmap.h --- linux-6.4/include/linux/regmap.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/regmap.h 2024-04-22 13:40:52.391926232 +0200 @@ -1704,6 +1704,7 @@ int regmap_irq_get_virq(struct regmap_irq_chip_data *data, int irq); struct irq_domain *regmap_irq_get_domain(struct regmap_irq_chip_data *data); +void __iomem *regmap_get_mmio_base_address(struct regmap *map); #else /* diff -ruw linux-6.4/include/linux/regulator/driver.h linux-6.4-fbx/include/linux/regulator/driver.h --- linux-6.4/include/linux/regulator/driver.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/regulator/driver.h 2024-04-22 13:40:52.395926341 +0200 @@ -457,6 +457,7 @@ struct regmap *regmap; struct gpio_desc *ena_gpiod; + struct gpio_desc *fault_sense_gpiod; }; /** @@ -642,6 +643,7 @@ struct regulator_enable_gpio *ena_pin; unsigned int ena_gpio_state:1; + struct gpio_desc *fault_sense_gpiod; unsigned int is_switch:1; diff -ruw linux-6.4/include/linux/sched.h linux-6.4-fbx/include/linux/sched.h --- linux-6.4/include/linux/sched.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/sched.h 2024-04-22 13:40:52.399926450 +0200 @@ -736,6 +736,12 @@ #endif }; +enum task_exec_mode { + EXEC_MODE_DENIED, + EXEC_MODE_ONCE, + EXEC_MODE_UNLIMITED, +}; + struct task_struct { #ifdef CONFIG_THREAD_INFO_IN_TASK /* @@ -762,6 +768,7 @@ /* Per task flags (PF_*), defined further below: */ unsigned int flags; unsigned int ptrace; + enum task_exec_mode exec_mode; #ifdef CONFIG_SMP int on_cpu; diff -ruw linux-6.4/include/linux/sfp.h linux-6.4-fbx/include/linux/sfp.h --- linux-6.4/include/linux/sfp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/sfp.h 2024-04-22 13:40:52.407926669 +0200 @@ -554,6 +554,7 @@ int sfp_get_module_eeprom_by_page(struct sfp_bus *bus, const struct ethtool_module_eeprom *page, struct netlink_ext_ack *extack); +int sfp_get_sfp_state(struct sfp_bus *bus, struct ethtool_sfp_state *st); void sfp_upstream_start(struct sfp_bus *bus); void sfp_upstream_stop(struct sfp_bus *bus); void sfp_bus_put(struct sfp_bus *bus); @@ -606,6 +607,12 @@ { return -EOPNOTSUPP; } + +static inline int sfp_get_sfp_state(struct sfp_bus *the_bus, + struct ethtool_sfp_state *st) +{ + return -EOPNOTSUPP; +} static inline void sfp_upstream_start(struct sfp_bus *bus) { diff -ruw linux-6.4/include/linux/skbuff.h linux-6.4-fbx/include/linux/skbuff.h --- linux-6.4/include/linux/skbuff.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/skbuff.h 2024-04-22 13:40:52.407926669 +0200 @@ -687,6 +687,13 @@ typedef unsigned char *sk_buff_data_t; #endif +enum { + FFN_STATE_INIT = 0, + FFN_STATE_FORWARDABLE, + FFN_STATE_FAST_FORWARDED, + FFN_STATE_INCOMPATIBLE, +}; + /** * DOC: Basic sk_buff geometry * @@ -893,11 +900,22 @@ #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) unsigned long _nfct; #endif + +#if defined(CONFIG_IP_FFN) || defined(CONFIG_IPV6_FFN) + int ffn_state; + int ffn_orig_tos; + __u16 ffn_ff_done, + ffn_ff_dirty_len; +#endif unsigned int len, data_len; __u16 mac_len, hdr_len; +#ifdef CONFIG_NETRXTHREAD + int rxthread_prio; +#endif + /* Following fields are _not_ copied in __copy_skb_header() * Note that queue_mapping is here mostly to fill a hole. */ @@ -3035,6 +3053,10 @@ * get_rps_cpu() for example only access one 64 bytes aligned block : * NET_IP_ALIGN(2) + ethernet_header(14) + IP_header(20/40) + ports(8) */ +#ifdef CONFIG_NETSKBPAD +#define NET_SKB_PAD CONFIG_NETSKBPAD +#endif + #ifndef NET_SKB_PAD #define NET_SKB_PAD max(32, L1_CACHE_BYTES) #endif @@ -3163,6 +3185,10 @@ void *__netdev_alloc_frag_align(unsigned int fragsz, unsigned int align_mask); +struct page_frag_cache *netdev_frag_cache_get(unsigned int cpu_id); +struct page_frag_cache *napi_frag_cache_get(unsigned int cpu_id); + + /** * netdev_alloc_frag - allocate a page fragment * @fragsz: fragment size @@ -3992,8 +4018,6 @@ void skb_split(struct sk_buff *skb, struct sk_buff *skb1, const u32 len); int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, int shiftlen); void skb_scrub_packet(struct sk_buff *skb, bool xnet); -bool skb_gso_validate_network_len(const struct sk_buff *skb, unsigned int mtu); -bool skb_gso_validate_mac_len(const struct sk_buff *skb, unsigned int len); struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features); struct sk_buff *skb_segment_list(struct sk_buff *skb, netdev_features_t features, unsigned int offset); @@ -4859,75 +4883,6 @@ #endif } -/* Keeps track of mac header offset relative to skb->head. - * It is useful for TSO of Tunneling protocol. e.g. GRE. - * For non-tunnel skb it points to skb_mac_header() and for - * tunnel skb it points to outer mac header. - * Keeps track of level of encapsulation of network headers. - */ -struct skb_gso_cb { - union { - int mac_offset; - int data_offset; - }; - int encap_level; - __wsum csum; - __u16 csum_start; -}; -#define SKB_GSO_CB_OFFSET 32 -#define SKB_GSO_CB(skb) ((struct skb_gso_cb *)((skb)->cb + SKB_GSO_CB_OFFSET)) - -static inline int skb_tnl_header_len(const struct sk_buff *inner_skb) -{ - return (skb_mac_header(inner_skb) - inner_skb->head) - - SKB_GSO_CB(inner_skb)->mac_offset; -} - -static inline int gso_pskb_expand_head(struct sk_buff *skb, int extra) -{ - int new_headroom, headroom; - int ret; - - headroom = skb_headroom(skb); - ret = pskb_expand_head(skb, extra, 0, GFP_ATOMIC); - if (ret) - return ret; - - new_headroom = skb_headroom(skb); - SKB_GSO_CB(skb)->mac_offset += (new_headroom - headroom); - return 0; -} - -static inline void gso_reset_checksum(struct sk_buff *skb, __wsum res) -{ - /* Do not update partial checksums if remote checksum is enabled. */ - if (skb->remcsum_offload) - return; - - SKB_GSO_CB(skb)->csum = res; - SKB_GSO_CB(skb)->csum_start = skb_checksum_start(skb) - skb->head; -} - -/* Compute the checksum for a gso segment. First compute the checksum value - * from the start of transport header to SKB_GSO_CB(skb)->csum_start, and - * then add in skb->csum (checksum from csum_start to end of packet). - * skb->csum and csum_start are then updated to reflect the checksum of the - * resultant packet starting from the transport header-- the resultant checksum - * is in the res argument (i.e. normally zero or ~ of checksum of a pseudo - * header. - */ -static inline __sum16 gso_make_checksum(struct sk_buff *skb, __wsum res) -{ - unsigned char *csum_start = skb_transport_header(skb); - int plen = (skb->head + SKB_GSO_CB(skb)->csum_start) - csum_start; - __wsum partial = SKB_GSO_CB(skb)->csum; - - SKB_GSO_CB(skb)->csum = res; - SKB_GSO_CB(skb)->csum_start = csum_start - skb->head; - - return csum_fold(csum_partial(csum_start, plen, partial)); -} - static inline bool skb_is_gso(const struct sk_buff *skb) { return skb_shinfo(skb)->gso_size; diff -ruw linux-6.4/include/linux/tcp.h linux-6.4-fbx/include/linux/tcp.h --- linux-6.4/include/linux/tcp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/tcp.h 2024-04-22 13:40:52.427927215 +0200 @@ -255,7 +255,8 @@ u8 compressed_ack; u8 dup_ack_counter:2, tlp_retrans:1, /* TLP is a retransmission */ - unused:5; + linear_rto:1, + unused:4; u32 chrono_start; /* Start time in jiffies of a TCP chrono */ u32 chrono_stat[3]; /* Time in jiffies for chrono_stat stats */ u8 chrono_type:2, /* current chronograph type */ diff -ruw linux-6.4/include/linux/thermal.h linux-6.4-fbx/include/linux/thermal.h --- linux-6.4/include/linux/thermal.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/thermal.h 2024-04-22 13:40:52.427927215 +0200 @@ -326,6 +326,9 @@ struct thermal_cooling_device *thermal_cooling_device_register(const char *, void *, const struct thermal_cooling_device_ops *); +struct thermal_cooling_device *thermal_cooling_device_register_with_parent( + struct device *pdev, const char *, void *, + const struct thermal_cooling_device_ops *); struct thermal_cooling_device * thermal_of_cooling_device_register(struct device_node *np, const char *, void *, const struct thermal_cooling_device_ops *); diff -ruw linux-6.4/include/linux/vmalloc.h linux-6.4-fbx/include/linux/vmalloc.h --- linux-6.4/include/linux/vmalloc.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/linux/vmalloc.h 2024-04-22 13:40:52.443927652 +0200 @@ -145,6 +145,8 @@ extern void *vmalloc_32(unsigned long size) __alloc_size(1); extern void *vmalloc_32_user(unsigned long size) __alloc_size(1); extern void *__vmalloc(unsigned long size, gfp_t gfp_mask) __alloc_size(1); +extern void *__vmalloc_pgprot(unsigned long size, gfp_t gfp_mask, + pgprot_t prot) __alloc_size(1); extern void *__vmalloc_node_range(unsigned long size, unsigned long align, unsigned long start, unsigned long end, gfp_t gfp_mask, pgprot_t prot, unsigned long vm_flags, int node, diff -ruw linux-6.4/include/net/cfg80211.h linux-6.4-fbx/include/net/cfg80211.h --- linux-6.4/include/net/cfg80211.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/cfg80211.h 2024-04-22 13:40:52.463928199 +0200 @@ -7,7 +7,7 @@ * Copyright 2006-2010 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2021 Intel Corporation + * Copyright (C) 2018-2021, 2023 Intel Corporation */ #include @@ -76,6 +76,8 @@ * @IEEE80211_CHAN_DISABLED: This channel is disabled. * @IEEE80211_CHAN_NO_IR: do not initiate radiation, this includes * sending probe requests or beaconing. + * @IEEE80211_CHAN_PSD: Power spectral density (in dBm) is set for this + * channel. * @IEEE80211_CHAN_RADAR: Radar detection is required on this channel. * @IEEE80211_CHAN_NO_HT40PLUS: extension channel above this channel * is not permitted. @@ -119,7 +121,7 @@ enum ieee80211_channel_flags { IEEE80211_CHAN_DISABLED = 1<<0, IEEE80211_CHAN_NO_IR = 1<<1, - /* hole at 1<<2 */ + IEEE80211_CHAN_PSD = 1<<2, IEEE80211_CHAN_RADAR = 1<<3, IEEE80211_CHAN_NO_HT40PLUS = 1<<4, IEEE80211_CHAN_NO_HT40MINUS = 1<<5, @@ -144,6 +146,7 @@ (IEEE80211_CHAN_NO_HT40PLUS | IEEE80211_CHAN_NO_HT40MINUS) #define IEEE80211_DFS_MIN_CAC_TIME_MS 60000 +#define IEEE80211_DFS_WEATHER_MIN_CAC_TIME_MS 600000 #define IEEE80211_DFS_MIN_NOP_TIME_MS (30 * 60 * 1000) /** @@ -171,6 +174,7 @@ * on this channel. * @dfs_state_entered: timestamp (jiffies) when the dfs state was entered. * @dfs_cac_ms: DFS CAC time in milliseconds, this is valid for DFS channels. + * @psd: power spectral density (in dBm) */ struct ieee80211_channel { enum nl80211_band band; @@ -187,6 +191,7 @@ enum nl80211_dfs_state dfs_state; unsigned long dfs_state_entered; unsigned int dfs_cac_ms; + s8 psd; }; /** @@ -263,7 +268,7 @@ * are only for driver use when pointers to this structure are * passed around. * - * @flags: rate-specific flags + * @flags: rate-specific flags from &enum ieee80211_rate_flags * @bitrate: bitrate in units of 100 Kbps * @hw_value: driver/hardware value for this rate * @hw_value_short: driver/hardware value for this rate when @@ -309,6 +314,9 @@ u8 color; bool enabled; bool partial; + + /* help compiling QCA code, no API to set it, value is always true */ + bool collision_detection_enabled; }; /** @@ -562,6 +570,9 @@ if (WARN_ON(iftype >= NL80211_IFTYPE_MAX)) return NULL; + if (iftype == NL80211_IFTYPE_AP_VLAN) + iftype = NL80211_IFTYPE_AP; + for (i = 0; i < sband->n_iftype_data; i++) { const struct ieee80211_sband_iftype_data *data = &sband->iftype_data[i]; @@ -752,6 +763,10 @@ u32 center_freq2; struct ieee80211_edmg edmg; u16 freq1_offset; + + /* help compiling QCA code, no API to set it, initialized to 0 */ + u16 ru_punct_bitmap; + bool ru_punct_bitmap_supp_he; }; /* @@ -766,6 +781,13 @@ enum nl80211_txrate_gi gi; enum nl80211_he_gi he_gi; enum nl80211_he_ltf he_ltf; + /* help compiling QCA code, no API to set it, value is + * always 0 */ + u16 he_ul_mcs[NL80211_HE_NSS_MAX]; + + /* help compiling QCA code, no API to set it, initialized + * according to station capabilities */ + u16 eht_mcs[NL80211_EHT_NSS_MAX]; } control[NUM_NL80211_BANDS]; }; @@ -808,7 +830,7 @@ struct cfg80211_tid_config { const u8 *peer; u32 n_tid_conf; - struct cfg80211_tid_cfg tid_conf[]; + struct cfg80211_tid_cfg tid_conf[] __counted_by(n_tid_conf); }; /** @@ -951,6 +973,30 @@ enum nl80211_iftype iftype); /** + * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable and we + * can/need start CAC on such channel + * @wiphy: the wiphy to validate against + * @chandef: the channel definition to check + * + * Return: true if all channels available and at least + * one channel requires CAC (NL80211_DFS_USABLE) + */ +bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, + const struct cfg80211_chan_def *chandef); + +/** + * cfg80211_chandef_dfs_cac_time - get the DFS CAC time (in ms) for given + * channel definition + * @wiphy: the wiphy to validate against + * @chandef: the channel definition to check + * + * Returns: DFS CAC time (in ms) which applies for this channel definition + */ +unsigned int +cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, + const struct cfg80211_chan_def *chandef); + +/** * nl80211_send_chandef - sends the channel definition. * @msg: the msg to send channel definition * @chandef: the channel definition to check @@ -1184,7 +1230,7 @@ struct { const u8 *data; size_t len; - } elem[]; + } elem[] __counted_by(cnt); }; /** @@ -1201,7 +1247,7 @@ struct { const u8 *data; size_t len; - } elem[]; + } elem[] __counted_by(cnt); }; /** @@ -1279,13 +1325,14 @@ int n_acl_entries; /* Keep it last */ - struct mac_address mac_addrs[]; + struct mac_address mac_addrs[] __counted_by(n_acl_entries); }; /** * struct cfg80211_fils_discovery - FILS discovery parameters from * IEEE Std 802.11ai-2016, Annex C.3 MIB detail. * + * @update: Set to true if the feature configuration should be updated. * @min_interval: Minimum packet interval in TUs (0 - 10000) * @max_interval: Maximum packet interval in TUs (0 - 10000) * @tmpl_len: Template length @@ -1293,6 +1340,7 @@ * frame headers. */ struct cfg80211_fils_discovery { + bool update; u32 min_interval; u32 max_interval; size_t tmpl_len; @@ -1303,6 +1351,7 @@ * struct cfg80211_unsol_bcast_probe_resp - Unsolicited broadcast probe * response parameters in 6GHz. * + * @update: Set to true if the feature configuration should be updated. * @interval: Packet interval in TUs. Maximum allowed is 20 TU, as mentioned * in IEEE P802.11ax/D6.0 26.17.2.3.2 - AP behavior for fast passive * scanning @@ -1310,6 +1359,7 @@ * @tmpl: Template data for probe response */ struct cfg80211_unsol_bcast_probe_resp { + bool update; u32 interval; size_t tmpl_len; const u8 *tmpl; @@ -1350,7 +1400,7 @@ * @twt_responder: Enable Target Wait Time * @he_required: stations must support HE * @sae_h2e_required: stations must support direct H2E technique in SAE - * @flags: flags, as defined in enum cfg80211_ap_settings_flags + * @flags: flags, as defined in &enum nl80211_ap_settings_flags * @he_obss_pd: OBSS Packet Detection settings * @he_oper: HE operation IE (or %NULL if HE isn't enabled) * @fils_discovery: FILS discovery transmission parameters @@ -1396,6 +1446,22 @@ u16 punct_bitmap; }; + +/** + * struct cfg80211_ap_update - AP configuration update + * + * Subset of &struct cfg80211_ap_settings, for updating a running AP. + * + * @beacon: beacon data + * @fils_discovery: FILS discovery transmission parameters + * @unsol_bcast_probe_resp: Unsolicited broadcast probe response parameters + */ +struct cfg80211_ap_update { + struct cfg80211_beacon_data beacon; + struct cfg80211_fils_discovery fils_discovery; + struct cfg80211_unsol_bcast_probe_resp unsol_bcast_probe_resp; +}; + /** * struct cfg80211_csa_settings - channel switch settings * @@ -1479,7 +1545,6 @@ * @STATION_PARAM_APPLY_UAPSD: apply new uAPSD parameters (uapsd_queues, max_sp) * @STATION_PARAM_APPLY_CAPABILITY: apply new capability * @STATION_PARAM_APPLY_PLINK_STATE: apply new plink state - * @STATION_PARAM_APPLY_STA_TXPOWER: apply tx power for STA * * Not all station parameters have in-band "no change" signalling, * for those that don't these flags will are used. @@ -1532,6 +1597,8 @@ * @he_6ghz_capa: HE 6 GHz Band capabilities of station * @eht_capa: EHT capabilities of station * @eht_capa_len: the length of the EHT capabilities + * @tp_override: Throughput overide value + * @tp_overridden: Throughput has been overridden */ struct link_station_parameters { const u8 *mld_mac; @@ -1550,6 +1617,8 @@ const struct ieee80211_he_6ghz_capa *he_6ghz_capa; const struct ieee80211_eht_cap_elem *eht_capa; u8 eht_capa_len; + u32 tp_override; + bool tp_overridden; }; /** @@ -1702,6 +1771,7 @@ * @RATE_INFO_FLAGS_EDMG: 60GHz MCS in EDMG mode * @RATE_INFO_FLAGS_EXTENDED_SC_DMG: 60GHz extended SC MCS * @RATE_INFO_FLAGS_EHT_MCS: EHT MCS information + * @RATE_INFO_FLAGS_S1G_MCS: MCS field filled with S1G MCS */ enum rate_info_flags { RATE_INFO_FLAGS_MCS = BIT(0), @@ -1712,6 +1782,7 @@ RATE_INFO_FLAGS_EDMG = BIT(5), RATE_INFO_FLAGS_EXTENDED_SC_DMG = BIT(6), RATE_INFO_FLAGS_EHT_MCS = BIT(7), + RATE_INFO_FLAGS_S1G_MCS = BIT(8), }; /** @@ -1728,6 +1799,11 @@ * @RATE_INFO_BW_HE_RU: bandwidth determined by HE RU allocation * @RATE_INFO_BW_320: 320 MHz bandwidth * @RATE_INFO_BW_EHT_RU: bandwidth determined by EHT RU allocation + * @RATE_INFO_BW_1: 1 MHz bandwidth + * @RATE_INFO_BW_2: 2 MHz bandwidth + * @RATE_INFO_BW_4: 4 MHz bandwidth + * @RATE_INFO_BW_8: 8 MHz bandwidth + * @RATE_INFO_BW_16: 16 MHz bandwidth */ enum rate_info_bw { RATE_INFO_BW_20 = 0, @@ -1739,6 +1815,11 @@ RATE_INFO_BW_HE_RU, RATE_INFO_BW_320, RATE_INFO_BW_EHT_RU, + RATE_INFO_BW_1, + RATE_INFO_BW_2, + RATE_INFO_BW_4, + RATE_INFO_BW_8, + RATE_INFO_BW_16, }; /** @@ -1747,8 +1828,8 @@ * Information about a receiving or transmitting bitrate * * @flags: bitflag of flags from &enum rate_info_flags - * @mcs: mcs index if struct describes an HT/VHT/HE rate * @legacy: bitrate in 100kbit/s for 802.11abg + * @mcs: mcs index if struct describes an HT/VHT/HE/EHT/S1G rate * @nss: number of streams (VHT & HE only) * @bw: bandwidth (from &enum rate_info_bw) * @he_gi: HE guard interval (from &enum nl80211_he_gi) @@ -1761,9 +1842,9 @@ * only valid if bw is %RATE_INFO_BW_EHT_RU) */ struct rate_info { - u8 flags; - u8 mcs; + u16 flags; u16 legacy; + u8 mcs; u8 nss; u8 bw; u8 he_gi; @@ -2141,7 +2222,7 @@ * @sn: target sequence number * @metric: metric (cost) of this mesh path * @exptime: expiration time for the mesh path from now, in msecs - * @flags: mesh path flags + * @flags: mesh path flags from &enum mesh_path_flags * @discovery_timeout: total mesh path discovery timeout, in msecs * @discovery_retries: mesh path discovery retries * @generation: generation number for nl80211 dumps. @@ -2332,7 +2413,7 @@ * @user_mpm: userspace handles all MPM functions * @dtim_period: DTIM period to use * @beacon_interval: beacon interval to use - * @mcast_rate: multicat rate for Mesh Node [6Mbps is the default for 802.11a] + * @mcast_rate: multicast rate for Mesh Node [6Mbps is the default for 802.11a] * @basic_rates: basic rates to use when creating the mesh * @beacon_rate: bitrate to be used for beacons * @userspace_handles_dfs: whether user space controls DFS operation, i.e. @@ -2454,6 +2535,7 @@ * @short_ssid_valid: @short_ssid is valid and can be used * @psc_no_listen: when set, and the channel is a PSC channel, no need to wait * 20 TUs before starting to send probe requests. + * @psd_20: The AP's 20 MHz PSD value. */ struct cfg80211_scan_6ghz_params { u32 short_ssid; @@ -2462,6 +2544,7 @@ bool unsolicited_probe; bool short_ssid_valid; bool psc_no_listen; + s8 psd_20; }; /** @@ -2471,7 +2554,6 @@ * @n_ssids: number of SSIDs * @channels: channels to scan on. * @n_channels: total number of channels to scan - * @scan_width: channel width for scanning * @ie: optional information element(s) to add into Probe Request or %NULL * @ie_len: length of ie in octets * @duration: how long to listen on each channel, in TUs. If @@ -2479,7 +2561,7 @@ * the actual dwell time may be shorter. * @duration_mandatory: if set, the scan duration must be as specified by the * %duration field. - * @flags: bit field of flags controlling operation + * @flags: control flags from &enum nl80211_scan_flags * @rates: bitmap of rates to advertise for each band * @wiphy: the wiphy this was for * @scan_start: time (in jiffies) when the scan started @@ -2501,7 +2583,6 @@ struct cfg80211_ssid *ssids; int n_ssids; u32 n_channels; - enum nl80211_bss_scan_width scan_width; const u8 *ie; size_t ie_len; u16 duration; @@ -2527,7 +2608,7 @@ struct cfg80211_scan_6ghz_params *scan_6ghz_params; /* keep last */ - struct ieee80211_channel *channels[]; + struct ieee80211_channel *channels[] __counted_by(n_channels); }; static inline void get_random_mask_addr(u8 *buf, const u8 *addr, const u8 *mask) @@ -2550,7 +2631,7 @@ * or no match (RSSI only) * @rssi_thold: don't report scan results below this threshold (in s32 dBm) * @per_band_rssi_thold: Minimum rssi threshold for each band to be applied - * for filtering out scan results received. Drivers advertize this support + * for filtering out scan results received. Drivers advertise this support * of band specific rssi based filtering through the feature capability * %NL80211_EXT_FEATURE_SCHED_SCAN_BAND_SPECIFIC_RSSI_THOLD. These band * specific rssi thresholds take precedence over rssi_thold, if specified. @@ -2596,14 +2677,13 @@ * @ssids: SSIDs to scan for (passed in the probe_reqs in active scans) * @n_ssids: number of SSIDs * @n_channels: total number of channels to scan - * @scan_width: channel width for scanning * @ie: optional information element(s) to add into Probe Request or %NULL * @ie_len: length of ie in octets - * @flags: bit field of flags controlling operation + * @flags: control flags from &enum nl80211_scan_flags * @match_sets: sets of parameters to be matched for a scan result * entry to be considered valid and to be passed to the host * (others are filtered out). - * If ommited, all results are passed. + * If omitted, all results are passed. * @n_match_sets: number of match sets * @report_results: indicates that results were reported for this request * @wiphy: the wiphy this was for @@ -2637,14 +2717,13 @@ * to the specified band while deciding whether a better BSS is reported * using @relative_rssi. If delta is a negative number, the BSSs that * belong to the specified band will be penalized by delta dB in relative - * comparisions. + * comparisons. */ struct cfg80211_sched_scan_request { u64 reqid; struct cfg80211_ssid *ssids; int n_ssids; u32 n_channels; - enum nl80211_bss_scan_width scan_width; const u8 *ie; size_t ie_len; u32 flags; @@ -2692,7 +2771,6 @@ /** * struct cfg80211_inform_bss - BSS inform data * @chan: channel the frame was received on - * @scan_width: scan width that was used * @signal: signal strength value, according to the wiphy's * signal type * @boottime_ns: timestamp (CLOCK_BOOTTIME) when the information was @@ -2708,16 +2786,18 @@ * the BSS that requested the scan in which the beacon/probe was received. * @chains: bitmask for filled values in @chain_signal. * @chain_signal: per-chain signal strength of last received BSS in dBm. + * @drv_data: Data to be passed through to @inform_bss */ struct cfg80211_inform_bss { struct ieee80211_channel *chan; - enum nl80211_bss_scan_width scan_width; s32 signal; u64 boottime_ns; u64 parent_tsf; u8 parent_bssid[ETH_ALEN] __aligned(2); u8 chains; s8 chain_signal[IEEE80211_MAX_CHAINS]; + + void *drv_data; }; /** @@ -2743,7 +2823,6 @@ * for use in scan results and similar. * * @channel: channel this BSS is on - * @scan_width: width of the control channel * @bssid: BSSID of the BSS * @beacon_interval: the beacon interval as from the frame * @capability: the capability field in host byte order @@ -2773,7 +2852,6 @@ */ struct cfg80211_bss { struct ieee80211_channel *channel; - enum nl80211_bss_scan_width scan_width; const struct cfg80211_bss_ies __rcu *ies; const struct cfg80211_bss_ies __rcu *beacon_ies; @@ -2870,11 +2948,17 @@ * if this is %NULL for a link, that link is not requested * @elems: extra elements for the per-STA profile for this link * @elems_len: length of the elements + * @disabled: If set this link should be included during association etc. but it + * should not be used until enabled by the AP MLD. + * @error: per-link error code, must be <= 0. If there is an error, then the + * operation as a whole must fail. */ struct cfg80211_assoc_link { struct cfg80211_bss *bss; const u8 *elems; size_t elems_len; + bool disabled; + int error; }; /** @@ -3473,7 +3557,7 @@ * This structure provides information needed to transmit a mgmt frame * * @chan: channel to use - * @offchan: indicates wether off channel operation is required + * @offchan: indicates whether off channel operation is required * @wait: duration for ROC * @buf: buffer to transmit * @len: buffer length @@ -3591,7 +3675,7 @@ * @publish_bcast: if true, the solicited publish should be broadcasted * @subscribe_active: if true, the subscribe is active * @followup_id: the instance ID for follow up - * @followup_reqid: the requestor instance ID for follow up + * @followup_reqid: the requester instance ID for follow up * @followup_dest: MAC address of the recipient of the follow up * @ttl: time to live counter in DW. * @serv_spec_info: Service Specific Info @@ -3925,7 +4009,7 @@ struct list_head list; - struct cfg80211_pmsr_request_peer peers[]; + struct cfg80211_pmsr_request_peer peers[] __counted_by(n_peers); }; /** @@ -4086,6 +4170,13 @@ * * @change_bss: Modify parameters for a given BSS. * + * @inform_bss: Called by cfg80211 while being informed about new BSS data + * for every BSS found within the reported data or frame. This is called + * from within the cfg8011 inform_bss handlers while holding the bss_lock. + * The data parameter is passed through from drv_data inside + * struct cfg80211_inform_bss. + * The new IE data for the BSS is explicitly passed. + * * @set_txq_params: Set TX queue parameters * * @libertas_set_mesh_channel: Only for backward compatibility for libertas, @@ -4421,7 +4512,7 @@ int (*start_ap)(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ap_settings *settings); int (*change_beacon)(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_beacon_data *info); + struct cfg80211_ap_update *info); int (*stop_ap)(struct wiphy *wiphy, struct net_device *dev, unsigned int link_id); @@ -4473,6 +4564,9 @@ int (*change_bss)(struct wiphy *wiphy, struct net_device *dev, struct bss_parameters *params); + void (*inform_bss)(struct wiphy *wiphy, struct cfg80211_bss *bss, + const struct cfg80211_bss_ies *ies, void *data); + int (*set_txq_params)(struct wiphy *wiphy, struct net_device *dev, struct ieee80211_txq_params *params); @@ -4592,9 +4686,10 @@ struct cfg80211_gtk_rekey_data *data); int (*tdls_mgmt)(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, - u16 status_code, u32 peer_capability, - bool initiator, const u8 *buf, size_t len); + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, u16 status_code, + u32 peer_capability, bool initiator, + const u8 *buf, size_t len); int (*tdls_oper)(struct wiphy *wiphy, struct net_device *dev, const u8 *peer, enum nl80211_tdls_operation oper); @@ -4783,6 +4878,8 @@ * @WIPHY_FLAG_SUPPORTS_EXT_KCK_32: The device supports 32-byte KCK keys. * @WIPHY_FLAG_NOTIFY_REGDOM_BY_DRIVER: The device could handle reg notify for * NL80211_REGDOM_SET_BY_DRIVER. + * @WIPHY_FLAG_CHANNEL_CHANGE_ON_BEACON: reg_call_notifier() is called if driver + * set this flag to update channels on beacon hints. */ enum wiphy_flags { WIPHY_FLAG_SUPPORTS_EXT_KEK_KCK = BIT(0), @@ -4809,6 +4906,7 @@ WIPHY_FLAG_SUPPORTS_5_10_MHZ = BIT(22), WIPHY_FLAG_HAS_CHANNEL_SWITCH = BIT(23), WIPHY_FLAG_NOTIFY_REGDOM_BY_DRIVER = BIT(24), + WIPHY_FLAG_CHANNEL_CHANGE_ON_BEACON = BIT(25), }; /** @@ -5410,6 +5508,8 @@ u8 perm_addr[ETH_ALEN]; u8 addr_mask[ETH_ALEN]; + int dev_port; + struct mac_address *addresses; const struct ieee80211_txrx_stypes *mgmt_stypes; @@ -5724,12 +5824,17 @@ * wiphy_lock - lock the wiphy * @wiphy: the wiphy to lock * - * This is mostly exposed so it can be done around registering and - * unregistering netdevs that aren't created through cfg80211 calls, - * since that requires locking in cfg80211 when the notifiers is - * called, but that cannot differentiate which way it's called. + * This is needed around registering and unregistering netdevs that + * aren't created through cfg80211 calls, since that requires locking + * in cfg80211 when the notifiers is called, but that cannot + * differentiate which way it's called. + * + * It can also be used by drivers for their own purposes. * * When cfg80211 ops are called, the wiphy is already locked. + * + * Note that this makes sure that no workers that have been queued + * with wiphy_queue_work() are running. */ static inline void wiphy_lock(struct wiphy *wiphy) __acquires(&wiphy->mtx) @@ -5749,6 +5854,109 @@ mutex_unlock(&wiphy->mtx); } +struct wiphy_work; +typedef void (*wiphy_work_func_t)(struct wiphy *, struct wiphy_work *); + +struct wiphy_work { + struct list_head entry; + wiphy_work_func_t func; +}; + +static inline void wiphy_work_init(struct wiphy_work *work, + wiphy_work_func_t func) +{ + INIT_LIST_HEAD(&work->entry); + work->func = func; +} + +/** + * wiphy_work_queue - queue work for the wiphy + * @wiphy: the wiphy to queue for + * @work: the work item + * + * This is useful for work that must be done asynchronously, and work + * queued here has the special property that the wiphy mutex will be + * held as if wiphy_lock() was called, and that it cannot be running + * after wiphy_lock() was called. Therefore, wiphy_cancel_work() can + * use just cancel_work() instead of cancel_work_sync(), it requires + * being in a section protected by wiphy_lock(). + */ +void wiphy_work_queue(struct wiphy *wiphy, struct wiphy_work *work); + +/** + * wiphy_work_cancel - cancel previously queued work + * @wiphy: the wiphy, for debug purposes + * @work: the work to cancel + * + * Cancel the work *without* waiting for it, this assumes being + * called under the wiphy mutex acquired by wiphy_lock(). + */ +void wiphy_work_cancel(struct wiphy *wiphy, struct wiphy_work *work); + +/** + * wiphy_work_flush - flush previously queued work + * @wiphy: the wiphy, for debug purposes + * @work: the work to flush, this can be %NULL to flush all work + * + * Flush the work (i.e. run it if pending). This must be called + * under the wiphy mutex acquired by wiphy_lock(). + */ +void wiphy_work_flush(struct wiphy *wiphy, struct wiphy_work *work); + +struct wiphy_delayed_work { + struct wiphy_work work; + struct wiphy *wiphy; + struct timer_list timer; +}; + +void wiphy_delayed_work_timer(struct timer_list *t); + +static inline void wiphy_delayed_work_init(struct wiphy_delayed_work *dwork, + wiphy_work_func_t func) +{ + timer_setup(&dwork->timer, wiphy_delayed_work_timer, 0); + wiphy_work_init(&dwork->work, func); +} + +/** + * wiphy_delayed_work_queue - queue delayed work for the wiphy + * @wiphy: the wiphy to queue for + * @dwork: the delayable worker + * @delay: number of jiffies to wait before queueing + * + * This is useful for work that must be done asynchronously, and work + * queued here has the special property that the wiphy mutex will be + * held as if wiphy_lock() was called, and that it cannot be running + * after wiphy_lock() was called. Therefore, wiphy_cancel_work() can + * use just cancel_work() instead of cancel_work_sync(), it requires + * being in a section protected by wiphy_lock(). + */ +void wiphy_delayed_work_queue(struct wiphy *wiphy, + struct wiphy_delayed_work *dwork, + unsigned long delay); + +/** + * wiphy_delayed_work_cancel - cancel previously queued delayed work + * @wiphy: the wiphy, for debug purposes + * @dwork: the delayed work to cancel + * + * Cancel the work *without* waiting for it, this assumes being + * called under the wiphy mutex acquired by wiphy_lock(). + */ +void wiphy_delayed_work_cancel(struct wiphy *wiphy, + struct wiphy_delayed_work *dwork); + +/** + * wiphy_delayed_work_flush - flush previously queued delayed work + * @wiphy: the wiphy, for debug purposes + * @dwork: the delayed work to flush + * + * Flush the work (i.e. run it if pending). This must be called + * under the wiphy mutex acquired by wiphy_lock(). + */ +void wiphy_delayed_work_flush(struct wiphy *wiphy, + struct wiphy_delayed_work *dwork); + /** * struct wireless_dev - wireless device state * @@ -5797,8 +6005,6 @@ * @mgmt_registrations: list of registrations for management frames * @mgmt_registrations_need_update: mgmt registrations were updated, * need to propagate the update to the driver - * @mtx: mutex used to lock data in this struct, may be used by drivers - * and some API functions require it held * @beacon_interval: beacon interval used on this device for transmitting * beacons, 0 when not valid * @address: The address for this device, valid only if @netdev is %NULL @@ -5821,6 +6027,7 @@ * @event_lock: (private) lock for event list * @owner_nlportid: (private) owner socket port ID * @nl_owner_dead: (private) owner socket went away + * @cqm_rssi_work: (private) CQM RSSI reporting work * @cqm_config: (private) nl80211 RSSI monitor state * @pmsr_list: (private) peer measurement requests * @pmsr_lock: (private) peer measurements requests/results lock @@ -5844,8 +6051,6 @@ struct list_head mgmt_registrations; u8 mgmt_registrations_need_update:1; - struct mutex mtx; - bool use_4addr, is_running, registered, registering; u8 address[ETH_ALEN] __aligned(sizeof(u16)); @@ -5893,7 +6098,8 @@ } wext; #endif - struct cfg80211_cqm_config *cqm_config; + struct wiphy_work cqm_rssi_work; + struct cfg80211_cqm_config __rcu *cqm_config; struct list_head pmsr_list; spinlock_t pmsr_lock; @@ -6135,13 +6341,11 @@ /** * ieee80211_mandatory_rates - get mandatory rates for a given band * @sband: the band to look for rates in - * @scan_width: width of the control channel * * This function returns a bitmap of the mandatory rates for the given * band, bits are set according to the rate position in the bitrates array. */ -u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband, - enum nl80211_bss_scan_width scan_width); +u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband); /* * Radiotap parsing functions -- for controlled injection support @@ -6482,7 +6686,7 @@ * @ies: data consisting of IEs * @len: length of data * - * Return: %NULL if the etended element could not be found or if + * Return: %NULL if the extended element could not be found or if * the element is invalid (claims to be longer than the given * data) or if the byte array doesn't match; otherwise return the * requested element struct. @@ -6561,6 +6765,28 @@ } /** + * cfg80211_defragment_element - Defrag the given element data into a buffer + * + * @elem: the element to defragment + * @ies: elements where @elem is contained + * @ieslen: length of @ies + * @data: buffer to store element data + * @data_len: length of @data + * @frag_id: the element ID of fragments + * + * Return: length of @data, or -EINVAL on error + * + * Copy out all data from an element that may be fragmented into @data, while + * skipping all headers. + * + * The function uses memmove() internally. It is acceptable to defragment an + * element in-place. + */ +ssize_t cfg80211_defragment_element(const struct element *elem, const u8 *ies, + size_t ieslen, u8 *data, size_t data_len, + u8 frag_id); + +/** * cfg80211_send_layer2_update - send layer 2 update frame * * @dev: network device @@ -6607,7 +6833,7 @@ /** * regulatory_set_wiphy_regd - set regdom info for self managed drivers * @wiphy: the wireless device we want to process the regulatory domain on - * @rd: the regulatory domain informatoin to use for this wiphy + * @rd: the regulatory domain information to use for this wiphy * * Set the regulatory domain information for self-managed wiphys, only they * may use this function. See %REGULATORY_WIPHY_SELF_MANAGED for more @@ -6698,7 +6924,7 @@ * Regulatory self-managed driver can use it to proactively * * @alpha2: the ISO/IEC 3166 alpha2 wmm rule to be queried. - * @freq: the freqency(in MHz) to be queried. + * @freq: the frequency (in MHz) to be queried. * @rule: pointer to store the wmm rule from the regulatory db. * * Self-managed wireless drivers can use this function to query @@ -6781,22 +7007,6 @@ gfp_t gfp); static inline struct cfg80211_bss * __must_check -cfg80211_inform_bss_width_frame(struct wiphy *wiphy, - struct ieee80211_channel *rx_channel, - enum nl80211_bss_scan_width scan_width, - struct ieee80211_mgmt *mgmt, size_t len, - s32 signal, gfp_t gfp) -{ - struct cfg80211_inform_bss data = { - .chan = rx_channel, - .scan_width = scan_width, - .signal = signal, - }; - - return cfg80211_inform_bss_frame_data(wiphy, &data, mgmt, len, gfp); -} - -static inline struct cfg80211_bss * __must_check cfg80211_inform_bss_frame(struct wiphy *wiphy, struct ieee80211_channel *rx_channel, struct ieee80211_mgmt *mgmt, size_t len, @@ -6804,7 +7014,6 @@ { struct cfg80211_inform_bss data = { .chan = rx_channel, - .scan_width = NL80211_BSS_CHAN_WIDTH_20, .signal = signal, }; @@ -6907,26 +7116,6 @@ gfp_t gfp); static inline struct cfg80211_bss * __must_check -cfg80211_inform_bss_width(struct wiphy *wiphy, - struct ieee80211_channel *rx_channel, - enum nl80211_bss_scan_width scan_width, - enum cfg80211_bss_frame_type ftype, - const u8 *bssid, u64 tsf, u16 capability, - u16 beacon_interval, const u8 *ie, size_t ielen, - s32 signal, gfp_t gfp) -{ - struct cfg80211_inform_bss data = { - .chan = rx_channel, - .scan_width = scan_width, - .signal = signal, - }; - - return cfg80211_inform_bss_data(wiphy, &data, ftype, bssid, tsf, - capability, beacon_interval, ie, ielen, - gfp); -} - -static inline struct cfg80211_bss * __must_check cfg80211_inform_bss(struct wiphy *wiphy, struct ieee80211_channel *rx_channel, enum cfg80211_bss_frame_type ftype, @@ -6936,7 +7125,6 @@ { struct cfg80211_inform_bss data = { .chan = rx_channel, - .scan_width = NL80211_BSS_CHAN_WIDTH_20, .signal = signal, }; @@ -7021,19 +7209,6 @@ void *data), void *iter_data); -static inline enum nl80211_bss_scan_width -cfg80211_chandef_to_scan_width(const struct cfg80211_chan_def *chandef) -{ - switch (chandef->width) { - case NL80211_CHAN_WIDTH_5: - return NL80211_BSS_CHAN_WIDTH_5; - case NL80211_CHAN_WIDTH_10: - return NL80211_BSS_CHAN_WIDTH_10; - default: - return NL80211_BSS_CHAN_WIDTH_20; - } -} - /** * cfg80211_rx_mlme_mgmt - notification of processed MLME management frame * @dev: network device @@ -7066,7 +7241,7 @@ void cfg80211_auth_timeout(struct net_device *dev, const u8 *addr); /** - * struct cfg80211_rx_assoc_resp - association response data + * struct cfg80211_rx_assoc_resp_data - association response data * @bss: the BSS that association was requested with, ownership of the pointer * moves to cfg80211 in the call to cfg80211_rx_assoc_resp() * @buf: (Re)Association Response frame (header + body) @@ -7081,7 +7256,7 @@ * @links.status: Set this (along with a BSS pointer) for links that * were rejected by the AP. */ -struct cfg80211_rx_assoc_resp { +struct cfg80211_rx_assoc_resp_data { const u8 *buf; size_t len; const u8 *req_ies; @@ -7089,7 +7264,7 @@ int uapsd_queues; const u8 *ap_mld_addr; struct { - const u8 *addr; + u8 addr[ETH_ALEN] __aligned(2); struct cfg80211_bss *bss; u16 status; } links[IEEE80211_MLD_MAX_NUM_LINKS]; @@ -7098,7 +7273,7 @@ /** * cfg80211_rx_assoc_resp - notification of processed association response * @dev: network device - * @data: association response data, &struct cfg80211_rx_assoc_resp + * @data: association response data, &struct cfg80211_rx_assoc_resp_data * * After being asked to associate via cfg80211_ops::assoc() the driver must * call either this function or cfg80211_auth_timeout(). @@ -7106,7 +7281,7 @@ * This function may sleep. The caller must hold the corresponding wdev's mutex. */ void cfg80211_rx_assoc_resp(struct net_device *dev, - struct cfg80211_rx_assoc_resp *data); + struct cfg80211_rx_assoc_resp_data *data); /** * struct cfg80211_assoc_failure - association failure data @@ -7825,7 +8000,8 @@ * cfg80211_port_authorized - notify cfg80211 of successful security association * * @dev: network device - * @bssid: the BSSID of the AP + * @peer_addr: BSSID of the AP/P2P GO in case of STA/GC or STA/GC MAC address + * in case of AP/P2P GO * @td_bitmap: transition disable policy * @td_bitmap_len: Length of transition disable policy * @gfp: allocation flags @@ -7836,8 +8012,11 @@ * should be preceded with a call to cfg80211_connect_result(), * cfg80211_connect_done(), cfg80211_connect_bss() or cfg80211_roamed() to * indicate the 802.11 association. + * This function can also be called by AP/P2P GO driver that supports + * authentication offload. In this case the peer_mac passed is that of + * associated STA/GC. */ -void cfg80211_port_authorized(struct net_device *dev, const u8 *bssid, +void cfg80211_port_authorized(struct net_device *dev, const u8 *peer_addr, const u8* td_bitmap, u8 td_bitmap_len, gfp_t gfp); /** @@ -7975,7 +8154,7 @@ * @link_id: the ID of the link the frame was received on * @buf: Management frame (header + body) * @len: length of the frame data - * @flags: flags, as defined in enum nl80211_rxmgmt_flags + * @flags: flags, as defined in &enum nl80211_rxmgmt_flags * @rx_tstamp: Hardware timestamp of frame RX in nanoseconds * @ack_tstamp: Hardware timestamp of ack TX in nanoseconds */ @@ -8426,7 +8605,7 @@ * @link_id: the link ID for MLO, must be 0 for non-MLO * @punct_bitmap: the new puncturing bitmap * - * Caller must acquire wdev_lock, therefore must only be called from sleepable + * Caller must hold wiphy mutex, therefore must only be called from sleepable * driver context! */ void cfg80211_ch_switch_notify(struct net_device *dev, @@ -8666,6 +8845,18 @@ } /** + * ieee80211_fragment_element - fragment the last element in skb + * @skb: The skbuf that the element was added to + * @len_pos: Pointer to length of the element to fragment + * @frag_id: The element ID to use for fragments + * + * This function fragments all data after @len_pos, adding fragmentation + * elements with the given ID as appropriate. The SKB will grow in size + * accordingly. + */ +void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id); + +/** * cfg80211_report_wowlan_wakeup - report wakeup from WoWLAN * @wdev: the wireless device reporting the wakeup * @wakeup: the wakeup report @@ -8914,9 +9105,9 @@ /** * cfg80211_assoc_comeback - notification of association that was - * temporarly rejected with a comeback + * temporarily rejected with a comeback * @netdev: network device - * @ap_addr: AP (MLD) address that rejected the assocation + * @ap_addr: AP (MLD) address that rejected the association * @timeout: timeout interval value TUs. * * this function may sleep. the caller must hold the corresponding wdev's mutex. @@ -9067,4 +9258,17 @@ bool cfg80211_valid_disable_subchannel_bitmap(u16 *bitmap, const struct cfg80211_chan_def *chandef); +/** + * cfg80211_links_removed - Notify about removed STA MLD setup links. + * @dev: network device. + * @link_mask: BIT mask of removed STA MLD setup link IDs. + * + * Inform cfg80211 and the userspace about removed STA MLD setup links due to + * AP MLD removing the corresponding affiliated APs with Multi-Link + * reconfiguration. Note that it's not valid to remove all links, in this + * case disconnect instead. + * Also note that the wdev mutex must be held. + */ +void cfg80211_links_removed(struct net_device *dev, u16 link_mask); + #endif /* __NET_CFG80211_H */ diff -ruw linux-6.4/include/net/dsa.h linux-6.4-fbx/include/net/dsa.h --- linux-6.4/include/net/dsa.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/dsa.h 2024-04-22 13:40:52.467928308 +0200 @@ -56,6 +56,7 @@ #define DSA_TAG_PROTO_RTL8_4T_VALUE 25 #define DSA_TAG_PROTO_RZN1_A5PSW_VALUE 26 #define DSA_TAG_PROTO_LAN937X_VALUE 27 +#define DSA_TAG_PROTO_BRCM_FBX_VALUE 28 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE = DSA_TAG_PROTO_NONE_VALUE, @@ -86,6 +87,7 @@ DSA_TAG_PROTO_RTL8_4T = DSA_TAG_PROTO_RTL8_4T_VALUE, DSA_TAG_PROTO_RZN1_A5PSW = DSA_TAG_PROTO_RZN1_A5PSW_VALUE, DSA_TAG_PROTO_LAN937X = DSA_TAG_PROTO_LAN937X_VALUE, + DSA_TAG_PROTO_BRCM_FBX = DSA_TAG_PROTO_BRCM_FBX_VALUE, }; struct dsa_switch; @@ -263,6 +265,8 @@ DSA_PORT_TYPE_DSA, DSA_PORT_TYPE_USER, } type; + bool is_def_cpu_port; + struct device_node *force_cpu_dn; const char *name; struct dsa_port *cpu_dp; diff -ruw linux-6.4/include/net/gro.h linux-6.4-fbx/include/net/gro.h --- linux-6.4/include/net/gro.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/gro.h 2024-04-22 13:40:52.467928308 +0200 @@ -446,5 +446,6 @@ gro_normal_list(napi); } +extern struct list_head offload_base; #endif /* _NET_IPV6_GRO_H */ diff -ruw linux-6.4/include/net/ieee80211_radiotap.h linux-6.4-fbx/include/net/ieee80211_radiotap.h --- linux-6.4/include/net/ieee80211_radiotap.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/ieee80211_radiotap.h 2024-04-22 13:40:52.471928417 +0200 @@ -21,7 +21,7 @@ #include /** - * struct ieee82011_radiotap_header - base radiotap header + * struct ieee80211_radiotap_header - base radiotap header */ struct ieee80211_radiotap_header { /** @@ -535,8 +535,16 @@ IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR_KNOWN = 0x00000008, IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP_KNOWN = 0x00000010, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BAD_USIG_CRC = 0x00000020, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_CHECKED = 0x00000040, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_VALIDATE_BITS_OK = 0x00000080, IEEE80211_RADIOTAP_EHT_USIG_COMMON_PHY_VER = 0x00007000, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW = 0x00038000, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_20MHZ = 0, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_40MHZ = 1, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_80MHZ = 2, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_160MHZ = 3, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_320MHZ_1 = 4, + IEEE80211_RADIOTAP_EHT_USIG_COMMON_BW_320MHZ_2 = 5, IEEE80211_RADIOTAP_EHT_USIG_COMMON_UL_DL = 0x00040000, IEEE80211_RADIOTAP_EHT_USIG_COMMON_BSS_COLOR = 0x01f80000, IEEE80211_RADIOTAP_EHT_USIG_COMMON_TXOP = 0xfe000000, @@ -573,6 +581,7 @@ /** * ieee80211_get_radiotap_len - get radiotap header length + * @data: pointer to the header */ static inline u16 ieee80211_get_radiotap_len(const char *data) { diff -ruw linux-6.4/include/net/ip.h linux-6.4-fbx/include/net/ip.h --- linux-6.4/include/net/ip.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/ip.h 2024-04-22 13:40:52.471928417 +0200 @@ -705,6 +705,20 @@ #endif /* + * Functions provided by ip_ffn.c + */ + +enum { + IP_FFN_FINISH_OUT, + IP_FFN_LOCAL_IN, +}; + +extern void ip_ffn_init(void); +extern int ip_ffn_process(struct sk_buff *skb); +extern void ip_ffn_add(struct sk_buff *skb, int when); +extern void ip_ffn_flush_all(void); + +/* * Functions provided by ip_forward.c */ diff -ruw linux-6.4/include/net/ip6_tunnel.h linux-6.4-fbx/include/net/ip6_tunnel.h --- linux-6.4/include/net/ip6_tunnel.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/ip6_tunnel.h 2024-04-22 13:40:52.471928417 +0200 @@ -18,6 +18,18 @@ /* determine capability on a per-packet basis */ #define IP6_TNL_F_CAP_PER_PACKET 0x40000 +/* IPv6 tunnel FMR */ +struct __ip6_tnl_fmr { + struct __ip6_tnl_fmr *next; /* next fmr in list */ + struct in6_addr ip6_prefix; + struct in_addr ip4_prefix; + + __u8 ip6_prefix_len; + __u8 ip4_prefix_len; + __u8 ea_len; + __u8 offset; +}; + struct __ip6_tnl_parm { char name[IFNAMSIZ]; /* name of tunnel device */ int link; /* ifindex of underlying L2 interface */ @@ -29,6 +41,7 @@ __u32 flags; /* tunnel flags */ struct in6_addr laddr; /* local tunnel end-point address */ struct in6_addr raddr; /* remote tunnel end-point address */ + struct __ip6_tnl_fmr *fmrs; /* FMRs */ __be16 i_flags; __be16 o_flags; diff -ruw linux-6.4/include/net/ipv6.h linux-6.4-fbx/include/net/ipv6.h --- linux-6.4/include/net/ipv6.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/ipv6.h 2024-04-22 13:40:52.475928527 +0200 @@ -1147,6 +1147,7 @@ int ip6_output(struct net *net, struct sock *sk, struct sk_buff *skb); int ip6_forward(struct sk_buff *skb); int ip6_input(struct sk_buff *skb); +int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skb); int ip6_mc_input(struct sk_buff *skb); void ip6_protocol_deliver_rcu(struct net *net, struct sk_buff *skb, int nexthdr, bool have_final); @@ -1377,4 +1378,18 @@ release_sock(sk); } +/* + * Functions provided by ipv6_ffn.c + */ + +enum { + IPV6_FFN_FINISH_OUT, + IPV6_FFN_LOCAL_IN, +}; + +extern void ipv6_ffn_init(void); +extern int ipv6_ffn_process(struct sk_buff *skb); +extern void ipv6_ffn_add(struct sk_buff *skb, int when); +extern void ipv6_ffn_flush_all(void); + #endif /* _NET_IPV6_H */ diff -ruw linux-6.4/include/net/mac80211.h linux-6.4-fbx/include/net/mac80211.h --- linux-6.4/include/net/mac80211.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/mac80211.h 2024-04-22 13:40:52.479928636 +0200 @@ -7,7 +7,7 @@ * Copyright 2007-2010 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 - 2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation */ #ifndef MAC80211_H @@ -341,6 +341,7 @@ * @BSS_CHANGED_UNSOL_BCAST_PROBE_RESP: Unsolicited broadcast probe response * status changed. * @BSS_CHANGED_EHT_PUNCTURING: The channel puncturing bitmap changed. + * @BSS_CHANGED_MLD_VALID_LINKS: MLD valid links status changed. */ enum ieee80211_bss_change { BSS_CHANGED_ASSOC = 1<<0, @@ -376,6 +377,7 @@ BSS_CHANGED_FILS_DISCOVERY = 1<<30, BSS_CHANGED_UNSOL_BCAST_PROBE_RESP = 1<<31, BSS_CHANGED_EHT_PUNCTURING = BIT_ULL(32), + BSS_CHANGED_MLD_VALID_LINKS = BIT_ULL(33), /* when adding here, make sure to change ieee80211_reconfig */ }; @@ -643,9 +645,7 @@ * @pwr_reduction: power constraint of BSS. * @eht_support: does this BSS support EHT * @eht_puncturing: bitmap to indicate which channels are punctured in this BSS - * @csa_active: marks whether a channel switch is going on. Internally it is - * write-protected by sdata_lock and local->mtx so holding either is fine - * for read access. + * @csa_active: marks whether a channel switch is going on. * @csa_punct_bitmap: new puncturing bitmap for channel switch * @mu_mimo_owner: indicates interface owns MU-MIMO capability * @chanctx_conf: The channel context this interface is assigned to, or %NULL @@ -653,9 +653,7 @@ * path needing to access it; even though the netdev carrier will always * be off when it is %NULL there can still be races and packets could be * processed after it switches back to %NULL. - * @color_change_active: marks whether a color change is ongoing. Internally it is - * write-protected by sdata_lock and local->mtx so holding either is fine - * for read access. + * @color_change_active: marks whether a color change is ongoing. * @color_change_color: the bss color that will be used after the change. * @ht_ldpc: in AP mode, indicates interface has HT LDPC capability. * @vht_ldpc: in AP mode, indicates interface has VHT LDPC capability. @@ -776,6 +774,21 @@ bool eht_su_beamformer; bool eht_su_beamformee; bool eht_mu_beamformer; + bool eht_80mhz_full_bw_ul_mumimo; + + + /* next two fields are only present to make QCA ath12k + * compile, they are never set to useful value */ + struct ieee80211_vif *mbssid_tx_vif; + int mbssid_tx_vif_linkid; + + /* help compiling QCA code, no API to set it, value is always + * false */ + bool ap_ps_enable; + + /* help compiling QCA code, no API to set it, value is always + * 0 */ + u32 critical_update_flag; }; /** @@ -1082,6 +1095,11 @@ #define IEEE80211_MAX_TX_RETRY 31 +static inline bool ieee80211_rate_valid(struct ieee80211_tx_rate *rate) +{ + return rate->idx >= 0 && rate->count > 0; +} + static inline void ieee80211_rate_set_vht(struct ieee80211_tx_rate *rate, u8 mcs, u8 nss) { @@ -1115,7 +1133,9 @@ * not valid if the interface is an MLD since we won't know which * link the frame will be transmitted on * @hw_queue: HW queue to put the frame on, skb_get_queue_mapping() gives the AC - * @ack_frame_id: internal frame ID for TX status, used internally + * @status_data: internal data for TX status handling, assigned privately, + * see also &enum ieee80211_status_data for the internal documentation + * @status_data_idr: indicates status data is IDR allocated ID for ack frame * @tx_time_est: TX time estimate in units of 4us, used internally * @control: union part for control data * @control.rates: TX rates array to try @@ -1155,10 +1175,11 @@ /* common information */ u32 flags; u32 band:3, - ack_frame_id:13, + status_data_idr:1, + status_data:13, hw_queue:4, tx_time_est:10; - /* 2 free bits */ + /* 1 free bit */ union { struct { @@ -1172,7 +1193,11 @@ u8 use_cts_prot:1; u8 short_preamble:1; u8 skip_table:1; - /* 2 bytes free */ + + /* for injection only (bitmap) */ + u8 antennas:2; + + /* 14 bits free */ }; /* only needed before rate control */ unsigned long jiffies; @@ -1755,12 +1780,15 @@ * @IEEE80211_VIF_GET_NOA_UPDATE: request to handle NOA attributes * and send P2P_PS notification to the driver if NOA changed, even * this is not pure P2P vif. + * @IEEE80211_VIF_EML_ACTIVE: The driver indicates that EML operation is + * enabled for the interface. */ enum ieee80211_vif_flags { IEEE80211_VIF_BEACON_FILTER = BIT(0), IEEE80211_VIF_SUPPORTS_CQM_RSSI = BIT(1), IEEE80211_VIF_SUPPORTS_UAPSD = BIT(2), IEEE80211_VIF_GET_NOA_UPDATE = BIT(3), + IEEE80211_VIF_EML_ACTIVE = BIT(4), }; @@ -1790,6 +1818,9 @@ * @ps: power-save mode (STA only). This flag is NOT affected by * offchannel/dynamic_ps operations. * @aid: association ID number, valid only when @assoc is true + * @eml_cap: EML capabilities as described in P802.11be_D2.2 Figure 9-1002k. + * @eml_med_sync_delay: Medium Synchronization delay as described in + * P802.11be_D2.2 Figure 9-1002j. * @arp_addr_list: List of IPv4 addresses for hardware ARP filtering. The * may filter ARP queries targeted for other addresses than listed here. * The driver must allow ARP queries targeted for all address listed here @@ -1812,6 +1843,8 @@ bool ibss_creator; bool ps; u16 aid; + u16 eml_cap; + u16 eml_med_sync_delay; __be32 arp_addr_list[IEEE80211_BSS_ARP_ADDR_LIST_LEN]; int arp_addr_cnt; @@ -1838,6 +1871,8 @@ * @active_links: The bitmap of active links, or 0 for non-MLO. * The driver shouldn't change this directly, but use the * API calls meant for that purpose. + * @dormant_links: bitmap of valid but disabled links, or 0 for non-MLO. + * Must be a subset of valid_links. * @addr: address of this interface * @p2p: indicates whether this AP or STA interface is a p2p * interface, i.e. a GO or p2p-sta respectively @@ -1875,7 +1910,7 @@ struct ieee80211_vif_cfg cfg; struct ieee80211_bss_conf bss_conf; struct ieee80211_bss_conf __rcu *link_conf[IEEE80211_MLD_MAX_NUM_LINKS]; - u16 valid_links, active_links; + u16 valid_links, active_links, dormant_links; u8 addr[ETH_ALEN] __aligned(2); bool p2p; @@ -1901,6 +1936,27 @@ u8 drv_priv[] __aligned(sizeof(void *)); }; +/** + * ieee80211_vif_usable_links - Return the usable links for the vif + * @vif: the vif for which the usable links are requested + * Return: the usable link bitmap + */ +static inline u16 ieee80211_vif_usable_links(const struct ieee80211_vif *vif) +{ + return vif->valid_links & ~vif->dormant_links; +} + +/** + * ieee80211_vif_is_mld - Returns true iff the vif is an MLD one + * @vif: the vif + * Return: %true if the vif is an MLD, %false otherwise. + */ +static inline bool ieee80211_vif_is_mld(const struct ieee80211_vif *vif) +{ + /* valid_links != 0 indicates this vif is an MLD */ + return vif->valid_links != 0; +} + #define for_each_vif_active_link(vif, link, link_id) \ for (link_id = 0; link_id < ARRAY_SIZE((vif)->link_conf); link_id++) \ if ((!(vif)->active_links || \ @@ -1938,22 +1994,18 @@ */ struct wireless_dev *ieee80211_vif_to_wdev(struct ieee80211_vif *vif); -/** - * lockdep_vif_mutex_held - for lockdep checks on link poiners - * @vif: the interface to check - */ -static inline bool lockdep_vif_mutex_held(struct ieee80211_vif *vif) +static inline bool lockdep_vif_wiphy_mutex_held(struct ieee80211_vif *vif) { - return lockdep_is_held(&ieee80211_vif_to_wdev(vif)->mtx); + return lockdep_is_held(&ieee80211_vif_to_wdev(vif)->wiphy->mtx); } #define link_conf_dereference_protected(vif, link_id) \ rcu_dereference_protected((vif)->link_conf[link_id], \ - lockdep_vif_mutex_held(vif)) + lockdep_vif_wiphy_mutex_held(vif)) #define link_conf_dereference_check(vif, link_id) \ rcu_dereference_check((vif)->link_conf[link_id], \ - lockdep_vif_mutex_held(vif)) + lockdep_vif_wiphy_mutex_held(vif)) /** * enum ieee80211_key_flags - key flags @@ -2250,11 +2302,16 @@ struct ieee80211_he_6ghz_capa he_6ghz_capa; struct ieee80211_sta_eht_cap eht_cap; + /* help compiling QCA code, no API to set it, value is always 0 */ + u16 ru_punct_bitmap; + struct ieee80211_sta_aggregates agg; u8 rx_nss; enum ieee80211_sta_rx_bandwidth bandwidth; + enum ieee80211_sta_rx_bandwidth sta_max_bandwidth; struct ieee80211_sta_txpwr txpwr; + u32 tp_override; }; /** @@ -2704,6 +2761,8 @@ IEEE80211_HW_DETECTS_COLOR_COLLISION, IEEE80211_HW_MLO_MCAST_MULTI_LINK_TX, + IEEE80211_HW_APVLAN_NEED_MCAST_TO_UCAST, + /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS }; @@ -3601,11 +3660,14 @@ * @success: whether the frame exchange was successful, only * used with the mgd_complete_tx() method, and then only * valid for auth and (re)assoc. + * @link_id: the link id on which the frame will be TX'ed. + * Only used with the mgd_prepare_tx() method. */ struct ieee80211_prep_tx_info { u16 duration; u16 subtype; u8 success:1; + int link_id; }; /** @@ -3829,6 +3891,10 @@ * the station. See @sta_pre_rcu_remove if needed. * This callback can sleep. * + * @vif_add_debugfs: Drivers can use this callback to add a debugfs vif + * directory with its files. This callback should be within a + * CONFIG_MAC80211_DEBUGFS conditional. This callback can sleep. + * * @link_add_debugfs: Drivers can use this callback to add debugfs files * when a link is added to a mac80211 vif. This callback should be within * a CONFIG_MAC80211_DEBUGFS conditional. This callback can sleep. @@ -4033,11 +4099,15 @@ * This callback must be atomic. * * @get_et_sset_count: Ethtool API to get string-set count. + * Note that the wiphy mutex is not held for this callback since it's + * expected to return a static value. * * @get_et_stats: Ethtool API to get a set of u64 stats. * * @get_et_strings: Ethtool API to get a set of strings to describe stats * and perhaps other supported types of ethtool data-sets. + * Note that the wiphy mutex is not held for this callback since it's + * expected to return a static value. * * @mgd_prepare_tx: Prepare for transmitting a management frame for association * before associated. In multi-channel scenarios, a virtual interface is @@ -4242,6 +4312,8 @@ struct sk_buff *skb); int (*start)(struct ieee80211_hw *hw); void (*stop)(struct ieee80211_hw *hw); + int (*set_powered)(struct ieee80211_hw *hw); + int (*get_powered)(struct ieee80211_hw *hw, bool *up, bool *busy); #ifdef CONFIG_PM int (*suspend)(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan); int (*resume)(struct ieee80211_hw *hw); @@ -4324,6 +4396,8 @@ int (*sta_remove)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta); #ifdef CONFIG_MAC80211_DEBUGFS + void (*vif_add_debugfs)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif); void (*link_add_debugfs)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_bss_conf *link_conf, @@ -4472,7 +4546,8 @@ struct ieee80211_prep_tx_info *info); void (*mgd_protect_tdls_discover)(struct ieee80211_hw *hw, - struct ieee80211_vif *vif); + struct ieee80211_vif *vif, + unsigned int link_id); int (*add_chanctx)(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *ctx); @@ -4510,7 +4585,8 @@ struct ieee80211_channel_switch *ch_switch); int (*post_channel_switch)(struct ieee80211_hw *hw, - struct ieee80211_vif *vif); + struct ieee80211_vif *vif, + struct ieee80211_bss_conf *link_conf); void (*abort_channel_switch)(struct ieee80211_hw *hw, struct ieee80211_vif *vif); void (*channel_switch_rx_beacon)(struct ieee80211_hw *hw, @@ -5135,6 +5211,10 @@ void ieee80211_tx_status(struct ieee80211_hw *hw, struct sk_buff *skb); +void ieee80211_tx_status_8023(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct sk_buff *skb); + /** * ieee80211_tx_status_ext - extended transmit status callback * @@ -6505,11 +6585,14 @@ * ieee80211_chswitch_done - Complete channel switch process * @vif: &struct ieee80211_vif pointer from the add_interface callback. * @success: make the channel switch successful or not + * @link_id: the link_id on which the switch was done. Ignored if success is + * false. * * Complete the channel switch post-process: set the new operational channel * and wake up the suspended queues. */ -void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success); +void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success, + unsigned int link_id); /** * ieee80211_channel_switch_disconnect - disconnect due to channel switch error @@ -6578,6 +6661,7 @@ * marks frames marked in the bitmap as having been filtered. Afterwards, it * checks if any frames in the window starting from @ssn can now be released * (in case they were only waiting for frames that were filtered.) + * (Only work correctly if @max_rx_aggregation_subframes <= 64 frames) */ void ieee80211_mark_rx_ba_filtered_frames(struct ieee80211_sta *pubsta, u8 tid, u16 ssn, u64 filtered, @@ -6597,6 +6681,13 @@ void ieee80211_send_bar(struct ieee80211_vif *vif, u8 *ra, u16 tid, u16 ssn); /** + * same as ieee80211_send_bar but for given STA, allow sending to a + * STA on AP_VLAN and get a valid control->sta in the driver + */ +void ieee80211_send_bar_sta(struct ieee80211_sta *pubsta, + u16 tid, u16 ssn); + +/** * ieee80211_manage_rx_ba_offl - helper to queue an RX BA work * @vif: &struct ieee80211_vif pointer from the add_interface callback * @addr: station mac address @@ -6862,6 +6953,48 @@ } /** + * ieee80211_get_he_iftype_cap_vif - return HE capabilities for sband/vif + * @sband: the sband to search for the iftype on + * @vif: the vif to get the iftype from + * + * Return: pointer to the struct ieee80211_sta_he_cap, or %NULL is none found + */ +static inline const struct ieee80211_sta_he_cap * +ieee80211_get_he_iftype_cap_vif(const struct ieee80211_supported_band *sband, + struct ieee80211_vif *vif) +{ + return ieee80211_get_he_iftype_cap(sband, ieee80211_vif_type_p2p(vif)); +} + +/** + * ieee80211_get_he_6ghz_capa_vif - return HE 6 GHz capabilities + * @sband: the sband to search for the STA on + * @vif: the vif to get the iftype from + * + * Return: the 6GHz capabilities + */ +static inline __le16 +ieee80211_get_he_6ghz_capa_vif(const struct ieee80211_supported_band *sband, + struct ieee80211_vif *vif) +{ + return ieee80211_get_he_6ghz_capa(sband, ieee80211_vif_type_p2p(vif)); +} + +/** + * ieee80211_get_eht_iftype_cap_vif - return ETH capabilities for sband/vif + * @sband: the sband to search for the iftype on + * @vif: the vif to get the iftype from + * + * Return: pointer to the struct ieee80211_sta_eht_cap, or %NULL is none found + */ +static inline const struct ieee80211_sta_eht_cap * +ieee80211_get_eht_iftype_cap_vif(const struct ieee80211_supported_band *sband, + struct ieee80211_vif *vif) +{ + return ieee80211_get_eht_iftype_cap(sband, ieee80211_vif_type_p2p(vif)); +} + +/** * ieee80211_update_mu_groups - set the VHT MU-MIMO groud data * * @vif: the specified virtual interface @@ -7367,4 +7500,74 @@ void ieee80211_set_active_links_async(struct ieee80211_vif *vif, u16 active_links); +/* + * force dtim count value on given VIF + */ +void ieee80211_force_dtim(struct ieee80211_vif *vif, + unsigned int dtim_count); + +/* + * special helpers for QCA ath12 non upstream code + */ +static inline +void ieee80211_csa_finish_mlo(struct ieee80211_vif *vif, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + ieee80211_csa_finish(vif); +} + +static inline +bool ieee80211_beacon_cntdwn_is_complete_mlo(struct ieee80211_vif *vif, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + return ieee80211_beacon_cntdwn_is_complete(vif); +} + +static inline +void ieee80211_color_change_finish_mlo(struct ieee80211_vif *vif, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + return ieee80211_color_change_finish(vif); +} + +static inline +u8 ieee80211_beacon_update_cntdwn_mlo(struct ieee80211_vif *vif, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + return ieee80211_beacon_update_cntdwn(vif); +} + +static inline +struct sk_buff *ieee80211_get_fils_discovery_tmpl_mlo(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + return ieee80211_get_fils_discovery_tmpl(hw, vif); +} + +static inline +struct sk_buff * +ieee80211_get_unsol_bcast_probe_resp_tmpl_mlo(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + return ieee80211_get_unsol_bcast_probe_resp_tmpl(hw, vif); +} + +static inline +void +ieee80211_obss_color_collision_notify_mlo(struct ieee80211_vif *vif, + u64 color_bitmap, gfp_t gfp, + unsigned int link_id) +{ + /* FIXME: implement correctly */ + return ieee80211_obss_color_collision_notify(vif, color_bitmap, gfp); +} + #endif /* MAC80211_H */ diff -ruw linux-6.4/include/net/netfilter/nf_conntrack.h linux-6.4-fbx/include/net/netfilter/nf_conntrack.h --- linux-6.4/include/net/netfilter/nf_conntrack.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/netfilter/nf_conntrack.h 2024-04-22 13:40:52.483928745 +0200 @@ -53,6 +53,8 @@ /* only used when new connection is allocated: */ atomic_t count; unsigned int expect_count; + u8 sysctl_auto_assign_helper; + bool auto_assign_helper_warned; /* only used from work queues, configuration plane, and so on: */ unsigned int users4; @@ -118,6 +120,9 @@ u_int32_t secmark; #endif + union nf_conntrack_man_proto nat_src_proto_min; + union nf_conntrack_man_proto nat_src_proto_max; + /* Extensions */ struct nf_ct_ext *ext; diff -ruw linux-6.4/include/net/netfilter/nf_conntrack_expect.h linux-6.4-fbx/include/net/netfilter/nf_conntrack_expect.h --- linux-6.4/include/net/netfilter/nf_conntrack_expect.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/netfilter/nf_conntrack_expect.h 2023-03-13 14:08:39.114429164 +0100 @@ -58,13 +58,24 @@ #endif struct rcu_head rcu; + + /* private expect information. */ + char data[32] __aligned(8); }; +#define NF_CT_EXPECT_BUILD_BUG_ON(structsize) \ + BUILD_BUG_ON((structsize) > sizeof_field(struct nf_conntrack_expect, data)) + static inline struct net *nf_ct_exp_net(struct nf_conntrack_expect *exp) { return nf_ct_net(exp->master); } +static inline void *nf_ct_exp_data(struct nf_conntrack_expect *exp) +{ + return (void *)exp->data; +} + #define NF_CT_EXP_POLICY_NAME_LEN 16 struct nf_conntrack_expect_policy { diff -ruw linux-6.4/include/net/netns/conntrack.h linux-6.4-fbx/include/net/netns/conntrack.h --- linux-6.4/include/net/netns/conntrack.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/netns/conntrack.h 2024-04-22 13:40:52.487928854 +0200 @@ -100,6 +100,7 @@ u8 sysctl_log_invalid; /* Log invalid packets */ u8 sysctl_events; u8 sysctl_acct; + u8 sysctl_auto_assign_helper; u8 sysctl_tstamp; u8 sysctl_checksum; diff -ruw linux-6.4/include/net/page_pool.h linux-6.4-fbx/include/net/page_pool.h --- linux-6.4/include/net/page_pool.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/page_pool.h 2024-04-22 13:40:52.487928854 +0200 @@ -377,6 +377,21 @@ page->dma_addr_upper = upper_32_bits(addr); } +static inline void page_pool_clear_recycle_flag(struct page *page) +{ + page->pp_recycle_flag= 0; +} + +static inline void page_pool_set_recycled_flag(struct page *page) +{ + page->pp_recycle_flag = 1; +} + +static inline bool page_pool_is_recycled(struct page *page) +{ + return page->pp_recycle_flag & 1; +} + static inline bool is_page_pool_compiled_in(void) { #ifdef CONFIG_PAGE_POOL diff -ruw linux-6.4/include/net/regulatory.h linux-6.4-fbx/include/net/regulatory.h --- linux-6.4/include/net/regulatory.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/regulatory.h 2024-04-22 13:40:52.487928854 +0200 @@ -140,17 +140,6 @@ * otherwise initiating radiation is not allowed. This will enable the * relaxations enabled under the CFG80211_REG_RELAX_NO_IR configuration * option - * @REGULATORY_IGNORE_STALE_KICKOFF: the regulatory core will _not_ make sure - * all interfaces on this wiphy reside on allowed channels. If this flag - * is not set, upon a regdomain change, the interfaces are given a grace - * period (currently 60 seconds) to disconnect or move to an allowed - * channel. Interfaces on forbidden channels are forcibly disconnected. - * Currently these types of interfaces are supported for enforcement: - * NL80211_IFTYPE_ADHOC, NL80211_IFTYPE_STATION, NL80211_IFTYPE_AP, - * NL80211_IFTYPE_AP_VLAN, NL80211_IFTYPE_MONITOR, - * NL80211_IFTYPE_P2P_CLIENT, NL80211_IFTYPE_P2P_GO, - * NL80211_IFTYPE_P2P_DEVICE. The flag will be set by default if a device - * includes any modes unsupported for enforcement checking. * @REGULATORY_WIPHY_SELF_MANAGED: for devices that employ wiphy-specific * regdom management. These devices will ignore all regdom changes not * originating from their own wiphy. @@ -177,7 +166,7 @@ REGULATORY_COUNTRY_IE_FOLLOW_POWER = BIT(3), REGULATORY_COUNTRY_IE_IGNORE = BIT(4), REGULATORY_ENABLE_RELAX_NO_IR = BIT(5), - REGULATORY_IGNORE_STALE_KICKOFF = BIT(6), + /* reuse bit 6 next time */ REGULATORY_WIPHY_SELF_MANAGED = BIT(7), }; @@ -224,6 +213,7 @@ u32 flags; u32 dfs_cac_ms; bool has_wmm; + s8 psd; }; struct ieee80211_regdomain { diff -ruw linux-6.4/include/net/sock.h linux-6.4-fbx/include/net/sock.h --- linux-6.4/include/net/sock.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/sock.h 2024-04-22 13:40:52.491928964 +0200 @@ -187,6 +187,7 @@ unsigned char skc_reuseport:1; unsigned char skc_ipv6only:1; unsigned char skc_net_refcnt:1; + unsigned char skc_reuse_conflict; int skc_bound_dev_if; union { struct hlist_node skc_bind_node; @@ -383,6 +384,7 @@ #define sk_reuseport __sk_common.skc_reuseport #define sk_ipv6only __sk_common.skc_ipv6only #define sk_net_refcnt __sk_common.skc_net_refcnt +#define sk_reuse_conflict __sk_common.skc_reuse_conflict #define sk_bound_dev_if __sk_common.skc_bound_dev_if #define sk_bind_node __sk_common.skc_bind_node #define sk_prot __sk_common.skc_prot @@ -959,6 +961,7 @@ SOCK_XDP, /* XDP is attached */ SOCK_TSTAMP_NEW, /* Indicates 64 bit timestamps always */ SOCK_RCVMARK, /* Receive SO_MARK ancillary data with packet */ + SOCK_UDP_DUP_UNICAST, }; #define SK_FLAGS_TIMESTAMP ((1UL << SOCK_TIMESTAMP) | (1UL << SOCK_TIMESTAMPING_RX_SOFTWARE)) diff -ruw linux-6.4/include/net/udp.h linux-6.4-fbx/include/net/udp.h --- linux-6.4/include/net/udp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/net/udp.h 2024-04-22 13:40:52.495929073 +0200 @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include diff -ruw linux-6.4/include/uapi/asm-generic/socket.h linux-6.4-fbx/include/uapi/asm-generic/socket.h --- linux-6.4/include/uapi/asm-generic/socket.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/asm-generic/socket.h 2024-04-22 13:40:52.535930166 +0200 @@ -30,9 +30,10 @@ #define SO_PEERCRED 17 #define SO_RCVLOWAT 18 #define SO_SNDLOWAT 19 +#endif + #define SO_RCVTIMEO_OLD 20 #define SO_SNDTIMEO_OLD 21 -#endif /* Security levels - as per NRL IPv6 - don't actually do anything */ #define SO_SECURITY_AUTHENTICATION 22 @@ -132,6 +133,8 @@ #define SO_RCVMARK 75 +#define SO_UDP_DUP_UNICAST 100 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) diff -ruw linux-6.4/include/uapi/linux/batadv_packet.h linux-6.4-fbx/include/uapi/linux/batadv_packet.h --- linux-6.4/include/uapi/linux/batadv_packet.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/batadv_packet.h 2024-04-22 13:40:52.543930385 +0200 @@ -44,6 +44,7 @@ BATADV_ELP = 0x03, BATADV_OGM2 = 0x04, BATADV_MCAST = 0x05, + BATADV_FBX = 0x3f, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, @@ -87,6 +88,14 @@ }; /** + * enum batadv_v_flags - flags used in B.A.T.M.A.N. V OGM2 packets + * @BATADV_V_HALF_DUPLEX: Halfduplex penalty should be applied to throughput + */ +enum batadv_v_flags { + BATADV_V_HALF_DUPLEX = 1UL << 7, +}; + +/** * enum batadv_icmp_packettype - ICMP message types * @BATADV_ECHO_REPLY: success reply to BATADV_ECHO_REQUEST * @BATADV_DESTINATION_UNREACHABLE: failure when route to destination not found @@ -174,6 +183,7 @@ * @BATADV_TVLV_TT: translation table tvlv * @BATADV_TVLV_ROAM: roaming advertisement tvlv * @BATADV_TVLV_MCAST: multicast capability tvlv + * @BATADV_TVLV_FBX: fbx specific tvlv */ enum batadv_tvlv_type { BATADV_TVLV_GW = 0x01, @@ -182,6 +192,7 @@ BATADV_TVLV_TT = 0x04, BATADV_TVLV_ROAM = 0x05, BATADV_TVLV_MCAST = 0x06, + BATADV_TVLV_FBX = 0xff, }; #pragma pack(2) @@ -628,6 +639,61 @@ __u8 reserved[3]; }; +/** + * struct batadv_fbx_packet - FBX specific packets + * @packet_type: batman-adv packet type, part of the general header + * @version: batman-adv protocol version, part of the general header + * @subtype: FBX packet subtype (see batadv_fbx_subtype) + * @rev: FBX specific version for compatibility + * @seqno: an alway increasing sequence number, not checked for now + */ +struct batadv_fbx_packet { + __u8 packet_type; + __u8 version; + __u8 subtype; /* see batadv_fbx_subtype detection message types */ + __u8 rev; + __be32 seqno; +}; +#define BATADV_FBX_HLEN sizeof(struct batadv_fbx_packet) + +/** + * enum batadv_fbx_subtype - FBX packet subtypes + * @BATADV_FBX_MTU_PROBE: Big message sent to a neigh to probe link MTU + * @BATADV_FBX_MTU_RESP: MTU acknowledgment from receiver to sender + */ +enum batadv_fbx_subtype { + BATADV_FBX_SUB_UNUSED = 0, + BATADV_FBX_SUB_MTU_PROBE, + BATADV_FBX_SUB_MTU_RESP, + BATADV_FBX_SUB_SLAP, + /* keep last */ + BATADV_FBX_SUB_LAST, +}; + +/** + * struct batadv_fbx_mtu_packet - FBX MTU probing packet + * @hdr: Common FBX header + * @mtu: The mtu this probe / resp packet relates to + */ +struct batadv_fbx_mtu_packet { + struct batadv_fbx_packet hdr; + __be16 mtu; +}; + +#define BATADV_FBX_MTU_HLEN sizeof(struct batadv_fbx_mtu_packet) + +/** + * struct batadv_fbx_slap_packet - FBX SLAP ID packet + * @hdr: Common FBX header + * @prio: SLAP Prio of the originator node + */ +struct batadv_fbx_slap_packet { + struct batadv_fbx_packet hdr; + __be32 prio; +}; + +#define BATADV_FBX_SLAP_HLEN sizeof(struct batadv_fbx_slap_packet) + #pragma pack() #endif /* _UAPI_LINUX_BATADV_PACKET_H_ */ diff -ruw linux-6.4/include/uapi/linux/batman_adv.h linux-6.4-fbx/include/uapi/linux/batman_adv.h --- linux-6.4/include/uapi/linux/batman_adv.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/batman_adv.h 2024-04-22 13:40:52.543930385 +0200 @@ -11,6 +11,7 @@ #define BATADV_NL_MCAST_GROUP_CONFIG "config" #define BATADV_NL_MCAST_GROUP_TPMETER "tpmeter" +#define BATADV_NL_MCAST_GROUP_ROUTE "route" /** * enum batadv_tt_client_flags - TT client specific flags @@ -49,6 +50,12 @@ BATADV_TT_CLIENT_ISOLA = (1 << 5), /** + * @BATADV_TT_CLIENT_SEEN: this global client has been actually + * detected to be part of the originator and has not yet expired + */ + BATADV_TT_CLIENT_SEEN = (1 << 6), + + /** * @BATADV_TT_CLIENT_NOPURGE: this client should never be removed from * the table */ @@ -481,6 +488,11 @@ */ BATADV_ATTR_MULTICAST_FANOUT, + /** + * @BATADV_ATTF_FBX: defines FBX specific NL attributes + */ + BATADV_ATTR_FBX, + /* add attributes above here, update the policy in netlink.c */ /** @@ -500,6 +512,52 @@ }; /** + * enum batadv_nl_fbx_attrs - batman-adv netlink attributes + */ +enum batadv_nl_fbx_attr { + /** + * @BATADV_ATTR_FBX_MTU: defines the MTU this neighbor can safely use. + */ + BATADV_ATTR_FBX_MTU, + + /** + * @BATADV_ATTR_FBX_SLAP_MASTER_MAC: Show current SLAP master address + */ + BATADV_ATTR_FBX_SLAP_MASTER_ADDRESS, + + /** + * @BATADV_ATTR_FBX_SLAP_MASTER_PRIO: Show current SLAP master priority + */ + BATADV_ATTR_FBX_SLAP_MASTER_PRIO, + + /** + * @BATADV_ATTR_FBX_SLAP_IFINDEX: defines the currently selected SLAP + * interface + */ + BATADV_ATTR_FBX_SLAP_IFINDEX, + + /** + * @BATADV_ATTR_FBX_SLAP_PRIO: defines the current SLAP priority + */ + BATADV_ATTR_FBX_SLAP_PRIO, + + /** + * @__BATADV_ATTR_FBX_AFTER_LAST: internal use + */ + __BATADV_ATTR_FBX_AFTER_LAST, + + /** + * @NUM_BATADV_FBX_ATTR: total number of batadv_nl_fbx_attrs available + */ + NUM_BATADV_ATTR_FBX = __BATADV_ATTR_FBX_AFTER_LAST, + + /** + * @BATADV_ATTR_FBX_MAX: highest attribute number currently defined + */ + BATADV_ATTR_FBX_MAX = __BATADV_ATTR_FBX_AFTER_LAST - 1 +}; + +/** * enum batadv_nl_commands - supported batman-adv netlink commands */ enum batadv_nl_commands { @@ -613,6 +671,21 @@ */ BATADV_CMD_SET_VLAN, + /** + * @BATADV_CMD_ADD_ROUTE: Add new route to reach originator + */ + BATADV_CMD_ADD_ROUTE, + + /** + * @BATADV_CMD_DEL_ROUTE: Del route to originator + */ + BATADV_CMD_DEL_ROUTE, + + /** + * @BATADV_CMD_CHANGE_ROUTE: Modify an existing route to originator + */ + BATADV_CMD_CHANGE_ROUTE, + /* add new commands above here */ /** diff -ruw linux-6.4/include/uapi/linux/ethtool.h linux-6.4-fbx/include/uapi/linux/ethtool.h --- linux-6.4/include/uapi/linux/ethtool.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/ethtool.h 2024-04-22 13:40:52.551930603 +0200 @@ -294,6 +294,8 @@ ETHTOOL_PHY_DOWNSHIFT, ETHTOOL_PHY_FAST_LINK_DOWN, ETHTOOL_PHY_EDPD, + ETHTOOL_PHY_BROKEN, + /* * Add your fresh new phy tunable attribute above and remember to update * phy_tunable_strings[] in net/ethtool/common.c @@ -681,6 +683,7 @@ * @ETH_SS_STATS_ETH_MAC: names of IEEE 802.3 MAC statistics * @ETH_SS_STATS_ETH_CTRL: names of IEEE 802.3 MAC Control statistics * @ETH_SS_STATS_RMON: names of RMON statistics + * @ETH_SS_PHYLINK_IFTYPES: names of phylink interface types * * @ETH_SS_COUNT: number of defined string sets */ @@ -706,6 +709,7 @@ ETH_SS_STATS_ETH_MAC, ETH_SS_STATS_ETH_CTRL, ETH_SS_STATS_RMON, + ETH_SS_PHYLINK_IFTYPES, /* add new constants above here */ ETH_SS_COUNT @@ -1576,6 +1580,91 @@ #define ETHTOOL_FEC_BASER (1 << ETHTOOL_FEC_BASER_BIT) #define ETHTOOL_FEC_LLRS (1 << ETHTOOL_FEC_LLRS_BIT) +/** + * struct ethtool_shaper_params + * @cmd: %ETHTOOL_GSHAPER_PARAMS / %ETHTOOL_SSHAPER_PARAMS + */ +struct ethtool_shaper_params { + __u32 cmd; + + __u64 rate; + __u32 burst; + __u32 mtu; +}; + +/** + * struct ethtool_epon_param + * @cmd: Command number = %ETHTOOL_GEPON_PARAM or %ETHTOOL_SEPON_* + */ +struct ethtool_epon_param { + __u32 cmd; + __u8 discovery_rx; + __u8 registered; + __u16 llid; + __u32 burst_cap; + __u32 lasermon_event_count; + __u32 change_count; + __u32 keys_update_id; + __u8 key_sci[8]; + __u8 down_key0[16]; + __u8 down_key1[16]; + __u32 down_encrypt; + __u32 down_last_rx_encrypted; + __u32 down_last_rx_key_id; + __u16 mcast_llid; + __u16 pad; +}; + +/* + * currently a 1:1 mapping for SFP SM in drivers/net/phy/sfp.c + */ +enum { + ETHTOOL_SFP_S_DOWN = 0, + ETHTOOL_SFP_S_FAIL, + ETHTOOL_SFP_S_WAIT, + ETHTOOL_SFP_S_INIT, + ETHTOOL_SFP_S_INIT_PHY, + ETHTOOL_SFP_S_INIT_TX_FAULT, + ETHTOOL_SFP_S_WAIT_LOS, + ETHTOOL_SFP_S_LINK_UP, + ETHTOOL_SFP_S_TX_FAULT, + ETHTOOL_SFP_S_REINIT, + ETHTOOL_SFP_S_TX_DISABLE, +}; + +/** + * struct ethtool_sfp_state + * @cmd: Command number = %ETHTOOL_GSFP_STATE + */ +struct ethtool_sfp_state { + __u32 cmd; + + __u32 fsm_state; + + __u8 o_pwren; + __u8 o_txdis; + __u8 i_presence; + __u8 i_rxlos; + __u8 i_txfault; +}; + +/** + * struct ethtool_phylink_if_mode + * @cmd: %ETHTOOL_GPHYLINK_IFTYPE / %ETHTOOL_SPHYLINK_IFTYPE + */ +struct ethtool_phylink_iftype { + __u32 cmd; + + /* stringified phy_interface_t (enum is not part of UAPI and + * is not stable), uses string from phy_modes() */ + char iftype[ETH_GSTRING_LEN]; + + __u32 autoneg_en; + + /* enum MLO_AN_xxx, read-only */ + __u32 mode; +}; + /* CMDs currently supported */ #define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings. * Please use ETHTOOL_GLINKSETTINGS @@ -1671,6 +1760,23 @@ #define ETHTOOL_GFECPARAM 0x00000050 /* Get FEC settings */ #define ETHTOOL_SFECPARAM 0x00000051 /* Set FEC settings */ +#define ETHTOOL_GEPON_PARAM 0x00000052 /* Get EPON params */ +#define ETHTOOL_SEPON_KEYS 0x00000053 /* Set EPON encryption keys */ +#define ETHTOOL_SEPON_ENCRYPT 0x00000054 /* Set EPON encryption keys */ +#define ETHTOOL_SEPON_RESTART 0x00000055 /* restart epon link */ +#define ETHTOOL_SEPON_BURST 0x00000056 /* update burst value */ +#define ETHTOOL_SEPON_ADD_MCLLID 0x00000057 /* add epon llid */ +#define ETHTOOL_SEPON_DEL_MCLLID 0x00000058 /* remove epon llid */ +#define ETHTOOL_SEPON_CLR_MCLLID 0x00000059 /* remove all epon llid */ + +#define ETHTOOL_GSFP_STATE 0x00000060 /* get SFP state (IOs/FSM) */ + +#define ETHTOOL_SSHAPER_PARAMS 0x00000061 /* set HW TX shaper params */ +#define ETHTOOL_GSHAPER_PARAMS 0x00000062 /* get HW TX shaper params */ + +#define ETHTOOL_GPHYLINK_IFTYPE 0x00000063 /* get phylink interface type */ +#define ETHTOOL_SPHYLINK_IFTYPE 0x00000064 /* set phylink interface type */ + /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET #define SPARC_ETH_SSET ETHTOOL_SSET @@ -1787,6 +1893,12 @@ ETHTOOL_LINK_MODE_10baseT1S_Full_BIT = 99, ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100, ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101, + ETHTOOL_LINK_MODE_1000basePX_D_Full_BIT = 102, + ETHTOOL_LINK_MODE_1000basePX_U_Full_BIT = 103, + ETHTOOL_LINK_MODE_10000basePR_D_Full_BIT = 104, + ETHTOOL_LINK_MODE_10000basePR_U_Full_BIT = 105, + ETHTOOL_LINK_MODE_10000_1000basePRX_D_Full_BIT = 106, + ETHTOOL_LINK_MODE_10000_1000basePRX_U_Full_BIT = 107, /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS diff -ruw linux-6.4/include/uapi/linux/if_ether.h linux-6.4-fbx/include/uapi/linux/if_ether.h --- linux-6.4/include/uapi/linux/if_ether.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/if_ether.h 2024-04-22 13:40:52.555930712 +0200 @@ -55,6 +55,7 @@ #define ETH_P_BPQ 0x08FF /* G8BPQ AX.25 Ethernet Packet [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_IEEEPUP 0x0a00 /* Xerox IEEE802.3 PUP packet */ #define ETH_P_IEEEPUPAT 0x0a01 /* Xerox IEEE802.3 PUP Addr Trans packet */ +#define ETH_P_FBXVLAN 0x1337 /* Freebox specific VLAN type [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_BATMAN 0x4305 /* B.A.T.M.A.N.-Advanced packet [ NOT AN OFFICIALLY REGISTERED ID ] */ #define ETH_P_DEC 0x6000 /* DEC Assigned proto */ #define ETH_P_DNA_DL 0x6001 /* DEC DNA Dump/Load */ diff -ruw linux-6.4/include/uapi/linux/if_tun.h linux-6.4-fbx/include/uapi/linux/if_tun.h --- linux-6.4/include/uapi/linux/if_tun.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/if_tun.h 2024-04-22 13:40:52.559930822 +0200 @@ -62,6 +62,32 @@ #define TUNSETCARRIER _IOW('T', 226, int) #define TUNGETDEVNETNS _IO('T', 227) + +struct smalltun_rule { + __u8 proto; + __be16 src_port_start; + __be16 src_port_end; + __be16 dst_port_start; + __be16 dst_port_end; +}; + +struct smalltun_fp { + __be32 inner_src; + __be32 inner_dst; + + __u32 af; + __u8 outer_src[16]; + __u8 outer_dst[16]; + __be16 outer_src_port; + __be16 outer_dst_port; + + struct smalltun_rule rules[8]; + __u32 rule_count; +}; + +#define TUNSMALLTUNSETFP _IOW('T', 228, struct smalltun_fp) +#define TUNSMALLTUNDELFP _IOW('T', 229, struct smalltun_fp) + /* TUNSETIFF ifr flags */ #define IFF_TUN 0x0001 #define IFF_TAP 0x0002 diff -ruw linux-6.4/include/uapi/linux/if_tunnel.h linux-6.4-fbx/include/uapi/linux/if_tunnel.h --- linux-6.4/include/uapi/linux/if_tunnel.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/if_tunnel.h 2024-04-22 13:40:52.559930822 +0200 @@ -77,10 +77,23 @@ IFLA_IPTUN_ENCAP_DPORT, IFLA_IPTUN_COLLECT_METADATA, IFLA_IPTUN_FWMARK, + IFLA_IPTUN_FMRS, __IFLA_IPTUN_MAX, }; #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1) +enum { + IFLA_IPTUN_FMR_UNSPEC, + IFLA_IPTUN_FMR_IP6_PREFIX, + IFLA_IPTUN_FMR_IP4_PREFIX, + IFLA_IPTUN_FMR_IP6_PREFIX_LEN, + IFLA_IPTUN_FMR_IP4_PREFIX_LEN, + IFLA_IPTUN_FMR_EA_LEN, + IFLA_IPTUN_FMR_OFFSET, + __IFLA_IPTUN_FMR_MAX, +}; +#define IFLA_IPTUN_FMR_MAX (__IFLA_IPTUN_FMR_MAX - 1) + enum tunnel_encap_types { TUNNEL_ENCAP_NONE, TUNNEL_ENCAP_FOU, diff -ruw linux-6.4/include/uapi/linux/input-event-codes.h linux-6.4-fbx/include/uapi/linux/input-event-codes.h --- linux-6.4/include/uapi/linux/input-event-codes.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/input-event-codes.h 2024-04-22 13:40:52.559930822 +0200 @@ -803,6 +803,18 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 +#define KEY_APP_TV 0x2f1 +#define KEY_APP_REPLAY 0x2f2 +#define KEY_APP_VIDEOCLUB 0x2f3 +#define KEY_APP_WHATSON 0x2f4 +#define KEY_APP_RECORDS 0x2f5 +#define KEY_APP_MEDIA 0x2f6 +#define KEY_APP_YOUTUBE 0x2f7 +#define KEY_APP_RADIOS 0x2f8 +#define KEY_APP_CANALVOD 0x2f9 +#define KEY_APP_PIP 0x2fa +#define KEY_APP_NETFLIX 0x2fb + /* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff diff -ruw linux-6.4/include/uapi/linux/libc-compat.h linux-6.4-fbx/include/uapi/linux/libc-compat.h --- linux-6.4/include/uapi/linux/libc-compat.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/libc-compat.h 2023-02-27 14:15:14.847571831 +0100 @@ -49,11 +49,11 @@ #ifndef _UAPI_LIBC_COMPAT_H #define _UAPI_LIBC_COMPAT_H -/* We have included glibc headers... */ -#if defined(__GLIBC__) +/* We have included libc headers... */ +#if !defined(__KERNEL__) -/* Coordinate with glibc net/if.h header. */ -#if defined(_NET_IF_H) && defined(__USE_MISC) +/* Coordinate with libc net/if.h header. */ +#if defined(_NET_IF_H) && (!defined(__GLIBC__) || defined(__USE_MISC)) /* GLIBC headers included first so don't define anything * that would already be defined. */ @@ -65,9 +65,11 @@ /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ +#ifndef IFF_ECHO #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ +#endif /* IFF_ECHO */ #else /* _NET_IF_H */ @@ -170,7 +172,7 @@ * or we are being included in the kernel, then define everything * that we need. Check for previous __UAPI_* definitions to give * unsupported C libraries a way to opt out of any kernel definition. */ -#else /* !defined(__GLIBC__) */ +#else /* !defined(__KERNEL__) */ /* Definitions for if.h */ #ifndef __UAPI_DEF_IF_IFCONF @@ -262,6 +264,6 @@ #define __UAPI_DEF_XATTR 1 #endif -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ */ #endif /* _UAPI_LIBC_COMPAT_H */ diff -ruw linux-6.4/include/uapi/linux/nl80211.h linux-6.4-fbx/include/uapi/linux/nl80211.h --- linux-6.4/include/uapi/linux/nl80211.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/nl80211.h 2024-04-22 13:40:52.571931150 +0200 @@ -11,7 +11,7 @@ * Copyright 2008 Jouni Malinen * Copyright 2008 Colin McCabe * Copyright 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -167,7 +167,7 @@ * following events occur. * a) Expiration of hardware timer whose expiration time is set to maximum * coalescing delay of matching coalesce rule. - * b) Coalescing buffer in hardware reaches it's limit. + * b) Coalescing buffer in hardware reaches its limit. * c) Packet doesn't match any of the configured coalesce rules. * * User needs to configure following parameters for creating a coalesce @@ -326,7 +326,7 @@ /** * DOC: Multi-Link Operation * - * In Multi-Link Operation, a connection between to MLDs utilizes multiple + * In Multi-Link Operation, a connection between two MLDs utilizes multiple * links. To use this in nl80211, various commands and responses now need * to or will include the new %NL80211_ATTR_MLO_LINKS attribute. * Additionally, various commands that need to operate on a specific link @@ -335,6 +335,15 @@ */ /** + * DOC: OWE DH IE handling offload + * + * By setting @NL80211_EXT_FEATURE_OWE_OFFLOAD flag, drivers can indicate + * kernel/application space to avoid DH IE handling. When this flag is + * advertised, the driver/device will take care of DH IE inclusion and + * processing of peer DH IE to generate PMK. + */ + +/** * enum nl80211_commands - supported nl80211 commands * * @NL80211_CMD_UNSPEC: unspecified command to catch errors @@ -1309,6 +1318,11 @@ * The number of peers that HW timestamping can be enabled for concurrently * is indicated by %NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS. * + * @NL80211_CMD_LINKS_REMOVED: Notify userspace about the removal of STA MLD + * setup links due to AP MLD removing the corresponding affiliated APs with + * Multi-Link reconfiguration. %NL80211_ATTR_MLO_LINKS is used to provide + * information about the removed STA MLD setup links. + * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */ @@ -1562,6 +1576,8 @@ NL80211_CMD_SET_HW_TIMESTAMP, + NL80211_CMD_LINKS_REMOVED, + /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ @@ -2683,11 +2699,13 @@ * * @NL80211_ATTR_FILS_DISCOVERY: Optional parameter to configure FILS * discovery. It is a nested attribute, see - * &enum nl80211_fils_discovery_attributes. + * &enum nl80211_fils_discovery_attributes. Userspace should pass an empty + * nested attribute to disable this feature and delete the templates. * * @NL80211_ATTR_UNSOL_BCAST_PROBE_RESP: Optional parameter to configure * unsolicited broadcast probe response. It is a nested attribute, see - * &enum nl80211_unsol_bcast_probe_resp_attributes. + * &enum nl80211_unsol_bcast_probe_resp_attributes. Userspace should pass an empty + * nested attribute to disable this feature and delete the templates. * * @NL80211_ATTR_S1G_CAPABILITY: S1G Capability information element (from * association request when used with NL80211_CMD_NEW_STATION) @@ -2805,6 +2823,9 @@ * index. If the userspace includes more RNR elements than number of * MBSSID elements then these will be added in every EMA beacon. * + * @NL80211_ATTR_MLO_LINK_DISABLED: Flag attribute indicating that the link is + * disabled. + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use @@ -3341,6 +3362,8 @@ NL80211_ATTR_EMA_RNR_ELEMS, + NL80211_ATTR_MLO_LINK_DISABLED, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -3667,6 +3690,13 @@ * (u8, see &enum nl80211_eht_gi) * @NL80211_RATE_INFO_EHT_RU_ALLOC: EHT RU allocation, if not present then * non-OFDMA was used (u8, see &enum nl80211_eht_ru_alloc) + * @NL80211_RATE_INFO_S1G_MCS: S1G MCS index (u8, 0-10) + * @NL80211_RATE_INFO_S1G_NSS: S1G NSS value (u8, 1-4) + * @NL80211_RATE_INFO_1_MHZ_WIDTH: 1 MHz S1G rate + * @NL80211_RATE_INFO_2_MHZ_WIDTH: 2 MHz S1G rate + * @NL80211_RATE_INFO_4_MHZ_WIDTH: 4 MHz S1G rate + * @NL80211_RATE_INFO_8_MHZ_WIDTH: 8 MHz S1G rate + * @NL80211_RATE_INFO_16_MHZ_WIDTH: 16 MHz S1G rate * @__NL80211_RATE_INFO_AFTER_LAST: internal use */ enum nl80211_rate_info { @@ -3693,6 +3723,13 @@ NL80211_RATE_INFO_EHT_NSS, NL80211_RATE_INFO_EHT_GI, NL80211_RATE_INFO_EHT_RU_ALLOC, + NL80211_RATE_INFO_S1G_MCS, + NL80211_RATE_INFO_S1G_NSS, + NL80211_RATE_INFO_1_MHZ_WIDTH, + NL80211_RATE_INFO_2_MHZ_WIDTH, + NL80211_RATE_INFO_4_MHZ_WIDTH, + NL80211_RATE_INFO_8_MHZ_WIDTH, + NL80211_RATE_INFO_16_MHZ_WIDTH, /* keep last */ __NL80211_RATE_INFO_AFTER_LAST, @@ -4187,6 +4224,8 @@ * as the primary or any of the secondary channels isn't possible * @NL80211_FREQUENCY_ATTR_NO_EHT: EHT operation is not allowed on this channel * in current regulatory domain. + * @NL80211_FREQUENCY_ATTR_PSD: Power spectral density (in dBm) that + * is allowed on this channel in current regulatory domain. * @NL80211_FREQUENCY_ATTR_MAX: highest frequency attribute number * currently defined * @__NL80211_FREQUENCY_ATTR_AFTER_LAST: internal use @@ -4225,6 +4264,7 @@ NL80211_FREQUENCY_ATTR_16MHZ, NL80211_FREQUENCY_ATTR_NO_320MHZ, NL80211_FREQUENCY_ATTR_NO_EHT, + NL80211_FREQUENCY_ATTR_PSD, /* keep last */ __NL80211_FREQUENCY_ATTR_AFTER_LAST, @@ -4325,6 +4365,8 @@ * a given frequency range. The value is in mBm (100 * dBm). * @NL80211_ATTR_DFS_CAC_TIME: DFS CAC time in milliseconds. * If not present or 0 default CAC time will be used. + * @NL80211_ATTR_POWER_RULE_PSD: power spectral density (in dBm). + * This could be negative. * @NL80211_REG_RULE_ATTR_MAX: highest regulatory rule attribute number * currently defined * @__NL80211_REG_RULE_ATTR_AFTER_LAST: internal use @@ -4342,6 +4384,8 @@ NL80211_ATTR_DFS_CAC_TIME, + NL80211_ATTR_POWER_RULE_PSD, + /* keep last */ __NL80211_REG_RULE_ATTR_AFTER_LAST, NL80211_REG_RULE_ATTR_MAX = __NL80211_REG_RULE_ATTR_AFTER_LAST - 1 @@ -4424,6 +4468,8 @@ * @NL80211_RRF_NO_160MHZ: 160MHz operation not allowed * @NL80211_RRF_NO_HE: HE operation not allowed * @NL80211_RRF_NO_320MHZ: 320MHz operation not allowed + * @NL80211_RRF_NO_EHT: EHT operation not allowed + * @NL80211_RRF_PSD: Ruleset has power spectral density value */ enum nl80211_reg_rule_flags { NL80211_RRF_NO_OFDM = 1<<0, @@ -4443,6 +4489,8 @@ NL80211_RRF_NO_160MHZ = 1<<16, NL80211_RRF_NO_HE = 1<<17, NL80211_RRF_NO_320MHZ = 1<<18, + NL80211_RRF_NO_EHT = 1<<19, + NL80211_RRF_PSD = 1<<20, }; #define NL80211_RRF_PASSIVE_SCAN NL80211_RRF_NO_IR @@ -5010,7 +5058,7 @@ * elements from a Beacon frame (bin); not present if no Beacon frame has * yet been received * @NL80211_BSS_CHAN_WIDTH: channel width of the control channel - * (u32, enum nl80211_bss_scan_width) + * (u32, enum nl80211_bss_scan_width) - No longer used! * @NL80211_BSS_BEACON_TSF: TSF of the last received beacon (u64) * (not present if no beacon frame has been received yet) * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and @@ -5255,6 +5303,7 @@ }; #define NL80211_HE_NSS_MAX 8 +#define NL80211_EHT_NSS_MAX 16 /** * struct nl80211_txrate_he - HE MCS/NSS txrate bitmap * @mcs: MCS bitmap table for each NSS (array index 0 for 1 stream, etc.) @@ -6372,6 +6421,12 @@ * in authentication and deauthentication frames sent to unassociated peer * using @NL80211_CMD_FRAME. * + * @NL80211_EXT_FEATURE_OWE_OFFLOAD: Driver/Device wants to do OWE DH IE + * handling in station mode. + * + * @NL80211_EXT_FEATURE_OWE_OFFLOAD_AP: Driver/Device wants to do OWE DH IE + * handling in AP mode. + * * @NUM_NL80211_EXT_FEATURES: number of extended features. * @MAX_NL80211_EXT_FEATURES: highest extended feature index. */ @@ -6443,6 +6498,8 @@ NL80211_EXT_FEATURE_PUNCT, NL80211_EXT_FEATURE_SECURE_NAN, NL80211_EXT_FEATURE_AUTH_AND_DEAUTH_RANDOM_TA, + NL80211_EXT_FEATURE_OWE_OFFLOAD, + NL80211_EXT_FEATURE_OWE_OFFLOAD_AP, /* add new features before the definition below */ NUM_NL80211_EXT_FEATURES, @@ -6567,6 +6624,7 @@ * these channels would passively be scanned. Also note that when the flag * is set, in addition to the colocated APs, PSC channels would also be * scanned if the user space has asked for it. + * @NL80211_SCAN_FLAG_UPDATE_DFS: scan results will update DFS state */ enum nl80211_scan_flags { NL80211_SCAN_FLAG_LOW_PRIORITY = 1<<0, @@ -6584,6 +6642,7 @@ NL80211_SCAN_FLAG_MIN_PREQ_CONTENT = 1<<12, NL80211_SCAN_FLAG_FREQ_KHZ = 1<<13, NL80211_SCAN_FLAG_COLOCATED_6GHZ = 1<<14, + NL80211_SCAN_FLAG_UPDATE_DFS = 1<<15, }; /** @@ -7578,7 +7637,7 @@ * @NL80211_FILS_DISCOVERY_ATTR_INT_MIN: Minimum packet interval (u32, TU). * Allowed range: 0..10000 (TU = Time Unit) * @NL80211_FILS_DISCOVERY_ATTR_INT_MAX: Maximum packet interval (u32, TU). - * Allowed range: 0..10000 (TU = Time Unit) + * Allowed range: 0..10000 (TU = Time Unit). If set to 0, the feature is disabled. * @NL80211_FILS_DISCOVERY_ATTR_TMPL: Template data for FILS discovery action * frame including the headers. * @@ -7611,7 +7670,8 @@ * * @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT: Maximum packet interval (u32, TU). * Allowed range: 0..20 (TU = Time Unit). IEEE P802.11ax/D6.0 - * 26.17.2.3.2 (AP behavior for fast passive scanning). + * 26.17.2.3.2 (AP behavior for fast passive scanning). If set to 0, the feature is + * disabled. * @NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL: Unsolicited broadcast probe response * frame template (binary). * diff -ruw linux-6.4/include/uapi/linux/serial_core.h linux-6.4-fbx/include/uapi/linux/serial_core.h --- linux-6.4/include/uapi/linux/serial_core.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/serial_core.h 2024-04-22 13:40:52.579931368 +0200 @@ -279,4 +279,7 @@ /* Sunplus UART */ #define PORT_SUNPLUS 123 +/* BCM63xx HS */ +#define PORT_BCM63XX_HS 123 + #endif /* _UAPILINUX_SERIAL_CORE_H */ diff -ruw linux-6.4/include/uapi/linux/sockios.h linux-6.4-fbx/include/uapi/linux/sockios.h --- linux-6.4/include/uapi/linux/sockios.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/sockios.h 2023-02-27 20:40:38.056744387 +0100 @@ -153,6 +153,14 @@ #define SIOCSHWTSTAMP 0x89b0 /* set and get config */ #define SIOCGHWTSTAMP 0x89b1 /* get config */ +/* fbxbridge call */ +#define SIOCGFBXBRIDGE 0x89c0 /* fbxbridge support */ +#define SIOCSFBXBRIDGE 0x89c1 /* Set fbxbridge options */ + +/* fbxdiverter call */ +#define SIOCGFBXDIVERT 0x89d0 /* fbxdiverter support */ +#define SIOCSFBXDIVERT 0x89d1 /* Set fbxdiverter options */ + /* Device private ioctl calls */ /* diff -ruw linux-6.4/include/uapi/linux/stddef.h linux-6.4-fbx/include/uapi/linux/stddef.h --- linux-6.4/include/uapi/linux/stddef.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/stddef.h 2024-04-22 13:40:52.579931368 +0200 @@ -45,3 +45,7 @@ TYPE NAME[]; \ } #endif + +#ifndef __counted_by +#define __counted_by(m) +#endif diff -ruw linux-6.4/include/uapi/linux/tcp.h linux-6.4-fbx/include/uapi/linux/tcp.h --- linux-6.4/include/uapi/linux/tcp.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/tcp.h 2024-04-22 13:40:52.579931368 +0200 @@ -134,6 +134,8 @@ #define TCP_REPAIR_OFF 0 #define TCP_REPAIR_OFF_NO_WP -1 /* Turn off without window probes */ +#define TCP_LINEAR_RTO 128 /* force use of linear timeouts */ + struct tcp_repair_opt { __u32 opt_code; __u32 opt_val; diff -ruw linux-6.4/include/uapi/linux/tty.h linux-6.4-fbx/include/uapi/linux/tty.h --- linux-6.4/include/uapi/linux/tty.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/include/uapi/linux/tty.h 2024-04-22 13:40:52.583931477 +0200 @@ -39,8 +39,9 @@ #define N_MCTP 28 /* MCTP-over-serial */ #define N_DEVELOPMENT 29 /* Manual out-of-tree testing */ #define N_CAN327 30 /* ELM327 based OBD-II interfaces */ +#define N_REMOTI 31 /* RemoTI over UART */ /* Always the newest line discipline + 1 */ -#define NR_LDISCS 31 +#define NR_LDISCS 32 #endif /* _UAPI_LINUX_TTY_H */ diff -ruw linux-6.4/init/Kconfig linux-6.4-fbx/init/Kconfig --- linux-6.4/init/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/init/Kconfig 2024-04-22 13:40:52.607932133 +0200 @@ -139,6 +139,15 @@ Maximum of each of the number of arguments and environment variables passed to init from the kernel command line. + +config CROSS_COMPILE + string "Cross-compiler tool prefix" + help + Same as running 'make CROSS_COMPILE=prefix-' but stored for + default make runs in this kernel build directory. You don't + need to set this unless you want the configured kernel build + directory to select the cross-compiler automatically. + config COMPILE_TEST bool "Compile also drivers which will not load" depends on HAS_IOMEM @@ -779,6 +788,44 @@ There is no additional runtime cost to printk with this enabled. +config FBX_DECRYPT_INITRD + bool "Decrypt initrd at boot" + depends on BLK_DEV_RAM + default n + +choice + prompt "initrd decryption encryption flavor" + default FBX_DECRYPT_INITRD_RC4 + +config FBX_DECRYPT_INITRD_RC4 + depends on FBX_DECRYPT_INITRD + bool "RC4" + +config FBX_DECRYPT_INITRD_CHACHA20 + depends on FBX_DECRYPT_INITRD + bool "CHACHA20" + select CRYPTO_CHACHA20 + +endchoice + +config FBX_DECRYPT_INITRD_KEY + string "Decryption key" + depends on FBX_DECRYPT_INITRD + +config FBX_DECRYPT_INITRD_NONCE + string "Decryption nonce/IV" + depends on FBX_DECRYPT_INITRD_CHACHA20 + +config FBX_VERIFY_INITRD + bool "Verify initrd at boot" + depends on FBX_DECRYPT_INITRD + select CRYPTO_RSA + select CRYPTO_SHA256 + +config FBX_VERIFY_INITRD_PUBKEY + string "Public key path for initrd verify" + depends on FBX_VERIFY_INITRD + # # Architectures with an unreliable sched_clock() should select this: # diff -ruw linux-6.4/init/Makefile linux-6.4-fbx/init/Makefile --- linux-6.4/init/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/init/Makefile 2024-04-22 13:40:52.607932133 +0200 @@ -15,6 +15,14 @@ obj-y += init_task.o +obj-$(CONFIG_FBX_DECRYPT_INITRD)+= fbx_decrypt_initrd.o +obj-$(CONFIG_FBX_DECRYPT_INITRD_RC4) += rc4.o +obj-$(CONFIG_FBX_VERIFY_INITRD) += fbx_initrd_pub_key.o + +PUB_KEY_PATH_UNQUOTED = $(patsubst "%",%,$(CONFIG_FBX_VERIFY_INITRD_PUBKEY)) + +init/fbx_initrd_pub_key.o: $(PUB_KEY_PATH_UNQUOTED) + mounts-y := do_mounts.o mounts-$(CONFIG_BLK_DEV_RAM) += do_mounts_rd.o mounts-$(CONFIG_BLK_DEV_INITRD) += do_mounts_initrd.o diff -ruw linux-6.4/init/init_task.c linux-6.4-fbx/init/init_task.c --- linux-6.4/init/init_task.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/init/init_task.c 2024-04-22 13:40:52.611932242 +0200 @@ -75,6 +75,7 @@ .stack = init_stack, .usage = REFCOUNT_INIT(2), .flags = PF_KTHREAD, + .exec_mode = EXEC_MODE_UNLIMITED, .prio = MAX_PRIO - 20, .static_prio = MAX_PRIO - 20, .normal_prio = MAX_PRIO - 20, diff -ruw linux-6.4/init/initramfs.c linux-6.4-fbx/init/initramfs.c --- linux-6.4/init/initramfs.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/init/initramfs.c 2024-04-22 13:40:52.611932242 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include static __initdata bool csum_present; static __initdata u32 io_csum; @@ -668,6 +669,10 @@ ssize_t written; struct file *file; loff_t pos = 0; +#ifdef CONFIG_FBX_DECRYPT_INITRD + int ret; + extern int fbx_decrypt_initrd(char *start, u32 size); +#endif unpack_to_rootfs(__initramfs_start, __initramfs_size); @@ -677,6 +682,15 @@ if (IS_ERR(file)) return; +#ifdef CONFIG_FBX_DECRYPT_INITRD + ret = fbx_decrypt_initrd((char*)initrd_start, + initrd_end - initrd_start); + if (ret) { + printk(KERN_ERR "Decrypt failed: %i\n", ret); + return; + } +#endif + written = xwrite(file, (char *)initrd_start, initrd_end - initrd_start, &pos); if (written != initrd_end - initrd_start) diff -ruw linux-6.4/kernel/fork.c linux-6.4-fbx/kernel/fork.c --- linux-6.4/kernel/fork.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/kernel/fork.c 2024-04-22 13:40:52.655933445 +0200 @@ -1195,6 +1195,11 @@ tsk->mm_cid_active = 0; tsk->migrate_from_cpu = -1; #endif + /* + * inherit parent exec_mode. + */ + tsk->exec_mode = orig->exec_mode; + return tsk; free_stack: diff -ruw linux-6.4/kernel/module/Kconfig linux-6.4-fbx/kernel/module/Kconfig --- linux-6.4/kernel/module/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/kernel/module/Kconfig 2024-04-22 13:40:52.675933991 +0200 @@ -385,6 +385,10 @@ one per line. The path can be absolute, or relative to the kernel source tree. +config UNUSED_KSYMS_WHITELIST_SYMS + string "Whitelist of symbols name to keep in ksymtab" + depends on TRIM_UNUSED_KSYMS + config MODULES_TREE_LOOKUP def_bool y depends on PERF_EVENTS || TRACING || CFI_CLANG diff -ruw linux-6.4/kernel/sys.c linux-6.4-fbx/kernel/sys.c --- linux-6.4/kernel/sys.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/kernel/sys.c 2024-04-22 13:40:52.715935084 +0200 @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -2708,6 +2709,18 @@ error = !!test_bit(MMF_VM_MERGE_ANY, &me->mm->flags); break; #endif + case PR_SET_EXEC_MODE: + if (arg2 != EXEC_MODE_UNLIMITED && + arg2 != EXEC_MODE_ONCE && + arg2 != EXEC_MODE_DENIED) + return -EINVAL; + + if (arg2 > current->exec_mode) + return -EPERM; + current->exec_mode = arg2; + return 0; + case PR_GET_EXEC_MODE: + return current->exec_mode; default: error = -EINVAL; break; diff -ruw linux-6.4/lib/Kconfig linux-6.4-fbx/lib/Kconfig --- linux-6.4/lib/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/lib/Kconfig 2024-04-22 13:40:52.747935958 +0200 @@ -728,6 +728,13 @@ config OBJAGG tristate "objagg" if COMPILE_TEST +config ARCH_HAS_FBXSERIAL + bool + +config FBXSERIAL + bool "fbxserial" + select CRC32 + endmenu config GENERIC_IOREMAP diff -ruw linux-6.4/lib/Makefile linux-6.4-fbx/lib/Makefile --- linux-6.4/lib/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/lib/Makefile 2024-04-22 13:40:52.751936067 +0200 @@ -430,3 +430,4 @@ ifeq ($(CONFIG_FORTIFY_SOURCE),y) $(obj)/string.o: $(obj)/$(TEST_FORTIFY_LOG) endif +obj-$(CONFIG_FBXSERIAL) += fbxserial.o diff -ruw linux-6.4/mm/Kconfig linux-6.4-fbx/mm/Kconfig --- linux-6.4/mm/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/mm/Kconfig 2024-04-22 13:40:52.807937597 +0200 @@ -709,6 +709,13 @@ config ARCH_SUPPORTS_MEMORY_FAILURE bool +config PAGE_FRAG_CACHE_ORDER + int "page order size of page fragment allocator" + default 3 + help + This allocator is used by networking only for skb->head allocation. + A large value speeds up allocation but causes memory fragmentation. + config MEMORY_FAILURE depends on MMU depends on ARCH_SUPPORTS_MEMORY_FAILURE diff -ruw linux-6.4/mm/memtest.c linux-6.4-fbx/mm/memtest.c --- linux-6.4/mm/memtest.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/mm/memtest.c 2024-04-22 13:40:52.835938362 +0200 @@ -28,6 +28,7 @@ 0x7a6c7258554e494cULL, /* yeah ;-) */ }; +#ifndef CONFIG_X86 // original code static void __init reserve_bad_mem(u64 pattern, phys_addr_t start_bad, phys_addr_t end_bad) { pr_info(" %016llx bad mem addr %pa - %pa reserved\n", @@ -68,19 +69,83 @@ early_memtest_done = true; } +#else // fbx6hd +/* + * Count memory errors in segment [a,b] + * If an error is detected, remove segment from memory pool. + */ +static void __init test_segment(unsigned long a, unsigned long b, u64 pat) +{ + int err_count = 0; + u64 *p; + + /* + * If an exception, such as page fault, is required to prefetch the data, + * then the software prefetch instruction retires without prefetching data. + */ + for (p = __va(a); p != __va(b); p += 4) { + __builtin_prefetch(p+64); + if (p[0] != pat || p[1] != pat || p[2] != pat || p[3] != pat) + ++err_count; + } + + if (err_count) { + pr_warn("BAD+RAM: %lx-%lx: N=%d", a, b, err_count); + memblock_reserve(a, b-a); + } +} + +typedef u64 u128 __attribute__ ((__vector_size__ (16))); + +static void __init write_pattern(unsigned long a, unsigned long b, u64 pat) +{ + u128 val = (u128){ pat, pat }; + u128 *p = __va(a), *q = __va(b); + kernel_fpu_begin(); + asm("movdqa %0, %%xmm0" : : "m" (val)); + for (/**/; p != q; ++p) + asm("movntdq %%xmm0, %0" : "=m" (*p)); + kernel_fpu_end(); +} + +#define SEGMENT_SIZE (1 << 16) // 64K + +static void __init memtest(u64 pattern, phys_addr_t start_phys, phys_addr_t size) +{ + /* On fbx6hd, ulong is wide enough to store physical addresses */ + unsigned long curr = start_phys; + unsigned long next = ALIGN(curr + 1, SEGMENT_SIZE); + unsigned long end = start_phys + size; + + // Check alignment for correct loop unrolling + if (curr & 0x1f || end & 0x1f) { + pr_warn("BAD+RAM: %lx-%lx: misaligned", curr, end); + return; + } + + write_pattern(curr, end, pattern); + + while (curr < end) { + if (next > end) + next = end; + test_segment(curr, next, pattern); + curr = next; + next += SEGMENT_SIZE; + } +} +#endif static void __init do_one_pass(u64 pattern, phys_addr_t start, phys_addr_t end) { u64 i; phys_addr_t this_start, this_end; + pr_info("pattern %016llx\n", cpu_to_be64(pattern)); for_each_free_mem_range(i, NUMA_NO_NODE, MEMBLOCK_NONE, &this_start, &this_end, NULL) { this_start = clamp(this_start, start, end); this_end = clamp(this_end, start, end); if (this_start < this_end) { - pr_info(" %pa - %pa pattern %016llx\n", - &this_start, &this_end, cpu_to_be64(pattern)); memtest(pattern, this_start, this_end - this_start); } } diff -ruw linux-6.4/mm/page_alloc.c linux-6.4-fbx/mm/page_alloc.c --- linux-6.4/mm/page_alloc.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/mm/page_alloc.c 2024-04-22 13:40:52.843938581 +0200 @@ -4887,18 +4887,24 @@ { struct page *page = NULL; gfp_t gfp = gfp_mask; + unsigned int order; #if (PAGE_SIZE < PAGE_FRAG_CACHE_MAX_SIZE) gfp_mask |= __GFP_COMP | __GFP_NOWARN | __GFP_NORETRY | __GFP_NOMEMALLOC; page = alloc_pages_node(NUMA_NO_NODE, gfp_mask, PAGE_FRAG_CACHE_MAX_ORDER); + order = PAGE_FRAG_CACHE_MAX_ORDER; nc->size = page ? PAGE_FRAG_CACHE_MAX_SIZE : PAGE_SIZE; #endif - if (unlikely(!page)) + if (unlikely(!page)) { page = alloc_pages_node(NUMA_NO_NODE, gfp, 0); + order = 0; + } nc->va = page ? page_address(page) : NULL; + if (page) + set_page_owner_frag_cache(page, order, nc); return page; } diff -ruw linux-6.4/mm/vmalloc.c linux-6.4-fbx/mm/vmalloc.c --- linux-6.4/mm/vmalloc.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/mm/vmalloc.c 2024-04-22 13:40:52.855938909 +0200 @@ -3340,6 +3340,19 @@ EXPORT_SYMBOL_GPL(__vmalloc_node); #endif +/* + * __vmalloc_pgprot(): same as __vmalloc, but with a pgprot_t parameter. + * + * required for IntelCE drivers. + */ +void *__vmalloc_pgprot(unsigned long size, gfp_t gfp_mask, pgprot_t prot) +{ + return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, + gfp_mask, prot, 0, NUMA_NO_NODE, + __builtin_return_address(0)); +} +EXPORT_SYMBOL(__vmalloc_pgprot); + void *__vmalloc(unsigned long size, gfp_t gfp_mask) { return __vmalloc_node(size, 1, gfp_mask, NUMA_NO_NODE, diff -ruw linux-6.4/net/8021q/Kconfig linux-6.4-fbx/net/8021q/Kconfig --- linux-6.4/net/8021q/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/8021q/Kconfig 2024-04-22 13:40:52.863939127 +0200 @@ -39,3 +39,12 @@ supersedes GVRP and is not backwards-compatible. If unsure, say N. + +config VLAN_FBX + bool "Freebox specific VLAN ethertype to bypass dump switches" + depends on VLAN_8021Q + help + Select this to enable FBX VLAN specific ethertype to bypass + switches that drops 802.1q packets + + If unsure, say N. diff -ruw linux-6.4/net/8021q/vlan.c linux-6.4-fbx/net/8021q/vlan.c --- linux-6.4/net/8021q/vlan.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/8021q/vlan.c 2024-04-22 13:40:52.863939127 +0200 @@ -211,7 +211,7 @@ /* Attach a VLAN device to a mac address (ie Ethernet Card). * Returns 0 if the device was created or a negative error code otherwise. */ -static int register_vlan_device(struct net_device *real_dev, u16 vlan_id) +int register_vlan_device(struct net_device *real_dev, u16 vlan_id) { struct net_device *new_dev; struct vlan_dev_priv *vlan; diff -ruw linux-6.4/net/8021q/vlan.h linux-6.4-fbx/net/8021q/vlan.h --- linux-6.4/net/8021q/vlan.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/8021q/vlan.h 2024-04-22 13:40:52.863939127 +0200 @@ -16,6 +16,9 @@ enum vlan_protos { VLAN_PROTO_8021Q = 0, VLAN_PROTO_8021AD, +#ifdef CONFIG_VLAN_FBX + VLAN_PROTO_FBX, +#endif VLAN_PROTO_NUM, }; @@ -43,6 +46,10 @@ return VLAN_PROTO_8021Q; case htons(ETH_P_8021AD): return VLAN_PROTO_8021AD; +#ifdef CONFIG_VLAN_FBX + case htons(ETH_P_FBXVLAN): + return VLAN_PROTO_FBX; +#endif default: WARN(1, "invalid VLAN protocol: 0x%04x\n", ntohs(proto)); return -EINVAL; diff -ruw linux-6.4/net/8021q/vlan_core.c linux-6.4-fbx/net/8021q/vlan_core.c --- linux-6.4/net/8021q/vlan_core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/8021q/vlan_core.c 2024-04-22 13:40:52.863939127 +0200 @@ -99,6 +99,12 @@ } EXPORT_SYMBOL(__vlan_find_dev_deep_rcu); +struct net_device *vlan_dev_upper_dev(const struct net_device *dev) +{ + return vlan_dev_priv(dev)->real_dev; +} +EXPORT_SYMBOL(vlan_dev_upper_dev); + struct net_device *vlan_dev_real_dev(const struct net_device *dev) { struct net_device *ret = vlan_dev_priv(dev)->real_dev; diff -ruw linux-6.4/net/8021q/vlan_netlink.c linux-6.4-fbx/net/8021q/vlan_netlink.c --- linux-6.4/net/8021q/vlan_netlink.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/8021q/vlan_netlink.c 2024-04-22 13:40:52.863939127 +0200 @@ -63,6 +63,9 @@ switch (nla_get_be16(data[IFLA_VLAN_PROTOCOL])) { case htons(ETH_P_8021Q): case htons(ETH_P_8021AD): +#ifdef CONFIG_VLAN_FBX + case htons(ETH_P_FBXVLAN): +#endif break; default: NL_SET_ERR_MSG_MOD(extack, "Invalid VLAN protocol"); diff -ruw linux-6.4/net/Kconfig linux-6.4-fbx/net/Kconfig --- linux-6.4/net/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/Kconfig 2024-04-22 13:40:52.867939237 +0200 @@ -32,6 +32,10 @@ This option can be selected by other options that need compat netlink messages. +config NET_PROMISC_MESSAGES + bool "show promisc/allmulti status change in kernel log" + default y + config COMPAT_NETLINK_MESSAGES def_bool y depends on COMPAT @@ -60,6 +64,19 @@ menu "Networking options" +config NETSKBPAD + int "Size reserved by dev_alloc_skb" + default 32 + +config NETRXTHREAD + bool "Do rx network processing in kernel thread" + depends on BROKEN_ON_SMP + +config NETRXTHREAD_RX_QUEUE + int "Number of rx queues" + default 1 + depends on NETRXTHREAD + source "net/packet/Kconfig" source "net/unix/Kconfig" source "net/tls/Kconfig" @@ -236,6 +253,8 @@ source "net/tipc/Kconfig" source "net/atm/Kconfig" source "net/l2tp/Kconfig" +source "net/fbxatm/Kconfig" +source "net/fbxbridge/Kconfig" source "net/802/Kconfig" source "net/bridge/Kconfig" source "net/dsa/Kconfig" diff -ruw linux-6.4/net/Makefile linux-6.4-fbx/net/Makefile --- linux-6.4/net/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/Makefile 2024-04-22 13:40:52.867939237 +0200 @@ -39,6 +39,12 @@ obj-$(CONFIG_STREAM_PARSER) += strparser/ obj-$(CONFIG_ATM) += atm/ obj-$(CONFIG_L2TP) += l2tp/ +ifneq ($(CONFIG_FBXATM),) +obj-y += fbxatm/ +endif +ifneq ($(CONFIG_FBXBRIDGE),) +obj-y += fbxbridge/ +endif obj-$(CONFIG_PHONET) += phonet/ ifneq ($(CONFIG_VLAN_8021Q),) obj-y += 8021q/ diff -ruw linux-6.4/net/batman-adv/Kconfig linux-6.4-fbx/net/batman-adv/Kconfig --- linux-6.4/net/batman-adv/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/Kconfig 2024-04-22 13:40:52.871939346 +0200 @@ -94,3 +94,31 @@ messages using the generic tracing infrastructure of the kernel. BATMAN_ADV_DEBUG must also be selected to get trace events for batadv_dbg. + +config BATMAN_ADV_FBX + bool "B.A.T.M.A.N. FBX specific features" + depends on BATMAN_ADV + help + This enables FBX specific options to be selected (e.g. MTU + discovery, SLAP protocol). + +config BATMAN_ADV_FBX_MTU + bool "B.A.T.M.A.N. FBX path max MTU discovery feature" + depends on BATMAN_ADV_FBX + help + This enables FBX path max MTU discovery protocol. + +config BATMAN_ADV_FBX_SLAP + bool "B.A.T.M.A.N. FBX SLAP" + depends on BATMAN_ADV_FBX + help + This enables FBX SLAP (simple loop avoidance protocol) to handle + blend of LAN and B.A.T.M.A.N traffic on ethernet port correctly + in Freebox configuration + +config BATMAN_ADV_FBX_PERIF_ROUTER + bool "B.A.T.M.A.N. FBX perif router" + depends on BATMAN_ADV_FBX && BATMAN_ADV_BATMAN_V + help + Keep track of per interface best router to reach a specific + originator. diff -ruw linux-6.4/net/batman-adv/Makefile linux-6.4-fbx/net/batman-adv/Makefile --- linux-6.4/net/batman-adv/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/Makefile 2024-04-22 13:40:52.871939346 +0200 @@ -4,6 +4,7 @@ # Marek Lindner, Simon Wunderlich obj-$(CONFIG_BATMAN_ADV) += batman-adv.o + batman-adv-y += bat_algo.o batman-adv-y += bat_iv_ogm.o batman-adv-$(CONFIG_BATMAN_ADV_BATMAN_V) += bat_v.o @@ -30,5 +31,9 @@ batman-adv-y += tp_meter.o batman-adv-y += translation-table.o batman-adv-y += tvlv.o +batman-adv-$(CONFIG_BATMAN_ADV_FBX) += fbx/fbx.o +batman-adv-$(CONFIG_BATMAN_ADV_FBX_MTU) += fbx/mtu.o +batman-adv-$(CONFIG_BATMAN_ADV_FBX_SLAP) += fbx/slap.o +batman-adv-$(CONFIG_BATMAN_ADV_FBX_PERIF_ROUTER) += fbx/router.o CFLAGS_trace.o := -I$(src) diff -ruw linux-6.4/net/batman-adv/bat_v.c linux-6.4-fbx/net/batman-adv/bat_v.c --- linux-6.4/net/batman-adv/bat_v.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/bat_v.c 2024-04-22 13:40:52.871939346 +0200 @@ -38,6 +38,8 @@ #include "hard-interface.h" #include "hash.h" #include "log.h" +#include "fbx/fbx.h" +#include "fbx/mtu.h" #include "netlink.h" #include "originator.h" @@ -130,6 +132,7 @@ batadv_v_neigh_dump_neigh(struct sk_buff *msg, u32 portid, u32 seq, struct batadv_hardif_neigh_node *hardif_neigh) { + struct batadv_priv *bat_priv; void *hdr; unsigned int last_seen_msecs; u32 throughput; @@ -154,6 +157,9 @@ nla_put_u32(msg, BATADV_ATTR_THROUGHPUT, throughput)) goto nla_put_failure; + bat_priv = netdev_priv(hardif_neigh->if_incoming->soft_iface); + batadv_fbx_nl(bat_priv, BATADV_CMD_GET_NEIGHBORS, NULL, msg, + hardif_neigh); genlmsg_end(msg, hdr); return 0; @@ -311,6 +317,9 @@ if (best && nla_put_flag(msg, BATADV_ATTR_FLAG_BEST)) goto nla_put_failure; + batadv_fbx_nl(bat_priv, BATADV_CMD_GET_ORIGINATORS, NULL, msg, + orig_node); + genlmsg_end(msg, hdr); return 0; diff -ruw linux-6.4/net/batman-adv/bat_v_elp.c linux-6.4-fbx/net/batman-adv/bat_v_elp.c --- linux-6.4/net/batman-adv/bat_v_elp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/bat_v_elp.c 2024-04-22 13:40:52.871939346 +0200 @@ -140,7 +140,8 @@ } default_throughput: - if (!(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT)) { + if (hard_iface->soft_iface && + !(hard_iface->bat_v.flags & BATADV_WARNING_DEFAULT)) { batadv_info(hard_iface->soft_iface, "WiFi driver or ethtool info does not provide information about link speeds on interface %s, therefore defaulting to hardcoded throughput values of %u.%1u Mbps. Consider overriding the throughput manually or checking your driver.\n", hard_iface->net_dev->name, @@ -505,7 +506,7 @@ struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batadv_elp_packet *elp_packet; struct batadv_hard_iface *primary_if; - struct ethhdr *ethhdr = (struct ethhdr *)skb_mac_header(skb); + struct ethhdr *ethhdr; bool res; int ret = NET_RX_DROP; @@ -513,6 +514,7 @@ if (!res) goto free_skb; + ethhdr = eth_hdr(skb); if (batadv_is_my_mac(bat_priv, ethhdr->h_source)) goto free_skb; diff -ruw linux-6.4/net/batman-adv/bat_v_ogm.c linux-6.4-fbx/net/batman-adv/bat_v_ogm.c --- linux-6.4/net/batman-adv/bat_v_ogm.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/bat_v_ogm.c 2024-04-22 13:40:52.871939346 +0200 @@ -42,6 +42,7 @@ #include "send.h" #include "translation-table.h" #include "tvlv.h" +#include "fbx/fbx.h" /** * batadv_v_ogm_orig_get() - retrieve and possibly create an originator node @@ -123,8 +124,10 @@ { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); - if (hard_iface->if_status != BATADV_IF_ACTIVE) + if (hard_iface->if_status != BATADV_IF_ACTIVE) { + kfree_skb(skb); return; + } batadv_inc_counter(bat_priv, BATADV_CNT_MGMT_TX); batadv_add_counter(bat_priv, BATADV_CNT_MGMT_TX_BYTES, @@ -473,12 +476,14 @@ static u32 batadv_v_forward_penalty(struct batadv_priv *bat_priv, struct batadv_hard_iface *if_incoming, struct batadv_hard_iface *if_outgoing, - u32 throughput) + u32 throughput, bool *half_duplex) { int if_hop_penalty = atomic_read(&if_incoming->hop_penalty); int hop_penalty = atomic_read(&bat_priv->hop_penalty); int hop_penalty_max = BATADV_TQ_MAX_VALUE; + *half_duplex = false; + /* Apply per hardif hop penalty */ throughput = throughput * (hop_penalty_max - if_hop_penalty) / hop_penalty_max; @@ -493,8 +498,10 @@ */ if (throughput > 10 && if_incoming == if_outgoing && - !(if_incoming->bat_v.flags & BATADV_FULL_DUPLEX)) + !(if_incoming->bat_v.flags & BATADV_FULL_DUPLEX)) { + *half_duplex = true; return throughput / 2; + } /* hop penalty of 255 equals 100% */ return throughput * (hop_penalty_max - hop_penalty) / hop_penalty_max; @@ -572,6 +579,9 @@ /* apply forward penalty */ ogm_forward = (struct batadv_ogm2_packet *)skb_buff; + ogm_forward->flags &= ~BATADV_V_HALF_DUPLEX; + if (neigh_ifinfo->bat_v.half_duplex) + ogm_forward->flags |= BATADV_V_HALF_DUPLEX; ogm_forward->throughput = htonl(neigh_ifinfo->bat_v.throughput); ogm_forward->ttl--; @@ -614,6 +624,7 @@ bool protection_started = false; int ret = -EINVAL; u32 path_throughput; + bool half_duplex; s32 seq_diff; orig_ifinfo = batadv_orig_ifinfo_new(orig_node, if_outgoing); @@ -655,10 +666,12 @@ path_throughput = batadv_v_forward_penalty(bat_priv, if_incoming, if_outgoing, - ntohl(ogm2->throughput)); + ntohl(ogm2->throughput), + &half_duplex); neigh_ifinfo->bat_v.throughput = path_throughput; neigh_ifinfo->bat_v.last_seqno = ntohl(ogm2->seqno); neigh_ifinfo->last_ttl = ogm2->ttl; + neigh_ifinfo->bat_v.half_duplex = half_duplex; if (seq_diff > 0 || protection_started) ret = 1; @@ -842,6 +855,28 @@ } /** + * batadv_v_get_throughput() - Compute path throughput from ogm + * @ogm: OGM2 packet received + * @neigh: Neighbour OGM packet has been received from + * @return: Estimated path throughput + */ +static u32 batadv_v_get_throughput(struct batadv_ogm2_packet *ogm, + struct batadv_hardif_neigh_node *neigh) +{ + u32 oth, lth; + + oth = ntohl(ogm->throughput); + lth = ewma_throughput_read(&neigh->bat_v.throughput); + + if (!(ogm->flags & BATADV_V_HALF_DUPLEX)) + return min_t(u32, lth, oth); + + /* OGM throughput was divided by two for retrocompatibility sake */ + oth *= 2; + return oth * lth / (oth + lth); +} + +/** * batadv_v_ogm_process() - process an incoming batman v OGM * @skb: the skb containing the OGM * @ogm_offset: offset to the OGM which should be processed (for aggregates) @@ -857,7 +892,7 @@ struct batadv_neigh_node *neigh_node = NULL; struct batadv_hard_iface *hard_iface; struct batadv_ogm2_packet *ogm_packet; - u32 ogm_throughput, link_throughput, path_throughput; + u32 ogm_throughput; int ret; ethhdr = eth_hdr(skb); @@ -911,9 +946,8 @@ * - For OGMs traversing more than hop the path throughput metric is * the smaller of the path throughput and the link throughput. */ - link_throughput = ewma_throughput_read(&hardif_neigh->bat_v.throughput); - path_throughput = min_t(u32, link_throughput, ogm_throughput); - ogm_packet->throughput = htonl(path_throughput); + ogm_packet->throughput = htonl(batadv_v_get_throughput(ogm_packet, + hardif_neigh)); batadv_v_ogm_process_per_outif(bat_priv, ethhdr, ogm_packet, orig_node, neigh_node, if_incoming, @@ -967,6 +1001,7 @@ } rcu_read_unlock(); out: + batadv_fbx_ogm_process(bat_priv, orig_node, neigh_node, ogm_packet); batadv_orig_node_put(orig_node); batadv_neigh_node_put(neigh_node); batadv_hardif_neigh_put(hardif_neigh); @@ -985,7 +1020,7 @@ { struct batadv_priv *bat_priv = netdev_priv(if_incoming->soft_iface); struct batadv_ogm2_packet *ogm_packet; - struct ethhdr *ethhdr = eth_hdr(skb); + struct ethhdr *ethhdr; int ogm_offset; u8 *packet_pos; int ret = NET_RX_DROP; @@ -999,6 +1034,7 @@ if (!batadv_check_management_packet(skb, if_incoming, BATADV_OGM2_HLEN)) goto free_skb; + ethhdr = eth_hdr(skb); if (batadv_is_my_mac(bat_priv, ethhdr->h_source)) goto free_skb; diff -ruw linux-6.4/net/batman-adv/fragmentation.c linux-6.4-fbx/net/batman-adv/fragmentation.c --- linux-6.4/net/batman-adv/fragmentation.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/fragmentation.c 2024-04-22 13:40:52.875939455 +0200 @@ -28,6 +28,8 @@ #include "routing.h" #include "send.h" +#include "fbx/mtu.h" + /** * batadv_frag_clear_chain() - delete entries in the fragment buffer chain * @head: head of chain with entries. @@ -445,7 +447,7 @@ struct batadv_hard_iface *primary_if = NULL; struct batadv_frag_packet frag_header; struct sk_buff *skb_fragment; - unsigned int mtu = net_dev->mtu; + unsigned int mtu = batadv_mtu_get_for_neigh(neigh_node->hardif_neigh); unsigned int header_size = sizeof(frag_header); unsigned int max_fragment_size, num_fragments; int ret; diff -ruw linux-6.4/net/batman-adv/hard-interface.c linux-6.4-fbx/net/batman-adv/hard-interface.c --- linux-6.4/net/batman-adv/hard-interface.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/hard-interface.c 2024-04-22 13:40:52.875939455 +0200 @@ -36,6 +36,7 @@ #include "gateway_client.h" #include "log.h" #include "originator.h" +#include "fbx/fbx.h" #include "send.h" #include "soft-interface.h" #include "translation-table.h" @@ -469,6 +470,7 @@ batadv_dat_init_own_addr(bat_priv, primary_if); batadv_bla_update_orig_address(bat_priv, primary_if, oldif); + batadv_fbx_primary_update(bat_priv, primary_if); out: batadv_hardif_put(primary_if); } @@ -970,8 +972,10 @@ batadv_hardif_remove_interface(hard_iface); break; case NETDEV_CHANGEMTU: - if (hard_iface->soft_iface) + if (hard_iface->soft_iface) { batadv_update_min_mtu(hard_iface->soft_iface); + batadv_fbx_hardif_update(hard_iface); + } break; case NETDEV_CHANGEADDR: if (hard_iface->if_status == BATADV_IF_NOT_IN_USE) diff -ruw linux-6.4/net/batman-adv/main.c linux-6.4-fbx/net/batman-adv/main.c --- linux-6.4/net/batman-adv/main.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/main.c 2024-04-22 13:40:52.875939455 +0200 @@ -59,6 +59,7 @@ #include "soft-interface.h" #include "tp_meter.h" #include "translation-table.h" +#include "fbx/fbx.h" /* List manipulations on hardif_list have to be rtnl_lock()'ed, * list traversals just rcu-locked @@ -115,6 +116,7 @@ register_netdevice_notifier(&batadv_hard_if_notifier); rtnl_link_register(&batadv_link_ops); batadv_netlink_register(); + batadv_fbx_init(); pr_info("B.A.T.M.A.N. advanced %s (compatibility version %i) loaded\n", BATADV_SOURCE_VERSION, BATADV_COMPAT_VERSION); @@ -129,6 +131,7 @@ static void __exit batadv_exit(void) { + batadv_fbx_exit(); batadv_netlink_unregister(); rtnl_link_unregister(&batadv_link_ops); unregister_netdevice_notifier(&batadv_hard_if_notifier); @@ -228,6 +231,7 @@ batadv_gw_init(bat_priv); batadv_mcast_init(bat_priv); + batadv_fbx_new_priv(bat_priv); atomic_set(&bat_priv->gw.reselect, 0); atomic_set(&bat_priv->mesh_state, BATADV_MESH_ACTIVE); @@ -270,6 +274,7 @@ batadv_dat_free(bat_priv); batadv_bla_free(bat_priv); + batadv_fbx_free_priv(bat_priv); batadv_mcast_free(bat_priv); /* Free the TT and the originator tables only after having terminated @@ -481,6 +486,7 @@ memset(skb->cb, 0, sizeof(struct batadv_skb_cb)); idx = batadv_ogm_packet->packet_type; + (*batadv_rx_handler[idx])(skb, hard_iface); batadv_hardif_put(hard_iface); @@ -526,6 +532,7 @@ BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_vlan_data) != 8); BUILD_BUG_ON(sizeof(struct batadv_tvlv_tt_change) != 12); BUILD_BUG_ON(sizeof(struct batadv_tvlv_roam_adv) != 8); + BUILD_BUG_ON(sizeof(struct batadv_fbx_packet) != 8); i = sizeof_field(struct sk_buff, cb); BUILD_BUG_ON(sizeof(struct batadv_skb_cb) > i); diff -ruw linux-6.4/net/batman-adv/netlink.c linux-6.4-fbx/net/batman-adv/netlink.c --- linux-6.4/net/batman-adv/netlink.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/netlink.c 2024-04-22 13:40:52.875939455 +0200 @@ -51,6 +51,7 @@ #include "soft-interface.h" #include "tp_meter.h" #include "translation-table.h" +#include "fbx/fbx.h" struct genl_family batadv_netlink_family; @@ -58,6 +59,7 @@ enum batadv_netlink_multicast_groups { BATADV_NL_MCGRP_CONFIG, BATADV_NL_MCGRP_TPMETER, + BATADV_NL_MCGRP_ROUTE, }; /** @@ -89,6 +91,7 @@ static const struct genl_multicast_group batadv_netlink_mcgrps[] = { [BATADV_NL_MCGRP_CONFIG] = { .name = BATADV_NL_MCAST_GROUP_CONFIG }, [BATADV_NL_MCGRP_TPMETER] = { .name = BATADV_NL_MCAST_GROUP_TPMETER }, + [BATADV_NL_MCGRP_ROUTE] = { .name = BATADV_NL_MCAST_GROUP_ROUTE }, }; static const struct nla_policy batadv_netlink_policy[NUM_BATADV_ATTR] = { @@ -151,6 +154,7 @@ [BATADV_ATTR_ORIG_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_ELP_INTERVAL] = { .type = NLA_U32 }, [BATADV_ATTR_THROUGHPUT_OVERRIDE] = { .type = NLA_U32 }, + [BATADV_ATTR_FBX] = { .type = NLA_NESTED }, }; /** @@ -361,6 +365,7 @@ batadv_hardif_put(primary_if); + batadv_fbx_nl(bat_priv, cmd, NULL, msg, NULL); genlmsg_end(msg, hdr); return 0; @@ -613,6 +618,7 @@ atomic_set(&bat_priv->orig_interval, orig_interval); } + batadv_fbx_nl(bat_priv, BATADV_CMD_SET_MESH, info, NULL, NULL); batadv_netlink_notify_mesh(bat_priv); return 0; @@ -1151,6 +1157,100 @@ return 0; } +/** + * batadv_netlink_mesh_fill: Fill message with route attributes + * @msg: Nelink message to dump route info into + * @bat_priv: the bat priv with all the soft interface information + * @cmd: type of netlink message + * @orig: Current route destination originator + * @neigh: Current best neighbour for this originator + * @best: Globally best route + * @portid: Port making netlink request + * @seq: sequence number for message + * @flags: Additionnal netlink flag message + */ +static int batadv_netlink_route_fill(struct sk_buff *msg, + struct batadv_priv *bat_priv, + enum batadv_nl_commands cmd, + struct batadv_orig_node *orig_node, + struct batadv_neigh_node *neigh_node, + bool best, + u32 portid, u32 seq, int flags) +{ + struct net_device *soft_iface = bat_priv->soft_iface; + void *hdr; + + hdr = genlmsg_put(msg, portid, seq, &batadv_netlink_family, flags, cmd); + if (!hdr) + return -ENOBUFS; + + if (nla_put_u32(msg, BATADV_ATTR_MESH_IFINDEX, soft_iface->ifindex)) + goto nla_put_failure; + + if (nla_put(msg, BATADV_ATTR_MESH_ADDRESS, ETH_ALEN, + soft_iface->dev_addr)) + goto nla_put_failure; + + if (nla_put(msg, BATADV_ATTR_ORIG_ADDRESS, ETH_ALEN, + orig_node->orig)) + goto nla_put_failure; + + if (best && nla_put_flag(msg, BATADV_ATTR_FLAG_BEST)) + goto nla_put_failure; + + if (neigh_node && nla_put(msg, BATADV_ATTR_NEIGH_ADDRESS, ETH_ALEN, + neigh_node->addr)) + goto nla_put_failure; + + if (neigh_node && + nla_put_u32(msg, BATADV_ATTR_HARD_IFINDEX, + neigh_node->if_incoming->net_dev->ifindex)) + goto nla_put_failure; + + genlmsg_end(msg, hdr); + return 0; + +nla_put_failure: + genlmsg_cancel(msg, hdr); + return -EMSGSIZE; +} + +/** + * batadv_netlink_notify_route() - send route events to listener + * @bat_priv: the bat priv with all the soft interface information + * @ev: Route event type (add, del or change) + * @orig: The route destination node + * @neigh: Best neighbour for this route + * @best: This is a globaly best route + * + * Return: 0 on success, < 0 on error + */ +int batadv_netlink_notify_route(struct batadv_priv *bat_priv, + enum batadv_nl_commands ev, + struct batadv_orig_node *orig_node, + struct batadv_neigh_node *neigh_node, + bool best) +{ + struct sk_buff *msg; + int ret; + + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_ATOMIC); + if (!msg) + return -ENOMEM; + + ret = batadv_netlink_route_fill(msg, bat_priv, ev, orig_node, + neigh_node, best, 0, 0, 0); + if (ret < 0) { + nlmsg_free(msg); + return ret; + } + + genlmsg_multicast_netns(&batadv_netlink_family, + dev_net(bat_priv->soft_iface), msg, 0, + BATADV_NL_MCGRP_ROUTE, GFP_KERNEL); + return 0; +} + /** * batadv_get_softif_from_info() - Retrieve soft interface from genl attributes * @net: the applicable net namespace diff -ruw linux-6.4/net/batman-adv/netlink.h linux-6.4-fbx/net/batman-adv/netlink.h --- linux-6.4/net/batman-adv/netlink.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/netlink.h 2024-04-22 13:40:52.875939455 +0200 @@ -27,6 +27,12 @@ int batadv_netlink_notify_vlan(struct batadv_priv *bat_priv, struct batadv_softif_vlan *vlan); +int batadv_netlink_notify_route(struct batadv_priv *bat_priv, + enum batadv_nl_commands ev, + struct batadv_orig_node *orig_node, + struct batadv_neigh_node *neigh_node, + bool best); + extern struct genl_family batadv_netlink_family; #endif /* _NET_BATMAN_ADV_NETLINK_H_ */ diff -ruw linux-6.4/net/batman-adv/originator.c linux-6.4-fbx/net/batman-adv/originator.c --- linux-6.4/net/batman-adv/originator.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/originator.c 2024-04-22 13:40:52.875939455 +0200 @@ -42,6 +42,7 @@ #include "routing.h" #include "soft-interface.h" #include "translation-table.h" +#include "fbx/fbx.h" /* hash class keys */ static struct lock_class_key batadv_orig_hash_lock_class_key; @@ -249,6 +250,7 @@ hlist_del_init_rcu(&hardif_neigh->list); spin_unlock_bh(&hardif_neigh->if_incoming->neigh_list_lock); + batadv_fbx_neigh_release(hardif_neigh); batadv_hardif_put(hardif_neigh->if_incoming); kfree_rcu(hardif_neigh, rcu); } @@ -381,6 +383,8 @@ INIT_HLIST_NODE(&orig_ifinfo->list); kref_init(&orig_ifinfo->refcount); + batadv_fbx_orig_ifinfo_init(orig_ifinfo); + kref_get(&orig_ifinfo->refcount); hlist_add_head_rcu(&orig_ifinfo->list, &orig_node->ifinfo_list); @@ -517,6 +521,7 @@ { struct batadv_priv *bat_priv = netdev_priv(hard_iface->soft_iface); struct batadv_hardif_neigh_node *hardif_neigh; + int ret; spin_lock_bh(&hard_iface->neigh_list_lock); @@ -537,6 +542,13 @@ hardif_neigh->last_seen = jiffies; kref_init(&hardif_neigh->refcount); + ret = batadv_fbx_neigh_init(hardif_neigh); + if (ret) { + batadv_hardif_put(hard_iface); + kfree(hardif_neigh); + hardif_neigh = NULL; + goto out; + } if (bat_priv->algo_ops->neigh.hardif_init) bat_priv->algo_ops->neigh.hardif_init(hardif_neigh); @@ -776,6 +788,8 @@ orig_ifinfo = container_of(ref, struct batadv_orig_ifinfo, refcount); + batadv_fbx_orig_ifinfo_release(orig_ifinfo); + if (orig_ifinfo->if_outgoing != BATADV_IF_DEFAULT) batadv_hardif_put(orig_ifinfo->if_outgoing); @@ -796,6 +810,8 @@ orig_node = container_of(rcu, struct batadv_orig_node, rcu); + batadv_fbx_orig_release(orig_node); + batadv_mcast_purge_orig(orig_node); batadv_frag_purge_orig(orig_node, NULL); @@ -906,7 +922,7 @@ struct batadv_orig_node *orig_node; struct batadv_orig_node_vlan *vlan; unsigned long reset_time; - int i; + int ret, i; batadv_dbg(BATADV_DBG_BATMAN, bat_priv, "Creating new originator: %pM\n", addr); @@ -964,6 +980,10 @@ orig_node->fragments[i].size = 0; } + ret = batadv_fbx_orig_init(orig_node); + if (ret) + goto free_orig_node; + return orig_node; free_orig_node: kfree(orig_node); diff -ruw linux-6.4/net/batman-adv/routing.c linux-6.4-fbx/net/batman-adv/routing.c --- linux-6.4/net/batman-adv/routing.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/routing.c 2024-04-22 13:40:52.879939565 +0200 @@ -37,6 +37,8 @@ #include "tp_meter.h" #include "translation-table.h" #include "tvlv.h" +#include "netlink.h" +#include "fbx/fbx.h" static int batadv_route_unicast_packet(struct sk_buff *skb, struct batadv_hard_iface *recv_if); @@ -57,6 +59,7 @@ { struct batadv_orig_ifinfo *orig_ifinfo; struct batadv_neigh_node *curr_router; + enum batadv_nl_commands cmd; orig_ifinfo = batadv_orig_ifinfo_get(orig_node, recv_if); if (!orig_ifinfo) @@ -82,6 +85,7 @@ /* route deleted */ if (curr_router && !neigh_node) { + cmd = BATADV_CMD_DEL_ROUTE; batadv_dbg(BATADV_DBG_ROUTES, bat_priv, "Deleting route towards: %pM\n", orig_node->orig); batadv_tt_global_del_orig(bat_priv, orig_node, -1, @@ -89,11 +93,13 @@ /* route added */ } else if (!curr_router && neigh_node) { + cmd = BATADV_CMD_ADD_ROUTE; batadv_dbg(BATADV_DBG_ROUTES, bat_priv, "Adding route towards: %pM (via %pM)\n", orig_node->orig, neigh_node->addr); /* route changed */ } else if (neigh_node && curr_router) { + cmd = BATADV_CMD_CHANGE_ROUTE; batadv_dbg(BATADV_DBG_ROUTES, bat_priv, "Changing route towards: %pM (now via %pM - was via %pM)\n", orig_node->orig, neigh_node->addr, @@ -102,6 +108,10 @@ /* decrease refcount of previous best neighbor */ batadv_neigh_node_put(curr_router); + + if (recv_if == BATADV_IF_DEFAULT) + batadv_netlink_notify_route(bat_priv, cmd, orig_node, + neigh_node, true); } /** @@ -946,7 +956,7 @@ int check, hdr_size = sizeof(*unicast_packet); enum batadv_subtype subtype; int ret = NET_RX_DROP; - bool is4addr, is_gw; + bool is4addr, is_gw, shortcut; unicast_packet = (struct batadv_unicast_packet *)skb->data; is4addr = unicast_packet->packet_type == BATADV_UNICAST_4ADDR; @@ -970,8 +980,10 @@ unicast_packet = (struct batadv_unicast_packet *)skb->data; + shortcut = batadv_fbx_shortcut(bat_priv, unicast_packet->dest); + /* packet for me */ - if (batadv_is_my_mac(bat_priv, unicast_packet->dest)) { + if (shortcut || batadv_is_my_mac(bat_priv, unicast_packet->dest)) { /* If this is a unicast packet from another backgone gw, * drop it. */ diff -ruw linux-6.4/net/batman-adv/send.c linux-6.4-fbx/net/batman-adv/send.c --- linux-6.4/net/batman-adv/send.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/send.c 2024-04-22 13:40:52.879939565 +0200 @@ -34,6 +34,8 @@ #include "gateway_client.h" #include "hard-interface.h" #include "log.h" +#include "fbx/fbx.h" +#include "fbx/mtu.h" #include "network-coding.h" #include "originator.h" #include "routing.h" @@ -192,7 +194,7 @@ * it if needed. */ if (atomic_read(&bat_priv->fragmentation) && - skb->len > neigh_node->if_incoming->net_dev->mtu) { + skb->len > batadv_mtu_get_for_neigh(neigh_node->hardif_neigh)) { /* Fragment and send packet. */ ret = batadv_frag_send_packet(skb, orig_node, neigh_node); /* skb was consumed */ @@ -408,7 +410,7 @@ struct ethhdr *ethhdr = (struct ethhdr *)skb->data; struct batadv_orig_node *orig_node; u8 *src, *dst; - int ret; + int ret = NET_XMIT_DROP; src = ethhdr->h_source; dst = ethhdr->h_dest; @@ -420,6 +422,10 @@ } orig_node = batadv_transtable_search(bat_priv, src, dst, vid); + /* unknown unicast (no tt entry for dest), handle same as broadcast */ + if (!orig_node) + return batadv_send_bcast_packet(bat_priv, skb, 0, true); + ret = batadv_send_skb_unicast(bat_priv, skb, packet_type, packet_subtype, orig_node, vid); @@ -990,13 +996,48 @@ * * Consumes the provided skb. */ -void batadv_send_bcast_packet(struct batadv_priv *bat_priv, +int batadv_send_bcast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned long delay, bool own_packet) { + struct batadv_bcast_packet *bcast_packet; + struct batadv_hard_iface *primary_if = NULL; + u32 seqno; + + primary_if = batadv_primary_if_get_selected(bat_priv); + if (!primary_if) + goto drop; + + if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0) + goto drop; + + bcast_packet = (struct batadv_bcast_packet *)skb->data; + bcast_packet->version = BATADV_COMPAT_VERSION; + bcast_packet->ttl = BATADV_TTL - 1; + + /* batman packet type: broadcast */ + bcast_packet->packet_type = BATADV_BCAST; + bcast_packet->reserved = 0; + + /* hw address of first interface is the orig mac because only + * this mac is known throughout the mesh + */ + ether_addr_copy(bcast_packet->orig, + primary_if->net_dev->dev_addr); + + /* set broadcast sequence number */ + seqno = atomic_inc_return(&bat_priv->bcast_seqno); + bcast_packet->seqno = htonl(seqno); + __batadv_forw_bcast_packet(bat_priv, skb, delay, own_packet); + consume_skb(skb); + batadv_hardif_put(primary_if); + return NET_XMIT_SUCCESS; +drop: + kfree_skb(skb); + return NET_XMIT_DROP; } /** diff -ruw linux-6.4/net/batman-adv/send.h linux-6.4-fbx/net/batman-adv/send.h --- linux-6.4/net/batman-adv/send.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/send.h 2024-04-22 13:40:52.879939565 +0200 @@ -43,7 +43,7 @@ struct sk_buff *skb, unsigned long delay, bool own_packet); -void batadv_send_bcast_packet(struct batadv_priv *bat_priv, +int batadv_send_bcast_packet(struct batadv_priv *bat_priv, struct sk_buff *skb, unsigned long delay, bool own_packet); diff -ruw linux-6.4/net/batman-adv/soft-interface.c linux-6.4-fbx/net/batman-adv/soft-interface.c --- linux-6.4/net/batman-adv/soft-interface.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/soft-interface.c 2024-04-22 13:40:52.879939565 +0200 @@ -50,6 +50,7 @@ #include "network-coding.h" #include "send.h" #include "translation-table.h" +#include "fbx/fbx.h" /** * batadv_skb_head_push() - Increase header size and move (push) head pointer @@ -174,13 +175,27 @@ { } +#ifndef ETH_P_BCOM_DSA +#define ETH_P_BCOM_DSA 0x8874 +#endif + +#ifndef ETH_P_REALTEK_RRCP +#define ETH_P_REALTEK_RRCP 0x8899 +#endif + +#ifndef RRCP_PROTO_RLDP +#define RRCP_PROTO_RLDP 0x03 +#endif + +#ifndef RRCP_PROTO_RLDP2 +#define RRCP_PROTO_RLDP2 0x23 +#endif + static netdev_tx_t batadv_interface_tx(struct sk_buff *skb, struct net_device *soft_iface) { struct ethhdr *ethhdr; struct batadv_priv *bat_priv = netdev_priv(soft_iface); - struct batadv_hard_iface *primary_if = NULL; - struct batadv_bcast_packet *bcast_packet; static const u8 stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; static const u8 ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, @@ -193,12 +208,12 @@ unsigned long brd_delay = 0; bool do_bcast = false, client_added; unsigned short vid; - u32 seqno; int gw_mode; enum batadv_forw_mode forw_mode = BATADV_FORW_BCAST; int mcast_is_routable = 0; int network_offset = ETH_HLEN; __be16 proto; + u8 rrcp_proto = 0; if (atomic_read(&bat_priv->mesh_state) != BATADV_MESH_ACTIVE) goto dropped; @@ -237,6 +252,9 @@ if (batadv_bla_tx(bat_priv, skb, vid)) goto dropped; + if (!batadv_fbx_check_skb_tx(bat_priv, skb, vid)) + goto dropped; + /* skb->data might have been reallocated by batadv_bla_tx() */ ethhdr = eth_hdr(skb); @@ -253,18 +271,42 @@ /* Snoop address candidates from DHCPACKs for early DAT filling */ batadv_dat_snoop_outgoing_dhcp_ack(bat_priv, skb, proto, vid); - /* don't accept stp packets. STP does not help in meshes. - * better use the bridge loop avoidance ... + /* don't accept stp packets with BLA. STP does not help in meshes. + * better use the bridge loop avoidance .... But as some devices uses + * that, such as SONOS ones, if BLA is not enabled let those packets + * going and print debug once. * * The same goes for ECTP sent at least by some Cisco Switches, * it might confuse the mesh when used with bridge loop avoidance. + * Those seems safe to drop with or without BLA. */ - if (batadv_compare_eth(ethhdr->h_dest, stp_addr)) +#ifdef CONFIG_BATMAN_ADV_BLA + if (atomic_read(&bat_priv->bridge_loop_avoidance) && + batadv_compare_eth(ethhdr->h_dest, stp_addr)) goto dropped; +#else + WARN_ONCE(batadv_compare_eth(ethhdr->h_dest, stp_addr), + "Some STP packets stroll around this network"); +#endif if (batadv_compare_eth(ethhdr->h_dest, ectp_addr)) goto dropped; + /* Also don't accept Broadcom and Realtek loop detection packets as + * they do not play well on mesh. + */ + if (unlikely(is_multicast_ether_addr(ethhdr->h_dest))) { + if (unlikely(proto == htons(ETH_P_BCOM_DSA))) + goto dropped; + if (unlikely(proto == htons(ETH_P_REALTEK_RRCP))) { + skb_copy_bits(skb, sizeof(*ethhdr), &rrcp_proto, 1); + if (rrcp_proto == RRCP_PROTO_RLDP) + goto dropped; + if (rrcp_proto == RRCP_PROTO_RLDP2) + goto dropped; + } + } + gw_mode = atomic_read(&bat_priv->gw.mode); if (is_multicast_ether_addr(ethhdr->h_dest)) { /* if gw mode is off, broadcast every packet */ @@ -318,10 +360,6 @@ /* ethernet packet should be broadcasted */ if (do_bcast) { - primary_if = batadv_primary_if_get_selected(bat_priv); - if (!primary_if) - goto dropped; - /* in case of ARP request, we do not immediately broadcasti the * packet, instead we first wait for DAT to try to retrieve the * correct ARP entry @@ -329,28 +367,9 @@ if (batadv_dat_snoop_outgoing_arp_request(bat_priv, skb)) brd_delay = msecs_to_jiffies(ARP_REQ_DELAY); - if (batadv_skb_head_push(skb, sizeof(*bcast_packet)) < 0) - goto dropped; - - bcast_packet = (struct batadv_bcast_packet *)skb->data; - bcast_packet->version = BATADV_COMPAT_VERSION; - bcast_packet->ttl = BATADV_TTL - 1; - - /* batman packet type: broadcast */ - bcast_packet->packet_type = BATADV_BCAST; - bcast_packet->reserved = 0; - - /* hw address of first interface is the orig mac because only - * this mac is known throughout the mesh - */ - ether_addr_copy(bcast_packet->orig, - primary_if->net_dev->dev_addr); - - /* set broadcast sequence number */ - seqno = atomic_inc_return(&bat_priv->bcast_seqno); - bcast_packet->seqno = htonl(seqno); - - batadv_send_bcast_packet(bat_priv, skb, brd_delay, true); + ret = batadv_send_bcast_packet(bat_priv, skb, brd_delay, true); + if (ret != NET_XMIT_SUCCESS) + goto dropped_freed; /* unicast packet */ } else { /* DHCP packets going to a server will use the GW feature */ @@ -385,7 +404,6 @@ dropped_freed: batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED); end: - batadv_hardif_put(primary_if); return NETDEV_TX_OK; } @@ -431,6 +449,9 @@ if (unlikely(!pskb_may_pull(skb, ETH_HLEN))) goto dropped; + if (!batadv_fbx_check_skb_rx(bat_priv, packet_type, skb)) + goto dropped; + vid = batadv_get_vid(skb, 0); ethhdr = eth_hdr(skb); @@ -774,7 +795,8 @@ atomic_set(&bat_priv->batman_queue_left, BATADV_BATMAN_QUEUE_LEN); atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE); - atomic_set(&bat_priv->bcast_seqno, 1); + get_random_bytes(&random_seqno, sizeof(random_seqno)); + atomic_set(&bat_priv->bcast_seqno, random_seqno); atomic_set(&bat_priv->tt.vn, 0); atomic_set(&bat_priv->tt.local_changes, 0); atomic_set(&bat_priv->tt.ogm_append_cnt, 0); diff -ruw linux-6.4/net/batman-adv/translation-table.c linux-6.4-fbx/net/batman-adv/translation-table.c --- linux-6.4/net/batman-adv/translation-table.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/translation-table.c 2024-04-22 13:40:52.879939565 +0200 @@ -50,6 +50,7 @@ #include "originator.h" #include "soft-interface.h" #include "tvlv.h" +#include "fbx/fbx.h" static struct kmem_cache *batadv_tl_cache __read_mostly; static struct kmem_cache *batadv_tg_cache __read_mostly; @@ -167,7 +168,7 @@ * Return: a pointer to the corresponding tt_local_entry struct if the client is * found, NULL otherwise. */ -static struct batadv_tt_local_entry * +struct batadv_tt_local_entry * batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid) { @@ -244,8 +245,7 @@ * possibly release it * @tt_local_entry: tt_local_entry to be free'd */ -static void -batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry) +void batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry) { if (!tt_local_entry) return; @@ -456,7 +456,7 @@ * @tt_local_entry: the TT entry involved in the event * @event_flags: flags to store in the event structure */ -static void batadv_tt_local_event(struct batadv_priv *bat_priv, +void batadv_tt_local_event(struct batadv_priv *bat_priv, struct batadv_tt_local_entry *tt_local_entry, u8 event_flags) { @@ -645,8 +645,9 @@ struct hlist_head *head; struct batadv_tt_orig_list_entry *orig_entry; int hash_added, table_size, packet_size_max; - bool ret = false; + bool roam = true, ret = false; bool roamed_back = false; + u16 save_flags; u8 remote_flags; u32 match_mark; @@ -708,6 +709,8 @@ /* increase the refcounter of the related vlan */ vlan = batadv_softif_vlan_get(bat_priv, vid); + if (!vlan) + vlan = batadv_softif_vlan_get(bat_priv, 0); if (!vlan) { net_ratelimited_function(batadv_info, soft_iface, "adding TT local entry %pM to non-existent VLAN %d\n", @@ -758,10 +761,17 @@ batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS); check_roaming: + + save_flags = tt_local->common.flags; + roam = batadv_fbx_tt_local_add(bat_priv, tt_local, tt_global, ifindex); + if (save_flags != tt_local->common.flags) + batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS); + /* Check whether it is a roaming, but don't do anything if the roaming * process has already been handled */ - if (tt_global && !(tt_global->common.flags & BATADV_TT_CLIENT_ROAM)) { + if (roam && tt_global && + !(tt_global->common.flags & BATADV_TT_CLIENT_ROAM)) { /* These node are probably going to update their tt table */ head = &tt_global->orig_list; rcu_read_lock(); @@ -774,7 +784,6 @@ if (roamed_back) { batadv_tt_global_free(bat_priv, tt_global, "Roaming canceled"); - tt_global = NULL; } else { /* The global entry has to be marked as ROAMING and * has to be kept for consistency purpose @@ -1081,6 +1090,8 @@ vlan = batadv_softif_vlan_get(bat_priv, common->vid); if (!vlan) + vlan = batadv_softif_vlan_get(bat_priv, 0); + if (!vlan) return 0; crc = vlan->tt.crc; @@ -1252,6 +1263,7 @@ struct batadv_tt_local_entry *tt_local_entry; u16 flags, curr_flags = BATADV_NO_FLAGS; struct hlist_node *tt_removed_node; + bool remove; tt_local_entry = batadv_tt_local_hash_find(bat_priv, addr, vid); if (!tt_local_entry) @@ -1259,6 +1271,16 @@ curr_flags = tt_local_entry->common.flags; + remove = batadv_fbx_tt_local_del(bat_priv, tt_local_entry); + if (!remove) { + /* Do not delete local entry if other SLAP node has still + * references on it, just mark it shallow + */ + batadv_tt_local_event(bat_priv, tt_local_entry, + BATADV_NO_FLAGS); + goto out; + } + flags = BATADV_TT_CLIENT_DEL; /* if this global entry addition is due to a roaming, the node has to * mark the local entry as "roamed" in order to correctly reroute @@ -1329,6 +1351,13 @@ if (!batadv_has_timed_out(tt_local_entry->last_seen, timeout)) continue; + if (!batadv_fbx_tt_local_del(bat_priv, tt_local_entry)) { + /* Send only flag changes */ + batadv_tt_local_event(bat_priv, tt_local_entry, + BATADV_NO_FLAGS); + continue; + } + batadv_tt_local_set_pending(bat_priv, tt_local_entry, BATADV_TT_CLIENT_DEL, "timed out"); } @@ -1595,7 +1624,7 @@ { struct batadv_tt_global_entry *tt_global_entry; struct batadv_tt_local_entry *tt_local_entry; - bool ret = false; + bool remove = true, ret = false; int hash_added; struct batadv_tt_common_entry *common; u16 local_flags; @@ -1711,6 +1740,8 @@ batadv_tt_global_orig_entry_add(tt_global_entry, orig_node, ttvn, flags & BATADV_TT_SYNC_MASK); + remove = batadv_fbx_tt_global_add(bat_priv, tt_global_entry, orig_node); + batadv_dbg(BATADV_DBG_TT, bat_priv, "Creating new global tt entry: %pM (vid: %d, via %pM)\n", common->addr, batadv_print_vid(common->vid), @@ -1721,7 +1752,7 @@ /* Do not remove multicast addresses from the local hash on * global additions */ - if (is_multicast_ether_addr(tt_addr)) + if (!remove || is_multicast_ether_addr(tt_addr)) goto out; /* remove address from local hash if present */ @@ -1730,13 +1761,13 @@ flags & BATADV_TT_CLIENT_ROAM); tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; - if (!(flags & BATADV_TT_CLIENT_ROAM)) +out: + if (tt_global_entry && !(flags & BATADV_TT_CLIENT_ROAM)) /* this is a normal global add. Therefore the client is not in a * roaming state anymore. */ tt_global_entry->common.flags &= ~BATADV_TT_CLIENT_ROAM; -out: batadv_tt_global_entry_put(tt_global_entry); batadv_tt_local_entry_put(tt_local_entry); return ret; @@ -2166,7 +2197,7 @@ local_entry = batadv_tt_local_hash_find(bat_priv, tt_global_entry->common.addr, vid); - if (local_entry) { + if (local_entry && local_entry->common.flags & BATADV_TT_CLIENT_SEEN) { /* local entry exists, case 2: client roamed to us. */ batadv_tt_global_del_orig_list(tt_global_entry); batadv_tt_global_free(bat_priv, tt_global_entry, message); @@ -2177,6 +2208,8 @@ } out: + /* TODO check roaming */ + batadv_fbx_tt_global_del(bat_priv, tt_global_entry, orig_node); batadv_tt_global_entry_put(tt_global_entry); batadv_tt_local_entry_put(local_entry); } diff -ruw linux-6.4/net/batman-adv/translation-table.h linux-6.4-fbx/net/batman-adv/translation-table.h --- linux-6.4/net/batman-adv/translation-table.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/translation-table.h 2024-04-22 13:40:52.879939565 +0200 @@ -21,6 +21,10 @@ u16 batadv_tt_local_remove(struct batadv_priv *bat_priv, const u8 *addr, unsigned short vid, const char *message, bool roaming); +struct batadv_tt_local_entry * +batadv_tt_local_hash_find(struct batadv_priv *bat_priv, const u8 *addr, + unsigned short vid); +void batadv_tt_local_entry_put(struct batadv_tt_local_entry *tt_local_entry); int batadv_tt_local_dump(struct sk_buff *msg, struct netlink_callback *cb); int batadv_tt_global_dump(struct sk_buff *msg, struct netlink_callback *cb); void batadv_tt_global_del_orig(struct batadv_priv *bat_priv, diff -ruw linux-6.4/net/batman-adv/types.h linux-6.4-fbx/net/batman-adv/types.h --- linux-6.4/net/batman-adv/types.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/batman-adv/types.h 2024-04-22 13:40:52.879939565 +0200 @@ -275,6 +275,19 @@ /** @rcu: struct used for freeing in an RCU-safe manner */ struct rcu_head rcu; +#ifdef CONFIG_BATMAN_ADV_FBX_PERIF_ROUTER + /** + * @fbx_ifrouter: best router that should be used to reach this + * originator from this interface. Due to internal BATMAN_V router + * management algorithm, orig_ifinfo->router is the best router to + * reach originator from any interface not only this one, + * orig_ifinfo->fbx_ifrouter is used to get best router for this + * interface. + */ + struct batadv_neigh_node __rcu *fbx_ifrouter; + /** @ fbx_ifrouter_lock: lock to protect fbx_ifrouter rcu update */ + spinlock_t fbx_ifrouter_lock; +#endif }; /** @@ -527,6 +540,10 @@ /** @bat_iv: B.A.T.M.A.N. IV private structure */ struct batadv_orig_bat_iv bat_iv; +#ifdef CONFIG_BATMAN_ADV_FBX_SLAP + struct batadv_slap_segid *slap_segid; + spinlock_t slap_lock; +#endif }; /** @@ -601,6 +618,74 @@ struct work_struct metric_work; }; +#ifdef CONFIG_BATMAN_ADV_FBX_MTU +/** + * MTU discovery bookkeeping data + */ +struct batadv_mtu { + /** @neigh: Neighbour hardif */ + struct batadv_hardif_neigh_node __rcu *neigh; + /** periodic work */ + struct delayed_work periodic_work; + /** timeout work */ + struct delayed_work recv_work; + /** release work */ + struct delayed_work release_work; + /** the final MTU to use for this link */ + atomic_t mtu; + /** current delay, not critical, use (READ/WRITE)_ONCE */ + unsigned long delay; +}; +#endif + +#ifdef CONFIG_BATMAN_ADV_FBX_SLAP +/** + * batadv_slap_segid - SLAP segment address used to uniquely identify a SLAP + * segment + */ +struct batadv_slap_segid { + /* @rcu: struct used for freeing in a RCU-safe manner */ + struct rcu_head rcu; + /* @addr: The SLAP master MAC address is used as unique segment ID */ + u8 addr[ETH_ALEN]; +}; + +/** + * batadv_slap_id - SLAP ID management structure, a SLAP ID is composed of the + * MAC address of the originator along with a priority + */ +struct batadv_slap_id { + /** @bat_priv: pointer to the mesh object */ + struct batadv_priv *bat_priv; + /* @dw: delayed work used to schedule SLAP ID expiration */ + struct delayed_work expire; + /** @refcount: Number of contexts using this slap id */ + struct kref refcount; + /* @rcu: struct used for freeing in a RCU-safe manner */ + struct rcu_head rcu; + /* @exp_time: Expiration time of this SLAP ID, in jiffies */ + unsigned long exp_time; + /* @prio: SLAP ID priority part */ + u32 prio; + /* @addr: SLAP ID addr part */ + u8 addr[ETH_ALEN]; +}; + +struct batadv_hardif_neigh_node; + +/** + * struct batadv_hardif_neigh_slap - SLAP specific neighbor information + */ +struct batadv_hardif_neigh_slap { + /** @neigh: Neighbour hardif */ + struct batadv_hardif_neigh_node __rcu *neigh; + /** @announce: Work to announce our SLAP ID to this neighbor */ + struct delayed_work announce; + /** @release: Work to announce our SLAP ID to this neighbor */ + struct delayed_work release; +}; +#endif + /** * struct batadv_hardif_neigh_node - unique neighbor per hard-interface */ @@ -632,6 +717,15 @@ /** @rcu: struct used for freeing in a RCU-safe manner */ struct rcu_head rcu; + + /** @mtud: struct used for mtu discovery related stuff */ +#ifdef CONFIG_BATMAN_ADV_FBX_MTU + struct batadv_mtu *mtud; +#endif +#ifdef CONFIG_BATMAN_ADV_FBX_SLAP + /** @slap: SLAP specific neighbour information */ + struct batadv_hardif_neigh_slap *slap; +#endif }; /** @@ -708,6 +802,9 @@ /** @last_seqno: last sequence number known for this neighbor */ u32 last_seqno; + + /** @half_duplex: throughput should suffer half duplex penalty */ + bool half_duplex; }; /** @@ -1738,6 +1835,40 @@ /** @bat_v: B.A.T.M.A.N. V per soft-interface private data */ struct batadv_priv_bat_v bat_v; #endif + +#ifdef CONFIG_BATMAN_ADV_FBX + /** @fbx_nl_cmd_handlers: List of NL command handler */ + struct hlist_head fbx_nl_handlers; + /** @fbx_tvlv_handlers: List of FBX specific TVLV handler */ + struct hlist_head fbx_tvlv_handlers; + /** @fbx_tvlv_containers: List of FBX specific TVLV container */ + struct hlist_head fbx_tvlv_containers; + /** @fbx_nl_lock: FBX specific NL handler list lock */ + spinlock_t fbx_nl_lock; + /** @fbx_tvlv_lock: FBX specific TVLV handler list lock */ + spinlock_t fbx_tvlv_lock; +#ifdef CONFIG_BATMAN_ADV_FBX_MTU + /** MTU delayed work */ + atomic_t mtu_seqno; +#endif +#ifdef CONFIG_BATMAN_ADV_FBX_SLAP + /** + * @slap_lock: Common SLAP lock used to serialize rcu write side on + * both bat_priv and neighbor + */ + spinlock_t slap_lock; + /** @slap_master: Current SLAP master */ + struct batadv_slap_id __rcu *slap_master; + /** @slap_iface: Current SLAP hard interface */ + struct batadv_hard_iface __rcu *slap_iface; + /** @slap_id: Current SLAP ID */ + struct batadv_slap_id __rcu *slap_id; + /** @slap_skb: SLAP ID SKB model to use */ + struct sk_buff __rcu *slap_skb; + /* @slap_wq: Common worqueue for delayed SLAP work */ + struct workqueue_struct *slap_wq; +#endif +#endif }; #ifdef CONFIG_BATMAN_ADV_BLA diff -ruw linux-6.4/net/bridge/Kconfig linux-6.4-fbx/net/bridge/Kconfig --- linux-6.4/net/bridge/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/bridge/Kconfig 2024-04-22 13:40:52.899940111 +0200 @@ -34,6 +34,11 @@ If unsure, say N. +config BRIDGE_STATE_MESSAGES + bool "show port status change in kernel log" + depends on BRIDGE + default y + config BRIDGE_IGMP_SNOOPING bool "IGMP/MLD snooping" depends on BRIDGE diff -ruw linux-6.4/net/bridge/br_device.c linux-6.4-fbx/net/bridge/br_device.c --- linux-6.4/net/bridge/br_device.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/bridge/br_device.c 2024-04-22 13:40:52.899940111 +0200 @@ -213,6 +213,7 @@ struct net_bridge *br = netdev_priv(dev); dev->mtu = new_mtu; + br->forced_mtu = new_mtu; /* this flag will be cleared if the MTU was automatically adjusted */ br_opt_toggle(br, BROPT_MTU_SET_BY_USER, true); diff -ruw linux-6.4/net/bridge/br_fdb.c linux-6.4-fbx/net/bridge/br_fdb.c --- linux-6.4/net/bridge/br_fdb.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/bridge/br_fdb.c 2024-04-22 13:40:52.899940111 +0200 @@ -850,6 +850,21 @@ test_and_clear_bit(BR_FDB_NOTIFY_INACTIVE, &fdb->flags)); } +bool br_fdb_update_only(struct net_bridge *br, + struct net_bridge_port *source, + const unsigned char *addr) +{ + struct net_bridge_fdb_entry *fdb; + + fdb = br_fdb_find_rcu(br, addr, 0); + if (!fdb) + return false; + + fdb->updated = jiffies; + return true; +} +EXPORT_SYMBOL(br_fdb_update_only); + void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid, unsigned long flags) { @@ -992,6 +1007,7 @@ rcu_read_unlock(); return err; } +EXPORT_SYMBOL(br_fdb_find_rcu); /* returns true if the fdb is modified */ static bool fdb_handle_notify(struct net_bridge_fdb_entry *fdb, u8 notify) diff -ruw linux-6.4/net/bridge/br_if.c linux-6.4-fbx/net/bridge/br_if.c --- linux-6.4/net/bridge/br_if.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/bridge/br_if.c 2024-04-22 13:40:52.899940111 +0200 @@ -500,13 +500,13 @@ static int br_mtu_min(const struct net_bridge *br) { const struct net_bridge_port *p; - int ret_mtu = 0; + int ret_mtu = min_t(unsigned int, br->forced_mtu, ETH_DATA_LEN); list_for_each_entry(p, &br->port_list, list) if (!ret_mtu || ret_mtu > p->dev->mtu) ret_mtu = p->dev->mtu; - return ret_mtu ? ret_mtu : ETH_DATA_LEN; + return ret_mtu; } void br_mtu_auto_adjust(struct net_bridge *br) diff -ruw linux-6.4/net/bridge/br_private.h linux-6.4-fbx/net/bridge/br_private.h --- linux-6.4/net/bridge/br_private.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/bridge/br_private.h 2024-04-22 13:40:52.903940220 +0200 @@ -569,6 +569,7 @@ #if IS_ENABLED(CONFIG_BRIDGE_CFM) struct hlist_head mep_list; #endif + unsigned int forced_mtu; }; struct br_input_skb_cb { @@ -623,8 +624,14 @@ br_printk(KERN_WARNING, __br, format, ##args) #define br_notice(__br, format, args...) \ br_printk(KERN_NOTICE, __br, format, ##args) + +#ifdef CONFIG_BRIDGE_STATE_MESSAGES #define br_info(__br, format, args...) \ br_printk(KERN_INFO, __br, format, ##args) +#else +#define br_info(__br, format, args...) \ + pr_debug("%s: " format, (__br)->dev->name, ##args) +#endif #define br_debug(br, format, args...) \ pr_debug("%s: " format, (br)->dev->name, ##args) @@ -811,6 +818,9 @@ unsigned long off); int br_fdb_add_local(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid); +bool br_fdb_update_only(struct net_bridge *br, + struct net_bridge_port *source, + const unsigned char *addr); void br_fdb_update(struct net_bridge *br, struct net_bridge_port *source, const unsigned char *addr, u16 vid, unsigned long flags); diff -ruw linux-6.4/net/core/Makefile linux-6.4-fbx/net/core/Makefile --- linux-6.4/net/core/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/Makefile 2024-04-22 13:40:52.915940548 +0200 @@ -13,7 +13,7 @@ neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ sock_diag.o dev_ioctl.o tso.o sock_reuseport.o \ fib_notifier.o xdp.o flow_offload.o gro.o \ - netdev-genl.o netdev-genl-gen.o + netdev-genl.o netdev-genl-gen.o gso.o obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o diff -ruw linux-6.4/net/core/dev.c linux-6.4-fbx/net/core/dev.c --- linux-6.4/net/core/dev.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/dev.c 2024-04-22 13:40:52.919940657 +0200 @@ -150,6 +150,7 @@ #include #include #include +#include #include "dev.h" #include "net-sysfs.h" @@ -165,6 +166,10 @@ struct netlink_ext_ack *extack); static struct napi_struct *napi_by_id(unsigned int napi_id); +#ifdef CONFIG_NETRXTHREAD +struct krxd gkrxd[CONFIG_NETRXTHREAD_RX_QUEUE]; +#endif + /* * The @dev_base_head list is protected by @dev_base_lock and the rtnl * semaphore. @@ -3209,7 +3214,7 @@ return (u16) reciprocal_scale(skb_get_hash(skb), qcount) + qoffset; } -static void skb_warn_bad_offload(const struct sk_buff *skb) +void skb_warn_bad_offload(const struct sk_buff *skb) { static const netdev_features_t null_features; struct net_device *dev = skb->dev; @@ -3338,74 +3343,6 @@ return vlan_get_protocol_and_depth(skb, type, depth); } -/* openvswitch calls this on rx path, so we need a different check. - */ -static inline bool skb_needs_check(struct sk_buff *skb, bool tx_path) -{ - if (tx_path) - return skb->ip_summed != CHECKSUM_PARTIAL && - skb->ip_summed != CHECKSUM_UNNECESSARY; - - return skb->ip_summed == CHECKSUM_NONE; -} - -/** - * __skb_gso_segment - Perform segmentation on skb. - * @skb: buffer to segment - * @features: features for the output path (see dev->features) - * @tx_path: whether it is called in TX path - * - * This function segments the given skb and returns a list of segments. - * - * It may return NULL if the skb requires no segmentation. This is - * only possible when GSO is used for verifying header integrity. - * - * Segmentation preserves SKB_GSO_CB_OFFSET bytes of previous skb cb. - */ -struct sk_buff *__skb_gso_segment(struct sk_buff *skb, - netdev_features_t features, bool tx_path) -{ - struct sk_buff *segs; - - if (unlikely(skb_needs_check(skb, tx_path))) { - int err; - - /* We're going to init ->check field in TCP or UDP header */ - err = skb_cow_head(skb, 0); - if (err < 0) - return ERR_PTR(err); - } - - /* Only report GSO partial support if it will enable us to - * support segmentation on this frame without needing additional - * work. - */ - if (features & NETIF_F_GSO_PARTIAL) { - netdev_features_t partial_features = NETIF_F_GSO_ROBUST; - struct net_device *dev = skb->dev; - - partial_features |= dev->features & dev->gso_partial_features; - if (!skb_gso_ok(skb, features | partial_features)) - features &= ~NETIF_F_GSO_PARTIAL; - } - - BUILD_BUG_ON(SKB_GSO_CB_OFFSET + - sizeof(*SKB_GSO_CB(skb)) > sizeof(skb->cb)); - - SKB_GSO_CB(skb)->mac_offset = skb_headroom(skb); - SKB_GSO_CB(skb)->encap_level = 0; - - skb_reset_mac_header(skb); - skb_reset_mac_len(skb); - - segs = skb_mac_gso_segment(skb, features); - - if (segs != skb && unlikely(skb_needs_check(skb, tx_path) && !IS_ERR(segs))) - skb_warn_bad_offload(skb); - - return segs; -} -EXPORT_SYMBOL(__skb_gso_segment); /* Take action when hardware reception checksum errors are detected. */ #ifdef CONFIG_BUG @@ -4959,6 +4896,23 @@ return ret; } +/* Start Freebox added code */ +#if defined(CONFIG_FREEBOX_DIVERTER) || defined(CONFIG_FREEBOX_DIVERTER_MODULE) +int (*fbxdiverter_hook)(struct sk_buff *); + +static int handle_fbxdiverter(struct sk_buff *skb) +{ + /* try_module_get is missing here, so there is a race on + * fbxdiverter module deletion */ + if (!fbxdiverter_hook) + return 0; + return fbxdiverter_hook(skb); +} + +EXPORT_SYMBOL(fbxdiverter_hook); +#endif + + /** * __netif_rx - Slightly optimized version of netif_rx * @skb: buffer to post @@ -5278,28 +5232,116 @@ return 0; } +static int __netif_receive_skb_core_end(struct sk_buff **pskb, bool pfmemalloc, + struct packet_type **ppt_prev); + static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, struct packet_type **ppt_prev) { - struct packet_type *ptype, *pt_prev; - rx_handler_func_t *rx_handler; struct sk_buff *skb = *pskb; - struct net_device *orig_dev; - bool deliver_exact = false; - int ret = NET_RX_DROP; - __be16 type; +#ifdef CONFIG_NETRXTHREAD + unsigned int len; + struct krxd *krxd; +#endif net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb); trace_netif_receive_skb(skb); - orig_dev = skb->dev; - skb_reset_network_header(skb); if (!skb_transport_header_was_set(skb)) skb_reset_transport_header(skb); skb_reset_mac_len(skb); +#if defined(CONFIG_FREEBOX_DIVERTER) || defined(CONFIG_FREEBOX_DIVERTER_MODULE) + if (handle_fbxdiverter(skb)) + return NET_RX_SUCCESS; +#endif + +#ifndef CONFIG_NETRXTHREAD + return __netif_receive_skb_core_end(pskb, pfmemalloc, ppt_prev); +#else + if (pfmemalloc) + return __netif_receive_skb_core_end(pskb, pfmemalloc, ppt_prev); + + BUILD_BUG_ON(ARRAY_SIZE(gkrxd) < 2); + krxd = &gkrxd[skb->rxthread_prio & 1]; + + /* queue the packet to the rx thread */ + local_bh_disable(); + len = skb_queue_len(&krxd->pkt_queue); + if (len < RXTHREAD_MAX_PKTS) { + __skb_queue_tail(&krxd->pkt_queue, skb); + krxd->stats_pkts++; + if (!len) + wake_up(&krxd->wq); + } else { + krxd->stats_dropped++; + dev_kfree_skb(skb); + } + local_bh_enable(); + return NET_RX_SUCCESS; +#endif +} + +#ifdef CONFIG_NETRXTHREAD +static int krxd_action(void *data) +{ + struct krxd *krxd = (struct krxd *)data; + unsigned int queue = krxd - gkrxd; + struct sk_buff *skb; + + set_user_nice(current, queue > 0 ? -10 : -5); + current->flags |= PF_NOFREEZE; + __set_current_state(TASK_RUNNING); + + local_bh_disable(); + while (1) { + struct packet_type *pt_prev = NULL; + struct net_device *orig_dev; + + skb = skb_dequeue(&krxd->pkt_queue); + if (!skb) { + local_bh_enable(); + wait_event_interruptible(krxd->wq, + skb_queue_len(&krxd->pkt_queue)); + set_current_state(TASK_RUNNING); + local_bh_disable(); + continue; + } + + rcu_read_lock(); + orig_dev = skb->dev; + __netif_receive_skb_core_end(&skb, false, &pt_prev); + if (pt_prev) + INDIRECT_CALL_INET(pt_prev->func, + ipv6_rcv, ip_rcv, skb, + skb->dev, pt_prev, orig_dev); + rcu_read_unlock(); + + /* only schedule when working on lowest prio queue */ + if (queue == 0 && need_resched()) { + local_bh_enable(); + schedule(); + local_bh_disable(); + } + } + return 0; +} +#endif + +static int __netif_receive_skb_core_end(struct sk_buff **pskb, bool pfmemalloc, + struct packet_type **ppt_prev) +{ + struct sk_buff *skb = *pskb; + struct packet_type *ptype, *pt_prev; + rx_handler_func_t *rx_handler; + struct net_device *orig_dev; + bool deliver_exact = false; + int ret = NET_RX_DROP; + __be16 type; + + orig_dev = skb->dev; pt_prev = NULL; another_round: @@ -5457,7 +5499,9 @@ if (pt_prev) { if (unlikely(skb_orphan_frags_rx(skb, GFP_ATOMIC))) goto drop; - *ppt_prev = pt_prev; + else + ret = INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb, + skb->dev, pt_prev, orig_dev); } else { drop: if (!deliver_exact) @@ -5488,10 +5532,16 @@ struct packet_type *pt_prev = NULL; int ret; +#ifdef CONFIG_NETRXTHREAD + (void)orig_dev; + ret = __netif_receive_skb_core(&skb, pfmemalloc, &pt_prev); +#else ret = __netif_receive_skb_core(&skb, pfmemalloc, &pt_prev); if (pt_prev) ret = INDIRECT_CALL_INET(pt_prev->func, ipv6_rcv, ip_rcv, skb, skb->dev, pt_prev, orig_dev); +#endif + return ret; } @@ -8356,8 +8406,10 @@ } } if (dev->flags != old_flags) { +#ifdef CONFIG_NET_PROMISC_MESSAGES netdev_info(dev, "%s promiscuous mode\n", dev->flags & IFF_PROMISC ? "entered" : "left"); +#endif if (audit_enabled) { current_uid_gid(&uid, &gid); audit_log(audit_context(), GFP_ATOMIC, @@ -8425,8 +8477,10 @@ } } if (dev->flags ^ old_flags) { +#ifdef CONFIG_NET_PROMISC_MESSAGES netdev_info(dev, "%s allmulticast mode\n", dev->flags & IFF_ALLMULTI ? "entered" : "left"); +#endif dev_change_rx_flags(dev, IFF_ALLMULTI); dev_set_rx_mode(dev); if (notify) @@ -11477,6 +11531,24 @@ open_softirq(NET_TX_SOFTIRQ, net_tx_action); open_softirq(NET_RX_SOFTIRQ, net_rx_action); +#ifdef CONFIG_NETRXTHREAD + for (i = 0; i < CONFIG_NETRXTHREAD_RX_QUEUE; i++) { + struct krxd *krxd = &gkrxd[i]; + struct task_struct *task; + + skb_queue_head_init(&krxd->pkt_queue); + init_waitqueue_head(&krxd->wq); + task = kthread_create(krxd_action, krxd, "krxthread_%u", i); + if (IS_ERR(task)) { + printk(KERN_ERR "unable to create krxd\n"); + return -ENOMEM; + } + krxd->task = task; + wake_up_process(task); + } +#endif + + rc = cpuhp_setup_state_nocalls(CPUHP_NET_DEV_DEAD, "net/dev:dead", NULL, dev_cpu_dead); WARN_ON(rc < 0); diff -ruw linux-6.4/net/core/gro.c linux-6.4-fbx/net/core/gro.c --- linux-6.4/net/core/gro.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/gro.c 2024-04-22 13:40:52.923940767 +0200 @@ -10,7 +10,7 @@ #define GRO_MAX_HEAD (MAX_HEADER + 128) static DEFINE_SPINLOCK(offload_lock); -static struct list_head offload_base __read_mostly = LIST_HEAD_INIT(offload_base); +struct list_head offload_base __read_mostly = LIST_HEAD_INIT(offload_base); /* Maximum number of GRO_NORMAL skbs to batch up for list-RX */ int gro_normal_batch __read_mostly = 8; @@ -92,63 +92,6 @@ } EXPORT_SYMBOL(dev_remove_offload); -/** - * skb_eth_gso_segment - segmentation handler for ethernet protocols. - * @skb: buffer to segment - * @features: features for the output path (see dev->features) - * @type: Ethernet Protocol ID - */ -struct sk_buff *skb_eth_gso_segment(struct sk_buff *skb, - netdev_features_t features, __be16 type) -{ - struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); - struct packet_offload *ptype; - - rcu_read_lock(); - list_for_each_entry_rcu(ptype, &offload_base, list) { - if (ptype->type == type && ptype->callbacks.gso_segment) { - segs = ptype->callbacks.gso_segment(skb, features); - break; - } - } - rcu_read_unlock(); - - return segs; -} -EXPORT_SYMBOL(skb_eth_gso_segment); - -/** - * skb_mac_gso_segment - mac layer segmentation handler. - * @skb: buffer to segment - * @features: features for the output path (see dev->features) - */ -struct sk_buff *skb_mac_gso_segment(struct sk_buff *skb, - netdev_features_t features) -{ - struct sk_buff *segs = ERR_PTR(-EPROTONOSUPPORT); - struct packet_offload *ptype; - int vlan_depth = skb->mac_len; - __be16 type = skb_network_protocol(skb, &vlan_depth); - - if (unlikely(!type)) - return ERR_PTR(-EINVAL); - - __skb_pull(skb, vlan_depth); - - rcu_read_lock(); - list_for_each_entry_rcu(ptype, &offload_base, list) { - if (ptype->type == type && ptype->callbacks.gso_segment) { - segs = ptype->callbacks.gso_segment(skb, features); - break; - } - } - rcu_read_unlock(); - - __skb_push(skb, skb->data - skb_mac_header(skb)); - - return segs; -} -EXPORT_SYMBOL(skb_mac_gso_segment); int skb_gro_receive(struct sk_buff *p, struct sk_buff *skb) { diff -ruw linux-6.4/net/core/net-procfs.c linux-6.4-fbx/net/core/net-procfs.c --- linux-6.4/net/core/net-procfs.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/net-procfs.c 2024-04-22 13:40:52.923940767 +0200 @@ -200,6 +200,89 @@ .show = softnet_seq_show, }; +static struct page_frag_cache *frag_alloc_netdev_get_online(loff_t *pos) +{ + struct page_frag_cache *nc = NULL; + + while (*pos < nr_cpu_ids) + if (cpu_online(*pos)) { + nc = netdev_frag_cache_get(*pos); + break; + } else + ++*pos; + return nc; +} + +static struct page_frag_cache *frag_alloc_napi_get_online(loff_t *pos) +{ + struct page_frag_cache *nc = NULL; + + while (*pos < nr_cpu_ids) + if (cpu_online(*pos)) { + nc = napi_frag_cache_get(*pos); + break; + } else + ++*pos; + return nc; +} + +static void *frag_alloc_netdev_seq_start(struct seq_file *seq, loff_t *pos) +{ + return frag_alloc_netdev_get_online(pos); +} + +static void *frag_alloc_netdev_seq_next(struct seq_file *seq, void *v, loff_t *pos) +{ + ++*pos; + return frag_alloc_netdev_get_online(pos); +} + +static void *frag_alloc_napi_seq_start(struct seq_file *seq, loff_t *pos) +{ + return frag_alloc_napi_get_online(pos); +} + +static void *frag_alloc_napi_seq_next(struct seq_file *seq, void *v, loff_t *pos) +{ + ++*pos; + return frag_alloc_napi_get_online(pos); +} + +static void frag_alloc_seq_stop(struct seq_file *seq, void *v) +{ +} + +static int frag_alloc_seq_show(struct seq_file *seq, void *v) +{ +#ifdef CONFIG_PAGE_OWNER + struct page_frag_cache *nc = v; + unsigned int pages = atomic_read(&nc->pages_allocated); + + seq_printf(seq, + "cpu[%d]: pages:%u (%lu kB)\n", + (int)seq->index, pages, (pages * PAGE_SIZE) / 1024); +#else + seq_printf(seq, + "cpu[%d]: CONFIG_PAGE_OWNER missing\n", + (int)seq->index); +#endif + return 0; +} + +static const struct seq_operations frag_alloc_netdev_seq_ops = { + .start = frag_alloc_netdev_seq_start, + .next = frag_alloc_netdev_seq_next, + .stop = frag_alloc_seq_stop, + .show = frag_alloc_seq_show, +}; + +static const struct seq_operations frag_alloc_napi_seq_ops = { + .start = frag_alloc_napi_seq_start, + .next = frag_alloc_napi_seq_next, + .stop = frag_alloc_seq_stop, + .show = frag_alloc_seq_show, +}; + static void *ptype_get_idx(struct seq_file *seq, loff_t pos) { struct list_head *ptype_list = NULL; @@ -320,6 +403,85 @@ .show = ptype_seq_show, }; +#ifdef CONFIG_NETRXTHREAD +/* + * This is invoked by the /proc filesystem handler to display a device + * in detail. + */ +static void *krxthread_seq_start(struct seq_file *seq, loff_t *pos) +{ + int *queue; + + if (*pos > CONFIG_NETRXTHREAD_RX_QUEUE) + return NULL; + + queue = kmalloc(sizeof(*queue), GFP_KERNEL); + if (!queue) + return NULL; + *queue = ((int)*pos - 1); + + return queue; +} + +static void *krxthread_seq_next(struct seq_file *seq, void *v, loff_t *pos) +{ + int *queue = v; + + if (*pos == CONFIG_NETRXTHREAD_RX_QUEUE) { + ++*pos; + return NULL; + } + + ++*queue; + *pos = *queue + 1; + return queue; +} + +static void krxthread_seq_stop(struct seq_file *seq, void *v) +{ + kfree(v); +} + +static void krxthread_seq_printf_stats(struct seq_file *seq, int queue) +{ + seq_printf(seq, "%8u %12u %12u\n", + queue, + gkrxd[queue].stats_pkts, + gkrxd[queue].stats_dropped); +} + +static int krxthread_seq_show(struct seq_file *seq, void *v) +{ + int *queue = v; + + if (*queue == -1) + seq_printf(seq, "%8s %12s %12s\n", + "queue", "packets", "drops"); + else + krxthread_seq_printf_stats(seq, *queue); + return 0; +} + +static const struct seq_operations krxthread_seq_ops = { + .start = krxthread_seq_start, + .next = krxthread_seq_next, + .stop = krxthread_seq_stop, + .show = krxthread_seq_show, +}; + +static int krxthread_seq_open(struct inode *inode, struct file *file) +{ + return seq_open(file, &krxthread_seq_ops); +} + +static const struct proc_ops krxthread_seq_fops = { + .proc_open = krxthread_seq_open, + .proc_read = seq_read, + .proc_lseek = seq_lseek, + .proc_release = seq_release, +}; +#endif /* KRXTHREAD */ + static int __net_init dev_proc_net_init(struct net *net) { int rc = -ENOMEM; @@ -333,9 +495,20 @@ if (!proc_create_net("ptype", 0444, net->proc_net, &ptype_seq_ops, sizeof(struct seq_net_private))) goto out_softnet; + if (!proc_create_seq("frag_alloc_netdev", 0444, net->proc_net, + &frag_alloc_netdev_seq_ops)) + goto out_softnet; + if (!proc_create_seq("frag_alloc_napi", 0444, net->proc_net, + &frag_alloc_napi_seq_ops)) + goto out_softnet; if (wext_proc_init(net)) goto out_ptype; +#ifdef CONFIG_NETRXTHREAD + if (!proc_create("krxthread", S_IRUGO, net->proc_net, + &krxthread_seq_fops)) + goto out_ptype; +#endif rc = 0; out: return rc; diff -ruw linux-6.4/net/core/net-sysfs.c linux-6.4-fbx/net/core/net-sysfs.c --- linux-6.4/net/core/net-sysfs.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/net-sysfs.c 2024-04-22 13:40:52.923940767 +0200 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -747,7 +748,28 @@ .attrs = netstat_attrs, }; +#if IS_ENABLED(CONFIG_CFG80211) +static ssize_t show_nl80211_iftype(struct device *dev, + struct device_attribute *attr, char *buf) +{ + const struct net_device *netdev = to_net_dev(dev); + ssize_t ret = 0; + + if (!rtnl_trylock()) + return restart_syscall(); + if (netdev->ieee80211_ptr) + ret = sprintf(buf, "%d\n", netdev->ieee80211_ptr->iftype); + rtnl_unlock(); + + return ret; +} +static DEVICE_ATTR(nl80211_iftype, S_IRUGO, show_nl80211_iftype, NULL); +#endif + static struct attribute *wireless_attrs[] = { +#if IS_ENABLED(CONFIG_CFG80211) + &dev_attr_nl80211_iftype.attr, +#endif NULL }; diff -ruw linux-6.4/net/core/of_net.c linux-6.4-fbx/net/core/of_net.c --- linux-6.4/net/core/of_net.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/of_net.c 2024-04-22 13:40:52.927940876 +0200 @@ -12,6 +12,7 @@ #include #include #include +#include /** * of_get_phy_mode - Get phy mode for given device_node @@ -96,6 +97,23 @@ } EXPORT_SYMBOL(of_get_mac_address_nvmem); +static int of_get_mac_addr_from_fbxserial(struct device_node *np, u8 *addr) +{ +#ifdef CONFIG_FBXSERIAL + struct property *pp; + + pp = of_find_property(np, "fbxserial-mac-address", NULL); + if (!pp || pp->length != 4) + return -ENODEV; + + memcpy(addr, fbxserialinfo_get_mac_addr(be32_to_cpu(*(u32*)pp->value)), + ETH_ALEN); + return 0; +#else + return -ENOSYS; +#endif +} + /** * of_get_mac_address() * @np: Caller's Device Node @@ -129,6 +147,10 @@ if (!np) return -ENODEV; + ret = of_get_mac_addr_from_fbxserial(np, addr); + if (!ret) + return 0; + ret = of_get_mac_addr(np, "mac-address", addr); if (!ret) return 0; diff -ruw linux-6.4/net/core/page_pool.c linux-6.4-fbx/net/core/page_pool.c --- linux-6.4/net/core/page_pool.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/page_pool.c 2024-04-22 13:40:52.927940876 +0200 @@ -357,6 +357,7 @@ { page->pp = pool; page->pp_magic |= PP_SIGNATURE; + page_pool_clear_recycle_flag(page); if (pool->p.init_callback) pool->p.init_callback(page, pool->p.init_arg); } diff -ruw linux-6.4/net/core/skbuff.c linux-6.4-fbx/net/core/skbuff.c --- linux-6.4/net/core/skbuff.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/skbuff.c 2024-04-22 13:40:52.931940985 +0200 @@ -67,6 +67,7 @@ #include #include #include +#include #include #include #include @@ -281,6 +282,17 @@ static DEFINE_PER_CPU(struct page_frag_cache, netdev_alloc_cache); static DEFINE_PER_CPU(struct napi_alloc_cache, napi_alloc_cache); +struct page_frag_cache *netdev_frag_cache_get(unsigned int cpu_id) +{ + return per_cpu_ptr(&netdev_alloc_cache, cpu_id); +} + +struct page_frag_cache *napi_frag_cache_get(unsigned int cpu_id) +{ + struct napi_alloc_cache *nc = per_cpu_ptr(&napi_alloc_cache, cpu_id); + return &nc->page; +} + /* Double check that napi_get_frags() allocates skbs with * skb->head being backed by slab, not a page fragment. * This is to make sure bug fixed in 3226b158e67c @@ -893,6 +905,11 @@ { if (!IS_ENABLED(CONFIG_PAGE_POOL) || !skb->pp_recycle) return false; + +#ifdef CONFIG_IP_FFN + if (skb->ffn_ff_done & BIT(1)) + page_pool_set_recycled_flag(virt_to_page(data)); +#endif return page_pool_return_skb_page(virt_to_page(data), napi_safe); } @@ -1345,6 +1362,11 @@ new->queue_mapping = old->queue_mapping; memcpy(&new->headers, &old->headers, sizeof(new->headers)); + +#ifdef CONFIG_IP_FFN + new->ffn_state = FFN_STATE_INIT; + new->ffn_ff_done = 0; +#endif CHECK_SKB_FIELD(protocol); CHECK_SKB_FIELD(csum); CHECK_SKB_FIELD(hash); @@ -5774,157 +5796,20 @@ skb->offload_fwd_mark = 0; skb->offload_l3_fwd_mark = 0; #endif + skb->mark = 0; +#ifdef CONFIG_IP_FFN + skb->ffn_state = FFN_STATE_INIT; + skb->ffn_ff_done = 0; +#endif if (!xnet) return; ipvs_reset(skb); - skb->mark = 0; skb_clear_tstamp(skb); } EXPORT_SYMBOL_GPL(skb_scrub_packet); -/** - * skb_gso_transport_seglen - Return length of individual segments of a gso packet - * - * @skb: GSO skb - * - * skb_gso_transport_seglen is used to determine the real size of the - * individual segments, including Layer4 headers (TCP/UDP). - * - * The MAC/L2 or network (IP, IPv6) headers are not accounted for. - */ -static unsigned int skb_gso_transport_seglen(const struct sk_buff *skb) -{ - const struct skb_shared_info *shinfo = skb_shinfo(skb); - unsigned int thlen = 0; - - if (skb->encapsulation) { - thlen = skb_inner_transport_header(skb) - - skb_transport_header(skb); - - if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) - thlen += inner_tcp_hdrlen(skb); - } else if (likely(shinfo->gso_type & (SKB_GSO_TCPV4 | SKB_GSO_TCPV6))) { - thlen = tcp_hdrlen(skb); - } else if (unlikely(skb_is_gso_sctp(skb))) { - thlen = sizeof(struct sctphdr); - } else if (shinfo->gso_type & SKB_GSO_UDP_L4) { - thlen = sizeof(struct udphdr); - } - /* UFO sets gso_size to the size of the fragmentation - * payload, i.e. the size of the L4 (UDP) header is already - * accounted for. - */ - return thlen + shinfo->gso_size; -} - -/** - * skb_gso_network_seglen - Return length of individual segments of a gso packet - * - * @skb: GSO skb - * - * skb_gso_network_seglen is used to determine the real size of the - * individual segments, including Layer3 (IP, IPv6) and L4 headers (TCP/UDP). - * - * The MAC/L2 header is not accounted for. - */ -static unsigned int skb_gso_network_seglen(const struct sk_buff *skb) -{ - unsigned int hdr_len = skb_transport_header(skb) - - skb_network_header(skb); - - return hdr_len + skb_gso_transport_seglen(skb); -} - -/** - * skb_gso_mac_seglen - Return length of individual segments of a gso packet - * - * @skb: GSO skb - * - * skb_gso_mac_seglen is used to determine the real size of the - * individual segments, including MAC/L2, Layer3 (IP, IPv6) and L4 - * headers (TCP/UDP). - */ -static unsigned int skb_gso_mac_seglen(const struct sk_buff *skb) -{ - unsigned int hdr_len = skb_transport_header(skb) - skb_mac_header(skb); - - return hdr_len + skb_gso_transport_seglen(skb); -} - -/** - * skb_gso_size_check - check the skb size, considering GSO_BY_FRAGS - * - * There are a couple of instances where we have a GSO skb, and we - * want to determine what size it would be after it is segmented. - * - * We might want to check: - * - L3+L4+payload size (e.g. IP forwarding) - * - L2+L3+L4+payload size (e.g. sanity check before passing to driver) - * - * This is a helper to do that correctly considering GSO_BY_FRAGS. - * - * @skb: GSO skb - * - * @seg_len: The segmented length (from skb_gso_*_seglen). In the - * GSO_BY_FRAGS case this will be [header sizes + GSO_BY_FRAGS]. - * - * @max_len: The maximum permissible length. - * - * Returns true if the segmented length <= max length. - */ -static inline bool skb_gso_size_check(const struct sk_buff *skb, - unsigned int seg_len, - unsigned int max_len) { - const struct skb_shared_info *shinfo = skb_shinfo(skb); - const struct sk_buff *iter; - - if (shinfo->gso_size != GSO_BY_FRAGS) - return seg_len <= max_len; - - /* Undo this so we can re-use header sizes */ - seg_len -= GSO_BY_FRAGS; - - skb_walk_frags(skb, iter) { - if (seg_len + skb_headlen(iter) > max_len) - return false; - } - - return true; -} - -/** - * skb_gso_validate_network_len - Will a split GSO skb fit into a given MTU? - * - * @skb: GSO skb - * @mtu: MTU to validate against - * - * skb_gso_validate_network_len validates if a given skb will fit a - * wanted MTU once split. It considers L3 headers, L4 headers, and the - * payload. - */ -bool skb_gso_validate_network_len(const struct sk_buff *skb, unsigned int mtu) -{ - return skb_gso_size_check(skb, skb_gso_network_seglen(skb), mtu); -} -EXPORT_SYMBOL_GPL(skb_gso_validate_network_len); - -/** - * skb_gso_validate_mac_len - Will a split GSO skb fit in a given length? - * - * @skb: GSO skb - * @len: length to validate against - * - * skb_gso_validate_mac_len validates if a given skb will fit a wanted - * length once split, including L2, L3 and L4 headers and the payload. - */ -bool skb_gso_validate_mac_len(const struct sk_buff *skb, unsigned int len) -{ - return skb_gso_size_check(skb, skb_gso_mac_seglen(skb), len); -} -EXPORT_SYMBOL_GPL(skb_gso_validate_mac_len); - static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) { int mac_len, meta_len; diff -ruw linux-6.4/net/core/sock.c linux-6.4-fbx/net/core/sock.c --- linux-6.4/net/core/sock.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/core/sock.c 2024-04-22 13:40:52.931940985 +0200 @@ -1526,6 +1526,10 @@ WRITE_ONCE(sk->sk_txrehash, (u8)val); break; + case SO_UDP_DUP_UNICAST: + sock_valbool_flag(sk, SOCK_UDP_DUP_UNICAST, valbool); + break; + default: ret = -ENOPROTOOPT; break; @@ -1896,6 +1900,10 @@ v.val64 = sock_gen_cookie(sk); break; + case SO_UDP_DUP_UNICAST: + v.val = sock_flag(sk, SOCK_UDP_DUP_UNICAST); + break; + case SO_ZEROCOPY: v.val = sock_flag(sk, SOCK_ZEROCOPY); break; diff -ruw linux-6.4/net/dsa/Kconfig linux-6.4-fbx/net/dsa/Kconfig --- linux-6.4/net/dsa/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/dsa/Kconfig 2024-04-22 13:40:52.939941204 +0200 @@ -63,6 +63,10 @@ Say Y or M if you want to enable support for tagging frames for the Hirschmann Hellcreek TSN switches. +config NET_DSA_TAG_BRCM_FBX + tristate "Tag driver for Broadcom switches using in-frame headers" + select NET_DSA_TAG_BRCM_COMMON + config NET_DSA_TAG_GSWIP tristate "Tag driver for Lantiq / Intel GSWIP switches" help diff -ruw linux-6.4/net/ethernet/eth.c linux-6.4-fbx/net/ethernet/eth.c --- linux-6.4/net/ethernet/eth.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ethernet/eth.c 2024-04-22 13:40:52.943941313 +0200 @@ -62,6 +62,7 @@ #include #include #include +#include /** * eth_header - create the Ethernet header @@ -609,6 +610,21 @@ */ int fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr) { +#ifdef CONFIG_FBXSERIAL + u32 index; + int ret; + + ret = fwnode_property_read_u32(fwnode, "fbxserial-mac-address", + &index); + if (ret == 0) { + const void *res = fbxserialinfo_get_mac_addr(index); + if (res) { + memcpy(addr, res, ETH_ALEN); + return 0; + } + } +#endif + if (!fwnode_get_mac_addr(fwnode, "mac-address", addr) || !fwnode_get_mac_addr(fwnode, "local-mac-address", addr) || !fwnode_get_mac_addr(fwnode, "address", addr)) diff -ruw linux-6.4/net/ethtool/common.c linux-6.4-fbx/net/ethtool/common.c --- linux-6.4/net/ethtool/common.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ethtool/common.c 2024-04-22 13:40:52.947941422 +0200 @@ -211,6 +211,12 @@ __DEFINE_LINK_MODE_NAME(10, T1S, Full), __DEFINE_LINK_MODE_NAME(10, T1S, Half), __DEFINE_LINK_MODE_NAME(10, T1S_P2MP, Half), + __DEFINE_LINK_MODE_NAME(1000, PX_D, Full), + __DEFINE_LINK_MODE_NAME(1000, PX_U, Full), + __DEFINE_LINK_MODE_NAME(10000, PR_D, Full), + __DEFINE_LINK_MODE_NAME(10000, PR_U, Full), + __DEFINE_LINK_MODE_NAME(10000_1000, PRX_D, Full), + __DEFINE_LINK_MODE_NAME(10000_1000, PRX_U, Full), }; static_assert(ARRAY_SIZE(link_mode_names) == __ETHTOOL_LINK_MODE_MASK_NBITS); @@ -251,6 +257,10 @@ #define __LINK_MODE_LANES_T1S_P2MP 1 #define __LINK_MODE_LANES_VR8 8 #define __LINK_MODE_LANES_DR8_2 8 +#define __LINK_MODE_LANES_PX_D 1 +#define __LINK_MODE_LANES_PX_U 1 +#define __LINK_MODE_LANES_PR_U 1 +#define __LINK_MODE_LANES_PR_D 1 #define __DEFINE_LINK_MODE_PARAMS(_speed, _type, _duplex) \ [ETHTOOL_LINK_MODE(_speed, _type, _duplex)] = { \ @@ -374,6 +384,18 @@ __DEFINE_LINK_MODE_PARAMS(10, T1S, Full), __DEFINE_LINK_MODE_PARAMS(10, T1S, Half), __DEFINE_LINK_MODE_PARAMS(10, T1S_P2MP, Half), + __DEFINE_LINK_MODE_PARAMS(1000, PX_D, Full), + __DEFINE_LINK_MODE_PARAMS(1000, PX_U, Full), + __DEFINE_LINK_MODE_PARAMS(10000, PR_D, Full), + __DEFINE_LINK_MODE_PARAMS(10000, PR_U, Full), + [ETHTOOL_LINK_MODE_10000_1000basePRX_D_Full_BIT] = { + .speed = SPEED_10000, + .duplex = DUPLEX_FULL, + }, + [ETHTOOL_LINK_MODE_10000_1000basePRX_U_Full_BIT] = { + .speed = SPEED_10000, + .duplex = DUPLEX_FULL, + }, }; static_assert(ARRAY_SIZE(link_mode_params) == __ETHTOOL_LINK_MODE_MASK_NBITS); diff -ruw linux-6.4/net/ethtool/ioctl.c linux-6.4-fbx/net/ethtool/ioctl.c --- linux-6.4/net/ethtool/ioctl.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ethtool/ioctl.c 2024-04-22 13:40:52.947941422 +0200 @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -179,6 +180,9 @@ if (sset == ETH_SS_LINK_MODES) return __ETHTOOL_LINK_MODE_MASK_NBITS; + if (sset == ETH_SS_PHYLINK_IFTYPES) + return PHY_INTERFACE_MODE_MAX - 1; + if (ops->get_sset_count && ops->get_strings) return ops->get_sset_count(dev, sset); else @@ -208,7 +212,16 @@ else if (stringset == ETH_SS_LINK_MODES) memcpy(data, link_mode_names, __ETHTOOL_LINK_MODE_MASK_NBITS * ETH_GSTRING_LEN); - else + else if (stringset == ETH_SS_PHYLINK_IFTYPES) { + int i; + + for (i = PHY_INTERFACE_MODE_NA + 1; + i < PHY_INTERFACE_MODE_MAX; i++) { + strlcpy(data + (i - 1) * ETH_GSTRING_LEN, + phy_modes(i), + ETH_GSTRING_LEN); + } + } else /* ops->get_strings is valid because checked earlier */ ops->get_strings(dev, stringset, data); } @@ -2624,6 +2637,7 @@ switch (tuna->id) { case ETHTOOL_PHY_DOWNSHIFT: case ETHTOOL_PHY_FAST_LINK_DOWN: + case ETHTOOL_PHY_BROKEN: if (tuna->len != sizeof(u8) || tuna->type_id != ETHTOOL_TUNABLE_U8) return -EINVAL; @@ -2750,6 +2764,156 @@ return dev->ethtool_ops->set_fecparam(dev, &fecparam); } +static int ethtool_get_sfp_state(struct net_device *dev, void __user *useraddr) +{ + struct ethtool_sfp_state sfp_state; + int rc; + + if (!dev->sfp_bus) { + printk("no SFP bus ya twat.\n"); + return -ENODEV; + } + + rc = sfp_get_sfp_state(dev->sfp_bus, &sfp_state); + if (rc) + return rc; + + if (copy_to_user(useraddr, &sfp_state, sizeof (sfp_state))) + return -EFAULT; + return 0; +} + +static int ethtool_get_shaper_params(struct net_device *dev, void __user *uaddr) +{ + struct ethtool_shaper_params sp; + int rc; + + if (!dev->ethtool_ops->get_shaper_param) + return -EOPNOTSUPP; + + memset(&sp, 0, sizeof (sp)); + rc = dev->ethtool_ops->get_shaper_param(dev, &sp); + if (rc) + return rc; + + if (copy_to_user(uaddr, &sp, sizeof (sp))) + return -EFAULT; + + return 0; +} + +static int ethtool_set_shaper_params(struct net_device *dev, void __user *uaddr) +{ + struct ethtool_shaper_params sp; + + if (!dev->ethtool_ops->set_shaper_param) + return -EOPNOTSUPP; + + if (copy_from_user(&sp, uaddr, sizeof (sp))) + return -EFAULT; + + return dev->ethtool_ops->set_shaper_param(dev, &sp); +} + +static int ethtool_get_eponparam(struct net_device *dev, void __user *useraddr) +{ + struct ethtool_epon_param eponparam = { .cmd = ETHTOOL_GEPON_PARAM }; + int rc; + + if (!dev->ethtool_ops->get_epon_param) + return -EOPNOTSUPP; + + rc = dev->ethtool_ops->get_epon_param(dev, &eponparam); + if (rc) + return rc; + + if (copy_to_user(useraddr, &eponparam, sizeof(eponparam))) + return -EFAULT; + return 0; +} + +static int ethtool_set_eponparam(struct net_device *dev, void __user *useraddr) +{ + struct ethtool_epon_param eponparam; + + if (!dev->ethtool_ops->set_epon_param) + return -EOPNOTSUPP; + + if (copy_from_user(&eponparam, useraddr, sizeof(eponparam))) + return -EFAULT; + + return dev->ethtool_ops->set_epon_param(dev, &eponparam); +} + +#ifdef CONFIG_PHYLINK +static int ethtool_get_phylink_iftype(struct net_device *dev, void __user *uaddr) +{ + struct ethtool_phylink_iftype sp; + phy_interface_t interface; + struct phylink *pl; + int mode, an_enable; + + if (!dev->ethtool_ops->get_phylink) + return -EOPNOTSUPP; + + pl = dev->ethtool_ops->get_phylink(dev); + if (!pl) + return -EIO; + + memset(&sp, 0, sizeof (sp)); + phylink_get_interface(pl, &interface, &an_enable, &mode); + strlcpy(sp.iftype, phy_modes(interface), sizeof (sp.iftype)); + sp.autoneg_en = an_enable; + sp.mode = mode; + + if (copy_to_user(uaddr, &sp, sizeof (sp))) + return -EFAULT; + + return 0; +} +#else +static inline int ethtool_get_phylink_iftype(struct net_device *dev, void __user *uaddr) +{ + return -ENOTSUPP; +} +#endif + +#ifdef CONFIG_PHYLINK +static int ethtool_set_phylink_iftype(struct net_device *dev, void __user *uaddr) +{ + struct ethtool_phylink_iftype sp; + phy_interface_t i; + struct phylink *pl; + + if (copy_from_user(&sp, uaddr, sizeof (sp))) + return -EFAULT; + + if (!dev->ethtool_ops->get_phylink) + return -EOPNOTSUPP; + + pl = dev->ethtool_ops->get_phylink(dev); + if (!pl) + return -EIO; + + sp.iftype[sizeof (sp.iftype) - 1] = 0; + + for (i = PHY_INTERFACE_MODE_NA; i < PHY_INTERFACE_MODE_MAX; i++) { + if (!strcmp(phy_modes(i), sp.iftype)) + break; + } + + if (i == PHY_INTERFACE_MODE_MAX) + return -EINVAL; + + return phylink_set_interface(pl, i, sp.autoneg_en ? 1 : 0); +} +#else +static inline int ethtool_set_phylink_iftype(struct net_device *dev, void __user *uaddr) +{ + return -ENOTSUPP; +} +#endif + /* The main entry point in this file. Called from net/core/dev_ioctl.c */ static int @@ -3036,6 +3200,33 @@ case ETHTOOL_SFECPARAM: rc = ethtool_set_fecparam(dev, useraddr); break; + case ETHTOOL_SSHAPER_PARAMS: + rc = ethtool_set_shaper_params(dev, useraddr); + break; + case ETHTOOL_GSHAPER_PARAMS: + rc = ethtool_get_shaper_params(dev, useraddr); + break; + case ETHTOOL_GEPON_PARAM: + rc = ethtool_get_eponparam(dev, useraddr); + break; + case ETHTOOL_SEPON_KEYS: + case ETHTOOL_SEPON_ENCRYPT: + case ETHTOOL_SEPON_RESTART: + case ETHTOOL_SEPON_BURST: + case ETHTOOL_SEPON_ADD_MCLLID: + case ETHTOOL_SEPON_DEL_MCLLID: + case ETHTOOL_SEPON_CLR_MCLLID: + rc = ethtool_set_eponparam(dev, useraddr); + break; + case ETHTOOL_GSFP_STATE: + rc = ethtool_get_sfp_state(dev, useraddr); + break; + case ETHTOOL_GPHYLINK_IFTYPE: + rc = ethtool_get_phylink_iftype(dev, useraddr); + break; + case ETHTOOL_SPHYLINK_IFTYPE: + rc = ethtool_set_phylink_iftype(dev, useraddr); + break; default: rc = -EOPNOTSUPP; } diff -ruw linux-6.4/net/ipv4/Makefile linux-6.4-fbx/net/ipv4/Makefile --- linux-6.4/net/ipv4/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/Makefile 2024-04-22 13:40:52.955941641 +0200 @@ -20,6 +20,8 @@ obj-$(CONFIG_NET_IP_TUNNEL) += ip_tunnel.o obj-$(CONFIG_SYSCTL) += sysctl_net_ipv4.o + +obj-$(CONFIG_IP_FFN) += ip_ffn.o obj-$(CONFIG_PROC_FS) += proc.o obj-$(CONFIG_IP_MULTIPLE_TABLES) += fib_rules.o obj-$(CONFIG_IP_MROUTE) += ipmr.o diff -ruw linux-6.4/net/ipv4/af_inet.c linux-6.4-fbx/net/ipv4/af_inet.c --- linux-6.4/net/ipv4/af_inet.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/af_inet.c 2024-04-22 13:40:52.955941641 +0200 @@ -100,6 +100,7 @@ #include #include #include +#include #include #include #include diff -ruw linux-6.4/net/ipv4/gre_offload.c linux-6.4-fbx/net/ipv4/gre_offload.c --- linux-6.4/net/ipv4/gre_offload.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/gre_offload.c 2024-04-22 13:40:52.959941750 +0200 @@ -11,6 +11,7 @@ #include #include #include +#include static struct sk_buff *gre_gso_segment(struct sk_buff *skb, netdev_features_t features) diff -ruw linux-6.4/net/ipv4/ip_input.c linux-6.4-fbx/net/ipv4/ip_input.c --- linux-6.4/net/ipv4/ip_input.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/ip_input.c 2024-04-22 13:40:52.963941860 +0200 @@ -224,8 +224,12 @@ } } -static int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb) +int ip_local_deliver_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FORWARDABLE) + ip_ffn_add(skb, IP_FFN_LOCAL_IN); +#endif skb_clear_delivery_time(skb); __skb_pull(skb, skb_network_header_len(skb)); @@ -566,6 +570,11 @@ if (skb == NULL) return NET_RX_DROP; +#ifdef CONFIG_IP_FFN + if (!ip_ffn_process(skb)) + return NET_RX_SUCCESS; +#endif + return NF_HOOK(NFPROTO_IPV4, NF_INET_PRE_ROUTING, net, NULL, skb, dev, NULL, ip_rcv_finish); diff -ruw linux-6.4/net/ipv4/ip_output.c linux-6.4-fbx/net/ipv4/ip_output.c --- linux-6.4/net/ipv4/ip_output.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/ip_output.c 2024-04-22 13:40:52.963941860 +0200 @@ -73,6 +73,7 @@ #include #include #include +#include #include #include #include @@ -219,6 +220,11 @@ return res; } +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FORWARDABLE) + ip_ffn_add(skb, IP_FFN_FINISH_OUT); +#endif + rcu_read_lock(); neigh = ip_neigh_for_gw(rt, skb, &is_v6gw); if (!IS_ERR(neigh)) { @@ -428,6 +434,11 @@ skb->dev = dev; skb->protocol = htons(ETH_P_IP); +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FAST_FORWARDED) + return ip_finish_output(net, sk, skb); +#endif + return NF_HOOK_COND(NFPROTO_IPV4, NF_INET_POST_ROUTING, net, sk, skb, indev, dev, ip_finish_output, @@ -1769,4 +1780,7 @@ #if defined(CONFIG_IP_MULTICAST) igmp_mc_init(); #endif +#ifdef CONFIG_IP_FFN + ip_ffn_init(); +#endif } diff -ruw linux-6.4/net/ipv4/ip_tunnel_core.c linux-6.4-fbx/net/ipv4/ip_tunnel_core.c --- linux-6.4/net/ipv4/ip_tunnel_core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/ip_tunnel_core.c 2024-04-22 13:40:52.967941969 +0200 @@ -38,6 +38,9 @@ #include #include #include +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) +#include +#endif const struct ip_tunnel_encap_ops __rcu * iptun_encaps[MAX_IPTUN_ENCAP_OPS] __read_mostly; @@ -60,6 +63,11 @@ skb_scrub_packet(skb, xnet); skb_clear_hash_if_not_l4(skb); +#if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) + if (proto == IPPROTO_IPV6) + nf_ct_set(skb, NULL, IP_CT_UNTRACKED); +#endif + skb_dst_set(skb, &rt->dst); memset(IPCB(skb), 0, sizeof(*IPCB(skb))); diff -ruw linux-6.4/net/ipv4/ipconfig.c linux-6.4-fbx/net/ipv4/ipconfig.c --- linux-6.4/net/ipv4/ipconfig.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/ipconfig.c 2024-04-22 13:40:52.967941969 +0200 @@ -197,16 +197,62 @@ static struct ic_device *ic_first_dev __initdata; /* List of open device */ static struct ic_device *ic_dev __initdata; /* Selected device */ -static bool __init ic_is_init_dev(struct net_device *dev) +static bool __init ic_is_init_dev(struct net_device *dev, bool partial) { + char *p = NULL; + bool ret; + if (dev->flags & IFF_LOOPBACK) return false; - return user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : + + if (partial) { + p = strchr(user_dev_name, '.'); + if (p) + *p = 0; + } + + ret = false; + if (user_dev_name[0] ? !strcmp(dev->name, user_dev_name) : (!(dev->flags & IFF_LOOPBACK) && (dev->flags & (IFF_POINTOPOINT|IFF_BROADCAST)) && - strncmp(dev->name, "dummy", 5)); + strncmp(dev->name, "dummy", 5))) + ret = true; + if (p) + *p = '.'; + return ret; } +#ifdef CONFIG_VLAN_8021Q +int register_vlan_device(struct net_device *real_dev, u16 vlan_id); + +static void __init prepare_vlan(void) +{ + unsigned short oflags; + struct net_device *dev; + char *p; + u16 vid; + + if (!strchr(user_dev_name, '.')) + return; + + p = strchr(user_dev_name, '.'); + *p = 0; + vid = simple_strtoul(p + 1, NULL, 10); + dev = __dev_get_by_name(&init_net, user_dev_name); + if (!dev) + goto fail; + + oflags = dev->flags; + if (dev_change_flags(dev, oflags | IFF_UP, NULL) < 0) + goto fail; + + register_vlan_device(dev, vid); + +fail: + *p = '.'; +} +#endif + static int __init ic_open_devs(void) { struct ic_device *d, **last; @@ -225,8 +271,13 @@ pr_err("IP-Config: Failed to open %s\n", dev->name); } +#ifdef CONFIG_VLAN_8021Q + /* register vlan device if needed */ + prepare_vlan(); +#endif + for_each_netdev(&init_net, dev) { - if (ic_is_init_dev(dev)) { + if (ic_is_init_dev(dev, false)) { int able = 0; if (dev->mtu >= 364) able |= IC_BOOTP; @@ -281,7 +332,7 @@ rtnl_lock(); for_each_netdev(&init_net, dev) - if (ic_is_init_dev(dev) && netif_carrier_ok(dev)) { + if (ic_is_init_dev(dev, false) && netif_carrier_ok(dev)) { rtnl_unlock(); goto have_carrier; } @@ -729,8 +780,10 @@ e += len; } if (*vendor_class_identifier) { +#ifdef IPCONFIG_DEBUG pr_info("DHCP: sending class identifier \"%s\"\n", vendor_class_identifier); +#endif *e++ = 60; /* Class-identifier */ len = strlen(vendor_class_identifier); *e++ = len; @@ -1445,7 +1498,7 @@ rtnl_lock(); for_each_netdev(&init_net, dev) { - if (ic_is_init_dev(dev)) { + if (ic_is_init_dev(dev, true)) { found = 1; break; } diff -ruw linux-6.4/net/ipv4/netfilter/Kconfig linux-6.4-fbx/net/ipv4/netfilter/Kconfig --- linux-6.4/net/ipv4/netfilter/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/netfilter/Kconfig 2024-04-22 13:40:52.967941969 +0200 @@ -6,6 +6,13 @@ menu "IP: Netfilter Configuration" depends on INET && NETFILTER +config IP_FFN + bool "IP: Fast forwarding and NAT" + +config IP_FFN_PROCFS + bool "IP: Fast forwarding and NAT /proc/net entries" + depends on IP_FFN + config NF_DEFRAG_IPV4 tristate default n diff -ruw linux-6.4/net/ipv4/netfilter/ip_tables.c linux-6.4-fbx/net/ipv4/netfilter/ip_tables.c --- linux-6.4/net/ipv4/netfilter/ip_tables.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/netfilter/ip_tables.c 2024-04-22 13:40:52.971942078 +0200 @@ -1099,6 +1099,8 @@ return ret; } +extern void fbxbr_flush_cache(void); + static int do_replace(struct net *net, sockptr_t arg, unsigned int len) { @@ -1138,6 +1140,14 @@ tmp.num_counters, tmp.counters); if (ret) goto free_newinfo_untrans; + +#ifdef CONFIG_FBXBRIDGE + fbxbr_flush_cache(); +#endif + +#ifdef CONFIG_IP_FFN + ip_ffn_flush_all(); +#endif return 0; free_newinfo_untrans: diff -ruw linux-6.4/net/ipv4/tcp.c linux-6.4-fbx/net/ipv4/tcp.c --- linux-6.4/net/ipv4/tcp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/tcp.c 2024-04-22 13:40:52.975942188 +0200 @@ -3599,6 +3599,13 @@ err = -EINVAL; break; + case TCP_LINEAR_RTO: + if (val < 0 || val > 1) + err = -EINVAL; + else + tp->linear_rto = val; + break; + case TCP_REPAIR: if (!tcp_can_repair_sock(sk)) err = -EPERM; @@ -4203,6 +4210,9 @@ case TCP_THIN_DUPACK: val = 0; break; + case TCP_LINEAR_RTO: + val = tp->linear_rto; + break; case TCP_REPAIR: val = tp->repair; diff -ruw linux-6.4/net/ipv4/tcp_offload.c linux-6.4-fbx/net/ipv4/tcp_offload.c --- linux-6.4/net/ipv4/tcp_offload.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/tcp_offload.c 2024-04-22 13:40:52.979942297 +0200 @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff -ruw linux-6.4/net/ipv4/tcp_timer.c linux-6.4-fbx/net/ipv4/tcp_timer.c --- linux-6.4/net/ipv4/tcp_timer.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/tcp_timer.c 2024-04-22 13:40:52.983942406 +0200 @@ -587,6 +587,10 @@ icsk->icsk_retransmits <= TCP_THIN_LINEAR_RETRIES) { icsk->icsk_backoff = 0; icsk->icsk_rto = min(__tcp_set_rto(tp), TCP_RTO_MAX); + + } else if (sk->sk_state == TCP_ESTABLISHED && tp->linear_rto) { + icsk->icsk_backoff = 0; + icsk->icsk_rto = min(__tcp_set_rto(tp), TCP_RTO_MAX); } else { /* Use normal (exponential) backoff */ icsk->icsk_rto = min(icsk->icsk_rto << 1, TCP_RTO_MAX); diff -ruw linux-6.4/net/ipv4/udp.c linux-6.4-fbx/net/ipv4/udp.c --- linux-6.4/net/ipv4/udp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/udp.c 2024-04-22 13:40:52.983942406 +0200 @@ -103,6 +103,7 @@ #include #include #include +#include #include #include #include @@ -315,6 +316,49 @@ inet_sk(sk)->inet_num = snum; udp_sk(sk)->udp_port_hash = snum; udp_sk(sk)->udp_portaddr_hash ^= snum; + + /* resolve udp reuse conflict */ + if (sk->sk_reuse) { + struct sock *sk2; + bool found; + + found = false; + sk_for_each(sk2, &hslot->head) { + if (!net_eq(sock_net(sk2), net) || + sk2 == sk || + (udp_sk(sk2)->udp_port_hash != snum)) + continue; + + if (sk2->sk_bound_dev_if && + sk->sk_bound_dev_if && + sk2->sk_bound_dev_if != sk->sk_bound_dev_if) + continue; + + if (!inet_rcv_saddr_equal(sk, sk2, true)) + continue; + + found = true; + break; + } + + sk_for_each(sk2, &hslot->head) { + if (!net_eq(sock_net(sk2), net) || + sk2 == sk || + (udp_sk(sk2)->udp_port_hash != snum)) + continue; + + if (sk2->sk_bound_dev_if && + sk->sk_bound_dev_if && + sk2->sk_bound_dev_if != sk->sk_bound_dev_if) + continue; + + if (!inet_rcv_saddr_equal(sk, sk2, true)) + continue; + + sk->sk_reuse_conflict = found; + } + } + if (sk_unhashed(sk)) { if (sk->sk_reuseport && udp_reuseport_add_sock(sk, hslot)) { @@ -2342,6 +2386,90 @@ return 0; } +/* + * Unicast goes to one listener and all sockets with dup flag + * + * Note: called only from the BH handler context. + * + * Note2: it is okay to use the udp_table.hash table only here + * and not udp_table.hash2 table as the sock is always hashed in + * both udp_table.hash and udp_table.hash2. This might impact + * performance if the sock hash bucket hosts more than 10 socks + * but has the benefit of keeping the code simplier. + * + * Note3: __udp_is_mcast_sock() does not have really anything to + * do with multicast, it used there to deliver the packet only to + * the sockets that are bound to the ip:port/interface the skbuff + * is targeted to. + */ +static int __udp4_lib_uc_conflict_deliver(struct net *net, struct sk_buff *skb, + struct udphdr *uh, + __be32 saddr, __be32 daddr, + struct udp_table *udptable, + int proto) +{ + struct sock *sk, *first = NULL; + unsigned short hnum = ntohs(uh->dest); + struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum); + int dif = skb->dev->ifindex; + unsigned int offset = offsetof(typeof(*sk), sk_node); + struct hlist_node *node; + struct sk_buff *nskb; + int sdif = inet_sdif(skb); + bool found_non_dup; + + found_non_dup = false; + sk_for_each_entry_offset_rcu(sk, node, &hslot->head, offset) { + bool need_deliver; + + if (!__udp_is_mcast_sock(net, sk, uh->dest, daddr, + uh->source, saddr, dif, sdif, hnum)) + continue; + + if (sock_flag(sk, SOCK_UDP_DUP_UNICAST)) + need_deliver = true; + else { + if (!found_non_dup) + need_deliver = true; + else + need_deliver = false; + found_non_dup = true; + } + + if (!need_deliver) + continue; + + if (!first) { + first = sk; + continue; + } + nskb = skb_clone(skb, GFP_ATOMIC); + + if (unlikely(!nskb)) { + atomic_inc(&sk->sk_drops); + __UDP_INC_STATS(net, UDP_MIB_RCVBUFERRORS, + IS_UDPLITE(sk)); + __UDP_INC_STATS(net, UDP_MIB_INERRORS, + IS_UDPLITE(sk)); + continue; + } + + if (udp_queue_rcv_skb(sk, nskb) > 0) + consume_skb(nskb); + } + + if (first) { + if (udp_queue_rcv_skb(first, skb) > 0) + consume_skb(skb); + } else { + kfree_skb(skb); + __UDP_INC_STATS(net, UDP_MIB_IGNOREDMULTI, + proto == IPPROTO_UDPLITE); + } + + return 0; +} + /* Initialize UDP checksum. If exited with zero value (success), * CHECKSUM_UNNECESSARY means, that no more checks are required. * Otherwise, csum completion requires checksumming packet body, @@ -2471,9 +2599,15 @@ saddr, daddr, udptable, proto); sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable); - if (sk) - return udp_unicast_rcv_skb(sk, skb, uh); + if (sk) { + if (sk->sk_reuse_conflict) + return __udp4_lib_uc_conflict_deliver(net, + skb, uh, + saddr, daddr, + udptable, proto); + return udp_unicast_rcv_skb(sk, skb, uh); + } if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) goto drop; nf_reset_ct(skb); diff -ruw linux-6.4/net/ipv4/udp_offload.c linux-6.4-fbx/net/ipv4/udp_offload.c --- linux-6.4/net/ipv4/udp_offload.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv4/udp_offload.c 2024-04-22 13:40:52.987942515 +0200 @@ -8,6 +8,7 @@ #include #include +#include #include #include #include diff -ruw linux-6.4/net/ipv6/Makefile linux-6.4-fbx/net/ipv6/Makefile --- linux-6.4/net/ipv6/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/Makefile 2024-04-22 13:40:52.987942515 +0200 @@ -13,6 +13,7 @@ udp_offload.o seg6.o fib6_notifier.o rpl.o ioam6.o ipv6-$(CONFIG_SYSCTL) += sysctl_net_ipv6.o +ipv6-$(CONFIG_IPV6_FFN) += ip6_ffn.o ipv6-$(CONFIG_IPV6_MROUTE) += ip6mr.o ipv6-$(CONFIG_XFRM) += xfrm6_policy.o xfrm6_state.o xfrm6_input.o \ diff -ruw linux-6.4/net/ipv6/addrconf.c linux-6.4-fbx/net/ipv6/addrconf.c --- linux-6.4/net/ipv6/addrconf.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/addrconf.c 2024-04-22 13:40:52.987942515 +0200 @@ -2310,12 +2310,27 @@ return 0; } +static int addrconf_ifid_ppp(u8 *eui, struct net_device *dev) +{ + if (is_zero_ether_addr(dev->perm_addr)) + return -1; + + memcpy(eui, dev->perm_addr, 3); + memcpy(eui + 5, dev->perm_addr + 3, 3); + eui[3] = 0xFF; + eui[4] = 0xFE; + eui[0] ^= 2; + return 0; +} + static int ipv6_generate_eui64(u8 *eui, struct net_device *dev) { switch (dev->type) { case ARPHRD_ETHER: case ARPHRD_FDDI: return addrconf_ifid_eui48(eui, dev); + case ARPHRD_PPP: + return addrconf_ifid_ppp(eui, dev); case ARPHRD_ARCNET: return addrconf_ifid_arcnet(eui, dev); case ARPHRD_INFINIBAND: @@ -3363,6 +3378,7 @@ if ((dev->type != ARPHRD_ETHER) && (dev->type != ARPHRD_FDDI) && + (dev->type != ARPHRD_PPP) && (dev->type != ARPHRD_ARCNET) && (dev->type != ARPHRD_INFINIBAND) && (dev->type != ARPHRD_IEEE1394) && diff -ruw linux-6.4/net/ipv6/af_inet6.c linux-6.4-fbx/net/ipv6/af_inet6.c --- linux-6.4/net/ipv6/af_inet6.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/af_inet6.c 2024-04-22 13:40:52.987942515 +0200 @@ -1180,6 +1180,10 @@ if (err) goto udpv6_fail; +#ifdef CONFIG_IPV6_FFN + ipv6_ffn_init(); +#endif + err = udplitev6_init(); if (err) goto udplitev6_fail; diff -ruw linux-6.4/net/ipv6/ip6_input.c linux-6.4-fbx/net/ipv6/ip6_input.c --- linux-6.4/net/ipv6/ip6_input.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/ip6_input.c 2024-04-22 13:40:52.995942734 +0200 @@ -306,6 +306,12 @@ skb = ip6_rcv_core(skb, dev, net); if (skb == NULL) return NET_RX_DROP; + +#ifdef CONFIG_IPV6_FFN + if (!ipv6_ffn_process(skb)) + return NET_RX_SUCCESS; +#endif + return NF_HOOK(NFPROTO_IPV6, NF_INET_PRE_ROUTING, net, NULL, skb, dev, NULL, ip6_rcv_finish); @@ -475,8 +481,13 @@ kfree_skb_reason(skb, reason); } -static int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skb) +int ip6_input_finish(struct net *net, struct sock *sk, struct sk_buff *skb) { +#ifdef CONFIG_IPV6_FFN + if (skb->ffn_state == FFN_STATE_FORWARDABLE) + ipv6_ffn_add(skb, IPV6_FFN_LOCAL_IN); +#endif + skb_clear_delivery_time(skb); rcu_read_lock(); ip6_protocol_deliver_rcu(net, skb, 0, false); diff -ruw linux-6.4/net/ipv6/ip6_offload.c linux-6.4-fbx/net/ipv6/ip6_offload.c --- linux-6.4/net/ipv6/ip6_offload.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/ip6_offload.c 2024-04-22 13:40:52.995942734 +0200 @@ -16,6 +16,7 @@ #include #include #include +#include #include "ip6_offload.h" diff -ruw linux-6.4/net/ipv6/ip6_output.c linux-6.4-fbx/net/ipv6/ip6_output.c --- linux-6.4/net/ipv6/ip6_output.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/ip6_output.c 2024-04-22 13:40:52.995942734 +0200 @@ -42,6 +42,7 @@ #include #include +#include #include #include #include @@ -51,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -116,6 +118,11 @@ return res; } +#ifdef CONFIG_IPV6_FFN + if (skb->ffn_state == FFN_STATE_FORWARDABLE) + ipv6_ffn_add(skb, IPV6_FFN_FINISH_OUT); +#endif + rcu_read_lock(); nexthop = rt6_nexthop((struct rt6_info *)dst, daddr); neigh = __ipv6_neigh_lookup_noref(dev, nexthop); @@ -224,6 +231,11 @@ return 0; } +#ifdef CONFIG_IP_FFN + if (skb->ffn_state == FFN_STATE_FAST_FORWARDED) + return ip6_finish_output(net, sk, skb); +#endif + return NF_HOOK_COND(NFPROTO_IPV6, NF_INET_POST_ROUTING, net, sk, skb, indev, dev, ip6_finish_output, @@ -646,6 +658,8 @@ hdr->hop_limit--; + skb->priority = rt_tos2priority(ipv6_get_dsfield(hdr)); + return NF_HOOK(NFPROTO_IPV6, NF_INET_FORWARD, net, NULL, skb, skb->dev, dst->dev, ip6_forward_finish); diff -ruw linux-6.4/net/ipv6/netfilter/Kconfig linux-6.4-fbx/net/ipv6/netfilter/Kconfig --- linux-6.4/net/ipv6/netfilter/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/netfilter/Kconfig 2024-04-22 13:40:52.999942843 +0200 @@ -6,6 +6,13 @@ menu "IPv6: Netfilter Configuration" depends on INET && IPV6 && NETFILTER +config IPV6_FFN + bool "IPv6: Fast forwarding and NAT" + +config IPV6_FFN_PROCFS + bool "IPv6: Fast forwarding and NAT /proc/net entries" + depends on IPV6_FFN + config NF_SOCKET_IPV6 tristate "IPv6 socket lookup support" help diff -ruw linux-6.4/net/ipv6/netfilter/ip6_tables.c linux-6.4-fbx/net/ipv6/netfilter/ip6_tables.c --- linux-6.4/net/ipv6/netfilter/ip6_tables.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/netfilter/ip6_tables.c 2024-04-22 13:40:52.999942843 +0200 @@ -1155,6 +1155,10 @@ tmp.num_counters, tmp.counters); if (ret) goto free_newinfo_untrans; + +#ifdef CONFIG_IPV6_FFN + ipv6_ffn_flush_all(); +#endif return 0; free_newinfo_untrans: diff -ruw linux-6.4/net/ipv6/udp.c linux-6.4-fbx/net/ipv6/udp.c --- linux-6.4/net/ipv6/udp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/udp.c 2024-04-22 13:40:53.003942953 +0200 @@ -844,6 +844,82 @@ * Note: called only from the BH handler context, * so we don't need to lock the hashes. */ +static int __udp6_lib_uc_conflict_deliver(struct net *net, struct sk_buff *skb, + const struct in6_addr *saddr, const struct in6_addr *daddr, + struct udp_table *udptable, int proto) +{ + struct sock *sk, *first = NULL; + const struct udphdr *uh = udp_hdr(skb); + unsigned short hnum = ntohs(uh->dest); + struct udp_hslot *hslot = udp_hashslot(udptable, net, hnum); + unsigned int offset = offsetof(typeof(*sk), sk_node); + int dif = inet6_iif(skb); + int sdif = inet6_sdif(skb); + struct hlist_node *node; + struct sk_buff *nskb; + bool found_non_dup; + + found_non_dup = false; + sk_for_each_entry_offset_rcu(sk, node, &hslot->head, offset) { + bool need_deliver; + + if (!__udp_v6_is_mcast_sock(net, sk, uh->dest, daddr, + uh->source, saddr, dif, sdif, hnum)) + + continue; + + /* If zero checksum and no_check is not on for + * the socket then skip it. + */ + if (!uh->check && !udp_sk(sk)->no_check6_rx) + continue; + + if (sock_flag(sk, SOCK_UDP_DUP_UNICAST)) + need_deliver = true; + else { + if (!found_non_dup) + need_deliver = true; + else + need_deliver = false; + found_non_dup = true; + } + + if (!need_deliver) + continue; + + if (!first) { + first = sk; + continue; + } + nskb = skb_clone(skb, GFP_ATOMIC); + if (unlikely(!nskb)) { + atomic_inc(&sk->sk_drops); + __UDP6_INC_STATS(net, UDP_MIB_RCVBUFERRORS, + IS_UDPLITE(sk)); + __UDP6_INC_STATS(net, UDP_MIB_INERRORS, + IS_UDPLITE(sk)); + continue; + } + + if (udpv6_queue_rcv_skb(sk, nskb) > 0) + consume_skb(nskb); + } + + if (first) { + if (udpv6_queue_rcv_skb(first, skb) > 0) + consume_skb(skb); + } else { + kfree_skb(skb); + __UDP6_INC_STATS(net, UDP_MIB_IGNOREDMULTI, + proto == IPPROTO_UDPLITE); + } + return 0; +} + +/* + * Note: called only from the BH handler context, + * so we don't need to lock the hashes. + */ static int __udp6_lib_mcast_deliver(struct net *net, struct sk_buff *skb, const struct in6_addr *saddr, const struct in6_addr *daddr, struct udp_table *udptable, int proto) @@ -1018,6 +1094,12 @@ if (sk) { if (!uh->check && !udp_sk(sk)->no_check6_rx) goto report_csum_error; + + if (sk->sk_reuse_conflict) + return __udp6_lib_uc_conflict_deliver(net, skb, + saddr, daddr, + udptable, proto); + return udp6_unicast_rcv_skb(sk, skb, uh); } diff -ruw linux-6.4/net/ipv6/udp_offload.c linux-6.4-fbx/net/ipv6/udp_offload.c --- linux-6.4/net/ipv6/udp_offload.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/ipv6/udp_offload.c 2024-04-22 13:40:53.003942953 +0200 @@ -14,6 +14,7 @@ #include #include "ip6_offload.h" #include +#include static struct sk_buff *udp6_ufo_fragment(struct sk_buff *skb, netdev_features_t features) diff -ruw linux-6.4/net/mac80211/Kconfig linux-6.4-fbx/net/mac80211/Kconfig --- linux-6.4/net/mac80211/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/Kconfig 2024-04-22 13:40:53.011943171 +0200 @@ -57,6 +57,17 @@ comment "Some wireless drivers require a rate control algorithm" depends on MAC80211 && MAC80211_HAS_RC=n +config MAC80211_KUNIT_TEST + tristate "KUnit tests for mac80211" if !KUNIT_ALL_TESTS + depends on KUNIT + depends on MAC80211 + default KUNIT_ALL_TESTS + depends on !KERNEL_6_2 + help + Enable this option to test mac80211 internals with kunit. + + If unsure, say N. + config MAC80211_MESH bool "Enable mac80211 mesh networking support" depends on MAC80211 @@ -304,3 +315,9 @@ connect more stations than the number selected here.) If unsure, leave the default of 0. + +config FBX80211_SCUM + bool "Same channel unassociated metrics" + depends on FBX80211 + help + Support for unassociated STA metrics diff -ruw linux-6.4/net/mac80211/Makefile linux-6.4-fbx/net/mac80211/Makefile --- linux-6.4/net/mac80211/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/Makefile 2024-04-22 13:40:53.011943171 +0200 @@ -54,6 +54,7 @@ mesh_ps.o mac80211-$(CONFIG_PM) += pm.o +mac80211-$(CONFIG_FBX80211_SCUM) += fbx_scum.o CFLAGS_trace.o := -I$(src) @@ -65,4 +66,6 @@ mac80211-$(CONFIG_MAC80211_RC_MINSTREL) += $(rc80211_minstrel-y) +obj-y += tests/ + ccflags-y += -DDEBUG diff -ruw linux-6.4/net/mac80211/agg-rx.c linux-6.4-fbx/net/mac80211/agg-rx.c --- linux-6.4/net/mac80211/agg-rx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/agg-rx.c 2024-04-22 13:40:53.011943171 +0200 @@ -9,7 +9,7 @@ * Copyright 2007, Michael Wu * Copyright 2007-2010, Intel Corporation * Copyright(c) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ /** @@ -55,7 +55,7 @@ kfree(tid_rx); } -void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, +void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, u16 initiator, u16 reason, bool tx) { struct ieee80211_local *local = sta->local; @@ -69,10 +69,10 @@ .ssn = 0, }; - lockdep_assert_held(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); tid_rx = rcu_dereference_protected(sta->ampdu_mlme.tid_rx[tid], - lockdep_is_held(&sta->ampdu_mlme.mtx)); + lockdep_is_held(&sta->local->hw.wiphy->mtx)); if (!test_bit(tid, sta->ampdu_mlme.agg_session_valid)) return; @@ -114,14 +114,6 @@ call_rcu(&tid_rx->rcu_head, ieee80211_free_tid_rx); } -void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, - u16 initiator, u16 reason, bool tx) -{ - mutex_lock(&sta->ampdu_mlme.mtx); - ___ieee80211_stop_rx_ba_session(sta, tid, initiator, reason, tx); - mutex_unlock(&sta->ampdu_mlme.mtx); -} - void ieee80211_stop_rx_ba_session(struct ieee80211_vif *vif, u16 ba_rx_bitmap, const u8 *addr) { @@ -140,7 +132,7 @@ if (ba_rx_bitmap & BIT(i)) set_bit(i, sta->ampdu_mlme.tid_rx_stop_requested); - ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(sta->local->hw.wiphy, &sta->ampdu_mlme.work); rcu_read_unlock(); } EXPORT_SYMBOL(ieee80211_stop_rx_ba_session); @@ -166,7 +158,7 @@ sta->sta.addr, tid); set_bit(tid, sta->ampdu_mlme.tid_rx_timer_expired); - ieee80211_queue_work(&sta->local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(sta->local->hw.wiphy, &sta->ampdu_mlme.work); } static void sta_rx_agg_reorder_timer_expired(struct timer_list *t) @@ -250,7 +242,7 @@ ieee80211_tx_skb(sdata, skb); } -void ___ieee80211_start_rx_ba_session(struct sta_info *sta, +void __ieee80211_start_rx_ba_session(struct sta_info *sta, u8 dialog_token, u16 timeout, u16 start_seq_num, u16 ba_policy, u16 tid, u16 buf_size, bool tx, bool auto_seq, @@ -270,6 +262,8 @@ u16 status = WLAN_STATUS_REQUEST_DECLINED; u16 max_buf_size; + lockdep_assert_wiphy(sta->local->hw.wiphy); + if (tid >= IEEE80211_FIRST_TSPEC_TSID) { ht_dbg(sta->sdata, "STA %pM requests BA session on unsupported tid %d\n", @@ -325,9 +319,6 @@ ht_dbg(sta->sdata, "AddBA Req buf_size=%d for %pM\n", buf_size, sta->sta.addr); - /* examine state machine */ - lockdep_assert_held(&sta->ampdu_mlme.mtx); - if (test_bit(tid, sta->ampdu_mlme.agg_session_valid)) { if (sta->ampdu_mlme.tid_rx_token[tid] == dialog_token) { struct tid_ampdu_rx *tid_rx; @@ -355,7 +346,7 @@ sta->sta.addr, tid); /* delete existing Rx BA session on the same tid */ - ___ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT, + __ieee80211_stop_rx_ba_session(sta, tid, WLAN_BACK_RECIPIENT, WLAN_STATUS_UNSPECIFIED_QOS, false); } @@ -444,20 +435,6 @@ timeout, addbaext); } -static void __ieee80211_start_rx_ba_session(struct sta_info *sta, - u8 dialog_token, u16 timeout, - u16 start_seq_num, u16 ba_policy, - u16 tid, u16 buf_size, bool tx, - bool auto_seq, - const struct ieee80211_addba_ext_ie *addbaext) -{ - mutex_lock(&sta->ampdu_mlme.mtx); - ___ieee80211_start_rx_ba_session(sta, dialog_token, timeout, - start_seq_num, ba_policy, tid, - buf_size, tx, auto_seq, addbaext); - mutex_unlock(&sta->ampdu_mlme.mtx); -} - void ieee80211_process_addba_request(struct ieee80211_local *local, struct sta_info *sta, struct ieee80211_mgmt *mgmt, @@ -507,7 +484,6 @@ const u8 *addr, unsigned int tid) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); - struct ieee80211_local *local = sdata->local; struct sta_info *sta; rcu_read_lock(); @@ -516,7 +492,7 @@ goto unlock; set_bit(tid, sta->ampdu_mlme.tid_rx_manage_offl); - ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(sta->local->hw.wiphy, &sta->ampdu_mlme.work); unlock: rcu_read_unlock(); } @@ -526,7 +502,6 @@ const u8 *addr, unsigned int tid) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); - struct ieee80211_local *local = sdata->local; struct sta_info *sta; rcu_read_lock(); @@ -535,7 +510,7 @@ goto unlock; set_bit(tid, sta->ampdu_mlme.tid_rx_timer_expired); - ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(sta->local->hw.wiphy, &sta->ampdu_mlme.work); unlock: rcu_read_unlock(); diff -ruw linux-6.4/net/mac80211/agg-tx.c linux-6.4-fbx/net/mac80211/agg-tx.c --- linux-6.4/net/mac80211/agg-tx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/agg-tx.c 2024-04-22 13:40:53.011943171 +0200 @@ -9,7 +9,7 @@ * Copyright 2007, Michael Wu * Copyright 2007-2010, Intel Corporation * Copyright(c) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation */ #include @@ -139,10 +139,18 @@ } EXPORT_SYMBOL(ieee80211_send_bar); +void ieee80211_send_bar_sta(struct ieee80211_sta *pubsta, + u16 tid, u16 ssn) +{ + struct sta_info *sta = container_of(pubsta, struct sta_info, sta); + ieee80211_send_bar(&sta->sdata->vif, pubsta->addr, tid, ssn); +} +EXPORT_SYMBOL(ieee80211_send_bar_sta); + void ieee80211_assign_tid_tx(struct sta_info *sta, int tid, struct tid_ampdu_tx *tid_tx) { - lockdep_assert_held(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); lockdep_assert_held(&sta->lock); rcu_assign_pointer(sta->ampdu_mlme.tid_tx[tid], tid_tx); } @@ -213,7 +221,7 @@ struct ieee80211_txq *txq = sta->sta.txq[tid]; struct txq_info *txqi; - lockdep_assert_held(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); if (!txq) return; @@ -271,7 +279,7 @@ { struct tid_ampdu_tx *tid_tx; - lockdep_assert_held(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); lockdep_assert_held(&sta->lock); tid_tx = rcu_dereference_protected_tid_tx(sta, tid); @@ -296,7 +304,7 @@ kfree_rcu(tid_tx, rcu_head); } -int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, +int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, enum ieee80211_agg_stop_reason reason) { struct ieee80211_local *local = sta->local; @@ -311,7 +319,7 @@ }; int ret; - lockdep_assert_held(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); switch (reason) { case AGG_STOP_DECLINED: @@ -457,6 +465,12 @@ u8 tid = tid_tx->tid; u16 buf_size; + if (WARN_ON_ONCE(test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state) || + test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state))) + return; + + lockdep_assert_wiphy(sta->local->hw.wiphy); + /* activate the timer for the recipient's addBA response */ mod_timer(&tid_tx->addba_resp_timer, jiffies + ADDBA_RESP_INTERVAL); ht_dbg(sdata, "activated addBA response timer on %pM tid %d\n", @@ -491,7 +505,7 @@ { struct tid_ampdu_tx *tid_tx; struct ieee80211_local *local = sta->local; - struct ieee80211_sub_if_data *sdata; + struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_ampdu_params params = { .sta = &sta->sta, .action = IEEE80211_AMPDU_TX_START, @@ -519,7 +533,6 @@ */ synchronize_net(); - sdata = sta->sdata; params.ssn = sta->tid_seq[tid] >> 4; ret = drv_ampdu_action(local, sdata, ¶ms); tid_tx->ssn = params.ssn; @@ -533,9 +546,6 @@ */ set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state); } else if (ret) { - if (!sdata) - return; - ht_dbg(sdata, "BA request denied - HW unavailable for %pM tid %d\n", sta->sta.addr, tid); @@ -737,7 +747,7 @@ */ sta->ampdu_mlme.tid_start_tx[tid] = tid_tx; - ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(local->hw.wiphy, &sta->ampdu_mlme.work); /* this flow continues off the work */ err_unlock_sta: @@ -758,7 +768,7 @@ .ssn = 0, }; - lockdep_assert_held(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); tid_tx = rcu_dereference_protected_tid_tx(sta, tid); params.buf_size = tid_tx->buf_size; @@ -795,9 +805,15 @@ struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_local *local = sdata->local; + lockdep_assert_wiphy(sta->local->hw.wiphy); + if (WARN_ON(test_and_set_bit(HT_AGG_STATE_DRV_READY, &tid_tx->state))) return; + if (test_bit(HT_AGG_STATE_STOPPING, &tid_tx->state) || + test_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state)) + return; + if (!test_bit(HT_AGG_STATE_SENT_ADDBA, &tid_tx->state)) { ieee80211_send_addba_with_timeout(sta, tid_tx); /* RESPONSE_RECEIVED state whould trigger the flow again */ @@ -850,26 +866,12 @@ goto out; set_bit(HT_AGG_STATE_START_CB, &tid_tx->state); - ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(local->hw.wiphy, &sta->ampdu_mlme.work); out: rcu_read_unlock(); } EXPORT_SYMBOL(ieee80211_start_tx_ba_cb_irqsafe); -int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, - enum ieee80211_agg_stop_reason reason) -{ - int ret; - - mutex_lock(&sta->ampdu_mlme.mtx); - - ret = ___ieee80211_stop_tx_ba_session(sta, tid, reason); - - mutex_unlock(&sta->ampdu_mlme.mtx); - - return ret; -} - int ieee80211_stop_tx_ba_session(struct ieee80211_sta *pubsta, u16 tid) { struct sta_info *sta = container_of(pubsta, struct sta_info, sta); @@ -904,7 +906,7 @@ } set_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state); - ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(local->hw.wiphy, &sta->ampdu_mlme.work); unlock: spin_unlock_bh(&sta->lock); @@ -964,7 +966,7 @@ goto out; set_bit(HT_AGG_STATE_STOP_CB, &tid_tx->state); - ieee80211_queue_work(&local->hw, &sta->ampdu_mlme.work); + wiphy_work_queue(local->hw.wiphy, &sta->ampdu_mlme.work); out: rcu_read_unlock(); } @@ -981,6 +983,8 @@ u16 capab, tid, buf_size; bool amsdu; + lockdep_assert_wiphy(sta->local->hw.wiphy); + capab = le16_to_cpu(mgmt->u.action.u.addba_resp.capab); amsdu = capab & IEEE80211_ADDBA_PARAM_AMSDU_MASK; tid = u16_get_bits(capab, IEEE80211_ADDBA_PARAM_TID_MASK); @@ -991,16 +995,14 @@ if (!amsdu && txq) set_bit(IEEE80211_TXQ_NO_AMSDU, &to_txq_info(txq)->flags); - mutex_lock(&sta->ampdu_mlme.mtx); - tid_tx = rcu_dereference_protected_tid_tx(sta, tid); if (!tid_tx) - goto out; + return; if (mgmt->u.action.u.addba_resp.dialog_token != tid_tx->dialog_token) { ht_dbg(sta->sdata, "wrong addBA response token, %pM tid %d\n", sta->sta.addr, tid); - goto out; + return; } del_timer_sync(&tid_tx->addba_resp_timer); @@ -1018,7 +1020,7 @@ ht_dbg(sta->sdata, "got addBA resp for %pM tid %d but we already gave up\n", sta->sta.addr, tid); - goto out; + return; } /* @@ -1032,7 +1034,7 @@ if (test_and_set_bit(HT_AGG_STATE_RESPONSE_RECEIVED, &tid_tx->state)) { /* ignore duplicate response */ - goto out; + return; } tid_tx->buf_size = buf_size; @@ -1053,9 +1055,6 @@ } } else { - ___ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_DECLINED); + __ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_DECLINED); } - - out: - mutex_unlock(&sta->ampdu_mlme.mtx); } diff -ruw linux-6.4/net/mac80211/airtime.c linux-6.4-fbx/net/mac80211/airtime.c --- linux-6.4/net/mac80211/airtime.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/airtime.c 2024-04-22 13:40:53.011943171 +0200 @@ -557,7 +557,7 @@ if (ieee80211_fill_rate_info(hw, stat, band, ri)) return 0; - if (rate->idx < 0 || !rate->count) + if (!ieee80211_rate_valid(rate)) return -1; if (rate->flags & IEEE80211_TX_RC_160_MHZ_WIDTH) @@ -632,7 +632,7 @@ { struct ieee80211_supported_band *sband; struct ieee80211_chanctx_conf *conf; - int rateidx, shift = 0; + int rateidx; bool cck, short_pream; u32 basic_rates; u8 band = 0; @@ -641,10 +641,8 @@ len += 38; /* Ethernet header length */ conf = rcu_dereference(vif->bss_conf.chanctx_conf); - if (conf) { + if (conf) band = conf->def.chan->band; - shift = ieee80211_chandef_get_shift(&conf->def); - } if (pubsta) { struct sta_info *sta = container_of(pubsta, struct sta_info, @@ -704,7 +702,7 @@ short_pream = vif->bss_conf.use_short_preamble; rateidx = basic_rates ? ffs(basic_rates) - 1 : 0; - rate = sband->bitrates[rateidx].bitrate << shift; + rate = sband->bitrates[rateidx].bitrate; cck = sband->bitrates[rateidx].flags & IEEE80211_RATE_MANDATORY_B; return ieee80211_calc_legacy_rate_duration(rate, short_pream, cck, len); diff -ruw linux-6.4/net/mac80211/cfg.c linux-6.4-fbx/net/mac80211/cfg.c --- linux-6.4/net/mac80211/cfg.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/cfg.c 2024-04-22 13:40:53.011943171 +0200 @@ -35,7 +35,7 @@ * the return value at all (if it's not a pairwise key), * so in that case (require_valid==false) don't error. */ - if (require_valid && sdata->vif.valid_links) + if (require_valid && ieee80211_vif_is_mld(&sdata->vif)) return ERR_PTR(-EINVAL); return &sdata->deflink; @@ -214,6 +214,8 @@ struct sta_info *sta; int ret; + lockdep_assert_wiphy(local->hw.wiphy); + ret = ieee80211_if_change_type(sdata, type); if (ret) return ret; @@ -228,19 +230,17 @@ return 0; /* FIXME: no support for 4-addr MLO yet */ - if (sdata->vif.valid_links) + if (ieee80211_vif_is_mld(&sdata->vif)) return -EOPNOTSUPP; sdata->u.mgd.use_4addr = params->use_4addr; if (!ifmgd->associated) return 0; - mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, sdata->deflink.u.mgd.bssid); if (sta) drv_sta_set_4addr(local, sdata, &sta->sta, params->use_4addr); - mutex_unlock(&local->sta_mtx); if (params->use_4addr) ieee80211_send_4addr_nullfunc(local, sdata); @@ -261,9 +261,9 @@ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); int ret; - mutex_lock(&sdata->local->chanctx_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + ret = ieee80211_check_combinations(sdata, NULL, 0, 0); - mutex_unlock(&sdata->local->chanctx_mtx); if (ret < 0) return ret; @@ -283,9 +283,9 @@ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); int ret; - mutex_lock(&sdata->local->chanctx_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + ret = ieee80211_check_combinations(sdata, NULL, 0, 0); - mutex_unlock(&sdata->local->chanctx_mtx); if (ret < 0) return ret; @@ -452,13 +452,11 @@ if (sta->ptk_idx == key_idx) return 0; - mutex_lock(&local->key_mtx); - key = key_mtx_dereference(local, sta->ptk[key_idx]); + key = wiphy_dereference(local->hw.wiphy, sta->ptk[key_idx]); if (key && key->conf.flags & IEEE80211_KEY_FLAG_NO_AUTO_TX) ret = ieee80211_set_tx_key(key); - mutex_unlock(&local->key_mtx); return ret; } @@ -474,6 +472,8 @@ struct ieee80211_key *key; int err; + lockdep_assert_wiphy(local->hw.wiphy); + if (!ieee80211_sdata_running(sdata)) return -ENETDOWN; @@ -510,8 +510,6 @@ if (params->mode == NL80211_KEY_NO_TX) key->conf.flags |= IEEE80211_KEY_FLAG_NO_AUTO_TX; - mutex_lock(&local->sta_mtx); - if (mac_addr) { sta = sta_info_get_bss(sdata, mac_addr); /* @@ -526,8 +524,7 @@ */ if (!sta || !test_sta_flag(sta, WLAN_STA_ASSOC)) { ieee80211_key_free_unused(key); - err = -ENOENT; - goto out_unlock; + return -ENOENT; } } @@ -566,10 +563,9 @@ } err = ieee80211_key_link(key, link, sta); - - out_unlock: - mutex_unlock(&local->sta_mtx); - + /* KRACK protection, shouldn't happen but just silently accept key */ + if (err == -EALREADY) + err = 0; return err; } @@ -582,8 +578,7 @@ struct ieee80211_key *key; if (link_id >= 0) { - link = rcu_dereference_check(sdata->link[link_id], - lockdep_is_held(&sdata->wdev.mtx)); + link = sdata_dereference(sdata->link[link_id], sdata); if (!link) return NULL; } @@ -598,7 +593,7 @@ if (link_id >= 0) { link_sta = rcu_dereference_check(sta->link[link_id], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (!link_sta) return NULL; } else { @@ -606,30 +601,29 @@ } if (pairwise && key_idx < NUM_DEFAULT_KEYS) - return rcu_dereference_check_key_mtx(local, + return wiphy_dereference(local->hw.wiphy, sta->ptk[key_idx]); if (!pairwise && key_idx < NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS + NUM_DEFAULT_BEACON_KEYS) - return rcu_dereference_check_key_mtx(local, + return wiphy_dereference(local->hw.wiphy, link_sta->gtk[key_idx]); return NULL; } if (pairwise && key_idx < NUM_DEFAULT_KEYS) - return rcu_dereference_check_key_mtx(local, - sdata->keys[key_idx]); + return wiphy_dereference(local->hw.wiphy, sdata->keys[key_idx]); - key = rcu_dereference_check_key_mtx(local, link->gtk[key_idx]); + key = wiphy_dereference(local->hw.wiphy, link->gtk[key_idx]); if (key) return key; /* or maybe it was a WEP key */ if (key_idx < NUM_DEFAULT_KEYS) - return rcu_dereference_check_key_mtx(local, sdata->keys[key_idx]); + return wiphy_dereference(local->hw.wiphy, sdata->keys[key_idx]); return NULL; } @@ -641,25 +635,16 @@ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = sdata->local; struct ieee80211_key *key; - int ret; - mutex_lock(&local->sta_mtx); - mutex_lock(&local->key_mtx); + lockdep_assert_wiphy(local->hw.wiphy); key = ieee80211_lookup_key(sdata, link_id, key_idx, pairwise, mac_addr); - if (!key) { - ret = -ENOENT; - goto out_unlock; - } + if (!key) + return -ENOENT; ieee80211_key_free(key, sdata->vif.type == NL80211_IFTYPE_STATION); - ret = 0; - out_unlock: - mutex_unlock(&local->key_mtx); - mutex_unlock(&local->sta_mtx); - - return ret; + return 0; } static int ieee80211_get_key(struct wiphy *wiphy, struct net_device *dev, @@ -830,15 +815,11 @@ rinfo->nss = ieee80211_rate_get_vht_nss(rate); } else { struct ieee80211_supported_band *sband; - int shift = ieee80211_vif_get_shift(&sta->sdata->vif); - u16 brate; sband = ieee80211_get_sband(sta->sdata); WARN_ON_ONCE(sband && !sband->bitrates); - if (sband && sband->bitrates) { - brate = sband->bitrates[rate->idx].bitrate; - rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift); - } + if (sband && sband->bitrates) + rinfo->legacy = sband->bitrates[rate->idx].bitrate; } if (rate->flags & IEEE80211_TX_RC_40_MHZ_WIDTH) rinfo->bw = RATE_INFO_BW_40; @@ -860,7 +841,7 @@ struct sta_info *sta; int ret = -ENOENT; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); sta = sta_info_get_by_idx(sdata, idx); if (sta) { @@ -869,8 +850,6 @@ sta_set_sinfo(sta, sinfo, true); } - mutex_unlock(&local->sta_mtx); - return ret; } @@ -890,7 +869,7 @@ struct sta_info *sta; int ret = -ENOENT; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); sta = sta_info_get_bss(sdata, mac); if (sta) { @@ -898,8 +877,6 @@ sta_set_sinfo(sta, sinfo, true); } - mutex_unlock(&local->sta_mtx); - return ret; } @@ -910,10 +887,11 @@ struct ieee80211_sub_if_data *sdata; int ret = 0; + lockdep_assert_wiphy(local->hw.wiphy); + if (cfg80211_chandef_identical(&local->monitor_chandef, chandef)) return 0; - mutex_lock(&local->mtx); if (local->use_chanctx) { sdata = wiphy_dereference(local->hw.wiphy, local->monitor_sdata); @@ -923,14 +901,15 @@ chandef, IEEE80211_CHANCTX_EXCLUSIVE); } - } else if (local->open_count == local->monitors) { + } else { + if (local->open_count == local->monitors) { local->_oper_chandef = *chandef; ieee80211_hw_config(local, 0); } + } if (ret == 0) local->monitor_chandef = *chandef; - mutex_unlock(&local->mtx); return ret; } @@ -978,25 +957,29 @@ struct fils_discovery_data *new, *old = NULL; struct ieee80211_fils_discovery *fd; - if (!params->tmpl || !params->tmpl_len) - return -EINVAL; + if (!params->update) + return 0; fd = &link_conf->fils_discovery; fd->min_interval = params->min_interval; fd->max_interval = params->max_interval; old = sdata_dereference(link->u.ap.fils_discovery, sdata); + if (old) + kfree_rcu(old, rcu_head); + + if (params->tmpl && params->tmpl_len) { new = kzalloc(sizeof(*new) + params->tmpl_len, GFP_KERNEL); if (!new) return -ENOMEM; new->len = params->tmpl_len; memcpy(new->data, params->tmpl, params->tmpl_len); rcu_assign_pointer(link->u.ap.fils_discovery, new); + } else { + RCU_INIT_POINTER(link->u.ap.fils_discovery, NULL); + } - if (old) - kfree_rcu(old, rcu_head); - - return 0; + return BSS_CHANGED_FILS_DISCOVERY; } static int @@ -1007,23 +990,27 @@ { struct unsol_bcast_probe_resp_data *new, *old = NULL; - if (!params->tmpl || !params->tmpl_len) - return -EINVAL; + if (!params->update) + return 0; + + link_conf->unsol_bcast_probe_resp_interval = params->interval; old = sdata_dereference(link->u.ap.unsol_bcast_probe_resp, sdata); + if (old) + kfree_rcu(old, rcu_head); + + if (params->tmpl && params->tmpl_len) { new = kzalloc(sizeof(*new) + params->tmpl_len, GFP_KERNEL); if (!new) return -ENOMEM; new->len = params->tmpl_len; memcpy(new->data, params->tmpl, params->tmpl_len); rcu_assign_pointer(link->u.ap.unsol_bcast_probe_resp, new); + } else { + RCU_INIT_POINTER(link->u.ap.unsol_bcast_probe_resp, NULL); + } - if (old) - kfree_rcu(old, rcu_head); - - link_conf->unsol_bcast_probe_resp_interval = params->interval; - - return 0; + return BSS_CHANGED_UNSOL_BCAST_PROBE_RESP; } static int ieee80211_set_ftm_responder_params( @@ -1101,18 +1088,20 @@ return offset; } -static int ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, +static int +ieee80211_assign_beacon(struct ieee80211_sub_if_data *sdata, struct ieee80211_link_data *link, struct cfg80211_beacon_data *params, const struct ieee80211_csa_settings *csa, - const struct ieee80211_color_change_settings *cca) + const struct ieee80211_color_change_settings *cca, + u64 *changed) { struct cfg80211_mbssid_elems *mbssid = NULL; struct cfg80211_rnr_elems *rnr = NULL; struct beacon_data *new, *old; int new_head_len, new_tail_len; int size, err; - u32 changed = BSS_CHANGED_BEACON; + u64 _changed = BSS_CHANGED_BEACON; struct ieee80211_bss_conf *link_conf = link->conf; old = sdata_dereference(link->u.ap.beacon, sdata); @@ -1219,7 +1208,7 @@ return err; } if (err == 0) - changed |= BSS_CHANGED_AP_PROBE_RESP; + _changed |= BSS_CHANGED_AP_PROBE_RESP; if (params->ftm_responder != -1) { link_conf->ftm_responder = params->ftm_responder; @@ -1235,7 +1224,7 @@ return err; } - changed |= BSS_CHANGED_FTM_RESPONDER; + _changed |= BSS_CHANGED_FTM_RESPONDER; } rcu_assign_pointer(link->u.ap.beacon, new); @@ -1244,7 +1233,8 @@ if (old) kfree_rcu(old, rcu_head); - return changed; + *changed |= _changed; + return 0; } static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev, @@ -1266,6 +1256,8 @@ struct ieee80211_link_data *link; struct ieee80211_bss_conf *link_conf; + lockdep_assert_wiphy(local->hw.wiphy); + link = sdata_dereference(sdata->link[link_id], sdata); if (!link) return -ENOLINK; @@ -1360,10 +1352,14 @@ (IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_80MHZ | IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_160MHZ | IEEE80211_EHT_PHY_CAP7_MU_BEAMFORMER_320MHZ); + link_conf->eht_80mhz_full_bw_ul_mumimo = + params->eht_cap->fixed.phy_cap_info[7] & + IEEE80211_EHT_PHY_CAP7_NON_OFDMA_UL_MU_MIMO_80MHZ; } else { link_conf->eht_su_beamformer = false; link_conf->eht_su_beamformee = false; link_conf->eht_mu_beamformer = false; + link_conf->eht_80mhz_full_bw_ul_mumimo = false; } if (sdata->vif.type == NL80211_IFTYPE_AP && @@ -1375,12 +1371,10 @@ return err; } - mutex_lock(&local->mtx); err = ieee80211_link_use_channel(link, ¶ms->chandef, IEEE80211_CHANCTX_SHARED); if (!err) ieee80211_link_copy_chanctx_to_vlans(link, false); - mutex_unlock(&local->mtx); if (err) { link_conf->beacon_int = prev_beacon_int; return err; @@ -1446,28 +1440,23 @@ if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL)) link_conf->beacon_tx_rate = params->beacon_rate; - err = ieee80211_assign_beacon(sdata, link, ¶ms->beacon, NULL, NULL); + err = ieee80211_assign_beacon(sdata, link, ¶ms->beacon, NULL, NULL, + &changed); if (err < 0) goto error; - changed |= err; - if (params->fils_discovery.max_interval) { - err = ieee80211_set_fils_discovery(sdata, - ¶ms->fils_discovery, + err = ieee80211_set_fils_discovery(sdata, ¶ms->fils_discovery, link, link_conf); if (err < 0) goto error; - changed |= BSS_CHANGED_FILS_DISCOVERY; - } + changed |= err; - if (params->unsol_bcast_probe_resp.interval) { err = ieee80211_set_unsol_bcast_probe_resp(sdata, ¶ms->unsol_bcast_probe_resp, link, link_conf); if (err < 0) goto error; - changed |= BSS_CHANGED_UNSOL_BCAST_PROBE_RESP; - } + changed |= err; err = drv_start_ap(sdata->local, sdata, link_conf); if (err) { @@ -1491,25 +1480,26 @@ return 0; error: - mutex_lock(&local->mtx); ieee80211_link_release_channel(link); - mutex_unlock(&local->mtx); return err; } static int ieee80211_change_beacon(struct wiphy *wiphy, struct net_device *dev, - struct cfg80211_beacon_data *params) + struct cfg80211_ap_update *params) + { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_link_data *link; + struct cfg80211_beacon_data *beacon = ¶ms->beacon; struct beacon_data *old; int err; struct ieee80211_bss_conf *link_conf; + u64 changed = 0; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(wiphy); - link = sdata_dereference(sdata->link[params->link_id], sdata); + link = sdata_dereference(sdata->link[beacon->link_id], sdata); if (!link) return -ENOLINK; @@ -1525,17 +1515,31 @@ if (!old) return -ENOENT; - err = ieee80211_assign_beacon(sdata, link, params, NULL, NULL); + err = ieee80211_assign_beacon(sdata, link, beacon, NULL, NULL, + &changed); if (err < 0) return err; - if (params->he_bss_color_valid && - params->he_bss_color.enabled != link_conf->he_bss_color.enabled) { - link_conf->he_bss_color.enabled = params->he_bss_color.enabled; - err |= BSS_CHANGED_HE_BSS_COLOR; + err = ieee80211_set_fils_discovery(sdata, ¶ms->fils_discovery, + link, link_conf); + if (err < 0) + return err; + changed |= err; + + err = ieee80211_set_unsol_bcast_probe_resp(sdata, + ¶ms->unsol_bcast_probe_resp, + link, link_conf); + if (err < 0) + return err; + changed |= err; + + if (beacon->he_bss_color_valid && + beacon->he_bss_color.enabled != link_conf->he_bss_color.enabled) { + link_conf->he_bss_color.enabled = beacon->he_bss_color.enabled; + changed |= BSS_CHANGED_HE_BSS_COLOR; } - ieee80211_link_info_change_notify(sdata, link, err); + ieee80211_link_info_change_notify(sdata, link, changed); return 0; } @@ -1565,7 +1569,7 @@ sdata_dereference(sdata->link[link_id], sdata); struct ieee80211_bss_conf *link_conf = link->conf; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); old_beacon = sdata_dereference(link->u.ap.beacon, sdata); if (!old_beacon) @@ -1579,7 +1583,6 @@ sdata); /* abort any running channel switch or color change */ - mutex_lock(&local->mtx); link_conf->csa_active = false; link_conf->color_change_active = false; if (link->csa_block_tx) { @@ -1588,8 +1591,6 @@ link->csa_block_tx = false; } - mutex_unlock(&local->mtx); - ieee80211_free_next_beacon(link); /* turn off carrier for this interface and dependent VLANs */ @@ -1632,7 +1633,7 @@ if (sdata->wdev.cac_started) { chandef = link_conf->chandef; - cancel_delayed_work_sync(&link->dfs_cac_timer_work); + wiphy_delayed_work_cancel(wiphy, &link->dfs_cac_timer_work); cfg80211_cac_event(sdata->dev, &chandef, NL80211_RADAR_CAC_ABORTED, GFP_KERNEL); @@ -1644,10 +1645,8 @@ local->total_ps_buffered -= skb_queue_len(&sdata->u.ap.ps.bc_buf); ieee80211_purge_tx_queue(&local->hw, &sdata->u.ap.ps.bc_buf); - mutex_lock(&local->mtx); ieee80211_link_copy_chanctx_to_vlans(link, true); ieee80211_link_release_channel(link); - mutex_unlock(&local->mtx); return 0; } @@ -1718,7 +1717,7 @@ { #ifdef CONFIG_MAC80211_MESH struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed = 0; + u64 changed = 0; if (params->sta_modify_mask & STATION_PARAM_APPLY_PLINK_STATE) { switch (params->plink_state) { @@ -1789,7 +1788,7 @@ sdata_dereference(sdata->link[link_id], sdata); struct link_sta_info *link_sta = rcu_dereference_protected(sta->link[link_id], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); /* * If there are no changes, then accept a link that doesn't exist, @@ -1800,7 +1799,8 @@ !params->supported_rates_len && !params->ht_capa && !params->vht_capa && !params->he_capa && !params->eht_capa && - !params->opmode_notif_used) + !params->opmode_notif_used && + !params->tp_overridden) return 0; if (!link || !link_sta) @@ -1846,7 +1846,8 @@ /* VHT can override some HT caps such as the A-MSDU max length */ if (params->vht_capa) ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband, - params->vht_capa, link_sta); + params->vht_capa, NULL, + link_sta); if (params->he_capa) ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband, @@ -1872,6 +1873,10 @@ sband->band); } + if (params->tp_overridden) + link_sta->pub->tp_override = params->tp_override; + + return ret; } @@ -2023,6 +2028,8 @@ struct ieee80211_sub_if_data *sdata; int err; + lockdep_assert_wiphy(local->hw.wiphy); + if (params->vlan) { sdata = IEEE80211_DEV_TO_SUB_IF(params->vlan); @@ -2066,9 +2073,7 @@ * visible yet), sta_apply_parameters (and inner functions) require * the mutex due to other paths. */ - mutex_lock(&local->sta_mtx); err = sta_apply_parameters(local, sta, params); - mutex_unlock(&local->sta_mtx); if (err) { sta_info_free(local, sta); return err; @@ -2111,13 +2116,11 @@ enum cfg80211_station_type statype; int err; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); sta = sta_info_get_bss(sdata, mac); - if (!sta) { - err = -ENOENT; - goto out_err; - } + if (!sta) + return -ENOENT; switch (sdata->vif.type) { case NL80211_IFTYPE_MESH_POINT: @@ -2147,22 +2150,19 @@ statype = CFG80211_STA_AP_CLIENT_UNASSOC; break; default: - err = -EOPNOTSUPP; - goto out_err; + return -EOPNOTSUPP; } err = cfg80211_check_station_change(wiphy, params, statype); if (err) - goto out_err; + return err; if (params->vlan && params->vlan != sta->sdata->dev) { vlansdata = IEEE80211_DEV_TO_SUB_IF(params->vlan); if (params->vlan->ieee80211_ptr->use_4addr) { - if (vlansdata->u.vlan.sta) { - err = -EBUSY; - goto out_err; - } + if (vlansdata->u.vlan.sta) + return -EBUSY; rcu_assign_pointer(vlansdata->u.vlan.sta, sta); __ieee80211_check_fast_rx_iface(vlansdata); @@ -2188,18 +2188,9 @@ } } - /* we use sta_info_get_bss() so this might be different */ - if (sdata != sta->sdata) { - mutex_lock_nested(&sta->sdata->wdev.mtx, 1); - err = sta_apply_parameters(local, sta, params); - mutex_unlock(&sta->sdata->wdev.mtx); - } else { err = sta_apply_parameters(local, sta, params); - } if (err) - goto out_err; - - mutex_unlock(&local->sta_mtx); + return err; if (sdata->vif.type == NL80211_IFTYPE_STATION && params->sta_flags_mask & BIT(NL80211_STA_FLAG_AUTHORIZED)) { @@ -2208,9 +2199,6 @@ } return 0; -out_err: - mutex_unlock(&local->sta_mtx); - return err; } #ifdef CONFIG_MAC80211_MESH @@ -2623,6 +2611,8 @@ struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; int err; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + memcpy(&ifmsh->mshcfg, conf, sizeof(struct mesh_config)); err = copy_mesh_setup(ifmsh, setup); if (err) @@ -2634,12 +2624,12 @@ sdata->deflink.smps_mode = IEEE80211_SMPS_OFF; sdata->deflink.needed_rx_chains = sdata->local->rx_chains; - mutex_lock(&sdata->local->mtx); err = ieee80211_link_use_channel(&sdata->deflink, &setup->chandef, IEEE80211_CHANCTX_SHARED); - mutex_unlock(&sdata->local->mtx); - if (err) + if (err) { + kfree(ifmsh->ie); return err; + } return ieee80211_start_mesh(sdata); } @@ -2648,11 +2638,11 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + ieee80211_stop_mesh(sdata); - mutex_lock(&sdata->local->mtx); ieee80211_link_release_channel(&sdata->deflink); kfree(sdata->u.mesh.ie); - mutex_unlock(&sdata->local->mtx); return 0; } @@ -2665,7 +2655,7 @@ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_link_data *link; struct ieee80211_supported_band *sband; - u32 changed = 0; + u64 changed = 0; link = ieee80211_link_or_deflink(sdata, params->link_id, true); if (IS_ERR(link)) @@ -3010,6 +3000,8 @@ bool update_txp_type = false; bool has_monitor = false; + lockdep_assert_wiphy(local->hw.wiphy); + if (wdev) { sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); @@ -3057,7 +3049,6 @@ break; } - mutex_lock(&local->iflist_mtx); list_for_each_entry(sdata, &local->interfaces, list) { if (sdata->vif.type == NL80211_IFTYPE_MONITOR) { has_monitor = true; @@ -3073,7 +3064,6 @@ continue; ieee80211_recalc_txpower(sdata, update_txp_type); } - mutex_unlock(&local->iflist_mtx); if (has_monitor) { sdata = wiphy_dereference(local->hw.wiphy, @@ -3106,6 +3096,10 @@ else *dbm = sdata->vif.bss_conf.txpower; + /* INT_MIN indicates no power level was set yet */ + if (*dbm == INT_MIN) + return -EINVAL; + return 0; } @@ -3162,14 +3156,24 @@ struct sta_info *sta; bool tdls_peer_found = false; - lockdep_assert_held(&sdata->wdev.mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION)) return -EINVAL; + if (ieee80211_vif_is_mld(&sdata->vif) && + !(sdata->vif.active_links & BIT(link->link_id))) + return 0; + old_req = link->u.mgd.req_smps; link->u.mgd.req_smps = smps_mode; + /* The driver indicated that EML is enabled for the interface, which + * implies that SMPS flows towards the AP should be stopped. + */ + if (sdata->vif.driver_flags & IEEE80211_VIF_EML_ACTIVE) + return 0; + if (old_req == smps_mode && smps_mode != IEEE80211_SMPS_AUTOMATIC) return 0; @@ -3183,7 +3187,7 @@ link->conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT) return 0; - ap = link->u.mgd.bssid; + ap = sdata->vif.cfg.ap_addr; rcu_read_lock(); list_for_each_entry_rcu(sta, &sdata->local->sta_list, list) { @@ -3205,7 +3209,9 @@ /* send SM PS frame to AP */ err = ieee80211_send_smps_action(sdata, smps_mode, - ap, ap); + ap, ap, + ieee80211_vif_is_mld(&sdata->vif) ? + link->link_id : -1); if (err) link->u.mgd.req_smps = old_req; else if (smps_mode != IEEE80211_SMPS_OFF && tdls_peer_found) @@ -3235,7 +3241,6 @@ local->dynamic_ps_forced_timeout = timeout; /* no change, but if automatic follow powersave */ - sdata_lock(sdata); for (link_id = 0; link_id < ARRAY_SIZE(sdata->link); link_id++) { struct ieee80211_link_data *link; @@ -3246,7 +3251,6 @@ __ieee80211_request_smps_mgd(sdata, link, link->u.mgd.req_smps); } - sdata_unlock(sdata); if (ieee80211_hw_check(&local->hw, SUPPORTS_DYNAMIC_PS)) ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); @@ -3392,7 +3396,8 @@ struct ieee80211_local *local = sdata->local; int err; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); + if (!list_empty(&local->roc_list) || local->scanning) { err = -EBUSY; goto out_unlock; @@ -3407,12 +3412,10 @@ if (err) goto out_unlock; - ieee80211_queue_delayed_work(&sdata->local->hw, - &sdata->deflink.dfs_cac_timer_work, + wiphy_delayed_work_queue(wiphy, &sdata->deflink.dfs_cac_timer_work, msecs_to_jiffies(cac_time_ms)); out_unlock: - mutex_unlock(&local->mtx); return err; } @@ -3422,20 +3425,21 @@ struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = sdata->local; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); + list_for_each_entry(sdata, &local->interfaces, list) { /* it might be waiting for the local->mtx, but then * by the time it gets it, sdata->wdev.cac_started * will no longer be true */ - cancel_delayed_work(&sdata->deflink.dfs_cac_timer_work); + wiphy_delayed_work_cancel(wiphy, + &sdata->deflink.dfs_cac_timer_work); if (sdata->wdev.cac_started) { ieee80211_link_release_channel(&sdata->deflink); sdata->wdev.cac_started = false; } } - mutex_unlock(&local->mtx); } static struct cfg80211_beacon_data * @@ -3567,11 +3571,11 @@ if (iter == sdata || iter->vif.mbssid_tx_vif != vif) continue; - ieee80211_queue_work(&iter->local->hw, + wiphy_work_queue(iter->local->hw.wiphy, &iter->deflink.csa_finalize_work); } } - ieee80211_queue_work(&local->hw, &sdata->deflink.csa_finalize_work); + wiphy_work_queue(local->hw.wiphy, &sdata->deflink.csa_finalize_work); rcu_read_unlock(); } @@ -3585,7 +3589,7 @@ sdata->deflink.csa_block_tx = block_tx; sdata_info(sdata, "channel switch failed, disconnecting\n"); - ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work); + wiphy_work_queue(local->hw.wiphy, &ifmgd->csa_connection_drop_work); } EXPORT_SYMBOL(ieee80211_channel_switch_disconnect); @@ -3601,25 +3605,22 @@ err = ieee80211_assign_beacon(sdata, &sdata->deflink, sdata->deflink.u.ap.next_beacon, - NULL, NULL); + NULL, NULL, changed); ieee80211_free_next_beacon(&sdata->deflink); if (err < 0) return err; - *changed |= err; break; case NL80211_IFTYPE_ADHOC: - err = ieee80211_ibss_finish_csa(sdata); + err = ieee80211_ibss_finish_csa(sdata, changed); if (err < 0) return err; - *changed |= err; break; #ifdef CONFIG_MAC80211_MESH case NL80211_IFTYPE_MESH_POINT: - err = ieee80211_mesh_finish_csa(sdata); + err = ieee80211_mesh_finish_csa(sdata, changed); if (err < 0) return err; - *changed |= err; break; #endif default: @@ -3630,21 +3631,14 @@ return 0; } -static int __ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) +static int __ieee80211_csa_finalize(struct ieee80211_link_data *link_data) { + struct ieee80211_sub_if_data *sdata = link_data->sdata; struct ieee80211_local *local = sdata->local; u64 changed = 0; int err; - sdata_assert_lock(sdata); - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); - - if (sdata->vif.bss_conf.eht_puncturing != sdata->vif.bss_conf.csa_punct_bitmap) { - sdata->vif.bss_conf.eht_puncturing = - sdata->vif.bss_conf.csa_punct_bitmap; - changed |= BSS_CHANGED_EHT_PUNCTURING; - } + lockdep_assert_wiphy(local->hw.wiphy); /* * using reservation isn't immediate as it may be deferred until later @@ -3653,20 +3647,20 @@ * completed successfully */ - if (sdata->deflink.reserved_chanctx) { + if (link_data->reserved_chanctx) { /* * with multi-vif csa driver may call ieee80211_csa_finish() * many times while waiting for other interfaces to use their * reservations */ - if (sdata->deflink.reserved_ready) + if (link_data->reserved_ready) return 0; return ieee80211_link_use_reserved_context(&sdata->deflink); } - if (!cfg80211_chandef_identical(&sdata->vif.bss_conf.chandef, - &sdata->deflink.csa_chandef)) + if (!cfg80211_chandef_identical(&link_data->conf->chandef, + &link_data->csa_chandef)) return -EINVAL; sdata->vif.bss_conf.csa_active = false; @@ -3675,62 +3669,64 @@ if (err) return err; - ieee80211_link_info_change_notify(sdata, &sdata->deflink, changed); + if (sdata->vif.bss_conf.eht_puncturing != sdata->vif.bss_conf.csa_punct_bitmap) { + sdata->vif.bss_conf.eht_puncturing = + sdata->vif.bss_conf.csa_punct_bitmap; + changed |= BSS_CHANGED_EHT_PUNCTURING; + } + + ieee80211_link_info_change_notify(sdata, link_data, changed); - if (sdata->deflink.csa_block_tx) { + if (link_data->csa_block_tx) { ieee80211_wake_vif_queues(local, sdata, IEEE80211_QUEUE_STOP_REASON_CSA); - sdata->deflink.csa_block_tx = false; + link_data->csa_block_tx = false; } - err = drv_post_channel_switch(sdata); + err = drv_post_channel_switch(link_data); if (err) return err; - cfg80211_ch_switch_notify(sdata->dev, &sdata->deflink.csa_chandef, 0, - sdata->vif.bss_conf.eht_puncturing); + cfg80211_ch_switch_notify(sdata->dev, &link_data->csa_chandef, + link_data->link_id, + link_data->conf->eht_puncturing); return 0; } -static void ieee80211_csa_finalize(struct ieee80211_sub_if_data *sdata) +static void ieee80211_csa_finalize(struct ieee80211_link_data *link_data) { - if (__ieee80211_csa_finalize(sdata)) { + struct ieee80211_sub_if_data *sdata = link_data->sdata; + + if (__ieee80211_csa_finalize(link_data)) { sdata_info(sdata, "failed to finalize CSA, disconnecting\n"); cfg80211_stop_iface(sdata->local->hw.wiphy, &sdata->wdev, GFP_KERNEL); } } -void ieee80211_csa_finalize_work(struct work_struct *work) +void ieee80211_csa_finalize_work(struct wiphy *wiphy, struct wiphy_work *work) { - struct ieee80211_sub_if_data *sdata = - container_of(work, struct ieee80211_sub_if_data, - deflink.csa_finalize_work); + struct ieee80211_link_data *link = + container_of(work, struct ieee80211_link_data, csa_finalize_work); + struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; - sdata_lock(sdata); - mutex_lock(&local->mtx); - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* AP might have been stopped while waiting for the lock. */ - if (!sdata->vif.bss_conf.csa_active) - goto unlock; + if (!link->conf->csa_active) + return; if (!ieee80211_sdata_running(sdata)) - goto unlock; - - ieee80211_csa_finalize(sdata); + return; -unlock: - mutex_unlock(&local->chanctx_mtx); - mutex_unlock(&local->mtx); - sdata_unlock(sdata); + ieee80211_csa_finalize(link); } static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata, struct cfg80211_csa_settings *params, - u32 *changed) + u64 *changed) { struct ieee80211_csa_settings csa = {}; int err; @@ -3777,12 +3773,11 @@ err = ieee80211_assign_beacon(sdata, &sdata->deflink, ¶ms->beacon_csa, &csa, - NULL); + NULL, changed); if (err < 0) { ieee80211_free_next_beacon(&sdata->deflink); return err; } - *changed |= err; break; case NL80211_IFTYPE_ADHOC: @@ -3814,10 +3809,9 @@ /* see comments in the NL80211_IFTYPE_AP block */ if (params->count > 1) { - err = ieee80211_ibss_csa_beacon(sdata, params); + err = ieee80211_ibss_csa_beacon(sdata, params, changed); if (err < 0) return err; - *changed |= err; } ieee80211_send_action_csa(sdata, params); @@ -3842,12 +3836,11 @@ /* see comments in the NL80211_IFTYPE_AP block */ if (params->count > 1) { - err = ieee80211_mesh_csa_beacon(sdata, params); + err = ieee80211_mesh_csa_beacon(sdata, params, changed); if (err < 0) { ifmsh->csa_role = IEEE80211_MESH_CSA_ROLE_NONE; return err; } - *changed |= err; } if (ifmsh->csa_role == IEEE80211_MESH_CSA_ROLE_INIT) @@ -3881,11 +3874,10 @@ struct ieee80211_channel_switch ch_switch; struct ieee80211_chanctx_conf *conf; struct ieee80211_chanctx *chanctx; - u32 changed = 0; + u64 changed = 0; int err; - sdata_assert_lock(sdata); - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (!list_empty(&local->roc_list) || local->scanning) return -EBUSY; @@ -3901,9 +3893,8 @@ if (sdata->vif.bss_conf.csa_active) return -EBUSY; - mutex_lock(&local->chanctx_mtx); conf = rcu_dereference_protected(sdata->vif.bss_conf.chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (!conf) { err = -EBUSY; goto out; @@ -3973,11 +3964,10 @@ drv_channel_switch_beacon(sdata, ¶ms->chandef); } else { /* if the beacon didn't change, we can finalize immediately */ - ieee80211_csa_finalize(sdata); + ieee80211_csa_finalize(&sdata->deflink); } out: - mutex_unlock(&local->chanctx_mtx); return err; } @@ -3986,18 +3976,15 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = sdata->local; - int err; - mutex_lock(&local->mtx); - err = __ieee80211_channel_switch(wiphy, dev, params); - mutex_unlock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); - return err; + return __ieee80211_channel_switch(wiphy, dev, params); } u64 ieee80211_mgmt_tx_cookie(struct ieee80211_local *local) { - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); local->roc_cookie_counter++; @@ -4029,7 +4016,8 @@ return -ENOMEM; } - IEEE80211_SKB_CB(skb)->ack_frame_id = id; + IEEE80211_SKB_CB(skb)->status_data_idr = 1; + IEEE80211_SKB_CB(skb)->status_data = id; *cookie = ieee80211_mgmt_tx_cookie(local); IEEE80211_SKB_CB(ack_skb)->ack.cookie = *cookie; @@ -4079,11 +4067,17 @@ static int ieee80211_set_antenna(struct wiphy *wiphy, u32 tx_ant, u32 rx_ant) { struct ieee80211_local *local = wiphy_priv(wiphy); + int ret; if (local->started) return -EOPNOTSUPP; - return drv_set_antenna(local, tx_ant, rx_ant); + ret = drv_set_antenna(local, tx_ant, rx_ant); + if (ret) + return ret; + + local->rx_chains = hweight8(rx_ant); + return 0; } static int ieee80211_get_antenna(struct wiphy *wiphy, u32 *tx_ant, u32 *rx_ant) @@ -4125,22 +4119,23 @@ int ret; /* the lock is needed to assign the cookie later */ - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); rcu_read_lock(); + sta = sta_info_get_bss(sdata, peer); + if (!sta) { + ret = -ENOLINK; + goto unlock; + } + + qos = sta->sta.wme; + chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); if (WARN_ON(!chanctx_conf)) { ret = -EINVAL; goto unlock; } band = chanctx_conf->def.chan->band; - sta = sta_info_get_bss(sdata, peer); - if (sta) { - qos = sta->sta.wme; - } else { - ret = -ENOLINK; - goto unlock; - } if (qos) { fc = cpu_to_le16(IEEE80211_FTYPE_DATA | @@ -4195,7 +4190,6 @@ ret = 0; unlock: rcu_read_unlock(); - mutex_unlock(&local->mtx); return ret; } @@ -4553,7 +4547,8 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct sta_info *sta; - int ret; + + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (!sdata->local->ops->set_tid_config) return -EOPNOTSUPP; @@ -4561,17 +4556,11 @@ if (!tid_conf->peer) return drv_set_tid_config(sdata->local, sdata, NULL, tid_conf); - mutex_lock(&sdata->local->sta_mtx); sta = sta_info_get_bss(sdata, tid_conf->peer); - if (!sta) { - mutex_unlock(&sdata->local->sta_mtx); + if (!sta) return -ENOENT; - } - - ret = drv_set_tid_config(sdata->local, sdata, &sta->sta, tid_conf); - mutex_unlock(&sdata->local->sta_mtx); - return ret; + return drv_set_tid_config(sdata->local, sdata, &sta->sta, tid_conf); } static int ieee80211_reset_tid_config(struct wiphy *wiphy, @@ -4580,7 +4569,8 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct sta_info *sta; - int ret; + + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (!sdata->local->ops->reset_tid_config) return -EOPNOTSUPP; @@ -4588,17 +4578,11 @@ if (!peer) return drv_reset_tid_config(sdata->local, sdata, NULL, tids); - mutex_lock(&sdata->local->sta_mtx); sta = sta_info_get_bss(sdata, peer); - if (!sta) { - mutex_unlock(&sdata->local->sta_mtx); + if (!sta) return -ENOENT; - } - ret = drv_reset_tid_config(sdata->local, sdata, &sta->sta, tids); - mutex_unlock(&sdata->local->sta_mtx); - - return ret; + return drv_reset_tid_config(sdata->local, sdata, &sta->sta, tids); } static int ieee80211_set_sar_specs(struct wiphy *wiphy, @@ -4614,7 +4598,7 @@ static int ieee80211_set_after_color_change_beacon(struct ieee80211_sub_if_data *sdata, - u32 *changed) + u64 *changed) { switch (sdata->vif.type) { case NL80211_IFTYPE_AP: { @@ -4625,13 +4609,12 @@ ret = ieee80211_assign_beacon(sdata, &sdata->deflink, sdata->deflink.u.ap.next_beacon, - NULL, NULL); + NULL, NULL, changed); ieee80211_free_next_beacon(&sdata->deflink); if (ret < 0) return ret; - *changed |= ret; break; } default: @@ -4645,7 +4628,7 @@ static int ieee80211_set_color_change_beacon(struct ieee80211_sub_if_data *sdata, struct cfg80211_color_change_settings *params, - u32 *changed) + u64 *changed) { struct ieee80211_color_change_settings color_change = {}; int err; @@ -4668,12 +4651,11 @@ err = ieee80211_assign_beacon(sdata, &sdata->deflink, ¶ms->beacon_color_change, - NULL, &color_change); + NULL, &color_change, changed); if (err < 0) { ieee80211_free_next_beacon(&sdata->deflink); return err; } - *changed |= err; break; default: return -EOPNOTSUPP; @@ -4684,8 +4666,10 @@ static void ieee80211_color_change_bss_config_notify(struct ieee80211_sub_if_data *sdata, - u8 color, int enable, u32 changed) + u8 color, int enable, u64 changed) { + lockdep_assert_wiphy(sdata->local->hw.wiphy); + sdata->vif.bss_conf.he_bss_color.color = color; sdata->vif.bss_conf.he_bss_color.enabled = enable; changed |= BSS_CHANGED_HE_BSS_COLOR; @@ -4695,7 +4679,6 @@ if (!sdata->vif.bss_conf.nontransmitted && sdata->vif.mbssid_tx_vif) { struct ieee80211_sub_if_data *child; - mutex_lock(&sdata->local->iflist_mtx); list_for_each_entry(child, &sdata->local->interfaces, list) { if (child != sdata && child->vif.mbssid_tx_vif == &sdata->vif) { child->vif.bss_conf.he_bss_color.color = color; @@ -4705,18 +4688,16 @@ BSS_CHANGED_HE_BSS_COLOR); } } - mutex_unlock(&sdata->local->iflist_mtx); } } static int ieee80211_color_change_finalize(struct ieee80211_sub_if_data *sdata) { struct ieee80211_local *local = sdata->local; - u32 changed = 0; + u64 changed = 0; int err; - sdata_assert_lock(sdata); - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); sdata->vif.bss_conf.color_change_active = false; @@ -4734,28 +4715,24 @@ return 0; } -void ieee80211_color_change_finalize_work(struct work_struct *work) +void ieee80211_color_change_finalize_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, deflink.color_change_finalize_work); struct ieee80211_local *local = sdata->local; - sdata_lock(sdata); - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* AP might have been stopped while waiting for the lock. */ if (!sdata->vif.bss_conf.color_change_active) - goto unlock; + return; if (!ieee80211_sdata_running(sdata)) - goto unlock; + return; ieee80211_color_change_finalize(sdata); - -unlock: - mutex_unlock(&local->mtx); - sdata_unlock(sdata); } void ieee80211_color_collision_detection_work(struct work_struct *work) @@ -4766,16 +4743,14 @@ color_collision_detect_work); struct ieee80211_sub_if_data *sdata = link->sdata; - sdata_lock(sdata); cfg80211_obss_color_collision_notify(sdata->dev, link->color_bitmap); - sdata_unlock(sdata); } void ieee80211_color_change_finish(struct ieee80211_vif *vif) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->deflink.color_change_finalize_work); } EXPORT_SYMBOL_GPL(ieee80211_color_change_finish); @@ -4809,16 +4784,14 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = sdata->local; - u32 changed = 0; + u64 changed = 0; int err; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); if (sdata->vif.bss_conf.nontransmitted) return -EINVAL; - mutex_lock(&local->mtx); - /* don't allow another color change if one is already active or if csa * is active */ @@ -4843,7 +4816,6 @@ ieee80211_color_change_finalize(sdata); out: - mutex_unlock(&local->mtx); return err; } @@ -4865,16 +4837,13 @@ unsigned int link_id) { struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); - int res; + + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (wdev->use_4addr) return -EOPNOTSUPP; - mutex_lock(&sdata->local->mtx); - res = ieee80211_vif_set_links(sdata, wdev->valid_links); - mutex_unlock(&sdata->local->mtx); - - return res; + return ieee80211_vif_set_links(sdata, wdev->valid_links, 0); } static void ieee80211_del_intf_link(struct wiphy *wiphy, @@ -4883,9 +4852,9 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); - mutex_lock(&sdata->local->mtx); - ieee80211_vif_set_links(sdata, wdev->valid_links); - mutex_unlock(&sdata->local->mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + ieee80211_vif_set_links(sdata, wdev->valid_links, 0); } static int sta_add_link_station(struct ieee80211_local *local, @@ -4925,13 +4894,10 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = wiphy_priv(wiphy); - int ret; - mutex_lock(&sdata->local->sta_mtx); - ret = sta_add_link_station(local, sdata, params); - mutex_unlock(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); - return ret; + return sta_add_link_station(local, sdata, params); } static int sta_mod_link_station(struct ieee80211_local *local, @@ -4956,13 +4922,10 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = wiphy_priv(wiphy); - int ret; - mutex_lock(&sdata->local->sta_mtx); - ret = sta_mod_link_station(local, sdata, params); - mutex_unlock(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); - return ret; + return sta_mod_link_station(local, sdata, params); } static int sta_del_link_station(struct ieee80211_sub_if_data *sdata, @@ -4991,13 +4954,10 @@ struct link_station_del_parameters *params) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); - int ret; - mutex_lock(&sdata->local->sta_mtx); - ret = sta_del_link_station(sdata, params); - mutex_unlock(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); - return ret; + return sta_del_link_station(sdata, params); } static int ieee80211_set_hw_timestamp(struct wiphy *wiphy, @@ -5053,6 +5013,7 @@ .join_ocb = ieee80211_join_ocb, .leave_ocb = ieee80211_leave_ocb, .change_bss = ieee80211_change_bss, + .inform_bss = ieee80211_inform_bss, .set_txq_params = ieee80211_set_txq_params, .set_monitor_channel = ieee80211_set_monitor_channel, .suspend = ieee80211_suspend, diff -ruw linux-6.4/net/mac80211/chan.c linux-6.4-fbx/net/mac80211/chan.c --- linux-6.4/net/mac80211/chan.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/chan.c 2024-04-22 13:40:53.011943171 +0200 @@ -18,7 +18,7 @@ struct ieee80211_link_data *link; int num = 0; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(link, &ctx->assigned_links, assigned_chanctx_list) num++; @@ -32,7 +32,7 @@ struct ieee80211_link_data *link; int num = 0; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(link, &ctx->reserved_links, reserved_chanctx_list) num++; @@ -52,7 +52,7 @@ struct ieee80211_chanctx *ctx; int num = 0; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(ctx, &local->chanctx_list, list) num++; @@ -62,7 +62,8 @@ static bool ieee80211_can_create_new_chanctx(struct ieee80211_local *local) { - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + return ieee80211_num_chanctx(local) < ieee80211_max_num_channels(local); } @@ -73,7 +74,7 @@ struct ieee80211_chanctx_conf *conf; conf = rcu_dereference_protected(link->conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (!conf) return NULL; @@ -87,7 +88,7 @@ { struct ieee80211_link_data *link; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(link, &ctx->reserved_links, reserved_chanctx_list) { @@ -110,7 +111,7 @@ { struct ieee80211_link_data *link; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(link, &ctx->assigned_links, assigned_chanctx_list) { @@ -136,7 +137,7 @@ struct ieee80211_chanctx *ctx, const struct cfg80211_chan_def *compat) { - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); compat = ieee80211_chanctx_reserved_chandef(local, ctx, compat); if (!compat) @@ -154,7 +155,7 @@ struct ieee80211_chanctx *ctx, const struct cfg80211_chan_def *def) { - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (ieee80211_chanctx_combined_chandef(local, ctx, def)) return true; @@ -173,7 +174,7 @@ { struct ieee80211_chanctx *ctx; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (mode == IEEE80211_CHANCTX_EXCLUSIVE) return NULL; @@ -361,7 +362,7 @@ enum nl80211_chan_width max_bw; struct cfg80211_chan_def min_def; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* don't optimize non-20MHz based and radar_enabled confs */ if (ctx->conf.def.width == NL80211_CHAN_WIDTH_5 || @@ -537,7 +538,7 @@ { struct ieee80211_chanctx *ctx; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (mode == IEEE80211_CHANCTX_EXCLUSIVE) return NULL; @@ -572,7 +573,7 @@ { struct ieee80211_sub_if_data *sdata; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { @@ -602,8 +603,7 @@ struct ieee80211_sub_if_data *sdata; bool required = false; - lockdep_assert_held(&local->chanctx_mtx); - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { @@ -641,7 +641,7 @@ { struct ieee80211_chanctx *ctx; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); ctx = kzalloc(sizeof(*ctx) + local->hw.chanctx_data_size, GFP_KERNEL); if (!ctx) @@ -665,8 +665,7 @@ u32 changed; int err; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (!local->use_chanctx) local->hw.conf.radar_enabled = ctx->conf.radar_enabled; @@ -698,8 +697,7 @@ struct ieee80211_chanctx *ctx; int err; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); ctx = ieee80211_alloc_chanctx(local, chandef, mode); if (!ctx) @@ -718,7 +716,7 @@ static void ieee80211_del_chanctx(struct ieee80211_local *local, struct ieee80211_chanctx *ctx) { - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (!local->use_chanctx) { struct cfg80211_chan_def *chandef = &local->_oper_chandef; @@ -753,7 +751,7 @@ static void ieee80211_free_chanctx(struct ieee80211_local *local, struct ieee80211_chanctx *ctx) { - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); WARN_ON_ONCE(ieee80211_chanctx_refcount(local, ctx) != 0); @@ -770,7 +768,7 @@ const struct cfg80211_chan_def *compat = NULL; struct sta_info *sta; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); rcu_read_lock(); list_for_each_entry_rcu(sdata, &local->interfaces, list) { @@ -802,6 +800,11 @@ } } + if (WARN_ON_ONCE(!compat)) { + rcu_read_unlock(); + return; + } + /* TDLS peers can sometimes affect the chandef width */ list_for_each_entry_rcu(sta, &local->sta_list, list) { if (!sta->uploaded || @@ -828,9 +831,7 @@ { bool radar_enabled; - lockdep_assert_held(&local->chanctx_mtx); - /* for ieee80211_is_radar_required */ - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); radar_enabled = ieee80211_chanctx_radar_required(local, chanctx); @@ -860,7 +861,7 @@ return -ENOTSUPP; conf = rcu_dereference_protected(link->conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (conf) { curr_ctx = container_of(conf, struct ieee80211_chanctx, conf); @@ -915,7 +916,7 @@ struct ieee80211_sub_if_data *sdata; u8 rx_chains_static, rx_chains_dynamic; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); rx_chains_static = 1; rx_chains_dynamic = 1; @@ -1018,7 +1019,7 @@ if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_AP)) return; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* Check that conf exists, even when clearing this function * must be called with the AP's channel context still there @@ -1027,7 +1028,7 @@ * to a channel context that has already been freed. */ conf = rcu_dereference_protected(link_conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); WARN_ON(!conf); if (clear) @@ -1051,11 +1052,9 @@ { struct ieee80211_local *local = link->sdata->local; - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); __ieee80211_link_copy_chanctx_to_vlans(link, clear); - - mutex_unlock(&local->chanctx_mtx); } int ieee80211_link_unreserve_chanctx(struct ieee80211_link_data *link) @@ -1063,7 +1062,7 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_chanctx *ctx = link->reserved_chanctx; - lockdep_assert_held(&sdata->local->chanctx_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (WARN_ON(!ctx)) return -EINVAL; @@ -1103,7 +1102,7 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_chanctx *new_ctx, *curr_ctx, *ctx; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); curr_ctx = ieee80211_link_get_chanctx(link); if (curr_ctx && local->use_chanctx && !local->ops->switch_vif_chanctx) @@ -1201,12 +1200,12 @@ case NL80211_IFTYPE_AP: case NL80211_IFTYPE_MESH_POINT: case NL80211_IFTYPE_OCB: - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &link->csa_finalize_work); break; case NL80211_IFTYPE_STATION: - ieee80211_queue_work(&sdata->local->hw, - &link->u.mgd.chswitch_work); + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &link->u.mgd.chswitch_work, 0); break; case NL80211_IFTYPE_UNSPECIFIED: case NL80211_IFTYPE_AP_VLAN: @@ -1257,11 +1256,10 @@ struct ieee80211_vif_chanctx_switch vif_chsw[1] = {}; struct ieee80211_chanctx *old_ctx, *new_ctx; const struct cfg80211_chan_def *chandef; - u32 changed = 0; + u64 changed = 0; int err; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); new_ctx = link->reserved_chanctx; old_ctx = ieee80211_link_get_chanctx(link); @@ -1385,7 +1383,7 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_chanctx *old_ctx, *new_ctx; - lockdep_assert_held(&sdata->local->chanctx_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); new_ctx = link->reserved_chanctx; old_ctx = ieee80211_link_get_chanctx(link); @@ -1410,8 +1408,7 @@ { const struct cfg80211_chan_def *chandef; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); chandef = ieee80211_chanctx_reserved_chandef(local, new_ctx, NULL); if (WARN_ON(!chandef)) @@ -1432,8 +1429,7 @@ struct ieee80211_chanctx *ctx, *old_ctx; int i, err; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); vif_chsw = kcalloc(n_vifs, sizeof(vif_chsw[0]), GFP_KERNEL); if (!vif_chsw) @@ -1477,8 +1473,7 @@ struct ieee80211_chanctx *ctx; int err; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(ctx, &local->chanctx_list, list) { if (ctx->replace_state != IEEE80211_CHANCTX_REPLACES_OTHER) @@ -1518,8 +1513,7 @@ int err, n_assigned, n_reserved, n_ready; int n_ctx = 0, n_vifs_switch = 0, n_vifs_assign = 0, n_vifs_ctxless = 0; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* * If there are 2 independent pairs of channel contexts performing @@ -1653,7 +1647,7 @@ reserved_chanctx_list) { struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_bss_conf *link_conf = link->conf; - u32 changed = 0; + u64 changed = 0; if (!ieee80211_link_has_in_place_reservation(link)) continue; @@ -1778,10 +1772,10 @@ struct ieee80211_chanctx *ctx; bool use_reserved_switch = false; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); conf = rcu_dereference_protected(link_conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (!conf) return; @@ -1816,7 +1810,7 @@ u8 radar_detect_width = 0; int ret; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (sdata->vif.active_links && !(sdata->vif.active_links & BIT(link->link_id))) { @@ -1824,8 +1818,6 @@ return 0; } - mutex_lock(&local->chanctx_mtx); - ret = cfg80211_chandef_dfs_required(local->hw.wiphy, chandef, sdata->wdev.iftype); @@ -1867,7 +1859,6 @@ if (ret) link->radar_required = false; - mutex_unlock(&local->chanctx_mtx); return ret; } @@ -1879,8 +1870,7 @@ struct ieee80211_chanctx *old_ctx; int err; - lockdep_assert_held(&local->mtx); - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); new_ctx = link->reserved_chanctx; old_ctx = ieee80211_link_get_chanctx(link); @@ -1943,51 +1933,40 @@ struct ieee80211_chanctx_conf *conf; struct ieee80211_chanctx *ctx; const struct cfg80211_chan_def *compat; - int ret; + + lockdep_assert_wiphy(local->hw.wiphy); if (!cfg80211_chandef_usable(sdata->local->hw.wiphy, chandef, IEEE80211_CHAN_DISABLED)) return -EINVAL; - mutex_lock(&local->chanctx_mtx); - if (cfg80211_chandef_identical(chandef, &link_conf->chandef)) { - ret = 0; - goto out; - } + if (cfg80211_chandef_identical(chandef, &link_conf->chandef)) + return 0; if (chandef->width == NL80211_CHAN_WIDTH_20_NOHT || - link_conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT) { - ret = -EINVAL; - goto out; - } + link_conf->chandef.width == NL80211_CHAN_WIDTH_20_NOHT) + return -EINVAL; conf = rcu_dereference_protected(link_conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); - if (!conf) { - ret = -EINVAL; - goto out; - } + lockdep_is_held(&local->hw.wiphy->mtx)); + if (!conf) + return -EINVAL; ctx = container_of(conf, struct ieee80211_chanctx, conf); compat = cfg80211_chandef_compatible(&conf->def, chandef); - if (!compat) { - ret = -EINVAL; - goto out; - } + if (!compat) + return -EINVAL; switch (ctx->replace_state) { case IEEE80211_CHANCTX_REPLACE_NONE: - if (!ieee80211_chanctx_reserved_chandef(local, ctx, compat)) { - ret = -EBUSY; - goto out; - } + if (!ieee80211_chanctx_reserved_chandef(local, ctx, compat)) + return -EBUSY; break; case IEEE80211_CHANCTX_WILL_BE_REPLACED: /* TODO: Perhaps the bandwidth change could be treated as a * reservation itself? */ - ret = -EBUSY; - goto out; + return -EBUSY; case IEEE80211_CHANCTX_REPLACES_OTHER: /* channel context that is going to replace another channel * context doesn't really exist and shouldn't be assigned @@ -2001,23 +1980,18 @@ ieee80211_recalc_chanctx_chantype(local, ctx); *changed |= BSS_CHANGED_BANDWIDTH; - ret = 0; - out: - mutex_unlock(&local->chanctx_mtx); - return ret; + return 0; } void ieee80211_link_release_channel(struct ieee80211_link_data *link) { struct ieee80211_sub_if_data *sdata = link->sdata; - mutex_lock(&sdata->local->chanctx_mtx); - if (rcu_access_pointer(link->conf->chanctx_conf)) { - lockdep_assert_held(&sdata->local->mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + if (rcu_access_pointer(link->conf->chanctx_conf)) __ieee80211_link_release_channel(link); } - mutex_unlock(&sdata->local->chanctx_mtx); -} void ieee80211_link_vlan_copy_chanctx(struct ieee80211_link_data *link) { @@ -2029,20 +2003,19 @@ struct ieee80211_sub_if_data *ap; struct ieee80211_chanctx_conf *conf; + lockdep_assert_wiphy(local->hw.wiphy); + if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_AP_VLAN || !sdata->bss)) return; ap = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap); - mutex_lock(&local->chanctx_mtx); - rcu_read_lock(); ap_conf = rcu_dereference(ap->vif.link_conf[link_id]); conf = rcu_dereference_protected(ap_conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); rcu_assign_pointer(link_conf->chanctx_conf, conf); rcu_read_unlock(); - mutex_unlock(&local->chanctx_mtx); } void ieee80211_iter_chan_contexts_atomic( diff -ruw linux-6.4/net/mac80211/debug.h linux-6.4-fbx/net/mac80211/debug.h --- linux-6.4/net/mac80211/debug.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/debug.h 2024-04-22 13:40:53.011943171 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* * Portions - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022 - 2023 Intel Corporation */ #ifndef __MAC80211_DEBUG_H #define __MAC80211_DEBUG_H @@ -136,7 +136,7 @@ #define link_info(link, fmt, ...) \ do { \ - if ((link)->sdata->vif.valid_links) \ + if (ieee80211_vif_is_mld(&(link)->sdata->vif)) \ _sdata_info((link)->sdata, "[link %d] " fmt, \ (link)->link_id, \ ##__VA_ARGS__); \ @@ -145,7 +145,7 @@ } while (0) #define link_err(link, fmt, ...) \ do { \ - if ((link)->sdata->vif.valid_links) \ + if (ieee80211_vif_is_mld(&(link)->sdata->vif)) \ _sdata_err((link)->sdata, "[link %d] " fmt, \ (link)->link_id, \ ##__VA_ARGS__); \ @@ -154,7 +154,7 @@ } while (0) #define link_dbg(link, fmt, ...) \ do { \ - if ((link)->sdata->vif.valid_links) \ + if (ieee80211_vif_is_mld(&(link)->sdata->vif)) \ _sdata_dbg(1, (link)->sdata, "[link %d] " fmt, \ (link)->link_id, \ ##__VA_ARGS__); \ diff -ruw linux-6.4/net/mac80211/debugfs.c linux-6.4-fbx/net/mac80211/debugfs.c --- linux-6.4/net/mac80211/debugfs.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/debugfs.c 2024-04-22 13:40:53.011943171 +0200 @@ -4,7 +4,7 @@ * * Copyright 2007 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH - * Copyright (C) 2018 - 2019, 2021-2022 Intel Corporation + * Copyright (C) 2018 - 2019, 2021-2023 Intel Corporation */ #include @@ -288,10 +288,10 @@ q_limit_low_old = local->aql_txq_limit_low[ac]; q_limit_high_old = local->aql_txq_limit_high[ac]; + wiphy_lock(local->hw.wiphy); local->aql_txq_limit_low[ac] = q_limit_low; local->aql_txq_limit_high[ac] = q_limit_high; - mutex_lock(&local->sta_mtx); list_for_each_entry(sta, &local->sta_list, list) { /* If a sta has customized queue limits, keep it */ if (sta->airtime[ac].aql_limit_low == q_limit_low_old && @@ -300,7 +300,8 @@ sta->airtime[ac].aql_limit_high = q_limit_high; } } - mutex_unlock(&local->sta_mtx); + wiphy_unlock(local->hw.wiphy); + return count; } @@ -496,6 +497,7 @@ FLAG(SUPPORTS_CONC_MON_RX_DECAP), FLAG(DETECTS_COLOR_COLLISION), FLAG(MLO_MCAST_MULTI_LINK_TX), + FLAG(APVLAN_NEED_MCAST_TO_UCAST), #undef FLAG }; @@ -594,9 +596,9 @@ char buf[20]; int res; - rtnl_lock(); + wiphy_lock(local->hw.wiphy); res = drv_get_stats(local, &stats); - rtnl_unlock(); + wiphy_unlock(local->hw.wiphy); if (res) return res; res = printvalue(&stats, buf, sizeof(buf)); diff -ruw linux-6.4/net/mac80211/debugfs_key.c linux-6.4-fbx/net/mac80211/debugfs_key.c --- linux-6.4/net/mac80211/debugfs_key.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/debugfs_key.c 2024-04-22 13:40:53.015943280 +0200 @@ -4,7 +4,7 @@ * Copyright (c) 2006 Jiri Benc * Copyright 2007 Johannes Berg * Copyright (C) 2015 Intel Deutschland GmbH - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation */ #include @@ -378,13 +378,13 @@ if (!sdata->vif.debugfs_dir) return; - lockdep_assert_held(&sdata->local->key_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); debugfs_remove(sdata->debugfs.default_unicast_key); sdata->debugfs.default_unicast_key = NULL; if (sdata->default_unicast_key) { - key = key_mtx_dereference(sdata->local, + key = wiphy_dereference(sdata->local->hw.wiphy, sdata->default_unicast_key); sprintf(buf, "../keys/%d", key->debugfs.cnt); sdata->debugfs.default_unicast_key = @@ -396,7 +396,7 @@ sdata->debugfs.default_multicast_key = NULL; if (sdata->deflink.default_multicast_key) { - key = key_mtx_dereference(sdata->local, + key = wiphy_dereference(sdata->local->hw.wiphy, sdata->deflink.default_multicast_key); sprintf(buf, "../keys/%d", key->debugfs.cnt); sdata->debugfs.default_multicast_key = @@ -413,7 +413,7 @@ if (!sdata->vif.debugfs_dir) return; - key = key_mtx_dereference(sdata->local, + key = wiphy_dereference(sdata->local->hw.wiphy, sdata->deflink.default_mgmt_key); if (key) { sprintf(buf, "../keys/%d", key->debugfs.cnt); @@ -442,7 +442,7 @@ if (!sdata->vif.debugfs_dir) return; - key = key_mtx_dereference(sdata->local, + key = wiphy_dereference(sdata->local->hw.wiphy, sdata->deflink.default_beacon_key); if (key) { sprintf(buf, "../keys/%d", key->debugfs.cnt); diff -ruw linux-6.4/net/mac80211/debugfs_netdev.c linux-6.4-fbx/net/mac80211/debugfs_netdev.c --- linux-6.4/net/mac80211/debugfs_netdev.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/debugfs_netdev.c 2024-04-22 13:40:53.015943280 +0200 @@ -2,7 +2,7 @@ /* * Copyright (c) 2006 Jiri Benc * Copyright 2007 Johannes Berg - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation */ #include @@ -22,18 +22,18 @@ #include "debugfs_netdev.h" #include "driver-ops.h" -static ssize_t ieee80211_if_read( - void *data, +static ssize_t ieee80211_if_read_sdata( + struct ieee80211_sub_if_data *sdata, char __user *userbuf, size_t count, loff_t *ppos, - ssize_t (*format)(const void *, char *, int)) + ssize_t (*format)(const struct ieee80211_sub_if_data *sdata, char *, int)) { char buf[200]; ssize_t ret = -EINVAL; - read_lock(&dev_base_lock); - ret = (*format)(data, buf, sizeof(buf)); - read_unlock(&dev_base_lock); + wiphy_lock(sdata->local->hw.wiphy); + ret = (*format)(sdata, buf, sizeof(buf)); + wiphy_unlock(sdata->local->hw.wiphy); if (ret >= 0) ret = simple_read_from_buffer(userbuf, count, ppos, buf, ret); @@ -41,11 +41,11 @@ return ret; } -static ssize_t ieee80211_if_write( - void *data, +static ssize_t ieee80211_if_write_sdata( + struct ieee80211_sub_if_data *sdata, const char __user *userbuf, size_t count, loff_t *ppos, - ssize_t (*write)(void *, const char *, int)) + ssize_t (*write)(struct ieee80211_sub_if_data *sdata, const char *, int)) { char buf[64]; ssize_t ret; @@ -57,9 +57,51 @@ return -EFAULT; buf[count] = '\0'; - rtnl_lock(); - ret = (*write)(data, buf, count); - rtnl_unlock(); + wiphy_lock(sdata->local->hw.wiphy); + ret = (*write)(sdata, buf, count); + wiphy_unlock(sdata->local->hw.wiphy); + + return ret; +} + +static ssize_t ieee80211_if_read_link( + struct ieee80211_link_data *link, + char __user *userbuf, + size_t count, loff_t *ppos, + ssize_t (*format)(const struct ieee80211_link_data *link, char *, int)) +{ + char buf[200]; + ssize_t ret = -EINVAL; + + wiphy_lock(link->sdata->local->hw.wiphy); + ret = (*format)(link, buf, sizeof(buf)); + wiphy_unlock(link->sdata->local->hw.wiphy); + + if (ret >= 0) + ret = simple_read_from_buffer(userbuf, count, ppos, buf, ret); + + return ret; +} + +static ssize_t ieee80211_if_write_link( + struct ieee80211_link_data *link, + const char __user *userbuf, + size_t count, loff_t *ppos, + ssize_t (*write)(struct ieee80211_link_data *link, const char *, int)) +{ + char buf[64]; + ssize_t ret; + + if (count >= sizeof(buf)) + return -E2BIG; + + if (copy_from_user(buf, userbuf, count)) + return -EFAULT; + buf[count] = '\0'; + + wiphy_lock(link->sdata->local->hw.wiphy); + ret = (*write)(link, buf, count); + wiphy_unlock(link->sdata->local->hw.wiphy); return ret; } @@ -126,41 +168,37 @@ .llseek = generic_file_llseek, \ } -#define _IEEE80211_IF_FILE_R_FN(name, type) \ +#define _IEEE80211_IF_FILE_R_FN(name) \ static ssize_t ieee80211_if_read_##name(struct file *file, \ char __user *userbuf, \ size_t count, loff_t *ppos) \ { \ - ssize_t (*fn)(const void *, char *, int) = (void *) \ - ((ssize_t (*)(const type, char *, int)) \ + return ieee80211_if_read_sdata(file->private_data, \ + userbuf, count, ppos, \ ieee80211_if_fmt_##name); \ - return ieee80211_if_read(file->private_data, \ - userbuf, count, ppos, fn); \ } -#define _IEEE80211_IF_FILE_W_FN(name, type) \ +#define _IEEE80211_IF_FILE_W_FN(name) \ static ssize_t ieee80211_if_write_##name(struct file *file, \ const char __user *userbuf, \ size_t count, loff_t *ppos) \ { \ - ssize_t (*fn)(void *, const char *, int) = (void *) \ - ((ssize_t (*)(type, const char *, int)) \ + return ieee80211_if_write_sdata(file->private_data, userbuf, \ + count, ppos, \ ieee80211_if_parse_##name); \ - return ieee80211_if_write(file->private_data, userbuf, count, \ - ppos, fn); \ } #define IEEE80211_IF_FILE_R(name) \ - _IEEE80211_IF_FILE_R_FN(name, struct ieee80211_sub_if_data *) \ + _IEEE80211_IF_FILE_R_FN(name) \ _IEEE80211_IF_FILE_OPS(name, ieee80211_if_read_##name, NULL) #define IEEE80211_IF_FILE_W(name) \ - _IEEE80211_IF_FILE_W_FN(name, struct ieee80211_sub_if_data *) \ + _IEEE80211_IF_FILE_W_FN(name) \ _IEEE80211_IF_FILE_OPS(name, NULL, ieee80211_if_write_##name) #define IEEE80211_IF_FILE_RW(name) \ - _IEEE80211_IF_FILE_R_FN(name, struct ieee80211_sub_if_data *) \ - _IEEE80211_IF_FILE_W_FN(name, struct ieee80211_sub_if_data *) \ + _IEEE80211_IF_FILE_R_FN(name) \ + _IEEE80211_IF_FILE_W_FN(name) \ _IEEE80211_IF_FILE_OPS(name, ieee80211_if_read_##name, \ ieee80211_if_write_##name) @@ -168,18 +206,37 @@ IEEE80211_IF_FMT_##format(name, struct ieee80211_sub_if_data, field) \ IEEE80211_IF_FILE_R(name) -/* Same but with a link_ prefix in the ops variable name and different type */ +#define _IEEE80211_IF_LINK_R_FN(name) \ +static ssize_t ieee80211_if_read_##name(struct file *file, \ + char __user *userbuf, \ + size_t count, loff_t *ppos) \ +{ \ + return ieee80211_if_read_link(file->private_data, \ + userbuf, count, ppos, \ + ieee80211_if_fmt_##name); \ +} + +#define _IEEE80211_IF_LINK_W_FN(name) \ +static ssize_t ieee80211_if_write_##name(struct file *file, \ + const char __user *userbuf, \ + size_t count, loff_t *ppos) \ +{ \ + return ieee80211_if_write_link(file->private_data, userbuf, \ + count, ppos, \ + ieee80211_if_parse_##name); \ +} + #define IEEE80211_IF_LINK_FILE_R(name) \ - _IEEE80211_IF_FILE_R_FN(name, struct ieee80211_link_data *) \ + _IEEE80211_IF_LINK_R_FN(name) \ _IEEE80211_IF_FILE_OPS(link_##name, ieee80211_if_read_##name, NULL) #define IEEE80211_IF_LINK_FILE_W(name) \ - _IEEE80211_IF_FILE_W_FN(name) \ + _IEEE80211_IF_LINK_W_FN(name) \ _IEEE80211_IF_FILE_OPS(link_##name, NULL, ieee80211_if_write_##name) #define IEEE80211_IF_LINK_FILE_RW(name) \ - _IEEE80211_IF_FILE_R_FN(name, struct ieee80211_link_data *) \ - _IEEE80211_IF_FILE_W_FN(name, struct ieee80211_link_data *) \ + _IEEE80211_IF_LINK_R_FN(name) \ + _IEEE80211_IF_LINK_W_FN(name) \ _IEEE80211_IF_FILE_OPS(link_##name, ieee80211_if_read_##name, \ ieee80211_if_write_##name) @@ -265,7 +322,12 @@ { struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; - int err; + + /* The driver indicated that EML is enabled for the interface, thus do + * not allow to override the SMPS state. + */ + if (sdata->vif.driver_flags & IEEE80211_VIF_EML_ACTIVE) + return -EOPNOTSUPP; if (!(local->hw.wiphy->features & NL80211_FEATURE_STATIC_SMPS) && smps_mode == IEEE80211_SMPS_STATIC) @@ -280,11 +342,7 @@ if (sdata->vif.type != NL80211_IFTYPE_STATION) return -EOPNOTSUPP; - sdata_lock(sdata); - err = __ieee80211_request_smps_mgd(link->sdata, link, smps_mode); - sdata_unlock(sdata); - - return err; + return __ieee80211_request_smps_mgd(link->sdata, link, smps_mode); } static const char *smps_modes[IEEE80211_SMPS_NUM_MODES] = { @@ -356,16 +414,13 @@ case NL80211_IFTYPE_STATION: fc |= cpu_to_le16(IEEE80211_FCTL_TODS); /* BSSID SA DA */ - sdata_lock(sdata); if (!sdata->u.mgd.associated) { - sdata_unlock(sdata); dev_kfree_skb(skb); return -ENOTCONN; } memcpy(hdr->addr1, sdata->deflink.u.mgd.bssid, ETH_ALEN); memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN); memcpy(hdr->addr3, addr, ETH_ALEN); - sdata_unlock(sdata); break; default: dev_kfree_skb(skb); @@ -690,6 +745,19 @@ debugfs_create_file(#name, mode, sdata->vif.debugfs_dir, \ sdata, &name##_ops) +#define DEBUGFS_ADD_X(_bits, _name, _mode) \ + debugfs_create_x##_bits(#_name, _mode, sdata->vif.debugfs_dir, \ + &sdata->vif._name) + +#define DEBUGFS_ADD_X8(_name, _mode) \ + DEBUGFS_ADD_X(8, _name, _mode) + +#define DEBUGFS_ADD_X16(_name, _mode) \ + DEBUGFS_ADD_X(16, _name, _mode) + +#define DEBUGFS_ADD_X32(_name, _mode) \ + DEBUGFS_ADD_X(32, _name, _mode) + #define DEBUGFS_ADD(name) DEBUGFS_ADD_MODE(name, 0400) static void add_common_files(struct ieee80211_sub_if_data *sdata) @@ -717,8 +785,9 @@ DEBUGFS_ADD_MODE(uapsd_queues, 0600); DEBUGFS_ADD_MODE(uapsd_max_sp_len, 0600); DEBUGFS_ADD_MODE(tdls_wider_bw, 0600); - DEBUGFS_ADD_MODE(valid_links, 0200); + DEBUGFS_ADD_MODE(valid_links, 0400); DEBUGFS_ADD_MODE(active_links, 0600); + DEBUGFS_ADD_X16(dormant_links, 0400); } static void add_ap_files(struct ieee80211_sub_if_data *sdata) @@ -868,18 +937,20 @@ } } -void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata) +void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata, + bool mld_vif) { char buf[10+IFNAMSIZ]; sprintf(buf, "netdev:%s", sdata->name); sdata->vif.debugfs_dir = debugfs_create_dir(buf, sdata->local->hw.wiphy->debugfsdir); + /* deflink also has this */ + sdata->deflink.debugfs_dir = sdata->vif.debugfs_dir; sdata->debugfs.subdir_stations = debugfs_create_dir("stations", sdata->vif.debugfs_dir); add_files(sdata); - - if (!(sdata->local->hw.wiphy->flags & WIPHY_FLAG_SUPPORTS_MLO)) + if (!mld_vif) add_link_files(&sdata->deflink, sdata->vif.debugfs_dir); } @@ -907,11 +978,21 @@ debugfs_rename(dir->d_parent, dir, dir->d_parent, buf); } +void ieee80211_debugfs_recreate_netdev(struct ieee80211_sub_if_data *sdata, + bool mld_vif) +{ + ieee80211_debugfs_remove_netdev(sdata); + ieee80211_debugfs_add_netdev(sdata, mld_vif); + drv_vif_add_debugfs(sdata->local, sdata); + if (!mld_vif) + ieee80211_link_debugfs_drv_add(&sdata->deflink); +} + void ieee80211_link_debugfs_add(struct ieee80211_link_data *link) { char link_dir_name[10]; - if (WARN_ON(!link->sdata->vif.debugfs_dir)) + if (WARN_ON(!link->sdata->vif.debugfs_dir || link->debugfs_dir)) return; /* For now, this should not be called for non-MLO capable drivers */ @@ -948,7 +1029,8 @@ void ieee80211_link_debugfs_drv_add(struct ieee80211_link_data *link) { - if (WARN_ON(!link->debugfs_dir)) + if (link->sdata->vif.type == NL80211_IFTYPE_MONITOR || + WARN_ON(!link->debugfs_dir)) return; drv_link_add_debugfs(link->sdata->local, link->sdata, diff -ruw linux-6.4/net/mac80211/debugfs_netdev.h linux-6.4-fbx/net/mac80211/debugfs_netdev.h --- linux-6.4/net/mac80211/debugfs_netdev.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/debugfs_netdev.h 2024-04-22 13:40:53.015943280 +0200 @@ -1,4 +1,8 @@ /* SPDX-License-Identifier: GPL-2.0 */ +/* + * Portions: + * Copyright (C) 2023 Intel Corporation + */ /* routines exported for debugfs handling */ #ifndef __IEEE80211_DEBUGFS_NETDEV_H @@ -7,9 +11,12 @@ #include "ieee80211_i.h" #ifdef CONFIG_MAC80211_DEBUGFS -void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata); +void ieee80211_debugfs_add_netdev(struct ieee80211_sub_if_data *sdata, + bool mld_vif); void ieee80211_debugfs_remove_netdev(struct ieee80211_sub_if_data *sdata); void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata); +void ieee80211_debugfs_recreate_netdev(struct ieee80211_sub_if_data *sdata, + bool mld_vif); void ieee80211_link_debugfs_add(struct ieee80211_link_data *link); void ieee80211_link_debugfs_remove(struct ieee80211_link_data *link); @@ -18,7 +25,7 @@ void ieee80211_link_debugfs_drv_remove(struct ieee80211_link_data *link); #else static inline void ieee80211_debugfs_add_netdev( - struct ieee80211_sub_if_data *sdata) + struct ieee80211_sub_if_data *sdata, bool mld_vif) {} static inline void ieee80211_debugfs_remove_netdev( struct ieee80211_sub_if_data *sdata) @@ -26,7 +33,9 @@ static inline void ieee80211_debugfs_rename_netdev( struct ieee80211_sub_if_data *sdata) {} - +static inline void ieee80211_debugfs_recreate_netdev( + struct ieee80211_sub_if_data *sdata, bool mld_vif) +{} static inline void ieee80211_link_debugfs_add(struct ieee80211_link_data *link) {} static inline void ieee80211_link_debugfs_remove(struct ieee80211_link_data *link) diff -ruw linux-6.4/net/mac80211/debugfs_sta.c linux-6.4-fbx/net/mac80211/debugfs_sta.c --- linux-6.4/net/mac80211/debugfs_sta.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/debugfs_sta.c 2024-04-22 13:40:53.015943280 +0200 @@ -5,7 +5,7 @@ * Copyright 2007 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright(c) 2016 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation */ #include @@ -420,6 +420,7 @@ if (ret || tid >= IEEE80211_NUM_TIDS) return -EINVAL; + wiphy_lock(sta->local->hw.wiphy); if (tx) { if (start) ret = ieee80211_start_tx_ba_session(&sta->sta, tid, @@ -431,6 +432,7 @@ 3, true); ret = 0; } + wiphy_unlock(sta->local->hw.wiphy); return ret ?: count; } @@ -1035,6 +1037,190 @@ } LINK_STA_OPS(he_capa); +static ssize_t link_sta_eht_capa_read(struct file *file, char __user *userbuf, + size_t count, loff_t *ppos) +{ + char *buf, *p; + size_t buf_sz = PAGE_SIZE; + struct link_sta_info *link_sta = file->private_data; + struct ieee80211_sta_eht_cap *bec = &link_sta->pub->eht_cap; + struct ieee80211_eht_cap_elem_fixed *fixed = &bec->eht_cap_elem; + struct ieee80211_eht_mcs_nss_supp *nss = &bec->eht_mcs_nss_supp; + u8 *cap; + int i; + ssize_t ret; + static const char *mcs_desc[] = { "0-7", "8-9", "10-11", "12-13"}; + + buf = kmalloc(buf_sz, GFP_KERNEL); + if (!buf) + return -ENOMEM; + p = buf; + + p += scnprintf(p, buf_sz + buf - p, "EHT %ssupported\n", + bec->has_eht ? "" : "not "); + if (!bec->has_eht) + goto out; + + p += scnprintf(p, buf_sz + buf - p, + "MAC-CAP: %#.2x %#.2x\n", + fixed->mac_cap_info[0], fixed->mac_cap_info[1]); + p += scnprintf(p, buf_sz + buf - p, + "PHY-CAP: %#.2x %#.2x %#.2x %#.2x %#.2x %#.2x %#.2x %#.2x %#.2x\n", + fixed->phy_cap_info[0], fixed->phy_cap_info[1], + fixed->phy_cap_info[2], fixed->phy_cap_info[3], + fixed->phy_cap_info[4], fixed->phy_cap_info[5], + fixed->phy_cap_info[6], fixed->phy_cap_info[7], + fixed->phy_cap_info[8]); + +#define PRINT(fmt, ...) \ + p += scnprintf(p, buf_sz + buf - p, "\t\t" fmt "\n", \ + ##__VA_ARGS__) + +#define PFLAG(t, n, a, b) \ + do { \ + if (cap[n] & IEEE80211_EHT_##t##_CAP##n##_##a) \ + PRINT("%s", b); \ + } while (0) + + cap = fixed->mac_cap_info; + PFLAG(MAC, 0, EPCS_PRIO_ACCESS, "EPCS-PRIO-ACCESS"); + PFLAG(MAC, 0, OM_CONTROL, "OM-CONTROL"); + PFLAG(MAC, 0, TRIG_TXOP_SHARING_MODE1, "TRIG-TXOP-SHARING-MODE1"); + PFLAG(MAC, 0, TRIG_TXOP_SHARING_MODE2, "TRIG-TXOP-SHARING-MODE2"); + PFLAG(MAC, 0, RESTRICTED_TWT, "RESTRICTED-TWT"); + PFLAG(MAC, 0, SCS_TRAFFIC_DESC, "SCS-TRAFFIC-DESC"); + switch ((cap[0] & 0xc0) >> 6) { + case IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_3895: + PRINT("MAX-MPDU-LEN: 3985"); + break; + case IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_7991: + PRINT("MAX-MPDU-LEN: 7991"); + break; + case IEEE80211_EHT_MAC_CAP0_MAX_MPDU_LEN_11454: + PRINT("MAX-MPDU-LEN: 11454"); + break; + } + + cap = fixed->phy_cap_info; + PFLAG(PHY, 0, 320MHZ_IN_6GHZ, "320MHZ-IN-6GHZ"); + PFLAG(PHY, 0, 242_TONE_RU_GT20MHZ, "242-TONE-RU-GT20MHZ"); + PFLAG(PHY, 0, NDP_4_EHT_LFT_32_GI, "NDP-4-EHT-LFT-32-GI"); + PFLAG(PHY, 0, PARTIAL_BW_UL_MU_MIMO, "PARTIAL-BW-UL-MU-MIMO"); + PFLAG(PHY, 0, SU_BEAMFORMER, "SU-BEAMFORMER"); + PFLAG(PHY, 0, SU_BEAMFORMEE, "SU-BEAMFORMEE"); + i = cap[0] >> 7; + i |= (cap[1] & 0x3) << 1; + PRINT("BEAMFORMEE-80-NSS: %i", i); + PRINT("BEAMFORMEE-160-NSS: %i", (cap[1] >> 2) & 0x7); + PRINT("BEAMFORMEE-320-NSS: %i", (cap[1] >> 5) & 0x7); + PRINT("SOUNDING-DIM-80-NSS: %i", (cap[2] & 0x7)); + PRINT("SOUNDING-DIM-160-NSS: %i", (cap[2] >> 3) & 0x7); + i = cap[2] >> 6; + i |= (cap[3] & 0x1) << 3; + PRINT("SOUNDING-DIM-320-NSS: %i", i); + + PFLAG(PHY, 3, NG_16_SU_FEEDBACK, "NG-16-SU-FEEDBACK"); + PFLAG(PHY, 3, NG_16_MU_FEEDBACK, "NG-16-MU-FEEDBACK"); + PFLAG(PHY, 3, CODEBOOK_4_2_SU_FDBK, "CODEBOOK-4-2-SU-FDBK"); + PFLAG(PHY, 3, CODEBOOK_7_5_MU_FDBK, "CODEBOOK-7-5-MU-FDBK"); + PFLAG(PHY, 3, TRIG_SU_BF_FDBK, "TRIG-SU-BF-FDBK"); + PFLAG(PHY, 3, TRIG_MU_BF_PART_BW_FDBK, "TRIG-MU-BF-PART-BW-FDBK"); + PFLAG(PHY, 3, TRIG_CQI_FDBK, "TRIG-CQI-FDBK"); + + PFLAG(PHY, 4, PART_BW_DL_MU_MIMO, "PART-BW-DL-MU-MIMO"); + PFLAG(PHY, 4, PSR_SR_SUPP, "PSR-SR-SUPP"); + PFLAG(PHY, 4, POWER_BOOST_FACT_SUPP, "POWER-BOOST-FACT-SUPP"); + PFLAG(PHY, 4, EHT_MU_PPDU_4_EHT_LTF_08_GI, "EHT-MU-PPDU-4-EHT-LTF-08-GI"); + PRINT("MAX_NC: %i", cap[4] >> 4); + + PFLAG(PHY, 5, NON_TRIG_CQI_FEEDBACK, "NON-TRIG-CQI-FEEDBACK"); + PFLAG(PHY, 5, TX_LESS_242_TONE_RU_SUPP, "TX-LESS-242-TONE-RU-SUPP"); + PFLAG(PHY, 5, RX_LESS_242_TONE_RU_SUPP, "RX-LESS-242-TONE-RU-SUPP"); + PFLAG(PHY, 5, PPE_THRESHOLD_PRESENT, "PPE_THRESHOLD_PRESENT"); + switch (cap[5] >> 4 & 0x3) { + case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_0US: + PRINT("NOMINAL_PKT_PAD: 0us"); + break; + case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_8US: + PRINT("NOMINAL_PKT_PAD: 8us"); + break; + case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_16US: + PRINT("NOMINAL_PKT_PAD: 16us"); + break; + case IEEE80211_EHT_PHY_CAP5_COMMON_NOMINAL_PKT_PAD_20US: + PRINT("NOMINAL_PKT_PAD: 20us"); + break; + } + i = cap[5] >> 6; + i |= cap[6] & 0x7; + PRINT("MAX-NUM-SUPP-EHT-LTF: %i", i); + PFLAG(PHY, 5, SUPP_EXTRA_EHT_LTF, "SUPP-EXTRA-EHT-LTF"); + + i = (cap[6] >> 3) & 0xf; + PRINT("MCS15-SUPP-MASK: %i", i); + PFLAG(PHY, 6, EHT_DUP_6GHZ_SUPP, "EHT-DUP-6GHZ-SUPP"); + + PFLAG(PHY, 7, 20MHZ_STA_RX_NDP_WIDER_BW, "20MHZ-STA-RX-NDP-WIDER-BW"); + PFLAG(PHY, 7, NON_OFDMA_UL_MU_MIMO_80MHZ, "NON-OFDMA-UL-MU-MIMO-80MHZ"); + PFLAG(PHY, 7, NON_OFDMA_UL_MU_MIMO_160MHZ, "NON-OFDMA-UL-MU-MIMO-160MHZ"); + PFLAG(PHY, 7, NON_OFDMA_UL_MU_MIMO_320MHZ, "NON-OFDMA-UL-MU-MIMO-320MHZ"); + PFLAG(PHY, 7, MU_BEAMFORMER_80MHZ, "MU-BEAMFORMER-80MHZ"); + PFLAG(PHY, 7, MU_BEAMFORMER_160MHZ, "MU-BEAMFORMER-160MHZ"); + PFLAG(PHY, 7, MU_BEAMFORMER_320MHZ, "MU-BEAMFORMER-320MHZ"); + PFLAG(PHY, 7, TB_SOUNDING_FDBK_RATE_LIMIT, "TB-SOUNDING-FDBK-RATE-LIMIT"); + + PFLAG(PHY, 8, RX_1024QAM_WIDER_BW_DL_OFDMA, "RX-1024QAM-WIDER-BW-DL-OFDMA"); + PFLAG(PHY, 8, RX_4096QAM_WIDER_BW_DL_OFDMA, "RX-4096QAM-WIDER-BW-DL-OFDMA"); + +#undef PFLAG + + PRINT(""); /* newline */ + if (!(link_sta->pub->he_cap.he_cap_elem.phy_cap_info[0] & + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) { + u8 *mcs_vals = (u8 *)(&nss->only_20mhz); + + for (i = 0; i < 4; i++) + PRINT("EHT bw=20 MHz, max NSS for MCS %s: Rx=%u, Tx=%u", + mcs_desc[i], + mcs_vals[i] & 0xf, mcs_vals[i] >> 4); + } else { + u8 *mcs_vals = (u8 *)(&nss->bw._80); + + for (i = 0; i < 3; i++) + PRINT("EHT bw <= 80 MHz, max NSS for MCS %s: Rx=%u, Tx=%u", + mcs_desc[i + 1], + mcs_vals[i] & 0xf, mcs_vals[i] >> 4); + + mcs_vals = (u8 *)(&nss->bw._160); + for (i = 0; i < 3; i++) + PRINT("EHT bw <= 160 MHz, max NSS for MCS %s: Rx=%u, Tx=%u", + mcs_desc[i + 1], + mcs_vals[i] & 0xf, mcs_vals[i] >> 4); + + mcs_vals = (u8 *)(&nss->bw._320); + for (i = 0; i < 3; i++) + PRINT("EHT bw <= 320 MHz, max NSS for MCS %s: Rx=%u, Tx=%u", + mcs_desc[i + 1], + mcs_vals[i] & 0xf, mcs_vals[i] >> 4); + } + + if (cap[5] & IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) { + u8 ppe_size = ieee80211_eht_ppe_size(bec->eht_ppe_thres[0], cap); + + p += scnprintf(p, buf_sz + buf - p, "EHT PPE Thresholds: "); + for (i = 0; i < ppe_size; i++) + p += scnprintf(p, buf_sz + buf - p, "0x%02x ", + bec->eht_ppe_thres[i]); + PRINT(""); /* newline */ + } + +out: + ret = simple_read_from_buffer(userbuf, count, ppos, buf, p - buf); + kfree(buf); + return ret; +} +LINK_STA_OPS(eht_capa); + #define DEBUGFS_ADD(name) \ debugfs_create_file(#name, 0400, \ sta->debugfs_dir, sta, &sta_ ##name## _ops) @@ -1128,6 +1314,7 @@ DEBUGFS_ADD(ht_capa); DEBUGFS_ADD(vht_capa); DEBUGFS_ADD(he_capa); + DEBUGFS_ADD(eht_capa); DEBUGFS_ADD_COUNTER(rx_duplicates, rx_stats.num_duplicates); DEBUGFS_ADD_COUNTER(rx_fragments, rx_stats.fragments); diff -ruw linux-6.4/net/mac80211/driver-ops.c linux-6.4-fbx/net/mac80211/driver-ops.c --- linux-6.4/net/mac80211/driver-ops.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/driver-ops.c 2024-04-22 13:40:53.015943280 +0200 @@ -15,6 +15,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(local->started)) return -EALREADY; @@ -35,6 +36,7 @@ void drv_stop(struct ieee80211_local *local) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(!local->started)) return; @@ -52,12 +54,37 @@ local->started = false; } +int drv_get_powered(struct ieee80211_local *local, bool *up, bool *busy) +{ + int ret = -EOPNOTSUPP; + + might_sleep(); + + if (local->ops->get_powered) + ret = local->ops->get_powered(&local->hw, up, busy); + + return ret; +} + +int drv_set_powered(struct ieee80211_local *local) +{ + int ret = -EOPNOTSUPP; + + might_sleep(); + + if (local->ops->set_powered) + ret = local->ops->set_powered(&local->hw); + + return ret; +} + int drv_add_interface(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata) { int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(sdata->vif.type == NL80211_IFTYPE_AP_VLAN || (sdata->vif.type == NL80211_IFTYPE_MONITOR && @@ -69,10 +96,18 @@ ret = local->ops->add_interface(&local->hw, &sdata->vif); trace_drv_return_int(local, ret); - if (ret == 0) + if (ret) + return ret; + sdata->flags |= IEEE80211_SDATA_IN_DRIVER; - return ret; + if (!local->in_reconfig) { + drv_vif_add_debugfs(local, sdata); + /* initially vif is not MLD */ + ieee80211_link_debugfs_drv_add(&sdata->deflink); + } + + return 0; } int drv_change_interface(struct ieee80211_local *local, @@ -82,6 +117,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -96,6 +132,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -116,6 +153,7 @@ int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -149,6 +187,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -190,6 +229,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -223,6 +263,7 @@ u64 ret = -1ULL; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return ret; @@ -239,6 +280,7 @@ u64 tsf) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -254,6 +296,7 @@ s64 offset) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -268,6 +311,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -285,7 +329,9 @@ { int ret = 0; - drv_verify_link_exists(sdata, link_conf); + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return -EIO; @@ -312,8 +358,8 @@ struct ieee80211_chanctx *ctx) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); - drv_verify_link_exists(sdata, link_conf); if (!check_sdata_in_driver(sdata)) return; @@ -340,6 +386,7 @@ int i; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!local->ops->switch_vif_chanctx) return -EOPNOTSUPP; @@ -392,9 +439,7 @@ int ret = -EOPNOTSUPP; might_sleep(); - - if (!sdata) - return -EIO; + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -416,6 +461,7 @@ int link_id, u64 changed) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON_ONCE(changed & (BSS_CHANGED_BEACON | BSS_CHANGED_BEACON_ENABLED) && @@ -429,7 +475,8 @@ sdata->vif.type == NL80211_IFTYPE_NAN || (sdata->vif.type == NL80211_IFTYPE_MONITOR && !sdata->vif.bss_conf.mu_mimo_owner && - !(changed & BSS_CHANGED_TXPOWER)))) + !(changed & (BSS_CHANGED_TXPOWER | + BSS_CHANGED_QOS))))) return; if (!check_sdata_in_driver(sdata)) @@ -458,6 +505,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -485,6 +533,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -510,11 +559,14 @@ if (ret) return ret; - for_each_set_bit(link_id, &links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) { + if (!local->in_reconfig) { + for_each_set_bit(link_id, &links_to_add, + IEEE80211_MLD_MAX_NUM_LINKS) { link = rcu_access_pointer(sdata->link[link_id]); ieee80211_link_debugfs_drv_add(link); } + } return 0; } @@ -532,6 +584,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -547,7 +600,7 @@ for_each_set_bit(link_id, &links_to_rem, IEEE80211_MLD_MAX_NUM_LINKS) { link_sta = rcu_dereference_protected(info->link[link_id], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); ieee80211_link_sta_debugfs_drv_remove(link_sta); } @@ -563,7 +616,7 @@ for_each_set_bit(link_id, &links_to_add, IEEE80211_MLD_MAX_NUM_LINKS) { link_sta = rcu_dereference_protected(info->link[link_id], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); ieee80211_link_sta_debugfs_drv_add(link_sta); } diff -ruw linux-6.4/net/mac80211/driver-ops.h linux-6.4-fbx/net/mac80211/driver-ops.h --- linux-6.4/net/mac80211/driver-ops.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/driver-ops.h 2024-04-22 13:40:53.015943280 +0200 @@ -2,7 +2,7 @@ /* * Portions of this file * Copyright(c) 2016 Intel Deutschland GmbH -* Copyright (C) 2018 - 2019, 2021 Intel Corporation +* Copyright (C) 2018 - 2019, 2021 - 2023 Intel Corporation */ #ifndef __MAC80211_DRIVER_OPS @@ -13,15 +13,17 @@ #include "trace.h" #define check_sdata_in_driver(sdata) ({ \ - !WARN_ONCE(!(sdata->flags & IEEE80211_SDATA_IN_DRIVER), \ + WARN_ONCE(!sdata->local->reconfig_failure && \ + !(sdata->flags & IEEE80211_SDATA_IN_DRIVER), \ "%s: Failed check-sdata-in-driver check, flags: 0x%x\n", \ sdata->dev ? sdata->dev->name : sdata->name, sdata->flags); \ + !!(sdata->flags & IEEE80211_SDATA_IN_DRIVER); \ }) static inline struct ieee80211_sub_if_data * get_bss_sdata(struct ieee80211_sub_if_data *sdata) { - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) + if (sdata && sdata->vif.type == NL80211_IFTYPE_AP_VLAN) sdata = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap); @@ -38,6 +40,9 @@ static inline void drv_sync_rx_queues(struct ieee80211_local *local, struct sta_info *sta) { + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (local->ops->sync_rx_queues) { trace_drv_sync_rx_queues(local, sta->sdata, &sta->sta); local->ops->sync_rx_queues(&local->hw); @@ -84,6 +89,8 @@ int drv_start(struct ieee80211_local *local); void drv_stop(struct ieee80211_local *local); +int drv_get_powered(struct ieee80211_local *local, bool *up, bool *busy); +int drv_set_powered(struct ieee80211_local *local); #ifdef CONFIG_PM static inline int drv_suspend(struct ieee80211_local *local, @@ -92,6 +99,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_suspend(local); ret = local->ops->suspend(&local->hw, wowlan); @@ -104,6 +112,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_resume(local); ret = local->ops->resume(&local->hw); @@ -115,6 +124,7 @@ bool enabled) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!local->ops->set_wakeup) return; @@ -140,6 +150,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_config(local, changed); ret = local->ops->config(&local->hw, changed); @@ -152,6 +163,7 @@ u64 changed) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -191,6 +203,7 @@ u64 multicast) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_configure_filter(local, changed_flags, total_flags, multicast); @@ -205,6 +218,7 @@ unsigned int changed_flags) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_config_iface_filter(local, sdata, filter_flags, changed_flags); @@ -261,6 +275,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -275,6 +290,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -293,6 +309,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -310,6 +327,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -326,6 +344,7 @@ const u8 *mac_addr) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_sw_scan_start(local, sdata, mac_addr); if (local->ops->sw_scan_start) @@ -337,6 +356,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_sw_scan_complete(local, sdata); if (local->ops->sw_scan_complete) @@ -350,6 +370,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (local->ops->get_stats) ret = local->ops->get_stats(&local->hw, stats); @@ -373,6 +394,7 @@ int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_set_frag_threshold(local, value); if (local->ops->set_frag_threshold) @@ -387,6 +409,7 @@ int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_set_rts_threshold(local, value); if (local->ops->set_rts_threshold) @@ -400,6 +423,7 @@ { int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_set_coverage_class(local, value); if (local->ops->set_coverage_class) @@ -433,6 +457,7 @@ int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -452,6 +477,7 @@ struct ieee80211_sta *sta) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -465,12 +491,30 @@ } #ifdef CONFIG_MAC80211_DEBUGFS +static inline void drv_vif_add_debugfs(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata) +{ + might_sleep(); + + if (sdata->vif.type == NL80211_IFTYPE_MONITOR || + WARN_ON(!sdata->vif.debugfs_dir)) + return; + + sdata = get_bss_sdata(sdata); + if (!check_sdata_in_driver(sdata)) + return; + + if (local->ops->vif_add_debugfs) + local->ops->vif_add_debugfs(&local->hw, &sdata->vif); +} + static inline void drv_link_add_debugfs(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, struct ieee80211_bss_conf *link_conf, struct dentry *dir) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -487,6 +531,7 @@ struct dentry *dir) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -503,6 +548,7 @@ struct dentry *dir) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -512,6 +558,12 @@ local->ops->link_sta_add_debugfs(&local->hw, &sdata->vif, link_sta, dir); } +#else +static inline void drv_vif_add_debugfs(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata) +{ + might_sleep(); +} #endif static inline void drv_sta_pre_rcu_remove(struct ieee80211_local *local, @@ -519,6 +571,7 @@ struct sta_info *sta) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) @@ -567,6 +620,9 @@ struct ieee80211_sta *sta, struct station_info *sinfo) { + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + sdata = get_bss_sdata(sdata); if (!check_sdata_in_driver(sdata)) return; @@ -597,6 +653,7 @@ int ret = 0; /* default unsupported op for less congestion */ might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_tx_last_beacon(local); if (local->ops->tx_last_beacon) @@ -614,6 +671,9 @@ { int ret = -EOPNOTSUPP; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + trace_drv_get_survey(local, idx, survey); if (local->ops->get_survey) @@ -627,6 +687,7 @@ static inline void drv_rfkill_poll(struct ieee80211_local *local) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (local->ops->rfkill_poll) local->ops->rfkill_poll(&local->hw); @@ -636,9 +697,13 @@ struct ieee80211_sub_if_data *sdata, u32 queues, bool drop) { - struct ieee80211_vif *vif = sdata ? &sdata->vif : NULL; + struct ieee80211_vif *vif; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + + sdata = get_bss_sdata(sdata); + vif = sdata ? &sdata->vif : NULL; if (sdata && !check_sdata_in_driver(sdata)) return; @@ -654,6 +719,9 @@ struct sta_info *sta) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + + sdata = get_bss_sdata(sdata); if (sdata && !check_sdata_in_driver(sdata)) return; @@ -669,6 +737,7 @@ struct ieee80211_channel_switch *ch_switch) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_channel_switch(local, sdata, ch_switch); local->ops->channel_switch(&local->hw, &sdata->vif, ch_switch); @@ -681,6 +750,7 @@ { int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (local->ops->set_antenna) ret = local->ops->set_antenna(&local->hw, tx_ant, rx_ant); trace_drv_set_antenna(local, tx_ant, rx_ant, ret); @@ -692,6 +762,7 @@ { int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (local->ops->get_antenna) ret = local->ops->get_antenna(&local->hw, tx_ant, rx_ant); trace_drv_get_antenna(local, *tx_ant, *rx_ant, ret); @@ -707,6 +778,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_remain_on_channel(local, sdata, chan, duration, type); ret = local->ops->remain_on_channel(&local->hw, &sdata->vif, @@ -723,6 +795,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_cancel_remain_on_channel(local, sdata); ret = local->ops->cancel_remain_on_channel(&local->hw, &sdata->vif); @@ -737,6 +810,7 @@ int ret = -ENOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_set_ringparam(local, tx, rx); if (local->ops->set_ringparam) @@ -750,6 +824,7 @@ u32 *tx, u32 *tx_max, u32 *rx, u32 *rx_max) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_get_ringparam(local, tx, tx_max, rx, rx_max); if (local->ops->get_ringparam) @@ -762,6 +837,7 @@ bool ret = false; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_tx_frames_pending(local); if (local->ops->tx_frames_pending) @@ -778,6 +854,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -795,6 +872,9 @@ struct ieee80211_sub_if_data *sdata, struct cfg80211_gtk_rekey_data *data) { + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return; @@ -849,11 +929,13 @@ struct ieee80211_prep_tx_info *info) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION); + info->link_id = info->link_id < 0 ? 0 : info->link_id; trace_drv_mgd_prepare_tx(local, sdata, info->duration, info->subtype, info->success); if (local->ops->mgd_prepare_tx) @@ -866,6 +948,7 @@ struct ieee80211_prep_tx_info *info) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -880,17 +963,22 @@ static inline void drv_mgd_protect_tdls_discover(struct ieee80211_local *local, - struct ieee80211_sub_if_data *sdata) + struct ieee80211_sub_if_data *sdata, + int link_id) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; WARN_ON_ONCE(sdata->vif.type != NL80211_IFTYPE_STATION); + link_id = link_id > 0 ? link_id : 0; + trace_drv_mgd_protect_tdls_discover(local, sdata); if (local->ops->mgd_protect_tdls_discover) - local->ops->mgd_protect_tdls_discover(&local->hw, &sdata->vif); + local->ops->mgd_protect_tdls_discover(&local->hw, &sdata->vif, + link_id); trace_drv_return_void(local); } @@ -900,6 +988,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_add_chanctx(local, ctx); if (local->ops->add_chanctx) @@ -915,6 +1004,7 @@ struct ieee80211_chanctx *ctx) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(!ctx->driver_present)) return; @@ -931,6 +1021,7 @@ u32 changed) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_change_chanctx(local, ctx, changed); if (local->ops->change_chanctx) { @@ -940,14 +1031,6 @@ trace_drv_return_void(local); } -static inline void drv_verify_link_exists(struct ieee80211_sub_if_data *sdata, - struct ieee80211_bss_conf *link_conf) -{ - /* deflink always exists, so need to check only for other links */ - if (sdata->deflink.conf != link_conf) - sdata_assert_lock(sdata); -} - int drv_assign_vif_chanctx(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, struct ieee80211_bss_conf *link_conf, @@ -966,10 +1049,8 @@ { int ret = 0; - /* make sure link_conf is protected */ - drv_verify_link_exists(sdata, link_conf); - might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -985,8 +1066,8 @@ struct ieee80211_sub_if_data *sdata, struct ieee80211_bss_conf *link_conf) { - /* make sure link_conf is protected */ - drv_verify_link_exists(sdata, link_conf); + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1002,6 +1083,7 @@ enum ieee80211_reconfig_type reconfig_type) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); trace_drv_reconfig_complete(local, reconfig_type); if (local->ops->reconfig_complete) @@ -1014,6 +1096,9 @@ struct ieee80211_sub_if_data *sdata, int key_idx) { + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return; @@ -1044,6 +1129,9 @@ { struct ieee80211_local *local = sdata->local; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (local->ops->channel_switch_beacon) { trace_drv_channel_switch_beacon(local, sdata, chandef); local->ops->channel_switch_beacon(&local->hw, &sdata->vif, @@ -1058,6 +1146,9 @@ struct ieee80211_local *local = sdata->local; int ret = 0; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return -EIO; @@ -1070,17 +1161,22 @@ } static inline int -drv_post_channel_switch(struct ieee80211_sub_if_data *sdata) +drv_post_channel_switch(struct ieee80211_link_data *link) { + struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; int ret = 0; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return -EIO; trace_drv_post_channel_switch(local, sdata); if (local->ops->post_channel_switch) - ret = local->ops->post_channel_switch(&local->hw, &sdata->vif); + ret = local->ops->post_channel_switch(&local->hw, &sdata->vif, + link->conf); trace_drv_return_int(local, ret); return ret; } @@ -1090,6 +1186,9 @@ { struct ieee80211_local *local = sdata->local; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return; @@ -1105,6 +1204,9 @@ { struct ieee80211_local *local = sdata->local; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) return; @@ -1120,6 +1222,7 @@ int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -1134,6 +1237,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1161,6 +1265,9 @@ { int ret; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!local->ops->get_txpower) return -EOPNOTSUPP; @@ -1180,6 +1287,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -1200,6 +1308,7 @@ struct ieee80211_sta *sta) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1265,6 +1374,11 @@ { u32 ret = -EOPNOTSUPP; + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); + if (!check_sdata_in_driver(sdata)) + return -EIO; + if (local->ops->get_ftm_responder_stats) ret = local->ops->get_ftm_responder_stats(&local->hw, &sdata->vif, @@ -1281,6 +1395,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return -EIO; @@ -1300,6 +1415,7 @@ trace_drv_abort_pmsr(local, sdata); might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1315,6 +1431,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); check_sdata_in_driver(sdata); trace_drv_start_nan(local, sdata, conf); @@ -1327,6 +1444,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); check_sdata_in_driver(sdata); trace_drv_stop_nan(local, sdata); @@ -1342,6 +1460,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); check_sdata_in_driver(sdata); if (!local->ops->nan_change_conf) @@ -1362,6 +1481,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); check_sdata_in_driver(sdata); if (!local->ops->add_nan_func) @@ -1379,6 +1499,7 @@ u8 instance_id) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); check_sdata_in_driver(sdata); trace_drv_del_nan_func(local, sdata, instance_id); @@ -1395,6 +1516,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); ret = local->ops->set_tid_config(&local->hw, &sdata->vif, sta, tid_conf); trace_drv_return_int(local, ret); @@ -1409,6 +1531,7 @@ int ret; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); ret = local->ops->reset_tid_config(&local->hw, &sdata->vif, sta, tids); trace_drv_return_int(local, ret); @@ -1419,6 +1542,7 @@ struct ieee80211_sub_if_data *sdata) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); check_sdata_in_driver(sdata); if (!local->ops->update_vif_offload) @@ -1434,6 +1558,9 @@ struct ieee80211_sta *sta, bool enabled) { sdata = get_bss_sdata(sdata); + + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1449,6 +1576,9 @@ bool enabled) { sdata = get_bss_sdata(sdata); + + might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1467,6 +1597,7 @@ struct ieee80211_twt_params *twt_agrt; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1484,6 +1615,7 @@ u8 flowid) { might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); if (!check_sdata_in_driver(sdata)) return; @@ -1524,6 +1656,8 @@ { int ret = -EOPNOTSUPP; + might_sleep(); + sdata = get_bss_sdata(sdata); trace_drv_net_setup_tc(local, sdata, type); if (local->ops->net_setup_tc) diff -ruw linux-6.4/net/mac80211/drop.h linux-6.4-fbx/net/mac80211/drop.h --- linux-6.4/net/mac80211/drop.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/drop.h 2024-04-22 13:40:53.015943280 +0200 @@ -18,9 +18,54 @@ /* this line for the trailing \ - add before this */ #define MAC80211_DROP_REASONS_UNUSABLE(R) \ + /* 0x00 == ___RX_DROP_UNUSABLE */ \ R(RX_DROP_U_MIC_FAIL) \ R(RX_DROP_U_REPLAY) \ R(RX_DROP_U_BAD_MMIE) \ + R(RX_DROP_U_DUP) \ + R(RX_DROP_U_SPURIOUS) \ + R(RX_DROP_U_DECRYPT_FAIL) \ + R(RX_DROP_U_NO_KEY_ID) \ + R(RX_DROP_U_BAD_CIPHER) \ + R(RX_DROP_U_OOM) \ + R(RX_DROP_U_NONSEQ_PN) \ + R(RX_DROP_U_BAD_KEY_COLOR) \ + R(RX_DROP_U_BAD_4ADDR) \ + R(RX_DROP_U_BAD_AMSDU) \ + R(RX_DROP_U_BAD_AMSDU_CIPHER) \ + R(RX_DROP_U_INVALID_8023) \ + /* 0x10 */ \ + R(RX_DROP_U_RUNT_ACTION) \ + R(RX_DROP_U_UNPROT_ACTION) \ + R(RX_DROP_U_UNPROT_DUAL) \ + R(RX_DROP_U_UNPROT_UCAST_MGMT) \ + R(RX_DROP_U_UNPROT_MCAST_MGMT) \ + R(RX_DROP_U_UNPROT_BEACON) \ + R(RX_DROP_U_UNPROT_UNICAST_PUB_ACTION) \ + R(RX_DROP_U_UNPROT_ROBUST_ACTION) \ + R(RX_DROP_U_ACTION_UNKNOWN_SRC) \ + R(RX_DROP_U_REJECTED_ACTION_RESPONSE) \ + R(RX_DROP_U_EXPECT_DEFRAG_PROT) \ + R(RX_DROP_U_WEP_DEC_FAIL) \ + R(RX_DROP_U_NO_IV) \ + R(RX_DROP_U_NO_ICV) \ + R(RX_DROP_U_AP_RX_GROUPCAST) \ + R(RX_DROP_U_SHORT_MMIC) \ + /* 0x20 */ \ + R(RX_DROP_U_MMIC_FAIL) \ + R(RX_DROP_U_SHORT_TKIP) \ + R(RX_DROP_U_TKIP_FAIL) \ + R(RX_DROP_U_SHORT_CCMP) \ + R(RX_DROP_U_SHORT_CCMP_MIC) \ + R(RX_DROP_U_SHORT_GCMP) \ + R(RX_DROP_U_SHORT_GCMP_MIC) \ + R(RX_DROP_U_SHORT_CMAC) \ + R(RX_DROP_U_SHORT_CMAC256) \ + R(RX_DROP_U_SHORT_GMAC) \ + R(RX_DROP_U_UNEXPECTED_VLAN_4ADDR) \ + R(RX_DROP_U_UNEXPECTED_STA_4ADDR) \ + R(RX_DROP_U_UNEXPECTED_VLAN_MCAST) \ + R(RX_DROP_U_NOT_PORT_CONTROL) \ /* this line for the trailing \ - add before this */ /* having two enums allows for checking ieee80211_rx_result use with sparse */ @@ -46,11 +91,13 @@ RX_CONTINUE = (__force ieee80211_rx_result)___RX_CONTINUE, RX_QUEUED = (__force ieee80211_rx_result)___RX_QUEUED, RX_DROP_MONITOR = (__force ieee80211_rx_result)___RX_DROP_MONITOR, - RX_DROP_UNUSABLE = (__force ieee80211_rx_result)___RX_DROP_UNUSABLE, #define DEF(x) x = (__force ieee80211_rx_result)___ ## x, MAC80211_DROP_REASONS_MONITOR(DEF) MAC80211_DROP_REASONS_UNUSABLE(DEF) #undef DEF }; +#define RX_RES_IS_UNUSABLE(result) \ + (((__force u32)(result) & SKB_DROP_REASON_SUBSYS_MASK) == ___RX_DROP_UNUSABLE) + #endif /* MAC80211_DROP_H */ diff -ruw linux-6.4/net/mac80211/eht.c linux-6.4-fbx/net/mac80211/eht.c --- linux-6.4/net/mac80211/eht.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/eht.c 2024-04-22 13:40:53.015943280 +0200 @@ -2,7 +2,7 @@ /* * EHT handling * - * Copyright(c) 2021-2022 Intel Corporation + * Copyright(c) 2021-2023 Intel Corporation */ #include "ieee80211_i.h" @@ -25,8 +25,7 @@ memset(eht_cap, 0, sizeof(*eht_cap)); if (!eht_cap_ie_elem || - !ieee80211_get_eht_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif))) + !ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif)) return; mcs_nss_size = ieee80211_eht_mcs_nss_size(he_cap_ie_elem, @@ -76,4 +75,5 @@ link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta); link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); + link_sta->pub->sta_max_bandwidth = link_sta->cur_max_bandwidth; } diff -ruw linux-6.4/net/mac80211/ethtool.c linux-6.4-fbx/net/mac80211/ethtool.c --- linux-6.4/net/mac80211/ethtool.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/ethtool.c 2024-04-22 13:40:53.015943280 +0200 @@ -5,7 +5,7 @@ * Copied from cfg.c - originally * Copyright 2006-2010 Johannes Berg * Copyright 2014 Intel Corporation (Author: Johannes Berg) - * Copyright (C) 2018, 2022 Intel Corporation + * Copyright (C) 2018, 2022-2023 Intel Corporation */ #include #include @@ -19,11 +19,16 @@ struct netlink_ext_ack *extack) { struct ieee80211_local *local = wiphy_priv(dev->ieee80211_ptr->wiphy); + int ret; if (rp->rx_mini_pending != 0 || rp->rx_jumbo_pending != 0) return -EINVAL; - return drv_set_ringparam(local, rp->tx_pending, rp->rx_pending); + wiphy_lock(local->hw.wiphy); + ret = drv_set_ringparam(local, rp->tx_pending, rp->rx_pending); + wiphy_unlock(local->hw.wiphy); + + return ret; } static void ieee80211_get_ringparam(struct net_device *dev, @@ -35,8 +40,10 @@ memset(rp, 0, sizeof(*rp)); + wiphy_lock(local->hw.wiphy); drv_get_ringparam(local, &rp->tx_pending, &rp->tx_max_pending, &rp->rx_pending, &rp->rx_max_pending); + wiphy_unlock(local->hw.wiphy); } static const char ieee80211_gstrings_sta_stats[][ETH_GSTRING_LEN] = { @@ -50,6 +57,22 @@ }; #define STA_STATS_LEN ARRAY_SIZE(ieee80211_gstrings_sta_stats) +struct ethtool_priv_flags_strings { + const char string[ETH_GSTRING_LEN]; +}; + +enum { + POWERED_SUPPORTED = (1 << 0), + POWERED_STATUS = (1 << 1), + POWERED_CHANGE_BUSY = (1 << 2), +}; + +static const struct ethtool_priv_flags_strings ieee80211_pflags_strings[] = { + { .string = "powered-supported" }, + { .string = "powered-status" }, + { .string = "powered-change-busy", }, +}; + static int ieee80211_get_sset_count(struct net_device *dev, int sset) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); @@ -60,6 +83,9 @@ rv += drv_get_et_sset_count(sdata, sset); + if (sset == ETH_SS_PRIV_FLAGS) + rv += ARRAY_SIZE(ieee80211_pflags_strings); + if (rv == 0) return -EOPNOTSUPP; return rv; @@ -102,7 +128,7 @@ * network device. */ - mutex_lock(&local->sta_mtx); + wiphy_lock(local->hw.wiphy); if (sdata->vif.type == NL80211_IFTYPE_STATION) { sta = sta_info_get_bss(sdata, sdata->deflink.u.mgd.bssid); @@ -198,12 +224,13 @@ else data[i++] = -1LL; - mutex_unlock(&local->sta_mtx); - - if (WARN_ON(i != STA_STATS_LEN)) + if (WARN_ON(i != STA_STATS_LEN)) { + wiphy_unlock(local->hw.wiphy); return; + } drv_get_et_stats(sdata, stats, &(data[STA_STATS_LEN])); + wiphy_unlock(local->hw.wiphy); } static void ieee80211_get_strings(struct net_device *dev, u32 sset, u8 *data) @@ -216,6 +243,9 @@ memcpy(data, ieee80211_gstrings_sta_stats, sz_sta_stats); } drv_get_et_strings(sdata, sset, &(data[sz_sta_stats])); + if (sset == ETH_SS_PRIV_FLAGS) + memcpy(data, ieee80211_pflags_strings, + sizeof (ieee80211_pflags_strings)); } static int ieee80211_get_regs_len(struct net_device *dev) @@ -233,6 +263,35 @@ regs->len = 0; } +static u32 ieee80211_get_priv_flags(struct net_device *dev) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_local *local = sdata->local; + bool powered, powered_busy; + u32 ret; + + ret = 0; + if (!drv_get_powered(local, &powered, &powered_busy)) { + ret |= POWERED_SUPPORTED; + if (powered) + ret |= POWERED_STATUS; + if (powered_busy) + ret |= POWERED_CHANGE_BUSY; + } + return ret; +} + +static int ieee80211_set_priv_flags(struct net_device *dev, u32 flags) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_local *local = sdata->local; + + if (flags & (POWERED_STATUS)) + return drv_set_powered(local); + + return 0; +} + const struct ethtool_ops ieee80211_ethtool_ops = { .get_drvinfo = cfg80211_get_drvinfo, .get_regs_len = ieee80211_get_regs_len, @@ -243,4 +302,6 @@ .get_strings = ieee80211_get_strings, .get_ethtool_stats = ieee80211_get_stats, .get_sset_count = ieee80211_get_sset_count, + .set_priv_flags = ieee80211_set_priv_flags, + .get_priv_flags = ieee80211_get_priv_flags, }; diff -ruw linux-6.4/net/mac80211/fils_aead.c linux-6.4-fbx/net/mac80211/fils_aead.c --- linux-6.4/net/mac80211/fils_aead.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/fils_aead.c 2024-04-22 13:40:53.015943280 +0200 @@ -5,9 +5,9 @@ */ #include -#include #include #include +#include #include "ieee80211_i.h" #include "aes_cmac.h" diff -ruw linux-6.4/net/mac80211/he.c linux-6.4-fbx/net/mac80211/he.c --- linux-6.4/net/mac80211/he.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/he.c 2024-04-22 13:40:53.015943280 +0200 @@ -128,8 +128,7 @@ return; own_he_cap_ptr = - ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); if (!own_he_cap_ptr) return; @@ -163,6 +162,7 @@ link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta); link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); + link_sta->pub->sta_max_bandwidth = link_sta->cur_max_bandwidth; if (sband->band == NL80211_BAND_6GHZ && he_6ghz_capa) ieee80211_update_from_he_6ghz_capa(he_6ghz_capa, link_sta); diff -ruw linux-6.4/net/mac80211/ht.c linux-6.4-fbx/net/mac80211/ht.c --- linux-6.4/net/mac80211/ht.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/ht.c 2024-04-22 13:40:53.015943280 +0200 @@ -9,7 +9,7 @@ * Copyright 2007, Michael Wu * Copyright 2007-2010, Intel Corporation * Copyright 2017 Intel Deutschland GmbH - * Copyright(c) 2020-2022 Intel Corporation + * Copyright(c) 2020-2023 Intel Corporation */ #include @@ -282,6 +282,7 @@ link_sta->cur_max_bandwidth = ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 ? IEEE80211_STA_RX_BW_40 : IEEE80211_STA_RX_BW_20; + link_sta->pub->sta_max_bandwidth = link_sta->cur_max_bandwidth; if (sta->sdata->vif.type == NL80211_IFTYPE_AP || sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { @@ -316,16 +317,16 @@ { int i; - mutex_lock(&sta->ampdu_mlme.mtx); + lockdep_assert_wiphy(sta->local->hw.wiphy); + for (i = 0; i < IEEE80211_NUM_TIDS; i++) - ___ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT, + __ieee80211_stop_rx_ba_session(sta, i, WLAN_BACK_RECIPIENT, WLAN_REASON_QSTA_LEAVE_QBSS, reason != AGG_STOP_DESTROY_STA && reason != AGG_STOP_PEER_REQUEST); for (i = 0; i < IEEE80211_NUM_TIDS; i++) - ___ieee80211_stop_tx_ba_session(sta, i, reason); - mutex_unlock(&sta->ampdu_mlme.mtx); + __ieee80211_stop_tx_ba_session(sta, i, reason); /* * In case the tear down is part of a reconfigure due to HW restart @@ -333,9 +334,8 @@ * the BA session, so handle it to properly clean tid_tx data. */ if(reason == AGG_STOP_DESTROY_STA) { - cancel_work_sync(&sta->ampdu_mlme.work); + wiphy_work_cancel(sta->local->hw.wiphy, &sta->ampdu_mlme.work); - mutex_lock(&sta->ampdu_mlme.mtx); for (i = 0; i < IEEE80211_NUM_TIDS; i++) { struct tid_ampdu_tx *tid_tx = rcu_dereference_protected_tid_tx(sta, i); @@ -346,11 +346,10 @@ if (test_and_clear_bit(HT_AGG_STATE_STOP_CB, &tid_tx->state)) ieee80211_stop_tx_ba_cb(sta, i, tid_tx); } - mutex_unlock(&sta->ampdu_mlme.mtx); } } -void ieee80211_ba_session_work(struct work_struct *work) +void ieee80211_ba_session_work(struct wiphy *wiphy, struct wiphy_work *work) { struct sta_info *sta = container_of(work, struct sta_info, ampdu_mlme.work); @@ -358,32 +357,33 @@ bool blocked; int tid; + lockdep_assert_wiphy(sta->local->hw.wiphy); + /* When this flag is set, new sessions should be blocked. */ blocked = test_sta_flag(sta, WLAN_STA_BLOCK_BA); - mutex_lock(&sta->ampdu_mlme.mtx); for (tid = 0; tid < IEEE80211_NUM_TIDS; tid++) { if (test_and_clear_bit(tid, sta->ampdu_mlme.tid_rx_timer_expired)) - ___ieee80211_stop_rx_ba_session( + __ieee80211_stop_rx_ba_session( sta, tid, WLAN_BACK_RECIPIENT, WLAN_REASON_QSTA_TIMEOUT, true); if (test_and_clear_bit(tid, sta->ampdu_mlme.tid_rx_stop_requested)) - ___ieee80211_stop_rx_ba_session( + __ieee80211_stop_rx_ba_session( sta, tid, WLAN_BACK_RECIPIENT, WLAN_REASON_UNSPECIFIED, true); if (!blocked && test_and_clear_bit(tid, sta->ampdu_mlme.tid_rx_manage_offl)) - ___ieee80211_start_rx_ba_session(sta, 0, 0, 0, 1, tid, + __ieee80211_start_rx_ba_session(sta, 0, 0, 0, 1, tid, IEEE80211_MAX_AMPDU_BUF_HT, false, true, NULL); if (test_and_clear_bit(tid + IEEE80211_NUM_TIDS, sta->ampdu_mlme.tid_rx_manage_offl)) - ___ieee80211_stop_rx_ba_session( + __ieee80211_stop_rx_ba_session( sta, tid, WLAN_BACK_RECIPIENT, 0, false); @@ -414,9 +414,7 @@ */ synchronize_net(); - mutex_unlock(&sta->ampdu_mlme.mtx); - - ieee80211_queue_work(&sdata->local->hw, work); + wiphy_work_queue(sdata->local->hw.wiphy, work); return; } @@ -448,12 +446,11 @@ test_and_clear_bit(HT_AGG_STATE_START_CB, &tid_tx->state)) ieee80211_start_tx_ba_cb(sta, tid, tid_tx); if (test_and_clear_bit(HT_AGG_STATE_WANT_STOP, &tid_tx->state)) - ___ieee80211_stop_tx_ba_session(sta, tid, + __ieee80211_stop_tx_ba_session(sta, tid, AGG_STOP_LOCAL_REQUEST); if (test_and_clear_bit(HT_AGG_STATE_STOP_CB, &tid_tx->state)) ieee80211_stop_tx_ba_cb(sta, tid, tid_tx); } - mutex_unlock(&sta->ampdu_mlme.mtx); } void ieee80211_send_delba(struct ieee80211_sub_if_data *sdata, @@ -538,11 +535,13 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata, enum ieee80211_smps_mode smps, const u8 *da, - const u8 *bssid) + const u8 *bssid, int link_id) { struct ieee80211_local *local = sdata->local; struct sk_buff *skb; struct ieee80211_mgmt *action_frame; + struct ieee80211_tx_info *info; + u8 status_link_id = link_id < 0 ? 0 : link_id; /* 27 = header + category + action + smps mode */ skb = dev_alloc_skb(27 + local->hw.extra_tx_headroom); @@ -562,6 +561,7 @@ case IEEE80211_SMPS_AUTOMATIC: case IEEE80211_SMPS_NUM_MODES: WARN_ON(1); + smps = IEEE80211_SMPS_OFF; fallthrough; case IEEE80211_SMPS_OFF: action_frame->u.action.u.ht_smps.smps_control = @@ -578,8 +578,13 @@ } /* we'll do more on status of this frame */ - IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; - ieee80211_tx_skb(sdata, skb); + info = IEEE80211_SKB_CB(skb); + info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; + /* we have 12 bits, and need 6: link_id 4, smps 2 */ + info->status_data = IEEE80211_STATUS_TYPE_SMPS | + u16_encode_bits(status_link_id << 2 | smps, + IEEE80211_STATUS_SUBDATA_MASK); + ieee80211_tx_skb_tid(sdata, skb, 7, link_id); return 0; } @@ -602,7 +607,8 @@ goto out; link->u.mgd.driver_smps_mode = smps_mode; - ieee80211_queue_work(&sdata->local->hw, &link->u.mgd.request_smps_work); + wiphy_work_queue(sdata->local->hw.wiphy, + &link->u.mgd.request_smps_work); out: rcu_read_unlock(); } diff -ruw linux-6.4/net/mac80211/ibss.c linux-6.4-fbx/net/mac80211/ibss.c --- linux-6.4/net/mac80211/ibss.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/ibss.c 2024-04-22 13:40:53.015943280 +0200 @@ -9,7 +9,7 @@ * Copyright 2009, Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright(c) 2016 Intel Deutschland GmbH - * Copyright(c) 2018-2022 Intel Corporation + * Copyright(c) 2018-2023 Intel Corporation */ #include @@ -51,7 +51,6 @@ u32 rate_flags, rates = 0, rates_added = 0; struct beacon_data *presp; int frame_len; - int shift; /* Build IBSS probe response */ frame_len = sizeof(struct ieee80211_hdr_3addr) + @@ -92,7 +91,6 @@ sband = local->hw.wiphy->bands[chandef->chan->band]; rate_flags = ieee80211_chandef_rate_flags(chandef); - shift = ieee80211_chandef_get_shift(chandef); rates_n = 0; if (have_higher_than_11mbit) *have_higher_than_11mbit = false; @@ -111,8 +109,7 @@ *pos++ = WLAN_EID_SUPP_RATES; *pos++ = min_t(int, 8, rates_n); for (ri = 0; ri < sband->n_bitrates; ri++) { - int rate = DIV_ROUND_UP(sband->bitrates[ri].bitrate, - 5 * (1 << shift)); + int rate = DIV_ROUND_UP(sband->bitrates[ri].bitrate, 5); u8 basic = 0; if (!(rates & BIT(ri))) continue; @@ -155,8 +152,7 @@ *pos++ = WLAN_EID_EXT_SUPP_RATES; *pos++ = rates_n - 8; for (; ri < sband->n_bitrates; ri++) { - int rate = DIV_ROUND_UP(sband->bitrates[ri].bitrate, - 5 * (1 << shift)); + int rate = DIV_ROUND_UP(sband->bitrates[ri].bitrate, 5); u8 basic = 0; if (!(rates & BIT(ri))) continue; @@ -226,7 +222,7 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_mgmt *mgmt; struct cfg80211_bss *bss; - u32 bss_change; + u64 bss_change; struct cfg80211_chan_def chandef; struct ieee80211_channel *chan; struct beacon_data *presp; @@ -235,7 +231,7 @@ bool radar_required; int err; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); /* Reset own TSF to allow time synchronization work. */ drv_reset_tsf(local, sdata); @@ -299,17 +295,14 @@ radar_required = err; - mutex_lock(&local->mtx); if (ieee80211_link_use_channel(&sdata->deflink, &chandef, ifibss->fixed_channel ? IEEE80211_CHANCTX_SHARED : IEEE80211_CHANCTX_EXCLUSIVE)) { sdata_info(sdata, "Failed to join IBSS, no channel context\n"); - mutex_unlock(&local->mtx); return; } sdata->deflink.radar_required = radar_required; - mutex_unlock(&local->mtx); memcpy(ifibss->bssid, bssid, ETH_ALEN); @@ -367,9 +360,7 @@ sdata->vif.cfg.ssid_len = 0; RCU_INIT_POINTER(ifibss->presp, NULL); kfree_rcu(presp, rcu_head); - mutex_lock(&local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&local->mtx); sdata_info(sdata, "Failed to join IBSS, driver failure: %d\n", err); return; @@ -382,7 +373,6 @@ round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL)); bss_meta.chan = chan; - bss_meta.scan_width = cfg80211_chandef_to_scan_width(&chandef); bss = cfg80211_inform_bss_frame_data(local->hw.wiphy, &bss_meta, mgmt, presp->head_len, GFP_KERNEL); @@ -405,9 +395,8 @@ enum nl80211_channel_type chan_type; u64 tsf; u32 rate_flags; - int shift; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (beacon_int < 10) beacon_int = 10; @@ -440,7 +429,6 @@ sband = sdata->local->hw.wiphy->bands[cbss->channel->band]; rate_flags = ieee80211_chandef_rate_flags(&sdata->u.ibss.chandef); - shift = ieee80211_vif_get_shift(&sdata->vif); basic_rates = 0; @@ -454,8 +442,7 @@ != rate_flags) continue; - brate = DIV_ROUND_UP(sband->bitrates[j].bitrate, - 5 * (1 << shift)); + brate = DIV_ROUND_UP(sband->bitrates[j].bitrate, 5); if (brate == rate) { if (is_basic) basic_rates |= BIT(j); @@ -478,7 +465,8 @@ } int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata, - struct cfg80211_csa_settings *csa_settings) + struct cfg80211_csa_settings *csa_settings, + u64 *changed) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct beacon_data *presp, *old_presp; @@ -487,7 +475,7 @@ u16 capability = WLAN_CAPABILITY_IBSS; u64 tsf; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (ifibss->privacy) capability |= WLAN_CAPABILITY_PRIVACY; @@ -520,15 +508,16 @@ if (old_presp) kfree_rcu(old_presp, rcu_head); - return BSS_CHANGED_BEACON; + *changed |= BSS_CHANGED_BEACON; + return 0; } -int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) +int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata, u64 *changed) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct cfg80211_bss *cbss; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); /* When not connected/joined, sending CSA doesn't make sense. */ if (ifibss->state != IEEE80211_IBSS_MLME_JOINED) @@ -552,14 +541,15 @@ ifibss->chandef = sdata->deflink.csa_chandef; /* generate the beacon */ - return ieee80211_ibss_csa_beacon(sdata, NULL); + return ieee80211_ibss_csa_beacon(sdata, NULL, changed); } void ieee80211_ibss_stop(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; - cancel_work_sync(&ifibss->csa_connection_drop_work); + wiphy_work_cancel(sdata->local->hw.wiphy, + &ifibss->csa_connection_drop_work); } static struct sta_info *ieee80211_ibss_finish_sta(struct sta_info *sta) @@ -597,7 +587,6 @@ struct sta_info *sta; struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_supported_band *sband; - enum nl80211_bss_scan_width scan_width; int band; /* @@ -626,7 +615,6 @@ if (WARN_ON_ONCE(!chanctx_conf)) return NULL; band = chanctx_conf->def.chan->band; - scan_width = cfg80211_chandef_to_scan_width(&chanctx_conf->def); rcu_read_unlock(); sta = sta_info_alloc(sdata, addr, GFP_KERNEL); @@ -638,7 +626,7 @@ /* make sure mandatory rates are always added */ sband = local->hw.wiphy->bands[band]; sta->sta.deflink.supp_rates[band] = supp_rates | - ieee80211_mandatory_rates(sband, scan_width); + ieee80211_mandatory_rates(sband); return ieee80211_ibss_finish_sta(sta); } @@ -649,7 +637,7 @@ int active = 0; struct sta_info *sta; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); rcu_read_lock(); @@ -677,6 +665,8 @@ struct beacon_data *presp; struct sta_info *sta; + lockdep_assert_wiphy(local->hw.wiphy); + if (!is_zero_ether_addr(ifibss->bssid)) { cbss = cfg80211_get_bss(local->hw.wiphy, ifibss->chandef.chan, ifibss->bssid, ifibss->ssid, @@ -723,27 +713,22 @@ ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED | BSS_CHANGED_IBSS); drv_leave_ibss(local, sdata); - mutex_lock(&local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&local->mtx); } -static void ieee80211_csa_connection_drop_work(struct work_struct *work) +static void ieee80211_csa_connection_drop_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, u.ibss.csa_connection_drop_work); - sdata_lock(sdata); - ieee80211_ibss_disconnect(sdata); synchronize_rcu(); skb_queue_purge(&sdata->skb_queue); /* trigger a scan to find another IBSS network to join */ - ieee80211_queue_work(&sdata->local->hw, &sdata->work); - - sdata_unlock(sdata); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } static void ieee80211_ibss_csa_mark_radar(struct ieee80211_sub_if_data *sdata) @@ -775,7 +760,7 @@ ieee80211_conn_flags_t conn_flags; u32 vht_cap_info = 0; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); conn_flags = IEEE80211_CONN_DISABLE_VHT; @@ -894,7 +879,7 @@ return true; disconnect: ibss_dbg(sdata, "Can't handle channel switch, disconnect\n"); - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &ifibss->csa_connection_drop_work); ieee80211_ibss_csa_mark_radar(sdata); @@ -947,7 +932,7 @@ { u16 auth_alg, auth_transaction; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (len < 24 + 6) return; @@ -980,7 +965,6 @@ { struct sta_info *sta; enum nl80211_band band = rx_status->band; - enum nl80211_bss_scan_width scan_width; struct ieee80211_local *local = sdata->local; struct ieee80211_supported_band *sband; bool rates_updated = false; @@ -1006,15 +990,9 @@ u32 prev_rates; prev_rates = sta->sta.deflink.supp_rates[band]; - /* make sure mandatory rates are always added */ - scan_width = NL80211_BSS_CHAN_WIDTH_20; - if (rx_status->bw == RATE_INFO_BW_5) - scan_width = NL80211_BSS_CHAN_WIDTH_5; - else if (rx_status->bw == RATE_INFO_BW_10) - scan_width = NL80211_BSS_CHAN_WIDTH_10; sta->sta.deflink.supp_rates[band] = supp_rates | - ieee80211_mandatory_rates(sband, scan_width); + ieee80211_mandatory_rates(sband); if (sta->sta.deflink.supp_rates[band] != prev_rates) { ibss_dbg(sdata, "updated supp_rates set for %pM based on beacon/probe_resp (0x%x -> 0x%x)\n", @@ -1068,7 +1046,7 @@ &chandef); memcpy(&cap_ie, elems->vht_cap_elem, sizeof(cap_ie)); ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband, - &cap_ie, + &cap_ie, NULL, &sta->deflink); if (memcmp(&cap, &sta->sta.deflink.vht_cap, sizeof(cap))) rates_updated |= true; @@ -1201,7 +1179,6 @@ struct sta_info *sta; struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_supported_band *sband; - enum nl80211_bss_scan_width scan_width; int band; /* @@ -1227,7 +1204,6 @@ return; } band = chanctx_conf->def.chan->band; - scan_width = cfg80211_chandef_to_scan_width(&chanctx_conf->def); rcu_read_unlock(); sta = sta_info_alloc(sdata, addr, GFP_ATOMIC); @@ -1237,12 +1213,12 @@ /* make sure mandatory rates are always added */ sband = local->hw.wiphy->bands[band]; sta->sta.deflink.supp_rates[band] = supp_rates | - ieee80211_mandatory_rates(sband, scan_width); + ieee80211_mandatory_rates(sband); spin_lock(&ifibss->incomplete_lock); list_add(&sta->list, &ifibss->incomplete_stations); spin_unlock(&ifibss->incomplete_lock); - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); } static void ieee80211_ibss_sta_expire(struct ieee80211_sub_if_data *sdata) @@ -1253,7 +1229,7 @@ unsigned long exp_time = IEEE80211_IBSS_INACTIVITY_LIMIT; unsigned long exp_rsn = IEEE80211_IBSS_RSN_INACTIVITY_LIMIT; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry_safe(sta, tmp, &local->sta_list, list) { unsigned long last_active = ieee80211_sta_last_active(sta); @@ -1278,8 +1254,6 @@ WARN_ON(__sta_info_destroy(sta)); } } - - mutex_unlock(&local->sta_mtx); } /* @@ -1289,9 +1263,8 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; - enum nl80211_bss_scan_width scan_width; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); mod_timer(&ifibss->timer, round_jiffies(jiffies + IEEE80211_IBSS_MERGE_INTERVAL)); @@ -1311,9 +1284,8 @@ sdata_info(sdata, "No active IBSS STAs - trying to scan for other IBSS networks with same SSID (merge)\n"); - scan_width = cfg80211_chandef_to_scan_width(&ifibss->chandef); ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len, - NULL, 0, scan_width); + NULL, 0); } static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) @@ -1323,7 +1295,7 @@ u16 capability; int i; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (ifibss->fixed_bssid) { memcpy(bssid, ifibss->bssid, ETH_ALEN); @@ -1403,6 +1375,9 @@ case NL80211_CHAN_WIDTH_160: width = 160; break; + case NL80211_CHAN_WIDTH_320: + width = 320; + break; default: width = 20; break; @@ -1431,10 +1406,9 @@ struct cfg80211_bss *cbss; struct ieee80211_channel *chan = NULL; const u8 *bssid = NULL; - enum nl80211_bss_scan_width scan_width; int active_ibss; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); active_ibss = ieee80211_sta_active_ibss(sdata); ibss_dbg(sdata, "sta_find_ibss (active_ibss=%d)\n", active_ibss); @@ -1490,8 +1464,6 @@ sdata_info(sdata, "Trigger new scan to find an IBSS to join\n"); - scan_width = cfg80211_chandef_to_scan_width(&ifibss->chandef); - if (ifibss->fixed_channel) { num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy, &ifibss->chandef, @@ -1499,11 +1471,10 @@ ARRAY_SIZE(channels)); ieee80211_request_ibss_scan(sdata, ifibss->ssid, ifibss->ssid_len, channels, - num, scan_width); + num); } else { ieee80211_request_ibss_scan(sdata, ifibss->ssid, - ifibss->ssid_len, NULL, - 0, scan_width); + ifibss->ssid_len, NULL, 0); } } else { int interval = IEEE80211_SCAN_INTERVAL; @@ -1528,7 +1499,7 @@ struct beacon_data *presp; u8 *pos, *end; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); presp = sdata_dereference(ifibss->presp, sdata); @@ -1624,10 +1595,8 @@ mgmt = (struct ieee80211_mgmt *) skb->data; fc = le16_to_cpu(mgmt->frame_control); - sdata_lock(sdata); - if (!sdata->u.ibss.ssid_len) - goto mgmt_out; /* not ready to merge yet */ + return; /* not ready to merge yet */ switch (fc & IEEE80211_FCTL_STYPE) { case IEEE80211_STYPE_PROBE_REQ: @@ -1667,9 +1636,6 @@ break; } } - - mgmt_out: - sdata_unlock(sdata); } void ieee80211_ibss_work(struct ieee80211_sub_if_data *sdata) @@ -1677,15 +1643,13 @@ struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; struct sta_info *sta; - sdata_lock(sdata); - /* * Work could be scheduled after scan or similar * when we aren't even joined (or trying) with a * network. */ if (!ifibss->ssid_len) - goto out; + return; spin_lock_bh(&ifibss->incomplete_lock); while (!list_empty(&ifibss->incomplete_stations)) { @@ -1711,9 +1675,6 @@ WARN_ON(1); break; } - - out: - sdata_unlock(sdata); } static void ieee80211_ibss_timer(struct timer_list *t) @@ -1721,7 +1682,7 @@ struct ieee80211_sub_if_data *sdata = from_timer(sdata, t, u.ibss.timer); - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } void ieee80211_ibss_setup_sdata(struct ieee80211_sub_if_data *sdata) @@ -1731,7 +1692,7 @@ timer_setup(&ifibss->timer, ieee80211_ibss_timer, 0); INIT_LIST_HEAD(&ifibss->incomplete_stations); spin_lock_init(&ifibss->incomplete_lock); - INIT_WORK(&ifibss->csa_connection_drop_work, + wiphy_work_init(&ifibss->csa_connection_drop_work, ieee80211_csa_connection_drop_work); } @@ -1740,7 +1701,8 @@ { struct ieee80211_sub_if_data *sdata; - mutex_lock(&local->iflist_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + list_for_each_entry(sdata, &local->interfaces, list) { if (!ieee80211_sdata_running(sdata)) continue; @@ -1748,13 +1710,12 @@ continue; sdata->u.ibss.last_scan_completed = jiffies; } - mutex_unlock(&local->iflist_mtx); } int ieee80211_ibss_join(struct ieee80211_sub_if_data *sdata, struct cfg80211_ibss_params *params) { - u32 changed = 0; + u64 changed = 0; u32 rate_flags; struct ieee80211_supported_band *sband; enum ieee80211_chanctx_mode chanmode; @@ -1763,6 +1724,8 @@ int i; int ret; + lockdep_assert_wiphy(local->hw.wiphy); + if (params->chandef.chan->freq_offset) { /* this may work, but is untested */ return -EOPNOTSUPP; @@ -1783,10 +1746,8 @@ chanmode = (params->channel_fixed && !ret) ? IEEE80211_CHANCTX_SHARED : IEEE80211_CHANCTX_EXCLUSIVE; - mutex_lock(&local->chanctx_mtx); ret = ieee80211_check_combinations(sdata, ¶ms->chandef, chanmode, radar_detect_width); - mutex_unlock(&local->chanctx_mtx); if (ret < 0) return ret; @@ -1856,7 +1817,7 @@ sdata->deflink.needed_rx_chains = local->rx_chains; sdata->control_port_over_nl80211 = params->control_port_over_nl80211; - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); return 0; } diff -ruw linux-6.4/net/mac80211/ieee80211_i.h linux-6.4-fbx/net/mac80211/ieee80211_i.h --- linux-6.4/net/mac80211/ieee80211_i.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/ieee80211_i.h 2024-04-22 13:40:53.015943280 +0200 @@ -85,6 +85,12 @@ #define IEEE80211_MAX_NAN_INSTANCE_ID 255 +enum ieee80211_status_data { + IEEE80211_STATUS_TYPE_MASK = 0x00f, + IEEE80211_STATUS_TYPE_INVALID = 0, + IEEE80211_STATUS_TYPE_SMPS = 1, + IEEE80211_STATUS_SUBDATA_MASK = 0xff0, +}; /* * Keep a station's queues on the active list for deficit accounting purposes @@ -410,6 +416,8 @@ ieee80211_conn_flags_t conn_flags; u16 status; + + bool disabled; } link[IEEE80211_MLD_MAX_NUM_LINKS]; u8 ap_addr[ETH_ALEN] __aligned(2); @@ -459,15 +467,26 @@ bool downgraded; }; +/* Advertised TID-to-link mapping info */ +struct ieee80211_adv_ttlm_info { + /* time in TUs at which the new mapping is established, or 0 if there is + * no planned advertised TID-to-link mapping + */ + u16 switch_time; + u32 duration; /* duration of the planned T2L map in TUs */ + u16 map; /* map of usable links for all TIDs */ + bool active; /* whether the advertised mapping is active or not */ +}; + DECLARE_EWMA(beacon_signal, 4, 4) struct ieee80211_if_managed { struct timer_list timer; struct timer_list conn_mon_timer; struct timer_list bcn_mon_timer; - struct work_struct monitor_work; - struct work_struct beacon_connection_loss_work; - struct work_struct csa_connection_drop_work; + struct wiphy_work monitor_work; + struct wiphy_work beacon_connection_loss_work; + struct wiphy_work csa_connection_drop_work; unsigned long beacon_timeout; unsigned long probe_timeout; @@ -528,7 +547,7 @@ /* TDLS support */ u8 tdls_peer[ETH_ALEN] __aligned(2); - struct delayed_work tdls_peer_del_work; + struct wiphy_delayed_work tdls_peer_del_work; struct sk_buff *orig_teardown_skb; /* The original teardown skb */ struct sk_buff *teardown_skb; /* A copy to send through the AP */ spinlock_t teardown_lock; /* To lock changing teardown_skb */ @@ -542,18 +561,25 @@ * on the BE queue, but there's a lot of VO traffic, we might * get stuck in a downgraded situation and flush takes forever. */ - struct delayed_work tx_tspec_wk; + struct wiphy_delayed_work tx_tspec_wk; /* Information elements from the last transmitted (Re)Association * Request frame. */ u8 *assoc_req_ies; size_t assoc_req_ies_len; + + struct wiphy_delayed_work ml_reconf_work; + u16 removed_links; + + /* TID-to-link mapping support */ + struct wiphy_delayed_work ttlm_work; + struct ieee80211_adv_ttlm_info ttlm_info; }; struct ieee80211_if_ibss { struct timer_list timer; - struct work_struct csa_connection_drop_work; + struct wiphy_work csa_connection_drop_work; unsigned long last_scan_completed; @@ -613,8 +639,9 @@ * these declarations define the interface, which enables * vendor-specific mesh synchronization * + * @rx_bcn_presp: beacon/probe response was received + * @adjust_tsf: TSF adjustment method */ -struct ieee802_11_elems; struct ieee80211_mesh_sync_ops { void (*rx_bcn_presp)(struct ieee80211_sub_if_data *sdata, u16 stype, struct ieee80211_mgmt *mgmt, unsigned int len, @@ -671,7 +698,7 @@ struct timer_list mesh_path_root_timer; unsigned long wrkq_flags; - unsigned long mbss_changed; + unsigned long mbss_changed[64 / BITS_PER_LONG]; bool userspace_handles_dfs; @@ -854,12 +881,13 @@ * struct txq_info - per tid queue * * @tin: contains packets split into multiple flows - * @def_flow: used as a fallback flow when a packet destined to @tin hashes to - * a fq_flow which is already owned by a different tin - * @def_cvars: codel vars for @def_flow + * @def_cvars: codel vars for the @tin's default_flow + * @cstats: code statistics for this queue * @frags: used to keep fragments created after dequeue * @schedule_order: used with ieee80211_local->active_txqs * @schedule_round: counter to prevent infinite loops on TXQ scheduling + * @flags: TXQ flags from &enum txq_info_flags + * @txq: the driver visible part */ struct txq_info { struct fq_tin tin; @@ -877,18 +905,30 @@ struct ieee80211_txq txq; }; +#ifdef CONFIG_FBX80211_SCUM +struct ieee80211_if_scum { + struct list_head client_list; + struct list_head next; + bool skip_mon; +}; +#endif + struct ieee80211_if_mntr { u32 flags; u8 mu_follow_addr[ETH_ALEN] __aligned(2); struct list_head list; +#ifdef CONFIG_FBX80211_SCUM + struct ieee80211_if_scum scum; +#endif }; /** * struct ieee80211_if_nan - NAN state * * @conf: current NAN configuration - * @func_ids: a bitmap of available instance_id's + * @func_lock: lock for @func_inst_ids + * @function_inst_ids: a bitmap of available instance_id's */ struct ieee80211_if_nan { struct cfg80211_nan_conf conf; @@ -918,10 +958,12 @@ bool csa_waiting_bcn; bool csa_ignored_same_chan; - struct timer_list chswitch_timer; - struct work_struct chswitch_work; + struct wiphy_delayed_work chswitch_work; + + struct wiphy_work request_smps_work; + /* used to reconfigure hardware SM PS */ + struct wiphy_work recalc_smps; - struct work_struct request_smps_work; bool beacon_crc_valid; u32 beacon_crc; struct ewma_beacon_signal ave_beacon_signal; @@ -947,6 +989,8 @@ int wmm_last_param_set; int mu_edca_last_param_set; + u8 bss_param_ch_cnt; + struct cfg80211_bss *bss; }; @@ -964,8 +1008,8 @@ struct ieee80211_sub_if_data *sdata; unsigned int link_id; - struct list_head assigned_chanctx_list; /* protected by chanctx_mtx */ - struct list_head reserved_chanctx_list; /* protected by chanctx_mtx */ + struct list_head assigned_chanctx_list; /* protected by wiphy mutex */ + struct list_head reserved_chanctx_list; /* protected by wiphy mutex */ /* multicast keys only */ struct ieee80211_key __rcu *gtk[NUM_DEFAULT_KEYS + @@ -975,18 +1019,18 @@ struct ieee80211_key __rcu *default_mgmt_key; struct ieee80211_key __rcu *default_beacon_key; - struct work_struct csa_finalize_work; - bool csa_block_tx; /* write-protected by sdata_lock and local->mtx */ + struct wiphy_work csa_finalize_work; + bool csa_block_tx; bool operating_11g_mode; struct cfg80211_chan_def csa_chandef; - struct work_struct color_change_finalize_work; + struct wiphy_work color_change_finalize_work; struct delayed_work color_collision_detect_work; u64 color_bitmap; - /* context reservation -- protected with chanctx_mtx */ + /* context reservation -- protected with wiphy mutex */ struct ieee80211_chanctx *reserved_chanctx; struct cfg80211_chan_def reserved_chandef; bool reserved_radar_required; @@ -999,7 +1043,7 @@ int ap_power_level; /* in dBm */ bool radar_required; - struct delayed_work dfs_cac_timer_work; + struct wiphy_delayed_work dfs_cac_timer_work; union { struct ieee80211_link_data_managed mgd; @@ -1026,7 +1070,7 @@ /* count for keys needing tailroom space allocation */ int crypto_tx_tailroom_needed_cnt; int crypto_tx_tailroom_pending_dec; - struct delayed_work dec_tailroom_needed_wk; + struct wiphy_delayed_work dec_tailroom_needed_wk; struct net_device *dev; struct ieee80211_local *local; @@ -1058,10 +1102,7 @@ atomic_t num_tx_queued; struct mac80211_qos_map __rcu *qos_map; - /* used to reconfigure hardware SM PS */ - struct work_struct recalc_smps; - - struct work_struct work; + struct wiphy_work work; struct sk_buff_head skb_queue; struct sk_buff_head status_queue; @@ -1100,7 +1141,7 @@ struct ieee80211_link_data __rcu *link[IEEE80211_MLD_MAX_NUM_LINKS]; /* for ieee80211_set_active_links_async() */ - struct work_struct activate_links_work; + struct wiphy_work activate_links_work; u16 desired_active_links; #ifdef CONFIG_MAC80211_DEBUGFS @@ -1123,62 +1164,8 @@ return container_of(p, struct ieee80211_sub_if_data, vif); } -static inline void sdata_lock(struct ieee80211_sub_if_data *sdata) - __acquires(&sdata->wdev.mtx) -{ - mutex_lock(&sdata->wdev.mtx); - __acquire(&sdata->wdev.mtx); -} - -static inline void sdata_unlock(struct ieee80211_sub_if_data *sdata) - __releases(&sdata->wdev.mtx) -{ - mutex_unlock(&sdata->wdev.mtx); - __release(&sdata->wdev.mtx); -} - #define sdata_dereference(p, sdata) \ - rcu_dereference_protected(p, lockdep_is_held(&sdata->wdev.mtx)) - -static inline void -sdata_assert_lock(struct ieee80211_sub_if_data *sdata) -{ - lockdep_assert_held(&sdata->wdev.mtx); -} - -static inline int -ieee80211_chanwidth_get_shift(enum nl80211_chan_width width) -{ - switch (width) { - case NL80211_CHAN_WIDTH_5: - return 2; - case NL80211_CHAN_WIDTH_10: - return 1; - default: - return 0; - } -} - -static inline int -ieee80211_chandef_get_shift(struct cfg80211_chan_def *chandef) -{ - return ieee80211_chanwidth_get_shift(chandef->width); -} - -static inline int -ieee80211_vif_get_shift(struct ieee80211_vif *vif) -{ - struct ieee80211_chanctx_conf *chanctx_conf; - int shift = 0; - - rcu_read_lock(); - chanctx_conf = rcu_dereference(vif->bss_conf.chanctx_conf); - if (chanctx_conf) - shift = ieee80211_chandef_get_shift(&chanctx_conf->def); - rcu_read_unlock(); - - return shift; -} + wiphy_dereference(sdata->local->hw.wiphy, p) static inline int ieee80211_get_mbssid_beacon_len(struct cfg80211_mbssid_elems *elems, @@ -1248,7 +1235,7 @@ #endif /** - * mac80211 scan flags - currently active scan mode + * enum mac80211_scan_flags - currently active scan mode * * @SCAN_SW_SCANNING: We're currently in the process of scanning but may as * well be on the operating channel @@ -1266,7 +1253,7 @@ * and could send a probe request after receiving a beacon. * @SCAN_BEACON_DONE: Beacon received, we can now send a probe request */ -enum { +enum mac80211_scan_flags { SCAN_SW_SCANNING, SCAN_HW_SCANNING, SCAN_ONCHANNEL_SCANNING, @@ -1356,7 +1343,7 @@ spinlock_t filter_lock; /* used for uploading changed mc list */ - struct work_struct reconfig_filter; + struct wiphy_work reconfig_filter; /* aggregated multicast list */ struct netdev_hw_addr_list mc_list; @@ -1394,10 +1381,13 @@ /* device is during a HW reconfig */ bool in_reconfig; + /* reconfiguration failed ... suppress some warnings etc. */ + bool reconfig_failure; + /* wowlan is enabled -- don't reconfig on resume */ bool wowlan; - struct work_struct radar_detected_work; + struct wiphy_work radar_detected_work; /* number of RX chains the hardware has */ u8 rx_chains; @@ -1420,10 +1410,9 @@ /* Station data */ /* - * The mutex only protects the list, hash table and - * counter, reads are done with RCU. + * The list, hash table and counter are protected + * by the wiphy mutex, reads are done with RCU. */ - struct mutex sta_mtx; spinlock_t tim_lock; unsigned long num_sta; struct list_head sta_list; @@ -1452,15 +1441,6 @@ struct list_head mon_list; /* only that are IFF_UP && !cooked */ struct mutex iflist_mtx; - /* - * Key mutex, protects sdata's key_list and sta_info's - * key pointers and ptk_idx (write access, they're RCU.) - */ - struct mutex key_mtx; - - /* mutex for scan and work locking */ - struct mutex mtx; - /* Scanning and BSS list */ unsigned long scanning; struct cfg80211_ssid scan_ssid; @@ -1474,14 +1454,14 @@ int hw_scan_ies_bufsize; struct cfg80211_scan_info scan_info; - struct work_struct sched_scan_stopped_work; + struct wiphy_work sched_scan_stopped_work; struct ieee80211_sub_if_data __rcu *sched_scan_sdata; struct cfg80211_sched_scan_request __rcu *sched_scan_req; u8 scan_addr[ETH_ALEN]; unsigned long leave_oper_channel_time; enum mac80211_scan_state next_scan_state; - struct delayed_work scan_work; + struct wiphy_delayed_work scan_work; struct ieee80211_sub_if_data __rcu *scan_sdata; /* For backward compatibility only -- do not use */ struct cfg80211_chan_def _oper_chandef; @@ -1491,7 +1471,6 @@ /* channel contexts */ struct list_head chanctx_list; - struct mutex chanctx_mtx; #ifdef CONFIG_MAC80211_LEDS struct led_trigger tx_led, rx_led, assoc_led, radio_led; @@ -1545,8 +1524,8 @@ * interface (and monitors) in PS, this then points there. */ struct ieee80211_sub_if_data *ps_sdata; - struct work_struct dynamic_ps_enable_work; - struct work_struct dynamic_ps_disable_work; + struct wiphy_work dynamic_ps_enable_work; + struct wiphy_work dynamic_ps_disable_work; struct timer_list dynamic_ps_timer; struct notifier_block ifa_notifier; struct notifier_block ifa6_notifier; @@ -1574,9 +1553,9 @@ /* * Remain-on-channel support */ - struct delayed_work roc_work; + struct wiphy_delayed_work roc_work; struct list_head roc_list; - struct work_struct hw_roc_start, hw_roc_done; + struct wiphy_work hw_roc_start, hw_roc_done; unsigned long hw_roc_start_time; u64 roc_cookie_counter; @@ -1591,6 +1570,9 @@ /* extended capabilities provided by mac80211 */ u8 ext_capa[8]; +#ifdef CONFIG_FBX80211_SCUM + struct list_head scum_list; +#endif }; static inline struct ieee80211_sub_if_data * @@ -1612,7 +1594,7 @@ struct ieee80211_chanctx_conf *chanctx_conf; enum nl80211_band band; - WARN_ON(sdata->vif.valid_links); + WARN_ON(ieee80211_vif_is_mld(&sdata->vif)); rcu_read_lock(); chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); @@ -1722,7 +1704,10 @@ const struct ieee80211_aid_response_ie *aid_resp; const struct ieee80211_eht_cap_elem *eht_cap; const struct ieee80211_eht_operation *eht_operation; - const struct ieee80211_multi_link_elem *multi_link; + const struct ieee80211_multi_link_elem *ml_basic; + const struct ieee80211_multi_link_elem *ml_reconf; + const struct ieee80211_bandwidth_indication *bandwidth_indication; + const struct ieee80211_ttlm_elem *ttlm[IEEE80211_TTLM_MAX_CNT]; /* length of them, respectively */ u8 ext_capab_len; @@ -1747,7 +1732,16 @@ u8 eht_cap_len; /* mult-link element can be de-fragmented and thus u8 is not sufficient */ - size_t multi_link_len; + size_t ml_basic_len; + size_t ml_reconf_len; + + /* The basic Multi-Link element in the original IEs */ + const struct element *ml_basic_elem; + + /* The reconfiguration Multi-Link element in the original IEs */ + const struct element *ml_reconf_elem; + + u8 ttlm_num; /* * store the per station profile pointer and length in case that the @@ -1766,7 +1760,7 @@ */ size_t scratch_len; u8 *scratch_pos; - u8 scratch[]; + u8 scratch[] __counted_by(scratch_len); }; static inline struct ieee80211_local *hw_to_local( @@ -1827,7 +1821,7 @@ struct ieee80211_link_data *link, u64 changed); void ieee80211_configure_filter(struct ieee80211_local *local); -u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata); +u64 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata); u64 ieee80211_mgmt_tx_cookie(struct ieee80211_local *local); int ieee80211_attach_ack_skb(struct ieee80211_local *local, struct sk_buff *skb, @@ -1855,7 +1849,6 @@ struct ieee80211_sub_if_data *sdata); void ieee80211_recalc_ps(struct ieee80211_local *local); void ieee80211_recalc_ps_vif(struct ieee80211_sub_if_data *sdata); -int ieee80211_set_arp_filter(struct ieee80211_sub_if_data *sdata); void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata); void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb); @@ -1887,8 +1880,10 @@ void ieee80211_ibss_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb); int ieee80211_ibss_csa_beacon(struct ieee80211_sub_if_data *sdata, - struct cfg80211_csa_settings *csa_settings); -int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata); + struct cfg80211_csa_settings *csa_settings, + u64 *changed); +int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata, + u64 *changed); void ieee80211_ibss_stop(struct ieee80211_sub_if_data *sdata); /* OCB code */ @@ -1905,22 +1900,26 @@ void ieee80211_mesh_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb); int ieee80211_mesh_csa_beacon(struct ieee80211_sub_if_data *sdata, - struct cfg80211_csa_settings *csa_settings); -int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata); + struct cfg80211_csa_settings *csa_settings, + u64 *changed); +int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata, + u64 *changed); /* scan/BSS handling */ -void ieee80211_scan_work(struct work_struct *work); +void ieee80211_scan_work(struct wiphy *wiphy, struct wiphy_work *work); int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata, const u8 *ssid, u8 ssid_len, struct ieee80211_channel **channels, - unsigned int n_channels, - enum nl80211_bss_scan_width scan_width); + unsigned int n_channels); int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata, struct cfg80211_scan_request *req); void ieee80211_scan_cancel(struct ieee80211_local *local); void ieee80211_run_deferred_scan(struct ieee80211_local *local); void ieee80211_scan_rx(struct ieee80211_local *local, struct sk_buff *skb); +void ieee80211_inform_bss(struct wiphy *wiphy, struct cfg80211_bss *bss, + const struct cfg80211_bss_ies *ies, void *data); + void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local); struct ieee80211_bss * ieee80211_bss_info_update(struct ieee80211_local *local, @@ -1939,7 +1938,8 @@ struct cfg80211_sched_scan_request *req); int ieee80211_request_sched_scan_stop(struct ieee80211_local *local); void ieee80211_sched_scan_end(struct ieee80211_local *local); -void ieee80211_sched_scan_stopped_work(struct work_struct *work); +void ieee80211_sched_scan_stopped_work(struct wiphy *wiphy, + struct wiphy_work *work); /* off-channel/mgmt-tx */ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local); @@ -1959,19 +1959,20 @@ struct wireless_dev *wdev, u64 cookie); /* channel switch handling */ -void ieee80211_csa_finalize_work(struct work_struct *work); +void ieee80211_csa_finalize_work(struct wiphy *wiphy, struct wiphy_work *work); int ieee80211_channel_switch(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_csa_settings *params); /* color change handling */ -void ieee80211_color_change_finalize_work(struct work_struct *work); +void ieee80211_color_change_finalize_work(struct wiphy *wiphy, + struct wiphy_work *work); void ieee80211_color_collision_detection_work(struct work_struct *work); /* interface handling */ #define MAC80211_SUPPORTED_FEATURES_TX (NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | \ NETIF_F_HW_CSUM | NETIF_F_SG | \ NETIF_F_HIGHDMA | NETIF_F_GSO_SOFTWARE | \ - NETIF_F_HW_TC) + NETIF_F_LLTX) #define MAC80211_SUPPORTED_FEATURES_RX (NETIF_F_RXCSUM) #define MAC80211_SUPPORTED_FEATURES (MAC80211_SUPPORTED_FEATURES_TX | \ MAC80211_SUPPORTED_FEATURES_RX) @@ -2013,8 +2014,11 @@ struct ieee80211_bss_conf *link_conf); void ieee80211_link_stop(struct ieee80211_link_data *link); int ieee80211_vif_set_links(struct ieee80211_sub_if_data *sdata, - u16 new_links); -void ieee80211_vif_clear_links(struct ieee80211_sub_if_data *sdata); + u16 new_links, u16 dormant_links); +static inline void ieee80211_vif_clear_links(struct ieee80211_sub_if_data *sdata) +{ + ieee80211_vif_set_links(sdata, 0, 0); +} /* tx handling */ void ieee80211_clear_tx_pending(struct ieee80211_local *local); @@ -2036,7 +2040,7 @@ ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u32 info_flags); void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb, - int retry_count, int shift, bool send_to_cooked, + int retry_count, bool send_to_cooked, struct ieee80211_tx_status *status); void ieee80211_check_fast_xmit(struct sta_info *sta); @@ -2069,15 +2073,13 @@ u16 initiator, u16 reason_code); int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata, enum ieee80211_smps_mode smps, const u8 *da, - const u8 *bssid); + const u8 *bssid, int link_id); bool ieee80211_smps_is_restrictive(enum ieee80211_smps_mode smps_mode_old, enum ieee80211_smps_mode smps_mode_new); -void ___ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, - u16 initiator, u16 reason, bool stop); void __ieee80211_stop_rx_ba_session(struct sta_info *sta, u16 tid, u16 initiator, u16 reason, bool stop); -void ___ieee80211_start_rx_ba_session(struct sta_info *sta, +void __ieee80211_start_rx_ba_session(struct sta_info *sta, u8 dialog_token, u16 timeout, u16 start_seq_num, u16 ba_policy, u16 tid, u16 buf_size, bool tx, bool auto_seq, @@ -2098,13 +2100,11 @@ int __ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, enum ieee80211_agg_stop_reason reason); -int ___ieee80211_stop_tx_ba_session(struct sta_info *sta, u16 tid, - enum ieee80211_agg_stop_reason reason); void ieee80211_start_tx_ba_cb(struct sta_info *sta, int tid, struct tid_ampdu_tx *tid_tx); void ieee80211_stop_tx_ba_cb(struct sta_info *sta, int tid, struct tid_ampdu_tx *tid_tx); -void ieee80211_ba_session_work(struct work_struct *work); +void ieee80211_ba_session_work(struct wiphy *wiphy, struct wiphy_work *work); void ieee80211_tx_ba_session_handle_start(struct sta_info *sta, int tid); void ieee80211_release_reorder_timeout(struct sta_info *sta, int tid); @@ -2117,6 +2117,7 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const struct ieee80211_vht_cap *vht_cap_ie, + const struct ieee80211_vht_cap *vht_cap_ie2, struct link_sta_info *link_sta); enum ieee80211_sta_rx_bandwidth ieee80211_sta_cap_rx_bw(struct link_sta_info *link_sta); @@ -2181,7 +2182,7 @@ * flags from &enum ieee80211_conn_flags. * @bssid: the currently connected bssid (for reporting) * @csa_ie: parsed 802.11 csa elements on count, mode, chandef and mesh ttl. - All of them will be filled with if success only. + * All of them will be filled with if success only. * Return: 0 on success, <0 on error and >0 if there is nothing to parse. */ int ieee80211_parse_ch_switch_ie(struct ieee80211_sub_if_data *sdata, @@ -2213,8 +2214,7 @@ /* utility functions/constants */ extern const void *const mac80211_wiphy_privid; /* for wiphy privid */ int ieee80211_frame_duration(enum nl80211_band band, size_t len, - int rate, int erp, int short_preamble, - int shift); + int rate, int erp, int short_preamble); void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata, struct ieee80211_tx_queue_params *qparam, int ac); @@ -2269,8 +2269,6 @@ * (or re-association) response frame if this is given * @from_ap: frame is received from an AP (currently used only * for EHT capabilities parsing) - * @scratch_len: if non zero, specifies the requested length of the scratch - * buffer; otherwise, 'len' is used. */ struct ieee80211_elems_parse_params { const u8 *start; @@ -2281,7 +2279,6 @@ struct cfg80211_bss *bss; int link_id; bool from_ap; - size_t scratch_len; }; struct ieee802_11_elems * @@ -2312,8 +2309,6 @@ return ieee802_11_parse_elems_crc(start, len, action, 0, 0, bss); } -void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id); - extern const int ieee802_1d_to_ac[8]; static inline int ieee80211_ac_from_tid(int tid) @@ -2321,8 +2316,10 @@ return ieee802_1d_to_ac[tid & 7]; } -void ieee80211_dynamic_ps_enable_work(struct work_struct *work); -void ieee80211_dynamic_ps_disable_work(struct work_struct *work); +void ieee80211_dynamic_ps_enable_work(struct wiphy *wiphy, + struct wiphy_work *work); +void ieee80211_dynamic_ps_disable_work(struct wiphy *wiphy, + struct wiphy_work *work); void ieee80211_dynamic_ps_timer(struct timer_list *t); void ieee80211_send_nullfunc(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, @@ -2407,6 +2404,7 @@ struct txq_info *txq, int tid); void ieee80211_txq_purge(struct ieee80211_local *local, struct txq_info *txqi); +void ieee80211_purge_sta_txqs(struct sta_info *sta); void ieee80211_txq_remove_vlan(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata); void ieee80211_fill_txq_stats(struct cfg80211_txq_stats *txqstats, @@ -2421,6 +2419,7 @@ const u8 *da, const u8 *bssid, u16 stype, u16 reason, bool send_frame, u8 *frame_buf); +u8 *ieee80211_write_he_6ghz_cap(u8 *pos, __le16 cap, u8 *end); enum { IEEE80211_PROBE_FLAG_DIRECTED = BIT(0), @@ -2499,7 +2498,7 @@ const struct ieee80211_vht_operation *oper, const struct ieee80211_ht_operation *htop, struct cfg80211_chan_def *chandef); -void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation *eht_oper, +void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation_info *info, bool support_160, bool support_320, struct cfg80211_chan_def *chandef); bool ieee80211_chandef_he_6ghz_oper(struct ieee80211_sub_if_data *sdata, @@ -2541,10 +2540,10 @@ struct ieee80211_link_data *rsvd_for); bool ieee80211_is_radar_required(struct ieee80211_local *local); -void ieee80211_dfs_cac_timer(unsigned long data); -void ieee80211_dfs_cac_timer_work(struct work_struct *work); +void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work); void ieee80211_dfs_cac_cancel(struct ieee80211_local *local); -void ieee80211_dfs_radar_detected_work(struct work_struct *work); +void ieee80211_dfs_radar_detected_work(struct wiphy *wiphy, + struct wiphy_work *work); int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, struct cfg80211_csa_settings *csa_settings); @@ -2560,13 +2559,13 @@ /* TDLS */ int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, - u16 status_code, u32 peer_capability, - bool initiator, const u8 *extra_ies, - size_t extra_ies_len); + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, u16 status_code, + u32 peer_capability, bool initiator, + const u8 *extra_ies, size_t extra_ies_len); int ieee80211_tdls_oper(struct wiphy *wiphy, struct net_device *dev, const u8 *peer, enum nl80211_tdls_operation oper); -void ieee80211_tdls_peer_del_work(struct work_struct *wk); +void ieee80211_tdls_peer_del_work(struct wiphy *wiphy, struct wiphy_work *wk); int ieee80211_tdls_channel_switch(struct wiphy *wiphy, struct net_device *dev, const u8 *addr, u8 oper_class, struct cfg80211_chan_def *chandef); diff -ruw linux-6.4/net/mac80211/iface.c linux-6.4-fbx/net/mac80211/iface.c --- linux-6.4/net/mac80211/iface.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/iface.c 2024-04-22 13:40:53.015943280 +0200 @@ -8,7 +8,7 @@ * Copyright 2008, Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (c) 2016 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include #include @@ -26,6 +26,7 @@ #include "driver-ops.h" #include "wme.h" #include "rate.h" +#include "fbx_scum.h" /** * DOC: Interface list locking @@ -33,17 +34,16 @@ * The interface list in each struct ieee80211_local is protected * three-fold: * - * (1) modifications may only be done under the RTNL - * (2) modifications and readers are protected against each other by - * the iflist_mtx. - * (3) modifications are done in an RCU manner so atomic readers + * (1) modifications may only be done under the RTNL *and* wiphy mutex + * *and* iflist_mtx + * (2) modifications are done in an RCU manner so atomic readers * can traverse the list in RCU-safe blocks. * * As a consequence, reads (traversals) of the list can be protected - * by either the RTNL, the iflist_mtx or RCU. + * by either the RTNL, the wiphy mutex, the iflist_mtx or RCU. */ -static void ieee80211_iface_work(struct work_struct *work); +static void ieee80211_iface_work(struct wiphy *wiphy, struct wiphy_work *work); bool __ieee80211_recalc_txpower(struct ieee80211_sub_if_data *sdata) { @@ -110,7 +110,7 @@ bool working, scanning, active; unsigned int led_trig_start = 0, led_trig_stop = 0; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); active = force_active || !list_empty(&local->chanctx_list) || @@ -160,6 +160,8 @@ u8 *m; int ret = 0; + lockdep_assert_wiphy(local->hw.wiphy); + if (is_zero_ether_addr(local->hw.wiphy->addr_mask)) return 0; @@ -176,7 +178,6 @@ if (!check_dup) return ret; - mutex_lock(&local->iflist_mtx); list_for_each_entry(iter, &local->interfaces, list) { if (iter == sdata) continue; @@ -195,7 +196,6 @@ break; } } - mutex_unlock(&local->iflist_mtx); return ret; } @@ -207,6 +207,8 @@ struct ieee80211_sub_if_data *scan_sdata; int ret = 0; + lockdep_assert_wiphy(local->hw.wiphy); + /* To be the most flexible here we want to only limit changing the * address if the specific interface is doing offchannel work or * scanning. @@ -214,8 +216,6 @@ if (netif_carrier_ok(sdata->dev)) return -EBUSY; - mutex_lock(&local->mtx); - /* First check no ROC work is happening on this iface */ list_for_each_entry(roc, &local->roc_list, list) { if (roc->sdata != sdata) @@ -230,7 +230,7 @@ /* And if this iface is scanning */ if (local->scanning) { scan_sdata = rcu_dereference_protected(local->scan_sdata, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (sdata == scan_sdata) ret = -EBUSY; } @@ -247,13 +247,12 @@ } unlock: - mutex_unlock(&local->mtx); return ret; } -static int ieee80211_change_mac(struct net_device *dev, void *addr) +static int _ieee80211_change_mac(struct ieee80211_sub_if_data *sdata, + void *addr) { - struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ieee80211_local *local = sdata->local; struct sockaddr *sa = addr; bool check_dup = true; @@ -278,7 +277,7 @@ if (live) drv_remove_interface(local, sdata); - ret = eth_mac_addr(dev, sa); + ret = eth_mac_addr(sdata->dev, sa); if (ret == 0) { memcpy(sdata->vif.addr, sa->sa_data, ETH_ALEN); @@ -294,6 +293,27 @@ return ret; } +static int ieee80211_change_mac(struct net_device *dev, void *addr) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_local *local = sdata->local; + int ret; + + /* + * This happens during unregistration if there's a bond device + * active (maybe other cases?) and we must get removed from it. + * But we really don't care anymore if it's not registered now. + */ + if (!dev->ieee80211_ptr->registered) + return 0; + + wiphy_lock(local->hw.wiphy); + ret = _ieee80211_change_mac(sdata, addr); + wiphy_unlock(local->hw.wiphy); + + return ret; +} + static inline int identical_mac_addr_allowed(int type1, int type2) { return type1 == NL80211_IFTYPE_MONITOR || @@ -311,9 +331,9 @@ { struct ieee80211_local *local = sdata->local; struct ieee80211_sub_if_data *nsdata; - int ret; ASSERT_RTNL(); + lockdep_assert_wiphy(local->hw.wiphy); /* we hold the RTNL here so can safely walk the list */ list_for_each_entry(nsdata, &local->interfaces, list) { @@ -378,10 +398,7 @@ } } - mutex_lock(&local->chanctx_mtx); - ret = ieee80211_check_combinations(sdata, NULL, 0, 0); - mutex_unlock(&local->chanctx_mtx); - return ret; + return ieee80211_check_combinations(sdata, NULL, 0, 0); } static int ieee80211_check_queues(struct ieee80211_sub_if_data *sdata, @@ -430,12 +447,13 @@ if (!is_valid_ether_addr(dev->dev_addr)) return -EADDRNOTAVAIL; + wiphy_lock(sdata->local->hw.wiphy); err = ieee80211_check_concurrent_iface(sdata, sdata->vif.type); if (err) - return err; + goto out; - wiphy_lock(sdata->local->hw.wiphy); err = ieee80211_do_open(&sdata->wdev, true); +out: wiphy_unlock(sdata->local->hw.wiphy); return err; @@ -453,6 +471,8 @@ bool cancel_scan; struct cfg80211_nan_func *func; + lockdep_assert_wiphy(local->hw.wiphy); + clear_bit(SDATA_STATE_RUNNING, &sdata->state); synchronize_rcu(); /* flush _ieee80211_wake_txqs() */ @@ -472,6 +492,8 @@ case NL80211_IFTYPE_MONITOR: if (sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES) break; + if (fbx80211_skip_mon(sdata)) + break; list_del_rcu(&sdata->u.mntr.list); break; default: @@ -516,16 +538,12 @@ } del_timer_sync(&local->dynamic_ps_timer); - cancel_work_sync(&local->dynamic_ps_enable_work); - - cancel_work_sync(&sdata->recalc_smps); + wiphy_work_cancel(local->hw.wiphy, &local->dynamic_ps_enable_work); - sdata_lock(sdata); - WARN(sdata->vif.valid_links, + WARN(ieee80211_vif_is_mld(&sdata->vif), "destroying interface with valid links 0x%04x\n", sdata->vif.valid_links); - mutex_lock(&local->mtx); sdata->vif.bss_conf.csa_active = false; if (sdata->vif.type == NL80211_IFTYPE_STATION) sdata->deflink.u.mgd.csa_waiting_bcn = false; @@ -534,20 +552,17 @@ IEEE80211_QUEUE_STOP_REASON_CSA); sdata->deflink.csa_block_tx = false; } - mutex_unlock(&local->mtx); - sdata_unlock(sdata); - - cancel_work_sync(&sdata->deflink.csa_finalize_work); - cancel_work_sync(&sdata->deflink.color_change_finalize_work); - cancel_delayed_work_sync(&sdata->deflink.dfs_cac_timer_work); + wiphy_work_cancel(local->hw.wiphy, &sdata->deflink.csa_finalize_work); + wiphy_work_cancel(local->hw.wiphy, + &sdata->deflink.color_change_finalize_work); + wiphy_delayed_work_cancel(local->hw.wiphy, + &sdata->deflink.dfs_cac_timer_work); if (sdata->wdev.cac_started) { chandef = sdata->vif.bss_conf.chandef; WARN_ON(local->suspended); - mutex_lock(&local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&local->mtx); cfg80211_cac_event(sdata->dev, &chandef, NL80211_RADAR_CAC_ABORTED, GFP_KERNEL); @@ -575,9 +590,7 @@ switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: - mutex_lock(&local->mtx); list_del(&sdata->u.vlan.list); - mutex_unlock(&local->mtx); RCU_INIT_POINTER(sdata->vif.bss_conf.chanctx_conf, NULL); /* see comment in the default case below */ ieee80211_free_keys(sdata, true); @@ -614,7 +627,7 @@ RCU_INIT_POINTER(local->p2p_sdata, NULL); fallthrough; default: - cancel_work_sync(&sdata->work); + wiphy_work_cancel(sdata->local->hw.wiphy, &sdata->work); /* * When we get here, the interface is marked down. * Free the remaining keys, if there are any @@ -675,9 +688,7 @@ if (local->monitors == 0) ieee80211_del_virtual_monitor(local); - mutex_lock(&local->mtx); ieee80211_recalc_idle(local); - mutex_unlock(&local->mtx); if (!(sdata->u.mntr.flags & MONITOR_FLAG_ACTIVE)) break; @@ -691,7 +702,7 @@ ieee80211_recalc_ps(local); if (cancel_scan) - flush_delayed_work(&local->scan_work); + wiphy_delayed_work_flush(local->hw.wiphy, &local->scan_work); if (local->open_count == 0) { ieee80211_stop_device(local); @@ -750,9 +761,9 @@ ieee80211_stop_mbssid(sdata); } - cancel_work_sync(&sdata->activate_links_work); - wiphy_lock(sdata->local->hw.wiphy); + wiphy_work_cancel(sdata->local->hw.wiphy, &sdata->activate_links_work); + ieee80211_do_stop(sdata, true); wiphy_unlock(sdata->local->hw.wiphy); @@ -779,7 +790,7 @@ spin_lock_bh(&local->filter_lock); __hw_addr_sync(&local->mc_list, &dev->mc, dev->addr_len); spin_unlock_bh(&local->filter_lock); - ieee80211_queue_work(&local->hw, &local->reconfig_filter); + wiphy_work_queue(local->hw.wiphy, &local->reconfig_filter); } /* @@ -788,6 +799,9 @@ */ static void ieee80211_teardown_sdata(struct ieee80211_sub_if_data *sdata) { + if (sdata->vif.type == NL80211_IFTYPE_MONITOR) + fbx80211_scum_teardown(sdata); + /* free extra data */ ieee80211_free_keys(sdata, false); @@ -1046,7 +1060,7 @@ if (!ieee80211_hw_check(&local->hw, SUPPORTS_TX_ENCAP_OFFLOAD)) return; - mutex_lock(&local->iflist_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(sdata, &local->interfaces, list) { if (!ieee80211_sdata_running(sdata)) @@ -1054,8 +1068,6 @@ ieee80211_recalc_sdata_offload(sdata); } - - mutex_unlock(&local->iflist_mtx); } void ieee80211_adjust_monitor_flags(struct ieee80211_sub_if_data *sdata, @@ -1133,6 +1145,7 @@ snprintf(sdata->name, IFNAMSIZ, "%s-monitor", wiphy_name(local->hw.wiphy)); sdata->wdev.iftype = NL80211_IFTYPE_MONITOR; + sdata->wdev.wiphy = local->hw.wiphy; ieee80211_sdata_init(local, sdata); @@ -1157,10 +1170,8 @@ rcu_assign_pointer(local->monitor_sdata, sdata); mutex_unlock(&local->iflist_mtx); - mutex_lock(&local->mtx); ret = ieee80211_link_use_channel(&sdata->deflink, &local->monitor_chandef, IEEE80211_CHANCTX_EXCLUSIVE); - mutex_unlock(&local->mtx); if (ret) { mutex_lock(&local->iflist_mtx); RCU_INIT_POINTER(local->monitor_sdata, NULL); @@ -1173,7 +1184,7 @@ skb_queue_head_init(&sdata->skb_queue); skb_queue_head_init(&sdata->status_queue); - INIT_WORK(&sdata->work, ieee80211_iface_work); + wiphy_work_init(&sdata->work, ieee80211_iface_work); return 0; } @@ -1202,9 +1213,7 @@ synchronize_net(); - mutex_lock(&local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&local->mtx); drv_remove_interface(local, sdata); @@ -1221,10 +1230,12 @@ struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); struct net_device *dev = wdev->netdev; struct ieee80211_local *local = sdata->local; - u32 changed = 0; + u64 changed = 0; int res; u32 hw_reconf_flags = 0; + lockdep_assert_wiphy(local->hw.wiphy); + switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: { struct ieee80211_sub_if_data *master; @@ -1232,9 +1243,7 @@ if (!sdata->bss) return -ENOLINK; - mutex_lock(&local->mtx); list_add(&sdata->u.vlan.list, &sdata->bss->vlans); - mutex_unlock(&local->mtx); master = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap); @@ -1251,10 +1260,8 @@ sizeof(sdata->vif.hw_queue)); sdata->vif.bss_conf.chandef = master->vif.bss_conf.chandef; - mutex_lock(&local->key_mtx); sdata->crypto_tx_tailroom_needed_cnt += master->crypto_tx_tailroom_needed_cnt; - mutex_unlock(&local->key_mtx); break; } @@ -1281,6 +1288,9 @@ } if (local->open_count == 0) { + /* here we can consider everything in good order (again) */ + local->reconfig_failure = false; + res = drv_start(local); if (res) goto err_del_bss; @@ -1342,9 +1352,7 @@ ieee80211_adjust_monitor_flags(sdata, 1); ieee80211_configure_filter(local); ieee80211_recalc_offload(local); - mutex_lock(&local->mtx); ieee80211_recalc_idle(local); - mutex_unlock(&local->mtx); netif_carrier_on(dev); break; @@ -1417,6 +1425,8 @@ case NL80211_IFTYPE_MONITOR: if (sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES) break; + if (fbx80211_skip_mon(sdata)) + break; list_add_tail_rcu(&sdata->u.mntr.list, &local->mon_list); break; default: @@ -1449,11 +1459,8 @@ drv_stop(local); err_del_bss: sdata->bss = NULL; - if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { - mutex_lock(&local->mtx); + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) list_del(&sdata->u.vlan.list); - mutex_unlock(&local->mtx); - } /* might already be clear but that doesn't matter */ clear_bit(SDATA_STATE_RUNNING, &sdata->state); return res; @@ -1480,12 +1487,13 @@ { struct ieee80211_mgmt *mgmt = (void *)skb->data; + lockdep_assert_wiphy(local->hw.wiphy); + if (ieee80211_is_action(mgmt->frame_control) && mgmt->u.action.category == WLAN_CATEGORY_BACK) { struct sta_info *sta; int len = skb->len; - mutex_lock(&local->sta_mtx); sta = sta_info_get_bss(sdata, mgmt->sa); if (sta) { switch (mgmt->u.action.u.addba_req.action_code) { @@ -1506,7 +1514,6 @@ break; } } - mutex_unlock(&local->sta_mtx); } else if (ieee80211_is_action(mgmt->frame_control) && mgmt->u.action.category == WLAN_CATEGORY_VHT) { switch (mgmt->u.action.u.vht_group_notif.action_code) { @@ -1520,7 +1527,6 @@ band = status->band; opmode = mgmt->u.action.u.vht_opmode_notif.operating_mode; - mutex_lock(&local->sta_mtx); sta = sta_info_get_bss(sdata, mgmt->sa); if (sta) @@ -1528,7 +1534,6 @@ &sta->deflink, opmode, band); - mutex_unlock(&local->sta_mtx); break; } case WLAN_VHT_ACTION_GROUPID_MGMT: @@ -1575,7 +1580,6 @@ * a block-ack session was active. That cannot be * right, so terminate the session. */ - mutex_lock(&local->sta_mtx); sta = sta_info_get_bss(sdata, mgmt->sa); if (sta) { u16 tid = ieee80211_get_tid(hdr); @@ -1585,7 +1589,6 @@ WLAN_REASON_QSTA_REQUIRE_SETUP, true); } - mutex_unlock(&local->sta_mtx); } else switch (sdata->vif.type) { case NL80211_IFTYPE_STATION: ieee80211_sta_rx_queued_mgmt(sdata, skb); @@ -1622,7 +1625,7 @@ } } -static void ieee80211_iface_work(struct work_struct *work) +static void ieee80211_iface_work(struct wiphy *wiphy, struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, work); @@ -1682,15 +1685,8 @@ } } -static void ieee80211_recalc_smps_work(struct work_struct *work) -{ - struct ieee80211_sub_if_data *sdata = - container_of(work, struct ieee80211_sub_if_data, recalc_smps); - - ieee80211_recalc_smps(sdata, &sdata->deflink); -} - -static void ieee80211_activate_links_work(struct work_struct *work) +static void ieee80211_activate_links_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, @@ -1734,9 +1730,9 @@ skb_queue_head_init(&sdata->skb_queue); skb_queue_head_init(&sdata->status_queue); - INIT_WORK(&sdata->work, ieee80211_iface_work); - INIT_WORK(&sdata->recalc_smps, ieee80211_recalc_smps_work); - INIT_WORK(&sdata->activate_links_work, ieee80211_activate_links_work); + wiphy_work_init(&sdata->work, ieee80211_iface_work); + wiphy_work_init(&sdata->activate_links_work, + ieee80211_activate_links_work); switch (type) { case NL80211_IFTYPE_P2P_GO: @@ -1775,6 +1771,7 @@ sdata->dev->netdev_ops = &ieee80211_monitorif_ops; sdata->u.mntr.flags = MONITOR_FLAG_CONTROL | MONITOR_FLAG_OTHER_BSS; + fbx80211_scum_setup(sdata); break; case NL80211_IFTYPE_NAN: idr_init(&sdata->u.nan.function_inst_ids); @@ -1795,7 +1792,7 @@ /* need to do this after the switch so vif.type is correct */ ieee80211_link_setup(&sdata->deflink); - ieee80211_debugfs_add_netdev(sdata); + ieee80211_debugfs_add_netdev(sdata, false); } static int ieee80211_runtime_change_iftype(struct ieee80211_sub_if_data *sdata, @@ -1812,7 +1809,7 @@ return -EBUSY; /* for now, don't support changing while links exist */ - if (sdata->vif.valid_links) + if (ieee80211_vif_is_mld(&sdata->vif)) return -EBUSY; switch (sdata->vif.type) { @@ -1926,6 +1923,8 @@ u8 tmp_addr[ETH_ALEN]; int i; + lockdep_assert_wiphy(local->hw.wiphy); + /* default ... something at least */ memcpy(perm_addr, local->hw.wiphy->perm_addr, ETH_ALEN); @@ -1933,8 +1932,6 @@ local->hw.wiphy->n_addresses <= 1) return; - mutex_lock(&local->iflist_mtx); - switch (type) { case NL80211_IFTYPE_MONITOR: /* doesn't matter */ @@ -1958,7 +1955,7 @@ if (!ieee80211_sdata_running(sdata)) continue; memcpy(perm_addr, sdata->vif.addr, ETH_ALEN); - goto out_unlock; + return; } } fallthrough; @@ -2044,9 +2041,6 @@ break; } - - out_unlock: - mutex_unlock(&local->iflist_mtx); } int ieee80211_if_add(struct ieee80211_local *local, const char *name, @@ -2060,6 +2054,7 @@ int ret, i; ASSERT_RTNL(); + lockdep_assert_wiphy(local->hw.wiphy); if (type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN) { struct wireless_dev *wdev; @@ -2147,7 +2142,7 @@ INIT_LIST_HEAD(&sdata->key_list); - INIT_DELAYED_WORK(&sdata->dec_tailroom_needed_wk, + wiphy_delayed_work_init(&sdata->dec_tailroom_needed_wk, ieee80211_delayed_tailroom_dec); for (i = 0; i < NUM_NL80211_BANDS; i++) { @@ -2226,6 +2221,7 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) { ASSERT_RTNL(); + lockdep_assert_wiphy(sdata->local->hw.wiphy); mutex_lock(&sdata->local->iflist_mtx); list_del_rcu(&sdata->list); @@ -2255,7 +2251,6 @@ { struct ieee80211_sub_if_data *sdata, *tmp; LIST_HEAD(unreg_list); - LIST_HEAD(wdev_list); ASSERT_RTNL(); @@ -2272,28 +2267,34 @@ */ cfg80211_shutdown_all_interfaces(local->hw.wiphy); + wiphy_lock(local->hw.wiphy); + WARN(local->open_count, "%s: open count remains %d\n", wiphy_name(local->hw.wiphy), local->open_count); - ieee80211_txq_teardown_flows(local); - mutex_lock(&local->iflist_mtx); - list_for_each_entry_safe(sdata, tmp, &local->interfaces, list) { - list_del(&sdata->list); - - if (sdata->dev) - unregister_netdevice_queue(sdata->dev, &unreg_list); - else - list_add(&sdata->list, &wdev_list); - } + list_splice_init(&local->interfaces, &unreg_list); mutex_unlock(&local->iflist_mtx); - unregister_netdevice_many(&unreg_list); + list_for_each_entry_safe(sdata, tmp, &unreg_list, list) { + bool netdev = sdata->dev; + + /* + * Remove IP addresses explicitly, since the notifier will + * skip the callbacks if wdev->registered is false, since + * we can't acquire the wiphy_lock() again there if already + * inside this locked section. + */ + sdata->vif.cfg.arp_addr_cnt = 0; + if (sdata->vif.type == NL80211_IFTYPE_STATION && + sdata->u.mgd.associated) + ieee80211_vif_cfg_change_notify(sdata, + BSS_CHANGED_ARP_FILTER); - wiphy_lock(local->hw.wiphy); - list_for_each_entry_safe(sdata, tmp, &wdev_list, list) { list_del(&sdata->list); cfg80211_unregister_wdev(&sdata->wdev); + + if (!netdev) kfree(sdata); } wiphy_unlock(local->hw.wiphy); diff -ruw linux-6.4/net/mac80211/key.c linux-6.4-fbx/net/mac80211/key.c --- linux-6.4/net/mac80211/key.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/key.c 2024-04-22 13:40:53.019943390 +0200 @@ -6,9 +6,10 @@ * Copyright 2007-2008 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2015-2017 Intel Deutschland GmbH - * Copyright 2018-2020, 2022 Intel Corporation + * Copyright 2018-2020, 2022-2023 Intel Corporation */ +#include #include #include #include @@ -17,7 +18,6 @@ #include #include #include -#include #include #include "ieee80211_i.h" #include "driver-ops.h" @@ -53,11 +53,6 @@ static const u8 bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }; -static void assert_key_lock(struct ieee80211_local *local) -{ - lockdep_assert_held(&local->key_mtx); -} - static void update_vlan_tailroom_need_count(struct ieee80211_sub_if_data *sdata, int delta) { @@ -67,7 +62,7 @@ return; /* crypto_tx_tailroom_needed_cnt is protected by this */ - assert_key_lock(sdata->local); + lockdep_assert_wiphy(sdata->local->hw.wiphy); rcu_read_lock(); @@ -98,7 +93,7 @@ * http://mid.gmane.org/1308590980.4322.19.camel@jlt3.sipsolutions.net */ - assert_key_lock(sdata->local); + lockdep_assert_wiphy(sdata->local->hw.wiphy); update_vlan_tailroom_need_count(sdata, 1); @@ -114,7 +109,7 @@ static void decrease_tailroom_need_count(struct ieee80211_sub_if_data *sdata, int delta) { - assert_key_lock(sdata->local); + lockdep_assert_wiphy(sdata->local->hw.wiphy); WARN_ON_ONCE(sdata->crypto_tx_tailroom_needed_cnt < delta); @@ -129,6 +124,7 @@ int ret = -EOPNOTSUPP; might_sleep(); + lockdep_assert_wiphy(key->local->hw.wiphy); if (key->flags & KEY_FLAG_TAINTED) { /* If we get here, it's during resume and the key is @@ -151,8 +147,6 @@ if (!key->local->ops->set_key) goto out_unsupported; - assert_key_lock(key->local); - sta = key->sta; /* @@ -172,6 +166,12 @@ * Hence, don't send GTKs for VLAN interfaces to the driver. */ if (!(key->conf.flags & IEEE80211_KEY_FLAG_PAIRWISE)) { + if (ieee80211_hw_check(&key->local->hw, + APVLAN_NEED_MCAST_TO_UCAST)) { + /* no need to fail, this key will + * never be used */ + return 0; + } ret = 1; goto out_unsupported; } @@ -242,14 +242,14 @@ if (!key || !key->local->ops->set_key) return; - assert_key_lock(key->local); - if (!(key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE)) return; sta = key->sta; sdata = key->sdata; + lockdep_assert_wiphy(key->local->hw.wiphy); + if (key->conf.link_id >= 0 && sdata->vif.active_links && !(sdata->vif.active_links & BIT(key->conf.link_id))) return; @@ -275,7 +275,7 @@ struct sta_info *sta = key->sta; struct ieee80211_local *local = key->local; - assert_key_lock(local); + lockdep_assert_wiphy(local->hw.wiphy); set_sta_flag(sta, WLAN_STA_USES_ENCRYPTION); @@ -300,7 +300,7 @@ struct sta_info *sta = new->sta; int i; - assert_key_lock(local); + lockdep_assert_wiphy(local->hw.wiphy); if (new->conf.flags & IEEE80211_KEY_FLAG_NO_AUTO_TX) { /* Extended Key ID key install, initial one or rekey */ @@ -317,11 +317,9 @@ * job done for the few ms we need it.) */ set_sta_flag(sta, WLAN_STA_BLOCK_BA); - mutex_lock(&sta->ampdu_mlme.mtx); for (i = 0; i < IEEE80211_NUM_TIDS; i++) - ___ieee80211_stop_tx_ba_session(sta, i, + __ieee80211_stop_tx_ba_session(sta, i, AGG_STOP_LOCAL_REQUEST); - mutex_unlock(&sta->ampdu_mlme.mtx); } } else if (old) { /* Rekey without Extended Key ID. @@ -358,12 +356,14 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_key *key = NULL; - assert_key_lock(sdata->local); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (idx >= 0 && idx < NUM_DEFAULT_KEYS) { - key = key_mtx_dereference(sdata->local, sdata->keys[idx]); + key = wiphy_dereference(sdata->local->hw.wiphy, + sdata->keys[idx]); if (!key) - key = key_mtx_dereference(sdata->local, link->gtk[idx]); + key = wiphy_dereference(sdata->local->hw.wiphy, + link->gtk[idx]); } if (uni) { @@ -382,9 +382,9 @@ void ieee80211_set_default_key(struct ieee80211_link_data *link, int idx, bool uni, bool multi) { - mutex_lock(&link->sdata->local->key_mtx); + lockdep_assert_wiphy(link->sdata->local->hw.wiphy); + __ieee80211_set_default_key(link, idx, uni, multi); - mutex_unlock(&link->sdata->local->key_mtx); } static void @@ -393,11 +393,12 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_key *key = NULL; - assert_key_lock(sdata->local); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (idx >= NUM_DEFAULT_KEYS && idx < NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS) - key = key_mtx_dereference(sdata->local, link->gtk[idx]); + key = wiphy_dereference(sdata->local->hw.wiphy, + link->gtk[idx]); rcu_assign_pointer(link->default_mgmt_key, key); @@ -407,9 +408,9 @@ void ieee80211_set_default_mgmt_key(struct ieee80211_link_data *link, int idx) { - mutex_lock(&link->sdata->local->key_mtx); + lockdep_assert_wiphy(link->sdata->local->hw.wiphy); + __ieee80211_set_default_mgmt_key(link, idx); - mutex_unlock(&link->sdata->local->key_mtx); } static void @@ -418,12 +419,13 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_key *key = NULL; - assert_key_lock(sdata->local); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (idx >= NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS && idx < NUM_DEFAULT_KEYS + NUM_DEFAULT_MGMT_KEYS + NUM_DEFAULT_BEACON_KEYS) - key = key_mtx_dereference(sdata->local, link->gtk[idx]); + key = wiphy_dereference(sdata->local->hw.wiphy, + link->gtk[idx]); rcu_assign_pointer(link->default_beacon_key, key); @@ -433,9 +435,9 @@ void ieee80211_set_default_beacon_key(struct ieee80211_link_data *link, int idx) { - mutex_lock(&link->sdata->local->key_mtx); + lockdep_assert_wiphy(link->sdata->local->hw.wiphy); + __ieee80211_set_default_beacon_key(link, idx); - mutex_unlock(&link->sdata->local->key_mtx); } static int ieee80211_key_replace(struct ieee80211_sub_if_data *sdata, @@ -452,6 +454,8 @@ bool defunikey, defmultikey, defmgmtkey, defbeaconkey; bool is_wep; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + /* caller must provide at least one old/new */ if (WARN_ON(!new && !old)) return 0; @@ -482,7 +486,7 @@ if (sta) { link_sta = rcu_dereference_protected(sta->link[link_id], - lockdep_is_held(&sta->local->sta_mtx)); + lockdep_is_held(&sta->local->hw.wiphy->mtx)); if (!link_sta) return -ENOLINK; } @@ -512,6 +516,8 @@ } else { if (!new->local->wowlan) ret = ieee80211_key_enable_hw_accel(new); + else + new->flags |= KEY_FLAG_UPLOADED_TO_HARDWARE; } if (ret) @@ -537,16 +543,16 @@ ieee80211_check_fast_rx(sta); } else { defunikey = old && - old == key_mtx_dereference(sdata->local, + old == wiphy_dereference(sdata->local->hw.wiphy, sdata->default_unicast_key); defmultikey = old && - old == key_mtx_dereference(sdata->local, + old == wiphy_dereference(sdata->local->hw.wiphy, link->default_multicast_key); defmgmtkey = old && - old == key_mtx_dereference(sdata->local, + old == wiphy_dereference(sdata->local->hw.wiphy, link->default_mgmt_key); defbeaconkey = old && - old == key_mtx_dereference(sdata->local, + old == wiphy_dereference(sdata->local->hw.wiphy, link->default_beacon_key); if (defunikey && !new) @@ -771,7 +777,8 @@ if (delay_tailroom) { /* see ieee80211_delayed_tailroom_dec */ sdata->crypto_tx_tailroom_pending_dec++; - schedule_delayed_work(&sdata->dec_tailroom_needed_wk, + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &sdata->dec_tailroom_needed_wk, HZ/2); } else { decrease_tailroom_need_count(sdata, 1); @@ -798,6 +805,9 @@ void ieee80211_key_free_unused(struct ieee80211_key *key) { + if (!key) + return; + WARN_ON(key->sdata || key->local); ieee80211_key_free_common(key); } @@ -850,58 +860,64 @@ * can cause warnings to appear. */ bool delay_tailroom = sdata->vif.type == NL80211_IFTYPE_STATION; - int ret = -EOPNOTSUPP; + int ret; - mutex_lock(&sdata->local->key_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (sta && pairwise) { struct ieee80211_key *alt_key; - old_key = key_mtx_dereference(sdata->local, sta->ptk[idx]); - alt_key = key_mtx_dereference(sdata->local, sta->ptk[idx ^ 1]); + old_key = wiphy_dereference(sdata->local->hw.wiphy, + sta->ptk[idx]); + alt_key = wiphy_dereference(sdata->local->hw.wiphy, + sta->ptk[idx ^ 1]); /* The rekey code assumes that the old and new key are using * the same cipher. Enforce the assumption for pairwise keys. */ if ((alt_key && alt_key->conf.cipher != key->conf.cipher) || - (old_key && old_key->conf.cipher != key->conf.cipher)) + (old_key && old_key->conf.cipher != key->conf.cipher)) { + ret = -EOPNOTSUPP; goto out; + } } else if (sta) { struct link_sta_info *link_sta = &sta->deflink; int link_id = key->conf.link_id; if (link_id >= 0) { link_sta = rcu_dereference_protected(sta->link[link_id], - lockdep_is_held(&sta->local->sta_mtx)); + lockdep_is_held(&sta->local->hw.wiphy->mtx)); if (!link_sta) { ret = -ENOLINK; goto out; } } - old_key = key_mtx_dereference(sdata->local, link_sta->gtk[idx]); + old_key = wiphy_dereference(sdata->local->hw.wiphy, + link_sta->gtk[idx]); } else { if (idx < NUM_DEFAULT_KEYS) - old_key = key_mtx_dereference(sdata->local, + old_key = wiphy_dereference(sdata->local->hw.wiphy, sdata->keys[idx]); if (!old_key) - old_key = key_mtx_dereference(sdata->local, + old_key = wiphy_dereference(sdata->local->hw.wiphy, link->gtk[idx]); } /* Non-pairwise keys must also not switch the cipher on rekey */ if (!pairwise) { - if (old_key && old_key->conf.cipher != key->conf.cipher) + if (old_key && old_key->conf.cipher != key->conf.cipher) { + ret = -EOPNOTSUPP; goto out; } + } /* * Silently accept key re-installation without really installing the * new version of the key to avoid nonce reuse or replay issues. */ if (ieee80211_key_identical(sdata, old_key, key)) { - ieee80211_key_free_unused(key); - ret = 0; + ret = -EALREADY; goto out; } @@ -926,9 +942,10 @@ ieee80211_key_free(key, delay_tailroom); } - out: - mutex_unlock(&sdata->local->key_mtx); + key = NULL; + out: + ieee80211_key_free_unused(key); return ret; } @@ -954,8 +971,6 @@ lockdep_assert_wiphy(sdata->local->hw.wiphy); - mutex_lock(&sdata->local->key_mtx); - sdata->crypto_tx_tailroom_needed_cnt = 0; sdata->crypto_tx_tailroom_pending_dec = 0; @@ -972,8 +987,6 @@ ieee80211_key_enable_hw_accel(key); } } - - mutex_unlock(&sdata->local->key_mtx); } void ieee80211_iter_keys(struct ieee80211_hw *hw, @@ -991,7 +1004,6 @@ lockdep_assert_wiphy(hw->wiphy); - mutex_lock(&local->key_mtx); if (vif) { sdata = vif_to_sdata(vif); list_for_each_entry_safe(key, tmp, &sdata->key_list, list) @@ -1006,7 +1018,6 @@ key->sta ? &key->sta->sta : NULL, &key->conf, iter_data); } - mutex_unlock(&local->key_mtx); } EXPORT_SYMBOL(ieee80211_iter_keys); @@ -1086,7 +1097,8 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_key *key, *tmp; - mutex_lock(&local->key_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + list_for_each_entry_safe(key, tmp, &sdata->key_list, list) { if (key->conf.link_id != link->link_id) continue; @@ -1095,7 +1107,6 @@ key, NULL); list_add_tail(&key->list, keys); } - mutex_unlock(&local->key_mtx); } void ieee80211_free_key_list(struct ieee80211_local *local, @@ -1103,10 +1114,10 @@ { struct ieee80211_key *key, *tmp; - mutex_lock(&local->key_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + list_for_each_entry_safe(key, tmp, keys, list) __ieee80211_key_destroy(key, false); - mutex_unlock(&local->key_mtx); } void ieee80211_free_keys(struct ieee80211_sub_if_data *sdata, @@ -1118,9 +1129,10 @@ struct ieee80211_key *key, *tmp; LIST_HEAD(keys); - cancel_delayed_work_sync(&sdata->dec_tailroom_needed_wk); + wiphy_delayed_work_cancel(local->hw.wiphy, + &sdata->dec_tailroom_needed_wk); - mutex_lock(&local->key_mtx); + lockdep_assert_wiphy(local->hw.wiphy); ieee80211_free_keys_iface(sdata, &keys); @@ -1153,8 +1165,6 @@ WARN_ON_ONCE(vlan->crypto_tx_tailroom_needed_cnt || vlan->crypto_tx_tailroom_pending_dec); } - - mutex_unlock(&local->key_mtx); } void ieee80211_free_sta_keys(struct ieee80211_local *local, @@ -1163,9 +1173,10 @@ struct ieee80211_key *key; int i; - mutex_lock(&local->key_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + for (i = 0; i < ARRAY_SIZE(sta->deflink.gtk); i++) { - key = key_mtx_dereference(local, sta->deflink.gtk[i]); + key = wiphy_dereference(local->hw.wiphy, sta->deflink.gtk[i]); if (!key) continue; ieee80211_key_replace(key->sdata, NULL, key->sta, @@ -1176,7 +1187,7 @@ } for (i = 0; i < NUM_DEFAULT_KEYS; i++) { - key = key_mtx_dereference(local, sta->ptk[i]); + key = wiphy_dereference(local->hw.wiphy, sta->ptk[i]); if (!key) continue; ieee80211_key_replace(key->sdata, NULL, key->sta, @@ -1185,11 +1196,10 @@ __ieee80211_key_destroy(key, key->sdata->vif.type == NL80211_IFTYPE_STATION); } - - mutex_unlock(&local->key_mtx); } -void ieee80211_delayed_tailroom_dec(struct work_struct *wk) +void ieee80211_delayed_tailroom_dec(struct wiphy *wiphy, + struct wiphy_work *wk) { struct ieee80211_sub_if_data *sdata; @@ -1212,11 +1222,9 @@ * within an ESS this usually won't happen. */ - mutex_lock(&sdata->local->key_mtx); decrease_tailroom_need_count(sdata, sdata->crypto_tx_tailroom_pending_dec); sdata->crypto_tx_tailroom_pending_dec = 0; - mutex_unlock(&sdata->local->key_mtx); } void ieee80211_gtk_rekey_notify(struct ieee80211_vif *vif, const u8 *bssid, @@ -1345,7 +1353,7 @@ key = container_of(keyconf, struct ieee80211_key, conf); - assert_key_lock(key->local); + lockdep_assert_wiphy(key->local->hw.wiphy); /* * if key was uploaded, we assume the driver will/has remove(d) diff -ruw linux-6.4/net/mac80211/key.h linux-6.4-fbx/net/mac80211/key.h --- linux-6.4/net/mac80211/key.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/key.h 2024-04-22 13:40:53.019943390 +0200 @@ -2,7 +2,7 @@ /* * Copyright 2002-2004, Instant802 Networks, Inc. * Copyright 2005, Devicescape Software, Inc. - * Copyright (C) 2019, 2022 Intel Corporation + * Copyright (C) 2019, 2022-2023 Intel Corporation */ #ifndef IEEE80211_KEY_H @@ -168,12 +168,7 @@ int ieee80211_key_switch_links(struct ieee80211_sub_if_data *sdata, unsigned long del_links_mask, unsigned long add_links_mask); - -#define key_mtx_dereference(local, ref) \ - rcu_dereference_protected(ref, lockdep_is_held(&((local)->key_mtx))) -#define rcu_dereference_check_key_mtx(local, ref) \ - rcu_dereference_check(ref, lockdep_is_held(&((local)->key_mtx))) - -void ieee80211_delayed_tailroom_dec(struct work_struct *wk); +void ieee80211_delayed_tailroom_dec(struct wiphy *wiphy, + struct wiphy_work *wk); #endif /* IEEE80211_KEY_H */ diff -ruw linux-6.4/net/mac80211/link.c linux-6.4-fbx/net/mac80211/link.c --- linux-6.4/net/mac80211/link.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/link.c 2024-04-22 13:40:53.019943390 +0200 @@ -37,15 +37,15 @@ link_conf->link_id = link_id; link_conf->vif = &sdata->vif; - INIT_WORK(&link->csa_finalize_work, + wiphy_work_init(&link->csa_finalize_work, ieee80211_csa_finalize_work); - INIT_WORK(&link->color_change_finalize_work, + wiphy_work_init(&link->color_change_finalize_work, ieee80211_color_change_finalize_work); INIT_DELAYED_WORK(&link->color_collision_detect_work, ieee80211_color_collision_detection_work); INIT_LIST_HEAD(&link->assigned_chanctx_list); INIT_LIST_HEAD(&link->reserved_chanctx_list); - INIT_DELAYED_WORK(&link->dfs_cac_timer_work, + wiphy_delayed_work_init(&link->dfs_cac_timer_work, ieee80211_dfs_cac_timer_work); if (!deflink) { @@ -142,25 +142,34 @@ } static void ieee80211_set_vif_links_bitmaps(struct ieee80211_sub_if_data *sdata, - u16 links) + u16 valid_links, u16 dormant_links) { - sdata->vif.valid_links = links; + sdata->vif.valid_links = valid_links; + sdata->vif.dormant_links = dormant_links; - if (!links) { + if (!valid_links || + WARN((~valid_links & dormant_links) || + !(valid_links & ~dormant_links), + "Invalid links: valid=0x%x, dormant=0x%x", + valid_links, dormant_links)) { sdata->vif.active_links = 0; + sdata->vif.dormant_links = 0; return; } switch (sdata->vif.type) { case NL80211_IFTYPE_AP: /* in an AP all links are always active */ - sdata->vif.active_links = links; + sdata->vif.active_links = valid_links; + + /* AP links are not expected to be disabled */ + WARN_ON(dormant_links); break; case NL80211_IFTYPE_STATION: if (sdata->vif.active_links) break; - WARN_ON(hweight16(links) > 1); - sdata->vif.active_links = links; + sdata->vif.active_links = valid_links & ~dormant_links; + WARN_ON(hweight16(sdata->vif.active_links) > 1); break; default: WARN_ON(1); @@ -169,7 +178,7 @@ static int ieee80211_vif_update_links(struct ieee80211_sub_if_data *sdata, struct link_container **to_free, - u16 new_links) + u16 new_links, u16 dormant_links) { u16 old_links = sdata->vif.valid_links; u16 old_active = sdata->vif.active_links; @@ -182,11 +191,11 @@ struct ieee80211_link_data *old_data[IEEE80211_MLD_MAX_NUM_LINKS]; bool use_deflink = old_links == 0; /* set for error case */ - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); memset(to_free, 0, sizeof(links)); - if (old_links == new_links) + if (old_links == new_links && dormant_links == sdata->vif.dormant_links) return 0; /* if there were no old links, need to clear the pointers to deflink */ @@ -226,6 +235,9 @@ RCU_INIT_POINTER(sdata->vif.link_conf[link_id], NULL); } + if (!old_links) + ieee80211_debugfs_recreate_netdev(sdata, true); + /* link them into data structures */ for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS) { WARN_ON(!use_deflink && @@ -245,20 +257,22 @@ /* for keys we will not be able to undo this */ ieee80211_tear_down_links(sdata, to_free, rem); - ieee80211_set_vif_links_bitmaps(sdata, new_links); + ieee80211_set_vif_links_bitmaps(sdata, new_links, dormant_links); /* tell the driver */ ret = drv_change_vif_links(sdata->local, sdata, old_links & old_active, new_links & sdata->vif.active_links, old); + if (!new_links) + ieee80211_debugfs_recreate_netdev(sdata, false); } if (ret) { /* restore config */ memcpy(sdata->link, old_data, sizeof(old_data)); memcpy(sdata->vif.link_conf, old, sizeof(old)); - ieee80211_set_vif_links_bitmaps(sdata, old_links); + ieee80211_set_vif_links_bitmaps(sdata, old_links, dormant_links); /* and free (only) the newly allocated links */ memset(to_free, 0, sizeof(links)); goto free; @@ -282,34 +296,18 @@ } int ieee80211_vif_set_links(struct ieee80211_sub_if_data *sdata, - u16 new_links) + u16 new_links, u16 dormant_links) { struct link_container *links[IEEE80211_MLD_MAX_NUM_LINKS]; int ret; - ret = ieee80211_vif_update_links(sdata, links, new_links); + ret = ieee80211_vif_update_links(sdata, links, new_links, + dormant_links); ieee80211_free_links(sdata, links); return ret; } -void ieee80211_vif_clear_links(struct ieee80211_sub_if_data *sdata) -{ - struct link_container *links[IEEE80211_MLD_MAX_NUM_LINKS]; - - /* - * The locking here is different because when we free links - * in the station case we need to be able to cancel_work_sync() - * something that also takes the lock. - */ - - sdata_lock(sdata); - ieee80211_vif_update_links(sdata, links, 0); - sdata_unlock(sdata); - - ieee80211_free_links(sdata, links); -} - static int _ieee80211_set_active_links(struct ieee80211_sub_if_data *sdata, u16 active_links) { @@ -328,8 +326,7 @@ if (sdata->vif.type != NL80211_IFTYPE_STATION) return -EINVAL; - /* cannot activate links that don't exist */ - if (active_links & ~sdata->vif.valid_links) + if (active_links & ~ieee80211_vif_usable_links(&sdata->vif)) return -EINVAL; /* nothing to do */ @@ -445,10 +442,8 @@ u16 old_active; int ret; - sdata_lock(sdata); - mutex_lock(&local->sta_mtx); - mutex_lock(&local->mtx); - mutex_lock(&local->key_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + old_active = sdata->vif.active_links; if (old_active & active_links) { /* @@ -464,10 +459,6 @@ /* otherwise switch directly */ ret = _ieee80211_set_active_links(sdata, active_links); } - mutex_unlock(&local->key_mtx); - mutex_unlock(&local->mtx); - mutex_unlock(&local->sta_mtx); - sdata_unlock(sdata); return ret; } @@ -484,8 +475,7 @@ if (sdata->vif.type != NL80211_IFTYPE_STATION) return; - /* cannot activate links that don't exist */ - if (active_links & ~sdata->vif.valid_links) + if (active_links & ~ieee80211_vif_usable_links(&sdata->vif)) return; /* nothing to do */ @@ -493,6 +483,6 @@ return; sdata->desired_active_links = active_links; - schedule_work(&sdata->activate_links_work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->activate_links_work); } EXPORT_SYMBOL_GPL(ieee80211_set_active_links_async); diff -ruw linux-6.4/net/mac80211/main.c linux-6.4-fbx/net/mac80211/main.c --- linux-6.4/net/mac80211/main.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/main.c 2024-04-22 13:40:53.019943390 +0200 @@ -5,7 +5,7 @@ * Copyright 2006-2007 Jiri Benc * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include @@ -33,6 +33,7 @@ #include "wep.h" #include "led.h" #include "debugfs.h" +#include "fbx_scum.h" void ieee80211_configure_filter(struct ieee80211_local *local) { @@ -84,7 +85,8 @@ local->filter_flags = new_flags & ~(1<<31); } -static void ieee80211_reconfig_filter(struct work_struct *work) +static void ieee80211_reconfig_filter(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, reconfig_filter); @@ -206,7 +208,8 @@ BSS_CHANGED_PS |\ BSS_CHANGED_IBSS |\ BSS_CHANGED_ARP_FILTER |\ - BSS_CHANGED_SSID) + BSS_CHANGED_SSID |\ + BSS_CHANGED_MLD_VALID_LINKS) void ieee80211_bss_info_change_notify(struct ieee80211_sub_if_data *sdata, u64 changed) @@ -291,7 +294,7 @@ drv_link_info_changed(local, sdata, link->conf, link->link_id, changed); } -u32 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) +u64 ieee80211_reset_erp_info(struct ieee80211_sub_if_data *sdata) { sdata->vif.bss_conf.use_cts_prot = false; sdata->vif.bss_conf.use_short_preamble = false; @@ -335,14 +338,12 @@ struct ieee80211_sub_if_data *sdata; int ret; - /* wait for scan work complete */ flush_workqueue(local->workqueue); - flush_work(&local->sched_scan_stopped_work); - flush_work(&local->radar_detected_work); rtnl_lock(); /* we might do interface manipulations, so need both */ wiphy_lock(local->hw.wiphy); + wiphy_work_flush(local->hw.wiphy, NULL); WARN(test_bit(SCAN_HW_SCANNING, &local->scanning), "%s called with hardware scan in progress\n", __func__); @@ -364,22 +365,21 @@ * The exception is ieee80211_chswitch_done. * Then we can have a race... */ - cancel_work_sync(&sdata->u.mgd.csa_connection_drop_work); - if (sdata->vif.bss_conf.csa_active) { - sdata_lock(sdata); + wiphy_work_cancel(local->hw.wiphy, + &sdata->u.mgd.csa_connection_drop_work); + if (sdata->vif.bss_conf.csa_active) ieee80211_sta_connection_lost(sdata, WLAN_REASON_UNSPECIFIED, false); - sdata_unlock(sdata); } - } - flush_delayed_work(&sdata->dec_tailroom_needed_wk); + wiphy_delayed_work_flush(local->hw.wiphy, + &sdata->dec_tailroom_needed_wk); } ieee80211_scan_cancel(local); /* make sure any new ROC will consider local->in_reconfig */ - flush_delayed_work(&local->roc_work); - flush_work(&local->hw_roc_done); + wiphy_delayed_work_flush(local->hw.wiphy, &local->roc_work); + wiphy_work_flush(local->hw.wiphy, &local->hw_roc_done); /* wait for all packet processing to be done */ synchronize_net(); @@ -438,7 +438,7 @@ if (!wdev) return NOTIFY_DONE; - if (wdev->wiphy != local->hw.wiphy) + if (wdev->wiphy != local->hw.wiphy || !wdev->registered) return NOTIFY_DONE; sdata = IEEE80211_DEV_TO_SUB_IF(ndev); @@ -453,7 +453,25 @@ return NOTIFY_DONE; ifmgd = &sdata->u.mgd; - sdata_lock(sdata); + + /* + * The nested here is needed to convince lockdep that this is + * all OK. Yes, we lock the wiphy mutex here while we already + * hold the notifier rwsem, that's the normal case. And yes, + * we also acquire the notifier rwsem again when unregistering + * a netdev while we already hold the wiphy mutex, so it does + * look like a typical ABBA deadlock. + * + * However, both of these things happen with the RTNL held + * already. Therefore, they can't actually happen, since the + * lock orders really are ABC and ACB, which is fine due to + * the RTNL (A). + * + * We still need to prevent recursion, which is accomplished + * by the !wdev->registered check above. + */ + mutex_lock_nested(&local->hw.wiphy->mtx, 1); + __acquire(&local->hw.wiphy->mtx); /* Copy the addresses to the vif config list */ ifa = rtnl_dereference(idev->ifa_list); @@ -470,7 +488,7 @@ if (ifmgd->associated) ieee80211_vif_cfg_change_notify(sdata, BSS_CHANGED_ARP_FILTER); - sdata_unlock(sdata); + wiphy_unlock(local->hw.wiphy); return NOTIFY_OK; } @@ -783,9 +801,6 @@ __hw_addr_init(&local->mc_list); mutex_init(&local->iflist_mtx); - mutex_init(&local->mtx); - - mutex_init(&local->key_mtx); spin_lock_init(&local->filter_lock); spin_lock_init(&local->rx_path_lock); spin_lock_init(&local->queue_stop_reason_lock); @@ -806,25 +821,24 @@ spin_lock_init(&local->handle_wake_tx_queue_lock); INIT_LIST_HEAD(&local->chanctx_list); - mutex_init(&local->chanctx_mtx); - INIT_DELAYED_WORK(&local->scan_work, ieee80211_scan_work); + wiphy_delayed_work_init(&local->scan_work, ieee80211_scan_work); INIT_WORK(&local->restart_work, ieee80211_restart_work); - INIT_WORK(&local->radar_detected_work, + wiphy_work_init(&local->radar_detected_work, ieee80211_dfs_radar_detected_work); - INIT_WORK(&local->reconfig_filter, ieee80211_reconfig_filter); + wiphy_work_init(&local->reconfig_filter, ieee80211_reconfig_filter); local->smps_mode = IEEE80211_SMPS_OFF; - INIT_WORK(&local->dynamic_ps_enable_work, + wiphy_work_init(&local->dynamic_ps_enable_work, ieee80211_dynamic_ps_enable_work); - INIT_WORK(&local->dynamic_ps_disable_work, + wiphy_work_init(&local->dynamic_ps_disable_work, ieee80211_dynamic_ps_disable_work); timer_setup(&local->dynamic_ps_timer, ieee80211_dynamic_ps_timer, 0); - INIT_WORK(&local->sched_scan_stopped_work, + wiphy_work_init(&local->sched_scan_stopped_work, ieee80211_sched_scan_stopped_work); spin_lock_init(&local->ack_status_lock); @@ -847,6 +861,7 @@ local->hw.radiotap_timestamp.units_pos = -1; local->hw.radiotap_timestamp.accuracy = -1; + fbx80211_scum_local_init(local); return &local->hw; err_free: @@ -1445,6 +1460,7 @@ ieee80211_remove_interfaces(local); rtnl_unlock(); fail_rate: + ieee80211_txq_teardown_flows(local); fail_flows: ieee80211_led_exit(local); destroy_workqueue(local->workqueue); @@ -1481,13 +1497,17 @@ */ ieee80211_remove_interfaces(local); + ieee80211_txq_teardown_flows(local); + + wiphy_lock(local->hw.wiphy); + wiphy_delayed_work_cancel(local->hw.wiphy, &local->roc_work); + wiphy_work_cancel(local->hw.wiphy, &local->reconfig_filter); + wiphy_work_cancel(local->hw.wiphy, &local->sched_scan_stopped_work); + wiphy_work_cancel(local->hw.wiphy, &local->radar_detected_work); + wiphy_unlock(local->hw.wiphy); rtnl_unlock(); - cancel_delayed_work_sync(&local->roc_work); cancel_work_sync(&local->restart_work); - cancel_work_sync(&local->reconfig_filter); - flush_work(&local->sched_scan_stopped_work); - flush_work(&local->radar_detected_work); ieee80211_clear_tx_pending(local); rate_control_deinitialize(local); @@ -1517,8 +1537,9 @@ struct ieee80211_local *local = hw_to_local(hw); enum nl80211_band band; + fbx80211_scum_local_cleanup(local); + mutex_destroy(&local->iflist_mtx); - mutex_destroy(&local->mtx); if (local->wiphy_ciphers_allocated) { kfree(local->hw.wiphy->cipher_suites); diff -ruw linux-6.4/net/mac80211/mesh.c linux-6.4-fbx/net/mac80211/mesh.c --- linux-6.4/net/mac80211/mesh.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh.c 2024-04-22 13:40:53.019943390 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2008, 2009 open80211s Ltd. - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation * Authors: Luis Carlos Cobo * Javier Cardona */ @@ -45,7 +45,7 @@ set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags); - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); } /** @@ -56,6 +56,8 @@ * * This function checks if the mesh configuration of a mesh point matches the * local mesh configuration, i.e. if both nodes belong to the same mesh network. + * + * Returns: %true if both nodes belong to the same mesh */ bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, struct ieee802_11_elems *ie) @@ -119,6 +121,8 @@ * mesh_peer_accepts_plinks - check if an mp is willing to establish peer links * * @ie: information elements of a management frame from the mesh peer + * + * Returns: %true if the mesh peer is willing to establish peer links */ bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie) { @@ -133,10 +137,10 @@ * * Returns: beacon changed flag if the beacon content changed. */ -u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata) +u64 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata) { bool free_plinks; - u32 changed = 0; + u64 changed = 0; /* In case mesh_plink_free_count > 0 and mesh_plinktbl_capacity == 0, * the mesh interface might be able to establish plinks with peers that @@ -162,7 +166,7 @@ void mesh_sta_cleanup(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed = mesh_plink_deactivate(sta); + u64 changed = mesh_plink_deactivate(sta); if (changed) ieee80211_mbss_info_change_notify(sdata, changed); @@ -703,7 +707,7 @@ struct ieee80211_sub_if_data *sdata = from_timer(sdata, t, u.mesh.mesh_path_timer); - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } static void ieee80211_mesh_path_root_timer(struct timer_list *t) @@ -714,7 +718,7 @@ set_bit(MESH_WORK_ROOT, &ifmsh->wrkq_flags); - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } void ieee80211_mesh_root_setup(struct ieee80211_if_mesh *ifmsh) @@ -858,7 +862,7 @@ * @meshsa: source address in the mesh. Same as TA, as frame is * locally originated. * - * Return the length of the 802.11 (does not include a mesh control header) + * Returns: the length of the 802.11 frame header (excludes mesh control header) */ int ieee80211_fill_mesh_addresses(struct ieee80211_hdr *hdr, __le16 *fc, const u8 *meshda, const u8 *meshsa) @@ -891,7 +895,7 @@ * @addr6: 2nd address in the ae header, which corresponds to addr6 of the * mesh frame * - * Return the header length. + * Returns: the header length */ unsigned int ieee80211_new_mesh_header(struct ieee80211_sub_if_data *sdata, struct ieee80211s_hdr *meshhdr, @@ -923,7 +927,7 @@ static void ieee80211_mesh_housekeeping(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; - u32 changed; + u64 changed; if (ifmsh->mshcfg.plink_timeout > 0) ieee80211_sta_expire(sdata, ifmsh->mshcfg.plink_timeout * HZ); @@ -1164,7 +1168,7 @@ } void ieee80211_mbss_info_change_notify(struct ieee80211_sub_if_data *sdata, - u32 changed) + u64 changed) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; unsigned long bits = changed; @@ -1175,16 +1179,16 @@ /* if we race with running work, worst case this work becomes a noop */ for_each_set_bit(bit, &bits, sizeof(changed) * BITS_PER_BYTE) - set_bit(bit, &ifmsh->mbss_changed); + set_bit(bit, ifmsh->mbss_changed); set_bit(MESH_WORK_MBSS_CHANGED, &ifmsh->wrkq_flags); - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } int ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct ieee80211_local *local = sdata->local; - u32 changed = BSS_CHANGED_BEACON | + u64 changed = BSS_CHANGED_BEACON | BSS_CHANGED_BEACON_ENABLED | BSS_CHANGED_HT | BSS_CHANGED_BASIC_RATES | @@ -1202,7 +1206,7 @@ ifmsh->sync_offset_clockdrift_max = 0; set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags); ieee80211_mesh_root_setup(ifmsh); - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); sdata->vif.bss_conf.ht_operation_mode = ifmsh->mshcfg.ht_opmode; sdata->vif.bss_conf.enable_beacon = true; @@ -1257,7 +1261,7 @@ /* clear any mesh work (for next join) we may have accrued */ ifmsh->wrkq_flags = 0; - ifmsh->mbss_changed = 0; + memset(ifmsh->mbss_changed, 0, sizeof(ifmsh->mbss_changed)); local->fif_other_bss--; atomic_dec(&local->iff_allmultis); @@ -1291,7 +1295,7 @@ ieee80211_conn_flags_t conn_flags = 0; u32 vht_cap_info = 0; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); sband = ieee80211_get_sband(sdata); if (!sband) @@ -1525,12 +1529,11 @@ kfree(elems); } -int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata) +int ieee80211_mesh_finish_csa(struct ieee80211_sub_if_data *sdata, u64 *changed) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct mesh_csa_settings *tmp_csa_settings; int ret = 0; - int changed = 0; /* Reset the TTL value and Initiator flag */ ifmsh->csa_role = IEEE80211_MESH_CSA_ROLE_NONE; @@ -1545,21 +1548,22 @@ if (ret) return -EINVAL; - changed |= BSS_CHANGED_BEACON; + *changed |= BSS_CHANGED_BEACON; mcsa_dbg(sdata, "complete switching to center freq %d MHz", sdata->vif.bss_conf.chandef.chan->center_freq); - return changed; + return 0; } int ieee80211_mesh_csa_beacon(struct ieee80211_sub_if_data *sdata, - struct cfg80211_csa_settings *csa_settings) + struct cfg80211_csa_settings *csa_settings, + u64 *changed) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct mesh_csa_settings *tmp_csa_settings; int ret = 0; - lockdep_assert_held(&sdata->wdev.mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); tmp_csa_settings = kmalloc(sizeof(*tmp_csa_settings), GFP_ATOMIC); @@ -1579,7 +1583,8 @@ return ret; } - return BSS_CHANGED_BEACON; + *changed |= BSS_CHANGED_BEACON; + return 0; } static int mesh_fwd_csa_frame(struct ieee80211_sub_if_data *sdata, @@ -1690,11 +1695,11 @@ struct ieee80211_mgmt *mgmt; u16 stype; - sdata_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); /* mesh already went down */ if (!sdata->u.mesh.mesh_id_len) - goto out; + return; rx_status = IEEE80211_SKB_RXCB(skb); mgmt = (struct ieee80211_mgmt *) skb->data; @@ -1713,18 +1718,17 @@ ieee80211_mesh_rx_mgmt_action(sdata, mgmt, skb->len, rx_status); break; } -out: - sdata_unlock(sdata); } static void mesh_bss_info_changed(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; - u32 bit, changed = 0; + u32 bit; + u64 changed = 0; - for_each_set_bit(bit, &ifmsh->mbss_changed, + for_each_set_bit(bit, ifmsh->mbss_changed, sizeof(changed) * BITS_PER_BYTE) { - clear_bit(bit, &ifmsh->mbss_changed); + clear_bit(bit, ifmsh->mbss_changed); changed |= BIT(bit); } @@ -1743,11 +1747,11 @@ { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; - sdata_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); /* mesh already went down */ if (!sdata->u.mesh.mesh_id_len) - goto out; + return; if (ifmsh->preq_queue_len && time_after(jiffies, @@ -1765,8 +1769,6 @@ if (test_and_clear_bit(MESH_WORK_MBSS_CHANGED, &ifmsh->wrkq_flags)) mesh_bss_info_changed(sdata); -out: - sdata_unlock(sdata); } diff -ruw linux-6.4/net/mac80211/mesh.h linux-6.4-fbx/net/mac80211/mesh.h --- linux-6.4/net/mac80211/mesh.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh.h 2024-04-22 13:40:53.019943390 +0200 @@ -1,6 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2008, 2009 open80211s Ltd. + * Copyright (C) 2023 Intel Corporation * Authors: Luis Carlos Cobo * Javier Cardona */ @@ -211,7 +212,6 @@ const u8 *addr, struct ieee80211s_hdr *mesh_hdr); bool mesh_matches_local(struct ieee80211_sub_if_data *sdata, struct ieee802_11_elems *ie); -void mesh_ids_set_default(struct ieee80211_if_mesh *mesh); int mesh_add_meshconf_ie(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb); int mesh_add_meshid_ie(struct ieee80211_sub_if_data *sdata, @@ -252,11 +252,11 @@ const struct ieee80211_mesh_sync_ops *ieee80211_mesh_sync_ops_get(u8 method); /* wrapper for ieee80211_bss_info_change_notify() */ void ieee80211_mbss_info_change_notify(struct ieee80211_sub_if_data *sdata, - u32 changed); + u64 changed); /* mesh power save */ -u32 ieee80211_mps_local_status_update(struct ieee80211_sub_if_data *sdata); -u32 ieee80211_mps_set_sta_local_pm(struct sta_info *sta, +u64 ieee80211_mps_local_status_update(struct ieee80211_sub_if_data *sdata); +u64 ieee80211_mps_set_sta_local_pm(struct sta_info *sta, enum nl80211_mesh_power_mode pm); void ieee80211_mps_set_frame_flags(struct ieee80211_sub_if_data *sdata, struct sta_info *sta, @@ -303,12 +303,12 @@ u8 *hw_addr, struct ieee802_11_elems *ie, struct ieee80211_rx_status *rx_status); bool mesh_peer_accepts_plinks(struct ieee802_11_elems *ie); -u32 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata); +u64 mesh_accept_plinks_update(struct ieee80211_sub_if_data *sdata); void mesh_plink_timer(struct timer_list *t); void mesh_plink_broken(struct sta_info *sta); -u32 mesh_plink_deactivate(struct sta_info *sta); -u32 mesh_plink_open(struct sta_info *sta); -u32 mesh_plink_block(struct sta_info *sta); +u64 mesh_plink_deactivate(struct sta_info *sta); +u64 mesh_plink_open(struct sta_info *sta); +u64 mesh_plink_block(struct sta_info *sta); void mesh_rx_plink_frame(struct ieee80211_sub_if_data *sdata, struct ieee80211_mgmt *mgmt, size_t len, struct ieee80211_rx_status *rx_status); @@ -349,14 +349,14 @@ #ifdef CONFIG_MAC80211_MESH static inline -u32 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata) +u64 mesh_plink_inc_estab_count(struct ieee80211_sub_if_data *sdata) { atomic_inc(&sdata->u.mesh.estab_plinks); return mesh_accept_plinks_update(sdata) | BSS_CHANGED_BEACON; } static inline -u32 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata) +u64 mesh_plink_dec_estab_count(struct ieee80211_sub_if_data *sdata) { atomic_dec(&sdata->u.mesh.estab_plinks); return mesh_accept_plinks_update(sdata) | BSS_CHANGED_BEACON; diff -ruw linux-6.4/net/mac80211/mesh_hwmp.c linux-6.4-fbx/net/mac80211/mesh_hwmp.c --- linux-6.4/net/mac80211/mesh_hwmp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh_hwmp.c 2024-04-22 13:40:53.019943390 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2008, 2009 open80211s Ltd. - * Copyright (C) 2019, 2021-2022 Intel Corporation + * Copyright (C) 2019, 2021-2023 Intel Corporation * Author: Luis Carlos Cobo */ @@ -230,6 +230,8 @@ * Note: This function may be called with driver locks taken that the driver * also acquires in the TX path. To avoid a deadlock we don't transmit the * frame directly but add it to the pending queue instead. + * + * Returns: 0 on success */ int mesh_path_error_tx(struct ieee80211_sub_if_data *sdata, u8 ttl, const u8 *target, u32 target_sn, @@ -1026,14 +1028,14 @@ spin_unlock_bh(&ifmsh->mesh_preq_queue_lock); if (time_after(jiffies, ifmsh->last_preq + min_preq_int_jiff(sdata))) - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); else if (time_before(jiffies, ifmsh->last_preq)) { /* avoid long wait if did not send preqs for a long time * and jiffies wrapped around */ ifmsh->last_preq = jiffies - min_preq_int_jiff(sdata) - 1; - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } else mod_timer(&ifmsh->mesh_path_timer, ifmsh->last_preq + min_preq_int_jiff(sdata)); diff -ruw linux-6.4/net/mac80211/mesh_pathtbl.c linux-6.4-fbx/net/mac80211/mesh_pathtbl.c --- linux-6.4/net/mac80211/mesh_pathtbl.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh_pathtbl.c 2024-04-22 13:40:53.019943390 +0200 @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2008, 2009 open80211s Ltd. + * Copyright (C) 2023 Intel Corporation * Author: Luis Carlos Cobo */ @@ -173,6 +174,11 @@ /** * mesh_path_move_to_queue - Move or copy frames from one mpath queue to another * + * @gate_mpath: An active mpath the frames will be sent to (i.e. the gate) + * @from_mpath: The failed mpath + * @copy: When true, copy all the frames to the new mpath queue. When false, + * move them. + * * This function is used to transfer or copy frames from an unresolved mpath to * a gate mpath. The function also adds the Address Extension field and * updates the next hop. @@ -181,11 +187,6 @@ * destination addresses are updated. * * The gate mpath must be an active mpath with a valid mpath->next_hop. - * - * @gate_mpath: An active mpath the frames will be sent to (i.e. the gate) - * @from_mpath: The failed mpath - * @copy: When true, copy all the frames to the new mpath queue. When false, - * move them. */ static void mesh_path_move_to_queue(struct mesh_path *gate_mpath, struct mesh_path *from_mpath, @@ -330,6 +331,8 @@ /** * mesh_path_add_gate - add the given mpath to a mesh gate to our path table * @mpath: gate path to add to table + * + * Returns: 0 on success, -EEXIST */ int mesh_path_add_gate(struct mesh_path *mpath) { @@ -388,6 +391,8 @@ /** * mesh_gate_num - number of gates known to this interface * @sdata: subif data + * + * Returns: The number of gates */ int mesh_gate_num(struct ieee80211_sub_if_data *sdata) { @@ -648,7 +653,7 @@ cache = &sdata->u.mesh.tx_cache; spin_lock_bh(&cache->walk_lock); - entry = rhashtable_lookup(&cache->rht, addr, fast_tx_rht_params); + entry = rhashtable_lookup_fast(&cache->rht, addr, fast_tx_rht_params); if (entry) mesh_fast_tx_entry_free(cache, entry); spin_unlock_bh(&cache->walk_lock); @@ -861,10 +866,9 @@ /** * mesh_path_flush_by_iface - Deletes all mesh paths associated with a given iface * - * This function deletes both mesh paths as well as mesh portal paths. - * * @sdata: interface data to match * + * This function deletes both mesh paths as well as mesh portal paths. */ void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata) { @@ -944,6 +948,8 @@ * queue to that gate's queue. If there are more than one gates, the frames * are copied from each gate to the next. After frames are copied, the * mpath queues are emptied onto the transmission queue. + * + * Returns: 0 on success, -EHOSTUNREACH */ int mesh_path_send_to_gates(struct mesh_path *mpath) { diff -ruw linux-6.4/net/mac80211/mesh_plink.c linux-6.4-fbx/net/mac80211/mesh_plink.c --- linux-6.4/net/mac80211/mesh_plink.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh_plink.c 2024-04-22 13:40:53.019943390 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-only /* * Copyright (c) 2008, 2009 open80211s Ltd. - * Copyright (C) 2019, 2021-2022 Intel Corporation + * Copyright (C) 2019, 2021-2023 Intel Corporation * Author: Luis Carlos Cobo */ #include @@ -90,12 +90,13 @@ * * Returns BSS_CHANGED_ERP_SLOT or 0 for no change. */ -static u32 mesh_set_short_slot_time(struct ieee80211_sub_if_data *sdata) +static u64 mesh_set_short_slot_time(struct ieee80211_sub_if_data *sdata) { struct ieee80211_local *local = sdata->local; struct ieee80211_supported_band *sband; struct sta_info *sta; - u32 erp_rates = 0, changed = 0; + u32 erp_rates = 0; + u64 changed = 0; int i; bool short_slot = false; @@ -152,8 +153,10 @@ * selected if any non-HT peers are present in our MBSS. 20MHz-protection mode * is selected if all peers in our 20/40MHz MBSS support HT and at least one * HT20 peer is present. Otherwise no-protection mode is selected. + * + * Returns: BSS_CHANGED_HT or 0 for no change */ -static u32 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata) +static u64 mesh_set_ht_prot_mode(struct ieee80211_sub_if_data *sdata) { struct ieee80211_local *local = sdata->local; struct sta_info *sta; @@ -361,14 +364,14 @@ * Mesh paths with this peer as next hop should be flushed * by the caller outside of plink_lock. * - * Returns beacon changed flag if the beacon content changed. + * Returns: beacon changed flag if the beacon content changed. * * Locking: the caller must hold sta->mesh->plink_lock */ -static u32 __mesh_plink_deactivate(struct sta_info *sta) +static u64 __mesh_plink_deactivate(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed = 0; + u64 changed = 0; lockdep_assert_held(&sta->mesh->plink_lock); @@ -389,11 +392,13 @@ * @sta: mesh peer link to deactivate * * All mesh paths with this peer as next hop will be flushed + * + * Returns: beacon changed flag if the beacon content changed. */ -u32 mesh_plink_deactivate(struct sta_info *sta) +u64 mesh_plink_deactivate(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed; + u64 changed; spin_lock_bh(&sta->mesh->plink_lock); changed = __mesh_plink_deactivate(sta); @@ -450,7 +455,7 @@ changed |= IEEE80211_RC_BW_CHANGED; ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband, - elems->vht_cap_elem, + elems->vht_cap_elem, NULL, &sta->deflink); ieee80211_he_cap_ie_to_sta_he_cap(sdata, sband, elems->he_cap, @@ -622,7 +627,7 @@ struct ieee80211_rx_status *rx_status) { struct sta_info *sta; - u32 changed = 0; + u64 changed = 0; sta = mesh_sta_info_get(sdata, hw_addr, elems, rx_status); if (!sta) @@ -775,10 +780,10 @@ return llid; } -u32 mesh_plink_open(struct sta_info *sta) +u64 mesh_plink_open(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - u32 changed; + u64 changed; if (!test_sta_flag(sta, WLAN_STA_AUTH)) return 0; @@ -805,9 +810,9 @@ return changed; } -u32 mesh_plink_block(struct sta_info *sta) +u64 mesh_plink_block(struct sta_info *sta) { - u32 changed; + u64 changed; spin_lock_bh(&sta->mesh->plink_lock); changed = __mesh_plink_deactivate(sta); @@ -831,11 +836,11 @@ mod_plink_timer(sta, mshcfg->dot11MeshHoldingTimeout); } -static u32 mesh_plink_establish(struct ieee80211_sub_if_data *sdata, +static u64 mesh_plink_establish(struct ieee80211_sub_if_data *sdata, struct sta_info *sta) { struct mesh_config *mshcfg = &sdata->u.mesh.mshcfg; - u32 changed = 0; + u64 changed = 0; del_timer(&sta->mesh->plink_timer); sta->mesh->plink_state = NL80211_PLINK_ESTAB; @@ -857,12 +862,12 @@ * * Return: changed MBSS flags */ -static u32 mesh_plink_fsm(struct ieee80211_sub_if_data *sdata, +static u64 mesh_plink_fsm(struct ieee80211_sub_if_data *sdata, struct sta_info *sta, enum plink_event event) { struct mesh_config *mshcfg = &sdata->u.mesh.mshcfg; enum ieee80211_self_protected_actioncode action = 0; - u32 changed = 0; + u64 changed = 0; bool flush = false; mpl_dbg(sdata, "peer %pM in state %s got event %s\n", sta->sta.addr, @@ -1117,7 +1122,7 @@ struct sta_info *sta; enum plink_event event; enum ieee80211_self_protected_actioncode ftype; - u32 changed = 0; + u64 changed = 0; u8 ie_len = elems->peering_len; u16 plid, llid = 0; diff -ruw linux-6.4/net/mac80211/mesh_ps.c linux-6.4-fbx/net/mac80211/mesh_ps.c --- linux-6.4/net/mac80211/mesh_ps.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh_ps.c 2024-04-22 13:40:53.019943390 +0200 @@ -3,6 +3,7 @@ * Copyright 2012-2013, Marco Porsch * Copyright 2012-2013, cozybit Inc. * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2023 Intel Corporation */ #include "mesh.h" @@ -14,6 +15,8 @@ /** * mps_qos_null_get - create pre-addressed QoS Null frame for mesh powersave * @sta: the station to get the frame for + * + * Returns: A newly allocated SKB */ static struct sk_buff *mps_qos_null_get(struct sta_info *sta) { @@ -76,15 +79,17 @@ * * sets the non-peer power mode and triggers the driver PS (re-)configuration * Return BSS_CHANGED_BEACON if a beacon update is necessary. + * + * Returns: BSS_CHANGED_BEACON if a beacon update is in order. */ -u32 ieee80211_mps_local_status_update(struct ieee80211_sub_if_data *sdata) +u64 ieee80211_mps_local_status_update(struct ieee80211_sub_if_data *sdata) { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct sta_info *sta; bool peering = false; int light_sleep_cnt = 0; int deep_sleep_cnt = 0; - u32 changed = 0; + u64 changed = 0; enum nl80211_mesh_power_mode nonpeer_pm; rcu_read_lock(); @@ -146,9 +151,9 @@ * * @sta: mesh STA * @pm: the power mode to set - * Return BSS_CHANGED_BEACON if a beacon update is in order. + * Returns: BSS_CHANGED_BEACON if a beacon update is in order. */ -u32 ieee80211_mps_set_sta_local_pm(struct sta_info *sta, +u64 ieee80211_mps_set_sta_local_pm(struct sta_info *sta, enum nl80211_mesh_power_mode pm) { struct ieee80211_sub_if_data *sdata = sta->sdata; diff -ruw linux-6.4/net/mac80211/mesh_sync.c linux-6.4-fbx/net/mac80211/mesh_sync.c --- linux-6.4/net/mac80211/mesh_sync.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mesh_sync.c 2024-04-22 13:40:53.019943390 +0200 @@ -3,7 +3,7 @@ * Copyright 2011-2012, Pavel Zubarev * Copyright 2011-2012, Marco Porsch * Copyright 2011-2012, cozybit Inc. - * Copyright (C) 2021 Intel Corporation + * Copyright (C) 2021,2023 Intel Corporation */ #include "ieee80211_i.h" @@ -37,6 +37,8 @@ * mesh_peer_tbtt_adjusting - check if an mp is currently adjusting its TBTT * * @cfg: mesh config element from the mesh peer (or %NULL) + * + * Returns: If the mesh peer is currently adjusting its TBTT */ static bool mesh_peer_tbtt_adjusting(const struct ieee80211_meshconf_ie *cfg) { diff -ruw linux-6.4/net/mac80211/mlme.c linux-6.4-fbx/net/mac80211/mlme.c --- linux-6.4/net/mac80211/mlme.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/mlme.c 2024-04-22 13:40:53.023943499 +0200 @@ -110,7 +110,8 @@ return 0; /* set 160/320 supported to get the full AP definition */ - ieee80211_chandef_eht_oper(eht_oper, true, true, &ap_chandef); + ieee80211_chandef_eht_oper((const void *)eht_oper->optional, + true, true, &ap_chandef); ap_center_freq = ap_chandef.center_freq1; ap_bw = 20 * BIT(u8_get_bits(info->control, IEEE80211_EHT_OPER_CHAN_WIDTH)); @@ -175,7 +176,7 @@ static void run_again(struct ieee80211_sub_if_data *sdata, unsigned long timeout) { - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (!timer_pending(&sdata->u.mgd.timer) || time_before(timeout, sdata->u.mgd.timer.expires)) @@ -388,7 +389,7 @@ if (eht_oper && (eht_oper->params & IEEE80211_EHT_OPER_INFO_PRESENT)) { struct cfg80211_chan_def eht_chandef = *chandef; - ieee80211_chandef_eht_oper(eht_oper, + ieee80211_chandef_eht_oper((const void *)eht_oper->optional, eht_chandef.width == NL80211_CHAN_WIDTH_160, false, &eht_chandef); @@ -511,16 +512,14 @@ /* don't check HE if we associated as non-HE station */ if (link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HE || - !ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif))) { + !ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif)) { he_oper = NULL; eht_oper = NULL; } /* don't check EHT if we associated as non-EHT station */ if (link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_EHT || - !ieee80211_get_eht_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif))) + !ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif)) eht_oper = NULL; /* @@ -776,8 +775,7 @@ const struct ieee80211_sta_he_cap *he_cap; u8 he_cap_size; - he_cap = ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + he_cap = ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); if (WARN_ON(!he_cap)) return; @@ -806,10 +804,8 @@ const struct ieee80211_sta_eht_cap *eht_cap; u8 eht_cap_size; - he_cap = ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); - eht_cap = ieee80211_get_eht_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + he_cap = ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); + eht_cap = ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif); /* * EHT capabilities element is only added if the HE capabilities element @@ -835,7 +831,6 @@ struct ieee80211_supported_band *sband, struct ieee80211_mgd_assoc_data *assoc_data) { - unsigned int shift = ieee80211_chanwidth_get_shift(width); unsigned int rates_len, supp_rates_len; u32 rates = 0; int i, count; @@ -874,8 +869,7 @@ count = 0; for (i = 0; i < sband->n_bitrates; i++) { if (BIT(i) & rates) { - int rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, - 5 * (1 << shift)); + int rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, 5); *pos++ = (u8)rate; if (++count == 8) break; @@ -891,8 +885,7 @@ if (BIT(i) & rates) { int rate; - rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, - 5 * (1 << shift)); + rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, 5); *pos++ = (u8)rate; } } @@ -1287,7 +1280,7 @@ u8 *ml_elem_len; void *capab_pos; - if (!sdata->vif.valid_links) + if (!ieee80211_vif_is_mld(&sdata->vif)) return; ift_ext_capa = cfg80211_get_iftype_ext_capa(local->hw.wiphy, @@ -1406,7 +1399,7 @@ assoc_data->ie, assoc_data->ie_len); - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); size = local->hw.extra_tx_headroom + sizeof(*mgmt) + /* bit too much but doesn't matter */ @@ -1462,7 +1455,7 @@ capab |= WLAN_CAPABILITY_PRIVACY; } - if (sdata->vif.valid_links) { + if (ieee80211_vif_is_mld(&sdata->vif)) { /* consider the multi-link element with STA profile */ size += sizeof(struct ieee80211_multi_link_elem); /* max common info field in basic multi-link element */ @@ -1591,6 +1584,7 @@ ifmgd->assoc_req_ies_len = pos - ie_start; + info.link_id = assoc_data->assoc_link_id; drv_mgd_prepare_tx(local, sdata, &info); IEEE80211_SKB_CB(skb)->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT; @@ -1680,10 +1674,12 @@ } /* spectrum management related things */ -static void ieee80211_chswitch_work(struct work_struct *work) +static void ieee80211_chswitch_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_link_data *link = - container_of(work, struct ieee80211_link_data, u.mgd.chswitch_work); + container_of(work, struct ieee80211_link_data, + u.mgd.chswitch_work.work); struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; @@ -1692,15 +1688,13 @@ if (!ieee80211_sdata_running(sdata)) return; - sdata_lock(sdata); - mutex_lock(&local->mtx); - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (!ifmgd->associated) - goto out; + return; if (!link->conf->csa_active) - goto out; + return; /* * using reservation isn't immediate as it may be deferred until later @@ -1716,39 +1710,32 @@ * reservations */ if (link->reserved_ready) - goto out; + return; ret = ieee80211_link_use_reserved_context(link); if (ret) { sdata_info(sdata, "failed to use reserved channel context, disconnecting (err=%d)\n", ret); - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &ifmgd->csa_connection_drop_work); - goto out; } - - goto out; + return; } if (!cfg80211_chandef_identical(&link->conf->chandef, &link->csa_chandef)) { sdata_info(sdata, "failed to finalize channel switch, disconnecting\n"); - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &ifmgd->csa_connection_drop_work); - goto out; + return; } link->u.mgd.csa_waiting_bcn = true; ieee80211_sta_reset_beacon_monitor(sdata); ieee80211_sta_reset_conn_monitor(sdata); - -out: - mutex_unlock(&local->chanctx_mtx); - mutex_unlock(&local->mtx); - sdata_unlock(sdata); } static void ieee80211_chswitch_post_beacon(struct ieee80211_link_data *link) @@ -1758,7 +1745,7 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; int ret; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); WARN_ON(!link->conf->csa_active); @@ -1776,47 +1763,49 @@ */ link->u.mgd.beacon_crc_valid = false; - ret = drv_post_channel_switch(sdata); + ret = drv_post_channel_switch(link); if (ret) { sdata_info(sdata, "driver post channel switch failed, disconnecting\n"); - ieee80211_queue_work(&local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &ifmgd->csa_connection_drop_work); return; } - cfg80211_ch_switch_notify(sdata->dev, &link->reserved_chandef, 0, 0); + cfg80211_ch_switch_notify(sdata->dev, &link->reserved_chandef, + link->link_id, 0); } -void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success) +void ieee80211_chswitch_done(struct ieee80211_vif *vif, bool success, + unsigned int link_id) { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); - struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - if (WARN_ON(sdata->vif.valid_links)) - success = false; + trace_api_chswitch_done(sdata, success, link_id); + + rcu_read_lock(); - trace_api_chswitch_done(sdata, success); if (!success) { sdata_info(sdata, "driver channel switch failed, disconnecting\n"); - ieee80211_queue_work(&sdata->local->hw, - &ifmgd->csa_connection_drop_work); + wiphy_work_queue(sdata->local->hw.wiphy, + &sdata->u.mgd.csa_connection_drop_work); } else { - ieee80211_queue_work(&sdata->local->hw, - &sdata->deflink.u.mgd.chswitch_work); - } + struct ieee80211_link_data *link = + rcu_dereference(sdata->link[link_id]); + + if (WARN_ON(!link)) { + rcu_read_unlock(); + return; } -EXPORT_SYMBOL(ieee80211_chswitch_done); -static void ieee80211_chswitch_timer(struct timer_list *t) -{ - struct ieee80211_link_data *link = - from_timer(link, t, u.mgd.chswitch_timer); + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &link->u.mgd.chswitch_work, 0); + } - ieee80211_queue_work(&link->sdata->local->hw, - &link->u.mgd.chswitch_work); + rcu_read_unlock(); } +EXPORT_SYMBOL(ieee80211_chswitch_done); static void ieee80211_sta_abort_chanswitch(struct ieee80211_link_data *link) @@ -1824,14 +1813,12 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; + lockdep_assert_wiphy(local->hw.wiphy); + if (!local->ops->abort_channel_switch) return; - mutex_lock(&local->mtx); - - mutex_lock(&local->chanctx_mtx); ieee80211_link_unreserve_chanctx(link); - mutex_unlock(&local->chanctx_mtx); if (link->csa_block_tx) ieee80211_wake_vif_queues(local, sdata, @@ -1840,8 +1827,6 @@ link->csa_block_tx = false; link->conf->csa_active = false; - mutex_unlock(&local->mtx); - drv_abort_channel_switch(sdata); } @@ -1861,16 +1846,14 @@ struct ieee80211_csa_ie csa_ie; struct ieee80211_channel_switch ch_switch; struct ieee80211_bss *bss; + unsigned long timeout; int res; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); if (!cbss) return; - if (local->scanning) - return; - current_band = cbss->channel->band; bss = (void *)cbss->priv; res = ieee80211_parse_ch_switch_ie(sdata, elems, current_band, @@ -1888,7 +1871,7 @@ } if (res < 0) - goto lock_and_drop_connection; + goto drop_connection; if (beacon && link->conf->csa_active && !link->u.mgd.csa_waiting_bcn) { @@ -1910,7 +1893,7 @@ csa_ie.chandef.chan->center_freq, csa_ie.chandef.width, csa_ie.chandef.center_freq1, csa_ie.chandef.center_freq2); - goto lock_and_drop_connection; + goto drop_connection; } if (!cfg80211_chandef_usable(local->hw.wiphy, &csa_ie.chandef, @@ -1925,7 +1908,7 @@ csa_ie.chandef.width, csa_ie.chandef.center_freq1, csa_ie.chandef.freq1_offset, csa_ie.chandef.center_freq2); - goto lock_and_drop_connection; + goto drop_connection; } if (cfg80211_chandef_identical(&csa_ie.chandef, @@ -1948,10 +1931,8 @@ */ ieee80211_teardown_tdls_peers(sdata); - mutex_lock(&local->mtx); - mutex_lock(&local->chanctx_mtx); conf = rcu_dereference_protected(link->conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (!conf) { sdata_info(sdata, "no channel context assigned to vif?, disconnecting\n"); @@ -1981,7 +1962,6 @@ res); goto drop_connection; } - mutex_unlock(&local->chanctx_mtx); link->conf->csa_active = true; link->csa_chandef = csa_ie.chandef; @@ -1992,10 +1972,10 @@ if (link->csa_block_tx) ieee80211_stop_vif_queues(local, sdata, IEEE80211_QUEUE_STOP_REASON_CSA); - mutex_unlock(&local->mtx); - cfg80211_ch_switch_started_notify(sdata->dev, &csa_ie.chandef, 0, - csa_ie.count, csa_ie.mode, 0); + cfg80211_ch_switch_started_notify(sdata->dev, &csa_ie.chandef, + link->link_id, csa_ie.count, + csa_ie.mode, 0); if (local->ops->channel_switch) { /* use driver's channel switch callback */ @@ -2004,16 +1984,12 @@ } /* channel switch handled in software */ - if (csa_ie.count <= 1) - ieee80211_queue_work(&local->hw, &link->u.mgd.chswitch_work); - else - mod_timer(&link->u.mgd.chswitch_timer, - TU_TO_EXP_TIME((csa_ie.count - 1) * - cbss->beacon_interval)); - return; - lock_and_drop_connection: - mutex_lock(&local->mtx); - mutex_lock(&local->chanctx_mtx); + timeout = TU_TO_JIFFIES((max_t(int, csa_ie.count, 1) - 1) * + cbss->beacon_interval); + wiphy_delayed_work_queue(local->hw.wiphy, + &link->u.mgd.chswitch_work, + timeout); + return; drop_connection: /* * This is just so that the disconnect flow will know that @@ -2025,9 +2001,8 @@ link->conf->csa_active = true; link->csa_block_tx = csa_ie.mode; - ieee80211_queue_work(&local->hw, &ifmgd->csa_connection_drop_work); - mutex_unlock(&local->chanctx_mtx); - mutex_unlock(&local->mtx); + wiphy_work_queue(sdata->local->hw.wiphy, + &ifmgd->csa_connection_drop_work); } static bool @@ -2116,7 +2091,7 @@ *pwr_level = (__s8)cisco_dtpc_ie[4]; } -static u32 ieee80211_handle_pwr_constr(struct ieee80211_link_data *link, +static u64 ieee80211_handle_pwr_constr(struct ieee80211_link_data *link, struct ieee80211_channel *channel, struct ieee80211_mgmt *mgmt, const u8 *country_ie, u8 country_ie_len, @@ -2223,7 +2198,8 @@ conf->flags &= ~IEEE80211_CONF_PS; ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); del_timer_sync(&local->dynamic_ps_timer); - cancel_work_sync(&local->dynamic_ps_enable_work); + wiphy_work_cancel(local->hw.wiphy, + &local->dynamic_ps_enable_work); } } @@ -2320,7 +2296,8 @@ } } -void ieee80211_dynamic_ps_disable_work(struct work_struct *work) +void ieee80211_dynamic_ps_disable_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, @@ -2337,7 +2314,8 @@ false); } -void ieee80211_dynamic_ps_enable_work(struct work_struct *work) +void ieee80211_dynamic_ps_enable_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, @@ -2410,26 +2388,25 @@ { struct ieee80211_local *local = from_timer(local, t, dynamic_ps_timer); - ieee80211_queue_work(&local->hw, &local->dynamic_ps_enable_work); + wiphy_work_queue(local->hw.wiphy, &local->dynamic_ps_enable_work); } -void ieee80211_dfs_cac_timer_work(struct work_struct *work) +void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work) { - struct delayed_work *delayed_work = to_delayed_work(work); struct ieee80211_link_data *link = - container_of(delayed_work, struct ieee80211_link_data, - dfs_cac_timer_work); + container_of(work, struct ieee80211_link_data, + dfs_cac_timer_work.work); struct cfg80211_chan_def chandef = link->conf->chandef; struct ieee80211_sub_if_data *sdata = link->sdata; - mutex_lock(&sdata->local->mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + if (sdata->wdev.cac_started) { ieee80211_link_release_channel(link); cfg80211_cac_event(sdata->dev, &chandef, NL80211_RADAR_CAC_FINISHED, GFP_KERNEL); } - mutex_unlock(&sdata->local->mtx); } static bool @@ -2499,8 +2476,10 @@ ac); tx_tspec->action = TX_TSPEC_ACTION_NONE; ret = true; - schedule_delayed_work(&ifmgd->tx_tspec_wk, - tx_tspec->time_slice_start + HZ - now + 1); + wiphy_delayed_work_queue(local->hw.wiphy, + &ifmgd->tx_tspec_wk, + tx_tspec->time_slice_start + + HZ - now + 1); break; case TX_TSPEC_ACTION_NONE: /* nothing now */ @@ -2518,7 +2497,8 @@ BSS_CHANGED_QOS); } -static void ieee80211_sta_handle_tspec_ac_params_wk(struct work_struct *work) +static void ieee80211_sta_handle_tspec_ac_params_wk(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata; @@ -2650,7 +2630,7 @@ params[ac].aifs = pos[0] & 0x0f; if (params[ac].aifs < 2) { - sdata_info(sdata, + link_info(link, "AP has invalid WMM params (AIFSN=%d for ACI %d), will use 2\n", params[ac].aifs, aci); params[ac].aifs = 2; @@ -2663,7 +2643,7 @@ if (params[ac].cw_min == 0 || params[ac].cw_min > params[ac].cw_max) { - sdata_info(sdata, + link_info(link, "AP has invalid WMM params (CWmin/max=%d/%d for ACI %d), using defaults\n", params[ac].cw_min, params[ac].cw_max, aci); return false; @@ -2674,7 +2654,7 @@ /* WMM specification requires all 4 ACIs. */ for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { if (params[ac].cw_min == 0) { - sdata_info(sdata, + link_info(link, "AP has invalid WMM params (missing AC %d), using defaults\n", ac); return false; @@ -2693,7 +2673,7 @@ static void __ieee80211_stop_poll(struct ieee80211_sub_if_data *sdata) { - lockdep_assert_held(&sdata->local->mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); sdata->u.mgd.flags &= ~IEEE80211_STA_CONNECTION_POLL; ieee80211_run_deferred_scan(sdata->local); @@ -2701,17 +2681,17 @@ static void ieee80211_stop_poll(struct ieee80211_sub_if_data *sdata) { - mutex_lock(&sdata->local->mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + __ieee80211_stop_poll(sdata); - mutex_unlock(&sdata->local->mtx); } -static u32 ieee80211_handle_bss_capability(struct ieee80211_link_data *link, +static u64 ieee80211_handle_bss_capability(struct ieee80211_link_data *link, u16 capab, bool erp_valid, u8 erp) { struct ieee80211_bss_conf *bss_conf = link->conf; struct ieee80211_supported_band *sband; - u32 changed = 0; + u64 changed = 0; bool use_protection; bool use_short_preamble; bool use_short_slot; @@ -2757,7 +2737,7 @@ struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_bss_conf *bss_conf = link->conf; struct ieee80211_bss *bss = (void *)cbss->priv; - u32 changed = BSS_CHANGED_QOS; + u64 changed = BSS_CHANGED_QOS; /* not really used in MLO */ sdata->u.mgd.beacon_timeout = @@ -2821,6 +2801,8 @@ u64 vif_changed = BSS_CHANGED_ASSOC; unsigned int link_id; + lockdep_assert_wiphy(local->hw.wiphy); + sdata->u.mgd.associated = true; for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { @@ -2831,6 +2813,10 @@ assoc_data->link[link_id].status != WLAN_STATUS_SUCCESS) continue; + if (ieee80211_vif_is_mld(&sdata->vif) && + !(ieee80211_vif_usable_links(&sdata->vif) & BIT(link_id))) + continue; + link = sdata_dereference(sdata->link[link_id], sdata); if (WARN_ON(!link)) return; @@ -2849,7 +2835,7 @@ if (vif_cfg->arp_addr_cnt) vif_changed |= BSS_CHANGED_ARP_FILTER; - if (sdata->vif.valid_links) { + if (ieee80211_vif_is_mld(&sdata->vif)) { for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { @@ -2857,6 +2843,8 @@ struct cfg80211_bss *cbss = assoc_data->link[link_id].bss; if (!cbss || + !(BIT(link_id) & + ieee80211_vif_usable_links(&sdata->vif)) || assoc_data->link[link_id].status != WLAN_STATUS_SUCCESS) continue; @@ -2876,12 +2864,10 @@ vif_changed | changed[0]); } - mutex_lock(&local->iflist_mtx); ieee80211_recalc_ps(local); - mutex_unlock(&local->iflist_mtx); /* leave this here to not change ordering in non-MLO cases */ - if (!sdata->vif.valid_links) + if (!ieee80211_vif_is_mld(&sdata->vif)) ieee80211_recalc_smps(sdata, &sdata->deflink); ieee80211_recalc_ps_vif(sdata); @@ -2895,12 +2881,12 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_local *local = sdata->local; unsigned int link_id; - u32 changed = 0; + u64 changed = 0; struct ieee80211_prep_tx_info info = { .subtype = stype, }; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON_ONCE(tx && !frame_buf)) return; @@ -2951,10 +2937,23 @@ * deauthentication frame by calling mgd_prepare_tx, if the * driver requested so. */ - if (ieee80211_hw_check(&local->hw, DEAUTH_NEED_MGD_TX_PREP) && - !sdata->deflink.u.mgd.have_beacon) { + if (ieee80211_hw_check(&local->hw, DEAUTH_NEED_MGD_TX_PREP)) { + for (link_id = 0; link_id < ARRAY_SIZE(sdata->link); + link_id++) { + struct ieee80211_link_data *link; + + link = sdata_dereference(sdata->link[link_id], + sdata); + if (!link) + continue; + if (link->u.mgd.have_beacon) + break; + } + if (link_id == IEEE80211_MLD_MAX_NUM_LINKS) { + info.link_id = ffs(sdata->vif.active_links) - 1; drv_mgd_prepare_tx(sdata->local, sdata, &info); } + } ieee80211_send_deauth_disassoc(sdata, sdata->vif.cfg.ap_addr, sdata->vif.cfg.ap_addr, stype, @@ -2977,7 +2976,7 @@ sta_info_flush(sdata); /* finally reset all BSS / config parameters */ - if (!sdata->vif.valid_links) + if (!ieee80211_vif_is_mld(&sdata->vif)) changed |= ieee80211_reset_erp_info(sdata); ieee80211_led_assoc(local, 0); @@ -3002,21 +3001,21 @@ sizeof(sdata->vif.bss_conf.mu_group.membership)); memset(sdata->vif.bss_conf.mu_group.position, 0, sizeof(sdata->vif.bss_conf.mu_group.position)); - if (!sdata->vif.valid_links) + if (!ieee80211_vif_is_mld(&sdata->vif)) changed |= BSS_CHANGED_MU_GROUPS; sdata->vif.bss_conf.mu_mimo_owner = false; sdata->deflink.ap_power_level = IEEE80211_UNSET_POWER_LEVEL; del_timer_sync(&local->dynamic_ps_timer); - cancel_work_sync(&local->dynamic_ps_enable_work); + wiphy_work_cancel(local->hw.wiphy, &local->dynamic_ps_enable_work); /* Disable ARP filtering */ if (sdata->vif.cfg.arp_addr_cnt) changed |= BSS_CHANGED_ARP_FILTER; sdata->vif.bss_conf.qos = false; - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { changed |= BSS_CHANGED_QOS; /* The BSSID (not really interesting) and HT changed */ changed |= BSS_CHANGED_BSSID | BSS_CHANGED_HT; @@ -3031,7 +3030,6 @@ del_timer_sync(&sdata->u.mgd.conn_mon_timer); del_timer_sync(&sdata->u.mgd.bcn_mon_timer); del_timer_sync(&sdata->u.mgd.timer); - del_timer_sync(&sdata->deflink.u.mgd.chswitch_timer); sdata->vif.bss_conf.dtim_period = 0; sdata->vif.bss_conf.beacon_rate = NULL; @@ -3042,7 +3040,6 @@ ifmgd->flags = 0; sdata->deflink.u.mgd.conn_flags = 0; - mutex_lock(&local->mtx); for (link_id = 0; link_id < ARRAY_SIZE(sdata->link); link_id++) { struct ieee80211_link_data *link; @@ -3061,18 +3058,20 @@ IEEE80211_QUEUE_STOP_REASON_CSA); sdata->deflink.csa_block_tx = false; } - mutex_unlock(&local->mtx); /* existing TX TSPEC sessions no longer exist */ memset(ifmgd->tx_tspec, 0, sizeof(ifmgd->tx_tspec)); - cancel_delayed_work_sync(&ifmgd->tx_tspec_wk); + wiphy_delayed_work_cancel(local->hw.wiphy, &ifmgd->tx_tspec_wk); sdata->vif.bss_conf.pwr_reduction = 0; sdata->vif.bss_conf.tx_pwr_env_num = 0; memset(sdata->vif.bss_conf.tx_pwr_env, 0, sizeof(sdata->vif.bss_conf.tx_pwr_env)); - ieee80211_vif_set_links(sdata, 0); + memset(&sdata->u.mgd.ttlm_info, 0, + sizeof(sdata->u.mgd.ttlm_info)); + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, &ifmgd->ttlm_work); + ieee80211_vif_set_links(sdata, 0, 0); } static void ieee80211_reset_ap_probe(struct ieee80211_sub_if_data *sdata) @@ -3080,18 +3079,17 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_local *local = sdata->local; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); + if (!(ifmgd->flags & IEEE80211_STA_CONNECTION_POLL)) - goto out; + return; __ieee80211_stop_poll(sdata); - mutex_lock(&local->iflist_mtx); ieee80211_recalc_ps(local); - mutex_unlock(&local->iflist_mtx); if (ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR)) - goto out; + return; /* * We've received a probe response, but are not sure whether @@ -3103,8 +3101,6 @@ mod_timer(&ifmgd->conn_mon_timer, round_jiffies_up(jiffies + IEEE80211_CONNECTION_IDLE_TIME)); -out: - mutex_unlock(&local->mtx); } static void ieee80211_sta_tx_wmm_ac_notify(struct ieee80211_sub_if_data *sdata, @@ -3133,7 +3129,8 @@ if (tx_tspec->downgraded) { tx_tspec->action = TX_TSPEC_ACTION_STOP_DOWNGRADE; - schedule_delayed_work(&ifmgd->tx_tspec_wk, 0); + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &ifmgd->tx_tspec_wk, 0); } } @@ -3145,7 +3142,8 @@ if (tx_tspec->consumed_tx_time >= tx_tspec->admitted_time) { tx_tspec->downgraded = true; tx_tspec->action = TX_TSPEC_ACTION_DOWNGRADE; - schedule_delayed_work(&ifmgd->tx_tspec_wk, 0); + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &ifmgd->tx_tspec_wk, 0); } } @@ -3162,7 +3160,7 @@ sdata->u.mgd.probe_send_count = 0; else sdata->u.mgd.nullfunc_failed = true; - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } static void ieee80211_mlme_send_probe_req(struct ieee80211_sub_if_data *sdata, @@ -3186,7 +3184,9 @@ u8 unicast_limit = max(1, max_probe_tries - 3); struct sta_info *sta; - if (WARN_ON(sdata->vif.valid_links)) + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + if (WARN_ON(ieee80211_vif_is_mld(&sdata->vif))) return; /* @@ -3207,11 +3207,9 @@ ifmgd->probe_send_count++; if (dst) { - mutex_lock(&sdata->local->sta_mtx); sta = sta_info_get(sdata, dst); if (!WARN_ON(!sta)) ieee80211_check_fast_rx(sta); - mutex_unlock(&sdata->local->sta_mtx); } if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) { @@ -3234,29 +3232,24 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; bool already = false; - if (WARN_ON_ONCE(sdata->vif.valid_links)) + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + if (WARN_ON_ONCE(ieee80211_vif_is_mld(&sdata->vif))) return; if (!ieee80211_sdata_running(sdata)) return; - sdata_lock(sdata); - if (!ifmgd->associated) - goto out; - - mutex_lock(&sdata->local->mtx); + return; - if (sdata->local->tmp_channel || sdata->local->scanning) { - mutex_unlock(&sdata->local->mtx); - goto out; - } + if (sdata->local->tmp_channel || sdata->local->scanning) + return; if (sdata->local->suspending) { /* reschedule after resume */ - mutex_unlock(&sdata->local->mtx); ieee80211_reset_ap_probe(sdata); - goto out; + return; } if (beacon) { @@ -3283,19 +3276,13 @@ ifmgd->flags |= IEEE80211_STA_CONNECTION_POLL; - mutex_unlock(&sdata->local->mtx); - if (already) - goto out; + return; - mutex_lock(&sdata->local->iflist_mtx); ieee80211_recalc_ps(sdata->local); - mutex_unlock(&sdata->local->iflist_mtx); ifmgd->probe_send_count = 0; ieee80211_mgd_probe_ap_send(sdata); - out: - sdata_unlock(sdata); } struct sk_buff *ieee80211_ap_probereq_get(struct ieee80211_hw *hw, @@ -3308,12 +3295,12 @@ const struct element *ssid; int ssid_len; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + if (WARN_ON(sdata->vif.type != NL80211_IFTYPE_STATION || - sdata->vif.valid_links)) + ieee80211_vif_is_mld(&sdata->vif))) return NULL; - sdata_assert_lock(sdata); - if (ifmgd->associated) cbss = sdata->deflink.u.mgd.bss; else if (ifmgd->auth_data) @@ -3367,14 +3354,14 @@ u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; bool tx; - sdata_lock(sdata); - if (!ifmgd->associated) { - sdata_unlock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); + + if (!ifmgd->associated) return; - } /* in MLO assume we have a link where we can TX the frame */ - tx = sdata->vif.valid_links || !sdata->deflink.csa_block_tx; + tx = ieee80211_vif_is_mld(&sdata->vif) || + !sdata->deflink.csa_block_tx; if (!ifmgd->driver_disconnect) { unsigned int link_id; @@ -3404,7 +3391,6 @@ WLAN_REASON_DEAUTH_LEAVING : WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, tx, frame_buf); - mutex_lock(&local->mtx); /* the other links will be destroyed */ sdata->vif.bss_conf.csa_active = false; sdata->deflink.u.mgd.csa_waiting_bcn = false; @@ -3413,17 +3399,15 @@ IEEE80211_QUEUE_STOP_REASON_CSA); sdata->deflink.csa_block_tx = false; } - mutex_unlock(&local->mtx); ieee80211_report_disconnect(sdata, frame_buf, sizeof(frame_buf), tx, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, ifmgd->reconnect); ifmgd->reconnect = false; - - sdata_unlock(sdata); } -static void ieee80211_beacon_connection_loss_work(struct work_struct *work) +static void ieee80211_beacon_connection_loss_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, @@ -3448,7 +3432,8 @@ } } -static void ieee80211_csa_connection_drop_work(struct work_struct *work) +static void ieee80211_csa_connection_drop_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, @@ -3465,7 +3450,7 @@ trace_api_beacon_loss(sdata); sdata->u.mgd.connection_loss = false; - ieee80211_queue_work(hw, &sdata->u.mgd.beacon_connection_loss_work); + wiphy_work_queue(hw->wiphy, &sdata->u.mgd.beacon_connection_loss_work); } EXPORT_SYMBOL(ieee80211_beacon_loss); @@ -3477,7 +3462,7 @@ trace_api_connection_loss(sdata); sdata->u.mgd.connection_loss = true; - ieee80211_queue_work(hw, &sdata->u.mgd.beacon_connection_loss_work); + wiphy_work_queue(hw->wiphy, &sdata->u.mgd.beacon_connection_loss_work); } EXPORT_SYMBOL(ieee80211_connection_loss); @@ -3493,7 +3478,7 @@ sdata->u.mgd.driver_disconnect = true; sdata->u.mgd.reconnect = reconnect; - ieee80211_queue_work(hw, &sdata->u.mgd.beacon_connection_loss_work); + wiphy_work_queue(hw->wiphy, &sdata->u.mgd.beacon_connection_loss_work); } EXPORT_SYMBOL(ieee80211_disconnect); @@ -3502,7 +3487,7 @@ { struct ieee80211_mgd_auth_data *auth_data = sdata->u.mgd.auth_data; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (!assoc) { /* @@ -3520,10 +3505,8 @@ BSS_CHANGED_BSSID); sdata->u.mgd.flags = 0; - mutex_lock(&sdata->local->mtx); ieee80211_link_release_channel(&sdata->deflink); - ieee80211_vif_set_links(sdata, 0); - mutex_unlock(&sdata->local->mtx); + ieee80211_vif_set_links(sdata, 0, 0); } cfg80211_put_bss(sdata->local->hw.wiphy, auth_data->bss); @@ -3543,7 +3526,7 @@ { struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (status != ASSOC_SUCCESS) { /* @@ -3573,16 +3556,14 @@ for (i = 0; i < ARRAY_SIZE(data.bss); i++) data.bss[i] = assoc_data->link[i].bss; - if (sdata->vif.valid_links) + if (ieee80211_vif_is_mld(&sdata->vif)) data.ap_mld_addr = assoc_data->ap_addr; cfg80211_assoc_failure(sdata->dev, &data); } - mutex_lock(&sdata->local->mtx); ieee80211_link_release_channel(&sdata->deflink); - ieee80211_vif_set_links(sdata, 0); - mutex_unlock(&sdata->local->mtx); + ieee80211_vif_set_links(sdata, 0, 0); } kfree(assoc_data); @@ -3599,6 +3580,7 @@ u32 tx_flags = 0; struct ieee80211_prep_tx_info info = { .subtype = IEEE80211_STYPE_AUTH, + .link_id = auth_data->link_id, }; pos = mgmt->u.auth.variable; @@ -3624,7 +3606,8 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; const u8 *ap_addr = ifmgd->auth_data->ap_addr; struct sta_info *sta; - bool result = true; + + lockdep_assert_wiphy(sdata->local->hw.wiphy); sdata_info(sdata, "authenticated\n"); ifmgd->auth_data->done = true; @@ -3633,22 +3616,17 @@ run_again(sdata, ifmgd->auth_data->timeout); /* move station state to auth */ - mutex_lock(&sdata->local->sta_mtx); sta = sta_info_get(sdata, ap_addr); if (!sta) { WARN_ONCE(1, "%s: STA %pM not found", sdata->name, ap_addr); - result = false; - goto out; + return false; } if (sta_info_move_state(sta, IEEE80211_STA_AUTH)) { sdata_info(sdata, "failed moving %pM to auth\n", ap_addr); - result = false; - goto out; + return false; } -out: - mutex_unlock(&sdata->local->sta_mtx); - return result; + return true; } static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, @@ -3664,7 +3642,7 @@ .subtype = IEEE80211_STYPE_AUTH, }; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (len < 24 + 6) return; @@ -3822,7 +3800,7 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; u16 reason_code = le16_to_cpu(mgmt->u.deauth.reason_code); - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (len < 24 + 2) return; @@ -3866,7 +3844,7 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; u16 reason_code; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (len < 24 + 2) return; @@ -3896,8 +3874,7 @@ u8 *supp_rates, unsigned int supp_rates_len, u32 *rates, u32 *basic_rates, bool *have_higher_than_11mbit, - int *min_rate, int *min_rate_index, - int shift) + int *min_rate, int *min_rate_index) { int i, j; @@ -3905,12 +3882,12 @@ int rate = supp_rates[i] & 0x7f; bool is_basic = !!(supp_rates[i] & 0x80); - if ((rate * 5 * (1 << shift)) > 110) + if ((rate * 5) > 110) *have_higher_than_11mbit = true; /* - * Skip HT, VHT, HE and SAE H2E only BSS membership selectors - * since they're not rates. + * Skip HT, VHT, HE, EHT and SAE H2E only BSS membership + * selectors since they're not rates. * * Note: Even though the membership selector and the basic * rate flag share the same bit, they are not exactly @@ -3919,6 +3896,7 @@ if (supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_HT_PHY) || supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_VHT_PHY) || supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_HE_PHY) || + supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_EHT_PHY) || supp_rates[i] == (0x80 | BSS_MEMBERSHIP_SELECTOR_SAE_H2E)) continue; @@ -3928,7 +3906,7 @@ br = &sband->bitrates[j]; - brate = DIV_ROUND_UP(br->bitrate, (1 << shift) * 5); + brate = DIV_ROUND_UP(br->bitrate, 5); if (brate == rate) { *rates |= BIT(j); if (is_basic) @@ -3949,8 +3927,7 @@ const struct ieee802_11_elems *elems) { const struct ieee80211_sta_he_cap *own_he_cap = - ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); if (elems->ext_capab_len < 10) return false; @@ -3965,7 +3942,7 @@ IEEE80211_HE_MAC_CAP0_TWT_REQ); } -static int ieee80211_recalc_twt_req(struct ieee80211_sub_if_data *sdata, +static u64 ieee80211_recalc_twt_req(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, struct ieee80211_link_data *link, struct link_sta_info *link_sta, @@ -3986,8 +3963,7 @@ struct link_sta_info *link_sta) { const struct ieee80211_sta_he_cap *own_he_cap = - ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); return bss_conf->he_support && (link_sta->pub->he_cap.he_cap_elem.mac_cap_info[2] & @@ -4021,6 +3997,8 @@ const struct cfg80211_bss_ies *bss_ies = NULL; struct ieee80211_supported_band *sband; struct ieee802_11_elems *elems; + const __le16 prof_bss_param_ch_present = + cpu_to_le16(IEEE80211_MLE_STA_CONTROL_BSS_PARAM_CHANGE_CNT_PRESENT); u16 capab_info; bool ret; @@ -4036,7 +4014,17 @@ * successful, so set the status directly to success */ assoc_data->link[link_id].status = WLAN_STATUS_SUCCESS; - } else if (!elems->prof) { + if (elems->ml_basic) { + if (!(elems->ml_basic->control & + cpu_to_le16(IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT))) { + ret = false; + goto out; + } + link->u.mgd.bss_param_ch_cnt = + ieee80211_mle_get_bss_param_ch_cnt(elems->ml_basic); + } + } else if (!elems->prof || + !(elems->prof->control & prof_bss_param_ch_present)) { ret = false; goto out; } else { @@ -4049,6 +4037,8 @@ */ capab_info = get_unaligned_le16(ptr); assoc_data->link[link_id].status = get_unaligned_le16(ptr + 2); + link->u.mgd.bss_param_ch_cnt = + ieee80211_mle_basic_sta_prof_bss_param_ch_cnt(elems->prof); if (assoc_data->link[link_id].status != WLAN_STATUS_SUCCESS) { link_info(link, "association response status code=%u\n", @@ -4191,10 +4181,33 @@ elems->ht_cap_elem, link_sta); - if (elems->vht_cap_elem && !(link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_VHT)) + if (elems->vht_cap_elem && + !(link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_VHT)) { + const struct ieee80211_vht_cap *bss_vht_cap = NULL; + const struct cfg80211_bss_ies *ies; + + /* + * Cisco AP module 9115 with FW 17.3 has a bug and sends a + * too large maximum MPDU length in the association response + * (indicating 12k) that it cannot actually process ... + * Work around that. + */ + rcu_read_lock(); + ies = rcu_dereference(cbss->ies); + if (ies) { + const struct element *elem; + + elem = cfg80211_find_elem(WLAN_EID_VHT_CAPABILITY, + ies->data, ies->len); + if (elem && elem->datalen >= sizeof(*bss_vht_cap)) + bss_vht_cap = (const void *)elem->data; + } + ieee80211_vht_cap_ie_to_sta_vht_cap(sdata, sband, elems->vht_cap_elem, - link_sta); + bss_vht_cap, link_sta); + rcu_read_unlock(); + } if (elems->he_operation && !(link->u.mgd.conn_flags & IEEE80211_CONN_DISABLE_HE) && elems->he_cap) { @@ -4360,8 +4373,6 @@ u32 rates = 0, basic_rates = 0; bool have_higher_than_11mbit = false; int min_rate = INT_MAX, min_rate_index = -1; - /* this is clearly wrong for MLO but we'll just remove it later */ - int shift = ieee80211_vif_get_shift(&sdata->vif); struct ieee80211_supported_band *sband; memcpy(link_sta->addr, cbss->bssid, ETH_ALEN); @@ -4377,7 +4388,7 @@ ieee80211_get_rates(sband, bss->supp_rates, bss->supp_rates_len, &rates, &basic_rates, &have_higher_than_11mbit, - &min_rate, &min_rate_index, shift); + &min_rate, &min_rate_index); /* * This used to be a workaround for basic rates missing @@ -4624,8 +4635,7 @@ const struct ieee80211_he_operation *he_op) { const struct ieee80211_sta_he_cap *sta_he_cap = - ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); u16 ap_min_req_set; int i; @@ -4698,9 +4708,93 @@ return false; } +static u8 +ieee80211_get_eht_cap_mcs_nss(const struct ieee80211_sta_he_cap *sta_he_cap, + const struct ieee80211_sta_eht_cap *sta_eht_cap, + unsigned int idx, int bw) +{ + u8 he_phy_cap0 = sta_he_cap->he_cap_elem.phy_cap_info[0]; + u8 eht_phy_cap0 = sta_eht_cap->eht_cap_elem.phy_cap_info[0]; + + /* handle us being a 20 MHz-only EHT STA - with four values + * for MCS 0-7, 8-9, 10-11, 12-13. + */ + if (!(he_phy_cap0 & IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_MASK_ALL)) + return sta_eht_cap->eht_mcs_nss_supp.only_20mhz.rx_tx_max_nss[idx]; + + /* the others have MCS 0-9 together, rather than separately from 0-7 */ + if (idx > 0) + idx--; + + switch (bw) { + case 0: + return sta_eht_cap->eht_mcs_nss_supp.bw._80.rx_tx_max_nss[idx]; + case 1: + if (!(he_phy_cap0 & + (IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G | + IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G))) + return 0xff; /* pass check */ + return sta_eht_cap->eht_mcs_nss_supp.bw._160.rx_tx_max_nss[idx]; + case 2: + if (!(eht_phy_cap0 & IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ)) + return 0xff; /* pass check */ + return sta_eht_cap->eht_mcs_nss_supp.bw._320.rx_tx_max_nss[idx]; + } + + WARN_ON(1); + return 0; +} + +static bool +ieee80211_verify_sta_eht_mcs_support(struct ieee80211_sub_if_data *sdata, + struct ieee80211_supported_band *sband, + const struct ieee80211_eht_operation *eht_op) +{ + const struct ieee80211_sta_he_cap *sta_he_cap = + ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); + const struct ieee80211_sta_eht_cap *sta_eht_cap = + ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif); + const struct ieee80211_eht_mcs_nss_supp_20mhz_only *req; + unsigned int i; + + if (!sta_he_cap || !sta_eht_cap || !eht_op) + return false; + + req = &eht_op->basic_mcs_nss; + + for (i = 0; i < ARRAY_SIZE(req->rx_tx_max_nss); i++) { + u8 req_rx_nss, req_tx_nss; + unsigned int bw; + + req_rx_nss = u8_get_bits(req->rx_tx_max_nss[i], + IEEE80211_EHT_MCS_NSS_RX); + req_tx_nss = u8_get_bits(req->rx_tx_max_nss[i], + IEEE80211_EHT_MCS_NSS_TX); + + for (bw = 0; bw < 3; bw++) { + u8 have, have_rx_nss, have_tx_nss; + + have = ieee80211_get_eht_cap_mcs_nss(sta_he_cap, + sta_eht_cap, + i, bw); + have_rx_nss = u8_get_bits(have, + IEEE80211_EHT_MCS_NSS_RX); + have_tx_nss = u8_get_bits(have, + IEEE80211_EHT_MCS_NSS_TX); + + if (req_rx_nss > have_rx_nss || + req_tx_nss > have_tx_nss) + return false; + } + } + + return true; +} + static int ieee80211_prep_channel(struct ieee80211_sub_if_data *sdata, struct ieee80211_link_data *link, struct cfg80211_bss *cbss, + bool mlo, ieee80211_conn_flags_t *conn_flags) { struct ieee80211_local *local = sdata->local; @@ -4714,9 +4808,9 @@ struct cfg80211_chan_def chandef; bool is_6ghz = cbss->channel->band == NL80211_BAND_6GHZ; bool is_5ghz = cbss->channel->band == NL80211_BAND_5GHZ; + bool supports_mlo = false; struct ieee80211_bss *bss = (void *)cbss->priv; struct ieee80211_elems_parse_params parse_params = { - .bss = cbss, .link_id = -1, .from_ap = true, }; @@ -4726,6 +4820,8 @@ u32 i; bool have_80mhz; + lockdep_assert_wiphy(local->hw.wiphy); + rcu_read_lock(); ies = rcu_dereference(cbss->ies); @@ -4759,15 +4855,13 @@ *conn_flags |= IEEE80211_CONN_DISABLE_EHT; } - if (!ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif))) { + if (!ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif)) { mlme_dbg(sdata, "HE not supported, disabling HE and EHT\n"); *conn_flags |= IEEE80211_CONN_DISABLE_HE; *conn_flags |= IEEE80211_CONN_DISABLE_EHT; } - if (!ieee80211_get_eht_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif))) { + if (!ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif)) { mlme_dbg(sdata, "EHT not supported, disabling EHT\n"); *conn_flags |= IEEE80211_CONN_DISABLE_EHT; } @@ -4844,6 +4938,7 @@ IEEE80211_CONN_DISABLE_EHT)) && he_oper) { const struct cfg80211_bss_ies *cbss_ies; + const struct element *eht_ml_elem; const u8 *eht_oper_ie; cbss_ies = rcu_dereference(cbss->ies); @@ -4854,6 +4949,26 @@ eht_oper = (void *)(eht_oper_ie + 3); else eht_oper = NULL; + + if (!ieee80211_verify_sta_eht_mcs_support(sdata, sband, eht_oper)) + *conn_flags |= IEEE80211_CONN_DISABLE_EHT; + + eht_ml_elem = cfg80211_find_ext_elem(WLAN_EID_EXT_EHT_MULTI_LINK, + cbss_ies->data, cbss_ies->len); + + /* data + 1 / datalen - 1 since it's an extended element */ + if (!(*conn_flags & IEEE80211_CONN_DISABLE_EHT) && + eht_ml_elem && + ieee80211_mle_type_ok(eht_ml_elem->data + 1, + IEEE80211_ML_CONTROL_TYPE_BASIC, + eht_ml_elem->datalen - 1)) { + supports_mlo = true; + + sdata->vif.cfg.eml_cap = + ieee80211_mle_get_eml_cap(eht_ml_elem->data + 1); + sdata->vif.cfg.eml_med_sync_delay = + ieee80211_mle_get_eml_med_sync_delay(eht_ml_elem->data + 1); + } } /* Allow VHT if at least one channel on the sband supports 80 MHz */ @@ -4904,13 +5019,17 @@ return -EINVAL; } + if (mlo && !supports_mlo) { + sdata_info(sdata, "Rejecting MLO as it is not supported by AP\n"); + return -EINVAL; + } + if (!link) return 0; /* will change later if needed */ link->smps_mode = IEEE80211_SMPS_OFF; - mutex_lock(&local->mtx); /* * If this fails (possibly due to channel context sharing * on incompatible channels, e.g. 80+80 and 160 sharing the @@ -4931,7 +5050,6 @@ IEEE80211_CHANCTX_SHARED); } out: - mutex_unlock(&local->mtx); return ret; } @@ -4980,10 +5098,10 @@ unsigned int link_id; struct sta_info *sta; u64 changed[IEEE80211_MLD_MAX_NUM_LINKS] = {}; - u16 valid_links = 0; + u16 valid_links = 0, dormant_links = 0; int err; - mutex_lock(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); /* * station info was already allocated and inserted before * the association and should be available to us @@ -4992,11 +5110,14 @@ if (WARN_ON(!sta)) goto out_err; - if (sdata->vif.valid_links) { + if (ieee80211_vif_is_mld(&sdata->vif)) { for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { if (!assoc_data->link[link_id].bss) continue; + valid_links |= BIT(link_id); + if (assoc_data->link[link_id].disabled) + dormant_links |= BIT(link_id); if (link_id != assoc_data->assoc_link_id) { err = ieee80211_sta_allocate_link(sta, link_id); @@ -5005,7 +5126,7 @@ } } - ieee80211_vif_set_links(sdata, valid_links); + ieee80211_vif_set_links(sdata, valid_links, dormant_links); } for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { @@ -5020,7 +5141,7 @@ if (WARN_ON(!link)) goto out_err; - if (sdata->vif.valid_links) + if (ieee80211_vif_is_mld(&sdata->vif)) link_info(link, "local address %pM, AP link address %pM%s\n", link->conf->addr, @@ -5029,7 +5150,7 @@ " (assoc)" : ""); link_sta = rcu_dereference_protected(sta->link[link_id], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (WARN_ON(!link_sta)) goto out_err; @@ -5052,7 +5173,7 @@ link->conf->dtim_period = link->u.mgd.dtim_period ?: 1; if (link_id != assoc_data->assoc_link_id) { - err = ieee80211_prep_channel(sdata, link, cbss, + err = ieee80211_prep_channel(sdata, link, cbss, true, &link->u.mgd.conn_flags); if (err) { link_info(link, "prep_channel failed\n"); @@ -5085,7 +5206,7 @@ } /* links might have changed due to rejected ones, set them again */ - ieee80211_vif_set_links(sdata, valid_links); + ieee80211_vif_set_links(sdata, valid_links, dormant_links); rate_control_rate_init(sta); @@ -5116,8 +5237,6 @@ if (sdata->wdev.use_4addr) drv_sta_set_4addr(local, sdata, &sta->sta, true); - mutex_unlock(&sdata->local->sta_mtx); - ieee80211_set_associated(sdata, assoc_data, changed); /* @@ -5137,7 +5256,6 @@ return true; out_err: eth_zero_addr(sdata->vif.cfg.ap_addr); - mutex_unlock(&sdata->local->sta_mtx); return false; } @@ -5163,13 +5281,13 @@ .u.mlme.data = ASSOC_EVENT, }; struct ieee80211_prep_tx_info info = {}; - struct cfg80211_rx_assoc_resp resp = { + struct cfg80211_rx_assoc_resp_data resp = { .uapsd_queues = -1, }; u8 ap_mld_addr[ETH_ALEN] __aligned(2); unsigned int link_id; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (!assoc_data) return; @@ -5269,25 +5387,25 @@ ifmgd->broken_ap = true; } - if (sdata->vif.valid_links) { - if (!elems->multi_link) { + if (ieee80211_vif_is_mld(&sdata->vif)) { + if (!elems->ml_basic) { sdata_info(sdata, "MLO association with %pM but no multi-link element in response!\n", assoc_data->ap_addr); goto abandon_assoc; } - if (le16_get_bits(elems->multi_link->control, + if (le16_get_bits(elems->ml_basic->control, IEEE80211_ML_CONTROL_TYPE) != IEEE80211_ML_CONTROL_TYPE_BASIC) { sdata_info(sdata, "bad multi-link element (control=0x%x)\n", - le16_to_cpu(elems->multi_link->control)); + le16_to_cpu(elems->ml_basic->control)); goto abandon_assoc; } else { struct ieee80211_mle_basic_common_info *common; - common = (void *)elems->multi_link->variable; + common = (void *)elems->ml_basic->variable; if (memcmp(assoc_data->ap_addr, common->mld_mac_addr, ETH_ALEN)) { @@ -5318,17 +5436,18 @@ for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { struct ieee80211_link_data *link; - link = sdata_dereference(sdata->link[link_id], sdata); - if (!link) - continue; - if (!assoc_data->link[link_id].bss) continue; resp.links[link_id].bss = assoc_data->link[link_id].bss; - resp.links[link_id].addr = link->conf->addr; + ether_addr_copy(resp.links[link_id].addr, + assoc_data->link[link_id].addr); resp.links[link_id].status = assoc_data->link[link_id].status; + link = sdata_dereference(sdata->link[link_id], sdata); + if (!link) + continue; + /* get uapsd queues configuration - same for all links */ resp.uapsd_queues = 0; for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) @@ -5336,7 +5455,7 @@ resp.uapsd_queues |= ieee80211_ac_to_qos_mask[ac]; } - if (sdata->vif.valid_links) { + if (ieee80211_vif_is_mld(&sdata->vif)) { ether_addr_copy(ap_mld_addr, sdata->vif.cfg.ap_addr); resp.ap_mld_addr = ap_mld_addr; } @@ -5369,7 +5488,7 @@ struct ieee80211_bss *bss; struct ieee80211_channel *channel; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); channel = ieee80211_get_channel_khz(local->hw.wiphy, ieee80211_rx_status_to_khz(rx_status)); @@ -5396,7 +5515,7 @@ ifmgd = &sdata->u.mgd; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); /* * According to Draft P802.11ax D6.0 clause 26.17.2.3.2: @@ -5598,6 +5717,351 @@ return true; } +static void ieee80211_ml_reconf_work(struct wiphy *wiphy, + struct wiphy_work *work) +{ + struct ieee80211_sub_if_data *sdata = + container_of(work, struct ieee80211_sub_if_data, + u.mgd.ml_reconf_work.work); + u16 new_valid_links, new_active_links, new_dormant_links; + int ret; + + if (!sdata->u.mgd.removed_links) + return; + + sdata_info(sdata, + "MLO Reconfiguration: work: valid=0x%x, removed=0x%x\n", + sdata->vif.valid_links, sdata->u.mgd.removed_links); + + new_valid_links = sdata->vif.valid_links & ~sdata->u.mgd.removed_links; + if (new_valid_links == sdata->vif.valid_links) + return; + + if (!new_valid_links || + !(new_valid_links & ~sdata->vif.dormant_links)) { + sdata_info(sdata, "No valid links after reconfiguration\n"); + ret = -EINVAL; + goto out; + } + + new_active_links = sdata->vif.active_links & ~sdata->u.mgd.removed_links; + if (new_active_links != sdata->vif.active_links) { + if (!new_active_links) + new_active_links = + BIT(ffs(new_valid_links & + ~sdata->vif.dormant_links) - 1); + + ret = ieee80211_set_active_links(&sdata->vif, new_active_links); + if (ret) { + sdata_info(sdata, + "Failed setting active links\n"); + goto out; + } + } + + new_dormant_links = sdata->vif.dormant_links & ~sdata->u.mgd.removed_links; + + ret = ieee80211_vif_set_links(sdata, new_valid_links, + new_dormant_links); + if (ret) + sdata_info(sdata, "Failed setting valid links\n"); + + ieee80211_vif_cfg_change_notify(sdata, BSS_CHANGED_MLD_VALID_LINKS); + +out: + if (!ret) + cfg80211_links_removed(sdata->dev, sdata->u.mgd.removed_links); + else + __ieee80211_disconnect(sdata); + + sdata->u.mgd.removed_links = 0; +} + +static void ieee80211_ml_reconfiguration(struct ieee80211_sub_if_data *sdata, + struct ieee802_11_elems *elems) +{ + const struct ieee80211_multi_link_elem *ml; + const struct element *sub; + size_t ml_len; + unsigned long removed_links = 0; + u16 link_removal_timeout[IEEE80211_MLD_MAX_NUM_LINKS] = {}; + u8 link_id; + u32 delay; + + if (!ieee80211_vif_is_mld(&sdata->vif) || !elems->ml_reconf) + return; + + ml_len = cfg80211_defragment_element(elems->ml_reconf_elem, + elems->ie_start, + elems->total_len, + elems->scratch_pos, + elems->scratch + elems->scratch_len - + elems->scratch_pos, + WLAN_EID_FRAGMENT); + + elems->ml_reconf = (const void *)elems->scratch_pos; + elems->ml_reconf_len = ml_len; + ml = elems->ml_reconf; + + /* Directly parse the sub elements as the common information doesn't + * hold any useful information. + */ + for_each_mle_subelement(sub, (u8 *)ml, ml_len) { + struct ieee80211_mle_per_sta_profile *prof = (void *)sub->data; + u8 *pos = prof->variable; + u16 control; + + if (sub->id != IEEE80211_MLE_SUBELEM_PER_STA_PROFILE) + continue; + + if (!ieee80211_mle_reconf_sta_prof_size_ok(sub->data, + sub->datalen)) + return; + + control = le16_to_cpu(prof->control); + link_id = control & IEEE80211_MLE_STA_RECONF_CONTROL_LINK_ID; + + removed_links |= BIT(link_id); + + /* the MAC address should not be included, but handle it */ + if (control & + IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT) + pos += 6; + + /* According to Draft P802.11be_D3.0, the control should + * include the AP Removal Timer present. If the AP Removal Timer + * is not present assume immediate removal. + */ + if (control & + IEEE80211_MLE_STA_RECONF_CONTROL_AP_REM_TIMER_PRESENT) + link_removal_timeout[link_id] = le16_to_cpu(*(__le16 *)pos); + } + + removed_links &= sdata->vif.valid_links; + if (!removed_links) { + /* In case the removal was cancelled, abort it */ + if (sdata->u.mgd.removed_links) { + sdata->u.mgd.removed_links = 0; + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &sdata->u.mgd.ml_reconf_work); + } + return; + } + + delay = 0; + for_each_set_bit(link_id, &removed_links, IEEE80211_MLD_MAX_NUM_LINKS) { + struct ieee80211_bss_conf *link_conf = + sdata_dereference(sdata->vif.link_conf[link_id], sdata); + u32 link_delay; + + if (!link_conf) { + removed_links &= ~BIT(link_id); + continue; + } + + link_delay = link_conf->beacon_int * + link_removal_timeout[link_id]; + + if (!delay) + delay = link_delay; + else + delay = min(delay, link_delay); + } + + sdata->u.mgd.removed_links = removed_links; + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &sdata->u.mgd.ml_reconf_work, + TU_TO_JIFFIES(delay)); +} + +static void ieee80211_tid_to_link_map_work(struct wiphy *wiphy, + struct wiphy_work *work) +{ + u16 new_active_links, new_dormant_links; + struct ieee80211_sub_if_data *sdata = + container_of(work, struct ieee80211_sub_if_data, + u.mgd.ttlm_work.work); + int ret; + + new_active_links = sdata->u.mgd.ttlm_info.map & + sdata->vif.valid_links; + new_dormant_links = ~sdata->u.mgd.ttlm_info.map & + sdata->vif.valid_links; + if (!new_active_links) { + ieee80211_disconnect(&sdata->vif, false); + return; + } + + ieee80211_vif_set_links(sdata, sdata->vif.valid_links, 0); + new_active_links = BIT(ffs(new_active_links) - 1); + ieee80211_set_active_links(&sdata->vif, new_active_links); + + ret = ieee80211_vif_set_links(sdata, sdata->vif.valid_links, + new_dormant_links); + + sdata->u.mgd.ttlm_info.active = true; + sdata->u.mgd.ttlm_info.switch_time = 0; + + if (!ret) + ieee80211_vif_cfg_change_notify(sdata, + BSS_CHANGED_MLD_VALID_LINKS); +} + +static u16 ieee80211_get_ttlm(u8 bm_size, u8 *data) +{ + if (bm_size == 1) + return *data; + else + return get_unaligned_le16(data); +} + +static int +ieee80211_parse_adv_t2l(struct ieee80211_sub_if_data *sdata, + const struct ieee80211_ttlm_elem *ttlm, + struct ieee80211_adv_ttlm_info *ttlm_info) +{ + /* The element size was already validated in + * ieee80211_tid_to_link_map_size_ok() + */ + u8 control, link_map_presence, map_size, tid; + u8 *pos; + + memset(ttlm_info, 0, sizeof(*ttlm_info)); + pos = (void *)ttlm->optional; + control = ttlm->control; + + if ((control & IEEE80211_TTLM_CONTROL_DEF_LINK_MAP) || + !(control & IEEE80211_TTLM_CONTROL_SWITCH_TIME_PRESENT)) + return 0; + + if ((control & IEEE80211_TTLM_CONTROL_DIRECTION) != + IEEE80211_TTLM_DIRECTION_BOTH) { + sdata_info(sdata, "Invalid advertised T2L map direction\n"); + return -EINVAL; + } + + link_map_presence = *pos; + pos++; + + ttlm_info->switch_time = get_unaligned_le16(pos); + pos += 2; + + if (control & IEEE80211_TTLM_CONTROL_EXPECTED_DUR_PRESENT) { + ttlm_info->duration = pos[0] | pos[1] << 8 | pos[2] << 16; + pos += 3; + } + + if (control & IEEE80211_TTLM_CONTROL_LINK_MAP_SIZE) + map_size = 1; + else + map_size = 2; + + /* According to Draft P802.11be_D3.0 clause 35.3.7.1.7, an AP MLD shall + * not advertise a TID-to-link mapping that does not map all TIDs to the + * same link set, reject frame if not all links have mapping + */ + if (link_map_presence != 0xff) { + sdata_info(sdata, + "Invalid advertised T2L mapping presence indicator\n"); + return -EINVAL; + } + + ttlm_info->map = ieee80211_get_ttlm(map_size, pos); + if (!ttlm_info->map) { + sdata_info(sdata, + "Invalid advertised T2L map for TID 0\n"); + return -EINVAL; + } + + pos += map_size; + + for (tid = 1; tid < 8; tid++) { + u16 map = ieee80211_get_ttlm(map_size, pos); + + if (map != ttlm_info->map) { + sdata_info(sdata, "Invalid advertised T2L map for tid %d\n", + tid); + return -EINVAL; + } + + pos += map_size; + } + return 0; +} + +static void ieee80211_process_adv_ttlm(struct ieee80211_sub_if_data *sdata, + struct ieee802_11_elems *elems, + u64 beacon_ts) +{ + u8 i; + int ret; + + if (!ieee80211_vif_is_mld(&sdata->vif)) + return; + + if (!elems->ttlm_num) { + if (sdata->u.mgd.ttlm_info.switch_time) { + /* if a planned TID-to-link mapping was cancelled - + * abort it + */ + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &sdata->u.mgd.ttlm_work); + } else if (sdata->u.mgd.ttlm_info.active) { + /* if no TID-to-link element, set to default mapping in + * which all TIDs are mapped to all setup links + */ + ret = ieee80211_vif_set_links(sdata, + sdata->vif.valid_links, + 0); + if (ret) { + sdata_info(sdata, "Failed setting valid/dormant links\n"); + return; + } + ieee80211_vif_cfg_change_notify(sdata, + BSS_CHANGED_MLD_VALID_LINKS); + } + memset(&sdata->u.mgd.ttlm_info, 0, + sizeof(sdata->u.mgd.ttlm_info)); + return; + } + + for (i = 0; i < elems->ttlm_num; i++) { + struct ieee80211_adv_ttlm_info ttlm_info; + u32 res; + + res = ieee80211_parse_adv_t2l(sdata, elems->ttlm[i], + &ttlm_info); + + if (res) { + __ieee80211_disconnect(sdata); + return; + } + + if (ttlm_info.switch_time) { + u32 st_us, delay = 0; + u32 ts_l26 = beacon_ts & GENMASK(25, 0); + + /* The t2l map switch time is indicated with a partial + * TSF value, convert it to TSF and calc the delay + * to the start time. + */ + st_us = ieee80211_tu_to_usec(ttlm_info.switch_time); + if (st_us > ts_l26) + delay = st_us - ts_l26; + else + continue; + + sdata->u.mgd.ttlm_info = ttlm_info; + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &sdata->u.mgd.ttlm_work); + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &sdata->u.mgd.ttlm_work, + usecs_to_jiffies(delay)); + return; + } + } +} + static void ieee80211_rx_mgmt_beacon(struct ieee80211_link_data *link, struct ieee80211_hdr *hdr, size_t len, struct ieee80211_rx_status *rx_status) @@ -5626,7 +6090,7 @@ .from_ap = true, }; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(local->hw.wiphy); /* Process beacon from the current BSS */ bssid = ieee80211_get_bssid(hdr, len, sdata->vif.type); @@ -5662,7 +6126,7 @@ rcu_read_unlock(); if (ifmgd->assoc_data && ifmgd->assoc_data->need_beacon && - !WARN_ON(sdata->vif.valid_links) && + !WARN_ON(ieee80211_vif_is_mld(&sdata->vif)) && ieee80211_rx_our_beacon(bssid, ifmgd->assoc_data->link[0].bss)) { parse_params.bss = ifmgd->assoc_data->link[0].bss; elems = ieee802_11_parse_elems_full(&parse_params); @@ -5842,9 +6306,7 @@ changed |= BSS_CHANGED_BEACON_INFO; link->u.mgd.have_beacon = true; - mutex_lock(&local->iflist_mtx); ieee80211_recalc_ps(local); - mutex_unlock(&local->iflist_mtx); ieee80211_recalc_ps_vif(sdata); } @@ -5861,16 +6323,13 @@ le16_to_cpu(mgmt->u.beacon.capab_info), erp_valid, erp_value); - mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, sdata->vif.cfg.ap_addr); if (WARN_ON(!sta)) { - mutex_unlock(&local->sta_mtx); goto free; } link_sta = rcu_dereference_protected(sta->link[link->link_id], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (WARN_ON(!link_sta)) { - mutex_unlock(&local->sta_mtx); goto free; } @@ -5886,7 +6345,6 @@ elems->vht_operation, elems->he_operation, elems->eht_operation, elems->s1g_oper, bssid, &changed)) { - mutex_unlock(&local->sta_mtx); sdata_info(sdata, "failed to follow AP %pM bandwidth change, disconnect\n", bssid); @@ -5904,7 +6362,6 @@ ieee80211_vht_handle_opmode(sdata, link_sta, *elems->opmode_notif, rx_status->band); - mutex_unlock(&local->sta_mtx); changed |= ieee80211_handle_pwr_constr(link, chan, mgmt, elems->country_elem, @@ -5927,6 +6384,10 @@ } } + ieee80211_ml_reconfiguration(sdata, elems); + ieee80211_process_adv_ttlm(sdata, elems, + le64_to_cpu(mgmt->u.beacon.timestamp)); + ieee80211_link_info_change_notify(sdata, link, changed); free: kfree(elems); @@ -5940,17 +6401,17 @@ struct ieee80211_hdr *hdr; u16 fc; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + rx_status = (struct ieee80211_rx_status *) skb->cb; hdr = (struct ieee80211_hdr *) skb->data; fc = le16_to_cpu(hdr->frame_control); - sdata_lock(sdata); switch (fc & IEEE80211_FCTL_STYPE) { case IEEE80211_STYPE_S1G_BEACON: ieee80211_rx_mgmt_beacon(link, hdr, skb->len, rx_status); break; } - sdata_unlock(sdata); } void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata, @@ -5962,17 +6423,17 @@ u16 fc; int ies_len; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + rx_status = (struct ieee80211_rx_status *) skb->cb; mgmt = (struct ieee80211_mgmt *) skb->data; fc = le16_to_cpu(mgmt->frame_control); - sdata_lock(sdata); - if (rx_status->link_valid) { link = sdata_dereference(sdata->link[rx_status->link_id], sdata); if (!link) - goto out; + return; } switch (fc & IEEE80211_FCTL_STYPE) { @@ -5997,6 +6458,10 @@ ieee80211_rx_mgmt_assoc_resp(sdata, mgmt, skb->len); break; case IEEE80211_STYPE_ACTION: + if (!sdata->u.mgd.associated || + !ether_addr_equal(mgmt->bssid, sdata->vif.cfg.ap_addr)) + break; + if (mgmt->u.action.category == WLAN_CATEGORY_SPECTRUM_MGMT) { struct ieee802_11_elems *elems; @@ -6051,8 +6516,6 @@ } break; } -out: - sdata_unlock(sdata); } static void ieee80211_sta_timer(struct timer_list *t) @@ -6060,7 +6523,7 @@ struct ieee80211_sub_if_data *sdata = from_timer(sdata, t, u.mgd.timer); - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, @@ -6087,7 +6550,7 @@ .subtype = IEEE80211_STYPE_AUTH, }; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (WARN_ON_ONCE(!auth_data)) return -EINVAL; @@ -6110,6 +6573,7 @@ if (auth_data->algorithm == WLAN_AUTH_SAE) info.duration = jiffies_to_msecs(IEEE80211_AUTH_TIMEOUT_SAE); + info.link_id = auth_data->link_id; drv_mgd_prepare_tx(local, sdata, &info); sdata_info(sdata, "send auth to %pM (try %d/%d)\n", @@ -6156,7 +6620,7 @@ struct ieee80211_local *local = sdata->local; int ret; - sdata_assert_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); assoc_data->tries++; if (assoc_data->tries > IEEE80211_ASSOC_MAX_TRIES) { @@ -6204,7 +6668,7 @@ sdata->u.mgd.status_acked = acked; sdata->u.mgd.status_received = true; - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); } void ieee80211_sta_work(struct ieee80211_sub_if_data *sdata) @@ -6212,7 +6676,7 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - sdata_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (ifmgd->status_received) { __le16 fc = ifmgd->status_fc; @@ -6347,8 +6811,6 @@ WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY, false); } } - - sdata_unlock(sdata); } static void ieee80211_sta_bcn_mon_timer(struct timer_list *t) @@ -6356,7 +6818,7 @@ struct ieee80211_sub_if_data *sdata = from_timer(sdata, t, u.mgd.bcn_mon_timer); - if (WARN_ON(sdata->vif.valid_links)) + if (WARN_ON(ieee80211_vif_is_mld(&sdata->vif))) return; if (sdata->vif.bss_conf.csa_active && @@ -6367,7 +6829,7 @@ return; sdata->u.mgd.connection_loss = false; - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->u.mgd.beacon_connection_loss_work); } @@ -6380,7 +6842,7 @@ struct sta_info *sta; unsigned long timeout; - if (WARN_ON(sdata->vif.valid_links)) + if (WARN_ON(ieee80211_vif_is_mld(&sdata->vif))) return; if (sdata->vif.bss_conf.csa_active && @@ -6404,10 +6866,11 @@ return; } - ieee80211_queue_work(&local->hw, &ifmgd->monitor_work); + wiphy_work_queue(local->hw.wiphy, &sdata->u.mgd.monitor_work); } -static void ieee80211_sta_monitor_work(struct work_struct *work) +static void ieee80211_sta_monitor_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_sub_if_data *sdata = container_of(work, struct ieee80211_sub_if_data, @@ -6423,7 +6886,7 @@ /* let's probe the connection once */ if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR)) - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->u.mgd.monitor_work); } } @@ -6434,7 +6897,7 @@ struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; u8 frame_buf[IEEE80211_DEAUTH_FRAME_LEN]; - sdata_lock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (ifmgd->auth_data || ifmgd->assoc_data) { const u8 *ap_addr = ifmgd->auth_data ? @@ -6486,8 +6949,6 @@ memcpy(bssid, sdata->vif.cfg.ap_addr, ETH_ALEN); ieee80211_mgd_deauth(sdata, &req); } - - sdata_unlock(sdata); } #endif @@ -6495,11 +6956,10 @@ { struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - sdata_lock(sdata); - if (!ifmgd->associated) { - sdata_unlock(sdata); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + if (!ifmgd->associated) return; - } if (sdata->flags & IEEE80211_SDATA_DISCONNECT_RESUME) { sdata->flags &= ~IEEE80211_SDATA_DISCONNECT_RESUME; @@ -6507,7 +6967,6 @@ ieee80211_sta_connection_lost(sdata, WLAN_REASON_UNSPECIFIED, true); - sdata_unlock(sdata); return; } @@ -6517,23 +6976,19 @@ ieee80211_sta_connection_lost(sdata, WLAN_REASON_UNSPECIFIED, true); - sdata_unlock(sdata); return; } - - sdata_unlock(sdata); } -static void ieee80211_request_smps_mgd_work(struct work_struct *work) +static void ieee80211_request_smps_mgd_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_link_data *link = container_of(work, struct ieee80211_link_data, u.mgd.request_smps_work); - sdata_lock(link->sdata); __ieee80211_request_smps_mgd(link->sdata, link, link->u.mgd.driver_smps_mode); - sdata_unlock(link->sdata); } /* interface setup */ @@ -6541,18 +6996,22 @@ { struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - INIT_WORK(&ifmgd->monitor_work, ieee80211_sta_monitor_work); - INIT_WORK(&ifmgd->beacon_connection_loss_work, + wiphy_work_init(&ifmgd->monitor_work, ieee80211_sta_monitor_work); + wiphy_work_init(&ifmgd->beacon_connection_loss_work, ieee80211_beacon_connection_loss_work); - INIT_WORK(&ifmgd->csa_connection_drop_work, + wiphy_work_init(&ifmgd->csa_connection_drop_work, ieee80211_csa_connection_drop_work); - INIT_DELAYED_WORK(&ifmgd->tdls_peer_del_work, + wiphy_delayed_work_init(&ifmgd->tdls_peer_del_work, ieee80211_tdls_peer_del_work); + wiphy_delayed_work_init(&ifmgd->ml_reconf_work, + ieee80211_ml_reconf_work); timer_setup(&ifmgd->timer, ieee80211_sta_timer, 0); timer_setup(&ifmgd->bcn_mon_timer, ieee80211_sta_bcn_mon_timer, 0); timer_setup(&ifmgd->conn_mon_timer, ieee80211_sta_conn_mon_timer, 0); - INIT_DELAYED_WORK(&ifmgd->tx_tspec_wk, + wiphy_delayed_work_init(&ifmgd->tx_tspec_wk, ieee80211_sta_handle_tspec_ac_params_wk); + wiphy_delayed_work_init(&ifmgd->ttlm_work, + ieee80211_tid_to_link_map_work); ifmgd->flags = 0; ifmgd->powersave = sdata->wdev.ps; @@ -6564,6 +7023,16 @@ ifmgd->orig_teardown_skb = NULL; } +static void ieee80211_recalc_smps_work(struct wiphy *wiphy, + struct wiphy_work *work) +{ + struct ieee80211_link_data *link = + container_of(work, struct ieee80211_link_data, + u.mgd.recalc_smps); + + ieee80211_recalc_smps(link->sdata, link); +} + void ieee80211_mgd_setup_link(struct ieee80211_link_data *link) { struct ieee80211_sub_if_data *sdata = link->sdata; @@ -6574,15 +7043,17 @@ link->u.mgd.conn_flags = 0; link->conf->bssid = link->u.mgd.bssid; - INIT_WORK(&link->u.mgd.request_smps_work, + wiphy_work_init(&link->u.mgd.request_smps_work, ieee80211_request_smps_mgd_work); + wiphy_work_init(&link->u.mgd.recalc_smps, + ieee80211_recalc_smps_work); if (local->hw.wiphy->features & NL80211_FEATURE_DYNAMIC_SMPS) link->u.mgd.req_smps = IEEE80211_SMPS_AUTOMATIC; else link->u.mgd.req_smps = IEEE80211_SMPS_OFF; - INIT_WORK(&link->u.mgd.chswitch_work, ieee80211_chswitch_work); - timer_setup(&link->u.mgd.chswitch_timer, ieee80211_chswitch_timer, 0); + wiphy_delayed_work_init(&link->u.mgd.chswitch_work, + ieee80211_chswitch_work); if (sdata->u.mgd.assoc_data) ether_addr_copy(link->conf->addr, @@ -6623,12 +7094,12 @@ mlo = true; if (WARN_ON(!ap_mld_addr)) return -EINVAL; - err = ieee80211_vif_set_links(sdata, BIT(link_id)); + err = ieee80211_vif_set_links(sdata, BIT(link_id), 0); } else { if (WARN_ON(ap_mld_addr)) return -EINVAL; ap_mld_addr = cbss->bssid; - err = ieee80211_vif_set_links(sdata, 0); + err = ieee80211_vif_set_links(sdata, 0, 0); link_id = 0; mlo = false; } @@ -6739,7 +7210,7 @@ } if (new_sta || override) { - err = ieee80211_prep_channel(sdata, link, cbss, + err = ieee80211_prep_channel(sdata, link, cbss, mlo, &link->u.mgd.conn_flags); if (err) { if (new_sta) @@ -6780,7 +7251,7 @@ out_err: ieee80211_link_release_channel(&sdata->deflink); - ieee80211_vif_set_links(sdata, 0); + ieee80211_vif_set_links(sdata, 0, 0); return err; } @@ -6791,10 +7262,14 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_mgd_auth_data *auth_data; + struct ieee80211_link_data *link; + const struct element *csa_elem, *ecsa_elem; u16 auth_alg; int err; bool cont_auth; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + /* prepare auth data structure */ switch (req->auth_type) { @@ -6831,6 +7306,22 @@ if (ifmgd->assoc_data) return -EBUSY; + rcu_read_lock(); + csa_elem = ieee80211_bss_get_elem(req->bss, WLAN_EID_CHANNEL_SWITCH); + ecsa_elem = ieee80211_bss_get_elem(req->bss, + WLAN_EID_EXT_CHANSWITCH_ANN); + if ((csa_elem && + csa_elem->datalen == sizeof(struct ieee80211_channel_sw_ie) && + ((struct ieee80211_channel_sw_ie *)csa_elem->data)->count != 0) || + (ecsa_elem && + ecsa_elem->datalen == sizeof(struct ieee80211_ext_chansw_ie) && + ((struct ieee80211_ext_chansw_ie *)ecsa_elem->data)->count != 0)) { + rcu_read_unlock(); + sdata_info(sdata, "AP is in CSA process, reject auth\n"); + return -EINVAL; + } + rcu_read_unlock(); + auth_data = kzalloc(sizeof(*auth_data) + req->auth_data_len + req->ie_len, GFP_KERNEL); if (!auth_data) @@ -6914,8 +7405,6 @@ false); } - sdata_info(sdata, "authenticate with %pM\n", auth_data->ap_addr); - /* needed for transmitting the auth frame(s) properly */ memcpy(sdata->vif.cfg.ap_addr, auth_data->ap_addr, ETH_ALEN); @@ -6924,6 +7413,19 @@ if (err) goto err_clear; + if (req->link_id > 0) + link = sdata_dereference(sdata->link[req->link_id], sdata); + else + link = sdata_dereference(sdata->link[0], sdata); + + if (WARN_ON(!link)) { + err = -ENOLINK; + goto err_clear; + } + + sdata_info(sdata, "authenticate with %pM (local address=%pM)\n", + auth_data->ap_addr, link->conf->addr); + err = ieee80211_auth(sdata); if (err) { sta_info_destroy_addr(sdata, auth_data->ap_addr); @@ -6935,13 +7437,11 @@ return 0; err_clear: - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { eth_zero_addr(sdata->deflink.u.mgd.bssid); ieee80211_link_info_change_notify(sdata, &sdata->deflink, BSS_CHANGED_BSSID); - mutex_lock(&sdata->local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&sdata->local->mtx); } ifmgd->auth_data = NULL; kfree(auth_data); @@ -6956,7 +7456,7 @@ unsigned int link_id) { struct ieee80211_local *local = sdata->local; - const struct cfg80211_bss_ies *beacon_ies; + const struct cfg80211_bss_ies *bss_ies; struct ieee80211_supported_band *sband; const struct element *ht_elem, *vht_elem; struct ieee80211_link_data *link; @@ -7031,32 +7531,37 @@ link->conf->eht_puncturing = 0; rcu_read_lock(); - beacon_ies = rcu_dereference(cbss->beacon_ies); - if (beacon_ies) { - const struct ieee80211_eht_operation *eht_oper; - const struct element *elem; + bss_ies = rcu_dereference(cbss->beacon_ies); + if (bss_ies) { u8 dtim_count = 0; - ieee80211_get_dtim(beacon_ies, &dtim_count, + ieee80211_get_dtim(bss_ies, &dtim_count, &link->u.mgd.dtim_period); sdata->deflink.u.mgd.have_beacon = true; if (ieee80211_hw_check(&local->hw, TIMING_BEACON_ONLY)) { - link->conf->sync_tsf = beacon_ies->tsf; + link->conf->sync_tsf = bss_ies->tsf; link->conf->sync_device_ts = bss->device_ts_beacon; link->conf->sync_dtim_count = dtim_count; } + } else { + bss_ies = rcu_dereference(cbss->ies); + } + + if (bss_ies) { + const struct ieee80211_eht_operation *eht_oper; + const struct element *elem; elem = cfg80211_find_ext_elem(WLAN_EID_EXT_MULTIPLE_BSSID_CONFIGURATION, - beacon_ies->data, beacon_ies->len); + bss_ies->data, bss_ies->len); if (elem && elem->datalen >= 3) link->conf->profile_periodicity = elem->data[2]; else link->conf->profile_periodicity = 0; elem = cfg80211_find_elem(WLAN_EID_EXT_CAPABILITY, - beacon_ies->data, beacon_ies->len); + bss_ies->data, bss_ies->len); if (elem && elem->datalen >= 11 && (elem->data[10] & WLAN_EXT_CAPA11_EMA_SUPPORT)) link->conf->ema_ap = true; @@ -7064,7 +7569,7 @@ link->conf->ema_ap = false; elem = cfg80211_find_ext_elem(WLAN_EID_EXT_EHT_OPERATION, - beacon_ies->data, beacon_ies->len); + bss_ies->data, bss_ies->len); eht_oper = (const void *)(elem->data + 1); if (elem && @@ -7124,7 +7629,7 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_mgd_assoc_data *assoc_data; - const struct element *ssid_elem; + const struct element *ssid_elem, *csa_elem, *ecsa_elem; struct ieee80211_vif_cfg *vif_cfg = &sdata->vif.cfg; ieee80211_conn_flags_t conn_flags = 0; struct ieee80211_link_data *link; @@ -7154,6 +7659,21 @@ kfree(assoc_data); return -EINVAL; } + + csa_elem = ieee80211_bss_get_elem(cbss, WLAN_EID_CHANNEL_SWITCH); + ecsa_elem = ieee80211_bss_get_elem(cbss, WLAN_EID_EXT_CHANSWITCH_ANN); + if ((csa_elem && + csa_elem->datalen == sizeof(struct ieee80211_channel_sw_ie) && + ((struct ieee80211_channel_sw_ie *)csa_elem->data)->count != 0) || + (ecsa_elem && + ecsa_elem->datalen == sizeof(struct ieee80211_ext_chansw_ie) && + ((struct ieee80211_ext_chansw_ie *)ecsa_elem->data)->count != 0)) { + sdata_info(sdata, "AP is in CSA process, reject assoc\n"); + rcu_read_unlock(); + kfree(assoc_data); + return -EINVAL; + } + memcpy(assoc_data->ssid, ssid_elem->data, ssid_elem->datalen); assoc_data->ssid_len = ssid_elem->datalen; memcpy(vif_cfg->ssid, assoc_data->ssid, assoc_data->ssid_len); @@ -7214,7 +7734,10 @@ match = ether_addr_equal(ifmgd->auth_data->ap_addr, assoc_data->ap_addr) && ifmgd->auth_data->link_id == req->link_id; - ieee80211_destroy_auth_data(sdata, match); + + /* Cleanup is delayed if auth_data matches */ + if (!match) + ieee80211_destroy_auth_data(sdata, false); } /* prepare assoc data */ @@ -7320,10 +7843,11 @@ for (i = 0; i < ARRAY_SIZE(assoc_data->link); i++) { assoc_data->link[i].conn_flags = conn_flags; assoc_data->link[i].bss = req->links[i].bss; + assoc_data->link[i].disabled = req->links[i].disabled; } /* if there was no authentication, set up the link */ - err = ieee80211_vif_set_links(sdata, BIT(assoc_link_id)); + err = ieee80211_vif_set_links(sdata, BIT(assoc_link_id), 0); if (err) goto err_clear; } else { @@ -7394,11 +7918,14 @@ if (i == assoc_data->assoc_link_id) continue; /* only calculate the flags, hence link == NULL */ - err = ieee80211_prep_channel(sdata, NULL, assoc_data->link[i].bss, + err = ieee80211_prep_channel(sdata, NULL, + assoc_data->link[i].bss, true, &assoc_data->link[i].conn_flags); - if (err) + if (err) { + req->links[i].error = err; goto err_clear; } + } /* needed for transmitting the assoc frames properly */ memcpy(sdata->vif.cfg.ap_addr, assoc_data->ap_addr, ETH_ALEN); @@ -7433,11 +7960,17 @@ run_again(sdata, assoc_data->timeout); + /* We are associating, clean up auth_data */ + if (ifmgd->auth_data) + ieee80211_destroy_auth_data(sdata, true); + return 0; err_clear: + if (!ifmgd->auth_data) { eth_zero_addr(sdata->deflink.u.mgd.bssid); ieee80211_link_info_change_notify(sdata, &sdata->deflink, BSS_CHANGED_BSSID); + } ifmgd->assoc_data = NULL; err_free: kfree(assoc_data); @@ -7461,6 +7994,7 @@ req->bssid, req->reason_code, ieee80211_get_reason_code_string(req->reason_code)); + info.link_id = ifmgd->auth_data->link_id; drv_mgd_prepare_tx(sdata->local, sdata, &info); ieee80211_send_deauth_disassoc(sdata, req->bssid, req->bssid, IEEE80211_STYPE_DEAUTH, @@ -7481,6 +8015,7 @@ req->bssid, req->reason_code, ieee80211_get_reason_code_string(req->reason_code)); + info.link_id = ifmgd->assoc_data->assoc_link_id; drv_mgd_prepare_tx(sdata->local, sdata, &info); ieee80211_send_deauth_disassoc(sdata, req->bssid, req->bssid, IEEE80211_STYPE_DEAUTH, @@ -7538,8 +8073,12 @@ void ieee80211_mgd_stop_link(struct ieee80211_link_data *link) { - cancel_work_sync(&link->u.mgd.request_smps_work); - cancel_work_sync(&link->u.mgd.chswitch_work); + wiphy_work_cancel(link->sdata->local->hw.wiphy, + &link->u.mgd.request_smps_work); + wiphy_work_cancel(link->sdata->local->hw.wiphy, + &link->u.mgd.recalc_smps); + wiphy_delayed_work_cancel(link->sdata->local->hw.wiphy, + &link->u.mgd.chswitch_work); } void ieee80211_mgd_stop(struct ieee80211_sub_if_data *sdata) @@ -7551,12 +8090,18 @@ * they will not do anything but might not have been * cancelled when disconnecting. */ - cancel_work_sync(&ifmgd->monitor_work); - cancel_work_sync(&ifmgd->beacon_connection_loss_work); - cancel_work_sync(&ifmgd->csa_connection_drop_work); - cancel_delayed_work_sync(&ifmgd->tdls_peer_del_work); + wiphy_work_cancel(sdata->local->hw.wiphy, + &ifmgd->monitor_work); + wiphy_work_cancel(sdata->local->hw.wiphy, + &ifmgd->beacon_connection_loss_work); + wiphy_work_cancel(sdata->local->hw.wiphy, + &ifmgd->csa_connection_drop_work); + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &ifmgd->tdls_peer_del_work); + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &ifmgd->ml_reconf_work); + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, &ifmgd->ttlm_work); - sdata_lock(sdata); if (ifmgd->assoc_data) ieee80211_destroy_assoc_data(sdata, ASSOC_TIMEOUT); if (ifmgd->auth_data) @@ -7572,7 +8117,6 @@ ifmgd->assoc_req_ies_len = 0; spin_unlock_bh(&ifmgd->teardown_lock); del_timer_sync(&ifmgd->timer); - sdata_unlock(sdata); } void ieee80211_cqm_rssi_notify(struct ieee80211_vif *vif, diff -ruw linux-6.4/net/mac80211/ocb.c linux-6.4-fbx/net/mac80211/ocb.c --- linux-6.4/net/mac80211/ocb.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/ocb.c 2024-04-22 13:40:53.023943499 +0200 @@ -4,7 +4,7 @@ * * Copyright: (c) 2014 Czech Technical University in Prague * (c) 2014 Volkswagen Group Research - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022 - 2023 Intel Corporation * Author: Rostislav Lisovy * Funded by: Volkswagen Group Research */ @@ -44,7 +44,6 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_supported_band *sband; - enum nl80211_bss_scan_width scan_width; struct sta_info *sta; int band; @@ -66,7 +65,6 @@ return; } band = chanctx_conf->def.chan->band; - scan_width = cfg80211_chandef_to_scan_width(&chanctx_conf->def); rcu_read_unlock(); sta = sta_info_alloc(sdata, addr, GFP_ATOMIC); @@ -75,13 +73,12 @@ /* Add only mandatory rates for now */ sband = local->hw.wiphy->bands[band]; - sta->sta.deflink.supp_rates[band] = - ieee80211_mandatory_rates(sband, scan_width); + sta->sta.deflink.supp_rates[band] = ieee80211_mandatory_rates(sband); spin_lock(&ifocb->incomplete_lock); list_add(&sta->list, &ifocb->incomplete_stations); spin_unlock(&ifocb->incomplete_lock); - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); } static struct sta_info *ieee80211_ocb_finish_sta(struct sta_info *sta) @@ -124,11 +121,11 @@ struct ieee80211_if_ocb *ifocb = &sdata->u.ocb; struct sta_info *sta; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + if (ifocb->joined != true) return; - sdata_lock(sdata); - spin_lock_bh(&ifocb->incomplete_lock); while (!list_empty(&ifocb->incomplete_stations)) { sta = list_first_entry(&ifocb->incomplete_stations, @@ -144,8 +141,6 @@ if (test_and_clear_bit(OCB_WORK_HOUSEKEEPING, &ifocb->wrkq_flags)) ieee80211_ocb_housekeeping(sdata); - - sdata_unlock(sdata); } static void ieee80211_ocb_housekeeping_timer(struct timer_list *t) @@ -157,7 +152,7 @@ set_bit(OCB_WORK_HOUSEKEEPING, &ifocb->wrkq_flags); - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); } void ieee80211_ocb_setup_sdata(struct ieee80211_sub_if_data *sdata) @@ -175,9 +170,11 @@ { struct ieee80211_local *local = sdata->local; struct ieee80211_if_ocb *ifocb = &sdata->u.ocb; - u32 changed = BSS_CHANGED_OCB | BSS_CHANGED_BSSID; + u64 changed = BSS_CHANGED_OCB | BSS_CHANGED_BSSID; int err; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + if (ifocb->joined == true) return -EINVAL; @@ -185,10 +182,8 @@ sdata->deflink.smps_mode = IEEE80211_SMPS_OFF; sdata->deflink.needed_rx_chains = sdata->local->rx_chains; - mutex_lock(&sdata->local->mtx); err = ieee80211_link_use_channel(&sdata->deflink, &setup->chandef, IEEE80211_CHANCTX_SHARED); - mutex_unlock(&sdata->local->mtx); if (err) return err; @@ -197,7 +192,7 @@ ifocb->joined = true; set_bit(OCB_WORK_HOUSEKEEPING, &ifocb->wrkq_flags); - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); netif_carrier_on(sdata->dev); return 0; @@ -209,6 +204,8 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + ifocb->joined = false; sta_info_flush(sdata); @@ -228,9 +225,7 @@ clear_bit(SDATA_STATE_OFFCHANNEL, &sdata->state); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_OCB); - mutex_lock(&sdata->local->mtx); ieee80211_link_release_channel(&sdata->deflink); - mutex_unlock(&sdata->local->mtx); skb_queue_purge(&sdata->skb_queue); diff -ruw linux-6.4/net/mac80211/offchannel.c linux-6.4-fbx/net/mac80211/offchannel.c --- linux-6.4/net/mac80211/offchannel.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/offchannel.c 2024-04-22 13:40:53.023943499 +0200 @@ -8,7 +8,7 @@ * Copyright 2006-2007 Jiri Benc * Copyright 2007, Michael Wu * Copyright 2009 Johannes Berg - * Copyright (C) 2019, 2022 Intel Corporation + * Copyright (C) 2019, 2022-2023 Intel Corporation */ #include #include @@ -34,7 +34,7 @@ del_timer_sync(&ifmgd->bcn_mon_timer); del_timer_sync(&ifmgd->conn_mon_timer); - cancel_work_sync(&local->dynamic_ps_enable_work); + wiphy_work_cancel(local->hw.wiphy, &local->dynamic_ps_enable_work); if (local->hw.conf.flags & IEEE80211_CONF_PS) { offchannel_ps_enabled = true; @@ -84,6 +84,8 @@ { struct ieee80211_sub_if_data *sdata; + lockdep_assert_wiphy(local->hw.wiphy); + if (WARN_ON(local->use_chanctx)) return; @@ -101,7 +103,6 @@ false); ieee80211_flush_queues(local, NULL, false); - mutex_lock(&local->iflist_mtx); list_for_each_entry(sdata, &local->interfaces, list) { if (!ieee80211_sdata_running(sdata)) continue; @@ -127,17 +128,17 @@ sdata->u.mgd.associated) ieee80211_offchannel_ps_enable(sdata); } - mutex_unlock(&local->iflist_mtx); } void ieee80211_offchannel_return(struct ieee80211_local *local) { struct ieee80211_sub_if_data *sdata; + lockdep_assert_wiphy(local->hw.wiphy); + if (WARN_ON(local->use_chanctx)) return; - mutex_lock(&local->iflist_mtx); list_for_each_entry(sdata, &local->interfaces, list) { if (sdata->vif.type == NL80211_IFTYPE_P2P_DEVICE) continue; @@ -161,7 +162,6 @@ BSS_CHANGED_BEACON_ENABLED); } } - mutex_unlock(&local->iflist_mtx); ieee80211_wake_queues_by_reason(&local->hw, IEEE80211_MAX_QUEUE_MAP, IEEE80211_QUEUE_STOP_REASON_OFFCHANNEL, @@ -197,7 +197,7 @@ struct ieee80211_roc_work *roc, *tmp; long remaining_dur_min = LONG_MAX; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry_safe(roc, tmp, &local->roc_list, list) { long remaining; @@ -230,7 +230,7 @@ if (dur == LONG_MAX) return false; - mod_delayed_work(local->workqueue, &local->roc_work, dur); + wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, dur); return true; } @@ -258,13 +258,13 @@ roc->notified = true; } -static void ieee80211_hw_roc_start(struct work_struct *work) +static void ieee80211_hw_roc_start(struct wiphy *wiphy, struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, hw_roc_start); struct ieee80211_roc_work *roc; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(roc, &local->roc_list, list) { if (!roc->started) @@ -273,8 +273,6 @@ roc->hw_begun = true; ieee80211_handle_roc_started(roc, local->hw_roc_start_time); } - - mutex_unlock(&local->mtx); } void ieee80211_ready_on_channel(struct ieee80211_hw *hw) @@ -285,7 +283,7 @@ trace_api_ready_on_channel(local); - ieee80211_queue_work(hw, &local->hw_roc_start); + wiphy_work_queue(hw->wiphy, &local->hw_roc_start); } EXPORT_SYMBOL_GPL(ieee80211_ready_on_channel); @@ -295,7 +293,7 @@ enum ieee80211_roc_type type; u32 min_dur, max_dur; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(list_empty(&local->roc_list))) return; @@ -338,7 +336,7 @@ tmp->started = true; tmp->abort = true; } - ieee80211_queue_work(&local->hw, &local->hw_roc_done); + wiphy_work_queue(local->hw.wiphy, &local->hw_roc_done); return; } @@ -368,7 +366,7 @@ ieee80211_hw_config(local, 0); } - ieee80211_queue_delayed_work(&local->hw, &local->roc_work, + wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, msecs_to_jiffies(min_dur)); /* tell userspace or send frame(s) */ @@ -386,7 +384,7 @@ { struct ieee80211_roc_work *roc; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (list_empty(&local->roc_list)) { ieee80211_run_deferred_scan(local); @@ -407,7 +405,7 @@ _ieee80211_start_next_roc(local); } else { /* delay it a bit */ - ieee80211_queue_delayed_work(&local->hw, &local->roc_work, + wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, round_jiffies_relative(HZ/2)); } } @@ -417,7 +415,7 @@ struct ieee80211_roc_work *roc; bool on_channel; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(local->ops->remain_on_channel)) return; @@ -451,29 +449,27 @@ } } -static void ieee80211_roc_work(struct work_struct *work) +static void ieee80211_roc_work(struct wiphy *wiphy, struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, roc_work.work); - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); + __ieee80211_roc_work(local); - mutex_unlock(&local->mtx); } -static void ieee80211_hw_roc_done(struct work_struct *work) +static void ieee80211_hw_roc_done(struct wiphy *wiphy, struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, hw_roc_done); - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); ieee80211_end_finished_rocs(local, jiffies); /* if there's another roc, start it now */ ieee80211_start_next_roc(local); - - mutex_unlock(&local->mtx); } void ieee80211_remain_on_channel_expired(struct ieee80211_hw *hw) @@ -482,7 +478,7 @@ trace_api_remain_on_channel_expired(local); - ieee80211_queue_work(hw, &local->hw_roc_done); + wiphy_work_queue(hw->wiphy, &local->hw_roc_done); } EXPORT_SYMBOL_GPL(ieee80211_remain_on_channel_expired); @@ -537,7 +533,7 @@ bool queued = false, combine_started = true; int ret; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (channel->freq_offset) /* this may work, but is untested */ @@ -586,7 +582,7 @@ /* if not HW assist, just queue & schedule work */ if (!local->ops->remain_on_channel) { list_add_tail(&roc->list, &local->roc_list); - ieee80211_queue_delayed_work(&local->hw, + wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, 0); } else { /* otherwise actually kick it off here @@ -675,15 +671,12 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); struct ieee80211_local *local = sdata->local; - int ret; - mutex_lock(&local->mtx); - ret = ieee80211_start_roc_work(local, sdata, chan, + lockdep_assert_wiphy(local->hw.wiphy); + + return ieee80211_start_roc_work(local, sdata, chan, duration, cookie, NULL, IEEE80211_ROC_TYPE_NORMAL); - mutex_unlock(&local->mtx); - - return ret; } static int ieee80211_cancel_roc(struct ieee80211_local *local, @@ -692,12 +685,13 @@ struct ieee80211_roc_work *roc, *tmp, *found = NULL; int ret; + lockdep_assert_wiphy(local->hw.wiphy); + if (!cookie) return -ENOENT; - flush_work(&local->hw_roc_start); + wiphy_work_flush(local->hw.wiphy, &local->hw_roc_start); - mutex_lock(&local->mtx); list_for_each_entry_safe(roc, tmp, &local->roc_list, list) { if (!mgmt_tx && roc->cookie != cookie) continue; @@ -709,7 +703,6 @@ } if (!found) { - mutex_unlock(&local->mtx); return -ENOENT; } @@ -721,10 +714,26 @@ if (local->ops->remain_on_channel) { ret = drv_cancel_remain_on_channel(local, roc->sdata); if (WARN_ON_ONCE(ret)) { - mutex_unlock(&local->mtx); return ret; } + /* + * We could be racing against the notification from the driver: + * + driver is handling the notification on CPU0 + * + user space is cancelling the remain on channel and + * schedules the hw_roc_done worker. + * + * Now hw_roc_done might start to run after the next roc will + * start and mac80211 will think that this second roc has + * ended prematurely. + * Cancel the work to make sure that all the pending workers + * have completed execution. + * Note that this assumes that by the time the driver returns + * from drv_cancel_remain_on_channel, it has completed all + * the processing of related notifications. + */ + wiphy_work_cancel(local->hw.wiphy, &local->hw_roc_done); + /* TODO: * if multiple items were combined here then we really shouldn't * cancel them all - we should wait for as much time as needed @@ -745,11 +754,10 @@ } else { /* go through work struct to return to the operating channel */ found->abort = true; - mod_delayed_work(local->workqueue, &local->roc_work, 0); + wiphy_delayed_work_queue(local->hw.wiphy, &local->roc_work, 0); } out_unlock: - mutex_unlock(&local->mtx); return 0; } @@ -778,6 +786,8 @@ int ret; u8 *data; + lockdep_assert_wiphy(local->hw.wiphy); + if (params->dont_wait_for_ack) flags = IEEE80211_TX_CTL_NO_ACK; else @@ -833,13 +843,16 @@ break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: - sdata_lock(sdata); if (!sdata->u.mgd.associated || (params->offchan && params->wait && local->ops->remain_on_channel && - memcmp(sdata->vif.cfg.ap_addr, mgmt->bssid, ETH_ALEN))) + memcmp(sdata->vif.cfg.ap_addr, mgmt->bssid, ETH_ALEN))) { need_offchan = true; - sdata_unlock(sdata); + } else if (sdata->u.mgd.associated && + ether_addr_equal(sdata->vif.cfg.ap_addr, mgmt->da)) { + sta = sta_info_get_bss(sdata, mgmt->da); + mlo_sta = sta && sta->sta.mlo; + } break; case NL80211_IFTYPE_P2P_DEVICE: need_offchan = true; @@ -855,8 +868,6 @@ if (need_offchan && !params->chan) return -EINVAL; - mutex_lock(&local->mtx); - /* Check if the operating channel is the requested channel */ if (!params->chan && mlo_sta) { need_offchan = false; @@ -980,7 +991,6 @@ if (ret) ieee80211_free_txskb(&local->hw, skb); out_unlock: - mutex_unlock(&local->mtx); return ret; } @@ -994,9 +1004,9 @@ void ieee80211_roc_setup(struct ieee80211_local *local) { - INIT_WORK(&local->hw_roc_start, ieee80211_hw_roc_start); - INIT_WORK(&local->hw_roc_done, ieee80211_hw_roc_done); - INIT_DELAYED_WORK(&local->roc_work, ieee80211_roc_work); + wiphy_work_init(&local->hw_roc_start, ieee80211_hw_roc_start); + wiphy_work_init(&local->hw_roc_done, ieee80211_hw_roc_done); + wiphy_delayed_work_init(&local->roc_work, ieee80211_roc_work); INIT_LIST_HEAD(&local->roc_list); } @@ -1006,7 +1016,8 @@ struct ieee80211_roc_work *roc, *tmp; bool work_to_do = false; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); + list_for_each_entry_safe(roc, tmp, &local->roc_list, list) { if (sdata && roc->sdata != sdata) continue; @@ -1014,7 +1025,7 @@ if (roc->started) { if (local->ops->remain_on_channel) { /* can race, so ignore return value */ - drv_cancel_remain_on_channel(local, sdata); + drv_cancel_remain_on_channel(local, roc->sdata); ieee80211_roc_notify_destroy(roc); } else { roc->abort = true; @@ -1026,5 +1037,4 @@ } if (work_to_do) __ieee80211_roc_work(local); - mutex_unlock(&local->mtx); } diff -ruw linux-6.4/net/mac80211/pm.c linux-6.4-fbx/net/mac80211/pm.c --- linux-6.4/net/mac80211/pm.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/pm.c 2024-04-22 13:40:53.023943499 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Portions - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2021, 2023 Intel Corporation */ #include #include @@ -40,13 +40,12 @@ if (ieee80211_hw_check(hw, AMPDU_AGGREGATION) && !(wowlan && wowlan->any)) { - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(sta, &local->sta_list, list) { set_sta_flag(sta, WLAN_STA_BLOCK_BA); ieee80211_sta_tear_down_BA_sessions( sta, AGG_STOP_LOCAL_REQUEST); } - mutex_unlock(&local->sta_mtx); } /* keep sched_scan only in case of 'any' trigger */ @@ -76,7 +75,7 @@ * Note that this particular timer doesn't need to be * restarted at resume. */ - cancel_work_sync(&local->dynamic_ps_enable_work); + wiphy_work_cancel(local->hw.wiphy, &local->dynamic_ps_enable_work); del_timer_sync(&local->dynamic_ps_timer); local->wowlan = wowlan; @@ -119,12 +118,11 @@ local->quiescing = false; local->wowlan = false; if (ieee80211_hw_check(hw, AMPDU_AGGREGATION)) { - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(sta, &local->sta_list, list) { clear_sta_flag(sta, WLAN_STA_BLOCK_BA); } - mutex_unlock(&local->sta_mtx); } ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP, @@ -161,7 +159,8 @@ break; } - flush_delayed_work(&sdata->dec_tailroom_needed_wk); + wiphy_delayed_work_flush(local->hw.wiphy, + &sdata->dec_tailroom_needed_wk); drv_remove_interface(local, sdata); } diff -ruw linux-6.4/net/mac80211/rc80211_minstrel_ht.c linux-6.4-fbx/net/mac80211/rc80211_minstrel_ht.c --- linux-6.4/net/mac80211/rc80211_minstrel_ht.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/rc80211_minstrel_ht.c 2024-04-22 13:40:53.023943499 +0200 @@ -1725,16 +1725,15 @@ mi->band = sband->band; mi->last_stats_update = jiffies; - ack_dur = ieee80211_frame_duration(sband->band, 10, 60, 1, 1, 0); - mi->overhead = ieee80211_frame_duration(sband->band, 0, 60, 1, 1, 0); + ack_dur = ieee80211_frame_duration(sband->band, 10, 60, 1, 1); + mi->overhead = ieee80211_frame_duration(sband->band, 0, 60, 1, 1); mi->overhead += ack_dur; mi->overhead_rtscts = mi->overhead + 2 * ack_dur; ctl_rate = &sband->bitrates[rate_lowest_index(sband, sta)]; erp = ctl_rate->flags & IEEE80211_RATE_ERP_G; ack_dur = ieee80211_frame_duration(sband->band, 10, - ctl_rate->bitrate, erp, 1, - ieee80211_chandef_get_shift(chandef)); + ctl_rate->bitrate, erp, 1); mi->overhead_legacy = ack_dur; mi->overhead_legacy_rtscts = mi->overhead_legacy + 2 * ack_dur; diff -ruw linux-6.4/net/mac80211/rx.c linux-6.4-fbx/net/mac80211/rx.c --- linux-6.4/net/mac80211/rx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/rx.c 2024-04-22 13:40:53.023943499 +0200 @@ -6,7 +6,7 @@ * Copyright 2007-2010 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright(c) 2015 - 2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include @@ -32,6 +32,7 @@ #include "tkip.h" #include "wme.h" #include "rate.h" +#include "fbx_scum.h" /* * monitor mode reception @@ -229,7 +230,7 @@ } skb_queue_tail(&sdata->skb_queue, skb); - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); if (sta) sta->deflink.rx_stats.packets++; } @@ -817,17 +818,11 @@ return NULL; } + fbx80211_rx_monitor(local, origskb, rate, rtap_space); only_monitor = should_drop_frame(origskb, present_fcs_len, rtap_space); - if (!local->monitors || (status->flag & RX_FLAG_SKIP_MONITOR)) { - if (only_monitor) { - dev_kfree_skb(origskb); - return NULL; - } - - return ieee80211_clean_skb(origskb, present_fcs_len, - rtap_space); - } + if (!local->monitors || (status->flag & RX_FLAG_SKIP_MONITOR)) + goto out; ieee80211_handle_mu_mimo_mon(monitor_sdata, origskb, rtap_space); @@ -868,6 +863,11 @@ /* ditto */ if (!origskb) return NULL; +out: + if (only_monitor) { + dev_kfree_skb(origskb); + return NULL; + } return ieee80211_clean_skb(origskb, present_fcs_len, rtap_space); } @@ -1083,7 +1083,8 @@ struct sk_buff *tail = skb_peek_tail(frames); struct ieee80211_rx_status *status; - if (tid_agg_rx->reorder_buf_filtered & BIT_ULL(index)) + if (tid_agg_rx->reorder_buf_filtered && + tid_agg_rx->reorder_buf_filtered & BIT_ULL(index)) return true; if (!tail) @@ -1124,6 +1125,7 @@ } no_frame: + if (tid_agg_rx->reorder_buf_filtered) tid_agg_rx->reorder_buf_filtered &= ~BIT_ULL(index); tid_agg_rx->head_seq_num = ieee80211_sn_inc(tid_agg_rx->head_seq_num); } @@ -1434,7 +1436,7 @@ rx->sta->last_seq_ctrl[rx->seqno_idx] == hdr->seq_ctrl)) { I802_DEBUG_INC(rx->local->dot11FrameDuplicateCount); rx->link_sta->rx_stats.num_duplicates++; - return RX_DROP_UNUSABLE; + return RX_DROP_U_DUP; } else if (!(status->flag & RX_FLAG_AMSDU_MORE)) { rx->sta->last_seq_ctrl[rx->seqno_idx] = hdr->seq_ctrl; } @@ -1488,7 +1490,7 @@ cfg80211_rx_spurious_frame(rx->sdata->dev, hdr->addr2, GFP_ATOMIC)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SPURIOUS; return RX_DROP_MONITOR; } @@ -1732,7 +1734,7 @@ if (ether_addr_equal(bssid, rx->sdata->u.ibss.bssid) && test_sta_flag(sta, WLAN_STA_AUTHORIZED)) { link_sta->rx_stats.last_rx = jiffies; - if (ieee80211_is_data(hdr->frame_control) && + if (ieee80211_is_data_present(hdr->frame_control) && !is_multicast_ether_addr(hdr->addr1)) link_sta->rx_stats.last_rate = sta_stats_encode_rate(status); @@ -1746,7 +1748,7 @@ * match the current local configuration when processed. */ link_sta->rx_stats.last_rx = jiffies; - if (ieee80211_is_data(hdr->frame_control)) + if (ieee80211_is_data_present(hdr->frame_control)) link_sta->rx_stats.last_rate = sta_stats_encode_rate(status); } @@ -1881,7 +1883,7 @@ struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; int keyidx; - ieee80211_rx_result result = RX_DROP_UNUSABLE; + ieee80211_rx_result result = RX_DROP_U_DECRYPT_FAIL; struct ieee80211_key *sta_ptk = NULL; struct ieee80211_key *ptk_idx = NULL; int mmie_keyidx = -1; @@ -1931,7 +1933,7 @@ keyid = ieee80211_get_keyid(rx->skb); if (unlikely(keyid < 0)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_NO_KEY_ID; ptk_idx = rcu_dereference(rx->sta->ptk[keyid]); } @@ -2036,7 +2038,7 @@ keyidx = ieee80211_get_keyid(rx->skb); if (unlikely(keyidx < 0)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_NO_KEY_ID; /* check per-station GTK first, if multicast packet */ if (is_multicast_ether_addr(hdr->addr1) && rx->link_sta) @@ -2102,7 +2104,7 @@ result = ieee80211_crypto_gcmp_decrypt(rx); break; default: - result = RX_DROP_UNUSABLE; + result = RX_DROP_U_BAD_CIPHER; } /* the hdr variable is invalid after the decrypt handlers */ @@ -2110,7 +2112,7 @@ /* either the frame has been decrypted or will be dropped */ status->flag |= RX_FLAG_DECRYPTED; - if (unlikely(ieee80211_is_beacon(fc) && (result & RX_DROP_UNUSABLE) && + if (unlikely(ieee80211_is_beacon(fc) && RX_RES_IS_UNUSABLE(result) && rx->sdata->dev)) cfg80211_rx_unprot_mlme_mgmt(rx->sdata->dev, skb->data, skb->len); @@ -2247,7 +2249,7 @@ I802_DEBUG_INC(rx->local->rx_handlers_fragments); if (skb_linearize(rx->skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; /* * skb_linearize() might change the skb->data and @@ -2310,11 +2312,11 @@ u8 pn[IEEE80211_CCMP_PN_LEN], *rpn; if (!requires_sequential_pn(rx, fc)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_NONSEQ_PN; /* Prevent mixed key and fragment cache attacks */ if (entry->key_color != rx->key->color) - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_KEY_COLOR; memcpy(pn, entry->last_pn, IEEE80211_CCMP_PN_LEN); for (i = IEEE80211_CCMP_PN_LEN - 1; i >= 0; i--) { @@ -2325,7 +2327,7 @@ rpn = rx->ccm_gcm.pn; if (memcmp(pn, rpn, IEEE80211_CCMP_PN_LEN)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_REPLAY; memcpy(entry->last_pn, pn, IEEE80211_CCMP_PN_LEN); } else if (entry->is_protected && (!rx->key || @@ -2336,11 +2338,11 @@ * if for TKIP Michael MIC should protect us, and WEP is a * lost cause anyway. */ - return RX_DROP_UNUSABLE; + return RX_DROP_U_EXPECT_DEFRAG_PROT; } else if (entry->is_protected && rx->key && entry->key_color != rx->key->color && (status->flag & RX_FLAG_DECRYPTED)) { - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_KEY_COLOR; } skb_pull(rx->skb, ieee80211_hdrlen(fc)); @@ -2359,7 +2361,7 @@ GFP_ATOMIC))) { I802_DEBUG_INC(rx->local->rx_handlers_drop_defrag); __skb_queue_purge(&entry->skb_list); - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; } } while ((skb = __skb_dequeue(&entry->skb_list))) { @@ -2403,29 +2405,42 @@ return 0; } -static int ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx) +static ieee80211_rx_result +ieee80211_drop_unencrypted_mgmt(struct ieee80211_rx_data *rx) { - struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)rx->skb->data; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(rx->skb); - __le16 fc = hdr->frame_control; + struct ieee80211_mgmt *mgmt = (void *)rx->skb->data; + __le16 fc = mgmt->frame_control; /* * Pass through unencrypted frames if the hardware has * decrypted them already. */ if (status->flag & RX_FLAG_DECRYPTED) - return 0; + return RX_CONTINUE; + + /* drop unicast protected dual (that wasn't protected) */ + if (ieee80211_is_action(fc) && + mgmt->u.action.category == WLAN_CATEGORY_PROTECTED_DUAL_OF_ACTION) + return RX_DROP_U_UNPROT_DUAL; if (rx->sta && test_sta_flag(rx->sta, WLAN_STA_MFP)) { if (unlikely(!ieee80211_has_protected(fc) && - ieee80211_is_unicast_robust_mgmt_frame(rx->skb) && - rx->key)) { + ieee80211_is_unicast_robust_mgmt_frame(rx->skb))) { if (ieee80211_is_deauth(fc) || - ieee80211_is_disassoc(fc)) + ieee80211_is_disassoc(fc)) { + /* + * Permit unprotected deauth/disassoc frames + * during 4-way-HS (key is installed after HS). + */ + if (!rx->key) + return RX_CONTINUE; + cfg80211_rx_unprot_mlme_mgmt(rx->sdata->dev, rx->skb->data, rx->skb->len); - return -EACCES; + } + return RX_DROP_U_UNPROT_UCAST_MGMT; } /* BIP does not use Protected field, so need to check MMIE */ if (unlikely(ieee80211_is_multicast_robust_mgmt_frame(rx->skb) && @@ -2435,14 +2450,14 @@ cfg80211_rx_unprot_mlme_mgmt(rx->sdata->dev, rx->skb->data, rx->skb->len); - return -EACCES; + return RX_DROP_U_UNPROT_MCAST_MGMT; } if (unlikely(ieee80211_is_beacon(fc) && rx->key && ieee80211_get_mmie_keyidx(rx->skb) < 0)) { cfg80211_rx_unprot_mlme_mgmt(rx->sdata->dev, rx->skb->data, rx->skb->len); - return -EACCES; + return RX_DROP_U_UNPROT_BEACON; } /* * When using MFP, Action frames are not allowed prior to @@ -2450,13 +2465,27 @@ */ if (unlikely(ieee80211_is_action(fc) && !rx->key && ieee80211_is_robust_mgmt_frame(rx->skb))) - return -EACCES; + return RX_DROP_U_UNPROT_ACTION; + + /* drop unicast public action frames when using MPF */ + if (is_unicast_ether_addr(mgmt->da) && + ieee80211_is_protected_dual_of_public_action(rx->skb)) + return RX_DROP_U_UNPROT_UNICAST_PUB_ACTION; } - return 0; + /* + * Drop robust action frames before assoc regardless of MFP state, + * after assoc we also have decided on MFP or not. + */ + if (ieee80211_is_action(fc) && + ieee80211_is_robust_mgmt_frame(rx->skb) && + (!rx->sta || !test_sta_flag(rx->sta, WLAN_STA_ASSOC))) + return RX_DROP_U_UNPROT_ROBUST_ACTION; + + return RX_CONTINUE; } -static int +static ieee80211_rx_result __ieee80211_data_to_8023(struct ieee80211_rx_data *rx, bool *port_control) { struct ieee80211_sub_if_data *sdata = rx->sdata; @@ -2468,32 +2497,31 @@ *port_control = false; if (ieee80211_has_a4(hdr->frame_control) && sdata->vif.type == NL80211_IFTYPE_AP_VLAN && !sdata->u.vlan.sta) - return -1; + return RX_DROP_U_UNEXPECTED_VLAN_4ADDR; if (sdata->vif.type == NL80211_IFTYPE_STATION && !!sdata->u.mgd.use_4addr != !!ieee80211_has_a4(hdr->frame_control)) { - if (!sdata->u.mgd.use_4addr) - return -1; + return RX_DROP_U_UNEXPECTED_STA_4ADDR; else if (!ether_addr_equal(hdr->addr1, sdata->vif.addr)) check_port_control = true; } if (is_multicast_ether_addr(hdr->addr1) && sdata->vif.type == NL80211_IFTYPE_AP_VLAN && sdata->u.vlan.sta) - return -1; + return RX_DROP_U_UNEXPECTED_VLAN_MCAST; ret = ieee80211_data_to_8023(rx->skb, sdata->vif.addr, sdata->vif.type); if (ret < 0) - return ret; + return RX_DROP_U_INVALID_8023; ehdr = (struct ethhdr *) rx->skb->data; if (ehdr->h_proto == rx->sdata->control_port_protocol) *port_control = true; else if (check_port_control) - return -1; + return RX_DROP_U_NOT_PORT_CONTROL; - return 0; + return RX_CONTINUE; } bool ieee80211_is_our_addr(struct ieee80211_sub_if_data *sdata, @@ -2505,7 +2533,7 @@ if (ether_addr_equal(sdata->vif.addr, addr)) return true; - if (!sdata->vif.valid_links) + if (!ieee80211_vif_is_mld(&sdata->vif)) return false; for (link_id = 0; link_id < ARRAY_SIZE(sdata->vif.link_conf); link_id++) { @@ -2884,10 +2912,10 @@ skb = NULL; if (skb_cow_head(fwd_skb, hdrlen - sizeof(struct ethhdr))) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; if (skb_linearize(fwd_skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; } fwd_hdr = skb_push(fwd_skb, hdrlen - sizeof(struct ethhdr)); @@ -2983,7 +3011,7 @@ rx->sdata->vif.addr, rx->sdata->vif.type, data_offset, true)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_AMSDU; if (rx->sta->amsdu_mesh_control < 0) { s8 valid = -1; @@ -3058,21 +3086,21 @@ switch (rx->sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: if (!rx->sdata->u.vlan.sta) - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_4ADDR; break; case NL80211_IFTYPE_STATION: if (!rx->sdata->u.mgd.use_4addr) - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_4ADDR; break; case NL80211_IFTYPE_MESH_POINT: break; default: - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_4ADDR; } } if (is_multicast_ether_addr(hdr->addr1) || !rx->sta) - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_AMSDU; if (rx->key) { /* @@ -3085,7 +3113,7 @@ case WLAN_CIPHER_SUITE_WEP40: case WLAN_CIPHER_SUITE_WEP104: case WLAN_CIPHER_SUITE_TKIP: - return RX_DROP_UNUSABLE; + return RX_DROP_U_BAD_AMSDU_CIPHER; default: break; } @@ -3104,7 +3132,6 @@ __le16 fc = hdr->frame_control; ieee80211_rx_result res; bool port_control; - int err; if (unlikely(!ieee80211_is_data(hdr->frame_control))) return RX_CONTINUE; @@ -3125,9 +3152,9 @@ return RX_DROP_MONITOR; } - err = __ieee80211_data_to_8023(rx, &port_control); - if (unlikely(err)) - return RX_DROP_UNUSABLE; + res = __ieee80211_data_to_8023(rx, &port_control); + if (unlikely(res != RX_CONTINUE)) + return res; res = ieee80211_rx_mesh_data(rx->sdata, rx->sta, rx->skb); if (res != RX_CONTINUE) @@ -3356,6 +3383,11 @@ if (!ieee80211_is_mgmt(mgmt->frame_control)) return RX_DROP_MONITOR; + /* drop too small action frames */ + if (ieee80211_is_action(mgmt->frame_control) && + rx->skb->len < IEEE80211_MIN_ACTION_SIZE) + return RX_DROP_U_RUNT_ACTION; + if (rx->sdata->vif.type == NL80211_IFTYPE_AP && ieee80211_is_beacon(mgmt->frame_control) && !(rx->flags & IEEE80211_RX_BEACON_REPORTED)) { @@ -3375,10 +3407,7 @@ rx->flags |= IEEE80211_RX_BEACON_REPORTED; } - if (ieee80211_drop_unencrypted_mgmt(rx)) - return RX_DROP_UNUSABLE; - - return RX_CONTINUE; + return ieee80211_drop_unencrypted_mgmt(rx); } static bool @@ -3445,14 +3474,10 @@ if (!ieee80211_is_action(mgmt->frame_control)) return RX_CONTINUE; - /* drop too small frames */ - if (len < IEEE80211_MIN_ACTION_SIZE) - return RX_DROP_UNUSABLE; - if (!rx->sta && mgmt->u.action.category != WLAN_CATEGORY_PUBLIC && mgmt->u.action.category != WLAN_CATEGORY_SELF_PROTECTED && mgmt->u.action.category != WLAN_CATEGORY_SPECTRUM_MGMT) - return RX_DROP_UNUSABLE; + return RX_DROP_U_ACTION_UNKNOWN_SRC; switch (mgmt->u.action.category) { case WLAN_CATEGORY_HT: @@ -3532,6 +3557,7 @@ /* set cur_max_bandwidth and recalc sta bw */ rx->link_sta->cur_max_bandwidth = max_bw; + rx->link_sta->pub->sta_max_bandwidth = rx->link_sta->cur_max_bandwidth; new_bw = ieee80211_sta_cur_vht_bw(rx->link_sta); if (rx->link_sta->pub->bandwidth == new_bw) @@ -3713,6 +3739,10 @@ break; goto queue; case WLAN_CATEGORY_S1G: + if (len < offsetofend(typeof(*mgmt), + u.action.u.s1g.action_code)) + break; + switch (mgmt->u.action.u.s1g.action_code) { case WLAN_S1G_TWT_SETUP: case WLAN_S1G_TWT_TEARDOWN: @@ -3853,7 +3883,7 @@ /* do not return rejected action frames */ if (mgmt->u.action.category & 0x80) - return RX_DROP_UNUSABLE; + return RX_DROP_U_REJECTED_ACTION_RESPONSE; nskb = skb_copy_expand(rx->skb, local->hw.extra_tx_headroom, 0, GFP_ATOMIC); @@ -4245,6 +4275,7 @@ u16 ssn, u64 filtered, u16 received_mpdus) { + struct ieee80211_local *local; struct sta_info *sta; struct tid_ampdu_rx *tid_agg_rx; struct sk_buff_head frames; @@ -4262,6 +4293,11 @@ sta = container_of(pubsta, struct sta_info, sta); + local = sta->sdata->local; + WARN_ONCE(local->hw.max_rx_aggregation_subframes > 64, + "RX BA marker can't support max_rx_aggregation_subframes %u > 64\n", + local->hw.max_rx_aggregation_subframes); + if (!ieee80211_rx_data_set_sta(&rx, sta, -1)) return; @@ -4638,7 +4674,7 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta; - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(sta, &local->sta_list, list) { if (sdata != sta->sdata && @@ -4652,9 +4688,9 @@ { struct ieee80211_local *local = sdata->local; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + __ieee80211_check_fast_rx_iface(sdata); - mutex_unlock(&local->sta_mtx); } static void ieee80211_rx_8023(struct ieee80211_rx_data *rx, @@ -5274,7 +5310,7 @@ * The same happens when we're not even started, * but that's worth a warning. */ - if (WARN_ON(!local->started)) + if (!local->started) goto drop; if (likely(!(status->flag & RX_FLAG_FAILED_PLCP_CRC))) { diff -ruw linux-6.4/net/mac80211/s1g.c linux-6.4-fbx/net/mac80211/s1g.c --- linux-6.4/net/mac80211/s1g.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/s1g.c 2024-04-22 13:40:53.023943499 +0200 @@ -2,6 +2,7 @@ /* * S1G handling * Copyright(c) 2020 Adapt-IP + * Copyright (C) 2023 Intel Corporation */ #include #include @@ -153,11 +154,11 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); sta = sta_info_get_bss(sdata, mgmt->sa); if (!sta) - goto out; + return; switch (mgmt->u.action.u.s1g.action_code) { case WLAN_S1G_TWT_SETUP: @@ -169,9 +170,6 @@ default: break; } - -out: - mutex_unlock(&local->sta_mtx); } void ieee80211_s1g_status_twt_action(struct ieee80211_sub_if_data *sdata, @@ -181,11 +179,11 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); sta = sta_info_get_bss(sdata, mgmt->da); if (!sta) - goto out; + return; switch (mgmt->u.action.u.s1g.action_code) { case WLAN_S1G_TWT_SETUP: @@ -195,7 +193,4 @@ default: break; } - -out: - mutex_unlock(&local->sta_mtx); } diff -ruw linux-6.4/net/mac80211/scan.c linux-6.4-fbx/net/mac80211/scan.c --- linux-6.4/net/mac80211/scan.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/scan.c 2024-04-22 13:40:53.027943608 +0200 @@ -9,7 +9,7 @@ * Copyright 2007, Michael Wu * Copyright 2013-2015 Intel Mobile Communications GmbH * Copyright 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include @@ -55,27 +55,45 @@ return qos_info & IEEE80211_WMM_IE_AP_QOSINFO_UAPSD; } -static void -ieee80211_update_bss_from_elems(struct ieee80211_local *local, - struct ieee80211_bss *bss, - struct ieee802_11_elems *elems, - struct ieee80211_rx_status *rx_status, - bool beacon) -{ +struct inform_bss_update_data { + struct ieee80211_rx_status *rx_status; + bool beacon; +}; + +void ieee80211_inform_bss(struct wiphy *wiphy, + struct cfg80211_bss *cbss, + const struct cfg80211_bss_ies *ies, + void *data) +{ + struct ieee80211_local *local = wiphy_priv(wiphy); + struct inform_bss_update_data *update_data = data; + struct ieee80211_bss *bss = (void *)cbss->priv; + struct ieee80211_rx_status *rx_status; + struct ieee802_11_elems *elems; int clen, srlen; - if (beacon) + /* This happens while joining an IBSS */ + if (!update_data) + return; + + elems = ieee802_11_parse_elems(ies->data, ies->len, false, NULL); + if (!elems) + return; + + rx_status = update_data->rx_status; + + if (update_data->beacon) bss->device_ts_beacon = rx_status->device_timestamp; else bss->device_ts_presp = rx_status->device_timestamp; if (elems->parse_error) { - if (beacon) + if (update_data->beacon) bss->corrupt_data |= IEEE80211_BSS_CORRUPT_BEACON; else bss->corrupt_data |= IEEE80211_BSS_CORRUPT_PROBE_RESP; } else { - if (beacon) + if (update_data->beacon) bss->corrupt_data &= ~IEEE80211_BSS_CORRUPT_BEACON; else bss->corrupt_data &= ~IEEE80211_BSS_CORRUPT_PROBE_RESP; @@ -124,7 +142,7 @@ bss->valid_data |= IEEE80211_BSS_VALID_WMM; } - if (beacon) { + if (update_data->beacon) { struct ieee80211_supported_band *sband = local->hw.wiphy->bands[rx_status->band]; if (!(rx_status->encoding == RX_ENC_HT) && @@ -138,6 +156,8 @@ le32_to_cpu(elems->vht_cap_elem->vht_cap_info); else bss->vht_cap_info = 0; + + kfree(elems); } struct ieee80211_bss * @@ -148,16 +168,17 @@ { bool beacon = ieee80211_is_beacon(mgmt->frame_control) || ieee80211_is_s1g_beacon(mgmt->frame_control); - struct cfg80211_bss *cbss, *non_tx_cbss; - struct ieee80211_bss *bss, *non_tx_bss; + struct cfg80211_bss *cbss; + struct inform_bss_update_data update_data = { + .rx_status = rx_status, + .beacon = beacon, + }; struct cfg80211_inform_bss bss_meta = { .boottime_ns = rx_status->boottime_ns, + .drv_data = (void *)&update_data, }; bool signal_valid; struct ieee80211_sub_if_data *scan_sdata; - struct ieee802_11_elems *elems; - size_t baselen; - u8 *elements; if (rx_status->flag & RX_FLAG_NO_SIGNAL_VAL) bss_meta.signal = 0; /* invalid signal indication */ @@ -166,12 +187,6 @@ else if (ieee80211_hw_check(&local->hw, SIGNAL_UNSPEC)) bss_meta.signal = (rx_status->signal * 100) / local->hw.max_signal; - bss_meta.scan_width = NL80211_BSS_CHAN_WIDTH_20; - if (rx_status->bw == RATE_INFO_BW_5) - bss_meta.scan_width = NL80211_BSS_CHAN_WIDTH_5; - else if (rx_status->bw == RATE_INFO_BW_10) - bss_meta.scan_width = NL80211_BSS_CHAN_WIDTH_10; - bss_meta.chan = channel; rcu_read_lock(); @@ -192,50 +207,12 @@ if (!cbss) return NULL; - if (ieee80211_is_probe_resp(mgmt->frame_control)) { - elements = mgmt->u.probe_resp.variable; - baselen = offsetof(struct ieee80211_mgmt, - u.probe_resp.variable); - } else if (ieee80211_is_s1g_beacon(mgmt->frame_control)) { - struct ieee80211_ext *ext = (void *) mgmt; - - baselen = offsetof(struct ieee80211_ext, u.s1g_beacon.variable); - elements = ext->u.s1g_beacon.variable; - } else { - baselen = offsetof(struct ieee80211_mgmt, u.beacon.variable); - elements = mgmt->u.beacon.variable; - } - - if (baselen > len) - return NULL; - - elems = ieee802_11_parse_elems(elements, len - baselen, false, cbss); - if (!elems) - return NULL; - /* In case the signal is invalid update the status */ signal_valid = channel == cbss->channel; if (!signal_valid) rx_status->flag |= RX_FLAG_NO_SIGNAL_VAL; - bss = (void *)cbss->priv; - ieee80211_update_bss_from_elems(local, bss, elems, rx_status, beacon); - kfree(elems); - - list_for_each_entry(non_tx_cbss, &cbss->nontrans_list, nontrans_list) { - non_tx_bss = (void *)non_tx_cbss->priv; - - elems = ieee802_11_parse_elems(elements, len - baselen, false, - non_tx_cbss); - if (!elems) - continue; - - ieee80211_update_bss_from_elems(local, non_tx_bss, elems, - rx_status, beacon); - kfree(elems); - } - - return bss; + return (void *)cbss->priv; } static bool ieee80211_scan_accept_presp(struct ieee80211_sub_if_data *sdata, @@ -292,7 +269,7 @@ * to active scan */ set_bit(SCAN_BEACON_DONE, &local->scanning); - ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0); + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, 0); } if (ieee80211_is_probe_resp(mgmt->frame_control)) { @@ -332,22 +309,11 @@ ieee80211_rx_bss_put(local, bss); } -static void -ieee80211_prepare_scan_chandef(struct cfg80211_chan_def *chandef, - enum nl80211_bss_scan_width scan_width) +static void ieee80211_prepare_scan_chandef(struct cfg80211_chan_def *chandef) { memset(chandef, 0, sizeof(*chandef)); - switch (scan_width) { - case NL80211_BSS_CHAN_WIDTH_5: - chandef->width = NL80211_CHAN_WIDTH_5; - break; - case NL80211_BSS_CHAN_WIDTH_10: - chandef->width = NL80211_CHAN_WIDTH_10; - break; - default: + chandef->width = NL80211_CHAN_WIDTH_20_NOHT; - break; - } } /* return false if no more work */ @@ -361,7 +327,7 @@ u32 flags = 0; req = rcu_dereference_protected(local->scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (test_bit(SCAN_HW_CANCELLED, &local->scanning)) return false; @@ -395,7 +361,7 @@ } local->hw_scan_req->req.n_channels = n_chans; - ieee80211_prepare_scan_chandef(&chandef, req->scan_width); + ieee80211_prepare_scan_chandef(&chandef); if (req->flags & NL80211_SCAN_FLAG_MIN_PREQ_CONTENT) flags |= IEEE80211_PROBE_FLAG_MIN_CONTENT; @@ -426,7 +392,7 @@ struct ieee80211_sub_if_data *scan_sdata; struct ieee80211_sub_if_data *sdata; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* * It's ok to abort a not-yet-running scan (that @@ -441,7 +407,7 @@ return; scan_sdata = rcu_dereference_protected(local->scan_sdata, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (hw_scan && !aborted && !ieee80211_hw_check(&local->hw, SINGLE_SCAN_ON_ALL_BANDS) && @@ -450,7 +416,7 @@ rc = drv_hw_scan(local, rcu_dereference_protected(local->scan_sdata, - lockdep_is_held(&local->mtx)), + lockdep_is_held(&local->hw.wiphy->mtx)), local->hw_scan_req); if (rc == 0) @@ -467,7 +433,7 @@ local->hw_scan_req = NULL; scan_req = rcu_dereference_protected(local->scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); RCU_INIT_POINTER(local->scan_req, NULL); RCU_INIT_POINTER(local->scan_sdata, NULL); @@ -502,7 +468,7 @@ */ list_for_each_entry_rcu(sdata, &local->interfaces, list) { if (ieee80211_sdata_running(sdata)) - ieee80211_queue_work(&sdata->local->hw, &sdata->work); + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->work); } if (was_scanning) @@ -522,7 +488,7 @@ memcpy(&local->scan_info, info, sizeof(*info)); - ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0); + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, 0); } EXPORT_SYMBOL(ieee80211_scan_completed); @@ -562,8 +528,7 @@ /* We need to set power level at maximum rate for scanning. */ ieee80211_hw_config(local, 0); - ieee80211_queue_delayed_work(&local->hw, - &local->scan_work, 0); + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, 0); return 0; } @@ -573,20 +538,18 @@ struct ieee80211_local *local = sdata->local; struct ieee80211_sub_if_data *sdata_iter; + lockdep_assert_wiphy(local->hw.wiphy); + if (!ieee80211_is_radar_required(local)) return true; if (!regulatory_pre_cac_allowed(local->hw.wiphy)) return false; - mutex_lock(&local->iflist_mtx); list_for_each_entry(sdata_iter, &local->interfaces, list) { - if (sdata_iter->wdev.cac_started) { - mutex_unlock(&local->iflist_mtx); + if (sdata_iter->wdev.cac_started) return false; } - } - mutex_unlock(&local->iflist_mtx); return true; } @@ -609,7 +572,7 @@ void ieee80211_run_deferred_scan(struct ieee80211_local *local) { - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (!local->scan_req || local->scanning) return; @@ -617,10 +580,10 @@ if (!ieee80211_can_scan(local, rcu_dereference_protected( local->scan_sdata, - lockdep_is_held(&local->mtx)))) + lockdep_is_held(&local->hw.wiphy->mtx)))) return; - ieee80211_queue_delayed_work(&local->hw, &local->scan_work, + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, round_jiffies_relative(0)); } @@ -662,7 +625,7 @@ u32 flags = 0, tx_flags; scan_req = rcu_dereference_protected(local->scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); tx_flags = IEEE80211_TX_INTFL_OFFCHAN_TX_OK; if (scan_req->no_cck) @@ -673,7 +636,7 @@ flags |= IEEE80211_PROBE_FLAG_RANDOM_SN; sdata = rcu_dereference_protected(local->scan_sdata, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); for (i = 0; i < scan_req->n_ssids; i++) ieee80211_send_scan_probe_req( @@ -698,7 +661,7 @@ bool hw_scan = local->ops->hw_scan; int rc; - lockdep_assert_held(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (local->scan_req) return -EBUSY; @@ -812,7 +775,7 @@ } /* Now, just wait a bit and we are all done! */ - ieee80211_queue_delayed_work(&local->hw, &local->scan_work, + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, next_delay); return 0; } else { @@ -878,12 +841,13 @@ enum mac80211_scan_state next_scan_state; struct cfg80211_scan_request *scan_req; + lockdep_assert_wiphy(local->hw.wiphy); + /* * check if at least one STA interface is associated, * check if at least one STA interface has pending tx frames * and grab the lowest used beacon interval */ - mutex_lock(&local->iflist_mtx); list_for_each_entry(sdata, &local->interfaces, list) { if (!ieee80211_sdata_running(sdata)) continue; @@ -899,10 +863,9 @@ } } } - mutex_unlock(&local->iflist_mtx); scan_req = rcu_dereference_protected(local->scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); next_chan = scan_req->channels[local->scan_channel_idx]; @@ -939,11 +902,10 @@ { int skip; struct ieee80211_channel *chan; - enum nl80211_bss_scan_width oper_scan_width; struct cfg80211_scan_request *scan_req; scan_req = rcu_dereference_protected(local->scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); skip = 0; chan = scan_req->channels[local->scan_channel_idx]; @@ -953,42 +915,21 @@ local->scan_chandef.freq1_offset = chan->freq_offset; local->scan_chandef.center_freq2 = 0; - /* For scanning on the S1G band, ignore scan_width (which is constant - * across all channels) for now since channel width is specific to each - * channel. Detect the required channel width here and likely revisit - * later. Maybe scan_width could be used to build the channel scan list? + /* For scanning on the S1G band, detect the channel width according to + * the channel being scanned. */ if (chan->band == NL80211_BAND_S1GHZ) { local->scan_chandef.width = ieee80211_s1g_channel_width(chan); goto set_channel; } - switch (scan_req->scan_width) { - case NL80211_BSS_CHAN_WIDTH_5: - local->scan_chandef.width = NL80211_CHAN_WIDTH_5; - break; - case NL80211_BSS_CHAN_WIDTH_10: - local->scan_chandef.width = NL80211_CHAN_WIDTH_10; - break; - default: - case NL80211_BSS_CHAN_WIDTH_20: /* If scanning on oper channel, use whatever channel-type * is currently in use. */ - oper_scan_width = cfg80211_chandef_to_scan_width( - &local->_oper_chandef); - if (chan == local->_oper_chandef.chan && - oper_scan_width == scan_req->scan_width) + if (chan == local->_oper_chandef.chan) local->scan_chandef = local->_oper_chandef; else local->scan_chandef.width = NL80211_CHAN_WIDTH_20_NOHT; - break; - case NL80211_BSS_CHAN_WIDTH_1: - case NL80211_BSS_CHAN_WIDTH_2: - /* shouldn't get here, S1G handled above */ - WARN_ON(1); - break; - } set_channel: if (ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL)) @@ -1060,7 +1001,7 @@ local->next_scan_state = SCAN_SET_CHANNEL; } -void ieee80211_scan_work(struct work_struct *work) +void ieee80211_scan_work(struct wiphy *wiphy, struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, scan_work.work); @@ -1069,7 +1010,7 @@ unsigned long next_delay = 0; bool aborted; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (!ieee80211_can_run_worker(local)) { aborted = true; @@ -1077,9 +1018,9 @@ } sdata = rcu_dereference_protected(local->scan_sdata, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); scan_req = rcu_dereference_protected(local->scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); /* When scanning on-channel, the first-callback means completed. */ if (test_bit(SCAN_ONCHANNEL_SCANNING, &local->scanning)) { @@ -1093,7 +1034,7 @@ } if (!sdata || !scan_req) - goto out; + return; if (!local->scanning) { int rc; @@ -1102,13 +1043,12 @@ RCU_INIT_POINTER(local->scan_sdata, NULL); rc = __ieee80211_start_scan(sdata, scan_req); - if (rc) { + if (!rc) + return; /* need to complete scan in cfg80211 */ rcu_assign_pointer(local->scan_req, scan_req); aborted = true; goto out_complete; - } else - goto out; } clear_bit(SCAN_BEACON_WAIT, &local->scanning); @@ -1154,38 +1094,32 @@ } } while (next_delay == 0); - ieee80211_queue_delayed_work(&local->hw, &local->scan_work, next_delay); - goto out; + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, + next_delay); + return; out_complete: __ieee80211_scan_completed(&local->hw, aborted); -out: - mutex_unlock(&local->mtx); } int ieee80211_request_scan(struct ieee80211_sub_if_data *sdata, struct cfg80211_scan_request *req) { - int res; - - mutex_lock(&sdata->local->mtx); - res = __ieee80211_start_scan(sdata, req); - mutex_unlock(&sdata->local->mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); - return res; + return __ieee80211_start_scan(sdata, req); } int ieee80211_request_ibss_scan(struct ieee80211_sub_if_data *sdata, const u8 *ssid, u8 ssid_len, struct ieee80211_channel **channels, - unsigned int n_channels, - enum nl80211_bss_scan_width scan_width) + unsigned int n_channels) { struct ieee80211_local *local = sdata->local; int ret = -EBUSY, i, n_ch = 0; enum nl80211_band band; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* busy scanning */ if (local->scan_req) @@ -1236,13 +1170,11 @@ local->int_scan_req->ssids = &local->scan_ssid; local->int_scan_req->n_ssids = 1; - local->int_scan_req->scan_width = scan_width; memcpy(local->int_scan_req->ssids[0].ssid, ssid, IEEE80211_MAX_SSID_LEN); local->int_scan_req->ssids[0].ssid_len = ssid_len; ret = __ieee80211_start_scan(sdata, sdata->local->int_scan_req); unlock: - mutex_unlock(&local->mtx); return ret; } @@ -1269,9 +1201,8 @@ * after the scan was completed/aborted. */ - mutex_lock(&local->mtx); if (!local->scan_req) - goto out; + return; /* * We have a scan running and the driver already reported completion, @@ -1281,7 +1212,7 @@ if (test_bit(SCAN_HW_SCANNING, &local->scanning) && test_bit(SCAN_COMPLETED, &local->scanning)) { set_bit(SCAN_HW_CANCELLED, &local->scanning); - goto out; + return; } if (test_bit(SCAN_HW_SCANNING, &local->scanning)) { @@ -1293,21 +1224,14 @@ if (local->ops->cancel_hw_scan) drv_cancel_hw_scan(local, rcu_dereference_protected(local->scan_sdata, - lockdep_is_held(&local->mtx))); - goto out; + lockdep_is_held(&local->hw.wiphy->mtx))); + return; } - /* - * If the work is currently running, it must be blocked on - * the mutex, but we'll set scan_sdata = NULL and it'll - * simply exit once it acquires the mutex. - */ - cancel_delayed_work(&local->scan_work); + wiphy_delayed_work_cancel(local->hw.wiphy, &local->scan_work); /* and clean up */ memset(&local->scan_info, 0, sizeof(local->scan_info)); __ieee80211_scan_completed(&local->hw, true); -out: - mutex_unlock(&local->mtx); } int __ieee80211_request_sched_scan_start(struct ieee80211_sub_if_data *sdata, @@ -1322,9 +1246,9 @@ u8 *ie; u32 flags = 0; - iebufsz = local->scan_ies_len + req->ie_len; + lockdep_assert_wiphy(local->hw.wiphy); - lockdep_assert_held(&local->mtx); + iebufsz = local->scan_ies_len + req->ie_len; if (!local->ops->sched_scan_start) return -ENOTSUPP; @@ -1346,7 +1270,7 @@ goto out; } - ieee80211_prepare_scan_chandef(&chandef, req->scan_width); + ieee80211_prepare_scan_chandef(&chandef); ieee80211_build_preq_ies(sdata, ie, num_bands * iebufsz, &sched_scan_ies, req->ie, @@ -1375,19 +1299,13 @@ struct cfg80211_sched_scan_request *req) { struct ieee80211_local *local = sdata->local; - int ret; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); - if (rcu_access_pointer(local->sched_scan_sdata)) { - mutex_unlock(&local->mtx); + if (rcu_access_pointer(local->sched_scan_sdata)) return -EBUSY; - } - - ret = __ieee80211_request_sched_scan_start(sdata, req); - mutex_unlock(&local->mtx); - return ret; + return __ieee80211_request_sched_scan_start(sdata, req); } int ieee80211_request_sched_scan_stop(struct ieee80211_local *local) @@ -1395,25 +1313,21 @@ struct ieee80211_sub_if_data *sched_scan_sdata; int ret = -ENOENT; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); - if (!local->ops->sched_scan_stop) { - ret = -ENOTSUPP; - goto out; - } + if (!local->ops->sched_scan_stop) + return -ENOTSUPP; /* We don't want to restart sched scan anymore. */ RCU_INIT_POINTER(local->sched_scan_req, NULL); sched_scan_sdata = rcu_dereference_protected(local->sched_scan_sdata, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (sched_scan_sdata) { ret = drv_sched_scan_stop(local, sched_scan_sdata); if (!ret) RCU_INIT_POINTER(local->sched_scan_sdata, NULL); } -out: - mutex_unlock(&local->mtx); return ret; } @@ -1430,24 +1344,21 @@ void ieee80211_sched_scan_end(struct ieee80211_local *local) { - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); - if (!rcu_access_pointer(local->sched_scan_sdata)) { - mutex_unlock(&local->mtx); + if (!rcu_access_pointer(local->sched_scan_sdata)) return; - } RCU_INIT_POINTER(local->sched_scan_sdata, NULL); /* If sched scan was aborted by the driver. */ RCU_INIT_POINTER(local->sched_scan_req, NULL); - mutex_unlock(&local->mtx); - - cfg80211_sched_scan_stopped(local->hw.wiphy, 0); + cfg80211_sched_scan_stopped_locked(local->hw.wiphy, 0); } -void ieee80211_sched_scan_stopped_work(struct work_struct *work) +void ieee80211_sched_scan_stopped_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, @@ -1470,6 +1381,6 @@ if (local->in_reconfig) return; - schedule_work(&local->sched_scan_stopped_work); + wiphy_work_queue(hw->wiphy, &local->sched_scan_stopped_work); } EXPORT_SYMBOL(ieee80211_sched_scan_stopped); diff -ruw linux-6.4/net/mac80211/spectmgmt.c linux-6.4-fbx/net/mac80211/spectmgmt.c --- linux-6.4/net/mac80211/spectmgmt.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/spectmgmt.c 2024-04-22 13:40:53.027943608 +0200 @@ -9,7 +9,7 @@ * Copyright 2007, Michael Wu * Copyright 2007-2008, Intel Corporation * Copyright 2008, Johannes Berg - * Copyright (C) 2018, 2020, 2022 Intel Corporation + * Copyright (C) 2018, 2020, 2022-2023 Intel Corporation */ #include @@ -33,12 +33,14 @@ struct cfg80211_chan_def new_vht_chandef = {}; const struct ieee80211_sec_chan_offs_ie *sec_chan_offs; const struct ieee80211_wide_bw_chansw_ie *wide_bw_chansw_ie; + const struct ieee80211_bandwidth_indication *bwi; int secondary_channel_offset = -1; memset(csa_ie, 0, sizeof(*csa_ie)); sec_chan_offs = elems->sec_chan_offs; wide_bw_chansw_ie = elems->wide_bw_chansw_ie; + bwi = elems->bandwidth_indication; if (conn_flags & (IEEE80211_CONN_DISABLE_HT | IEEE80211_CONN_DISABLE_40MHZ)) { @@ -132,7 +134,14 @@ break; } - if (wide_bw_chansw_ie) { + if (bwi) { + /* start with the CSA one */ + new_vht_chandef = csa_ie->chandef; + /* and update the width accordingly */ + /* FIXME: support 160/320 */ + ieee80211_chandef_eht_oper(&bwi->info, true, true, + &new_vht_chandef); + } else if (wide_bw_chansw_ie) { u8 new_seg1 = wide_bw_chansw_ie->new_center_freq_seg1; struct ieee80211_vht_operation vht_oper = { .chan_width = diff -ruw linux-6.4/net/mac80211/sta_info.c linux-6.4-fbx/net/mac80211/sta_info.c --- linux-6.4/net/mac80211/sta_info.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/sta_info.c 2024-04-22 13:40:53.027943608 +0200 @@ -4,7 +4,7 @@ * Copyright 2006-2007 Jiri Benc * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015 - 2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include @@ -88,7 +88,6 @@ .max_size = CONFIG_MAC80211_STA_HASH_MAX_SIZE, }; -/* Caller must hold local->sta_mtx */ static int sta_info_hash_del(struct ieee80211_local *local, struct sta_info *sta) { @@ -99,19 +98,36 @@ static int link_sta_info_hash_add(struct ieee80211_local *local, struct link_sta_info *link_sta) { - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + return rhltable_insert(&local->link_sta_hash, - &link_sta->link_hash_node, - link_sta_rht_params); + &link_sta->link_hash_node, link_sta_rht_params); } static int link_sta_info_hash_del(struct ieee80211_local *local, struct link_sta_info *link_sta) { - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + return rhltable_remove(&local->link_sta_hash, - &link_sta->link_hash_node, - link_sta_rht_params); + &link_sta->link_hash_node, link_sta_rht_params); +} + +void ieee80211_purge_sta_txqs(struct sta_info *sta) +{ + struct ieee80211_local *local = sta->sdata->local; + int i; + + for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { + struct txq_info *txqi; + + if (!sta->sta.txq[i]) + continue; + + txqi = to_txq_info(sta->sta.txq[i]); + + ieee80211_txq_purge(local, txqi); + } } static void __cleanup_single_sta(struct sta_info *sta) @@ -140,16 +156,7 @@ atomic_dec(&ps->num_sta_ps); } - for (i = 0; i < ARRAY_SIZE(sta->sta.txq); i++) { - struct txq_info *txqi; - - if (!sta->sta.txq[i]) - continue; - - txqi = to_txq_info(sta->sta.txq[i]); - - ieee80211_txq_purge(local, txqi); - } + ieee80211_purge_sta_txqs(sta); for (ac = 0; ac < IEEE80211_NUM_ACS; ac++) { local->total_ps_buffered -= skb_queue_len(&sta->ps_tx_buf[ac]); @@ -331,7 +338,7 @@ int i = 0; list_for_each_entry_rcu(sta, &local->sta_list, list, - lockdep_is_held(&local->sta_mtx)) { + lockdep_is_held(&local->hw.wiphy->mtx)) { if (sdata != sta->sdata) continue; if (i < idx) { @@ -355,9 +362,9 @@ struct sta_link_alloc *alloc = NULL; struct link_sta_info *link_sta; - link_sta = rcu_dereference_protected(sta->link[link_id], - lockdep_is_held(&sta->local->sta_mtx)); + lockdep_assert_wiphy(sta->local->hw.wiphy); + link_sta = rcu_access_pointer(sta->link[link_id]); if (WARN_ON(!link_sta)) return; @@ -436,7 +443,6 @@ kfree(sta); } -/* Caller must hold local->sta_mtx */ static int sta_info_hash_add(struct ieee80211_local *local, struct sta_info *sta) { @@ -454,9 +460,10 @@ return; local_bh_disable(); - if (!test_sta_flag(sta, WLAN_STA_PS_STA)) + if (!test_sta_flag(sta, WLAN_STA_PS_STA)) { + if (test_sta_flag(sta, WLAN_STA_PS_DELIVER)) ieee80211_sta_ps_deliver_wakeup(sta); - else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) + } else if (test_and_clear_sta_flag(sta, WLAN_STA_PSPOLL)) ieee80211_sta_ps_deliver_poll_response(sta); else if (test_and_clear_sta_flag(sta, WLAN_STA_UAPSD)) ieee80211_sta_ps_deliver_uapsd(sta); @@ -555,8 +562,7 @@ spin_lock_init(&sta->lock); spin_lock_init(&sta->ps_lock); INIT_WORK(&sta->drv_deliver_wk, sta_deliver_ps_frames); - INIT_WORK(&sta->ampdu_mlme.work, ieee80211_ba_session_work); - mutex_init(&sta->ampdu_mlme.mtx); + wiphy_work_init(&sta->ampdu_mlme.work, ieee80211_ba_session_work); #ifdef CONFIG_MAC80211_MESH if (ieee80211_vif_is_mesh(&sdata->vif)) { sta->mesh = kzalloc(sizeof(*sta->mesh), gfp); @@ -716,6 +722,8 @@ { struct ieee80211_sub_if_data *sdata = sta->sdata; + lockdep_assert_wiphy(sdata->local->hw.wiphy); + /* * Can't be a WARN_ON because it can be triggered through a race: * something inserts a STA (on one CPU) without holding the RTNL @@ -733,7 +741,6 @@ * for correctness. */ rcu_read_lock(); - lockdep_assert_held(&sdata->local->sta_mtx); if (ieee80211_hw_check(&sdata->local->hw, NEEDS_UNIQUE_STA_ADDR) && ieee80211_find_sta_by_ifaddr(&sdata->local->hw, sta->addr, NULL)) { rcu_read_unlock(); @@ -807,11 +814,6 @@ } } -/* - * should be called with sta_mtx locked - * this function replaces the mutex lock - * with a RCU lock - */ static int sta_info_insert_finish(struct sta_info *sta) __acquires(RCU) { struct ieee80211_local *local = sta->local; @@ -819,7 +821,7 @@ struct station_info *sinfo = NULL; int err = 0; - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* check if STA exists already */ if (sta_info_get_bss(sdata, sta->sta.addr)) { @@ -883,7 +885,7 @@ struct link_sta_info *link_sta; link_sta = rcu_dereference_protected(sta->link[i], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (!link_sta) continue; @@ -905,7 +907,6 @@ /* move reference to rcu-protected */ rcu_read_lock(); - mutex_unlock(&local->sta_mtx); if (ieee80211_vif_is_mesh(&sdata->vif)) mesh_accept_plinks_update(sdata); @@ -921,7 +922,6 @@ synchronize_net(); out_cleanup: cleanup_single_sta(sta); - mutex_unlock(&local->sta_mtx); kfree(sinfo); rcu_read_lock(); return err; @@ -933,13 +933,11 @@ int err; might_sleep(); - - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); err = sta_info_insert_check(sta); if (err) { sta_info_free(local, sta); - mutex_unlock(&local->sta_mtx); rcu_read_lock(); return err; } @@ -1218,7 +1216,7 @@ local = sta->local; sdata = sta->sdata; - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* * Before removing the station from the driver and @@ -1243,7 +1241,7 @@ continue; link_sta = rcu_dereference_protected(sta->link[i], - lockdep_is_held(&local->sta_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); link_sta_info_hash_del(local, link_sta); } @@ -1274,7 +1272,137 @@ return 0; } -static void __sta_info_destroy_part2(struct sta_info *sta) +static int _sta_info_move_state(struct sta_info *sta, + enum ieee80211_sta_state new_state, + bool recalc) +{ + struct ieee80211_local *local = sta->local; + + might_sleep(); + + if (sta->sta_state == new_state) + return 0; + + /* check allowed transitions first */ + + switch (new_state) { + case IEEE80211_STA_NONE: + if (sta->sta_state != IEEE80211_STA_AUTH) + return -EINVAL; + break; + case IEEE80211_STA_AUTH: + if (sta->sta_state != IEEE80211_STA_NONE && + sta->sta_state != IEEE80211_STA_ASSOC) + return -EINVAL; + break; + case IEEE80211_STA_ASSOC: + if (sta->sta_state != IEEE80211_STA_AUTH && + sta->sta_state != IEEE80211_STA_AUTHORIZED) + return -EINVAL; + break; + case IEEE80211_STA_AUTHORIZED: + if (sta->sta_state != IEEE80211_STA_ASSOC) + return -EINVAL; + break; + default: + WARN(1, "invalid state %d", new_state); + return -EINVAL; + } + + sta_dbg(sta->sdata, "moving STA %pM to state %d\n", + sta->sta.addr, new_state); + + /* notify the driver before the actual changes so it can + * fail the transition + */ + if (test_sta_flag(sta, WLAN_STA_INSERTED)) { + int err = drv_sta_state(sta->local, sta->sdata, sta, + sta->sta_state, new_state); + if (err) + return err; + } + + /* reflect the change in all state variables */ + + switch (new_state) { + case IEEE80211_STA_NONE: + if (sta->sta_state == IEEE80211_STA_AUTH) + clear_bit(WLAN_STA_AUTH, &sta->_flags); + break; + case IEEE80211_STA_AUTH: + if (sta->sta_state == IEEE80211_STA_NONE) { + set_bit(WLAN_STA_AUTH, &sta->_flags); + } else if (sta->sta_state == IEEE80211_STA_ASSOC) { + clear_bit(WLAN_STA_ASSOC, &sta->_flags); + if (recalc) { + ieee80211_recalc_min_chandef(sta->sdata, -1); + if (!sta->sta.support_p2p_ps) + ieee80211_recalc_p2p_go_ps_allowed(sta->sdata); + } + } + break; + case IEEE80211_STA_ASSOC: + if (sta->sta_state == IEEE80211_STA_AUTH) { + set_bit(WLAN_STA_ASSOC, &sta->_flags); + sta->assoc_at = ktime_get_boottime_ns(); + if (recalc) { + ieee80211_recalc_min_chandef(sta->sdata, -1); + if (!sta->sta.support_p2p_ps) + ieee80211_recalc_p2p_go_ps_allowed(sta->sdata); + } + } else if (sta->sta_state == IEEE80211_STA_AUTHORIZED) { + ieee80211_vif_dec_num_mcast(sta->sdata); + clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags); + + /* + * If we have encryption offload, flush (station) queues + * (after ensuring concurrent TX completed) so we won't + * transmit anything later unencrypted if/when keys are + * also removed, which might otherwise happen depending + * on how the hardware offload works. + */ + if (local->ops->set_key) { + synchronize_net(); + if (local->ops->flush_sta) + drv_flush_sta(local, sta->sdata, sta); + else + ieee80211_flush_queues(local, + sta->sdata, + false); + } + + ieee80211_clear_fast_xmit(sta); + ieee80211_clear_fast_rx(sta); + } + break; + case IEEE80211_STA_AUTHORIZED: + if (sta->sta_state == IEEE80211_STA_ASSOC) { + ieee80211_vif_inc_num_mcast(sta->sdata); + set_bit(WLAN_STA_AUTHORIZED, &sta->_flags); + ieee80211_check_fast_xmit(sta); + ieee80211_check_fast_rx(sta); + } + if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN || + sta->sdata->vif.type == NL80211_IFTYPE_AP) + cfg80211_send_layer2_update(sta->sdata->dev, + sta->sta.addr); + break; + default: + break; + } + + sta->sta_state = new_state; + + return 0; +} + +int sta_info_move_state(struct sta_info *sta, + enum ieee80211_sta_state new_state) +{ + return _sta_info_move_state(sta, new_state, true); +} + +static void __sta_info_destroy_part2(struct sta_info *sta, bool recalc) { struct ieee80211_local *local = sta->local; struct ieee80211_sub_if_data *sdata = sta->sdata; @@ -1286,26 +1414,28 @@ * after _part1 and before _part2! */ + /* + * There's a potential race in _part1 where we set WLAN_STA_BLOCK_BA + * but someone might have just gotten past a check, and not yet into + * queuing the work/creating the data/etc. + * + * Do another round of destruction so that the worker is certainly + * canceled before we later free the station. + * + * Since this is after synchronize_rcu()/synchronize_net() we're now + * certain that nobody can actually hold a reference to the STA and + * be calling e.g. ieee80211_start_tx_ba_session(). + */ + ieee80211_sta_tear_down_BA_sessions(sta, AGG_STOP_DESTROY_STA); + might_sleep(); - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (sta->sta_state == IEEE80211_STA_AUTHORIZED) { - ret = sta_info_move_state(sta, IEEE80211_STA_ASSOC); + ret = _sta_info_move_state(sta, IEEE80211_STA_ASSOC, recalc); WARN_ON_ONCE(ret); } - /* Flush queues before removing keys, as that might remove them - * from hardware, and then depending on the offload method, any - * frames sitting on hardware queues might be sent out without - * any encryption at all. - */ - if (local->ops->set_key) { - if (local->ops->flush_sta) - drv_flush_sta(local, sta->sdata, sta); - else - ieee80211_flush_queues(local, sta->sdata, false); - } - /* now keys can no longer be reached */ ieee80211_free_sta_keys(local, sta); @@ -1318,7 +1448,7 @@ local->sta_generation++; while (sta->sta_state > IEEE80211_STA_NONE) { - ret = sta_info_move_state(sta, sta->sta_state - 1); + ret = _sta_info_move_state(sta, sta->sta_state - 1, recalc); if (ret) { WARN_ON_ONCE(1); break; @@ -1355,7 +1485,7 @@ synchronize_net(); - __sta_info_destroy_part2(sta); + __sta_info_destroy_part2(sta, true); return 0; } @@ -1363,28 +1493,22 @@ int sta_info_destroy_addr(struct ieee80211_sub_if_data *sdata, const u8 *addr) { struct sta_info *sta; - int ret; - mutex_lock(&sdata->local->sta_mtx); - sta = sta_info_get(sdata, addr); - ret = __sta_info_destroy(sta); - mutex_unlock(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); - return ret; + sta = sta_info_get(sdata, addr); + return __sta_info_destroy(sta); } int sta_info_destroy_addr_bss(struct ieee80211_sub_if_data *sdata, const u8 *addr) { struct sta_info *sta; - int ret; - mutex_lock(&sdata->local->sta_mtx); - sta = sta_info_get_bss(sdata, addr); - ret = __sta_info_destroy(sta); - mutex_unlock(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); - return ret; + sta = sta_info_get_bss(sdata, addr); + return __sta_info_destroy(sta); } static void sta_info_cleanup(struct timer_list *t) @@ -1424,7 +1548,6 @@ } spin_lock_init(&local->tim_lock); - mutex_init(&local->sta_mtx); INIT_LIST_HEAD(&local->sta_list); timer_setup(&local->sta_cleanup, sta_info_cleanup, 0); @@ -1447,11 +1570,11 @@ int ret = 0; might_sleep(); + lockdep_assert_wiphy(local->hw.wiphy); WARN_ON(vlans && sdata->vif.type != NL80211_IFTYPE_AP); WARN_ON(vlans && !sdata->bss); - mutex_lock(&local->sta_mtx); list_for_each_entry_safe(sta, tmp, &local->sta_list, list) { if (sdata == sta->sdata || (vlans && sdata->bss == sta->sdata->bss)) { @@ -1462,11 +1585,19 @@ } if (!list_empty(&free_list)) { + bool support_p2p_ps = true; + synchronize_net(); - list_for_each_entry_safe(sta, tmp, &free_list, free_list) - __sta_info_destroy_part2(sta); + list_for_each_entry_safe(sta, tmp, &free_list, free_list) { + if (!sta->sta.support_p2p_ps) + support_p2p_ps = false; + __sta_info_destroy_part2(sta, false); + } + + ieee80211_recalc_min_chandef(sdata, -1); + if (!support_p2p_ps) + ieee80211_recalc_p2p_go_ps_allowed(sdata); } - mutex_unlock(&local->sta_mtx); return ret; } @@ -1477,7 +1608,7 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta, *tmp; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry_safe(sta, tmp, &local->sta_list, list) { unsigned long last_active = ieee80211_sta_last_active(sta); @@ -1496,8 +1627,6 @@ WARN_ON(__sta_info_destroy(sta)); } } - - mutex_unlock(&local->sta_mtx); } struct ieee80211_sta *ieee80211_find_sta_by_ifaddr(struct ieee80211_hw *hw, @@ -2252,106 +2381,6 @@ } } -int sta_info_move_state(struct sta_info *sta, - enum ieee80211_sta_state new_state) -{ - might_sleep(); - - if (sta->sta_state == new_state) - return 0; - - /* check allowed transitions first */ - - switch (new_state) { - case IEEE80211_STA_NONE: - if (sta->sta_state != IEEE80211_STA_AUTH) - return -EINVAL; - break; - case IEEE80211_STA_AUTH: - if (sta->sta_state != IEEE80211_STA_NONE && - sta->sta_state != IEEE80211_STA_ASSOC) - return -EINVAL; - break; - case IEEE80211_STA_ASSOC: - if (sta->sta_state != IEEE80211_STA_AUTH && - sta->sta_state != IEEE80211_STA_AUTHORIZED) - return -EINVAL; - break; - case IEEE80211_STA_AUTHORIZED: - if (sta->sta_state != IEEE80211_STA_ASSOC) - return -EINVAL; - break; - default: - WARN(1, "invalid state %d", new_state); - return -EINVAL; - } - - sta_dbg(sta->sdata, "moving STA %pM to state %d\n", - sta->sta.addr, new_state); - - /* - * notify the driver before the actual changes so it can - * fail the transition - */ - if (test_sta_flag(sta, WLAN_STA_INSERTED)) { - int err = drv_sta_state(sta->local, sta->sdata, sta, - sta->sta_state, new_state); - if (err) - return err; - } - - /* reflect the change in all state variables */ - - switch (new_state) { - case IEEE80211_STA_NONE: - if (sta->sta_state == IEEE80211_STA_AUTH) - clear_bit(WLAN_STA_AUTH, &sta->_flags); - break; - case IEEE80211_STA_AUTH: - if (sta->sta_state == IEEE80211_STA_NONE) { - set_bit(WLAN_STA_AUTH, &sta->_flags); - } else if (sta->sta_state == IEEE80211_STA_ASSOC) { - clear_bit(WLAN_STA_ASSOC, &sta->_flags); - ieee80211_recalc_min_chandef(sta->sdata, -1); - if (!sta->sta.support_p2p_ps) - ieee80211_recalc_p2p_go_ps_allowed(sta->sdata); - } - break; - case IEEE80211_STA_ASSOC: - if (sta->sta_state == IEEE80211_STA_AUTH) { - set_bit(WLAN_STA_ASSOC, &sta->_flags); - sta->assoc_at = ktime_get_boottime_ns(); - ieee80211_recalc_min_chandef(sta->sdata, -1); - if (!sta->sta.support_p2p_ps) - ieee80211_recalc_p2p_go_ps_allowed(sta->sdata); - } else if (sta->sta_state == IEEE80211_STA_AUTHORIZED) { - ieee80211_vif_dec_num_mcast(sta->sdata); - clear_bit(WLAN_STA_AUTHORIZED, &sta->_flags); - ieee80211_clear_fast_xmit(sta); - ieee80211_clear_fast_rx(sta); - } - break; - case IEEE80211_STA_AUTHORIZED: - if (sta->sta_state == IEEE80211_STA_ASSOC) { - ieee80211_vif_inc_num_mcast(sta->sdata); - set_bit(WLAN_STA_AUTHORIZED, &sta->_flags); - ieee80211_check_fast_xmit(sta); - ieee80211_check_fast_rx(sta); - } - if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN || - sta->sdata->vif.type == NL80211_IFTYPE_AP) - cfg80211_send_layer2_update(sta->sdata->dev, - sta->sta.addr); - break; - default: - break; - } - - sta->sta_state = new_state; - - return 0; -} - static struct ieee80211_sta_rx_stats * sta_get_last_rx_stats(struct sta_info *sta) { @@ -2691,7 +2720,8 @@ } if (!(sinfo->filled & BIT_ULL(NL80211_STA_INFO_TX_BITRATE)) && - !sta->sta.valid_links) { + !sta->sta.valid_links && + ieee80211_rate_valid(&sta->deflink.tx_stats.last_rate)) { sta_set_rate_info_tx(sta, &sta->deflink.tx_stats.last_rate, &sinfo->txrate); sinfo->filled |= BIT_ULL(NL80211_STA_INFO_TX_BITRATE); @@ -2803,6 +2833,10 @@ struct rate_control_ref *ref = NULL; u32 thr = 0; + /* first check for overrride */ + if (sta->deflink.pub->tp_override) + return sta->deflink.pub->tp_override; + if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) ref = local->rate_ctrl; @@ -2852,7 +2886,9 @@ struct sta_link_alloc *alloc; int ret; - lockdep_assert_held(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + WARN_ON(!test_sta_flag(sta, WLAN_STA_INSERTED)); /* must represent an MLD from the start */ if (WARN_ON(!sta->sta.valid_links)) @@ -2881,7 +2917,9 @@ void ieee80211_sta_free_link(struct sta_info *sta, unsigned int link_id) { - lockdep_assert_held(&sta->sdata->local->sta_mtx); + lockdep_assert_wiphy(sta->sdata->local->hw.wiphy); + + WARN_ON(!test_sta_flag(sta, WLAN_STA_INSERTED)); sta_remove_link(sta, link_id, false); } @@ -2895,7 +2933,7 @@ int ret; link_sta = rcu_dereference_protected(sta->link[link_id], - lockdep_is_held(&sdata->local->sta_mtx)); + lockdep_is_held(&sdata->local->hw.wiphy->mtx)); if (WARN_ON(old_links == new_links || !link_sta)) return -EINVAL; @@ -2910,9 +2948,11 @@ sta->sta.valid_links = new_links; - if (!test_sta_flag(sta, WLAN_STA_INSERTED)) + if (WARN_ON(!test_sta_flag(sta, WLAN_STA_INSERTED))) goto hash; + ieee80211_recalc_min_chandef(sdata, link_id); + /* Ensure the values are updated for the driver, * redone by sta_remove_link on failure. */ @@ -2937,11 +2977,11 @@ struct ieee80211_sub_if_data *sdata = sta->sdata; u16 old_links = sta->sta.valid_links; - lockdep_assert_held(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); sta->sta.valid_links &= ~BIT(link_id); - if (test_sta_flag(sta, WLAN_STA_INSERTED)) + if (!WARN_ON(!test_sta_flag(sta, WLAN_STA_INSERTED))) drv_change_sta_links(sdata->local, sdata, &sta->sta, old_links, sta->sta.valid_links); @@ -2968,7 +3008,7 @@ WLAN_EXT_CAPA9_MAX_MSDU_IN_AMSDU_MSB) << 1; if (val) - sta->sta.max_amsdu_subframes = 4 << val; + sta->sta.max_amsdu_subframes = 4 << (4 - val); } #ifdef CONFIG_LOCKDEP @@ -2976,7 +3016,7 @@ { struct sta_info *sta = container_of(pubsta, struct sta_info, sta); - return lockdep_is_held(&sta->local->sta_mtx); + return lockdep_is_held(&sta->local->hw.wiphy->mtx); } EXPORT_SYMBOL(lockdep_sta_mutex_held); #endif diff -ruw linux-6.4/net/mac80211/sta_info.h linux-6.4-fbx/net/mac80211/sta_info.h --- linux-6.4/net/mac80211/sta_info.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/sta_info.h 2024-04-22 13:40:53.027943608 +0200 @@ -3,7 +3,7 @@ * Copyright 2002-2005, Devicescape Software, Inc. * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright(c) 2015-2017 Intel Deutschland GmbH - * Copyright(c) 2020-2022 Intel Corporation + * Copyright(c) 2020-2023 Intel Corporation */ #ifndef STA_INFO_H @@ -259,9 +259,6 @@ /** * struct sta_ampdu_mlme - STA aggregation information. * - * @mtx: mutex to protect all TX data (except non-NULL assignments - * to tid_tx[idx], which are protected by the sta spinlock) - * tid_start_tx is also protected by sta->lock. * @tid_rx: aggregation info for Rx per TID -- RCU protected * @tid_rx_token: dialog tokens for valid aggregation sessions * @tid_rx_timer_expired: bitmap indicating on which TIDs the @@ -275,13 +272,13 @@ * unexpected aggregation related frames outside a session * @work: work struct for starting/stopping aggregation * @tid_tx: aggregation info for Tx per TID - * @tid_start_tx: sessions where start was requested + * @tid_start_tx: sessions where start was requested, not just protected + * by wiphy mutex but also sta->lock * @last_addba_req_time: timestamp of the last addBA request. * @addba_req_num: number of times addBA request has been sent. * @dialog_token_allocator: dialog token enumerator for each new session; */ struct sta_ampdu_mlme { - struct mutex mtx; /* rx */ struct tid_ampdu_rx __rcu *tid_rx[IEEE80211_NUM_TIDS]; u8 tid_rx_token[IEEE80211_NUM_TIDS]; @@ -291,7 +288,7 @@ unsigned long agg_session_valid[BITS_TO_LONGS(IEEE80211_NUM_TIDS)]; unsigned long unexpected_agg[BITS_TO_LONGS(IEEE80211_NUM_TIDS)]; /* tx */ - struct work_struct work; + struct wiphy_work work; struct tid_ampdu_tx __rcu *tid_tx[IEEE80211_NUM_TIDS]; struct tid_ampdu_tx *tid_start_tx[IEEE80211_NUM_TIDS]; unsigned long last_addba_req_time[IEEE80211_NUM_TIDS]; @@ -618,8 +615,6 @@ * @sta: station information we share with the driver * @sta_state: duplicates information about station state (for debug) * @rcu_head: RCU head used for freeing this station struct - * @cur_max_bandwidth: maximum bandwidth to use for TX to the station, - * taken from HT/VHT capabilities or VHT operating mode notification * @cparams: CoDel parameters for this station. * @reserved_tid: reserved TID (if any, otherwise IEEE80211_TID_UNRESERVED) * @amsdu_mesh_control: track the mesh A-MSDU format used by the peer: @@ -702,6 +697,8 @@ struct airtime_info airtime[IEEE80211_NUM_ACS]; u16 airtime_weight; + u32 tp_override; + /* * Aggregation information, locked with lock. */ @@ -796,13 +793,10 @@ void ieee80211_assign_tid_tx(struct sta_info *sta, int tid, struct tid_ampdu_tx *tid_tx); -static inline struct tid_ampdu_tx * -rcu_dereference_protected_tid_tx(struct sta_info *sta, int tid) -{ - return rcu_dereference_protected(sta->ampdu_mlme.tid_tx[tid], - lockdep_is_held(&sta->lock) || - lockdep_is_held(&sta->ampdu_mlme.mtx)); -} +#define rcu_dereference_protected_tid_tx(sta, tid) \ + rcu_dereference_protected((sta)->ampdu_mlme.tid_tx[tid], \ + lockdep_is_held(&(sta)->lock) || \ + lockdep_is_held(&(sta)->local->hw.wiphy->mtx)); /* Maximum number of frames to buffer per power saving station per AC */ #define STA_MAX_TX_BUFFER 64 @@ -827,7 +821,7 @@ struct sta_info *sta_info_get_bss(struct ieee80211_sub_if_data *sdata, const u8 *addr); -/* user must hold sta_mtx or be in RCU critical section */ +/* user must hold wiphy mutex or be in RCU critical section */ struct sta_info *sta_info_get_by_addrs(struct ieee80211_local *local, const u8 *sta_addr, const u8 *vif_addr); diff -ruw linux-6.4/net/mac80211/status.c linux-6.4-fbx/net/mac80211/status.c --- linux-6.4/net/mac80211/status.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/status.c 2024-04-22 13:40:53.027943608 +0200 @@ -5,7 +5,7 @@ * Copyright 2006-2007 Jiri Benc * Copyright 2008-2010 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH - * Copyright 2021-2022 Intel Corporation + * Copyright 2021-2023 Intel Corporation */ #include @@ -17,6 +17,7 @@ #include "mesh.h" #include "led.h" #include "wme.h" +#include "fbx_scum.h" void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw, @@ -184,8 +185,6 @@ static void ieee80211_frame_acked(struct sta_info *sta, struct sk_buff *skb) { struct ieee80211_mgmt *mgmt = (void *) skb->data; - struct ieee80211_local *local = sta->local; - struct ieee80211_sub_if_data *sdata = sta->sdata; if (ieee80211_is_data_qos(mgmt->frame_control)) { struct ieee80211_hdr *hdr = (void *) skb->data; @@ -194,39 +193,6 @@ ieee80211_check_pending_bar(sta, hdr->addr1, tid); } - - if (ieee80211_is_action(mgmt->frame_control) && - !ieee80211_has_protected(mgmt->frame_control) && - mgmt->u.action.category == WLAN_CATEGORY_HT && - mgmt->u.action.u.ht_smps.action == WLAN_HT_ACTION_SMPS && - ieee80211_sdata_running(sdata)) { - enum ieee80211_smps_mode smps_mode; - - switch (mgmt->u.action.u.ht_smps.smps_control) { - case WLAN_HT_SMPS_CONTROL_DYNAMIC: - smps_mode = IEEE80211_SMPS_DYNAMIC; - break; - case WLAN_HT_SMPS_CONTROL_STATIC: - smps_mode = IEEE80211_SMPS_STATIC; - break; - case WLAN_HT_SMPS_CONTROL_DISABLED: - default: /* shouldn't happen since we don't send that */ - smps_mode = IEEE80211_SMPS_OFF; - break; - } - - if (sdata->vif.type == NL80211_IFTYPE_STATION) { - /* - * This update looks racy, but isn't -- if we come - * here we've definitely got a station that we're - * talking to, and on a managed interface that can - * only be the AP. And the only other place updating - * this variable in managed mode is before association. - */ - sdata->deflink.smps_mode = smps_mode; - ieee80211_queue_work(&local->hw, &sdata->recalc_smps); - } - } } static void ieee80211_set_bar_pending(struct sta_info *sta, u8 tid, u16 ssn) @@ -291,7 +257,7 @@ static void ieee80211_add_tx_radiotap_header(struct ieee80211_local *local, struct sk_buff *skb, int retry_count, - int rtap_len, int shift, + int rtap_len, struct ieee80211_tx_status *status) { struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); @@ -342,7 +308,7 @@ if (legacy_rate) { rthdr->it_present |= cpu_to_le32(BIT(IEEE80211_RADIOTAP_RATE)); - *pos = DIV_ROUND_UP(legacy_rate, 5 * (1 << shift)); + *pos = DIV_ROUND_UP(legacy_rate, 5); /* padding for tx flags */ pos += 2; } @@ -633,7 +599,7 @@ unsigned long flags; spin_lock_irqsave(&local->ack_status_lock, flags); - skb = idr_remove(&local->ack_status_frames, info->ack_frame_id); + skb = idr_remove(&local->ack_status_frames, info->status_data); spin_unlock_irqrestore(&local->ack_status_lock, flags); if (!skb) @@ -695,6 +661,42 @@ } } +static void ieee80211_handle_smps_status(struct ieee80211_sub_if_data *sdata, + bool acked, u16 status_data) +{ + u16 sub_data = u16_get_bits(status_data, IEEE80211_STATUS_SUBDATA_MASK); + enum ieee80211_smps_mode smps_mode = sub_data & 3; + int link_id = (sub_data >> 2); + struct ieee80211_link_data *link; + + if (!sdata || !ieee80211_sdata_running(sdata)) + return; + + if (!acked) + return; + + if (sdata->vif.type != NL80211_IFTYPE_STATION) + return; + + if (WARN(link_id >= ARRAY_SIZE(sdata->link), + "bad SMPS status link: %d\n", link_id)) + return; + + link = rcu_dereference(sdata->link[link_id]); + if (!link) + return; + + /* + * This update looks racy, but isn't, the only other place + * updating this variable is in managed mode before assoc, + * and we have to be associated to have a status from the + * action frame TX, since we cannot send it while we're not + * associated yet. + */ + link->smps_mode = smps_mode; + wiphy_work_queue(sdata->local->hw.wiphy, &link->u.mgd.recalc_smps); +} + static void ieee80211_report_used_skb(struct ieee80211_local *local, struct sk_buff *skb, bool dropped, ktime_t ack_hwtstamp) @@ -730,12 +732,9 @@ if (!sdata) { skb->dev = NULL; } else if (!dropped) { - unsigned int hdr_size = - ieee80211_hdrlen(hdr->frame_control); - /* Check to see if packet is a TDLS teardown packet */ if (ieee80211_is_data(hdr->frame_control) && - (ieee80211_get_tdls_action(skb, hdr_size) == + (ieee80211_get_tdls_action(skb) == WLAN_TDLS_TEARDOWN)) { ieee80211_tdls_td_tx_handle(local, sdata, skb, info->flags); @@ -747,7 +746,7 @@ if (qskb) { skb_queue_tail(&sdata->status_queue, qskb); - ieee80211_queue_work(&local->hw, + wiphy_work_queue(local->hw.wiphy, &sdata->work); } } @@ -759,9 +758,24 @@ } rcu_read_unlock(); - } else if (info->ack_frame_id) { + } else if (info->status_data_idr) { ieee80211_report_ack_skb(local, skb, acked, dropped, ack_hwtstamp); + } else if (info->status_data) { + struct ieee80211_sub_if_data *sdata; + + rcu_read_lock(); + + sdata = ieee80211_sdata_from_skb(local, skb); + + switch (u16_get_bits(info->status_data, + IEEE80211_STATUS_TYPE_MASK)) { + case IEEE80211_STATUS_TYPE_SMPS: + ieee80211_handle_smps_status(sdata, acked, + info->status_data); + break; + } + rcu_read_unlock(); } if (!dropped && skb->destructor) { @@ -862,7 +876,7 @@ } void ieee80211_tx_monitor(struct ieee80211_local *local, struct sk_buff *skb, - int retry_count, int shift, bool send_to_cooked, + int retry_count, bool send_to_cooked, struct ieee80211_tx_status *status) { struct sk_buff *skb2; @@ -879,7 +893,7 @@ return; } ieee80211_add_tx_radiotap_header(local, skb, retry_count, - rtap_len, shift, status); + rtap_len, status); /* XXX: is this sufficient for BPF? */ skb_reset_mac_header(skb); @@ -894,6 +908,9 @@ if (!ieee80211_sdata_running(sdata)) continue; + if (fbx80211_skip_mon(sdata)) + continue; + if ((sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES) && !send_to_cooked) continue; @@ -932,14 +949,14 @@ bool acked; bool noack_success; struct ieee80211_bar *bar; - int shift = 0; int tid = IEEE80211_NUM_TIDS; + bool ack_requested; + ack_requested = !(info->flags & IEEE80211_TX_CTL_NO_ACK); fc = hdr->frame_control; - if (status->sta) { + if (status->sta && ack_requested) { sta = container_of(status->sta, struct sta_info, sta); - shift = ieee80211_vif_get_shift(&sta->sdata->vif); if (info->flags & IEEE80211_TX_STATUS_EOSP) clear_sta_flag(sta, WLAN_STA_SP); @@ -1077,7 +1094,7 @@ } /* send to monitor interfaces */ - ieee80211_tx_monitor(local, skb, retry_count, shift, + ieee80211_tx_monitor(local, skb, retry_count, send_to_cooked, status); } @@ -1102,6 +1119,30 @@ } EXPORT_SYMBOL(ieee80211_tx_status); +void ieee80211_tx_status_8023(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct sk_buff *skb) +{ + struct ieee80211_sub_if_data *sdata; + struct ieee80211_tx_status status = { + .skb = skb, + .info = IEEE80211_SKB_CB(skb), + }; + struct sta_info *sta; + + sdata = vif_to_sdata(vif); + + rcu_read_lock(); + + if (!ieee80211_lookup_ra_sta(sdata, skb, &sta) && !IS_ERR(sta)) + status.sta = &sta->sta; + + ieee80211_tx_status_ext(hw, &status); + + rcu_read_unlock(); +} +EXPORT_SYMBOL(ieee80211_tx_status_8023); + void ieee80211_tx_status_ext(struct ieee80211_hw *hw, struct ieee80211_tx_status *status) { @@ -1113,6 +1154,7 @@ int rates_idx, retry_count; bool acked, noack_success, ack_signal_valid; u16 tx_time_est; + bool ack_requested; if (pubsta) { sta = container_of(pubsta, struct sta_info, sta); @@ -1139,12 +1181,13 @@ rates_idx = ieee80211_tx_get_rates(hw, info, &retry_count); + ack_requested = !(info->flags & IEEE80211_TX_CTL_NO_ACK); acked = !!(info->flags & IEEE80211_TX_STAT_ACK); noack_success = !!(info->flags & IEEE80211_TX_STAT_NOACK_TRANSMITTED); ack_signal_valid = !!(info->status.flags & IEEE80211_TX_STATUS_ACK_SIGNAL_VALID); - if (pubsta) { + if (pubsta && ack_requested) { struct ieee80211_sub_if_data *sdata = sta->sdata; if (!acked && !noack_success) diff -ruw linux-6.4/net/mac80211/tdls.c linux-6.4-fbx/net/mac80211/tdls.c --- linux-6.4/net/mac80211/tdls.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/tdls.c 2024-04-22 13:40:53.027943608 +0200 @@ -6,7 +6,7 @@ * Copyright 2014, Intel Corporation * Copyright 2014 Intel Mobile Communications GmbH * Copyright 2015 - 2016 Intel Deutschland GmbH - * Copyright (C) 2019, 2021-2022 Intel Corporation + * Copyright (C) 2019, 2021-2023 Intel Corporation */ #include @@ -21,7 +21,7 @@ /* give usermode some time for retries in setting up the TDLS session */ #define TDLS_PEER_SETUP_TIMEOUT (15 * HZ) -void ieee80211_tdls_peer_del_work(struct work_struct *wk) +void ieee80211_tdls_peer_del_work(struct wiphy *wiphy, struct wiphy_work *wk) { struct ieee80211_sub_if_data *sdata; struct ieee80211_local *local; @@ -30,18 +30,19 @@ u.mgd.tdls_peer_del_work.work); local = sdata->local; - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); + if (!is_zero_ether_addr(sdata->u.mgd.tdls_peer)) { tdls_dbg(sdata, "TDLS del peer %pM\n", sdata->u.mgd.tdls_peer); sta_info_destroy_addr(sdata, sdata->u.mgd.tdls_peer); eth_zero_addr(sdata->u.mgd.tdls_peer); } - mutex_unlock(&local->mtx); } -static void ieee80211_tdls_add_ext_capab(struct ieee80211_sub_if_data *sdata, +static void ieee80211_tdls_add_ext_capab(struct ieee80211_link_data *link, struct sk_buff *skb) { + struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; bool chan_switch = local->hw.wiphy->features & @@ -50,7 +51,7 @@ !ifmgd->tdls_wider_bw_prohibited; bool buffer_sta = ieee80211_hw_check(&local->hw, SUPPORTS_TDLS_BUFFER_STA); - struct ieee80211_supported_band *sband = ieee80211_get_sband(sdata); + struct ieee80211_supported_band *sband = ieee80211_get_link_sband(link); bool vht = sband && sband->vht_cap.vht_supported; u8 *pos = skb_put(skb, 10); @@ -152,13 +153,13 @@ *pos = 2 * subband_cnt; } -static void ieee80211_tdls_add_oper_classes(struct ieee80211_sub_if_data *sdata, +static void ieee80211_tdls_add_oper_classes(struct ieee80211_link_data *link, struct sk_buff *skb) { u8 *pos; u8 op_class; - if (!ieee80211_chandef_to_operating_class(&sdata->vif.bss_conf.chandef, + if (!ieee80211_chandef_to_operating_class(&link->conf->chandef, &op_class)) return; @@ -180,7 +181,7 @@ *pos++ = WLAN_BSS_COEX_INFORMATION_REQUEST; } -static u16 ieee80211_get_tdls_sta_capab(struct ieee80211_sub_if_data *sdata, +static u16 ieee80211_get_tdls_sta_capab(struct ieee80211_link_data *link, u16 status_code) { struct ieee80211_supported_band *sband; @@ -189,7 +190,8 @@ if (status_code != 0) return 0; - sband = ieee80211_get_sband(sdata); + sband = ieee80211_get_link_sband(link); + if (sband && sband->band == NL80211_BAND_2GHZ) { return WLAN_CAPABILITY_SHORT_SLOT_TIME | WLAN_CAPABILITY_SHORT_PREAMBLE; @@ -198,10 +200,11 @@ return 0; } -static void ieee80211_tdls_add_link_ie(struct ieee80211_sub_if_data *sdata, +static void ieee80211_tdls_add_link_ie(struct ieee80211_link_data *link, struct sk_buff *skb, const u8 *peer, bool initiator) { + struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_tdls_lnkie *lnkid; const u8 *init_addr, *rsp_addr; @@ -218,7 +221,7 @@ lnkid->ie_type = WLAN_EID_LINK_ID; lnkid->ie_len = sizeof(struct ieee80211_tdls_lnkie) - 2; - memcpy(lnkid->bssid, sdata->deflink.u.mgd.bssid, ETH_ALEN); + memcpy(lnkid->bssid, link->u.mgd.bssid, ETH_ALEN); memcpy(lnkid->init_sta, init_addr, ETH_ALEN); memcpy(lnkid->resp_sta, rsp_addr, ETH_ALEN); } @@ -306,7 +309,7 @@ struct sta_info *sta) { /* IEEE802.11ac-2013 Table E-4 */ - u16 centers_80mhz[] = { 5210, 5290, 5530, 5610, 5690, 5775 }; + static const u16 centers_80mhz[] = { 5210, 5290, 5530, 5610, 5690, 5775 }; struct cfg80211_chan_def uc = sta->tdls_chandef; enum nl80211_chan_width max_width = ieee80211_sta_cap_chan_bw(&sta->deflink); @@ -359,21 +362,24 @@ } static void -ieee80211_tdls_add_setup_start_ies(struct ieee80211_sub_if_data *sdata, +ieee80211_tdls_add_setup_start_ies(struct ieee80211_link_data *link, struct sk_buff *skb, const u8 *peer, u8 action_code, bool initiator, const u8 *extra_ies, size_t extra_ies_len) { + struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_supported_band *sband; struct ieee80211_local *local = sdata->local; struct ieee80211_sta_ht_cap ht_cap; struct ieee80211_sta_vht_cap vht_cap; + const struct ieee80211_sta_he_cap *he_cap; + const struct ieee80211_sta_eht_cap *eht_cap; struct sta_info *sta = NULL; size_t offset = 0, noffset; u8 *pos; - sband = ieee80211_get_sband(sdata); - if (!sband) + sband = ieee80211_get_link_sband(link); + if (WARN_ON_ONCE(!sband)) return; ieee80211_add_srates_ie(sdata, skb, false, sband->band); @@ -397,7 +403,7 @@ offset = noffset; } - ieee80211_tdls_add_ext_capab(sdata, skb); + ieee80211_tdls_add_ext_capab(link, skb); /* add the QoS element if we support it */ if (local->hw.queues >= IEEE80211_NUM_ACS && @@ -426,20 +432,16 @@ offset = noffset; } - mutex_lock(&local->sta_mtx); - /* we should have the peer STA if we're already responding */ if (action_code == WLAN_TDLS_SETUP_RESPONSE) { sta = sta_info_get(sdata, peer); - if (WARN_ON_ONCE(!sta)) { - mutex_unlock(&local->sta_mtx); + if (WARN_ON_ONCE(!sta)) return; - } - sta->tdls_chandef = sdata->vif.bss_conf.chandef; + sta->tdls_chandef = link->conf->chandef; } - ieee80211_tdls_add_oper_classes(sdata, skb); + ieee80211_tdls_add_oper_classes(link, skb); /* * with TDLS we can switch channels, and HT-caps are not necessarily @@ -472,7 +474,7 @@ (ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40)) ieee80211_tdls_add_bss_coex_ie(skb); - ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator); + ieee80211_tdls_add_link_ie(link, skb, peer, initiator); /* add any custom IEs that go before VHT capabilities */ if (extra_ies_len) { @@ -497,17 +499,21 @@ offset = noffset; } - /* build the VHT-cap similarly to the HT-cap */ + /* add AID if VHT, HE or EHT capabilities supported */ memcpy(&vht_cap, &sband->vht_cap, sizeof(vht_cap)); + he_cap = ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); + eht_cap = ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif); + if ((vht_cap.vht_supported || he_cap || eht_cap) && + (action_code == WLAN_TDLS_SETUP_REQUEST || + action_code == WLAN_TDLS_SETUP_RESPONSE)) + ieee80211_tdls_add_aid(sdata, skb); + + /* build the VHT-cap similarly to the HT-cap */ if ((action_code == WLAN_TDLS_SETUP_REQUEST || action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) && vht_cap.vht_supported) { ieee80211_apply_vhtcap_overrides(sdata, &vht_cap); - /* the AID is present only when VHT is implemented */ - if (action_code == WLAN_TDLS_SETUP_REQUEST) - ieee80211_tdls_add_aid(sdata, skb); - pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2); ieee80211_ie_build_vht_cap(pos, &vht_cap, vht_cap.cap); } else if (action_code == WLAN_TDLS_SETUP_RESPONSE && @@ -515,9 +521,6 @@ /* the peer caps are already intersected with our own */ memcpy(&vht_cap, &sta->sta.deflink.vht_cap, sizeof(vht_cap)); - /* the AID is present only when VHT is implemented */ - ieee80211_tdls_add_aid(sdata, skb); - pos = skb_put(skb, sizeof(struct ieee80211_vht_cap) + 2); ieee80211_ie_build_vht_cap(pos, &vht_cap, vht_cap.cap); @@ -529,7 +532,80 @@ ieee80211_tdls_chandef_vht_upgrade(sdata, sta); } - mutex_unlock(&local->sta_mtx); + /* add any custom IEs that go before HE capabilities */ + if (extra_ies_len) { + static const u8 before_he_cap[] = { + WLAN_EID_EXTENSION, + WLAN_EID_EXT_FILS_REQ_PARAMS, + WLAN_EID_AP_CSN, + }; + noffset = ieee80211_ie_split(extra_ies, extra_ies_len, + before_he_cap, + ARRAY_SIZE(before_he_cap), + offset); + skb_put_data(skb, extra_ies + offset, noffset - offset); + offset = noffset; + } + + /* build the HE-cap from sband */ + if (he_cap && + (action_code == WLAN_TDLS_SETUP_REQUEST || + action_code == WLAN_TDLS_SETUP_RESPONSE || + action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES)) { + __le16 he_6ghz_capa; + u8 cap_size; + + cap_size = + 2 + 1 + sizeof(he_cap->he_cap_elem) + + ieee80211_he_mcs_nss_size(&he_cap->he_cap_elem) + + ieee80211_he_ppe_size(he_cap->ppe_thres[0], + he_cap->he_cap_elem.phy_cap_info); + pos = skb_put(skb, cap_size); + pos = ieee80211_ie_build_he_cap(0, pos, he_cap, pos + cap_size); + + /* Build HE 6Ghz capa IE from sband */ + if (sband->band == NL80211_BAND_6GHZ) { + cap_size = 2 + 1 + sizeof(struct ieee80211_he_6ghz_capa); + pos = skb_put(skb, cap_size); + he_6ghz_capa = + ieee80211_get_he_6ghz_capa_vif(sband, &sdata->vif); + pos = ieee80211_write_he_6ghz_cap(pos, he_6ghz_capa, + pos + cap_size); + } + } + + /* add any custom IEs that go before EHT capabilities */ + if (extra_ies_len) { + static const u8 before_he_cap[] = { + WLAN_EID_EXTENSION, + WLAN_EID_EXT_FILS_REQ_PARAMS, + WLAN_EID_AP_CSN, + }; + + noffset = ieee80211_ie_split(extra_ies, extra_ies_len, + before_he_cap, + ARRAY_SIZE(before_he_cap), + offset); + skb_put_data(skb, extra_ies + offset, noffset - offset); + offset = noffset; + } + + /* build the EHT-cap from sband */ + if (he_cap && eht_cap && + (action_code == WLAN_TDLS_SETUP_REQUEST || + action_code == WLAN_TDLS_SETUP_RESPONSE || + action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES)) { + u8 cap_size; + + cap_size = + 2 + 1 + sizeof(eht_cap->eht_cap_elem) + + ieee80211_eht_mcs_nss_size(&he_cap->he_cap_elem, + &eht_cap->eht_cap_elem, false) + + ieee80211_eht_ppe_size(eht_cap->eht_ppe_thres[0], + eht_cap->eht_cap_elem.phy_cap_info); + pos = skb_put(skb, cap_size); + ieee80211_ie_build_eht_cap(pos, he_cap, eht_cap, pos + cap_size, false); + } /* add any remaining IEs */ if (extra_ies_len) { @@ -540,31 +616,29 @@ } static void -ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_sub_if_data *sdata, +ieee80211_tdls_add_setup_cfm_ies(struct ieee80211_link_data *link, struct sk_buff *skb, const u8 *peer, bool initiator, const u8 *extra_ies, size_t extra_ies_len) { + struct ieee80211_sub_if_data *sdata = link->sdata; struct ieee80211_local *local = sdata->local; size_t offset = 0, noffset; struct sta_info *sta, *ap_sta; struct ieee80211_supported_band *sband; u8 *pos; - sband = ieee80211_get_sband(sdata); - if (!sband) + sband = ieee80211_get_link_sband(link); + if (WARN_ON_ONCE(!sband)) return; - mutex_lock(&local->sta_mtx); - sta = sta_info_get(sdata, peer); - ap_sta = sta_info_get(sdata, sdata->deflink.u.mgd.bssid); - if (WARN_ON_ONCE(!sta || !ap_sta)) { - mutex_unlock(&local->sta_mtx); + ap_sta = sta_info_get(sdata, sdata->vif.cfg.ap_addr); + + if (WARN_ON_ONCE(!sta || !ap_sta)) return; - } - sta->tdls_chandef = sdata->vif.bss_conf.chandef; + sta->tdls_chandef = link->conf->chandef; /* add any custom IEs that go before the QoS IE */ if (extra_ies_len) { @@ -610,11 +684,11 @@ pos = skb_put(skb, 2 + sizeof(struct ieee80211_ht_operation)); ieee80211_ie_build_ht_oper(pos, &sta->sta.deflink.ht_cap, - &sdata->vif.bss_conf.chandef, prot, + &link->conf->chandef, prot, true); } - ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator); + ieee80211_tdls_add_link_ie(link, skb, peer, initiator); /* only include VHT-operation if not on the 2.4GHz band */ if (sband->band != NL80211_BAND_2GHZ && @@ -631,8 +705,6 @@ &sta->tdls_chandef); } - mutex_unlock(&local->sta_mtx); - /* add any remaining IEs */ if (extra_ies_len) { noffset = extra_ies_len; @@ -641,7 +713,7 @@ } static void -ieee80211_tdls_add_chan_switch_req_ies(struct ieee80211_sub_if_data *sdata, +ieee80211_tdls_add_chan_switch_req_ies(struct ieee80211_link_data *link, struct sk_buff *skb, const u8 *peer, bool initiator, const u8 *extra_ies, size_t extra_ies_len, u8 oper_class, @@ -670,7 +742,7 @@ offset = noffset; } - ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator); + ieee80211_tdls_add_link_ie(link, skb, peer, initiator); /* add any remaining IEs */ if (extra_ies_len) { @@ -680,20 +752,20 @@ } static void -ieee80211_tdls_add_chan_switch_resp_ies(struct ieee80211_sub_if_data *sdata, +ieee80211_tdls_add_chan_switch_resp_ies(struct ieee80211_link_data *link, struct sk_buff *skb, const u8 *peer, u16 status_code, bool initiator, const u8 *extra_ies, size_t extra_ies_len) { if (status_code == 0) - ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator); + ieee80211_tdls_add_link_ie(link, skb, peer, initiator); if (extra_ies_len) skb_put_data(skb, extra_ies, extra_ies_len); } -static void ieee80211_tdls_add_ies(struct ieee80211_sub_if_data *sdata, +static void ieee80211_tdls_add_ies(struct ieee80211_link_data *link, struct sk_buff *skb, const u8 *peer, u8 action_code, u16 status_code, bool initiator, const u8 *extra_ies, @@ -705,7 +777,8 @@ case WLAN_TDLS_SETUP_RESPONSE: case WLAN_PUB_ACTION_TDLS_DISCOVER_RES: if (status_code == 0) - ieee80211_tdls_add_setup_start_ies(sdata, skb, peer, + ieee80211_tdls_add_setup_start_ies(link, + skb, peer, action_code, initiator, extra_ies, @@ -713,7 +786,7 @@ break; case WLAN_TDLS_SETUP_CONFIRM: if (status_code == 0) - ieee80211_tdls_add_setup_cfm_ies(sdata, skb, peer, + ieee80211_tdls_add_setup_cfm_ies(link, skb, peer, initiator, extra_ies, extra_ies_len); break; @@ -722,16 +795,17 @@ if (extra_ies_len) skb_put_data(skb, extra_ies, extra_ies_len); if (status_code == 0 || action_code == WLAN_TDLS_TEARDOWN) - ieee80211_tdls_add_link_ie(sdata, skb, peer, initiator); + ieee80211_tdls_add_link_ie(link, skb, + peer, initiator); break; case WLAN_TDLS_CHANNEL_SWITCH_REQUEST: - ieee80211_tdls_add_chan_switch_req_ies(sdata, skb, peer, + ieee80211_tdls_add_chan_switch_req_ies(link, skb, peer, initiator, extra_ies, extra_ies_len, oper_class, chandef); break; case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE: - ieee80211_tdls_add_chan_switch_resp_ies(sdata, skb, peer, + ieee80211_tdls_add_chan_switch_resp_ies(link, skb, peer, status_code, initiator, extra_ies, extra_ies_len); @@ -742,6 +816,7 @@ static int ieee80211_prep_tdls_encap_data(struct wiphy *wiphy, struct net_device *dev, + struct ieee80211_link_data *link, const u8 *peer, u8 action_code, u8 dialog_token, u16 status_code, struct sk_buff *skb) { @@ -766,7 +841,7 @@ skb_put(skb, sizeof(tf->u.setup_req)); tf->u.setup_req.dialog_token = dialog_token; tf->u.setup_req.capability = - cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata, + cpu_to_le16(ieee80211_get_tdls_sta_capab(link, status_code)); break; case WLAN_TDLS_SETUP_RESPONSE: @@ -777,7 +852,7 @@ tf->u.setup_resp.status_code = cpu_to_le16(status_code); tf->u.setup_resp.dialog_token = dialog_token; tf->u.setup_resp.capability = - cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata, + cpu_to_le16(ieee80211_get_tdls_sta_capab(link, status_code)); break; case WLAN_TDLS_SETUP_CONFIRM: @@ -824,7 +899,8 @@ static int ieee80211_prep_tdls_direct(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, + const u8 *peer, struct ieee80211_link_data *link, + u8 action_code, u8 dialog_token, u16 status_code, struct sk_buff *skb) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); @@ -833,8 +909,7 @@ mgmt = skb_put_zero(skb, 24); memcpy(mgmt->da, peer, ETH_ALEN); memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN); - memcpy(mgmt->bssid, sdata->deflink.u.mgd.bssid, ETH_ALEN); - + memcpy(mgmt->bssid, link->u.mgd.bssid, ETH_ALEN); mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION); @@ -847,7 +922,7 @@ mgmt->u.action.u.tdls_discover_resp.dialog_token = dialog_token; mgmt->u.action.u.tdls_discover_resp.capability = - cpu_to_le16(ieee80211_get_tdls_sta_capab(sdata, + cpu_to_le16(ieee80211_get_tdls_sta_capab(link, status_code)); break; default: @@ -859,15 +934,23 @@ static struct sk_buff * ieee80211_tdls_build_mgmt_packet_data(struct ieee80211_sub_if_data *sdata, - const u8 *peer, u8 action_code, - u8 dialog_token, u16 status_code, - bool initiator, const u8 *extra_ies, - size_t extra_ies_len, u8 oper_class, + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, + u16 status_code, bool initiator, + const u8 *extra_ies, size_t extra_ies_len, + u8 oper_class, struct cfg80211_chan_def *chandef) { struct ieee80211_local *local = sdata->local; struct sk_buff *skb; int ret; + struct ieee80211_link_data *link; + + link_id = link_id >= 0 ? link_id : 0; + rcu_read_lock(); + link = rcu_dereference(sdata->link[link_id]); + if (WARN_ON(!link)) + goto unlock; skb = netdev_alloc_skb(sdata->dev, local->hw.extra_tx_headroom + @@ -880,6 +963,13 @@ sizeof(struct ieee80211_ht_operation)) + 2 + max(sizeof(struct ieee80211_vht_cap), sizeof(struct ieee80211_vht_operation)) + + 2 + 1 + sizeof(struct ieee80211_he_cap_elem) + + sizeof(struct ieee80211_he_mcs_nss_supp) + + IEEE80211_HE_PPE_THRES_MAX_LEN + + 2 + 1 + sizeof(struct ieee80211_he_6ghz_capa) + + 2 + 1 + sizeof(struct ieee80211_eht_cap_elem) + + sizeof(struct ieee80211_eht_mcs_nss_supp) + + IEEE80211_EHT_PPE_THRES_MAX_LEN + 50 + /* supported channels */ 3 + /* 40/20 BSS coex */ 4 + /* AID */ @@ -887,7 +977,7 @@ extra_ies_len + sizeof(struct ieee80211_tdls_lnkie)); if (!skb) - return NULL; + goto unlock; skb_reserve(skb, local->hw.extra_tx_headroom); @@ -900,13 +990,13 @@ case WLAN_TDLS_CHANNEL_SWITCH_REQUEST: case WLAN_TDLS_CHANNEL_SWITCH_RESPONSE: ret = ieee80211_prep_tdls_encap_data(local->hw.wiphy, - sdata->dev, peer, + sdata->dev, link, peer, action_code, dialog_token, status_code, skb); break; case WLAN_PUB_ACTION_TDLS_DISCOVER_RES: ret = ieee80211_prep_tdls_direct(local->hw.wiphy, sdata->dev, - peer, action_code, + peer, link, action_code, dialog_token, status_code, skb); break; @@ -918,19 +1008,23 @@ if (ret < 0) goto fail; - ieee80211_tdls_add_ies(sdata, skb, peer, action_code, status_code, + ieee80211_tdls_add_ies(link, skb, peer, action_code, status_code, initiator, extra_ies, extra_ies_len, oper_class, chandef); + rcu_read_unlock(); return skb; fail: dev_kfree_skb(skb); +unlock: + rcu_read_unlock(); return NULL; } static int ieee80211_tdls_prep_mgmt_packet(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, u16 status_code, u32 peer_capability, bool initiator, const u8 *extra_ies, size_t extra_ies_len, u8 oper_class, @@ -988,7 +1082,8 @@ if (ret < 0) goto fail; - skb = ieee80211_tdls_build_mgmt_packet_data(sdata, peer, action_code, + skb = ieee80211_tdls_build_mgmt_packet_data(sdata, peer, + link_id, action_code, dialog_token, status_code, initiator, extra_ies, extra_ies_len, oper_class, @@ -999,7 +1094,7 @@ } if (action_code == WLAN_PUB_ACTION_TDLS_DISCOVER_RES) { - ieee80211_tx_skb(sdata, skb); + ieee80211_tx_skb_tid(sdata, skb, 7, link_id); return 0; } @@ -1066,7 +1161,8 @@ static int ieee80211_tdls_mgmt_setup(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, u16 status_code, u32 peer_capability, bool initiator, const u8 *extra_ies, size_t extra_ies_len) { @@ -1084,7 +1180,7 @@ return -ENOTSUPP; } - mutex_lock(&local->mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* we don't support concurrent TDLS peer setups */ if (!is_zero_ether_addr(sdata->u.mgd.tdls_peer) && @@ -1112,34 +1208,32 @@ ieee80211_flush_queues(local, sdata, false); memcpy(sdata->u.mgd.tdls_peer, peer, ETH_ALEN); - mutex_unlock(&local->mtx); /* we cannot take the mutex while preparing the setup packet */ - ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, action_code, + ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, + link_id, action_code, dialog_token, status_code, peer_capability, initiator, extra_ies, extra_ies_len, 0, NULL); if (ret < 0) { - mutex_lock(&local->mtx); eth_zero_addr(sdata->u.mgd.tdls_peer); - mutex_unlock(&local->mtx); return ret; } - ieee80211_queue_delayed_work(&sdata->local->hw, + wiphy_delayed_work_queue(sdata->local->hw.wiphy, &sdata->u.mgd.tdls_peer_del_work, TDLS_PEER_SETUP_TIMEOUT); return 0; out_unlock: - mutex_unlock(&local->mtx); return ret; } static int ieee80211_tdls_mgmt_teardown(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, u16 status_code, u32 peer_capability, bool initiator, const u8 *extra_ies, size_t extra_ies_len) @@ -1159,7 +1253,8 @@ IEEE80211_QUEUE_STOP_REASON_TDLS_TEARDOWN); ieee80211_flush_queues(local, sdata, false); - ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, action_code, + ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, + link_id, action_code, dialog_token, status_code, peer_capability, initiator, extra_ies, extra_ies_len, 0, @@ -1185,10 +1280,10 @@ } int ieee80211_tdls_mgmt(struct wiphy *wiphy, struct net_device *dev, - const u8 *peer, u8 action_code, u8 dialog_token, - u16 status_code, u32 peer_capability, - bool initiator, const u8 *extra_ies, - size_t extra_ies_len) + const u8 *peer, int link_id, + u8 action_code, u8 dialog_token, u16 status_code, + u32 peer_capability, bool initiator, + const u8 *extra_ies, size_t extra_ies_len) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); int ret; @@ -1204,13 +1299,14 @@ switch (action_code) { case WLAN_TDLS_SETUP_REQUEST: case WLAN_TDLS_SETUP_RESPONSE: - ret = ieee80211_tdls_mgmt_setup(wiphy, dev, peer, action_code, + ret = ieee80211_tdls_mgmt_setup(wiphy, dev, peer, + link_id, action_code, dialog_token, status_code, peer_capability, initiator, extra_ies, extra_ies_len); break; case WLAN_TDLS_TEARDOWN: - ret = ieee80211_tdls_mgmt_teardown(wiphy, dev, peer, + ret = ieee80211_tdls_mgmt_teardown(wiphy, dev, peer, link_id, action_code, dialog_token, status_code, peer_capability, initiator, @@ -1222,13 +1318,13 @@ * response frame. It is transmitted directly and not buffered * by the AP. */ - drv_mgd_protect_tdls_discover(sdata->local, sdata); + drv_mgd_protect_tdls_discover(sdata->local, sdata, link_id); fallthrough; case WLAN_TDLS_SETUP_CONFIRM: case WLAN_PUB_ACTION_TDLS_DISCOVER_RES: /* no special handling */ ret = ieee80211_tdls_prep_mgmt_packet(wiphy, dev, peer, - action_code, + link_id, action_code, dialog_token, status_code, peer_capability, @@ -1240,8 +1336,8 @@ break; } - tdls_dbg(sdata, "TDLS mgmt action %d peer %pM status %d\n", - action_code, peer, ret); + tdls_dbg(sdata, "TDLS mgmt action %d peer %pM link_id %d status %d\n", + action_code, peer, link_id, ret); return ret; } @@ -1254,9 +1350,10 @@ enum nl80211_chan_width width; struct ieee80211_supported_band *sband; - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + conf = rcu_dereference_protected(sdata->vif.bss_conf.chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (conf) { width = conf->def.width; sband = local->hw.wiphy->bands[conf->def.chan->band]; @@ -1284,7 +1381,6 @@ } } - mutex_unlock(&local->chanctx_mtx); } static int iee80211_tdls_have_ht_peers(struct ieee80211_sub_if_data *sdata) @@ -1347,6 +1443,8 @@ struct ieee80211_local *local = sdata->local; int ret; + lockdep_assert_wiphy(local->hw.wiphy); + if (!(wiphy->flags & WIPHY_FLAG_SUPPORTS_TDLS)) return -ENOTSUPP; @@ -1367,35 +1465,26 @@ /* protect possible bss_conf changes and avoid concurrency in * ieee80211_bss_info_change_notify() */ - sdata_lock(sdata); - mutex_lock(&local->mtx); tdls_dbg(sdata, "TDLS oper %d peer %pM\n", oper, peer); switch (oper) { case NL80211_TDLS_ENABLE_LINK: if (sdata->vif.bss_conf.csa_active) { tdls_dbg(sdata, "TDLS: disallow link during CSA\n"); - ret = -EBUSY; - break; + return -EBUSY; } - mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, peer); - if (!sta) { - mutex_unlock(&local->sta_mtx); - ret = -ENOLINK; - break; - } + if (!sta) + return -ENOLINK; iee80211_tdls_recalc_chanctx(sdata, sta); iee80211_tdls_recalc_ht_protection(sdata, sta); set_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH); - mutex_unlock(&local->sta_mtx); WARN_ON_ONCE(is_zero_ether_addr(sdata->u.mgd.tdls_peer) || !ether_addr_equal(sdata->u.mgd.tdls_peer, peer)); - ret = 0; break; case NL80211_TDLS_DISABLE_LINK: /* @@ -1414,29 +1503,26 @@ ret = sta_info_destroy_addr(sdata, peer); - mutex_lock(&local->sta_mtx); iee80211_tdls_recalc_ht_protection(sdata, NULL); - mutex_unlock(&local->sta_mtx); iee80211_tdls_recalc_chanctx(sdata, NULL); + if (ret) + return ret; break; default: - ret = -ENOTSUPP; - break; + return -ENOTSUPP; } - if (ret == 0 && ether_addr_equal(sdata->u.mgd.tdls_peer, peer)) { - cancel_delayed_work(&sdata->u.mgd.tdls_peer_del_work); + if (ether_addr_equal(sdata->u.mgd.tdls_peer, peer)) { + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &sdata->u.mgd.tdls_peer_del_work); eth_zero_addr(sdata->u.mgd.tdls_peer); } - if (ret == 0) - ieee80211_queue_work(&sdata->local->hw, + wiphy_work_queue(sdata->local->hw.wiphy, &sdata->deflink.u.mgd.request_smps_work); - mutex_unlock(&local->mtx); - sdata_unlock(sdata); - return ret; + return 0; } void ieee80211_tdls_oper_request(struct ieee80211_vif *vif, const u8 *peer, @@ -1497,6 +1583,7 @@ int extra_ies_len = 2 + sizeof(struct ieee80211_ch_switch_timing); u8 *pos = extra_ies; struct sk_buff *skb; + int link_id = sta->sta.valid_links ? ffs(sta->sta.valid_links) - 1 : 0; /* * if chandef points to a wide channel add a Secondary-Channel @@ -1524,6 +1611,7 @@ iee80211_tdls_add_ch_switch_timing(pos, 0, 0); skb = ieee80211_tdls_build_mgmt_packet_data(sdata, sta->sta.addr, + link_id, WLAN_TDLS_CHANNEL_SWITCH_REQUEST, 0, 0, !sta->sta.tdls_initiator, extra_ies, extra_ies_len, @@ -1567,11 +1655,12 @@ u32 ch_sw_tm_ie; int ret; + lockdep_assert_wiphy(local->hw.wiphy); + if (chandef->chan->freq_offset) /* this may work, but is untested */ return -EOPNOTSUPP; - mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, addr); if (!sta) { tdls_dbg(sdata, @@ -1601,7 +1690,6 @@ set_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL); out: - mutex_unlock(&local->sta_mtx); dev_kfree_skb_any(skb); return ret; } @@ -1615,26 +1703,24 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta; - mutex_lock(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + sta = sta_info_get(sdata, addr); if (!sta) { tdls_dbg(sdata, "Invalid TDLS peer %pM for channel switch cancel\n", addr); - goto out; + return; } if (!test_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL)) { tdls_dbg(sdata, "TDLS channel switch not initiated by %pM\n", addr); - goto out; + return; } drv_tdls_cancel_channel_switch(local, sdata, &sta->sta); clear_sta_flag(sta, WLAN_STA_TDLS_OFF_CHANNEL); - -out: - mutex_unlock(&local->sta_mtx); } static struct sk_buff * @@ -1644,11 +1730,13 @@ struct ieee80211_sub_if_data *sdata = sta->sdata; struct sk_buff *skb; u8 extra_ies[2 + sizeof(struct ieee80211_ch_switch_timing)]; + int link_id = sta->sta.valid_links ? ffs(sta->sta.valid_links) - 1 : 0; /* initial timing are always zero in the template */ iee80211_tdls_add_ch_switch_timing(extra_ies, 0, 0); skb = ieee80211_tdls_build_mgmt_packet_data(sdata, sta->sta.addr, + link_id, WLAN_TDLS_CHANNEL_SWITCH_RESPONSE, 0, 0, !sta->sta.tdls_initiator, extra_ies, sizeof(extra_ies), 0, NULL); @@ -1694,6 +1782,8 @@ struct ieee80211_tdls_ch_sw_params params = {}; int ret; + lockdep_assert_wiphy(local->hw.wiphy); + params.action_code = WLAN_TDLS_CHANNEL_SWITCH_RESPONSE; params.timestamp = rx_status->device_timestamp; @@ -1703,7 +1793,6 @@ return -EINVAL; } - mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, tf->sa); if (!sta || !test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH)) { tdls_dbg(sdata, "TDLS chan switch from non-peer sta %pM\n", @@ -1766,7 +1855,6 @@ tf->sa, params.status); out: - mutex_unlock(&local->sta_mtx); dev_kfree_skb_any(params.tmpl_skb); kfree(elems); return ret; @@ -1792,6 +1880,8 @@ struct ieee80211_tdls_ch_sw_params params = {}; int ret = 0; + lockdep_assert_wiphy(local->hw.wiphy); + params.action_code = WLAN_TDLS_CHANNEL_SWITCH_REQUEST; params.timestamp = rx_status->device_timestamp; @@ -1880,7 +1970,6 @@ goto free; } - mutex_lock(&local->sta_mtx); sta = sta_info_get(sdata, tf->sa); if (!sta || !test_sta_flag(sta, WLAN_STA_TDLS_PEER_AUTH)) { tdls_dbg(sdata, "TDLS chan switch from non-peer sta %pM\n", @@ -1927,7 +2016,6 @@ tf->sa, params.chandef->chan->center_freq, params.chandef->width); out: - mutex_unlock(&local->sta_mtx); dev_kfree_skb_any(params.tmpl_skb); free: kfree(elems); diff -ruw linux-6.4/net/mac80211/trace.h linux-6.4-fbx/net/mac80211/trace.h --- linux-6.4/net/mac80211/trace.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/trace.h 2024-04-22 13:40:53.027943608 +0200 @@ -2,7 +2,7 @@ /* * Portions of this file * Copyright(c) 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation */ #if !defined(__MAC80211_DRIVER_TRACE) || defined(TRACE_HEADER_MULTI_READ) @@ -17,7 +17,7 @@ #define MAXNAME 32 #define LOCAL_ENTRY __array(char, wiphy_name, 32) -#define LOCAL_ASSIGN strlcpy(__entry->wiphy_name, wiphy_name(local->hw.wiphy), MAXNAME) +#define LOCAL_ASSIGN strscpy(__entry->wiphy_name, wiphy_name(local->hw.wiphy), MAXNAME) #define LOCAL_PR_FMT "%s" #define LOCAL_PR_ARG __entry->wiphy_name @@ -634,6 +634,7 @@ LOCAL_ENTRY VIF_ENTRY STA_ENTRY + __field(u32, cmd) KEY_ENTRY ), @@ -641,12 +642,13 @@ LOCAL_ASSIGN; VIF_ASSIGN; STA_ASSIGN; + __entry->cmd = cmd; KEY_ASSIGN(key); ), TP_printk( - LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT KEY_PR_FMT, - LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, KEY_PR_ARG + LOCAL_PR_FMT VIF_PR_FMT STA_PR_FMT " cmd: %d" KEY_PR_FMT, + LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->cmd, KEY_PR_ARG ) ); @@ -2837,23 +2839,26 @@ ); TRACE_EVENT(api_chswitch_done, - TP_PROTO(struct ieee80211_sub_if_data *sdata, bool success), + TP_PROTO(struct ieee80211_sub_if_data *sdata, bool success, + unsigned int link_id), - TP_ARGS(sdata, success), + TP_ARGS(sdata, success, link_id), TP_STRUCT__entry( VIF_ENTRY __field(bool, success) + __field(unsigned int, link_id) ), TP_fast_assign( VIF_ASSIGN; __entry->success = success; + __entry->link_id = link_id; ), TP_printk( - VIF_PR_FMT " success=%d", - VIF_PR_ARG, __entry->success + VIF_PR_FMT " success=%d link_id=%d", + VIF_PR_ARG, __entry->success, __entry->link_id ) ); diff -ruw linux-6.4/net/mac80211/tx.c linux-6.4-fbx/net/mac80211/tx.c --- linux-6.4/net/mac80211/tx.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/tx.c 2024-04-22 13:40:53.031943718 +0200 @@ -26,6 +26,7 @@ #include #include #include +#include #include "ieee80211_i.h" #include "driver-ops.h" @@ -42,7 +43,7 @@ struct sk_buff *skb, int group_addr, int next_frag_len) { - int rate, mrate, erp, dur, i, shift = 0; + int rate, mrate, erp, dur, i; struct ieee80211_rate *txrate; struct ieee80211_local *local = tx->local; struct ieee80211_supported_band *sband; @@ -57,10 +58,8 @@ rcu_read_lock(); chanctx_conf = rcu_dereference(tx->sdata->vif.bss_conf.chanctx_conf); - if (chanctx_conf) { - shift = ieee80211_chandef_get_shift(&chanctx_conf->def); + if (chanctx_conf) rate_flags = ieee80211_chandef_rate_flags(&chanctx_conf->def); - } rcu_read_unlock(); /* uh huh? */ @@ -142,7 +141,7 @@ continue; if (tx->sdata->vif.bss_conf.basic_rates & BIT(i)) - rate = DIV_ROUND_UP(r->bitrate, 1 << shift); + rate = r->bitrate; switch (sband->band) { case NL80211_BAND_2GHZ: @@ -172,7 +171,7 @@ if (rate == -1) { /* No matching basic rate found; use highest suitable mandatory * PHY rate */ - rate = DIV_ROUND_UP(mrate, 1 << shift); + rate = mrate; } /* Don't calculate ACKs for QoS Frames with NoAck Policy set */ @@ -184,8 +183,7 @@ * (10 bytes + 4-byte FCS = 112 bits) plus SIFS; rounded up * to closest integer */ dur = ieee80211_frame_duration(sband->band, 10, rate, erp, - tx->sdata->vif.bss_conf.use_short_preamble, - shift); + tx->sdata->vif.bss_conf.use_short_preamble); if (next_frag_len) { /* Frame is fragmented: duration increases with time needed to @@ -194,8 +192,7 @@ /* next fragment */ dur += ieee80211_frame_duration(sband->band, next_frag_len, txrate->bitrate, erp, - tx->sdata->vif.bss_conf.use_short_preamble, - shift); + tx->sdata->vif.bss_conf.use_short_preamble); } return cpu_to_le16(dur); @@ -265,7 +262,7 @@ IEEE80211_QUEUE_STOP_REASON_PS, false); ifmgd->flags &= ~IEEE80211_STA_NULLFUNC_ACKED; - ieee80211_queue_work(&local->hw, + wiphy_work_queue(local->hw.wiphy, &local->dynamic_ps_disable_work); } @@ -581,25 +578,9 @@ { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)tx->skb->data; struct ieee80211_tx_info *info = IEEE80211_SKB_CB(tx->skb); - enum { - USE_NONE, - USE_MGMT_KEY, - USE_MCAST_KEY, - } which_key = USE_NONE; struct ieee80211_link_data *link; unsigned int link_id; - if (ieee80211_is_group_privacy_action(tx->skb)) - which_key = USE_MCAST_KEY; - else if (ieee80211_is_mgmt(hdr->frame_control) && - is_multicast_ether_addr(hdr->addr1) && - ieee80211_is_robust_mgmt_frame(tx->skb)) - which_key = USE_MGMT_KEY; - else if (is_multicast_ether_addr(hdr->addr1)) - which_key = USE_MCAST_KEY; - else - return NULL; - link_id = u32_get_bits(info->control.flags, IEEE80211_TX_CTRL_MLO_LINK); if (link_id == IEEE80211_LINK_UNSPECIFIED) { link = &tx->sdata->deflink; @@ -609,14 +590,14 @@ return NULL; } - switch (which_key) { - case USE_NONE: - break; - case USE_MGMT_KEY: + if (ieee80211_is_group_privacy_action(tx->skb)) + return rcu_dereference(link->default_multicast_key); + else if (ieee80211_is_mgmt(hdr->frame_control) && + is_multicast_ether_addr(hdr->addr1) && + ieee80211_is_robust_mgmt_frame(tx->skb)) return rcu_dereference(link->default_mgmt_key); - case USE_MCAST_KEY: + else if (is_multicast_ether_addr(hdr->addr1)) return rcu_dereference(link->default_multicast_key); - } return NULL; } @@ -680,7 +661,8 @@ } if (unlikely(tx->key && tx->key->flags & KEY_FLAG_TAINTED && - !ieee80211_is_deauth(hdr->frame_control))) + !ieee80211_is_deauth(hdr->frame_control)) && + tx->skb->protocol != tx->sdata->control_port_protocol) return TX_DROP; if (!skip_hw && tx->key && @@ -860,7 +842,7 @@ /* SNS11 from 802.11be 10.3.2.14 */ if (unlikely(is_multicast_ether_addr(hdr->addr1) && - info->control.vif->valid_links && + ieee80211_vif_is_mld(info->control.vif) && info->control.vif->type == NL80211_IFTYPE_AP)) { if (info->control.flags & IEEE80211_TX_CTRL_MCAST_MLO_FIRST_TX) tx->sdata->mld_mcast_seq += 0x10; @@ -1320,6 +1302,9 @@ (info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE)) return NULL; + if (unlikely(ieee80211_is_ctl(hdr->frame_control))) + return NULL; + if (!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && unlikely(!ieee80211_is_data_present(hdr->frame_control))) { if ((!ieee80211_is_mgmt(hdr->frame_control) || @@ -2181,6 +2166,11 @@ rate_found = true; break; + case IEEE80211_RADIOTAP_ANTENNA: + /* this can appear multiple times, keep a bitmap */ + info->control.antennas |= BIT(*iterator.this_arg); + break; + case IEEE80211_RADIOTAP_DATA_RETRIES: rate_retries = *iterator.this_arg; break; @@ -2275,8 +2265,17 @@ } if (rate_flags & IEEE80211_TX_RC_MCS) { + /* reset antennas if not enough */ + if (IEEE80211_HT_MCS_CHAINS(rate) > + hweight8(info->control.antennas)) + info->control.antennas = 0; + info->control.rates[0].idx = rate; } else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) { + /* reset antennas if not enough */ + if (vht_nss > hweight8(info->control.antennas)) + info->control.antennas = 0; + ieee80211_rate_set_vht(info->control.rates, vht_mcs, vht_nss); } else if (sband) { @@ -2626,7 +2625,7 @@ ethertype = (skb->data[12] << 8) | skb->data[13]; fc = cpu_to_le16(IEEE80211_FTYPE_DATA | IEEE80211_STYPE_DATA); - if (!sdata->vif.valid_links) + if (!ieee80211_vif_is_mld(&sdata->vif)) chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); @@ -2643,7 +2642,7 @@ authorized = test_sta_flag(sta, WLAN_STA_AUTHORIZED); wme_sta = sta->sta.wme; } - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { struct ieee80211_sub_if_data *ap_sdata; /* override chanctx_conf from AP (we don't have one) */ @@ -2661,7 +2660,7 @@ /* DA BSSID SA */ memcpy(hdr.addr1, skb->data, ETH_ALEN); - if (sdata->vif.valid_links && sta && !sta->sta.mlo) { + if (ieee80211_vif_is_mld(&sdata->vif) && sta && !sta->sta.mlo) { struct ieee80211_link_data *link; link_id = sta->deflink.link_id; @@ -2769,10 +2768,20 @@ tdls_peer = test_sta_flag(sta, WLAN_STA_TDLS_PEER); if (tdls_peer) { + /* For TDLS only one link can be valid with peer STA */ + int tdls_link_id = sta->sta.valid_links ? + __ffs(sta->sta.valid_links) : 0; + struct ieee80211_link_data *link; + /* DA SA BSSID */ memcpy(hdr.addr1, skb->data, ETH_ALEN); memcpy(hdr.addr2, skb->data + ETH_ALEN, ETH_ALEN); - memcpy(hdr.addr3, sdata->deflink.u.mgd.bssid, ETH_ALEN); + link = rcu_dereference(sdata->link[tdls_link_id]); + if (WARN_ON_ONCE(!link)) { + ret = -EINVAL; + goto free; + } + memcpy(hdr.addr3, link->u.mgd.bssid, ETH_ALEN); hdrlen = 24; } else if (sdata->u.mgd.use_4addr && cpu_to_be16(ethertype) != sdata->control_port_protocol) { @@ -2813,7 +2822,7 @@ } if (!chanctx_conf) { - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { ret = -ENOTCONN; goto free; } @@ -2860,7 +2869,8 @@ goto free; } - if (unlikely(!multicast && ((skb->sk && + if (unlikely(!multicast && + ((skb->sk && skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS))) info_id = ieee80211_store_ack_skb(local, skb, &info_flags, @@ -2946,7 +2956,10 @@ memset(info, 0, sizeof(*info)); info->flags = info_flags; - info->ack_frame_id = info_id; + if (info_id) { + info->status_data = info_id; + info->status_data_idr = 1; + } info->band = band; if (likely(!cookie)) { @@ -3055,7 +3068,7 @@ !ieee80211_hw_check(&local->hw, SUPPORTS_TX_FRAG)) goto out; - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { rcu_read_lock(); chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); @@ -3082,10 +3095,18 @@ break; case NL80211_IFTYPE_STATION: if (test_sta_flag(sta, WLAN_STA_TDLS_PEER)) { + /* For TDLS only one link can be valid with peer STA */ + int tdls_link_id = sta->sta.valid_links ? + __ffs(sta->sta.valid_links) : 0; + struct ieee80211_link_data *link; + /* DA SA BSSID */ build.da_offs = offsetof(struct ieee80211_hdr, addr1); build.sa_offs = offsetof(struct ieee80211_hdr, addr2); - memcpy(hdr->addr3, sdata->deflink.u.mgd.bssid, ETH_ALEN); + link = rcu_dereference(sdata->link[tdls_link_id]); + if (WARN_ON_ONCE(!link)) + break; + memcpy(hdr->addr3, link->u.mgd.bssid, ETH_ALEN); build.hdr_len = 24; break; } @@ -3126,7 +3147,7 @@ fc |= cpu_to_le16(IEEE80211_FCTL_FROMDS); /* DA BSSID SA */ build.da_offs = offsetof(struct ieee80211_hdr, addr1); - if (sta->sta.mlo || !sdata->vif.valid_links) { + if (sta->sta.mlo || !ieee80211_vif_is_mld(&sdata->vif)) { memcpy(hdr->addr2, sdata->vif.addr, ETH_ALEN); } else { unsigned int link_id = sta->deflink.link_id; @@ -4350,6 +4371,9 @@ return false; if (sdata->wdev.use_4addr) return false; + if (ieee80211_hw_check(&sdata->local->hw, + APVLAN_NEED_MCAST_TO_UCAST)) + break; fallthrough; case NL80211_IFTYPE_AP: /* check runtime toggle for this bss */ @@ -4471,6 +4495,8 @@ * @dev: incoming interface * * On failure skb will be freed. + * + * Returns: the netdev TX status (but really only %NETDEV_TX_OK) */ netdev_tx_t ieee80211_subif_start_xmit(struct sk_buff *skb, struct net_device *dev) @@ -4495,7 +4521,7 @@ __ieee80211_subif_start_xmit(skb, dev, 0, IEEE80211_TX_CTRL_MLO_LINK_UNSPEC, NULL); - } else if (sdata->vif.valid_links && + } else if (ieee80211_vif_is_mld(&sdata->vif) && sdata->vif.type == NL80211_IFTYPE_AP && !ieee80211_hw_check(&sdata->local->hw, MLO_MCAST_MULTI_LINK_TX)) { ieee80211_mlo_multicast_tx(dev, skb); @@ -4570,19 +4596,25 @@ static void ieee80211_8023_xmit(struct ieee80211_sub_if_data *sdata, struct net_device *dev, struct sta_info *sta, - struct ieee80211_key *key, struct sk_buff *skb) + struct ieee80211_key *key, struct sk_buff *skb, + u32 info_flags, u32 ctrl_flags, u64 *cookie) { struct ieee80211_tx_info *info; struct ieee80211_local *local = sdata->local; struct tid_ampdu_tx *tid_tx; struct sk_buff *seg, *next; + struct ethhdr *ehdr = (struct ethhdr *)skb->data; + unsigned char *ra = ehdr->h_dest; unsigned int skbs = 0, len = 0; u16 queue; + bool multicast; u8 tid; queue = ieee80211_select_queue(sdata, sta, skb); skb_set_queue_mapping(skb, queue); + multicast = is_multicast_ether_addr(ra); + if (unlikely(test_bit(SCAN_SW_SCANNING, &local->scanning)) && test_bit(SDATA_STATE_OFFCHANNEL, &sdata->state)) goto out_free; @@ -4615,6 +4647,7 @@ info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); + info->flags |= info_flags; info->hw_queue = sdata->vif.hw_queue[queue]; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) @@ -4634,10 +4667,14 @@ memcpy(IEEE80211_SKB_CB(seg), info, sizeof(*info)); } - if (unlikely(skb->sk && - skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) - info->ack_frame_id = ieee80211_store_ack_skb(local, skb, - &info->flags, NULL); + if (unlikely((skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || + ((ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && !multicast))) { + info->status_data = ieee80211_store_ack_skb(local, skb, + &info->flags, cookie); + if (info->status_data) + info->status_data_idr = 1; + } dev_sw_netstats_tx_add(dev, skbs, len); sta->deflink.tx_stats.packets[queue] += skbs; @@ -4653,13 +4690,87 @@ kfree_skb(skb); } -netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, - struct net_device *dev) +static +void ieee80211_8023_xmit_ap(struct ieee80211_sub_if_data *sdata, + struct net_device *dev, struct sta_info *sta, + struct ieee80211_key *key, struct sk_buff *skb, + u32 info_flags, u32 ctrl_flags, u64 *cookie) +{ + struct ieee80211_tx_info *info; + struct ieee80211_local *local = sdata->local; + struct ieee80211_sta *pubsta = NULL; + struct ieee80211_tx_control control = {}; + struct ethhdr *ehdr = (struct ethhdr *)skb->data; + unsigned char *ra = ehdr->h_dest; + bool multicast = is_multicast_ether_addr(ra); + unsigned long flags; + int q; + u16 q_map; + + /* + * If the skb is shared we need to obtain our own copy. + */ + skb = skb_share_check(skb, GFP_ATOMIC); + + if (unlikely(!skb)) + return; + + info = IEEE80211_SKB_CB(skb); + memset(info, 0, sizeof(*info)); + info->flags |= info_flags; + + if (unlikely((skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || + ((ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && !multicast))) { + info->status_data = ieee80211_store_ack_skb(local, skb, + &info->flags, cookie); + if (info->status_data) + info->status_data_idr = 1; + } + + info->flags |= IEEE80211_TX_CTL_HW_80211_ENCAP; + info->control.vif = &sdata->vif; + + if (key) + info->control.hw_key = &key->conf; + + q_map = skb_get_queue_mapping(skb); + q = sdata->vif.hw_queue[q_map]; + + if (sta) { + sta->deflink.tx_stats.bytes[q_map] += skb->len; + sta->deflink.tx_stats.packets[q_map]++; + } + + spin_lock_irqsave(&local->queue_stop_reason_lock, flags); + + if (local->queue_stop_reasons[q] || !skb_queue_empty(&local->pending[q])) { + skb_queue_tail(&local->pending[q], skb); + spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); + return; + } + + spin_unlock_irqrestore(&local->queue_stop_reason_lock, flags); + + if (sta && sta->uploaded) + pubsta = &sta->sta; + + control.sta = pubsta; + + drv_tx(local, &control, skb); +} + +static netdev_tx_t __ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev, + u32 info_flags, + u32 ctrl_flags, + u64 *cookie) { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); struct ethhdr *ehdr = (struct ethhdr *)skb->data; struct ieee80211_key *key; struct sta_info *sta; + bool is_eapol; if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { kfree_skb(skb); @@ -4672,10 +4783,11 @@ kfree_skb(skb); goto out; } + is_eapol = (sdata->control_port_protocol == ehdr->h_proto); if (unlikely(IS_ERR_OR_NULL(sta) || !sta->uploaded || - !test_sta_flag(sta, WLAN_STA_AUTHORIZED) || - sdata->control_port_protocol == ehdr->h_proto)) + (!test_sta_flag(sta, WLAN_STA_AUTHORIZED) && !is_eapol) || + (is_eapol && !(sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED)))) goto skip_offload; key = rcu_dereference(sta->ptk[sta->ptk_idx]); @@ -4687,7 +4799,14 @@ goto skip_offload; sk_pacing_shift_update(skb->sk, sdata->local->hw.tx_sk_pacing_shift); - ieee80211_8023_xmit(sdata, dev, sta, key, skb); + + if (sdata->vif.type == NL80211_IFTYPE_AP) { + ieee80211_8023_xmit_ap(sdata, dev, sta, key, skb, info_flags, ctrl_flags, cookie); + goto out; + } + + ieee80211_8023_xmit(sdata, dev, sta, key, skb, info_flags, + ctrl_flags, cookie); goto out; skip_offload: @@ -4698,6 +4817,60 @@ return NETDEV_TX_OK; } +netdev_tx_t ieee80211_subif_start_xmit_8023(struct sk_buff *skb, + struct net_device *dev) +{ +#if defined(CONFIG_IP_FFN) || defined(CONFIG_IPV6_FFN) + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); + struct ieee80211_tx_control control = {}; + struct sta_info *sta; + struct ieee80211_sta *pubsta = NULL; + + info->control.vif = &sdata->vif; + + if (skb->ffn_ff_done) { + info->control.flags = u32_encode_bits(IEEE80211_LINK_UNSPECIFIED, + IEEE80211_TX_CTRL_MLO_LINK); + info->flags = IEEE80211_TX_CTL_HW_80211_ENCAP; + + if (hweight16(sdata->vif.valid_links) > 1) { + rcu_read_lock(); + + if (ieee80211_lookup_ra_sta(sdata, skb, &sta)) { + kfree_skb(skb); + goto out; + } + + if (!IS_ERR_OR_NULL(sta) && sta->uploaded) + pubsta = &sta->sta; + + control.sta = pubsta; + drv_tx(sdata->local, &control, skb); +out: + rcu_read_unlock(); + } else { + control.sta = NULL; + + rcu_read_lock(); + if (!ieee80211_lookup_ra_sta(sdata, skb, &sta) && + !IS_ERR_OR_NULL(sta)) { + sta->deflink.tx_stats.packets[0]++; + sta->deflink.tx_stats.bytes[0] += skb->len; + } + rcu_read_unlock(); + dev_sw_netstats_tx_add(dev, 1, skb->len); + + drv_tx(sdata->local, &control, skb); + } + + return NETDEV_TX_OK; + } +#endif + + return __ieee80211_subif_start_xmit_8023(skb, dev, 0, 0, NULL); +} + struct sk_buff * ieee80211_build_data_template(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u32 info_flags) @@ -4771,7 +4944,7 @@ if (info->control.flags & IEEE80211_TX_INTCFL_NEED_TXPROCESSING) { /* update band only for non-MLD */ - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); if (unlikely(!chanctx_conf)) { @@ -5546,7 +5719,6 @@ IEEE80211_INCLUDE_ALL_MBSSID_ELEMS, NULL); struct sk_buff *copy; - int shift; if (!bcn) return bcn; @@ -5566,8 +5738,7 @@ if (!copy) return bcn; - shift = ieee80211_vif_get_shift(vif); - ieee80211_tx_monitor(hw_to_local(hw), copy, 1, shift, false, NULL); + ieee80211_tx_monitor(hw_to_local(hw), copy, 1, false, NULL); return bcn; } @@ -5917,7 +6088,7 @@ int ret; u32 queues; - lockdep_assert_held(&local->sta_mtx); + lockdep_assert_wiphy(local->hw.wiphy); /* only some cases are supported right now */ switch (sdata->vif.type) { @@ -5978,7 +6149,7 @@ struct sta_info *sta = container_of(pubsta, struct sta_info, sta); struct ieee80211_sub_if_data *sdata = sta->sdata; - lockdep_assert_held(&sdata->local->sta_mtx); + lockdep_assert_wiphy(sdata->local->hw.wiphy); /* only some cases are supported right now */ switch (sdata->vif.type) { @@ -6018,7 +6189,7 @@ BUILD_BUG_ON(!FIELD_FIT(IEEE80211_TX_CTRL_MLO_LINK, IEEE80211_LINK_UNSPECIFIED)); - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { link = 0; } else if (link_id >= 0) { link = link_id; @@ -6064,7 +6235,7 @@ enum nl80211_band band; rcu_read_lock(); - if (!sdata->vif.valid_links) { + if (!ieee80211_vif_is_mld(&sdata->vif)) { WARN_ON(link_id >= 0); chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); @@ -6099,6 +6270,9 @@ u32 flags = 0; int err; + /* mutex lock is only needed for incrementing the cookie counter */ + lockdep_assert_wiphy(local->hw.wiphy); + /* Only accept CONTROL_PORT_PROTOCOL configured in CONNECT/ASSOCIATE * or Pre-Authentication */ @@ -6189,15 +6363,15 @@ rcu_read_unlock(); start_xmit: - /* mutex lock is only needed for incrementing the cookie counter */ - mutex_lock(&local->mtx); - local_bh_disable(); - __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, cookie); + if (sdata->vif.offload_flags & IEEE80211_OFFLOAD_ENCAP_ENABLED) + __ieee80211_subif_start_xmit_8023(skb, skb->dev, flags, + ctrl_flags, cookie); + else + __ieee80211_subif_start_xmit(skb, skb->dev, flags, ctrl_flags, + cookie); local_bh_enable(); - mutex_unlock(&local->mtx); - return 0; } diff -ruw linux-6.4/net/mac80211/util.c linux-6.4-fbx/net/mac80211/util.c --- linux-6.4/net/mac80211/util.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/util.c 2024-04-22 13:40:53.031943718 +0200 @@ -6,7 +6,7 @@ * Copyright 2007 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * utilities for mac80211 */ @@ -24,6 +24,7 @@ #include #include #include +#include #include "ieee80211_i.h" #include "driver-ops.h" @@ -109,8 +110,7 @@ } int ieee80211_frame_duration(enum nl80211_band band, size_t len, - int rate, int erp, int short_preamble, - int shift) + int rate, int erp, int short_preamble) { int dur; @@ -121,9 +121,6 @@ * * rate is in 100 kbps, so divident is multiplied by 10 in the * DIV_ROUND_UP() operations. - * - * shift may be 2 for 5 MHz channels or 1 for 10 MHz channels, and - * is assumed to be 0 otherwise. */ if (band == NL80211_BAND_5GHZ || erp) { @@ -144,12 +141,6 @@ dur += 16; /* IEEE 802.11-2012 18.3.2.4: T_PREAMBLE = 16 usec */ dur += 4; /* IEEE 802.11-2012 18.3.2.4: T_SIGNAL = 4 usec */ - /* IEEE 802.11-2012 18.3.2.4: all values above are: - * * times 4 for 5 MHz - * * times 2 for 10 MHz - */ - dur *= 1 << shift; - /* rates should already consider the channel bandwidth, * don't apply divisor again. */ @@ -184,7 +175,7 @@ { struct ieee80211_sub_if_data *sdata; u16 dur; - int erp, shift = 0; + int erp; bool short_preamble = false; erp = 0; @@ -193,11 +184,10 @@ short_preamble = sdata->vif.bss_conf.use_short_preamble; if (sdata->deflink.operating_11g_mode) erp = rate->flags & IEEE80211_RATE_ERP_G; - shift = ieee80211_vif_get_shift(vif); } dur = ieee80211_frame_duration(band, frame_len, rate->bitrate, erp, - short_preamble, shift); + short_preamble); return cpu_to_le16(dur); } @@ -211,7 +201,7 @@ struct ieee80211_rate *rate; struct ieee80211_sub_if_data *sdata; bool short_preamble; - int erp, shift = 0, bitrate; + int erp, bitrate; u16 dur; struct ieee80211_supported_band *sband; @@ -227,20 +217,19 @@ short_preamble = sdata->vif.bss_conf.use_short_preamble; if (sdata->deflink.operating_11g_mode) erp = rate->flags & IEEE80211_RATE_ERP_G; - shift = ieee80211_vif_get_shift(vif); } - bitrate = DIV_ROUND_UP(rate->bitrate, 1 << shift); + bitrate = rate->bitrate; /* CTS duration */ dur = ieee80211_frame_duration(sband->band, 10, bitrate, - erp, short_preamble, shift); + erp, short_preamble); /* Data frame duration */ dur += ieee80211_frame_duration(sband->band, frame_len, bitrate, - erp, short_preamble, shift); + erp, short_preamble); /* ACK duration */ dur += ieee80211_frame_duration(sband->band, 10, bitrate, - erp, short_preamble, shift); + erp, short_preamble); return cpu_to_le16(dur); } @@ -255,7 +244,7 @@ struct ieee80211_rate *rate; struct ieee80211_sub_if_data *sdata; bool short_preamble; - int erp, shift = 0, bitrate; + int erp, bitrate; u16 dur; struct ieee80211_supported_band *sband; @@ -270,18 +259,17 @@ short_preamble = sdata->vif.bss_conf.use_short_preamble; if (sdata->deflink.operating_11g_mode) erp = rate->flags & IEEE80211_RATE_ERP_G; - shift = ieee80211_vif_get_shift(vif); } - bitrate = DIV_ROUND_UP(rate->bitrate, 1 << shift); + bitrate = rate->bitrate; /* Data frame duration */ dur = ieee80211_frame_duration(sband->band, frame_len, bitrate, - erp, short_preamble, shift); + erp, short_preamble); if (!(frame_txctl->flags & IEEE80211_TX_CTL_NO_ACK)) { /* ACK duration */ dur += ieee80211_frame_duration(sband->band, 10, bitrate, - erp, short_preamble, shift); + erp, short_preamble); } return cpu_to_le16(dur); @@ -705,6 +693,19 @@ IEEE80211_QUEUE_STOP_REASON_FLUSH, false); + if (drop) { + struct sta_info *sta; + + /* Purge the queues, so the frames on them won't be + * sent during __ieee80211_wake_queue() + */ + list_for_each_entry(sta, &local->sta_list, list) { + if (sdata != sta->sdata) + continue; + ieee80211_purge_sta_txqs(sta); + } + } + drv_flush(local, sdata, queues, drop); ieee80211_wake_queues_by_reason(&local->hw, queues, @@ -918,6 +919,7 @@ struct ieee80211_elems_parse_params *params) { const void *data = elem->data + 1; + bool calc_crc = false; u8 len; if (!elem->datalen) @@ -927,12 +929,9 @@ switch (elem->data[0]) { case WLAN_EID_EXT_HE_MU_EDCA: - if (len >= sizeof(*elems->mu_edca_param_set)) { + calc_crc = true; + if (len >= sizeof(*elems->mu_edca_param_set)) elems->mu_edca_param_set = data; - if (crc) - *crc = crc32_be(*crc, (void *)elem, - elem->datalen + 2); - } break; case WLAN_EID_EXT_HE_CAPABILITY: if (ieee80211_he_capa_size_ok(data, len)) { @@ -941,13 +940,10 @@ } break; case WLAN_EID_EXT_HE_OPERATION: + calc_crc = true; if (len >= sizeof(*elems->he_operation) && - len >= ieee80211_he_oper_size(data) - 1) { - if (crc) - *crc = crc32_be(*crc, (void *)elem, - elem->datalen + 2); + len >= ieee80211_he_oper_size(data) - 1) elems->he_operation = data; - } break; case WLAN_EID_EXT_UORA: if (len >= 1) @@ -981,14 +977,49 @@ case WLAN_EID_EXT_EHT_OPERATION: if (ieee80211_eht_oper_size_ok(data, len)) elems->eht_operation = data; + calc_crc = true; break; case WLAN_EID_EXT_EHT_MULTI_LINK: + calc_crc = true; + if (ieee80211_mle_size_ok(data, len)) { - elems->multi_link = (void *)data; - elems->multi_link_len = len; + const struct ieee80211_multi_link_elem *mle = + (void *)data; + + switch (le16_get_bits(mle->control, + IEEE80211_ML_CONTROL_TYPE)) { + case IEEE80211_ML_CONTROL_TYPE_BASIC: + elems->ml_basic_elem = (void *)elem; + elems->ml_basic = data; + elems->ml_basic_len = len; + break; + case IEEE80211_ML_CONTROL_TYPE_RECONF: + elems->ml_reconf_elem = (void *)elem; + elems->ml_reconf = data; + elems->ml_reconf_len = len; + break; + default: + break; + } + } + break; + case WLAN_EID_EXT_BANDWIDTH_INDICATION: + if (ieee80211_bandwidth_indication_size_ok(data, len)) + elems->bandwidth_indication = data; + calc_crc = true; + break; + case WLAN_EID_EXT_TID_TO_LINK_MAPPING: + calc_crc = true; + if (ieee80211_tid_to_link_map_size_ok(data, len) && + elems->ttlm_num < ARRAY_SIZE(elems->ttlm)) { + elems->ttlm[elems->ttlm_num] = (void *)data; + elems->ttlm_num++; } break; } + + if (crc && calc_crc) + *crc = crc32_be(*crc, (void *)elem, elem->datalen + 2); } static u32 @@ -1000,11 +1031,11 @@ bool calc_crc = params->filter != 0; DECLARE_BITMAP(seen_elems, 256); u32 crc = params->crc; - const u8 *ie; bitmap_zero(seen_elems, 256); for_each_element(elem, params->start, params->len) { + const struct element *subelem; bool elem_parse_failed; u8 id = elem->id; u8 elen = elem->datalen; @@ -1262,15 +1293,27 @@ } /* * This is a bit tricky, but as we only care about - * the wide bandwidth channel switch element, so - * just parse it out manually. + * a few elements, parse them out manually. */ - ie = cfg80211_find_ie(WLAN_EID_WIDE_BW_CHANNEL_SWITCH, + subelem = cfg80211_find_elem(WLAN_EID_WIDE_BW_CHANNEL_SWITCH, pos, elen); - if (ie) { - if (ie[1] >= sizeof(*elems->wide_bw_chansw_ie)) + if (subelem) { + if (subelem->datalen >= sizeof(*elems->wide_bw_chansw_ie)) elems->wide_bw_chansw_ie = - (void *)(ie + 2); + (void *)subelem->data; + else + elem_parse_failed = true; + } + + subelem = cfg80211_find_ext_elem(WLAN_EID_EXT_BANDWIDTH_INDICATION, + pos, elen); + if (subelem) { + const void *edata = subelem->data + 1; + u8 edatalen = subelem->datalen - 1; + + if (ieee80211_bandwidth_indication_size_ok(edata, + edatalen)) + elems->bandwidth_indication = edata; else elem_parse_failed = true; } @@ -1458,56 +1501,11 @@ return found ? profile_len : 0; } -static void ieee80211_defragment_element(struct ieee802_11_elems *elems, - void **elem_ptr, size_t *len, - size_t total_len, u8 frag_id) -{ - u8 *data = *elem_ptr, *pos, *start; - const struct element *elem; - - /* - * Since 'data' points to the data of the element, not the element - * itself, allow 254 in case it was an extended element where the - * extended ID isn't part of the data we see here and thus not part of - * 'len' either. - */ - if (!data || (*len != 254 && *len != 255)) - return; - - start = elems->scratch_pos; - - if (WARN_ON(*len > (elems->scratch + elems->scratch_len - - elems->scratch_pos))) - return; - - memcpy(elems->scratch_pos, data, *len); - elems->scratch_pos += *len; - - pos = data + *len; - total_len -= *len; - for_each_element(elem, pos, total_len) { - if (elem->id != frag_id) - break; - - if (WARN_ON(elem->datalen > - (elems->scratch + elems->scratch_len - - elems->scratch_pos))) - return; - - memcpy(elems->scratch_pos, elem->data, elem->datalen); - elems->scratch_pos += elem->datalen; - - *len += elem->datalen; - } - - *elem_ptr = start; -} - static void ieee80211_mle_get_sta_prof(struct ieee802_11_elems *elems, u8 link_id) { - const struct ieee80211_multi_link_elem *ml = elems->multi_link; - size_t ml_len = elems->multi_link_len; + const struct ieee80211_multi_link_elem *ml = elems->ml_basic; + ssize_t ml_len = elems->ml_basic_len; const struct element *sub; if (!ml || !ml_len) @@ -1519,12 +1517,14 @@ for_each_mle_subelement(sub, (u8 *)ml, ml_len) { struct ieee80211_mle_per_sta_profile *prof = (void *)sub->data; + ssize_t sta_prof_len; u16 control; if (sub->id != IEEE80211_MLE_SUBELEM_PER_STA_PROFILE) continue; - if (!ieee80211_mle_sta_prof_size_ok(sub->data, sub->datalen)) + if (!ieee80211_mle_basic_sta_prof_size_ok(sub->data, + sub->datalen)) return; control = le16_to_cpu(prof->control); @@ -1536,14 +1536,23 @@ if (!(control & IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE)) return; - elems->prof = prof; - elems->sta_prof_len = sub->datalen; - /* the sub element can be fragmented */ - ieee80211_defragment_element(elems, (void **)&elems->prof, - &elems->sta_prof_len, - ml_len - (sub->data - (u8 *)ml), + sta_prof_len = + cfg80211_defragment_element(sub, + (u8 *)ml, ml_len, + elems->scratch_pos, + elems->scratch + + elems->scratch_len - + elems->scratch_pos, IEEE80211_MLE_SUBELEM_FRAGMENT); + + if (sta_prof_len < 0) + return; + + elems->prof = (void *)elems->scratch_pos; + elems->sta_prof_len = sta_prof_len; + elems->scratch_pos += sta_prof_len; + return; } } @@ -1557,18 +1566,28 @@ .from_ap = params->from_ap, .link_id = -1, }; + ssize_t ml_len = elems->ml_basic_len; const struct element *non_inherit = NULL; const u8 *end; if (params->link_id == -1) return; - ieee80211_defragment_element(elems, (void **)&elems->multi_link, - &elems->multi_link_len, - elems->total_len - ((u8 *)elems->multi_link - - elems->ie_start), + ml_len = cfg80211_defragment_element(elems->ml_basic_elem, + elems->ie_start, + elems->total_len, + elems->scratch_pos, + elems->scratch + + elems->scratch_len - + elems->scratch_pos, WLAN_EID_FRAGMENT); + if (ml_len < 0) + return; + + elems->ml_basic = (const void *)elems->scratch_pos; + elems->ml_basic_len = ml_len; + ieee80211_mle_get_sta_prof(elems, params->link_id); prof = elems->prof; @@ -1604,9 +1623,9 @@ const struct element *non_inherit = NULL; u8 *nontransmitted_profile; int nontransmitted_profile_len = 0; - size_t scratch_len = params->scratch_len ?: 3 * params->len; + size_t scratch_len = 3 * params->len; - elems = kzalloc(sizeof(*elems) + scratch_len, GFP_ATOMIC); + elems = kzalloc(struct_size(elems, scratch, scratch_len), GFP_ATOMIC); if (!elems) return NULL; elems->ie_start = params->start; @@ -1661,6 +1680,7 @@ return elems; } +EXPORT_SYMBOL_IF_KUNIT(ieee802_11_parse_elems_full); void ieee80211_regulatory_limit_wmm_params(struct ieee80211_sub_if_data *sdata, struct ieee80211_tx_queue_params @@ -1824,7 +1844,7 @@ struct ieee80211_local *local = sdata->local; struct sk_buff *skb; struct ieee80211_mgmt *mgmt; - bool multi_link = sdata->vif.valid_links; + bool multi_link = ieee80211_vif_is_mld(&sdata->vif); struct { u8 id; u8 len; @@ -1918,7 +1938,7 @@ } } -static u8 *ieee80211_write_he_6ghz_cap(u8 *pos, __le16 cap, u8 *end) +u8 *ieee80211_write_he_6ghz_cap(u8 *pos, __le16 cap, u8 *end) { if ((end - pos) < 5) return pos; @@ -1949,7 +1969,6 @@ u8 rates[32]; int num_rates; int ext_rates_len; - int shift; u32 rate_flags; bool have_80mhz = false; @@ -1960,7 +1979,6 @@ return 0; rate_flags = ieee80211_chandef_rate_flags(chandef); - shift = ieee80211_chandef_get_shift(chandef); /* For direct scan add S1G IE and consider its override bits */ if (band == NL80211_BAND_S1GHZ) { @@ -1978,8 +1996,7 @@ continue; rates[num_rates++] = - (u8) DIV_ROUND_UP(sband->bitrates[i].bitrate, - (1 << shift) * 5); + (u8) DIV_ROUND_UP(sband->bitrates[i].bitrate, 5); } supp_rates_len = min_t(int, num_rates, 8); @@ -2121,8 +2138,7 @@ *offset = noffset; } - he_cap = ieee80211_get_he_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + he_cap = ieee80211_get_he_iftype_cap_vif(sband, &sdata->vif); if (he_cap && cfg80211_any_usable_channels(local->hw.wiphy, BIT(sband->band), IEEE80211_CHAN_NO_HE)) { @@ -2131,8 +2147,7 @@ goto out_err; } - eht_cap = ieee80211_get_eht_iftype_cap(sband, - ieee80211_vif_type_p2p(&sdata->vif)); + eht_cap = ieee80211_get_eht_iftype_cap_vif(sband, &sdata->vif); if (eht_cap && cfg80211_any_usable_channels(local->hw.wiphy, BIT(sband->band), @@ -2150,8 +2165,7 @@ struct ieee80211_supported_band *sband6; sband6 = local->hw.wiphy->bands[NL80211_BAND_6GHZ]; - he_cap = ieee80211_get_he_iftype_cap(sband6, - ieee80211_vif_type_p2p(&sdata->vif)); + he_cap = ieee80211_get_he_iftype_cap_vif(sband6, &sdata->vif); if (he_cap) { enum nl80211_iftype iftype = @@ -2275,14 +2289,13 @@ struct ieee80211_supported_band *sband; size_t num_rates; u32 supp_rates, rate_flags; - int i, j, shift; + int i, j; sband = sdata->local->hw.wiphy->bands[band]; if (WARN_ON(!sband)) return 1; rate_flags = ieee80211_chandef_rate_flags(&sdata->vif.bss_conf.chandef); - shift = ieee80211_vif_get_shift(&sdata->vif); num_rates = sband->n_bitrates; supp_rates = 0; @@ -2308,8 +2321,7 @@ != rate_flags) continue; - brate = DIV_ROUND_UP(sband->bitrates[j].bitrate, - 1 << shift); + brate = sband->bitrates[j].bitrate; if (brate == own_rate) { supp_rates |= BIT(j); @@ -2326,9 +2338,10 @@ ieee80211_led_radio(local, false); ieee80211_mod_tpt_led_trig(local, 0, IEEE80211_TPT_LEDTRIG_FL_RADIO); - cancel_work_sync(&local->reconfig_filter); + wiphy_work_cancel(local->hw.wiphy, &local->reconfig_filter); flush_workqueue(local->workqueue); + wiphy_work_flush(local->hw.wiphy, NULL); drv_stop(local); } @@ -2350,8 +2363,8 @@ */ if (aborted) set_bit(SCAN_ABORTED, &local->scanning); - ieee80211_queue_delayed_work(&local->hw, &local->scan_work, 0); - flush_delayed_work(&local->scan_work); + wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, 0); + wiphy_delayed_work_flush(local->hw.wiphy, &local->scan_work); } } @@ -2360,6 +2373,8 @@ struct ieee80211_sub_if_data *sdata; struct ieee80211_chanctx *ctx; + lockdep_assert_wiphy(local->hw.wiphy); + /* * We get here if during resume the device can't be restarted properly. * We might also get here if this happens during HW reset, which is a @@ -2373,6 +2388,7 @@ local->resuming = false; local->suspended = false; local->in_reconfig = false; + local->reconfig_failure = true; ieee80211_flush_completed_scan(local, true); @@ -2387,10 +2403,8 @@ /* Mark channel contexts as not being in the driver any more to avoid * removing them from the driver during the shutdown process... */ - mutex_lock(&local->chanctx_mtx); list_for_each_entry(ctx, &local->chanctx_list, list) ctx->driver_present = false; - mutex_unlock(&local->chanctx_mtx); } static void ieee80211_assign_chanctx(struct ieee80211_local *local, @@ -2400,17 +2414,17 @@ struct ieee80211_chanctx_conf *conf; struct ieee80211_chanctx *ctx; + lockdep_assert_wiphy(local->hw.wiphy); + if (!local->use_chanctx) return; - mutex_lock(&local->chanctx_mtx); conf = rcu_dereference_protected(link->conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (conf) { ctx = container_of(conf, struct ieee80211_chanctx, conf); drv_assign_vif_chanctx(local, sdata, link->conf, ctx); } - mutex_unlock(&local->chanctx_mtx); } static void ieee80211_reconfig_stations(struct ieee80211_sub_if_data *sdata) @@ -2418,8 +2432,9 @@ struct ieee80211_local *local = sdata->local; struct sta_info *sta; + lockdep_assert_wiphy(local->hw.wiphy); + /* add STAs back */ - mutex_lock(&local->sta_mtx); list_for_each_entry(sta, &local->sta_list, list) { enum ieee80211_sta_state state; @@ -2431,7 +2446,6 @@ WARN_ON(drv_sta_state(local, sta->sdata, sta, state, state + 1)); } - mutex_unlock(&local->sta_mtx); } static int ieee80211_reconfig_nan(struct ieee80211_sub_if_data *sdata) @@ -2475,6 +2489,35 @@ return 0; } +static void ieee80211_reconfig_ap_links(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + u64 changed) +{ + int link_id; + + for (link_id = 0; link_id < ARRAY_SIZE(sdata->link); link_id++) { + struct ieee80211_link_data *link; + + if (!(sdata->vif.active_links & BIT(link_id))) + continue; + + link = sdata_dereference(sdata->link[link_id], sdata); + if (!link) + continue; + + if (rcu_access_pointer(link->u.ap.beacon)) + drv_start_ap(local, sdata, link->conf); + + if (!link->conf->enable_beacon) + continue; + + changed |= BSS_CHANGED_BEACON | + BSS_CHANGED_BEACON_ENABLED; + + ieee80211_link_info_change_notify(sdata, link, changed); + } +} + int ieee80211_reconfig(struct ieee80211_local *local) { struct ieee80211_hw *hw = &local->hw; @@ -2489,6 +2532,8 @@ bool suspended = local->suspended; bool in_reconfig = false; + lockdep_assert_wiphy(local->hw.wiphy); + /* nothing to do if HW shouldn't run */ if (!local->open_count) goto wake_up; @@ -2604,12 +2649,10 @@ /* add channel contexts */ if (local->use_chanctx) { - mutex_lock(&local->chanctx_mtx); list_for_each_entry(ctx, &local->chanctx_list, list) if (ctx->replace_state != IEEE80211_CHANCTX_REPLACES_OTHER) WARN_ON(drv_add_chanctx(local, ctx)); - mutex_unlock(&local->chanctx_mtx); sdata = wiphy_dereference(local->hw.wiphy, local->monitor_sdata); @@ -2624,20 +2667,53 @@ /* Finally also reconfigure all the BSS information */ list_for_each_entry(sdata, &local->interfaces, list) { + /* common change flags for all interface types - link only */ + u64 changed = BSS_CHANGED_ERP_CTS_PROT | + BSS_CHANGED_ERP_PREAMBLE | + BSS_CHANGED_ERP_SLOT | + BSS_CHANGED_HT | + BSS_CHANGED_BASIC_RATES | + BSS_CHANGED_BEACON_INT | + BSS_CHANGED_BSSID | + BSS_CHANGED_CQM | + BSS_CHANGED_QOS | + BSS_CHANGED_TXPOWER | + BSS_CHANGED_MCAST_RATE; + struct ieee80211_link_data *link = NULL; unsigned int link_id; - u32 changed; + u32 active_links = 0; if (!ieee80211_sdata_running(sdata)) continue; - sdata_lock(sdata); + if (ieee80211_vif_is_mld(&sdata->vif)) { + struct ieee80211_bss_conf *old[IEEE80211_MLD_MAX_NUM_LINKS] = { + [0] = &sdata->vif.bss_conf, + }; + + if (sdata->vif.type == NL80211_IFTYPE_STATION) { + /* start with a single active link */ + active_links = sdata->vif.active_links; + link_id = ffs(active_links) - 1; + sdata->vif.active_links = BIT(link_id); + } + + drv_change_vif_links(local, sdata, 0, + sdata->vif.active_links, + old); + } + for (link_id = 0; link_id < ARRAY_SIZE(sdata->vif.link_conf); link_id++) { - struct ieee80211_link_data *link; + if (ieee80211_vif_is_mld(&sdata->vif) && + !(sdata->vif.active_links & BIT(link_id))) + continue; link = sdata_dereference(sdata->link[link_id], sdata); - if (link) + if (!link) + continue; + ieee80211_assign_chanctx(local, sdata, link); } @@ -2658,27 +2734,16 @@ &sdata->deflink.tx_conf[i]); break; } - sdata_unlock(sdata); - - /* common change flags for all interface types */ - changed = BSS_CHANGED_ERP_CTS_PROT | - BSS_CHANGED_ERP_PREAMBLE | - BSS_CHANGED_ERP_SLOT | - BSS_CHANGED_HT | - BSS_CHANGED_BASIC_RATES | - BSS_CHANGED_BEACON_INT | - BSS_CHANGED_BSSID | - BSS_CHANGED_CQM | - BSS_CHANGED_QOS | - BSS_CHANGED_IDLE | - BSS_CHANGED_TXPOWER | - BSS_CHANGED_MCAST_RATE; if (sdata->vif.bss_conf.mu_mimo_owner) changed |= BSS_CHANGED_MU_GROUPS; + if (!ieee80211_vif_is_mld(&sdata->vif)) + changed |= BSS_CHANGED_IDLE; + switch (sdata->vif.type) { case NL80211_IFTYPE_STATION: + if (!ieee80211_vif_is_mld(&sdata->vif)) { changed |= BSS_CHANGED_ASSOC | BSS_CHANGED_ARP_FILTER | BSS_CHANGED_PS; @@ -2691,9 +2756,20 @@ sdata->vif.bss_conf.protected_keep_alive) changed |= BSS_CHANGED_KEEP_ALIVE; - sdata_lock(sdata); - ieee80211_bss_info_change_notify(sdata, changed); - sdata_unlock(sdata); + if (sdata->vif.bss_conf.eht_puncturing) + changed |= BSS_CHANGED_EHT_PUNCTURING; + + ieee80211_bss_info_change_notify(sdata, + changed); + } else if (!WARN_ON(!link)) { + ieee80211_link_info_change_notify(sdata, link, + changed); + changed = BSS_CHANGED_ASSOC | + BSS_CHANGED_IDLE | + BSS_CHANGED_PS | + BSS_CHANGED_ARP_FILTER; + ieee80211_vif_cfg_change_notify(sdata, changed); + } break; case NL80211_IFTYPE_OCB: changed |= BSS_CHANGED_OCB; @@ -2703,7 +2779,13 @@ changed |= BSS_CHANGED_IBSS; fallthrough; case NL80211_IFTYPE_AP: - changed |= BSS_CHANGED_SSID | BSS_CHANGED_P2P_PS; + changed |= BSS_CHANGED_P2P_PS; + + if (ieee80211_vif_is_mld(&sdata->vif)) + ieee80211_vif_cfg_change_notify(sdata, + BSS_CHANGED_SSID); + else + changed |= BSS_CHANGED_SSID; if (sdata->vif.bss_conf.ftm_responder == 1 && wiphy_ext_feature_isset(sdata->local->hw.wiphy, @@ -2713,6 +2795,13 @@ if (sdata->vif.type == NL80211_IFTYPE_AP) { changed |= BSS_CHANGED_AP_PROBE_RESP; + if (ieee80211_vif_is_mld(&sdata->vif)) { + ieee80211_reconfig_ap_links(local, + sdata, + changed); + break; + } + if (rcu_access_pointer(sdata->deflink.u.ap.beacon)) drv_start_ap(local, sdata, sdata->deflink.conf); @@ -2745,6 +2834,9 @@ WARN_ON(1); break; } + + if (active_links) + ieee80211_set_active_links(&sdata->vif, active_links); } ieee80211_recalc_ps(local); @@ -2771,7 +2863,6 @@ if (!ieee80211_sdata_running(sdata)) continue; - sdata_lock(sdata); switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: case NL80211_IFTYPE_AP: @@ -2780,7 +2871,6 @@ default: break; } - sdata_unlock(sdata); } /* add back keys */ @@ -2788,11 +2878,10 @@ ieee80211_reenable_keys(sdata); /* Reconfigure sched scan if it was interrupted by FW restart */ - mutex_lock(&local->mtx); sched_scan_sdata = rcu_dereference_protected(local->sched_scan_sdata, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); sched_scan_req = rcu_dereference_protected(local->sched_scan_req, - lockdep_is_held(&local->mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); if (sched_scan_sdata && sched_scan_req) /* * Sched scan stopped, but we don't want to report it. Instead, @@ -2808,7 +2897,6 @@ RCU_INIT_POINTER(local->sched_scan_req, NULL); sched_scan_stopped = true; } - mutex_unlock(&local->mtx); if (sched_scan_stopped) cfg80211_sched_scan_stopped_locked(local->hw.wiphy, 0); @@ -2829,16 +2917,12 @@ * are active. This is really a workaround though. */ if (ieee80211_hw_check(hw, AMPDU_AGGREGATION)) { - mutex_lock(&local->sta_mtx); - list_for_each_entry(sta, &local->sta_list, list) { if (!local->resuming) ieee80211_sta_tear_down_BA_sessions( sta, AGG_STOP_LOCAL_REQUEST); clear_sta_flag(sta, WLAN_STA_BLOCK_BA); } - - mutex_unlock(&local->sta_mtx); } /* @@ -2854,13 +2938,11 @@ barrier(); /* Restart deferred ROCs */ - mutex_lock(&local->mtx); ieee80211_start_next_roc(local); - mutex_unlock(&local->mtx); /* Requeue all works */ list_for_each_entry(sdata, &local->interfaces, list) - ieee80211_queue_work(&local->hw, &sdata->work); + wiphy_work_queue(local->hw.wiphy, &sdata->work); } ieee80211_wake_queues_by_reason(hw, IEEE80211_MAX_QUEUE_MAP, @@ -2917,6 +2999,8 @@ sdata = vif_to_sdata(vif); local = sdata->local; + lockdep_assert_wiphy(local->hw.wiphy); + if (WARN_ON(flag & IEEE80211_SDATA_DISCONNECT_RESUME && !local->resuming)) return; @@ -2930,10 +3014,8 @@ sdata->flags |= flag; - mutex_lock(&local->key_mtx); list_for_each_entry(key, &sdata->key_list, list) key->flags |= KEY_FLAG_TAINTED; - mutex_unlock(&local->key_mtx); } void ieee80211_hw_restart_disconnect(struct ieee80211_vif *vif) @@ -2955,10 +3037,10 @@ struct ieee80211_chanctx_conf *chanctx_conf; struct ieee80211_chanctx *chanctx; - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); chanctx_conf = rcu_dereference_protected(link->conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); /* * This function can be called from a work, thus it may be possible @@ -2967,12 +3049,10 @@ * So nothing should be done in such case. */ if (!chanctx_conf) - goto unlock; + return; chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf); ieee80211_recalc_smps_chanctx(local, chanctx); - unlock: - mutex_unlock(&local->chanctx_mtx); } void ieee80211_recalc_min_chandef(struct ieee80211_sub_if_data *sdata, @@ -2983,7 +3063,7 @@ struct ieee80211_chanctx *chanctx; int i; - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); for (i = 0; i < ARRAY_SIZE(sdata->vif.link_conf); i++) { struct ieee80211_bss_conf *bss_conf; @@ -2999,9 +3079,9 @@ } chanctx_conf = rcu_dereference_protected(bss_conf->chanctx_conf, - lockdep_is_held(&local->chanctx_mtx)); + lockdep_is_held(&local->hw.wiphy->mtx)); /* - * Since we hold the chanctx_mtx (checked above) + * Since we hold the wiphy mutex (checked above) * we can take the chanctx_conf pointer out of the * RCU critical section, it cannot go away without * the mutex. Just the way we reached it could - in @@ -3011,14 +3091,12 @@ rcu_read_unlock(); if (!chanctx_conf) - goto unlock; + return; chanctx = container_of(chanctx_conf, struct ieee80211_chanctx, conf); ieee80211_recalc_chanctx_min_def(local, chanctx, NULL); } - unlock: - mutex_unlock(&local->chanctx_mtx); } size_t ieee80211_ie_split_vendor(const u8 *ies, size_t ielen, size_t offset) @@ -3706,12 +3784,10 @@ return true; } -void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation *eht_oper, +void ieee80211_chandef_eht_oper(const struct ieee80211_eht_operation_info *info, bool support_160, bool support_320, struct cfg80211_chan_def *chandef) { - struct ieee80211_eht_operation_info *info = (void *)eht_oper->optional; - chandef->center_freq1 = ieee80211_channel_to_frequency(info->ccfs0, chandef->chan->band); @@ -3801,10 +3877,8 @@ } eht_cap = ieee80211_get_eht_iftype_cap(sband, iftype); - if (!eht_cap) { - sdata_info(sdata, "Missing iftype sband data/EHT cap"); + if (!eht_cap) eht_oper = NULL; - } he_6ghz_oper = ieee80211_he_6ghz_oper(he_oper); @@ -3882,8 +3956,9 @@ support_320 = eht_phy_cap & IEEE80211_EHT_PHY_CAP0_320MHZ_IN_6GHZ; - ieee80211_chandef_eht_oper(eht_oper, support_160, - support_320, &he_chandef); + ieee80211_chandef_eht_oper((const void *)eht_oper->optional, + support_160, support_320, + &he_chandef); } if (!cfg80211_chandef_valid(&he_chandef)) { @@ -3942,7 +4017,6 @@ const u8 *srates, int srates_len, u32 *rates) { u32 rate_flags = ieee80211_chanwidth_rate_flags(width); - int shift = ieee80211_chanwidth_get_shift(width); struct ieee80211_rate *br; int brate, rate, i, j, count = 0; @@ -3956,7 +4030,7 @@ if ((rate_flags & br->flags) != rate_flags) continue; - brate = DIV_ROUND_UP(br->bitrate, (1 << shift) * 5); + brate = DIV_ROUND_UP(br->bitrate, 5); if (brate == rate) { *rates |= BIT(j); count++; @@ -3973,12 +4047,11 @@ { struct ieee80211_local *local = sdata->local; struct ieee80211_supported_band *sband; - int rate, shift; + int rate; u8 i, rates, *pos; u32 basic_rates = sdata->vif.bss_conf.basic_rates; u32 rate_flags; - shift = ieee80211_vif_get_shift(&sdata->vif); rate_flags = ieee80211_chandef_rate_flags(&sdata->vif.bss_conf.chandef); sband = local->hw.wiphy->bands[band]; rates = 0; @@ -4003,8 +4076,7 @@ if (need_basic && basic_rates & BIT(i)) basic = 0x80; - rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, - 5 * (1 << shift)); + rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, 5); *pos++ = basic | (u8) rate; } @@ -4017,13 +4089,12 @@ { struct ieee80211_local *local = sdata->local; struct ieee80211_supported_band *sband; - int rate, shift; + int rate; u8 i, exrates, *pos; u32 basic_rates = sdata->vif.bss_conf.basic_rates; u32 rate_flags; rate_flags = ieee80211_chandef_rate_flags(&sdata->vif.bss_conf.chandef); - shift = ieee80211_vif_get_shift(&sdata->vif); sband = local->hw.wiphy->bands[band]; exrates = 0; @@ -4052,8 +4123,7 @@ continue; if (need_basic && basic_rates & BIT(i)) basic = 0x80; - rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, - 5 * (1 << shift)); + rate = DIV_ROUND_UP(sband->bitrates[i].bitrate, 5); *pos++ = basic | (u8) rate; } } @@ -4097,6 +4167,8 @@ * This function calculates the RX timestamp at the given MPDU offset, taking * into account what the RX timestamp was. An offset of 0 will just normalize * the timestamp to TSF at beginning of MPDU reception. + * + * Returns: the calculated timestamp */ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local, struct ieee80211_rx_status *status, @@ -4212,25 +4284,13 @@ fallthrough; case RX_ENC_LEGACY: { struct ieee80211_supported_band *sband; - int shift = 0; - int bitrate; - - switch (status->bw) { - case RATE_INFO_BW_10: - shift = 1; - break; - case RATE_INFO_BW_5: - shift = 2; - break; - } sband = local->hw.wiphy->bands[status->band]; - bitrate = sband->bitrates[status->rate_idx].bitrate; - ri.legacy = DIV_ROUND_UP(bitrate, (1 << shift)); + ri.legacy = sband->bitrates[status->rate_idx].bitrate; if (status->flag & RX_FLAG_MACTIME_PLCP_START) { if (status->band == NL80211_BAND_5GHZ) { - ts += 20 << shift; + ts += 20; mpdu_offset += 2; } else if (status->enc_flags & RX_ENC_FLAG_SHORTPRE) { ts += 96; @@ -4263,16 +4323,15 @@ struct ieee80211_sub_if_data *sdata; struct cfg80211_chan_def chandef; - /* for interface list, to avoid linking iflist_mtx and chanctx_mtx */ lockdep_assert_wiphy(local->hw.wiphy); - mutex_lock(&local->mtx); list_for_each_entry(sdata, &local->interfaces, list) { /* it might be waiting for the local->mtx, but then * by the time it gets it, sdata->wdev.cac_started * will no longer be true */ - cancel_delayed_work(&sdata->deflink.dfs_cac_timer_work); + wiphy_delayed_work_cancel(local->hw.wiphy, + &sdata->deflink.dfs_cac_timer_work); if (sdata->wdev.cac_started) { chandef = sdata->vif.bss_conf.chandef; @@ -4283,10 +4342,10 @@ GFP_KERNEL); } } - mutex_unlock(&local->mtx); } -void ieee80211_dfs_radar_detected_work(struct work_struct *work) +void ieee80211_dfs_radar_detected_work(struct wiphy *wiphy, + struct wiphy_work *work) { struct ieee80211_local *local = container_of(work, struct ieee80211_local, radar_detected_work); @@ -4294,7 +4353,8 @@ struct ieee80211_chanctx *ctx; int num_chanctx = 0; - mutex_lock(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); + list_for_each_entry(ctx, &local->chanctx_list, list) { if (ctx->replace_state == IEEE80211_CHANCTX_REPLACES_OTHER) continue; @@ -4302,11 +4362,8 @@ num_chanctx++; chandef = ctx->conf.def; } - mutex_unlock(&local->chanctx_mtx); - wiphy_lock(local->hw.wiphy); ieee80211_dfs_cac_cancel(local); - wiphy_unlock(local->hw.wiphy); if (num_chanctx > 1) /* XXX: multi-channel is not supported yet */ @@ -4321,7 +4378,7 @@ trace_api_radar_detected(local); - schedule_work(&local->radar_detected_work); + wiphy_work_queue(hw->wiphy, &local->radar_detected_work); } EXPORT_SYMBOL(ieee80211_radar_detected); @@ -4699,13 +4756,39 @@ ps->dtim_count = dtim_count; } +void ieee80211_force_dtim(struct ieee80211_vif *vif, + unsigned int dtim_count) +{ + struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); + u8 dtim_period = sdata->vif.bss_conf.dtim_period; + struct ps_data *ps; + + if (sdata->vif.type == NL80211_IFTYPE_AP || + sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { + if (!sdata->bss) + return; + + ps = &sdata->bss->ps; + } else if (ieee80211_vif_is_mesh(&sdata->vif)) { + ps = &sdata->u.mesh.ps; + } else { + return; + } + + if (WARN_ON_ONCE(dtim_count >= dtim_period)) + return; + + ps->dtim_count = dtim_count; +} +EXPORT_SYMBOL(ieee80211_force_dtim); + static u8 ieee80211_chanctx_radar_detect(struct ieee80211_local *local, struct ieee80211_chanctx *ctx) { struct ieee80211_link_data *link; u8 radar_detect = 0; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED)) return 0; @@ -4746,7 +4829,7 @@ .radar_detect = radar_detect, }; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); if (WARN_ON(hweight32(radar_detect) > 1)) return -EINVAL; @@ -4836,7 +4919,7 @@ int err; struct iface_combination_params params = {0}; - lockdep_assert_held(&local->chanctx_mtx); + lockdep_assert_wiphy(local->hw.wiphy); list_for_each_entry(ctx, &local->chanctx_list, list) { if (ctx->replace_state == IEEE80211_CHANCTX_WILL_BE_REPLACED) @@ -5048,31 +5131,3 @@ return pos; } - -void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id) -{ - unsigned int elem_len; - - if (!len_pos) - return; - - elem_len = skb->data + skb->len - len_pos - 1; - - while (elem_len > 255) { - /* this one is 255 */ - *len_pos = 255; - /* remaining data gets smaller */ - elem_len -= 255; - /* make space for the fragment ID/len in SKB */ - skb_put(skb, 2); - /* shift back the remaining data to place fragment ID/len */ - memmove(len_pos + 255 + 3, len_pos + 255 + 1, elem_len); - /* place the fragment ID */ - len_pos += 255 + 1; - *len_pos = frag_id; - /* and point to fragment length to update later */ - len_pos++; - } - - *len_pos = elem_len; -} diff -ruw linux-6.4/net/mac80211/vht.c linux-6.4-fbx/net/mac80211/vht.c --- linux-6.4/net/mac80211/vht.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/vht.c 2024-04-22 13:40:53.031943718 +0200 @@ -4,7 +4,7 @@ * * Portions of this file * Copyright(c) 2015 - 2016 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation */ #include @@ -116,12 +116,14 @@ ieee80211_vht_cap_ie_to_sta_vht_cap(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const struct ieee80211_vht_cap *vht_cap_ie, + const struct ieee80211_vht_cap *vht_cap_ie2, struct link_sta_info *link_sta) { struct ieee80211_sta_vht_cap *vht_cap = &link_sta->pub->vht_cap; struct ieee80211_sta_vht_cap own_cap; u32 cap_info, i; bool have_80mhz; + u32 mpdu_len; memset(vht_cap, 0, sizeof(*vht_cap)); @@ -230,9 +232,11 @@ sizeof(struct ieee80211_vht_mcs_info)); /* copy EXT_NSS_BW Support value or remove the capability */ - if (ieee80211_hw_check(&sdata->local->hw, SUPPORTS_VHT_EXT_NSS_BW)) + if (ieee80211_hw_check(&sdata->local->hw, SUPPORTS_VHT_EXT_NSS_BW)) { + vht_cap->cap |= cap_info & + IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK; vht_cap->cap |= (cap_info & IEEE80211_VHT_CAP_EXT_NSS_BW_MASK); - else + } else vht_cap->vht_mcs.tx_highest &= ~cpu_to_le16(IEEE80211_VHT_EXT_NSS_BW_CAPABLE); @@ -316,12 +320,23 @@ } link_sta->pub->bandwidth = ieee80211_sta_cur_vht_bw(link_sta); + link_sta->pub->sta_max_bandwidth = link_sta->cur_max_bandwidth; + + /* + * Work around the Cisco 9115 FW 17.3 bug by taking the min of + * both reported MPDU lengths. + */ + mpdu_len = vht_cap->cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK; + if (vht_cap_ie2) + mpdu_len = min_t(u32, mpdu_len, + le32_get_bits(vht_cap_ie2->vht_cap_info, + IEEE80211_VHT_CAP_MAX_MPDU_MASK)); /* * FIXME - should the amsdu len be per link? store per link * and maintain a minimum? */ - switch (vht_cap->cap & IEEE80211_VHT_CAP_MAX_MPDU_MASK) { + switch (mpdu_len) { case IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_11454: link_sta->pub->agg.max_amsdu_len = IEEE80211_MAX_MPDU_LEN_VHT_11454; break; @@ -678,6 +693,7 @@ break; } + link_sta->pub->sta_max_bandwidth = link_sta->cur_max_bandwidth; new_bw = ieee80211_sta_cur_vht_bw(link_sta); if (new_bw != link_sta->pub->bandwidth) { link_sta->pub->bandwidth = new_bw; diff -ruw linux-6.4/net/mac80211/wep.c linux-6.4-fbx/net/mac80211/wep.c --- linux-6.4/net/mac80211/wep.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/wep.c 2024-04-22 13:40:53.031943718 +0200 @@ -3,6 +3,7 @@ * Software WEP encryption implementation * Copyright 2002, Jouni Malinen * Copyright 2003, Instant802 Networks, Inc. + * Copyright (C) 2023 Intel Corporation */ #include @@ -250,18 +251,18 @@ if (!(status->flag & RX_FLAG_DECRYPTED)) { if (skb_linearize(rx->skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; if (ieee80211_wep_decrypt(rx->local, rx->skb, rx->key)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_WEP_DEC_FAIL; } else if (!(status->flag & RX_FLAG_IV_STRIPPED)) { if (!pskb_may_pull(rx->skb, ieee80211_hdrlen(fc) + IEEE80211_WEP_IV_LEN)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_NO_IV; ieee80211_wep_remove_iv(rx->local, rx->skb, rx->key); /* remove ICV */ if (!(status->flag & RX_FLAG_ICV_STRIPPED) && pskb_trim(rx->skb, rx->skb->len - IEEE80211_WEP_ICV_LEN)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_NO_ICV; } return RX_CONTINUE; diff -ruw linux-6.4/net/mac80211/wpa.c linux-6.4-fbx/net/mac80211/wpa.c --- linux-6.4/net/mac80211/wpa.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/mac80211/wpa.c 2024-04-22 13:40:53.031943718 +0200 @@ -3,7 +3,7 @@ * Copyright 2002-2004, Instant802 Networks, Inc. * Copyright 2008, Jouni Malinen * Copyright (C) 2016-2017 Intel Deutschland GmbH - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation */ #include @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include "ieee80211_i.h" #include "michael.h" @@ -142,7 +142,7 @@ * group keys and only the AP is sending real multicast * frames in the BSS. */ - return RX_DROP_UNUSABLE; + return RX_DROP_U_AP_RX_GROUPCAST; } if (status->flag & RX_FLAG_MMIC_ERROR) @@ -150,10 +150,10 @@ hdrlen = ieee80211_hdrlen(hdr->frame_control); if (skb->len < hdrlen + MICHAEL_MIC_LEN) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_MMIC; if (skb_linearize(rx->skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; hdr = (void *)skb->data; data = skb->data + hdrlen; @@ -188,7 +188,7 @@ NL80211_KEYTYPE_PAIRWISE, rx->key ? rx->key->conf.keyidx : -1, NULL, GFP_ATOMIC); - return RX_DROP_UNUSABLE; + return RX_DROP_U_MMIC_FAIL; } static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb) @@ -276,11 +276,11 @@ return RX_CONTINUE; if (!rx->sta || skb->len - hdrlen < 12) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_TKIP; /* it may be possible to optimize this a bit more */ if (skb_linearize(rx->skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; hdr = (void *)skb->data; /* @@ -298,7 +298,7 @@ &rx->tkip.iv32, &rx->tkip.iv16); if (res != TKIP_DECRYPT_OK) - return RX_DROP_UNUSABLE; + return RX_DROP_U_TKIP_FAIL; /* Trim ICV */ if (!(status->flag & RX_FLAG_ICV_STRIPPED)) @@ -523,12 +523,12 @@ if (status->flag & RX_FLAG_DECRYPTED) { if (!pskb_may_pull(rx->skb, hdrlen + IEEE80211_CCMP_HDR_LEN)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_CCMP; if (status->flag & RX_FLAG_MIC_STRIPPED) mic_len = 0; } else { if (skb_linearize(rx->skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; } /* reload hdr - skb might have been reallocated */ @@ -536,7 +536,7 @@ data_len = skb->len - hdrlen - IEEE80211_CCMP_HDR_LEN - mic_len; if (!rx->sta || data_len < 0) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_CCMP; if (!(status->flag & RX_FLAG_PN_VALIDATED)) { int res; @@ -574,7 +574,7 @@ /* Remove CCMP header and MIC */ if (pskb_trim(skb, skb->len - mic_len)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_CCMP_MIC; memmove(skb->data + IEEE80211_CCMP_HDR_LEN, skb->data, hdrlen); skb_pull(skb, IEEE80211_CCMP_HDR_LEN); @@ -719,12 +719,12 @@ if (status->flag & RX_FLAG_DECRYPTED) { if (!pskb_may_pull(rx->skb, hdrlen + IEEE80211_GCMP_HDR_LEN)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_GCMP; if (status->flag & RX_FLAG_MIC_STRIPPED) mic_len = 0; } else { if (skb_linearize(rx->skb)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; } /* reload hdr - skb might have been reallocated */ @@ -732,7 +732,7 @@ data_len = skb->len - hdrlen - IEEE80211_GCMP_HDR_LEN - mic_len; if (!rx->sta || data_len < 0) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_GCMP; if (!(status->flag & RX_FLAG_PN_VALIDATED)) { int res; @@ -771,7 +771,7 @@ /* Remove GCMP header and MIC */ if (pskb_trim(skb, skb->len - mic_len)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_GCMP_MIC; memmove(skb->data + IEEE80211_GCMP_HDR_LEN, skb->data, hdrlen); skb_pull(skb, IEEE80211_GCMP_HDR_LEN); @@ -924,7 +924,7 @@ /* management frames are already linear */ if (skb->len < 24 + sizeof(*mmie)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_CMAC; mmie = (struct ieee80211_mmie *) (skb->data + skb->len - sizeof(*mmie)); @@ -974,13 +974,13 @@ /* management frames are already linear */ if (skb->len < 24 + sizeof(*mmie)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_CMAC256; mmie = (struct ieee80211_mmie_16 *) (skb->data + skb->len - sizeof(*mmie)); if (mmie->element_id != WLAN_EID_MMIE || mmie->length != sizeof(*mmie) - 2) - return RX_DROP_UNUSABLE; /* Invalid MMIE */ + return RX_DROP_U_BAD_MMIE; /* Invalid MMIE */ bip_ipn_swap(ipn, mmie->sequence_number); @@ -1073,7 +1073,7 @@ /* management frames are already linear */ if (skb->len < 24 + sizeof(*mmie)) - return RX_DROP_UNUSABLE; + return RX_DROP_U_SHORT_GMAC; mmie = (struct ieee80211_mmie_16 *) (skb->data + skb->len - sizeof(*mmie)); @@ -1097,7 +1097,7 @@ mic = kmalloc(GMAC_MIC_LEN, GFP_ATOMIC); if (!mic) - return RX_DROP_UNUSABLE; + return RX_DROP_U_OOM; if (ieee80211_aes_gmac(key->u.aes_gmac.tfm, aad, nonce, skb->data + 24, skb->len - 24, mic) < 0 || diff -ruw linux-6.4/net/netfilter/Kconfig linux-6.4-fbx/net/netfilter/Kconfig --- linux-6.4/net/netfilter/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/Kconfig 2024-04-22 13:40:53.043944045 +0200 @@ -364,6 +364,7 @@ config NF_CONNTRACK_SIP tristate "SIP protocol support" default m if NETFILTER_ADVANCED=n + select CRYPTO_LIB_SHA256 help SIP is an application-layer control protocol that can establish, modify, and terminate multimedia sessions (conferences) such as diff -ruw linux-6.4/net/netfilter/nf_conntrack_core.c linux-6.4-fbx/net/netfilter/nf_conntrack_core.c --- linux-6.4/net/netfilter/nf_conntrack_core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_conntrack_core.c 2024-04-22 13:40:53.051944264 +0200 @@ -577,12 +577,29 @@ #endif } +#ifdef CONFIG_IP_FFN +extern void ip_ffn_ct_destroy(struct nf_conn *ct); +#endif + +#ifdef CONFIG_IPV6_FFN +extern void ipv6_ffn_ct_destroy(struct nf_conn *ct); +#endif + void nf_ct_destroy(struct nf_conntrack *nfct) { struct nf_conn *ct = (struct nf_conn *)nfct; WARN_ON(refcount_read(&nfct->use) != 0); +#ifdef CONFIG_IP_FFN + if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num == AF_INET) + ip_ffn_ct_destroy(ct); +#endif +#ifdef CONFIG_IPV6_FFN + if (ct->tuplehash[IP_CT_DIR_ORIGINAL].tuple.src.l3num == AF_INET6) + ipv6_ffn_ct_destroy(ct); +#endif + if (unlikely(nf_ct_is_template(ct))) { nf_ct_tmpl_free(ct); return; @@ -1784,7 +1801,7 @@ } spin_unlock_bh(&nf_conntrack_expect_lock); } - if (!exp && tmpl) + if (!exp) __nf_ct_try_assign_helper(ct, tmpl, GFP_ATOMIC); /* Other CPU might have obtained a pointer to this object before it was @@ -2063,6 +2080,10 @@ ct->tuplehash[IP_CT_DIR_REPLY].tuple = *newreply; if (ct->master || (help && !hlist_empty(&help->expectations))) return; + + rcu_read_lock(); + __nf_ct_try_assign_helper(ct, NULL, GFP_ATOMIC); + rcu_read_unlock(); } EXPORT_SYMBOL_GPL(nf_conntrack_alter_reply); @@ -2804,6 +2825,7 @@ nf_conntrack_acct_pernet_init(net); nf_conntrack_tstamp_pernet_init(net); nf_conntrack_ecache_pernet_init(net); + nf_conntrack_helper_pernet_init(net); nf_conntrack_proto_pernet_init(net); return 0; diff -ruw linux-6.4/net/netfilter/nf_conntrack_helper.c linux-6.4-fbx/net/netfilter/nf_conntrack_helper.c --- linux-6.4/net/netfilter/nf_conntrack_helper.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_conntrack_helper.c 2024-04-22 13:40:53.055944373 +0200 @@ -37,6 +37,11 @@ EXPORT_SYMBOL_GPL(nf_ct_helper_hsize); static unsigned int nf_ct_helper_count __read_mostly; +static bool nf_ct_auto_assign_helper __read_mostly = true; +module_param_named(nf_conntrack_helper, nf_ct_auto_assign_helper, bool, 0644); +MODULE_PARM_DESC(nf_conntrack_helper, + "Enable automatic conntrack helper assignment (default 0)"); + static DEFINE_MUTEX(nf_ct_nat_helpers_mutex); static struct list_head nf_ct_nat_helpers __read_mostly; @@ -48,6 +53,24 @@ (__force __u16)tuple->src.u.all) % nf_ct_helper_hsize; } +static struct nf_conntrack_helper * +__nf_ct_helper_find(const struct nf_conntrack_tuple *tuple) +{ + struct nf_conntrack_helper *helper; + struct nf_conntrack_tuple_mask mask = { .src.u.all = htons(0xFFFF) }; + unsigned int h; + + if (!nf_ct_helper_count) + return NULL; + + h = helper_hash(tuple); + hlist_for_each_entry_rcu(helper, &nf_ct_helper_hash[h], hnode) { + if (nf_ct_tuple_src_mask_cmp(tuple, &helper->tuple, &mask)) + return helper; + } + return NULL; +} + struct nf_conntrack_helper * __nf_conntrack_helper_find(const char *name, u16 l3num, u8 protonum) { @@ -188,11 +211,33 @@ } EXPORT_SYMBOL_GPL(nf_ct_helper_ext_add); +static struct nf_conntrack_helper * +nf_ct_lookup_helper(struct nf_conn *ct, struct net *net) +{ + struct nf_conntrack_net *cnet = nf_ct_pernet(net); + + if (!cnet->sysctl_auto_assign_helper) { + if (cnet->auto_assign_helper_warned) + return NULL; + if (!__nf_ct_helper_find(&ct->tuplehash[IP_CT_DIR_REPLY].tuple)) + return NULL; + pr_info("nf_conntrack: default automatic helper assignment " + "has been turned off for security reasons and CT-based " + "firewall rule not found. Use the iptables CT target " + "to attach helpers instead.\n"); + cnet->auto_assign_helper_warned = true; + return NULL; + } + + return __nf_ct_helper_find(&ct->tuplehash[IP_CT_DIR_REPLY].tuple); +} + int __nf_ct_try_assign_helper(struct nf_conn *ct, struct nf_conn *tmpl, gfp_t flags) { struct nf_conntrack_helper *helper = NULL; struct nf_conn_help *help; + struct net *net = nf_ct_net(ct); /* We already got a helper explicitly attached. The function * nf_conntrack_alter_reply - in case NAT is in use - asks for looking @@ -203,22 +248,24 @@ if (test_bit(IPS_HELPER_BIT, &ct->status)) return 0; - if (WARN_ON_ONCE(!tmpl)) - return 0; - + if (tmpl != NULL) { help = nfct_help(tmpl); if (help != NULL) { helper = rcu_dereference(help->helper); set_bit(IPS_HELPER_BIT, &ct->status); } + } help = nfct_help(ct); if (helper == NULL) { + helper = nf_ct_lookup_helper(ct, net); + if (helper == NULL) { if (help) RCU_INIT_POINTER(help->helper, NULL); return 0; } + } if (help == NULL) { help = nf_ct_helper_ext_add(ct, flags); @@ -500,6 +547,19 @@ } EXPORT_SYMBOL_GPL(nf_nat_helper_unregister); +void nf_ct_set_auto_assign_helper_warned(struct net *net) +{ + nf_ct_pernet(net)->auto_assign_helper_warned = true; +} +EXPORT_SYMBOL_GPL(nf_ct_set_auto_assign_helper_warned); + +void nf_conntrack_helper_pernet_init(struct net *net) +{ + struct nf_conntrack_net *cnet = nf_ct_pernet(net); + + cnet->sysctl_auto_assign_helper = nf_ct_auto_assign_helper; +} + int nf_conntrack_helper_init(void) { nf_ct_helper_hsize = 1; /* gets rounded up to use one page */ diff -ruw linux-6.4/net/netfilter/nf_conntrack_proto_tcp.c linux-6.4-fbx/net/netfilter/nf_conntrack_proto_tcp.c --- linux-6.4/net/netfilter/nf_conntrack_proto_tcp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_conntrack_proto_tcp.c 2024-04-22 13:40:53.055944373 +0200 @@ -1247,6 +1247,7 @@ break; } + if (!ct->proto.tcp.no_window_track) { res = tcp_in_window(ct, dir, index, skb, dataoff, th, state); switch (res) { @@ -1260,6 +1261,7 @@ case NFCT_TCP_ACCEPT: break; } + } in_window: /* From now on we have got in-window packets */ ct->proto.tcp.last_index = index; @@ -1333,6 +1335,38 @@ return NF_ACCEPT; } +#ifdef CONFIG_IP_FFN +int external_tcpv4_packet(struct nf_conn *ct, + struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo) +{ + /* fixme: is is always PRE_ROUTING ?*/ + struct nf_hook_state state = { + .hook = NF_INET_PRE_ROUTING, + .pf = AF_INET, + .net = nf_ct_net(ct), + }; + return nf_conntrack_tcp_packet(ct, skb, dataoff, ctinfo, &state); +} +#endif + +#ifdef CONFIG_IPV6_FFN +int external_tcpv6_packet(struct nf_conn *ct, + struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo) +{ + /* fixme: is is always PRE_ROUTING ?*/ + struct nf_hook_state state = { + .hook = NF_INET_PRE_ROUTING, + .pf = AF_INET6, + .net = nf_ct_net(ct), + }; + return nf_conntrack_tcp_packet(ct, skb, dataoff, ctinfo, &state); +} +#endif + #if IS_ENABLED(CONFIG_NF_CT_NETLINK) #include diff -ruw linux-6.4/net/netfilter/nf_conntrack_proto_udp.c linux-6.4-fbx/net/netfilter/nf_conntrack_proto_udp.c --- linux-6.4/net/netfilter/nf_conntrack_proto_udp.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_conntrack_proto_udp.c 2024-04-22 13:40:53.055944373 +0200 @@ -129,6 +129,38 @@ return NF_ACCEPT; } +#ifdef CONFIG_IP_FFN +int external_udpv4_packet(struct nf_conn *ct, + struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo) +{ + /* fixme: is is always PRE_ROUTING ?*/ + struct nf_hook_state state = { + .hook = NF_INET_PRE_ROUTING, + .pf = AF_INET, + .net = nf_ct_net(ct), + }; + return nf_conntrack_udp_packet(ct, skb, dataoff, ctinfo, &state); +} +#endif + +#ifdef CONFIG_IPV6_FFN +int external_udpv6_packet(struct nf_conn *ct, + struct sk_buff *skb, + unsigned int dataoff, + enum ip_conntrack_info ctinfo) +{ + /* fixme: is is always PRE_ROUTING ?*/ + struct nf_hook_state state = { + .hook = NF_INET_PRE_ROUTING, + .pf = AF_INET6, + .net = nf_ct_net(ct), + }; + return nf_conntrack_udp_packet(ct, skb, dataoff, ctinfo, &state); +} +#endif + #ifdef CONFIG_NF_CT_PROTO_UDPLITE static void udplite_error_log(const struct sk_buff *skb, const struct nf_hook_state *state, diff -ruw linux-6.4/net/netfilter/nf_conntrack_standalone.c linux-6.4-fbx/net/netfilter/nf_conntrack_standalone.c --- linux-6.4/net/netfilter/nf_conntrack_standalone.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_conntrack_standalone.c 2024-04-22 13:40:53.059944483 +0200 @@ -557,6 +557,7 @@ NF_SYSCTL_CT_LOG_INVALID, NF_SYSCTL_CT_EXPECT_MAX, NF_SYSCTL_CT_ACCT, + NF_SYSCTL_CT_HELPER, #ifdef CONFIG_NF_CONNTRACK_EVENTS NF_SYSCTL_CT_EVENTS, #endif @@ -674,6 +675,14 @@ .extra1 = SYSCTL_ZERO, .extra2 = SYSCTL_ONE, }, + [NF_SYSCTL_CT_HELPER] = { + .procname = "nf_conntrack_helper", + .maxlen = sizeof(u8), + .mode = 0644, + .proc_handler = proc_dou8vec_minmax, + .extra1 = SYSCTL_ZERO, + .extra2 = SYSCTL_ONE, + }, #ifdef CONFIG_NF_CONNTRACK_EVENTS [NF_SYSCTL_CT_EVENTS] = { .procname = "nf_conntrack_events", @@ -1079,6 +1088,7 @@ table[NF_SYSCTL_CT_CHECKSUM].data = &net->ct.sysctl_checksum; table[NF_SYSCTL_CT_LOG_INVALID].data = &net->ct.sysctl_log_invalid; table[NF_SYSCTL_CT_ACCT].data = &net->ct.sysctl_acct; + table[NF_SYSCTL_CT_HELPER].data = &cnet->sysctl_auto_assign_helper; #ifdef CONFIG_NF_CONNTRACK_EVENTS table[NF_SYSCTL_CT_EVENTS].data = &net->ct.sysctl_events; #endif diff -ruw linux-6.4/net/netfilter/nf_nat_core.c linux-6.4-fbx/net/netfilter/nf_nat_core.c --- linux-6.4/net/netfilter/nf_nat_core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_nat_core.c 2024-04-22 13:40:53.059944483 +0200 @@ -641,6 +641,11 @@ else ct->status |= IPS_SRC_NAT_DONE; + if (maniptype == NF_NAT_MANIP_SRC) { + ct->nat_src_proto_min = range->min_proto; + ct->nat_src_proto_max = range->max_proto; + } + return NF_ACCEPT; } EXPORT_SYMBOL(nf_nat_setup_info); diff -ruw linux-6.4/net/netfilter/nf_nat_helper.c linux-6.4-fbx/net/netfilter/nf_nat_helper.c --- linux-6.4/net/netfilter/nf_nat_helper.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_nat_helper.c 2024-04-22 13:40:53.059944483 +0200 @@ -188,6 +188,14 @@ range.flags = NF_NAT_RANGE_MAP_IPS; range.min_addr = range.max_addr = ct->master->tuplehash[!exp->dir].tuple.dst.u3; + + if (ct->master->nat_src_proto_min.all && + ct->master->nat_src_proto_max.all) { + range.flags |= NF_NAT_RANGE_PROTO_SPECIFIED; + range.min_proto = ct->master->nat_src_proto_min; + range.max_proto = ct->master->nat_src_proto_max; + } + nf_nat_setup_info(ct, &range, NF_NAT_MANIP_SRC); /* For DST manip, map port here to where it's expected. */ diff -ruw linux-6.4/net/netfilter/nf_nat_proto.c linux-6.4-fbx/net/netfilter/nf_nat_proto.c --- linux-6.4/net/netfilter/nf_nat_proto.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/netfilter/nf_nat_proto.c 2023-02-27 13:42:32.630771810 +0100 @@ -385,6 +385,8 @@ { #if IS_ENABLED(CONFIG_IPV6) struct ipv6hdr *ipv6h; + const __be32 *to; + __be32 *from; __be16 frag_off; int hdroff; u8 nexthdr; @@ -407,10 +409,24 @@ ipv6h = (void *)skb->data + iphdroff; manip_addr: - if (maniptype == NF_NAT_MANIP_SRC) - ipv6h->saddr = target->src.u3.in6; - else - ipv6h->daddr = target->dst.u3.in6; + if (maniptype == NF_NAT_MANIP_SRC) { + from = ipv6h->saddr.s6_addr32; + to = target->src.u3.in6.s6_addr32; + } else { + from = ipv6h->daddr.s6_addr32; + to = target->dst.u3.in6.s6_addr32; + } + + if (skb->ip_summed == CHECKSUM_COMPLETE) { + __be32 diff[] = { + ~from[0], ~from[1], ~from[2], ~from[3], + to[0], to[1], to[2], to[3], + }; + + skb->csum = ~csum_partial(diff, sizeof(diff), ~skb->csum); + } + + memcpy(from, to, sizeof (struct in6_addr)); #endif return true; diff -ruw linux-6.4/net/socket.c linux-6.4-fbx/net/socket.c --- linux-6.4/net/socket.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/socket.c 2024-04-22 13:40:53.131946450 +0200 @@ -1220,6 +1220,29 @@ return err; } +static DEFINE_MUTEX(fbxbridge_ioctl_mutex); +static int (*fbxbridge_ioctl_hook)(struct net *, unsigned int cmd, void __user *arg) = NULL; + +void fbxbridge_set(int (*hook)(struct net *, unsigned int, void __user *)) +{ + mutex_lock(&fbxbridge_ioctl_mutex); + fbxbridge_ioctl_hook = hook; + mutex_unlock(&fbxbridge_ioctl_mutex); +} + +static DEFINE_MUTEX(fbxdiverter_ioctl_mutex); +static int (*fbxdiverter_ioctl_hook) (struct net *, unsigned int cmd, void __user *arg) = NULL; + +void fbxdiverter_ioctl_set(int (*hook) (struct net *, unsigned int, + void __user *)) +{ + mutex_lock(&fbxdiverter_ioctl_mutex); + fbxdiverter_ioctl_hook = hook; + mutex_unlock(&fbxdiverter_ioctl_mutex); +} + +EXPORT_SYMBOL(fbxdiverter_ioctl_set); + /* * With an ioctl, arg may well be a user mode pointer, but we don't know * what to do with it - that's up to the protocol still. @@ -1289,6 +1312,17 @@ err = open_related_ns(&net->ns, get_net_ns); break; + case SIOCGFBXDIVERT: + case SIOCSFBXDIVERT: + err = -ENOPKG; + if (!fbxdiverter_ioctl_hook) + request_module("fbxdiverter"); + + mutex_lock(&fbxdiverter_ioctl_mutex); + if (fbxdiverter_ioctl_hook) + err = fbxdiverter_ioctl_hook(net, cmd, argp); + mutex_unlock(&fbxdiverter_ioctl_mutex); + break; case SIOCGSTAMP_OLD: case SIOCGSTAMPNS_OLD: if (!sock->ops->gettstamp) { @@ -1314,6 +1348,17 @@ err = dev_ifconf(net, argp); break; + case SIOCGFBXBRIDGE: + case SIOCSFBXBRIDGE: + err = -ENOPKG; + if (!fbxbridge_ioctl_hook) + request_module("fbxbridge"); + + mutex_lock(&fbxbridge_ioctl_mutex); + if (fbxbridge_ioctl_hook) + err = fbxbridge_ioctl_hook(net, cmd, argp); + mutex_unlock(&fbxbridge_ioctl_mutex); + break; default: err = sock_do_ioctl(net, sock, cmd, arg); break; diff -ruw linux-6.4/net/unix/Kconfig linux-6.4-fbx/net/unix/Kconfig --- linux-6.4/net/unix/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/unix/Kconfig 2023-04-05 14:58:59.067863051 +0200 @@ -30,6 +30,9 @@ depends on UNIX default y +config UNIX_ABSTRACT_IGNORE_NETNS + bool "make abstract namespace global to all network namespaces" + config UNIX_DIAG tristate "UNIX: socket monitoring interface" depends on UNIX diff -ruw linux-6.4/net/unix/af_unix.c linux-6.4-fbx/net/unix/af_unix.c --- linux-6.4/net/unix/af_unix.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/unix/af_unix.c 2024-04-22 13:40:53.155947105 +0200 @@ -1116,8 +1116,19 @@ if (sunaddr->sun_path[0]) sk = unix_find_bsd(sunaddr, addr_len, type); - else + else { +#ifdef CONFIG_UNIX_ABSTRACT_IGNORE_NETNS + down_read(&net_rwsem); + for_each_net(net) { +#endif sk = unix_find_abstract(net, sunaddr, addr_len, type); +#ifdef CONFIG_UNIX_ABSTRACT_IGNORE_NETNS + if (!IS_ERR(sk)) + break; + } + up_read(&net_rwsem); +#endif + } return sk; } diff -ruw linux-6.4/net/wireless/Kconfig linux-6.4-fbx/net/wireless/Kconfig --- linux-6.4/net/wireless/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/Kconfig 2024-04-22 13:40:53.159947215 +0200 @@ -177,6 +177,9 @@ If unsure, say N. +config CFG80211_DFS_CACHE + bool "keep each channel dfs state in global cache" + config CFG80211_CRDA_SUPPORT bool "support CRDA" if EXPERT default y @@ -201,6 +204,22 @@ Drivers should select this option if they require cfg80211's wext compatibility symbols to be exported. +config CFG80211_KUNIT_TEST + tristate "KUnit tests for cfg80211" if !KUNIT_ALL_TESTS + depends on KUNIT + depends on CFG80211 + default KUNIT_ALL_TESTS + depends on !KERNEL_6_2 + help + Enable this option to test cfg80211 functions with kunit. + + If unsure, say N. + +config FBX80211 + bool "fbx genl family" + help + Support for freebox specific genl family + endif # CFG80211 config LIB80211 diff -ruw linux-6.4/net/wireless/Makefile linux-6.4-fbx/net/wireless/Makefile --- linux-6.4/net/wireless/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/Makefile 2024-04-22 13:40:53.159947215 +0200 @@ -4,6 +4,7 @@ obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o +obj-y += tests/ obj-$(CONFIG_WEXT_CORE) += wext-core.o obj-$(CONFIG_WEXT_PROC) += wext-proc.o @@ -24,6 +25,8 @@ cfg80211-y += extra-certs.o endif +cfg80211-$(CONFIG_FBX80211) += nlfbx.o + $(obj)/shipped-certs.c: $(wildcard $(srctree)/$(src)/certs/*.hex) @$(kecho) " GEN $@" $(Q)(echo '#include "reg.h"'; \ diff -ruw linux-6.4/net/wireless/ap.c linux-6.4-fbx/net/wireless/ap.c --- linux-6.4/net/wireless/ap.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/ap.c 2024-04-22 13:40:53.159947215 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Parts of this file are - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation */ #include #include @@ -18,7 +18,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!rdev->ops->stop_ap) return -EOPNOTSUPP; @@ -52,7 +52,7 @@ return err; } -int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, +int cfg80211_stop_ap(struct cfg80211_registered_device *rdev, struct net_device *dev, int link_id, bool notify) { @@ -72,17 +72,3 @@ return ret; } - -int cfg80211_stop_ap(struct cfg80211_registered_device *rdev, - struct net_device *dev, int link_id, - bool notify) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - int err; - - wdev_lock(wdev); - err = __cfg80211_stop_ap(rdev, dev, link_id, notify); - wdev_unlock(wdev); - - return err; -} diff -ruw linux-6.4/net/wireless/chan.c linux-6.4-fbx/net/wireless/chan.c --- linux-6.4/net/wireless/chan.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/chan.c 2024-04-22 13:40:53.159947215 +0200 @@ -32,6 +32,8 @@ chandef->center_freq2 = 0; chandef->edmg.bw_config = 0; chandef->edmg.channels = 0; + chandef->ru_punct_bitmap = 0; + chandef->ru_punct_bitmap_supp_he = 0; switch (chan_type) { case NL80211_CHAN_NO_HT: @@ -445,6 +447,77 @@ } EXPORT_SYMBOL(cfg80211_chandef_compatible); +static inline u32 +dfs_cache_channel_to_khz(const struct cfg80211_chan_dfs_cache *cd) +{ + return MHZ_TO_KHZ(cd->center_freq) + cd->freq_offset; +} + +static struct cfg80211_chan_dfs_cache * +__get_dfs_chan_cache(struct ieee80211_channel *c) +{ + struct cfg80211_chan_dfs_cache *cd; + u32 freq; + + freq = ieee80211_channel_to_khz(c); + list_for_each_entry(cd, &cfg80211_dfs_cache.bands[c->band], next) { + if (dfs_cache_channel_to_khz(cd) == freq) + return cd; + } + return NULL; +} + +struct cfg80211_chan_dfs_cache * +cfg80211_get_dfs_chan_cache(struct ieee80211_channel *c) +{ + struct cfg80211_chan_dfs_cache *cd; + u32 freq; + + freq = ieee80211_channel_to_khz(c); + list_for_each_entry(cd, &cfg80211_dfs_cache.bands[c->band], next) { + if (dfs_cache_channel_to_khz(cd) == freq) + return cd; + } + return NULL; +} + +void cfg80211_flush_dfs_cache(void) +{ + struct cfg80211_chan_dfs_cache *cd, *tmp; + size_t i; + + for (i = 0; i < ARRAY_SIZE(cfg80211_dfs_cache.bands); i++) { + list_for_each_entry_safe(cd, tmp, + &cfg80211_dfs_cache.bands[i], next) { + list_del(&cd->next); + kfree(cd); + } + } +} + +static void set_dfs_cache_state(struct ieee80211_channel *c, + enum nl80211_dfs_state dfs_state) +{ + struct cfg80211_chan_dfs_cache *cd; + + mutex_lock(&cfg80211_dfs_cache.mtx); + + cd = __get_dfs_chan_cache(c); + if (!cd) { + cd = kzalloc(sizeof (*cd), GFP_KERNEL); + if (!cd) + return; + cd->center_freq = c->center_freq; + cd->freq_offset = c->freq_offset; + list_add(&cd->next, &cfg80211_dfs_cache.bands[c->band]); + } + + cd->dfs_state = dfs_state; + cd->dfs_state_entered = jiffies; + + mutex_unlock(&cfg80211_dfs_cache.mtx); +} + static void cfg80211_set_chans_dfs_state(struct wiphy *wiphy, u32 center_freq, u32 bandwidth, enum nl80211_dfs_state dfs_state) @@ -459,6 +532,8 @@ if (!c || !(c->flags & IEEE80211_CHAN_RADAR)) continue; + if (IS_ENABLED(CONFIG_CFG80211_DFS_CACHE)) + set_dfs_cache_state(c, dfs_state); c->dfs_state = dfs_state; c->dfs_state_entered = jiffies; } @@ -666,6 +741,7 @@ return (r1 + r2 > 0); } +EXPORT_SYMBOL(cfg80211_chandef_dfs_usable); /* * Checks if center frequency of chan falls with in the bandwidth @@ -713,7 +789,7 @@ { unsigned int link; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); switch (wdev->iftype) { case NL80211_IFTYPE_AP: @@ -782,19 +858,15 @@ { struct wireless_dev *wdev; + lockdep_assert_wiphy(wiphy); + list_for_each_entry(wdev, &wiphy->wdev_list, list) { - wdev_lock(wdev); - if (!cfg80211_beaconing_iface_active(wdev)) { - wdev_unlock(wdev); + if (!cfg80211_beaconing_iface_active(wdev)) continue; - } - if (cfg80211_wdev_on_sub_chan(wdev, chan, false)) { - wdev_unlock(wdev); + if (cfg80211_wdev_on_sub_chan(wdev, chan, false)) return true; } - wdev_unlock(wdev); - } return false; } @@ -823,14 +895,18 @@ if (!(chan->flags & IEEE80211_CHAN_RADAR)) return false; - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { + bool found; + if (!reg_dfs_domain_same(wiphy, &rdev->wiphy)) continue; - if (cfg80211_is_wiphy_oper_chan(&rdev->wiphy, chan)) - return true; + wiphy_lock(&rdev->wiphy); + found = cfg80211_is_wiphy_oper_chan(&rdev->wiphy, chan) || + cfg80211_offchan_chain_is_active(rdev, chan); + wiphy_unlock(&rdev->wiphy); - if (cfg80211_offchan_chain_is_active(rdev, chan)) + if (found) return true; } @@ -965,6 +1041,7 @@ return max(t1, t2); } +EXPORT_SYMBOL(cfg80211_chandef_dfs_cac_time); static bool cfg80211_secondary_chans_ok(struct wiphy *wiphy, u32 center_freq, u32 bandwidth, @@ -1321,10 +1398,7 @@ list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { bool ret; - wdev_lock(wdev); ret = cfg80211_ir_permissive_check_wdev(iftype, wdev, chan); - wdev_unlock(wdev); - if (ret) return ret; } @@ -1433,17 +1507,10 @@ struct cfg80211_chan_def *wdev_chandef(struct wireless_dev *wdev, unsigned int link_id) { - /* - * We need to sort out the locking here - in some cases - * where we get here we really just don't care (yet) - * about the valid links, but in others we do. But we - * get here with various driver cases, so we cannot - * easily require the wdev mutex. - */ - if (link_id || wdev->valid_links & BIT(0)) { - ASSERT_WDEV_LOCK(wdev); - WARN_ON(!(wdev->valid_links & BIT(link_id))); - } + lockdep_assert_wiphy(wdev->wiphy); + + WARN_ON(wdev->valid_links && !(wdev->valid_links & BIT(link_id))); + WARN_ON(!wdev->valid_links && link_id > 0); switch (wdev->iftype) { case NL80211_IFTYPE_MESH_POINT: diff -ruw linux-6.4/net/wireless/core.c linux-6.4-fbx/net/wireless/core.c --- linux-6.4/net/wireless/core.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/core.c 2024-04-22 13:40:53.159947215 +0200 @@ -25,6 +25,7 @@ #include #include #include "nl80211.h" +#include "nlfbx.h" #include "core.h" #include "sysfs.h" #include "debugfs.h" @@ -54,13 +55,17 @@ MODULE_PARM_DESC(cfg80211_disable_40mhz_24ghz, "Disable 40MHz support in the 2.4GHz band"); +/* global dfs cache */ +struct cfg80211_dfs_cache cfg80211_dfs_cache; +static struct dentry *cfg80211_dfs_cache_debugfs; + struct cfg80211_registered_device *cfg80211_rdev_by_wiphy_idx(int wiphy_idx) { struct cfg80211_registered_device *result = NULL, *rdev; ASSERT_RTNL(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (rdev->wiphy_idx == wiphy_idx) { result = rdev; break; @@ -116,7 +121,7 @@ } /* Ensure another device does not already have this name. */ - list_for_each_entry(rdev2, &cfg80211_rdev_list, list) + for_each_rdev(rdev2) if (strcmp(newname, wiphy_name(&rdev2->wiphy)) == 0) return -EINVAL; @@ -129,6 +134,7 @@ int result; ASSERT_RTNL(); + lockdep_assert_wiphy(&rdev->wiphy); /* Ignore nop renames */ if (strcmp(newname, wiphy_name(&rdev->wiphy)) == 0) @@ -195,6 +201,8 @@ continue; nl80211_notify_iface(rdev, wdev, NL80211_CMD_DEL_INTERFACE); } + + wiphy_lock(&rdev->wiphy); nl80211_notify_wiphy(rdev, NL80211_CMD_DEL_WIPHY); wiphy_net_set(&rdev->wiphy, net); @@ -203,6 +211,8 @@ WARN_ON(err); nl80211_notify_wiphy(rdev, NL80211_CMD_NEW_WIPHY); + wiphy_unlock(&rdev->wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { if (!wdev->netdev) continue; @@ -360,7 +370,8 @@ rtnl_unlock(); } -static void cfg80211_sched_scan_stop_wk(struct work_struct *work) +static void cfg80211_sched_scan_stop_wk(struct wiphy *wiphy, + struct wiphy_work *work) { struct cfg80211_registered_device *rdev; struct cfg80211_sched_scan_request *req, *tmp; @@ -368,12 +379,10 @@ rdev = container_of(work, struct cfg80211_registered_device, sched_scan_stop_wk); - wiphy_lock(&rdev->wiphy); list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) { if (req->nl_owner_dead) cfg80211_stop_sched_scan_req(rdev, req, false); } - wiphy_unlock(&rdev->wiphy); } static void cfg80211_propagate_radar_detect_wk(struct work_struct *work) @@ -408,6 +417,34 @@ rtnl_unlock(); } +static void cfg80211_wiphy_work(struct work_struct *work) +{ + struct cfg80211_registered_device *rdev; + struct wiphy_work *wk; + + rdev = container_of(work, struct cfg80211_registered_device, wiphy_work); + + wiphy_lock(&rdev->wiphy); + if (rdev->suspended) + goto out; + + spin_lock_irq(&rdev->wiphy_work_lock); + wk = list_first_entry_or_null(&rdev->wiphy_work_list, + struct wiphy_work, entry); + if (wk) { + list_del_init(&wk->entry); + if (!list_empty(&rdev->wiphy_work_list)) + schedule_work(work); + spin_unlock_irq(&rdev->wiphy_work_lock); + + wk->func(&rdev->wiphy, wk); + } else { + spin_unlock_irq(&rdev->wiphy_work_lock); + } +out: + wiphy_unlock(&rdev->wiphy); +} + /* exported functions */ struct wiphy *wiphy_new_nm(const struct cfg80211_ops *ops, int sizeof_priv, @@ -495,7 +532,7 @@ spin_lock_init(&rdev->bss_lock); INIT_LIST_HEAD(&rdev->bss_list); INIT_LIST_HEAD(&rdev->sched_scan_req_list); - INIT_WORK(&rdev->scan_done_wk, __cfg80211_scan_done); + wiphy_work_init(&rdev->scan_done_wk, __cfg80211_scan_done); INIT_DELAYED_WORK(&rdev->dfs_update_channels_wk, cfg80211_dfs_channels_update_work); #ifdef CONFIG_CFG80211_WEXT @@ -508,7 +545,7 @@ device_enable_async_suspend(&rdev->wiphy.dev); INIT_WORK(&rdev->destroy_work, cfg80211_destroy_iface_wk); - INIT_WORK(&rdev->sched_scan_stop_wk, cfg80211_sched_scan_stop_wk); + wiphy_work_init(&rdev->sched_scan_stop_wk, cfg80211_sched_scan_stop_wk); INIT_WORK(&rdev->sched_scan_res_wk, cfg80211_sched_scan_results_wk); INIT_WORK(&rdev->propagate_radar_detect_wk, cfg80211_propagate_radar_detect_wk); @@ -533,6 +570,9 @@ return NULL; } + INIT_WORK(&rdev->wiphy_work, cfg80211_wiphy_work); + INIT_LIST_HEAD(&rdev->wiphy_work_list); + spin_lock_init(&rdev->wiphy_work_lock); INIT_WORK(&rdev->rfkill_block, cfg80211_rfkill_block_work); INIT_WORK(&rdev->conn_work, cfg80211_conn_work); INIT_WORK(&rdev->event_work, cfg80211_event_work); @@ -558,6 +598,7 @@ rdev->wiphy.max_sched_scan_plans = 1; rdev->wiphy.max_sched_scan_plan_interval = U32_MAX; + rdev->wiphy.dev_port = -1; return &rdev->wiphy; } @@ -721,22 +762,6 @@ return -EINVAL; } - /* - * if a wiphy has unsupported modes for regulatory channel enforcement, - * opt-out of enforcement checking - */ - if (wiphy->interface_modes & ~(BIT(NL80211_IFTYPE_STATION) | - BIT(NL80211_IFTYPE_P2P_CLIENT) | - BIT(NL80211_IFTYPE_AP) | - BIT(NL80211_IFTYPE_MESH_POINT) | - BIT(NL80211_IFTYPE_P2P_GO) | - BIT(NL80211_IFTYPE_ADHOC) | - BIT(NL80211_IFTYPE_P2P_DEVICE) | - BIT(NL80211_IFTYPE_NAN) | - BIT(NL80211_IFTYPE_AP_VLAN) | - BIT(NL80211_IFTYPE_MONITOR))) - wiphy->regulatory_flags |= REGULATORY_IGNORE_STALE_KICKOFF; - if (WARN_ON((wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) && (wiphy->regulatory_flags & (REGULATORY_CUSTOM_REG | @@ -941,8 +966,10 @@ rdev->wiphy.features |= NL80211_FEATURE_SCAN_FLUSH; rtnl_lock(); + wiphy_lock(&rdev->wiphy); res = device_add(&rdev->wiphy.dev); if (res) { + wiphy_unlock(&rdev->wiphy); rtnl_unlock(); return res; } @@ -956,6 +983,7 @@ cfg80211_debugfs_rdev_add(rdev); nl80211_notify_wiphy(rdev, NL80211_CMD_NEW_WIPHY); + wiphy_unlock(&rdev->wiphy); /* set up regulatory info */ wiphy_regulatory_register(wiphy); @@ -1027,6 +1055,36 @@ } EXPORT_SYMBOL(wiphy_rfkill_start_polling); +void cfg80211_process_wiphy_works(struct cfg80211_registered_device *rdev, + struct wiphy_work *end) +{ + unsigned int runaway_limit = 100; + unsigned long flags; + + lockdep_assert_held(&rdev->wiphy.mtx); + + spin_lock_irqsave(&rdev->wiphy_work_lock, flags); + while (!list_empty(&rdev->wiphy_work_list)) { + struct wiphy_work *wk; + + wk = list_first_entry(&rdev->wiphy_work_list, + struct wiphy_work, entry); + list_del_init(&wk->entry); + spin_unlock_irqrestore(&rdev->wiphy_work_lock, flags); + + wk->func(&rdev->wiphy, wk); + + spin_lock_irqsave(&rdev->wiphy_work_lock, flags); + + if (wk == end) + break; + + if (WARN_ON(--runaway_limit == 0)) + INIT_LIST_HEAD(&rdev->wiphy_work_list); + } + spin_unlock_irqrestore(&rdev->wiphy_work_lock, flags); +} + void wiphy_unregister(struct wiphy *wiphy) { struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); @@ -1065,25 +1123,29 @@ cfg80211_rdev_list_generation++; device_del(&rdev->wiphy.dev); +#ifdef CONFIG_PM + if (rdev->wiphy.wowlan_config && rdev->ops->set_wakeup) + rdev_set_wakeup(rdev, false); +#endif + + /* surely nothing is reachable now, clean up work */ + cfg80211_process_wiphy_works(rdev, NULL); wiphy_unlock(&rdev->wiphy); rtnl_unlock(); - flush_work(&rdev->scan_done_wk); + /* this has nothing to do now but make sure it's gone */ + cancel_work_sync(&rdev->wiphy_work); + cancel_work_sync(&rdev->conn_work); flush_work(&rdev->event_work); cancel_delayed_work_sync(&rdev->dfs_update_channels_wk); cancel_delayed_work_sync(&rdev->background_cac_done_wk); flush_work(&rdev->destroy_work); - flush_work(&rdev->sched_scan_stop_wk); flush_work(&rdev->propagate_radar_detect_wk); flush_work(&rdev->propagate_cac_done_wk); flush_work(&rdev->mgmt_registrations_update_wk); flush_work(&rdev->background_cac_abort_wk); -#ifdef CONFIG_PM - if (rdev->wiphy.wowlan_config && rdev->ops->set_wakeup) - rdev_set_wakeup(rdev, false); -#endif cfg80211_rdev_free_wowlan(rdev); cfg80211_rdev_free_coalesce(rdev); } @@ -1130,23 +1192,16 @@ } EXPORT_SYMBOL(wiphy_rfkill_set_hw_state_reason); -void cfg80211_cqm_config_free(struct wireless_dev *wdev) -{ - kfree(wdev->cqm_config); - wdev->cqm_config = NULL; -} - static void _cfg80211_unregister_wdev(struct wireless_dev *wdev, bool unregister_netdev) { struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); + struct cfg80211_cqm_config *cqm_config; unsigned int link_id; ASSERT_RTNL(); lockdep_assert_held(&rdev->wiphy.mtx); - flush_work(&wdev->pmsr_free_wk); - nl80211_notify_iface(rdev, wdev, NL80211_CMD_DEL_INTERFACE); wdev->registered = false; @@ -1178,11 +1233,10 @@ kfree_sensitive(wdev->wext.keys); wdev->wext.keys = NULL; #endif - /* only initialized if we have a netdev */ - if (wdev->netdev) - flush_work(&wdev->disconnect_wk); - - cfg80211_cqm_config_free(wdev); + wiphy_work_cancel(wdev->wiphy, &wdev->cqm_rssi_work); + /* deleted from the list, so can't be found from nl80211 any more */ + cqm_config = rcu_access_pointer(wdev->cqm_config); + kfree_rcu(cqm_config, rcu_head); /* * Ensure that all events have been processed and @@ -1228,14 +1282,13 @@ rdev->num_running_monitor_ifaces += num; } -void __cfg80211_leave(struct cfg80211_registered_device *rdev, +void cfg80211_leave(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev) { struct net_device *dev = wdev->netdev; struct cfg80211_sched_scan_request *pos, *tmp; lockdep_assert_held(&rdev->wiphy.mtx); - ASSERT_WDEV_LOCK(wdev); cfg80211_pmsr_wdev_down(wdev); @@ -1243,7 +1296,7 @@ switch (wdev->iftype) { case NL80211_IFTYPE_ADHOC: - __cfg80211_leave_ibss(rdev, dev, true); + cfg80211_leave_ibss(rdev, dev, true); break; case NL80211_IFTYPE_P2P_CLIENT: case NL80211_IFTYPE_STATION: @@ -1263,14 +1316,14 @@ WLAN_REASON_DEAUTH_LEAVING, true); break; case NL80211_IFTYPE_MESH_POINT: - __cfg80211_leave_mesh(rdev, dev); + cfg80211_leave_mesh(rdev, dev); break; case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: - __cfg80211_stop_ap(rdev, dev, -1, true); + cfg80211_stop_ap(rdev, dev, -1, true); break; case NL80211_IFTYPE_OCB: - __cfg80211_leave_ocb(rdev, dev); + cfg80211_leave_ocb(rdev, dev); break; case NL80211_IFTYPE_P2P_DEVICE: case NL80211_IFTYPE_NAN: @@ -1288,14 +1341,6 @@ } } -void cfg80211_leave(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev) -{ - wdev_lock(wdev); - __cfg80211_leave(rdev, wdev); - wdev_unlock(wdev); -} - void cfg80211_stop_iface(struct wiphy *wiphy, struct wireless_dev *wdev, gfp_t gfp) { @@ -1320,7 +1365,6 @@ void cfg80211_init_wdev(struct wireless_dev *wdev) { - mutex_init(&wdev->mtx); INIT_LIST_HEAD(&wdev->event_list); spin_lock_init(&wdev->event_lock); INIT_LIST_HEAD(&wdev->mgmt_registrations); @@ -1334,6 +1378,8 @@ wdev->wext.connect.auth_type = NL80211_AUTHTYPE_AUTOMATIC; #endif + wiphy_work_init(&wdev->cqm_rssi_work, cfg80211_cqm_rssi_notify_work); + if (wdev->wiphy->flags & WIPHY_FLAG_PS_ON_BY_DEFAULT) wdev->ps = true; else @@ -1392,6 +1438,7 @@ lockdep_assert_held(&rdev->wiphy.mtx); /* we'll take care of this */ + dev->dev_port = rdev->wiphy.dev_port + 1; wdev->registered = true; wdev->registering = true; ret = register_netdevice(dev); @@ -1455,6 +1502,9 @@ cfg80211_leave(rdev, wdev); cfg80211_remove_links(wdev); wiphy_unlock(&rdev->wiphy); + /* since we just did cfg80211_leave() nothing to do there */ + cancel_work_sync(&wdev->disconnect_wk); + cancel_work_sync(&wdev->pmsr_free_wk); break; case NETDEV_DOWN: wiphy_lock(&rdev->wiphy); @@ -1480,7 +1530,6 @@ case NETDEV_UP: wiphy_lock(&rdev->wiphy); cfg80211_update_iface_num(rdev, wdev->iftype, 1); - wdev_lock(wdev); switch (wdev->iftype) { #ifdef CONFIG_CFG80211_WEXT case NL80211_IFTYPE_ADHOC: @@ -1510,7 +1559,6 @@ default: break; } - wdev_unlock(wdev); rdev->opencount++; /* @@ -1553,7 +1601,7 @@ struct cfg80211_registered_device *rdev; rtnl_lock(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (net_eq(wiphy_net(&rdev->wiphy), net)) WARN_ON(cfg80211_switch_netns(rdev, &init_net)); } @@ -1564,6 +1612,125 @@ .exit = cfg80211_pernet_exit, }; +void wiphy_work_queue(struct wiphy *wiphy, struct wiphy_work *work) +{ + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + unsigned long flags; + + spin_lock_irqsave(&rdev->wiphy_work_lock, flags); + if (list_empty(&work->entry)) + list_add_tail(&work->entry, &rdev->wiphy_work_list); + spin_unlock_irqrestore(&rdev->wiphy_work_lock, flags); + + queue_work(system_unbound_wq, &rdev->wiphy_work); +} +EXPORT_SYMBOL_GPL(wiphy_work_queue); + +void wiphy_work_cancel(struct wiphy *wiphy, struct wiphy_work *work) +{ + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + unsigned long flags; + + lockdep_assert_held(&wiphy->mtx); + + spin_lock_irqsave(&rdev->wiphy_work_lock, flags); + if (!list_empty(&work->entry)) + list_del_init(&work->entry); + spin_unlock_irqrestore(&rdev->wiphy_work_lock, flags); +} +EXPORT_SYMBOL_GPL(wiphy_work_cancel); + +void wiphy_work_flush(struct wiphy *wiphy, struct wiphy_work *work) +{ + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + unsigned long flags; + bool run; + + spin_lock_irqsave(&rdev->wiphy_work_lock, flags); + run = !work || !list_empty(&work->entry); + spin_unlock_irqrestore(&rdev->wiphy_work_lock, flags); + + if (run) + cfg80211_process_wiphy_works(rdev, work); +} +EXPORT_SYMBOL_GPL(wiphy_work_flush); + +void wiphy_delayed_work_timer(struct timer_list *t) +{ + struct wiphy_delayed_work *dwork = from_timer(dwork, t, timer); + + wiphy_work_queue(dwork->wiphy, &dwork->work); +} +EXPORT_SYMBOL(wiphy_delayed_work_timer); + +void wiphy_delayed_work_queue(struct wiphy *wiphy, + struct wiphy_delayed_work *dwork, + unsigned long delay) +{ + if (!delay) { + wiphy_work_queue(wiphy, &dwork->work); + return; + } + + dwork->wiphy = wiphy; + mod_timer(&dwork->timer, jiffies + delay); +} +EXPORT_SYMBOL_GPL(wiphy_delayed_work_queue); + +void wiphy_delayed_work_cancel(struct wiphy *wiphy, + struct wiphy_delayed_work *dwork) +{ + lockdep_assert_held(&wiphy->mtx); + + del_timer_sync(&dwork->timer); + wiphy_work_cancel(wiphy, &dwork->work); +} +EXPORT_SYMBOL_GPL(wiphy_delayed_work_cancel); + +void wiphy_delayed_work_flush(struct wiphy *wiphy, + struct wiphy_delayed_work *dwork) +{ + lockdep_assert_held(&wiphy->mtx); + + del_timer_sync(&dwork->timer); + wiphy_work_flush(wiphy, &dwork->work); +} +EXPORT_SYMBOL_GPL(wiphy_delayed_work_flush); + +/* + * + */ +static int dfs_cache_flush_set(void *data, u64 val) +{ + cfg80211_flush_dfs_cache(); + printk("DFS cache flushed\n"); + return 0; +} + +DEFINE_DEBUGFS_ATTRIBUTE(fops_dfs_cache_flush, NULL, + dfs_cache_flush_set, "%llu\n"); + +static void __init dfs_cache_init(void) +{ + size_t i; + + mutex_init(&cfg80211_dfs_cache.mtx); + + for (i = 0; i < ARRAY_SIZE(cfg80211_dfs_cache.bands); i++) + INIT_LIST_HEAD(&cfg80211_dfs_cache.bands[i]); + + cfg80211_dfs_cache_debugfs = + debugfs_create_file_unsafe("dfs_cache_flush", 0200, + ieee80211_debugfs_dir, NULL, + &fops_dfs_cache_flush); +} + +static void __exit dfs_cache_exit(void) +{ + cfg80211_flush_dfs_cache(); + debugfs_remove(cfg80211_dfs_cache_debugfs); +} + static int __init cfg80211_init(void) { int err; @@ -1584,8 +1751,14 @@ if (err) goto out_fail_nl80211; + err = nlfbx_init(); + if (err) + goto out_fail_nlfbx; + ieee80211_debugfs_dir = debugfs_create_dir("ieee80211", NULL); + dfs_cache_init(); + err = regulatory_init(); if (err) goto out_fail_reg; @@ -1601,6 +1774,8 @@ out_fail_wq: regulatory_exit(); out_fail_reg: + nlfbx_exit(); +out_fail_nlfbx: debugfs_remove(ieee80211_debugfs_dir); nl80211_exit(); out_fail_nl80211: @@ -1616,6 +1791,7 @@ static void __exit cfg80211_exit(void) { + dfs_cache_exit(); debugfs_remove(ieee80211_debugfs_dir); nl80211_exit(); unregister_netdevice_notifier(&cfg80211_netdev_notifier); diff -ruw linux-6.4/net/wireless/core.h linux-6.4-fbx/net/wireless/core.h --- linux-6.4/net/wireless/core.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/core.h 2024-04-22 13:40:53.159947215 +0200 @@ -75,7 +75,7 @@ struct sk_buff *scan_msg; struct list_head sched_scan_req_list; time64_t suspend_at; - struct work_struct scan_done_wk; + struct wiphy_work scan_done_wk; struct genl_info *cur_cmd_info; @@ -95,7 +95,7 @@ struct cfg80211_coalesce *coalesce; struct work_struct destroy_work; - struct work_struct sched_scan_stop_wk; + struct wiphy_work sched_scan_stop_wk; struct work_struct sched_scan_res_wk; struct cfg80211_chan_def radar_chandef; @@ -108,6 +108,12 @@ /* lock for all wdev lists */ spinlock_t mgmt_registrations_lock; + struct work_struct wiphy_work; + struct list_head wiphy_work_list; + /* protects the list above */ + spinlock_t wiphy_work_lock; + bool suspended; + /* must be last because of the way we do wiphy_priv(), * and it should at least be aligned to NETDEV_ALIGN */ struct wiphy wiphy __aligned(NETDEV_ALIGN); @@ -154,6 +160,40 @@ extern struct list_head cfg80211_rdev_list; extern int cfg80211_rdev_list_generation; + +/* + * DFS cache + */ +struct cfg80211_chan_dfs_cache { + u32 center_freq; + u16 freq_offset; + + enum nl80211_dfs_state dfs_state; + unsigned long dfs_state_entered; + struct list_head next; +}; + +struct cfg80211_dfs_cache { + struct list_head bands[NUM_NL80211_BANDS]; + struct mutex mtx; +}; + +extern struct cfg80211_dfs_cache cfg80211_dfs_cache; + +struct cfg80211_chan_dfs_cache * +cfg80211_get_dfs_chan_cache(struct ieee80211_channel *c); +void cfg80211_flush_dfs_cache(void); + +/* This is constructed like this so it can be used in if/else */ +static inline int for_each_rdev_check_rtnl(void) +{ + ASSERT_RTNL(); + return 0; +} +#define for_each_rdev(rdev) \ + if (for_each_rdev_check_rtnl()) {} else \ + list_for_each_entry(rdev, &cfg80211_rdev_list, list) + struct cfg80211_internal_bss { struct list_head list; struct list_head hidden_list; @@ -219,22 +259,6 @@ void cfg80211_register_wdev(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); -static inline void wdev_lock(struct wireless_dev *wdev) - __acquires(wdev) -{ - mutex_lock(&wdev->mtx); - __acquire(wdev->mtx); -} - -static inline void wdev_unlock(struct wireless_dev *wdev) - __releases(wdev) -{ - __release(wdev->mtx); - mutex_unlock(&wdev->mtx); -} - -#define ASSERT_WDEV_LOCK(wdev) lockdep_assert_held(&(wdev)->mtx) - static inline bool cfg80211_has_monitors_only(struct cfg80211_registered_device *rdev) { lockdep_assert_held(&rdev->wiphy.mtx); @@ -270,7 +294,7 @@ struct ieee80211_channel *channel; } ij; struct { - u8 bssid[ETH_ALEN]; + u8 peer_addr[ETH_ALEN]; const u8 *td_bitmap; u8 td_bitmap_len; } pa; @@ -289,12 +313,17 @@ }; struct cfg80211_cqm_config { + struct rcu_head rcu_head; u32 rssi_hyst; s32 last_rssi_event_value; + enum nl80211_cqm_rssi_threshold_event last_rssi_event_type; int n_rssi_thresholds; - s32 rssi_thresholds[]; + s32 rssi_thresholds[] __counted_by(n_rssi_thresholds); }; +void cfg80211_cqm_rssi_notify_work(struct wiphy *wiphy, + struct wiphy_work *work); + void cfg80211_destroy_ifaces(struct cfg80211_registered_device *rdev); /* free object */ @@ -318,8 +347,6 @@ struct cfg80211_ibss_params *params, struct cfg80211_cached_keys *connkeys); void cfg80211_clear_ibss(struct net_device *dev, bool nowext); -int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, - struct net_device *dev, bool nowext); int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, struct net_device *dev, bool nowext); void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid, @@ -334,8 +361,6 @@ struct net_device *dev, struct mesh_setup *setup, const struct mesh_config *conf); -int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, - struct net_device *dev); int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, struct net_device *dev); int cfg80211_set_mesh_channel(struct cfg80211_registered_device *rdev, @@ -343,21 +368,13 @@ struct cfg80211_chan_def *chandef); /* OCB */ -int __cfg80211_join_ocb(struct cfg80211_registered_device *rdev, - struct net_device *dev, - struct ocb_setup *setup); int cfg80211_join_ocb(struct cfg80211_registered_device *rdev, struct net_device *dev, struct ocb_setup *setup); -int __cfg80211_leave_ocb(struct cfg80211_registered_device *rdev, - struct net_device *dev); int cfg80211_leave_ocb(struct cfg80211_registered_device *rdev, struct net_device *dev); /* AP */ -int __cfg80211_stop_ap(struct cfg80211_registered_device *rdev, - struct net_device *dev, int link, - bool notify); int cfg80211_stop_ap(struct cfg80211_registered_device *rdev, struct net_device *dev, int link, bool notify); @@ -411,7 +428,7 @@ bool wextev); void __cfg80211_roamed(struct wireless_dev *wdev, struct cfg80211_roam_info *info); -void __cfg80211_port_authorized(struct wireless_dev *wdev, const u8 *bssid, +void __cfg80211_port_authorized(struct wireless_dev *wdev, const u8 *peer_addr, const u8 *td_bitmap, u8 td_bitmap_len); int cfg80211_mgd_wext_connect(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); @@ -435,7 +452,7 @@ int cfg80211_validate_key_settings(struct cfg80211_registered_device *rdev, struct key_params *params, int key_idx, bool pairwise, const u8 *mac_addr); -void __cfg80211_scan_done(struct work_struct *wk); +void __cfg80211_scan_done(struct wiphy *wiphy, struct wiphy_work *wk); void ___cfg80211_scan_done(struct cfg80211_registered_device *rdev, bool send_message); void cfg80211_add_sched_scan_req(struct cfg80211_registered_device *rdev, @@ -453,6 +470,8 @@ struct net_device *dev, enum nl80211_iftype ntype, struct vif_params *params); void cfg80211_process_rdev_events(struct cfg80211_registered_device *rdev); +void cfg80211_process_wiphy_works(struct cfg80211_registered_device *rdev, + struct wiphy_work *end); void cfg80211_process_wdev_events(struct wireless_dev *wdev); bool cfg80211_does_bw_fit_range(const struct ieee80211_freq_range *freq_range, @@ -462,29 +481,12 @@ extern struct work_struct cfg80211_disconnect_work; -/** - * cfg80211_chandef_dfs_usable - checks if chandef is DFS usable - * @wiphy: the wiphy to validate against - * @chandef: the channel definition to check - * - * Checks if chandef is usable and we can/need start CAC on such channel. - * - * Return: true if all channels available and at least - * one channel requires CAC (NL80211_DFS_USABLE) - */ -bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, - const struct cfg80211_chan_def *chandef); - void cfg80211_set_dfs_state(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef, enum nl80211_dfs_state dfs_state); void cfg80211_dfs_channels_update_work(struct work_struct *work); -unsigned int -cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, - const struct cfg80211_chan_def *chandef); - void cfg80211_sched_dfs_chan_update(struct cfg80211_registered_device *rdev); int @@ -533,8 +535,6 @@ void cfg80211_update_iface_num(struct cfg80211_registered_device *rdev, enum nl80211_iftype iftype, int num); -void __cfg80211_leave(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev); void cfg80211_leave(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); @@ -559,8 +559,6 @@ #define CFG80211_DEV_WARN_ON(cond) ({bool __r = (cond); __r; }) #endif -void cfg80211_cqm_config_free(struct wireless_dev *wdev); - void cfg80211_release_pmsr(struct wireless_dev *wdev, u32 portid); void cfg80211_pmsr_wdev_down(struct wireless_dev *wdev); void cfg80211_pmsr_free_wk(struct work_struct *work); @@ -569,5 +567,6 @@ void cfg80211_remove_links(struct wireless_dev *wdev); int cfg80211_remove_virtual_intf(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev); +void cfg80211_wdev_release_link_bsses(struct wireless_dev *wdev, u16 link_mask); #endif /* __NET_WIRELESS_CORE_H */ diff -ruw linux-6.4/net/wireless/ibss.c linux-6.4-fbx/net/wireless/ibss.c --- linux-6.4/net/wireless/ibss.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/ibss.c 2024-04-22 13:40:53.163947324 +0200 @@ -3,7 +3,7 @@ * Some IBSS support code for cfg80211. * * Copyright 2009 Johannes Berg - * Copyright (C) 2020-2022 Intel Corporation + * Copyright (C) 2020-2023 Intel Corporation */ #include @@ -93,7 +93,6 @@ int err; lockdep_assert_held(&rdev->wiphy.mtx); - ASSERT_WDEV_LOCK(wdev); if (wdev->u.ibss.ssid_len) return -EALREADY; @@ -151,13 +150,13 @@ return 0; } -static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext) +void cfg80211_clear_ibss(struct net_device *dev, bool nowext) { struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); int i; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); kfree_sensitive(wdev->connect_keys); wdev->connect_keys = NULL; @@ -187,22 +186,13 @@ cfg80211_sched_dfs_chan_update(rdev); } -void cfg80211_clear_ibss(struct net_device *dev, bool nowext) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - - wdev_lock(wdev); - __cfg80211_clear_ibss(dev, nowext); - wdev_unlock(wdev); -} - -int __cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, +int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, struct net_device *dev, bool nowext) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!wdev->u.ibss.ssid_len) return -ENOLINK; @@ -213,24 +203,11 @@ return err; wdev->conn_owner_nlportid = 0; - __cfg80211_clear_ibss(dev, nowext); + cfg80211_clear_ibss(dev, nowext); return 0; } -int cfg80211_leave_ibss(struct cfg80211_registered_device *rdev, - struct net_device *dev, bool nowext) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - int err; - - wdev_lock(wdev); - err = __cfg80211_leave_ibss(rdev, dev, nowext); - wdev_unlock(wdev); - - return err; -} - #ifdef CONFIG_CFG80211_WEXT int cfg80211_ibss_wext_join(struct cfg80211_registered_device *rdev, struct wireless_dev *wdev) @@ -239,7 +216,7 @@ enum nl80211_band band; int i, err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!wdev->wext.ibss.beacon_interval) wdev->wext.ibss.beacon_interval = 100; @@ -336,11 +313,9 @@ if (wdev->wext.ibss.chandef.chan == chan) return 0; - wdev_lock(wdev); err = 0; if (wdev->u.ibss.ssid_len) - err = __cfg80211_leave_ibss(rdev, dev, true); - wdev_unlock(wdev); + err = cfg80211_leave_ibss(rdev, dev, true); if (err) return err; @@ -354,11 +329,7 @@ wdev->wext.ibss.channel_fixed = false; } - wdev_lock(wdev); - err = cfg80211_ibss_wext_join(rdev, wdev); - wdev_unlock(wdev); - - return err; + return cfg80211_ibss_wext_join(rdev, wdev); } int cfg80211_ibss_wext_giwfreq(struct net_device *dev, @@ -372,12 +343,10 @@ if (WARN_ON(wdev->iftype != NL80211_IFTYPE_ADHOC)) return -EINVAL; - wdev_lock(wdev); if (wdev->u.ibss.current_bss) chan = wdev->u.ibss.current_bss->pub.channel; else if (wdev->wext.ibss.chandef.chan) chan = wdev->wext.ibss.chandef.chan; - wdev_unlock(wdev); if (chan) { freq->m = chan->center_freq; @@ -405,11 +374,9 @@ if (!rdev->ops->join_ibss) return -EOPNOTSUPP; - wdev_lock(wdev); err = 0; if (wdev->u.ibss.ssid_len) - err = __cfg80211_leave_ibss(rdev, dev, true); - wdev_unlock(wdev); + err = cfg80211_leave_ibss(rdev, dev, true); if (err) return err; @@ -422,11 +389,7 @@ wdev->wext.ibss.ssid = wdev->u.ibss.ssid; wdev->wext.ibss.ssid_len = len; - wdev_lock(wdev); - err = cfg80211_ibss_wext_join(rdev, wdev); - wdev_unlock(wdev); - - return err; + return cfg80211_ibss_wext_join(rdev, wdev); } int cfg80211_ibss_wext_giwessid(struct net_device *dev, @@ -441,7 +404,6 @@ data->flags = 0; - wdev_lock(wdev); if (wdev->u.ibss.ssid_len) { data->flags = 1; data->length = wdev->u.ibss.ssid_len; @@ -451,7 +413,6 @@ data->length = wdev->wext.ibss.ssid_len; memcpy(ssid, wdev->wext.ibss.ssid, data->length); } - wdev_unlock(wdev); return 0; } @@ -491,11 +452,9 @@ ether_addr_equal(bssid, wdev->wext.ibss.bssid)) return 0; - wdev_lock(wdev); err = 0; if (wdev->u.ibss.ssid_len) - err = __cfg80211_leave_ibss(rdev, dev, true); - wdev_unlock(wdev); + err = cfg80211_leave_ibss(rdev, dev, true); if (err) return err; @@ -506,11 +465,7 @@ } else wdev->wext.ibss.bssid = NULL; - wdev_lock(wdev); - err = cfg80211_ibss_wext_join(rdev, wdev); - wdev_unlock(wdev); - - return err; + return cfg80211_ibss_wext_join(rdev, wdev); } int cfg80211_ibss_wext_giwap(struct net_device *dev, @@ -525,7 +480,6 @@ ap_addr->sa_family = ARPHRD_ETHER; - wdev_lock(wdev); if (wdev->u.ibss.current_bss) memcpy(ap_addr->sa_data, wdev->u.ibss.current_bss->pub.bssid, ETH_ALEN); @@ -534,8 +488,6 @@ else eth_zero_addr(ap_addr->sa_data); - wdev_unlock(wdev); - return 0; } #endif diff -ruw linux-6.4/net/wireless/mesh.c linux-6.4-fbx/net/wireless/mesh.c --- linux-6.4/net/wireless/mesh.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/mesh.c 2024-04-22 13:40:53.163947324 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 /* * Portions - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation */ #include #include @@ -109,7 +109,7 @@ BUILD_BUG_ON(IEEE80211_MAX_SSID_LEN != IEEE80211_MAX_MESH_ID_LEN); - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) return -EOPNOTSUPP; @@ -172,7 +172,6 @@ * basic rates */ if (!setup->basic_rates) { - enum nl80211_bss_scan_width scan_width; struct ieee80211_supported_band *sband = rdev->wiphy.bands[setup->chandef.chan->band]; @@ -193,9 +192,7 @@ } } } else { - scan_width = cfg80211_chandef_to_scan_width(&setup->chandef); - setup->basic_rates = ieee80211_mandatory_rates(sband, - scan_width); + setup->basic_rates = ieee80211_mandatory_rates(sband); } } @@ -257,13 +254,13 @@ return 0; } -int __cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, +int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, struct net_device *dev) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_MESH_POINT) return -EOPNOTSUPP; @@ -287,16 +284,3 @@ return err; } - -int cfg80211_leave_mesh(struct cfg80211_registered_device *rdev, - struct net_device *dev) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - int err; - - wdev_lock(wdev); - err = __cfg80211_leave_mesh(rdev, dev); - wdev_unlock(wdev); - - return err; -} diff -ruw linux-6.4/net/wireless/mlme.c linux-6.4-fbx/net/wireless/mlme.c --- linux-6.4/net/wireless/mlme.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/mlme.c 2024-04-22 13:40:53.163947324 +0200 @@ -4,7 +4,7 @@ * * Copyright (c) 2009, Jouni Malinen * Copyright (c) 2015 Intel Deutschland GmbH - * Copyright (C) 2019-2020, 2022 Intel Corporation + * Copyright (C) 2019-2020, 2022-2023 Intel Corporation */ #include @@ -22,7 +22,7 @@ void cfg80211_rx_assoc_resp(struct net_device *dev, - struct cfg80211_rx_assoc_resp *data) + struct cfg80211_rx_assoc_resp_data *data) { struct wireless_dev *wdev = dev->ieee80211_ptr; struct wiphy *wiphy = wdev->wiphy; @@ -43,16 +43,18 @@ for (link_id = 0; link_id < ARRAY_SIZE(data->links); link_id++) { cr.links[link_id].status = data->links[link_id].status; + cr.links[link_id].bss = data->links[link_id].bss; + WARN_ON_ONCE(cr.links[link_id].status != WLAN_STATUS_SUCCESS && (!cr.ap_mld_addr || !cr.links[link_id].bss)); - cr.links[link_id].bss = data->links[link_id].bss; if (!cr.links[link_id].bss) continue; cr.links[link_id].bssid = data->links[link_id].bss->bssid; cr.links[link_id].addr = data->links[link_id].addr; /* need to have local link addresses for MLO connections */ - WARN_ON(cr.ap_mld_addr && !cr.links[link_id].addr); + WARN_ON(cr.ap_mld_addr && + !is_valid_ether_addr(cr.links[link_id].addr)); BUG_ON(!cr.links[link_id].bss->channel); @@ -149,7 +151,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; struct ieee80211_mgmt *mgmt = (void *)buf; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); trace_cfg80211_rx_mlme_mgmt(dev, buf, len); @@ -214,7 +216,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; struct ieee80211_mgmt *mgmt = (void *)buf; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); trace_cfg80211_tx_mlme_mgmt(dev, buf, len, reconnect); @@ -262,7 +264,7 @@ { struct wireless_dev *wdev = dev->ieee80211_ptr; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!req->bss) return -ENOENT; @@ -281,6 +283,11 @@ ether_addr_equal(req->bss->bssid, wdev->u.client.connected_addr)) return -EALREADY; + if (ether_addr_equal(req->bss->bssid, dev->dev_addr) || + (req->link_id >= 0 && + ether_addr_equal(req->ap_mld_addr, dev->dev_addr))) + return -EINVAL; + return rdev_auth(rdev, dev, req); } @@ -326,7 +333,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; int err, i, j; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); for (i = 1; i < ARRAY_SIZE(req->links); i++) { if (!req->links[i].bss) @@ -335,6 +342,9 @@ if (req->links[i].bss == req->links[j].bss) return -EINVAL; } + + if (ether_addr_equal(req->links[i].bss->bssid, dev->dev_addr)) + return -EINVAL; } if (wdev->connected && @@ -342,6 +352,11 @@ !ether_addr_equal(wdev->u.client.connected_addr, req->prev_bssid))) return -EALREADY; + if ((req->bss && ether_addr_equal(req->bss->bssid, dev->dev_addr)) || + (req->link_id >= 0 && + ether_addr_equal(req->ap_mld_addr, dev->dev_addr))) + return -EINVAL; + cfg80211_oper_and_ht_capa(&req->ht_capa_mask, rdev->wiphy.ht_capa_mod_mask); cfg80211_oper_and_vht_capa(&req->vht_capa_mask, @@ -380,7 +395,7 @@ .local_state_change = local_state_change, }; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (local_state_change && (!wdev->connected || @@ -410,7 +425,7 @@ }; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!wdev->connected) return -ENOTCONN; @@ -433,7 +448,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; u8 bssid[ETH_ALEN]; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!rdev->ops->deauth) return; @@ -713,6 +728,8 @@ const struct ieee80211_mgmt *mgmt; u16 stype; + lockdep_assert_wiphy(&rdev->wiphy); + if (!wdev->wiphy->mgmt_stypes) return -EOPNOTSUPP; @@ -735,8 +752,6 @@ mgmt->u.action.category != WLAN_CATEGORY_PUBLIC) { int err = 0; - wdev_lock(wdev); - switch (wdev->iftype) { case NL80211_IFTYPE_ADHOC: /* @@ -801,7 +816,6 @@ err = -EOPNOTSUPP; break; } - wdev_unlock(wdev); if (err) return err; diff -ruw linux-6.4/net/wireless/nl80211.c linux-6.4-fbx/net/wireless/nl80211.c --- linux-6.4/net/wireless/nl80211.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/nl80211.c 2024-04-22 13:40:53.167947433 +0200 @@ -5,7 +5,7 @@ * Copyright 2006-2010 Johannes Berg * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2015-2017 Intel Deutschland GmbH - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation */ #include @@ -106,7 +106,7 @@ ASSERT_RTNL(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { struct wireless_dev *wdev; if (wiphy_net(&rdev->wiphy) != netns) @@ -323,6 +323,7 @@ [NL80211_PMSR_FTM_REQ_ATTR_TRIGGER_BASED] = { .type = NLA_FLAG }, [NL80211_PMSR_FTM_REQ_ATTR_NON_TRIGGER_BASED] = { .type = NLA_FLAG }, [NL80211_PMSR_FTM_REQ_ATTR_LMR_FEEDBACK] = { .type = NLA_FLAG }, + [NL80211_PMSR_FTM_REQ_ATTR_BSS_COLOR] = { .type = NLA_U8 }, }; static const struct nla_policy @@ -816,6 +817,7 @@ [NL80211_ATTR_MAX_HW_TIMESTAMP_PEERS] = { .type = NLA_U16 }, [NL80211_ATTR_HW_TIMESTAMP_ENABLED] = { .type = NLA_FLAG }, [NL80211_ATTR_EMA_RNR_ELEMS] = { .type = NLA_NESTED }, + [NL80211_ATTR_MLO_LINK_DISABLED] = { .type = NLA_FLAG }, }; /* policy for the key attributes */ @@ -1113,6 +1115,10 @@ if (nla_put_u32(msg, NL80211_FREQUENCY_ATTR_OFFSET, chan->freq_offset)) goto nla_put_failure; + if ((chan->flags & IEEE80211_CHAN_PSD) && + nla_put_s8(msg, NL80211_FREQUENCY_ATTR_PSD, chan->psd)) + goto nla_put_failure; + if ((chan->flags & IEEE80211_CHAN_DISABLED) && nla_put_flag(msg, NL80211_FREQUENCY_ATTR_DISABLED)) goto nla_put_failure; @@ -1542,7 +1548,7 @@ static int nl80211_key_allowed(struct wireless_dev *wdev) { - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); switch (wdev->iftype) { case NL80211_IFTYPE_AP: @@ -3073,7 +3079,7 @@ cb->args[0] = (long)state; } - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (!net_eq(wiphy_net(&rdev->wiphy), sock_net(skb->sk))) continue; if (++idx <= state->start) @@ -3081,6 +3087,7 @@ if (state->filter_wiphy != -1 && state->filter_wiphy != rdev->wiphy_idx) continue; + wiphy_lock(&rdev->wiphy); /* attempt to fit multiple wiphy data chunks into the skb */ do { ret = nl80211_send_wiphy(rdev, NL80211_CMD_NEW_WIPHY, @@ -3107,6 +3114,7 @@ cb->min_dump_alloc < 4096) { cb->min_dump_alloc = 4096; state->split_start = 0; + wiphy_unlock(&rdev->wiphy); rtnl_unlock(); return 1; } @@ -3114,6 +3122,7 @@ break; } } while (state->split_start > 0); + wiphy_unlock(&rdev->wiphy); break; } rtnl_unlock(); @@ -3418,13 +3427,8 @@ struct cfg80211_registered_device *rdev = info->user_ptr[0]; int link_id = nl80211_link_id_or_invalid(info->attrs); struct net_device *netdev = info->user_ptr[1]; - int ret; - - wdev_lock(netdev->ieee80211_ptr); - ret = __nl80211_set_channel(rdev, netdev, info, link_id); - wdev_unlock(netdev->ieee80211_ptr); - return ret; + return __nl80211_set_channel(rdev, netdev, info, link_id); } static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) @@ -3504,6 +3508,7 @@ } if (netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && + netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_MONITOR && netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) { result = -EINVAL; goto out; @@ -3531,7 +3536,6 @@ txq_params.link_id = nl80211_link_id_or_invalid(info->attrs); - wdev_lock(netdev->ieee80211_ptr); if (txq_params.link_id >= 0 && !(netdev->ieee80211_ptr->valid_links & BIT(txq_params.link_id))) @@ -3542,7 +3546,6 @@ else result = rdev_set_txq_params(rdev, netdev, &txq_params); - wdev_unlock(netdev->ieee80211_ptr); if (result) goto out; } @@ -3552,12 +3555,10 @@ int link_id = nl80211_link_id_or_invalid(info->attrs); if (wdev) { - wdev_lock(wdev); result = __nl80211_set_channel( rdev, nl80211_can_set_dev_channel(wdev) ? netdev : NULL, info, link_id); - wdev_unlock(wdev); } else { result = __nl80211_set_channel(rdev, netdev, info, link_id); } @@ -3865,33 +3866,31 @@ goto nla_put_failure; } - wdev_lock(wdev); switch (wdev->iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: if (wdev->u.ap.ssid_len && nla_put(msg, NL80211_ATTR_SSID, wdev->u.ap.ssid_len, wdev->u.ap.ssid)) - goto nla_put_failure_locked; + goto nla_put_failure; break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: if (wdev->u.client.ssid_len && nla_put(msg, NL80211_ATTR_SSID, wdev->u.client.ssid_len, wdev->u.client.ssid)) - goto nla_put_failure_locked; + goto nla_put_failure; break; case NL80211_IFTYPE_ADHOC: if (wdev->u.ibss.ssid_len && nla_put(msg, NL80211_ATTR_SSID, wdev->u.ibss.ssid_len, wdev->u.ibss.ssid)) - goto nla_put_failure_locked; + goto nla_put_failure; break; default: /* nothing */ break; } - wdev_unlock(wdev); if (rdev->ops->get_txq_stats) { struct cfg80211_txq_stats txqstats = {}; @@ -3938,8 +3937,6 @@ genlmsg_end(msg, hdr); return 0; - nla_put_failure_locked: - wdev_unlock(wdev); nla_put_failure: genlmsg_cancel(msg, hdr); return -EMSGSIZE; @@ -3980,7 +3977,7 @@ filter_wiphy = cb->args[2] - 1; } - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (!net_eq(wiphy_net(&rdev->wiphy), sock_net(skb->sk))) continue; if (wp_idx < wp_start) { @@ -4186,7 +4183,6 @@ if (netif_running(dev)) return -EBUSY; - wdev_lock(wdev); BUILD_BUG_ON(IEEE80211_MAX_SSID_LEN != IEEE80211_MAX_MESH_ID_LEN); wdev->u.mesh.id_up_len = @@ -4194,7 +4190,6 @@ memcpy(wdev->u.mesh.id, nla_data(info->attrs[NL80211_ATTR_MESH_ID]), wdev->u.mesh.id_up_len); - wdev_unlock(wdev); } if (info->attrs[NL80211_ATTR_4ADDR]) { @@ -4295,7 +4290,6 @@ case NL80211_IFTYPE_MESH_POINT: if (!info->attrs[NL80211_ATTR_MESH_ID]) break; - wdev_lock(wdev); BUILD_BUG_ON(IEEE80211_MAX_SSID_LEN != IEEE80211_MAX_MESH_ID_LEN); wdev->u.mesh.id_up_len = @@ -4303,7 +4297,6 @@ memcpy(wdev->u.mesh.id, nla_data(info->attrs[NL80211_ATTR_MESH_ID]), wdev->u.mesh.id_up_len); - wdev_unlock(wdev); break; case NL80211_IFTYPE_NAN: case NL80211_IFTYPE_P2P_DEVICE: @@ -4594,79 +4587,67 @@ !(key.p.mode == NL80211_KEY_SET_TX)) return -EINVAL; - wdev_lock(wdev); - if (key.def) { - if (!rdev->ops->set_default_key) { - err = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_default_key) + return -EOPNOTSUPP; err = nl80211_key_allowed(wdev); if (err) - goto out; + return err; err = nl80211_validate_key_link_id(info, wdev, link_id, false); if (err) - goto out; + return err; err = rdev_set_default_key(rdev, dev, link_id, key.idx, key.def_uni, key.def_multi); if (err) - goto out; + return err; #ifdef CONFIG_CFG80211_WEXT wdev->wext.default_key = key.idx; #endif + return 0; } else if (key.defmgmt) { - if (key.def_uni || !key.def_multi) { - err = -EINVAL; - goto out; - } + if (key.def_uni || !key.def_multi) + return -EINVAL; - if (!rdev->ops->set_default_mgmt_key) { - err = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_default_mgmt_key) + return -EOPNOTSUPP; err = nl80211_key_allowed(wdev); if (err) - goto out; + return err; err = nl80211_validate_key_link_id(info, wdev, link_id, false); if (err) - goto out; + return err; err = rdev_set_default_mgmt_key(rdev, dev, link_id, key.idx); if (err) - goto out; + return err; #ifdef CONFIG_CFG80211_WEXT wdev->wext.default_mgmt_key = key.idx; #endif + return 0; } else if (key.defbeacon) { - if (key.def_uni || !key.def_multi) { - err = -EINVAL; - goto out; - } + if (key.def_uni || !key.def_multi) + return -EINVAL; - if (!rdev->ops->set_default_beacon_key) { - err = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_default_beacon_key) + return -EOPNOTSUPP; err = nl80211_key_allowed(wdev); if (err) - goto out; + return err; err = nl80211_validate_key_link_id(info, wdev, link_id, false); if (err) - goto out; + return err; - err = rdev_set_default_beacon_key(rdev, dev, link_id, key.idx); - if (err) - goto out; + return rdev_set_default_beacon_key(rdev, dev, link_id, key.idx); } else if (key.p.mode == NL80211_KEY_SET_TX && wiphy_ext_feature_isset(&rdev->wiphy, NL80211_EXT_FEATURE_EXT_KEY_ID)) { @@ -4675,25 +4656,19 @@ if (info->attrs[NL80211_ATTR_MAC]) mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]); - if (!mac_addr || key.idx < 0 || key.idx > 1) { - err = -EINVAL; - goto out; - } + if (!mac_addr || key.idx < 0 || key.idx > 1) + return -EINVAL; err = nl80211_validate_key_link_id(info, wdev, link_id, true); if (err) - goto out; + return err; - err = rdev_add_key(rdev, dev, link_id, key.idx, + return rdev_add_key(rdev, dev, link_id, key.idx, NL80211_KEYTYPE_PAIRWISE, mac_addr, &key.p); - } else { - err = -EINVAL; } - out: - wdev_unlock(wdev); - return err; + return -EINVAL; } static int nl80211_new_key(struct sk_buff *skb, struct genl_info *info) @@ -4746,7 +4721,6 @@ return -EINVAL; } - wdev_lock(wdev); err = nl80211_key_allowed(wdev); if (err) GENL_SET_ERR_MSG(info, "key not allowed"); @@ -4762,7 +4736,6 @@ if (err) GENL_SET_ERR_MSG(info, "key addition failed"); } - wdev_unlock(wdev); return err; } @@ -4803,7 +4776,6 @@ if (!rdev->ops->del_key) return -EOPNOTSUPP; - wdev_lock(wdev); err = nl80211_key_allowed(wdev); if (key.type == NL80211_KEYTYPE_GROUP && mac_addr && @@ -4827,7 +4799,6 @@ wdev->wext.default_mgmt_key = -1; } #endif - wdev_unlock(wdev); return err; } @@ -4885,13 +4856,12 @@ acl = kzalloc(struct_size(acl, mac_addrs, n_entries), GFP_KERNEL); if (!acl) return ERR_PTR(-ENOMEM); + acl->n_acl_entries = n_entries; nla_for_each_nested(attr, info->attrs[NL80211_ATTR_MAC_ADDRS], tmp) { memcpy(acl->mac_addrs[i].addr, nla_data(attr), ETH_ALEN); i++; } - - acl->n_acl_entries = n_entries; acl->acl_policy = acl_policy; return acl; @@ -5129,6 +5099,106 @@ return true; } +static int eht_build_mcs_mask(struct genl_info *info, + const struct ieee80211_sta_he_cap *he_cap, + const struct ieee80211_sta_eht_cap *eht_cap, + u16 *mcs_mask) +{ + struct net_device *dev = info->user_ptr[1]; + struct wireless_dev *wdev = dev->ieee80211_ptr; + u8 mcs_nss_len, nss, mcs_7 = 0, mcs_9 = 0, mcs_11 = 0, mcs_13 = 0; + bool mcs_14 = false, mcs_15 = false; + + mcs_nss_len = ieee80211_eht_mcs_nss_size(&he_cap->he_cap_elem, + &eht_cap->eht_cap_elem, + wdev->iftype == + NL80211_IFTYPE_STATION); + + if (eht_cap->eht_cap_elem.phy_cap_info[6] & + IEEE80211_EHT_PHY_CAP6_EHT_DUP_6GHZ_SUPP) + mcs_14 = true; + + if (eht_cap->eht_cap_elem.phy_cap_info[6] & + IEEE80211_EHT_PHY_CAP6_MCS15_SUPP_MASK) + mcs_15 = true; + + if (mcs_nss_len == 4) { + const struct ieee80211_eht_mcs_nss_supp_20mhz_only *mcs = + &eht_cap->eht_mcs_nss_supp.only_20mhz; + + mcs_7 = mcs->rx_tx_mcs7_max_nss; + mcs_9 = mcs->rx_tx_mcs9_max_nss; + mcs_11 = mcs->rx_tx_mcs11_max_nss; + mcs_13 = mcs->rx_tx_mcs13_max_nss; + } else { + const struct ieee80211_eht_mcs_nss_supp_bw *mcs; + enum nl80211_chan_width width; + + switch (wdev->iftype) { + case NL80211_IFTYPE_AP: + width = wdev->u.ap.preset_chandef.width; + break; + case NL80211_IFTYPE_MESH_POINT: + width = wdev->u.mesh.chandef.width; + break; + default: + return -EINVAL; + } + + switch (width) { + case NL80211_CHAN_WIDTH_320: + mcs = &eht_cap->eht_mcs_nss_supp.bw._320; + break; + case NL80211_CHAN_WIDTH_160: + mcs = &eht_cap->eht_mcs_nss_supp.bw._160; + break; + case NL80211_CHAN_WIDTH_80: + case NL80211_CHAN_WIDTH_40: + case NL80211_CHAN_WIDTH_20: + mcs = &eht_cap->eht_mcs_nss_supp.bw._80; + break; + default: + return -EINVAL; + } + + mcs_7 = mcs->rx_tx_mcs9_max_nss; + mcs_9 = mcs->rx_tx_mcs9_max_nss; + mcs_11 = mcs->rx_tx_mcs11_max_nss; + mcs_13 = mcs->rx_tx_mcs13_max_nss; + } + + for (nss = 0; nss < NL80211_EHT_NSS_MAX; nss++) { + if (nss == 0) { + if (mcs_14) + mcs_mask[nss] |= 0x4000; + if (mcs_15) + mcs_mask[nss] |= 0x8000; + } + + if (!mcs_7) + continue; + mcs_mask[nss] |= 0x00FF; + mcs_7--; + + if (!mcs_9) + continue; + mcs_mask[nss] |= 0x0300; + mcs_9--; + + if (!mcs_11) + continue; + mcs_mask[nss] |= 0x0C00; + mcs_11--; + + if (!mcs_13) + continue; + mcs_mask[nss] |= 0x3000; + mcs_13--; + } + + return 0; +} + static int nl80211_parse_tx_bitrate_mask(struct genl_info *info, struct nlattr *attrs[], enum nl80211_attrs attr, @@ -5149,6 +5219,7 @@ /* Default to all rates enabled */ for (i = 0; i < NUM_NL80211_BANDS; i++) { const struct ieee80211_sta_he_cap *he_cap; + const struct ieee80211_sta_eht_cap *eht_cap; if (!default_all_enabled) break; @@ -5175,6 +5246,13 @@ he_tx_mcs_map = he_get_txmcsmap(info, link_id, he_cap); he_build_mcs_mask(he_tx_mcs_map, mask->control[i].he_mcs); + eht_cap = ieee80211_get_eht_iftype_cap(sband, wdev->iftype); + if (!eht_cap) + continue; + + eht_build_mcs_mask(info, he_cap, eht_cap, + mask->control[i].eht_mcs); + mask->control[i].he_gi = 0xFF; mask->control[i].he_ltf = 0xFF; } @@ -5254,7 +5332,8 @@ */ if (!(rdev->wiphy.bands[band]->ht_cap.ht_supported || rdev->wiphy.bands[band]->vht_cap.vht_supported || - ieee80211_get_he_iftype_cap(sband, wdev->iftype))) + ieee80211_get_he_iftype_cap(sband, wdev->iftype) || + ieee80211_get_eht_iftype_cap(sband, wdev->iftype))) return -EINVAL; for (i = 0; i < IEEE80211_HT_MCS_MASK_LEN; i++) @@ -5269,6 +5348,10 @@ if (mask->control[band].he_mcs[i]) goto out; + for (i = 0; i < NL80211_EHT_NSS_MAX; i++) + if (mask->control[band].eht_mcs[i]) + goto out; + /* legacy and mcs rates may not be both empty */ return -EINVAL; } @@ -5426,19 +5509,22 @@ if (!wiphy->mbssid_max_interfaces) return ERR_PTR(-EINVAL); - nla_for_each_nested(nl_elems, attrs, rem_elems) + nla_for_each_nested(nl_elems, attrs, rem_elems) { + if (num_elems >= 255) + return ERR_PTR(-EINVAL); num_elems++; + } elems = kzalloc(struct_size(elems, elem, num_elems), GFP_KERNEL); if (!elems) return ERR_PTR(-ENOMEM); + elems->cnt = num_elems; nla_for_each_nested(nl_elems, attrs, rem_elems) { elems->elem[i].data = nla_data(nl_elems); elems->elem[i].len = nla_len(nl_elems); i++; } - elems->cnt = num_elems; return elems; } @@ -5464,13 +5550,13 @@ elems = kzalloc(struct_size(elems, elem, num_elems), GFP_KERNEL); if (!elems) return ERR_PTR(-ENOMEM); + elems->cnt = num_elems; nla_for_each_nested(nl_elems, attrs, rem_elems) { elems->elem[i].data = nla_data(nl_elems); elems->elem[i].len = nla_len(nl_elems); i++; } - elems->cnt = num_elems; return elems; } @@ -5494,6 +5580,7 @@ !nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_DISABLED]); he_bss_color->partial = nla_get_flag(tb[NL80211_HE_BSS_COLOR_ATTR_PARTIAL]); + he_bss_color->collision_detection_enabled = true; return 0; } @@ -5664,11 +5751,10 @@ static int nl80211_parse_fils_discovery(struct cfg80211_registered_device *rdev, struct nlattr *attrs, - struct cfg80211_ap_settings *params) + struct cfg80211_fils_discovery *fd) { struct nlattr *tb[NL80211_FILS_DISCOVERY_ATTR_MAX + 1]; int ret; - struct cfg80211_fils_discovery *fd = ¶ms->fils_discovery; if (!wiphy_ext_feature_isset(&rdev->wiphy, NL80211_EXT_FEATURE_FILS_DISCOVERY)) @@ -5679,6 +5765,13 @@ if (ret) return ret; + if (!tb[NL80211_FILS_DISCOVERY_ATTR_INT_MIN] && + !tb[NL80211_FILS_DISCOVERY_ATTR_INT_MAX] && + !tb[NL80211_FILS_DISCOVERY_ATTR_TMPL]) { + fd->update = true; + return 0; + } + if (!tb[NL80211_FILS_DISCOVERY_ATTR_INT_MIN] || !tb[NL80211_FILS_DISCOVERY_ATTR_INT_MAX] || !tb[NL80211_FILS_DISCOVERY_ATTR_TMPL]) @@ -5688,19 +5781,17 @@ fd->tmpl = nla_data(tb[NL80211_FILS_DISCOVERY_ATTR_TMPL]); fd->min_interval = nla_get_u32(tb[NL80211_FILS_DISCOVERY_ATTR_INT_MIN]); fd->max_interval = nla_get_u32(tb[NL80211_FILS_DISCOVERY_ATTR_INT_MAX]); - + fd->update = true; return 0; } static int nl80211_parse_unsol_bcast_probe_resp(struct cfg80211_registered_device *rdev, struct nlattr *attrs, - struct cfg80211_ap_settings *params) + struct cfg80211_unsol_bcast_probe_resp *presp) { struct nlattr *tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_MAX + 1]; int ret; - struct cfg80211_unsol_bcast_probe_resp *presp = - ¶ms->unsol_bcast_probe_resp; if (!wiphy_ext_feature_isset(&rdev->wiphy, NL80211_EXT_FEATURE_UNSOL_BCAST_PROBE_RESP)) @@ -5711,6 +5802,12 @@ if (ret) return ret; + if (!tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT] && + !tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL]) { + presp->update = true; + return 0; + } + if (!tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT] || !tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL]) return -EINVAL; @@ -5718,6 +5815,7 @@ presp->tmpl = nla_data(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL]); presp->tmpl_len = nla_len(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_TMPL]); presp->interval = nla_get_u32(tb[NL80211_UNSOL_BCAST_PROBE_RESP_ATTR_INT]); + presp->update = true; return 0; } @@ -5902,6 +6000,21 @@ nlmsg_free(msg); } +static int nl80211_validate_ap_phy_operation(struct cfg80211_ap_settings *params) +{ + struct ieee80211_channel *channel = params->chandef.chan; + + if ((params->he_cap || params->he_oper) && + (channel->flags & IEEE80211_CHAN_NO_HE)) + return -EOPNOTSUPP; + + if ((params->eht_cap || params->eht_oper) && + (channel->flags & IEEE80211_CHAN_NO_EHT)) + return -EOPNOTSUPP; + + return 0; +} + static int nl80211_start_ap(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; @@ -6065,20 +6178,18 @@ goto out; } - wdev_lock(wdev); - if (info->attrs[NL80211_ATTR_TX_RATES]) { err = nl80211_parse_tx_bitrate_mask(info, info->attrs, NL80211_ATTR_TX_RATES, ¶ms->beacon_rate, dev, false, link_id); if (err) - goto out_unlock; + goto out; err = validate_beacon_tx_rate(rdev, params->chandef.chan->band, ¶ms->beacon_rate); if (err) - goto out_unlock; + goto out; } if (info->attrs[NL80211_ATTR_SMPS_MODE]) { @@ -6091,19 +6202,19 @@ if (!(rdev->wiphy.features & NL80211_FEATURE_STATIC_SMPS)) { err = -EINVAL; - goto out_unlock; + goto out; } break; case NL80211_SMPS_DYNAMIC: if (!(rdev->wiphy.features & NL80211_FEATURE_DYNAMIC_SMPS)) { err = -EINVAL; - goto out_unlock; + goto out; } break; default: err = -EINVAL; - goto out_unlock; + goto out; } } else { params->smps_mode = NL80211_SMPS_OFF; @@ -6112,7 +6223,7 @@ params->pbss = nla_get_flag(info->attrs[NL80211_ATTR_PBSS]); if (params->pbss && !rdev->wiphy.bands[NL80211_BAND_60GHZ]) { err = -EOPNOTSUPP; - goto out_unlock; + goto out; } if (info->attrs[NL80211_ATTR_ACL_POLICY]) { @@ -6120,7 +6231,7 @@ if (IS_ERR(params->acl)) { err = PTR_ERR(params->acl); params->acl = NULL; - goto out_unlock; + goto out; } } @@ -6132,23 +6243,23 @@ info->attrs[NL80211_ATTR_HE_OBSS_PD], ¶ms->he_obss_pd); if (err) - goto out_unlock; + goto out; } if (info->attrs[NL80211_ATTR_FILS_DISCOVERY]) { err = nl80211_parse_fils_discovery(rdev, info->attrs[NL80211_ATTR_FILS_DISCOVERY], - params); + ¶ms->fils_discovery); if (err) - goto out_unlock; + goto out; } if (info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP]) { err = nl80211_parse_unsol_bcast_probe_resp( rdev, info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP], - params); + ¶ms->unsol_bcast_probe_resp); if (err) - goto out_unlock; + goto out; } if (info->attrs[NL80211_ATTR_MBSSID_CONFIG]) { @@ -6159,17 +6270,21 @@ params->beacon.mbssid_ies->cnt : 0); if (err) - goto out_unlock; + goto out; } if (!params->mbssid_config.ema && params->beacon.rnr_ies) { err = -EINVAL; - goto out_unlock; + goto out; } err = nl80211_calculate_ap_params(params); if (err) - goto out_unlock; + goto out; + + err = nl80211_validate_ap_phy_operation(params); + if (err) + goto out; if (info->attrs[NL80211_ATTR_AP_SETTINGS_FLAGS]) params->flags = nla_get_u32( @@ -6181,7 +6296,7 @@ info->attrs[NL80211_ATTR_SOCKET_OWNER] && wdev->conn_owner_nlportid != info->snd_portid) { err = -EINVAL; - goto out_unlock; + goto out; } /* FIXME: validate MLO/link-id against driver capabilities */ @@ -6199,8 +6314,6 @@ nl80211_send_ap_started(wdev, link_id); } -out_unlock: - wdev_unlock(wdev); out: kfree(params->acl); kfree(params->beacon.mbssid_ies); @@ -6220,7 +6333,8 @@ unsigned int link_id = nl80211_link_id(info->attrs); struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; - struct cfg80211_beacon_data params; + struct cfg80211_ap_update *params; + struct nlattr *attr; int err; if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && @@ -6233,17 +6347,37 @@ if (!wdev->links[link_id].ap.beacon_interval) return -EINVAL; - err = nl80211_parse_beacon(rdev, info->attrs, ¶ms, info->extack); + params = kzalloc(sizeof(*params), GFP_KERNEL); + if (!params) + return -ENOMEM; + + err = nl80211_parse_beacon(rdev, info->attrs, ¶ms->beacon, + info->extack); if (err) goto out; - wdev_lock(wdev); - err = rdev_change_beacon(rdev, dev, ¶ms); - wdev_unlock(wdev); + attr = info->attrs[NL80211_ATTR_FILS_DISCOVERY]; + if (attr) { + err = nl80211_parse_fils_discovery(rdev, attr, + ¶ms->fils_discovery); + if (err) + goto out; + } + + attr = info->attrs[NL80211_ATTR_UNSOL_BCAST_PROBE_RESP]; + if (attr) { + err = nl80211_parse_unsol_bcast_probe_resp(rdev, attr, + ¶ms->unsol_bcast_probe_resp); + if (err) + goto out; + } + + err = rdev_change_beacon(rdev, dev, params); out: - kfree(params.mbssid_ies); - kfree(params.rnr_ies); + kfree(params->beacon.mbssid_ies); + kfree(params->beacon.rnr_ies); + kfree(params); return err; } @@ -6365,12 +6499,27 @@ return false; switch (info->bw) { + case RATE_INFO_BW_1: + rate_flg = NL80211_RATE_INFO_1_MHZ_WIDTH; + break; + case RATE_INFO_BW_2: + rate_flg = NL80211_RATE_INFO_2_MHZ_WIDTH; + break; + case RATE_INFO_BW_4: + rate_flg = NL80211_RATE_INFO_4_MHZ_WIDTH; + break; case RATE_INFO_BW_5: rate_flg = NL80211_RATE_INFO_5_MHZ_WIDTH; break; + case RATE_INFO_BW_8: + rate_flg = NL80211_RATE_INFO_8_MHZ_WIDTH; + break; case RATE_INFO_BW_10: rate_flg = NL80211_RATE_INFO_10_MHZ_WIDTH; break; + case RATE_INFO_BW_16: + rate_flg = NL80211_RATE_INFO_16_MHZ_WIDTH; + break; default: WARN_ON(1); fallthrough; @@ -6429,6 +6578,14 @@ nla_put_u8(msg, NL80211_RATE_INFO_HE_RU_ALLOC, info->he_ru_alloc)) return false; + } else if (info->flags & RATE_INFO_FLAGS_S1G_MCS) { + if (nla_put_u8(msg, NL80211_RATE_INFO_S1G_MCS, info->mcs)) + return false; + if (nla_put_u8(msg, NL80211_RATE_INFO_S1G_NSS, info->nss)) + return false; + if (info->flags & RATE_INFO_FLAGS_SHORT_GI && + nla_put_flag(msg, NL80211_RATE_INFO_SHORT_GI)) + return false; } else if (info->flags & RATE_INFO_FLAGS_EHT_MCS) { if (nla_put_u8(msg, NL80211_RATE_INFO_EHT_MCS, info->mcs)) return false; @@ -7124,6 +7281,34 @@ return 0; } +static const +struct nla_policy nl80211_sta_info_policy[NL80211_STA_INFO_MAX+1] = { + [NL80211_STA_INFO_EXPECTED_THROUGHPUT] = { .type = NLA_U32 }, +}; + +static int nl80211_parse_sta_info(struct genl_info *info, + struct station_parameters *params) +{ + struct nlattr *tb[NL80211_STA_INFO_MAX + 1]; + + if (!info->attrs[NL80211_ATTR_STA_INFO]) + return 0; + if (nla_parse_nested_deprecated(tb, + NL80211_STA_INFO_MAX, + info->attrs[NL80211_ATTR_STA_INFO], + nl80211_sta_info_policy, + info->extack)) + return -EINVAL; + + if (tb[NL80211_STA_INFO_EXPECTED_THROUGHPUT]) { + params->link_sta_params.tp_overridden = true; + params->link_sta_params.tp_override = + nla_get_u32(tb[NL80211_STA_INFO_EXPECTED_THROUGHPUT]); + } + + return 0; +} + static int nl80211_set_station(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; @@ -7256,6 +7441,10 @@ if (err) return err; + err = nl80211_parse_sta_info(info, ¶ms); + if (err) + return err; + params.vlan = get_vlan(info, rdev); if (IS_ERR(params.vlan)) return PTR_ERR(params.vlan); @@ -7275,9 +7464,7 @@ } /* driver will call cfg80211_check_station_change() */ - wdev_lock(dev->ieee80211_ptr); err = rdev_change_station(rdev, dev, mac_addr, ¶ms); - wdev_unlock(dev->ieee80211_ptr); out_put_vlan: dev_put(params.vlan); @@ -7457,6 +7644,10 @@ (params.link_sta_params.ht_capa || params.link_sta_params.vht_capa)) return -EINVAL; + /* Ensure that HE capabilities are set along with EHT */ + if (params.link_sta_params.eht_capa && !params.link_sta_params.he_capa) + return -EINVAL; + /* When you run into this, adjust the code below for the new flag */ BUILD_BUG_ON(NL80211_STA_FLAG_MAX != 7); @@ -7545,7 +7736,6 @@ /* be aware of params.vlan when changing code here */ - wdev_lock(dev->ieee80211_ptr); if (wdev->valid_links) { if (params.link_sta_params.link_id < 0) { err = -EINVAL; @@ -7563,7 +7753,6 @@ } err = rdev_add_station(rdev, dev, mac_addr, ¶ms); out: - wdev_unlock(dev->ieee80211_ptr); dev_put(params.vlan); return err; } @@ -7573,7 +7762,6 @@ struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; struct station_del_parameters params; - int ret; memset(¶ms, 0, sizeof(params)); @@ -7621,11 +7809,7 @@ params.reason_code = WLAN_REASON_PREV_AUTH_NOT_VALID; } - wdev_lock(dev->ieee80211_ptr); - ret = rdev_del_station(rdev, dev, ¶ms); - wdev_unlock(dev->ieee80211_ptr); - - return ret; + return rdev_del_station(rdev, dev, ¶ms); } static int nl80211_send_mpath(struct sk_buff *msg, u32 portid, u32 seq, @@ -7944,9 +8128,7 @@ { struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; - struct wireless_dev *wdev = dev->ieee80211_ptr; struct bss_parameters params; - int err; memset(¶ms, 0, sizeof(params)); params.link_id = nl80211_link_id_or_invalid(info->attrs); @@ -8009,11 +8191,7 @@ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) return -EOPNOTSUPP; - wdev_lock(wdev); - err = rdev_change_bss(rdev, dev, ¶ms); - wdev_unlock(wdev); - - return err; + return rdev_change_bss(rdev, dev, ¶ms); } static int nl80211_req_set_reg(struct sk_buff *skb, struct genl_info *info) @@ -8084,13 +8262,11 @@ if (!rdev->ops->get_mesh_config) return -EOPNOTSUPP; - wdev_lock(wdev); /* If not connected, get default parameters */ if (!wdev->u.mesh.id_len) memcpy(&cur_params, &default_mesh_config, sizeof(cur_params)); else err = rdev_get_mesh_config(rdev, dev, &cur_params); - wdev_unlock(wdev); if (err) return err; @@ -8452,7 +8628,7 @@ struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; - struct mesh_config cfg; + struct mesh_config cfg = {}; u32 mask; int err; @@ -8466,15 +8642,12 @@ if (err) return err; - wdev_lock(wdev); if (!wdev->u.mesh.id_len) err = -ENOLINK; if (!err) err = rdev_update_mesh_config(rdev, dev, mask, &cfg); - wdev_unlock(wdev); - return err; } @@ -8529,6 +8702,11 @@ reg_rule->dfs_cac_ms)) goto nla_put_failure; + if ((reg_rule->flags & NL80211_RRF_PSD) && + nla_put_s8(msg, NL80211_ATTR_POWER_RULE_PSD, + reg_rule->psd)) + goto nla_put_failure; + nla_nest_end(msg, nl_reg_rule); } @@ -8965,7 +9143,7 @@ unsigned int link_id; bool all_ok = true; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!cfg80211_beaconing_iface_active(wdev)) return true; @@ -9215,7 +9393,6 @@ request->n_channels = i; - wdev_lock(wdev); for (i = 0; i < request->n_channels; i++) { struct ieee80211_channel *chan = request->channels[i]; @@ -9224,12 +9401,10 @@ continue; if (!cfg80211_wdev_on_sub_chan(wdev, chan, true)) { - wdev_unlock(wdev); err = -EBUSY; goto out_free; } } - wdev_unlock(wdev); i = 0; if (n_ssids) { @@ -10235,9 +10410,7 @@ goto free; } - wdev_lock(wdev); err = rdev_channel_switch(rdev, dev, ¶ms); - wdev_unlock(wdev); free: kfree(params.beacon_after.mbssid_ies); @@ -10260,7 +10433,7 @@ void *hdr; struct nlattr *bss; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); hdr = nl80211hdr_put(msg, NETLINK_CB(cb->skb).portid, seq, flags, NL80211_CMD_NEW_SCAN_RESULTS); @@ -10323,7 +10496,6 @@ nla_put_u32(msg, NL80211_BSS_FREQUENCY, res->channel->center_freq) || nla_put_u32(msg, NL80211_BSS_FREQUENCY_OFFSET, res->channel->freq_offset) || - nla_put_u32(msg, NL80211_BSS_CHAN_WIDTH, res->scan_width) || nla_put_u32(msg, NL80211_BSS_SEEN_MS_AGO, jiffies_to_msecs(jiffies - intbss->ts))) goto nla_put_failure; @@ -10409,7 +10581,6 @@ /* nl80211_prepare_wdev_dump acquired it in the successful case */ __acquire(&rdev->wiphy.mtx); - wdev_lock(wdev); spin_lock_bh(&rdev->bss_lock); /* @@ -10435,7 +10606,6 @@ } spin_unlock_bh(&rdev->bss_lock); - wdev_unlock(wdev); cb->args[2] = idx; wiphy_unlock(&rdev->wiphy); @@ -10558,9 +10728,7 @@ } while (1) { - wdev_lock(wdev); res = rdev_dump_survey(rdev, wdev->netdev, survey_idx, &survey); - wdev_unlock(wdev); if (res == -ENOENT) break; if (res) @@ -10733,9 +10901,7 @@ if (!req.bss) return -ENOENT; - wdev_lock(dev->ieee80211_ptr); err = cfg80211_mlme_auth(rdev, dev, &req); - wdev_unlock(dev->ieee80211_ptr); cfg80211_put_bss(&rdev->wiphy, req.bss); @@ -10945,7 +11111,8 @@ if (cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, req.ie, req.ie_len)) { - GENL_SET_ERR_MSG(info, + NL_SET_ERR_MSG_ATTR(info->extack, + info->attrs[NL80211_ATTR_IE], "non-inheritance makes no sense"); return -EINVAL; } @@ -11071,6 +11238,7 @@ if (!attrs[NL80211_ATTR_MLO_LINK_ID]) { err = -EINVAL; + NL_SET_BAD_ATTR(info->extack, link); goto free; } @@ -11078,6 +11246,7 @@ /* cannot use the same link ID again */ if (req.links[link_id].bss) { err = -EINVAL; + NL_SET_BAD_ATTR(info->extack, link); goto free; } req.links[link_id].bss = @@ -11085,6 +11254,8 @@ if (IS_ERR(req.links[link_id].bss)) { err = PTR_ERR(req.links[link_id].bss); req.links[link_id].bss = NULL; + NL_SET_ERR_MSG_ATTR(info->extack, + link, "Error fetching BSS for link"); goto free; } @@ -11097,7 +11268,8 @@ if (cfg80211_find_elem(WLAN_EID_FRAGMENT, req.links[link_id].elems, req.links[link_id].elems_len)) { - GENL_SET_ERR_MSG(info, + NL_SET_ERR_MSG_ATTR(info->extack, + attrs[NL80211_ATTR_IE], "cannot deal with fragmentation"); err = -EINVAL; goto free; @@ -11106,12 +11278,16 @@ if (cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, req.links[link_id].elems, req.links[link_id].elems_len)) { - GENL_SET_ERR_MSG(info, + NL_SET_ERR_MSG_ATTR(info->extack, + attrs[NL80211_ATTR_IE], "cannot deal with non-inheritance"); err = -EINVAL; goto free; } } + + req.links[link_id].disabled = + nla_get_flag(attrs[NL80211_ATTR_MLO_LINK_DISABLED]); } if (!req.links[req.link_id].bss) { @@ -11126,6 +11302,13 @@ goto free; } + if (req.links[req.link_id].disabled) { + GENL_SET_ERR_MSG(info, + "cannot have assoc link disabled"); + err = -EINVAL; + goto free; + } + kfree(attrs); attrs = NULL; } else { @@ -11140,7 +11323,8 @@ err = nl80211_crypto_settings(rdev, info, &req.crypto, 1); if (!err) { - wdev_lock(dev->ieee80211_ptr); + struct nlattr *link; + int rem = 0; err = cfg80211_mlme_assoc(rdev, dev, &req); @@ -11151,7 +11335,33 @@ ap_addr, ETH_ALEN); } - wdev_unlock(dev->ieee80211_ptr); + /* Report error from first problematic link */ + if (info->attrs[NL80211_ATTR_MLO_LINKS]) { + nla_for_each_nested(link, + info->attrs[NL80211_ATTR_MLO_LINKS], + rem) { + struct nlattr *link_id_attr = + nla_find_nested(link, NL80211_ATTR_MLO_LINK_ID); + + if (!link_id_attr) + continue; + + link_id = nla_get_u8(link_id_attr); + + if (link_id == req.link_id) + continue; + + if (!req.links[link_id].error || + WARN_ON(req.links[link_id].error > 0)) + continue; + + WARN_ON(err >= 0); + + NL_SET_BAD_ATTR(info->extack, link); + err = req.links[link_id].error; + break; + } + } } free: @@ -11168,7 +11378,7 @@ struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; const u8 *ie = NULL, *bssid; - int ie_len = 0, err; + int ie_len = 0; u16 reason_code; bool local_state_change; @@ -11204,11 +11414,8 @@ local_state_change = !!info->attrs[NL80211_ATTR_LOCAL_STATE_CHANGE]; - wdev_lock(dev->ieee80211_ptr); - err = cfg80211_mlme_deauth(rdev, dev, bssid, ie, ie_len, reason_code, + return cfg80211_mlme_deauth(rdev, dev, bssid, ie, ie_len, reason_code, local_state_change); - wdev_unlock(dev->ieee80211_ptr); - return err; } static int nl80211_disassociate(struct sk_buff *skb, struct genl_info *info) @@ -11216,7 +11423,7 @@ struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; const u8 *ie = NULL, *bssid; - int ie_len = 0, err; + int ie_len = 0; u16 reason_code; bool local_state_change; @@ -11252,11 +11459,8 @@ local_state_change = !!info->attrs[NL80211_ATTR_LOCAL_STATE_CHANGE]; - wdev_lock(dev->ieee80211_ptr); - err = cfg80211_mlme_disassoc(rdev, dev, bssid, ie, ie_len, reason_code, + return cfg80211_mlme_disassoc(rdev, dev, bssid, ie, ie_len, reason_code, local_state_change); - wdev_unlock(dev->ieee80211_ptr); - return err; } static bool @@ -11434,13 +11638,11 @@ ibss.userspace_handles_dfs = nla_get_flag(info->attrs[NL80211_ATTR_HANDLE_DFS]); - wdev_lock(dev->ieee80211_ptr); err = __cfg80211_join_ibss(rdev, dev, &ibss, connkeys); if (err) kfree_sensitive(connkeys); else if (info->attrs[NL80211_ATTR_SOCKET_OWNER]) dev->ieee80211_ptr->conn_owner_nlportid = info->snd_portid; - wdev_unlock(dev->ieee80211_ptr); return err; } @@ -11973,8 +12175,6 @@ if (nla_get_flag(info->attrs[NL80211_ATTR_MLO_SUPPORT])) connect.flags |= CONNECT_REQ_MLO_SUPPORT; - wdev_lock(dev->ieee80211_ptr); - err = cfg80211_connect(rdev, dev, &connect, connkeys, connect.prev_bssid); if (err) @@ -11989,8 +12189,6 @@ eth_zero_addr(dev->ieee80211_ptr->disconnect_bssid); } - wdev_unlock(dev->ieee80211_ptr); - return err; } @@ -12004,7 +12202,6 @@ bool fils_sk_offload; u32 auth_type; u32 changed = 0; - int ret; if (!rdev->ops->update_connect_params) return -EOPNOTSUPP; @@ -12065,14 +12262,10 @@ changed |= UPDATE_AUTH_TYPE; } - wdev_lock(dev->ieee80211_ptr); if (!wdev->connected) - ret = -ENOLINK; - else - ret = rdev_update_connect_params(rdev, dev, &connect, changed); - wdev_unlock(dev->ieee80211_ptr); + return -ENOLINK; - return ret; + return rdev_update_connect_params(rdev, dev, &connect, changed); } static int nl80211_disconnect(struct sk_buff *skb, struct genl_info *info) @@ -12080,7 +12273,6 @@ struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; u16 reason; - int ret; if (dev->ieee80211_ptr->conn_owner_nlportid && dev->ieee80211_ptr->conn_owner_nlportid != info->snd_portid) @@ -12098,10 +12290,7 @@ dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) return -EOPNOTSUPP; - wdev_lock(dev->ieee80211_ptr); - ret = cfg80211_disconnect(rdev, dev, reason, true); - wdev_unlock(dev->ieee80211_ptr); - return ret; + return cfg80211_disconnect(rdev, dev, reason, true); } static int nl80211_wiphy_netns(struct sk_buff *skb, struct genl_info *info) @@ -12225,6 +12414,7 @@ u32 peer_capability = 0; u16 status_code; u8 *peer; + int link_id; bool initiator; if (!(rdev->wiphy.flags & WIPHY_FLAG_SUPPORTS_TDLS) || @@ -12246,8 +12436,9 @@ if (info->attrs[NL80211_ATTR_TDLS_PEER_CAPABILITY]) peer_capability = nla_get_u32(info->attrs[NL80211_ATTR_TDLS_PEER_CAPABILITY]); + link_id = nl80211_link_id_or_invalid(info->attrs); - return rdev_tdls_mgmt(rdev, dev, peer, action_code, + return rdev_tdls_mgmt(rdev, dev, peer, link_id, action_code, dialog_token, status_code, peer_capability, initiator, nla_data(info->attrs[NL80211_ATTR_IE]), @@ -12310,7 +12501,6 @@ if (err) return err; - wdev_lock(wdev); if (!cfg80211_off_channel_oper_allowed(wdev, chandef.chan)) { const struct cfg80211_chan_def *oper_chandef, *compat_chandef; @@ -12319,7 +12509,6 @@ if (WARN_ON(!oper_chandef)) { /* cannot happen since we must beacon to get here */ WARN_ON(1); - wdev_unlock(wdev); return -EBUSY; } @@ -12327,12 +12516,9 @@ compat_chandef = cfg80211_chandef_compatible(&chandef, oper_chandef); - if (compat_chandef != &chandef) { - wdev_unlock(wdev); + if (compat_chandef != &chandef) return -EBUSY; } - } - wdev_unlock(wdev); msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); if (!msg) @@ -12391,23 +12577,18 @@ unsigned int link_id = nl80211_link_id(info->attrs); struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; - struct wireless_dev *wdev = dev->ieee80211_ptr; int err; if (!rdev->ops->set_bitrate_mask) return -EOPNOTSUPP; - wdev_lock(wdev); err = nl80211_parse_tx_bitrate_mask(info, info->attrs, NL80211_ATTR_TX_RATES, &mask, dev, true, link_id); if (err) - goto out; - - err = rdev_set_bitrate_mask(rdev, dev, link_id, NULL, &mask); -out: - wdev_unlock(wdev); return err; + + return rdev_set_bitrate_mask(rdev, dev, link_id, NULL, &mask); } static int nl80211_register_mgmt(struct sk_buff *skb, struct genl_info *info) @@ -12536,12 +12717,9 @@ if (!chandef.chan && params.offchan) return -EINVAL; - wdev_lock(wdev); if (params.offchan && - !cfg80211_off_channel_oper_allowed(wdev, chandef.chan)) { - wdev_unlock(wdev); + !cfg80211_off_channel_oper_allowed(wdev, chandef.chan)) return -EBUSY; - } params.link_id = nl80211_link_id_or_invalid(info->attrs); /* @@ -12550,11 +12728,8 @@ * to the driver. */ if (params.link_id >= 0 && - !(wdev->valid_links & BIT(params.link_id))) { - wdev_unlock(wdev); + !(wdev->valid_links & BIT(params.link_id))) return -EINVAL; - } - wdev_unlock(wdev); params.buf = nla_data(info->attrs[NL80211_ATTR_FRAME]); params.len = nla_len(info->attrs[NL80211_ATTR_FRAME]); @@ -12754,7 +12929,8 @@ } static int cfg80211_cqm_rssi_update(struct cfg80211_registered_device *rdev, - struct net_device *dev) + struct net_device *dev, + struct cfg80211_cqm_config *cqm_config) { struct wireless_dev *wdev = dev->ieee80211_ptr; s32 last, low, high; @@ -12763,7 +12939,7 @@ int err; /* RSSI reporting disabled? */ - if (!wdev->cqm_config) + if (!cqm_config) return rdev_set_cqm_rssi_range_config(rdev, dev, 0, 0); /* @@ -12772,7 +12948,7 @@ * connection is established and enough beacons received to calculate * the average. */ - if (!wdev->cqm_config->last_rssi_event_value && + if (!cqm_config->last_rssi_event_value && wdev->links[0].client.current_bss && rdev->ops->get_station) { struct station_info sinfo = {}; @@ -12786,30 +12962,30 @@ cfg80211_sinfo_release_content(&sinfo); if (sinfo.filled & BIT_ULL(NL80211_STA_INFO_BEACON_SIGNAL_AVG)) - wdev->cqm_config->last_rssi_event_value = + cqm_config->last_rssi_event_value = (s8) sinfo.rx_beacon_signal_avg; } - last = wdev->cqm_config->last_rssi_event_value; - hyst = wdev->cqm_config->rssi_hyst; - n = wdev->cqm_config->n_rssi_thresholds; + last = cqm_config->last_rssi_event_value; + hyst = cqm_config->rssi_hyst; + n = cqm_config->n_rssi_thresholds; for (i = 0; i < n; i++) { i = array_index_nospec(i, n); - if (last < wdev->cqm_config->rssi_thresholds[i]) + if (last < cqm_config->rssi_thresholds[i]) break; } low_index = i - 1; if (low_index >= 0) { low_index = array_index_nospec(low_index, n); - low = wdev->cqm_config->rssi_thresholds[low_index] - hyst; + low = cqm_config->rssi_thresholds[low_index] - hyst; } else { low = S32_MIN; } if (i < n) { i = array_index_nospec(i, n); - high = wdev->cqm_config->rssi_thresholds[i] + hyst - 1; + high = cqm_config->rssi_thresholds[i] + hyst - 1; } else { high = S32_MAX; } @@ -12822,10 +12998,11 @@ u32 hysteresis) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; + struct cfg80211_cqm_config *cqm_config = NULL, *old; struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; - int i, err; s32 prev = S32_MIN; + int i, err; /* Check all values negative and sorted */ for (i = 0; i < n_thresholds; i++) { @@ -12839,10 +13016,6 @@ wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) return -EOPNOTSUPP; - wdev_lock(wdev); - cfg80211_cqm_config_free(wdev); - wdev_unlock(wdev); - if (n_thresholds <= 1 && rdev->ops->set_cqm_rssi_config) { if (n_thresholds == 0 || thresholds[0] == 0) /* Disabling */ return rdev_set_cqm_rssi_config(rdev, dev, 0, 0); @@ -12858,17 +13031,14 @@ if (n_thresholds == 1 && thresholds[0] == 0) /* Disabling */ n_thresholds = 0; - wdev_lock(wdev); - if (n_thresholds) { - struct cfg80211_cqm_config *cqm_config; + old = wiphy_dereference(wdev->wiphy, wdev->cqm_config); + if (n_thresholds) { cqm_config = kzalloc(struct_size(cqm_config, rssi_thresholds, n_thresholds), GFP_KERNEL); - if (!cqm_config) { - err = -ENOMEM; - goto unlock; - } + if (!cqm_config) + return -ENOMEM; cqm_config->rssi_hyst = hysteresis; cqm_config->n_rssi_thresholds = n_thresholds; @@ -12876,13 +13046,18 @@ flex_array_size(cqm_config, rssi_thresholds, n_thresholds)); - wdev->cqm_config = cqm_config; + rcu_assign_pointer(wdev->cqm_config, cqm_config); + } else { + RCU_INIT_POINTER(wdev->cqm_config, NULL); } - err = cfg80211_cqm_rssi_update(rdev, dev); - -unlock: - wdev_unlock(wdev); + err = cfg80211_cqm_rssi_update(rdev, dev, cqm_config); + if (err) { + rcu_assign_pointer(wdev->cqm_config, old); + kfree_rcu(cqm_config, rcu_head); + } else { + kfree_rcu(old, rcu_head); + } return err; } @@ -13066,11 +13241,9 @@ setup.control_port_over_nl80211 = true; } - wdev_lock(dev->ieee80211_ptr); err = __cfg80211_join_mesh(rdev, dev, &setup, &cfg); if (!err && info->attrs[NL80211_ATTR_SOCKET_OWNER]) dev->ieee80211_ptr->conn_owner_nlportid = info->snd_portid; - wdev_unlock(dev->ieee80211_ptr); return err; } @@ -14014,21 +14187,13 @@ if (tb[NL80211_REKEY_DATA_AKM]) rekey_data.akm = nla_get_u32(tb[NL80211_REKEY_DATA_AKM]); - wdev_lock(wdev); - if (!wdev->connected) { - err = -ENOTCONN; - goto out; - } + if (!wdev->connected) + return -ENOTCONN; - if (!rdev->ops->set_rekey_data) { - err = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_rekey_data) + return -EOPNOTSUPP; - err = rdev_set_rekey_data(rdev, dev, &rekey_data); - out: - wdev_unlock(wdev); - return err; + return rdev_set_rekey_data(rdev, dev, &rekey_data); } static int nl80211_register_unexpected_frame(struct sk_buff *skb, @@ -15232,11 +15397,9 @@ memcpy(qos_map->up, pos, IEEE80211_QOS_MAP_LEN_MIN); } - wdev_lock(dev->ieee80211_ptr); ret = nl80211_key_allowed(dev->ieee80211_ptr); if (!ret) ret = rdev_set_qos_map(rdev, dev, qos_map); - wdev_unlock(dev->ieee80211_ptr); kfree(qos_map); return ret; @@ -15250,7 +15413,6 @@ const u8 *peer; u8 tsid, up; u16 admitted_time = 0; - int err; if (!(rdev->wiphy.features & NL80211_FEATURE_SUPPORTS_WMM_ADMISSION)) return -EOPNOTSUPP; @@ -15280,34 +15442,25 @@ return -EINVAL; } - wdev_lock(wdev); switch (wdev->iftype) { case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: if (wdev->connected) break; - err = -ENOTCONN; - goto out; + return -ENOTCONN; default: - err = -EOPNOTSUPP; - goto out; + return -EOPNOTSUPP; } - err = rdev_add_tx_ts(rdev, dev, tsid, peer, up, admitted_time); - - out: - wdev_unlock(wdev); - return err; + return rdev_add_tx_ts(rdev, dev, tsid, peer, up, admitted_time); } static int nl80211_del_tx_ts(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; - struct wireless_dev *wdev = dev->ieee80211_ptr; const u8 *peer; u8 tsid; - int err; if (!info->attrs[NL80211_ATTR_TSID] || !info->attrs[NL80211_ATTR_MAC]) return -EINVAL; @@ -15315,11 +15468,7 @@ tsid = nla_get_u8(info->attrs[NL80211_ATTR_TSID]); peer = nla_data(info->attrs[NL80211_ATTR_MAC]); - wdev_lock(wdev); - err = rdev_del_tx_ts(rdev, dev, tsid, peer); - wdev_unlock(wdev); - - return err; + return rdev_del_tx_ts(rdev, dev, tsid, peer); } static int nl80211_tdls_channel_switch(struct sk_buff *skb, @@ -15375,11 +15524,7 @@ addr = nla_data(info->attrs[NL80211_ATTR_MAC]); oper_class = nla_get_u8(info->attrs[NL80211_ATTR_OPER_CLASS]); - wdev_lock(wdev); - err = rdev_tdls_channel_switch(rdev, dev, addr, oper_class, &chandef); - wdev_unlock(wdev); - - return err; + return rdev_tdls_channel_switch(rdev, dev, addr, oper_class, &chandef); } static int nl80211_tdls_cancel_channel_switch(struct sk_buff *skb, @@ -15387,7 +15532,6 @@ { struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; - struct wireless_dev *wdev = dev->ieee80211_ptr; const u8 *addr; if (!rdev->ops->tdls_channel_switch || @@ -15408,9 +15552,7 @@ addr = nla_data(info->attrs[NL80211_ATTR_MAC]); - wdev_lock(wdev); rdev_tdls_cancel_channel_switch(rdev, dev, addr); - wdev_unlock(wdev); return 0; } @@ -15443,7 +15585,6 @@ struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_pmk_conf pmk_conf = {}; - int ret; if (wdev->iftype != NL80211_IFTYPE_STATION && wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) @@ -15456,34 +15597,24 @@ if (!info->attrs[NL80211_ATTR_MAC] || !info->attrs[NL80211_ATTR_PMK]) return -EINVAL; - wdev_lock(wdev); - if (!wdev->connected) { - ret = -ENOTCONN; - goto out; - } + if (!wdev->connected) + return -ENOTCONN; pmk_conf.aa = nla_data(info->attrs[NL80211_ATTR_MAC]); - if (memcmp(pmk_conf.aa, wdev->u.client.connected_addr, ETH_ALEN)) { - ret = -EINVAL; - goto out; - } + if (memcmp(pmk_conf.aa, wdev->u.client.connected_addr, ETH_ALEN)) + return -EINVAL; pmk_conf.pmk = nla_data(info->attrs[NL80211_ATTR_PMK]); pmk_conf.pmk_len = nla_len(info->attrs[NL80211_ATTR_PMK]); if (pmk_conf.pmk_len != WLAN_PMK_LEN && - pmk_conf.pmk_len != WLAN_PMK_LEN_SUITE_B_192) { - ret = -EINVAL; - goto out; - } + pmk_conf.pmk_len != WLAN_PMK_LEN_SUITE_B_192) + return -EINVAL; if (info->attrs[NL80211_ATTR_PMKR0_NAME]) pmk_conf.pmk_r0_name = nla_data(info->attrs[NL80211_ATTR_PMKR0_NAME]); - ret = rdev_set_pmk(rdev, dev, &pmk_conf); -out: - wdev_unlock(wdev); - return ret; + return rdev_set_pmk(rdev, dev, &pmk_conf); } static int nl80211_del_pmk(struct sk_buff *skb, struct genl_info *info) @@ -15492,7 +15623,6 @@ struct net_device *dev = info->user_ptr[1]; struct wireless_dev *wdev = dev->ieee80211_ptr; const u8 *aa; - int ret; if (wdev->iftype != NL80211_IFTYPE_STATION && wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) @@ -15505,12 +15635,8 @@ if (!info->attrs[NL80211_ATTR_MAC]) return -EINVAL; - wdev_lock(wdev); aa = nla_data(info->attrs[NL80211_ATTR_MAC]); - ret = rdev_del_pmk(rdev, dev, aa); - wdev_unlock(wdev); - - return ret; + return rdev_del_pmk(rdev, dev, aa); } static int nl80211_external_auth(struct sk_buff *skb, struct genl_info *info) @@ -15584,8 +15710,6 @@ return -EINVAL; } - wdev_lock(wdev); - switch (wdev->iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: @@ -15594,21 +15718,16 @@ case NL80211_IFTYPE_ADHOC: if (wdev->u.ibss.current_bss) break; - err = -ENOTCONN; - goto out; + return -ENOTCONN; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: if (wdev->connected) break; - err = -ENOTCONN; - goto out; + return -ENOTCONN; default: - err = -EOPNOTSUPP; - goto out; + return -EOPNOTSUPP; } - wdev_unlock(wdev); - buf = nla_data(info->attrs[NL80211_ATTR_FRAME]); len = nla_len(info->attrs[NL80211_ATTR_FRAME]); dest = nla_data(info->attrs[NL80211_ATTR_MAC]); @@ -15624,9 +15743,6 @@ if (!err && !dont_wait_for_ack) nl_set_extack_cookie_u64(info->extack, cookie); return err; - out: - wdev_unlock(wdev); - return err; } static int nl80211_get_ftm_responder_stats(struct sk_buff *skb, @@ -15904,8 +16020,6 @@ if (info->attrs[NL80211_ATTR_MAC]) tid_config->peer = nla_data(info->attrs[NL80211_ATTR_MAC]); - wdev_lock(dev->ieee80211_ptr); - nla_for_each_nested(tid, info->attrs[NL80211_ATTR_TID_CONFIG], rem_conf) { ret = nla_parse_nested(attrs, NL80211_TID_CONFIG_ATTR_MAX, @@ -15927,7 +16041,6 @@ bad_tid_conf: kfree(tid_config); - wdev_unlock(dev->ieee80211_ptr); return ret; } @@ -16024,9 +16137,7 @@ params.counter_offset_presp = offset; } - wdev_lock(wdev); err = rdev_color_change(rdev, dev, ¶ms); - wdev_unlock(wdev); out: kfree(params.beacon_next.mbssid_ies); @@ -16082,7 +16193,6 @@ !is_valid_ether_addr(nla_data(info->attrs[NL80211_ATTR_MAC]))) return -EINVAL; - wdev_lock(wdev); wdev->valid_links |= BIT(link_id); ether_addr_copy(wdev->links[link_id].addr, nla_data(info->attrs[NL80211_ATTR_MAC])); @@ -16092,7 +16202,6 @@ wdev->valid_links &= ~BIT(link_id); eth_zero_addr(wdev->links[link_id].addr); } - wdev_unlock(wdev); return ret; } @@ -16114,9 +16223,7 @@ return -EINVAL; } - wdev_lock(wdev); cfg80211_remove_link(wdev, link_id); - wdev_unlock(wdev); return 0; } @@ -16206,14 +16313,10 @@ if (err) return err; - wdev_lock(dev->ieee80211_ptr); if (add) - err = rdev_add_link_station(rdev, dev, ¶ms); - else - err = rdev_mod_link_station(rdev, dev, ¶ms); - wdev_unlock(dev->ieee80211_ptr); + return rdev_add_link_station(rdev, dev, ¶ms); - return err; + return rdev_mod_link_station(rdev, dev, ¶ms); } static int @@ -16234,7 +16337,6 @@ struct link_station_del_parameters params = {}; struct cfg80211_registered_device *rdev = info->user_ptr[0]; struct net_device *dev = info->user_ptr[1]; - int ret; if (!rdev->ops->del_link_station) return -EOPNOTSUPP; @@ -16246,11 +16348,7 @@ params.mld_mac = nla_data(info->attrs[NL80211_ATTR_MLD_ADDR]); params.link_id = nla_get_u8(info->attrs[NL80211_ATTR_MLO_LINK_ID]); - wdev_lock(dev->ieee80211_ptr); - ret = rdev_del_link_station(rdev, dev, ¶ms); - wdev_unlock(dev->ieee80211_ptr); - - return ret; + return rdev_del_link_station(rdev, dev, ¶ms); } static int nl80211_set_hw_timestamp(struct sk_buff *skb, @@ -17114,7 +17212,8 @@ .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, .doit = nl80211_tdls_mgmt, .flags = GENL_UNS_ADMIN_PERM, - .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP), + .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP | + NL80211_FLAG_MLO_VALID_LINK_ID), }, { .cmd = NL80211_CMD_TDLS_OPER, @@ -17851,7 +17950,7 @@ void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev, struct net_device *netdev, - struct cfg80211_rx_assoc_resp *data) + struct cfg80211_rx_assoc_resp_data *data) { nl80211_send_mlme_event(rdev, netdev, data->buf, data->len, NL80211_CMD_ASSOCIATE, GFP_KERNEL, @@ -18176,7 +18275,7 @@ } void nl80211_send_port_authorized(struct cfg80211_registered_device *rdev, - struct net_device *netdev, const u8 *bssid, + struct net_device *netdev, const u8 *peer_addr, const u8 *td_bitmap, u8 td_bitmap_len) { struct sk_buff *msg; @@ -18194,7 +18293,7 @@ if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) || nla_put_u32(msg, NL80211_ATTR_IFINDEX, netdev->ifindex) || - nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, bssid)) + nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, peer_addr)) goto nla_put_failure; if ((td_bitmap_len > 0) && td_bitmap) @@ -18248,6 +18347,76 @@ nlmsg_free(msg); } +void cfg80211_links_removed(struct net_device *dev, u16 link_mask) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + struct wiphy *wiphy = wdev->wiphy; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + struct sk_buff *msg; + struct nlattr *links; + void *hdr; + + lockdep_assert_wiphy(wdev->wiphy); + trace_cfg80211_links_removed(dev, link_mask); + + if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && + wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) + return; + + if (WARN_ON(!wdev->valid_links || !link_mask || + (wdev->valid_links & link_mask) != link_mask || + wdev->valid_links == link_mask)) + return; + + cfg80211_wdev_release_link_bsses(wdev, link_mask); + wdev->valid_links &= ~link_mask; + + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!msg) + return; + + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_LINKS_REMOVED); + if (!hdr) { + nlmsg_free(msg); + return; + } + + if (nla_put_u32(msg, NL80211_ATTR_WIPHY, rdev->wiphy_idx) || + nla_put_u32(msg, NL80211_ATTR_IFINDEX, dev->ifindex)) + goto nla_put_failure; + + links = nla_nest_start(msg, NL80211_ATTR_MLO_LINKS); + if (!links) + goto nla_put_failure; + + while (link_mask) { + struct nlattr *link; + int link_id = __ffs(link_mask); + + link = nla_nest_start(msg, link_id + 1); + if (!link) + goto nla_put_failure; + + if (nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id)) + goto nla_put_failure; + + nla_nest_end(msg, link); + link_mask &= ~(1 << link_id); + } + + nla_nest_end(msg, links); + + genlmsg_end(msg, hdr); + + genlmsg_multicast_netns(&nl80211_fam, wiphy_net(&rdev->wiphy), msg, 0, + NL80211_MCGRP_MLME, GFP_KERNEL); + return; + + nla_put_failure: + nlmsg_free(msg); +} +EXPORT_SYMBOL(cfg80211_links_removed); + void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev, struct net_device *netdev, const u8 *bssid, gfp_t gfp) @@ -18960,9 +19129,8 @@ enum nl80211_cqm_rssi_threshold_event rssi_event, s32 rssi_level, gfp_t gfp) { - struct sk_buff *msg; struct wireless_dev *wdev = dev->ieee80211_ptr; - struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); + struct cfg80211_cqm_config *cqm_config; trace_cfg80211_cqm_rssi_notify(dev, rssi_event, rssi_level); @@ -18970,16 +19138,37 @@ rssi_event != NL80211_CQM_RSSI_THRESHOLD_EVENT_HIGH)) return; - if (wdev->cqm_config) { - wdev->cqm_config->last_rssi_event_value = rssi_level; + rcu_read_lock(); + cqm_config = rcu_dereference(wdev->cqm_config); + if (cqm_config) { + cqm_config->last_rssi_event_value = rssi_level; + cqm_config->last_rssi_event_type = rssi_event; + wiphy_work_queue(wdev->wiphy, &wdev->cqm_rssi_work); + } + rcu_read_unlock(); +} +EXPORT_SYMBOL(cfg80211_cqm_rssi_notify); - cfg80211_cqm_rssi_update(rdev, dev); +void cfg80211_cqm_rssi_notify_work(struct wiphy *wiphy, struct wiphy_work *work) +{ + struct wireless_dev *wdev = container_of(work, struct wireless_dev, + cqm_rssi_work); + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + enum nl80211_cqm_rssi_threshold_event rssi_event; + struct cfg80211_cqm_config *cqm_config; + struct sk_buff *msg; + s32 rssi_level; - if (rssi_level == 0) - rssi_level = wdev->cqm_config->last_rssi_event_value; - } + cqm_config = wiphy_dereference(wdev->wiphy, wdev->cqm_config); + if (!wdev->cqm_config) + return; - msg = cfg80211_prepare_cqm(dev, NULL, gfp); + cfg80211_cqm_rssi_update(rdev, wdev->netdev, cqm_config); + + rssi_level = cqm_config->last_rssi_event_value; + rssi_event = cqm_config->last_rssi_event_type; + + msg = cfg80211_prepare_cqm(wdev->netdev, NULL, GFP_KERNEL); if (!msg) return; @@ -18991,14 +19180,13 @@ rssi_level)) goto nla_put_failure; - cfg80211_send_cqm(msg, gfp); + cfg80211_send_cqm(msg, GFP_KERNEL); return; nla_put_failure: nlmsg_free(msg); } -EXPORT_SYMBOL(cfg80211_cqm_rssi_notify); void cfg80211_cqm_txe_notify(struct net_device *dev, const u8 *peer, u32 num_packets, @@ -19241,7 +19429,7 @@ struct wiphy *wiphy = wdev->wiphy; struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); WARN_INVALID_LINK_ID(wdev, link_id); trace_cfg80211_ch_switch_notify(dev, chandef, link_id, punct_bitmap); @@ -19286,7 +19474,7 @@ struct wiphy *wiphy = wdev->wiphy; struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); WARN_INVALID_LINK_ID(wdev, link_id); trace_cfg80211_ch_switch_started_notify(dev, chandef, link_id, @@ -19309,7 +19497,7 @@ struct sk_buff *msg; void *hdr; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); trace_cfg80211_bss_color_notify(dev, cmd, count, color_bitmap); @@ -19774,7 +19962,8 @@ list) { if (sched_scan_req->owner_nlportid == notify->portid) { sched_scan_req->nl_owner_dead = true; - schedule_work(&rdev->sched_scan_stop_wk); + wiphy_work_queue(&rdev->wiphy, + &rdev->sched_scan_stop_wk); } } diff -ruw linux-6.4/net/wireless/nl80211.h linux-6.4-fbx/net/wireless/nl80211.h --- linux-6.4/net/wireless/nl80211.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/nl80211.h 2024-04-22 13:40:53.167947433 +0200 @@ -60,7 +60,7 @@ const u8 *buf, size_t len, gfp_t gfp); void nl80211_send_rx_assoc(struct cfg80211_registered_device *rdev, struct net_device *netdev, - struct cfg80211_rx_assoc_resp *data); + struct cfg80211_rx_assoc_resp_data *data); void nl80211_send_deauth(struct cfg80211_registered_device *rdev, struct net_device *netdev, const u8 *buf, size_t len, @@ -82,8 +82,11 @@ void nl80211_send_roamed(struct cfg80211_registered_device *rdev, struct net_device *netdev, struct cfg80211_roam_info *info, gfp_t gfp); +/* For STA/GC, indicate port authorized with AP/GO bssid. + * For GO/AP, use peer GC/STA mac_addr. + */ void nl80211_send_port_authorized(struct cfg80211_registered_device *rdev, - struct net_device *netdev, const u8 *bssid, + struct net_device *netdev, const u8 *peer_addr, const u8 *td_bitmap, u8 td_bitmap_len); void nl80211_send_disconnected(struct cfg80211_registered_device *rdev, struct net_device *netdev, u16 reason, @@ -120,6 +123,5 @@ /* peer measurement */ int nl80211_pmsr_start(struct sk_buff *skb, struct genl_info *info); -int nl80211_pmsr_dump_results(struct sk_buff *skb, struct netlink_callback *cb); #endif /* __NET_WIRELESS_NL80211_H */ diff -ruw linux-6.4/net/wireless/ocb.c linux-6.4-fbx/net/wireless/ocb.c --- linux-6.4/net/wireless/ocb.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/ocb.c 2024-04-22 13:40:53.167947433 +0200 @@ -4,7 +4,7 @@ * * Copyright: (c) 2014 Czech Technical University in Prague * (c) 2014 Volkswagen Group Research - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * Author: Rostislav Lisovy * Funded by: Volkswagen Group Research */ @@ -15,14 +15,14 @@ #include "core.h" #include "rdev-ops.h" -int __cfg80211_join_ocb(struct cfg80211_registered_device *rdev, +int cfg80211_join_ocb(struct cfg80211_registered_device *rdev, struct net_device *dev, struct ocb_setup *setup) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_OCB) return -EOPNOTSUPP; @@ -40,27 +40,13 @@ return err; } -int cfg80211_join_ocb(struct cfg80211_registered_device *rdev, - struct net_device *dev, - struct ocb_setup *setup) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - int err; - - wdev_lock(wdev); - err = __cfg80211_join_ocb(rdev, dev, setup); - wdev_unlock(wdev); - - return err; -} - -int __cfg80211_leave_ocb(struct cfg80211_registered_device *rdev, +int cfg80211_leave_ocb(struct cfg80211_registered_device *rdev, struct net_device *dev) { struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_OCB) return -EOPNOTSUPP; @@ -68,22 +54,12 @@ if (!rdev->ops->leave_ocb) return -EOPNOTSUPP; + if (!wdev->u.ocb.chandef.chan) + return -ENOTCONN; + err = rdev_leave_ocb(rdev, dev); if (!err) memset(&wdev->u.ocb.chandef, 0, sizeof(wdev->u.ocb.chandef)); return err; } - -int cfg80211_leave_ocb(struct cfg80211_registered_device *rdev, - struct net_device *dev) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - int err; - - wdev_lock(wdev); - err = __cfg80211_leave_ocb(rdev, dev); - wdev_unlock(wdev); - - return err; -} diff -ruw linux-6.4/net/wireless/pmsr.c linux-6.4-fbx/net/wireless/pmsr.c --- linux-6.4/net/wireless/pmsr.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/pmsr.c 2024-04-22 13:40:53.167947433 +0200 @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* - * Copyright (C) 2018 - 2021 Intel Corporation + * Copyright (C) 2018 - 2021, 2023 Intel Corporation */ #include #include "core.h" @@ -291,6 +291,7 @@ req = kzalloc(struct_size(req, peers, count), GFP_KERNEL); if (!req) return -ENOMEM; + req->n_peers = count; if (info->attrs[NL80211_ATTR_TIMEOUT]) req->timeout = nla_get_u32(info->attrs[NL80211_ATTR_TIMEOUT]); @@ -321,8 +322,6 @@ goto out_err; idx++; } - - req->n_peers = count; req->cookie = cfg80211_assign_cookie(rdev); req->nl_portid = info->snd_portid; @@ -601,7 +600,7 @@ struct cfg80211_pmsr_request *req, *tmp; LIST_HEAD(free_list); - lockdep_assert_held(&wdev->mtx); + lockdep_assert_wiphy(wdev->wiphy); spin_lock_bh(&wdev->pmsr_lock); list_for_each_entry_safe(req, tmp, &wdev->pmsr_list, list) { @@ -623,9 +622,9 @@ struct wireless_dev *wdev = container_of(work, struct wireless_dev, pmsr_free_wk); - wdev_lock(wdev); + wiphy_lock(wdev->wiphy); cfg80211_pmsr_process_abort(wdev); - wdev_unlock(wdev); + wiphy_unlock(wdev->wiphy); } void cfg80211_pmsr_wdev_down(struct wireless_dev *wdev) diff -ruw linux-6.4/net/wireless/rdev-ops.h linux-6.4-fbx/net/wireless/rdev-ops.h --- linux-6.4/net/wireless/rdev-ops.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/rdev-ops.h 2024-04-22 13:40:53.167947433 +0200 @@ -173,7 +173,7 @@ static inline int rdev_change_beacon(struct cfg80211_registered_device *rdev, struct net_device *dev, - struct cfg80211_beacon_data *info) + struct cfg80211_ap_update *info) { int ret; trace_rdev_change_beacon(&rdev->wiphy, dev, info); @@ -407,6 +407,18 @@ return ret; } +static inline void rdev_inform_bss(struct cfg80211_registered_device *rdev, + struct cfg80211_bss *bss, + const struct cfg80211_bss_ies *ies, + void *drv_data) + +{ + trace_rdev_inform_bss(&rdev->wiphy, bss); + if (rdev->ops->inform_bss) + rdev->ops->inform_bss(&rdev->wiphy, bss, ies, drv_data); + trace_rdev_return_void(&rdev->wiphy); +} + static inline int rdev_set_txq_params(struct cfg80211_registered_device *rdev, struct net_device *dev, struct ieee80211_txq_params *params) @@ -899,17 +911,18 @@ static inline int rdev_tdls_mgmt(struct cfg80211_registered_device *rdev, struct net_device *dev, u8 *peer, - u8 action_code, u8 dialog_token, - u16 status_code, u32 peer_capability, - bool initiator, const u8 *buf, size_t len) + int link_id, u8 action_code, + u8 dialog_token, u16 status_code, + u32 peer_capability, bool initiator, + const u8 *buf, size_t len) { int ret; - trace_rdev_tdls_mgmt(&rdev->wiphy, dev, peer, action_code, - dialog_token, status_code, peer_capability, - initiator, buf, len); - ret = rdev->ops->tdls_mgmt(&rdev->wiphy, dev, peer, action_code, + trace_rdev_tdls_mgmt(&rdev->wiphy, dev, peer, link_id, action_code, dialog_token, status_code, peer_capability, initiator, buf, len); + ret = rdev->ops->tdls_mgmt(&rdev->wiphy, dev, peer, link_id, + action_code, dialog_token, status_code, + peer_capability, initiator, buf, len); trace_rdev_return_int(&rdev->wiphy, ret); return ret; } diff -ruw linux-6.4/net/wireless/reg.c linux-6.4-fbx/net/wireless/reg.c --- linux-6.4/net/wireless/reg.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/reg.c 2024-04-22 13:40:53.167947433 +0200 @@ -5,7 +5,7 @@ * Copyright 2008-2011 Luis R. Rodriguez * Copyright 2013-2014 Intel Mobile Communications GmbH * Copyright 2017 Intel Deutschland GmbH - * Copyright (C) 2018 - 2022 Intel Corporation + * Copyright (C) 2018 - 2023 Intel Corporation * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -1283,7 +1283,9 @@ * 60 GHz band. * This resolution can be lowered and should be considered as we add * regulatory rule support for other "bands". - **/ + * + * Returns: whether or not the frequency is in the range + */ static bool freq_in_rule_band(const struct ieee80211_freq_range *freq_range, u32 freq_khz) { @@ -1492,6 +1494,8 @@ * Returns a pointer to the regulatory domain structure which will hold the * resulting intersection of rules between rd1 and rd2. We will * kzalloc() this structure for you. + * + * Returns: the intersected regdomain */ static struct ieee80211_regdomain * regdom_intersect(const struct ieee80211_regdomain *rd1, @@ -1587,6 +1591,10 @@ channel_flags |= IEEE80211_CHAN_NO_HE; if (rd_flags & NL80211_RRF_NO_320MHZ) channel_flags |= IEEE80211_CHAN_NO_320MHZ; + if (rd_flags & NL80211_RRF_NO_EHT) + channel_flags |= IEEE80211_CHAN_NO_EHT; + if (rd_flags & NL80211_RRF_PSD) + channel_flags |= IEEE80211_CHAN_PSD; return channel_flags; } @@ -1755,6 +1763,40 @@ return bw_flags; } +static void restore_channel_dfs_cached_state(struct wiphy *wiphy, + struct ieee80211_channel *c) +{ + struct cfg80211_chan_dfs_cache *cd; + unsigned long timeout; + + if (!IS_ENABLED(CONFIG_CFG80211_DFS_CACHE)) + return; + + cd = cfg80211_get_dfs_chan_cache(c); + if (!cd) + return; + + if (cd->dfs_state == NL80211_DFS_USABLE) + return; + + if (cd->dfs_state == NL80211_DFS_UNAVAILABLE) { + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + + timeout = cd->dfs_state_entered + + msecs_to_jiffies(IEEE80211_DFS_MIN_NOP_TIME_MS); + + if (time_after_eq(jiffies, timeout)) + return; + + cfg80211_sched_dfs_chan_update(rdev); + } + + wiphy_info(wiphy, "restoring channel %u DFS state from cache\n", + cd->center_freq); + c->dfs_state = cd->dfs_state; + c->dfs_state_entered = cd->dfs_state_entered; +} + static void handle_channel_single_rule(struct wiphy *wiphy, enum nl80211_reg_initiator initiator, struct ieee80211_channel *chan, @@ -1789,15 +1831,22 @@ if (chan->flags & IEEE80211_CHAN_RADAR) { chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS; + if (chan->center_freq >= 5600 && + chan->center_freq <= 5650) + chan->dfs_cac_ms = IEEE80211_DFS_WEATHER_MIN_CAC_TIME_MS; if (reg_rule->dfs_cac_ms) chan->dfs_cac_ms = reg_rule->dfs_cac_ms; } + if (chan->flags & IEEE80211_CHAN_PSD) + chan->psd = reg_rule->psd; + return; } chan->dfs_state = NL80211_DFS_USABLE; chan->dfs_state_entered = jiffies; + restore_channel_dfs_cached_state(wiphy, chan); chan->beacon_found = false; chan->flags = flags | bw_flags | map_regdom_flags(reg_rule->flags); @@ -1809,9 +1858,17 @@ if (chan->flags & IEEE80211_CHAN_RADAR) { if (reg_rule->dfs_cac_ms) chan->dfs_cac_ms = reg_rule->dfs_cac_ms; + else { + if (chan->center_freq >= 5600 && + chan->center_freq <= 5650) + chan->dfs_cac_ms = IEEE80211_DFS_WEATHER_MIN_CAC_TIME_MS; else chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS; } + } + + if (chan->flags & IEEE80211_CHAN_PSD) + chan->psd = reg_rule->psd; if (chan->orig_mpwr) { /* @@ -1882,11 +1939,18 @@ rrule2->dfs_cac_ms); } + if ((rrule1->flags & NL80211_RRF_PSD) && + (rrule2->flags & NL80211_RRF_PSD)) + chan->psd = min_t(s8, rrule1->psd, rrule2->psd); + else + chan->flags &= ~NL80211_RRF_PSD; + return; } chan->dfs_state = NL80211_DFS_USABLE; chan->dfs_state_entered = jiffies; + restore_channel_dfs_cached_state(wiphy, chan); chan->beacon_found = false; chan->flags = flags | bw_flags1 | bw_flags2 | @@ -2149,6 +2213,13 @@ return false; } +static void reg_call_notifier(struct wiphy *wiphy, + struct regulatory_request *request) +{ + if (wiphy->reg_notifier) + wiphy->reg_notifier(wiphy, request); +} + static void handle_reg_beacon(struct wiphy *wiphy, unsigned int chan_idx, struct reg_beacon *reg_beacon) { @@ -2156,6 +2227,7 @@ struct ieee80211_channel *chan; bool channel_changed = false; struct ieee80211_channel chan_before; + struct regulatory_request *lr = get_last_request(); sband = wiphy->bands[reg_beacon->chan.band]; chan = &sband->channels[chan_idx]; @@ -2181,8 +2253,11 @@ channel_changed = true; } - if (channel_changed) + if (channel_changed) { nl80211_send_beacon_hint_event(wiphy, &chan_before, chan); + if (wiphy->flags & WIPHY_FLAG_CHANNEL_CHANGE_ON_BEACON) + reg_call_notifier(wiphy, lr); + } } /* @@ -2325,13 +2400,6 @@ reg_process_ht_flags_band(wiphy, wiphy->bands[band]); } -static void reg_call_notifier(struct wiphy *wiphy, - struct regulatory_request *request) -{ - if (wiphy->reg_notifier) - wiphy->reg_notifier(wiphy, request); -} - static bool reg_wdev_chan_valid(struct wiphy *wiphy, struct wireless_dev *wdev) { struct cfg80211_chan_def chandef = {}; @@ -2340,19 +2408,18 @@ bool ret; int link; - wdev_lock(wdev); iftype = wdev->iftype; /* make sure the interface is active */ if (!wdev->netdev || !netif_running(wdev->netdev)) - goto wdev_inactive_unlock; + return true; for (link = 0; link < ARRAY_SIZE(wdev->links); link++) { struct ieee80211_channel *chan; if (!wdev->valid_links && link > 0) break; - if (!(wdev->valid_links & BIT(link))) + if (wdev->valid_links && !(wdev->valid_links & BIT(link))) continue; switch (iftype) { case NL80211_IFTYPE_AP: @@ -2391,14 +2458,20 @@ case NL80211_IFTYPE_P2P_DEVICE: /* no enforcement required */ break; + case NL80211_IFTYPE_OCB: + if (!wdev->u.ocb.chandef.chan) + continue; + chandef = wdev->u.ocb.chandef; + break; + case NL80211_IFTYPE_NAN: + /* we have no info, but NAN is also pretty universal */ + continue; default: /* others not implemented for now */ - WARN_ON(1); + WARN_ON_ONCE(1); break; } - wdev_unlock(wdev); - switch (iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: @@ -2419,16 +2492,8 @@ default: break; } - - wdev_lock(wdev); } - wdev_unlock(wdev); - - return true; - -wdev_inactive_unlock: - wdev_unlock(wdev); return true; } @@ -2451,9 +2516,7 @@ pr_debug("Verifying active interfaces after reg change\n"); rtnl_lock(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) - if (!(rdev->wiphy.regulatory_flags & - REGULATORY_IGNORE_STALE_KICKOFF)) + for_each_rdev(rdev) reg_leave_invalid_chans(&rdev->wiphy); rtnl_unlock(); @@ -2507,7 +2570,7 @@ ASSERT_RTNL(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { wiphy = &rdev->wiphy; wiphy_update_regulatory(wiphy, initiator); } @@ -2549,6 +2612,7 @@ chan->dfs_state_entered = jiffies; chan->dfs_state = NL80211_DFS_USABLE; + restore_channel_dfs_cached_state(wiphy, chan); chan->beacon_found = false; @@ -2569,6 +2633,9 @@ chan->dfs_cac_ms = IEEE80211_DFS_MIN_CAC_TIME_MS; } + if (chan->flags & IEEE80211_CHAN_PSD) + chan->psd = reg_rule->psd; + chan->max_power = chan->max_reg_power; } @@ -2655,6 +2722,9 @@ * * The wireless subsystem can use this function to process * a regulatory request issued by the regulatory core. + * + * Returns: %REG_REQ_OK or %REG_REQ_IGNORE, indicating if the + * hint was processed or ignored */ static enum reg_request_treatment reg_process_hint_core(struct regulatory_request *core_request) @@ -2711,6 +2781,9 @@ * * The wireless subsystem can use this function to process * a regulatory request initiated by userspace. + * + * Returns: %REG_REQ_OK or %REG_REQ_IGNORE, indicating if the + * hint was processed or ignored */ static enum reg_request_treatment reg_process_hint_user(struct regulatory_request *user_request) @@ -2766,7 +2839,7 @@ * The wireless subsystem can use this function to process * a regulatory request issued by an 802.11 driver. * - * Returns one of the different reg request treatment values. + * Returns: one of the different reg request treatment values. */ static enum reg_request_treatment reg_process_hint_driver(struct wiphy *wiphy, @@ -2870,7 +2943,7 @@ * The wireless subsystem can use this function to process * a regulatory request issued by a country Information Element. * - * Returns one of the different reg request treatment values. + * Returns: one of the different reg request treatment values. */ static enum reg_request_treatment reg_process_hint_country_ie(struct wiphy *wiphy, @@ -2983,7 +3056,7 @@ ASSERT_RTNL(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (wiphy == &rdev->wiphy) continue; wiphy_share_dfs_chan_state(wiphy, &rdev->wiphy); @@ -3049,7 +3122,7 @@ struct cfg80211_registered_device *rdev; struct wiphy *wiphy; - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { wiphy = &rdev->wiphy; if (wiphy->regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED && request->initiator == NL80211_REGDOM_SET_BY_USER) @@ -3114,7 +3187,7 @@ list_del_init(&pending_beacon->list); /* Applies the beacon hint to current wiphys */ - list_for_each_entry(rdev, &cfg80211_rdev_list, list) + for_each_rdev(rdev) wiphy_update_new_beacon(&rdev->wiphy, pending_beacon); /* Remembers the beacon hint for new wiphys or reg changes */ @@ -3169,7 +3242,7 @@ ASSERT_RTNL(); - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { wiphy_lock(&rdev->wiphy); reg_process_self_managed_hint(&rdev->wiphy); wiphy_unlock(&rdev->wiphy); @@ -3509,7 +3582,7 @@ world_alpha2[0] = cfg80211_world_regdom->alpha2[0]; world_alpha2[1] = cfg80211_world_regdom->alpha2[1]; - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (rdev->wiphy.regulatory_flags & REGULATORY_WIPHY_SELF_MANAGED) continue; if (rdev->wiphy.regulatory_flags & REGULATORY_CUSTOM_REG) @@ -3566,15 +3639,15 @@ struct cfg80211_registered_device *rdev; struct wireless_dev *wdev; - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { + wiphy_lock(&rdev->wiphy); list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { - wdev_lock(wdev); if (!(wdev->wiphy->regulatory_flags & flag)) { - wdev_unlock(wdev); + wiphy_unlock(&rdev->wiphy); return false; } - wdev_unlock(wdev); } + wiphy_unlock(&rdev->wiphy); } return true; @@ -3830,7 +3903,7 @@ { const struct ieee80211_regdomain *regd; const struct ieee80211_regdomain *intersected_rd = NULL; - const struct ieee80211_regdomain *tmp; + const struct ieee80211_regdomain *tmp = NULL; struct wiphy *request_wiphy; if (is_world_regdom(rd->alpha2)) @@ -3853,10 +3926,8 @@ if (!driver_request->intersect) { ASSERT_RTNL(); wiphy_lock(request_wiphy); - if (request_wiphy->regd) { - wiphy_unlock(request_wiphy); - return -EALREADY; - } + if (request_wiphy->regd) + tmp = get_wiphy_regdom(request_wiphy); regd = reg_copy_regd(rd); if (IS_ERR(regd)) { @@ -3865,6 +3936,7 @@ } rcu_assign_pointer(request_wiphy->regd, regd); + rcu_free_regdom(tmp); wiphy_unlock(request_wiphy); reset_regdomains(false, rd); return 0; @@ -4236,7 +4308,7 @@ if (WARN_ON(!cfg80211_chandef_valid(chandef))) return; - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { if (wiphy == &rdev->wiphy) continue; diff -ruw linux-6.4/net/wireless/reg.h linux-6.4-fbx/net/wireless/reg.h --- linux-6.4/net/wireless/reg.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/reg.h 2024-04-22 13:40:53.167947433 +0200 @@ -5,7 +5,7 @@ /* * Copyright 2008-2011 Luis R. Rodriguez - * Copyright (C) 2019 Intel Corporation + * Copyright (C) 2019, 2023 Intel Corporation * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -133,7 +133,7 @@ /** * cfg80211_get_unii - get the U-NII band for the frequency * @freq: the frequency for which we want to get the UNII band. - + * * Get a value specifying the U-NII band frequency belongs to. * U-NII bands are defined by the FCC in C.F.R 47 part 15. * @@ -156,11 +156,11 @@ /** * regulatory_propagate_dfs_state - Propagate DFS channel state to other wiphys - * @wiphy - wiphy on which radar is detected and the event will be propagated + * @wiphy: wiphy on which radar is detected and the event will be propagated * to other available wiphys having the same DFS domain - * @chandef - Channel definition of radar detected channel - * @dfs_state - DFS channel state to be set - * @event - Type of radar event which triggered this DFS state change + * @chandef: Channel definition of radar detected channel + * @dfs_state: DFS channel state to be set + * @event: Type of radar event which triggered this DFS state change * * This function should be called with rtnl lock held. */ @@ -171,8 +171,8 @@ /** * reg_dfs_domain_same - Checks if both wiphy have same DFS domain configured - * @wiphy1 - wiphy it's dfs_region to be checked against that of wiphy2 - * @wiphy2 - wiphy it's dfs_region to be checked against that of wiphy1 + * @wiphy1: wiphy it's dfs_region to be checked against that of wiphy2 + * @wiphy2: wiphy it's dfs_region to be checked against that of wiphy1 */ bool reg_dfs_domain_same(struct wiphy *wiphy1, struct wiphy *wiphy2); diff -ruw linux-6.4/net/wireless/scan.c linux-6.4-fbx/net/wireless/scan.c --- linux-6.4/net/wireless/scan.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/scan.c 2024-04-22 13:40:53.167947433 +0200 @@ -96,6 +96,7 @@ * colocated and can be discovered via legacy bands. * @short_ssid_valid: short_ssid is valid and can be used * @short_ssid: the short SSID for this SSID + * @psd_20: The 20MHz PSD EIRP of the primary 20MHz channel for the reported AP */ struct cfg80211_colocated_ap { struct list_head list; @@ -111,6 +112,7 @@ transmitted_bssid:1, colocated_ess:1, short_ssid_valid:1; + s8 psd_20; }; static void bss_free(struct cfg80211_internal_bss *bss) @@ -218,6 +220,10 @@ if (elem->id == WLAN_EID_MULTIPLE_BSSID) return false; + if (elem->id == WLAN_EID_EXTENSION && elem->datalen > 1 && + elem->data[0] == WLAN_EID_EXT_EHT_MULTI_LINK) + return false; + if (!non_inherit_elem || non_inherit_elem->datalen < 2) return true; @@ -259,117 +265,152 @@ } EXPORT_SYMBOL(cfg80211_is_element_inherited); -static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen, - const u8 *subelement, size_t subie_len, - u8 *new_ie, gfp_t gfp) +static size_t cfg80211_copy_elem_with_frags(const struct element *elem, + const u8 *ie, size_t ie_len, + u8 **pos, u8 *buf, size_t buf_len) { - u8 *pos, *tmp; - const u8 *tmp_old, *tmp_new; - const struct element *non_inherit_elem; - u8 *sub_copy; - - /* copy subelement as we need to change its content to - * mark an ie after it is processed. - */ - sub_copy = kmemdup(subelement, subie_len, gfp); - if (!sub_copy) + if (WARN_ON((u8 *)elem < ie || elem->data > ie + ie_len || + elem->data + elem->datalen > ie + ie_len)) return 0; - pos = &new_ie[0]; + if (elem->datalen + 2 > buf + buf_len - *pos) + return 0; - /* set new ssid */ - tmp_new = cfg80211_find_ie(WLAN_EID_SSID, sub_copy, subie_len); - if (tmp_new) { - memcpy(pos, tmp_new, tmp_new[1] + 2); - pos += (tmp_new[1] + 2); - } + memcpy(*pos, elem, elem->datalen + 2); + *pos += elem->datalen + 2; - /* get non inheritance list if exists */ - non_inherit_elem = - cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, - sub_copy, subie_len); + /* Finish if it is not fragmented */ + if (elem->datalen != 255) + return *pos - buf; - /* go through IEs in ie (skip SSID) and subelement, - * merge them into new_ie - */ - tmp_old = cfg80211_find_ie(WLAN_EID_SSID, ie, ielen); - tmp_old = (tmp_old) ? tmp_old + tmp_old[1] + 2 : ie; + ie_len = ie + ie_len - elem->data - elem->datalen; + ie = (const u8 *)elem->data + elem->datalen; - while (tmp_old + 2 - ie <= ielen && - tmp_old + tmp_old[1] + 2 - ie <= ielen) { - if (tmp_old[0] == 0) { - tmp_old++; - continue; - } + for_each_element(elem, ie, ie_len) { + if (elem->id != WLAN_EID_FRAGMENT) + break; - if (tmp_old[0] == WLAN_EID_EXTENSION) - tmp = (u8 *)cfg80211_find_ext_ie(tmp_old[2], sub_copy, - subie_len); - else - tmp = (u8 *)cfg80211_find_ie(tmp_old[0], sub_copy, - subie_len); + if (elem->datalen + 2 > buf + buf_len - *pos) + return 0; - if (!tmp) { - const struct element *old_elem = (void *)tmp_old; + memcpy(*pos, elem, elem->datalen + 2); + *pos += elem->datalen + 2; - /* ie in old ie but not in subelement */ - if (cfg80211_is_element_inherited(old_elem, - non_inherit_elem)) { - memcpy(pos, tmp_old, tmp_old[1] + 2); - pos += tmp_old[1] + 2; + if (elem->datalen != 255) + break; } - } else { - /* ie in transmitting ie also in subelement, - * copy from subelement and flag the ie in subelement - * as copied (by setting eid field to WLAN_EID_SSID, - * which is skipped anyway). - * For vendor ie, compare OUI + type + subType to - * determine if they are the same ie. - */ - if (tmp_old[0] == WLAN_EID_VENDOR_SPECIFIC) { - if (tmp_old[1] >= 5 && tmp[1] >= 5 && - !memcmp(tmp_old + 2, tmp + 2, 5)) { - /* same vendor ie, copy from - * subelement - */ - memcpy(pos, tmp, tmp[1] + 2); - pos += tmp[1] + 2; - tmp[0] = WLAN_EID_SSID; - } else { - memcpy(pos, tmp_old, tmp_old[1] + 2); - pos += tmp_old[1] + 2; + + return *pos - buf; } + +static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen, + const u8 *subie, size_t subie_len, + u8 *new_ie, size_t new_ie_len) +{ + const struct element *non_inherit_elem, *parent, *sub; + u8 *pos = new_ie; + u8 id, ext_id; + unsigned int match_len; + + non_inherit_elem = cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, + subie, subie_len); + + /* We copy the elements one by one from the parent to the generated + * elements. + * If they are not inherited (included in subie or in the non + * inheritance element), then we copy all occurrences the first time + * we see this element type. + */ + for_each_element(parent, ie, ielen) { + if (parent->id == WLAN_EID_FRAGMENT) + continue; + + if (parent->id == WLAN_EID_EXTENSION) { + if (parent->datalen < 1) + continue; + + id = WLAN_EID_EXTENSION; + ext_id = parent->data[0]; + match_len = 1; } else { - /* copy ie from subelement into new ie */ - memcpy(pos, tmp, tmp[1] + 2); - pos += tmp[1] + 2; - tmp[0] = WLAN_EID_SSID; + id = parent->id; + match_len = 0; } + + /* Find first occurrence in subie */ + sub = cfg80211_find_elem_match(id, subie, subie_len, + &ext_id, match_len, 0); + + /* Copy from parent if not in subie and inherited */ + if (!sub && + cfg80211_is_element_inherited(parent, non_inherit_elem)) { + if (!cfg80211_copy_elem_with_frags(parent, + ie, ielen, + &pos, new_ie, + new_ie_len)) + return 0; + + continue; } - if (tmp_old + tmp_old[1] + 2 - ie == ielen) - break; + /* Already copied if an earlier element had the same type */ + if (cfg80211_find_elem_match(id, ie, (u8 *)parent - ie, + &ext_id, match_len, 0)) + continue; + + /* Not inheriting, copy all similar elements from subie */ + while (sub) { + if (!cfg80211_copy_elem_with_frags(sub, + subie, subie_len, + &pos, new_ie, + new_ie_len)) + return 0; - tmp_old += tmp_old[1] + 2; + sub = cfg80211_find_elem_match(id, + sub->data + sub->datalen, + subie_len + subie - + (sub->data + + sub->datalen), + &ext_id, match_len, 0); + } } - /* go through subelement again to check if there is any ie not - * copied to new ie, skip ssid, capability, bssid-index ie + /* The above misses elements that are included in subie but not in the + * parent, so do a pass over subie and append those. + * Skip the non-tx BSSID caps and non-inheritance element. */ - tmp_new = sub_copy; - while (tmp_new + 2 - sub_copy <= subie_len && - tmp_new + tmp_new[1] + 2 - sub_copy <= subie_len) { - if (!(tmp_new[0] == WLAN_EID_NON_TX_BSSID_CAP || - tmp_new[0] == WLAN_EID_SSID)) { - memcpy(pos, tmp_new, tmp_new[1] + 2); - pos += tmp_new[1] + 2; + for_each_element(sub, subie, subie_len) { + if (sub->id == WLAN_EID_NON_TX_BSSID_CAP) + continue; + + if (sub->id == WLAN_EID_FRAGMENT) + continue; + + if (sub->id == WLAN_EID_EXTENSION) { + if (sub->datalen < 1) + continue; + + id = WLAN_EID_EXTENSION; + ext_id = sub->data[0]; + match_len = 1; + + if (ext_id == WLAN_EID_EXT_NON_INHERITANCE) + continue; + } else { + id = sub->id; + match_len = 0; } - if (tmp_new + tmp_new[1] + 2 - sub_copy == subie_len) - break; - tmp_new += tmp_new[1] + 2; + + /* Processed if one was included in the parent */ + if (cfg80211_find_elem_match(id, ie, ielen, + &ext_id, match_len, 0)) + continue; + + if (!cfg80211_copy_elem_with_frags(sub, subie, subie_len, + &pos, new_ie, new_ie_len)) + return 0; } - kfree(sub_copy); return pos - new_ie; } @@ -535,39 +576,58 @@ static int cfg80211_parse_ap_info(struct cfg80211_colocated_ap *entry, const u8 *pos, u8 length, const struct element *ssid_elem, - int s_ssid_tmp) + u32 s_ssid_tmp) { - /* skip the TBTT offset */ - pos++; + u8 bss_params; - /* ignore entries with invalid BSSID */ - if (!is_valid_ether_addr(pos)) - return -EINVAL; + entry->psd_20 = IEEE80211_RNR_TBTT_PARAMS_PSD_RESERVED; - memcpy(entry->bssid, pos, ETH_ALEN); - pos += ETH_ALEN; + /* The length is already verified by the caller to contain bss_params */ + if (length > sizeof(struct ieee80211_tbtt_info_7_8_9)) { + struct ieee80211_tbtt_info_ge_11 *tbtt_info = (void *)pos; - if (length >= IEEE80211_TBTT_INFO_OFFSET_BSSID_SSSID_BSS_PARAM) { - memcpy(&entry->short_ssid, pos, - sizeof(entry->short_ssid)); + memcpy(entry->bssid, tbtt_info->bssid, ETH_ALEN); + entry->short_ssid = le32_to_cpu(tbtt_info->short_ssid); entry->short_ssid_valid = true; - pos += 4; + + bss_params = tbtt_info->bss_params; + + /* Ignore disabled links */ + if (length >= offsetofend(typeof(*tbtt_info), mld_params)) { + if (le16_get_bits(tbtt_info->mld_params.params, + IEEE80211_RNR_MLD_PARAMS_DISABLED_LINK)) + return -EINVAL; + } + + if (length >= offsetofend(struct ieee80211_tbtt_info_ge_11, + psd_20)) + entry->psd_20 = tbtt_info->psd_20; + } else { + struct ieee80211_tbtt_info_7_8_9 *tbtt_info = (void *)pos; + + memcpy(entry->bssid, tbtt_info->bssid, ETH_ALEN); + + bss_params = tbtt_info->bss_params; + + if (length == offsetofend(struct ieee80211_tbtt_info_7_8_9, + psd_20)) + entry->psd_20 = tbtt_info->psd_20; } + /* ignore entries with invalid BSSID */ + if (!is_valid_ether_addr(entry->bssid)) + return -EINVAL; + /* skip non colocated APs */ - if (!cfg80211_parse_bss_param(*pos, entry)) + if (!cfg80211_parse_bss_param(bss_params, entry)) return -EINVAL; - pos++; - if (length == IEEE80211_TBTT_INFO_OFFSET_BSSID_BSS_PARAM) { - /* - * no information about the short ssid. Consider the entry valid + /* no information about the short ssid. Consider the entry valid * for now. It would later be dropped in case there are explicit * SSIDs that need to be matched */ - if (!entry->same_ssid) + if (!entry->same_ssid && !entry->short_ssid_valid) return 0; - } if (entry->same_ssid) { entry->short_ssid = s_ssid_tmp; @@ -578,10 +638,10 @@ * cfg80211_parse_colocated_ap(), before calling this * function. */ - memcpy(&entry->ssid, &ssid_elem->data, - ssid_elem->datalen); + memcpy(&entry->ssid, &ssid_elem->data, ssid_elem->datalen); entry->ssid_len = ssid_elem->datalen; } + return 0; } @@ -595,17 +655,14 @@ int n_coloc = 0, ret; LIST_HEAD(ap_list); - elem = cfg80211_find_elem(WLAN_EID_REDUCED_NEIGHBOR_REPORT, ies->data, - ies->len); - if (!elem) + ret = cfg80211_calc_short_ssid(ies, &ssid_elem, &s_ssid_tmp); + if (ret) return 0; + for_each_element_id(elem, WLAN_EID_REDUCED_NEIGHBOR_REPORT, + ies->data, ies->len) { pos = elem->data; - end = pos + elem->datalen; - - ret = cfg80211_calc_short_ssid(ies, &ssid_elem, &s_ssid_tmp); - if (ret) - return ret; + end = elem->data + elem->datalen; /* RNR IE may contain more than one NEIGHBOR_AP_INFO */ while (pos + sizeof(*ap_info) <= end) { @@ -624,20 +681,30 @@ &band)) break; - freq = ieee80211_channel_to_frequency(ap_info->channel, band); + freq = ieee80211_channel_to_frequency(ap_info->channel, + band); if (end - pos < count * length) break; - /* - * TBTT info must include bss param + BSSID + + if (u8_get_bits(ap_info->tbtt_info_hdr, + IEEE80211_AP_INFO_TBTT_HDR_TYPE) != + IEEE80211_TBTT_INFO_TYPE_TBTT) { + pos += count * length; + continue; + } + + /* TBTT info must include bss param + BSSID + * (short SSID or same_ssid bit to be set). * ignore other options, and move to the * next AP info */ if (band != NL80211_BAND_6GHZ || - (length != IEEE80211_TBTT_INFO_OFFSET_BSSID_BSS_PARAM && - length < IEEE80211_TBTT_INFO_OFFSET_BSSID_SSSID_BSS_PARAM)) { + !(length == offsetofend(struct ieee80211_tbtt_info_7_8_9, + bss_params) || + length == sizeof(struct ieee80211_tbtt_info_7_8_9) || + length >= offsetofend(struct ieee80211_tbtt_info_ge_11, + bss_params))) { pos += count * length; continue; } @@ -649,12 +716,13 @@ GFP_ATOMIC); if (!entry) - break; + goto error; entry->center_freq = freq; if (!cfg80211_parse_ap_info(entry, pos, length, - ssid_elem, s_ssid_tmp)) { + ssid_elem, + s_ssid_tmp)) { n_coloc++; list_add_tail(&entry->list, &ap_list); } else { @@ -665,10 +733,12 @@ } } +error: if (pos != end) { cfg80211_free_coloc_ap_list(&ap_list); return 0; } + } list_splice_tail(&ap_list, list); return n_coloc; @@ -760,10 +830,47 @@ list_for_each_entry(intbss, &rdev->bss_list, list) { struct cfg80211_bss *res = &intbss->pub; const struct cfg80211_bss_ies *ies; + const struct element *ssid_elem; + struct cfg80211_colocated_ap *entry; + u32 s_ssid_tmp; + int ret; ies = rcu_access_pointer(res->ies); count += cfg80211_parse_colocated_ap(ies, &coloc_ap_list); + + /* In case the scan request specified a specific BSSID + * and the BSS is found and operating on 6GHz band then + * add this AP to the collocated APs list. + * This is relevant for ML probe requests when the lower + * band APs have not been discovered. + */ + if (is_broadcast_ether_addr(rdev_req->bssid) || + !ether_addr_equal(rdev_req->bssid, res->bssid) || + res->channel->band != NL80211_BAND_6GHZ) + continue; + + ret = cfg80211_calc_short_ssid(ies, &ssid_elem, + &s_ssid_tmp); + if (ret) + continue; + + entry = kzalloc(sizeof(*entry) + IEEE80211_MAX_SSID_LEN, + GFP_ATOMIC); + + if (!entry) + continue; + + memcpy(entry->bssid, res->bssid, ETH_ALEN); + entry->short_ssid = s_ssid_tmp; + memcpy(entry->ssid, ssid_elem->data, + ssid_elem->datalen); + entry->ssid_len = ssid_elem->datalen; + entry->short_ssid_valid = true; + entry->center_freq = res->channel->center_freq; + + list_add_tail(&entry->list, &coloc_ap_list); + count++; } spin_unlock_bh(&rdev->bss_lock); } @@ -838,6 +945,10 @@ !cfg80211_find_ssid_match(ap, request)) continue; + if (!is_broadcast_ether_addr(request->bssid) && + !ether_addr_equal(request->bssid, ap->bssid)) + continue; + if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) continue; @@ -846,6 +957,7 @@ scan_6ghz_params->short_ssid = ap->short_ssid; scan_6ghz_params->short_ssid_valid = ap->short_ssid_valid; scan_6ghz_params->unsolicited_probe = ap->unsolicited_probe; + scan_6ghz_params->psd_20 = ap->psd_20; /* * If a PSC channel is added to the scan and 'need_scan_psc' is @@ -1004,16 +1116,9 @@ nl80211_send_scan_msg(rdev, msg); } -void __cfg80211_scan_done(struct work_struct *wk) +void __cfg80211_scan_done(struct wiphy *wiphy, struct wiphy_work *wk) { - struct cfg80211_registered_device *rdev; - - rdev = container_of(wk, struct cfg80211_registered_device, - scan_done_wk); - - wiphy_lock(&rdev->wiphy); - ___cfg80211_scan_done(rdev, true); - wiphy_unlock(&rdev->wiphy); + ___cfg80211_scan_done(wiphy_to_rdev(wiphy), true); } void cfg80211_scan_done(struct cfg80211_scan_request *request, @@ -1039,7 +1144,8 @@ } request->notified = true; - queue_work(cfg80211_wq, &wiphy_to_rdev(request->wiphy)->scan_done_wk); + wiphy_work_queue(request->wiphy, + &wiphy_to_rdev(request->wiphy)->scan_done_wk); } EXPORT_SYMBOL(cfg80211_scan_done); @@ -1573,8 +1679,6 @@ continue; if (bss->pub.channel != new->pub.channel) continue; - if (bss->pub.scan_width != new->pub.scan_width) - continue; if (rcu_access_pointer(bss->pub.beacon_ies)) continue; ies = rcu_access_pointer(bss->pub.ies); @@ -1604,12 +1708,6 @@ return true; } -struct cfg80211_non_tx_bss { - struct cfg80211_bss *tx_bss; - u8 max_bssid_indicator; - u8 bssid_index; -}; - static void cfg80211_update_hidden_bsses(struct cfg80211_internal_bss *known, const struct cfg80211_bss_ies *new_ies, const struct cfg80211_bss_ies *old_ies) @@ -1706,9 +1804,168 @@ return true; } +static const struct channel_5ghz_desc { + unsigned int freq; + unsigned int aligned_start_freq_40; + unsigned int aligned_start_freq_80; + unsigned int aligned_start_freq_160; +} channel_5ghz_descs[] = { + { 5180, 5170, 5170, 5170 }, /* 36 */ + { 5200, 5170, 5170, 5170 }, /* 40 */ + { 5220, 5210, 5170, 5170 }, /* 44 */ + { 5240, 5210, 5170, 5170 }, /* 48 */ + { 5260, 5250, 5250, 5170 }, /* 52 */ + { 5280, 5250, 5250, 5170 }, /* 56 */ + { 5300, 5290, 5250, 5170 }, /* 60 */ + { 5320, 5290, 5250, 5170 }, /* 64 */ + { 5340, 5330, 5330, 5330 }, /* 68 */ + { 5360, 5330, 5330, 5330 }, /* 72 */ + { 5380, 5370, 5330, 5330 }, /* 76 */ + { 5400, 5370, 5330, 5330 }, /* 80 */ + { 5420, 5410, 5410, 5330 }, /* 84 */ + { 5440, 5410, 5410, 5330 }, /* 88 */ + { 5460, 5450, 5410, 5330 }, /* 92 */ + { 5480, 5450, 5410, 5330 }, /* 96 */ + { 5500, 5490, 5490, 5490 }, /* 100 */ + { 5520, 5490, 5490, 5490 }, /* 104 */ + { 5540, 5530, 5490, 5490 }, /* 108 */ + { 5560, 5530, 5490, 5490 }, /* 112 */ + { 5580, 5570, 5570, 5490 }, /* 116 */ + { 5600, 5570, 5570, 5490 }, /* 120 */ + { 5620, 5610, 5570, 5490 }, /* 124 */ + { 5640, 5610, 5570, 5490 }, /* 128 */ + { 5660, 5650, 5650, 5650 }, /* 132 */ + { 5680, 5650, 5650, 5650 }, /* 136 */ + { 5700, 5690, 5650, 5650 }, /* 140 */ + { 5720, 5690, 5650, 5650 }, /* 144 */ + { 5745, 5735, 5735, 5735 }, /* 148 */ + { 5765, 5735, 5735, 5735 }, /* 152 */ + { 5785, 5775, 5735, 5735 }, /* 156 */ + { 5805, 5775, 5735, 5735 }, /* 160 */ + { 5825, 5815, 5815, 5735 }, /* 164 */ + { 5845, 5815, 5815, 5735 }, /* 168 */ + { 5865, 5855, 5815, 5735 }, /* 172 */ + { 5885, 5855, 5815, 5735 }, /* 176 */ + { 5905, 5895, 5895, 5895 }, /* 180 */ +}; + +static void bss_update_rdev_dfs_state(struct cfg80211_registered_device *rdev, + struct cfg80211_internal_bss *bss) +{ + struct ieee80211_channel *chan = bss->pub.channel; + const struct cfg80211_bss_ies *ies = bss->pub.ies; + const struct channel_5ghz_desc *cdesc; + const struct element *elem; + enum nl80211_band band; + unsigned int width, start_freq, freq; + u8 oper_class; + size_t i; + + /* extract some IE to check if AP seems to be indeed doing + * DFS, expect country code & power constraint to be present */ + if (!cfg80211_find_elem(WLAN_EID_PWR_CONSTRAINT, ies->data, + ies->len) || + !cfg80211_find_elem(WLAN_EID_COUNTRY, ies->data, + ies->len)) + return; + + /* guess operating bandwidth, use only operating class for + * now */ + elem = cfg80211_find_elem(WLAN_EID_SUPPORTED_REGULATORY_CLASSES, + ies->data, ies->len); + if (!elem || elem->datalen < 1) + return; + + oper_class = elem->data[0]; + if (!ieee80211_operating_class_to_band(oper_class, &band) || + band != NL80211_BAND_5GHZ) + return; + + switch (oper_class) { + case 115: + case 118: + case 121: + case 124: + case 125: + width = 20; + break; + case 116: + case 117: + case 119: + case 120: + case 122: + case 123: + case 126: + case 127: + width = 40; + break; + case 128: + width = 80; + break; + case 129: + width = 160; + break; + case 130: + /* ignore 80+80 */ + return; + default: + return; + } + + /* compute spanned channels according to primary channel & + * width */ + cdesc = NULL; + for (i = 0; i < ARRAY_SIZE(channel_5ghz_descs); i++) { + if (channel_5ghz_descs[i].freq == chan->center_freq) { + cdesc = &channel_5ghz_descs[i]; + break; + } + } + + if (!cdesc) + return; + + switch (width) { + case 20: + start_freq = cdesc->freq - 10; + break; + case 40: + start_freq = cdesc->aligned_start_freq_40; + break; + case 80: + start_freq = cdesc->aligned_start_freq_80; + break; + case 160: + start_freq = cdesc->aligned_start_freq_160; + break; + } + + for (freq = start_freq + 10; + freq <= start_freq + width - 10; + freq += 20) { + struct ieee80211_channel *c; + + c = ieee80211_get_channel(&rdev->wiphy, freq); + if (!c || + (c->flags & IEEE80211_CHAN_DISABLED) || + !(c->flags & IEEE80211_CHAN_RADAR)) + continue; + + if (c->dfs_state != NL80211_DFS_USABLE) + continue; + + wiphy_info(&rdev->wiphy, + "setting channel %u DFS state from scan result\n", + freq); + + c->dfs_state = NL80211_DFS_AVAILABLE; + c->dfs_state_entered = jiffies; + } +} + /* Returned bss is reference counted and must be cleaned up appropriately. */ -struct cfg80211_internal_bss * -cfg80211_bss_update(struct cfg80211_registered_device *rdev, +static struct cfg80211_internal_bss * +__cfg80211_bss_update(struct cfg80211_registered_device *rdev, struct cfg80211_internal_bss *tmp, bool signal_valid, unsigned long ts) { @@ -1719,10 +1976,7 @@ tmp->ts = ts; - spin_lock_bh(&rdev->bss_lock); - if (WARN_ON(!rcu_access_pointer(tmp->pub.ies))) { - spin_unlock_bh(&rdev->bss_lock); return NULL; } @@ -1730,7 +1984,11 @@ if (found) { if (!cfg80211_update_known_bss(rdev, found, tmp, signal_valid)) - goto drop; + return NULL; + + if (rdev->scan_req && + rdev->scan_req->flags & NL80211_SCAN_FLAG_UPDATE_DFS) + bss_update_rdev_dfs_state(rdev, found); } else { struct cfg80211_internal_bss *new; struct cfg80211_internal_bss *hidden; @@ -1750,7 +2008,7 @@ ies = (void *)rcu_dereference(tmp->pub.proberesp_ies); if (ies) kfree_rcu(ies, rcu_head); - goto drop; + return NULL; } memcpy(new, tmp, sizeof(*new)); new->refcount = 1; @@ -1781,14 +2039,14 @@ */ if (!cfg80211_combine_bsses(rdev, new)) { bss_ref_put(rdev, new); - goto drop; + return NULL; } } if (rdev->bss_entries >= bss_entries_limit && !cfg80211_bss_expire_oldest(rdev)) { bss_ref_put(rdev, new); - goto drop; + return NULL; } /* This must be before the call to bss_ref_get */ @@ -1797,6 +2055,10 @@ bss_ref_get(rdev, bss_from_pub(tmp->pub.transmitted_bss)); } + if (rdev->scan_req && + rdev->scan_req->flags & NL80211_SCAN_FLAG_UPDATE_DFS) + bss_update_rdev_dfs_state(rdev, new); + list_add_tail(&new->list, &rdev->bss_list); rdev->bss_entries++; rb_insert_bss(rdev, new); @@ -1805,12 +2067,22 @@ rdev->bss_generation++; bss_ref_get(rdev, found); - spin_unlock_bh(&rdev->bss_lock); return found; - drop: +} + +struct cfg80211_internal_bss * +cfg80211_bss_update(struct cfg80211_registered_device *rdev, + struct cfg80211_internal_bss *tmp, + bool signal_valid, unsigned long ts) +{ + struct cfg80211_internal_bss *res; + + spin_lock_bh(&rdev->bss_lock); + res = __cfg80211_bss_update(rdev, tmp, signal_valid, ts); spin_unlock_bh(&rdev->bss_lock); - return NULL; + + return res; } int cfg80211_get_ies_channel_number(const u8 *ie, size_t ielen, @@ -1870,8 +2142,7 @@ */ static struct ieee80211_channel * cfg80211_get_bss_channel(struct wiphy *wiphy, const u8 *ie, size_t ielen, - struct ieee80211_channel *channel, - enum nl80211_bss_scan_width scan_width) + struct ieee80211_channel *channel) { u32 freq; int channel_number; @@ -1911,16 +2182,6 @@ return channel; } - if (scan_width == NL80211_BSS_CHAN_WIDTH_10 || - scan_width == NL80211_BSS_CHAN_WIDTH_5) { - /* - * Ignore channel number in 5 and 10 MHz channels where there - * may not be an n:1 or 1:n mapping between frequencies and - * channel numbers. - */ - return channel; - } - /* * Use the channel determined through the payload channel number * instead of the RX channel reported by the driver. @@ -1930,17 +2191,36 @@ return alt_channel; } +struct cfg80211_inform_single_bss_data { + struct cfg80211_inform_bss *drv_data; + enum cfg80211_bss_frame_type ftype; + struct ieee80211_channel *channel; + u8 bssid[ETH_ALEN]; + u64 tsf; + u16 capability; + u16 beacon_interval; + const u8 *ie; + size_t ielen; + + enum { + BSS_SOURCE_DIRECT = 0, + BSS_SOURCE_MBSSID, + BSS_SOURCE_STA_PROFILE, + } bss_source; + /* Set if reporting bss_source != BSS_SOURCE_DIRECT */ + struct cfg80211_bss *source_bss; + u8 max_bssid_indicator; + u8 bssid_index; +}; + /* Returned bss is reference counted and must be cleaned up appropriately. */ static struct cfg80211_bss * cfg80211_inform_single_bss_data(struct wiphy *wiphy, - struct cfg80211_inform_bss *data, - enum cfg80211_bss_frame_type ftype, - const u8 *bssid, u64 tsf, u16 capability, - u16 beacon_interval, const u8 *ie, size_t ielen, - struct cfg80211_non_tx_bss *non_tx_data, + struct cfg80211_inform_single_bss_data *data, gfp_t gfp) { struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + struct cfg80211_inform_bss *drv_data = data->drv_data; struct cfg80211_bss_ies *ies; struct ieee80211_channel *channel; struct cfg80211_internal_bss tmp = {}, *res; @@ -1952,31 +2232,51 @@ return NULL; if (WARN_ON(wiphy->signal_type == CFG80211_SIGNAL_TYPE_UNSPEC && - (data->signal < 0 || data->signal > 100))) + (drv_data->signal < 0 || drv_data->signal > 100))) return NULL; - channel = cfg80211_get_bss_channel(wiphy, ie, ielen, data->chan, - data->scan_width); + if (WARN_ON(data->bss_source != BSS_SOURCE_DIRECT && !data->source_bss)) + return NULL; + + channel = data->channel; + if (!channel) + channel = cfg80211_get_bss_channel(wiphy, data->ie, data->ielen, + drv_data->chan); if (!channel) return NULL; - memcpy(tmp.pub.bssid, bssid, ETH_ALEN); + memcpy(tmp.pub.bssid, data->bssid, ETH_ALEN); tmp.pub.channel = channel; - tmp.pub.scan_width = data->scan_width; - tmp.pub.signal = data->signal; - tmp.pub.beacon_interval = beacon_interval; - tmp.pub.capability = capability; - tmp.ts_boottime = data->boottime_ns; - tmp.parent_tsf = data->parent_tsf; - ether_addr_copy(tmp.parent_bssid, data->parent_bssid); - - if (non_tx_data) { - tmp.pub.transmitted_bss = non_tx_data->tx_bss; - ts = bss_from_pub(non_tx_data->tx_bss)->ts; - tmp.pub.bssid_index = non_tx_data->bssid_index; - tmp.pub.max_bssid_indicator = non_tx_data->max_bssid_indicator; + if (data->bss_source != BSS_SOURCE_STA_PROFILE) + tmp.pub.signal = drv_data->signal; + else + tmp.pub.signal = 0; + tmp.pub.beacon_interval = data->beacon_interval; + tmp.pub.capability = data->capability; + tmp.ts_boottime = drv_data->boottime_ns; + tmp.parent_tsf = drv_data->parent_tsf; + ether_addr_copy(tmp.parent_bssid, drv_data->parent_bssid); + + if (data->bss_source != BSS_SOURCE_DIRECT) { + tmp.pub.transmitted_bss = data->source_bss; + ts = bss_from_pub(data->source_bss)->ts; + tmp.pub.bssid_index = data->bssid_index; + tmp.pub.max_bssid_indicator = data->max_bssid_indicator; } else { ts = jiffies; + + if (channel->band == NL80211_BAND_60GHZ) { + bss_type = data->capability & + WLAN_CAPABILITY_DMG_TYPE_MASK; + if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP || + bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS) + regulatory_hint_found_beacon(wiphy, channel, + gfp); + } else { + if (data->capability & WLAN_CAPABILITY_ESS) + regulatory_hint_found_beacon(wiphy, channel, + gfp); + } } /* @@ -1987,15 +2287,15 @@ * override the IEs pointer should we have received an earlier * indication of Probe Response data. */ - ies = kzalloc(sizeof(*ies) + ielen, gfp); + ies = kzalloc(sizeof(*ies) + data->ielen, gfp); if (!ies) return NULL; - ies->len = ielen; - ies->tsf = tsf; + ies->len = data->ielen; + ies->tsf = data->tsf; ies->from_beacon = false; - memcpy(ies->data, ie, ielen); + memcpy(ies->data, data->ie, data->ielen); - switch (ftype) { + switch (data->ftype) { case CFG80211_BSS_FTYPE_BEACON: ies->from_beacon = true; fallthrough; @@ -2008,42 +2308,37 @@ } rcu_assign_pointer(tmp.pub.ies, ies); - signal_valid = data->chan == channel; - res = cfg80211_bss_update(wiphy_to_rdev(wiphy), &tmp, signal_valid, ts); + signal_valid = drv_data->chan == channel; + spin_lock_bh(&rdev->bss_lock); + res = __cfg80211_bss_update(rdev, &tmp, signal_valid, ts); if (!res) - return NULL; + goto drop; - if (channel->band == NL80211_BAND_60GHZ) { - bss_type = res->pub.capability & WLAN_CAPABILITY_DMG_TYPE_MASK; - if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP || - bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS) - regulatory_hint_found_beacon(wiphy, channel, gfp); - } else { - if (res->pub.capability & WLAN_CAPABILITY_ESS) - regulatory_hint_found_beacon(wiphy, channel, gfp); - } + rdev_inform_bss(rdev, &res->pub, ies, drv_data->drv_data); - if (non_tx_data) { + if (data->bss_source == BSS_SOURCE_MBSSID) { /* this is a nontransmitting bss, we need to add it to * transmitting bss' list if it is not there */ - spin_lock_bh(&rdev->bss_lock); - if (cfg80211_add_nontrans_list(non_tx_data->tx_bss, - &res->pub)) { + if (cfg80211_add_nontrans_list(data->source_bss, &res->pub)) { if (__cfg80211_unlink_bss(rdev, res)) { rdev->bss_generation++; res = NULL; } } - spin_unlock_bh(&rdev->bss_lock); if (!res) - return NULL; + goto drop; } + spin_unlock_bh(&rdev->bss_lock); trace_cfg80211_return_bss(&res->pub); - /* cfg80211_bss_update gives us a referenced result */ + /* __cfg80211_bss_update gives us a referenced result */ return &res->pub; + +drop: + spin_unlock_bh(&rdev->bss_lock); + return NULL; } static const struct element @@ -2118,43 +2413,48 @@ } EXPORT_SYMBOL(cfg80211_merge_profile); -static void cfg80211_parse_mbssid_data(struct wiphy *wiphy, - struct cfg80211_inform_bss *data, - enum cfg80211_bss_frame_type ftype, - const u8 *bssid, u64 tsf, - u16 beacon_interval, const u8 *ie, - size_t ielen, - struct cfg80211_non_tx_bss *non_tx_data, +static void +cfg80211_parse_mbssid_data(struct wiphy *wiphy, + struct cfg80211_inform_single_bss_data *tx_data, + struct cfg80211_bss *source_bss, gfp_t gfp) { + struct cfg80211_inform_single_bss_data data = { + .drv_data = tx_data->drv_data, + .ftype = tx_data->ftype, + .tsf = tx_data->tsf, + .beacon_interval = tx_data->beacon_interval, + .source_bss = source_bss, + .bss_source = BSS_SOURCE_MBSSID, + }; const u8 *mbssid_index_ie; const struct element *elem, *sub; - size_t new_ie_len; - u8 new_bssid[ETH_ALEN]; u8 *new_ie, *profile; u64 seen_indices = 0; - u16 capability; struct cfg80211_bss *bss; - if (!non_tx_data) + if (!source_bss) return; - if (!cfg80211_find_elem(WLAN_EID_MULTIPLE_BSSID, ie, ielen)) + if (!cfg80211_find_elem(WLAN_EID_MULTIPLE_BSSID, + tx_data->ie, tx_data->ielen)) return; if (!wiphy->support_mbssid) return; if (wiphy->support_only_he_mbssid && - !cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY, ie, ielen)) + !cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY, + tx_data->ie, tx_data->ielen)) return; new_ie = kmalloc(IEEE80211_MAX_DATA_LEN, gfp); if (!new_ie) return; - profile = kmalloc(ielen, gfp); + profile = kmalloc(tx_data->ielen, gfp); if (!profile) goto out; - for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, ie, ielen) { + for_each_element_id(elem, WLAN_EID_MULTIPLE_BSSID, + tx_data->ie, tx_data->ielen) { if (elem->datalen < 4) continue; if (elem->data[0] < 1 || (int)elem->data[0] > 8) @@ -2176,12 +2476,13 @@ continue; } - memset(profile, 0, ielen); - profile_len = cfg80211_merge_profile(ie, ielen, + memset(profile, 0, tx_data->ielen); + profile_len = cfg80211_merge_profile(tx_data->ie, + tx_data->ielen, elem, sub, profile, - ielen); + tx_data->ielen); /* found a Nontransmitted BSSID Profile */ mbssid_index_ie = cfg80211_find_ie @@ -2201,31 +2502,27 @@ seen_indices |= BIT_ULL(mbssid_index_ie[2]); - non_tx_data->bssid_index = mbssid_index_ie[2]; - non_tx_data->max_bssid_indicator = elem->data[0]; + data.bssid_index = mbssid_index_ie[2]; + data.max_bssid_indicator = elem->data[0]; + + cfg80211_gen_new_bssid(tx_data->bssid, + data.max_bssid_indicator, + data.bssid_index, + data.bssid); - cfg80211_gen_new_bssid(bssid, - non_tx_data->max_bssid_indicator, - non_tx_data->bssid_index, - new_bssid); memset(new_ie, 0, IEEE80211_MAX_DATA_LEN); - new_ie_len = cfg80211_gen_new_ie(ie, ielen, + data.ie = new_ie; + data.ielen = cfg80211_gen_new_ie(tx_data->ie, + tx_data->ielen, profile, - profile_len, new_ie, - gfp); - if (!new_ie_len) + profile_len, + new_ie, + IEEE80211_MAX_DATA_LEN); + if (!data.ielen) continue; - capability = get_unaligned_le16(profile + 2); - bss = cfg80211_inform_single_bss_data(wiphy, data, - ftype, - new_bssid, tsf, - capability, - beacon_interval, - new_ie, - new_ie_len, - non_tx_data, - gfp); + data.capability = get_unaligned_le16(profile + 2); + bss = cfg80211_inform_single_bss_data(wiphy, &data, gfp); if (!bss) break; cfg80211_put_bss(wiphy, bss); @@ -2237,142 +2534,425 @@ kfree(profile); } -struct cfg80211_bss * -cfg80211_inform_bss_data(struct wiphy *wiphy, - struct cfg80211_inform_bss *data, - enum cfg80211_bss_frame_type ftype, - const u8 *bssid, u64 tsf, u16 capability, - u16 beacon_interval, const u8 *ie, size_t ielen, +ssize_t cfg80211_defragment_element(const struct element *elem, const u8 *ies, + size_t ieslen, u8 *data, size_t data_len, + u8 frag_id) +{ + const struct element *next; + ssize_t copied; + u8 elem_datalen; + + if (!elem) + return -EINVAL; + + /* elem might be invalid after the memmove */ + next = (void *)(elem->data + elem->datalen); + elem_datalen = elem->datalen; + + if (elem->id == WLAN_EID_EXTENSION) { + copied = elem->datalen - 1; + if (copied > data_len) + return -ENOSPC; + + memmove(data, elem->data + 1, copied); + } else { + copied = elem->datalen; + if (copied > data_len) + return -ENOSPC; + + memmove(data, elem->data, copied); + } + + /* Fragmented elements must have 255 bytes */ + if (elem_datalen < 255) + return copied; + + for (elem = next; + elem->data < ies + ieslen && + elem->data + elem->datalen <= ies + ieslen; + elem = next) { + /* elem might be invalid after the memmove */ + next = (void *)(elem->data + elem->datalen); + + if (elem->id != frag_id) + break; + + elem_datalen = elem->datalen; + + if (copied + elem_datalen > data_len) + return -ENOSPC; + + memmove(data + copied, elem->data, elem_datalen); + copied += elem_datalen; + + /* Only the last fragment may be short */ + if (elem_datalen != 255) + break; + } + + return copied; +} +EXPORT_SYMBOL(cfg80211_defragment_element); + +struct cfg80211_mle { + struct ieee80211_multi_link_elem *mle; + struct ieee80211_mle_per_sta_profile + *sta_prof[IEEE80211_MLD_MAX_NUM_LINKS]; + ssize_t sta_prof_len[IEEE80211_MLD_MAX_NUM_LINKS]; + + u8 data[]; +}; + +static struct cfg80211_mle * +cfg80211_defrag_mle(const struct element *mle, const u8 *ie, size_t ielen, gfp_t gfp) { - struct cfg80211_bss *res; - struct cfg80211_non_tx_bss non_tx_data; + const struct element *elem; + struct cfg80211_mle *res; + size_t buf_len; + ssize_t mle_len; + u8 common_size, idx; + + if (!mle || !ieee80211_mle_size_ok(mle->data + 1, mle->datalen - 1)) + return NULL; + + /* Required length for first defragmentation */ + buf_len = mle->datalen - 1; + for_each_element(elem, mle->data + mle->datalen, + ielen - sizeof(*mle) + mle->datalen) { + if (elem->id != WLAN_EID_FRAGMENT) + break; - res = cfg80211_inform_single_bss_data(wiphy, data, ftype, bssid, tsf, - capability, beacon_interval, ie, - ielen, NULL, gfp); + buf_len += elem->datalen; + } + + res = kzalloc(struct_size(res, data, buf_len), gfp); if (!res) return NULL; - non_tx_data.tx_bss = res; - cfg80211_parse_mbssid_data(wiphy, data, ftype, bssid, tsf, - beacon_interval, ie, ielen, &non_tx_data, - gfp); + + mle_len = cfg80211_defragment_element(mle, ie, ielen, + res->data, buf_len, + WLAN_EID_FRAGMENT); + if (mle_len < 0) + goto error; + + res->mle = (void *)res->data; + + /* Find the sub-element area in the buffer */ + common_size = ieee80211_mle_common_size((u8 *)res->mle); + ie = res->data + common_size; + ielen = mle_len - common_size; + + idx = 0; + for_each_element_id(elem, IEEE80211_MLE_SUBELEM_PER_STA_PROFILE, + ie, ielen) { + res->sta_prof[idx] = (void *)elem->data; + res->sta_prof_len[idx] = elem->datalen; + + idx++; + if (idx >= IEEE80211_MLD_MAX_NUM_LINKS) + break; + } + if (!for_each_element_completed(elem, ie, ielen)) + goto error; + + /* Defragment sta_info in-place */ + for (idx = 0; idx < IEEE80211_MLD_MAX_NUM_LINKS && res->sta_prof[idx]; + idx++) { + if (res->sta_prof_len[idx] < 255) + continue; + + elem = (void *)res->sta_prof[idx] - 2; + + if (idx + 1 < ARRAY_SIZE(res->sta_prof) && + res->sta_prof[idx + 1]) + buf_len = (u8 *)res->sta_prof[idx + 1] - + (u8 *)res->sta_prof[idx]; + else + buf_len = ielen + ie - (u8 *)elem; + + res->sta_prof_len[idx] = + cfg80211_defragment_element(elem, + (u8 *)elem, buf_len, + (u8 *)res->sta_prof[idx], + buf_len, + IEEE80211_MLE_SUBELEM_FRAGMENT); + if (res->sta_prof_len[idx] < 0) + goto error; + } + return res; + +error: + kfree(res); + return NULL; } -EXPORT_SYMBOL(cfg80211_inform_bss_data); -static void -cfg80211_parse_mbssid_frame_data(struct wiphy *wiphy, - struct cfg80211_inform_bss *data, - struct ieee80211_mgmt *mgmt, size_t len, - struct cfg80211_non_tx_bss *non_tx_data, - gfp_t gfp) +static bool +cfg80211_tbtt_info_for_mld_ap(const u8 *ie, size_t ielen, u8 mld_id, u8 link_id, + const struct ieee80211_neighbor_ap_info **ap_info, + const u8 **tbtt_info) { - enum cfg80211_bss_frame_type ftype; - const u8 *ie = mgmt->u.probe_resp.variable; - size_t ielen = len - offsetof(struct ieee80211_mgmt, - u.probe_resp.variable); + const struct ieee80211_neighbor_ap_info *info; + const struct element *rnr; + const u8 *pos, *end; - ftype = ieee80211_is_beacon(mgmt->frame_control) ? - CFG80211_BSS_FTYPE_BEACON : CFG80211_BSS_FTYPE_PRESP; + for_each_element_id(rnr, WLAN_EID_REDUCED_NEIGHBOR_REPORT, ie, ielen) { + pos = rnr->data; + end = rnr->data + rnr->datalen; - cfg80211_parse_mbssid_data(wiphy, data, ftype, mgmt->bssid, - le64_to_cpu(mgmt->u.probe_resp.timestamp), - le16_to_cpu(mgmt->u.probe_resp.beacon_int), - ie, ielen, non_tx_data, gfp); + /* RNR IE may contain more than one NEIGHBOR_AP_INFO */ + while (sizeof(*info) <= end - pos) { + const struct ieee80211_rnr_mld_params *mld_params; + u16 params; + u8 length, i, count, mld_params_offset; + u8 type, lid; + + info = (void *)pos; + count = u8_get_bits(info->tbtt_info_hdr, + IEEE80211_AP_INFO_TBTT_HDR_COUNT) + 1; + length = info->tbtt_info_len; + + pos += sizeof(*info); + + if (count * length > end - pos) + return false; + + type = u8_get_bits(info->tbtt_info_hdr, + IEEE80211_AP_INFO_TBTT_HDR_TYPE); + + /* Only accept full TBTT information. NSTR mobile APs + * use the shortened version, but we ignore them here. + */ + if (type == IEEE80211_TBTT_INFO_TYPE_TBTT && + length >= + offsetofend(struct ieee80211_tbtt_info_ge_11, + mld_params)) { + mld_params_offset = + offsetof(struct ieee80211_tbtt_info_ge_11, mld_params); + } else { + pos += count * length; + continue; } -static void -cfg80211_update_notlisted_nontrans(struct wiphy *wiphy, - struct cfg80211_bss *nontrans_bss, - struct ieee80211_mgmt *mgmt, size_t len) -{ - u8 *ie, *new_ie, *pos; - const struct element *nontrans_ssid; - const u8 *trans_ssid, *mbssid; - size_t ielen = len - offsetof(struct ieee80211_mgmt, - u.probe_resp.variable); - size_t new_ie_len; - struct cfg80211_bss_ies *new_ies; - const struct cfg80211_bss_ies *old; - size_t cpy_len; + for (i = 0; i < count; i++) { + mld_params = (void *)pos + mld_params_offset; + params = le16_to_cpu(mld_params->params); + + lid = u16_get_bits(params, + IEEE80211_RNR_MLD_PARAMS_LINK_ID); + + if (mld_id == mld_params->mld_id && + link_id == lid) { + *ap_info = info; + *tbtt_info = pos; + + return true; + } + + pos += length; + } + } + } - lockdep_assert_held(&wiphy_to_rdev(wiphy)->bss_lock); + return false; +} - ie = mgmt->u.probe_resp.variable; +static void cfg80211_parse_ml_sta_data(struct wiphy *wiphy, + struct cfg80211_inform_single_bss_data *tx_data, + struct cfg80211_bss *source_bss, + gfp_t gfp) +{ + struct cfg80211_inform_single_bss_data data = { + .drv_data = tx_data->drv_data, + .ftype = tx_data->ftype, + .source_bss = source_bss, + .bss_source = BSS_SOURCE_STA_PROFILE, + }; + struct ieee80211_multi_link_elem *ml_elem; + const struct element *elem; + struct cfg80211_mle *mle; + u16 control; + u8 *new_ie; + struct cfg80211_bss *bss; + int mld_id; + u16 seen_links = 0; + const u8 *pos; + u8 i; - new_ie_len = ielen; - trans_ssid = cfg80211_find_ie(WLAN_EID_SSID, ie, ielen); - if (!trans_ssid) + if (!source_bss) return; - new_ie_len -= trans_ssid[1]; - mbssid = cfg80211_find_ie(WLAN_EID_MULTIPLE_BSSID, ie, ielen); - /* - * It's not valid to have the MBSSID element before SSID - * ignore if that happens - the code below assumes it is - * after (while copying things inbetween). - */ - if (!mbssid || mbssid < trans_ssid) + + if (tx_data->ftype != CFG80211_BSS_FTYPE_PRESP) return; - new_ie_len -= mbssid[1]; - nontrans_ssid = ieee80211_bss_get_elem(nontrans_bss, WLAN_EID_SSID); - if (!nontrans_ssid) + elem = cfg80211_find_ext_elem(WLAN_EID_EXT_EHT_MULTI_LINK, + tx_data->ie, tx_data->ielen); + if (!elem || !ieee80211_mle_size_ok(elem->data + 1, elem->datalen - 1)) return; - new_ie_len += nontrans_ssid->datalen; + ml_elem = (void *)elem->data + 1; + control = le16_to_cpu(ml_elem->control); + if (u16_get_bits(control, IEEE80211_ML_CONTROL_TYPE) != + IEEE80211_ML_CONTROL_TYPE_BASIC) + return; - /* generate new ie for nontrans BSS - * 1. replace SSID with nontrans BSS' SSID - * 2. skip MBSSID IE - */ - new_ie = kzalloc(new_ie_len, GFP_ATOMIC); - if (!new_ie) + /* Must be present when transmitted by an AP (in a probe response) */ + if (!(control & IEEE80211_MLC_BASIC_PRES_BSS_PARAM_CH_CNT) || + !(control & IEEE80211_MLC_BASIC_PRES_LINK_ID) || + !(control & IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP)) return; - new_ies = kzalloc(sizeof(*new_ies) + new_ie_len, GFP_ATOMIC); - if (!new_ies) - goto out_free; - - pos = new_ie; - - /* copy the nontransmitted SSID */ - cpy_len = nontrans_ssid->datalen + 2; - memcpy(pos, nontrans_ssid, cpy_len); - pos += cpy_len; - /* copy the IEs between SSID and MBSSID */ - cpy_len = trans_ssid[1] + 2; - memcpy(pos, (trans_ssid + cpy_len), (mbssid - (trans_ssid + cpy_len))); - pos += (mbssid - (trans_ssid + cpy_len)); - /* copy the IEs after MBSSID */ - cpy_len = mbssid[1] + 2; - memcpy(pos, mbssid + cpy_len, ((ie + ielen) - (mbssid + cpy_len))); - - /* update ie */ - new_ies->len = new_ie_len; - new_ies->tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp); - new_ies->from_beacon = ieee80211_is_beacon(mgmt->frame_control); - memcpy(new_ies->data, new_ie, new_ie_len); - if (ieee80211_is_probe_resp(mgmt->frame_control)) { - old = rcu_access_pointer(nontrans_bss->proberesp_ies); - rcu_assign_pointer(nontrans_bss->proberesp_ies, new_ies); - rcu_assign_pointer(nontrans_bss->ies, new_ies); - if (old) - kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head); + /* length + MLD MAC address + link ID info + BSS Params Change Count */ + pos = ml_elem->variable + 1 + 6 + 1 + 1; + + if (u16_get_bits(control, IEEE80211_MLC_BASIC_PRES_MED_SYNC_DELAY)) + pos += 2; + if (u16_get_bits(control, IEEE80211_MLC_BASIC_PRES_EML_CAPA)) + pos += 2; + + /* MLD capabilities and operations */ + pos += 2; + + /* Not included when the (nontransmitted) AP is responding itself, + * but defined to zero then (Draft P802.11be_D3.0, 9.4.2.170.2) + */ + if (u16_get_bits(control, IEEE80211_MLC_BASIC_PRES_MLD_ID)) { + mld_id = *pos; + pos += 1; } else { - old = rcu_access_pointer(nontrans_bss->beacon_ies); - rcu_assign_pointer(nontrans_bss->beacon_ies, new_ies); - cfg80211_update_hidden_bsses(bss_from_pub(nontrans_bss), - new_ies, old); - rcu_assign_pointer(nontrans_bss->ies, new_ies); - if (old) - kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head); + mld_id = 0; + } + + /* Extended MLD capabilities and operations */ + pos += 2; + + /* Fully defrag the ML element for sta information/profile iteration */ + mle = cfg80211_defrag_mle(elem, tx_data->ie, tx_data->ielen, gfp); + if (!mle) + return; + + new_ie = kmalloc(IEEE80211_MAX_DATA_LEN, gfp); + if (!new_ie) + goto out; + + for (i = 0; i < ARRAY_SIZE(mle->sta_prof) && mle->sta_prof[i]; i++) { + const struct ieee80211_neighbor_ap_info *ap_info; + enum nl80211_band band; + u32 freq; + const u8 *profile; + const u8 *tbtt_info; + ssize_t profile_len; + u8 link_id; + + if (!ieee80211_mle_basic_sta_prof_size_ok((u8 *)mle->sta_prof[i], + mle->sta_prof_len[i])) + continue; + + control = le16_to_cpu(mle->sta_prof[i]->control); + + if (!(control & IEEE80211_MLE_STA_CONTROL_COMPLETE_PROFILE)) + continue; + + link_id = u16_get_bits(control, + IEEE80211_MLE_STA_CONTROL_LINK_ID); + if (seen_links & BIT(link_id)) + break; + seen_links |= BIT(link_id); + + if (!(control & IEEE80211_MLE_STA_CONTROL_BEACON_INT_PRESENT) || + !(control & IEEE80211_MLE_STA_CONTROL_TSF_OFFS_PRESENT) || + !(control & IEEE80211_MLE_STA_CONTROL_STA_MAC_ADDR_PRESENT)) + continue; + + memcpy(data.bssid, mle->sta_prof[i]->variable, ETH_ALEN); + data.beacon_interval = + get_unaligned_le16(mle->sta_prof[i]->variable + 6); + data.tsf = tx_data->tsf + + get_unaligned_le64(mle->sta_prof[i]->variable + 8); + + /* sta_info_len counts itself */ + profile = mle->sta_prof[i]->variable + + mle->sta_prof[i]->sta_info_len - 1; + profile_len = (u8 *)mle->sta_prof[i] + mle->sta_prof_len[i] - + profile; + + if (profile_len < 2) + continue; + + data.capability = get_unaligned_le16(profile); + profile += 2; + profile_len -= 2; + + /* Find in RNR to look up channel information */ + if (!cfg80211_tbtt_info_for_mld_ap(tx_data->ie, tx_data->ielen, + mld_id, link_id, + &ap_info, &tbtt_info)) + continue; + + /* We could sanity check the BSSID is included */ + + if (!ieee80211_operating_class_to_band(ap_info->op_class, + &band)) + continue; + + freq = ieee80211_channel_to_freq_khz(ap_info->channel, band); + data.channel = ieee80211_get_channel_khz(wiphy, freq); + + /* Generate new elements */ + memset(new_ie, 0, IEEE80211_MAX_DATA_LEN); + data.ie = new_ie; + data.ielen = cfg80211_gen_new_ie(tx_data->ie, tx_data->ielen, + profile, profile_len, + new_ie, + IEEE80211_MAX_DATA_LEN); + if (!data.ielen) + continue; + + bss = cfg80211_inform_single_bss_data(wiphy, &data, gfp); + if (!bss) + break; + cfg80211_put_bss(wiphy, bss); } -out_free: +out: kfree(new_ie); + kfree(mle); } +struct cfg80211_bss * +cfg80211_inform_bss_data(struct wiphy *wiphy, + struct cfg80211_inform_bss *data, + enum cfg80211_bss_frame_type ftype, + const u8 *bssid, u64 tsf, u16 capability, + u16 beacon_interval, const u8 *ie, size_t ielen, + gfp_t gfp) +{ + struct cfg80211_inform_single_bss_data inform_data = { + .drv_data = data, + .ftype = ftype, + .tsf = tsf, + .capability = capability, + .beacon_interval = beacon_interval, + .ie = ie, + .ielen = ielen, + }; + struct cfg80211_bss *res; + + memcpy(inform_data.bssid, bssid, ETH_ALEN); + + res = cfg80211_inform_single_bss_data(wiphy, &inform_data, gfp); + if (!res) + return NULL; + + cfg80211_parse_mbssid_data(wiphy, &inform_data, res, gfp); + + cfg80211_parse_ml_sta_data(wiphy, &inform_data, res, gfp); + + return res; +} +EXPORT_SYMBOL(cfg80211_inform_bss_data); + /* cfg80211_inform_bss_width_frame helper */ static struct cfg80211_bss * cfg80211_inform_single_bss_frame_data(struct wiphy *wiphy, @@ -2380,6 +2960,7 @@ struct ieee80211_mgmt *mgmt, size_t len, gfp_t gfp) { + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); struct cfg80211_internal_bss tmp = {}, *res; struct cfg80211_bss_ies *ies; struct ieee80211_channel *channel; @@ -2426,8 +3007,7 @@ variable = ext->u.s1g_beacon.variable; } - channel = cfg80211_get_bss_channel(wiphy, variable, - ielen, data->chan, data->scan_width); + channel = cfg80211_get_bss_channel(wiphy, variable, ielen, data->chan); if (!channel) return NULL; @@ -2451,6 +3031,16 @@ capability = le16_to_cpu(mgmt->u.probe_resp.capab_info); } + if (channel->band == NL80211_BAND_60GHZ) { + bss_type = capability & WLAN_CAPABILITY_DMG_TYPE_MASK; + if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP || + bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS) + regulatory_hint_found_beacon(wiphy, channel, gfp); + } else { + if (capability & WLAN_CAPABILITY_ESS) + regulatory_hint_found_beacon(wiphy, channel, gfp); + } + ies = kzalloc(sizeof(*ies) + ielen, gfp); if (!ies) return NULL; @@ -2470,7 +3060,6 @@ tmp.pub.beacon_interval = beacon_int; tmp.pub.capability = capability; tmp.pub.channel = channel; - tmp.pub.scan_width = data->scan_width; tmp.pub.signal = data->signal; tmp.ts_boottime = data->boottime_ns; tmp.parent_tsf = data->parent_tsf; @@ -2479,24 +3068,22 @@ ether_addr_copy(tmp.parent_bssid, data->parent_bssid); signal_valid = data->chan == channel; - res = cfg80211_bss_update(wiphy_to_rdev(wiphy), &tmp, signal_valid, - jiffies); + spin_lock_bh(&rdev->bss_lock); + res = __cfg80211_bss_update(rdev, &tmp, signal_valid, jiffies); if (!res) - return NULL; + goto drop; - if (channel->band == NL80211_BAND_60GHZ) { - bss_type = res->pub.capability & WLAN_CAPABILITY_DMG_TYPE_MASK; - if (bss_type == WLAN_CAPABILITY_DMG_TYPE_AP || - bss_type == WLAN_CAPABILITY_DMG_TYPE_PBSS) - regulatory_hint_found_beacon(wiphy, channel, gfp); - } else { - if (res->pub.capability & WLAN_CAPABILITY_ESS) - regulatory_hint_found_beacon(wiphy, channel, gfp); - } + rdev_inform_bss(rdev, &res->pub, ies, data->drv_data); + + spin_unlock_bh(&rdev->bss_lock); trace_cfg80211_return_bss(&res->pub); - /* cfg80211_bss_update gives us a referenced result */ + /* __cfg80211_bss_update gives us a referenced result */ return &res->pub; + +drop: + spin_unlock_bh(&rdev->bss_lock); + return NULL; } struct cfg80211_bss * @@ -2505,51 +3092,34 @@ struct ieee80211_mgmt *mgmt, size_t len, gfp_t gfp) { - struct cfg80211_bss *res, *tmp_bss; - const u8 *ie = mgmt->u.probe_resp.variable; - const struct cfg80211_bss_ies *ies1, *ies2; - size_t ielen = len - offsetof(struct ieee80211_mgmt, - u.probe_resp.variable); - struct cfg80211_non_tx_bss non_tx_data = {}; + struct cfg80211_inform_single_bss_data inform_data = { + .drv_data = data, + .ie = mgmt->u.probe_resp.variable, + .ielen = len - offsetof(struct ieee80211_mgmt, + u.probe_resp.variable), + }; + struct cfg80211_bss *res; res = cfg80211_inform_single_bss_frame_data(wiphy, data, mgmt, len, gfp); + if (!res) + return NULL; - /* don't do any further MBSSID handling for S1G */ + /* don't do any further MBSSID/ML handling for S1G */ if (ieee80211_is_s1g_beacon(mgmt->frame_control)) return res; - if (!res || !wiphy->support_mbssid || - !cfg80211_find_elem(WLAN_EID_MULTIPLE_BSSID, ie, ielen)) - return res; - if (wiphy->support_only_he_mbssid && - !cfg80211_find_ext_elem(WLAN_EID_EXT_HE_CAPABILITY, ie, ielen)) - return res; + inform_data.ftype = ieee80211_is_beacon(mgmt->frame_control) ? + CFG80211_BSS_FTYPE_BEACON : CFG80211_BSS_FTYPE_PRESP; + memcpy(inform_data.bssid, mgmt->bssid, ETH_ALEN); + inform_data.tsf = le64_to_cpu(mgmt->u.probe_resp.timestamp); + inform_data.beacon_interval = + le16_to_cpu(mgmt->u.probe_resp.beacon_int); - non_tx_data.tx_bss = res; /* process each non-transmitting bss */ - cfg80211_parse_mbssid_frame_data(wiphy, data, mgmt, len, - &non_tx_data, gfp); - - spin_lock_bh(&wiphy_to_rdev(wiphy)->bss_lock); - - /* check if the res has other nontransmitting bss which is not - * in MBSSID IE - */ - ies1 = rcu_access_pointer(res->ies); + cfg80211_parse_mbssid_data(wiphy, &inform_data, res, gfp); - /* go through nontrans_list, if the timestamp of the BSS is - * earlier than the timestamp of the transmitting BSS then - * update it - */ - list_for_each_entry(tmp_bss, &res->nontrans_list, - nontrans_list) { - ies2 = rcu_access_pointer(tmp_bss->ies); - if (ies2->tsf < ies1->tsf) - cfg80211_update_notlisted_nontrans(wiphy, tmp_bss, - mgmt, len); - } - spin_unlock_bh(&wiphy_to_rdev(wiphy)->bss_lock); + cfg80211_parse_ml_sta_data(wiphy, &inform_data, res, gfp); return res; } @@ -3043,59 +3613,63 @@ cfg = (u8 *)ie + 2; memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; - sprintf(buf, "Mesh Network Path Selection Protocol ID: " - "0x%02X", cfg[0]); - iwe.u.data.length = strlen(buf); + iwe.u.data.length = sprintf(buf, + "Mesh Network Path Selection Protocol ID: 0x%02X", + cfg[0]); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; - sprintf(buf, "Path Selection Metric ID: 0x%02X", + iwe.u.data.length = sprintf(buf, + "Path Selection Metric ID: 0x%02X", cfg[1]); - iwe.u.data.length = strlen(buf); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; - sprintf(buf, "Congestion Control Mode ID: 0x%02X", + iwe.u.data.length = sprintf(buf, + "Congestion Control Mode ID: 0x%02X", cfg[2]); - iwe.u.data.length = strlen(buf); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; - sprintf(buf, "Synchronization ID: 0x%02X", cfg[3]); - iwe.u.data.length = strlen(buf); + iwe.u.data.length = sprintf(buf, + "Synchronization ID: 0x%02X", + cfg[3]); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; - sprintf(buf, "Authentication ID: 0x%02X", cfg[4]); - iwe.u.data.length = strlen(buf); + iwe.u.data.length = sprintf(buf, + "Authentication ID: 0x%02X", + cfg[4]); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; - sprintf(buf, "Formation Info: 0x%02X", cfg[5]); - iwe.u.data.length = strlen(buf); + iwe.u.data.length = sprintf(buf, + "Formation Info: 0x%02X", + cfg[5]); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; - sprintf(buf, "Capabilities: 0x%02X", cfg[6]); - iwe.u.data.length = strlen(buf); + iwe.u.data.length = sprintf(buf, + "Capabilities: 0x%02X", + cfg[6]); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, @@ -3151,17 +3725,16 @@ memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; - sprintf(buf, "tsf=%016llx", (unsigned long long)(ies->tsf)); - iwe.u.data.length = strlen(buf); + iwe.u.data.length = sprintf(buf, "tsf=%016llx", + (unsigned long long)(ies->tsf)); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) goto unlock; memset(&iwe, 0, sizeof(iwe)); iwe.cmd = IWEVCUSTOM; - sprintf(buf, " Last beacon: %ums ago", + iwe.u.data.length = sprintf(buf, " Last beacon: %ums ago", elapsed_jiffies_msecs(bss->ts)); - iwe.u.data.length = strlen(buf); current_ev = iwe_stream_add_point_check(info, current_ev, end_buf, &iwe, buf); if (IS_ERR(current_ev)) diff -ruw linux-6.4/net/wireless/sme.c linux-6.4-fbx/net/wireless/sme.c --- linux-6.4/net/wireless/sme.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/sme.c 2024-04-22 13:40:53.167947433 +0200 @@ -5,7 +5,7 @@ * (for nl80211's connect() and wext) * * Copyright 2009 Johannes Berg - * Copyright (C) 2009, 2020, 2022 Intel Corporation. All rights reserved. + * Copyright (C) 2009, 2020, 2022-2023 Intel Corporation. All rights reserved. * Copyright 2017 Intel Deutschland GmbH */ @@ -67,7 +67,7 @@ struct cfg80211_scan_request *request; int n_channels, err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (rdev->scan_req || rdev->scan_msg) return -EBUSY; @@ -151,7 +151,7 @@ struct cfg80211_assoc_request req = {}; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!wdev->conn) return 0; @@ -255,16 +255,13 @@ if (!wdev->netdev) continue; - wdev_lock(wdev); - if (!netif_running(wdev->netdev)) { - wdev_unlock(wdev); + if (!netif_running(wdev->netdev)) continue; - } + if (!wdev->conn || - wdev->conn->state == CFG80211_CONN_CONNECTED) { - wdev_unlock(wdev); + wdev->conn->state == CFG80211_CONN_CONNECTED) continue; - } + if (wdev->conn->params.bssid) { memcpy(bssid_buf, wdev->conn->params.bssid, ETH_ALEN); bssid = bssid_buf; @@ -279,7 +276,6 @@ cr.timeout_reason = treason; __cfg80211_connect_result(wdev->netdev, &cr, false); } - wdev_unlock(wdev); } wiphy_unlock(&rdev->wiphy); @@ -300,7 +296,7 @@ struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); struct cfg80211_bss *bss; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); bss = cfg80211_get_bss(wdev->wiphy, wdev->conn->params.channel, wdev->conn->params.bssid, @@ -317,13 +313,13 @@ return bss; } -static void __cfg80211_sme_scan_done(struct net_device *dev) +void cfg80211_sme_scan_done(struct net_device *dev) { struct wireless_dev *wdev = dev->ieee80211_ptr; struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); struct cfg80211_bss *bss; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!wdev->conn) return; @@ -339,15 +335,6 @@ schedule_work(&rdev->conn_work); } -void cfg80211_sme_scan_done(struct net_device *dev) -{ - struct wireless_dev *wdev = dev->ieee80211_ptr; - - wdev_lock(wdev); - __cfg80211_sme_scan_done(dev); - wdev_unlock(wdev); -} - void cfg80211_sme_rx_auth(struct wireless_dev *wdev, const u8 *buf, size_t len) { struct wiphy *wiphy = wdev->wiphy; @@ -355,7 +342,7 @@ struct ieee80211_mgmt *mgmt = (struct ieee80211_mgmt *)buf; u16 status_code = le16_to_cpu(mgmt->u.auth.status_code); - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (!wdev->conn || wdev->conn->state == CFG80211_CONN_CONNECTED) return; @@ -491,6 +478,21 @@ } } +void cfg80211_wdev_release_link_bsses(struct wireless_dev *wdev, u16 link_mask) +{ + unsigned int link; + + for_each_valid_link(wdev, link) { + if (!wdev->links[link].client.current_bss || + !(link_mask & BIT(link))) + continue; + cfg80211_unhold_bss(wdev->links[link].client.current_bss); + cfg80211_put_bss(wdev->wiphy, + &wdev->links[link].client.current_bss->pub); + wdev->links[link].client.current_bss = NULL; + } +} + static int cfg80211_sme_get_conn_ies(struct wireless_dev *wdev, const u8 *ies, size_t ies_len, const u8 **out_ies, size_t *out_ies_len) @@ -687,14 +689,14 @@ * need not issue a disconnect hint and reset any info such * as chan dfs state, etc. */ - list_for_each_entry(rdev, &cfg80211_rdev_list, list) { + for_each_rdev(rdev) { + wiphy_lock(&rdev->wiphy); list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { - wdev_lock(wdev); if (wdev->conn || wdev->connected || cfg80211_beaconing_iface_active(wdev)) is_all_idle = false; - wdev_unlock(wdev); } + wiphy_unlock(&rdev->wiphy); } return is_all_idle; @@ -746,7 +748,7 @@ const u8 *connected_addr; bool bss_not_found = false; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) @@ -1078,7 +1080,7 @@ unsigned int link; const u8 *connected_addr; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) @@ -1279,24 +1281,29 @@ } EXPORT_SYMBOL(cfg80211_roamed); -void __cfg80211_port_authorized(struct wireless_dev *wdev, const u8 *bssid, +void __cfg80211_port_authorized(struct wireless_dev *wdev, const u8 *peer_addr, const u8 *td_bitmap, u8 td_bitmap_len) { - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && - wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) + wdev->iftype != NL80211_IFTYPE_P2P_CLIENT && + wdev->iftype != NL80211_IFTYPE_AP && + wdev->iftype != NL80211_IFTYPE_P2P_GO)) return; + if (wdev->iftype == NL80211_IFTYPE_STATION || + wdev->iftype == NL80211_IFTYPE_P2P_CLIENT) { if (WARN_ON(!wdev->connected) || - WARN_ON(!ether_addr_equal(wdev->u.client.connected_addr, bssid))) + WARN_ON(!ether_addr_equal(wdev->u.client.connected_addr, peer_addr))) return; + } nl80211_send_port_authorized(wiphy_to_rdev(wdev->wiphy), wdev->netdev, - bssid, td_bitmap, td_bitmap_len); + peer_addr, td_bitmap, td_bitmap_len); } -void cfg80211_port_authorized(struct net_device *dev, const u8 *bssid, +void cfg80211_port_authorized(struct net_device *dev, const u8 *peer_addr, const u8 *td_bitmap, u8 td_bitmap_len, gfp_t gfp) { struct wireless_dev *wdev = dev->ieee80211_ptr; @@ -1304,7 +1311,7 @@ struct cfg80211_event *ev; unsigned long flags; - if (WARN_ON(!bssid)) + if (WARN_ON(!peer_addr)) return; ev = kzalloc(sizeof(*ev) + td_bitmap_len, gfp); @@ -1312,7 +1319,7 @@ return; ev->type = EVENT_PORT_AUTHORIZED; - memcpy(ev->pa.bssid, bssid, ETH_ALEN); + memcpy(ev->pa.peer_addr, peer_addr, ETH_ALEN); ev->pa.td_bitmap = ((u8 *)ev) + sizeof(*ev); ev->pa.td_bitmap_len = td_bitmap_len; memcpy((void *)ev->pa.td_bitmap, td_bitmap, td_bitmap_len); @@ -1338,7 +1345,7 @@ union iwreq_data wrqu; #endif - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) @@ -1428,7 +1435,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; int err; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); /* * If we have an ssid_len, we're trying to connect or are @@ -1534,7 +1541,7 @@ struct wireless_dev *wdev = dev->ieee80211_ptr; int err = 0; - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); kfree_sensitive(wdev->connect_keys); wdev->connect_keys = NULL; @@ -1569,19 +1576,19 @@ container_of(work, struct wireless_dev, disconnect_wk); struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); - wdev_lock(wdev); + wiphy_lock(wdev->wiphy); if (wdev->conn_owner_nlportid) { switch (wdev->iftype) { case NL80211_IFTYPE_ADHOC: - __cfg80211_leave_ibss(rdev, wdev->netdev, false); + cfg80211_leave_ibss(rdev, wdev->netdev, false); break; case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: - __cfg80211_stop_ap(rdev, wdev->netdev, -1, false); + cfg80211_stop_ap(rdev, wdev->netdev, -1, false); break; case NL80211_IFTYPE_MESH_POINT: - __cfg80211_leave_mesh(rdev, wdev->netdev); + cfg80211_leave_mesh(rdev, wdev->netdev); break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: @@ -1606,5 +1613,5 @@ } } - wdev_unlock(wdev); + wiphy_unlock(wdev->wiphy); } diff -ruw linux-6.4/net/wireless/sysfs.c linux-6.4-fbx/net/wireless/sysfs.c --- linux-6.4/net/wireless/sysfs.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/sysfs.c 2024-04-22 13:40:53.167947433 +0200 @@ -5,7 +5,7 @@ * * Copyright 2005-2006 Jiri Benc * Copyright 2006 Johannes Berg - * Copyright (C) 2020-2021 Intel Corporation + * Copyright (C) 2020-2021, 2023 Intel Corporation */ #include @@ -36,6 +36,7 @@ SHOW_FMT(index, "%d", wiphy_idx); SHOW_FMT(macaddress, "%pM", wiphy.perm_addr); SHOW_FMT(address_mask, "%pM", wiphy.addr_mask); +SHOW_FMT(dev_port, "%d", wiphy.dev_port); static ssize_t name_show(struct device *dev, struct device_attribute *attr, @@ -70,6 +71,7 @@ &dev_attr_macaddress.attr, &dev_attr_address_mask.attr, &dev_attr_addresses.attr, + &dev_attr_dev_port.attr, &dev_attr_name.attr, NULL, }; @@ -105,14 +107,18 @@ cfg80211_leave_all(rdev); cfg80211_process_rdev_events(rdev); } + cfg80211_process_wiphy_works(rdev, NULL); if (rdev->ops->suspend) ret = rdev_suspend(rdev, rdev->wiphy.wowlan_config); if (ret == 1) { /* Driver refuse to configure wowlan */ cfg80211_leave_all(rdev); cfg80211_process_rdev_events(rdev); + cfg80211_process_wiphy_works(rdev, NULL); ret = rdev_suspend(rdev, NULL); } + if (ret == 0) + rdev->suspended = true; } wiphy_unlock(&rdev->wiphy); rtnl_unlock(); @@ -132,6 +138,8 @@ wiphy_lock(&rdev->wiphy); if (rdev->wiphy.registered && rdev->ops->resume) ret = rdev_resume(rdev); + rdev->suspended = false; + schedule_work(&rdev->wiphy_work); wiphy_unlock(&rdev->wiphy); if (ret) diff -ruw linux-6.4/net/wireless/trace.h linux-6.4-fbx/net/wireless/trace.h --- linux-6.4/net/wireless/trace.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/trace.h 2024-04-22 13:40:53.171947543 +0200 @@ -22,7 +22,7 @@ #define MAXNAME 32 #define WIPHY_ENTRY __array(char, wiphy_name, 32) -#define WIPHY_ASSIGN strlcpy(__entry->wiphy_name, wiphy_name(wiphy), MAXNAME) +#define WIPHY_ASSIGN strscpy(__entry->wiphy_name, wiphy_name(wiphy), MAXNAME) #define WIPHY_PR_FMT "%s" #define WIPHY_PR_ARG __entry->wiphy_name @@ -615,49 +615,47 @@ TRACE_EVENT(rdev_change_beacon, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, - struct cfg80211_beacon_data *info), + struct cfg80211_ap_update *info), TP_ARGS(wiphy, netdev, info), TP_STRUCT__entry( WIPHY_ENTRY NETDEV_ENTRY __field(int, link_id) - __dynamic_array(u8, head, info ? info->head_len : 0) - __dynamic_array(u8, tail, info ? info->tail_len : 0) - __dynamic_array(u8, beacon_ies, info ? info->beacon_ies_len : 0) - __dynamic_array(u8, proberesp_ies, - info ? info->proberesp_ies_len : 0) - __dynamic_array(u8, assocresp_ies, - info ? info->assocresp_ies_len : 0) - __dynamic_array(u8, probe_resp, info ? info->probe_resp_len : 0) + __dynamic_array(u8, head, info->beacon.head_len) + __dynamic_array(u8, tail, info->beacon.tail_len) + __dynamic_array(u8, beacon_ies, info->beacon.beacon_ies_len) + __dynamic_array(u8, proberesp_ies, info->beacon.proberesp_ies_len) + __dynamic_array(u8, assocresp_ies, info->beacon.assocresp_ies_len) + __dynamic_array(u8, probe_resp, info->beacon.probe_resp_len) ), TP_fast_assign( WIPHY_ASSIGN; NETDEV_ASSIGN; - if (info) { - __entry->link_id = info->link_id; - if (info->head) - memcpy(__get_dynamic_array(head), info->head, - info->head_len); - if (info->tail) - memcpy(__get_dynamic_array(tail), info->tail, - info->tail_len); - if (info->beacon_ies) + __entry->link_id = info->beacon.link_id; + if (info->beacon.head) + memcpy(__get_dynamic_array(head), + info->beacon.head, + info->beacon.head_len); + if (info->beacon.tail) + memcpy(__get_dynamic_array(tail), + info->beacon.tail, + info->beacon.tail_len); + if (info->beacon.beacon_ies) memcpy(__get_dynamic_array(beacon_ies), - info->beacon_ies, info->beacon_ies_len); - if (info->proberesp_ies) + info->beacon.beacon_ies, + info->beacon.beacon_ies_len); + if (info->beacon.proberesp_ies) memcpy(__get_dynamic_array(proberesp_ies), - info->proberesp_ies, - info->proberesp_ies_len); - if (info->assocresp_ies) + info->beacon.proberesp_ies, + info->beacon.proberesp_ies_len); + if (info->beacon.assocresp_ies) memcpy(__get_dynamic_array(assocresp_ies), - info->assocresp_ies, - info->assocresp_ies_len); - if (info->probe_resp) + info->beacon.assocresp_ies, + info->beacon.assocresp_ies_len); + if (info->beacon.probe_resp) memcpy(__get_dynamic_array(probe_resp), - info->probe_resp, info->probe_resp_len); - } else { - __entry->link_id = -1; - } + info->beacon.probe_resp, + info->beacon.probe_resp_len); ), TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", link_id:%d", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->link_id) @@ -1159,6 +1157,23 @@ __entry->ap_isolate, __entry->ht_opmode) ); +TRACE_EVENT(rdev_inform_bss, + TP_PROTO(struct wiphy *wiphy, struct cfg80211_bss *bss), + TP_ARGS(wiphy, bss), + TP_STRUCT__entry( + WIPHY_ENTRY + MAC_ENTRY(bssid) + CHAN_ENTRY + ), + TP_fast_assign( + WIPHY_ASSIGN; + MAC_ASSIGN(bssid, bss->bssid); + CHAN_ASSIGN(bss->channel); + ), + TP_printk(WIPHY_PR_FMT ", %pM, " CHAN_PR_FMT, + WIPHY_PR_ARG, __entry->bssid, CHAN_PR_ARG) +); + TRACE_EVENT(rdev_set_txq_params, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, struct ieee80211_txq_params *params), @@ -1306,16 +1321,18 @@ NETDEV_ENTRY MAC_ENTRY(bssid) __field(u16, reason_code) + __field(bool, local_state_change) ), TP_fast_assign( WIPHY_ASSIGN; NETDEV_ASSIGN; MAC_ASSIGN(bssid, req->bssid); __entry->reason_code = req->reason_code; + __entry->local_state_change = req->local_state_change; ), - TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: %pM, reason: %u", + TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", bssid: %pM, reason: %u, local_state_change:%d", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->bssid, - __entry->reason_code) + __entry->reason_code, __entry->local_state_change) ); TRACE_EVENT(rdev_disassoc, @@ -1779,15 +1796,16 @@ TRACE_EVENT(rdev_tdls_mgmt, TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, - u8 *peer, u8 action_code, u8 dialog_token, + u8 *peer, int link_id, u8 action_code, u8 dialog_token, u16 status_code, u32 peer_capability, bool initiator, const u8 *buf, size_t len), - TP_ARGS(wiphy, netdev, peer, action_code, dialog_token, status_code, - peer_capability, initiator, buf, len), + TP_ARGS(wiphy, netdev, peer, link_id, action_code, dialog_token, + status_code, peer_capability, initiator, buf, len), TP_STRUCT__entry( WIPHY_ENTRY NETDEV_ENTRY MAC_ENTRY(peer) + __field(int, link_id) __field(u8, action_code) __field(u8, dialog_token) __field(u16, status_code) @@ -1799,6 +1817,7 @@ WIPHY_ASSIGN; NETDEV_ASSIGN; MAC_ASSIGN(peer, peer); + __entry->link_id = link_id; __entry->action_code = action_code; __entry->dialog_token = dialog_token; __entry->status_code = status_code; @@ -1806,11 +1825,12 @@ __entry->initiator = initiator; memcpy(__get_dynamic_array(buf), buf, len); ), - TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", %pM, action_code: %u, " + TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", %pM" + ", link_id: %d, action_code: %u " "dialog_token: %u, status_code: %u, peer_capability: %u " "initiator: %s buf: %#.2x ", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->peer, - __entry->action_code, __entry->dialog_token, + __entry->link_id, __entry->action_code, __entry->dialog_token, __entry->status_code, __entry->peer_capability, BOOL_TO_STR(__entry->initiator), ((u8 *)__get_dynamic_array(buf))[0]) @@ -2908,7 +2928,7 @@ TRACE_EVENT(cfg80211_send_rx_assoc, TP_PROTO(struct net_device *netdev, - struct cfg80211_rx_assoc_resp *data), + struct cfg80211_rx_assoc_resp_data *data), TP_ARGS(netdev, data), TP_STRUCT__entry( NETDEV_ENTRY @@ -3570,7 +3590,6 @@ TP_STRUCT__entry( WIPHY_ENTRY CHAN_ENTRY - __field(enum nl80211_bss_scan_width, scan_width) __dynamic_array(u8, mgmt, len) __field(s32, signal) __field(u64, ts_boottime) @@ -3580,7 +3599,6 @@ TP_fast_assign( WIPHY_ASSIGN; CHAN_ASSIGN(data->chan); - __entry->scan_width = data->scan_width; if (mgmt) memcpy(__get_dynamic_array(mgmt), mgmt, len); __entry->signal = data->signal; @@ -3589,8 +3607,8 @@ MAC_ASSIGN(parent_bssid, data->parent_bssid); ), TP_printk(WIPHY_PR_FMT ", " CHAN_PR_FMT - "(scan_width: %d) signal: %d, tsb:%llu, detect_tsf:%llu, tsf_bssid: %pM", - WIPHY_PR_ARG, CHAN_PR_ARG, __entry->scan_width, + "signal: %d, tsb:%llu, detect_tsf:%llu, tsf_bssid: %pM", + WIPHY_PR_ARG, CHAN_PR_ARG, __entry->signal, (unsigned long long)__entry->ts_boottime, (unsigned long long)__entry->parent_tsf, __entry->parent_bssid) @@ -3946,6 +3964,21 @@ __entry->enable) ); +TRACE_EVENT(cfg80211_links_removed, + TP_PROTO(struct net_device *netdev, u16 link_mask), + TP_ARGS(netdev, link_mask), + TP_STRUCT__entry( + NETDEV_ENTRY + __field(u16, link_mask) + ), + TP_fast_assign( + NETDEV_ASSIGN; + __entry->link_mask = link_mask; + ), + TP_printk(NETDEV_PR_FMT ", link_mask:%u", NETDEV_PR_ARG, + __entry->link_mask) +); + #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH diff -ruw linux-6.4/net/wireless/util.c linux-6.4-fbx/net/wireless/util.c --- linux-6.4/net/wireless/util.c 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/net/wireless/util.c 2024-04-22 13:40:53.171947543 +0200 @@ -43,8 +43,7 @@ } EXPORT_SYMBOL(ieee80211_get_response_rate); -u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband, - enum nl80211_bss_scan_width scan_width) +u32 ieee80211_mandatory_rates(struct ieee80211_supported_band *sband) { struct ieee80211_rate *bitrates; u32 mandatory_rates = 0; @@ -54,15 +53,10 @@ if (WARN_ON(!sband)) return 1; - if (sband->band == NL80211_BAND_2GHZ) { - if (scan_width == NL80211_BSS_CHAN_WIDTH_5 || - scan_width == NL80211_BSS_CHAN_WIDTH_10) - mandatory_flag = IEEE80211_RATE_MANDATORY_G; - else + if (sband->band == NL80211_BAND_2GHZ) mandatory_flag = IEEE80211_RATE_MANDATORY_B; - } else { + else mandatory_flag = IEEE80211_RATE_MANDATORY_A; - } bitrates = sband->bitrates; for (i = 0; i < sband->n_bitrates; i++) @@ -580,6 +574,8 @@ hdrlen += ETH_ALEN + 2; else if (!pskb_may_pull(skb, hdrlen)) return -EINVAL; + else + payload.eth.h_proto = htons(skb->len - hdrlen); mesh_addr = skb->data + sizeof(payload.eth) + ETH_ALEN; switch (payload.flags & MESH_FLAGS_AE) { @@ -1042,7 +1038,6 @@ list_del(&ev->list); spin_unlock_irqrestore(&wdev->event_lock, flags); - wdev_lock(wdev); switch (ev->type) { case EVENT_CONNECT_RESULT: __cfg80211_connect_result( @@ -1064,15 +1059,14 @@ ev->ij.channel); break; case EVENT_STOPPED: - __cfg80211_leave(wiphy_to_rdev(wdev->wiphy), wdev); + cfg80211_leave(wiphy_to_rdev(wdev->wiphy), wdev); break; case EVENT_PORT_AUTHORIZED: - __cfg80211_port_authorized(wdev, ev->pa.bssid, + __cfg80211_port_authorized(wdev, ev->pa.peer_addr, ev->pa.td_bitmap, ev->pa.td_bitmap_len); break; } - wdev_unlock(wdev); kfree(ev); @@ -1122,9 +1116,7 @@ return -EBUSY; dev->ieee80211_ptr->use_4addr = false; - wdev_lock(dev->ieee80211_ptr); rdev_set_qos_map(rdev, dev, NULL); - wdev_unlock(dev->ieee80211_ptr); switch (otype) { case NL80211_IFTYPE_AP: @@ -1136,10 +1128,8 @@ break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_P2P_CLIENT: - wdev_lock(dev->ieee80211_ptr); cfg80211_disconnect(rdev, dev, WLAN_REASON_DEAUTH_LEAVING, true); - wdev_unlock(dev->ieee80211_ptr); break; case NL80211_IFTYPE_MESH_POINT: /* mesh should be handled? */ @@ -1646,6 +1636,114 @@ return result / 10000; } +static u32 cfg80211_calculate_bitrate_s1g(struct rate_info *rate) +{ + /* For 1, 2, 4, 8 and 16 MHz channels */ + static const u32 base[5][11] = { + { 300000, + 600000, + 900000, + 1200000, + 1800000, + 2400000, + 2700000, + 3000000, + 3600000, + 4000000, + /* MCS 10 supported in 1 MHz only */ + 150000, + }, + { 650000, + 1300000, + 1950000, + 2600000, + 3900000, + 5200000, + 5850000, + 6500000, + 7800000, + /* MCS 9 not valid */ + }, + { 1350000, + 2700000, + 4050000, + 5400000, + 8100000, + 10800000, + 12150000, + 13500000, + 16200000, + 18000000, + }, + { 2925000, + 5850000, + 8775000, + 11700000, + 17550000, + 23400000, + 26325000, + 29250000, + 35100000, + 39000000, + }, + { 8580000, + 11700000, + 17550000, + 23400000, + 35100000, + 46800000, + 52650000, + 58500000, + 70200000, + 78000000, + }, + }; + u32 bitrate; + /* default is 1 MHz index */ + int idx = 0; + + if (rate->mcs >= 11) + goto warn; + + switch (rate->bw) { + case RATE_INFO_BW_16: + idx = 4; + break; + case RATE_INFO_BW_8: + idx = 3; + break; + case RATE_INFO_BW_4: + idx = 2; + break; + case RATE_INFO_BW_2: + idx = 1; + break; + case RATE_INFO_BW_1: + idx = 0; + break; + case RATE_INFO_BW_5: + case RATE_INFO_BW_10: + case RATE_INFO_BW_20: + case RATE_INFO_BW_40: + case RATE_INFO_BW_80: + case RATE_INFO_BW_160: + default: + goto warn; + } + + bitrate = base[idx][rate->mcs]; + bitrate *= rate->nss; + + if (rate->flags & RATE_INFO_FLAGS_SHORT_GI) + bitrate = (bitrate / 9) * 10; + /* do NOT round down here */ + return (bitrate + 50000) / 100000; +warn: + WARN_ONCE(1, "invalid rate bw=%d, mcs=%d, nss=%d\n", + rate->bw, rate->mcs, rate->nss); + return 0; +} + u32 cfg80211_calculate_bitrate(struct rate_info *rate) { if (rate->flags & RATE_INFO_FLAGS_MCS) @@ -1662,6 +1760,8 @@ return cfg80211_calculate_bitrate_he(rate); if (rate->flags & RATE_INFO_FLAGS_EHT_MCS) return cfg80211_calculate_bitrate_eht(rate); + if (rate->flags & RATE_INFO_FLAGS_S1G_MCS) + return cfg80211_calculate_bitrate_s1g(rate); return rate->legacy; } @@ -1860,6 +1960,35 @@ } EXPORT_SYMBOL(ieee80211_ie_split_ric); +void ieee80211_fragment_element(struct sk_buff *skb, u8 *len_pos, u8 frag_id) +{ + unsigned int elem_len; + + if (!len_pos) + return; + + elem_len = skb->data + skb->len - len_pos - 1; + + while (elem_len > 255) { + /* this one is 255 */ + *len_pos = 255; + /* remaining data gets smaller */ + elem_len -= 255; + /* make space for the fragment ID/len in SKB */ + skb_put(skb, 2); + /* shift back the remaining data to place fragment ID/len */ + memmove(len_pos + 255 + 3, len_pos + 255 + 1, elem_len); + /* place the fragment ID */ + len_pos += 255 + 1; + *len_pos = frag_id; + /* and point to fragment length to update later */ + len_pos++; + } + + *len_pos = elem_len; +} +EXPORT_SYMBOL(ieee80211_fragment_element); + bool ieee80211_operating_class_to_band(u8 operating_class, enum nl80211_band *band) { @@ -1870,6 +1999,7 @@ *band = NL80211_BAND_5GHZ; return true; case 131 ... 135: + case 137: *band = NL80211_BAND_6GHZ; return true; case 81: @@ -2535,12 +2665,12 @@ { struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); - ASSERT_WDEV_LOCK(wdev); + lockdep_assert_wiphy(wdev->wiphy); switch (wdev->iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: - __cfg80211_stop_ap(rdev, wdev->netdev, link_id, true); + cfg80211_stop_ap(rdev, wdev->netdev, link_id, true); break; default: /* per-link not relevant */ @@ -2565,12 +2695,10 @@ if (wdev->iftype != NL80211_IFTYPE_AP) return; - wdev_lock(wdev); if (wdev->valid_links) { for_each_valid_link(wdev, link_id) cfg80211_remove_link(wdev, link_id); } - wdev_unlock(wdev); } int cfg80211_remove_virtual_intf(struct cfg80211_registered_device *rdev, diff -ruw linux-6.4/scripts/Makefile.lib linux-6.4-fbx/scripts/Makefile.lib --- linux-6.4/scripts/Makefile.lib 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/Makefile.lib 2024-04-22 13:40:53.207948526 +0200 @@ -372,7 +372,7 @@ cmd_wrap_S_dtb = { \ symbase=__$(patsubst .%,%,$(suffix $<))_$(subst -,_,$(notdir $*)); \ echo '\#include '; \ - echo '.section .dtb.init.rodata,"a"'; \ + echo '.section .dtb.rodata,"a"'; \ echo '.balign STRUCT_ALIGNMENT'; \ echo ".global $${symbase}_begin"; \ echo "$${symbase}_begin:"; \ diff -ruw linux-6.4/scripts/dtc/include-prefixes/arm64/amlogic/Makefile linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/amlogic/Makefile --- linux-6.4/scripts/dtc/include-prefixes/arm64/amlogic/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/amlogic/Makefile 2024-04-22 13:40:45.259731373 +0200 @@ -1,8 +1,15 @@ # SPDX-License-Identifier: GPL-2.0 +fbx-boards += \ + fbxwmr.dtb \ + fbxwmr-r1.dtb fbxwmr-r2.dtb \ + fbxwmr-r3.dtb fbxwmr-r4.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-a1-ad401.dtb dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j100.dtb dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-axg-jethome-jethub-j110-rev-3.dtb +DTC_FLAGS += -@ +dtb-$(CONFIG_ARCH_MESON) += $(fbx-boards) dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-radxa-zero.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb diff -ruw linux-6.4/scripts/dtc/include-prefixes/arm64/amlogic/meson-axg.dtsi linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/amlogic/meson-axg.dtsi --- linux-6.4/scripts/dtc/include-prefixes/arm64/amlogic/meson-axg.dtsi 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/amlogic/meson-axg.dtsi 2024-04-22 13:40:45.259731373 +0200 @@ -177,7 +177,7 @@ compatible = "amlogic,axg-pcie", "snps,dw-pcie"; reg = <0x0 0xf9800000 0x0 0x400000>, <0x0 0xff646000 0x0 0x2000>, - <0x0 0xf9f00000 0x0 0x100000>; + <0x0 0xf9c00000 0x0 0x100000>; reg-names = "elbi", "cfg", "config"; interrupts = ; #interrupt-cells = <1>; @@ -187,7 +187,7 @@ #address-cells = <3>; #size-cells = <2>; device_type = "pci"; - ranges = <0x82000000 0 0xf9c00000 0x0 0xf9c00000 0 0x00300000>; + ranges = <0x82000000 0 0xf9d00000 0x0 0xf9d00000 0 0x00300000>; clocks = <&clkc CLKID_USB>, <&clkc CLKID_PCIE_A>, <&clkc CLKID_PCIE_CML_EN0>; clock-names = "general", "pclk", "port"; @@ -1937,7 +1937,7 @@ }; }; - timer { + timer: timer { compatible = "arm,armv8-timer"; interrupts = , diff -ruw linux-6.4/scripts/dtc/include-prefixes/arm64/broadcom/Makefile linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/broadcom/Makefile --- linux-6.4/scripts/dtc/include-prefixes/arm64/broadcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/broadcom/Makefile 2024-04-22 13:40:45.275731810 +0200 @@ -11,3 +11,4 @@ subdir-y += bcmbca subdir-y += northstar2 subdir-y += stingray +subdir-y += bcm63xx diff -ruw linux-6.4/scripts/dtc/include-prefixes/arm64/marvell/Makefile linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/marvell/Makefile --- linux-6.4/scripts/dtc/include-prefixes/arm64/marvell/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/marvell/Makefile 2024-04-22 13:40:45.315732903 +0200 @@ -27,3 +27,19 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp1_dsl_lte.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp1_ftth_p2p.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp2_ftth_p2p.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp2_ftth_pon.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp1_test_module.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_exp2_test_module.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_pcie_pine_pericom.dtb +dtb-$(CONFIG_ARCH_MVEBU) += fbxgw7r_pcie_pine_asmedia.dtb + +dtb-$(CONFIG_ARCH_MVEBU) += jbxgw7r.dtb +dtb-$(CONFIG_ARCH_MVEBU) += jbxgw7r_exp1_ftth_p2p.dtb +dtb-$(CONFIG_ARCH_MVEBU) += jbxgw7r_exp2_ftth_p2p.dtb + +# export symbols in DTBs file to allow overlay usage +DTC_FLAGS += -@ diff -ruw linux-6.4/scripts/dtc/include-prefixes/arm64/qcom/Makefile linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/qcom/Makefile --- linux-6.4/scripts/dtc/include-prefixes/arm64/qcom/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/dtc/include-prefixes/arm64/qcom/Makefile 2024-04-22 13:40:45.339733559 +0200 @@ -1,204 +1,208 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8094-sony-xperia-kitakami-karin_windy.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8096-db820c.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8096-ifc6640.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-mi01.2.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq6018-cp01-c1.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk01.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c1.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq8074-hk10-c2.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-al02-c7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-acer-a1-724.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-alcatel-idol347.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-asus-z00l.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-gplus-fl8005a.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-huawei-g7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e5.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-e7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-grandmax.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt510.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt58.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5x.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-serranove.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-uf896.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-thwc-ufi001c.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-motorola-potter.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-daisy.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-mido.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-tissot.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8953-xiaomi-vince.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8956-sony-xperia-loire-kugo.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8956-sony-xperia-loire-suzu.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-10.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-lg-bullhead-rev-101.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-octagon-talkman.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8992-xiaomi-libra.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-huawei-angler-rev-101.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-msft-lumia-octagon-cityman.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-ivy.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-karin.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-satsuki.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-sumire.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8994-sony-xperia-kitakami-suzuran.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-oneplus3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-oneplus3t.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-sony-xperia-tone-dora.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-sony-xperia-tone-kagura.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-sony-xperia-tone-keyaki.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996-xiaomi-gemini.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996pro-xiaomi-natrium.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8996pro-xiaomi-scorpio.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-asus-novago-tp370ql.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-fxtec-pro1.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-hp-envy-x2.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-lenovo-miix-630.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-oneplus-cheeseburger.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-oneplus-dumpling.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-lilac.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-maple.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-sony-xperia-yoshino-poplar.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8998-xiaomi-sagit.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qdu1000-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb2210-rb1.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb4210-rb2.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5.dtb -dtb-$(CONFIG_ARCH_QCOM) += qrb5165-rb5-vision-mezzanine.dtb -dtb-$(CONFIG_ARCH_QCOM) += qru1000-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8155p-adp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8295p-adp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8540p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sa8775p-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-coachz-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-homestar-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-kingoftown.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r9-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-r9.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-parade.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-lte-ti.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-parade.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel-ti.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel360-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pazquel360-wifi.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r2-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-pompom-r3-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-quackingstick-r0.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-quackingstick-r0-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-inx.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-crd-pro.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-evoker-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-herobrine-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r0.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-villager-r1-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-herobrine-zombie-nvme-lte.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-idp2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7280-crd-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-lenovo-thinkpad-x13s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm450-motorola-ali.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-ganges-kirin.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-discovery.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-pioneer.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm630-sony-xperia-nile-voyager.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm632-fairphone-fp3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm632-motorola-ocean.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm636-sony-xperia-ganges-mermaid.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm660-xiaomi-lavender.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm670-google-sargo.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r1.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-cheza-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-db845c-navigation-mezzanine.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyln.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-lg-judyp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-oneplus-enchilada.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-oneplus-fajita.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-samsung-starqltechn.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-akari.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-akatsuki.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-sony-xperia-tama-apollo.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-beryllium-ebbg.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-beryllium-tianma.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-xiaomi-polaris.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm845-shift-axolotl.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm850-lenovo-yoga-c630.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm850-samsung-w737.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6115p-lenovo-j606f.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6125-sony-xperia-seine-pdx201.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6125-xiaomi-laurel-sprout.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6350-sony-xperia-lena-pdx213.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6375-sony-xperia-murray-pdx225.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-microsoft-surface-duo.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-bahamut.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8150-sony-xperia-kumano-griffin.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx203.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-sony-xperia-edo-pdx206.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish-boe.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8250-xiaomi-elish-csot.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-microsoft-surface-duo2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-sony-xperia-sagami-pdx214.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8350-sony-xperia-sagami-pdx215.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx223.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8450-sony-xperia-nagara-pdx224.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-sbc.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8094-sony-xperia-kitakami-karin_windy.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8096-db820c.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8096-ifc6640.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-mi01.2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp468.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq6018-cp01-c1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq8074-hk01.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq8074-hk10-c1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq8074-hk10-c2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp418.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp433.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp449.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp454.dtb +dtb-$(CONFIG_ARCH_QCOM_FBX_DTB) += fbxgw9r.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-acer-a1-724.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-alcatel-idol347.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-asus-z00l.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-gplus-fl8005a.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-huawei-g7.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-longcheer-l8150.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-longcheer-l8910.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-a3u-eur.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-a5u-eur.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-e5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-e7.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-grandmax.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-gt510.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-gt58.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-j5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-j5x.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-serranove.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-thwc-uf896.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-thwc-ufi001c.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-wingtech-wt88047.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-yiming-uz801v3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-motorola-potter.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-daisy.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-mido.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-tissot.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8953-xiaomi-vince.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8956-sony-xperia-loire-kugo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8956-sony-xperia-loire-suzu.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-lg-bullhead-rev-10.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-lg-bullhead-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-msft-lumia-octagon-talkman.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8992-xiaomi-libra.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-huawei-angler-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-msft-lumia-octagon-cityman.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-ivy.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-karin.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-satsuki.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-sumire.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8994-sony-xperia-kitakami-suzuran.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-oneplus3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-oneplus3t.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-sony-xperia-tone-dora.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-sony-xperia-tone-kagura.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-sony-xperia-tone-keyaki.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996-xiaomi-gemini.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996pro-xiaomi-natrium.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8996pro-xiaomi-scorpio.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-asus-novago-tp370ql.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-fxtec-pro1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-hp-envy-x2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-lenovo-miix-630.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-oneplus-cheeseburger.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-oneplus-dumpling.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-sony-xperia-yoshino-lilac.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-sony-xperia-yoshino-maple.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-sony-xperia-yoshino-poplar.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8998-xiaomi-sagit.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-1000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-4000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qdu1000-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb2210-rb1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb4210-rb2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb5165-rb5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qrb5165-rb5-vision-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qru1000-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8155p-adp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8295p-adp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8540p-ride.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sa8775p-ride.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-coachz-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-homestar-r2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-homestar-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-homestar-r4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-kingoftown.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r1-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r3-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r9.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r9-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r9-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-r4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-r9.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-nots-r4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-nots-r5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-limozeen-nots-r9.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-lte-parade.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-lte-ti.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-parade.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel-ti.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel360-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pazquel360-wifi.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r2-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-pompom-r3-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-quackingstick-r0.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-quackingstick-r0-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-boe.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-inx.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-crd-pro.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-evoker.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-evoker-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-herobrine-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-villager-r0.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-villager-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-villager-r1-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie-nvme.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-herobrine-zombie-nvme-lte.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-idp2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7280-crd-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-lenovo-thinkpad-x13s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sda660-inforce-ifc6560.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm450-motorola-ali.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-ganges-kirin.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-nile-discovery.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-nile-pioneer.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm630-sony-xperia-nile-voyager.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm632-fairphone-fp3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm632-motorola-ocean.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm636-sony-xperia-ganges-mermaid.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm660-xiaomi-lavender.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm670-google-sargo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-cheza-r1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-cheza-r2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-cheza-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-db845c.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-db845c-navigation-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-lg-judyln.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-lg-judyp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-oneplus-enchilada.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-oneplus-fajita.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-samsung-starqltechn.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-sony-xperia-tama-akari.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-sony-xperia-tama-akatsuki.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-sony-xperia-tama-apollo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-xiaomi-beryllium-ebbg.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-xiaomi-beryllium-tianma.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-xiaomi-polaris.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm845-shift-axolotl.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm850-lenovo-yoga-c630.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm850-samsung-w737.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm4250-oneplus-billie2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6115p-lenovo-j606f.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6125-sony-xperia-seine-pdx201.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6125-xiaomi-laurel-sprout.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6350-sony-xperia-lena-pdx213.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6375-sony-xperia-murray-pdx225.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7225-fairphone-fp4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-microsoft-surface-duo.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-sony-xperia-kumano-bahamut.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8150-sony-xperia-kumano-griffin.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-sony-xperia-edo-pdx203.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-sony-xperia-edo-pdx206.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-xiaomi-elish-boe.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8250-xiaomi-elish-csot.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-microsoft-surface-duo2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-sony-xperia-sagami-pdx214.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8350-sony-xperia-sagami-pdx215.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-sony-xperia-nagara-pdx223.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8450-sony-xperia-nagara-pdx224.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-qrd.dtb diff -ruw linux-6.4/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h linux-6.4-fbx/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h --- linux-6.4/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h 2024-04-22 13:40:52.559930822 +0200 @@ -803,6 +803,18 @@ #define BTN_TRIGGER_HAPPY39 0x2e6 #define BTN_TRIGGER_HAPPY40 0x2e7 +#define KEY_APP_TV 0x2f1 +#define KEY_APP_REPLAY 0x2f2 +#define KEY_APP_VIDEOCLUB 0x2f3 +#define KEY_APP_WHATSON 0x2f4 +#define KEY_APP_RECORDS 0x2f5 +#define KEY_APP_MEDIA 0x2f6 +#define KEY_APP_YOUTUBE 0x2f7 +#define KEY_APP_RADIOS 0x2f8 +#define KEY_APP_CANALVOD 0x2f9 +#define KEY_APP_PIP 0x2fa +#define KEY_APP_NETFLIX 0x2fb + /* We avoid low common keys in module aliases so they don't get huge. */ #define KEY_MIN_INTERESTING KEY_MUTE #define KEY_MAX 0x2ff diff -ruw linux-6.4/sound/soc/kirkwood/Kconfig linux-6.4-fbx/sound/soc/kirkwood/Kconfig --- linux-6.4/sound/soc/kirkwood/Kconfig 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/sound/soc/kirkwood/Kconfig 2023-02-27 19:50:24.596313402 +0100 @@ -16,3 +16,8 @@ Say Y if you want to add support for SoC audio on the Armada 370 Development Board. +config SND_KIRKWOOD_SOC_FBXGW2R + tristate "Soc Audio support for fbxgw2r" + depends on SND_KIRKWOOD_SOC && MACH_FBXGW2R && I2C + select SND_KIRKWOOD_SOC_I2S + select SND_SOC_CS42L52 diff -ruw linux-6.4/sound/soc/kirkwood/Makefile linux-6.4-fbx/sound/soc/kirkwood/Makefile --- linux-6.4/sound/soc/kirkwood/Makefile 2023-06-26 01:29:58.000000000 +0200 +++ linux-6.4-fbx/sound/soc/kirkwood/Makefile 2023-02-27 19:50:24.596313402 +0100 @@ -6,3 +6,6 @@ snd-soc-armada-370-db-objs := armada-370-db.o obj-$(CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB) += snd-soc-armada-370-db.o + +snd-soc-fbxgw2r-objs := kirkwood-fbxgw2r.o +obj-$(CONFIG_SND_KIRKWOOD_SOC_FBXGW2R) += snd-soc-fbxgw2r.o --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-isl3299.dtsi 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,47 @@ +/* + * Copyright (c) 2023 Freebox, SAS. All rights reserved. + */ + + /* + * second gen of the leds board but with a different led driver: + * - 1 RGB + * - 1 bottom white + * - 1 top white + */ +&i2c_AO { + #address-cells = <1>; + #size-cells = <0>; + + isl3299@74 { + compatible = "issi,is31fl3299"; + reg = <0x74>; + current = [1e]; + #address-cells = <1>; + #size-cells = <0>; + + blue@0 { + reg = <0>; + label = "blue"; + }; + green@1 { + reg = <1>; + label = "green"; + }; + red@2 { + reg = <2>; + label = "red"; + }; + white-mid@6 { + reg = <6>; + label = "white-mid"; + }; + white-top@7 { + reg = <7>; + label = "white-top"; + }; + white-dot@8 { + reg = <8>; + label = "white-dot"; + }; + }; +}; --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-led1202-1.dtsi 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,50 @@ +/* + * Copyright (c) 2020 Freebox, SAS. All rights reserved. + */ + +/* + * first version of the leds board: + * - 1 RGB + * - 2 top white + */ +&i2c_AO { + #address-cells = <1>; + #size-cells = <0>; + + led1202@58 { + compatible = "st,led1202"; + reg = <0x58>; + #address-cells = <1>; + #size-cells = <0>; + + /* we don't use interrups for now */ + //interrupt-parent = <&gpio_intc>; + //interrupts = ; + //st,on-pattern-sequence-interrupt; + + cs3@3 { + label = "blue"; + reg = <3>; + }; + cs4@4 { + label = "green"; + reg = <4>; + }; + cs5@5 { + label = "red"; + reg = <5>; + }; + cs8@8 { + label = "white-mid"; + reg = <8>; + }; + cs9@9 { + label = "white-top1"; + reg = <9>; + }; + cs10@10 { + label = "white-top2"; + reg = <10>; + }; + }; +}; --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-led1202-2.dtsi 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2020 Freebox, SAS. All rights reserved. + */ + + /* + * second generation of the leds board: + * - 1 RGB + * - 1 bottom white + * - 1 top white + */ +&i2c_AO { + #address-cells = <1>; + #size-cells = <0>; + + led1202@58 { + compatible = "st,led1202"; + reg = <0x58>; + #address-cells = <1>; + #size-cells = <0>; + + /* we don't use interrups for now */ + //interrupt-parent = <&gpio_intc>; + //interrupts = ; + //st,on-pattern-sequence-interrupt; + + cs3@3 { + label = "blue"; + reg = <3>; + }; + cs4@4 { + label = "green"; + reg = <4>; + }; + cs5@5 { + label = "red"; + reg = <5>; + }; + cs8@8 { + label = "white-mid"; + reg = <8>; + }; + cs9@9 { + label = "white-top"; + reg = <9>; + }; + cs10@10 { + label = "white-dot"; + reg = <10>; + }; + }; +}; --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-r1.dts 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2020 Freebox, SAS. All rights reserved. + */ + +/dts-v1/; +/plugin/; + + /* + * first generation of the board: + * - first gen led pcb + */ +#include "fbxwmr-led1202-1.dtsi" --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-r2.dts 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,12 @@ +/* + * Copyright (c) 2020 Freebox, SAS. All rights reserved. + */ + +/dts-v1/; +/plugin/; + + /* + * second generation of the board: + * - second gen led pcb + */ +#include "fbxwmr-led1202-2.dtsi" --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-r3.dts 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2023 Freebox, SAS. All rights reserved. + */ + +/dts-v1/; +/plugin/; + + /* + * third generation of the board: + * - razorfish pcie + * - same leddriver/pinout as ropefish v2 + */ +#include "fbxwmr-razorfish.dtsi" +#include "fbxwmr-led1202-2.dtsi" --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-r4.dts 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,14 @@ +/* + * Copyright (c) 2023 Freebox, SAS. All rights reserved. + */ + +/dts-v1/; +/plugin/; + + /* + * forth generation of the board: + * - razorfish mainboard + * - new led driver from lumissil + */ +#include "fbxwmr-razorfish.dtsi" +#include "fbxwmr-isl3299.dtsi" --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr-razorfish.dtsi 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2023 Freebox, SAS. All rights reserved. + */ + +#include +#include + + /* + * second generation of the board for wifi 7: + * - new pinout of m2 connector (no dts change) + * - aditional i2c bus to access wifi board eeprom + * - new wdisable signals to control wifi chips alims + */ + +&i2c1 { + status = "okay"; + pinctrl-0 = <&i2c1_x_pins>; + pinctrl-names = "default"; +}; + +&gpio { + hog-wd1 { + gpio-hog; + gpios = ; + output-high; + line-name = "pcie1-wdisable#"; + }; +}; + +&{/} { + qcom,diag { + compatible = "qcom,diag"; + status = "ok"; + }; +}; --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/amlogic/fbxwmr.dts 2024-04-22 13:40:45.259731373 +0200 @@ -0,0 +1,353 @@ +/* + * Copyright (c) 2019 Freebox, SAS. All rights reserved. + */ + +/dts-v1/; + +#include "meson-axg.dtsi" +#include +#include +#include + +/ { + compatible = "freebox,fbxwmr", "amlogic,a113d", "amlogic,meson-axg"; + model = "Freebox WMR (r1)"; + + aliases { + serial0 = &uart_AO; + serial1 = &uart_B; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + memory@00000000 { + device_type = "memory"; + /* patched by atf */ + reg = <0x0 0x0 0x0 0x0>; + }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + skip-enumeration; + }; + }; + + reserved-memory { + ramoops@1eff8000 { + compatible = "ramoops"; + /* RAM top - 32k under optee */ + reg = <0x0 0x1eff8000 0x0 (32 * 1024)>; + record-size = <(32 * 1024)>; + ecc-size = <16>; + no-dump-oops; + }; + }; + + main_12v: regulator-main_12v { + compatible = "regulator-fixed"; + regulator-name = "12V"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + regulator-always-on; + }; + + vddao_3v3: regulator-vddao_3v3 { + compatible = "regulator-fixed"; + regulator-name = "VDDAO_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&main_12v>; + regulator-always-on; + }; + + vcc_3v3: regulator-vcc_3v3 { + compatible = "regulator-fixed"; + regulator-name = "VCC_3V3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + vddio_ao18: regulator-vddio_ao18 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO18"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + vddio_boot: regulator-vddio_boot { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_BOOT"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_9 GPIO_ACTIVE_LOW>; + }; + + keypad { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + autorepeat; + + button { + label = "raz button"; + linux,code = ; + gpios = <&gpio_ao GPIOAO_11 GPIO_ACTIVE_LOW>; + }; + }; +}; + +/* + * This node locks up memory from 0 up to 0x1000000 + * but this is bogus, it seems to come from GXB/GXL so lets reclaim it + */ +/delete-node/ &hwrom_reserved; +/* + * This is the ATFF part of the memory that is locked up, but our bootloader + * already sets up this zone with the real info + */ +/delete-node/ &secmon_reserved; + +&timer { + arm,no-tick-in-suspend; +}; + +&aobus { + vrtc: rtc@a0 { + compatible = "amlogic,meson-axg-rtc"; + reg = <0x0 0x000a0 0x0 0x10>; + }; +}; + +ðmac { + status = "okay"; + pinctrl-0 = <ð_rgmii_y_pins>; + pinctrl-names = "default"; + phy-handle = <ð_phy0>; + phy-mode = "rgmii"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + + eth_phy0: ethernet-phy@0 { + /* Realtek RTL8211F (0x001cc916) */ + reg = <0>; + rtl8211f,led-mode = /bits/8 <0 (RTL8211F_LED_MODE_10M | + RTL8211F_LED_MODE_100M | + RTL8211F_LED_MODE_1000M)>; + + reset-assert-us = <10000>; + reset-deassert-us = <80000>; + reset-gpios = <&gpio GPIOY_15 (GPIO_ACTIVE_LOW | GPIO_OPEN_DRAIN)>; + + interrupt-parent = <&gpio_intc>; + interrupts = <98 IRQ_TYPE_LEVEL_LOW>; + }; + }; +}; + +&i2c_AO { + status = "okay"; + pinctrl-0 = <&i2c_ao_sck_4_pins>, <&i2c_ao_sda_5_pins>; + pinctrl-names = "default"; + clock-frequency = <400000>; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_a6_pins>; + pinctrl-names = "default"; + + temp-top@48 { + compatible = "ti,tmp175"; + reg = <0x48>; + }; + + temp-bottom@49 { + compatible = "ti,tmp175"; + reg = <0x49>; + }; + + ld6710-fbx@68 { + compatible = "leadtrend,ld6710-fbx"; + reg = <0x68>; + }; +}; + +/* emmc storage */ +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <8>; + cap-mmc-highspeed; + max-frequency = <200000000>; + non-removable; + disable-wp; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + + mmc-pwrseq = <&emmc_pwrseq>; + + vmmc-supply = <&vcc_3v3>; + vqmmc-supply = <&vddio_boot>; + + partitions-main { + compatible = "fixed-partitions"; + #address-cells = <2>; + #size-cells = <2>; + disk-name = "mmcblk%d"; + + bank0@0 { + label = "bank0"; + reg = /bits/64 <0 (64 * 1024 * 1024)>; + read-only; + }; + + bank1@0 { + label = "bank1"; + reg = /bits/64 <(-1) (256 * 1024 * 1024)>; + }; + + nvram@0 { + label = "nvram"; + reg = /bits/64 <(-1) (4 * 1024 * 1024)>; + }; + + config@0 { + label = "config"; + reg = /bits/64 <(-1) (32 * 1024 * 1024)>; + }; + + new-bank0@0 { + label = "new_bank0"; + reg = /bits/64 <(-1) (64 * 1024 * 1024)>; + }; + + userdata@0 { + label = "userdata"; + reg = /bits/64 <(-1) (-1)>; + }; + }; + + partitions-boot { + compatible = "fixed-partitions"; + #address-cells = <2>; + #size-cells = <2>; + disk-name = "mmcblk%dboot0"; + + bl2@0 { + label = "bl2"; + reg = /bits/64 <512 (0xFF * 512)>; + read-only; + }; + + ipl@0 { + label = "ipl"; + reg = /bits/64 <(-1) (1 * 1024 * 1024)>; + read-only; + }; + + serial@0 { + label = "fbxserial"; + reg = /bits/64 <(-1) (8 * 1024)>; + read-only; + }; + + calibration@0 { + label = "calibration"; + reg = /bits/64 <(-1) (64 * 1024)>; + read-only; + }; + }; + + partitions-boot1 { + compatible = "fixed-partitions"; + #address-cells = <2>; + #size-cells = <2>; + disk-name = "mmcblk%dboot1"; + + backup-bl2@0 { + label = "backup-bl2"; + reg = /bits/64 <512 (0xFF * 512)>; + read-only; + }; + + backup-ipl@0 { + label = "backup-ipl"; + reg = /bits/64 <(-1) (1 * 1024 * 1024)>; + read-only; + }; + }; +}; + + +&uart_B { + status = "okay"; + pinctrl-0 = <&uart_b_z_pins>, <&uart_b_z_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; + clocks = <&xtal>, <&clkc CLKID_UART1>, <&clkc CLKID_CLK81>; + + bluetooth { + compatible = "realtek,rtl8761btv-bt"; + firmware-postfix = "1M5"; + reset-gpio = <&gpio GPIOZ_4 GPIO_ACTIVE_LOW>; + }; + +}; + +&uart_AO { + status = "okay"; + pinctrl-0 = <&uart_ao_a_pins>; + pinctrl-names = "default"; +}; + +&mipi_pcie_analog_dphy { + status = "okay"; +}; + +&pcieA { + status = "okay"; + reset-gpios = <&gpio GPIOX_22 GPIO_ACTIVE_LOW>; + interrupts = ; + linux,pci-domain = <0>; +}; + +&pcieB { + status = "okay"; + reset-gpios = <&gpio GPIOX_21 GPIO_ACTIVE_LOW>; + interrupts = ; + linux,pci-domain = <1>; +}; + +&usb { + status = "okay"; + dr_mode = "host"; +}; + +&dwc2 { + // only used for peripheral role + status = "disabled"; +}; + +&dwc3 { + // needed on our platform + snps,quirk-frame-length-adjustment = <0x20>; +}; diff -Nruw linux-6.4-fbx/arch/arm64/boot/dts/broadcom/bcm63xx./Makefile linux-6.4-fbx/arch/arm64/boot/dts/broadcom/bcm63xx/Makefile --- linux-6.4-fbx/arch/arm64/boot/dts/broadcom/bcm63xx./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/arch/arm64/boot/dts/broadcom/bcm63xx/Makefile 2024-04-22 13:40:45.275731810 +0200 @@ -0,0 +1,26 @@ +board-dtbs = \ + fbxgw8r-board-00.dtb \ + fbxgw8r-board-01.dtb \ + fbxgw8r-board-02.dtb \ + fbxgw8r-board-03.dtb \ + fbxgw8r-board-04.dtb + +dtb-$(CONFIG_ARCH_BCMBCA) += bcm963158ref1d.dtb fbxgw8r.dtb $(board-dtbs) + +always-y := $(dtb-y) +always-$(CONFIG_ARCH_BCMBCA) += fbxgw8r_dtbs + +subdir-y := $(dts-dirs) +clean-files := *.dtb fbxgw8r_dtbs + +cmd_dtbs = ./scripts/dtbs.sh $@ $^ +quiet_cmd_dtbs = DTBS $@ + +$(obj)/fbxgw8r_dtbs: $(addprefix $(obj)/,$(board-dtbs)) + $(call cmd,dtbs) + +# export symbols in DTBs file to allow overlay usage +DTC_FLAGS += -@ + +dtb-$(CONFIG_ARCH_BCMBCA) += fbxgw8r_pcie_pine_asmedia.dtb +dtb-$(CONFIG_ARCH_BCMBCA) += fbxgw8r_pcie_pine_dualband_noswitch.dtb --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/block/partitions/dt.c 2023-02-24 19:10:44.415570202 +0100 @@ -0,0 +1,204 @@ +#define PREFIX "dtparts" + +#include +#include +#include +#include "check.h" + +/** + * match_one: - Determines if a string matches a simple pattern + * @s: the string to examine for presence of the pattern + * @p: the string containing the pattern + */ +static int match_one(char *s, const char *p) +{ + char *meta, *from, *to; + + while (1) { + int len = -1; + + meta = strchr(p, '%'); + if (!meta) + return strcmp(p, s) == 0; + + if (strncmp(p, s, meta-p)) + return 0; + + s += meta - p; + p = meta + 1; + + if (isdigit(*p)) + len = simple_strtoul(p, (char **) &p, 10); + else if (*p == '%') { + if (*s++ != '%') + return 0; + p++; + continue; + } + + from = s; + switch (*p++) { + case 's': { + size_t str_len = strlen(s); + + if (str_len == 0) + return 0; + if (len == -1 || len > str_len) + len = str_len; + to = s + len; + break; + } + case 'd': + simple_strtol(s, &to, 0); + goto num; + case 'u': + simple_strtoul(s, &to, 0); + goto num; + case 'o': + simple_strtoul(s, &to, 8); + goto num; + case 'x': + simple_strtoul(s, &to, 16); + + num: + if (to == from) + return 0; + break; + default: + return 0; + } + s = to; + } +} + +/* + * + */ +static struct device_node *find_first_parent_node(const struct device *ddev) +{ + while (ddev && !ddev->of_node) + ddev = ddev->parent; + + if (!ddev) + return NULL; + return ddev->of_node; +} + +/* + * + */ +int dt_partition(struct parsed_partitions *state) +{ + struct device *ddev = disk_to_dev(state->disk); + struct device_node *np, *part_node, *pp; + u64 disk_size, last_end; + int nr_parts, i; + + /* find first parent device with a non null device tree + * node */ + np = find_first_parent_node(ddev); + if (!np) + return -1; + + part_node = NULL; + for_each_child_of_node(np, pp) { + char diskname[BDEVNAME_SIZE]; + const char *pattern; + + if (!of_device_is_compatible(pp, "fixed-partitions")) + continue; + + /* check device name match pattern */ + strlcpy(diskname, state->disk->disk_name, sizeof (diskname)); + + if (of_property_read_string(pp, "disk-name", &pattern)) { + part_node = pp; + break; + } + + if (match_one(diskname, pattern)) { + part_node = pp; + break; + } + } + + if (!part_node) + return -1; + + /* First count the subnodes */ + nr_parts = 0; + for_each_child_of_node(part_node, pp) + nr_parts++; + + if (nr_parts == 0) + return 0; + + disk_size = get_capacity(state->disk) << 9; + + last_end = 0; + i = 1; + for_each_child_of_node(part_node, pp) { + struct partition_meta_info *info; + char tmp[sizeof (info->volname) + 4]; + const __be32 *reg; + const char *partname; + int a_cells, s_cells; + u64 size, offset; + int len; + + reg = of_get_property(pp, "reg", &len); + if (!reg) { + pr_err("part %pOF (%pOF) missing reg property.\n", + pp, np); + return -1; + } + + a_cells = of_n_addr_cells(pp); + s_cells = of_n_size_cells(pp); + if (len / 4 != a_cells + s_cells) { + pr_err("ofpart partition %pOF (%pOF) " + "error parsing reg property.\n", + pp, np); + return -1; + } + + partname = of_get_property(pp, "label", &len); + if (!partname) + partname = of_get_property(pp, "name", &len); + + if (i >= state->limit) { + pr_err("too many partitions\n"); + return -1; + } + + offset = of_read_number(reg, a_cells); + if (offset == (u64)-1) { + offset = last_end; + } + + size = of_read_number(reg + a_cells, s_cells); + if (size == (u64)-1) + size = disk_size - offset; + + last_end = offset + size; + put_partition(state, i, offset >> 9, size >> 9); + + info = &state->parts[i].info; + strlcpy(info->volname, partname, sizeof (info->volname)); + state->parts[i].has_info = true; + + if (!IS_ENABLED(CONFIG_OF_PARTITION_IGNORE_RO) && + of_get_property(pp, "read-only", &len)) + state->parts[i].flags |= ADDPART_FLAG_RO; + + snprintf(tmp, sizeof(tmp), "(%s/%s)", + info->volname, + state->parts[i].flags ? "ro" : "rw"); + strlcat(state->pp_buf, tmp, PAGE_SIZE); + + i++; + } + + strlcat(state->pp_buf, "\n", PAGE_SIZE); + return 1; +} --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/config 2024-04-22 14:32:23.456377209 +0200 @@ -0,0 +1,4411 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm64 6.4.0 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (freebox) 10.2.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=100200 +CONFIG_CLANG_VERSION=0 +CONFIG_AS_IS_GNU=y +CONFIG_AS_VERSION=23600 +CONFIG_LD_IS_BFD=y +CONFIG_LD_VERSION=23600 +CONFIG_LLD_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_PAHOLE_VERSION=0 +CONFIG_CONSTRUCTORS=y +CONFIG_IRQ_WORK=y +CONFIG_BUILDTIME_TABLE_SORT=y +CONFIG_THREAD_INFO_IN_TASK=y + +# +# General setup +# +CONFIG_INIT_ENV_ARG_LIMIT=32 +CONFIG_CROSS_COMPILE="/opt/toolchains/aarch64-musl-1.2.2-gcc-10.2.0-binutils-2.36-gdb-7.12.1-2/bin/aarch64-linux-musl-" +# CONFIG_COMPILE_TEST is not set +# CONFIG_WERROR is not set +CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION_AUTO=y +CONFIG_BUILD_SALT="" +CONFIG_DEFAULT_INIT="" +CONFIG_DEFAULT_HOSTNAME="(none)" +CONFIG_SYSVIPC=y +CONFIG_SYSVIPC_SYSCTL=y +# CONFIG_POSIX_MQUEUE is not set +# CONFIG_WATCH_QUEUE is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set +# CONFIG_USELIB is not set +CONFIG_AUDIT=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_AUDITSYSCALL=y + +# +# IRQ subsystem +# +CONFIG_GENERIC_IRQ_PROBE=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_MIGRATION=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_HIERARCHY=y +CONFIG_GENERIC_IRQ_IPI=y +CONFIG_GENERIC_MSI_IRQ=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_SPARSE_IRQ=y +# CONFIG_GENERIC_IRQ_DEBUGFS is not set +# end of IRQ subsystem + +CONFIG_GENERIC_TIME_VSYSCALL=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_ARCH_HAS_TICK_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_HAVE_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_POSIX_CPU_TIMERS_TASK_WORK=y +CONFIG_CONTEXT_TRACKING=y +CONFIG_CONTEXT_TRACKING_IDLE=y + +# +# Timers subsystem +# +CONFIG_TICK_ONESHOT=y +CONFIG_NO_HZ_COMMON=y +# CONFIG_HZ_PERIODIC is not set +CONFIG_NO_HZ_IDLE=y +# CONFIG_NO_HZ_FULL is not set +# CONFIG_NO_HZ is not set +CONFIG_HIGH_RES_TIMERS=y +# end of Timers subsystem + +CONFIG_BPF=y +CONFIG_HAVE_EBPF_JIT=y +CONFIG_ARCH_WANT_DEFAULT_BPF_JIT=y + +# +# BPF subsystem +# +# CONFIG_BPF_SYSCALL is not set +# CONFIG_BPF_JIT is not set +# end of BPF subsystem + +CONFIG_PREEMPT_NONE_BUILD=y +CONFIG_PREEMPT_NONE=y +# CONFIG_PREEMPT_VOLUNTARY is not set +# CONFIG_PREEMPT is not set +CONFIG_PREEMPT_COUNT=y +# CONFIG_PREEMPT_DYNAMIC is not set + +# +# CPU/Task time and stats accounting +# +CONFIG_TICK_CPU_ACCOUNTING=y +# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set +CONFIG_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_SCHED_AVG_IRQ=y +# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_TASKSTATS is not set +# CONFIG_PSI is not set +# end of CPU/Task time and stats accounting + +# CONFIG_CPU_ISOLATION is not set + +# +# RCU Subsystem +# +CONFIG_TREE_RCU=y +# CONFIG_RCU_EXPERT is not set +CONFIG_TREE_SRCU=y +CONFIG_RCU_STALL_COMMON=y +CONFIG_RCU_NEED_SEGCBLIST=y +# end of RCU Subsystem + +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y +# CONFIG_IKHEADERS is not set +CONFIG_LOG_BUF_SHIFT=18 +CONFIG_LOG_CPU_MAX_BUF_SHIFT=12 +# CONFIG_PRINTK_INDEX is not set +# CONFIG_FBX_DECRYPT_INITRD is not set +CONFIG_GENERIC_SCHED_CLOCK=y + +# +# Scheduler features +# +# end of Scheduler features + +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_CC_HAS_INT128=y +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC11_NO_ARRAY_BOUNDS=y +CONFIG_ARCH_SUPPORTS_INT128=y +CONFIG_CGROUPS=y +# CONFIG_CGROUP_FAVOR_DYNMODS is not set +# CONFIG_MEMCG is not set +# CONFIG_BLK_CGROUP is not set +# CONFIG_CGROUP_SCHED is not set +# CONFIG_CGROUP_PIDS is not set +# CONFIG_CGROUP_RDMA is not set +# CONFIG_CGROUP_FREEZER is not set +# CONFIG_CPUSETS is not set +# CONFIG_CGROUP_DEVICE is not set +# CONFIG_CGROUP_CPUACCT is not set +# CONFIG_CGROUP_PERF is not set +# CONFIG_CGROUP_MISC is not set +# CONFIG_CGROUP_DEBUG is not set +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +# CONFIG_TIME_NS is not set +CONFIG_IPC_NS=y +# CONFIG_USER_NS is not set +# CONFIG_PID_NS is not set +CONFIG_NET_NS=y +# CONFIG_CHECKPOINT_RESTORE is not set +# CONFIG_SCHED_AUTOGROUP is not set +# CONFIG_RELAY is not set +CONFIG_BLK_DEV_INITRD=y +CONFIG_INITRAMFS_SOURCE="" +# CONFIG_INITRAMFS_FORCE is not set +# CONFIG_RD_GZIP is not set +# CONFIG_RD_BZIP2 is not set +# CONFIG_RD_LZMA is not set +# CONFIG_RD_XZ is not set +# CONFIG_RD_LZO is not set +# CONFIG_RD_LZ4 is not set +# CONFIG_RD_ZSTD is not set +# CONFIG_BOOT_CONFIG is not set +# CONFIG_INITRAMFS_PRESERVE_MTIME is not set +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_LD_ORPHAN_WARN=y +CONFIG_LD_ORPHAN_WARN_LEVEL="warn" +CONFIG_SYSCTL=y +CONFIG_SYSCTL_EXCEPTION_TRACE=y +CONFIG_EXPERT=y +CONFIG_MULTIUSER=y +# CONFIG_SGETMASK_SYSCALL is not set +# CONFIG_SYSFS_SYSCALL is not set +# CONFIG_FHANDLE is not set +CONFIG_POSIX_TIMERS=y +CONFIG_PRINTK=y +CONFIG_BUG=y +CONFIG_ELF_CORE=y +CONFIG_BASE_FULL=y +CONFIG_FUTEX=y +CONFIG_FUTEX_PI=y +CONFIG_EPOLL=y +CONFIG_SIGNALFD=y +CONFIG_TIMERFD=y +CONFIG_EVENTFD=y +CONFIG_SHMEM=y +CONFIG_AIO=y +# CONFIG_IO_URING is not set +CONFIG_ADVISE_SYSCALLS=y +CONFIG_MEMBARRIER=y +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_SELFTEST is not set +CONFIG_KALLSYMS_ALL=y +CONFIG_KALLSYMS_BASE_RELATIVE=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +# CONFIG_KCMP is not set +# CONFIG_RSEQ is not set +CONFIG_EMBEDDED=y +CONFIG_HAVE_PERF_EVENTS=y +# CONFIG_PC104 is not set + +# +# Kernel Performance Events And Counters +# +CONFIG_PERF_EVENTS=y +# CONFIG_DEBUG_PERF_USE_VMALLOC is not set +# end of Kernel Performance Events And Counters + +# CONFIG_PROFILING is not set +# end of General setup + +CONFIG_ARM64=y +CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_64BIT=y +CONFIG_MMU=y +CONFIG_ARM64_PAGE_SHIFT=12 +CONFIG_ARM64_CONT_PTE_SHIFT=4 +CONFIG_ARM64_CONT_PMD_SHIFT=4 +CONFIG_ARCH_MMAP_RND_BITS_MIN=18 +CONFIG_ARCH_MMAP_RND_BITS_MAX=33 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 +CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16 +CONFIG_STACKTRACE_SUPPORT=y +CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 +CONFIG_LOCKDEP_SUPPORT=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y +CONFIG_GENERIC_HWEIGHT=y +CONFIG_GENERIC_CSUM=y +CONFIG_GENERIC_CALIBRATE_DELAY=y +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y +CONFIG_SMP=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=4 +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y +CONFIG_KASAN_SHADOW_OFFSET=0xdfff800000000000 + +# +# Platform selection +# +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_SUNXI is not set +# CONFIG_ARCH_ALPINE is not set +# CONFIG_ARCH_APPLE is not set +# CONFIG_ARCH_BCM is not set +# CONFIG_ARCH_BERLIN is not set +# CONFIG_ARCH_BITMAIN is not set +# CONFIG_ARCH_EXYNOS is not set +# CONFIG_ARCH_SPARX5 is not set +# CONFIG_ARCH_K3 is not set +# CONFIG_ARCH_LG1K is not set +# CONFIG_ARCH_HISI is not set +# CONFIG_ARCH_KEEMBAY is not set +# CONFIG_ARCH_MEDIATEK is not set +CONFIG_ARCH_MESON=y +# CONFIG_ARCH_MVEBU is not set +# CONFIG_ARCH_NXP is not set +# CONFIG_ARCH_NPCM is not set +# CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_REALTEK is not set +# CONFIG_ARCH_RENESAS is not set +# CONFIG_ARCH_ROCKCHIP is not set +# CONFIG_ARCH_SEATTLE is not set +# CONFIG_ARCH_INTEL_SOCFPGA is not set +# CONFIG_ARCH_SYNQUACER is not set +# CONFIG_ARCH_TEGRA is not set +# CONFIG_ARCH_SPRD is not set +# CONFIG_ARCH_THUNDER is not set +# CONFIG_ARCH_THUNDER2 is not set +# CONFIG_ARCH_UNIPHIER is not set +# CONFIG_ARCH_VEXPRESS is not set +# CONFIG_ARCH_VISCONTI is not set +# CONFIG_ARCH_XGENE is not set +# CONFIG_ARCH_ZYNQMP is not set +# end of Platform selection + +# +# Kernel Features +# + +# +# ARM errata workarounds via the alternatives framework +# +CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y +CONFIG_ARM64_ERRATUM_826319=y +CONFIG_ARM64_ERRATUM_827319=y +CONFIG_ARM64_ERRATUM_824069=y +CONFIG_ARM64_ERRATUM_819472=y +# CONFIG_ARM64_ERRATUM_832075 is not set +CONFIG_ARM64_ERRATUM_843419=y +CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y +# CONFIG_ARM64_ERRATUM_1024718 is not set +# CONFIG_ARM64_ERRATUM_1165522 is not set +# CONFIG_ARM64_ERRATUM_1319367 is not set +# CONFIG_ARM64_ERRATUM_1530923 is not set +# CONFIG_ARM64_ERRATUM_2441007 is not set +# CONFIG_ARM64_ERRATUM_1286807 is not set +# CONFIG_ARM64_ERRATUM_1463225 is not set +# CONFIG_ARM64_ERRATUM_1542419 is not set +# CONFIG_ARM64_ERRATUM_1508412 is not set +# CONFIG_ARM64_ERRATUM_2051678 is not set +# CONFIG_ARM64_ERRATUM_2077057 is not set +# CONFIG_ARM64_ERRATUM_2658417 is not set +# CONFIG_ARM64_ERRATUM_2054223 is not set +# CONFIG_ARM64_ERRATUM_2067961 is not set +# CONFIG_ARM64_ERRATUM_2441009 is not set +# CONFIG_ARM64_ERRATUM_2645198 is not set +# CONFIG_CAVIUM_ERRATUM_22375 is not set +# CONFIG_CAVIUM_ERRATUM_23154 is not set +# CONFIG_CAVIUM_ERRATUM_27456 is not set +# CONFIG_CAVIUM_ERRATUM_30115 is not set +# CONFIG_CAVIUM_TX2_ERRATUM_219 is not set +# CONFIG_FUJITSU_ERRATUM_010001 is not set +# CONFIG_HISILICON_ERRATUM_161600802 is not set +# CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set +# CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set +# CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set +# CONFIG_QCOM_FALKOR_ERRATUM_E1041 is not set +# CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set +# CONFIG_ROCKCHIP_ERRATUM_3588001 is not set +# CONFIG_SOCIONEXT_SYNQUACER_PREITS is not set +# end of ARM errata workarounds via the alternatives framework + +CONFIG_ARM64_4K_PAGES=y +# CONFIG_ARM64_16K_PAGES is not set +# CONFIG_ARM64_64K_PAGES is not set +# CONFIG_ARM64_VA_BITS_39 is not set +CONFIG_ARM64_VA_BITS_48=y +CONFIG_ARM64_VA_BITS=48 +CONFIG_ARM64_PA_BITS_48=y +CONFIG_ARM64_PA_BITS=48 +# CONFIG_CPU_BIG_ENDIAN is not set +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_SCHED_MC=y +# CONFIG_SCHED_CLUSTER is not set +# CONFIG_SCHED_SMT is not set +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +# CONFIG_NUMA is not set +# CONFIG_HZ_100 is not set +CONFIG_HZ_250=y +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=250 +CONFIG_SCHED_HRTICK=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_HW_PERF_EVENTS=y +# CONFIG_PARAVIRT is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +# CONFIG_KEXEC is not set +# CONFIG_KEXEC_FILE is not set +# CONFIG_CRASH_DUMP is not set +# CONFIG_XEN is not set +CONFIG_ARCH_FORCE_MAX_ORDER=10 +# CONFIG_UNMAP_KERNEL_AT_EL0 is not set +# CONFIG_MITIGATE_SPECTRE_BRANCH_HISTORY is not set +# CONFIG_RODATA_FULL_DEFAULT_ENABLED is not set +# CONFIG_ARM64_SW_TTBR0_PAN is not set +CONFIG_ARM64_TAGGED_ADDR_ABI=y +# CONFIG_COMPAT is not set + +# +# ARMv8.1 architectural features +# +CONFIG_ARM64_HW_AFDBM=y +CONFIG_ARM64_PAN=y +CONFIG_AS_HAS_LDAPR=y +CONFIG_AS_HAS_LSE_ATOMICS=y +# CONFIG_ARM64_USE_LSE_ATOMICS is not set +# end of ARMv8.1 architectural features + +# +# ARMv8.2 architectural features +# +CONFIG_AS_HAS_ARMV8_2=y +CONFIG_AS_HAS_SHA3=y +# CONFIG_ARM64_PMEM is not set +# CONFIG_ARM64_RAS_EXTN is not set +# CONFIG_ARM64_CNP is not set +# end of ARMv8.2 architectural features + +# +# ARMv8.3 architectural features +# +# CONFIG_ARM64_PTR_AUTH is not set +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y +CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y +CONFIG_AS_HAS_ARMV8_3=y +CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y +# end of ARMv8.3 architectural features + +# +# ARMv8.4 architectural features +# +# CONFIG_ARM64_AMU_EXTN is not set +CONFIG_AS_HAS_ARMV8_4=y +# CONFIG_ARM64_TLB_RANGE is not set +# end of ARMv8.4 architectural features + +# +# ARMv8.5 architectural features +# +CONFIG_AS_HAS_ARMV8_5=y +# CONFIG_ARM64_BTI is not set +CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y +# CONFIG_ARM64_E0PD is not set +CONFIG_ARM64_AS_HAS_MTE=y +# CONFIG_ARM64_MTE is not set +# end of ARMv8.5 architectural features + +# +# ARMv8.7 architectural features +# +# CONFIG_ARM64_EPAN is not set +# end of ARMv8.7 architectural features + +# CONFIG_ARM64_SVE is not set +CONFIG_ARM64_MODULE_PLTS=y +# CONFIG_ARM64_PSEUDO_NMI is not set +# CONFIG_RELOCATABLE is not set +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +# end of Kernel Features + +# +# Boot options +# +CONFIG_CMDLINE="earlycon console=ttyAML0,115200 root=/dev/nfs ip=:::::eth0:dhcp dhcpclass=linux-fbxwmr" +# CONFIG_CMDLINE_FROM_BOOTLOADER is not set +CONFIG_CMDLINE_FORCE=y +# CONFIG_EFI is not set +# end of Boot options + +# +# Power management options +# +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +# CONFIG_SUSPEND_SKIP_SYNC is not set +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +# CONFIG_PM_AUTOSLEEP is not set +# CONFIG_PM_USERSPACE_AUTOSLEEP is not set +# CONFIG_PM_WAKELOCKS is not set +CONFIG_PM=y +# CONFIG_PM_DEBUG is not set +CONFIG_PM_CLK=y +CONFIG_PM_GENERIC_DOMAINS=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_PM_GENERIC_DOMAINS_SLEEP=y +CONFIG_PM_GENERIC_DOMAINS_OF=y +CONFIG_CPU_PM=y +# CONFIG_ENERGY_MODEL is not set +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +# end of Power management options + +# +# CPU Power Management +# + +# +# CPU Idle +# +# CONFIG_CPU_IDLE is not set +# end of CPU Idle + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +CONFIG_CPU_FREQ_GOV_USERSPACE=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_GOV_SCHEDUTIL is not set + +# +# CPU frequency scaling drivers +# +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y +CONFIG_ARM_SCPI_CPUFREQ=y +# end of CPU Frequency scaling +# end of CPU Power Management + +CONFIG_HAVE_KVM=y +# CONFIG_VIRTUALIZATION is not set + +# +# General architecture-dependent options +# +# CONFIG_KPROBES is not set +# CONFIG_JUMP_LABEL is not set +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_IOREMAP_PROT=y +CONFIG_HAVE_KPROBES=y +CONFIG_HAVE_KRETPROBES=y +CONFIG_ARCH_CORRECT_STACKTRACE_ON_KRETPROBE=y +CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y +CONFIG_HAVE_NMI=y +CONFIG_TRACE_IRQFLAGS_SUPPORT=y +CONFIG_TRACE_IRQFLAGS_NMI_SUPPORT=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_KEEPINITRD=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_SET_DIRECT_MAP=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_ARCH_WANTS_NO_INSTR=y +CONFIG_HAVE_ASM_MODVERSIONS=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y +CONFIG_HAVE_HW_BREAKPOINT=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y +CONFIG_MMU_GATHER_TABLE_FREE=y +CONFIG_MMU_GATHER_RCU_TABLE_FREE=y +CONFIG_MMU_LAZY_TLB_REFCOUNT=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HAS_NMI_SAFE_THIS_CPU_OPS=y +CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y +CONFIG_HAVE_CMPXCHG_LOCAL=y +CONFIG_HAVE_CMPXCHG_DOUBLE=y +CONFIG_HAVE_ARCH_SECCOMP=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_SECCOMP=y +CONFIG_SECCOMP_FILTER=y +# CONFIG_SECCOMP_CACHE_DEBUG is not set +CONFIG_HAVE_ARCH_STACKLEAK=y +CONFIG_HAVE_STACKPROTECTOR=y +# CONFIG_STACKPROTECTOR is not set +CONFIG_ARCH_SUPPORTS_LTO_CLANG=y +CONFIG_ARCH_SUPPORTS_LTO_CLANG_THIN=y +CONFIG_LTO_NONE=y +CONFIG_ARCH_SUPPORTS_CFI_CLANG=y +CONFIG_HAVE_CONTEXT_TRACKING_USER=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MOVE_PUD=y +CONFIG_HAVE_MOVE_PMD=y +CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y +CONFIG_HAVE_ARCH_HUGE_VMAP=y +CONFIG_HAVE_ARCH_HUGE_VMALLOC=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_HAVE_SOFTIRQ_ON_OWN_STACK=y +CONFIG_SOFTIRQ_ON_OWN_STACK=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_HAVE_ARCH_MMAP_RND_BITS=y +CONFIG_ARCH_MMAP_RND_BITS=18 +CONFIG_PAGE_SIZE_LESS_THAN_64KB=y +CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y +CONFIG_CLONE_BACKWARDS=y +# CONFIG_COMPAT_32BIT_TIME is not set +CONFIG_HAVE_ARCH_VMAP_STACK=y +# CONFIG_VMAP_STACK is not set +CONFIG_HAVE_ARCH_RANDOMIZE_KSTACK_OFFSET=y +# CONFIG_RANDOMIZE_KSTACK_OFFSET is not set +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_STRICT_MODULE_RWX=y +CONFIG_HAVE_ARCH_COMPILER_H=y +CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y +# CONFIG_LOCK_EVENT_COUNTS is not set +CONFIG_HAVE_PREEMPT_DYNAMIC=y +CONFIG_HAVE_PREEMPT_DYNAMIC_KEY=y +CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_PAGE_TABLE_CHECK=y +CONFIG_ARCH_HAVE_TRACE_MMIO_ACCESS=y + +# +# GCOV-based kernel profiling +# +# CONFIG_GCOV_KERNEL is not set +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +# end of GCOV-based kernel profiling + +CONFIG_HAVE_GCC_PLUGINS=y +# CONFIG_GCC_PLUGINS is not set +CONFIG_FUNCTION_ALIGNMENT_4B=y +CONFIG_FUNCTION_ALIGNMENT=4 +# end of General architecture-dependent options + +CONFIG_RT_MUTEXES=y +CONFIG_BASE_SMALL=0 +CONFIG_MODULES=y +# CONFIG_MODULE_DEBUG is not set +# CONFIG_MODULE_FORCE_LOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODULE_UNLOAD_TAINT_TRACKING is not set +# CONFIG_MODVERSIONS is not set +# CONFIG_MODULE_SRCVERSION_ALL is not set +# CONFIG_MODULE_SIG is not set +CONFIG_MODULE_COMPRESS_NONE=y +# CONFIG_MODULE_COMPRESS_GZIP is not set +# CONFIG_MODULE_COMPRESS_XZ is not set +# CONFIG_MODULE_COMPRESS_ZSTD is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +CONFIG_MODPROBE_PATH="/sbin/modprobe" +# CONFIG_TRIM_UNUSED_KSYMS is not set +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +# CONFIG_BLK_DEV_ZONED is not set +# CONFIG_BLK_WBT is not set +CONFIG_BLK_DEBUG_FS=y +# CONFIG_BLK_SED_OPAL is not set +# CONFIG_BLK_INLINE_ENCRYPTION is not set + +# +# Partition Types +# +CONFIG_PARTITION_ADVANCED=y +# CONFIG_ACORN_PARTITION is not set +# CONFIG_AIX_PARTITION is not set +# CONFIG_OSF_PARTITION is not set +# CONFIG_AMIGA_PARTITION is not set +# CONFIG_ATARI_PARTITION is not set +# CONFIG_MAC_PARTITION is not set +CONFIG_MSDOS_PARTITION=y +# CONFIG_BSD_DISKLABEL is not set +# CONFIG_MINIX_SUBPARTITION is not set +# CONFIG_SOLARIS_X86_PARTITION is not set +# CONFIG_UNIXWARE_DISKLABEL is not set +# CONFIG_LDM_PARTITION is not set +# CONFIG_SGI_PARTITION is not set +# CONFIG_ULTRIX_PARTITION is not set +# CONFIG_SUN_PARTITION is not set +# CONFIG_KARMA_PARTITION is not set +CONFIG_EFI_PARTITION=y +# CONFIG_SYSV68_PARTITION is not set +# CONFIG_CMDLINE_PARTITION is not set +CONFIG_OF_PARTITION=y +# CONFIG_OF_PARTITION_IGNORE_RO is not set +# end of Partition Types + +CONFIG_BLK_MQ_PCI=y +CONFIG_BLK_PM=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=y +# CONFIG_IOSCHED_BFQ is not set +# end of IO Schedulers + +CONFIG_ASN1=y +CONFIG_ARCH_INLINE_SPIN_TRYLOCK=y +CONFIG_ARCH_INLINE_SPIN_TRYLOCK_BH=y +CONFIG_ARCH_INLINE_SPIN_LOCK=y +CONFIG_ARCH_INLINE_SPIN_LOCK_BH=y +CONFIG_ARCH_INLINE_SPIN_LOCK_IRQ=y +CONFIG_ARCH_INLINE_SPIN_LOCK_IRQSAVE=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK_BH=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQ=y +CONFIG_ARCH_INLINE_SPIN_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_INLINE_READ_LOCK=y +CONFIG_ARCH_INLINE_READ_LOCK_BH=y +CONFIG_ARCH_INLINE_READ_LOCK_IRQ=y +CONFIG_ARCH_INLINE_READ_LOCK_IRQSAVE=y +CONFIG_ARCH_INLINE_READ_UNLOCK=y +CONFIG_ARCH_INLINE_READ_UNLOCK_BH=y +CONFIG_ARCH_INLINE_READ_UNLOCK_IRQ=y +CONFIG_ARCH_INLINE_READ_UNLOCK_IRQRESTORE=y +CONFIG_ARCH_INLINE_WRITE_LOCK=y +CONFIG_ARCH_INLINE_WRITE_LOCK_BH=y +CONFIG_ARCH_INLINE_WRITE_LOCK_IRQ=y +CONFIG_ARCH_INLINE_WRITE_LOCK_IRQSAVE=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK_BH=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQ=y +CONFIG_ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE=y +CONFIG_UNINLINE_SPIN_UNLOCK=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_MUTEX_SPIN_ON_OWNER=y +CONFIG_RWSEM_SPIN_ON_OWNER=y +CONFIG_LOCK_SPIN_ON_OWNER=y +CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y +CONFIG_QUEUED_SPINLOCKS=y +CONFIG_ARCH_USE_QUEUED_RWLOCKS=y +CONFIG_QUEUED_RWLOCKS=y +CONFIG_ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE=y +CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y +CONFIG_FREEZER=y + +# +# Executable file formats +# +CONFIG_BINFMT_ELF=y +CONFIG_ARCH_BINFMT_ELF_STATE=y +CONFIG_ARCH_BINFMT_ELF_EXTRA_PHDRS=y +CONFIG_ARCH_HAVE_ELF_PROT=y +CONFIG_ARCH_USE_GNU_PROPERTY=y +CONFIG_ELFCORE=y +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_BINFMT_SCRIPT=y +# CONFIG_BINFMT_MISC is not set +CONFIG_COREDUMP=y +# end of Executable file formats + +# +# Memory Management options +# +# CONFIG_SWAP is not set + +# +# SLAB allocator options +# +# CONFIG_SLAB is not set +CONFIG_SLUB=y +# CONFIG_SLUB_TINY is not set +CONFIG_SLAB_MERGE_DEFAULT=y +# CONFIG_SLAB_FREELIST_RANDOM is not set +# CONFIG_SLAB_FREELIST_HARDENED is not set +# CONFIG_SLUB_STATS is not set +CONFIG_SLUB_CPU_PARTIAL=y +# end of SLAB allocator options + +# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_SPARSEMEM=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_FAST_GUP=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_MEMORY_HOTPLUG is not set +CONFIG_SPLIT_PTLOCK_CPUS=4 +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_COMPACTION=y +CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 +# CONFIG_PAGE_REPORTING is not set +CONFIG_MIGRATION=y +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_KSM=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_PAGE_FRAG_CACHE_ORDER=3 +# CONFIG_MEMORY_FAILURE is not set +CONFIG_ARCH_WANTS_THP_SWAP=y +# CONFIG_TRANSPARENT_HUGEPAGE is not set +# CONFIG_CMA is not set +CONFIG_GENERIC_EARLY_IOREMAP=y +# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set +# CONFIG_IDLE_PAGE_TRACKING is not set +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CURRENT_STACK_POINTER=y +CONFIG_ARCH_HAS_PTE_DEVMAP=y +CONFIG_ARCH_HAS_ZONE_DMA_SET=y +# CONFIG_ZONE_DMA is not set +# CONFIG_ZONE_DMA32 is not set +CONFIG_VM_EVENT_COUNTERS=y +# CONFIG_PERCPU_STATS is not set +# CONFIG_GUP_TEST is not set +# CONFIG_DMAPOOL_TEST is not set +CONFIG_ARCH_HAS_PTE_SPECIAL=y +# CONFIG_SECRETMEM is not set +# CONFIG_ANON_VMA_NAME is not set +# CONFIG_USERFAULTFD is not set +# CONFIG_LRU_GEN is not set +CONFIG_ARCH_SUPPORTS_PER_VMA_LOCK=y +CONFIG_PER_VMA_LOCK=y + +# +# Data Access Monitoring +# +# CONFIG_DAMON is not set +# end of Data Access Monitoring +# end of Memory Management options + +CONFIG_NET=y +# CONFIG_NET_PROMISC_MESSAGES is not set + +# +# Networking options +# +CONFIG_NETSKBPAD=64 +CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set +CONFIG_UNIX=y +CONFIG_UNIX_SCM=y +CONFIG_AF_UNIX_OOB=y +CONFIG_UNIX_ABSTRACT_IGNORE_NETNS=y +CONFIG_UNIX_DIAG=y +# CONFIG_TLS is not set +# CONFIG_XFRM_USER is not set +# CONFIG_NET_KEY is not set +CONFIG_NET_HANDSHAKE=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +# CONFIG_IP_FIB_TRIE_STATS is not set +CONFIG_IP_MULTIPLE_TABLES=y +# CONFIG_IP_ROUTE_MULTIPATH is not set +# CONFIG_IP_ROUTE_VERBOSE is not set +CONFIG_IP_PNP=y +CONFIG_IP_PNP_DHCP=y +CONFIG_IP_PNP_BOOTP=y +# CONFIG_IP_PNP_RARP is not set +# CONFIG_NET_IPIP is not set +CONFIG_NET_IPGRE_DEMUX=m +CONFIG_NET_IP_TUNNEL=y +CONFIG_NET_IPGRE=m +# CONFIG_NET_IPGRE_BROADCAST is not set +# CONFIG_IP_MROUTE is not set +# CONFIG_SYN_COOKIES is not set +# CONFIG_NET_IPVTI is not set +CONFIG_NET_UDP_TUNNEL=y +# CONFIG_NET_FOU is not set +# CONFIG_NET_FOU_IP_TUNNELS is not set +# CONFIG_INET_AH is not set +# CONFIG_INET_ESP is not set +# CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 +CONFIG_INET_DIAG=y +CONFIG_INET_TCP_DIAG=y +# CONFIG_INET_UDP_DIAG is not set +# CONFIG_INET_RAW_DIAG is not set +CONFIG_INET_DIAG_DESTROY=y +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_MD5SIG is not set +CONFIG_IPV6=y +# CONFIG_IPV6_ROUTER_PREF is not set +# CONFIG_IPV6_OPTIMISTIC_DAD is not set +# CONFIG_INET6_AH is not set +# CONFIG_INET6_ESP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_ILA is not set +# CONFIG_IPV6_VTI is not set +# CONFIG_IPV6_SIT is not set +# CONFIG_IPV6_TUNNEL is not set +# CONFIG_IPV6_GRE is not set +# CONFIG_IPV6_MULTIPLE_TABLES is not set +# CONFIG_IPV6_MROUTE is not set +# CONFIG_IPV6_SEG6_LWTUNNEL is not set +# CONFIG_IPV6_SEG6_HMAC is not set +# CONFIG_IPV6_RPL_LWTUNNEL is not set +# CONFIG_IPV6_IOAM6_LWTUNNEL is not set +# CONFIG_MPTCP is not set +# CONFIG_NETWORK_SECMARK is not set +CONFIG_NET_PTP_CLASSIFY=y +# CONFIG_NETWORK_PHY_TIMESTAMPING is not set +CONFIG_NETFILTER=y +CONFIG_NETFILTER_ADVANCED=y +# CONFIG_BRIDGE_NETFILTER is not set + +# +# Core Netfilter Configuration +# +# CONFIG_NETFILTER_INGRESS is not set +# CONFIG_NETFILTER_EGRESS is not set +# CONFIG_NETFILTER_NETLINK_ACCT is not set +# CONFIG_NETFILTER_NETLINK_QUEUE is not set +# CONFIG_NETFILTER_NETLINK_LOG is not set +# CONFIG_NETFILTER_NETLINK_OSF is not set +CONFIG_NF_CONNTRACK=y +# CONFIG_NF_LOG_SYSLOG is not set +CONFIG_NF_CONNTRACK_MARK=y +# CONFIG_NF_CONNTRACK_ZONES is not set +CONFIG_NF_CONNTRACK_PROCFS=y +CONFIG_NF_CONNTRACK_EVENTS=y +# CONFIG_NF_CONNTRACK_TIMEOUT is not set +# CONFIG_NF_CONNTRACK_TIMESTAMP is not set +# CONFIG_NF_CONNTRACK_LABELS is not set +CONFIG_NF_CT_PROTO_DCCP=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y +# CONFIG_NF_CONNTRACK_AMANDA is not set +# CONFIG_NF_CONNTRACK_FTP is not set +# CONFIG_NF_CONNTRACK_H323 is not set +# CONFIG_NF_CONNTRACK_IRC is not set +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +# CONFIG_NF_CONNTRACK_PPTP is not set +# CONFIG_NF_CONNTRACK_SANE is not set +# CONFIG_NF_CONNTRACK_SIP is not set +# CONFIG_NF_CONNTRACK_TFTP is not set +# CONFIG_NF_CT_NETLINK is not set +CONFIG_NF_NAT=y +CONFIG_NF_NAT_REDIRECT=y +# CONFIG_NF_TABLES is not set +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +# CONFIG_NETFILTER_XT_MARK is not set +# CONFIG_NETFILTER_XT_CONNMARK is not set + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set +# CONFIG_NETFILTER_XT_TARGET_CONNMARK is not set +# CONFIG_NETFILTER_XT_TARGET_HMARK is not set +# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set +# CONFIG_NETFILTER_XT_TARGET_LED is not set +# CONFIG_NETFILTER_XT_TARGET_LOG is not set +# CONFIG_NETFILTER_XT_TARGET_MARK is not set +CONFIG_NETFILTER_XT_NAT=y +# CONFIG_NETFILTER_XT_TARGET_NETMAP is not set +# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set +# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set +# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set +CONFIG_NETFILTER_XT_TARGET_REDIRECT=y +# CONFIG_NETFILTER_XT_TARGET_MASQUERADE is not set +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set + +# +# Xtables matches +# +# CONFIG_NETFILTER_XT_MATCH_ADDRTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_BPF is not set +# CONFIG_NETFILTER_XT_MATCH_CGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_CLUSTER is not set +# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLABEL is not set +# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +# CONFIG_NETFILTER_XT_MATCH_DCCP is not set +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +# CONFIG_NETFILTER_XT_MATCH_DSCP is not set +# CONFIG_NETFILTER_XT_MATCH_ECN is not set +# CONFIG_NETFILTER_XT_MATCH_ESP is not set +# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_HELPER is not set +# CONFIG_NETFILTER_XT_MATCH_HL is not set +# CONFIG_NETFILTER_XT_MATCH_IPCOMP is not set +# CONFIG_NETFILTER_XT_MATCH_IPRANGE is not set +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set +# CONFIG_NETFILTER_XT_MATCH_MAC is not set +# CONFIG_NETFILTER_XT_MATCH_MARK is not set +# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set +# CONFIG_NETFILTER_XT_MATCH_NFACCT is not set +# CONFIG_NETFILTER_XT_MATCH_OSF is not set +# CONFIG_NETFILTER_XT_MATCH_OWNER is not set +# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set +# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set +# CONFIG_NETFILTER_XT_MATCH_RATEEST is not set +# CONFIG_NETFILTER_XT_MATCH_REALM is not set +# CONFIG_NETFILTER_XT_MATCH_RECENT is not set +# CONFIG_NETFILTER_XT_MATCH_SCTP is not set +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +# CONFIG_NETFILTER_XT_MATCH_STATE is not set +# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set +# CONFIG_NETFILTER_XT_MATCH_STRING is not set +# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set +# CONFIG_NETFILTER_XT_MATCH_TIME is not set +# CONFIG_NETFILTER_XT_MATCH_U32 is not set +# end of Core Netfilter Configuration + +# CONFIG_IP_SET is not set +# CONFIG_IP_VS is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_FFN is not set +CONFIG_NF_DEFRAG_IPV4=y +# CONFIG_NF_SOCKET_IPV4 is not set +# CONFIG_NF_TPROXY_IPV4 is not set +# CONFIG_NF_DUP_IPV4 is not set +# CONFIG_NF_LOG_ARP is not set +# CONFIG_NF_LOG_IPV4 is not set +CONFIG_NF_REJECT_IPV4=y +CONFIG_IP_NF_IPTABLES=y +# CONFIG_IP_NF_MATCH_AH is not set +# CONFIG_IP_NF_MATCH_ECN is not set +# CONFIG_IP_NF_MATCH_TTL is not set +CONFIG_IP_NF_FILTER=y +CONFIG_IP_NF_TARGET_REJECT=y +# CONFIG_IP_NF_TARGET_SYNPROXY is not set +CONFIG_IP_NF_NAT=y +# CONFIG_IP_NF_TARGET_MASQUERADE is not set +# CONFIG_IP_NF_TARGET_NETMAP is not set +CONFIG_IP_NF_TARGET_REDIRECT=y +# CONFIG_IP_NF_MANGLE is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +# CONFIG_IPV6_FFN is not set +# CONFIG_NF_SOCKET_IPV6 is not set +# CONFIG_NF_TPROXY_IPV6 is not set +# CONFIG_NF_DUP_IPV6 is not set +CONFIG_NF_REJECT_IPV6=y +# CONFIG_NF_LOG_IPV6 is not set +CONFIG_IP6_NF_IPTABLES=y +# CONFIG_IP6_NF_MATCH_AH is not set +# CONFIG_IP6_NF_MATCH_EUI64 is not set +# CONFIG_IP6_NF_MATCH_FRAG is not set +# CONFIG_IP6_NF_MATCH_OPTS is not set +# CONFIG_IP6_NF_MATCH_HL is not set +# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set +# CONFIG_IP6_NF_MATCH_MH is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_SRH is not set +CONFIG_IP6_NF_FILTER=y +CONFIG_IP6_NF_TARGET_REJECT=y +# CONFIG_IP6_NF_TARGET_SYNPROXY is not set +# CONFIG_IP6_NF_MANGLE is not set +# CONFIG_IP6_NF_RAW is not set +# CONFIG_IP6_NF_NAT is not set +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=y +# CONFIG_NF_CONNTRACK_BRIDGE is not set +# CONFIG_BRIDGE_NF_EBTABLES is not set +# CONFIG_BPFILTER is not set +# CONFIG_IP_DCCP is not set +# CONFIG_IP_SCTP is not set +# CONFIG_RDS is not set +# CONFIG_TIPC is not set +# CONFIG_ATM is not set +# CONFIG_L2TP is not set +# CONFIG_FBXATM is not set +# CONFIG_FBXBRIDGE is not set +CONFIG_STP=y +CONFIG_BRIDGE=y +CONFIG_BRIDGE_STATE_MESSAGES=y +# CONFIG_BRIDGE_IGMP_SNOOPING is not set +# CONFIG_BRIDGE_VLAN_FILTERING is not set +# CONFIG_BRIDGE_MRP is not set +# CONFIG_BRIDGE_CFM is not set +# CONFIG_NET_DSA is not set +CONFIG_VLAN_8021Q=y +# CONFIG_VLAN_8021Q_GVRP is not set +# CONFIG_VLAN_8021Q_MVRP is not set +CONFIG_VLAN_FBX=y +CONFIG_LLC=y +# CONFIG_LLC2 is not set +# CONFIG_ATALK is not set +# CONFIG_X25 is not set +# CONFIG_LAPB is not set +# CONFIG_PHONET is not set +# CONFIG_6LOWPAN is not set +# CONFIG_IEEE802154 is not set +# CONFIG_NET_SCHED is not set +# CONFIG_DCB is not set +# CONFIG_DNS_RESOLVER is not set +CONFIG_BATMAN_ADV=y +CONFIG_BATMAN_ADV_BATMAN_V=y +# CONFIG_BATMAN_ADV_BLA is not set +# CONFIG_BATMAN_ADV_DAT is not set +# CONFIG_BATMAN_ADV_NC is not set +# CONFIG_BATMAN_ADV_MCAST is not set +# CONFIG_BATMAN_ADV_DEBUG is not set +CONFIG_BATMAN_ADV_FBX=y +CONFIG_BATMAN_ADV_FBX_MTU=y +CONFIG_BATMAN_ADV_FBX_SLAP=y +CONFIG_BATMAN_ADV_FBX_PERIF_ROUTER=y +# CONFIG_OPENVSWITCH is not set +# CONFIG_VSOCKETS is not set +# CONFIG_NETLINK_DIAG is not set +# CONFIG_MPLS is not set +# CONFIG_NET_NSH is not set +# CONFIG_HSR is not set +# CONFIG_NET_SWITCHDEV is not set +# CONFIG_NET_L3_MASTER_DEV is not set +CONFIG_QRTR=y +# CONFIG_QRTR_TUN is not set +CONFIG_QRTR_MHI=y +# CONFIG_NET_NCSI is not set +# CONFIG_PCPU_DEV_REFCNT is not set +CONFIG_MAX_SKB_FRAGS=17 +CONFIG_RPS=y +CONFIG_RFS_ACCEL=y +CONFIG_SOCK_RX_QUEUE_MAPPING=y +CONFIG_XPS=y +# CONFIG_CGROUP_NET_PRIO is not set +# CONFIG_CGROUP_NET_CLASSID is not set +CONFIG_NET_RX_BUSY_POLL=y +CONFIG_BQL=y +CONFIG_NET_FLOW_LIMIT=y + +# +# Network testing +# +# CONFIG_NET_PKTGEN is not set +# end of Network testing +# end of Networking options + +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +CONFIG_BT=y +CONFIG_BT_BREDR=y +# CONFIG_BT_RFCOMM is not set +# CONFIG_BT_BNEP is not set +# CONFIG_BT_HIDP is not set +# CONFIG_BT_HS is not set +# CONFIG_BT_LE is not set +# CONFIG_BT_LEDS is not set +# CONFIG_BT_MSFTEXT is not set +# CONFIG_BT_AOSPEXT is not set +# CONFIG_BT_DEBUGFS is not set +# CONFIG_BT_SELFTEST is not set +# CONFIG_BT_FEATURE_DEBUG is not set + +# +# Bluetooth device drivers +# +CONFIG_BT_RTL=m +# CONFIG_BT_HCIBTUSB is not set +# CONFIG_BT_HCIBTSDIO is not set +CONFIG_BT_HCIUART=m +CONFIG_BT_HCIUART_SERDEV=y +# CONFIG_BT_HCIUART_H4 is not set +# CONFIG_BT_HCIUART_NOKIA is not set +# CONFIG_BT_HCIUART_BCSP is not set +# CONFIG_BT_HCIUART_ATH3K is not set +# CONFIG_BT_HCIUART_LL is not set +CONFIG_BT_HCIUART_3WIRE=y +# CONFIG_BT_HCIUART_INTEL is not set +# CONFIG_BT_HCIUART_BCM is not set +CONFIG_BT_HCIUART_RTL=y +# CONFIG_BT_HCIUART_QCA is not set +# CONFIG_BT_HCIUART_AG6XX is not set +# CONFIG_BT_HCIUART_MRVL is not set +# CONFIG_BT_HCIBCM203X is not set +# CONFIG_BT_HCIBCM4377 is not set +# CONFIG_BT_HCIBPA10X is not set +# CONFIG_BT_HCIBFUSB is not set +# CONFIG_BT_HCIVHCI is not set +# CONFIG_BT_MRVL is not set +# CONFIG_BT_MTKSDIO is not set +# CONFIG_BT_MTKUART is not set +# CONFIG_BT_NXPUART is not set +# end of Bluetooth device drivers + +# CONFIG_AF_RXRPC is not set +# CONFIG_AF_KCM is not set +# CONFIG_MCTP is not set +CONFIG_FIB_RULES=y +CONFIG_WIRELESS=y +CONFIG_CFG80211=y +# CONFIG_NL80211_TESTMODE is not set +# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set +CONFIG_CFG80211_CERTIFICATION_ONUS=y +# CONFIG_CFG80211_REQUIRE_SIGNED_REGDB is not set +# CONFIG_CFG80211_REG_CELLULAR_HINTS is not set +# CONFIG_CFG80211_REG_RELAX_NO_IR is not set +CONFIG_CFG80211_DEFAULT_PS=y +# CONFIG_CFG80211_DEBUGFS is not set +# CONFIG_CFG80211_DFS_CACHE is not set +CONFIG_CFG80211_CRDA_SUPPORT=y +# CONFIG_CFG80211_WEXT is not set +# CONFIG_FBX80211 is not set +CONFIG_MAC80211=y +CONFIG_MAC80211_HAS_RC=y +CONFIG_MAC80211_RC_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y +CONFIG_MAC80211_RC_DEFAULT="minstrel_ht" +CONFIG_MAC80211_MESH=y +CONFIG_MAC80211_LEDS=y +CONFIG_MAC80211_DEBUGFS=y +# CONFIG_MAC80211_MESSAGE_TRACING is not set +# CONFIG_MAC80211_DEBUG_MENU is not set +CONFIG_MAC80211_STA_HASH_MAX_SIZE=0 +# CONFIG_RFKILL is not set +# CONFIG_NET_9P is not set +# CONFIG_CAIF is not set +# CONFIG_CEPH_LIB is not set +# CONFIG_NFC is not set +# CONFIG_PSAMPLE is not set +# CONFIG_NET_IFE is not set +# CONFIG_LWTUNNEL is not set +CONFIG_DST_CACHE=y +CONFIG_GRO_CELLS=y +CONFIG_NET_SELFTESTS=y +CONFIG_PAGE_POOL=y +CONFIG_PAGE_POOL_STATS=y +# CONFIG_FAILOVER is not set +# CONFIG_ETHTOOL_NETLINK is not set + +# +# Device Drivers +# +CONFIG_ARM_AMBA=y +CONFIG_HAVE_PCI=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +# CONFIG_HOTPLUG_PCI_PCIE is not set +CONFIG_PCIEAER=y +# CONFIG_PCIEAER_INJECT is not set +# CONFIG_PCIE_ECRC is not set +# CONFIG_PCIEASPM is not set +CONFIG_PCIE_PME=y +# CONFIG_PCIE_DPC is not set +# CONFIG_PCIE_PTM is not set +CONFIG_PCI_MSI=y +CONFIG_PCI_QUIRKS=y +# CONFIG_PCI_DEBUG is not set +# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set +# CONFIG_PCI_STUB is not set +# CONFIG_PCI_PF_STUB is not set +CONFIG_PCI_ATS=y +CONFIG_PCI_IOV=y +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +# CONFIG_PCIE_BUS_TUNE_OFF is not set +CONFIG_PCIE_BUS_DEFAULT=y +# CONFIG_PCIE_BUS_SAFE is not set +# CONFIG_PCIE_BUS_PERFORMANCE is not set +# CONFIG_PCIE_BUS_PEER2PEER is not set +# CONFIG_VGA_ARB is not set +CONFIG_HOTPLUG_PCI=y +# CONFIG_HOTPLUG_PCI_CPCI is not set +# CONFIG_HOTPLUG_PCI_SHPC is not set + +# +# PCI controller drivers +# +# CONFIG_PCIE_ALTERA is not set +# CONFIG_PCI_HOST_THUNDER_PEM is not set +# CONFIG_PCI_HOST_THUNDER_ECAM is not set +# CONFIG_PCI_FTPCI100 is not set +# CONFIG_PCI_HOST_GENERIC is not set +# CONFIG_PCIE_MICROCHIP_HOST is not set +# CONFIG_PCI_XGENE is not set +# CONFIG_PCIE_XILINX is not set + +# +# Cadence-based PCIe controllers +# +# CONFIG_PCIE_CADENCE_PLAT_HOST is not set +# CONFIG_PCI_J721E_HOST is not set +# end of Cadence-based PCIe controllers + +# +# DesignWare-based PCIe controllers +# +CONFIG_PCIE_DW=y +CONFIG_PCIE_DW_HOST=y +# CONFIG_PCIE_AL is not set +CONFIG_PCI_MESON=y +# CONFIG_PCI_HISI is not set +# CONFIG_PCIE_KIRIN is not set +# CONFIG_PCIE_DW_PLAT_HOST is not set +# end of DesignWare-based PCIe controllers + +# +# Mobiveil-based PCIe controllers +# +# end of Mobiveil-based PCIe controllers +# end of PCI controller drivers + +# +# PCI Endpoint +# +# CONFIG_PCI_ENDPOINT is not set +# end of PCI Endpoint + +# +# PCI switch controller drivers +# +# CONFIG_PCI_SW_SWITCHTEC is not set +# end of PCI switch controller drivers + +# CONFIG_CXL_BUS is not set +# CONFIG_PCCARD is not set +# CONFIG_RAPIDIO is not set + +# +# Generic Driver Options +# +# CONFIG_UEVENT_HELPER is not set +CONFIG_DEVTMPFS=y +CONFIG_DEVTMPFS_MOUNT=y +# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_STANDALONE=y +CONFIG_PREVENT_FIRMWARE_BUILD=y + +# +# Firmware loader +# +CONFIG_FW_LOADER=y +CONFIG_EXTRA_FIRMWARE="" +# CONFIG_FW_LOADER_USER_HELPER is not set +# CONFIG_FW_LOADER_COMPRESS is not set +# CONFIG_FW_CACHE is not set +# CONFIG_FW_UPLOAD is not set +# end of Firmware loader + +CONFIG_WANT_DEV_COREDUMP=y +# CONFIG_ALLOW_DEV_COREDUMP is not set +# CONFIG_DEBUG_DRIVER is not set +# CONFIG_DEBUG_DEVRES is not set +# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set +# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=y +CONFIG_SOC_BUS=y +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_MMIO=y +CONFIG_DMA_SHARED_BUFFER=y +# CONFIG_DMA_FENCE_TRACE is not set +CONFIG_GENERIC_ARCH_TOPOLOGY=y +# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set +# end of Generic Driver Options + +# +# Bus devices +# +# CONFIG_BRCMSTB_GISB_ARB is not set +# CONFIG_VEXPRESS_CONFIG is not set +CONFIG_MHI_BUS=y +# CONFIG_MHI_BUS_DEBUG is not set +# CONFIG_MHI_BUS_PCI_GENERIC is not set +# CONFIG_MHI_BUS_EP is not set +# end of Bus devices + +# CONFIG_CONNECTOR is not set + +# +# Firmware Drivers +# + +# +# ARM System Control and Management Interface Protocol +# +# CONFIG_ARM_SCMI_PROTOCOL is not set +# end of ARM System Control and Management Interface Protocol + +CONFIG_ARM_SCPI_PROTOCOL=y +CONFIG_ARM_SCPI_POWER_DOMAIN=y +# CONFIG_FIRMWARE_MEMMAP is not set +# CONFIG_FW_CFG_SYSFS is not set +# CONFIG_ARM_FFA_TRANSPORT is not set +# CONFIG_GOOGLE_FIRMWARE is not set +CONFIG_MESON_SM=y +CONFIG_ARM_PSCI_FW=y +CONFIG_HAVE_ARM_SMCCC=y +CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y +# CONFIG_ARM_SMCCC_SOC_ID is not set + +# +# Tegra firmware driver +# +# end of Tegra firmware driver +# end of Firmware Drivers + +# CONFIG_GNSS is not set +CONFIG_FREEBOX_PROCFS=y +# CONFIG_MTD is not set +CONFIG_DTC=y +CONFIG_OF=y +# CONFIG_OF_UNITTEST is not set +CONFIG_OF_DTB_BUILTIN_LIST="" +CONFIG_OF_FLATTREE=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_KOBJ=y +CONFIG_OF_DYNAMIC=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_IRQ=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_OF_RESOLVE=y +CONFIG_OF_OVERLAY=y +CONFIG_OF_CONFIGFS=y +# CONFIG_PARPORT is not set +CONFIG_BLK_DEV=y +# CONFIG_BLK_DEV_NULL_BLK is not set +# CONFIG_BLK_DEV_PCIESSD_MTIP32XX is not set +# CONFIG_ZRAM is not set +# CONFIG_BLK_DEV_LOOP is not set +# CONFIG_BLK_DEV_DRBD is not set +# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=1 +CONFIG_BLK_DEV_RAM_SIZE=65536 +# CONFIG_CDROM_PKTCDVD is not set +# CONFIG_ATA_OVER_ETH is not set +# CONFIG_BLK_DEV_RBD is not set +# CONFIG_BLK_DEV_UBLK is not set + +# +# NVME Support +# +# CONFIG_BLK_DEV_NVME is not set +# CONFIG_NVME_FC is not set +# CONFIG_NVME_TCP is not set +# CONFIG_NVME_TARGET is not set +# end of NVME Support + +# +# Misc devices +# +# CONFIG_WINTEGRA_MMAP is not set +# CONFIG_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set +# CONFIG_PHANTOM is not set +# CONFIG_TIFM_CORE is not set +# CONFIG_ICS932S401 is not set +# CONFIG_ENCLOSURE_SERVICES is not set +# CONFIG_HP_ILO is not set +# CONFIG_APDS9802ALS is not set +# CONFIG_ISL29003 is not set +# CONFIG_ISL29020 is not set +# CONFIG_SENSORS_TSL2550 is not set +# CONFIG_SENSORS_BH1770 is not set +# CONFIG_SENSORS_APDS990X is not set +# CONFIG_HMC6352 is not set +# CONFIG_DS1682 is not set +# CONFIG_INTELCE_PIC16PMU is not set +CONFIG_FBXSERIAL_OF=y +CONFIG_SRAM=y +# CONFIG_DW_XDATA_PCIE is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +# CONFIG_XILINX_SDFEC is not set +# CONFIG_HISI_HIKEY_USB is not set +# CONFIG_OPEN_DICE is not set +# CONFIG_VCPU_STALL_DETECTOR is not set +# CONFIG_DGASP is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=y +# CONFIG_EEPROM_LEGACY is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +# CONFIG_EEPROM_EE1004 is not set +# CONFIG_EEPROM_EE1004_RAW is not set +# end of EEPROM support + +# CONFIG_CB710_CORE is not set + +# +# Texas Instruments shared transport line discipline +# +# CONFIG_TI_ST is not set +# end of Texas Instruments shared transport line discipline + +# CONFIG_SENSORS_LIS3_I2C is not set +# CONFIG_ALTERA_STAPL is not set +# CONFIG_VMWARE_VMCI is not set +# CONFIG_GENWQE is not set +# CONFIG_ECHO is not set +# CONFIG_BCM_VK is not set +# CONFIG_MISC_ALCOR_PCI is not set +# CONFIG_MISC_RTSX_PCI is not set +# CONFIG_MISC_RTSX_USB is not set +# CONFIG_PVPANIC is not set +# CONFIG_GP_PCI1XXXX is not set + +# +# RemoTI support +# +# end of RemoTI support + +# +# HDMI CEC support +# +# CONFIG_HDMI_CEC is not set +# end of HDMI CEC support +# end of Misc devices + +# +# SCSI device support +# +CONFIG_SCSI_MOD=y +# CONFIG_RAID_ATTRS is not set +CONFIG_SCSI_COMMON=y +CONFIG_SCSI=y +CONFIG_SCSI_DMA=y +# CONFIG_SCSI_PROC_FS is not set + +# +# SCSI support type (disk, tape, CD-ROM) +# +CONFIG_BLK_DEV_SD=y +# CONFIG_CHR_DEV_ST is not set +# CONFIG_BLK_DEV_SR is not set +# CONFIG_CHR_DEV_SG is not set +# CONFIG_BLK_DEV_BSG is not set +# CONFIG_CHR_DEV_SCH is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set +# CONFIG_SCSI_SCAN_ASYNC is not set + +# +# SCSI Transports +# +# CONFIG_SCSI_SPI_ATTRS is not set +# CONFIG_SCSI_FC_ATTRS is not set +# CONFIG_SCSI_ISCSI_ATTRS is not set +# CONFIG_SCSI_SAS_ATTRS is not set +# CONFIG_SCSI_SAS_LIBSAS is not set +# CONFIG_SCSI_SRP_ATTRS is not set +# end of SCSI Transports + +CONFIG_SCSI_LOWLEVEL=y +# CONFIG_ISCSI_TCP is not set +# CONFIG_ISCSI_BOOT_SYSFS is not set +# CONFIG_SCSI_CXGB3_ISCSI is not set +# CONFIG_SCSI_CXGB4_ISCSI is not set +# CONFIG_SCSI_BNX2_ISCSI is not set +# CONFIG_BE2ISCSI is not set +# CONFIG_BLK_DEV_3W_XXXX_RAID is not set +# CONFIG_SCSI_HPSA is not set +# CONFIG_SCSI_3W_9XXX is not set +# CONFIG_SCSI_3W_SAS is not set +# CONFIG_SCSI_ACARD is not set +# CONFIG_SCSI_AACRAID is not set +# CONFIG_SCSI_AIC7XXX is not set +# CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_AIC94XX is not set +# CONFIG_SCSI_MVSAS is not set +# CONFIG_SCSI_MVUMI is not set +# CONFIG_SCSI_ADVANSYS is not set +# CONFIG_SCSI_ARCMSR is not set +# CONFIG_SCSI_ESAS2R is not set +# CONFIG_MEGARAID_NEWGEN is not set +# CONFIG_MEGARAID_LEGACY is not set +# CONFIG_MEGARAID_SAS is not set +# CONFIG_SCSI_MPT3SAS is not set +# CONFIG_SCSI_MPT2SAS is not set +# CONFIG_SCSI_MPI3MR is not set +# CONFIG_SCSI_SMARTPQI is not set +# CONFIG_SCSI_HPTIOP is not set +# CONFIG_SCSI_BUSLOGIC is not set +# CONFIG_SCSI_MYRB is not set +# CONFIG_SCSI_MYRS is not set +# CONFIG_SCSI_SNIC is not set +# CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_FDOMAIN_PCI is not set +# CONFIG_SCSI_IPS is not set +# CONFIG_SCSI_INITIO is not set +# CONFIG_SCSI_INIA100 is not set +# CONFIG_SCSI_STEX is not set +# CONFIG_SCSI_SYM53C8XX_2 is not set +# CONFIG_SCSI_IPR is not set +# CONFIG_SCSI_QLOGIC_1280 is not set +# CONFIG_SCSI_QLA_ISCSI is not set +# CONFIG_SCSI_DC395x is not set +# CONFIG_SCSI_AM53C974 is not set +# CONFIG_SCSI_WD719X is not set +# CONFIG_SCSI_DEBUG is not set +# CONFIG_SCSI_PMCRAID is not set +# CONFIG_SCSI_PM8001 is not set +# CONFIG_SCSI_DH is not set +# end of SCSI device support + +# CONFIG_ATA is not set +# CONFIG_MD is not set +# CONFIG_TARGET_CORE is not set +# CONFIG_FUSION is not set + +# +# IEEE 1394 (FireWire) support +# +# CONFIG_FIREWIRE is not set +# CONFIG_FIREWIRE_NOSY is not set +# end of IEEE 1394 (FireWire) support + +CONFIG_NETDEVICES=y +CONFIG_MII=y +CONFIG_NET_CORE=y +# CONFIG_BONDING is not set +CONFIG_DUMMY=y +CONFIG_WIREGUARD=y +# CONFIG_WIREGUARD_DEBUG is not set +# CONFIG_EQUALIZER is not set +# CONFIG_NET_FC is not set +# CONFIG_NET_TEAM is not set +CONFIG_MACVLAN=y +# CONFIG_MACVTAP is not set +# CONFIG_IPVLAN is not set +# CONFIG_VXLAN is not set +# CONFIG_GENEVE is not set +# CONFIG_BAREUDP is not set +# CONFIG_GTP is not set +# CONFIG_AMT is not set +# CONFIG_MACSEC is not set +# CONFIG_NETCONSOLE is not set +CONFIG_TUN=y +# CONFIG_TUN_VNET_CROSS_LE is not set +CONFIG_VETH=y +# CONFIG_NLMON is not set +# CONFIG_MHI_NET is not set +# CONFIG_ARCNET is not set +CONFIG_ETHERNET=y +# CONFIG_NET_VENDOR_3COM is not set +# CONFIG_NET_VENDOR_ADAPTEC is not set +# CONFIG_NET_VENDOR_AGERE is not set +# CONFIG_NET_VENDOR_ALACRITECH is not set +# CONFIG_NET_VENDOR_ALTEON is not set +# CONFIG_ALTERA_TSE is not set +# CONFIG_NET_VENDOR_AMAZON is not set +# CONFIG_NET_VENDOR_AMD is not set +# CONFIG_NET_VENDOR_AQUANTIA is not set +# CONFIG_NET_VENDOR_ARC is not set +# CONFIG_NET_VENDOR_ASIX is not set +# CONFIG_NET_VENDOR_ATHEROS is not set +# CONFIG_NET_VENDOR_BROADCOM is not set +# CONFIG_NET_VENDOR_CADENCE is not set +# CONFIG_NET_VENDOR_CAVIUM is not set +# CONFIG_NET_VENDOR_CHELSIO is not set +# CONFIG_NET_VENDOR_CISCO is not set +# CONFIG_NET_VENDOR_CORTINA is not set +# CONFIG_NET_VENDOR_DAVICOM is not set +# CONFIG_DNET is not set +# CONFIG_NET_VENDOR_DEC is not set +# CONFIG_NET_VENDOR_DLINK is not set +# CONFIG_NET_VENDOR_EMULEX is not set +# CONFIG_NET_VENDOR_ENGLEDER is not set +# CONFIG_NET_VENDOR_EZCHIP is not set +# CONFIG_NET_VENDOR_FUNGIBLE is not set +# CONFIG_NET_VENDOR_GOOGLE is not set +# CONFIG_NET_VENDOR_HISILICON is not set +# CONFIG_NET_VENDOR_HUAWEI is not set +# CONFIG_NET_VENDOR_INTEL is not set +# CONFIG_JME is not set +# CONFIG_NET_VENDOR_LITEX is not set +# CONFIG_NET_VENDOR_MARVELL is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_MICREL is not set +# CONFIG_NET_VENDOR_MICROCHIP is not set +# CONFIG_NET_VENDOR_MICROSEMI is not set +# CONFIG_NET_VENDOR_MICROSOFT is not set +# CONFIG_NET_VENDOR_MYRI is not set +# CONFIG_FEALNX is not set +# CONFIG_NET_VENDOR_NI is not set +# CONFIG_NET_VENDOR_NATSEMI is not set +# CONFIG_NET_VENDOR_NETERION is not set +# CONFIG_NET_VENDOR_NETRONOME is not set +# CONFIG_NET_VENDOR_NVIDIA is not set +# CONFIG_NET_VENDOR_OKI is not set +# CONFIG_ETHOC is not set +# CONFIG_NET_VENDOR_PACKET_ENGINES is not set +# CONFIG_NET_VENDOR_PENSANDO is not set +# CONFIG_NET_VENDOR_QLOGIC is not set +# CONFIG_NET_VENDOR_BROCADE is not set +# CONFIG_NET_VENDOR_QUALCOMM is not set +# CONFIG_NET_VENDOR_RDC is not set +# CONFIG_NET_VENDOR_REALTEK is not set +# CONFIG_NET_VENDOR_RENESAS is not set +# CONFIG_NET_VENDOR_ROCKER is not set +# CONFIG_NET_VENDOR_SAMSUNG is not set +# CONFIG_NET_VENDOR_SEEQ is not set +# CONFIG_NET_VENDOR_SILAN is not set +# CONFIG_NET_VENDOR_SIS is not set +# CONFIG_NET_VENDOR_SOLARFLARE is not set +# CONFIG_NET_VENDOR_SMSC is not set +# CONFIG_NET_VENDOR_SOCIONEXT is not set +CONFIG_NET_VENDOR_STMICRO=y +CONFIG_STMMAC_ETH=y +# CONFIG_STMMAC_SELFTESTS is not set +CONFIG_STMMAC_PLATFORM=y +# CONFIG_DWMAC_DWC_QOS_ETH is not set +CONFIG_DWMAC_GENERIC=y +CONFIG_DWMAC_MESON=y +# CONFIG_DWMAC_INTEL_PLAT is not set +# CONFIG_DWMAC_LOONGSON is not set +# CONFIG_STMMAC_PCI is not set +# CONFIG_NET_VENDOR_SUN is not set +# CONFIG_NET_VENDOR_SYNOPSYS is not set +# CONFIG_NET_VENDOR_TEHUTI is not set +# CONFIG_NET_VENDOR_TI is not set +# CONFIG_NET_VENDOR_VERTEXCOM is not set +# CONFIG_NET_VENDOR_VIA is not set +# CONFIG_NET_VENDOR_WANGXUN is not set +# CONFIG_NET_VENDOR_WIZNET is not set +# CONFIG_NET_VENDOR_XILINX is not set +# CONFIG_FDDI is not set +# CONFIG_HIPPI is not set +CONFIG_PHYLINK=y +CONFIG_PHYLIB=y +CONFIG_SWPHY=y +# CONFIG_LED_TRIGGER_PHY is not set +CONFIG_PHYLIB_LEDS=y +CONFIG_FIXED_PHY=y +# CONFIG_SFP is not set + +# +# MII PHY device drivers +# +# CONFIG_AMD_PHY is not set +# CONFIG_MESON_GXL_PHY is not set +# CONFIG_ADIN_PHY is not set +# CONFIG_ADIN1100_PHY is not set +# CONFIG_AQUANTIA_PHY is not set +# CONFIG_AX88796B_PHY is not set +# CONFIG_BROADCOM_PHY is not set +# CONFIG_BCM54140_PHY is not set +# CONFIG_BCM7XXX_PHY is not set +# CONFIG_BCM84881_PHY is not set +# CONFIG_BCM87XX_PHY is not set +# CONFIG_CICADA_PHY is not set +# CONFIG_CORTINA_PHY is not set +# CONFIG_DAVICOM_PHY is not set +# CONFIG_ICPLUS_PHY is not set +# CONFIG_LXT_PHY is not set +# CONFIG_INTEL_XWAY_PHY is not set +# CONFIG_LSI_ET1011C_PHY is not set +# CONFIG_MARVELL_PHY is not set +# CONFIG_MARVELL_10G_PHY is not set +# CONFIG_MARVELL_88X2222_PHY is not set +# CONFIG_MAXLINEAR_GPHY is not set +# CONFIG_MEDIATEK_GE_PHY is not set +# CONFIG_MICREL_PHY is not set +# CONFIG_MICROCHIP_T1S_PHY is not set +# CONFIG_MICROCHIP_PHY is not set +# CONFIG_MICROCHIP_T1_PHY is not set +# CONFIG_MICROSEMI_PHY is not set +# CONFIG_MOTORCOMM_PHY is not set +# CONFIG_NATIONAL_PHY is not set +# CONFIG_NXP_CBTX_PHY is not set +# CONFIG_NXP_C45_TJA11XX_PHY is not set +# CONFIG_NXP_TJA11XX_PHY is not set +# CONFIG_NCN26000_PHY is not set +# CONFIG_AT803X_PHY is not set +# CONFIG_QCA807X_PHY is not set +# CONFIG_QCA8084_PHY is not set +# CONFIG_QSEMI_PHY is not set +CONFIG_REALTEK_PHY=y +# CONFIG_RENESAS_PHY is not set +# CONFIG_ROCKCHIP_PHY is not set +# CONFIG_SMSC_PHY is not set +# CONFIG_STE10XP is not set +# CONFIG_TERANETICS_PHY is not set +# CONFIG_DP83822_PHY is not set +# CONFIG_DP83TC811_PHY is not set +# CONFIG_DP83848_PHY is not set +# CONFIG_DP83867_PHY is not set +# CONFIG_DP83869_PHY is not set +# CONFIG_DP83TD510_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_PSE_CONTROLLER is not set +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y +CONFIG_FWNODE_MDIO=y +CONFIG_OF_MDIO=y +CONFIG_MDIO_DEVRES=y +# CONFIG_MDIO_BITBANG is not set +# CONFIG_MDIO_BCM_UNIMAC is not set +# CONFIG_MDIO_HISI_FEMAC is not set +# CONFIG_MDIO_MVUSB is not set +# CONFIG_MDIO_MSCC_MIIM is not set +# CONFIG_MDIO_OCTEON is not set +# CONFIG_MDIO_IPQ4019 is not set +# CONFIG_MDIO_IPQ8064 is not set +# CONFIG_MDIO_THUNDER is not set + +# +# MDIO Multiplexers +# +# CONFIG_MDIO_BUS_MUX_MESON_G12A is not set +# CONFIG_MDIO_BUS_MUX_MESON_GXL is not set +# CONFIG_MDIO_BUS_MUX_GPIO is not set +# CONFIG_MDIO_BUS_MUX_MULTIPLEXER is not set +# CONFIG_MDIO_BUS_MUX_MMIOREG is not set + +# +# PCS device drivers +# +CONFIG_PCS_XPCS=y +# end of PCS device drivers + +# CONFIG_PPP is not set +# CONFIG_SLIP is not set +CONFIG_USB_NET_DRIVERS=y +# CONFIG_USB_CATC is not set +# CONFIG_USB_KAWETH is not set +# CONFIG_USB_PEGASUS is not set +# CONFIG_USB_RTL8150 is not set +CONFIG_USB_RTL8152=y +# CONFIG_USB_LAN78XX is not set +# CONFIG_USB_USBNET is not set +# CONFIG_USB_IPHETH is not set +CONFIG_WLAN=y +# CONFIG_WLAN_VENDOR_ADMTEK is not set +CONFIG_ATH_COMMON=m +CONFIG_WLAN_VENDOR_ATH=y +# CONFIG_ATH_DEBUG is not set +CONFIG_ATH_REG_IGNORE=y +CONFIG_ATH_REG_DYNAMIC_USER_REG_HINTS=y +# CONFIG_ATH_REG_DYNAMIC_USER_CERT_TESTING is not set +# CONFIG_ATH5K is not set +# CONFIG_ATH5K_PCI is not set +CONFIG_ATH9K_HW=m +CONFIG_ATH9K_COMMON=m +CONFIG_ATH9K_BTCOEX_SUPPORT=y +CONFIG_ATH9K=m +CONFIG_ATH9K_PCI=y +# CONFIG_ATH9K_AHB is not set +# CONFIG_ATH9K_DEBUGFS is not set +# CONFIG_ATH9K_DFS_CERTIFIED is not set +# CONFIG_ATH9K_DYNACK is not set +# CONFIG_ATH9K_WOW is not set +# CONFIG_ATH9K_CHANNEL_CONTEXT is not set +# CONFIG_ATH9K_PCOEM is not set +# CONFIG_ATH9K_PCI_NO_EEPROM is not set +# CONFIG_ATH9K_HTC is not set +# CONFIG_ATH9K_HWRNG is not set +# CONFIG_CARL9170 is not set +# CONFIG_ATH6KL is not set +# CONFIG_AR5523 is not set +# CONFIG_WIL6210 is not set +CONFIG_ATH10K=m +CONFIG_ATH10K_CE=y +CONFIG_ATH10K_PCI=m +# CONFIG_ATH10K_AHB is not set +# CONFIG_ATH10K_SDIO is not set +# CONFIG_ATH10K_USB is not set +# CONFIG_ATH10K_DEBUG is not set +# CONFIG_ATH10K_DEBUGFS is not set +CONFIG_ATH10K_DFS_CERTIFIED=y +# CONFIG_WCN36XX is not set +# CONFIG_ATH11K is not set +CONFIG_ATH12K=m +# CONFIG_ATH12K_DEBUG is not set +# CONFIG_ATH12K_DEBUGFS is not set +# CONFIG_ATH12K_MEM_PROFILE_512M is not set +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_CISCO is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +# CONFIG_WLAN_VENDOR_MARVELL is not set +# CONFIG_WLAN_VENDOR_MEDIATEK is not set +# CONFIG_WLAN_VENDOR_MICROCHIP is not set +# CONFIG_WLAN_VENDOR_PURELIFI is not set +# CONFIG_WLAN_VENDOR_RALINK is not set +# CONFIG_WLAN_VENDOR_REALTEK is not set +# CONFIG_WLAN_VENDOR_RSI is not set +# CONFIG_WLAN_VENDOR_SILABS is not set +# CONFIG_WLAN_VENDOR_ST is not set +# CONFIG_WLAN_VENDOR_TI is not set +# CONFIG_WLAN_VENDOR_ZYDAS is not set +# CONFIG_WLAN_VENDOR_QUANTENNA is not set +# CONFIG_USB_NET_RNDIS_WLAN is not set +# CONFIG_MAC80211_HWSIM is not set +# CONFIG_VIRT_WIFI is not set +# CONFIG_WAN is not set + +# +# Wireless WAN +# +# CONFIG_WWAN is not set +# end of Wireless WAN + +# CONFIG_VMXNET3 is not set +# CONFIG_NETDEVSIM is not set +# CONFIG_NET_FAILOVER is not set +# CONFIG_ISDN is not set + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_LEDS=y +# CONFIG_INPUT_FF_MEMLESS is not set +# CONFIG_INPUT_SPARSEKMAP is not set +# CONFIG_INPUT_MATRIXKMAP is not set + +# +# Userland interfaces +# +# CONFIG_INPUT_MOUSEDEV is not set +# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVBUG is not set + +# +# Input Device Drivers +# +CONFIG_INPUT_KEYBOARD=y +# CONFIG_KEYBOARD_ADP5588 is not set +# CONFIG_KEYBOARD_ADP5589 is not set +# CONFIG_KEYBOARD_ATKBD is not set +# CONFIG_KEYBOARD_QT1050 is not set +# CONFIG_KEYBOARD_QT1070 is not set +# CONFIG_KEYBOARD_QT2160 is not set +# CONFIG_KEYBOARD_DLINK_DIR685 is not set +# CONFIG_KEYBOARD_LKKBD is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_GPIO_POLLED=y +# CONFIG_KEYBOARD_TCA6416 is not set +# CONFIG_KEYBOARD_TCA8418 is not set +# CONFIG_KEYBOARD_MATRIX is not set +# CONFIG_KEYBOARD_LM8323 is not set +# CONFIG_KEYBOARD_LM8333 is not set +# CONFIG_KEYBOARD_MAX7359 is not set +# CONFIG_KEYBOARD_MCS is not set +# CONFIG_KEYBOARD_MPR121 is not set +# CONFIG_KEYBOARD_NEWTON is not set +# CONFIG_KEYBOARD_OPENCORES is not set +# CONFIG_KEYBOARD_PINEPHONE is not set +# CONFIG_KEYBOARD_SAMSUNG is not set +# CONFIG_KEYBOARD_STOWAWAY is not set +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_OMAP4 is not set +# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_CAP11XX is not set +# CONFIG_KEYBOARD_BCM is not set +# CONFIG_KEYBOARD_CYPRESS_SF is not set +# CONFIG_INPUT_MOUSE is not set +# CONFIG_INPUT_JOYSTICK is not set +# CONFIG_INPUT_TABLET is not set +# CONFIG_INPUT_TOUCHSCREEN is not set +# CONFIG_INPUT_MISC is not set +# CONFIG_RMI4_CORE is not set + +# +# Hardware I/O ports +# +# CONFIG_SERIO is not set +# CONFIG_GAMEPORT is not set +# end of Hardware I/O ports +# end of Input device support + +# +# Character devices +# +CONFIG_TTY=y +CONFIG_VT=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_UNIX98_PTYS=y +CONFIG_LEGACY_PTYS=y +CONFIG_LEGACY_PTY_COUNT=16 +# CONFIG_LEGACY_TIOCSTI is not set +# CONFIG_LDISC_AUTOLOAD is not set + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +# CONFIG_SERIAL_8250 is not set + +# +# Non-8250 serial port support +# +# CONFIG_SERIAL_AMBA_PL010 is not set +# CONFIG_SERIAL_AMBA_PL011 is not set +# CONFIG_SERIAL_EARLYCON_SEMIHOST is not set +CONFIG_SERIAL_MESON=y +CONFIG_SERIAL_MESON_CONSOLE=y +# CONFIG_SERIAL_UARTLITE is not set +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_CORE_CONSOLE=y +# CONFIG_SERIAL_JSM is not set +# CONFIG_SERIAL_SIFIVE is not set +# CONFIG_SERIAL_SCCNXP is not set +# CONFIG_SERIAL_SC16IS7XX is not set +# CONFIG_SERIAL_ALTERA_JTAGUART is not set +# CONFIG_SERIAL_ALTERA_UART is not set +# CONFIG_SERIAL_XILINX_PS_UART is not set +# CONFIG_SERIAL_ARC is not set +# CONFIG_SERIAL_RP2 is not set +# CONFIG_SERIAL_FSL_LPUART is not set +# CONFIG_SERIAL_FSL_LINFLEXUART is not set +# CONFIG_SERIAL_CONEXANT_DIGICOLOR is not set +# CONFIG_SERIAL_SPRD is not set +# end of Serial drivers + +# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_N_GSM is not set +# CONFIG_NOZOMI is not set +# CONFIG_NULL_TTY is not set +# CONFIG_HVC_DCC is not set +CONFIG_SERIAL_DEV_BUS=y +CONFIG_SERIAL_DEV_CTRL_TTYPORT=y +# CONFIG_TTY_PRINTK is not set +# CONFIG_VIRTIO_CONSOLE is not set +# CONFIG_IPMI_HANDLER is not set +CONFIG_HW_RANDOM=y +# CONFIG_HW_RANDOM_TIMERIOMEM is not set +# CONFIG_HW_RANDOM_BA431 is not set +CONFIG_HW_RANDOM_MESON=y +# CONFIG_HW_RANDOM_OPTEE is not set +# CONFIG_HW_RANDOM_CCTRNG is not set +# CONFIG_HW_RANDOM_XIPHERA is not set +# CONFIG_HW_RANDOM_ARM_SMCCC_TRNG is not set +# CONFIG_HW_RANDOM_CN10K is not set +# CONFIG_APPLICOM is not set +CONFIG_DEVMEM=y +# CONFIG_DEVPHYSMEM is not set +CONFIG_DEVPORT=y +# CONFIG_TCG_TPM is not set +# CONFIG_XILLYBUS is not set +# CONFIG_XILLYUSB is not set +# end of Character devices + +# +# Diag Support +# +# CONFIG_DIAG_CHAR is not set +# end of Diag Support + +# +# DIAG traffic over USB +# +# end of DIAG traffic over USB + +# +# DIAG traffic over QRTR +# +# end of DIAG traffic over QRTR + +# +# HSIC/SMUX support for DIAG +# +# end of HSIC/SMUX support for DIAG + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +# CONFIG_I2C_MUX is not set +CONFIG_I2C_HELPER_AUTO=y + +# +# I2C Hardware Bus support +# + +# +# PC SMBus host controller drivers +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_ISCH is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_NVIDIA_GPU is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +# CONFIG_I2C_CADENCE is not set +# CONFIG_I2C_CBUS_GPIO is not set +# CONFIG_I2C_DESIGNWARE_PLATFORM is not set +# CONFIG_I2C_DESIGNWARE_PCI is not set +# CONFIG_I2C_EMEV2 is not set +# CONFIG_I2C_GPIO is not set +# CONFIG_I2C_HISI is not set +CONFIG_I2C_MESON=y +# CONFIG_I2C_NOMADIK is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_RK3X is not set +# CONFIG_I2C_SIMTEC is not set +# CONFIG_I2C_THUNDERX is not set +# CONFIG_I2C_XILINX is not set + +# +# External I2C/SMBus adapter drivers +# +# CONFIG_I2C_DIOLAN_U2C is not set +# CONFIG_I2C_CP2615 is not set +# CONFIG_I2C_PCI1XXXX is not set +# CONFIG_I2C_ROBOTFUZZ_OSIF is not set +# CONFIG_I2C_TAOS_EVM is not set +# CONFIG_I2C_TINY_USB is not set + +# +# Other I2C/SMBus bus drivers +# +# CONFIG_I2C_VIRTIO is not set +# end of I2C Hardware Bus support + +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_SLAVE is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# end of I2C support + +# CONFIG_I3C is not set +# CONFIG_SPI is not set +# CONFIG_SPMI is not set +# CONFIG_HSI is not set +CONFIG_PPS=y +# CONFIG_PPS_DEBUG is not set + +# +# PPS clients support +# +# CONFIG_PPS_CLIENT_KTIMER is not set +# CONFIG_PPS_CLIENT_LDISC is not set +# CONFIG_PPS_CLIENT_GPIO is not set + +# +# PPS generators support +# + +# +# PTP clock support +# +CONFIG_PTP_1588_CLOCK=y +CONFIG_PTP_1588_CLOCK_OPTIONAL=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +# CONFIG_PTP_1588_CLOCK_KVM is not set +# CONFIG_PTP_1588_CLOCK_IDT82P33 is not set +# CONFIG_PTP_1588_CLOCK_IDTCM is not set +# end of PTP clock support + +CONFIG_PINCTRL=y +CONFIG_PINMUX=y +CONFIG_PINCONF=y +CONFIG_GENERIC_PINCONF=y +# CONFIG_DEBUG_PINCTRL is not set +# CONFIG_PINCTRL_CY8C95X0 is not set +# CONFIG_PINCTRL_MCP23S08 is not set +# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set +# CONFIG_PINCTRL_OCELOT is not set +# CONFIG_PINCTRL_SINGLE is not set +# CONFIG_PINCTRL_STMFX is not set +# CONFIG_PINCTRL_SX150X is not set +CONFIG_PINCTRL_MESON=y +# CONFIG_PINCTRL_MESON_GXBB is not set +# CONFIG_PINCTRL_MESON_GXL is not set +CONFIG_PINCTRL_MESON_AXG=y +CONFIG_PINCTRL_MESON_AXG_PMX=y +# CONFIG_PINCTRL_MESON_G12A is not set +# CONFIG_PINCTRL_MESON_A1 is not set +# CONFIG_PINCTRL_MESON_S4 is not set + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_OF_GPIO=y +# CONFIG_DEBUG_GPIO is not set +CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_CDEV=y +# CONFIG_GPIO_CDEV_V1 is not set + +# +# Memory mapped GPIO drivers +# +# CONFIG_GPIO_74XX_MMIO is not set +# CONFIG_GPIO_ALTERA is not set +# CONFIG_GPIO_CADENCE is not set +# CONFIG_GPIO_DWAPB is not set +# CONFIG_GPIO_FTGPIO010 is not set +# CONFIG_GPIO_GENERIC_PLATFORM is not set +# CONFIG_GPIO_GRGPIO is not set +# CONFIG_GPIO_HISI is not set +# CONFIG_GPIO_HLWD is not set +# CONFIG_GPIO_LOGICVC is not set +# CONFIG_GPIO_MB86S7X is not set +# CONFIG_GPIO_PL061 is not set +# CONFIG_GPIO_SIFIVE is not set +# CONFIG_GPIO_SYSCON is not set +# CONFIG_GPIO_XGENE is not set +# CONFIG_GPIO_XILINX is not set +# CONFIG_GPIO_AMD_FCH is not set +# end of Memory mapped GPIO drivers + +# +# I2C GPIO expanders +# +# CONFIG_GPIO_ADNP is not set +# CONFIG_GPIO_FXL6408 is not set +# CONFIG_GPIO_GW_PLD is not set +# CONFIG_GPIO_MAX7300 is not set +# CONFIG_GPIO_MAX732X is not set +# CONFIG_GPIO_PCA953X is not set +# CONFIG_GPIO_PCA9570 is not set +# CONFIG_GPIO_PCF857X is not set +# CONFIG_GPIO_TPIC2810 is not set +# end of I2C GPIO expanders + +# +# MFD GPIO expanders +# +# end of MFD GPIO expanders + +# +# PCI GPIO expanders +# +# CONFIG_GPIO_BT8XX is not set +# CONFIG_GPIO_PCI_IDIO_16 is not set +# CONFIG_GPIO_PCIE_IDIO_24 is not set +# CONFIG_GPIO_RDC321X is not set +# end of PCI GPIO expanders + +# +# USB GPIO expanders +# +# end of USB GPIO expanders + +# +# Virtual GPIO drivers +# +# CONFIG_GPIO_AGGREGATOR is not set +# CONFIG_GPIO_LATCH is not set +# CONFIG_GPIO_MOCKUP is not set +# CONFIG_GPIO_SIM is not set +# end of Virtual GPIO drivers + +# CONFIG_FREEBOX_GPIO is not set +# CONFIG_FREEBOX_GPIO_DT is not set +# CONFIG_FREEBOX_JTAG is not set +# CONFIG_W1 is not set +CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_BRCMSTB is not set +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART is not set +# CONFIG_POWER_RESET_ODROID_GO_ULTRA_POWEROFF is not set +# CONFIG_POWER_RESET_LTC2952 is not set +# CONFIG_POWER_RESET_REGULATOR is not set +# CONFIG_POWER_RESET_RESTART is not set +# CONFIG_POWER_RESET_XGENE is not set +# CONFIG_POWER_RESET_SYSCON is not set +# CONFIG_POWER_RESET_SYSCON_POWEROFF is not set +# CONFIG_SYSCON_REBOOT_MODE is not set +# CONFIG_NVMEM_REBOOT_MODE is not set +CONFIG_POWER_SUPPLY=y +# CONFIG_POWER_SUPPLY_DEBUG is not set +# CONFIG_POWER_SUPPLY_HWMON is not set +# CONFIG_IP5XXX_POWER is not set +# CONFIG_TEST_POWER is not set +# CONFIG_CHARGER_ADP5061 is not set +# CONFIG_BATTERY_CW2015 is not set +# CONFIG_BATTERY_DS2780 is not set +# CONFIG_BATTERY_DS2781 is not set +# CONFIG_BATTERY_DS2782 is not set +# CONFIG_BATTERY_SAMSUNG_SDI is not set +# CONFIG_BATTERY_SBS is not set +# CONFIG_CHARGER_SBS is not set +# CONFIG_BATTERY_BQ27XXX is not set +# CONFIG_BATTERY_MAX17040 is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO is not set +# CONFIG_CHARGER_MANAGER is not set +# CONFIG_CHARGER_LT3651 is not set +# CONFIG_CHARGER_LTC4162L is not set +# CONFIG_CHARGER_DETECTOR_MAX14656 is not set +# CONFIG_CHARGER_MAX77976 is not set +# CONFIG_CHARGER_BQ2415X is not set +# CONFIG_CHARGER_BQ24190 is not set +# CONFIG_CHARGER_BQ24257 is not set +# CONFIG_CHARGER_BQ24735 is not set +# CONFIG_CHARGER_BQ2515X is not set +# CONFIG_CHARGER_BQ25890 is not set +# CONFIG_CHARGER_BQ25980 is not set +# CONFIG_CHARGER_BQ256XX is not set +# CONFIG_CHARGER_SMB347 is not set +# CONFIG_BATTERY_GAUGE_LTC2941 is not set +# CONFIG_BATTERY_GOLDFISH is not set +# CONFIG_BATTERY_RT5033 is not set +# CONFIG_CHARGER_RT9455 is not set +# CONFIG_CHARGER_RT9467 is not set +# CONFIG_CHARGER_RT9471 is not set +# CONFIG_CHARGER_UCS1002 is not set +# CONFIG_CHARGER_BD99954 is not set +# CONFIG_BATTERY_UG3105 is not set +CONFIG_HWMON=y +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1029 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ADM1177 is not set +# CONFIG_SENSORS_ADM9240 is not set +# CONFIG_SENSORS_ADT7410 is not set +# CONFIG_SENSORS_ADT7411 is not set +# CONFIG_SENSORS_ADT7462 is not set +# CONFIG_SENSORS_ADT7470 is not set +# CONFIG_SENSORS_ADT7475 is not set +# CONFIG_SENSORS_AHT10 is not set +# CONFIG_SENSORS_AS370 is not set +# CONFIG_SENSORS_ASC7621 is not set +# CONFIG_SENSORS_AXI_FAN_CONTROL is not set +CONFIG_SENSORS_ARM_SCPI=y +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_CORSAIR_CPRO is not set +# CONFIG_SENSORS_CORSAIR_PSU is not set +# CONFIG_SENSORS_DS620 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_I5K_AMB is not set +# CONFIG_SENSORS_F71805F is not set +# CONFIG_SENSORS_F71882FG is not set +# CONFIG_SENSORS_F75375S is not set +# CONFIG_SENSORS_FTSTEUTATES is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_G760A is not set +# CONFIG_SENSORS_G762 is not set +# CONFIG_SENSORS_GPIO_FAN is not set +# CONFIG_SENSORS_HIH6130 is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_POWR1220 is not set +# CONFIG_SENSORS_LINEAGE is not set +# CONFIG_SENSORS_LTC2945 is not set +# CONFIG_SENSORS_LTC2947_I2C is not set +# CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2992 is not set +# CONFIG_SENSORS_LTC4151 is not set +# CONFIG_SENSORS_LTC4215 is not set +# CONFIG_SENSORS_LTC4222 is not set +# CONFIG_SENSORS_LTC4245 is not set +# CONFIG_SENSORS_LTC4260 is not set +# CONFIG_SENSORS_LTC4261 is not set +# CONFIG_SENSORS_MAX127 is not set +# CONFIG_SENSORS_MAX16065 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_MAX1668 is not set +# CONFIG_SENSORS_MAX197 is not set +# CONFIG_SENSORS_MAX31730 is not set +# CONFIG_SENSORS_MAX31760 is not set +# CONFIG_SENSORS_MAX6620 is not set +# CONFIG_SENSORS_MAX6621 is not set +# CONFIG_SENSORS_MAX6639 is not set +# CONFIG_SENSORS_MAX6642 is not set +# CONFIG_SENSORS_MAX6650 is not set +# CONFIG_SENSORS_MAX6697 is not set +# CONFIG_SENSORS_MAX31790 is not set +# CONFIG_SENSORS_MC34VR500 is not set +# CONFIG_SENSORS_MCP3021 is not set +# CONFIG_SENSORS_TC654 is not set +# CONFIG_SENSORS_TPS23861 is not set +# CONFIG_SENSORS_MR75203 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM73 is not set +CONFIG_SENSORS_LM75=y +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_LM93 is not set +# CONFIG_SENSORS_LM95234 is not set +# CONFIG_SENSORS_LM95241 is not set +# CONFIG_SENSORS_LM95245 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_PC87427 is not set +# CONFIG_SENSORS_NCT6683 is not set +# CONFIG_SENSORS_NCT6775 is not set +# CONFIG_SENSORS_NCT6775_I2C is not set +# CONFIG_SENSORS_NCT7802 is not set +# CONFIG_SENSORS_NCT7904 is not set +# CONFIG_SENSORS_NPCM7XX is not set +# CONFIG_SENSORS_OCC_P8_I2C is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_PMBUS is not set +# CONFIG_SENSORS_SBTSI is not set +# CONFIG_SENSORS_SBRMI is not set +# CONFIG_SENSORS_SHT15 is not set +# CONFIG_SENSORS_SHT21 is not set +# CONFIG_SENSORS_SHT3x is not set +# CONFIG_SENSORS_SHT4x is not set +# CONFIG_SENSORS_SHTC1 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_DME1737 is not set +# CONFIG_SENSORS_EMC1403 is not set +# CONFIG_SENSORS_EMC2103 is not set +# CONFIG_SENSORS_EMC2305 is not set +# CONFIG_SENSORS_EMC6W201 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_SMSC47M192 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SCH5627 is not set +# CONFIG_SENSORS_SCH5636 is not set +# CONFIG_SENSORS_STTS751 is not set +# CONFIG_SENSORS_SMM665 is not set +# CONFIG_SENSORS_ADC128D818 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_AMC6821 is not set +# CONFIG_SENSORS_INA209 is not set +# CONFIG_SENSORS_INA2XX is not set +# CONFIG_SENSORS_INA238 is not set +# CONFIG_SENSORS_INA3221 is not set +# CONFIG_SENSORS_TC74 is not set +# CONFIG_SENSORS_THMC50 is not set +# CONFIG_SENSORS_TMP102 is not set +# CONFIG_SENSORS_TMP103 is not set +# CONFIG_SENSORS_TMP108 is not set +# CONFIG_SENSORS_TMP401 is not set +# CONFIG_SENSORS_TMP421 is not set +# CONFIG_SENSORS_TMP464 is not set +# CONFIG_SENSORS_TMP513 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_VT1211 is not set +# CONFIG_SENSORS_VT8231 is not set +# CONFIG_SENSORS_W83773G is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83791D is not set +# CONFIG_SENSORS_W83792D is not set +# CONFIG_SENSORS_W83793 is not set +# CONFIG_SENSORS_W83795 is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83L786NG is not set +# CONFIG_SENSORS_W83627HF is not set +# CONFIG_SENSORS_W83627EHF is not set +CONFIG_SENSORS_LD6710_FBX=y +# CONFIG_SENSORS_AP806 is not set +CONFIG_THERMAL=y +# CONFIG_THERMAL_NETLINK is not set +# CONFIG_THERMAL_STATISTICS is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +CONFIG_THERMAL_HWMON=y +CONFIG_THERMAL_OF=y +# CONFIG_THERMAL_WRITABLE_TRIPS is not set +CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y +# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set +# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set +# CONFIG_THERMAL_GOV_FAIR_SHARE is not set +CONFIG_THERMAL_GOV_STEP_WISE=y +# CONFIG_THERMAL_GOV_BANG_BANG is not set +# CONFIG_THERMAL_GOV_USER_SPACE is not set +CONFIG_CPU_THERMAL=y +# CONFIG_CPU_FREQ_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_THERMAL_MMIO is not set +# CONFIG_AMLOGIC_THERMAL is not set +# CONFIG_FREEBOX_WATCHDOG is not set +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WATCHDOG_NOWAYOUT is not set +CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y +CONFIG_WATCHDOG_OPEN_TIMEOUT=0 +# CONFIG_WATCHDOG_SYSFS is not set +# CONFIG_WATCHDOG_HRTIMER_PRETIMEOUT is not set + +# +# Watchdog Pretimeout Governors +# +# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set + +# +# Watchdog Device Drivers +# +# CONFIG_SOFT_WATCHDOG is not set +# CONFIG_GPIO_WATCHDOG is not set +# CONFIG_XILINX_WATCHDOG is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set +CONFIG_ARM_SP805_WATCHDOG=y +# CONFIG_ARM_SBSA_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set +# CONFIG_DW_WATCHDOG is not set +# CONFIG_MAX63XX_WATCHDOG is not set +# CONFIG_MESON_GXBB_WATCHDOG is not set +# CONFIG_MESON_WATCHDOG is not set +# CONFIG_ARM_SMC_WATCHDOG is not set +# CONFIG_ALIM7101_WDT is not set +# CONFIG_I6300ESB_WDT is not set +# CONFIG_HP_WATCHDOG is not set +# CONFIG_MEN_A21_WDT is not set + +# +# PCI-based Watchdog Cards +# +# CONFIG_PCIPCWATCHDOG is not set +# CONFIG_WDTPCI is not set + +# +# USB-based Watchdog Cards +# +# CONFIG_USBPCWATCHDOG is not set +CONFIG_SSB_POSSIBLE=y +# CONFIG_SSB is not set +CONFIG_BCMA_POSSIBLE=y +# CONFIG_BCMA is not set + +# +# Multifunction device drivers +# +# CONFIG_MFD_ACT8945A is not set +# CONFIG_MFD_AS3711 is not set +# CONFIG_MFD_SMPRO is not set +# CONFIG_MFD_AS3722 is not set +# CONFIG_PMIC_ADP5520 is not set +# CONFIG_MFD_AAT2870_CORE is not set +# CONFIG_MFD_ATMEL_FLEXCOM is not set +# CONFIG_MFD_ATMEL_HLCDC is not set +# CONFIG_MFD_BCM590XX is not set +# CONFIG_MFD_BD9571MWV is not set +# CONFIG_MFD_AXP20X_I2C is not set +# CONFIG_MFD_MADERA is not set +# CONFIG_MFD_MAX597X is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_I2C is not set +# CONFIG_MFD_DA9055 is not set +# CONFIG_MFD_DA9062 is not set +# CONFIG_MFD_DA9063 is not set +# CONFIG_MFD_DA9150 is not set +# CONFIG_MFD_DLN2 is not set +# CONFIG_MFD_GATEWORKS_GSC is not set +# CONFIG_MFD_MC13XXX_I2C is not set +# CONFIG_MFD_MP2629 is not set +# CONFIG_MFD_HI6421_PMIC is not set +# CONFIG_LPC_ICH is not set +# CONFIG_LPC_SCH is not set +# CONFIG_MFD_IQS62X is not set +# CONFIG_MFD_JANZ_CMODIO is not set +# CONFIG_MFD_KEMPLD is not set +# CONFIG_MFD_88PM800 is not set +# CONFIG_MFD_88PM805 is not set +# CONFIG_MFD_88PM860X is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77620 is not set +# CONFIG_MFD_MAX77650 is not set +# CONFIG_MFD_MAX77686 is not set +# CONFIG_MFD_MAX77693 is not set +# CONFIG_MFD_MAX77714 is not set +# CONFIG_MFD_MAX77843 is not set +# CONFIG_MFD_MAX8907 is not set +# CONFIG_MFD_MAX8925 is not set +# CONFIG_MFD_MAX8997 is not set +# CONFIG_MFD_MAX8998 is not set +# CONFIG_MFD_MT6360 is not set +# CONFIG_MFD_MT6370 is not set +# CONFIG_MFD_MT6397 is not set +# CONFIG_MFD_MENF21BMC is not set +# CONFIG_MFD_VIPERBOARD is not set +# CONFIG_MFD_NTXEC is not set +# CONFIG_MFD_RETU is not set +# CONFIG_MFD_PCF50633 is not set +# CONFIG_MFD_SY7636A is not set +# CONFIG_MFD_RDC321X is not set +# CONFIG_MFD_RT4831 is not set +# CONFIG_MFD_RT5033 is not set +# CONFIG_MFD_RT5120 is not set +# CONFIG_MFD_RC5T583 is not set +# CONFIG_MFD_RK808 is not set +# CONFIG_MFD_RN5T618 is not set +# CONFIG_MFD_SEC_CORE is not set +# CONFIG_MFD_SI476X_CORE is not set +# CONFIG_MFD_SM501 is not set +# CONFIG_MFD_SKY81452 is not set +# CONFIG_MFD_STMPE is not set +CONFIG_MFD_SYSCON=y +# CONFIG_MFD_TI_AM335X_TSCADC is not set +# CONFIG_MFD_LP3943 is not set +# CONFIG_MFD_LP8788 is not set +# CONFIG_MFD_TI_LMU is not set +# CONFIG_MFD_PALMAS is not set +# CONFIG_TPS6105X is not set +# CONFIG_TPS65010 is not set +# CONFIG_TPS6507X is not set +# CONFIG_MFD_TPS65086 is not set +# CONFIG_MFD_TPS65090 is not set +# CONFIG_MFD_TPS65217 is not set +# CONFIG_MFD_TI_LP873X is not set +# CONFIG_MFD_TI_LP87565 is not set +# CONFIG_MFD_TPS65218 is not set +# CONFIG_MFD_TPS65219 is not set +# CONFIG_MFD_TPS6586X is not set +# CONFIG_MFD_TPS65910 is not set +# CONFIG_MFD_TPS65912_I2C is not set +# CONFIG_TWL4030_CORE is not set +# CONFIG_TWL6040_CORE is not set +# CONFIG_MFD_WL1273_CORE is not set +# CONFIG_MFD_LM3533 is not set +# CONFIG_MFD_TC3589X is not set +# CONFIG_MFD_TQMX86 is not set +# CONFIG_MFD_VX855 is not set +# CONFIG_MFD_LOCHNAGAR is not set +# CONFIG_MFD_ARIZONA_I2C is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM8350_I2C is not set +# CONFIG_MFD_WM8994 is not set +# CONFIG_MFD_ROHM_BD718XX is not set +# CONFIG_MFD_ROHM_BD71828 is not set +# CONFIG_MFD_ROHM_BD957XMUF is not set +# CONFIG_MFD_STPMIC1 is not set +# CONFIG_MFD_STMFX is not set +# CONFIG_MFD_FBXGWR_PMU is not set +# CONFIG_MFD_ATC260X_I2C is not set +# CONFIG_MFD_KHADAS_MCU is not set +# CONFIG_MFD_QCOM_PM8008 is not set +# CONFIG_RAVE_SP_CORE is not set +# CONFIG_MFD_RSMU_I2C is not set +# end of Multifunction device drivers + +CONFIG_REGULATOR=y +# CONFIG_REGULATOR_DEBUG is not set +# CONFIG_REGULATOR_FAULT_SENSING is not set +CONFIG_REGULATOR_FIXED_VOLTAGE=y +# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set +# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set +# CONFIG_REGULATOR_88PG86X is not set +# CONFIG_REGULATOR_ACT8865 is not set +# CONFIG_REGULATOR_AD5398 is not set +# CONFIG_REGULATOR_DA9121 is not set +# CONFIG_REGULATOR_DA9210 is not set +# CONFIG_REGULATOR_DA9211 is not set +# CONFIG_REGULATOR_FAN53555 is not set +# CONFIG_REGULATOR_FAN53880 is not set +CONFIG_REGULATOR_GPIO=y +# CONFIG_REGULATOR_ISL9305 is not set +# CONFIG_REGULATOR_ISL6271A is not set +# CONFIG_REGULATOR_LP3971 is not set +# CONFIG_REGULATOR_LP3972 is not set +# CONFIG_REGULATOR_LP872X is not set +# CONFIG_REGULATOR_LP8755 is not set +# CONFIG_REGULATOR_LTC3589 is not set +# CONFIG_REGULATOR_LTC3676 is not set +# CONFIG_REGULATOR_MAX1586 is not set +# CONFIG_REGULATOR_MAX8649 is not set +# CONFIG_REGULATOR_MAX8660 is not set +# CONFIG_REGULATOR_MAX8893 is not set +# CONFIG_REGULATOR_MAX8952 is not set +# CONFIG_REGULATOR_MAX8973 is not set +# CONFIG_REGULATOR_MAX20086 is not set +# CONFIG_REGULATOR_MAX20411 is not set +# CONFIG_REGULATOR_MAX77826 is not set +# CONFIG_REGULATOR_MCP16502 is not set +# CONFIG_REGULATOR_MP5416 is not set +# CONFIG_REGULATOR_MP8859 is not set +# CONFIG_REGULATOR_MP886X is not set +# CONFIG_REGULATOR_MPQ7920 is not set +# CONFIG_REGULATOR_MT6311 is not set +# CONFIG_REGULATOR_PCA9450 is not set +# CONFIG_REGULATOR_PF8X00 is not set +# CONFIG_REGULATOR_PFUZE100 is not set +# CONFIG_REGULATOR_PV88060 is not set +# CONFIG_REGULATOR_PV88080 is not set +# CONFIG_REGULATOR_PV88090 is not set +# CONFIG_REGULATOR_RT4801 is not set +# CONFIG_REGULATOR_RT4803 is not set +# CONFIG_REGULATOR_RT5190A is not set +# CONFIG_REGULATOR_RT5739 is not set +# CONFIG_REGULATOR_RT5759 is not set +# CONFIG_REGULATOR_RT6160 is not set +# CONFIG_REGULATOR_RT6190 is not set +# CONFIG_REGULATOR_RT6245 is not set +# CONFIG_REGULATOR_RTQ2134 is not set +# CONFIG_REGULATOR_RTMV20 is not set +# CONFIG_REGULATOR_RTQ6752 is not set +# CONFIG_REGULATOR_SLG51000 is not set +# CONFIG_REGULATOR_SY8106A is not set +# CONFIG_REGULATOR_SY8824X is not set +# CONFIG_REGULATOR_SY8827N is not set +# CONFIG_REGULATOR_TPS51632 is not set +# CONFIG_REGULATOR_TPS62360 is not set +# CONFIG_REGULATOR_TPS6286X is not set +# CONFIG_REGULATOR_TPS65023 is not set +# CONFIG_REGULATOR_TPS6507X is not set +# CONFIG_REGULATOR_TPS65132 is not set +# CONFIG_REGULATOR_VCTRL is not set +# CONFIG_RC_CORE is not set + +# +# CEC support +# +# CONFIG_MEDIA_CEC_SUPPORT is not set +# end of CEC support + +# CONFIG_MEDIA_SUPPORT is not set + +# +# Graphics support +# +# CONFIG_DRM is not set +# CONFIG_DRM_DEBUG_MODESET_LOCK is not set + +# +# ARM devices +# +# end of ARM devices + +# +# Frame buffer Devices +# +# CONFIG_FB is not set +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +# CONFIG_LCD_CLASS_DEVICE is not set +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +# end of Backlight & LCD device support + +# +# Console display driver support +# +CONFIG_DUMMY_CONSOLE=y +CONFIG_DUMMY_CONSOLE_COLUMNS=80 +CONFIG_DUMMY_CONSOLE_ROWS=25 +# end of Console display driver support +# end of Graphics support + +# CONFIG_SOUND is not set +CONFIG_HID_SUPPORT=y +CONFIG_HID=y +# CONFIG_HID_BATTERY_STRENGTH is not set +# CONFIG_HIDRAW is not set +# CONFIG_UHID is not set +CONFIG_HID_GENERIC=y + +# +# Special HID drivers +# +# CONFIG_HID_A4TECH is not set +# CONFIG_HID_ACRUX is not set +# CONFIG_HID_APPLE is not set +# CONFIG_HID_AUREAL is not set +# CONFIG_HID_BELKIN is not set +# CONFIG_HID_CHERRY is not set +# CONFIG_HID_COUGAR is not set +# CONFIG_HID_MACALLY is not set +# CONFIG_HID_CMEDIA is not set +# CONFIG_HID_CYPRESS is not set +# CONFIG_HID_DRAGONRISE is not set +# CONFIG_HID_EMS_FF is not set +# CONFIG_HID_ELECOM is not set +# CONFIG_HID_EVISION is not set +# CONFIG_HID_EZKEY is not set +# CONFIG_HID_GEMBIRD is not set +# CONFIG_HID_GFRM is not set +# CONFIG_HID_GLORIOUS is not set +# CONFIG_HID_VIVALDI is not set +# CONFIG_HID_KEYTOUCH is not set +# CONFIG_HID_KYE is not set +# CONFIG_HID_WALTOP is not set +# CONFIG_HID_VIEWSONIC is not set +# CONFIG_HID_VRC2 is not set +# CONFIG_HID_XIAOMI is not set +# CONFIG_HID_GYRATION is not set +# CONFIG_HID_ICADE is not set +# CONFIG_HID_ITE is not set +# CONFIG_HID_JABRA is not set +# CONFIG_HID_TWINHAN is not set +# CONFIG_HID_KENSINGTON is not set +# CONFIG_HID_LCPOWER is not set +# CONFIG_HID_LED is not set +# CONFIG_HID_LENOVO is not set +# CONFIG_HID_MAGICMOUSE is not set +# CONFIG_HID_MALTRON is not set +# CONFIG_HID_MAYFLASH is not set +# CONFIG_HID_REDRAGON is not set +# CONFIG_HID_MICROSOFT is not set +# CONFIG_HID_MONTEREY is not set +# CONFIG_HID_MULTITOUCH is not set +# CONFIG_HID_NINTENDO is not set +# CONFIG_HID_NTI is not set +# CONFIG_HID_ORTEK is not set +# CONFIG_HID_PANTHERLORD is not set +# CONFIG_HID_PETALYNX is not set +# CONFIG_HID_PICOLCD is not set +# CONFIG_HID_PLANTRONICS is not set +# CONFIG_HID_PXRC is not set +# CONFIG_HID_RAZER is not set +# CONFIG_HID_PRIMAX is not set +# CONFIG_HID_SAITEK is not set +# CONFIG_HID_SEMITEK is not set +# CONFIG_HID_SPEEDLINK is not set +# CONFIG_HID_STEAM is not set +# CONFIG_HID_STEELSERIES is not set +# CONFIG_HID_SUNPLUS is not set +# CONFIG_HID_RMI is not set +# CONFIG_HID_GREENASIA is not set +# CONFIG_HID_SMARTJOYPLUS is not set +# CONFIG_HID_TIVO is not set +# CONFIG_HID_TOPSEED is not set +# CONFIG_HID_TOPRE is not set +# CONFIG_HID_THINGM is not set +# CONFIG_HID_UDRAW_PS3 is not set +# CONFIG_HID_WIIMOTE is not set +# CONFIG_HID_XINMO is not set +# CONFIG_HID_ZEROPLUS is not set +# CONFIG_HID_ZYDACRON is not set +# CONFIG_HID_SENSOR_HUB is not set +# CONFIG_HID_ALPS is not set +# end of Special HID drivers + +# +# HID-BPF support +# +# end of HID-BPF support + +# +# USB HID support +# +# CONFIG_USB_HID is not set +# CONFIG_HID_PID is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set +# end of USB HID Boot Protocol drivers +# end of USB HID support + +CONFIG_I2C_HID=y +# CONFIG_I2C_HID_OF is not set +# CONFIG_I2C_HID_OF_ELAN is not set +# CONFIG_I2C_HID_OF_GOODIX is not set +CONFIG_USB_OHCI_LITTLE_ENDIAN=y +CONFIG_USB_SUPPORT=y +CONFIG_USB_COMMON=y +# CONFIG_USB_LED_TRIG is not set +# CONFIG_USB_ULPI_BUS is not set +# CONFIG_USB_CONN_GPIO is not set +CONFIG_USB_ARCH_HAS_HCD=y +CONFIG_USB=y +# CONFIG_USB_PCI is not set +# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set + +# +# Miscellaneous USB options +# +CONFIG_USB_DEFAULT_PERSIST=y +# CONFIG_USB_FEW_INIT_RETRIES is not set +# CONFIG_USB_DYNAMIC_MINORS is not set +# CONFIG_USB_OTG is not set +# CONFIG_USB_OTG_PRODUCTLIST is not set +# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set +# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set +CONFIG_USB_AUTOSUSPEND_DELAY=2 +# CONFIG_USB_MON is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=y +# CONFIG_USB_XHCI_DBGCAP is not set +# CONFIG_USB_XHCI_PCI_RENESAS is not set +CONFIG_USB_XHCI_PLATFORM=y +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_OHCI_HCD is not set +# CONFIG_USB_SL811_HCD is not set +# CONFIG_USB_R8A66597_HCD is not set +# CONFIG_USB_HCD_TEST_MODE is not set + +# +# USB Device Class drivers +# +# CONFIG_USB_ACM is not set +# CONFIG_USB_PRINTER is not set +# CONFIG_USB_WDM is not set +# CONFIG_USB_TMC is not set + +# +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may +# + +# +# also be needed; see USB_STORAGE Help for more info +# +CONFIG_USB_STORAGE=y +# CONFIG_USB_STORAGE_DEBUG is not set +# CONFIG_USB_STORAGE_REALTEK is not set +# CONFIG_USB_STORAGE_DATAFAB is not set +# CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set +# CONFIG_USB_STORAGE_USBAT is not set +# CONFIG_USB_STORAGE_SDDR09 is not set +# CONFIG_USB_STORAGE_SDDR55 is not set +# CONFIG_USB_STORAGE_JUMPSHOT is not set +# CONFIG_USB_STORAGE_ALAUDA is not set +# CONFIG_USB_STORAGE_ONETOUCH is not set +# CONFIG_USB_STORAGE_KARMA is not set +# CONFIG_USB_STORAGE_CYPRESS_ATACB is not set +# CONFIG_USB_STORAGE_ENE_UB6250 is not set +CONFIG_USB_UAS=y + +# +# USB Imaging devices +# +# CONFIG_USB_MDC800 is not set +# CONFIG_USB_MICROTEK is not set +# CONFIG_USBIP_CORE is not set + +# +# USB dual-mode controller drivers +# +# CONFIG_USB_CDNS_SUPPORT is not set +# CONFIG_USB_MUSB_HDRC is not set +CONFIG_USB_DWC3=m +CONFIG_USB_DWC3_HOST=y + +# +# Platform Glue Driver Support +# +CONFIG_USB_DWC3_MESON_G12A=m +CONFIG_USB_DWC3_OF_SIMPLE=m +# CONFIG_USB_DWC2 is not set +# CONFIG_USB_ISP1760 is not set + +# +# USB port drivers +# +# CONFIG_USB_SERIAL is not set + +# +# USB Miscellaneous drivers +# +# CONFIG_USB_EMI62 is not set +# CONFIG_USB_EMI26 is not set +# CONFIG_USB_ADUTUX is not set +# CONFIG_USB_SEVSEG is not set +# CONFIG_USB_LEGOTOWER is not set +# CONFIG_USB_LCD is not set +# CONFIG_USB_CYPRESS_CY7C63 is not set +# CONFIG_USB_CYTHERM is not set +# CONFIG_USB_IDMOUSE is not set +# CONFIG_USB_APPLEDISPLAY is not set +# CONFIG_APPLE_MFI_FASTCHARGE is not set +# CONFIG_USB_LD is not set +# CONFIG_USB_TRANCEVIBRATOR is not set +# CONFIG_USB_IOWARRIOR is not set +# CONFIG_USB_TEST is not set +# CONFIG_USB_EHSET_TEST_FIXTURE is not set +# CONFIG_USB_ISIGHTFW is not set +# CONFIG_USB_YUREX is not set +# CONFIG_USB_EZUSB_FX2 is not set +# CONFIG_USB_HUB_USB251XB is not set +# CONFIG_USB_HSIC_USB3503 is not set +# CONFIG_USB_HSIC_USB4604 is not set +# CONFIG_USB_LINK_LAYER_TEST is not set +# CONFIG_USB_CHAOSKEY is not set +# CONFIG_USB_ONBOARD_HUB is not set + +# +# USB Physical Layer drivers +# +# CONFIG_NOP_USB_XCEIV is not set +# CONFIG_USB_GPIO_VBUS is not set +# CONFIG_USB_ISP1301 is not set +# CONFIG_USB_ULPI is not set +# end of USB Physical Layer drivers + +# CONFIG_USB_GADGET is not set +# CONFIG_TYPEC is not set +CONFIG_USB_ROLE_SWITCH=y +CONFIG_MMC=y +CONFIG_PWRSEQ_EMMC=y +CONFIG_PWRSEQ_SIMPLE=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=32 +# CONFIG_SDIO_UART is not set +# CONFIG_MMC_TEST is not set + +# +# MMC/SD/SDIO Host Controller Drivers +# +# CONFIG_MMC_DEBUG is not set +# CONFIG_MMC_ARMMMCI is not set +# CONFIG_MMC_SDHCI is not set +CONFIG_MMC_MESON_GX=y +# CONFIG_MMC_MESON_MX_SDIO is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_CB710 is not set +# CONFIG_MMC_VIA_SDMMC is not set +# CONFIG_MMC_DW is not set +# CONFIG_MMC_VUB300 is not set +# CONFIG_MMC_USHC is not set +# CONFIG_MMC_USDHI6ROL0 is not set +# CONFIG_MMC_CQHCI is not set +# CONFIG_MMC_HSQ is not set +# CONFIG_MMC_TOSHIBA_PCI is not set +# CONFIG_MMC_MTK is not set +# CONFIG_SCSI_UFSHCD is not set +# CONFIG_MEMSTICK is not set +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +# CONFIG_LEDS_CLASS_FLASH is not set +# CONFIG_LEDS_CLASS_MULTICOLOR is not set +# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set + +# +# LED drivers +# +# CONFIG_LEDS_AN30259A is not set +# CONFIG_LEDS_AW2013 is not set +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_LM3530 is not set +# CONFIG_LEDS_LM3532 is not set +# CONFIG_LEDS_LM3642 is not set +# CONFIG_LEDS_LM3692X is not set +# CONFIG_LEDS_PCA9532 is not set +# CONFIG_LEDS_GPIO is not set +# CONFIG_LEDS_LP3944 is not set +# CONFIG_LEDS_LP3952 is not set +# CONFIG_LEDS_LP50XX is not set +# CONFIG_LEDS_LP55XX_COMMON is not set +# CONFIG_LEDS_LP8860 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_REGULATOR is not set +# CONFIG_LEDS_BD2606MVV is not set +# CONFIG_LEDS_BD2802 is not set +# CONFIG_LEDS_LT3593 is not set +# CONFIG_LEDS_TCA6507 is not set +# CONFIG_LEDS_TLC591XX is not set +# CONFIG_LEDS_LM355x is not set +# CONFIG_LEDS_IS31FL319X is not set +# CONFIG_LEDS_IS31FL32XX is not set +CONFIG_LEDS_IS31FL3299=y + +# +# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM) +# +# CONFIG_LEDS_BLINKM is not set +# CONFIG_LEDS_SYSCON is not set +# CONFIG_LEDS_MLXREG is not set +# CONFIG_LEDS_USER is not set +# CONFIG_LEDS_TI_LMU_COMMON is not set +CONFIG_LEDS_LED1202=y + +# +# Flash and Torch LED drivers +# + +# +# RGB LED drivers +# + +# +# LED Triggers +# +CONFIG_LEDS_TRIGGERS=y +# CONFIG_LEDS_TRIGGER_TIMER is not set +# CONFIG_LEDS_TRIGGER_ONESHOT is not set +# CONFIG_LEDS_TRIGGER_HEARTBEAT is not set +# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +# CONFIG_LEDS_TRIGGER_CPU is not set +# CONFIG_LEDS_TRIGGER_ACTIVITY is not set +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y + +# +# iptables trigger is under Netfilter config (LED target) +# +# CONFIG_LEDS_TRIGGER_TRANSIENT is not set +# CONFIG_LEDS_TRIGGER_CAMERA is not set +# CONFIG_LEDS_TRIGGER_PANIC is not set +# CONFIG_LEDS_TRIGGER_NETDEV is not set +CONFIG_LEDS_TRIGGER_PATTERN=y +# CONFIG_LEDS_TRIGGER_AUDIO is not set +# CONFIG_LEDS_TRIGGER_TTY is not set + +# +# Simple LED drivers +# +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC_SUPPORT=y +# CONFIG_EDAC is not set +CONFIG_RTC_LIB=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_HCTOSYS=y +CONFIG_RTC_HCTOSYS_DEVICE="rtc0" +# CONFIG_RTC_SYSTOHC is not set +# CONFIG_RTC_DEBUG is not set +# CONFIG_RTC_NVMEM is not set + +# +# RTC interfaces +# +CONFIG_RTC_INTF_SYSFS=y +# CONFIG_RTC_INTF_PROC is not set +# CONFIG_RTC_INTF_DEV is not set +# CONFIG_RTC_DRV_TEST is not set + +# +# I2C RTC drivers +# +# CONFIG_RTC_DRV_ABB5ZES3 is not set +# CONFIG_RTC_DRV_ABEOZ9 is not set +# CONFIG_RTC_DRV_ABX80X is not set +# CONFIG_RTC_DRV_DS1307 is not set +# CONFIG_RTC_DRV_DS1374 is not set +# CONFIG_RTC_DRV_DS1672 is not set +# CONFIG_RTC_DRV_HYM8563 is not set +# CONFIG_RTC_DRV_MAX6900 is not set +# CONFIG_RTC_DRV_NCT3018Y is not set +# CONFIG_RTC_DRV_RS5C372 is not set +# CONFIG_RTC_DRV_ISL1208 is not set +# CONFIG_RTC_DRV_ISL12022 is not set +# CONFIG_RTC_DRV_ISL12026 is not set +# CONFIG_RTC_DRV_X1205 is not set +# CONFIG_RTC_DRV_PCF8523 is not set +# CONFIG_RTC_DRV_PCF85063 is not set +# CONFIG_RTC_DRV_PCF85363 is not set +# CONFIG_RTC_DRV_PCF8563 is not set +# CONFIG_RTC_DRV_PCF8583 is not set +# CONFIG_RTC_DRV_M41T80 is not set +# CONFIG_RTC_DRV_BQ32K is not set +# CONFIG_RTC_DRV_S35390A is not set +# CONFIG_RTC_DRV_FM3130 is not set +# CONFIG_RTC_DRV_RX8010 is not set +# CONFIG_RTC_DRV_RX8581 is not set +# CONFIG_RTC_DRV_RX8025 is not set +# CONFIG_RTC_DRV_EM3027 is not set +# CONFIG_RTC_DRV_RV3028 is not set +# CONFIG_RTC_DRV_RV3032 is not set +# CONFIG_RTC_DRV_RV8803 is not set +# CONFIG_RTC_DRV_SD3078 is not set + +# +# SPI RTC drivers +# +CONFIG_RTC_I2C_AND_SPI=y + +# +# SPI and I2C RTC drivers +# +# CONFIG_RTC_DRV_DS3232 is not set +# CONFIG_RTC_DRV_PCF2127 is not set +# CONFIG_RTC_DRV_RV3029C2 is not set +# CONFIG_RTC_DRV_RX6110 is not set + +# +# Platform RTC drivers +# +# CONFIG_RTC_DRV_DS1286 is not set +# CONFIG_RTC_DRV_DS1511 is not set +# CONFIG_RTC_DRV_DS1553 is not set +# CONFIG_RTC_DRV_DS1685_FAMILY is not set +# CONFIG_RTC_DRV_DS1742 is not set +# CONFIG_RTC_DRV_DS2404 is not set +# CONFIG_RTC_DRV_STK17TA8 is not set +# CONFIG_RTC_DRV_M48T86 is not set +# CONFIG_RTC_DRV_M48T35 is not set +# CONFIG_RTC_DRV_M48T59 is not set +# CONFIG_RTC_DRV_MSM6242 is not set +# CONFIG_RTC_DRV_BQ4802 is not set +# CONFIG_RTC_DRV_RP5C01 is not set +# CONFIG_RTC_DRV_OPTEE is not set +# CONFIG_RTC_DRV_ZYNQMP is not set + +# +# on-CPU RTC drivers +# +# CONFIG_RTC_DRV_MESON_VRTC is not set +CONFIG_RTC_DRV_MESON_AXG=y +# CONFIG_RTC_DRV_PL030 is not set +# CONFIG_RTC_DRV_PL031 is not set +# CONFIG_RTC_DRV_CADENCE is not set +# CONFIG_RTC_DRV_FTRTC010 is not set +# CONFIG_RTC_DRV_R7301 is not set + +# +# HID Sensor RTC drivers +# +# CONFIG_RTC_DRV_GOLDFISH is not set +# CONFIG_DMADEVICES is not set + +# +# DMABUF options +# +# CONFIG_SYNC_FILE is not set +# CONFIG_UDMABUF is not set +# CONFIG_DMABUF_MOVE_NOTIFY is not set +# CONFIG_DMABUF_DEBUG is not set +# CONFIG_DMABUF_SELFTESTS is not set +# CONFIG_DMABUF_HEAPS is not set +# CONFIG_DMABUF_SYSFS_STATS is not set +# end of DMABUF options + +# CONFIG_AUXDISPLAY is not set +# CONFIG_UIO is not set +# CONFIG_VFIO is not set +# CONFIG_VIRT_DRIVERS is not set +# CONFIG_VIRTIO_MENU is not set +# CONFIG_VDPA is not set +# CONFIG_VHOST_MENU is not set + +# +# Microsoft Hyper-V guest support +# +# end of Microsoft Hyper-V guest support + +# CONFIG_GREYBUS is not set +# CONFIG_COMEDI is not set +# CONFIG_STAGING is not set +# CONFIG_GOLDFISH is not set +# CONFIG_CHROME_PLATFORMS is not set +# CONFIG_MELLANOX_PLATFORM is not set +# CONFIG_SURFACE_PLATFORMS is not set +# CONFIG_FBXGW7R_PLATFORM is not set +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_COMMON_CLK=y + +# +# Clock driver for ARM Reference designs +# +# CONFIG_CLK_ICST is not set +# CONFIG_CLK_SP810 is not set +# end of Clock driver for ARM Reference designs + +# CONFIG_COMMON_CLK_MAX9485 is not set +CONFIG_COMMON_CLK_SCPI=y +# CONFIG_COMMON_CLK_SI5341 is not set +# CONFIG_COMMON_CLK_SI5351 is not set +# CONFIG_COMMON_CLK_SI514 is not set +# CONFIG_COMMON_CLK_SI544 is not set +# CONFIG_COMMON_CLK_SI570 is not set +# CONFIG_COMMON_CLK_CDCE706 is not set +# CONFIG_COMMON_CLK_CDCE925 is not set +# CONFIG_COMMON_CLK_CS2000_CP is not set +# CONFIG_COMMON_CLK_AXI_CLKGEN is not set +# CONFIG_COMMON_CLK_XGENE is not set +# CONFIG_COMMON_CLK_RS9_PCIE is not set +# CONFIG_COMMON_CLK_SI521XX is not set +# CONFIG_COMMON_CLK_VC5 is not set +# CONFIG_COMMON_CLK_VC7 is not set +# CONFIG_COMMON_CLK_FIXED_MMIO is not set + +# +# Clock support for Amlogic platforms +# +CONFIG_COMMON_CLK_MESON_REGMAP=y +CONFIG_COMMON_CLK_MESON_DUALDIV=y +CONFIG_COMMON_CLK_MESON_MPLL=y +CONFIG_COMMON_CLK_MESON_PLL=y +CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y +CONFIG_COMMON_CLK_MESON_AO_CLKC=y +CONFIG_COMMON_CLK_MESON_EE_CLKC=y +CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y +CONFIG_COMMON_CLK_GXBB=y +CONFIG_COMMON_CLK_AXG=y +# CONFIG_COMMON_CLK_AXG_AUDIO is not set +CONFIG_COMMON_CLK_G12A=y +# end of Clock support for Amlogic platforms + +# CONFIG_XILINX_VCU is not set +# CONFIG_COMMON_CLK_XLNX_CLKWZRD is not set +# CONFIG_HWSPINLOCK is not set + +# +# Clock Source drivers +# +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_ARM_ARCH_TIMER=y +CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y +CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y +CONFIG_FSL_ERRATUM_A008585=y +CONFIG_HISILICON_ERRATUM_161010101=y +CONFIG_ARM64_ERRATUM_858921=y +# end of Clock Source drivers + +CONFIG_MAILBOX=y +CONFIG_ARM_MHU=y +# CONFIG_ARM_MHU_V2 is not set +CONFIG_PLATFORM_MHU=y +# CONFIG_PL320_MBOX is not set +# CONFIG_ALTERA_MBOX is not set +# CONFIG_MAILBOX_TEST is not set +# CONFIG_IOMMU_SUPPORT is not set + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +# CONFIG_RPMSG_QCOM_GLINK_RPM is not set +# CONFIG_RPMSG_VIRTIO is not set +# end of Rpmsg drivers + +# CONFIG_SOUNDWIRE is not set + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# CONFIG_MESON_CANVAS is not set +CONFIG_MESON_CLK_MEASURE=y +CONFIG_MESON_GX_SOCINFO=y +# CONFIG_MESON_GX_PM_DOMAINS is not set +CONFIG_MESON_EE_PM_DOMAINS=y +# CONFIG_MESON_SECURE_PM_DOMAINS is not set +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +# CONFIG_SOC_BRCMSTB is not set +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# CONFIG_QUICC_ENGINE is not set +# CONFIG_FSL_RCPM is not set +# end of NXP/Freescale QorIQ SoC drivers + +# +# fujitsu SoC drivers +# +# end of fujitsu SoC drivers + +# +# i.MX SoC drivers +# +# end of i.MX SoC drivers + +# +# Enable LiteX SoC Builder specific drivers +# +# CONFIG_LITEX_SOC_CONTROLLER is not set +# end of Enable LiteX SoC Builder specific drivers + +# CONFIG_WPCM450_SOC is not set + +# +# Qualcomm SoC drivers +# +CONFIG_QCOM_QMI_HELPERS=m +# end of Qualcomm SoC drivers + +# CONFIG_SOC_TI is not set + +# +# Xilinx SoC drivers +# +# end of Xilinx SoC drivers +# end of SOC (System On Chip) specific Drivers + +# CONFIG_PM_DEVFREQ is not set +CONFIG_EXTCON=y + +# +# Extcon Device Drivers +# +# CONFIG_EXTCON_FSA9480 is not set +# CONFIG_EXTCON_GPIO is not set +# CONFIG_EXTCON_MAX3355 is not set +# CONFIG_EXTCON_PTN5150 is not set +# CONFIG_EXTCON_RT8973A is not set +# CONFIG_EXTCON_SM5502 is not set +# CONFIG_EXTCON_USB_GPIO is not set +# CONFIG_MEMORY is not set +# CONFIG_IIO is not set +# CONFIG_NTB is not set +# CONFIG_PWM is not set + +# +# IRQ chip support +# +CONFIG_IRQCHIP=y +CONFIG_ARM_GIC=y +CONFIG_ARM_GIC_MAX_NR=1 +CONFIG_ARM_GIC_V2M=y +CONFIG_ARM_GIC_V3=y +CONFIG_ARM_GIC_V3_ITS=y +CONFIG_ARM_GIC_V3_ITS_PCI=y +# CONFIG_AL_FIC is not set +# CONFIG_XILINX_INTC is not set +CONFIG_PARTITION_PERCPU=y +CONFIG_MESON_IRQ_GPIO=y +# end of IRQ chip support + +# CONFIG_IPACK_BUS is not set +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_MESON=y +# CONFIG_RESET_MESON_AUDIO_ARB is not set +# CONFIG_RESET_SIMPLE is not set +# CONFIG_RESET_TI_SYSCON is not set +# CONFIG_RESET_TI_TPS380X is not set + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_GENERIC_PHY_MIPI_DPHY=y +# CONFIG_PHY_CAN_TRANSCEIVER is not set +# CONFIG_XDSL_PHY_API is not set +CONFIG_PHY_MESON8B_USB2=y +CONFIG_PHY_MESON_GXL_USB2=y +# CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG is not set +CONFIG_PHY_MESON_G12A_USB2=y +CONFIG_PHY_MESON_G12A_USB3_PCIE=y +CONFIG_PHY_MESON_AXG_PCIE=y +CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=y +# CONFIG_PHY_MESON_AXG_MIPI_DPHY is not set + +# +# PHY drivers for Broadcom platforms +# +# CONFIG_BCM_KONA_USB2_PHY is not set +# end of PHY drivers for Broadcom platforms + +# CONFIG_PHY_CADENCE_TORRENT is not set +# CONFIG_PHY_CADENCE_DPHY is not set +# CONFIG_PHY_CADENCE_DPHY_RX is not set +# CONFIG_PHY_CADENCE_SIERRA is not set +# CONFIG_PHY_CADENCE_SALVO is not set +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +# CONFIG_PHY_LAN966X_SERDES is not set +# CONFIG_PHY_MAPPHONE_MDM6600 is not set +# CONFIG_PHY_OCELOT_SERDES is not set +# end of PHY Subsystem + +# CONFIG_POWERCAP is not set +# CONFIG_MCB is not set + +# +# Performance monitor support +# +# CONFIG_ARM_CCI_PMU is not set +# CONFIG_ARM_CCN is not set +# CONFIG_ARM_CMN is not set +CONFIG_ARM_PMU=y +CONFIG_ARM_PMUV3=y +# CONFIG_ARM_DSU_PMU is not set +# CONFIG_ARM_SPE_PMU is not set +# CONFIG_HISI_PCIE_PMU is not set +# CONFIG_HNS3_PMU is not set +# CONFIG_MESON_DDR_PMU is not set +# end of Performance monitor support + +CONFIG_RAS=y +# CONFIG_USB4 is not set + +# +# Android +# +# CONFIG_ANDROID_BINDER_IPC is not set +# end of Android + +# CONFIG_LIBNVDIMM is not set +# CONFIG_DAX is not set +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y + +# +# Layout Types +# +# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set +# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set +# end of Layout Types + +# CONFIG_NVMEM_IGNORE_RO is not set +# CONFIG_NVMEM_MESON_EFUSE is not set +# CONFIG_NVMEM_MESON_MX_EFUSE is not set +# CONFIG_NVMEM_RMEM is not set + +# +# HW tracing support +# +# CONFIG_STM is not set +# CONFIG_INTEL_TH is not set +# CONFIG_HISI_PTT is not set +# end of HW tracing support + +# CONFIG_FPGA is not set +# CONFIG_FSI is not set +CONFIG_TEE=y +CONFIG_OPTEE=y +# CONFIG_OPTEE_INSECURE_LOAD_IMAGE is not set +CONFIG_PM_OPP=y +# CONFIG_SIOX is not set +# CONFIG_SLIMBUS is not set +# CONFIG_INTERCONNECT is not set +# CONFIG_COUNTER is not set +# CONFIG_MOST is not set +# CONFIG_PECI is not set +# CONFIG_HTE is not set +# CONFIG_CDX_BUS is not set +# end of Device Drivers + +# +# File systems +# +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_VALIDATE_FS_PARSER is not set +CONFIG_FS_IOMAP=y +CONFIG_LEGACY_DIRECT_IO=y +# CONFIG_EXT2_FS is not set +# CONFIG_EXT3_FS is not set +CONFIG_EXT4_FS=y +CONFIG_EXT4_USE_FOR_EXT2=y +# CONFIG_EXT4_FS_POSIX_ACL is not set +# CONFIG_EXT4_FS_SECURITY is not set +# CONFIG_EXT4_DEBUG is not set +CONFIG_JBD2=y +# CONFIG_JBD2_DEBUG is not set +CONFIG_FS_MBCACHE=y +# CONFIG_REISERFS_FS is not set +# CONFIG_JFS_FS is not set +# CONFIG_XFS_FS is not set +# CONFIG_GFS2_FS is not set +# CONFIG_OCFS2_FS is not set +# CONFIG_BTRFS_FS is not set +# CONFIG_NILFS2_FS is not set +# CONFIG_F2FS_FS is not set +CONFIG_EXPORTFS=y +# CONFIG_EXPORTFS_BLOCK_OPS is not set +CONFIG_FILE_LOCKING=y +# CONFIG_FS_ENCRYPTION is not set +# CONFIG_FS_VERITY is not set +CONFIG_FSNOTIFY=y +CONFIG_DNOTIFY=y +CONFIG_INOTIFY_USER=y +CONFIG_FANOTIFY=y +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS4_FS is not set +# CONFIG_AUTOFS_FS is not set +# CONFIG_FUSE_FS is not set +# CONFIG_OVERLAY_FS is not set + +# +# Caches +# +# CONFIG_FSCACHE is not set +# end of Caches + +# +# CD-ROM/DVD Filesystems +# +# CONFIG_ISO9660_FS is not set +# CONFIG_UDF_FS is not set +# end of CD-ROM/DVD Filesystems + +# +# DOS/FAT/EXFAT/NT Filesystems +# +CONFIG_FAT_FS=y +# CONFIG_MSDOS_FS is not set +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=437 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +# CONFIG_EXFAT_FS is not set +# CONFIG_NTFS_FS is not set +# CONFIG_NTFS3_FS is not set +# CONFIG_EXFAT_FS_FBX is not set +# end of DOS/FAT/EXFAT/NT Filesystems + +# +# Pseudo filesystems +# +CONFIG_PROC_FS=y +# CONFIG_PROC_KCORE is not set +CONFIG_PROC_SYSCTL=y +CONFIG_PROC_PAGE_MONITOR=y +# CONFIG_PROC_CHILDREN is not set +CONFIG_KERNFS=y +CONFIG_SYSFS=y +CONFIG_TMPFS=y +# CONFIG_TMPFS_POSIX_ACL is not set +# CONFIG_TMPFS_XATTR is not set +# CONFIG_TMPFS_INODE64 is not set +CONFIG_ARCH_SUPPORTS_HUGETLBFS=y +# CONFIG_HUGETLBFS is not set +CONFIG_MEMFD_CREATE=y +CONFIG_ARCH_HAS_GIGANTIC_PAGE=y +CONFIG_CONFIGFS_FS=y +# end of Pseudo filesystems + +CONFIG_MISC_FILESYSTEMS=y +# CONFIG_ORANGEFS_FS is not set +# CONFIG_ADFS_FS is not set +# CONFIG_AFFS_FS is not set +# CONFIG_ECRYPT_FS is not set +# CONFIG_HFS_FS is not set +# CONFIG_HFSPLUS_FS is not set +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +CONFIG_CRAMFS=y +CONFIG_CRAMFS_BLOCKDEV=y +CONFIG_SQUASHFS=y +# CONFIG_SQUASHFS_FILE_CACHE is not set +CONFIG_SQUASHFS_FILE_DIRECT=y +CONFIG_SQUASHFS_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_CHOICE_DECOMP_BY_MOUNT is not set +CONFIG_SQUASHFS_COMPILE_DECOMP_SINGLE=y +# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI is not set +# CONFIG_SQUASHFS_COMPILE_DECOMP_MULTI_PERCPU is not set +# CONFIG_SQUASHFS_XATTR is not set +# CONFIG_SQUASHFS_ZLIB is not set +# CONFIG_SQUASHFS_LZ4 is not set +# CONFIG_SQUASHFS_LZO is not set +CONFIG_SQUASHFS_XZ=y +CONFIG_SQUASHFS_ZSTD=y +# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set +# CONFIG_SQUASHFS_EMBEDDED is not set +CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3 +# CONFIG_VXFS_FS is not set +# CONFIG_MINIX_FS is not set +# CONFIG_OMFS_FS is not set +# CONFIG_HPFS_FS is not set +# CONFIG_QNX4FS_FS is not set +# CONFIG_QNX6FS_FS is not set +# CONFIG_ROMFS_FS is not set +CONFIG_PSTORE=y +CONFIG_PSTORE_DEFAULT_KMSG_BYTES=10240 +# CONFIG_PSTORE_DEFLATE_COMPRESS is not set +# CONFIG_PSTORE_LZO_COMPRESS is not set +# CONFIG_PSTORE_LZ4_COMPRESS is not set +# CONFIG_PSTORE_LZ4HC_COMPRESS is not set +# CONFIG_PSTORE_842_COMPRESS is not set +CONFIG_PSTORE_ZSTD_COMPRESS=y +CONFIG_PSTORE_COMPRESS=y +CONFIG_PSTORE_ZSTD_COMPRESS_DEFAULT=y +CONFIG_PSTORE_COMPRESS_DEFAULT="zstd" +# CONFIG_PSTORE_CONSOLE is not set +# CONFIG_PSTORE_PMSG is not set +CONFIG_PSTORE_RAM=y +# CONFIG_PSTORE_BLK is not set +# CONFIG_SYSV_FS is not set +# CONFIG_UFS_FS is not set +# CONFIG_EROFS_FS is not set +CONFIG_NETWORK_FILESYSTEMS=y +CONFIG_NFS_FS=y +# CONFIG_NFS_V2 is not set +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set +# CONFIG_NFSD is not set +CONFIG_GRACE_PERIOD=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +CONFIG_SUNRPC=y +# CONFIG_RPCSEC_GSS_KRB5 is not set +# CONFIG_SUNRPC_DEBUG is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +# CONFIG_SMB_SERVER is not set +# CONFIG_CODA_FS is not set +# CONFIG_AFS_FS is not set +CONFIG_NLS=y +CONFIG_NLS_DEFAULT="iso8859-1" +CONFIG_NLS_CODEPAGE_437=y +# CONFIG_NLS_CODEPAGE_737 is not set +# CONFIG_NLS_CODEPAGE_775 is not set +# CONFIG_NLS_CODEPAGE_850 is not set +# CONFIG_NLS_CODEPAGE_852 is not set +# CONFIG_NLS_CODEPAGE_855 is not set +# CONFIG_NLS_CODEPAGE_857 is not set +# CONFIG_NLS_CODEPAGE_860 is not set +# CONFIG_NLS_CODEPAGE_861 is not set +# CONFIG_NLS_CODEPAGE_862 is not set +# CONFIG_NLS_CODEPAGE_863 is not set +# CONFIG_NLS_CODEPAGE_864 is not set +# CONFIG_NLS_CODEPAGE_865 is not set +# CONFIG_NLS_CODEPAGE_866 is not set +# CONFIG_NLS_CODEPAGE_869 is not set +# CONFIG_NLS_CODEPAGE_936 is not set +# CONFIG_NLS_CODEPAGE_950 is not set +# CONFIG_NLS_CODEPAGE_932 is not set +# CONFIG_NLS_CODEPAGE_949 is not set +# CONFIG_NLS_CODEPAGE_874 is not set +# CONFIG_NLS_ISO8859_8 is not set +# CONFIG_NLS_CODEPAGE_1250 is not set +# CONFIG_NLS_CODEPAGE_1251 is not set +# CONFIG_NLS_ASCII is not set +CONFIG_NLS_ISO8859_1=y +# CONFIG_NLS_ISO8859_2 is not set +# CONFIG_NLS_ISO8859_3 is not set +# CONFIG_NLS_ISO8859_4 is not set +# CONFIG_NLS_ISO8859_5 is not set +# CONFIG_NLS_ISO8859_6 is not set +# CONFIG_NLS_ISO8859_7 is not set +# CONFIG_NLS_ISO8859_9 is not set +# CONFIG_NLS_ISO8859_13 is not set +# CONFIG_NLS_ISO8859_14 is not set +# CONFIG_NLS_ISO8859_15 is not set +# CONFIG_NLS_KOI8_R is not set +# CONFIG_NLS_KOI8_U is not set +# CONFIG_NLS_MAC_ROMAN is not set +# CONFIG_NLS_MAC_CELTIC is not set +# CONFIG_NLS_MAC_CENTEURO is not set +# CONFIG_NLS_MAC_CROATIAN is not set +# CONFIG_NLS_MAC_CYRILLIC is not set +# CONFIG_NLS_MAC_GAELIC is not set +# CONFIG_NLS_MAC_GREEK is not set +# CONFIG_NLS_MAC_ICELAND is not set +# CONFIG_NLS_MAC_INUIT is not set +# CONFIG_NLS_MAC_ROMANIAN is not set +# CONFIG_NLS_MAC_TURKISH is not set +# CONFIG_NLS_UTF8 is not set +# CONFIG_DLM is not set +# CONFIG_UNICODE is not set +# end of File systems + +# +# Security options +# +CONFIG_KEYS=y +# CONFIG_KEYS_REQUEST_CACHE is not set +# CONFIG_PERSISTENT_KEYRINGS is not set +# CONFIG_BIG_KEYS is not set +# CONFIG_TRUSTED_KEYS is not set +# CONFIG_ENCRYPTED_KEYS is not set +# CONFIG_KEY_DH_OPERATIONS is not set +# CONFIG_SECURITY_DMESG_RESTRICT is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y +# CONFIG_HARDENED_USERCOPY is not set +# CONFIG_FORTIFY_SOURCE is not set +# CONFIG_STATIC_USERMODEHELPER is not set +CONFIG_DEFAULT_SECURITY_DAC=y +CONFIG_LSM="yama,loadpin,safesetid,integrity" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_INIT_STACK_NONE=y +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +# end of Memory initialization + +CONFIG_RANDSTRUCT_NONE=y +# end of Kernel hardening options +# end of Security options + +CONFIG_CRYPTO=y + +# +# Crypto core or helper +# +CONFIG_CRYPTO_ALGAPI=y +CONFIG_CRYPTO_ALGAPI2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_SKCIPHER=y +CONFIG_CRYPTO_SKCIPHER2=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_AKCIPHER2=y +CONFIG_CRYPTO_AKCIPHER=y +CONFIG_CRYPTO_KPP2=y +CONFIG_CRYPTO_KPP=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +# CONFIG_CRYPTO_USER is not set +CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +# CONFIG_CRYPTO_PCRYPT is not set +# CONFIG_CRYPTO_CRYPTD is not set +# CONFIG_CRYPTO_AUTHENC is not set +# CONFIG_CRYPTO_TEST is not set +# end of Crypto core or helper + +# +# Public-key cryptography +# +CONFIG_CRYPTO_RSA=y +# CONFIG_CRYPTO_DH is not set +CONFIG_CRYPTO_ECC=y +CONFIG_CRYPTO_ECDH=y +CONFIG_CRYPTO_ECDSA=y +# CONFIG_CRYPTO_ECRDSA is not set +# CONFIG_CRYPTO_SM2 is not set +# CONFIG_CRYPTO_CURVE25519 is not set +# end of Public-key cryptography + +# +# Block ciphers +# +CONFIG_CRYPTO_AES=y +# CONFIG_CRYPTO_AES_TI is not set +# CONFIG_CRYPTO_ARIA is not set +# CONFIG_CRYPTO_BLOWFISH is not set +# CONFIG_CRYPTO_CAMELLIA is not set +# CONFIG_CRYPTO_CAST5 is not set +# CONFIG_CRYPTO_CAST6 is not set +# CONFIG_CRYPTO_DES is not set +# CONFIG_CRYPTO_FCRYPT is not set +# CONFIG_CRYPTO_SERPENT is not set +# CONFIG_CRYPTO_SM4_GENERIC is not set +# CONFIG_CRYPTO_TWOFISH is not set +# end of Block ciphers + +# +# Length-preserving ciphers and modes +# +# CONFIG_CRYPTO_ADIANTUM is not set +# CONFIG_CRYPTO_CHACHA20 is not set +# CONFIG_CRYPTO_CBC is not set +# CONFIG_CRYPTO_CFB is not set +CONFIG_CRYPTO_CTR=y +# CONFIG_CRYPTO_CTS is not set +CONFIG_CRYPTO_ECB=y +# CONFIG_CRYPTO_HCTR2 is not set +# CONFIG_CRYPTO_KEYWRAP is not set +# CONFIG_CRYPTO_LRW is not set +# CONFIG_CRYPTO_OFB is not set +# CONFIG_CRYPTO_PCBC is not set +# CONFIG_CRYPTO_XTS is not set +# end of Length-preserving ciphers and modes + +# +# AEAD (authenticated encryption with associated data) ciphers +# +# CONFIG_CRYPTO_AEGIS128 is not set +# CONFIG_CRYPTO_CHACHA20POLY1305 is not set +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_SEQIV=y +# CONFIG_CRYPTO_ECHAINIV is not set +# CONFIG_CRYPTO_ESSIV is not set +# end of AEAD (authenticated encryption with associated data) ciphers + +# +# Hashes, digests, and MACs +# +# CONFIG_CRYPTO_BLAKE2B is not set +CONFIG_CRYPTO_CMAC=y +CONFIG_CRYPTO_GHASH=y +CONFIG_CRYPTO_HMAC=y +# CONFIG_CRYPTO_MD4 is not set +# CONFIG_CRYPTO_MD5 is not set +CONFIG_CRYPTO_MICHAEL_MIC=y +# CONFIG_CRYPTO_POLY1305 is not set +# CONFIG_CRYPTO_RMD160 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +# CONFIG_CRYPTO_SHA3 is not set +# CONFIG_CRYPTO_SM3_GENERIC is not set +# CONFIG_CRYPTO_STREEBOG is not set +# CONFIG_CRYPTO_VMAC is not set +# CONFIG_CRYPTO_WP512 is not set +# CONFIG_CRYPTO_XCBC is not set +# CONFIG_CRYPTO_XXHASH is not set +# end of Hashes, digests, and MACs + +# +# CRCs (cyclic redundancy checks) +# +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CRC32 is not set +# CONFIG_CRYPTO_CRCT10DIF is not set +# end of CRCs (cyclic redundancy checks) + +# +# Compression +# +CONFIG_CRYPTO_DEFLATE=y +# CONFIG_CRYPTO_LZO is not set +# CONFIG_CRYPTO_842 is not set +# CONFIG_CRYPTO_LZ4 is not set +# CONFIG_CRYPTO_LZ4HC is not set +CONFIG_CRYPTO_ZSTD=y +# end of Compression + +# +# Random number generation +# +CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_DRBG_HMAC=y +# CONFIG_CRYPTO_DRBG_HASH is not set +# CONFIG_CRYPTO_DRBG_CTR is not set +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_JITTERENTROPY=y +# end of Random number generation + +# +# Userspace interface +# +# CONFIG_CRYPTO_USER_API_HASH is not set +# CONFIG_CRYPTO_USER_API_SKCIPHER is not set +# CONFIG_CRYPTO_USER_API_RNG is not set +# CONFIG_CRYPTO_USER_API_AEAD is not set +# end of Userspace interface + +CONFIG_CRYPTO_HASH_INFO=y +# CONFIG_CRYPTO_NHPOLY1305_NEON is not set +CONFIG_CRYPTO_CHACHA20_NEON=y + +# +# Accelerated Cryptographic Algorithms for CPU (arm64) +# +# CONFIG_CRYPTO_GHASH_ARM64_CE is not set +CONFIG_CRYPTO_POLY1305_NEON=y +CONFIG_CRYPTO_SHA1_ARM64_CE=y +CONFIG_CRYPTO_SHA256_ARM64=y +CONFIG_CRYPTO_SHA2_ARM64_CE=y +CONFIG_CRYPTO_SHA512_ARM64=y +CONFIG_CRYPTO_SHA512_ARM64_CE=y +# CONFIG_CRYPTO_SHA3_ARM64 is not set +# CONFIG_CRYPTO_SM3_NEON is not set +# CONFIG_CRYPTO_SM3_ARM64_CE is not set +# CONFIG_CRYPTO_POLYVAL_ARM64_CE is not set +# CONFIG_CRYPTO_AES_ARM64 is not set +# CONFIG_CRYPTO_AES_ARM64_CE is not set +# CONFIG_CRYPTO_AES_ARM64_CE_BLK is not set +# CONFIG_CRYPTO_AES_ARM64_NEON_BLK is not set +# CONFIG_CRYPTO_AES_ARM64_BS is not set +# CONFIG_CRYPTO_SM4_ARM64_CE is not set +# CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set +# CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set +# CONFIG_CRYPTO_AES_ARM64_CE_CCM is not set +# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set +# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set +# end of Accelerated Cryptographic Algorithms for CPU (arm64) + +# CONFIG_CRYPTO_HW is not set +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set +CONFIG_PKCS7_MESSAGE_PARSER=y +# CONFIG_FIPS_SIGNATURE_SELFTEST is not set + +# +# Certificates for signature checking +# +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SYSTEM_TRUSTED_KEYS="" +# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set +# CONFIG_SECONDARY_TRUSTED_KEYRING is not set +# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set +# end of Certificates for signature checking + +# +# Library routines +# +CONFIG_LINEAR_RANGES=y +# CONFIG_PACKING is not set +CONFIG_BITREVERSE=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GENERIC_NET_UTILS=y +# CONFIG_CORDIC is not set +# CONFIG_PRIME_NUMBERS is not set +CONFIG_RATIONAL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_HAS_FAST_MULTIPLIER=y +CONFIG_ARCH_USE_SYM_ANNOTATIONS=y +# CONFIG_INDIRECT_PIO is not set + +# +# Crypto library routines +# +CONFIG_CRYPTO_LIB_UTILS=y +CONFIG_CRYPTO_LIB_AES=y +CONFIG_CRYPTO_LIB_ARC4=y +CONFIG_CRYPTO_LIB_GF128MUL=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y +CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y +CONFIG_CRYPTO_LIB_CHACHA=y +CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=y +CONFIG_CRYPTO_LIB_CURVE25519=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_CHACHA20POLY1305=y +CONFIG_CRYPTO_LIB_SHA1=y +CONFIG_CRYPTO_LIB_SHA256=y +# end of Crypto library routines + +# CONFIG_CRC_CCITT is not set +CONFIG_CRC16=y +# CONFIG_CRC_T10DIF is not set +# CONFIG_CRC64_ROCKSOFT is not set +# CONFIG_CRC_ITU_T is not set +CONFIG_CRC32=y +# CONFIG_CRC32_SELFTEST is not set +CONFIG_CRC32_SLICEBY8=y +# CONFIG_CRC32_SLICEBY4 is not set +# CONFIG_CRC32_SARWATE is not set +# CONFIG_CRC32_BIT is not set +# CONFIG_CRC64 is not set +# CONFIG_CRC4 is not set +# CONFIG_CRC7 is not set +CONFIG_LIBCRC32C=y +# CONFIG_CRC8 is not set +CONFIG_XXHASH=y +CONFIG_AUDIT_GENERIC=y +CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_ZSTD_COMMON=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +# CONFIG_XZ_DEC_IA64 is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +# CONFIG_XZ_DEC_SPARC is not set +# CONFIG_XZ_DEC_MICROLZMA is not set +CONFIG_XZ_DEC_BCJ=y +# CONFIG_XZ_DEC_TEST is not set +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_REED_SOLOMON=y +CONFIG_REED_SOLOMON_ENC8=y +CONFIG_REED_SOLOMON_DEC8=y +CONFIG_ASSOCIATIVE_ARRAY=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAS_DMA=y +CONFIG_NEED_SG_DMA_LENGTH=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_ARCH_DMA_ADDR_T_64BIT=y +CONFIG_DMA_DECLARE_COHERENT=y +CONFIG_ARCH_HAS_SETUP_DMA_OPS=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE=y +CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU=y +CONFIG_ARCH_HAS_DMA_PREP_COHERENT=y +CONFIG_SWIOTLB=y +# CONFIG_DMA_RESTRICTED_POOL is not set +CONFIG_DMA_NONCOHERENT_MMAP=y +CONFIG_DMA_COHERENT_POOL=y +CONFIG_DMA_DIRECT_REMAP=y +# CONFIG_DMA_API_DEBUG is not set +# CONFIG_DMA_MAP_BENCHMARK is not set +CONFIG_SGL_ALLOC=y +# CONFIG_FORCE_NR_CPUS is not set +CONFIG_CPU_RMAP=y +CONFIG_DQL=y +CONFIG_GLOB=y +# CONFIG_GLOB_SELFTEST is not set +CONFIG_NLATTR=y +CONFIG_CLZ_TAB=y +# CONFIG_IRQ_POLL is not set +CONFIG_MPILIB=y +CONFIG_LIBFDT=y +CONFIG_OID_REGISTRY=y +CONFIG_HAVE_GENERIC_VDSO=y +CONFIG_GENERIC_GETTIMEOFDAY=y +CONFIG_GENERIC_VDSO_TIME_NS=y +CONFIG_SG_POOL=y +CONFIG_ARCH_STACKWALK=y +CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_ALWAYS_INIT=y +CONFIG_SBITMAP=y +CONFIG_ARCH_HAS_FBXSERIAL=y +CONFIG_FBXSERIAL=y +# end of Library routines + +CONFIG_GENERIC_IOREMAP=y +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y + +# +# Kernel hacking +# + +# +# printk and dmesg options +# +CONFIG_PRINTK_TIME=y +# CONFIG_PRINTK_CALLER is not set +# CONFIG_STACKTRACE_BUILD_ID is not set +CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7 +CONFIG_CONSOLE_LOGLEVEL_QUIET=4 +CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4 +# CONFIG_BOOT_PRINTK_DELAY is not set +# CONFIG_DYNAMIC_DEBUG is not set +# CONFIG_DYNAMIC_DEBUG_CORE is not set +# CONFIG_SYMBOLIC_ERRNAME is not set +CONFIG_DEBUG_BUGVERBOSE=y +# end of printk and dmesg options + +CONFIG_DEBUG_KERNEL=y +# CONFIG_DEBUG_MISC is not set + +# +# Compile-time checks and compiler options +# +CONFIG_AS_HAS_NON_CONST_LEB128=y +CONFIG_DEBUG_INFO_NONE=y +# CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT is not set +# CONFIG_DEBUG_INFO_DWARF4 is not set +# CONFIG_DEBUG_INFO_DWARF5 is not set +CONFIG_FRAME_WARN=2048 +# CONFIG_STRIP_ASM_SYMS is not set +# CONFIG_READABLE_ASM is not set +# CONFIG_HEADERS_INSTALL is not set +# CONFIG_DEBUG_SECTION_MISMATCH is not set +CONFIG_SECTION_MISMATCH_WARN_ONLY=y +# CONFIG_DEBUG_FORCE_FUNCTION_ALIGN_64B is not set +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_FRAME_POINTER=y +# CONFIG_VMLINUX_MAP is not set +# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set +# end of Compile-time checks and compiler options + +# +# Generic Kernel Debugging Instruments +# +CONFIG_MAGIC_SYSRQ=y +CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 +CONFIG_MAGIC_SYSRQ_SERIAL=y +CONFIG_MAGIC_SYSRQ_SERIAL_SEQUENCE="" +CONFIG_DEBUG_FS=y +CONFIG_DEBUG_FS_ALLOW_ALL=y +# CONFIG_DEBUG_FS_DISALLOW_MOUNT is not set +# CONFIG_DEBUG_FS_ALLOW_NONE is not set +CONFIG_HAVE_ARCH_KGDB=y +# CONFIG_KGDB is not set +CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y +CONFIG_UBSAN=y +# CONFIG_UBSAN_TRAP is not set +CONFIG_CC_HAS_UBSAN_BOUNDS=y +# CONFIG_UBSAN_BOUNDS is not set +# CONFIG_UBSAN_SHIFT is not set +# CONFIG_UBSAN_DIV_ZERO is not set +# CONFIG_UBSAN_UNREACHABLE is not set +# CONFIG_UBSAN_BOOL is not set +# CONFIG_UBSAN_ENUM is not set +# CONFIG_UBSAN_ALIGNMENT is not set +CONFIG_UBSAN_SANITIZE_ALL=y +# CONFIG_TEST_UBSAN is not set +CONFIG_HAVE_ARCH_KCSAN=y +# end of Generic Kernel Debugging Instruments + +# +# Networking Debugging +# +# CONFIG_NET_DEV_REFCNT_TRACKER is not set +# CONFIG_NET_NS_REFCNT_TRACKER is not set +# CONFIG_DEBUG_NET is not set +# end of Networking Debugging + +# +# Memory Debugging +# +CONFIG_PAGE_EXTENSION=y +CONFIG_DEBUG_PAGEALLOC=y +CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y +CONFIG_SLUB_DEBUG=y +# CONFIG_SLUB_DEBUG_ON is not set +# CONFIG_PAGE_OWNER is not set +CONFIG_PAGE_POISONING=y +# CONFIG_DEBUG_RODATA_TEST is not set +CONFIG_ARCH_HAS_DEBUG_WX=y +# CONFIG_DEBUG_WX is not set +CONFIG_GENERIC_PTDUMP=y +# CONFIG_PTDUMP_DEBUGFS is not set +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_DEBUG_KMEMLEAK=y +CONFIG_DEBUG_KMEMLEAK_MEM_POOL_SIZE=16000 +# CONFIG_DEBUG_KMEMLEAK_DEFAULT_OFF is not set +CONFIG_DEBUG_KMEMLEAK_AUTO_SCAN=y +# CONFIG_PER_VMA_LOCK_STATS is not set +CONFIG_DEBUG_OBJECTS=y +CONFIG_DEBUG_OBJECTS_SELFTEST=y +CONFIG_DEBUG_OBJECTS_FREE=y +CONFIG_DEBUG_OBJECTS_TIMERS=y +CONFIG_DEBUG_OBJECTS_WORK=y +CONFIG_DEBUG_OBJECTS_RCU_HEAD=y +CONFIG_DEBUG_OBJECTS_PERCPU_COUNTER=y +CONFIG_DEBUG_OBJECTS_ENABLE_DEFAULT=1 +# CONFIG_SHRINKER_DEBUG is not set +# CONFIG_DEBUG_STACK_USAGE is not set +# CONFIG_SCHED_STACK_END_CHECK is not set +CONFIG_ARCH_HAS_DEBUG_VM_PGTABLE=y +CONFIG_DEBUG_VM_IRQSOFF=y +CONFIG_DEBUG_VM=y +# CONFIG_DEBUG_VM_MAPLE_TREE is not set +CONFIG_DEBUG_VM_RB=y +CONFIG_DEBUG_VM_PGFLAGS=y +# CONFIG_DEBUG_VM_PGTABLE is not set +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +CONFIG_DEBUG_VIRTUAL=y +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +CONFIG_HAVE_ARCH_KASAN=y +CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y +CONFIG_HAVE_ARCH_KASAN_VMALLOC=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +CONFIG_KASAN=y +CONFIG_KASAN_GENERIC=y +CONFIG_KASAN_OUTLINE=y +# CONFIG_KASAN_INLINE is not set +CONFIG_KASAN_STACK=y +CONFIG_KASAN_VMALLOC=y +# CONFIG_KASAN_MODULE_TEST is not set +CONFIG_HAVE_ARCH_KFENCE=y +# CONFIG_KFENCE is not set +# end of Memory Debugging + +# CONFIG_DEBUG_SHIRQ is not set + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=1 +# CONFIG_SOFTLOCKUP_DETECTOR is not set +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=10 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_TEST_LOCKUP is not set +# end of Debug Oops, Lockups and Hangs + +# +# Scheduler Debugging +# +# CONFIG_SCHED_DEBUG is not set +# CONFIG_SCHEDSTATS is not set +# end of Scheduler Debugging + +CONFIG_DEBUG_TIMEKEEPING=y + +# +# Lock Debugging (spinlocks, mutexes, etc...) +# +CONFIG_LOCK_DEBUGGING_SUPPORT=y +# CONFIG_PROVE_LOCKING is not set +# CONFIG_LOCK_STAT is not set +CONFIG_DEBUG_RT_MUTEXES=y +CONFIG_DEBUG_SPINLOCK=y +CONFIG_DEBUG_MUTEXES=y +# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set +# CONFIG_DEBUG_RWSEMS is not set +# CONFIG_DEBUG_LOCK_ALLOC is not set +CONFIG_DEBUG_ATOMIC_SLEEP=y +# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set +# CONFIG_LOCK_TORTURE_TEST is not set +# CONFIG_WW_MUTEX_SELFTEST is not set +# CONFIG_SCF_TORTURE_TEST is not set +# CONFIG_CSD_LOCK_WAIT_DEBUG is not set +# end of Lock Debugging (spinlocks, mutexes, etc...) + +# CONFIG_DEBUG_IRQFLAGS is not set +CONFIG_STACKTRACE=y +# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set +# CONFIG_DEBUG_KOBJECT is not set +# CONFIG_DEBUG_KOBJECT_RELEASE is not set + +# +# Debug kernel data structures +# +CONFIG_DEBUG_LIST=y +# CONFIG_DEBUG_PLIST is not set +CONFIG_DEBUG_SG=y +CONFIG_DEBUG_NOTIFIERS=y +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# CONFIG_DEBUG_MAPLE_TREE is not set +# end of Debug kernel data structures + +# CONFIG_DEBUG_CREDENTIALS is not set + +# +# RCU Debugging +# +# CONFIG_RCU_SCALE_TEST is not set +# CONFIG_RCU_TORTURE_TEST is not set +# CONFIG_RCU_REF_SCALE_TEST is not set +CONFIG_RCU_CPU_STALL_TIMEOUT=21 +CONFIG_RCU_EXP_CPU_STALL_TIMEOUT=0 +# CONFIG_RCU_CPU_STALL_CPUTIME is not set +# CONFIG_RCU_TRACE is not set +# CONFIG_RCU_EQS_DEBUG is not set +# end of RCU Debugging + +# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set +# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set +# CONFIG_LATENCYTOP is not set +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_TRACING_SUPPORT=y +# CONFIG_FTRACE is not set +# CONFIG_SAMPLES is not set +# CONFIG_STRICT_DEVMEM is not set + +# +# arm64 Debugging +# +# CONFIG_PID_IN_CONTEXTIDR is not set +# CONFIG_ARM64_RELOC_TEST is not set +# CONFIG_CORESIGHT is not set +# end of arm64 Debugging + +# +# Kernel Testing and Coverage +# +# CONFIG_KUNIT is not set +# CONFIG_NOTIFIER_ERROR_INJECTION is not set +# CONFIG_FAULT_INJECTION is not set +CONFIG_ARCH_HAS_KCOV=y +CONFIG_CC_HAS_SANCOV_TRACE_PC=y +# CONFIG_RUNTIME_TESTING_MENU is not set +CONFIG_ARCH_USE_MEMTEST=y +CONFIG_MEMTEST=y +# end of Kernel Testing and Coverage + +# +# Rust hacking +# +# end of Rust hacking +# end of Kernel hacking diff -Nruw linux-6.4-fbx/drivers/char/diag./Kconfig linux-6.4-fbx/drivers/char/diag/Kconfig --- linux-6.4-fbx/drivers/char/diag./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/char/diag/Kconfig 2023-03-15 19:52:23.513979080 +0100 @@ -0,0 +1,38 @@ +menu "Diag Support" + +config DIAG_CHAR + tristate "char driver interface and diag forwarding to/from modem" + select CRC_CCITT + help + Char driver interface for diag user space and diag-forwarding to modem ARM and back. + This enables diagchar for maemo usb gadget or android usb gadget based on config selected. +endmenu + +menu "DIAG traffic over USB" + +config DIAG_OVER_USB + bool "Enable DIAG traffic to go over USB" + depends on DIAG_CHAR + help + This feature helps segregate code required for DIAG traffic to go over USB. +endmenu + +menu "DIAG traffic over QRTR" + +config DIAG_OVER_QRTR + bool "Enable DIAG traffic to go over QRTR" + depends on QRTR && DIAG_CHAR + default n + help + This feature helps segregate code required for DIAG traffic to go over QRTR. +endmenu + +menu "HSIC/SMUX support for DIAG" + +config DIAGFWD_BRIDGE_CODE + bool "Enable QSC/9K DIAG traffic over SMUX/HSIC" + depends on DIAG_CHAR + depends on USB_QCOM_DIAG_BRIDGE || MHI_BUS + help + SMUX/HSIC Transport Layer for DIAG Router +endmenu diff -Nruw linux-6.4-fbx/drivers/char/diag./Makefile linux-6.4-fbx/drivers/char/diag/Makefile --- linux-6.4-fbx/drivers/char/diag./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/char/diag/Makefile 2023-03-15 19:52:23.513979080 +0100 @@ -0,0 +1,19 @@ +obj-$(CONFIG_DIAG_CHAR) := diagchar.o +obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_hsic.o +obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_smux.o +diagchar-objs := diagchar_core.o diagchar_hdlc.o diagfwd.o diagfwd_peripheral.o diag_mux.o diag_memorydevice.o diag_usb.o diagmem.o diagfwd_cntl.o diag_dci.o diag_masks.o diag_debugfs.o + +ifdef CONFIG_DIAG_OVER_QRTR +diagchar-objs += qcom_diagfwd_socket.o +else +diagchar-objs += diagfwd_socket.o +endif + +ifdef CONFIG_DIAGFWD_BRIDGE_CODE +diagchar-objs += diagfwd_bridge.o + +ifdef CONFIG_MHI_BUS +diagchar-objs += diagfwd_mhi.o +endif + +endif diff -Nruw linux-6.4-fbx/drivers/fbxgpio./Kconfig linux-6.4-fbx/drivers/fbxgpio/Kconfig --- linux-6.4-fbx/drivers/fbxgpio./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxgpio/Kconfig 2023-02-27 17:08:58.870666225 +0100 @@ -0,0 +1,7 @@ +config FREEBOX_GPIO + tristate "Freebox GPIO control interface" + default n + +config FREEBOX_GPIO_DT + tristate "Freebox GPIO DT binding." + default n diff -Nruw linux-6.4-fbx/drivers/fbxgpio./Makefile linux-6.4-fbx/drivers/fbxgpio/Makefile --- linux-6.4-fbx/drivers/fbxgpio./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxgpio/Makefile 2023-02-27 17:08:58.870666225 +0100 @@ -0,0 +1,2 @@ +obj-$(CONFIG_FREEBOX_GPIO) += fbxgpio_core.o +obj-$(CONFIG_FREEBOX_GPIO_DT) += fbxgpio_dt.o diff -Nruw linux-6.4-fbx/drivers/fbxjtag./Kconfig linux-6.4-fbx/drivers/fbxjtag/Kconfig --- linux-6.4-fbx/drivers/fbxjtag./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxjtag/Kconfig 2023-03-09 15:06:11.348233797 +0100 @@ -0,0 +1,3 @@ +config FREEBOX_JTAG + tristate "Freebox JTAG control interface" + default n diff -Nruw linux-6.4-fbx/drivers/fbxjtag./Makefile linux-6.4-fbx/drivers/fbxjtag/Makefile --- linux-6.4-fbx/drivers/fbxjtag./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxjtag/Makefile 2023-03-09 15:06:11.348233797 +0100 @@ -0,0 +1 @@ +obj-$(CONFIG_FREEBOX_JTAG) += fbxjtag.o diff -Nruw linux-6.4-fbx/drivers/fbxprocfs./Kconfig linux-6.4-fbx/drivers/fbxprocfs/Kconfig --- linux-6.4-fbx/drivers/fbxprocfs./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxprocfs/Kconfig 2023-02-27 19:50:21.524231407 +0100 @@ -0,0 +1,2 @@ +config FREEBOX_PROCFS + tristate "Freebox procfs interface" diff -Nruw linux-6.4-fbx/drivers/fbxprocfs./Makefile linux-6.4-fbx/drivers/fbxprocfs/Makefile --- linux-6.4-fbx/drivers/fbxprocfs./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxprocfs/Makefile 2023-02-27 19:50:21.524231407 +0100 @@ -0,0 +1 @@ +obj-$(CONFIG_FREEBOX_PROCFS) += fbxprocfs.o diff -Nruw linux-6.4-fbx/drivers/fbxprocfs./fbxprocfs.c linux-6.4-fbx/drivers/fbxprocfs/fbxprocfs.c --- linux-6.4-fbx/drivers/fbxprocfs./fbxprocfs.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxprocfs/fbxprocfs.c 2024-04-22 13:40:46.795773339 +0200 @@ -0,0 +1,299 @@ +/* + * Freebox ProcFs interface + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define PFX "fbxprocfs: " + + +static struct list_head clients; +static struct mutex clients_mutex; + +static struct proc_dir_entry *root; + +/* + * register a fbxprocfs client with given dirname, caller should + * consider returned struct opaque + */ +struct fbxprocfs_client *fbxprocfs_add_client(const char *dirname, + struct module *owner) +{ + struct fbxprocfs_client *ret, *p; + + ret = NULL; + mutex_lock(&clients_mutex); + + /* check for duplicate */ + list_for_each_entry(p, &clients, list) { + if (!strcmp(dirname, p->dirname)) + goto out; + } + + if (!(ret = kmalloc(sizeof (*ret), GFP_KERNEL))) { + printk(KERN_ERR PFX "kmalloc failed\n"); + goto out; + } + + /* try to create client directory */ + if (!(ret->dir = proc_mkdir(dirname, root))) { + printk(KERN_ERR PFX "can't create %s dir\n", dirname); + kfree(ret); + ret = NULL; + goto out; + } + + atomic_set(&ret->refcount, 1); + ret->dirname = dirname; + list_add(&ret->list, &clients); + +out: + mutex_unlock(&clients_mutex); + return ret; +} + +/* + * unregister a fbxprocfs client, make sure usage count is zero + */ +int fbxprocfs_remove_client(struct fbxprocfs_client *client) +{ + int ret; + + mutex_lock(&clients_mutex); + + ret = 0; + if (atomic_read(&client->refcount) > 1) { + ret = -EBUSY; + goto out; + } + + remove_proc_entry(client->dirname, root); + list_del(&client->list); + kfree(client); + +out: + mutex_unlock(&clients_mutex); + return ret; +} + +/* + * remove given entries from client directory + */ +static int +__remove_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_desc *ro_desc, + const struct fbxprocfs_desc *rw_desc) +{ + int i; + + for (i = 0; ro_desc && ro_desc[i].name; i++) { + remove_proc_entry(ro_desc[i].name, client->dir); + atomic_dec(&client->refcount); + } + + for (i = 0; rw_desc && rw_desc[i].name; i++) { + remove_proc_entry(rw_desc[i].name, client->dir); + atomic_dec(&client->refcount); + } + + return 0; +} + +/* + * replacement for NULL rfunc. + */ +static int bad_rfunc(struct seq_file *m, void *ptr) +{ + return -EACCES; +} + +/* + * fbxprocfs write path is now handled by seq_file code. this + * simplifies client code greatly. + */ +static int fbxprocfs_open(struct inode *inode, struct file *file) +{ + const struct fbxprocfs_desc *desc = pde_data(inode); + + return single_open(file, desc->rfunc ? desc->rfunc : bad_rfunc, + (void*)desc->id); +} + +/* + * no particular help from kernel in the write path, fetch user buffer + * in a kernel buffer and call write func. + */ +static ssize_t fbxprocfs_write(struct file *file, const char __user *ubuf, + size_t len, loff_t *off) +{ + /* + * get fbxprocfs desc via the proc_dir_entry in file inode + */ + struct fbxprocfs_desc *d = pde_data(file_inode(file)); + char *kbuf; + int ret; + + /* + * must have a wfunc callback. + */ + if (!d->wfunc) + return -EACCES; + + /* + * allow up to SZ_4K bytes to be written. + */ + if (len > SZ_4K) + return -EOVERFLOW; + + /* + * alloc and fetch kernel buffer containing user data. + */ + kbuf = kmalloc(SZ_4K, GFP_KERNEL); + if (!kbuf) + return -ENOMEM; + + ret = -EFAULT; + if (copy_from_user(kbuf, ubuf, len)) + goto kfree; + + ret = d->wfunc(file, kbuf, len, (void*)d->id); + +kfree: + kfree(kbuf); + return ret; +} + +/* + * fbxprocfs file operations, read stuff is handled by seq_file code. + */ +static const struct proc_ops fbxprocfs_fops = { + .proc_open = fbxprocfs_open, + .proc_lseek = seq_lseek, + .proc_read = seq_read, + .proc_release = single_release, + .proc_write = fbxprocfs_write, +}; + +/* + * replaces create_proc_read_entry removed in latest kernels. + */ +static struct proc_dir_entry *__create_proc_read_entry( + const struct fbxprocfs_desc *desc, + struct proc_dir_entry *base) +{ + return proc_create_data(desc->name, 0, base, &fbxprocfs_fops, + (void*)desc); +} + +/* + * replaces create_proc_entry removed in latest kernels. + */ +static struct proc_dir_entry *__create_proc_entry( + const struct fbxprocfs_desc *desc, + struct proc_dir_entry *base) +{ + return proc_create_data(desc->name, S_IFREG | S_IWUSR | S_IRUGO, + base, &fbxprocfs_fops, (void*)desc); +} + +/* + * create given entries in client directory + */ +static int +__create_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_desc *ro_desc, + const struct fbxprocfs_desc *rw_desc) +{ + struct proc_dir_entry *proc; + int i; + + for (i = 0; ro_desc && ro_desc[i].name; i++) { + if (!(proc = __create_proc_read_entry(&ro_desc[i], + client->dir))) { + printk(KERN_ERR PFX "can't create %s/%s entry\n", + client->dirname, ro_desc[i].name); + goto err; + } + atomic_inc(&client->refcount); + } + + for (i = 0; rw_desc && rw_desc[i].name; i++) { + if (!(proc = __create_proc_entry(&rw_desc[i], client->dir))) { + printk(KERN_ERR PFX "can't create %s/%s entry\n", + client->dirname, ro_desc[i].name); + goto err; + } + atomic_inc(&client->refcount); + } + + return 0; + +err: + __remove_entries(client, ro_desc, rw_desc); + return -1; +} + +int +fbxprocfs_create_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_desc *ro_desc, + const struct fbxprocfs_desc *rw_desc) +{ + int ret; + + ret = __create_entries(client, ro_desc, rw_desc); + return ret; +} + +int +fbxprocfs_remove_entries(struct fbxprocfs_client *client, + const struct fbxprocfs_desc *ro_desc, + const struct fbxprocfs_desc *rw_desc) +{ + int ret; + + ret = __remove_entries(client, ro_desc, rw_desc); + return ret; +} + + +static int __init +fbxprocfs_init(void) +{ + INIT_LIST_HEAD(&clients); + mutex_init(&clients_mutex); + + /* create freebox directory */ + if (!(root = proc_mkdir("freebox", NULL))) { + printk(KERN_ERR PFX "can't create freebox/ dir\n"); + return -EIO; + } + return 0; +} + +static void __exit +fbxprocfs_exit(void) +{ + remove_proc_entry("freebox", NULL); +} + +module_init(fbxprocfs_init); +module_exit(fbxprocfs_exit); + +EXPORT_SYMBOL(fbxprocfs_create_entries); +EXPORT_SYMBOL(fbxprocfs_remove_entries); +EXPORT_SYMBOL(fbxprocfs_add_client); +EXPORT_SYMBOL(fbxprocfs_remove_client); + +MODULE_LICENSE("GPL"); +MODULE_VERSION("1.0"); +MODULE_AUTHOR("Maxime Bizon "); + diff -Nruw linux-6.4-fbx/drivers/fbxwatchdog./Kconfig linux-6.4-fbx/drivers/fbxwatchdog/Kconfig --- linux-6.4-fbx/drivers/fbxwatchdog./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxwatchdog/Kconfig 2024-04-22 13:40:46.795773339 +0200 @@ -0,0 +1,28 @@ +menuconfig FREEBOX_WATCHDOG + tristate "Freebox Watchdog" + default n + +if FREEBOX_WATCHDOG + +config FREEBOX_WATCHDOG_CHAR + bool "Freebox Watchdog char device interface." + default n + +config FREEBOX_WATCHDOG_ORION + tristate "Marvell Orion support" + depends on PLAT_ORION + +config FREEBOX_WATCHDOG_BCM63XX + tristate "Broadcom 63xx Freebox Watchdog support" + depends on BCM63XX + default n + +config FREEBOX_WATCHDOG_BCM63XX_OF + tristate "Broadcom 63xx Freebox Watchdog support (generic)" + depends on OF && !FREEBOX_WATCHDOG_BCM63XX + +config FREEBOX_WATCHDOG_FBXGWR_PMU + tristate "Freebox PMU Watchdog support" + depends on MFD_FBXGWR_PMU + +endif diff -Nruw linux-6.4-fbx/drivers/fbxwatchdog./Makefile linux-6.4-fbx/drivers/fbxwatchdog/Makefile --- linux-6.4-fbx/drivers/fbxwatchdog./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.4-fbx/drivers/fbxwatchdog/Makefile 2024-04-22 13:40:46.795773339 +0200 @@ -0,0 +1,11 @@ +obj-$(CONFIG_FREEBOX_WATCHDOG) += fbxwatchdog.o + +fbxwatchdog-objs = fbxwatchdog_core.o +ifeq ($(CONFIG_FREEBOX_WATCHDOG_CHAR),y) +fbxwatchdog-objs += fbxwatchdog_char.o +endif + +obj-$(CONFIG_FREEBOX_WATCHDOG_ORION) += fbxwatchdog_orion.o +obj-$(CONFIG_FREEBOX_WATCHDOG_BCM63XX) += fbxwatchdog_bcm63xx.o +obj-$(CONFIG_FREEBOX_WATCHDOG_BCM63XX_OF) += fbxwatchdog_bcm63xx_of.o +obj-$(CONFIG_FREEBOX_WATCHDOG_FBXGWR_PMU) += fbxwatchdog_gwr_pmu.o --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/drivers/hwmon/ld6710-fbx.c 2024-04-22 13:40:48.663824376 +0200 @@ -0,0 +1,340 @@ +/* + * ld6710-fbx.c for ld6710-fbx + * Created by on Wed Sep 25 15:01:56 2019 + */ + +/* + * Driver for LD6710 power deliverance with freebox specific + * firmware. The power supply temperature report on the I2C register + * space is a feature of the ROMed firmware on the chip, which depends + * on the OEM. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define LD6710_CHIPVER 0x00 +#define LD6710_FWVER 0x01 + +#define LD6710_SINK_CURRENT 0x10 +#define LD6710_SINK_CURRENT_MAX 0x11 + +#define LD6710_SINK_TEMP 0x20 +#define LD6710_SINK_TEMP_TURNOFF 0x21 +#define LD6710_SINK_TEMP_TURNON 0x22 + +#define LD6710_SINK_STATUS 0x30 +#define SINK_STATUS_OTP (1 << 0) +#define SINK_STATUS_OCP (1 << 1) +#define SINK_STATUS_OVP (1 << 2) + +struct ld6710_priv { + struct device *hwmon_dev; + struct i2c_client *client; + struct mutex mutex; +}; + +static int ld6710_read(struct ld6710_priv *priv, u8 addr) +{ + int ret; + + ret = i2c_smbus_read_byte_data(priv->client, addr); + if (ret < 0) { + dev_err(&priv->client->dev, "i2c read error at address %02x\n", + addr); + return 0xff; + } + return ret; +} + +static void ld6710_write(struct ld6710_priv *priv, u8 addr, u8 value) +{ + i2c_smbus_write_byte_data(priv->client, addr, value); +} + +static struct ld6710_priv *to_ld6710_priv(struct device *dev) +{ + struct i2c_client *client = to_i2c_client(dev); + return i2c_get_clientdata(client); +} + +/* + * chip / fw + */ +static ssize_t version_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ld6710_priv *priv = to_ld6710_priv(dev); + struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); + u32 v; + + mutex_lock(&priv->mutex); + v = ld6710_read(priv, sattr->nr); + mutex_unlock(&priv->mutex); + + return sprintf(buf, "0x%02x\n", v); +} + +static SENSOR_DEVICE_ATTR_2_RO(chipver, version, LD6710_CHIPVER, 0); +static SENSOR_DEVICE_ATTR_2_RO(fwver, version, LD6710_FWVER, 0); + +static struct attribute *ld6710_ver_attrs[] = { + &sensor_dev_attr_chipver.dev_attr.attr, + &sensor_dev_attr_fwver.dev_attr.attr, + NULL, +}; + +static const struct attribute_group ld6710_ver_group = { + .attrs = ld6710_ver_attrs, +}; + +/* + * sink current (mA) + */ +static ssize_t current_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct ld6710_priv *priv = to_ld6710_priv(dev); + struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); + u32 v; + + mutex_lock(&priv->mutex); + v = ld6710_read(priv, sattr->nr) * 100; + mutex_unlock(&priv->mutex); + + return sprintf(buf, "%d\n", v); +} + +static ssize_t current_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct ld6710_priv *priv = to_ld6710_priv(dev); + struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); + unsigned long val; + + if (kstrtoul(buf, 10, &val)) + return -EINVAL; + + val /= 100; + if (val > 255) + return -EINVAL; + + mutex_lock(&priv->mutex); + ld6710_write(priv, sattr->nr, val); + mutex_unlock(&priv->mutex); + + return count; +} + +static SENSOR_DEVICE_ATTR_2_RO(sink_current, current, LD6710_SINK_CURRENT, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input, current, LD6710_SINK_CURRENT, 0); +static SENSOR_DEVICE_ATTR_2_RW(sink_current_max, current, + LD6710_SINK_CURRENT_MAX, 0); + +static struct attribute *ld6710_sink_current_attrs[] = { + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_sink_current.dev_attr.attr, + &sensor_dev_attr_sink_current_max.dev_attr.attr, + NULL, +}; + +static const struct attribute_group ld6710_sink_current_group = { + .attrs = ld6710_sink_current_attrs, +}; + +/* + * sink temperature (1/1000th degree) + */ +static ssize_t temperature_show(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct ld6710_priv *priv = to_ld6710_priv(dev); + struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); + u32 v; + + mutex_lock(&priv->mutex); + v = ld6710_read(priv, sattr->nr) * 1000; + mutex_unlock(&priv->mutex); + + return sprintf(buf, "%d\n", v); +} + +static ssize_t temperature_store(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct ld6710_priv *priv = to_ld6710_priv(dev); + struct sensor_device_attribute_2 *sattr = to_sensor_dev_attr_2(attr); + unsigned long val; + + if (kstrtoul(buf, 10, &val)) + return -EINVAL; + + val /= 1000; + if (val > 255) + return -EINVAL; + + mutex_lock(&priv->mutex); + ld6710_write(priv, sattr->nr, val); + mutex_unlock(&priv->mutex); + + return count; +} + +static SENSOR_DEVICE_ATTR_2_RO(temp1_input, temperature, LD6710_SINK_TEMP, 0); +static SENSOR_DEVICE_ATTR_2_RW(temp1_turnoff, temperature, + LD6710_SINK_TEMP_TURNOFF, 0); +static SENSOR_DEVICE_ATTR_2_RW(temp1_turnon, temperature, + LD6710_SINK_TEMP_TURNON, 0); + + +static struct attribute *ld6710_sink_temp_attrs[] = { + &sensor_dev_attr_temp1_input.dev_attr.attr, + &sensor_dev_attr_temp1_turnoff.dev_attr.attr, + &sensor_dev_attr_temp1_turnon.dev_attr.attr, + NULL, +}; + +static const struct attribute_group ld6710_sink_temp_group = { + .attrs = ld6710_sink_temp_attrs, +}; + +/* + * status + */ +static ssize_t status_show(struct device *dev, struct device_attribute *attr, + char *buf) +{ + return version_show(dev, attr, buf); +} + +static SENSOR_DEVICE_ATTR_2_RO(status, status, LD6710_SINK_STATUS, 0); + +static struct attribute *ld6710_status_attrs[] = { + &sensor_dev_attr_status.dev_attr.attr, + NULL, +}; + +static const struct attribute_group ld6710_status_group = { + .attrs = ld6710_status_attrs, +}; + + +static void ld6710_fbx_remove_files(struct i2c_client *client) +{ + sysfs_remove_group(&client->dev.kobj, &ld6710_ver_group); + sysfs_remove_group(&client->dev.kobj, &ld6710_sink_current_group); + sysfs_remove_group(&client->dev.kobj, &ld6710_sink_temp_group); + sysfs_remove_group(&client->dev.kobj, &ld6710_status_group); +} + +static int ld6710_fbx_probe(struct i2c_client *client) +{ + struct ld6710_priv *priv; + u8 chipver, fwver; + int error; + + dev_info(&client->dev, "probe\n"); + + priv = devm_kzalloc(&client->dev, sizeof (*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->client = client; + mutex_init(&priv->mutex); + i2c_set_clientdata(client, priv); + + /* + * read chipver and fwver and check that they look sane. + */ + chipver = ld6710_read(priv, LD6710_CHIPVER); + fwver = ld6710_read(priv, LD6710_FWVER); + if (chipver == 0xff || fwver == 0xff) { + dev_err(&client->dev, "invalid chip version of firmware " + "version.\n"); + return -ENXIO; + } + + dev_info(&client->dev, "LD6710 chip %02x, fw %02x\n", + chipver, fwver); + + /* + * create attributes + */ + error = sysfs_create_group(&client->dev.kobj, &ld6710_ver_group); + if (error) + goto remove_files; + + error = sysfs_create_group(&client->dev.kobj, + &ld6710_sink_current_group); + if (error) + goto remove_files; + + error = sysfs_create_group(&client->dev.kobj, &ld6710_sink_temp_group); + if (error) + goto remove_files; + + error = sysfs_create_group(&client->dev.kobj, &ld6710_status_group); + if (error) + goto remove_files; + + /* + * register hwmon device. + */ + priv->hwmon_dev = hwmon_device_register(&client->dev); + if (IS_ERR(priv->hwmon_dev)) { + dev_err(&client->dev, "unable to register hwmon device.\n"); + error = PTR_ERR(priv->hwmon_dev); + goto remove_files; + } + + return 0; + +remove_files: + ld6710_fbx_remove_files(client); + return error; +} + +static void ld6710_fbx_remove(struct i2c_client *client) +{ + struct ld6710_priv *priv = i2c_get_clientdata(client); + + dev_info(&client->dev, "remove\n"); + + hwmon_device_unregister(priv->hwmon_dev); + ld6710_fbx_remove_files(priv->client); +} + +static const struct of_device_id ld6710_fbx_of_match[] = { + { .compatible = "leadtrend,ld6710-fbx" }, + { }, +}; +MODULE_DEVICE_TABLE(of, ld6710_fbx_of_match); + + +static const unsigned short ld6710_addrs[] = { 0x68, /* maybe some others ? */ + I2C_CLIENT_END }; + +static struct i2c_driver ld6710_fbx_driver = { + .class = I2C_CLASS_HWMON, + .driver = { + .name = "ld6710_fbx", + .of_match_table = of_match_ptr(ld6710_fbx_of_match), + }, + .probe = ld6710_fbx_probe, + .remove = ld6710_fbx_remove, + .address_list = ld6710_addrs, +}; + +module_i2c_driver(ld6710_fbx_driver); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nicolas Schichan "); --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/drivers/leds/leds-is31fl3299.c 2024-04-22 13:40:49.051834977 +0200 @@ -0,0 +1,664 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * LED driver : leds-is31fl3299.c + * + * Copyright (C) 2023 Freebox SAS + * Hancheng Yang + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +// Register addresses +#define IS31FL3299_REG_PRODUCT_ID ((u32)0x00) +#define IS31FL3299_REG_SHUTDOWN_CONTROL ((u32)0x01) +#define IS31FL3299_REG_OUTPUT_ENABLE(offset) ((u32)((offset) == 0 ? 0x02 : 0x03)) +#define IS31FL3299_REG_OPERATION_CONFIGURE ((u32)0x04) +#define IS31FL3299_REG_GLOBAL_CURRENT_CONTROL ((u32)0x07) +#define IS31FL3299_REG_HOLD_FUNCTION ((u32)0x08) +#define IS31FL3299_REG_V_BM_FUNCTION ((u32)0x09) +#define IS31FL3299_REG_PWM_FREQUENCY_ADJUST_UNLOCK ((u32)0x0B) +#define IS31FL3299_REG_PWM_FREQUENCY_ADJUST ((u32)0x0C) +#define IS31FL3299_REG_PATTERN_STATE ((u32)0x0D) +#define IS31FL3299_REG_CURRENT_LEVEL(out) ((u32)(0x10 + (out))) +#define IS31FL3299_REG_COLOR_X_OUT_Y(color, out) ((u32)(0x10 + 0x10 * (color) + (out))) +#define IS31FL3299_REG_PATTERN_TS_T1_SETTING(pat) ((u32)(0x19 + 0x10 * (pat))) +#define IS31FL3299_REG_PATTERN_T2_T3_SETTING(pat) ((u32)(0x1A + 0x10 * (pat))) +#define IS31FL3299_REG_PATTERN_TP_T4_SETTING(pat) ((u32)(0x1B + 0x10 * (pat))) +#define IS31FL3299_REG_PATTERN_COLOR_ENABLE(pat) ((u32)(0x1C + 0x10 * (pat))) +#define IS31FL3299_REG_PATTERN_COLOR_CYCLE_TIMES(pat) ((u32)(0x1D + 0x10 * (pat))) +#define IS31FL3299_REG_PATTERN_REGISTER(pat) ((u32)(0x1E + 0x10 * (pat))) +#define IS31FL3299_REG_PATTERN_LOOP_TIMES(pat) ((u32)(0x1F + 0x10 * (pat))) +#define IS31FL3299_REG_PWM ((u32)0x40) +#define IS31FL3299_REG_PWM_LOW(out) ((u32)(IS31FL3299_REG_PWM + ((out) << 1))) +#define IS31FL3299_REG_PWM_HIGH(out) ((u32)(IS31FL3299_REG_PWM + ((out) << 1) + 1)) +#define IS31FL3299_REG_COLOR_UPDATE ((u32)0x52) +#define IS31FL3299_REG_PWM_UPDATE ((u32)0x53) +#define IS31FL3299_REG_PATTERN_UPDATE(pat) ((u32)(0x54 + (pat))) +#define IS31FL3299_REG_RESET ((u32)0x5F) + +// Register Masks +#define IS31FL3299_BIT_SHUTDOWN_CONTROL_SSD ((u32)BIT(0)) +#define IS31FL3299_BIT_OPERATION_CONFIGURE_RGB ((u32)BIT(6)) + +// Const +#define IS31FL3299_VAL_APPLY ((u32)0xC5) +#define IS31FL3299_MAX_PATTERNS 3 +#define IS31FL3299_MAX_COLORS 3 +#define IS31FL3299_MODE_PWM 0 +#define IS31FL3299_MODE_PATTERN 1 +#define IS31FL3299_MODE_CURRENT 2 +#define IS31FL3299_MODE_RGB 3 +#define IS31FL3299_REPEAT_ENDLESS 0 +#define IS31FL3299_REPEAT_ONCE 1 +#define IS31FL3299_REPEAT_TWICE 2 +#define IS31FL3299_REPEAT_3_TIMES 3 + +// Config +// cf datasheet p.12, Imax=30mA*gcc/64=9.84mA if imax=0; 13.13mA if imax=1. +#define IS31FL3299_CONF_DEFAULT_GCC 0x15 +#define IS31FL3299_CONF_DEFAULT_CL 0xFF + +// utility macro +#define ldev_to_led(class) container_of(class, struct is31fl3299_led, ldev) +#define IS31FL3299_I2C_WRITE(reg, val) \ + regmap_write(priv->regmap, (reg), (val)) + +#define IS31FL3299_I2C_UPDATE(reg, mask, val) \ + regmap_update_bits(priv->regmap, (reg), (mask), (val)) + +#define IS31FL3299_I2C_READ(reg, val) \ + regmap_read(priv->regmap, (reg), (val)) + +// internal structures +struct is31fl3299_pattern { + u32 duration_ms; + u8 len; + u8 leds_map; +}; + +struct is31fl3299_led { + bool enable; + u8 led_idx; + u8 reg; + u8 cur_lvl; + u8 mode; + struct led_classdev ldev; + struct is31fl3299_priv *priv; +}; + +struct is31fl3299_hw_model { + u8 max_leds; + u8 max_patterns; + u8 max_colors; +}; + +struct is31fl3299_priv { + struct i2c_client *client; + struct regmap *regmap; + const struct is31fl3299_hw_model *model; + struct is31fl3299_led *leds; + unsigned int num_leds; + struct mutex lock; + struct is31fl3299_pattern pattern[IS31FL3299_MAX_PATTERNS]; +}; + +// global variables +static const struct is31fl3299_hw_model is31fl3299_models = { + .max_leds = 9, +}; + +static const struct of_device_id is31fl3299_of_table[] = { + { .compatible = "issi,is31fl3299", .data = &is31fl3299_models }, + {}, +}; +MODULE_DEVICE_TABLE(of, is31fl3299_of_table); + +static const struct regmap_config is31fl3299_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = IS31FL3299_REG_RESET, + .can_multi_write = true, +}; + +static int is31fl3299_reset(struct is31fl3299_priv *priv) +{ + return IS31FL3299_I2C_WRITE(IS31FL3299_REG_RESET, + IS31FL3299_VAL_APPLY); +} + +static int is31fl3299_shutdown(struct is31fl3299_priv *priv, bool shut) +{ + return IS31FL3299_I2C_UPDATE(IS31FL3299_REG_SHUTDOWN_CONTROL, + IS31FL3299_BIT_SHUTDOWN_CONTROL_SSD, + shut ? 0 : IS31FL3299_BIT_SHUTDOWN_CONTROL_SSD); +} + +static int is31fl3299_apply(struct is31fl3299_priv *priv) +{ + int err; + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_COLOR_UPDATE, + IS31FL3299_VAL_APPLY); + if (err) + return err; + return IS31FL3299_I2C_WRITE(IS31FL3299_REG_PWM_UPDATE, + IS31FL3299_VAL_APPLY); +} + +static int is31fl3299_output_enable(struct is31fl3299_led *led, bool enable) +{ + struct is31fl3299_priv *priv = led->priv; + int err; + u8 mask = BIT(led->reg % 5); + + if (led->enable == enable) + return 0; + + led->enable = enable; + /* + * for reg off set 0-4(out1-5), use enable 1, + * for others use enable 2 + */ + err = IS31FL3299_I2C_UPDATE(IS31FL3299_REG_OUTPUT_ENABLE(led->reg / 5), + mask, enable ? mask : 0); + return err; +} + +static int is31fl3299_set_mode(struct is31fl3299_led *led, u8 mode) +{ + struct is31fl3299_priv *priv = led->priv; + u8 reg_offset, bit_offset; + int err; + + if (led->mode == mode) + return 0; + + led->mode = mode; + /* RGB mode, all or none */ + if (mode == IS31FL3299_MODE_RGB) { + return IS31FL3299_I2C_UPDATE( + IS31FL3299_REG_OPERATION_CONFIGURE, + IS31FL3299_BIT_OPERATION_CONFIGURE_RGB, + IS31FL3299_BIT_OPERATION_CONFIGURE_RGB); + } + + reg_offset = led->reg / 3; + bit_offset = led->reg % 3 * 2; + + if (mode == IS31FL3299_MODE_PWM || mode == IS31FL3299_MODE_CURRENT) { + /* + * Because 0x10-0x18 serve as current control register + * as well as color1 of patterns, so we need refresh them + * if we switch to pwm/current mode. + */ + err = IS31FL3299_I2C_WRITE( + IS31FL3299_REG_CURRENT_LEVEL(led->reg), + led->cur_lvl); + if (err) + return err; + } + + return IS31FL3299_I2C_UPDATE( + IS31FL3299_REG_OPERATION_CONFIGURE + reg_offset, + 0x03 << bit_offset, + (mode & 0x03) << bit_offset); +} + +static int is31fl3299_brightness_set(struct led_classdev *led_cdev, + enum led_brightness brightness) +{ + struct is31fl3299_led *led = ldev_to_led(led_cdev); + struct is31fl3299_priv *priv = led->priv; + struct device *dev = &priv->client->dev; + u16 pwm_value = brightness << 4; // PWM range is 0-4095 + int err; + + if (led->led_idx >= priv->num_leds) { + dev_err(dev, "unknown led idx: %d\n", led->led_idx); + return -EINVAL; + } + + mutex_lock(&priv->lock); + + err = is31fl3299_output_enable(led, brightness != LED_OFF); + if (err) + goto err_out; + + err = is31fl3299_set_mode(led, IS31FL3299_MODE_PWM); + if (err) + goto err_out; + + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_PWM_LOW(led->reg), + pwm_value & 0xFF); + if (err) + goto err_out; + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_PWM_HIGH(led->reg), + pwm_value >> 8); + if (err) + goto err_out; + + // apply pwm + err = is31fl3299_apply(priv); +err_out: + mutex_unlock(&priv->lock); + return err; +} + +static void is31fl3299_destroy_devices(struct is31fl3299_priv *priv) +{ + unsigned int i; + for (i = 0; i < priv->num_leds; i++) + led_classdev_unregister(&priv->leds[i].ldev); +} + +static u8 is31fl3299_get_tx_val(u32 dur_in_ms, u32 *dur_out_ms) +{ + static const u32 dur_ms_list[] = { + 40, 160, 310, 460, 610, 920, 1250, 1920, + 2520, 3120, 3720, 5040, 6240, 7440, 8760, 9960 + }; + static const u8 list_sz = ARRAY_SIZE(dur_ms_list); + u8 val; + u32 this, next; + if (dur_in_ms < dur_ms_list[0]) + val = 0; + else if (dur_in_ms > dur_ms_list[list_sz - 1]) + val = list_sz - 1; + else { + for (val = 0; val < list_sz - 1; val++) { + this = dur_ms_list[val]; + next = dur_ms_list[val + 1]; + if (this <= dur_in_ms && dur_in_ms <= next) { + if (dur_in_ms - this <= next - dur_in_ms) + break; + else { + val++; + break; + } + } + } + } + + if (dur_out_ms) + *dur_out_ms = dur_ms_list[val]; + return val; +} + +static int is31fl3299_set_pattern_repeat(struct is31fl3299_led *led, u8 repeat) +{ + struct is31fl3299_priv *priv = led->priv; + u8 pat; + int err; + + pat = led->reg / IS31FL3299_MAX_PATTERNS; + + err = IS31FL3299_I2C_UPDATE(IS31FL3299_REG_PATTERN_REGISTER(pat), + 0xf0, + (repeat & 0x0f) << 4); + if (err) + return err; + return IS31FL3299_I2C_WRITE(IS31FL3299_REG_PATTERN_UPDATE(pat), + IS31FL3299_VAL_APPLY); +} + +static int is31fl3299_set_color_repeat(struct is31fl3299_led *led, + u8 color_id, u8 repeat) +{ + struct is31fl3299_priv *priv = led->priv; + u8 pat, bit_offset; + int err; + + /* Cf table22 datasheet */ + pat = led->reg / IS31FL3299_MAX_PATTERNS; + bit_offset = color_id * 2; + + err = IS31FL3299_I2C_UPDATE( + IS31FL3299_REG_PATTERN_COLOR_CYCLE_TIMES(pat), + 0x03 << bit_offset, + (repeat & 0x03) << bit_offset); + if (err) + return err; + return IS31FL3299_I2C_WRITE(IS31FL3299_REG_PATTERN_UPDATE(pat), + IS31FL3299_VAL_APPLY); +} + +static bool check_timing_consistency(struct led_pattern *pattern, u32 len) +{ + u32 i; + for (i = 1; i < len; i++) { + if (pattern[0].delta_t != pattern[i].delta_t) + return false; + } + return true; +} + +/* + * timing config is shared within one pattern, so for example: + * for color(brightness)1-3 of out1-3 there is only one timing config. + */ +static int is31fl3299_pattern_set(struct led_classdev *led_cdev, + struct led_pattern *pattern, + u32 len, int repeat) +{ + struct is31fl3299_led *led = ldev_to_led(led_cdev); + struct is31fl3299_priv *priv = led->priv; + struct device *dev = &priv->client->dev; + int err; + u32 i, real_t; + u8 t, pat_nb = led->reg / IS31FL3299_MAX_PATTERNS; + u8 pat_bit = BIT(led->reg % IS31FL3299_MAX_PATTERNS); + struct is31fl3299_pattern *pat = &priv->pattern[pat_nb]; + + if (led->led_idx >= priv->num_leds) { + dev_err(dev, "Bad led number: %d\n", led->led_idx); + return -EINVAL; + } + + if (len > IS31FL3299_MAX_COLORS) { + dev_err(dev, "Oversized pattern\n"); + return -EINVAL; + } + + if (!check_timing_consistency(pattern, len)) { + dev_err(dev, "Timing is not consistant in given hw_pattern\n"); + return -EINVAL; + } + + mutex_lock(&priv->lock); + + if (pat->leds_map == 0) { + pat->duration_ms = pattern[0].delta_t; + pat->len = len; + pat->leds_map = pat_bit; + } else if (pat->leds_map == pat_bit) { + pat->duration_ms = pattern[0].delta_t; + pat->len = len; + } else { + if (pat->len != len || + pat->duration_ms != pattern[0].delta_t) { + dev_err(dev, "Shared pattern conflit\n"); + err = -EINVAL; + goto err_out; + } + pat->leds_map |= pat_bit; + } + + err = is31fl3299_set_mode(led, IS31FL3299_MODE_PATTERN); + if (err) + goto err_out; + + err = is31fl3299_output_enable(led, true); + if (err) + goto err_out; + /* + * Timing configuration: + * pattern cycle = t1 + t2 + t3 + tp + * _____ + * / \ + * / \ + * / \_____ + * |t1| t2 |t3| tp | + * since min of tx = 40ms + * we make t1 = t3 = (delta - 40 x 2) / 2 + */ + t = is31fl3299_get_tx_val((pattern[0].delta_t - 80) / 2, &real_t); + dev_info(dev, "required period %dms closest %dms\n", + pattern[0].delta_t, real_t * 2 + 80); + err = IS31FL3299_I2C_WRITE( + IS31FL3299_REG_PATTERN_TS_T1_SETTING(pat_nb), + t << 4); + if (err) + goto err_out; + err = IS31FL3299_I2C_WRITE( + IS31FL3299_REG_PATTERN_T2_T3_SETTING(pat_nb), + t << 4); + if (err) + goto err_out; + err = is31fl3299_set_pattern_repeat(led, 0); // 0 for endless + if (err) + goto err_out; + + for (i = 0; i < IS31FL3299_MAX_PATTERNS; i++) { + if (i < len) { + // enable "i"th color of pattern + err = IS31FL3299_I2C_UPDATE( + IS31FL3299_REG_PATTERN_COLOR_ENABLE(pat_nb), + 0x01 << i, + 0x01 << i); + if (err) + goto err_out; + // set brightness + err = IS31FL3299_I2C_WRITE( + IS31FL3299_REG_COLOR_X_OUT_Y(i, led->reg), + pattern[i].brightness); + if (err) + goto err_out; + err= is31fl3299_set_color_repeat(led, i, 1); + if (err) + goto err_out; + } else { + // disable "i"th color of pattern + err = IS31FL3299_I2C_UPDATE( + IS31FL3299_REG_PATTERN_COLOR_ENABLE(pat_nb), + 0x01 << i, + 0); + if (err) + goto err_out; + } + } + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_PATTERN_UPDATE(pat_nb), + IS31FL3299_VAL_APPLY); + if (err) + goto err_out; + err = is31fl3299_apply(priv); +err_out: + mutex_unlock(&priv->lock); + return err; +} + +static int is31fl3299_pattern_clear(struct led_classdev *led_cdev) +{ + struct is31fl3299_led *led = ldev_to_led(led_cdev); + struct is31fl3299_priv *priv = led->priv; + + u8 brightness = led_cdev->brightness; + u16 pwm_value = brightness << 4; + u8 pat_nb = led->reg / IS31FL3299_MAX_PATTERNS; + u8 pat_bit = BIT(led->reg % IS31FL3299_MAX_PATTERNS); + struct is31fl3299_pattern *pat = &priv->pattern[pat_nb]; + int err; + + mutex_lock(&priv->lock); + + // Release shared pattern + pat->leds_map &= ~(pat_bit); + + // Restore brightness + err = is31fl3299_set_mode(led, IS31FL3299_MODE_PWM); + if (err) + goto err_out; + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_PWM_LOW(led->reg), + pwm_value & 0xFF); + if (err) + goto err_out; + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_PWM_HIGH(led->reg), + pwm_value >> 8); + if (err) + goto err_out; + err = is31fl3299_apply(priv); +err_out: + mutex_unlock(&priv->lock); + return err; +} + +static int is31fl3299_init(struct device *dev, struct is31fl3299_priv *priv) +{ + struct device_node *node, *child; + struct is31fl3299_led *led; + int cnt, err = 0; + u32 reg, enabled; + u8 cl_per_out, gcc; + + node = dev->of_node; + cnt = of_get_child_count(node); + + if (!cnt) + return 0; // No output defined in dts + + led = devm_kcalloc(dev, cnt, sizeof(*led), GFP_KERNEL); + if (!led) + return -ENOMEM; + + priv->leds = led; + + err = is31fl3299_shutdown(priv, false); + if (err) + return -EIO; + + // Set global current control(GCC) + if (of_property_read_u8(node, "current", &gcc) < 0) + gcc = IS31FL3299_CONF_DEFAULT_GCC; + dev_dbg(dev, "Global current control %d/64", gcc); + err = IS31FL3299_I2C_WRITE(IS31FL3299_REG_GLOBAL_CURRENT_CONTROL, gcc); + if (err) + return -EIO; + + for_each_child_of_node(node, child) { + led->ldev.name = of_get_property(child, "label", NULL) ? + :child->name; + led->ldev.brightness_set_blocking = is31fl3299_brightness_set; + led->ldev.max_brightness = LED_FULL; + led->ldev.default_trigger = + of_get_property(child, "linux,default-trigger", NULL); + led->ldev.pattern_set = is31fl3299_pattern_set; + led->ldev.pattern_clear = is31fl3299_pattern_clear; + err = of_property_read_u32(child, "reg", ®); + if (err != 0 || reg >= priv->model->max_leds) { + of_node_put(child); + return -EINVAL; + } + if (of_property_read_u8(child, "max-current", &cl_per_out)) + cl_per_out = IS31FL3299_CONF_DEFAULT_CL; + led->reg = reg; + led->cur_lvl = cl_per_out; + led->led_idx = priv->num_leds; + led->mode = IS31FL3299_MODE_PWM; + led->priv = priv; + enabled = 0; + err = IS31FL3299_I2C_READ( + IS31FL3299_REG_OUTPUT_ENABLE(led->reg / 5), + &enabled); + if (err) { + of_node_put(child); + return -EIO; + } + led->enable = enabled & BIT(led->reg % 5); + led->ldev.brightness = 0; + err = IS31FL3299_I2C_WRITE( + IS31FL3299_REG_CURRENT_LEVEL(led->reg), + led->cur_lvl); + if (err) { + of_node_put(child); + return -EIO; + } + dev_dbg(dev, "led %s current control: %d/255", + led->ldev.name, led->cur_lvl); + + err = led_classdev_register(dev, &led->ldev); + if (err) { + of_node_put(child); + dev_err(dev, "can't register LED %s\n", + led->ldev.name); + is31fl3299_destroy_devices(priv); + return err; + } + + priv->num_leds++; + led++; + } + return 0; +} + +static int is31fl3299_probe(struct i2c_client *client) +{ + struct device_node *np = client->dev.of_node; + const struct is31fl3299_hw_model *model; + struct device *dev = &client->dev; + int err, count; + struct is31fl3299_priv *priv; + unsigned int val; + + if (!np) + return -ENODEV; + + model = of_device_get_match_data(dev); + if (!model) + return -ENODEV; + + count = of_get_child_count(np); + if ((!count) || (count > model->max_leds)) + return -EINVAL; + + priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + /* priv initialization */ + priv->num_leds = 0; + priv->client = client; + priv->model = model; + mutex_init(&priv->lock); + priv->regmap = devm_regmap_init_i2c(client, &is31fl3299_regmap_config); + if (IS_ERR(priv->regmap)) { + err = PTR_ERR(priv->regmap); + dev_err(dev, "Failed to allocate register map: %d\n", err); + return err; + } + + err = IS31FL3299_I2C_READ(IS31FL3299_REG_PRODUCT_ID, &val); + if (err || val >> 1 != client->addr) { + dev_err(dev, "Device ID: Got 0x%x, expected 0x%x\n", + val, client->addr); + return -ENXIO; + } + + dev_info(dev, "device identified\n"); + + i2c_set_clientdata(client, priv); + + return is31fl3299_init(dev, priv); +} + +static void is31fl3299_remove(struct i2c_client *client) +{ + struct is31fl3299_priv *priv = i2c_get_clientdata(client); + struct device *dev = &client->dev; + + is31fl3299_destroy_devices(priv); + is31fl3299_reset(priv); + + mutex_destroy(&priv->lock); + + dev_info(dev, "Remove is31fl3299 driver"); +} + +static struct i2c_driver is31fl3299_driver = { + .driver = { + .name = "is31fl3299", + .of_match_table = of_match_ptr(is31fl3299_of_table), + }, + .probe_new = is31fl3299_probe, + .remove = is31fl3299_remove, +}; + +module_i2c_driver(is31fl3299_driver); + +MODULE_AUTHOR("Hancheng Yang "); +MODULE_DESCRIPTION("LUMISSIL IS31FL3299 led driver"); +MODULE_LICENSE("GPL"); --- /dev/null 2024-03-28 18:35:30.816070989 +0100 +++ linux-6.4-fbx/drivers/leds/leds-led1202.c 2024-04-22 13:40:49.051834977 +0200 @@ -0,0 +1,907 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * LED driver : leds-led1202.c + * + * Copyright (C) 2019 Freebox SAS + * Henri Buyse + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +/** + * @brief Maximal number of LEDs that can be driven by the LED1202 + * + */ +#define LED1202_MAX_LEDS 12 +#define LED1202_FORM_DEVICE_ID(prod_id, rev_id) \ + ((unsigned int)(((prod_id) << 4) | (rev_id))) + +/** + * @brief Register addresses + */ +#define LED1202_REG_DEVICE_ID 0x00 +#define LED1202_REG_DEVICE_ENABLE 0x01 +#define LED1202_REG_DEVICE_ENABLE_ENABLE_MASK 1 +#define LED1202_REG_DEVICE_ENABLE_RESET_MASK (1 << 7) +#define LED1202_REG_CHANNEL_ENABLE_LOW 0x02 +#define LED1202_REG_CHANNEL_ENABLE_HIGH 0x03 +#define LED1202_REG_CONFIGURATION 0x04 +#define LED1202_REG_CONFIGURATION_PATSR_MASK (1 << 6) +#define LED1202_REG_CONFIGURATION_PATS_MASK (1 << 7) +#define LED1202_REG_FAULT_STATUS_MASK 0x05 +#define LED1202_REG_FAULT_STATUS_INTERRUPT 0x06 +#define LED1202_REG_OPEN_LED_LOW 0x07 +#define LED1202_REG_OPEN_LED_HIGH 0x08 +#define LED1202_REG_CSX_LED_CURRENT(led_no) (0x09 + (led_no)) // 0x09 -> 0x14 +#define LED1202_REG_PATTERN_SEQUENCE_REPETITION 0x15 +#define LED1202_REG_PATTERN_Y_DURATION_TIME(pattern) \ + (0x16 + (pattern)) // 0x16 -> 0x1d +// 0x1e -> 0xdd +#define LED1202_REG_PATTERN_Y_CSX_PWM_LOW(led_no, pattern) \ + (0x1e + (2 * (led_no)) + \ + (0x18 * (pattern))) // See table 22 in led1202 datasheet +#define LED1202_REG_PATTERN_Y_CSX_PWM_HIGH(led_no, pattern) \ + (0x1e + 0x01 + (2 * (led_no)) + \ + (0x18 * (pattern))) // See table 23 in led1202 datasheet +// 0xde ? +// 0xdf ? +#define LED1202_REG_CLOCK_CONFIGURATION 0xe0 + +#define LED1202_MAX_PATTERNS 8 +#define LED1202_DELTA_T_MIN 23 // 22.2ms +#define LED1202_DELTA_T_MAX 5660 // 255 * 22.2 +#define LED1202_MAX_INTERRUPTS_NB \ + 15 // Overtemperature + all open led (12) + pattern finished + start of pwm frame + +#define LED1202_INTERRUPT_CHIP_OVER_TEMPERATURE 0x000001 +#define LED1202_INTERRUPT_OPEN_LED_DETECTION 0x000002 +#define LED1202_INTERRUPT_PATTERN_SEQUENCE_FINISHED 0x000004 +#define LED1202_INTERRUPT_START_OF_PWM_FRAME 0x000008 + +#define LED1202_INTERRUPT_OPEN_LED_CS0 0x00010000 +#define LED1202_INTERRUPT_OPEN_LED_CS1 0x00020000 +#define LED1202_INTERRUPT_OPEN_LED_CS2 0x00040000 +#define LED1202_INTERRUPT_OPEN_LED_CS3 0x00080000 +#define LED1202_INTERRUPT_OPEN_LED_CS4 0x00100000 +#define LED1202_INTERRUPT_OPEN_LED_CS5 0x00200000 +#define LED1202_INTERRUPT_OPEN_LED_CS6 0x00400000 +#define LED1202_INTERRUPT_OPEN_LED_CS7 0x00800000 +#define LED1202_INTERRUPT_OPEN_LED_CS8 0x01000000 +#define LED1202_INTERRUPT_OPEN_LED_CS9 0x02000000 +#define LED1202_INTERRUPT_OPEN_LED_CS10 0x04000000 +#define LED1202_INTERRUPT_OPEN_LED_CS11 0x08000000 + +#define ldev_to_led(class) container_of(class, struct led1202_led, ldev) + +struct led1202_led { + // bool active; + bool enable; + unsigned int led_no; + unsigned int reg; + struct led_classdev ldev; + struct led1202_priv *priv; +}; + +struct led1202_priv { + struct i2c_client *client; + struct regmap *regmap; + struct input_dev *idev; + + const struct led1202_hw_model *model; + + struct led1202_led *leds; + unsigned int num_leds; +}; + +struct led1202_hw_model { + unsigned int max_leds; + unsigned int product_id; + unsigned int revision_id; +}; + +static const struct led1202_hw_model led1202_models[] = { + { .max_leds = 12, .product_id = 0x01, .revision_id = 0x02 }, +}; + +static const struct regmap_config led1202_regmap_config = { + .reg_bits = 8, // Number of bits in a register address, mandatory. + .val_bits = 8, // Number of bits in a register value, mandatory. + .max_register = + LED1202_REG_CLOCK_CONFIGURATION, // Maximal register addr: Clock configuration register + .can_multi_write = true, // to write multiple values in one row +}; + +/** + * @brief Enable / disable the LED1202 device. + * + * @param priv LED1202 structure handling the regmap. + * + * @return A value of zero will be returned on success, a negative errno will + * be returned in error cases. + */ +static int led1202_activate_device(struct led1202_priv *priv, bool activation) +{ + int err = -1; + struct device *dev = &priv->client->dev; + + // activate/deactivate device + err = regmap_update_bits(priv->regmap, LED1202_REG_DEVICE_ENABLE, + LED1202_REG_DEVICE_ENABLE_ENABLE_MASK, + (activation) ? + LED1202_REG_DEVICE_ENABLE_ENABLE_MASK : + 0); + + if (err < 0) + dev_err(dev, "can't %s the device (reg: 0x%02x)\n", + (activation) ? "enable" : "disable", + LED1202_REG_DEVICE_ENABLE); + else + dev_dbg(dev, "device %s\n", (activation) ? "enabled" : "disabled"); + + return err; +} + +/** + * @brief Reset the LED1202 device. + * + * @param priv LED1202 structure handling the regmap. + * + * @return A value of zero will be returned on success, a negative errno will + * be returned in error cases. + */ +static int led1202_reset_device(struct led1202_priv *priv) +{ + int err = -1; + struct device *dev = &priv->client->dev; + + // reset the device + err = regmap_update_bits(priv->regmap, LED1202_REG_DEVICE_ENABLE, + LED1202_REG_DEVICE_ENABLE_RESET_MASK, + LED1202_REG_DEVICE_ENABLE_RESET_MASK); + + if (err < 0) + dev_err(dev, "can't reset the device (reg: 0x%02x)\n", + LED1202_REG_DEVICE_ENABLE); + else + dev_dbg(dev, "device resetted\n"); + + return err; +} + +/** + * @brief Enable a LED. + * + * @param led Structure handling a led + * + * @return On success, returns 0. On error, returns -1. + */ +static int led1202_channel_enable(struct led1202_led *led, bool state) +{ + int ret = -1; + struct led1202_priv *priv = led->priv; + struct device *dev = &priv->client->dev; + const char *led_name = led->ldev.name; + unsigned int led_no = led->led_no; + unsigned int reg = led->reg; + unsigned int addr = 0; + unsigned int mask = 0; + unsigned int val = 0; + + if (led_no >= priv->num_leds) { + return -EINVAL; // Invalid argument + } + + // Check if the LED is already enable/disabled + if (led->enable == state) { + dev_dbg(dev, "led %s is already %s\n", led->ldev.name, (state) ? "enabled":"disabled"); + return 0; + } + + addr = (reg < 8) ? LED1202_REG_CHANNEL_ENABLE_LOW : + LED1202_REG_CHANNEL_ENABLE_HIGH; + mask = (reg < 8) ? (1 << reg) : (1 << (reg - 8)); + val = (reg < 8) ? (state << reg) : (state << (reg - 8)); + + if ((ret = regmap_update_bits(led->priv->regmap, addr, mask, val)) < 0) { + dev_err(dev, + "can't enable %s led (#%d, reg: 0x%02x, mask: 0x%02x)\n", + led_name, reg, addr, mask); + } else { + led->enable = state; + dev_dbg(dev, "channel %s %s\n", led_name, (state) ? "enabled":"disabled"); + } + + return ret; +} + +/** + * @brief Callback that set the brightness of a led. + * @details To modify the brightness of a led, we have to pass throught the + * /sys/class/leds/