diff -ruw linux-6.13.12/Makefile linux-6.13.12-fbx/Makefile --- linux-6.13.12/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/Makefile 2025-09-29 14:36:10.165612915 +0200 @@ -401,6 +401,8 @@ # CROSS_COMPILE can be set on the command line # make CROSS_COMPILE=aarch64-linux-gnu- # 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) @@ -438,6 +440,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 @@ -1053,6 +1058,9 @@ KBUILD_CFLAGS-$(CONFIG_CC_NO_STRINGOP_OVERFLOW) += $(call cc-option, -Wno-stringop-overflow) KBUILD_CFLAGS-$(CONFIG_CC_STRINGOP_OVERFLOW) += $(call cc-option, -Wstringop-overflow) +#Currently, disable -Wunterminated-string-initialization as broken +KBUILD_CFLAGS += $(call cc-option, -Wno-unterminated-string-initialization) + # disable invalid "can't wrap" optimizations for signed / pointers KBUILD_CFLAGS += -fno-strict-overflow @@ -1350,7 +1358,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.13.12/arch/arm64/Kconfig linux-6.13.12-fbx/arch/arm64/Kconfig --- linux-6.13.12/arch/arm64/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/Kconfig 2025-09-29 14:36:10.165612915 +0200 @@ -2506,4 +2506,3 @@ source "drivers/acpi/Kconfig" source "arch/arm64/kvm/Kconfig" - diff -ruw linux-6.13.12/arch/arm64/Kconfig.platforms linux-6.13.12-fbx/arch/arm64/Kconfig.platforms --- linux-6.13.12/arch/arm64/Kconfig.platforms 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/Kconfig.platforms 2025-09-25 17:40:30.187340548 +0200 @@ -70,6 +70,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. @@ -85,6 +87,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 @@ -101,6 +111,35 @@ help This enables support for the Bitmain SoC Family. +config ARCH_CORTINA + bool + select SOC_BUS + +config ARCH_CORTINA_ACCESS + bool "Cortina Access SoC Platforms" + select ARCH_CORTINA + help + This enables support for Cortina-Access SoC Family + +config CORTINA_SMCC + bool + help + SMC call for Cortina ARMv8 platform + +choice + prompt "Cortina Access Arch Type" + default ARCH_CORTINA_VENUS + depends on ARCH_CORTINA_ACCESS + +config ARCH_CORTINA_VENUS + bool "Venus" + select GENERIC_IRQ_CHIP + select CORTINA_SMCC + help + This is Cortina Access Venus SoC (CA8289) + +endchoice + config ARCH_EXYNOS bool "Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG @@ -270,6 +309,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.13.12/arch/arm64/boot/Makefile linux-6.13.12-fbx/arch/arm64/boot/Makefile --- linux-6.13.12/arch/arm64/boot/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/Makefile 2025-09-25 17:40:30.187340548 +0200 @@ -55,3 +55,5 @@ $(NM) vmlinux|grep _kernel_codesize|cut -d' ' -f1) include $(srctree)/drivers/firmware/efi/libstub/Makefile.zboot + +subdir-y += dts/ diff -ruw linux-6.13.12/arch/arm64/boot/dts/Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/Makefile --- linux-6.13.12/arch/arm64/boot/dts/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/Makefile 2025-09-25 17:40:30.187340548 +0200 @@ -12,6 +12,7 @@ subdir-y += bitmain subdir-y += broadcom subdir-y += cavium +subdir-y += cortina-access subdir-y += exynos subdir-y += freescale subdir-y += hisilicon diff -ruw linux-6.13.12/arch/arm64/boot/dts/amlogic/Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/amlogic/Makefile --- linux-6.13.12/arch/arm64/boot/dts/amlogic/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/amlogic/Makefile 2025-09-25 17:40:30.195340588 +0200 @@ -10,6 +10,12 @@ 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 += -@ +fbx-boards += \ + fbxwmr.dtb \ + fbxwmr-r1.dtb fbxwmr-r2.dtb \ + fbxwmr-r3.dtb fbxwmr-r4.dtb +dtb-$(CONFIG_ARCH_MESON) += $(fbx-boards) dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-fbx8am-brcm.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-fbx8am-realtek.dtb diff -ruw linux-6.13.12/arch/arm64/boot/dts/broadcom/Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/broadcom/Makefile --- linux-6.13.12/arch/arm64/boot/dts/broadcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/broadcom/Makefile 2025-09-25 17:40:30.215340687 +0200 @@ -16,3 +16,4 @@ subdir-y += bcmbca subdir-y += northstar2 subdir-y += stingray +subdir-y += bcm63xx diff -ruw linux-6.13.12/arch/arm64/boot/dts/marvell/Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/Makefile --- linux-6.13.12/arch/arm64/boot/dts/marvell/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/Makefile 2025-09-25 17:40:30.259340905 +0200 @@ -28,7 +28,19 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += ac5x-rd-carrier-cn9131.dtb dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-base.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-pro.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9131-cf-solidwan.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9132-clearfog.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.13.12/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi --- linux-6.13.12/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/armada-ap80x.dtsi 2025-09-25 17:40:30.267340945 +0200 @@ -291,6 +291,11 @@ }; }; + ap_hwmon: ap806-hwmon@6f8084 { + compatible = "marvell,ap806-hwmon"; + reg = <0x6f8084 0xc>; + }; + ap_syscon1: system-controller@6f8000 { compatible = "syscon", "simple-mfd"; reg = <0x6f8000 0x1000>; diff -ruw linux-6.13.12/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi --- linux-6.13.12/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/armada-cp11x.dtsi 2025-09-25 17:40:30.271340965 +0200 @@ -58,8 +58,6 @@ ranges = <0x0 0x0 ADDRESSIFY(CP11X_BASE) 0x2000000>; CP11X_LABEL(ethernet): ethernet@0 { - #address-cells = <1>; - #size-cells = <0>; compatible = "marvell,armada-7k-pp22"; reg = <0x0 0x100000>, <0x129000 0xb000>, <0x220000 0x800>; clocks = <&CP11X_LABEL(clk) 1 3>, <&CP11X_LABEL(clk) 1 9>, @@ -71,7 +69,7 @@ status = "disabled"; dma-coherent; - CP11X_LABEL(eth0): ethernet-port@0 { + CP11X_LABEL(eth0): eth0 { interrupts = <39 IRQ_TYPE_LEVEL_HIGH>, <43 IRQ_TYPE_LEVEL_HIGH>, <47 IRQ_TYPE_LEVEL_HIGH>, @@ -85,13 +83,12 @@ interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - reg = <0>; - port-id = <0>; /* For backward compatibility. */ + port-id = <0>; gop-port-id = <0>; status = "disabled"; }; - CP11X_LABEL(eth1): ethernet-port@1 { + CP11X_LABEL(eth1): eth1 { interrupts = <40 IRQ_TYPE_LEVEL_HIGH>, <44 IRQ_TYPE_LEVEL_HIGH>, <48 IRQ_TYPE_LEVEL_HIGH>, @@ -105,13 +102,12 @@ interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - reg = <1>; - port-id = <1>; /* For backward compatibility. */ + port-id = <1>; gop-port-id = <2>; status = "disabled"; }; - CP11X_LABEL(eth2): ethernet-port@2 { + CP11X_LABEL(eth2): eth2 { interrupts = <41 IRQ_TYPE_LEVEL_HIGH>, <45 IRQ_TYPE_LEVEL_HIGH>, <49 IRQ_TYPE_LEVEL_HIGH>, @@ -125,8 +121,7 @@ interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - reg = <2>; - port-id = <2>; /* For backward compatibility. */ + port-id = <2>; gop-port-id = <3>; status = "disabled"; }; @@ -137,10 +132,13 @@ reg = <0x120000 0x6000>; marvell,system-controller = <&CP11X_LABEL(syscon0)>; clocks = <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>, - <&CP11X_LABEL(clk) 1 18>; - clock-names = "mg_clk", "mg_core_clk", "axi_clk"; + <&CP11X_LABEL(clk) 1 18>, <&CP11X_LABEL(clk) 1 9>; + clock-names = "mg_clk", "mg_core_clk", "axi_clk", "gop_clk"; #address-cells = <1>; #size-cells = <0>; + marvell,cp_mgmt = <&CP11X_LABEL(syscon1)>; + /* always use Master CP S@R */ + marvell,sar = <&cp0_syscon1>; CP11X_LABEL(comphy0): phy@0 { reg = <0>; @@ -354,6 +352,14 @@ }; }; + CP11X_LABEL(utmi_fbx): utmi@580000-fbx { + compatible = "marvell,cp110-utmi-phy-fbx"; + #phy-cells = <1>; + reg = <0x580000 0x2000>; + reg-names = "utmi-unit"; + marvell,system-controller = <&CP11X_LABEL(syscon0)>; + }; + CP11X_LABEL(xor0): xor@6a0000 { compatible = "marvell,armada-7k-xor", "marvell,xor-v2"; reg = <0x6a0000 0x1000>, <0x6b0000 0x1000>; @@ -396,6 +402,12 @@ status = "disabled"; }; + CP11X_LABEL(hwmon): cp110-hwmon@0x400070 { + compatible = "marvell,cp110-hwmon"; + reg = <0x400070 0xc>; + }; + + CP11X_LABEL(i2c0): i2c@701000 { compatible = "marvell,mv78230-i2c"; reg = <0x701000 0x20>; @@ -420,6 +432,16 @@ status = "disabled"; }; + CP11X_LABEL(mss_i2c): i2c@211000 { + compatible = "marvell,mv64xxx-i2c"; + reg = <0x211000 0x20>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&CP11X_LABEL(clk) 1 21>; + status = "disabled"; + }; + CP11X_LABEL(uart0): serial@702000 { compatible = "snps,dw-apb-uart"; reg = <0x702000 0x100>; @@ -489,8 +511,8 @@ CP11X_LABEL(trng): trng@760000 { compatible = "marvell,armada-8k-rng", - "inside-secure,safexcel-eip76"; - reg = <0x760000 0x7d>; + "inside-secure,safexcel-eip150"; + reg = <0x760000 0x10000>; interrupts = <95 IRQ_TYPE_LEVEL_HIGH>; clock-names = "core", "reg"; clocks = <&CP11X_LABEL(clk) 1 25>, @@ -524,6 +546,19 @@ <&CP11X_LABEL(clk) 1 17>; dma-coherent; }; + + CP11X_LABEL(tdm0): tdmmc@7a0000 { + compatible = "marvell,armada-a8k-tdm"; + reg = <0x7a0000 0x20000>, + <0x440400 0x20>; + reg-names = "tdm_regs", "pll_regs"; + interrupts = <111 IRQ_TYPE_LEVEL_HIGH>, + <112 IRQ_TYPE_LEVEL_HIGH>, + <113 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&CP11X_LABEL(clk) 1 1>; + clock-names = "gateclk"; + status = "disabled"; + }; }; CP11X_LABEL(pcie0): pcie@CP11X_PCIE0_BASE { diff -ruw linux-6.13.12/arch/arm64/boot/dts/qcom/Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/qcom/Makefile --- linux-6.13.12/arch/arm64/boot/dts/qcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/qcom/Makefile 2025-09-25 17:40:30.291341064 +0200 @@ -1,288 +1,302 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-sbc.dtb apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8016-schneider-hmibsc.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.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) += ipq5018-rdp432-c2.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5018-tplink-archer-ax55-v1.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp441.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp442.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp474.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-rdp418.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp454.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.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-lg-c50.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-lg-m216.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-harpia.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-osprey.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-surnia.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-gprimeltecan.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-grandmax.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-grandprimelte.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt510.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt58.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j3ltetw.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5x.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-rossa.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-wt86518.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt86528.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8929-wingtech-wt82918hd.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-huawei-kiwi.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-longcheer-l9100.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-samsung-a7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-wingtech-wt82918.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-wingtech-wt82918hd.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-lg-h815.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) += qcm6490-fairphone-fp5.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcm6490-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcm6490-shift-otter.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.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_DTB) += apq8016-sbc-usb-host.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-sbc-d3-camera-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-schneider-hmibsc.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8039-t2.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) += ipq5018-rdp432-c2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5018-tplink-archer-ax55-v1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp441.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp442.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp468.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp474.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-rdp453.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp454.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8216-samsung-fortuna3g.dtb +dtb-$(CONFIG_ARCH_QCOM_FBX_DTB) += fbxgw9r.dtb jbxgw9r.dtb fbxgw9r-ltd.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-lg-c50.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-lg-m216.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-motorola-harpia.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-motorola-osprey.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-motorola-surnia.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-gprimeltecan.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-grandmax.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-grandprimelte.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-j3ltetw.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-rossa.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-wt86518.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-wingtech-wt86528.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-wingtech-wt88047.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-yiming-uz801v3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8929-wingtech-wt82918hd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-huawei-kiwi.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-longcheer-l9100.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-samsung-a7.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-sony-xperia-kanuti-tulip.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-wingtech-wt82918.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-wingtech-wt82918hd.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-lg-h815.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) += qcm6490-fairphone-fp5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcm6490-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcm6490-shift-otter.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-1000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-4000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs6490-rb3gen2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs8550-aim300-aiot.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs9100-ride.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs9100-ride-r3.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 qrb5165-rb5-vision-mezzanine-dtbs := qrb5165-rb5.dtb qrb5165-rb5-vision-mezzanine.dtbo -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) += sa8775p-ride-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.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-r10.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-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-r10.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-lazor-limozeen-nots-r10.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) += sc8180x-lenovo-flex-5g.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8180x-primus.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-lenovo-thinkpad-x13s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-microsoft-arcata.dtb -dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm450-lenovo-tbx605f.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_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) += sa8775p-ride-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-acer-aspire1.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-r10.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r10-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r10-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-r10.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-lazor-limozeen-nots-r10.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) += sc8180x-lenovo-flex-5g.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8180x-primus.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-lenovo-thinkpad-x13s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-microsoft-arcata.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sda660-inforce-ifc6560.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm450-lenovo-tbx605f.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 sdm845-db845c-navigation-mezzanine-dtbs := sdm845-db845c.dtb sdm845-db845c-navigation-mezzanine.dtbo -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) += sdx75-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm4450-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6115-fxtec-pro1x.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) += sm7125-xiaomi-curtana.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-joyeuse.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7325-nothing-spacewar.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) += sm8250-xiaomi-pipa.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-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-samsung-q5q.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-sony-xperia-yodo-pdx234.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) += sdx75-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm4250-oneplus-billie2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm4450-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6115-fxtec-pro1x.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) += sm7125-xiaomi-curtana.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7125-xiaomi-joyeuse.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7225-fairphone-fp4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7325-nothing-spacewar.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) += sm8250-xiaomi-pipa.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-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-samsung-q5q.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-sony-xperia-yodo-pdx234.dtb sm8650-hdk-display-card-dtbs := sm8650-hdk.dtb sm8650-hdk-display-card.dtbo -dtb-$(CONFIG_ARCH_QCOM) += sm8650-hdk-display-card.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8650-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8650-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8650-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e78100-lenovo-thinkpad-t14s.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-asus-vivobook-s15.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-dell-xps13-9345.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-lenovo-yoga-slim7x.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-microsoft-romulus13.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-microsoft-romulus15.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-qcp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-hdk-display-card.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e78100-lenovo-thinkpad-t14s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-asus-vivobook-s15.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-dell-xps13-9345.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-lenovo-yoga-slim7x.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-microsoft-romulus13.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-microsoft-romulus15.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-qcp.dtb + +always-$(CONFIG_ARCH_QCOM_FBX_DTB) += fbxgw9r_dtbs +clean-files += fbxgw9r_dtbs +board-dtbs = \ + fbxgw9r.dtb \ + fbxgw9r-ltd.dtb \ + jbxgw9r.dtb + +cmd_dtbs = ./scripts/dtbs.sh $@ $^ +quiet_cmd_dtbs = DTBS $@ + +$(obj)/fbxgw9r_dtbs: $(addprefix $(obj)/,$(board-dtbs)) + $(call cmd,dtbs) diff -ruw linux-6.13.12/arch/arm64/include/asm/assembler.h linux-6.13.12-fbx/arch/arm64/include/asm/assembler.h --- linux-6.13.12/arch/arm64/include/asm/assembler.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/include/asm/assembler.h 2025-09-25 17:40:30.419341699 +0200 @@ -404,6 +404,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.13.12/arch/arm64/include/asm/cacheflush.h linux-6.13.12-fbx/arch/arm64/include/asm/cacheflush.h --- linux-6.13.12/arch/arm64/include/asm/cacheflush.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/include/asm/cacheflush.h 2025-09-25 17:40:30.419341699 +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.13.12/arch/arm64/include/asm/memory.h linux-6.13.12-fbx/arch/arm64/include/asm/memory.h --- linux-6.13.12/arch/arm64/include/asm/memory.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/include/asm/memory.h 2025-09-25 17:40:30.431341758 +0200 @@ -104,7 +104,7 @@ #define _KASAN_SHADOW_START(va) (KASAN_SHADOW_END - (UL(1) << ((va) - KASAN_SHADOW_SCALE_SHIFT))) #define KASAN_SHADOW_START _KASAN_SHADOW_START(vabits_actual) #define PAGE_END KASAN_SHADOW_START -#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.13.12/arch/arm64/include/asm/pgtable-hwdef.h linux-6.13.12-fbx/arch/arm64/include/asm/pgtable-hwdef.h --- linux-6.13.12/arch/arm64/include/asm/pgtable-hwdef.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/include/asm/pgtable-hwdef.h 2025-09-25 17:40:30.435341778 +0200 @@ -165,7 +165,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 */ @@ -283,12 +287,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.13.12/arch/arm64/mm/cache.S linux-6.13.12-fbx/arch/arm64/mm/cache.S --- linux-6.13.12/arch/arm64/mm/cache.S 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/mm/cache.S 2025-09-25 17:40:30.511342155 +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.13.12/arch/arm64/mm/flush.c linux-6.13.12-fbx/arch/arm64/mm/flush.c --- linux-6.13.12/arch/arm64/mm/flush.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/arch/arm64/mm/flush.c 2025-09-25 17:40:30.511342155 +0200 @@ -100,3 +100,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.13.12/block/blk-flush.c linux-6.13.12-fbx/block/blk-flush.c --- linux-6.13.12/block/blk-flush.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/blk-flush.c 2025-09-25 17:40:31.115345150 +0200 @@ -157,10 +157,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.13.12/block/blk-mq.c linux-6.13.12-fbx/block/blk-mq.c --- linux-6.13.12/block/blk-mq.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/blk-mq.c 2025-09-25 17:40:31.119345170 +0200 @@ -1031,7 +1031,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) { trace_block_io_done(req); @@ -1049,6 +1049,8 @@ part_stat_add(req->part, nsecs[sgrp], now - req->start_time_ns); part_stat_local_dec(req->part, in_flight[op_is_write(req_op(req))]); + if (error) + part_stat_inc(req->part, io_errors[rq_data_dir(req)]); part_stat_unlock(); } } @@ -1112,19 +1114,19 @@ part_stat_unlock(); } -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, blk_time_get_ns()); + __blk_mq_end_request_acct(rq, blk_time_get_ns(), error); blk_mq_finish_request(rq); @@ -1175,7 +1177,7 @@ blk_complete_request(rq); if (iob->need_ts) - __blk_mq_end_request_acct(rq, now); + __blk_mq_end_request_acct(rq, now, 0); blk_mq_finish_request(rq); @@ -3232,7 +3234,7 @@ blk_mq_run_dispatch_ops(q, ret = blk_mq_request_issue_directly(rq, true)); if (ret) - blk_account_io_done(rq, blk_time_get_ns()); + blk_account_io_done(rq, blk_time_get_ns(), 0); return ret; } EXPORT_SYMBOL_GPL(blk_insert_cloned_request); diff -ruw linux-6.13.12/block/genhd.c linux-6.13.12-fbx/block/genhd.c --- linux-6.13.12/block/genhd.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/genhd.c 2025-09-25 17:40:31.123345189 +0200 @@ -1004,6 +1004,7 @@ "%8u %8u %8u " "%8lu %8lu %8llu %8u " "%8lu %8u" + "%8lu %8lu" "\n", stat.ios[STAT_READ], stat.merges[STAT_READ], @@ -1025,7 +1026,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.13.12/block/partitions/Kconfig linux-6.13.12-fbx/block/partitions/Kconfig --- linux-6.13.12/block/partitions/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/partitions/Kconfig 2025-09-25 17:40:31.127345209 +0200 @@ -279,4 +279,9 @@ The format for the device tree node is just like MTD fixed-partition schema. +config OF_PARTITION_IGNORE_RO + bool "ignore read-only flag" + depends on OF_PARTITION + select MMC_BLOCK_IGNORE_RO_AREA if MMC_BLOCK + endmenu diff -ruw linux-6.13.12/block/partitions/Makefile linux-6.13.12-fbx/block/partitions/Makefile --- linux-6.13.12/block/partitions/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/partitions/Makefile 2025-09-25 17:40:31.127345209 +0200 @@ -12,7 +12,6 @@ obj-$(CONFIG_MAC_PARTITION) += mac.o obj-$(CONFIG_LDM_PARTITION) += ldm.o obj-$(CONFIG_MSDOS_PARTITION) += msdos.o -obj-$(CONFIG_OF_PARTITION) += of.o obj-$(CONFIG_OSF_PARTITION) += osf.o obj-$(CONFIG_SGI_PARTITION) += sgi.o obj-$(CONFIG_SUN_PARTITION) += sun.o @@ -21,3 +20,5 @@ obj-$(CONFIG_EFI_PARTITION) += efi.o obj-$(CONFIG_KARMA_PARTITION) += karma.o obj-$(CONFIG_SYSV68_PARTITION) += sysv68.o +#obj-$(CONFIG_OF_PARTITION) += of.o +obj-$(CONFIG_OF_PARTITION) += dt.o diff -ruw linux-6.13.12/block/partitions/check.h linux-6.13.12-fbx/block/partitions/check.h --- linux-6.13.12/block/partitions/check.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/partitions/check.h 2025-09-25 17:40:31.127345209 +0200 @@ -68,3 +68,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.13.12/block/partitions/core.c linux-6.13.12-fbx/block/partitions/core.c --- linux-6.13.12/block/partitions/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/block/partitions/core.c 2025-09-25 17:40:31.127345209 +0200 @@ -44,7 +44,7 @@ cmdline_partition, #endif #ifdef CONFIG_OF_PARTITION - of_partition, /* cmdline have priority to OF */ + dt_partition, /* cmdline have priority to OF */ #endif #ifdef CONFIG_EFI_PARTITION efi_partition, /* this must come before msdos */ diff -ruw linux-6.13.12/drivers/Kconfig linux-6.13.12-fbx/drivers/Kconfig --- linux-6.13.12/drivers/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/Kconfig 2025-09-25 17:40:31.179345467 +0200 @@ -23,6 +23,8 @@ source "drivers/gnss/Kconfig" +source "drivers/fbxprocfs/Kconfig" + source "drivers/mtd/Kconfig" source "drivers/of/Kconfig" @@ -79,6 +81,10 @@ source "drivers/gpio/Kconfig" +source "drivers/fbxgpio/Kconfig" + +source "drivers/fbxjtag/Kconfig" + source "drivers/w1/Kconfig" source "drivers/power/Kconfig" @@ -87,6 +93,8 @@ source "drivers/thermal/Kconfig" +source "drivers/fbxwatchdog/Kconfig" + source "drivers/watchdog/Kconfig" source "drivers/ssb/Kconfig" diff -ruw linux-6.13.12/drivers/Makefile linux-6.13.12-fbx/drivers/Makefile --- linux-6.13.12/drivers/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/Makefile 2025-09-25 17:40:31.179345467 +0200 @@ -20,7 +20,9 @@ # LEDs must come before PCI, it is needed by NPEM driver obj-y += leds/ +obj-$(CONFIG_FREEBOX_GPIO) += fbxgpio/ obj-y += pci/ +obj-$(CONFIG_FREEBOX_JTAG) += fbxjtag/ obj-$(CONFIG_PARISC) += parisc/ obj-$(CONFIG_RAPIDIO) += rapidio/ @@ -120,6 +122,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_DPLL) += dpll/ obj-$(CONFIG_S390) += s390/ + +obj-$(CONFIG_FREEBOX_PROCFS) += fbxprocfs/ diff -ruw linux-6.13.12/drivers/ata/ahci.h linux-6.13.12-fbx/drivers/ata/ahci.h --- linux-6.13.12/drivers/ata/ahci.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/ata/ahci.h 2025-09-25 17:40:31.251345824 +0200 @@ -378,6 +378,9 @@ /* only required for per-port MSI(-X) support */ int (*get_irq_vector)(struct ata_host *host, int port); + + u32 comreset_u; + u32 comwake; }; extern int ahci_ignore_sss; diff -ruw linux-6.13.12/drivers/ata/ahci_mvebu.c linux-6.13.12-fbx/drivers/ata/ahci_mvebu.c --- linux-6.13.12/drivers/ata/ahci_mvebu.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/ata/ahci_mvebu.c 2025-09-25 17:40:31.251345824 +0200 @@ -17,6 +17,7 @@ #include #include #include + #include "ahci.h" #define DRV_NAME "ahci-mvebu" @@ -67,6 +68,41 @@ writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA); } +#define PORT_INDIRECT_PHY_ADDR(__p) ((__p) * 0x80 + 0x178) +#define PORT_INDIRECT_PHY_DATA(__p) ((__p) * 0x80 + 0x17c) + +#define INDIRECT_PHY_CONTROL 0x0a +#define INDIRECT_PHY_CTRL_NEG_RX_CLK (1 << 13) +#define INDIRECT_PHY_CTRL_NEG_TX_CLK (1 << 12) + +static inline void indirect_phy_write(void __iomem *mmio, int port, + u32 value, u32 phy_off) +{ + writel(phy_off, mmio + PORT_INDIRECT_PHY_ADDR(port)); + writel(value, mmio + PORT_INDIRECT_PHY_DATA(port)); +} + +static inline u32 indirect_phy_read(void __iomem *mmio, int port, u32 phy_off) +{ + writel(phy_off, mmio + PORT_INDIRECT_PHY_ADDR(port)); + return readl(mmio + PORT_INDIRECT_PHY_DATA(port)); +} + +static void ahci_mvebu_tune_clk_edge(struct ahci_host_priv *hpriv) +{ + int i; + + for (i = 0; i < hpriv->nports; ++i) { + u32 v; + + pr_debug("inverting RX/TX clk on port %d\n", i); + v = indirect_phy_read(hpriv->mmio, i, INDIRECT_PHY_CONTROL); + v &= ~INDIRECT_PHY_CTRL_NEG_TX_CLK; + v &= ~INDIRECT_PHY_CTRL_NEG_RX_CLK; + indirect_phy_write(hpriv->mmio, i, v, INDIRECT_PHY_CONTROL); + } +} + static int ahci_mvebu_armada_380_config(struct ahci_host_priv *hpriv) { const struct mbus_dram_target_info *dram; @@ -96,6 +132,13 @@ return 0; } +static int ahci_mvebu_armada_8k_config(struct ahci_host_priv *hpriv) +{ + ahci_mvebu_regret_option(hpriv); + ahci_mvebu_tune_clk_edge(hpriv); + return 0; +} + /** * ahci_mvebu_stop_engine * @@ -209,6 +252,18 @@ if (rc) goto disable_resources; + /* + * comreset and comwake parameters, later configured in + * ahci_port_init(). + */ + if (of_property_read_u32(pdev->dev.of_node, "comwake", + &hpriv->comwake)) + hpriv->comwake = 0; + + if (of_property_read_u32(pdev->dev.of_node, "comreset_u", + &hpriv->comreset_u)) + hpriv->comreset_u = 0; + rc = ahci_platform_init_host(pdev, hpriv, &ahci_mvebu_port_info, &ahci_platform_sht); if (rc) @@ -230,6 +285,11 @@ .flags = AHCI_HFLAG_SUSPEND_PHYS, }; +static const struct ahci_mvebu_plat_data ahci_mvebu_armada_8k_plat_data = { + .plat_config = ahci_mvebu_armada_8k_config, + .flags = 0, +}; + static const struct of_device_id ahci_mvebu_of_match[] = { { .compatible = "marvell,armada-380-ahci", @@ -239,6 +299,10 @@ .compatible = "marvell,armada-3700-ahci", .data = &ahci_mvebu_armada_3700_plat_data, }, + { + .compatible = "marvell,armada-8k-ahci", + .data = &ahci_mvebu_armada_8k_plat_data, + }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, ahci_mvebu_of_match); diff -ruw linux-6.13.12/drivers/ata/libahci.c linux-6.13.12-fbx/drivers/ata/libahci.c --- linux-6.13.12/drivers/ata/libahci.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/ata/libahci.c 2025-09-25 17:40:31.255345844 +0200 @@ -1256,6 +1256,46 @@ return sprintf(buf, "%d\n", emp->blink_policy); } +#define PORT_OOB_INDIRECT_ADDR 0x78 +#define PORT_OOB_INDIRECT_DATA 0x7c + +#define COM_PARAM_REG 0x48 +#define COMWAKE_MASK 0xf +#define COMRST_MASK 0x3f +#define COMWAKE_VAL(x) (((x) & 0xf) << 12) +#define COMRST_VAL(x) (((x) & 0x3f) << 0) + +static void write_phy_indirect(void __iomem *pmmio, u32 v, u32 reg) +{ + writel(reg, pmmio + PORT_OOB_INDIRECT_ADDR); + writel(v, pmmio + PORT_OOB_INDIRECT_DATA); +} + +static u32 read_phy_indirect(void __iomem *pmmio, u32 reg) +{ + writel(reg, pmmio + PORT_OOB_INDIRECT_ADDR); + return readl(pmmio + PORT_OOB_INDIRECT_DATA); +} + +static void comwake_comrst_config(void __iomem *pmmio, u32 comwake, u32 comrst) +{ + u32 v; + + v = read_phy_indirect(pmmio, COM_PARAM_REG); + + if (comwake) { + v &= ~COMWAKE_VAL(COMWAKE_MASK); + v |= COMWAKE_VAL(comwake); + } + + if (comrst) { + v &= ~COMRST_VAL(COMRST_MASK); + v |= COMRST_VAL(comrst); + } + + write_phy_indirect(pmmio, v, COM_PARAM_REG); +} + static void ahci_port_clear_pending_irq(struct ata_port *ap) { struct ahci_host_priv *hpriv = ap->host->private_data; @@ -1280,6 +1320,7 @@ int port_no, void __iomem *mmio, void __iomem *port_mmio) { + struct ahci_host_priv *hpriv = ap->host->private_data; const char *emsg = NULL; int rc; @@ -1288,6 +1329,7 @@ if (rc) dev_warn(dev, "%s (%d)\n", emsg, rc); + comwake_comrst_config(port_mmio, hpriv->comwake, hpriv->comreset_u); ahci_port_clear_pending_irq(ap); } diff -ruw linux-6.13.12/drivers/ata/libata-core.c linux-6.13.12-fbx/drivers/ata/libata-core.c --- linux-6.13.12/drivers/ata/libata-core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/ata/libata-core.c 2025-09-25 17:40:31.255345844 +0200 @@ -4082,6 +4082,8 @@ /* Sandisk SD7/8/9s lock up hard on large trims */ { "SanDisk SD[789]*", NULL, ATA_QUIRK_MAX_TRIM_128M }, + { "Boot ROM", NULL, ATA_QUIRK_NODMA }, + /* devices which puke on READ_NATIVE_MAX */ { "HDS724040KLSA80", "KFAOA20N", ATA_QUIRK_BROKEN_HPA }, { "WDC WD3200JD-00KLB0", "WD-WCAMR1130137", ATA_QUIRK_BROKEN_HPA }, diff -ruw linux-6.13.12/drivers/ata/libata-scsi.c linux-6.13.12-fbx/drivers/ata/libata-scsi.c --- linux-6.13.12/drivers/ata/libata-scsi.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/ata/libata-scsi.c 2025-09-25 17:40:31.259345864 +0200 @@ -4506,7 +4506,7 @@ */ shost->max_host_blocked = 1; - rc = scsi_add_host_with_dma(shost, &ap->tdev, ap->host->dev); + rc = scsi_add_host_with_dma(shost, host->dev, host->dev); if (rc) goto err_alloc; } diff -ruw linux-6.13.12/drivers/base/regmap/internal.h linux-6.13.12-fbx/drivers/base/regmap/internal.h --- linux-6.13.12/drivers/base/regmap/internal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/base/regmap/internal.h 2025-09-25 17:40:31.295346042 +0200 @@ -345,4 +345,6 @@ #define regmap_init_raw_ram(dev, config, data) \ __regmap_lockdep_wrapper(__regmap_init_raw_ram, #dev, dev, config, data) +void *regmap_mmio_ctx_get_base(const void *priv); + #endif diff -ruw linux-6.13.12/drivers/base/regmap/regmap-mmio.c linux-6.13.12-fbx/drivers/base/regmap/regmap-mmio.c --- linux-6.13.12/drivers/base/regmap/regmap-mmio.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/base/regmap/regmap-mmio.c 2025-09-25 17:40:31.295346042 +0200 @@ -609,4 +609,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.13.12/drivers/base/regmap/regmap.c linux-6.13.12-fbx/drivers/base/regmap/regmap.c --- linux-6.13.12/drivers/base/regmap/regmap.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/base/regmap/regmap.c 2025-09-25 17:40:31.299346062 +0200 @@ -3512,6 +3512,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.13.12/drivers/bus/mhi/host/boot.c linux-6.13.12-fbx/drivers/bus/mhi/host/boot.c --- linux-6.13.12/drivers/bus/mhi/host/boot.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/bus/mhi/host/boot.c 2025-09-25 17:40:31.335346241 +0200 @@ -16,8 +16,12 @@ #include #include #include +#include +#include #include "internal.h" +#define PCIE_PCIE_LOCAL_REG_PCIE_LOCAL_RSV1 0x3168 + /* Setup RDDM vector table for RDDM transfer and program RXVEC */ int mhi_rddm_prepare(struct mhi_controller *mhi_cntrl, struct image_info *img_info) @@ -303,7 +307,7 @@ struct mhi_buf *mhi_buf = image_info->mhi_buf; for (i = 0; i < image_info->entries; i++, mhi_buf++) - dma_free_coherent(mhi_cntrl->cntrl_dev, mhi_buf->len, + mhi_dma_free_coherent_no_dev(mhi_buf->len, mhi_buf->buf, mhi_buf->dma_addr); kfree(image_info->mhi_buf); @@ -340,7 +344,7 @@ vec_size = sizeof(struct bhi_vec_entry) * i; mhi_buf->len = vec_size; - mhi_buf->buf = dma_alloc_coherent(mhi_cntrl->cntrl_dev, + mhi_buf->buf = mhi_dma_alloc_coherent_no_dev( vec_size, &mhi_buf->dma_addr, GFP_KERNEL); if (!mhi_buf->buf) @@ -355,7 +359,7 @@ error_alloc_segment: for (--i, --mhi_buf; i >= 0; i--, mhi_buf--) - dma_free_coherent(mhi_cntrl->cntrl_dev, mhi_buf->len, + mhi_dma_free_coherent_no_dev(mhi_buf->len, mhi_buf->buf, mhi_buf->dma_addr); error_alloc_mhi_buf: @@ -385,6 +389,38 @@ } } +static void mhi_download_fw_license(struct mhi_controller *mhi_cntrl) +{ + struct device *dev = &mhi_cntrl->mhi_dev->dev; + struct pci_dev *pdev = to_pci_dev(mhi_cntrl->cntrl_dev); + int err; + + err = lm_get_license_pcidev(pdev, &mhi_cntrl->license_buf); + + if (err) { + mhi_write_reg(mhi_cntrl, mhi_cntrl->regs, + PCIE_PCIE_LOCAL_REG_PCIE_LOCAL_RSV1, 0x0); + if (err != -ENOSYS) + dev_info(dev, "Unable to get license file from " + "manager: %d\n", err); + return ; + } + + /* + * Let device know the about license data. The device used by + * the license manager driver to allocate the dma coherent + * memory has a 32bit dma coherent mask, so the DMA address so + * using the lower 32bits of the DMA address will always work. + */ + mhi_write_reg(mhi_cntrl, mhi_cntrl->regs, + PCIE_PCIE_LOCAL_REG_PCIE_LOCAL_RSV1, + lower_32_bits(mhi_cntrl->license_buf.dma_addr)); + dev_dbg(dev, "DMA address 0x%x is copied to EP's RSV1\n", + lower_32_bits(mhi_cntrl->license_buf.dma_addr)); + + return ; +} + void mhi_fw_load_handler(struct mhi_controller *mhi_cntrl) { const struct firmware *firmware = NULL; @@ -452,7 +488,7 @@ fw_sz = firmware->size; skip_req_fw: - buf = dma_alloc_coherent(mhi_cntrl->cntrl_dev, size, &dma_addr, + buf = mhi_dma_alloc_coherent_no_dev(size, &dma_addr, GFP_KERNEL); if (!buf) { release_firmware(firmware); @@ -462,7 +498,7 @@ /* Download image using BHI */ memcpy(buf, fw_data, size); ret = mhi_fw_load_bhi(mhi_cntrl, dma_addr, size); - dma_free_coherent(mhi_cntrl->cntrl_dev, size, buf, dma_addr); + mhi_dma_free_coherent_no_dev(size, buf, dma_addr); /* Error or in EDL mode, we're done */ if (ret) { @@ -528,11 +564,17 @@ struct image_info *image_info = mhi_cntrl->fbc_image; struct device *dev = &mhi_cntrl->mhi_dev->dev; enum mhi_pm_state new_state; + struct pci_dev *pdev = to_pci_dev(mhi_cntrl->cntrl_dev); int ret; if (!image_info) return -EIO; + if (pdev && pdev->device == QCN9224_DEVICE_ID) { + /* Download the License */ + mhi_download_fw_license(mhi_cntrl); + } + ret = mhi_fw_load_bhie(mhi_cntrl, /* Vector table is the last entry */ &image_info->mhi_buf[image_info->entries - 1]); diff -ruw linux-6.13.12/drivers/bus/mhi/host/init.c linux-6.13.12-fbx/drivers/bus/mhi/host/init.c --- linux-6.13.12/drivers/bus/mhi/host/init.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/bus/mhi/host/init.c 2025-09-25 17:40:31.339346261 +0200 @@ -1472,6 +1472,70 @@ .dev_groups = mhi_dev_groups, }; +struct list_head mhi_dma_cache_list = LIST_HEAD_INIT(mhi_dma_cache_list); +DEFINE_MUTEX(mhi_dma_cache_lock); + +static void mhi_dma_cache_cleanup(void) +{ + struct mhi_dma_cache_entry *e, *tmp; + + mutex_lock(&mhi_dma_cache_lock); + + list_for_each_entry_safe(e, tmp, &mhi_dma_cache_list, next) { + dma_free_coherent_no_dev(e->size, e->vaddr, e->paddr); + list_del(&e->next); + kfree(e); + } + + mutex_unlock(&mhi_dma_cache_lock); +} + +void* mhi_dma_alloc_coherent_no_dev(size_t sz, dma_addr_t *paddr, int flags) +{ + struct mhi_dma_cache_entry *e, *found = NULL; + void *vaddr; + + mutex_lock(&mhi_dma_cache_lock); + + list_for_each_entry(e, &mhi_dma_cache_list, next) { + if (e->size == sz) { + list_del(&e->next); + found = e; + break; + } + } + mutex_unlock(&mhi_dma_cache_lock); + + if (found) { + vaddr = e->vaddr; + *paddr = e->paddr; + kfree(e); + return vaddr; + } + + return dma_alloc_coherent_no_dev(sz, paddr, flags); +} + +void mhi_dma_free_coherent_no_dev(size_t sz, void *vaddr, dma_addr_t paddr) +{ + struct mhi_dma_cache_entry *e; + + e = kzalloc(sizeof(*e), GFP_KERNEL); + if (!e) + goto free_buffer; + + e->vaddr = vaddr; + e->paddr = paddr; + e->size = sz; + + mutex_lock(&mhi_dma_cache_lock); + list_add_tail(&e->next, &mhi_dma_cache_list); + mutex_unlock(&mhi_dma_cache_lock); + return; +free_buffer: + dma_free_coherent_no_dev(sz, vaddr, paddr); +} + static int __init mhi_init(void) { mhi_debugfs_init(); @@ -1481,6 +1545,7 @@ static void __exit mhi_exit(void) { mhi_debugfs_exit(); + mhi_dma_cache_cleanup(); bus_unregister(&mhi_bus_type); } diff -ruw linux-6.13.12/drivers/bus/mhi/host/internal.h linux-6.13.12-fbx/drivers/bus/mhi/host/internal.h --- linux-6.13.12/drivers/bus/mhi/host/internal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/bus/mhi/host/internal.h 2025-09-25 17:40:31.339346261 +0200 @@ -15,6 +15,20 @@ #define MHI_SOC_RESET_REQ_OFFSET 0xb0 #define MHI_SOC_RESET_REQ BIT(0) +#define QCN9224_DEVICE_ID (0x1109) +#define SOC_HW_VERSION_OFFS 0x224 +#define SOC_HW_VERSION_FAM_NUM_BMSK GENMASK(31, 28) +#define SOC_HW_VERSION_DEV_NUM_BMSK GENMASK(27, 16) +#define SOC_HW_VERSION_MAJOR_VER_BMSK GENMASK(15, 8) +#define SOC_HW_VERSION_MINOR_VER_BMSK GENMASK(7, 0) + +struct mhi_dma_cache_entry { + struct list_head next; + size_t size; + void *vaddr; + dma_addr_t paddr; +}; + struct mhi_ctxt { struct mhi_event_ctxt *er_ctxt; struct mhi_chan_ctxt *chan_ctxt; @@ -420,4 +434,7 @@ void mhi_unmap_single_use_bb(struct mhi_controller *mhi_cntrl, struct mhi_buf_info *buf_info); +void *mhi_dma_alloc_coherent_no_dev(size_t sz, dma_addr_t *paddr, int flags); +void mhi_dma_free_coherent_no_dev(size_t sz, void *vaddr, dma_addr_t paddr); + #endif /* _MHI_INT_H */ diff -ruw linux-6.13.12/drivers/bus/mhi/host/pm.c linux-6.13.12-fbx/drivers/bus/mhi/host/pm.c --- linux-6.13.12/drivers/bus/mhi/host/pm.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/bus/mhi/host/pm.c 2025-09-25 17:40:31.339346261 +0200 @@ -14,6 +14,7 @@ #include #include #include +#include #include "internal.h" #include "trace.h" @@ -464,6 +465,11 @@ mhi_cntrl->wake_put(mhi_cntrl, false); read_unlock_bh(&mhi_cntrl->pm_lock); + /* + * Free license buffer + */ + lm_free_license(&mhi_cntrl->license_buf); + return ret; } diff -ruw linux-6.13.12/drivers/char/Kconfig linux-6.13.12-fbx/drivers/char/Kconfig --- linux-6.13.12/drivers/char/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/char/Kconfig 2025-09-25 17:40:31.343346280 +0200 @@ -317,6 +317,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 @@ -424,3 +433,5 @@ driver include crash and makedumpfile. endmenu + +source "drivers/char/diag/Kconfig" diff -ruw linux-6.13.12/drivers/char/Makefile linux-6.13.12-fbx/drivers/char/Makefile --- linux-6.13.12/drivers/char/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/char/Makefile 2025-09-25 17:40:31.343346280 +0200 @@ -43,3 +43,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.13.12/drivers/char/hw_random/Kconfig linux-6.13.12-fbx/drivers/char/hw_random/Kconfig --- linux-6.13.12/drivers/char/hw_random/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/char/hw_random/Kconfig 2025-09-25 17:40:31.355346340 +0200 @@ -125,6 +125,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_BCMBCA || ARCH_BRCMSTB || COMPILE_TEST @@ -613,6 +618,17 @@ If unsure, say Y. +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. + +config HW_RANDOM_CLP800 + depends on HAS_IOMEM && OF + tristate "Elliptic CLP800 Hardware Random Generator Driver" + endif # HW_RANDOM config UML_RANDOM diff -ruw linux-6.13.12/drivers/char/hw_random/Makefile linux-6.13.12-fbx/drivers/char/hw_random/Makefile --- linux-6.13.12/drivers/char/hw_random/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/char/hw_random/Makefile 2025-09-25 17:40:31.355346340 +0200 @@ -33,6 +33,7 @@ obj-$(CONFIG_HW_RANDOM_HISTB) += histb-rng.o obj-$(CONFIG_HW_RANDOM_BCM2835) += bcm2835-rng.o obj-$(CONFIG_HW_RANDOM_BCM74110) += bcm74110-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 @@ -52,3 +53,5 @@ obj-$(CONFIG_HW_RANDOM_POLARFIRE_SOC) += mpfs-rng.o obj-$(CONFIG_HW_RANDOM_ROCKCHIP) += rockchip-rng.o obj-$(CONFIG_HW_RANDOM_JH7110) += jh7110-trng.o +obj-$(CONFIG_HW_RANDOM_QCOM) += qcom-rng.o +obj-$(CONFIG_HW_RANDOM_CLP800) += clp800-rng.o diff -ruw linux-6.13.12/drivers/char/hw_random/omap-rng.c linux-6.13.12-fbx/drivers/char/hw_random/omap-rng.c --- linux-6.13.12/drivers/char/hw_random/omap-rng.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/char/hw_random/omap-rng.c 2025-09-25 17:40:31.359346360 +0200 @@ -71,6 +71,22 @@ */ #define RNG_DATA_FILL_TIMEOUT 100 +/* + * EIP-150 interrupt management registers: + * + * EIP-150 has an EIP-76 (TRNG) and EIP-28 (PKA) in the same block, + * and a couple of registers aggretating interrupt sources from both + * TRNG and PKA. + * + * This doesn't make any attempt at implementing any support for the + * PKA block. This would require another driver and proper interrupt + * sharing between the two. + * + */ +#define EIP150_IRQ_MASK 0x8008 +#define EIP150_IRQ_ACK 0x8010 +#define EIP150_TRNG_MASK (1 << 3) + enum { RNG_OUTPUT_0_REG = 0, RNG_OUTPUT_1_REG, @@ -147,6 +163,7 @@ u32 (*data_present)(struct omap_rng_dev *priv); int (*init)(struct omap_rng_dev *priv); void (*cleanup)(struct omap_rng_dev *priv); + bool hw_is_eip150; }; struct omap_rng_dev { @@ -271,8 +288,21 @@ omap_rng_write(priv, RNG_FRODETUNE_REG, 0x0); omap_rng_write(priv, RNG_FROENABLE_REG, RNG_REG_FROENABLE_MASK); - /* Enable TRNG */ - val = RNG_CONTROL_ENABLE_TRNG_MASK; + /* Setup alarm/shutdown threshold */ + val = RNG_ALARM_THRESHOLD << RNG_ALARMCNT_ALARM_TH_SHIFT; + val |= RNG_SHUTDOWN_THRESHOLD << RNG_ALARMCNT_SHUTDOWN_TH_SHIFT; + omap_rng_write(priv, RNG_ALARMCNT_REG, val); + + /* + * Enable TRNG, we potentially need to preserve + * RNG_SHUTDOWN_OFLO_MASK + */ + if (priv->pdata->regs[RNG_INTMASK_REG]) + val = 0; + else + val = omap_rng_read(priv, RNG_CONTROL_REG) & + RNG_SHUTDOWN_OFLO_MASK; + val |= RNG_CONTROL_ENABLE_TRNG_MASK; omap_rng_write(priv, RNG_CONTROL_REG, val); return 0; @@ -336,6 +366,12 @@ omap_rng_write(priv, RNG_INTACK_REG, RNG_REG_INTACK_SHUTDOWN_OFLO_MASK); + /* + * ack irq at the EIP-150 level + */ + if (priv->pdata->hw_is_eip150) + writel(EIP150_TRNG_MASK, priv->base + EIP150_IRQ_ACK); + return IRQ_HANDLED; } @@ -355,6 +391,15 @@ .cleanup = omap4_rng_cleanup, }; +static struct omap_rng_pdata eip150_rng_pdata = { + .regs = (u16 *)reg_map_eip76, + .data_size = EIP76_RNG_OUTPUT_SIZE, + .data_present = omap4_rng_data_present, + .init = eip76_rng_init, + .cleanup = omap4_rng_cleanup, + .hw_is_eip150 = true, +}; + static const struct of_device_id omap_rng_of_match[] __maybe_unused = { { .compatible = "ti,omap2-rng", @@ -368,6 +413,10 @@ .compatible = "inside-secure,safexcel-eip76", .data = &eip76_rng_pdata, }, + { + .compatible = "inside-secure,safexcel-eip150", + .data = &eip150_rng_pdata, + }, {}, }; MODULE_DEVICE_TABLE(of, omap_rng_of_match); @@ -384,7 +433,8 @@ if (of_device_is_compatible(dev->of_node, "ti,omap4-rng") || - of_device_is_compatible(dev->of_node, "inside-secure,safexcel-eip76")) { + of_device_is_compatible(dev->of_node, "inside-secure,safexcel-eip76") || + of_device_is_compatible(dev->of_node, "inside-secure,safexcel-eip150")) { irq = platform_get_irq(pdev, 0); if (irq < 0) return irq; @@ -409,6 +459,12 @@ else omap_rng_write(priv, RNG_CONTROL_REG, RNG_SHUTDOWN_OFLO_MASK); + + /* + * unmask IRQ at EIP-150 level + */ + if (priv->pdata->hw_is_eip150) + writel(EIP150_TRNG_MASK, priv->base + EIP150_IRQ_MASK); } return 0; } diff -ruw linux-6.13.12/drivers/char/mem.c linux-6.13.12-fbx/drivers/char/mem.c --- linux-6.13.12/drivers/char/mem.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/char/mem.c 2025-09-25 17:40:31.367346399 +0200 @@ -28,6 +28,8 @@ #include #include #include +#include + #include #include @@ -383,6 +385,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); +} + #ifdef CONFIG_DEVPORT static ssize_t read_port(struct file *file, char __user *buf, size_t count, loff_t *ppos) @@ -626,6 +636,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 @@ -687,6 +702,14 @@ .splice_read = copy_splice_read, }; +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; const struct file_operations *fops; @@ -707,6 +730,9 @@ #ifdef CONFIG_PRINTK [11] = { "kmsg", &kmsg_fops, 0, 0644 }, #endif +#ifdef CONFIG_DEVPHYSMEM + [16] = { "physmem", &physmem_fops, 0, 0 }, +#endif }; static int memory_open(struct inode *inode, struct file *filp) diff -ruw linux-6.13.12/drivers/clk/Kconfig linux-6.13.12-fbx/drivers/clk/Kconfig --- linux-6.13.12/drivers/clk/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/clk/Kconfig 2025-09-25 17:40:31.375346439 +0200 @@ -497,6 +497,7 @@ source "drivers/clk/analogbits/Kconfig" source "drivers/clk/baikal-t1/Kconfig" source "drivers/clk/bcm/Kconfig" +source "drivers/clk/cortina/Kconfig" source "drivers/clk/hisilicon/Kconfig" source "drivers/clk/imgtec/Kconfig" source "drivers/clk/imx/Kconfig" diff -ruw linux-6.13.12/drivers/clk/Makefile linux-6.13.12-fbx/drivers/clk/Makefile --- linux-6.13.12/drivers/clk/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/clk/Makefile 2025-09-25 17:40:31.375346439 +0200 @@ -117,6 +117,7 @@ obj-$(CONFIG_CLK_BAIKAL_T1) += baikal-t1/ obj-y += bcm/ obj-$(CONFIG_ARCH_BERLIN) += berlin/ +obj-y += cortina/ obj-$(CONFIG_ARCH_DAVINCI) += davinci/ obj-$(CONFIG_ARCH_HISI) += hisilicon/ obj-y += imgtec/ diff -ruw linux-6.13.12/drivers/clk/mvebu/cp110-system-controller.c linux-6.13.12-fbx/drivers/clk/mvebu/cp110-system-controller.c --- linux-6.13.12/drivers/clk/mvebu/cp110-system-controller.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/clk/mvebu/cp110-system-controller.c 2025-09-25 17:40:31.399346558 +0200 @@ -225,6 +225,10 @@ u32 nand_clk_ctrl; int i, ret; char *gate_name[ARRAY_SIZE(gate_base_names)]; + bool ignore_eip150; + + ignore_eip150 = of_property_read_bool(pdev->dev.of_node, + "fbx,ignore-eip150"); regmap = syscon_node_to_regmap(syscon_node); if (IS_ERR(regmap)) @@ -323,6 +327,11 @@ if (gate_name[i] == NULL) continue; + if (ignore_eip150 && i == CP110_GATE_EIP150) { + dev_info(&pdev->dev, "ignoring EIP150 gate clock.\n"); + continue; + } + switch (i) { case CP110_GATE_NAND: parent = nand_name; diff -ruw linux-6.13.12/drivers/clk/qcom/Kconfig linux-6.13.12-fbx/drivers/clk/qcom/Kconfig --- linux-6.13.12/drivers/clk/qcom/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/clk/qcom/Kconfig 2025-09-25 17:40:31.403346578 +0200 @@ -272,6 +272,12 @@ Say Y or M if you want to use network features of switch or PHY device. Select this for the root clock of qca8k. +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" depends on ARM || COMPILE_TEST diff -ruw linux-6.13.12/drivers/clk/qcom/Makefile linux-6.13.12-fbx/drivers/clk/qcom/Makefile --- linux-6.13.12/drivers/clk/qcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/clk/qcom/Makefile 2025-09-25 17:40:31.403346578 +0200 @@ -37,6 +37,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_IPQ_NSSCC_QCA8K) += nsscc-qca8k.o obj-$(CONFIG_MDM_GCC_9607) += gcc-mdm9607.o diff -ruw linux-6.13.12/drivers/cpufreq/Kconfig linux-6.13.12-fbx/drivers/cpufreq/Kconfig --- linux-6.13.12/drivers/cpufreq/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/cpufreq/Kconfig 2025-09-25 17:40:31.483346975 +0200 @@ -325,6 +325,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 + config ACPI_CPPC_CPUFREQ tristate "CPUFreq driver based on the ACPI CPPC spec" depends on ACPI_PROCESSOR diff -ruw linux-6.13.12/drivers/cpufreq/Kconfig.arm linux-6.13.12-fbx/drivers/cpufreq/Kconfig.arm --- linux-6.13.12/drivers/cpufreq/Kconfig.arm 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/cpufreq/Kconfig.arm 2025-09-25 17:40:31.483346975 +0200 @@ -86,6 +86,14 @@ If in doubt, say N. +config ARM_CORTINA_CPUFREQ + tristate "Cortina Access CPUfreq driver" + depends on ARCH_CORTINA_ACCESS && CPUFREQ_DT + select PM_OPP + help + This enables the Cortina Access CPUfreq driver. + + If in doubt, say N. config ARM_IMX6Q_CPUFREQ tristate "Freescale i.MX6 cpufreq support" depends on ARCH_MXC diff -ruw linux-6.13.12/drivers/cpufreq/Makefile linux-6.13.12-fbx/drivers/cpufreq/Makefile --- linux-6.13.12/drivers/cpufreq/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/cpufreq/Makefile 2025-09-25 17:40:31.483346975 +0200 @@ -58,6 +58,7 @@ obj-$(CONFIG_ARM_ARMADA_8K_CPUFREQ) += armada-8k-cpufreq.o obj-$(CONFIG_ARM_BRCMSTB_AVS_CPUFREQ) += brcmstb-avs-cpufreq.o obj-$(CONFIG_ACPI_CPPC_CPUFREQ) += cppc_cpufreq.o +obj-$(CONFIG_ARM_CORTINA_CPUFREQ) += cortina-cpufreq.o obj-$(CONFIG_ARCH_DAVINCI) += davinci-cpufreq.o obj-$(CONFIG_ARM_HIGHBANK_CPUFREQ) += highbank-cpufreq.o obj-$(CONFIG_ARM_IMX6Q_CPUFREQ) += imx6q-cpufreq.o @@ -107,3 +108,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.13.12/drivers/gpio/Kconfig linux-6.13.12-fbx/drivers/gpio/Kconfig --- linux-6.13.12/drivers/gpio/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/gpio/Kconfig 2025-09-25 17:40:31.651347808 +0200 @@ -1087,6 +1087,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 @@ -1915,6 +1920,9 @@ This enables the GPIO simulator - a configfs-based GPIO testing driver. +config GPIOLIB_NONEXCLUSIVE_TEST + tristate "GPIO non exclusive reference test driver" + endmenu menu "GPIO Debugging utilities" diff -ruw linux-6.13.12/drivers/gpio/Makefile linux-6.13.12-fbx/drivers/gpio/Makefile --- linux-6.13.12/drivers/gpio/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/gpio/Makefile 2025-09-25 17:40:31.651347808 +0200 @@ -64,6 +64,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 @@ -206,3 +207,4 @@ obj-$(CONFIG_GPIO_ZEVIO) += gpio-zevio.o obj-$(CONFIG_GPIO_ZYNQ) += gpio-zynq.o obj-$(CONFIG_GPIO_ZYNQMP_MODEPIN) += gpio-zynqmp-modepin.o +obj-$(CONFIG_GPIOLIB_NONEXCLUSIVE_TEST) += gpiolib-nonexclusive-test.o diff -ruw linux-6.13.12/drivers/gpio/gpio-mvebu.c linux-6.13.12-fbx/drivers/gpio/gpio-mvebu.c --- linux-6.13.12/drivers/gpio/gpio-mvebu.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/gpio/gpio-mvebu.c 2025-09-25 17:40:31.667347887 +0200 @@ -63,6 +63,11 @@ #define GPIO_LEVEL_MASK_OFF 0x001c #define GPIO_BLINK_CNT_SELECT_OFF 0x0020 +#define GPIO_CONTROL_SET_OFF 0x0028 +#define GPIO_CONTROL_CLR_OFF 0x002c +#define GPIO_DATAOUT_SET_OFF 0x0030 +#define GPIO_DATAOUT_CLR_OFF 0x0034 + /* * PWM register offsets. */ @@ -111,11 +116,13 @@ struct mvebu_gpio_chip { struct gpio_chip chip; struct regmap *regs; + void __iomem *base; u32 offset; struct regmap *percpu_regs; int irqbase; struct irq_domain *domain; int soc_variant; + int broken_mpp33_dir_wa; /* Used for PWM support */ struct clk *clk; @@ -301,6 +308,18 @@ { struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip); + if (mvchip->soc_variant == MVEBU_GPIO_SOC_VARIANT_A8K) { + unsigned int off; + + if (value) + off = GPIO_DATAOUT_SET_OFF; + else + off = GPIO_DATAOUT_CLR_OFF; + + writel(BIT(pin), mvchip->base + off + mvchip->offset); + return; + } + regmap_update_bits(mvchip->regs, GPIO_OUT_OFF + mvchip->offset, BIT(pin), value ? BIT(pin) : 0); } @@ -339,7 +358,7 @@ static int mvebu_gpio_direction_input(struct gpio_chip *chip, unsigned int pin) { struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip); - int ret; + int offset, ret; /* * Check with the pinctrl driver whether this pin is usable as @@ -349,7 +368,16 @@ if (ret) return ret; - regmap_update_bits(mvchip->regs, GPIO_IO_CONF_OFF + mvchip->offset, + offset = 0; + if (pin == 1 && mvchip->broken_mpp33_dir_wa) { + /* + * See comment in mvebu_gpio_direction_output(). + */ + offset = -0x40; + } + + regmap_update_bits(mvchip->regs, + GPIO_IO_CONF_OFF + mvchip->offset + offset, BIT(pin), BIT(pin)); return 0; @@ -359,7 +387,7 @@ int value) { struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip); - int ret; + int offset, ret; /* * Check with the pinctrl driver whether this pin is usable as @@ -372,7 +400,17 @@ mvebu_gpio_blink(chip, pin, 0); mvebu_gpio_set(chip, pin, value); - regmap_update_bits(mvchip->regs, GPIO_IO_CONF_OFF + mvchip->offset, + offset = 0; + if (pin == 1 && mvchip->broken_mpp33_dir_wa) { + /* + * gpio33 direction bit is not controlled from the + * gpio block 0, but from gpio block 1 instead + */ + offset = -0x40; + } + + regmap_update_bits(mvchip->regs, + GPIO_IO_CONF_OFF + mvchip->offset + offset, BIT(pin), 0); return 0; @@ -381,9 +419,18 @@ static int mvebu_gpio_get_direction(struct gpio_chip *chip, unsigned int pin) { struct mvebu_gpio_chip *mvchip = gpiochip_get_data(chip); + int offset; u32 u; - regmap_read(mvchip->regs, GPIO_IO_CONF_OFF + mvchip->offset, &u); + offset = 0; + if (pin == 1 && mvchip->broken_mpp33_dir_wa) { + /* + * See comment in mvebu_gpio_direction_output(). + */ + offset = -0x40; + } + + regmap_read(mvchip->regs, GPIO_IO_CONF_OFF + mvchip->offset + offset, &u); if (u & BIT(pin)) return GPIO_LINE_DIRECTION_IN; @@ -1074,6 +1121,8 @@ if (IS_ERR(mvchip->regs)) return PTR_ERR(mvchip->regs); + mvchip->base = base; + /* * For the legacy SoCs, the regmap directly maps to the GPIO * registers, so no offset is needed. @@ -1106,6 +1155,7 @@ if (IS_ERR(mvchip->regs)) return PTR_ERR(mvchip->regs); + mvchip->base = regmap_get_mmio_base_address(mvchip->regs); if (device_property_read_u32(&pdev->dev, "offset", &mvchip->offset)) return -EINVAL; @@ -1129,6 +1179,7 @@ bool have_irqs; int soc_variant; int i, cpu, id; + uint32_t broken_mpp33_dir = 0; int err; soc_variant = (unsigned long)device_get_match_data(&pdev->dev); @@ -1152,6 +1203,12 @@ return -ENODEV; } + of_property_read_u32(pdev->dev.of_node, "marvell,broken-mpp33-dir", + &broken_mpp33_dir); + if (broken_mpp33_dir) + dev_notice(&pdev->dev, "using direction set work around for " + "MPP 33.\n"); + id = of_alias_get_id(pdev->dev.of_node, "gpio"); if (id < 0) { dev_err(&pdev->dev, "Couldn't get OF id\n"); @@ -1163,6 +1220,7 @@ if (!IS_ERR(mvchip->clk)) clk_prepare_enable(mvchip->clk); + mvchip->broken_mpp33_dir_wa = broken_mpp33_dir; mvchip->soc_variant = soc_variant; mvchip->chip.label = dev_name(&pdev->dev); mvchip->chip.parent = &pdev->dev; diff -ruw linux-6.13.12/drivers/gpio/gpiolib.c linux-6.13.12-fbx/drivers/gpio/gpiolib.c --- linux-6.13.12/drivers/gpio/gpiolib.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/gpio/gpiolib.c 2025-09-25 17:40:31.683347966 +0200 @@ -2398,12 +2398,23 @@ return ret; } -static void gpiod_free_commit(struct gpio_desc *desc) +static bool gpiod_free_commit(struct gpio_desc *desc) { unsigned long flags; might_sleep(); + if (test_bit(FLAG_NONEXCLUSIVE_REF, &desc->flags)) { + /* + * non exclusive use GPIO descriptor, free the memory + * allocated in make_nonexclusive_desc(). + */ + kfree(desc->name); + kfree(desc->label); + kfree(desc); + return false; + } + CLASS(gpio_chip_guard, guard)(desc); flags = READ_ONCE(desc->flags); @@ -2432,13 +2443,15 @@ #endif gpiod_line_state_notify(desc, GPIO_V2_LINE_CHANGED_RELEASED); } + return true; } void gpiod_free(struct gpio_desc *desc) { VALIDATE_DESC_VOID(desc); - gpiod_free_commit(desc); + if (!gpiod_free_commit(desc)) + return; module_put(desc->gdev->owner); gpio_device_put(desc->gdev); } @@ -4386,6 +4399,38 @@ return desc; } +/* + * For non exclusive access to a gpio_desc, kmalloc a new one, and set + * its flags with FLAG_NONEXCLUSIVE_REF to recognize them when + * freeing. + */ +static struct gpio_desc *make_nonexclusive_desc(struct gpio_desc *desc) +{ + struct gpio_desc *ret; + + ret = kmemdup(desc, sizeof (*desc), GFP_KERNEL); + if (!ret) + return ERR_PTR(-ENOMEM); + ret->label = NULL; + + if (desc_set_label(ret, desc->label->str)) + goto fail_enomem; + + ret->name = kstrdup(desc->name, GFP_KERNEL); + if (!ret->name && desc->name) + goto fail_enomem; + + ret->real_desc = desc; + set_bit(FLAG_NONEXCLUSIVE_REF, &ret->flags); + return ret; + +fail_enomem: + kfree(ret->label); + kfree(ret->name); + kfree(ret); + return ERR_PTR(-ENOMEM); +} + struct gpio_desc *gpiod_find_and_request(struct device *consumer, struct fwnode_handle *fwnode, const char *con_id, @@ -4441,7 +4486,7 @@ * FIXME: Make this more sane and safe. */ dev_info(consumer, "nonexclusive access to GPIO for %s\n", name); - return desc; + return make_nonexclusive_desc(desc);; } ret = gpiod_configure_flags(desc, con_id, lookupflags, flags); diff -ruw linux-6.13.12/drivers/gpio/gpiolib.h linux-6.13.12-fbx/drivers/gpio/gpiolib.h --- linux-6.13.12/drivers/gpio/gpiolib.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/gpio/gpiolib.h 2025-09-25 17:40:31.683347966 +0200 @@ -204,6 +204,7 @@ #define FLAG_EDGE_FALLING 17 /* GPIO CDEV detects falling edge events */ #define FLAG_EVENT_CLOCK_REALTIME 18 /* GPIO CDEV reports REALTIME timestamps in events */ #define FLAG_EVENT_CLOCK_HTE 19 /* GPIO CDEV reports hardware timestamps in events */ +#define FLAG_NONEXCLUSIVE_REF 20 /* gpio_desc is kmalloc()'d because it is a non exclusive ref */ /* Connection label */ struct gpio_desc_label __rcu *label; @@ -216,6 +217,12 @@ /* debounce period in microseconds */ unsigned int debounce_period_us; #endif + + /* + * valid only for gpio_descs with FLAG_NONEXCLUSIVE_REF set, + * points to the GPIO descriptors within struct gpio_device::descs[]. + */ + struct gpio_desc *real_desc; }; #define gpiod_not_found(desc) (IS_ERR(desc) && PTR_ERR(desc) == -ENOENT) @@ -275,9 +282,14 @@ /* * Return the GPIO number of the passed descriptor relative to its chip + * + * In the case of a non exclusive GPIO descriptor, we must use the + * actual descriptor with the descs[] array. */ static inline int gpio_chip_hwgpio(const struct gpio_desc *desc) { + if (test_bit(FLAG_NONEXCLUSIVE_REF, &desc->flags)) + desc = desc->real_desc; return desc - &desc->gdev->descs[0]; } diff -ruw linux-6.13.12/drivers/hwmon/Kconfig linux-6.13.12-fbx/drivers/hwmon/Kconfig --- linux-6.13.12/drivers/hwmon/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/hwmon/Kconfig 2025-09-25 17:40:32.659352806 +0200 @@ -345,6 +345,14 @@ 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_PERICOM_PCIE + bool "Pericom's PI7C9X3G606GP PCIe switch hardware monitoring driver" + depends on PCIEPORTBUS + config SENSORS_APPLESMC tristate "Apple SMC (Motion sensor, light sensor, keyboard backlight)" depends on INPUT && X86 @@ -2576,6 +2584,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.13.12/drivers/hwmon/Makefile linux-6.13.12-fbx/drivers/hwmon/Makefile --- linux-6.13.12/drivers/hwmon/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/hwmon/Makefile 2025-09-25 17:40:32.659352806 +0200 @@ -78,6 +78,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 @@ -110,6 +111,7 @@ obj-$(CONFIG_SENSORS_K10TEMP) += k10temp.o obj-$(CONFIG_SENSORS_LAN966X) += lan966x-hwmon.o obj-$(CONFIG_SENSORS_LENOVO_EC) += lenovo-ec-sensors.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 @@ -186,6 +188,7 @@ obj-$(CONFIG_SENSORS_PC87427) += pc87427.o obj-$(CONFIG_SENSORS_PCF8591) += pcf8591.o obj-$(CONFIG_SENSORS_POWERZ) += powerz.o +obj-$(CONFIG_SENSORS_PERICOM_PCIE) += pericom_pcie.o obj-$(CONFIG_SENSORS_POWR1220) += powr1220.o obj-$(CONFIG_SENSORS_PT5161L) += pt5161l.o obj-$(CONFIG_SENSORS_PWM_FAN) += pwm-fan.o @@ -235,6 +238,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.13.12/drivers/hwmon/adt7475.c linux-6.13.12-fbx/drivers/hwmon/adt7475.c --- linux-6.13.12/drivers/hwmon/adt7475.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/hwmon/adt7475.c 2025-09-25 17:40:32.663352826 +0200 @@ -136,7 +136,19 @@ /* Macro to read the registers */ -#define adt7475_read(reg) i2c_smbus_read_byte_data(client, (reg)) +static inline s32 __adt7475_read(const struct i2c_client *client, u8 cmd) +{ + s32 ret; + + ret = i2c_smbus_read_byte_data(client, cmd); + if (ret < 0) { + printk("__adt7475_read error: %d\n", ret); + return 0; + } + return ret; +} + +#define adt7475_read(reg) __adt7475_read(client, (reg)) /* Macros to easily index the registers */ diff -ruw linux-6.13.12/drivers/i2c/busses/Kconfig linux-6.13.12-fbx/drivers/i2c/busses/Kconfig --- linux-6.13.12/drivers/i2c/busses/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/i2c/busses/Kconfig 2025-09-25 17:40:32.695352985 +0200 @@ -510,6 +510,10 @@ If you do not need I2C interface, say N. +config I2C_CORTINA + tristate "Cortina I2C Controller" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + config I2C_CADENCE tristate "Cadence I2C Controller" depends on ARCH_ZYNQ || ARM64 || XTENSA || RISCV || COMPILE_TEST @@ -1543,4 +1547,8 @@ This driver can also be built as a module. If so, the module will be called i2c-virtio. +config I2C_FBXGWR_PMU + tristate "Freebox PMU I2C Proxy Adapter support" + depends on MFD_FBXGWR_PMU + endmenu diff -ruw linux-6.13.12/drivers/i2c/busses/Makefile linux-6.13.12-fbx/drivers/i2c/busses/Makefile --- linux-6.13.12/drivers/i2c/busses/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/i2c/busses/Makefile 2025-09-25 17:40:32.695352985 +0200 @@ -16,6 +16,7 @@ obj-$(CONFIG_I2C_AMD756) += i2c-amd756.o obj-$(CONFIG_I2C_AMD8111) += i2c-amd8111.o obj-$(CONFIG_I2C_CHT_WC) += i2c-cht-wc.o +obj-$(CONFIG_I2C_CORTINA) += i2c-cortina.o obj-$(CONFIG_I2C_I801) += i2c-i801.o obj-$(CONFIG_I2C_ISCH) += i2c-isch.o obj-$(CONFIG_I2C_ISMT) += i2c-ismt.o @@ -157,5 +158,6 @@ obj-$(CONFIG_SCx200_ACB) += scx200_acb.o obj-$(CONFIG_I2C_FSI) += i2c-fsi.o obj-$(CONFIG_I2C_VIRTIO) += i2c-virtio.o +obj-$(CONFIG_I2C_FBXGWR_PMU) += i2c-fbxgwr-pmu.o ccflags-$(CONFIG_I2C_DEBUG_BUS) := -DDEBUG diff -ruw linux-6.13.12/drivers/i2c/busses/i2c-mv64xxx.c linux-6.13.12-fbx/drivers/i2c/busses/i2c-mv64xxx.c --- linux-6.13.12/drivers/i2c/busses/i2c-mv64xxx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/i2c/busses/i2c-mv64xxx.c 2025-09-25 17:40:32.707353044 +0200 @@ -322,6 +322,11 @@ case MV64XXX_I2C_STATUS_MAST_WR_NO_ACK: /* 30 */ case MV64XXX_I2C_STATUS_MAST_RD_ADDR_NO_ACK: /* 48 */ /* Doesn't seem to be a device at other end */ + dev_dbg(&drv_data->adapter.dev, + "mv64xxx_i2c_fsm: got no ack -- state: 0x%x, " + "status: 0x%x, addr: 0x%x, flags: 0x%x\n", + drv_data->state, status, drv_data->msg->addr, + drv_data->msg->flags); drv_data->action = MV64XXX_I2C_ACTION_SEND_STOP; drv_data->state = MV64XXX_I2C_STATE_IDLE; drv_data->rc = -ENXIO; @@ -607,6 +612,34 @@ int is_last) { unsigned long flags; + int limit; + + /* + * wait for (re)start/stop condition to clear from last + * transfer if any + */ + limit = 1000; + do { + u32 val; + + val = readl(drv_data->reg_base + drv_data->reg_offsets.control); + if (!(val & (MV64XXX_I2C_REG_CONTROL_STOP | + MV64XXX_I2C_REG_CONTROL_STOP))) + break; + + udelay(1); + } while (limit-- > 0); + + if (limit < 0) { + dev_err(&drv_data->adapter.dev, + "mv64xxx: start/stop bit won't clear\n"); + } + + /* according to datasheet, controller is buggy when you do + * register polling and it says to always wait for an IRQ + * (clock domain related), since we busywait for START/STOP + * clear, add a small delay */ + udelay(5); spin_lock_irqsave(&drv_data->lock, flags); @@ -614,6 +647,7 @@ drv_data->send_stop = is_last; drv_data->block = 1; + mv64xxx_i2c_send_start(drv_data); spin_unlock_irqrestore(&drv_data->lock, flags); @@ -1043,7 +1077,7 @@ drv_data->adapter.dev.parent = &pd->dev; drv_data->adapter.algo = &mv64xxx_i2c_algo; drv_data->adapter.owner = THIS_MODULE; - drv_data->adapter.class = I2C_CLASS_DEPRECATED; + drv_data->adapter.class = I2C_CLASS_HWMON; drv_data->adapter.nr = pd->id; drv_data->adapter.dev.of_node = pd->dev.of_node; platform_set_drvdata(pd, drv_data); diff -ruw linux-6.13.12/drivers/i2c/i2c-core-base.c linux-6.13.12-fbx/drivers/i2c/i2c-core-base.c --- linux-6.13.12/drivers/i2c/i2c-core-base.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/i2c/i2c-core-base.c 2025-09-25 17:40:32.719353104 +0200 @@ -271,12 +271,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.13.12/drivers/input/misc/Kconfig linux-6.13.12-fbx/drivers/input/misc/Kconfig --- linux-6.13.12/drivers/input/misc/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/input/misc/Kconfig 2025-09-25 17:40:32.987354433 +0200 @@ -956,4 +956,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.13.12/drivers/input/misc/Makefile linux-6.13.12-fbx/drivers/input/misc/Makefile --- linux-6.13.12/drivers/input/misc/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/input/misc/Makefile 2025-09-25 17:40:32.987354433 +0200 @@ -92,3 +92,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.13.12/drivers/irqchip/Kconfig linux-6.13.12-fbx/drivers/irqchip/Kconfig --- linux-6.13.12/drivers/irqchip/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/irqchip/Kconfig 2025-09-25 17:40:33.047354730 +0200 @@ -39,6 +39,12 @@ select GENERIC_IRQ_EFFECTIVE_AFF_MASK if SMP select HAVE_ARM_SMCCC_DISCOVERY +config ARM_GIC_V3_CORTINA + bool "compile duplicate GICv3 driver for Cortina broken GIC integration" + depends on ARM_GIC_V3 + depends on ARCH_CORTINA || COMPILE_TEST + default ARCH_CORTINA + config ARM_GIC_V3_ITS bool select GENERIC_MSI_IRQ @@ -137,6 +143,11 @@ select GENERIC_IRQ_CHIP select IRQ_DOMAIN +config RX5281_VEC_INT + bool "Realtek RX5281 vector interrupt support" + depends on MACH_CORTINA_SATURN || BMIPS_GENERIC + default MACH_CORTINA_SATURN + config DAVINCI_CP_INTC bool select GENERIC_IRQ_CHIP @@ -759,4 +770,8 @@ chained controller, routing all interrupt source in P-Chip to the primary controller on C-Chip. +config CORTINA_PERI_ICTL + bool "Cortina peripheral interrupt controller" if COMPILE_TEST + default ARCH_CORTINA || MACH_CORTINA_SATURN + endmenu diff -ruw linux-6.13.12/drivers/irqchip/Makefile linux-6.13.12-fbx/drivers/irqchip/Makefile --- linux-6.13.12/drivers/irqchip/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/irqchip/Makefile 2025-09-25 17:40:33.047354730 +0200 @@ -34,6 +34,7 @@ obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-v3-mbi.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v4.o irq-gic-v3-its-msi-parent.o obj-$(CONFIG_ARM_GIC_V3_ITS_FSL_MC) += irq-gic-v3-its-fsl-mc-msi.o +obj-$(CONFIG_ARM_GIC_V3_CORTINA) += irq-gic-v3-ca.o irq-gic-common-ca.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o obj-$(CONFIG_ARM_NVIC) += irq-nvic.o @@ -46,6 +47,7 @@ obj-$(CONFIG_IRQ_MIPS_CPU) += irq-mips-cpu.o obj-$(CONFIG_IXP4XX_IRQ) += irq-ixp4xx.o obj-$(CONFIG_JCORE_AIC) += irq-jcore-aic.o +obj-$(CONFIG_RX5281_VEC_INT) += irq-rx5281-vec-cpu.o irq-rx5281-vec-cpu-handler.o obj-$(CONFIG_RDA_INTC) += irq-rda-intc.o obj-$(CONFIG_RENESAS_INTC_IRQPIN) += irq-renesas-intc-irqpin.o obj-$(CONFIG_RENESAS_IRQC) += irq-renesas-irqc.o @@ -129,3 +131,4 @@ obj-$(CONFIG_APPLE_AIC) += irq-apple-aic.o obj-$(CONFIG_MCHP_EIC) += irq-mchp-eic.o obj-$(CONFIG_SUNPLUS_SP7021_INTC) += irq-sp7021-intc.o +obj-$(CONFIG_CORTINA_PERI_ICTL) += irq-cortina-peri-intc.o diff -ruw linux-6.13.12/drivers/irqchip/irq-gic-common.h linux-6.13.12-fbx/drivers/irqchip/irq-gic-common.h --- linux-6.13.12/drivers/irqchip/irq-gic-common.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/irqchip/irq-gic-common.h 2025-09-25 17:40:33.055354770 +0200 @@ -35,4 +35,12 @@ #define RDIST_FLAGS_RD_TABLES_PREALLOCATED (1 << 1) #define RDIST_FLAGS_FORCE_NON_SHAREABLE (1 << 2) +/* + * _ca versions of those functions above to support irq-gicv3-ca.c + * code. + */ +int gic_configure_irq_ca(unsigned int irq, unsigned int type, phys_addr_t base); +void gic_dist_config_ca(phys_addr_t base, int gic_irqs, u8 priority); +void gic_cpu_config_ca(phys_addr_t base, int nr, u8 priority); + #endif /* _IRQ_GIC_COMMON_H */ diff -ruw linux-6.13.12/drivers/leds/Kconfig linux-6.13.12-fbx/drivers/leds/Kconfig --- linux-6.13.12/drivers/leds/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/leds/Kconfig 2025-09-25 17:40:33.087354928 +0200 @@ -392,6 +392,14 @@ 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_FBXGWR_ANNIV + tristate "Freebox GWR anniversary LED controller" + depends on I2C_FBXGWR_PMU + config LEDS_LP3944 tristate "LED Support for N.S. LP3944 (Fun Light) I2C chip" depends on LEDS_CLASS @@ -804,6 +812,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 @@ -959,6 +974,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.13.12/drivers/leds/Makefile linux-6.13.12-fbx/drivers/leds/Makefile --- linux-6.13.12/drivers/leds/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/leds/Makefile 2025-09-25 17:40:33.087354928 +0200 @@ -31,12 +31,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 @@ -92,6 +94,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 # Kinetic ExpressWire Protocol obj-$(CONFIG_LEDS_EXPRESSWIRE) += leds-expresswire.o @@ -102,6 +105,9 @@ obj-$(CONFIG_LEDS_EL15203000) += leds-el15203000.o obj-$(CONFIG_LEDS_SPI_BYTE) += leds-spi-byte.o +# LED I2C Drivers +obj-$(CONFIG_LEDS_FBXGWR_ANNIV) += leds-fbxgwr-anniv.o + # LED Userspace Drivers obj-$(CONFIG_LEDS_USER) += uleds.o diff -ruw linux-6.13.12/drivers/media/dvb-core/dvb_frontend.c linux-6.13.12-fbx/drivers/media/dvb-core/dvb_frontend.c --- linux-6.13.12/drivers/media/dvb-core/dvb_frontend.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/media/dvb-core/dvb_frontend.c 2025-09-25 17:40:33.147355226 +0200 @@ -815,6 +815,7 @@ if (fe->exit != DVB_FE_DEVICE_REMOVED) fe->exit = DVB_FE_NORMAL_EXIT; mb(); + wake_up_all(&fepriv->events.wait_queue); if (!fepriv->thread) return; @@ -2754,6 +2755,9 @@ poll_wait(file, &fepriv->events.wait_queue, wait); + if (fe->exit) + return POLLERR | POLLHUP; + if (fepriv->events.eventw != fepriv->events.eventr) return (EPOLLIN | EPOLLRDNORM | EPOLLPRI); diff -ruw linux-6.13.12/drivers/media/rc/keymaps/Makefile linux-6.13.12-fbx/drivers/media/rc/keymaps/Makefile --- linux-6.13.12/drivers/media/rc/keymaps/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/media/rc/keymaps/Makefile 2025-09-25 17:40:33.279355881 +0200 @@ -104,6 +104,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.13.12/drivers/media/usb/dvb-usb/dib0700_devices.c linux-6.13.12-fbx/drivers/media/usb/dvb-usb/dib0700_devices.c --- linux-6.13.12/drivers/media/usb/dvb-usb/dib0700_devices.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/media/usb/dvb-usb/dib0700_devices.c 2025-09-25 17:40:33.315356059 +0200 @@ -3909,6 +3909,7 @@ DIBCOM_STK8096PVR, HAMA_DVBT_HYBRID, MICROSOFT_XBOX_ONE_TUNER, + DIBCOM_HOOK_DEFAULT_STK7770P, }; struct usb_device_id dib0700_usb_id_table[] = { @@ -3999,6 +4000,7 @@ DVB_USB_DEV(DIBCOM, DIBCOM_STK8096PVR), DVB_USB_DEV(HAMA, HAMA_DVBT_HYBRID), DVB_USB_DEV(MICROSOFT, MICROSOFT_XBOX_ONE_TUNER), + DVB_USB_DEV(DIBCOM, DIBCOM_HOOK_DEFAULT_STK7770P), { } }; @@ -5242,6 +5244,30 @@ { NULL }, }, }, + }, { DIB0700_DEFAULT_DEVICE_PROPERTIES, + .num_adapters = 1, + .adapter = { + { + DIB0700_NUM_FRONTENDS(1), + .fe = {{ + .caps = DVB_USB_ADAP_HAS_PID_FILTER | DVB_USB_ADAP_PID_FILTER_CAN_BE_TURNED_OFF, + .pid_filter_count = 32, + .pid_filter = stk70x0p_pid_filter, + .pid_filter_ctrl = stk70x0p_pid_filter_ctrl, + .frontend_attach = stk7770p_frontend_attach, + .tuner_attach = dib7770p_tuner_attach, + + DIB0700_DEFAULT_STREAMING_CONFIG(0x02), + }}, + }, + }, + .num_device_descs = 1, + .devices = { + { "DiBcom STK7770P reference design no IR", + { &dib0700_usb_id_table[DIBCOM_HOOK_DEFAULT_STK7770P], NULL }, + { NULL }, + }, + }, }, }; diff -ruw linux-6.13.12/drivers/mfd/Kconfig linux-6.13.12-fbx/drivers/mfd/Kconfig --- linux-6.13.12/drivers/mfd/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mfd/Kconfig 2025-09-25 17:40:33.351356238 +0200 @@ -2192,6 +2192,24 @@ additional drivers must be enabled in order to use the functionality of the device. +config MFD_FBXGWR_PMU + tristate "Freebox fbxgwr PMU" + depends on I2C + depends on OF + select MFD_CORE + select REGMAP_I2C + +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_WCD934X tristate "Support for WCD9340/WCD9341 Codec" depends on SLIMBUS diff -ruw linux-6.13.12/drivers/mfd/Makefile linux-6.13.12-fbx/drivers/mfd/Makefile --- linux-6.13.12/drivers/mfd/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mfd/Makefile 2025-09-25 17:40:33.351356238 +0200 @@ -287,6 +287,8 @@ obj-$(CONFIG_MFD_ATC260X) += atc260x-core.o obj-$(CONFIG_MFD_ATC260X_I2C) += atc260x-i2c.o +obj-$(CONFIG_MFD_FBXGWR_PMU) += fbxgwr-pmu.o +obj-$(CONFIG_MFD_FBXGW7R_PANEL) += fbxgw7r-panel.o obj-$(CONFIG_MFD_RSMU_I2C) += rsmu_i2c.o rsmu_core.o obj-$(CONFIG_MFD_RSMU_SPI) += rsmu_spi.o rsmu_core.o diff -ruw linux-6.13.12/drivers/misc/Kconfig linux-6.13.12-fbx/drivers/misc/Kconfig --- linux-6.13.12/drivers/misc/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/misc/Kconfig 2025-09-25 17:40:33.375356357 +0200 @@ -413,6 +413,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 @@ -434,6 +446,12 @@ 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 + select FBXSERIAL + config LATTICE_ECP3_CONFIG tristate "Lattice ECP3 FPGA bitstream configuration via SPI" depends on SPI && SYSFS @@ -634,6 +652,9 @@ - lan966x-miim (MDIO_MSCC_MIIM) - lan966x-switch (LAN966X_SWITCH) +config DGASP + bool "dying gasp infrastructure" + source "drivers/misc/c2port/Kconfig" source "drivers/misc/eeprom/Kconfig" source "drivers/misc/cb710/Kconfig" @@ -651,4 +672,6 @@ source "drivers/misc/pvpanic/Kconfig" source "drivers/misc/mchp_pci1xxxx/Kconfig" source "drivers/misc/keba/Kconfig" +source "drivers/misc/remoti/Kconfig" +source "drivers/misc/hdmi-cec/Kconfig" endmenu diff -ruw linux-6.13.12/drivers/misc/Makefile linux-6.13.12-fbx/drivers/misc/Makefile --- linux-6.13.12/drivers/misc/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/misc/Makefile 2025-09-25 17:40:33.375356357 +0200 @@ -22,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 @@ -40,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 += lis3lv02d/ obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_INTEL_MEI) += mei/ @@ -74,3 +77,5 @@ lan966x-pci-objs += lan966x_pci.dtbo.o obj-$(CONFIG_MCHP_LAN966X_PCI) += lan966x-pci.o obj-y += keba/ +obj-y += remoti/ +obj-$(CONFIG_DGASP) += dgasp.o diff -ruw linux-6.13.12/drivers/misc/eeprom/Kconfig linux-6.13.12-fbx/drivers/misc/eeprom/Kconfig --- linux-6.13.12/drivers/misc/eeprom/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/misc/eeprom/Kconfig 2025-09-25 17:40:33.387356416 +0200 @@ -119,4 +119,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.13.12/drivers/misc/eeprom/Makefile linux-6.13.12-fbx/drivers/misc/eeprom/Makefile --- linux-6.13.12/drivers/misc/eeprom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/misc/eeprom/Makefile 2025-09-25 17:40:33.387356416 +0200 @@ -7,3 +7,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.13.12/drivers/misc/eeprom/at24.c linux-6.13.12-fbx/drivers/misc/eeprom/at24.c --- linux-6.13.12/drivers/misc/eeprom/at24.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/misc/eeprom/at24.c 2025-09-25 17:40:33.391356436 +0200 @@ -608,7 +608,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); @@ -629,8 +628,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; @@ -770,21 +771,6 @@ } pm_runtime_enable(dev); - /* - * 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; - } - } - at24->nvmem = devm_nvmem_register(dev, &nvmem_config); if (IS_ERR(at24->nvmem)) { pm_runtime_disable(dev); diff -ruw linux-6.13.12/drivers/mmc/core/Kconfig linux-6.13.12-fbx/drivers/mmc/core/Kconfig --- linux-6.13.12/drivers/mmc/core/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/core/Kconfig 2025-09-25 17:40:33.411356535 +0200 @@ -64,6 +64,10 @@ If unsure, say 8 here. +config MMC_BLOCK_IGNORE_RO_AREA + bool + depends on MMC_BLOCK + config SDIO_UART tristate "SDIO UART/GPS class support" depends on TTY diff -ruw linux-6.13.12/drivers/mmc/core/block.c linux-6.13.12-fbx/drivers/mmc/core/block.c --- linux-6.13.12/drivers/mmc/core/block.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/core/block.c 2025-09-25 17:40:33.411356535 +0200 @@ -2448,6 +2448,58 @@ return mmc_blk_rw_wait(mq, NULL); } +static bool __mmc_within_ro_area(const struct ro_area *ro_area, + u64 start, u64 end) +{ + if (end < start) + /* + * overflow: be on the safe side. + */ + return true; + + if (start < ro_area->end && end > ro_area->start) + return true; + return false; +} + +static bool mmc_blk_within_ro_area(struct mmc_card *card, + struct mmc_blk_data *md, + struct request *req) +{ + const struct ro_area *ro_area; + u64 bytes_start, bytes_end; + + switch (req_op(req)) { + case REQ_OP_DISCARD: + case REQ_OP_SECURE_ERASE: + case REQ_OP_WRITE_ZEROES: + case REQ_OP_WRITE: + break; + default: + return false; + } + + switch (md->part_type) { + case 0x0: + // user area; + ro_area = &card->user_ro_area; + break; + case EXT_CSD_PART_CONFIG_ACC_BOOT0: + case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1: + // any boot partition + ro_area = &card->boot_ro_area; + break; + default: + return false; + } + + + bytes_start = blk_rq_pos(req) << 9; + bytes_end = bytes_start + (blk_rq_sectors(req) << 9); + + return __mmc_within_ro_area(ro_area, bytes_start, bytes_end); +} + enum mmc_issued mmc_blk_mq_issue_rq(struct mmc_queue *mq, struct request *req) { struct mmc_blk_data *md = mq->blkdata; @@ -2455,6 +2507,9 @@ struct mmc_host *host = card->host; int ret; + if (mmc_blk_within_ro_area(card, md, req)) + return MMC_REQ_WRITE_PROTECTION; + ret = mmc_blk_part_switch(card, md->part_type); if (ret) return MMC_REQ_FAILED_TO_START; @@ -2655,7 +2710,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.13.12/drivers/mmc/core/mmc.c linux-6.13.12-fbx/drivers/mmc/core/mmc.c --- linux-6.13.12/drivers/mmc/core/mmc.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/core/mmc.c 2025-09-25 17:40:33.415356555 +0200 @@ -1585,6 +1585,21 @@ return mmc_execute_tuning(card); } +static void mmc_read_of_ro_area(struct mmc_card *card, const char *of_key, + struct ro_area *ro_area) +{ + u64 v[2]; + + if (!IS_ENABLED(CONFIG_MMC_BLOCK_IGNORE_RO_AREA) && + !of_property_read_u64_array(card->host->parent->of_node, + of_key, v, 2)) { + ro_area->start = v[0]; + ro_area->end = v[0] + v[1]; + } + dev_info(&card->dev, "%s %08llx - %08llx\n", of_key, + ro_area->start, ro_area->end); +} + /* * Handle the detection and initialisation of a card. * @@ -1660,6 +1675,11 @@ memcpy(card->raw_cid, cid, sizeof(card->raw_cid)); } + mmc_read_of_ro_area(card, "boot-ro-area", + &card->boot_ro_area); + mmc_read_of_ro_area(card, "user-ro-area", + &card->user_ro_area); + /* * Call the optional HC's init_card function to handle quirks. */ diff -ruw linux-6.13.12/drivers/mmc/core/queue.c linux-6.13.12-fbx/drivers/mmc/core/queue.c --- linux-6.13.12/drivers/mmc/core/queue.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/core/queue.c 2025-09-25 17:40:33.415356555 +0200 @@ -312,6 +312,9 @@ case MMC_REQ_FAILED_TO_START: ret = BLK_STS_IOERR; break; + case MMC_REQ_WRITE_PROTECTION: + ret = BLK_STS_PROTECTION; + break; default: ret = BLK_STS_OK; break; diff -ruw linux-6.13.12/drivers/mmc/core/queue.h linux-6.13.12-fbx/drivers/mmc/core/queue.h --- linux-6.13.12/drivers/mmc/core/queue.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/core/queue.h 2025-09-25 17:40:33.415356555 +0200 @@ -12,6 +12,7 @@ MMC_REQ_STARTED, MMC_REQ_BUSY, MMC_REQ_FAILED_TO_START, + MMC_REQ_WRITE_PROTECTION, MMC_REQ_FINISHED, }; diff -ruw linux-6.13.12/drivers/mmc/host/Kconfig linux-6.13.12-fbx/drivers/mmc/host/Kconfig --- linux-6.13.12/drivers/mmc/host/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/host/Kconfig 2025-09-25 17:40:33.419356575 +0200 @@ -803,6 +803,15 @@ the Synopsys DesignWare Memory Card Interface driver. Select this option for platforms based on Mellanox BlueField SoC's. +config MMC_DW_CORTINA + tristate "Cortina specific extensions for Synopsys DW Memory Card Interface" + depends on MMC_DW + select MMC_DW_PLTFM + help + This selects support for Cortina Access SoC specific extensions to the + Synopsys DesignWare Memory Card Interface driver. Select this option + for platforms based on Cortina Access SoC's. + config MMC_DW_EXYNOS tristate "Exynos specific extensions for Synopsys DW Memory Card Interface" depends on MMC_DW @@ -1039,7 +1048,7 @@ config MMC_SDHCI_BRCMSTB tristate "Broadcom SDIO/SD/MMC support" - depends on ARCH_BRCMSTB || ARCH_BCM2835 || BMIPS_GENERIC || COMPILE_TEST + depends on ARCH_BRCMSTB || ARCH_BCM2835 || BMIPS_GENERIC || ARCH_BCMBCA || COMPILE_TEST depends on MMC_SDHCI_PLTFM select MMC_CQHCI default ARCH_BRCMSTB || BMIPS_GENERIC diff -ruw linux-6.13.12/drivers/mmc/host/Makefile linux-6.13.12-fbx/drivers/mmc/host/Makefile --- linux-6.13.12/drivers/mmc/host/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mmc/host/Makefile 2025-09-25 17:40:33.419356575 +0200 @@ -50,6 +50,7 @@ obj-$(CONFIG_MMC_DW) += dw_mmc.o obj-$(CONFIG_MMC_DW_PLTFM) += dw_mmc-pltfm.o obj-$(CONFIG_MMC_DW_BLUEFIELD) += dw_mmc-bluefield.o +obj-$(CONFIG_MMC_DW_CORTINA)+= dw_mmc-cortina.o obj-$(CONFIG_MMC_DW_EXYNOS) += dw_mmc-exynos.o obj-$(CONFIG_MMC_DW_HI3798CV200) += dw_mmc-hi3798cv200.o obj-$(CONFIG_MMC_DW_HI3798MV200) += dw_mmc-hi3798mv200.o diff -ruw linux-6.13.12/drivers/mtd/Kconfig linux-6.13.12-fbx/drivers/mtd/Kconfig --- linux-6.13.12/drivers/mtd/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/Kconfig 2025-09-25 17:40:33.447356714 +0200 @@ -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.13.12/drivers/mtd/mtdchar.c linux-6.13.12-fbx/drivers/mtd/mtdchar.c --- linux-6.13.12/drivers/mtd/mtdchar.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/mtdchar.c 2025-09-25 17:40:33.451356733 +0200 @@ -168,6 +168,7 @@ { struct mtd_oob_ops ops = {}; + memset(&ops, 0, sizeof (ops)); ops.mode = MTD_OPS_RAW; ops.datbuf = kbuf; ops.oobbuf = NULL; @@ -262,6 +263,7 @@ { struct mtd_oob_ops ops = {}; + memset(&ops, 0, sizeof (ops)); ops.mode = MTD_OPS_RAW; ops.datbuf = kbuf; ops.oobbuf = NULL; @@ -947,6 +949,11 @@ erase->len = einfo32.length; } +#ifdef CONFIG_MTD_ERASE_PRINTK + printk(KERN_DEBUG "mtd: %s: ERASE offset=@%08llx\n", + mtd->name, erase->addr); +#endif + ret = mtd_erase(mtd, erase); kfree(erase); } diff -ruw linux-6.13.12/drivers/mtd/mtdcore.c linux-6.13.12-fbx/drivers/mtd/mtdcore.c --- linux-6.13.12/drivers/mtd/mtdcore.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/mtdcore.c 2025-09-25 17:40:33.451356733 +0200 @@ -339,6 +339,56 @@ } MTD_DEVICE_ATTR_RO(bbt_blocks); +static ssize_t mtd_nand_type_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%s\n", mtd->nand_type); +} +static DEVICE_ATTR(nand_type, S_IRUGO, mtd_nand_type_show, NULL); + +static ssize_t mtd_nand_manufacturer_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%s\n", mtd->nand_manufacturer); +} +static DEVICE_ATTR(nand_manufacturer, S_IRUGO, mtd_nand_manufacturer_show, NULL); + +static ssize_t mtd_nand_onfi_ecc_bits_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%d\n", mtd->onfi_ecc_bits); +} +static DEVICE_ATTR(onfi_ecc_bits, S_IRUGO, mtd_nand_onfi_ecc_bits_show, NULL); + +static ssize_t mtd_nand_onfi_model_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%s\n", + mtd->onfi_model ? mtd->onfi_model : "unknown"); +} +static DEVICE_ATTR(onfi_model, S_IRUGO, mtd_nand_onfi_model_show, NULL); + +static ssize_t mtd_nand_ids_show(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct mtd_info *mtd = dev_get_drvdata(dev); + + return snprintf(buf, PAGE_SIZE, "%02x%02x%02x%02x%02x%02x%02x%02x\n", + mtd->nand_ids[0], mtd->nand_ids[1], + mtd->nand_ids[2], mtd->nand_ids[3], + mtd->nand_ids[4], mtd->nand_ids[5], + mtd->nand_ids[6], mtd->nand_ids[7]); +} +static DEVICE_ATTR(nand_ids, S_IRUGO, mtd_nand_ids_show, NULL); + static struct attribute *mtd_attrs[] = { &dev_attr_type.attr, &dev_attr_flags.attr, @@ -357,6 +407,11 @@ &dev_attr_bad_blocks.attr, &dev_attr_bbt_blocks.attr, &dev_attr_bitflip_threshold.attr, + &dev_attr_nand_type.attr, + &dev_attr_nand_manufacturer.attr, + &dev_attr_onfi_ecc_bits.attr, + &dev_attr_onfi_model.attr, + &dev_attr_nand_ids.attr, NULL, }; ATTRIBUTE_GROUPS(mtd); diff -ruw linux-6.13.12/drivers/mtd/mtdpart.c linux-6.13.12-fbx/drivers/mtd/mtdpart.c --- linux-6.13.12/drivers/mtd/mtdpart.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/mtdpart.c 2025-09-25 17:40:33.451356733 +0200 @@ -74,6 +74,11 @@ child->oobsize = parent->oobsize; child->oobavail = parent->oobavail; child->subpage_sft = parent->subpage_sft; + child->nand_type = parent->nand_type; + child->nand_manufacturer = parent->nand_manufacturer; + child->onfi_ecc_bits = parent->onfi_ecc_bits; + child->onfi_model = parent->onfi_model; + memcpy(child->nand_ids, parent->nand_ids, 8); child->name = name; child->owner = parent->owner; diff -ruw linux-6.13.12/drivers/mtd/nand/raw/Kconfig linux-6.13.12-fbx/drivers/mtd/nand/raw/Kconfig --- linux-6.13.12/drivers/mtd/nand/raw/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/nand/raw/Kconfig 2025-09-25 17:40:33.455356753 +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.13.12/drivers/mtd/nand/raw/Makefile linux-6.13.12-fbx/drivers/mtd/nand/raw/Makefile --- linux-6.13.12/drivers/mtd/nand/raw/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/nand/raw/Makefile 2025-09-25 17:40:33.455356753 +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.13.12/drivers/mtd/parsers/Kconfig linux-6.13.12-fbx/drivers/mtd/parsers/Kconfig --- linux-6.13.12/drivers/mtd/parsers/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/parsers/Kconfig 2025-09-25 17:40:33.467356813 +0200 @@ -91,6 +91,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 @@ -215,3 +219,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.13.12/drivers/mtd/parsers/Makefile linux-6.13.12-fbx/drivers/mtd/parsers/Makefile --- linux-6.13.12/drivers/mtd/parsers/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/parsers/Makefile 2025-09-25 17:40:33.471356833 +0200 @@ -15,3 +15,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.13.12/drivers/mtd/parsers/ofpart_core.c linux-6.13.12-fbx/drivers/mtd/parsers/ofpart_core.c --- linux-6.13.12/drivers/mtd/parsers/ofpart_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/parsers/ofpart_core.c 2025-09-25 17:40:33.471356833 +0200 @@ -157,8 +157,10 @@ partname = of_get_property(pp, "name", &len); parts[i].name = partname; +#ifndef CONFIG_MTD_OF_PARTS_IGNORE_RO if (of_property_read_bool(pp, "read-only")) parts[i].mask_flags |= MTD_WRITEABLE; +#endif if (of_property_read_bool(pp, "lock")) parts[i].mask_flags |= MTD_POWERUP_LOCK; diff -ruw linux-6.13.12/drivers/mtd/spi-nor/atmel.c linux-6.13.12-fbx/drivers/mtd/spi-nor/atmel.c --- linux-6.13.12/drivers/mtd/spi-nor/atmel.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/spi-nor/atmel.c 2025-09-25 17:40:33.471356833 +0200 @@ -238,6 +238,14 @@ .flags = SPI_NOR_HAS_LOCK, .no_sfdp_flags = SECT_4K, .fixups = &at25fs_nor_fixups + }, { + /* Used on Freebox Gateways ... */ + .id = SNOR_ID(0x1f, 0x65, 0x00), + .name = "at25f512b", + .alt_probe_id = 0x1f65, + .sector_size = SZ_32K, + .size = SZ_128K, + .flags = ALT_PROBE_ATMEL, }, }; diff -ruw linux-6.13.12/drivers/mtd/spi-nor/core.c linux-6.13.12-fbx/drivers/mtd/spi-nor/core.c --- linux-6.13.12/drivers/mtd/spi-nor/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/spi-nor/core.c 2025-09-25 17:40:33.471356833 +0200 @@ -787,6 +787,18 @@ return spi_nor_wait_till_ready(nor); } +static void sst_ewrsr(struct spi_nor *nor) +{ + struct spi_mem_op op = + SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_EWRSR, 1), + SPI_MEM_OP_NO_ADDR, + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_NO_DATA); + + BUG_ON(!nor->spimem); + spi_mem_exec_op(nor->spimem, &op); +} + /** * spi_nor_write_sr() - Write the Status Register. * @nor: pointer to 'struct spi_nor'. @@ -803,6 +815,9 @@ if (ret) return ret; + if (nor->info->flags & SST_EWRSR) + sst_ewrsr(nor); + if (nor->spimem) { struct spi_mem_op op = SPI_NOR_WRSR_OP(sr, len); @@ -2006,6 +2021,40 @@ return NULL; } +static const struct flash_info * +spi_nor_search_part_by_alt_id(const struct flash_info *parts, + unsigned int nparts, + const u32 id) + +{ + int i; + + for (i = 0; i < nparts; i++) { + const struct flash_info *info = &parts[i]; + if ((info->flags & ALT_PROBE) && (info->alt_probe_id == id)) + return info; + } + + return NULL; +} + +static const struct flash_info * +spi_nor_search_part_by_atmel_id(const struct flash_info *parts, + unsigned int nparts, + const u32 id) + +{ + int i; + + for (i = 0; i < nparts; i++) { + const struct flash_info *info = &parts[i]; + if ((info->flags & ALT_PROBE_ATMEL) && (info->alt_probe_id == id)) + return info; + } + + return NULL; +} + static const struct flash_info *spi_nor_detect(struct spi_nor *nor) { const struct flash_info *info; @@ -2040,6 +2089,80 @@ return info; } +static const struct flash_info *spi_nor_alt_read_id(struct spi_nor *nor) +{ + u8 *data = nor->bouncebuf; + u16 id; + int err; + size_t i; + const struct flash_info *info; + struct spi_mem_op op = + SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_RDID_ALT, 1), + SPI_MEM_OP_ADDR(3, 0, 1), + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_DATA_IN(2, data, 1)); + + BUG_ON(!nor->spimem); + + err = spi_mem_exec_op(nor->spimem, &op); + if (err < 0) { + dev_err(nor->dev, "error %d reading alt ID\n", err); + return ERR_PTR(err); + } + + id = (data[1] << 8) | data[0]; + + for (i = 0; i < ARRAY_SIZE(manufacturers); i++) { + info = spi_nor_search_part_by_alt_id(manufacturers[i]->parts, + manufacturers[i]->nparts, + id); + if (info) { + nor->manufacturer = manufacturers[i]; + return info; + } + } + + + dev_err(nor->dev, "unrecognized ALT id %04x\n", id); + return ERR_PTR(-ENODEV); +} + +static const struct flash_info *spi_nor_atmel_id(struct spi_nor *nor) +{ + u8 *data = nor->bouncebuf; + u16 id; + int err; + size_t i; + const struct flash_info *info; + struct spi_mem_op op = + SPI_MEM_OP(SPI_MEM_OP_CMD(0x15, 1), + SPI_MEM_OP_NO_ADDR, + SPI_MEM_OP_NO_DUMMY, + SPI_MEM_OP_DATA_IN(2, data, 1)); + + BUG_ON(!nor->spimem); + + err = spi_mem_exec_op(nor->spimem, &op); + if (err < 0) { + dev_err(nor->dev, "error %d reading atmel ID\n", err); + return ERR_PTR(err); + } + id = (data[1] << 8) | data[0]; + + for (i = 0; i < ARRAY_SIZE(manufacturers); i++) { + info = spi_nor_search_part_by_atmel_id(manufacturers[i]->parts, + manufacturers[i]->nparts, + id); + if (info) { + nor->manufacturer = manufacturers[i]; + return info; + } + } + + dev_err(nor->dev, "unrecognized ATMEL id %04x\n", id); + return ERR_PTR(-ENODEV); +} + static int spi_nor_read(struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf) { @@ -3295,6 +3418,17 @@ return NULL; } +static void sst_write_enable(struct spi_nor *nor) +{ + u8 *pzero = nor->bouncebuf; + + spi_nor_write_enable(nor); + sst_ewrsr(nor); + + pzero[0] = 0; + spi_nor_write_sr(nor, pzero, 1); +} + static const struct flash_info *spi_nor_get_flash_info(struct spi_nor *nor, const char *name) { @@ -3310,6 +3444,12 @@ if (!info || info->id) { const struct flash_info *jinfo; + jinfo = spi_nor_alt_read_id(nor); + if (IS_ERR(jinfo)) + /* try ATMEL */ + jinfo = spi_nor_atmel_id(nor); + if (IS_ERR(jinfo)) + /* try JEDEC */ jinfo = spi_nor_detect(nor); if (IS_ERR(jinfo)) return jinfo; @@ -3485,6 +3625,9 @@ if (spi_nor_use_parallel_locking(nor)) init_waitqueue_head(&nor->rww.wait); + if (info->flags & SST_EWRSR) + sst_write_enable(nor); + /* * Configure the SPI memory: * - select op codes for (Fast) Read, Page Program and Sector Erase. diff -ruw linux-6.13.12/drivers/mtd/spi-nor/core.h linux-6.13.12-fbx/drivers/mtd/spi-nor/core.h --- linux-6.13.12/drivers/mtd/spi-nor/core.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/spi-nor/core.h 2025-09-25 17:40:33.471356833 +0200 @@ -505,6 +505,7 @@ struct flash_info { char *name; const struct spi_nor_id *id; + uint32_t alt_probe_id; size_t size; unsigned sector_size; u16 page_size; @@ -521,6 +522,9 @@ #define SPI_NOR_NO_ERASE BIT(6) #define SPI_NOR_QUAD_PP BIT(8) #define SPI_NOR_RWW BIT(9) +#define ALT_PROBE BIT(10) /* only match during alt_probe */ +#define ALT_PROBE_ATMEL BIT(11) /* only match during alt_probe_atmel */ +#define SST_EWRSR BIT(12) /* EWRSR opcode before WRSR */ u8 no_sfdp_flags; #define SPI_NOR_SKIP_SFDP BIT(0) diff -ruw linux-6.13.12/drivers/mtd/spi-nor/eon.c linux-6.13.12-fbx/drivers/mtd/spi-nor/eon.c --- linux-6.13.12/drivers/mtd/spi-nor/eon.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/spi-nor/eon.c 2025-09-25 17:40:33.471356833 +0200 @@ -62,6 +62,13 @@ }, { .id = SNOR_ID(0x1c, 0x70, 0x19), .name = "en25qh256", + }, { + /* Used on Freebox Gateways ... */ + .id = SNOR_ID(0x1c, 0x05, 0x00), + .alt_probe_id = 0x1c05, + .size = SZ_64K, + .name = "en25f05", + .flags = ALT_PROBE, }, }; diff -ruw linux-6.13.12/drivers/mtd/spi-nor/macronix.c linux-6.13.12-fbx/drivers/mtd/spi-nor/macronix.c --- linux-6.13.12/drivers/mtd/spi-nor/macronix.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/spi-nor/macronix.c 2025-09-25 17:40:33.471356833 +0200 @@ -56,6 +56,11 @@ .size = SZ_64K, .no_sfdp_flags = SECT_4K, }, { + .id = SNOR_ID(0xc2, 0x20, 0x11), + .name = "mx25v1006f", + .size = SZ_128K, + .no_sfdp_flags = SECT_4K, + }, { .id = SNOR_ID(0xc2, 0x20, 0x12), .name = "mx25l2005a", .size = SZ_256K, @@ -199,7 +204,15 @@ .name = "mx25l3255e", .size = SZ_4M, .no_sfdp_flags = SECT_4K, + }, { + /* Used on Freebox Gateways ... */ + .id = SNOR_ID(0xc2, 0x05, 0x00), + .alt_probe_id = 0xc205, + .name = "mx25l512", + .size = SZ_64K, + .flags = ALT_PROBE, }, + /* * This spares us of adding new flash entries for flashes that can be * initialized solely based on the SFDP data, but still need the diff -ruw linux-6.13.12/drivers/mtd/spi-nor/sst.c linux-6.13.12-fbx/drivers/mtd/spi-nor/sst.c --- linux-6.13.12/drivers/mtd/spi-nor/sst.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/mtd/spi-nor/sst.c 2025-09-25 17:40:33.475356852 +0200 @@ -164,7 +164,14 @@ .name = "sst26wf016b", .size = SZ_2M, .no_sfdp_flags = SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ, - } + }, { + /* Used on Freebox Gateways ... */ + .id = SNOR_ID(0xbf, 0x48, 0x00), + .alt_probe_id = 0xbf48, + .name = "sst25vf512a", + .size = SZ_64K, + .flags = ALT_PROBE | SST_EWRSR, + }, }; static int sst_nor_write_data(struct spi_nor *nor, loff_t to, size_t len, diff -ruw linux-6.13.12/drivers/net/ethernet/broadcom/Kconfig linux-6.13.12-fbx/drivers/net/ethernet/broadcom/Kconfig --- linux-6.13.12/drivers/net/ethernet/broadcom/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/broadcom/Kconfig 2025-09-25 17:40:33.551357229 +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.13.12/drivers/net/ethernet/broadcom/Makefile linux-6.13.12-fbx/drivers/net/ethernet/broadcom/Makefile --- linux-6.13.12/drivers/net/ethernet/broadcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/broadcom/Makefile 2025-09-25 17:40:33.551357229 +0200 @@ -18,3 +18,5 @@ obj-$(CONFIG_SYSTEMPORT) += bcmsysport.o obj-$(CONFIG_BNXT) += bnxt/ obj-$(CONFIG_BCMASP) += asp2/ +obj-$(CONFIG_BCM63XX_ENET_RUNNER) += bcm63xx_enet_runner/ +obj-y += bcm63158/ diff -ruw linux-6.13.12/drivers/net/ethernet/cortina/Kconfig linux-6.13.12-fbx/drivers/net/ethernet/cortina/Kconfig --- linux-6.13.12/drivers/net/ethernet/cortina/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/cortina/Kconfig 2025-09-25 17:40:33.631357626 +0200 @@ -2,7 +2,7 @@ # Cortina ethernet devices config NET_VENDOR_CORTINA - bool "Cortina Gemini devices" + bool "Cortina devices" default y help If you have a network (Ethernet) card belonging to this class, say Y @@ -20,4 +20,28 @@ help This driver supports StorLink SL351x (Gemini) dual Gigabit Ethernet. +config CA_NI_ENET + tristate "Cortina ni ethernet driver (for 827x)" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + help + Not usable at the same time as cortina-network-engine + proprietary module. Only use to ease low level development + or if you need NFS root. + +config CORTINA_NETWORK_ENGINE + tristate "Cortina Network Engine driver (for ca8289)" + depends on ARCH_CORTINA || COMPILE_TEST + +if CORTINA_NETWORK_ENGINE + +config CORTINA_NETWORK_ENGINE_DEBUGFS + bool "DebugFS entry" + default n + help + If selected, the network engine driver will create a debugfs + entry letting us dump the internal state of the engine + from userland (counters, ...). + +endif # CORTINA_NETWORK_ENGINE + endif # NET_VENDOR_CORTINA diff -ruw linux-6.13.12/drivers/net/ethernet/cortina/Makefile linux-6.13.12-fbx/drivers/net/ethernet/cortina/Makefile --- linux-6.13.12/drivers/net/ethernet/cortina/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/cortina/Makefile 2025-09-25 17:40:33.631357626 +0200 @@ -1,4 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 -# Makefile for the Cortina Gemini network device drivers. obj-$(CONFIG_GEMINI_ETHERNET) += gemini.o +obj-$(CONFIG_CA_NI_ENET) += ca_ni_enet.o + +obj-y += network_engine/ diff -ruw linux-6.13.12/drivers/net/ethernet/marvell/Kconfig linux-6.13.12-fbx/drivers/net/ethernet/marvell/Kconfig --- linux-6.13.12/drivers/net/ethernet/marvell/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/marvell/Kconfig 2025-09-25 17:40:33.783358380 +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.13.12/drivers/net/ethernet/marvell/mvpp2/mvpp2.h linux-6.13.12-fbx/drivers/net/ethernet/marvell/mvpp2/mvpp2.h --- linux-6.13.12/drivers/net/ethernet/marvell/mvpp2/mvpp2.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/marvell/mvpp2/mvpp2.h 2025-09-25 17:40:33.783358380 +0200 @@ -281,7 +281,13 @@ #define MVPP2_ISR_RX_TX_CAUSE_REG(port) (0x5480 + 4 * (port)) #define MVPP2_CAUSE_RXQ_OCCUP_DESC_ALL_MASK(version) \ ((version) == MVPP21 ? 0xffff : 0xff) + +#ifdef CONFIG_MVPP2_FBX_FF +#define MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK 0x7f0000 +#else #define MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_MASK 0xff0000 +#endif + #define MVPP2_CAUSE_TXQ_OCCUP_DESC_ALL_OFFSET 16 #define MVPP2_CAUSE_RX_FIFO_OVERRUN_MASK BIT(24) #define MVPP2_CAUSE_FCS_ERR_MASK BIT(25) @@ -376,6 +382,7 @@ #define MVPP2_RX_PKTS_FULL_QUEUE_DROP_CTR 0x7220 #define MVPP2_RX_PKTS_EARLY_DROP_CTR 0x7224 #define MVPP2_RX_PKTS_BM_DROP_CTR 0x7228 +#define MVPP2_BM_DROP_CTR(pool) (0x7300 + (pool * 4)) #define MVPP2_CLS_DEC_TBL_HIT_CTR 0x7700 #define MVPP2_CLS_FLOW_TBL_HIT_CTR 0x7704 @@ -403,6 +410,7 @@ #define MVPP2_TXQ_TOKEN_SIZE_MAX 0x7fffffff #define MVPP2_TXQ_SCHED_TOKEN_CNTR_REG(q) (0x8080 + ((q) << 2)) #define MVPP2_TXQ_TOKEN_CNTR_MAX 0xffffffff +#define MVPP2_TXQ_SCHED_BCOUNT_CFG_REG(q) (0x80A0 + ((q) << 2)) /* TX general registers */ #define MVPP2_TX_SNOOP_REG 0x8800 @@ -459,6 +467,7 @@ #define MVPP2_GMAC_STATUS0_RX_PAUSE BIT(4) #define MVPP2_GMAC_STATUS0_TX_PAUSE BIT(5) #define MVPP2_GMAC_STATUS0_AN_COMPLETE BIT(11) +#define MVPP2_GMAC_STATUS0_SYNC_OK BIT(14) #define MVPP2_GMAC_PORT_FIFO_CFG_1_REG 0x1c #define MVPP2_GMAC_TX_FIFO_MIN_TH_OFFS 6 #define MVPP2_GMAC_TX_FIFO_MIN_TH_ALL_MASK 0x1fc0 @@ -605,6 +614,8 @@ #define MAC_CLK_RESET_MAC BIT(2) #define MVPP22_MPCS_CLK_RESET_DIV_RATIO(n) ((n) << 4) #define MVPP22_MPCS_CLK_RESET_DIV_SET BIT(11) +#define MVPP22_MPCS_GEARBOX_STATUS 0xd0 +#define MVPP22_MPCS_GEARBOX_STATUS_LANELOCK BIT(0) /* FCA registers. PPv2.2 and PPv2.3 */ #define MVPP22_FCA_BASE(port) (0x7600 + (port) * 0x1000) @@ -739,7 +750,7 @@ /* Max number of Tx descriptors */ #define MVPP2_MAX_TXD_MAX 2048 -#define MVPP2_MAX_TXD_DFLT 1024 +#define MVPP2_MAX_TXD_DFLT 2048 /* Amount of Tx descriptors that can be reserved at once by CPU */ #define MVPP2_CPU_DESC_CHUNK 64 @@ -991,6 +1002,9 @@ #define MVPP2_MIB_COUNTERS_STATS_DELAY (1 * HZ) +#define MVPP2_LINKDOWN_10G_WA_WORK_FREQ (1 * HZ) +#define MVPP2_LINKDOWN_10G_WA_RESET_DELAY (15 * HZ) + #define MVPP2_DESC_DMA_MASK DMA_BIT_MASK(40) /* Buffer header info bits */ @@ -1026,6 +1040,10 @@ /* Shared Packet Processor resources */ struct mvpp2 { +#ifdef CONFIG_MVPP2_FBX_FF + int id; +#endif + /* Shared registers' base addresses */ void __iomem *lms_base; void __iomem *iface_base; @@ -1091,6 +1109,14 @@ char queue_name[31]; struct workqueue_struct *stats_queue; + /* Workqueue to delay phylink state being set to down */ + char phylink_queue_name[30]; + struct workqueue_struct *phylink_down_queue; + + /* Workqueue for serdes workaround */ + char linkdown_10g_wa_queue_name[30]; + struct workqueue_struct *linkdown_10g_wa_queue; + /* Debugfs root entry */ struct dentry *dbgfs_dir; @@ -1147,6 +1173,8 @@ u32 pending_cause_rx; struct mvpp2_port *port; struct cpumask *mask; + char irq_name[32]; + char request_name[64]; }; /* Internal represention of a Flow Steering rule */ @@ -1185,8 +1213,18 @@ u8 next; }; +/* + * ethtool private flags layout (stopgap measure until phylink is + * operational on mvpp2). + */ +#define FBX_SYNC_OK_BIT 0 +#define FBX_CLEAR_MIB_BIT 1 +#define FBX_EN_10G_LINKDOWN_WA 2 +#define FBX_LINKDOWN_DEBOUNCE 3 + struct mvpp2_port { u8 id; + unsigned int index; /* Index of the port from the "group of ports" complex point * of view. This is specific to PPv2.2. @@ -1194,6 +1232,7 @@ int gop_id; int port_irq; + char link_irq_request_name[64]; struct mvpp2 *priv; @@ -1237,6 +1276,14 @@ struct mutex gather_stats_lock; struct delayed_work stats_work; + struct delayed_work phylink_down_work; + + struct delayed_work linkdown_10g_wa_work; + bool linkdown_10g_wa_enable; + unsigned long linkdown_10g_wa_jiffies; + + bool linkdown_debounce; + struct device_node *of_node; phy_interface_t phy_interface; @@ -1274,6 +1321,17 @@ /* Firmware TX flow control */ bool tx_fc; + + /* MII bus for MII bus access ioctls from userspace */ + struct mii_bus *mii_bus; + + /* FBX ratures */ + bool en_fbx_10g1g_switch; + +#ifdef CONFIG_MVPP2_FBX_FF + struct mvpp2_tx_queue *ff_txq; + struct notifier_block ff_notifier; +#endif }; /* The mvpp2_tx_desc and mvpp2_rx_desc structures describe the @@ -1351,7 +1409,7 @@ /* HW RX descriptor for PPv2.2 and PPv2.3 */ struct mvpp22_rx_desc { __le32 status; - __le16 reserved1; + __le16 parser_info; __le16 data_size; __le32 reserved2; __le32 timestamp; @@ -1391,6 +1449,13 @@ struct sk_buff *skb; }; +#ifdef CONFIG_MVPP2_FBX_FF + bool is_rx_buf; + int pool; + phys_addr_t bm_dma; + phys_addr_t bm_phys; +#endif + /* Physical address of transmitted buffer */ dma_addr_t dma; @@ -1410,6 +1475,10 @@ */ int count; +#ifdef CONFIG_MVPP2_FBX_FF + int release_pending; +#endif + int wake_threshold; int stop_threshold; diff -ruw linux-6.13.12/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c linux-6.13.12-fbx/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c --- linux-6.13.12/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c 2025-09-25 17:40:33.787358400 +0200 @@ -39,10 +39,27 @@ #include #include +#ifdef CONFIG_MVPP2_FBX_FF +#include +#include +#include +#include +#include +#include +#include + +#include "../../../net/bridge/br_private.h" +#include "../../../net/fbxbridge/fbxbr_private.h" +#endif + #include "mvpp2.h" #include "mvpp2_prs.h" #include "mvpp2_cls.h" +#ifdef CONFIG_MVPP2_FBX_FF +static struct mvpp2_port *ports_by_idx[4]; +#endif + enum mvpp2_bm_pool_log_num { MVPP2_BM_SHORT, MVPP2_BM_LONG, @@ -64,11 +81,24 @@ #define MVPP2_QDIST_SINGLE_MODE 0 #define MVPP2_QDIST_MULTI_MODE 1 +#ifdef CONFIG_MVPP2_FBX_FF +static int queue_mode = MVPP2_QDIST_SINGLE_MODE; +#else static int queue_mode = MVPP2_QDIST_MULTI_MODE; +#endif module_param(queue_mode, int, 0444); MODULE_PARM_DESC(queue_mode, "Set queue_mode (single=0, multi=1)"); +#ifdef CONFIG_MVPP2_FBX_FF +#define MVPP2_FF_TXQ_ID 7 +#define MVPP2_USABLE_TX_QUEUES 7 +#else +#define MVPP2_USABLE_TX_QUEUES 8 +#endif + +#define MVPP2_TX_FIXED_PRIO_QUEUES (1 << (MVPP2_USABLE_TX_QUEUES - 1)) + /* Utility/helper methods */ void mvpp2_write(struct mvpp2 *priv, u32 offset, u32 data) @@ -311,6 +341,9 @@ { struct mvpp2_txq_pcpu_buf *tx_buf = txq_pcpu->buffs + txq_pcpu->txq_put_index; +#ifdef CONFIG_MVPP2_FBX_FF + tx_buf->is_rx_buf = false; +#endif tx_buf->type = buf_type; if (buf_type == MVPP2_TYPE_SKB) tx_buf->skb = data; @@ -329,7 +362,7 @@ { unsigned int nrxqs; - if (priv->hw_version >= MVPP22 && queue_mode == MVPP2_QDIST_SINGLE_MODE) + if (priv->hw_version == MVPP22 && queue_mode == MVPP2_QDIST_SINGLE_MODE) return 1; /* According to the PPv2.2 datasheet and our experiments on @@ -356,6 +389,2343 @@ return (MVPP2_MAX_TCONT + port) * MVPP2_MAX_TXQ + txq; } + +#ifdef CONFIG_MVPP2_FBX_FF + +static u16 mvpp2_rxdesc_parser_info_get(struct mvpp2_port *port, + struct mvpp2_rx_desc *rx_desc) +{ + if (port->priv->hw_version == MVPP21) + return 0; + else + return rx_desc->pp22.parser_info; +} + +static int mvpp2_aggr_desc_num_check(struct mvpp2_port *port, + struct mvpp2_tx_queue *aggr_txq, int num); + +static void mvpp2_aggr_txq_pend_desc_add(struct mvpp2_port *port, int pending); + +static inline void mvpp2_bm_pool_put(struct mvpp2_port *port, int pool, + dma_addr_t buf_dma_addr, + phys_addr_t buf_phys_addr); + +static int mvpp2_rx_refill(struct mvpp2_port *port, + struct mvpp2_bm_pool *bm_pool, + struct page_pool *page_pool, int pool); + +static int mvpp2_txq_reserved_desc_num_proc(struct mvpp2_port *port, + struct mvpp2_tx_queue *txq, + struct mvpp2_txq_pcpu *txq_pcpu, + int num); + +static struct mvpp2_tx_desc * +mvpp2_txq_next_desc_get(struct mvpp2_tx_queue *txq); + +static inline int mvpp2_txq_sent_desc_proc(struct mvpp2_port *port, + struct mvpp2_tx_queue *txq); + +static void mvpp2_txq_inc_put_ff(struct mvpp2_port *port, + dma_addr_t buf_dma, + phys_addr_t buf_phys, + int pool, + struct mvpp2_txq_pcpu *txq_pcpu, + struct mvpp2_tx_desc *tx_desc) +{ + struct mvpp2_txq_pcpu_buf *tx_buf = + txq_pcpu->buffs + txq_pcpu->txq_put_index; + + tx_buf->is_rx_buf = true; + tx_buf->pool = pool; + tx_buf->bm_dma = buf_dma; + tx_buf->bm_phys = buf_phys; + + txq_pcpu->txq_put_index++; + if (txq_pcpu->txq_put_index == txq_pcpu->size) + txq_pcpu->txq_put_index = 0; +} + +static bool ff_enabled; + +static DEFINE_PER_CPU(spinlock_t, ff_plock); + +/* + * ff lock + */ +static void ff_lock_this_cpu(void) +{ + spinlock_t *lock = &per_cpu(ff_plock, raw_smp_processor_id()); + spin_lock(lock); +} + +static void ff_unlock_this_cpu(void) +{ + spinlock_t *lock = &per_cpu(ff_plock, raw_smp_processor_id()); + spin_unlock(lock); +} + +static void ff_lock_cpu_bh(int cpu) +{ + spinlock_t *lock = &per_cpu(ff_plock, cpu); + spin_lock_bh(lock); +} + +static void ff_unlock_cpu_bh(int cpu) +{ + spinlock_t *lock = &per_cpu(ff_plock, cpu); + spin_unlock_bh(lock); +} + +static void ff_lock_all_cpu_bh(void) +{ + int cpu; + + for_each_online_cpu(cpu) + ff_lock_cpu_bh(cpu); +} + +static void ff_unlock_all_cpu_bh(void) +{ + int cpu; + + for_each_online_cpu(cpu) + ff_unlock_cpu_bh(cpu); +} + +static inline bool pkt_is_ipv4(u32 rx_status) +{ + u32 val; + + val = (rx_status >> 28) & 0x7; + if (val == 1 || val == 2 || val == 3) + return true; + + return false; +} + +static inline bool pkt_is_ipv6(u32 rx_status) +{ + u32 val; + + val = (rx_status >> 28) & 0x7; + if (val == 4 || val == 5) + return true; + + return false; +} + +static inline bool pkt_is_ipvx(u32 rx_status) +{ + return pkt_is_ipv4(rx_status) || pkt_is_ipv6(rx_status); +} + +static inline bool pkt_is_vlan(u16 parser_info) +{ + if (parser_info & (0x3 << 14)) + return true; + return false; +} + + +#define FF_MAX_WAN_DEV 4 + +#define FF_DEV_SWLAN_ID 0 +#define FF_DEV_SWLAN_PORT_INDEX 1 + +#define FF_DEV_WAN_ID 0 +#define FF_DEV_WAN_PORT_INDEX 0 + +#define FF_DEV_SFPLAN_ID 1 +#define FF_DEV_SFPLAN_PORT_INDEX 0 + +static struct { + struct net_device *wan_devs[FF_MAX_WAN_DEV]; + int wan_vlan_ids[FF_MAX_WAN_DEV]; + int wan_active_dev; + struct net_device *lan_dev_sfp; + struct net_device *lan_dev_sw; + + u32 jiffies; + + struct net_device *tun_dev; + u8 tun_ready:1; + u16 tun_mtu; + + /* sit parameters */ + union ff_tun_params { + struct { + u32 src; + u32 s6rd_prefix; + u32 s6rd_pmask; + u8 s6rd_plen; + } sit; + + struct { + /* map parameters */ + u32 ipv4_prefix; + u32 ipv4_pmask; + u8 ipv4_plen; + u8 ipv6_plen; + struct in6_addr src; + struct in6_addr br; + + u64 ipv6_prefix; + u32 ea_addr_mask; + u16 ea_port_mask; + u8 psid_len; + u8 ea_lshift; + } map; + } u; + + char tun_dev_name[IFNAMSIZ]; + char wan_dev_name[IFNAMSIZ]; + + /* configured by userspace, cannot be infered from tunnel + * netdev parameters */ + u32 sit_6rd_br; +} ff; + +static LIST_HEAD(ff_devs); + +struct ff_dev { + const char *desc; + int id; + int port_index; + bool bridge_member; + bool is_wan; + unsigned int vlan; + struct net_device **pvirt_dev; + int *pvlan_id; + + char bridge_hwaddr[6]; + + bool active; + struct net_bridge_port *br_port; + struct fbxbr_port *fbxbr_port; + bool dev_up; + struct list_head next; +}; + +static struct ff_dev swlan; +static struct ff_dev sfplan; +static struct ff_dev wan; + +static inline bool is_bridge_dev(struct net_device *dev) +{ + return dev->priv_flags & IFF_EBRIDGE; +} + +static inline bool is_fbxbridge_port(struct net_device *dev) +{ + return dev->priv_flags & IFF_FBXBRIDGE_PORT; +} + +static u32 gen_netmask(u8 len) +{ + return htonl(~((1 << (32 - len)) - 1)); +} + +static void __ff_tun_set_params(bool ready, + unsigned int mtu, + const union ff_tun_params *tp) +{ + if (!ready) { + if (!ff.tun_ready) + return; + + printk(KERN_DEBUG "ff: tunnel now NOT ready\n"); + ff.tun_ready = 0; + return; + } + + if (ff.tun_ready) { + if (ff.tun_mtu == mtu && !memcmp(tp, &ff.u, sizeof (*tp))) + return; + } + + ff.tun_mtu = mtu; + memcpy(&ff.u, tp, sizeof (*tp)); + + if (!ff.tun_ready) + printk(KERN_DEBUG "ff: tunnel now ready\n"); + else + printk(KERN_DEBUG "ff: tunnel params updated\n"); + + ff.tun_ready = true; +} + +static void __ff_tun_read_params(void) +{ + union ff_tun_params tp; + struct net_device *wan_dev; + + if (!ff.tun_dev) + return; + + if (ff.wan_active_dev == -1) { + __ff_tun_set_params(false, 0, NULL); + return; + } + + wan_dev = ff.wan_devs[ff.wan_active_dev]; + memset(&tp, 0, sizeof (tp)); + + if (ff.tun_dev->type == ARPHRD_SIT) { + const struct ip_tunnel *tun = netdev_priv(ff.tun_dev); + const struct ip_tunnel_6rd_parm *ip6rd = &tun->ip6rd; + + if (!ip6rd->prefixlen || ip6rd->prefixlen > 32) { + printk(KERN_DEBUG "ff: unsupported 6rd plen\n"); + __ff_tun_set_params(false, 0, NULL); + return; + } + + if (ff.tun_dev->mtu + sizeof (struct iphdr) > + wan_dev->mtu) { + printk(KERN_DEBUG "ff: WAN mtu too " + "small for tunnel (%u => %u)\n", + ff.tun_dev->mtu, wan_dev->mtu); + __ff_tun_set_params(false, 0, NULL); + return; + } + + tp.sit.src = tun->parms.iph.saddr; + tp.sit.s6rd_prefix = ip6rd->prefix.s6_addr32[0]; + tp.sit.s6rd_pmask = gen_netmask(ip6rd->prefixlen); + tp.sit.s6rd_plen = ip6rd->prefixlen; + __ff_tun_set_params(true, ff.tun_dev->mtu, &tp); + return; + } + + if (ff.tun_dev->type == ARPHRD_TUNNEL6) { + const struct ip6_tnl *t = netdev_priv(ff.tun_dev); + const struct __ip6_tnl_parm *prm = &t->parms; + const struct __ip6_tnl_fmr *fmr; + + if (ff.tun_dev->mtu + sizeof (struct ipv6hdr) > + wan_dev->mtu) { + printk(KERN_DEBUG "ff: WAN mtu too " + "small for tunnel (%u => %u)\n", + ff.tun_dev->mtu, wan_dev->mtu); + __ff_tun_set_params(false, 0, NULL); + return; + } + + tp.map.src = prm->laddr; + tp.map.br = prm->raddr; + + fmr = prm->fmrs; + if (!fmr) { + tp.map.ipv4_prefix = 0; + __ff_tun_set_params(true, ff.tun_dev->mtu, &tp); + return; + } + + if (fmr->ip6_prefix_len < 32 || + (fmr->ip6_prefix_len + 32 - fmr->ip4_prefix_len > 64)) { + printk(KERN_DEBUG "ff: unsupp MAP-E: eabits " + "span 32 bits\n"); + __ff_tun_set_params(false, 0, NULL); + return; + } + + if (fmr->offset) { + printk(KERN_DEBUG "ff: unsupp MAP-E: non zero " + "PSID offset\n"); + __ff_tun_set_params(false, 0, NULL); + return; + } + + tp.map.ipv4_prefix = fmr->ip4_prefix.s_addr; + tp.map.ipv4_pmask = gen_netmask(fmr->ip4_prefix_len); + tp.map.ipv4_plen = fmr->ip4_prefix_len; + tp.map.ipv6_plen = fmr->ip6_prefix_len; + memcpy(&tp.map.ipv6_prefix, &fmr->ip6_prefix, 8); + + tp.map.ea_addr_mask = ~gen_netmask(fmr->ip4_prefix_len); + if (fmr->ea_len <= 32 - fmr->ip4_prefix_len) { + /* v4 prefix or full IP */ + u32 addr_bits; + + addr_bits = fmr->ip4_prefix_len + fmr->ea_len; + if (addr_bits != 32) + tp.map.ea_addr_mask &= gen_netmask(addr_bits); + tp.map.psid_len = 0; + } else { + u8 psid_len; + + psid_len = fmr->ea_len - (32 - fmr->ip4_prefix_len); + tp.map.psid_len = psid_len; + tp.map.ea_port_mask = gen_netmask(psid_len); + } + + tp.map.ea_lshift = 32 - (fmr->ip6_prefix_len - 32) - + fmr->ea_len; + + __ff_tun_set_params(true, ff.tun_dev->mtu, &tp); + return; + } +} + +static void __ff_tun_capture(void) +{ + struct net_device *dev; + + if (ff.tun_dev) { + printk(KERN_ERR "ff: error: tun already registered\n"); + return; + } + + dev = dev_get_by_name(&init_net, ff.tun_dev_name); + if (!dev) { + return; + } + + if (dev->type != ARPHRD_SIT && dev->type != ARPHRD_TUNNEL6) { + return; + } + + if (!(dev->flags & IFF_UP)) { + dev_put(ff.tun_dev); + return; + } + + ff.tun_dev = dev; + __ff_tun_read_params(); + printk(KERN_INFO "ff: tun dev grabbed\n"); +} + +static void __ff_tun_release(void) +{ + int was_on = 0; + + if (ff.tun_dev) { + dev_put(ff.tun_dev); + ff.tun_dev = NULL; + was_on = 1; + } + if (was_on) + printk(KERN_INFO "ff: tun dev released\n"); +} + +static void __ff_wan_find_active(void) +{ + int i, matching; + + matching = -1; + for (i = 0; i < ARRAY_SIZE(ff.wan_devs); i++) { + if (ff.wan_devs[i] && + !strcmp(ff.wan_devs[i]->name, ff.wan_dev_name)) { + matching = i; + break; + } + } + + if (ff.wan_active_dev != -1) { + if (matching == -1) { + printk("ff: no more selected wan\n"); + ff.wan_active_dev = -1; + __ff_tun_read_params(); + } else if (matching != ff.wan_active_dev) { + printk("ff: selected wan changed\n"); + ff.wan_active_dev = matching; + __ff_tun_read_params(); + } + + } else if (matching != -1) { + printk("ff: selected wan now %s\n", ff.wan_dev_name); + ff.wan_active_dev = matching; + __ff_tun_read_params(); + } +} + +static int ff_device_event(struct notifier_block *this, + unsigned long event, void *ptr) +{ + struct net_device *dev = netdev_notifier_info_to_dev(ptr); + struct mvpp2_port *port; + struct ff_dev *ff_dev; + + if (!net_eq(dev_net(dev), &init_net)) + return 0; + + if (!strcmp(dev->name, ff.tun_dev_name)) { + ff_lock_all_cpu_bh(); + + switch (event) { + case NETDEV_UP: + if (!ff.tun_dev) + __ff_tun_capture(); + break; + + case NETDEV_CHANGE: + case NETDEV_CHANGEMTU: + if (ff.tun_dev == dev) + __ff_tun_read_params(); + break; + + case NETDEV_GOING_DOWN: + case NETDEV_DOWN: + case NETDEV_UNREGISTER: + if (ff.tun_dev == dev) + __ff_tun_release(); + break; + } + + ff_unlock_all_cpu_bh(); + return 0; + } + + port = container_of(this, typeof(*port), ff_notifier); + list_for_each_entry(ff_dev, &ff_devs, next) { + if (port->priv->id != ff_dev->id) + continue; + if (port->index != ff_dev->port_index) + continue; + + if (ff_dev->vlan) { + if (!is_vlan_dev(dev)) + continue; + + switch (event) { + case NETDEV_UP: + if (vlan_dev_upper_dev(dev) != port->dev || + vlan_dev_vlan_id(dev) != ff_dev->vlan) + continue; + + if (ff_dev->active) + continue; + + dev_hold(dev); + + ff_lock_all_cpu_bh(); + *(ff_dev->pvirt_dev) = dev; + if (ff_dev->pvlan_id) + *ff_dev->pvlan_id = ff_dev->vlan; + + if (ff_dev->is_wan) + __ff_wan_find_active(); + + ff_unlock_all_cpu_bh(); + + ff_dev->active = true; + printk(KERN_INFO "ff: ff_dev %s: active " + "for %s\n", ff_dev->desc, + dev->name); + break; + + case NETDEV_GOING_DOWN: + case NETDEV_DOWN: + case NETDEV_UNREGISTER: + if (!ff_dev->active) + continue; + + if (vlan_dev_upper_dev(dev) != port->dev || + vlan_dev_vlan_id(dev) != ff_dev->vlan) + continue; + + ff_lock_all_cpu_bh(); + *(ff_dev->pvirt_dev) = NULL; + + if (ff_dev->is_wan) + __ff_wan_find_active(); + + ff_unlock_all_cpu_bh(); + dev_put(dev); + ff_dev->active = false; + + printk(KERN_INFO "ff: ff_dev %s: now " + "inactive\n", ff_dev->desc); + break; + + default: + break; + } + } + + if (ff_dev->bridge_member) { + struct net_bridge *br; + struct fbxbr *fbxbr; + bool ok; + + switch (event) { + case NETDEV_UP: + if (dev == port->dev) + ff_dev->dev_up = true; + break; + + case NETDEV_GOING_DOWN: + case NETDEV_DOWN: + case NETDEV_UNREGISTER: + if (dev == port->dev) + ff_dev->dev_up = false; + break; + + case NETDEV_CHANGEUPPER: + if (dev == port->dev) { + rcu_read_lock(); + if ((dev->priv_flags & + IFF_BRIDGE_PORT) && + netdev_master_upper_dev_get(dev)) + ff_dev->br_port = br_port_get_rcu(dev); + else + ff_dev->br_port = NULL; + + if ((dev->priv_flags & + IFF_FBXBRIDGE_PORT) && + netdev_master_upper_dev_get(dev)) + ff_dev->fbxbr_port = fbxbr_port_get_rcu(dev); + else + ff_dev->fbxbr_port = NULL; + rcu_read_unlock(); + } + break; + + default: + break; + } + + ok = false; + br = NULL; + fbxbr = NULL; + if (ff_dev->dev_up && ff_dev->br_port) { + br = ff_dev->br_port->br; + if (br->dev->flags & IFF_UP) + ok = true; + } + + if (ff_dev->dev_up && ff_dev->fbxbr_port) { + fbxbr = ff_dev->fbxbr_port->br; + if (fbxbr->dev->flags & IFF_UP) + ok = true; + } + + if (!(ok ^ ff_dev->active)) + continue; + + if (ok) { + struct net_device *true_dev; + + if (br) { + true_dev = br->dev; + } else { + true_dev = port->dev; + } + + dev_hold(true_dev); + ff_lock_all_cpu_bh(); + *(ff_dev->pvirt_dev) = true_dev; + ff_unlock_all_cpu_bh(); + + if (br) + memcpy(ff_dev->bridge_hwaddr, + br->dev->dev_addr, 6); + ff_dev->active = true; + + printk(KERN_INFO "ff: ff_dev %s: active " + "for %s\n", ff_dev->desc, + true_dev->name); + + + } else { + dev = *(ff_dev->pvirt_dev); + ff_lock_all_cpu_bh(); + *(ff_dev->pvirt_dev) = NULL; + ff_unlock_all_cpu_bh(); + dev_put(dev); + ff_dev->active = false; + memset(ff_dev->bridge_hwaddr, 0, 6); + printk(KERN_INFO "ff: ff_dev %s: " + "now inactive\n", ff_dev->desc); + } + } + } + + return 0; +} + +enum ff_xmit_mode { + FF_XMIT_IPV4, + FF_XMIT_IPV6, + FF_XMIT_IPV6_IN_IPV4, + FF_XMIT_IPV4_IN_IPV6, +}; + +static void mvpp2_frag_free(const struct mvpp2_bm_pool *pool, + struct page_pool *page_pool, void *data); +static void mvpp2_bm_bufs_get_addrs(struct device *dev, struct mvpp2 *priv, + struct mvpp2_bm_pool *bm_pool, + dma_addr_t *dma_addr, + phys_addr_t *phys_addr); + +/* + * + */ +static bool ff_force_reclaim(unsigned int thread, + struct mvpp2_port *port, + struct mvpp2_bm_pool *bm_pool, + unsigned int count) +{ + struct mvpp2_tx_queue *txq; + struct mvpp2_txq_pcpu *txq_pcpu; + struct device *device; + bool done; + struct page_pool *pp = NULL; + + if (port->priv->percpu_pools) + pp = port->priv->page_pool[bm_pool->id]; + + txq = port->ff_txq; + txq_pcpu = per_cpu_ptr(txq->pcpu, thread); + + txq_pcpu->release_pending += mvpp2_txq_sent_desc_proc(port, txq); + device = port->dev->dev.parent; + + done = false; + while (txq_pcpu->count > count && txq_pcpu->release_pending) { + struct mvpp2_txq_pcpu_buf *tx_buf; + void *data; + + tx_buf = txq_pcpu->buffs + txq_pcpu->txq_get_index; + if (WARN_ON(!tx_buf->is_rx_buf)) + continue; + + dma_unmap_single(device, + tx_buf->bm_dma, + MVPP2_RX_BUF_SIZE(bm_pool->pkt_size), + DMA_FROM_DEVICE); + + data = (void *)phys_to_virt(tx_buf->bm_dma); + mvpp2_frag_free(bm_pool, pp, data); + txq_pcpu->release_pending--; + txq_pcpu->count--; + mvpp2_txq_inc_get(txq_pcpu); + done = true; + } + return done; +} + +/* + * + */ +static bool ff_can_send(unsigned int thread, + struct mvpp2_port *port, + struct mvpp2_bm_pool *bm_pool) +{ + struct mvpp2_tx_queue *txq; + struct mvpp2_txq_pcpu *txq_pcpu; + + txq = port->ff_txq; + txq_pcpu = per_cpu_ptr(txq->pcpu, thread); + + /* make sure tx queue is not full */ + if (txq_pcpu->count == txq_pcpu->size) { + txq_pcpu->release_pending += + mvpp2_txq_sent_desc_proc(port, txq); + if (!txq_pcpu->release_pending) { + /* if (net_ratelimit()) */ + /* printk("ff: %s: txq_pcpu is full (%u)\n", */ + /* port->dev->name, */ + /* txq_pcpu->count); */ + return false; + } + } + + if (txq_pcpu->count < (txq_pcpu->size / 2)) + return true; + + ff_force_reclaim(thread, port, bm_pool, txq_pcpu->size / 2); + return true; +} + +/* + * + */ +static bool ff_ensure_tx_desc(unsigned int thread, + struct mvpp2_port *port, + struct mvpp2_bm_pool *bm_pool) +{ + struct mvpp2_tx_queue *txq, *aggr_txq; + struct mvpp2_txq_pcpu *txq_pcpu; + + txq = port->ff_txq; + txq_pcpu = per_cpu_ptr(txq->pcpu, thread); + + /* make sure there is space in the aggregated tx queue */ + aggr_txq = &port->priv->aggr_txqs[thread]; + if (mvpp2_aggr_desc_num_check(port, aggr_txq, 1)) { + if (net_ratelimit()) + printk("ff: %s: failed to get 1 desc in aggr tx queue\n", + port->dev->name); + return false; + } + + /* make sure we have space reserved in the ff txq */ + if (!mvpp2_txq_reserved_desc_num_proc(port, txq, txq_pcpu, 1)) + return true; + + ff_force_reclaim(thread, port, bm_pool, txq_pcpu->size / 2); + + if (!mvpp2_txq_reserved_desc_num_proc(port, txq, txq_pcpu, 1)) + return true; + + return false; +} + +/* + * + */ +static void ff_send(unsigned int thread, + struct mvpp2_port *port, + dma_addr_t dma_buf_addr, + phys_addr_t dma_buf_phys, + unsigned int dma_buf_offset, + int dma_buf_pool, + unsigned int send_len, + bool is_ipv4, + bool is_tcp_or_udp, + bool is_tcp, + bool is_vlan) +{ + struct mvpp2_tx_queue *txq, *aggr_txq; + struct mvpp2_txq_pcpu *txq_pcpu; + struct mvpp2_tx_desc *tx_desc; + u32 tx_cmd; + + aggr_txq = &port->priv->aggr_txqs[thread]; + txq = port->ff_txq; + txq_pcpu = per_cpu_ptr(txq->pcpu, thread); + + /* Get a descriptor for packet */ + tx_desc = mvpp2_txq_next_desc_get(aggr_txq); + memset(tx_desc, 0, sizeof (*tx_desc)); + mvpp2_txdesc_txq_set(port, tx_desc, txq->id); + mvpp2_txdesc_size_set(port, tx_desc, send_len); + mvpp2_txdesc_dma_addr_set(port, tx_desc, + dma_buf_addr + dma_buf_offset); + + if (is_vlan) + tx_cmd = (VLAN_ETH_HLEN << MVPP2_TXD_L3_OFF_SHIFT); + else + tx_cmd = (ETH_HLEN << MVPP2_TXD_L3_OFF_SHIFT); + + if (is_ipv4) { + /* 20 is sizeof (ipv4) */ + tx_cmd |= ((20 >> 2) << MVPP2_TXD_IP_HLEN_SHIFT); + } else { + /* 40 is sizeof (ip6hdr) */ + tx_cmd |= ((40 >> 2) << MVPP2_TXD_IP_HLEN_SHIFT); + tx_cmd |= MVPP2_TXD_IP_CSUM_DISABLE; + tx_cmd |= MVPP2_TXD_L3_IP6; + } + + if (is_tcp_or_udp) { + if (!is_tcp) + tx_cmd |= MVPP2_TXD_L4_UDP; + } else { + tx_cmd |= MVPP2_TXD_L4_CSUM_NOT; + } + + /* First and Last descriptor */ + tx_cmd |= MVPP2_TXD_F_DESC | MVPP2_TXD_L_DESC; + mvpp2_txdesc_cmd_set(port, tx_desc, tx_cmd); + mvpp2_txq_inc_put_ff(port, + dma_buf_addr, + dma_buf_phys, + dma_buf_pool, + txq_pcpu, tx_desc); + + txq_pcpu->reserved_num--; + txq_pcpu->count++; + aggr_txq->count++; + + /* Enable transmit */ + wmb(); + mvpp2_aggr_txq_pend_desc_add(port, 1); +} + +/* + * ipv4 forward cache private data + */ +struct ff_priv { + struct in6_addr tun_dest_ip6; + struct dst_entry *tun_dst; +}; + +static void ff_priv_release(const struct ff_priv *priv) +{ + dst_release(priv->tun_dst); +} + +static void ff_priv_destructor_cb(void *data) +{ + const struct ff_priv *priv = (const struct ff_priv *)data; + ff_priv_release(priv); +} + +static const struct ff_priv *ffn_get_ro_priv(const struct ffn_lookup_entry *e) +{ + if (e->manip.priv_destructor != ff_priv_destructor_cb) + return NULL; + + return (const struct ff_priv *)e->manip.ffn_priv_area; +} + +static struct ff_priv *ffn_get_rw_priv(struct ffn_lookup_entry *e) +{ + BUILD_BUG_ON(sizeof (e->manip.ffn_priv_area) < + sizeof (struct ff_priv)); + + if (e->manip.priv_destructor && + e->manip.priv_destructor != ff_priv_destructor_cb) + return NULL; + + return (struct ff_priv *)e->manip.ffn_priv_area; +} + +static const struct ff_priv *fwc_get_ro_priv(const struct fbxbr_fwcache *fwc) +{ + if (fwc->priv_destructor != ff_priv_destructor_cb) + return NULL; + + return (const struct ff_priv *)fwc->priv_area; +} + +static struct ff_priv *fwc_get_rw_priv(const struct fbxbr_fwcache *fwc) +{ + BUILD_BUG_ON(sizeof (fwc->priv_area) < sizeof (struct ff_priv)); + + if (fwc->priv_destructor && + fwc->priv_destructor != ff_priv_destructor_cb) + return NULL; + + return (struct ff_priv *)fwc->priv_area; +} + +/* + * ipv6 forward cache private data + */ +struct ff6_priv { + u32 tun_dest_ip; + struct dst_entry *tun_dst; +}; + +static void ff6_priv_release(const struct ff6_priv *priv) +{ + dst_release(priv->tun_dst); +} + +static void ff6_priv_destructor_cb(void *data) +{ + const struct ff6_priv *priv = (const struct ff6_priv *)data; + ff6_priv_release(priv); +} + +static const struct ff6_priv *ffn6_get_ro_priv(const struct ffn6_lookup_entry *e6) +{ + if (e6->manip.priv_destructor != ff6_priv_destructor_cb) + return NULL; + + return (const struct ff6_priv *)e6->manip.ffn_priv_area; +} + +static struct ff6_priv *ffn6_get_rw_priv(struct ffn6_lookup_entry *e6) +{ + BUILD_BUG_ON(sizeof (e6->manip.ffn_priv_area) < + sizeof (struct ff6_priv)); + + if (e6->manip.priv_destructor && + e6->manip.priv_destructor != ff6_priv_destructor_cb) + return NULL; + + return (struct ff6_priv *)e6->manip.ffn_priv_area; +} + +/* + * + */ +static u32 ff_tun_extract_6rd_addr(const struct in6_addr *d) +{ + u32 a1, a2; + + a1 = ntohl(d->s6_addr32[0] & ~ff.u.sit.s6rd_pmask); + a1 <<= ff.u.sit.s6rd_plen; + + a2 = ntohl(d->s6_addr32[1] & ff.u.sit.s6rd_pmask); + a2 >>= (32 - ff.u.sit.s6rd_plen); + return htonl(a1 | a2); +} + +/* + * + */ +static void ff_tun_gen_mape_addr(u32 addr, u16 port, struct in6_addr *dest) +{ + u32 eabits; + u16 psid; + + eabits = ntohl(addr & ff.u.map.ea_addr_mask) << ff.u.map.psid_len; + psid = 0; + if (ff.u.map.psid_len) { + psid = ntohs(port & ff.u.map.ea_port_mask) >> + (16 - ff.u.map.psid_len); + eabits |= psid; + } + + memcpy(dest, &ff.u.map.ipv6_prefix, 8); + dest->s6_addr32[1] |= htonl(eabits << ff.u.map.ea_lshift); + + dest->s6_addr32[2] = htonl(ntohl(addr) >> 16); + dest->s6_addr32[3] = htonl((ntohl(addr) << 16) | psid); +} + +/* + * + */ +static bool ff_forward(unsigned int thread, + struct mvpp2_port *rx_port, + const uint8_t *rx_alt_hwaddr, + int pool, + struct mvpp2_port *tx_port1, + struct mvpp2_port *tx_port2, + const uint8_t *tx_alt_hwaddr, + bool wan_to_lan, + struct net_device *rx_dev, + struct net_device *tx_dev, + unsigned int rx_vlan, + unsigned int tx_vlan, + struct mvpp2_rx_desc *rx_desc, + void *frag, + size_t offset, size_t eth_len) +{ + struct mvpp2_bm_pool *bm_pool; + struct mvpp2_pcpu_stats *stats; + struct mvpp2_port *tx_port; + struct net_device *last_rx_dev, *next_tx_dev; + struct ffn_lookup_entry *e = NULL; + struct ffn6_lookup_entry *e6 = NULL; + struct nf_conn *ct = NULL; + struct ethhdr *eth; + enum ff_xmit_mode xmit_mode; + u8 dest_hw[6]; + unsigned int timeout; + void *l2_hdr, *l3_hdr, *l4_hdr; + bool l3_is_ipv4, l4_is_tcp; + unsigned int l3_plen; + u32 tun_v4_dest = 0; + const struct in6_addr *tun_v6_pdest = NULL; + u32 rx_status; + u16 proto, parser_info; + dma_addr_t frag_dma_addr; + phys_addr_t frag_phys_addr; + const uint8_t *src_hwaddr; + struct page_pool *pp = NULL; + struct net_device *soft_tx_dev; + + /* make sure we have headroom for the worst case scenario */ + BUILD_BUG_ON(NET_SKB_PAD < + (sizeof (struct ipv6hdr) + VLAN_HLEN)); + + if (!tx_port1 || !rx_port || !tx_dev || !rx_dev) + return false; + + eth = (struct ethhdr *)((uint8_t *)frag + offset); + rx_status = mvpp2_rxdesc_status_get(rx_port, rx_desc); + parser_info = mvpp2_rxdesc_parser_info_get(rx_port, rx_desc); + + /* + * filter only IPv4 & IPv6 packets + */ + if (rx_vlan) { + struct vlan_ethhdr *vhdr; + + if (!pkt_is_vlan(parser_info)) + return false; + + vhdr = (struct vlan_ethhdr *)eth; + if (vhdr->h_vlan_TCI != htons(rx_vlan)) + return false; + + if (!pkt_is_ipvx(rx_status)) + return false; + + l3_hdr = vhdr + 1; + l3_plen = eth_len - VLAN_ETH_HLEN; + } else { + if (pkt_is_vlan(parser_info)) + return false; + + if (!pkt_is_ipvx(rx_status)) + return false; + + l3_hdr = eth + 1; + l3_plen = eth_len - ETH_HLEN; + } + + /* make sure packet is for our mac address */ + if (memcmp(eth->h_dest, rx_port->dev->dev_addr, 6)) { + if (!rx_alt_hwaddr || memcmp(eth->h_dest, rx_alt_hwaddr, 6)) + return false; + } + + last_rx_dev = rx_dev; + l3_is_ipv4 = pkt_is_ipv4(rx_status); + + if (l3_is_ipv4) { + struct iphdr *iph; + struct fbxbr_fwcache *fwc; + struct fbxbr *fbxbr = NULL; + struct fbxbr_port *fbxbr_fwd_port = NULL; + u16 sport, dport; + u8 ip_proto; + +handle_ipv4: + iph = (struct iphdr *)l3_hdr; + + /* lookup IP ffn entry */ + if (iph->ihl > 5 || (iph->frag_off & htons(IP_MF | IP_OFFSET))) + return false; + + if (iph->ttl <= 1) + return false; + + ip_proto = iph->protocol; + if (ip_proto == IPPROTO_TCP) { + struct tcphdr *tcph; + + if (l3_plen < sizeof (*iph) + sizeof (*tcph)) + return false; + + tcph = (struct tcphdr *)((u8 *)iph + 20); + if (tcph->fin || + tcph->syn || + tcph->rst || + !tcph->ack) { + return false; + } + + sport = tcph->source; + dport = tcph->dest; + l4_hdr = tcph; + l4_is_tcp = true; + + } else if (ip_proto == IPPROTO_UDP) { + struct udphdr *udph; + + if (l3_plen < sizeof (*iph) + sizeof (*udph)) + return false; + + udph = (struct udphdr *)((u8 *)iph + 20); + sport = udph->source; + dport = udph->dest; + l4_hdr = udph; + l4_is_tcp = false; + + } else if (ip_proto == IPPROTO_IPV6) { + struct ipv6hdr *ip6hdr; + u32 ip6rd_daddr; + bool src_pfx_match; + + if (!ff.tun_ready) + return false; + + /* must be for us */ + if (iph->daddr != ff.u.sit.src) + return false; + + /* check len */ + if (l3_plen < sizeof (struct iphdr) + + sizeof (struct ipv6hdr)) + return false; + + ip6hdr = (struct ipv6hdr *)(iph + 1); + + /* must belong to 6rd prefix */ + if ((ip6hdr->daddr.s6_addr32[0] & + ff.u.sit.s6rd_pmask) != ff.u.sit.s6rd_prefix) + return false; + + /* 6rd address */ + ip6rd_daddr = ff_tun_extract_6rd_addr(&ip6hdr->daddr); + if (ip6rd_daddr != ff.u.sit.src) + return false; + + /* check for spoofing here */ + if ((ip6hdr->saddr.s6_addr32[0] & + ff.u.sit.s6rd_pmask) == ff.u.sit.s6rd_prefix) + src_pfx_match = true; + else + src_pfx_match = false; + + /* if src prefix is the 6rd prefix, packet + * should come from corresponding IPv4 + * source */ + if (src_pfx_match) { + u32 addr; + + addr = ff_tun_extract_6rd_addr(&ip6hdr->saddr); + if (addr != iph->saddr) + return false; + } else { + /* only accept packet from configured + * border relay */ + if (!ff.sit_6rd_br || + iph->saddr != ff.sit_6rd_br) + return false; + } + + l3_hdr = ip6hdr; + l3_plen -= 20; + l3_is_ipv4 = false; + goto handle_ipv6; + + } else + return false; + + if (is_fbxbridge_port(last_rx_dev)) { + struct fbxbr_fwcache_key k; + struct fbxbr_port *p; + u32 hash; + + p = fbxbr_port_get_rcu(last_rx_dev); + fbxbr = p->br; + + if (wan_to_lan) { + WARN_ON(!p->is_wan); + k.wan_ip = iph->saddr; + k.lan_ip = iph->daddr; + k.wan_port = sport; + k.lan_port = dport; + fbxbr_fwd_port = fbxbr->lan_port; + } else { + WARN_ON(p->is_wan); + k.lan_ip = iph->saddr; + k.wan_ip = iph->daddr; + k.lan_port = sport; + k.wan_port = dport; + fbxbr_fwd_port = fbxbr->wan_port; + } + k.is_tcp = l4_is_tcp; + + if (!unlikely(fbxbr_fwd_port)) + return false; + + hash = fbxbr_fwcache_hash(&k); + fwc = __fbxbr_fwcache_lookup_rcu(p->br, hash, &k); + if (!fwc) + return false; + + next_tx_dev = fbxbr_fwd_port->dev; + e = NULL; + } else { + struct ffn_lookup_key k; + + k.sip = iph->saddr; + k.dip = iph->daddr; + k.sport = sport; + k.dport = dport; + k.is_tcp = l4_is_tcp; + e = __ffn_get_rcu(&k); + if (!e) + return false; + + if (e->manip.dst->obsolete > 0) + return false; + + ct = e->manip.ct; + + /* only fast forward TCP connections in established state */ + if (l4_is_tcp && + ct->proto.tcp.state != TCP_CONNTRACK_ESTABLISHED) + return false; + + next_tx_dev = e->manip.dst->dev; + fwc = NULL; + } + + /* find out if the packet is to be sent as-is or + * tunneled */ + if (ff.tun_dev && next_tx_dev == ff.tun_dev) { + const struct ff_priv *ff_priv; + struct ff_priv *ff_wpriv; + struct dst_entry *v6_dst; + const struct in6_addr *pdest, *nexthop; + struct in6_addr dest; + struct rt6_info *rt6; + struct neighbour *neigh; + + /* IPv4 tunneled into MAP-E device */ + if (!ff.tun_ready) { + return false; + } + + if (l3_plen > ff.tun_mtu) + return false; + + /* lookup ipv6 route cache */ + if (e) + ff_priv = ffn_get_ro_priv(e); + else + ff_priv = fwc_get_ro_priv(fwc); + + if (ff_priv) { + if (ff_priv->tun_dst->obsolete < 0) { + /* valid route found */ + v6_dst = ff_priv->tun_dst; + pdest = &ff_priv->tun_dest_ip6; + goto cached_ipv6_route; + } + + ff_priv_release(ff_priv); + if (e) + e->manip.priv_destructor = NULL; + else + fwc->priv_destructor = NULL; + } + + /* cache miss, compute IPv6 destination */ + if (ff.u.map.ipv4_prefix && + (iph->daddr & ff.u.map.ipv4_pmask) == + ff.u.map.ipv4_prefix) { + /* compute dest using FMR */ + ff_tun_gen_mape_addr(iph->daddr, dport, &dest); + pdest = &dest; + } else { + /* next hop is BR */ + pdest = &ff.u.map.br; + } + + /* v6 route lookup */ + rt6 = rt6_lookup(&init_net, pdest, NULL, 0, NULL, 0); + if (!rt6) + return false; + + if (e) + ff_wpriv = ffn_get_rw_priv(e); + else + ff_wpriv = fwc_get_rw_priv(fwc); + if (!ff_wpriv) + return false; + + /* cache this inside FFN private area */ + ff_wpriv->tun_dst = (struct dst_entry *)rt6; + memcpy(&ff_wpriv->tun_dest_ip6, pdest, 16); + if (e) + e->manip.priv_destructor = ff_priv_destructor_cb; + else + fwc->priv_destructor = ff_priv_destructor_cb; + ff_priv = ff_wpriv; + + v6_dst = (struct dst_entry *)rt6; + +cached_ipv6_route: + if (v6_dst->dev != tx_dev) { + return false; + } + + /* is the neighboor ready ? */ + rt6 = (struct rt6_info *)v6_dst; + nexthop = rt6_nexthop(rt6, (struct in6_addr *)pdest); + if (!nexthop) { + return false; + } + + neigh = __ipv6_neigh_lookup_noref(tx_dev, nexthop); + if (!neigh || !(neigh->nud_state & NUD_VALID)) + return false; + memcpy(dest_hw, neigh->ha, 6); + + xmit_mode = FF_XMIT_IPV4_IN_IPV6; + tun_v6_pdest = &ff_priv->tun_dest_ip6; + + } else if (next_tx_dev == tx_dev) { + struct neighbour *neigh; + const struct rtable *rt; + + /* is the neighboor ready ? */ + if (e) { + u32 nexthop; + + rt = (const struct rtable *)e->manip.dst; + nexthop = (__force u32)rt_nexthop(rt, + e->manip.new_dip); + neigh = __ipv4_neigh_lookup_noref(tx_dev, + nexthop); + if (!neigh || !(neigh->nud_state & NUD_VALID)) + return false; + + memcpy(dest_hw, neigh->ha, 6); + } else { + if (!fbxbr_fwd_port->is_wan) { + if (!fbxbr->have_hw_addr) + return false; + memcpy(dest_hw, fbxbr->lan_hwaddr, 6); + } else { + __be32 nh; + + nh = iph->daddr; + if ((nh & fbxbr->wan_netmask) != + (fbxbr->wan_ipaddr & + fbxbr->wan_netmask)) { + rt = fbxbr_fwd_port->rt; + if (!rt || + rt->dst.obsolete > 0) + return false; + + nh = rt_nexthop(rt, nh); + } + + neigh = __ipv4_neigh_lookup_noref( + tx_dev, nh); + if (!neigh || + !(neigh->nud_state & NUD_VALID)) + return false; + + memcpy(dest_hw, neigh->ha, 6); + } + } + + xmit_mode = FF_XMIT_IPV4; + } else + return false; + + } else { + struct ipv6hdr *ip6hdr; + struct ffn6_lookup_key k; + u16 sport, dport; + u8 ip_proto; + +handle_ipv6: + ip6hdr = (struct ipv6hdr *)l3_hdr; + + if (ip6hdr->hop_limit <= 1 || !ip6hdr->payload_len) + return false; + + if (ntohs(ip6hdr->payload_len) > l3_plen) + return false; + + ip_proto = ip6hdr->nexthdr; + + if (ip_proto == IPPROTO_TCP) { + struct tcphdr *tcph; + + if (l3_plen < sizeof (*ip6hdr) + sizeof (*tcph)) + return false; + + tcph = (struct tcphdr *)((u8 *)ip6hdr + + sizeof (*ip6hdr)); + + if (tcph->fin || + tcph->syn || + tcph->rst || + !tcph->ack) { + return false; + } + + sport = tcph->source; + dport = tcph->dest; + l4_hdr = tcph; + l4_is_tcp = true; + + } else if (ip_proto == IPPROTO_UDP) { + struct udphdr *udph; + + if (l3_plen < sizeof (*ip6hdr) + sizeof (*udph)) + return false; + + udph = (struct udphdr *)((u8 *)ip6hdr + + sizeof (*ip6hdr)); + sport = udph->source; + dport = udph->dest; + l4_hdr = udph; + l4_is_tcp = false; + + } else if (ip_proto == IPPROTO_IPIP) { + struct iphdr *iph; + + if (!ff.tun_ready) + return false; + + /* must be for us */ + if (memcmp(&ip6hdr->daddr, &ff.u.map.src, 16)) + return false; + + /* check len */ + if (l3_plen < sizeof (struct iphdr) + + sizeof (struct ipv6hdr)) + return false; + + iph = (struct iphdr *)(ip6hdr + 1); + + /* does it come from BR ? */ + if (memcmp(&ip6hdr->saddr, &ff.u.map.br, 16)) { + struct in6_addr exp_src_addr; + + /* no, check FMR for spoofing */ + if (!ff.u.map.ipv4_prefix) + return false; + + /* check up to PSID to reduce lookup + * depth */ + ff_tun_gen_mape_addr(iph->saddr, 0, + &exp_src_addr); + if (!ipv6_prefix_equal(&ip6hdr->saddr, + &exp_src_addr, + ff.u.map.ipv6_plen + + ff.u.map.ipv4_plen)) + return false; + } + + last_rx_dev = ff.tun_dev; + if (!last_rx_dev) + return false; + + l3_hdr = iph; + l3_plen -= sizeof (*ip6hdr); + l3_is_ipv4 = true; + goto handle_ipv4; + + } else + return false; + + k.sip = ip6hdr->saddr.s6_addr32; + k.dip = ip6hdr->daddr.s6_addr32; + k.sport = sport; + k.dport = dport; + k.is_tcp = l4_is_tcp; + e6 = __ffn6_get_rcu(&k); + if (!e6) { + return false; + } + + if (e6->manip.dst->obsolete > 0) { + return false; + } + + ct = e6->manip.ct; + + /* only fast forward TCP connections in established state */ + if (l4_is_tcp && + ct->proto.tcp.state != TCP_CONNTRACK_ESTABLISHED) { + return false; + } + + /* find out if the packet is to be sent as-is or + * tunneled */ + if (ff.tun_dev && e6->manip.dst->dev == ff.tun_dev) { + const struct ff6_priv *ff6_priv; + struct ff6_priv *ff6_wpriv; + struct dst_entry *v4_dst; + struct flowi4 fl4; + struct rtable *rt; + struct neighbour *neigh; + u32 dest, nexthop; + + /* IPv6 tunneled into SIT device using 6rd */ + if (!ff.tun_ready) { + return false; + } + + if (l3_plen > ff.tun_mtu) + return false; + + /* lookup ipv4 route cache */ + ff6_priv = ffn6_get_ro_priv(e6); + if (ff6_priv) { + if (!ff6_priv->tun_dst->obsolete) { + /* valid route found */ + v4_dst = ff6_priv->tun_dst; + dest = ff6_priv->tun_dest_ip; + goto cached_ipv4_route; + } + + ff6_priv_release(ff6_priv); + e6->manip.priv_destructor = NULL; + } + + /* cache miss, compute IPv4 destination */ + if ((ip6hdr->daddr.s6_addr32[0] & + ff.u.sit.s6rd_pmask) == ff.u.sit.s6rd_prefix) { + /* next hop via prefix */ + dest = ff_tun_extract_6rd_addr(&ip6hdr->daddr); + } else { + const struct in6_addr *nh6; + struct rt6_info *rt6; + + /* next hop via route */ + rt6 = (struct rt6_info *)e6->manip.dst; + nh6 = rt6_nexthop(rt6, + (struct in6_addr *)e6->manip.new_dip); + if (!nh6) { + return false; + } + + /* should be a v4 mapped */ + if (nh6->s6_addr32[0] != 0 || + nh6->s6_addr32[1] != 0 || + nh6->s6_addr32[2] != 0) { + return false; + } + + dest = nh6->s6_addr32[3]; + } + + /* v4 route lookup */ + rt = ip_route_output_ports(&init_net, &fl4, NULL, + dest, ff.u.sit.src, + 0, 0, + IPPROTO_IPV6, 0, + 0); + if (IS_ERR(rt) || + rt->rt_type != RTN_UNICAST) + return false; + + ff6_wpriv = ffn6_get_rw_priv(e6); + if (!ff6_wpriv) + return false; + + /* cache this inside FFN private area */ + ff6_wpriv->tun_dst = (struct dst_entry *)rt; + ff6_wpriv->tun_dest_ip = dest; + e6->manip.priv_destructor = ff6_priv_destructor_cb; + + v4_dst = (struct dst_entry *)rt; + ff6_priv = ff6_wpriv; + +cached_ipv4_route: + if (v4_dst->dev != tx_dev) { + return false; + } + + /* is the neighboor ready ? */ + rt = (struct rtable *)v4_dst; + nexthop = (__force u32)rt_nexthop(rt, dest); + neigh = __ipv4_neigh_lookup_noref(tx_dev, nexthop); + if (!neigh || !(neigh->nud_state & NUD_VALID)) + return false; + memcpy(dest_hw, neigh->ha, 6); + + tun_v4_dest = dest; + xmit_mode = FF_XMIT_IPV6_IN_IPV4; + + } else if (e6->manip.dst->dev == tx_dev) { + const struct in6_addr *nexthop; + struct rt6_info *rt6; + struct neighbour *neigh; + + /* is the neighboor ready ? */ + rt6 = (struct rt6_info *)e6->manip.dst; + + nexthop = rt6_nexthop(rt6, + (struct in6_addr *)e6->manip.new_dip); + if (!nexthop) + return false; + + neigh = __ipv6_neigh_lookup_noref(tx_dev, nexthop); + if (!neigh || !(neigh->nud_state & NUD_VALID)) + return false; + memcpy(dest_hw, neigh->ha, 6); + + xmit_mode = FF_XMIT_IPV6; + } else + return false; + } + + /* should only ff long frames */ + if (WARN_ON(pool != MVPP2_BM_LONG)) + return false; + + /* is destination on correct tx bridge port ? */ + soft_tx_dev = NULL; + tx_port = NULL; + if (!is_bridge_dev(tx_dev)) + tx_port = tx_port1; + else { + struct net_bridge_port *p1, *p2; + struct net_bridge_fdb_entry *fdb; + + p1 = br_port_get_rcu(tx_port1->dev); + p2 = NULL; + if (tx_port2) + p2 = br_port_get_rcu(tx_port2->dev); + + fdb = br_fdb_find_rcu(p1->br, dest_hw, 0); + if (!fdb) + return false; + + if (fdb->dst == p1) + tx_port = tx_port1; + else if (fdb->dst == p2) + tx_port = tx_port2; + else + soft_tx_dev = fdb->dst->dev; + } + + if (is_bridge_dev(rx_dev)) { + struct net_bridge *br = netdev_priv(rx_dev); + struct net_bridge_port *p; + + /* if packet comes from a bridge, make sure we are + * allowed to ingress it */ + p = br_port_get_rcu(rx_port->dev); + if (p->state != BR_STATE_FORWARDING) { + return false; + } + + /* refresh FDB entry for this source */ + if (!br_fdb_update_only(br, p, eth->h_source)) { + return false; + } + + dev_sw_netstats_rx_add(rx_dev, eth_len); + + } else if (rx_vlan) { + struct vlan_dev_priv *vlan = vlan_dev_priv(rx_dev); + struct vlan_pcpu_stats *vstats; + vstats = this_cpu_ptr(vlan->vlan_pcpu_stats); + u64_stats_inc(&vstats->rx_packets); + u64_stats_add(&vstats->rx_bytes, eth_len); + } + + if (last_rx_dev != rx_dev) { + /* increment tunnel stats if any */ + last_rx_dev->stats.rx_packets++; + last_rx_dev->stats.rx_bytes += eth_len; + } + + frag_dma_addr = mvpp2_rxdesc_dma_addr_get(rx_port, rx_desc); + frag_phys_addr = mvpp2_rxdesc_cookie_get(rx_port, rx_desc); + + /* do we have room in the tx queue ? */ + bm_pool = &rx_port->priv->bm_pools[pool]; + if (tx_port && !ff_can_send(thread, tx_port, bm_pool)) { + /* just rearm descriptor and fake success */ + mvpp2_bm_pool_put(rx_port, pool, frag_dma_addr, frag_phys_addr); + return true; + } + + /* can we allocate a new fragment to replace the descriptor we + * are about to use ? */ + if (mvpp2_rx_refill(rx_port, bm_pool, pp, pool)) { + /* just rearm descriptor and fake success */ + mvpp2_bm_pool_put(rx_port, pool, frag_dma_addr, frag_phys_addr); + return true; + } + + /* do we have a free tx desc ? */ + if (tx_port && !ff_ensure_tx_desc(thread, tx_port, bm_pool)) { + /* just rearm descriptor and fake success */ + mvpp2_bm_pool_put(rx_port, pool, frag_dma_addr, frag_phys_addr); + return true; + } + + if (ct && l4_is_tcp) { + /* don't try to track window anymore on this + * connection */ + ct->proto.tcp.no_window_track = 1; + } + + /* alter l3 & l4 content if needed (routing only) */ + if (l3_is_ipv4 && e) { + struct iphdr *iph = (struct iphdr *)l3_hdr; + + if (e->manip.alter) { + if (l4_is_tcp) { + struct tcphdr *tcph = (struct tcphdr *)l4_hdr; + tcph->source = e->manip.new_sport; + tcph->dest = e->manip.new_dport; + tcph->check = csum16_sub(tcph->check, + e->manip.l4_adjustment); + } else { + struct udphdr *udph = (struct udphdr *)l4_hdr; + udph->source = e->manip.new_sport; + udph->dest = e->manip.new_dport; + if (udph->check) { + u16 tcheck; + + tcheck = csum16_sub(udph->check, + e->manip.l4_adjustment); + udph->check = tcheck ? tcheck : 0xffff; + } + } + + iph->saddr = e->manip.new_sip; + iph->daddr = e->manip.new_dip; + } + + iph->ttl--; + iph->check = csum16_sub(iph->check, + e->manip.ip_adjustment); + + } else if (!l3_is_ipv4 && e6) { + struct ipv6hdr *ip6hdr = (struct ipv6hdr *)l3_hdr; + + if (e6->manip.alter) { + if (l4_is_tcp) { + struct tcphdr *tcph = (struct tcphdr *)l4_hdr; + tcph->source = e6->manip.new_sport; + tcph->dest = e6->manip.new_dport; + tcph->check = csum16_sub(tcph->check, + e6->manip.adjustment); + } else { + struct udphdr *udph = (struct udphdr *)l4_hdr; + udph->source = e6->manip.new_sport; + udph->dest = e6->manip.new_dport; + + if (udph->check) { + u16 tcheck; + + tcheck = csum16_sub(udph->check, + e6->manip.adjustment); + udph->check = tcheck ? tcheck : 0xffff; + } + } + + memcpy(ip6hdr->saddr.s6_addr32, e6->manip.new_sip, 16); + memcpy(ip6hdr->daddr.s6_addr32, e6->manip.new_dip, 16); + } + + ip6hdr->hop_limit--; + } + + /* packet is ready to xmit */ + switch (xmit_mode) { + case FF_XMIT_IPV4: + proto = ETH_P_IP; + break; + + case FF_XMIT_IPV6: + proto = ETH_P_IPV6; + break; + + case FF_XMIT_IPV6_IN_IPV4: + { + struct iphdr *tun_hdr; + /* prepend IPv4 */ + tun_hdr = (struct iphdr *)((u8 *)l3_hdr - sizeof (*tun_hdr)); + tun_hdr->ihl = 5; + tun_hdr->version = 4; + tun_hdr->tos = 0; + tun_hdr->tot_len = htons(l3_plen + sizeof (*tun_hdr)); + tun_hdr->id = 0; + tun_hdr->frag_off = 0; + tun_hdr->ttl = 64; + tun_hdr->protocol = IPPROTO_IPV6; + tun_hdr->saddr = ff.u.sit.src; + tun_hdr->daddr = tun_v4_dest; + + l3_hdr = (u8 *)tun_hdr; + l3_plen += sizeof (*tun_hdr); + + dev_sw_netstats_tx_add(ff.tun_dev, 1, l3_plen); + proto = ETH_P_IP; + break; + } + + case FF_XMIT_IPV4_IN_IPV6: + { + struct ipv6hdr *tun_6hdr; + + /* prepend IPv6 */ + tun_6hdr = (struct ipv6hdr *)((u8 *)l3_hdr - sizeof (*tun_6hdr)); + tun_6hdr->version = 6; + tun_6hdr->priority = 0; + memset(tun_6hdr->flow_lbl, 0, sizeof (tun_6hdr->flow_lbl)); + tun_6hdr->payload_len = htons(l3_plen); + tun_6hdr->nexthdr = IPPROTO_IPIP; + tun_6hdr->hop_limit = 64; + tun_6hdr->saddr = ff.u.map.src; + tun_6hdr->daddr = *tun_v6_pdest; + + l3_hdr = (u8 *)tun_6hdr; + l3_plen += sizeof (*tun_6hdr); + + dev_sw_netstats_tx_add(ff.tun_dev, 1, l3_plen); + proto = ETH_P_IPV6; + break; + } + } + + if (tx_port) + src_hwaddr = tx_port->dev->dev_addr; + else + src_hwaddr = soft_tx_dev->dev_addr; + + if (tx_alt_hwaddr) + src_hwaddr = tx_alt_hwaddr; + + /* add ethernet header */ + l2_hdr = l3_hdr; + + if (tx_vlan) { + struct vlan_ethhdr *vhdr; + + l2_hdr -= VLAN_ETH_HLEN; + vhdr = (struct vlan_ethhdr *)l2_hdr; + memcpy(vhdr->h_dest, dest_hw, 6); + memcpy(vhdr->h_source, src_hwaddr, 6); + vhdr->h_vlan_proto = htons(ETH_P_8021Q); + vhdr->h_vlan_TCI = htons(tx_vlan); + vhdr->h_vlan_encapsulated_proto = htons(proto); + + eth = (struct ethhdr *)vhdr; + eth_len = l3_plen + VLAN_ETH_HLEN; + } else { + l2_hdr -= ETH_HLEN; + eth = (struct ethhdr *)l2_hdr; + memcpy(eth->h_dest, dest_hw, 6); + memcpy(eth->h_source, src_hwaddr, 6); + eth->h_proto = htons(proto); + eth_len = l3_plen + ETH_HLEN; + } + + /* refresh conntrack */ + if (ct) { + if (l4_is_tcp) + timeout = HZ * 3600 * 24 * 5; + else + timeout = HZ * 180; + + if (ct->timeout - ff.jiffies < timeout - 10 * HZ) { + unsigned long newtime = ff.jiffies + timeout; + ct->timeout = newtime; + } + } + + if (tx_port) { + ff_send(thread, + tx_port, + frag_dma_addr, + frag_phys_addr, + (void *)eth - frag, + pool, + eth_len, + (proto == ETH_P_IP), + (xmit_mode == FF_XMIT_IPV4), + l4_is_tcp, + tx_vlan); + } else { + struct sk_buff *skb; + + skb = build_skb(frag, bm_pool->frag_size); + if (!skb) { + skb_free_frag(frag); + return true; + } + + skb_reserve(skb, (void *)eth - frag); + skb_put(skb, eth_len); + skb->protocol = eth->h_proto; + skb_set_network_header(skb, l3_hdr - l2_hdr); + skb->dev = soft_tx_dev; + dev_queue_xmit(skb); + } + + if (is_bridge_dev(tx_dev)) { + dev_sw_netstats_tx_add(tx_dev, 1, eth_len); + } else if (tx_vlan) { + struct vlan_dev_priv *vlan = vlan_dev_priv(tx_dev); + struct vlan_pcpu_stats *vstats; + vstats = this_cpu_ptr(vlan->vlan_pcpu_stats); + u64_stats_inc(&vstats->tx_packets); + u64_stats_add(&vstats->tx_bytes, eth_len); + } + + if (tx_port) { + stats = per_cpu_ptr(tx_port->stats, thread); + u64_stats_update_begin(&stats->syncp); + stats->tx_packets++; + stats->tx_bytes += eth_len; + u64_stats_update_end(&stats->syncp); + } + + return true; +} + +/* + * + */ +static bool ff_receive(unsigned int thread, + struct mvpp2_port *port, + int pool, + struct mvpp2_rx_desc *rx_desc, + void *frag, + size_t offset, size_t dlen) +{ + int wan_idx = (FF_DEV_WAN_ID << 1) | FF_DEV_WAN_PORT_INDEX; + int sfplan_idx = (FF_DEV_SFPLAN_ID << 1) | FF_DEV_SFPLAN_PORT_INDEX; + int swlan_idx = (FF_DEV_SWLAN_ID << 1) | FF_DEV_SWLAN_PORT_INDEX; + struct net_device *wan_dev; + int wan_vlan_id; + unsigned int idx; + + if (!ff_enabled) + return false; + + if (ff.wan_active_dev == -1) + return false; + + wan_dev = ff.wan_devs[ff.wan_active_dev]; + wan_vlan_id = ff.wan_vlan_ids[ff.wan_active_dev]; + + idx = (port->priv->id << 1) | port->index; + + /* + * LAN => WAN + * [sfplan0 (untagged)] => [br0] => IPV4 => [ftth0.] + */ + if (idx == sfplan_idx) { + return ff_forward(thread, + port, + sfplan.bridge_hwaddr, + pool, + ports_by_idx[wan_idx], + NULL, + NULL, + false, + ff.lan_dev_sfp, + wan_dev, + 0, wan_vlan_id, + rx_desc, + frag, offset, dlen); + } + + /* + * LAN => WAN + * [swlan0 (untagged)] => [br0] => IPV4 => [ftth0.] + */ + if (idx == swlan_idx) { + return ff_forward(thread, + port, + swlan.bridge_hwaddr, + pool, + ports_by_idx[wan_idx], + NULL, + NULL, + false, + ff.lan_dev_sw, + wan_dev, + 0, wan_vlan_id, + rx_desc, + frag, offset, dlen); + } + + /* + * WAN => LAN + * [ffth0.] => IPV4 => [br0] => [sfplan0/swlan0] + */ + if (idx == wan_idx) { + struct mvpp2_port *tx_ports[2]; + struct net_device *tx_dev; + const uint8_t *tx_alt_hwaddr; + + if (ff.lan_dev_sfp && sfplan.fbxbr_port) { + /* fbxbridge mode */ + tx_ports[0] = ports_by_idx[sfplan_idx]; + tx_ports[1] = NULL; + tx_dev = ff.lan_dev_sfp; + tx_alt_hwaddr = NULL; + + } else if (ff.lan_dev_sw && swlan.fbxbr_port) { + /* fbxbridge mode */ + tx_ports[0] = ports_by_idx[swlan_idx]; + tx_ports[1] = NULL; + tx_dev = ff.lan_dev_sw; + tx_alt_hwaddr = NULL; + + } else { + /* bridge mode */ + tx_ports[0] = ports_by_idx[sfplan_idx]; + if (tx_ports[0]) + tx_ports[1] = ports_by_idx[swlan_idx]; + else { + tx_ports[0] = ports_by_idx[swlan_idx]; + tx_ports[1] = NULL; + } + + tx_dev = ff.lan_dev_sfp; + tx_alt_hwaddr = sfplan.bridge_hwaddr; + if (!tx_dev) { + tx_dev = ff.lan_dev_sw; + tx_alt_hwaddr = swlan.bridge_hwaddr; + } + } + + return ff_forward(thread, + port, + NULL, + pool, + tx_ports[0], + tx_ports[1], + tx_alt_hwaddr, + true, + wan_dev, + tx_dev, + wan_vlan_id, 0, + rx_desc, + frag, offset, dlen); + } + + return false; +} + +/* + * + */ +static unsigned int ff_get_opposite_ports(struct mvpp2_port *in_port, + struct mvpp2_port *out_ports[2]) +{ + int wan_idx = (FF_DEV_WAN_ID << 1) | FF_DEV_WAN_PORT_INDEX; + int sfplan_idx = (FF_DEV_SFPLAN_ID << 1) | FF_DEV_SFPLAN_PORT_INDEX; + int swlan_idx = (FF_DEV_SWLAN_ID << 1) | FF_DEV_SWLAN_PORT_INDEX; + unsigned int idx, count; + + idx = (in_port->priv->id << 1) | in_port->index; + count = 0; + + if (idx == sfplan_idx || idx == swlan_idx) { + if (ports_by_idx[wan_idx]) + out_ports[count++] = ports_by_idx[wan_idx]; + } else if (idx == wan_idx) { + if (ports_by_idx[sfplan_idx]) + out_ports[count++] = ports_by_idx[sfplan_idx]; + if (ports_by_idx[swlan_idx]) + out_ports[count++] = ports_by_idx[swlan_idx]; + } + + return count; +} + +/* + * + */ +static ssize_t ff_show_enabled(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%u\n", ff_enabled); +} + +static ssize_t ff_store_enabled(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + unsigned long val; + + if (kstrtoul(buf, 10, &val)) + return -EINVAL; + + if (ff_enabled == val) + return len; + + printk(KERN_NOTICE "ff: fastpath now %s\n", + val ? "enabled" : "disabled"); + ff_enabled = val; + return len; +} + +static struct device_attribute dev_attr_ff = { + .attr = { .name = "ff_enabled", .mode = (S_IRUGO | S_IWUSR) }, + .show = ff_show_enabled, + .store = ff_store_enabled, +}; + +/* + * + */ +static ssize_t ff_show_tun_dev(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%s\n", ff.tun_dev_name); +} + +static ssize_t ff_store_tun_dev(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + if (!len || buf[0] == '\n') { + ff.tun_dev_name[0] = 0; + ff_lock_all_cpu_bh(); + __ff_tun_release(); + ff_unlock_all_cpu_bh(); + printk(KERN_NOTICE "ff: tun dev unset\n"); + return len; + } + + ff_lock_all_cpu_bh(); + __ff_tun_release(); + strncpy(ff.tun_dev_name, buf, len); + strim(ff.tun_dev_name); + printk(KERN_NOTICE "ff: tun dev set to %s\n", ff.tun_dev_name); + __ff_tun_capture(); + ff_unlock_all_cpu_bh(); + return len; +} + +static struct device_attribute dev_attr_tun = { + .attr = { .name = "ff_tun_dev", .mode = (S_IRUGO | S_IWUSR) }, + .show = ff_show_tun_dev, + .store = ff_store_tun_dev, +}; + +/* + * + */ +static ssize_t ff_show_wan_dev(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%s\n", ff.wan_dev_name); +} + +static ssize_t ff_store_wan_dev(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + if (!len || buf[0] == '\n') { + ff.wan_dev_name[0] = 0; + ff_lock_all_cpu_bh(); + __ff_wan_find_active(); + ff_unlock_all_cpu_bh(); + printk(KERN_NOTICE "ff: requested wan dev unset\n"); + return len; + } + + ff_lock_all_cpu_bh(); + ff.wan_dev_name[0] = 0; + __ff_wan_find_active(); + strncpy(ff.wan_dev_name, buf, len); + strim(ff.wan_dev_name); + printk(KERN_NOTICE "ff: requested wan dev set to %s\n", + ff.wan_dev_name); + __ff_wan_find_active(); + ff_unlock_all_cpu_bh(); + return len; +} + +static struct device_attribute dev_attr_wan = { + .attr = { .name = "ff_wan_dev", .mode = (S_IRUGO | S_IWUSR) }, + .show = ff_show_wan_dev, + .store = ff_store_wan_dev, +}; + +/* + * + */ +static ssize_t ff_show_tun_6rd_br(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + return sprintf(buf, "%pI4\n", &ff.sit_6rd_br); +} + +static ssize_t ff_store_tun_6rd_br(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t len) +{ + if (!len || buf[0] == '\n') { + ff.sit_6rd_br = 0; + return len; + } + + ff.sit_6rd_br = in_aton(buf); + printk(KERN_NOTICE "ff: tun border relay set to %pI4\n", + &ff.sit_6rd_br); + return len; +} + +static struct device_attribute dev_attr_tun_6rd_br = { + .attr = { .name = "ff_tun_sit_6rd_br", .mode = (S_IRUGO | S_IWUSR) }, + .show = ff_show_tun_6rd_br, + .store = ff_store_tun_6rd_br, +}; + +static struct ff_dev swlan = { + .desc = "swlan", + .id = FF_DEV_SWLAN_ID, + .port_index = FF_DEV_SWLAN_PORT_INDEX, + .bridge_member = true, + .pvirt_dev = &ff.lan_dev_sw, +}; + +static struct ff_dev sfplan = { + .desc = "sfplan", + .id = FF_DEV_SFPLAN_ID, + .port_index = FF_DEV_SFPLAN_PORT_INDEX, + .bridge_member = true, + .pvirt_dev = &ff.lan_dev_sfp, +}; + +static struct ff_dev wan = { + .desc = "wan_836", + .id = FF_DEV_WAN_ID, + .port_index = FF_DEV_WAN_PORT_INDEX, + .vlan = 836, + .is_wan = true, + .pvirt_dev = &ff.wan_devs[0], + .pvlan_id = &ff.wan_vlan_ids[0], +}; + +static struct ff_dev wan_301 = { + .desc = "wan_301", + .id = FF_DEV_WAN_ID, + .port_index = FF_DEV_WAN_PORT_INDEX, + .vlan = 301, + .is_wan = true, + .pvirt_dev = &ff.wan_devs[1], + .pvlan_id = &ff.wan_vlan_ids[1], +}; + +static struct ff_dev wan_302 = { + .desc = "wan_302", + .id = FF_DEV_WAN_ID, + .port_index = FF_DEV_WAN_PORT_INDEX, + .vlan = 302, + .is_wan = true, + .pvirt_dev = &ff.wan_devs[2], + .pvlan_id = &ff.wan_vlan_ids[2], +}; + +static struct ff_dev wan_303 = { + .desc = "wan_303", + .id = FF_DEV_WAN_ID, + .port_index = FF_DEV_WAN_PORT_INDEX, + .vlan = 303, + .is_wan = true, + .pvirt_dev = &ff.wan_devs[3], + .pvlan_id = &ff.wan_vlan_ids[3], +}; + +static void ff_init(struct device *dev) +{ + static bool done; + int i; + + if (done) + return; + + for_each_possible_cpu(i) { + spinlock_t *lock = &per_cpu(ff_plock, i); + spin_lock_init(lock); + } + + ff.wan_active_dev = -1; + device_create_file(dev, &dev_attr_ff); + device_create_file(dev, &dev_attr_tun); + device_create_file(dev, &dev_attr_wan); + device_create_file(dev, &dev_attr_tun_6rd_br); + + list_add(&swlan.next, &ff_devs); + list_add(&sfplan.next, &ff_devs); + list_add(&wan.next, &ff_devs); + list_add(&wan_301.next, &ff_devs); + list_add(&wan_302.next, &ff_devs); + list_add(&wan_303.next, &ff_devs); + done = true; +} +#endif + /* Returns a struct page if page_pool is set, otherwise a buffer */ static void *mvpp2_frag_alloc(const struct mvpp2_bm_pool *pool, struct page_pool *page_pool) @@ -1205,6 +3575,10 @@ enum mvpp2_bm_pool_log_num long_log_pool, short_log_pool; int rxq; +#ifdef CONFIG_MVPP2_FBX_FF + long_log_pool = MVPP2_BM_JUMBO; + short_log_pool = MVPP2_BM_LONG; +#else /* If port pkt_size is higher than 1518B: * HW Long pool - SW Jumbo pool, HW Short pool - SW Long pool * else: HW Long pool - SW Long pool, HW Short pool - SW Short pool @@ -1216,6 +3590,7 @@ long_log_pool = MVPP2_BM_LONG; short_log_pool = MVPP2_BM_SHORT; } +#endif if (!port->pool_long) { port->pool_long = @@ -1882,7 +4257,7 @@ static u64 mvpp2_read_count(struct mvpp2_port *port, const struct mvpp2_ethtool_counter *counter) { - u64 val; + u64 val = 0; val = readl(port->stats_base + counter->offset); if (counter->reg_is_64b) @@ -1975,11 +4350,28 @@ { ETHTOOL_XDP_XMIT_ERR, "tx_xdp_xmit_errors", }, }; +static const struct mvpp2_ethtool_counter mvpp2_ethtool_bm_regs[] = { + { MVPP2_BM_DROP_CTR(0), "bm_%d_drop" }, +}; + #define MVPP2_N_ETHTOOL_STATS(ntxqs, nrxqs) (ARRAY_SIZE(mvpp2_ethtool_mib_regs) + \ ARRAY_SIZE(mvpp2_ethtool_port_regs) + \ (ARRAY_SIZE(mvpp2_ethtool_txq_regs) * (ntxqs)) + \ (ARRAY_SIZE(mvpp2_ethtool_rxq_regs) * (nrxqs)) + \ - ARRAY_SIZE(mvpp2_ethtool_xdp)) + ARRAY_SIZE(mvpp2_ethtool_xdp)) + \ + (ARRAY_SIZE(mvpp2_ethtool_bm_regs) * (16)) + +struct ethtool_priv_flags_strings { + const char string[ETH_GSTRING_LEN]; +}; + +static const struct ethtool_priv_flags_strings mvpp2_priv_flags_strings[] = { + { .string = "st-sync-ok", }, + { .string = "clear-mib", }, + { .string = "en-10g-linkdown-wa" }, + { .string = "linkdown-debounce" }, +}; + static void mvpp2_ethtool_get_strings(struct net_device *netdev, u32 sset, u8 *data) @@ -1988,6 +4380,12 @@ const char *str; int i, q; + if (sset == ETH_SS_PRIV_FLAGS) { + memcpy(data, mvpp2_priv_flags_strings, + sizeof (mvpp2_priv_flags_strings)); + return; + } + if (sset != ETH_SS_STATS) return; @@ -2011,6 +4409,15 @@ for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_xdp); i++) ethtool_puts(&data, mvpp2_ethtool_xdp[i].string); + + for (q = 0; q < 16; q++) { + for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_bm_regs); i++) { + snprintf(data, ETH_GSTRING_LEN, + mvpp2_ethtool_bm_regs[i].string, + q); + data += ETH_GSTRING_LEN; + } + } } static void @@ -2114,6 +4521,48 @@ break; } } + + for (q = 0; q < 16; q++) + for (i = 0; i < ARRAY_SIZE(mvpp2_ethtool_bm_regs); i++) + *pstats++ += mvpp2_read(port->priv, + mvpp2_ethtool_bm_regs[i].offset + + 4 * q); +} + +static void mvpp2_start_dev_silent(struct mvpp2_port *port); +static void mvpp2_stop_dev(struct mvpp2_port *port); + +static void mvpp2_linkdown_10g_wa(struct work_struct *work) +{ + struct delayed_work *del_work = to_delayed_work(work); + struct mvpp2_port *port = container_of(del_work, struct mvpp2_port, + linkdown_10g_wa_work); + + /* + * it seems the serdes does not fully retry to bring the link + * up sometimes, and ifconfig down/up fixes it, so force + * regular serdes reset when link is down + */ + if (!port->linkdown_10g_wa_enable || + netif_carrier_ok(port->dev) || + port->phy_interface != PHY_INTERFACE_MODE_10GBASER) + goto rearm; + + if (!time_after(jiffies, port->linkdown_10g_wa_jiffies)) + goto rearm; + + rtnl_lock(); + mvpp2_stop_dev(port); + mvpp2_start_dev_silent(port); + rtnl_unlock(); + + port->linkdown_10g_wa_jiffies = jiffies + + MVPP2_LINKDOWN_10G_WA_RESET_DELAY; + +rearm: + queue_delayed_work(port->priv->linkdown_10g_wa_queue, + &port->linkdown_10g_wa_work, + MVPP2_LINKDOWN_10G_WA_WORK_FREQ); } static void mvpp2_gather_hw_statistics(struct work_struct *work) @@ -2159,6 +4608,9 @@ if (sset == ETH_SS_STATS) return MVPP2_N_ETHTOOL_STATS(port->ntxqs, port->nrxqs); + if (sset == ETH_SS_PRIV_FLAGS) + return ARRAY_SIZE(mvpp2_priv_flags_strings); + return -EOPNOTSUPP; } @@ -2274,8 +4726,16 @@ tx_port_num); mvpp2_write(port->priv, MVPP2_TXP_SCHED_CMD_1_REG, 0); - /* Set TXQ scheduling to Round-Robin */ - mvpp2_write(port->priv, MVPP2_TXP_SCHED_FIXED_PRIO_REG, 0); + /* setup fixed prio queue mask, rest are WRR */ + mvpp2_write(port->priv, MVPP2_TXP_SCHED_FIXED_PRIO_REG, + MVPP2_TX_FIXED_PRIO_QUEUES); + + /* setup non zero WRR value for all ports (otherwise WRR seems + * biased) */ + for (queue = 0; queue < MVPP2_MAX_TXQ; queue++) + mvpp2_write(port->priv, + MVPP2_TXQ_SCHED_BCOUNT_CFG_REG(queue), + 64); /* Close bandwidth for all queues */ for (queue = 0; queue < MVPP2_MAX_TXQ; queue++) @@ -2552,18 +5012,30 @@ desc_count += txq_pcpu_aux->reserved_num; } +#ifdef CONFIG_MVPP2_FBX_FF + if (txq->log_id == MVPP2_FF_TXQ_ID) { + if (desc_count >= txq->size) + return -ENOMEM; + + req = max(MVPP2_CPU_DESC_CHUNK, num - txq_pcpu->reserved_num); + if (req > txq->size - desc_count) + req = txq->size - desc_count; + } else +#endif + { req = max(MVPP2_CPU_DESC_CHUNK, num - txq_pcpu->reserved_num); desc_count += req; - if (desc_count > - (txq->size - (MVPP2_MAX_THREADS * MVPP2_CPU_DESC_CHUNK))) + (txq->size - (num_present_cpus() * MVPP2_CPU_DESC_CHUNK))) return -ENOMEM; + } txq_pcpu->reserved_num += mvpp2_txq_alloc_reserved_desc(port, txq, req); /* OK, the descriptor could have been updated: check again. */ if (txq_pcpu->reserved_num < num) return -ENOMEM; + return 0; } @@ -2821,6 +5293,17 @@ struct mvpp2_txq_pcpu_buf *tx_buf = txq_pcpu->buffs + txq_pcpu->txq_get_index; +#ifdef CONFIG_MVPP2_FBX_FF + if (tx_buf->is_rx_buf) { + mvpp2_bm_pool_put(port, + tx_buf->pool, + tx_buf->bm_dma, + tx_buf->bm_phys); + mvpp2_txq_inc_get(txq_pcpu); + continue; + } +#endif + if (!IS_TSO_HEADER(txq_pcpu, tx_buf->dma) && tx_buf->type != MVPP2_TYPE_XDP_TX) dma_unmap_single(port->dev->dev.parent, tx_buf->dma, @@ -2864,6 +5347,10 @@ if (txq_pcpu->thread != mvpp2_cpu_to_thread(port->priv, smp_processor_id())) netdev_err(port->dev, "wrong cpu on the end of Tx processing\n"); +#ifdef CONFIG_MVPP2_FBX_FF + WARN_ON(txq->log_id == MVPP2_FF_TXQ_ID); +#endif + tx_done = mvpp2_txq_sent_desc_proc(port, txq); if (!tx_done) return; @@ -3421,13 +5908,48 @@ mvpp2_isr_handle_ptp_queue(port, 1); } +static void mvpp2_phylink_down(struct work_struct *work) +{ + struct delayed_work *del_work = to_delayed_work(work); + struct mvpp2_port *port = container_of(del_work, struct mvpp2_port, + phylink_down_work); + phylink_mac_change(port->phylink, false); +} + +/* + * Some switches have random link crashing issues; reporting the port being + * down and up right away as not much impact except when STP is used (it can + * take up to a few ten seconds to be back in forwarding state). In order to + * workaround that when link status interrupt happens to notify a down link, + * the port is actually reset and the phylink status report is delayed by 50ms + * giving the link a chance to be up again in the meantime. This is a kind of + * debounce. + */ +static void mvpp2_phylink_debounce(struct mvpp2_port *port, bool link) +{ + if (!port->linkdown_debounce) { + phylink_mac_change(port->phylink, link); + } else if (link) { + cancel_delayed_work(&port->phylink_down_work); + phylink_mac_change(port->phylink, true); + } else { + queue_delayed_work(port->priv->phylink_down_queue, + &port->phylink_down_work, + msecs_to_jiffies(50)); + } +} + static void mvpp2_isr_handle_link(struct mvpp2_port *port, struct phylink_pcs *pcs, bool link) { struct net_device *dev = port->dev; + if (!link) + port->linkdown_10g_wa_jiffies = jiffies + + MVPP2_LINKDOWN_10G_WA_RESET_DELAY; + if (port->phylink) { - phylink_pcs_change(pcs, link); + mvpp2_phylink_debounce(port, link); return; } @@ -3557,6 +6079,7 @@ switch (status & MVPP2_RXD_ERR_CODE_MASK) { case MVPP2_RXD_ERR_CRC: err_str = "crc"; + port->dev->stats.rx_crc_errors++; break; case MVPP2_RXD_ERR_OVERRUN: err_str = "overrun"; @@ -3594,6 +6117,62 @@ phys_addr_t phys_addr; void *buf; +#ifdef CONFIG_MVPP2_FBX_FF + if (ff_enabled && pool == MVPP2_BM_LONG) { + struct mvpp2_port *opp_ports[2]; + unsigned int i, count; + unsigned int thread = mvpp2_cpu_to_thread(port->priv, + smp_processor_id()); + + /* + * try to reclaim from opposite fast forward dedicated + * tx queues + */ + count = ff_get_opposite_ports(port, opp_ports); + if (!count) + goto alloc; + + for (i = 0; i < count; i++) { + struct mvpp2_port *opp_port = opp_ports[i]; + struct mvpp2_tx_queue *txq; + struct mvpp2_txq_pcpu *txq_pcpu; + struct mvpp2_txq_pcpu_buf *tx_buf; + + + txq = opp_port->ff_txq; + if (WARN_ON(txq->log_id != MVPP2_FF_TXQ_ID)) + continue; + + txq_pcpu = per_cpu_ptr(txq->pcpu, thread); + if (!txq_pcpu->count) + continue; + + if (!txq_pcpu->release_pending) + txq_pcpu->release_pending = + mvpp2_txq_sent_desc_proc(opp_port, txq); + + if (!txq_pcpu->release_pending) + continue; + + tx_buf = txq_pcpu->buffs + txq_pcpu->txq_get_index; + if (WARN_ON(!tx_buf->is_rx_buf)) + continue; + + mvpp2_bm_pool_put(port, + tx_buf->pool, + tx_buf->bm_dma, + tx_buf->bm_phys); + + txq_pcpu->release_pending--; + txq_pcpu->count--; + mvpp2_txq_inc_get(txq_pcpu); + return 0; + } + } +alloc: +#endif + + /* No recycle or too many buffers are in use, so allocate a new skb */ buf = mvpp2_buf_alloc(port, bm_pool, page_pool, &dma_addr, &phys_addr, GFP_ATOMIC); if (!buf) @@ -3906,6 +6485,11 @@ int rx_done = 0; u32 xdp_ret = 0; +#ifdef CONFIG_MVPP2_FBX_FF + unsigned int thread = mvpp2_cpu_to_thread(port->priv, smp_processor_id()); + ff_lock_this_cpu(); +#endif + xdp_prog = READ_ONCE(port->xdp_prog); /* Get number of received packets and clamp the to-do */ @@ -3967,6 +6551,22 @@ /* Prefetch header */ prefetch(data + MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM); +#ifdef CONFIG_MVPP2_FBX_FF + rcu_read_lock(); + ret = ff_receive(thread, + port, + pool, + rx_desc, + data, + MVPP2_MH_SIZE + MVPP2_SKB_HEADROOM, rx_bytes); + rcu_read_unlock(); + if (ret) { + ps.rx_packets++; + ps.rx_bytes += rx_bytes; + continue; + } +#endif + if (bm_pool->frag_size > PAGE_SIZE) frag_size = 0; else @@ -4001,6 +6601,12 @@ } } + err = mvpp2_rx_refill(port, bm_pool, pp, pool); + if (err) { + netdev_err(port->dev, "failed to refill BM pools\n"); + goto err_drop_frame; + } + if (frag_size) skb = build_skb(data, frag_size); else @@ -4019,13 +6625,6 @@ skb_hwtstamps(skb)); } - err = mvpp2_rx_refill(port, bm_pool, pp, pool); - if (err) { - netdev_err(port->dev, "failed to refill BM pools\n"); - dev_kfree_skb_any(skb); - goto err_drop_frame; - } - if (pp) skb_mark_for_recycle(skb); else @@ -4057,6 +6656,10 @@ if (xdp_ret & MVPP2_XDP_REDIR) xdp_do_flush(); +#ifdef CONFIG_MVPP2_FBX_FF + ff_unlock_this_cpu(); +#endif + if (ps.rx_packets) { struct mvpp2_pcpu_stats *stats = this_cpu_ptr(port->stats); @@ -4369,6 +6972,10 @@ txq_id = skb_get_queue_mapping(skb); txq = port->txqs[txq_id]; +#ifdef CONFIG_MVPP2_FBX_FF + WARN_ON(txq->log_id == MVPP2_FF_TXQ_ID); +#endif + txq_pcpu = per_cpu_ptr(txq->pcpu, thread); aggr_txq = &port->priv->aggr_txqs[thread]; @@ -4492,6 +7099,10 @@ struct mvpp2_queue_vector *qv; unsigned int thread = mvpp2_cpu_to_thread(port->priv, smp_processor_id()); +#ifdef CONFIG_MVPP2_FBX_FF + ff.jiffies = nfct_time_stamp; +#endif + qv = container_of(napi, struct mvpp2_queue_vector, napi); /* Rx/Tx cause register @@ -4599,7 +7210,7 @@ } /* Set hw internals when starting port */ -static void mvpp2_start_dev(struct mvpp2_port *port) +static void __mvpp2_start_dev(struct mvpp2_port *port, bool silent) { int i; @@ -4615,6 +7226,9 @@ mvpp22_mode_reconfigure(port, port->phy_interface); if (port->phylink) { + if (silent) + phylink_start_silent(port->phylink); + else phylink_start(port->phylink); } else { mvpp2_acpi_start(port); @@ -4625,6 +7239,16 @@ clear_bit(0, &port->state); } +static void mvpp2_start_dev(struct mvpp2_port *port) +{ + return __mvpp2_start_dev(port, false); +} + +static void mvpp2_start_dev_silent(struct mvpp2_port *port) +{ + return __mvpp2_start_dev(port, true); +} + /* Set hw internals when stopping port */ static void mvpp2_stop_dev(struct mvpp2_port *port) { @@ -4717,7 +7341,13 @@ irq_set_status_flags(qv->irq, IRQ_NO_BALANCING); } - err = request_irq(qv->irq, mvpp2_isr, 0, port->dev->name, qv); + scnprintf(qv->request_name, + sizeof (qv->request_name), + "%s%s%s", + port->dev->name, + qv->irq_name[0] ? "-" : "", + qv->irq_name); + err = request_irq(qv->irq, mvpp2_isr, 0, qv->request_name, qv); if (err) goto err; @@ -4778,6 +7408,9 @@ bool valid = false; int err; + port->linkdown_10g_wa_jiffies = jiffies + + MVPP2_LINKDOWN_10G_WA_RESET_DELAY; + err = mvpp2_prs_mac_da_accept(port, mac_bcast, true); if (err) { netdev_err(dev, "mvpp2_prs_mac_da_accept BC failed\n"); @@ -4830,8 +7463,12 @@ } if (priv->hw_version >= MVPP22 && port->port_irq) { + scnprintf(port->link_irq_request_name, + sizeof (port->link_irq_request_name), + "%s-link", + port->dev->name); err = request_irq(port->port_irq, mvpp2_port_isr, 0, - dev->name, port); + port->link_irq_request_name, port); if (err) { netdev_err(port->dev, "cannot request port link/ptp IRQ %d\n", @@ -4856,6 +7493,10 @@ goto err_free_irq; } +#ifdef CONFIG_MVPP2_FBX_FF + port->ff_txq = port->txqs[MVPP2_FF_TXQ_ID]; +#endif + /* Unmask interrupts on all CPUs */ on_each_cpu(mvpp2_interrupts_unmask, port, 1); mvpp2_shared_interrupt_mask_unmask(port, false); @@ -4866,6 +7507,18 @@ queue_delayed_work(priv->stats_queue, &port->stats_work, MVPP2_MIB_COUNTERS_STATS_DELAY); + /* Start serdes WA work */ + queue_delayed_work(priv->linkdown_10g_wa_queue, + &port->linkdown_10g_wa_work, + MVPP2_LINKDOWN_10G_WA_WORK_FREQ); + +#ifdef CONFIG_MVPP2_FBX_FF + { + int ff_idx = (port->priv->id << 1) | port->index; + WARN_ON(ports_by_idx[ff_idx] != NULL); + ports_by_idx[ff_idx] = port; + } +#endif return 0; err_free_irq: @@ -4883,6 +7536,13 @@ struct mvpp2_port_pcpu *port_pcpu; unsigned int thread; +#ifdef CONFIG_MVPP2_FBX_FF + { + int ff_idx = (port->priv->id << 1) | port->index; + ports_by_idx[ff_idx] = NULL; + } +#endif + mvpp2_stop_dev(port); /* Mask interrupts on all threads */ @@ -4907,10 +7567,16 @@ mvpp2_cleanup_txqs(port); cancel_delayed_work_sync(&port->stats_work); + cancel_delayed_work_sync(&port->phylink_down_work); + cancel_delayed_work_sync(&port->linkdown_10g_wa_work); mvpp2_mac_reset_assert(port); mvpp22_pcs_reset_assert(port); +#ifdef CONFIG_MVPP2_FBX_FF + port->ff_txq = NULL; +#endif + return 0; } @@ -4929,49 +7595,46 @@ return 0; } -static void mvpp2_set_rx_promisc(struct mvpp2_port *port, bool enable) +static void mvpp2_set_vlan_promisc(struct mvpp2_port *port, bool enable) { if (!enable && (port->dev->features & NETIF_F_HW_VLAN_CTAG_FILTER)) mvpp2_prs_vid_enable_filtering(port); else mvpp2_prs_vid_disable_filtering(port); - - mvpp2_prs_mac_promisc_set(port->priv, port->id, - MVPP2_PRS_L2_UNI_CAST, enable); - - mvpp2_prs_mac_promisc_set(port->priv, port->id, - MVPP2_PRS_L2_MULTI_CAST, enable); } static void mvpp2_set_rx_mode(struct net_device *dev) { struct mvpp2_port *port = netdev_priv(dev); + /* switch to promisc while we clear uc & mc list */ + mvpp2_prs_mac_promisc_set(port->priv, port->id, + MVPP2_PRS_L2_UNI_CAST, true); + mvpp2_prs_mac_promisc_set(port->priv, port->id, + MVPP2_PRS_L2_MULTI_CAST, true); + /* Clear the whole UC and MC list */ mvpp2_prs_mac_del_all(port); if (dev->flags & IFF_PROMISC) { - mvpp2_set_rx_promisc(port, true); + mvpp2_set_vlan_promisc(port, true); return; } - mvpp2_set_rx_promisc(port, false); + mvpp2_set_vlan_promisc(port, false); - if (netdev_uc_count(dev) > MVPP2_PRS_MAC_UC_FILT_MAX || - mvpp2_prs_mac_da_accept_list(port, &dev->uc)) + if (netdev_uc_count(dev) <= MVPP2_PRS_MAC_UC_FILT_MAX && + !mvpp2_prs_mac_da_accept_list(port, &dev->uc)) mvpp2_prs_mac_promisc_set(port->priv, port->id, - MVPP2_PRS_L2_UNI_CAST, true); + MVPP2_PRS_L2_UNI_CAST, false); - if (dev->flags & IFF_ALLMULTI) { - mvpp2_prs_mac_promisc_set(port->priv, port->id, - MVPP2_PRS_L2_MULTI_CAST, true); + if (dev->flags & IFF_ALLMULTI) return; - } - if (netdev_mc_count(dev) > MVPP2_PRS_MAC_MC_FILT_MAX || - mvpp2_prs_mac_da_accept_list(port, &dev->mc)) + if (netdev_mc_count(dev) <= MVPP2_PRS_MAC_MC_FILT_MAX && + !mvpp2_prs_mac_da_accept_list(port, &dev->mc)) mvpp2_prs_mac_promisc_set(port->priv, port->id, - MVPP2_PRS_L2_MULTI_CAST, true); + MVPP2_PRS_L2_MULTI_CAST, false); } static int mvpp2_set_mac_address(struct net_device *dev, void *p) @@ -5081,9 +7744,11 @@ /* No port is using jumbo frames */ if (!jumbo) { +#ifndef CONFIG_MVPP2_FBX_FF dev_info(port->dev->dev.parent, "all ports have a low MTU, switching to per-cpu buffers"); mvpp2_bm_switch_buffers(priv, true); +#endif } } @@ -5266,6 +7931,21 @@ return 0; } +static int mii_bus_read(struct net_device *dev, int mii_id, int regnum) +{ + struct mvpp2_port *port = netdev_priv(dev); + + return port->mii_bus->read(port->mii_bus, mii_id, regnum); +} + +static void mii_bus_write(struct net_device *dev, int mii_id, int regnum, + int value) +{ + struct mvpp2_port *port = netdev_priv(dev); + + port->mii_bus->write(port->mii_bus, mii_id, regnum, value); +} + static int mvpp2_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) { struct mvpp2_port *port = netdev_priv(dev); @@ -5280,6 +7960,21 @@ if (port->hwtstamp) return mvpp2_get_ts_config(port, ifr); break; + case SIOCGMIIREG: + case SIOCSMIIREG: { + struct mii_if_info mii; + + if (!port->mii_bus) + return -ENOTSUPP; + + mii.dev = dev; + mii.mdio_read = mii_bus_read; + mii.mdio_write = mii_bus_write; + mii.phy_id = 0; + mii.phy_id_mask = 0x3f; + mii.reg_num_mask = 0x1f; + return generic_mii_ioctl(&mii, if_mii(ifr), cmd, NULL); + } } if (!port->phylink) @@ -5757,6 +8452,91 @@ return mvpp2_modify_rxfh_context(dev, NULL, rxfh, extack); } +static int mvpp2_ethtool_set_priv_flags(struct net_device *dev, u32 flags) +{ + struct mvpp2_port *port = netdev_priv(dev); + + if (flags & (1 << FBX_CLEAR_MIB_BIT)) { + memset(port->ethtool_stats, 0, + sizeof(u64) * MVPP2_N_ETHTOOL_STATS(port->ntxqs, port->nrxqs)); + flags &= ~(1 << FBX_CLEAR_MIB_BIT); + } + + if (!flags) + return 0; + + if (port->gop_id != 0) + /* + * only GOP port ID0 supports 10G speeds. + */ + return -ENOTSUPP; + + port->linkdown_debounce = !!(flags & (1 << FBX_LINKDOWN_DEBOUNCE)); + + port->linkdown_10g_wa_enable = + !!(flags & (1 << FBX_EN_10G_LINKDOWN_WA)); + + return 0; +} + +static int mvpp2_get_port_sync_ok(struct net_device *dev) +{ + struct mvpp2_port *port = netdev_priv(dev); + struct mvpp2 *priv = port->priv; + u32 v; + + if (!netif_running(dev)) + return 0; + + + if (port->gop_id == 0 && + port->phy_interface == PHY_INTERFACE_MODE_10GBASER) { + /* + * on port0 in 10GBASER mode, get sync ok from MPCS + * gearbox register, field Lane Locked. + */ + void __iomem *mpcs = priv->iface_base + + MVPP22_MPCS_BASE(port->gop_id); + + v = readl(mpcs + MVPP22_MPCS_GEARBOX_STATUS) & + MVPP22_MPCS_GEARBOX_STATUS_LANELOCK; + } else + /* otherwise default to GMAC SyncOk status.*/ + v = readl(port->base + MVPP2_GMAC_STATUS0) & + MVPP2_GMAC_STATUS0_SYNC_OK; + return !!v; +} + +static u32 mvpp2_ethtool_get_priv_flags(struct net_device *dev) +{ + struct mvpp2_port *port = netdev_priv(dev); + u32 ret = 0; + + ret |= mvpp2_get_port_sync_ok(dev) << FBX_SYNC_OK_BIT; + ret |= (port->linkdown_10g_wa_enable ? 1 : 0) << FBX_EN_10G_LINKDOWN_WA; + ret |= (port->linkdown_debounce ? 1 : 0) << FBX_LINKDOWN_DEBOUNCE; + + return ret; +} + +static struct phylink *mvpp2_ethtool_get_phylink(struct net_device *dev) +{ + struct mvpp2_port *port = netdev_priv(dev); + return port->phylink; +} + +/* + * netdevice ->ndo_select_queue() callback + */ +static u16 mvpp2_select_queue(struct net_device *dev, + struct sk_buff *skb, + struct net_device *skb_dev) +{ + if (skb->priority >= TC_PRIO_INTERACTIVE) + return MVPP2_USABLE_TX_QUEUES - 1; + return 0; +} + /* Device ops */ static const struct net_device_ops mvpp2_netdev_ops = { @@ -5773,6 +8553,7 @@ .ndo_set_features = mvpp2_set_features, .ndo_bpf = mvpp2_xdp, .ndo_xdp_xmit = mvpp2_xdp_xmit, + .ndo_select_queue = mvpp2_select_queue, }; static const struct ethtool_ops mvpp2_eth_tool_ops = { @@ -5802,6 +8583,9 @@ .create_rxfh_context = mvpp2_create_rxfh_context, .modify_rxfh_context = mvpp2_modify_rxfh_context, .remove_rxfh_context = mvpp2_remove_rxfh_context, + .set_priv_flags = mvpp2_ethtool_set_priv_flags, + .get_priv_flags = mvpp2_ethtool_get_priv_flags, + .get_phylink = mvpp2_ethtool_get_phylink, }; /* Used for PPv2.1, or PPv2.2 with the old Device Tree binding that @@ -5818,6 +8602,7 @@ v->sw_thread_id = 0; v->sw_thread_mask = *cpumask_bits(cpu_online_mask); v->port = port; + v->irq_name[0] = 0; v->irq = irq_of_parse_and_map(port_node, 0); if (v->irq <= 0) return -EINVAL; @@ -5880,6 +8665,7 @@ ret = -EINVAL; goto err; } + strscpy(v->irq_name, irqname, sizeof (v->irq_name)); netif_napi_add(port->dev, &v->napi, mvpp2_poll); } @@ -6717,7 +9503,7 @@ /* Ports initialization */ static int mvpp2_port_probe(struct platform_device *pdev, struct fwnode_handle *port_fwnode, - struct mvpp2 *priv) + struct mvpp2 *priv, int index) { struct phy *comphy = NULL; struct mvpp2_port *port; @@ -6733,6 +9519,7 @@ u32 id; int phy_mode; int err, i; + struct device_node *mdio_node; has_tx_irqs = mvpp2_port_has_irqs(priv, port_node, &flags); if (!has_tx_irqs && queue_mode == MVPP2_QDIST_MULTI_MODE) { @@ -6795,6 +9582,15 @@ port->has_tx_irqs = has_tx_irqs; port->flags = flags; + mdio_node = of_parse_phandle(port_node, "mdio-bus", 0); + if (mdio_node) { + port->mii_bus = of_mdio_find_bus(mdio_node); + if (!port->mii_bus) { + err = -EPROBE_DEFER; + goto err_free_netdev; + } + } + err = mvpp2_queue_vectors_init(port, port_node); if (err) goto err_free_netdev; @@ -6872,6 +9668,10 @@ mutex_init(&port->gather_stats_lock); INIT_DELAYED_WORK(&port->stats_work, mvpp2_gather_hw_statistics); + INIT_DELAYED_WORK(&port->phylink_down_work, mvpp2_phylink_down); + + INIT_DELAYED_WORK(&port->linkdown_10g_wa_work, mvpp2_linkdown_10g_wa); + err = mvpp2_port_copy_mac_addr(dev, priv, port_fwnode, &mac_from); if (err < 0) goto err_free_stats; @@ -6879,6 +9679,8 @@ port->tx_ring_size = MVPP2_MAX_TXD_DFLT; port->rx_ring_size = MVPP2_MAX_RXD_DFLT; SET_NETDEV_DEV(dev, &pdev->dev); + port->index = index; + dev->dev_port = index; err = mvpp2_port_init(port); if (err < 0) { @@ -7048,6 +9850,11 @@ priv->port_list[priv->port_count++] = port; +#ifdef CONFIG_MVPP2_FBX_FF + port->ff_notifier.notifier_call = ff_device_event; + register_netdevice_notifier(&port->ff_notifier); +#endif + return 0; err_phylink: @@ -7075,6 +9882,10 @@ { int i; +#ifdef CONFIG_MVPP2_FBX_FF + unregister_netdevice_notifier(&port->ff_notifier); +#endif + unregister_netdev(port->dev); if (port->phylink) phylink_destroy(port->phylink); @@ -7453,6 +10264,10 @@ int i, shared; int err; +#ifdef CONFIG_MVPP2_FBX_FF + ff_init(&pdev->dev); +#endif + priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); if (!priv) return -ENOMEM; @@ -7504,6 +10319,18 @@ priv->global_tx_fc = true; } +#ifdef CONFIG_MVPP2_FBX_FF + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (res->start == 0xf2000000) { + priv->id = 0; + } else if (res->start == 0xf4000000) { + priv->id = 1; + } else { + WARN(1, "unknown mvpp2 unit for fastpath: %llx\n", + res->start); + } +#endif + if (priv->hw_version >= MVPP22 && dev_of_node(&pdev->dev)) { priv->sysctrl_base = syscon_regmap_lookup_by_phandle(pdev->dev.of_node, @@ -7518,8 +10345,11 @@ } if (priv->hw_version >= MVPP22 && - mvpp2_get_nrxqs(priv) * 2 <= MVPP2_BM_MAX_POOLS) + mvpp2_get_nrxqs(priv) * 2 <= MVPP2_BM_MAX_POOLS) { +#ifndef CONFIG_MVPP2_FBX_FF priv->percpu_pools = 1; +#endif + } mvpp2_setup_bm_pool(); @@ -7643,10 +10473,12 @@ goto err_axi_clk; /* Initialize ports */ + i = 0; device_for_each_child_node_scoped(&pdev->dev, port_fwnode) { - err = mvpp2_port_probe(pdev, port_fwnode, priv); + err = mvpp2_port_probe(pdev, port_fwnode, priv, i); if (err < 0) goto err_port_probe; + ++i; } if (priv->port_count == 0) { @@ -7676,11 +10508,36 @@ dev_warn(&pdev->dev, "Minimum of CM3 firmware 18.09 and chip revision B0 required for flow control\n"); } + snprintf(priv->phylink_queue_name, sizeof(priv->phylink_queue_name), + "phylink-wq-%s%s", netdev_name(priv->port_list[0]->dev), + priv->port_count > 1 ? "+" : ""); + priv->phylink_down_queue = + create_singlethread_workqueue(priv->phylink_queue_name); + if (!priv->phylink_down_queue) { + err = -ENOMEM; + goto err_phylink_wq; + } + + snprintf(priv->linkdown_10g_wa_queue_name, + sizeof(priv->linkdown_10g_wa_queue_name), + "serdes-wa-wq-%s%s", netdev_name(priv->port_list[0]->dev), + priv->port_count > 1 ? "+" : ""); + priv->linkdown_10g_wa_queue = + create_singlethread_workqueue(priv->linkdown_10g_wa_queue_name); + if (!priv->linkdown_10g_wa_queue) { + err = -ENOMEM; + goto err_linkdown_10g_wa_wq; + } + mvpp2_dbgfs_init(priv, pdev->name); platform_set_drvdata(pdev, priv); return 0; +err_linkdown_10g_wa_wq: + destroy_workqueue(priv->phylink_down_queue); +err_phylink_wq: + destroy_workqueue(priv->stats_queue); err_port_probe: for (i = 0; i < priv->port_count; i++) mvpp2_port_remove(priv->port_list[i]); @@ -7710,6 +10567,8 @@ } destroy_workqueue(priv->stats_queue); + destroy_workqueue(priv->phylink_down_queue); + destroy_workqueue(priv->linkdown_10g_wa_queue); if (priv->percpu_pools) poolnum = mvpp2_get_nrxqs(priv) * 2; diff -ruw linux-6.13.12/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c linux-6.13.12-fbx/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c --- linux-6.13.12/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c 2025-09-25 17:40:33.787358400 +0200 @@ -1360,32 +1360,6 @@ struct mvpp2_prs_entry pe; int tid, ihl; - /* Ethertype: PPPoE */ - tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID, - MVPP2_PE_LAST_FREE_TID); - if (tid < 0) - return tid; - - memset(&pe, 0, sizeof(pe)); - mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_L2); - pe.index = tid; - - mvpp2_prs_match_etype(&pe, 0, ETH_P_PPP_SES); - - mvpp2_prs_sram_shift_set(&pe, MVPP2_PPPOE_HDR_SIZE, - MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD); - mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_PPPOE); - mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_PPPOE_MASK, - MVPP2_PRS_RI_PPPOE_MASK); - - /* Update shadow table and hw entry */ - mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_L2); - priv->prs_shadow[pe.index].udf = MVPP2_PRS_UDF_L2_DEF; - priv->prs_shadow[pe.index].finish = false; - mvpp2_prs_shadow_ri_set(priv, pe.index, MVPP2_PRS_RI_PPPOE_MASK, - MVPP2_PRS_RI_PPPOE_MASK); - mvpp2_prs_hw_write(priv, &pe); - /* Ethertype: ARP */ tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID, MVPP2_PE_LAST_FREE_TID); @@ -1624,106 +1598,6 @@ return 0; } -/* Set entries for PPPoE ethertype */ -static int mvpp2_prs_pppoe_init(struct mvpp2 *priv) -{ - struct mvpp2_prs_entry pe; - int tid, ihl; - - /* IPv4 over PPPoE with header length >= 5 */ - for (ihl = MVPP2_PRS_IPV4_IHL_MIN; ihl <= MVPP2_PRS_IPV4_IHL_MAX; ihl++) { - tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID, - MVPP2_PE_LAST_FREE_TID); - if (tid < 0) - return tid; - - memset(&pe, 0, sizeof(pe)); - mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE); - pe.index = tid; - - mvpp2_prs_match_etype(&pe, 0, PPP_IP); - mvpp2_prs_tcam_data_byte_set(&pe, MVPP2_ETH_TYPE_LEN, - MVPP2_PRS_IPV4_HEAD | ihl, - MVPP2_PRS_IPV4_HEAD_MASK | - MVPP2_PRS_IPV4_IHL_MASK); - - mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP4); - mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP4, - MVPP2_PRS_RI_L3_PROTO_MASK); - /* goto ipv4 dst-address (skip eth_type + IP-header-size - 4) */ - mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + - sizeof(struct iphdr) - 4, - MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD); - /* Set L3 offset */ - mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3, - MVPP2_ETH_TYPE_LEN, - MVPP2_PRS_SRAM_OP_SEL_UDF_ADD); - /* Set L4 offset */ - mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L4, - MVPP2_ETH_TYPE_LEN + (ihl * 4), - MVPP2_PRS_SRAM_OP_SEL_UDF_ADD); - - /* Update shadow table and hw entry */ - mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE); - mvpp2_prs_hw_write(priv, &pe); - } - - /* IPv6 over PPPoE */ - tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID, - MVPP2_PE_LAST_FREE_TID); - if (tid < 0) - return tid; - - memset(&pe, 0, sizeof(pe)); - mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE); - pe.index = tid; - - mvpp2_prs_match_etype(&pe, 0, PPP_IPV6); - - mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_IP6); - mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_IP6, - MVPP2_PRS_RI_L3_PROTO_MASK); - /* Jump to DIP of IPV6 header */ - mvpp2_prs_sram_shift_set(&pe, MVPP2_ETH_TYPE_LEN + 8 + - MVPP2_MAX_L3_ADDR_SIZE, - MVPP2_PRS_SRAM_OP_SEL_SHIFT_ADD); - /* Set L3 offset */ - mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3, - MVPP2_ETH_TYPE_LEN, - MVPP2_PRS_SRAM_OP_SEL_UDF_ADD); - - /* Update shadow table and hw entry */ - mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE); - mvpp2_prs_hw_write(priv, &pe); - - /* Non-IP over PPPoE */ - tid = mvpp2_prs_tcam_first_free(priv, MVPP2_PE_FIRST_FREE_TID, - MVPP2_PE_LAST_FREE_TID); - if (tid < 0) - return tid; - - memset(&pe, 0, sizeof(pe)); - mvpp2_prs_tcam_lu_set(&pe, MVPP2_PRS_LU_PPPOE); - pe.index = tid; - - mvpp2_prs_sram_ri_update(&pe, MVPP2_PRS_RI_L3_UN, - MVPP2_PRS_RI_L3_PROTO_MASK); - - /* Finished: go to flowid generation */ - mvpp2_prs_sram_next_lu_set(&pe, MVPP2_PRS_LU_FLOWS); - mvpp2_prs_sram_bits_set(&pe, MVPP2_PRS_SRAM_LU_GEN_BIT, 1); - /* Set L3 offset even if it's unknown L3 */ - mvpp2_prs_sram_offset_set(&pe, MVPP2_PRS_SRAM_UDF_TYPE_L3, - MVPP2_ETH_TYPE_LEN, - MVPP2_PRS_SRAM_OP_SEL_UDF_ADD); - - /* Update shadow table and hw entry */ - mvpp2_prs_shadow_set(priv, pe.index, MVPP2_PRS_LU_PPPOE); - mvpp2_prs_hw_write(priv, &pe); - - return 0; -} - /* Initialize entries for IPv4 */ static int mvpp2_prs_ip4_init(struct mvpp2 *priv) { @@ -2206,7 +2080,6 @@ err = mvpp2_prs_etype_init(priv); err = err ? : mvpp2_prs_vlan_init(pdev, priv); - err = err ? : mvpp2_prs_pppoe_init(priv); err = err ? : mvpp2_prs_ip6_init(priv); err = err ? : mvpp2_prs_ip4_init(priv); diff -ruw linux-6.13.12/drivers/net/ethernet/qualcomm/Kconfig linux-6.13.12-fbx/drivers/net/ethernet/qualcomm/Kconfig --- linux-6.13.12/drivers/net/ethernet/qualcomm/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/qualcomm/Kconfig 2025-09-25 17:40:33.931359114 +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.13.12/drivers/net/ethernet/qualcomm/Makefile linux-6.13.12-fbx/drivers/net/ethernet/qualcomm/Makefile --- linux-6.13.12/drivers/net/ethernet/qualcomm/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ethernet/qualcomm/Makefile 2025-09-25 17:40:33.931359114 +0200 @@ -12,3 +12,4 @@ obj-y += emac/ obj-$(CONFIG_RMNET) += rmnet/ +obj-y += ipq95xx/ diff -ruw linux-6.13.12/drivers/net/mdio/Kconfig linux-6.13.12-fbx/drivers/net/mdio/Kconfig --- linux-6.13.12/drivers/net/mdio/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/mdio/Kconfig 2025-09-25 17:40:34.031359610 +0200 @@ -105,6 +105,10 @@ config MDIO_CAVIUM tristate +config MDIO_CA_NI + tristate "Cortina ni mdio driver (for 82xx)" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + config MDIO_GPIO tristate "GPIO lib-based bitbanged MDIO buses" depends on MDIO_BITBANG diff -ruw linux-6.13.12/drivers/net/mdio/Makefile linux-6.13.12-fbx/drivers/net/mdio/Makefile --- linux-6.13.12/drivers/net/mdio/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/mdio/Makefile 2025-09-25 17:40:34.031359610 +0200 @@ -10,6 +10,7 @@ obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o obj-$(CONFIG_MDIO_CAVIUM) += mdio-cavium.o +obj-$(CONFIG_MDIO_CA_NI) += mdio-ca-ni.o obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o obj-$(CONFIG_MDIO_I2C) += mdio-i2c.o diff -ruw linux-6.13.12/drivers/net/mdio/of_mdio.c linux-6.13.12-fbx/drivers/net/mdio/of_mdio.c --- linux-6.13.12/drivers/net/mdio/of_mdio.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/mdio/of_mdio.c 2025-09-25 17:40:34.035359629 +0200 @@ -221,6 +221,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.13.12/drivers/net/phy/Kconfig linux-6.13.12-fbx/drivers/net/phy/Kconfig --- linux-6.13.12/drivers/net/phy/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/Kconfig 2025-09-25 17:40:34.039359649 +0200 @@ -207,6 +207,10 @@ help Currently supports the CS4340 phy. +config CORTINA_NI_PHY + tristate "Cortina 827x integrated gigabit phy" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + config DAVICOM_PHY tristate "Davicom PHYs" help @@ -338,6 +342,9 @@ source "drivers/net/phy/qcom/Kconfig" +config QCA8084_PHY + tristate "Qualcomm QCA8084 Quad-PHY" + config QSEMI_PHY tristate "Quality Semiconductor PHYs" help diff -ruw linux-6.13.12/drivers/net/phy/Makefile linux-6.13.12-fbx/drivers/net/phy/Makefile --- linux-6.13.12/drivers/net/phy/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/Makefile 2025-09-25 17:40:34.039359649 +0200 @@ -55,6 +55,7 @@ obj-$(CONFIG_BROADCOM_PHY) += broadcom.o obj-$(CONFIG_CICADA_PHY) += cicada.o obj-$(CONFIG_CORTINA_PHY) += cortina.o +obj-$(CONFIG_CORTINA_NI_PHY) += cortina_ni.o obj-$(CONFIG_DAVICOM_PHY) += davicom.o obj-$(CONFIG_DP83640_PHY) += dp83640.o obj-$(CONFIG_DP83822_PHY) += dp83822.o @@ -93,7 +94,15 @@ obj-$(CONFIG_NXP_CBTX_PHY) += nxp-cbtx.o obj-$(CONFIG_NXP_TJA11XX_PHY) += nxp-tja11xx.o obj-y += qcom/ +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 +ifdef CONFIG_ARCH_CORTINA_VENUS +realtek-objs += realtek-cortina.o +endif obj-$(CONFIG_REALTEK_PHY) += realtek.o obj-$(CONFIG_RENESAS_PHY) += uPD60620.o obj-$(CONFIG_ROCKCHIP_PHY) += rockchip.o diff -ruw linux-6.13.12/drivers/net/phy/mdio_bus.c linux-6.13.12-fbx/drivers/net/phy/mdio_bus.c --- linux-6.13.12/drivers/net/phy/mdio_bus.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/mdio_bus.c 2025-09-25 17:40:34.047359689 +0200 @@ -685,7 +685,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; @@ -740,7 +740,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", @@ -750,7 +750,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); } @@ -792,8 +793,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; @@ -822,8 +825,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.13.12/drivers/net/phy/phy-c45.c linux-6.13.12-fbx/drivers/net/phy/phy-c45.c --- linux-6.13.12/drivers/net/phy/phy-c45.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/phy-c45.c 2025-09-25 17:40:34.059359748 +0200 @@ -784,6 +784,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; } @@ -831,6 +841,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; } @@ -1593,3 +1613,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.13.12/drivers/net/phy/phy-core.c linux-6.13.12-fbx/drivers/net/phy/phy-core.c --- linux-6.13.12/drivers/net/phy/phy-core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/phy-core.c 2025-09-25 17:40:34.059359748 +0200 @@ -13,7 +13,7 @@ */ const char *phy_speed_to_str(int speed) { - BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 103, + BUILD_BUG_ON_MSG(__ETHTOOL_LINK_MODE_MASK_NBITS != 109, "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"); @@ -127,6 +127,7 @@ case PHY_INTERFACE_MODE_TRGMII: case PHY_INTERFACE_MODE_USXGMII: case PHY_INTERFACE_MODE_SGMII: + case PHY_INTERFACE_MODE_HISGMII: case PHY_INTERFACE_MODE_SMII: case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_2500BASEX: @@ -138,6 +139,12 @@ 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: @@ -233,6 +240,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 ), @@ -248,6 +259,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 ), @@ -407,6 +420,10 @@ linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT, modes); if (of_property_read_bool(node, "eee-broken-10gkr")) linkmode_set_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT, modes); + if (of_property_read_bool(node, "eee-broken-2500t")) + linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT, modes); + if (of_property_read_bool(node, "eee-broken-5000t")) + linkmode_set_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT, modes); } /** diff -ruw linux-6.13.12/drivers/net/phy/phy.c linux-6.13.12-fbx/drivers/net/phy/phy.c --- linux-6.13.12/drivers/net/phy/phy.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/phy.c 2025-09-25 17:40:34.059359748 +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.13.12/drivers/net/phy/phy_device.c linux-6.13.12-fbx/drivers/net/phy/phy_device.c --- linux-6.13.12/drivers/net/phy/phy_device.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/phy_device.c 2025-09-25 17:40:34.059359748 +0200 @@ -884,7 +884,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. @@ -894,9 +895,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++) { @@ -1561,6 +1566,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; @@ -3021,6 +3029,23 @@ EXPORT_SYMBOL(phy_support_eee); /** + * phy_disable_eee - Disable EEE for the PHY + * @phydev: Target phy_device struct + * + * This function is used by MAC drivers for MAC's which don't support EEE. + * It disables EEE on the PHY layer. + */ +void phy_disable_eee(struct phy_device *phydev) +{ + linkmode_zero(phydev->advertising_eee); + phydev->eee_cfg.tx_lpi_enabled = false; + phydev->eee_cfg.eee_enabled = false; + /* don't let userspace re-enable EEE advertisement */ + linkmode_fill(phydev->eee_broken_modes); +} +EXPORT_SYMBOL_GPL(phy_disable_eee); + +/** * phy_support_sym_pause - Enable support of symmetrical pause * @phydev: target phy_device struct * @@ -3833,14 +3858,19 @@ if (rc) goto err_mdio_bus; + 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) goto err_c45; return 0; - err_c45: phy_driver_unregister(&genphy_c45_driver); +err_c45_broken: + phy_driver_unregister(&genphy_broken_c45_driver); err_mdio_bus: mdio_bus_exit(); err_ethtool_phy_ops: @@ -3854,6 +3884,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.13.12/drivers/net/phy/phylink.c linux-6.13.12-fbx/drivers/net/phy/phylink.c --- linux-6.13.12/drivers/net/phy/phylink.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/phylink.c 2025-09-25 17:40:34.059359748 +0200 @@ -227,8 +227,11 @@ case PHY_INTERFACE_MODE_QUSGMII: case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_GMII: + case PHY_INTERFACE_MODE_1000BASEPX_D: + case PHY_INTERFACE_MODE_1000BASEPX_U: return SPEED_1000; + case PHY_INTERFACE_MODE_HISGMII: case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_10G_QXGMII: return SPEED_2500; @@ -242,6 +245,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: @@ -250,6 +257,7 @@ case PHY_INTERFACE_MODE_XLGMII: return SPEED_40000; + case PHY_INTERFACE_MODE_INTERNAL: case PHY_INTERFACE_MODE_NA: case PHY_INTERFACE_MODE_MAX: @@ -503,6 +511,7 @@ caps |= MAC_10000FD | MAC_5000FD; fallthrough; + case PHY_INTERFACE_MODE_HISGMII: case PHY_INTERFACE_MODE_10G_QXGMII: caps |= MAC_2500FD; fallthrough; @@ -539,6 +548,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; @@ -555,6 +566,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; @@ -567,10 +582,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; } @@ -901,6 +916,7 @@ switch (pl->link_config.interface) { case PHY_INTERFACE_MODE_SGMII: + case PHY_INTERFACE_MODE_HISGMII: case PHY_INTERFACE_MODE_PSGMII: case PHY_INTERFACE_MODE_QSGMII: case PHY_INTERFACE_MODE_QUSGMII: @@ -924,6 +940,25 @@ phylink_caps_to_linkmodes(pl->supported, caps); 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", @@ -1113,6 +1148,7 @@ case PHY_INTERFACE_MODE_QSGMII: case PHY_INTERFACE_MODE_QUSGMII: case PHY_INTERFACE_MODE_USXGMII: + case PHY_INTERFACE_MODE_HISGMII: case PHY_INTERFACE_MODE_10G_QXGMII: /* These protocols are designed for use with a PHY which * communicates its negotiation result back to the MAC via @@ -2182,12 +2218,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)); @@ -2240,6 +2277,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() @@ -2866,6 +2915,30 @@ } EXPORT_SYMBOL_GPL(phylink_ethtool_set_eee); +void phylink_support_eee(struct phylink *pl) +{ + if (pl->phydev) + phy_support_eee(pl->phydev); + +} +EXPORT_SYMBOL_GPL(phylink_support_eee); + +void phylink_disable_eee(struct phylink *pl) +{ + if (pl->phydev) + phy_disable_eee(pl->phydev); + +} +EXPORT_SYMBOL_GPL(phylink_disable_eee); + +void phylink_eee_update_cfg_timer(struct phylink *pl, + unsigned int val) +{ + if (pl->phydev) + pl->phydev->eee_cfg.tx_lpi_timer = val; +} +EXPORT_SYMBOL_GPL(phylink_eee_update_cfg_timer); + /* This emulates MII registers for a fixed-mode phy operating as per the * passed in state. "aneg" defines if we report negotiation is possible. * @@ -3220,10 +3293,10 @@ struct phylink_link_state config; 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; @@ -3839,6 +3912,125 @@ } 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 (!test_bit(PHYLINK_DISABLE_STOPPED, + &pl->phylink_disable_state)) { + phylink_pcs_poll_stop(pl); + cancel_work_sync(&pl->resolve); + } + } + + 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)) { + 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.13.12/drivers/net/phy/sfp-bus.c linux-6.13.12-fbx/drivers/net/phy/sfp-bus.c --- linux-6.13.12/drivers/net/phy/sfp-bus.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/sfp-bus.c 2025-09-25 17:40:34.067359788 +0200 @@ -526,6 +526,15 @@ } EXPORT_SYMBOL_GPL(sfp_get_module_eeprom); +/* + * sfp_get_sfp_state + */ +int sfp_get_sfp_state(struct sfp_bus *bus, struct ethtool_sfp_state *st) +{ + return bus->socket_ops->get_sfp_state(bus->sfp, st); +} +EXPORT_SYMBOL_GPL(sfp_get_sfp_state); + /** * sfp_get_module_eeprom_by_page() - Read a page from the SFP module EEPROM * @bus: a pointer to the &struct sfp_bus structure for the sfp module @@ -637,11 +646,6 @@ else if (ret < 0) return ERR_PTR(ret); - if (!fwnode_device_is_available(ref.fwnode)) { - fwnode_handle_put(ref.fwnode); - return NULL; - } - bus = sfp_bus_get(ref.fwnode); fwnode_handle_put(ref.fwnode); if (!bus) diff -ruw linux-6.13.12/drivers/net/phy/sfp.c linux-6.13.12-fbx/drivers/net/phy/sfp.c --- linux-6.13.12/drivers/net/phy/sfp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/sfp.c 2025-09-25 17:40:34.067359788 +0200 @@ -26,6 +26,7 @@ GPIO_TX_DISABLE, GPIO_RS0, GPIO_RS1, + GPIO_POWER_ENABLE, GPIO_MAX, SFP_F_PRESENT = BIT(GPIO_MODDEF0), @@ -34,8 +35,9 @@ SFP_F_TX_DISABLE = BIT(GPIO_TX_DISABLE), SFP_F_RS0 = BIT(GPIO_RS0), SFP_F_RS1 = BIT(GPIO_RS1), + SFP_F_POWER_ENABLE = BIT(GPIO_POWER_ENABLE), - SFP_F_OUTPUTS = SFP_F_TX_DISABLE | SFP_F_RS0 | SFP_F_RS1, + SFP_F_OUTPUTS = SFP_F_TX_DISABLE | SFP_F_RS0 | SFP_F_RS1 | SFP_F_POWER_ENABLE, SFP_E_INSERT = 0, SFP_E_REMOVE, @@ -153,6 +155,7 @@ "tx-disable", "rate-select0", "rate-select1", + "pwr-enable", }; static const enum gpiod_flags gpio_flags[] = { @@ -162,6 +165,7 @@ GPIOD_ASIS, GPIOD_ASIS, GPIOD_ASIS, + GPIOD_ASIS, }; /* t_start_up (SFF-8431) or t_init (SFF-8472) is the time required for a @@ -236,6 +240,8 @@ const struct sff_data *type; size_t i2c_block_size; u32 max_power_mW; + bool force_1000baset_as_1000basex; + bool skip_10g_t_phy_detect; unsigned int (*get_state)(struct sfp *); void (*set_state)(struct sfp *, unsigned int); @@ -330,7 +336,7 @@ static const struct sff_data sfp_data = { .gpios = SFP_F_PRESENT | SFP_F_LOS | SFP_F_TX_FAULT | - SFP_F_TX_DISABLE | SFP_F_RS0 | SFP_F_RS1, + SFP_F_TX_DISABLE | SFP_F_RS0 | SFP_F_RS1 | SFP_F_POWER_ENABLE, .module_supported = sfp_module_supported, }; @@ -592,6 +598,10 @@ { unsigned int drive; + if (sfp->gpio[GPIO_POWER_ENABLE]) + gpiod_direction_output(sfp->gpio[GPIO_POWER_ENABLE], + (state & SFP_F_PRESENT) ? 1 : 0); + if (state & SFP_F_PRESENT) /* If the module is present, drive the requested signals */ drive = sfp->state_hw_drive; @@ -1930,6 +1940,7 @@ break; case MDIO_I2C_C45: + if (sfp->skip_10g_t_phy_detect) err = sfp_sm_probe_phy(sfp, SFP_PHY_ADDR, true); break; @@ -2308,6 +2319,11 @@ } } + if (sfp->force_1000baset_as_1000basex && id.base.e1000_base_t) { + id.base.e1000_base_t = 0; + id.base.e1000_base_sx = 1; + } + sfp->id = id; dev_info(sfp->dev, "module %.*s %.*s rev %.*s sn %.*s dc %.*s\n", @@ -2451,6 +2467,7 @@ switch (sfp->sm_mod_state) { default: if (event == SFP_E_INSERT) { + sfp_set_state(sfp, sfp->state); sfp_sm_mod_next(sfp, SFP_MOD_PROBE, T_SERIAL); sfp->sm_mod_tries_init = R_PROBE_RETRY_INIT; sfp->sm_mod_tries = R_PROBE_RETRY_SLOW; @@ -2855,6 +2872,55 @@ page->data, page->length); }; +static inline u32 to_ethtool_sfp_state(int my_state) +{ + switch (my_state) { + case SFP_S_DOWN: + return ETHTOOL_SFP_S_DOWN; + case SFP_S_FAIL: + return ETHTOOL_SFP_S_FAIL; + case SFP_S_WAIT: + return ETHTOOL_SFP_S_WAIT; + case SFP_S_INIT: + return ETHTOOL_SFP_S_INIT; + case SFP_S_INIT_PHY: + return ETHTOOL_SFP_S_INIT_PHY; + case SFP_S_INIT_TX_FAULT: + return ETHTOOL_SFP_S_INIT_TX_FAULT; + case SFP_S_WAIT_LOS: + return ETHTOOL_SFP_S_WAIT_LOS; + case SFP_S_LINK_UP: + return ETHTOOL_SFP_S_LINK_UP; + case SFP_S_TX_FAULT: + return ETHTOOL_SFP_S_TX_FAULT; + case SFP_S_REINIT: + return ETHTOOL_SFP_S_REINIT; + case SFP_S_TX_DISABLE: + return ETHTOOL_SFP_S_TX_DISABLE; + default: + return 0xffffffff; + } +} + +static int sfp_state(struct sfp *sfp, struct ethtool_sfp_state *st) +{ + memset(st, 0, sizeof (*st)); + + st->fsm_state = to_ethtool_sfp_state(sfp->sm_state); + + st->i_presence = !(sfp->state & SFP_F_PRESENT); + st->i_rxlos = !!(sfp->state & SFP_F_LOS); + st->i_txfault = !!(sfp->state & SFP_F_TX_FAULT); + + /* + * pwren is unconditionally driven whenever an SFP is present. + */ + st->o_pwren = (sfp->state & SFP_F_PRESENT); + st->o_txdis = !!(sfp->state & SFP_F_TX_DISABLE); + + return 0; +} + static const struct sfp_socket_ops sfp_module_ops = { .attach = sfp_attach, .detach = sfp_detach, @@ -2864,6 +2930,7 @@ .module_info = sfp_module_info, .module_eeprom = sfp_module_eeprom, .module_eeprom_by_page = sfp_module_eeprom_by_page, + .get_sfp_state = sfp_state, }; static void sfp_timeout(struct work_struct *work) @@ -3053,6 +3120,12 @@ dev_info(sfp->dev, "Host maximum power %u.%uW\n", sfp->max_power_mW / 1000, (sfp->max_power_mW / 100) % 10); + sfp->force_1000baset_as_1000basex = + device_property_present(&pdev->dev, "force-1000baset-as-1000basex"); + + sfp->skip_10g_t_phy_detect = + device_property_present(&pdev->dev, "skip-10g-t-phy-detect"); + /* Get the initial state, and always signal TX disable, * since the network interface will not be up. */ diff -ruw linux-6.13.12/drivers/net/phy/sfp.h linux-6.13.12-fbx/drivers/net/phy/sfp.h --- linux-6.13.12/drivers/net/phy/sfp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/sfp.h 2025-09-25 17:40:34.067359788 +0200 @@ -26,6 +26,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.13.12/drivers/net/phy/swphy.c linux-6.13.12-fbx/drivers/net/phy/swphy.c --- linux-6.13.12/drivers/net/phy/swphy.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/phy/swphy.c 2025-09-25 17:40:34.067359788 +0200 @@ -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.13.12/drivers/net/ppp/ppp_generic.c linux-6.13.12-fbx/drivers/net/ppp/ppp_generic.c --- linux-6.13.12/drivers/net/ppp/ppp_generic.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ppp/ppp_generic.c 2025-09-25 17:40:34.067359788 +0200 @@ -190,6 +190,7 @@ netns_tracker ns_tracker; struct list_head clist; /* link in list of channels per unit */ rwlock_t upl; /* protects `ppp' and 'bridge' */ + int stopped; /* channel is stopped */ struct channel __rcu *bridge; /* "bridged" ppp channel */ #ifdef CONFIG_PPP_MULTILINK u8 avail; /* flag used in multilink stuff */ @@ -1672,10 +1673,28 @@ ppp_send_frame(ppp, skb); /* If there's no work left to do, tell the core net code that we can accept some more. */ - if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) + if (!ppp->xmit_pending && !skb_peek(&ppp->file.xq)) { + /* only enable net queue if at least one + * channel is not stopped */ + struct list_head *list; + struct channel *pch; + bool need_wake; + + list = &ppp->channels; + need_wake = false; + while ((list = list->next) != &ppp->channels) { + pch = list_entry(list, struct channel, clist); + if (!pch->stopped) { + need_wake = true; + break; + } + } + + if (need_wake) netif_wake_queue(ppp->dev); else netif_stop_queue(ppp->dev); + } } else { kfree_skb(skb); } @@ -3030,10 +3049,24 @@ if (!pch) return; + pch->stopped = 0; ppp_channel_push(pch); } /* + * Callback from a channel when it want to prevent further transmit on it + */ +void +ppp_output_stop(struct ppp_channel *chan) +{ + struct channel *pch = chan->ppp; + + if (pch == 0) + return; + pch->stopped = 1; +} + +/* * Compression control. */ @@ -3627,6 +3660,7 @@ EXPORT_SYMBOL(ppp_input); EXPORT_SYMBOL(ppp_input_error); EXPORT_SYMBOL(ppp_output_wakeup); +EXPORT_SYMBOL(ppp_output_stop); EXPORT_SYMBOL(ppp_register_compressor); EXPORT_SYMBOL(ppp_unregister_compressor); MODULE_DESCRIPTION("Generic PPP layer driver"); diff -ruw linux-6.13.12/drivers/net/ppp/pptp.c linux-6.13.12-fbx/drivers/net/ppp/pptp.c --- linux-6.13.12/drivers/net/ppp/pptp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/ppp/pptp.c 2025-09-25 17:40:34.071359808 +0200 @@ -370,6 +370,7 @@ po = lookup_chan(ntohs(header->call_id), iph->saddr); if (po) { skb_dst_drop(skb); + skb->mark = 0; nf_reset_ct(skb); return sk_receive_skb(sk_pppox(po), skb, 0); } diff -ruw linux-6.13.12/drivers/net/tun.c linux-6.13.12-fbx/drivers/net/tun.c --- linux-6.13.12/drivers/net/tun.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/tun.c 2025-09-25 17:40:34.075359828 +0200 @@ -79,6 +79,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -165,6 +169,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) @@ -184,6 +213,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| \ @@ -1031,6 +1065,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) { @@ -1123,6 +1335,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)) { @@ -3397,6 +3614,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.13.12/drivers/net/wireless/ath/Kconfig linux-6.13.12-fbx/drivers/net/wireless/ath/Kconfig --- linux-6.13.12/drivers/net/wireless/ath/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/Kconfig 2025-09-25 17:40:34.099359947 +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.13.12/drivers/net/wireless/ath/ath.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath.h --- linux-6.13.12/drivers/net/wireless/ath/ath.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath.h 2025-09-25 17:40:34.099359947 +0200 @@ -47,6 +47,7 @@ u32 rx_busy; u32 rx_frame; u32 tx_frame; + u32 rx_bss_frame; }; enum ath_device_state { @@ -188,6 +189,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.13.12/drivers/net/wireless/ath/ath10k/core.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/core.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/core.c 2025-09-25 17:40:34.099359947 +0200 @@ -32,6 +32,8 @@ unsigned int ath10k_debug_mask; EXPORT_SYMBOL(ath10k_debug_mask); +bool ath10k_offload_use_drv_tx; + static unsigned int ath10k_cryptmode_param; static bool uart_print; static bool skip_otp; @@ -43,6 +45,8 @@ unsigned long ath10k_coredump_mask = BIT(ATH10K_FW_CRASH_DUMP_REGISTERS) | BIT(ATH10K_FW_CRASH_DUMP_CE_DATA); +bool ath10k_no_fetch = 0; + /* FIXME: most of these should be readonly */ module_param_named(debug_mask, ath10k_debug_mask, uint, 0644); module_param_named(cryptmode, ath10k_cryptmode_param, uint, 0644); @@ -51,6 +55,8 @@ module_param(fw_diag_log, bool, 0644); module_param_named(frame_mode, ath10k_frame_mode, uint, 0644); module_param_named(coredump_mask, ath10k_coredump_mask, ulong, 0444); +module_param_named(no_fetch, ath10k_no_fetch, bool, 0644); +module_param_named(offload_use_drv_tx, ath10k_offload_use_drv_tx, bool, 0644); MODULE_PARM_DESC(debug_mask, "Debugging mask"); MODULE_PARM_DESC(uart_print, "Uart target debugging"); @@ -60,6 +66,8 @@ "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)"); MODULE_PARM_DESC(coredump_mask, "Bitfield of what to include in firmware crash file"); MODULE_PARM_DESC(fw_diag_log, "Diag based fw log debugging"); +MODULE_PARM_DESC(no_fetch, "Disable pull mode (push only mode)"); +MODULE_PARM_DESC(offload_use_drv_tx, "allow using drv_tx datapath for offload, no AQL"); static const struct ath10k_hw_params ath10k_hw_params_list[] = { { @@ -85,8 +93,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, @@ -97,6 +104,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, @@ -126,8 +134,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, @@ -168,8 +175,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, @@ -246,8 +252,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, @@ -287,8 +292,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, @@ -328,8 +332,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, @@ -372,8 +375,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, @@ -420,8 +422,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, @@ -473,8 +474,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, @@ -524,8 +526,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, @@ -565,8 +568,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, @@ -608,8 +610,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, @@ -690,8 +691,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, @@ -1270,6 +1270,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", @@ -1283,6 +1284,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 */ @@ -1484,6 +1490,7 @@ const char *boardname, const char *fallback_boardname1, const char *fallback_boardname2, + const char *pci_boardname, const char *filename) { size_t len, magic_len; @@ -1528,7 +1535,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 */ @@ -1540,8 +1551,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; } @@ -1557,7 +1568,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 }; @@ -1566,7 +1578,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), @@ -1575,7 +1587,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", @@ -1620,14 +1632,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; @@ -1636,7 +1649,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); @@ -1646,12 +1659,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)); @@ -1665,6 +1686,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; @@ -2558,6 +2580,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.13.12/drivers/net/wireless/ath/ath10k/core.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/core.h --- linux-6.13.12/drivers/net/wireless/ath/ath10k/core.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/core.h 2025-09-29 14:23:07.585732311 +0200 @@ -37,7 +37,7 @@ #define ATH10K_SCAN_ID 0 #define ATH10K_SCAN_CHANNEL_SWITCH_WMI_EVT_OVERHEAD 10 /* msec */ #define WMI_READY_TIMEOUT (5 * HZ) -#define ATH10K_FLUSH_TIMEOUT_HZ (5 * HZ) +#define ATH10K_FLUSH_TIMEOUT_HZ (HZ / 2) #define ATH10K_CONNECTION_LOSS_HZ (3 * HZ) #define ATH10K_NUM_CHANS 41 #define ATH10K_MAX_5G_CHAN 173 @@ -558,6 +558,8 @@ u8 rate_ctrl[ATH10K_TID_MAX]; u32 rate_code[ATH10K_TID_MAX]; int rtscts[ATH10K_TID_MAX]; + wait_queue_head_t empty_tx_wq; + atomic_t num_fw_queued; }; #define ATH10K_VDEV_SETUP_TIMEOUT_HZ (5 * HZ) @@ -700,10 +702,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. @@ -1020,6 +1024,7 @@ void *vaddr; } msa; u8 mac_addr[ETH_ALEN]; + const char *fem_name; enum ath10k_hw_rev hw_rev; u16 dev_id; @@ -1210,6 +1215,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 @@ -1330,6 +1337,8 @@ extern unsigned int ath10k_frame_mode; extern unsigned long ath10k_coredump_mask; +extern bool ath10k_no_fetch; +extern bool ath10k_offload_use_drv_tx; void ath10k_core_napi_sync_disable(struct ath10k *ar); void ath10k_core_napi_enable(struct ath10k *ar); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath10k/debug.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/debug.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/debug.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/debug.c 2025-09-25 17:40:34.103359967 +0200 @@ -2495,6 +2495,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); @@ -2582,6 +2655,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.13.12/drivers/net/wireless/ath/ath10k/debug.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/debug.h --- linux-6.13.12/drivers/net/wireless/ath/ath10k/debug.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/debug.h 2025-09-25 17:40:34.103359967 +0200 @@ -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.13.12/drivers/net/wireless/ath/ath10k/htt.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/htt.h --- linux-6.13.12/drivers/net/wireless/ath/ath10k/htt.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/htt.h 2025-09-25 17:40:34.103359967 +0200 @@ -1870,6 +1870,7 @@ spinlock_t tx_lock; int max_num_pending_tx; int num_pending_tx; + int num_pending_per_queue[IEEE80211_MAX_QUEUES]; int num_pending_mgmt_tx; struct idr pending_tx; wait_queue_head_t empty_tx_wq; @@ -2447,11 +2448,17 @@ void ath10k_htt_tx_txq_recalc(struct ieee80211_hw *hw, struct ieee80211_txq *txq); void ath10k_htt_tx_txq_sync(struct ath10k *ar); -void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt); -int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt); +void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt, + struct ieee80211_txq *txq); +int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt, + struct ieee80211_txq *txq); void ath10k_htt_tx_mgmt_dec_pending(struct ath10k_htt *htt); int ath10k_htt_tx_mgmt_inc_pending(struct ath10k_htt *htt, bool is_mgmt, bool is_presp); +void ath10k_htt_tx_sta_inc_pending(struct ath10k_htt *htt, + struct ieee80211_sta *sta); +void ath10k_htt_tx_sta_dec_pending(struct ath10k_htt *htt, + struct ieee80211_sta *sta); int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb); void ath10k_htt_tx_free_msdu_id(struct ath10k_htt *htt, u16 msdu_id); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath10k/htt_tx.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/htt_tx.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/htt_tx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/htt_tx.c 2025-09-25 17:40:34.103359967 +0200 @@ -140,19 +140,26 @@ spin_unlock_bh(&ar->htt.tx_lock); } -void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt) +void ath10k_htt_tx_dec_pending(struct ath10k_htt *htt, + struct ieee80211_txq *txq) { + int qnr = -1; + lockdep_assert_held(&htt->tx_lock); htt->num_pending_tx--; if (htt->num_pending_tx == htt->max_num_pending_tx - 1) ath10k_mac_tx_unlock(htt->ar, ATH10K_TX_PAUSE_Q_FULL); - if (htt->num_pending_tx == 0) + if (txq) + qnr = --htt->num_pending_per_queue[txq->vif->hw_queue[txq->ac]]; + + if (htt->num_pending_tx == 0 || qnr == 0) wake_up(&htt->empty_tx_wq); } -int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt) +int ath10k_htt_tx_inc_pending(struct ath10k_htt *htt, + struct ieee80211_txq *txq) { lockdep_assert_held(&htt->tx_lock); @@ -163,6 +170,11 @@ if (htt->num_pending_tx == htt->max_num_pending_tx) ath10k_mac_tx_lock(htt->ar, ATH10K_TX_PAUSE_Q_FULL); + if (!txq) + return 0; + + htt->num_pending_per_queue[txq->vif->hw_queue[txq->ac]]++; + return 0; } @@ -195,6 +207,37 @@ htt->num_pending_mgmt_tx--; } +void ath10k_htt_tx_sta_inc_pending(struct ath10k_htt *htt, + struct ieee80211_sta *sta) +{ + struct ath10k_sta *arsta; + + if (!sta) + return; + + arsta = (struct ath10k_sta *)sta->drv_priv; + + atomic_inc(&arsta->num_fw_queued); +} + +void ath10k_htt_tx_sta_dec_pending(struct ath10k_htt *htt, + struct ieee80211_sta *sta) +{ + struct ath10k_sta *arsta; + int v; + + if (!sta) + return; + + arsta = (struct ath10k_sta *)sta->drv_priv; + + v = atomic_dec_if_positive(&arsta->num_fw_queued); + if (v < 0) + WARN_ON_ONCE(1); + if (v == 0) + wake_up(&arsta->empty_tx_wq); +} + int ath10k_htt_tx_alloc_msdu_id(struct ath10k_htt *htt, struct sk_buff *skb) { struct ath10k *ar = htt->ar; @@ -1403,6 +1446,7 @@ u32 txbuf_paddr; struct htt_msdu_ext_desc *ext_desc = NULL; struct htt_msdu_ext_desc *ext_desc_t = NULL; + int map_len; res = ath10k_htt_tx_alloc_msdu_id(htt, msdu); if (res < 0) @@ -1432,7 +1476,13 @@ } } - skb_cb->paddr = dma_map_single(dev, msdu->data, msdu->len, +#if defined(CONFIG_IP_FFN) + map_len = skb_ffn_get_dirty_len(msdu); +#else + map_len = msdu->len; +#endif + + skb_cb->paddr = dma_map_single(dev, msdu->data, map_len, DMA_TO_DEVICE); res = dma_mapping_error(dev, skb_cb->paddr); if (res) { @@ -1440,6 +1490,12 @@ goto err_free_msdu_id; } +#if defined(CONFIG_IP_FFN) + /* mark it so page pool recycler will remember this */ + if (msdu->ffn_ff_done) + msdu->ffn_ff_done |= BIT(1); +#endif + if (unlikely(info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)) freq = ar->scan.roc_freq; @@ -1576,7 +1632,7 @@ return 0; err_unmap_msdu: - dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE); + dma_unmap_single(dev, skb_cb->paddr, map_len, DMA_TO_DEVICE); err_free_msdu_id: spin_lock_bh(&htt->tx_lock); ath10k_htt_tx_free_msdu_id(htt, msdu_id); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath10k/hw.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/hw.h --- linux-6.13.12/drivers/net/wireless/ath/ath10k/hw.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/hw.h 2025-09-29 14:23:07.589732331 +0200 @@ -571,11 +571,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.13.12/drivers/net/wireless/ath/ath10k/mac.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/mac.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/mac.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/mac.c 2025-09-29 14:23:07.589732331 +0200 @@ -3,7 +3,7 @@ * Copyright (c) 2005-2011 Atheros Communications Inc. * Copyright (c) 2011-2017 Qualcomm Atheros, Inc. * Copyright (c) 2018-2019, The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "mac.h" @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include "hif.h" #include "core.h" @@ -216,7 +218,9 @@ int ret; if (test_bit(WMI_SERVICE_TX_MODE_DYNAMIC, ar->wmi.svc_map)) - platform_type = WMI_HOST_PLATFORM_LOW_PERF; + platform_type = (ath10k_no_fetch) ? + WMI_HOST_PLATFORM_LOW_PERF_NO_FETCH : + WMI_HOST_PLATFORM_LOW_PERF; else platform_type = WMI_HOST_PLATFORM_HIGH_PERF; @@ -2519,30 +2523,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, @@ -2550,13 +2530,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; @@ -2599,15 +2582,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 = @@ -2622,20 +2610,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)); @@ -4385,7 +4359,7 @@ u16 airtime; spin_lock_bh(&ar->htt.tx_lock); - ret = ath10k_htt_tx_inc_pending(htt); + ret = ath10k_htt_tx_inc_pending(htt, txq); spin_unlock_bh(&ar->htt.tx_lock); if (ret) @@ -4394,7 +4368,7 @@ skb = ieee80211_tx_dequeue_ni(hw, txq); if (!skb) { spin_lock_bh(&ar->htt.tx_lock); - ath10k_htt_tx_dec_pending(htt); + ath10k_htt_tx_dec_pending(htt, txq); spin_unlock_bh(&ar->htt.tx_lock); return -ENOENT; @@ -4416,22 +4390,25 @@ ret = ath10k_htt_tx_mgmt_inc_pending(htt, is_mgmt, is_presp); if (ret) { - ath10k_htt_tx_dec_pending(htt); + ath10k_htt_tx_dec_pending(htt, txq); spin_unlock_bh(&ar->htt.tx_lock); return ret; } spin_unlock_bh(&ar->htt.tx_lock); } + ath10k_htt_tx_sta_inc_pending(&ar->htt, sta); + ret = ath10k_mac_tx(ar, vif, txmode, txpath, skb, false); if (unlikely(ret)) { ath10k_warn(ar, "failed to push frame: %d\n", ret); spin_lock_bh(&ar->htt.tx_lock); - ath10k_htt_tx_dec_pending(htt); + ath10k_htt_tx_dec_pending(htt, txq); if (is_mgmt) ath10k_htt_tx_mgmt_dec_pending(htt); spin_unlock_bh(&ar->htt.tx_lock); + ath10k_htt_tx_sta_dec_pending(&ar->htt, sta); return ret; } @@ -4690,7 +4667,7 @@ is_presp = ieee80211_is_probe_resp(hdr->frame_control); } - ret = ath10k_htt_tx_inc_pending(htt); + ret = ath10k_htt_tx_inc_pending(htt, txq); if (ret) { ath10k_warn(ar, "failed to increase tx pending count: %d, dropping\n", ret); @@ -4703,7 +4680,7 @@ if (ret) { ath10k_dbg(ar, ATH10K_DBG_MAC, "failed to increase tx mgmt pending count: %d, dropping\n", ret); - ath10k_htt_tx_dec_pending(htt); + ath10k_htt_tx_dec_pending(htt, txq); spin_unlock_bh(&ar->htt.tx_lock); ieee80211_free_txskb(ar->hw, skb); return; @@ -4716,7 +4693,7 @@ ath10k_warn(ar, "failed to transmit frame: %d\n", ret); if (is_htt) { spin_lock_bh(&ar->htt.tx_lock); - ath10k_htt_tx_dec_pending(htt); + ath10k_htt_tx_dec_pending(htt, txq); if (is_mgmt) ath10k_htt_tx_mgmt_dec_pending(htt); spin_unlock_bh(&ar->htt.tx_lock); @@ -4904,14 +4881,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 +5045,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 +5132,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 +5223,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 +5251,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 +5264,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 +5433,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) { @@ -7481,7 +7547,7 @@ arsta->peer_ps_state = WMI_PEER_PS_STATE_DISABLED; INIT_WORK(&arsta->update_wk, ath10k_sta_rc_update_wk); INIT_WORK(&arsta->tid_config_wk, ath10k_sta_tid_cfg_wk); - + init_waitqueue_head(&arsta->empty_tx_wq); for (i = 0; i < ARRAY_SIZE(sta->txq); i++) ath10k_mac_txq_init(sta->txq[i]); } @@ -8018,7 +8084,7 @@ * in ath10k, but device-specific in mac80211. */ -static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, u32 value) +static int ath10k_set_rts_threshold(struct ieee80211_hw *hw, u8 radio_id, u32 value) { struct ath10k *ar = hw->priv; struct ath10k_vif *arvif; @@ -8056,10 +8122,12 @@ return -EOPNOTSUPP; } -void ath10k_mac_wait_tx_complete(struct ath10k *ar) +static void _ath10k_mac_wait_tx_complete(struct ath10k *ar, + unsigned long queues) { bool skip; long time_left; + unsigned int q; /* mac80211 doesn't care if we really xmit queued frames or not * we'll collect those frames either way if we stop/delete vdevs @@ -8072,7 +8140,11 @@ bool empty; spin_lock_bh(&ar->htt.tx_lock); - empty = (ar->htt.num_pending_tx == 0); + for_each_set_bit(q, &queues, ar->hw->queues) { + empty = (ar->htt.num_pending_per_queue[q] == 0); + if (!empty) + break; + } spin_unlock_bh(&ar->htt.tx_lock); skip = (ar->state == ATH10K_STATE_WEDGED) || @@ -8087,6 +8159,13 @@ skip, ar->state, time_left); } +void ath10k_mac_wait_tx_complete(struct ath10k *ar) +{ + unsigned int queues = GENMASK(ar->hw->queues - 1, 0); + + _ath10k_mac_wait_tx_complete(ar, queues); +} + static void ath10k_flush(struct ieee80211_hw *hw, struct ieee80211_vif *vif, u32 queues, bool drop) { @@ -8108,7 +8187,41 @@ } mutex_lock(&ar->conf_mutex); - ath10k_mac_wait_tx_complete(ar); + _ath10k_mac_wait_tx_complete(ar, queues); + mutex_unlock(&ar->conf_mutex); +} + +static void ath10k_flush_sta(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + struct ieee80211_sta *sta) +{ + struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv; + struct ath10k *ar = hw->priv; + bool skip; + long time_left; + + /* TODO do we need drop implemented here ? */ + + mutex_lock(&ar->conf_mutex); + + if (ar->state == ATH10K_STATE_WEDGED) + goto out; + + time_left = wait_event_timeout(arsta->empty_tx_wq, ({ + bool empty; + + empty = atomic_read(&arsta->num_fw_queued) == 0; + + skip = (ar->state == ATH10K_STATE_WEDGED) || + test_bit(ATH10K_FLAG_CRASH_FLUSH, + &ar->dev_flags); + + (empty || skip); + }), ATH10K_FLUSH_TIMEOUT_HZ); + + if (time_left == 0 || skip) + ath10k_warn(ar, "failed to flush sta txq (sta %pM skip %i ar-state %i): %ld\n", + sta->addr, skip, ar->state, time_left); +out: mutex_unlock(&ar->conf_mutex); } @@ -9438,6 +9551,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, @@ -9459,6 +9574,7 @@ .set_rts_threshold = ath10k_set_rts_threshold, .set_frag_threshold = ath10k_mac_op_set_frag_threshold, .flush = ath10k_flush, + .flush_sta = ath10k_flush_sta, .tx_last_beacon = ath10k_tx_last_beacon, .set_antenna = ath10k_set_antenna, .get_antenna = ath10k_get_antenna, @@ -9652,6 +9768,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 }, @@ -9835,6 +9952,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; @@ -9959,7 +10078,9 @@ WLAN_CIPHER_SUITE_CCMP_256, }; struct ieee80211_supported_band *band; + const struct firmware *firmware; void *channels; + u32 crc = 0; int ret; if (!is_valid_ether_addr(ar->mac_addr)) { @@ -10048,15 +10169,20 @@ 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); + if (ath10k_offload_use_drv_tx) + ieee80211_hw_set(ar->hw, ALLOW_DRV_TX_FOR_DATA); + ar->hw->wiphy->features |= NL80211_FEATURE_STATIC_SMPS; ar->hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN; @@ -10249,6 +10375,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); @@ -10296,6 +10424,18 @@ ar->hw->weight_multiplier = ATH10K_AIRTIME_WEIGHT_MULTIPLIER; + INIT_WORK(&ar->powerup_work, ath10k_powerup_work); + ar->powerup_pending = false; + + firmware = ar->normal_mode_fw.fw_file.firmware; + if (firmware) + crc = crc32_le(0, firmware->data, firmware->size); + snprintf(ar->hw->wiphy->fw_version, + sizeof(ar->hw->wiphy->fw_version), + "%s, 0x%x", + ar->hw_params.name, + crc); + ret = ieee80211_register_hw(ar->hw); if (ret) { ath10k_err(ar, "failed to register ieee80211: %d\n", ret); @@ -10307,6 +10447,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, @@ -10314,10 +10455,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: @@ -10335,6 +10479,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.13.12/drivers/net/wireless/ath/ath10k/pci.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/pci.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/pci.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/pci.c 2025-09-25 17:40:34.107359986 +0200 @@ -10,6 +10,7 @@ #include #include #include +#include #include "core.h" #include "debug.h" @@ -31,6 +32,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)"); @@ -38,6 +40,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 @@ -715,7 +720,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; @@ -1320,12 +1326,20 @@ struct sk_buff *skb; while (ath10k_ce_completed_send_next(ce_state, (void **)&skb) == 0) { + int map_len; + /* no need to call tx completion for NULL pointers */ if (!skb) continue; +#if defined(CONFIG_IP_FFN) + map_len = skb_ffn_get_dirty_len(skb); +#else + map_len = skb->len; +#endif + dma_unmap_single(ar->dev, ATH10K_SKB_CB(skb)->paddr, - skb->len, DMA_TO_DEVICE); + map_len, DMA_TO_DEVICE); ath10k_htt_hif_tx_complete(ar, skb); } } @@ -2657,12 +2671,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); @@ -3526,7 +3534,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; @@ -3567,21 +3575,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; @@ -3620,6 +3628,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; @@ -3778,6 +3787,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.13.12/drivers/net/wireless/ath/ath10k/thermal.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/thermal.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/thermal.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/thermal.c 2025-09-25 17:40:34.111360006 +0200 @@ -161,7 +161,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.13.12/drivers/net/wireless/ath/ath10k/thermal.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/thermal.h --- linux-6.13.12/drivers/net/wireless/ath/ath10k/thermal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/thermal.h 2025-09-25 17:40:34.111360006 +0200 @@ -9,7 +9,7 @@ #define ATH10K_QUIET_PERIOD_MIN 25 #define ATH10K_QUIET_START_OFFSET 10 #define ATH10K_HWMON_NAME_LEN 15 -#define ATH10K_THERMAL_SYNC_TIMEOUT_HZ (5 * HZ) +#define ATH10K_THERMAL_SYNC_TIMEOUT_HZ (HZ/10) #define ATH10K_THERMAL_THROTTLE_MAX 100 struct ath10k_thermal { diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath10k/txrx.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/txrx.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/txrx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/txrx.c 2025-09-25 17:40:34.111360006 +0200 @@ -82,13 +82,16 @@ flags = skb_cb->flags; ath10k_htt_tx_free_msdu_id(htt, tx_done->msdu_id); - ath10k_htt_tx_dec_pending(htt); + ath10k_htt_tx_dec_pending(htt, txq); spin_unlock_bh(&htt->tx_lock); rcu_read_lock(); - if (txq && txq->sta && skb_cb->airtime_est) + if (txq && txq->sta) { + if (skb_cb->airtime_est) ieee80211_sta_register_airtime(txq->sta, txq->tid, skb_cb->airtime_est, 0); + ath10k_htt_tx_sta_dec_pending(htt, txq->sta); + } rcu_read_unlock(); if (ar->bus_param.dev_type != ATH10K_DEV_TYPE_HL) diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath10k/wmi.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/wmi.c --- linux-6.13.12/drivers/net/wireless/ath/ath10k/wmi.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/wmi.c 2025-09-29 14:23:07.593732350 +0200 @@ -964,7 +964,7 @@ .txbf = WMI_VDEV_PARAM_UNSUPPORTED, .packet_powersave = WMI_VDEV_PARAM_UNSUPPORTED, .drop_unencry = WMI_VDEV_PARAM_UNSUPPORTED, - .tx_encap_type = WMI_VDEV_PARAM_UNSUPPORTED, + .tx_encap_type = WMI_10X_VDEV_PARAM_TX_ENCAP_TYPE, .ap_detect_out_of_sync_sleeping_sta_time_secs = WMI_10X_VDEV_PARAM_AP_DETECT_OUT_OF_SYNC_SLEEPING_STA_TIME_SECS, .rc_num_retries = WMI_VDEV_PARAM_UNSUPPORTED, @@ -5837,12 +5837,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.13.12/drivers/net/wireless/ath/ath10k/wmi.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/wmi.h --- linux-6.13.12/drivers/net/wireless/ath/ath10k/wmi.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath10k/wmi.h 2025-09-29 14:23:07.593732350 +0200 @@ -7389,6 +7389,7 @@ enum wmi_host_platform_type { WMI_HOST_PLATFORM_HIGH_PERF, WMI_HOST_PLATFORM_LOW_PERF, + WMI_HOST_PLATFORM_LOW_PERF_NO_FETCH, }; enum wmi_bss_survey_req_type { diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/Kconfig linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/Kconfig --- linux-6.13.12/drivers/net/wireless/ath/ath11k/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/Kconfig 2025-09-29 14:23:07.593732350 +0200 @@ -58,3 +58,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.13.12/drivers/net/wireless/ath/ath11k/core.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/core.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/core.c 2025-09-25 17:40:34.119360046 +0200 @@ -34,9 +34,14 @@ "Datapath frame mode (0: raw, 1: native wifi (default), 2: ethernet)"); bool ath11k_ftm_mode; -module_param_named(ftm_mode, ath11k_ftm_mode, bool, 0444); +module_param_named(ftm_mode, ath11k_ftm_mode, bool, 0644); MODULE_PARM_DESC(ftm_mode, "Boots up in factory test mode"); +static char *ath11k_board_variant; +module_param_named(board_variant, ath11k_board_variant, charp, 0644); +MODULE_PARM_DESC(board_variant, "board variant to use for bdf lookup"); + + static const struct ath11k_hw_params ath11k_hw_params[] = { { .hw_rev = ATH11K_HW_IPQ8074, @@ -56,7 +61,7 @@ .host_ce_config = ath11k_host_ce_config_ipq8074, .ce_count = 12, .target_ce_config = ath11k_target_ce_config_wlan_ipq8074, - .target_ce_count = 11, + .target_ce_count = 12, .svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq8074, .svc_to_ce_map_len = 21, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, @@ -94,6 +99,7 @@ .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, + .supports_ap_vlan = true, .hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074), .supports_regdb = false, .fix_l1ss = true, @@ -123,6 +129,8 @@ .tx_ring_size = DP_TCL_DATA_RING_SIZE, .smp2p_wow_exit = false, .support_dual_stations = false, + .ce_fwlog_enable = false, + .pdev_suspend = false, }, { .hw_rev = ATH11K_HW_IPQ6018_HW10, @@ -142,7 +150,7 @@ .host_ce_config = ath11k_host_ce_config_ipq8074, .ce_count = 12, .target_ce_config = ath11k_target_ce_config_wlan_ipq8074, - .target_ce_count = 11, + .target_ce_count = 12, .svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_ipq6018, .svc_to_ce_map_len = 19, .ce_ie_addr = &ath11k_ce_ie_addr_ipq8074, @@ -177,6 +185,7 @@ .num_vdevs = 16 + 1, .num_peers = 512, .supports_suspend = false, + .supports_ap_vlan = true, .hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074), .supports_regdb = false, .fix_l1ss = true, @@ -207,6 +216,8 @@ .smp2p_wow_exit = false, .support_fw_mac_sequence = false, .support_dual_stations = false, + .ce_fwlog_enable = false, + .pdev_suspend = false, }, { .name = "qca6390 hw2.0", @@ -263,6 +274,7 @@ .num_vdevs = 2 + 1, .num_peers = 512, .supports_suspend = true, + .supports_ap_vlan = false, .hal_desc_sz = sizeof(struct hal_rx_desc_ipq8074), .supports_regdb = false, .fix_l1ss = true, @@ -296,6 +308,8 @@ .smp2p_wow_exit = false, .support_fw_mac_sequence = true, .support_dual_stations = true, + .ce_fwlog_enable = false, + .pdev_suspend = false, }, { .name = "qcn9074 hw1.0", @@ -349,6 +363,7 @@ .num_vdevs = 8, .num_peers = 128, .supports_suspend = false, + .supports_ap_vlan = true, .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), .supports_regdb = false, .fix_l1ss = true, @@ -365,7 +380,7 @@ .bios_sar_capa = NULL, .m3_fw_support = true, .fixed_bdf_addr = false, - .fixed_mem_region = false, + .fixed_mem_region = IS_ENABLED(CONFIG_ATH11K_QCN9074_FIXED_MEM_REGION), .static_window_map = true, .hybrid_bus_type = false, .fixed_fw_mem = false, @@ -379,6 +394,8 @@ .smp2p_wow_exit = false, .support_fw_mac_sequence = false, .support_dual_stations = false, + .ce_fwlog_enable = true, + .pdev_suspend = false, }, { .name = "wcn6855 hw2.0", @@ -435,6 +452,7 @@ .num_vdevs = 2 + 1, .num_peers = 512, .supports_suspend = true, + .supports_ap_vlan = false, .hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855), .supports_regdb = true, .fix_l1ss = false, @@ -468,6 +486,7 @@ .smp2p_wow_exit = false, .support_fw_mac_sequence = true, .support_dual_stations = true, + .pdev_suspend = false, }, { .name = "wcn6855 hw2.1", @@ -522,6 +541,7 @@ .num_vdevs = 2 + 1, .num_peers = 512, .supports_suspend = true, + .supports_ap_vlan = false, .hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855), .supports_regdb = true, .fix_l1ss = false, @@ -555,6 +575,7 @@ .smp2p_wow_exit = false, .support_fw_mac_sequence = true, .support_dual_stations = true, + .pdev_suspend = false, }, { .name = "wcn6750 hw1.0", @@ -607,6 +628,7 @@ .num_vdevs = 3, .num_peers = 512, .supports_suspend = false, + .supports_ap_vlan = false, .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), .supports_regdb = true, .fix_l1ss = false, @@ -637,6 +659,7 @@ .smp2p_wow_exit = true, .support_fw_mac_sequence = true, .support_dual_stations = false, + .pdev_suspend = true, }, { .hw_rev = ATH11K_HW_IPQ5018_HW10, @@ -649,6 +672,7 @@ .max_radios = MAX_RADIOS_5018, .bdf_addr = 0x4BA00000, /* hal_desc_sz and hw ops are similar to qcn9074 */ + .supports_ap_vlan = false, .hal_desc_sz = sizeof(struct hal_rx_desc_qcn9074), .qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_IPQ8074, .ring_mask = &ath11k_hw_ring_mask_ipq8074, @@ -719,6 +743,7 @@ .smp2p_wow_exit = false, .support_fw_mac_sequence = false, .support_dual_stations = false, + .pdev_suspend = false, }, { .name = "qca2066 hw2.1", @@ -809,6 +834,94 @@ .support_fw_mac_sequence = true, .support_dual_stations = true, }, + { + .name = "qca6698aq hw2.1", + .hw_rev = ATH11K_HW_QCA6698AQ_HW21, + .fw = { + .dir = "QCA6698AQ/hw2.1", + .board_size = 256 * 1024, + .cal_offset = 128 * 1024, + }, + .max_radios = 3, + .bdf_addr = 0x4B0C0000, + .hw_ops = &wcn6855_ops, + .ring_mask = &ath11k_hw_ring_mask_qca6390, + .internal_sleep_clock = true, + .regs = &wcn6855_regs, + .qmi_service_ins_id = ATH11K_QMI_WLFW_SERVICE_INS_ID_V01_QCA6390, + .host_ce_config = ath11k_host_ce_config_qca6390, + .ce_count = 9, + .target_ce_config = ath11k_target_ce_config_wlan_qca6390, + .target_ce_count = 9, + .svc_to_ce_map = ath11k_target_service_to_ce_map_wlan_qca6390, + .svc_to_ce_map_len = 14, + .single_pdev_only = true, + .rxdma1_enable = false, + .num_rxdma_per_pdev = 2, + .rx_mac_buf_ring = true, + .vdev_start_delay = true, + .htt_peer_map_v2 = false, + + .spectral = { + .fft_sz = 0, + .fft_pad_sz = 0, + .summary_pad_sz = 0, + .fft_hdr_len = 0, + .max_fft_bins = 0, + .fragment_160mhz = false, + }, + + .interface_modes = BIT(NL80211_IFTYPE_STATION) | + BIT(NL80211_IFTYPE_AP) | + BIT(NL80211_IFTYPE_P2P_DEVICE) | + BIT(NL80211_IFTYPE_P2P_CLIENT) | + BIT(NL80211_IFTYPE_P2P_GO), + .supports_monitor = false, + .supports_shadow_regs = true, + .idle_ps = true, + .supports_sta_ps = true, + .coldboot_cal_mm = false, + .coldboot_cal_ftm = false, + .cbcal_restart_fw = false, + .fw_mem_mode = 0, + .num_vdevs = 2 + 1, + .num_peers = 512, + .supports_suspend = true, + .hal_desc_sz = sizeof(struct hal_rx_desc_wcn6855), + .supports_regdb = true, + .fix_l1ss = false, + .credit_flow = true, + .max_tx_ring = DP_TCL_NUM_RING_MAX_QCA6390, + .hal_params = &ath11k_hw_hal_params_qca6390, + .supports_dynamic_smps_6ghz = false, + .alloc_cacheable_memory = false, + .supports_rssi_stats = true, + .fw_wmi_diag_event = true, + .current_cc_support = true, + .dbr_debug_support = false, + .global_reset = true, + .bios_sar_capa = &ath11k_hw_sar_capa_wcn6855, + .m3_fw_support = true, + .fixed_bdf_addr = false, + .fixed_mem_region = false, + .static_window_map = false, + .hybrid_bus_type = false, + .fixed_fw_mem = false, + .support_off_channel_tx = true, + .supports_multi_bssid = true, + + .sram_dump = { + .start = 0x01400000, + .end = 0x0177ffff, + }, + + .tcl_ring_retry = true, + .tx_ring_size = DP_TCL_DATA_RING_SIZE, + .smp2p_wow_exit = false, + .support_fw_mac_sequence = true, + .support_dual_stations = true, + .pdev_suspend = false, + }, }; static inline struct ath11k_pdev *ath11k_core_get_single_pdev(struct ath11k_base *ab) @@ -1105,7 +1218,10 @@ /* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */ char variant[9 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = { 0 }; - if (with_variant && ab->qmi.target.bdf_ext[0] != '\0') + if (ath11k_board_variant) + scnprintf(variant, sizeof(variant), ",variant=%s", + ath11k_board_variant); + else if (with_variant && ab->qmi.target.bdf_ext[0] != '\0') scnprintf(variant, sizeof(variant), ",variant=%s", ab->qmi.target.bdf_ext); @@ -1669,11 +1785,47 @@ return ret; } +static void ath11k_core_pdev_suspend_target(struct ath11k_base *ab) +{ + struct ath11k *ar; + struct ath11k_pdev *pdev; + unsigned long time_left; + int ret; + int i; + + if (!ab->hw_params.pdev_suspend) + return; + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + ar = pdev->ar; + + reinit_completion(&ab->htc_suspend); + + ret = ath11k_wmi_pdev_suspend(ar, WMI_PDEV_SUSPEND_AND_DISABLE_INTR, + pdev->pdev_id); + if (ret) { + ath11k_warn(ab, "could not suspend target :%d\n", ret); + /* pointless to try other pdevs */ + return; + } + + time_left = wait_for_completion_timeout(&ab->htc_suspend, 3 * HZ); + + if (!time_left) { + ath11k_warn(ab, "suspend timed out - target pause event never came\n"); + /* pointless to try other pdevs */ + return; + } + } +} + static void ath11k_core_pdev_destroy(struct ath11k_base *ab) { ath11k_spectral_deinit(ab); ath11k_thermal_unregister(ab); ath11k_mac_unregister(ab); + ath11k_core_pdev_suspend_target(ab); ath11k_hif_irq_disable(ab); ath11k_dp_pdev_free(ab); ath11k_debugfs_pdev_destroy(ab); @@ -1807,6 +1959,10 @@ return ret; } +unsigned int ce_fwlog = 1; +module_param_named(ce_fwlog, ce_fwlog, uint, 0644); +MODULE_PARM_DESC(ce_fwlog, "Enable/Disable CE based FW logging"); + int ath11k_core_qmi_firmware_ready(struct ath11k_base *ab) { int ret; @@ -1859,6 +2015,15 @@ goto err_core_stop; } ath11k_hif_irq_enable(ab); + + if (ab->hw_params.ce_fwlog_enable && ce_fwlog) { + ret = ath11k_enable_fwlog(ab); + if (ret < 0) { + ath11k_err(ab, "failed to enable fwlog: %d\n", ret); + goto err_core_stop; + } + } + mutex_unlock(&ab->core_lock); return 0; @@ -1924,6 +2089,7 @@ ath11k_mac_scan_finish(ar); ath11k_mac_peer_cleanup_all(ar); cancel_delayed_work_sync(&ar->scan.timeout); + cancel_work_sync(&ar->channel_update_work); cancel_work_sync(&ar->regd_update_work); cancel_work_sync(&ab->update_11d_work); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/core.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/core.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/core.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/core.h 2025-09-29 14:23:07.593732350 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_CORE_H @@ -148,6 +148,7 @@ ATH11K_HW_WCN6750_HW10, ATH11K_HW_IPQ5018_HW10, ATH11K_HW_QCA2066_HW21, + ATH11K_HW_QCA6698AQ_HW21, }; enum ath11k_firmware_mode { @@ -168,6 +169,7 @@ struct ath11k_ext_irq_grp { struct ath11k_base *ab; + char *name; u32 irqs[ATH11K_EXT_IRQ_NUM_MAX]; u32 num_irq; u32 grp_id; @@ -340,7 +342,6 @@ * @ap_power_type: 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 firmware */ @@ -350,7 +351,6 @@ enum wmi_reg_6ghz_ap_type ap_power_type; u8 num_pwr_levels; u8 reg_max[ATH11K_NUM_PWR_LEVELS]; - u8 ap_constraint_power; s8 tpe[ATH11K_NUM_PWR_LEVELS]; struct ath11k_chan_power_info chan_power_info[ATH11K_NUM_PWR_LEVELS]; }; @@ -370,8 +370,8 @@ struct ath11k *ar; struct ieee80211_vif *vif; - u16 tx_seq_no; struct wmi_wmm_params_all_arg wmm_params; + struct wmi_wmm_params_all_arg muedca_params; struct list_head list; union { struct { @@ -551,6 +551,9 @@ struct ath11k_htt_tx_stats *tx_stats; struct ath11k_rx_peer_stats *rx_stats; + atomic_t num_tx_pending; + wait_queue_head_t tx_empty_waitq; + #ifdef CONFIG_MAC80211_DEBUGFS /* protected by conf_mutex */ bool aggr_mode; @@ -624,6 +627,7 @@ u32 mem_offset; u32 module_id_bitmap[MAX_MODULE_ID_BITMAP_WORDS]; struct ath11k_debug_dbr *dbr_debug[WMI_DIRECT_BUF_MAX]; + u32 mem_addr; }; struct ath11k_per_peer_tx_stats { @@ -645,6 +649,7 @@ struct ath11k_base *ab; struct ath11k_pdev *pdev; struct ieee80211_hw *hw; + struct ieee80211_ops *ops; struct ath11k_pdev_wmi *wmi; struct ath11k_pdev_dp dp; u8 mac_addr[ETH_ALEN]; @@ -687,7 +692,7 @@ struct mutex conf_mutex; /* protects the radio specific data like debug stats, ppdu_stats_info stats, * vdev_stop_status info, scan data, ath11k_sta info, ath11k_vif info, - * channel context data, survey info, test mode data. + * channel context data, survey info, test mode data, channel_update_queue. */ spinlock_t data_lock; @@ -745,6 +750,9 @@ struct completion bss_survey_done; struct work_struct regd_update_work; + struct work_struct channel_update_work; + /* protected with data_lock */ + struct list_head channel_update_queue; struct work_struct wmi_mgmt_tx_work; struct sk_buff_head wmi_mgmt_tx_queue; @@ -951,6 +959,7 @@ wait_queue_head_t peer_mapping_wq; u8 mac_addr[ETH_ALEN]; int irq_num[ATH11K_IRQ_NUM_MAX]; + char *irq_name[ATH11K_IRQ_NUM_MAX]; struct ath11k_ext_irq_grp ext_irq_grp[ATH11K_EXT_IRQ_GRP_NUM_MAX]; struct ath11k_targ_cap target_caps; u32 ext_service_bitmap[WMI_SERVICE_EXT_BM_SIZE]; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dbring.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dbring.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dbring.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dbring.c 2025-09-25 17:40:34.119360046 +0200 @@ -81,6 +81,8 @@ buff->paddr = paddr; + dma_sync_single_for_device(ab->dev, paddr, ring->buf_sz, DMA_FROM_DEVICE); + cookie = FIELD_PREP(DP_RXDMA_BUF_COOKIE_PDEV_ID, ar->pdev_idx) | FIELD_PREP(DP_RXDMA_BUF_COOKIE_BUF_ID, buf_id); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/debugfs.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/debugfs.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/debugfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/debugfs.c 2025-09-25 17:40:34.119360046 +0200 @@ -16,6 +16,7 @@ #include "debugfs_htt_stats.h" #include "peer.h" #include "hif.h" +#include "qmi.h" static const char *htt_bp_umac_ring[HTT_SW_UMAC_RING_IDX_MAX] = { "REO2SW1_RING", @@ -178,7 +179,7 @@ * received 'update stats' event, we keep a 3 seconds timeout in case, * fw_stats_done is not marked yet */ - timeout = jiffies + msecs_to_jiffies(3 * 1000); + timeout = jiffies + secs_to_jiffies(3); ath11k_debugfs_fw_stats_reset(ar); @@ -557,6 +558,104 @@ .llseek = default_llseek, }; + +static ssize_t ath11k_athdiag_read(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar = file->private_data; + u8 *buf; + int ret; + + if (*ppos <= 0) + return -EINVAL; + + if (!count) + return 0; + + mutex_lock(&ar->conf_mutex); + + buf = vmalloc(count); + if (!buf) { + ret = -ENOMEM; + goto exit; + } + + ret = ath11k_qmi_mem_read(ar->ab, *ppos, buf, count); + if (ret < 0) { + ath11k_warn(ar->ab, "failed to read address 0x%08x via diagnose window from debugfs: %d\n", + (u32)(*ppos), ret); + goto exit; + } + + ret = copy_to_user(user_buf, buf, count); + if (ret) { + ret = -EFAULT; + goto exit; + } + + count -= ret; + *ppos += count; + ret = count; +exit: + vfree(buf); + mutex_unlock(&ar->conf_mutex); + + return ret; +} + +static ssize_t ath11k_athdiag_write(struct file *file, + const char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct ath11k *ar = file->private_data; + u8 *buf; + int ret; + + if (*ppos <= 0) + return -EINVAL; + + if (!count) + return 0; + + mutex_lock(&ar->conf_mutex); + + buf = vmalloc(count); + if (!buf) { + ret = -ENOMEM; + goto exit; + } + + ret = copy_from_user(buf, user_buf, count); + if (ret) { + ret = -EFAULT; + goto exit; + } + + ret = ath11k_qmi_mem_write(ar->ab, *ppos, buf, count); + if (ret < 0) { + ath11k_warn(ar->ab, "failed to write address 0x%08x via diagnose window from debugfs: %d\n", + (u32)(*ppos), ret); + goto exit; + } + + *ppos += count; + ret = count; + +exit: + vfree(buf); + mutex_unlock(&ar->conf_mutex); + return ret; +} + +static const struct file_operations fops_athdiag = { + .read = ath11k_athdiag_read, + .write = ath11k_athdiag_write, + .open = simple_open, + .owner = THIS_MODULE, + .llseek = default_llseek, +}; + static ssize_t ath11k_write_enable_extd_tx_stats(struct file *file, const char __user *ubuf, size_t count, loff_t *ppos) @@ -1649,6 +1748,10 @@ &fops_reset_ps_duration); } + debugfs_create_file("athdiag", S_IRUSR | S_IWUSR, + ar->debug.debugfs_pdev, ar, + &fops_athdiag); + return 0; } diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dp.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp.c 2025-09-25 17:40:34.119360046 +0200 @@ -282,8 +282,18 @@ case HAL_RXDMA_MONITOR_STATUS: 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; + /* In case of PCI chipsets, we dont have PPDU end interrupts, + * so MONITOR STATUS ring is reaped by receiving MSI from srng. + * Keep batch threshold as 8 so that an interrupt is received for + * every 4 frames in MONITOR_STATUS ring. + */ + if ((type == HAL_RXDMA_MONITOR_STATUS) && + (params.flags & HAL_SRNG_FLAGS_MSI_INTR)) + params.intr_batch_cntr_thres_entries = 4; + else + params.intr_batch_cntr_thres_entries = 0; + break; case HAL_WBM2SW_RELEASE: if (ring_num < 3) { diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dp.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp.h 2025-09-25 17:40:34.123360066 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2023, 2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_DP_H @@ -20,7 +20,6 @@ struct dp_rx_tid { u8 tid; - u32 *vaddr; dma_addr_t paddr; u32 size; u32 ba_win_sz; @@ -37,6 +36,9 @@ /* Timer info related to fragments */ struct timer_list frag_timer; struct ath11k_base *ab; + u32 *vaddr_unaligned; + dma_addr_t paddr_unaligned; + u32 unaligned_size; }; #define DP_REO_DESC_FREE_THRESHOLD 64 @@ -165,7 +167,6 @@ struct ath11k_pdev_mon_stats rx_mon_stats; /* lock for monitor data */ spinlock_t mon_lock; - struct sk_buff_head rx_status_q; }; struct ath11k_pdev_dp { @@ -205,7 +206,6 @@ #define DP_WBM_RELEASE_RING_SIZE 64 #define DP_TCL_DATA_RING_SIZE 512 #define DP_TCL_DATA_RING_SIZE_WCN6750 2048 -#define DP_TX_COMP_RING_SIZE 32768 #define DP_TX_IDR_SIZE DP_TX_COMP_RING_SIZE #define DP_TCL_CMD_RING_SIZE 32 #define DP_TCL_STATUS_RING_SIZE 32 @@ -219,13 +219,22 @@ #define DP_RXDMA_BUF_RING_SIZE 4096 #define DP_RXDMA_REFILL_RING_SIZE 2048 #define DP_RXDMA_ERR_DST_RING_SIZE 1024 -#define DP_RXDMA_MON_STATUS_RING_SIZE 1024 -#define DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 -#define DP_RXDMA_MONITOR_DST_RING_SIZE 2048 #define DP_RXDMA_MONITOR_DESC_RING_SIZE 4096 #define DP_RX_RELEASE_RING_NUM 3 +#ifdef CONFIG_ATH11K_SMALL_DP_RINGS +# define DP_TX_COMP_RING_SIZE 8192 +# define DP_RXDMA_MON_STATUS_RING_SIZE 512 +# define DP_RXDMA_MONITOR_BUF_RING_SIZE 128 +# define DP_RXDMA_MONITOR_DST_RING_SIZE 128 +#else +# define DP_TX_COMP_RING_SIZE 32768 +# define DP_RXDMA_MON_STATUS_RING_SIZE 1024 +# define DP_RXDMA_MONITOR_BUF_RING_SIZE 4096 +# define DP_RXDMA_MONITOR_DST_RING_SIZE 2048 +#endif + #define DP_RX_BUFFER_SIZE 2048 #define DP_RX_BUFFER_SIZE_LITE 1024 #define DP_RX_BUFFER_ALIGN_SIZE 128 diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_rx.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_rx.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_rx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_rx.c 2025-09-29 14:23:07.597732370 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -675,11 +675,11 @@ 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; + if (rx_tid->vaddr_unaligned) { + dma_free_noncoherent(ab->dev, rx_tid->unaligned_size, + rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; } kfree(cmd); } @@ -689,11 +689,11 @@ 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; + if (rx_tid->vaddr_unaligned) { + dma_free_noncoherent(ab->dev, rx_tid->unaligned_size, + rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; } kfree(cmd_cache); } @@ -708,11 +708,11 @@ if (status != HAL_REO_CMD_SUCCESS) ath11k_warn(dp->ab, "failed to flush rx tid hw desc, tid %d status %d\n", rx_tid->tid, status); - 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; + if (rx_tid->vaddr_unaligned) { + dma_free_noncoherent(dp->ab->dev, rx_tid->unaligned_size, + rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; } } @@ -749,10 +749,10 @@ if (ret) { ath11k_err(ab, "failed to send HAL_REO_CMD_FLUSH_CACHE cmd, tid %d (%d)\n", rx_tid->tid, ret); - dma_unmap_single(ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; + dma_free_noncoherent(ab->dev, rx_tid->unaligned_size, + rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; } } @@ -784,6 +784,7 @@ dp->reo_cmd_cache_flush_count++; /* Flush and invalidate aged REO desc from HW cache */ +retry: list_for_each_entry_safe(elem, tmp, &dp->reo_cmd_cache_flush_list, list) { if (dp->reo_cmd_cache_flush_count > DP_REO_DESC_FREE_THRESHOLD || @@ -796,16 +797,17 @@ ath11k_dp_reo_cache_flush(ab, &elem->data); kfree(elem); spin_lock_bh(&dp->reo_cmd_lock); + goto retry; } } spin_unlock_bh(&dp->reo_cmd_lock); return; free_desc: - dma_unmap_single(ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; + dma_free_noncoherent(ab->dev, rx_tid->unaligned_size, + rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; } void ath11k_peer_rx_tid_delete(struct ath11k *ar, @@ -831,14 +833,16 @@ if (ret != -ESHUTDOWN) ath11k_err(ar->ab, "failed to send HAL_REO_CMD_UPDATE_RX_QUEUE cmd, tid %d (%d)\n", tid, ret); - dma_unmap_single(ar->ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; + dma_free_noncoherent(ar->ab->dev, rx_tid->unaligned_size, + rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; } rx_tid->paddr = 0; + rx_tid->paddr_unaligned = 0; rx_tid->size = 0; + rx_tid->unaligned_size = 0; } static int ath11k_dp_rx_link_desc_return(struct ath11k_base *ab, @@ -982,10 +986,9 @@ if (!rx_tid->active) goto unlock_exit; - dma_unmap_single(ab->dev, rx_tid->paddr, rx_tid->size, - DMA_BIDIRECTIONAL); - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; + dma_free_noncoherent(ab->dev, rx_tid->unaligned_size, rx_tid->vaddr_unaligned, + rx_tid->paddr_unaligned, DMA_BIDIRECTIONAL); + rx_tid->vaddr_unaligned = NULL; rx_tid->active = false; @@ -1000,9 +1003,8 @@ struct ath11k_base *ab = ar->ab; struct ath11k_peer *peer; struct dp_rx_tid *rx_tid; - u32 hw_desc_sz; - u32 *addr_aligned; - void *vaddr; + u32 hw_desc_sz, *vaddr; + void *vaddr_unaligned; dma_addr_t paddr; int ret; @@ -1050,37 +1052,34 @@ else hw_desc_sz = ath11k_hal_reo_qdesc_size(DP_BA_WIN_SZ_MAX, tid); - vaddr = kzalloc(hw_desc_sz + HAL_LINK_DESC_ALIGN - 1, GFP_ATOMIC); - if (!vaddr) { + rx_tid->unaligned_size = hw_desc_sz + HAL_LINK_DESC_ALIGN - 1; + vaddr_unaligned = dma_alloc_noncoherent(ab->dev, rx_tid->unaligned_size, &paddr, + DMA_BIDIRECTIONAL, GFP_ATOMIC); + if (!vaddr_unaligned) { spin_unlock_bh(&ab->base_lock); return -ENOMEM; } - addr_aligned = PTR_ALIGN(vaddr, HAL_LINK_DESC_ALIGN); - - ath11k_hal_reo_qdesc_setup(addr_aligned, tid, ba_win_sz, - ssn, pn_type); - - paddr = dma_map_single(ab->dev, addr_aligned, hw_desc_sz, - DMA_BIDIRECTIONAL); - - ret = dma_mapping_error(ab->dev, paddr); - if (ret) { - spin_unlock_bh(&ab->base_lock); - ath11k_warn(ab, "failed to setup dma map for peer %pM rx tid %d: %d\n", - peer_mac, tid, ret); - goto err_mem_free; - } - - rx_tid->vaddr = vaddr; - rx_tid->paddr = paddr; + rx_tid->vaddr_unaligned = vaddr_unaligned; + vaddr = PTR_ALIGN(vaddr_unaligned, HAL_LINK_DESC_ALIGN); + rx_tid->paddr_unaligned = paddr; + rx_tid->paddr = rx_tid->paddr_unaligned + ((unsigned long)vaddr - + (unsigned long)rx_tid->vaddr_unaligned); + ath11k_hal_reo_qdesc_setup(vaddr, tid, ba_win_sz, ssn, pn_type); rx_tid->size = hw_desc_sz; rx_tid->active = true; + /* After dma_alloc_noncoherent, vaddr is being modified for reo qdesc setup. + * Since these changes are not reflected in the device, driver now needs to + * explicitly call dma_sync_single_for_device. + */ + dma_sync_single_for_device(ab->dev, rx_tid->paddr, + rx_tid->size, + DMA_TO_DEVICE); spin_unlock_bh(&ab->base_lock); - ret = ath11k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id, peer_mac, - paddr, tid, 1, ba_win_sz); + ret = ath11k_wmi_peer_rx_reorder_queue_setup(ar, vdev_id, peer_mac, rx_tid->paddr, + tid, 1, ba_win_sz); if (ret) { ath11k_warn(ar->ab, "failed to setup rx reorder queue for peer %pM tid %d: %d\n", peer_mac, tid, ret); @@ -1088,12 +1087,6 @@ } return ret; - -err_mem_free: - kfree(rx_tid->vaddr); - rx_tid->vaddr = NULL; - - return ret; } int ath11k_dp_rx_ampdu_start(struct ath11k *ar, @@ -2831,8 +2824,6 @@ rx_stats->dcm_count += ppdu_info->dcm; rx_stats->ru_alloc_cnt[ppdu_info->ru_alloc] += num_msdu; - arsta->rssi_comb = ppdu_info->rssi_comb; - BUILD_BUG_ON(ARRAY_SIZE(arsta->chain_signal) > ARRAY_SIZE(ppdu_info->rssi_chain_pri20)); @@ -4691,8 +4682,9 @@ } } -static u32 -ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id, +/* clang stack usage explodes if this is inlined */ +static noinline_for_stack +u32 ath11k_dp_rx_mon_mpdu_pop(struct ath11k *ar, int mac_id, void *ring_entry, struct sk_buff **head_msdu, struct sk_buff **tail_msdu, u32 *npackets, u32 *ppdu_id) @@ -4782,7 +4774,7 @@ if (!msdu) { ath11k_dbg(ar->ab, ATH11K_DBG_DATA, "msdu_pop: invalid buf_id %d\n", buf_id); - break; + goto next_msdu; } rxcb = ATH11K_SKB_RXCB(msdu); if (!rxcb->unmapped) { @@ -5147,7 +5139,7 @@ struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&dp->mon_data; const struct ath11k_hw_hal_params *hal_params; void *ring_entry; - void *mon_dst_srng; + struct hal_srng *mon_dst_srng; u32 ppdu_id; u32 rx_bufs_used; u32 ring_id; @@ -5164,6 +5156,7 @@ spin_lock_bh(&pmon->mon_lock); + spin_lock_bh(&mon_dst_srng->lock); ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng); ppdu_id = pmon->mon_ppdu_info.ppdu_id; @@ -5222,6 +5215,7 @@ mon_dst_srng); } ath11k_hal_srng_access_end(ar->ab, mon_dst_srng); + spin_unlock_bh(&mon_dst_srng->lock); spin_unlock_bh(&pmon->mon_lock); @@ -5409,7 +5403,7 @@ "full mon msdu_pop: invalid buf_id %d\n", buf_id); spin_unlock_bh(&rx_ring->idr_lock); - break; + goto next_msdu; } idr_remove(&rx_ring->bufs_idr, buf_id); spin_unlock_bh(&rx_ring->idr_lock); @@ -5611,7 +5605,7 @@ struct hal_sw_mon_ring_entries *sw_mon_entries; struct ath11k_pdev_mon_stats *rx_mon_stats; struct sk_buff *head_msdu, *tail_msdu; - void *mon_dst_srng = &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id]; + struct hal_srng *mon_dst_srng; void *ring_entry; u32 rx_bufs_used = 0, mpdu_rx_bufs_used; int quota = 0, ret; @@ -5627,6 +5621,9 @@ goto reap_status_ring; } + mon_dst_srng = &ar->ab->hal.srng_list[dp->rxdma_mon_dst_ring.ring_id]; + spin_lock_bh(&mon_dst_srng->lock); + ath11k_hal_srng_access_begin(ar->ab, mon_dst_srng); while ((ring_entry = ath11k_hal_srng_dst_peek(ar->ab, mon_dst_srng))) { head_msdu = NULL; @@ -5670,6 +5667,7 @@ } ath11k_hal_srng_access_end(ar->ab, mon_dst_srng); + spin_unlock_bh(&mon_dst_srng->lock); spin_unlock_bh(&pmon->mon_lock); if (rx_bufs_used) { @@ -5706,8 +5704,6 @@ struct ath11k_pdev_dp *dp = &ar->dp; struct ath11k_mon_data *pmon = (struct ath11k_mon_data *)&dp->mon_data; - skb_queue_head_init(&pmon->rx_status_q); - pmon->mon_ppdu_status = DP_PPDU_STATUS_START; memset(&pmon->rx_mon_stats, 0, diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_rx.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_rx.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_rx.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_rx.h 2025-09-25 17:40:34.123360066 +0200 @@ -10,7 +10,7 @@ #include "rx_desc.h" #include "debug.h" -#define DP_MAX_NWIFI_HDR_LEN 30 +#define DP_MAX_NWIFI_HDR_LEN 36 #define DP_RX_MPDU_ERR_FCS BIT(0) #define DP_RX_MPDU_ERR_DECRYPT BIT(1) diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_tx.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_tx.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_tx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_tx.c 2025-09-25 17:40:34.123360066 +0200 @@ -79,6 +79,47 @@ } } +#define HTT_META_DATA_ALIGNMENT 0x8 + +static int ath11k_dp_metadata_align_skb(struct sk_buff *skb, u8 align_len) +{ + int ret; + + ret = skb_cow_head(skb, align_len); + if (unlikely(ret)) + return ret; + + skb_push(skb, align_len); + memset(skb->data, 0, align_len); + return 0; +} + +static int ath11k_dp_prepare_htt_metadata(struct sk_buff *skb, + u8 *htt_metadata_size) +{ + u8 htt_desc_size; + /* Size rounded of multiple of 8 bytes */ + u8 htt_desc_size_aligned; + struct htt_tx_msdu_desc_ext *desc_ext; + int ret; + + htt_desc_size = sizeof(*desc_ext); + htt_desc_size_aligned = ALIGN(htt_desc_size, HTT_META_DATA_ALIGNMENT); + + ret = ath11k_dp_metadata_align_skb(skb, htt_desc_size_aligned); + if (unlikely(ret)) + return ret; + + desc_ext = (struct htt_tx_msdu_desc_ext *)skb->data; + desc_ext->info0 = + __cpu_to_le32(FIELD_PREP(HTT_TX_MSDU_DESC_INFO0_VALID_ENCRYPT_TYPE, 1) | + FIELD_PREP(HTT_TX_MSDU_DESC_INFO0_ENCRYPT_TYPE, 0) | + FIELD_PREP(HTT_TX_MSDU_DESC_INFO0_HOST_TX_DESC_POOL, 1)); + *htt_metadata_size = htt_desc_size_aligned; + + return 0; +} + int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, struct ath11k_sta *arsta, struct sk_buff *skb) { @@ -97,9 +138,7 @@ u32 ring_selector = 0; u8 ring_map = 0; bool tcl_ring_retry; - - if (unlikely(test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) - return -ESHUTDOWN; + u8 align_pad, htt_meta_size = 0; if (unlikely(!(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && !ieee80211_is_data(hdr->frame_control))) @@ -208,15 +247,42 @@ goto fail_remove_idr; } + /* Add metadata for sw encrypted vlan group traffic */ + if (!test_bit(ATH11K_FLAG_HW_CRYPTO_DISABLED, &ar->ab->dev_flags) && + !(info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) && + !info->control.hw_key && + ieee80211_has_protected(hdr->frame_control)) { + /* HW requirement is that metadata should always point to a + * 8-byte aligned address. So we add alignment pad to start of + * buffer. HTT Metadata should be ensured to be multiple of 8-bytes + * to get 8-byte aligned start address along with align_pad added + */ + align_pad = ((unsigned long)skb->data) & (HTT_META_DATA_ALIGNMENT - 1); + ret = ath11k_dp_metadata_align_skb(skb, align_pad); + if (unlikely(ret)) + goto fail_remove_idr; + + ti.pkt_offset += align_pad; + ret = ath11k_dp_prepare_htt_metadata(skb, &htt_meta_size); + if (unlikely(ret)) + goto fail_pull_skb; + + ti.pkt_offset += htt_meta_size; + ti.meta_data_flags |= HTT_TCL_META_DATA_VALID_HTT; + ti.flags0 |= FIELD_PREP(HAL_TCL_DATA_CMD_INFO1_TO_FW, 1); + ti.encap_type = HAL_TCL_ENCAP_TYPE_RAW; + ti.encrypt_type = HAL_ENCRYPT_TYPE_OPEN; + } + ti.paddr = dma_map_single(ab->dev, skb->data, skb->len, DMA_TO_DEVICE); if (unlikely(dma_mapping_error(ab->dev, ti.paddr))) { atomic_inc(&ab->soc_stats.tx_err.misc_fail); ath11k_warn(ab, "failed to DMA map data Tx buffer\n"); ret = -ENOMEM; - goto fail_remove_idr; + goto fail_pull_skb; } - ti.data_len = skb->len; + ti.data_len = skb->len - ti.pkt_offset; skb_cb->paddr = ti.paddr; skb_cb->vif = arvif->vif; skb_cb->ar = ar; @@ -265,12 +331,18 @@ skb->data, skb->len); atomic_inc(&ar->dp.num_tx_pending); + if (arsta) + atomic_inc(&arsta->num_tx_pending); return 0; fail_unmap_dma: dma_unmap_single(ab->dev, ti.paddr, ti.data_len, DMA_TO_DEVICE); +fail_pull_skb: + if (ti.pkt_offset) + skb_pull(skb, ti.pkt_offset); + fail_remove_idr: spin_lock_bh(&tx_ring->tx_idr_lock); idr_remove(&tx_ring->txbuf_idr, @@ -322,6 +394,7 @@ struct ath11k_skb_cb *skb_cb; struct ath11k *ar; struct ath11k_peer *peer; + struct ath11k_sta *arsta; spin_lock(&tx_ring->tx_idr_lock); msdu = idr_remove(&tx_ring->txbuf_idr, ts->msdu_id); @@ -381,6 +454,10 @@ status.sta = peer->sta; status.info = info; status.skb = msdu; + arsta = (struct ath11k_sta *) peer->sta->drv_priv; + + if (atomic_dec_and_test(&arsta->num_tx_pending)) + wake_up(&arsta->tx_empty_waitq); ieee80211_tx_status_ext(ar->hw, &status); } @@ -649,6 +726,9 @@ spin_unlock_bh(&ab->base_lock); + if (atomic_dec_and_test(&arsta->num_tx_pending)) + wake_up(&arsta->tx_empty_waitq); + ieee80211_tx_status_ext(ar->hw, &status); } diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_tx.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_tx.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/dp_tx.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/dp_tx.h 2025-09-25 17:40:34.123360066 +0200 @@ -17,6 +17,20 @@ u16 peer_id; }; +#define HTT_TX_MSDU_DESC_INFO0_VALID_ENCRYPT_TYPE BIT(8) +#define HTT_TX_MSDU_DESC_INFO0_ENCRYPT_TYPE GENMASK(16, 15) +#define HTT_TX_MSDU_DESC_INFO0_HOST_TX_DESC_POOL BIT(31) + +struct htt_tx_msdu_desc_ext { + __le32 info0; + __le32 info1; + __le32 info2; + __le32 info3; + __le32 info4; + __le32 info5; + __le32 info6; +} __packed; + void ath11k_dp_tx_update_txcompl(struct ath11k *ar, struct hal_tx_status *ts); int ath11k_dp_tx_htt_h2t_ver_req_msg(struct ath11k_base *ab); int ath11k_dp_tx(struct ath11k *ar, struct ath11k_vif *arvif, diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/hal.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hal.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/hal.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hal.c 2025-09-25 17:40:34.127360086 +0200 @@ -829,11 +829,15 @@ srng->u.src_ring.cached_tp = *(volatile u32 *)srng->u.src_ring.tp_addr; } else { - srng->u.dst_ring.cached_hp = *srng->u.dst_ring.hp_addr; + srng->u.dst_ring.cached_hp = + READ_ONCE(*srng->u.dst_ring.hp_addr); /* Try to prefetch the next descriptor in the ring */ if (srng->flags & HAL_SRNG_FLAGS_CACHED) ath11k_hal_srng_prefetch_desc(ab, srng); + + /* Make sure descriptor is read after the head pointer. */ + dma_rmb(); } } @@ -844,7 +848,6 @@ { lockdep_assert_held(&srng->lock); - /* TODO: See if we need a write memory barrier here */ if (srng->flags & HAL_SRNG_FLAGS_LMAC_RING) { /* For LMAC rings, ring pointer updates are done through FW and * hence written to a shared memory location that is read by FW @@ -852,15 +855,20 @@ if (srng->ring_dir == HAL_SRNG_DIR_SRC) { 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; + /* Make sure desc is updated before the head pointer. */ + dma_wmb(); + WRITE_ONCE(*srng->u.src_ring.hp_addr, + srng->u.src_ring.hp); } else { srng->u.dst_ring.last_hp = *srng->u.dst_ring.hp_addr; - *srng->u.dst_ring.tp_addr = srng->u.dst_ring.tp; + WRITE_ONCE(*srng->u.dst_ring.tp_addr, + srng->u.dst_ring.tp); } } else { if (srng->ring_dir == HAL_SRNG_DIR_SRC) { srng->u.src_ring.last_tp = *(volatile u32 *)srng->u.src_ring.tp_addr; + /* MMIO access, no need for wmb here */ ath11k_hif_write32(ab, (unsigned long)srng->u.src_ring.hp_addr - (unsigned long)ab->mem, diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/hal.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hal.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/hal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hal.h 2025-07-01 14:10:42.700045625 +0200 @@ -700,7 +700,7 @@ #define HAL_REO_CMD_FLG_UNBLK_RESOURCE BIT(7) #define HAL_REO_CMD_FLG_UNBLK_CACHE BIT(8) -/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* feilds */ +/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO0_UPD_* fields */ #define HAL_REO_CMD_UPD0_RX_QUEUE_NUM BIT(8) #define HAL_REO_CMD_UPD0_VLD BIT(9) #define HAL_REO_CMD_UPD0_ALDC BIT(10) @@ -725,7 +725,7 @@ #define HAL_REO_CMD_UPD0_PN_VALID BIT(29) #define HAL_REO_CMD_UPD0_PN BIT(30) -/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* feilds */ +/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO1_* fields */ #define HAL_REO_CMD_UPD1_VLD BIT(16) #define HAL_REO_CMD_UPD1_ALDC GENMASK(18, 17) #define HAL_REO_CMD_UPD1_DIS_DUP_DETECTION BIT(19) @@ -741,7 +741,7 @@ #define HAL_REO_CMD_UPD1_PN_HANDLE_ENABLE BIT(30) #define HAL_REO_CMD_UPD1_IGNORE_AMPDU_FLG BIT(31) -/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* feilds */ +/* Should be matching with HAL_REO_UPD_RX_QUEUE_INFO2_* fields */ #define HAL_REO_CMD_UPD2_SVLD BIT(10) #define HAL_REO_CMD_UPD2_SSN GENMASK(22, 11) #define HAL_REO_CMD_UPD2_SEQ_2K_ERR BIT(23) diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/hw.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hw.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/hw.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hw.c 2025-09-29 14:23:07.597732370 +0200 @@ -1399,6 +1399,14 @@ }, /* CE11 Not used */ + { + .pipenum = __cpu_to_le32(11), + .pipedir = __cpu_to_le32(0), + .nentries = __cpu_to_le32(0), + .nbytes_max = __cpu_to_le32(0), + .flags = __cpu_to_le32(CE_ATTR_FLAGS | CE_ATTR_DIS_INTR), + .reserved = __cpu_to_le32(0), + }, }; /* Map from service/endpoint to Copy Engine. diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/hw.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hw.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/hw.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/hw.h 2025-09-29 14:23:07.597732370 +0200 @@ -194,6 +194,7 @@ u32 num_vdevs; u32 num_peers; bool supports_suspend; + bool supports_ap_vlan; u32 hal_desc_sz; bool supports_regdb; bool fix_l1ss; @@ -227,6 +228,8 @@ bool smp2p_wow_exit; bool support_fw_mac_sequence; bool support_dual_stations; + bool ce_fwlog_enable; + bool pdev_suspend; }; struct ath11k_hw_ops { diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/mac.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/mac.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/mac.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/mac.c 2025-09-29 14:23:07.601732390 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -1529,17 +1529,29 @@ return ret; } -static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif) +static struct ath11k_vif *ath11k_mac_get_tx_arvif(struct ath11k_vif *arvif, + struct ieee80211_bss_conf *link_conf) +{ + struct ieee80211_bss_conf *tx_bss_conf; + + lockdep_assert_wiphy(arvif->ar->hw->wiphy); + + tx_bss_conf = wiphy_dereference(arvif->ar->hw->wiphy, link_conf->tx_bss_conf); + if (tx_bss_conf) + return ath11k_vif_to_arvif(tx_bss_conf->vif); + + return NULL; +} + +static int ath11k_mac_setup_bcn_tmpl_ema(struct ath11k_vif *arvif, + struct ath11k_vif *tx_arvif) { - struct ath11k_vif *tx_arvif; struct ieee80211_ema_beacons *beacons; int ret = 0; bool nontx_vif_params_set = false; u32 params = 0; u8 i = 0; - tx_arvif = ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif); - beacons = ieee80211_beacon_get_template_ema_list(tx_arvif->ar->hw, tx_arvif->vif, 0); if (!beacons || !beacons->cnt) { @@ -1585,26 +1597,23 @@ return ret; } -static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif) +static int ath11k_mac_setup_bcn_tmpl_mbssid(struct ath11k_vif *arvif, + struct ath11k_vif *tx_arvif) { struct ath11k *ar = arvif->ar; struct ath11k_base *ab = ar->ab; - struct ath11k_vif *tx_arvif = arvif; struct ieee80211_hw *hw = ar->hw; struct ieee80211_vif *vif = arvif->vif; struct ieee80211_mutable_offsets offs = {}; struct sk_buff *bcn; int ret; - if (vif->mbssid_tx_vif) { - tx_arvif = ath11k_vif_to_arvif(vif->mbssid_tx_vif); if (tx_arvif != arvif) { ar = tx_arvif->ar; ab = ar->ab; hw = ar->hw; vif = tx_arvif->vif; } - } bcn = ieee80211_beacon_get_template(hw, vif, &offs, 0); if (!bcn) { @@ -1632,6 +1641,7 @@ static int ath11k_mac_setup_bcn_tmpl(struct ath11k_vif *arvif) { struct ieee80211_vif *vif = arvif->vif; + struct ath11k_vif *tx_arvif; if (arvif->vdev_type != WMI_VDEV_TYPE_AP) return 0; @@ -1639,14 +1649,18 @@ /* Target does not expect beacon templates for the already up * non-transmitting interfaces, and results in a crash if sent. */ - if (vif->mbssid_tx_vif && - arvif != ath11k_vif_to_arvif(vif->mbssid_tx_vif) && arvif->is_up) + tx_arvif = ath11k_mac_get_tx_arvif(arvif, &vif->bss_conf); + if (tx_arvif) { + if (arvif != tx_arvif && arvif->is_up) return 0; - if (vif->bss_conf.ema_ap && vif->mbssid_tx_vif) - return ath11k_mac_setup_bcn_tmpl_ema(arvif); + if (vif->bss_conf.ema_ap) + return ath11k_mac_setup_bcn_tmpl_ema(arvif, tx_arvif); + } else { + tx_arvif = arvif; + } - return ath11k_mac_setup_bcn_tmpl_mbssid(arvif); + return ath11k_mac_setup_bcn_tmpl_mbssid(arvif, tx_arvif); } void ath11k_mac_bcn_tx_event(struct ath11k_vif *arvif) @@ -1674,7 +1688,7 @@ struct ieee80211_bss_conf *info) { struct ath11k *ar = arvif->ar; - struct ath11k_vif *tx_arvif = NULL; + struct ath11k_vif *tx_arvif; int ret = 0; lockdep_assert_held(&arvif->ar->conf_mutex); @@ -1697,15 +1711,11 @@ return; } - arvif->tx_seq_no = 0x1000; - arvif->aid = 0; ether_addr_copy(arvif->bssid, info->bssid); - if (arvif->vif->mbssid_tx_vif) - tx_arvif = ath11k_vif_to_arvif(arvif->vif->mbssid_tx_vif); - + tx_arvif = ath11k_mac_get_tx_arvif(arvif, &arvif->vif->bss_conf); ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid, arvif->bssid, tx_arvif ? tx_arvif->bssid : NULL, @@ -1857,7 +1867,7 @@ } /* FIXME: base on RSN IE/WPA IE is a correct idea? */ - if (rsnie || wpaie) { + if (ar->supports_6ghz || rsnie || wpaie) { ath11k_dbg(ar->ab, ATH11K_DBG_WMI, "%s: rsn ie found\n", __func__); arg->need_ptk_4_way = true; @@ -2230,7 +2240,7 @@ __le16_to_cpu(vht_cap->vht_mcs.tx_mcs_map), vht_mcs_mask); /* In IPQ8074 platform, VHT mcs rate 10 and 11 is enabled by default. - * VHT mcs rate 10 and 11 is not suppoerted in 11ac standard. + * VHT mcs rate 10 and 11 is not supported in 11ac standard. * so explicitly disable the VHT MCS rate 10 and 11 in 11ac mode. */ arg->tx_mcs_set &= ~IEEE80211_VHT_MCS_SUPPORT_0_11_MASK; @@ -3332,7 +3342,8 @@ { u32 bitmap[2], param_id, param_val, pdev_id; int ret; - s8 non_srg_th = 0, srg_th = 0; + s8 non_srg_th = ATH11K_OBSS_PD_THRESHOLD_DISABLED; + s8 srg_th = 0; pdev_id = ar->pdev->pdev_id; @@ -3361,8 +3372,6 @@ if (he_obss_pd->sr_ctrl & IEEE80211_HE_SPR_NON_SRG_OFFSET_PRESENT) non_srg_th = (ATH11K_OBSS_PD_MAX_THRESHOLD + he_obss_pd->non_srg_max_offset); - else - non_srg_th = ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD; param_val |= ATH11K_OBSS_PD_NON_SRG_EN; } @@ -3377,6 +3386,7 @@ param_val |= ATH11K_OBSS_PD_THRESHOLD_IN_DBM; param_val |= FIELD_PREP(GENMASK(15, 8), srg_th); } else { + if ((non_srg_th & 0xff) != ATH11K_OBSS_PD_THRESHOLD_DISABLED) non_srg_th -= ATH11K_DEFAULT_NOISE_FLOOR; /* SRG not supported and threshold in dB */ param_val &= ~(ATH11K_OBSS_PD_SRG_EN | @@ -4222,7 +4232,9 @@ return 0; if (cmd == DISABLE_KEY) { - arg.key_cipher = WMI_CIPHER_NONE; + /* TODO: Check if FW expects value other than NONE for del */ + /* arg.key_cipher = WMI_CIPHER_NONE; */ + arg.key_len = 0; arg.key_data = NULL; goto install; } @@ -4355,7 +4367,25 @@ */ if (peer && sta && cmd == SET_KEY) ath11k_peer_frags_flush(ar, peer); + + /* Reset peer authorized flag in FW before deleting keys + * to avoid races in FW during encryption of queued packets. + */ + if (peer && sta && cmd == DISABLE_KEY && peer->is_authorized) { + peer->is_authorized = false; + spin_unlock_bh(&ab->base_lock); + ret = ath11k_wmi_set_peer_param(ar, sta->addr, + arvif->vdev_id, + WMI_PEER_AUTHORIZE, + 0); + if (ret) { + ath11k_warn(ar->ab, "Unable to reset authorize flag for " + "peer (%pM) vdev %d: %d\n", + sta->addr, arvif->vdev_id, ret); + } + } else { spin_unlock_bh(&ab->base_lock); + } if (!peer) { if (cmd == SET_KEY) { @@ -5206,6 +5236,45 @@ return ret; } +static int ath11k_mac_op_conf_tx_mu_edca(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + unsigned int link_id, u16 ac, + const struct ieee80211_tx_queue_params *params) +{ + struct ath11k_vif *arvif = ath11k_vif_to_arvif(vif); + struct ath11k *ar = hw->priv; + struct wmi_wmm_params_arg *p; + int ret; + + switch (ac) { + case IEEE80211_AC_VO: + p = &arvif->muedca_params.ac_vo; + break; + case IEEE80211_AC_VI: + p = &arvif->muedca_params.ac_vi; + break; + case IEEE80211_AC_BE: + p = &arvif->muedca_params.ac_be; + break; + case IEEE80211_AC_BK: + p = &arvif->muedca_params.ac_bk; + break; + default: + ath11k_warn(ar->ab, "error ac: %d", ac); + return -EINVAL; + } + + p->cwmin = u8_get_bits(params->mu_edca_param_rec.ecw_min_max, GENMASK(3, 0)); + p->cwmax = u8_get_bits(params->mu_edca_param_rec.ecw_min_max, GENMASK(7, 4)); + p->aifs = u8_get_bits(params->mu_edca_param_rec.aifsn, GENMASK(3, 0)); + p->txop = params->mu_edca_param_rec.mu_edca_timer; + + ret = ath11k_wmi_send_wmm_update_cmd_tlv(ar, arvif->vdev_id, + &arvif->muedca_params, + WMI_WMM_PARAM_TYPE_11AX_MU_EDCA); + return ret; +} + static int ath11k_mac_op_conf_tx(struct ieee80211_hw *hw, struct ieee80211_vif *vif, unsigned int link_id, u16 ac, @@ -5244,12 +5313,22 @@ p->txop = params->txop; ret = ath11k_wmi_send_wmm_update_cmd_tlv(ar, arvif->vdev_id, - &arvif->wmm_params); + &arvif->wmm_params, + WMI_WMM_PARAM_TYPE_LEGACY); if (ret) { ath11k_warn(ar->ab, "failed to set wmm params: %d\n", ret); goto exit; } + if (params->mu_edca) { + ret = ath11k_mac_op_conf_tx_mu_edca(hw, vif, link_id, ac, + params); + if (ret) { + ath11k_warn(ar->ab, "failed to set mu_edca params: %d\n", ret); + goto exit; + } + } + ret = ath11k_conf_tx_uapsd(ar, vif, ac, params->uapsd); if (ret) @@ -5338,8 +5417,6 @@ if (vht_cap & (IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE)) { nsts = vht_cap & IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK; nsts >>= IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT; - if (nsts > (ar->num_rx_chains - 1)) - nsts = ar->num_rx_chains - 1; value |= SM(nsts, WMI_TXBF_STS_CAP_OFFSET); } @@ -5423,9 +5500,6 @@ /* Enable Beamformee STS Field only if SU BF is enabled */ if (subfee) { - if (nsts > (ar->num_rx_chains - 1)) - nsts = ar->num_rx_chains - 1; - nsts <<= IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT; nsts &= IEEE80211_VHT_CAP_BEAMFORMEE_STS_MASK; *vht_cap |= nsts; @@ -6063,6 +6137,11 @@ bool is_prb_rsp; int ret; + if (unlikely(test_bit(ATH11K_FLAG_CRASH_FLUSH, &ar->ab->dev_flags))) { + ieee80211_free_txskb(ar->hw, skb); + return; + } + memset(skb_cb, 0, sizeof(*skb_cb)); skb_cb->vif = vif; @@ -6290,6 +6369,7 @@ { struct ath11k *ar = hw->priv; struct htt_ppdu_stats_info *ppdu_stats, *tmp; + struct scan_chan_list_params *params; int ret; ath11k_mac_drain_tx(ar); @@ -6305,6 +6385,7 @@ mutex_unlock(&ar->conf_mutex); cancel_delayed_work_sync(&ar->scan.timeout); + cancel_work_sync(&ar->channel_update_work); cancel_work_sync(&ar->regd_update_work); cancel_work_sync(&ar->ab->update_11d_work); @@ -6314,10 +6395,19 @@ } spin_lock_bh(&ar->data_lock); + list_for_each_entry_safe(ppdu_stats, tmp, &ar->ppdu_stats_info, list) { list_del(&ppdu_stats->list); kfree(ppdu_stats); } + + while ((params = list_first_entry_or_null(&ar->channel_update_queue, + struct scan_chan_list_params, + list))) { + list_del(¶ms->list); + kfree(params); + } + spin_unlock_bh(&ar->data_lock); rcu_assign_pointer(ar->ab->pdevs_active[ar->pdev_idx], NULL); @@ -6332,23 +6422,20 @@ { struct ath11k *ar = arvif->ar; struct ath11k_vif *tx_arvif; - struct ieee80211_vif *tx_vif; *tx_vdev_id = 0; - tx_vif = arvif->vif->mbssid_tx_vif; - if (!tx_vif) { + tx_arvif = ath11k_mac_get_tx_arvif(arvif, &arvif->vif->bss_conf); + if (!tx_arvif) { *flags = WMI_HOST_VDEV_FLAGS_NON_MBSSID_AP; return 0; } - tx_arvif = ath11k_vif_to_arvif(tx_vif); - if (arvif->vif->bss_conf.nontransmitted) { - if (ar->hw->wiphy != ieee80211_vif_to_wdev(tx_vif)->wiphy) + if (ar->hw->wiphy != tx_arvif->ar->hw->wiphy) return -EINVAL; *flags = WMI_HOST_VDEV_FLAGS_NON_TRANSMIT_AP; - *tx_vdev_id = ath11k_vif_to_arvif(tx_vif)->vdev_id; + *tx_vdev_id = tx_arvif->vdev_id; } else if (tx_arvif == arvif) { *flags = WMI_HOST_VDEV_FLAGS_TRANSMIT_AP; } else { @@ -6952,7 +7039,7 @@ /* Recalc txpower for remaining vdev */ ath11k_mac_txpower_recalc(ar); - /* TODO: recal traffic pause state based on the available vdevs */ + /* TODO: recalc traffic pause state based on the available vdevs */ mutex_unlock(&ar->conf_mutex); } @@ -7308,8 +7395,7 @@ int n_vifs) { struct ath11k_base *ab = ar->ab; - struct ath11k_vif *arvif, *tx_arvif = NULL; - struct ieee80211_vif *mbssid_tx_vif; + struct ath11k_vif *arvif, *tx_arvif; int ret; int i; bool monitor_vif = false; @@ -7363,10 +7449,7 @@ ath11k_warn(ab, "failed to update bcn tmpl during csa: %d\n", ret); - mbssid_tx_vif = arvif->vif->mbssid_tx_vif; - if (mbssid_tx_vif) - tx_arvif = ath11k_vif_to_arvif(mbssid_tx_vif); - + tx_arvif = ath11k_mac_get_tx_arvif(arvif, &arvif->vif->bss_conf); ret = ath11k_wmi_vdev_up(arvif->ar, arvif->vdev_id, arvif->aid, arvif->bssid, tx_arvif ? tx_arvif->bssid : NULL, @@ -8124,7 +8207,8 @@ /* mac80211 stores device specific RTS/Fragmentation threshold value, * this is set interface specific to firmware from ath11k driver */ -static int ath11k_mac_op_set_rts_threshold(struct ieee80211_hw *hw, u32 value) +static int ath11k_mac_op_set_rts_threshold(struct ieee80211_hw *hw, u8 radio_id, + u32 value) { struct ath11k *ar = hw->priv; int param_id = WMI_VDEV_PARAM_RTS_THRESHOLD; @@ -8190,6 +8274,22 @@ ath11k_mac_flush_tx_complete(ar); } +static void ath11k_mac_op_flush_sta(struct ieee80211_hw *hw, + struct ieee80211_vif *vif, + struct ieee80211_sta *sta) +{ + struct ath11k *ar = hw->priv; + struct ath11k_sta *arsta = (struct ath11k_sta *) sta->drv_priv; + long time_left; + + time_left = wait_event_timeout(arsta->tx_empty_waitq, + (atomic_read(&arsta->num_tx_pending) == 0), + ATH11K_FLUSH_TIMEOUT); + if (time_left == 0) + ath11k_warn(ar->ab, "failed to flush sta transmit queue, data pkts pending %d\n", + atomic_read(&arsta->num_tx_pending)); +} + static bool ath11k_mac_has_single_legacy_rate(struct ath11k *ar, enum nl80211_band band, @@ -9356,6 +9456,7 @@ static int ath11k_mac_op_get_txpower(struct ieee80211_hw *hw, struct ieee80211_vif *vif, + unsigned int link_id, int *dbm) { struct ath11k *ar = hw->priv; @@ -9583,6 +9684,7 @@ arsta->peer_ps_state = WMI_PEER_PS_STATE_DISABLED; INIT_WORK(&arsta->update_wk, ath11k_sta_rc_update_wk); INIT_WORK(&arsta->set_4addr_wk, ath11k_sta_set_4addr_wk); + init_waitqueue_head(&arsta->tx_empty_waitq); ret = ath11k_mac_station_add(ar, vif, sta); if (ret) @@ -9671,10 +9773,21 @@ spin_lock_bh(&ar->ab->base_lock); peer = ath11k_peer_find(ar->ab, arvif->vdev_id, sta->addr); - if (peer) + if (peer) { peer->is_authorized = false; - spin_unlock_bh(&ar->ab->base_lock); + ret = ath11k_wmi_set_peer_param(ar, sta->addr, + arvif->vdev_id, + WMI_PEER_AUTHORIZE, + 0); + if (ret) { + ath11k_warn(ar->ab, "Unable to reset authorize flag for " + "peer (%pM) vdev %d: %d\n", + sta->addr, arvif->vdev_id, ret); + } + } else { + spin_unlock_bh(&ar->ab->base_lock); + } } else if (old_state == IEEE80211_STA_ASSOC && new_state == IEEE80211_STA_AUTH && (vif->type == NL80211_IFTYPE_AP || @@ -9725,6 +9838,7 @@ .set_bitrate_mask = ath11k_mac_op_set_bitrate_mask, .get_survey = ath11k_mac_op_get_survey, .flush = ath11k_mac_op_flush, + .flush_sta = ath11k_mac_op_flush_sta, .sta_statistics = ath11k_mac_op_sta_statistics, CFG80211_TESTMODE_CMD(ath11k_tm_cmd) @@ -9765,6 +9879,28 @@ } } +#define ATH11k_5_DOT_9_MIN_FREQ 5845 +#define ATH11k_5_DOT_9_MAX_FREQ 5885 + +static void ath11k_mac_update_5_dot_9_ch_list(struct ath11k *ar, + struct ieee80211_supported_band *band) +{ + int i; + + if (test_bit(WMI_TLV_SERVICE_5_DOT_9GHZ_SUPPORT, + ar->ab->wmi_ab.svc_map)) + return; + + if (ar->ab->dfs_region != ATH11K_DFS_REG_FCC) + return; + + for (i = 0; i < band->n_channels; i++) { + if (band->channels[i].center_freq >= ATH11k_5_DOT_9_MIN_FREQ && + band->channels[i].center_freq <= ATH11k_5_DOT_9_MAX_FREQ) + band->channels[i].flags |= IEEE80211_CHAN_DISABLED; + } +} + static u32 ath11k_get_phy_id(struct ath11k *ar, u32 band) { struct ath11k_pdev *pdev = ar->pdev; @@ -9875,6 +10011,7 @@ ath11k_mac_update_ch_list(ar, band, temp_reg_cap->low_5ghz_chan, temp_reg_cap->high_5ghz_chan); + ath11k_mac_update_5_dot_9_ch_list(ar, band); } } @@ -10020,6 +10157,7 @@ static void __ath11k_mac_unregister(struct ath11k *ar) { + cancel_work_sync(&ar->channel_update_work); cancel_work_sync(&ar->regd_update_work); ieee80211_unregister_hw(ar->hw); @@ -10252,6 +10390,12 @@ ab->hw_params.bios_sar_capa) ar->hw->wiphy->sar_capa = ab->hw_params.bios_sar_capa; + snprintf(ar->hw->wiphy->fw_version, + sizeof(ar->hw->wiphy->fw_version), + "%s, 0x%x", + ab->hw_params.name, + ab->qmi.target.fw_version); + ret = ieee80211_register_hw(ar->hw); if (ret) { ath11k_err(ar->ab, "ieee80211 registration failed: %d\n", ret); @@ -10266,6 +10410,11 @@ */ ar->hw->wiphy->interface_modes &= ~BIT(NL80211_IFTYPE_MONITOR); + if (ab->hw_params.supports_ap_vlan) { + ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_AP_VLAN); + ar->hw->wiphy->software_iftypes |= BIT(NL80211_IFTYPE_AP_VLAN); + } + /* Apply the regd received during initialization */ ret = ath11k_regd_update(ar); if (ret) { @@ -10369,6 +10518,7 @@ struct ieee80211_hw *hw; struct ath11k *ar; struct ath11k_pdev *pdev; + struct ieee80211_ops *ops; int ret; int i; @@ -10376,17 +10526,25 @@ return 0; for (i = 0; i < ab->num_radios; i++) { + ops = kmemdup(&ath11k_ops, sizeof(ath11k_ops), GFP_KERNEL); + if (!ops) { + ret = -ENOMEM; + goto err_free_mac; + } + pdev = &ab->pdevs[i]; - hw = ieee80211_alloc_hw(sizeof(struct ath11k), &ath11k_ops); + hw = ieee80211_alloc_hw(sizeof(struct ath11k), ops); if (!hw) { ath11k_warn(ab, "failed to allocate mac80211 hw device\n"); ret = -ENOMEM; + kfree(ops); goto err_free_mac; } ar = hw->priv; ar->hw = hw; ar->ab = ab; + ar->ops = ops; ar->pdev = pdev; ar->pdev_idx = i; ar->lmac_id = ath11k_hw_get_mac_from_pdev_id(&ab->hw_params, i); @@ -10419,6 +10577,8 @@ init_completion(&ar->thermal.wmi_sync); INIT_DELAYED_WORK(&ar->scan.timeout, ath11k_scan_timeout_work); + INIT_WORK(&ar->channel_update_work, ath11k_regd_update_chan_list_work); + INIT_LIST_HEAD(&ar->channel_update_queue); INIT_WORK(&ar->regd_update_work, ath11k_regd_update_work); INIT_WORK(&ar->wmi_mgmt_tx_work, ath11k_mgmt_over_wmi_tx_work); @@ -10446,6 +10606,7 @@ { struct ath11k *ar; struct ath11k_pdev *pdev; + struct ieee80211_ops *ops; int i; for (i = 0; i < ab->num_radios; i++) { @@ -10455,7 +10616,9 @@ continue; ath11k_fw_stats_free(&ar->fw_stats); + ops = ar->ops; ieee80211_free_hw(ar->hw); + kfree(ops); pdev->ar = NULL; } } diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/mac.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/mac.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/mac.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/mac.h 2025-09-25 17:40:34.127360086 +0200 @@ -122,7 +122,7 @@ #define ATH11K_PEER_RX_NSS_80_80MHZ GENMASK(5, 3) #define ATH11K_OBSS_PD_MAX_THRESHOLD -82 -#define ATH11K_OBSS_PD_NON_SRG_MAX_THRESHOLD -62 +#define ATH11K_OBSS_PD_THRESHOLD_DISABLED 128 #define ATH11K_OBSS_PD_THRESHOLD_IN_DBM BIT(29) #define ATH11K_OBSS_PD_SRG_EN BIT(30) #define ATH11K_OBSS_PD_NON_SRG_EN BIT(31) diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/mhi.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/mhi.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/mhi.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/mhi.c 2025-09-25 17:40:34.127360086 +0200 @@ -328,7 +328,7 @@ if (ret) return ret; - mhi_ctrl->iova_start = res.start + 0x1000000; + mhi_ctrl->iova_start = res.start; mhi_ctrl->iova_stop = res.end; return 0; @@ -398,6 +398,7 @@ case ATH11K_HW_WCN6855_HW20: case ATH11K_HW_WCN6855_HW21: case ATH11K_HW_QCA2066_HW21: + case ATH11K_HW_QCA6698AQ_HW21: ath11k_mhi_config = &ath11k_mhi_config_qca6390; break; default: diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/pci.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pci.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/pci.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pci.c 2025-09-25 17:40:34.131360105 +0200 @@ -30,6 +30,7 @@ #define WCN6855_DEVICE_ID 0x1103 #define TCSR_SOC_HW_SUB_VER 0x1910010 +#define ATH11K_PCIE_LOCAL_REG_PCIE_LOCAL_RSV0 0x1E03164 static const struct pci_device_id ath11k_pci_id_table[] = { { PCI_VDEVICE(QCOM, QCA6390_DEVICE_ID) }, @@ -177,8 +178,16 @@ static void ath11k_pci_soc_global_reset(struct ath11k_base *ab) { + struct ath11k_pci *ab_pci = ath11k_pci_priv(ab); u32 val, delay; + /* + * reset will reinitialise SoC registers to their default + * values, we must not assume that the actual window cached + * there is going to be valid after global reset. + */ + ab_pci->register_window = 0x00; + val = ath11k_pcic_read32(ab, PCIE_SOC_GLOBAL_RESET); val |= PCIE_SOC_GLOBAL_RESET_V; @@ -371,9 +380,14 @@ ath11k_mhi_set_mhictrl_reset(ab); } +#define ATH11K_QRTR_INSTANCE_PCI_DOMAIN GENMASK(3, 0) +#define ATH11K_QRTR_INSTANCE_PCI_BUS_NUM GENMASK(7, 4) + static void ath11k_pci_init_qmi_ce_config(struct ath11k_base *ab) { struct ath11k_qmi_ce_cfg *cfg = &ab->qmi.ce_cfg; + struct ath11k_pci *ab_pci = ath11k_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; @@ -384,6 +398,13 @@ ath11k_ce_get_shadow_config(ab, &cfg->shadow_reg_v2, &cfg->shadow_reg_v2_len); + + ab_pci->instance_id = + FIELD_PREP(ATH11K_QRTR_INSTANCE_PCI_DOMAIN, + pci_domain_nr(bus)) | + FIELD_PREP(ATH11K_QRTR_INSTANCE_PCI_BUS_NUM, + bus->number); + ab->qmi.service_ins_id += ab_pci->instance_id; } static void ath11k_pci_msi_config(struct ath11k_pci *ab_pci, bool enable) @@ -610,6 +631,18 @@ PCI_EXP_LNKCTL_ASPMC); } +static void ath11k_pci_update_qrtr_node_id(struct ath11k_base *ab) +{ + struct ath11k_pci *ab_pci = ath11k_pci_priv(ab); + u32 reg; + + reg = ATH11K_PCIE_LOCAL_REG_PCIE_LOCAL_RSV0 & ATH11K_PCI_WINDOW_RANGE_MASK; + ath11k_pcic_write32(ab, reg, ab_pci->instance_id); + + ath11k_dbg(ab, ATH11K_DBG_PCI, "pci reg 0x%x instance_id 0x%x read val 0x%x\n", + reg, ab_pci->instance_id, ath11k_pcic_read32(ab, reg)); +} + static int ath11k_pci_power_up(struct ath11k_base *ab) { struct ath11k_pci *ab_pci = ath11k_pci_priv(ab); @@ -626,6 +659,8 @@ ath11k_pci_msi_enable(ab_pci); + ath11k_pci_update_qrtr_node_id(ab); + ret = ath11k_mhi_start(ab_pci); if (ret) { ath11k_err(ab, "failed to start mhi: %d\n", ret); @@ -846,6 +881,9 @@ case 0x1019D0E1: ab->hw_rev = ATH11K_HW_QCA2066_HW21; break; + case 0x001e60e1: + ab->hw_rev = ATH11K_HW_QCA6698AQ_HW21; + break; default: ab->hw_rev = ATH11K_HW_WCN6855_HW21; } @@ -910,7 +948,7 @@ ath11k_pci_init_qmi_ce_config(ab); - ret = ath11k_pcic_config_irq(ab); + ret = ath11k_pcic_config_irq(ab, pci_name(pdev)); if (ret) { ath11k_err(ab, "failed to config irq: %d\n", ret); goto err_ce_free; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/pci.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pci.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/pci.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pci.h 2025-09-25 17:40:34.131360105 +0200 @@ -74,6 +74,7 @@ unsigned long flags; u16 link_ctl; u64 dma_mask; + u32 instance_id; }; static inline struct ath11k_pci *ath11k_pci_priv(struct ath11k_base *ab) diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/pcic.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pcic.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/pcic.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pcic.c 2025-09-25 17:40:34.131360105 +0200 @@ -1,17 +1,14 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2019-2021 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "core.h" #include "pcic.h" #include "debug.h" -static const char *irq_name[ATH11K_IRQ_NUM_MAX] = { - "bhi", - "mhi-er0", - "mhi-er1", +static const char *ce_irq_name[] = { "ce0", "ce1", "ce2", @@ -24,42 +21,20 @@ "ce9", "ce10", "ce11", - "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-ring3", - "wbm2host-tx-completions-ring2", - "wbm2host-tx-completions-ring1", - "tcl2host-status-ring", +}; + +static const char *dp_irq_name[ATH11K_EXT_IRQ_NUM_MAX] = { + "wbm2host_tx_completions_ring1", + "wbm2host_tx_completions_ring2", + "wbm2host_tx_completions_ring3", + "lmac_reo_misc_irq", + "reo2host_destination_ring1", + "reo2host_destination_ring2", + "reo2host_destination_ring3", + "reo2host_destination_ring4", + "dp_res1", + "dp_res2", + "dp_res3", }; static const struct ath11k_msi_config ath11k_msi_config[] = { @@ -126,6 +101,17 @@ }, .hw_rev = ATH11K_HW_QCA2066_HW21, }, + { + .total_vectors = 32, + .total_users = 4, + .users = (struct ath11k_msi_user[]) { + { .name = "MHI", .num_vectors = 3, .base_vector = 0 }, + { .name = "CE", .num_vectors = 10, .base_vector = 3 }, + { .name = "WAKE", .num_vectors = 1, .base_vector = 13 }, + { .name = "DP", .num_vectors = 18, .base_vector = 14 }, + }, + .hw_rev = ATH11K_HW_QCA6698AQ_HW21, + }, }; int ath11k_pcic_init_msi_config(struct ath11k_base *ab) @@ -317,6 +303,8 @@ netif_napi_del(&irq_grp->napi); free_netdev(irq_grp->napi_ndev); + kfree(irq_grp->name); + irq_grp->name = NULL; } } @@ -329,6 +317,8 @@ continue; irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i; free_irq(ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]); + kfree(ab->irq_name[i]); + ab->irq_name[i] = NULL; } ath11k_pcic_free_ext_irq(ab); @@ -557,7 +547,8 @@ return ab->pci.ops->get_msi_irq(ab, vector); } -static int ath11k_pcic_ext_irq_config(struct ath11k_base *ab) +static int ath11k_pcic_ext_irq_config(struct ath11k_base *ab, + const char *dev_name) { int i, j, n, ret, num_vectors = 0; u32 user_base_data = 0, base_vector = 0; @@ -600,6 +591,13 @@ num_irq = 1; } + irq_grp->name = kasprintf(GFP_KERNEL, + "%s-%s", + dev_name, + dp_irq_name[i]); + if (!irq_grp->name) + return -ENOMEM; + irq_grp->num_irq = num_irq; irq_grp->irqs[0] = ATH11K_PCI_IRQ_DP_OFFSET + i; @@ -620,7 +618,7 @@ irq_set_status_flags(irq, IRQ_DISABLE_UNLAZY); ret = request_irq(irq, ath11k_pcic_ext_interrupt_handler, - irq_flags, "DP_EXT_IRQ", irq_grp); + irq_flags, irq_grp->name, irq_grp); if (ret) { ath11k_err(ab, "failed request irq %d: %d\n", vector, ret); @@ -646,7 +644,8 @@ return ret; } -int ath11k_pcic_config_irq(struct ath11k_base *ab) +int ath11k_pcic_config_irq(struct ath11k_base *ab, + const char *dev_name) { struct ath11k_ce_pipe *ce_pipe; u32 msi_data_start; @@ -675,6 +674,13 @@ if (irq < 0) return irq; + ab->irq_name[i] = kasprintf(GFP_KERNEL, + "%s-%s", + dev_name, + ce_irq_name[i]); + if (!ab->irq_name[i]) + return -ENOMEM; + ce_pipe = &ab->ce.ce_pipe[i]; irq_idx = ATH11K_PCI_IRQ_CE0_OFFSET + i; @@ -682,7 +688,7 @@ tasklet_setup(&ce_pipe->intr_tq, ath11k_pcic_ce_tasklet); ret = request_irq(irq, ath11k_pcic_ce_interrupt_handler, - irq_flags, irq_name[irq_idx], ce_pipe); + irq_flags, ab->irq_name[i], ce_pipe); if (ret) { ath11k_err(ab, "failed to request irq %d: %d\n", irq_idx, ret); @@ -695,7 +701,7 @@ ath11k_pcic_ce_irq_disable(ab, i); } - ret = ath11k_pcic_ext_irq_config(ab); + ret = ath11k_pcic_ext_irq_config(ab, dev_name); if (ret) return ret; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/pcic.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pcic.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/pcic.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/pcic.h 2025-09-25 17:40:34.131360105 +0200 @@ -35,7 +35,7 @@ u32 *msi_addr_hi); void ath11k_pcic_get_ce_msi_idx(struct ath11k_base *ab, u32 ce_id, u32 *msi_idx); void ath11k_pcic_free_irq(struct ath11k_base *ab); -int ath11k_pcic_config_irq(struct ath11k_base *ab); +int ath11k_pcic_config_irq(struct ath11k_base *ab, const char *dev_name); void ath11k_pcic_ext_irq_enable(struct ath11k_base *ab); void ath11k_pcic_ext_irq_disable(struct ath11k_base *ab); void ath11k_pcic_stop(struct ath11k_base *ab); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/qmi.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/qmi.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/qmi.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/qmi.c 2025-09-25 17:40:34.131360105 +0200 @@ -29,6 +29,10 @@ MODULE_PARM_DESC(cold_boot_cal, "Decrease the channel switch time but increase the driver load time (Default: true)"); +bool ath11k_skip_caldata = 0; +module_param_named(skip_caldata, ath11k_skip_caldata, bool, 0644); +MODULE_PARM_DESC(ath11k_skip_caldata, "Skip caldata download"); + static const struct qmi_elem_info qmi_wlanfw_host_cap_req_msg_v01_ei[] = { { .data_type = QMI_OPT_FLAG, @@ -1704,7 +1708,204 @@ }, }; -static int ath11k_qmi_host_cap_send(struct ath11k_base *ab) +struct qmi_elem_info wlfw_ini_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 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, + }, +}; + +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, + }, +}; + +/* clang stack usage explodes if this is inlined */ +static noinline_for_stack +int ath11k_qmi_host_cap_send(struct ath11k_base *ab) { struct qmi_wlanfw_host_cap_req_msg_v01 req; struct qmi_wlanfw_host_cap_resp_msg_v01 resp; @@ -2190,9 +2391,11 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab) { + struct device *dev = ab->dev; struct qmi_wlanfw_cap_req_msg_v01 req; struct qmi_wlanfw_cap_resp_msg_v01 resp; struct qmi_txn txn; + unsigned int board_id; int ret = 0; int r; char *fw_build_id; @@ -2237,10 +2440,13 @@ 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 { ab->qmi.target.board_id = 0xFF; + } if (resp.soc_info_valid) ab->qmi.target.soc_id = resp.soc_info.soc_id; @@ -2449,6 +2655,11 @@ if (bdf_type == ATH11K_QMI_BDF_TYPE_ELF || bdf_type == ATH11K_QMI_BDF_TYPE_REGDB) goto out; + if (ath11k_skip_caldata) { + ath11k_warn(ab, "Skipping caldata download\n"); + goto out; + } + if (ab->qmi.target.eeprom_caldata) { file_type = ATH11K_QMI_FILE_TYPE_EEPROM; tmp = filename; @@ -2475,9 +2686,8 @@ } ret = PTR_ERR(fw_entry); ath11k_warn(ab, - "qmi failed to load CAL data file:%s\n", - filename); - goto out; + "qmi failed to load CAL data file:%s booting with minimal performance\n",ATH11K_DEFAULT_CAL_FILE); + return 0; } success: fw_size = min_t(u32, ab->hw_params.fw.board_size, fw_entry->size); @@ -2570,7 +2780,9 @@ m3_mem->size = 0; } -static int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab) +/* clang stack usage explodes if this is inlined */ +static noinline_for_stack +int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab) { struct m3_mem_region *m3_mem = &ab->qmi.m3_mem; struct qmi_wlanfw_m3_info_req_msg_v01 req; @@ -3113,6 +3325,130 @@ ath11k_dbg(ab, ATH11K_DBG_QMI, "firmware init done\n"); } +int ath11k_qmi_mem_read(struct ath11k_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 = 0; + + 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); + ath11k_warn(ab, "Failed to send mem read request, err %d\n", + ret); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp->resp.result != QMI_RESULT_SUCCESS_V01) { + ath11k_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) { + ath11k_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 ath11k_qmi_mem_write(struct ath11k_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 = 0; + + 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); + ath11k_warn(ab, "Failed to send mem write request, err %d\n", + ret); + goto out; + } + + ret = qmi_txn_wait(&txn, msecs_to_jiffies(ATH11K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) + goto out; + + if (resp->resp.result != QMI_RESULT_SUCCESS_V01) { + ath11k_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 const struct qmi_msg_handler ath11k_qmi_msg_handlers[] = { { .type = QMI_INDICATION, @@ -3302,6 +3638,55 @@ spin_unlock(&qmi->event_lock); } +int ath11k_enable_fwlog(struct ath11k_base *ab) +{ + struct wlfw_ini_req_msg_v01 *req; + struct wlfw_ini_resp_msg_v01 resp; + struct qmi_txn txn = {}; + int ret = 0; + + req = kzalloc(sizeof(*req), GFP_KERNEL); + if (!req) + return -ENOMEM; + + memset(&resp, 0, sizeof(resp)); + + 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) { + ath11k_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(ATH11K_QMI_WLANFW_TIMEOUT_MS)); + if (ret < 0) { + ath11k_warn(ab, "fwlog enable wait for resp failed: %d\n", ret); + goto out; + } + + if (resp.resp.result != QMI_RESULT_SUCCESS_V01) { + ath11k_warn(ab, "fwlog enable request failed, result: %d, err: %d\n", + resp.resp.result, resp.resp.error); + ret = -EINVAL; + goto out; + } +out: + kfree(req); + return ret; +} + int ath11k_qmi_init_service(struct ath11k_base *ab) { int ret; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/qmi.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/qmi.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/qmi.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/qmi.h 2025-09-25 17:40:34.131360105 +0200 @@ -154,6 +154,7 @@ #define BDF_MEM_REGION_TYPE 0x2 #define M3_DUMP_REGION_TYPE 0x3 #define CALDB_MEM_REGION_TYPE 0x4 +#define QMI_MEM_REGION_TYPE 0 struct qmi_wlanfw_host_cap_req_msg_v01 { u8 num_clients_valid; @@ -228,6 +229,18 @@ u64 fw_status; }; +struct wlfw_ini_req_msg_v01 { + u8 enablefwlog_valid; + u8 enablefwlog; +}; + +struct wlfw_ini_resp_msg_v01 { + struct qmi_response_type_v01 resp; +}; + +#define QMI_WLFW_INI_REQ_V01 0x002F +#define WLFW_INI_REQ_MSG_V01_MAX_MSG_LEN 4 + #define QMI_WLANFW_REQUEST_MEM_IND_MSG_V01_MAX_LEN 1824 #define QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN 888 #define QMI_WLANFW_RESPOND_MEM_RESP_MSG_V01_MAX_LEN 7 @@ -235,6 +248,11 @@ #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_WLANFW_MAX_STR_LEN_V01 16 +#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_cfg_s_v01 { u64 offset; @@ -511,6 +529,30 @@ struct qmi_response_type_v01 resp; }; +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 ath11k_qmi_firmware_start(struct ath11k_base *ab, u32 mode); void ath11k_qmi_firmware_stop(struct ath11k_base *ab); @@ -518,5 +560,8 @@ int ath11k_qmi_init_service(struct ath11k_base *ab); void ath11k_qmi_free_resource(struct ath11k_base *ab); int ath11k_qmi_fwreset_from_cold_boot(struct ath11k_base *ab); +int ath11k_enable_fwlog(struct ath11k_base *ab); +int ath11k_qmi_mem_read(struct ath11k_base *ab, u32 mem_addr, void *mem_value, size_t count); +int ath11k_qmi_mem_write(struct ath11k_base *ab, u32 mem_addr, void* mem_value, size_t count); #endif diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/reg.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/reg.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/reg.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/reg.c 2025-09-25 17:40:34.131360105 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include @@ -55,6 +55,19 @@ ath11k_dbg(ar->ab, ATH11K_DBG_REG, "Regulatory Notification received for %s\n", wiphy_name(wiphy)); + if (request->initiator == NL80211_REGDOM_SET_BY_DRIVER) { + ath11k_dbg(ar->ab, ATH11K_DBG_REG, + "driver initiated regd update\n"); + if (ar->state != ATH11K_STATE_ON) + return; + + ret = ath11k_reg_update_chan_list(ar, true); + if (ret) + ath11k_warn(ar->ab, "failed to update channel list: %d\n", ret); + + return; + } + /* 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 @@ -111,32 +124,7 @@ struct channel_param *ch; enum nl80211_band band; int num_channels = 0; - int i, ret, left; - - if (wait && ar->state_11d != ATH11K_11D_IDLE) { - left = wait_for_completion_timeout(&ar->completed_11d_scan, - ATH11K_SCAN_TIMEOUT_HZ); - if (!left) { - ath11k_dbg(ar->ab, ATH11K_DBG_REG, - "failed to receive 11d scan complete: timed out\n"); - ar->state_11d = ATH11K_11D_IDLE; - } - ath11k_dbg(ar->ab, ATH11K_DBG_REG, - "11d scan wait left time %d\n", left); - } - - if (wait && - (ar->scan.state == ATH11K_SCAN_STARTING || - ar->scan.state == ATH11K_SCAN_RUNNING)) { - left = wait_for_completion_timeout(&ar->scan.completed, - ATH11K_SCAN_TIMEOUT_HZ); - if (!left) - ath11k_dbg(ar->ab, ATH11K_DBG_REG, - "failed to receive hw scan complete: timed out\n"); - - ath11k_dbg(ar->ab, ATH11K_DBG_REG, - "hw scan wait left time %d\n", left); - } + int i, ret = 0; if (ar->state == ATH11K_STATE_RESTARTING) return 0; @@ -218,6 +206,16 @@ } } + if (wait) { + spin_lock_bh(&ar->data_lock); + list_add_tail(¶ms->list, &ar->channel_update_queue); + spin_unlock_bh(&ar->data_lock); + + queue_work(ar->ab->workqueue, &ar->channel_update_work); + + return 0; + } + ret = ath11k_wmi_send_scan_chan_list_cmd(ar, params); kfree(params); @@ -293,12 +291,6 @@ if (ret) goto err; - if (ar->state == ATH11K_STATE_ON) { - ret = ath11k_reg_update_chan_list(ar, true); - if (ret) - goto err; - } - return 0; err: ath11k_warn(ab, "failed to perform regd update : %d\n", ret); @@ -784,7 +776,7 @@ tmp_regd->n_reg_rules = i; - if (intersect) { + if (0) { default_regd = ab->default_regd[reg_info->phy_id]; /* Get a new regd by intersecting the received regd with @@ -804,6 +796,54 @@ return new_regd; } +void ath11k_regd_update_chan_list_work(struct work_struct *work) +{ + struct ath11k *ar = container_of(work, struct ath11k, + channel_update_work); + struct scan_chan_list_params *params; + struct list_head local_update_list; + int left; + + INIT_LIST_HEAD(&local_update_list); + + spin_lock_bh(&ar->data_lock); + list_splice_tail_init(&ar->channel_update_queue, &local_update_list); + spin_unlock_bh(&ar->data_lock); + + while ((params = list_first_entry_or_null(&local_update_list, + struct scan_chan_list_params, + list))) { + if (ar->state_11d != ATH11K_11D_IDLE) { + left = wait_for_completion_timeout(&ar->completed_11d_scan, + ATH11K_SCAN_TIMEOUT_HZ); + if (!left) { + ath11k_dbg(ar->ab, ATH11K_DBG_REG, + "failed to receive 11d scan complete: timed out\n"); + ar->state_11d = ATH11K_11D_IDLE; + } + + ath11k_dbg(ar->ab, ATH11K_DBG_REG, + "reg 11d scan wait left time %d\n", left); + } + + if ((ar->scan.state == ATH11K_SCAN_STARTING || + ar->scan.state == ATH11K_SCAN_RUNNING)) { + left = wait_for_completion_timeout(&ar->scan.completed, + ATH11K_SCAN_TIMEOUT_HZ); + if (!left) + ath11k_dbg(ar->ab, ATH11K_DBG_REG, + "failed to receive hw scan complete: timed out\n"); + + ath11k_dbg(ar->ab, ATH11K_DBG_REG, + "reg hw scan wait left time %d\n", left); + } + + ath11k_wmi_send_scan_chan_list_cmd(ar, params); + list_del(¶ms->list); + kfree(params); + } +} + static bool ath11k_reg_is_world_alpha(char *alpha) { if (alpha[0] == '0' && alpha[1] == '0') @@ -977,6 +1017,7 @@ void ath11k_reg_init(struct ath11k *ar) { ar->hw->wiphy->regulatory_flags = REGULATORY_WIPHY_SELF_MANAGED; + ar->hw->wiphy->flags |= WIPHY_FLAG_NOTIFY_REGDOM_BY_DRIVER; ar->hw->wiphy->reg_notifier = ath11k_reg_notifier; } diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/reg.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/reg.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/reg.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/reg.h 2025-07-01 14:10:42.708045839 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2022-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2022-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_REG_H @@ -33,6 +33,7 @@ void ath11k_reg_reset_info(struct cur_regulatory_info *reg_info); void ath11k_reg_free(struct ath11k_base *ab); void ath11k_regd_update_work(struct work_struct *work); +void ath11k_regd_update_chan_list_work(struct work_struct *work); struct ieee80211_regdomain * ath11k_reg_build_regd(struct ath11k_base *ab, struct cur_regulatory_info *reg_info, bool intersect, diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/testmode.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/testmode.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/testmode.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/testmode.c 2025-09-25 17:40:34.131360105 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2023-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include "testmode.h" @@ -15,15 +15,55 @@ #define ATH11K_FTM_SEGHDR_CURRENT_SEQ GENMASK(3, 0) #define ATH11K_FTM_SEGHDR_TOTAL_SEGMENTS GENMASK(7, 4) -static const struct nla_policy ath11k_tm_policy[ATH11K_TM_ATTR_MAX + 1] = { - [ATH11K_TM_ATTR_CMD] = { .type = NLA_U32 }, - [ATH11K_TM_ATTR_DATA] = { .type = NLA_BINARY, - .len = ATH11K_TM_DATA_MAX_LEN }, - [ATH11K_TM_ATTR_WMI_CMDID] = { .type = NLA_U32 }, - [ATH11K_TM_ATTR_VERSION_MAJOR] = { .type = NLA_U32 }, - [ATH11K_TM_ATTR_VERSION_MINOR] = { .type = NLA_U32 }, +static const struct nla_policy ath11k_tm_policy[ATH_TM_ATTR_MAX + 1] = { + [ATH_TM_ATTR_CMD] = { .type = NLA_U32 }, + [ATH_TM_ATTR_DATA] = { .type = NLA_BINARY, + .len = ATH_TM_DATA_MAX_LEN }, + [ATH_TM_ATTR_WMI_CMDID] = { .type = NLA_U32 }, + [ATH_TM_ATTR_VERSION_MAJOR] = { .type = NLA_U32 }, + [ATH_TM_ATTR_VERSION_MINOR] = { .type = NLA_U32 }, + [ATH_TM_ATTR_FWLOG] = { .type = NLA_BINARY, + .len = ATH_FTM_FWLOG_MAX_LEN }, }; +void ath11k_fwlog_write(struct ath11k_base *ab, u8 *data, int len) +{ + struct sk_buff *nl_skb; + int ret, i; + struct ath11k *ar = NULL; + struct ath11k_pdev *pdev; + + for (i = 0; i < ab->num_radios; i++) { + pdev = &ab->pdevs[i]; + if (pdev && pdev->ar) { + ar = pdev->ar; + break; + } + } + + if (!ar) + return; + + nl_skb = cfg80211_testmode_alloc_event_skb(ar->hw->wiphy, + len, GFP_ATOMIC); + if (!nl_skb) { + ath11k_warn(ab, + "failed to allocate skb for fwlog event\n"); + return; + } + + ret = nla_put(nl_skb, ATH_TM_ATTR_FWLOG, len, data); + if (ret) { + ath11k_warn(ab, + "failed to to put fwlog wmi event to nl: %d\n", + ret); + kfree_skb(nl_skb); + return; + } + + cfg80211_testmode_event(nl_skb, GFP_ATOMIC); +} + static struct ath11k *ath11k_tm_get_ar(struct ath11k_base *ab) { struct ath11k_pdev *pdev; @@ -73,9 +113,9 @@ goto out; } - if (nla_put_u32(nl_skb, ATH11K_TM_ATTR_CMD, ATH11K_TM_CMD_WMI) || - nla_put_u32(nl_skb, ATH11K_TM_ATTR_WMI_CMDID, cmd_id) || - nla_put(nl_skb, ATH11K_TM_ATTR_DATA, skb->len, skb->data)) { + if (nla_put_u32(nl_skb, ATH_TM_ATTR_CMD, ATH_TM_CMD_WMI) || + nla_put_u32(nl_skb, ATH_TM_ATTR_WMI_CMDID, cmd_id) || + nla_put(nl_skb, ATH_TM_ATTR_DATA, skb->len, skb->data)) { ath11k_warn(ab, "failed to populate testmode unsegmented event\n"); kfree_skb(nl_skb); goto out; @@ -140,7 +180,7 @@ data_pos = ab->testmode.data_pos; - if ((data_pos + datalen) > ATH11K_FTM_EVENT_MAX_BUF_LENGTH) { + if ((data_pos + datalen) > ATH_FTM_EVENT_MAX_BUF_LENGTH) { ath11k_warn(ab, "Invalid ftm event length at %d: %d\n", data_pos, datalen); ret = -EINVAL; @@ -172,10 +212,10 @@ goto out; } - if (nla_put_u32(nl_skb, ATH11K_TM_ATTR_CMD, - ATH11K_TM_CMD_WMI_FTM) || - nla_put_u32(nl_skb, ATH11K_TM_ATTR_WMI_CMDID, cmd_id) || - nla_put(nl_skb, ATH11K_TM_ATTR_DATA, data_pos, + if (nla_put_u32(nl_skb, ATH_TM_ATTR_CMD, + ATH_TM_CMD_WMI_FTM) || + nla_put_u32(nl_skb, ATH_TM_ATTR_WMI_CMDID, cmd_id) || + nla_put(nl_skb, ATH_TM_ATTR_DATA, data_pos, &ab->testmode.eventdata[0])) { ath11k_warn(ab, "failed to populate segmented testmode event"); kfree_skb(nl_skb); @@ -235,23 +275,23 @@ ath11k_dbg(ar->ab, ATH11K_DBG_TESTMODE, "cmd get version_major %d version_minor %d\n", - ATH11K_TESTMODE_VERSION_MAJOR, - ATH11K_TESTMODE_VERSION_MINOR); + ATH_TESTMODE_VERSION_MAJOR, + ATH_TESTMODE_VERSION_MINOR); skb = cfg80211_testmode_alloc_reply_skb(ar->hw->wiphy, nla_total_size(sizeof(u32))); if (!skb) return -ENOMEM; - ret = nla_put_u32(skb, ATH11K_TM_ATTR_VERSION_MAJOR, - ATH11K_TESTMODE_VERSION_MAJOR); + ret = nla_put_u32(skb, ATH_TM_ATTR_VERSION_MAJOR, + ATH_TESTMODE_VERSION_MAJOR); if (ret) { kfree_skb(skb); return ret; } - ret = nla_put_u32(skb, ATH11K_TM_ATTR_VERSION_MINOR, - ATH11K_TESTMODE_VERSION_MINOR); + ret = nla_put_u32(skb, ATH_TM_ATTR_VERSION_MINOR, + ATH_TESTMODE_VERSION_MINOR); if (ret) { kfree_skb(skb); return ret; @@ -277,7 +317,7 @@ goto err; } - ar->ab->testmode.eventdata = kzalloc(ATH11K_FTM_EVENT_MAX_BUF_LENGTH, + ar->ab->testmode.eventdata = kzalloc(ATH_FTM_EVENT_MAX_BUF_LENGTH, GFP_KERNEL); if (!ar->ab->testmode.eventdata) { ret = -ENOMEM; @@ -310,25 +350,25 @@ mutex_lock(&ar->conf_mutex); - if (!tb[ATH11K_TM_ATTR_DATA]) { + if (!tb[ATH_TM_ATTR_DATA]) { ret = -EINVAL; goto out; } - if (!tb[ATH11K_TM_ATTR_WMI_CMDID]) { + if (!tb[ATH_TM_ATTR_WMI_CMDID]) { ret = -EINVAL; goto out; } - buf = nla_data(tb[ATH11K_TM_ATTR_DATA]); - buf_len = nla_len(tb[ATH11K_TM_ATTR_DATA]); + buf = nla_data(tb[ATH_TM_ATTR_DATA]); + buf_len = nla_len(tb[ATH_TM_ATTR_DATA]); if (!buf_len) { ath11k_warn(ar->ab, "No data present in testmode wmi command\n"); ret = -EINVAL; goto out; } - cmd_id = nla_get_u32(tb[ATH11K_TM_ATTR_WMI_CMDID]); + cmd_id = nla_get_u32(tb[ATH_TM_ATTR_WMI_CMDID]); /* Make sure that the buffer length is long enough to * hold TLV and pdev/vdev id. @@ -409,13 +449,13 @@ goto out; } - if (!tb[ATH11K_TM_ATTR_DATA]) { + if (!tb[ATH_TM_ATTR_DATA]) { ret = -EINVAL; goto out; } - buf = nla_data(tb[ATH11K_TM_ATTR_DATA]); - buf_len = nla_len(tb[ATH11K_TM_ATTR_DATA]); + buf = nla_data(tb[ATH_TM_ATTR_DATA]); + buf_len = nla_len(tb[ATH_TM_ATTR_DATA]); cmd_id = WMI_PDEV_UTF_CMDID; ath11k_dbg(ar->ab, ATH11K_DBG_TESTMODE, @@ -476,25 +516,25 @@ void *data, int len) { struct ath11k *ar = hw->priv; - struct nlattr *tb[ATH11K_TM_ATTR_MAX + 1]; + struct nlattr *tb[ATH_TM_ATTR_MAX + 1]; int ret; - ret = nla_parse(tb, ATH11K_TM_ATTR_MAX, data, len, ath11k_tm_policy, + ret = nla_parse(tb, ATH_TM_ATTR_MAX, data, len, ath11k_tm_policy, NULL); if (ret) return ret; - if (!tb[ATH11K_TM_ATTR_CMD]) + if (!tb[ATH_TM_ATTR_CMD]) return -EINVAL; - switch (nla_get_u32(tb[ATH11K_TM_ATTR_CMD])) { - case ATH11K_TM_CMD_GET_VERSION: + switch (nla_get_u32(tb[ATH_TM_ATTR_CMD])) { + case ATH_TM_CMD_GET_VERSION: return ath11k_tm_cmd_get_version(ar, tb); - case ATH11K_TM_CMD_WMI: + case ATH_TM_CMD_WMI: return ath11k_tm_cmd_wmi(ar, tb, vif); - case ATH11K_TM_CMD_TESTMODE_START: + case ATH_TM_CMD_TESTMODE_START: return ath11k_tm_cmd_testmode_start(ar, tb); - case ATH11K_TM_CMD_WMI_FTM: + case ATH_TM_CMD_WMI_FTM: return ath11k_tm_cmd_wmi_ftm(ar, tb); default: return -EOPNOTSUPP; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/testmode.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/testmode.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/testmode.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/testmode.h 2025-09-25 17:40:34.131360105 +0200 @@ -12,6 +12,7 @@ int ath11k_tm_cmd(struct ieee80211_hw *hw, struct ieee80211_vif *vif, void *data, int len); +void ath11k_fwlog_write(struct ath11k_base *ab, u8 *data, int len); #else static inline void ath11k_tm_wmi_event(struct ath11k_base *ab, u32 cmd_id, @@ -26,4 +27,9 @@ return 0; } +static inline void ath11k_fwlog_write(struct ath11k_base *ab, u8 *data, + int len) +{ + +} #endif diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/testmode_i.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/testmode_i.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/testmode_i.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/testmode_i.h 2025-09-25 17:40:34.131360105 +0200 @@ -1,66 +1,69 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* - * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2018-2021 The Linux Foundation. All rights reserved. + * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved. */ -/* "API" level of the ath11k testmode interface. Bump it after every +/* "API" level of the ath testmode interface. Bump it after every * incompatible interface change. */ -#define ATH11K_TESTMODE_VERSION_MAJOR 1 +#define ATH_TESTMODE_VERSION_MAJOR 1 /* Bump this after every _compatible_ interface change, for example * addition of a new command or an attribute. */ -#define ATH11K_TESTMODE_VERSION_MINOR 1 +#define ATH_TESTMODE_VERSION_MINOR 0 -#define ATH11K_TM_DATA_MAX_LEN 5000 -#define ATH11K_FTM_EVENT_MAX_BUF_LENGTH 2048 +#define ATH_TM_DATA_MAX_LEN 5000 +#define ATH_FTM_EVENT_MAX_BUF_LENGTH 2048 -enum ath11k_tm_attr { - __ATH11K_TM_ATTR_INVALID = 0, - ATH11K_TM_ATTR_CMD = 1, - ATH11K_TM_ATTR_DATA = 2, - ATH11K_TM_ATTR_WMI_CMDID = 3, - ATH11K_TM_ATTR_VERSION_MAJOR = 4, - ATH11K_TM_ATTR_VERSION_MINOR = 5, - ATH11K_TM_ATTR_WMI_OP_VERSION = 6, +#define ATH_FTM_FWLOG_MAX_LEN 2048 + +enum ath_tm_attr { + __ATH_TM_ATTR_INVALID = 0, + ATH_TM_ATTR_CMD = 1, + ATH_TM_ATTR_DATA = 2, + ATH_TM_ATTR_WMI_CMDID = 3, + ATH_TM_ATTR_VERSION_MAJOR = 4, + ATH_TM_ATTR_VERSION_MINOR = 5, + ATH_TM_ATTR_WMI_OP_VERSION = 6, + ATH_TM_ATTR_FWLOG = 7, + ATH_TM_ATTR_DUAL_MAC = 9, /* keep last */ - __ATH11K_TM_ATTR_AFTER_LAST, - ATH11K_TM_ATTR_MAX = __ATH11K_TM_ATTR_AFTER_LAST - 1, + __ATH_TM_ATTR_AFTER_LAST, + ATH_TM_ATTR_MAX = __ATH_TM_ATTR_AFTER_LAST - 1, }; -/* All ath11k testmode interface commands specified in - * ATH11K_TM_ATTR_CMD +/* All ath testmode interface commands specified in + * ATH_TM_ATTR_CMD */ -enum ath11k_tm_cmd { - /* Returns the supported ath11k testmode interface version in - * ATH11K_TM_ATTR_VERSION. Always guaranteed to work. User space +enum ath_tm_cmd { + /* Returns the supported ath testmode interface version in + * ATH_TM_ATTR_VERSION. Always guaranteed to work. User space * uses this to verify it's using the correct version of the * testmode interface */ - ATH11K_TM_CMD_GET_VERSION = 0, + ATH_TM_CMD_GET_VERSION = 0, + + /* Set ar state to test mode. */ + ATH_TM_CMD_TESTMODE_START = 1, + + /* Set ar state back into OFF state. */ + ATH_TM_CMD_TESTMODE_STOP = 2, /* The command used to transmit a WMI command to the firmware and * the event to receive WMI events from the firmware. Without * struct wmi_cmd_hdr header, only the WMI payload. Command id is - * provided with ATH11K_TM_ATTR_WMI_CMDID and payload in - * ATH11K_TM_ATTR_DATA. - */ - ATH11K_TM_CMD_WMI = 1, - - /* Boots the UTF firmware, the netdev interface must be down at the - * time. + * provided with ATH_TM_ATTR_WMI_CMDID and payload in + * ATH_TM_ATTR_DATA. */ - ATH11K_TM_CMD_TESTMODE_START = 2, + ATH_TM_CMD_WMI = 3, /* The command used to transmit a FTM WMI command to the firmware * and the event to receive WMI events from the firmware. The data - * received only contain the payload, need to add the tlv header - * and send the cmd to firmware with command id WMI_PDEV_UTF_CMDID. - * The data payload size could be large and the driver needs to - * send segmented data to firmware. + * received only contain the payload. Need to add the tlv + * header and send the cmd to fw with commandid WMI_PDEV_UTF_CMDID. */ - ATH11K_TM_CMD_WMI_FTM = 3, + ATH_TM_CMD_WMI_FTM = 4, }; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/thermal.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/thermal.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/thermal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/thermal.h 2025-09-25 17:40:34.131360105 +0200 @@ -12,7 +12,7 @@ #define ATH11K_THERMAL_THROTTLE_MAX 100 #define ATH11K_THERMAL_DEFAULT_DUTY_CYCLE 100 #define ATH11K_HWMON_NAME_LEN 15 -#define ATH11K_THERMAL_SYNC_TIMEOUT_HZ (5 * HZ) +#define ATH11K_THERMAL_SYNC_TIMEOUT_HZ (HZ / 10) struct ath11k_thermal { struct thermal_cooling_device *cdev; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/wmi.c linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/wmi.c --- linux-6.13.12/drivers/net/wireless/ath/ath11k/wmi.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/wmi.c 2025-09-29 14:23:07.601732390 +0200 @@ -1,7 +1,7 @@ // SPDX-License-Identifier: BSD-3-Clause-Clear /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #include #include @@ -1854,7 +1854,6 @@ tlv = (struct wmi_tlv *)(skb->data + sizeof(*cmd)); tlv->header = FIELD_PREP(WMI_TLV_TAG, WMI_TAG_ARRAY_BYTE) | FIELD_PREP(WMI_TLV_LEN, key_len_aligned); - if (arg->key_data) memcpy(tlv->value, (u8 *)arg->key_data, key_len_aligned); ret = ath11k_wmi_cmd_send(wmi, skb, WMI_VDEV_INSTALL_KEY_CMDID); @@ -2662,7 +2661,8 @@ } int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id, - struct wmi_wmm_params_all_arg *param) + struct wmi_wmm_params_all_arg *param, + enum wmi_wmm_params_type wmm_param_type) { struct ath11k_pdev_wmi *wmi = ar->wmi; struct wmi_vdev_set_wmm_params_cmd *cmd; @@ -2681,7 +2681,7 @@ FIELD_PREP(WMI_TLV_LEN, sizeof(*cmd) - TLV_HDR_SIZE); cmd->vdev_id = vdev_id; - cmd->wmm_param_type = 0; + cmd->wmm_param_type = wmm_param_type; for (ac = 0; ac < WME_NUM_AC; ac++) { switch (ac) { @@ -2714,8 +2714,8 @@ wmm_param->no_ack = wmi_wmm_arg->no_ack; ath11k_dbg(ar->ab, ATH11K_DBG_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 set type %d ac %d aifs %d cwmin %d cwmax %d txop %d acm %d no_ack %d\n", + wmm_param_type, ac, wmm_param->aifs, wmm_param->cwmin, wmm_param->cwmax, wmm_param->txoplimit, wmm_param->acm, wmm_param->no_ack); } @@ -8013,12 +8013,14 @@ survey->noise = 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); @@ -8529,15 +8531,6 @@ complete(&ab->wow.wakeup_completed); } -static void -ath11k_wmi_diag_event(struct ath11k_base *ab, - struct sk_buff *skb) -{ - ath11k_dbg(ab, ATH11K_DBG_WMI, "event diag"); - - trace_ath11k_wmi_diag(ab, skb->data, skb->len); -} - static const char *ath11k_wmi_twt_add_dialog_event_status(u32 status) { switch (status) { @@ -8705,6 +8698,29 @@ kfree(tb); } +static void ath11k_wmi_diag_event(struct ath11k_base *ab, struct sk_buff *skb) +{ + const struct wmi_tlv *tlv; + u16 tlv_tag, tlv_len; + uint32_t *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; + } else { + ath11k_warn(ab, "WMI Diag Event missing required tlv\n"); + return; + } + + ath11k_fwlog_write(ab,data, tlv_len); +} + static void ath11k_wmi_tlv_op_rx(struct ath11k_base *ab, struct sk_buff *skb) { struct wmi_cmd_hdr *cmd_hdr; diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath11k/wmi.h linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/wmi.h --- linux-6.13.12/drivers/net/wireless/ath/ath11k/wmi.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath11k/wmi.h 2025-09-29 14:23:07.605732410 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause-Clear */ /* * Copyright (c) 2018-2019 The Linux Foundation. All rights reserved. - * Copyright (c) 2021-2024 Qualcomm Innovation Center, Inc. All rights reserved. + * Copyright (c) 2021-2025 Qualcomm Innovation Center, Inc. All rights reserved. */ #ifndef ATH11K_WMI_H @@ -2122,6 +2122,7 @@ WMI_TLV_SERVICE_FREQINFO_IN_METADATA = 219, WMI_TLV_SERVICE_EXT2_MSG = 220, WMI_TLV_SERVICE_PEER_POWER_SAVE_DURATION_SUPPORT = 246, + WMI_TLV_SERVICE_5_DOT_9GHZ_SUPPORT = 247, WMI_TLV_SERVICE_SRG_SRP_SPATIAL_REUSE_SUPPORT = 249, WMI_TLV_SERVICE_MBSS_PARAM_IN_VDEV_START_SUPPORT = 253, WMI_TLV_SERVICE_PASSIVE_SCAN_START_TIME_ENHANCE = 263, @@ -3817,6 +3818,7 @@ }; struct scan_chan_list_params { + struct list_head list; u32 pdev_id; u16 nallchans; struct channel_param ch_param[]; @@ -6346,6 +6348,11 @@ #define WMI_STA_KEEPALIVE_INTERVAL_DEFAULT 30 #define WMI_STA_KEEPALIVE_INTERVAL_DISABLE 0 +enum wmi_wmm_params_type { + WMI_WMM_PARAM_TYPE_LEGACY = 0, + WMI_WMM_PARAM_TYPE_11AX_MU_EDCA = 1, +}; + const void **ath11k_wmi_tlv_parse_alloc(struct ath11k_base *ab, struct sk_buff *skb, gfp_t gfp); int ath11k_wmi_cmd_send(struct ath11k_pdev_wmi *wmi, struct sk_buff *skb, @@ -6402,7 +6409,8 @@ int ath11k_wmi_send_scan_stop_cmd(struct ath11k *ar, struct scan_cancel_param *param); int ath11k_wmi_send_wmm_update_cmd_tlv(struct ath11k *ar, u32 vdev_id, - struct wmi_wmm_params_all_arg *param); + struct wmi_wmm_params_all_arg *param, + enum wmi_wmm_params_type wmm_param_type); int ath11k_wmi_pdev_suspend(struct ath11k *ar, u32 suspend_opt, u32 pdev_id); int ath11k_wmi_pdev_resume(struct ath11k *ar, u32 pdev_id); diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath12k/Kconfig linux-6.13.12-fbx/drivers/net/wireless/ath/ath12k/Kconfig --- linux-6.13.12/drivers/net/wireless/ath/ath12k/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath12k/Kconfig 2025-09-29 14:23:07.605732410 +0200 @@ -52,3 +52,35 @@ If unsure, say Y to make it easier to debug problems. But if dump collection not required choose N. + +choice + prompt "Memory profile" + depends on ATH12K + default ATH12K_MEM_PROFILE_DEFAULT + help + Allows to select the memory profile + + By enabling this option, can choose between different memory + profiles, such as the default profile or a 512 MB profile. + +config ATH12K_MEM_PROFILE_DEFAULT + bool "ath12k default memory profile" + depends on ATH12K + help + Enables the default memory profile + + This profile is recommended when memory is not constraint or + if unsure which profile to choose. + +config ATH12K_MEM_PROFILE_512M + bool "ath12k enable 512MB memory profile" + depends on ATH12K + help + Enables the 512MB memory profile + + Selecting this option reduces memory allocation to the firmware, + decreases the number of transmit and receive descriptors, and + limits the monitor ring and the number of virtual devices + (vdevs). + +endchoice diff -ruw linux-6.13.12/drivers/net/wireless/ath/ath12k/Makefile linux-6.13.12-fbx/drivers/net/wireless/ath/ath12k/Makefile --- linux-6.13.12/drivers/net/wireless/ath/ath12k/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/ath12k/Makefile 2025-09-25 17:40:34.135360125 +0200 @@ -23,11 +23,13 @@ fw.o \ p2p.o -ath12k-$(CONFIG_ATH12K_DEBUGFS) += debugfs.o debugfs_htt_stats.o +ath12k-$(CONFIG_ATH12K_DEBUGFS) += debugfs.o debugfs_htt_stats.o debugfs_sta.o ath12k-$(CONFIG_ACPI) += acpi.o ath12k-$(CONFIG_ATH12K_TRACING) += trace.o ath12k-$(CONFIG_PM) += wow.o ath12k-$(CONFIG_ATH12K_COREDUMP) += coredump.o +ath12k-$(CONFIG_NL80211_TESTMODE) += testmode.o +ath12k-$(CONFIG_THERMAL) += thermal.o # for tracing framework to find trace.h CFLAGS_trace.o := -I$(src) diff -ruw linux-6.13.12/drivers/net/wireless/ath/dfs_pattern_detector.c linux-6.13.12-fbx/drivers/net/wireless/ath/dfs_pattern_detector.c --- linux-6.13.12/drivers/net/wireless/ath/dfs_pattern_detector.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/dfs_pattern_detector.c 2025-09-25 17:40:34.191360403 +0200 @@ -270,6 +270,7 @@ { u32 i; struct channel_detector *cd; + int diff_ts; /* * pulses received for a non-supported or un-initialized @@ -282,8 +283,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.13.12/drivers/net/wireless/ath/dfs_pattern_detector.h linux-6.13.12-fbx/drivers/net/wireless/ath/dfs_pattern_detector.h --- linux-6.13.12/drivers/net/wireless/ath/dfs_pattern_detector.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/dfs_pattern_detector.h 2025-09-25 17:40:34.191360403 +0200 @@ -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.13.12/drivers/net/wireless/ath/key.c linux-6.13.12-fbx/drivers/net/wireless/ath/key.c --- linux-6.13.12/drivers/net/wireless/ath/key.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/key.c 2025-09-25 17:40:34.191360403 +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.13.12/drivers/net/wireless/ath/regd.c linux-6.13.12-fbx/drivers/net/wireless/ath/regd.c --- linux-6.13.12/drivers/net/wireless/ath/regd.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/ath/regd.c 2025-09-25 17:40:34.191360403 +0200 @@ -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.13.12/drivers/net/wireless/marvell/Kconfig linux-6.13.12-fbx/drivers/net/wireless/marvell/Kconfig --- linux-6.13.12/drivers/net/wireless/marvell/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/marvell/Kconfig 2025-09-29 14:23:07.613732450 +0200 @@ -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.13.12/drivers/net/wireless/marvell/Makefile linux-6.13.12-fbx/drivers/net/wireless/marvell/Makefile --- linux-6.13.12/drivers/net/wireless/marvell/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/net/wireless/marvell/Makefile 2025-09-25 17:40:34.287360879 +0200 @@ -5,3 +5,4 @@ obj-$(CONFIG_MWIFIEX) += mwifiex/ obj-$(CONFIG_MWL8K) += mwl8k.o +obj-$(CONFIG_MWL8K_NEW) += mwl8k_new/ diff -ruw linux-6.13.12/drivers/nvmem/Kconfig linux-6.13.12-fbx/drivers/nvmem/Kconfig --- linux-6.13.12/drivers/nvmem/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/nvmem/Kconfig 2025-09-25 17:40:34.499361930 +0200 @@ -61,6 +61,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 @@ -267,6 +270,12 @@ This driver can also be built as a module. If so, the module will be called nvmem-rmem. +config NVMEM_IOMAP + tristate "I/O mapped NVMEM support" + depends on HAS_IOMEM + help + This driver supports NVMEM that can be accessed using I/O mapping. + config NVMEM_ROCKCHIP_EFUSE tristate "Rockchip eFuse Support" depends on ARCH_ROCKCHIP || COMPILE_TEST @@ -428,4 +437,8 @@ This driver can also be built as a module. If so, the module will be called nvmem_qoriq_efuse. +config NVMEM_CORTINA_OTP + tristate "Cortina OTP support." + depends on ARCH_CORTINA + endif diff -ruw linux-6.13.12/drivers/nvmem/Makefile linux-6.13.12-fbx/drivers/nvmem/Makefile --- linux-6.13.12/drivers/nvmem/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/nvmem/Makefile 2025-09-25 17:40:34.499361930 +0200 @@ -56,6 +56,8 @@ nvmem-rcar-efuse-y := rcar-efuse.o obj-$(CONFIG_NVMEM_RMEM) += nvmem-rmem.o nvmem-rmem-y := rmem.o +obj-$(CONFIG_NVMEM_IOMAP) += nvmem_iomap.o +nvmem_iomap-y := iomap.o obj-$(CONFIG_NVMEM_ROCKCHIP_EFUSE) += nvmem_rockchip_efuse.o nvmem_rockchip_efuse-y := rockchip-efuse.o obj-$(CONFIG_NVMEM_ROCKCHIP_OTP) += nvmem-rockchip-otp.o @@ -85,3 +87,7 @@ nvmem_zynqmp_nvmem-y := zynqmp_nvmem.o obj-$(CONFIG_NVMEM_QORIQ_EFUSE) += nvmem-qoriq-efuse.o nvmem-qoriq-efuse-y := qoriq-efuse.o + +# when in Rome ... +obj-$(CONFIG_NVMEM_CORTINA_OTP) += nvmem-cortina-otp.o +nvmem-cortina-otp-y := cortina-otp.o diff -ruw linux-6.13.12/drivers/nvmem/core.c linux-6.13.12-fbx/drivers/nvmem/core.c --- linux-6.13.12/drivers/nvmem/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/nvmem/core.c 2025-09-25 17:40:34.499361930 +0200 @@ -996,8 +996,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.13.12/drivers/of/Kconfig linux-6.13.12-fbx/drivers/of/Kconfig --- linux-6.13.12/drivers/of/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/of/Kconfig 2025-09-25 17:40:34.503361950 +0200 @@ -61,6 +61,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 @@ -126,4 +131,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.13.12/drivers/of/Makefile linux-6.13.12-fbx/drivers/of/Makefile --- linux-6.13.12/drivers/of/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/of/Makefile 2025-09-25 17:40:34.503361950 +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 empty_root.dtb.o obj-$(CONFIG_OF_EARLY_FLATTREE) += fdt_address.o diff -ruw linux-6.13.12/drivers/of/fdt.c linux-6.13.12-fbx/drivers/of/fdt.c --- linux-6.13.12/drivers/of/fdt.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/of/fdt.c 2025-09-25 17:40:34.503361950 +0200 @@ -28,6 +28,7 @@ #include /* for COMMAND_LINE_SIZE */ #include +#include #include "of_private.h" @@ -651,6 +652,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.13.12/drivers/of/overlay.c linux-6.13.12-fbx/drivers/of/overlay.c --- linux-6.13.12/drivers/of/overlay.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/of/overlay.c 2025-09-25 17:40:34.503361950 +0200 @@ -357,7 +357,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.13.12/drivers/pci/controller/Kconfig linux-6.13.12-fbx/drivers/pci/controller/Kconfig --- linux-6.13.12/drivers/pci/controller/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/Kconfig 2025-09-25 17:40:34.511361990 +0200 @@ -207,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.13.12/drivers/pci/controller/Makefile linux-6.13.12-fbx/drivers/pci/controller/Makefile --- linux-6.13.12/drivers/pci/controller/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/Makefile 2025-09-25 17:40:34.511361990 +0200 @@ -33,6 +33,7 @@ obj-$(CONFIG_PCIE_ROCKCHIP_HOST) += pcie-rockchip-host.o obj-$(CONFIG_PCIE_MEDIATEK) += pcie-mediatek.o obj-$(CONFIG_PCIE_MEDIATEK_GEN3) += pcie-mediatek-gen3.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.13.12/drivers/pci/controller/dwc/Kconfig linux-6.13.12-fbx/drivers/pci/controller/dwc/Kconfig --- linux-6.13.12/drivers/pci/controller/dwc/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/dwc/Kconfig 2025-09-25 17:40:34.515362010 +0200 @@ -70,6 +70,16 @@ Enables support for the PCIe controller in the Baikal-T1 SoC to work in host mode. It's based on the Synopsys DWC PCIe v4.60a IP-core. +config PCIE_CORTINA + tristate "Cortina Access PCIe controller" + depends on ARCH_CORTINA_ACCESS || COMPILE_TEST + depends on PCI_MSI + select PCIE_DW_HOST + select PCI_MSI_ARCH_FALLBACKS + help + Say Y here if you want PCIE controller support on Cortina Access + SoCs + config PCI_IMX6 bool diff -ruw linux-6.13.12/drivers/pci/controller/dwc/Makefile linux-6.13.12-fbx/drivers/pci/controller/dwc/Makefile --- linux-6.13.12/drivers/pci/controller/dwc/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/dwc/Makefile 2025-09-25 17:40:34.515362010 +0200 @@ -4,6 +4,7 @@ obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o obj-$(CONFIG_PCIE_BT1) += pcie-bt1.o +obj-$(CONFIG_PCIE_CORTINA) += pcie-cortina.o obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o obj-$(CONFIG_PCIE_FU740) += pcie-fu740.o @@ -16,7 +17,6 @@ obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o obj-$(CONFIG_PCIE_QCOM_EP) += pcie-qcom-ep.o obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o -obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o obj-$(CONFIG_PCIE_ROCKCHIP_DW) += pcie-dw-rockchip.o obj-$(CONFIG_PCIE_INTEL_GW) += pcie-intel-gw.o obj-$(CONFIG_PCIE_KEEMBAY) += pcie-keembay.o diff -ruw linux-6.13.12/drivers/pci/controller/dwc/pcie-armada8k.c linux-6.13.12-fbx/drivers/pci/controller/dwc/pcie-armada8k.c --- linux-6.13.12/drivers/pci/controller/dwc/pcie-armada8k.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/dwc/pcie-armada8k.c 2025-09-25 17:40:34.515362010 +0200 @@ -21,9 +21,12 @@ #include #include #include +#include #include "pcie-designware.h" +#include "../../pci.h" + #define ARMADA8K_PCIE_MAX_LANES PCIE_LNK_X4 struct armada8k_pcie { @@ -32,6 +35,7 @@ struct clk *clk_reg; struct phy *phy[ARMADA8K_PCIE_MAX_LANES]; unsigned int phy_count; + struct gpio_descs *reset_gpios; }; #define PCIE_VENDOR_REGS_OFFSET 0x8000 @@ -153,15 +157,75 @@ return 0; } +static void armada8k_pcie_reset_port(struct dw_pcie *pci) +{ + struct armada8k_pcie *pcie = to_armada8k_pcie(pci); + + /* + * Power up a PCIe port. PCIe requires the refclk to be + * stable for 100µs + * + * prior to releasing PERST. See table 2-4 in section 2.6.2 + * AC Specifications + * + * of the PCI Express Card Electromechanical Specification, 1.1. + */ + if (pcie->reset_gpios) { + struct gpio_descs *reset_gpios = pcie->reset_gpios; + u32 reset_udelay = PCI_PM_D3COLD_WAIT * 1000; + int i; + unsigned long values; + + dev_info(pci->dev, "using %u gpio(s) to reset bus", + reset_gpios->ndescs); + + /* + * explicitely assert reset. + */ + for (i = 0; i < reset_gpios->ndescs; i++) + __clear_bit(i, &values); + + gpiod_set_array_value_cansleep(reset_gpios->ndescs, + reset_gpios->desc, + NULL, + &values); + + udelay(150); + + /* + * deassert reset. + */ + for (i = 0; i < reset_gpios->ndescs; i++) + __set_bit(i, &values); + + gpiod_set_array_value_cansleep(reset_gpios->ndescs, + reset_gpios->desc, + NULL, + &values); + + msleep(reset_udelay / 1000); + } +} + static int armada8k_pcie_start_link(struct dw_pcie *pci) { u32 reg; + armada8k_pcie_reset_port(pci); + /* Start LTSSM */ reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_CONTROL_REG); reg |= PCIE_APP_LTSSM_EN; dw_pcie_writel_dbi(pci, PCIE_GLOBAL_CONTROL_REG, reg); + if (dw_pcie_wait_for_link(pci)) { + dev_err(pci->dev, "Link not up after reconfiguration. " + "trying port reset\n"); + armada8k_pcie_reset_port(pci); + if (dw_pcie_wait_for_link(pci)) + dev_err(pci->dev, "Link not up after reset.\n"); + } + return 0; } @@ -284,6 +348,23 @@ pcie->pci = pci; + /* get reset gpios */ + pcie->reset_gpios = devm_gpiod_get_array_optional(dev, + "reset", + GPIOD_OUT_LOW); + if (IS_ERR(pcie->reset_gpios)) { + ret = PTR_ERR(pcie->reset_gpios); + dev_err(dev, "failed to parse reset-gpios property: %d\n", ret); + return ret; + } + + if (pcie->reset_gpios->ndescs > BITS_PER_LONG) { + dev_err(dev, "too may reset GPIOs given (%d), max %d is " + "supported.\n", pcie->reset_gpios->ndescs, + BITS_PER_LONG); + return -EINVAL; + } + pcie->clk = devm_clk_get(dev, NULL); if (IS_ERR(pcie->clk)) return PTR_ERR(pcie->clk); diff -ruw linux-6.13.12/drivers/pci/controller/dwc/pcie-designware-host.c linux-6.13.12-fbx/drivers/pci/controller/dwc/pcie-designware-host.c --- linux-6.13.12/drivers/pci/controller/dwc/pcie-designware-host.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/dwc/pcie-designware-host.c 2025-09-25 17:40:34.515362010 +0200 @@ -531,7 +531,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.13.12/drivers/pci/controller/dwc/pcie-designware.h linux-6.13.12-fbx/drivers/pci/controller/dwc/pcie-designware.h --- linux-6.13.12/drivers/pci/controller/dwc/pcie-designware.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/controller/dwc/pcie-designware.h 2025-09-25 17:40:34.519362029 +0200 @@ -431,6 +431,7 @@ size_t size, u32 val); int (*link_up)(struct dw_pcie *pcie); enum dw_pcie_ltssm (*get_ltssm)(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.13.12/drivers/pci/pci-sysfs.c linux-6.13.12-fbx/drivers/pci/pci-sysfs.c --- linux-6.13.12/drivers/pci/pci-sysfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/pci-sysfs.c 2025-09-25 17:40:34.543362148 +0200 @@ -1172,6 +1172,7 @@ { int i; + mutex_lock(&pdev->sysfs_init_lock); for (i = 0; i < PCI_STD_NUM_BARS; i++) { struct bin_attribute *res_attr; @@ -1187,6 +1188,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) @@ -1256,6 +1260,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++) { @@ -1269,10 +1279,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.13.12/drivers/pci/pcie/portdrv.c linux-6.13.12-fbx/drivers/pci/pcie/portdrv.c --- linux-6.13.12/drivers/pci/pcie/portdrv.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/pcie/portdrv.c 2025-09-25 17:40:34.547362168 +0200 @@ -19,9 +19,13 @@ #include #include +#include + #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 @@ -115,16 +119,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; } @@ -144,9 +153,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 | @@ -673,6 +686,13 @@ #define PCIE_PORTDRV_PM_OPS NULL #endif /* !PM */ +static inline bool __pci_dev_support_hwmon_pericom(const struct pci_dev *dev) +{ + return pci_pcie_type(dev) == PCI_EXP_TYPE_UPSTREAM && + dev->vendor == PCI_VENDOR_ID_PERICOM && + dev->device == 0xc008; +} + /* * pcie_portdrv_probe - Probe PCI-Express port devices * @dev: PCI-Express port device being probed @@ -719,6 +739,9 @@ pm_runtime_allow(&dev->dev); } + if (__pci_dev_support_hwmon_pericom(dev)) + return hwmon_pericom_pcie_probe(dev); + return 0; } @@ -730,6 +753,7 @@ pm_runtime_dont_use_autosuspend(&dev->dev); } + hwmon_pericom_pcie_remove(dev); pcie_port_device_remove(dev); pci_disable_device(dev); @@ -743,6 +767,7 @@ pm_runtime_dont_use_autosuspend(&dev->dev); } + hwmon_pericom_pcie_remove(dev); pcie_port_device_remove(dev); } diff -ruw linux-6.13.12/drivers/pci/probe.c linux-6.13.12-fbx/drivers/pci/probe.c --- linux-6.13.12/drivers/pci/probe.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/probe.c 2025-09-25 17:40:34.547362168 +0200 @@ -2359,6 +2359,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) { @@ -3333,6 +3334,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 @@ -3348,6 +3377,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.13.12/drivers/pci/quirks.c linux-6.13.12-fbx/drivers/pci/quirks.c --- linux-6.13.12/drivers/pci/quirks.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pci/quirks.c 2025-09-25 17:40:34.551362188 +0200 @@ -3269,6 +3269,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.13.12/drivers/phy/Kconfig linux-6.13.12-fbx/drivers/phy/Kconfig --- linux-6.13.12/drivers/phy/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/Kconfig 2025-09-25 17:40:34.567362267 +0200 @@ -25,6 +25,14 @@ Provides a number of helpers a core functions for MIPI D-PHY drivers to us. +config PHY_CORTINA_ACCESS + tristate "Cortina Access PHY driver" + depends on OF && (ARCH_CORTINA || COMPILE_TEST) + select GENERIC_PHY + help + Enable this to support the Cortina Access PHY. + If unsure, say N. + config PHY_LPC18XX_USB_OTG tristate "NXP LPC18xx/43xx SoC USB OTG PHY driver" depends on OF && (ARCH_LPC18XX || COMPILE_TEST) @@ -93,6 +101,10 @@ schemes. It supports all three USB 2.0 data rates: Low Speed, Full Speed and High Speed. +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.13.12/drivers/phy/Makefile linux-6.13.12-fbx/drivers/phy/Makefile --- linux-6.13.12/drivers/phy/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/Makefile 2025-09-25 17:40:34.567362267 +0200 @@ -6,12 +6,15 @@ obj-$(CONFIG_GENERIC_PHY) += phy-core.o obj-$(CONFIG_GENERIC_PHY_MIPI_DPHY) += phy-core-mipi-dphy.o obj-$(CONFIG_PHY_CAN_TRANSCEIVER) += phy-can-transceiver.o +obj-$(CONFIG_PHY_CORTINA_ACCESS) += phy-cortina.o obj-$(CONFIG_PHY_LPC18XX_USB_OTG) += phy-lpc18xx-usb-otg.o 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_PHY_AIROHA_PCIE) += phy-airoha-pcie.o obj-$(CONFIG_PHY_NXP_PTN3222) += phy-nxp-ptn3222.o +obj-$(CONFIG_XDSL_PHY_API) += xdsl_phy_api.o + obj-y += allwinner/ \ amlogic/ \ broadcom/ \ diff -ruw linux-6.13.12/drivers/phy/broadcom/Kconfig linux-6.13.12-fbx/drivers/phy/broadcom/Kconfig --- linux-6.13.12/drivers/phy/broadcom/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/broadcom/Kconfig 2025-09-25 17:40:34.567362267 +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.13.12/drivers/phy/broadcom/Makefile linux-6.13.12-fbx/drivers/phy/broadcom/Makefile --- linux-6.13.12/drivers/phy/broadcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/broadcom/Makefile 2025-09-25 17:40:34.567362267 +0200 @@ -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.13.12/drivers/phy/marvell/Kconfig linux-6.13.12-fbx/drivers/phy/marvell/Kconfig --- linux-6.13.12/drivers/phy/marvell/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/marvell/Kconfig 2025-09-25 17:40:34.571362287 +0200 @@ -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.13.12/drivers/phy/marvell/Makefile linux-6.13.12-fbx/drivers/phy/marvell/Makefile --- linux-6.13.12/drivers/phy/marvell/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/marvell/Makefile 2025-09-25 17:40:34.571362287 +0200 @@ -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.13.12/drivers/phy/marvell/phy-mvebu-cp110-comphy.c linux-6.13.12-fbx/drivers/phy/marvell/phy-mvebu-cp110-comphy.c --- linux-6.13.12/drivers/phy/marvell/phy-mvebu-cp110-comphy.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/phy/marvell/phy-mvebu-cp110-comphy.c 2025-09-25 17:40:34.571362287 +0200 @@ -16,6 +16,7 @@ #include #include #include +#include /* Relative to priv->base */ #define MVEBU_COMPHY_SERDES_CFG0(n) (0x0 + (n) * 0x1000) @@ -33,6 +34,7 @@ #define MVEBU_COMPHY_SERDES_CFG1_RF_RESET BIT(6) #define MVEBU_COMPHY_SERDES_CFG2(n) (0x8 + (n) * 0x1000) #define MVEBU_COMPHY_SERDES_CFG2_DFE_EN BIT(4) +#define MVEBU_COMPHY_SERDES_CFG2_SSC_EN BIT(7) #define MVEBU_COMPHY_SERDES_STATUS0(n) (0x18 + (n) * 0x1000) #define MVEBU_COMPHY_SERDES_STATUS0_TX_PLL_RDY BIT(2) #define MVEBU_COMPHY_SERDES_STATUS0_RX_PLL_RDY BIT(3) @@ -50,7 +52,9 @@ #define MVEBU_COMPHY_COEF_DFE_CTRL BIT(15) #define MVEBU_COMPHY_GEN1_S0(n) (0x834 + (n) * 0x1000) #define MVEBU_COMPHY_GEN1_S0_TX_AMP(n) ((n) << 1) +#define MVEBU_COMPHY_GEN1_S0_TX_AMP_ADJ BIT(6) #define MVEBU_COMPHY_GEN1_S0_TX_EMPH(n) ((n) << 7) +#define MVEBU_COMPHY_GEN1_S0_TX_EMPH_EN BIT(11) #define MVEBU_COMPHY_GEN1_S1(n) (0x838 + (n) * 0x1000) #define MVEBU_COMPHY_GEN1_S1_RX_MUL_PI(n) ((n) << 0) #define MVEBU_COMPHY_GEN1_S1_RX_MUL_PF(n) ((n) << 3) @@ -58,21 +62,66 @@ #define MVEBU_COMPHY_GEN1_S1_RX_MUL_FF(n) ((n) << 8) #define MVEBU_COMPHY_GEN1_S1_RX_DFE_EN BIT(10) #define MVEBU_COMPHY_GEN1_S1_RX_DIV(n) ((n) << 11) +#define MVEBU_COMPHY_GEN2_S0(n) (0x83c + (n) * 0x1000) +#define MVEBU_COMPHY_GEN2_S0_TX_AMP(n) ((n) << 1) +#define MVEBU_COMPHY_GEN2_S0_TX_AMP_ADJ BIT(6) +#define MVEBU_COMPHY_GEN2_S0_TX_EMPH(n) ((n) << 7) +#define MVEBU_COMPHY_GEN2_S0_TX_EMPH_EN BIT(11) +#define MVEBU_COMPHY_GEN2_S1(n) (0x840 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN2_S1_RX_MUL_PI(n) ((n) << 0) +#define MVEBU_COMPHY_GEN2_S1_RX_MUL_PF(n) ((n) << 3) +#define MVEBU_COMPHY_GEN2_S1_RX_MUL_FI(n) ((n) << 6) +#define MVEBU_COMPHY_GEN2_S1_RX_MUL_FF(n) ((n) << 8) +#define MVEBU_COMPHY_GEN2_S1_RX_DFE_EN BIT(10) +#define MVEBU_COMPHY_GEN2_S1_RX_DIV(n) ((n) << 11) +#define MVEBU_COMPHY_GEN3_S0(n) (0x844 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN3_S0_TX_AMP(n) ((n) << 1) +#define MVEBU_COMPHY_GEN3_S0_TX_AMP_ADJ BIT(6) +#define MVEBU_COMPHY_GEN3_S0_TX_EMPH(n) ((n) << 7) +#define MVEBU_COMPHY_GEN3_S0_TX_EMPH_EN BIT(11) +#define MVEBU_COMPHY_GEN3_S0_TX_SLEW_RATE_SEL(n) ((n) << 12) +#define MVEBU_COMPHY_GEN3_S0_TX_SLEW_CTRL_EN BIT(15) +#define MVEBU_COMPHY_GEN3_S1(n) (0x848 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN3_S1_RX_MUL_PI(n) ((n) << 0) +#define MVEBU_COMPHY_GEN3_S1_RX_MUL_PF(n) ((n) << 3) +#define MVEBU_COMPHY_GEN3_S1_RX_MUL_FI(n) ((n) << 6) +#define MVEBU_COMPHY_GEN3_S1_RX_MUL_FF(n) ((n) << 8) +#define MVEBU_COMPHY_GEN3_S1_RX_DFE_EN BIT(10) +#define MVEBU_COMPHY_GEN3_S1_RX_DIV(n) ((n) << 11) +#define MVEBU_COMPHY_GEN3_S1_SMPL_INPX2_EN BIT(13) #define MVEBU_COMPHY_GEN1_S2(n) (0x8f4 + (n) * 0x1000) #define MVEBU_COMPHY_GEN1_S2_TX_EMPH(n) ((n) << 0) #define MVEBU_COMPHY_GEN1_S2_TX_EMPH_EN BIT(4) #define MVEBU_COMPHY_LOOPBACK(n) (0x88c + (n) * 0x1000) #define MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH(n) ((n) << 1) +#define MVEBU_COMPHY_SYNC_PATTERN(n) (0x890 + (n) * 0x1000) +#define MVEBU_COMPHY_SYNC_PATTERN_RXD_INV BIT(11) +#define MVEBU_COMPHY_SYNC_PATTERN_TXD_INV BIT(10) +#define MVEBU_COMPHY_INTERFACE(n) (0x894 + (n) * 0x1000) +#define MVEBU_COMPHY_INTERFACE_GEN_MAX(n) ((n) << 10) +#define MVEBU_COMPHY_INTERFACE_DET_BYPASS BIT(12) +#define MVEBU_COMPHY_INTERFACE_LINK_TRAIN BIT(14) #define MVEBU_COMPHY_VDD_CAL0(n) (0x908 + (n) * 0x1000) #define MVEBU_COMPHY_VDD_CAL0_CONT_MODE BIT(15) #define MVEBU_COMPHY_EXT_SELV(n) (0x914 + (n) * 0x1000) #define MVEBU_COMPHY_EXT_SELV_RX_SAMPL(n) ((n) << 5) +#define MVEBU_COMPHY_PCIE_REG0(n) (0x920 + (n) * 0x1000) +#define MVEBU_COMPHY_PCIE_REG0_IDLE_SYNC BIT(12) +#define MVEBU_COMPHY_PCIE_REG0_SEL_BITS(n) ((n) << 13) +#define MVEBU_COMPHY_LANE_ALIGN(n) (0x924 + (n) * 0x1000) +#define MVEBU_COMPHY_LANE_ALIGN_BIT BIT(12) #define MVEBU_COMPHY_MISC_CTRL0(n) (0x93c + (n) * 0x1000) +#define MVEBU_COMPHY_MISC_CTRL0_CLK100M_125M BIT(4) #define MVEBU_COMPHY_MISC_CTRL0_ICP_FORCE BIT(5) +#define MVEBU_COMPHY_MISC_CTRL0_TXDCLK_2X BIT(6) +#define MVEBU_COMPHY_MISC_CTRL0_CLK500M_EN BIT(7) #define MVEBU_COMPHY_MISC_CTRL0_REFCLK_SEL BIT(10) #define MVEBU_COMPHY_RX_CTRL1(n) (0x940 + (n) * 0x1000) #define MVEBU_COMPHY_RX_CTRL1_RXCLK2X_SEL BIT(11) #define MVEBU_COMPHY_RX_CTRL1_CLK8T_EN BIT(12) +#define MVEBU_COMPHY_PWR_CTR(n) (0x948 + (n) * 0x1000) +#define MVEBU_COMPHY_PWR_CTR_RST_DFE BIT(0) +#define MVEBU_COMPHY_PWR_CTR_SOFT_RST BIT(10) #define MVEBU_COMPHY_SPEED_DIV(n) (0x954 + (n) * 0x1000) #define MVEBU_COMPHY_SPEED_DIV_TX_FORCE BIT(7) #define MVEBU_SP_CALIB(n) (0x96c + (n) * 0x1000) @@ -82,7 +131,21 @@ #define MVEBU_COMPHY_TX_SLEW_RATE_EMPH(n) ((n) << 5) #define MVEBU_COMPHY_TX_SLEW_RATE_SLC(n) ((n) << 10) #define MVEBU_COMPHY_DTL_CTRL(n) (0x984 + (n) * 0x1000) +#define MVEBU_COMPHY_DTL_CTRL_DTL_DET_EN BIT(0) +#define MVEBU_COMPHY_DTL_CTRL_DTL_PLOOP_EN BIT(1) #define MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN BIT(2) +#define MVEBU_COMPHY_DTL_CTRL_DTL_CLAMP_SEL(n) ((n) << 4) +#define MVEBU_COMPHY_DTL_CTRL_DTL_INPCLK_DIV_FORCE BIT(10) +#define MVEBU_COMPHY_DTL_CTRL_DTL_CLK_MODE(n) ((n) << 12) +#define MVEBU_COMPHY_DTL_CTRL_DTL_CLK_MODE_FORCE BIT(14) +#define MVEBU_COMPHY_PHASE_CTRL(n) (0x988 + (n) * 0x1000) +#define MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF(n) ((n) << 0) +#define MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_FORCE BIT(7) +#define MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID BIT(8) +#define MVEBU_COMPHY_TX_TRAIN_CTRL(n) (0xa6c + (n) * 0x1000) +#define MVEBU_COMPHY_TX_TRAIN_CTRL_G1 BIT(0) +#define MVEBU_COMPHY_TX_TRAIN_CTRL_GN1 BIT(1) +#define MVEBU_COMPHY_TX_TRAIN_CTRL_G0 BIT(2) #define MVEBU_COMPHY_FRAME_DETECT0(n) (0xa14 + (n) * 0x1000) #define MVEBU_COMPHY_FRAME_DETECT0_PATN(n) ((n) << 7) #define MVEBU_COMPHY_FRAME_DETECT3(n) (0xa20 + (n) * 0x1000) @@ -91,24 +154,100 @@ #define MVEBU_COMPHY_DME_ETH_MODE BIT(7) #define MVEBU_COMPHY_TRAINING0(n) (0xa68 + (n) * 0x1000) #define MVEBU_COMPHY_TRAINING0_P2P_HOLD BIT(15) +#define MVEBU_COMPHY_TRAINING4(n) (0xa78 + (n) * 0x1000) +#define MVEBU_COMPHY_TRAINING4_TIMER(n) ((n) << 0) #define MVEBU_COMPHY_TRAINING5(n) (0xaa4 + (n) * 0x1000) #define MVEBU_COMPHY_TRAINING5_RX_TIMER(n) ((n) << 0) +#define MVEBU_COMPHY_TRAINING5_START_SQ_EN BIT(11) +#define MVEBU_COMPHY_TRAINING5_FRM_DET_EN BIT(12) +#define MVEBU_COMPHY_TRAINING5_FRM_LOCK_EN BIT(13) +#define MVEBU_COMPHY_TRAINING5_WAIT_TIME_EN BIT(14) #define MVEBU_COMPHY_TX_TRAIN_PRESET(n) (0xb1c + (n) * 0x1000) +#define MVEBU_COMPHY_TX_TRAIN_CHK_INIT BIT(4) +#define MVEBU_COMPHY_TX_TRAIN_COEF_FM_PIN_PCIE3 BIT(7) #define MVEBU_COMPHY_TX_TRAIN_PRESET_16B_AUTO_EN BIT(8) #define MVEBU_COMPHY_TX_TRAIN_PRESET_PRBS11 BIT(9) +#define MVEBU_COMPHY_CDR_CONTROL(n) (0xc18 + (n) * 0x1000) +#define MVEBU_COMPHY_CDR_CONTROL_RX_MAX_DFE_ADAPT_1(n) ((n) << 12) +#define MVEBU_COMPHY_CDR_CONTROL_MAX_DFE_ADAPT_0(n) ((n) << 9) +#define MVEBU_COMPHY_CDR_CONTROL_MAX_DFE_ADAPT_1(n) ((n) << 6) +#define MVEBU_COMPHY_TX_TRAINING11(n) (0xc38 + (n) * 0x1000) +#define MVEBU_COMPHY_TX_TRAINING11_CHECK_MODE BIT(6) +#define MVEBU_COMPHY_TX_TRAINING11_PRESET_NUM(n) ((n) << 10) +#define MVEBU_COMPHY_TX_TRAINING11_PRESET_EN BIT(15) #define MVEBU_COMPHY_GEN1_S3(n) (0xc40 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN1_S3_FFE_CAP_SEL(n) ((n) << 0) +#define MVEBU_COMPHY_GEN1_S3_FFE_RES_SEL(n) ((n) << 4) +#define MVEBU_COMPHY_GEN1_S3_SETTING_FORCE BIT(7) #define MVEBU_COMPHY_GEN1_S3_FBCK_SEL BIT(9) +#define MVEBU_COMPHY_GEN1_S3_FFE_DEG_RES_LVL(n) ((n) << 12) +#define MVEBU_COMPHY_GEN1_S3_FFE_LOAD_RES_LVL(n) ((n) << 14) #define MVEBU_COMPHY_GEN1_S4(n) (0xc44 + (n) * 0x1000) #define MVEBU_COMPHY_GEN1_S4_DFE_RES(n) ((n) << 8) +#define MVEBU_COMPHY_GEN2_S4(n) (0xc4c + (n) * 0x1000) +#define MVEBU_COMPHY_GEN2_S4_DFE_RES(n) ((n) << 8) +#define MVEBU_COMPHY_GEN3_S3(n) (0xc50 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN3_S3_FFE_CAP_SEL(n) ((n) << 0) +#define MVEBU_COMPHY_GEN3_S3_FFE_RES_SEL(n) ((n) << 4) +#define MVEBU_COMPHY_GEN3_S3_SETTING_FORCE BIT(7) +#define MVEBU_COMPHY_GEN3_S3_FBCK_SEL BIT(9) +#define MVEBU_COMPHY_GEN3_S3_FFE_DEG_RES_LVL(n) ((n) << 12) +#define MVEBU_COMPHY_GEN3_S3_FFE_LOAD_RES_LVL(n) ((n) << 14) +#define MVEBU_COMPHY_GEN3_S4(n) (0xc54 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN3_S4_DFE_RES(n) ((n) << 8) #define MVEBU_COMPHY_TX_PRESET(n) (0xc68 + (n) * 0x1000) #define MVEBU_COMPHY_TX_PRESET_INDEX(n) ((n) << 0) +#define MVEBU_COMPHY_DFE_CTRL(n) (0xc70 + (n) * 0x1000) +#define MVEBU_COMPHY_DFE_CTRL_TX_MAX_DFE_ADAPT(n) ((n) << 14) +#define MVEBU_COMPHY_DFE_CTRL_28(n) (0xc9c + (n) * 0x1000) +#define MVEBU_COMPHY_DFE_CTRL_28_PIPE4 BIT(7) #define MVEBU_COMPHY_GEN1_S5(n) (0xd38 + (n) * 0x1000) #define MVEBU_COMPHY_GEN1_S5_ICP(n) ((n) << 0) +#define MVEBU_COMPHY_GEN3_S5(n) (0xd48 + (n) * 0x1000) +#define MVEBU_COMPHY_GEN3_S5_ICP(n) ((n) << 0) +#define MVEBU_COMPHY_LANE_CFG0(n) (0xe00 + (n) * 0x1000) +#define MVEBU_COMPHY_LANE_CFG0_PRD_TXEEMPH0 BIT(0) +#define MVEBU_COMPHY_LANE_STATUS0(n) (0xe0c + (n) * 0x1000) +#define MVEBU_COMPHY_LANE_STATUS0_PCLK_EN BIT(0) +#define MVEBU_COMPHY_LANE_CFG4(n) (0xe20 + (n) * 0x1000) +#define MVEBU_COMPHY_LANE_CFG4_DFE_CTRL(n) ((n) << 0) +#define MVEBU_COMPHY_LANE_CFG4_DFE_EN_SEL BIT(3) +#define MVEBU_COMPHY_LANE_CFG4_DFE_OVER BIT(6) +#define MVEBU_COMPHY_LANE_CFG4_DFE_SSC BIT(7) +#define MVEBU_COMPHY_EQ_CONFIG0(n) (0xe9c + (n) * 0x1000) +#define MVEBU_COMPHY_EQ_CONFIG0_RC_MODE BIT(12) +#define MVEBU_COMPHY_LANE_EQ_CFG1(n) (0xea0 + (n) * 0x1000) +#define MVEBU_COMPHY_LANE_EQ_CFG1_UPDATE_POLARITY BIT(12) +#define MVEBU_COMPHY_LANE_EQ_REMOTE_CFG(n) (0xef8 + (n) * 0x1000) +#define MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_DIRN_OVERRIDE BIT(0) +#define MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_ONLY_MODE BIT(1) +#define MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_PRESET_VECTOR(n) ((n) << 2) +#define MVEBU_COMPHY_PIPE_RST_CLK_CTRL(n) (0xf04 + (n) * 0x1000) +#define MVEBU_COMPHY_PIPE_RST_CLK_CTRL_RST BIT(0) +#define MVEBU_COMPHY_PIPE_RST_CLK_CTRL_FIXED_PCLK BIT(2) +#define MVEBU_COMPHY_PIPE_RST_CLK_CTRL_PIPE_WIDTH BIT(3) +#define MVEBU_COMPHY_PIPE_RST_CLK_CTRL_FREQ_SEL BIT(9) +#define MVEBU_COMPHY_MODE_CTRL(n) (0xf08 + (n) * 0x1000) +#define MVEBU_COMPHY_MODE_CTRL_MODE_MARGIN BIT(2) +#define MVEBU_COMPHY_PIPE_CLK_SRC_LO(n) (0xf0c + (n) * 0x1000) +#define MVEBU_COMPHY_PIPE_CLK_SRC_LO_PERIOD_SEL BIT(1) +#define MVEBU_COMPHY_PIPE_CLK_SRC_LO_PERIOD_SCALE(n) ((n) << 2) +#define MVEBU_COMPHY_PIPE_CLK_SRC_LO_PLL_RDY_DL(n) ((n) << 5) +#define MVEBU_COMPHY_PIPE_CLK_SRC_HI(n) (0xf10 + (n) * 0x1000) +#define MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_START BIT(0) +#define MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_BREAK BIT(1) +#define MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_MASTER BIT(2) +#define MVEBU_COMPHY_PIPE_CLK_SRC_HI_MODE_PIPE BIT(7) +#define MVEBU_COMPHY_PIPE_PM_CTRL(n) (0xf40 + (n) * 0x1000) +#define MVEBU_COMPHY_PIPE_PM_CTRL_RDLOZ_WAIT(n) ((n) << 0) /* Relative to priv->regmap */ #define MVEBU_COMPHY_CONF1(n) (0x1000 + (n) * 0x28) #define MVEBU_COMPHY_CONF1_PWRUP BIT(1) #define MVEBU_COMPHY_CONF1_USB_PCIE BIT(2) /* 0: Ethernet/SATA */ +#define MVEBU_COMPHY_CONF1_POR BIT(14) +#define MVEBU_COMPHY_CONF1_CORE_RESET BIT(13) +#define MVEBU_COMPHY_CONF1_PHY_MODE_USB BIT(15) /* 1: USB */ #define MVEBU_COMPHY_CONF6(n) (0x1014 + (n) * 0x28) #define MVEBU_COMPHY_CONF6_40B BIT(18) #define MVEBU_COMPHY_SELECTOR 0x1140 @@ -118,6 +257,20 @@ #define MVEBU_COMPHY_SD1_CTRL1 0x1148 #define MVEBU_COMPHY_SD1_CTRL1_RXAUI1_EN BIT(26) #define MVEBU_COMPHY_SD1_CTRL1_RXAUI0_EN BIT(27) +#define MVEBU_COMPHY_SD1_CTRL1_PCIE_X2_EN BIT(25) +#define MVEBU_COMPHY_SD1_CTRL1_PCIE_X4_EN BIT(24) +#define MVEBU_COMPHY_SD1_CTRL1_PHY0_3_MASK 0xffff +#define MVEBU_COMPHY_SD1_CTRL1_PHY0_1_MASK 0x00ff + +/* Relative to priv->cp_mgmt_regmap */ +#define DEVICE_SAR0 0x200 +#define DEV_SAR0_PCIE1_CLK_CP0 BIT(3) +#define DEV_SAR0_PCIE0_CLK_CP0 BIT(2) +#define DEV_SAR0_PCIE1_CLK_CP1 BIT(1) +#define DEV_SAR0_PCIE0_CLK_CP1 BIT(0) +#define DEVICE_SAR1 0x204 +#define DFX_DEV_GEN_CTRL12 0x280 +#define DFX_DEV_GEN_CTRL12_CLK_SRC(n) ((n) << 7) #define MVEBU_COMPHY_LANES 6 #define MVEBU_COMPHY_PORTS 3 @@ -195,27 +348,69 @@ .fw_mode = _fw, \ } -#define GEN_CONF(_lane, _port, _mode, _fw) \ +#define GEN_CONF(_lane, _port, _mode, _mux, _fw) \ { \ .lane = _lane, \ .port = _port, \ .mode = _mode, \ .submode = PHY_INTERFACE_MODE_NA, \ - .mux = -1, \ + .mux = _mux, \ .fw_mode = _fw, \ } +#define MVEBU_COMPHY_PIPE_CONF(_lane, _port, _mode, _mux) \ + { \ + .lane = _lane, \ + .port = _port, \ + .mode = _mode, \ + .submode = 0, \ + .mux = _mux, \ + } + +/* + * default values for 10GKR comphys amplitudes/emphasises. Those work + * on the A8K DB board, but most likely won't be suitable for other + * boards. + * + * The Marvell A8K DB board has a fairly long trace length from the + * CPU to the SFP cage, and a connector in between, therefore it needs + * fairly bosted up amplitude and emphasis settings in order to get a + * descent eye diagram. + * + * On other designs with shorter traces lengths this will most likely + * result in a fairly large overshoot of the signal and bad signal + * integrity. + */ +#define DEFAULT_GEN1_S0_AMP 0x1c +#define DEFAULT_GEN1_S0_EMPH 0xe +#define DEFAULT_GEN1_S2_EMPH 0x0 + +#define KR_DEFAULT_FFE_CAP_SEL 0xe +#define KR_DEFAULT_FFE_RES_SEL 0x4 +#define KR_DEFAULT_DFE_RES 0x1 +#define KR_DEFAULT_PHASE_OFFSET 0x60 + +/* + * default values for SATA comphys amplitudes/emphasises and DFE + * resolutions. Those work on the A8K DB board, but most likely won't + * be suitable for other boards. + */ +#define SATA_DEFAULT_GEN3_S0_AMP 0x1e +#define SATA_DEFAULT_GEN3_S0_EMPH 0x06 +#define SATA_DEFAULT_GEN3_S4_DFE_RES 0x2 +#define SATA_DEFAULT_PHASE_OFFSET 0x61 + static const struct mvebu_comphy_conf mvebu_comphy_cp110_modes[] = { /* lane 0 */ - GEN_CONF(0, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), + GEN_CONF(0, 0, PHY_MODE_PCIE, 0x4, COMPHY_FW_MODE_PCIE), ETH_CONF(0, 1, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), ETH_CONF(0, 1, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), - GEN_CONF(0, 1, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), + GEN_CONF(0, 1, PHY_MODE_SATA, 0x4, COMPHY_FW_MODE_SATA), /* lane 1 */ - GEN_CONF(1, 0, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), - GEN_CONF(1, 0, PHY_MODE_USB_DEVICE_SS, COMPHY_FW_MODE_USB3D), - GEN_CONF(1, 0, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), - GEN_CONF(1, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), + GEN_CONF(1, 0, PHY_MODE_USB_HOST_SS, 0x1, COMPHY_FW_MODE_USB3H), + GEN_CONF(1, 0, PHY_MODE_USB_DEVICE_SS, 0x2, COMPHY_FW_MODE_USB3D), + GEN_CONF(1, 0, PHY_MODE_SATA, 0x4, COMPHY_FW_MODE_SATA), + GEN_CONF(1, 0, PHY_MODE_PCIE, 0x4, COMPHY_FW_MODE_PCIE), ETH_CONF(1, 2, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), ETH_CONF(1, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), /* lane 2 */ @@ -224,45 +419,77 @@ ETH_CONF(2, 0, PHY_INTERFACE_MODE_RXAUI, 0x1, COMPHY_FW_MODE_RXAUI), ETH_CONF(2, 0, PHY_INTERFACE_MODE_5GBASER, 0x1, COMPHY_FW_MODE_XFI), ETH_CONF(2, 0, PHY_INTERFACE_MODE_10GBASER, 0x1, COMPHY_FW_MODE_XFI), - GEN_CONF(2, 0, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), - GEN_CONF(2, 0, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), - GEN_CONF(2, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), + GEN_CONF(2, 0, PHY_MODE_USB_HOST_SS, 0x1, COMPHY_FW_MODE_USB3H), + GEN_CONF(2, 0, PHY_MODE_SATA, 0x4, COMPHY_FW_MODE_SATA), + GEN_CONF(2, 0, PHY_MODE_PCIE, 0x4, COMPHY_FW_MODE_PCIE), /* lane 3 */ - GEN_CONF(3, 0, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), + GEN_CONF(3, 0, PHY_MODE_PCIE, 0x4, COMPHY_FW_MODE_PCIE), ETH_CONF(3, 1, PHY_INTERFACE_MODE_SGMII, 0x2, COMPHY_FW_MODE_SGMII), ETH_CONF(3, 1, PHY_INTERFACE_MODE_2500BASEX, 0x2, COMPHY_FW_MODE_2500BASEX), ETH_CONF(3, 1, PHY_INTERFACE_MODE_RXAUI, 0x1, COMPHY_FW_MODE_RXAUI), - GEN_CONF(3, 1, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), - GEN_CONF(3, 1, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), + GEN_CONF(3, 1, PHY_MODE_USB_HOST_SS, 0x1, COMPHY_FW_MODE_USB3H), + GEN_CONF(3, 1, PHY_MODE_SATA, 0x4, COMPHY_FW_MODE_SATA), /* lane 4 */ ETH_CONF(4, 0, PHY_INTERFACE_MODE_SGMII, 0x2, COMPHY_FW_MODE_SGMII), ETH_CONF(4, 0, PHY_INTERFACE_MODE_2500BASEX, 0x2, COMPHY_FW_MODE_2500BASEX), ETH_CONF(4, 0, PHY_INTERFACE_MODE_5GBASER, 0x2, COMPHY_FW_MODE_XFI), ETH_CONF(4, 0, PHY_INTERFACE_MODE_10GBASER, 0x2, COMPHY_FW_MODE_XFI), ETH_CONF(4, 0, PHY_INTERFACE_MODE_RXAUI, 0x2, COMPHY_FW_MODE_RXAUI), - GEN_CONF(4, 0, PHY_MODE_USB_DEVICE_SS, COMPHY_FW_MODE_USB3D), - GEN_CONF(4, 1, PHY_MODE_USB_HOST_SS, COMPHY_FW_MODE_USB3H), - GEN_CONF(4, 1, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), + GEN_CONF(4, 0, PHY_MODE_USB_DEVICE_SS, 0x2, COMPHY_FW_MODE_USB3D), + GEN_CONF(4, 1, PHY_MODE_USB_HOST_SS, 0x1, COMPHY_FW_MODE_USB3H), + GEN_CONF(4, 1, PHY_MODE_PCIE, 0x4, COMPHY_FW_MODE_PCIE), ETH_CONF(4, 1, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), ETH_CONF(4, 1, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), ETH_CONF(4, 1, PHY_INTERFACE_MODE_5GBASER, 0x1, COMPHY_FW_MODE_XFI), ETH_CONF(4, 1, PHY_INTERFACE_MODE_10GBASER, -1, COMPHY_FW_MODE_XFI), /* lane 5 */ ETH_CONF(5, 1, PHY_INTERFACE_MODE_RXAUI, 0x2, COMPHY_FW_MODE_RXAUI), - GEN_CONF(5, 1, PHY_MODE_SATA, COMPHY_FW_MODE_SATA), + GEN_CONF(5, 1, PHY_MODE_SATA, 0x4, COMPHY_FW_MODE_SATA), ETH_CONF(5, 2, PHY_INTERFACE_MODE_SGMII, 0x1, COMPHY_FW_MODE_SGMII), ETH_CONF(5, 2, PHY_INTERFACE_MODE_2500BASEX, 0x1, COMPHY_FW_MODE_2500BASEX), - GEN_CONF(5, 2, PHY_MODE_PCIE, COMPHY_FW_MODE_PCIE), + GEN_CONF(5, 2, PHY_MODE_PCIE, 0x4, COMPHY_FW_MODE_PCIE), +}; + +static const struct mvebu_comphy_conf mvebu_comphy_cp110_pipe_modes[] = { + /* lane 0 */ + MVEBU_COMPHY_PIPE_CONF(0, 0, PHY_MODE_PCIE, 0x4), + + /* lane 1 */ + MVEBU_COMPHY_PIPE_CONF(1, 0, PHY_MODE_USB_HOST, 0x1), + MVEBU_COMPHY_PIPE_CONF(1, 0, PHY_MODE_USB_DEVICE, 0x2), + MVEBU_COMPHY_PIPE_CONF(1, 0, PHY_MODE_PCIE, 0x4), + + /* lane 2 */ + MVEBU_COMPHY_PIPE_CONF(2, 0, PHY_MODE_USB_HOST, 0x1), + MVEBU_COMPHY_PIPE_CONF(2, 0, PHY_MODE_PCIE, 0x4), + + /* lane 3 */ + MVEBU_COMPHY_PIPE_CONF(3, 1, PHY_MODE_USB_HOST, 0x1), + MVEBU_COMPHY_PIPE_CONF(3, 0, PHY_MODE_PCIE, 0x4), + + /* lane 4 */ + MVEBU_COMPHY_PIPE_CONF(4, 1, PHY_MODE_USB_HOST, 0x1), + MVEBU_COMPHY_PIPE_CONF(4, 0, PHY_MODE_USB_DEVICE, 0x2), + MVEBU_COMPHY_PIPE_CONF(4, 1, PHY_MODE_PCIE, 0x4), + + /* lane 5 */ + MVEBU_COMPHY_PIPE_CONF(5, 2, PHY_MODE_PCIE, 0x4), }; struct mvebu_comphy_priv { void __iomem *base; struct regmap *regmap; + struct regmap *sar_regmap; + struct regmap *cp_mgmt_regmap; struct device *dev; struct clk *mg_domain_clk; struct clk *mg_core_clk; struct clk *axi_clk; + struct clk *gop_clk; unsigned long cp_phys; + int modes[MVEBU_COMPHY_LANES]; + + struct dentry *debugfs_root; }; struct mvebu_comphy_lane { @@ -271,6 +498,23 @@ enum phy_mode mode; int submode; int port; + + u32 kr_gen1_s0_amplitude; + u32 kr_gen1_s0_emphasis; + u32 kr_gen1_s2_emphasis; + + u32 kr_ffe_cap_sel; + u32 kr_ffe_res_sel; + u32 kr_dfe_res; + u32 kr_phase_offset; + + bool rx_swap_polarity; + bool tx_swap_polarity; + + u32 sata_gen3_s0_amplitude; + u32 sata_gen3_s0_emphasis; + u32 sata_gen3_s4_dfe_res; + u32 sata_phase_offset; }; static int mvebu_comphy_smc(unsigned long function, unsigned long phys, @@ -450,6 +694,138 @@ return 0; } +static void mvebu_comphy_sata_init_reset(struct mvebu_comphy_lane *lane) +{ + struct mvebu_comphy_priv *priv = lane->priv; + u32 val; + + /* RFU configurations - hard reset comphy */ + regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); + val &= ~MVEBU_COMPHY_CONF1_USB_PCIE; + val &= ~MVEBU_COMPHY_CONF1_POR; + val &= ~MVEBU_COMPHY_CONF1_CORE_RESET; + val |= MVEBU_COMPHY_CONF1_PWRUP; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), val); + + /* Set data width 40Bit - SATA mode only */ + regmap_read(priv->regmap, MVEBU_COMPHY_CONF6(lane->id), &val); + val |= MVEBU_COMPHY_CONF6_40B; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF6(lane->id), val); + + /* reset */ + val = readl(priv->base + MVEBU_COMPHY_SERDES_CFG1(lane->id)); + val &= ~(MVEBU_COMPHY_SERDES_CFG1_RESET | + MVEBU_COMPHY_SERDES_CFG1_CORE_RESET | + MVEBU_COMPHY_SERDES_CFG1_RF_RESET); + writel(val, priv->base + MVEBU_COMPHY_SERDES_CFG1(lane->id)); + + /* de-assert reset */ + val = readl(priv->base + MVEBU_COMPHY_SERDES_CFG1(lane->id)); + val |= MVEBU_COMPHY_SERDES_CFG1_RESET | + MVEBU_COMPHY_SERDES_CFG1_CORE_RESET; + writel(val, priv->base + MVEBU_COMPHY_SERDES_CFG1(lane->id)); + + /* wait until clocks are ready */ + mdelay(1); + + /* Set reference clock to comes from group 1 - chose 25Mhz */ + val = readl(priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id)); + val &= ~MVEBU_COMPHY_MISC_CTRL0_REFCLK_SEL; + writel(val,priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id)); + + /* power and pll selection */ + val = readl(priv->base + MVEBU_COMPHY_PWRPLL_CTRL(lane->id)); + val &= ~(MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x1f) | + MVEBU_COMPHY_PWRPLL_PHY_MODE(0x7)); + /* Reference frequency select set 1 (for SATA = 25Mhz) */ + /* PHY mode select (set SATA = 0x0 */ + val |= MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x1) | + MVEBU_COMPHY_PWRPLL_PHY_MODE(0x0); + writel(val, priv->base + MVEBU_COMPHY_PWRPLL_CTRL(lane->id)); + + /* Set max PHY generation setting - 6Gbps */ + val = readl(priv->base + MVEBU_COMPHY_INTERFACE(lane->id)); + val &= ~MVEBU_COMPHY_INTERFACE_GEN_MAX(0x3); + val |= MVEBU_COMPHY_INTERFACE_GEN_MAX(0x2); + writel(val, priv->base + MVEBU_COMPHY_INTERFACE(lane->id)); + + /* Set select data width 40Bit (SEL_BITS[2:0]) */ + val = readl(priv->base + MVEBU_COMPHY_LOOPBACK(lane->id)); + val &= ~MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH(0x7); + val |= MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH(0x2); + writel(val, priv->base + MVEBU_COMPHY_LOOPBACK(lane->id)); +} + +static void mvebu_comphy_usb3_init_reset(struct mvebu_comphy_lane *lane) +{ + struct mvebu_comphy_priv *priv = lane->priv; + u32 val; + + /* RFU configurations - hard reset comphy */ + regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); + val &= ~MVEBU_COMPHY_CONF1_POR; + val &= ~MVEBU_COMPHY_CONF1_CORE_RESET; + val |= MVEBU_COMPHY_CONF1_PWRUP; + val |= MVEBU_COMPHY_CONF1_PHY_MODE_USB; + val |= MVEBU_COMPHY_CONF1_USB_PCIE; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), val); + + /* release from hard reset */ + regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); + val |= MVEBU_COMPHY_CONF1_POR; + val |= MVEBU_COMPHY_CONF1_CORE_RESET; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), val); + + /* wait until clocks are ready */ + mdelay(1); + + /* Set PIPE soft reset */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + val |= MVEBU_COMPHY_PIPE_RST_CLK_CTRL_RST; + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_FIXED_PCLK; + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_PIPE_WIDTH; + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_FREQ_SEL; + writel(val, priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + + /* Set PLL ready delay for 0x2 */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_CLK_SRC_LO(lane->id)); + val &= ~MVEBU_COMPHY_PIPE_CLK_SRC_LO_PLL_RDY_DL(0x7); + val |= MVEBU_COMPHY_PIPE_CLK_SRC_LO_PLL_RDY_DL(0x2); + writel(val, priv->base + MVEBU_COMPHY_PIPE_CLK_SRC_LO(lane->id)); + + /* Set reference clock to come from group 1 - 25Mhz */ + val = readl(priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id)); + val &= ~MVEBU_COMPHY_MISC_CTRL0_REFCLK_SEL; + writel(val, priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id)); + + /* power and pll selection */ + val = readl(priv->base + MVEBU_COMPHY_PWRPLL_CTRL(lane->id)); + val &= ~(MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x1f) | + MVEBU_COMPHY_PWRPLL_PHY_MODE(0x7)); + val |= MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x2) | + MVEBU_COMPHY_PWRPLL_PHY_MODE(0x5); + writel(val, priv->base + MVEBU_COMPHY_PWRPLL_CTRL(lane->id)); + + + /* Set the amount of time spent in the LoZ state - set for 0x7 */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_PM_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PIPE_PM_CTRL_RDLOZ_WAIT(0xff); + val |= MVEBU_COMPHY_PIPE_PM_CTRL_RDLOZ_WAIT(0x7); + writel(val, priv->base + MVEBU_COMPHY_PIPE_PM_CTRL(lane->id)); + + /* Set max PHY generation setting - 5Gbps */ + val = readl(priv->base + MVEBU_COMPHY_INTERFACE(lane->id)); + val &= ~MVEBU_COMPHY_INTERFACE_GEN_MAX(0x3); + val |= MVEBU_COMPHY_INTERFACE_GEN_MAX(0x1); + writel(val, priv->base + MVEBU_COMPHY_INTERFACE(lane->id)); + + /* Set select data width 20Bit (SEL_BITS[2:0]) */ + val = readl(priv->base + MVEBU_COMPHY_LOOPBACK(lane->id)); + val &= ~MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH(0x7); + val |= MVEBU_COMPHY_LOOPBACK_DBUS_WIDTH(0x1); + writel(val, priv->base + MVEBU_COMPHY_LOOPBACK(lane->id)); +} + static int mvebu_comphy_init_plls(struct mvebu_comphy_lane *lane) { struct mvebu_comphy_priv *priv = lane->priv; @@ -491,6 +867,125 @@ return 0; } +static void mvebu_comphy_pcie_init_reset(struct mvebu_comphy_lane *lane, + int pcie_clk_config, int pcie_width) +{ + struct mvebu_comphy_priv *priv = lane->priv; + u32 val; + + /* RFU configurations - hard reset comphy */ + regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); + val &= ~MVEBU_COMPHY_CONF1_POR; + val &= ~MVEBU_COMPHY_CONF1_CORE_RESET; + val &= ~MVEBU_COMPHY_CONF1_PHY_MODE_USB; + val |= MVEBU_COMPHY_CONF1_PWRUP; + val |= MVEBU_COMPHY_CONF1_USB_PCIE; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), val); + + /* release from hard reset */ + regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); + val |= MVEBU_COMPHY_CONF1_POR; + val |= MVEBU_COMPHY_CONF1_CORE_RESET; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), val); + + /* wait until clocks are ready */ + mdelay(1); + + /* Start comphy Configuration */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + val |= MVEBU_COMPHY_PIPE_RST_CLK_CTRL_RST; + val |= MVEBU_COMPHY_PIPE_RST_CLK_CTRL_FIXED_PCLK; + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_PIPE_WIDTH; + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_FREQ_SEL; + writel(val, priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + + /* Set PLL ready delay for 0x2 */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_CLK_SRC_LO(lane->id)); + val &= ~MVEBU_COMPHY_PIPE_CLK_SRC_LO_PLL_RDY_DL(0x7); + val |= MVEBU_COMPHY_PIPE_CLK_SRC_LO_PLL_RDY_DL(0x2); + if (pcie_width > 1) { + val |= MVEBU_COMPHY_PIPE_CLK_SRC_LO_PERIOD_SEL; + val &= ~MVEBU_COMPHY_PIPE_CLK_SRC_LO_PERIOD_SCALE(0x3); + val |= MVEBU_COMPHY_PIPE_CLK_SRC_LO_PERIOD_SCALE(0x1); + } + writel(val, priv->base + MVEBU_COMPHY_PIPE_CLK_SRC_LO(lane->id)); + + /* Set PIPE mode interface to PCIe3 - 0x1 & set lane order */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_CLK_SRC_HI(lane->id)); + val |= MVEBU_COMPHY_PIPE_CLK_SRC_HI_MODE_PIPE; + if (pcie_width > 1) { + if (lane->id == 0) { + val |= MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_START; + val |= MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_MASTER; + } else { + val &= ~MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_START; + val &= ~MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_MASTER; + } + if (lane->id == pcie_width - 1) + val |= MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_BREAK; + else + val &= ~MVEBU_COMPHY_PIPE_CLK_SRC_HI_LANE_BREAK; + } + writel(val, priv->base + MVEBU_COMPHY_PIPE_CLK_SRC_HI(lane->id)); + + /* Config update polarity equalization */ + val = readl(priv->base + MVEBU_COMPHY_LANE_EQ_CFG1(lane->id)); + val |= MVEBU_COMPHY_LANE_EQ_CFG1_UPDATE_POLARITY; + writel(val, priv->base + MVEBU_COMPHY_LANE_EQ_CFG1(lane->id)); + + /* Set PIPE version 4 to mode enable */ + val = readl(priv->base + MVEBU_COMPHY_DFE_CTRL_28(lane->id)); + val |= MVEBU_COMPHY_DFE_CTRL_28_PIPE4; + writel(val, priv->base + MVEBU_COMPHY_DFE_CTRL_28(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id)); + val &= ~MVEBU_COMPHY_MISC_CTRL0_TXDCLK_2X; + val |= MVEBU_COMPHY_MISC_CTRL0_CLK500M_EN; + val |= MVEBU_COMPHY_MISC_CTRL0_ICP_FORCE; + if (pcie_clk_config) { + val &= ~MVEBU_COMPHY_MISC_CTRL0_REFCLK_SEL; + val |= MVEBU_COMPHY_MISC_CTRL0_CLK100M_125M; + } else { + val |= MVEBU_COMPHY_MISC_CTRL0_REFCLK_SEL; + } + writel(val, priv->base + MVEBU_COMPHY_MISC_CTRL0(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_PWRPLL_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x1f); + val &= ~MVEBU_COMPHY_PWRPLL_PHY_MODE(0x7); + if (pcie_clk_config) + val |= MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x2); + else + val |= MVEBU_COMPHY_PWRPLL_CTRL_RFREQ(0x0); + val |= MVEBU_COMPHY_PWRPLL_PHY_MODE(0x3); + writel(val, priv->base + MVEBU_COMPHY_PWRPLL_CTRL(lane->id)); + + if (pcie_width > 1) { + /* reference clock alignment */ + val = readl(priv->base + MVEBU_COMPHY_LANE_ALIGN(lane->id)); + val &= ~MVEBU_COMPHY_LANE_ALIGN_BIT; + writel(val, priv->base + MVEBU_COMPHY_LANE_ALIGN(lane->id)); + } + + /* + * Set the amount of time spent in the LoZ state - set for 0x7 + * only if the PCIe clock is output + */ + if (pcie_clk_config) { + val = readl(priv->base + MVEBU_COMPHY_PIPE_PM_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PIPE_PM_CTRL_RDLOZ_WAIT(0xff); + val |= MVEBU_COMPHY_PIPE_PM_CTRL_RDLOZ_WAIT(0x7); + writel(val, priv->base + MVEBU_COMPHY_PIPE_PM_CTRL(lane->id)); + } + + val = readl(priv->base + MVEBU_COMPHY_INTERFACE(lane->id)); + val &= ~MVEBU_COMPHY_INTERFACE_GEN_MAX(0x3); + val |= MVEBU_COMPHY_INTERFACE_GEN_MAX(0x2); + val |= MVEBU_COMPHY_INTERFACE_DET_BYPASS; + val |= MVEBU_COMPHY_INTERFACE_LINK_TRAIN; + writel(val, priv->base + MVEBU_COMPHY_INTERFACE(lane->id)); +} + static int mvebu_comphy_set_mode_sgmii(struct phy *phy) { struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); @@ -519,6 +1014,9 @@ val = readl(priv->base + MVEBU_COMPHY_GEN1_S0(lane->id)); val &= ~MVEBU_COMPHY_GEN1_S0_TX_EMPH(0xf); val |= MVEBU_COMPHY_GEN1_S0_TX_EMPH(0x1); + /* set it back to hardware default value to fix unstable bcm + * link on fbx proto */ + val |= MVEBU_COMPHY_GEN1_S0_TX_EMPH(0x9); writel(val, priv->base + MVEBU_COMPHY_GEN1_S0(lane->id)); return mvebu_comphy_init_plls(lane); @@ -584,6 +1082,16 @@ u32 val; int err; + dev_dbg(&phy->dev, "mvebu_comphy_set_mode_10gbaser: %x,%x,%x " + "%x,%x,%x,%x\n", + lane->kr_gen1_s0_amplitude, + lane->kr_gen1_s0_emphasis, + lane->kr_gen1_s2_emphasis, + lane->kr_ffe_cap_sel, + lane->kr_ffe_res_sel, + lane->kr_dfe_res, + lane->kr_phase_offset); + err = mvebu_comphy_ethernet_init_reset(lane); if (err) return err; @@ -597,6 +1105,14 @@ val |= MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN; writel(val, priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); + val = readl(priv->base + MVEBU_COMPHY_GEN1_S3(lane->id)); + val |= MVEBU_COMPHY_GEN1_S3_SETTING_FORCE; + val &= ~MVEBU_COMPHY_GEN1_S3_FFE_CAP_SEL(0xf); + val &= ~MVEBU_COMPHY_GEN1_S3_FFE_RES_SEL(0x7); + val |= MVEBU_COMPHY_GEN1_S3_FFE_CAP_SEL(lane->kr_ffe_cap_sel); + val |= MVEBU_COMPHY_GEN1_S3_FFE_RES_SEL(lane->kr_ffe_res_sel); + writel(val, priv->base + MVEBU_COMPHY_GEN1_S3(lane->id)); + /* Speed divider */ val = readl(priv->base + MVEBU_COMPHY_SPEED_DIV(lane->id)); val |= MVEBU_COMPHY_SPEED_DIV_TX_FORCE; @@ -614,12 +1130,13 @@ val = readl(priv->base + MVEBU_COMPHY_GEN1_S0(lane->id)); val &= ~(MVEBU_COMPHY_GEN1_S0_TX_AMP(0x1f) | MVEBU_COMPHY_GEN1_S0_TX_EMPH(0xf)); - val |= MVEBU_COMPHY_GEN1_S0_TX_AMP(0x1c) | - MVEBU_COMPHY_GEN1_S0_TX_EMPH(0xe); + val |= MVEBU_COMPHY_GEN1_S0_TX_AMP(lane->kr_gen1_s0_amplitude) | + MVEBU_COMPHY_GEN1_S0_TX_EMPH(lane->kr_gen1_s0_emphasis); writel(val, priv->base + MVEBU_COMPHY_GEN1_S0(lane->id)); val = readl(priv->base + MVEBU_COMPHY_GEN1_S2(lane->id)); val &= ~MVEBU_COMPHY_GEN1_S2_TX_EMPH(0xf); + val |= MVEBU_COMPHY_GEN1_S2_TX_EMPH(lane->kr_gen1_s2_emphasis); val |= MVEBU_COMPHY_GEN1_S2_TX_EMPH_EN; writel(val, priv->base + MVEBU_COMPHY_GEN1_S2(lane->id)); @@ -628,6 +1145,25 @@ MVEBU_COMPHY_TX_SLEW_RATE_SLC(0x3f); writel(val, priv->base + MVEBU_COMPHY_TX_SLEW_RATE(lane->id)); + /* phase offset */ + val = readl(priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF(0x7f); + val |= MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF(lane->kr_phase_offset); + val |= MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_FORCE; + val &= ~MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID; + writel(val, priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + + /* + * phase offset sampled on rising edge of OS_PH_OFF_VALID. + */ + val = readl(priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + val |= MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID; + writel(val, priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID; + writel(val, priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + /* Impedance calibration */ val = readl(priv->base + MVEBU_COMPHY_IMP_CAL(lane->id)); val &= ~MVEBU_COMPHY_IMP_CAL_TX_EXT(0x1f); @@ -657,7 +1193,7 @@ val = readl(priv->base + MVEBU_COMPHY_GEN1_S4(lane->id)); val &= ~MVEBU_COMPHY_GEN1_S4_DFE_RES(0x3); - val |= MVEBU_COMPHY_GEN1_S4_DFE_RES(0x1); + val |= MVEBU_COMPHY_GEN1_S4_DFE_RES(lane->kr_dfe_res); writel(val, priv->base + MVEBU_COMPHY_GEN1_S4(lane->id)); val = readl(priv->base + MVEBU_COMPHY_GEN1_S3(lane->id)); @@ -719,20 +1255,603 @@ return mvebu_comphy_init_plls(lane); } +static inline bool phy_mode_is_pipe_mode(int mode) +{ + switch (mode) { + case PHY_MODE_USB_HOST_SS: + case PHY_MODE_USB_DEVICE_SS: + case PHY_MODE_PCIE: + return true; + default: + return false; + } +} + +static int mvebu_comphy_set_mode_sata(struct phy *phy) +{ + struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); + struct mvebu_comphy_priv *priv = lane->priv; + u32 val; + + mvebu_comphy_sata_init_reset(lane); + + /* G1 Settings */ + val = readl(priv->base + MVEBU_COMPHY_GEN1_S1(lane->id)); + val &= ~(MVEBU_COMPHY_GEN1_S1_RX_MUL_PI(0x7) | + MVEBU_COMPHY_GEN1_S1_RX_MUL_PF(0x7) | + MVEBU_COMPHY_GEN1_S1_RX_MUL_FI(0x3) | + MVEBU_COMPHY_GEN1_S1_RX_MUL_FF(0x3) | + MVEBU_COMPHY_GEN1_S1_RX_DIV(0x3)); + val |= MVEBU_COMPHY_GEN1_S1_RX_MUL_PI(0x0) | + MVEBU_COMPHY_GEN1_S1_RX_MUL_PF(0x1) | + MVEBU_COMPHY_GEN1_S1_RX_MUL_FI(0x0) | + MVEBU_COMPHY_GEN1_S1_RX_MUL_FF(0x3) | + MVEBU_COMPHY_GEN1_S1_RX_DIV(0x1); + writel(val, priv->base + MVEBU_COMPHY_GEN1_S1(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_GEN1_S3(lane->id)); + val &= ~(MVEBU_COMPHY_GEN1_S3_FFE_CAP_SEL(0xf) | + MVEBU_COMPHY_GEN1_S3_FFE_RES_SEL(0x7) | + MVEBU_COMPHY_GEN1_S3_FFE_DEG_RES_LVL(0x3) | + MVEBU_COMPHY_GEN1_S3_FFE_LOAD_RES_LVL(0x3)); + val |= MVEBU_COMPHY_GEN1_S3_SETTING_FORCE | + MVEBU_COMPHY_GEN1_S3_FFE_CAP_SEL(0xf) | + MVEBU_COMPHY_GEN1_S3_FFE_RES_SEL(0x2) | + MVEBU_COMPHY_GEN1_S3_FFE_DEG_RES_LVL(0x1) | + MVEBU_COMPHY_GEN1_S3_FFE_LOAD_RES_LVL(0x1); + writel(val, priv->base + MVEBU_COMPHY_GEN1_S3(lane->id)); + + /* G2 Settings */ + val = readl(priv->base + MVEBU_COMPHY_GEN2_S1(lane->id)); + val &= ~(MVEBU_COMPHY_GEN2_S1_RX_MUL_PI(0x7) | + MVEBU_COMPHY_GEN2_S1_RX_MUL_PF(0x7) | + MVEBU_COMPHY_GEN2_S1_RX_MUL_FI(0x3) | + MVEBU_COMPHY_GEN2_S1_RX_MUL_FF(0x3) | + MVEBU_COMPHY_GEN2_S1_RX_DIV(0x3)); + val |= MVEBU_COMPHY_GEN2_S1_RX_MUL_PI(0x0) | + MVEBU_COMPHY_GEN2_S1_RX_MUL_PF(0x1) | + MVEBU_COMPHY_GEN2_S1_RX_MUL_FI(0x0) | + MVEBU_COMPHY_GEN2_S1_RX_MUL_FF(0x3) | + MVEBU_COMPHY_GEN2_S1_RX_DIV(0x1); + writel(val, priv->base + MVEBU_COMPHY_GEN2_S1(lane->id)); + + /* G3 Settings */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S1(lane->id)); + val &= ~(MVEBU_COMPHY_GEN3_S1_RX_MUL_PI(0x7) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_PF(0x7) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_FI(0x3) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_FF(0x3) | + MVEBU_COMPHY_GEN2_S1_RX_DIV(0x3) | + MVEBU_COMPHY_GEN3_S1_SMPL_INPX2_EN); + val |= MVEBU_COMPHY_GEN3_S1_RX_MUL_PI(0x2) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_PF(0x2) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_FI(0x3) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_FF(0x3) | + MVEBU_COMPHY_GEN3_S1_RX_DIV(0x2) | + MVEBU_COMPHY_GEN3_S1_RX_DFE_EN; + writel(val, priv->base + MVEBU_COMPHY_GEN3_S1(lane->id)); + + /* DTL Control */ + val = readl(priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); + val &= ~(MVEBU_COMPHY_DTL_CTRL_DTL_CLAMP_SEL(0x7) | + MVEBU_COMPHY_DTL_CTRL_DTL_CLK_MODE(0x3)); + val |= MVEBU_COMPHY_DTL_CTRL_DTL_DET_EN | + MVEBU_COMPHY_DTL_CTRL_DTL_PLOOP_EN | + MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN | + MVEBU_COMPHY_DTL_CTRL_DTL_CLAMP_SEL(0x1) | + MVEBU_COMPHY_DTL_CTRL_DTL_INPCLK_DIV_FORCE | + MVEBU_COMPHY_DTL_CTRL_DTL_CLK_MODE(0x1) | + MVEBU_COMPHY_DTL_CTRL_DTL_CLK_MODE_FORCE; + writel(val, priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); + + /* Trigger sampler enable pulses */ + val = readl(priv->base + MVEBU_SP_CALIB(lane->id)); + val |= MVEBU_SP_CALIB_SAMPLER_EN; + writel(val, priv->base + MVEBU_SP_CALIB(lane->id)); + val = readl(priv->base + MVEBU_SP_CALIB(lane->id)); + val &= ~MVEBU_SP_CALIB_SAMPLER_EN; + writel(val, priv->base + MVEBU_SP_CALIB(lane->id)); + + /* VDD Calibration Control 3 */ + val = readl(priv->base + MVEBU_COMPHY_EXT_SELV(lane->id)); + val &= ~MVEBU_COMPHY_EXT_SELV_RX_SAMPL(0x1f); + val |= MVEBU_COMPHY_EXT_SELV_RX_SAMPL(0x10); + writel(val, priv->base + MVEBU_COMPHY_EXT_SELV(lane->id)); + + /* DFE Resolution Control */ + val = readl(priv->base + MVEBU_COMPHY_DFE_RES(lane->id)); + val |= MVEBU_COMPHY_DFE_RES_FORCE_GEN_TBL; + writel(val, priv->base + MVEBU_COMPHY_DFE_RES(lane->id)); + + /* DFE F3-F5 Coefficient Control */ + val = readl(priv->base + MVEBU_COMPHY_COEF(lane->id)); + val &= ~(MVEBU_COMPHY_COEF_DFE_EN | MVEBU_COMPHY_COEF_DFE_CTRL); + writel(val, priv->base + MVEBU_COMPHY_COEF(lane->id)); + + /* G3 Setting 3 */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S3(lane->id)); + val &= ~(MVEBU_COMPHY_GEN3_S3_FFE_CAP_SEL(0xf) | + MVEBU_COMPHY_GEN3_S3_FFE_RES_SEL(0x7) | + MVEBU_COMPHY_GEN3_S3_FFE_DEG_RES_LVL(0x3) | + MVEBU_COMPHY_GEN3_S3_FFE_LOAD_RES_LVL(0x3)); + val |= MVEBU_COMPHY_GEN3_S3_SETTING_FORCE | + MVEBU_COMPHY_GEN3_S3_FFE_CAP_SEL(0xf) | + MVEBU_COMPHY_GEN3_S3_FFE_RES_SEL(0x4) | + MVEBU_COMPHY_GEN3_S3_FFE_DEG_RES_LVL(0x1) | + MVEBU_COMPHY_GEN3_S3_FFE_LOAD_RES_LVL(0x3); + writel(val, priv->base + MVEBU_COMPHY_GEN3_S3(lane->id)); + + /* G3 Setting 4 */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S4(lane->id)); + val &= ~MVEBU_COMPHY_GEN3_S4_DFE_RES(0x3); + val |= MVEBU_COMPHY_GEN3_S4_DFE_RES(lane->sata_gen3_s4_dfe_res); + writel(val, priv->base + MVEBU_COMPHY_GEN3_S4(lane->id)); + + /* Offset Phase Control */ + val = readl(priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF(0x7f); + val |= MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF(lane->sata_phase_offset); + val |= MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_FORCE; + val &= ~MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID; + writel(val, priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + val |= MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID; + writel(val, priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PHASE_CTRL_OS_PH_OFF_VALID; + writel(val, priv->base + MVEBU_COMPHY_PHASE_CTRL(lane->id)); + + /* Set G1 TX amplitude and TX post emphasis value */ + val = readl(priv->base + MVEBU_COMPHY_GEN1_S0(lane->id)); + val &= ~(MVEBU_COMPHY_GEN1_S0_TX_AMP(0x1f) | + MVEBU_COMPHY_GEN1_S0_TX_EMPH(0xf)); + val |= MVEBU_COMPHY_GEN1_S0_TX_AMP(0x8) | + MVEBU_COMPHY_GEN1_S0_TX_EMPH(0x1) | + MVEBU_COMPHY_GEN1_S0_TX_AMP_ADJ | + MVEBU_COMPHY_GEN1_S0_TX_EMPH_EN; + writel(val, priv->base + MVEBU_COMPHY_GEN1_S0(lane->id)); + + /* Set G2 TX amplitude and TX post emphasis value */ + val = readl(priv->base + MVEBU_COMPHY_GEN2_S0(lane->id)); + val &= ~(MVEBU_COMPHY_GEN2_S0_TX_AMP(0x1f) | + MVEBU_COMPHY_GEN2_S0_TX_EMPH(0xf)); + val |= MVEBU_COMPHY_GEN2_S0_TX_AMP(0xa) | + MVEBU_COMPHY_GEN2_S0_TX_EMPH(0x2) | + MVEBU_COMPHY_GEN2_S0_TX_AMP_ADJ | + MVEBU_COMPHY_GEN2_S0_TX_EMPH_EN; + writel(val, priv->base + MVEBU_COMPHY_GEN2_S0(lane->id)); + + /* Set G3 TX amplitude and TX post emphasis value */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S0(lane->id)); + val &= ~(MVEBU_COMPHY_GEN3_S0_TX_AMP(0x1f) | + MVEBU_COMPHY_GEN3_S0_TX_EMPH(0xf) | + MVEBU_COMPHY_GEN3_S0_TX_SLEW_RATE_SEL(0x7) | + MVEBU_COMPHY_GEN3_S0_TX_SLEW_CTRL_EN); + val |= MVEBU_COMPHY_GEN3_S0_TX_AMP(lane->sata_gen3_s0_amplitude) | + MVEBU_COMPHY_GEN3_S0_TX_EMPH(lane->sata_gen3_s0_emphasis) | + MVEBU_COMPHY_GEN3_S0_TX_SLEW_RATE_SEL(0x4) | + MVEBU_COMPHY_GEN3_S0_TX_AMP_ADJ | + MVEBU_COMPHY_GEN3_S0_TX_EMPH_EN; + writel(val, priv->base + MVEBU_COMPHY_GEN3_S0(lane->id)); + + /* SERDES External Configuration 2 register */ + val = readl(priv->base + MVEBU_COMPHY_SERDES_CFG2(lane->id)); + val |= MVEBU_COMPHY_SERDES_CFG2_SSC_EN; + writel(val, priv->base + MVEBU_COMPHY_SERDES_CFG2(lane->id)); + + /* DFE reset sequence */ + val = readl(priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + val |= MVEBU_COMPHY_PWR_CTR_RST_DFE; + writel(val, priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + val = readl(priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + val &= ~MVEBU_COMPHY_PWR_CTR_RST_DFE; + writel(val, priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + + /* SW reset for interrupt logic */ + val = readl(priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + val |= MVEBU_COMPHY_PWR_CTR_SOFT_RST; + writel(val, priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + val = readl(priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + val &= ~MVEBU_COMPHY_PWR_CTR_SOFT_RST; + writel(val, priv->base + MVEBU_COMPHY_PWR_CTR(lane->id)); + + /* wait for PLL ready */ + readl_poll_timeout(priv->base + MVEBU_COMPHY_SERDES_STATUS0(lane->id), + val, + val & (MVEBU_COMPHY_SERDES_STATUS0_RX_PLL_RDY | + MVEBU_COMPHY_SERDES_STATUS0_TX_PLL_RDY), + 1000, 150000); + if (!(val & (MVEBU_COMPHY_SERDES_STATUS0_RX_PLL_RDY | + MVEBU_COMPHY_SERDES_STATUS0_TX_PLL_RDY))) + return -ETIMEDOUT; + + return 0; +} + +static int mvebu_comphy_set_mode_usb3(struct phy *phy) +{ + struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); + struct mvebu_comphy_priv *priv = lane->priv; + u32 val; + + mvebu_comphy_usb3_init_reset(lane); + + /* select de-emphasize 3.5db */ + val = readl(priv->base + MVEBU_COMPHY_LANE_CFG0(lane->id)); + val |= MVEBU_COMPHY_LANE_CFG0_PRD_TXEEMPH0; + writel(val, priv->base + MVEBU_COMPHY_LANE_CFG0(lane->id)); + + /* override tx margining from the MAC */ + val = readl(priv->base + MVEBU_COMPHY_MODE_CTRL(lane->id)); + val |= MVEBU_COMPHY_MODE_CTRL_MODE_MARGIN; + writel(val, priv->base + MVEBU_COMPHY_MODE_CTRL(lane->id)); + + /* Start analog paramters from ETP(HW) */ + val = readl(priv->base + MVEBU_COMPHY_LANE_CFG4(lane->id)); + val &= ~MVEBU_COMPHY_LANE_CFG4_DFE_CTRL(0x7); + val |= MVEBU_COMPHY_LANE_CFG4_DFE_CTRL(0x1); + val |= MVEBU_COMPHY_LANE_CFG4_DFE_OVER; + val |= MVEBU_COMPHY_LANE_CFG4_DFE_SSC; + writel(val, priv->base + MVEBU_COMPHY_LANE_CFG4(lane->id)); + + /* Release from PIPE soft reset */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_RST; + writel(val, priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + + /* wait for PLL ready */ + readl_poll_timeout(priv->base + MVEBU_COMPHY_LANE_STATUS0(lane->id), + val, + val & MVEBU_COMPHY_LANE_STATUS0_PCLK_EN, + 1000, 150000); + if (!(val & MVEBU_COMPHY_LANE_STATUS0_PCLK_EN)) + return -ETIMEDOUT; + + return 0; +} + +static int mvebu_comphy_pcie_get_width(struct mvebu_comphy_lane *lane) +{ + int i; + struct mvebu_comphy_priv *priv = lane->priv; + int ret; + + if (lane->id == 4 || lane->id == 5) { + return 1; + } + + for (ret = 0, i = 0; i < 4; ++i) { + if (priv->modes[i] == PHY_MODE_PCIE) + ++ret; + else + break; + } + + if (ret == 0 || ret == 3) + /* + * filter out invalid configurations. + */ + return -EINVAL; + + return ret; +} + +static int mvebu_comphy_set_mode_pcie(struct phy *phy) +{ + struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); + struct mvebu_comphy_priv *priv = lane->priv; + int pcie_clk_config; + int pcie_width; + u32 val; + int start_lane; + int end_lane; + int i; + + /* + * first get PCIe clk configuration from sample at reset + * register. + * values for pcie_clk_config: + * - 0: external PCIe clock generation + * - 1: internal PCIe clock generation + * + * NOTE: on A8K, only the master CP holds the proper pcie + * clock configuration. the PCIE1 bit control the clock + * configuration for both lane 4 and lane 5. + * + * FIXME: we should use the CP1 configuration values when + * initialising the CP1 PCIe interfaces. + */ + regmap_read(priv->sar_regmap, DEVICE_SAR0, &val); + if (lane->id == 4 || lane->id == 5) { + pcie_clk_config = !!(val & DEV_SAR0_PCIE1_CLK_CP0); + } else { + pcie_clk_config = !!(val & DEV_SAR0_PCIE0_CLK_CP0); + } + + pcie_width = mvebu_comphy_pcie_get_width(lane); + if (pcie_width < 0) + return pcie_width; + + /* + * PCIe width configuration on lane 0 + */ + if (lane->id == 0) { + regmap_read(priv->regmap, MVEBU_COMPHY_SD1_CTRL1, &val); + switch (pcie_width) { + case 1: + val &= ~MVEBU_COMPHY_SD1_CTRL1_PCIE_X2_EN; + val &= ~MVEBU_COMPHY_SD1_CTRL1_PCIE_X4_EN; + break; + case 2: + val |= MVEBU_COMPHY_SD1_CTRL1_PCIE_X2_EN; + val &= ~MVEBU_COMPHY_SD1_CTRL1_PCIE_X4_EN; + break; + case 4: + val &= ~MVEBU_COMPHY_SD1_CTRL1_PCIE_X2_EN; + val |= MVEBU_COMPHY_SD1_CTRL1_PCIE_X4_EN; + break; + } + regmap_write(priv->regmap, MVEBU_COMPHY_SD1_CTRL1, val); + } + + /* + * if PCIe clock is output and clock source from SerDes lane + * 5, need to configure the clock-source MUX. By default, the + * clock source is from lane 4 + */ + if (pcie_clk_config && lane->id == 5) { + regmap_read(priv->cp_mgmt_regmap, DFX_DEV_GEN_CTRL12, &val); + val &= ~DFX_DEV_GEN_CTRL12_CLK_SRC(0x7); + val |= DFX_DEV_GEN_CTRL12_CLK_SRC(0x3); + regmap_write(priv->cp_mgmt_regmap, DFX_DEV_GEN_CTRL12, val); + } + + mvebu_comphy_pcie_init_reset(lane, pcie_clk_config, pcie_width); + + val = readl(priv->base + MVEBU_COMPHY_PCIE_REG0(lane->id)); + val |= MVEBU_COMPHY_PCIE_REG0_IDLE_SYNC; + val &= ~MVEBU_COMPHY_PCIE_REG0_SEL_BITS(0x3); + val |= MVEBU_COMPHY_PCIE_REG0_SEL_BITS(0x2); + writel(val, priv->base + MVEBU_COMPHY_PCIE_REG0(lane->id)); + + + val = readl(priv->base + MVEBU_COMPHY_TX_TRAIN_CTRL(lane->id)); + val |= MVEBU_COMPHY_TX_TRAIN_CTRL_G1; + val |= MVEBU_COMPHY_TX_TRAIN_CTRL_GN1; + val &= ~MVEBU_COMPHY_TX_TRAIN_CTRL_G0; + writel(val, priv->base + MVEBU_COMPHY_TX_TRAIN_CTRL(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_TX_TRAIN_PRESET(lane->id)); + val &= ~MVEBU_COMPHY_TX_TRAIN_CHK_INIT; + val |= MVEBU_COMPHY_TX_TRAIN_COEF_FM_PIN_PCIE3; + writel(val, priv->base + MVEBU_COMPHY_TX_TRAIN_PRESET(lane->id)); + + /* Set Preset sweep configurations */ + val = readl(priv->base + MVEBU_COMPHY_TX_TRAINING11(lane->id)); + val |= MVEBU_COMPHY_TX_TRAINING11_CHECK_MODE; + val |= MVEBU_COMPHY_TX_TRAINING11_PRESET_NUM(0x7); + val |= MVEBU_COMPHY_TX_TRAINING11_PRESET_EN; + writel(val, priv->base + MVEBU_COMPHY_TX_TRAINING11(lane->id)); + + /* Tx train start configuration */ + val = readl(priv->base + MVEBU_COMPHY_TRAINING5(lane->id)); + val |= MVEBU_COMPHY_TRAINING5_START_SQ_EN; + val &= ~MVEBU_COMPHY_TRAINING5_FRM_DET_EN; + val &= ~MVEBU_COMPHY_TRAINING5_FRM_LOCK_EN; + val |= MVEBU_COMPHY_TRAINING5_WAIT_TIME_EN; + writel(val, priv->base + MVEBU_COMPHY_TRAINING5(lane->id)); + + /* Enable Tx train P2P */ + val = readl(priv->base + MVEBU_COMPHY_TRAINING0(lane->id)); + val |= MVEBU_COMPHY_TRAINING0_P2P_HOLD; + writel(val, priv->base + MVEBU_COMPHY_TRAINING0(lane->id)); + + + /* Configure Tx train timeout */ + val = readl(priv->base + MVEBU_COMPHY_TRAINING4(lane->id)); + val &= ~MVEBU_COMPHY_TRAINING4_TIMER(0x3ff); + val |= MVEBU_COMPHY_TRAINING4_TIMER(0x17); + writel(val, priv->base + MVEBU_COMPHY_TRAINING4(lane->id)); + + /* Disable G0/G1/GN1 adaptation */ + val = readl(priv->base + MVEBU_COMPHY_TX_TRAIN_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_TX_TRAIN_CTRL_G1; + val &= ~MVEBU_COMPHY_TX_TRAIN_CTRL_GN1; + val &= ~MVEBU_COMPHY_TX_TRAIN_CTRL_G0; + writel(val, priv->base + MVEBU_COMPHY_TX_TRAIN_CTRL(lane->id)); + + /* Disable DTL frequency loop */ + val = readl(priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_DTL_CTRL_DTL_FLOOP_EN; + writel(val, priv->base + MVEBU_COMPHY_DTL_CTRL(lane->id)); + + /* Configure G3 DFE */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S4(lane->id)); + val &= ~MVEBU_COMPHY_GEN3_S4_DFE_RES(0x3); + val |= MVEBU_COMPHY_GEN3_S4_DFE_RES(0x3); + writel(val, priv->base + MVEBU_COMPHY_GEN3_S4(lane->id)); + + /* Use TX/RX training result for DFE */ + val = readl(priv->base + MVEBU_COMPHY_DFE_RES(lane->id)); + val &= ~MVEBU_COMPHY_DFE_RES_FORCE_GEN_TBL; + writel(val, priv->base + MVEBU_COMPHY_DFE_RES(lane->id)); + + /* Configure initial and final coefficient value for receiver */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S1(lane->id)); + val &= ~(MVEBU_COMPHY_GEN3_S1_RX_MUL_PI(0x7) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_PF(0x7) | + MVEBU_COMPHY_GEN3_S1_SMPL_INPX2_EN); + val |= MVEBU_COMPHY_GEN3_S1_RX_MUL_PI(0x1) | + MVEBU_COMPHY_GEN3_S1_RX_MUL_PF(0x1); + writel(val, priv->base + MVEBU_COMPHY_GEN3_S1(lane->id)); + + /* Trigger sampler enable pulse */ + val = readl(priv->base + MVEBU_SP_CALIB(lane->id)); + val |= MVEBU_SP_CALIB_SAMPLER_EN; + writel(val, priv->base + MVEBU_SP_CALIB(lane->id)); + udelay(5); + val = readl(priv->base + MVEBU_SP_CALIB(lane->id)); + val &= ~MVEBU_SP_CALIB_SAMPLER_EN; + writel(val, priv->base + MVEBU_SP_CALIB(lane->id)); + + /* FFE resistor tuning for different bandwidth */ + /* G3 Setting 3 */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S3(lane->id)); + val &= ~(MVEBU_COMPHY_GEN3_S3_FFE_DEG_RES_LVL(0x3) | + MVEBU_COMPHY_GEN3_S3_FFE_LOAD_RES_LVL(0x3)); + val |= MVEBU_COMPHY_GEN3_S3_FFE_DEG_RES_LVL(0x1) | + MVEBU_COMPHY_GEN3_S3_FFE_LOAD_RES_LVL(0x3); + writel(val, priv->base + MVEBU_COMPHY_GEN3_S3(lane->id)); + + /* Pattern lock lost timeout disable */ + val = readl(priv->base + MVEBU_COMPHY_FRAME_DETECT3(lane->id)); + val &= ~MVEBU_COMPHY_FRAME_DETECT3_LOST_TIMEOUT_EN; + writel(val, priv->base + MVEBU_COMPHY_FRAME_DETECT3(lane->id)); + + /* Configure DFE adaptations */ + val = readl(priv->base + MVEBU_COMPHY_CDR_CONTROL(lane->id)); + val &= ~MVEBU_COMPHY_CDR_CONTROL_RX_MAX_DFE_ADAPT_1(0x3); + val &= ~MVEBU_COMPHY_CDR_CONTROL_MAX_DFE_ADAPT_1(0x7); + val &= ~MVEBU_COMPHY_CDR_CONTROL_MAX_DFE_ADAPT_0(0x7); + val |= MVEBU_COMPHY_CDR_CONTROL_RX_MAX_DFE_ADAPT_1(0x0); + val |= MVEBU_COMPHY_CDR_CONTROL_MAX_DFE_ADAPT_1(0x1); + val |= MVEBU_COMPHY_CDR_CONTROL_MAX_DFE_ADAPT_0(0x0); + writel(val, priv->base + MVEBU_COMPHY_CDR_CONTROL(lane->id)); + + val = readl(priv->base + MVEBU_COMPHY_DFE_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_DFE_CTRL_TX_MAX_DFE_ADAPT(0x3); + writel(val, priv->base + MVEBU_COMPHY_DFE_CTRL(lane->id)); + + /* Generation 2 setting 1*/ + val = readl(priv->base + MVEBU_COMPHY_GEN2_S1(lane->id)); + val &= ~MVEBU_COMPHY_GEN2_S1_RX_MUL_PI(0x7); + val &= ~MVEBU_COMPHY_GEN2_S1_RX_MUL_PF(0x7); + val &= ~MVEBU_COMPHY_GEN2_S1_RX_MUL_FI(0x3); + val |= MVEBU_COMPHY_GEN2_S1_RX_MUL_PI(0x0); + val |= MVEBU_COMPHY_GEN2_S1_RX_MUL_PF(0x1); + val |= MVEBU_COMPHY_GEN2_S1_RX_MUL_FI(0x0); + writel(val, priv->base + MVEBU_COMPHY_GEN2_S1(lane->id)); + + /* DFE enable */ + val = readl(priv->base + MVEBU_COMPHY_GEN2_S4(lane->id)); + val &= ~MVEBU_COMPHY_GEN2_S4_DFE_RES(0x3); + val |= MVEBU_COMPHY_GEN2_S4_DFE_RES(0x3); + writel(val, priv->base + MVEBU_COMPHY_GEN2_S4(lane->id)); + + /* Configure DFE Resolution */ + val = readl(priv->base + MVEBU_COMPHY_LANE_CFG4(lane->id)); + val |= MVEBU_COMPHY_LANE_CFG4_DFE_EN_SEL; + writel(val, priv->base + MVEBU_COMPHY_LANE_CFG4(lane->id)); + + /* VDD calibration control */ + val = readl(priv->base + MVEBU_COMPHY_EXT_SELV(lane->id)); + val &= ~MVEBU_COMPHY_EXT_SELV_RX_SAMPL(0x1f); + val |= MVEBU_COMPHY_EXT_SELV_RX_SAMPL(0x16); + writel(val, priv->base + MVEBU_COMPHY_EXT_SELV(lane->id)); + + /* Set PLL Charge-pump Current Control */ + val = readl(priv->base + MVEBU_COMPHY_GEN3_S5(lane->id)); + val &= ~MVEBU_COMPHY_GEN3_S5_ICP(0xf); + val |= MVEBU_COMPHY_GEN3_S5_ICP(0x4); + writel(val, priv->base + MVEBU_COMPHY_GEN3_S5(lane->id)); + + /* Set lane equalization remote setting */ + val = readl(priv->base + MVEBU_COMPHY_LANE_EQ_REMOTE_CFG(lane->id)); + val |= MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_DIRN_OVERRIDE; + val |= MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_ONLY_MODE; + val &= ~MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_PRESET_VECTOR(0xf); + val |= MVEBU_COMPHY_LANE_EQ_REMOTE_CFG_PRESET_VECTOR(0x2); + writel(val, priv->base + MVEBU_COMPHY_LANE_EQ_REMOTE_CFG(lane->id)); + + /* Set phy in root complex mode */ + val = readl(priv->base + MVEBU_COMPHY_EQ_CONFIG0(lane->id)); + val |= MVEBU_COMPHY_EQ_CONFIG0_RC_MODE; + writel(val, priv->base + MVEBU_COMPHY_EQ_CONFIG0(lane->id)); + + /* we're done for now if we are not in the last lane. */ + if (pcie_width > 1 && lane->id != (pcie_width - 1)) + return 0; + + if (pcie_width > 1) { + /* + * for x2 or x4: we need to release the pipe reset in + * one single write on all comphys. + */ + regmap_read(priv->regmap, MVEBU_COMPHY_SD1_CTRL1, &val); + if (pcie_width == 2) + val &= ~MVEBU_COMPHY_SD1_CTRL1_PHY0_1_MASK; + else + val &= ~MVEBU_COMPHY_SD1_CTRL1_PHY0_3_MASK; + regmap_write(priv->regmap, MVEBU_COMPHY_SD1_CTRL1, val); + + /* + * now all writes to comphy register block 0 will hit + * all PCIe PHYs. + */ + val = readl(priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(0)); + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_RST; + writel(val, priv->base + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(0)); + + /* + * restore writes to all individual phys. + */ + regmap_read(priv->regmap, MVEBU_COMPHY_SD1_CTRL1, &val); + if (pcie_width == 2) + val |= 0x0010; + else + val |= 0x3210; + regmap_write(priv->regmap, MVEBU_COMPHY_SD1_CTRL1, val); + + start_lane = 0; + end_lane = pcie_width - 1; + } else { + /* release pipe soft reset */ + val = readl(priv->base + + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + val &= ~MVEBU_COMPHY_PIPE_RST_CLK_CTRL_RST; + writel(val, priv->base + + MVEBU_COMPHY_PIPE_RST_CLK_CTRL(lane->id)); + start_lane = end_lane = lane->id; + } + + for (i = start_lane; i <= end_lane; ++i) { + readl_poll_timeout(priv->base + MVEBU_COMPHY_LANE_STATUS0(i), + val, + val & MVEBU_COMPHY_LANE_STATUS0_PCLK_EN, + 1000, 150000); + if (!(val & MVEBU_COMPHY_LANE_STATUS0_PCLK_EN)) { + printk("timedout waiting for lane pclk on lane %d\n", + lane->id); + return -ETIMEDOUT; + } + } + + return 0; +} + static int mvebu_comphy_power_on_legacy(struct phy *phy) { struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); struct mvebu_comphy_priv *priv = lane->priv; - int ret, mux; + int ret, mux = 0, pipe_mux = 0, mux_val; u32 val; - mux = mvebu_comphy_get_mux(lane->id, lane->port, + mux_val = mvebu_comphy_get_mux(lane->id, lane->port, lane->mode, lane->submode); + if (mux < 0) return -ENOTSUPP; + if (phy_mode_is_pipe_mode(lane->mode)) + pipe_mux = mux_val; + else + mux = mux_val; + regmap_read(priv->regmap, MVEBU_COMPHY_PIPE_SELECTOR, &val); val &= ~(0xf << MVEBU_COMPHY_PIPE_SELECTOR_PIPE(lane->id)); + val |= pipe_mux << MVEBU_COMPHY_PIPE_SELECTOR_PIPE(lane->id); regmap_write(priv->regmap, MVEBU_COMPHY_PIPE_SELECTOR, val); regmap_read(priv->regmap, MVEBU_COMPHY_SELECTOR, &val); @@ -740,6 +1859,8 @@ val |= mux << MVEBU_COMPHY_SELECTOR_PHY(lane->id); regmap_write(priv->regmap, MVEBU_COMPHY_SELECTOR, val); + switch (lane->mode) { + case PHY_MODE_ETHERNET: switch (lane->submode) { case PHY_INTERFACE_MODE_SGMII: case PHY_INTERFACE_MODE_2500BASEX: @@ -751,6 +1872,18 @@ case PHY_INTERFACE_MODE_10GBASER: ret = mvebu_comphy_set_mode_10gbaser(phy); break; + } + break; + case PHY_MODE_SATA: + ret = mvebu_comphy_set_mode_sata(phy); + break; + case PHY_MODE_USB_HOST_SS: + case PHY_MODE_USB_DEVICE_SS: + ret = mvebu_comphy_set_mode_usb3(phy); + break; + case PHY_MODE_PCIE: + ret = mvebu_comphy_set_mode_pcie(phy); + break; default: return -ENOTSUPP; } @@ -760,6 +1893,20 @@ val |= MVEBU_COMPHY_SERDES_CFG1_RF_RESET; writel(val, priv->base + MVEBU_COMPHY_SERDES_CFG1(lane->id)); + /* + * swap rx/tx N/P polarities if needed. + */ + val = readl(priv->base + MVEBU_COMPHY_SYNC_PATTERN(lane->id)); + if (lane->rx_swap_polarity) + val |= MVEBU_COMPHY_SYNC_PATTERN_RXD_INV; + else + val &= ~MVEBU_COMPHY_SYNC_PATTERN_RXD_INV; + if (lane->tx_swap_polarity) + val |= MVEBU_COMPHY_SYNC_PATTERN_TXD_INV; + else + val &= ~MVEBU_COMPHY_SYNC_PATTERN_TXD_INV; + writel(val, priv->base + MVEBU_COMPHY_SYNC_PATTERN(lane->id)); + return ret; } @@ -838,10 +1985,10 @@ return ret; if (ret == -EOPNOTSUPP) - dev_err(priv->dev, + dev_dbg(priv->dev, "unsupported SMC call, try updating your firmware\n"); - dev_warn(priv->dev, + dev_dbg(priv->dev, "Firmware could not configure PHY %d with mode %d (ret: %d), trying legacy method\n", lane->id, lane->mode, ret); @@ -861,6 +2008,7 @@ if (mvebu_comphy_get_fw_mode(lane->id, lane->port, mode, submode) < 0) return -EINVAL; + lane->priv->modes[lane->id] = mode; lane->mode = mode; lane->submode = submode; @@ -883,6 +2031,11 @@ MVEBU_COMPHY_SERDES_CFG1_RF_RESET); writel(val, priv->base + MVEBU_COMPHY_SERDES_CFG1(lane->id)); + regmap_read(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), &val); + val &= ~MVEBU_COMPHY_CONF1_POR; + val &= ~MVEBU_COMPHY_CONF1_CORE_RESET; + regmap_write(priv->regmap, MVEBU_COMPHY_CONF1(lane->id), val); + regmap_read(priv->regmap, MVEBU_COMPHY_SELECTOR, &val); val &= ~(0xf << MVEBU_COMPHY_SELECTOR_PHY(lane->id)); regmap_write(priv->regmap, MVEBU_COMPHY_SELECTOR, val); @@ -967,8 +2120,21 @@ if (ret < 0) goto dis_mg_core_clk; + priv->gop_clk = devm_clk_get(priv->dev, "gop_clk"); + if (IS_ERR(priv->gop_clk)) { + ret = PTR_ERR(priv->gop_clk); + goto dis_axi_clk; + } + + ret = clk_prepare_enable(priv->gop_clk); + if (ret < 0) + goto dis_axi_clk; + return 0; +dis_axi_clk: + clk_disable_unprepare(priv->axi_clk); + dis_mg_core_clk: clk_disable_unprepare(priv->mg_core_clk); @@ -984,6 +2150,9 @@ static void mvebu_comphy_disable_unprepare_clks(struct mvebu_comphy_priv *priv) { + if (priv->mg_core_clk) + clk_disable_unprepare(priv->gop_clk); + if (priv->axi_clk) clk_disable_unprepare(priv->axi_clk); @@ -994,6 +2163,217 @@ clk_disable_unprepare(priv->mg_domain_clk); } +static void fixup_debugfs_path(char *buf) +{ + while (*buf) { + if (*buf == '/') + *buf = '-'; + ++buf; + } +} + +/* + * create base directory for this comphy block, we use the device tree + * OF path, with the '/'s replaced with '-'s. + * + * example: + * mvebu-comphy-cp0-config-space@f2000000-phy@120000 + */ +static void mvebu_comphy_debugfs_init_root(struct mvebu_comphy_priv *priv) +{ + struct dentry *d; + char buf[64]; + + snprintf(buf, sizeof (buf), "mvebu-comphy%pOF", priv->dev->of_node); + + fixup_debugfs_path(buf); + + d = debugfs_create_dir(buf, NULL); + if (IS_ERR(d)) { + dev_dbg(priv->dev, "unable to create %s debugfs " + "directory: %ld.\n", buf, PTR_ERR(d)); + return ; + } + + priv->debugfs_root = d; +} + +/* + * structure for file private data used in attr show/write callbacks. + */ +struct kr_attr_data { + u32 *v; + struct phy *phy; + struct mvebu_comphy_lane *lane; + ptrdiff_t offset; +}; + +/* + * + */ +static ssize_t mvebu_comphy_show_10gkr_attr(struct file *file, + char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct kr_attr_data *data = file->private_data; + char buf[32]; + + snprintf(buf, sizeof (buf), "0x%x\n", *data->v); + return simple_read_from_buffer(user_buf, count, ppos, buf, strlen(buf)); +} + +/* + * write a KR attributes. + */ +static ssize_t mvebu_comphy_write_10gkr_attr(struct file *file, + const char __user *user_buf, + size_t count, loff_t *ppos) +{ + struct kr_attr_data *data = file->private_data; + char buf[32] = {0}; + int err; + u32 my_val; + u32 limit = 0; + + + err = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, + count); + if (err < 0) + return err; + + err = kstrtou32(buf, 16, &my_val); + if (err) + return err; + + /* + * sort out limit for the given value, depending on its offset + * in the mvebu_comphy_lane structure. + */ + switch (data->offset) { + case offsetof(struct mvebu_comphy_lane, kr_gen1_s0_amplitude): + limit = 0x1f; + break; + case offsetof(struct mvebu_comphy_lane, kr_gen1_s0_emphasis): + limit = 0xf; + break; + case offsetof(struct mvebu_comphy_lane, kr_gen1_s2_emphasis): + limit = 0xf; + break; + case offsetof(struct mvebu_comphy_lane, kr_ffe_cap_sel): + limit = 0xf; + break; + case offsetof(struct mvebu_comphy_lane, kr_ffe_res_sel): + limit = 0x7; + break; + case offsetof(struct mvebu_comphy_lane, kr_dfe_res): + limit = 0x3; + break; + case offsetof(struct mvebu_comphy_lane, kr_phase_offset): + limit = 0x7f; + break; + default: + return -EINVAL; + } + + if (my_val > limit) + return -EINVAL; + + mutex_lock(&data->phy->mutex); + + /* + * do not allow change if phy is powered on. you'll need to + * bring the interface down before changing an attribute + * value. + */ + if (data->phy->power_count > 0) { + mutex_unlock(&data->phy->mutex); + return -EBUSY; + } + + *data->v = my_val; + mutex_unlock(&data->phy->mutex); + + return count; +} + +static const struct file_operations fops_10gkr_debugfs_attributes = { + .read = mvebu_comphy_show_10gkr_attr, + .write = mvebu_comphy_write_10gkr_attr, + .open = simple_open, + .llseek = default_llseek, + .owner = THIS_MODULE, +}; + +/* + * debugfs_create_x32 would have been great, but we probably want to + * make sure the user-provided data is sane, and that the phy is + * powered off before changing any attribute. + */ +static void mvebu_comphy_init_10gkr_attr(const char *name, struct dentry *d, + struct phy *phy, u32 *v) +{ + struct kr_attr_data *data = kzalloc(sizeof (*data), GFP_KERNEL); + + if (!data) + return ; + + data->phy = phy; + data->lane = phy_get_drvdata(phy); + data->v = v; + data->offset = (void*)v - (void*)data->lane; + + debugfs_create_file(name, 0600, d, data, + &fops_10gkr_debugfs_attributes); +} + +static inline bool lane_is_10gkr_capable(struct mvebu_comphy_lane *lane) +{ + return (mvebu_comphy_get_fw_mode(lane->id, 0, PHY_MODE_ETHERNET, + PHY_INTERFACE_MODE_10GBASER) >= 0) || + (mvebu_comphy_get_fw_mode(lane->id, 1, PHY_MODE_ETHERNET, + PHY_INTERFACE_MODE_10GBASER) >= 0); +} + +static void mvebu_comphy_debugfs_init_lane(struct mvebu_comphy_priv *priv, + struct phy *phy) +{ + struct dentry *d; + char buf[32]; + struct mvebu_comphy_lane *lane = phy_get_drvdata(phy); + + /* + * we currently only create attributes for 10G KR settings, so + * do not clobber debugfs with lanes that do not support 10G + * KR. + */ + if (!lane_is_10gkr_capable(lane) || !priv->debugfs_root) + return ; + + snprintf(buf, sizeof (buf), "lane-%d", lane->id); + d = debugfs_create_dir(buf, priv->debugfs_root); + if (IS_ERR(d)) { + dev_dbg(priv->dev, "unable to create %s debugfs " + "directory: %ld\n", buf, PTR_ERR(d)); + return ; + } + + mvebu_comphy_init_10gkr_attr("kr_gen1_s0_amplitude", d, phy, + &lane->kr_gen1_s0_amplitude); + mvebu_comphy_init_10gkr_attr("kr_gen1_s0_emphasis", d, phy, + &lane->kr_gen1_s0_emphasis); + mvebu_comphy_init_10gkr_attr("kr_gen1_s2_emphasis", d, phy, + &lane->kr_gen1_s2_emphasis); + + mvebu_comphy_init_10gkr_attr("kr_ffe_cap_sel", d, phy, + &lane->kr_ffe_cap_sel); + mvebu_comphy_init_10gkr_attr("kr_ffe_res_sel", d, phy, + &lane->kr_ffe_res_sel); + mvebu_comphy_init_10gkr_attr("kr_dfe_res", d, phy, + &lane->kr_dfe_res); + mvebu_comphy_init_10gkr_attr("kr_phase_offset", d, phy, + &lane->kr_phase_offset); +} + static int mvebu_comphy_probe(struct platform_device *pdev) { struct mvebu_comphy_priv *priv; @@ -1012,10 +2392,25 @@ "marvell,system-controller"); if (IS_ERR(priv->regmap)) return PTR_ERR(priv->regmap); + + priv->sar_regmap = + syscon_regmap_lookup_by_phandle(pdev->dev.of_node, + "marvell,sar"); + if (IS_ERR(priv->sar_regmap)) + return PTR_ERR(priv->sar_regmap); + + priv->cp_mgmt_regmap = + syscon_regmap_lookup_by_phandle(pdev->dev.of_node, + "marvell,cp_mgmt"); + if (IS_ERR(priv->cp_mgmt_regmap)) + return PTR_ERR(priv->cp_mgmt_regmap); + priv->base = devm_platform_get_and_ioremap_resource(pdev, 0, &res); if (IS_ERR(priv->base)) return PTR_ERR(priv->base); + mvebu_comphy_debugfs_init_root(priv); + /* * Ignore error if clocks have not been initialized properly for DT * compatibility reasons. @@ -1071,13 +2466,63 @@ lane->port = -1; phy_set_drvdata(phy, lane); + lane->kr_gen1_s0_amplitude = DEFAULT_GEN1_S0_AMP; + lane->kr_gen1_s0_emphasis = DEFAULT_GEN1_S0_EMPH; + lane->kr_gen1_s2_emphasis = DEFAULT_GEN1_S2_EMPH; + lane->kr_ffe_cap_sel = KR_DEFAULT_FFE_CAP_SEL; + lane->kr_ffe_res_sel = KR_DEFAULT_FFE_RES_SEL; + lane->kr_phase_offset = KR_DEFAULT_PHASE_OFFSET; + lane->kr_dfe_res = KR_DEFAULT_DFE_RES; + + /* + * fetch optional 10GKR amplitude and emphasis + * parameters from device tree for this comphy. + */ + of_property_read_u32(child, "kr-gen1-s0-amplitude", + &lane->kr_gen1_s0_amplitude); + of_property_read_u32(child, "kr-gen1-s0-emphasis", + &lane->kr_gen1_s0_emphasis); + of_property_read_u32(child, "kr-gen1-s2-emphasis", + &lane->kr_gen1_s2_emphasis); + of_property_read_u32(child, "kr-ffe-cap-sel", + &lane->kr_ffe_cap_sel); + of_property_read_u32(child, "kr-ffe-res-sel", + &lane->kr_ffe_res_sel); + of_property_read_u32(child, "kr-dfe-res", + &lane->kr_dfe_res); + of_property_read_u32(child, "kr-phase-offset", + &lane->kr_phase_offset); + + lane->sata_gen3_s0_amplitude = SATA_DEFAULT_GEN3_S0_AMP; + lane->sata_gen3_s0_emphasis = SATA_DEFAULT_GEN3_S0_EMPH; + lane->sata_gen3_s4_dfe_res = SATA_DEFAULT_GEN3_S4_DFE_RES; + lane->sata_phase_offset = SATA_DEFAULT_PHASE_OFFSET; /* - * All modes are supported in this driver so we could call - * mvebu_comphy_power_off(phy) here to avoid relying on the - * bootloader/firmware configuration, but for compatibility - * reasons we cannot de-configure the COMPHY without being sure - * that the firmware is up-to-date and fully-featured. + * fetch optional SATA amplitude and emphasis + * parameter from device tree, for this comphy. */ + of_property_read_u32(child, "sata-gen3-s0-amplitude", + &lane->sata_gen3_s0_amplitude); + of_property_read_u32(child, "sata-gen3-s0-emphasis", + &lane->sata_gen3_s0_emphasis); + of_property_read_u32(child, "sata-gen3-s4-dfe-res", + &lane->sata_gen3_s4_dfe_res); + of_property_read_u32(child, "sata-phase-offset", + &lane->sata_phase_offset); + + lane->rx_swap_polarity = of_property_read_bool(child, + "rx-swap-polarity"); + lane->tx_swap_polarity = of_property_read_bool(child, + "tx-swap-polarity"); + + /* + * All modes are now supported in this driver so call + * mvebu_comphy_power_off(phy) here to avoid relying + * on the bootloader/firmware configuration. + */ + mvebu_comphy_power_off(phy); + + mvebu_comphy_debugfs_init_lane(priv, phy); } dev_set_drvdata(&pdev->dev, priv); diff -ruw linux-6.13.12/drivers/pinctrl/Kconfig linux-6.13.12-fbx/drivers/pinctrl/Kconfig --- linux-6.13.12/drivers/pinctrl/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pinctrl/Kconfig 2025-09-25 17:40:34.591362386 +0200 @@ -153,6 +153,12 @@ help Pinctrl driver for Bitmain BM1880 SoC. +config PINCTRL_CORTINA + bool "Cortina-Access pin control" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + select PINMUX + select GENERIC_PINCONF + config PINCTRL_CY8C95X0 tristate "Cypress CY8C95X0 I2C pinctrl and GPIO driver" depends on I2C diff -ruw linux-6.13.12/drivers/pinctrl/Makefile linux-6.13.12-fbx/drivers/pinctrl/Makefile --- linux-6.13.12/drivers/pinctrl/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pinctrl/Makefile 2025-09-25 17:40:34.591362386 +0200 @@ -64,6 +64,7 @@ obj-y += bcm/ obj-$(CONFIG_PINCTRL_BERLIN) += berlin/ obj-y += cirrus/ +obj-$(CONFIG_PINCTRL_CORTINA) += cortina/ obj-y += freescale/ obj-$(CONFIG_X86) += intel/ obj-y += mediatek/ diff -ruw linux-6.13.12/drivers/pinctrl/bcm/Kconfig linux-6.13.12-fbx/drivers/pinctrl/bcm/Kconfig --- linux-6.13.12/drivers/pinctrl/bcm/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pinctrl/bcm/Kconfig 2025-09-25 17:40:34.595362406 +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.13.12/drivers/pinctrl/bcm/Makefile linux-6.13.12-fbx/drivers/pinctrl/bcm/Makefile --- linux-6.13.12/drivers/pinctrl/bcm/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/pinctrl/bcm/Makefile 2025-09-25 17:40:34.595362406 +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.13.12/drivers/platform/Kconfig linux-6.13.12-fbx/drivers/platform/Kconfig --- linux-6.13.12/drivers/platform/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/platform/Kconfig 2025-09-25 17:40:34.663362743 +0200 @@ -18,3 +18,11 @@ source "drivers/platform/x86/Kconfig" source "drivers/platform/arm64/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.13.12/drivers/platform/Makefile linux-6.13.12-fbx/drivers/platform/Makefile --- linux-6.13.12/drivers/platform/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/platform/Makefile 2025-09-25 17:40:34.663362743 +0200 @@ -13,3 +13,6 @@ obj-$(CONFIG_CZNIC_PLATFORMS) += cznic/ obj-$(CONFIG_SURFACE_PLATFORMS) += surface/ obj-$(CONFIG_ARM64_PLATFORM_DEVICES) += arm64/ +obj-$(CONFIG_X86_INTEL_CE) += intelce/ +obj-$(CONFIG_FBXGW7R_PLATFORM) += fbxgw7r/ +obj-$(CONFIG_QCOM_IPQ_PLATFORM) += ipq/ diff -ruw linux-6.13.12/drivers/power/reset/Kconfig linux-6.13.12-fbx/drivers/power/reset/Kconfig --- linux-6.13.12/drivers/power/reset/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/power/reset/Kconfig 2025-09-25 17:40:34.727363061 +0200 @@ -315,4 +315,12 @@ help This driver supports reset or low power mode handling for Mellanox BlueField. +config POWER_RESET_SYSCON_REASON + tristate "Generic SYSCON regmap reset reason driver" + depends on OF + depends on MFD_SYSCON + help + Say y here will enable syscon reset reason driver. This will store + reset reason (cold, soft, panic, watchdog) and expose it to sysfs. + endif diff -ruw linux-6.13.12/drivers/power/reset/Makefile linux-6.13.12-fbx/drivers/power/reset/Makefile --- linux-6.13.12/drivers/power/reset/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/power/reset/Makefile 2025-09-25 17:40:34.727363061 +0200 @@ -37,3 +37,4 @@ obj-$(CONFIG_POWER_RESET_SC27XX) += sc27xx-poweroff.o obj-$(CONFIG_NVMEM_REBOOT_MODE) += nvmem-reboot-mode.o obj-$(CONFIG_POWER_MLXBF) += pwr-mlxbf.o +obj-$(CONFIG_POWER_RESET_SYSCON_REASON) += syscon-reset-reason.o diff -ruw linux-6.13.12/drivers/regulator/Kconfig linux-6.13.12-fbx/drivers/regulator/Kconfig --- linux-6.13.12/drivers/regulator/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/regulator/Kconfig 2025-09-25 17:40:34.779363319 +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.13.12/drivers/rtc/Kconfig linux-6.13.12-fbx/drivers/rtc/Kconfig --- linux-6.13.12/drivers/rtc/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/rtc/Kconfig 2025-09-25 17:40:34.799363418 +0200 @@ -1450,6 +1450,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.13.12/drivers/rtc/Makefile linux-6.13.12-fbx/drivers/rtc/Makefile --- linux-6.13.12/drivers/rtc/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/rtc/Makefile 2025-09-25 17:40:34.799363418 +0200 @@ -102,6 +102,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.13.12/drivers/soc/bcm/Kconfig linux-6.13.12-fbx/drivers/soc/bcm/Kconfig --- linux-6.13.12/drivers/soc/bcm/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/soc/bcm/Kconfig 2025-09-25 17:40:35.059364707 +0200 @@ -1,6 +1,18 @@ # SPDX-License-Identifier: GPL-2.0-only menu "Broadcom SoC drivers" +config SOC_BCM63XX + bool "Broadcom 63xx SoC drivers" + 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. + + If unsure, say N. + +source "drivers/soc/bcm/bcm63xx/Kconfig" + config SOC_BRCMSTB bool "Broadcom STB SoC drivers" depends on ARCH_BRCMSTB || BMIPS_GENERIC || COMPILE_TEST diff -ruw linux-6.13.12/drivers/soc/bcm/Makefile linux-6.13.12-fbx/drivers/soc/bcm/Makefile --- linux-6.13.12/drivers/soc/bcm/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/soc/bcm/Makefile 2025-09-25 17:40:35.059364707 +0200 @@ -1,2 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only obj-$(CONFIG_SOC_BRCMSTB) += brcmstb/ +obj-$(CONFIG_SOC_BCM63XX) += bcm63xx/ diff -ruw linux-6.13.12/drivers/soc/qcom/Kconfig linux-6.13.12-fbx/drivers/soc/qcom/Kconfig --- linux-6.13.12/drivers/soc/qcom/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/soc/qcom/Kconfig 2025-09-25 17:40:35.087364846 +0200 @@ -295,4 +295,11 @@ This module provides the APIs to the client drivers that wants to send the PBS trigger event to the PBS RAM. +config QCOM_IMEM_RESET_REASON + tristate "QCOM IMEM based reset reason" + depends on ARCH_QCOM || COMPILE_TEST + +config QCOM_LICENSE_MANAGER_SIMPLE + tristate "QCOM Simple License Manager Driver" + endmenu diff -ruw linux-6.13.12/drivers/soc/qcom/Makefile linux-6.13.12-fbx/drivers/soc/qcom/Makefile --- linux-6.13.12/drivers/soc/qcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/soc/qcom/Makefile 2025-09-25 17:40:35.087364846 +0200 @@ -39,3 +39,7 @@ qcom_ice-objs += ice.o obj-$(CONFIG_QCOM_INLINE_CRYPTO_ENGINE) += qcom_ice.o obj-$(CONFIG_QCOM_PBS) += qcom-pbs.o + +obj-$(CONFIG_QCOM_IMEM_RESET_REASON) += qcom-imem-reset-reason.o + +obj-$(CONFIG_QCOM_LICENSE_MANAGER_SIMPLE) += qcom-license-manager-simple.o diff -ruw linux-6.13.12/drivers/spi/Kconfig linux-6.13.12-fbx/drivers/spi/Kconfig --- linux-6.13.12/drivers/spi/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/spi/Kconfig 2025-09-25 17:40:35.107364945 +0200 @@ -308,6 +308,19 @@ This enables support for the Coldfire QSPI controller in master mode. +config SPI_CORTINA + tristate "Cortina-Access host SPI controller" + depends on ARCH_CORTINA || COMPILE_TEST + default ARCH_CORTINA_ACCESS + help + This enables support for the Cortina-Access host SPI controller + +config SPI_CORTINA_SFLASH + tristate "Cortina-Access serial flash controller driver" + depends on MACH_CORTINA_SATURN || COMPILE_TEST + depends on SPI_MEM + default MACH_CORTINA_SATURN + config SPI_CS42L43 tristate "Cirrus Logic CS42L43 SPI controller" depends on MFD_CS42L43 && PINCTRL_CS42L43 @@ -843,6 +856,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 || (X86 && (PCI || ACPI)) || COMPILE_TEST diff -ruw linux-6.13.12/drivers/spi/Makefile linux-6.13.12-fbx/drivers/spi/Makefile --- linux-6.13.12/drivers/spi/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/spi/Makefile 2025-09-25 17:40:35.107364945 +0200 @@ -43,6 +43,8 @@ obj-$(CONFIG_SPI_CH341) += spi-ch341.o obj-$(CONFIG_SPI_CLPS711X) += spi-clps711x.o obj-$(CONFIG_SPI_COLDFIRE_QSPI) += spi-coldfire-qspi.o +obj-$(CONFIG_SPI_CORTINA) += spi-cortina.o +obj-$(CONFIG_SPI_CORTINA_SFLASH) += spi-cortina-sflash.o obj-$(CONFIG_SPI_CS42L43) += spi-cs42l43.o obj-$(CONFIG_SPI_DAVINCI) += spi-davinci.o obj-$(CONFIG_SPI_DLN2) += spi-dln2.o @@ -107,6 +109,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 obj-$(CONFIG_SPI_PXA2XX) += spi-pxa2xx-core.o diff -ruw linux-6.13.12/drivers/spi/spi-orion.c linux-6.13.12-fbx/drivers/spi/spi-orion.c --- linux-6.13.12/drivers/spi/spi-orion.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/spi/spi-orion.c 2025-09-25 17:40:35.119365005 +0200 @@ -45,6 +45,9 @@ /* Register for the "Direct Mode" */ #define SPI_DIRECT_WRITE_CONFIG_REG 0x20 +/* per-CS register parameters */ +#define SPI_CSN_TIMING_PARM_REGS(n) (0x30 + 4 * (n)) + #define ORION_SPI_TMISO_SAMPLE_MASK (0x3 << 6) #define ORION_SPI_TMISO_SAMPLE_1 (1 << 6) #define ORION_SPI_TMISO_SAMPLE_2 (2 << 6) @@ -729,6 +732,25 @@ goto out_rel_axi_clk; } + /* + * on A8K (using a380 compatible) and A380, there are per-CS + * timing parameters registers, which may be used and left + * active by the bootloader. + * + * This drivers uses the global timing parameter register(s) + * and interface configuration register, and could silently + * fallback to previously configured per-CS timing parameters, + * unless those registers are cleared beforehand. + */ + if (of_device_is_compatible(pdev->dev.of_node, + "marvell,armada-380-spi")) { + int cs; + + for (cs = 0; cs < 8; ++cs) + writel(0x0, spi->base + SPI_CSN_TIMING_PARM_REGS(cs)); + + } + for_each_available_child_of_node(pdev->dev.of_node, np) { struct orion_direct_acc *dir_acc; u32 cs; diff -ruw linux-6.13.12/drivers/tee/optee/smc_abi.c linux-6.13.12-fbx/drivers/tee/optee/smc_abi.c --- linux-6.13.12/drivers/tee/optee/smc_abi.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/tee/optee/smc_abi.c 2025-09-25 17:40:35.219365501 +0200 @@ -1770,9 +1770,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; + } INIT_WORK(&optee->rpmb_scan_bus_work, optee_bus_scan_rpmb); optee->rpmb_intf.notifier_call = optee_rpmb_intf_rdev; diff -ruw linux-6.13.12/drivers/thermal/Kconfig linux-6.13.12-fbx/drivers/thermal/Kconfig --- linux-6.13.12/drivers/thermal/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/thermal/Kconfig 2025-09-25 17:40:35.219365501 +0200 @@ -435,6 +435,11 @@ source "drivers/thermal/broadcom/Kconfig" endmenu +menu "Cortina thermal drivers" +depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST +source "drivers/thermal/cortina/Kconfig" +endmenu + menu "Texas Instruments thermal drivers" depends on ARCH_HAS_BANDGAP || COMPILE_TEST depends on HAS_IOMEM diff -ruw linux-6.13.12/drivers/thermal/Makefile linux-6.13.12-fbx/drivers/thermal/Makefile --- linux-6.13.12/drivers/thermal/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/thermal/Makefile 2025-09-25 17:40:35.223365520 +0200 @@ -53,6 +53,7 @@ obj-$(CONFIG_MAX77620_THERMAL) += max77620_thermal.o obj-$(CONFIG_QORIQ_THERMAL) += qoriq_thermal.o obj-$(CONFIG_DA9062_THERMAL) += da9062-thermal.o +obj-y += cortina/ obj-y += intel/ obj-$(CONFIG_TI_SOC_THERMAL) += ti-soc-thermal/ obj-y += st/ diff -ruw linux-6.13.12/drivers/thermal/thermal_core.c linux-6.13.12-fbx/drivers/thermal/thermal_core.c --- linux-6.13.12/drivers/thermal/thermal_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/thermal/thermal_core.c 2025-09-25 17:40:35.231365560 +0200 @@ -1037,6 +1037,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. @@ -1052,7 +1053,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) { @@ -1112,6 +1113,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) { @@ -1155,11 +1157,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. @@ -1179,7 +1200,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); @@ -1219,7 +1240,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.13.12/drivers/tty/serial/8250/8250_platform.c linux-6.13.12-fbx/drivers/tty/serial/8250/8250_platform.c --- linux-6.13.12/drivers/tty/serial/8250/8250_platform.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/tty/serial/8250/8250_platform.c 2025-09-25 17:40:35.251365659 +0200 @@ -335,7 +335,11 @@ if (ret) goto put_dev; +#ifndef CONFIG_X86_INTEL_CE + /* legacy uart via ioport works but not IRQ 4, uart will come + * later through PCI */ serial8250_register_ports(&serial8250_reg, &serial8250_isa_devs->dev); +#endif ret = platform_driver_register(&serial8250_isa_driver); if (ret == 0) diff -ruw linux-6.13.12/drivers/tty/serial/Kconfig linux-6.13.12-fbx/drivers/tty/serial/Kconfig --- linux-6.13.12/drivers/tty/serial/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/tty/serial/Kconfig 2025-09-25 17:40:35.255365679 +0200 @@ -1368,6 +1368,17 @@ This driver can also be build as a module. If so, the module will be called men_z135_uart.ko +config SERIAL_CORTINA + bool "CORTINA serial port support" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + select SERIAL_CORE + +config SERIAL_CORTINA_CONSOLE + bool "Console on Cortina serial port" + depends on SERIAL_CORTINA + select SERIAL_CORE_CONSOLE + select SERIAL_EARLYCON + config SERIAL_SPRD tristate "Support for Spreadtrum serial" select SERIAL_CORE diff -ruw linux-6.13.12/drivers/tty/serial/Makefile linux-6.13.12-fbx/drivers/tty/serial/Makefile --- linux-6.13.12/drivers/tty/serial/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/tty/serial/Makefile 2025-09-25 17:40:35.255365679 +0200 @@ -36,6 +36,7 @@ obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o obj-$(CONFIG_SERIAL_CONEXANT_DIGICOLOR) += digicolor-usart.o +obj-$(CONFIG_SERIAL_CORTINA) += serial-cortina.o obj-$(CONFIG_SERIAL_DZ) += dz.o obj-$(CONFIG_SERIAL_ESP32) += esp32_uart.o obj-$(CONFIG_SERIAL_ESP32_ACM) += esp32_acm.o diff -ruw linux-6.13.12/drivers/usb/dwc3/Kconfig linux-6.13.12-fbx/drivers/usb/dwc3/Kconfig --- linux-6.13.12/drivers/usb/dwc3/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/dwc3/Kconfig 2025-09-25 17:40:35.307365937 +0200 @@ -189,4 +189,13 @@ or dual-role mode. Say 'Y' or 'M' if you have such device. +config USB_DWC3_CORTINA + tristate "Cortina Access Platform" + depends on OF && (ARCH_CORTINA || COMPILE_TEST) + default USB_DWC3 + help + Some Cortina SoCs use DesignWare Core IP for USB2/3 + functionality. + Say 'Y' or 'M' if you have one such device. + endif diff -ruw linux-6.13.12/drivers/usb/dwc3/Makefile linux-6.13.12-fbx/drivers/usb/dwc3/Makefile --- linux-6.13.12/drivers/usb/dwc3/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/dwc3/Makefile 2025-09-25 17:40:35.307365937 +0200 @@ -56,3 +56,4 @@ obj-$(CONFIG_USB_DWC3_XILINX) += dwc3-xilinx.o obj-$(CONFIG_USB_DWC3_OCTEON) += dwc3-octeon.o obj-$(CONFIG_USB_DWC3_RTK) += dwc3-rtk.o +obj-$(CONFIG_USB_DWC3_CORTINA) += dwc3-cortina.o diff -ruw linux-6.13.12/drivers/usb/host/Kconfig linux-6.13.12-fbx/drivers/usb/host/Kconfig --- linux-6.13.12/drivers/usb/host/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/host/Kconfig 2025-09-25 17:40:35.343366115 +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.13.12/drivers/usb/host/Makefile linux-6.13.12-fbx/drivers/usb/host/Makefile --- linux-6.13.12/drivers/usb/host/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/host/Makefile 2025-09-25 17:40:35.347366135 +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.13.12/drivers/usb/host/xhci-hub.c linux-6.13.12-fbx/drivers/usb/host/xhci-hub.c --- linux-6.13.12/drivers/usb/host/xhci-hub.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/host/xhci-hub.c 2025-09-25 17:40:35.355366175 +0200 @@ -17,6 +17,8 @@ #include "xhci.h" #include "xhci-trace.h" +extern int usb3_disable; + #define PORT_WAKE_BITS (PORT_WKOC_E | PORT_WKDISC_E | PORT_WKCONN_E) #define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_WRC | PORT_OCC | \ PORT_RC | PORT_PLC | PORT_PE) @@ -655,6 +657,9 @@ xhci_dbg(xhci, "set port power %d-%d %s, portsc: 0x%x\n", hcd->self.busnum, port->hcd_portnum + 1, on ? "ON" : "OFF", temp); + if (usb3_disable && on && hcd->speed >= HCD_USB3) + on = false; + temp = xhci_port_state_to_neutral(temp); if (on) { diff -ruw linux-6.13.12/drivers/usb/host/xhci-plat.c linux-6.13.12-fbx/drivers/usb/host/xhci-plat.c --- linux-6.13.12/drivers/usb/host/xhci-plat.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/host/xhci-plat.c 2025-09-25 17:40:35.359366195 +0200 @@ -128,6 +128,8 @@ .compatible = "marvell,armada3700-xhci", .data = &xhci_plat_marvell_armada3700, }, { + .compatible = "marvell,armada-8k-xhci", + }, { .compatible = "brcm,xhci-brcm-v2", .data = &xhci_plat_brcm, }, { diff -ruw linux-6.13.12/drivers/usb/host/xhci-ring.c linux-6.13.12-fbx/drivers/usb/host/xhci-ring.c --- linux-6.13.12/drivers/usb/host/xhci-ring.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/host/xhci-ring.c 2025-09-25 17:40:35.359366195 +0200 @@ -1976,7 +1976,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.13.12/drivers/usb/host/xhci.c linux-6.13.12-fbx/drivers/usb/host/xhci.c --- linux-6.13.12/drivers/usb/host/xhci.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/host/xhci.c 2025-09-25 17:40:35.363366215 +0200 @@ -39,6 +39,10 @@ module_param(quirks, ullong, S_IRUGO); MODULE_PARM_DESC(quirks, "Bit flags for quirks to be enabled as default"); +int usb3_disable = 0; +module_param(usb3_disable, int, S_IRUGO | S_IWUSR); +MODULE_PARM_DESC(usb3_disable, "Disable USB3 interface"); + static bool td_on_ring(struct xhci_td *td, struct xhci_ring *ring) { struct xhci_segment *seg; diff -ruw linux-6.13.12/drivers/usb/storage/usb.c linux-6.13.12-fbx/drivers/usb/storage/usb.c --- linux-6.13.12/drivers/usb/storage/usb.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/usb/storage/usb.c 2025-09-25 17:40:35.391366353 +0200 @@ -68,7 +68,7 @@ MODULE_DESCRIPTION("USB Mass Storage driver for Linux"); MODULE_LICENSE("GPL"); -static unsigned int delay_use = 1 * MSEC_PER_SEC; +static unsigned int delay_use = 5 * MSEC_PER_SEC; /** * parse_delay_str - parse an unsigned decimal integer delay diff -ruw linux-6.13.12/drivers/video/Kconfig linux-6.13.12-fbx/drivers/video/Kconfig --- linux-6.13.12/drivers/video/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/video/Kconfig 2025-09-25 17:40:35.415366472 +0200 @@ -69,5 +69,4 @@ endif - endmenu diff -ruw linux-6.13.12/drivers/video/fbdev/Kconfig linux-6.13.12-fbx/drivers/video/fbdev/Kconfig --- linux-6.13.12/drivers/video/fbdev/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/video/fbdev/Kconfig 2025-09-25 17:40:35.419366492 +0200 @@ -1819,6 +1819,18 @@ 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_SYSMEM_HELPERS_DEFERRED + select FB_BACKLIGHT + +config FB_SSD1327 + tristate "SSD1327 OLED driver" + depends on FB && SPI + select FB_SYSMEM_HELPERS_DEFERRED + 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.13.12/drivers/video/fbdev/Makefile linux-6.13.12-fbx/drivers/video/fbdev/Makefile --- linux-6.13.12/drivers/video/fbdev/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/video/fbdev/Makefile 2025-09-25 17:40:35.419366492 +0200 @@ -123,6 +123,8 @@ obj-$(CONFIG_FB_OF) += offb.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.13.12/drivers/watchdog/Kconfig linux-6.13.12-fbx/drivers/watchdog/Kconfig --- linux-6.13.12/drivers/watchdog/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/watchdog/Kconfig 2025-09-25 17:40:35.463366710 +0200 @@ -1043,6 +1043,13 @@ When built as a module this will be called realtek_otto_wdt. +config CORTINA_PER_WDT + tristate "Cortina watchdog support" + depends on ARCH_CORTINA || MACH_CORTINA_SATURN || COMPILE_TEST + depends on COMMON_CLK + select WATCHDOG_CORE + default ARCH_CORTINA || MACH_CORTINA_SATURN + config SPRD_WATCHDOG tristate "Spreadtrum watchdog support" depends on ARCH_SPRD || COMPILE_TEST diff -ruw linux-6.13.12/drivers/watchdog/Makefile linux-6.13.12-fbx/drivers/watchdog/Makefile --- linux-6.13.12/drivers/watchdog/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/drivers/watchdog/Makefile 2025-09-25 17:40:35.463366710 +0200 @@ -166,6 +166,7 @@ # MIPS Architecture obj-$(CONFIG_ATH79_WDT) += ath79_wdt.o obj-$(CONFIG_BCM47XX_WDT) += bcm47xx_wdt.o +obj-$(CONFIG_CORTINA_PER_WDT) += cortina_per_wdt.o obj-$(CONFIG_RC32434_WDT) += rc32434_wdt.o obj-$(CONFIG_INDYDOG) += indydog.o obj-$(CONFIG_JZ4740_WDT) += jz4740_wdt.o diff -ruw linux-6.13.12/fs/Kconfig linux-6.13.12-fbx/fs/Kconfig --- linux-6.13.12/fs/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/Kconfig 2025-09-25 17:40:36.423371471 +0200 @@ -161,6 +161,7 @@ source "fs/fat/Kconfig" source "fs/exfat/Kconfig" source "fs/ntfs3/Kconfig" +source "fs/exfat-fbx/Kconfig" endmenu endif # BLOCK diff -ruw linux-6.13.12/fs/Makefile linux-6.13.12-fbx/fs/Makefile --- linux-6.13.12/fs/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/Makefile 2025-09-25 17:40:36.423371471 +0200 @@ -129,3 +129,4 @@ obj-$(CONFIG_VBOXSF_FS) += vboxsf/ obj-$(CONFIG_ZONEFS_FS) += zonefs/ obj-$(CONFIG_BPF_LSM) += bpf_fs_kfuncs.o +obj-$(CONFIG_EXFAT_FS_FBX) += exfat-fbx/ diff -ruw linux-6.13.12/fs/binfmt_elf.c linux-6.13.12-fbx/fs/binfmt_elf.c --- linux-6.13.12/fs/binfmt_elf.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/binfmt_elf.c 2025-09-25 17:40:36.475371729 +0200 @@ -280,6 +280,7 @@ NEW_AUX_ENT(AT_RSEQ_FEATURE_SIZE, offsetof(struct rseq, end)); NEW_AUX_ENT(AT_RSEQ_ALIGN, __alignof__(struct rseq)); #endif + NEW_AUX_ENT(AT_ASLR, bprm->aslr_used); #undef NEW_AUX_ENT /* AT_NULL is zero; clear the rest too */ memset(elf_info, 0, (char *)mm->saved_auxv + @@ -1014,6 +1015,8 @@ current->flags |= PF_RANDOMIZE; setup_new_exec(bprm); + if ((current->flags & PF_RANDOMIZE) && !bprm->aslr_used) + bprm->aslr_used = 1; /* Do this so that we can load the interpreter, if need be. We will change some of these later */ diff -ruw linux-6.13.12/fs/debugfs/inode.c linux-6.13.12-fbx/fs/debugfs/inode.c --- linux-6.13.12/fs/debugfs/inode.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/debugfs/inode.c 2025-09-25 17:40:36.543372066 +0200 @@ -834,76 +834,70 @@ EXPORT_SYMBOL_GPL(debugfs_lookup_and_remove); /** - * debugfs_rename - rename a file/directory in the debugfs filesystem - * @old_dir: a pointer to the parent dentry for the renamed object. This - * should be a directory dentry. - * @old_dentry: dentry of an object to be renamed. - * @new_dir: a pointer to the parent dentry where the object should be - * moved. This should be a directory dentry. - * @new_name: a pointer to a string containing the target name. + * debugfs_change_name - rename a file/directory in the debugfs filesystem + * @dentry: dentry of an object to be renamed. + * @fmt: format for new name * * This function renames a file/directory in debugfs. The target must not * exist for rename to succeed. * - * This function will return a pointer to old_dentry (which is updated to - * reflect renaming) if it succeeds. If an error occurs, ERR_PTR(-ERROR) - * will be returned. + * This function will return 0 on success and -E... on failure. * * If debugfs is not enabled in the kernel, the value -%ENODEV will be * returned. */ -struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, - struct dentry *new_dir, const char *new_name) +int __printf(2, 3) debugfs_change_name(struct dentry *dentry, const char *fmt, ...) { - int error; - struct dentry *dentry = NULL, *trap; + int error = 0; + const char *new_name; struct name_snapshot old_name; - - if (IS_ERR(old_dir)) - return old_dir; - if (IS_ERR(new_dir)) - return new_dir; - if (IS_ERR_OR_NULL(old_dentry)) - return old_dentry; - - trap = lock_rename(new_dir, old_dir); - /* Source or destination directories don't exist? */ - if (d_really_is_negative(old_dir) || d_really_is_negative(new_dir)) - goto exit; - /* Source does not exist, cyclic rename, or mountpoint? */ - if (d_really_is_negative(old_dentry) || old_dentry == trap || - d_mountpoint(old_dentry)) - goto exit; - dentry = lookup_one_len(new_name, new_dir, strlen(new_name)); - /* Lookup failed, cyclic rename or target exists? */ - if (IS_ERR(dentry) || dentry == trap || d_really_is_positive(dentry)) - goto exit; - - take_dentry_name_snapshot(&old_name, old_dentry); - - error = simple_rename(&nop_mnt_idmap, d_inode(old_dir), old_dentry, - d_inode(new_dir), dentry, 0); - if (error) { - release_dentry_name_snapshot(&old_name); - goto exit; + struct dentry *parent, *target; + struct inode *dir; + va_list ap; + + if (IS_ERR_OR_NULL(dentry)) + return 0; + + va_start(ap, fmt); + new_name = kvasprintf_const(GFP_KERNEL, fmt, ap); + va_end(ap); + if (!new_name) + return -ENOMEM; + + parent = dget_parent(dentry); + dir = d_inode(parent); + inode_lock(dir); + + take_dentry_name_snapshot(&old_name, dentry); + + if (WARN_ON_ONCE(dentry->d_parent != parent)) { + error = -EINVAL; + goto out; + } + if (strcmp(old_name.name.name, new_name) == 0) + goto out; + target = lookup_one_len(new_name, parent, strlen(new_name)); + if (IS_ERR(target)) { + error = PTR_ERR(target); + goto out; + } + if (d_really_is_positive(target)) { + dput(target); + error = -EINVAL; + goto out; } - d_move(old_dentry, dentry); - fsnotify_move(d_inode(old_dir), d_inode(new_dir), &old_name.name, - d_is_dir(old_dentry), - NULL, old_dentry); + simple_rename_timestamp(dir, dentry, dir, target); + d_move(dentry, target); + dput(target); + fsnotify_move(dir, dir, &old_name.name, d_is_dir(dentry), NULL, dentry); +out: release_dentry_name_snapshot(&old_name); - unlock_rename(new_dir, old_dir); - dput(dentry); - return old_dentry; -exit: - if (dentry && !IS_ERR(dentry)) - dput(dentry); - unlock_rename(new_dir, old_dir); - if (IS_ERR(dentry)) - return dentry; - return ERR_PTR(-EINVAL); + inode_unlock(dir); + dput(parent); + kfree_const(new_name); + return error; } -EXPORT_SYMBOL_GPL(debugfs_rename); +EXPORT_SYMBOL_GPL(debugfs_change_name); /** * debugfs_initialized - Tells whether debugfs has been registered diff -ruw linux-6.13.12/fs/exec.c linux-6.13.12-fbx/fs/exec.c --- linux-6.13.12/fs/exec.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/exec.c 2025-09-25 17:40:36.555372125 +0200 @@ -77,6 +77,7 @@ #include "internal.h" #include +#include static int bprm_creds_from_file(struct linux_binprm *bprm); @@ -1851,6 +1852,22 @@ if (retval) return retval; +#ifdef CONFIG_PSEUDO_ASLR + /* + * apply paslr policy + */ + bprm->aslr_used = 0; + if (randomize_va_space == 3) { + switch (current->paslr_exec_policy) { + case PR_PASLR_POLICY_UID: + case PR_PASLR_POLICY_PRESEED: + bprm->aslr_used = 2; + case PR_PASLR_POLICY_DISABLE: + break; + } + } +#endif + /* * Check for unsafe execution states before exec_binprm(), which * will call back into begin_new_exec(), into bprm_creds_from_file(), @@ -1867,6 +1884,41 @@ if (retval) goto out; +#ifdef CONFIG_PSEUDO_ASLR + /* + * apply paslr policy + */ + if (bprm->aslr_used == 2) { + switch (current->paslr_exec_policy) { + case PR_PASLR_POLICY_UID: + { + unsigned char uid_seed[SCHED_PASLR_SEED_SIZE]; + + /* seed from uid */ + memset(uid_seed, 0, sizeof (uid_seed)); + memcpy(uid_seed, ¤t->real_cred->suid, + sizeof (current->real_cred->suid)); + paslr_task_init(current, + current->paslr_exec_policy, + uid_seed); + current->paslr_used = true; + break; + } + case PR_PASLR_POLICY_DISABLE: + /* no paslr */ + current->paslr_used = false; + break; + case PR_PASLR_POLICY_PRESEED: + /* use pre-seed */ + paslr_task_init(current, + current->paslr_exec_policy, + current->paslr_exec_preseed); + current->paslr_used = true; + break; + } + } +#endif + retval = exec_binprm(bprm); if (retval < 0) goto out; @@ -1908,6 +1960,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.13.12/fs/proc/array.c linux-6.13.12-fbx/fs/proc/array.c --- linux-6.13.12/fs/proc/array.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/proc/array.c 2025-09-25 17:40:36.743373058 +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) { @@ -195,6 +210,10 @@ seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->sgid)); seq_put_decimal_ull(m, "\t", from_kgid_munged(user_ns, cred->fsgid)); seq_put_decimal_ull(m, "\nFDSize:\t", max_fds); +#ifdef CONFIG_PSEUDO_ASLR + seq_put_decimal_ull(m, "\nPaslr:\t", p->paslr_used); + seq_put_decimal_ull(m, "\nPaslrPolicy:\t", p->paslr_exec_policy); +#endif seq_puts(m, "\nGroups:\t"); group_info = cred->group_info; @@ -403,6 +422,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", @@ -461,6 +486,7 @@ cpuset_task_status_allowed(m, task); task_context_switch_counts(m, task); arch_proc_pid_thread_features(m, task); + task_exec_mode(m, task); return 0; } diff -ruw linux-6.13.12/fs/proc/base.c linux-6.13.12-fbx/fs/proc/base.c --- linux-6.13.12/fs/proc/base.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/proc/base.c 2025-09-25 17:40:36.743373058 +0200 @@ -3269,6 +3269,7 @@ struct pid *pid, struct task_struct *task) { struct mm_struct *mm; + int ret = 0; mm = get_task_mm(task); if (mm) { @@ -3276,6 +3277,16 @@ seq_printf(m, "ksm_zero_pages %ld\n", mm_ksm_zero_pages(mm)); seq_printf(m, "ksm_merging_pages %lu\n", mm->ksm_merging_pages); seq_printf(m, "ksm_process_profit %ld\n", ksm_process_profit(mm)); + seq_printf(m, "ksm_merge_any: %s\n", + test_bit(MMF_VM_MERGE_ANY, &mm->flags) ? "yes" : "no"); + ret = mmap_read_lock_killable(mm); + if (ret) { + mmput(mm); + return ret; + } + seq_printf(m, "ksm_mergeable: %s\n", + ksm_process_mergeable(mm) ? "yes" : "no"); + mmap_read_unlock(mm); mmput(mm); } diff -ruw linux-6.13.12/fs/pstore/inode.c linux-6.13.12-fbx/fs/pstore/inode.c --- linux-6.13.12/fs/pstore/inode.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/pstore/inode.c 2025-09-25 17:40:36.747373078 +0200 @@ -24,6 +24,7 @@ #include #include #include +#include #include "internal.h" @@ -202,6 +203,54 @@ return simple_unlink(dir, dentry); } +/* + * + */ +static ssize_t +pstore_xattr_list(struct dentry *dentry, char *buffer, size_t buffer_size) +{ + struct pstore_private *p = d_inode(dentry)->i_private; + struct pstore_record *record = p->record; + + printk("pstore_xattr_list called\n"); + if (!record->uts_release[0]) { + printk("zero len\n"); + return 0; + } + + return strscpy(buffer, "user.uts_release", buffer_size); +} + +/* + * + */ +static int +pstore_xattr_get_user_uts_release(const struct xattr_handler *hdl, + struct dentry *dentry, struct inode *inode, + const char *name, void *buffer, size_t size) +{ + struct pstore_private *p = d_inode(dentry)->i_private; + struct pstore_record *record = p->record; + size_t len = strlen(record->uts_release) + 1; + + if (buffer) { + if (size < len) + return -ERANGE; + memcpy(buffer, record->uts_release, len); + } + return len; +} + +static const struct xattr_handler pstore_xattr_user_uts_release_handler = { + .name = "user.uts_release", + .get = pstore_xattr_get_user_uts_release, +}; + +static const struct xattr_handler *pstore_xattr_handlers[] = { + &pstore_xattr_user_uts_release_handler, + NULL +}; + static void pstore_evict_inode(struct inode *inode) { struct pstore_private *p = inode->i_private; @@ -210,6 +259,10 @@ free_pstore_private(p); } +const struct inode_operations pstore_file_inode_operations = { + .listxattr = pstore_xattr_list, +}; + static const struct inode_operations pstore_dir_inode_operations = { .lookup = simple_lookup, .unlink = pstore_unlink, @@ -359,9 +412,10 @@ return -ENOMEM; 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); @@ -374,6 +428,7 @@ private->dentry = dentry; private->record = record; + inode->i_op = &pstore_file_inode_operations; inode->i_size = private->total_size = size; inode->i_private = private; @@ -416,6 +471,7 @@ sb->s_magic = PSTOREFS_MAGIC; sb->s_op = &pstore_ops; sb->s_time_gran = 1; + sb->s_xattr = pstore_xattr_handlers; parse_options(data); diff -ruw linux-6.13.12/fs/pstore/ram.c linux-6.13.12-fbx/fs/pstore/ram.c --- linux-6.13.12/fs/pstore/ram.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/pstore/ram.c 2025-09-25 17:40:36.747373078 +0200 @@ -21,6 +21,7 @@ #include #include #include +#include #include "internal.h" #include "ram_internal.h" @@ -142,17 +143,31 @@ record->type = prz->type; record->id = id; + record->old = prz->old_zone; return prz; } static int ramoops_read_kmsg_hdr(char *buffer, struct timespec64 *time, - bool *compressed) + bool *compressed, + char *rbuf, size_t rbuf_size) { char data_type; int header_length = 0; + char release[131]; - if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n", + release[0] = 0; + if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c-VER%130s%n", + (time64_t *)&time->tv_sec, &time->tv_nsec, &data_type, + release, &header_length) == 4) { + time->tv_nsec *= 1000; + if (data_type == 'C') + *compressed = true; + else + *compressed = false; + strim(release); + + } else if (sscanf(buffer, RAMOOPS_KERNMSG_HDR "%lld.%lu-%c\n%n", (time64_t *)&time->tv_sec, &time->tv_nsec, &data_type, &header_length) == 3) { time->tv_nsec *= 1000; @@ -170,6 +185,8 @@ time->tv_nsec = 0; *compressed = false; } + + strscpy(rbuf, release, rbuf_size); return header_length; } @@ -204,7 +221,9 @@ continue; header_length = ramoops_read_kmsg_hdr(persistent_ram_old(prz), &record->time, - &record->compressed); + &record->compressed, + record->uts_release, + sizeof (record->uts_release)); /* Clear and skip this DMESG record if it has no valid header */ if (!header_length) { persistent_ram_free_old(prz); @@ -297,14 +316,15 @@ static size_t ramoops_write_kmsg_hdr(struct persistent_ram_zone *prz, struct pstore_record *record) { - char hdr[36]; /* "===="(4), %lld(20), "."(1), %06lu(6), "-%c\n"(3) */ + char hdr[165]; /* "===="(4), %lld(20), "."(1), %06lu(6), "-%c"(2), "-VER%.127s\n"(4 + 127 + 1) */ size_t len; len = scnprintf(hdr, sizeof(hdr), - RAMOOPS_KERNMSG_HDR "%lld.%06lu-%c\n", + RAMOOPS_KERNMSG_HDR "%lld.%06lu-%c-VER%s\n", (time64_t)record->time.tv_sec, record->time.tv_nsec / 1000, - record->compressed ? 'C' : 'D'); + record->compressed ? 'C' : 'D', + UTS_RELEASE); persistent_ram_write(prz, hdr, len); return len; @@ -486,7 +506,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) { @@ -551,7 +571,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); @@ -584,7 +604,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; @@ -599,7 +619,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)) { @@ -787,17 +807,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; @@ -806,6 +829,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.13.12/fs/pstore/ram_core.c linux-6.13.12-fbx/fs/pstore/ram_core.c --- linux-6.13.12/fs/pstore/ram_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/pstore/ram_core.c 2025-09-25 17:40:36.747373078 +0200 @@ -34,6 +34,7 @@ uint32_t sig; atomic_t start; atomic_t size; + atomic_t flags; uint8_t data[]; }; @@ -393,6 +394,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); } @@ -479,13 +481,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, @@ -532,6 +537,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", @@ -581,7 +595,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) { @@ -601,7 +616,7 @@ if (!prz->label) goto err; - 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.13.12/fs/pstore/ram_internal.h linux-6.13.12-fbx/fs/pstore/ram_internal.h --- linux-6.13.12/fs/pstore/ram_internal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/pstore/ram_internal.h 2025-09-25 17:40:36.751373097 +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.13.12/fs/smb/server/Kconfig linux-6.13.12-fbx/fs/smb/server/Kconfig --- linux-6.13.12/fs/smb/server/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/Kconfig 2025-09-25 17:40:36.775373216 +0200 @@ -57,6 +57,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.13.12/fs/smb/server/Makefile linux-6.13.12-fbx/fs/smb/server/Makefile --- linux-6.13.12/fs/smb/server/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/Makefile 2025-09-25 17:40:36.775373216 +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 diff -ruw linux-6.13.12/fs/smb/server/auth.c linux-6.13.12-fbx/fs/smb/server/auth.c --- linux-6.13.12/fs/smb/server/auth.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/auth.c 2025-09-25 17:40:36.775373216 +0200 @@ -68,6 +68,126 @@ { memcpy(buf, NEGOTIATE_GSS_HEADER, AUTH_GSS_LENGTH); } +#ifdef CONFIG_SMB_INSECURE_SERVER +static void +str_to_key(unsigned char *str, unsigned char *key) +{ + int i; + + key[0] = str[0] >> 1; + key[1] = ((str[0] & 0x01) << 6) | (str[1] >> 2); + key[2] = ((str[1] & 0x03) << 5) | (str[2] >> 3); + key[3] = ((str[2] & 0x07) << 4) | (str[3] >> 4); + key[4] = ((str[3] & 0x0F) << 3) | (str[4] >> 5); + key[5] = ((str[4] & 0x1F) << 2) | (str[5] >> 6); + key[6] = ((str[5] & 0x3F) << 1) | (str[6] >> 7); + key[7] = str[6] & 0x7F; + for (i = 0; i < 8; i++) + key[i] = (key[i] << 1); +} + +static int +smbhash(unsigned char *out, const unsigned char *in, unsigned char *key) +{ + unsigned char key2[8]; + struct des_ctx ctx; + + if (fips_enabled) { + ksmbd_debug(AUTH, "FIPS compliance enabled: DES not permitted\n"); + return -ENOENT; + } + + str_to_key(key, key2); + des_expand_key(&ctx, key2, DES_KEY_SIZE); + des_encrypt(&ctx, out, in); + memzero_explicit(&ctx, sizeof(ctx)); + return 0; +} + +static int ksmbd_enc_p24(unsigned char *p21, const unsigned char *c8, unsigned char *p24) +{ + int rc; + + rc = smbhash(p24, c8, p21); + if (rc) + return rc; + rc = smbhash(p24 + 8, c8, p21 + 7); + if (rc) + return rc; + return smbhash(p24 + 16, c8, p21 + 14); +} + +/* produce a md4 message digest from data of length n bytes */ +static int ksmbd_enc_md4(unsigned char *md4_hash, unsigned char *link_str, + int link_len) +{ + int rc; + struct ksmbd_crypto_ctx *ctx; + + ctx = ksmbd_crypto_ctx_find_md4(); + if (!ctx) { + ksmbd_debug(AUTH, "Crypto md4 allocation error\n"); + return -ENOMEM; + } + + rc = crypto_shash_init(CRYPTO_MD4(ctx)); + if (rc) { + ksmbd_debug(AUTH, "Could not init md4 shash\n"); + goto out; + } + + rc = crypto_shash_update(CRYPTO_MD4(ctx), link_str, link_len); + if (rc) { + ksmbd_debug(AUTH, "Could not update with link_str\n"); + goto out; + } + + rc = crypto_shash_final(CRYPTO_MD4(ctx), md4_hash); + if (rc) + ksmbd_debug(AUTH, "Could not generate md4 hash\n"); +out: + ksmbd_release_crypto_ctx(ctx); + return rc; +} + +static int ksmbd_enc_update_sess_key(unsigned char *md5_hash, char *nonce, + char *server_challenge, int len) +{ + int rc; + struct ksmbd_crypto_ctx *ctx; + + ctx = ksmbd_crypto_ctx_find_md5(); + if (!ctx) { + ksmbd_debug(AUTH, "Crypto md5 allocation error\n"); + return -ENOMEM; + } + + rc = crypto_shash_init(CRYPTO_MD5(ctx)); + if (rc) { + ksmbd_debug(AUTH, "Could not init md5 shash\n"); + goto out; + } + + rc = crypto_shash_update(CRYPTO_MD5(ctx), server_challenge, len); + if (rc) { + ksmbd_debug(AUTH, "Could not update with challenge\n"); + goto out; + } + + rc = crypto_shash_update(CRYPTO_MD5(ctx), nonce, len); + if (rc) { + ksmbd_debug(AUTH, "Could not update with nonce\n"); + goto out; + } + + rc = crypto_shash_final(CRYPTO_MD5(ctx), md5_hash); + if (rc) + ksmbd_debug(AUTH, "Could not generate md5 hash\n"); +out: + ksmbd_release_crypto_ctx(ctx); + return rc; +} +#endif /** * ksmbd_gen_sess_key() - function to generate session key @@ -207,6 +327,45 @@ } /** + * ksmbd_auth_ntlm() - NTLM authentication handler + * @sess: session of connection + * @pw_buf: NTLM challenge response + * @passkey: user password + * + * Return: 0 on success, error number on error + */ +#ifdef CONFIG_SMB_INSECURE_SERVER +int ksmbd_auth_ntlm(struct ksmbd_session *sess, char *pw_buf, char *cryptkey) +{ + int rc; + unsigned char p21[21]; + char key[CIFS_AUTH_RESP_SIZE]; + + memset(p21, '\0', 21); + memcpy(p21, user_passkey(sess->user), CIFS_NTHASH_SIZE); + rc = ksmbd_enc_p24(p21, cryptkey, key); + if (rc) { + pr_err("password processing failed\n"); + return rc; + } + + ksmbd_enc_md4(sess->sess_key, user_passkey(sess->user), + CIFS_SMB1_SESSKEY_SIZE); + memcpy(sess->sess_key + CIFS_SMB1_SESSKEY_SIZE, key, + CIFS_AUTH_RESP_SIZE); + sess->sequence_number = 1; + + if (strncmp(pw_buf, key, CIFS_AUTH_RESP_SIZE) != 0) { + ksmbd_debug(AUTH, "ntlmv1 authentication failed\n"); + return -EINVAL; + } + + ksmbd_debug(AUTH, "ntlmv1 authentication pass\n"); + return 0; +} +#endif + +/** * ksmbd_auth_ntlmv2() - NTLMv2 authentication handler * @conn: connection * @sess: session of connection @@ -292,6 +451,46 @@ return rc; } +#ifdef CONFIG_SMB_INSECURE_SERVER +/** + * __ksmbd_auth_ntlmv2() - NTLM2(extended security) authentication handler + * @sess: session of connection + * @client_nonce: client nonce from LM response. + * @ntlm_resp: ntlm response data from client. + * + * Return: 0 on success, error number on error + */ +static int __ksmbd_auth_ntlmv2(struct ksmbd_session *sess, + char *client_nonce, + char *ntlm_resp, + char *cryptkey) +{ + char sess_key[CIFS_SMB1_SESSKEY_SIZE] = {0}; + int rc; + unsigned char p21[21]; + char key[CIFS_AUTH_RESP_SIZE]; + + rc = ksmbd_enc_update_sess_key(sess_key, client_nonce, cryptkey, 8); + if (rc) { + pr_err("password processing failed\n"); + goto out; + } + + memset(p21, '\0', 21); + memcpy(p21, user_passkey(sess->user), CIFS_NTHASH_SIZE); + rc = ksmbd_enc_p24(p21, sess_key, key); + if (rc) { + pr_err("password processing failed\n"); + goto out; + } + + if (memcmp(ntlm_resp, key, CIFS_AUTH_RESP_SIZE) != 0) + rc = -EINVAL; +out: + return rc; +} +#endif + /** * ksmbd_decode_ntlmssp_auth_blob() - helper function to construct * authenticate blob @@ -309,6 +508,10 @@ char *domain_name; unsigned int nt_off, dn_off; unsigned short nt_len, dn_len; +#ifdef CONFIG_SMB_INSECURE_SERVER + unsigned int lm_off; + unsigned short lm_len; +#endif int ret; if (blob_len < sizeof(struct authenticate_message)) { @@ -332,6 +535,26 @@ nt_len < CIFS_ENCPWD_SIZE) return -EINVAL; +#ifdef CONFIG_SMB_INSECURE_SERVER + lm_off = le32_to_cpu(authblob->LmChallengeResponse.BufferOffset); + lm_len = le16_to_cpu(authblob->LmChallengeResponse.Length); + if (blob_len < (u64)lm_off + lm_len) + return -EINVAL; + + /* process NTLM authentication */ + if (nt_len == CIFS_AUTH_RESP_SIZE) { + if (le32_to_cpu(authblob->NegotiateFlags) & + NTLMSSP_NEGOTIATE_EXTENDED_SEC) + return __ksmbd_auth_ntlmv2(sess, + (char *)authblob + lm_off, + (char *)authblob + nt_off, + conn->ntlmssp.cryptkey); + else + return ksmbd_auth_ntlm(sess, (char *)authblob + + nt_off, conn->ntlmssp.cryptkey); + } +#endif + /* TODO : use domain name that imported from configuration file */ domain_name = smb_strndup_from_utf16((const char *)authblob + dn_off, dn_len, true, conn->local_nls); @@ -550,7 +773,19 @@ retval = -ENOMEM; goto out; } + + if (!sess->user) { + /* First successful authentication */ sess->user = user; + } else { + if (!ksmbd_compare_user(sess->user, user)) { + ksmbd_debug(AUTH, "different user tried to reuse session\n"); + retval = -EPERM; + ksmbd_free_user(user); + goto out; + } + ksmbd_free_user(user); + } memcpy(sess->sess_key, resp->payload, resp->session_key_len); memcpy(out_blob, resp->payload + resp->session_key_len, @@ -569,6 +804,60 @@ } #endif +#ifdef CONFIG_SMB_INSECURE_SERVER +/** + * ksmbd_sign_smb1_pdu() - function to generate SMB1 packet signing + * @sess: session of connection + * @iov: buffer iov array + * @n_vec: number of iovecs + * @sig: signature value generated for client request packet + * + */ +int ksmbd_sign_smb1_pdu(struct ksmbd_session *sess, struct kvec *iov, int n_vec, + char *sig) +{ + struct ksmbd_crypto_ctx *ctx; + int rc, i; + + ctx = ksmbd_crypto_ctx_find_md5(); + if (!ctx) { + ksmbd_debug(AUTH, "could not crypto alloc md5\n"); + return -ENOMEM; + } + + rc = crypto_shash_init(CRYPTO_MD5(ctx)); + if (rc) { + ksmbd_debug(AUTH, "md5 init error %d\n", rc); + goto out; + } + + rc = crypto_shash_update(CRYPTO_MD5(ctx), sess->sess_key, 40); + if (rc) { + ksmbd_debug(AUTH, "md5 update error %d\n", rc); + goto out; + } + + for (i = 0; i < n_vec; i++) { + rc = crypto_shash_update(CRYPTO_MD5(ctx), + iov[i].iov_base, + iov[i].iov_len); + if (rc) { + ksmbd_debug(AUTH, "md5 update error %d\n", rc); + goto out; + } + } + + rc = crypto_shash_final(CRYPTO_MD5(ctx), sig); + if (rc) + ksmbd_debug(AUTH, "md5 generation error %d\n", rc); + +out: + ksmbd_release_crypto_ctx(ctx); + return rc; +} +#endif + + /** * ksmbd_sign_smb2_pdu() - function to generate packet signing * @conn: connection diff -ruw linux-6.13.12/fs/smb/server/auth.h linux-6.13.12-fbx/fs/smb/server/auth.h --- linux-6.13.12/fs/smb/server/auth.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/auth.h 2025-09-25 17:40:36.775373216 +0200 @@ -52,6 +52,11 @@ struct ksmbd_conn *conn); int ksmbd_krb5_authenticate(struct ksmbd_session *sess, char *in_blob, int in_len, char *out_blob, int *out_len); +#ifdef CONFIG_SMB_INSECURE_SERVER +int ksmbd_auth_ntlm(struct ksmbd_session *sess, char *pw_buf, char *cryptkey); +int ksmbd_sign_smb1_pdu(struct ksmbd_session *sess, struct kvec *iov, int n_vec, + char *sig); +#endif int ksmbd_sign_smb2_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov, int n_vec, char *sig); int ksmbd_sign_smb3_pdu(struct ksmbd_conn *conn, char *key, struct kvec *iov, diff -ruw linux-6.13.12/fs/smb/server/connection.c linux-6.13.12-fbx/fs/smb/server/connection.c --- linux-6.13.12/fs/smb/server/connection.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/connection.c 2025-09-25 17:40:36.775373216 +0200 @@ -10,6 +10,9 @@ #include "server.h" #include "smb_common.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +#include "smb1pdu.h" +#endif #include "mgmt/ksmbd_ida.h" #include "connection.h" #include "transport_tcp.h" @@ -115,9 +118,20 @@ { struct ksmbd_conn *conn = work->conn; struct list_head *requests_queue = NULL; +#ifdef CONFIG_SMB_INSECURE_SERVER + struct smb2_hdr *hdr = work->request_buf; + if (hdr->ProtocolId == SMB2_PROTO_NUMBER) { if (conn->ops->get_cmd_val(work) != SMB2_CANCEL_HE) requests_queue = &conn->requests; + } else { + if (conn->ops->get_cmd_val(work) != SMB_COM_NT_CANCEL) + requests_queue = &conn->requests; + } +#else + if (conn->ops->get_cmd_val(work) != SMB2_CANCEL_HE) + requests_queue = &conn->requests; +#endif atomic_inc(&conn->req_running); if (requests_queue) { @@ -220,6 +234,12 @@ if (work->send_no_response) return 0; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (!work->iov_idx) + ksmbd_iov_pin_rsp(work, (char *)work->response_buf + 4, + work->response_offset); +#endif + if (!work->iov_idx) return -EINVAL; @@ -295,7 +315,11 @@ return true; } +#ifdef CONFIG_SMB_INSECURE_SERVER +#define SMB1_MIN_SUPPORTED_HEADER_SIZE SMB_HEADER_SIZE +#else #define SMB1_MIN_SUPPORTED_HEADER_SIZE (sizeof(struct smb_hdr)) +#endif #define SMB2_MIN_SUPPORTED_HEADER_SIZE (sizeof(struct smb2_hdr) + 4) /** @@ -351,8 +375,9 @@ max_allowed_pdu_size = SMB3_MAX_MSGSIZE; if (pdu_size > max_allowed_pdu_size) { - pr_err_ratelimited("PDU length(%u) exceeded maximum allowed pdu size(%u) on connection(%d)\n", + pr_err_ratelimited("PDU length(%u) exceeded maximum allowed pdu size(%u) from %pISc (status=%d\n", pdu_size, max_allowed_pdu_size, + KSMBD_TCP_PEER_SOCKADDR(conn), READ_ONCE(conn->status)); break; } diff -ruw linux-6.13.12/fs/smb/server/crypto_ctx.c linux-6.13.12-fbx/fs/smb/server/crypto_ctx.c --- linux-6.13.12/fs/smb/server/crypto_ctx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/crypto_ctx.c 2025-09-25 17:40:36.775373216 +0200 @@ -81,6 +81,14 @@ case CRYPTO_SHASH_SHA512: tfm = crypto_alloc_shash("sha512", 0, 0); break; +#ifdef CONFIG_SMB_INSECURE_SERVER + case CRYPTO_SHASH_MD4: + tfm = crypto_alloc_shash("md4", 0, 0); + break; + case CRYPTO_SHASH_MD5: + tfm = crypto_alloc_shash("md5", 0, 0); + break; +#endif default: return NULL; } @@ -207,6 +215,17 @@ { return ____crypto_shash_ctx_find(CRYPTO_SHASH_SHA512); } +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md4(void) +{ + return ____crypto_shash_ctx_find(CRYPTO_SHASH_MD4); +} + +struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md5(void) +{ + return ____crypto_shash_ctx_find(CRYPTO_SHASH_MD5); +} +#endif static struct ksmbd_crypto_ctx *____crypto_aead_ctx_find(int id) { diff -ruw linux-6.13.12/fs/smb/server/crypto_ctx.h linux-6.13.12-fbx/fs/smb/server/crypto_ctx.h --- linux-6.13.12/fs/smb/server/crypto_ctx.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/crypto_ctx.h 2025-09-25 17:40:36.775373216 +0200 @@ -15,6 +15,10 @@ CRYPTO_SHASH_CMACAES, CRYPTO_SHASH_SHA256, CRYPTO_SHASH_SHA512, +#ifdef CONFIG_SMB_INSECURE_SERVER + CRYPTO_SHASH_MD4, + CRYPTO_SHASH_MD5, +#endif CRYPTO_SHASH_MAX, }; @@ -41,6 +45,10 @@ #define CRYPTO_CMACAES(c) ((c)->desc[CRYPTO_SHASH_CMACAES]) #define CRYPTO_SHA256(c) ((c)->desc[CRYPTO_SHASH_SHA256]) #define CRYPTO_SHA512(c) ((c)->desc[CRYPTO_SHASH_SHA512]) +#ifdef CONFIG_SMB_INSECURE_SERVER +#define CRYPTO_MD4(c) ((c)->desc[CRYPTO_SHASH_MD4]) +#define CRYPTO_MD5(c) ((c)->desc[CRYPTO_SHASH_MD5]) +#endif #define CRYPTO_HMACMD5_TFM(c) ((c)->desc[CRYPTO_SHASH_HMACMD5]->tfm) #define CRYPTO_HMACSHA256_TFM(c)\ @@ -48,6 +56,10 @@ #define CRYPTO_CMACAES_TFM(c) ((c)->desc[CRYPTO_SHASH_CMACAES]->tfm) #define CRYPTO_SHA256_TFM(c) ((c)->desc[CRYPTO_SHASH_SHA256]->tfm) #define CRYPTO_SHA512_TFM(c) ((c)->desc[CRYPTO_SHASH_SHA512]->tfm) +#ifdef CONFIG_SMB_INSECURE_SERVER +#define CRYPTO_MD4_TFM(c) ((c)->desc[CRYPTO_SHASH_MD4]->tfm) +#define CRYPTO_MD5_TFM(c) ((c)->desc[CRYPTO_SHASH_MD5]->tfm) +#endif #define CRYPTO_GCM(c) ((c)->ccmaes[CRYPTO_AEAD_AES_GCM]) #define CRYPTO_CCM(c) ((c)->ccmaes[CRYPTO_AEAD_AES_CCM]) @@ -58,6 +70,10 @@ struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_cmacaes(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_sha512(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_sha256(void); +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md4(void); +struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_md5(void); +#endif struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_gcm(void); struct ksmbd_crypto_ctx *ksmbd_crypto_ctx_find_ccm(void); void ksmbd_crypto_destroy(void); diff -ruw linux-6.13.12/fs/smb/server/ksmbd_work.h linux-6.13.12-fbx/fs/smb/server/ksmbd_work.h --- linux-6.13.12/fs/smb/server/ksmbd_work.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/ksmbd_work.h 2025-09-25 17:40:36.779373236 +0200 @@ -35,6 +35,9 @@ void *request_buf; /* Response buffer */ void *response_buf; +#ifdef CONFIG_SMB_INSECURE_SERVER + size_t response_offset; +#endif struct list_head aux_read_list; diff -ruw linux-6.13.12/fs/smb/server/mgmt/ksmbd_ida.c linux-6.13.12-fbx/fs/smb/server/mgmt/ksmbd_ida.c --- linux-6.13.12/fs/smb/server/mgmt/ksmbd_ida.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/mgmt/ksmbd_ida.c 2025-09-25 17:40:36.779373236 +0200 @@ -6,6 +6,18 @@ #include "ksmbd_ida.h" #include "../glob.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +int ksmbd_acquire_smb1_tid(struct ida *ida) +{ + return ida_alloc_range(ida, 1, 0xFFFE, KSMBD_DEFAULT_GFP); +} + +int ksmbd_acquire_smb1_uid(struct ida *ida) +{ + return ida_alloc_range(ida, 1, 0xFFFD, KSMBD_DEFAULT_GFP); +} +#endif + int ksmbd_acquire_smb2_tid(struct ida *ida) { return ida_alloc_range(ida, 1, 0xFFFFFFFE, KSMBD_DEFAULT_GFP); diff -ruw linux-6.13.12/fs/smb/server/mgmt/ksmbd_ida.h linux-6.13.12-fbx/fs/smb/server/mgmt/ksmbd_ida.h --- linux-6.13.12/fs/smb/server/mgmt/ksmbd_ida.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/mgmt/ksmbd_ida.h 2025-09-25 17:40:36.779373236 +0200 @@ -16,6 +16,9 @@ * The value 0xFFFF is used to specify all TIDs or no TID, * depending upon the context in which it is used. */ +#ifdef CONFIG_SMB_INSECURE_SERVER +int ksmbd_acquire_smb1_tid(struct ida *ida); +#endif int ksmbd_acquire_smb2_tid(struct ida *ida); /* @@ -25,6 +28,9 @@ * valid UID.<21> All other possible values for a UID, excluding * zero (0x0000), are valid. */ +#ifdef CONFIG_SMB_INSECURE_SERVER +int ksmbd_acquire_smb1_uid(struct ida *ida); +#endif int ksmbd_acquire_smb2_uid(struct ida *ida); int ksmbd_acquire_async_msg_id(struct ida *ida); diff -ruw linux-6.13.12/fs/smb/server/mgmt/user_session.c linux-6.13.12-fbx/fs/smb/server/mgmt/user_session.c --- linux-6.13.12/fs/smb/server/mgmt/user_session.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/mgmt/user_session.c 2025-09-25 17:40:36.779373236 +0200 @@ -59,10 +59,12 @@ struct ksmbd_session_rpc *entry; long index; + down_write(&sess->rpc_lock); xa_for_each(&sess->rpc_handle_list, index, entry) { xa_erase(&sess->rpc_handle_list, index); __session_rpc_close(sess, entry); } + up_write(&sess->rpc_lock); xa_destroy(&sess->rpc_handle_list); } @@ -92,7 +94,7 @@ { struct ksmbd_session_rpc *entry, *old; struct ksmbd_rpc_command *resp; - int method; + int method, id; method = __rpc_method(rpc_name); if (!method) @@ -102,26 +104,29 @@ if (!entry) return -ENOMEM; + down_read(&sess->rpc_lock); entry->method = method; - entry->id = ksmbd_ipc_id_alloc(); - if (entry->id < 0) + entry->id = id = ksmbd_ipc_id_alloc(); + if (id < 0) goto free_entry; - old = xa_store(&sess->rpc_handle_list, entry->id, entry, KSMBD_DEFAULT_GFP); + old = xa_store(&sess->rpc_handle_list, id, entry, KSMBD_DEFAULT_GFP); if (xa_is_err(old)) goto free_id; - resp = ksmbd_rpc_open(sess, entry->id); + resp = ksmbd_rpc_open(sess, id); if (!resp) goto erase_xa; + up_read(&sess->rpc_lock); kvfree(resp); - return entry->id; + return id; erase_xa: xa_erase(&sess->rpc_handle_list, entry->id); free_id: ksmbd_rpc_id_free(entry->id); free_entry: kfree(entry); + up_read(&sess->rpc_lock); return -EINVAL; } @@ -129,9 +134,11 @@ { struct ksmbd_session_rpc *entry; + down_write(&sess->rpc_lock); entry = xa_erase(&sess->rpc_handle_list, id); if (entry) __session_rpc_close(sess, entry); + up_write(&sess->rpc_lock); } int ksmbd_session_rpc_method(struct ksmbd_session *sess, int id) @@ -186,7 +193,12 @@ time_after(jiffies, sess->last_active + SMB2_SESSION_TIMEOUT))) { xa_erase(&conn->sessions, sess->id); +#ifdef CONFIG_SMB_INSECURE_SERVER + if (hash_hashed(&sess->hlist)) + hash_del(&sess->hlist); +#else hash_del(&sess->hlist); +#endif ksmbd_session_destroy(sess); continue; } @@ -229,7 +241,12 @@ hash_for_each_safe(sessions_table, bkt, tmp, sess, hlist) { if (!ksmbd_chann_del(conn, sess) && xa_empty(&sess->ksmbd_chann_list)) { +#ifdef CONFIG_SMB_INSECURE_SERVER + if (hash_hashed(&sess->hlist)) + hash_del(&sess->hlist); +#else hash_del(&sess->hlist); +#endif down_write(&conn->session_lock); xa_erase(&conn->sessions, sess->id); up_write(&conn->session_lock); @@ -252,7 +269,12 @@ ksmbd_chann_del(conn, sess); if (xa_empty(&sess->ksmbd_chann_list)) { xa_erase(&conn->sessions, sess->id); +#ifdef CONFIG_SMB_INSECURE_SERVER + if (hash_hashed(&sess->hlist)) hash_del(&sess->hlist); +#else + hash_del(&sess->hlist); +#endif if (atomic_dec_and_test(&sess->refcnt)) ksmbd_session_destroy(sess); } @@ -405,6 +427,18 @@ return NULL; } +#ifdef CONFIG_SMB_INSECURE_SERVER +static int __init_smb1_session(struct ksmbd_session *sess) +{ + int id = ksmbd_acquire_smb1_uid(&session_ida); + + if (id < 0) + return -EINVAL; + sess->id = id; + return 0; +} +#endif + static int __init_smb2_session(struct ksmbd_session *sess) { int id = ksmbd_acquire_smb2_uid(&session_ida); @@ -420,8 +454,10 @@ struct ksmbd_session *sess; int ret; +#ifndef CONFIG_SMB_INSECURE_SERVER if (protocol != CIFDS_SESSION_FLAG_SMB2) return NULL; +#endif sess = kzalloc(sizeof(struct ksmbd_session), KSMBD_DEFAULT_GFP); if (!sess) @@ -439,8 +475,22 @@ sess->sequence_number = 1; rwlock_init(&sess->tree_conns_lock); atomic_set(&sess->refcnt, 2); + init_rwsem(&sess->rpc_lock); + switch (protocol) { +#ifdef CONFIG_SMB_INSECURE_SERVER + case CIFDS_SESSION_FLAG_SMB1: + ret = __init_smb1_session(sess); + break; +#endif + case CIFDS_SESSION_FLAG_SMB2: ret = __init_smb2_session(sess); + break; + default: + ret = -EINVAL; + break; + } + if (ret) goto error; @@ -457,6 +507,13 @@ return NULL; } +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_session *ksmbd_smb1_session_create(void) +{ + return __session_create(CIFDS_SESSION_FLAG_SMB1); +} +#endif + struct ksmbd_session *ksmbd_smb2_session_create(void) { return __session_create(CIFDS_SESSION_FLAG_SMB2); @@ -466,6 +523,10 @@ { int id = -EINVAL; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (test_session_flag(sess, CIFDS_SESSION_FLAG_SMB1)) + id = ksmbd_acquire_smb1_tid(&sess->tree_conn_ida); +#endif if (test_session_flag(sess, CIFDS_SESSION_FLAG_SMB2)) id = ksmbd_acquire_smb2_tid(&sess->tree_conn_ida); diff -ruw linux-6.13.12/fs/smb/server/mgmt/user_session.h linux-6.13.12-fbx/fs/smb/server/mgmt/user_session.h --- linux-6.13.12/fs/smb/server/mgmt/user_session.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/mgmt/user_session.h 2025-09-25 17:40:36.779373236 +0200 @@ -12,6 +12,9 @@ #include "../smb_common.h" #include "../ntlmssp.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +#define CIFDS_SESSION_FLAG_SMB1 BIT(0) +#endif #define CIFDS_SESSION_FLAG_SMB2 BIT(1) #define PREAUTH_HASHVALUE_SIZE 64 @@ -63,6 +66,7 @@ rwlock_t tree_conns_lock; atomic_t refcnt; + struct rw_semaphore rpc_lock; }; static inline int test_session_flag(struct ksmbd_session *sess, int bit) @@ -80,6 +84,9 @@ sess->flags &= ~bit; } +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_session *ksmbd_smb1_session_create(void); +#endif struct ksmbd_session *ksmbd_smb2_session_create(void); void ksmbd_session_destroy(struct ksmbd_session *sess); diff -ruw linux-6.13.12/fs/smb/server/oplock.c linux-6.13.12-fbx/fs/smb/server/oplock.c --- linux-6.13.12/fs/smb/server/oplock.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/oplock.c 2025-09-25 17:40:36.779373236 +0200 @@ -16,6 +16,10 @@ #include "mgmt/share_config.h" #include "mgmt/tree_connect.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +#include "smb1pdu.h" +#endif + static LIST_HEAD(lease_table_list); static DEFINE_RWLOCK(lease_list_lock); @@ -45,6 +49,9 @@ opinfo->pending_break = 0; opinfo->fid = id; opinfo->Tid = Tid; +#ifdef CONFIG_SMB_INSECURE_SERVER + opinfo->is_smb2 = IS_SMB2(conn); +#endif INIT_LIST_HEAD(&opinfo->op_entry); init_waitqueue_head(&opinfo->oplock_q); init_waitqueue_head(&opinfo->oplock_brk); @@ -129,14 +136,6 @@ kfree(opinfo); } -static inline void opinfo_free_rcu(struct rcu_head *rcu_head) -{ - struct oplock_info *opinfo; - - opinfo = container_of(rcu_head, struct oplock_info, rcu_head); - free_opinfo(opinfo); -} - struct oplock_info *opinfo_get(struct ksmbd_file *fp) { struct oplock_info *opinfo; @@ -154,11 +153,8 @@ { struct oplock_info *opinfo; - if (list_empty(&ci->m_op_list)) - return NULL; - - rcu_read_lock(); - opinfo = list_first_or_null_rcu(&ci->m_op_list, struct oplock_info, + down_read(&ci->m_lock); + opinfo = list_first_entry_or_null(&ci->m_op_list, struct oplock_info, op_entry); if (opinfo) { if (opinfo->conn == NULL || @@ -171,8 +167,7 @@ } } } - - rcu_read_unlock(); + up_read(&ci->m_lock); return opinfo; } @@ -185,7 +180,7 @@ if (!atomic_dec_and_test(&opinfo->refcount)) return; - call_rcu(&opinfo->rcu_head, opinfo_free_rcu); + free_opinfo(opinfo); } static void opinfo_add(struct oplock_info *opinfo) @@ -193,7 +188,7 @@ struct ksmbd_inode *ci = opinfo->o_fp->f_ci; down_write(&ci->m_lock); - list_add_rcu(&opinfo->op_entry, &ci->m_op_list); + list_add(&opinfo->op_entry, &ci->m_op_list); up_write(&ci->m_lock); } @@ -207,7 +202,7 @@ write_unlock(&lease_list_lock); } down_write(&ci->m_lock); - list_del_rcu(&opinfo->op_entry); + list_del(&opinfo->op_entry); up_write(&ci->m_lock); } @@ -245,6 +240,8 @@ { struct lease *lease = opinfo->o_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (opinfo->is_smb2) { if (!(opinfo->level == SMB2_OPLOCK_LEVEL_BATCH || opinfo->level == SMB2_OPLOCK_LEVEL_EXCLUSIVE)) { pr_err("bad oplock(0x%x)\n", opinfo->level); @@ -256,6 +253,27 @@ if (opinfo->is_lease) lease->state = lease->new_state; + } else { + if (!(opinfo->level == OPLOCK_EXCLUSIVE || + opinfo->level == OPLOCK_BATCH)) { + pr_err("bad oplock(0x%x)\n", opinfo->level); + return -EINVAL; + } + opinfo->level = OPLOCK_READ; + } +#else + if (!(opinfo->level == SMB2_OPLOCK_LEVEL_BATCH || + opinfo->level == SMB2_OPLOCK_LEVEL_EXCLUSIVE)) { + pr_err("bad oplock(0x%x)\n", opinfo->level); + if (opinfo->is_lease) + pr_err("lease state(0x%x)\n", lease->state); + return -EINVAL; + } + opinfo->level = SMB2_OPLOCK_LEVEL_II; + + if (opinfo->is_lease) + lease->state = lease->new_state; +#endif return 0; } @@ -284,6 +302,27 @@ { struct lease *lease = opinfo->o_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (opinfo->is_smb2) { + if (!(opinfo->level == SMB2_OPLOCK_LEVEL_BATCH || + opinfo->level == SMB2_OPLOCK_LEVEL_EXCLUSIVE)) { + pr_err("bad oplock(0x%x)\n", opinfo->level); + if (opinfo->is_lease) + pr_err("lease state(0x%x)\n", lease->state); + return -EINVAL; + } + opinfo->level = SMB2_OPLOCK_LEVEL_NONE; + if (opinfo->is_lease) + lease->state = lease->new_state; + } else { + if (!(opinfo->level == OPLOCK_EXCLUSIVE || + opinfo->level == OPLOCK_BATCH)) { + pr_err("bad oplock(0x%x)\n", opinfo->level); + return -EINVAL; + } + opinfo->level = OPLOCK_NONE; + } +#else if (!(opinfo->level == SMB2_OPLOCK_LEVEL_BATCH || opinfo->level == SMB2_OPLOCK_LEVEL_EXCLUSIVE)) { pr_err("bad oplock(0x%x)\n", opinfo->level); @@ -294,6 +333,7 @@ opinfo->level = SMB2_OPLOCK_LEVEL_NONE; if (opinfo->is_lease) lease->state = lease->new_state; +#endif return 0; } @@ -307,6 +347,8 @@ { struct lease *lease = opinfo->o_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (opinfo->is_smb2) { if (opinfo->level != SMB2_OPLOCK_LEVEL_II) { pr_err("bad oplock(0x%x)\n", opinfo->level); if (opinfo->is_lease) @@ -316,6 +358,24 @@ opinfo->level = SMB2_OPLOCK_LEVEL_NONE; if (opinfo->is_lease) lease->state = lease->new_state; + } else { + if (opinfo->level != OPLOCK_READ) { + pr_err("bad oplock(0x%x)\n", opinfo->level); + return -EINVAL; + } + opinfo->level = OPLOCK_NONE; + } +#else + if (opinfo->level != SMB2_OPLOCK_LEVEL_II) { + pr_err("bad oplock(0x%x)\n", opinfo->level); + if (opinfo->is_lease) + pr_err("lease state(0x%x)\n", lease->state); + return -EINVAL; + } + opinfo->level = SMB2_OPLOCK_LEVEL_NONE; + if (opinfo->is_lease) + lease->state = lease->new_state; +#endif return 0; } @@ -419,10 +479,24 @@ { struct lease *lease = opinfo_new->o_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (opinfo_new->is_smb2) { if (req_oplock == SMB2_OPLOCK_LEVEL_BATCH) opinfo_new->level = SMB2_OPLOCK_LEVEL_BATCH; else opinfo_new->level = SMB2_OPLOCK_LEVEL_EXCLUSIVE; + } else { + if (req_oplock == REQ_BATCHOPLOCK) + opinfo_new->level = OPLOCK_BATCH; + else + opinfo_new->level = OPLOCK_EXCLUSIVE; + } +#else + if (req_oplock == SMB2_OPLOCK_LEVEL_BATCH) + opinfo_new->level = SMB2_OPLOCK_LEVEL_BATCH; + else + opinfo_new->level = SMB2_OPLOCK_LEVEL_EXCLUSIVE; +#endif if (lctx) { lease->state = lctx->req_state; @@ -442,7 +516,14 @@ { struct lease *lease = opinfo_new->o_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (opinfo_new->is_smb2) opinfo_new->level = SMB2_OPLOCK_LEVEL_II; + else + opinfo_new->level = OPLOCK_READ; +#else + opinfo_new->level = SMB2_OPLOCK_LEVEL_II; +#endif if (lctx) { lease->state = SMB2_LEASE_READ_CACHING_LE; @@ -464,7 +545,14 @@ { struct lease *lease = opinfo_new->o_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + if (opinfo_new->is_smb2) opinfo_new->level = SMB2_OPLOCK_LEVEL_NONE; + else + opinfo_new->level = OPLOCK_NONE; +#else + opinfo_new->level = SMB2_OPLOCK_LEVEL_NONE; +#endif if (lctx) { lease->state = 0; @@ -620,6 +708,119 @@ return 0; } +#ifdef CONFIG_SMB_INSECURE_SERVER +static inline int allocate_oplock_break_buf(struct ksmbd_work *work) +{ + work->response_buf = kzalloc(MAX_CIFS_SMALL_BUFFER_SIZE, KSMBD_DEFAULT_GFP); + if (!work->response_buf) + return -ENOMEM; + work->response_sz = MAX_CIFS_SMALL_BUFFER_SIZE; + return 0; +} + +/** + * smb1_oplock_break_noti() - send smb1 oplock break cmd from conn + * to client + * @work: smb work object + * + * There are two ways this function can be called. 1- while file open we break + * from exclusive/batch lock to levelII oplock and 2- while file write/truncate + * we break from levelII oplock no oplock. + * work->request_buf contains oplock_info. + */ +static void __smb1_oplock_break_noti(struct work_struct *wk) +{ + struct ksmbd_work *work = container_of(wk, struct ksmbd_work, work); + struct ksmbd_conn *conn = work->conn; + struct smb_hdr *rsp_hdr; + struct smb_com_lock_req *req; + struct oplock_info *opinfo = work->request_buf; + + if (allocate_oplock_break_buf(work)) { + pr_err("smb_allocate_rsp_buf failed! "); + ksmbd_free_work_struct(work); + return; + } + + /* Init response header */ + rsp_hdr = work->response_buf; + /* wct is 8 for locking andx(18) */ + memset(rsp_hdr, 0, sizeof(struct smb_hdr) + 18); + rsp_hdr->smb_buf_length = + cpu_to_be32(conn->vals->header_size - 4 + 18); + rsp_hdr->Protocol[0] = 0xFF; + rsp_hdr->Protocol[1] = 'S'; + rsp_hdr->Protocol[2] = 'M'; + rsp_hdr->Protocol[3] = 'B'; + + rsp_hdr->Command = SMB_COM_LOCKING_ANDX; + /* we know unicode, long file name and use nt error codes */ + rsp_hdr->Flags2 = SMBFLG2_UNICODE | SMBFLG2_KNOWS_LONG_NAMES | + SMBFLG2_ERR_STATUS; + rsp_hdr->Uid = cpu_to_le16(work->sess->id); + rsp_hdr->Pid = cpu_to_le16(0xFFFF); + rsp_hdr->Mid = cpu_to_le16(0xFFFF); + rsp_hdr->Tid = cpu_to_le16(opinfo->Tid); + rsp_hdr->WordCount = 8; + + /* Init locking request */ + req = work->response_buf; + + req->AndXCommand = 0xFF; + req->AndXReserved = 0; + req->AndXOffset = 0; + req->Fid = opinfo->fid; + req->LockType = LOCKING_ANDX_OPLOCK_RELEASE; + if (!opinfo->open_trunc && + (opinfo->level == OPLOCK_BATCH || + opinfo->level == OPLOCK_EXCLUSIVE)) + req->OplockLevel = 1; + else + req->OplockLevel = 0; + req->Timeout = 0; + req->NumberOfUnlocks = 0; + req->ByteCount = 0; + ksmbd_debug(OPLOCK, "sending oplock break for fid %d lock level = %d\n", + req->Fid, req->OplockLevel); + + ksmbd_conn_write(work); + ksmbd_free_work_struct(work); +} + +/** + * smb1_oplock_break() - send smb1 exclusive/batch to level2 oplock + * break command from server to client + * @opinfo: oplock info object + * @ack_required if requiring ack + * + * Return: 0 on success, otherwise error + */ +static int smb1_oplock_break_noti(struct oplock_info *opinfo) +{ + struct ksmbd_conn *conn = opinfo->conn; + struct ksmbd_work *work = ksmbd_alloc_work_struct(); + + if (!work) + return -ENOMEM; + + work->request_buf = (char *)opinfo; + work->conn = conn; + + ksmbd_conn_r_count_inc(conn); + if (opinfo->op_state == OPLOCK_ACK_WAIT) { + INIT_WORK(&work->work, __smb1_oplock_break_noti); + ksmbd_queue_work(work); + + wait_for_break_ack(opinfo); + } else { + __smb1_oplock_break_noti(&work->work); + if (opinfo->level == OPLOCK_READ) + opinfo->level = OPLOCK_NONE; + } + return 0; +} +#endif + /** * __smb2_oplock_break_noti() - send smb2 oplock break cmd from conn * to client @@ -929,10 +1130,20 @@ brk_opinfo->op_state = OPLOCK_ACK_WAIT; } +#ifdef CONFIG_SMB_INSECURE_SERVER + if (brk_opinfo->is_smb2) if (brk_opinfo->is_lease) err = smb2_lease_break_noti(brk_opinfo); else err = smb2_oplock_break_noti(brk_opinfo); + else + err = smb1_oplock_break_noti(brk_opinfo); +#else + if (brk_opinfo->is_lease) + err = smb2_lease_break_noti(brk_opinfo); + else + err = smb2_oplock_break_noti(brk_opinfo); +#endif ksmbd_debug(OPLOCK, "oplock granted = %d\n", brk_opinfo->level); if (brk_opinfo->op_state == OPLOCK_CLOSING) @@ -1076,6 +1287,10 @@ struct lease_ctx_info *lctx) { switch (level) { +#ifdef CONFIG_SMB_INSECURE_SERVER + case REQ_OPLOCK: + case REQ_BATCHOPLOCK: +#endif case SMB2_OPLOCK_LEVEL_BATCH: case SMB2_OPLOCK_LEVEL_EXCLUSIVE: grant_write_oplock(opinfo, level, lctx); @@ -1347,8 +1562,8 @@ ci = fp->f_ci; op = opinfo_get(fp); - rcu_read_lock(); - list_for_each_entry_rcu(brk_op, &ci->m_op_list, op_entry) { + down_read(&ci->m_lock); + list_for_each_entry(brk_op, &ci->m_op_list, op_entry) { if (brk_op->conn == NULL) continue; @@ -1358,7 +1573,35 @@ if (ksmbd_conn_releasing(brk_op->conn)) continue; - rcu_read_unlock(); +#ifdef CONFIG_SMB_INSECURE_SERVER + if (brk_op->is_smb2) { + if (brk_op->is_lease && (brk_op->o_lease->state & + (~(SMB2_LEASE_READ_CACHING_LE | + SMB2_LEASE_HANDLE_CACHING_LE)))) { + ksmbd_debug(OPLOCK, + "unexpected lease state(0x%x)\n", + brk_op->o_lease->state); + goto next; + } else if (brk_op->level != + SMB2_OPLOCK_LEVEL_II) { + ksmbd_debug(OPLOCK, "unexpected oplock(0x%x)\n", + brk_op->level); + goto next; + } + + /* Skip oplock being break to none */ + if (brk_op->is_lease && + brk_op->o_lease->new_state == SMB2_LEASE_NONE_LE && + atomic_read(&brk_op->breaking_cnt)) + goto next; + } else { + if (brk_op->level != OPLOCK_READ) { + ksmbd_debug(OPLOCK, "unexpected oplock(0x%x)\n", + brk_op->level); + goto next; + } + } +#else if (brk_op->is_lease && (brk_op->o_lease->state & (~(SMB2_LEASE_READ_CACHING_LE | SMB2_LEASE_HANDLE_CACHING_LE)))) { @@ -1377,6 +1620,7 @@ brk_op->o_lease->new_state == SMB2_LEASE_NONE_LE && atomic_read(&brk_op->breaking_cnt)) goto next; +#endif if (op && op->is_lease && brk_op->is_lease && !memcmp(conn->ClientGUID, brk_op->conn->ClientGUID, @@ -1388,9 +1632,8 @@ oplock_break(brk_op, SMB2_OPLOCK_LEVEL_NONE, NULL); next: opinfo_put(brk_op); - rcu_read_lock(); } - rcu_read_unlock(); + up_read(&ci->m_lock); if (op) opinfo_put(op); @@ -1507,7 +1750,7 @@ if (le16_to_cpu(cc->DataOffset) + le32_to_cpu(cc->DataLength) < sizeof(struct create_lease_v2) - 4) - return NULL; + goto err_out; memcpy(lreq->lease_key, lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE); lreq->req_state = lc->lcontext.LeaseState; @@ -1523,7 +1766,7 @@ if (le16_to_cpu(cc->DataOffset) + le32_to_cpu(cc->DataLength) < sizeof(struct create_lease)) - return NULL; + goto err_out; memcpy(lreq->lease_key, lc->lcontext.LeaseKey, SMB2_LEASE_KEY_SIZE); lreq->req_state = lc->lcontext.LeaseState; @@ -1532,6 +1775,9 @@ lreq->version = 1; } return lreq; +err_out: + kfree(lreq); + return NULL; } /** diff -ruw linux-6.13.12/fs/smb/server/oplock.h linux-6.13.12-fbx/fs/smb/server/oplock.h --- linux-6.13.12/fs/smb/server/oplock.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/oplock.h 2025-09-25 17:40:36.779373236 +0200 @@ -11,6 +11,14 @@ #define OPLOCK_WAIT_TIME (35 * HZ) +#ifdef CONFIG_SMB_INSECURE_SERVER +/* SMB Oplock levels */ +#define OPLOCK_NONE 0 +#define OPLOCK_EXCLUSIVE 1 +#define OPLOCK_BATCH 2 +#define OPLOCK_READ 3 /* level 2 oplock */ +#endif + /* Oplock states */ #define OPLOCK_STATE_NONE 0x00 #define OPLOCK_ACK_WAIT 0x01 @@ -65,13 +73,15 @@ atomic_t refcount; __u16 Tid; bool is_lease; +#ifdef CONFIG_SMB_INSECURE_SERVER + bool is_smb2; +#endif bool open_trunc; /* truncate on open */ struct lease *o_lease; struct list_head op_entry; struct list_head lease_entry; wait_queue_head_t oplock_q; /* Other server threads */ wait_queue_head_t oplock_brk; /* oplock breaking wait */ - struct rcu_head rcu_head; }; struct lease_break_info { diff -ruw linux-6.13.12/fs/smb/server/smb2ops.c linux-6.13.12-fbx/fs/smb/server/smb2ops.c --- linux-6.13.12/fs/smb/server/smb2ops.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/smb2ops.c 2025-09-25 17:40:36.783373256 +0200 @@ -12,6 +12,34 @@ #include "smb_common.h" #include "server.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +static struct smb_version_values smb20_server_values = { + .version_string = SMB20_VERSION_STRING, + .protocol_id = SMB20_PROT_ID, + .capabilities = 0, + .max_read_size = CIFS_DEFAULT_IOSIZE, + .max_write_size = CIFS_DEFAULT_IOSIZE, + .max_trans_size = CIFS_DEFAULT_IOSIZE, + .max_credits = SMB2_MAX_CREDITS, + .large_lock_type = 0, + .exclusive_lock_type = SMB2_LOCKFLAG_EXCLUSIVE, + .shared_lock_type = SMB2_LOCKFLAG_SHARED, + .unlock_lock_type = SMB2_LOCKFLAG_UNLOCK, + .header_size = sizeof(struct smb2_hdr), + .max_header_size = MAX_SMB2_HDR_SIZE, + .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .lock_cmd = SMB2_LOCK, + .cap_unix = 0, + .cap_nt_find = SMB2_NT_FIND, + .cap_large_files = SMB2_LARGE_FILES, + .create_lease_size = sizeof(struct create_lease), + .create_durable_size = sizeof(struct create_durable_rsp), + .create_mxac_size = sizeof(struct create_mxac_rsp), + .create_disk_id_size = sizeof(struct create_disk_id_rsp), + .create_posix_size = sizeof(struct create_posix_rsp), +}; +#endif + static struct smb_version_values smb21_server_values = { .version_string = SMB21_VERSION_STRING, .protocol_id = SMB21_PROT_ID, @@ -190,6 +218,22 @@ [SMB2_CHANGE_NOTIFY_HE] = { .proc = smb2_notify}, }; +#ifdef CONFIG_SMB_INSECURE_SERVER +/** + * init_smb2_0_server() - initialize a smb server connection with smb2.0 + * command dispatcher + * @conn: connection instance + */ +void init_smb2_0_server(struct ksmbd_conn *conn) +{ + conn->vals = &smb20_server_values; + conn->ops = &smb2_0_server_ops; + conn->cmds = smb2_0_server_cmds; + conn->max_cmds = ARRAY_SIZE(smb2_0_server_cmds); + conn->signing_algorithm = SIGNING_ALG_HMAC_SHA256; +} +#endif + /** * init_smb2_1_server() - initialize a smb server connection with smb2.1 * command dispatcher diff -ruw linux-6.13.12/fs/smb/server/smb2pdu.c linux-6.13.12-fbx/fs/smb/server/smb2pdu.c --- linux-6.13.12/fs/smb/server/smb2pdu.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/smb2pdu.c 2025-09-25 17:40:36.787373276 +0200 @@ -497,6 +497,10 @@ { struct smb2_hdr *rsp_hdr = smb2_get_msg(work->response_buf); struct smb2_hdr *rcv_hdr = smb2_get_msg(work->request_buf); + size_t rcv_sz = get_rfc1002_len(work->request_buf); + + if (rcv_sz < sizeof(struct smb2_hdr)) + return 1; memset(rsp_hdr, 0, sizeof(struct smb2_hdr) + 2); rsp_hdr->ProtocolId = rcv_hdr->ProtocolId; @@ -632,6 +636,11 @@ return name; } + if (*name == '\0') { + kfree(name); + return ERR_PTR(-EINVAL); + } + if (*name == '\\') { pr_err("not allow directory name included leading slash\n"); kfree(name); @@ -1194,6 +1203,11 @@ case SMB21_PROT_ID: init_smb2_1_server(conn); break; +#ifdef CONFIG_SMB_INSECURE_SERVER + case SMB20_PROT_ID: + init_smb2_0_server(conn); + break; +#endif case SMB2X_PROT_ID: case BAD_PROT_ID: default: @@ -1444,7 +1458,7 @@ { struct ksmbd_conn *conn = work->conn; struct ksmbd_session *sess = work->sess; - struct channel *chann = NULL; + struct channel *chann = NULL, *old; struct ksmbd_user *user; u64 prev_id; int sz, rc; @@ -1556,7 +1570,12 @@ return -ENOMEM; chann->conn = conn; - xa_store(&sess->ksmbd_chann_list, (long)conn, chann, KSMBD_DEFAULT_GFP); + old = xa_store(&sess->ksmbd_chann_list, (long)conn, chann, + KSMBD_DEFAULT_GFP); + if (xa_is_err(old)) { + kfree(chann); + return xa_err(old); + } } } @@ -1596,20 +1615,18 @@ out_len = work->response_sz - (le16_to_cpu(rsp->SecurityBufferOffset) + 4); - /* Check previous session */ - prev_sess_id = le64_to_cpu(req->PreviousSessionId); - if (prev_sess_id && prev_sess_id != sess->id) - destroy_previous_session(conn, sess->user, prev_sess_id); - - if (sess->state == SMB2_SESSION_VALID) - ksmbd_free_user(sess->user); - retval = ksmbd_krb5_authenticate(sess, in_blob, in_len, out_blob, &out_len); if (retval) { ksmbd_debug(SMB, "krb5 authentication failed\n"); return -EINVAL; } + + /* Check previous session */ + prev_sess_id = le64_to_cpu(req->PreviousSessionId); + if (prev_sess_id && prev_sess_id != sess->id) + destroy_previous_session(conn, sess->user, prev_sess_id); + rsp->SecurityBufferLength = cpu_to_le16(out_len); if ((conn->sign || server_conf.enforced_signing) || @@ -1824,8 +1841,6 @@ ksmbd_conn_set_good(conn); sess->state = SMB2_SESSION_VALID; } - kfree(sess->Preauth_HashValue); - sess->Preauth_HashValue = NULL; } else if (conn->preferred_auth_mech == KSMBD_AUTH_NTLMSSP) { if (negblob->MessageType == NtLmNegotiate) { rc = ntlm_negotiate(work, negblob, negblob_len, rsp); @@ -1852,8 +1867,6 @@ kfree(preauth_sess); } } - kfree(sess->Preauth_HashValue); - sess->Preauth_HashValue = NULL; } else { pr_info_ratelimited("Unknown NTLMSSP message type : 0x%x\n", le32_to_cpu(negblob->MessageType)); @@ -8511,11 +8524,6 @@ goto err_out; } - opinfo->op_state = OPLOCK_STATE_NONE; - wake_up_interruptible_all(&opinfo->oplock_q); - opinfo_put(opinfo); - ksmbd_fd_put(work, fp); - rsp->StructureSize = cpu_to_le16(24); rsp->OplockLevel = rsp_oplevel; rsp->Reserved = 0; @@ -8523,16 +8531,15 @@ rsp->VolatileFid = volatile_id; rsp->PersistentFid = persistent_id; ret = ksmbd_iov_pin_rsp(work, rsp, sizeof(struct smb2_oplock_break)); - if (!ret) - return; - + if (ret) { err_out: + smb2_set_err_rsp(work); + } + opinfo->op_state = OPLOCK_STATE_NONE; wake_up_interruptible_all(&opinfo->oplock_q); - opinfo_put(opinfo); ksmbd_fd_put(work, fp); - smb2_set_err_rsp(work); } static int check_lease_state(struct lease *lease, __le32 req_state) @@ -8662,11 +8669,6 @@ } lease_state = lease->state; - opinfo->op_state = OPLOCK_STATE_NONE; - wake_up_interruptible_all(&opinfo->oplock_q); - atomic_dec(&opinfo->breaking_cnt); - wake_up_interruptible_all(&opinfo->oplock_brk); - opinfo_put(opinfo); rsp->StructureSize = cpu_to_le16(36); rsp->Reserved = 0; @@ -8675,16 +8677,16 @@ rsp->LeaseState = lease_state; rsp->LeaseDuration = 0; ret = ksmbd_iov_pin_rsp(work, rsp, sizeof(struct smb2_lease_ack)); - if (!ret) - return; - + if (ret) { err_out: + smb2_set_err_rsp(work); + } + + opinfo->op_state = OPLOCK_STATE_NONE; wake_up_interruptible_all(&opinfo->oplock_q); atomic_dec(&opinfo->breaking_cnt); wake_up_interruptible_all(&opinfo->oplock_brk); - opinfo_put(opinfo); - smb2_set_err_rsp(work); } /** diff -ruw linux-6.13.12/fs/smb/server/smb2pdu.h linux-6.13.12-fbx/fs/smb/server/smb2pdu.h --- linux-6.13.12/fs/smb/server/smb2pdu.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/smb2pdu.h 2025-09-25 17:40:36.787373276 +0200 @@ -424,6 +424,9 @@ } __packed; /* functions */ +#ifdef CONFIG_SMB_INSECURE_SERVER +void init_smb2_0_server(struct ksmbd_conn *conn); +#endif void init_smb2_1_server(struct ksmbd_conn *conn); void init_smb3_0_server(struct ksmbd_conn *conn); void init_smb3_02_server(struct ksmbd_conn *conn); diff -ruw linux-6.13.12/fs/smb/server/smb_common.c linux-6.13.12-fbx/fs/smb/server/smb_common.c --- linux-6.13.12/fs/smb/server/smb_common.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/smb_common.c 2025-09-25 17:40:36.787373276 +0200 @@ -17,6 +17,10 @@ #include "mgmt/tree_connect.h" #include "mgmt/share_config.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +#include "smb1pdu.h" +#endif + /*for shortname implementation */ static const char *basechars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ_-!@#$%"; #define MANGLE_BASE (strlen(basechars) - 1) @@ -32,6 +36,20 @@ }; static struct smb_protocol smb1_protos[] = { +#ifdef CONFIG_SMB_INSECURE_SERVER + { + SMB1_PROT, + "\2NT LM 0.12", + "NT1", + SMB10_PROT_ID + }, + { + SMB2_PROT, + "\2SMB 2.002", + "SMB2_02", + SMB20_PROT_ID + }, +#endif { SMB21_PROT, "\2SMB 2.1", @@ -90,7 +108,11 @@ inline int ksmbd_min_protocol(void) { +#ifdef CONFIG_SMB_INSECURE_SERVER + return SMB1_PROT; +#else return SMB21_PROT; +#endif } inline int ksmbd_max_protocol(void) @@ -135,6 +157,16 @@ int ksmbd_verify_smb_message(struct ksmbd_work *work) { struct smb2_hdr *smb2_hdr = ksmbd_req_buf_next(work); + +#ifdef CONFIG_SMB_INSECURE_SERVER + if (smb2_hdr->ProtocolId == SMB2_PROTO_NUMBER) { + ksmbd_debug(SMB, "got SMB2 command\n"); + return ksmbd_smb2_check_message(work); + } + + work->conn->outstanding_credits++; + return ksmbd_smb1_check_message(work); +#else struct smb_hdr *hdr; if (smb2_hdr->ProtocolId == SMB2_PROTO_NUMBER) @@ -148,6 +180,7 @@ } return -EINVAL; +#endif } /** @@ -299,6 +332,7 @@ return BAD_PROT_ID; } +#ifndef CONFIG_SMB_INSECURE_SERVER #define SMB_COM_NEGOTIATE_EX 0x0 /** @@ -409,6 +443,7 @@ conn->max_cmds = ARRAY_SIZE(smb1_server_cmds); return 0; } +#endif int ksmbd_init_smb_server(struct ksmbd_conn *conn) { @@ -570,6 +605,7 @@ conn->dialect <= SMB311_PROT_ID); } +#ifndef CONFIG_SMB_INSECURE_SERVER static int smb_handle_negotiate(struct ksmbd_work *work) { struct smb_negotiate_rsp *neg_rsp = work->response_buf; @@ -586,6 +622,7 @@ neg_rsp->ByteCount = 0; return 0; } +#endif int ksmbd_smb_negotiate_common(struct ksmbd_work *work, unsigned int command) { diff -ruw linux-6.13.12/fs/smb/server/smb_common.h linux-6.13.12-fbx/fs/smb/server/smb_common.h --- linux-6.13.12/fs/smb/server/smb_common.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/smb_common.h 2025-09-25 17:40:36.787373276 +0200 @@ -49,6 +49,42 @@ /* * File Attribute flags */ +#ifdef CONFIG_SMB_INSECURE_SERVER +#define ATTR_READONLY 0x0001 +#define ATTR_HIDDEN 0x0002 +#define ATTR_SYSTEM 0x0004 +#define ATTR_VOLUME 0x0008 +#define ATTR_DIRECTORY 0x0010 +#define ATTR_ARCHIVE 0x0020 +#define ATTR_DEVICE 0x0040 +#define ATTR_NORMAL 0x0080 +#define ATTR_TEMPORARY 0x0100 +#define ATTR_SPARSE 0x0200 +#define ATTR_REPARSE 0x0400 +#define ATTR_COMPRESSED 0x0800 +#define ATTR_OFFLINE 0x1000 +#define ATTR_NOT_CONTENT_INDEXED 0x2000 +#define ATTR_ENCRYPTED 0x4000 + +#define ATTR_READONLY_LE cpu_to_le32(ATTR_READONLY) +#define ATTR_HIDDEN_LE cpu_to_le32(ATTR_HIDDEN) +#define ATTR_SYSTEM_LE cpu_to_le32(ATTR_SYSTEM) +#define ATTR_DIRECTORY_LE cpu_to_le32(ATTR_DIRECTORY) +#define ATTR_ARCHIVE_LE cpu_to_le32(ATTR_ARCHIVE) +#define ATTR_NORMAL_LE cpu_to_le32(ATTR_NORMAL) +#define ATTR_TEMPORARY_LE cpu_to_le32(ATTR_TEMPORARY) +#define ATTR_SPARSE_FILE_LE cpu_to_le32(ATTR_SPARSE) +#define ATTR_REPARSE_POINT_LE cpu_to_le32(ATTR_REPARSE) +#define ATTR_COMPRESSED_LE cpu_to_le32(ATTR_COMPRESSED) +#define ATTR_OFFLINE_LE cpu_to_le32(ATTR_OFFLINE) +#define ATTR_NOT_CONTENT_INDEXED_LE cpu_to_le32(ATTR_NOT_CONTENT_INDEXED) +#define ATTR_ENCRYPTED_LE cpu_to_le32(ATTR_ENCRYPTED) +#define ATTR_INTEGRITY_STREAML_LE cpu_to_le32(0x00008000) +#define ATTR_NO_SCRUB_DATA_LE cpu_to_le32(0x00020000) +#define ATTR_MASK_LE cpu_to_le32(0x00007FB7) + +#define IS_SMB2(x) ((x)->vals->protocol_id != SMB10_PROT_ID) +#endif #define ATTR_POSIX_SEMANTICS 0x01000000 #define ATTR_BACKUP_SEMANTICS 0x02000000 #define ATTR_DELETE_ON_CLOSE 0x04000000 @@ -203,11 +239,13 @@ unsigned char DialectsArray[]; } __packed; +#ifndef CONFIG_SMB_INSECURE_SERVER struct smb_negotiate_rsp { struct smb_hdr hdr; /* wct = 17 */ __le16 DialectIndex; /* 0xFFFF = no dialect acceptable */ __le16 ByteCount; } __packed; +#endif struct filesystem_attribute_info { __le32 Attributes; @@ -236,6 +274,14 @@ __le32 BytesPerSector; } __packed; /* size info, level 0x103 */ +struct filesystem_full_info { + __le64 TotalAllocationUnits; + __le64 FreeAllocationUnits; + __le64 ActualAvailableUnits; + __le32 SectorsPerAllocationUnit; + __le32 BytesPerSector; +} __packed; /* size info, level 0x3ef */ + #define EXTENDED_INFO_MAGIC 0x43667364 /* Cfsd */ #define STRING_LENGTH 28 diff -ruw linux-6.13.12/fs/smb/server/transport_ipc.c linux-6.13.12-fbx/fs/smb/server/transport_ipc.c --- linux-6.13.12/fs/smb/server/transport_ipc.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/transport_ipc.c 2025-09-25 17:40:36.787373276 +0200 @@ -310,7 +310,11 @@ server_conf.signing = req->signing; server_conf.tcp_port = req->tcp_port; server_conf.ipc_timeout = req->ipc_timeout * HZ; - server_conf.deadtime = req->deadtime * SMB_ECHO_INTERVAL; + if (check_mul_overflow(req->deadtime, SMB_ECHO_INTERVAL, + &server_conf.deadtime)) { + ret = -EINVAL; + goto out; + } server_conf.share_fake_fscaps = req->share_fake_fscaps; ksmbd_init_domain(req->sub_auth); @@ -336,6 +340,7 @@ ret |= ksmbd_set_work_group(req->work_group); ret |= ksmbd_tcp_set_interfaces(KSMBD_STARTUP_CONFIG_INTERFACES(req), req->ifc_list_sz); +out: if (ret) { pr_err("Server configuration error: %s %s %s\n", req->netbios_name, req->server_string, diff -ruw linux-6.13.12/fs/smb/server/unicode.c linux-6.13.12-fbx/fs/smb/server/unicode.c --- linux-6.13.12/fs/smb/server/unicode.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/unicode.c 2025-09-25 17:40:36.791373296 +0200 @@ -13,6 +13,24 @@ #include "unicode.h" #include "smb_common.h" +#ifdef CONFIG_SMB_INSECURE_SERVER +int smb1_utf16_name_length(const __le16 *from, int maxbytes) +{ + int i, len = 0; + int maxwords = maxbytes / 2; + __u16 ftmp; + + for (i = 0; i < maxwords; i++) { + ftmp = get_unaligned_le16(&from[i]); + len += 2; + if (ftmp == 0) + break; + } + + return len; +} +#endif + /* * cifs_mapchar() - convert a host-endian char to proper char in codepage * @target: where converted character should be copied diff -ruw linux-6.13.12/fs/smb/server/unicode.h linux-6.13.12-fbx/fs/smb/server/unicode.h --- linux-6.13.12/fs/smb/server/unicode.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/unicode.h 2025-09-25 17:40:36.791373296 +0200 @@ -28,6 +28,9 @@ #include "../../nls/nls_ucs2_utils.h" #ifdef __KERNEL__ +#ifdef CONFIG_SMB_INSECURE_SERVER +int smb1_utf16_name_length(const __le16 *from, int maxbytes); +#endif int smb_strtoUTF16(__le16 *to, const char *from, int len, const struct nls_table *codepage); char *smb_strndup_from_utf16(const char *src, const int maxlen, diff -ruw linux-6.13.12/fs/smb/server/vfs.c linux-6.13.12-fbx/fs/smb/server/vfs.c --- linux-6.13.12/fs/smb/server/vfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/vfs.c 2025-09-25 17:40:36.791373296 +0200 @@ -426,10 +426,15 @@ ksmbd_debug(VFS, "write stream data pos : %llu, count : %zd\n", *pos, count); + if (*pos >= XATTR_SIZE_MAX) { + pr_err("stream write position %lld is out of bounds\n", *pos); + return -EINVAL; + } + size = *pos + count; if (size > XATTR_SIZE_MAX) { size = XATTR_SIZE_MAX; - count = (*pos + count) - XATTR_SIZE_MAX; + count = XATTR_SIZE_MAX - *pos; } v_len = ksmbd_vfs_getcasexattr(idmap, @@ -496,7 +501,8 @@ int err = 0; if (work->conn->connection_type) { - if (!(fp->daccess & (FILE_WRITE_DATA_LE | FILE_APPEND_DATA_LE))) { + if (!(fp->daccess & (FILE_WRITE_DATA_LE | FILE_APPEND_DATA_LE)) || + S_ISDIR(file_inode(fp->filp)->i_mode)) { pr_err("no right to write(%pD)\n", fp->filp); err = -EACCES; goto out; @@ -557,12 +563,253 @@ { int err; - err = vfs_getattr(path, stat, STATX_BTIME, AT_STATX_SYNC_AS_STAT); + err = vfs_getattr(path, stat, STATX_BASIC_STATS | STATX_BTIME, + AT_STATX_SYNC_AS_STAT); if (err) pr_err("getattr failed, err %d\n", err); return err; } +#ifdef CONFIG_SMB_INSECURE_SERVER +/** + * smb_check_attrs() - sanitize inode attributes + * @inode: inode + * @attrs: inode attributes + */ +static void smb_check_attrs(struct inode *inode, struct iattr *attrs) +{ + /* sanitize the mode change */ + if (attrs->ia_valid & ATTR_MODE) { + attrs->ia_mode &= S_IALLUGO; + attrs->ia_mode |= (inode->i_mode & ~S_IALLUGO); + } + + /* Revoke setuid/setgid on chown */ + if (!S_ISDIR(inode->i_mode) && + (((attrs->ia_valid & ATTR_UID) && + !uid_eq(attrs->ia_uid, inode->i_uid)) || + ((attrs->ia_valid & ATTR_GID) && + !gid_eq(attrs->ia_gid, inode->i_gid)))) { + attrs->ia_valid |= ATTR_KILL_PRIV; + if (attrs->ia_valid & ATTR_MODE) { + /* we're setting mode too, just clear the s*id bits */ + attrs->ia_mode &= ~S_ISUID; + if (attrs->ia_mode & 0010) + attrs->ia_mode &= ~S_ISGID; + } else { + /* set ATTR_KILL_* bits and let VFS handle it */ + attrs->ia_valid |= (ATTR_KILL_SUID | ATTR_KILL_SGID); + } + } +} + +/** + * ksmbd_vfs_setattr() - vfs helper for smb setattr + * @work: work + * @name: file name + * @fid: file id of open file + * @attrs: inode attributes + * + * Return: 0 on success, otherwise error + */ +int ksmbd_vfs_setattr(struct ksmbd_work *work, const char *name, u64 fid, + struct iattr *attrs) +{ + struct file *filp; + struct dentry *dentry; + struct inode *inode; + struct path path; + bool update_size = false; + int err = 0; + struct ksmbd_file *fp = NULL; + struct mnt_idmap *idmap; + + if (ksmbd_override_fsids(work)) + return -ENOMEM; + + if (name) { + err = kern_path(name, 0, &path); + if (err) { + ksmbd_revert_fsids(work); + ksmbd_debug(VFS, "lookup failed for %s, err = %d\n", + name, err); + return -ENOENT; + } + dentry = path.dentry; + inode = d_inode(dentry); + idmap = mnt_idmap(path.mnt); + } else { + fp = ksmbd_lookup_fd_fast(work, fid); + if (!fp) { + ksmbd_revert_fsids(work); + pr_err("failed to get filp for fid %llu\n", fid); + return -ENOENT; + } + + filp = fp->filp; + dentry = filp->f_path.dentry; + inode = d_inode(dentry); + idmap = file_mnt_idmap(filp); + } + + err = inode_permission(idmap, d_inode(dentry), MAY_WRITE); + if (err) + goto out; + + /* no need to update mode of symlink */ + if (S_ISLNK(inode->i_mode)) + attrs->ia_valid &= ~ATTR_MODE; + + /* skip setattr, if nothing to update */ + if (!attrs->ia_valid) { + err = 0; + goto out; + } + + smb_check_attrs(inode, attrs); + if (attrs->ia_valid & ATTR_SIZE) { + err = get_write_access(inode); + if (err) + goto out; + update_size = true; + } + + attrs->ia_valid |= ATTR_CTIME; + + inode_lock(inode); + err = notify_change(idmap, dentry, attrs, NULL); + inode_unlock(inode); + + if (update_size) + put_write_access(inode); + + if (!err) { + sync_inode_metadata(inode, 1); + ksmbd_debug(VFS, "fid %llu, setattr done\n", fid); + } + +out: + if (name) + path_put(&path); + ksmbd_fd_put(work, fp); + ksmbd_revert_fsids(work); + return err; +} + +/** + * ksmbd_vfs_symlink() - vfs helper for creating smb symlink + * @name: source file name + * @symname: symlink name + * + * Return: 0 on success, otherwise error + */ +int ksmbd_vfs_symlink(struct ksmbd_work *work, const char *name, + const char *symname) +{ + struct path path; + struct dentry *dentry; + int err; + + if (ksmbd_override_fsids(work)) + return -ENOMEM; + + dentry = kern_path_create(AT_FDCWD, symname, &path, 0); + if (IS_ERR(dentry)) { + ksmbd_revert_fsids(work); + err = PTR_ERR(dentry); + pr_err("path create failed for %s, err %d\n", name, err); + return err; + } + + err = vfs_symlink(mnt_idmap(path.mnt), d_inode(dentry->d_parent), + dentry, name); + if (err && (err != -EEXIST || err != -ENOSPC)) + ksmbd_debug(VFS, "failed to create symlink, err %d\n", err); + + done_path_create(&path, dentry); + ksmbd_revert_fsids(work); + return err; +} + +/** + * ksmbd_vfs_readlink() - vfs helper for reading value of symlink + * @path: path of symlink + * @buf: destination buffer for symlink value + * @lenp: destination buffer length + * + * Return: symlink value length on success, otherwise error + */ +int ksmbd_vfs_readlink(struct path *path, char *buf, int lenp) +{ + struct inode *inode; + int err; + const char *link; + DEFINE_DELAYED_CALL(done); + int len; + + if (!path) + return -ENOENT; + + inode = d_inode(path->dentry); + if (!S_ISLNK(inode->i_mode)) + return -EINVAL; + + link = vfs_get_link(path->dentry, &done); + if (IS_ERR(link)) { + err = PTR_ERR(link); + pr_err("readlink failed, err = %d\n", err); + return err; + } + + len = strlen(link); + if (len > lenp) + len = lenp; + + memcpy(buf, link, len); + do_delayed_call(&done); + + return len; +} + +int ksmbd_vfs_readdir_name(struct ksmbd_work *work, + struct mnt_idmap *idmap, + struct ksmbd_kstat *ksmbd_kstat, + const char *de_name, int de_name_len, + const char *dir_path) +{ + struct path parent_path, path; + int rc, file_pathlen, dir_pathlen; + char *name; + + dir_pathlen = strlen(dir_path); + /* 1 for '/'*/ + file_pathlen = dir_pathlen + de_name_len + 1; + name = kmalloc(file_pathlen + 1, KSMBD_DEFAULT_GFP); + if (!name) + return -ENOMEM; + + memcpy(name, dir_path, dir_pathlen); + memset(name + dir_pathlen, '/', 1); + memcpy(name + dir_pathlen + 1, de_name, de_name_len); + name[file_pathlen] = '\0'; + + rc = ksmbd_vfs_kern_path_locked(work, name, LOOKUP_NO_SYMLINKS, + &parent_path, &path, true); + if (rc) { + pr_err("lookup failed: %s [%d]\n", name, rc); + kfree(name); + return -ENOMEM; + } + + ksmbd_vfs_fill_dentry_attrs(work, idmap, path.dentry, ksmbd_kstat); + inode_unlock(d_inode(parent_path.dentry)); + path_put(&path); + path_put(&parent_path); + kfree(name); + return 0; +} +#endif + /** * ksmbd_vfs_fsync() - vfs helper for smb fsync * @work: work @@ -958,6 +1205,38 @@ return err; } +#ifdef CONFIG_SMB_INSECURE_SERVER +int ksmbd_vfs_fsetxattr(struct ksmbd_work *work, const char *filename, + const char *attr_name, const void *attr_value, + size_t attr_size, int flags) +{ + struct path path; + int err; + + if (ksmbd_override_fsids(work)) + return -ENOMEM; + + err = kern_path(filename, 0, &path); + if (err) { + ksmbd_revert_fsids(work); + ksmbd_debug(VFS, "cannot get linux path %s, err %d\n", + filename, err); + return err; + } + + err = vfs_setxattr(mnt_idmap(path.mnt), path.dentry, + attr_name, + attr_value, + attr_size, + flags); + if (err) + ksmbd_debug(VFS, "setxattr failed, err %d\n", err); + path_put(&path); + ksmbd_revert_fsids(work); + return err; +} +#endif + /** * ksmbd_vfs_set_fadvise() - convert smb IO caching options to linux options * @filp: file pointer for IO @@ -1109,6 +1388,63 @@ return err; } +#ifdef CONFIG_SMB_INSECURE_SERVER +/** + * ksmbd_vfs_dentry_open() - open a dentry and provide fid for it + * @work: smb work ptr + * @path: path of dentry to be opened + * @flags: open flags + * @ret_id: fid returned on this + * @option: file access pattern options for fadvise + * @fexist: file already present or not + * + * Return: allocated struct ksmbd_file on success, otherwise error pointer + */ +struct ksmbd_file *ksmbd_vfs_dentry_open(struct ksmbd_work *work, + const struct path *path, int flags, + __le32 option, int fexist) +{ + struct file *filp; + int err = 0; + struct ksmbd_file *fp = NULL; + + filp = dentry_open(path, flags | O_LARGEFILE, current_cred()); + if (IS_ERR(filp)) { + err = PTR_ERR(filp); + pr_err("dentry open failed, err %d\n", err); + return ERR_PTR(err); + } + + ksmbd_vfs_set_fadvise(filp, option); + + fp = ksmbd_open_fd(work, filp); + if (IS_ERR(fp)) { + fput(filp); + err = PTR_ERR(fp); + pr_err("id insert failed\n"); + goto err_out; + } + + if (flags & O_TRUNC) { + if (fexist) + smb_break_all_oplock(work, fp); + err = vfs_truncate((struct path *)path, 0); + if (err) + goto err_out; + } + return fp; + +err_out: + if (!IS_ERR(fp)) + ksmbd_close_fd(work, fp->volatile_id); + if (err) { + fp = ERR_PTR(err); + pr_err("err : %d\n", err); + } + return fp; +} +#endif + static bool __dir_empty(struct dir_context *ctx, const char *name, int namlen, loff_t offset, u64 ino, unsigned int d_type) { @@ -1292,6 +1628,7 @@ err = ksmbd_vfs_lock_parent(parent_path->dentry, path->dentry); if (err) { + mnt_drop_write(parent_path->mnt); path_put(path); path_put(parent_path); } diff -ruw linux-6.13.12/fs/smb/server/vfs.h linux-6.13.12-fbx/fs/smb/server/vfs.h --- linux-6.13.12/fs/smb/server/vfs.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/vfs.h 2025-09-25 17:40:36.791373296 +0200 @@ -39,6 +39,9 @@ struct ksmbd_dir_info { const char *name; +#ifdef CONFIG_SMB_INSECURE_SERVER + char *smb1_name; +#endif char *wptr; char *rptr; int name_len; @@ -87,6 +90,24 @@ int ksmbd_vfs_link(struct ksmbd_work *work, const char *oldname, const char *newname); int ksmbd_vfs_getattr(const struct path *path, struct kstat *stat); +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_file *ksmbd_vfs_dentry_open(struct ksmbd_work *work, + const struct path *path, int flags, + __le32 option, int fexist); +int ksmbd_vfs_setattr(struct ksmbd_work *work, const char *name, + u64 fid, struct iattr *attrs); +int ksmbd_vfs_fsetxattr(struct ksmbd_work *work, const char *filename, + const char *attr_name, const void *attr_value, + size_t attr_size, int flags); +int ksmbd_vfs_symlink(struct ksmbd_work *work, + const char *name, const char *symname); +int ksmbd_vfs_readlink(struct path *path, char *buf, int lenp); +int ksmbd_vfs_readdir_name(struct ksmbd_work *work, + struct mnt_idmap *idmap, + struct ksmbd_kstat *ksmbd_kstat, + const char *de_name, int de_name_len, + const char *dir_path); +#endif int ksmbd_vfs_rename(struct ksmbd_work *work, const struct path *old_path, char *newname, int flags); int ksmbd_vfs_truncate(struct ksmbd_work *work, diff -ruw linux-6.13.12/fs/smb/server/vfs_cache.c linux-6.13.12-fbx/fs/smb/server/vfs_cache.c --- linux-6.13.12/fs/smb/server/vfs_cache.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/vfs_cache.c 2025-09-25 17:40:36.791373296 +0200 @@ -342,6 +342,9 @@ locks_free_lock(smb_lock->fl); kfree(smb_lock); } +#ifdef CONFIG_SMB_INSECURE_SERVER + kfree(fp->filename); +#endif if (ksmbd_stream_fd(fp)) kfree(fp->stream.name); @@ -529,6 +532,52 @@ return fp; } +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_file *ksmbd_lookup_fd_filename(struct ksmbd_work *work, char *filename) +{ + struct ksmbd_file *fp = NULL; + unsigned int id; + char *pathname; + + pathname = kmalloc(PATH_MAX, KSMBD_DEFAULT_GFP); + if (!pathname) + return NULL; + + read_lock(&work->sess->file_table.lock); + idr_for_each_entry(work->sess->file_table.idr, fp, id) { + char *path = d_path(&fp->filp->f_path, pathname, PATH_MAX); + + if (IS_ERR(path)) + break; + + if (!strcmp(path, filename)) { + fp = ksmbd_fp_get(fp); + break; + } + } + read_unlock(&work->sess->file_table.lock); + + kfree(pathname); + return fp; +} + +int ksmbd_file_table_flush(struct ksmbd_work *work) +{ + struct ksmbd_file *fp = NULL; + unsigned int id; + int ret; + + read_lock(&work->sess->file_table.lock); + idr_for_each_entry(work->sess->file_table.idr, fp,id) { + ret = ksmbd_vfs_fsync(work, fp->volatile_id, KSMBD_NO_FID); + if (ret) + break; + } + read_unlock(&work->sess->file_table.lock); + return ret; +} +#endif + struct ksmbd_file *ksmbd_lookup_fd_inode(struct dentry *dentry) { struct ksmbd_file *lfp; @@ -579,7 +628,13 @@ idr_preload(KSMBD_DEFAULT_GFP); write_lock(&ft->lock); +#ifdef CONFIG_SMB_INSECURE_SERVER + ret = idr_alloc_cyclic(ft->idr, fp, 0, + IS_SMB2(fp->conn) ? INT_MAX - 1 : 0xFFFF, + GFP_NOWAIT); +#else ret = idr_alloc_cyclic(ft->idr, fp, 0, INT_MAX - 1, GFP_NOWAIT); +#endif if (ret >= 0) { id = ret; ret = 0; @@ -661,21 +716,40 @@ bool (*skip)(struct ksmbd_tree_connect *tcon, struct ksmbd_file *fp)) { - unsigned int id; struct ksmbd_file *fp; + unsigned int id = 0; int num = 0; - idr_for_each_entry(ft->idr, fp, id) { - if (skip(tcon, fp)) + while (1) { + write_lock(&ft->lock); + fp = idr_get_next(ft->idr, &id); + if (!fp) { + write_unlock(&ft->lock); + break; + } + + if (skip(tcon, fp) || + !atomic_dec_and_test(&fp->refcount)) { + id++; + write_unlock(&ft->lock); continue; + } set_close_state_blocked_works(fp); + idr_remove(ft->idr, fp->volatile_id); + fp->volatile_id = KSMBD_NO_FID; + write_unlock(&ft->lock); + + down_write(&fp->f_ci->m_lock); + list_del_init(&fp->node); + up_write(&fp->f_ci->m_lock); - if (!atomic_dec_and_test(&fp->refcount)) - continue; __ksmbd_close_fd(ft, fp); + num++; + id++; } + return num; } diff -ruw linux-6.13.12/fs/smb/server/vfs_cache.h linux-6.13.12-fbx/fs/smb/server/vfs_cache.h --- linux-6.13.12/fs/smb/server/vfs_cache.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/fs/smb/server/vfs_cache.h 2025-09-25 17:40:36.791373296 +0200 @@ -103,6 +103,20 @@ unsigned int durable_timeout; unsigned int durable_scavenger_timeout; +#ifdef CONFIG_SMB_INSECURE_SERVER + /* for SMB1 */ + int pid; + + /* conflict lock fail count for SMB1 */ + unsigned int cflock_cnt; + /* last lock failure start offset for SMB1 */ + unsigned long long llock_fstart; + + int dirent_offset; + + /* for find_first/find_next */ + char *filename; +#endif /* if ls is happening on directory, below is valid*/ struct ksmbd_readdir_data readdir_data; int dot_dotdot[2]; @@ -150,6 +164,10 @@ struct ksmbd_file *ksmbd_lookup_durable_fd(unsigned long long id); void ksmbd_put_durable_fd(struct ksmbd_file *fp); struct ksmbd_file *ksmbd_lookup_fd_cguid(char *cguid); +#ifdef CONFIG_SMB_INSECURE_SERVER +struct ksmbd_file *ksmbd_lookup_fd_filename(struct ksmbd_work *work, char *filename); +int ksmbd_file_table_flush(struct ksmbd_work *work); +#endif struct ksmbd_file *ksmbd_lookup_fd_inode(struct dentry *dentry); unsigned int ksmbd_open_durable_fd(struct ksmbd_file *fp); struct ksmbd_file *ksmbd_open_fd(struct ksmbd_work *work, struct file *filp); diff -ruw linux-6.13.12/include/asm-generic/vmlinux.lds.h linux-6.13.12-fbx/include/asm-generic/vmlinux.lds.h --- linux-6.13.12/include/asm-generic/vmlinux.lds.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/asm-generic/vmlinux.lds.h 2025-09-29 14:38:18.398248786 +0200 @@ -345,7 +345,7 @@ #define KERNEL_DTB() \ STRUCT_ALIGN(); \ __dtb_start = .; \ - KEEP(*(.dtb.init.rodata)) \ + KEEP(*(.dtb.rodata)) \ __dtb_end = .; /* @@ -457,6 +457,7 @@ . = ALIGN((align)); \ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ __start_rodata = .; \ + KERNEL_DTB() \ *(.rodata) *(.rodata.*) *(.data.rel.ro*) \ SCHED_DATA \ RO_AFTER_INIT_DATA /* Read only after init */ \ @@ -711,7 +712,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.13.12/include/dt-bindings/input/linux-event-codes.h linux-6.13.12-fbx/include/dt-bindings/input/linux-event-codes.h --- linux-6.13.12/include/dt-bindings/input/linux-event-codes.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/dt-bindings/input/linux-event-codes.h 2025-09-25 17:40:37.299375815 +0200 @@ -807,6 +807,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.13.12/include/linux/binfmts.h linux-6.13.12-fbx/include/linux/binfmts.h --- linux-6.13.12/include/linux/binfmts.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/binfmts.h 2025-09-25 17:40:36.935374010 +0200 @@ -62,7 +62,7 @@ unsigned long loader, exec; struct rlimit rlim_stack; /* Saved RLIMIT_STACK used during exec. */ - + int aslr_used; char buf[BINPRM_BUF_SIZE]; } __randomize_layout; diff -ruw linux-6.13.12/include/linux/debugfs.h linux-6.13.12-fbx/include/linux/debugfs.h --- linux-6.13.12/include/linux/debugfs.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/debugfs.h 2025-09-25 17:40:36.959374129 +0200 @@ -164,8 +164,7 @@ ssize_t debugfs_attr_write_signed(struct file *file, const char __user *buf, size_t len, loff_t *ppos); -struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, - struct dentry *new_dir, const char *new_name); +int debugfs_change_name(struct dentry *dentry, const char *fmt, ...) __printf(2, 3); void debugfs_create_u8(const char *name, umode_t mode, struct dentry *parent, u8 *value); @@ -341,10 +340,10 @@ return -ENODEV; } -static inline struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, - struct dentry *new_dir, char *new_name) +static inline int __printf(2, 3) debugfs_change_name(struct dentry *dentry, + const char *fmt, ...) { - return ERR_PTR(-ENODEV); + return -ENODEV; } static inline void debugfs_create_u8(const char *name, umode_t mode, diff -ruw linux-6.13.12/include/linux/device.h linux-6.13.12-fbx/include/linux/device.h --- linux-6.13.12/include/linux/device.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/device.h 2025-09-25 17:40:36.963374149 +0200 @@ -372,6 +372,9 @@ void __iomem *devm_of_iomap(struct device *dev, struct device_node *node, int index, resource_size_t *size); + +void __iomem *devm_of_iomap_byname(struct device *dev, struct device_node *node, + char *name, resource_size_t *size); #else static inline @@ -395,6 +398,13 @@ { return ERR_PTR(-EINVAL); } + +static inline +void __iomem *devm_of_iomap_byname(struct device *dev, struct device_node *node, + char *name, resource_size_t *size) +{ + return ERR_PTR(-EINVAL); +} #endif diff -ruw linux-6.13.12/include/linux/dma-mapping.h linux-6.13.12-fbx/include/linux/dma-mapping.h --- linux-6.13.12/include/linux/dma-mapping.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/dma-mapping.h 2025-09-25 17:40:36.967374168 +0200 @@ -489,6 +489,9 @@ return DMA_BIT_MASK(32); } +void *dma_alloc_coherent_no_dev(size_t size, dma_addr_t *dma_handle, gfp_t gfp); +void dma_free_coherent_no_dev(size_t size, void *addr, dma_addr_t dma_handle); + /* * Set both the DMA mask and the coherent DMA mask to the same thing. * Note that we don't check the return value from dma_set_coherent_mask() diff -ruw linux-6.13.12/include/linux/ethtool.h linux-6.13.12-fbx/include/linux/ethtool.h --- linux-6.13.12/include/linux/ethtool.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/ethtool.h 2025-09-25 17:40:36.971374188 +0200 @@ -1125,6 +1125,19 @@ 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 (*get_prbs_param)(struct net_device *, + struct ethtool_prbs_param *); + int (*set_prbs_param)(struct net_device *, + const struct ethtool_prbs_param *); }; int ethtool_check_ops(const struct ethtool_ops *ops); diff -ruw linux-6.13.12/include/linux/ieee80211.h linux-6.13.12-fbx/include/linux/ieee80211.h --- linux-6.13.12/include/linux/ieee80211.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/ieee80211.h 2025-09-25 17:40:36.995374307 +0200 @@ -1532,6 +1532,17 @@ struct { u8 action_code; } __packed ttlm_tear_down; + struct { + u8 action_code; + u8 dialog_token; + u8 variable[]; + } __packed ml_reconf_req; + struct { + u8 action_code; + u8 dialog_token; + u8 count; + u8 variable[]; + } __packed ml_reconf_resp; } u; } __packed action; DECLARE_FLEX_ARRAY(u8, body); /* Generic frame body */ @@ -1542,11 +1553,13 @@ #define BSS_MEMBERSHIP_SELECTOR_HT_PHY 127 #define BSS_MEMBERSHIP_SELECTOR_VHT_PHY 126 #define BSS_MEMBERSHIP_SELECTOR_GLK 125 -#define BSS_MEMBERSHIP_SELECTOR_EPS 124 +#define BSS_MEMBERSHIP_SELECTOR_EPD 124 #define BSS_MEMBERSHIP_SELECTOR_SAE_H2E 123 #define BSS_MEMBERSHIP_SELECTOR_HE_PHY 122 #define BSS_MEMBERSHIP_SELECTOR_EHT_PHY 121 +#define BSS_MEMBERSHIP_SELECTOR_MIN BSS_MEMBERSHIP_SELECTOR_EHT_PHY + /* mgmt header + 1 byte category code */ #define IEEE80211_MIN_ACTION_SIZE offsetof(struct ieee80211_mgmt, u.action.u) @@ -2308,6 +2321,7 @@ #define IEEE80211_EHT_OPER_EHT_DEF_PE_DURATION 0x04 #define IEEE80211_EHT_OPER_GROUP_ADDRESSED_BU_IND_LIMIT 0x08 #define IEEE80211_EHT_OPER_GROUP_ADDRESSED_BU_IND_EXP_MASK 0x30 +#define IEEE80211_EHT_OPER_MCS15_DISABLE 0x40 /** * struct ieee80211_eht_operation - eht operation element @@ -3883,6 +3897,16 @@ WLAN_PROTECTED_EHT_ACTION_TTLM_REQ = 0, WLAN_PROTECTED_EHT_ACTION_TTLM_RES = 1, WLAN_PROTECTED_EHT_ACTION_TTLM_TEARDOWN = 2, + WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_REQ = 3, + WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_RESP = 4, + WLAN_PROTECTED_EHT_ACTION_EPCS_ENABLE_TEARDOWN = 5, + WLAN_PROTECTED_EHT_ACTION_EML_OP_MODE_NOTIF = 6, + WLAN_PROTECTED_EHT_ACTION_LINK_RECOMMEND = 7, + WLAN_PROTECTED_EHT_ACTION_ML_OP_UPDATE_REQ = 8, + WLAN_PROTECTED_EHT_ACTION_ML_OP_UPDATE_RESP = 9, + WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_NOTIF = 10, + WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_REQ = 11, + WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_RESP = 12, }; /* Security key length */ @@ -4055,6 +4079,9 @@ /* Defines support for enhanced multi-bssid advertisement*/ #define WLAN_EXT_CAPA11_EMA_SUPPORT BIT(3) +/* Enable Beacon Protection */ +#define WLAN_EXT_CAPA11_BCN_PROTECT BIT(4) + /* TDLS specific payload type in the LLC/SNAP header */ #define WLAN_TDLS_SNAP_RFTYPE 0x2 @@ -4961,6 +4988,7 @@ #define IEEE80211_MLC_BASIC_PRES_EML_CAPA 0x0080 #define IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP 0x0100 #define IEEE80211_MLC_BASIC_PRES_MLD_ID 0x0200 +#define IEEE80211_MLC_BASIC_PRES_EXT_MLD_CAPA_OP 0x0400 #define IEEE80211_MED_SYNC_DELAY_DURATION 0x00ff #define IEEE80211_MED_SYNC_DELAY_SYNC_OFDM_ED_THRESH 0x0f00 @@ -5018,6 +5046,8 @@ #define IEEE80211_MLD_CAP_OP_TID_TO_LINK_MAP_NEG_SUPP_DIFF 3 #define IEEE80211_MLD_CAP_OP_FREQ_SEP_TYPE_IND 0x0f80 #define IEEE80211_MLD_CAP_OP_AAR_SUPPORT 0x1000 +#define IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT 0x2000 +#define IEEE80211_MLD_CAP_OP_ALIGNED_TWT_SUPPORT 0x4000 struct ieee80211_mle_basic_common_info { u8 len; @@ -5033,6 +5063,9 @@ } __packed; #define IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR 0x0010 +#define IEEE80211_MLC_RECONF_PRES_EML_CAPA 0x0020 +#define IEEE80211_MLC_RECONF_PRES_MLD_CAPA_OP 0x0040 +#define IEEE80211_MLC_RECONF_PRES_EXT_MLD_CAPA_OP 0x0080 /* no fixed fields in RECONF */ @@ -5223,6 +5256,47 @@ } /** + * ieee80211_mle_get_ext_mld_capa_op - returns the extended MLD capabilities + * and operations. + * @data: pointer to the multi-link element + * Return: the extended MLD capabilities and operations field value from + * the multi-link element, or 0 if not present + * + * The element is assumed to be of the correct type (BASIC) and big enough, + * this must be checked using ieee80211_mle_type_ok(). + */ +static inline u16 ieee80211_mle_get_ext_mld_capa_op(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_EXT_MLD_CAPA_OP)) + 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; + if (control & IEEE80211_MLC_BASIC_PRES_EML_CAPA) + common += 2; + if (control & IEEE80211_MLC_BASIC_PRES_MLD_CAPA_OP) + common += 2; + if (control & IEEE80211_MLC_BASIC_PRES_MLD_ID) + common += 1; + + return get_unaligned_le16(common); +} + +/** * ieee80211_mle_get_mld_id - returns the MLD ID * @data: pointer to the multi-link element * Return: The MLD ID in the given multi-link element, or 0 if not present @@ -5294,6 +5368,8 @@ common += 2; if (control & IEEE80211_MLC_BASIC_PRES_MLD_ID) common += 1; + if (control & IEEE80211_MLC_BASIC_PRES_EXT_MLD_CAPA_OP) + common += 2; break; case IEEE80211_ML_CONTROL_TYPE_PREQ: common += sizeof(struct ieee80211_mle_preq_common_info); @@ -5304,6 +5380,12 @@ case IEEE80211_ML_CONTROL_TYPE_RECONF: if (control & IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR) common += ETH_ALEN; + if (control & IEEE80211_MLC_RECONF_PRES_EML_CAPA) + common += 2; + if (control & IEEE80211_MLC_RECONF_PRES_MLD_CAPA_OP) + common += 2; + if (control & IEEE80211_MLC_RECONF_PRES_EXT_MLD_CAPA_OP) + common += 2; break; case IEEE80211_ML_CONTROL_TYPE_TDLS: common += sizeof(struct ieee80211_mle_tdls_common_info); @@ -5453,7 +5535,12 @@ #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_TYPE 0x0780 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_AP_REM 0 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_OP_PARAM_UPDATE 1 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_ADD_LINK 2 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_DEL_LINK 3 +#define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_NSTR_STATUS 4 #define IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_PARAMS_PRESENT 0x0800 /** diff -ruw linux-6.13.12/include/linux/if_vlan.h linux-6.13.12-fbx/include/linux/if_vlan.h --- linux-6.13.12/include/linux/if_vlan.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/if_vlan.h 2025-09-25 17:40:36.999374327 +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.13.12/include/linux/in.h linux-6.13.12-fbx/include/linux/in.h --- linux-6.13.12/include/linux/in.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/in.h 2025-09-25 17:40:36.999374327 +0200 @@ -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.13.12/include/linux/irqchip/arm-gic-v3.h linux-6.13.12-fbx/include/linux/irqchip/arm-gic-v3.h --- linux-6.13.12/include/linux/irqchip/arm-gic-v3.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/irqchip/arm-gic-v3.h 2025-09-25 17:40:37.007374367 +0200 @@ -615,6 +615,8 @@ struct { raw_spinlock_t rd_lock; void __iomem *rd_base; + /* rd_base_phys, for use by irq-gicv3-ca code */ + phys_addr_t rd_base_phys; struct page *pend_page; phys_addr_t phys_base; u64 flags; diff -ruw linux-6.13.12/include/linux/ksm.h linux-6.13.12-fbx/include/linux/ksm.h --- linux-6.13.12/include/linux/ksm.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/ksm.h 2025-09-25 17:40:37.015374406 +0200 @@ -93,6 +93,7 @@ void collect_procs_ksm(const struct folio *folio, const struct page *page, struct list_head *to_kill, int force_early); long ksm_process_profit(struct mm_struct *); +bool ksm_process_mergeable(struct mm_struct *mm); #else /* !CONFIG_KSM */ diff -ruw linux-6.13.12/include/linux/mhi.h linux-6.13.12-fbx/include/linux/mhi.h --- linux-6.13.12/include/linux/mhi.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/mhi.h 2025-09-25 17:40:37.043374545 +0200 @@ -14,6 +14,7 @@ #include #include #include +#include #define MHI_MAX_OEM_PK_HASH_SEGMENTS 16 @@ -447,6 +448,8 @@ bool wake_set; unsigned long irq_flags; u32 mru; + + struct lm_license_buf license_buf; }; /** diff -ruw linux-6.13.12/include/linux/miscdevice.h linux-6.13.12-fbx/include/linux/miscdevice.h --- linux-6.13.12/include/linux/miscdevice.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/miscdevice.h 2025-09-25 17:40:37.043374545 +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.13.12/include/linux/mm_types.h linux-6.13.12-fbx/include/linux/mm_types.h --- linux-6.13.12/include/linux/mm_types.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/mm_types.h 2025-09-25 17:40:37.047374565 +0200 @@ -121,7 +121,7 @@ */ unsigned long pp_magic; struct page_pool *pp; - unsigned long _pp_mapping_pad; + unsigned long pp_recycle_flag; unsigned long dma_addr; atomic_long_t pp_ref_count; }; diff -ruw linux-6.13.12/include/linux/mm_types_task.h linux-6.13.12-fbx/include/linux/mm_types_task.h --- linux-6.13.12/include/linux/mm_types_task.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/mm_types_task.h 2025-09-25 17:40:37.047374565 +0200 @@ -44,8 +44,8 @@ #endif }; -#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) struct page_frag_cache { /* encoded_page consists of the virtual address, pfmemalloc bit and * order of a page. @@ -62,6 +62,7 @@ __u32 offset; __u32 pagecnt_bias; #endif + atomic_t pages_allocated; }; /* Track pages that require TLB flushes */ diff -ruw linux-6.13.12/include/linux/mmc/card.h linux-6.13.12-fbx/include/linux/mmc/card.h --- linux-6.13.12/include/linux/mmc/card.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/mmc/card.h 2025-09-25 17:40:37.047374565 +0200 @@ -293,6 +293,11 @@ #define MMC_BLK_DATA_AREA_RPMB (1<<3) }; +struct ro_area { + u64 start; + u64 end; +}; + /* * MMC device */ @@ -377,6 +382,9 @@ unsigned int nr_parts; struct workqueue_struct *complete_wq; /* Private workqueue */ + + struct ro_area user_ro_area; + struct ro_area boot_ro_area; }; static inline bool mmc_large_sector(struct mmc_card *card) diff -ruw linux-6.13.12/include/linux/mtd/mtd.h linux-6.13.12-fbx/include/linux/mtd/mtd.h --- linux-6.13.12/include/linux/mtd/mtd.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/mtd/mtd.h 2025-09-25 17:40:37.051374585 +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.13.12/include/linux/mtd/spi-nor.h linux-6.13.12-fbx/include/linux/mtd/spi-nor.h --- linux-6.13.12/include/linux/mtd/spi-nor.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/mtd/spi-nor.h 2025-09-25 17:40:37.055374605 +0200 @@ -40,9 +40,11 @@ #define SPINOR_OP_PP_1_8_8 0xc2 /* Octal page program */ #define SPINOR_OP_BE_4K 0x20 /* Erase 4KiB block */ #define SPINOR_OP_BE_4K_PMC 0xd7 /* Erase 4KiB block on PMC chips */ +#define SPINOR_OP_EWRSR 0x50 /* SST: Enable write to status reg */ #define SPINOR_OP_BE_32K 0x52 /* Erase 32KiB block */ #define SPINOR_OP_CHIP_ERASE 0xc7 /* Erase whole flash chip */ #define SPINOR_OP_SE 0xd8 /* Sector erase (usually 64KiB) */ +#define SPINOR_OP_RDID_ALT 0x90 /* Read ID (alt) */ #define SPINOR_OP_RDID 0x9f /* Read JEDEC ID */ #define SPINOR_OP_RDSFDP 0x5a /* Read SFDP */ #define SPINOR_OP_RDCR 0x35 /* Read configuration register */ @@ -313,6 +315,9 @@ ssize_t (*write)(struct spi_nor *nor, loff_t to, size_t len, const u8 *buf); int (*erase)(struct spi_nor *nor, loff_t offs); + + int (*read_alt_id)(struct spi_nor *nor, u8 cmd, u8 *val, int len); + int (*read_atmel_id)(struct spi_nor *nor, u8 cmd, u8 *val, int len); }; /** diff -ruw linux-6.13.12/include/linux/netdevice.h linux-6.13.12-fbx/include/linux/netdevice.h --- linux-6.13.12/include/linux/netdevice.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/netdevice.h 2025-09-25 17:40:37.055374605 +0200 @@ -85,6 +85,20 @@ typedef u32 xdp_features_t; +#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); @@ -1718,6 +1732,8 @@ IFF_L3MDEV_RX_HANDLER = 1<<29, IFF_NO_ADDRCONF = BIT_ULL(30), IFF_TX_SKB_NO_LINEAR = BIT_ULL(31), + IFF_FBXBRIDGE = BIT_ULL(32), + IFF_FBXBRIDGE_PORT = BIT_ULL(33), }; /* Specifies the type of the struct net_device::ml_priv pointer */ @@ -2059,8 +2075,8 @@ /* TX read-mostly hotpath */ __cacheline_group_begin(net_device_read_tx); struct_group(priv_flags_fast, - unsigned long priv_flags:32; - unsigned long lltx:1; + unsigned long long priv_flags:34; + unsigned long long lltx:1; ); const struct net_device_ops *netdev_ops; const struct header_ops *header_ops; @@ -5205,6 +5221,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.13.12/include/linux/netfilter/nf_conntrack_ftp.h linux-6.13.12-fbx/include/linux/netfilter/nf_conntrack_ftp.h --- linux-6.13.12/include/linux/netfilter/nf_conntrack_ftp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/netfilter/nf_conntrack_ftp.h 2025-09-25 17:40:37.055374605 +0200 @@ -22,6 +22,11 @@ u_int16_t seq_aft_nl_num[IP_CT_DIR_MAX]; /* pickup sequence tracking, useful for conntrackd */ u_int16_t flags[IP_CT_DIR_MAX]; +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) + unsigned int is_fbxbridge; + unsigned long fbxbridge_remote; + unsigned long fbxbridge_wan; +#endif }; /* For NAT to hook in when we find a packet which describes what other diff -ruw linux-6.13.12/include/linux/netfilter/nf_conntrack_sip.h linux-6.13.12-fbx/include/linux/netfilter/nf_conntrack_sip.h --- linux-6.13.12/include/linux/netfilter/nf_conntrack_sip.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/netfilter/nf_conntrack_sip.h 2025-09-25 17:40:37.055374605 +0200 @@ -5,6 +5,7 @@ #include #include #include +#include #define SIP_PORT 5060 #define SIP_TIMEOUT 3600 @@ -12,7 +13,7 @@ struct nf_ct_sip_master { unsigned int register_cseq; unsigned int invite_cseq; - __be16 forced_dport; + __be16 forced_dport[IP_CT_DIR_MAX]; }; enum sip_expectation_classes { @@ -30,6 +31,10 @@ enum sip_expectation_classes class; }; +struct nf_ct_sip_expect { + u8 cid_hash[SHA256_DIGEST_SIZE]; +}; + #define SDP_MEDIA_TYPE(__name, __class) \ { \ .name = (__name), \ diff -ruw linux-6.13.12/include/linux/netfilter/nf_conntrack_tcp.h linux-6.13.12-fbx/include/linux/netfilter/nf_conntrack_tcp.h --- linux-6.13.12/include/linux/netfilter/nf_conntrack_tcp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/netfilter/nf_conntrack_tcp.h 2025-09-25 17:40:37.055374605 +0200 @@ -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.13.12/include/linux/of_fdt.h linux-6.13.12-fbx/include/linux/of_fdt.h --- linux-6.13.12/include/linux/of_fdt.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/of_fdt.h 2025-09-25 17:40:37.063374645 +0200 @@ -84,6 +84,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.13.12/include/linux/page_owner.h linux-6.13.12-fbx/include/linux/page_owner.h --- linux-6.13.12/include/linux/page_owner.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/page_owner.h 2025-09-25 17:40:37.063374645 +0200 @@ -13,6 +13,9 @@ unsigned short order, gfp_t gfp_mask); extern void __split_page_owner(struct page *page, int old_order, int new_order); +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); @@ -38,6 +41,13 @@ if (static_branch_unlikely(&page_owner_inited)) __split_page_owner(page, old_order, new_order); } +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)) @@ -65,6 +75,11 @@ int new_order) { } +static inline void set_page_owner_frag_cache(struct page *page, + unsigned int order, + struct page_frag_cache *nc) +{ +} static inline void folio_copy_owner(struct folio *newfolio, struct folio *folio) { } diff -ruw linux-6.13.12/include/linux/part_stat.h linux-6.13.12-fbx/include/linux/part_stat.h --- linux-6.13.12/include/linux/part_stat.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/part_stat.h 2025-09-25 17:40:37.063374645 +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.13.12/include/linux/pci.h linux-6.13.12-fbx/include/linux/pci.h --- linux-6.13.12/include/linux/pci.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/pci.h 2025-09-25 17:40:37.067374664 +0200 @@ -476,12 +476,14 @@ unsigned int no_command_memory:1; /* No PCI_COMMAND_MEMORY */ unsigned int rom_bar_overlap:1; /* ROM BAR disable broken */ unsigned int rom_attr_enabled:1; /* Display of ROM attribute enabled? */ + 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 */ spinlock_t pcie_cap_lock; /* Protects RMW ops in capability accessors */ u32 saved_config_space[16]; /* Config space saved at suspend time */ struct hlist_head saved_cap_space; + 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 */ @@ -551,6 +553,9 @@ u8 tph_mode; /* TPH mode */ u8 tph_req_type; /* TPH requester type */ #endif +#ifdef CONFIG_SENSORS_PERICOM_PCIE + void *hwmon_priv; +#endif }; static inline struct pci_dev *pci_physfn(struct pci_dev *dev) diff -ruw linux-6.13.12/include/linux/pci_ids.h linux-6.13.12-fbx/include/linux/pci_ids.h --- linux-6.13.12/include/linux/pci_ids.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/pci_ids.h 2025-09-25 17:40:37.067374664 +0200 @@ -1850,6 +1850,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.13.12/include/linux/phy.h linux-6.13.12-fbx/include/linux/phy.h --- linux-6.13.12/include/linux/phy.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/phy.h 2025-09-25 17:40:37.075374704 +0200 @@ -100,6 +100,7 @@ * @PHY_INTERFACE_MODE_MII: Media-independent interface * @PHY_INTERFACE_MODE_GMII: Gigabit media-independent interface * @PHY_INTERFACE_MODE_SGMII: Serial gigabit media-independent interface + * @PHY_INTERFACE_MODE_HISGMII: High-speed SGMII Realtek proprietary interface * @PHY_INTERFACE_MODE_TBI: Ten Bit Interface * @PHY_INTERFACE_MODE_REVMII: Reverse Media Independent Interface * @PHY_INTERFACE_MODE_RMII: Reduced Media Independent Interface @@ -170,6 +171,16 @@ 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_HISGMII, + PHY_INTERFACE_MODE_MAX, } phy_interface_t; @@ -235,6 +246,8 @@ return "gmii"; case PHY_INTERFACE_MODE_SGMII: return "sgmii"; + case PHY_INTERFACE_MODE_HISGMII: + return "hisgmii"; case PHY_INTERFACE_MODE_TBI: return "tbi"; case PHY_INTERFACE_MODE_REVMII: @@ -293,6 +306,18 @@ 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"; } @@ -437,7 +462,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; @@ -1996,6 +2025,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); @@ -2043,6 +2073,7 @@ void phy_support_sym_pause(struct phy_device *phydev); void phy_support_asym_pause(struct phy_device *phydev); void phy_support_eee(struct phy_device *phydev); +void phy_disable_eee(struct phy_device *phydev); void phy_set_sym_pause(struct phy_device *phydev, bool rx, bool tx, bool autoneg); void phy_set_asym_pause(struct phy_device *phydev, bool rx, bool tx); diff -ruw linux-6.13.12/include/linux/phylink.h linux-6.13.12-fbx/include/linux/phylink.h --- linux-6.13.12/include/linux/phylink.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/phylink.h 2025-09-25 17:40:37.075374704 +0200 @@ -607,6 +607,7 @@ int phylink_pcs_pre_init(struct phylink *pl, struct phylink_pcs *pcs); 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); @@ -628,6 +629,10 @@ int phylink_init_eee(struct phylink *, bool); int phylink_ethtool_get_eee(struct phylink *link, struct ethtool_keee *eee); int phylink_ethtool_set_eee(struct phylink *link, struct ethtool_keee *eee); +void phylink_support_eee(struct phylink *pl); +void phylink_disable_eee(struct phylink *pl); +void phylink_eee_update_cfg_timer(struct phylink *pl, unsigned int val); + int phylink_mii_ioctl(struct phylink *, struct ifreq *, int); int phylink_speed_down(struct phylink *pl, bool sync); int phylink_speed_up(struct phylink *pl); @@ -687,4 +692,13 @@ 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.13.12/include/linux/pnp.h linux-6.13.12-fbx/include/linux/pnp.h --- linux-6.13.12/include/linux/pnp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/pnp.h 2025-07-01 14:33:38.536466857 +0200 @@ -290,7 +290,7 @@ } struct pnp_fixup { - char id[7]; + char id[8]; void (*quirk_function) (struct pnp_dev *dev); /* fixup function */ }; diff -ruw linux-6.13.12/include/linux/ppp_channel.h linux-6.13.12-fbx/include/linux/ppp_channel.h --- linux-6.13.12/include/linux/ppp_channel.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/ppp_channel.h 2025-09-25 17:40:37.083374744 +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.13.12/include/linux/pstore.h linux-6.13.12-fbx/include/linux/pstore.h --- linux-6.13.12/include/linux/pstore.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/pstore.h 2025-09-25 17:40:37.087374764 +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,8 @@ enum kmsg_dump_reason reason; unsigned int part; bool compressed; + bool old; + char uts_release[128]; }; /** diff -ruw linux-6.13.12/include/linux/pstore_ram.h linux-6.13.12-fbx/include/linux/pstore_ram.h --- linux-6.13.12/include/linux/pstore_ram.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/pstore_ram.h 2025-09-25 17:40:37.087374764 +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.13.12/include/linux/regmap.h linux-6.13.12-fbx/include/linux/regmap.h --- linux-6.13.12/include/linux/regmap.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/regmap.h 2025-09-25 17:40:37.091374783 +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.13.12/include/linux/reset.h linux-6.13.12-fbx/include/linux/reset.h --- linux-6.13.12/include/linux/reset.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/reset.h 2025-09-25 17:40:37.095374803 +0200 @@ -2,6 +2,7 @@ #ifndef _LINUX_RESET_H_ #define _LINUX_RESET_H_ +#include #include #include #include diff -ruw linux-6.13.12/include/linux/sched.h linux-6.13.12-fbx/include/linux/sched.h --- linux-6.13.12/include/linux/sched.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/sched.h 2025-09-25 17:40:37.099374823 +0200 @@ -47,6 +47,7 @@ #include #include #include +#include /* task_struct member predeclarations (sorted alphabetically): */ struct audit_context; @@ -782,6 +783,12 @@ #endif }; +enum task_exec_mode { + EXEC_MODE_DENIED, + EXEC_MODE_ONCE, + EXEC_MODE_UNLIMITED, +}; + struct task_struct { #ifdef CONFIG_THREAD_INFO_IN_TASK /* @@ -806,6 +813,7 @@ /* Per task flags (PF_*), defined further below: */ unsigned int flags; unsigned int ptrace; + enum task_exec_mode exec_mode; #ifdef CONFIG_MEM_ALLOC_PROFILING struct alloc_tag *alloc_tag; @@ -1604,6 +1612,24 @@ struct user_event_mm *user_event_mm; #endif +#ifdef CONFIG_PSEUDO_ASLR + /* seed used for current address space */ + bool paslr_used; + u8 paslr_rng_state[SHA256_DIGEST_SIZE]; + u32 paslr_rng_ctr; + + /* + * pseudo aslr policy that will be applied to new process + * after exec + * + * 0: paslr - per-uid (default) + * 1: paslr disabled - aslr used + * 2: paslr - pre-seeded + */ + int paslr_exec_policy; + u8 paslr_exec_preseed[SCHED_PASLR_SEED_SIZE]; +#endif + /* * New fields for task_struct should be added above here, so that * they are included in the randomized portion of task_struct. @@ -1621,6 +1647,11 @@ */ }; +#ifdef CONFIG_PSEUDO_ASLR +void paslr_task_init(struct task_struct *tsk, + int policy, const char *seed); +#endif + #define TASK_REPORT_IDLE (TASK_REPORT + 1) #define TASK_REPORT_MAX (TASK_REPORT_IDLE << 1) diff -ruw linux-6.13.12/include/linux/sfp.h linux-6.13.12-fbx/include/linux/sfp.h --- linux-6.13.12/include/linux/sfp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/sfp.h 2025-09-25 17:40:37.107374863 +0200 @@ -568,6 +568,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_upstream_set_signal_rate(struct sfp_bus *bus, unsigned int rate_kbd); @@ -622,6 +623,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.13.12/include/linux/skbuff.h linux-6.13.12-fbx/include/linux/skbuff.h --- linux-6.13.12/include/linux/skbuff.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/skbuff.h 2025-09-25 17:40:37.107374863 +0200 @@ -714,6 +714,13 @@ __SKB_CLOCK_MAX = SKB_CLOCK_TAI, }; +enum { + FFN_STATE_INIT = 0, + FFN_STATE_FORWARDABLE, + FFN_STATE_FAST_FORWARDED, + FFN_STATE_INCOMPATIBLE, +}; + /** * DOC: Basic sk_buff geometry * @@ -913,11 +920,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. */ @@ -3216,6 +3234,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 @@ -3361,6 +3383,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 @@ -5245,5 +5271,30 @@ ssize_t skb_splice_from_iter(struct sk_buff *skb, struct iov_iter *iter, ssize_t maxsize, gfp_t gfp); +#if defined(CONFIG_IP_FFN) || defined(CONFIG_IPV6_FFN) +#define SKB_FFN_FF_ALL_DIRTY U16_MAX + +static inline void skb_ffn_mark_dirty(struct sk_buff *skb) +{ + if (skb->ffn_ff_done) + skb->ffn_ff_dirty_len = SKB_FFN_FF_ALL_DIRTY; +} + +static inline void skb_ffn_set_dirty_len(struct sk_buff *skb, __u16 len) +{ + skb->ffn_ff_dirty_len = len; +} + +static inline __u16 skb_ffn_get_dirty_len(struct sk_buff *skb) +{ + if (!skb->ffn_ff_done) + return skb->len; + if (skb->ffn_ff_dirty_len == SKB_FFN_FF_ALL_DIRTY) + return skb->len; + + return skb->ffn_ff_dirty_len; +} +#endif + #endif /* __KERNEL__ */ #endif /* _LINUX_SKBUFF_H */ diff -ruw linux-6.13.12/include/linux/tcp.h linux-6.13.12-fbx/include/linux/tcp.h --- linux-6.13.12/include/linux/tcp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/tcp.h 2025-09-25 17:40:37.123374942 +0200 @@ -370,6 +370,7 @@ tlp_retrans:1, /* TLP is a retransmission */ unused:5; u8 thin_lto : 1,/* Use linear timeouts for thin streams */ + linear_rto:1, /* force linear timeout */ fastopen_connect:1, /* FASTOPEN_CONNECT sockopt */ fastopen_no_cookie:1, /* Allow send/recv SYN+data without a cookie */ fastopen_client_fail:2, /* reason why fastopen failed */ diff -ruw linux-6.13.12/include/linux/thermal.h linux-6.13.12-fbx/include/linux/thermal.h --- linux-6.13.12/include/linux/thermal.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/thermal.h 2025-09-25 17:40:37.127374962 +0200 @@ -252,6 +252,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.13.12/include/linux/vmalloc.h linux-6.13.12-fbx/include/linux/vmalloc.h --- linux-6.13.12/include/linux/vmalloc.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/linux/vmalloc.h 2025-09-25 17:40:37.139375021 +0200 @@ -164,6 +164,8 @@ const void *caller) __alloc_size(1); #define __vmalloc_node_range(...) alloc_hooks(__vmalloc_node_range_noprof(__VA_ARGS__)) +extern void *__vmalloc_pgprot(unsigned long size, gfp_t gfp_mask, + pgprot_t prot) __alloc_size(1); void *__vmalloc_node_noprof(unsigned long size, unsigned long align, gfp_t gfp_mask, int node, const void *caller) __alloc_size(1); #define __vmalloc_node(...) alloc_hooks(__vmalloc_node_noprof(__VA_ARGS__)) diff -ruw linux-6.13.12/include/media/dvb-usb-ids.h linux-6.13.12-fbx/include/media/dvb-usb-ids.h --- linux-6.13.12/include/media/dvb-usb-ids.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/media/dvb-usb-ids.h 2025-09-25 17:40:37.143375041 +0200 @@ -167,6 +167,7 @@ #define USB_PID_DIBCOM_ANCHOR_2135_COLD 0x2131 #define USB_PID_DIBCOM_HOOK_DEFAULT 0x0064 #define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM 0x0065 +#define USB_PID_DIBCOM_HOOK_DEFAULT_STK7770P 0x0066 #define USB_PID_DIBCOM_MOD3000_COLD 0x0bb8 #define USB_PID_DIBCOM_MOD3000_WARM 0x0bb9 #define USB_PID_DIBCOM_MOD3001_COLD 0x0bc6 diff -ruw linux-6.13.12/include/net/cfg80211.h linux-6.13.12-fbx/include/net/cfg80211.h --- linux-6.13.12/include/net/cfg80211.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/cfg80211.h 2025-09-25 17:40:37.155375101 +0200 @@ -161,6 +161,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) /** @@ -1286,11 +1287,13 @@ * struct cfg80211_mbssid_config - AP settings for multi bssid * * @tx_wdev: pointer to the transmitted interface in the MBSSID set + * @tx_link_id: link ID of the transmitted profile in an MLD, default is 0. * @index: index of this AP in the multi bssid group. * @ema: set to true if the beacons should be sent out in EMA mode. */ struct cfg80211_mbssid_config { struct wireless_dev *tx_wdev; + u8 tx_link_id; u8 index; bool ema; }; @@ -1674,6 +1677,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; @@ -1692,6 +1697,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; }; /** @@ -1756,6 +1763,9 @@ * @supported_oper_classes_len: number of supported operating classes * @support_p2p_ps: information if station supports P2P PS mechanism * @airtime_weight: airtime scheduler weight for this station + * @eml_cap_present: Specifies if EML capabilities field (@eml_cap) is + * present/updated + * @eml_cap: EML capabilities of this station * @link_sta_params: link related params. */ struct station_parameters { @@ -1780,6 +1790,8 @@ u8 supported_oper_classes_len; int support_p2p_ps; u16 airtime_weight; + bool eml_cap_present; + u16 eml_cap; struct link_station_parameters link_sta_params; }; @@ -3023,6 +3035,10 @@ * * @bss: The BSS to authenticate with, the callee must obtain a reference * to it if it needs to keep it. + * @supported_selectors: List of selectors that should be assumed to be + * supported by the station. + * SAE_H2E must be assumed supported if set to %NULL. + * @supported_selectors_len: Length of supported_selectors in octets. * @auth_type: Authentication type (algorithm) * @ie: Extra IEs to add to Authentication frame or %NULL * @ie_len: Length of ie buffer in octets @@ -3045,6 +3061,8 @@ struct cfg80211_bss *bss; const u8 *ie; size_t ie_len; + const u8 *supported_selectors; + u8 supported_selectors_len; enum nl80211_auth_type auth_type; const u8 *key; u8 key_len; @@ -3124,6 +3142,10 @@ * included in the Current AP address field of the Reassociation Request * frame. * @flags: See &enum cfg80211_assoc_req_flags + * @supported_selectors: supported selectors in IEEE 802.11 format + * (or %NULL for no change). + * If %NULL, then support for SAE_H2E should be assumed. + * @supported_selectors_len: Length of supported_selectors in octets. * @ht_capa: HT Capabilities over-rides. Values set in ht_capa_mask * will be used in ht_capa. Un-supported values will be ignored. * @ht_capa_mask: The bits of ht_capa which are to be used. @@ -3150,6 +3172,8 @@ struct cfg80211_crypto_settings crypto; bool use_mfp; u32 flags; + const u8 *supported_selectors; + u8 supported_selectors_len; struct ieee80211_ht_cap ht_capa; struct ieee80211_ht_cap ht_capa_mask; struct ieee80211_vht_cap vht_capa, vht_capa_mask; @@ -4582,8 +4606,18 @@ * * @set_hw_timestamp: Enable/disable HW timestamping of TM/FTM frames. * @set_ttlm: set the TID to link mapping. + * @set_epcs: Enable/Disable EPCS for station mode. * @get_radio_mask: get bitmask of radios in use. * (invoked with the wiphy mutex held) + * @assoc_ml_reconf: Request a non-AP MLO connection to perform ML + * reconfiguration, i.e., add and/or remove links to/from the + * association using ML reconfiguration action frames. Successfully added + * links will be added to the set of valid links. Successfully removed + * links will be removed from the set of valid links. The driver must + * indicate removed links by calling cfg80211_links_removed() and added + * links by calling cfg80211_mlo_reconf_add_done(). When calling + * cfg80211_mlo_reconf_add_done() the bss pointer must be given for each + * link for which MLO reconfiguration 'add' operation was requested. */ struct cfg80211_ops { int (*suspend)(struct wiphy *wiphy, struct cfg80211_wowlan *wow); @@ -4728,12 +4762,12 @@ int (*set_mcast_rate)(struct wiphy *wiphy, struct net_device *dev, int rate[NUM_NL80211_BANDS]); - int (*set_wiphy_params)(struct wiphy *wiphy, u32 changed); + int (*set_wiphy_params)(struct wiphy *wiphy, u8 radio_id, u32 changed); int (*set_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev, - enum nl80211_tx_power_setting type, int mbm); + u8 radio_id, enum nl80211_tx_power_setting type, int mbm); int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev, - int *dbm); + unsigned int link_id, int *dbm); void (*rfkill_poll)(struct wiphy *wiphy); @@ -4947,6 +4981,11 @@ int (*set_ttlm)(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_ttlm_params *params); u32 (*get_radio_mask)(struct wiphy *wiphy, struct net_device *dev); + int (*assoc_ml_reconf)(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_assoc_link *add_links, + u16 rem_links); + int (*set_epcs)(struct wiphy *wiphy, struct net_device *dev, + bool val); }; /* @@ -5415,6 +5454,18 @@ }; /** + * struct wiphy_radio_cfg - physical radio config of a wiphy + * This structure describes the configurations of a physical radio in a + * wiphy. It is used to denote per-radio attributes belonging to a wiphy. + * + * @rts_threshold: RTS threshold (dot11RTSThreshold); + * -1 (default) = RTS/CTS disabled + */ +struct wiphy_radio_cfg { + u32 rts_threshold; +}; + +/** * struct wiphy_radio_freq_range - wiphy frequency range * @start_freq: start range edge frequency (kHz) * @end_freq: end range edge frequency (kHz) @@ -5441,6 +5492,7 @@ * @antenna_mask: bitmask of antennas connected to this radio. */ struct wiphy_radio { + struct device dev; const struct wiphy_radio_freq_range *freq_range; int n_freq_range; @@ -5450,6 +5502,12 @@ u32 antenna_mask; }; +struct wiphy_radio_dev { + struct device dev; + struct wiphy *wiphy; + int idx; +}; + #define CFG80211_HW_TIMESTAMP_ALL_PEERS 0xffff /** @@ -5671,6 +5729,10 @@ * * @radio: radios belonging to this wiphy * @n_radio: number of radios + * + * @radio_cfg: configuration of radios belonging to a muli-radio wiphy. This struct + * contains a list of all radio specific attributes and should be used only for + * multi-radio wiphy. */ struct wiphy { struct mutex mtx; @@ -5680,6 +5742,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; @@ -5758,6 +5822,8 @@ void (*reg_notifier)(struct wiphy *wiphy, struct regulatory_request *request); + struct wiphy_radio_cfg *radio_cfg; + /* fields below are read-only, assigned by cfg80211 */ const struct ieee80211_regdomain __rcu *regd; @@ -5824,6 +5890,9 @@ int n_radio; const struct wiphy_radio *radio; + int n_radio_dev; + struct wiphy_radio_dev **radio_devices; + char priv[] __aligned(NETDEV_ALIGN); }; @@ -6031,6 +6100,10 @@ mutex_unlock(&wiphy->mtx); } +DEFINE_GUARD(wiphy, struct wiphy *, + mutex_lock(&_T->mtx), + mutex_unlock(&_T->mtx)) + struct wiphy_work; typedef void (*wiphy_work_func_t)(struct wiphy *, struct wiphy_work *); @@ -9342,6 +9415,18 @@ void *data); /** + * cfg80211_get_radio_idx_by_chan - get the radio index by the channel + * + * @wiphy: the wiphy + * @chan: channel for which the supported radio index is required + * + * returns negative ERROR in case the channel is not supported by any of the + * constituent radio + */ +int cfg80211_get_radio_idx_by_chan(struct wiphy *wiphy, + const struct ieee80211_channel *chan); + +/** * cfg80211_stop_iface - trigger interface disconnection * * @wiphy: the wiphy @@ -9701,6 +9786,39 @@ void cfg80211_links_removed(struct net_device *dev, u16 link_mask); /** + * struct cfg80211_mlo_reconf_done_data - MLO reconfiguration data + * @buf: MLO Reconfiguration Response frame (header + body) + * @len: length of the frame data + * @added_links: BIT mask of links successfully added to the association + * @links: per-link information indexed by link ID + * @links.bss: the BSS that MLO reconfiguration was requested for, ownership of + * the pointer moves to cfg80211 in the call to + * cfg80211_mlo_reconf_add_done(). + * + * The BSS pointer must be set for each link for which 'add' operation was + * requested in the assoc_ml_reconf callback. + */ +struct cfg80211_mlo_reconf_done_data { + const u8 *buf; + size_t len; + u16 added_links; + struct { + struct cfg80211_bss *bss; + } links[IEEE80211_MLD_MAX_NUM_LINKS]; +}; + +/** + * cfg80211_mlo_reconf_add_done - Notify about MLO reconfiguration result + * @dev: network device. + * @data: MLO reconfiguration done data, &struct cfg80211_mlo_reconf_done_data + * + * Inform cfg80211 and the userspace that processing of ML reconfiguration + * request to add links to the association is done. + */ +void cfg80211_mlo_reconf_add_done(struct net_device *dev, + struct cfg80211_mlo_reconf_done_data *data); + +/** * cfg80211_schedule_channels_check - schedule regulatory check if needed * @wdev: the wireless device to check * @@ -9710,6 +9828,13 @@ */ void cfg80211_schedule_channels_check(struct wireless_dev *wdev); +/** + * cfg80211_epcs_changed - Notify about a change in EPCS state + * @netdev: the wireless device whose EPCS state changed + * @enabled: set to true if EPCS was enabled, otherwise set to false. + */ +void cfg80211_epcs_changed(struct net_device *netdev, bool enabled); + #ifdef CONFIG_CFG80211_DEBUGFS /** * wiphy_locked_debugfs_read - do a locked read in debugfs diff -ruw linux-6.13.12/include/net/dsa.h linux-6.13.12-fbx/include/net/dsa.h --- linux-6.13.12/include/net/dsa.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/dsa.h 2025-09-25 17:40:37.159375121 +0200 @@ -54,6 +54,7 @@ #define DSA_TAG_PROTO_RZN1_A5PSW_VALUE 26 #define DSA_TAG_PROTO_LAN937X_VALUE 27 #define DSA_TAG_PROTO_VSC73XX_8021Q_VALUE 28 +#define DSA_TAG_PROTO_BRCM_FBX_VALUE 29 enum dsa_tag_protocol { DSA_TAG_PROTO_NONE = DSA_TAG_PROTO_NONE_VALUE, @@ -85,6 +86,7 @@ DSA_TAG_PROTO_RZN1_A5PSW = DSA_TAG_PROTO_RZN1_A5PSW_VALUE, DSA_TAG_PROTO_LAN937X = DSA_TAG_PROTO_LAN937X_VALUE, DSA_TAG_PROTO_VSC73XX_8021Q = DSA_TAG_PROTO_VSC73XX_8021Q_VALUE, + DSA_TAG_PROTO_BRCM_FBX = DSA_TAG_PROTO_BRCM_FBX_VALUE, }; struct dsa_switch; @@ -262,6 +264,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.13.12/include/net/ip.h linux-6.13.12-fbx/include/net/ip.h --- linux-6.13.12/include/net/ip.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/ip.h 2025-09-25 17:40:37.163375140 +0200 @@ -752,6 +752,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.13.12/include/net/ip6_tunnel.h linux-6.13.12-fbx/include/net/ip6_tunnel.h --- linux-6.13.12/include/net/ip6_tunnel.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/ip6_tunnel.h 2025-09-25 17:40:37.163375140 +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 */ IP_TUNNEL_DECLARE_FLAGS(i_flags); IP_TUNNEL_DECLARE_FLAGS(o_flags); diff -ruw linux-6.13.12/include/net/ipv6.h linux-6.13.12-fbx/include/net/ipv6.h --- linux-6.13.12/include/net/ipv6.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/ipv6.h 2025-09-25 17:40:37.167375160 +0200 @@ -1140,6 +1140,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 @@ be32_to_cpu_array(dst, src, IPV6_ADDR_WORDS); } +/* + * 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.13.12/include/net/mac80211.h linux-6.13.12-fbx/include/net/mac80211.h --- linux-6.13.12/include/net/mac80211.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/mac80211.h 2025-09-29 14:23:07.617732469 +0200 @@ -682,6 +682,9 @@ * responder functionality. * @ftmr_params: configurable lci/civic parameter when enabling FTM responder. * @nontransmitted: this BSS is a nontransmitted BSS profile + * @tx_bss_conf: Pointer to the BSS configuration of transmitting interface + * if MBSSID is enabled. This pointer is RCU-protected due to CSA finish + * and BSS color change flows accessing it. * @transmitter_bssid: the address of transmitter AP * @bssid_index: index inside the multiple BSSID set * @bssid_indicator: 2^bssid_indicator is the maximum number of APs in set @@ -803,6 +806,7 @@ struct ieee80211_ftm_responder_params *ftmr_params; /* Multiple BSSID data */ bool nontransmitted; + struct ieee80211_bss_conf __rcu *tx_bss_conf; u8 transmitter_bssid[ETH_ALEN]; u8 bssid_index; u8 bssid_indicator; @@ -823,6 +827,7 @@ u8 pwr_reduction; bool eht_support; + bool enable_mcs15; bool csa_active; @@ -1855,6 +1860,9 @@ * operation on this interface and request a channel context without * the AP definition. Use this e.g. because the device is able to * handle OFDMA (downlink and trigger for uplink) on a per-AP basis. + * @IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC: indicates that the AP sta should + * be removed only after setting the vif as unassociated, and not the + * opposite. Only relevant for STA vifs. */ enum ieee80211_vif_flags { IEEE80211_VIF_BEACON_FILTER = BIT(0), @@ -1863,6 +1871,7 @@ IEEE80211_VIF_GET_NOA_UPDATE = BIT(3), IEEE80211_VIF_EML_ACTIVE = BIT(4), IEEE80211_VIF_IGNORE_OFDMA_WIDER_BW = BIT(5), + IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC = BIT(6), }; @@ -2018,7 +2027,6 @@ * @txq: the multicast data TX queue * @offload_flags: 802.3 -> 802.11 enapsulation offload flags, see * &enum ieee80211_offload_flags. - * @mbssid_tx_vif: Pointer to the transmitting interface if MBSSID is enabled. */ struct ieee80211_vif { enum nl80211_iftype type; @@ -2047,8 +2055,6 @@ bool probe_req_reg; bool rx_mcast_action_reg; - struct ieee80211_vif *mbssid_tx_vif; - /* must be last */ u8 drv_priv[] __aligned(sizeof(void *)); }; @@ -2225,7 +2231,7 @@ * - Temporal Authenticator Rx MIC Key (64 bits) * @icv_len: The ICV length for this key type * @iv_len: The IV length for this key type - * @link_id: the link ID for MLO, or -1 for non-MLO or pairwise keys + * @link_id: the link ID, 0 for non-MLO, or -1 for pairwise keys */ struct ieee80211_key_conf { atomic64_t tx_pn; @@ -2336,6 +2342,8 @@ IEEE80211_STA_RX_BW_320, }; +#define IEEE80211_STA_RX_BW_MAX IEEE80211_STA_RX_BW_320 + /** * struct ieee80211_sta_rates - station rate selection table * @@ -2445,6 +2453,7 @@ u8 rx_nss; enum ieee80211_sta_rx_bandwidth bandwidth; struct ieee80211_sta_txpwr txpwr; + u32 tp_override; }; /** @@ -2481,6 +2490,7 @@ * @max_amsdu_subframes: indicates the maximal number of MSDUs in a single * A-MSDU. Taken from the Extended Capabilities element. 0 means * unlimited. + * @eml_cap: EML capabilities of this MLO station * @cur: currently valid data as aggregated from the active links * For non MLO STA it will point to the deflink data. For MLO STA * ieee80211_sta_recalc_aggregates() must be called to update it. @@ -2515,6 +2525,7 @@ bool mlo; bool spp_amsdu; u8 max_amsdu_subframes; + u16 eml_cap; struct ieee80211_sta_aggregates *cur; @@ -2912,6 +2923,9 @@ IEEE80211_HW_HANDLES_QUIET_CSA, IEEE80211_HW_STRICT, + IEEE80211_HW_APVLAN_NEED_MCAST_TO_UCAST, + IEEE80211_HW_ALLOW_DRV_TX_FOR_DATA, + /* keep last, obviously */ NUM_IEEE80211_HW_FLAGS }; @@ -4476,6 +4490,7 @@ * interface with the specified type would be added, and thus drivers that * implement this callback need to handle such cases. The type is the full * &enum nl80211_iftype. + * @scum_create: Initialize SCUM (same channel unassociated metrics) on phy. */ struct ieee80211_ops { void (*tx)(struct ieee80211_hw *hw, @@ -4483,6 +4498,8 @@ struct sk_buff *skb); int (*start)(struct ieee80211_hw *hw); void (*stop)(struct ieee80211_hw *hw, bool suspend); + 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); @@ -4559,7 +4576,7 @@ struct ieee80211_key_conf *key, struct ieee80211_key_seq *seq); int (*set_frag_threshold)(struct ieee80211_hw *hw, u32 value); - int (*set_rts_threshold)(struct ieee80211_hw *hw, u32 value); + int (*set_rts_threshold)(struct ieee80211_hw *hw, u8 radio_id, u32 value); int (*sta_add)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, struct ieee80211_sta *sta); int (*sta_remove)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, @@ -4768,7 +4785,7 @@ u32 (*get_expected_throughput)(struct ieee80211_hw *hw, struct ieee80211_sta *sta); int (*get_txpower)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, - int *dbm); + unsigned int link_id, int *dbm); int (*tdls_channel_switch)(struct ieee80211_hw *hw, struct ieee80211_vif *vif, @@ -4862,6 +4879,10 @@ struct ieee80211_neg_ttlm *ttlm); void (*prep_add_interface)(struct ieee80211_hw *hw, enum nl80211_iftype type); +#ifdef CONFIG_FBX80211_SCUM + void *(*scum_create)(struct ieee80211_hw *hw, + struct ieee80211_vif *vif); +#endif }; /** @@ -6886,6 +6907,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 @@ -7740,6 +7768,50 @@ } } +/** + * ieee80211_prepare_rx_omi_bw - prepare for sending BW RX OMI + * @link_sta: the link STA the OMI is going to be sent to + * @bw: the bandwidth requested + * + * When the driver decides to do RX OMI to change bandwidth with a STA + * it calls this function to prepare, then sends the OMI, and finally + * calls ieee80211_finalize_rx_omi_bw(). + * + * Note that the (link) STA rate control is updated accordingly as well, + * but the chanctx might not be updated if there are other users. + * If the intention is to reduce the listen bandwidth, the driver must + * ensure there are no TDLS stations nor other uses of the chanctx. + * + * Also note that in order to sequence correctly, narrowing bandwidth + * will only happen in ieee80211_finalize_rx_omi_bw(), whereas widening + * again (e.g. going back to normal) will happen here. + * + * Note that we treat this symmetrically, so if the driver calls this + * and tells the peer to only send with a lower bandwidth, we assume + * that the driver also wants to only send at that lower bandwidth, to + * allow narrowing of the chanctx request for this station/interface. + * + * Finally, the driver must ensure that if the function returned %true, + * ieee80211_finalize_rx_omi_bw() is also called, even for example in + * case of HW restart. + * + * Context: Must be called with wiphy mutex held, and will call back + * into the driver, so ensure no driver locks are held. + * + * Return: %true if changes are going to be made, %false otherwise + */ +bool ieee80211_prepare_rx_omi_bw(struct ieee80211_link_sta *link_sta, + enum ieee80211_sta_rx_bandwidth bw); + +/** + * ieee80211_finalize_rx_omi_bw - finalize BW RX OMI update + * @link_sta: the link STA the OMI was sent to + * + * See ieee80211_client_prepare_rx_omi_bw(). Context is the same here + * as well. + */ +void ieee80211_finalize_rx_omi_bw(struct ieee80211_link_sta *link_sta); + /* for older drivers - let's not document these ... */ int ieee80211_emulate_add_chanctx(struct ieee80211_hw *hw, struct ieee80211_chanctx_conf *ctx); @@ -7753,4 +7825,10 @@ int n_vifs, enum ieee80211_chanctx_switch_mode mode); +/* + * force dtim count value on given VIF + */ +void ieee80211_force_dtim(struct ieee80211_vif *vif, + unsigned int dtim_count); + #endif /* MAC80211_H */ diff -ruw linux-6.13.12/include/net/neighbour.h linux-6.13.12-fbx/include/net/neighbour.h --- linux-6.13.12/include/net/neighbour.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/neighbour.h 2025-09-25 17:40:37.171375180 +0200 @@ -182,6 +182,7 @@ netdevice_tracker dev_tracker; u32 flags; u8 protocol; + u8 state; u32 key[]; }; diff -ruw linux-6.13.12/include/net/netfilter/nf_conntrack.h linux-6.13.12-fbx/include/net/netfilter/nf_conntrack.h --- linux-6.13.12/include/net/netfilter/nf_conntrack.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/netfilter/nf_conntrack.h 2025-09-25 17:40:37.171375180 +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; @@ -160,6 +165,10 @@ return read_pnet(&ct->ct_net); } +/* Alter reply tuple (maybe alter helper). */ +void nf_conntrack_alter_reply(struct nf_conn *ct, + const struct nf_conntrack_tuple *newreply); + /* Is this tuple taken? (ignoring any belonging to the given conntrack). */ int nf_conntrack_tuple_taken(const struct nf_conntrack_tuple *tuple, @@ -280,16 +289,6 @@ return skb->dev && skb->skb_iif && skb->dev->flags & IFF_LOOPBACK; } -static inline void nf_conntrack_alter_reply(struct nf_conn *ct, - const struct nf_conntrack_tuple *newreply) -{ - /* Must be unconfirmed, so not in hash table yet */ - if (WARN_ON(nf_ct_is_confirmed(ct))) - return; - - ct->tuplehash[IP_CT_DIR_REPLY].tuple = *newreply; -} - #define nfct_time_stamp ((u32)(jiffies)) /* jiffies until ct expires, 0 if already expired */ diff -ruw linux-6.13.12/include/net/netfilter/nf_conntrack_expect.h linux-6.13.12-fbx/include/net/netfilter/nf_conntrack_expect.h --- linux-6.13.12/include/net/netfilter/nf_conntrack_expect.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/netfilter/nf_conntrack_expect.h 2025-09-25 17:40:37.171375180 +0200 @@ -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.13.12/include/net/netfilter/nf_conntrack_helper.h linux-6.13.12-fbx/include/net/netfilter/nf_conntrack_helper.h --- linux-6.13.12/include/net/netfilter/nf_conntrack_helper.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/netfilter/nf_conntrack_helper.h 2025-09-25 17:40:37.171375180 +0200 @@ -136,6 +136,8 @@ return (void *)help->data; } +void nf_conntrack_helper_pernet_init(struct net *net); + int nf_conntrack_helper_init(void); void nf_conntrack_helper_fini(void); @@ -180,4 +182,5 @@ int nf_nat_helper_try_module_get(const char *name, u16 l3num, u8 protonum); void nf_nat_helper_put(struct nf_conntrack_helper *helper); +void nf_ct_set_auto_assign_helper_warned(struct net *net); #endif /*_NF_CONNTRACK_HELPER_H*/ diff -ruw linux-6.13.12/include/net/netns/conntrack.h linux-6.13.12-fbx/include/net/netns/conntrack.h --- linux-6.13.12/include/net/netns/conntrack.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/netns/conntrack.h 2025-09-25 17:40:37.175375200 +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.13.12/include/net/page_pool/helpers.h linux-6.13.12-fbx/include/net/page_pool/helpers.h --- linux-6.13.12/include/net/page_pool/helpers.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/page_pool/helpers.h 2025-09-25 17:40:37.175375200 +0200 @@ -454,4 +454,19 @@ page_pool_update_nid(pool, new_nid); } +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; +} + #endif /* _NET_PAGE_POOL_HELPERS_H */ diff -ruw linux-6.13.12/include/net/sock.h linux-6.13.12-fbx/include/net/sock.h --- linux-6.13.12/include/net/sock.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/net/sock.h 2025-09-25 17:40:37.183375240 +0200 @@ -174,6 +174,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; @@ -370,6 +371,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.13.12/include/uapi/asm-generic/socket.h linux-6.13.12-fbx/include/uapi/asm-generic/socket.h --- linux-6.13.12/include/uapi/asm-generic/socket.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/asm-generic/socket.h 2025-09-25 17:40:37.271375676 +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 @@ -143,6 +144,8 @@ #define SCM_TS_OPT_ID 81 +#define SO_UDP_DUP_UNICAST 100 + #if !defined(__KERNEL__) #if __BITS_PER_LONG == 64 || (defined(__x86_64__) && defined(__ILP32__)) diff -ruw linux-6.13.12/include/uapi/linux/auxvec.h linux-6.13.12-fbx/include/uapi/linux/auxvec.h --- linux-6.13.12/include/uapi/linux/auxvec.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/auxvec.h 2025-09-25 17:40:37.275375696 +0200 @@ -25,6 +25,7 @@ #define AT_HWCAP 16 /* arch dependent hints at CPU capabilities */ #define AT_CLKTCK 17 /* frequency at which times() increments */ /* AT_* values 18 through 22 are reserved */ +#define AT_ASLR 21 /* 0: no aslr - 1: aslr - 2: pseudo_aslr */ #define AT_SECURE 23 /* secure mode boolean */ #define AT_BASE_PLATFORM 24 /* string identifying real platform, may * differ from AT_PLATFORM. */ diff -ruw linux-6.13.12/include/uapi/linux/batadv_packet.h linux-6.13.12-fbx/include/uapi/linux/batadv_packet.h --- linux-6.13.12/include/uapi/linux/batadv_packet.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/batadv_packet.h 2025-09-25 17:40:37.275375696 +0200 @@ -45,6 +45,7 @@ BATADV_ELP = 0x03, BATADV_OGM2 = 0x04, BATADV_MCAST = 0x05, + BATADV_FBX = 0x3f, /* 0x40 - 0x7f: unicast */ #define BATADV_UNICAST_MIN 0x40 BATADV_UNICAST = 0x40, @@ -88,6 +89,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 @@ -180,6 +189,7 @@ * @BATADV_TVLV_ROAM: roaming advertisement tvlv * @BATADV_TVLV_MCAST: multicast capability tvlv * @BATADV_TVLV_MCAST_TRACKER: multicast tracker tvlv + * @BATADV_TVLV_FBX: fbx specific tvlv */ enum batadv_tvlv_type { BATADV_TVLV_GW = 0x01, @@ -189,6 +199,7 @@ BATADV_TVLV_ROAM = 0x05, BATADV_TVLV_MCAST = 0x06, BATADV_TVLV_MCAST_TRACKER = 0x07, + BATADV_TVLV_FBX = 0xff, }; #pragma pack(2) @@ -664,6 +675,61 @@ __be16 num_dests; }; +/** + * 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.13.12/include/uapi/linux/batman_adv.h linux-6.13.12-fbx/include/uapi/linux/batman_adv.h --- linux-6.13.12/include/uapi/linux/batman_adv.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/batman_adv.h 2025-09-25 17:40:37.275375696 +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.13.12/include/uapi/linux/ethtool.h linux-6.13.12-fbx/include/uapi/linux/ethtool.h --- linux-6.13.12/include/uapi/linux/ethtool.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/ethtool.h 2025-09-25 17:40:37.287375755 +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 @@ -379,6 +381,30 @@ __u32 reserved[2]; }; +struct ethtool_eee_linkmode { + __u32 cmd; + __u32 eee_active; + __u32 eee_enabled; + __u32 tx_lpi_enabled; + __u32 tx_lpi_timer; + __s8 link_mode_masks_nwords; + __u8 reserved[3]; + +#ifndef __KERNEL__ + /* Linux builds with -Wflex-array-member-not-at-end but does + * not use the "link_mode_masks" member. Leave it defined for + * userspace for now, and when userspace wants to start using + * -Wfamnae, we'll need a new solution. + */ + __u32 link_mode_masks[]; + /* layout of link_mode_masks fields: + * __u32 map_supported[link_mode_masks_nwords]; + * __u32 map_advertising[link_mode_masks_nwords]; + * __u32 map_lp_advertising[link_mode_masks_nwords]; + */ +#endif +}; + /** * struct ethtool_modinfo - plugin module eeprom information * @cmd: %ETHTOOL_GMODULEINFO @@ -681,6 +707,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 +733,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 @@ -1843,6 +1871,121 @@ #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; +}; + +enum ethtool_prbs_direction { + ETHTOOL_PRBS_DIRECTION_TX = 0x1, + ETHTOOL_PRBS_DIRECTION_RX = 0x2, + ETHTOOL_PRBS_DIRECTION_BOTH = ETHTOOL_PRBS_DIRECTION_RX | + ETHTOOL_PRBS_DIRECTION_TX, +}; + +/** + * struct ethtool_prbs_params + * @cmd: %ETHTOOL_GPRBS_PARAM / %ETHTOOL_SPRBS_PARAM + * @enable: Whether a transmission/analysis is ongoing + * @length: Length of the sequence + * @errors: Number of errors detected during the analysis + * @lock: Current state of the PRBS checker lock bit (read-only) + */ +struct ethtool_prbs_param { + __u32 cmd; + + __u8 enable; + __u8 length; + __u64 errors; + __u8 lock; + + enum ethtool_prbs_direction direction; + + char pre_emphasis[ETH_GSTRING_LEN]; + char amplitude[ETH_GSTRING_LEN]; + char post_emphasis[ETH_GSTRING_LEN]; +}; + /* CMDs currently supported */ #define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings. * Please use ETHTOOL_GLINKSETTINGS @@ -1938,6 +2081,29 @@ #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 */ + +#define ETHTOOL_GEEE_LINKMODE 0x00000065 /* Get EEE settings linkmode format */ +#define ETHTOOL_SEEE_LINKMODE 0x00000066 /* Set EEE settings linkmode format */ + +#define ETHTOOL_GPRBS_PARAM 0x00000067 /* Set hardware PRBS parameters */ +#define ETHTOOL_SPRBS_PARAM 0x00000068 /* Get hardware PRBS parameters */ + /* compatibility with older code */ #define SPARC_ETH_GSET ETHTOOL_GSET #define SPARC_ETH_SSET ETHTOOL_SSET @@ -2055,6 +2221,12 @@ ETHTOOL_LINK_MODE_10baseT1S_Half_BIT = 100, ETHTOOL_LINK_MODE_10baseT1S_P2MP_Half_BIT = 101, ETHTOOL_LINK_MODE_10baseT1BRR_Full_BIT = 102, + ETHTOOL_LINK_MODE_1000basePX_D_Full_BIT = 103, + ETHTOOL_LINK_MODE_1000basePX_U_Full_BIT = 104, + ETHTOOL_LINK_MODE_10000basePR_D_Full_BIT = 105, + ETHTOOL_LINK_MODE_10000basePR_U_Full_BIT = 106, + ETHTOOL_LINK_MODE_10000_1000basePRX_D_Full_BIT = 107, + ETHTOOL_LINK_MODE_10000_1000basePRX_U_Full_BIT = 108, /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS diff -ruw linux-6.13.12/include/uapi/linux/if_ether.h linux-6.13.12-fbx/include/uapi/linux/if_ether.h --- linux-6.13.12/include/uapi/linux/if_ether.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/if_ether.h 2025-09-25 17:40:37.295375795 +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.13.12/include/uapi/linux/if_tun.h linux-6.13.12-fbx/include/uapi/linux/if_tun.h --- linux-6.13.12/include/uapi/linux/if_tun.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/if_tun.h 2025-09-25 17:40:37.299375815 +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.13.12/include/uapi/linux/if_tunnel.h linux-6.13.12-fbx/include/uapi/linux/if_tunnel.h --- linux-6.13.12/include/uapi/linux/if_tunnel.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/if_tunnel.h 2025-09-25 17:40:37.299375815 +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.13.12/include/uapi/linux/input-event-codes.h linux-6.13.12-fbx/include/uapi/linux/input-event-codes.h --- linux-6.13.12/include/uapi/linux/input-event-codes.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/input-event-codes.h 2025-09-25 17:40:37.299375815 +0200 @@ -807,6 +807,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.13.12/include/uapi/linux/libc-compat.h linux-6.13.12-fbx/include/uapi/linux/libc-compat.h --- linux-6.13.12/include/uapi/linux/libc-compat.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/libc-compat.h 2025-09-25 17:40:37.303375835 +0200 @@ -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 */ @@ -140,6 +142,25 @@ #endif /* _NETINET_IN_H */ +/* Coordinate with glibc netipx/ipx.h header. */ +#if defined(__NETIPX_IPX_H) + +#define __UAPI_DEF_SOCKADDR_IPX 0 +#define __UAPI_DEF_IPX_ROUTE_DEFINITION 0 +#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 0 +#define __UAPI_DEF_IPX_CONFIG_DATA 0 +#define __UAPI_DEF_IPX_ROUTE_DEF 0 + +#else /* defined(__NETIPX_IPX_H) */ + +#define __UAPI_DEF_SOCKADDR_IPX 1 +#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1 +#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1 +#define __UAPI_DEF_IPX_CONFIG_DATA 1 +#define __UAPI_DEF_IPX_ROUTE_DEF 1 + +#endif /* defined(__NETIPX_IPX_H) */ + /* Definitions for xattr.h */ #if defined(_SYS_XATTR_H) #define __UAPI_DEF_XATTR 0 @@ -151,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 @@ -221,11 +242,28 @@ #define __UAPI_DEF_IP6_MTUINFO 1 #endif +/* Definitions for ipx.h */ +#ifndef __UAPI_DEF_SOCKADDR_IPX +#define __UAPI_DEF_SOCKADDR_IPX 1 +#endif +#ifndef __UAPI_DEF_IPX_ROUTE_DEFINITION +#define __UAPI_DEF_IPX_ROUTE_DEFINITION 1 +#endif +#ifndef __UAPI_DEF_IPX_INTERFACE_DEFINITION +#define __UAPI_DEF_IPX_INTERFACE_DEFINITION 1 +#endif +#ifndef __UAPI_DEF_IPX_CONFIG_DATA +#define __UAPI_DEF_IPX_CONFIG_DATA 1 +#endif +#ifndef __UAPI_DEF_IPX_ROUTE_DEF +#define __UAPI_DEF_IPX_ROUTE_DEF 1 +#endif + /* Definitions for xattr.h */ #ifndef __UAPI_DEF_XATTR #define __UAPI_DEF_XATTR 1 #endif -#endif /* __GLIBC__ */ +#endif /* __KERNEL__ */ #endif /* _UAPI_LIBC_COMPAT_H */ diff -ruw linux-6.13.12/include/uapi/linux/nl80211.h linux-6.13.12-fbx/include/uapi/linux/nl80211.h --- linux-6.13.12/include/uapi/linux/nl80211.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/nl80211.h 2025-09-25 17:40:37.311375874 +0200 @@ -1329,6 +1329,13 @@ * %NL80211_ATTR_MLO_TTLM_ULINK attributes are used to specify the * TID to Link mapping for downlink/uplink traffic. * + * @NL80211_CMD_ASSOC_MLO_RECONF: For a non-AP MLD station, request to + * add/remove links to/from the association. + * + * @NL80211_CMD_EPCS_CFG: EPCS configuration for a station. Used by userland to + * control EPCS configuration. Used to notify userland on the current state + * of EPCS. + * * @NL80211_CMD_MAX: highest used command number * @__NL80211_CMD_AFTER_LAST: internal use */ @@ -1586,6 +1593,9 @@ NL80211_CMD_SET_TID_TO_LINK_MAPPING, + NL80211_CMD_ASSOC_MLO_RECONF, + NL80211_CMD_EPCS_CFG, + /* add new commands above here */ /* used to define NL80211_CMD_MAX below */ @@ -2871,6 +2881,23 @@ * @NL80211_ATTR_VIF_RADIO_MASK: Bitmask of allowed radios (u32). * A value of 0 means all radios. * + * @NL80211_ATTR_SUPPORTED_SELECTORS: supported selectors, array of + * supported selectors as defined by IEEE 802.11 7.3.2.2 but without the + * length restriction (at most %NL80211_MAX_SUPP_SELECTORS). + * This can be used to provide a list of selectors that are implemented + * by the supplicant. If not given, support for SAE_H2E is assumed. + * + * @NL80211_ATTR_MLO_RECONF_REM_LINKS: (u16) A bitmask of the links requested + * to be removed from the MLO association. + * + * @NL80211_ATTR_EPCS: Flag attribute indicating that EPCS is enabled for a + * station interface. + * + * @NL80211_ATTR_WIPHY_RADIO_INDEX: Integer attribute denoting the index of + * the radio in interest. Internally a value of 0xff is used to indicate + * this attribute is not present, and hence any associated attributes are + * deemed to be applicable to all radios + * * @NUM_NL80211_ATTR: total number of nl80211_attrs available * @NL80211_ATTR_MAX: highest attribute number currently defined * @__NL80211_ATTR_AFTER_LAST: internal use @@ -3421,6 +3448,13 @@ NL80211_ATTR_VIF_RADIO_MASK, + NL80211_ATTR_SUPPORTED_SELECTORS, + + NL80211_ATTR_MLO_RECONF_REM_LINKS, + NL80211_ATTR_EPCS, + + NL80211_ATTR_WIPHY_RADIO_INDEX, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -3463,8 +3497,10 @@ #define NL80211_ATTR_FEATURE_FLAGS NL80211_ATTR_FEATURE_FLAGS #define NL80211_WIPHY_NAME_MAXLEN 64 +#define NL80211_WIPHY_RADIO_ID_MAX 0xff #define NL80211_MAX_SUPP_RATES 32 +#define NL80211_MAX_SUPP_SELECTORS 128 #define NL80211_MAX_SUPP_HT_RATES 77 #define NL80211_MAX_SUPP_REG_RULES 128 #define NL80211_TKIP_DATA_OFFSET_ENCR_KEY 0 @@ -6772,6 +6808,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, @@ -6789,6 +6826,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, }; /** @@ -7994,6 +8032,11 @@ * Setting this flag is permitted only if the driver advertises EMA support * by setting wiphy->ema_max_profile_periodicity to non-zero. * + * @NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID: Link ID of the transmitted profile. + * This parameter is mandatory if the transmitted profile is part of an MLD + * and the interface getting configured is a non-transmitted profile. For all + * other cases it will be ignored. + * * @__NL80211_MBSSID_CONFIG_ATTR_LAST: Internal * @NL80211_MBSSID_CONFIG_ATTR_MAX: highest attribute */ @@ -8005,6 +8048,7 @@ NL80211_MBSSID_CONFIG_ATTR_INDEX, NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX, NL80211_MBSSID_CONFIG_ATTR_EMA, + NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID, /* keep last */ __NL80211_MBSSID_CONFIG_ATTR_LAST, @@ -8040,6 +8084,7 @@ * and contains attributes defined in &enum nl80211_if_combination_attrs. * @NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK: bitmask (u32) of antennas * connected to this radio. + * @NL80211_WIPHY_RADIO_ATTR_RTS_THRESHOLD: RTS threshold (u32) of this radio. * * @__NL80211_WIPHY_RADIO_ATTR_LAST: Internal * @NL80211_WIPHY_RADIO_ATTR_MAX: Highest attribute @@ -8051,6 +8096,7 @@ NL80211_WIPHY_RADIO_ATTR_FREQ_RANGE, NL80211_WIPHY_RADIO_ATTR_INTERFACE_COMBINATION, NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK, + NL80211_WIPHY_RADIO_ATTR_RTS_THRESHOLD, /* keep last */ __NL80211_WIPHY_RADIO_ATTR_LAST, diff -ruw linux-6.13.12/include/uapi/linux/sched.h linux-6.13.12-fbx/include/uapi/linux/sched.h --- linux-6.13.12/include/uapi/linux/sched.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/sched.h 2025-09-25 17:40:37.315375894 +0200 @@ -146,4 +146,6 @@ SCHED_FLAG_KEEP_ALL | \ SCHED_FLAG_UTIL_CLAMP) +#define SCHED_PASLR_SEED_SIZE 16 + #endif /* _UAPI_LINUX_SCHED_H */ diff -ruw linux-6.13.12/include/uapi/linux/serial_core.h linux-6.13.12-fbx/include/uapi/linux/serial_core.h --- linux-6.13.12/include/uapi/linux/serial_core.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/serial_core.h 2025-09-25 17:40:37.319375914 +0200 @@ -234,4 +234,7 @@ /* Generic type identifier for ports which type is not important to userspace. */ #define PORT_GENERIC (-1) +/* Cortina uart */ +#define PORT_CORTINA 124 + #endif /* _UAPILINUX_SERIAL_CORE_H */ diff -ruw linux-6.13.12/include/uapi/linux/sockios.h linux-6.13.12-fbx/include/uapi/linux/sockios.h --- linux-6.13.12/include/uapi/linux/sockios.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/sockios.h 2025-09-25 17:40:37.319375914 +0200 @@ -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.13.12/include/uapi/linux/tcp.h linux-6.13.12-fbx/include/uapi/linux/tcp.h --- linux-6.13.12/include/uapi/linux/tcp.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/tcp.h 2025-09-25 17:40:37.319375914 +0200 @@ -141,6 +141,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.13.12/include/uapi/linux/tty.h linux-6.13.12-fbx/include/uapi/linux/tty.h --- linux-6.13.12/include/uapi/linux/tty.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/include/uapi/linux/tty.h 2025-09-25 17:40:37.319375914 +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.13.12/init/Kconfig linux-6.13.12-fbx/init/Kconfig --- linux-6.13.12/init/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/init/Kconfig 2025-09-25 17:40:37.335375993 +0200 @@ -175,6 +175,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 @@ -817,6 +826,43 @@ 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 + depends on FBX_DECRYPT_INITRD + +config FBX_DECRYPT_INITRD_RC4 + bool "RC4" + +config FBX_DECRYPT_INITRD_CHACHA20 + 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.13.12/init/Makefile linux-6.13.12-fbx/init/Makefile --- linux-6.13.12/init/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/init/Makefile 2025-09-25 17:40:37.335375993 +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.13.12/init/init_task.c linux-6.13.12-fbx/init/init_task.c --- linux-6.13.12/init/init_task.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/init/init_task.c 2025-09-25 17:40:37.339376013 +0200 @@ -72,6 +72,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.13.12/init/initramfs.c linux-6.13.12-fbx/init/initramfs.c --- linux-6.13.12/init/initramfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/init/initramfs.c 2025-09-29 14:23:07.617732469 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include #include "do_mounts.h" @@ -687,6 +688,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 printk(KERN_INFO "rootfs image is not initramfs (%s); looks like an initrd\n", err); @@ -694,6 +699,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.13.12/kernel/bpf/core.c linux-6.13.12-fbx/kernel/bpf/core.c --- linux-6.13.12/kernel/bpf/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/kernel/bpf/core.c 2025-09-25 17:40:37.363376132 +0200 @@ -2296,8 +2296,7 @@ const struct bpf_insn *insn) { /* If this handler ever gets executed, then BPF_JIT_ALWAYS_ON - * is not working properly, or interpreter is being used when - * prog->jit_requested is not 0, so warn about it! + * is not working properly, so warn about it! */ WARN_ON_ONCE(1); return 0; @@ -2377,8 +2376,9 @@ return ret; } -static void bpf_prog_select_func(struct bpf_prog *fp) +static bool bpf_prog_select_interpreter(struct bpf_prog *fp) { + bool select_interpreter = false; #ifndef CONFIG_BPF_JIT_ALWAYS_ON u32 stack_depth = max_t(u32, fp->aux->stack_depth, 1); u32 idx = (round_up(stack_depth, 32) / 32) - 1; @@ -2387,15 +2387,16 @@ * But for non-JITed programs, we don't need bpf_func, so no bounds * check needed. */ - if (!fp->jit_requested && - !WARN_ON_ONCE(idx >= ARRAY_SIZE(interpreters))) { + if (idx < ARRAY_SIZE(interpreters)) { fp->bpf_func = interpreters[idx]; + select_interpreter = true; } else { fp->bpf_func = __bpf_prog_ret0_warn; } #else fp->bpf_func = __bpf_prog_ret0_warn; #endif + return select_interpreter; } /** @@ -2423,7 +2424,8 @@ bpf_prog_has_kfunc_call(fp)) jit_needed = true; - bpf_prog_select_func(fp); + if (!bpf_prog_select_interpreter(fp)) + jit_needed = true; /* eBPF JITs can rewrite the program in case constant * blinding is active. However, in case of error during diff -ruw linux-6.13.12/kernel/dma/mapping.c linux-6.13.12-fbx/kernel/dma/mapping.c --- linux-6.13.12/kernel/dma/mapping.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/kernel/dma/mapping.c 2025-09-25 17:40:37.391376271 +0200 @@ -664,6 +664,53 @@ } EXPORT_SYMBOL(dma_free_attrs); +void *dma_alloc_coherent_no_dev(size_t size, dma_addr_t *dma_handle, gfp_t gfp) +{ + struct page *page; + void *cpu_addr; + pgprot_t prot; + + size = PAGE_ALIGN(size); + /* no specific zone and no zero init, this is incompatible with + * our pupose built reduced implementation + */ + gfp &= ~(__GFP_DMA | __GFP_DMA32 | __GFP_HIGHMEM | __GFP_ZERO); + + /* simply alloc some continuous pages */ + page = alloc_pages(gfp, get_order(size)); + if (!page) + return NULL; + + /* remove any dirty cache lines on the kernel alias */ + arch_dma_prep_coherent(page, size); + + /* create a coherent mapping */ + prot = pgprot_dmacoherent(PAGE_KERNEL); + cpu_addr = dma_common_contiguous_remap(page, size, prot, + __builtin_return_address(0)); + if (!cpu_addr) { + __free_pages(page, get_order(size)); + return NULL; + } + + memset(cpu_addr, 0, size); + + *dma_handle = page_to_phys(page); + return cpu_addr; +} +EXPORT_SYMBOL(dma_alloc_coherent_no_dev); + +void dma_free_coherent_no_dev(size_t size, void *cpu_addr,dma_addr_t dma_handle) +{ + struct page *page; + + page = phys_to_page(dma_handle); + + vunmap(cpu_addr); + return __free_pages(page, get_order(size)); +} +EXPORT_SYMBOL(dma_free_coherent_no_dev); + static struct page *__dma_alloc_pages(struct device *dev, size_t size, dma_addr_t *dma_handle, enum dma_data_direction dir, gfp_t gfp) { diff -ruw linux-6.13.12/kernel/fork.c linux-6.13.12-fbx/kernel/fork.c --- linux-6.13.12/kernel/fork.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/kernel/fork.c 2025-09-25 17:40:37.399376311 +0200 @@ -1157,6 +1157,13 @@ set_task_stack_end_magic(tsk); clear_syscall_work_syscall_user_dispatch(tsk); +#ifdef CONFIG_PSEUDO_ASLR + tsk->paslr_used = false; + tsk->paslr_exec_policy = orig->paslr_exec_policy; + memcpy(tsk->paslr_exec_preseed, orig->paslr_exec_preseed, + sizeof (tsk->paslr_exec_preseed)); +#endif + #ifdef CONFIG_STACKPROTECTOR tsk->stack_canary = get_random_canary(); #endif @@ -1210,6 +1217,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.13.12/kernel/module/Kconfig linux-6.13.12-fbx/kernel/module/Kconfig --- linux-6.13.12/kernel/module/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/kernel/module/Kconfig 2025-09-25 17:40:37.423376430 +0200 @@ -397,6 +397,10 @@ one per line. The path can be absolute, or relative to the kernel source or obj 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.13.12/kernel/sys.c linux-6.13.12-fbx/kernel/sys.c --- linux-6.13.12/kernel/sys.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/kernel/sys.c 2025-09-25 17:40:37.463376628 +0200 @@ -12,6 +12,7 @@ #include #include #include +#include #include #include #include @@ -2809,6 +2810,36 @@ return -EINVAL; error = arch_lock_shadow_stack_status(me, arg2); break; + 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_SET_PASLR_POLICY: + if (arg2 != PR_PASLR_POLICY_UID && + arg2 != PR_PASLR_POLICY_DISABLE && + arg2 != PR_PASLR_POLICY_PRESEED) + return -EINVAL; + +#ifdef CONFIG_PSEUDO_ASLR + if (arg2 == PR_PASLR_POLICY_PRESEED) { + if (copy_from_user(current->paslr_exec_preseed, + (u8 __user *)arg3, + sizeof(current->paslr_exec_preseed))) + return -EFAULT; + } + current->paslr_exec_policy = arg2; + return 0; +#else + return -EOPNOTSUPP; +#endif + case PR_GET_EXEC_MODE: + return current->exec_mode; default: error = -EINVAL; break; diff -ruw linux-6.13.12/lib/Kconfig linux-6.13.12-fbx/lib/Kconfig --- linux-6.13.12/lib/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/lib/Kconfig 2025-09-25 17:40:37.507376846 +0200 @@ -751,6 +751,13 @@ help Run boot-time test of light-weight queuing. +config ARCH_HAS_FBXSERIAL + bool + +config FBXSERIAL + bool "fbxserial" + select CRC32 + endmenu config GENERIC_IOREMAP diff -ruw linux-6.13.12/lib/Makefile linux-6.13.12-fbx/lib/Makefile --- linux-6.13.12/lib/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/lib/Makefile 2025-09-25 17:40:37.507376846 +0200 @@ -406,3 +406,4 @@ obj-$(CONFIG_FIRMWARE_TABLE) += fw_table.o subdir-$(CONFIG_FORTIFY_SOURCE) += test_fortify +obj-$(CONFIG_FBXSERIAL) += fbxserial.o diff -ruw linux-6.13.12/lib/devres.c linux-6.13.12-fbx/lib/devres.c --- linux-6.13.12/lib/devres.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/lib/devres.c 2025-09-25 17:40:37.527376945 +0200 @@ -250,6 +250,47 @@ } EXPORT_SYMBOL(devm_of_iomap); +/* + * devm_of_iomap - Requests a resource and maps the memory mapped IO + * for a given device_node managed by a given device + * + * Checks that a resource is a valid memory region, requests the memory + * region and ioremaps it. All operations are managed and will be undone + * on driver detach of the device. + * + * This is to be used when a device requests/maps resources described + * by other device tree nodes (children or otherwise). + * + * @dev: The device "managing" the resource + * @node: The device-tree node where the resource resides + * @name: name of the MMIO range in the "reg-names" property + * @size: Returns the size of the resource (pass NULL if not needed) + * + * Usage example: + * + * base = devm_of_iomap_byname(&pdev->dev, node, "register", NULL); + * if (IS_ERR(base)) + * return PTR_ERR(base); + * + * Return: a pointer to the requested and mapped memory or an ERR_PTR() encoded + * error code on failure. + */ +void __iomem *devm_of_iomap_byname(struct device *dev, struct device_node *node, + char *name, resource_size_t *size) +{ + int index; + + if (!name) + return IOMEM_ERR_PTR(-EINVAL); + + index = fwnode_property_match_string(&node->fwnode, "reg-names", name); + if (index < 0) + return IOMEM_ERR_PTR(index); + + return devm_of_iomap(dev, node, index, size); +} +EXPORT_SYMBOL(devm_of_iomap_byname); + #ifdef CONFIG_HAS_IOPORT_MAP /* * Generic iomap devres diff -ruw linux-6.13.12/mm/Kconfig linux-6.13.12-fbx/mm/Kconfig --- linux-6.13.12/mm/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/mm/Kconfig 2025-09-25 17:40:37.575377183 +0200 @@ -369,6 +369,13 @@ Say Y if unsure. +config PSEUDO_ASLR + bool "Support pseudo-ASLR for userland address space" + select CRYPTO_LIB_SHA256 + depends on ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT + help + ASLR with a configurable pseudo-random seed policy. + config COMPAT_BRK bool "Disable heap randomization" default y @@ -762,6 +769,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.13.12/mm/memtest.c linux-6.13.12-fbx/mm/memtest.c --- linux-6.13.12/mm/memtest.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/mm/memtest.c 2025-09-25 17:40:37.611377362 +0200 @@ -29,6 +29,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", @@ -69,19 +70,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.13.12/mm/page_frag_cache.c linux-6.13.12-fbx/mm/page_frag_cache.c --- linux-6.13.12/mm/page_frag_cache.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/mm/page_frag_cache.c 2025-09-25 17:40:37.619377402 +0200 @@ -18,6 +18,7 @@ #include #include #include +#include #include "internal.h" static unsigned long encoded_page_create(struct page *page, unsigned int order, @@ -66,6 +67,8 @@ nc->encoded_page = page ? encoded_page_create(page, order, page_is_pfmemalloc(page)) : 0; + if (page) + set_page_owner_frag_cache(page, order, nc); return page; } diff -ruw linux-6.13.12/mm/pgtable-generic.c linux-6.13.12-fbx/mm/pgtable-generic.c --- linux-6.13.12/mm/pgtable-generic.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/mm/pgtable-generic.c 2025-09-25 17:40:37.623377421 +0200 @@ -407,3 +407,5 @@ pte_unmap_unlock(pte, ptl); goto again; } + +EXPORT_SYMBOL(__pte_offset_map_lock); diff -ruw linux-6.13.12/mm/util.c linux-6.13.12-fbx/mm/util.c --- linux-6.13.12/mm/util.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/mm/util.c 2025-09-25 17:40:37.635377481 +0200 @@ -28,6 +28,10 @@ #include +#ifdef CONFIG_PSEUDO_ASLR +#include +#endif + #include "internal.h" #include "swap.h" @@ -351,6 +355,74 @@ #endif } +#ifdef CONFIG_PSEUDO_ASLR + +static u8 paslr_host_seed[SCHED_PASLR_SEED_SIZE]; +static bool paslr_host_seed_valid; +static DEFINE_MUTEX(paslr_mutex); + +void paslr_task_init(struct task_struct *tsk, int policy, const char *seed) +{ + struct sha256_state s; + + mutex_lock(&paslr_mutex); + if (!paslr_host_seed_valid) { + get_random_bytes_wait(paslr_host_seed, + sizeof (paslr_host_seed)); + paslr_host_seed_valid = true; + } + mutex_unlock(&paslr_mutex); + + sha256_init(&s); + sha256_update(&s, paslr_host_seed, SCHED_PASLR_SEED_SIZE); + sha256_update(&s, (void *)&policy, sizeof (policy)); + sha256_update(&s, seed, SCHED_PASLR_SEED_SIZE); + sha256_final(&s, tsk->paslr_rng_state); + + tsk->paslr_rng_ctr = 0; +} + +static unsigned long aslr_get_random_long(bool skip_paslr) +{ + struct sha256_state s; + unsigned long v; + u8 d[SHA256_DIGEST_SIZE]; + + if (skip_paslr || !current->paslr_used) + goto no_paslr; + + /* generate output with current counter value */ + ++current->paslr_rng_ctr; + sha256_init(&s); + sha256_update(&s, current->paslr_rng_state, + sizeof (current->paslr_rng_state)); + sha256_update(&s, (u8 *)¤t->paslr_rng_ctr, + sizeof (current->paslr_rng_ctr)); + sha256_final(&s, d); + + /* reseed with next counter value */ + ++current->paslr_rng_ctr; + sha256_init(&s); + sha256_update(&s, current->paslr_rng_state, + sizeof (current->paslr_rng_state)); + sha256_update(&s, (u8 *)¤t->paslr_rng_ctr, + sizeof (current->paslr_rng_ctr)); + sha256_final(&s, current->paslr_rng_state); + + memcpy(&v, d, sizeof (v)); + return v; + +no_paslr: + return get_random_long(); +} + +#else +static inline unsigned long aslr_get_random_long(bool skip_paslr) +{ + return get_random_long(); +} +#endif + /** * randomize_page - Generate a random, page aligned address * @start: The smallest acceptable address the caller will take. @@ -365,7 +437,8 @@ * Return: A page aligned address within [start, start + range). On error, * @start is returned. */ -unsigned long randomize_page(unsigned long start, unsigned long range) +static unsigned long _randomize_page(unsigned long start, unsigned long range, + bool skip_paslr) { if (!PAGE_ALIGNED(start)) { range -= PAGE_ALIGN(start) - start; @@ -380,7 +453,12 @@ if (range == 0) return start; - return start + (get_random_long() % range << PAGE_SHIFT); + return start + (aslr_get_random_long(skip_paslr) % range << PAGE_SHIFT); +} + +unsigned long randomize_page(unsigned long start, unsigned long range) +{ + return _randomize_page(start, range, false); } #ifdef CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT @@ -388,9 +466,9 @@ { /* Is the current task 32bit ? */ if (!IS_ENABLED(CONFIG_64BIT) || is_compat_task()) - return randomize_page(mm->brk, SZ_32M); + return _randomize_page(mm->brk, SZ_32M, true); - return randomize_page(mm->brk, SZ_1G); + return _randomize_page(mm->brk, SZ_1G, true); } unsigned long arch_mmap_rnd(void) @@ -399,10 +477,10 @@ #ifdef CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS if (is_compat_task()) - rnd = get_random_long() & ((1UL << mmap_rnd_compat_bits) - 1); + rnd = aslr_get_random_long(false) & ((1UL << mmap_rnd_compat_bits) - 1); else #endif /* CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS */ - rnd = get_random_long() & ((1UL << mmap_rnd_bits) - 1); + rnd = aslr_get_random_long(false) & ((1UL << mmap_rnd_bits) - 1); return rnd << PAGE_SHIFT; } diff -ruw linux-6.13.12/mm/vmalloc.c linux-6.13.12-fbx/mm/vmalloc.c --- linux-6.13.12/mm/vmalloc.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/mm/vmalloc.c 2025-09-25 17:40:37.635377481 +0200 @@ -3927,6 +3927,19 @@ } EXPORT_SYMBOL(__vmalloc_noprof); +/* + * __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); + /** * vmalloc - allocate virtually contiguous memory * @size: allocation size diff -ruw linux-6.13.12/net/8021q/Kconfig linux-6.13.12-fbx/net/8021q/Kconfig --- linux-6.13.12/net/8021q/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/8021q/Kconfig 2025-09-25 17:40:37.643377521 +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.13.12/net/8021q/vlan.c linux-6.13.12-fbx/net/8021q/vlan.c --- linux-6.13.12/net/8021q/vlan.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/8021q/vlan.c 2025-09-25 17:40:37.643377521 +0200 @@ -212,7 +212,8 @@ /* 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); +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.13.12/net/8021q/vlan.h linux-6.13.12-fbx/net/8021q/vlan.h --- linux-6.13.12/net/8021q/vlan.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/8021q/vlan.h 2025-09-25 17:40:37.643377521 +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.13.12/net/8021q/vlan_core.c linux-6.13.12-fbx/net/8021q/vlan_core.c --- linux-6.13.12/net/8021q/vlan_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/8021q/vlan_core.c 2025-09-25 17:40:37.643377521 +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.13.12/net/8021q/vlan_netlink.c linux-6.13.12-fbx/net/8021q/vlan_netlink.c --- linux-6.13.12/net/8021q/vlan_netlink.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/8021q/vlan_netlink.c 2025-09-25 17:40:37.643377521 +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.13.12/net/Kconfig linux-6.13.12-fbx/net/Kconfig --- linux-6.13.12/net/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/Kconfig 2025-09-25 17:40:37.647377540 +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 @@ -77,6 +81,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" @@ -251,6 +268,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.13.12/net/Makefile linux-6.13.12-fbx/net/Makefile --- linux-6.13.12/net/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/Makefile 2025-09-25 17:40:37.647377540 +0200 @@ -38,6 +38,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.13.12/net/batman-adv/Kconfig linux-6.13.12-fbx/net/batman-adv/Kconfig --- linux-6.13.12/net/batman-adv/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/Kconfig 2025-09-25 17:40:37.651377560 +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.13.12/net/batman-adv/Makefile linux-6.13.12-fbx/net/batman-adv/Makefile --- linux-6.13.12/net/batman-adv/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/Makefile 2025-09-25 17:40:37.651377560 +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 @@ -31,5 +32,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.13.12/net/batman-adv/bat_iv_ogm.c linux-6.13.12-fbx/net/batman-adv/bat_iv_ogm.c --- linux-6.13.12/net/batman-adv/bat_iv_ogm.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/bat_iv_ogm.c 2025-09-25 17:40:37.651377560 +0200 @@ -2022,13 +2022,20 @@ bool ret = true; neigh1_ifinfo = batadv_neigh_ifinfo_get(neigh1, if_outgoing1); - neigh2_ifinfo = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); - - if (!neigh1_ifinfo || !neigh2_ifinfo) { + if (!neigh1_ifinfo) { ret = false; goto out; } + /* If neigh2 is invalid always prefer neigh1 */ + *diff = 1; + if (!neigh2) + goto out; + + neigh2_ifinfo = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); + if (!neigh2_ifinfo) + goto out; + tq1 = neigh1_ifinfo->bat_iv.tq_avg; tq2 = neigh2_ifinfo->bat_iv.tq_avg; *diff = (int)tq1 - (int)tq2; diff -ruw linux-6.13.12/net/batman-adv/bat_v.c linux-6.13.12-fbx/net/batman-adv/bat_v.c --- linux-6.13.12/net/batman-adv/bat_v.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/bat_v.c 2025-09-25 17:40:37.651377560 +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" @@ -128,6 +130,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; @@ -152,6 +155,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; @@ -309,6 +315,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; @@ -458,6 +467,11 @@ if (!ifinfo1) goto err_ifinfo1; + /* If neigh2 is invalid always prefer neigh1 */ + ret = 1; + if (!neigh2) + goto err_ifinfo2; + ifinfo2 = batadv_neigh_ifinfo_get(neigh2, if_outgoing2); if (!ifinfo2) goto err_ifinfo2; diff -ruw linux-6.13.12/net/batman-adv/bat_v_ogm.c linux-6.13.12-fbx/net/batman-adv/bat_v_ogm.c --- linux-6.13.12/net/batman-adv/bat_v_ogm.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/bat_v_ogm.c 2025-09-25 17:40:37.651377560 +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 @@ -475,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; @@ -495,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; @@ -574,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--; @@ -616,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); @@ -657,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; @@ -843,6 +854,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) @@ -858,7 +891,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); @@ -912,9 +945,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, @@ -968,6 +1000,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); diff -ruw linux-6.13.12/net/batman-adv/fragmentation.c linux-6.13.12-fbx/net/batman-adv/fragmentation.c --- linux-6.13.12/net/batman-adv/fragmentation.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/fragmentation.c 2025-09-25 17:40:37.655377580 +0200 @@ -27,6 +27,8 @@ #include "originator.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. @@ -439,7 +441,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.13.12/net/batman-adv/hard-interface.c linux-6.13.12-fbx/net/batman-adv/hard-interface.c --- linux-6.13.12/net/batman-adv/hard-interface.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/hard-interface.c 2025-09-29 14:23:07.621732489 +0200 @@ -37,6 +37,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" @@ -470,6 +471,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); } @@ -946,7 +948,7 @@ switch (event) { case NETDEV_REGISTER: bat_priv = netdev_priv(net_dev); - batadv_softif_create_vlan(bat_priv, BATADV_NO_FLAGS); + batadv_softif_create_vlan_own(bat_priv, BATADV_NO_FLAGS); break; } @@ -988,8 +990,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.13.12/net/batman-adv/main.c linux-6.13.12-fbx/net/batman-adv/main.c --- linux-6.13.12/net/batman-adv/main.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/main.c 2025-09-25 17:40:37.659377600 +0200 @@ -60,6 +60,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 @@ -116,6 +117,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); @@ -130,6 +132,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); @@ -229,6 +232,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); @@ -271,6 +275,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 @@ -482,6 +487,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); @@ -527,6 +533,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.13.12/net/batman-adv/netlink.c linux-6.13.12-fbx/net/batman-adv/netlink.c --- linux-6.13.12/net/batman-adv/netlink.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/netlink.c 2025-09-25 17:40:37.663377620 +0200 @@ -49,6 +49,7 @@ #include "soft-interface.h" #include "tp_meter.h" #include "translation-table.h" +#include "fbx/fbx.h" struct genl_family batadv_netlink_family; @@ -56,6 +57,7 @@ enum batadv_netlink_multicast_groups { BATADV_NL_MCGRP_CONFIG, BATADV_NL_MCGRP_TPMETER, + BATADV_NL_MCGRP_ROUTE, }; /** @@ -87,6 +89,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] = { @@ -149,6 +152,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 }, }; /** @@ -359,6 +363,7 @@ batadv_hardif_put(primary_if); + batadv_fbx_nl(bat_priv, cmd, NULL, msg, NULL); genlmsg_end(msg, hdr); return 0; @@ -611,6 +616,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; @@ -1150,6 +1156,100 @@ } /** + * 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_ATOMIC); + return 0; +} + +/** * batadv_get_softif_from_info() - Retrieve soft interface from genl attributes * @net: the applicable net namespace * @info: receiver information @@ -1409,7 +1509,7 @@ { .cmd = BATADV_CMD_GET_ORIGINATORS, .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP, - .flags = GENL_UNS_ADMIN_PERM, + /* can be retrieved by unprivileged users */ .dumpit = batadv_orig_dump, }, { diff -ruw linux-6.13.12/net/batman-adv/netlink.h linux-6.13.12-fbx/net/batman-adv/netlink.h --- linux-6.13.12/net/batman-adv/netlink.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/netlink.h 2025-09-25 17:40:37.663377620 +0200 @@ -21,6 +21,12 @@ u8 result, u32 test_time, u64 total_bytes, u32 cookie); +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.13.12/net/batman-adv/originator.c linux-6.13.12-fbx/net/batman-adv/originator.c --- linux-6.13.12/net/batman-adv/originator.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/originator.c 2025-09-25 17:40:37.663377620 +0200 @@ -43,6 +43,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; @@ -276,6 +277,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); } @@ -435,6 +437,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); @@ -571,6 +575,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); @@ -591,6 +596,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); @@ -830,6 +842,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); @@ -850,6 +864,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); @@ -960,7 +976,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); @@ -1019,6 +1035,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); @@ -1194,8 +1214,8 @@ rcu_read_lock(); hlist_for_each_entry_rcu(neigh, &orig_node->neigh_list, list) { - if (best && (bao->neigh.cmp(neigh, if_outgoing, best, - if_outgoing) <= 0)) + if (bao->neigh.cmp(neigh, if_outgoing, best, + if_outgoing) <= 0) continue; if (!kref_get_unless_zero(&neigh->refcount)) diff -ruw linux-6.13.12/net/batman-adv/routing.c linux-6.13.12-fbx/net/batman-adv/routing.c --- linux-6.13.12/net/batman-adv/routing.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/routing.c 2025-09-25 17:40:37.663377620 +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.13.12/net/batman-adv/send.c linux-6.13.12-fbx/net/batman-adv/send.c --- linux-6.13.12/net/batman-adv/send.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/send.c 2025-09-25 17:40:37.663377620 +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.13.12/net/batman-adv/send.h linux-6.13.12-fbx/net/batman-adv/send.h --- linux-6.13.12/net/batman-adv/send.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/send.h 2025-09-25 17:40:37.663377620 +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.13.12/net/batman-adv/soft-interface.c linux-6.13.12-fbx/net/batman-adv/soft-interface.c --- linux-6.13.12/net/batman-adv/soft-interface.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/soft-interface.c 2025-09-25 17:40:37.667377640 +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 @@ -141,6 +142,10 @@ rcu_read_lock(); hlist_for_each_entry_rcu(vlan, &bat_priv->softif_vlan_list, list) { + /* we don't use this VID ourself, avoid adding us to it */ + if (!batadv_is_my_client(bat_priv, old_addr, vlan->vid)) + continue; + batadv_tt_local_remove(bat_priv, old_addr, vlan->vid, "mac address changed", false); batadv_tt_local_add(dev, addr->sa_data, vlan->vid, @@ -177,15 +182,31 @@ { } +#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; +#ifdef CONFIG_BATMAN_ADV_BLA static const u8 stp_addr[ETH_ALEN] = {0x01, 0x80, 0xC2, 0x00, 0x00, 0x00}; +#endif static const u8 ectp_addr[ETH_ALEN] = {0xCF, 0x00, 0x00, 0x00, 0x00, 0x00}; enum batadv_dhcp_recipient dhcp_rcp = BATADV_DHCP_NO; @@ -196,12 +217,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; @@ -240,6 +261,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); @@ -256,18 +280,39 @@ /* 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; +#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 */ @@ -322,10 +367,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 @@ -333,28 +374,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 */ @@ -391,7 +413,6 @@ dropped_freed: batadv_inc_counter(bat_priv, BATADV_CNT_TX_DROPPED); end: - batadv_hardif_put(primary_if); return NETDEV_TX_OK; } @@ -437,6 +458,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); @@ -553,9 +577,11 @@ * @bat_priv: the bat priv with all the soft interface information * @vid: the VLAN identifier * - * Return: 0 on success, a negative error otherwise. + * Return: a pointer to the newly allocated softif vlan struct on success, NULL + * otherwise. */ -int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) +static struct batadv_softif_vlan * +batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid) { struct batadv_softif_vlan *vlan; @@ -563,15 +589,14 @@ vlan = batadv_softif_vlan_get(bat_priv, vid); if (vlan) { - batadv_softif_vlan_put(vlan); spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - return -EEXIST; + return vlan; } vlan = kzalloc(sizeof(*vlan), GFP_ATOMIC); if (!vlan) { spin_unlock_bh(&bat_priv->softif_vlan_list_lock); - return -ENOMEM; + return NULL; } vlan->bat_priv = bat_priv; @@ -580,38 +605,74 @@ atomic_set(&vlan->ap_isolation, 0); - kref_get(&vlan->refcount); hlist_add_head_rcu(&vlan->list, &bat_priv->softif_vlan_list); spin_unlock_bh(&bat_priv->softif_vlan_list_lock); + return vlan; +} + +/** + * batadv_softif_vlan_get_or_create() - retrieve or create a softif vlan struct + * @bat_priv: the bat priv with all the soft interface information + * @vid: the VLAN identifier + * + * Return: the softif vlan struct if found or created or NULL otherwise. + */ +struct batadv_softif_vlan * +batadv_softif_vlan_get_or_create(struct batadv_priv *bat_priv, + unsigned short vid) +{ + struct batadv_softif_vlan *vlan = batadv_softif_vlan_get(bat_priv, vid); + + if (vlan) + return vlan; + + return batadv_softif_create_vlan(bat_priv, vid); +} + +/** + * batadv_softif_create_vlan_own() - add our own softif to the local TT + * @bat_priv: the bat priv with all the soft interface information + * @vid: the VLAN identifier + * + * Adds the MAC address of our own soft interface with the given VLAN ID as + * a permanent local TT entry. + * + * Return: 0 on success, a negative error otherwise. + */ +int batadv_softif_create_vlan_own(struct batadv_priv *bat_priv, + unsigned short vid) +{ + int ret; + /* add a new TT local entry. This one will be marked with the NOPURGE * flag */ - batadv_tt_local_add(bat_priv->soft_iface, + ret = batadv_tt_local_add(bat_priv->soft_iface, bat_priv->soft_iface->dev_addr, vid, BATADV_NULL_IFINDEX, BATADV_NO_MARK); - - /* don't return reference to new softif_vlan */ - batadv_softif_vlan_put(vlan); + if (ret < 0) + return ret; return 0; } /** - * batadv_softif_destroy_vlan() - remove and destroy a softif_vlan object + * batadv_softif_destroy_vlan_own() - remove our own softif from the local TT * @bat_priv: the bat priv with all the soft interface information - * @vlan: the object to remove + * @vid: the VLAN identifier + * + * Removes the MAC address of our own soft interface with the given VLAN ID from + * the local TT. */ -static void batadv_softif_destroy_vlan(struct batadv_priv *bat_priv, - struct batadv_softif_vlan *vlan) +static void batadv_softif_destroy_vlan_own(struct batadv_priv *bat_priv, + unsigned short vid) { /* explicitly remove the associated TT local entry because it is marked * with the NOPURGE flag */ - batadv_tt_local_remove(bat_priv, bat_priv->soft_iface->dev_addr, - vlan->vid, "vlan interface destroyed", false); - - batadv_softif_vlan_put(vlan); + batadv_tt_local_remove(bat_priv, bat_priv->soft_iface->dev_addr, vid, + "vlan interface destroyed", false); } /** @@ -629,7 +690,6 @@ unsigned short vid) { struct batadv_priv *bat_priv = netdev_priv(dev); - struct batadv_softif_vlan *vlan; /* only 802.1Q vlans are supported. * batman-adv does not know how to handle other types @@ -639,25 +699,7 @@ vid |= BATADV_VLAN_HAS_TAG; - /* if a new vlan is getting created and it already exists, it means that - * it was not deleted yet. batadv_softif_vlan_get() increases the - * refcount in order to revive the object. - * - * if it does not exist then create it. - */ - vlan = batadv_softif_vlan_get(bat_priv, vid); - if (!vlan) - return batadv_softif_create_vlan(bat_priv, vid); - - /* add a new TT local entry. This one will be marked with the NOPURGE - * flag. This must be added again, even if the vlan object already - * exists, because the entry was deleted by kill_vid() - */ - batadv_tt_local_add(bat_priv->soft_iface, - bat_priv->soft_iface->dev_addr, vid, - BATADV_NULL_IFINDEX, BATADV_NO_MARK); - - return 0; + return batadv_softif_create_vlan_own(bat_priv, vid); } /** @@ -676,7 +718,6 @@ unsigned short vid) { struct batadv_priv *bat_priv = netdev_priv(dev); - struct batadv_softif_vlan *vlan; /* only 802.1Q vlans are supported. batman-adv does not know how to * handle other types @@ -684,15 +725,7 @@ if (proto != htons(ETH_P_8021Q)) return -EINVAL; - vlan = batadv_softif_vlan_get(bat_priv, vid | BATADV_VLAN_HAS_TAG); - if (!vlan) - return -ENOENT; - - batadv_softif_destroy_vlan(bat_priv, vlan); - - /* finally free the vlan object */ - batadv_softif_vlan_put(vlan); - + batadv_softif_destroy_vlan_own(bat_priv, vid | BATADV_VLAN_HAS_TAG); return 0; } @@ -781,15 +814,16 @@ 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); #ifdef CONFIG_BATMAN_ADV_BLA atomic_set(&bat_priv->bla.num_requests, 0); #endif atomic_set(&bat_priv->tp_num, 0); + bat_priv->tt.local_changes = 0; bat_priv->tt.last_changeset = NULL; bat_priv->tt.last_changeset_len = 0; bat_priv->isolation_mark = 0; @@ -1100,7 +1134,6 @@ { struct batadv_priv *bat_priv = netdev_priv(soft_iface); struct batadv_hard_iface *hard_iface; - struct batadv_softif_vlan *vlan; list_for_each_entry(hard_iface, &batadv_hardif_list, list) { if (hard_iface->soft_iface == soft_iface) @@ -1108,11 +1141,7 @@ } /* destroy the "untagged" VLAN */ - vlan = batadv_softif_vlan_get(bat_priv, BATADV_NO_FLAGS); - if (vlan) { - batadv_softif_destroy_vlan(bat_priv, vlan); - batadv_softif_vlan_put(vlan); - } + batadv_softif_destroy_vlan_own(bat_priv, BATADV_NO_FLAGS); unregister_netdevice_queue(soft_iface, head); } diff -ruw linux-6.13.12/net/batman-adv/soft-interface.h linux-6.13.12-fbx/net/batman-adv/soft-interface.h --- linux-6.13.12/net/batman-adv/soft-interface.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/soft-interface.h 2025-09-25 17:40:37.667377640 +0200 @@ -21,10 +21,14 @@ struct batadv_orig_node *orig_node); bool batadv_softif_is_valid(const struct net_device *net_dev); extern struct rtnl_link_ops batadv_link_ops; -int batadv_softif_create_vlan(struct batadv_priv *bat_priv, unsigned short vid); +int batadv_softif_create_vlan_own(struct batadv_priv *bat_priv, + unsigned short vid); void batadv_softif_vlan_release(struct kref *ref); struct batadv_softif_vlan *batadv_softif_vlan_get(struct batadv_priv *bat_priv, unsigned short vid); +struct batadv_softif_vlan * +batadv_softif_vlan_get_or_create(struct batadv_priv *bat_priv, + unsigned short vid); /** * batadv_softif_vlan_put() - decrease the vlan object refcounter and diff -ruw linux-6.13.12/net/batman-adv/translation-table.c linux-6.13.12-fbx/net/batman-adv/translation-table.c --- linux-6.13.12/net/batman-adv/translation-table.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/translation-table.c 2025-09-25 17:40:37.667377640 +0200 @@ -51,6 +51,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; @@ -168,7 +169,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) { @@ -231,8 +232,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; @@ -423,7 +423,6 @@ struct batadv_tt_change_node *tt_change_node, *entry, *safe; struct batadv_tt_common_entry *common = &tt_local_entry->common; u8 flags = common->flags | event_flags; - bool event_removed = false; bool del_op_requested, del_op_entry; tt_change_node = kmem_cache_alloc(batadv_tt_change_cache, GFP_ATOMIC); @@ -461,28 +460,27 @@ /* this is a second add in the same originator interval. It * means that flags have been changed: update them! */ - if (!del_op_requested && !del_op_entry) + if (del_op_requested == del_op_entry) { entry->change.flags = flags; + goto discard; + } continue; del: list_del(&entry->list); kmem_cache_free(batadv_tt_change_cache, entry); + bat_priv->tt.local_changes--; +discard: kmem_cache_free(batadv_tt_change_cache, tt_change_node); - event_removed = true; goto unlock; } /* track the change in the OGMinterval list */ list_add_tail(&tt_change_node->list, &bat_priv->tt.changes_list); + bat_priv->tt.local_changes++; unlock: spin_unlock_bh(&bat_priv->tt.changes_list_lock); - - if (event_removed) - atomic_dec(&bat_priv->tt.local_changes); - else - atomic_inc(&bat_priv->tt.local_changes); } /** @@ -592,7 +590,7 @@ * * Return: true if the client was successfully added, false otherwise. */ -bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, +int batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, unsigned short vid, int ifindex, u32 mark) { struct batadv_priv *bat_priv = netdev_priv(soft_iface); @@ -605,10 +603,12 @@ 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; bool roamed_back = false; + u16 save_flags; u8 remote_flags; u32 match_mark; + int ret = 0; if (ifindex != BATADV_NULL_IFINDEX) in_dev = dev_get_by_index(net, ifindex); @@ -659,21 +659,22 @@ net_ratelimited_function(batadv_info, soft_iface, "Local translation table size (%i) exceeds maximum packet size (%i); Ignoring new local tt entry: %pM\n", table_size, packet_size_max, addr); + ret = -E2BIG; goto out; } tt_local = kmem_cache_alloc(batadv_tl_cache, GFP_ATOMIC); - if (!tt_local) + if (!tt_local) { + ret = -ENOMEM; goto out; + } /* increase the refcounter of the related vlan */ - vlan = batadv_softif_vlan_get(bat_priv, vid); + vlan = batadv_softif_vlan_get_or_create(bat_priv, vid); if (!vlan) { - net_ratelimited_function(batadv_info, soft_iface, - "adding TT local entry %pM to non-existent VLAN %d\n", - addr, batadv_print_vid(vid)); kmem_cache_free(batadv_tl_cache, tt_local); tt_local = NULL; + ret = -ENOMEM; goto out; } @@ -718,10 +719,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(); @@ -770,7 +778,7 @@ if (remote_flags ^ (tt_local->common.flags & BATADV_TT_REMOTE_MASK)) batadv_tt_local_event(bat_priv, tt_local, BATADV_NO_FLAGS); - ret = true; + ret = 1; out: batadv_hardif_put(in_hardif); dev_put(in_dev); @@ -952,7 +960,7 @@ size_t tt_extra_len = 0; u16 tvlv_len; - tt_diff_entries_num = atomic_read(&bat_priv->tt.local_changes); + tt_diff_entries_num = READ_ONCE(bat_priv->tt.local_changes); tt_diff_len = batadv_tt_len(tt_diff_entries_num); /* if we have too many changes for one packet don't send any @@ -979,7 +987,7 @@ goto container_register; spin_lock_bh(&bat_priv->tt.changes_list_lock); - atomic_set(&bat_priv->tt.local_changes, 0); + bat_priv->tt.local_changes = 0; list_for_each_entry_safe(entry, safe, &bat_priv->tt.changes_list, list) { @@ -1224,6 +1232,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) @@ -1231,6 +1240,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 @@ -1301,6 +1320,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"); } @@ -1395,7 +1421,7 @@ kmem_cache_free(batadv_tt_change_cache, entry); } - atomic_set(&bat_priv->tt.local_changes, 0); + bat_priv->tt.local_changes = 0; spin_unlock_bh(&bat_priv->tt.changes_list_lock); } @@ -1567,7 +1593,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; @@ -1683,6 +1709,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), @@ -1696,12 +1724,16 @@ if (is_multicast_ether_addr(tt_addr)) goto out; + if (!remove) + goto out_clear_roam; + /* remove address from local hash if present */ local_flags = batadv_tt_local_remove(bat_priv, tt_addr, vid, "global tt received", flags & BATADV_TT_CLIENT_ROAM); tt_global_entry->common.flags |= local_flags & BATADV_TT_CLIENT_WIFI; +out_clear_roam: if (!(flags & BATADV_TT_CLIENT_ROAM)) /* this is a normal global add. Therefore the client is not in a * roaming state anymore. @@ -2138,7 +2170,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); @@ -2149,6 +2181,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); } @@ -3656,7 +3690,7 @@ { lockdep_assert_held(&bat_priv->tt.commit_lock); - if (atomic_read(&bat_priv->tt.local_changes) < 1) { + if (READ_ONCE(bat_priv->tt.local_changes) < 1) { if (!batadv_atomic_dec_not_zero(&bat_priv->tt.ogm_append_cnt)) batadv_tt_tvlv_container_update(bat_priv); return; @@ -3999,7 +4033,8 @@ u16 tvlv_value_len) { struct batadv_tvlv_tt_data *tt_data; - u16 tt_vlan_len, tt_num_entries; + size_t tt_vlan_len; + u16 tt_num_entries; char tt_flag; bool ret; diff -ruw linux-6.13.12/net/batman-adv/translation-table.h linux-6.13.12-fbx/net/batman-adv/translation-table.h --- linux-6.13.12/net/batman-adv/translation-table.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/translation-table.h 2025-09-25 17:40:37.667377640 +0200 @@ -16,11 +16,15 @@ #include int batadv_tt_init(struct batadv_priv *bat_priv); -bool batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, +int batadv_tt_local_add(struct net_device *soft_iface, const u8 *addr, unsigned short vid, int ifindex, u32 mark); 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.13.12/net/batman-adv/types.h linux-6.13.12-fbx/net/batman-adv/types.h --- linux-6.13.12/net/batman-adv/types.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/batman-adv/types.h 2025-09-25 17:40:37.671377659 +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 }; /** @@ -598,6 +615,74 @@ unsigned long last_unicast_tx; }; +#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 */ @@ -629,6 +714,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 }; /** @@ -705,6 +799,9 @@ /** @last_seqno: last sequence number known for this neighbor */ u32 last_seqno; + + /** @half_duplex: throughput should suffer half duplex penalty */ + bool half_duplex; }; /** @@ -1019,7 +1116,7 @@ atomic_t ogm_append_cnt; /** @local_changes: changes registered in an originator interval */ - atomic_t local_changes; + size_t local_changes; /** * @changes_list: tracks tt local changes within an originator interval @@ -1811,6 +1908,42 @@ /** @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; + /* @stp_guard_stop */ + unsigned long stp_guard_stop; +#endif +#endif }; #ifdef CONFIG_BATMAN_ADV_BLA diff -ruw linux-6.13.12/net/bridge/Kconfig linux-6.13.12-fbx/net/bridge/Kconfig --- linux-6.13.12/net/bridge/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/bridge/Kconfig 2025-09-25 17:40:37.687377739 +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.13.12/net/bridge/br_device.c linux-6.13.12-fbx/net/bridge/br_device.c --- linux-6.13.12/net/bridge/br_device.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/bridge/br_device.c 2025-09-25 17:40:37.687377739 +0200 @@ -204,6 +204,7 @@ struct net_bridge *br = netdev_priv(dev); WRITE_ONCE(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.13.12/net/bridge/br_fdb.c linux-6.13.12-fbx/net/bridge/br_fdb.c --- linux-6.13.12/net/bridge/br_fdb.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/bridge/br_fdb.c 2025-09-25 17:40:37.687377739 +0200 @@ -880,6 +880,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) { @@ -1026,6 +1041,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.13.12/net/bridge/br_if.c linux-6.13.12-fbx/net/bridge/br_if.c --- linux-6.13.12/net/bridge/br_if.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/bridge/br_if.c 2025-09-25 17:40:37.687377739 +0200 @@ -501,13 +501,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.13.12/net/bridge/br_private.h linux-6.13.12-fbx/net/bridge/br_private.h --- linux-6.13.12/net/bridge/br_private.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/bridge/br_private.h 2025-09-25 17:40:37.691377759 +0200 @@ -577,6 +577,7 @@ #if IS_ENABLED(CONFIG_BRIDGE_CFM) struct hlist_head mep_list; #endif + unsigned int forced_mtu; }; struct br_input_skb_cb { @@ -634,8 +635,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) @@ -848,6 +855,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.13.12/net/core/dev.c linux-6.13.12-fbx/net/core/dev.c --- linux-6.13.12/net/core/dev.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/dev.c 2025-09-25 17:40:37.707377838 +0200 @@ -172,6 +172,10 @@ struct net_device *dev, struct netlink_ext_ack *extack); +#ifdef CONFIG_NETRXTHREAD +struct krxd gkrxd[CONFIG_NETRXTHREAD_RX_QUEUE]; +#endif + static DEFINE_MUTEX(ifalias_mutex); /* protects napi_hash addition/deletion and napi_gen_id */ @@ -5274,6 +5278,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 @@ -5527,28 +5548,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(net_hotdata.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: @@ -5707,7 +5816,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) @@ -5738,10 +5849,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; } @@ -8793,8 +8910,10 @@ WRITE_ONCE(dev->promiscuity, promiscuity); if (flags != old_flags) { WRITE_ONCE(dev->flags, 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, @@ -8864,8 +8983,10 @@ WRITE_ONCE(dev->allmulti, allmulti); if (flags != old_flags) { WRITE_ONCE(dev->flags, 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) @@ -12335,6 +12456,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.13.12/net/core/neighbour.c linux-6.13.12-fbx/net/core/neighbour.c --- linux-6.13.12/net/core/neighbour.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/neighbour.c 2025-09-25 17:40:37.715377878 +0200 @@ -54,7 +54,8 @@ u32 pid); static void neigh_update_notify(struct neighbour *neigh, u32 nlmsg_pid); static int pneigh_ifdown_and_unlock(struct neigh_table *tbl, - struct net_device *dev); + struct net_device *dev, + bool skip_perm); #ifdef CONFIG_PROC_FS static const struct seq_operations neigh_stat_seq_ops; @@ -423,7 +424,7 @@ { write_lock_bh(&tbl->lock); neigh_flush_dev(tbl, dev, skip_perm); - pneigh_ifdown_and_unlock(tbl, dev); + pneigh_ifdown_and_unlock(tbl, dev, skip_perm); pneigh_queue_purge(&tbl->proxy_queue, dev ? dev_net(dev) : NULL, tbl->family); if (skb_queue_empty_lockless(&tbl->proxy_queue)) @@ -803,7 +804,8 @@ } static int pneigh_ifdown_and_unlock(struct neigh_table *tbl, - struct net_device *dev) + struct net_device *dev, + bool skip_perm) { struct pneigh_entry *n, **np, *freelist = NULL; u32 h; @@ -811,12 +813,15 @@ for (h = 0; h <= PNEIGH_HASHMASK; h++) { np = &tbl->phash_buckets[h]; while ((n = *np) != NULL) { + if (skip_perm && n->state & NUD_PERMANENT) + goto skip; if (!dev || n->dev == dev) { *np = n->next; n->next = freelist; freelist = n; continue; } +skip: np = &n->next; } } @@ -1979,6 +1984,7 @@ if (tb[NDA_PROTOCOL]) protocol = nla_get_u8(tb[NDA_PROTOCOL]); if (ndm_flags & NTF_PROXY) { + u8 state = ndm->ndm_state & NUD_PERMANENT; struct pneigh_entry *pn; if (ndm_flags & NTF_MANAGED) { @@ -1990,6 +1996,7 @@ pn = pneigh_lookup(tbl, net, dst, dev, 1); if (pn) { pn->flags = ndm_flags; + pn->state = state; if (protocol) pn->protocol = protocol; err = 0; diff -ruw linux-6.13.12/net/core/net-procfs.c linux-6.13.12-fbx/net/core/net-procfs.c --- linux-6.13.12/net/core/net-procfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/net-procfs.c 2025-09-25 17:40:37.715377878 +0200 @@ -168,6 +168,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; @@ -288,6 +371,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; @@ -301,9 +463,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.13.12/net/core/net-sysfs.c linux-6.13.12-fbx/net/core/net-sysfs.c --- linux-6.13.12/net/core/net-sysfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/net-sysfs.c 2025-09-25 17:40:37.715377878 +0200 @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -769,7 +770,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.13.12/net/core/of_net.c linux-6.13.12-fbx/net/core/of_net.c --- linux-6.13.12/net/core/of_net.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/of_net.c 2025-09-25 17:40:37.715377878 +0200 @@ -13,6 +13,7 @@ #include #include #include +#include /** * of_get_phy_mode - Get phy mode for given device_node @@ -97,6 +98,30 @@ } 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; + const void *mac; + + pp = of_find_property(np, "fbxserial-mac-address", NULL); + if (!pp || pp->length != 4) + return -ENODEV; + + mac = fbxserialinfo_get_mac_addr(be32_to_cpu(*(u32*)pp->value)); + if (IS_ERR(mac)) + return PTR_ERR(mac); + memcpy(addr, mac, ETH_ALEN); + + if (of_property_present(np, "fbxserial-mac-address-set-lla")) + addr[0] |= 0x02; + + return 0; +#else + return -ENOSYS; +#endif +} + /** * of_get_mac_address() * @np: Caller's Device Node @@ -126,10 +151,17 @@ int of_get_mac_address(struct device_node *np, u8 *addr) { int ret; + bool need_defer = false; if (!np) return -ENODEV; + ret = of_get_mac_addr_from_fbxserial(np, addr); + if (!ret) + return 0; + if (ret == -EPROBE_DEFER) + need_defer = true; + ret = of_get_mac_addr(np, "mac-address", addr); if (!ret) return 0; @@ -142,7 +174,13 @@ if (!ret) return 0; - return of_get_mac_address_nvmem(np, addr); + ret = of_get_mac_address_nvmem(np, addr); + if (!ret) + return 0; + + if (need_defer) + return -EPROBE_DEFER; + return ret; } EXPORT_SYMBOL(of_get_mac_address); diff -ruw linux-6.13.12/net/core/page_pool.c linux-6.13.12-fbx/net/core/page_pool.c --- linux-6.13.12/net/core/page_pool.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/page_pool.c 2025-09-25 17:40:37.715377878 +0200 @@ -627,6 +627,7 @@ { netmem_set_pp(netmem, pool); netmem_or_pp_magic(netmem, PP_SIGNATURE); + page_pool_clear_recycle_flag(netmem_to_page(netmem)); /* Ensuring all pages have been split into one fragment initially: * page_pool_set_pp_info() is only called once for every page when it diff -ruw linux-6.13.12/net/core/skbuff.c linux-6.13.12-fbx/net/core/skbuff.c --- linux-6.13.12/net/core/skbuff.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/skbuff.c 2025-09-25 17:40:37.723377917 +0200 @@ -293,6 +293,17 @@ .bh_lock = INIT_LOCAL_LOCK(bh_lock), }; +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 @@ -1048,6 +1059,10 @@ { 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 napi_pp_put_page(page_to_netmem(virt_to_page(data))); } @@ -1545,6 +1560,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); @@ -6127,12 +6147,16 @@ skb->offload_fwd_mark = 0; skb->offload_l3_fwd_mark = 0; #endif + skb->mark = 0; ipvs_reset(skb); +#ifdef CONFIG_IP_FFN + skb->ffn_state = FFN_STATE_INIT; + skb->ffn_ff_done = 0; +#endif if (!xnet) return; - skb->mark = 0; skb_clear_tstamp(skb); } EXPORT_SYMBOL_GPL(skb_scrub_packet); diff -ruw linux-6.13.12/net/core/sock.c linux-6.13.12-fbx/net/core/sock.c --- linux-6.13.12/net/core/sock.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/core/sock.c 2025-09-25 17:40:37.723377917 +0200 @@ -1623,6 +1623,21 @@ break; } + case SO_TXREHASH: + if (val < -1 || val > 1) { + ret = -EINVAL; + break; + } + if ((u8)val == SOCK_TXREHASH_DEFAULT) + val = READ_ONCE(sock_net(sk)->core.sysctl_txrehash); + /* Paired with READ_ONCE() in tcp_rtx_synack() */ + 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; @@ -2041,6 +2056,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.13.12/net/dsa/Kconfig linux-6.13.12-fbx/net/dsa/Kconfig --- linux-6.13.12/net/dsa/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/dsa/Kconfig 2025-09-25 17:40:37.739377997 +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.13.12/net/ethernet/eth.c linux-6.13.12-fbx/net/ethernet/eth.c --- linux-6.13.12/net/ethernet/eth.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ethernet/eth.c 2025-09-25 17:40:37.739377997 +0200 @@ -62,6 +62,7 @@ #include #include #include +#include /** * eth_header - create the Ethernet header @@ -597,6 +598,28 @@ */ 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 (IS_ERR(res) && PTR_ERR(res) == -EPROBE_DEFER) + return -EPROBE_DEFER; + + if (res) { + if (fwnode_property_present( + fwnode, "fbxserial-mac-address-set-lla")) + addr[0] |= 0x02; + + 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.13.12/net/ethtool/common.c linux-6.13.12-fbx/net/ethtool/common.c --- linux-6.13.12/net/ethtool/common.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ethtool/common.c 2025-09-25 17:40:37.739377997 +0200 @@ -210,6 +210,12 @@ __DEFINE_LINK_MODE_NAME(10, T1S, Half), __DEFINE_LINK_MODE_NAME(10, T1S_P2MP, Half), __DEFINE_LINK_MODE_NAME(10, T1BRR, Full), + __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_VR8 8 #define __LINK_MODE_LANES_DR8_2 8 #define __LINK_MODE_LANES_T1BRR 1 +#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)] = { \ @@ -375,6 +385,18 @@ __DEFINE_LINK_MODE_PARAMS(10, T1S, Half), __DEFINE_LINK_MODE_PARAMS(10, T1S_P2MP, Half), __DEFINE_LINK_MODE_PARAMS(10, T1BRR, Full), + __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.13.12/net/ethtool/ioctl.c linux-6.13.12-fbx/net/ethtool/ioctl.c --- linux-6.13.12/net/ethtool/ioctl.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ethtool/ioctl.c 2025-09-25 17:40:37.743378016 +0200 @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -183,6 +184,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 @@ -212,7 +216,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++) { + strscpy(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); } @@ -1801,6 +1814,127 @@ return ret; } +struct ethtool_eee_usettings { + struct ethtool_eee_linkmode base; + struct { + __u32 supported[__ETHTOOL_LINK_MODE_MASK_NU32]; + __u32 advertised[__ETHTOOL_LINK_MODE_MASK_NU32]; + __u32 lp_advertised[__ETHTOOL_LINK_MODE_MASK_NU32]; + } link_modes; +}; + +/* convert ethtool_eee_usettings in user space to a kernel internal + * ethtool_keee. return 0 on success, errno on error. + */ +static int load_keee_from_user_linkmode(struct ethtool_keee *keee, + const void __user *from) +{ + struct ethtool_eee_usettings eee_usettings; + struct ethtool_eee_linkmode *base; + + if (copy_from_user(&eee_usettings, from, sizeof(eee_usettings))) + return -EFAULT; + + /* expect userland to get this value from a previous + * ETHTOOL_GLINKSETTINGS call */ + if (__ETHTOOL_LINK_MODE_MASK_NU32 + != eee_usettings.base.link_mode_masks_nwords) + return -EINVAL; + + memset(keee, 0, sizeof(*keee)); + base = &eee_usettings.base; + keee->eee_enabled = base->eee_enabled; + keee->tx_lpi_enabled = base->tx_lpi_enabled; + keee->tx_lpi_timer = base->tx_lpi_timer; + + bitmap_from_arr32(keee->supported, + eee_usettings.link_modes.supported, + __ETHTOOL_LINK_MODE_MASK_NBITS); + bitmap_from_arr32(keee->advertised, + eee_usettings.link_modes.advertised, + __ETHTOOL_LINK_MODE_MASK_NBITS); + bitmap_from_arr32(keee->lp_advertised, + eee_usettings.link_modes.lp_advertised, + __ETHTOOL_LINK_MODE_MASK_NBITS); + + return 0; +} + +/* convert a kernel internal ethtool_eee_ksettings to + * ethtool_eee_linkmode in user space. return 0 on success, errno on + * error. + */ +static int +store_link_keee_for_user(void __user *to, + const struct ethtool_keee *keee) +{ + struct ethtool_eee_usettings eee_usettings; + struct ethtool_eee_linkmode *base; + + memset(&eee_usettings, 0, sizeof(eee_usettings)); + base = &eee_usettings.base; + base->eee_active = keee->eee_active; + base->eee_enabled = keee->eee_enabled; + base->tx_lpi_enabled = keee->tx_lpi_enabled; + base->tx_lpi_timer = keee->tx_lpi_timer; + base->link_mode_masks_nwords = __ETHTOOL_LINK_MODE_MASK_NU32; + + bitmap_to_arr32(eee_usettings.link_modes.supported, + keee->supported, + __ETHTOOL_LINK_MODE_MASK_NBITS); + bitmap_to_arr32(eee_usettings.link_modes.advertised, + keee->advertised, + __ETHTOOL_LINK_MODE_MASK_NBITS); + bitmap_to_arr32(eee_usettings.link_modes.lp_advertised, + keee->lp_advertised, + __ETHTOOL_LINK_MODE_MASK_NBITS); + + if (copy_to_user(to, &eee_usettings, sizeof(eee_usettings))) + return -EFAULT; + + return 0; +} + +static int ethtool_get_eee_linkmode(struct net_device *dev, + char __user *useraddr) +{ + struct ethtool_keee keee; + int rc; + + if (!dev->ethtool_ops->get_eee) + return -EOPNOTSUPP; + + memset(&keee, 0, sizeof(keee)); + rc = dev->ethtool_ops->get_eee(dev, &keee); + if (rc) + return rc; + + rc = store_link_keee_for_user(useraddr, &keee); + if (rc) + return rc; + + return 0; +} + +static int ethtool_set_eee_linkmode(struct net_device *dev, + char __user *useraddr) +{ + struct ethtool_keee keee; + int ret; + + if (!dev->ethtool_ops->set_eee) + return -EOPNOTSUPP; + + ret = load_keee_from_user_linkmode(&keee, useraddr); + if (ret) + return ret; + + ret = dev->ethtool_ops->set_eee(dev, &keee); + if (!ret) + ethtool_notify(dev, ETHTOOL_MSG_EEE_NTF, NULL); + return ret; +} + static int ethtool_nway_reset(struct net_device *dev) { if (!dev->ethtool_ops->nway_reset) @@ -2943,6 +3077,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; @@ -3069,6 +3204,187 @@ 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); + strscpy(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 + +static int ethtool_get_prbs_params(struct net_device *dev, void __user *uaddr) +{ + struct ethtool_prbs_param prbs = { .cmd = ETHTOOL_GPRBS_PARAM }; + int ret; + + if (!dev->ethtool_ops->get_prbs_param) + return -EOPNOTSUPP; + + ret = dev->ethtool_ops->get_prbs_param(dev, &prbs); + if (ret) + return ret; + + if (copy_to_user(uaddr, &prbs, sizeof(prbs))) + return -EFAULT; + + return 0; +} + +static int ethtool_set_prbs_params(struct net_device *dev, void __user *uaddr) +{ + struct ethtool_prbs_param prbs; + + if (!dev->ethtool_ops->set_prbs_param) + return -EOPNOTSUPP; + + if (copy_from_user(&prbs, uaddr, sizeof(prbs))) + return -EFAULT; + + return dev->ethtool_ops->set_prbs_param(dev, &prbs); +} + /* The main entry point in this file. Called from net/core/dev_ioctl.c */ static int @@ -3355,6 +3671,45 @@ 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; + case ETHTOOL_GEEE_LINKMODE: + rc = ethtool_get_eee_linkmode(dev, useraddr); + break; + case ETHTOOL_SEEE_LINKMODE: + rc = ethtool_set_eee_linkmode(dev, useraddr); + break; + case ETHTOOL_GPRBS_PARAM: + rc = ethtool_get_prbs_params(dev, useraddr); + break; + case ETHTOOL_SPRBS_PARAM: + rc = ethtool_set_prbs_params(dev, useraddr); + break; default: rc = -EOPNOTSUPP; } diff -ruw linux-6.13.12/net/ipv4/Makefile linux-6.13.12-fbx/net/ipv4/Makefile --- linux-6.13.12/net/ipv4/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/Makefile 2025-09-25 17:40:37.755378076 +0200 @@ -18,6 +18,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.13.12/net/ipv4/ip_input.c linux-6.13.12-fbx/net/ipv4/ip_input.c --- linux-6.13.12/net/ipv4/ip_input.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/ip_input.c 2025-09-25 17:40:37.763378116 +0200 @@ -224,8 +224,13 @@ } } -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); +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)); @@ -564,6 +569,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.13.12/net/ipv4/ip_output.c linux-6.13.12-fbx/net/ipv4/ip_output.c --- linux-6.13.12/net/ipv4/ip_output.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/ip_output.c 2025-09-25 17:40:37.763378116 +0200 @@ -226,6 +226,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)) { @@ -431,6 +436,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, @@ -1683,4 +1693,7 @@ #if defined(CONFIG_IP_MULTICAST) igmp_mc_init(); #endif +#ifdef CONFIG_IP_FFN + ip_ffn_init(); +#endif } diff -ruw linux-6.13.12/net/ipv4/ip_tunnel_core.c linux-6.13.12-fbx/net/ipv4/ip_tunnel_core.c --- linux-6.13.12/net/ipv4/ip_tunnel_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/ip_tunnel_core.c 2025-09-25 17:40:37.767378135 +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.13.12/net/ipv4/ipconfig.c linux-6.13.12-fbx/net/ipv4/ipconfig.c --- linux-6.13.12/net/ipv4/ipconfig.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/ipconfig.c 2025-09-25 17:40:37.767378135 +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; } @@ -732,8 +783,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; @@ -1451,7 +1504,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.13.12/net/ipv4/netfilter/Kconfig linux-6.13.12-fbx/net/ipv4/netfilter/Kconfig --- linux-6.13.12/net/ipv4/netfilter/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/netfilter/Kconfig 2025-09-25 17:40:37.767378135 +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.13.12/net/ipv4/netfilter/ip_tables.c linux-6.13.12-fbx/net/ipv4/netfilter/ip_tables.c --- linux-6.13.12/net/ipv4/netfilter/ip_tables.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/netfilter/ip_tables.c 2025-09-25 17:40:37.767378135 +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) { @@ -1142,6 +1144,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.13.12/net/ipv4/tcp.c linux-6.13.12-fbx/net/ipv4/tcp.c --- linux-6.13.12/net/ipv4/tcp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/tcp.c 2025-09-25 17:40:37.771378155 +0200 @@ -3829,6 +3829,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; @@ -4434,6 +4441,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.13.12/net/ipv4/tcp_timer.c linux-6.13.12-fbx/net/ipv4/tcp_timer.c --- linux-6.13.12/net/ipv4/tcp_timer.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/tcp_timer.c 2025-09-25 17:40:37.779378195 +0200 @@ -666,6 +666,9 @@ icsk->icsk_rto = clamp(__tcp_set_rto(tp), tcp_rto_min(sk), 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 if (sk->sk_state != TCP_SYN_SENT || tp->total_rto > READ_ONCE(net->ipv4.sysctl_tcp_syn_linear_timeouts)) { diff -ruw linux-6.13.12/net/ipv4/udp.c linux-6.13.12-fbx/net/ipv4/udp.c --- linux-6.13.12/net/ipv4/udp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv4/udp.c 2025-09-25 17:40:37.783378215 +0200 @@ -318,6 +318,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)) { @@ -2563,6 +2606,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, @@ -2696,8 +2823,15 @@ saddr, daddr, udptable, proto); sk = __udp4_lib_lookup_skb(skb, uh->source, uh->dest, udptable); - if (sk) + 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); + } no_sk: if (!xfrm4_policy_check(NULL, XFRM_POLICY_IN, skb)) goto drop; diff -ruw linux-6.13.12/net/ipv6/Makefile linux-6.13.12-fbx/net/ipv6/Makefile --- linux-6.13.12/net/ipv6/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/Makefile 2025-09-25 17:40:37.783378215 +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.13.12/net/ipv6/addrconf.c linux-6.13.12-fbx/net/ipv6/addrconf.c --- linux-6.13.12/net/ipv6/addrconf.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/addrconf.c 2025-09-25 17:40:37.787378235 +0200 @@ -2371,12 +2371,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: @@ -3484,6 +3499,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.13.12/net/ipv6/af_inet6.c linux-6.13.12-fbx/net/ipv6/af_inet6.c --- linux-6.13.12/net/ipv6/af_inet6.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/af_inet6.c 2025-09-25 17:40:37.787378235 +0200 @@ -1190,6 +1190,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.13.12/net/ipv6/ip6_input.c linux-6.13.12-fbx/net/ipv6/ip6_input.c --- linux-6.13.12/net/ipv6/ip6_input.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/ip6_input.c 2025-09-25 17:40:37.795378274 +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); @@ -474,8 +480,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.13.12/net/ipv6/ip6_output.c linux-6.13.12-fbx/net/ipv6/ip6_output.c --- linux-6.13.12/net/ipv6/ip6_output.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/ip6_output.c 2025-09-25 17:40:37.795378274 +0200 @@ -52,6 +52,7 @@ #include #include #include +#include #include #include #include @@ -123,6 +124,11 @@ IP6_UPD_PO_STATS(net, idev, IPSTATS_MIB_OUT, skb->len); +#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(dst_rt6_info(dst), daddr); neigh = __ipv6_neigh_lookup_noref(dev, nexthop); @@ -244,6 +250,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, @@ -665,6 +676,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.13.12/net/ipv6/ip6_tunnel.c linux-6.13.12-fbx/net/ipv6/ip6_tunnel.c --- linux-6.13.12/net/ipv6/ip6_tunnel.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/ip6_tunnel.c 2025-09-25 17:40:37.795378274 +0200 @@ -68,9 +68,9 @@ module_param(log_ecn_error, bool, 0644); MODULE_PARM_DESC(log_ecn_error, "Log packets received with corrupted ECN"); -static u32 HASH(const struct in6_addr *addr1, const struct in6_addr *addr2) +static u32 HASH(const struct in6_addr *addr) { - u32 hash = ipv6_addr_hash(addr1) ^ ipv6_addr_hash(addr2); + u32 hash = ipv6_addr_hash(addr); return hash_32(hash, IP6_TUNNEL_HASH_SIZE_SHIFT); } @@ -115,17 +115,26 @@ ip6_tnl_lookup(struct net *net, int link, const struct in6_addr *remote, const struct in6_addr *local) { - unsigned int hash = HASH(remote, local); + unsigned int hash = HASH(local); struct ip6_tnl *t, *cand = NULL; struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); struct in6_addr any; + struct __ip6_tnl_fmr *fmr; for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) { if (!ipv6_addr_equal(local, &t->parms.laddr) || - !ipv6_addr_equal(remote, &t->parms.raddr) || !(t->dev->flags & IFF_UP)) continue; + if (!ipv6_addr_equal(remote, &t->parms.raddr)) { + for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { + if (ipv6_prefix_equal(remote, &fmr->ip6_prefix, + fmr->ip6_prefix_len)) + return t; + } + continue ; + } + if (link == t->parms.link) return t; else @@ -133,7 +142,7 @@ } memset(&any, 0, sizeof(any)); - hash = HASH(&any, local); + hash = HASH(local); for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) { if (!ipv6_addr_equal(local, &t->parms.laddr) || !ipv6_addr_any(&t->parms.raddr) || @@ -146,7 +155,7 @@ cand = t; } - hash = HASH(remote, &any); + hash = HASH(&any); for_each_ip6_tunnel_rcu(ip6n->tnls_r_l[hash]) { if (!ipv6_addr_equal(remote, &t->parms.raddr) || !ipv6_addr_any(&t->parms.laddr) || @@ -195,7 +204,7 @@ if (!ipv6_addr_any(remote) || !ipv6_addr_any(local)) { prio = 1; - h = HASH(remote, local); + h = HASH(local); } return &ip6n->tnls[prio][h]; } @@ -376,6 +385,12 @@ struct net *net = t->net; struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); + while (t->parms.fmrs) { + struct __ip6_tnl_fmr *next = t->parms.fmrs->next; + kfree(t->parms.fmrs); + t->parms.fmrs = next; + } + if (dev == ip6n->fb_tnl_dev) RCU_INIT_POINTER(ip6n->tnls_wc[0], NULL); else @@ -790,6 +805,107 @@ } EXPORT_SYMBOL_GPL(ip6_tnl_rcv_ctl); +/** + * ip4ip6_fmr_calc - calculate target / source IPv6-address based on FMR + * @dest: destination IPv6 address buffer + * @skb: received socket buffer + * @fmr: MAP FMR + * @xmit: Calculate for xmit or rcv + **/ +static void ip4ip6_fmr_calc(struct in6_addr *dest, + const struct iphdr *iph, const uint8_t *end, + const struct __ip6_tnl_fmr *fmr, bool xmit) +{ + int psidlen = fmr->ea_len - (32 - fmr->ip4_prefix_len); + u8 *portp = NULL; + bool use_dest_addr; + const struct iphdr *dsth = iph; + + if ((u8*)dsth >= end) + return; + + /* find significant IP header */ + if (iph->protocol == IPPROTO_ICMP) { + struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); + if (ih && ((u8*)&ih[1]) <= end && ( + ih->type == ICMP_DEST_UNREACH || + ih->type == ICMP_SOURCE_QUENCH || + ih->type == ICMP_TIME_EXCEEDED || + ih->type == ICMP_PARAMETERPROB || + ih->type == ICMP_REDIRECT)) + dsth = (const struct iphdr*)&ih[1]; + } + + /* in xmit-path use dest port by default and source port only if + this is an ICMP reply to something else; vice versa in rcv-path */ + use_dest_addr = (xmit && dsth == iph) || (!xmit && dsth != iph); + + /* get dst port */ + if (((u8*)&dsth[1]) <= end && ( + dsth->protocol == IPPROTO_UDP || + dsth->protocol == IPPROTO_TCP || + dsth->protocol == IPPROTO_SCTP || + dsth->protocol == IPPROTO_DCCP)) { + /* for UDP, TCP, SCTP and DCCP source and dest port + follow IPv4 header directly */ + portp = ((u8*)dsth) + dsth->ihl * 4; + + if (use_dest_addr) + portp += sizeof(u16); + } else if (iph->protocol == IPPROTO_ICMP) { + struct icmphdr *ih = (struct icmphdr*)(((u8*)dsth) + dsth->ihl * 4); + + /* use icmp identifier as port */ + if (((u8*)&ih) <= end && ( + (use_dest_addr && ( + ih->type == ICMP_ECHOREPLY || + ih->type == ICMP_TIMESTAMPREPLY || + ih->type == ICMP_INFO_REPLY || + ih->type == ICMP_ADDRESSREPLY)) || + (!use_dest_addr && ( + ih->type == ICMP_ECHO || + ih->type == ICMP_TIMESTAMP || + ih->type == ICMP_INFO_REQUEST || + ih->type == ICMP_ADDRESS) + ))) + portp = (u8*)&ih->un.echo.id; + } + + if ((portp && &portp[2] <= end) || psidlen == 0) { + int frombyte = fmr->ip6_prefix_len / 8; + int fromrem = fmr->ip6_prefix_len % 8; + int bytes = sizeof(struct in6_addr) - frombyte; + const u32 *addr = (use_dest_addr) ? &iph->daddr : &iph->saddr; + u64 eabits = ((u64)ntohl(*addr)) << (32 + fmr->ip4_prefix_len); + u64 t = 0; + + /* extract PSID from port and add it to eabits */ + u16 psidbits = 0; + if (psidlen > 0) { + psidbits = ((u16)portp[0]) << 8 | ((u16)portp[1]); + psidbits >>= 16 - psidlen - fmr->offset; + psidbits = (u16)(psidbits << (16 - psidlen)); + eabits |= ((u64)psidbits) << (48 - (fmr->ea_len - psidlen)); + } + + /* rewrite destination address */ + *dest = fmr->ip6_prefix; + memcpy(&dest->s6_addr[10], addr, sizeof(*addr)); + dest->s6_addr16[7] = htons(psidbits >> (16 - psidlen)); + + if (bytes > sizeof(u64)) + bytes = sizeof(u64); + + /* insert eabits */ + memcpy(&t, &dest->s6_addr[frombyte], bytes); + t = be64_to_cpu(t) & ~(((((u64)1) << fmr->ea_len) - 1) + << (64 - fmr->ea_len - fromrem)); + t = cpu_to_be64(t | (eabits >> fromrem)); + memcpy(&dest->s6_addr[frombyte], &t, bytes); + } +} + + static int __ip6_tnl_rcv(struct ip6_tnl *tunnel, struct sk_buff *skb, const struct tnl_ptk_info *tpi, struct metadata_dst *tun_dst, @@ -855,6 +971,27 @@ memset(skb->cb, 0, sizeof(struct inet6_skb_parm)); + if (tpi->proto == htons(ETH_P_IP) && + !ipv6_addr_equal(&ipv6h->saddr, &tunnel->parms.raddr)) { + /* Packet didn't come from BR, so lookup FMR */ + struct __ip6_tnl_fmr *fmr; + struct in6_addr expected = tunnel->parms.raddr; + for (fmr = tunnel->parms.fmrs; fmr; fmr = fmr->next) + if (ipv6_prefix_equal(&ipv6h->saddr, + &fmr->ip6_prefix, fmr->ip6_prefix_len)) + break; + + /* Check that IPv6 matches IPv4 source to prevent spoofing */ + if (fmr) + ip4ip6_fmr_calc(&expected, ip_hdr(skb), + skb_tail_pointer(skb), fmr, false); + + if (!ipv6_addr_equal(&ipv6h->saddr, &expected)) { + rcu_read_unlock(); + goto drop; + } + } + __skb_tunnel_rx(skb, tunnel->dev, tunnel->net); err = dscp_ecn_decapsulate(tunnel, ipv6h, skb); @@ -1004,6 +1141,7 @@ opt->ops.opt_nflen = 8; } + /** * ip6_tnl_addr_conflict - compare packet addresses to tunnel's own * @t: the outgoing tunnel device @@ -1257,8 +1395,10 @@ */ max_headroom = LL_RESERVED_SPACE(dst->dev) + sizeof(struct ipv6hdr) + dst->header_len + t->hlen; - if (max_headroom > READ_ONCE(dev->needed_headroom)) - WRITE_ONCE(dev->needed_headroom, max_headroom); + if (max_headroom > READ_ONCE(dev->needed_headroom) + + dev->hard_header_len) + WRITE_ONCE(dev->needed_headroom, + max_headroom - dev->hard_header_len); err = ip6_tnl_encap(skb, t, &proto, fl6); if (err) @@ -1298,6 +1438,7 @@ const struct iphdr *iph; int encap_limit = -1; __u16 offset; + struct __ip6_tnl_fmr *fmr; struct flowi6 fl6; __u8 dsfield, orig_dsfield; __u32 mtu; @@ -1393,6 +1534,18 @@ fl6.flowi6_uid = sock_net_uid(dev_net(dev), NULL); dsfield = INET_ECN_encapsulate(dsfield, orig_dsfield); + /* try to find matching FMR */ + for (fmr = t->parms.fmrs; fmr; fmr = fmr->next) { + unsigned mshift = 32 - fmr->ip4_prefix_len; + if (ntohl(fmr->ip4_prefix.s_addr) >> mshift == + ntohl(ip_hdr(skb)->daddr) >> mshift) + break; + } + + /* change dstaddr according to FMR */ + if (fmr) + ip4ip6_fmr_calc(&fl6.daddr, ip_hdr(skb), skb_tail_pointer(skb), fmr, true); + if (iptunnel_handle_offloads(skb, SKB_GSO_IPXIP6)) return -1; @@ -1546,6 +1699,14 @@ t->parms.link = p->link; t->parms.proto = p->proto; t->parms.fwmark = p->fwmark; + + while (t->parms.fmrs) { + struct __ip6_tnl_fmr *next = t->parms.fmrs->next; + kfree(t->parms.fmrs); + t->parms.fmrs = next; + } + t->parms.fmrs = p->fmrs; + dst_cache_reset(&t->dst_cache); ip6_tnl_link_config(t); } @@ -1580,6 +1741,7 @@ p->flowinfo = u->flowinfo; p->link = u->link; p->proto = u->proto; + p->fmrs = NULL; memcpy(p->name, u->name, sizeof(u->name)); } @@ -1963,13 +2125,22 @@ return 0; } -static void ip6_tnl_netlink_parms(struct nlattr *data[], +static const struct nla_policy ip6_tnl_fmr_policy[IFLA_IPTUN_FMR_MAX + 1] = { + [IFLA_IPTUN_FMR_IP6_PREFIX] = { .len = sizeof(struct in6_addr) }, + [IFLA_IPTUN_FMR_IP4_PREFIX] = { .len = sizeof(struct in_addr) }, + [IFLA_IPTUN_FMR_IP6_PREFIX_LEN] = { .type = NLA_U8 }, + [IFLA_IPTUN_FMR_IP4_PREFIX_LEN] = { .type = NLA_U8 }, + [IFLA_IPTUN_FMR_EA_LEN] = { .type = NLA_U8 }, + [IFLA_IPTUN_FMR_OFFSET] = { .type = NLA_U8 } +}; + +static int ip6_tnl_netlink_parms(struct nlattr *data[], struct __ip6_tnl_parm *parms) { memset(parms, 0, sizeof(*parms)); if (!data) - return; + return 0; if (data[IFLA_IPTUN_LINK]) parms->link = nla_get_u32(data[IFLA_IPTUN_LINK]); @@ -2000,6 +2171,52 @@ if (data[IFLA_IPTUN_FWMARK]) parms->fwmark = nla_get_u32(data[IFLA_IPTUN_FWMARK]); + + if (data[IFLA_IPTUN_FMRS]) { + unsigned rem; + struct nlattr *fmr; + + nla_for_each_nested(fmr, data[IFLA_IPTUN_FMRS], rem) { + struct nlattr *fmrd[IFLA_IPTUN_FMR_MAX + 1], *c; + struct __ip6_tnl_fmr *nfmr; + int err; + + err = nla_parse_nested_deprecated(fmrd, IFLA_IPTUN_FMR_MAX, + fmr, ip6_tnl_fmr_policy, NULL); + if (err) + return err; + + if (!(nfmr = kzalloc(sizeof(*nfmr), GFP_KERNEL))) + return -ENOMEM; + + nfmr->offset = 6; + + if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX])) + nla_memcpy(&nfmr->ip6_prefix, fmrd[IFLA_IPTUN_FMR_IP6_PREFIX], + sizeof(nfmr->ip6_prefix)); + + if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX])) + nla_memcpy(&nfmr->ip4_prefix, fmrd[IFLA_IPTUN_FMR_IP4_PREFIX], + sizeof(nfmr->ip4_prefix)); + + if ((c = fmrd[IFLA_IPTUN_FMR_IP6_PREFIX_LEN])) + nfmr->ip6_prefix_len = nla_get_u8(c); + + if ((c = fmrd[IFLA_IPTUN_FMR_IP4_PREFIX_LEN])) + nfmr->ip4_prefix_len = nla_get_u8(c); + + if ((c = fmrd[IFLA_IPTUN_FMR_EA_LEN])) + nfmr->ea_len = nla_get_u8(c); + + if ((c = fmrd[IFLA_IPTUN_FMR_OFFSET])) + nfmr->offset = nla_get_u8(c); + + nfmr->next = parms->fmrs; + parms->fmrs = nfmr; + } + } + + return 0; } static int ip6_tnl_newlink(struct net *src_net, struct net_device *dev, @@ -2020,7 +2237,9 @@ return err; } - ip6_tnl_netlink_parms(data, &nt->parms); + err = ip6_tnl_netlink_parms(data, &nt->parms); + if (err) + return err; if (nt->parms.collect_md) { if (rtnl_dereference(ip6n->collect_md_tun)) @@ -2047,6 +2266,7 @@ struct net *net = t->net; struct ip6_tnl_net *ip6n = net_generic(net, ip6_tnl_net_id); struct ip_tunnel_encap ipencap; + int err; if (dev == ip6n->fb_tnl_dev) return -EINVAL; @@ -2057,7 +2277,10 @@ if (err < 0) return err; } - ip6_tnl_netlink_parms(data, &p); + err = ip6_tnl_netlink_parms(data, &p); + if (err) + return err; + if (p.collect_md) return -EINVAL; @@ -2083,6 +2306,12 @@ static size_t ip6_tnl_get_size(const struct net_device *dev) { + const struct ip6_tnl *t = netdev_priv(dev); + struct __ip6_tnl_fmr *c; + int fmrs = 0; + for (c = t->parms.fmrs; c; c = c->next) + ++fmrs; + return /* IFLA_IPTUN_LINK */ nla_total_size(4) + @@ -2112,6 +2341,24 @@ nla_total_size(0) + /* IFLA_IPTUN_FWMARK */ nla_total_size(4) + + /* IFLA_IPTUN_FMRS */ + nla_total_size(0) + + ( + /* nest */ + nla_total_size(0) + + /* IFLA_IPTUN_FMR_IP6_PREFIX */ + nla_total_size(sizeof(struct in6_addr)) + + /* IFLA_IPTUN_FMR_IP4_PREFIX */ + nla_total_size(sizeof(struct in_addr)) + + /* IFLA_IPTUN_FMR_EA_LEN */ + nla_total_size(1) + + /* IFLA_IPTUN_FMR_IP6_PREFIX_LEN */ + nla_total_size(1) + + /* IFLA_IPTUN_FMR_IP4_PREFIX_LEN */ + nla_total_size(1) + + /* IFLA_IPTUN_FMR_OFFSET */ + nla_total_size(1) + ) * fmrs + 0; } @@ -2119,6 +2366,9 @@ { struct ip6_tnl *tunnel = netdev_priv(dev); struct __ip6_tnl_parm *parm = &tunnel->parms; + struct __ip6_tnl_fmr *c; + int fmrcnt = 0; + struct nlattr *fmrs; if (nla_put_u32(skb, IFLA_IPTUN_LINK, parm->link) || nla_put_in6_addr(skb, IFLA_IPTUN_LOCAL, &parm->laddr) || @@ -2128,9 +2378,27 @@ nla_put_be32(skb, IFLA_IPTUN_FLOWINFO, parm->flowinfo) || nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) || nla_put_u8(skb, IFLA_IPTUN_PROTO, parm->proto) || - nla_put_u32(skb, IFLA_IPTUN_FWMARK, parm->fwmark)) + nla_put_u32(skb, IFLA_IPTUN_FWMARK, parm->fwmark) || + !(fmrs = nla_nest_start_noflag(skb, IFLA_IPTUN_FMRS))) goto nla_put_failure; + for (c = parm->fmrs; c; c = c->next) { + struct nlattr *fmr = nla_nest_start_noflag(skb, ++fmrcnt); + if (!fmr || + nla_put(skb, IFLA_IPTUN_FMR_IP6_PREFIX, + sizeof(c->ip6_prefix), &c->ip6_prefix) || + nla_put(skb, IFLA_IPTUN_FMR_IP4_PREFIX, + sizeof(c->ip4_prefix), &c->ip4_prefix) || + nla_put_u8(skb, IFLA_IPTUN_FMR_IP6_PREFIX_LEN, c->ip6_prefix_len) || + nla_put_u8(skb, IFLA_IPTUN_FMR_IP4_PREFIX_LEN, c->ip4_prefix_len) || + nla_put_u8(skb, IFLA_IPTUN_FMR_EA_LEN, c->ea_len) || + nla_put_u8(skb, IFLA_IPTUN_FMR_OFFSET, c->offset)) + goto nla_put_failure; + + nla_nest_end(skb, fmr); + } + nla_nest_end(skb, fmrs); + if (nla_put_u16(skb, IFLA_IPTUN_ENCAP_TYPE, tunnel->encap.type) || nla_put_be16(skb, IFLA_IPTUN_ENCAP_SPORT, tunnel->encap.sport) || nla_put_be16(skb, IFLA_IPTUN_ENCAP_DPORT, tunnel->encap.dport) || @@ -2170,6 +2438,7 @@ [IFLA_IPTUN_ENCAP_DPORT] = { .type = NLA_U16 }, [IFLA_IPTUN_COLLECT_METADATA] = { .type = NLA_FLAG }, [IFLA_IPTUN_FWMARK] = { .type = NLA_U32 }, + [IFLA_IPTUN_FMRS] = { .type = NLA_NESTED }, }; static struct rtnl_link_ops ip6_link_ops __read_mostly = { diff -ruw linux-6.13.12/net/ipv6/netfilter/Kconfig linux-6.13.12-fbx/net/ipv6/netfilter/Kconfig --- linux-6.13.12/net/ipv6/netfilter/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/netfilter/Kconfig 2025-09-25 17:40:37.799378294 +0200 @@ -17,6 +17,13 @@ This is not needed if you are using iptables over nftables (iptables-nft). +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.13.12/net/ipv6/netfilter/ip6_tables.c linux-6.13.12-fbx/net/ipv6/netfilter/ip6_tables.c --- linux-6.13.12/net/ipv6/netfilter/ip6_tables.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/netfilter/ip6_tables.c 2025-09-25 17:40:37.799378294 +0200 @@ -1159,6 +1159,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.13.12/net/ipv6/udp.c linux-6.13.12-fbx/net/ipv6/udp.c --- linux-6.13.12/net/ipv6/udp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/ipv6/udp.c 2025-09-25 17:40:37.803378314 +0200 @@ -973,6 +973,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_get_no_check6_rx(sk)) + 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) @@ -1148,6 +1224,12 @@ if (sk) { if (!uh->check && !udp_get_no_check6_rx(sk)) 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); } no_sk: diff -ruw linux-6.13.12/net/mac80211/Kconfig linux-6.13.12-fbx/net/mac80211/Kconfig --- linux-6.13.12/net/mac80211/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/Kconfig 2025-09-25 17:40:37.811378354 +0200 @@ -314,3 +314,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.13.12/net/mac80211/Makefile linux-6.13.12-fbx/net/mac80211/Makefile --- linux-6.13.12/net/mac80211/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/Makefile 2025-09-25 17:40:37.811378354 +0200 @@ -54,6 +54,7 @@ mesh_ps.o mac80211-$(CONFIG_PM) += pm.o +mac80211-$(CONFIG_FBX80211_SCUM) += fbx_scum.o fbx_scum_monif.o CFLAGS_trace.o := -I$(src) diff -ruw linux-6.13.12/net/mac80211/agg-tx.c linux-6.13.12-fbx/net/mac80211/agg-tx.c --- linux-6.13.12/net/mac80211/agg-tx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/agg-tx.c 2025-09-25 17:40:37.811378354 +0200 @@ -130,6 +130,14 @@ } 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) { diff -ruw linux-6.13.12/net/mac80211/cfg.c linux-6.13.12-fbx/net/mac80211/cfg.c --- linux-6.13.12/net/mac80211/cfg.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/cfg.c 2025-09-25 17:40:37.811378354 +0200 @@ -147,8 +147,8 @@ struct ieee80211_bss_conf *link_conf) { struct ieee80211_sub_if_data *tx_sdata; + struct ieee80211_bss_conf *old; - sdata->vif.mbssid_tx_vif = NULL; link_conf->bssid_index = 0; link_conf->nontransmitted = false; link_conf->ema_ap = false; @@ -157,14 +157,27 @@ if (sdata->vif.type != NL80211_IFTYPE_AP || !params->tx_wdev) return -EINVAL; + old = sdata_dereference(link_conf->tx_bss_conf, sdata); + if (old) + return -EALREADY; + tx_sdata = IEEE80211_WDEV_TO_SUB_IF(params->tx_wdev); if (!tx_sdata) return -EINVAL; if (tx_sdata == sdata) { - sdata->vif.mbssid_tx_vif = &sdata->vif; + rcu_assign_pointer(link_conf->tx_bss_conf, link_conf); } else { - sdata->vif.mbssid_tx_vif = &tx_sdata->vif; + struct ieee80211_bss_conf *tx_bss_conf; + + tx_bss_conf = + sdata_dereference(tx_sdata->vif.link_conf[params->tx_link_id], + sdata); + if (rcu_access_pointer(tx_bss_conf->tx_bss_conf) != tx_bss_conf) + return -EINVAL; + + rcu_assign_pointer(link_conf->tx_bss_conf, tx_bss_conf); + link_conf->nontransmitted = true; link_conf->bssid_index = params->index; } @@ -503,6 +516,9 @@ if (IS_ERR(link)) return PTR_ERR(link); + if (WARN_ON(pairwise && link_id >= 0)) + return -EINVAL; + if (pairwise && params->mode == NL80211_KEY_SET_TX) return ieee80211_set_tx(sdata, mac_addr, key_idx); @@ -525,10 +541,12 @@ if (IS_ERR(key)) return PTR_ERR(key); - key->conf.link_id = link_id; - - if (pairwise) + if (pairwise) { key->conf.flags |= IEEE80211_KEY_FLAG_PAIRWISE; + key->conf.link_id = -1; + } else { + key->conf.link_id = link->link_id; + } if (params->mode == NL80211_KEY_NO_TX) key->conf.flags |= IEEE80211_KEY_FLAG_NO_AUTO_TX; @@ -1405,6 +1423,8 @@ (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); + link_conf->enable_mcs15 = !(u8_get_bits(params->eht_oper->params, + IEEE80211_EHT_OPER_MCS15_DISABLE)); } else { link_conf->eht_su_beamformer = false; link_conf->eht_su_beamformee = false; @@ -1665,13 +1685,12 @@ kfree(link_conf->ftmr_params); link_conf->ftmr_params = NULL; - sdata->vif.mbssid_tx_vif = NULL; link_conf->bssid_index = 0; link_conf->nontransmitted = false; link_conf->ema_ap = false; link_conf->bssid_indicator = 0; - __sta_info_flush(sdata, true, link_id); + __sta_info_flush(sdata, true, link_id, NULL); ieee80211_remove_link_keys(link, &keys); if (!list_empty(&keys)) { @@ -1679,6 +1698,9 @@ ieee80211_free_key_list(local, &keys); } + ieee80211_stop_mbssid(sdata); + RCU_INIT_POINTER(link_conf->tx_bss_conf, NULL); + link_conf->enable_beacon = false; sdata->beacon_rate_set = false; sdata->vif.cfg.ssid_len = 0; @@ -1857,7 +1879,8 @@ params->vht_capa || params->he_capa || params->eht_capa || - params->opmode_notif_used; + params->opmode_notif_used || + params->tp_overridden; switch (mode) { case STA_LINK_MODE_NEW: @@ -1946,6 +1969,9 @@ sband->band); } + if (params->tp_overridden) + link_sta->pub->tp_override = params->tp_override; + return 0; } @@ -2062,6 +2088,9 @@ if (params->listen_interval >= 0) sta->listen_interval = params->listen_interval; + if (params->eml_cap_present) + sta->sta.eml_cap = params->eml_cap; + ret = sta_link_apply_parameters(local, sta, STA_LINK_MODE_STA_MODIFY, ¶ms->link_sta_params); if (ret) @@ -2698,8 +2727,10 @@ err = ieee80211_link_use_channel(&sdata->deflink, &chanreq, IEEE80211_CHANCTX_SHARED); - if (err) + if (err) { + kfree(ifmsh->ie); return err; + } return ieee80211_start_mesh(sdata); } @@ -3004,7 +3035,7 @@ return 0; } -static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u32 changed) +static int ieee80211_set_wiphy_params(struct wiphy *wiphy, u8 radio_id, u32 changed) { struct ieee80211_local *local = wiphy_priv(wiphy); int err; @@ -3033,7 +3064,13 @@ } if (changed & WIPHY_PARAM_RTS_THRESHOLD) { - err = drv_set_rts_threshold(local, wiphy->rts_threshold); + u32 rts_threshold; + + if (radio_id >= wiphy->n_radio) + rts_threshold = wiphy->rts_threshold; + else + rts_threshold = wiphy->radio_cfg[radio_id].rts_threshold; + err = drv_set_rts_threshold(local, radio_id, rts_threshold); if (err) return err; @@ -3062,12 +3099,13 @@ } static int ieee80211_set_tx_power(struct wiphy *wiphy, - struct wireless_dev *wdev, + struct wireless_dev *wdev, u8 radio_id, enum nl80211_tx_power_setting type, int mbm) { struct ieee80211_local *local = wiphy_priv(wiphy); struct ieee80211_sub_if_data *sdata; enum nl80211_tx_power_setting txp_type = type; + struct ieee80211_chanctx_conf *conf; bool update_txp_type = false; bool has_monitor = false; int user_power_level; @@ -3143,6 +3181,12 @@ if (!link) continue; + if (radio_id < wiphy->n_radio) { + conf = wiphy_dereference(wiphy, link->conf->chanctx_conf); + if (!conf || conf->radio_idx != radio_id) + continue; + } + link->user_power_level = local->user_power_level; if (txp_type != link->conf->txpower_type) update_txp_type = true; @@ -3163,6 +3207,12 @@ if (!link) continue; + if (radio_id < wiphy->n_radio) { + conf = wiphy_dereference(wiphy, link->conf->chanctx_conf); + if (!conf || conf->radio_idx != radio_id) + continue; + } + ieee80211_recalc_txpower(link, update_txp_type); } } @@ -3190,19 +3240,27 @@ static int ieee80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, + unsigned int link_id, int *dbm) { struct ieee80211_local *local = wiphy_priv(wiphy); struct ieee80211_sub_if_data *sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); + struct ieee80211_link_data *link_data; if (local->ops->get_txpower && (sdata->flags & IEEE80211_SDATA_IN_DRIVER)) - return drv_get_txpower(local, sdata, dbm); + return drv_get_txpower(local, sdata, link_id, dbm); - if (local->emulate_chanctx) + if (local->emulate_chanctx) { *dbm = local->hw.conf.power_level; + } else { + link_data = wiphy_dereference(wiphy, sdata->link[link_id]); + + if (link_data) + *dbm = link_data->conf->txpower; else - *dbm = sdata->vif.bss_conf.txpower; + return -ENOLINK; + } /* INT_MIN indicates no power level was set yet */ if (*dbm == INT_MIN) @@ -3517,6 +3575,61 @@ return 0; } +static bool +__ieee80211_is_scan_ongoing(struct wiphy *wiphy, + struct ieee80211_local *local, + struct cfg80211_chan_def *chandef) +{ + struct cfg80211_scan_request *scan_req; + int chan_radio_idx, req_radio_idx; + struct ieee80211_roc_work *roc; + bool ret = false; + + if (!list_empty(&local->roc_list) || local->scanning) + ret = true; + + if (wiphy->n_radio < 2) + return ret; + + /* Multiple HWs are grouped under same wiphy. If not scanning then return + * now itself + */ + if (!ret) + return ret; + + req_radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, chandef->chan); + if (req_radio_idx < 0) + return true; + + if (local->scanning) { + rcu_read_lock(); + scan_req = rcu_dereference(local->scan_req); + /* scanning is going on but info is not there. Should not happen + * but if it does, let's not take risk and assume we can't use + * the hw hence return true + */ + if (WARN_ON(!scan_req)) { + rcu_read_unlock(); + return true; + } + + ret = ieee80211_is_radio_idx_in_scan_req(wiphy, scan_req, req_radio_idx); + rcu_read_unlock(); + return ret; + } + + if (!list_empty(&local->roc_list)) { + list_for_each_entry(roc, &local->roc_list, list) { + chan_radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, roc->chan); + if (chan_radio_idx == req_radio_idx) + return true; + } + return false; + } + + return false; +} + static int ieee80211_start_radar_detection(struct wiphy *wiphy, struct net_device *dev, struct cfg80211_chan_def *chandef, @@ -3530,7 +3643,7 @@ lockdep_assert_wiphy(local->hw.wiphy); - if (!list_empty(&local->roc_list) || local->scanning) + if (__ieee80211_is_scan_ongoing(wiphy, local, chandef)) return -EBUSY; link_data = sdata_dereference(sdata->link[link_id], sdata); @@ -3688,6 +3801,7 @@ { struct ieee80211_sub_if_data *sdata = vif_to_sdata(vif); struct ieee80211_local *local = sdata->local; + struct ieee80211_bss_conf *tx_bss_conf; struct ieee80211_link_data *link_data; if (WARN_ON(link_id >= IEEE80211_MLD_MAX_NUM_LINKS)) @@ -3701,25 +3815,24 @@ return; } - /* TODO: MBSSID with MLO changes */ - if (vif->mbssid_tx_vif == vif) { + tx_bss_conf = rcu_dereference(link_data->conf->tx_bss_conf); + if (tx_bss_conf == link_data->conf) { /* Trigger ieee80211_csa_finish() on the non-transmitting * interfaces when channel switch is received on * transmitting interface */ - struct ieee80211_sub_if_data *iter; + struct ieee80211_link_data *iter; - list_for_each_entry_rcu(iter, &local->interfaces, list) { - if (!ieee80211_sdata_running(iter)) + for_each_sdata_link(local, iter) { + if (iter->sdata == sdata || + rcu_access_pointer(iter->conf->tx_bss_conf) != tx_bss_conf) continue; - if (iter == sdata || iter->vif.mbssid_tx_vif != vif) - continue; - - wiphy_work_queue(iter->local->hw.wiphy, - &iter->deflink.csa.finalize_work); + wiphy_work_queue(iter->sdata->local->hw.wiphy, + &iter->csa.finalize_work); } } + wiphy_work_queue(local->hw.wiphy, &link_data->csa.finalize_work); rcu_read_unlock(); @@ -4022,7 +4135,7 @@ lockdep_assert_wiphy(local->hw.wiphy); - if (!list_empty(&local->roc_list) || local->scanning) + if (__ieee80211_is_scan_ongoing(wiphy, local, ¶ms->chandef)) return -EBUSY; if (sdata->wdev.links[link_id].cac_started) @@ -4254,10 +4367,12 @@ int size = sizeof(*nullfunc); __le16 fc; bool qos; + struct ieee80211_bss_conf *conf; struct ieee80211_tx_info *info; struct sta_info *sta; struct ieee80211_chanctx_conf *chanctx_conf; enum nl80211_band band; + u8 link_id; int ret; /* the lock is needed to assign the cookie later */ @@ -4272,11 +4387,25 @@ qos = sta->sta.wme; - chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); + /* In case of ML vif, we shall use the default sta link to + * send the probe frame. For non ML vif the link id 0 is + * the deflink + */ + link_id = sta->deflink.link_id; + + conf = rcu_dereference(sdata->vif.link_conf[link_id]); + + if (unlikely(!conf)) { + ret = -ENOLINK; + goto unlock; + } + + chanctx_conf = rcu_dereference(conf->chanctx_conf); if (WARN_ON(!chanctx_conf)) { ret = -EINVAL; goto unlock; } + band = chanctx_conf->def.chan->band; if (qos) { @@ -4304,8 +4433,8 @@ nullfunc->frame_control = fc; nullfunc->duration_id = 0; memcpy(nullfunc->addr1, sta->sta.addr, ETH_ALEN); - memcpy(nullfunc->addr2, sdata->vif.addr, ETH_ALEN); - memcpy(nullfunc->addr3, sdata->vif.addr, ETH_ALEN); + memcpy(nullfunc->addr2, conf->addr, ETH_ALEN); + memcpy(nullfunc->addr3, conf->addr, ETH_ALEN); nullfunc->seq_ctrl = 0; info = IEEE80211_SKB_CB(skb); @@ -4314,6 +4443,8 @@ IEEE80211_TX_INTFL_NL80211_FRAME_TX; info->band = band; + info->control.flags |= u32_encode_bits(link_id, IEEE80211_TX_CTRL_MLO_LINK); + skb_set_queue_mapping(skb, IEEE80211_AC_VO); skb->priority = 7; if (qos) @@ -4822,20 +4953,22 @@ ieee80211_link_info_change_notify(sdata, link, changed); - if (!sdata->vif.bss_conf.nontransmitted && sdata->vif.mbssid_tx_vif) { - struct ieee80211_sub_if_data *child; + if (!link->conf->nontransmitted && + rcu_access_pointer(link->conf->tx_bss_conf)) { + struct ieee80211_link_data *tmp; + + for_each_sdata_link(sdata->local, tmp) { + if (tmp->sdata == sdata || + rcu_access_pointer(tmp->conf->tx_bss_conf) != link->conf) + continue; - 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; - child->vif.bss_conf.he_bss_color.enabled = enable; - ieee80211_link_info_change_notify(child, - &child->deflink, + tmp->conf->he_bss_color.color = color; + tmp->conf->he_bss_color.enabled = enable; + ieee80211_link_info_change_notify(tmp->sdata, tmp, BSS_CHANGED_HE_BSS_COLOR); } } } -} static int ieee80211_color_change_finalize(struct ieee80211_link_data *link) { @@ -5172,6 +5305,18 @@ return ieee80211_req_neg_ttlm(sdata, params); } +static int +ieee80211_assoc_ml_reconf(struct wiphy *wiphy, struct net_device *dev, + struct cfg80211_assoc_link *add_links, + u16 rem_links) +{ + struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); + + lockdep_assert_wiphy(sdata->local->hw.wiphy); + + return ieee80211_mgd_assoc_ml_reconf(sdata, add_links, rem_links); +} + const struct cfg80211_ops mac80211_config_ops = { .add_virtual_intf = ieee80211_add_iface, .del_virtual_intf = ieee80211_del_iface, @@ -5286,4 +5431,5 @@ .set_hw_timestamp = ieee80211_set_hw_timestamp, .set_ttlm = ieee80211_set_ttlm, .get_radio_mask = ieee80211_get_radio_mask, + .assoc_ml_reconf = ieee80211_assoc_ml_reconf, }; diff -ruw linux-6.13.12/net/mac80211/chan.c linux-6.13.12-fbx/net/mac80211/chan.c --- linux-6.13.12/net/mac80211/chan.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/chan.c 2025-09-25 17:40:37.811378354 +0200 @@ -247,6 +247,13 @@ if (!link_sta) return NL80211_CHAN_WIDTH_20_NOHT; + /* + * We assume that TX/RX might be asymmetric (so e.g. VHT operating + * mode notification changes what a STA wants to receive, but not + * necessarily what it will transmit to us), and therefore use the + * capabilities here. Calling it RX bandwidth capability is a bit + * wrong though, since capabilities are in fact symmetric. + */ width = ieee80211_sta_cap_rx_bw(link_sta); switch (width) { @@ -637,15 +644,23 @@ return NULL; } -bool ieee80211_is_radar_required(struct ieee80211_local *local) +bool ieee80211_is_radar_required(struct ieee80211_local *local, + struct cfg80211_scan_request *req) { + struct wiphy *wiphy = local->hw.wiphy; struct ieee80211_link_data *link; + struct ieee80211_channel *chan; + int radio_idx; lockdep_assert_wiphy(local->hw.wiphy); for_each_sdata_link(local, link) { - if (link->radar_required) - return true; + if (link->radar_required) { + chan = link->conf->chanreq.oper.chan; + radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, chan); + return ieee80211_is_radio_idx_in_scan_req(wiphy, req, + radio_idx); + } } return false; @@ -2124,6 +2139,9 @@ { struct ieee80211_sub_if_data *sdata = link->sdata; + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) + return; + lockdep_assert_wiphy(sdata->local->hw.wiphy); if (rcu_access_pointer(link->conf->chanctx_conf)) diff -ruw linux-6.13.12/net/mac80211/debug.h linux-6.13.12-fbx/net/mac80211/debug.h --- linux-6.13.12/net/mac80211/debug.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/debug.h 2025-09-25 17:40:37.811378354 +0200 @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ /* * Portions - * Copyright (C) 2022 - 2023 Intel Corporation + * Copyright (C) 2022 - 2024 Intel Corporation */ #ifndef __MAC80211_DEBUG_H #define __MAC80211_DEBUG_H @@ -152,6 +152,14 @@ else \ _sdata_err((link)->sdata, fmt, ##__VA_ARGS__); \ } while (0) +#define link_id_info(sdata, link_id, fmt, ...) \ + do { \ + if (ieee80211_vif_is_mld(&sdata->vif)) \ + _sdata_info(sdata, "[link %d] " fmt, link_id, \ + ##__VA_ARGS__); \ + else \ + _sdata_info(sdata, fmt, ##__VA_ARGS__); \ + } while (0) #define _link_id_dbg(print, sdata, link_id, fmt, ...) \ do { \ if (ieee80211_vif_is_mld(&(sdata)->vif)) \ diff -ruw linux-6.13.12/net/mac80211/debugfs.c linux-6.13.12-fbx/net/mac80211/debugfs.c --- linux-6.13.12/net/mac80211/debugfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/debugfs.c 2025-09-25 17:40:37.811378354 +0200 @@ -284,7 +284,8 @@ 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); + guard(wiphy)(local->hw.wiphy); + local->aql_txq_limit_low[ac] = q_limit_low; local->aql_txq_limit_high[ac] = q_limit_high; @@ -296,7 +297,6 @@ sta->airtime[ac].aql_limit_high = q_limit_high; } } - wiphy_unlock(local->hw.wiphy); return count; } @@ -492,6 +492,8 @@ FLAG(DISALLOW_PUNCTURING), FLAG(DISALLOW_PUNCTURING_5GHZ), FLAG(HANDLES_QUIET_CSA), + FLAG(APVLAN_NEED_MCAST_TO_UCAST), + FLAG(ALLOW_DRV_TX_FOR_DATA), FLAG(STRICT), #undef FLAG }; diff -ruw linux-6.13.12/net/mac80211/debugfs_key.c linux-6.13.12-fbx/net/mac80211/debugfs_key.c --- linux-6.13.12/net/mac80211/debugfs_key.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/debugfs_key.c 2025-07-01 14:10:45.700125948 +0200 @@ -402,25 +402,6 @@ } } -void ieee80211_debugfs_key_add_mgmt_default(struct ieee80211_sub_if_data *sdata) -{ - char buf[50]; - struct ieee80211_key *key; - - if (!sdata->vif.debugfs_dir) - return; - - key = wiphy_dereference(sdata->local->hw.wiphy, - sdata->deflink.default_mgmt_key); - if (key) { - sprintf(buf, "../keys/%d", key->debugfs.cnt); - sdata->debugfs.default_mgmt_key = - debugfs_create_symlink("default_mgmt_key", - sdata->vif.debugfs_dir, buf); - } else - ieee80211_debugfs_key_remove_mgmt_default(sdata); -} - void ieee80211_debugfs_key_remove_mgmt_default(struct ieee80211_sub_if_data *sdata) { if (!sdata) @@ -431,27 +412,6 @@ } void -ieee80211_debugfs_key_add_beacon_default(struct ieee80211_sub_if_data *sdata) -{ - char buf[50]; - struct ieee80211_key *key; - - if (!sdata->vif.debugfs_dir) - return; - - key = wiphy_dereference(sdata->local->hw.wiphy, - sdata->deflink.default_beacon_key); - if (key) { - sprintf(buf, "../keys/%d", key->debugfs.cnt); - sdata->debugfs.default_beacon_key = - debugfs_create_symlink("default_beacon_key", - sdata->vif.debugfs_dir, buf); - } else { - ieee80211_debugfs_key_remove_beacon_default(sdata); - } -} - -void ieee80211_debugfs_key_remove_beacon_default(struct ieee80211_sub_if_data *sdata) { if (!sdata) @@ -460,10 +420,3 @@ debugfs_remove(sdata->debugfs.default_beacon_key); sdata->debugfs.default_beacon_key = NULL; } - -void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, - struct sta_info *sta) -{ - debugfs_remove(key->debugfs.stalink); - key->debugfs.stalink = NULL; -} diff -ruw linux-6.13.12/net/mac80211/debugfs_key.h linux-6.13.12-fbx/net/mac80211/debugfs_key.h --- linux-6.13.12/net/mac80211/debugfs_key.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/debugfs_key.h 2025-07-01 14:10:45.700125948 +0200 @@ -6,16 +6,10 @@ void ieee80211_debugfs_key_add(struct ieee80211_key *key); void ieee80211_debugfs_key_remove(struct ieee80211_key *key); void ieee80211_debugfs_key_update_default(struct ieee80211_sub_if_data *sdata); -void ieee80211_debugfs_key_add_mgmt_default( - struct ieee80211_sub_if_data *sdata); void ieee80211_debugfs_key_remove_mgmt_default( struct ieee80211_sub_if_data *sdata); -void ieee80211_debugfs_key_add_beacon_default( - struct ieee80211_sub_if_data *sdata); void ieee80211_debugfs_key_remove_beacon_default( struct ieee80211_sub_if_data *sdata); -void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, - struct sta_info *sta); #else static inline void ieee80211_debugfs_key_add(struct ieee80211_key *key) {} @@ -24,21 +18,12 @@ static inline void ieee80211_debugfs_key_update_default( struct ieee80211_sub_if_data *sdata) {} -static inline void ieee80211_debugfs_key_add_mgmt_default( - struct ieee80211_sub_if_data *sdata) -{} static inline void ieee80211_debugfs_key_remove_mgmt_default( struct ieee80211_sub_if_data *sdata) {} -static inline void ieee80211_debugfs_key_add_beacon_default( - struct ieee80211_sub_if_data *sdata) -{} static inline void ieee80211_debugfs_key_remove_beacon_default( struct ieee80211_sub_if_data *sdata) {} -static inline void ieee80211_debugfs_key_sta_del(struct ieee80211_key *key, - struct sta_info *sta) -{} #endif #endif /* __MAC80211_DEBUGFS_KEY_H */ diff -ruw linux-6.13.12/net/mac80211/debugfs_netdev.c linux-6.13.12-fbx/net/mac80211/debugfs_netdev.c --- linux-6.13.12/net/mac80211/debugfs_netdev.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/debugfs_netdev.c 2025-09-25 17:40:37.815378373 +0200 @@ -1025,16 +1025,7 @@ void ieee80211_debugfs_rename_netdev(struct ieee80211_sub_if_data *sdata) { - struct dentry *dir; - char buf[10 + IFNAMSIZ]; - - dir = sdata->vif.debugfs_dir; - - if (IS_ERR_OR_NULL(dir)) - return; - - sprintf(buf, "netdev:%s", sdata->name); - debugfs_rename(dir->d_parent, dir, dir->d_parent, buf); + debugfs_change_name(sdata->vif.debugfs_dir, "netdev:%s", sdata->name); } void ieee80211_debugfs_recreate_netdev(struct ieee80211_sub_if_data *sdata, diff -ruw linux-6.13.12/net/mac80211/driver-ops.c linux-6.13.12-fbx/net/mac80211/driver-ops.c --- linux-6.13.12/net/mac80211/driver-ops.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/driver-ops.c 2025-09-25 17:40:37.815378373 +0200 @@ -54,6 +54,30 @@ 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) { @@ -477,7 +501,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)) diff -ruw linux-6.13.12/net/mac80211/driver-ops.h linux-6.13.12-fbx/net/mac80211/driver-ops.h --- linux-6.13.12/net/mac80211/driver-ops.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/driver-ops.h 2025-09-25 17:40:37.815378373 +0200 @@ -89,6 +89,8 @@ int drv_start(struct ieee80211_local *local); void drv_stop(struct ieee80211_local *local, bool suspend); +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, @@ -402,16 +404,16 @@ } static inline int drv_set_rts_threshold(struct ieee80211_local *local, - u32 value) + u8 radio_id, u32 value) { int ret = 0; might_sleep(); lockdep_assert_wiphy(local->hw.wiphy); - trace_drv_set_rts_threshold(local, value); + trace_drv_set_rts_threshold(local, radio_id, value); if (local->ops->set_rts_threshold) - ret = local->ops->set_rts_threshold(&local->hw, value); + ret = local->ops->set_rts_threshold(&local->hw, radio_id, value); trace_drv_return_int(local, ret); return ret; } @@ -1276,7 +1278,8 @@ } static inline int drv_get_txpower(struct ieee80211_local *local, - struct ieee80211_sub_if_data *sdata, int *dbm) + struct ieee80211_sub_if_data *sdata, + unsigned int link_id, int *dbm) { int ret; @@ -1286,8 +1289,8 @@ if (!local->ops->get_txpower) return -EOPNOTSUPP; - ret = local->ops->get_txpower(&local->hw, &sdata->vif, dbm); - trace_drv_get_txpower(local, sdata, *dbm, ret); + ret = local->ops->get_txpower(&local->hw, &sdata->vif, link_id, dbm); + trace_drv_get_txpower(local, sdata, link_id, *dbm, ret); return ret; } diff -ruw linux-6.13.12/net/mac80211/eht.c linux-6.13.12-fbx/net/mac80211/eht.c --- linux-6.13.12/net/mac80211/eht.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/eht.c 2025-09-25 17:40:37.815378373 +0200 @@ -33,6 +33,33 @@ sdata->vif.type == NL80211_IFTYPE_STATION); + /* + * mediatek MT7927 windows driver 5.4.0.3044 sets the + * IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_40MHZ_IN_2G bit in + * 6Ghz band, which is supposed to be reserved + * + * This causes the kernel to miscalculate mcs_nss_size to 3 + * bytes, resulting in incorrect rx/tx nss map, so the sta is + * believed to have have 0 NSS for 80/160/320. + * + * Since the driver does not set the + * IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT bit, we can do + * a hack that should not affect other implementations, and + * assume than any leftover bytes in eht capabilities must be + * that we miscalculated the mcs_nss size. + */ + if (!(eht_cap_ie_elem->fixed.phy_cap_info[5] & + IEEE80211_EHT_PHY_CAP5_PPE_THRESHOLD_PRESENT) && + mcs_nss_size == 3 && + eht_cap_len > eht_total_size + mcs_nss_size) { + /* check if the leftover looks like a possible mcs_nss + * mapping (should be multiple of 3 bytes) */ + u8 var_size = eht_cap_len - sizeof(eht_cap->eht_cap_elem); + if (var_size == 3 || var_size == 6 || var_size == 9) { + mcs_nss_size = var_size; + } + } + eht_total_size += mcs_nss_size; /* Calculate the PPE thresholds length only if the header is present */ diff -ruw linux-6.13.12/net/mac80211/ethtool.c linux-6.13.12-fbx/net/mac80211/ethtool.c --- linux-6.13.12/net/mac80211/ethtool.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/ethtool.c 2025-09-25 17:40:37.815378373 +0200 @@ -19,16 +19,13 @@ 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; - wiphy_lock(local->hw.wiphy); - ret = drv_set_ringparam(local, rp->tx_pending, rp->rx_pending); - wiphy_unlock(local->hw.wiphy); + guard(wiphy)(local->hw.wiphy); - return ret; + return drv_set_ringparam(local, rp->tx_pending, rp->rx_pending); } static void ieee80211_get_ringparam(struct net_device *dev, @@ -40,10 +37,10 @@ memset(rp, 0, sizeof(*rp)); - wiphy_lock(local->hw.wiphy); + guard(wiphy)(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] = { @@ -57,6 +54,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); @@ -67,6 +80,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; @@ -109,7 +125,7 @@ * network device. */ - wiphy_lock(local->hw.wiphy); + guard(wiphy)(local->hw.wiphy); if (sdata->vif.type == NL80211_IFTYPE_STATION) { sta = sta_info_get_bss(sdata, sdata->deflink.u.mgd.bssid); @@ -160,6 +176,10 @@ chanctx_conf = rcu_dereference(sdata->vif.bss_conf.chanctx_conf); if (chanctx_conf) channel = chanctx_conf->def.chan; + else if (local->open_count > 0 && + local->open_count == local->monitors && + sdata->vif.type == NL80211_IFTYPE_MONITOR) + channel = local->monitor_chanreq.oper.chan; else channel = NULL; rcu_read_unlock(); @@ -205,13 +225,10 @@ else data[i++] = -1LL; - if (WARN_ON(i != STA_STATS_LEN)) { - wiphy_unlock(local->hw.wiphy); + if (WARN_ON(i != STA_STATS_LEN)) 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) @@ -224,6 +241,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) @@ -241,6 +261,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, @@ -251,4 +300,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.13.12/net/mac80211/he.c linux-6.13.12-fbx/net/mac80211/he.c --- linux-6.13.12/net/mac80211/he.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/he.c 2025-09-25 17:40:37.815378373 +0200 @@ -3,10 +3,11 @@ * HE handling * * Copyright(c) 2017 Intel Deutschland GmbH - * Copyright(c) 2019 - 2023 Intel Corporation + * Copyright(c) 2019 - 2024 Intel Corporation */ #include "ieee80211_i.h" +#include "rate.h" static void ieee80211_update_from_he_6ghz_capa(const struct ieee80211_he_6ghz_capa *he_6ghz_capa, @@ -158,6 +159,14 @@ &he_cap_ie[sizeof(he_cap->he_cap_elem) + mcs_nss_size], he_ppe_size); + /* Check if STA supports at least single spatial stream */ + if (he_cap->he_mcs_nss_supp.rx_mcs_80 == cpu_to_le16(0xFFFF)) { + he_cap->has_he = false; + sdata_info(sdata, "Ignoring HE IE from %pM due to invalid rx_mcs_80\n", + link_sta->pub->addr); + return; + } + he_cap->has_he = true; link_sta->cur_max_bandwidth = ieee80211_sta_cap_rx_bw(link_sta); @@ -248,3 +257,119 @@ he_obss_pd->enable = true; } } + +static void ieee80211_link_sta_rc_update_omi(struct ieee80211_link_data *link, + struct link_sta_info *link_sta) +{ + struct ieee80211_sub_if_data *sdata = link->sdata; + struct ieee80211_supported_band *sband; + enum ieee80211_sta_rx_bandwidth new_bw; + enum nl80211_band band; + + band = link->conf->chanreq.oper.chan->band; + sband = sdata->local->hw.wiphy->bands[band]; + + new_bw = ieee80211_sta_cur_vht_bw(link_sta); + if (link_sta->pub->bandwidth == new_bw) + return; + + link_sta->pub->bandwidth = new_bw; + rate_control_rate_update(sdata->local, sband, link_sta, + IEEE80211_RC_BW_CHANGED); +} + +bool ieee80211_prepare_rx_omi_bw(struct ieee80211_link_sta *pub_link_sta, + enum ieee80211_sta_rx_bandwidth bw) +{ + struct sta_info *sta = container_of(pub_link_sta->sta, + struct sta_info, sta); + struct ieee80211_local *local = sta->sdata->local; + struct link_sta_info *link_sta = + sdata_dereference(sta->link[pub_link_sta->link_id], sta->sdata); + struct ieee80211_link_data *link = + sdata_dereference(sta->sdata->link[pub_link_sta->link_id], + sta->sdata); + struct ieee80211_chanctx_conf *conf; + struct ieee80211_chanctx *chanctx; + bool ret; + + if (WARN_ON(!link || !link_sta || link_sta->pub != pub_link_sta)) + return false; + + conf = sdata_dereference(link->conf->chanctx_conf, sta->sdata); + if (WARN_ON(!conf)) + return false; + + trace_api_prepare_rx_omi_bw(local, sta->sdata, link_sta, bw); + + chanctx = container_of(conf, typeof(*chanctx), conf); + + if (link_sta->rx_omi_bw_staging == bw) { + ret = false; + goto trace; + } + + /* must call this API in pairs */ + if (WARN_ON(link_sta->rx_omi_bw_tx != link_sta->rx_omi_bw_staging || + link_sta->rx_omi_bw_rx != link_sta->rx_omi_bw_staging)) { + ret = false; + goto trace; + } + + if (bw < link_sta->rx_omi_bw_staging) { + link_sta->rx_omi_bw_tx = bw; + ieee80211_link_sta_rc_update_omi(link, link_sta); + } else { + link_sta->rx_omi_bw_rx = bw; + ieee80211_recalc_chanctx_min_def(local, chanctx, NULL, false); + } + + link_sta->rx_omi_bw_staging = bw; + ret = true; +trace: + trace_api_return_bool(local, ret); + return ret; +} +EXPORT_SYMBOL_GPL(ieee80211_prepare_rx_omi_bw); + +void ieee80211_finalize_rx_omi_bw(struct ieee80211_link_sta *pub_link_sta) +{ + struct sta_info *sta = container_of(pub_link_sta->sta, + struct sta_info, sta); + struct ieee80211_local *local = sta->sdata->local; + struct link_sta_info *link_sta = + sdata_dereference(sta->link[pub_link_sta->link_id], sta->sdata); + struct ieee80211_link_data *link = + sdata_dereference(sta->sdata->link[pub_link_sta->link_id], + sta->sdata); + struct ieee80211_chanctx_conf *conf; + struct ieee80211_chanctx *chanctx; + + if (WARN_ON(!link || !link_sta || link_sta->pub != pub_link_sta)) + return; + + conf = sdata_dereference(link->conf->chanctx_conf, sta->sdata); + if (WARN_ON(!conf)) + return; + + trace_api_finalize_rx_omi_bw(local, sta->sdata, link_sta); + + chanctx = container_of(conf, typeof(*chanctx), conf); + + if (link_sta->rx_omi_bw_tx != link_sta->rx_omi_bw_staging) { + /* rate control in finalize only when widening bandwidth */ + WARN_ON(link_sta->rx_omi_bw_tx > link_sta->rx_omi_bw_staging); + link_sta->rx_omi_bw_tx = link_sta->rx_omi_bw_staging; + ieee80211_link_sta_rc_update_omi(link, link_sta); + } + + if (link_sta->rx_omi_bw_rx != link_sta->rx_omi_bw_staging) { + /* channel context in finalize only when narrowing bandwidth */ + WARN_ON(link_sta->rx_omi_bw_rx < link_sta->rx_omi_bw_staging); + link_sta->rx_omi_bw_rx = link_sta->rx_omi_bw_staging; + ieee80211_recalc_chanctx_min_def(local, chanctx, NULL, false); + } + + trace_api_return_void(local); +} +EXPORT_SYMBOL_GPL(ieee80211_finalize_rx_omi_bw); diff -ruw linux-6.13.12/net/mac80211/ibss.c linux-6.13.12-fbx/net/mac80211/ibss.c --- linux-6.13.12/net/mac80211/ibss.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/ibss.c 2025-09-25 17:40:37.815378373 +0200 @@ -245,6 +245,7 @@ sdata->vif.cfg.ibss_creator = false; sdata->vif.bss_conf.enable_beacon = false; netif_carrier_off(sdata->dev); + synchronize_net(); ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_IBSS | BSS_CHANGED_BEACON_ENABLED); @@ -1826,8 +1827,8 @@ { struct ieee80211_if_ibss *ifibss = &sdata->u.ibss; - ieee80211_ibss_disconnect(sdata); ifibss->ssid_len = 0; + ieee80211_ibss_disconnect(sdata); eth_zero_addr(ifibss->bssid); /* remove beacon */ diff -ruw linux-6.13.12/net/mac80211/ieee80211_i.h linux-6.13.12-fbx/net/mac80211/ieee80211_i.h --- linux-6.13.12/net/mac80211/ieee80211_i.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/ieee80211_i.h 2025-09-29 14:23:07.625732509 +0200 @@ -404,6 +404,8 @@ int tries; u16 algorithm, expected_transaction; + unsigned long userspace_selectors[BITS_TO_LONGS(128)]; + u8 key[WLAN_KEY_LEN_WEP104]; u8 key_len, key_idx; bool done, waiting; @@ -444,6 +446,8 @@ const u8 *supp_rates; u8 supp_rates_len; + unsigned long userspace_selectors[BITS_TO_LONGS(128)]; + unsigned long timeout; int tries; @@ -602,6 +606,15 @@ /* dialog token enumerator for neg TTLM request */ u8 dialog_token_alloc; struct wiphy_delayed_work neg_ttlm_timeout_work; + + /* Locally initiated multi-link reconfiguration */ + struct { + struct ieee80211_mgd_assoc_data *add_links_data; + struct wiphy_delayed_work wk; + u16 removed_links; + u16 added_links; + u8 dialog_token; + } reconf; }; struct ieee80211_if_ibss { @@ -938,11 +951,22 @@ struct ieee80211_txq txq; }; +#ifdef CONFIG_FBX80211_SCUM +struct ieee80211_if_scum_monif { + struct ieee80211_vif *vif; + 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_monif scum; +#endif }; /** @@ -1181,6 +1205,11 @@ } debugfs; #endif +#ifdef CONFIG_FBX80211_SCUM + struct fbx80211_scum_ops __rcu *scum_ops; + struct list_head scum_client_list; +#endif + /* must be last, dynamically sized area in this! */ struct ieee80211_vif vif; }; @@ -1204,7 +1233,7 @@ for (int ___link_id = 0; \ ___link_id < ARRAY_SIZE(___sdata->link); \ ___link_id++) \ - if ((_link = wiphy_dereference((local)->hw.wiphy, \ + if ((_link = wiphy_dereference((_local)->hw.wiphy, \ ___sdata->link[___link_id]))) static inline int @@ -2059,6 +2088,8 @@ ieee80211_vif_set_links(sdata, 0, 0); } +void ieee80211_apvlan_link_setup(struct ieee80211_sub_if_data *sdata); + /* tx handling */ void ieee80211_clear_tx_pending(struct ieee80211_local *local); void ieee80211_tx_pending(struct tasklet_struct *t); @@ -2111,8 +2142,6 @@ int ieee80211_send_smps_action(struct ieee80211_sub_if_data *sdata, enum ieee80211_smps_mode smps, const u8 *da, 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_add_addbaext(struct sk_buff *skb, const u8 req_addba_ext_data, u16 buf_size); @@ -2684,8 +2713,12 @@ struct ieee80211_chanctx *ctx, struct ieee80211_link_data *rsvd_for, bool check_reserved); -bool ieee80211_is_radar_required(struct ieee80211_local *local); +bool ieee80211_is_radar_required(struct ieee80211_local *local, + struct cfg80211_scan_request *req); +bool ieee80211_is_radio_idx_in_scan_req(struct wiphy *wiphy, + struct cfg80211_scan_request *scan_req, + int radio_idx); void ieee80211_dfs_cac_timer_work(struct wiphy *wiphy, struct wiphy_work *work); void ieee80211_dfs_cac_cancel(struct ieee80211_local *local, struct ieee80211_chanctx *chanctx); @@ -2768,6 +2801,14 @@ void ieee80211_add_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef); void ieee80211_remove_wbrf(struct ieee80211_local *local, struct cfg80211_chan_def *chandef); +int ieee80211_mgd_assoc_ml_reconf(struct ieee80211_sub_if_data *sdata, + struct cfg80211_assoc_link *add_links, + u16 rem_links); + +void ieee80211_process_ml_reconf_resp(struct ieee80211_sub_if_data *sdata, + struct ieee80211_mgmt *mgmt, size_t len); +void ieee80211_stop_mbssid(struct ieee80211_sub_if_data *sdata); + #if IS_ENABLED(CONFIG_MAC80211_KUNIT_TEST) #define EXPORT_SYMBOL_IF_MAC80211_KUNIT(sym) EXPORT_SYMBOL_IF_KUNIT(sym) #define VISIBLE_IF_MAC80211_KUNIT diff -ruw linux-6.13.12/net/mac80211/iface.c linux-6.13.12-fbx/net/mac80211/iface.c --- linux-6.13.12/net/mac80211/iface.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/iface.c 2025-09-29 14:23:07.625732509 +0200 @@ -26,6 +26,7 @@ #include "driver-ops.h" #include "wme.h" #include "rate.h" +#include "fbx_scum.h" /** * DOC: Interface list locking @@ -295,7 +296,6 @@ { 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 @@ -305,11 +305,9 @@ if (!dev->ieee80211_ptr->registered) return 0; - wiphy_lock(local->hw.wiphy); - ret = _ieee80211_change_mac(sdata, addr); - wiphy_unlock(local->hw.wiphy); + guard(wiphy)(local->hw.wiphy); - return ret; + return _ieee80211_change_mac(sdata, addr); } static inline int identical_mac_addr_allowed(int type1, int type2) @@ -445,16 +443,13 @@ if (!is_valid_ether_addr(dev->dev_addr)) return -EADDRNOTAVAIL; - wiphy_lock(sdata->local->hw.wiphy); + guard(wiphy)(sdata->local->hw.wiphy); + err = ieee80211_check_concurrent_iface(sdata, sdata->vif.type); if (err) - goto out; - - err = ieee80211_do_open(&sdata->wdev, true); -out: - wiphy_unlock(sdata->local->hw.wiphy); - return err; + + return ieee80211_do_open(&sdata->wdev, true); } static void ieee80211_do_stop(struct ieee80211_sub_if_data *sdata, bool going_down) @@ -491,8 +486,14 @@ 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; + case NL80211_IFTYPE_AP_VLAN: + sdata->wdev.valid_links = 0; + ieee80211_vif_clear_links(sdata); + break; default: break; } @@ -666,6 +667,9 @@ if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) ieee80211_txq_remove_vlan(local, sdata); + if (sdata->vif.txq) + ieee80211_txq_purge(sdata->local, to_txq_info(sdata->vif.txq)); + sdata->bss = NULL; if (local->open_count == 0) @@ -733,30 +737,59 @@ ieee80211_add_virtual_monitor(local); } -static void ieee80211_stop_mbssid(struct ieee80211_sub_if_data *sdata) +void ieee80211_stop_mbssid(struct ieee80211_sub_if_data *sdata) { - struct ieee80211_sub_if_data *tx_sdata, *non_tx_sdata, *tmp_sdata; - struct ieee80211_vif *tx_vif = sdata->vif.mbssid_tx_vif; + struct ieee80211_sub_if_data *tx_sdata; + struct ieee80211_bss_conf *link_conf, *tx_bss_conf; + struct ieee80211_link_data *tx_link, *link; + unsigned int link_id; - if (!tx_vif) - return; + lockdep_assert_wiphy(sdata->local->hw.wiphy); - tx_sdata = vif_to_sdata(tx_vif); - sdata->vif.mbssid_tx_vif = NULL; + /* Check if any of the links of current sdata is an MBSSID. */ + for_each_vif_active_link(&sdata->vif, link_conf, link_id) { + tx_bss_conf = sdata_dereference(link_conf->tx_bss_conf, sdata); + if (!tx_bss_conf) + continue; + + tx_sdata = vif_to_sdata(tx_bss_conf->vif); + RCU_INIT_POINTER(link_conf->tx_bss_conf, NULL); - list_for_each_entry_safe(non_tx_sdata, tmp_sdata, - &tx_sdata->local->interfaces, list) { - if (non_tx_sdata != sdata && non_tx_sdata != tx_sdata && - non_tx_sdata->vif.mbssid_tx_vif == tx_vif && - ieee80211_sdata_running(non_tx_sdata)) { - non_tx_sdata->vif.mbssid_tx_vif = NULL; - dev_close(non_tx_sdata->wdev.netdev); + /* If we are not tx sdata reset tx sdata's tx_bss_conf to avoid recusrion + * while closing tx sdata at the end of outer loop below. + */ + if (sdata != tx_sdata) { + tx_link = sdata_dereference(tx_sdata->link[tx_bss_conf->link_id], + tx_sdata); + if (!tx_link) + continue; + + RCU_INIT_POINTER(tx_link->conf->tx_bss_conf, NULL); } + + /* loop through sdatas to find if any of their links + * belong to same MBSSID set as the one getting deleted. + */ + for_each_sdata_link(tx_sdata->local, link) { + struct ieee80211_sub_if_data *link_sdata = link->sdata; + + if (link_sdata == sdata || link_sdata == tx_sdata || + rcu_access_pointer(link->conf->tx_bss_conf) != tx_bss_conf) + continue; + + RCU_INIT_POINTER(link->conf->tx_bss_conf, NULL); + + /* Remove all links of matching MLD until dynamic link + * removal can be supported. + */ + cfg80211_stop_iface(link_sdata->wdev.wiphy, &link_sdata->wdev, + GFP_KERNEL); } - if (sdata != tx_sdata && ieee80211_sdata_running(tx_sdata)) { - tx_sdata->vif.mbssid_tx_vif = NULL; - dev_close(tx_sdata->wdev.netdev); + /* If we are not tx sdata, remove links of tx sdata and proceed */ + if (sdata != tx_sdata && ieee80211_sdata_running(tx_sdata)) + cfg80211_stop_iface(tx_sdata->wdev.wiphy, + &tx_sdata->wdev, GFP_KERNEL); } } @@ -764,22 +797,26 @@ { struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev); - /* close dependent VLAN and MBSSID interfaces before locking wiphy */ + /* close dependent VLAN interfaces before locking wiphy */ if (sdata->vif.type == NL80211_IFTYPE_AP) { struct ieee80211_sub_if_data *vlan, *tmpsdata; list_for_each_entry_safe(vlan, tmpsdata, &sdata->u.ap.vlans, u.vlan.list) dev_close(vlan->dev); - - ieee80211_stop_mbssid(sdata); } - wiphy_lock(sdata->local->hw.wiphy); + guard(wiphy)(sdata->local->hw.wiphy); + wiphy_work_cancel(sdata->local->hw.wiphy, &sdata->activate_links_work); + /* Close the dependent MBSSID interfaces with wiphy lock as we may be + * terminating its partner links too in case of MLD. + */ + if (sdata->vif.type == NL80211_IFTYPE_AP) + ieee80211_stop_mbssid(sdata); + ieee80211_do_stop(sdata, true); - wiphy_unlock(sdata->local->hw.wiphy); return 0; } @@ -988,7 +1025,7 @@ local->hw.wiphy->frag_threshold != (u32)-1) flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED; - if (local->monitors) + if (!list_empty(&local->mon_list)) flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED; } else { flags &= ~IEEE80211_OFFLOAD_ENCAP_ENABLED; @@ -1240,7 +1277,7 @@ struct net_device *dev = wdev->netdev; struct ieee80211_local *local = sdata->local; u64 changed = 0; - int res; + int link_id, res; u32 hw_reconf_flags = 0; lockdep_assert_wiphy(local->hw.wiphy); @@ -1272,6 +1309,8 @@ sdata->crypto_tx_tailroom_needed_cnt += master->crypto_tx_tailroom_needed_cnt; + ieee80211_apvlan_link_setup(sdata); + break; } case NL80211_IFTYPE_AP: @@ -1328,7 +1367,20 @@ case NL80211_IFTYPE_AP_VLAN: /* no need to tell driver, but set carrier and chanctx */ if (sdata->bss->active) { + struct ieee80211_link_data *link; + unsigned long valid_links = sdata->vif.valid_links; + + if (valid_links) { + for_each_set_bit(link_id, &valid_links, + IEEE80211_MLD_MAX_NUM_LINKS) { + link = sdata_dereference(sdata->link[link_id], + sdata); + ieee80211_link_vlan_copy_chanctx(link); + } + } else { ieee80211_link_vlan_copy_chanctx(&sdata->deflink); + } + netif_carrier_on(dev); ieee80211_set_vif_encap_ops(sdata); } else { @@ -1359,6 +1411,10 @@ hw_reconf_flags |= IEEE80211_CONF_CHANGE_MONITOR; } + if (!(sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES) && + !fbx80211_skip_mon(sdata)) + list_add_tail_rcu(&sdata->u.mntr.list, &local->mon_list); + ieee80211_adjust_monitor_flags(sdata, 1); ieee80211_configure_filter(local); ieee80211_recalc_offload(local); @@ -1432,11 +1488,6 @@ case NL80211_IFTYPE_P2P_DEVICE: rcu_assign_pointer(local->p2p_sdata, sdata); break; - case NL80211_IFTYPE_MONITOR: - if (sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES) - break; - list_add_tail_rcu(&sdata->u.mntr.list, &local->mon_list); - break; default: break; } @@ -1570,6 +1621,10 @@ ieee80211_process_neg_ttlm_res(sdata, mgmt, skb->len); break; + case WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_RESP: + ieee80211_process_ml_reconf_resp(sdata, mgmt, + skb->len); + break; default: break; } @@ -2283,7 +2338,7 @@ */ cfg80211_shutdown_all_interfaces(local->hw.wiphy); - wiphy_lock(local->hw.wiphy); + guard(wiphy)(local->hw.wiphy); WARN(local->open_count, "%s: open count remains %d\n", wiphy_name(local->hw.wiphy), local->open_count); @@ -2313,7 +2368,6 @@ if (!netdev) kfree(sdata); } - wiphy_unlock(local->hw.wiphy); } static int netdev_notify(struct notifier_block *nb, diff -ruw linux-6.13.12/net/mac80211/key.c linux-6.13.12-fbx/net/mac80211/key.c --- linux-6.13.12/net/mac80211/key.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/key.c 2025-09-25 17:40:37.819378393 +0200 @@ -166,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; } @@ -1409,7 +1415,7 @@ if (sdata->u.mgd.mfp != IEEE80211_MFP_DISABLED) key->conf.flags |= IEEE80211_KEY_FLAG_RX_MGMT; - key->conf.link_id = link_id; + key->conf.link_id = link_data->link_id; err = ieee80211_key_link(key, link_data, NULL); if (err) diff -ruw linux-6.13.12/net/mac80211/link.c linux-6.13.12-fbx/net/mac80211/link.c --- linux-6.13.12/net/mac80211/link.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/link.c 2025-09-25 17:40:37.819378393 +0200 @@ -12,6 +12,62 @@ #include "key.h" #include "debugfs_netdev.h" +static void ieee80211_update_apvlan_links(struct ieee80211_sub_if_data *sdata) +{ + struct ieee80211_sub_if_data *vlan; + struct ieee80211_link_data *link; + u16 master_links = sdata->vif.valid_links; + u16 new_links, vlan_links; + unsigned long add; + + list_for_each_entry(vlan, &sdata->u.ap.vlans, u.vlan.list) { + int link_id; + + if (!vlan) + continue; + + /* No support for 4addr with MLO yet */ + if (vlan->wdev.use_4addr) + return; + + vlan_links = vlan->vif.valid_links; + + new_links = master_links; + + add = new_links & ~vlan_links; + if (!add) + continue; + + ieee80211_vif_set_links(vlan, add, 0); + + for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS) { + link = sdata_dereference(vlan->link[link_id], vlan); + ieee80211_link_vlan_copy_chanctx(link); + } + } +} + +void ieee80211_apvlan_link_setup(struct ieee80211_sub_if_data *sdata) +{ + struct ieee80211_sub_if_data *master = container_of(sdata->bss, + struct ieee80211_sub_if_data, u.ap); + u16 new_links = master->vif.valid_links; + unsigned long add; + int link_id; + + if (!master->vif.valid_links) + return; + + add = new_links; + for_each_set_bit(link_id, &add, IEEE80211_MLD_MAX_NUM_LINKS) { + sdata->wdev.valid_links |= BIT(link_id); + ether_addr_copy(sdata->wdev.links[link_id].addr, + master->wdev.links[link_id].addr); + } + + ieee80211_vif_set_links(sdata, new_links, 0); +} + void ieee80211_link_setup(struct ieee80211_link_data *link) { if (link->sdata->vif.type == NL80211_IFTYPE_STATION) @@ -31,6 +87,22 @@ rcu_assign_pointer(sdata->vif.link_conf[link_id], link_conf); rcu_assign_pointer(sdata->link[link_id], link); + if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) { + struct ieee80211_sub_if_data *master; + struct ieee80211_bss_conf *master_conf; + + master = container_of(sdata->bss, + struct ieee80211_sub_if_data, u.ap); + if (!master) + goto skip_vlan_conf; + + master_conf = sdata_dereference(master->vif.link_conf[link_id], + master); + + memcpy(link_conf, master_conf, sizeof(*link_conf)); + } + +skip_vlan_conf: link->sdata = sdata; link->link_id = link_id; link->conf = link_conf; @@ -54,6 +126,7 @@ if (!deflink) { switch (sdata->vif.type) { case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_AP_VLAN: ether_addr_copy(link_conf->addr, sdata->wdev.links[link_id].addr); link_conf->bssid = link_conf->addr; @@ -177,6 +250,7 @@ switch (sdata->vif.type) { case NL80211_IFTYPE_AP: + case NL80211_IFTYPE_AP_VLAN: /* in an AP all links are always active */ sdata->vif.active_links = valid_links; @@ -278,12 +352,16 @@ ieee80211_set_vif_links_bitmaps(sdata, new_links, dormant_links); /* tell the driver */ + if (sdata->vif.type != NL80211_IFTYPE_AP_VLAN) 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 (sdata->vif.type == NL80211_IFTYPE_AP) + ieee80211_update_apvlan_links(sdata); } if (ret) { diff -ruw linux-6.13.12/net/mac80211/main.c linux-6.13.12-fbx/net/mac80211/main.c --- linux-6.13.12/net/mac80211/main.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/main.c 2025-09-25 17:40:37.819378393 +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-2023 Intel Corporation + * Copyright (C) 2018-2024 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) { @@ -726,8 +727,13 @@ }, [NL80211_IFTYPE_P2P_DEVICE] = { .tx = 0xffff, + /* + * To support P2P PASN pairing let user space register to rx + * also AUTH frames on P2P device interface. + */ .rx = BIT(IEEE80211_STYPE_ACTION >> 4) | - BIT(IEEE80211_STYPE_PROBE_REQ >> 4), + BIT(IEEE80211_STYPE_PROBE_REQ >> 4) | + BIT(IEEE80211_STYPE_AUTH >> 4), }, }; @@ -1305,6 +1311,11 @@ sband->ht_cap.cap & IEEE80211_HT_CAP_SUP_WIDTH_20_40 && !(iftd->he_cap.he_cap_elem.phy_cap_info[0] & he_40_mhz_cap)) return -EINVAL; + + /* no support for per-band vendor elems with MLO */ + if (WARN_ON(iftd->vendor_elems.len && + hw->wiphy->flags & WIPHY_FLAG_SUPPORTS_MLO)) + return -EINVAL; } /* HT, VHT, HE require QoS, thus >= 4 queues */ diff -ruw linux-6.13.12/net/mac80211/mesh_plink.c linux-6.13.12-fbx/net/mac80211/mesh_plink.c --- linux-6.13.12/net/mac80211/mesh_plink.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/mesh_plink.c 2025-09-25 17:40:37.823378413 +0200 @@ -432,15 +432,14 @@ { struct ieee80211_local *local = sdata->local; struct ieee80211_supported_band *sband; - u32 rates, basic_rates = 0, changed = 0; + u32 rates, changed = 0; enum ieee80211_sta_rx_bandwidth bw = sta->sta.deflink.bandwidth; sband = ieee80211_get_sband(sdata); if (!sband) return; - rates = ieee80211_sta_get_rates(sdata, elems, sband->band, - &basic_rates); + rates = ieee80211_sta_get_rates(sdata, elems, sband->band, NULL); spin_lock_bh(&sta->mesh->plink_lock); sta->deflink.rx_stats.last_rx = jiffies; diff -ruw linux-6.13.12/net/mac80211/mlme.c linux-6.13.12-fbx/net/mac80211/mlme.c --- linux-6.13.12/net/mac80211/mlme.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/mlme.c 2025-09-25 17:40:37.823378413 +0200 @@ -347,6 +347,7 @@ static bool ieee80211_verify_peer_he_mcs_support(struct ieee80211_sub_if_data *sdata, + int link_id, const struct ieee80211_he_cap_elem *he_cap, const struct ieee80211_he_operation *he_op) { @@ -374,7 +375,7 @@ */ if ((mcs_80_map_tx & 0x3) == IEEE80211_HE_MCS_NOT_SUPPORTED || (mcs_80_map_rx & 0x3) == IEEE80211_HE_MCS_NOT_SUPPORTED) { - sdata_info(sdata, + link_id_info(sdata, link_id, "Missing mandatory rates for 1 Nss, rx 0x%x, tx 0x%x, disable HE\n", mcs_80_map_tx, mcs_80_map_rx); return false; @@ -420,9 +421,9 @@ if (ap_rx_val == IEEE80211_HE_MCS_NOT_SUPPORTED || ap_tx_val == IEEE80211_HE_MCS_NOT_SUPPORTED || ap_rx_val < ap_op_val || ap_tx_val < ap_op_val) { - sdata_info(sdata, + link_id_info(sdata, link_id, "Invalid rates for %d Nss, rx %d, tx %d oper %d, disable HE\n", - nss, ap_rx_val, ap_rx_val, ap_op_val); + nss, ap_rx_val, ap_tx_val, ap_op_val); return false; } } @@ -592,6 +593,68 @@ return true; } +static void ieee80211_get_rates(struct ieee80211_supported_band *sband, + const u8 *supp_rates, + unsigned int supp_rates_len, + const u8 *ext_supp_rates, + unsigned int ext_supp_rates_len, + u32 *rates, u32 *basic_rates, + unsigned long *unknown_rates_selectors, + bool *have_higher_than_11mbit, + int *min_rate, int *min_rate_index) +{ + int i, j; + + for (i = 0; i < supp_rates_len + ext_supp_rates_len; i++) { + u8 supp_rate = i < supp_rates_len ? + supp_rates[i] : + ext_supp_rates[i - supp_rates_len]; + int rate = supp_rate & 0x7f; + bool is_basic = !!(supp_rate & 0x80); + + if ((rate * 5) > 110 && have_higher_than_11mbit) + *have_higher_than_11mbit = true; + + /* + * Skip 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 + * the same. + */ + if (is_basic && rate >= BSS_MEMBERSHIP_SELECTOR_MIN) { + if (unknown_rates_selectors) + set_bit(rate, unknown_rates_selectors); + continue; + } + + for (j = 0; j < sband->n_bitrates; j++) { + struct ieee80211_rate *br; + int brate; + + br = &sband->bitrates[j]; + + brate = DIV_ROUND_UP(br->bitrate, 5); + if (brate == rate) { + if (rates) + *rates |= BIT(j); + if (is_basic && basic_rates) + *basic_rates |= BIT(j); + if (min_rate && (rate * 5) < *min_rate) { + *min_rate = rate * 5; + if (min_rate_index) + *min_rate_index = j; + } + break; + } + } + + /* Handle an unknown entry as if it is an unknown selector */ + if (is_basic && unknown_rates_selectors && j == sband->n_bitrates) + set_bit(rate, unknown_rates_selectors); + } +} + static bool ieee80211_chandef_usable(struct ieee80211_sub_if_data *sdata, const struct cfg80211_chan_def *chandef, u32 prohibited_flags) @@ -822,7 +885,8 @@ struct ieee80211_conn_settings *conn, struct cfg80211_bss *cbss, int link_id, struct ieee80211_chan_req *chanreq, - struct cfg80211_chan_def *ap_chandef) + struct cfg80211_chan_def *ap_chandef, + unsigned long *userspace_selectors) { const struct cfg80211_bss_ies *ies = rcu_dereference(cbss->ies); struct ieee80211_bss *bss = (void *)cbss->priv; @@ -836,6 +900,8 @@ struct ieee802_11_elems *elems; struct ieee80211_supported_band *sband; enum ieee80211_conn_mode ap_mode; + unsigned long unknown_rates_selectors[BITS_TO_LONGS(128)] = {}; + unsigned long sta_selectors[BITS_TO_LONGS(128)] = {}; int ret; again: @@ -864,6 +930,11 @@ sband = sdata->local->hw.wiphy->bands[channel->band]; + ieee80211_get_rates(sband, elems->supp_rates, elems->supp_rates_len, + elems->ext_supp_rates, elems->ext_supp_rates_len, + NULL, NULL, unknown_rates_selectors, NULL, NULL, + NULL); + switch (channel->band) { case NL80211_BAND_S1GHZ: if (WARN_ON(ap_mode != IEEE80211_CONN_MODE_S1G)) { @@ -873,7 +944,7 @@ return elems; case NL80211_BAND_6GHZ: if (ap_mode < IEEE80211_CONN_MODE_HE) { - sdata_info(sdata, + link_id_info(sdata, link_id, "Rejecting non-HE 6/7 GHz connection"); ret = -EINVAL; goto free; @@ -914,6 +985,29 @@ chanreq->oper = *ap_chandef; + bitmap_copy(sta_selectors, userspace_selectors, 128); + if (conn->mode >= IEEE80211_CONN_MODE_HT) + set_bit(BSS_MEMBERSHIP_SELECTOR_HT_PHY, sta_selectors); + if (conn->mode >= IEEE80211_CONN_MODE_VHT) + set_bit(BSS_MEMBERSHIP_SELECTOR_VHT_PHY, sta_selectors); + if (conn->mode >= IEEE80211_CONN_MODE_HE) + set_bit(BSS_MEMBERSHIP_SELECTOR_HE_PHY, sta_selectors); + if (conn->mode >= IEEE80211_CONN_MODE_EHT) + set_bit(BSS_MEMBERSHIP_SELECTOR_EHT_PHY, sta_selectors); + + /* + * We do not support EPD or GLK so never add them. + * SAE_H2E is handled through userspace_selectors. + */ + + /* Check if we support all required features */ + if (!bitmap_subset(unknown_rates_selectors, sta_selectors, 128)) { + link_id_info(sdata, link_id, + "required basic rate or BSS membership selectors not supported or disabled, rejecting connection\n"); + ret = -EINVAL; + goto free; + } + ieee80211_set_chanreq_ap(sdata, chanreq, conn, ap_chandef); while (!ieee80211_chandef_usable(sdata, &chanreq->oper, @@ -945,16 +1039,18 @@ } if (chanreq->oper.width != ap_chandef->width || ap_mode != conn->mode) - sdata_info(sdata, + link_id_info(sdata, link_id, "regulatory prevented using AP config, downgraded\n"); if (conn->mode >= IEEE80211_CONN_MODE_HE && - (!ieee80211_verify_peer_he_mcs_support(sdata, (void *)elems->he_cap, + (!ieee80211_verify_peer_he_mcs_support(sdata, link_id, + (void *)elems->he_cap, elems->he_operation) || !ieee80211_verify_sta_he_mcs_support(sdata, sband, elems->he_operation))) { conn->mode = IEEE80211_CONN_MODE_VHT; - sdata_info(sdata, "required MCSes not supported, disabling HE\n"); + link_id_info(sdata, link_id, + "required MCSes not supported, disabling HE\n"); } if (conn->mode >= IEEE80211_CONN_MODE_EHT && @@ -964,7 +1060,8 @@ conn->bw_limit = min_t(enum ieee80211_conn_bw_limit, conn->bw_limit, IEEE80211_CONN_BW_LIMIT_160); - sdata_info(sdata, "required MCSes not supported, disabling EHT\n"); + link_id_info(sdata, link_id, + "required MCSes not supported, disabling EHT\n"); } /* the mode can only decrease, so this must terminate */ @@ -991,7 +1088,8 @@ static int ieee80211_config_bw(struct ieee80211_link_data *link, struct ieee802_11_elems *elems, - bool update, u64 *changed) + bool update, u64 *changed, + const char *frame) { struct ieee80211_channel *channel = link->conf->chanreq.oper.chan; struct ieee80211_sub_if_data *sdata = link->sdata; @@ -1016,9 +1114,10 @@ if (ap_mode != link->u.mgd.conn.mode) { link_info(link, - "AP appears to change mode (expected %s, found %s), disconnect\n", + "AP %pM appears to change mode (expected %s, found %s) in %s, disconnect\n", + link->u.mgd.bssid, ieee80211_conn_mode_str(link->u.mgd.conn.mode), - ieee80211_conn_mode_str(ap_mode)); + ieee80211_conn_mode_str(ap_mode), frame); return -EINVAL; } @@ -1063,16 +1162,16 @@ return 0; link_info(link, - "AP %pM changed bandwidth, new used config is %d.%03d MHz, width %d (%d.%03d/%d MHz)\n", - link->u.mgd.bssid, chanreq.oper.chan->center_freq, + "AP %pM changed bandwidth in %s, new used config is %d.%03d MHz, width %d (%d.%03d/%d MHz)\n", + link->u.mgd.bssid, frame, chanreq.oper.chan->center_freq, chanreq.oper.chan->freq_offset, chanreq.oper.width, chanreq.oper.center_freq1, chanreq.oper.freq1_offset, chanreq.oper.center_freq2); if (!cfg80211_chandef_valid(&chanreq.oper)) { sdata_info(sdata, - "AP %pM changed caps/bw in a way we can't support - disconnect\n", - link->u.mgd.bssid); + "AP %pM changed caps/bw in %s in a way we can't support - disconnect\n", + link->u.mgd.bssid, frame); return -EINVAL; } @@ -1101,8 +1200,8 @@ ret = ieee80211_link_change_chanreq(link, &chanreq, changed); if (ret) { sdata_info(sdata, - "AP %pM changed bandwidth to incompatible one - disconnect\n", - link->u.mgd.bssid); + "AP %pM changed bandwidth in %s to incompatible one - disconnect\n", + link->u.mgd.bssid, frame); return ret; } @@ -1419,23 +1518,25 @@ #define PRESENT_ELEMS_MAX 8 #define PRESENT_ELEM_EXT_OFFS 0x100 -static void ieee80211_assoc_add_ml_elem(struct ieee80211_sub_if_data *sdata, +static void +ieee80211_assoc_add_ml_elem(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u16 capab, const struct element *ext_capa, - const u16 *present_elems); + const u16 *present_elems, + struct ieee80211_mgd_assoc_data *assoc_data); -static size_t ieee80211_assoc_link_elems(struct ieee80211_sub_if_data *sdata, +static size_t +ieee80211_add_link_elems(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u16 *capab, const struct element *ext_capa, const u8 *extra_elems, size_t extra_elems_len, unsigned int link_id, struct ieee80211_link_data *link, - u16 *present_elems) + u16 *present_elems, + struct ieee80211_mgd_assoc_data *assoc_data) { enum nl80211_iftype iftype = ieee80211_vif_type_p2p(&sdata->vif); - struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data; struct cfg80211_bss *cbss = assoc_data->link[link_id].bss; struct ieee80211_channel *chan = cbss->channel; const struct ieee80211_sband_iftype_data *iftd; @@ -1584,7 +1685,7 @@ if (link_id == assoc_data->assoc_link_id) ieee80211_assoc_add_ml_elem(sdata, skb, orig_capab, ext_capa, - present_elems); + present_elems, assoc_data); /* crash if somebody gets it wrong */ present_elems = NULL; @@ -1663,14 +1764,14 @@ *len = skb->len - skb_len - 2; } -static void ieee80211_assoc_add_ml_elem(struct ieee80211_sub_if_data *sdata, +static void +ieee80211_assoc_add_ml_elem(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb, u16 capab, const struct element *ext_capa, - const u16 *outer_present_elems) + const u16 *outer_present_elems, + struct ieee80211_mgd_assoc_data *assoc_data) { struct ieee80211_local *local = sdata->local; - struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; - struct ieee80211_mgd_assoc_data *assoc_data = ifmgd->assoc_data; struct ieee80211_multi_link_elem *ml_elem; struct ieee80211_mle_basic_common_info *common; const struct wiphy_iftype_ext_capab *ift_ext_capa; @@ -1743,16 +1844,17 @@ * (if applicable) are skipped. So we only have * the capability field (remember the position and fill * later), followed by the elements added below by - * calling ieee80211_assoc_link_elems(). + * calling ieee80211_add_link_elems(). */ capab_pos = skb_put(skb, 2); - extra_used = ieee80211_assoc_link_elems(sdata, skb, &capab, + extra_used = ieee80211_add_link_elems(sdata, skb, &capab, ext_capa, extra_elems, extra_elems_len, link_id, NULL, - link_present_elems); + link_present_elems, + assoc_data); if (extra_elems) skb_put_data(skb, extra_elems + extra_used, extra_elems_len - extra_used); @@ -1769,6 +1871,55 @@ ieee80211_fragment_element(skb, ml_elem_len, WLAN_EID_FRAGMENT); } +static int +ieee80211_link_common_elems_size(struct ieee80211_sub_if_data *sdata, + enum nl80211_iftype iftype, + struct cfg80211_bss *cbss, + size_t elems_len) +{ + struct ieee80211_local *local = sdata->local; + const struct ieee80211_sband_iftype_data *iftd; + struct ieee80211_supported_band *sband; + size_t size = 0; + + if (!cbss) + return size; + + sband = local->hw.wiphy->bands[cbss->channel->band]; + + /* add STA profile elements length */ + size += elems_len; + + /* and supported rates length */ + size += 4 + sband->n_bitrates; + + /* supported channels */ + size += 2 + 2 * sband->n_channels; + + iftd = ieee80211_get_sband_iftype_data(sband, iftype); + if (iftd) + size += iftd->vendor_elems.len; + + /* power capability */ + size += 4; + + /* HT, VHT, HE, EHT */ + size += 2 + sizeof(struct ieee80211_ht_cap); + size += 2 + sizeof(struct ieee80211_vht_cap); + size += 2 + 1 + sizeof(struct ieee80211_he_cap_elem) + + sizeof(struct ieee80211_he_mcs_nss_supp) + + IEEE80211_HE_PPE_THRES_MAX_LEN; + + if (sband->band == NL80211_BAND_6GHZ) + size += 2 + 1 + sizeof(struct ieee80211_he_6ghz_capa); + + size += 2 + 1 + sizeof(struct ieee80211_eht_cap_elem) + + sizeof(struct ieee80211_eht_mcs_nss_supp) + + IEEE80211_EHT_PPE_THRES_MAX_LEN; + + return size; +} + static int ieee80211_send_assoc(struct ieee80211_sub_if_data *sdata) { struct ieee80211_local *local = sdata->local; @@ -1807,42 +1958,15 @@ for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { struct cfg80211_bss *cbss = assoc_data->link[link_id].bss; - const struct ieee80211_sband_iftype_data *iftd; - struct ieee80211_supported_band *sband; + size_t elems_len = assoc_data->link[link_id].elems_len; if (!cbss) continue; - sband = local->hw.wiphy->bands[cbss->channel->band]; - n_links++; - /* add STA profile elements length */ - size += assoc_data->link[link_id].elems_len; - /* and supported rates length */ - size += 4 + sband->n_bitrates; - /* supported channels */ - size += 2 + 2 * sband->n_channels; - - iftd = ieee80211_get_sband_iftype_data(sband, iftype); - if (iftd) - size += iftd->vendor_elems.len; - /* power capability */ - size += 4; - - /* HT, VHT, HE, EHT */ - size += 2 + sizeof(struct ieee80211_ht_cap); - size += 2 + sizeof(struct ieee80211_vht_cap); - size += 2 + 1 + sizeof(struct ieee80211_he_cap_elem) + - sizeof(struct ieee80211_he_mcs_nss_supp) + - IEEE80211_HE_PPE_THRES_MAX_LEN; - - if (sband->band == NL80211_BAND_6GHZ) - size += 2 + 1 + sizeof(struct ieee80211_he_6ghz_capa); - - size += 2 + 1 + sizeof(struct ieee80211_eht_cap_elem) + - sizeof(struct ieee80211_eht_mcs_nss_supp) + - IEEE80211_EHT_PPE_THRES_MAX_LEN; + size += ieee80211_link_common_elems_size(sdata, iftype, cbss, + elems_len); /* non-inheritance element */ size += 2 + 2 + PRESENT_ELEMS_MAX; @@ -1940,12 +2064,12 @@ /* add the elements for the assoc (main) link */ link_capab = capab; - offset = ieee80211_assoc_link_elems(sdata, skb, &link_capab, + offset = ieee80211_add_link_elems(sdata, skb, &link_capab, ext_capa, assoc_data->ie, assoc_data->ie_len, assoc_data->assoc_link_id, link, - present_elems); + present_elems, assoc_data); put_unaligned_le16(link_capab, capab_pos); /* if present, add any custom non-vendor IEs */ @@ -3601,12 +3725,45 @@ netif_carrier_on(sdata->dev); } +static void ieee80211_ml_reconf_reset(struct ieee80211_sub_if_data *sdata) +{ + struct ieee80211_mgd_assoc_data *add_links_data = + sdata->u.mgd.reconf.add_links_data; + + if (!ieee80211_vif_is_mld(&sdata->vif) || + !(sdata->u.mgd.reconf.added_links | + sdata->u.mgd.reconf.removed_links)) + return; + + wiphy_delayed_work_cancel(sdata->local->hw.wiphy, + &sdata->u.mgd.reconf.wk); + sdata->u.mgd.reconf.added_links = 0; + sdata->u.mgd.reconf.removed_links = 0; + sdata->u.mgd.reconf.dialog_token = 0; + + if (add_links_data) { + struct cfg80211_mlo_reconf_done_data done_data = {}; + u8 link_id; + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) + done_data.links[link_id].bss = + add_links_data->link[link_id].bss; + + cfg80211_mlo_reconf_add_done(sdata->dev, &done_data); + + kfree(sdata->u.mgd.reconf.add_links_data); + sdata->u.mgd.reconf.add_links_data = NULL; + } +} + static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata, u16 stype, u16 reason, bool tx, u8 *frame_buf) { struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; struct ieee80211_local *local = sdata->local; + struct sta_info *ap_sta = sta_info_get(sdata, sdata->vif.cfg.ap_addr); unsigned int link_id; u64 changed = 0; struct ieee80211_prep_tx_info info = { @@ -3617,6 +3774,9 @@ lockdep_assert_wiphy(local->hw.wiphy); + if (WARN_ON(!ap_sta)) + return; + if (WARN_ON_ONCE(tx && !frame_buf)) return; @@ -3680,8 +3840,16 @@ sdata->vif.cfg.ssid_len = 0; - /* remove AP and TDLS peers */ + /* Remove TDLS peers */ + __sta_info_flush(sdata, false, -1, ap_sta); + + if (sdata->vif.driver_flags & IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC) { + /* Only move the AP state */ + sta_info_move_state(ap_sta, IEEE80211_STA_NONE); + } else { + /* Remove AP peer */ sta_info_flush(sdata, -1); + } /* finally reset all BSS / config parameters */ if (!ieee80211_vif_is_mld(&sdata->vif)) @@ -3732,6 +3900,14 @@ ieee80211_vif_cfg_change_notify(sdata, changed); } + if (sdata->vif.driver_flags & IEEE80211_VIF_REMOVE_AP_AFTER_DISASSOC) { + /* + * After notifying the driver about the disassoc, + * remove the ap sta. + */ + sta_info_flush(sdata, -1); + } + /* disassociated - set to defaults now */ ieee80211_set_wmm_default(&sdata->deflink, false, false); @@ -3793,6 +3969,12 @@ ieee80211_vif_set_links(sdata, 0, 0); ifmgd->mcast_seq_last = IEEE80211_SN_MODULO; + + /* if disconnection happens in the middle of the ML reconfiguration + * flow, cfg80211 must called to release the BSS references obtained + * when the flow started. + */ + ieee80211_ml_reconf_reset(sdata); } static void ieee80211_reset_ap_probe(struct ieee80211_sub_if_data *sdata) @@ -3907,9 +4089,6 @@ lockdep_assert_wiphy(sdata->local->hw.wiphy); - if (WARN_ON(ieee80211_vif_is_mld(&sdata->vif))) - return; - /* * Try sending broadcast probe requests for the last three * probe requests after the first ones failed since some @@ -3955,9 +4134,6 @@ lockdep_assert_wiphy(sdata->local->hw.wiphy); - if (WARN_ON_ONCE(ieee80211_vif_is_mld(&sdata->vif))) - return; - if (!ieee80211_sdata_running(sdata)) return; @@ -4228,6 +4404,8 @@ lockdep_assert_wiphy(sdata->local->hw.wiphy); + sdata->u.mgd.auth_data = NULL; + if (!assoc) { /* * we are not authenticated yet, the only timer that could be @@ -4249,7 +4427,6 @@ cfg80211_put_bss(sdata->local->hw.wiphy, auth_data->bss); kfree(auth_data); - sdata->u.mgd.auth_data = NULL; } enum assoc_status { @@ -4266,6 +4443,8 @@ lockdep_assert_wiphy(sdata->local->hw.wiphy); + sdata->u.mgd.assoc_data = NULL; + if (status != ASSOC_SUCCESS) { /* * we are not associated yet, the only timer that could be @@ -4304,7 +4483,6 @@ } kfree(assoc_data); - sdata->u.mgd.assoc_data = NULL; } static void ieee80211_auth_challenge(struct ieee80211_sub_if_data *sdata, @@ -4607,57 +4785,6 @@ false); } -static void ieee80211_get_rates(struct ieee80211_supported_band *sband, - 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 i, j; - - for (i = 0; i < supp_rates_len; i++) { - int rate = supp_rates[i] & 0x7f; - bool is_basic = !!(supp_rates[i] & 0x80); - - if ((rate * 5) > 110) - *have_higher_than_11mbit = true; - - /* - * 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 - * the same. - */ - 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; - - for (j = 0; j < sband->n_bitrates; j++) { - struct ieee80211_rate *br; - int brate; - - br = &sband->bitrates[j]; - - brate = DIV_ROUND_UP(br->bitrate, 5); - if (brate == rate) { - *rates |= BIT(j); - if (is_basic) - *basic_rates |= BIT(j); - if ((rate * 5) < *min_rate) { - *min_rate = rate * 5; - *min_rate_index = j; - } - break; - } - } - } -} - static bool ieee80211_twt_req_supported(struct ieee80211_sub_if_data *sdata, struct ieee80211_supported_band *sband, const struct link_sta_info *link_sta, @@ -4719,7 +4846,8 @@ u64 *changed) { struct ieee80211_sub_if_data *sdata = link->sdata; - struct ieee80211_mgd_assoc_data *assoc_data = sdata->u.mgd.assoc_data; + struct ieee80211_mgd_assoc_data *assoc_data = + sdata->u.mgd.assoc_data ?: sdata->u.mgd.reconf.add_links_data; struct ieee80211_bss_conf *bss_conf = link->conf; struct ieee80211_local *local = sdata->local; unsigned int link_id = link->link_id; @@ -4907,7 +5035,7 @@ /* check/update if AP changed anything in assoc response vs. scan */ if (ieee80211_config_bw(link, elems, link_id == assoc_data->assoc_link_id, - changed)) { + changed, "assoc response")) { ret = false; goto out; } @@ -5139,7 +5267,9 @@ sband = local->hw.wiphy->bands[cbss->channel->band]; ieee80211_get_rates(sband, bss->supp_rates, bss->supp_rates_len, - &rates, &basic_rates, &have_higher_than_11mbit, + NULL, 0, + &rates, &basic_rates, NULL, + &have_higher_than_11mbit, &min_rate, &min_rate_index); /* @@ -5532,7 +5662,8 @@ struct ieee80211_link_data *link, int link_id, struct cfg80211_bss *cbss, bool mlo, - struct ieee80211_conn_settings *conn) + struct ieee80211_conn_settings *conn, + unsigned long *userspace_selectors) { struct ieee80211_local *local = sdata->local; bool is_6ghz = cbss->channel->band == NL80211_BAND_6GHZ; @@ -5545,7 +5676,8 @@ rcu_read_lock(); elems = ieee80211_determine_chan_mode(sdata, conn, cbss, link_id, - &chanreq, &ap_chandef); + &chanreq, &ap_chandef, + userspace_selectors); if (IS_ERR(elems)) { rcu_read_unlock(); @@ -5739,7 +5871,8 @@ link->u.mgd.conn = assoc_data->link[link_id].conn; err = ieee80211_prep_channel(sdata, link, link_id, cbss, - true, &link->u.mgd.conn); + true, &link->u.mgd.conn, + assoc_data->userspace_selectors); if (err) { link_info(link, "prep_channel failed\n"); goto out_err; @@ -5857,6 +5990,8 @@ if (!assoc_data) return; + info.link_id = assoc_data->assoc_link_id; + parse_params.mode = assoc_data->link[assoc_data->assoc_link_id].conn.mode; @@ -7074,7 +7209,7 @@ changed |= ieee80211_recalc_twt_req(sdata, sband, link, link_sta, elems); - if (ieee80211_config_bw(link, elems, true, &changed)) { + if (ieee80211_config_bw(link, elems, true, &changed, "beacon")) { ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, WLAN_REASON_DEAUTH_LEAVING, true, deauth_buf); @@ -8153,6 +8288,25 @@ link->u.mgd.driver_smps_mode); } +static void ieee80211_ml_sta_reconf_timeout(struct wiphy *wiphy, + struct wiphy_work *work) +{ + struct ieee80211_sub_if_data *sdata = + container_of(work, struct ieee80211_sub_if_data, + u.mgd.reconf.wk.work); + + if (!sdata->u.mgd.reconf.added_links && + !sdata->u.mgd.reconf.removed_links) + return; + + sdata_info(sdata, + "mlo: reconf: timeout: added=0x%x, removed=0x%x\n", + sdata->u.mgd.reconf.added_links, + sdata->u.mgd.reconf.removed_links); + + __ieee80211_disconnect(sdata); +} + /* interface setup */ void ieee80211_sta_setup_sdata(struct ieee80211_sub_if_data *sdata) { @@ -8167,6 +8321,8 @@ ieee80211_tdls_peer_del_work); wiphy_delayed_work_init(&ifmgd->ml_reconf_work, ieee80211_ml_reconf_work); + wiphy_delayed_work_init(&ifmgd->reconf.wk, + ieee80211_ml_sta_reconf_timeout); 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); @@ -8227,6 +8383,9 @@ if (sdata->u.mgd.assoc_data) ether_addr_copy(link->conf->addr, sdata->u.mgd.assoc_data->link[link_id].addr); + else if (sdata->u.mgd.reconf.add_links_data) + ether_addr_copy(link->conf->addr, + sdata->u.mgd.reconf.add_links_data->link[link_id].addr); else if (!is_valid_ether_addr(link->conf->addr)) eth_random_addr(link->conf->addr); } @@ -8249,7 +8408,8 @@ struct cfg80211_bss *cbss, s8 link_id, const u8 *ap_mld_addr, bool assoc, struct ieee80211_conn_settings *conn, - bool override) + bool override, + unsigned long *userspace_selectors) { struct ieee80211_local *local = sdata->local; struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; @@ -8388,7 +8548,8 @@ */ link->u.mgd.conn = *conn; err = ieee80211_prep_channel(sdata, link, link->link_id, cbss, - mlo, &link->u.mgd.conn); + mlo, &link->u.mgd.conn, + userspace_selectors); if (err) { if (new_sta) sta_info_free(local, new_sta); @@ -8504,6 +8665,22 @@ return ret; } +static void ieee80211_parse_cfg_selectors(unsigned long *userspace_selectors, + const u8 *supported_selectors, + u8 supported_selectors_len) +{ + if (supported_selectors) { + for (int i = 0; i < supported_selectors_len; i++) { + set_bit(supported_selectors[i], + userspace_selectors); + } + } else { + /* Assume SAE_H2E support for backward compatibility. */ + set_bit(BSS_MEMBERSHIP_SELECTOR_SAE_H2E, + userspace_selectors); + } +} + /* config hooks */ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata, struct cfg80211_auth_request *req) @@ -8605,6 +8782,10 @@ memcpy(auth_data->key, req->key, req->key_len); } + ieee80211_parse_cfg_selectors(auth_data->userspace_selectors, + req->supported_selectors, + req->supported_selectors_len); + auth_data->algorithm = auth_alg; /* try to authenticate/probe */ @@ -8658,7 +8839,8 @@ err = ieee80211_prep_connection(sdata, req->bss, req->link_id, req->ap_mld_addr, cont_auth, - &conn, false); + &conn, false, + auth_data->userspace_selectors); if (err) goto err_clear; @@ -8945,6 +9127,10 @@ false); } + ieee80211_parse_cfg_selectors(assoc_data->userspace_selectors, + req->supported_selectors, + req->supported_selectors_len); + memcpy(&ifmgd->ht_capa, &req->ht_capa, sizeof(ifmgd->ht_capa)); memcpy(&ifmgd->ht_capa_mask, &req->ht_capa_mask, sizeof(ifmgd->ht_capa_mask)); @@ -9191,7 +9377,8 @@ /* only calculate the mode, hence link == NULL */ err = ieee80211_prep_channel(sdata, NULL, i, assoc_data->link[i].bss, true, - &assoc_data->link[i].conn); + &assoc_data->link[i].conn, + assoc_data->userspace_selectors); if (err) { req->links[i].error = err; goto err_clear; @@ -9207,7 +9394,8 @@ err = ieee80211_prep_connection(sdata, cbss, req->link_id, req->ap_mld_addr, true, &assoc_data->link[assoc_link_id].conn, - override); + override, + assoc_data->userspace_selectors); if (err) goto err_clear; @@ -9451,3 +9639,697 @@ _ieee80211_enable_rssi_reports(sdata, 0, 0); } EXPORT_SYMBOL(ieee80211_disable_rssi_reports); + +static void ieee80211_ml_reconf_selectors(unsigned long *userspace_selectors) +{ + *userspace_selectors = 0; + + /* these selectors are mandatory for ML reconfiguration */ + set_bit(BSS_MEMBERSHIP_SELECTOR_SAE_H2E, userspace_selectors); + set_bit(BSS_MEMBERSHIP_SELECTOR_HE_PHY, userspace_selectors); + set_bit(BSS_MEMBERSHIP_SELECTOR_EHT_PHY, userspace_selectors); +} + +void ieee80211_process_ml_reconf_resp(struct ieee80211_sub_if_data *sdata, + struct ieee80211_mgmt *mgmt, size_t len) +{ + struct ieee80211_local *local = sdata->local; + struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; + struct ieee80211_mgd_assoc_data *add_links_data = + ifmgd->reconf.add_links_data; + struct sta_info *sta; + struct cfg80211_mlo_reconf_done_data done_data = {}; + u16 sta_changed_links = sdata->u.mgd.reconf.added_links | + sdata->u.mgd.reconf.removed_links; + u16 link_mask, valid_links; + unsigned int link_id; + unsigned long userspace_selectors; + size_t orig_len = len; + u8 i, group_key_data_len; + u8 *pos; + + if (!ieee80211_vif_is_mld(&sdata->vif) || + len < offsetofend(typeof(*mgmt), u.action.u.ml_reconf_resp) || + mgmt->u.action.u.ml_reconf_resp.dialog_token != + sdata->u.mgd.reconf.dialog_token || + !sta_changed_links) + return; + + pos = mgmt->u.action.u.ml_reconf_resp.variable; + len -= offsetofend(typeof(*mgmt), u.action.u.ml_reconf_resp); + + /* each status duple is 3 octets */ + if (len < mgmt->u.action.u.ml_reconf_resp.count * 3) { + sdata_info(sdata, + "mlo: reconf: unexpected len=%zu, count=%u\n", + len, mgmt->u.action.u.ml_reconf_resp.count); + goto disconnect; + } + + link_mask = sta_changed_links; + for (i = 0; i < mgmt->u.action.u.ml_reconf_resp.count; i++) { + u16 status = get_unaligned_le16(pos + 1); + + link_id = *pos; + + if (!(link_mask & BIT(link_id))) { + sdata_info(sdata, + "mlo: reconf: unexpected link: %u, changed=0x%x\n", + link_id, sta_changed_links); + goto disconnect; + } + + /* clear the corresponding link, to detect the case that + * the same link was included more than one time + */ + link_mask &= ~BIT(link_id); + + /* Handle failure to remove links here. Failure to remove added + * links will be done later in the flow. + */ + if (status != WLAN_STATUS_SUCCESS) { + sdata_info(sdata, + "mlo: reconf: failed on link=%u, status=%u\n", + link_id, status); + + /* The AP MLD failed to remove a link that was already + * removed locally. As this is not expected behavior, + * disconnect + */ + if (sdata->u.mgd.reconf.removed_links & BIT(link_id)) + goto disconnect; + + /* The AP MLD failed to add a link. Remove it from the + * added links. + */ + sdata->u.mgd.reconf.added_links &= ~BIT(link_id); + } + + pos += 3; + len -= 3; + } + + if (link_mask) { + sdata_info(sdata, + "mlo: reconf: no response for links=0x%x\n", + link_mask); + goto disconnect; + } + + if (!sdata->u.mgd.reconf.added_links) + goto out; + + if (len < 1 || len < 1 + *pos) { + sdata_info(sdata, + "mlo: reconf: invalid group key data length"); + goto disconnect; + } + + /* The Group Key Data field must be present when links are added. This + * field should be processed by userland. + */ + group_key_data_len = *pos++; + + pos += group_key_data_len; + len -= group_key_data_len + 1; + + /* Process the information for the added links */ + sta = sta_info_get(sdata, sdata->vif.cfg.ap_addr); + if (WARN_ON(!sta)) + goto disconnect; + + valid_links = sdata->vif.valid_links; + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { + if (!add_links_data->link[link_id].bss || + !(sdata->u.mgd.reconf.added_links & BIT(link_id))) + + continue; + + valid_links |= BIT(link_id); + if (ieee80211_sta_allocate_link(sta, link_id)) + goto disconnect; + } + + ieee80211_vif_set_links(sdata, valid_links, sdata->vif.dormant_links); + ieee80211_ml_reconf_selectors(&userspace_selectors); + link_mask = 0; + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { + struct cfg80211_bss *cbss = add_links_data->link[link_id].bss; + struct ieee80211_link_data *link; + struct link_sta_info *link_sta; + u64 changed = 0; + + if (!cbss) + continue; + + link = sdata_dereference(sdata->link[link_id], sdata); + if (WARN_ON(!link)) + goto disconnect; + + link_info(link, + "mlo: reconf: local address %pM, AP link address %pM\n", + add_links_data->link[link_id].addr, + add_links_data->link[link_id].bss->bssid); + + link_sta = rcu_dereference_protected(sta->link[link_id], + lockdep_is_held(&local->hw.wiphy->mtx)); + if (WARN_ON(!link_sta)) + goto disconnect; + + if (!link->u.mgd.have_beacon) { + const struct cfg80211_bss_ies *ies; + + rcu_read_lock(); + ies = rcu_dereference(cbss->beacon_ies); + if (ies) + link->u.mgd.have_beacon = true; + else + ies = rcu_dereference(cbss->ies); + ieee80211_get_dtim(ies, + &link->conf->sync_dtim_count, + &link->u.mgd.dtim_period); + link->conf->beacon_int = cbss->beacon_interval; + rcu_read_unlock(); + } + + link->conf->dtim_period = link->u.mgd.dtim_period ?: 1; + + link->u.mgd.conn = add_links_data->link[link_id].conn; + if (ieee80211_prep_channel(sdata, link, link_id, cbss, + true, &link->u.mgd.conn, + &userspace_selectors)) { + link_info(link, "mlo: reconf: prep_channel failed\n"); + goto disconnect; + } + + if (ieee80211_mgd_setup_link_sta(link, sta, link_sta, + add_links_data->link[link_id].bss)) + goto disconnect; + + if (!ieee80211_assoc_config_link(link, link_sta, + add_links_data->link[link_id].bss, + mgmt, pos, len, + &changed)) + goto disconnect; + + /* The AP MLD indicated success for this link, but the station + * profile status indicated otherwise. Since there is an + * inconsistency in the ML reconfiguration response, disconnect + */ + if (add_links_data->link[link_id].status != WLAN_STATUS_SUCCESS) + goto disconnect; + + ieee80211_sta_init_nss(link_sta); + if (ieee80211_sta_activate_link(sta, link_id)) + goto disconnect; + + changed |= ieee80211_link_set_associated(link, cbss); + ieee80211_link_info_change_notify(sdata, link, changed); + + ieee80211_recalc_smps(sdata, link); + link_mask |= BIT(link_id); + } + + sdata_info(sdata, + "mlo: reconf: current valid_links=0x%x, added=0x%x\n", + valid_links, link_mask); + + /* links might have changed due to rejected ones, set them again */ + ieee80211_vif_set_links(sdata, valid_links, sdata->vif.dormant_links); + ieee80211_vif_cfg_change_notify(sdata, BSS_CHANGED_MLD_VALID_LINKS); + + ieee80211_recalc_ps(local); + ieee80211_recalc_ps_vif(sdata); + + done_data.buf = (const u8 *)mgmt; + done_data.len = orig_len; + done_data.added_links = link_mask; + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) + done_data.links[link_id].bss = add_links_data->link[link_id].bss; + + cfg80211_mlo_reconf_add_done(sdata->dev, &done_data); + kfree(sdata->u.mgd.reconf.add_links_data); + sdata->u.mgd.reconf.add_links_data = NULL; +out: + ieee80211_ml_reconf_reset(sdata); + return; + +disconnect: + __ieee80211_disconnect(sdata); +} + +static struct sk_buff * +ieee80211_build_ml_reconf_req(struct ieee80211_sub_if_data *sdata, + struct ieee80211_mgd_assoc_data *add_links_data, + u16 removed_links) +{ + struct ieee80211_local *local = sdata->local; + struct ieee80211_mgmt *mgmt; + struct ieee80211_multi_link_elem *ml_elem; + struct ieee80211_mle_basic_common_info *common; + enum nl80211_iftype iftype = ieee80211_vif_type_p2p(&sdata->vif); + struct sk_buff *skb; + size_t size; + unsigned int link_id; + __le16 eml_capa = 0, mld_capa_ops = 0; + struct ieee80211_tx_info *info; + u8 common_size, var_common_size; + u8 *ml_elem_len; + u16 capab = 0; + + size = local->hw.extra_tx_headroom + sizeof(*mgmt); + + /* Consider the maximal length of the reconfiguration ML element */ + size += sizeof(struct ieee80211_multi_link_elem); + + /* The Basic ML element and the Reconfiguration ML element have the same + * fixed common information fields in the context of ML reconfiguration + * action frame. The AP MLD MAC address must always be present + */ + common_size = sizeof(*common); + + /* when adding links, the MLD capabilities must be present */ + var_common_size = 0; + if (add_links_data) { + const struct wiphy_iftype_ext_capab *ift_ext_capa = + cfg80211_get_iftype_ext_capa(local->hw.wiphy, + ieee80211_vif_type_p2p(&sdata->vif)); + + if (ift_ext_capa) { + eml_capa = cpu_to_le16(ift_ext_capa->eml_capabilities); + mld_capa_ops = + cpu_to_le16(ift_ext_capa->mld_capa_and_ops); + } + + /* MLD capabilities and operation */ + var_common_size += 2; + + /* EML capabilities */ + if (eml_capa & cpu_to_le16((IEEE80211_EML_CAP_EMLSR_SUPP | + IEEE80211_EML_CAP_EMLMR_SUPPORT))) + var_common_size += 2; + } + + /* Add the common information length */ + size += common_size + var_common_size; + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { + struct cfg80211_bss *cbss; + size_t elems_len; + + if (removed_links & BIT(link_id)) { + size += sizeof(struct ieee80211_mle_per_sta_profile) + + ETH_ALEN; + continue; + } + + if (!add_links_data || !add_links_data->link[link_id].bss) + continue; + + elems_len = add_links_data->link[link_id].elems_len; + cbss = add_links_data->link[link_id].bss; + + /* should be the same across all BSSes */ + if (cbss->capability & WLAN_CAPABILITY_PRIVACY) + capab |= WLAN_CAPABILITY_PRIVACY; + + size += 2 + sizeof(struct ieee80211_mle_per_sta_profile) + + ETH_ALEN; + + /* SSID element + WMM */ + size += 2 + sdata->vif.cfg.ssid_len + 9; + size += ieee80211_link_common_elems_size(sdata, iftype, cbss, + elems_len); + } + + skb = alloc_skb(size, GFP_KERNEL); + if (!skb) + return NULL; + + skb_reserve(skb, local->hw.extra_tx_headroom); + mgmt = skb_put_zero(skb, offsetofend(struct ieee80211_mgmt, + u.action.u.ml_reconf_req)); + + /* Add the MAC header */ + mgmt->frame_control = cpu_to_le16(IEEE80211_FTYPE_MGMT | + IEEE80211_STYPE_ACTION); + memcpy(mgmt->da, sdata->vif.cfg.ap_addr, ETH_ALEN); + memcpy(mgmt->sa, sdata->vif.addr, ETH_ALEN); + memcpy(mgmt->bssid, sdata->vif.cfg.ap_addr, ETH_ALEN); + + /* Add the action frame fixed fields */ + mgmt->u.action.category = WLAN_CATEGORY_PROTECTED_EHT; + mgmt->u.action.u.ml_reconf_req.action_code = + WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_REQ; + + /* allocate a dialog token and store it */ + sdata->u.mgd.reconf.dialog_token = ++sdata->u.mgd.dialog_token_alloc; + mgmt->u.action.u.ml_reconf_req.dialog_token = + sdata->u.mgd.reconf.dialog_token; + + /* Add the ML reconfiguration element and the common information */ + skb_put_u8(skb, WLAN_EID_EXTENSION); + ml_elem_len = skb_put(skb, 1); + skb_put_u8(skb, WLAN_EID_EXT_EHT_MULTI_LINK); + ml_elem = skb_put(skb, sizeof(*ml_elem)); + ml_elem->control = + cpu_to_le16(IEEE80211_ML_CONTROL_TYPE_RECONF | + IEEE80211_MLC_RECONF_PRES_MLD_MAC_ADDR); + common = skb_put(skb, common_size); + common->len = common_size + var_common_size; + memcpy(common->mld_mac_addr, sdata->vif.addr, ETH_ALEN); + + if (add_links_data) { + if (eml_capa & + cpu_to_le16((IEEE80211_EML_CAP_EMLSR_SUPP | + IEEE80211_EML_CAP_EMLMR_SUPPORT))) { + ml_elem->control |= + cpu_to_le16(IEEE80211_MLC_RECONF_PRES_EML_CAPA); + skb_put_data(skb, &eml_capa, sizeof(eml_capa)); + } + + ml_elem->control |= + cpu_to_le16(IEEE80211_MLC_RECONF_PRES_MLD_CAPA_OP); + + skb_put_data(skb, &mld_capa_ops, sizeof(mld_capa_ops)); + } + + if (sdata->u.mgd.flags & IEEE80211_STA_ENABLE_RRM) + capab |= WLAN_CAPABILITY_RADIO_MEASURE; + + /* Add the per station profile */ + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; link_id++) { + u8 *subelem_len = NULL; + u16 ctrl; + const u8 *addr; + + /* Skip links that are not changing */ + if (!(removed_links & BIT(link_id)) && + (!add_links_data || !add_links_data->link[link_id].bss)) + continue; + + ctrl = link_id | + IEEE80211_MLE_STA_RECONF_CONTROL_STA_MAC_ADDR_PRESENT; + + if (removed_links & BIT(link_id)) { + struct ieee80211_bss_conf *conf = + sdata_dereference(sdata->vif.link_conf[link_id], + sdata); + if (!conf) + continue; + + addr = conf->addr; + ctrl |= u16_encode_bits(IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_DEL_LINK, + IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE); + } else { + addr = add_links_data->link[link_id].addr; + ctrl |= IEEE80211_MLE_STA_RECONF_CONTROL_COMPLETE_PROFILE | + u16_encode_bits(IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE_ADD_LINK, + IEEE80211_MLE_STA_RECONF_CONTROL_OPERATION_TYPE); + } + + skb_put_u8(skb, IEEE80211_MLE_SUBELEM_PER_STA_PROFILE); + subelem_len = skb_put(skb, 1); + + put_unaligned_le16(ctrl, skb_put(skb, sizeof(ctrl))); + skb_put_u8(skb, 1 + ETH_ALEN); + skb_put_data(skb, addr, ETH_ALEN); + + if (!(removed_links & BIT(link_id))) { + u16 link_present_elems[PRESENT_ELEMS_MAX] = {}; + size_t extra_used; + void *capab_pos; + u8 qos_info; + + capab_pos = skb_put(skb, 2); + + skb_put_u8(skb, WLAN_EID_SSID); + skb_put_u8(skb, sdata->vif.cfg.ssid_len); + skb_put_data(skb, sdata->vif.cfg.ssid, + sdata->vif.cfg.ssid_len); + + extra_used = + ieee80211_add_link_elems(sdata, skb, &capab, NULL, + add_links_data->link[link_id].elems, + add_links_data->link[link_id].elems_len, + link_id, NULL, + link_present_elems, + add_links_data); + + if (add_links_data->link[link_id].elems) + skb_put_data(skb, + add_links_data->link[link_id].elems + + extra_used, + add_links_data->link[link_id].elems_len - + extra_used); + if (sdata->u.mgd.flags & IEEE80211_STA_UAPSD_ENABLED) { + qos_info = sdata->u.mgd.uapsd_queues; + qos_info |= (sdata->u.mgd.uapsd_max_sp_len << + IEEE80211_WMM_IE_STA_QOSINFO_SP_SHIFT); + } else { + qos_info = 0; + } + + ieee80211_add_wmm_info_ie(skb_put(skb, 9), qos_info); + put_unaligned_le16(capab, capab_pos); + } + + ieee80211_fragment_element(skb, subelem_len, + IEEE80211_MLE_SUBELEM_FRAGMENT); + } + + ieee80211_fragment_element(skb, ml_elem_len, WLAN_EID_FRAGMENT); + + info = IEEE80211_SKB_CB(skb); + info->flags |= IEEE80211_TX_CTL_REQ_TX_STATUS; + + return skb; +} + +int ieee80211_mgd_assoc_ml_reconf(struct ieee80211_sub_if_data *sdata, + struct cfg80211_assoc_link *add_links, + u16 rem_links) +{ + struct ieee80211_local *local = sdata->local; + struct ieee80211_mgd_assoc_data *data = NULL; + struct sta_info *sta; + struct sk_buff *skb; + u16 added_links, new_valid_links; + int link_id, err; + + if (!ieee80211_vif_is_mld(&sdata->vif) || + !(sdata->vif.cfg.mld_capa_op & + IEEE80211_MLD_CAP_OP_LINK_RECONF_SUPPORT)) + return -EINVAL; + + /* No support for concurrent ML reconfiguration operation */ + if (sdata->u.mgd.reconf.added_links || + sdata->u.mgd.reconf.removed_links) + return -EBUSY; + + added_links = 0; + for (link_id = 0; add_links && link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) { + if (!add_links[link_id].bss) + continue; + + added_links |= BIT(link_id); + } + + sta = sta_info_get(sdata, sdata->vif.cfg.ap_addr); + if (WARN_ON(!sta)) + return -ENOLINK; + + if (rem_links & BIT(sta->sta.deflink.link_id)) + return -EINVAL; + + /* Adding links to the set of valid link is done only after a successful + * ML reconfiguration frame exchange. Here prepare the data for the ML + * reconfiguration frame construction and allocate the required + * resources + */ + if (added_links) { + bool uapsd_supported; + unsigned long userspace_selectors; + + data = kzalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + uapsd_supported = true; + ieee80211_ml_reconf_selectors(&userspace_selectors); + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) { + struct ieee80211_supported_band *sband; + struct cfg80211_bss *link_cbss = add_links[link_id].bss; + struct ieee80211_bss *bss; + + if (!link_cbss) + continue; + + bss = (void *)link_cbss->priv; + + if (!bss->wmm_used) { + err = -EINVAL; + goto err_free; + } + + if (link_cbss->channel->band == NL80211_BAND_S1GHZ) { + err = -EINVAL; + goto err_free; + } + + eth_random_addr(data->link[link_id].addr); + data->link[link_id].conn = + ieee80211_conn_settings_unlimited; + sband = + local->hw.wiphy->bands[link_cbss->channel->band]; + + ieee80211_determine_our_sta_mode(sdata, sband, + NULL, true, link_id, + &data->link[link_id].conn); + + data->link[link_id].bss = link_cbss; + data->link[link_id].disabled = + add_links[link_id].disabled; + data->link[link_id].elems = + (u8 *)add_links[link_id].elems; + data->link[link_id].elems_len = + add_links[link_id].elems_len; + + if (!bss->uapsd_supported) + uapsd_supported = false; + + if (data->link[link_id].conn.mode < + IEEE80211_CONN_MODE_EHT) { + err = -EINVAL; + goto err_free; + } + + err = ieee80211_mgd_get_ap_ht_vht_capa(sdata, data, + link_id); + if (err) { + err = -EINVAL; + goto err_free; + } + } + + /* Require U-APSD support to be similar to the current valid + * links + */ + if (uapsd_supported != + !!(sdata->u.mgd.flags & IEEE80211_STA_UAPSD_ENABLED)) { + err = -EINVAL; + goto err_free; + } + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) { + if (!data->link[link_id].bss) + continue; + + /* only used to verify the mode, nothing is allocated */ + err = ieee80211_prep_channel(sdata, NULL, link_id, + data->link[link_id].bss, + true, + &data->link[link_id].conn, + &userspace_selectors); + if (err) + goto err_free; + } + } + + /* link removal is done before the ML reconfiguration frame exchange so + * that these links will not be used between their removal by the AP MLD + * and before the station got the ML reconfiguration response. Based on + * Section 35.3.6.4 in Draft P802.11be_D7.0 the AP MLD should accept the + * link removal request. + */ + if (rem_links) { + u16 new_active_links = sdata->vif.active_links & ~rem_links; + + new_valid_links = sdata->vif.valid_links & ~rem_links; + + /* Should not be left with no valid links to perform the + * ML reconfiguration + */ + if (!new_valid_links || + !(new_valid_links & ~sdata->vif.dormant_links)) { + sdata_info(sdata, "mlo: reconf: no valid links\n"); + err = -EINVAL; + goto err_free; + } + + if (new_active_links != sdata->vif.active_links) { + if (!new_active_links) + new_active_links = + BIT(__ffs(new_valid_links & + ~sdata->vif.dormant_links)); + + err = ieee80211_set_active_links(&sdata->vif, + new_active_links); + if (err) { + sdata_info(sdata, + "mlo: reconf: failed set active links\n"); + goto err_free; + } + } + } + + /* Build the SKB before the link removal as the construction of the + * station info for removed links requires the local address. + * Invalidate the removed links, so that the transmission of the ML + * reconfiguration request frame would not be done using them, as the AP + * is expected to send the ML reconfiguration response frame on the link + * on which the request was received. + */ + skb = ieee80211_build_ml_reconf_req(sdata, data, rem_links); + if (!skb) { + err = -ENOMEM; + goto err_free; + } + + if (rem_links) { + u16 new_dormant_links = sdata->vif.dormant_links & ~rem_links; + + err = ieee80211_vif_set_links(sdata, new_valid_links, + new_dormant_links); + if (err) { + sdata_info(sdata, + "mlo: reconf: failed set valid links\n"); + kfree_skb(skb); + goto err_free; + } + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) { + if (!(rem_links & BIT(link_id))) + continue; + + ieee80211_sta_remove_link(sta, link_id); + } + + /* notify the driver and upper layers */ + ieee80211_vif_cfg_change_notify(sdata, + BSS_CHANGED_MLD_VALID_LINKS); + cfg80211_links_removed(sdata->dev, rem_links); + } + + sdata_info(sdata, "mlo: reconf: adding=0x%x, removed=0x%x\n", + added_links, rem_links); + + ieee80211_tx_skb(sdata, skb); + + sdata->u.mgd.reconf.added_links = added_links; + sdata->u.mgd.reconf.add_links_data = data; + sdata->u.mgd.reconf.removed_links = rem_links; + wiphy_delayed_work_queue(sdata->local->hw.wiphy, + &sdata->u.mgd.reconf.wk, + IEEE80211_ASSOC_TIMEOUT_SHORT); + return 0; + + err_free: + kfree(data); + return err; +} diff -ruw linux-6.13.12/net/mac80211/offchannel.c linux-6.13.12-fbx/net/mac80211/offchannel.c --- linux-6.13.12/net/mac80211/offchannel.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/offchannel.c 2025-09-25 17:40:37.827378433 +0200 @@ -565,6 +565,7 @@ struct sk_buff *txskb, enum ieee80211_roc_type type) { + struct cfg80211_scan_request *req = local->scan_req; struct ieee80211_roc_work *roc, *tmp; bool queued = false, combine_started = true; int ret; @@ -614,7 +615,7 @@ /* if there's no need to queue, handle it immediately */ if (list_empty(&local->roc_list) && - !local->scanning && !ieee80211_is_radar_required(local)) { + !local->scanning && !ieee80211_is_radar_required(local, req)) { /* if not HW assist, just queue & schedule work */ if (!local->ops->remain_on_channel) { list_add_tail(&roc->list, &local->roc_list); diff -ruw linux-6.13.12/net/mac80211/rx.c linux-6.13.12-fbx/net/mac80211/rx.c --- linux-6.13.12/net/mac80211/rx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/rx.c 2025-09-25 17:40:37.827378433 +0200 @@ -23,6 +23,7 @@ #include #include #include +#include #include "ieee80211_i.h" #include "driver-ops.h" @@ -34,6 +35,8 @@ #include "wme.h" #include "rate.h" +#include "fbx_scum_monif.h" + /* * monitor mode reception * @@ -822,17 +825,12 @@ return NULL; } - only_monitor = should_drop_frame(origskb, present_fcs_len, rtap_space); + fbx80211_scum_mon_rx(local, origskb, rate, rtap_space); - if (!local->monitors || (status->flag & RX_FLAG_SKIP_MONITOR)) { - if (only_monitor) { - dev_kfree_skb(origskb); - return NULL; - } + only_monitor = should_drop_frame(origskb, present_fcs_len, rtap_space); - 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); @@ -885,6 +883,11 @@ if (!origskb) return NULL; +out: + if (only_monitor) { + dev_kfree_skb(origskb); + return NULL; + } return ieee80211_clean_skb(origskb, present_fcs_len, rtap_space); } @@ -3035,8 +3038,7 @@ check_da = NULL; break; case NL80211_IFTYPE_STATION: - if (!rx->sta || - !test_sta_flag(rx->sta, WLAN_STA_TDLS_PEER)) + if (!test_sta_flag(rx->sta, WLAN_STA_TDLS_PEER)) check_sa = NULL; break; case NL80211_IFTYPE_MESH_POINT: @@ -3820,6 +3822,18 @@ u.action.u.ttlm_res)) goto invalid; goto queue; + case WLAN_PROTECTED_EHT_ACTION_LINK_RECONFIG_RESP: + if (sdata->vif.type != NL80211_IFTYPE_STATION) + break; + + /* The reconfiguration response action frame must + * least one 'Status Duple' entry (3 octets) + */ + if (len < + offsetofend(typeof(*mgmt), + u.action.u.ml_reconf_resp) + 3) + goto invalid; + goto queue; default: break; } @@ -4563,7 +4577,9 @@ return ieee80211_is_public_action(hdr, skb->len) || ieee80211_is_probe_req(hdr->frame_control) || ieee80211_is_probe_resp(hdr->frame_control) || - ieee80211_is_beacon(hdr->frame_control); + ieee80211_is_beacon(hdr->frame_control) || + (ieee80211_is_auth(hdr->frame_control) && + ether_addr_equal(sdata->vif.addr, hdr->addr1)); case NL80211_IFTYPE_NAN: /* Currently no frames on NAN interface are allowed */ return false; @@ -5305,6 +5321,12 @@ prev = NULL; list_for_each_entry_rcu(sdata, &local->interfaces, list) { + unsigned int link_id; + struct ieee80211_bss_conf *bss_conf; + struct ieee80211_chanctx_conf *conf; + unsigned long valid_links = sdata->vif.valid_links; + bool flag = false; + if (!ieee80211_sdata_running(sdata)) continue; @@ -5312,12 +5334,37 @@ sdata->vif.type == NL80211_IFTYPE_AP_VLAN) continue; + if (valid_links) { + for_each_set_bit(link_id, &valid_links, + IEEE80211_MLD_MAX_NUM_LINKS) { + bss_conf = rcu_dereference(sdata->vif.link_conf[link_id]); + if (bss_conf) { + conf = rcu_dereference(bss_conf->chanctx_conf); + if (conf && conf->def.chan && + conf->def.chan->center_freq == status->freq) { + flag = true; + break; + } + } + } + } else { + bss_conf = &sdata->vif.bss_conf; + + if (bss_conf) { + conf = rcu_dereference(bss_conf->chanctx_conf); + if (conf && conf->def.chan && + conf->def.chan->center_freq == status->freq) + flag = true; + } + } + /* * frame is destined for this interface, but if it's * not also for the previous one we handle that after * the loop to avoid copying the SKB once too much */ + if (flag) { if (!prev) { prev = sdata; continue; @@ -5328,13 +5375,47 @@ prev = sdata; } + } if (prev) { + unsigned int link_id; + struct ieee80211_bss_conf *bss_conf; + struct ieee80211_chanctx_conf *conf; + unsigned long valid_links = prev->vif.valid_links; + bool flag = false; + + if (valid_links) { + for_each_set_bit(link_id, &valid_links, + IEEE80211_MLD_MAX_NUM_LINKS) { + bss_conf = rcu_dereference(prev->vif.link_conf[link_id]); + + if (bss_conf) { + conf = rcu_dereference(bss_conf->chanctx_conf); + if (conf && conf->def.chan && + conf->def.chan->center_freq == status->freq) { + flag = true; + break; + } + } + } + } else { + bss_conf = &prev->vif.bss_conf; + + if (bss_conf) { + conf = rcu_dereference(bss_conf->chanctx_conf); + if (conf && conf->def.chan && + conf->def.chan->center_freq == status->freq) + flag = true; + } + } + + if (flag) { rx.sdata = prev; if (ieee80211_rx_for_interface(&rx, skb, true)) return; } + } out: dev_kfree_skb(skb); @@ -5380,7 +5461,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.13.12/net/mac80211/scan.c linux-6.13.12-fbx/net/mac80211/scan.c --- linux-6.13.12/net/mac80211/scan.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/scan.c 2025-09-25 17:40:37.827378433 +0200 @@ -571,7 +571,8 @@ return 0; } -static bool __ieee80211_can_leave_ch(struct ieee80211_sub_if_data *sdata) +static bool __ieee80211_can_leave_ch(struct ieee80211_sub_if_data *sdata, + struct cfg80211_scan_request *req) { struct ieee80211_local *local = sdata->local; struct ieee80211_sub_if_data *sdata_iter; @@ -579,7 +580,7 @@ lockdep_assert_wiphy(local->hw.wiphy); - if (!ieee80211_is_radar_required(local)) + if (!ieee80211_is_radar_required(local, req)) return true; if (!regulatory_pre_cac_allowed(local->hw.wiphy)) @@ -595,9 +596,10 @@ } static bool ieee80211_can_scan(struct ieee80211_local *local, - struct ieee80211_sub_if_data *sdata) + struct ieee80211_sub_if_data *sdata, + struct cfg80211_scan_request *req) { - if (!__ieee80211_can_leave_ch(sdata)) + if (!__ieee80211_can_leave_ch(sdata, req)) return false; if (!list_empty(&local->roc_list)) @@ -612,15 +614,19 @@ void ieee80211_run_deferred_scan(struct ieee80211_local *local) { + struct cfg80211_scan_request *req; + lockdep_assert_wiphy(local->hw.wiphy); if (!local->scan_req || local->scanning) return; + req = local->scan_req; + if (!ieee80211_can_scan(local, rcu_dereference_protected( local->scan_sdata, - lockdep_is_held(&local->hw.wiphy->mtx)))) + lockdep_is_held(&local->hw.wiphy->mtx)), req)) return; wiphy_delayed_work_queue(local->hw.wiphy, &local->scan_work, @@ -717,10 +723,10 @@ !(sdata->vif.active_links & BIT(req->tsf_report_link_id))) return -EINVAL; - if (!__ieee80211_can_leave_ch(sdata)) + if (!__ieee80211_can_leave_ch(sdata, req)) return -EBUSY; - if (!ieee80211_can_scan(local, sdata)) { + if (!ieee80211_can_scan(local, sdata, req)) { /* wait for the work to finish/time out */ rcu_assign_pointer(local->scan_req, req); rcu_assign_pointer(local->scan_sdata, sdata); diff -ruw linux-6.13.12/net/mac80211/sta_info.c linux-6.13.12-fbx/net/mac80211/sta_info.c --- linux-6.13.12/net/mac80211/sta_info.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/sta_info.c 2025-09-25 17:40:37.831378453 +0200 @@ -463,9 +463,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); @@ -509,6 +510,24 @@ for (i = 0; i < ARRAY_SIZE(link_info->rx_stats_avg.chain_signal); i++) ewma_signal_init(&link_info->rx_stats_avg.chain_signal[i]); + link_info->rx_omi_bw_rx = IEEE80211_STA_RX_BW_MAX; + link_info->rx_omi_bw_tx = IEEE80211_STA_RX_BW_MAX; + link_info->rx_omi_bw_staging = IEEE80211_STA_RX_BW_MAX; + + /* + * Cause (a) warning(s) if IEEE80211_STA_RX_BW_MAX != 320 + * or if new values are added to the enum. + */ + switch (link_info->cur_max_bandwidth) { + case IEEE80211_STA_RX_BW_20: + case IEEE80211_STA_RX_BW_40: + case IEEE80211_STA_RX_BW_80: + case IEEE80211_STA_RX_BW_160: + case IEEE80211_STA_RX_BW_MAX: + /* intentionally nothing */ + break; + } + return 0; } @@ -1581,7 +1600,7 @@ int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans, - int link_id) + int link_id, struct sta_info *do_not_flush_sta) { struct ieee80211_local *local = sdata->local; struct sta_info *sta, *tmp; @@ -1599,6 +1618,9 @@ (!vlans || sdata->bss != sta->sdata->bss)) continue; + if (sta == do_not_flush_sta) + continue; + if (link_id >= 0 && sta->sta.valid_links && !(sta->sta.valid_links & BIT(link_id))) continue; @@ -2856,6 +2878,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; diff -ruw linux-6.13.12/net/mac80211/sta_info.h linux-6.13.12-fbx/net/mac80211/sta_info.h --- linux-6.13.12/net/mac80211/sta_info.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/sta_info.h 2025-09-25 17:40:37.831378453 +0200 @@ -512,6 +512,10 @@ * @status_stats.avg_ack_signal: average ACK signal * @cur_max_bandwidth: maximum bandwidth to use for TX to the station, * taken from HT/VHT capabilities or VHT operating mode notification + * @rx_omi_bw_rx: RX OMI bandwidth restriction to apply for RX + * @rx_omi_bw_tx: RX OMI bandwidth restriction to apply for TX + * @rx_omi_bw_staging: RX OMI bandwidth restriction to apply later + * during finalize * @debugfs_dir: debug filesystem directory dentry * @pub: public (driver visible) link STA data * TODO Move other link params from sta_info as required for MLD operation @@ -561,6 +565,9 @@ } tx_stats; enum ieee80211_sta_rx_bandwidth cur_max_bandwidth; + enum ieee80211_sta_rx_bandwidth rx_omi_bw_rx, + rx_omi_bw_tx, + rx_omi_bw_staging; #ifdef CONFIG_MAC80211_DEBUGFS struct dentry *debugfs_dir; @@ -701,6 +708,8 @@ struct airtime_info airtime[IEEE80211_NUM_ACS]; u16 airtime_weight; + u32 tp_override; + /* * Aggregation information, locked with lock. */ @@ -899,9 +908,10 @@ * @link_id: if given (>=0), all those STA entries using @link_id only * will be removed. If -1 is passed, all STA entries will be * removed. + * @do_not_flush_sta: a station that shouldn't be flushed. */ int __sta_info_flush(struct ieee80211_sub_if_data *sdata, bool vlans, - int link_id); + int link_id, struct sta_info *do_not_flush_sta); /** * sta_info_flush - flush matching STA entries from the STA table @@ -916,7 +926,7 @@ static inline int sta_info_flush(struct ieee80211_sub_if_data *sdata, int link_id) { - return __sta_info_flush(sdata, false, link_id); + return __sta_info_flush(sdata, false, link_id, NULL); } void sta_set_rate_info_tx(struct sta_info *sta, diff -ruw linux-6.13.12/net/mac80211/status.c linux-6.13.12-fbx/net/mac80211/status.c --- linux-6.13.12/net/mac80211/status.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/status.c 2025-09-25 17:40:37.831378453 +0200 @@ -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, @@ -930,6 +931,9 @@ if (sdata->u.mntr.flags & MONITOR_FLAG_SKIP_TX) continue; + if (fbx80211_skip_mon(sdata)) + continue; + if ((sdata->u.mntr.flags & MONITOR_FLAG_COOK_FRAMES) && !send_to_cooked) continue; @@ -969,10 +973,12 @@ bool noack_success; struct ieee80211_bar *bar; 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); if (info->flags & IEEE80211_TX_STATUS_EOSP) @@ -1147,6 +1153,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); @@ -1173,12 +1180,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.13.12/net/mac80211/tests/Makefile linux-6.13.12-fbx/net/mac80211/tests/Makefile --- linux-6.13.12/net/mac80211/tests/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/tests/Makefile 2025-09-25 17:40:37.831378453 +0200 @@ -1,3 +1,3 @@ -mac80211-tests-y += module.o elems.o mfp.o tpe.o +mac80211-tests-y += module.o util.o elems.o mfp.o tpe.o obj-$(CONFIG_MAC80211_KUNIT_TEST) += mac80211-tests.o diff -ruw linux-6.13.12/net/mac80211/trace.h linux-6.13.12-fbx/net/mac80211/trace.h --- linux-6.13.12/net/mac80211/trace.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/trace.h 2025-09-25 17:40:37.831378453 +0200 @@ -823,9 +823,27 @@ TP_ARGS(local, value) ); -DEFINE_EVENT(local_u32_evt, drv_set_rts_threshold, - TP_PROTO(struct ieee80211_local *local, u32 value), - TP_ARGS(local, value) +TRACE_EVENT(drv_set_rts_threshold, + TP_PROTO(struct ieee80211_local *local, u8 radio_id, u32 value), + + TP_ARGS(local, radio_id, value), + + TP_STRUCT__entry( + LOCAL_ENTRY + __field(u8, radio_id) + __field(u32, value) + ), + + TP_fast_assign( + LOCAL_ASSIGN; + __entry->radio_id = radio_id; + __entry->value = value; + ), + + TP_printk( + LOCAL_PR_FMT " value:%d", + LOCAL_PR_ARG, __entry->value + ) ); TRACE_EVENT(drv_set_coverage_class, @@ -2173,13 +2191,14 @@ TRACE_EVENT(drv_get_txpower, TP_PROTO(struct ieee80211_local *local, struct ieee80211_sub_if_data *sdata, - int dbm, int ret), + unsigned int link_id, int dbm, int ret), - TP_ARGS(local, sdata, dbm, ret), + TP_ARGS(local, sdata, link_id, dbm, ret), TP_STRUCT__entry( LOCAL_ENTRY VIF_ENTRY + __field(unsigned int, link_id) __field(int, dbm) __field(int, ret) ), @@ -2187,13 +2206,14 @@ TP_fast_assign( LOCAL_ASSIGN; VIF_ASSIGN; + __entry->link_id = link_id; __entry->dbm = dbm; __entry->ret = ret; ), TP_printk( - LOCAL_PR_FMT VIF_PR_FMT " dbm:%d ret:%d", - LOCAL_PR_ARG, VIF_PR_ARG, __entry->dbm, __entry->ret + LOCAL_PR_FMT VIF_PR_FMT " link_id:%d dbm:%d ret:%d", + LOCAL_PR_ARG, VIF_PR_ARG, __entry->link_id, __entry->dbm, __entry->ret ) ); @@ -2588,6 +2608,45 @@ * Tracing for API calls that drivers call. */ +TRACE_EVENT(api_return_bool, + TP_PROTO(struct ieee80211_local *local, bool result), + + TP_ARGS(local, result), + + TP_STRUCT__entry( + LOCAL_ENTRY + __field(bool, result) + ), + + TP_fast_assign( + LOCAL_ASSIGN; + __entry->result = result; + ), + + TP_printk( + LOCAL_PR_FMT " result=%d", + LOCAL_PR_ARG, __entry->result + ) +); + +TRACE_EVENT(api_return_void, + TP_PROTO(struct ieee80211_local *local), + + TP_ARGS(local), + + TP_STRUCT__entry( + LOCAL_ENTRY + ), + + TP_fast_assign( + LOCAL_ASSIGN; + ), + + TP_printk( + LOCAL_PR_FMT, LOCAL_PR_ARG + ) +); + TRACE_EVENT(api_start_tx_ba_session, TP_PROTO(struct ieee80211_sta *sta, u16 tid), @@ -3052,6 +3111,65 @@ ) ); +TRACE_EVENT(api_prepare_rx_omi_bw, + TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct link_sta_info *link_sta, + enum ieee80211_sta_rx_bandwidth bw), + + TP_ARGS(local, sdata, link_sta, bw), + + TP_STRUCT__entry( + LOCAL_ENTRY + VIF_ENTRY + STA_ENTRY + __field(int, link_id) + __field(u32, bw) + __field(bool, result) + ), + + TP_fast_assign( + LOCAL_ASSIGN; + VIF_ASSIGN; + STA_NAMED_ASSIGN(link_sta->sta); + __entry->link_id = link_sta->link_id; + __entry->bw = bw; + ), + + TP_printk( + LOCAL_PR_FMT " " VIF_PR_FMT " " STA_PR_FMT " link:%d, bw:%d", + LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, + __entry->link_id, __entry->bw + ) +); + +TRACE_EVENT(api_finalize_rx_omi_bw, + TP_PROTO(struct ieee80211_local *local, + struct ieee80211_sub_if_data *sdata, + struct link_sta_info *link_sta), + + TP_ARGS(local, sdata, link_sta), + + TP_STRUCT__entry( + LOCAL_ENTRY + VIF_ENTRY + STA_ENTRY + __field(int, link_id) + ), + + TP_fast_assign( + LOCAL_ASSIGN; + VIF_ASSIGN; + STA_NAMED_ASSIGN(link_sta->sta); + __entry->link_id = link_sta->link_id; + ), + + TP_printk( + LOCAL_PR_FMT " " VIF_PR_FMT " " STA_PR_FMT " link:%d", + LOCAL_PR_ARG, VIF_PR_ARG, STA_PR_ARG, __entry->link_id + ) +); + /* * Tracing for internal functions * (which may also be called in response to driver calls) @@ -3059,49 +3177,55 @@ TRACE_EVENT(wake_queue, TP_PROTO(struct ieee80211_local *local, u16 queue, - enum queue_stop_reason reason), + enum queue_stop_reason reason, int refcount), - TP_ARGS(local, queue, reason), + TP_ARGS(local, queue, reason, refcount), TP_STRUCT__entry( LOCAL_ENTRY __field(u16, queue) __field(u32, reason) + __field(int, refcount) ), TP_fast_assign( LOCAL_ASSIGN; __entry->queue = queue; __entry->reason = reason; + __entry->refcount = refcount; ), TP_printk( - LOCAL_PR_FMT " queue:%d, reason:%d", - LOCAL_PR_ARG, __entry->queue, __entry->reason + LOCAL_PR_FMT " queue:%d, reason:%d, refcount: %d", + LOCAL_PR_ARG, __entry->queue, __entry->reason, + __entry->refcount ) ); TRACE_EVENT(stop_queue, TP_PROTO(struct ieee80211_local *local, u16 queue, - enum queue_stop_reason reason), + enum queue_stop_reason reason, int refcount), - TP_ARGS(local, queue, reason), + TP_ARGS(local, queue, reason, refcount), TP_STRUCT__entry( LOCAL_ENTRY __field(u16, queue) __field(u32, reason) + __field(int, refcount) ), TP_fast_assign( LOCAL_ASSIGN; __entry->queue = queue; __entry->reason = reason; + __entry->refcount = refcount; ), TP_printk( - LOCAL_PR_FMT " queue:%d, reason:%d", - LOCAL_PR_ARG, __entry->queue, __entry->reason + LOCAL_PR_FMT " queue:%d, reason:%d, refcount: %d", + LOCAL_PR_ARG, __entry->queue, __entry->reason, + __entry->refcount ) ); diff -ruw linux-6.13.12/net/mac80211/tx.c linux-6.13.12-fbx/net/mac80211/tx.c --- linux-6.13.12/net/mac80211/tx.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/tx.c 2025-09-25 17:40:37.835378473 +0200 @@ -622,6 +622,12 @@ else tx->key = NULL; + if (info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP) { + if (tx->key && tx->key->flags & KEY_FLAG_UPLOADED_TO_HARDWARE) + info->control.hw_key = &tx->key->conf; + return TX_CONTINUE; + } + if (tx->key) { bool skip_hw = false; @@ -680,6 +686,7 @@ struct ieee80211_hdr *hdr = (void *)tx->skb->data; struct ieee80211_supported_band *sband; u32 len; + u8 i; struct ieee80211_tx_rate_control txrc; struct ieee80211_sta_rates *ratetbl = NULL; bool encap = info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP; @@ -715,7 +722,13 @@ tx->sdata->vif.type == NL80211_IFTYPE_OCB); /* set up RTS protection if desired */ - if (len > tx->local->hw.wiphy->rts_threshold) { + if (tx->local->hw.wiphy->n_radio) { + for (i = 0; i < tx->local->hw.wiphy->n_radio; i++) { + if (len > tx->local->hw.wiphy->radio_cfg[i].rts_threshold) + txrc.rts = true; + } + } else { + if (len > tx->local->hw.wiphy->rts_threshold) txrc.rts = true; } @@ -1304,6 +1317,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) || @@ -3868,20 +3884,32 @@ tx.sdata = vif_to_sdata(info->control.vif); if (txq->sta) { + const u8 *sender, *dest; + tx.sta = container_of(txq->sta, struct sta_info, sta); + + if ((info->flags & IEEE80211_TX_CTL_HW_80211_ENCAP)) { + struct ethhdr *ehdr = (struct ethhdr *)skb->data; + sender = ehdr->h_source; + dest = ehdr->h_dest; + } else { + sender = hdr->addr2; + dest = hdr->addr1; + } + /* * Drop unicast frames to unauthorised stations unless they are * injected frames or EAPOL frames from the local station. */ if (unlikely(!(info->flags & IEEE80211_TX_CTL_INJECTED) && - ieee80211_is_data(hdr->frame_control) && + ieee80211_is_tx_data(skb) && !ieee80211_vif_is_mesh(&tx.sdata->vif) && tx.sdata->vif.type != NL80211_IFTYPE_OCB && - !is_multicast_ether_addr(hdr->addr1) && + !is_multicast_ether_addr(dest) && !test_sta_flag(tx.sta, WLAN_STA_AUTHORIZED) && (!(info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO) || - !ieee80211_is_our_addr(tx.sdata, hdr->addr2, + !ieee80211_is_our_addr(tx.sdata, sender, NULL)))) { I802_DEBUG_INC(local->tx_handlers_drop_unauth_port); ieee80211_free_txskb(&local->hw, skb); @@ -3893,6 +3921,7 @@ * The key can be removed while the packet was queued, so need to call * this here to get the current key. */ + info->control.hw_key = NULL; r = ieee80211_tx_h_select_key(&tx); if (r != TX_CONTINUE) { ieee80211_free_txskb(&local->hw, skb); @@ -4278,6 +4307,10 @@ struct sk_buff *next; int len = skb->len; +#if defined(CONFIG_IP_FFN) || defined(CONFIG_IPV6_FFN) + skb_ffn_mark_dirty(skb); +#endif + if (unlikely(!ieee80211_sdata_running(sdata) || skb->len < ETH_HLEN)) { kfree_skb(skb); return; @@ -4377,6 +4410,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 */ @@ -4525,8 +4561,10 @@ IEEE80211_TX_CTRL_MLO_LINK_UNSPEC, NULL); } 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)) { + ((sdata->vif.type == NL80211_IFTYPE_AP && + !ieee80211_hw_check(&sdata->local->hw, MLO_MCAST_MULTI_LINK_TX)) || + ((sdata->vif.type == NL80211_IFTYPE_AP_VLAN) && + !sdata->wdev.use_4addr))) { ieee80211_mlo_multicast_tx(dev, skb); } else { normal: @@ -4583,7 +4621,20 @@ { struct ieee80211_local *local = sdata->local; struct sk_buff *next; - bool ret = true; + struct ieee80211_tx_control control = {}; + struct ieee80211_sta *pubsta = NULL; + struct ethhdr *ehdr = (struct ethhdr *)skb->data; + bool ret = true, is_eapol; + + is_eapol = (sdata->control_port_protocol == ehdr->h_proto); + if (sta && is_eapol) { + if (sta->uploaded) + pubsta = &sta->sta; + + control.sta = pubsta; + drv_tx(local, &control, skb); + return ret; + } if (ieee80211_queue_skb(local, sdata, sta, skb)) return true; @@ -4599,19 +4650,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; @@ -4644,6 +4701,8 @@ info = IEEE80211_SKB_CB(skb); memset(info, 0, sizeof(*info)); + info->control.flags = ctrl_flags; + info->flags |= info_flags; info->hw_queue = sdata->vif.hw_queue[queue]; if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN) @@ -4663,10 +4722,11 @@ memcpy(IEEE80211_SKB_CB(seg), info, sizeof(*info)); } - if (unlikely(skb->sk && - skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) { + if (unlikely((skb->sk && + skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS) || + ((ctrl_flags & IEEE80211_TX_CTL_REQ_TX_STATUS) && !multicast))) { info->status_data = ieee80211_store_ack_skb(local, skb, - &info->flags, NULL); + &info->flags, cookie); if (info->status_data) info->status_data_idr = 1; } @@ -4685,13 +4745,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); @@ -4704,10 +4838,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]); @@ -4719,7 +4854,15 @@ 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_hw_check(&sdata->local->hw, ALLOW_DRV_TX_FOR_DATA)) { + 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: @@ -4730,6 +4873,62 @@ 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_local *local = sdata->local; + 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 && + ieee80211_hw_check(&local->hw, ALLOW_DRV_TX_FOR_DATA)) { + 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; + } + dev_sw_netstats_tx_add(dev, 1, skb->len); + + drv_tx(sdata->local, &control, skb); + rcu_read_unlock(); + } + + 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) @@ -6243,7 +6442,12 @@ start_xmit: 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(); return 0; diff -ruw linux-6.13.12/net/mac80211/util.c linux-6.13.12-fbx/net/mac80211/util.c --- linux-6.13.12/net/mac80211/util.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/util.c 2025-09-25 17:40:37.835378473 +0200 @@ -437,8 +437,6 @@ { struct ieee80211_local *local = hw_to_local(hw); - trace_wake_queue(local, queue, reason); - if (WARN_ON(queue >= hw->queues)) return; @@ -456,6 +454,9 @@ if (local->q_stop_reasons[queue][reason] == 0) __clear_bit(reason, &local->queue_stop_reasons[queue]); + trace_wake_queue(local, queue, reason, + local->q_stop_reasons[queue][reason]); + if (local->queue_stop_reasons[queue] != 0) /* someone still has this queue stopped */ return; @@ -502,8 +503,6 @@ { struct ieee80211_local *local = hw_to_local(hw); - trace_stop_queue(local, queue, reason); - if (WARN_ON(queue >= hw->queues)) return; @@ -512,6 +511,9 @@ else local->q_stop_reasons[queue][reason]++; + trace_stop_queue(local, queue, reason, + local->q_stop_reasons[queue][reason]); + set_bit(reason, &local->queue_stop_reasons[queue]); } @@ -1838,7 +1840,13 @@ drv_set_frag_threshold(local, hw->wiphy->frag_threshold); /* setup RTS threshold */ - drv_set_rts_threshold(local, hw->wiphy->rts_threshold); + if (hw->wiphy->n_radio) + for (i = 0; i < hw->wiphy->n_radio; i++) + drv_set_rts_threshold(local, i, + hw->wiphy->radio_cfg[i].rts_threshold); + else + drv_set_rts_threshold(local, NL80211_WIPHY_RADIO_ID_MAX, + hw->wiphy->rts_threshold); /* reset coverage class */ drv_set_coverage_class(local, hw->wiphy->coverage_class); @@ -2751,6 +2759,7 @@ { struct ieee80211_he_operation *he_oper; struct ieee80211_he_6ghz_oper *he_6ghz_op; + struct cfg80211_chan_def he_chandef; u32 he_oper_params; u8 ie_len = 1 + sizeof(struct ieee80211_he_operation); @@ -2782,27 +2791,33 @@ if (chandef->chan->band != NL80211_BAND_6GHZ) goto out; + cfg80211_chandef_create(&he_chandef, chandef->chan, NL80211_CHAN_NO_HT); + he_chandef.center_freq1 = chandef->center_freq1; + he_chandef.center_freq2 = chandef->center_freq2; + he_chandef.width = chandef->width; + /* TODO add VHT operational */ he_6ghz_op = (struct ieee80211_he_6ghz_oper *)pos; he_6ghz_op->minrate = 6; /* 6 Mbps */ he_6ghz_op->primary = - ieee80211_frequency_to_channel(chandef->chan->center_freq); + ieee80211_frequency_to_channel(he_chandef.chan->center_freq); he_6ghz_op->ccfs0 = - ieee80211_frequency_to_channel(chandef->center_freq1); - if (chandef->center_freq2) + ieee80211_frequency_to_channel(he_chandef.center_freq1); + if (he_chandef.center_freq2) he_6ghz_op->ccfs1 = - ieee80211_frequency_to_channel(chandef->center_freq2); + ieee80211_frequency_to_channel(he_chandef.center_freq2); else he_6ghz_op->ccfs1 = 0; - switch (chandef->width) { + switch (he_chandef.width) { case NL80211_CHAN_WIDTH_320: - /* - * TODO: mesh operation is not defined over 6GHz 320 MHz - * channels. + /* Downgrade EHT 320 MHz BW to 160 MHz for HE and set new + * center_freq1 */ - WARN_ON(1); - break; + ieee80211_chandef_downgrade(&he_chandef, NULL); + he_6ghz_op->ccfs0 = + ieee80211_frequency_to_channel(he_chandef.center_freq1); + fallthrough; case NL80211_CHAN_WIDTH_160: /* Convert 160 MHz channel width to new style as interop * workaround. @@ -2810,7 +2825,7 @@ he_6ghz_op->control = IEEE80211_HE_6GHZ_OPER_CTRL_CHANWIDTH_160MHZ; he_6ghz_op->ccfs1 = he_6ghz_op->ccfs0; - if (chandef->chan->center_freq < chandef->center_freq1) + if (he_chandef.chan->center_freq < he_chandef.center_freq1) he_6ghz_op->ccfs0 -= 8; else he_6ghz_op->ccfs0 += 8; @@ -3650,31 +3665,6 @@ WARN_ON_ONCE(!cfg80211_chandef_valid(c)); } -/* - * Returns true if smps_mode_new is strictly more restrictive than - * smps_mode_old. - */ -bool ieee80211_smps_is_restrictive(enum ieee80211_smps_mode smps_mode_old, - enum ieee80211_smps_mode smps_mode_new) -{ - if (WARN_ON_ONCE(smps_mode_old == IEEE80211_SMPS_AUTOMATIC || - smps_mode_new == IEEE80211_SMPS_AUTOMATIC)) - return false; - - switch (smps_mode_old) { - case IEEE80211_SMPS_STATIC: - return false; - case IEEE80211_SMPS_DYNAMIC: - return smps_mode_new == IEEE80211_SMPS_STATIC; - case IEEE80211_SMPS_OFF: - return smps_mode_new != IEEE80211_SMPS_OFF; - default: - WARN_ON(1); - } - - return false; -} - int ieee80211_send_action_csa(struct ieee80211_sub_if_data *sdata, struct cfg80211_csa_settings *csa_settings) { @@ -3950,6 +3940,32 @@ 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) { @@ -3983,6 +3999,23 @@ return radar_detect; } +bool ieee80211_is_radio_idx_in_scan_req(struct wiphy *wiphy, + struct cfg80211_scan_request *scan_req, + int radio_idx) +{ + struct ieee80211_channel *chan; + int i, chan_radio_idx; + + for (i = 0; i < scan_req->n_channels; i++) { + chan = scan_req->channels[i]; + chan_radio_idx = cfg80211_get_radio_idx_by_chan(wiphy, chan); + if (chan_radio_idx == radio_idx) + return true; + } + + return false; +} + static u32 __ieee80211_get_radio_mask(struct ieee80211_sub_if_data *sdata) { diff -ruw linux-6.13.12/net/mac80211/vht.c linux-6.13.12-fbx/net/mac80211/vht.c --- linux-6.13.12/net/mac80211/vht.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/mac80211/vht.c 2025-09-25 17:40:37.835378473 +0200 @@ -232,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); @@ -350,8 +352,8 @@ } /* FIXME: move this to some better location - parses HE/EHT now */ -enum ieee80211_sta_rx_bandwidth -_ieee80211_sta_cap_rx_bw(struct link_sta_info *link_sta, +static enum ieee80211_sta_rx_bandwidth +__ieee80211_sta_cap_rx_bw(struct link_sta_info *link_sta, struct cfg80211_chan_def *chandef) { unsigned int link_id = link_sta->link_id; @@ -423,6 +425,28 @@ return IEEE80211_STA_RX_BW_80; } +enum ieee80211_sta_rx_bandwidth +_ieee80211_sta_cap_rx_bw(struct link_sta_info *link_sta, + struct cfg80211_chan_def *chandef) +{ + /* + * With RX OMI, also pretend that the STA's capability changed. + * Of course this isn't really true, it didn't change, only our + * RX capability was changed by notifying RX OMI to the STA. + * The purpose, however, is to save power, and that requires + * changing also transmissions to the AP and the chanctx. The + * transmissions depend on link_sta->bandwidth which is set in + * _ieee80211_sta_cur_vht_bw() below, but the chanctx depends + * on the result of this function which is also called by + * _ieee80211_sta_cur_vht_bw(), so we need to do that here as + * well. This is sufficient for the steady state, but during + * the transition we already need to change TX/RX separately, + * so _ieee80211_sta_cur_vht_bw() below applies the _tx one. + */ + return min(__ieee80211_sta_cap_rx_bw(link_sta, chandef), + link_sta->rx_omi_bw_rx); +} + enum nl80211_chan_width ieee80211_sta_cap_chan_bw(struct link_sta_info *link_sta) { @@ -503,8 +527,11 @@ rcu_read_unlock(); } - bw = _ieee80211_sta_cap_rx_bw(link_sta, chandef); + /* intentionally do not take rx_bw_omi_rx into account */ + bw = __ieee80211_sta_cap_rx_bw(link_sta, chandef); bw = min(bw, link_sta->cur_max_bandwidth); + /* but do apply rx_omi_bw_tx */ + bw = min(bw, link_sta->rx_omi_bw_tx); /* Don't consider AP's bandwidth for TDLS peers, section 11.23.1 of * IEEE80211-2016 specification makes higher bandwidth operation diff -ruw linux-6.13.12/net/netfilter/Kconfig linux-6.13.12-fbx/net/netfilter/Kconfig --- linux-6.13.12/net/netfilter/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/Kconfig 2025-09-25 17:40:37.847378532 +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.13.12/net/netfilter/nf_conntrack_core.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_core.c --- linux-6.13.12/net/netfilter/nf_conntrack_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_core.c 2025-09-25 17:40:37.851378552 +0200 @@ -571,12 +571,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; @@ -1822,7 +1839,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 @@ -2086,6 +2103,28 @@ } EXPORT_SYMBOL_GPL(nf_conntrack_in); +/* Alter reply tuple (maybe alter helper). This is for NAT, and is + implicitly racy: see __nf_conntrack_confirm */ +void nf_conntrack_alter_reply(struct nf_conn *ct, + const struct nf_conntrack_tuple *newreply) +{ + struct nf_conn_help *help = nfct_help(ct); + + /* Should be unconfirmed, so not in hash table yet */ + WARN_ON(nf_ct_is_confirmed(ct)); + + nf_ct_dump_tuple(newreply); + + 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); + /* Refresh conntrack for this many jiffies and do accounting if do_acct is 1 */ void __nf_ct_refresh_acct(struct nf_conn *ct, enum ip_conntrack_info ctinfo, @@ -2751,6 +2790,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.13.12/net/netfilter/nf_conntrack_ftp.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_ftp.c --- linux-6.13.12/net/netfilter/nf_conntrack_ftp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_ftp.c 2025-09-25 17:40:37.851378552 +0200 @@ -27,6 +27,10 @@ #include #define HELPER_NAME "ftp" +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) +#include +#include +#endif MODULE_LICENSE("GPL"); MODULE_AUTHOR("Rusty Russell "); @@ -397,6 +401,17 @@ if (unlikely(skb_linearize(skb))) return NF_DROP; +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) + if (!ct_ftp_info->is_fbxbridge && skb->dev->fbx_bridge) { + struct fbxbridge *fbxbr; + + fbxbr = skb->dev->fbx_bridge; + ct_ftp_info->is_fbxbridge = 1; + ct_ftp_info->fbxbridge_remote = ntohl(fbxbr->br_remote_ipaddr); + ct_ftp_info->fbxbridge_wan = fbxbr->wan_ipaddr; + } +#endif + th = skb_header_pointer(skb, protoff, sizeof(_tcph), &_tcph); if (th == NULL) return NF_ACCEPT; @@ -483,6 +498,50 @@ * Doesn't matter unless NAT is happening. */ daddr = &ct->tuplehash[!dir].tuple.dst.u3; +#if defined(CONFIG_FREEBOX_BRIDGE) || defined(CONFIG_FREEBOX_BRIDGE_MODULE) + if (ct_ftp_info->is_fbxbridge && + search[dir][i].ftptype == NF_CT_FTP_PORT) { + unsigned long orig_ip_addr; + unsigned short orig_port; + char buffer[sizeof("nnn,nnn,nnn,nnn,nnn,nnn")]; + unsigned int len; + __be32 addr; + + /* kludge: if we are here, then this is a local pkt + * that has gone through internal fbxbridge snat. + * + * If we see a port command, then we mangle packet to + * change ip address given to the remote bridge + * address */ + + /* check address is packet is the one fbxbridge + * changed */ + orig_ip_addr = cmd.u3.ip; + if (orig_ip_addr != ct_ftp_info->fbxbridge_wan) + goto donttouch; + + /* now mangle the remote address */ + orig_port = cmd.u.tcp.port; + addr = ct_ftp_info->fbxbridge_remote; + len = sprintf(buffer, "%u,%u,%u,%u,%u,%u", + ((unsigned char *)&addr)[0], + ((unsigned char *)&addr)[1], + ((unsigned char *)&addr)[2], + ((unsigned char *)&addr)[3], + orig_port >> 8 , orig_port & 0xFF); + + nf_nat_mangle_tcp_packet(skb, ct, ctinfo, matchoff, + matchlen, buffer, len); + + /* then adjust as if nothing happened */ + matchlen = len; + cmd.u3.ip = ct_ftp_info->fbxbridge_remote; + } +donttouch: + +#endif + + /* Update the ftp info */ if ((cmd.l3num == nf_ct_l3num(ct)) && memcmp(&cmd.u3.all, &ct->tuplehash[dir].tuple.src.u3.all, diff -ruw linux-6.13.12/net/netfilter/nf_conntrack_helper.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_helper.c --- linux-6.13.12/net/netfilter/nf_conntrack_helper.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_helper.c 2025-09-25 17:40:37.855378572 +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,32 +211,61 @@ } 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 (e.g. nft_ct) */ + /* We already got a helper explicitly attached. The function + * nf_conntrack_alter_reply - in case NAT is in use - asks for looking + * the helper up again. Since now the user is in full control of + * making consistent helper configurations, skip this automatic + * re-lookup, otherwise we'll lose the helper. + */ 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); @@ -498,6 +550,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.13.12/net/netfilter/nf_conntrack_netlink.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_netlink.c --- linux-6.13.12/net/netfilter/nf_conntrack_netlink.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_netlink.c 2025-09-25 17:40:37.855378572 +0200 @@ -2296,6 +2296,11 @@ ct->status |= IPS_HELPER; RCU_INIT_POINTER(help->helper, helper); } + } else { + /* try an implicit helper assignation */ + err = __nf_ct_try_assign_helper(ct, NULL, GFP_ATOMIC); + if (err < 0) + goto err2; } err = ctnetlink_setup_nat(ct, cda); diff -ruw linux-6.13.12/net/netfilter/nf_conntrack_proto_tcp.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_proto_tcp.c --- linux-6.13.12/net/netfilter/nf_conntrack_proto_tcp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_proto_tcp.c 2025-09-25 17:40:37.855378572 +0200 @@ -1250,6 +1250,7 @@ break; } + if (!ct->proto.tcp.no_window_track) { res = tcp_in_window(ct, dir, index, skb, dataoff, th, state); switch (res) { @@ -1263,6 +1264,7 @@ case NFCT_TCP_ACCEPT: break; } + } in_window: /* From now on we have got in-window packets */ ct->proto.tcp.last_index = index; @@ -1336,6 +1338,46 @@ 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); +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); +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.13.12/net/netfilter/nf_conntrack_proto_udp.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_proto_udp.c --- linux-6.13.12/net/netfilter/nf_conntrack_proto_udp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_proto_udp.c 2025-09-25 17:40:37.855378572 +0200 @@ -129,6 +129,46 @@ 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); +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); +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.13.12/net/netfilter/nf_conntrack_sip.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_sip.c --- linux-6.13.12/net/netfilter/nf_conntrack_sip.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_sip.c 2025-09-25 17:40:37.855378572 +0200 @@ -35,6 +35,8 @@ MODULE_ALIAS("ip_conntrack_sip"); MODULE_ALIAS_NFCT_HELPER(HELPER_NAME); +#define MAX_CALLS 8 + #define MAX_PORTS 8 static unsigned short ports[MAX_PORTS]; static unsigned int ports_c; @@ -825,7 +827,8 @@ return found; } -static void flush_expectations(struct nf_conn *ct, bool media) +static void __flush_expectations(struct nf_conn *ct, bool media, + const u8 *cid_hash) { struct nf_conn_help *help = nfct_help(ct); struct nf_conntrack_expect *exp; @@ -835,6 +838,15 @@ hlist_for_each_entry_safe(exp, next, &help->expectations, lnode) { if ((exp->class != SIP_EXPECT_SIGNALLING) ^ media) continue; + if (media && cid_hash) { + const struct nf_ct_sip_expect *exp_sip_info; + exp_sip_info = nf_ct_exp_data(exp); + + if (memcmp(exp_sip_info->cid_hash, cid_hash, + sizeof (exp_sip_info->cid_hash))) + continue; + } + if (!nf_ct_remove_expect(exp)) continue; if (!media) @@ -843,12 +855,36 @@ spin_unlock_bh(&nf_conntrack_expect_lock); } +static void flush_sig_expectations(struct nf_conn *ct) +{ + return __flush_expectations(ct, false, NULL); +} + +static void flush_media_expectations(struct nf_conn *ct, + const char *msg_data, + unsigned int msg_len) +{ + unsigned int matchoff, matchlen; + u8 cid_hash[SHA256_DIGEST_SIZE]; + struct sha256_state s; + + sha256_init(&s); + if (ct_sip_get_header(ct, msg_data, 0, msg_len, + SIP_HDR_CALL_ID, + &matchoff, &matchlen) > 0) + sha256_update(&s, msg_data + matchoff, matchlen); + sha256_final(&s, cid_hash); + + __flush_expectations(ct, true, cid_hash); +} + static int set_expected_rtp_rtcp(struct sk_buff *skb, unsigned int protoff, unsigned int dataoff, const char **dptr, unsigned int *datalen, union nf_inet_addr *daddr, __be16 port, enum sip_expectation_classes class, - unsigned int mediaoff, unsigned int medialen) + unsigned int mediaoff, unsigned int medialen, + const u8 *cid_hash) { struct nf_conntrack_expect *exp, *rtp_exp, *rtcp_exp; enum ip_conntrack_info ctinfo; @@ -861,6 +897,7 @@ u_int16_t base_port; __be16 rtp_port, rtcp_port; const struct nf_nat_sip_hooks *hooks; + struct nf_ct_sip_expect *exp_sip_info; saddr = NULL; if (sip_direct_media) { @@ -953,18 +990,29 @@ goto err1; } - if (skip_expect) + if (skip_expect) { + exp_sip_info = nf_ct_exp_data(exp); + memcpy(exp_sip_info->cid_hash, cid_hash, + sizeof (exp_sip_info->cid_hash)); return NF_ACCEPT; + } rtp_exp = nf_ct_expect_alloc(ct); if (rtp_exp == NULL) goto err1; + exp_sip_info = nf_ct_exp_data(rtp_exp); + memcpy(exp_sip_info->cid_hash, cid_hash, + sizeof (exp_sip_info->cid_hash)); nf_ct_expect_init(rtp_exp, class, nf_ct_l3num(ct), saddr, daddr, IPPROTO_UDP, NULL, &rtp_port); + rtcp_exp = nf_ct_expect_alloc(ct); if (rtcp_exp == NULL) goto err2; + exp_sip_info = nf_ct_exp_data(rtcp_exp); + memcpy(exp_sip_info->cid_hash, cid_hash, + sizeof (exp_sip_info->cid_hash)); nf_ct_expect_init(rtcp_exp, class, nf_ct_l3num(ct), saddr, daddr, IPPROTO_UDP, NULL, &rtcp_port); @@ -1039,10 +1087,20 @@ const struct nf_nat_sip_hooks *hooks; unsigned int port; const struct sdp_media_type *t; + struct sha256_state s; + u8 cid_hash[SHA256_DIGEST_SIZE]; int ret = NF_ACCEPT; hooks = rcu_dereference(nf_nat_sip_hooks); + /* extract caller id if any */ + sha256_init(&s); + if (ct_sip_get_header(ct, *dptr, 0, *datalen, + SIP_HDR_CALL_ID, + &matchoff, &matchlen) > 0) + sha256_update(&s, *dptr + matchoff, matchlen); + sha256_final(&s, cid_hash); + /* Find beginning of session description */ if (ct_sip_get_sdp_header(ct, *dptr, 0, *datalen, SDP_HDR_VERSION, SDP_HDR_UNSPEC, @@ -1101,7 +1159,7 @@ ret = set_expected_rtp_rtcp(skb, protoff, dataoff, dptr, datalen, &rtp_addr, htons(port), t->class, - mediaoff, medialen); + mediaoff, medialen, cid_hash); if (ret != NF_ACCEPT) { nf_ct_helper_log(skb, ct, "cannot add expectation for voice"); @@ -1145,7 +1203,7 @@ (code >= 200 && code <= 299)) return process_sdp(skb, protoff, dataoff, dptr, datalen, cseq); else if (ct_sip_info->invite_cseq == cseq) - flush_expectations(ct, true); + flush_media_expectations(ct, *dptr, *datalen); return NF_ACCEPT; } @@ -1162,7 +1220,7 @@ (code >= 200 && code <= 299)) return process_sdp(skb, protoff, dataoff, dptr, datalen, cseq); else if (ct_sip_info->invite_cseq == cseq) - flush_expectations(ct, true); + flush_media_expectations(ct, *dptr, *datalen); return NF_ACCEPT; } @@ -1179,7 +1237,7 @@ (code >= 200 && code <= 299)) return process_sdp(skb, protoff, dataoff, dptr, datalen, cseq); else if (ct_sip_info->invite_cseq == cseq) - flush_expectations(ct, true); + flush_media_expectations(ct, *dptr, *datalen); return NF_ACCEPT; } @@ -1193,7 +1251,7 @@ struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct); unsigned int ret; - flush_expectations(ct, true); + flush_media_expectations(ct, *dptr, *datalen); ret = process_sdp(skb, protoff, dataoff, dptr, datalen, cseq); if (ret == NF_ACCEPT) ct_sip_info->invite_cseq = cseq; @@ -1208,7 +1266,7 @@ enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); - flush_expectations(ct, true); + flush_media_expectations(ct, *dptr, *datalen); return NF_ACCEPT; } @@ -1392,7 +1450,7 @@ } flush: - flush_expectations(ct, false); + flush_sig_expectations(ct); return NF_ACCEPT; } @@ -1468,12 +1526,13 @@ * Via: header so that nf_nat_sip can redirect the responses to * the correct port. */ - if (ct_sip_parse_header_uri(ct, *dptr, NULL, *datalen, + if (nf_ct_protonum(ct) == IPPROTO_UDP && + ct_sip_parse_header_uri(ct, *dptr, NULL, *datalen, SIP_HDR_VIA_UDP, NULL, &matchoff, &matchlen, &addr, &port) > 0 && port != ct->tuplehash[dir].tuple.src.u.udp.port && nf_inet_addr_cmp(&addr, &ct->tuplehash[dir].tuple.src.u3)) - ct_sip_info->forced_dport = port; + ct_sip_info->forced_dport[!dir] = port; for (i = 0; i < ARRAY_SIZE(sip_handlers); i++) { const struct sip_handler *handler; @@ -1647,17 +1706,17 @@ }, [SIP_EXPECT_AUDIO] = { .name = "audio", - .max_expected = 2 * IP_CT_DIR_MAX, + .max_expected = MAX_CALLS * 2 * IP_CT_DIR_MAX, .timeout = 3 * 60, }, [SIP_EXPECT_VIDEO] = { .name = "video", - .max_expected = 2 * IP_CT_DIR_MAX, + .max_expected = MAX_CALLS * 2 * IP_CT_DIR_MAX, .timeout = 3 * 60, }, [SIP_EXPECT_IMAGE] = { .name = "image", - .max_expected = IP_CT_DIR_MAX, + .max_expected = MAX_CALLS * IP_CT_DIR_MAX, .timeout = 3 * 60, }, }; @@ -1672,6 +1731,7 @@ int i, ret; NF_CT_HELPER_BUILD_BUG_ON(sizeof(struct nf_ct_sip_master)); + NF_CT_EXPECT_BUILD_BUG_ON(sizeof(struct nf_ct_sip_expect)); if (ports_c == 0) ports[ports_c++] = SIP_PORT; diff -ruw linux-6.13.12/net/netfilter/nf_conntrack_standalone.c linux-6.13.12-fbx/net/netfilter/nf_conntrack_standalone.c --- linux-6.13.12/net/netfilter/nf_conntrack_standalone.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_conntrack_standalone.c 2025-09-25 17:40:37.855378572 +0200 @@ -554,6 +554,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 @@ -666,6 +667,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", @@ -1060,6 +1069,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.13.12/net/netfilter/nf_nat_core.c linux-6.13.12-fbx/net/netfilter/nf_nat_core.c --- linux-6.13.12/net/netfilter/nf_nat_core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_nat_core.c 2025-09-25 17:40:37.859378592 +0200 @@ -844,6 +844,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.13.12/net/netfilter/nf_nat_ftp.c linux-6.13.12-fbx/net/netfilter/nf_nat_ftp.c --- linux-6.13.12/net/netfilter/nf_nat_ftp.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_nat_ftp.c 2025-09-25 17:40:37.859378592 +0200 @@ -69,7 +69,8 @@ struct nf_conntrack_expect *exp) { union nf_inet_addr newaddr; - u_int16_t port; + u_int16_t port, sport, eport; + unsigned int i; int dir = CTINFO2DIR(ctinfo); struct nf_conn *ct = exp->master; char buffer[sizeof("|1||65535|") + INET6_ADDRSTRLEN]; @@ -86,7 +87,42 @@ * this one. */ exp->expectfn = nf_nat_follow_master; - port = nf_nat_exp_find_port(exp, ntohs(exp->saved_proto.tcp.port)); + if (dir == IP_CT_DIR_ORIGINAL && + (ct->status & IPS_SRC_NAT) && + ct->nat_src_proto_min.all && + ct->nat_src_proto_max.all) { + sport = ntohs(ct->nat_src_proto_min.all); + eport = ntohs(ct->nat_src_proto_max.all); + } else { + sport = 1024; + eport = 65535; + } + + port = ntohs(exp->saved_proto.tcp.port); + if (port < sport || port > eport) { + get_random_bytes(&port, sizeof (port)); + port %= eport - sport; + port += sport; + } + + /* Try to get same port: if not, try to change it. */ + for (i = 0; i < eport - sport + 1; i++) { + int ret; + + exp->tuple.dst.u.tcp.port = htons(port); + ret = nf_ct_expect_related(exp, 0); + if (ret == 0) + break; + else if (ret != -EBUSY) { + port = 0; + break; + } + + port++; + if (port > eport) + port = sport; + } + if (port == 0) { nf_ct_helper_log(skb, exp->master, "all ports in use"); return NF_DROP; diff -ruw linux-6.13.12/net/netfilter/nf_nat_helper.c linux-6.13.12-fbx/net/netfilter/nf_nat_helper.c --- linux-6.13.12/net/netfilter/nf_nat_helper.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_nat_helper.c 2025-09-25 17:40:37.859378592 +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.13.12/net/netfilter/nf_nat_proto.c linux-6.13.12-fbx/net/netfilter/nf_nat_proto.c --- linux-6.13.12/net/netfilter/nf_nat_proto.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_nat_proto.c 2025-09-25 17:40:37.859378592 +0200 @@ -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.13.12/net/netfilter/nf_nat_sip.c linux-6.13.12-fbx/net/netfilter/nf_nat_sip.c --- linux-6.13.12/net/netfilter/nf_nat_sip.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nf_nat_sip.c 2025-09-25 17:40:37.859378592 +0200 @@ -111,8 +111,11 @@ } else if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.dst.u3, addr) && ct->tuplehash[dir].tuple.dst.u.udp.port == port) { newaddr = ct->tuplehash[!dir].tuple.src.u3; - newport = ct_sip_info->forced_dport ? : + if (nf_ct_protonum(ct) == IPPROTO_UDP) + newport = ct_sip_info->forced_dport[dir] ? : ct->tuplehash[!dir].tuple.src.u.udp.port; + else + newport = ct->tuplehash[!dir].tuple.src.u.udp.port; } else return 1; @@ -279,7 +282,8 @@ } /* Mangle destination port for Cisco phones, then fix up checksums */ - if (dir == IP_CT_DIR_REPLY && ct_sip_info->forced_dport) { + if (nf_ct_protonum(ct) == IPPROTO_UDP && + dir == IP_CT_DIR_REPLY && ct_sip_info->forced_dport[dir]) { struct udphdr *uh; if (skb_ensure_writable(skb, skb->len)) { @@ -288,7 +292,7 @@ } uh = (void *)skb->data + protoff; - uh->dest = ct_sip_info->forced_dport; + uh->dest = ct_sip_info->forced_dport[dir]; if (!nf_nat_mangle_udp_packet(skb, ct, ctinfo, protoff, 0, 0, NULL, 0)) { @@ -365,6 +369,15 @@ range_set_for_snat = 1; } + if (range_set_for_snat) { + 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; + } + } + /* Perform SRC manip. */ if (range_set_for_snat) nf_nat_setup_info(ct, &range, NF_NAT_MANIP_SRC); @@ -382,10 +395,11 @@ enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); struct nf_ct_sip_master *ct_sip_info = nfct_help_data(ct); union nf_inet_addr newaddr; - u_int16_t port; + u_int16_t port, sport, eport; __be16 srcport; char buffer[INET6_ADDRSTRLEN + sizeof("[]:nnnnn")]; unsigned int buflen; + unsigned int i; /* Connection will come from reply */ if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.src.u3, @@ -397,7 +411,7 @@ /* If the signalling port matches the connection's source port in the * original direction, try to use the destination port in the opposite * direction. */ - srcport = ct_sip_info->forced_dport ? : + srcport = ct_sip_info->forced_dport[dir] ? : ct->tuplehash[dir].tuple.src.u.udp.port; if (exp->tuple.dst.u.udp.port == srcport) port = ntohs(ct->tuplehash[!dir].tuple.dst.u.udp.port); @@ -410,7 +424,40 @@ exp->dir = !dir; exp->expectfn = nf_nat_sip_expected; - port = nf_nat_exp_find_port(exp, port); + if (dir == IP_CT_DIR_ORIGINAL && + (ct->status & IPS_SRC_NAT) && + ct->nat_src_proto_min.all && + ct->nat_src_proto_max.all) { + sport = ntohs(ct->nat_src_proto_min.all); + eport = ntohs(ct->nat_src_proto_max.all); + } else { + sport = 1024; + eport = 65535; + } + + if (port < sport || port > eport) { + get_random_bytes(&port, sizeof (port)); + port %= eport - sport; + port += sport; + } + + for (i = 0; i < eport - sport + 1; i++) { + int ret; + + exp->tuple.dst.u.udp.port = htons(port); + ret = nf_ct_expect_related(exp, NF_CT_EXP_F_SKIP_MASTER); + if (ret == 0) + break; + else if (ret != -EBUSY) { + port = 0; + break; + } + + port++; + if (port > eport) + port = sport; + } + if (port == 0) { nf_ct_helper_log(skb, ct, "all ports in use for SIP"); return NF_DROP; @@ -568,7 +615,8 @@ enum ip_conntrack_info ctinfo; struct nf_conn *ct = nf_ct_get(skb, &ctinfo); enum ip_conntrack_dir dir = CTINFO2DIR(ctinfo); - u_int16_t port; + u_int16_t port, sport, eport; + unsigned int i; /* Connection will come from reply */ if (nf_inet_addr_cmp(&ct->tuplehash[dir].tuple.src.u3, @@ -589,17 +637,37 @@ rtcp_exp->dir = !dir; rtcp_exp->expectfn = nf_nat_sip_expected; + if (dir == IP_CT_DIR_ORIGINAL && + (ct->status & IPS_SRC_NAT) && + ct->nat_src_proto_min.all && + ct->nat_src_proto_max.all) { + sport = ntohs(ct->nat_src_proto_min.all); + eport = ntohs(ct->nat_src_proto_max.all); + } else { + sport = 1024; + eport = 65535; + } + + port = ntohs(rtp_exp->tuple.dst.u.udp.port); + if (port < sport || port > eport - 1) { + get_random_bytes(&port, sizeof (port)); + port %= eport - sport; + port += sport; + } + /* Try to get same pair of ports: if not, try to change them. */ - for (port = ntohs(rtp_exp->tuple.dst.u.udp.port); - port != 0; port += 2) { + for (i = 0; i < eport - sport + 1; i += 2) { int ret; rtp_exp->tuple.dst.u.udp.port = htons(port); ret = nf_ct_expect_related(rtp_exp, NF_CT_EXP_F_SKIP_MASTER); - if (ret == -EBUSY) + if (ret == -EBUSY) { + port += 2; + if (port > eport) + port = sport; continue; - else if (ret < 0) { + } else if (ret < 0) { port = 0; break; } @@ -610,12 +678,19 @@ break; else if (ret == -EBUSY) { nf_ct_unexpect_related(rtp_exp); + port += 2; + if (port > eport) + port = sport; continue; } else if (ret < 0) { nf_ct_unexpect_related(rtp_exp); port = 0; break; } + + port += 2; + if (port > eport) + port = sport; } if (port == 0) { diff -ruw linux-6.13.12/net/netfilter/nfnetlink.c linux-6.13.12-fbx/net/netfilter/nfnetlink.c --- linux-6.13.12/net/netfilter/nfnetlink.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/netfilter/nfnetlink.c 2025-09-25 17:40:37.863378612 +0200 @@ -656,7 +656,10 @@ skb->len < nlh->nlmsg_len) return; - if (!netlink_net_capable(skb, CAP_NET_ADMIN)) { + if (NFNL_SUBSYS_ID(nlh->nlmsg_type) == NFNL_SUBSYS_CTNETLINK && + NFNL_MSG_TYPE(nlh->nlmsg_type) == 1 /* IPCTNL_MSG_CT_GET */) { + pr_debug("Carving out access exception for conntrack get; does not work for batch queries\n"); + } else if (!netlink_net_capable(skb, CAP_NET_ADMIN)) { netlink_ack(skb, nlh, -EPERM, NULL); return; } diff -ruw linux-6.13.12/net/sched/sch_drr.c linux-6.13.12-fbx/net/sched/sch_drr.c --- linux-6.13.12/net/sched/sch_drr.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/sched/sch_drr.c 2025-09-25 17:40:37.903378810 +0200 @@ -105,6 +105,7 @@ return -ENOBUFS; gnet_stats_basic_sync_init(&cl->bstats); + INIT_LIST_HEAD(&cl->alist); cl->common.classid = classid; cl->quantum = quantum; cl->qdisc = qdisc_create_dflt(sch->dev_queue, @@ -229,7 +230,7 @@ { struct drr_class *cl = (struct drr_class *)arg; - list_del(&cl->alist); + list_del_init(&cl->alist); } static int drr_dump_class(struct Qdisc *sch, unsigned long arg, @@ -326,7 +327,9 @@ cl = drr_find_class(sch, res.classid); return cl; } - return NULL; + + /* default to first minor if it exists, or drop */ + return drr_find_class(sch, TC_H_MAKE(TC_H_MAJ(sch->handle), 1)); } static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch, @@ -390,7 +393,7 @@ if (unlikely(skb == NULL)) goto out; if (cl->qdisc->q.qlen == 0) - list_del(&cl->alist); + list_del_init(&cl->alist); bstats_update(&cl->bstats, skb); qdisc_bstats_update(sch, skb); @@ -431,7 +434,7 @@ for (i = 0; i < q->clhash.hashsize; i++) { hlist_for_each_entry(cl, &q->clhash.hash[i], common.hnode) { if (cl->qdisc->q.qlen) - list_del(&cl->alist); + list_del_init(&cl->alist); qdisc_reset(cl->qdisc); } } diff -ruw linux-6.13.12/net/socket.c linux-6.13.12-fbx/net/socket.c --- linux-6.13.12/net/socket.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/socket.c 2025-09-25 17:40:37.927378929 +0200 @@ -1228,6 +1228,32 @@ 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 *)); +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 *)); +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. @@ -1299,6 +1325,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 (!ops->gettstamp) { @@ -1324,6 +1361,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.13.12/net/unix/Kconfig linux-6.13.12-fbx/net/unix/Kconfig --- linux-6.13.12/net/unix/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/unix/Kconfig 2025-09-25 17:40:37.951379048 +0200 @@ -21,6 +21,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.13.12/net/unix/af_unix.c linux-6.13.12-fbx/net/unix/af_unix.c --- linux-6.13.12/net/unix/af_unix.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/unix/af_unix.c 2025-09-25 17:40:37.951379048 +0200 @@ -1183,8 +1183,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.13.12/net/wireless/Kconfig linux-6.13.12-fbx/net/wireless/Kconfig --- linux-6.13.12/net/wireless/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/Kconfig 2025-09-25 17:40:37.951379048 +0200 @@ -174,6 +174,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,4 +204,9 @@ If unsure, say N. +config FBX80211 + bool "fbx genl family" + help + Support for freebox specific genl family + endif # CFG80211 diff -ruw linux-6.13.12/net/wireless/Makefile linux-6.13.12-fbx/net/wireless/Makefile --- linux-6.13.12/net/wireless/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/Makefile 2025-09-25 17:40:37.951379048 +0200 @@ -6,7 +6,7 @@ obj-$(CONFIG_WEXT_PROC) += wext-proc.o obj-$(CONFIG_WEXT_PRIV) += wext-priv.o -cfg80211-y += core.o sysfs.o radiotap.o util.o reg.o scan.o nl80211.o +cfg80211-y += core.o sysfs.o sysfs-radio.o radiotap.o util.o reg.o scan.o nl80211.o cfg80211-y += mlme.o ibss.o sme.o chan.o ethtool.o mesh.o ap.o trace.o ocb.o cfg80211-y += pmsr.o cfg80211-$(CONFIG_OF) += of.o @@ -20,6 +20,8 @@ cfg80211-y += extra-certs.o endif +cfg80211-$(CONFIG_FBX80211) += nlfbx.o + $(obj)/shipped-certs.c: $(sort $(wildcard $(src)/certs/*.hex)) @$(kecho) " GEN $@" $(Q)(echo '#include "reg.h"'; \ diff -ruw linux-6.13.12/net/wireless/chan.c linux-6.13.12-fbx/net/wireless/chan.c --- linux-6.13.12/net/wireless/chan.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/chan.c 2025-09-25 17:40:37.955379068 +0200 @@ -55,6 +55,56 @@ } EXPORT_SYMBOL(cfg80211_chandef_create); +static int cfg80211_chandef_get_width(const struct cfg80211_chan_def *c) +{ + return nl80211_chan_width_to_mhz(c->width); +} + +static u32 cfg80211_get_start_freq(const struct cfg80211_chan_def *chandef, + u32 cf) +{ + u32 start_freq, center_freq, bandwidth; + + center_freq = MHZ_TO_KHZ((cf == 1) ? + chandef->center_freq1 : chandef->center_freq2); + bandwidth = MHZ_TO_KHZ(cfg80211_chandef_get_width(chandef)); + + if (bandwidth <= MHZ_TO_KHZ(20)) + start_freq = center_freq; + else + start_freq = center_freq - bandwidth / 2 + MHZ_TO_KHZ(10); + + return start_freq; +} + +static u32 cfg80211_get_end_freq(const struct cfg80211_chan_def *chandef, + u32 cf) +{ + u32 end_freq, center_freq, bandwidth; + + center_freq = MHZ_TO_KHZ((cf == 1) ? + chandef->center_freq1 : chandef->center_freq2); + bandwidth = MHZ_TO_KHZ(cfg80211_chandef_get_width(chandef)); + + if (bandwidth <= MHZ_TO_KHZ(20)) + end_freq = center_freq; + else + end_freq = center_freq + bandwidth / 2 - MHZ_TO_KHZ(10); + + return end_freq; +} + +#define for_each_subchan(chandef, freq, cf) \ + for (u32 punctured = chandef->punctured, \ + cf = 1, freq = cfg80211_get_start_freq(chandef, cf); \ + freq <= cfg80211_get_end_freq(chandef, cf); \ + freq += MHZ_TO_KHZ(20), \ + ((cf == 1 && chandef->center_freq2 != 0 && \ + freq > cfg80211_get_end_freq(chandef, cf)) ? \ + (cf++, freq = cfg80211_get_start_freq(chandef, cf), \ + punctured = 0) : (punctured >>= 1))) \ + if (!(punctured & 1)) + struct cfg80211_per_bw_puncturing_values { u8 len; const u16 *valid_values; @@ -258,11 +308,6 @@ } EXPORT_SYMBOL(nl80211_chan_width_to_mhz); -static int cfg80211_chandef_get_width(const struct cfg80211_chan_def *c) -{ - return nl80211_chan_width_to_mhz(c->width); -} - static bool cfg80211_valid_center_freq(u32 center, enum nl80211_chan_width width) { @@ -582,29 +627,82 @@ } EXPORT_SYMBOL(cfg80211_chandef_compatible); -static void cfg80211_set_chans_dfs_state(struct wiphy *wiphy, u32 center_freq, - u32 bandwidth, - enum nl80211_dfs_state dfs_state) +static inline u32 +dfs_cache_channel_to_khz(const struct cfg80211_chan_dfs_cache *cd) { - struct ieee80211_channel *c; + 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; - for (freq = center_freq - bandwidth/2 + 10; - freq <= center_freq + bandwidth/2 - 10; - freq += 20) { - c = ieee80211_get_channel(wiphy, freq); - if (!c || !(c->flags & IEEE80211_CHAN_RADAR)) - continue; + 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; +} - c->dfs_state = dfs_state; - c->dfs_state_entered = jiffies; +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); } void cfg80211_set_dfs_state(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef, enum nl80211_dfs_state dfs_state) { + struct ieee80211_channel *c; int width; if (WARN_ON(!cfg80211_chandef_valid(chandef))) @@ -614,41 +712,17 @@ if (width < 0) return; - cfg80211_set_chans_dfs_state(wiphy, chandef->center_freq1, - width, dfs_state); - - if (!chandef->center_freq2) - return; - cfg80211_set_chans_dfs_state(wiphy, chandef->center_freq2, - width, dfs_state); -} - -static u32 cfg80211_get_start_freq(u32 center_freq, - u32 bandwidth) -{ - u32 start_freq; + for_each_subchan(chandef, freq, cf) { + c = ieee80211_get_channel_khz(wiphy, freq); + if (!c || !(c->flags & IEEE80211_CHAN_RADAR)) + continue; - bandwidth = MHZ_TO_KHZ(bandwidth); - if (bandwidth <= MHZ_TO_KHZ(20)) - start_freq = center_freq; - else - start_freq = center_freq - bandwidth / 2 + MHZ_TO_KHZ(10); + if (IS_ENABLED(CONFIG_CFG80211_DFS_CACHE)) + set_dfs_cache_state(c, dfs_state); - return start_freq; + c->dfs_state = dfs_state; + c->dfs_state_entered = jiffies; } - -static u32 cfg80211_get_end_freq(u32 center_freq, - u32 bandwidth) -{ - u32 end_freq; - - bandwidth = MHZ_TO_KHZ(bandwidth); - if (bandwidth <= MHZ_TO_KHZ(20)) - end_freq = center_freq; - else - end_freq = center_freq + bandwidth / 2 - MHZ_TO_KHZ(10); - - return end_freq; } static bool @@ -725,17 +799,12 @@ } static int cfg80211_get_chans_dfs_required(struct wiphy *wiphy, - u32 center_freq, - u32 bandwidth, + const struct cfg80211_chan_def *chandef, enum nl80211_iftype iftype) { struct ieee80211_channel *c; - u32 freq, start_freq, end_freq; - - start_freq = cfg80211_get_start_freq(center_freq, bandwidth); - end_freq = cfg80211_get_end_freq(center_freq, bandwidth); - for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) { + for_each_subchan(chandef, freq, cf) { c = ieee80211_get_channel_khz(wiphy, freq); if (!c) return -EINVAL; @@ -768,25 +837,9 @@ if (width < 0) return -EINVAL; - ret = cfg80211_get_chans_dfs_required(wiphy, - ieee80211_chandef_to_khz(chandef), - width, iftype); - if (ret < 0) - return ret; - else if (ret > 0) - return BIT(chandef->width); - - if (!chandef->center_freq2) - return 0; - - ret = cfg80211_get_chans_dfs_required(wiphy, - MHZ_TO_KHZ(chandef->center_freq2), - width, iftype); - if (ret < 0) - return ret; - else if (ret > 0) - return BIT(chandef->width); + ret = cfg80211_get_chans_dfs_required(wiphy, chandef, iftype); + return (ret > 0) ? BIT(chandef->width) : ret; break; case NL80211_IFTYPE_STATION: case NL80211_IFTYPE_OCB: @@ -806,16 +859,18 @@ } EXPORT_SYMBOL(cfg80211_chandef_dfs_required); -static int cfg80211_get_chans_dfs_usable(struct wiphy *wiphy, - u32 center_freq, - u32 bandwidth) +bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, + const struct cfg80211_chan_def *chandef) { struct ieee80211_channel *c; - u32 freq, start_freq, end_freq; - int count = 0; + int width, count = 0; - start_freq = cfg80211_get_start_freq(center_freq, bandwidth); - end_freq = cfg80211_get_end_freq(center_freq, bandwidth); + if (WARN_ON(!cfg80211_chandef_valid(chandef))) + return false; + + width = cfg80211_chandef_get_width(chandef); + if (width < 0) + return false; /* * Check entire range of channels for the bandwidth. @@ -823,61 +878,24 @@ * DFS_AVAILABLE). Return number of usable channels * (require CAC). Allow DFS and non-DFS channel mix. */ - for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) { + for_each_subchan(chandef, freq, cf) { c = ieee80211_get_channel_khz(wiphy, freq); if (!c) - return -EINVAL; + return false; if (c->flags & IEEE80211_CHAN_DISABLED) - return -EINVAL; + return false; if (c->flags & IEEE80211_CHAN_RADAR) { if (c->dfs_state == NL80211_DFS_UNAVAILABLE) - return -EINVAL; + return false; if (c->dfs_state == NL80211_DFS_USABLE) count++; } } - return count; -} - -bool cfg80211_chandef_dfs_usable(struct wiphy *wiphy, - const struct cfg80211_chan_def *chandef) -{ - int width; - int r1, r2 = 0; - - if (WARN_ON(!cfg80211_chandef_valid(chandef))) - return false; - - width = cfg80211_chandef_get_width(chandef); - if (width < 0) - return false; - - r1 = cfg80211_get_chans_dfs_usable(wiphy, - MHZ_TO_KHZ(chandef->center_freq1), - width); - - if (r1 < 0) - return false; - - switch (chandef->width) { - case NL80211_CHAN_WIDTH_80P80: - WARN_ON(!chandef->center_freq2); - r2 = cfg80211_get_chans_dfs_usable(wiphy, - MHZ_TO_KHZ(chandef->center_freq2), - width); - if (r2 < 0) - return false; - break; - default: - WARN_ON(chandef->center_freq2); - break; - } - - return (r1 + r2 > 0); + return count > 0; } EXPORT_SYMBOL(cfg80211_chandef_dfs_usable); @@ -1039,10 +1057,10 @@ if (!reg_dfs_domain_same(wiphy, &rdev->wiphy)) continue; - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + found = cfg80211_is_wiphy_oper_chan(&rdev->wiphy, chan) || cfg80211_offchan_chain_is_active(rdev, chan); - wiphy_unlock(&rdev->wiphy); if (found) return true; @@ -1051,26 +1069,29 @@ return false; } -static bool cfg80211_get_chans_dfs_available(struct wiphy *wiphy, - u32 center_freq, - u32 bandwidth) +static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy, + const struct cfg80211_chan_def *chandef) { struct ieee80211_channel *c; - u32 freq, start_freq, end_freq; + int width; bool dfs_offload; + if (WARN_ON(!cfg80211_chandef_valid(chandef))) + return false; + + width = cfg80211_chandef_get_width(chandef); + if (width < 0) + return false; + dfs_offload = wiphy_ext_feature_isset(wiphy, NL80211_EXT_FEATURE_DFS_OFFLOAD); - start_freq = cfg80211_get_start_freq(center_freq, bandwidth); - end_freq = cfg80211_get_end_freq(center_freq, bandwidth); - /* * Check entire range of channels for the bandwidth. * If any channel in between is disabled or has not * had gone through CAC return false */ - for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) { + for_each_subchan(chandef, freq, cf) { c = ieee80211_get_channel_khz(wiphy, freq); if (!c) return false; @@ -1087,124 +1108,54 @@ return true; } -static bool cfg80211_chandef_dfs_available(struct wiphy *wiphy, +unsigned int +cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, const struct cfg80211_chan_def *chandef) { + struct ieee80211_channel *c; int width; - int r; + unsigned int t1 = 0, t2 = 0; if (WARN_ON(!cfg80211_chandef_valid(chandef))) - return false; + return 0; width = cfg80211_chandef_get_width(chandef); if (width < 0) - return false; - - r = cfg80211_get_chans_dfs_available(wiphy, - MHZ_TO_KHZ(chandef->center_freq1), - width); - - /* If any of channels unavailable for cf1 just return */ - if (!r) - return r; - - switch (chandef->width) { - case NL80211_CHAN_WIDTH_80P80: - WARN_ON(!chandef->center_freq2); - r = cfg80211_get_chans_dfs_available(wiphy, - MHZ_TO_KHZ(chandef->center_freq2), - width); - break; - default: - WARN_ON(chandef->center_freq2); - break; - } - - return r; -} - -static unsigned int cfg80211_get_chans_dfs_cac_time(struct wiphy *wiphy, - u32 center_freq, - u32 bandwidth) -{ - struct ieee80211_channel *c; - u32 start_freq, end_freq, freq; - unsigned int dfs_cac_ms = 0; - - start_freq = cfg80211_get_start_freq(center_freq, bandwidth); - end_freq = cfg80211_get_end_freq(center_freq, bandwidth); - - for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) { - c = ieee80211_get_channel_khz(wiphy, freq); - if (!c) return 0; - if (c->flags & IEEE80211_CHAN_DISABLED) - return 0; + for_each_subchan(chandef, freq, cf) { + c = ieee80211_get_channel_khz(wiphy, freq); + if (!c || (c->flags & IEEE80211_CHAN_DISABLED)) { + if (cf == 1) + t1 = INT_MAX; + else + t2 = INT_MAX; + continue; + } if (!(c->flags & IEEE80211_CHAN_RADAR)) continue; - if (c->dfs_cac_ms > dfs_cac_ms) - dfs_cac_ms = c->dfs_cac_ms; - } + if (cf == 1 && c->dfs_cac_ms > t1) + t1 = c->dfs_cac_ms; - return dfs_cac_ms; + if (cf == 2 && c->dfs_cac_ms > t2) + t2 = c->dfs_cac_ms; } -unsigned int -cfg80211_chandef_dfs_cac_time(struct wiphy *wiphy, - const struct cfg80211_chan_def *chandef) -{ - int width; - unsigned int t1 = 0, t2 = 0; - - if (WARN_ON(!cfg80211_chandef_valid(chandef))) + if (t1 == INT_MAX && t2 == INT_MAX) return 0; - width = cfg80211_chandef_get_width(chandef); - if (width < 0) - return 0; + if (t1 == INT_MAX) + return t2; - t1 = cfg80211_get_chans_dfs_cac_time(wiphy, - MHZ_TO_KHZ(chandef->center_freq1), - width); - - if (!chandef->center_freq2) + if (t2 == INT_MAX) return t1; - t2 = cfg80211_get_chans_dfs_cac_time(wiphy, - MHZ_TO_KHZ(chandef->center_freq2), - width); - 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, - u32 prohibited_flags, - u32 permitting_flags) -{ - struct ieee80211_channel *c; - u32 freq, start_freq, end_freq; - - start_freq = cfg80211_get_start_freq(center_freq, bandwidth); - end_freq = cfg80211_get_end_freq(center_freq, bandwidth); - - for (freq = start_freq; freq <= end_freq; freq += MHZ_TO_KHZ(20)) { - c = ieee80211_get_channel_khz(wiphy, freq); - if (!c) - return false; - if (c->flags & permitting_flags) - continue; - if (c->flags & prohibited_flags) - return false; - } - - return true; -} - /* check if the operating channels are valid and supported */ static bool cfg80211_edmg_usable(struct wiphy *wiphy, u8 edmg_channels, enum ieee80211_edmg_bw_config edmg_bw_config, @@ -1270,6 +1221,7 @@ bool ext_nss_cap, support_80_80 = false, support_320 = false; const struct ieee80211_sband_iftype_data *iftd; struct ieee80211_supported_band *sband; + struct ieee80211_channel *c; int i; if (WARN_ON(!cfg80211_chandef_valid(chandef))) @@ -1420,19 +1372,17 @@ if (width < 20) prohibited_flags |= IEEE80211_CHAN_NO_OFDM; - - if (!cfg80211_secondary_chans_ok(wiphy, - ieee80211_chandef_to_khz(chandef), - width, prohibited_flags, - permitting_flags)) + for_each_subchan(chandef, freq, cf) { + c = ieee80211_get_channel_khz(wiphy, freq); + if (!c) return false; + if (c->flags & permitting_flags) + continue; + if (c->flags & prohibited_flags) + return false; + } - if (!chandef->center_freq2) return true; - return cfg80211_secondary_chans_ok(wiphy, - MHZ_TO_KHZ(chandef->center_freq2), - width, prohibited_flags, - permitting_flags); } bool cfg80211_chandef_usable(struct wiphy *wiphy, diff -ruw linux-6.13.12/net/wireless/core.c linux-6.13.12-fbx/net/wireless/core.c --- linux-6.13.12/net/wireless/core.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/core.c 2025-09-29 14:23:07.625732509 +0200 @@ -25,6 +25,7 @@ #include #include #include "nl80211.h" +#include "nlfbx.h" #include "core.h" #include "sysfs.h" #include "debugfs.h" @@ -54,6 +55,10 @@ 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; @@ -143,10 +148,7 @@ if (result) return result; - if (!IS_ERR_OR_NULL(rdev->wiphy.debugfsdir)) - debugfs_rename(rdev->wiphy.debugfsdir->d_parent, - rdev->wiphy.debugfsdir, - rdev->wiphy.debugfsdir->d_parent, newname); + debugfs_change_name(rdev->wiphy.debugfsdir, "%s", newname); nl80211_notify_wiphy(rdev, NL80211_CMD_NEW_WIPHY); @@ -191,7 +193,8 @@ return err; } - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { if (!wdev->netdev) continue; @@ -212,7 +215,6 @@ continue; nl80211_notify_iface(rdev, wdev, NL80211_CMD_NEW_INTERFACE); } - wiphy_unlock(&rdev->wiphy); return 0; } @@ -221,9 +223,9 @@ { struct cfg80211_registered_device *rdev = data; - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + rdev_rfkill_poll(rdev); - wiphy_unlock(&rdev->wiphy); } void cfg80211_stop_p2p_device(struct cfg80211_registered_device *rdev, @@ -283,7 +285,7 @@ /* otherwise, check iftype */ - wiphy_lock(wiphy); + guard(wiphy)(wiphy); switch (wdev->iftype) { case NL80211_IFTYPE_P2P_DEVICE: @@ -295,8 +297,6 @@ default: break; } - - wiphy_unlock(wiphy); } } EXPORT_SYMBOL_GPL(cfg80211_shutdown_all_interfaces); @@ -331,9 +331,9 @@ rdev = container_of(work, struct cfg80211_registered_device, event_work); - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + cfg80211_process_rdev_events(rdev); - wiphy_unlock(&rdev->wiphy); } void cfg80211_destroy_ifaces(struct cfg80211_registered_device *rdev) @@ -347,10 +347,10 @@ if (wdev->netdev) dev_close(wdev->netdev); - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + cfg80211_leave(rdev, wdev); cfg80211_remove_virtual_intf(rdev, wdev); - wiphy_unlock(&rdev->wiphy); } } } @@ -423,9 +423,9 @@ trace_wiphy_work_worker_start(&rdev->wiphy); - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); if (rdev->suspended) - goto out; + return; spin_lock_irq(&rdev->wiphy_work_lock); wk = list_first_entry_or_null(&rdev->wiphy_work_list, @@ -441,8 +441,6 @@ } else { spin_unlock_irq(&rdev->wiphy_work_lock); } -out: - wiphy_unlock(&rdev->wiphy); } /* exported functions */ @@ -598,6 +596,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; } @@ -1073,6 +1072,58 @@ rdev->wiphy.registered = true; rtnl_unlock(); + /* register individual radio objects */ + wiphy->n_radio_dev = wiphy->n_radio; + if (!wiphy->n_radio_dev) + wiphy->n_radio_dev = 1; + + wiphy->radio_devices = kcalloc(wiphy->n_radio_dev, + sizeof (wiphy->radio_devices), + GFP_KERNEL); + if (!wiphy->radio_devices) { + wiphy_unregister(&rdev->wiphy); + return -ENOMEM; + } + + for (i = 0; i < wiphy->n_radio_dev; i++) { + struct wiphy_radio_dev *radio; + + radio = kzalloc(sizeof (*radio), GFP_KERNEL); + if (!radio) { + wiphy_unregister(&rdev->wiphy); + return -ENOMEM; + } + + radio->idx = i; + device_initialize(&radio->dev); + radio->dev.parent = &wiphy->dev; + radio->dev.class = &ieee80211_radio_class; + radio->dev.platform_data = radio; + radio->wiphy = wiphy; + + wiphy->radio_devices[i] = radio; + } + + for (i = 0; i < wiphy->n_radio_dev; i++) { + struct wiphy_radio_dev *radio = wiphy->radio_devices[i]; + + res = dev_set_name(&radio->dev, "%s_radio%d", + wiphy_name(wiphy), + i); + if (res) { + wiphy_unregister(&rdev->wiphy); + return res; + } + + res = device_add(&radio->dev); + if (res) { + wiphy_unregister(&rdev->wiphy); + return res; + } + + get_device(&wiphy->dev); + } + res = rfkill_register(rdev->wiphy.rfkill); if (res) { rfkill_destroy(rdev->wiphy.rfkill); @@ -1081,6 +1132,23 @@ return res; } + /* Allocate radio configuration space for multi-radio wiphy. + */ + if (wiphy->n_radio) { + int idx; + + wiphy->radio_cfg = kcalloc(wiphy->n_radio, sizeof(*wiphy->radio_cfg), + GFP_KERNEL); + if (!wiphy->radio_cfg) + return -ENOMEM; + /* + * Initialize wiphy radio parameters to IEEE 802.11 MIB default values. + * RTS threshold is disabled by default with the special -1 value. + */ + for (idx = 0; idx < wiphy->n_radio; idx++) + wiphy->radio_cfg[idx].rts_threshold = (u32)-1; + } + return 0; } EXPORT_SYMBOL(wiphy_register); @@ -1130,6 +1198,7 @@ void wiphy_unregister(struct wiphy *wiphy) { struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + int i; wait_event(rdev->dev_wait, ({ int __count; @@ -1143,6 +1212,18 @@ rtnl_lock(); wiphy_lock(&rdev->wiphy); + + if (wiphy->radio_devices) { + for (i = 0; i < wiphy->n_radio_dev; i++) { + struct wiphy_radio_dev *radio; + radio = wiphy->radio_devices[i]; + if (!radio) + continue; + device_del(&radio->dev); + } + kfree(wiphy->radio_devices); + } + nl80211_notify_wiphy(rdev, NL80211_CMD_DEL_WIPHY); rdev->wiphy.registered = false; @@ -1191,6 +1272,7 @@ cfg80211_rdev_free_wowlan(rdev); cfg80211_free_coalesce(rdev->coalesce); rdev->coalesce = NULL; + kfree(wiphy->radio_cfg); } EXPORT_SYMBOL(wiphy_unregister); @@ -1491,6 +1573,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); @@ -1533,9 +1616,9 @@ break; case NETDEV_REGISTER: if (!wdev->registered) { - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + cfg80211_register_wdev(rdev, wdev); - wiphy_unlock(&rdev->wiphy); } break; case NETDEV_UNREGISTER: @@ -1544,16 +1627,16 @@ * so check wdev->registered. */ if (wdev->registered && !wdev->registering) { - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + _cfg80211_unregister_wdev(wdev, false); - wiphy_unlock(&rdev->wiphy); } break; case NETDEV_GOING_DOWN: - wiphy_lock(&rdev->wiphy); + scoped_guard(wiphy, &rdev->wiphy) { 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); @@ -1765,6 +1848,40 @@ } EXPORT_SYMBOL_GPL(wiphy_delayed_work_pending); +/* + * + */ +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; @@ -1777,6 +1894,10 @@ if (err) goto out_fail_sysfs; + err = wiphy_sysfs_radio_init(); + if (err) + goto out_fail_sysfs; + err = register_netdevice_notifier(&cfg80211_netdev_notifier); if (err) goto out_fail_notifier; @@ -1785,8 +1906,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; @@ -1802,11 +1929,14 @@ out_fail_wq: regulatory_exit(); out_fail_reg: + nlfbx_exit(); +out_fail_nlfbx: debugfs_remove(ieee80211_debugfs_dir); nl80211_exit(); out_fail_nl80211: unregister_netdevice_notifier(&cfg80211_netdev_notifier); out_fail_notifier: + wiphy_sysfs_radio_exit(); wiphy_sysfs_exit(); out_fail_sysfs: unregister_pernet_device(&cfg80211_pernet_ops); @@ -1817,9 +1947,11 @@ static void __exit cfg80211_exit(void) { + dfs_cache_exit(); debugfs_remove(ieee80211_debugfs_dir); nl80211_exit(); unregister_netdevice_notifier(&cfg80211_netdev_notifier); + wiphy_sysfs_radio_exit(); wiphy_sysfs_exit(); regulatory_exit(); unregister_pernet_device(&cfg80211_pernet_ops); diff -ruw linux-6.13.12/net/wireless/core.h linux-6.13.12-fbx/net/wireless/core.h --- linux-6.13.12/net/wireless/core.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/core.h 2025-09-25 17:40:37.955379068 +0200 @@ -160,6 +160,30 @@ 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) { @@ -567,6 +591,10 @@ struct wireless_dev *wdev); void cfg80211_wdev_release_link_bsses(struct wireless_dev *wdev, u16 link_mask); +int cfg80211_assoc_ml_reconf(struct cfg80211_registered_device *rdev, + struct net_device *dev, + struct cfg80211_assoc_link *links, + u16 rem_links); /** * struct cfg80211_colocated_ap - colocated AP information * diff -ruw linux-6.13.12/net/wireless/debugfs.c linux-6.13.12-fbx/net/wireless/debugfs.c --- linux-6.13.12/net/wireless/debugfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/debugfs.c 2025-09-25 17:40:37.955379068 +0200 @@ -29,8 +29,6 @@ .llseek = generic_file_llseek, \ } -DEBUGFS_READONLY_FILE(rts_threshold, 20, "%d", - wiphy->rts_threshold); DEBUGFS_READONLY_FILE(fragmentation_threshold, 20, "%d", wiphy->frag_threshold); DEBUGFS_READONLY_FILE(short_retry_limit, 20, "%d", @@ -96,6 +94,39 @@ .open = simple_open, .llseek = default_llseek, }; + +static ssize_t rts_threshold_read(struct file *file, char __user *user_buf, + size_t count, loff_t *ppos) +{ + unsigned int buf_size = PAGE_SIZE, res = 0, i; + struct wiphy *wiphy = file->private_data; + char *buf; + ssize_t r; + + buf = kzalloc(buf_size, GFP_KERNEL); + if (!buf) + return -ENOMEM; + + if (wiphy->n_radio) { + for (i = 0; i < wiphy->n_radio; i++) + res += scnprintf(buf, buf_size, "%d\n", + wiphy->radio_cfg[i].rts_threshold); + } else { + res = scnprintf(buf, buf_size, "%d\n", wiphy->rts_threshold); + } + + r = simple_read_from_buffer(user_buf, count, ppos, buf, res); + + kfree(buf); + + return r; +} + +static const struct file_operations rts_threshold_ops = { + .read = rts_threshold_read, + .open = simple_open, + .llseek = default_llseek, +}; #define DEBUGFS_ADD(name) \ debugfs_create_file(#name, 0444, phyd, &rdev->wiphy, &name## _ops) diff -ruw linux-6.13.12/net/wireless/mlme.c linux-6.13.12-fbx/net/wireless/mlme.c --- linux-6.13.12/net/wireless/mlme.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/mlme.c 2025-09-25 17:40:37.955379068 +0200 @@ -352,6 +352,13 @@ return -EINVAL; } + if (ieee80211_mle_get_ext_mld_capa_op((const u8 *)mle_a) != + ieee80211_mle_get_ext_mld_capa_op((const u8 *)mle_b)) { + NL_SET_ERR_MSG(extack, + "extended link MLD capabilities/ops mismatch"); + return -EINVAL; + } + return 0; } @@ -627,10 +634,10 @@ rdev = container_of(wk, struct cfg80211_registered_device, mgmt_registrations_update_wk); - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) cfg80211_mgmt_registrations_update(wdev); - wiphy_unlock(&rdev->wiphy); } int cfg80211_mlme_register_mgmt(struct wireless_dev *wdev, u32 snd_portid, @@ -1193,10 +1200,10 @@ const struct cfg80211_chan_def *chandef, enum nl80211_radar_event event) { - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + __cfg80211_background_cac_event(rdev, rdev->background_radar_wdev, chandef, event); - wiphy_unlock(&rdev->wiphy); } void cfg80211_background_cac_done_wk(struct work_struct *work) @@ -1287,3 +1294,80 @@ &rdev->background_radar_chandef, NL80211_RADAR_CAC_ABORTED); } + +int cfg80211_assoc_ml_reconf(struct cfg80211_registered_device *rdev, + struct net_device *dev, + struct cfg80211_assoc_link *links, + u16 rem_links) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + int err; + + lockdep_assert_wiphy(wdev->wiphy); + + err = rdev_assoc_ml_reconf(rdev, dev, links, rem_links); + if (!err) { + int link_id; + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) { + if (!links[link_id].bss) + continue; + + cfg80211_ref_bss(&rdev->wiphy, links[link_id].bss); + cfg80211_hold_bss(bss_from_pub(links[link_id].bss)); + } + } + + return err; +} + +void cfg80211_mlo_reconf_add_done(struct net_device *dev, + struct cfg80211_mlo_reconf_done_data *data) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + struct wiphy *wiphy = wdev->wiphy; + int link_id; + + lockdep_assert_wiphy(wiphy); + + trace_cfg80211_mlo_reconf_add_done(dev, data->added_links, + data->buf, data->len); + + if (WARN_ON(!wdev->valid_links)) + return; + + if (WARN_ON(wdev->iftype != NL80211_IFTYPE_STATION && + wdev->iftype != NL80211_IFTYPE_P2P_CLIENT)) + return; + + /* validate that a BSS is given for each added link */ + for (link_id = 0; link_id < ARRAY_SIZE(data->links); link_id++) { + struct cfg80211_bss *bss = data->links[link_id].bss; + + if (!(data->added_links & BIT(link_id))) + continue; + + if (WARN_ON(!bss)) + return; + } + + for (link_id = 0; link_id < ARRAY_SIZE(data->links); link_id++) { + struct cfg80211_bss *bss = data->links[link_id].bss; + + if (!bss) + continue; + + if (data->added_links & BIT(link_id)) { + wdev->links[link_id].client.current_bss = + bss_from_pub(bss); + } else { + cfg80211_unhold_bss(bss_from_pub(bss)); + cfg80211_put_bss(wiphy, bss); + } + } + + wdev->valid_links |= data->added_links; + nl80211_mlo_reconf_add_done(dev, data); +} +EXPORT_SYMBOL(cfg80211_mlo_reconf_add_done); diff -ruw linux-6.13.12/net/wireless/nl80211.c linux-6.13.12-fbx/net/wireless/nl80211.c --- linux-6.13.12/net/wireless/nl80211.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/nl80211.c 2025-09-25 17:40:37.959379088 +0200 @@ -294,6 +294,21 @@ return 0; } +static int validate_supported_selectors(const struct nlattr *attr, + struct netlink_ext_ack *extack) +{ + const u8 *supported_selectors = nla_data(attr); + u8 supported_selectors_len = nla_len(attr); + + /* The top bit must not be set as it is not part of the selector */ + for (int i = 0; i < supported_selectors_len; i++) { + if (supported_selectors[i] & 0x80) + return -EINVAL; + } + + return 0; +} + /* policy for the attributes */ static const struct nla_policy nl80211_policy[NUM_NL80211_ATTR]; @@ -454,6 +469,8 @@ [NL80211_MBSSID_CONFIG_ATTR_INDEX] = { .type = NLA_U8 }, [NL80211_MBSSID_CONFIG_ATTR_TX_IFINDEX] = { .type = NLA_U32 }, [NL80211_MBSSID_CONFIG_ATTR_EMA] = { .type = NLA_FLAG }, + [NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID] = + NLA_POLICY_MAX(NLA_U8, IEEE80211_MLD_MAX_NUM_LINKS), }; static const struct nla_policy @@ -818,6 +835,7 @@ [NL80211_ATTR_MLD_ADDR] = NLA_POLICY_EXACT_LEN(ETH_ALEN), [NL80211_ATTR_MLO_SUPPORT] = { .type = NLA_FLAG }, [NL80211_ATTR_MAX_NUM_AKM_SUITES] = { .type = NLA_REJECT }, + [NL80211_ATTR_EML_CAPABILITY] = { .type = NLA_U16 }, [NL80211_ATTR_PUNCT_BITMAP] = NLA_POLICY_FULL_RANGE(NLA_U32, &nl80211_punct_bitmap_range), @@ -830,6 +848,12 @@ [NL80211_ATTR_MLO_TTLM_ULINK] = NLA_POLICY_EXACT_LEN(sizeof(u16) * 8), [NL80211_ATTR_ASSOC_SPP_AMSDU] = { .type = NLA_FLAG }, [NL80211_ATTR_VIF_RADIO_MASK] = { .type = NLA_U32 }, + [NL80211_ATTR_SUPPORTED_SELECTORS] = + NLA_POLICY_VALIDATE_FN(NLA_BINARY, validate_supported_selectors, + NL80211_MAX_SUPP_SELECTORS), + [NL80211_ATTR_MLO_RECONF_REM_LINKS] = { .type = NLA_U16 }, + [NL80211_ATTR_EPCS] = { .type = NLA_FLAG }, + [NL80211_ATTR_WIPHY_RADIO_INDEX] = { .type = NLA_U8 }, }; /* policy for the key attributes */ @@ -2418,6 +2442,7 @@ static int nl80211_put_radio(struct wiphy *wiphy, struct sk_buff *msg, int idx) { const struct wiphy_radio *r = &wiphy->radio[idx]; + const struct wiphy_radio_cfg *rcfg = &wiphy->radio_cfg[idx]; struct nlattr *radio, *freq; int i; @@ -2428,6 +2453,10 @@ if (nla_put_u32(msg, NL80211_WIPHY_RADIO_ATTR_INDEX, idx)) goto nla_put_failure; + if (wiphy->radio_cfg && + nla_put_u32(msg, NL80211_WIPHY_RADIO_ATTR_RTS_THRESHOLD, rcfg->rts_threshold)) + goto nla_put_failure; + if (r->antenna_mask && nla_put_u32(msg, NL80211_WIPHY_RADIO_ATTR_ANTENNA_MASK, r->antenna_mask)) @@ -3064,6 +3093,7 @@ goto nla_put_failure; } + state->capa_start = 0; state->split_start++; break; case 14: @@ -3210,7 +3240,8 @@ skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, - NLM_F_MULTI, state); + NLM_F_MULTI, + state); if (ret < 0) { /* * If sending the wiphy data didn't fit (ENOBUFS @@ -3587,7 +3618,7 @@ int result = 0, rem_txq_params = 0; struct nlattr *nl_txq_params; u32 changed; - u8 retry_short = 0, retry_long = 0; + u8 retry_short = 0, retry_long = 0, radio_id = NL80211_WIPHY_RADIO_ID_MAX; u32 frag_threshold = 0, rts_threshold = 0; u8 coverage_class = 0; u32 txq_limit = 0, txq_memory_limit = 0, txq_quantum = 0; @@ -3626,7 +3657,7 @@ } else wdev = netdev->ieee80211_ptr; - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); /* * end workaround code, by now the rdev is available @@ -3639,32 +3670,35 @@ rtnl_unlock(); if (result) - goto out; + return result; + + if (info->attrs[NL80211_ATTR_WIPHY_RADIO_INDEX]) { + /* Radio idx is not expected for non-multi radio wiphy */ + if (!rdev->wiphy.n_radio) + return -EINVAL; + + radio_id = nla_get_u8(info->attrs[NL80211_ATTR_WIPHY_RADIO_INDEX]); + if (radio_id >= rdev->wiphy.n_radio) + return -EINVAL; + } if (info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS]) { struct ieee80211_txq_params txq_params; struct nlattr *tb[NL80211_TXQ_ATTR_MAX + 1]; - if (!rdev->ops->set_txq_params) { - result = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_txq_params) + return -EOPNOTSUPP; - if (!netdev) { - result = -EINVAL; - goto out; - } + if (!netdev) + return -EINVAL; if (netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_AP && - netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) { - result = -EINVAL; - goto out; - } + netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_MONITOR && + netdev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_GO) + return -EINVAL; - if (!netif_running(netdev)) { - result = -ENETDOWN; - goto out; - } + if (!netif_running(netdev)) + return -ENETDOWN; nla_for_each_nested(nl_txq_params, info->attrs[NL80211_ATTR_WIPHY_TXQ_PARAMS], @@ -3675,10 +3709,11 @@ txq_params_policy, info->extack); if (result) - goto out; + return result; + result = parse_txq_params(tb, &txq_params); if (result) - goto out; + return result; txq_params.link_id = nl80211_link_id_or_invalid(info->attrs); @@ -3694,7 +3729,7 @@ result = rdev_set_txq_params(rdev, netdev, &txq_params); if (result) - goto out; + return result; } } @@ -3711,7 +3746,7 @@ } if (result) - goto out; + return result; } if (info->attrs[NL80211_ATTR_WIPHY_TX_POWER_SETTING]) { @@ -3722,28 +3757,24 @@ if (!(rdev->wiphy.features & NL80211_FEATURE_VIF_TXPOWER)) txp_wdev = NULL; - if (!rdev->ops->set_tx_power) { - result = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_tx_power) + return -EOPNOTSUPP; idx = NL80211_ATTR_WIPHY_TX_POWER_SETTING; type = nla_get_u32(info->attrs[idx]); if (!info->attrs[NL80211_ATTR_WIPHY_TX_POWER_LEVEL] && - (type != NL80211_TX_POWER_AUTOMATIC)) { - result = -EINVAL; - goto out; - } + (type != NL80211_TX_POWER_AUTOMATIC)) + return -EINVAL; if (type != NL80211_TX_POWER_AUTOMATIC) { idx = NL80211_ATTR_WIPHY_TX_POWER_LEVEL; mbm = nla_get_u32(info->attrs[idx]); } - result = rdev_set_tx_power(rdev, txp_wdev, type, mbm); + result = rdev_set_tx_power(rdev, txp_wdev, radio_id, type, mbm); if (result) - goto out; + return result; } if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] && @@ -3752,10 +3783,8 @@ if ((!rdev->wiphy.available_antennas_tx && !rdev->wiphy.available_antennas_rx) || - !rdev->ops->set_antenna) { - result = -EOPNOTSUPP; - goto out; - } + !rdev->ops->set_antenna) + return -EOPNOTSUPP; tx_ant = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX]); rx_ant = nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]); @@ -3763,17 +3792,15 @@ /* reject antenna configurations which don't match the * available antenna masks, except for the "all" mask */ if ((~tx_ant && (tx_ant & ~rdev->wiphy.available_antennas_tx)) || - (~rx_ant && (rx_ant & ~rdev->wiphy.available_antennas_rx))) { - result = -EINVAL; - goto out; - } + (~rx_ant && (rx_ant & ~rdev->wiphy.available_antennas_rx))) + return -EINVAL; tx_ant = tx_ant & rdev->wiphy.available_antennas_tx; rx_ant = rx_ant & rdev->wiphy.available_antennas_rx; result = rdev_set_antenna(rdev, tx_ant, rx_ant); if (result) - goto out; + return result; } changed = 0; @@ -3795,10 +3822,8 @@ if (info->attrs[NL80211_ATTR_WIPHY_FRAG_THRESHOLD]) { frag_threshold = nla_get_u32( info->attrs[NL80211_ATTR_WIPHY_FRAG_THRESHOLD]); - if (frag_threshold < 256) { - result = -EINVAL; - goto out; - } + if (frag_threshold < 256) + return -EINVAL; if (frag_threshold != (u32) -1) { /* @@ -3819,10 +3844,8 @@ } if (info->attrs[NL80211_ATTR_WIPHY_COVERAGE_CLASS]) { - if (info->attrs[NL80211_ATTR_WIPHY_DYN_ACK]) { - result = -EINVAL; - goto out; - } + if (info->attrs[NL80211_ATTR_WIPHY_DYN_ACK]) + return -EINVAL; coverage_class = nla_get_u8( info->attrs[NL80211_ATTR_WIPHY_COVERAGE_CLASS]); @@ -3830,20 +3853,17 @@ } if (info->attrs[NL80211_ATTR_WIPHY_DYN_ACK]) { - if (!(rdev->wiphy.features & NL80211_FEATURE_ACKTO_ESTIMATION)) { - result = -EOPNOTSUPP; - goto out; - } + if (!(rdev->wiphy.features & NL80211_FEATURE_ACKTO_ESTIMATION)) + return -EOPNOTSUPP; changed |= WIPHY_PARAM_DYN_ACK; } if (info->attrs[NL80211_ATTR_TXQ_LIMIT]) { if (!wiphy_ext_feature_isset(&rdev->wiphy, - NL80211_EXT_FEATURE_TXQS)) { - result = -EOPNOTSUPP; - goto out; - } + NL80211_EXT_FEATURE_TXQS)) + return -EOPNOTSUPP; + txq_limit = nla_get_u32( info->attrs[NL80211_ATTR_TXQ_LIMIT]); changed |= WIPHY_PARAM_TXQ_LIMIT; @@ -3851,10 +3871,9 @@ if (info->attrs[NL80211_ATTR_TXQ_MEMORY_LIMIT]) { if (!wiphy_ext_feature_isset(&rdev->wiphy, - NL80211_EXT_FEATURE_TXQS)) { - result = -EOPNOTSUPP; - goto out; - } + NL80211_EXT_FEATURE_TXQS)) + return -EOPNOTSUPP; + txq_memory_limit = nla_get_u32( info->attrs[NL80211_ATTR_TXQ_MEMORY_LIMIT]); changed |= WIPHY_PARAM_TXQ_MEMORY_LIMIT; @@ -3862,10 +3881,9 @@ if (info->attrs[NL80211_ATTR_TXQ_QUANTUM]) { if (!wiphy_ext_feature_isset(&rdev->wiphy, - NL80211_EXT_FEATURE_TXQS)) { - result = -EOPNOTSUPP; - goto out; - } + NL80211_EXT_FEATURE_TXQS)) + return -EOPNOTSUPP; + txq_quantum = nla_get_u32( info->attrs[NL80211_ATTR_TXQ_QUANTUM]); changed |= WIPHY_PARAM_TXQ_QUANTUM; @@ -3874,14 +3892,25 @@ if (changed) { u8 old_retry_short, old_retry_long; u32 old_frag_threshold, old_rts_threshold; - u8 old_coverage_class; + u8 old_coverage_class, i; u32 old_txq_limit, old_txq_memory_limit, old_txq_quantum; - if (!rdev->ops->set_wiphy_params) { - result = -EOPNOTSUPP; - goto out; - } + if (!rdev->ops->set_wiphy_params) + return -EOPNOTSUPP; + + if (radio_id < rdev->wiphy.n_radio) { + old_rts_threshold = + rdev->wiphy.radio_cfg[radio_id].rts_threshold; + + if (changed & WIPHY_PARAM_RTS_THRESHOLD) + rdev->wiphy.radio_cfg[radio_id].rts_threshold = + rts_threshold; + result = rdev_set_wiphy_params(rdev, radio_id, changed); + if (result) + rdev->wiphy.radio_cfg[radio_id].rts_threshold = + old_rts_threshold; + } else { old_retry_short = rdev->wiphy.retry_short; old_retry_long = rdev->wiphy.retry_long; old_frag_threshold = rdev->wiphy.frag_threshold; @@ -3908,7 +3937,7 @@ if (changed & WIPHY_PARAM_TXQ_QUANTUM) rdev->wiphy.txq_quantum = txq_quantum; - result = rdev_set_wiphy_params(rdev, changed); + result = rdev_set_wiphy_params(rdev, radio_id, changed); if (result) { rdev->wiphy.retry_short = old_retry_short; rdev->wiphy.retry_long = old_retry_long; @@ -3918,15 +3947,17 @@ rdev->wiphy.txq_limit = old_txq_limit; rdev->wiphy.txq_memory_limit = old_txq_memory_limit; rdev->wiphy.txq_quantum = old_txq_quantum; - goto out; - } + return result; } - result = 0; + for (i = 0 ; i < rdev->wiphy.n_radio; i++) { + rdev->wiphy.radio_cfg[i].rts_threshold = + rdev->wiphy.rts_threshold; + } + } + } -out: - wiphy_unlock(&rdev->wiphy); - return result; + return 0; } int nl80211_send_chandef(struct sk_buff *msg, const struct cfg80211_chan_def *chandef) @@ -4010,10 +4041,10 @@ goto nla_put_failure; } - if (rdev->ops->get_tx_power) { + if (rdev->ops->get_tx_power && !wdev->valid_links) { int dbm, ret; - ret = rdev_get_tx_power(rdev, wdev, &dbm); + ret = rdev_get_tx_power(rdev, wdev, 0, &dbm); if (ret == 0 && nla_put_u32(msg, NL80211_ATTR_WIPHY_TX_POWER_LEVEL, DBM_TO_MBM(dbm))) @@ -4082,6 +4113,15 @@ if (ret == 0 && nl80211_send_chandef(msg, &chandef)) goto nla_put_failure; + if (rdev->ops->get_tx_power) { + int dbm, ret; + + ret = rdev_get_tx_power(rdev, wdev, link_id, &dbm); + if (ret == 0 && + nla_put_u32(msg, NL80211_ATTR_WIPHY_TX_POWER_LEVEL, + DBM_TO_MBM(dbm))) + goto nla_put_failure; + } nla_nest_end(msg, link); } @@ -4144,22 +4184,22 @@ if_idx = 0; - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { if (if_idx < if_start) { if_idx++; continue; } + if (nl80211_send_iface(skb, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI, rdev, wdev, - NL80211_CMD_NEW_INTERFACE) < 0) { - wiphy_unlock(&rdev->wiphy); + NL80211_CMD_NEW_INTERFACE) < 0) goto out; - } + if_idx++; } - wiphy_unlock(&rdev->wiphy); if_start = 0; wp_idx++; @@ -4522,16 +4562,13 @@ static int nl80211_new_interface(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; - int ret; /* to avoid failing a new interface creation due to pending removal */ cfg80211_destroy_ifaces(rdev); - wiphy_lock(&rdev->wiphy); - ret = _nl80211_new_interface(skb, info); - wiphy_unlock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); - return ret; + return _nl80211_new_interface(skb, info); } static int nl80211_del_interface(struct sk_buff *skb, struct genl_info *info) @@ -5566,6 +5603,18 @@ } config->tx_wdev = tx_netdev->ieee80211_ptr; + + if (config->tx_wdev->valid_links) { + if (!tb[NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID]) + return -ENOLINK; + + config->tx_link_id = + nla_get_u8(tb[NL80211_MBSSID_CONFIG_ATTR_TX_LINK_ID]); + + if (!(config->tx_wdev->valid_links & + BIT(config->tx_link_id))) + return -ENOLINK; + } } else { config->tx_wdev = dev->ieee80211_ptr; } @@ -7354,6 +7403,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]; @@ -7466,6 +7543,12 @@ params.link_sta_params.he_6ghz_capa = nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]); + if (info->attrs[NL80211_ATTR_EML_CAPABILITY]) { + params.eml_cap_present = true; + params.eml_cap = + nla_get_u16(info->attrs[NL80211_ATTR_EML_CAPABILITY]); + } + if (info->attrs[NL80211_ATTR_AIRTIME_WEIGHT]) params.airtime_weight = nla_get_u16(info->attrs[NL80211_ATTR_AIRTIME_WEIGHT]); @@ -7486,6 +7569,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); @@ -7624,6 +7711,11 @@ } } + if (info->attrs[NL80211_ATTR_EML_CAPABILITY]) { + params.eml_cap_present = true; + params.eml_cap = nla_get_u16(info->attrs[NL80211_ATTR_EML_CAPABILITY]); + } + if (info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]) params.link_sta_params.he_6ghz_capa = nla_data(info->attrs[NL80211_ATTR_HE_6GHZ_CAPABILITY]); @@ -9325,6 +9417,32 @@ return 0; } +static bool radio_channel_allowed(struct wiphy *wiphy, + struct ieee80211_channel *chan, + u32 radio_mask) +{ + const struct wiphy_radio *radio; + struct cfg80211_chan_def chandef; + int i; + + if (!wiphy->n_radio || radio_mask == BIT(wiphy->n_radio) - 1) + return true; + + cfg80211_chandef_create(&chandef, chan, NL80211_CHAN_HT20); + for (i = 0; i < wiphy->n_radio; i++) { + if (!(radio_mask & BIT(i))) + continue; + + radio = &wiphy->radio[i]; + if (!cfg80211_radio_chandef_valid(radio, &chandef)) + continue; + + return true; + } + + return false; +} + static int nl80211_trigger_scan(struct sk_buff *skb, struct genl_info *info) { struct cfg80211_registered_device *rdev = info->user_ptr[0]; @@ -9337,6 +9455,7 @@ int err, tmp, n_ssids = 0, n_channels, i; size_t ie_len, size; size_t ssids_offset, ie_offset; + u32 radio_mask = 0; wiphy = &rdev->wiphy; @@ -9349,6 +9468,21 @@ if (rdev->scan_req || rdev->scan_msg) return -EBUSY; + if (info->attrs[NL80211_ATTR_VIF_RADIO_MASK]) { + u32 mask; + + mask = nla_get_u32(info->attrs[NL80211_ATTR_VIF_RADIO_MASK]); + + /* don't use any radio restricted by mask */ + if (wiphy->n_radio) { + if (mask & ~wdev->radio_mask) + return -EINVAL; + + mask &= wdev->radio_mask; + } + radio_mask = mask; + } + if (info->attrs[NL80211_ATTR_SCAN_FREQ_KHZ]) { if (!wiphy_ext_feature_isset(wiphy, NL80211_EXT_FEATURE_SCAN_FREQ_KHZ)) @@ -9418,6 +9552,12 @@ !cfg80211_wdev_channel_allowed(wdev, chan)) continue; + /* ignore channel not available to selected + * radios */ + if (radio_mask && + !radio_channel_allowed(wiphy, chan, radio_mask)) + continue; + request->channels[i] = chan; i++; } @@ -9439,6 +9579,13 @@ !cfg80211_wdev_channel_allowed(wdev, chan)) continue; + /* ignore channel not available to selected + * radio (if any) */ + if (radio_mask && + !radio_channel_allowed(wiphy, chan, + radio_mask)) + continue; + request->channels[i] = chan; i++; } @@ -10103,7 +10250,7 @@ struct cfg80211_chan_def chandef; enum nl80211_dfs_regions dfs_region; unsigned int cac_time_ms; - int err = -EINVAL; + int err; flush_delayed_work(&rdev->dfs_update_channels_wk); @@ -10118,35 +10265,29 @@ return -EINVAL; } - wiphy_lock(wiphy); + guard(wiphy)(wiphy); dfs_region = reg_get_dfs_region(wiphy); if (dfs_region == NL80211_DFS_UNSET) - goto unlock; + return -EINVAL; err = nl80211_parse_chandef(rdev, info, &chandef); if (err) - goto unlock; + return err; err = cfg80211_chandef_dfs_required(wiphy, &chandef, wdev->iftype); if (err < 0) - goto unlock; + return err; - if (err == 0) { - err = -EINVAL; - goto unlock; - } + if (err == 0) + return -EINVAL; - if (!cfg80211_chandef_dfs_usable(wiphy, &chandef)) { - err = -EINVAL; - goto unlock; - } + if (!cfg80211_chandef_dfs_usable(wiphy, &chandef)) + return -EINVAL; - if (nla_get_flag(info->attrs[NL80211_ATTR_RADAR_BACKGROUND])) { - err = cfg80211_start_background_radar_detection(rdev, wdev, + if (nla_get_flag(info->attrs[NL80211_ATTR_RADAR_BACKGROUND])) + return cfg80211_start_background_radar_detection(rdev, wdev, &chandef); - goto unlock; - } if (cfg80211_beaconing_iface_active(wdev)) { /* During MLO other link(s) can beacon, only the current link @@ -10156,26 +10297,19 @@ !wdev->links[link_id].ap.beacon_interval) { /* nothing */ } else { - err = -EBUSY; - goto unlock; + return -EBUSY; } } - if (wdev->links[link_id].cac_started) { - err = -EBUSY; - goto unlock; - } + if (wdev->links[link_id].cac_started) + return -EBUSY; /* CAC start is offloaded to HW and can't be started manually */ - if (wiphy_ext_feature_isset(wiphy, NL80211_EXT_FEATURE_DFS_OFFLOAD)) { - err = -EOPNOTSUPP; - goto unlock; - } + if (wiphy_ext_feature_isset(wiphy, NL80211_EXT_FEATURE_DFS_OFFLOAD)) + return -EOPNOTSUPP; - if (!rdev->ops->start_radar_detection) { - err = -EOPNOTSUPP; - goto unlock; - } + if (!rdev->ops->start_radar_detection) + return -EOPNOTSUPP; cac_time_ms = cfg80211_chandef_dfs_cac_time(&rdev->wiphy, &chandef); if (WARN_ON(!cac_time_ms)) @@ -10183,11 +10317,13 @@ err = rdev_start_radar_detection(rdev, dev, &chandef, cac_time_ms, link_id); - if (!err) { + if (err) + return err; + switch (wdev->iftype) { case NL80211_IFTYPE_AP: case NL80211_IFTYPE_P2P_GO: - wdev->links[0].ap.chandef = chandef; + wdev->links[link_id].ap.chandef = chandef; break; case NL80211_IFTYPE_ADHOC: wdev->u.ibss.chandef = chandef; @@ -10201,9 +10337,6 @@ wdev->links[link_id].cac_started = true; wdev->links[link_id].cac_start_time = jiffies; wdev->links[link_id].cac_time_ms = cac_time_ms; - } -unlock: - wiphy_unlock(wiphy); return err; } @@ -10902,6 +11035,13 @@ req.ie_len = nla_len(info->attrs[NL80211_ATTR_IE]); } + if (info->attrs[NL80211_ATTR_SUPPORTED_SELECTORS]) { + req.supported_selectors = + nla_data(info->attrs[NL80211_ATTR_SUPPORTED_SELECTORS]); + req.supported_selectors_len = + nla_len(info->attrs[NL80211_ATTR_SUPPORTED_SELECTORS]); + } + auth_type = nla_get_u32(info->attrs[NL80211_ATTR_AUTH_TYPE]); if (!nl80211_valid_auth_type(rdev, auth_type, NL80211_CMD_AUTHENTICATE)) return -EINVAL; @@ -11132,12 +11272,83 @@ return bss; } +static int nl80211_process_links(struct cfg80211_registered_device *rdev, + struct cfg80211_assoc_link *links, + const u8 *ssid, int ssid_len, + struct genl_info *info) +{ + unsigned int attrsize = NUM_NL80211_ATTR * sizeof(struct nlattr *); + struct nlattr **attrs __free(kfree) = kzalloc(attrsize, GFP_KERNEL); + struct nlattr *link; + unsigned int link_id; + int rem, err; + + if (!attrs) + return -ENOMEM; + + nla_for_each_nested(link, info->attrs[NL80211_ATTR_MLO_LINKS], rem) { + memset(attrs, 0, attrsize); + + nla_parse_nested(attrs, NL80211_ATTR_MAX, link, NULL, NULL); + + if (!attrs[NL80211_ATTR_MLO_LINK_ID]) { + NL_SET_BAD_ATTR(info->extack, link); + return -EINVAL; + } + + link_id = nla_get_u8(attrs[NL80211_ATTR_MLO_LINK_ID]); + /* cannot use the same link ID again */ + if (links[link_id].bss) { + NL_SET_BAD_ATTR(info->extack, link); + return -EINVAL; + } + links[link_id].bss = + nl80211_assoc_bss(rdev, ssid, ssid_len, attrs, + link_id, link_id); + if (IS_ERR(links[link_id].bss)) { + err = PTR_ERR(links[link_id].bss); + links[link_id].bss = NULL; + NL_SET_ERR_MSG_ATTR(info->extack, link, + "Error fetching BSS for link"); + return err; + } + + if (attrs[NL80211_ATTR_IE]) { + links[link_id].elems = nla_data(attrs[NL80211_ATTR_IE]); + links[link_id].elems_len = + nla_len(attrs[NL80211_ATTR_IE]); + + if (cfg80211_find_elem(WLAN_EID_FRAGMENT, + links[link_id].elems, + links[link_id].elems_len)) { + NL_SET_ERR_MSG_ATTR(info->extack, + attrs[NL80211_ATTR_IE], + "cannot deal with fragmentation"); + return -EINVAL; + } + + if (cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, + links[link_id].elems, + links[link_id].elems_len)) { + NL_SET_ERR_MSG_ATTR(info->extack, + attrs[NL80211_ATTR_IE], + "cannot deal with non-inheritance"); + return -EINVAL; + } + } + + links[link_id].disabled = + nla_get_flag(attrs[NL80211_ATTR_MLO_LINK_DISABLED]); + } + + return 0; +} + static int nl80211_associate(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 cfg80211_assoc_request req = {}; - struct nlattr **attrs = NULL; const u8 *ap_addr, *ssid; unsigned int link_id; int err, ssid_len; @@ -11184,6 +11395,13 @@ if (info->attrs[NL80211_ATTR_PREV_BSSID]) req.prev_bssid = nla_data(info->attrs[NL80211_ATTR_PREV_BSSID]); + if (info->attrs[NL80211_ATTR_SUPPORTED_SELECTORS]) { + req.supported_selectors = + nla_data(info->attrs[NL80211_ATTR_SUPPORTED_SELECTORS]); + req.supported_selectors_len = + nla_len(info->attrs[NL80211_ATTR_SUPPORTED_SELECTORS]); + } + if (nla_get_flag(info->attrs[NL80211_ATTR_DISABLE_HT])) req.flags |= ASSOC_REQ_DISABLE_HT; @@ -11269,10 +11487,6 @@ req.link_id = nl80211_link_id_or_invalid(info->attrs); if (info->attrs[NL80211_ATTR_MLO_LINKS]) { - unsigned int attrsize = NUM_NL80211_ATTR * sizeof(*attrs); - struct nlattr *link; - int rem = 0; - if (req.link_id < 0) return -EINVAL; @@ -11287,72 +11501,10 @@ req.ap_mld_addr = nla_data(info->attrs[NL80211_ATTR_MLD_ADDR]); ap_addr = req.ap_mld_addr; - attrs = kzalloc(attrsize, GFP_KERNEL); - if (!attrs) - return -ENOMEM; - - nla_for_each_nested(link, - info->attrs[NL80211_ATTR_MLO_LINKS], - rem) { - memset(attrs, 0, attrsize); - - nla_parse_nested(attrs, NL80211_ATTR_MAX, - link, NULL, NULL); - - if (!attrs[NL80211_ATTR_MLO_LINK_ID]) { - err = -EINVAL; - NL_SET_BAD_ATTR(info->extack, link); - goto free; - } - - link_id = nla_get_u8(attrs[NL80211_ATTR_MLO_LINK_ID]); - /* 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 = - nl80211_assoc_bss(rdev, ssid, ssid_len, attrs, - req.link_id, link_id); - 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; - } - - if (attrs[NL80211_ATTR_IE]) { - req.links[link_id].elems = - nla_data(attrs[NL80211_ATTR_IE]); - req.links[link_id].elems_len = - nla_len(attrs[NL80211_ATTR_IE]); - - if (cfg80211_find_elem(WLAN_EID_FRAGMENT, - req.links[link_id].elems, - req.links[link_id].elems_len)) { - NL_SET_ERR_MSG_ATTR(info->extack, - attrs[NL80211_ATTR_IE], - "cannot deal with fragmentation"); - err = -EINVAL; - goto free; - } - - if (cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, - req.links[link_id].elems, - req.links[link_id].elems_len)) { - NL_SET_ERR_MSG_ATTR(info->extack, - attrs[NL80211_ATTR_IE], - "cannot deal with non-inheritance"); - err = -EINVAL; + err = nl80211_process_links(rdev, req.links, ssid, ssid_len, + info); + if (err) goto free; - } - } - - req.links[link_id].disabled = - nla_get_flag(attrs[NL80211_ATTR_MLO_LINK_DISABLED]); - } if (!req.links[req.link_id].bss) { err = -EINVAL; @@ -11372,9 +11524,6 @@ err = -EINVAL; goto free; } - - kfree(attrs); - attrs = NULL; } else { if (req.link_id >= 0) return -EINVAL; @@ -11434,7 +11583,6 @@ for (link_id = 0; link_id < ARRAY_SIZE(req.links); link_id++) cfg80211_put_bss(&rdev->wiphy, req.links[link_id].bss); cfg80211_put_bss(&rdev->wiphy, req.bss); - kfree(attrs); return err; } @@ -16486,6 +16634,86 @@ return rdev_set_ttlm(rdev, dev, ¶ms); } +static int nl80211_assoc_ml_reconf(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; + struct cfg80211_assoc_link links[IEEE80211_MLD_MAX_NUM_LINKS] = {}; + unsigned int link_id; + u16 add_links, rem_links; + int err; + + if (!wdev->valid_links) + return -EINVAL; + + if (dev->ieee80211_ptr->conn_owner_nlportid && + dev->ieee80211_ptr->conn_owner_nlportid != info->snd_portid) + return -EPERM; + + if (dev->ieee80211_ptr->iftype != NL80211_IFTYPE_STATION && + dev->ieee80211_ptr->iftype != NL80211_IFTYPE_P2P_CLIENT) + return -EOPNOTSUPP; + + add_links = 0; + if (info->attrs[NL80211_ATTR_MLO_LINKS]) { + err = nl80211_process_links(rdev, links, NULL, 0, info); + if (err) + return err; + + for (link_id = 0; link_id < IEEE80211_MLD_MAX_NUM_LINKS; + link_id++) { + if (!links[link_id].bss) + continue; + add_links |= BIT(link_id); + } + } + + if (info->attrs[NL80211_ATTR_MLO_RECONF_REM_LINKS]) + rem_links = + nla_get_u16(info->attrs[NL80211_ATTR_MLO_RECONF_REM_LINKS]); + else + rem_links = 0; + + /* Validate that existing links are not added, removed links are valid + * and don't allow adding and removing the same links + */ + if ((add_links & rem_links) || !(add_links | rem_links) || + (wdev->valid_links & add_links) || + ((wdev->valid_links & rem_links) != rem_links)) { + err = -EINVAL; + goto out; + } + + err = cfg80211_assoc_ml_reconf(rdev, dev, links, rem_links); + +out: + for (link_id = 0; link_id < ARRAY_SIZE(links); link_id++) + cfg80211_put_bss(&rdev->wiphy, links[link_id].bss); + + return err; +} + +static int +nl80211_epcs_cfg(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; + bool val; + + if (wdev->iftype != NL80211_IFTYPE_STATION && + wdev->iftype != NL80211_IFTYPE_P2P_CLIENT) + return -EOPNOTSUPP; + + if (!wdev->connected) + return -ENOLINK; + + val = nla_get_flag(info->attrs[NL80211_ATTR_EPCS]); + + return rdev_set_epcs(rdev, dev, val); +} + #define NL80211_FLAG_NEED_WIPHY 0x01 #define NL80211_FLAG_NEED_NETDEV 0x02 #define NL80211_FLAG_NEED_RTNL 0x04 @@ -17678,6 +17906,18 @@ .flags = GENL_UNS_ADMIN_PERM, .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP), }, + { + .cmd = NL80211_CMD_ASSOC_MLO_RECONF, + .doit = nl80211_assoc_ml_reconf, + .flags = GENL_UNS_ADMIN_PERM, + .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP), + }, + { + .cmd = NL80211_CMD_EPCS_CFG, + .doit = nl80211_epcs_cfg, + .flags = GENL_UNS_ADMIN_PERM, + .internal_flags = IFLAGS(NL80211_FLAG_NEED_NETDEV_UP), + }, }; static struct genl_family nl80211_fam __ro_after_init = { @@ -18453,9 +18693,8 @@ nla_put(msg, NL80211_ATTR_MAC, ETH_ALEN, peer_addr)) goto nla_put_failure; - if ((td_bitmap_len > 0) && td_bitmap) - if (nla_put(msg, NL80211_ATTR_TD_BITMAP, - td_bitmap_len, td_bitmap)) + if (td_bitmap_len > 0 && td_bitmap && + nla_put(msg, NL80211_ATTR_TD_BITMAP, td_bitmap_len, td_bitmap)) goto nla_put_failure; genlmsg_end(msg, hdr); @@ -18574,6 +18813,23 @@ } EXPORT_SYMBOL(cfg80211_links_removed); +void nl80211_mlo_reconf_add_done(struct net_device *dev, + struct cfg80211_mlo_reconf_done_data *data) +{ + struct wireless_dev *wdev = dev->ieee80211_ptr; + struct wiphy *wiphy = wdev->wiphy; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + struct nl80211_mlme_event event = { + .cmd = NL80211_CMD_ASSOC_MLO_RECONF, + .buf = data->buf, + .buf_len = data->len, + .uapsd_queues = -1, + }; + + nl80211_send_mlme_event(rdev, dev, &event, GFP_KERNEL); +} +EXPORT_SYMBOL(nl80211_mlo_reconf_add_done); + void nl80211_send_ibss_bssid(struct cfg80211_registered_device *rdev, struct net_device *netdev, const u8 *bssid, gfp_t gfp) @@ -20406,6 +20662,39 @@ } EXPORT_SYMBOL(cfg80211_schedule_channels_check); +void cfg80211_epcs_changed(struct net_device *netdev, bool enabled) +{ + struct wireless_dev *wdev = netdev->ieee80211_ptr; + struct wiphy *wiphy = wdev->wiphy; + struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); + struct sk_buff *msg; + void *hdr; + + trace_cfg80211_epcs_changed(wdev, enabled); + + msg = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); + if (!msg) + return; + + hdr = nl80211hdr_put(msg, 0, 0, 0, NL80211_CMD_EPCS_CFG); + if (!hdr) { + nlmsg_free(msg); + return; + } + + if (enabled && nla_put_flag(msg, NL80211_ATTR_EPCS)) + goto nla_put_failure; + + 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_epcs_changed); + /* initialisation/exit functions */ int __init nl80211_init(void) diff -ruw linux-6.13.12/net/wireless/nl80211.h linux-6.13.12-fbx/net/wireless/nl80211.h --- linux-6.13.12/net/wireless/nl80211.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/nl80211.h 2025-07-01 14:10:45.856130125 +0200 @@ -124,4 +124,7 @@ /* peer measurement */ int nl80211_pmsr_start(struct sk_buff *skb, struct genl_info *info); +void nl80211_mlo_reconf_add_done(struct net_device *dev, + struct cfg80211_mlo_reconf_done_data *data); + #endif /* __NET_WIRELESS_NL80211_H */ diff -ruw linux-6.13.12/net/wireless/pmsr.c linux-6.13.12-fbx/net/wireless/pmsr.c --- linux-6.13.12/net/wireless/pmsr.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/pmsr.c 2025-07-01 14:10:45.856130125 +0200 @@ -630,9 +630,9 @@ struct wireless_dev *wdev = container_of(work, struct wireless_dev, pmsr_free_wk); - wiphy_lock(wdev->wiphy); + guard(wiphy)(wdev->wiphy); + cfg80211_pmsr_process_abort(wdev); - wiphy_unlock(wdev->wiphy); } void cfg80211_pmsr_wdev_down(struct wireless_dev *wdev) diff -ruw linux-6.13.12/net/wireless/rdev-ops.h linux-6.13.12-fbx/net/wireless/rdev-ops.h --- linux-6.13.12/net/wireless/rdev-ops.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/rdev-ops.h 2025-09-25 17:40:37.959379088 +0200 @@ -577,34 +577,35 @@ } static inline int -rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u32 changed) +rdev_set_wiphy_params(struct cfg80211_registered_device *rdev, u8 radio_id, u32 changed) { int ret = -EOPNOTSUPP; - trace_rdev_set_wiphy_params(&rdev->wiphy, changed); + trace_rdev_set_wiphy_params(&rdev->wiphy, radio_id, changed); if (rdev->ops->set_wiphy_params) - ret = rdev->ops->set_wiphy_params(&rdev->wiphy, changed); + ret = rdev->ops->set_wiphy_params(&rdev->wiphy, radio_id, changed); trace_rdev_return_int(&rdev->wiphy, ret); return ret; } static inline int rdev_set_tx_power(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev, + struct wireless_dev *wdev, u8 radio_id, enum nl80211_tx_power_setting type, int mbm) { int ret; - trace_rdev_set_tx_power(&rdev->wiphy, wdev, type, mbm); - ret = rdev->ops->set_tx_power(&rdev->wiphy, wdev, type, mbm); + trace_rdev_set_tx_power(&rdev->wiphy, wdev, radio_id, type, mbm); + ret = rdev->ops->set_tx_power(&rdev->wiphy, wdev, radio_id, type, mbm); trace_rdev_return_int(&rdev->wiphy, ret); return ret; } static inline int rdev_get_tx_power(struct cfg80211_registered_device *rdev, - struct wireless_dev *wdev, int *dbm) + struct wireless_dev *wdev, unsigned int link_id, + int *dbm) { int ret; - trace_rdev_get_tx_power(&rdev->wiphy, wdev); - ret = rdev->ops->get_tx_power(&rdev->wiphy, wdev, dbm); + trace_rdev_get_tx_power(&rdev->wiphy, wdev, link_id); + ret = rdev->ops->get_tx_power(&rdev->wiphy, wdev, link_id, dbm); trace_rdev_return_int_int(&rdev->wiphy, ret, *dbm); return ret; } @@ -1546,4 +1547,38 @@ return rdev->ops->get_radio_mask(wiphy, dev); } + +static inline int +rdev_assoc_ml_reconf(struct cfg80211_registered_device *rdev, + struct net_device *dev, + struct cfg80211_assoc_link *add_links, + u16 rem_links) +{ + struct wiphy *wiphy = &rdev->wiphy; + int ret = -EOPNOTSUPP; + + trace_rdev_assoc_ml_reconf(wiphy, dev, add_links, rem_links); + if (rdev->ops->assoc_ml_reconf) + ret = rdev->ops->assoc_ml_reconf(wiphy, dev, add_links, + rem_links); + trace_rdev_return_int(wiphy, ret); + + return ret; +} + +static inline int +rdev_set_epcs(struct cfg80211_registered_device *rdev, + struct net_device *dev, bool val) +{ + struct wiphy *wiphy = &rdev->wiphy; + int ret = -EOPNOTSUPP; + + trace_rdev_set_epcs(wiphy, dev, val); + if (rdev->ops->set_epcs) + ret = rdev->ops->set_epcs(wiphy, dev, val); + trace_rdev_return_int(wiphy, ret); + + return ret; +} + #endif /* __CFG80211_RDEV_OPS */ diff -ruw linux-6.13.12/net/wireless/reg.c linux-6.13.12-fbx/net/wireless/reg.c --- linux-6.13.12/net/wireless/reg.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/reg.c 2025-09-25 17:40:37.959379088 +0200 @@ -1771,6 +1771,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, @@ -1805,6 +1839,9 @@ 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; } @@ -1817,6 +1854,7 @@ 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); @@ -1828,9 +1866,14 @@ 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; @@ -1915,6 +1958,7 @@ 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 | @@ -2466,11 +2510,11 @@ struct wireless_dev *wdev; struct cfg80211_registered_device *rdev = wiphy_to_rdev(wiphy); - wiphy_lock(wiphy); + guard(wiphy)(wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) if (!reg_wdev_chan_valid(wiphy, wdev)) cfg80211_leave(rdev, wdev); - wiphy_unlock(wiphy); } static void reg_check_chans_work(struct work_struct *work) @@ -2576,6 +2620,7 @@ chan->dfs_state_entered = jiffies; chan->dfs_state = NL80211_DFS_USABLE; + restore_channel_dfs_cached_state(wiphy, chan); chan->beacon_found = false; @@ -2650,13 +2695,11 @@ return; rtnl_lock(); - wiphy_lock(wiphy); - + scoped_guard(wiphy, wiphy) { tmp = get_wiphy_regdom(wiphy); rcu_assign_pointer(wiphy->regd, new_regd); rcu_free_regdom(tmp); - - wiphy_unlock(wiphy); + } rtnl_unlock(); } EXPORT_SYMBOL(wiphy_apply_custom_regulatory); @@ -2826,9 +2869,9 @@ tmp = get_wiphy_regdom(wiphy); ASSERT_RTNL(); - wiphy_lock(wiphy); + scoped_guard(wiphy, wiphy) { rcu_assign_pointer(wiphy->regd, regd); - wiphy_unlock(wiphy); + } rcu_free_regdom(tmp); } @@ -3206,9 +3249,9 @@ ASSERT_RTNL(); for_each_rdev(rdev) { - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + reg_process_self_managed_hint(&rdev->wiphy); - wiphy_unlock(&rdev->wiphy); } reg_check_channels(); @@ -3601,15 +3644,13 @@ struct wireless_dev *wdev; for_each_rdev(rdev) { - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { - if (!(wdev->wiphy->regulatory_flags & flag)) { - wiphy_unlock(&rdev->wiphy); + if (!(wdev->wiphy->regulatory_flags & flag)) return false; } } - wiphy_unlock(&rdev->wiphy); - } return true; } @@ -3884,19 +3925,18 @@ if (!driver_request->intersect) { ASSERT_RTNL(); - wiphy_lock(request_wiphy); + scoped_guard(wiphy, request_wiphy) { if (request_wiphy->regd) tmp = get_wiphy_regdom(request_wiphy); regd = reg_copy_regd(rd); - if (IS_ERR(regd)) { - wiphy_unlock(request_wiphy); + if (IS_ERR(regd)) return PTR_ERR(regd); - } rcu_assign_pointer(request_wiphy->regd, regd); rcu_free_regdom(tmp); - wiphy_unlock(request_wiphy); + } + reset_regdomains(false, rd); return 0; } diff -ruw linux-6.13.12/net/wireless/scan.c linux-6.13.12-fbx/net/wireless/scan.c --- linux-6.13.12/net/wireless/scan.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/scan.c 2025-09-25 17:40:37.963379107 +0200 @@ -272,12 +272,19 @@ { const struct element *non_inherit_elem, *parent, *sub; u8 *pos = new_ie; - u8 id, ext_id; + const u8 *mbssid_index_ie; + u8 id, ext_id, bssid_index = 255; unsigned int match_len; non_inherit_elem = cfg80211_find_ext_elem(WLAN_EID_EXT_NON_INHERITANCE, subie, subie_len); + mbssid_index_ie = cfg80211_find_ie(WLAN_EID_MULTI_BSSID_IDX, subie, + subie_len); + if (mbssid_index_ie && mbssid_index_ie[1] > 0 && + mbssid_index_ie[2] > 0 && mbssid_index_ie[2] <= 46) + bssid_index = mbssid_index_ie[2]; + /* 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 @@ -316,6 +323,24 @@ continue; } + /* For ML probe response, match the MLE in the frame body with + * MLD id being 'bssid_index' + */ + if (parent->id == WLAN_EID_EXTENSION && parent->datalen > 1 && + parent->data[0] == WLAN_EID_EXT_EHT_MULTI_LINK && + bssid_index == ieee80211_mle_get_mld_id(parent->data + 1)) { + if (!cfg80211_copy_elem_with_frags(parent, + ie, ielen, + &pos, new_ie, + new_ie_len)) + return 0; + + /* Continue here to prevent processing the MLE in + * sub-element, which AP MLD should not carry + */ + continue; + } + /* 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)) @@ -704,7 +729,7 @@ bss_params))) return RNR_ITER_CONTINUE; - entry = kzalloc(sizeof(*entry) + IEEE80211_MAX_SSID_LEN, GFP_ATOMIC); + entry = kzalloc(sizeof(*entry), GFP_ATOMIC); if (!entry) return RNR_ITER_ERROR; @@ -713,6 +738,17 @@ if (!cfg80211_parse_ap_info(entry, tbtt_info, tbtt_info_len, data->ssid_elem, data->s_ssid_tmp)) { + struct cfg80211_colocated_ap *tmp; + + /* Don't add duplicate BSSIDs on the same channel. */ + list_for_each_entry(tmp, &data->ap_list, list) { + if (ether_addr_equal(tmp->bssid, entry->bssid) && + tmp->center_freq == entry->center_freq) { + kfree(entry); + return RNR_ITER_CONTINUE; + } + } + data->n_coloc++; list_add_tail(&entry->list, &data->ap_list); } else { @@ -1235,7 +1271,8 @@ rdev = container_of(work, struct cfg80211_registered_device, sched_scan_res_wk); - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + list_for_each_entry_safe(req, tmp, &rdev->sched_scan_req_list, list) { if (req->report_results) { req->report_results = false; @@ -1250,7 +1287,6 @@ NL80211_CMD_SCHED_SCAN_RESULTS); } } - wiphy_unlock(&rdev->wiphy); } void cfg80211_sched_scan_results(struct wiphy *wiphy, u64 reqid) @@ -1285,9 +1321,9 @@ void cfg80211_sched_scan_stopped(struct wiphy *wiphy, u64 reqid) { - wiphy_lock(wiphy); + guard(wiphy)(wiphy); + cfg80211_sched_scan_stopped_locked(wiphy, reqid); - wiphy_unlock(wiphy); } EXPORT_SYMBOL(cfg80211_sched_scan_stopped); @@ -1913,6 +1949,165 @@ 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. */ static struct cfg80211_internal_bss * __cfg80211_bss_update(struct cfg80211_registered_device *rdev, @@ -1935,6 +2130,10 @@ if (found) { if (!cfg80211_update_known_bss(rdev, found, tmp, signal_valid)) 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; @@ -1997,6 +2196,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); + cfg80211_insert_bss(rdev, new); found = new; } @@ -3562,10 +3765,8 @@ /* translate "Scan for SSID" request */ if (wreq) { if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { - if (wreq->essid_len > IEEE80211_MAX_SSID_LEN) { - err = -EINVAL; - goto out; - } + if (wreq->essid_len > IEEE80211_MAX_SSID_LEN) + return -EINVAL; memcpy(creq->ssids[0].ssid, wreq->essid, wreq->essid_len); creq->ssids[0].ssid_len = wreq->essid_len; } @@ -3581,8 +3782,7 @@ eth_broadcast_addr(creq->bssid); - wiphy_lock(&rdev->wiphy); - + scoped_guard(wiphy, &rdev->wiphy) { rdev->scan_req = creq; err = rdev_scan(rdev, creq); if (err) { @@ -3594,7 +3794,8 @@ creq = NULL; dev_hold(dev); } - wiphy_unlock(&rdev->wiphy); + } + out: kfree(creq); return err; diff -ruw linux-6.13.12/net/wireless/sme.c linux-6.13.12-fbx/net/wireless/sme.c --- linux-6.13.12/net/wireless/sme.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/sme.c 2025-09-25 17:40:37.963379107 +0200 @@ -252,7 +252,7 @@ u8 bssid_buf[ETH_ALEN], *bssid = NULL; enum nl80211_timeout_reason treason; - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { if (!wdev->netdev) @@ -280,8 +280,6 @@ __cfg80211_connect_result(wdev->netdev, &cr, false); } } - - wiphy_unlock(&rdev->wiphy); } static void cfg80211_step_auth_next(struct cfg80211_conn *conn, @@ -693,13 +691,13 @@ * as chan dfs state, etc. */ for_each_rdev(rdev) { - wiphy_lock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); + list_for_each_entry(wdev, &rdev->wiphy.wdev_list, list) { if (wdev->conn || wdev->connected || cfg80211_beaconing_iface_active(wdev)) is_all_idle = false; } - wiphy_unlock(&rdev->wiphy); } return is_all_idle; @@ -1583,7 +1581,7 @@ container_of(work, struct wireless_dev, disconnect_wk); struct cfg80211_registered_device *rdev = wiphy_to_rdev(wdev->wiphy); - wiphy_lock(wdev->wiphy); + guard(wiphy)(wdev->wiphy); if (wdev->conn_owner_nlportid) { switch (wdev->iftype) { @@ -1619,6 +1617,4 @@ break; } } - - wiphy_unlock(wdev->wiphy); } diff -ruw linux-6.13.12/net/wireless/sysfs.c linux-6.13.12-fbx/net/wireless/sysfs.c --- linux-6.13.12/net/wireless/sysfs.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/sysfs.c 2025-09-25 17:40:37.963379107 +0200 @@ -36,6 +36,8 @@ 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); +SHOW_FMT(n_radio_dev, "%d", wiphy.n_radio_dev); static ssize_t name_show(struct device *dev, struct device_attribute *attr, @@ -70,6 +72,8 @@ &dev_attr_macaddress.attr, &dev_attr_address_mask.attr, &dev_attr_addresses.attr, + &dev_attr_dev_port.attr, + &dev_attr_n_radio_dev.attr, &dev_attr_name.attr, NULL, }; diff -ruw linux-6.13.12/net/wireless/sysfs.h linux-6.13.12-fbx/net/wireless/sysfs.h --- linux-6.13.12/net/wireless/sysfs.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/sysfs.h 2025-09-25 17:40:37.963379107 +0200 @@ -7,4 +7,9 @@ extern struct class ieee80211_class; +int wiphy_sysfs_radio_init(void); +void wiphy_sysfs_radio_exit(void); + +extern struct class ieee80211_radio_class; + #endif /* __WIRELESS_SYSFS_H */ diff -ruw linux-6.13.12/net/wireless/trace.h linux-6.13.12-fbx/net/wireless/trace.h --- linux-6.13.12/net/wireless/trace.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/trace.h 2025-09-25 17:40:37.963379107 +0200 @@ -1676,10 +1676,11 @@ ); TRACE_EVENT(rdev_set_wiphy_params, - TP_PROTO(struct wiphy *wiphy, u32 changed), - TP_ARGS(wiphy, changed), + TP_PROTO(struct wiphy *wiphy, u8 radio_id, u32 changed), + TP_ARGS(wiphy, radio_id, changed), TP_STRUCT__entry( WIPHY_ENTRY + __field(u8, radio_id) __field(u32, changed) ), TP_fast_assign( @@ -1690,29 +1691,51 @@ WIPHY_PR_ARG, __entry->changed) ); -DEFINE_EVENT(wiphy_wdev_evt, rdev_get_tx_power, - TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev), - TP_ARGS(wiphy, wdev) +DECLARE_EVENT_CLASS(wiphy_wdev_link_evt, + TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, + unsigned int link_id), + TP_ARGS(wiphy, wdev, link_id), + TP_STRUCT__entry( + WIPHY_ENTRY + WDEV_ENTRY + __field(unsigned int, link_id) + ), + TP_fast_assign( + WIPHY_ASSIGN; + WDEV_ASSIGN; + __entry->link_id = link_id; + ), + TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", link_id: %u", + WIPHY_PR_ARG, WDEV_PR_ARG, __entry->link_id) ); -TRACE_EVENT(rdev_set_tx_power, +DEFINE_EVENT(wiphy_wdev_link_evt, rdev_get_tx_power, TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, + unsigned int link_id), + TP_ARGS(wiphy, wdev, link_id) +); + +TRACE_EVENT(rdev_set_tx_power, + TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, u8 radio_id, enum nl80211_tx_power_setting type, int mbm), - TP_ARGS(wiphy, wdev, type, mbm), + TP_ARGS(wiphy, wdev, radio_id, type, mbm), TP_STRUCT__entry( WIPHY_ENTRY WDEV_ENTRY + __field(u8, radio_id) __field(enum nl80211_tx_power_setting, type) __field(int, mbm) ), TP_fast_assign( WIPHY_ASSIGN; WDEV_ASSIGN; + __entry->radio_id = radio_id; __entry->type = type; __entry->mbm = mbm; ), - TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", type: %u, mbm: %d", - WIPHY_PR_ARG, WDEV_PR_ARG,__entry->type, __entry->mbm) + TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", radio_id: %u, type: %u, mbm: %d", + WIPHY_PR_ARG, WDEV_PR_ARG, __entry->radio_id, __entry->type, + __entry->mbm) ); TRACE_EVENT(rdev_return_int_int, @@ -2192,25 +2215,6 @@ TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", noack_map: %u", WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->noack_map) ); - -DECLARE_EVENT_CLASS(wiphy_wdev_link_evt, - TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, - unsigned int link_id), - TP_ARGS(wiphy, wdev, link_id), - TP_STRUCT__entry( - WIPHY_ENTRY - WDEV_ENTRY - __field(unsigned int, link_id) - ), - TP_fast_assign( - WIPHY_ASSIGN; - WDEV_ASSIGN; - __entry->link_id = link_id; - ), - TP_printk(WIPHY_PR_FMT ", " WDEV_PR_FMT ", link_id: %u", - WIPHY_PR_ARG, WDEV_PR_ARG, __entry->link_id) -); - DEFINE_EVENT(wiphy_wdev_link_evt, rdev_get_channel, TP_PROTO(struct wiphy *wiphy, struct wireless_dev *wdev, unsigned int link_id), @@ -3049,6 +3053,24 @@ WIPHY_PR_ARG, NETDEV_PR_ARG) ); +TRACE_EVENT(rdev_set_epcs, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, + bool val), + TP_ARGS(wiphy, netdev, val), + TP_STRUCT__entry( + WIPHY_ENTRY + NETDEV_ENTRY + __field(bool, val) + ), + TP_fast_assign( + WIPHY_ASSIGN; + NETDEV_ASSIGN; + __entry->val = val; + ), + TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", config=%u", + WIPHY_PR_ARG, NETDEV_PR_ARG, __entry->val) +); + /************************************************************* * cfg80211 exported functions traces * *************************************************************/ @@ -4104,6 +4126,66 @@ __entry->link_mask) ); +TRACE_EVENT(cfg80211_mlo_reconf_add_done, + TP_PROTO(struct net_device *netdev, u16 link_mask, + const u8 *buf, size_t len), + TP_ARGS(netdev, link_mask, buf, len), + TP_STRUCT__entry( + NETDEV_ENTRY + __field(u16, link_mask) + __dynamic_array(u8, buf, len) + ), + TP_fast_assign( + NETDEV_ASSIGN; + __entry->link_mask = link_mask; + memcpy(__get_dynamic_array(buf), buf, len); + ), + TP_printk(NETDEV_PR_FMT ", link_mask:0x%x", + NETDEV_PR_ARG, __entry->link_mask) +); + +TRACE_EVENT(rdev_assoc_ml_reconf, + TP_PROTO(struct wiphy *wiphy, struct net_device *netdev, + struct cfg80211_assoc_link *add_links, + u16 rem_links), + TP_ARGS(wiphy, netdev, add_links, rem_links), + TP_STRUCT__entry( + WIPHY_ENTRY + NETDEV_ENTRY + __field(u16, add_links) + __field(u16, rem_links) + ), + TP_fast_assign( + WIPHY_ASSIGN; + NETDEV_ASSIGN; + u32 i; + + __entry->add_links = 0; + __entry->rem_links = rem_links; + for (i = 0; add_links && i < IEEE80211_MLD_MAX_NUM_LINKS; i++) + if (add_links[i].bss) + __entry->add_links |= BIT(i); + ), + TP_printk(WIPHY_PR_FMT ", " NETDEV_PR_FMT ", add_links=0x%x, rem_links=0x%x", + WIPHY_PR_ARG, NETDEV_PR_ARG, + __entry->add_links, __entry->rem_links) +); + +TRACE_EVENT(cfg80211_epcs_changed, + TP_PROTO(struct wireless_dev *wdev, bool enabled), + TP_ARGS(wdev, enabled), + TP_STRUCT__entry( + WDEV_ENTRY + __field(u32, enabled) + ), + TP_fast_assign( + WDEV_ASSIGN; + __entry->enabled = enabled; + ), + TP_printk(WDEV_PR_FMT ", enabled=%u", + WDEV_PR_ARG, __entry->enabled) +); + #endif /* !__RDEV_OPS_TRACE || TRACE_HEADER_MULTI_READ */ #undef TRACE_INCLUDE_PATH diff -ruw linux-6.13.12/net/wireless/util.c linux-6.13.12-fbx/net/wireless/util.c --- linux-6.13.12/net/wireless/util.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/net/wireless/util.c 2025-09-25 17:40:37.963379107 +0200 @@ -2516,6 +2516,30 @@ } EXPORT_SYMBOL(cfg80211_check_combinations); +int cfg80211_get_radio_idx_by_chan(struct wiphy *wiphy, + const struct ieee80211_channel *chan) +{ + const struct wiphy_radio *radio; + int i, j; + u32 freq; + + if (!chan) + return -EINVAL; + + freq = MHZ_TO_KHZ(chan->center_freq); + for (i = 0; i < wiphy->n_radio; i++) { + radio = &wiphy->radio[i]; + for (j = 0; j < radio->n_freq_range; j++) { + if (freq >= radio->freq_range[j].start_freq && + freq <= radio->freq_range[j].end_freq) + return i; + } + } + + return -ENOENT; +} +EXPORT_SYMBOL(cfg80211_get_radio_idx_by_chan); + int ieee80211_get_ratemask(struct ieee80211_supported_band *sband, const u8 *rates, unsigned int n_rates, u32 *mask) @@ -2572,7 +2596,6 @@ { struct cfg80211_registered_device *rdev; struct wireless_dev *wdev; - int ret; wdev = dev->ieee80211_ptr; if (!wdev) @@ -2584,11 +2607,9 @@ memset(sinfo, 0, sizeof(*sinfo)); - wiphy_lock(&rdev->wiphy); - ret = rdev_get_station(rdev, dev, mac_addr, sinfo); - wiphy_unlock(&rdev->wiphy); + guard(wiphy)(&rdev->wiphy); - return ret; + return rdev_get_station(rdev, dev, mac_addr, sinfo); } EXPORT_SYMBOL(cfg80211_get_station); diff -ruw linux-6.13.12/scripts/Makefile.dtbs linux-6.13.12-fbx/scripts/Makefile.dtbs --- linux-6.13.12/scripts/Makefile.dtbs 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/Makefile.dtbs 2025-09-25 17:40:37.991379246 +0200 @@ -34,7 +34,7 @@ # Assembly file to wrap dtb(o) # --------------------------------------------------------------------------- -builtin-dtb-section = $(if $(filter arch/$(SRCARCH)/boot/dts%, $(obj)),.dtb.init.rodata,.rodata) +builtin-dtb-section = .dtb.rodata # Generate an assembly file to wrap the output of the device tree compiler quiet_cmd_wrap_S_dtb = WRAP $@ diff -ruw linux-6.13.12/scripts/Makefile.modpost linux-6.13.12-fbx/scripts/Makefile.modpost --- linux-6.13.12/scripts/Makefile.modpost 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/Makefile.modpost 2025-09-25 17:40:37.995379266 +0200 @@ -97,6 +97,7 @@ ksym-wl := $(if $(filter-out /%, $(ksym-wl)),$(if $(wildcard $(ksym-wl)),,$(srctree)/))$(ksym-wl) modpost-args += -t $(addprefix -u , $(ksym-wl)) modpost-deps += $(ksym-wl) +modpost-args += $(addprefix -U , $(CONFIG_UNUSED_KSYMS_WHITELIST_SYMS)) endif ifeq ($(wildcard vmlinux.o),) diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/arm64/Makefile linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/Makefile --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/Makefile 2025-09-25 17:40:30.187340548 +0200 @@ -12,6 +12,7 @@ subdir-y += bitmain subdir-y += broadcom subdir-y += cavium +subdir-y += cortina-access subdir-y += exynos subdir-y += freescale subdir-y += hisilicon diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/arm64/amlogic/Makefile linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/amlogic/Makefile --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/amlogic/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/amlogic/Makefile 2025-09-25 17:40:30.195340588 +0200 @@ -10,6 +10,12 @@ 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 += -@ +fbx-boards += \ + fbxwmr.dtb \ + fbxwmr-r1.dtb fbxwmr-r2.dtb \ + fbxwmr-r3.dtb fbxwmr-r4.dtb +dtb-$(CONFIG_ARCH_MESON) += $(fbx-boards) dtb-$(CONFIG_ARCH_MESON) += meson-axg-s400.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-fbx8am-brcm.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12a-fbx8am-realtek.dtb diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/arm64/broadcom/Makefile linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/broadcom/Makefile --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/broadcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/broadcom/Makefile 2025-09-25 17:40:30.215340687 +0200 @@ -16,3 +16,4 @@ subdir-y += bcmbca subdir-y += northstar2 subdir-y += stingray +subdir-y += bcm63xx diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/arm64/marvell/Makefile linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/marvell/Makefile --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/marvell/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/marvell/Makefile 2025-09-25 17:40:30.259340905 +0200 @@ -28,7 +28,19 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb dtb-$(CONFIG_ARCH_MVEBU) += ac5x-rd-carrier-cn9131.dtb dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-base.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9130-cf-pro.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9131-cf-solidwan.dtb -dtb-$(CONFIG_ARCH_MVEBU) += cn9132-clearfog.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.13.12/scripts/dtc/include-prefixes/arm64/marvell/armada-ap80x.dtsi linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/marvell/armada-ap80x.dtsi --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/marvell/armada-ap80x.dtsi 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/marvell/armada-ap80x.dtsi 2025-09-25 17:40:30.267340945 +0200 @@ -291,6 +291,11 @@ }; }; + ap_hwmon: ap806-hwmon@6f8084 { + compatible = "marvell,ap806-hwmon"; + reg = <0x6f8084 0xc>; + }; + ap_syscon1: system-controller@6f8000 { compatible = "syscon", "simple-mfd"; reg = <0x6f8000 0x1000>; diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/arm64/marvell/armada-cp11x.dtsi linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/marvell/armada-cp11x.dtsi --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/marvell/armada-cp11x.dtsi 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/marvell/armada-cp11x.dtsi 2025-09-25 17:40:30.271340965 +0200 @@ -58,8 +58,6 @@ ranges = <0x0 0x0 ADDRESSIFY(CP11X_BASE) 0x2000000>; CP11X_LABEL(ethernet): ethernet@0 { - #address-cells = <1>; - #size-cells = <0>; compatible = "marvell,armada-7k-pp22"; reg = <0x0 0x100000>, <0x129000 0xb000>, <0x220000 0x800>; clocks = <&CP11X_LABEL(clk) 1 3>, <&CP11X_LABEL(clk) 1 9>, @@ -71,7 +69,7 @@ status = "disabled"; dma-coherent; - CP11X_LABEL(eth0): ethernet-port@0 { + CP11X_LABEL(eth0): eth0 { interrupts = <39 IRQ_TYPE_LEVEL_HIGH>, <43 IRQ_TYPE_LEVEL_HIGH>, <47 IRQ_TYPE_LEVEL_HIGH>, @@ -85,13 +83,12 @@ interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - reg = <0>; - port-id = <0>; /* For backward compatibility. */ + port-id = <0>; gop-port-id = <0>; status = "disabled"; }; - CP11X_LABEL(eth1): ethernet-port@1 { + CP11X_LABEL(eth1): eth1 { interrupts = <40 IRQ_TYPE_LEVEL_HIGH>, <44 IRQ_TYPE_LEVEL_HIGH>, <48 IRQ_TYPE_LEVEL_HIGH>, @@ -105,13 +102,12 @@ interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - reg = <1>; - port-id = <1>; /* For backward compatibility. */ + port-id = <1>; gop-port-id = <2>; status = "disabled"; }; - CP11X_LABEL(eth2): ethernet-port@2 { + CP11X_LABEL(eth2): eth2 { interrupts = <41 IRQ_TYPE_LEVEL_HIGH>, <45 IRQ_TYPE_LEVEL_HIGH>, <49 IRQ_TYPE_LEVEL_HIGH>, @@ -125,8 +121,7 @@ interrupt-names = "hif0", "hif1", "hif2", "hif3", "hif4", "hif5", "hif6", "hif7", "hif8", "link"; - reg = <2>; - port-id = <2>; /* For backward compatibility. */ + port-id = <2>; gop-port-id = <3>; status = "disabled"; }; @@ -137,10 +132,13 @@ reg = <0x120000 0x6000>; marvell,system-controller = <&CP11X_LABEL(syscon0)>; clocks = <&CP11X_LABEL(clk) 1 5>, <&CP11X_LABEL(clk) 1 6>, - <&CP11X_LABEL(clk) 1 18>; - clock-names = "mg_clk", "mg_core_clk", "axi_clk"; + <&CP11X_LABEL(clk) 1 18>, <&CP11X_LABEL(clk) 1 9>; + clock-names = "mg_clk", "mg_core_clk", "axi_clk", "gop_clk"; #address-cells = <1>; #size-cells = <0>; + marvell,cp_mgmt = <&CP11X_LABEL(syscon1)>; + /* always use Master CP S@R */ + marvell,sar = <&cp0_syscon1>; CP11X_LABEL(comphy0): phy@0 { reg = <0>; @@ -354,6 +352,14 @@ }; }; + CP11X_LABEL(utmi_fbx): utmi@580000-fbx { + compatible = "marvell,cp110-utmi-phy-fbx"; + #phy-cells = <1>; + reg = <0x580000 0x2000>; + reg-names = "utmi-unit"; + marvell,system-controller = <&CP11X_LABEL(syscon0)>; + }; + CP11X_LABEL(xor0): xor@6a0000 { compatible = "marvell,armada-7k-xor", "marvell,xor-v2"; reg = <0x6a0000 0x1000>, <0x6b0000 0x1000>; @@ -396,6 +402,12 @@ status = "disabled"; }; + CP11X_LABEL(hwmon): cp110-hwmon@0x400070 { + compatible = "marvell,cp110-hwmon"; + reg = <0x400070 0xc>; + }; + + CP11X_LABEL(i2c0): i2c@701000 { compatible = "marvell,mv78230-i2c"; reg = <0x701000 0x20>; @@ -420,6 +432,16 @@ status = "disabled"; }; + CP11X_LABEL(mss_i2c): i2c@211000 { + compatible = "marvell,mv64xxx-i2c"; + reg = <0x211000 0x20>; + #address-cells = <1>; + #size-cells = <0>; + interrupts = <0 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&CP11X_LABEL(clk) 1 21>; + status = "disabled"; + }; + CP11X_LABEL(uart0): serial@702000 { compatible = "snps,dw-apb-uart"; reg = <0x702000 0x100>; @@ -489,8 +511,8 @@ CP11X_LABEL(trng): trng@760000 { compatible = "marvell,armada-8k-rng", - "inside-secure,safexcel-eip76"; - reg = <0x760000 0x7d>; + "inside-secure,safexcel-eip150"; + reg = <0x760000 0x10000>; interrupts = <95 IRQ_TYPE_LEVEL_HIGH>; clock-names = "core", "reg"; clocks = <&CP11X_LABEL(clk) 1 25>, @@ -524,6 +546,19 @@ <&CP11X_LABEL(clk) 1 17>; dma-coherent; }; + + CP11X_LABEL(tdm0): tdmmc@7a0000 { + compatible = "marvell,armada-a8k-tdm"; + reg = <0x7a0000 0x20000>, + <0x440400 0x20>; + reg-names = "tdm_regs", "pll_regs"; + interrupts = <111 IRQ_TYPE_LEVEL_HIGH>, + <112 IRQ_TYPE_LEVEL_HIGH>, + <113 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&CP11X_LABEL(clk) 1 1>; + clock-names = "gateclk"; + status = "disabled"; + }; }; CP11X_LABEL(pcie0): pcie@CP11X_PCIE0_BASE { diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/arm64/qcom/Makefile linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/qcom/Makefile --- linux-6.13.12/scripts/dtc/include-prefixes/arm64/qcom/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/arm64/qcom/Makefile 2025-09-25 17:40:30.291341064 +0200 @@ -1,288 +1,302 @@ # SPDX-License-Identifier: GPL-2.0 -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-sbc.dtb apq8016-sbc-usb-host-dtbs := apq8016-sbc.dtb apq8016-sbc-usb-host.dtbo -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-usb-host.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8016-sbc-d3-camera-mezzanine.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8016-schneider-hmibsc.dtb -dtb-$(CONFIG_ARCH_QCOM) += apq8039-t2.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) += ipq5018-rdp432-c2.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5018-tplink-archer-ax55-v1.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp441.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp442.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp468.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq5332-rdp474.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-rdp418.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp433.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp449.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp453.dtb -dtb-$(CONFIG_ARCH_QCOM) += ipq9574-rdp454.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8216-samsung-fortuna3g.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-lg-c50.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-lg-m216.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8910.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-harpia.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-osprey.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-motorola-surnia.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-gprimeltecan.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-grandmax.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-grandprimelte.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt510.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-gt58.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j3ltetw.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-j5x.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-rossa.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-wt86518.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt86528.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-wingtech-wt88047.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8916-yiming-uz801v3.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8929-wingtech-wt82918hd.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-huawei-kiwi.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-longcheer-l9100.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-samsung-a7.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-sony-xperia-kanuti-tulip.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-wingtech-wt82918.dtb -dtb-$(CONFIG_ARCH_QCOM) += msm8939-wingtech-wt82918hd.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-lg-h815.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) += qcm6490-fairphone-fp5.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcm6490-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcm6490-shift-otter.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-1000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs404-evb-4000.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs6490-rb3gen2.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs8550-aim300-aiot.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride.dtb -dtb-$(CONFIG_ARCH_QCOM) += qcs9100-ride-r3.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_DTB) += apq8016-sbc-usb-host.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-sbc-d3-camera-mezzanine.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8016-schneider-hmibsc.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += apq8039-t2.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) += ipq5018-rdp432-c2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5018-tplink-archer-ax55-v1.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp441.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp442.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp468.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq5332-rdp474.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-rdp453.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += ipq9574-rdp454.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8216-samsung-fortuna3g.dtb +dtb-$(CONFIG_ARCH_QCOM_FBX_DTB) += fbxgw9r.dtb jbxgw9r.dtb fbxgw9r-ltd.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-lg-c50.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-lg-m216.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-motorola-harpia.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-motorola-osprey.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-motorola-surnia.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-gprimeltecan.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-grandmax.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-samsung-grandprimelte.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-j3ltetw.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-rossa.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-wt86518.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-wingtech-wt86528.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-wingtech-wt88047.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8916-yiming-uz801v3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8929-wingtech-wt82918hd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-huawei-kiwi.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-longcheer-l9100.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-samsung-a7.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-sony-xperia-kanuti-tulip.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-wingtech-wt82918.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += msm8939-wingtech-wt82918hd.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-lg-h815.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) += qcm6490-fairphone-fp5.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcm6490-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcm6490-shift-otter.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-1000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs404-evb-4000.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs6490-rb3gen2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs8550-aim300-aiot.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs9100-ride.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += qcs9100-ride-r3.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 qrb5165-rb5-vision-mezzanine-dtbs := qrb5165-rb5.dtb qrb5165-rb5-vision-mezzanine.dtbo -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) += sa8775p-ride-r3.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-acer-aspire1.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-r10.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-kb.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc7180-trogdor-lazor-r10-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-r10.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-lazor-limozeen-nots-r10.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) += sc8180x-lenovo-flex-5g.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8180x-primus.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-lenovo-thinkpad-x13s.dtb -dtb-$(CONFIG_ARCH_QCOM) += sc8280xp-microsoft-arcata.dtb -dtb-$(CONFIG_ARCH_QCOM) += sda660-inforce-ifc6560.dtb -dtb-$(CONFIG_ARCH_QCOM) += sdm450-lenovo-tbx605f.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_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) += sa8775p-ride-r3.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-acer-aspire1.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-r10.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r10-kb.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc7180-trogdor-lazor-r10-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-r10.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-lazor-limozeen-nots-r10.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) += sc8180x-lenovo-flex-5g.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8180x-primus.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-lenovo-thinkpad-x13s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sc8280xp-microsoft-arcata.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sda660-inforce-ifc6560.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sdm450-lenovo-tbx605f.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 sdm845-db845c-navigation-mezzanine-dtbs := sdm845-db845c.dtb sdm845-db845c-navigation-mezzanine.dtbo -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) += sdx75-idp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm4250-oneplus-billie2.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm4450-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm6115-fxtec-pro1x.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) += sm7125-xiaomi-curtana.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7125-xiaomi-joyeuse.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7225-fairphone-fp4.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm7325-nothing-spacewar.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) += sm8250-xiaomi-pipa.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-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-samsung-q5q.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8550-sony-xperia-yodo-pdx234.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) += sdx75-idp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm4250-oneplus-billie2.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm4450-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm6115-fxtec-pro1x.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) += sm7125-xiaomi-curtana.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7125-xiaomi-joyeuse.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7225-fairphone-fp4.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm7325-nothing-spacewar.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) += sm8250-xiaomi-pipa.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-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-samsung-q5q.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8550-sony-xperia-yodo-pdx234.dtb sm8650-hdk-display-card-dtbs := sm8650-hdk.dtb sm8650-hdk-display-card.dtbo -dtb-$(CONFIG_ARCH_QCOM) += sm8650-hdk-display-card.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8650-hdk.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8650-mtp.dtb -dtb-$(CONFIG_ARCH_QCOM) += sm8650-qrd.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e78100-lenovo-thinkpad-t14s.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-asus-vivobook-s15.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-crd.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-dell-xps13-9345.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-lenovo-yoga-slim7x.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-microsoft-romulus13.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-microsoft-romulus15.dtb -dtb-$(CONFIG_ARCH_QCOM) += x1e80100-qcp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-hdk-display-card.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-hdk.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-mtp.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += sm8650-qrd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e78100-lenovo-thinkpad-t14s.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-asus-vivobook-s15.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-crd.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-dell-xps13-9345.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-lenovo-yoga-slim7x.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-microsoft-romulus13.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-microsoft-romulus15.dtb +dtb-$(CONFIG_ARCH_QCOM_DTB) += x1e80100-qcp.dtb + +always-$(CONFIG_ARCH_QCOM_FBX_DTB) += fbxgw9r_dtbs +clean-files += fbxgw9r_dtbs +board-dtbs = \ + fbxgw9r.dtb \ + fbxgw9r-ltd.dtb \ + jbxgw9r.dtb + +cmd_dtbs = ./scripts/dtbs.sh $@ $^ +quiet_cmd_dtbs = DTBS $@ + +$(obj)/fbxgw9r_dtbs: $(addprefix $(obj)/,$(board-dtbs)) + $(call cmd,dtbs) diff -ruw linux-6.13.12/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h linux-6.13.12-fbx/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h --- linux-6.13.12/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/dtc/include-prefixes/dt-bindings/input/linux-event-codes.h 2025-09-25 17:40:37.299375815 +0200 @@ -807,6 +807,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.13.12/scripts/mod/modpost.c linux-6.13.12-fbx/scripts/mod/modpost.c --- linux-6.13.12/scripts/mod/modpost.c 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/scripts/mod/modpost.c 2025-09-25 17:40:38.015379365 +0200 @@ -2149,6 +2149,11 @@ } } +struct syms_wl { + struct list_head list; + const char *name; +}; + int main(int argc, char **argv) { struct module *mod; @@ -2157,9 +2162,11 @@ char *dump_write = NULL, *files_source = NULL; int opt; LIST_HEAD(dump_lists); + LIST_HEAD(syms_wl); struct dump_list *dl, *dl2; + struct syms_wl *wl, *wl2; - while ((opt = getopt(argc, argv, "ei:MmnT:to:au:WwENd:")) != -1) { + while ((opt = getopt(argc, argv, "ei:MmnT:to:au:U:WwENd:")) != -1) { switch (opt) { case 'e': external_module = true; @@ -2193,6 +2200,11 @@ case 'u': unused_exports_white_list = optarg; break; + case 'U': + wl = xmalloc(sizeof(*dl)); + wl->name = optarg; + list_add_tail(&wl->list, &syms_wl); + break; case 'W': extra_warn = true; break; @@ -2240,6 +2252,16 @@ if (unused_exports_white_list) handle_white_list_exports(unused_exports_white_list); + list_for_each_entry_safe(wl, wl2, &syms_wl, list) { + struct symbol *sym = find_symbol(wl->name); + if (sym) + sym->used = true; + else + error("whitelist symbol \"%s\" not found", wl->name); + list_del(&wl->list); + free(wl); + } + list_for_each_entry(mod, &modules, list) { if (mod->dump_file) continue; diff -ruw linux-6.13.12/sound/soc/kirkwood/Kconfig linux-6.13.12-fbx/sound/soc/kirkwood/Kconfig --- linux-6.13.12/sound/soc/kirkwood/Kconfig 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/sound/soc/kirkwood/Kconfig 2025-09-25 17:40:38.367381111 +0200 @@ -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.13.12/sound/soc/kirkwood/Makefile linux-6.13.12-fbx/sound/soc/kirkwood/Makefile --- linux-6.13.12/sound/soc/kirkwood/Makefile 2025-04-20 10:18:30.000000000 +0200 +++ linux-6.13.12-fbx/sound/soc/kirkwood/Makefile 2025-09-25 17:40:38.367381111 +0200 @@ -6,3 +6,6 @@ snd-soc-armada-370-db-y := 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 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am-brcm.dtso 2025-04-20 10:18:30.000000000 +0200 @@ -0,0 +1,31 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (c) 2024 Freebox SAS + +/dts-v1/; +/plugin/; + +#include +#include + +&uart_A { + bluetooth { + compatible = "brcm,bcm43438-bt"; + shutdown-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; + max-speed = <2000000>; + clocks = <&wifi32k>; + clock-names = "lpo"; + vbat-supply = <&vddao_3v3>; + vddio-supply = <&vddio_ao1v8>; + }; +}; + +&sd_emmc_a { + /* Per mmc-controller.yaml */ + #address-cells = <1>; + #size-cells = <0>; + /* NB: may be either AP6398S or AP6398SR3 wifi module */ + brcmf: wifi@1 { + reg = <1>; + compatible = "brcm,bcm4329-fmac"; + }; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am-realtek.dtso 2025-04-20 10:18:30.000000000 +0200 @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (c) 2024 Freebox SAS + +/dts-v1/; +/plugin/; + +#include +#include + +&uart_A { + bluetooth { + compatible = "realtek,rtl8822cs-bt"; + enable-gpios = <&gpio GPIOX_17 GPIO_ACTIVE_HIGH>; + host-wake-gpios = <&gpio GPIOX_19 GPIO_ACTIVE_HIGH>; + device-wake-gpios = <&gpio GPIOX_18 GPIO_ACTIVE_HIGH>; + }; +}; + +&sd_emmc_a { + /* No explicit compatible for rtl8822cs sdio */ +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12/arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts 2025-04-20 10:18:30.000000000 +0200 @@ -0,0 +1,466 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +// Copyright (c) 2024 Freebox SAS + +/* + * SEI codename: SEI530FB (based on SEI510) + * Freebox codename: fbx8am + * Commercial names: Freebox Pop, Player TV Free 4K + */ + +/dts-v1/; + +#include "meson-g12a.dtsi" +#include +#include +#include +#include + +/ { + compatible = "freebox,fbx8am", "amlogic,g12a"; + model = "Freebox Player Pop"; + chassis-type = "embedded"; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + }; + + gpio-keys-polled { + compatible = "gpio-keys-polled"; + poll-interval = <100>; + + /* Physical user-accessible reset button near USB port */ + power-button { + label = "Reset"; + linux,code = ; + gpios = <&gpio_ao GPIOAO_3 GPIO_ACTIVE_HIGH>; + }; + }; + + spdif_dit: audio-codec-2 { + #sound-dai-cells = <0>; + compatible = "linux,spdif-dit"; + status = "okay"; + sound-name-prefix = "DIT"; + }; + + aliases { + serial0 = &uart_AO; + ethernet0 = ðmac; + }; + + chosen { + stdout-path = "serial0:115200n8"; + }; + + emmc_pwrseq: emmc-pwrseq { + compatible = "mmc-pwrseq-emmc"; + reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; + }; + + hdmi-connector { + compatible = "hdmi-connector"; + type = "a"; + + port { + hdmi_connector_in: endpoint { + remote-endpoint = <&hdmi_tx_tmds_out>; + }; + }; + }; + + memory@0 { + device_type = "memory"; + reg = <0x0 0x0 0x0 0x80000000>; + }; + + ao_5v: regulator-ao-5v { + compatible = "regulator-fixed"; + regulator-name = "AO_5V"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + vin-supply = <&dc_in>; + regulator-always-on; + }; + + dc_in: regulator-dc-in { + compatible = "regulator-fixed"; + regulator-name = "DC_IN"; + regulator-min-microvolt = <12000000>; + regulator-max-microvolt = <12000000>; + regulator-always-on; + }; + + emmc_1v8: regulator-emmc-1v8 { + compatible = "regulator-fixed"; + regulator-name = "EMMC_1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + 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 = <&ao_5v>; + regulator-always-on; + }; + + vddao_3v3_t: regulator-vddao-3v3-t { + compatible = "regulator-fixed"; + regulator-name = "VDDAO_3V3_T"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vddao_3v3>; + gpio = <&gpio GPIOH_8 GPIO_OPEN_DRAIN>; + enable-active-high; + }; + + vddcpu: regulator-vddcpu { + /* + * SY8120B1ABC DC/DC Regulator. + */ + compatible = "pwm-regulator"; + + regulator-name = "VDDCPU"; + regulator-min-microvolt = <721000>; + regulator-max-microvolt = <1022000>; + + pwm-supply = <&ao_5v>; + + pwms = <&pwm_AO_cd 1 1250 0>; + pwm-dutycycle-range = <100 0>; + + regulator-boot-on; + regulator-always-on; + }; + + vddio_ao1v8: regulator-vddio-ao1v8 { + compatible = "regulator-fixed"; + regulator-name = "VDDIO_AO1V8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + vin-supply = <&vddao_3v3>; + regulator-always-on; + }; + + sdio_pwrseq: sdio-pwrseq { + compatible = "mmc-pwrseq-simple"; + reset-gpios = <&gpio GPIOX_6 GPIO_ACTIVE_LOW>; + post-power-on-delay-ms = <10>; /* required for 43752 */ + clocks = <&wifi32k>; + clock-names = "ext_clock"; + }; + + wifi32k: wifi32k { + compatible = "pwm-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + pwms = <&pwm_ef 0 30518 0>; /* PWM_E at 32.768KHz */ + }; + + sound { + compatible = "amlogic,axg-sound-card"; + model = "fbx8am"; + audio-aux-devs = <&tdmout_b>; + audio-routing = "TDMOUT_B IN 0", "FRDDR_A OUT 1", + "TDMOUT_B IN 1", "FRDDR_B OUT 1", + "TDMOUT_B IN 2", "FRDDR_C OUT 1", + "TDM_B Playback", "TDMOUT_B OUT", + "SPDIFOUT_A IN 0", "FRDDR_A OUT 3", + "SPDIFOUT_A IN 1", "FRDDR_B OUT 3", + "SPDIFOUT_A IN 2", "FRDDR_C OUT 3"; + + clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + + assigned-clocks = <&clkc CLKID_MPLL2>, + <&clkc CLKID_MPLL0>, + <&clkc CLKID_MPLL1>; + assigned-clock-parents = <0>, <0>, <0>; + assigned-clock-rates = <294912000>, + <270950400>, + <393216000>; + + dai-link-0 { + sound-dai = <&frddr_a>; + }; + + dai-link-1 { + sound-dai = <&frddr_b>; + }; + + dai-link-2 { + sound-dai = <&frddr_c>; + }; + + /* 8ch hdmi interface */ + dai-link-3 { + sound-dai = <&tdmif_b>; + dai-format = "i2s"; + dai-tdm-slot-tx-mask-0 = <1 1>; + dai-tdm-slot-tx-mask-1 = <1 1>; + dai-tdm-slot-tx-mask-2 = <1 1>; + dai-tdm-slot-tx-mask-3 = <1 1>; + mclk-fs = <256>; + + codec { + sound-dai = <&tohdmitx TOHDMITX_I2S_IN_B>; + }; + }; + + /* spdif hdmi or toslink interface */ + dai-link-4 { + sound-dai = <&spdifout_a>; + + codec-0 { + sound-dai = <&spdif_dit>; + }; + + codec-1 { + sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_A>; + }; + }; + + /* spdif hdmi interface */ + dai-link-5 { + sound-dai = <&spdifout_b>; + + codec { + sound-dai = <&tohdmitx TOHDMITX_SPDIF_IN_B>; + }; + }; + + /* hdmi glue */ + dai-link-6 { + sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>; + + codec { + sound-dai = <&hdmi_tx>; + }; + }; + }; +}; + +&arb { + status = "okay"; +}; + +&cecb_AO { + pinctrl-0 = <&cec_ao_b_h_pins>; + pinctrl-names = "default"; + status = "okay"; + hdmi-phandle = <&hdmi_tx>; +}; + +&clkc_audio { + status = "okay"; +}; + +&cpu0 { + cpu-supply = <&vddcpu>; + operating-points-v2 = <&cpu_opp_table>; + clocks = <&clkc CLKID_CPU_CLK>; + clock-latency = <50000>; +}; + +&cpu1 { + cpu-supply = <&vddcpu>; + operating-points-v2 = <&cpu_opp_table>; + clocks = <&clkc CLKID_CPU_CLK>; + clock-latency = <50000>; +}; + +&cpu2 { + cpu-supply = <&vddcpu>; + operating-points-v2 = <&cpu_opp_table>; + clocks = <&clkc CLKID_CPU_CLK>; + clock-latency = <50000>; +}; + +&cpu3 { + cpu-supply = <&vddcpu>; + operating-points-v2 = <&cpu_opp_table>; + clocks = <&clkc CLKID_CPU_CLK>; + clock-latency = <50000>; +}; + +ðmac { + status = "okay"; + phy-handle = <&internal_ephy>; + phy-mode = "rmii"; +}; + +&frddr_a { + status = "okay"; +}; + +&frddr_b { + status = "okay"; +}; + +&frddr_c { + status = "okay"; +}; + +&spdifout_a { + pinctrl-0 = <&spdif_out_h_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&spdifout_b { + status = "okay"; +}; + +&hdmi_tx { + status = "okay"; + pinctrl-0 = <&hdmitx_hpd_pins>, <&hdmitx_ddc_pins>; + pinctrl-names = "default"; +}; + +&hdmi_tx_tmds_port { + hdmi_tx_tmds_out: endpoint { + remote-endpoint = <&hdmi_connector_in>; + }; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_sda_a_pins>, <&i2c3_sck_a_pins>; + pinctrl-names = "default"; +}; + +&ir { + status = "okay"; + pinctrl-0 = <&remote_input_ao_pins>; + pinctrl-names = "default"; +}; + +&pwm_AO_cd { + pinctrl-0 = <&pwm_ao_d_e_pins>; + pinctrl-names = "default"; + clocks = <&xtal>; + clock-names = "clkin1"; + status = "okay"; +}; + +&pwm_ef { + status = "okay"; + pinctrl-0 = <&pwm_e_pins>; + pinctrl-names = "default"; + clocks = <&xtal>; + clock-names = "clkin0"; +}; + +&pdm { + pinctrl-0 = <&pdm_din0_z_pins>, <&pdm_din1_z_pins>, + <&pdm_din2_z_pins>, <&pdm_din3_z_pins>, + <&pdm_dclk_z_pins>; + pinctrl-names = "default"; + status = "okay"; +}; + +&saradc { + status = "okay"; + vref-supply = <&vddio_ao1v8>; +}; + +/* SDIO */ +&sd_emmc_a { + status = "okay"; + pinctrl-0 = <&sdio_pins>; + pinctrl-1 = <&sdio_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + #address-cells = <1>; + #size-cells = <0>; + + bus-width = <4>; + cap-sd-highspeed; + sd-uhs-sdr50; + max-frequency = <100000000>; + + non-removable; + disable-wp; + + /* WiFi firmware requires power to be kept while in suspend */ + keep-power-in-suspend; + + mmc-pwrseq = <&sdio_pwrseq>; + + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddio_ao1v8>; +}; + +/* SD card */ +&sd_emmc_b { + status = "okay"; + pinctrl-0 = <&sdcard_c_pins>; + pinctrl-1 = <&sdcard_clk_gate_c_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <4>; + cap-sd-highspeed; + max-frequency = <50000000>; + disable-wp; + + cd-gpios = <&gpio GPIOC_6 GPIO_ACTIVE_LOW>; + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&vddao_3v3>; +}; + +/* eMMC */ +&sd_emmc_c { + status = "okay"; + pinctrl-0 = <&emmc_ctrl_pins>, <&emmc_data_8b_pins>, <&emmc_ds_pins>; + pinctrl-1 = <&emmc_clk_gate_pins>; + pinctrl-names = "default", "clk-gate"; + + bus-width = <8>; + cap-mmc-highspeed; + mmc-ddr-1_8v; + mmc-hs200-1_8v; + max-frequency = <200000000>; + non-removable; + disable-wp; + + mmc-pwrseq = <&emmc_pwrseq>; + vmmc-supply = <&vddao_3v3>; + vqmmc-supply = <&emmc_1v8>; +}; + +&tdmif_b { + status = "okay"; +}; + +&tdmout_b { + status = "okay"; +}; + +&tohdmitx { + status = "okay"; +}; + +&uart_A { + status = "okay"; + pinctrl-0 = <&uart_a_pins>, <&uart_a_cts_rts_pins>; + pinctrl-names = "default"; + uart-has-rtscts; +}; + +&uart_AO { + status = "okay"; + pinctrl-0 = <&uart_ao_a_pins>; + pinctrl-names = "default"; +}; + +&usb { + status = "okay"; + dr_mode = "host"; +}; diff -Nruw linux-6.13.12-fbx/arch/arm64/boot/dts/broadcom/bcm63xx./Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/broadcom/bcm63xx/Makefile --- linux-6.13.12-fbx/arch/arm64/boot/dts/broadcom/bcm63xx./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/broadcom/bcm63xx/Makefile 2025-09-25 17:40:30.219340707 +0200 @@ -0,0 +1,37 @@ +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 $@ + +# calculate size of file $1 aligned to a $2 boundary +file_size = $(shell echo "sz=$$(stat -c %s $1); a=$2; (sz + a - 1) / a * a" | bc) + +# due to a bug in CFE v2.4, check that $1 and $2's sizes are okay and +# will be accepted. in flash mode we need to account for the AES +# padding (15 bytes at most) +check_dtb_size = if [ $(call file_size,$1,16) -gt $(call file_size,$2,1) ]; \ + then echo "bad DTB size for CFE v2.4: $2's size must be greater than $1's size"; exit 1; fi + +$(obj)/fbxgw8r_dtbs: $(addprefix $(obj)/,$(board-dtbs)) + $(Q)$(call check_dtb_size,$(obj)/fbxgw8r.dtb,$(obj)/fbxgw8r-board-00.dtb) + $(Q)$(call check_dtb_size,$(obj)/fbxgw8r.dtb,$(obj)/fbxgw8r-board-01.dtb) + $(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 diff -Nruw linux-6.13.12-fbx/arch/arm64/boot/dts/cortina-access./Makefile linux-6.13.12-fbx/arch/arm64/boot/dts/cortina-access/Makefile --- linux-6.13.12-fbx/arch/arm64/boot/dts/cortina-access./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/cortina-access/Makefile 2025-09-25 17:40:30.227340746 +0200 @@ -0,0 +1,16 @@ +dtb-$(CONFIG_ARCH_CORTINA_ACCESS) += fbxgw3r-evb.dtb +dtb-$(CONFIG_ARCH_CORTINA_ACCESS) += fbxgw3r-board-00.dtb +dtb-$(CONFIG_ARCH_CORTINA_ACCESS) += ca8289-engboard.dtb +dtb-$(CONFIG_ARCH_CORTINA_ACCESS) += ca8289-refboard.dtb + +always-$(CONFIG_ARCH_CORTINA_ACCESS) += fbxgw3r_dtbs +clean-files += fbxgw3r_dtbs +board-dtbs = \ + fbxgw3r-evb.dtb \ + fbxgw3r-board-00.dtb + +cmd_dtbs = ./scripts/dtbs.sh $@ $^ +quiet_cmd_dtbs = DTBS $@ + +$(obj)/fbxgw3r_dtbs: $(addprefix $(obj)/,$(board-dtbs)) + $(call cmd,dtbs) --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r-common.dtsi 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,954 @@ +#include <../../../include/generated/autoconf.h> + +/ { + chosen { + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + ramoops@3fff8000 { + compatible = "ramoops"; + /* RAM top - 32k */ + reg = <0x0 0x3fff8000 0x0 (32 * 1024)>; + record-size = <(32 * 1024)>; + ecc-size = <16>; + no-dump-oops; + }; + +#ifdef CONFIG_ATH11K_QCN9074_FIXED_MEM_REGION + qca_pine_2G4: qca-pine-2G4 { + reg = <0x0 0x30000000 0x0 0x01a00000>; + no-map; + }; + qca_pine_5G: qca-pine-5G { + reg = <0x0 0x31a00000 0x0 0x01a00000>; + no-map; + }; + qca_pine_6G: qca-pine-6G { + reg = <0x0 0x33400000 0x0 0x01a00000>; + no-map; + }; +#endif + }; + + memory@00000000 { + device_type = "memory"; + // hopefully patched by ATF. + reg = <0x0 0x0 0x0 0x0>; + }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + skip-enumeration; + }; + }; + + fbx7r-fbxgpio { + compatible = "fbx,fbxgpio"; + + lan-sfp-txdis { + gpio = <&cp0_gpio2 22 0>; + output-high; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + lan-sfp-txfault { + gpio = <&cp0_gpio2 21 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + lan-sfp-pwren { + gpio = <&io_expander1 7 0>; + output-low; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + lan-sfp-presence { + gpio = <&cp1_gpio1 27 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + lan-sfp-pwrgood { + gpio = <&cp1_gpio1 10 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + lan-sfp-rxlos { + gpio = <&cp1_gpio1 28 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + + sata0-pwren { + gpio = <&io_expander0 13 0>; + output-low; + }; + sata1-pwren { + gpio = <&io_expander0 14 0>; + output-low; + }; + sata0-pwrfault { + gpio = <&io_expander0 11 0>; + input; + }; + sata1-pwrfault { + gpio = <&io_expander0 12 0>; + input; + }; + + sata2-pwren { + gpio = <&io_expander1 11 0>; + output-low; + }; + sata3-pwren { + gpio = <&io_expander1 10 0>; + output-low; + }; + sata2-pwrfault { + gpio = <&io_expander1 5 0>; + input; + }; + sata3-pwrfault { + gpio = <&io_expander1 4 0>; + input; + }; + + usbhub2-rst { + gpio = <&io_expander0 15 0>; + output-low; + }; + usbhub3-rst { + gpio = <&io_expander1 6 0>; + output-low; + }; + + mpcie0-rst { + /* WiFi 5.0Ghz */ + gpio = <&io_expander0 8 0>; + output-low; + no-claim; + }; + mpcie1-rst { + /* WiFI 2.4 Ghz */ + gpio = <&io_expander1 15 0>; + output-low; + no-claim; + }; + mpcie2-rst { + /* WiFi Listen */ + gpio = <&io_expander1 9 0>; + output-low; + no-claim; + }; + + ha-rst { + gpio = <&cp1_gpio1 25 0 >; + output-low; + }; + + sw-int { + gpio = <&cp0_gpio2 1 0>; + input; + }; + sw-reset { + gpio = <&io_expander0 0 0>; + output-high; + no-claim; + }; + phy-int { + gpio = <&cp0_gpio2 20 0>; + input; + }; + phy-reset { + gpio = <&io_expander0 1 0>; + output-high; + }; + + dect_jtag_tck: dect-jtag-tck { + gpio = <&cp1_gpio1 20 0>; + output-low; + }; + dect_jtag_tdi: dect-jtag-tdi { + gpio = <&cp1_gpio1 17 0>; + output-low; + }; + dect_jtag_tdo: dect-jtag-tdo { + gpio = <&cp1_gpio1 18 0>; + input; + }; + dect_jtag_tms: dect-jtag-tms { + gpio = <&cp1_gpio1 26 0>; + output-low; + }; + dect-reset { + gpio = <&cp1_gpio1 4 0>; + output-low; + }; + + exp1-rst0 { + gpio = <&io_expander0 2 0>; + output-low; + }; + exp1-rst1 { + gpio = <&io_expander0 3 0>; + output-low; + }; + exp1-3v3-en { + gpio = <&io_expander0 6 0>; + output-low; + }; + exp1-20v-pwren { + gpio = <&io_expander0 5 0>; + output-low; + }; + + exp2-rst0 { + gpio = <&io_expander1 3 0>; + output-low; + }; + exp2-rst1 { + gpio = <&io_expander1 1 0>; + output-low; + }; + exp2-3v3-en { + gpio = <&io_expander1 2 0>; + output-low; + }; + exp2-20v-pwren { + gpio = <&io_expander1 8 0>; + output-low; + }; + + + boot-eth { + gpio = <&cp0_gpio2 29 0>; + input; + }; + + nfc-int { + gpio = <&cp1_gpio1 9 0>; + input; + }; + nfc-en { + gpio = <&io_expander0 9 0>; + output-high; + }; + }; + + /* + * I2C mux isolating LAN SFP, both expansion boards + * Expansion boards branches from each other. + */ + i2c_bigmux { + compatible = "i2c-mux-gpio"; + #address-cells = <1>; + #size-cells = <0>; + mux-gpios = <&cp1_gpio1 24 0>, /* lan-sfp-i2c-en */ + <&io_expander1 12 0>, /* exp2-i2c-en */ + <&io_expander1 13 0>; /* exp1-i2c-en */ + idle-state = <0x0>; + i2c-parent = <&misc_i2c>; + + lan_sfp_i2c: i2c@1 { + reg = <0x1>; + }; + + exp2_ext_i2c: i2c@2 { + reg = <0x2>; + }; + + exp1_ext_i2c: i2c@4 { + reg = <0x4>; + }; + }; + + jtag_dect { + compatible = "fbx,fbxjtag"; + + clock-delay = <500>; + wait-tms = <0>; + data-read-size = <128>; + inst-read-size = <128>; + + fbxgpio-tck = <&dect_jtag_tck>; + fbxgpio-tdo = <&dect_jtag_tdo>; + fbxgpio-tdi = <&dect_jtag_tdi>; + fbxgpio-tms = <&dect_jtag_tms>; + }; + + cp0_i2c1_gpio: cp0_i2c1_gpio { + /* aka I2C #1, A8K I2C bus CP0_I2C1 */ + compatible = "i2c-gpio"; + gpios = <&cp0_gpio2 3 0 /* sda */ + &cp0_gpio2 4 0 /* scl */ + >; + i2c-gpio,delay-us = <2>; /* ~100 kHz */ + #address-cells = <1>; + #size-cells = <0>; + + spd@0x53 { + /* SPD eeprom */ + compatible = "at24,ee1004"; + reg = <0x53>; + }; + }; + + misc_i2c: cp1_mss_i2c { + /* aka I2C #2, A8K I2C bus CP1_MSS_I2C */ + compatible = "i2c-gpio"; + gpios = <&cp1_gpio1 29 0 /* sda */ + &cp1_gpio1 30 0 /* scl */ + >; + i2c-gpio,delay-us = <2>; /* ~100 kHz */ + #address-cells = <1>; + #size-cells = <0>; + }; + +#ifdef USE_PHYLINK_SFP + sfp_lan: sfp-lan { + compatible = "sff,sfp"; + i2c-bus = <&lan_sfp_i2c>; + maximum-power-milliwatt = <3000>; + los-gpios = <&cp1_gpio1 28 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&cp1_gpio1 27 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&cp0_gpio2 22 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&cp0_gpio2 21 GPIO_ACTIVE_HIGH>; + pwr-enable-gpios = <&io_expander1 7 GPIO_ACTIVE_HIGH>; + // i2c access to 10G PHY works too randomly + // don't attempt to do it + skip-10g-t-phy-detect; + }; +#endif + + exp1_sfp: exp1-sfp { + status = "disabled"; + }; + + exp2_sfp: exp2-sfp { + status = "disabled"; + }; + + qcom,diag@0 { + compatible = "qcom,diag"; + status = "ok"; + }; + + aliases { + /* console */ + serial0 = &uart0; + /* DECT */ + serial1 = &cp0_uart0; + /* EXP2 */ + serial2 = &cp0_uart1; + /* EXP1 */ + serial3 = &cp0_uart2; + /* BT */ + serial4 = &cp1_uart0; + /* HA */ + serial5 = &cp1_uart2; + + i2c0 = &cp0_i2c0; + i2c1 = &cp0_i2c1_gpio; + i2c2 = &misc_i2c; + i2c3 = &lan_sfp_i2c; + i2c4 = &exp2_ext_i2c; + i2c5 = &exp1_ext_i2c; + i2c6 = &cp0_mss_i2c; + }; +}; + +&cp1_gpio1 { + gpio-line-names = "", /* 0 */ + "", /* 1 */ + "", /* 2 */ + "", /* 3 */ + "tdm-rst", /* 4 */ + "", /* 5 */ + "", /* 6 */ + "", /* 7 */ + "", /* 8 */ + "nfc-int", /* 9 */ + "lan-sfp-pwrfault", /* 10 */ + "", /* 11 */ + "", /* 12 */ + "", /* 13 */ + "", /* 14 */ + "", /* 15 */ + "", /* 16 */ + "dect-jtag-tdi", /* 17 */ + "dect-jtag-tdo", /* 18 */ + "ha-swd", /* 19 */ + "dect-jtag-tck", /* 20 */ + "display-swc", /* 21 */ + "", /* 22 */ + "display-swd", /* 23 */ + "lan-sfp-i2c-en", /* 24 */ + "ha-reset", /* 25 */ + "dect-jtag-tms", /* 26 */ + "lan-sfp-presence", /* 27 */ + "lan-sfp-rxlos", /* 28 */ + "", /* 29 */ + "", /* 30 */ + "exp1-3v3-pwrfault"; /* 31 */ +}; + +&cp0_gpio2 { + /* starts at offset 32 in cp110-master */ + + gpio-line-names = "exp2-3v3-pwrfault", /* 0 */ + "sw-int", /* 1 */ + "keypad-int", /* 2 */ + "", /* 3 */ + "", /* 4 */ + "", /* 5 */ + "", /* 6 */ + "", /* 7 */ + "", /* 8 */ + "", /* 9 */ + "", /* 10 */ + "", /* 11 */ + "ha-swc", /* 12 */ + "", /* 13 */ + "keypad-rst", /* 14 */ + "", /* 15 */ + "io-expander-reset", /* 16 */ + "", /* 17 */ + "", /* 18 */ + "", /* 19 */ + "phy-int", /* 20 */ + "lan-sfp-txfault", /* 21 */ + "lan-sfp-txdisable", /* 22 */ + "sdr-event", /* 23 */ + "fan-alert-int", /* 24 */ + "", /* 25 */ + "", /* 26 */ + "", /* 27 */ + "", /* 28 */ + "boot-eth", /* 29 */ + ""; /* 30 */ +}; + +&uart0 { + status = "okay"; +}; + +&ap_sdhci0 { + status = "okay"; + bus-width = <8>; + non-removable; + + user-ro-area = /bits/64 <0 (32 << 20)>; + boot-ro-area = /bits/64 <0 (4 << 20)>; + + partitions-main { + compatible = "fixed-partitions"; + #address-cells = <2>; + #size-cells = <2>; + disk-name = "mmcblk%d"; + + bank0@0 { + label = "bank0"; + reg = /bits/64 <0 (32 * 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) (32 * 1024 * 1024)>; + }; + + fbxmbr@0 { + label = "fbxmbr"; + reg = /bits/64 <(-1) (4096)>; + }; + + fortknox@0 { + label = "fortknox"; + reg = /bits/64 <(-1) (128 * 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"; + + ipl@0 { + label = "ipl"; + reg = /bits/64 <0 (1 * 1024 * 1024)>; + read-only; + }; + + serial@0 { + label = "fbxserial"; + reg = /bits/64 <(-1) (8 * 1024)>; + read-only; + }; + + randomdata@0 { + label = "randomdata"; + reg = /bits/64 <(-1) (8 * 1024)>; + read-only; + }; + + calibration@0 { + label = "calibration"; + reg = /bits/64 <(-1) (64 * 1024)>; + read-only; + }; + + field-calibration@0 { + label = "field_calibration"; + reg = /bits/64 <(-1) (64 * 1024)>; + }; + }; + + partitions-boot1 { + compatible = "fixed-partitions"; + #address-cells = <2>; + #size-cells = <2>; + disk-name = "mmcblk%dboot1"; + + backup-ipl@0 { + label = "backup-ipl"; + reg = /bits/64 <0 (1 * 1024 * 1024)>; + read-only; + }; + }; +}; + +&ap_hwmon { + status = "okay"; + fbx,requires-smc; +}; + +&cp0_hwmon { + status = "okay"; +}; + +&cp1_hwmon { + status = "okay"; + fbx,requires-smc; +}; + +&cp0_i2c0 { + status = "okay"; + pinctrl-names = "default"; + + adt7475@2e { + compatible = "adi,adt7475"; + reg = <0x2e>; + }; + + io_expander0: exp0@74 { + compatible = "nxp,pca9539"; + reg = <0x74>; + gpio-controller; + ngpios = <16>; + #gpio-cells = <2>; + gpio-line-names = "sw-rst", /* 0 */ + "phy-rst", /* 1 */ + "exp1-rst1", /* 2 */ + "exp1-rst2", /* 3 */ + "exp1-presence", /* 4 */ + "exp1-20v-pwren", /* 5 */ + "exp1-3v3-pwren", /* 6 */ + "", /* 7 */ + "pcie0-rst", /* 8 */ + "nfc-en", /* 9 */ + "type-c-i2c-en", /* 10 */ + "sata0-pwrfault", /* 11 */ + "sata1-pwrfault", /* 12 */ + "sata0-pwren", /* 13 */ + "sata1-pwren", /* 14 */ + "usbhub2-rst"; /* 15 */ + }; + + io_expander1: exp1@75 { + compatible = "nxp,pca9539"; + reg = <0x75>; + gpio-controller; + gpiobase = <300>; + ngpios = <16>; + #gpio-cells = <2>; + gpio-line-names = "exp2-presence", /* 0 */ + "exp2-rst1", /* 1 */ + "exp2-3v3-en", /* 2 */ + "exp2-rst0", /* 3 */ + "sata3-pwrfault", /* 4 */ + "sata2-pwrfault", /* 5 */ + "usbhub3-rst", /* 6 */ + "lan-sfp-pwren", /* 7 */ + "exp2-20v-pwren", /* 8 */ + "pcie2-rst", /* 9 */ + "sata3-pwren", /* 10 */ + "sata2-pwren", /* 11 */ + "exp2-i2c-en", /* 12 */ + "exp1-i2c-en", /* 13 */ + "pcie1-bt-rst", /* 14 */ + "pcie1-rst"; /* 15 */ + }; +}; + +&cp0_mss_i2c { + status = "okay"; + pinctrl-0 = <&cp0_mss_i2c_pins>; + pinctrl-names = "default"; + + ld6710-fbx@68 { + compatible = "leadtrend,ld6710-fbx"; + reg = <0x68>; + }; +}; + +&cp0_ethernet { + status = "okay"; +}; + +&cp0_mdio { + status = "okay"; + + mv6141: mv6141@16 { + compatible = "freebox,fbxgw7r-mv6141"; + reg = <0>; + gpio-reset = <&io_expander0 0 0>; + }; +}; + + +/* + * Internal port to midplane for "EXP2" expansion connector. Can + * operate in 10GBase-KR. + */ +&cp0_eth0 { + managed = "in-band-status"; + status = "okay"; + phys = <&cp0_comphy2 0>; + phy-mode = "1000base-x"; + mac-address = [00 07 cb 00 00 fd]; + sfp = <&exp2_sfp>; +}; + +/* + * Switch uplink port in 2500Base-X. + */ +&cp0_eth2 { + managed = "in-band-status"; + status = "okay"; + phy-mode = "1000base-x"; + phys = <&cp0_comphy5 2>; + fbxserial-mac-address = <0>; + mdio-bus = <&cp0_mdio>; +}; + +&cp1_ethernet { + status = "okay"; +}; + +/* + * 10G Lan port (SFP) + */ +&cp1_comphy4 { + kr-gen1-s0-amplitude = <0x12>; + kr-gen1-s0-emphasis = <0x4>; + kr-gen1-s2-emphasis = <0x0>; +}; + +&cp1_eth0 { + managed = "in-band-status"; + status = "okay"; + phys = <&cp1_comphy4 0>; + phy-mode = "10gbase-kr"; + fbxserial-mac-address = <1>; +#ifdef USE_PHYLINK_SFP + sfp = <&sfp_lan>; +#endif +}; + +/* + * Internal port to midplane for "EXP1" expansion connector. 1000BaseX + * only, not 10G capapable + */ +&cp1_eth2 { + managed = "in-band-status"; + status = "okay"; + phys = <&cp1_comphy5 2>; + phy-mode = "1000base-x"; + mac-address = [00 07 cb 00 00 fd]; + sfp = <&exp1_sfp>; +}; + +&cp0_comphy1 { + sata-gen3-s0-amplitude = <0x15>; + sata-gen3-s0-emphasis = <0x7>; + sata-gen3-s4-dfe-res = <0x1>; + sata-phase-offset = <0x61>; +}; + +&cp0_comphy3 { + sata-gen3-s0-amplitude = <0x15>; + sata-gen3-s0-emphasis = <0x5>; + sata-gen3-s4-dfe-res = <0x1>; + sata-phase-offset = <0x61>; +}; + +&cp0_sata0 { + status = "okay"; + comreset_u = <0x17>; + comwake = <0x6>; + + sata-port@0 { + status = "okay"; + reg = <0>; + phys = <&cp0_comphy1 0>; + }; + sata-port@1 { + status = "okay"; + reg = <1>; + phys = <&cp0_comphy3 1>; + }; +}; + +&cp1_comphy2 { + sata-gen3-s0-amplitude = <0x14>; + sata-gen3-s0-emphasis = <0x5>; + sata-gen3-s4-dfe-res = <0x1>; + sata-phase-offset = <0x61>; +}; + +&cp1_comphy3 { + sata-gen3-s0-amplitude = <0x14>; + sata-gen3-s0-emphasis = <0x5>; + sata-gen3-s4-dfe-res = <0x1>; + sata-phase-offset = <0x61>; +}; + +&cp1_sata0 { + status = "okay"; + comreset_u = <0x17>; + comwake = <0x6>; + + sata-port@1 { + status = "okay"; + reg = <1>; + phys = <&cp1_comphy3 1>; + }; + sata-port@0 { + status = "okay"; + reg = <0>; + phys = <&cp1_comphy2 0>; + }; +}; + + +&cp0_usb3_1 { + status = "okay"; + + phys = <&cp0_utmi_fbx 0>; + phy-names = "usb2"; +}; + +&cp1_usb3_0 { + status = "okay"; + + phys = <&cp1_comphy1 0>, + <&cp1_utmi_fbx 0>; + phy-names = "usb3", "usb2"; +}; + +&cp0_pcie0 { + /* + * WiFi 5.0Ghz + */ + status = "okay"; + num-lanes = <1>; + + phys = <&cp0_comphy0 0>; + phy-names = "lane0"; + + reset-gpios = <&io_expander0 8 0>; +}; + +&cp0_pcie1 { + /* + * WiFi Listen + */ + status = "okay"; + num-lanes = <1>; + + phys = <&cp0_comphy4 1>; + phy-names = "lane0"; + + reset-gpio = <&io_expander1 9 0>; +}; + +&cp1_pcie0 { + /* + * WiFi 2.4 Ghz + */ + status = "okay"; + num-lanes = <1>; + + phys = <&cp1_comphy0 0>; + phy-names = "lane0"; + reset-gpio = <&io_expander1 15 0>, <&io_expander1 14 0>; +}; + +&cp0_spi0 { + status = "okay"; + pinctrl-0 = <&cp0_spi0_pins>; + pinctrl-names = "default"; + + spi-slac@0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "microsemi,le9641"; + reg = <0>; + spi-max-frequency = <5000000>; + }; +}; + +&cp1_spi1 { + status = "okay"; + pinctrl-0 = <&cp1_spi1_pins>; + pinctrl-names = "default"; +}; + +&cp0_pinctrl { + /* DECT */ + cp0_uart0_pins: uart0-pins-0 { + marvell,pins = "mpp45", "mpp62"; + marvell,function = "uart0"; + }; + /* EXP2 */ + cp0_uart1_pins: uart1-pins-0 { + marvell,pins = "mpp59", "mpp60"; + marvell,function = "uart1"; + }; + /* EXP1 */ + cp0_uart2_pins: uart2-pins-0 { + marvell,pins = "mpp50", "mpp51"; + marvell,function = "uart2"; + }; + /* SPI SLAC */ + cp0_spi0_pins: spi0-pins-0 { + marvell,pins = "mpp39", "mpp40", "mpp41", "mpp42", "mpp43"; + marvell,function = "spi0"; + }; + cp0_mss_i2c_pins: mss-i2c-pins-0 { + marvell,pins = "mpp57", "mpp58"; + marvell,function = "mss_i2c"; + }; +}; + +&cp1_pinctrl { + cp1_mss_i2c_pins: mss-i2c-pins-0 { + marvell,pins = "mpp29", "mpp30"; + marvell,function = "mss_i2c"; + }; + cp1_spi1_pins: spi1-pins-0 { + marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15", "mpp16"; + marvell,function = "spi1"; + }; + cp1_tdm0_pins: tdm0-pins-0 { + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", "mpp5"; + marvell,function = "tdm"; + }; + /* BT */ + cp1_uart0_pins: uart0-pins-0 { + marvell,pins = "mpp6", "mpp7"; + marvell,function = "uart0"; + }; + /* HA */ + cp1_uart2_pins: uart2-pins-0 { + marvell,pins = "mpp8", "mpp11"; + marvell,function = "uart2"; + }; +}; + +/* DECT */ +&cp0_uart0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&cp0_uart0_pins>; +}; + +/* EXP2 */ +&cp0_uart1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&cp0_uart1_pins>; +}; + +/* EXP1 */ +&cp0_uart2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&cp0_uart2_pins>; +}; + +&cp1_tdm0 { + pinctrl-names = "default"; + pinctrl-0 = <&cp1_tdm0_pins>; + status = "okay"; + pclk-freq-mhz = <2>; +}; + +/* BT */ +&cp1_uart0 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&cp1_uart0_pins>; +}; + +/* HA */ +&cp1_uart2 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&cp1_uart2_pins>; +}; + +&cp1_trng { + /* secure TRNG on fbxgw7r */ + status = "foutu"; +}; + +&cp1_clk { + fbx,ignore-eip150; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,38 @@ +#include +#include + +#include "armada-8040.dtsi" + +#include "fbxgw7r-common.dtsi" + +/ { + model = "Freebox V7R Board"; + compatible = "freebox,fbxgw7r", "marvell,armada8040", + "marvell,armada-ap806-quad", "marvell,armada-ap806"; +}; + +&cp0_spi0 { + spi-panel@1 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "freebox,fbxgw7r-panel"; + reg = <1>; + spi-max-frequency = <(750 * 1000)>; + irq-gpio = <&cp0_gpio2 2 0>; + }; +}; + +/* + * Internal port to midplane for "EXP2" expansion connector. Can + * operate in 10GBase-KR. + */ +&cp0_comphy2 { + kr-gen1-s0-amplitude = <0x16>; + kr-gen1-s0-emphasis = <0x4>; + kr-gen1-s2-emphasis = <0x0>; + + kr-ffe-cap-sel = <0x0>; + kr-ffe-res-sel = <0x0>; + kr-dfe-res = <0x3>; + kr-phase-offset = <0x62>; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp1_dsl_lte.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,33 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "freebox,fbxgw7r"; + + fragment@0 { + target-path="/"; + __overlay__ { + fbxatm-remote@0 { + compatible = "freebox,fbxatm-remote"; + mac-address = [00 07 cb 00 00 fe]; + netdev-name = "bcmfbxatm0"; + remote-name = "bcm63xx_fbxxtm0"; + }; + }; + }; + + fragment@1 { + target = <&cp1_spi1>; + __overlay__ { + #address-cells = <0x1>; + #size-cells = <0x0>; + + exp1-flash@1 { + compatible = "m25p80"; + reg = <1>; + spi-max-frequency = <(1 * 1000 * 1000)>; + label = "exp1-spi-flash"; + }; + }; + }; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp1_ftth_p2p.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,4 @@ +#undef USE_PHYLINK_SFP + +#define EXP_SLOT exp1 +#include "fbxgw7r_expX_ftth_p2p.dts" --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp1_test_module.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,4 @@ +#define EXP_SLOT exp1 +#define EXP_SPI_FLASH_LABEL "exp1-spi-flash" +#define EXP_SPI_FLASH_CS 1 +#include "fbxgw7r_expX_test_module.dts" --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp2_ftth_p2p.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,4 @@ +#undef USE_PHYLINK_SFP + +#define EXP_SLOT exp2 +#include "fbxgw7r_expX_ftth_p2p.dts" --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp2_ftth_pon.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,13 @@ +#include + +/dts-v1/; +/plugin/; + +/ { + compatible = "freebox,fbxgw7r"; + fragment@0 { + target-path="/"; + __overlay__ { + }; + }; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp2_test_module.dts 2025-09-25 17:40:30.271340965 +0200 @@ -0,0 +1,4 @@ +#define EXP_SLOT exp2 +#define EXP_SPI_FLASH_LABEL "exp2-spi-flash" +#define EXP_SPI_FLASH_CS 0 +#include "fbxgw7r_expX_test_module.dts" --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_expX_ftth_p2p.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,156 @@ +#include + +#include "fbxgw7r_exp_common.dtsi" + +/dts-v1/; +/plugin/; + +/ { + compatible = "freebox,fbxgw7r"; + + fragment@0 { + target = <&EXP_LABEL(ext_i2c)>; + __overlay__ { + #address-cells = <0x1>; + #size-cells = <0x0>; + + // IO expander found only on P2P Fiber + // expansion board. + EXP_LABEL(gpio_extender): EXP_NODE_NAME(gpio_extender)@74 { + compatible = "nxp,pca9539"; + reg = <0x74>; + gpio-controller; + ngpios = <16>; + #gpio-cells = <2>; + gpio-line-names = "wan-sfp-pwren", /* 0 */ + "wan-sfp-pwrgood", /* 1 */ + "wan-sfp-txfault", /* 2 */ + "wan-sfp-txdisable", /* 3 */ + "wan-sfp-presence", /* 4 */ + "wan-sfp-rxlos", /* 5 */ + "wan-sfp-led", /* 6 */ + "wan-sfp-i2cen", /* 7 */ + "redriver-eqb", /* 8 */ + "redriver-fgb", /* 9 */ + "redriver-swb", /* 10 */ + "redriver-eqa", /* 11 */ + "redriver-fga", /* 12 */ + "redriver-swa", /* 13 */ + "redriver-mode", /* 14 */ + "redriver-enable"; /* 15 */ + }; + }; + }; + + fragment@1 { + target-path="/"; + __overlay__ { + EXP_NODE_NAME(ftth-p2p-fbxgpio) { + compatible = "fbx,fbxgpio"; + EXP_NODE_NAME(ftth-p2p-sfp-pwren) { + gpio = <&EXP_LABEL(gpio_extender) 0 0>; + output-low; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + EXP_NODE_NAME(ftth-p2p-sfp-pwrgood) { + gpio = <&EXP_LABEL(gpio_extender) 1 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + EXP_NODE_NAME(ftth-p2p-sfp-txfault) { + gpio = <&EXP_LABEL(gpio_extender) 2 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + EXP_NODE_NAME(ftth-p2p-sfp-txdis) { + gpio = <&EXP_LABEL(gpio_extender) 3 0>; + output-high; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + EXP_NODE_NAME(ftth-p2p-sfp-presence) { + gpio = <&EXP_LABEL(gpio_extender) 4 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + EXP_NODE_NAME(ftth-p2p-sfp-rxlos) { + gpio = <&EXP_LABEL(gpio_extender) 5 0>; + input; +#ifdef USE_PHYLINK_SFP + no-claim; +#endif + }; + EXP_NODE_NAME(ftth-p2p-sfp-link-led) { + gpio = <&EXP_LABEL(gpio_extender) 6 GPIO_ACTIVE_LOW>; + output-low; + }; + EXP_NODE_NAME(ftth-p2p-sfp-i2cen) { + gpio = <&EXP_LABEL(gpio_extender) 7 0>; + /* enable it by default, revisit later */ + output-high; + }; + + EXP_NODE_NAME(ftth-p2p-redriver-eqb) { + gpio = <&EXP_LABEL(gpio_extender) 8 0>; + output-high; + }; + EXP_NODE_NAME(ftth-p2p-redriver-fgb) { + gpio = <&EXP_LABEL(gpio_extender) 9 0>; + output-high; + }; + EXP_NODE_NAME(ftth-p2p-redriver-swb) { + gpio = <&EXP_LABEL(gpio_extender) 10 0>; + output-high; + }; + EXP_NODE_NAME(ftth-p2p-redriver-eqa) { + gpio = <&EXP_LABEL(gpio_extender) 11 0>; + output-high; + }; + EXP_NODE_NAME(ftth-p2p-redriver-fga) { + gpio = <&EXP_LABEL(gpio_extender) 12 0>; + output-high; + }; + EXP_NODE_NAME(ftth-p2p-redriver-swa) { + gpio = <&EXP_LABEL(gpio_extender) 13 0>; + output-high; + }; + EXP_NODE_NAME(ftth-p2p-redriver-mode) { + gpio = <&EXP_LABEL(gpio_extender) 14 0>; + output-low; + }; + EXP_NODE_NAME(ftth-p2p-redriver-en) { + gpio = <&EXP_LABEL(gpio_extender) 15 0>; + output-low; + }; + }; + }; + }; + +#ifdef USE_PHYLINK_SFP + fragment@2 { + target = <&EXP_LABEL(sfp)>; + __overlay__ { + status = "okay"; + compatible = "sff,sfp"; + i2c-bus = <&EXP_LABEL(ext_i2c)>; + maximum-power-milliwatt = <3000>; + los-gpios = <&EXP_LABEL(gpio_extender) 5 GPIO_ACTIVE_HIGH>; + mod-def0-gpios = <&EXP_LABEL(gpio_extender) 4 GPIO_ACTIVE_LOW>; + tx-disable-gpios = <&EXP_LABEL(gpio_extender) 3 GPIO_ACTIVE_HIGH>; + tx-fault-gpios = <&EXP_LABEL(gpio_extender) 2 GPIO_ACTIVE_HIGH>; + pwr-enable-gpios = <&EXP_LABEL(gpio_extender) 0 GPIO_ACTIVE_HIGH>; + }; + }; +#endif + + +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_expX_test_module.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,99 @@ +#include + +#include "fbxgw7r_exp_common.dtsi" + +/dts-v1/; +/plugin/; + +/ { + compatible = "freebox,fbxgw7r"; + + fragment@0 { + target = <&EXP_LABEL(ext_i2c)>; + __overlay__ { + #address-cells = <0x1>; + #size-cells = <0x0>; + + EXP_LABEL(gpio_extender): exp1@74 { + compatible = "nxp,pca9539"; + reg = <0x74>; + gpio-controller; + ngpios = <16>; + #gpio-cells = <2>; + gpio-line-names = "sfp-pwren", /* 0 */ + "sfp-pwrgood", /* 1 */ + "sfp-txfault", /* 2 */ + "sfp-txdisable", /* 3 */ + "sfp-presence", /* 4 */ + "sfp-rxlos", /* 5 */ + "sfp-led", /* 6 */ + "sfp-i2cen", /* 7 */ + "", /* 8 */ + "", /* 9 */ + "", /* 10 */ + "", /* 11 */ + "", /* 12 */ + "", /* 13 */ + "", /* 14 */ + ""; /* 15 */ + }; + }; + }; + + fragment@1 { + target-path="/"; + __overlay__ { + EXP_NODE_NAME(test-module-fbxgpio) { + compatible = "fbx,fbxgpio"; + EXP_NODE_NAME(test-module-sfp-pwren) { + gpio = <&EXP_LABEL(gpio_extender) 0 0>; + output-low; + }; + EXP_NODE_NAME(test-module-sfp-pwrgood) { + gpio = <&EXP_LABEL(gpio_extender) 1 0>; + input; + }; + EXP_NODE_NAME(test-module-sfp-txfault) { + gpio = <&EXP_LABEL(gpio_extender) 2 0>; + input; + }; + EXP_NODE_NAME(test-module-sfp-txdis) { + gpio = <&EXP_LABEL(gpio_extender) 3 0>; + output-high; + }; + EXP_NODE_NAME(test-module-sfp-presence) { + gpio = <&EXP_LABEL(gpio_extender) 4 0>; + input; + }; + EXP_NODE_NAME(test-module-sfp-rxlos) { + gpio = <&EXP_LABEL(gpio_extender) 5 0>; + input; + }; + EXP_NODE_NAME(test-module-sfp-link-led) { + gpio = <&EXP_LABEL(gpio_extender) 6 GPIO_ACTIVE_LOW>; + output-low; + }; + EXP_NODE_NAME(test-module-sfp-i2cen) { + gpio = <&EXP_LABEL(gpio_extender) 7 0>; + /* enable it by default, revisit later */ + output-high; + }; + }; + }; + }; + + fragment@2 { + target = <&cp1_spi1>; + __overlay__ { + #address-cells = <0x1>; + #size-cells = <0x0>; + + EXP_NODE_NAME(flash)@1 { + compatible = "m25p80"; + reg = ; + spi-max-frequency = <(1 * 1000 * 1000)>; + label = EXP_SPI_FLASH_LABEL; + }; + }; + }; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_exp_common.dtsi 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,5 @@ +#define PASTER(x, y) x ## y +#define EVALUATOR(x, y) PASTER(x, y) +#define EXP_LABEL(name) EVALUATOR(EXP_SLOT, EVALUATOR(_, name)) +#define EXP_NODE_NAME(name) EVALUATOR(EXP_SLOT, EVALUATOR(-, name)) +#define ADDRESSIFY(addr) EVALUATOR(0x, addr) --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_pcie_pine_asmedia.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,62 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "freebox,fbxgw7r"; + + fragment@1 { + target = <&cp0_pcie0>; + __overlay__ { + #address-cells = <3>; + #size-cells = <2>; + rc@0,0 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0000 0x0 0x0 0x0 0x0>; + us { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0000 0x0 0x0 0x0 0x0>; + ds1 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x1800 0x0 0x0 0x0 0x0>; + ep_pine5G { + reg = <0x0000 0x0 0x0 0x0 0x0>; + qcom,board_id = <0xa1>; + memory-region = <&qca_pine_5G>; + }; + }; + ds2 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x3800 0x0 0x0 0x0 0x0>; + ep_pine2G4 { + reg = <0x0000 0x0 0x0 0x0 0x0>; + qcom,board_id = <0xa0>; + memory-region = <&qca_pine_2G4>; + }; + }; + }; + }; + }; + }; + + fragment@2 { + target = <&cp1_pcie0>; + __overlay__ { + #address-cells = <3>; + #size-cells = <2>; + rc@0,0 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0000 0x0 0x0 0x0 0x0>; + ep_pine6G { + reg = <0x0000 0x0 0x0 0x0 0x0>; + qcom,board_id = <0xa2>; + memory-region = <&qca_pine_6G>; + }; + }; + }; + }; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/fbxgw7r_pcie_pine_pericom.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,59 @@ +/dts-v1/; +/plugin/; + +/ { + compatible = "freebox,fbxgw7r"; + + fragment@1 { + target = <&cp0_pcie0>; + __overlay__ { + #address-cells = <3>; + #size-cells = <2>; + rc@0,0 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0000 0x0 0x0 0x0 0x0>; + us { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0000 0x0 0x0 0x0 0x0>; + ds1 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0800 0x0 0x0 0x0 0x0>; + ep_pine2G4 { + reg = <0x0000 0x0 0x0 0x0 0x0>; + qcom,board_id = <0xa0>; + }; + }; + ds4 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x2000 0x0 0x0 0x0 0x0>; + ep_pine5G { + reg = <0x0000 0x0 0x0 0x0 0x0>; + qcom,board_id = <0xa1>; + }; + }; + }; + }; + }; + }; + + fragment@2 { + target = <&cp1_pcie0>; + __overlay__ { + #address-cells = <3>; + #size-cells = <2>; + rc@0,0 { + #address-cells = <3>; + #size-cells = <2>; + reg = <0x0000 0x0 0x0 0x0 0x0>; + ep_pine6G { + reg = <0x0000 0x0 0x0 0x0 0x0>; + qcom,board_id = <0xa2>; + }; + }; + }; + }; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/jbxgw7r.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,129 @@ +#include +#include + +#include "armada-8040.dtsi" + +#define USE_PHYLINK_SFP + +#include "fbxgw7r-common.dtsi" + +/ { + model = "Freebox JaguarBox V7R Board"; + compatible = "freebox,jbxgw7r", "marvell,armada8040", + "marvell,armada-ap806-quad", "marvell,armada-ap806"; + + fbx7r-fbxgpio { + pos-sense { + gpio = <&io_expander0 7 0>; + input; + }; + }; +}; + + +&cp0_spi0 { + ssd1327@1 { + compatible = "solomon,ssd1327"; + status = "okay"; + reg = <1>; + spi-max-frequency = <(5 * 1000 * 1000)>; + ssd1327,width = <128>; + ssd1327,height = <128>; + ssd1327,rotate = <270>; + ssd1327,watchdog = <300>; + + ssd1327,data-select-gpio = <&cp1_gpio1 23 GPIO_ACTIVE_HIGH>; + ssd1327,vcc-gpio = <&cp0_gpio2 14 GPIO_ACTIVE_HIGH>; + ssd1327,reset-gpio = <&cp1_gpio1 21 0>; + ssd1327,init-sequence = "p32202"; + }; +}; + + +&cp0_i2c0 { + cap1066@28 { + /* SMSC cap1066 */ + compatible = "smsc,smsc_cap1066"; + reg = <0x28>; + keymap = ; + }; + + led1202@58 { + compatible = "st,led1202"; + reg = <0x58>; + + #address-cells = <1>; + #size-cells = <0>; + + blue@0 { + label = "front-d67-blue"; + reg = <0>; + }; + green@1 { + label = "front-d67-green"; + reg = <1>; + }; + red@2 { + label = "front-d67-red"; + reg = <2>; + }; + }; + + led1202@59 { + compatible = "st,led1202"; + reg = <0x59>; + + #address-cells = <1>; + #size-cells = <0>; + + blue@0 { + label = "rear-d1-red"; + reg = <0>; + }; + green@1 { + label = "rear-d1-green"; + reg = <1>; + }; + red@2 { + label = "rear-d1-blue"; + reg = <2>; + }; + }; +}; + +/* + * Internal port to midplane for "EXP2" expansion connector. Can + * operate in 10GBase-KR. + */ +&cp0_comphy2 { + kr-gen1-s0-amplitude = <0x12>; + kr-gen1-s0-emphasis = <0x8>; + kr-gen1-s2-emphasis = <0x2>; + + kr-ffe-cap-sel = <0xe>; + kr-ffe-res-sel = <0x6>; + kr-dfe-res = <0x1>; + kr-phase-offset = <0x60>; +}; + +/* + * for routing comfort on the midplane, rx & tx lanes polarity is swapped + * on jbxgw7r's expansion 1 backplane serdes. + */ +&cp1_comphy5 { + rx-swap-polarity; + tx-swap-polarity; +}; + + +/* + * CP1 sata is completely unused on jbxgw7r. + */ +&cp1_sata0 { + status = "disabled"; +}; --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/jbxgw7r_exp1_ftth_p2p.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,4 @@ +#define USE_PHYLINK_SFP + +#define EXP_SLOT exp1 +#include "fbxgw7r_expX_ftth_p2p.dts" --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/arch/arm64/boot/dts/marvell/jbxgw7r_exp2_ftth_p2p.dts 2025-09-25 17:40:30.275340984 +0200 @@ -0,0 +1,4 @@ +#define USE_PHYLINK_SFP + +#define EXP_SLOT exp2 +#include "fbxgw7r_expX_ftth_p2p.dts" --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/block/partitions/dt.c 2025-09-25 17:40:31.127345209 +0200 @@ -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 */ + strscpy(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; + strscpy(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_READONLY; + + 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 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/config 2025-09-29 14:39:16.034534589 +0200 @@ -0,0 +1,5077 @@ +# +# Automatically generated file; DO NOT EDIT. +# Linux/arm64 6.13.12 Kernel Configuration +# +CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (freebox) 14.2.0" +CONFIG_CC_IS_GCC=y +CONFIG_GCC_VERSION=140200 +CONFIG_CLANG_VERSION=0 +CONFIG_AS_IS_GNU=y +CONFIG_AS_VERSION=24300 +CONFIG_LD_IS_BFD=y +CONFIG_LD_VERSION=24300 +CONFIG_LLD_VERSION=0 +CONFIG_RUSTC_VERSION=0 +CONFIG_RUSTC_LLVM_VERSION=0 +CONFIG_CC_CAN_LINK=y +CONFIG_CC_CAN_LINK_STATIC=y +CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y +CONFIG_CC_HAS_ASM_GOTO_TIED_OUTPUT=y +CONFIG_TOOLS_SUPPORT_RELR=y +CONFIG_CC_HAS_ASM_INLINE=y +CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y +CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y +CONFIG_PAHOLE_VERSION=0 +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.5-gcc-14.2.0-binutils-2.43-mold-2.33.0-gdb-15.1-1/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_HARDIRQS_SW_RESEND=y +CONFIG_GENERIC_IRQ_CHIP=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_HZ_PERIODIC=y +# CONFIG_NO_HZ_IDLE is not set +# 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=y +CONFIG_BPF_JIT_DEFAULT_ON=y +# 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_RT 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 is not set +# 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_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y +CONFIG_CC_HAS_INT128=y +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_GCC10_NO_ARRAY_BOUNDS=y +CONFIG_CC_NO_ARRAY_BOUNDS=y +CONFIG_GCC_NO_STRINGOP_OVERFLOW=y +CONFIG_CC_NO_STRINGOP_OVERFLOW=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=y +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_SMALL is not set +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_KCMP is not set +# CONFIG_RSEQ is not set +# CONFIG_CACHESTAT_SYSCALL is not set +# CONFIG_PC104 is not set +CONFIG_KALLSYMS=y +# CONFIG_KALLSYMS_SELFTEST is not set +CONFIG_KALLSYMS_ALL=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_GUEST_PERF_EVENTS=y + +# +# 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 + +# +# Kexec and crash features +# +# CONFIG_KEXEC_FILE is not set +# end of Kexec and crash features +# end of General setup + +CONFIG_ARM64=y +CONFIG_RUSTC_SUPPORTS_ARM64=y +CONFIG_GCC_SUPPORTS_DYNAMIC_FTRACE_WITH_ARGS=y +CONFIG_64BIT=y +CONFIG_MMU=y +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=24 +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_SMP=y +CONFIG_KERNEL_MODE_NEON=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_PGTABLE_LEVELS=3 +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_PROC_KCORE_TEXT=y +CONFIG_BUILTIN_RETURN_ADDRESS_STRIPS_PAC=y + +# +# Platform selection +# +# CONFIG_ARCH_ACTIONS is not set +# CONFIG_ARCH_AIROHA 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_CORTINA_ACCESS 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 is not set +CONFIG_ARCH_MVEBU=y +# CONFIG_ARCH_NXP is not set +# CONFIG_ARCH_MA35 is not set +# CONFIG_ARCH_NPCM is not set +# CONFIG_ARCH_PENSANDO 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_STM32 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_AMPERE_ERRATUM_AC03_CPU_38 is not set +# CONFIG_ARM64_ERRATUM_826319 is not set +# CONFIG_ARM64_ERRATUM_827319 is not set +# CONFIG_ARM64_ERRATUM_824069 is not set +# CONFIG_ARM64_ERRATUM_819472 is not set +# CONFIG_ARM64_ERRATUM_832075 is not set +# CONFIG_ARM64_ERRATUM_834220 is not set +# CONFIG_ARM64_ERRATUM_843419 is not set +CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y +CONFIG_ARM64_ERRATUM_1024718=y +# 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_ARM64_ERRATUM_2966298 is not set +# CONFIG_ARM64_ERRATUM_3117295 is not set +# CONFIG_ARM64_ERRATUM_3194386 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_HISILICON_ERRATUM_162100801 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_3568002 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=y +# CONFIG_ARM64_VA_BITS_48 is not set +# CONFIG_ARM64_VA_BITS_52 is not set +CONFIG_ARM64_VA_BITS=39 +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 is not set +# CONFIG_SCHED_CLUSTER is not set +# CONFIG_SCHED_SMT is not set +CONFIG_NR_CPUS=4 +# CONFIG_HOTPLUG_CPU is not set +# CONFIG_NUMA is not set +CONFIG_HZ_100=y +# CONFIG_HZ_250 is not set +# CONFIG_HZ_300 is not set +# CONFIG_HZ_1000 is not set +CONFIG_HZ=100 +CONFIG_SCHED_HRTICK=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_HW_PERF_EVENTS=y +CONFIG_CC_HAVE_SHADOW_CALL_STACK=y +# CONFIG_PARAVIRT is not set +# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set +CONFIG_ARCH_SUPPORTS_KEXEC_FILE=y +CONFIG_ARCH_SUPPORTS_KEXEC_SIG=y +CONFIG_ARCH_SUPPORTS_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_DEFAULT_KEXEC_IMAGE_VERIFY_SIG=y +CONFIG_ARCH_SUPPORTS_CRASH_DUMP=y +CONFIG_ARCH_DEFAULT_CRASH_DUMP=y +# 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 is not set +# CONFIG_COMPAT is not set + +# +# ARMv8.1 architectural features +# +CONFIG_ARM64_HW_AFDBM=y +CONFIG_ARM64_PAN=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 +CONFIG_AS_HAS_LDAPR=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 +# end of ARMv8.5 architectural features + +# +# ARMv8.7 architectural features +# +# CONFIG_ARM64_EPAN is not set +# end of ARMv8.7 architectural features + +CONFIG_AS_HAS_MOPS=y + +# +# ARMv8.9 architectural features +# +# CONFIG_ARM64_POE is not set +CONFIG_ARCH_PKEY_BITS=3 +# CONFIG_ARM64_HAFT is not set +# end of ARMv8.9 architectural features + +# +# v9.4 architectural features +# +# CONFIG_ARM64_GCS is not set +# end of v9.4 architectural features + +# CONFIG_ARM64_SVE is not set +# CONFIG_ARM64_PSEUDO_NMI is not set +# CONFIG_RELOCATABLE is not set +# CONFIG_RANDOMIZE_BASE is not set +CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y +# CONFIG_ARM64_CONTPTE is not set +# end of Kernel Features + +# +# Boot options +# +CONFIG_CMDLINE="console=ttyS0,115200 earlycon=uart8250,mmio32,0xf0512000 maxcpus=4 root=/dev/nfs ip=:::::eth1.41:dhcp memtest=0 dhcpclass=linux-fbxgw7r" +# CONFIG_CMDLINE_FROM_BOOTLOADER is not set +CONFIG_CMDLINE_FORCE=y +# CONFIG_EFI is not set +# CONFIG_COMPRESSED_INSTALL is not set +# end of Boot options + +# +# Power management options +# +# CONFIG_SUSPEND is not set +# CONFIG_PM is not set +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 is not set +# end of CPU Frequency scaling +# end of CPU Power Management + +CONFIG_KVM_COMMON=y +CONFIG_HAVE_KVM_IRQCHIP=y +CONFIG_HAVE_KVM_IRQ_ROUTING=y +CONFIG_HAVE_KVM_DIRTY_RING=y +CONFIG_HAVE_KVM_DIRTY_RING_ACQ_REL=y +CONFIG_NEED_KVM_DIRTY_RING_WITH_BITMAP=y +CONFIG_KVM_MMIO=y +CONFIG_HAVE_KVM_MSI=y +CONFIG_HAVE_KVM_READONLY_MEM=y +CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y +CONFIG_KVM_VFIO=y +CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y +CONFIG_HAVE_KVM_IRQ_BYPASS=y +CONFIG_HAVE_KVM_VCPU_RUN_PID_CHANGE=y +CONFIG_KVM_XFER_TO_GUEST_WORK=y +CONFIG_KVM_GENERIC_HARDWARE_ENABLING=y +CONFIG_KVM_GENERIC_MMU_NOTIFIER=y +CONFIG_VIRTUALIZATION=y +CONFIG_KVM=y +# CONFIG_NVHE_EL2_DEBUG is not set +# CONFIG_PTDUMP_STAGE2_DEBUGFS is not set +CONFIG_CPU_MITIGATIONS=y + +# +# 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_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_RUST=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_SHADOW_CALL_STACK=y +# CONFIG_SHADOW_CALL_STACK 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_ARCH_WANT_PMD_MKWRITE=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_MODULES_USE_ELF_RELA=y +CONFIG_ARCH_WANTS_EXECMEM_LATE=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_HAVE_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_4KB=y +CONFIG_PAGE_SIZE_LESS_THAN_64KB=y +CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SHIFT=12 +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y +CONFIG_CLONE_BACKWARDS=y +# CONFIG_COMPAT_32BIT_TIME is not set +CONFIG_ARCH_SUPPORTS_RT=y +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_ARCH_HAS_MEM_ENCRYPT=y +CONFIG_ARCH_HAS_CC_PLATFORM=y +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 +CONFIG_ARCH_HAS_HW_PTE_YOUNG=y +CONFIG_ARCH_HAS_KERNEL_FPU_SUPPORT=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=y +# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set +CONFIG_FUNCTION_ALIGNMENT_4B=y +CONFIG_FUNCTION_ALIGNMENT=4 +CONFIG_CC_HAS_MIN_FUNCTION_ALIGNMENT=y +CONFIG_CC_HAS_SANE_FUNCTION_ALIGNMENT=y +# end of General architecture-dependent options + +CONFIG_RT_MUTEXES=y +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 is not set +# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set +CONFIG_MODPROBE_PATH="/sbin/modprobe" +CONFIG_TRIM_UNUSED_KSYMS=y +CONFIG_UNUSED_KSYMS_WHITELIST="" +CONFIG_UNUSED_KSYMS_WHITELIST_SYMS="dib7000p_attach" +CONFIG_MODULES_TREE_LOOKUP=y +CONFIG_BLOCK=y +CONFIG_BLOCK_LEGACY_AUTOLOAD=y +# CONFIG_BLK_DEV_BSGLIB is not set +# CONFIG_BLK_DEV_INTEGRITY is not set +CONFIG_BLK_DEV_WRITE_MOUNTED=y +# 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=y +# end of Partition Types + +CONFIG_BLK_MQ_PCI=y +CONFIG_BLOCK_HOLDER_DEPRECATED=y +CONFIG_BLK_MQ_STACKING=y + +# +# IO Schedulers +# +CONFIG_MQ_IOSCHED_DEADLINE=y +CONFIG_MQ_IOSCHED_KYBER=y +# CONFIG_IOSCHED_BFQ is not set +# end of IO Schedulers + +CONFIG_PREEMPT_NOTIFIERS=y +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 + +# +# 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=y +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_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_SLAB_BUCKETS is not set +# CONFIG_SLUB_STATS is not set +CONFIG_SLUB_CPU_PARTIAL=y +# CONFIG_RANDOM_KMALLOC_CACHES is not set +# end of Slab allocator options + +# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set +CONFIG_PSEUDO_ASLR=y +# CONFIG_COMPAT_BRK is not set +CONFIG_SPARSEMEM=y +CONFIG_SPARSEMEM_EXTREME=y +CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y +CONFIG_SPARSEMEM_VMEMMAP=y +CONFIG_HAVE_GUP_FAST=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_EXCLUSIVE_SYSTEM_RAM=y +CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y +CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y +# CONFIG_MEMORY_HOTPLUG is not set +CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y +CONFIG_SPLIT_PTE_PTLOCKS=y +CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y +CONFIG_SPLIT_PMD_PTLOCKS=y +CONFIG_COMPACTION=y +CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 +# CONFIG_PAGE_REPORTING is not set +CONFIG_MIGRATION=y +CONFIG_ARCH_ENABLE_THP_MIGRATION=y +CONFIG_PCP_BATCH_SCALE_MAX=5 +CONFIG_PHYS_ADDR_T_64BIT=y +CONFIG_MMU_NOTIFIER=y +# CONFIG_KSM is not set +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=y +# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set +CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y +# CONFIG_TRANSPARENT_HUGEPAGE_NEVER is not set +# CONFIG_READ_ONLY_THP_FOR_FS is not set +CONFIG_PGTABLE_HAS_HUGE_LEAVES=y +CONFIG_ARCH_SUPPORTS_HUGE_PFNMAP=y +CONFIG_ARCH_SUPPORTS_PMD_PFNMAP=y +# 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=y +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_MEMFD_CREATE=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 +CONFIG_LOCK_MM_AND_FIND_VMA=y +CONFIG_EXECMEM=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 +CONFIG_NET_INGRESS=y +CONFIG_NET_EGRESS=y +CONFIG_NET_XGRESS=y +CONFIG_SKB_EXTENSIONS=y +CONFIG_NET_DEVMEM=y + +# +# Networking options +# +CONFIG_NETSKBPAD=64 +CONFIG_PACKET=y +# CONFIG_PACKET_DIAG is not set +CONFIG_UNIX=y +CONFIG_AF_UNIX_OOB=y +CONFIG_UNIX_ABSTRACT_IGNORE_NETNS=y +# CONFIG_UNIX_DIAG is not set +# CONFIG_TLS is not set +CONFIG_XFRM=y +CONFIG_XFRM_OFFLOAD=y +CONFIG_XFRM_ALGO=y +CONFIG_XFRM_USER=y +CONFIG_XFRM_INTERFACE=y +# CONFIG_XFRM_SUB_POLICY is not set +# CONFIG_XFRM_MIGRATE is not set +# CONFIG_XFRM_STATISTICS is not set +CONFIG_XFRM_AH=y +CONFIG_XFRM_ESP=y +CONFIG_NET_KEY=y +# CONFIG_NET_KEY_MIGRATE 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=y +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=y +CONFIG_INET_ESP=y +# CONFIG_INET_ESP_OFFLOAD is not set +# CONFIG_INET_ESPINTCP is not set +# CONFIG_INET_IPCOMP is not set +CONFIG_INET_TABLE_PERTURB_ORDER=16 +CONFIG_INET_TUNNEL=y +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 is not set +# CONFIG_TCP_CONG_ADVANCED is not set +CONFIG_TCP_CONG_CUBIC=y +CONFIG_DEFAULT_TCP_CONG="cubic" +# CONFIG_TCP_AO is not set +# 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=y +CONFIG_INET6_ESP=y +CONFIG_INET6_ESP_OFFLOAD=y +# CONFIG_INET6_ESPINTCP is not set +# CONFIG_INET6_IPCOMP is not set +# CONFIG_IPV6_MIP6 is not set +# CONFIG_IPV6_ILA is not set +CONFIG_INET6_TUNNEL=y +# CONFIG_IPV6_VTI is not set +CONFIG_IPV6_SIT=y +CONFIG_IPV6_SIT_6RD=y +CONFIG_IPV6_NDISC_NODETYPE=y +CONFIG_IPV6_TUNNEL=y +# CONFIG_IPV6_GRE is not set +CONFIG_IPV6_MULTIPLE_TABLES=y +CONFIG_IPV6_SUBTREES=y +# 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_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=y +# 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 is not set +# 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_GRE=y +CONFIG_NF_CT_PROTO_SCTP=y +# CONFIG_NF_CT_PROTO_UDPLITE is not set +# CONFIG_NF_CONNTRACK_AMANDA is not set +CONFIG_NF_CONNTRACK_FTP=y +CONFIG_NF_CONNTRACK_H323=m +CONFIG_NF_CONNTRACK_IRC=m +# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set +# CONFIG_NF_CONNTRACK_SNMP is not set +CONFIG_NF_CONNTRACK_PPTP=m +# CONFIG_NF_CONNTRACK_SANE is not set +CONFIG_NF_CONNTRACK_SIP=m +CONFIG_NF_CONNTRACK_TFTP=y +CONFIG_NF_CT_NETLINK=y +CONFIG_NF_NAT=y +CONFIG_NF_NAT_FTP=y +CONFIG_NF_NAT_IRC=m +CONFIG_NF_NAT_SIP=m +CONFIG_NF_NAT_TFTP=y +CONFIG_NF_NAT_REDIRECT=y +CONFIG_NF_NAT_MASQUERADE=y +# CONFIG_NF_TABLES is not set +CONFIG_NETFILTER_XTABLES=y + +# +# Xtables combined modules +# +CONFIG_NETFILTER_XT_MARK=y +CONFIG_NETFILTER_XT_CONNMARK=y + +# +# Xtables targets +# +# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +# CONFIG_NETFILTER_XT_TARGET_CHECKSUM is not set +CONFIG_NETFILTER_XT_TARGET_CLASSIFY=y +CONFIG_NETFILTER_XT_TARGET_CONNMARK=y +CONFIG_NETFILTER_XT_TARGET_DSCP=y +# CONFIG_NETFILTER_XT_TARGET_HL 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=y +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=y +# CONFIG_NETFILTER_XT_TARGET_TEE is not set +CONFIG_NETFILTER_XT_TARGET_TPROXY=y +CONFIG_NETFILTER_XT_TARGET_TCPMSS=y +# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP 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=y +CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y +# CONFIG_NETFILTER_XT_MATCH_CPU is not set +CONFIG_NETFILTER_XT_MATCH_DCCP=y +# CONFIG_NETFILTER_XT_MATCH_DEVGROUP is not set +CONFIG_NETFILTER_XT_MATCH_DSCP=y +# 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=y +# CONFIG_NETFILTER_XT_MATCH_L2TP is not set +# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set +CONFIG_NETFILTER_XT_MATCH_LIMIT=y +CONFIG_NETFILTER_XT_MATCH_MAC=y +CONFIG_NETFILTER_XT_MATCH_MARK=y +# 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=y +# CONFIG_NETFILTER_XT_MATCH_POLICY 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=y +# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set +CONFIG_NETFILTER_XT_MATCH_STATE=y +# 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=y +CONFIG_IP_FFN_PROCFS=y +CONFIG_NF_DEFRAG_IPV4=y +CONFIG_IP_NF_IPTABLES_LEGACY=y +# CONFIG_NF_SOCKET_IPV4 is not set +CONFIG_NF_TPROXY_IPV4=y +# 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_NF_NAT_PPTP=m +CONFIG_NF_NAT_H323=m +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_RPFILTER 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=y +# CONFIG_IP_NF_TARGET_NETMAP is not set +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_NF_MANGLE=y +# CONFIG_IP_NF_TARGET_ECN is not set +# CONFIG_IP_NF_TARGET_TTL is not set +# CONFIG_IP_NF_RAW is not set +# CONFIG_IP_NF_ARPTABLES is not set +# CONFIG_IP_NF_ARPFILTER is not set +# end of IP: Netfilter Configuration + +# +# IPv6: Netfilter Configuration +# +CONFIG_IP6_NF_IPTABLES_LEGACY=y +CONFIG_IPV6_FFN=y +CONFIG_IPV6_FFN_PROCFS=y +# CONFIG_NF_SOCKET_IPV6 is not set +CONFIG_NF_TPROXY_IPV6=y +# 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_RPFILTER is not set +# CONFIG_IP6_NF_MATCH_RT is not set +# CONFIG_IP6_NF_MATCH_SRH is not set +# CONFIG_IP6_NF_TARGET_HL 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=y +# CONFIG_IP6_NF_RAW is not set +CONFIG_IP6_NF_NAT=y +CONFIG_IP6_NF_TARGET_MASQUERADE=y +# CONFIG_IP6_NF_TARGET_NPT is not set +# end of IPv6: Netfilter Configuration + +CONFIG_NF_DEFRAG_IPV6=y +# CONFIG_NF_CONNTRACK_BRIDGE is not set +# CONFIG_BRIDGE_NF_EBTABLES_LEGACY is not set +# CONFIG_BRIDGE_NF_EBTABLES 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=y +CONFIG_FBXATM_REMOTE=y +CONFIG_FBXATM_STACK=y +# CONFIG_FBXATM_REMOTE_STUB is not set +CONFIG_FBXATM_REMOTE_DRIVER=y +CONFIG_FBXBRIDGE=y +CONFIG_STP=y +CONFIG_BRIDGE=y +# CONFIG_BRIDGE_STATE_MESSAGES is not set +# 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=y + +# +# Queueing/Scheduling +# +# CONFIG_NET_SCH_HTB is not set +# CONFIG_NET_SCH_HFSC is not set +CONFIG_NET_SCH_PRIO=y +CONFIG_NET_SCH_MULTIQ=y +# CONFIG_NET_SCH_RED is not set +# CONFIG_NET_SCH_SFB is not set +CONFIG_NET_SCH_SFQ=y +# CONFIG_NET_SCH_TEQL is not set +# CONFIG_NET_SCH_TBF is not set +# CONFIG_NET_SCH_CBS is not set +# CONFIG_NET_SCH_ETF is not set +# CONFIG_NET_SCH_TAPRIO is not set +# CONFIG_NET_SCH_GRED is not set +# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_DRR=y +# CONFIG_NET_SCH_MQPRIO is not set +# CONFIG_NET_SCH_SKBPRIO is not set +# CONFIG_NET_SCH_CHOKE is not set +# CONFIG_NET_SCH_QFQ is not set +# CONFIG_NET_SCH_CODEL is not set +CONFIG_NET_SCH_FQ_CODEL=y +# CONFIG_NET_SCH_CAKE is not set +# CONFIG_NET_SCH_FQ is not set +# CONFIG_NET_SCH_HHF is not set +# CONFIG_NET_SCH_PIE is not set +CONFIG_NET_SCH_INGRESS=y +# CONFIG_NET_SCH_PLUG is not set +# CONFIG_NET_SCH_ETS is not set +# CONFIG_NET_SCH_DEFAULT is not set + +# +# Classification +# +CONFIG_NET_CLS=y +# CONFIG_NET_CLS_BASIC is not set +# CONFIG_NET_CLS_ROUTE4 is not set +# CONFIG_NET_CLS_FW is not set +CONFIG_NET_CLS_U32=y +# CONFIG_CLS_U32_PERF is not set +CONFIG_CLS_U32_MARK=y +# CONFIG_NET_CLS_FLOW is not set +# CONFIG_NET_CLS_CGROUP is not set +# CONFIG_NET_CLS_BPF is not set +# CONFIG_NET_CLS_FLOWER is not set +# CONFIG_NET_CLS_MATCHALL is not set +# CONFIG_NET_EMATCH is not set +CONFIG_NET_CLS_ACT=y +CONFIG_NET_ACT_POLICE=y +# CONFIG_NET_ACT_GACT is not set +# CONFIG_NET_ACT_MIRRED is not set +# CONFIG_NET_ACT_SAMPLE is not set +# CONFIG_NET_ACT_NAT is not set +# CONFIG_NET_ACT_PEDIT is not set +# CONFIG_NET_ACT_SIMP is not set +CONFIG_NET_ACT_SKBEDIT=y +# CONFIG_NET_ACT_CSUM is not set +# CONFIG_NET_ACT_MPLS is not set +# CONFIG_NET_ACT_VLAN is not set +# CONFIG_NET_ACT_BPF is not set +# CONFIG_NET_ACT_CONNMARK is not set +# CONFIG_NET_ACT_CTINFO is not set +# CONFIG_NET_ACT_SKBMOD is not set +# CONFIG_NET_ACT_IFE is not set +# CONFIG_NET_ACT_TUNNEL_KEY is not set +# CONFIG_NET_ACT_GATE is not set +# CONFIG_NET_TC_SKB_EXT is not set +CONFIG_NET_SCH_FIFO=y +# 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 is not set +# CONFIG_OPENVSWITCH is not set +CONFIG_VSOCKETS=y +# CONFIG_VSOCKETS_DIAG is not set +# CONFIG_VSOCKETS_LOOPBACK is not set +CONFIG_VIRTIO_VSOCKETS_COMMON=y +# 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=y +# end of Network testing +# end of Networking options + +# CONFIG_HAMRADIO is not set +# CONFIG_CAN is not set +# CONFIG_BT is not set +# 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=y +# 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=y +CONFIG_CFG80211_DFS_CACHE=y +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_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_GENERIC_PCI_IOMAP=y +CONFIG_PCI=y +CONFIG_PCI_DOMAINS=y +CONFIG_PCI_DOMAINS_GENERIC=y +CONFIG_PCI_SYSCALL=y +CONFIG_PCIEPORTBUS=y +# CONFIG_PCIEAER is not set +# CONFIG_PCIEASPM 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_STUB is not set +# CONFIG_PCI_IOV is not set +# CONFIG_PCI_NPEM is not set +# CONFIG_PCI_PRI is not set +# CONFIG_PCI_PASID is not set +# CONFIG_PCIE_TPH is not set +# CONFIG_PCI_DYNAMIC_OF_NODES 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 is not set + +# +# PCI controller drivers +# +# CONFIG_PCI_AARDVARK is not set +# 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_PCI_XGENE is not set +# CONFIG_PCIE_XILINX is not set + +# +# Cadence-based PCIe controllers +# +# CONFIG_PCIE_CADENCE_PLAT_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 is not set +# CONFIG_PCI_HISI is not set +# CONFIG_PCIE_KIRIN is not set +CONFIG_PCIE_ARMADA_8K=y +# CONFIG_PCIE_DW_PLAT_HOST is not set +# end of DesignWare-based PCIe controllers + +# +# Mobiveil-based PCIe controllers +# +# end of Mobiveil-based PCIe controllers + +# +# PLDA-based PCIe controllers +# +# CONFIG_PCIE_MICROCHIP_HOST is not set +# end of PLDA-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_FW_LOADER_PAGED_BUF=y +CONFIG_FW_LOADER_SYSFS=y +CONFIG_EXTRA_FIRMWARE="" +CONFIG_FW_LOADER_USER_HELPER=y +CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y +# CONFIG_FW_LOADER_COMPRESS 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_DEVICES=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_CPU_VULNERABILITIES=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_MOXTET 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 + +# +# Cache Drivers +# +# end of Cache Drivers + +# 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_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_ARM_PSCI_FW=y + +# +# Qualcomm firmware drivers +# +# end of Qualcomm firmware drivers + +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=y +# CONFIG_MTD_TESTS is not set +CONFIG_MTD_ERASE_PRINTK=y + +# +# Partition parsers +# +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_OF_PARTS=y +# CONFIG_MTD_OF_PARTS_IGNORE_RO is not set +# CONFIG_MTD_AFS_PARTS is not set +# CONFIG_MTD_REDBOOT_PARTS is not set +# CONFIG_MTD_FBX6HD_PARTS is not set +# end of Partition parsers + +# +# User Modules And Translation Layers +# +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y + +# +# Note that in some cases UBI block is preferred. See MTD_UBI_BLOCK. +# +# CONFIG_FTL is not set +# CONFIG_NFTL is not set +# CONFIG_INFTL is not set +# CONFIG_RFD_FTL is not set +# CONFIG_SSFDC is not set +# CONFIG_SM_FTL is not set +# CONFIG_MTD_OOPS is not set +# CONFIG_MTD_PARTITIONED_MASTER is not set + +# +# RAM/ROM/Flash chip drivers +# +# CONFIG_MTD_CFI is not set +# CONFIG_MTD_JEDECPROBE is not set +CONFIG_MTD_MAP_BANK_WIDTH_1=y +CONFIG_MTD_MAP_BANK_WIDTH_2=y +CONFIG_MTD_MAP_BANK_WIDTH_4=y +CONFIG_MTD_CFI_I1=y +CONFIG_MTD_CFI_I2=y +# CONFIG_MTD_RAM is not set +# CONFIG_MTD_ROM is not set +# CONFIG_MTD_ABSENT is not set +# end of RAM/ROM/Flash chip drivers + +# +# Mapping drivers for chip access +# +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +# CONFIG_MTD_PLATRAM is not set +# end of Mapping drivers for chip access + +# +# Self-contained MTD device drivers +# +# CONFIG_MTD_PMC551 is not set +# CONFIG_MTD_DATAFLASH is not set +# CONFIG_MTD_MCHP23K256 is not set +# CONFIG_MTD_MCHP48L640 is not set +# CONFIG_MTD_SST25L is not set +# CONFIG_MTD_SLRAM is not set +# CONFIG_MTD_PHRAM is not set +# CONFIG_MTD_MTDRAM is not set +# CONFIG_MTD_BLOCK2MTD is not set + +# +# Disk-On-Chip Device Drivers +# +# CONFIG_MTD_DOCG3 is not set +# end of Self-contained MTD device drivers + +# +# NAND +# +# CONFIG_MTD_ONENAND is not set +# CONFIG_MTD_RAW_NAND is not set +# CONFIG_MTD_SPI_NAND is not set + +# +# ECC engine support +# +# CONFIG_MTD_NAND_ECC_SW_HAMMING is not set +# CONFIG_MTD_NAND_ECC_SW_BCH is not set +# CONFIG_MTD_NAND_ECC_MXIC is not set +# end of ECC engine support +# end of NAND + +# +# LPDDR & LPDDR2 PCM memory drivers +# +# CONFIG_MTD_LPDDR is not set +# end of LPDDR & LPDDR2 PCM memory drivers + +CONFIG_MTD_SPI_NOR=y +# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +# CONFIG_MTD_SPI_NOR_SWP_DISABLE is not set +CONFIG_MTD_SPI_NOR_SWP_DISABLE_ON_VOLATILE=y +# CONFIG_MTD_SPI_NOR_SWP_KEEP is not set +# CONFIG_MTD_UBI is not set +# CONFIG_MTD_HYPERBUS 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=y +CONFIG_BLK_DEV_LOOP_MIN_COUNT=8 +# 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_AD525X_DPOT is not set +# CONFIG_DUMMY_IRQ is not set +# CONFIG_PHANTOM is not set +# CONFIG_RPMB 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_LATTICE_ECP3_CONFIG is not set +# CONFIG_SRAM is not set +# CONFIG_DW_XDATA_PCIE is not set +# CONFIG_PCI_ENDPOINT_TEST is not set +# CONFIG_XILINX_SDFEC is not set +# CONFIG_OPEN_DICE is not set +# CONFIG_VCPU_STALL_DETECTOR is not set +# CONFIG_MCHP_LAN966X_PCI is not set +# CONFIG_DGASP is not set +# CONFIG_C2PORT is not set + +# +# EEPROM support +# +CONFIG_EEPROM_AT24=m +# CONFIG_EEPROM_AT25 is not set +# CONFIG_EEPROM_MAX6875 is not set +# CONFIG_EEPROM_93CX6 is not set +# CONFIG_EEPROM_93XX46 is not set +# CONFIG_EEPROM_IDT_89HPESX is not set +# CONFIG_EEPROM_EE1004 is not set +CONFIG_EEPROM_EE1004_RAW=y +# end of EEPROM support + +# CONFIG_CB710_CORE is not set +# CONFIG_SENSORS_LIS3_SPI is not set +# 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 +# CONFIG_KEBA_CP500 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=y +# 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=y + +# +# 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 is not set +# CONFIG_SCSI_DH is not set +# end of SCSI device support + +CONFIG_ATA=y +CONFIG_SATA_HOST=y +CONFIG_ATA_VERBOSE_ERROR=y +# CONFIG_ATA_FORCE is not set +CONFIG_SATA_PMP=y + +# +# Controllers with non-SFF native interface +# +# CONFIG_SATA_AHCI is not set +# CONFIG_SATA_AHCI_PLATFORM is not set +# CONFIG_AHCI_DWC is not set +# CONFIG_AHCI_CEVA is not set +CONFIG_AHCI_MVEBU=m +# CONFIG_SATA_INIC162X is not set +# CONFIG_SATA_ACARD_AHCI is not set +# CONFIG_SATA_SIL24 is not set +# CONFIG_ATA_SFF is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=y +# CONFIG_MD_AUTODETECT is not set +# CONFIG_MD_BITMAP_FILE is not set +# CONFIG_MD_LINEAR is not set +CONFIG_MD_RAID0=y +CONFIG_MD_RAID1=y +CONFIG_MD_RAID10=y +CONFIG_MD_RAID456=y +# CONFIG_BCACHE is not set +CONFIG_BLK_DEV_DM_BUILTIN=y +CONFIG_BLK_DEV_DM=y +# CONFIG_DM_DEBUG is not set +# CONFIG_DM_UNSTRIPED is not set +CONFIG_DM_CRYPT=y +# CONFIG_DM_SNAPSHOT is not set +# CONFIG_DM_THIN_PROVISIONING is not set +# CONFIG_DM_CACHE is not set +# CONFIG_DM_WRITECACHE is not set +# CONFIG_DM_EBS is not set +# CONFIG_DM_ERA is not set +# CONFIG_DM_CLONE is not set +# CONFIG_DM_MIRROR is not set +# CONFIG_DM_RAID is not set +# CONFIG_DM_ZERO is not set +# CONFIG_DM_MULTIPATH is not set +# CONFIG_DM_DELAY is not set +# CONFIG_DM_DUST is not set +# CONFIG_DM_INIT is not set +# CONFIG_DM_UEVENT is not set +# CONFIG_DM_FLAKEY is not set +# CONFIG_DM_VERITY is not set +# CONFIG_DM_SWITCH is not set +# CONFIG_DM_LOG_WRITES is not set +# CONFIG_DM_INTEGRITY is not set +# CONFIG_DM_AUDIT is not set +# CONFIG_DM_VDO 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 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_PFCP 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_VSOCKMON 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_ADI is not set +# CONFIG_NET_VENDOR_LITEX is not set +CONFIG_NET_VENDOR_MARVELL=y +CONFIG_MVMDIO=y +# CONFIG_MVNETA is not set +CONFIG_MVPP2=y +CONFIG_MVPP2_FBX_FF=y +# CONFIG_SKGE is not set +# CONFIG_SKY2 is not set +# CONFIG_OCTEONTX2_AF is not set +# CONFIG_OCTEONTX2_PF is not set +# CONFIG_OCTEON_EP is not set +# CONFIG_OCTEON_EP_VF is not set +# CONFIG_NET_VENDOR_MELLANOX is not set +# CONFIG_NET_VENDOR_META 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_OA_TC6 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 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=y + +# +# MII PHY device drivers +# +# CONFIG_AIR_EN8811H_PHY is not set +# CONFIG_AMD_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_88Q2XXX_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_QCA83XX_PHY is not set +# CONFIG_QCA808X_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 is not set +# 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_DP83TG720_PHY is not set +# CONFIG_VITESSE_PHY is not set +# CONFIG_XILINX_GMII2RGMII is not set +# CONFIG_MICREL_KS8995MA 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_I2C=y +# 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_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 is not set +# end of PCS device drivers + +CONFIG_PPP=y +# CONFIG_PPP_BSDCOMP is not set +# CONFIG_PPP_DEFLATE is not set +# CONFIG_PPP_FILTER is not set +CONFIG_PPP_MPPE=y +# CONFIG_PPP_MULTILINK is not set +CONFIG_PPPOE=y +# CONFIG_PPPOE_HASH_BITS_1 is not set +# CONFIG_PPPOE_HASH_BITS_2 is not set +CONFIG_PPPOE_HASH_BITS_4=y +# CONFIG_PPPOE_HASH_BITS_8 is not set +CONFIG_PPPOE_HASH_BITS=4 +CONFIG_PPTP=y +# CONFIG_PPP_ASYNC is not set +# CONFIG_PPP_SYNC_TTY is not set +# CONFIG_SLIP is not set +CONFIG_SLHC=y +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 is not set +# CONFIG_USB_LAN78XX is not set +CONFIG_USB_USBNET=y +# CONFIG_USB_NET_AX8817X is not set +# CONFIG_USB_NET_AX88179_178A is not set +CONFIG_USB_NET_CDCETHER=y +# CONFIG_USB_NET_CDC_EEM is not set +# CONFIG_USB_NET_CDC_NCM is not set +# CONFIG_USB_NET_HUAWEI_CDC_NCM is not set +# CONFIG_USB_NET_CDC_MBIM is not set +# CONFIG_USB_NET_DM9601 is not set +# CONFIG_USB_NET_SR9700 is not set +# CONFIG_USB_NET_SR9800 is not set +# CONFIG_USB_NET_SMSC75XX is not set +# CONFIG_USB_NET_SMSC95XX is not set +# CONFIG_USB_NET_GL620A is not set +# CONFIG_USB_NET_NET1080 is not set +# CONFIG_USB_NET_PLUSB is not set +# CONFIG_USB_NET_MCS7830 is not set +# CONFIG_USB_NET_RNDIS_HOST is not set +# CONFIG_USB_NET_CDC_SUBSET is not set +# CONFIG_USB_NET_ZAURUS is not set +# CONFIG_USB_NET_CX82310_ETH is not set +# CONFIG_USB_NET_KALMIA is not set +# CONFIG_USB_NET_QMI_WWAN is not set +# CONFIG_USB_NET_INT51X1 is not set +# CONFIG_USB_IPHETH is not set +# CONFIG_USB_SIERRA_NET is not set +# CONFIG_USB_VL600 is not set +# CONFIG_USB_NET_CH9200 is not set +# CONFIG_USB_NET_AQC111 is not set +CONFIG_USB_RTL8153_ECM=y +CONFIG_WLAN=y +# CONFIG_WLAN_VENDOR_ADMTEK is not set +CONFIG_ATH_COMMON=y +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=y +# CONFIG_ATH5K is not set +# CONFIG_ATH5K_PCI is not set +# CONFIG_ATH9K is not set +# CONFIG_ATH9K_HTC 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=y +CONFIG_ATH10K_DEBUGFS=y +CONFIG_ATH10K_LEDS=y +# CONFIG_ATH10K_SPECTRAL is not set +CONFIG_ATH10K_DFS_CERTIFIED=y +# CONFIG_WCN36XX is not set +CONFIG_ATH11K=y +CONFIG_ATH11K_PCI=m +CONFIG_ATH11K_DEBUG=y +CONFIG_ATH11K_DEBUGFS=y +# CONFIG_ATH11K_SPECTRAL is not set +# CONFIG_ATH11K_SMALL_DP_RINGS is not set +# CONFIG_ATH11K_QCN9074_FIXED_MEM_REGION is not set +# CONFIG_ATH12K is not set +# CONFIG_WLAN_VENDOR_ATMEL is not set +# CONFIG_WLAN_VENDOR_BROADCOM is not set +# CONFIG_WLAN_VENDOR_INTEL is not set +# CONFIG_WLAN_VENDOR_INTERSIL is not set +CONFIG_WLAN_VENDOR_MARVELL=y +# CONFIG_LIBERTAS is not set +# CONFIG_LIBERTAS_THINFIRM is not set +# CONFIG_MWIFIEX is not set +# CONFIG_MWL8K is not set +CONFIG_MWL8K_NEW=m +# 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_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 is not set +# 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 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=y +# CONFIG_INPUT_AD714X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set +# CONFIG_INPUT_BMA150 is not set +# CONFIG_INPUT_E3X0_BUTTON is not set +# CONFIG_INPUT_MMA8450 is not set +# CONFIG_INPUT_GPIO_BEEPER is not set +# CONFIG_INPUT_GPIO_DECODER is not set +# CONFIG_INPUT_GPIO_VIBRA is not set +# CONFIG_INPUT_ATI_REMOTE2 is not set +# CONFIG_INPUT_KEYSPAN_REMOTE is not set +# CONFIG_INPUT_KXTJ9 is not set +# CONFIG_INPUT_POWERMATE is not set +# CONFIG_INPUT_YEALINK is not set +# CONFIG_INPUT_CM109 is not set +# CONFIG_INPUT_UINPUT is not set +# CONFIG_INPUT_PCF8574 is not set +# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set +# CONFIG_INPUT_DA7280_HAPTICS is not set +# CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_IMS_PCU is not set +# CONFIG_INPUT_IQS269A is not set +# CONFIG_INPUT_IQS626A is not set +# CONFIG_INPUT_IQS7222 is not set +# CONFIG_INPUT_CMA3000 is not set +# CONFIG_INPUT_DRV260X_HAPTICS is not set +# CONFIG_INPUT_DRV2665_HAPTICS is not set +# CONFIG_INPUT_DRV2667_HAPTICS is not set +CONFIG_INPUT_SMSC_CAP1066=y +# 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_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=y + +# +# Serial drivers +# +CONFIG_SERIAL_EARLYCON=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y +# CONFIG_SERIAL_8250_16550A_VARIANTS is not set +# CONFIG_SERIAL_8250_FINTEK is not set +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_PCI is not set +# CONFIG_SERIAL_8250_EXAR is not set +CONFIG_SERIAL_8250_NR_UARTS=6 +CONFIG_SERIAL_8250_RUNTIME_UARTS=6 +# CONFIG_SERIAL_8250_EXTENDED is not set +# CONFIG_SERIAL_8250_PCI1XXXX is not set +CONFIG_SERIAL_8250_DWLIB=y +CONFIG_SERIAL_8250_FSL=y +CONFIG_SERIAL_8250_DW=y +# CONFIG_SERIAL_8250_RT288X is not set +# CONFIG_SERIAL_8250_PERICOM is not set +CONFIG_SERIAL_OF_PLATFORM=y + +# +# 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_MAX3100 is not set +# CONFIG_SERIAL_MAX310X is not set +# 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 +# CONFIG_SERIAL_MVEBU_UART is not set +# end of Serial drivers + +CONFIG_SERIAL_MCTRL_GPIO=y +# 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 is not set +# 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_OMAP=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_HW_RANDOM_CLP800 is not set +# CONFIG_APPLICOM is not set +# CONFIG_DEVMEM is not set +# CONFIG_DEVPHYSMEM is not set +# CONFIG_DEVPORT is not set +# 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_CHARDEV=y +CONFIG_I2C_MUX=y + +# +# Multiplexer I2C Chip support +# +# CONFIG_I2C_ARB_GPIO_CHALLENGE is not set +CONFIG_I2C_MUX_GPIO=y +# CONFIG_I2C_MUX_GPMUX is not set +# CONFIG_I2C_MUX_LTC4306 is not set +# CONFIG_I2C_MUX_PCA9541 is not set +# CONFIG_I2C_MUX_PCA954x is not set +# CONFIG_I2C_MUX_PINCTRL is not set +# CONFIG_I2C_MUX_REG is not set +# CONFIG_I2C_DEMUX_PINCTRL is not set +# CONFIG_I2C_MUX_MLXCPLD is not set +# end of Multiplexer I2C Chip support + +CONFIG_I2C_HELPER_AUTO=y +CONFIG_I2C_ALGOBIT=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_CORE is not set +# CONFIG_I2C_EMEV2 is not set +CONFIG_I2C_GPIO=y +# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set +# CONFIG_I2C_HISI is not set +CONFIG_I2C_MV64XXX=y +# CONFIG_I2C_NOMADIK is not set +# CONFIG_I2C_OCORES is not set +# CONFIG_I2C_PCA_PLATFORM is not set +# CONFIG_I2C_PXA 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=y +# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y + +# +# SPI Master Controller Drivers +# +# CONFIG_SPI_ALTERA is not set +# CONFIG_SPI_ARMADA_3700 is not set +# CONFIG_SPI_AXI_SPI_ENGINE is not set +# CONFIG_SPI_BITBANG is not set +# CONFIG_SPI_CADENCE is not set +# CONFIG_SPI_CADENCE_QUADSPI is not set +# CONFIG_SPI_CADENCE_XSPI is not set +# CONFIG_SPI_CH341 is not set +# CONFIG_SPI_DESIGNWARE is not set +# CONFIG_SPI_GPIO is not set +# CONFIG_SPI_FSL_SPI is not set +# CONFIG_SPI_MICROCHIP_CORE is not set +# CONFIG_SPI_MICROCHIP_CORE_QSPI is not set +# CONFIG_SPI_OC_TINY is not set +CONFIG_SPI_ORION=y +# CONFIG_SPI_PCI1XXXX is not set +# CONFIG_SPI_PL022 is not set +# CONFIG_SPI_SC18IS602 is not set +# CONFIG_SPI_SIFIVE is not set +# CONFIG_SPI_SN_F_OSPI is not set +# CONFIG_SPI_MXIC is not set +# CONFIG_SPI_THUNDERX is not set +# CONFIG_SPI_XCOMM is not set +# CONFIG_SPI_XILINX is not set +# CONFIG_SPI_ZYNQMP_GQSPI is not set +# CONFIG_SPI_AMD is not set + +# +# SPI Multiplexer support +# +# CONFIG_SPI_MUX is not set + +# +# SPI Protocol Masters +# +# CONFIG_SPI_SPIDEV is not set +# CONFIG_SPI_LOOPBACK_TEST is not set +# CONFIG_SPI_TLE62X0 is not set +# CONFIG_SPI_SLAVE is not set +CONFIG_SPI_DYNAMIC=y +# CONFIG_SPMI is not set +# CONFIG_HSI is not set +# CONFIG_PPS is not set + +# +# PTP clock support +# +# CONFIG_PTP_1588_CLOCK is not set +CONFIG_PTP_1588_CLOCK_OPTIONAL=y + +# +# Enable PHYLIB and NETWORK_PHY_TIMESTAMPING to see the additional clocks. +# +# 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_AW9523 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_MVEBU=y +CONFIG_PINCTRL_ARMADA_AP806=y +CONFIG_PINCTRL_ARMADA_CP110=y +CONFIG_PINCTRL_AC5=y +CONFIG_PINCTRL_ARMADA_37XX=y + +# +# Renesas pinctrl drivers +# +# end of Renesas pinctrl drivers + +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_FASTPATH_LIMIT=512 +CONFIG_OF_GPIO=y +CONFIG_GPIOLIB_IRQCHIP=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_MVEBU=y +# CONFIG_GPIO_PL061 is not set +# CONFIG_GPIO_POLARFIRE_SOC 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_DS4520 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=y +# CONFIG_GPIO_PCA953X_IRQ 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 + +# +# SPI GPIO expanders +# +# CONFIG_GPIO_74X164 is not set +# CONFIG_GPIO_MAX3191X is not set +# CONFIG_GPIO_MAX7301 is not set +# CONFIG_GPIO_MC33880 is not set +# CONFIG_GPIO_PISOSR is not set +# CONFIG_GPIO_XRA1403 is not set +# end of SPI GPIO expanders + +# +# USB GPIO expanders +# +# CONFIG_GPIO_MPSSE is not set +# 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 +# CONFIG_GPIOLIB_NONEXCLUSIVE_TEST is not set +# end of Virtual GPIO drivers + +# +# GPIO Debugging utilities +# +# CONFIG_GPIO_VIRTUSER is not set +# end of GPIO Debugging utilities + +CONFIG_FREEBOX_GPIO=y +CONFIG_FREEBOX_GPIO_DT=y +CONFIG_FREEBOX_JTAG=m +# CONFIG_W1 is not set +CONFIG_POWER_RESET=y +# CONFIG_POWER_RESET_GPIO is not set +# CONFIG_POWER_RESET_GPIO_RESTART is not set +# CONFIG_POWER_RESET_LINKSTATION is not set +# CONFIG_POWER_RESET_LTC2952 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_RESET_SYSCON_REASON is not set +# CONFIG_POWER_SEQUENCING 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_MANAGER_SBS is not set +# CONFIG_BATTERY_BQ27XXX is not set +# CONFIG_BATTERY_MAX17042 is not set +# CONFIG_BATTERY_MAX1720X is not set +# CONFIG_CHARGER_MAX8903 is not set +# CONFIG_CHARGER_LP8727 is not set +# CONFIG_CHARGER_GPIO 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_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_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_BD99954 is not set +# CONFIG_BATTERY_UG3105 is not set +# CONFIG_FUEL_GAUGE_MM8013 is not set +CONFIG_HWMON=y +CONFIG_HWMON_VID=y +# CONFIG_HWMON_DEBUG_CHIP is not set + +# +# Native drivers +# +# CONFIG_SENSORS_AD7314 is not set +# CONFIG_SENSORS_AD7414 is not set +# CONFIG_SENSORS_AD7418 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_ADT7310 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=y +# 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_PERICOM_PCIE is not set +# CONFIG_SENSORS_ATXP1 is not set +# CONFIG_SENSORS_CHIPCAP2 is not set +# CONFIG_SENSORS_DRIVETEMP 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_HS3001 is not set +# CONFIG_SENSORS_ISL28022 is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_JC42 is not set +# CONFIG_SENSORS_POWERZ 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_LTC2947_SPI is not set +# CONFIG_SENSORS_LTC2990 is not set +# CONFIG_SENSORS_LTC2991 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_LTC4282 is not set +# CONFIG_SENSORS_MAX1111 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_MAX31722 is not set +# CONFIG_SENSORS_MAX31730 is not set +# CONFIG_SENSORS_MAX31760 is not set +# CONFIG_MAX31827 is not set +# CONFIG_SENSORS_MAX6620 is not set +# CONFIG_SENSORS_MAX6621 is not set +# CONFIG_SENSORS_MAX6639 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_ADCXX is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM70 is not set +# CONFIG_SENSORS_LM73 is not set +# CONFIG_SENSORS_LM75 is not set +# 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_NCT7363 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_PT5161L 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_ADC128D818 is not set +# CONFIG_SENSORS_ADS7828 is not set +# CONFIG_SENSORS_ADS7871 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_SPD5118 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=m +CONFIG_SENSORS_AP806=y +CONFIG_THERMAL=y +# CONFIG_THERMAL_NETLINK is not set +# CONFIG_THERMAL_STATISTICS is not set +# CONFIG_THERMAL_DEBUGFS is not set +# CONFIG_THERMAL_CORE_TESTING is not set +CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 +# CONFIG_THERMAL_HWMON is not set +# CONFIG_THERMAL_OF 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_PCIE_THERMAL is not set +# CONFIG_THERMAL_EMULATION is not set +# CONFIG_THERMAL_MMIO is not set +# CONFIG_ARMADA_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=y +# 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_XILINX_WINDOW_WATCHDOG is not set +# CONFIG_ZIIRAVE_WATCHDOG is not set +# CONFIG_ARM_SP805_WATCHDOG is not set +CONFIG_ARM_SBSA_WATCHDOG=m +# CONFIG_ARMADA_37XX_WATCHDOG is not set +# CONFIG_CADENCE_WATCHDOG is not set +# CONFIG_DW_WATCHDOG is not set +# CONFIG_MAX63XX_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_ADP5585 is not set +# 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_CS42L43_I2C is not set +# CONFIG_MFD_MADERA is not set +# CONFIG_MFD_MAX5970 is not set +# CONFIG_PMIC_DA903X is not set +# CONFIG_MFD_DA9052_SPI 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_SPI 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_88PM886_PMIC is not set +# CONFIG_MFD_MAX14577 is not set +# CONFIG_MFD_MAX77541 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_OCELOT is not set +# CONFIG_EZX_PCAP is not set +# CONFIG_MFD_CPCAP 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_RK8XX_I2C is not set +# CONFIG_MFD_RK8XX_SPI 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_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_MFD_TPS65912_SPI is not set +# CONFIG_MFD_TPS6594_I2C is not set +# CONFIG_MFD_TPS6594_SPI 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_ARIZONA_SPI is not set +# CONFIG_MFD_WM8400 is not set +# CONFIG_MFD_WM831X_I2C is not set +# CONFIG_MFD_WM831X_SPI 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_ROHM_BD96801 is not set +# CONFIG_MFD_STPMIC1 is not set +# CONFIG_MFD_STMFX is not set +# CONFIG_MFD_FBXGWR_PMU is not set +CONFIG_MFD_FBXGW7R_PANEL=y +# CONFIG_MFD_ATC260X_I2C is not set +# CONFIG_MFD_QCOM_PM8008 is not set +# CONFIG_MFD_CS40L50_I2C is not set +# CONFIG_MFD_CS40L50_SPI is not set +# CONFIG_MFD_INTEL_M10_BMC_SPI is not set +# CONFIG_MFD_RSMU_I2C is not set +# CONFIG_MFD_RSMU_SPI is not set +# end of Multifunction device drivers + +# CONFIG_REGULATOR is not set +CONFIG_RC_CORE=y +# CONFIG_LIRC is not set +# CONFIG_RC_MAP is not set +# CONFIG_RC_DECODERS is not set +# CONFIG_RC_DEVICES is not set + +# +# CEC support +# +# CONFIG_MEDIA_CEC_SUPPORT is not set +# end of CEC support + +CONFIG_MEDIA_SUPPORT=y +# CONFIG_MEDIA_SUPPORT_FILTER is not set +# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set + +# +# Media device types +# +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_ANALOG_TV_SUPPORT=y +CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y +CONFIG_MEDIA_RADIO_SUPPORT=y +CONFIG_MEDIA_SDR_SUPPORT=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y +CONFIG_MEDIA_TEST_SUPPORT=y +# end of Media device types + +# +# Media core support +# +# CONFIG_VIDEO_DEV is not set +# CONFIG_MEDIA_CONTROLLER is not set +CONFIG_DVB_CORE=y +# end of Media core support + +# +# Digital TV options +# +# CONFIG_DVB_NET is not set +CONFIG_DVB_MAX_ADAPTERS=8 +# CONFIG_DVB_DYNAMIC_MINORS is not set +# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set +# CONFIG_DVB_ULE_DEBUG is not set +# end of Digital TV options + +# +# Media drivers +# + +# +# Media drivers +# +CONFIG_MEDIA_USB_SUPPORT=y + +# +# Webcam devices +# + +# +# Analog TV USB devices +# + +# +# Analog/digital TV USB devices +# + +# +# Digital TV USB devices +# +# CONFIG_DVB_AS102 is not set +# CONFIG_DVB_B2C2_FLEXCOP_USB is not set +CONFIG_DVB_USB_V2=y +# CONFIG_DVB_USB_AF9015 is not set +CONFIG_DVB_USB_AF9035=m +# CONFIG_DVB_USB_ANYSEE is not set +# CONFIG_DVB_USB_AU6610 is not set +# CONFIG_DVB_USB_AZ6007 is not set +# CONFIG_DVB_USB_CE6230 is not set +# CONFIG_DVB_USB_DVBSKY is not set +# CONFIG_DVB_USB_EC168 is not set +# CONFIG_DVB_USB_GL861 is not set +# CONFIG_DVB_USB_LME2510 is not set +# CONFIG_DVB_USB_MXL111SF is not set +# CONFIG_DVB_USB_RTL28XXU is not set +# CONFIG_DVB_USB_ZD1301 is not set +CONFIG_DVB_USB=y +# CONFIG_DVB_USB_DEBUG is not set +# CONFIG_DVB_USB_A800 is not set +# CONFIG_DVB_USB_AF9005 is not set +# CONFIG_DVB_USB_AZ6027 is not set +# CONFIG_DVB_USB_CINERGY_T2 is not set +# CONFIG_DVB_USB_CXUSB is not set +CONFIG_DVB_USB_DIB0700=m +# CONFIG_DVB_USB_DIBUSB_MB is not set +# CONFIG_DVB_USB_DIBUSB_MC is not set +# CONFIG_DVB_USB_DIGITV is not set +# CONFIG_DVB_USB_DTT200U is not set +# CONFIG_DVB_USB_DTV5100 is not set +# CONFIG_DVB_USB_DW2102 is not set +# CONFIG_DVB_USB_GP8PSK is not set +# CONFIG_DVB_USB_M920X is not set +# CONFIG_DVB_USB_NOVA_T_USB2 is not set +# CONFIG_DVB_USB_OPERA1 is not set +# CONFIG_DVB_USB_PCTV452E is not set +# CONFIG_DVB_USB_TECHNISAT_USB2 is not set +# CONFIG_DVB_USB_TTUSB2 is not set +# CONFIG_DVB_USB_UMT_010 is not set +# CONFIG_DVB_USB_VP702X is not set +# CONFIG_DVB_USB_VP7045 is not set +# CONFIG_SMS_USB_DRV is not set +# CONFIG_DVB_TTUSB_BUDGET is not set +# CONFIG_DVB_TTUSB_DEC is not set + +# +# Webcam, TV (analog/digital) USB devices +# + +# +# Software defined radio USB devices +# +# CONFIG_MEDIA_PCI_SUPPORT is not set +# CONFIG_MEDIA_PLATFORM_DRIVERS is not set + +# +# MMC/SDIO DVB adapters +# +# CONFIG_SMS_SDIO_DRV is not set +# CONFIG_DVB_TEST_DRIVERS is not set +CONFIG_CYPRESS_FIRMWARE=y +# end of Media drivers + +# +# Media ancillary drivers +# +CONFIG_MEDIA_ATTACH=y +CONFIG_MEDIA_TUNER=y + +# +# Customize TV tuners +# +# CONFIG_MEDIA_TUNER_FC0011 is not set +# CONFIG_MEDIA_TUNER_FC0012 is not set +# CONFIG_MEDIA_TUNER_FC0013 is not set +CONFIG_MEDIA_TUNER_IT913X=m +# CONFIG_MEDIA_TUNER_M88RS6000T is not set +# CONFIG_MEDIA_TUNER_MAX2165 is not set +# CONFIG_MEDIA_TUNER_MC44S803 is not set +# CONFIG_MEDIA_TUNER_MT2060 is not set +# CONFIG_MEDIA_TUNER_MT2063 is not set +# CONFIG_MEDIA_TUNER_MT20XX is not set +# CONFIG_MEDIA_TUNER_MT2131 is not set +# CONFIG_MEDIA_TUNER_MT2266 is not set +# CONFIG_MEDIA_TUNER_MXL301RF is not set +# CONFIG_MEDIA_TUNER_MXL5005S is not set +# CONFIG_MEDIA_TUNER_MXL5007T is not set +# CONFIG_MEDIA_TUNER_QM1D1B0004 is not set +# CONFIG_MEDIA_TUNER_QM1D1C0042 is not set +# CONFIG_MEDIA_TUNER_QT1010 is not set +# CONFIG_MEDIA_TUNER_R820T is not set +# CONFIG_MEDIA_TUNER_SI2157 is not set +# CONFIG_MEDIA_TUNER_SIMPLE is not set +# CONFIG_MEDIA_TUNER_TDA18212 is not set +# CONFIG_MEDIA_TUNER_TDA18218 is not set +# CONFIG_MEDIA_TUNER_TDA18250 is not set +# CONFIG_MEDIA_TUNER_TDA18271 is not set +# CONFIG_MEDIA_TUNER_TDA827X is not set +# CONFIG_MEDIA_TUNER_TDA8290 is not set +# CONFIG_MEDIA_TUNER_TDA9887 is not set +# CONFIG_MEDIA_TUNER_TEA5761 is not set +# CONFIG_MEDIA_TUNER_TEA5767 is not set +# CONFIG_MEDIA_TUNER_TUA9001 is not set +# CONFIG_MEDIA_TUNER_XC2028 is not set +# CONFIG_MEDIA_TUNER_XC4000 is not set +# CONFIG_MEDIA_TUNER_XC5000 is not set +# end of Customize TV tuners + +# +# Customise DVB Frontends +# + +# +# Multistandard (satellite) frontends +# +# CONFIG_DVB_M88DS3103 is not set +# CONFIG_DVB_MXL5XX is not set +# CONFIG_DVB_STB0899 is not set +# CONFIG_DVB_STB6100 is not set +# CONFIG_DVB_STV090x is not set +# CONFIG_DVB_STV0910 is not set +# CONFIG_DVB_STV6110x is not set +# CONFIG_DVB_STV6111 is not set + +# +# Multistandard (cable + terrestrial) frontends +# +# CONFIG_DVB_DRXK is not set +# CONFIG_DVB_MN88472 is not set +# CONFIG_DVB_MN88473 is not set +# CONFIG_DVB_SI2165 is not set +# CONFIG_DVB_TDA18271C2DD is not set + +# +# DVB-S (satellite) frontends +# +# CONFIG_DVB_CX24110 is not set +# CONFIG_DVB_CX24116 is not set +# CONFIG_DVB_CX24117 is not set +# CONFIG_DVB_CX24120 is not set +# CONFIG_DVB_CX24123 is not set +# CONFIG_DVB_DS3000 is not set +# CONFIG_DVB_MB86A16 is not set +# CONFIG_DVB_MT312 is not set +# CONFIG_DVB_S5H1420 is not set +# CONFIG_DVB_SI21XX is not set +# CONFIG_DVB_STB6000 is not set +# CONFIG_DVB_STV0288 is not set +# CONFIG_DVB_STV0299 is not set +# CONFIG_DVB_STV0900 is not set +# CONFIG_DVB_STV6110 is not set +# CONFIG_DVB_TDA10071 is not set +# CONFIG_DVB_TDA10086 is not set +# CONFIG_DVB_TDA8083 is not set +# CONFIG_DVB_TDA8261 is not set +# CONFIG_DVB_TDA826X is not set +# CONFIG_DVB_TS2020 is not set +# CONFIG_DVB_TUA6100 is not set +# CONFIG_DVB_TUNER_CX24113 is not set +# CONFIG_DVB_TUNER_ITD1000 is not set +# CONFIG_DVB_VES1X93 is not set +# CONFIG_DVB_ZL10036 is not set +# CONFIG_DVB_ZL10039 is not set + +# +# DVB-T (terrestrial) frontends +# +# CONFIG_DVB_AF9013 is not set +# CONFIG_DVB_CX22700 is not set +# CONFIG_DVB_CX22702 is not set +# CONFIG_DVB_CXD2820R is not set +# CONFIG_DVB_CXD2841ER is not set +# CONFIG_DVB_DIB3000MB is not set +# CONFIG_DVB_DIB3000MC is not set +CONFIG_DVB_DIB7000M=m +CONFIG_DVB_DIB7000P=m +# CONFIG_DVB_DIB9000 is not set +# CONFIG_DVB_DRXD is not set +# CONFIG_DVB_EC100 is not set +# CONFIG_DVB_L64781 is not set +# CONFIG_DVB_MT352 is not set +# CONFIG_DVB_NXT6000 is not set +# CONFIG_DVB_RTL2830 is not set +# CONFIG_DVB_RTL2832 is not set +# CONFIG_DVB_S5H1432 is not set +# CONFIG_DVB_SI2168 is not set +# CONFIG_DVB_SP887X is not set +# CONFIG_DVB_STV0367 is not set +# CONFIG_DVB_TDA10048 is not set +# CONFIG_DVB_TDA1004X is not set +# CONFIG_DVB_ZD1301_DEMOD is not set +# CONFIG_DVB_ZL10353 is not set +# CONFIG_DVB_CXD2880 is not set + +# +# DVB-C (cable) frontends +# +# CONFIG_DVB_STV0297 is not set +# CONFIG_DVB_TDA10021 is not set +# CONFIG_DVB_TDA10023 is not set +# CONFIG_DVB_VES1820 is not set + +# +# ATSC (North American/Korean Terrestrial/Cable DTV) frontends +# +# CONFIG_DVB_AU8522_DTV is not set +# CONFIG_DVB_BCM3510 is not set +# CONFIG_DVB_LG2160 is not set +# CONFIG_DVB_LGDT3305 is not set +# CONFIG_DVB_LGDT3306A is not set +# CONFIG_DVB_LGDT330X is not set +# CONFIG_DVB_MXL692 is not set +# CONFIG_DVB_NXT200X is not set +# CONFIG_DVB_OR51132 is not set +# CONFIG_DVB_OR51211 is not set +# CONFIG_DVB_S5H1409 is not set +# CONFIG_DVB_S5H1411 is not set + +# +# ISDB-T (terrestrial) frontends +# +# CONFIG_DVB_DIB8000 is not set +# CONFIG_DVB_MB86A20S is not set +# CONFIG_DVB_S921 is not set + +# +# ISDB-S (satellite) & ISDB-T (terrestrial) frontends +# +# CONFIG_DVB_MN88443X is not set +# CONFIG_DVB_TC90522 is not set + +# +# Digital terrestrial only tuners/PLL +# +# CONFIG_DVB_PLL is not set +CONFIG_DVB_TUNER_DIB0070=m +# CONFIG_DVB_TUNER_DIB0090 is not set + +# +# SEC control devices for DVB-S +# +# CONFIG_DVB_A8293 is not set +CONFIG_DVB_AF9033=m +# CONFIG_DVB_ASCOT2E is not set +# CONFIG_DVB_ATBM8830 is not set +# CONFIG_DVB_HELENE is not set +# CONFIG_DVB_HORUS3A is not set +# CONFIG_DVB_ISL6405 is not set +# CONFIG_DVB_ISL6421 is not set +# CONFIG_DVB_ISL6423 is not set +# CONFIG_DVB_IX2505V is not set +# CONFIG_DVB_LGS8GL5 is not set +# CONFIG_DVB_LGS8GXX is not set +# CONFIG_DVB_LNBH25 is not set +# CONFIG_DVB_LNBH29 is not set +# CONFIG_DVB_LNBP21 is not set +# CONFIG_DVB_LNBP22 is not set +# CONFIG_DVB_M88RS2000 is not set +# CONFIG_DVB_TDA665x is not set +# CONFIG_DVB_DRX39XYJ is not set + +# +# Common Interface (EN50221) controller drivers +# +# CONFIG_DVB_CXD2099 is not set +# CONFIG_DVB_SP2 is not set +# end of Customise DVB Frontends + +# +# Tools to develop new frontends +# +# CONFIG_DVB_DUMMY_FE is not set +# end of Media ancillary drivers + +# +# Graphics support +# +CONFIG_VIDEO=y +# CONFIG_AUXDISPLAY is not set +# CONFIG_DRM is not set + +# +# Frame buffer Devices +# +CONFIG_FB=y +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_OPENCORES is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_I740 is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON is not set +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_S3 is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_VT8623 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_ARK is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_CARMINE is not set +# CONFIG_FB_SMSCUFX is not set +# CONFIG_FB_UDL is not set +# CONFIG_FB_IBM_GXT4500 is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +# CONFIG_FB_MB862XX is not set +# CONFIG_FB_SIMPLE is not set +# CONFIG_FB_SSD1307 is not set +# CONFIG_FB_SM712 is not set +# CONFIG_FB_SSD1320 is not set +CONFIG_FB_SSD1327=y +CONFIG_FB_CORE=y +CONFIG_FB_NOTIFY=y +# CONFIG_FIRMWARE_EDID is not set +CONFIG_FB_DEVICE=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +# CONFIG_FB_FOREIGN_ENDIAN is not set +CONFIG_FB_SYSMEM_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_FB_SYSMEM_HELPERS=y +CONFIG_FB_SYSMEM_HELPERS_DEFERRED=y +CONFIG_FB_BACKLIGHT=y +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set +# end of Frame buffer Devices + +# +# Backlight & LCD device support +# +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_KTD253 is not set +# CONFIG_BACKLIGHT_KTD2801 is not set +# CONFIG_BACKLIGHT_KTZ8866 is not set +# CONFIG_BACKLIGHT_QCOM_WLED is not set +# CONFIG_BACKLIGHT_ADP8860 is not set +# CONFIG_BACKLIGHT_ADP8870 is not set +# CONFIG_BACKLIGHT_LM3509 is not set +# CONFIG_BACKLIGHT_LM3639 is not set +# CONFIG_BACKLIGHT_GPIO is not set +# CONFIG_BACKLIGHT_LV5207LP is not set +# CONFIG_BACKLIGHT_BD6107 is not set +# CONFIG_BACKLIGHT_ARCXCNN is not set +# CONFIG_BACKLIGHT_LED 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 +# CONFIG_FRAMEBUFFER_CONSOLE is not set +# end of Console display driver support + +# CONFIG_LOGO is not set +# end of Graphics support + +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +# CONFIG_SND_OSSEMUL is not set +CONFIG_SND_PCM_TIMER=y +# CONFIG_SND_HRTIMER is not set +# CONFIG_SND_DYNAMIC_MINORS is not set +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +# CONFIG_SND_CTL_FAST_LOOKUP is not set +# CONFIG_SND_DEBUG is not set +# CONFIG_SND_CTL_INPUT_VALIDATION is not set +# CONFIG_SND_UTIMER is not set +# CONFIG_SND_SEQUENCER is not set +CONFIG_SND_DRIVERS=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_ALOOP is not set +# CONFIG_SND_PCMTEST is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set +# CONFIG_SND_PCI is not set + +# +# HD-Audio +# +# end of HD-Audio + +CONFIG_SND_HDA_PREALLOC_SIZE=64 +# CONFIG_SND_SPI is not set +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=y +# CONFIG_SND_USB_AUDIO_MIDI_V2 is not set +# CONFIG_SND_USB_UA101 is not set +# CONFIG_SND_USB_CAIAQ is not set +# CONFIG_SND_USB_6FIRE is not set +# CONFIG_SND_USB_HIFACE is not set +# CONFIG_SND_BCD2000 is not set +# CONFIG_SND_USB_POD is not set +# CONFIG_SND_USB_PODHD is not set +# CONFIG_SND_USB_TONEPORT is not set +# CONFIG_SND_USB_VARIAX is not set +# CONFIG_SND_SOC is not set +# CONFIG_HID_SUPPORT 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=y + +# +# 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_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_DEFAULT_AUTHORIZATION_MODE=1 +# CONFIG_USB_MON is not set + +# +# USB Host Controller Drivers +# +# CONFIG_USB_C67X00_HCD is not set +CONFIG_USB_XHCI_HCD=m +# CONFIG_USB_XHCI_DBGCAP is not set +CONFIG_USB_XHCI_PLATFORM=m +CONFIG_USB_XHCI_MVEBU=m +# CONFIG_USB_EHCI_HCD is not set +# CONFIG_USB_OXU210HP_HCD is not set +# CONFIG_USB_ISP116X_HCD is not set +# CONFIG_USB_MAX3421_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=y +CONFIG_USB_PRINTER=y +# 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 is not set + +# +# 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 is not set +# 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_DEV 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 is not set +CONFIG_MMC=y +# CONFIG_PWRSEQ_EMMC is not set +# CONFIG_PWRSEQ_SIMPLE is not set +CONFIG_MMC_BLOCK=y +CONFIG_MMC_BLOCK_MINORS=8 +CONFIG_MMC_BLOCK_IGNORE_RO_AREA=y +# 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=y +# CONFIG_MMC_SDHCI_PCI is not set +CONFIG_MMC_SDHCI_PLTFM=y +# CONFIG_MMC_SDHCI_OF_ARASAN is not set +# CONFIG_MMC_SDHCI_OF_AT91 is not set +# CONFIG_MMC_SDHCI_OF_DWCMSHC is not set +# CONFIG_MMC_SDHCI_CADENCE is not set +# CONFIG_MMC_SDHCI_PXAV3 is not set +# CONFIG_MMC_SDHCI_F_SDH30 is not set +# CONFIG_MMC_SDHCI_MILBEAUT is not set +# CONFIG_MMC_TIFM_SD is not set +# CONFIG_MMC_SPI 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_MMC_SDHCI_XENON=y +# 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_AW200XX is not set +# CONFIG_LEDS_AW2013 is not set +# CONFIG_LEDS_BCM6328 is not set +# CONFIG_LEDS_BCM6358 is not set +# CONFIG_LEDS_CR0014114 is not set +# CONFIG_LEDS_EL15203000 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_LP8860 is not set +# CONFIG_LEDS_PCA955X is not set +# CONFIG_LEDS_PCA963X is not set +# CONFIG_LEDS_PCA995X is not set +# CONFIG_LEDS_DAC124S085 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 is not set + +# +# 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_SPI_BYTE is not set +# CONFIG_LEDS_LM3697 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_DISK is not set +# CONFIG_LEDS_TRIGGER_MTD 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_GPIO is not set +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set + +# +# 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 is not set +# CONFIG_LEDS_TRIGGER_TTY is not set +# CONFIG_LEDS_TRIGGER_INPUT_EVENTS is not set + +# +# Simple LED drivers +# +# CONFIG_ACCESSIBILITY is not set +# CONFIG_INFINIBAND is not set +CONFIG_EDAC_SUPPORT=y +CONFIG_EDAC=y +CONFIG_EDAC_LEGACY_SYSFS=y +# CONFIG_EDAC_DEBUG is not set +# CONFIG_EDAC_THUNDERX is not set +# CONFIG_EDAC_XGENE is not set +# CONFIG_EDAC_DMC520 is not set +# CONFIG_RTC_CLASS 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_UIO is not set +# CONFIG_VFIO is not set +CONFIG_IRQ_BYPASS_MANAGER=y +# CONFIG_VIRT_DRIVERS is not set +# CONFIG_VIRTIO_MENU is not set +# CONFIG_VDPA is not set +CONFIG_VHOST_IOTLB=y +CONFIG_VHOST_TASK=y +CONFIG_VHOST=y +CONFIG_VHOST_MENU=y +CONFIG_VHOST_NET=y +CONFIG_VHOST_VSOCK=y +# CONFIG_VHOST_CROSS_ENDIAN_LEGACY 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_CZNIC_PLATFORMS is not set +# CONFIG_MELLANOX_PLATFORM is not set +# CONFIG_SURFACE_PLATFORMS is not set +# CONFIG_ARM64_PLATFORM_DEVICES is not set +CONFIG_FBXGW7R_PLATFORM=y +CONFIG_FBXGW7R_SWITCH=y +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_LMK04832 is not set +# CONFIG_COMMON_CLK_MAX9485 is not set +# 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=y +# CONFIG_COMMON_CLK_RS9_PCIE is not set +# CONFIG_COMMON_CLK_SI521XX is not set +# CONFIG_COMMON_CLK_VC3 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 +CONFIG_ARMADA_AP_CP_HELPER=y +CONFIG_ARMADA_37XX_CLK=y +CONFIG_ARMADA_AP806_SYSCON=y +CONFIG_ARMADA_CP110_SYSCON=y +# 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 +# CONFIG_ARM_TIMER_SP804 is not set +# end of Clock Source drivers + +# CONFIG_MAILBOX is not set +# CONFIG_IOMMU_SUPPORT is not set + +# +# Remoteproc drivers +# +# CONFIG_REMOTEPROC is not set +# end of Remoteproc drivers + +# +# Rpmsg drivers +# +# CONFIG_RPMSG_VIRTIO is not set +# end of Rpmsg drivers + +# +# SOC (System On Chip) specific Drivers +# + +# +# Amlogic SoC drivers +# +# end of Amlogic SoC drivers + +# +# Broadcom SoC drivers +# +# end of Broadcom SoC drivers + +# +# NXP/Freescale QorIQ SoC drivers +# +# CONFIG_QUICC_ENGINE 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=y +# CONFIG_QCOM_LICENSE_MANAGER_SIMPLE is not set +# 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 + +# +# PM Domains +# + +# +# Amlogic PM Domains +# +# end of Amlogic PM Domains + +# +# Broadcom PM Domains +# +# end of Broadcom PM Domains + +# +# i.MX PM Domains +# +# end of i.MX PM Domains + +# +# Qualcomm PM Domains +# +# end of Qualcomm PM Domains +# end of PM Domains + +# CONFIG_PM_DEVFREQ is not set +# CONFIG_EXTCON 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_IRQ_MSI_LIB=y +# CONFIG_AL_FIC is not set +# CONFIG_XILINX_INTC is not set +CONFIG_MVEBU_GICP=y +CONFIG_MVEBU_ICU=y +CONFIG_MVEBU_ODMI=y +CONFIG_MVEBU_PIC=y +CONFIG_MVEBU_SEI=y +CONFIG_PARTITION_PERCPU=y +# end of IRQ chip support + +# CONFIG_IPACK_BUS is not set +CONFIG_RESET_CONTROLLER=y +# CONFIG_RESET_GPIO 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_PHY_CAN_TRANSCEIVER is not set +# CONFIG_PHY_NXP_PTN3222 is not set +# CONFIG_XDSL_PHY_API 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_MVEBU_A3700_COMPHY is not set +# CONFIG_PHY_MVEBU_A3700_UTMI is not set +# CONFIG_PHY_MVEBU_A38X_COMPHY is not set +CONFIG_PHY_MVEBU_CP110_COMPHY=y +# CONFIG_PHY_MVEBU_CP110_UTMI is not set +# CONFIG_PHY_PXA_28NM_HSIC is not set +# CONFIG_PHY_PXA_28NM_USB2 is not set +CONFIG_PHY_UTMI_CP110=y +# 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_NI is not set +CONFIG_ARM_PMU=y +# CONFIG_ARM_SMMU_V3_PMU is not set +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_DWC_PCIE_PMU is not set +# CONFIG_ARM_CORESIGHT_PMU_ARCH_SYSTEM_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=y +# CONFIG_DEV_DAX is not set +CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=y +CONFIG_NVMEM_LAYOUTS=y + +# +# Layout Types +# +# CONFIG_NVMEM_LAYOUT_SL28_VPD is not set +# CONFIG_NVMEM_LAYOUT_ONIE_TLV is not set +# CONFIG_NVMEM_LAYOUT_U_BOOT_ENV is not set +# end of Layout Types + +# CONFIG_NVMEM_IGNORE_RO is not set +# CONFIG_NVMEM_RMEM is not set +# CONFIG_NVMEM_IOMAP is not set +# CONFIG_NVMEM_U_BOOT_ENV 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_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_BUFFER_HEAD=y +CONFIG_LEGACY_DIRECT_IO=y +CONFIG_EXT2_FS=y +# CONFIG_EXT2_FS_XATTR is not set +CONFIG_EXT3_FS=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_EXT4_FS=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_JFS_FS is not set +CONFIG_XFS_FS=y +# CONFIG_XFS_SUPPORT_V4 is not set +CONFIG_XFS_SUPPORT_ASCII_CI=y +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_RT is not set +# CONFIG_XFS_ONLINE_SCRUB is not set +# CONFIG_XFS_WARN is not set +# CONFIG_XFS_DEBUG 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_BCACHEFS_FS is not set +CONFIG_FS_POSIX_ACL=y +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_FANOTIFY_ACCESS_PERMISSIONS is not set +# CONFIG_QUOTA is not set +# CONFIG_AUTOFS_FS is not set +CONFIG_FUSE_FS=y +# CONFIG_CUSE is not set +# CONFIG_VIRTIO_FS is not set +# CONFIG_FUSE_PASSTHROUGH is not set +# CONFIG_OVERLAY_FS is not set + +# +# Caches +# +# 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=y +CONFIG_VFAT_FS=y +CONFIG_FAT_DEFAULT_CODEPAGE=850 +CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" +# CONFIG_FAT_DEFAULT_UTF8 is not set +# CONFIG_EXFAT_FS is not set +CONFIG_NTFS3_FS=y +# CONFIG_NTFS3_64BIT_CLUSTER is not set +# CONFIG_NTFS3_LZX_XPRESS is not set +# CONFIG_NTFS3_FS_POSIX_ACL is not set +CONFIG_NTFS_FS=y +CONFIG_EXFAT_FS_FBX=y +# 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_TMPFS_QUOTA is not set +CONFIG_ARCH_SUPPORTS_HUGETLBFS=y +# CONFIG_HUGETLBFS is not set +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=y +CONFIG_HFSPLUS_FS=y +# CONFIG_BEFS_FS is not set +# CONFIG_BFS_FS is not set +# CONFIG_EFS_FS is not set +# CONFIG_JFFS2_FS is not set +CONFIG_CRAMFS=y +CONFIG_CRAMFS_BLOCKDEV=y +# CONFIG_CRAMFS_MTD is not set +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 is not set +# 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_COMPRESS is not set +# 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=y +CONFIG_NFS_V3=y +# CONFIG_NFS_V3_ACL is not set +# CONFIG_NFS_V4 is not set +CONFIG_ROOT_NFS=y +# CONFIG_NFS_FSCACHE is not set +# CONFIG_NFS_DISABLE_UDP_SUPPORT is not set +CONFIG_NFSD=y +# CONFIG_NFSD_V2 is not set +# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V4=y +# CONFIG_NFSD_BLOCKLAYOUT is not set +# CONFIG_NFSD_SCSILAYOUT is not set +# CONFIG_NFSD_FLEXFILELAYOUT is not set +# CONFIG_NFSD_LEGACY_CLIENT_TRACKING is not set +CONFIG_GRACE_PERIOD=y +CONFIG_LOCKD=y +CONFIG_LOCKD_V4=y +CONFIG_NFS_COMMON=y +# CONFIG_NFS_LOCALIO is not set +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y +# CONFIG_SUNRPC_DEBUG is not set +# CONFIG_CEPH_FS is not set +# CONFIG_CIFS is not set +CONFIG_SMB_SERVER=y +CONFIG_SMB_INSECURE_SERVER=y +CONFIG_SMB_SERVER_CHECK_CAP_NET_ADMIN=y +# CONFIG_SMB_SERVER_KERBEROS5 is not set +CONFIG_SMBFS=y +# 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=y +# 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=y +# 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=y +CONFIG_NLS_UCS2_UTILS=y +# 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_PROC_MEM_ALWAYS_FORCE=y +# CONFIG_PROC_MEM_FORCE_PTRACE is not set +# CONFIG_PROC_MEM_NO_FORCE is not set +# CONFIG_SECURITY is not set +# CONFIG_SECURITYFS is not set +# 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="lockdown,yama,loadpin,safesetid,integrity" + +# +# Kernel hardening options +# + +# +# Memory initialization +# +CONFIG_CC_HAS_AUTO_VAR_INIT_PATTERN=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO_BARE=y +CONFIG_CC_HAS_AUTO_VAR_INIT_ZERO=y +CONFIG_INIT_STACK_NONE=y +# CONFIG_INIT_STACK_ALL_PATTERN is not set +# CONFIG_INIT_STACK_ALL_ZERO is not set +# CONFIG_GCC_PLUGIN_STACKLEAK is not set +# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set +# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set +CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y +# CONFIG_ZERO_CALL_USED_REGS is not set +# end of Memory initialization + +# +# Hardening of kernel data structures +# +CONFIG_LIST_HARDENED=y +# CONFIG_BUG_ON_DATA_CORRUPTION is not set +# end of Hardening of kernel data structures + +CONFIG_RANDSTRUCT_NONE=y +# CONFIG_RANDSTRUCT_FULL is not set +# CONFIG_RANDSTRUCT_PERFORMANCE is not set +# end of Kernel hardening options +# end of Security options + +CONFIG_XOR_BLOCKS=y +CONFIG_ASYNC_CORE=y +CONFIG_ASYNC_MEMCPY=y +CONFIG_ASYNC_XOR=y +CONFIG_ASYNC_PQ=y +CONFIG_ASYNC_RAID6_RECOV=y +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_SIG=y +CONFIG_CRYPTO_SIG2=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=y +CONFIG_CRYPTO_AUTHENC=y +# 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_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=y +# 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=y +CONFIG_CRYPTO_CBC=y +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_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=y +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_GENIV=y +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_ECHAINIV=y +CONFIG_CRYPTO_ESSIV=y +# 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=y +CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MICHAEL_MIC=y +CONFIG_CRYPTO_POLY1305=y +# CONFIG_CRYPTO_RMD160 is not set +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CRYPTO_SHA3=y +# 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=y +# CONFIG_CRYPTO_842 is not set +# CONFIG_CRYPTO_LZ4 is not set +# CONFIG_CRYPTO_LZ4HC is not set +# CONFIG_CRYPTO_ZSTD is not set +# end of Compression + +# +# Random number generation +# +# CONFIG_CRYPTO_ANSI_CPRNG is not set +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 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKS=64 +CONFIG_CRYPTO_JITTERENTROPY_MEMORY_BLOCKSIZE=32 +CONFIG_CRYPTO_JITTERENTROPY_OSR=1 +# 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=y +CONFIG_CRYPTO_AES_ARM64_CE=y +CONFIG_CRYPTO_AES_ARM64_CE_BLK=y +CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y +# 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=y +# 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_RAID6_PQ=y +# CONFIG_RAID6_PQ_BENCHMARK is not set +# 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_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_DES=y +CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9 +CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=y +CONFIG_CRYPTO_LIB_POLY1305_GENERIC=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_AUDIT_GENERIC=y +CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y +# CONFIG_RANDOM32_SELFTEST is not set +CONFIG_ZLIB_INFLATE=y +CONFIG_ZLIB_DEFLATE=y +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_XZ_DEC=y +# CONFIG_XZ_DEC_X86 is not set +# CONFIG_XZ_DEC_POWERPC is not set +CONFIG_XZ_DEC_ARM=y +CONFIG_XZ_DEC_ARMTHUMB=y +# CONFIG_XZ_DEC_ARM64 is not set +# CONFIG_XZ_DEC_SPARC is not set +# CONFIG_XZ_DEC_RISCV 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_INTERVAL_TREE=y +CONFIG_XARRAY_MULTI=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_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y +CONFIG_SWIOTLB=y +# CONFIG_SWIOTLB_DYNAMIC is not set +CONFIG_DMA_BOUNCE_UNALIGNED_KMALLOC=y +CONFIG_DMA_NEED_SYNC=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_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_VDSO_GETRANDOM=y +CONFIG_SG_POOL=y +CONFIG_ARCH_STACKWALK=y +CONFIG_STACKDEPOT=y +CONFIG_STACKDEPOT_ALWAYS_INIT=y +CONFIG_STACKDEPOT_MAX_FRAMES=64 +CONFIG_SBITMAP=y +# CONFIG_LWQ_TEST is not set +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_ULEB128=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=y +# CONFIG_UBSAN is not set +CONFIG_HAVE_ARCH_KCSAN=y +CONFIG_HAVE_KCSAN_COMPILER=y +# CONFIG_KCSAN is not set +# 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 +# CONFIG_DEBUG_NET_SMALL_RTNL 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_TABLE_CHECK 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 is not set +# 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 is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_PER_CPU_MAPS is not set +# CONFIG_MEM_ALLOC_PROFILING 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_KASAN_SW_TAGS=y +CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y +# CONFIG_KASAN is not set +CONFIG_HAVE_ARCH_KFENCE=y +# CONFIG_KFENCE is not set +# end of Memory Debugging + +CONFIG_DEBUG_SHIRQ=y + +# +# Debug Oops, Lockups and Hangs +# +# CONFIG_PANIC_ON_OOPS is not set +CONFIG_PANIC_ON_OOPS_VALUE=0 +CONFIG_PANIC_TIMEOUT=10 +# CONFIG_SOFTLOCKUP_DETECTOR is not set +CONFIG_HAVE_HARDLOCKUP_DETECTOR_BUDDY=y +# CONFIG_HARDLOCKUP_DETECTOR is not set +CONFIG_DETECT_HUNG_TASK=y +CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120 +CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y +# CONFIG_WQ_WATCHDOG is not set +# CONFIG_WQ_CPU_INTENSIVE_REPORT 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_SCHED_INFO=y +# CONFIG_SCHEDSTATS is not set +# end of Scheduler Debugging + +# +# 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_DEBUG_MAPLE_TREE is not set +# end of Debug kernel data structures + +# +# 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_LATENCYTOP is not set +CONFIG_USER_STACKTRACE_SUPPORT=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_GRAPH_RETVAL=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_HAVE_SAMPLE_FTRACE_DIRECT=y +CONFIG_HAVE_SAMPLE_FTRACE_DIRECT_MULTI=y + +# +# 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_KCOV is not set +# 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.13.12-fbx/drivers/char/diag./Kconfig linux-6.13.12-fbx/drivers/char/diag/Kconfig --- linux-6.13.12-fbx/drivers/char/diag./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/char/diag/Kconfig 2025-09-25 17:40:31.347346300 +0200 @@ -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.13.12-fbx/drivers/char/diag./Makefile linux-6.13.12-fbx/drivers/char/diag/Makefile --- linux-6.13.12-fbx/drivers/char/diag./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/char/diag/Makefile 2025-09-25 17:40:31.347346300 +0200 @@ -0,0 +1,21 @@ +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 + +EXTRA_CFLAGS += -Wno-missing-prototypes -Wno-missing-declarations + +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.13.12-fbx/drivers/clk/cortina./Kconfig linux-6.13.12-fbx/drivers/clk/cortina/Kconfig --- linux-6.13.12-fbx/drivers/clk/cortina./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/clk/cortina/Kconfig 2025-09-25 17:40:31.383346479 +0200 @@ -0,0 +1,3 @@ +config CLK_CORTINA_VENUS + default ARCH_CORTINA_VENUS + bool diff -Nruw linux-6.13.12-fbx/drivers/clk/cortina./Makefile linux-6.13.12-fbx/drivers/clk/cortina/Makefile --- linux-6.13.12-fbx/drivers/clk/cortina./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/clk/cortina/Makefile 2025-09-25 17:40:31.387346499 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_CLK_CORTINA_VENUS) += clk-ca8289.o clk-mmc-phase.o diff -Nruw linux-6.13.12-fbx/drivers/fbxgpio./Kconfig linux-6.13.12-fbx/drivers/fbxgpio/Kconfig --- linux-6.13.12-fbx/drivers/fbxgpio./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxgpio/Kconfig 2025-09-25 17:40:31.611347609 +0200 @@ -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.13.12-fbx/drivers/fbxgpio./Makefile linux-6.13.12-fbx/drivers/fbxgpio/Makefile --- linux-6.13.12-fbx/drivers/fbxgpio./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxgpio/Makefile 2025-09-25 17:40:31.611347609 +0200 @@ -0,0 +1,2 @@ +obj-$(CONFIG_FREEBOX_GPIO) += fbxgpio_core.o +obj-$(CONFIG_FREEBOX_GPIO_DT) += fbxgpio_dt.o diff -Nruw linux-6.13.12-fbx/drivers/fbxgpio./fbxgpio_core.c linux-6.13.12-fbx/drivers/fbxgpio/fbxgpio_core.c --- linux-6.13.12-fbx/drivers/fbxgpio./fbxgpio_core.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxgpio/fbxgpio_core.c 2025-09-25 17:40:31.611347609 +0200 @@ -0,0 +1,336 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PFX "fbxgpio_core: " + +/* #define DEBUG */ +#ifdef DEBUG +#define dprint(Fmt, Arg...) printk(PFX Fmt, Arg) +#else +#define dprint(Fmt, Arg...) do { } while (0) +#endif + +static struct class *fbxgpio_class; + +/* + * retrieval of a struct fbxgpio_pin from a phandle in the device + * tree. + * + * can be removed when fbxjtag uses standard gpio library instead of + * fbxgpio + */ +struct fbxgpio_of_mach_data { + struct fbxgpio_pin *match; + struct device_node *np; +}; + +static int match_fbxgpio_of_node(struct device *dev, void *data) +{ + struct fbxgpio_of_mach_data *md = data; + struct fbxgpio_pin *pin = dev_get_drvdata(dev); + + if (pin->of_node == md->np) { + md->match = pin; + return 1; + } + return 0; +} + +struct fbxgpio_pin *fbxgpio_of_get(struct device_node *np, const char *propname, + int index) +{ + struct fbxgpio_of_mach_data md; + + /* + * get the pin device_node. + */ + md.match = NULL; + md.np = of_parse_phandle(np, propname, index); + if (!md.np) + return ERR_PTR(-ENOENT); + + /* + * find the struct fbxgpio_pin behind that device_node. + */ + class_for_each_device(fbxgpio_class, NULL, &md, + match_fbxgpio_of_node); + + return md.match ? md.match : ERR_PTR(-ENOENT); +} +EXPORT_SYMBOL(fbxgpio_of_get); + +/* + * can be removed when fbxjtag uses standard gpio library instead of + * fbxgpio + */ +int fbxgpio_set_data_out(struct fbxgpio_pin *p, int val) +{ + struct gpio_desc *desc; + + p->cur_dataout = val; + + if (p->use_desc) { + desc = p->request_desc(p); + if (IS_ERR(desc)) + return PTR_ERR(desc); + gpiod_set_value_cansleep(desc, val); + p->release_desc(p); + } else { + if (p->flags & FBXGPIO_PIN_REVERSE_POL) + val = 1 - val; + gpio_set_value_cansleep(p->pin_num, val); + } + return 0; +} + +EXPORT_SYMBOL(fbxgpio_set_data_out); + +/* + * can be removed when fbxjtag uses standard gpio library instead of + * fbxgpio + */ +int fbxgpio_get_data_in(struct fbxgpio_pin *p) +{ + const struct gpio_desc *desc; + int val; + + if (p->use_desc) { + desc = p->request_desc(p); + if (IS_ERR(desc)) + return PTR_ERR(desc); + + val = gpiod_get_value_cansleep(desc); + p->release_desc(p); + } else { + val = gpio_get_value_cansleep(p->pin_num); + if (p->flags & FBXGPIO_PIN_REVERSE_POL) + val = 1 - val; + } + + return val; +} + +EXPORT_SYMBOL(fbxgpio_get_data_in); + +/* + * show direction in for gpio associated with class_device dev. + */ +static ssize_t show_direction(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxgpio_pin *p; + int dir, ret = 0; + + p = dev_get_drvdata(dev); + + dir = p->direction; + + switch (dir) { + case GPIO_DIR_IN: + ret += sprintf(buf, "input\n"); + break; + case GPIO_DIR_OUT: + case GPIO_DIR_OUT_UNINITIALIZED: + ret += sprintf(buf, "output\n"); + break; + default: + ret += sprintf(buf, "unknown\n"); + break; + } + return ret; +} + +/* + * show input data for input gpio pins. + */ +static ssize_t show_datain(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxgpio_pin *p; + int val; + + p = dev_get_drvdata(dev); + if (p->direction != GPIO_DIR_IN) + return -EINVAL; + + val = fbxgpio_get_data_in(p); + return sprintf(buf, "%i\n", val); +} + +/* + * show output data for output gpio pins. + */ +static ssize_t show_dataout(struct device *dev, + struct device_attribute *attr, char *buf) +{ + int val; + struct fbxgpio_pin *p; + + p = dev_get_drvdata(dev); + if (p->direction != GPIO_DIR_OUT) + return -EINVAL; + + val = p->cur_dataout; + return sprintf(buf, "%i\n", val); +} + +/* + * store new dataout value for output gpio pins. + */ +static ssize_t store_dataout(struct device *dev, + struct device_attribute *attr, const char *buf, size_t size) +{ + struct fbxgpio_pin *p; + int val; + + if (*buf == ' ' || *buf == '\t' || *buf == '\r' || *buf == '\n') + /* silently eat any spaces/tab/linefeed/carriagereturn */ + return 1; + + p = dev_get_drvdata(dev); + + if (p->direction != GPIO_DIR_OUT && + p->direction != GPIO_DIR_OUT_UNINITIALIZED) + return -EINVAL; + + switch (*buf) { + case '0': + val = 0; + break ; + case '1': + val = 1; + break ; + default: + return -EINVAL; + } + + p->direction = GPIO_DIR_OUT; + fbxgpio_set_data_out(p, val); + return 1; +} + +/* + * attribute list associated with each class device. + */ +static struct device_attribute gpio_attributes[] = { + __ATTR(direction, 0400, show_direction, NULL), + __ATTR(data_in, 0400, show_datain, NULL), + __ATTR(data_out, 0600, show_dataout, store_dataout), +}; + +static int fbxgpio_register_pin(struct platform_device *ppdev, + struct fbxgpio_pin *pin) +{ + struct device *dev; + int i, ret; + + if (pin->use_desc && (!pin->request_desc || !pin->release_desc)) + return -EINVAL; + + dprint("registering pin %s\n", pin->pin_name); + + dev = device_create(fbxgpio_class, &ppdev->dev, 0, pin, + "%s", pin->pin_name); + if (IS_ERR(dev)) + return PTR_ERR(dev); + + for (i = 0; i < ARRAY_SIZE(gpio_attributes); i++) { + ret = device_create_file(dev, &gpio_attributes[i]); + if (ret) + goto err_out; + } + + pin->dev = dev; + return 0; + +err_out: + for (; i >= 0; i--) + device_remove_file(dev, &gpio_attributes[i]); + device_unregister(dev); + return ret; +} + +static void fbxgpio_unregister_pin(struct fbxgpio_pin *pin) +{ + struct device *dev; + int i; + + dprint("unregistering pin %s\n", pin->pin_name); + dev = pin->dev; + pin->dev = NULL; + + for (i = 0; i < ARRAY_SIZE(gpio_attributes); i++) + device_remove_file(dev, &gpio_attributes[i]); + device_unregister(dev); +} + +static int fbxgpio_platform_probe(struct platform_device *pdev) +{ + struct fbxgpio_pin *p; + int err = 0; + + p = pdev->dev.platform_data; + while (p->pin_name) { + err = fbxgpio_register_pin(pdev, p); + if (err) + return err; + ++p; + } + return 0; +} + +static void fbxgpio_platform_remove(struct platform_device *pdev) +{ + struct fbxgpio_pin *p; + + p = pdev->dev.platform_data; + while (p->pin_name) { + fbxgpio_unregister_pin(p); + ++p; + } +} + +static struct platform_driver fbxgpio_platform_driver = +{ + .probe = fbxgpio_platform_probe, + .remove = fbxgpio_platform_remove, + .driver = { + .name = "fbxgpio", + } +}; + +static int __init fbxgpio_init(void) +{ + int ret; + + fbxgpio_class = class_create("fbxgpio"); + if (IS_ERR(fbxgpio_class)) + return PTR_ERR(fbxgpio_class); + + ret = platform_driver_register(&fbxgpio_platform_driver); + if (ret) { + printk(KERN_ERR PFX "unable to register fbxgpio driver.\n"); + class_destroy(fbxgpio_class); + return ret; + } + return 0; +} + +static void __exit fbxgpio_exit(void) +{ + platform_driver_unregister(&fbxgpio_platform_driver); + class_destroy(fbxgpio_class); +} + +subsys_initcall(fbxgpio_init); +module_exit(fbxgpio_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Nicolas Schichan "); diff -Nruw linux-6.13.12-fbx/drivers/fbxgpio./fbxgpio_dt.c linux-6.13.12-fbx/drivers/fbxgpio/fbxgpio_dt.c --- linux-6.13.12-fbx/drivers/fbxgpio./fbxgpio_dt.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxgpio/fbxgpio_dt.c 2025-09-25 17:40:31.611347609 +0200 @@ -0,0 +1,263 @@ +/* + * fbxgpio_dt.c for fbxgpio + * Created by on Tue Aug 1 14:01:01 2017 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static atomic_t last_id = ATOMIC_INIT(0); + +/* + * fbxgpio driver fetching gpios names and configuration from + * device-tree. + */ + +struct fbxgpio_dt_priv { + struct fbxgpio_pin *pins; + unsigned int npins; + + /* dynamically created platform_device for fbxgpio_core */ + struct platform_device *top_pdev; +}; + +/* + * + */ +static struct gpio_desc *request_desc_cb(struct fbxgpio_pin *pin) +{ + struct gpio_desc *desc; + int ret; + + if (!pin->dt.no_claim) { + /* was requested earlier */ + return pin->dt.desc; + } + + /* try to request it for real first */ + desc = fwnode_gpiod_get_index(of_fwnode_handle(pin->of_node), + NULL, 0, pin->dt.flags, + pin->dt.pin_name); + if (!IS_ERR(desc)) { + /* we want to release it later */ + pin->dt.desc = desc; + return desc; + } + + ret = PTR_ERR(desc); + if (ret != -EBUSY) + return desc; + + /* device is busy, which is expected for no-claim, just fetch + * a "light" reference, which we won't need to put */ + return fwnode_gpiod_get_index(of_fwnode_handle(pin->of_node), + NULL, 0, GPIOD_ASIS | + GPIOD_FLAGS_BIT_NONEXCLUSIVE, + pin->dt.pin_name); +} + +/* + * + */ +static void release_desc_cb(struct fbxgpio_pin *pin) +{ + if (pin->dt.no_claim && pin->dt.desc) { + gpiod_put(pin->dt.desc); + pin->dt.desc = NULL; + } +} + +/* + * fill an fbxgpio_pin with the configuration found in a device tree + * node. + * + * required properties are: + * - gpio: a phandle to a standard linux gpio. + * + * - the name of the node: the name of the gpio as it will appear under + * /sys/class/fbxgpio/ + * + * - ///: how to declare + * gpio and actually setup it unless no-claim is given + * + * - : just declare gpio, but don't request & setup it + */ +static int fbxgpio_dt_fill_gpio(struct platform_device *pdev, + struct device_node *np, + struct fbxgpio_pin *pin) +{ + enum gpiod_flags flags; + int error; + + error = of_property_read_string(np, "name", &pin->pin_name); + if (error) { + dev_err(&pdev->dev, "gpio has no name.\n"); + return error; + } + + if (of_property_read_bool(np, "input")) { + pin->direction = GPIO_DIR_IN; + flags = GPIOD_IN; + } else if (of_property_read_bool(np, "output-low")) { + pin->direction = GPIO_DIR_OUT; + pin->cur_dataout = 0; + flags = GPIOD_OUT_LOW; + } else if (of_property_read_bool(np, "output-high")) { + pin->direction = GPIO_DIR_OUT; + pin->cur_dataout = 1; + flags = GPIOD_OUT_HIGH; + } else if (of_property_read_bool(np, "output-preserve")) { + pin->direction = GPIO_DIR_OUT_UNINITIALIZED; + flags = GPIOD_ASIS; + } else { + dev_err(&pdev->dev, + "no state specified for %s\n", + pin->pin_name); + return -EINVAL; + } + + pin->use_desc = true; + pin->of_node = np; + pin->dt.flags = flags; + pin->request_desc = request_desc_cb; + pin->release_desc = release_desc_cb; + scnprintf(pin->dt.pin_name, sizeof (pin->dt.pin_name), + "fbxgpio-dt/%s", pin->pin_name); + + if (of_property_read_bool(np, "no-claim")) { + /* will be requested on demain */ + pin->dt.no_claim = true; + return 0; + } + + pin->dt.desc = devm_fwnode_gpiod_get(&pdev->dev, of_fwnode_handle(np), + NULL, flags, pin->dt.pin_name); + if (IS_ERR(pin->dt.desc)) { + int ret = PTR_ERR(pin->dt.desc); + + if (ret != -EPROBE_DEFER) + dev_err(&pdev->dev, + "unable to get gpio desc for %s: %d.\n", + pin->pin_name, ret); + return ret; + } + + return 0; +} + +static int fbxgpio_dt_probe(struct platform_device *pdev) +{ + struct fbxgpio_dt_priv *priv; + struct device_node *fbxgpio_node; + u32 cur_gpio; + int error = 0; + size_t priv_alloc_size; + int i; + + priv = devm_kzalloc(&pdev->dev, sizeof (*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + dev_set_drvdata(&pdev->dev, priv); + + /* + * first pass to get the number of struct fbxgpio_pin to + * allocate. + */ + for_each_available_child_of_node(pdev->dev.of_node, fbxgpio_node) { + ++priv->npins; + } + + /* + * allocate pins: use npins + 1 for zeroed end sentinel. + */ + priv_alloc_size = (priv->npins + 1) * sizeof (struct fbxgpio_pin); + priv->pins = devm_kzalloc(&pdev->dev, priv_alloc_size, GFP_KERNEL); + if (!priv->pins) + return -ENOMEM; + + /* + * second pass to fill the priv->pins array. + */ + cur_gpio = 0; + for_each_available_child_of_node(pdev->dev.of_node, fbxgpio_node) { + error = fbxgpio_dt_fill_gpio(pdev, fbxgpio_node, + &priv->pins[cur_gpio]); + if (error) + return error; + ++cur_gpio; + } + + dev_info(&pdev->dev, "%u gpios.\n", priv->npins); + + /* + * create and register a platform device for fbxgpio_core. + */ + priv->top_pdev = platform_device_register_data(&pdev->dev, + "fbxgpio", + atomic_inc_return(&last_id), + priv->pins, + priv_alloc_size); + + if (IS_ERR(priv->top_pdev)) { + dev_err(&pdev->dev, "unable to register fbxgpio platform " + "device: %ld\n", PTR_ERR(priv->top_pdev)); + return PTR_ERR(priv->top_pdev); + } + + for (i = 0; i < priv->npins; i++) { + struct fbxgpio_pin *pin = &priv->pins[i]; + + if (pin->direction == GPIO_DIR_OUT) + dev_dbg(&pdev->dev, + "%sgpio %s is output, default %d\n", + pin->dt.no_claim ? "unclaimed " : "", + pin->pin_name, pin->cur_dataout); + else if (pin->direction == GPIO_DIR_IN) + dev_dbg(&pdev->dev, + "%sgpio %s is input\n", + pin->dt.no_claim ? "unclaimed " : "", + pin->pin_name); + else + dev_dbg(&pdev->dev, + "%sgpio %s has output, value preserved\n", + pin->dt.no_claim ? "unclaimed " : "", + pin->pin_name); + } + + return 0; +} + +static void fbxgpio_dt_remove(struct platform_device *pdev) +{ + struct fbxgpio_dt_priv *priv = dev_get_drvdata(&pdev->dev); + platform_device_unregister(priv->top_pdev); +} + +static const struct of_device_id fbxgpio_dt_of_match_table[] = { + { .compatible = "fbx,fbxgpio" }, + { }, +}; +MODULE_DEVICE_TABLE(of, fbxgpio_dt_of_match_table); + +static struct platform_driver fbxgpio_dt_platform_driver = { + .probe = fbxgpio_dt_probe, + .remove = fbxgpio_dt_remove, + .driver = { + .name = "fbxgpio-dt", + .of_match_table = fbxgpio_dt_of_match_table, + }, +}; + +module_platform_driver(fbxgpio_dt_platform_driver); + +MODULE_AUTHOR("Nicolas Schichan "); +MODULE_DESCRIPTION("DT Freebox GPIO Driver"); +MODULE_LICENSE("GPL v2"); diff -Nruw linux-6.13.12-fbx/drivers/fbxjtag./Kconfig linux-6.13.12-fbx/drivers/fbxjtag/Kconfig --- linux-6.13.12-fbx/drivers/fbxjtag./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxjtag/Kconfig 2025-09-25 17:40:31.611347609 +0200 @@ -0,0 +1,3 @@ +config FREEBOX_JTAG + tristate "Freebox JTAG control interface" + default n diff -Nruw linux-6.13.12-fbx/drivers/fbxjtag./Makefile linux-6.13.12-fbx/drivers/fbxjtag/Makefile --- linux-6.13.12-fbx/drivers/fbxjtag./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxjtag/Makefile 2025-09-25 17:40:31.611347609 +0200 @@ -0,0 +1 @@ +obj-$(CONFIG_FREEBOX_JTAG) += fbxjtag.o diff -Nruw linux-6.13.12-fbx/drivers/fbxjtag./fbxjtag.c linux-6.13.12-fbx/drivers/fbxjtag/fbxjtag.c --- linux-6.13.12-fbx/drivers/fbxjtag./fbxjtag.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxjtag/fbxjtag.c 2025-09-25 17:40:31.611347609 +0200 @@ -0,0 +1,1113 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PFX "fbxjtag: " + +static struct class *fbxjtag_class; + +static enum jtag_state jtag_transitions[][2] = { + [JTAG_STATE_UNDEF] = { JTAG_STATE_UNDEF , JTAG_STATE_UNDEF }, + [JTAG_STATE_TEST_LOGIC_RESET] = { JTAG_STATE_RUN_TEST_IDLE , JTAG_STATE_TEST_LOGIC_RESET }, + [JTAG_STATE_RUN_TEST_IDLE] = { JTAG_STATE_RUN_TEST_IDLE , JTAG_STATE_SELECT_DR }, + + [JTAG_STATE_SELECT_DR] = { JTAG_STATE_CAPTURE_DR , JTAG_STATE_SELECT_IR }, + [JTAG_STATE_CAPTURE_DR] = { JTAG_STATE_SHIFT_DR , JTAG_STATE_EXIT1_DR }, + [JTAG_STATE_SHIFT_DR] = { JTAG_STATE_SHIFT_DR , JTAG_STATE_EXIT1_DR }, + [JTAG_STATE_EXIT1_DR] = { JTAG_STATE_PAUSE_DR , JTAG_STATE_UPDATE_DR }, + [JTAG_STATE_PAUSE_DR] = { JTAG_STATE_PAUSE_DR , JTAG_STATE_EXIT2_DR }, + [JTAG_STATE_EXIT2_DR] = { JTAG_STATE_SHIFT_DR , JTAG_STATE_UPDATE_DR }, + [JTAG_STATE_UPDATE_DR] = { JTAG_STATE_RUN_TEST_IDLE , JTAG_STATE_SELECT_DR }, + + [JTAG_STATE_SELECT_IR] = { JTAG_STATE_CAPTURE_IR , JTAG_STATE_TEST_LOGIC_RESET }, + [JTAG_STATE_CAPTURE_IR] = { JTAG_STATE_SHIFT_IR , JTAG_STATE_EXIT1_IR }, + [JTAG_STATE_SHIFT_IR] = { JTAG_STATE_SHIFT_IR , JTAG_STATE_EXIT1_IR }, + [JTAG_STATE_EXIT1_IR] = { JTAG_STATE_PAUSE_IR , JTAG_STATE_UPDATE_IR }, + [JTAG_STATE_PAUSE_IR] = { JTAG_STATE_PAUSE_IR , JTAG_STATE_EXIT2_IR }, + [JTAG_STATE_EXIT2_IR] = { JTAG_STATE_SHIFT_IR , JTAG_STATE_UPDATE_IR }, + [JTAG_STATE_UPDATE_IR] = { JTAG_STATE_RUN_TEST_IDLE , JTAG_STATE_SELECT_DR }, +}; + + +static char *debug_state_str[] = { + [JTAG_STATE_UNDEF] = "undef", + [JTAG_STATE_TEST_LOGIC_RESET] = "Test logic reset", + [JTAG_STATE_RUN_TEST_IDLE] = "Run test idle", + [JTAG_STATE_SELECT_DR] = "Select DR", + [JTAG_STATE_CAPTURE_DR] = "Capture DR", + [JTAG_STATE_SHIFT_DR] = "Shift DR", + [JTAG_STATE_EXIT1_DR] = "Exit 1 DR", + [JTAG_STATE_PAUSE_DR] = "Pause DR", + [JTAG_STATE_EXIT2_DR] = "Exit 2 DR", + [JTAG_STATE_UPDATE_DR] = "Update DR", + [JTAG_STATE_SELECT_IR] = "Select IR", + [JTAG_STATE_CAPTURE_IR] = "Capture IR", + [JTAG_STATE_SHIFT_IR] = "Shift IR", + [JTAG_STATE_EXIT1_IR] = "Exit 1 IR", + [JTAG_STATE_PAUSE_IR] = "Pause IR", + [JTAG_STATE_EXIT2_IR] = "Exit 2 IR", + [JTAG_STATE_UPDATE_IR] = "Update IR", +}; + +static char *jtag_state_str(enum jtag_state state) { + if (state < JTAG_STATE_UNDEF || state >= JTAG_STATE_MAX) + return "invalid"; + + return debug_state_str[state]; +} + +#define DEBUG_STATE(jtag) printk(KERN_INFO PFX "new state: %s\n", jtag_state_str((jtag)->state)) + +static void set_tms(struct fbxjtag_data *jtag, int val) +{ + struct fbxgpio_pin *tms; + + tms = jtag->gpios.tms; + fbxgpio_set_data_out(tms, val); + jtag->last_tms_dataout = val; +} + +static void set_tdi(struct fbxjtag_data *jtag, int val) +{ + struct fbxgpio_pin *tdi; + + tdi = jtag->gpios.tdi; + fbxgpio_set_data_out(tdi, val); +} + +static int get_tdo(struct fbxjtag_data *jtag) +{ + struct fbxgpio_pin *tdo; + + tdo = jtag->gpios.tdo; + return fbxgpio_get_data_in(tdo); +} + +static void tck_pulse(struct fbxjtag_data *jtag) +{ + struct fbxgpio_pin *tck; + struct fbxgpio_pin *tms; + int tms_val, tdo_val; + + tms = jtag->gpios.tms; + tck = jtag->gpios.tck; + + + // rising edge + fbxgpio_set_data_out(tck, 1); + ndelay(jtag->clock_delay); + + // update state + tms_val = jtag->last_tms_dataout; + + // read tdo + if (jtag->state == JTAG_STATE_SHIFT_DR) { + tdo_val = get_tdo(jtag); + jtag->dr_buf[jtag->dr_w] = tdo_val + '0'; + jtag->dr_w = (jtag->dr_w + 1) % JTAG_BUF_SIZE; + } + + if (jtag->state == JTAG_STATE_UNDEF) { + if (tms_val == 1) { + jtag->nb_reset++; + if (jtag->nb_reset >= 5) { + jtag->state = JTAG_STATE_TEST_LOGIC_RESET; + } + } else { + jtag->nb_reset = 0; + } + } else { + jtag->state = jtag_transitions[jtag->state][tms_val]; + } + + // falling edge + fbxgpio_set_data_out(tck, 0); + ndelay(jtag->clock_delay); +} + +static void set_tms_pulse(struct fbxjtag_data *jtag, int tms) +{ + set_tms(jtag, tms); + tck_pulse(jtag); +} + +static void set_tms_tdi_pulse(struct fbxjtag_data *jtag, int tms, int tdi) +{ + set_tms(jtag, tms); + set_tdi(jtag, tdi); + tck_pulse(jtag); +} + +static void reset_state(struct fbxjtag_data *jtag) +{ + int i; + + for (i = 0; i < JTAG_RESET_STEPS; ++i) + set_tms_pulse(jtag, 1); + jtag->state = JTAG_STATE_TEST_LOGIC_RESET; +} + +static void goto_sub_state(struct fbxjtag_data *jtag, + enum jtag_state new_state) { + + enum jtag_sub_state cur_sub = jtag->state & JTAG_SUB_STATE_MASK; + enum jtag_sub_state new_sub = new_state & JTAG_SUB_STATE_MASK; + + switch(cur_sub) { + case JTAG_SUB_STATE_SELECT: + switch(new_sub) { + case JTAG_SUB_STATE_CAPTURE: + set_tms_pulse(jtag, 0); + // now in CAPTURE + break; + case JTAG_SUB_STATE_SHIFT: + set_tms_pulse(jtag, 0); + // now in CAPTURE + set_tms_pulse(jtag, 0); + // now in SHIFT + break; + case JTAG_SUB_STATE_EXIT1: + set_tms_pulse(jtag, 0); + // now in CAPTURE + set_tms_pulse(jtag, 1); + // now in EXIT1 + break; + case JTAG_SUB_STATE_PAUSE: + set_tms_pulse(jtag, 0); + // now in CAPTURE + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 0); + // now in PAUSE + break; + case JTAG_SUB_STATE_EXIT2: + set_tms_pulse(jtag, 0); + // now in CAPTURE + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 0); + // now in PAUSE + set_tms_pulse(jtag, 1); + // now in EXIT2 + break; + case JTAG_SUB_STATE_UPDATE: + set_tms_pulse(jtag, 0); + // now in CAPTURE + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 1); + // now in UPDATE + break; + case JTAG_SUB_STATE_SELECT: + default: + // stay in SELECT + break; + } + break; + + case JTAG_SUB_STATE_CAPTURE: + case JTAG_SUB_STATE_SHIFT: + switch(new_sub) { + case JTAG_SUB_STATE_SELECT: + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 1); + // now in UPDATE + set_tms_pulse(jtag, 1); + // now in SELECT-DR + if (JTAG_STATE_IN_IR(new_state)) { + // on more 1 to go to select IR + set_tms_pulse(jtag, 1); + // now in SELECT-IR + } + break; + case JTAG_SUB_STATE_SHIFT: + set_tms_pulse(jtag, 0); + // now in SHIFT + break; + case JTAG_SUB_STATE_EXIT1: + set_tms_pulse(jtag, 1); + // now in EXIT1 + break; + case JTAG_SUB_STATE_PAUSE: + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 0); + // now in PAUSE + break; + case JTAG_SUB_STATE_EXIT2: + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 0); + // now in PAUSE + set_tms_pulse(jtag, 1); + // now in EXIT2 + break; + case JTAG_SUB_STATE_UPDATE: + set_tms_pulse(jtag, 1); + // now in EXIT1 + set_tms_pulse(jtag, 1); + // now in UPDATE + break; + case JTAG_SUB_STATE_CAPTURE: + if (cur_sub == JTAG_SUB_STATE_SHIFT) { + goto_sub_state(jtag, + (new_state & JTAG_STATE_MASK) | JTAG_SUB_STATE_SELECT); + goto_sub_state(jtag, new_state); + } + break; + default: + // stay in current state + break; + } + break; + + case JTAG_SUB_STATE_EXIT1: + switch(new_sub) { + case JTAG_SUB_STATE_SELECT: + set_tms_pulse(jtag, 1); + // now in UPDATE + set_tms_pulse(jtag, 1); + // now in SELECT-DR + if (JTAG_STATE_IN_IR(new_state)) { + // on more 1 to go to select IR + set_tms_pulse(jtag, 1); + // now in SELECT-IR + } + break; + case JTAG_SUB_STATE_SHIFT: + set_tms_pulse(jtag, 0); + // now in PAUSE + set_tms_pulse(jtag, 1); + // now in EXIT2 + set_tms_pulse(jtag, 0); + // now in SHIFT + break; + case JTAG_SUB_STATE_PAUSE: + set_tms_pulse(jtag, 0); + // now in PAUSE + break; + case JTAG_SUB_STATE_EXIT2: + set_tms_pulse(jtag, 0); + // now in PAUSE + set_tms_pulse(jtag, 1); + // now in EXIT2 + break; + case JTAG_SUB_STATE_UPDATE: + set_tms_pulse(jtag, 1); + // now in UPDATE + break; + case JTAG_SUB_STATE_CAPTURE: + goto_sub_state(jtag, + (new_state & JTAG_STATE_MASK) | JTAG_SUB_STATE_SELECT); + goto_sub_state(jtag, new_state); + break; + default: + // stay in current state + break; + } + break; + + case JTAG_SUB_STATE_PAUSE: + switch(new_sub) { + case JTAG_SUB_STATE_SELECT: + set_tms_pulse(jtag, 1); + // now in EXIT2 + set_tms_pulse(jtag, 1); + // now in UPDATE + set_tms_pulse(jtag, 1); + // now in SELECT-DR + if (JTAG_STATE_IN_IR(new_state)) { + // on more 1 to go to select IR + set_tms_pulse(jtag, 1); + // now in SELECT-IR + } + break; + case JTAG_SUB_STATE_SHIFT: + set_tms_pulse(jtag, 1); + // now in EXIT2 + set_tms_pulse(jtag, 0); + // now in SHIFT + break; + case JTAG_SUB_STATE_PAUSE: + set_tms_pulse(jtag, 0); + // now in PAUSE + break; + case JTAG_SUB_STATE_EXIT2: + set_tms_pulse(jtag, 1); + // now in EXIT2 + break; + case JTAG_SUB_STATE_UPDATE: + set_tms_pulse(jtag, 1); + // now in EXIT2 + set_tms_pulse(jtag, 1); + // now in UPDATE + break; + case JTAG_SUB_STATE_CAPTURE: + goto_sub_state(jtag, + (new_state & JTAG_STATE_MASK) | JTAG_SUB_STATE_SELECT); + goto_sub_state(jtag, new_state); + break; + default: + // stay in current state + break; + } + break; + + case JTAG_SUB_STATE_EXIT2: + switch(new_sub) { + case JTAG_SUB_STATE_SELECT: + set_tms_pulse(jtag, 1); + // now in UPDATE + set_tms_pulse(jtag, 1); + // now in SELECT-DR + if (JTAG_STATE_IN_IR(new_state)) { + // on more 1 to go to select IR + set_tms_pulse(jtag, 1); + // now in SELECT-IR + } + break; + case JTAG_SUB_STATE_SHIFT: + set_tms_pulse(jtag, 0); + // now in SHIFT + break; + case JTAG_SUB_STATE_PAUSE: + set_tms_pulse(jtag, 0); + // now in SHIFT + set_tms_pulse(jtag, 1); + // now in EXIT 1 + set_tms_pulse(jtag, 0); + // now in PAUSE + break; + case JTAG_SUB_STATE_UPDATE: + set_tms_pulse(jtag, 1); + // now in UPDATE + break; + case JTAG_SUB_STATE_CAPTURE: + goto_sub_state(jtag, + (new_state & JTAG_STATE_MASK) | JTAG_SUB_STATE_SELECT); + goto_sub_state(jtag, new_state); + break; + default: + // stay in current state + break; + } + break; + + case JTAG_SUB_STATE_UPDATE: + switch(new_sub) { + case JTAG_SUB_STATE_SELECT: + set_tms_pulse(jtag, 1); + // now in SELECT-DR + if (JTAG_STATE_IN_IR(new_state)) { + // on more 1 to go to select IR + set_tms_pulse(jtag, 1); + // now in SELECT-IR + } + break; + case JTAG_SUB_STATE_UPDATE: + // stay in current state + break; + default: + goto_sub_state(jtag, + (new_state & JTAG_STATE_MASK) | JTAG_SUB_STATE_SELECT); + goto_sub_state(jtag, new_state); + break; + } + break; + + default: + BUG(); + break; + } +} + +static void goto_state(struct fbxjtag_data *jtag, enum jtag_state new_state) { + + enum jtag_main_state main_state, cur_main_state; + + if (jtag->state == JTAG_STATE_UNDEF) { + reset_state(jtag); + } + + main_state = new_state & JTAG_STATE_MASK; + cur_main_state = jtag->state & JTAG_STATE_MASK; + + if (main_state != cur_main_state) { + switch(cur_main_state) { + case JTAG_STATE_DR_MASK: + case JTAG_STATE_IR_MASK: + goto_state(jtag, (jtag->state & JTAG_STATE_MASK) | JTAG_SUB_STATE_UPDATE); + // now in UPDATE_DR or UPDATE_IR + + switch(main_state) { + case JTAG_STATE_TEST_MASK: + set_tms_pulse(jtag, 1); + // now in SELECT_DR + set_tms_pulse(jtag, 1); + // now in SELECT_IR + set_tms_pulse(jtag, 1); + // now in TEST_LOGIC_RESET + break; + + case JTAG_STATE_RUN_MASK: + set_tms_pulse(jtag, 0); + // now in RUN_TEST_IDLE + break; + + case JTAG_STATE_IR_MASK: + set_tms_pulse(jtag, 1); + // now in SELECT_DR + set_tms_pulse(jtag, 1); + // now in SELECT_IR + break; + + case JTAG_STATE_DR_MASK: + set_tms_pulse(jtag, 1); + // now in SELECT_DR + break; + } + break; + + case JTAG_STATE_TEST_MASK: + switch(main_state) { + case JTAG_STATE_RUN_MASK: + set_tms_pulse(jtag, 0); + // now in RUN_TEST_IDLE + break; + + case JTAG_STATE_DR_MASK: + set_tms_pulse(jtag, 0); + // now in RUN_TEST_IDLE + set_tms_pulse(jtag, 1); + // now in SELECT_DR + break; + + case JTAG_STATE_IR_MASK: + set_tms_pulse(jtag, 0); + // now in RUN_TEST_IDLE + set_tms_pulse(jtag, 1); + // now in SELECT_DR + set_tms_pulse(jtag, 1); + // now in SELECT_IR + break; + default: + BUG(); + break; + } + break; + + case JTAG_STATE_RUN_MASK: + switch(main_state) { + case JTAG_STATE_DR_MASK: + set_tms_pulse(jtag, 1); + // now in SELECT_DR + break; + + case JTAG_STATE_IR_MASK: + set_tms_pulse(jtag, 1); + // now in SELECT_DR + set_tms_pulse(jtag, 1); + // now in SELECT_IR + break; + + case JTAG_STATE_TEST_MASK: + set_tms_pulse(jtag, 1); + // now in SELECT_DR + set_tms_pulse(jtag, 1); + // now in SELECT_IR + set_tms_pulse(jtag, 1); + // now in TEST_LOGIC_RESET + break; + default: + printk(KERN_ERR PFX "JTAG TRANSITION ERROR :'( %s:%d", __FILE__, __LINE__); + BUG(); + break; + } + break; + + default: + printk(KERN_ERR PFX "JTAG TRANSITION ERROR :'( %s:%d", __FILE__, __LINE__); + BUG(); + break; + } + + if ((jtag->state & JTAG_STATE_MASK) != main_state) { + printk(KERN_ERR PFX "JTAG error : state %x != %x", + (jtag->state & JTAG_STATE_MASK), + main_state); + } + BUG_ON((jtag->state & JTAG_STATE_MASK) != main_state); + + if (new_state == JTAG_STATE_TEST_LOGIC_RESET + || new_state == JTAG_STATE_RUN_TEST_IDLE) + return; // we're done + } + + // now main_state == cur_main_state + + switch(new_state) { + case JTAG_STATE_TEST_LOGIC_RESET: + // stay in TEST_LOGIC_RESET + set_tms_pulse(jtag, 1); + return; + case JTAG_STATE_RUN_TEST_IDLE: + // stay in JTAG_STATE_RUN_TEST_IDLE + set_tms_pulse(jtag, 0); + return; + default: + break; + } + + // move inside IR or DR + goto_sub_state(jtag, new_state); + if (jtag->state != new_state) { + printk(KERN_ERR PFX "JTAG Error: state is %s instead of %s", + jtag_state_str(jtag->state), + jtag_state_str(new_state)); + } + BUG_ON(jtag->state != new_state); +} + +static ssize_t show_state(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + jtag = dev_get_drvdata(dev); + return sprintf(buf, "%s\n", jtag_state_str(jtag->state)); +} + +static ssize_t write_state(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + unsigned long new_state = simple_strtoul(buf, NULL, 10); + jtag = dev_get_drvdata(dev); + + switch(new_state) { + case JTAG_STATE_TEST_LOGIC_RESET: + case JTAG_STATE_RUN_TEST_IDLE: + case JTAG_STATE_SELECT_DR: + case JTAG_STATE_CAPTURE_DR: + case JTAG_STATE_SHIFT_DR: + case JTAG_STATE_EXIT1_DR: + case JTAG_STATE_PAUSE_DR: + case JTAG_STATE_EXIT2_DR: + case JTAG_STATE_UPDATE_DR: + case JTAG_STATE_SELECT_IR: + case JTAG_STATE_CAPTURE_IR: + case JTAG_STATE_SHIFT_IR: + case JTAG_STATE_EXIT1_IR: + case JTAG_STATE_PAUSE_IR: + case JTAG_STATE_EXIT2_IR: + case JTAG_STATE_UPDATE_IR: + goto_state(jtag, new_state); + return size; + + default: + printk(KERN_ERR PFX "Trying to set an invalid state: %lx\n", new_state); + return -EINVAL; + } +} + + +static ssize_t show_tck(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + return sprintf(buf, "%i\n", jtag->gpios.tck->pin_num); +} + +static ssize_t show_tms(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + return sprintf(buf, "%i\n", jtag->gpios.tms->pin_num); +} + +static ssize_t show_tdi(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + return sprintf(buf, "%i\n", jtag->gpios.tdi->pin_num); +} + +static ssize_t show_tdo(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + return sprintf(buf, "%i\n", jtag->gpios.tdo->pin_num); +} + +static ssize_t write_reset(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + reset_state(jtag); + + return size; +} + +static ssize_t read_data(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxjtag_data *jtag; + size_t len; + + jtag = dev_get_drvdata(dev); + len = jtag->dr_w - jtag->dr_r; + if (len < 0) + len += JTAG_BUF_SIZE; + + memcpy(buf, jtag->dr_buf, len); + buf[len] = '\0'; + return len + 1; +} + +static ssize_t write_data(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + size_t real_size = 0; + int i; + + if (!size) + return size; + + for (i = 0; i < size; ++i) + if ((buf[i] == '0') || (buf[i] == '1')) + real_size++; + + if (!real_size) + return size; + + jtag = dev_get_drvdata(dev); + + // reset read buffer + jtag->dr_r = 0; + jtag->dr_w = 0; + goto_state(jtag, JTAG_STATE_SHIFT_DR); + for (i = 0; real_size > 0; ++i) { + if ((buf[i] == '0') || (buf[i] == '1')) { + if (real_size-- > 1) + /* stay in shift */ + set_tms_tdi_pulse(jtag, 0, buf[i] - '0'); + else + /* exit */ + set_tms_tdi_pulse(jtag, 1, buf[i] - '0'); + } + } + BUG_ON(jtag->state != JTAG_STATE_EXIT1_DR); + goto_state(jtag, JTAG_STATE_UPDATE_DR); + + return size; +} + +static ssize_t read_instruction(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxjtag_data *jtag; + size_t len; + + jtag = dev_get_drvdata(dev); + len = jtag->ir_w - jtag->ir_r; + if (len < 0) + len += JTAG_BUF_SIZE; + + memcpy(buf, jtag->ir_buf, len); + buf[len] = '\0'; + return len + 1; +} + +static ssize_t write_instruction(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + size_t real_size = 0; + int i; + + if (!size) + return size; + + for (i = 0; i < size; ++i) + if ((buf[i] == '0') || (buf[i] == '1')) + real_size++; + + if (!real_size) + return size; + + jtag = dev_get_drvdata(dev); + + // reset read buffer + jtag->ir_r = 0; + jtag->ir_w = 0; + goto_state(jtag, JTAG_STATE_SHIFT_IR); + for (i = 0; real_size > 0; ++i) { + if ((buf[i] == '0') || (buf[i] == '1')) { + if (real_size-- > 1) + /* stay in shift */ + set_tms_tdi_pulse(jtag, 0, buf[i] - '0'); + else + /* exit */ + set_tms_tdi_pulse(jtag, 1, buf[i] - '0'); + } + } + BUG_ON(jtag->state != JTAG_STATE_EXIT1_IR); + goto_state(jtag, JTAG_STATE_UPDATE_IR); + + return size; +} + +static ssize_t show_clock_delay(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", jtag->clock_delay); +} + +static ssize_t write_clock_delay(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + + jtag->clock_delay = simple_strtoul(buf, NULL, 10); + + return size; +} + +static ssize_t show_wait_tms(struct device *dev, struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", jtag->wait_tms); +} + +static ssize_t write_wait_tms(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + + if (!size) + return size; + + jtag = dev_get_drvdata(dev); + + switch (*buf) { + case '0': + jtag->wait_tms = 0; + break ; + case '1': + jtag->wait_tms = 1; + break ; + default: + return -EINVAL; + } + + return size; +} + +static ssize_t write_wait_time(struct device *dev, struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + int i; + unsigned long val; + + val = simple_strtoul(buf, NULL, 10); + + if (!val) + return -EINVAL; + + jtag = dev_get_drvdata(dev); + + for (i = 0; i < val; ++i) { + set_tms_pulse(jtag, jtag->wait_tms); + } + + return size; +} + +static ssize_t show_data_read_size(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", jtag->data_read_size); +} + +static ssize_t write_data_read_size(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + unsigned long val; + + val = simple_strtoul(buf, NULL, 10); + + if (!val) + return -EINVAL; + + jtag = dev_get_drvdata(dev); + jtag->data_read_size = val; + + return size; +} + +static ssize_t show_instruction_read_size(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct fbxjtag_data *jtag; + + jtag = dev_get_drvdata(dev); + + return sprintf(buf, "%u\n", jtag->instruction_read_size); +} + +static ssize_t write_instruction_read_size(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t size) +{ + struct fbxjtag_data *jtag; + unsigned long val; + + val = simple_strtoul(buf, NULL, 10); + + if (!val) + return -EINVAL; + + jtag = dev_get_drvdata(dev); + jtag->instruction_read_size = val; + + return size; +} + +static struct device_attribute jtag_attributes[] = { + __ATTR(tck, 0400, show_tck, NULL), + __ATTR(tms, 0400, show_tms, NULL), + __ATTR(tdi, 0400, show_tdi, NULL), + __ATTR(tdo, 0400, show_tdo, NULL), + __ATTR(clock_delay, 0600, show_clock_delay, write_clock_delay), + __ATTR(wait_tms, 0600, show_wait_tms, write_wait_tms), + __ATTR(wait_time, 0200, NULL, write_wait_time), + __ATTR(data_read_size, 0600, show_data_read_size, write_data_read_size), + __ATTR(instruction_read_size, 0600, show_instruction_read_size, + write_instruction_read_size), + __ATTR(data, 0600, read_data, write_data), + __ATTR(instruction, 0600, read_instruction, write_instruction), + __ATTR(reset, 0200, NULL, write_reset), + __ATTR(state, 0600, show_state, write_state), +}; + +static int fbxjtag_register_jtag(struct platform_device *ppdev, + struct fbxjtag_data *jtag) +{ + struct device *dev; + int i, ret; + + printk(KERN_INFO PFX "registering jtag %s\n", jtag->name); + + if (!jtag->gpios.tck || !jtag->gpios.tms || + !jtag->gpios.tdi || !jtag->gpios.tdo) { + printk(KERN_ERR PFX "a gpio is not set\n"); + return -ENODEV; + } + + dev = device_create(fbxjtag_class, &ppdev->dev, 0, jtag, + "%s", jtag->name); + + if (IS_ERR(dev)) + return PTR_ERR(dev); + + for (i = 0; i < ARRAY_SIZE(jtag_attributes); ++i) { + ret = device_create_file(dev, &jtag_attributes[i]); + if (ret) + goto err_out; + } + + jtag->dev = dev; + jtag->nb_reset = 0; + jtag->state = JTAG_STATE_UNDEF; + jtag->dr_r = 0; + jtag->dr_w = 0; + jtag->ir_r = 0; + jtag->ir_w = 0; + return 0; + +err_out: + for (; i >= 0; --i) + device_remove_file(dev, &jtag_attributes[i]); + device_unregister(dev); + return ret; +} + +static void fbxjtag_unregister_jtag(struct fbxjtag_data *jtag) +{ + struct device *dev; + int i; + + printk(KERN_INFO PFX "unregistering jtag %s\n", jtag->name); + dev = jtag->dev; + jtag->dev = NULL; + + for (i = 0; i < ARRAY_SIZE(jtag_attributes); ++i) + device_remove_file(dev, &jtag_attributes[i]); + device_unregister(dev); +} + +static int fbxjtag_from_of(struct fbxjtag_data *jtag, + struct platform_device *pdev) +{ + int error; + + error = of_property_read_string(pdev->dev.of_node, "name", + &jtag->name); + if (error) + return error; + + error = of_property_read_u32(pdev->dev.of_node, "clock-delay", + &jtag->clock_delay); + if (error) + return error; + + error = of_property_read_u32(pdev->dev.of_node, "wait-tms", + &jtag->wait_tms); + if (error) + return error; + + error = of_property_read_u32(pdev->dev.of_node, "data-read-size", + &jtag->data_read_size); + if (error) + return error; + + error = of_property_read_u32(pdev->dev.of_node, "inst-read-size", + &jtag->instruction_read_size); + if (error) + return error; + + jtag->gpios.tck = fbxgpio_of_get(pdev->dev.of_node, "fbxgpio-tck", 0); + if (IS_ERR(jtag->gpios.tck)) + return PTR_ERR(jtag->gpios.tck); + + jtag->gpios.tdi = fbxgpio_of_get(pdev->dev.of_node, "fbxgpio-tdi", 0); + if (IS_ERR(jtag->gpios.tdi)) + return PTR_ERR(jtag->gpios.tdi); + + jtag->gpios.tdo = fbxgpio_of_get(pdev->dev.of_node, "fbxgpio-tdo", 0); + if (IS_ERR(jtag->gpios.tdo)) + return PTR_ERR(jtag->gpios.tdo); + + jtag->gpios.tms = fbxgpio_of_get(pdev->dev.of_node, "fbxgpio-tms", 0); + if (IS_ERR(jtag->gpios.tms)) + return PTR_ERR(jtag->gpios.tms); + + return 0; +} + +static int fbxjtag_platform_probe(struct platform_device *pdev) +{ + struct fbxjtag_data *jtag; + + jtag = pdev->dev.platform_data; + if (!jtag) { + int error; + jtag = devm_kzalloc(&pdev->dev, sizeof (*jtag), GFP_KERNEL); + if (!jtag) + return -ENOMEM; + error = fbxjtag_from_of(jtag, pdev); + if (error) + return error; + + dev_set_drvdata(&pdev->dev, jtag); + } + if (jtag && jtag->name) + return fbxjtag_register_jtag(pdev, jtag); + + return -EINVAL; +} + +static void fbxjtag_platform_remove(struct platform_device *pdev) +{ + struct fbxjtag_data *jtag; + + jtag = pdev->dev.platform_data; + if (!jtag) + jtag = dev_get_drvdata(&pdev->dev); + if (jtag->name) + fbxjtag_unregister_jtag(jtag); +} + +static const struct of_device_id fbxjtag_of_match_table[] = { + { .compatible = "fbx,fbxjtag" }, + { }, +}; +MODULE_DEVICE_TABLE(of, fbxjtag_of_match_table); + +static struct platform_driver fbxjtag_platform_driver = +{ + .probe = fbxjtag_platform_probe, + .remove = fbxjtag_platform_remove, + .driver = { + .name = "fbxjtag", + .of_match_table = fbxjtag_of_match_table, + }, +}; + +static int __init fbxjtag_init(void) +{ + int ret; + + fbxjtag_class = class_create("fbxjtag"); + if (IS_ERR(fbxjtag_class)) + return PTR_ERR(fbxjtag_class); + + ret = platform_driver_register(&fbxjtag_platform_driver); + if (ret) { + printk(KERN_ERR PFX "unable to register fbxjtag driver.\n"); + class_destroy(fbxjtag_class); + } + + return ret; +} + +static void __exit fbxjtag_exit(void) +{ + printk(KERN_DEBUG PFX "exit fbxjtag\n"); + platform_driver_unregister(&fbxjtag_platform_driver); + class_destroy(fbxjtag_class); +} + +module_init(fbxjtag_init); +module_exit(fbxjtag_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Arnaud de Turckheim +#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.13.12-fbx/drivers/fbxwatchdog./Kconfig linux-6.13.12-fbx/drivers/fbxwatchdog/Kconfig --- linux-6.13.12-fbx/drivers/fbxwatchdog./Kconfig 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxwatchdog/Kconfig 2025-09-25 17:40:31.615347629 +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.13.12-fbx/drivers/fbxwatchdog./Makefile linux-6.13.12-fbx/drivers/fbxwatchdog/Makefile --- linux-6.13.12-fbx/drivers/fbxwatchdog./Makefile 1970-01-01 01:00:00.000000000 +0100 +++ linux-6.13.12-fbx/drivers/fbxwatchdog/Makefile 2025-09-25 17:40:31.615347629 +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 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/drivers/hwmon/ap806-hwmon.c 2025-09-25 17:40:32.663352826 +0200 @@ -0,0 +1,284 @@ +/* + * ap806.c for ap806-hwmon + * Created by on Tue Oct 3 15:43:07 2017 + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#define AP806_SENSOR_CTRL 0x0 +# define AP806_SENSOR_CTRL_START BIT(0) +# define AP806_SENSOR_CTRL_RESET BIT(1) +# define AP806_SENSOR_CTRL_ENABLE BIT(2) + +#define CP110_TSEN_CONTROL 0x4 +# define CP110_TSEN_CONTROL_HW_RESET BIT(8) + +#define AP806_SENSOR_STATUS 0x8 +# define AP806_SENSOR_STATUS_READOUT_MASK (0x3ff) + +#define CP110_SENSOR_VALID_BIT 10 +#define AP806_SENSOR_VALID_BIT 16 + +#define SENSOR_READ_SMC ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_64, \ + ARM_SMCCC_OWNER_OEM, 0) + +#define SENSOR_WRITE_SMC ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_64, \ + ARM_SMCCC_OWNER_OEM, 1) + +struct ap806_hwmon_priv { + void __iomem *regs; + struct device *hwmon_dev; + const struct sensor_data *data; + + bool requires_smc; + unsigned long io_phys_base; + struct device *dev; + +}; + +struct sensor_data { + u32 readout_valid_bit; + bool two_complement; + unsigned long coef_b; + unsigned long coef_m; + unsigned long coef_div; + int (*init_sensor)(struct ap806_hwmon_priv *priv); +}; + +/* + * SMC/IO accessors for sensors. on A8K, sensors registers lie in the + * DFX space which may have to be configured to reject non secure + * accesses (fuses block are on the DFX space). + * + * Freebox ATF implements IO accessors for sensor registers via SMC + * call to the secure monitor. + * + * Ideally we should put these details in a regmap but this will do + * for now. + */ +static int sensor_read(u32 *v, struct ap806_hwmon_priv *priv, u32 reg_off) +{ + if (!priv->requires_smc) { + *v = readl(priv->regs + reg_off); + return 0; + } else { + struct arm_smccc_res smc_res; + + arm_smccc_smc(SENSOR_READ_SMC, priv->io_phys_base + reg_off, + 0, 0, 0, 0, 0, 0, &smc_res); + if (smc_res.a0) { + dev_err(priv->dev, "read SMC failed.\n"); + return -ENXIO; + } else { + *v = smc_res.a1; + return 0; + } + } +} + +static int sensor_write(u32 value, struct ap806_hwmon_priv *priv, u32 reg_off) +{ + if (!priv->requires_smc) { + writel(value, priv->regs + reg_off); + return 0; + } else { + struct arm_smccc_res smc_res; + + arm_smccc_smc(SENSOR_WRITE_SMC, value, + priv->io_phys_base + reg_off, + 0, 0, 0, 0, 0, &smc_res); + + if (smc_res.a0) { + dev_err(priv->dev, "write SMC failed.\n"); + return -ENXIO; + } + return 0; + } +} + +static int ap806_init_sensor(struct ap806_hwmon_priv *priv) +{ + u32 reg; + int error; + + /* + * dereset and start sensor. + */ + error = sensor_read(®, priv, AP806_SENSOR_CTRL); + if (error) + return error; + + reg &= ~AP806_SENSOR_CTRL_RESET; + reg |= AP806_SENSOR_CTRL_ENABLE; + reg |= AP806_SENSOR_CTRL_START; + + return sensor_write(reg, priv, AP806_SENSOR_CTRL); +} + +static int cp110_init_sensor(struct ap806_hwmon_priv *priv) +{ + u32 reg; + int error; + /* + * dereset sensor. + */ + error = sensor_read(®, priv, CP110_TSEN_CONTROL); + if (error) + return error; + + reg |= CP110_TSEN_CONTROL_HW_RESET; + + return sensor_write(reg, priv, CP110_TSEN_CONTROL); +} + +static const struct sensor_data ap806_sensor_data = { + .readout_valid_bit = AP806_SENSOR_VALID_BIT, + .coef_b = 153400, + .coef_m = 425, + .coef_div = 1, + .two_complement = true, + .init_sensor = ap806_init_sensor, +}; + +static const struct sensor_data cp110_sensor_data = { + .readout_valid_bit = CP110_SENSOR_VALID_BIT, + .coef_b = -2791000UL, + .coef_m = 4761UL, + .coef_div = 10, + .two_complement = false, + .init_sensor = cp110_init_sensor, +}; + +static ssize_t ap806_show_temp(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct ap806_hwmon_priv *priv = dev_get_drvdata(dev); + const struct sensor_data *data = priv->data; + u32 reg; + int value; + int error; + + error = sensor_read(®, priv, AP806_SENSOR_STATUS); + if (error) + return -ENXIO; + + if ((reg & (1 << data->readout_valid_bit)) == 0) + return -EIO; + + reg &= AP806_SENSOR_STATUS_READOUT_MASK; + + if (data->two_complement && reg >= 512) + reg = reg - 1024; + + value = (data->coef_m * (long)reg + data->coef_b) / + data->coef_div; + return sprintf(buf, "%d\n", value); +} + +static SENSOR_DEVICE_ATTR_2(temp0_input, S_IRUGO, ap806_show_temp, NULL, 0, 0); + +static struct attribute *temp_attrs[] = { + &sensor_dev_attr_temp0_input.dev_attr.attr, + NULL +}; + +static const struct attribute_group ap806_temperature_attr_group = { + .attrs = temp_attrs, +}; + +static const struct of_device_id ap806_hwmon_of_match[] = { + { .compatible = "marvell,ap806-hwmon", .data = &ap806_sensor_data }, + { .compatible = "marvell,cp110-hwmon", .data = &cp110_sensor_data }, + { }, +}; +MODULE_DEVICE_TABLE(of, ap806_hwmon_of_match); + +static int ap806_hwmon_probe(struct platform_device *pdev) +{ + struct ap806_hwmon_priv *priv; + struct resource *reg_resource; + int error; + const struct of_device_id *match; + + match = of_match_device(ap806_hwmon_of_match, &pdev->dev); + if (!match) + return -ENODEV; + + priv = devm_kzalloc(&pdev->dev, sizeof (*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + dev_set_drvdata(&pdev->dev, priv); + priv->dev = &pdev->dev; + + reg_resource = platform_get_resource(pdev, IORESOURCE_MEM, 0); + if (!reg_resource) + return -EINVAL; + + if (of_property_read_bool(pdev->dev.of_node, "fbx,requires-smc")) { + dev_info(&pdev->dev, "using SMC to access registers.\n"); + priv->requires_smc = true; + priv->io_phys_base = reg_resource->start; + } else { + priv->regs = devm_ioremap_resource(&pdev->dev, reg_resource); + if (!priv->regs) + return -ENOMEM; + } + + priv->data = match->data; + + error = priv->data->init_sensor(priv); + if (error) + return error; + + error = sysfs_create_group(&pdev->dev.kobj, &ap806_temperature_attr_group); + if (error) + return error; + + priv->hwmon_dev = hwmon_device_register(&pdev->dev); + if (IS_ERR(priv->hwmon_dev)) { + error = PTR_ERR(priv->hwmon_dev); + goto sysfs_remove_group; + } + + return 0; + +sysfs_remove_group: + sysfs_remove_group(&pdev->dev.kobj, &ap806_temperature_attr_group); + return error; +} + +static void ap806_hwmon_remove(struct platform_device *pdev) +{ + struct ap806_hwmon_priv *priv = dev_get_drvdata(&pdev->dev); + + hwmon_device_unregister(priv->hwmon_dev); + sysfs_remove_group(&pdev->dev.kobj, &ap806_temperature_attr_group); +} + +struct platform_driver ap806_hwmon_driver = { + .probe = ap806_hwmon_probe, + .remove = ap806_hwmon_remove, + .driver = { + .name = "ap806-hwmon", + .owner = THIS_MODULE, + .of_match_table = ap806_hwmon_of_match, + }, +}; + +module_platform_driver(ap806_hwmon_driver); + +MODULE_AUTHOR("Nicolas Schichan "); +MODULE_LICENSE("GPL"); --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/drivers/hwmon/ld6710-fbx.c 2025-09-25 17:40:32.671352866 +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 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/drivers/input/misc/smsc_cap1066.c 2025-09-25 17:40:32.991354452 +0200 @@ -0,0 +1,1115 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define PFX "cap1066: " + +/* + * list of registers + */ +#define SMSC_REG_MAIN_CTRL 0x00 +#define SMSC_REG_BTN_STATUS1 0x03 +#define SMSC_REG_DATA_SENSITIVITY 0x1f +#define SMSC_REG_CFG 0x20 +#define SMSC_REG_SENS_CFG 0x22 +#define SMSC_REG_MTOUCH_CFG_REG 0x2a +#define SMSC_REG_CFG2 0x44 +#define SMSC_REG_LED_OUT_TYPE 0x71 +#define SMSC_REG_LED_LINK 0x72 +#define SMSC_REG_LED_OUTPUT_CTL 0x74 +#define SMSC_REG_LED_BEHAVIOUR1 0x81 +#define SMSC_REG_LED_BEHAVIOUR2 0x82 +#define SMSC_REG_LED_DIRECT_DCYCLE 0x93 +#define SMSC_REG_LED_DIRECT_RAMP_RATE 0x94 +#define SMSC_REG_LED_OFF_DELAY 0x95 +#define SMSC_REG_DID 0xfd +#define SMSC_REG_VID 0xfe + +/* + * used in cap1066_init_hw and during priv initialization. + */ +#define DEFAULT_DUTY_CYCLE_MIN 0x4 +#define DEFAULT_DUTY_CYCLE_MAX 0xf +#define DEFAULT_RAMP_TIME_FALL 0x1 +#define DEFAULT_RAMP_TIME_RISE 0x2 + +/* + * vendor id / device id + */ +#define SMSC_CAP1066_VID 0x5d +#define SMSC_CAP1066_DID 0x41 +#define SMSC_CAP1166_DID 0x51 + +static const unsigned short normal_i2c[] = { 0x28, I2C_CLIENT_END }; + +static const struct i2c_device_id cap1066_id[] = { + { "cap1066", 0 }, + { } +}; + +/* + * private context + */ +static u32 default_map[CAP1066_MAX_BTNS] = { + BTN_0, + BTN_1, + BTN_2, + BTN_3, + BTN_4, + BTN_5, +}; + +struct led_btn_name +{ + int code; + const char *name; +}; + +/* + * whenever possible symlinks will be created from led_btn_X to + * led_key_y, depending on user provided keymap. add entries here as + * you see fit. + */ +static const struct led_btn_name led_btn_names[] = { + { KEY_UP, "led_key_up", }, + { KEY_DOWN, "led_key_down", }, + { KEY_LEFT, "led_key_left", }, + { KEY_RIGHT, "led_key_right", }, + { KEY_ENTER, "led_key_enter", }, +}; + +enum { + E_SMSC_CAP1066_LED_MODE_AUTO, + E_SMSC_CAP1066_LED_MODE_ON, + E_SMSC_CAP1066_LED_MODE_OFF, +}; + +struct cap1066_led_dev +{ + struct cap1066_priv *parent_priv; + struct device dev; + int led_mode; + int led_index; + const char *btn_link; +}; + +struct cap1066_priv { + struct input_dev *input; + struct i2c_client *client; + u32 keymap[CAP1066_MAX_BTNS]; + struct cap1066_led_dev *led_devices[CAP1066_MAX_BTNS]; + + u8 duty_cycle_min; + u8 duty_cycle_max; + u8 raw_ramp_time_fall; + u8 raw_ramp_time_rise; + + struct gpio_desc *irq_gpio; +}; + +static const char *get_keycode_btn_name(int key_code) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(led_btn_names); ++i) { + if (key_code == led_btn_names[i].code) + return led_btn_names[i].name; + } + return NULL; +} + +/* + * single register read + */ +static int cap1066_read_reg(struct i2c_client *client, u8 reg, u8 *val) +{ + int ret; + + ret = i2c_smbus_read_byte_data(client, reg); + if (ret < 0) { + printk(KERN_ERR PFX "read failed: %d\n", ret); + return ret; + } + + *val = (u8)ret; + return 0; +} + +/* + * single register write + */ +static int cap1066_write_reg(struct i2c_client *client, u8 reg, u8 val) +{ + int ret; + + ret = i2c_smbus_write_byte_data(client, reg, val); + if (ret < 0) { + printk(KERN_ERR PFX "write failed: %d\n", ret); + return ret; + } + return 0; +} + +/* + * called when an smbus device is detected, make sure it's a cap1066 + */ +static int cap1066_detect(struct i2c_client *client, + struct i2c_board_info *info) + +{ + int ret; + u8 vid, did; + const char *name = NULL; + + ret = cap1066_read_reg(client, SMSC_REG_VID, &vid); + if (ret) + return ret; + + ret = cap1066_read_reg(client, SMSC_REG_DID, &did); + if (ret) + return ret; + + if (vid != SMSC_CAP1066_VID) + goto no_dev; + + switch (did) { + case SMSC_CAP1066_DID: + name = "cap1066"; + break; + case SMSC_CAP1166_DID: + name = "cap1166"; + break; + default: + goto no_dev; + } + + printk(KERN_INFO PFX "detected SMSC %s chip\n", name); + if (info) + strscpy(info->type, name, I2C_NAME_SIZE); + return 0; + +no_dev: + printk(KERN_ERR PFX "bad vid/did: 0x%04x/0x%04x\n", vid, did); + return -ENODEV; +} + +/* + * reset registers value + */ +static int cap1066_init_hw(struct i2c_client *client) +{ + unsigned int i; + u8 did; + int ret; + + static const u8 init_regs[] = { + /* power on */ + SMSC_REG_MAIN_CTRL, 0x0, + + /* default sensitivity */ + SMSC_REG_DATA_SENSITIVITY, 0x2f, + + /* max duration */ + SMSC_REG_SENS_CFG, 0xf4, + + /* default configuration */ + SMSC_REG_CFG, 0x38, + + /* open drain output on all gpios */ + SMSC_REG_LED_OUT_TYPE, 0x00, + + /* link leds with sensors */ + SMSC_REG_LED_LINK, 0x3f, + + /* setup direct mode */ + SMSC_REG_LED_BEHAVIOUR1, 0x00, + SMSC_REG_LED_BEHAVIOUR2, 0x00, + + /* set led duty cycle min/max to 10% => 100% */ + SMSC_REG_LED_DIRECT_DCYCLE, + (DEFAULT_DUTY_CYCLE_MAX << 4) | + (DEFAULT_DUTY_CYCLE_MIN), + + /* set ramp rate time to 500ms/250ms */ + SMSC_REG_LED_DIRECT_RAMP_RATE, + (DEFAULT_RAMP_TIME_RISE << 3) | + (DEFAULT_RAMP_TIME_FALL), + }; + + static const u8 init_cap11_regs[] = { + /* default configuration2 */ + SMSC_REG_CFG2, 0x44, + }; + + for (i = 0; i < ARRAY_SIZE(init_regs); i += 2) { + int ret; + + ret = cap1066_write_reg(client, + init_regs[i], init_regs[i + 1]); + if (ret) + return ret; + } + + ret = cap1066_read_reg(client, SMSC_REG_DID, &did); + if (ret) + return ret; + + if (did != SMSC_CAP1166_DID) + return 0; + + for (i = 0; i < ARRAY_SIZE(init_cap11_regs); i += 2) { + int ret; + + ret = cap1066_write_reg(client, + init_cap11_regs[i], + init_cap11_regs[i + 1]); + if (ret) + return ret; + } + + return 0; +} + +/* + * input core poll callback + */ +static void cap1066_input_poll(struct input_dev *input) +{ + struct cap1066_priv *priv = input_get_drvdata(input); + unsigned int i; + int ret; + u8 stat; + + if (priv->irq_gpio && gpiod_get_value(priv->irq_gpio)) + return; + + /* clear interrupt flag */ + cap1066_write_reg(priv->client, SMSC_REG_MAIN_CTRL, 0); + + ret = cap1066_read_reg(priv->client, SMSC_REG_BTN_STATUS1, &stat); + if (ret) { + printk(KERN_ERR PFX "unable to read status\n"); + return; + } + + for (i = 0; i < CAP1066_MAX_BTNS; i++) + input_report_key(input, priv->keymap[i], + (stat & (1 << i)) ? 1 : 0); + input_sync(input); +} + +#define to_cap1066_led_dev(Dev) container_of(Dev, struct cap1066_led_dev, dev) + +/* + * called when all sysfs references to the cap1066_led_dev are gone. + */ +static void cap1066_led_dev_release(struct device *dev) +{ + struct cap1066_led_dev *led_dev; + + led_dev = to_cap1066_led_dev(dev); + kfree(led_dev); +} + +static int is_white(int c) +{ + return c == '\0' || c == ' ' || c == '\t' || c == '\n' || c == '\r'; +} + +/* + * store a new control value for a given cap1066_led_dev: + * - auto means that the led is linked to the capacitive keys + * - on means that the led is always on + * - off means that the led is always off + */ +static ssize_t store_control(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + struct cap1066_led_dev *led_dev; + int new_mode; + int read_len = 0; + const char *end; + int key; + u8 reg; + struct i2c_client *client; + static const char *valid_keys[] = { + [E_SMSC_CAP1066_LED_MODE_AUTO] = "auto", + [E_SMSC_CAP1066_LED_MODE_ON] = "on", + [E_SMSC_CAP1066_LED_MODE_OFF] = "off", + }; + + + led_dev = to_cap1066_led_dev(dev); + client = led_dev->parent_priv->client; + + if (is_white(*buf)) + /* + * eat white spaces silently, upper layer will call us + * again. + */ + return 1; + + for (key = 0; key < ARRAY_SIZE(valid_keys); ++key) { + if (count < strlen(valid_keys[key])) + continue ; + if (!strncmp(buf, valid_keys[key], strlen(valid_keys[key]))) { + break; + } + } + + if (key == ARRAY_SIZE(valid_keys)) { + /* + * end of valid_keys array reached and nothing valid + * was recognized. + */ + printk(KERN_ERR PFX "invalid control value.\n"); + return -EINVAL; + } + new_mode = key; + read_len = strlen(valid_keys[key]); + + /* + * check that no garbage is present at end of input. + */ + end = buf + read_len; + if (end < buf + count && !is_white(*end)) { + /* + * garbage at end of input. + */ + printk(KERN_ERR PFX "garbage at end of value for led " + "control.\n"); + return -EINVAL; + } + + if (new_mode == led_dev->led_mode) + return read_len; + + if (new_mode == E_SMSC_CAP1066_LED_MODE_AUTO) { + cap1066_read_reg(client, SMSC_REG_LED_LINK, ®); + reg |= (1 << led_dev->led_index); + cap1066_write_reg(client, SMSC_REG_LED_LINK, reg); + } else { + cap1066_read_reg(client, SMSC_REG_LED_LINK, ®); + reg &= ~(1 << led_dev->led_index); + cap1066_write_reg(client, SMSC_REG_LED_LINK, reg); + + cap1066_read_reg(client, SMSC_REG_LED_OUTPUT_CTL, ®); + if (new_mode == E_SMSC_CAP1066_LED_MODE_ON) + reg |= (1 << led_dev->led_index); + else + reg &= ~(1 << led_dev->led_index); + cap1066_write_reg(client, SMSC_REG_LED_OUTPUT_CTL, reg); + } + led_dev->led_mode = new_mode; + + return read_len; +} + +static ssize_t show_control(struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct cap1066_led_dev *led_dev; + const char *str; + + led_dev = to_cap1066_led_dev(dev); + switch (led_dev->led_mode) { + case E_SMSC_CAP1066_LED_MODE_AUTO: + str = "auto"; + break; + + case E_SMSC_CAP1066_LED_MODE_ON: + str = "on"; + break; + + case E_SMSC_CAP1066_LED_MODE_OFF: + str = "off"; + break; + + default: + str = "invalid"; + break; + } + + return sprintf(buf, "%s\n", str); +} + +static DEVICE_ATTR(control, S_IWUSR | S_IRUSR, show_control, store_control); + +static struct device_attribute *cap1066_led_dev_attrs[] = { + &dev_attr_control, +}; + +/* + * helper used to create all attributes given in the attr array. + * + * if something goes wrong during creation, remove attributes that + * have already been created. + */ +static int create_sysfs_files(struct device *dev, + struct device_attribute **attrs, + size_t count) +{ + int created; + int error = 0; + + for (created = 0; created < count; ++created) { + error = device_create_file(dev, attrs[created]); + if (error) + break; + } + + if (!error) + /* + * no errors, can return. + */ + return 0; + + /* + * errors during creation, remove already created + * files. + */ + while (--created >= 0) + device_remove_file(dev, attrs[created]); + + return error; +} + +/* + * create a led device. This will create a new directory in the sysfs + * base of the parent. a symlink will be created if a button name is + * found via get_keycode_btn_name(). + */ +static struct cap1066_led_dev *cap1066_create_led_dev(struct device *parent, + struct cap1066_priv *priv, + int index, int key_code) +{ + struct cap1066_led_dev *dev; + int error = 0; + + dev = kzalloc(sizeof (*dev), GFP_KERNEL); + if (!dev) + return NULL; + + dev->led_index = index; + dev->parent_priv = priv; + dev_set_name(&dev->dev, "led_btn_%i", index); + dev->dev.release = cap1066_led_dev_release; + dev->dev.parent = parent; + if (device_register(&dev->dev) < 0) { + kfree(dev); + return NULL; + } + + /* + * create sysfs attributes. + */ + error = create_sysfs_files(&dev->dev, cap1066_led_dev_attrs, + ARRAY_SIZE(cap1066_led_dev_attrs)); + if (error) { + device_unregister(&dev->dev); + return NULL; + } + + /* + * create sysfs symlinks to friendly names, wherever possible. + */ + dev->btn_link = get_keycode_btn_name(key_code); + if (dev->btn_link) { + error = sysfs_create_link(&parent->kobj, &dev->dev.kobj, + dev->btn_link); + if (error) + dev->btn_link = NULL; + } + return dev; +} + +static void cap1066_remove_led_dev(struct cap1066_led_dev *dev) +{ + int i; + + if (dev->btn_link) + sysfs_remove_link(&dev->dev.parent->kobj, dev->btn_link); + + for (i = 0; i < ARRAY_SIZE(cap1066_led_dev_attrs); ++i) + device_remove_file(&dev->dev, cap1066_led_dev_attrs[i]); + device_unregister(&dev->dev); + + /* + * dev->release() kfree the cap1066_led_dev struct + */ +} + +/* + * helper to exctract an unsigned long from the buffer given in + * parameter. + * + * first store buf in a zero terminated string and strtoul() it. + */ +static int get_ulong(const char *buf, size_t count, unsigned long *ret) +{ + char local_buf[32]; + unsigned long val; + const char *end; + + strncpy(local_buf, buf, min(count , sizeof (local_buf))); + local_buf[min(count, sizeof (local_buf) - 1)] = 0; + + val = simple_strtoul(local_buf, (char**)&end, 0); + if (!is_white(*end)) + /* + * garbage after end of input. + */ + return -EINVAL; + + *ret = val; + + return 0; +} + +/* + * duty cycle sysfs callbacks: things may not work as expected if + * duty_cycle_min is >= duty_cycle_max. + * + * values that can be written in duty_cycle_max/duty_cycle_min + * attributes can be on the range [0, 16 [. + * + * 0 means the lowest possible pwm duty cycle. + * 1 means the highest possible pwm duty cycle. + */ + +static ssize_t store_duty_cycle_min(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + if (val > 0xf) + return -ERANGE; + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, ®); + reg &= ~0xf; + reg |= val; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, reg); + + priv->duty_cycle_min = val; + + pr_debug(PFX "store_duty_cycle_min: reg = 0x%02x\n", reg); + return count; +} + +static ssize_t show_duty_cycle_min(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + return sprintf(buf, "%u\n", priv->duty_cycle_min); +} + +static ssize_t store_duty_cycle_max(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + if (val > 0xf) + return -ERANGE; + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, ®); + reg &= ~0xf0; + reg |= val << 4; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_DCYCLE, reg); + + priv->duty_cycle_max = val; + + pr_debug(PFX "store_duty_cycle_max: reg = 0x%02x\n", reg); + return count; +} + +static ssize_t show_duty_cycle_max(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + return sprintf(buf, "%u\n", priv->duty_cycle_max); +} + +/* + * convert millisecond value to a "raw" value ready to be written to + * the register. + */ +static u8 msec_to_raw_ramp_time(unsigned long msec) +{ + u8 ret; + + if (msec <= 1500) + /* + * register handles 250 msec increments if below 1500 + * msec. + */ + ret = msec / 250; + else + /* + * there is no 1750 msec step, and 2000 msec is + * encoded as 0x7. + */ + ret = 0x7; + + return ret; +} + +/* + * convert raw register value to a millisecond value. + */ +static unsigned long raw_ramp_time_to_msec(u8 raw) +{ + unsigned long ret; + + if (raw < 7) + ret = 250 * raw; + else + ret = 2000; + + return ret; +} + +/* + * ramp time sysfs callbacks. delays are not reliable if programmed + * want time is higher than 1000 msec. + * + * values that can be written are on the range [0, 2000] and are given + * in milliseconds. Values higher than 2000 are clamped to 2000. shown + * values are rounded up to the next value supported by the hardware. + */ + +static ssize_t store_ramp_time_rise(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + u8 raw_val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + raw_val = msec_to_raw_ramp_time(val); + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, ®); + reg &= ~(0x7 << 3); + reg |= raw_val << 3; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, reg); + + priv->raw_ramp_time_rise = raw_val; + + pr_debug(PFX "store_ramp_time_rise: reg = %02x\n", reg); + return count; +} + +static ssize_t show_ramp_time_rise(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + unsigned long msec; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + msec = raw_ramp_time_to_msec(priv->raw_ramp_time_rise); + + return sprintf(buf, "%lu\n", msec); +} + +static ssize_t store_ramp_time_fall(struct device *dev, + struct device_attribute *attr, + const char *buf, size_t count) +{ + unsigned long val; + u8 raw_val; + struct i2c_client *client; + struct cap1066_priv *priv; + int error; + u8 reg; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + if (is_white(*buf)) + return 1; + + error = get_ulong(buf, count, &val); + if (error) + return error; + + raw_val = msec_to_raw_ramp_time(val); + + cap1066_read_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, ®); + reg &= ~0x7; + reg |= raw_val; + cap1066_write_reg(client, SMSC_REG_LED_DIRECT_RAMP_RATE, reg); + + priv->raw_ramp_time_fall = raw_val; + + pr_debug(PFX "store_ramp_time_rise: reg = %02x\n", reg); + return count; +} + +static ssize_t show_ramp_time_fall(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + struct cap1066_priv *priv; + unsigned long msec; + + client = to_i2c_client(dev); + priv = i2c_get_clientdata(client); + + msec = raw_ramp_time_to_msec(priv->raw_ramp_time_fall); + + return sprintf(buf, "%lu\n", msec); +} + +#define MTOUCH_ENABLE (1 << 7) +#define MTOUCH_COUNT_MASK (3 << 2) +#define MTOUCH_COUNT_SHIFT (2) + +/* + * touch limit handling: the hardware can report at most 1 to 4 key + * press event or no limit at all. + * + * Accepted values in touch_limit attribte: + * 0 -> no limit + * [1, 4] -> limit to the indicated count + * [4, +inf [ -> invalid + */ +static ssize_t store_touch_limit(struct device *dev, + struct device_attribute *attr, const char *buf, + size_t count) +{ + struct i2c_client *client; + unsigned long limit; + int err; + u8 mtouch_reg; + + client = to_i2c_client(dev); + + if (is_white(*buf)) + return 1; + + err = get_ulong(buf, count, &limit); + if (err) + return err; + + if (limit > 4) + return -EINVAL; + + if (limit == 0) { + mtouch_reg = 0; + } else { + mtouch_reg = MTOUCH_ENABLE | + ((limit - 1) << MTOUCH_COUNT_SHIFT); + } + cap1066_write_reg(client, SMSC_REG_MTOUCH_CFG_REG, mtouch_reg); + + return count; +} + +static ssize_t show_touch_limit(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct i2c_client *client; + u8 mtouch_reg; + + client = to_i2c_client(dev); + + cap1066_read_reg(client, SMSC_REG_MTOUCH_CFG_REG, &mtouch_reg); + + if (mtouch_reg & MTOUCH_ENABLE) { + u8 count = (mtouch_reg & MTOUCH_COUNT_MASK) >> + MTOUCH_COUNT_SHIFT; + return sprintf(buf, "%d\n", count + 1); + } else { + return sprintf(buf, "0\n"); + } +} + +static DEVICE_ATTR(duty_cycle_min, S_IRUSR | S_IWUSR, show_duty_cycle_min, + store_duty_cycle_min); + +static DEVICE_ATTR(duty_cycle_max, S_IRUSR | S_IWUSR, show_duty_cycle_max, + store_duty_cycle_max); + +static DEVICE_ATTR(ramp_time_rise, S_IRUSR | S_IWUSR, show_ramp_time_rise, + store_ramp_time_rise); + +static DEVICE_ATTR(ramp_time_fall, S_IRUSR | S_IWUSR, show_ramp_time_fall, + store_ramp_time_fall); + +static DEVICE_ATTR(touch_limit, S_IWUSR | S_IRUSR, show_touch_limit, + store_touch_limit); + +static struct device_attribute *cap1066_base_attributes[] = { + &dev_attr_duty_cycle_min, + &dev_attr_duty_cycle_max, + &dev_attr_ramp_time_rise, + &dev_attr_ramp_time_fall, + &dev_attr_touch_limit, +}; + +/* + * i2c core probe callback, called after sucessful detect + */ +static int cap1066_probe(struct i2c_client *client) +{ + struct device_node *np = client->dev.of_node; + struct input_dev *input; + struct cap1066_priv *priv; + struct reset_control *reset; + int ret, i; + + priv = devm_kzalloc(&client->dev, sizeof (*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->irq_gpio = devm_gpiod_get_optional(&client->dev, + "irq", + GPIOD_IN); + if (IS_ERR(priv->irq_gpio)) { + ret = PTR_ERR(priv->irq_gpio); + if (ret != -EPROBE_DEFER) + dev_err(&client->dev, + "failed to get irq gpio :%d", ret); + return ret; + } + + if (np) { + ret = of_property_read_u32_array(np, + "keymap", + priv->keymap, + ARRAY_SIZE(priv->keymap)); + if (ret < 0) { + dev_err(&client->dev, + "bad/missing keymap property: %d", ret); + return ret; + } + } else + memcpy(priv->keymap, default_map, sizeof (priv->keymap)); + + /* un-reset if needed */ + reset = devm_reset_control_get_shared_by_index(&client->dev, 0); + if (IS_ERR(reset)) { + ret = PTR_ERR(reset); + if (ret == -ENOENT) + reset = NULL; + else if (ret != -EPROBE_DEFER){ + dev_err(&client->dev, "failed to get reset: %d\n", + ret); + return ret; + } + } + + if (reset && reset_control_status(reset)) { + reset_control_deassert(reset); + msleep(10); + } + + ret = cap1066_detect(client, NULL); + if (ret) { + if (ret != -ENODEV) + return ret; + + dev_warn(&client->dev, "unknown cap1x66 device, try anyway.\n"); + } + + /* initialize controller */ + ret = cap1066_init_hw(client); + if (ret) + return ret; + + /* allocate context */ + input = input_allocate_device(); + if (!priv || !input) { + ret = -ENOMEM; + goto out_fail; + } + + /* + * must match what has been setup in cap1066_init_hw(). + */ + priv->duty_cycle_min = DEFAULT_DUTY_CYCLE_MIN; + priv->duty_cycle_max = DEFAULT_DUTY_CYCLE_MAX; + priv->raw_ramp_time_rise = DEFAULT_RAMP_TIME_RISE; + priv->raw_ramp_time_fall = DEFAULT_RAMP_TIME_FALL; + + priv->input = input; + priv->client = client; + + input_set_drvdata(input, priv); + + ret = input_setup_polling(input, cap1066_input_poll); + if (ret) + goto out_fail; + + input_set_poll_interval(input, 50 /* ms */); + + input->name = "smsc_cap1066"; + input->phys = "smsc_cap1066/input0"; + input->id.bustype = BUS_I2C; + input->dev.parent = &client->dev; + + input->keycode = priv->keymap; + input->keycodemax = ARRAY_SIZE(priv->keymap); + input->keycodesize = sizeof (unsigned short); + + set_bit(EV_REP, input->evbit); + set_bit(EV_KEY, input->evbit); + for (i = 0; i < ARRAY_SIZE(priv->keymap); i++) + set_bit(priv->keymap[i], input->keybit); + + i2c_set_clientdata(client, priv); + + ret = input_register_device(input); + if (ret) + goto out_fail; + + for (i = 0; i < ARRAY_SIZE(priv->keymap); ++i) { + if (!priv->keymap[i]) + continue; + priv->led_devices[i] = + cap1066_create_led_dev(&client->dev, + priv, i, priv->keymap[i]); + } + + if (create_sysfs_files(&client->dev, cap1066_base_attributes, + ARRAY_SIZE(cap1066_base_attributes)) < 0) + goto out_free_led_devs; + + return 0; + +out_free_led_devs: + for (i = 0; i < ARRAY_SIZE(priv->keymap); ++i) + if (priv->led_devices[i]) + cap1066_remove_led_dev(priv->led_devices[i]); +out_fail: + input_free_device(input); + i2c_set_clientdata(client, NULL); + return ret; +} + +/* + * i2c core remove callback + */ +static void cap1066_remove(struct i2c_client *client) +{ + int i; + struct cap1066_priv *priv = i2c_get_clientdata(client); + + for (i = 0; i < ARRAY_SIZE(cap1066_base_attributes); ++i) + device_remove_file(&client->dev, cap1066_base_attributes[i]); + + for (i = 0; i < ARRAY_SIZE(priv->keymap); ++i) { + if (priv->led_devices[i]) + cap1066_remove_led_dev(priv->led_devices[i]); + } + + input_unregister_device(priv->input); + input_free_device(priv->input); +} + +static const struct of_device_id cap1066_of_table[] = { + { .compatible = "smsc,smsc_cap1066" }, + { } +}; +MODULE_DEVICE_TABLE(of, cap1066_of_table); + +static struct i2c_driver cap1066_driver = { + .driver = { + .name = "cap1066", + .of_match_table = of_match_ptr(cap1066_of_table), + }, + .probe = cap1066_probe, + .remove = cap1066_remove, + .id_table = cap1066_id, + + .detect = cap1066_detect, + .class = I2C_CLASS_HWMON, + .address_list = normal_i2c, +}; + +static int __init cap1066_init(void) +{ + return i2c_add_driver(&cap1066_driver); +} + +static void __exit cap1066_exit(void) +{ + i2c_del_driver(&cap1066_driver); +} + + +MODULE_AUTHOR("Maxime Bizon "); +MODULE_DESCRIPTION("SMSC CAP1066 driver"); +MODULE_LICENSE("GPL"); + +module_init(cap1066_init); +module_exit(cap1066_exit); --- /dev/null 2025-08-21 03:50:04.461059392 +0200 +++ linux-6.13.12-fbx/drivers/leds/leds-led1202.c 2025-09-25 17:40:33.087354928 +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/