linux-merge February 2023

linux-merge@lists.open-mesh.org

2 participants
32 discussions

Build check errors found: 2023-02-28
by postmaster＠open-mesh.org 28 Feb '23

28 Feb '23

Name of failed tests ==================== stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/Documentation/networking/batman-adv.rst | 2 net/net/batman-adv/bat_iv_ogm.c | 1 net/net/batman-adv/bat_v_elp.c | 1 net/net/batman-adv/bat_v_ogm.c | 5 net/net/batman-adv/distributed-arp-table.c | 2 net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 251 +------------------ net/net/batman-adv/multicast.h | 38 -- net/net/batman-adv/network-coding.c | 4 net/net/batman-adv/routing.c | 7 net/net/batman-adv/soft-interface.c | 26 - net/net/batman-adv/translation-table.c | 4 net/net/batman-adv/tvlv.c | 71 +++-- net/net/batman-adv/tvlv.h | 9 net/net/batman-adv/types.h | 6 16 files changed, 108 insertions(+), 323 deletions(-) Statistics ========== stable ------ Failed tests: 1 Started build tests: 279 Tested Linux versions: 36 Tested configs: 111 main ---- Failed tests: 0 Started build tests: 263 Tested Linux versions: 36 Tested configs: 110

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20230227
by batman＠open-mesh.org 27 Feb '23

27 Feb '23

The following commit has been merged in the master branch: commit 8395d932d24a9b4c01ab33ed0b4b2de06328afc2 Merge: a93e884edf61f9debc9ca61ef9e545f0394ab666 1ba7dfb905b3975bdb8b9d1f7793efcdfc59385b Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Fri Feb 24 13:31:53 2023 -0800 Merge tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux Pull devicetree updates from Rob Herring: "DT core: - Add node lifecycle unit tests - Add of_property_present() helper aligned with fwnode API - Print more information on reserved regions on boot - Update dtc to upstream v1.6.1-66-gabbd523bae6e - Use strscpy() to instead of strncpy() in DT core - Add option for schema validation on %.dtb targets Bindings: - Add/fix support for listing multiple patterns in DT_SCHEMA_FILES - Rework external memory controller/bus bindings to properly support controller specific child node properties - Convert loongson,ls1x-intc, fcs,fusb302, sil,sii8620, Rockchip RK3399 PCIe, Synquacer I2C, and Synquacer EXIU bindings to DT schema format - Add RiscV SBI PMU event mapping binding - Add missing contraints on Arm SCMI child node allowed properties - Add a bunch of missing Socionext UniPhier glue block bindings and example fixes - Various fixes for duplicate or conflicting type definitions on DT properties" * tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (66 commits) dt-bindings: regulator: Add mps,mpq7932 power-management IC of: dynamic: Fix spelling mistake "kojbect" -> "kobject" dt-bindings: drop Sagar Kadam from SiFive binding maintainership dt-bindings: sram: qcom,imem: document sm8450 dt-bindings: interrupt-controller: convert loongson,ls1x-intc.txt to json-schema dt-bindings: arm: Add Cortex-A715 and X3 of: dynamic: add lifecycle docbook info to node creation functions of: add consistency check to of_node_release() of: do not use "%pOF" printk format on node with refcount of zero of: unittest: add node lifecycle tests of: update kconfig unittest help of: add processing of EXPECT_NOT to of_unittest_expect of: prepare to add processing of EXPECT_NOT to of_unittest_expect of: Use preferred of_property_read_* functions of: Use of_property_present() helper of: Add of_property_present() helper of: reserved_mem: Use proper binary prefix dt-bindings: Fix multi pattern support in DT_SCHEMA_FILES of: reserved-mem: print out reserved-mem details during boot dt-bindings: serial: restrict possible child node names ... diff --combined Documentation/devicetree/bindings/display/msm/dp-controller.yaml index efe4257c031f,9db39fb1cfd7..0e8d8df686dc --- a/Documentation/devicetree/bindings/display/msm/dp-controller.yaml +++ b/Documentation/devicetree/bindings/display/msm/dp-controller.yaml @@@ -21,9 -21,6 +21,9 @@@ properties - qcom,sc7280-edp - qcom,sc8180x-dp - qcom,sc8180x-edp + - qcom,sc8280xp-dp + - qcom,sc8280xp-edp + - qcom,sdm845-dp - qcom,sm8350-dp reg: @@@ -71,8 -68,7 +71,7 @@@ items: - const: dp - operating-points-v2: - maxItems: 1 + operating-points-v2: true opp-table: true @@@ -84,7 -80,6 +83,7 @@@ data-lanes: $ref: /schemas/types.yaml#/definitions/uint32-array + deprecated: true minItems: 1 maxItems: 4 items: @@@ -106,28 -101,8 +105,28 @@@ description: Input endpoint of the controller port@1: - $ref: /schemas/graph.yaml#/properties/port + $ref: /schemas/graph.yaml#/$defs/port-base description: Output endpoint of the controller + properties: + endpoint: + $ref: /schemas/media/video-interfaces.yaml# + unevaluatedProperties: false + properties: + data-lanes: + minItems: 1 + maxItems: 4 + items: + enum: [ 0, 1, 2, 3 ] + + link-frequencies: + minItems: 1 + maxItems: 4 + items: + enum: [ 1620000000, 2700000000, 5400000000, 8100000000 ] + + required: + - port@0 + - port@1 required: - compatible @@@ -151,10 -126,11 +150,10 @@@ allOf enum: - qcom,sc7280-edp - qcom,sc8180x-edp + - qcom,sc8280xp-edp then: properties: "#sound-dai-cells": false - reg: - maxItems: 4 else: properties: aux-bus: false @@@ -216,8 -192,6 +215,8 @@@ examples reg = <1>; endpoint { remote-endpoint = <&typec>; + data-lanes = <0 1>; + link-frequencies = /bits/ 64 <1620000000 2700000000 5400000000 8100000000>; }; }; }; diff --combined Documentation/devicetree/bindings/display/msm/gpu.yaml index db8afc636576,304525f81563..d4191cca71fb --- a/Documentation/devicetree/bindings/display/msm/gpu.yaml +++ b/Documentation/devicetree/bindings/display/msm/gpu.yaml @@@ -89,7 -89,7 +89,7 @@@ properties help bring the GPU out of secure mode. properties: memory-region: - $ref: /schemas/types.yaml#/definitions/phandle + maxItems: 1 firmware-name: description: | @@@ -149,8 -149,6 +149,8 @@@ allOf description: GPU 3D engine clock - const: rbbmtimer description: GPU RBBM Timer for Adreno 5xx series + - const: rbcpr + description: GPU RB Core Power Reduction clock minItems: 2 maxItems: 7 diff --combined Documentation/devicetree/bindings/serial/8250.yaml index c55865fd371a,09b40ef59ba3..692aa05500fd --- a/Documentation/devicetree/bindings/serial/8250.yaml +++ b/Documentation/devicetree/bindings/serial/8250.yaml @@@ -11,6 -11,7 +11,7 @@@ maintainers allOf: - $ref: serial.yaml# + - $ref: /schemas/memory-controllers/mc-peripheral-props.yaml# - if: anyOf: - required: @@@ -62,6 -63,7 +63,6 @@@ properties - const: mrvl,pxa-uart - const: nuvoton,wpcm450-uart - const: nuvoton,npcm750-uart - - const: nuvoton,npcm845-uart - const: nvidia,tegra20-uart - const: nxp,lpc3220-uart - items: @@@ -91,10 -93,6 +92,10 @@@ - enum: - ns16550 # Deprecated, unless the FIFO really is broken - ns16550a + - items: + - enum: + - nuvoton,npcm845-uart + - const: nuvoton,npcm750-uart - items: - enum: - ralink,mt7620a-uart @@@ -203,13 -201,12 +204,13 @@@ deprecated: true aspeed,lpc-io-reg: - $ref: '/schemas/types.yaml#/definitions/uint32' + $ref: /schemas/types.yaml#/definitions/uint32-array + maxItems: 1 description: | The VUART LPC address. Only applicable to aspeed,ast2500-vuart. aspeed,lpc-interrupts: - $ref: "/schemas/types.yaml#/definitions/uint32-array" + $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 2 maxItems: 2 description: | diff --combined Documentation/devicetree/bindings/serial/serial.yaml index e05ad3ac2abc,21992e9a3c2b..c9231e501f1f --- a/Documentation/devicetree/bindings/serial/serial.yaml +++ b/Documentation/devicetree/bindings/serial/serial.yaml @@@ -96,7 -96,7 +96,7 @@@ then rts-gpios: false patternProperties: - ".*": + "^bluetooth|gnss|gps|mcu$": if: type: object then: @@@ -141,13 -141,13 +141,13 @@@ additionalProperties: tru examples: - | serial@1234 { - compatible = "ns16550a"; - reg = <0x1234 0x20>; - interrupts = <1>; - - bluetooth { - compatible = "brcm,bcm4330-bt"; - interrupt-parent = <&gpio>; - interrupts = <10>; - }; + compatible = "ns16550a"; + reg = <0x1234 0x20>; + interrupts = <1>; + + bluetooth { + compatible = "brcm,bcm4330-bt"; + interrupt-parent = <&gpio>; + interrupts = <10>; + }; }; diff --combined Documentation/devicetree/bindings/ufs/qcom,ufs.yaml index 6bc4c0b59d92,54f5f8dc5c87..c5a06c048389 --- a/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml +++ b/Documentation/devicetree/bindings/ufs/qcom,ufs.yaml @@@ -33,7 -33,6 +33,7 @@@ properties - qcom,sm8250-ufshc - qcom,sm8350-ufshc - qcom,sm8450-ufshc + - qcom,sm8550-ufshc - const: qcom,ufshc - const: jedec,ufs-2.0 @@@ -45,8 -44,6 +45,8 @@@ minItems: 8 maxItems: 11 + dma-coherent: true + interconnects: minItems: 2 maxItems: 2 @@@ -74,6 -71,9 +74,9 @@@ minItems: 1 maxItems: 2 + required-opps: + maxItems: 1 + resets: maxItems: 1 @@@ -106,7 -106,6 +109,7 @@@ allOf - qcom,sm8250-ufshc - qcom,sm8350-ufshc - qcom,sm8450-ufshc + - qcom,sm8550-ufshc then: properties: clocks: diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml index 94d35b562d95,0e57ae744199..ed64e06ecca4 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@@ -69,8 -69,6 +69,8 @@@ patternProperties description: Annapurna Labs "^alcatel,.*": description: Alcatel + "^aldec,.*": + description: Aldec, Inc. "^alfa-network,.*": description: ALFA Network Inc. "^allegro,.*": @@@ -266,8 -264,6 +266,8 @@@ description: Cirrus Logic, Inc. "^cisco,.*": description: Cisco Systems, Inc. + "^clockwork,.*": + description: Clockwork Tech LLC "^cloos,.*": description: Carl Cloos Schweisstechnik GmbH. "^cloudengines,.*": @@@ -378,8 -374,6 +378,8 @@@ description: EBV Elektronik "^eckelmann,.*": description: Eckelmann AG + "^edgeble,.*": + description: Edgeble AI Technologies Pvt. Ltd. "^edimax,.*": description: EDIMAX Technology Co., Ltd "^edt,.*": @@@ -402,8 -396,6 +402,8 @@@ description: Elimo Engineering Ltd. "^elpida,.*": description: Elpida Memory, Inc. + "^embedfire,.*": + description: Dongguan EmbedFire Electronic Technology Co., Ltd. "^embest,.*": description: Shenzhen Embest Technology Co., Ltd. "^emlid,.*": @@@ -520,8 -512,6 +520,8 @@@ description: Shenzhen Huiding Technology Co., Ltd. "^google,.*": description: Google, Inc. + "^gplus,.*": + description: GPLUS "^grinn,.*": description: Grinn "^grmn,.*": @@@ -645,8 -635,6 +645,8 @@@ description: Inverse Path "^iom,.*": description: Iomega Corporation + "^irondevice,.*": + description: Iron Device Corporation "^isee,.*": description: ISEE 2007 S.L. "^isil,.*": @@@ -741,6 -729,8 +741,8 @@@ description: Lichee Pi "^linaro,.*": description: Linaro Limited + "^lineartechnology,.*": + description: Linear Technology "^linksprite,.*": description: LinkSprite Technologies, Inc. "^linksys,.*": @@@ -787,8 -777,6 +789,8 @@@ description: MaxBotix Inc. "^maxim,.*": description: Maxim Integrated Products + "^maxlinear,.*": + description: MaxLinear Inc. "^mbvl,.*": description: Mobiveil Inc. "^mcube,.*": @@@ -859,8 -847,6 +861,8 @@@ description: Moortec Semiconductor Ltd. "^mosaixtech,.*": description: Mosaix Technologies, Inc. + "^motorcomm,.*": + description: MotorComm, Inc. "^motorola,.*": description: Motorola, Inc. "^moxa,.*": @@@ -1041,8 -1027,6 +1043,8 @@@ description: PocketBook International SA "^polaroid,.*": description: Polaroid Corporation + "^polyhex,.*": + description: Polyhex Technology Co. Ltd. "^portwell,.*": description: Portwell Inc. "^poslab,.*": @@@ -1264,8 -1248,6 +1266,8 @@@ description: Starry Electronic Technology (ShenZhen) Co., LTD "^startek,.*": description: Startek + "^starterkit,.*": + description: Starterkit "^ste,.*": description: ST-Ericsson deprecated: true @@@ -1339,8 -1321,6 +1341,8 @@@ description: thingy.jp "^thundercomm,.*": description: Thundercomm Technology Co., Ltd. + "^thwc,.*": + description: Shenzhen Tong Heng Wei Chuang Technology Co., Ltd. "^ti,.*": description: Texas Instruments "^tianma,.*": @@@ -1394,8 -1374,6 +1396,8 @@@ description: uCRobotics "^udoo,.*": description: Udoo + "^ufispace,.*": + description: Ufi Space Co., Ltd. "^ugoos,.*": description: Ugoos Industrial Co., Ltd. "^uniwest,.*": @@@ -1422,8 -1400,6 +1424,8 @@@ description: Vertexcom Technologies, Inc. "^via,.*": description: VIA Technologies, Inc. + "^vialab,.*": + description: VIA Labs, Inc. "^vicor,.*": description: Vicor Corporation "^videostrong,.*": @@@ -1470,8 -1446,6 +1472,8 @@@ description: Shenzhen whwave Electronics, Inc. "^wi2wi,.*": description: Wi2Wi, Inc. + "^widora,.*": + description: Beijing Widora Technology Co., Ltd. "^wiligear,.*": description: Wiligear, Ltd. "^willsemi,.*": diff --combined MAINTAINERS index 7e8258e321c1,06d5be2c713c..02d2d33f507c --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -361,8 -361,6 +361,8 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/ABI/testing/configfs-acpi F: Documentation/ABI/testing/sysfs-bus-acpi F: Documentation/firmware-guide/acpi/ +F: arch/x86/kernel/acpi/ +F: arch/x86/pci/acpi.c F: drivers/acpi/ F: drivers/pci/*/*acpi* F: drivers/pci/*acpi* @@@ -385,7 -383,7 +385,7 @@@ ACPI COMPONENT ARCHITECTURE (ACPICA M: Robert Moore <robert.moore(a)intel.com> M: "Rafael J. Wysocki" <rafael.j.wysocki(a)intel.com> L: linux-acpi(a)vger.kernel.org -L: devel(a)acpica.org +L: acpica-devel(a)lists.linuxfoundation.org S: Supported W: https://acpica.org/ W: https://github.com/acpica/acpica/ @@@ -1099,12 -1097,14 +1099,12 @@@ S: Maintaine F: drivers/dma/ptdma/ AMD SEATTLE DEVICE TREE SUPPORT -M: Brijesh Singh <brijeshkumar.singh(a)amd.com> M: Suravee Suthikulpanit <suravee.suthikulpanit(a)amd.com> M: Tom Lendacky <thomas.lendacky(a)amd.com> S: Supported F: arch/arm64/boot/dts/amd/ AMD XGBE DRIVER -M: Tom Lendacky <thomas.lendacky(a)amd.com> M: "Shyam Sundar S K" <Shyam-sundar.S-k(a)amd.com> L: netdev(a)vger.kernel.org S: Supported @@@ -1853,6 -1853,21 +1853,6 @@@ F: include/dt-bindings/reset/actions, F: include/linux/soc/actions/ N: owl -ARM/ADS SPHERE MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/AFEB9260 MACHINE SUPPORT -M: Sergey Lapin <slapin(a)ossfans.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/AJECO 1ARM MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/Allwinner SoC Clock Support M: Emilio López <emilio(a)elopez.com.ar> S: Maintained @@@ -1873,7 -1888,7 +1873,7 @@@ F: drivers/pinctrl/sunxi F: drivers/soc/sunxi/ N: allwinner N: sun[x456789]i -N: sun50i +N: sun[25]0i ARM/Amlogic Meson SoC CLOCK FRAMEWORK M: Neil Armstrong <neil.armstrong(a)linaro.org> @@@ -2043,6 -2058,11 +2043,6 @@@ F: arch/arm/boot/dts/ecx-*.dts F: arch/arm/boot/dts/highbank.dts F: arch/arm/mach-highbank/ -ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT -M: Krzysztof Halasa <khalasa(a)piap.pl> -S: Maintained -F: arch/arm/mach-cns3xxx/ - ARM/CAVIUM THUNDER NETWORK DRIVER M: Sunil Goutham <sgoutham(a)marvell.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2071,10 -2091,8 +2071,10 @@@ M: Hartley Sweeten <hsweeten@visionengr M: Alexander Sverdlin <alexander.sverdlin(a)gmail.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained +F: Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml +F: arch/arm/boot/compressed/misc-ep93xx.h F: arch/arm/mach-ep93xx/ -F: arch/arm/mach-ep93xx/include/mach/ +F: drivers/iio/adc/ep93xx_adc.c ARM/CLKDEV SUPPORT M: Russell King <linux(a)armlinux.org.uk> @@@ -2090,6 -2108,11 +2090,6 @@@ S: Maintaine F: arch/arm/boot/dts/cx92755* N: digicolor -ARM/CONTEC MICRO9 MACHINE SUPPORT -M: Hubert Feurstein <hubert.feurstein(a)contec.at> -S: Maintained -F: arch/arm/mach-ep93xx/micro9.c - ARM/CORESIGHT FRAMEWORK AND DRIVERS M: Mathieu Poirier <mathieu.poirier(a)linaro.org> M: Suzuki K Poulose <suzuki.poulose(a)arm.com> @@@ -2101,7 -2124,6 +2101,7 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git F: Documentation/ABI/testing/sysfs-bus-coresight-devices-* F: Documentation/devicetree/bindings/arm/arm,coresight-*.yaml +F: Documentation/devicetree/bindings/arm/qcom,coresight-*.yaml F: Documentation/devicetree/bindings/arm/arm,embedded-trace-extension.yaml F: Documentation/devicetree/bindings/arm/arm,trace-buffer-extension.yaml F: Documentation/trace/coresight/* @@@ -2117,6 -2139,10 +2117,6 @@@ F: tools/perf/arch/arm/util/pmu. F: tools/perf/util/cs-etm-decoder/* F: tools/perf/util/cs-etm.* -ARM/CORGI MACHINE SUPPORT -M: Richard Purdie <rpurdie(a)rpsys.net> -S: Maintained - ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE M: Hans Ulli Kroll <ulli.kroll(a)googlemail.com> M: Linus Walleij <linus.walleij(a)linaro.org> @@@ -2156,6 -2182,12 +2156,6 @@@ F: include/dt-bindings/bus/moxtet. F: include/linux/armada-37xx-rwtm-mailbox.h F: include/linux/moxtet.h -ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) -M: Robert Jarzmik <robert.jarzmik(a)free.fr> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/ezx.c - ARM/FARADAY FA526 PORT M: Hans Ulli Kroll <ulli.kroll(a)googlemail.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2181,9 -2213,6 +2181,9 @@@ L: linux-arm-kernel(a)lists.infradead.or S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git X: drivers/media/i2c/ +F: arch/arm64/boot/dts/freescale/ +X: arch/arm64/boot/dts/freescale/fsl-* +X: arch/arm64/boot/dts/freescale/qoriq-* N: imx N: mxs @@@ -2208,11 -2237,25 +2208,11 @@@ T: git git://git.kernel.org/pub/scm/lin F: arch/arm/boot/dts/vf* F: arch/arm/mach-imx/*vf610* -ARM/GLOMATION GESBC9312SX MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/GUMSTIX MACHINE SUPPORT M: Steve Sakoman <sakoman(a)gmail.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT -M: Philipp Zabel <philipp.zabel(a)gmail.com> -M: Paul Parsons <lost.distance(a)yahoo.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/hx4700.c -F: arch/arm/mach-pxa/include/mach/hx4700.h -F: sound/soc/pxa/hx4700.c - ARM/HISILICON SOC SUPPORT M: Wei Xu <xuwei5(a)hisilicon.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2237,16 -2280,13 +2237,16 @@@ ARM/HPE GXP ARCHITECTUR M: Jean-Marie Verdun <verdun(a)hpe.com> M: Nick Hawkins <nick.hawkins(a)hpe.com> S: Maintained +F: Documentation/hwmon/gxp-fan-ctrl.rst F: Documentation/devicetree/bindings/arm/hpe,gxp.yaml +F: Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml F: Documentation/devicetree/bindings/spi/hpe,gxp-spifi.yaml F: Documentation/devicetree/bindings/timer/hpe,gxp-timer.yaml F: arch/arm/boot/dts/hpe-bmc* F: arch/arm/boot/dts/hpe-gxp* F: arch/arm/mach-hpe/ F: drivers/clocksource/timer-gxp.c +F: drivers/hwmon/gxp-fan-ctrl.c F: drivers/spi/spi-gxp.c F: drivers/watchdog/gxp-wdt.c @@@ -2258,6 -2298,27 +2258,6 @@@ L: linux-arm-kernel(a)lists.infradead.or S: Maintained F: arch/arm/boot/dts/omap3-igep* -ARM/INCOME PXA270 SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/colibri-pxa270-income.c - -ARM/INTEL IOP32X ARM ARCHITECTURE -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/INTEL IQ81342EX MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/INTEL IXDP2850 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/INTEL IXP4XX ARM ARCHITECTURE M: Linus Walleij <linusw(a)kernel.org> M: Imre Kaloz <kaloz(a)openwrt.org> @@@ -2265,7 -2326,7 +2265,7 @@@ M: Krzysztof Halasa <khalasa(a)piap.pl L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained F: Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml - F: Documentation/devicetree/bindings/bus/intel,ixp4xx-expansion-bus-controller.yaml + F: Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion* F: Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt F: Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml F: Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml @@@ -2290,12 -2351,22 +2290,12 @@@ M: Lennert Buytenhek <kernel@wantstofly L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/LG1K ARCHITECTURE M: Chanho Min <chanho.min(a)lge.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm64/boot/dts/lg/ -ARM/LOGICPD PXA270 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/LPC18XX ARCHITECTURE M: Vladimir Zapolskiy <vz(a)mleia.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2322,6 -2393,10 +2322,6 @@@ F: drivers/usb/host/ohci-nxp. F: drivers/watchdog/pnx4008_wdt.c N: lpc32xx -ARM/MAGICIAN MACHINE SUPPORT -M: Philipp Zabel <philipp.zabel(a)gmail.com> -S: Maintained - ARM/Marvell Dove/MV78xx0/Orion SOC support M: Andrew Lunn <andrew(a)lunn.ch> M: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com> @@@ -2376,14 -2451,11 +2376,14 @@@ F: drivers/rtc/rtc-mt7622. ARM/Mediatek SoC support M: Matthias Brugger <matthias.bgg(a)gmail.com> +R: AngeloGioacchino Del Regno <angelogioacchino.delregno(a)collabora.com> +L: linux-kernel(a)vger.kernel.org L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) L: linux-mediatek(a)lists.infradead.org (moderated for non-subscribers) S: Maintained W: https://mtk.wiki.kernel.org/ -C: irc://chat.freenode.net/linux-mediatek +C: irc://irc.libera.chat/linux-mediatek +F: arch/arm/boot/dts/mt2* F: arch/arm/boot/dts/mt6* F: arch/arm/boot/dts/mt7* F: arch/arm/boot/dts/mt8* @@@ -2391,7 -2463,7 +2391,7 @@@ F: arch/arm/mach-mediatek F: arch/arm64/boot/dts/mediatek/ F: drivers/soc/mediatek/ N: mtk -N: mt[678] +N: mt[2678] K: mediatek ARM/Mediatek USB3 PHY DRIVER @@@ -2453,6 -2525,12 +2453,6 @@@ F: arch/arm/boot/dts/milbeaut F: arch/arm/mach-milbeaut/ N: milbeaut -ARM/MIOA701 MACHINE SUPPORT -M: Robert Jarzmik <robert.jarzmik(a)free.fr> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/mioa701.c - ARM/MStar/Sigmastar Armv7 SoC support M: Daniel Palmer <daniel(a)thingy.jp> M: Romain Perier <romain.perier(a)gmail.com> @@@ -2473,6 -2551,10 +2473,6 @@@ F: drivers/watchdog/msc313e_wdt. F: include/dt-bindings/clock/mstar-* F: include/dt-bindings/gpio/msc313-gpio.h -ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT -M: Michael Petchkovsky <mkpetch(a)internode.on.net> -S: Maintained - ARM/NOMADIK/Ux500 ARCHITECTURES M: Linus Walleij <linus.walleij(a)linaro.org> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2528,7 -2610,6 +2528,7 @@@ S: Maintaine W: https://github.com/neuschaefer/wpcm450/wiki F: Documentation/devicetree/bindings/*/*wpcm* F: arch/arm/boot/dts/nuvoton-wpcm450* +F: arch/arm/configs/wpcm450_defconfig F: arch/arm/mach-npcm/wpcm450.c F: drivers/*/*/*wpcm* F: drivers/*/*wpcm* @@@ -2542,6 -2623,13 +2542,6 @@@ L: linux-arm-kernel(a)lists.infradead.or S: Maintained F: arch/arm64/boot/dts/freescale/s32g*.dts* -ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT -L: openmoko-kernel(a)lists.openmoko.org (subscribers-only) -S: Orphan -W: http://wiki.openmoko.org/wiki/Neo_FreeRunner -F: arch/arm/mach-s3c/gta02.h -F: arch/arm/mach-s3c/mach-gta02.c - ARM/Orion SoC/Technologic Systems TS-78xx platform support M: Alexander Clouter <alex(a)digriz.org.uk> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2559,6 -2647,43 +2559,6 @@@ F: arch/arm/mach-oxnas F: drivers/power/reset/oxnas-restart.c N: oxnas -ARM/PALM TREO SUPPORT -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Orphan -F: arch/arm/mach-pxa/palmtreo.* - -ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://hackndev.com -F: arch/arm/mach-pxa/include/mach/palmld.h -F: arch/arm/mach-pxa/include/mach/palmtc.h -F: arch/arm/mach-pxa/include/mach/palmtx.h -F: arch/arm/mach-pxa/palmld.c -F: arch/arm/mach-pxa/palmt5.* -F: arch/arm/mach-pxa/palmtc.c -F: arch/arm/mach-pxa/palmte2.* -F: arch/arm/mach-pxa/palmtx.c - -ARM/PALMZ72 SUPPORT -M: Sergey Lapin <slapin(a)ossfans.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://hackndev.com -F: arch/arm/mach-pxa/palmz72.* - -ARM/PLEB SUPPORT -M: Peter Chubb <pleb(a)gelato.unsw.edu.au> -S: Maintained -W: http://www.disy.cse.unsw.edu.au/Hardware/PLEB - -ARM/PT DIGITAL BOARD PORT -M: Stefan Eletzhofer <stefan.eletzhofer(a)eletztrick.de> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://www.armlinux.org.uk/ - ARM/QUALCOMM SUPPORT M: Andy Gross <agross(a)kernel.org> M: Bjorn Andersson <andersson(a)kernel.org> @@@ -2602,6 -2727,11 +2602,6 @@@ F: include/dt-bindings/*/qcom F: include/linux/*/qcom* F: include/linux/soc/qcom/ -ARM/RADISYS ENP2611 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/RDA MICRO ARCHITECTURE M: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2677,7 -2807,7 +2677,7 @@@ F: Documentation/devicetree/bindings/i2 F: Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml F: Documentation/devicetree/bindings/spi/spi-rockchip.yaml F: arch/arm/boot/dts/rk3* -F: arch/arm/boot/dts/rv1108* +F: arch/arm/boot/dts/rv11* F: arch/arm/mach-rockchip/ F: drivers/*/*/*rockchip* F: drivers/*/*rockchip* @@@ -2722,6 -2852,7 +2722,6 @@@ F: include/linux/platform_data/*s3c F: include/linux/serial_s3c.h F: include/linux/soc/samsung/ N: exynos -N: s3c2410 N: s3c64xx N: s5pv210 @@@ -2794,7 -2925,6 +2794,7 @@@ M: Patrice Chotard <patrice.chotard@fos L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained W: http://www.stlinux.com +F: Documentation/devicetree/bindings/spi/st,ssc-spi.yaml F: Documentation/devicetree/bindings/i2c/i2c-st.txt F: arch/arm/boot/dts/sti* F: arch/arm/mach-sti/ @@@ -2880,7 -3010,7 +2880,7 @@@ M: linux-fsd(a)tesla.co L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc(a)vger.kernel.org S: Maintained -F: arch/arm64/boot/dts/tesla* +F: arch/arm64/boot/dts/tesla/ ARM/TETON BGA MACHINE SUPPORT M: "Mark F. Brown" <mark.brown314(a)gmail.com> @@@ -2933,6 -3063,16 +2933,6 @@@ F: arch/arm64/boot/dts/ti/Makefil F: arch/arm64/boot/dts/ti/k3-* F: include/dt-bindings/pinctrl/k3.h -ARM/THECUS N2100 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/TOSA MACHINE SUPPORT -M: Dmitry Eremin-Solenikov <dbaryshkov(a)gmail.com> -M: Dirk Opfer <dirk(a)opfer-online.de> -S: Maintained - ARM/TOSHIBA VISCONTI ARCHITECTURE M: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu(a)toshiba.co.jp> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2963,6 -3103,7 +2963,7 @@@ S: Maintaine F: Documentation/devicetree/bindings/arm/socionext/uniphier.yaml F: Documentation/devicetree/bindings/gpio/socionext,uniphier-gpio.yaml F: Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.yaml + F: Documentation/devicetree/bindings/soc/socionext/socionext,uniphier*.yaml F: arch/arm/boot/dts/uniphier* F: arch/arm/include/asm/hardware/cache-uniphier.h F: arch/arm/mach-uniphier/ @@@ -2989,7 -3130,7 +2990,7 @@@ S: Maintaine F: */*/*/vexpress* F: */*/vexpress* F: arch/arm/boot/dts/vexpress* -F: arch/arm/mach-vexpress/ +F: arch/arm/mach-versatile/ F: arch/arm64/boot/dts/arm/ F: drivers/clk/versatile/clk-vexpress-osc.c F: drivers/clocksource/timer-versatile.c @@@ -3002,6 -3143,13 +3003,6 @@@ S: Maintaine W: http://www.armlinux.org.uk/ F: arch/arm/vfp/ -ARM/VOIPAC PXA270 SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/include/mach/vpac270.h -F: arch/arm/mach-pxa/vpac270.c - ARM/VT8500 ARM ARCHITECTURE L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Orphan @@@ -3019,6 -3167,13 +3020,6 @@@ F: drivers/video/fbdev/vt8500lcdfb. F: drivers/video/fbdev/wm8505fb* F: drivers/video/fbdev/wmt_ge_rops.* -ARM/ZIPIT Z2 SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/include/mach/z2.h -F: arch/arm/mach-pxa/z2.c - ARM/ZYNQ ARCHITECTURE M: Michal Simek <michal.simek(a)xilinx.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -3156,7 -3311,7 +3157,7 @@@ ASPEED CRYPTO DRIVE M: Neal Liu <neal_liu(a)aspeedtech.com> L: linux-aspeed(a)lists.ozlabs.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml +F: Documentation/devicetree/bindings/crypto/aspeed,* F: drivers/crypto/aspeed/ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS @@@ -3357,7 -3512,7 +3358,7 @@@ F: drivers/net/ieee802154/atusb. AUDIT SUBSYSTEM M: Paul Moore <paul(a)paul-moore.com> M: Eric Paris <eparis(a)redhat.com> -L: linux-audit(a)redhat.com (moderated for non-subscribers) +L: audit(a)vger.kernel.org S: Supported W: https://github.com/linux-audit T: git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git @@@ -3613,6 -3768,7 +3614,6 @@@ F: net/bluetooth BONDING DRIVER M: Jay Vosburgh <j.vosburgh(a)gmail.com> -M: Veaceslav Falico <vfalico(a)gmail.com> M: Andy Gospodarek <andy(a)greyhouse.net> L: netdev(a)vger.kernel.org S: Supported @@@ -3865,13 -4021,6 +3866,13 @@@ L: bpf(a)vger.kernel.or S: Maintained F: tools/testing/selftests/bpf/ +BPF [DOCUMENTATION] (Related to Standardization) +R: David Vernet <void(a)manifault.com> +L: bpf(a)vger.kernel.org +L: bpf(a)ietf.org +S: Maintained +F: Documentation/bpf/instruction-set.rst + BPF [MISC] L: bpf(a)vger.kernel.org S: Odd Fixes @@@ -4151,17 -4300,6 +4152,17 @@@ L: linux-kernel(a)vger.kernel.or S: Maintained F: drivers/phy/broadcom/phy-brcm-usb* +BROADCOM Broadband SoC High Speed SPI Controller DRIVER +M: William Zhang <william.zhang(a)broadcom.com> +M: Kursad Oney <kursad.oney(a)broadcom.com> +M: Jonas Gorski <jonas.gorski(a)gmail.com> +R: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com> +L: linux-spi(a)vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/spi/brcm,bcm63xx-hsspi.yaml +F: drivers/spi/spi-bcm63xx-hsspi.c +F: drivers/spi/spi-bcmbca-hsspi.c + BROADCOM ETHERNET PHY DRIVERS M: Florian Fainelli <f.fainelli(a)gmail.com> R: Broadcom internal kernel review list <bcm-kernel-feedback-list(a)broadcom.com> @@@ -4667,11 -4805,12 +4668,11 @@@ F: net/sched/sch_etf. F: net/sched/sch_taprio.c CC2520 IEEE-802.15.4 RADIO DRIVER -M: Varka Bhadram <varkabhadram(a)gmail.com> +M: Stefan Schmidt <stefan(a)datenfreihafen.org> L: linux-wpan(a)vger.kernel.org -S: Maintained +S: Odd Fixes F: Documentation/devicetree/bindings/net/ieee802154/cc2520.txt F: drivers/net/ieee802154/cc2520.c -F: include/linux/spi/cc2520.h CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER M: Gilad Ben-Yossef <gilad(a)benyossef.com> @@@ -4847,13 -4986,6 +4848,13 @@@ S: Maintaine F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml F: sound/soc/codecs/cros_ec_codec.* +CHROMEOS EC UART DRIVER +M: Bhanu Prakash Maiya <bhanumaiya(a)chromium.org> +R: Benson Leung <bleung(a)chromium.org> +R: Tzung-Bi Shih <tzungbi(a)kernel.org> +S: Maintained +F: drivers/platform/chrome/cros_ec_uart.c + CHROMEOS EC SUBDRIVERS M: Benson Leung <bleung(a)chromium.org> R: Guenter Roeck <groeck(a)chromium.org> @@@ -4867,9 -4999,8 +4868,9 @@@ CHROMEOS EC USB TYPE-C DRIVE M: Prashant Malani <pmalani(a)chromium.org> L: chrome-platform(a)lists.linux.dev S: Maintained -F: drivers/platform/chrome/cros_ec_typec.c +F: drivers/platform/chrome/cros_ec_typec.* F: drivers/platform/chrome/cros_typec_switch.c +F: drivers/platform/chrome/cros_typec_vdm.* CHROMEOS EC USB PD NOTIFY DRIVER M: Prashant Malani <pmalani(a)chromium.org> @@@ -5660,11 -5791,6 +5661,11 @@@ M: SeongJae Park <sj(a)kernel.org L: damon(a)lists.linux.dev L: linux-mm(a)kvack.org S: Maintained +W: https://damonitor.github.io +P: Documentation/mm/damon/maintainer-profile.rst +T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +T: quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new +T: git git://git.kernel.org/pub/scm/linux/kernel/git/sj/linux.git damon/next F: Documentation/ABI/testing/sysfs-kernel-mm-damon F: Documentation/admin-guide/mm/damon/ F: Documentation/mm/damon/ @@@ -5802,6 -5928,7 +5803,6 @@@ F: Documentation/ABI/testing/sysfs-plat F: drivers/platform/x86/dell/dell-wmi-ddv.c DELL WMI SYSMAN DRIVER -M: Divya Bharathi <divya.bharathi(a)dell.com> M: Prasanth Ksr <prasanth.ksr(a)dell.com> L: Dell.Client.Kernel(a)dell.com L: platform-driver-x86(a)vger.kernel.org @@@ -5973,7 -6100,7 +5974,7 @@@ S: Supporte F: Documentation/networking/devlink F: include/net/devlink.h F: include/uapi/linux/devlink.h -F: net/core/devlink.c +F: net/devlink/ DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT M: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> @@@ -6296,7 -6423,6 +6297,7 @@@ T: git git://git.linbit.com/linux-drbd. T: git git://git.linbit.com/drbd-8.4.git F: Documentation/admin-guide/blockdev/ F: drivers/block/drbd/ +F: include/linux/drbd* F: lib/lru_cache.c DRIVER COMPONENT FRAMEWORK @@@ -6425,14 -6551,6 +6426,14 @@@ S: Maintaine T: git git://anongit.freedesktop.org/drm/drm-misc F: drivers/gpu/drm/tiny/gm12u320.c +DRM DRIVER FOR HIMAX HX8394 MIPI-DSI LCD panels +M: Ondrej Jirman <megi(a)xff.cz> +M: Javier Martinez Canillas <javierm(a)redhat.com> +S: Maintained +T: git git://anongit.freedesktop.org/drm/drm-misc +F: Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml +F: drivers/gpu/drm/panel/panel-himax-hx8394.c + DRM DRIVER FOR HX8357D PANELS M: Emma Anholt <emma(a)anholt.net> S: Maintained @@@ -6454,6 -6572,11 +6455,6 @@@ T: git git://anongit.freedesktop.org/dr F: Documentation/devicetree/bindings/display/ilitek,ili9486.yaml F: drivers/gpu/drm/tiny/ili9486.c -DRM DRIVER FOR INTEL I810 VIDEO CARDS -S: Orphan / Obsolete -F: drivers/gpu/drm/i810/ -F: include/uapi/drm/i810_drm.h - DRM DRIVER FOR JADARD JD9365DA-H3 MIPI-DSI LCD PANELS M: Jagan Teki <jagan(a)edgeble.ai> S: Maintained @@@ -6482,6 -6605,11 +6483,6 @@@ S: Maintaine F: Documentation/devicetree/bindings/display/panel/mantix,mlaf057we51-x.yaml F: drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c -DRM DRIVER FOR MATROX G200/G400 GRAPHICS CARDS -S: Orphan / Obsolete -F: drivers/gpu/drm/mga/ -F: include/uapi/drm/mga_drm.h - DRM DRIVER FOR MGA G200 GRAPHICS CHIPS M: Dave Airlie <airlied(a)redhat.com> R: Thomas Zimmermann <tzimmermann(a)suse.de> @@@ -6600,6 -6728,11 +6601,6 @@@ T: git git://anongit.freedesktop.org/dr F: drivers/gpu/drm/qxl/ F: include/uapi/drm/qxl_drm.h -DRM DRIVER FOR RAGE 128 VIDEO CARDS -S: Orphan / Obsolete -F: drivers/gpu/drm/r128/ -F: include/uapi/drm/r128_drm.h - DRM DRIVER FOR RAYDIUM RM67191 PANELS M: Robert Chiras <robert.chiras(a)nxp.com> S: Maintained @@@ -6627,6 -6760,11 +6628,6 @@@ S: Maintaine F: Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml F: drivers/gpu/drm/panel/panel-sitronix-st7703.c -DRM DRIVER FOR SAVAGE VIDEO CARDS -S: Orphan / Obsolete -F: drivers/gpu/drm/savage/ -F: include/uapi/drm/savage_drm.h - DRM DRIVER FOR FIRMWARE FRAMEBUFFERS M: Thomas Zimmermann <tzimmermann(a)suse.de> M: Javier Martinez Canillas <javierm(a)redhat.com> @@@ -6642,6 -6780,11 +6643,6 @@@ F: include/drm/drm_aperture. F: include/linux/aperture.h F: include/video/nomodeset.h -DRM DRIVER FOR SIS VIDEO CARDS -S: Orphan / Obsolete -F: drivers/gpu/drm/sis/ -F: include/uapi/drm/sis_drm.h - DRM DRIVER FOR SITRONIX ST7586 PANELS M: David Lechner <david(a)lechnology.com> S: Maintained @@@ -6669,6 -6812,10 +6670,6 @@@ T: git git://anongit.freedesktop.org/dr F: Documentation/devicetree/bindings/display/ste,mcde.yaml F: drivers/gpu/drm/mcde/ -DRM DRIVER FOR TDFX VIDEO CARDS -S: Orphan / Obsolete -F: drivers/gpu/drm/tdfx/ - DRM DRIVER FOR TI DLPC3433 MIPI DSI TO DMD BRIDGE M: Jagan Teki <jagan(a)amarulasolutions.com> S: Maintained @@@ -6768,16 -6915,6 +6769,16 @@@ C: irc://irc.oftc.net/dri-deve T: git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/accel.git F: Documentation/accel/ F: drivers/accel/ +F: include/drm/drm_accel.h + +DRM ACCEL DRIVERS FOR INTEL VPU +M: Jacek Lawrynowicz <jacek.lawrynowicz(a)linux.intel.com> +M: Stanislaw Gruszka <stanislaw.gruszka(a)linux.intel.com> +L: dri-devel(a)lists.freedesktop.org +S: Supported +T: git git://anongit.freedesktop.org/drm/drm-misc +F: drivers/accel/ivpu/ +F: include/uapi/drm/ivpu_accel.h DRM DRIVERS FOR ALLWINNER A10 M: Maxime Ripard <mripard(a)kernel.org> @@@ -6812,7 -6949,7 +6813,7 @@@ F: drivers/gpu/drm/atmel-hlcdc DRM DRIVERS FOR BRIDGE CHIPS M: Andrzej Hajda <andrzej.hajda(a)intel.com> M: Neil Armstrong <neil.armstrong(a)linaro.org> -M: Robert Foss <robert.foss(a)linaro.org> +M: Robert Foss <rfoss(a)kernel.org> R: Laurent Pinchart <Laurent.pinchart(a)ideasonboard.com> R: Jonas Karlman <jonas(a)kwiboo.se> R: Jernej Skrabec <jernej.skrabec(a)gmail.com> @@@ -6848,7 -6985,7 +6849,7 @@@ M: Philipp Zabel <p.zabel(a)pengutronix.d L: dri-devel(a)lists.freedesktop.org S: Maintained F: Documentation/devicetree/bindings/display/imx/ -F: drivers/gpu/drm/imx/ +F: drivers/gpu/drm/imx/ipuv3/ F: drivers/gpu/ipu-v3/ DRM DRIVERS FOR FREESCALE IMX BRIDGE @@@ -6871,10 -7008,9 +6872,10 @@@ F: drivers/gpu/drm/gma500 DRM DRIVERS FOR HISILICON M: Xinliang Liu <xinliang.liu(a)linaro.org> M: Tian Tao <tiantao6(a)hisilicon.com> -R: John Stultz <jstultz(a)google.com> R: Xinwei Kong <kong.kongxinwei(a)hisilicon.com> -R: Chen Feng <puck.chen(a)hisilicon.com> +R: Sumit Semwal <sumit.semwal(a)linaro.org> +R: Yongqin Liu <yongqin.liu(a)linaro.org> +R: John Stultz <jstultz(a)google.com> L: dri-devel(a)lists.freedesktop.org S: Maintained T: git git://anongit.freedesktop.org/drm/drm-misc @@@ -6915,7 -7051,7 +6916,7 @@@ M: Thierry Reding <thierry.reding@gmail L: dri-devel(a)lists.freedesktop.org L: linux-tegra(a)vger.kernel.org S: Supported -T: git git://anongit.freedesktop.org/tegra/linux.git +T: git https://gitlab.freedesktop.org/drm/tegra.git F: Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-host1x.yaml F: Documentation/devicetree/bindings/gpu/host1x/ F: drivers/gpu/drm/tegra/ @@@ -7481,6 -7617,7 +7482,6 @@@ S: Maintaine F: drivers/firmware/efi/test/ EFI VARIABLE FILESYSTEM -M: Matthew Garrett <matthew.garrett(a)nebula.com> M: Jeremy Kerr <jk(a)ozlabs.org> M: Ard Biesheuvel <ardb(a)kernel.org> L: linux-efi(a)vger.kernel.org @@@ -7609,7 -7746,6 +7610,7 @@@ R: Jeffle Xu <jefflexu(a)linux.alibaba.co L: linux-erofs(a)lists.ozlabs.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git +F: Documentation/ABI/testing/sysfs-fs-erofs F: Documentation/filesystems/erofs.rst F: fs/erofs/ F: include/trace/events/erofs.h @@@ -7760,11 -7896,7 +7761,11 @@@ F: include/linux/extcon EXTRA BOOT CONFIG M: Masami Hiramatsu <mhiramat(a)kernel.org> +L: linux-kernel(a)vger.kernel.org +L: linux-trace-kernel(a)vger.kernel.org +Q: https://patchwork.kernel.org/project/linux-trace-kernel/list/ S: Maintained +T: git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git F: Documentation/admin-guide/bootconfig.rst F: fs/proc/bootconfig.c F: include/linux/bootconfig.h @@@ -8065,7 -8197,7 +8066,7 @@@ F: drivers/fpga/microchip-spi. FPU EMULATOR M: Bill Metzenthen <billm(a)melbpc.org.au> S: Maintained -W: http://floatingpoint.sourceforge.net/emulator/index.html +W: https://floatingpoint.billm.au/ F: arch/x86/math-emu/ FRAMEBUFFER CORE @@@ -8337,16 -8469,16 +8338,16 @@@ F: fs/fscache F: include/linux/fscache*.h FSCRYPT: FILE SYSTEM LEVEL ENCRYPTION SUPPORT +M: Eric Biggers <ebiggers(a)kernel.org> M: Theodore Y. Ts'o <tytso(a)mit.edu> M: Jaegeuk Kim <jaegeuk(a)kernel.org> -M: Eric Biggers <ebiggers(a)kernel.org> L: linux-fscrypt(a)vger.kernel.org S: Supported Q: https://patchwork.kernel.org/project/linux-fscrypt/list/ -T: git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git +T: git https://git.kernel.org/pub/scm/fs/fscrypt/linux.git F: Documentation/filesystems/fscrypt.rst F: fs/crypto/ -F: include/linux/fscrypt*.h +F: include/linux/fscrypt.h F: include/uapi/linux/fscrypt.h FSI SUBSYSTEM @@@ -8389,10 -8521,10 +8390,10 @@@ F: include/linux/fsnotify*. FSVERITY: READ-ONLY FILE-BASED AUTHENTICITY PROTECTION M: Eric Biggers <ebiggers(a)kernel.org> M: Theodore Y. Ts'o <tytso(a)mit.edu> -L: linux-fscrypt(a)vger.kernel.org +L: fsverity(a)lists.linux.dev S: Supported -Q: https://patchwork.kernel.org/project/linux-fscrypt/list/ -T: git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity +Q: https://patchwork.kernel.org/project/fsverity/list/ +T: git https://git.kernel.org/pub/scm/fs/fsverity/linux.git F: Documentation/filesystems/fsverity.rst F: fs/verity/ F: include/linux/fsverity.h @@@ -8440,7 -8572,6 +8441,7 @@@ F: kernel/trace/fgraph. F: arch/*/*/*/*ftrace* F: arch/*/*/*ftrace* F: include/*/ftrace.h +F: samples/ftrace FUNGIBLE ETHERNET DRIVERS M: Dimitris Michailidis <dmichail(a)fungible.com> @@@ -8913,15 -9044,13 +8914,15 @@@ F: block/partitions/efi. HABANALABS PCI DRIVER M: Oded Gabbay <ogabbay(a)kernel.org> +L: dri-devel(a)lists.freedesktop.org S: Supported +C: irc://irc.oftc.net/dri-devel T: git https://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git F: Documentation/ABI/testing/debugfs-driver-habanalabs F: Documentation/ABI/testing/sysfs-driver-habanalabs -F: drivers/misc/habanalabs/ +F: drivers/accel/habanalabs/ F: include/trace/events/habanalabs.h -F: include/uapi/misc/habanalabs.h +F: include/uapi/drm/habanalabs_accel.h HACKRF MEDIA DRIVER M: Antti Palosaari <crope(a)iki.fi> @@@ -9072,12 -9201,9 +9073,12 @@@ M: Benjamin Tissoires <benjamin.tissoir L: linux-input(a)vger.kernel.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git +F: Documentation/hid/ F: drivers/hid/ F: include/linux/hid* F: include/uapi/linux/hid* +F: samples/hid/ +F: tools/testing/selftests/hid/ HID LOGITECH DRIVERS R: Filipe Laíns <lains(a)riseup.net> @@@ -9085,13 -9211,6 +9086,13 @@@ L: linux-input(a)vger.kernel.or S: Maintained F: drivers/hid/hid-logitech-* +HID++ LOGITECH DRIVERS +R: Filipe Laíns <lains(a)riseup.net> +R: Bastien Nocera <hadess(a)hadess.net> +L: linux-input(a)vger.kernel.org +S: Maintained +F: drivers/hid/hid-logitech-hidpp.c + HID PLAYSTATION DRIVER M: Roderick Colenbrander <roderick.colenbrander(a)sony.com> L: linux-input(a)vger.kernel.org @@@ -9181,7 -9300,7 +9182,7 @@@ F: net/dsa/tag_hellcreek. HISILICON DMA DRIVER M: Zhou Wang <wangzhou1(a)hisilicon.com> -M: Jie Hai <haijie1(a)hisilicon.com> +M: Jie Hai <haijie1(a)huawei.com> L: dmaengine(a)vger.kernel.org S: Maintained F: drivers/dma/hisi_dma.c @@@ -9257,15 -9376,11 +9258,15 @@@ F: drivers/perf/hisilicon/hns3_pmu. HISILICON PTT DRIVER M: Yicong Yang <yangyicong(a)hisilicon.com> +M: Jonathan Cameron <jonathan.cameron(a)huawei.com> L: linux-kernel(a)vger.kernel.org S: Maintained F: Documentation/ABI/testing/sysfs-devices-hisi_ptt F: Documentation/trace/hisi-ptt.rst F: drivers/hwtracing/ptt/ +F: tools/perf/arch/arm64/util/hisi-ptt.c +F: tools/perf/util/hisi-ptt* +F: tools/perf/util/hisi-ptt-decoder/* HISILICON QM DRIVER M: Weili Qian <qianweili(a)huawei.com> @@@ -9352,7 -9467,7 +9353,7 @@@ F: Documentation/mm/hmm.rs F: include/linux/hmm* F: lib/test_hmm* F: mm/hmm* -F: tools/testing/selftests/vm/*hmm* +F: tools/testing/selftests/mm/*hmm* HOST AP DRIVER M: Jouni Malinen <j(a)w1.fi> @@@ -9875,7 -9990,7 +9876,7 @@@ S: Maintaine T: git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git F: Documentation/filesystems/idmappings.rst F: tools/testing/selftests/mount_setattr/ -F: include/linux/mnt_idmapping.h +F: include/linux/mnt_idmapping.* IDT VersaClock 5 CLOCK DRIVER M: Luca Ceresoli <luca(a)lucaceresoli.net> @@@ -9886,7 -10001,6 +9887,7 @@@ F: drivers/clk/clk-versaclock5. IEEE 802.15.4 SUBSYSTEM M: Alexander Aring <alex.aring(a)gmail.com> M: Stefan Schmidt <stefan(a)datenfreihafen.org> +M: Miquel Raynal <miquel.raynal(a)bootlin.com> L: linux-wpan(a)vger.kernel.org S: Maintained W: https://linux-wpan.org/ @@@ -10046,13 -10160,6 +10047,13 @@@ L: linux-iio(a)vger.kernel.or S: Maintained F: drivers/iio/pressure/dps310.c +INFINEON PEB2466 ASoC CODEC +M: Herve Codina <herve.codina(a)bootlin.com> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/sound/infineon,peb2466.yaml +F: sound/soc/codecs/peb2466.c + INFINIBAND SUBSYSTEM M: Jason Gunthorpe <jgg(a)nvidia.com> M: Leon Romanovsky <leonro(a)nvidia.com> @@@ -10461,7 -10568,6 +10462,7 @@@ F: drivers/watchdog/mei_wdt. F: include/linux/mei_aux.h F: include/linux/mei_cl_bus.h F: include/uapi/linux/mei.h +F: include/uapi/linux/uuid.h F: samples/mei/* INTEL MAX 10 BMC MFD DRIVER @@@ -10471,7 -10577,7 +10472,7 @@@ S: Maintaine F: Documentation/ABI/testing/sysfs-driver-intel-m10-bmc F: Documentation/hwmon/intel-m10-bmc-hwmon.rst F: drivers/hwmon/intel-m10-bmc-hwmon.c -F: drivers/mfd/intel-m10-bmc.c +F: drivers/mfd/intel-m10-bmc* F: include/linux/mfd/intel-m10-bmc.h INTEL MENLOW THERMAL DRIVER @@@ -10578,13 -10684,6 +10579,13 @@@ S: Maintaine F: arch/x86/include/asm/intel_telemetry.h F: drivers/platform/x86/intel/telemetry/ +INTEL TPMI DRIVER +M: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> +L: platform-driver-x86(a)vger.kernel.org +S: Maintained +F: drivers/platform/x86/intel/tpmi.c +F: include/linux/intel_tpmi.h + INTEL UNCORE FREQUENCY CONTROL M: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> L: platform-driver-x86(a)vger.kernel.org @@@ -10822,13 -10921,6 +10823,13 @@@ M: David Sterba <dsterba(a)suse.com S: Odd Fixes F: drivers/tty/ipwireless/ +IRON DEVICE AUDIO CODEC DRIVERS +M: Kiseok Jo <kiseok.jo(a)irondevice.com> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/sound/irondevice,* +F: sound/soc/codecs/sma* + IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY) M: Marc Zyngier <maz(a)kernel.org> S: Maintained @@@ -10844,8 -10936,6 +10845,8 @@@ L: linux-kernel(a)vger.kernel.or S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core F: kernel/irq/ +F: include/linux/group_cpus.h +F: lib/group_cpus.c IRQCHIP DRIVERS M: Thomas Gleixner <tglx(a)linutronix.de> @@@ -11267,9 -11357,9 +11268,9 @@@ F: virt/kvm/ KERNEL VIRTUAL MACHINE FOR ARM64 (KVM/arm64) M: Marc Zyngier <maz(a)kernel.org> R: James Morse <james.morse(a)arm.com> -R: Alexandru Elisei <alexandru.elisei(a)arm.com> R: Suzuki K Poulose <suzuki.poulose(a)arm.com> R: Oliver Upton <oliver.upton(a)linux.dev> +R: Zenghui Yu <yuzenghui(a)huawei.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) L: kvmarm(a)lists.linux.dev L: kvmarm(a)lists.cs.columbia.edu (deprecated, moderated for non-subscribers) @@@ -11379,7 -11469,7 +11380,7 @@@ F: arch/x86/kvm/hyperv. F: arch/x86/kvm/kvm_onhyperv.* F: arch/x86/kvm/svm/hyperv.* F: arch/x86/kvm/svm/svm_onhyperv.* -F: arch/x86/kvm/vmx/evmcs.* +F: arch/x86/kvm/vmx/hyperv.* KVM X86 Xen (KVM/Xen) M: David Woodhouse <dwmw2(a)infradead.org> @@@ -11585,12 -11675,6 +11586,12 @@@ M: John Hawley <warthog9(a)eaglescrag.net S: Maintained F: tools/testing/ktest +KTZ8866 BACKLIGHT DRIVER +M: Jianhua Lu <lujianhua000(a)gmail.com> +S: Maintained +F: Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml +F: drivers/video/backlight/ktz8866.c + L3MDEV M: David Ahern <dsahern(a)kernel.org> L: netdev(a)vger.kernel.org @@@ -11603,7 -11687,7 +11604,7 @@@ M: Mickaël Salaün <mic(a)digikod.net L: linux-security-module(a)vger.kernel.org S: Supported W: https://landlock.io -T: git https://github.com/landlock-lsm/linux.git +T: git https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git F: Documentation/security/landlock.rst F: Documentation/userspace-api/landlock.rst F: include/uapi/linux/landlock.h @@@ -12732,9 -12816,9 +12733,9 @@@ F: drivers/iio/potentiometer/mcp4018. F: drivers/iio/potentiometer/mcp4531.c MCR20A IEEE-802.15.4 RADIO DRIVER -M: Xue Liu <liuxuenetmail(a)gmail.com> +M: Stefan Schmidt <stefan(a)datenfreihafen.org> L: linux-wpan(a)vger.kernel.org -S: Maintained +S: Odd Fixes W: https://github.com/xueliu/mcr20a-linux F: Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt F: drivers/net/ieee802154/mcr20a.c @@@ -13391,7 -13475,7 +13392,7 @@@ M: Andrew Morton <akpm@linux-foundation L: linux-mm(a)kvack.org S: Maintained W: http://www.linux-mm.org -T: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm T: quilt git://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new F: include/linux/gfp.h F: include/linux/gfp_types.h @@@ -13400,8 -13484,7 +13401,8 @@@ F: include/linux/mm. F: include/linux/mmzone.h F: include/linux/pagewalk.h F: mm/ -F: tools/testing/selftests/vm/ +F: tools/mm/ +F: tools/testing/selftests/mm/ VMALLOC M: Andrew Morton <akpm(a)linux-foundation.org> @@@ -13410,7 -13493,7 +13411,7 @@@ R: Christoph Hellwig <hch(a)infradead.org L: linux-mm(a)kvack.org S: Maintained W: http://www.linux-mm.org -T: git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +T: git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm F: include/linux/vmalloc.h F: mm/vmalloc.c @@@ -13536,22 -13619,9 +13537,22 @@@ W: http://www.monstr.eu/fdt T: git git://git.monstr.eu/linux-2.6-microblaze.git F: arch/microblaze/ +MICROBLAZE TMR MANAGER +M: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao(a)amd.com> +S: Supported +F: Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager +F: Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml +F: drivers/misc/xilinx_tmr_manager.c + +MICROBLAZE TMR INJECT +M: Appana Durga Kedareswara rao <appana.durga.kedareswara.rao(a)amd.com> +S: Supported +F: Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml +F: drivers/misc/xilinx_tmr_inject.c + MICROCHIP AT91 DMA DRIVERS M: Ludovic Desroches <ludovic.desroches(a)microchip.com> -M: Tudor Ambarus <tudor.ambarus(a)microchip.com> +M: Tudor Ambarus <tudor.ambarus(a)linaro.org> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) L: dmaengine(a)vger.kernel.org S: Supported @@@ -13596,7 -13666,7 +13597,7 @@@ F: Documentation/devicetree/bindings/me F: drivers/media/platform/microchip/microchip-csi2dc.c MICROCHIP ECC DRIVER -M: Tudor Ambarus <tudor.ambarus(a)microchip.com> +M: Tudor Ambarus <tudor.ambarus(a)linaro.org> L: linux-crypto(a)vger.kernel.org S: Maintained F: drivers/crypto/atmel-ecc.* @@@ -13641,7 -13711,6 +13642,7 @@@ S: Maintaine F: Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml F: Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml F: drivers/net/dsa/microchip/* +F: include/linux/dsa/ksz_common.h F: include/linux/platform_data/microchip-ksz.h F: net/dsa/tag_ksz.c @@@ -13694,7 -13763,7 +13695,7 @@@ S: Maintaine F: drivers/mmc/host/atmel-mci.c MICROCHIP NAND DRIVER -M: Tudor Ambarus <tudor.ambarus(a)microchip.com> +M: Tudor Ambarus <tudor.ambarus(a)linaro.org> L: linux-mtd(a)lists.infradead.org S: Supported F: Documentation/devicetree/bindings/mtd/atmel-nand.txt @@@ -13724,13 -13793,6 +13725,13 @@@ L: linux-i2c(a)vger.kernel.or S: Maintained F: drivers/i2c/busses/i2c-mchp-pci1xxxx.c +MICROCHIP PCIe UART DRIVER +M: Kumaravel Thiagarajan <kumaravel.thiagarajan(a)microchip.com> +M: Tharun Kumar P <tharunkumar.pasumarthi(a)microchip.com> +L: linux-serial(a)vger.kernel.org +S: Maintained +F: drivers/tty/serial/8250/8250_pci1xxxx.c + MICROCHIP PWM DRIVER M: Claudiu Beznea <claudiu.beznea(a)microchip.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -13753,7 -13815,7 +13754,7 @@@ S: Supporte F: drivers/power/reset/at91-sama5d2_shdwc.c MICROCHIP SPI DRIVER -M: Tudor Ambarus <tudor.ambarus(a)microchip.com> +M: Tudor Ambarus <tudor.ambarus(a)linaro.org> S: Supported F: drivers/spi/spi-atmel.* @@@ -14081,7 -14143,6 +14082,7 @@@ M: Saravanan Sekar <sravanhome(a)gmail.co S: Maintained F: Documentation/devicetree/bindings/mfd/mps,mp2629.yaml F: Documentation/devicetree/bindings/regulator/mps,mp*.yaml +F: drivers/hwmon/pmbus/mpq7932.c F: drivers/iio/adc/mp2629_adc.c F: drivers/mfd/mp2629.c F: drivers/power/supply/mp2629_charger.c @@@ -14090,16 -14151,6 +14091,16 @@@ F: drivers/regulator/mpq7920. F: drivers/regulator/mpq7920.h F: include/linux/mfd/mp2629.h +MOST(R) TECHNOLOGY DRIVER +M: Parthiban Veerasooran <parthiban.veerasooran(a)microchip.com> +M: Christian Gromm <christian.gromm(a)microchip.com> +S: Maintained +F: Documentation/ABI/testing/configfs-most +F: Documentation/ABI/testing/sysfs-bus-most +F: drivers/most/ +F: drivers/staging/most/ +F: include/linux/most.h + MOTION EYE VAIO PICTUREBOOK CAMERA DRIVER S: Orphan W: http://popies.net/meye/ @@@ -14112,7 -14163,6 +14113,7 @@@ M: Peter Geis <pgwipeout(a)gmail.com M: Frank <Frank.Sae(a)motor-comm.com> L: netdev(a)vger.kernel.org S: Maintained +F: Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml F: drivers/net/phy/motorcomm.c MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD @@@ -14129,9 -14179,9 +14130,9 @@@ T: git git://linuxtv.org/media_tree.gi F: drivers/media/radio/radio-mr800.c MRF24J40 IEEE 802.15.4 RADIO DRIVER -M: Alan Ott <alan(a)signal11.us> +M: Stefan Schmidt <stefan(a)datenfreihafen.org> L: linux-wpan(a)vger.kernel.org -S: Maintained +S: Odd Fixes F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt F: drivers/net/ieee802154/mrf24j40.c @@@ -14231,7 -14281,7 +14232,7 @@@ F: drivers/media/i2c/mt9v111. MULTIFUNCTION DEVICES (MFD) M: Lee Jones <lee(a)kernel.org> -S: Supported +S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git F: Documentation/devicetree/bindings/mfd/ F: drivers/mfd/ @@@ -14493,8 -14543,6 +14494,8 @@@ M: Florian Fainelli <f.fainelli(a)gmail.c M: Vladimir Oltean <olteanv(a)gmail.com> S: Maintained F: Documentation/devicetree/bindings/net/dsa/ +F: Documentation/devicetree/bindings/net/ethernet-switch-port.yaml +F: Documentation/devicetree/bindings/net/ethernet-switch.yaml F: drivers/net/dsa/ F: include/linux/dsa/ F: include/linux/platform_data/dsa.h @@@ -14513,10 -14561,8 +14514,10 @@@ Q: https://patchwork.kernel.org/project B: mailto:netdev@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +F: Documentation/core-api/netlink.rst F: Documentation/networking/ F: Documentation/process/maintainer-netdev.rst +F: Documentation/userspace-api/netlink/ F: include/linux/in.h F: include/linux/net.h F: include/linux/netdevice.h @@@ -14528,7 -14574,6 +14529,7 @@@ F: include/uapi/linux/netdevice. F: lib/net_utils.c F: lib/random32.c F: net/ +F: tools/net/ F: tools/testing/selftests/net/ NETWORKING [IPSEC] @@@ -14557,6 -14602,7 +14558,6 @@@ F: tools/testing/selftests/net/ipsec. NETWORKING [IPv4/IPv6] M: "David S. Miller" <davem(a)davemloft.net> -M: Hideaki YOSHIFUJI <yoshfuji(a)linux-ipv6.org> M: David Ahern <dsahern(a)kernel.org> L: netdev(a)vger.kernel.org S: Maintained @@@ -14589,6 -14635,7 +14590,6 @@@ F: net/netfilter/xt_SECMARK. F: net/netlabel/ NETWORKING [MPTCP] -M: Mat Martineau <mathew.j.martineau(a)linux.intel.com> M: Matthieu Baerts <matthieu.baerts(a)tessares.net> L: netdev(a)vger.kernel.org L: mptcp(a)lists.linux.dev @@@ -14870,11 -14917,9 +14871,11 @@@ L: linux-nvme(a)lists.infradead.or S: Supported W: http://git.infradead.org/nvme.git T: git://git.infradead.org/nvme.git +F: Documentation/nvme/ F: drivers/nvme/host/ F: drivers/nvme/common/ -F: include/linux/nvme* +F: include/linux/nvme.h +F: include/linux/nvme-*.h F: include/uapi/linux/nvme_ioctl.h NVM EXPRESS FABRICS AUTHENTICATION @@@ -14974,16 -15019,14 +14975,16 @@@ S: Maintaine F: Documentation/devicetree/bindings/iio/adc/nxp,imx8qxp-adc.yaml F: drivers/iio/adc/imx8qxp-adc.c -NXP i.MX 7D/6SX/6UL AND VF610 ADC DRIVER +NXP i.MX 7D/6SX/6UL/93 AND VF610 ADC DRIVER M: Haibo Chen <haibo.chen(a)nxp.com> L: linux-iio(a)vger.kernel.org L: linux-imx(a)nxp.com S: Maintained F: Documentation/devicetree/bindings/iio/adc/fsl,imx7d-adc.yaml F: Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml +F: Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml F: drivers/iio/adc/imx7d_adc.c +F: drivers/iio/adc/imx93_adc.c F: drivers/iio/adc/vf610_adc.c NXP PF8100/PF8121A/PF8200 PMIC REGULATOR DEVICE DRIVER @@@ -15108,7 -15151,6 +15109,7 @@@ M: Colin Foster <colin.foster@in-advant S: Supported F: Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml F: drivers/mfd/ocelot* +F: drivers/net/dsa/ocelot/ocelot_ext.c F: include/linux/mfd/ocelot.h OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER @@@ -15272,6 -15314,7 +15273,6 @@@ Q: http://patchwork.kernel.org/project/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git F: arch/arm/configs/omap1_defconfig F: arch/arm/mach-omap1/ -F: arch/arm/plat-omap/ F: drivers/i2c/busses/i2c-omap.c F: include/linux/platform_data/ams-delta-fiq.h F: include/linux/platform_data/i2c-omap.h @@@ -15286,6 -15329,7 +15287,6 @@@ Q: http://patchwork.kernel.org/project/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git F: arch/arm/configs/omap2plus_defconfig F: arch/arm/mach-omap2/ -F: arch/arm/plat-omap/ F: drivers/bus/ti-sysc.c F: drivers/i2c/busses/i2c-omap.c F: drivers/irqchip/irq-omap-intc.c @@@ -15529,7 -15573,6 +15530,7 @@@ F: drivers/mtd/nand/onenand F: include/linux/mtd/onenand*.h ONEXPLAYER FAN DRIVER +M: Derek John Clark <derekjohn.clark(a)gmail.com> M: Joaquín Ignacio Aramendía <samsagax(a)gmail.com> L: linux-hwmon(a)vger.kernel.org S: Maintained @@@ -15541,13 -15584,6 +15542,13 @@@ L: linux-mips(a)vger.kernel.or S: Maintained F: arch/mips/boot/dts/ralink/omega2p.dts +ONSEMI ETHERNET PHY DRIVERS +M: Piergiorgio Beruto <piergiorgio.beruto(a)gmail.com> +L: netdev(a)vger.kernel.org +S: Supported +W: http://www.onsemi.com +F: drivers/net/phy/ncn* + OP-TEE DRIVER M: Jens Wiklander <jens.wiklander(a)linaro.org> L: op-tee(a)lists.trustedfirmware.org @@@ -15622,7 -15658,7 +15623,7 @@@ OPENRISC ARCHITECTUR M: Jonas Bonn <jonas(a)southpole.se> M: Stefan Kristiansson <stefan.kristiansson(a)saunalahti.fi> M: Stafford Horne <shorne(a)gmail.com> -L: openrisc(a)lists.librecores.org +L: linux-openrisc(a)vger.kernel.org S: Maintained W: http://openrisc.io T: git https://github.com/openrisc/linux.git @@@ -15713,12 -15749,6 +15714,12 @@@ S: Maintaine W: https://wireless.wiki.kernel.org/en/users/Drivers/p54 F: drivers/net/wireless/intersil/p54/ +PACKET SOCKETS +M: Willem de Bruijn <willemdebruijn.kernel(a)gmail.com> +S: Maintained +F: include/uapi/linux/if_packet.h +F: net/packet/af_packet.c + PACKING M: Vladimir Oltean <olteanv(a)gmail.com> L: netdev(a)vger.kernel.org @@@ -15814,6 -15844,13 +15815,6 @@@ F: arch/*/include/asm/paravirt*. F: arch/*/kernel/paravirt* F: include/linux/hypervisor.h -PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES -M: Tim Waugh <tim(a)cyberelk.net> -L: linux-parport(a)lists.infradead.org (subscribers-only) -S: Maintained -F: Documentation/admin-guide/blockdev/paride.rst -F: drivers/block/paride/ - PARISC ARCHITECTURE M: "James E.J. Bottomley" <James.Bottomley(a)HansenPartnership.com> M: Helge Deller <deller(a)gmx.de> @@@ -16071,7 -16108,7 +16072,7 @@@ F: drivers/pci/controller/pci-v3-semi. PCI ENDPOINT SUBSYSTEM M: Lorenzo Pieralisi <lpieralisi(a)kernel.org> -R: Krzysztof Wilczyński <kw(a)linux.com> +M: Krzysztof Wilczyński <kw(a)linux.com> R: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> R: Kishon Vijay Abraham I <kishon(a)kernel.org> L: linux-pci(a)vger.kernel.org @@@ -16079,7 -16116,7 +16080,7 @@@ S: Supporte Q: https://patchwork.kernel.org/project/linux-pci/list/ B: https://bugzilla.kernel.org C: irc://irc.oftc.net/linux-pci -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git F: Documentation/PCI/endpoint/* F: Documentation/misc-devices/pci-endpoint-test.rst F: drivers/misc/pci_endpoint_test.c @@@ -16114,7 -16151,7 +16115,7 @@@ S: Supporte Q: https://patchwork.kernel.org/project/linux-pci/list/ B: https://bugzilla.kernel.org C: irc://irc.oftc.net/linux-pci -T: git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git F: Documentation/driver-api/pci/p2pdma.rst F: drivers/pci/p2pdma.c F: include/linux/pci-p2pdma.h @@@ -16136,14 -16173,14 +16137,14 @@@ F: drivers/pci/controller/pci-xgene-msi PCI NATIVE HOST BRIDGE AND ENDPOINT DRIVERS M: Lorenzo Pieralisi <lpieralisi(a)kernel.org> +M: Krzysztof Wilczyński <kw(a)linux.com> R: Rob Herring <robh(a)kernel.org> -R: Krzysztof Wilczyński <kw(a)linux.com> L: linux-pci(a)vger.kernel.org S: Supported Q: https://patchwork.kernel.org/project/linux-pci/list/ B: https://bugzilla.kernel.org C: irc://irc.oftc.net/linux-pci -T: git git://git.kernel.org/pub/scm/linux/kernel/git/lpieralisi/pci.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git F: Documentation/devicetree/bindings/pci/ F: drivers/pci/controller/ F: drivers/pci/pci-bridge-emul.c @@@ -16156,7 -16193,7 +16157,7 @@@ S: Supporte Q: https://patchwork.kernel.org/project/linux-pci/list/ B: https://bugzilla.kernel.org C: irc://irc.oftc.net/linux-pci -T: git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git +T: git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git F: Documentation/PCI/ F: Documentation/devicetree/bindings/pci/ F: arch/x86/kernel/early-quirks.c @@@ -16270,7 -16307,7 +16271,7 @@@ M: Shawn Lin <shawn.lin(a)rock-chips.com L: linux-pci(a)vger.kernel.org L: linux-rockchip(a)lists.infradead.org S: Maintained - F: Documentation/devicetree/bindings/pci/rockchip-pcie* + F: Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie* F: drivers/pci/controller/pcie-rockchip* PCIE DRIVER FOR SOCIONEXT UNIPHIER @@@ -16375,7 -16412,6 +16376,7 @@@ R: Mark Rutland <mark.rutland(a)arm.com R: Alexander Shishkin <alexander.shishkin(a)linux.intel.com> R: Jiri Olsa <jolsa(a)kernel.org> R: Namhyung Kim <namhyung(a)kernel.org> +R: Ian Rogers <irogers(a)google.com> L: linux-perf-users(a)vger.kernel.org L: linux-kernel(a)vger.kernel.org S: Supported @@@ -16574,26 -16610,12 +16575,26 @@@ S: Supporte F: Documentation/devicetree/bindings/input/pine64,pinephone-keyboard.yaml F: drivers/input/keyboard/pinephone-keyboard.c +PKTCDVD DRIVER +M: linux-block(a)vger.kernel.org +S: Orphan +F: drivers/block/pktcdvd.c +F: include/linux/pktcdvd.h +F: include/uapi/linux/pktcdvd.h + PLANTOWER PMS7003 AIR POLLUTION SENSOR DRIVER M: Tomasz Duszynski <tduszyns(a)gmail.com> S: Maintained F: Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml F: drivers/iio/chemical/pms7003.c +PLCA RECONCILIATION SUBLAYER (IEEE802.3 Clause 148) +M: Piergiorgio Beruto <piergiorgio.beruto(a)gmail.com> +L: netdev(a)vger.kernel.org +S: Maintained +F: drivers/net/phy/mdio-open-alliance.h +F: net/ethtool/plca.c + PLDMFW LIBRARY M: Jacob Keller <jacob.e.keller(a)intel.com> S: Maintained @@@ -17191,13 -17213,6 +17192,13 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml F: drivers/net/wireless/ath/ath11k/ +QUALCOMM ATH12K WIRELESS DRIVER +M: Kalle Valo <kvalo(a)kernel.org> +L: ath12k(a)lists.infradead.org +S: Supported +T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git +F: drivers/net/wireless/ath/ath12k/ + QUALCOMM ATHEROS ATH9K WIRELESS DRIVER M: Toke Høiland-Jørgensen <toke(a)toke.dk> L: linux-wireless(a)vger.kernel.org @@@ -17215,7 -17230,7 +17216,7 @@@ F: Documentation/devicetree/bindings/ne F: drivers/net/wwan/qcom_bam_dmux.c QUALCOMM CAMERA SUBSYSTEM DRIVER -M: Robert Foss <robert.foss(a)linaro.org> +M: Robert Foss <rfoss(a)kernel.org> M: Todor Tomov <todor.too(a)gmail.com> L: linux-media(a)vger.kernel.org S: Maintained @@@ -17295,7 -17310,7 +17296,7 @@@ F: drivers/dma/qcom/hidma QUALCOMM I2C CCI DRIVER M: Loic Poulain <loic.poulain(a)linaro.org> -M: Robert Foss <robert.foss(a)linaro.org> +M: Robert Foss <rfoss(a)kernel.org> L: linux-i2c(a)vger.kernel.org L: linux-arm-msm(a)vger.kernel.org S: Maintained @@@ -17769,13 -17784,6 +17770,13 @@@ F: Documentation/devicetree/bindings/ne F: drivers/net/ethernet/renesas/ F: include/linux/sh_eth.h +RENESAS IDT821034 ASoC CODEC +M: Herve Codina <herve.codina(a)bootlin.com> +L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) +S: Maintained +F: Documentation/devicetree/bindings/sound/renesas,idt821034.yaml +F: sound/soc/codecs/idt821034.c + RENESAS R-CAR GYROADC DRIVER M: Marek Vasut <marek.vasut(a)gmail.com> L: linux-iio(a)vger.kernel.org @@@ -17851,14 -17859,6 +17852,14 @@@ S: Maintaine F: Documentation/devicetree/bindings/rtc/renesas,rzn1-rtc.yaml F: drivers/rtc/rtc-rzn1.c +RENESAS RZ/N1 USBF CONTROLLER DRIVER +M: Herve Codina <herve.codina(a)bootlin.com> +L: linux-renesas-soc(a)vger.kernel.org +L: linux-usb(a)vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml +F: drivers/usb/gadget/udc/renesas_usbf.c + RENESAS R-CAR GEN3 & RZ/N1 NAND CONTROLLER DRIVER M: Miquel Raynal <miquel.raynal(a)bootlin.com> L: linux-mtd(a)lists.infradead.org @@@ -17949,7 -17949,6 +17950,7 @@@ M: Albert Ou <aou(a)eecs.berkeley.edu L: linux-riscv(a)lists.infradead.org S: Supported Q: https://patchwork.kernel.org/project/linux-riscv/list/ +C: irc://irc.libera.chat/riscv P: Documentation/riscv/patch-acceptance.rst T: git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git F: arch/riscv/ @@@ -18215,7 -18214,6 +18216,7 @@@ L: rust-for-linux(a)vger.kernel.or S: Supported W: https://github.com/Rust-for-Linux/linux B: https://github.com/Rust-for-Linux/linux/issues +C: zulip://rust-for-linux.zulipchat.com T: git https://github.com/Rust-for-Linux/linux.git rust-next F: Documentation/rust/ F: rust/ @@@ -18255,7 -18253,6 +18256,7 @@@ F: Documentation/driver-api/s390-driver F: Documentation/s390/ F: arch/s390/ F: drivers/s390/ +F: drivers/watchdog/diag288_wdt.c S390 COMMON I/O LAYER M: Vineeth Vijayan <vneethv(a)linux.ibm.com> @@@ -18316,13 -18313,6 +18317,13 @@@ F: arch/s390/pci F: drivers/pci/hotplug/s390_pci_hpc.c F: Documentation/s390/pci.rst +S390 SCM DRIVER +M: Vineeth Vijayan <vneethv(a)linux.ibm.com> +L: linux-s390(a)vger.kernel.org +S: Supported +F: drivers/s390/block/scm* +F: drivers/s390/cio/scm.c + S390 VFIO AP DRIVER M: Tony Krowiak <akrowiak(a)linux.ibm.com> M: Halil Pasic <pasic(a)linux.ibm.com> @@@ -18366,6 -18356,19 +18367,6 @@@ L: linux-s390(a)vger.kernel.or S: Supported F: drivers/s390/scsi/zfcp_* -S3C ADC BATTERY DRIVER -M: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> -L: linux-samsung-soc(a)vger.kernel.org -S: Odd Fixes -F: drivers/power/supply/s3c_adc_battery.c -F: include/linux/s3c_adc_battery.h - -S3C24XX SD/MMC Driver -M: Ben Dooks <ben-linux(a)fluff.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Supported -F: drivers/mmc/host/s3cmci.* - SAA6588 RDS RECEIVER DRIVER M: Hans Verkuil <hverkuil(a)xs4all.nl> L: linux-media(a)vger.kernel.org @@@ -18518,9 -18521,11 +18519,9 @@@ F: Documentation/devicetree/bindings/cl F: Documentation/devicetree/bindings/clock/samsung,s3c* F: drivers/clk/samsung/ F: include/dt-bindings/clock/exynos*.h -F: include/dt-bindings/clock/s3c*.h F: include/dt-bindings/clock/s5p*.h F: include/dt-bindings/clock/samsung,*.h F: include/linux/clk/samsung.h -F: include/linux/platform_data/clk-s3c2410.h SAMSUNG SPI DRIVERS M: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> @@@ -18531,6 -18536,7 +18532,6 @@@ S: Maintaine F: Documentation/devicetree/bindings/spi/samsung,spi*.yaml F: drivers/spi/spi-s3c* F: include/linux/platform_data/spi-s3c64xx.h -F: include/linux/spi/s3c24xx-fiq.h SAMSUNG SXGBE DRIVERS M: Byungho An <bh74.an(a)samsung.com> @@@ -18664,9 -18670,9 +18665,9 @@@ F: drivers/target F: include/target/ SCTP PROTOCOL -M: Vlad Yasevich <vyasevich(a)gmail.com> M: Neil Horman <nhorman(a)tuxdriver.com> M: Marcelo Ricardo Leitner <marcelo.leitner(a)gmail.com> +M: Xin Long <lucien.xin(a)gmail.com> L: linux-sctp(a)vger.kernel.org S: Maintained W: http://lksctp.sourceforge.net @@@ -18889,7 -18895,6 +18890,7 @@@ M: Edward Cree <ecree.xilinx(a)gmail.com M: Martin Habets <habetsm.xilinx(a)gmail.com> L: netdev(a)vger.kernel.org S: Supported +F: Documentation/networking/devlink/sfc.rst F: drivers/net/ethernet/sfc/ SFF/SFP/SFP+ MODULE SUPPORT @@@ -19101,6 -19106,14 +19102,6 @@@ M: Simtec Linux Team <linux(a)simtec.co.u S: Supported W: http://www.simtec.co.uk/products/EB110ATX/ -SIMTEC EB2410ITX (BAST) -M: Simtec Linux Team <linux(a)simtec.co.uk> -S: Supported -W: http://www.simtec.co.uk/products/EB2410ITX/ -F: arch/arm/mach-s3c/bast-ide.c -F: arch/arm/mach-s3c/bast-irq.c -F: arch/arm/mach-s3c/mach-bast.c - SIOX M: Thorsten Scherer <t.scherer(a)eckelmann.de> M: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> @@@ -19297,7 -19310,7 +19298,7 @@@ SOCIONEXT SYNQUACER I2C DRIVE M: Ard Biesheuvel <ardb(a)kernel.org> L: linux-i2c(a)vger.kernel.org S: Maintained - F: Documentation/devicetree/bindings/i2c/i2c-synquacer.txt + F: Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml F: drivers/i2c/busses/i2c-synquacer.c SOCIONEXT UNIPHIER SOUND DRIVER @@@ -19305,13 -19318,6 +19306,13 @@@ L: alsa-devel(a)alsa-project.org (moderat S: Orphan F: sound/soc/uniphier/ +SOCKET TIMESTAMPING +M: Willem de Bruijn <willemdebruijn.kernel(a)gmail.com> +S: Maintained +F: Documentation/networking/timestamping.rst +F: include/uapi/linux/net_tstamp.h +F: tools/testing/selftests/net/so_txtime.c + SOEKRIS NET48XX LED SUPPORT M: Chris Boot <bootc(a)bootc.net> S: Maintained @@@ -19659,7 -19665,7 +19660,7 @@@ F: drivers/clk/spear F: drivers/pinctrl/spear/ SPI NOR SUBSYSTEM -M: Tudor Ambarus <tudor.ambarus(a)microchip.com> +M: Tudor Ambarus <tudor.ambarus(a)linaro.org> M: Pratyush Yadav <pratyush(a)kernel.org> R: Michael Walle <michael(a)walle.cc> L: linux-mtd(a)lists.infradead.org @@@ -19885,15 -19891,13 +19886,15 @@@ F: Documentation/devicetree/bindings/cl F: drivers/clk/starfive/clk-starfive-jh7100* F: include/dt-bindings/clock/starfive-jh7100*.h -STARFIVE JH7100 PINCTRL DRIVER +STARFIVE JH71X0 PINCTRL DRIVERS M: Emil Renner Berthing <kernel(a)esmil.dk> +M: Jianlong Huang <jianlong.huang(a)starfivetech.com> L: linux-gpio(a)vger.kernel.org S: Maintained -F: Documentation/devicetree/bindings/pinctrl/starfive,jh7100-pinctrl.yaml -F: drivers/pinctrl/starfive/ +F: Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml +F: drivers/pinctrl/starfive/pinctrl-starfive-jh71* F: include/dt-bindings/pinctrl/pinctrl-starfive-jh7100.h +F: include/dt-bindings/pinctrl/starfive,jh7110-pinctrl.h STARFIVE JH7100 RESET CONTROLLER DRIVER M: Emil Renner Berthing <kernel(a)esmil.dk> @@@ -19902,12 -19906,6 +19903,12 @@@ F: Documentation/devicetree/bindings/re F: drivers/reset/reset-starfive-jh7100.c F: include/dt-bindings/reset/starfive-jh7100.h +STARFIVE TRNG DRIVER +M: Jia Jie Ho <jiajie.ho(a)starfivetech.com> +S: Supported +F: Documentation/devicetree/bindings/rng/starfive* +F: drivers/char/hw_random/jh7110-trng.c + STATIC BRANCH/CALL M: Peter Zijlstra <peterz(a)infradead.org> M: Josh Poimboeuf <jpoimboe(a)kernel.org> @@@ -20065,7 -20063,6 +20066,7 @@@ F: drivers/watchdog/sunplus_wdt. SUPERH M: Yoshinori Sato <ysato(a)users.sourceforge.jp> M: Rich Felker <dalias(a)libc.org> +M: John Paul Adrian Glaubitz <glaubitz(a)physik.fu-berlin.de> L: linux-sh(a)vger.kernel.org S: Maintained Q: http://patchwork.kernel.org/project/linux-sh/list/ @@@ -20081,8 -20078,7 +20082,8 @@@ L: linux-pm(a)vger.kernel.or S: Supported B: https://bugzilla.kernel.org F: Documentation/power/ -F: arch/x86/kernel/acpi/ +F: arch/x86/kernel/acpi/sleep* +F: arch/x86/kernel/acpi/wakeup* F: drivers/base/power/ F: include/linux/freezer.h F: include/linux/pm.h @@@ -20299,7 -20295,8 +20300,7 @@@ S: Maintaine F: drivers/platform/x86/system76_acpi.c SYSV FILESYSTEM -M: Christoph Hellwig <hch(a)infradead.org> -S: Maintained +S: Orphan F: Documentation/filesystems/sysv-fs.rst F: fs/sysv/ F: include/linux/sysv_fs.h @@@ -20690,7 -20687,6 +20691,7 @@@ S: Supporte Q: https://patchwork.kernel.org/project/linux-pm/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal F: Documentation/ABI/testing/sysfs-class-thermal +F: Documentation/admin-guide/thermal/ F: Documentation/devicetree/bindings/thermal/ F: Documentation/driver-api/thermal/ F: drivers/thermal/ @@@ -20772,20 -20768,13 +20773,20 @@@ M: Mika Westerberg <mika.westerberg@lin M: Yehezkel Bernat <YehezkelShB(a)gmail.com> L: netdev(a)vger.kernel.org S: Maintained -F: drivers/net/thunderbolt.c +F: drivers/net/thunderbolt/ THUNDERX GPIO DRIVER M: Robert Richter <rric(a)kernel.org> S: Odd Fixes F: drivers/gpio/gpio-thunderx.c +TI ADS7924 ADC DRIVER +M: Hugo Villeneuve <hvilleneuve(a)dimonoff.com> +L: linux-iio(a)vger.kernel.org +S: Supported +F: Documentation/devicetree/bindings/iio/adc/ti,ads7924.yaml +F: drivers/iio/adc/ti-ads7924.c + TI AM437X VPFE DRIVER M: "Lad, Prabhakar" <prabhakar.csengg(a)gmail.com> L: linux-media(a)vger.kernel.org @@@ -20854,6 -20843,7 +20855,6 @@@ W: https://linuxtv.or Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git F: drivers/media/platform/ti/davinci/ -F: drivers/staging/media/deprecated/vpfe_capture/ F: include/media/davinci/ TI ENHANCED CAPTURE (eCAP) DRIVER @@@ -20905,14 -20895,6 +20906,14 @@@ S: Maintaine F: sound/soc/codecs/isabelle* F: sound/soc/codecs/lm49453* +TI LMP92064 ADC DRIVER +M: Leonard Göhrs <l.goehrs(a)pengutronix.de> +R: kernel(a)pengutronix.de +L: linux-iio(a)vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml +F: drivers/iio/adc/ti-lmp92064.c + TI PCM3060 ASoC CODEC DRIVER M: Kirill Marinushkin <kmarinushkin(a)birdec.com> L: alsa-devel(a)alsa-project.org (moderated for non-subscribers) @@@ -20926,13 -20908,6 +20927,13 @@@ L: alsa-devel(a)alsa-project.org (moderat S: Odd Fixes F: sound/soc/codecs/tas571x* +TI TMAG5273 MAGNETOMETER DRIVER +M: Gerald Loacker <gerald.loacker(a)wolfvision.net> +L: linux-iio(a)vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml +F: drivers/iio/magnetometer/tmag5273.c + TI TRF7970A NFC DRIVER M: Mark Greer <mgreer(a)animalcreek.com> L: linux-wireless(a)vger.kernel.org @@@ -21412,12 -21387,6 +21413,12 @@@ L: linux-scsi(a)vger.kernel.or S: Supported F: drivers/ufs/host/*dwc* +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER EXYNOS HOOKS +M: Alim Akhtar <alim.akhtar(a)samsung.com> +L: linux-scsi(a)vger.kernel.org +S: Maintained +F: drivers/ufs/host/ufs-exynos* + UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER MEDIATEK HOOKS M: Stanley Chu <stanley.chu(a)mediatek.com> L: linux-scsi(a)vger.kernel.org @@@ -21425,14 -21394,6 +21426,14 @@@ L: linux-mediatek(a)lists.infradead.org ( S: Maintained F: drivers/ufs/host/ufs-mediatek* +UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER QUALCOMM HOOKS +M: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> +L: linux-arm-msm(a)vger.kernel.org +L: linux-scsi(a)vger.kernel.org +S: Maintained +F: Documentation/devicetree/bindings/ufs/qcom,ufs.yaml +F: drivers/ufs/host/ufs-qcom* + UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER RENESAS HOOKS M: Yoshihiro Shimoda <yoshihiro.shimoda.uh(a)renesas.com> L: linux-renesas-soc(a)vger.kernel.org @@@ -21742,7 -21703,6 +21743,7 @@@ F: include/uapi/linux/uvcvideo. USB WEBCAM GADGET M: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> +M: Daniel Scally <dan.scally(a)ideasonboard.com> L: linux-usb(a)vger.kernel.org S: Maintained F: drivers/usb/gadget/function/*uvc* @@@ -21778,13 -21738,6 +21779,13 @@@ T: git git://linuxtv.org/media_tree.gi F: Documentation/admin-guide/media/zr364xx* F: drivers/staging/media/deprecated/zr364xx/ +USER DATAGRAM PROTOCOL (UDP) +M: Willem de Bruijn <willemdebruijn.kernel(a)gmail.com> +S: Maintained +F: include/linux/udp.h +F: net/ipv4/udp.c +F: net/ipv6/udp.c + USER-MODE LINUX (UML) M: Richard Weinberger <richard(a)nod.at> M: Anton Ivanov <anton.ivanov(a)cambridgegreys.com> @@@ -21830,10 -21783,13 +21831,10 @@@ W: http://en.wikipedia.org/wiki/Util-li T: git git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git UUID HELPERS -M: Christoph Hellwig <hch(a)lst.de> R: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> L: linux-kernel(a)vger.kernel.org S: Maintained -T: git git://git.infradead.org/users/hch/uuid.git F: include/linux/uuid.h -F: include/uapi/linux/uuid.h F: lib/test_uuid.c F: lib/uuid.c @@@ -22290,9 -22246,7 +22291,9 @@@ F: drivers/scsi/vmw_pvscsi. F: drivers/scsi/vmw_pvscsi.h VMWARE VIRTUAL PTP CLOCK DRIVER -M: Vivek Thampi <vithampi(a)vmware.com> +M: Srivatsa S. Bhat (VMware) <srivatsa(a)csail.mit.edu> +M: Deep Shah <sdeep(a)vmware.com> +R: Alexey Makhalov <amakhalov(a)vmware.com> R: VMware PV-Drivers Reviewers <pv-drivers(a)vmware.com> L: netdev(a)vger.kernel.org S: Supported @@@ -22660,7 -22614,6 +22661,7 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git F: drivers/platform/olpc/ F: drivers/platform/x86/ +F: include/linux/platform_data/x86/ X86 PLATFORM DRIVERS - ARCH R: Darren Hart <dvhart(a)infradead.org> @@@ -22946,13 -22899,6 +22947,13 @@@ F: Documentation/devicetree/bindings/dm F: drivers/dma/xilinx/xilinx_dpdma.c F: include/dt-bindings/dma/xlnx-zynqmp-dpdma.h +XILINX ZYNQMP OCM EDAC DRIVER +M: Shubhrajyoti Datta <shubhrajyoti.datta(a)amd.com> +M: Sai Krishna Potthuri <sai.krishna.potthuri(a)amd.com> +S: Maintained +F: Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml +F: drivers/edac/zynqmp_edac.c + XILINX ZYNQMP PSGTR PHY DRIVER M: Anurag Kumar Vulisha <anurag.kumar.vulisha(a)xilinx.com> M: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> diff --combined Makefile index 8e5621ddadb2,b74503aec68c..126faecec461 --- a/Makefile +++ b/Makefile @@@ -2,7 -2,7 +2,7 @@@ VERSION = 6 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -rc1 +EXTRAVERSION = NAME = Hurr durr I'ma ninja sloth # *DOCUMENTATION* @@@ -297,7 -297,7 +297,7 @@@ no-compiler-targets := $(no-dot-config- headers_install modules_install kernelrelease image_name no-sync-config-targets := $(no-dot-config-targets) %install kernelrelease \ image_name -single-targets := %.a %.i %.rsi %.ko %.lds %.ll %.lst %.mod %.o %.s %.symtypes %/ +single-targets := %.a %.i %.ko %.lds %.ll %.lst %.mod %.o %.rsi %.s %.symtypes %/ config-build := mixed-build := @@@ -549,7 -549,7 +549,7 @@@ LDFLAGS_MODULE CFLAGS_KERNEL = RUSTFLAGS_KERNEL = AFLAGS_KERNEL = -export LDFLAGS_vmlinux = +LDFLAGS_vmlinux = # Use USERINCLUDE when you must reference the UAPI directories only. USERINCLUDE := \ @@@ -1248,18 -1248,6 +1248,18 @@@ vmlinux.o modules.builtin.modinfo modul @: PHONY += vmlinux +# LDFLAGS_vmlinux in the top Makefile defines linker flags for the top vmlinux, +# not for decompressors. LDFLAGS_vmlinux in arch/*/boot/compressed/Makefile is +# unrelated; the decompressors just happen to have the same base name, +# arch/*/boot/compressed/vmlinux. +# Export LDFLAGS_vmlinux only to scripts/Makefile.vmlinux. +# +# _LDFLAGS_vmlinux is a workaround for the 'private export' bug: +# https://savannah.gnu.org/bugs/?61463 +# For Make > 4.4, the following simple code will work: +# vmlinux: private export LDFLAGS_vmlinux := $(LDFLAGS_vmlinux) +vmlinux: private _LDFLAGS_vmlinux := $(LDFLAGS_vmlinux) +vmlinux: export LDFLAGS_vmlinux = $(_LDFLAGS_vmlinux) vmlinux: vmlinux.o $(KBUILD_LDS) modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.vmlinux @@@ -1493,7 -1481,10 +1493,10 @@@ dtbs_prepare: include/config/kernel.rel ifneq ($(filter dtbs_check, $(MAKECMDGOALS)),) export CHECK_DTBS=y - dtbs: dt_binding_check + endif + + ifneq ($(CHECK_DTBS),) + dtbs_prepare: dt_binding_check endif dtbs_check: dtbs @@@ -1545,7 -1536,6 +1548,7 @@@ endi # *.ko are usually independent of vmlinux, but CONFIG_DEBUG_INFOBTF_MODULES # is an exception. ifdef CONFIG_DEBUG_INFO_BTF_MODULES +KBUILD_BUILTIN := 1 modules: vmlinux endif @@@ -1602,7 -1592,7 +1605,7 @@@ endif # CONFIG_MODULE CLEAN_FILES += include/ksym vmlinux.symvers modules-only.symvers \ modules.builtin modules.builtin.modinfo modules.nsdeps \ compile_commands.json .thinlto-cache rust/test rust/doc \ - .vmlinux.objs .vmlinux.export.c + rust-project.json .vmlinux.objs .vmlinux.export.c # Directories & files removed with 'make mrproper' MRPROPER_FILES += include/config include/generated \ @@@ -1792,6 -1782,10 +1795,10 @@@ help @echo ' 3: more obscure warnings, can most likely be ignored' @echo ' e: warnings are being treated as errors' @echo ' Multiple levels can be combined with W=12 or W=123' + @$(if $(dtstree), \ + echo ' make CHECK_DTBS=1 [targets] Check all generated dtb files against schema'; \ + echo ' This can be applied both to "dtbs" and to individual "foo.dtb" targets' ; \ + ) @echo '' @echo 'Execute "make" or "make all" to build all targets marked with [*] ' @echo 'For further info see the ./README file' @@@ -1999,7 -1993,7 +2006,7 @@@ $(single-no-ko): $(build-dir # Remove MODORDER when done because it is not the real one. PHONY += single_modules single_modules: $(single-no-ko) modules_prepare - $(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$m;) } > $(MODORDER) + $(Q){ $(foreach m, $(single-ko), echo $(extmod_prefix)$(m:%.ko=%.o);) } > $(MODORDER) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost ifneq ($(KBUILD_MODPOST_NOFINAL),1) $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modfinal diff --combined drivers/of/of_reserved_mem.c index f90975e00446,9f7127297f4d..948efa9f99e3 --- a/drivers/of/of_reserved_mem.c +++ b/drivers/of/of_reserved_mem.c @@@ -48,10 -48,9 +48,10 @@@ static int __init early_init_dt_alloc_r err = memblock_mark_nomap(base, size); if (err) memblock_phys_free(base, size); - kmemleak_ignore_phys(base); } + kmemleak_ignore_phys(base); + return err; } @@@ -285,6 -284,16 +285,16 @@@ void __init fdt_init_reserved_mem(void else memblock_phys_free(rmem->base, rmem->size); + } else { + phys_addr_t end = rmem->base + rmem->size - 1; + bool reusable = + (of_get_flat_dt_prop(node, "reusable", NULL)) != NULL; + + pr_info("%pa..%pa (%lu KiB) %s %s %s\n", + &rmem->base, &end, (unsigned long)(rmem->size / SZ_1K), + nomap ? "nomap" : "map", + reusable ? "reusable" : "non-reusable", + rmem->name ? rmem->name : "unknown"); } } } diff --combined drivers/of/platform.c index b3878a98d27f,9f015ad73288..b2bd2e783445 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@@ -222,7 -222,6 +222,6 @@@ static struct amba_device *of_amba_devi struct device *parent) { struct amba_device *dev; - const void *prop; int ret; pr_debug("Creating amba device %pOF\n", node); @@@ -250,9 -249,7 +249,7 @@@ of_device_make_bus_id(&dev->dev); /* Allow the HW Peripheral ID to be overridden */ - prop = of_get_property(node, "arm,primecell-periphid", NULL); - if (prop) - dev->periphid = of_read_ulong(prop, 1); + of_property_read_u32(node, "arm,primecell-periphid", &dev->periphid); ret = of_address_to_resource(node, 0, &dev->res); if (ret) { @@@ -525,11 -522,10 +522,11 @@@ static int __init of_platform_default_p if (IS_ENABLED(CONFIG_PPC)) { struct device_node *boot_display = NULL; struct platform_device *dev; + int display_number = 0; int ret; /* Check if we have a MacOS display without a node spec */ - if (of_get_property(of_chosen, "linux,bootx-noscreen", NULL)) { + if (of_property_present(of_chosen, "linux,bootx-noscreen")) { /* * The old code tried to work out which node was the MacOS * display based on the address. I'm dropping that since the @@@ -556,23 -552,16 +553,23 @@@ if (!of_get_property(node, "linux,opened", NULL) || !of_get_property(node, "linux,boot-display", NULL)) continue; - dev = of_platform_device_create(node, "of-display", NULL); + dev = of_platform_device_create(node, "of-display.0", NULL); + of_node_put(node); if (WARN_ON(!dev)) return -ENOMEM; boot_display = node; + display_number++; break; } for_each_node_by_type(node, "display") { + char buf[14]; + const char *of_display_format = "of-display.%d"; + if (!of_get_property(node, "linux,opened", NULL) || node == boot_display) continue; - of_platform_device_create(node, "of-display", NULL); + ret = snprintf(buf, sizeof(buf), of_display_format, display_number++); + if (ret < sizeof(buf)) + of_platform_device_create(node, buf, NULL); } } else { diff --combined drivers/of/property.c index fb210e921ca9,a229536f7564..ddc75cd50825 --- a/drivers/of/property.c +++ b/drivers/of/property.c @@@ -1062,6 -1062,20 +1062,6 @@@ of_fwnode_device_get_match_data(const s return of_device_get_match_data(dev); } -static bool of_is_ancestor_of(struct device_node *test_ancestor, - struct device_node *child) -{ - of_node_get(child); - while (child) { - if (child == test_ancestor) { - of_node_put(child); - return true; - } - child = of_get_next_parent(child); - } - return false; -} - static struct device_node *of_get_compat_node(struct device_node *np) { of_node_get(np); @@@ -1072,7 -1086,7 +1072,7 @@@ np = NULL; } - if (of_find_property(np, "compatible", NULL)) + if (of_property_present(np, "compatible")) break; np = of_get_next_parent(np); @@@ -1092,27 -1106,71 +1092,27 @@@ static struct device_node *of_get_compa return node; } -/** - * of_link_to_phandle - Add fwnode link to supplier from supplier phandle - * @con_np: consumer device tree node - * @sup_np: supplier device tree node - * - * Given a phandle to a supplier device tree node (@sup_np), this function - * finds the device that owns the supplier device tree node and creates a - * device link from @dev consumer device to the supplier device. This function - * doesn't create device links for invalid scenarios such as trying to create a - * link with a parent device as the consumer of its child device. In such - * cases, it returns an error. - * - * Returns: - * - 0 if fwnode link successfully created to supplier - * - -EINVAL if the supplier link is invalid and should not be created - * - -ENODEV if struct device will never be create for supplier - */ -static int of_link_to_phandle(struct device_node *con_np, +static void of_link_to_phandle(struct device_node *con_np, struct device_node *sup_np) { - struct device *sup_dev; - struct device_node *tmp_np = sup_np; + struct device_node *tmp_np = of_node_get(sup_np); - /* - * Find the device node that contains the supplier phandle. It may be - * @sup_np or it may be an ancestor of @sup_np. - */ - sup_np = of_get_compat_node(sup_np); - if (!sup_np) { - pr_debug("Not linking %pOFP to %pOFP - No device\n", - con_np, tmp_np); - return -ENODEV; - } + /* Check that sup_np and its ancestors are available. */ + while (tmp_np) { + if (of_fwnode_handle(tmp_np)->dev) { + of_node_put(tmp_np); + break; + } - /* - * Don't allow linking a device node as a consumer of one of its - * descendant nodes. By definition, a child node can't be a functional - * dependency for the parent node. - */ - if (of_is_ancestor_of(con_np, sup_np)) { - pr_debug("Not linking %pOFP to %pOFP - is descendant\n", - con_np, sup_np); - of_node_put(sup_np); - return -EINVAL; - } + if (!of_device_is_available(tmp_np)) { + of_node_put(tmp_np); + return; + } - /* - * Don't create links to "early devices" that won't have struct devices - * created for them. - */ - sup_dev = get_dev_from_fwnode(&sup_np->fwnode); - if (!sup_dev && - (of_node_check_flag(sup_np, OF_POPULATED) || - sup_np->fwnode.flags & FWNODE_FLAG_NOT_DEVICE)) { - pr_debug("Not linking %pOFP to %pOFP - No struct device\n", - con_np, sup_np); - of_node_put(sup_np); - return -ENODEV; + tmp_np = of_get_next_parent(tmp_np); } - put_device(sup_dev); fwnode_link_add(of_fwnode_handle(con_np), of_fwnode_handle(sup_np)); - of_node_put(sup_np); - - return 0; } /** @@@ -1144,8 -1202,8 +1144,8 @@@ static struct device_node *parse_prop_c if (strcmp(prop_name, list_name)) return NULL; - if (of_parse_phandle_with_args(np, list_name, cells_name, index, - &sup_args)) + if (__of_parse_phandle_with_args(np, list_name, cells_name, 0, index, + &sup_args)) return NULL; return sup_args.np; @@@ -1249,7 -1307,7 +1249,7 @@@ DEFINE_SIMPLE_PROP(dmas, "dmas", "#dma- DEFINE_SIMPLE_PROP(power_domains, "power-domains", "#power-domain-cells") DEFINE_SIMPLE_PROP(hwlocks, "hwlocks", "#hwlock-cells") DEFINE_SIMPLE_PROP(extcon, "extcon", NULL) -DEFINE_SIMPLE_PROP(nvmem_cells, "nvmem-cells", NULL) +DEFINE_SIMPLE_PROP(nvmem_cells, "nvmem-cells", "#nvmem-cell-cells") DEFINE_SIMPLE_PROP(phys, "phys", "#phy-cells") DEFINE_SIMPLE_PROP(wakeup_parent, "wakeup-parent", NULL) DEFINE_SIMPLE_PROP(pinctrl0, "pinctrl-0", NULL) @@@ -1300,7 -1358,7 +1300,7 @@@ static struct device_node *parse_gpio_c * Ignore node with gpio-hog property since its gpios are all provided * by its parent. */ - if (of_find_property(np, "gpio-hog", NULL)) + if (of_property_read_bool(np, "gpio-hog")) return NULL; if (of_parse_phandle_with_args(np, prop_name, "#gpio-cells", index, diff --combined include/linux/of.h index 98c252d2d851,1cb659e682f5..0af611307db2 --- a/include/linux/of.h +++ b/include/linux/of.h @@@ -100,8 -100,19 +100,19 @@@ struct of_reconfig_data struct property *old_prop; }; + /** + * of_node_init - initialize a devicetree node + * @node: Pointer to device node that has been created by kzalloc() + * @phandle_name: Name of property holding a phandle value + * + * On return the device_node refcount is set to one. Use of_node_put() + * on @node when done to free the memory allocated for it. If the node + * is NOT a dynamic node the memory will not be freed. The decision of + * whether to free the memory will be done by node->release(), which is + * of_node_release(). + */ /* initialize a node */ - extern struct kobj_type of_node_ktype; + extern const struct kobj_type of_node_ktype; extern const struct fwnode_operations of_fwnode_ops; static inline void of_node_init(struct device_node *node) { @@@ -1008,31 -1019,6 +1019,31 @@@ static inline int of_parse_phandle_with index, out_args); } +/** + * of_parse_phandle_with_optional_args() - Find a node pointed by phandle in a list + * @np: pointer to a device tree node containing a list + * @list_name: property name that contains a list + * @cells_name: property name that specifies phandles' arguments count + * @index: index of a phandle to parse out + * @out_args: optional pointer to output arguments structure (will be filled) + * + * Same as of_parse_phandle_with_args() except that if the cells_name property + * is not found, cell_count of 0 is assumed. + * + * This is used to useful, if you have a phandle which didn't have arguments + * before and thus doesn't have a '#*-cells' property but is now migrated to + * having arguments while retaining backwards compatibility. + */ +static inline int of_parse_phandle_with_optional_args(const struct device_node *np, + const char *list_name, + const char *cells_name, + int index, + struct of_phandle_args *out_args) +{ + return __of_parse_phandle_with_args(np, list_name, cells_name, + 0, index, out_args); +} + /** * of_property_count_u8_elems - Count the number of u8 elements in a property * @@@ -1180,7 -1166,8 +1191,8 @@@ static inline int of_property_read_stri * @np: device node from which the property value is to be read. * @propname: name of the property to be searched. * - * Search for a property in a device node. + * Search for a boolean property in a device node. Usage on non-boolean + * property types is deprecated. * * Return: true if the property exists false otherwise. */ @@@ -1192,6 -1179,20 +1204,20 @@@ static inline bool of_property_read_boo return prop ? true : false; } + /** + * of_property_present - Test if a property is present in a node + * @np: device node to search for the property. + * @propname: name of the property to be searched. + * + * Test for a property present in a device node. + * + * Return: true if the property exists false otherwise. + */ + static inline bool of_property_present(const struct device_node *np, const char *propname) + { + return of_property_read_bool(np, propname); + } + /** * of_property_read_u8_array - Find and read an array of u8 from a property. * -- LinuxNextTracking

1 0

Build check errors found: 2023-02-27
by postmaster＠open-mesh.org 27 Feb '23

27 Feb '23

Name of failed tests ==================== stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/Documentation/networking/batman-adv.rst | 2 net/net/batman-adv/bat_iv_ogm.c | 1 net/net/batman-adv/bat_v_elp.c | 1 net/net/batman-adv/bat_v_ogm.c | 5 net/net/batman-adv/distributed-arp-table.c | 2 net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 251 +------------------ net/net/batman-adv/multicast.h | 38 -- net/net/batman-adv/network-coding.c | 4 net/net/batman-adv/routing.c | 7 net/net/batman-adv/soft-interface.c | 26 - net/net/batman-adv/translation-table.c | 4 net/net/batman-adv/tvlv.c | 71 +++-- net/net/batman-adv/tvlv.h | 9 net/net/batman-adv/types.h | 6 16 files changed, 108 insertions(+), 323 deletions(-) Statistics ========== main ---- Failed tests: 0 Started build tests: 250 Tested Linux versions: 36 Tested configs: 114 stable ------ Failed tests: 1 Started build tests: 295 Tested Linux versions: 36 Tested configs: 116

1 0

Build check errors found: 2023-02-26
by postmaster＠open-mesh.org 26 Feb '23

26 Feb '23

Name of failed tests ==================== stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/Documentation/networking/batman-adv.rst | 2 net/net/batman-adv/bat_iv_ogm.c | 1 net/net/batman-adv/bat_v_elp.c | 1 net/net/batman-adv/bat_v_ogm.c | 5 net/net/batman-adv/distributed-arp-table.c | 2 net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 251 +------------------ net/net/batman-adv/multicast.h | 38 -- net/net/batman-adv/network-coding.c | 4 net/net/batman-adv/routing.c | 7 net/net/batman-adv/soft-interface.c | 26 - net/net/batman-adv/translation-table.c | 4 net/net/batman-adv/tvlv.c | 71 +++-- net/net/batman-adv/tvlv.h | 9 net/net/batman-adv/types.h | 6 16 files changed, 108 insertions(+), 323 deletions(-) Statistics ========== stable ------ Failed tests: 1 Started build tests: 265 Tested Linux versions: 36 Tested configs: 113 main ---- Failed tests: 0 Started build tests: 266 Tested Linux versions: 36 Tested configs: 108

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20230225
by batman＠open-mesh.org 25 Feb '23

25 Feb '23

The following commit has been merged in the master branch: commit 2b79eb73e2c4b362a2a261b7b2f718385fb478e4 Merge: 0df82189bc42037678fa590a77ed0116f428c90d c96abaec78f34366b3ddf1c6be52ca5c1241e15b Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Feb 23 13:03:08 2023 -0800 Merge tag 'probes-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace Pull kprobes updates from Masami Hiramatsu: - Skip negative return code check for snprintf in eprobe - Add recursive call test cases for kprobe unit test - Add 'char' type to probe events to show it as the character instead of value - Update kselftest kprobe-event testcase to ignore '__pfx_' symbols - Fix kselftest to check filter on eprobe event correctly - Add filter on eprobe to the README file in tracefs - Fix optprobes to check whether there is 'under unoptimizing' optprobe when optimizing another kprobe correctly - Fix optprobe to check whether there is 'under unoptimizing' optprobe when fetching the original instruction correctly - Fix optprobe to free 'forcibly unoptimized' optprobe correctly * tag 'probes-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace: tracing/eprobe: no need to check for negative ret value for snprintf test_kprobes: Add recursed kprobe test case tracing/probe: add a char type to show the character value of traced arguments selftests/ftrace: Fix probepoint testcase to ignore __pfx_* symbols selftests/ftrace: Fix eprobe syntax test case to check filter support tracing/eprobe: Fix to add filter on eprobe description in README file x86/kprobes: Fix arch_check_optimized_kprobe check within optimized_kprobe range x86/kprobes: Fix __recover_optprobed_insn check optimizing logic kprobes: Fix to handle forcibly unoptimized kprobes on freeing_list diff --combined Documentation/trace/kprobetrace.rst index 0d103074d3d2,ef223b8ad6d5..651f9ab53f3e --- a/Documentation/trace/kprobetrace.rst +++ b/Documentation/trace/kprobetrace.rst @@@ -6,21 -6,21 +6,21 @@@ Kprobe-based Event Tracin Overview -------- -These events are similar to tracepoint based events. Instead of Tracepoint, +These events are similar to tracepoint-based events. Instead of tracepoints, this is based on kprobes (kprobe and kretprobe). So it can probe wherever kprobes can probe (this means, all functions except those with __kprobes/nokprobe_inline annotation and those marked NOKPROBE_SYMBOL). -Unlike the Tracepoint based event, this can be added and removed +Unlike the tracepoint-based event, this can be added and removed dynamically, on the fly. To enable this feature, build your kernel with CONFIG_KPROBE_EVENTS=y. -Similar to the events tracer, this doesn't need to be activated via +Similar to the event tracer, this doesn't need to be activated via current_tracer. Instead of that, add probe points via -/sys/kernel/debug/tracing/kprobe_events, and enable it via -/sys/kernel/debug/tracing/events/kprobes/<EVENT>/enable. +/sys/kernel/tracing/kprobe_events, and enable it via +/sys/kernel/tracing/events/kprobes/<EVENT>/enable. -You can also use /sys/kernel/debug/tracing/dynamic_events instead of +You can also use /sys/kernel/tracing/dynamic_events instead of kprobe_events. That interface will provide unified access to other dynamic events too. @@@ -58,7 -58,7 +58,7 @@@ Synopsis of kprobe_event NAME=FETCHARG : Set NAME as the argument name of FETCHARG. FETCHARG:TYPE : Set TYPE as the type of FETCHARG. Currently, basic types (u8/u16/u32/u64/s8/s16/s32/s64), hexadecimal types - (x8/x16/x32/x64), "string", "ustring", "symbol", "symstr" + (x8/x16/x32/x64), "char", "string", "ustring", "symbol", "symstr" and bitfield are supported. (\*1) only for the probe on function entry (offs == 0). @@@ -68,25 -68,23 +68,27 @@@ Types ----- -Several types are supported for fetch-args. Kprobe tracer will access memory +Several types are supported for fetchargs. Kprobe tracer will access memory by given type. Prefix 's' and 'u' means those types are signed and unsigned respectively. 'x' prefix implies it is unsigned. Traced arguments are shown in decimal ('s' and 'u') or hexadecimal ('x'). Without type casting, 'x32' or 'x64' is used depends on the architecture (e.g. x86-32 uses x32, and x86-64 uses x64). + These value types can be an array. To record array data, you can add '[N]' (where N is a fixed number, less than 64) to the base type. -E.g. 'x16[4]' means an array of x16 (2bytes hex) with 4 elements. +E.g. 'x16[4]' means an array of x16 (2-byte hex) with 4 elements. Note that the array can be applied to memory type fetchargs, you can not apply it to registers/stack-entries etc. (for example, '$stack1:x8[8]' is wrong, but '+8($stack):x8[8]' is OK.) + + Char type can be used to show the character value of traced arguments. ++ String type is a special type, which fetches a "null-terminated" string from kernel space. This means it will fail and store NULL if the string container has been paged out. "ustring" type is an alternative of string for user-space. -See :ref:`user_mem_access` for more info.. +See :ref:`user_mem_access` for more info. + The string array type is a bit different from other types. For other base types, <base-type>[1] is equal to <base-type> (e.g. +0(%di):x32[1] is same as +0(%di):x32.) But string[1] is not equal to string. The string type itself @@@ -123,8 -121,8 +125,8 @@@ space. 'ustring' is a shortcut way of p Note that kprobe-event provides the user-memory access syntax but it doesn't use it transparently. This means if you use normal dereference or string type -for user memory, it might fail, and may always fail on some archs. The user -has to carefully check if the target data is in kernel or user space. +for user memory, it might fail, and may always fail on some architectures. The +user has to carefully check if the target data is in kernel or user space. Per-Probe Event Filtering ------------------------- @@@ -153,7 -151,7 +155,7 @@@ trigger Event Profiling --------------- You can check the total number of probe hits and probe miss-hits via -/sys/kernel/debug/tracing/kprobe_profile. +/sys/kernel/tracing/kprobe_profile. The first column is event name, the second is the number of probe hits, the third is the number of probe miss-hits. @@@ -163,11 -161,11 +165,11 @@@ You can add and enable new kprobe event "kprobe_event=" parameter. The parameter accepts a semicolon-delimited kprobe events, which format is similar to the kprobe_events. The difference is that the probe definition parameters are comma-delimited -instead of space. For example, adding myprobe event on do_sys_open like below +instead of space. For example, adding myprobe event on do_sys_open like below:: p:myprobe do_sys_open dfd=%ax filename=%dx flags=%cx mode=+4($stack) -should be below for kernel boot parameter (just replace spaces with comma) +should be below for kernel boot parameter (just replace spaces with comma):: p:myprobe,do_sys_open,dfd=%ax,filename=%dx,flags=%cx,mode=+4($stack) @@@ -177,7 -175,7 +179,7 @@@ Usage example To add a probe as a new event, write a new definition to kprobe_events as below:: - echo 'p:myprobe do_sys_open dfd=%ax filename=%dx flags=%cx mode=+4($stack)' > /sys/kernel/debug/tracing/kprobe_events + echo 'p:myprobe do_sys_open dfd=%ax filename=%dx flags=%cx mode=+4($stack)' > /sys/kernel/tracing/kprobe_events This sets a kprobe on the top of do_sys_open() function with recording 1st to 4th arguments as "myprobe" event. Note, which register/stack entry is @@@ -187,15 -185,15 +189,15 @@@ under tools/perf/) As this example shows, users can choose more familiar names for each arguments. :: - echo 'r:myretprobe do_sys_open $retval' >> /sys/kernel/debug/tracing/kprobe_events + echo 'r:myretprobe do_sys_open $retval' >> /sys/kernel/tracing/kprobe_events This sets a kretprobe on the return point of do_sys_open() function with recording return value as "myretprobe" event. You can see the format of these events via -/sys/kernel/debug/tracing/events/kprobes/<EVENT>/format. +/sys/kernel/tracing/events/kprobes/<EVENT>/format. :: - cat /sys/kernel/debug/tracing/events/kprobes/myprobe/format + cat /sys/kernel/tracing/events/kprobes/myprobe/format name: myprobe ID: 780 format: @@@ -218,7 -216,7 +220,7 @@@ You can see that the event has 4 arguments as in the expressions you specified. :: - echo > /sys/kernel/debug/tracing/kprobe_events + echo > /sys/kernel/tracing/kprobe_events This clears all probe points. @@@ -233,8 -231,8 +235,8 @@@ Right after definition, each event is d events, you need to enable it. :: - echo 1 > /sys/kernel/debug/tracing/events/kprobes/myprobe/enable - echo 1 > /sys/kernel/debug/tracing/events/kprobes/myretprobe/enable + echo 1 > /sys/kernel/tracing/events/kprobes/myprobe/enable + echo 1 > /sys/kernel/tracing/events/kprobes/myretprobe/enable Use the following command to start tracing in an interval. :: @@@ -243,10 -241,10 +245,10 @@@ Open something... # echo 0 > tracing_on -And you can see the traced information via /sys/kernel/debug/tracing/trace. +And you can see the traced information via /sys/kernel/tracing/trace. :: - cat /sys/kernel/debug/tracing/trace + cat /sys/kernel/tracing/trace # tracer: nop # # TASK-PID CPU# TIMESTAMP FUNCTION diff --combined kernel/trace/trace.c index 0fa59acfea17,712ba8d6f91f..45551c7b4c36 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@@ -49,8 -49,6 +49,8 @@@ #include <linux/irq_work.h> #include <linux/workqueue.h> +#include <asm/setup.h> /* COMMAND_LINE_SIZE */ + #include "trace.h" #include "trace_output.h" @@@ -188,12 -186,6 +188,12 @@@ static char *default_bootup_tracer static bool allocate_snapshot; static bool snapshot_at_boot; +static char boot_instance_info[COMMAND_LINE_SIZE] __initdata; +static int boot_instance_index; + +static char boot_snapshot_info[COMMAND_LINE_SIZE] __initdata; +static int boot_snapshot_index; + static int __init set_cmdline_ftrace(char *str) { strlcpy(bootup_tracer_buf, str, MAX_TRACER_SIZE); @@@ -230,22 -222,9 +230,22 @@@ __setup("traceoff_on_warning", stop_tra static int __init boot_alloc_snapshot(char *str) { - allocate_snapshot = true; - /* We also need the main ring buffer expanded */ - ring_buffer_expanded = true; + char *slot = boot_snapshot_info + boot_snapshot_index; + int left = sizeof(boot_snapshot_info) - boot_snapshot_index; + int ret; + + if (str[0] == '=') { + str++; + if (strlen(str) >= left) + return -1; + + ret = snprintf(slot, left, "%s\t", str); + boot_snapshot_index += ret; + } else { + allocate_snapshot = true; + /* We also need the main ring buffer expanded */ + ring_buffer_expanded = true; + } return 1; } __setup("alloc_snapshot", boot_alloc_snapshot); @@@ -260,23 -239,6 +260,23 @@@ static int __init boot_snapshot(char *s __setup("ftrace_boot_snapshot", boot_snapshot); +static int __init boot_instance(char *str) +{ + char *slot = boot_instance_info + boot_instance_index; + int left = sizeof(boot_instance_info) - boot_instance_index; + int ret; + + if (strlen(str) >= left) + return -1; + + ret = snprintf(slot, left, "%s\t", str); + boot_instance_index += ret; + + return 1; +} +__setup("trace_instance=", boot_instance); + + static char trace_boot_options_buf[MAX_TRACER_SIZE] __initdata; static int __init set_trace_boot_options(char *str) @@@ -1039,8 -1001,13 +1039,8 @@@ __buffer_unlock_commit(struct trace_buf ring_buffer_unlock_commit(buffer); } -/** - * __trace_puts - write a constant string into the trace buffer. - * @ip: The address of the caller - * @str: The constant string to write - * @size: The size of the string. - */ -int __trace_puts(unsigned long ip, const char *str, int size) +int __trace_array_puts(struct trace_array *tr, unsigned long ip, + const char *str, int size) { struct ring_buffer_event *event; struct trace_buffer *buffer; @@@ -1048,7 -1015,7 +1048,7 @@@ unsigned int trace_ctx; int alloc; - if (!(global_trace.trace_flags & TRACE_ITER_PRINTK)) + if (!(tr->trace_flags & TRACE_ITER_PRINTK)) return 0; if (unlikely(tracing_selftest_running || tracing_disabled)) @@@ -1057,7 -1024,7 +1057,7 @@@ alloc = sizeof(*entry) + size + 2; /* possible \n added */ trace_ctx = tracing_gen_ctx(); - buffer = global_trace.array_buffer.buffer; + buffer = tr->array_buffer.buffer; ring_buffer_nest_start(buffer); event = __trace_buffer_lock_reserve(buffer, TRACE_PRINT, alloc, trace_ctx); @@@ -1079,23 -1046,11 +1079,23 @@@ entry->buf[size] = '\0'; __buffer_unlock_commit(buffer, event); - ftrace_trace_stack(&global_trace, buffer, trace_ctx, 4, NULL); + ftrace_trace_stack(tr, buffer, trace_ctx, 4, NULL); out: ring_buffer_nest_end(buffer); return size; } +EXPORT_SYMBOL_GPL(__trace_array_puts); + +/** + * __trace_puts - write a constant string into the trace buffer. + * @ip: The address of the caller + * @str: The constant string to write + * @size: The size of the string. + */ +int __trace_puts(unsigned long ip, const char *str, int size) +{ + return __trace_array_puts(&global_trace, ip, str, size); +} EXPORT_SYMBOL_GPL(__trace_puts); /** @@@ -1187,7 -1142,7 +1187,7 @@@ void tracing_snapshot_instance(struct t * * Note, make sure to allocate the snapshot with either * a tracing_snapshot_alloc(), or by doing it manually - * with: echo 1 > /sys/kernel/debug/tracing/snapshot + * with: echo 1 > /sys/kernel/tracing/snapshot * * If the snapshot buffer is not allocated, it will stop tracing. * Basically making a permanent snapshot. @@@ -3173,9 -3128,6 +3173,9 @@@ void __trace_stack(struct trace_array * return; } + if (WARN_ON_ONCE(IS_ENABLED(CONFIG_GENERIC_ENTRY))) + return; + /* * When an NMI triggers, RCU is enabled via ct_nmi_enter(), * but if the above rcu_is_watching() failed, then the NMI @@@ -5646,7 -5598,7 +5646,7 @@@ static const char readme_msg[] #ifdef CONFIG_HIST_TRIGGERS "\t s:[synthetic/]<event> <field> [<field>]\n" #endif - "\t e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>]\n" + "\t e[:[<group>/][<event>]] <attached-group>.<attached-event> [<args>] [if <filter>]\n" "\t -:[<group>/][<event>]\n" #ifdef CONFIG_KPROBE_EVENTS "\t place: [<module>:]<symbol>[+<offset>]|<memaddr>\n" @@@ -5663,7 -5615,7 +5663,7 @@@ "\t $stack<index>, $stack, $retval, $comm,\n" #endif "\t +|-[u]<offset>(<fetcharg>), \\imm-value, \\\"imm-string\"\n" - "\t type: s8/16/32/64, u8/16/32/64, x8/16/32/64, string, symbol,\n" + "\t type: s8/16/32/64, u8/16/32/64, x8/16/32/64, char, string, symbol,\n" "\t b<bit-width>@<bit-offset>/<container-size>, ustring,\n" "\t symstr, <type>\\[<array-size>\\]\n" #ifdef CONFIG_HIST_TRIGGERS @@@ -5805,7 -5757,7 +5805,7 @@@ #ifdef CONFIG_SYNTH_EVENTS " events/synthetic_events\t- Create/append/remove/show synthetic events\n" "\t Write into this file to define/undefine new synthetic events.\n" - "\t example: echo 'myevent u64 lat; char name[]' >> synthetic_events\n" + "\t example: echo 'myevent u64 lat; char name[]; long[] stack' >> synthetic_events\n" #endif #endif ; @@@ -9270,6 -9222,10 +9270,6 @@@ static int allocate_trace_buffers(struc } tr->allocated_snapshot = allocate_snapshot; - /* - * Only the top level trace array gets its snapshot allocated - * from the kernel command line. - */ allocate_snapshot = false; #endif @@@ -10185,79 -10141,6 +10185,79 @@@ out return ret; } +#ifdef CONFIG_TRACER_MAX_TRACE +__init static bool tr_needs_alloc_snapshot(const char *name) +{ + char *test; + int len = strlen(name); + bool ret; + + if (!boot_snapshot_index) + return false; + + if (strncmp(name, boot_snapshot_info, len) == 0 && + boot_snapshot_info[len] == '\t') + return true; + + test = kmalloc(strlen(name) + 3, GFP_KERNEL); + if (!test) + return false; + + sprintf(test, "\t%s\t", name); + ret = strstr(boot_snapshot_info, test) == NULL; + kfree(test); + return ret; +} + +__init static void do_allocate_snapshot(const char *name) +{ + if (!tr_needs_alloc_snapshot(name)) + return; + + /* + * When allocate_snapshot is set, the next call to + * allocate_trace_buffers() (called by trace_array_get_by_name()) + * will allocate the snapshot buffer. That will alse clear + * this flag. + */ + allocate_snapshot = true; +} +#else +static inline void do_allocate_snapshot(const char *name) { } +#endif + +__init static void enable_instances(void) +{ + struct trace_array *tr; + char *curr_str; + char *str; + char *tok; + + /* A tab is always appended */ + boot_instance_info[boot_instance_index - 1] = '\0'; + str = boot_instance_info; + + while ((curr_str = strsep(&str, "\t"))) { + + tok = strsep(&curr_str, ","); + + if (IS_ENABLED(CONFIG_TRACER_MAX_TRACE)) + do_allocate_snapshot(tok); + + tr = trace_array_get_by_name(tok); + if (!tr) { + pr_warn("Failed to create instance buffer %s\n", curr_str); + continue; + } + /* Allow user space to delete it */ + trace_array_put(tr); + + while ((tok = strsep(&curr_str, ","))) { + early_enable_events(tr, tok, true); + } + } +} + __init static int tracer_alloc_buffers(void) { int ring_buf_size; @@@ -10391,19 -10274,10 +10391,19 @@@ out void __init ftrace_boot_snapshot(void) { + struct trace_array *tr; + if (snapshot_at_boot) { tracing_snapshot(); internal_trace_puts("** Boot snapshot taken **\n"); } + + list_for_each_entry(tr, &ftrace_trace_arrays, list) { + if (tr == &global_trace) + continue; + trace_array_puts(tr, "** Boot snapshot taken **\n"); + tracing_snapshot_instance(tr); + } } void __init early_trace_init(void) @@@ -10425,9 -10299,6 +10425,9 @@@ void __init trace_init(void) { trace_event_init(); + + if (boot_instance_index) + enable_instances(); } __init static void clear_boot_tracer(void) -- LinuxNextTracking

1 0

Build check errors found: 2023-02-25
by postmaster＠open-mesh.org 25 Feb '23

25 Feb '23

Name of failed tests ==================== stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/Documentation/networking/batman-adv.rst | 2 net/net/batman-adv/bat_iv_ogm.c | 1 net/net/batman-adv/bat_v_elp.c | 1 net/net/batman-adv/bat_v_ogm.c | 5 net/net/batman-adv/distributed-arp-table.c | 2 net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 251 +------------------ net/net/batman-adv/multicast.h | 38 -- net/net/batman-adv/network-coding.c | 4 net/net/batman-adv/routing.c | 7 net/net/batman-adv/soft-interface.c | 26 - net/net/batman-adv/translation-table.c | 4 net/net/batman-adv/tvlv.c | 71 +++-- net/net/batman-adv/tvlv.h | 9 net/net/batman-adv/types.h | 6 16 files changed, 108 insertions(+), 323 deletions(-) Statistics ========== main ---- Failed tests: 0 Started build tests: 253 Tested Linux versions: 36 Tested configs: 119 stable ------ Failed tests: 1 Started build tests: 290 Tested Linux versions: 36 Tested configs: 111

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20230224
by batman＠open-mesh.org 24 Feb '23

24 Feb '23

The following commit has been merged in the master branch: commit d151e8bea1509a6f72a8929882d9ecb66e936b09 Merge: 8762069330316392331e693befd8a5b632833618 471859f57d42537626a56312cfb50cd6acee09ae Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Wed Feb 22 13:50:13 2023 -0800 Merge tag 'iomap-6.3-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux Pull iomap updates from Darrick Wong: "This is mostly rearranging things to make life easier for gfs2, nothing all that mindblowing for this release. - Change when the iomap page_done function is called so that we still have a locked folio in the success case. This fixes a writeback race in gfs2 - Change when the iomap page_prepare function is called so that gfs2 can recover from OOM scenarios more gracefully - Rename the iomap page_ops to folio_ops, since they operate on folios now" * tag 'iomap-6.3-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: iomap: Rename page_ops to folio_ops iomap: Rename page_prepare handler to get_folio iomap: Add __iomap_get_folio helper iomap/gfs2: Get page in page_prepare handler iomap: Add iomap_get_folio helper iomap: Rename page_done handler to put_folio iomap/gfs2: Unlock and put folio in page_done handler iomap: Add __iomap_put_folio helper diff --combined include/linux/iomap.h index fca43a4bd96b,c70a9d4fb447..0f8123504e5e --- a/include/linux/iomap.h +++ b/include/linux/iomap.h @@@ -13,6 -13,7 +13,7 @@@ struct address_space; struct fiemap_extent_info; struct inode; + struct iomap_iter; struct iomap_dio; struct iomap_writepage_ctx; struct iov_iter; @@@ -58,7 -59,8 +59,7 @@@ struct vm_fault #define IOMAP_F_SHARED (1U << 2) #define IOMAP_F_MERGED (1U << 3) #define IOMAP_F_BUFFER_HEAD (1U << 4) -#define IOMAP_F_ZONE_APPEND (1U << 5) -#define IOMAP_F_XATTR (1U << 6) +#define IOMAP_F_XATTR (1U << 5) /* * Flags set by the core iomap code during operations: @@@ -84,7 -86,7 +85,7 @@@ */ #define IOMAP_NULL_ADDR -1ULL /* addr is not valid */ - struct iomap_page_ops; + struct iomap_folio_ops; struct iomap { u64 addr; /* disk offset of mapping, bytes */ @@@ -96,7 -98,7 +97,7 @@@ struct dax_device *dax_dev; /* dax_dev for dax operations */ void *inline_data; void *private; /* filesystem private */ - const struct iomap_page_ops *page_ops; + const struct iomap_folio_ops *folio_ops; u64 validity_cookie; /* used with .iomap_valid() */ }; @@@ -124,19 -126,20 +125,20 @@@ static inline bool iomap_inline_data_va } /* - * When a filesystem sets page_ops in an iomap mapping it returns, page_prepare - * and page_done will be called for each page written to. This only applies to - * buffered writes as unbuffered writes will not typically have pages + * When a filesystem sets folio_ops in an iomap mapping it returns, get_folio + * and put_folio will be called for each folio written to. This only applies + * to buffered writes as unbuffered writes will not typically have folios * associated with them. * - * When page_prepare succeeds, page_done will always be called to do any - * cleanup work necessary. In that page_done call, @page will be NULL if the - * associated page could not be obtained. + * When get_folio succeeds, put_folio will always be called to do any + * cleanup work necessary. put_folio is responsible for unlocking and putting + * @folio. */ - struct iomap_page_ops { - int (*page_prepare)(struct inode *inode, loff_t pos, unsigned len); - void (*page_done)(struct inode *inode, loff_t pos, unsigned copied, - struct page *page); + struct iomap_folio_ops { + struct folio *(*get_folio)(struct iomap_iter *iter, loff_t pos, + unsigned len); + void (*put_folio)(struct inode *inode, loff_t pos, unsigned copied, + struct folio *folio); /* * Check that the cached iomap still maps correctly to the filesystem's @@@ -259,6 -262,7 +261,7 @@@ int iomap_file_buffered_write_punch_del int iomap_read_folio(struct folio *folio, const struct iomap_ops *ops); void iomap_readahead(struct readahead_control *, const struct iomap_ops *ops); bool iomap_is_partially_uptodate(struct folio *, size_t from, size_t count); + struct folio *iomap_get_folio(struct iomap_iter *iter, loff_t pos); bool iomap_release_folio(struct folio *folio, gfp_t gfp_flags); void iomap_invalidate_folio(struct folio *folio, size_t offset, size_t len); int iomap_file_unshare(struct inode *inode, loff_t pos, loff_t len, -- LinuxNextTracking

1 0

Build check errors found: 2023-02-24
by postmaster＠open-mesh.org 24 Feb '23

24 Feb '23

Name of failed tests ==================== stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/Documentation/networking/batman-adv.rst | 2 net/net/batman-adv/bat_iv_ogm.c | 1 net/net/batman-adv/bat_v_elp.c | 1 net/net/batman-adv/bat_v_ogm.c | 5 net/net/batman-adv/distributed-arp-table.c | 2 net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 251 +------------------ net/net/batman-adv/multicast.h | 38 -- net/net/batman-adv/network-coding.c | 4 net/net/batman-adv/routing.c | 7 net/net/batman-adv/soft-interface.c | 26 - net/net/batman-adv/translation-table.c | 4 net/net/batman-adv/tvlv.c | 71 +++-- net/net/batman-adv/tvlv.h | 9 net/net/batman-adv/types.h | 6 16 files changed, 108 insertions(+), 323 deletions(-) Statistics ========== stable ------ Failed tests: 1 Started build tests: 293 Tested Linux versions: 36 Tested configs: 120 main ---- Failed tests: 0 Started build tests: 254 Tested Linux versions: 36 Tested configs: 115

1 0

[linux-next] LinuxNextTracking branch, master, updated. next-20230223
by batman＠open-mesh.org 23 Feb '23

23 Feb '23

The following commit has been merged in the master branch: commit 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2 Merge: 36289a03bcd3aabdf66de75cb6d1b4ee15726438 d1fabc68f8e0541d41657096dc713cb01775652d Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Tue Feb 21 18:24:12 2023 -0800 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next Pull networking updates from Jakub Kicinski: "Core: - Add dedicated kmem_cache for typical/small skb->head, avoid having to access struct page at kfree time, and improve memory use. - Introduce sysctl to set default RPS configuration for new netdevs. - Define Netlink protocol specification format which can be used to describe messages used by each family and auto-generate parsers. Add tools for generating kernel data structures and uAPI headers. - Expose all net/core sysctls inside netns. - Remove 4s sleep in netpoll if carrier is instantly detected on boot. - Add configurable limit of MDB entries per port, and port-vlan. - Continue populating drop reasons throughout the stack. - Retire a handful of legacy Qdiscs and classifiers. Protocols: - Support IPv4 big TCP (TSO frames larger than 64kB). - Add IP_LOCAL_PORT_RANGE socket option, to control local port range on socket by socket basis. - Track and report in procfs number of MPTCP sockets used. - Support mixing IPv4 and IPv6 flows in the in-kernel MPTCP path manager. - IPv6: don't check net.ipv6.route.max_size and rely on garbage collection to free memory (similarly to IPv4). - Support Penultimate Segment Pop (PSP) flavor in SRv6 (RFC8986). - ICMP: add per-rate limit counters. - Add support for user scanning requests in ieee802154. - Remove static WEP support. - Support minimal Wi-Fi 7 Extremely High Throughput (EHT) rate reporting. - WiFi 7 EHT channel puncturing support (client & AP). BPF: - Add a rbtree data structure following the "next-gen data structure" precedent set by recently added linked list, that is, by using kfunc + kptr instead of adding a new BPF map type. - Expose XDP hints via kfuncs with initial support for RX hash and timestamp metadata. - Add BPF_F_NO_TUNNEL_KEY extension to bpf_skb_set_tunnel_key to better support decap on GRE tunnel devices not operating in collect metadata. - Improve x86 JIT's codegen for PROBE_MEM runtime error checks. - Remove the need for trace_printk_lock for bpf_trace_printk and bpf_trace_vprintk helpers. - Extend libbpf's bpf_tracing.h support for tracing arguments of kprobes/uprobes and syscall as a special case. - Significantly reduce the search time for module symbols by livepatch and BPF. - Enable cpumasks to be used as kptrs, which is useful for tracing programs tracking which tasks end up running on which CPUs in different time intervals. - Add support for BPF trampoline on s390x and riscv64. - Add capability to export the XDP features supported by the NIC. - Add __bpf_kfunc tag for marking kernel functions as kfuncs. - Add cgroup.memory=nobpf kernel parameter option to disable BPF memory accounting for container environments. Netfilter: - Remove the CLUSTERIP target. It has been marked as obsolete for years, and we still have WARN splats wrt races of the out-of-band /proc interface installed by this target. - Add 'destroy' commands to nf_tables. They are identical to the existing 'delete' commands, but do not return an error if the referenced object (set, chain, rule...) did not exist. Driver API: - Improve cpumask_local_spread() locality to help NICs set the right IRQ affinity on AMD platforms. - Separate C22 and C45 MDIO bus transactions more clearly. - Introduce new DCB table to control DSCP rewrite on egress. - Support configuration of Physical Layer Collision Avoidance (PLCA) Reconciliation Sublayer (RS) (802.3cg-2019). Modern version of shared medium Ethernet. - Support for MAC Merge layer (IEEE 802.3-2018 clause 99). Allowing preemption of low priority frames by high priority frames. - Add support for controlling MACSec offload using netlink SET. - Rework devlink instance refcounts to allow registration and de-registration under the instance lock. Split the code into multiple files, drop some of the unnecessarily granular locks and factor out common parts of netlink operation handling. - Add TX frame aggregation parameters (for USB drivers). - Add a new attr TCA_EXT_WARN_MSG to report TC (offload) warning messages with notifications for debug. - Allow offloading of UDP NEW connections via act_ct. - Add support for per action HW stats in TC. - Support hardware miss to TC action (continue processing in SW from a specific point in the action chain). - Warn if old Wireless Extension user space interface is used with modern cfg80211/mac80211 drivers. Do not support Wireless Extensions for Wi-Fi 7 devices at all. Everyone should switch to using nl80211 interface instead. - Improve the CAN bit timing configuration. Use extack to return error messages directly to user space, update the SJW handling, including the definition of a new default value that will benefit CAN-FD controllers, by increasing their oscillator tolerance. New hardware / drivers: - Ethernet: - nVidia BlueField-3 support (control traffic driver) - Ethernet support for imx93 SoCs - Motorcomm yt8531 gigabit Ethernet PHY - onsemi NCN26000 10BASE-T1S PHY (with support for PLCA) - Microchip LAN8841 PHY (incl. cable diagnostics and PTP) - Amlogic gxl MDIO mux - WiFi: - RealTek RTL8188EU (rtl8xxxu) - Qualcomm Wi-Fi 7 devices (ath12k) - CAN: - Renesas R-Car V4H Drivers: - Bluetooth: - Set Per Platform Antenna Gain (PPAG) for Intel controllers. - Ethernet NICs: - Intel (1G, igc): - support TSN / Qbv / packet scheduling features of i226 model - Intel (100G, ice): - use GNSS subsystem instead of TTY - multi-buffer XDP support - extend support for GPIO pins to E823 devices - nVidia/Mellanox: - update the shared buffer configuration on PFC commands - implement PTP adjphase function for HW offset control - TC support for Geneve and GRE with VF tunnel offload - more efficient crypto key management method - multi-port eswitch support - Netronome/Corigine: - add DCB IEEE support - support IPsec offloading for NFP3800 - Freescale/NXP (enetc): - support XDP_REDIRECT for XDP non-linear buffers - improve reconfig, avoid link flap and waiting for idle - support MAC Merge layer - Other NICs: - sfc/ef100: add basic devlink support for ef100 - ionic: rx_push mode operation (writing descriptors via MMIO) - bnxt: use the auxiliary bus abstraction for RDMA - r8169: disable ASPM and reset bus in case of tx timeout - cpsw: support QSGMII mode for J721e CPSW9G - cpts: support pulse-per-second output - ngbe: add an mdio bus driver - usbnet: optimize usbnet_bh() by avoiding unnecessary queuing - r8152: handle devices with FW with NCM support - amd-xgbe: support 10Mbps, 2.5GbE speeds and rx-adaptation - virtio-net: support multi buffer XDP - virtio/vsock: replace virtio_vsock_pkt with sk_buff - tsnep: XDP support - Ethernet high-speed switches: - nVidia/Mellanox (mlxsw): - add support for latency TLV (in FW control messages) - Microchip (sparx5): - separate explicit and implicit traffic forwarding rules, make the implicit rules always active - add support for egress DSCP rewrite - IS0 VCAP support (Ingress Classification) - IS2 VCAP filters (protos, L3 addrs, L4 ports, flags, ToS etc.) - ES2 VCAP support (Egress Access Control) - support for Per-Stream Filtering and Policing (802.1Q, 8.6.5.1) - Ethernet embedded switches: - Marvell (mv88e6xxx): - add MAB (port auth) offload support - enable PTP receive for mv88e6390 - NXP (ocelot): - support MAC Merge layer - support for the the vsc7512 internal copper phys - Microchip: - lan9303: convert to PHYLINK - lan966x: support TC flower filter statistics - lan937x: PTP support for KSZ9563/KSZ8563 and LAN937x - lan937x: support Credit Based Shaper configuration - ksz9477: support Energy Efficient Ethernet - other: - qca8k: convert to regmap read/write API, use bulk operations - rswitch: Improve TX timestamp accuracy - Intel WiFi (iwlwifi): - EHT (Wi-Fi 7) rate reporting - STEP equalizer support: transfer some STEP (connection to radio on platforms with integrated wifi) related parameters from the BIOS to the firmware. - Qualcomm 802.11ax WiFi (ath11k): - IPQ5018 support - Fine Timing Measurement (FTM) responder role support - channel 177 support - MediaTek WiFi (mt76): - per-PHY LED support - mt7996: EHT (Wi-Fi 7) support - Wireless Ethernet Dispatch (WED) reset support - switch to using page pool allocator - RealTek WiFi (rtw89): - support new version of Bluetooth co-existance - Mobile: - rmnet: support TX aggregation" * tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1872 commits) page_pool: add a comment explaining the fragment counter usage net: ethtool: fix __ethtool_dev_mm_supported() implementation ethtool: pse-pd: Fix double word in comments xsk: add linux/vmalloc.h to xsk.c sefltests: netdevsim: wait for devlink instance after netns removal selftest: fib_tests: Always cleanup before exit net/mlx5e: Align IPsec ASO result memory to be as required by hardware net/mlx5e: TC, Set CT miss to the specific ct action instance net/mlx5e: Rename CHAIN_TO_REG to MAPPED_OBJ_TO_REG net/mlx5: Refactor tc miss handling to a single function net/mlx5: Kconfig: Make tc offload depend on tc skb extension net/sched: flower: Support hardware miss to tc action net/sched: flower: Move filter handle initialization earlier net/sched: cls_api: Support hardware miss to tc action net/sched: Rename user cookie and act cookie sfc: fix builds without CONFIG_RTC_LIB sfc: clean up some inconsistent indentings net/mlx4_en: Introduce flexible array to silence overflow warning net: lan966x: Fix possible deadlock inside PTP net/ulp: Remove redundant ->clone() test in inet_clone_ulp(). ... diff --combined Documentation/admin-guide/kernel-parameters.txt index 993f3b6c10ff,29fb41e801ce..5e4ee29cf393 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@@ -557,6 -557,7 +557,7 @@@ Format: <string> nosocket -- Disable socket memory accounting. nokmem -- Disable kernel memory accounting. + nobpf -- Disable BPF memory accounting. checkreqprot= [SELINUX] Set initial checkreqprot flag value. Format: { "0" | "1" } @@@ -5113,17 -5114,6 +5114,17 @@@ rcupdate.rcu_cpu_stall_timeout to be used (after conversion from seconds to milliseconds). + rcupdate.rcu_cpu_stall_cputime= [KNL] + Provide statistics on the cputime and count of + interrupts and tasks during the sampling period. For + multiple continuous RCU stalls, all sampling periods + begin at half of the first RCU stall timeout. + + rcupdate.rcu_exp_stall_task_details= [KNL] + Print stack dumps of any tasks blocking the + current expedited RCU grace period during an + expedited RCU CPU stall warning. + rcupdate.rcu_expedited= [KNL] Use expedited grace-period primitives, for example, synchronize_rcu_expedited() instead @@@ -5232,7 -5222,7 +5233,7 @@@ rdt= [HW,X86,RDT] Turn on/off individual RDT features. List is: cmt, mbmtotal, mbmlocal, l3cat, l3cdp, l2cat, l2cdp, - mba. + mba, smba, bmec. E.g. to turn on cmt and turn off mba use: rdt=cmt,!mba @@@ -5740,9 -5730,9 +5741,9 @@@ retpoline,generic - Retpolines retpoline,lfence - LFENCE; indirect branch retpoline,amd - alias for retpoline,lfence - eibrs - enhanced IBRS - eibrs,retpoline - enhanced IBRS + Retpolines - eibrs,lfence - enhanced IBRS + LFENCE + eibrs - Enhanced/Auto IBRS + eibrs,retpoline - Enhanced/Auto IBRS + Retpolines + eibrs,lfence - Enhanced/Auto IBRS + LFENCE ibrs - use IBRS to protect kernel Not specifying this option is equivalent to @@@ -6380,16 -6370,6 +6381,16 @@@ in situations with strict latency requirements (where interruptions from clocksource watchdog are not acceptable). + [x86] recalibrate: force recalibration against a HW timer + (HPET or PM timer) on systems whose TSC frequency was + obtained from HW or FW using either an MSR or CPUID(0x15). + Warn if the difference is more than 500 ppm. + [x86] watchdog: Use TSC as the watchdog clocksource with + which to check other HW timers (HPET or PM timer), but + only on systems where TSC has been deemed trustworthy. + This will be suppressed by an earlier tsc=nowatchdog and + can be overridden by a later tsc=nowatchdog. A console + message will flag any such suppression or overriding. tsc_early_khz= [X86] Skip early TSC calibration and use the given value instead. Useful when the early TSC frequency discovery @@@ -7041,10 -7021,3 +7042,10 @@@ management firmware translates the requests into actual hardware states (core frequency, data fabric and memory clocks etc.) + active + Use amd_pstate_epp driver instance as the scaling driver, + driver provides a hint to the hardware if software wants + to bias toward performance (0x0) or energy efficiency (0xff) + to the CPPC firmware. then CPPC power algorithm will + calculate the runtime workload and adjust the realtime cores + frequency. diff --combined Documentation/devicetree/bindings/vendor-prefixes.yaml index 852910c0ce30,99bb8594753c..5c3c6abb983b --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml @@@ -69,8 -69,6 +69,8 @@@ patternProperties description: Annapurna Labs "^alcatel,.*": description: Alcatel + "^aldec,.*": + description: Aldec, Inc. "^alfa-network,.*": description: ALFA Network Inc. "^allegro,.*": @@@ -266,8 -264,6 +266,8 @@@ description: Cirrus Logic, Inc. "^cisco,.*": description: Cisco Systems, Inc. + "^clockwork,.*": + description: Clockwork Tech LLC "^cloos,.*": description: Carl Cloos Schweisstechnik GmbH. "^cloudengines,.*": @@@ -378,8 -374,6 +378,8 @@@ description: EBV Elektronik "^eckelmann,.*": description: Eckelmann AG + "^edgeble,.*": + description: Edgeble AI Technologies Pvt. Ltd. "^edimax,.*": description: EDIMAX Technology Co., Ltd "^edt,.*": @@@ -402,8 -396,6 +402,8 @@@ description: Elimo Engineering Ltd. "^elpida,.*": description: Elpida Memory, Inc. + "^embedfire,.*": + description: Dongguan EmbedFire Electronic Technology Co., Ltd. "^embest,.*": description: Shenzhen Embest Technology Co., Ltd. "^emlid,.*": @@@ -520,8 -512,6 +520,8 @@@ description: Shenzhen Huiding Technology Co., Ltd. "^google,.*": description: Google, Inc. + "^gplus,.*": + description: GPLUS "^grinn,.*": description: Grinn "^grmn,.*": @@@ -785,6 -775,8 +785,8 @@@ description: MaxBotix Inc. "^maxim,.*": description: Maxim Integrated Products + "^maxlinear,.*": + description: MaxLinear Inc. "^mbvl,.*": description: Mobiveil Inc. "^mcube,.*": @@@ -855,6 -847,8 +857,8 @@@ description: Moortec Semiconductor Ltd. "^mosaixtech,.*": description: Mosaix Technologies, Inc. + "^motorcomm,.*": + description: MotorComm, Inc. "^motorola,.*": description: Motorola, Inc. "^moxa,.*": @@@ -1035,8 -1029,6 +1039,8 @@@ description: PocketBook International SA "^polaroid,.*": description: Polaroid Corporation + "^polyhex,.*": + description: Polyhex Technology Co. Ltd. "^portwell,.*": description: Portwell Inc. "^poslab,.*": @@@ -1258,8 -1250,6 +1262,8 @@@ description: Starry Electronic Technology (ShenZhen) Co., LTD "^startek,.*": description: Startek + "^starterkit,.*": + description: Starterkit "^ste,.*": description: ST-Ericsson deprecated: true @@@ -1333,8 -1323,6 +1337,8 @@@ description: thingy.jp "^thundercomm,.*": description: Thundercomm Technology Co., Ltd. + "^thwc,.*": + description: Shenzhen Tong Heng Wei Chuang Technology Co., Ltd. "^ti,.*": description: Texas Instruments "^tianma,.*": @@@ -1388,8 -1376,6 +1392,8 @@@ description: uCRobotics "^udoo,.*": description: Udoo + "^ufispace,.*": + description: Ufi Space Co., Ltd. "^ugoos,.*": description: Ugoos Industrial Co., Ltd. "^uniwest,.*": @@@ -1462,8 -1448,6 +1466,8 @@@ description: Shenzhen whwave Electronics, Inc. "^wi2wi,.*": description: Wi2Wi, Inc. + "^widora,.*": + description: Beijing Widora Technology Co., Ltd. "^wiligear,.*": description: Wiligear, Ltd. "^willsemi,.*": diff --combined MAINTAINERS index b4d198cca5aa,4df1a6e89fe7..fbff490379ad --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -361,8 -361,6 +361,8 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/ABI/testing/configfs-acpi F: Documentation/ABI/testing/sysfs-bus-acpi F: Documentation/firmware-guide/acpi/ +F: arch/x86/kernel/acpi/ +F: arch/x86/pci/acpi.c F: drivers/acpi/ F: drivers/pci/*/*acpi* F: drivers/pci/*acpi* @@@ -1853,6 -1851,21 +1853,6 @@@ F: include/dt-bindings/reset/actions, F: include/linux/soc/actions/ N: owl -ARM/ADS SPHERE MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/AFEB9260 MACHINE SUPPORT -M: Sergey Lapin <slapin(a)ossfans.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/AJECO 1ARM MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/Allwinner SoC Clock Support M: Emilio López <emilio(a)elopez.com.ar> S: Maintained @@@ -1873,7 -1886,7 +1873,7 @@@ F: drivers/pinctrl/sunxi F: drivers/soc/sunxi/ N: allwinner N: sun[x456789]i -N: sun50i +N: sun[25]0i ARM/Amlogic Meson SoC CLOCK FRAMEWORK M: Neil Armstrong <neil.armstrong(a)linaro.org> @@@ -2043,6 -2056,11 +2043,6 @@@ F: arch/arm/boot/dts/ecx-*.dts F: arch/arm/boot/dts/highbank.dts F: arch/arm/mach-highbank/ -ARM/CAVIUM NETWORKS CNS3XXX MACHINE SUPPORT -M: Krzysztof Halasa <khalasa(a)piap.pl> -S: Maintained -F: arch/arm/mach-cns3xxx/ - ARM/CAVIUM THUNDER NETWORK DRIVER M: Sunil Goutham <sgoutham(a)marvell.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2071,8 -2089,8 +2071,8 @@@ M: Hartley Sweeten <hsweeten@visionengr M: Alexander Sverdlin <alexander.sverdlin(a)gmail.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained +F: arch/arm/boot/compressed/misc-ep93xx.h F: arch/arm/mach-ep93xx/ -F: arch/arm/mach-ep93xx/include/mach/ ARM/CLKDEV SUPPORT M: Russell King <linux(a)armlinux.org.uk> @@@ -2088,6 -2106,11 +2088,6 @@@ S: Maintaine F: arch/arm/boot/dts/cx92755* N: digicolor -ARM/CONTEC MICRO9 MACHINE SUPPORT -M: Hubert Feurstein <hubert.feurstein(a)contec.at> -S: Maintained -F: arch/arm/mach-ep93xx/micro9.c - ARM/CORESIGHT FRAMEWORK AND DRIVERS M: Mathieu Poirier <mathieu.poirier(a)linaro.org> M: Suzuki K Poulose <suzuki.poulose(a)arm.com> @@@ -2114,6 -2137,10 +2114,6 @@@ F: tools/perf/arch/arm/util/pmu. F: tools/perf/util/cs-etm-decoder/* F: tools/perf/util/cs-etm.* -ARM/CORGI MACHINE SUPPORT -M: Richard Purdie <rpurdie(a)rpsys.net> -S: Maintained - ARM/CORTINA SYSTEMS GEMINI ARM ARCHITECTURE M: Hans Ulli Kroll <ulli.kroll(a)googlemail.com> M: Linus Walleij <linus.walleij(a)linaro.org> @@@ -2153,6 -2180,12 +2153,6 @@@ F: include/dt-bindings/bus/moxtet. F: include/linux/armada-37xx-rwtm-mailbox.h F: include/linux/moxtet.h -ARM/EZX SMARTPHONES (A780, A910, A1200, E680, ROKR E2 and ROKR E6) -M: Robert Jarzmik <robert.jarzmik(a)free.fr> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/ezx.c - ARM/FARADAY FA526 PORT M: Hans Ulli Kroll <ulli.kroll(a)googlemail.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2205,11 -2238,25 +2205,11 @@@ T: git git://git.kernel.org/pub/scm/lin F: arch/arm/boot/dts/vf* F: arch/arm/mach-imx/*vf610* -ARM/GLOMATION GESBC9312SX MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/GUMSTIX MACHINE SUPPORT M: Steve Sakoman <sakoman(a)gmail.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/H4700 (HP IPAQ HX4700) MACHINE SUPPORT -M: Philipp Zabel <philipp.zabel(a)gmail.com> -M: Paul Parsons <lost.distance(a)yahoo.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/hx4700.c -F: arch/arm/mach-pxa/include/mach/hx4700.h -F: sound/soc/pxa/hx4700.c - ARM/HISILICON SOC SUPPORT M: Wei Xu <xuwei5(a)hisilicon.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2252,6 -2299,27 +2252,6 @@@ L: linux-arm-kernel(a)lists.infradead.or S: Maintained F: arch/arm/boot/dts/omap3-igep* -ARM/INCOME PXA270 SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/colibri-pxa270-income.c - -ARM/INTEL IOP32X ARM ARCHITECTURE -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/INTEL IQ81342EX MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/INTEL IXDP2850 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/INTEL IXP4XX ARM ARCHITECTURE M: Linus Walleij <linusw(a)kernel.org> M: Imre Kaloz <kaloz(a)openwrt.org> @@@ -2284,12 -2352,22 +2284,12 @@@ M: Lennert Buytenhek <kernel@wantstofly L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained -ARM/IP FABRICS DOUBLE ESPRESSO MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/LG1K ARCHITECTURE M: Chanho Min <chanho.min(a)lge.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Maintained F: arch/arm64/boot/dts/lg/ -ARM/LOGICPD PXA270 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/LPC18XX ARCHITECTURE M: Vladimir Zapolskiy <vz(a)mleia.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2316,6 -2394,10 +2316,6 @@@ F: drivers/usb/host/ohci-nxp. F: drivers/watchdog/pnx4008_wdt.c N: lpc32xx -ARM/MAGICIAN MACHINE SUPPORT -M: Philipp Zabel <philipp.zabel(a)gmail.com> -S: Maintained - ARM/Marvell Dove/MV78xx0/Orion SOC support M: Andrew Lunn <andrew(a)lunn.ch> M: Sebastian Hesselbarth <sebastian.hesselbarth(a)gmail.com> @@@ -2447,6 -2529,12 +2447,6 @@@ F: arch/arm/boot/dts/milbeaut F: arch/arm/mach-milbeaut/ N: milbeaut -ARM/MIOA701 MACHINE SUPPORT -M: Robert Jarzmik <robert.jarzmik(a)free.fr> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/mioa701.c - ARM/MStar/Sigmastar Armv7 SoC support M: Daniel Palmer <daniel(a)thingy.jp> M: Romain Perier <romain.perier(a)gmail.com> @@@ -2467,6 -2555,10 +2467,6 @@@ F: drivers/watchdog/msc313e_wdt. F: include/dt-bindings/clock/mstar-* F: include/dt-bindings/gpio/msc313-gpio.h -ARM/NEC MOBILEPRO 900/c MACHINE SUPPORT -M: Michael Petchkovsky <mkpetch(a)internode.on.net> -S: Maintained - ARM/NOMADIK/Ux500 ARCHITECTURES M: Linus Walleij <linus.walleij(a)linaro.org> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2522,7 -2614,6 +2522,7 @@@ S: Maintaine W: https://github.com/neuschaefer/wpcm450/wiki F: Documentation/devicetree/bindings/*/*wpcm* F: arch/arm/boot/dts/nuvoton-wpcm450* +F: arch/arm/configs/wpcm450_defconfig F: arch/arm/mach-npcm/wpcm450.c F: drivers/*/*/*wpcm* F: drivers/*/*wpcm* @@@ -2536,6 -2627,13 +2536,6 @@@ L: linux-arm-kernel(a)lists.infradead.or S: Maintained F: arch/arm64/boot/dts/freescale/s32g*.dts* -ARM/OPENMOKO NEO FREERUNNER (GTA02) MACHINE SUPPORT -L: openmoko-kernel(a)lists.openmoko.org (subscribers-only) -S: Orphan -W: http://wiki.openmoko.org/wiki/Neo_FreeRunner -F: arch/arm/mach-s3c/gta02.h -F: arch/arm/mach-s3c/mach-gta02.c - ARM/Orion SoC/Technologic Systems TS-78xx platform support M: Alexander Clouter <alex(a)digriz.org.uk> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2553,6 -2651,43 +2553,6 @@@ F: arch/arm/mach-oxnas F: drivers/power/reset/oxnas-restart.c N: oxnas -ARM/PALM TREO SUPPORT -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Orphan -F: arch/arm/mach-pxa/palmtreo.* - -ARM/PALMTX,PALMT5,PALMLD,PALMTE2,PALMTC SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://hackndev.com -F: arch/arm/mach-pxa/include/mach/palmld.h -F: arch/arm/mach-pxa/include/mach/palmtc.h -F: arch/arm/mach-pxa/include/mach/palmtx.h -F: arch/arm/mach-pxa/palmld.c -F: arch/arm/mach-pxa/palmt5.* -F: arch/arm/mach-pxa/palmtc.c -F: arch/arm/mach-pxa/palmte2.* -F: arch/arm/mach-pxa/palmtx.c - -ARM/PALMZ72 SUPPORT -M: Sergey Lapin <slapin(a)ossfans.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://hackndev.com -F: arch/arm/mach-pxa/palmz72.* - -ARM/PLEB SUPPORT -M: Peter Chubb <pleb(a)gelato.unsw.edu.au> -S: Maintained -W: http://www.disy.cse.unsw.edu.au/Hardware/PLEB - -ARM/PT DIGITAL BOARD PORT -M: Stefan Eletzhofer <stefan.eletzhofer(a)eletztrick.de> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -W: http://www.armlinux.org.uk/ - ARM/QUALCOMM SUPPORT M: Andy Gross <agross(a)kernel.org> M: Bjorn Andersson <andersson(a)kernel.org> @@@ -2596,6 -2731,11 +2596,6 @@@ F: include/dt-bindings/*/qcom F: include/linux/*/qcom* F: include/linux/soc/qcom/ -ARM/RADISYS ENP2611 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - ARM/RDA MICRO ARCHITECTURE M: Manivannan Sadhasivam <manivannan.sadhasivam(a)linaro.org> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2671,7 -2811,7 +2671,7 @@@ F: Documentation/devicetree/bindings/i2 F: Documentation/devicetree/bindings/mmc/rockchip-dw-mshc.yaml F: Documentation/devicetree/bindings/spi/spi-rockchip.yaml F: arch/arm/boot/dts/rk3* -F: arch/arm/boot/dts/rv1108* +F: arch/arm/boot/dts/rv11* F: arch/arm/mach-rockchip/ F: drivers/*/*/*rockchip* F: drivers/*/*rockchip* @@@ -2716,6 -2856,7 +2716,6 @@@ F: include/linux/platform_data/*s3c F: include/linux/serial_s3c.h F: include/linux/soc/samsung/ N: exynos -N: s3c2410 N: s3c64xx N: s5pv210 @@@ -2873,7 -3014,7 +2873,7 @@@ M: linux-fsd(a)tesla.co L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) L: linux-samsung-soc(a)vger.kernel.org S: Maintained -F: arch/arm64/boot/dts/tesla* +F: arch/arm64/boot/dts/tesla/ ARM/TETON BGA MACHINE SUPPORT M: "Mark F. Brown" <mark.brown314(a)gmail.com> @@@ -2926,6 -3067,16 +2926,6 @@@ F: arch/arm64/boot/dts/ti/Makefil F: arch/arm64/boot/dts/ti/k3-* F: include/dt-bindings/pinctrl/k3.h -ARM/THECUS N2100 MACHINE SUPPORT -M: Lennert Buytenhek <kernel(a)wantstofly.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained - -ARM/TOSA MACHINE SUPPORT -M: Dmitry Eremin-Solenikov <dbaryshkov(a)gmail.com> -M: Dirk Opfer <dirk(a)opfer-online.de> -S: Maintained - ARM/TOSHIBA VISCONTI ARCHITECTURE M: Nobuhiro Iwamatsu <nobuhiro1.iwamatsu(a)toshiba.co.jp> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -2982,7 -3133,7 +2982,7 @@@ S: Maintaine F: */*/*/vexpress* F: */*/vexpress* F: arch/arm/boot/dts/vexpress* -F: arch/arm/mach-vexpress/ +F: arch/arm/mach-versatile/ F: arch/arm64/boot/dts/arm/ F: drivers/clk/versatile/clk-vexpress-osc.c F: drivers/clocksource/timer-versatile.c @@@ -2995,6 -3146,13 +2995,6 @@@ S: Maintaine W: http://www.armlinux.org.uk/ F: arch/arm/vfp/ -ARM/VOIPAC PXA270 SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/include/mach/vpac270.h -F: arch/arm/mach-pxa/vpac270.c - ARM/VT8500 ARM ARCHITECTURE L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) S: Orphan @@@ -3012,6 -3170,13 +3012,6 @@@ F: drivers/video/fbdev/vt8500lcdfb. F: drivers/video/fbdev/wm8505fb* F: drivers/video/fbdev/wmt_ge_rops.* -ARM/ZIPIT Z2 SUPPORT -M: Marek Vasut <marek.vasut(a)gmail.com> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm/mach-pxa/include/mach/z2.h -F: arch/arm/mach-pxa/z2.c - ARM/ZYNQ ARCHITECTURE M: Michal Simek <michal.simek(a)xilinx.com> L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) @@@ -3149,7 -3314,7 +3149,7 @@@ ASPEED CRYPTO DRIVE M: Neal Liu <neal_liu(a)aspeedtech.com> L: linux-aspeed(a)lists.ozlabs.org (moderated for non-subscribers) S: Maintained -F: Documentation/devicetree/bindings/crypto/aspeed,ast2500-hace.yaml +F: Documentation/devicetree/bindings/crypto/aspeed,* F: drivers/crypto/aspeed/ ASUS NOTEBOOKS AND EEEPC ACPI/WMI EXTRAS DRIVERS @@@ -3858,6 -4023,13 +3858,13 @@@ L: bpf(a)vger.kernel.or S: Maintained F: tools/testing/selftests/bpf/ + BPF [DOCUMENTATION] (Related to Standardization) + R: David Vernet <void(a)manifault.com> + L: bpf(a)vger.kernel.org + L: bpf(a)ietf.org + S: Maintained + F: Documentation/bpf/instruction-set.rst + BPF [MISC] L: bpf(a)vger.kernel.org S: Odd Fixes @@@ -4642,12 -4814,11 +4649,11 @@@ F: net/sched/sch_etf. F: net/sched/sch_taprio.c CC2520 IEEE-802.15.4 RADIO DRIVER - M: Varka Bhadram <varkabhadram(a)gmail.com> + M: Stefan Schmidt <stefan(a)datenfreihafen.org> L: linux-wpan(a)vger.kernel.org - S: Maintained + S: Odd Fixes F: Documentation/devicetree/bindings/net/ieee802154/cc2520.txt F: drivers/net/ieee802154/cc2520.c - F: include/linux/spi/cc2520.h CCREE ARM TRUSTZONE CRYPTOCELL REE DRIVER M: Gilad Ben-Yossef <gilad(a)benyossef.com> @@@ -4823,13 -4994,6 +4829,13 @@@ S: Maintaine F: Documentation/devicetree/bindings/sound/google,cros-ec-codec.yaml F: sound/soc/codecs/cros_ec_codec.* +CHROMEOS EC UART DRIVER +M: Bhanu Prakash Maiya <bhanumaiya(a)chromium.org> +R: Benson Leung <bleung(a)chromium.org> +R: Tzung-Bi Shih <tzungbi(a)kernel.org> +S: Maintained +F: drivers/platform/chrome/cros_ec_uart.c + CHROMEOS EC SUBDRIVERS M: Benson Leung <bleung(a)chromium.org> R: Guenter Roeck <groeck(a)chromium.org> @@@ -4843,9 -5007,8 +4849,9 @@@ CHROMEOS EC USB TYPE-C DRIVE M: Prashant Malani <pmalani(a)chromium.org> L: chrome-platform(a)lists.linux.dev S: Maintained -F: drivers/platform/chrome/cros_ec_typec.c +F: drivers/platform/chrome/cros_ec_typec.* F: drivers/platform/chrome/cros_typec_switch.c +F: drivers/platform/chrome/cros_typec_vdm.* CHROMEOS EC USB PD NOTIFY DRIVER M: Prashant Malani <pmalani(a)chromium.org> @@@ -5773,6 -5936,7 +5779,6 @@@ F: Documentation/ABI/testing/sysfs-plat F: drivers/platform/x86/dell/dell-wmi-ddv.c DELL WMI SYSMAN DRIVER -M: Divya Bharathi <divya.bharathi(a)dell.com> M: Prasanth Ksr <prasanth.ksr(a)dell.com> L: Dell.Client.Kernel(a)dell.com L: platform-driver-x86(a)vger.kernel.org @@@ -5944,7 -6108,7 +5950,7 @@@ S: Supporte F: Documentation/networking/devlink F: include/net/devlink.h F: include/uapi/linux/devlink.h - F: net/core/devlink.c + F: net/devlink/ DH ELECTRONICS IMX6 DHCOM/DHCOR BOARD SUPPORT M: Christoph Niedermaier <cniedermaier(a)dh-electronics.com> @@@ -6267,7 -6431,6 +6273,7 @@@ T: git git://git.linbit.com/linux-drbd. T: git git://git.linbit.com/drbd-8.4.git F: Documentation/admin-guide/blockdev/ F: drivers/block/drbd/ +F: include/linux/drbd* F: lib/lru_cache.c DRIVER COMPONENT FRAMEWORK @@@ -7590,7 -7753,6 +7596,7 @@@ R: Jeffle Xu <jefflexu(a)linux.alibaba.co L: linux-erofs(a)lists.ozlabs.org S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git +F: Documentation/ABI/testing/sysfs-fs-erofs F: Documentation/filesystems/erofs.rst F: fs/erofs/ F: include/trace/events/erofs.h @@@ -8046,7 -8208,7 +8052,7 @@@ F: drivers/fpga/microchip-spi. FPU EMULATOR M: Bill Metzenthen <billm(a)melbpc.org.au> S: Maintained -W: http://floatingpoint.sourceforge.net/emulator/index.html +W: https://floatingpoint.billm.au/ F: arch/x86/math-emu/ FRAMEBUFFER CORE @@@ -9840,7 -10002,7 +9846,7 @@@ S: Maintaine T: git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git F: Documentation/filesystems/idmappings.rst F: tools/testing/selftests/mount_setattr/ -F: include/linux/mnt_idmapping.h +F: include/linux/mnt_idmapping.* IDT VersaClock 5 CLOCK DRIVER M: Luca Ceresoli <luca(a)lucaceresoli.net> @@@ -9851,6 -10013,7 +9857,7 @@@ F: drivers/clk/clk-versaclock5. IEEE 802.15.4 SUBSYSTEM M: Alexander Aring <alex.aring(a)gmail.com> M: Stefan Schmidt <stefan(a)datenfreihafen.org> + M: Miquel Raynal <miquel.raynal(a)bootlin.com> L: linux-wpan(a)vger.kernel.org S: Maintained W: https://linux-wpan.org/ @@@ -10534,13 -10697,6 +10541,13 @@@ S: Maintaine F: arch/x86/include/asm/intel_telemetry.h F: drivers/platform/x86/intel/telemetry/ +INTEL TPMI DRIVER +M: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> +L: platform-driver-x86(a)vger.kernel.org +S: Maintained +F: drivers/platform/x86/intel/tpmi.c +F: include/linux/intel_tpmi.h + INTEL UNCORE FREQUENCY CONTROL M: Srinivas Pandruvada <srinivas.pandruvada(a)linux.intel.com> L: platform-driver-x86(a)vger.kernel.org @@@ -10793,8 -10949,6 +10800,8 @@@ L: linux-kernel(a)vger.kernel.or S: Maintained T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core F: kernel/irq/ +F: include/linux/group_cpus.h +F: lib/group_cpus.c IRQCHIP DRIVERS M: Thomas Gleixner <tglx(a)linutronix.de> @@@ -12675,9 -12829,9 +12682,9 @@@ F: drivers/iio/potentiometer/mcp4018. F: drivers/iio/potentiometer/mcp4531.c MCR20A IEEE-802.15.4 RADIO DRIVER - M: Xue Liu <liuxuenetmail(a)gmail.com> + M: Stefan Schmidt <stefan(a)datenfreihafen.org> L: linux-wpan(a)vger.kernel.org - S: Maintained + S: Odd Fixes W: https://github.com/xueliu/mcr20a-linux F: Documentation/devicetree/bindings/net/ieee802154/mcr20a.txt F: drivers/net/ieee802154/mcr20a.c @@@ -13570,6 -13724,7 +13577,7 @@@ S: Maintaine F: Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml F: Documentation/devicetree/bindings/net/dsa/microchip,lan937x.yaml F: drivers/net/dsa/microchip/* + F: include/linux/dsa/ksz_common.h F: include/linux/platform_data/microchip-ksz.h F: net/dsa/tag_ksz.c @@@ -14022,6 -14177,7 +14030,7 @@@ M: Peter Geis <pgwipeout(a)gmail.com M: Frank <Frank.Sae(a)motor-comm.com> L: netdev(a)vger.kernel.org S: Maintained + F: Documentation/devicetree/bindings/net/motorcomm,yt8xxx.yaml F: drivers/net/phy/motorcomm.c MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD @@@ -14038,9 -14194,9 +14047,9 @@@ T: git git://linuxtv.org/media_tree.gi F: drivers/media/radio/radio-mr800.c MRF24J40 IEEE 802.15.4 RADIO DRIVER - M: Alan Ott <alan(a)signal11.us> + M: Stefan Schmidt <stefan(a)datenfreihafen.org> L: linux-wpan(a)vger.kernel.org - S: Maintained + S: Odd Fixes F: Documentation/devicetree/bindings/net/ieee802154/mrf24j40.txt F: drivers/net/ieee802154/mrf24j40.c @@@ -14402,6 -14558,8 +14411,8 @@@ M: Florian Fainelli <f.fainelli(a)gmail.c M: Vladimir Oltean <olteanv(a)gmail.com> S: Maintained F: Documentation/devicetree/bindings/net/dsa/ + F: Documentation/devicetree/bindings/net/ethernet-switch-port.yaml + F: Documentation/devicetree/bindings/net/ethernet-switch.yaml F: drivers/net/dsa/ F: include/linux/dsa/ F: include/linux/platform_data/dsa.h @@@ -14420,8 -14578,10 +14431,10 @@@ Q: https://patchwork.kernel.org/project B: mailto:netdev@vger.kernel.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git + F: Documentation/core-api/netlink.rst F: Documentation/networking/ F: Documentation/process/maintainer-netdev.rst + F: Documentation/userspace-api/netlink/ F: include/linux/in.h F: include/linux/net.h F: include/linux/netdevice.h @@@ -14433,6 -14593,7 +14446,7 @@@ F: include/uapi/linux/netdevice. F: lib/net_utils.c F: lib/random32.c F: net/ + F: tools/net/ F: tools/testing/selftests/net/ NETWORKING [IPSEC] @@@ -15010,6 -15171,7 +15024,7 @@@ M: Colin Foster <colin.foster@in-advant S: Supported F: Documentation/devicetree/bindings/mfd/mscc,ocelot.yaml F: drivers/mfd/ocelot* + F: drivers/net/dsa/ocelot/ocelot_ext.c F: include/linux/mfd/ocelot.h OCXL (Open Coherent Accelerator Processor Interface OpenCAPI) DRIVER @@@ -15173,6 -15335,7 +15188,6 @@@ Q: http://patchwork.kernel.org/project/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git F: arch/arm/configs/omap1_defconfig F: arch/arm/mach-omap1/ -F: arch/arm/plat-omap/ F: drivers/i2c/busses/i2c-omap.c F: include/linux/platform_data/ams-delta-fiq.h F: include/linux/platform_data/i2c-omap.h @@@ -15187,6 -15350,7 +15202,6 @@@ Q: http://patchwork.kernel.org/project/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git F: arch/arm/configs/omap2plus_defconfig F: arch/arm/mach-omap2/ -F: arch/arm/plat-omap/ F: drivers/bus/ti-sysc.c F: drivers/i2c/busses/i2c-omap.c F: drivers/irqchip/irq-omap-intc.c @@@ -15441,6 -15605,13 +15456,13 @@@ L: linux-mips(a)vger.kernel.or S: Maintained F: arch/mips/boot/dts/ralink/omega2p.dts + ONSEMI ETHERNET PHY DRIVERS + M: Piergiorgio Beruto <piergiorgio.beruto(a)gmail.com> + L: netdev(a)vger.kernel.org + S: Supported + W: http://www.onsemi.com + F: drivers/net/phy/ncn* + OP-TEE DRIVER M: Jens Wiklander <jens.wiklander(a)linaro.org> L: op-tee(a)lists.trustedfirmware.org @@@ -16486,6 -16657,13 +16508,13 @@@ S: Maintaine F: Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.yaml F: drivers/iio/chemical/pms7003.c + PLCA RECONCILIATION SUBLAYER (IEEE802.3 Clause 148) + M: Piergiorgio Beruto <piergiorgio.beruto(a)gmail.com> + L: netdev(a)vger.kernel.org + S: Maintained + F: drivers/net/phy/mdio-open-alliance.h + F: net/ethtool/plca.c + PLDMFW LIBRARY M: Jacob Keller <jacob.e.keller(a)intel.com> S: Maintained @@@ -17083,6 -17261,13 +17112,13 @@@ T: git git://git.kernel.org/pub/scm/lin F: Documentation/devicetree/bindings/net/wireless/qcom,ath11k.yaml F: drivers/net/wireless/ath/ath11k/ + QUALCOMM ATH12K WIRELESS DRIVER + M: Kalle Valo <kvalo(a)kernel.org> + L: ath12k(a)lists.infradead.org + S: Supported + T: git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git + F: drivers/net/wireless/ath/ath12k/ + QUALCOMM ATHEROS ATH9K WIRELESS DRIVER M: Toke Høiland-Jørgensen <toke(a)toke.dk> L: linux-wireless(a)vger.kernel.org @@@ -18085,7 -18270,6 +18121,7 @@@ L: rust-for-linux(a)vger.kernel.or S: Supported W: https://github.com/Rust-for-Linux/linux B: https://github.com/Rust-for-Linux/linux/issues +C: zulip://rust-for-linux.zulipchat.com T: git https://github.com/Rust-for-Linux/linux.git rust-next F: Documentation/rust/ F: rust/ @@@ -18125,7 -18309,6 +18161,7 @@@ F: Documentation/driver-api/s390-driver F: Documentation/s390/ F: arch/s390/ F: drivers/s390/ +F: drivers/watchdog/diag288_wdt.c S390 COMMON I/O LAYER M: Vineeth Vijayan <vneethv(a)linux.ibm.com> @@@ -18186,13 -18369,6 +18222,13 @@@ F: arch/s390/pci F: drivers/pci/hotplug/s390_pci_hpc.c F: Documentation/s390/pci.rst +S390 SCM DRIVER +M: Vineeth Vijayan <vneethv(a)linux.ibm.com> +L: linux-s390(a)vger.kernel.org +S: Supported +F: drivers/s390/block/scm* +F: drivers/s390/cio/scm.c + S390 VFIO AP DRIVER M: Tony Krowiak <akrowiak(a)linux.ibm.com> M: Halil Pasic <pasic(a)linux.ibm.com> @@@ -18236,6 -18412,19 +18272,6 @@@ L: linux-s390(a)vger.kernel.or S: Supported F: drivers/s390/scsi/zfcp_* -S3C ADC BATTERY DRIVER -M: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> -L: linux-samsung-soc(a)vger.kernel.org -S: Odd Fixes -F: drivers/power/supply/s3c_adc_battery.c -F: include/linux/s3c_adc_battery.h - -S3C24XX SD/MMC Driver -M: Ben Dooks <ben-linux(a)fluff.org> -L: linux-arm-kernel(a)lists.infradead.org (moderated for non-subscribers) -S: Supported -F: drivers/mmc/host/s3cmci.* - SAA6588 RDS RECEIVER DRIVER M: Hans Verkuil <hverkuil(a)xs4all.nl> L: linux-media(a)vger.kernel.org @@@ -18388,9 -18577,11 +18424,9 @@@ F: Documentation/devicetree/bindings/cl F: Documentation/devicetree/bindings/clock/samsung,s3c* F: drivers/clk/samsung/ F: include/dt-bindings/clock/exynos*.h -F: include/dt-bindings/clock/s3c*.h F: include/dt-bindings/clock/s5p*.h F: include/dt-bindings/clock/samsung,*.h F: include/linux/clk/samsung.h -F: include/linux/platform_data/clk-s3c2410.h SAMSUNG SPI DRIVERS M: Krzysztof Kozlowski <krzysztof.kozlowski(a)linaro.org> @@@ -18401,6 -18592,7 +18437,6 @@@ S: Maintaine F: Documentation/devicetree/bindings/spi/samsung,spi*.yaml F: drivers/spi/spi-s3c* F: include/linux/platform_data/spi-s3c64xx.h -F: include/linux/spi/s3c24xx-fiq.h SAMSUNG SXGBE DRIVERS M: Byungho An <bh74.an(a)samsung.com> @@@ -18759,6 -18951,7 +18795,7 @@@ M: Edward Cree <ecree.xilinx(a)gmail.com M: Martin Habets <habetsm.xilinx(a)gmail.com> L: netdev(a)vger.kernel.org S: Supported + F: Documentation/networking/devlink/sfc.rst F: drivers/net/ethernet/sfc/ SFF/SFP/SFP+ MODULE SUPPORT @@@ -18970,6 -19163,14 +19007,6 @@@ M: Simtec Linux Team <linux(a)simtec.co.u S: Supported W: http://www.simtec.co.uk/products/EB110ATX/ -SIMTEC EB2410ITX (BAST) -M: Simtec Linux Team <linux(a)simtec.co.uk> -S: Supported -W: http://www.simtec.co.uk/products/EB2410ITX/ -F: arch/arm/mach-s3c/bast-ide.c -F: arch/arm/mach-s3c/bast-irq.c -F: arch/arm/mach-s3c/mach-bast.c - SIOX M: Thorsten Scherer <t.scherer(a)eckelmann.de> M: Uwe Kleine-König <u.kleine-koenig(a)pengutronix.de> @@@ -19769,12 -19970,6 +19806,12 @@@ F: Documentation/devicetree/bindings/re F: drivers/reset/reset-starfive-jh7100.c F: include/dt-bindings/reset/starfive-jh7100.h +STARFIVE TRNG DRIVER +M: Jia Jie Ho <jiajie.ho(a)starfivetech.com> +S: Supported +F: Documentation/devicetree/bindings/rng/starfive* +F: drivers/char/hw_random/jh7110-trng.c + STATIC BRANCH/CALL M: Peter Zijlstra <peterz(a)infradead.org> M: Josh Poimboeuf <jpoimboe(a)kernel.org> @@@ -19948,8 -20143,7 +19985,8 @@@ L: linux-pm(a)vger.kernel.or S: Supported B: https://bugzilla.kernel.org F: Documentation/power/ -F: arch/x86/kernel/acpi/ +F: arch/x86/kernel/acpi/sleep* +F: arch/x86/kernel/acpi/wakeup* F: drivers/base/power/ F: include/linux/freezer.h F: include/linux/pm.h @@@ -20557,7 -20751,6 +20594,7 @@@ S: Supporte Q: https://patchwork.kernel.org/project/linux-pm/list/ T: git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git thermal F: Documentation/ABI/testing/sysfs-class-thermal +F: Documentation/admin-guide/thermal/ F: Documentation/devicetree/bindings/thermal/ F: Documentation/driver-api/thermal/ F: drivers/thermal/ @@@ -20639,7 -20832,7 +20676,7 @@@ M: Mika Westerberg <mika.westerberg@lin M: Yehezkel Bernat <YehezkelShB(a)gmail.com> L: netdev(a)vger.kernel.org S: Maintained - F: drivers/net/thunderbolt.c + F: drivers/net/thunderbolt/ THUNDERX GPIO DRIVER M: Robert Richter <rric(a)kernel.org> @@@ -20714,6 -20907,7 +20751,6 @@@ W: https://linuxtv.or Q: http://patchwork.linuxtv.org/project/linux-media/list/ T: git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git F: drivers/media/platform/ti/davinci/ -F: drivers/staging/media/deprecated/vpfe_capture/ F: include/media/davinci/ TI ENHANCED CAPTURE (eCAP) DRIVER @@@ -22492,7 -22686,6 +22529,7 @@@ S: Maintaine T: git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git F: drivers/platform/olpc/ F: drivers/platform/x86/ +F: include/linux/platform_data/x86/ X86 PLATFORM DRIVERS - ARCH R: Darren Hart <dvhart(a)infradead.org> @@@ -22778,13 -22971,6 +22815,13 @@@ F: Documentation/devicetree/bindings/dm F: drivers/dma/xilinx/xilinx_dpdma.c F: include/dt-bindings/dma/xlnx-zynqmp-dpdma.h +XILINX ZYNQMP OCM EDAC DRIVER +M: Shubhrajyoti Datta <shubhrajyoti.datta(a)amd.com> +M: Sai Krishna Potthuri <sai.krishna.potthuri(a)amd.com> +S: Maintained +F: Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml +F: drivers/edac/zynqmp_edac.c + XILINX ZYNQMP PSGTR PHY DRIVER M: Anurag Kumar Vulisha <anurag.kumar.vulisha(a)xilinx.com> M: Laurent Pinchart <laurent.pinchart(a)ideasonboard.com> diff --combined arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts index c928b6824e41,cdcc5093c763..fefb93487291 --- a/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts +++ b/arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts @@@ -15,13 -15,6 +15,13 @@@ stdout-path = &lpuart1; }; + reg_vref_1v8: regulator-adc-vref { + compatible = "regulator-fixed"; + regulator-name = "vref_1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + reg_usdhc2_vmmc: regulator-usdhc2 { compatible = "regulator-fixed"; pinctrl-names = "default"; @@@ -34,11 -27,6 +34,11 @@@ }; }; +&adc1 { + vref-supply = <&reg_vref_1v8>; + status = "okay"; +}; + &mu1 { status = "okay"; }; @@@ -47,6 -35,46 +47,46 @@@ status = "okay"; }; + &eqos { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_eqos>; + phy-mode = "rgmii-id"; + phy-handle = <&ethphy1>; + status = "okay"; + + mdio { + compatible = "snps,dwmac-mdio"; + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <5000000>; + + ethphy1: ethernet-phy@1 { + reg = <1>; + eee-broken-1000t; + }; + }; + }; + + &fec { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fec>; + phy-mode = "rgmii-id"; + phy-handle = <&ethphy2>; + fsl,magic-packet; + status = "okay"; + + mdio { + #address-cells = <1>; + #size-cells = <0>; + clock-frequency = <5000000>; + + ethphy2: ethernet-phy@2 { + reg = <2>; + eee-broken-1000t; + }; + }; + }; + &lpuart1 { /* console */ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; @@@ -77,6 -105,44 +117,44 @@@ }; &iomuxc { + pinctrl_eqos: eqosgrp { + fsl,pins = < + MX93_PAD_ENET1_MDC__ENET_QOS_MDC 0x57e + MX93_PAD_ENET1_MDIO__ENET_QOS_MDIO 0x57e + MX93_PAD_ENET1_RD0__ENET_QOS_RGMII_RD0 0x57e + MX93_PAD_ENET1_RD1__ENET_QOS_RGMII_RD1 0x57e + MX93_PAD_ENET1_RD2__ENET_QOS_RGMII_RD2 0x57e + MX93_PAD_ENET1_RD3__ENET_QOS_RGMII_RD3 0x57e + MX93_PAD_ENET1_RXC__CCM_ENET_QOS_CLOCK_GENERATE_RX_CLK 0x5fe + MX93_PAD_ENET1_RX_CTL__ENET_QOS_RGMII_RX_CTL 0x57e + MX93_PAD_ENET1_TD0__ENET_QOS_RGMII_TD0 0x57e + MX93_PAD_ENET1_TD1__ENET_QOS_RGMII_TD1 0x57e + MX93_PAD_ENET1_TD2__ENET_QOS_RGMII_TD2 0x57e + MX93_PAD_ENET1_TD3__ENET_QOS_RGMII_TD3 0x57e + MX93_PAD_ENET1_TXC__CCM_ENET_QOS_CLOCK_GENERATE_TX_CLK 0x5fe + MX93_PAD_ENET1_TX_CTL__ENET_QOS_RGMII_TX_CTL 0x57e + >; + }; + + pinctrl_fec: fecgrp { + fsl,pins = < + MX93_PAD_ENET2_MDC__ENET1_MDC 0x57e + MX93_PAD_ENET2_MDIO__ENET1_MDIO 0x57e + MX93_PAD_ENET2_RD0__ENET1_RGMII_RD0 0x57e + MX93_PAD_ENET2_RD1__ENET1_RGMII_RD1 0x57e + MX93_PAD_ENET2_RD2__ENET1_RGMII_RD2 0x57e + MX93_PAD_ENET2_RD3__ENET1_RGMII_RD3 0x57e + MX93_PAD_ENET2_RXC__ENET1_RGMII_RXC 0x5fe + MX93_PAD_ENET2_RX_CTL__ENET1_RGMII_RX_CTL 0x57e + MX93_PAD_ENET2_TD0__ENET1_RGMII_TD0 0x57e + MX93_PAD_ENET2_TD1__ENET1_RGMII_TD1 0x57e + MX93_PAD_ENET2_TD2__ENET1_RGMII_TD2 0x57e + MX93_PAD_ENET2_TD3__ENET1_RGMII_TD3 0x57e + MX93_PAD_ENET2_TXC__ENET1_RGMII_TXC 0x5fe + MX93_PAD_ENET2_TX_CTL__ENET1_RGMII_TX_CTL 0x57e + >; + }; + pinctrl_uart1: uart1grp { fsl,pins = < MX93_PAD_UART1_RXD__LPUART1_RX 0x31e diff --combined arch/arm64/boot/dts/freescale/imx93.dtsi index abb3fbe4ba22,22dd2ee70be7..2076f9c9983a --- a/arch/arm64/boot/dts/freescale/imx93.dtsi +++ b/arch/arm64/boot/dts/freescale/imx93.dtsi @@@ -223,20 -223,6 +223,20 @@@ status = "disabled"; }; + flexcan1: can@443a0000 { + compatible = "fsl,imx93-flexcan"; + reg = <0x443a0000 0x10000>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_BUS_AON>, + <&clk IMX93_CLK_CAN1_GATE>; + clock-names = "ipg", "per"; + assigned-clocks = <&clk IMX93_CLK_CAN1>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <40000000>; + fsl,clk-source = /bits/ 8 <0>; + status = "disabled"; + }; + iomuxc: pinctrl@443c0000 { compatible = "fsl,imx93-iomuxc"; reg = <0x443c0000 0x10000>; @@@ -280,19 -266,6 +280,19 @@@ compatible = "fsl,imx93-anatop", "syscon"; reg = <0x44480000 0x10000>; }; + + adc1: adc@44530000 { + compatible = "nxp,imx93-adc"; + reg = <0x44530000 0x10000>; + interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_ADC1_GATE>; + clock-names = "ipg"; + #io-channel-cells = <1>; + status = "disabled"; + }; }; aips2: bus@42000000 { @@@ -420,20 -393,6 +420,20 @@@ status = "disabled"; }; + flexcan2: can@425b0000 { + compatible = "fsl,imx93-flexcan"; + reg = <0x425b0000 0x10000>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_BUS_WAKEUP>, + <&clk IMX93_CLK_CAN2_GATE>; + clock-names = "ipg", "per"; + assigned-clocks = <&clk IMX93_CLK_CAN2>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <40000000>; + fsl,clk-source = /bits/ 8 <0>; + status = "disabled"; + }; + lpuart7: serial@42690000 { compatible = "fsl,imx93-lpuart", "fsl,imx7ulp-lpuart"; reg = <0x42690000 0x1000>; @@@ -577,6 -536,54 +577,54 @@@ status = "disabled"; }; + eqos: ethernet@428a0000 { + compatible = "nxp,imx93-dwmac-eqos", "snps,dwmac-5.10a"; + reg = <0x428a0000 0x10000>; + interrupts = <GIC_SPI 183 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 184 IRQ_TYPE_LEVEL_HIGH>; + interrupt-names = "eth_wake_irq", "macirq"; + clocks = <&clk IMX93_CLK_ENET_QOS_GATE>, + <&clk IMX93_CLK_ENET_QOS_GATE>, + <&clk IMX93_CLK_ENET_TIMER2>, + <&clk IMX93_CLK_ENET>, + <&clk IMX93_CLK_ENET_QOS_GATE>; + clock-names = "stmmaceth", "pclk", "ptp_ref", "tx", "mem"; + assigned-clocks = <&clk IMX93_CLK_ENET_TIMER2>, + <&clk IMX93_CLK_ENET>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>, + <&clk IMX93_CLK_SYS_PLL_PFD0_DIV2>; + assigned-clock-rates = <100000000>, <250000000>; + intf_mode = <&wakeupmix_gpr 0x28>; + clk_csr = <0>; + status = "disabled"; + }; + + fec: ethernet@42890000 { + compatible = "fsl,imx93-fec", "fsl,imx8mq-fec", "fsl,imx6sx-fec"; + reg = <0x42890000 0x10000>; + interrupts = <GIC_SPI 179 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 180 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 181 IRQ_TYPE_LEVEL_HIGH>, + <GIC_SPI 182 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_ENET1_GATE>, + <&clk IMX93_CLK_ENET1_GATE>, + <&clk IMX93_CLK_ENET_TIMER1>, + <&clk IMX93_CLK_ENET_REF>, + <&clk IMX93_CLK_ENET_REF_PHY>; + clock-names = "ipg", "ahb", "ptp", + "enet_clk_ref", "enet_out"; + assigned-clocks = <&clk IMX93_CLK_ENET_TIMER1>, + <&clk IMX93_CLK_ENET_REF>, + <&clk IMX93_CLK_ENET_REF_PHY>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>, + <&clk IMX93_CLK_SYS_PLL_PFD0_DIV2>, + <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <100000000>, <250000000>, <50000000>; + fsl,num-tx-queues = <3>; + fsl,num-rx-queues = <3>; + status = "disabled"; + }; + usdhc3: mmc@428b0000 { compatible = "fsl,imx93-usdhc", "fsl,imx8mm-usdhc"; reg = <0x428b0000 0x10000>; diff --combined drivers/net/Kconfig index 12910338ea1a,950a09f021dd..c34bd432da27 --- a/drivers/net/Kconfig +++ b/drivers/net/Kconfig @@@ -334,6 -334,7 +334,6 @@@ config NETCONSOLE_DYNAMI config NETPOLL def_bool NETCONSOLE - select SRCU config NET_POLL_CONTROLLER def_bool NETPOLL @@@ -582,18 -583,7 +582,7 @@@ config FUJITSU_E This driver provides support for Extended Socket network device on Extended Partitioning of FUJITSU PRIMEQUEST 2000 E2 series. - config USB4_NET - tristate "Networking over USB4 and Thunderbolt cables" - depends on USB4 && INET - help - Select this if you want to create network between two computers - over a USB4 and Thunderbolt cables. The driver supports Apple - ThunderboltIP protocol and allows communication with any host - supporting the same protocol including Windows and macOS. - - To compile this driver a module, choose M here. The module will be - called thunderbolt-net. - + source "drivers/net/thunderbolt/Kconfig" source "drivers/net/hyperv/Kconfig" config NETDEVSIM diff --combined drivers/net/hyperv/netvsc_drv.c index 42162167b5b4,e34ccd47ae57..0103ff914024 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c @@@ -2559,6 -2559,9 +2559,9 @@@ static int netvsc_probe(struct hv_devic netdev_lockdep_set_classes(net); + net->xdp_features = NETDEV_XDP_ACT_BASIC | NETDEV_XDP_ACT_REDIRECT | + NETDEV_XDP_ACT_NDO_XMIT; + /* MTU range: 68 - 1500 or 65521 */ net->min_mtu = NETVSC_MTU_MIN; if (nvdev->nvsp_version >= NVSP_PROTOCOL_VERSION_2) @@@ -2594,7 -2597,7 +2597,7 @@@ no_net return ret; } -static int netvsc_remove(struct hv_device *dev) +static void netvsc_remove(struct hv_device *dev) { struct net_device_context *ndev_ctx; struct net_device *vf_netdev, *net; @@@ -2603,7 -2606,7 +2606,7 @@@ net = hv_get_drvdata(dev); if (net == NULL) { dev_err(&dev->device, "No net device to remove\n"); - return 0; + return; } ndev_ctx = netdev_priv(net); @@@ -2637,6 -2640,7 +2640,6 @@@ free_percpu(ndev_ctx->vf_stats); free_netdev(net); - return 0; } static int netvsc_suspend(struct hv_device *dev) diff --combined drivers/net/macsec.c index becb04123d3e,17452f818b0d..25616247d7a5 --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@@ -528,9 -528,9 +528,9 @@@ static void count_tx(struct net_device } } -static void macsec_encrypt_done(struct crypto_async_request *base, int err) +static void macsec_encrypt_done(void *data, int err) { - struct sk_buff *skb = base->data; + struct sk_buff *skb = data; struct net_device *dev = skb->dev; struct macsec_dev *macsec = macsec_priv(dev); struct macsec_tx_sa *sa = macsec_skb_cb(skb)->tx_sa; @@@ -835,9 -835,9 +835,9 @@@ static void count_rx(struct net_device u64_stats_update_end(&stats->syncp); } -static void macsec_decrypt_done(struct crypto_async_request *base, int err) +static void macsec_decrypt_done(void *data, int err) { - struct sk_buff *skb = base->data; + struct sk_buff *skb = data; struct net_device *dev = skb->dev; struct macsec_dev *macsec = macsec_priv(dev); struct macsec_rx_sa *rx_sa = macsec_skb_cb(skb)->rx_sa; @@@ -2583,16 -2583,56 +2583,56 @@@ static bool macsec_is_configured(struc return false; } + static int macsec_update_offload(struct net_device *dev, enum macsec_offload offload) + { + enum macsec_offload prev_offload; + const struct macsec_ops *ops; + struct macsec_context ctx; + struct macsec_dev *macsec; + int ret = 0; + + macsec = macsec_priv(dev); + + /* Check if the offloading mode is supported by the underlying layers */ + if (offload != MACSEC_OFFLOAD_OFF && + !macsec_check_offload(offload, macsec)) + return -EOPNOTSUPP; + + /* Check if the net device is busy. */ + if (netif_running(dev)) + return -EBUSY; + + /* Check if the device already has rules configured: we do not support + * rules migration. + */ + if (macsec_is_configured(macsec)) + return -EBUSY; + + prev_offload = macsec->offload; + + ops = __macsec_get_ops(offload == MACSEC_OFFLOAD_OFF ? prev_offload : offload, + macsec, &ctx); + if (!ops) + return -EOPNOTSUPP; + + macsec->offload = offload; + + ctx.secy = &macsec->secy; + ret = offload == MACSEC_OFFLOAD_OFF ? macsec_offload(ops->mdo_del_secy, &ctx) + : macsec_offload(ops->mdo_add_secy, &ctx); + if (ret) + macsec->offload = prev_offload; + + return ret; + } + static int macsec_upd_offload(struct sk_buff *skb, struct genl_info *info) { struct nlattr *tb_offload[MACSEC_OFFLOAD_ATTR_MAX + 1]; - enum macsec_offload offload, prev_offload; - int (*func)(struct macsec_context *ctx); struct nlattr **attrs = info->attrs; - struct net_device *dev; - const struct macsec_ops *ops; - struct macsec_context ctx; + enum macsec_offload offload; struct macsec_dev *macsec; + struct net_device *dev; int ret = 0; if (!attrs[MACSEC_ATTR_IFINDEX]) @@@ -2621,55 -2661,9 +2661,9 @@@ } offload = nla_get_u8(tb_offload[MACSEC_OFFLOAD_ATTR_TYPE]); - if (macsec->offload == offload) - goto out; - - /* Check if the offloading mode is supported by the underlying layers */ - if (offload != MACSEC_OFFLOAD_OFF && - !macsec_check_offload(offload, macsec)) { - ret = -EOPNOTSUPP; - goto out; - } - - /* Check if the net device is busy. */ - if (netif_running(dev)) { - ret = -EBUSY; - goto out; - } - - prev_offload = macsec->offload; - macsec->offload = offload; - /* Check if the device already has rules configured: we do not support - * rules migration. - */ - if (macsec_is_configured(macsec)) { - ret = -EBUSY; - goto rollback; - } - - ops = __macsec_get_ops(offload == MACSEC_OFFLOAD_OFF ? prev_offload : offload, - macsec, &ctx); - if (!ops) { - ret = -EOPNOTSUPP; - goto rollback; - } - - if (prev_offload == MACSEC_OFFLOAD_OFF) - func = ops->mdo_add_secy; - else - func = ops->mdo_del_secy; - - ctx.secy = &macsec->secy; - ret = macsec_offload(func, &ctx); - if (ret) - goto rollback; - - rtnl_unlock(); - return 0; - - rollback: - macsec->offload = prev_offload; + if (macsec->offload != offload) + ret = macsec_update_offload(dev, offload); out: rtnl_unlock(); return ret; @@@ -3817,6 -3811,8 +3811,8 @@@ static int macsec_changelink(struct net struct netlink_ext_ack *extack) { struct macsec_dev *macsec = macsec_priv(dev); + bool macsec_offload_state_change = false; + enum macsec_offload offload; struct macsec_tx_sc tx_sc; struct macsec_secy secy; int ret; @@@ -3840,8 -3836,18 +3836,18 @@@ if (ret) goto cleanup; + if (data[IFLA_MACSEC_OFFLOAD]) { + offload = nla_get_u8(data[IFLA_MACSEC_OFFLOAD]); + if (macsec->offload != offload) { + macsec_offload_state_change = true; + ret = macsec_update_offload(dev, offload); + if (ret) + goto cleanup; + } + } + /* If h/w offloading is available, propagate to the device */ - if (macsec_is_offloaded(macsec)) { + if (!macsec_offload_state_change && macsec_is_offloaded(macsec)) { const struct macsec_ops *ops; struct macsec_context ctx; @@@ -4240,16 -4246,22 +4246,22 @@@ static size_t macsec_get_size(const str nla_total_size(1) + /* IFLA_MACSEC_SCB */ nla_total_size(1) + /* IFLA_MACSEC_REPLAY_PROTECT */ nla_total_size(1) + /* IFLA_MACSEC_VALIDATION */ + nla_total_size(1) + /* IFLA_MACSEC_OFFLOAD */ 0; } static int macsec_fill_info(struct sk_buff *skb, const struct net_device *dev) { - struct macsec_secy *secy = &macsec_priv(dev)->secy; - struct macsec_tx_sc *tx_sc = &secy->tx_sc; + struct macsec_tx_sc *tx_sc; + struct macsec_dev *macsec; + struct macsec_secy *secy; u64 csid; + macsec = macsec_priv(dev); + secy = &macsec->secy; + tx_sc = &secy->tx_sc; + switch (secy->key_len) { case MACSEC_GCM_AES_128_SAK_LEN: csid = secy->xpn ? MACSEC_CIPHER_ID_GCM_AES_XPN_128 : MACSEC_DEFAULT_CIPHER_ID; @@@ -4274,6 -4286,7 +4286,7 @@@ nla_put_u8(skb, IFLA_MACSEC_SCB, tx_sc->scb) || nla_put_u8(skb, IFLA_MACSEC_REPLAY_PROTECT, secy->replay_protect) || nla_put_u8(skb, IFLA_MACSEC_VALIDATION, secy->validate_frames) || + nla_put_u8(skb, IFLA_MACSEC_OFFLOAD, macsec->offload) || 0) goto nla_put_failure; diff --combined drivers/nvme/host/tcp.c index d6100a787d39,70e273b565de..1955c0ec209e --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@@ -14,6 -14,7 +14,7 @@@ #include <linux/blk-mq.h> #include <crypto/hash.h> #include <net/busy_poll.h> + #include <trace/events/sock.h> #include "nvme.h" #include "fabrics.h" @@@ -905,6 -906,8 +906,8 @@@ static void nvme_tcp_data_ready(struct { struct nvme_tcp_queue *queue; + trace_sk_data_ready(sk); + read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; if (likely(queue && queue->rd_enabled) && @@@ -2282,13 -2285,10 +2285,13 @@@ static enum blk_eh_timer_return nvme_tc struct nvme_tcp_request *req = blk_mq_rq_to_pdu(rq); struct nvme_ctrl *ctrl = &req->queue->ctrl->ctrl; struct nvme_tcp_cmd_pdu *pdu = req->pdu; + u8 opc = pdu->cmd.common.opcode, fctype = pdu->cmd.fabrics.fctype; + int qid = nvme_tcp_queue_id(req->queue); dev_warn(ctrl->device, - "queue %d: timeout request %#x type %d\n", - nvme_tcp_queue_id(req->queue), rq->tag, pdu->hdr.type); + "queue %d: timeout cid %#x type %d opcode %#x (%s)\n", + nvme_tcp_queue_id(req->queue), nvme_cid(rq), pdu->hdr.type, + opc, nvme_opcode_str(qid, opc, fctype)); if (ctrl->state != NVME_CTRL_LIVE) { /* diff --combined drivers/nvme/target/tcp.c index c5759eb503d0,4a161c8cb531..66e8f9fd0ca7 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c @@@ -14,6 -14,7 +14,7 @@@ #include <linux/inet.h> #include <linux/llist.h> #include <crypto/hash.h> + #include <trace/events/sock.h> #include "nvmet.h" @@@ -321,8 -322,9 +322,8 @@@ static void nvmet_tcp_build_pdu_iovec(s while (length) { u32 iov_len = min_t(u32, length, sg->length - sg_offset); - iov->bv_page = sg_page(sg); - iov->bv_len = sg->length; - iov->bv_offset = sg->offset + sg_offset; + bvec_set_page(iov, sg_page(sg), sg->length, + sg->offset + sg_offset); length -= iov_len; sg = sg_next(sg); @@@ -1469,6 -1471,8 +1470,8 @@@ static void nvmet_tcp_data_ready(struc { struct nvmet_tcp_queue *queue; + trace_sk_data_ready(sk); + read_lock_bh(&sk->sk_callback_lock); queue = sk->sk_user_data; if (likely(queue)) @@@ -1666,6 -1670,8 +1669,8 @@@ static void nvmet_tcp_listen_data_ready { struct nvmet_tcp_port *port; + trace_sk_data_ready(sk); + read_lock_bh(&sk->sk_callback_lock); port = sk->sk_user_data; if (!port) diff --combined drivers/xen/pvcalls-back.c index 7a464a541d91,e2abc3474d85..dcb00938de61 --- a/drivers/xen/pvcalls-back.c +++ b/drivers/xen/pvcalls-back.c @@@ -14,6 -14,7 +14,7 @@@ #include <net/inet_common.h> #include <net/inet_connection_sock.h> #include <net/request_sock.h> + #include <trace/events/sock.h> #include <xen/events.h> #include <xen/grant_table.h> @@@ -173,8 -174,6 +174,8 @@@ static bool pvcalls_conn_back_write(str RING_IDX cons, prod, size, array_size; int ret; + atomic_set(&map->write, 0); + cons = intf->out_cons; prod = intf->out_prod; /* read the indexes before dealing with the data */ @@@ -199,6 -198,7 +200,6 @@@ iov_iter_kvec(&msg.msg_iter, ITER_SOURCE, vec, 2, size); } - atomic_set(&map->write, 0); ret = inet_sendmsg(map->sock, &msg, size); if (ret == -EAGAIN) { atomic_inc(&map->write); @@@ -301,6 -301,8 +302,8 @@@ static void pvcalls_sk_data_ready(struc struct sock_mapping *map = sock->sk_user_data; struct pvcalls_ioworker *iow; + trace_sk_data_ready(sock); + if (map == NULL) return; @@@ -589,6 -591,8 +592,8 @@@ static void pvcalls_pass_sk_data_ready( unsigned long flags; int notify; + trace_sk_data_ready(sock); + if (mappass == NULL) return; diff --combined fs/dlm/lowcomms.c index 61cd6c2628fa,7920c655173c..a9b14f81d655 --- a/fs/dlm/lowcomms.c +++ b/fs/dlm/lowcomms.c @@@ -54,6 -54,7 +54,7 @@@ #include <net/ipv6.h> #include <trace/events/dlm.h> + #include <trace/events/sock.h> #include "dlm_internal.h" #include "lowcomms.h" @@@ -61,7 -62,6 +62,7 @@@ #include "memory.h" #include "config.h" +#define DLM_SHUTDOWN_WAIT_TIMEOUT msecs_to_jiffies(5000) #define NEEDED_RMEM (4*1024*1024) struct connection { @@@ -100,7 -100,6 +101,7 @@@ struct connection *othercon; struct work_struct rwork; /* receive worker */ struct work_struct swork; /* send worker */ + wait_queue_head_t shutdown_wait; unsigned char rx_leftover_buf[DLM_MAX_SOCKET_BUFSIZE]; int rx_leftover; int mark; @@@ -284,7 -283,6 +285,7 @@@ static void dlm_con_init(struct connect INIT_WORK(&con->swork, process_send_sockets); INIT_WORK(&con->rwork, process_recv_sockets); spin_lock_init(&con->addrs_lock); + init_waitqueue_head(&con->shutdown_wait); } /* @@@ -502,6 -500,8 +503,8 @@@ static void lowcomms_data_ready(struct { struct connection *con = sock2con(sk); + trace_sk_data_ready(sk); + set_bit(CF_RECV_INTR, &con->flags); lowcomms_queue_rwork(con); } @@@ -533,6 -533,8 +536,8 @@@ static void lowcomms_state_change(struc static void lowcomms_listen_data_ready(struct sock *sk) { + trace_sk_data_ready(sk); + queue_work(io_workqueue, &listen_con.rwork); } @@@ -793,43 -795,6 +798,43 @@@ static void close_connection(struct con up_write(&con->sock_lock); } +static void shutdown_connection(struct connection *con, bool and_other) +{ + int ret; + + if (con->othercon && and_other) + shutdown_connection(con->othercon, false); + + flush_workqueue(io_workqueue); + down_read(&con->sock_lock); + /* nothing to shutdown */ + if (!con->sock) { + up_read(&con->sock_lock); + return; + } + + ret = kernel_sock_shutdown(con->sock, SHUT_WR); + up_read(&con->sock_lock); + if (ret) { + log_print("Connection %p failed to shutdown: %d will force close", + con, ret); + goto force_close; + } else { + ret = wait_event_timeout(con->shutdown_wait, !con->sock, + DLM_SHUTDOWN_WAIT_TIMEOUT); + if (ret == 0) { + log_print("Connection %p shutdown timed out, will force close", + con); + goto force_close; + } + } + + return; + +force_close: + close_connection(con, false); +} + static struct processqueue_entry *new_processqueue_entry(int nodeid, int buflen) { @@@ -1528,7 -1493,6 +1533,7 @@@ static void process_recv_sockets(struc break; case DLM_IO_EOF: close_connection(con, false); + wake_up(&con->shutdown_wait); /* CF_RECV_PENDING cleared */ break; case DLM_IO_RESCHED: @@@ -1736,9 -1700,6 +1741,9 @@@ static int work_start(void void dlm_lowcomms_shutdown(void) { + struct connection *con; + int i, idx; + /* stop lowcomms_listen_data_ready calls */ lock_sock(listen_con.sock->sk); listen_con.sock->sk->sk_data_ready = listen_sock.sk_data_ready; @@@ -1747,20 -1708,29 +1752,20 @@@ cancel_work_sync(&listen_con.rwork); dlm_close_sock(&listen_con.sock); - flush_workqueue(process_workqueue); -} - -void dlm_lowcomms_shutdown_node(int nodeid, bool force) -{ - struct connection *con; - int idx; - idx = srcu_read_lock(&connections_srcu); - con = nodeid2con(nodeid, 0); - if (WARN_ON_ONCE(!con)) { - srcu_read_unlock(&connections_srcu, idx); - return; + for (i = 0; i < CONN_HASH_SIZE; i++) { + hlist_for_each_entry_rcu(con, &connection_hash[i], list) { + shutdown_connection(con, true); + stop_connection_io(con); + flush_workqueue(process_workqueue); + close_connection(con, true); + + clean_one_writequeue(con); + if (con->othercon) + clean_one_writequeue(con->othercon); + allow_connection_io(con); + } } - - flush_work(&con->swork); - stop_connection_io(con); - WARN_ON_ONCE(!force && !list_empty(&con->writequeue)); - close_connection(con, true); - clean_one_writequeue(con); - if (con->othercon) - clean_one_writequeue(con->othercon); - allow_connection_io(con); srcu_read_unlock(&connections_srcu, idx); } diff --combined include/linux/cpumask.h index d45e5de13721,7b16aede7ac5..10c92bd9b807 --- a/include/linux/cpumask.h +++ b/include/linux/cpumask.h @@@ -391,6 -391,26 +391,26 @@@ unsigned int cpumask_nth_andnot(unsigne nr_cpumask_bits, cpumask_check(cpu)); } + /** + * cpumask_nth_and_andnot - get the Nth cpu set in 1st and 2nd cpumask, and clear in 3rd. + * @srcp1: the cpumask pointer + * @srcp2: the cpumask pointer + * @srcp3: the cpumask pointer + * @cpu: the N'th cpu to find, starting from 0 + * + * Returns >= nr_cpu_ids if such cpu doesn't exist. + */ + static __always_inline + unsigned int cpumask_nth_and_andnot(unsigned int cpu, const struct cpumask *srcp1, + const struct cpumask *srcp2, + const struct cpumask *srcp3) + { + return find_nth_and_andnot_bit(cpumask_bits(srcp1), + cpumask_bits(srcp2), + cpumask_bits(srcp3), + nr_cpumask_bits, cpumask_check(cpu)); + } + #define CPU_BITS_NONE \ { \ [0 ... BITS_TO_LONGS(NR_CPUS)-1] = 0UL \ @@@ -1017,9 -1037,9 +1037,9 @@@ static inline const struct cpumask *get * concurrent CPU hotplug operations unless invoked from a cpuhp_lock held * region. */ -static inline unsigned int num_online_cpus(void) +static __always_inline unsigned int num_online_cpus(void) { - return atomic_read(&__num_online_cpus); + return arch_atomic_read(&__num_online_cpus); } #define num_possible_cpus() cpumask_weight(cpu_possible_mask) #define num_present_cpus() cpumask_weight(cpu_present_mask) diff --combined include/linux/poison.h index 0e8a1f2ceb2f,2823f90fdab4..851a855d3868 --- a/include/linux/poison.h +++ b/include/linux/poison.h @@@ -81,10 -81,10 +81,13 @@@ /********** net/core/page_pool.c **********/ #define PP_SIGNATURE (0x40 + POISON_POINTER_DELTA) + /********** net/core/skbuff.c **********/ + #define SKB_LIST_POISON_NEXT ((void *)(0x800 + POISON_POINTER_DELTA)) + /********** kernel/bpf/ **********/ #define BPF_PTR_POISON ((void *)(0xeB9FUL + POISON_POINTER_DELTA)) +/********** VFS **********/ +#define VFS_PTR_POISON ((void *)(0xF5 + POISON_POINTER_DELTA)) + #endif diff --combined init/Kconfig index 18f0bf50c468,d88ffde2bbe1..77a4318a6043 --- a/init/Kconfig +++ b/init/Kconfig @@@ -1045,10 -1045,6 +1045,10 @@@ config RT_GROUP_SCHE endif #CGROUP_SCHED +config SCHED_MM_CID + def_bool y + depends on SMP && RSEQ + config UCLAMP_TASK_GROUP bool "Utilization clamping per group of tasks" depends on CGROUP_SCHED @@@ -1873,6 -1869,7 +1873,6 @@@ config PERF_EVENT default y if PROFILING depends on HAVE_PERF_EVENTS select IRQ_WORK - select SRCU help Enable kernel support for various performance events provided by software and hardware. @@@ -1942,7 -1939,7 +1942,7 @@@ config RUS depends on !MODVERSIONS depends on !GCC_PLUGINS depends on !RANDSTRUCT - depends on !DEBUG_INFO_BTF + depends on !DEBUG_INFO_BTF || PAHOLE_HAS_LANG_EXCLUDE select CONSTRUCTORS help Enables Rust support in the kernel. diff --combined kernel/bpf/core.c index 430c66d59ec7,3390961c4e10..933869983e2a --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@@ -35,6 -35,7 +35,7 @@@ #include <linux/bpf_verifier.h> #include <linux/nodemask.h> #include <linux/bpf_mem_alloc.h> + #include <linux/memcontrol.h> #include <asm/barrier.h> #include <asm/unaligned.h> @@@ -87,7 -88,7 +88,7 @@@ void *bpf_internal_load_pointer_neg_hel struct bpf_prog *bpf_prog_alloc_no_stats(unsigned int size, gfp_t gfp_extra_flags) { - gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags; + gfp_t gfp_flags = bpf_memcg_flags(GFP_KERNEL | __GFP_ZERO | gfp_extra_flags); struct bpf_prog_aux *aux; struct bpf_prog *fp; @@@ -96,12 -97,12 +97,12 @@@ if (fp == NULL) return NULL; - aux = kzalloc(sizeof(*aux), GFP_KERNEL_ACCOUNT | gfp_extra_flags); + aux = kzalloc(sizeof(*aux), bpf_memcg_flags(GFP_KERNEL | gfp_extra_flags)); if (aux == NULL) { vfree(fp); return NULL; } - fp->active = alloc_percpu_gfp(int, GFP_KERNEL_ACCOUNT | gfp_extra_flags); + fp->active = alloc_percpu_gfp(int, bpf_memcg_flags(GFP_KERNEL | gfp_extra_flags)); if (!fp->active) { vfree(fp); kfree(aux); @@@ -126,7 -127,7 +127,7 @@@ struct bpf_prog *bpf_prog_alloc(unsigned int size, gfp_t gfp_extra_flags) { - gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags; + gfp_t gfp_flags = bpf_memcg_flags(GFP_KERNEL | __GFP_ZERO | gfp_extra_flags); struct bpf_prog *prog; int cpu; @@@ -159,7 -160,7 +160,7 @@@ int bpf_prog_alloc_jited_linfo(struct b prog->aux->jited_linfo = kvcalloc(prog->aux->nr_linfo, sizeof(*prog->aux->jited_linfo), - GFP_KERNEL_ACCOUNT | __GFP_NOWARN); + bpf_memcg_flags(GFP_KERNEL | __GFP_NOWARN)); if (!prog->aux->jited_linfo) return -ENOMEM; @@@ -234,7 -235,7 +235,7 @@@ void bpf_prog_fill_jited_linfo(struct b struct bpf_prog *bpf_prog_realloc(struct bpf_prog *fp_old, unsigned int size, gfp_t gfp_extra_flags) { - gfp_t gfp_flags = GFP_KERNEL_ACCOUNT | __GFP_ZERO | gfp_extra_flags; + gfp_t gfp_flags = bpf_memcg_flags(GFP_KERNEL | __GFP_ZERO | gfp_extra_flags); struct bpf_prog *fp; u32 pages; @@@ -1910,7 -1911,9 +1911,7 @@@ out * reuse preexisting logic from Spectre v1 mitigation that * happens to produce the required code on x86 for v4 as well. */ -#ifdef CONFIG_X86 barrier_nospec(); -#endif CONT; #define LDST(SIZEOP, SIZE) \ STX_MEM_##SIZEOP: \ @@@ -2094,6 -2097,14 +2095,14 @@@ bool bpf_prog_map_compatible(struct bpf if (fp->kprobe_override) return false; + /* XDP programs inserted into maps are not guaranteed to run on + * a particular netdev (and can run outside driver context entirely + * in the case of devmap and cpumap). Until device checks + * are implemented, prohibit adding dev-bound programs to program maps. + */ + if (bpf_prog_is_dev_bound(fp->aux)) + return false; + spin_lock(&map->owner.lock); if (!map->owner.type) { /* There's no owner yet where we could check for @@@ -2180,7 -2191,7 +2189,7 @@@ struct bpf_prog *bpf_prog_select_runtim * valid program, which in this case would simply not * be JITed, but falls back to the interpreter. */ - if (!bpf_prog_is_dev_bound(fp->aux)) { + if (!bpf_prog_is_offloaded(fp->aux)) { *err = bpf_prog_alloc_jited_linfo(fp); if (*err) return fp; @@@ -2552,7 -2563,7 +2561,7 @@@ static void bpf_prog_free_deferred(stru bpf_free_used_maps(aux); bpf_free_used_btfs(aux); if (bpf_prog_is_dev_bound(aux)) - bpf_prog_offload_destroy(aux->prog); + bpf_prog_dev_bound_destroy(aux->prog); #ifdef CONFIG_PERF_EVENTS if (aux->prog->has_callchain_buf) put_callchain_buffers(); diff --combined kernel/sched/topology.c index d93c3379e901,1a9ee8fcd477..051aaf65c749 --- a/kernel/sched/topology.c +++ b/kernel/sched/topology.c @@@ -3,6 -3,8 +3,8 @@@ * Scheduler topology setup/handling methods */ + #include <linux/bsearch.h> + DEFINE_MUTEX(sched_domains_mutex); /* Protected by sched_domains_mutex: */ @@@ -578,7 -580,7 +580,7 @@@ out */ struct root_domain def_root_domain; -void init_defrootdomain(void) +void __init init_defrootdomain(void) { init_rootdomain(&def_root_domain); @@@ -2067,6 -2069,99 +2069,99 @@@ unlock return found; } + struct __cmp_key { + const struct cpumask *cpus; + struct cpumask ***masks; + int node; + int cpu; + int w; + }; + + static int hop_cmp(const void *a, const void *b) + { + struct cpumask **prev_hop, **cur_hop = *(struct cpumask ***)b; + struct __cmp_key *k = (struct __cmp_key *)a; + + if (cpumask_weight_and(k->cpus, cur_hop[k->node]) <= k->cpu) + return 1; + + if (b == k->masks) { + k->w = 0; + return 0; + } + + prev_hop = *((struct cpumask ***)b - 1); + k->w = cpumask_weight_and(k->cpus, prev_hop[k->node]); + if (k->w <= k->cpu) + return 0; + + return -1; + } + + /* + * sched_numa_find_nth_cpu() - given the NUMA topology, find the Nth next cpu + * closest to @cpu from @cpumask. + * cpumask: cpumask to find a cpu from + * cpu: Nth cpu to find + * + * returns: cpu, or nr_cpu_ids when nothing found. + */ + int sched_numa_find_nth_cpu(const struct cpumask *cpus, int cpu, int node) + { + struct __cmp_key k = { .cpus = cpus, .node = node, .cpu = cpu }; + struct cpumask ***hop_masks; + int hop, ret = nr_cpu_ids; + + rcu_read_lock(); + + k.masks = rcu_dereference(sched_domains_numa_masks); + if (!k.masks) + goto unlock; + + hop_masks = bsearch(&k, k.masks, sched_domains_numa_levels, sizeof(k.masks[0]), hop_cmp); + hop = hop_masks - k.masks; + + ret = hop ? + cpumask_nth_and_andnot(cpu - k.w, cpus, k.masks[hop][node], k.masks[hop-1][node]) : + cpumask_nth_and(cpu, cpus, k.masks[0][node]); + unlock: + rcu_read_unlock(); + return ret; + } + EXPORT_SYMBOL_GPL(sched_numa_find_nth_cpu); + + /** + * sched_numa_hop_mask() - Get the cpumask of CPUs at most @hops hops away from + * @node + * @node: The node to count hops from. + * @hops: Include CPUs up to that many hops away. 0 means local node. + * + * Return: On success, a pointer to a cpumask of CPUs at most @hops away from + * @node, an error value otherwise. + * + * Requires rcu_lock to be held. Returned cpumask is only valid within that + * read-side section, copy it if required beyond that. + * + * Note that not all hops are equal in distance; see sched_init_numa() for how + * distances and masks are handled. + * Also note that this is a reflection of sched_domains_numa_masks, which may change + * during the lifetime of the system (offline nodes are taken out of the masks). + */ + const struct cpumask *sched_numa_hop_mask(unsigned int node, unsigned int hops) + { + struct cpumask ***masks; + + if (node >= nr_node_ids || hops >= sched_domains_numa_levels) + return ERR_PTR(-EINVAL); + + masks = rcu_dereference(sched_domains_numa_masks); + if (!masks) + return ERR_PTR(-EBUSY); + + return masks[hops][node]; + } + EXPORT_SYMBOL_GPL(sched_numa_hop_mask); + #endif /* CONFIG_NUMA */ static int __sdt_alloc(const struct cpumask *cpu_map) @@@ -2451,7 -2546,7 +2546,7 @@@ void free_sched_domains(cpumask_var_t d * Set up scheduler domains and groups. For now this just excludes isolated * CPUs, but could be used to exclude other special cases in the future. */ -int sched_init_domains(const struct cpumask *cpu_map) +int __init sched_init_domains(const struct cpumask *cpu_map) { int err; diff --combined kernel/trace/bpf_trace.c index b8ac8b09c86f,c58baf9983cc..e8da032bb6fc --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@@ -369,8 -369,6 +369,6 @@@ static const struct bpf_func_proto *bpf return &bpf_probe_write_user_proto; } - static DEFINE_RAW_SPINLOCK(trace_printk_lock); - #define MAX_TRACE_PRINTK_VARARGS 3 #define BPF_TRACE_PRINTK_SIZE 1024 @@@ -378,23 -376,22 +376,22 @@@ BPF_CALL_5(bpf_trace_printk, char *, fm u64, arg2, u64, arg3) { u64 args[MAX_TRACE_PRINTK_VARARGS] = { arg1, arg2, arg3 }; - u32 *bin_args; - static char buf[BPF_TRACE_PRINTK_SIZE]; - unsigned long flags; + struct bpf_bprintf_data data = { + .get_bin_args = true, + .get_buf = true, + }; int ret; - ret = bpf_bprintf_prepare(fmt, fmt_size, args, &bin_args, - MAX_TRACE_PRINTK_VARARGS); + ret = bpf_bprintf_prepare(fmt, fmt_size, args, + MAX_TRACE_PRINTK_VARARGS, &data); if (ret < 0) return ret; - raw_spin_lock_irqsave(&trace_printk_lock, flags); - ret = bstr_printf(buf, sizeof(buf), fmt, bin_args); + ret = bstr_printf(data.buf, MAX_BPRINTF_BUF, fmt, data.bin_args); - trace_bpf_trace_printk(buf); - raw_spin_unlock_irqrestore(&trace_printk_lock, flags); + trace_bpf_trace_printk(data.buf); - bpf_bprintf_cleanup(); + bpf_bprintf_cleanup(&data); return ret; } @@@ -427,30 -424,29 +424,29 @@@ const struct bpf_func_proto *bpf_get_tr return &bpf_trace_printk_proto; } - BPF_CALL_4(bpf_trace_vprintk, char *, fmt, u32, fmt_size, const void *, data, + BPF_CALL_4(bpf_trace_vprintk, char *, fmt, u32, fmt_size, const void *, args, u32, data_len) { - static char buf[BPF_TRACE_PRINTK_SIZE]; - unsigned long flags; + struct bpf_bprintf_data data = { + .get_bin_args = true, + .get_buf = true, + }; int ret, num_args; - u32 *bin_args; if (data_len & 7 || data_len > MAX_BPRINTF_VARARGS * 8 || - (data_len && !data)) + (data_len && !args)) return -EINVAL; num_args = data_len / 8; - ret = bpf_bprintf_prepare(fmt, fmt_size, data, &bin_args, num_args); + ret = bpf_bprintf_prepare(fmt, fmt_size, args, num_args, &data); if (ret < 0) return ret; - raw_spin_lock_irqsave(&trace_printk_lock, flags); - ret = bstr_printf(buf, sizeof(buf), fmt, bin_args); + ret = bstr_printf(data.buf, MAX_BPRINTF_BUF, fmt, data.bin_args); - trace_bpf_trace_printk(buf); - raw_spin_unlock_irqrestore(&trace_printk_lock, flags); + trace_bpf_trace_printk(data.buf); - bpf_bprintf_cleanup(); + bpf_bprintf_cleanup(&data); return ret; } @@@ -472,23 -468,25 +468,25 @@@ const struct bpf_func_proto *bpf_get_tr } BPF_CALL_5(bpf_seq_printf, struct seq_file *, m, char *, fmt, u32, fmt_size, - const void *, data, u32, data_len) + const void *, args, u32, data_len) { + struct bpf_bprintf_data data = { + .get_bin_args = true, + }; int err, num_args; - u32 *bin_args; if (data_len & 7 || data_len > MAX_BPRINTF_VARARGS * 8 || - (data_len && !data)) + (data_len && !args)) return -EINVAL; num_args = data_len / 8; - err = bpf_bprintf_prepare(fmt, fmt_size, data, &bin_args, num_args); + err = bpf_bprintf_prepare(fmt, fmt_size, args, num_args, &data); if (err < 0) return err; - seq_bprintf(m, fmt, bin_args); + seq_bprintf(m, fmt, data.bin_args); - bpf_bprintf_cleanup(); + bpf_bprintf_cleanup(&data); return seq_has_overflowed(m) ? -EOVERFLOW : 0; } @@@ -687,7 -685,8 +685,7 @@@ BPF_CALL_5(bpf_perf_event_output, struc } perf_sample_data_init(sd, 0, 0); - sd->raw = &raw; - sd->sample_flags |= PERF_SAMPLE_RAW; + perf_sample_save_raw_data(sd, &raw); err = __bpf_perf_event_output(regs, map, flags, sd); @@@ -745,7 -744,8 +743,7 @@@ u64 bpf_event_output(struct bpf_map *ma perf_fetch_caller_regs(regs); perf_sample_data_init(sd, 0, 0); - sd->raw = &raw; - sd->sample_flags |= PERF_SAMPLE_RAW; + perf_sample_save_raw_data(sd, &raw); ret = __bpf_perf_event_output(regs, map, flags, sd); out: @@@ -1237,7 -1237,7 +1235,7 @@@ __diag_ignore_all("-Wmissing-prototypes * Return: a bpf_key pointer with a valid key pointer if the key is found, a * NULL pointer otherwise. */ - struct bpf_key *bpf_lookup_user_key(u32 serial, u64 flags) + __bpf_kfunc struct bpf_key *bpf_lookup_user_key(u32 serial, u64 flags) { key_ref_t key_ref; struct bpf_key *bkey; @@@ -1286,7 -1286,7 +1284,7 @@@ * Return: a bpf_key pointer with an invalid key pointer set from the * pre-determined ID on success, a NULL pointer otherwise */ - struct bpf_key *bpf_lookup_system_key(u64 id) + __bpf_kfunc struct bpf_key *bpf_lookup_system_key(u64 id) { struct bpf_key *bkey; @@@ -1310,7 -1310,7 +1308,7 @@@ * Decrement the reference count of the key inside *bkey*, if the pointer * is valid, and free *bkey*. */ - void bpf_key_put(struct bpf_key *bkey) + __bpf_kfunc void bpf_key_put(struct bpf_key *bkey) { if (bkey->has_ref) key_put(bkey->key); @@@ -1330,7 -1330,7 +1328,7 @@@ * * Return: 0 on success, a negative value on error. */ - int bpf_verify_pkcs7_signature(struct bpf_dynptr_kern *data_ptr, + __bpf_kfunc int bpf_verify_pkcs7_signature(struct bpf_dynptr_kern *data_ptr, struct bpf_dynptr_kern *sig_ptr, struct bpf_key *trusted_keyring) { @@@ -2686,69 -2686,77 +2684,77 @@@ static void symbols_swap_r(void *a, voi } } - struct module_addr_args { - unsigned long *addrs; - u32 addrs_cnt; + struct modules_array { struct module **mods; int mods_cnt; int mods_cap; }; - static int module_callback(void *data, const char *name, - struct module *mod, unsigned long addr) + static int add_module(struct modules_array *arr, struct module *mod) { - struct module_addr_args *args = data; struct module **mods; - /* We iterate all modules symbols and for each we: - * - search for it in provided addresses array - * - if found we check if we already have the module pointer stored - * (we iterate modules sequentially, so we can check just the last - * module pointer) - * - take module reference and store it - */ - if (!bsearch(&addr, args->addrs, args->addrs_cnt, sizeof(addr), - bpf_kprobe_multi_addrs_cmp)) - return 0; - - if (args->mods && args->mods[args->mods_cnt - 1] == mod) - return 0; - - if (args->mods_cnt == args->mods_cap) { - args->mods_cap = max(16, args->mods_cap * 3 / 2); - mods = krealloc_array(args->mods, args->mods_cap, sizeof(*mods), GFP_KERNEL); + if (arr->mods_cnt == arr->mods_cap) { + arr->mods_cap = max(16, arr->mods_cap * 3 / 2); + mods = krealloc_array(arr->mods, arr->mods_cap, sizeof(*mods), GFP_KERNEL); if (!mods) return -ENOMEM; - args->mods = mods; + arr->mods = mods; } - if (!try_module_get(mod)) - return -EINVAL; - - args->mods[args->mods_cnt] = mod; - args->mods_cnt++; + arr->mods[arr->mods_cnt] = mod; + arr->mods_cnt++; return 0; } + static bool has_module(struct modules_array *arr, struct module *mod) + { + int i; + + for (i = arr->mods_cnt - 1; i >= 0; i--) { + if (arr->mods[i] == mod) + return true; + } + return false; + } + static int get_modules_for_addrs(struct module ***mods, unsigned long *addrs, u32 addrs_cnt) { - struct module_addr_args args = { - .addrs = addrs, - .addrs_cnt = addrs_cnt, - }; - int err; + struct modules_array arr = {}; + u32 i, err = 0; + + for (i = 0; i < addrs_cnt; i++) { + struct module *mod; + + preempt_disable(); + mod = __module_address(addrs[i]); + /* Either no module or we it's already stored */ + if (!mod || has_module(&arr, mod)) { + preempt_enable(); + continue; + } + if (!try_module_get(mod)) + err = -EINVAL; + preempt_enable(); + if (err) + break; + err = add_module(&arr, mod); + if (err) { + module_put(mod); + break; + } + } /* We return either err < 0 in case of error, ... */ - err = module_kallsyms_on_each_symbol(module_callback, &args); if (err) { - kprobe_multi_put_modules(args.mods, args.mods_cnt); - kfree(args.mods); + kprobe_multi_put_modules(arr.mods, arr.mods_cnt); + kfree(arr.mods); return err; } /* or number of modules found if everything is ok. */ - *mods = args.mods; - return args.mods_cnt; + *mods = arr.mods; + return arr.mods_cnt; } int bpf_kprobe_multi_link_attach(const union bpf_attr *attr, struct bpf_prog *prog) @@@ -2861,13 -2869,6 +2867,6 @@@ bpf_kprobe_multi_cookie_cmp, bpf_kprobe_multi_cookie_swap, link); - } else { - /* - * We need to sort addrs array even if there are no cookies - * provided, to allow bsearch in get_modules_for_addrs. - */ - sort(addrs, cnt, sizeof(*addrs), - bpf_kprobe_multi_addrs_cmp, NULL); } err = get_modules_for_addrs(&link->mods, addrs, cnt); diff --combined kernel/trace/ftrace.c index 51896b610414,49762ef50b72..29baa97d0d53 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@@ -125,33 -125,6 +125,33 @@@ struct ftrace_ops global_ops void ftrace_ops_list_func(unsigned long ip, unsigned long parent_ip, struct ftrace_ops *op, struct ftrace_regs *fregs); +#ifdef CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS +/* + * Stub used to invoke the list ops without requiring a separate trampoline. + */ +const struct ftrace_ops ftrace_list_ops = { + .func = ftrace_ops_list_func, + .flags = FTRACE_OPS_FL_STUB, +}; + +static void ftrace_ops_nop_func(unsigned long ip, unsigned long parent_ip, + struct ftrace_ops *op, + struct ftrace_regs *fregs) +{ + /* do nothing */ +} + +/* + * Stub used when a call site is disabled. May be called transiently by threads + * which have made it into ftrace_caller but haven't yet recovered the ops at + * the point the call site is disabled. + */ +const struct ftrace_ops ftrace_nop_ops = { + .func = ftrace_ops_nop_func, + .flags = FTRACE_OPS_FL_STUB, +}; +#endif + static inline void ftrace_ops_init(struct ftrace_ops *ops) { #ifdef CONFIG_DYNAMIC_FTRACE @@@ -1846,18 -1819,6 +1846,18 @@@ static bool __ftrace_hash_rec_update(st * if rec count is zero. */ } + + /* + * If the rec has a single associated ops, and ops->func can be + * called directly, allow the call site to call via the ops. + */ + if (IS_ENABLED(CONFIG_DYNAMIC_FTRACE_WITH_CALL_OPS) && + ftrace_rec_count(rec) == 1 && + ftrace_ops_get_func(ops) == ops->func) + rec->flags |= FTRACE_FL_CALL_OPS; + else + rec->flags &= ~FTRACE_FL_CALL_OPS; + count++; /* Must match FTRACE_UPDATE_CALLS in ftrace_modify_all_code() */ @@@ -2152,9 -2113,8 +2152,9 @@@ void ftrace_bug(int failed, struct dyn_ struct ftrace_ops *ops = NULL; pr_info("ftrace record flags: %lx\n", rec->flags); - pr_cont(" (%ld)%s", ftrace_rec_count(rec), - rec->flags & FTRACE_FL_REGS ? " R" : " "); + pr_cont(" (%ld)%s%s", ftrace_rec_count(rec), + rec->flags & FTRACE_FL_REGS ? " R" : " ", + rec->flags & FTRACE_FL_CALL_OPS ? " O" : " "); if (rec->flags & FTRACE_FL_TRAMP_EN) { ops = ftrace_find_tramp_ops_any(rec); if (ops) { @@@ -2222,7 -2182,6 +2222,7 @@@ static int ftrace_check_record(struct d * want the direct enabled (it will be done via the * direct helper). But if DIRECT_EN is set, and * the count is not one, we need to clear it. + * */ if (ftrace_rec_count(rec) == 1) { if (!(rec->flags & FTRACE_FL_DIRECT) != @@@ -2231,19 -2190,6 +2231,19 @@@ } else if (rec->flags & FTRACE_FL_DIRECT_EN) { flag |= FTRACE_FL_DIRECT; } + + /* + * Ops calls are special, as count matters. + * As with direct calls, they must only be enabled when count + * is one, otherwise they'll be handled via the list ops. + */ + if (ftrace_rec_count(rec) == 1) { + if (!(rec->flags & FTRACE_FL_CALL_OPS) != + !(rec->flags & FTRACE_FL_CALL_OPS_EN)) + flag |= FTRACE_FL_CALL_OPS; + } else if (rec->flags & FTRACE_FL_CALL_OPS_EN) { + flag |= FTRACE_FL_CALL_OPS; + } } /* If the state of this record hasn't changed, then do nothing */ @@@ -2288,21 -2234,6 +2288,21 @@@ rec->flags &= ~FTRACE_FL_DIRECT_EN; } } + + if (flag & FTRACE_FL_CALL_OPS) { + if (ftrace_rec_count(rec) == 1) { + if (rec->flags & FTRACE_FL_CALL_OPS) + rec->flags |= FTRACE_FL_CALL_OPS_EN; + else + rec->flags &= ~FTRACE_FL_CALL_OPS_EN; + } else { + /* + * Can only call directly if there's + * only one set of associated ops. + */ + rec->flags &= ~FTRACE_FL_CALL_OPS_EN; + } + } } /* @@@ -2332,8 -2263,7 +2332,8 @@@ * and REGS states. The _EN flags must be disabled though. */ rec->flags &= ~(FTRACE_FL_ENABLED | FTRACE_FL_TRAMP_EN | - FTRACE_FL_REGS_EN | FTRACE_FL_DIRECT_EN); + FTRACE_FL_REGS_EN | FTRACE_FL_DIRECT_EN | + FTRACE_FL_CALL_OPS_EN); } ftrace_bug_type = FTRACE_BUG_NOP; @@@ -2506,25 -2436,6 +2506,25 @@@ ftrace_find_tramp_ops_new(struct dyn_ft return NULL; } +struct ftrace_ops * +ftrace_find_unique_ops(struct dyn_ftrace *rec) +{ + struct ftrace_ops *op, *found = NULL; + unsigned long ip = rec->ip; + + do_for_each_ftrace_op(op, ftrace_ops_list) { + + if (hash_contains_ip(ip, op->func_hash)) { + if (found) + return NULL; + found = op; + } + + } while_for_each_ftrace_op(op); + + return found; +} + #ifdef CONFIG_DYNAMIC_FTRACE_WITH_DIRECT_CALLS /* Protected by rcu_tasks for reading, and direct_mutex for writing */ static struct ftrace_hash *direct_functions = EMPTY_HASH; @@@ -3874,12 -3785,11 +3874,12 @@@ static int t_show(struct seq_file *m, v if (iter->flags & FTRACE_ITER_ENABLED) { struct ftrace_ops *ops; - seq_printf(m, " (%ld)%s%s%s", + seq_printf(m, " (%ld)%s%s%s%s", ftrace_rec_count(rec), rec->flags & FTRACE_FL_REGS ? " R" : " ", rec->flags & FTRACE_FL_IPMODIFY ? " I" : " ", - rec->flags & FTRACE_FL_DIRECT ? " D" : " "); + rec->flags & FTRACE_FL_DIRECT ? " D" : " ", + rec->flags & FTRACE_FL_CALL_OPS ? " O" : " "); if (rec->flags & FTRACE_FL_TRAMP_EN) { ops = ftrace_find_tramp_ops_any(rec); if (ops) { @@@ -3895,15 -3805,6 +3895,15 @@@ } else { add_trampoline_func(m, NULL, rec); } + if (rec->flags & FTRACE_FL_CALL_OPS_EN) { + ops = ftrace_find_unique_ops(rec); + if (ops) { + seq_printf(m, "\tops: %pS (%pS)", + ops, ops->func); + } else { + seq_puts(m, "\tops: ERROR!"); + } + } if (rec->flags & FTRACE_FL_DIRECT) { unsigned long direct; @@@ -8444,7 -8345,7 +8444,7 @@@ int ftrace_lookup_symbols(const char ** found_all = kallsyms_on_each_symbol(kallsyms_callback, &args); if (found_all) return 0; - found_all = module_kallsyms_on_each_symbol(kallsyms_callback, &args); + found_all = module_kallsyms_on_each_symbol(NULL, kallsyms_callback, &args); return found_all ? 0 : -ESRCH; } diff --combined net/rxrpc/ar-internal.h index 3931a4bba8af,9e19688b0e06..67b0a894162d --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@@ -149,7 -149,7 +149,7 @@@ struct rxrpc_sock struct list_head sock_calls; /* List of calls owned by this socket */ struct list_head to_be_accepted; /* calls awaiting acceptance */ struct list_head recvmsg_q; /* Calls awaiting recvmsg's attention */ - rwlock_t recvmsg_lock; /* Lock for recvmsg_q */ + spinlock_t recvmsg_lock; /* Lock for recvmsg_q */ struct key *key; /* security for this socket */ struct key *securities; /* list of server security descriptors */ struct rb_root calls; /* User ID -> call mapping */ @@@ -284,7 -284,9 +284,9 @@@ struct rxrpc_local struct task_struct *io_thread; struct completion io_thread_ready; /* Indication that the I/O thread started */ struct rxrpc_sock *service; /* Service(s) listening on this endpoint */ - struct rw_semaphore defrag_sem; /* control re-enablement of IP DF bit */ + #ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY + struct sk_buff_head rx_delay_queue; /* Delay injection queue */ + #endif struct sk_buff_head rx_queue; /* Received packets */ struct list_head conn_attend_q; /* Conns requiring immediate attention */ struct list_head call_attend_q; /* Calls requiring immediate attention */ @@@ -688,9 -690,11 +690,11 @@@ struct rxrpc_call /* Receive-phase ACK management (ACKs we send). */ u8 ackr_reason; /* reason to ACK */ + u16 ackr_sack_base; /* Starting slot in SACK table ring */ rxrpc_serial_t ackr_serial; /* serial of packet being ACK'd */ - atomic64_t ackr_window; /* Base (in LSW) and top (in MSW) of SACK window */ - atomic_t ackr_nr_unacked; /* Number of unacked packets */ + rxrpc_seq_t ackr_window; /* Base of SACK window */ + rxrpc_seq_t ackr_wtop; /* Base of SACK window */ + unsigned int ackr_nr_unacked; /* Number of unacked packets */ atomic_t ackr_nr_consumed; /* Number of packets needing hard ACK */ struct { #define RXRPC_SACK_SIZE 256 @@@ -795,7 -799,7 +799,7 @@@ struct rxrpc_txbuf u8 data[RXRPC_JUMBO_DATALEN]; /* Data packet */ struct { struct rxrpc_ackpacket ack; - u8 acks[0]; + DECLARE_FLEX_ARRAY(u8, acks); }; }; } __aligned(64); @@@ -1109,6 -1113,9 +1113,9 @@@ extern unsigned long rxrpc_idle_ack_del extern unsigned int rxrpc_rx_window_size; extern unsigned int rxrpc_rx_mtu; extern unsigned int rxrpc_rx_jumbo_max; + #ifdef CONFIG_AF_RXRPC_INJECT_RX_DELAY + extern unsigned long rxrpc_inject_rx_delay; + #endif /* * net_ns.c diff --combined net/socket.c index c6c44e26e954,4080b4ba7daf..6bae8ce7059e --- a/net/socket.c +++ b/net/socket.c @@@ -106,6 -106,7 +106,7 @@@ #include <net/busy_poll.h> #include <linux/errqueue.h> #include <linux/ptp_clock_kernel.h> + #include <trace/events/sock.h> #ifdef CONFIG_NET_RX_BUSY_POLL unsigned int sysctl_net_busy_read __read_mostly; @@@ -385,7 -386,7 +386,7 @@@ static const struct xattr_handler sockf }; static int sockfs_security_xattr_set(const struct xattr_handler *handler, - struct user_namespace *mnt_userns, + struct mnt_idmap *idmap, struct dentry *dentry, struct inode *inode, const char *suffix, const void *value, size_t size, int flags) @@@ -589,10 -590,10 +590,10 @@@ static ssize_t sockfs_listxattr(struct return used; } -static int sockfs_setattr(struct user_namespace *mnt_userns, +static int sockfs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, struct iattr *iattr) { - int err = simple_setattr(&init_user_ns, dentry, iattr); + int err = simple_setattr(&nop_mnt_idmap, dentry, iattr); if (!err && (iattr->ia_valid & ATTR_UID)) { struct socket *sock = SOCKET_I(d_inode(dentry)); @@@ -709,12 -710,22 +710,22 @@@ INDIRECT_CALLABLE_DECLARE(int inet_send size_t)); INDIRECT_CALLABLE_DECLARE(int inet6_sendmsg(struct socket *, struct msghdr *, size_t)); + + static noinline void call_trace_sock_send_length(struct sock *sk, int ret, + int flags) + { + trace_sock_send_length(sk, ret, 0); + } + static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg) { int ret = INDIRECT_CALL_INET(sock->ops->sendmsg, inet6_sendmsg, inet_sendmsg, sock, msg, msg_data_left(msg)); BUG_ON(ret == -EIOCBQUEUED); + + if (trace_sock_send_length_enabled()) + call_trace_sock_send_length(sock->sk, ret, 0); return ret; } @@@ -992,12 -1003,21 +1003,21 @@@ INDIRECT_CALLABLE_DECLARE(int inet_recv size_t, int)); INDIRECT_CALLABLE_DECLARE(int inet6_recvmsg(struct socket *, struct msghdr *, size_t, int)); + + static noinline void call_trace_sock_recv_length(struct sock *sk, int ret, int flags) + { + trace_sock_recv_length(sk, ret, flags); + } + static inline int sock_recvmsg_nosec(struct socket *sock, struct msghdr *msg, int flags) { - return INDIRECT_CALL_INET(sock->ops->recvmsg, inet6_recvmsg, - inet_recvmsg, sock, msg, msg_data_left(msg), - flags); + int ret = INDIRECT_CALL_INET(sock->ops->recvmsg, inet6_recvmsg, + inet_recvmsg, sock, msg, + msg_data_left(msg), flags); + if (trace_sock_recv_length_enabled()) + call_trace_sock_recv_length(sock->sk, ret, flags); + return ret; } /** @@@ -1047,6 -1067,7 +1067,7 @@@ static ssize_t sock_sendpage(struct fil { struct socket *sock; int flags; + int ret; sock = file->private_data; @@@ -1054,7 -1075,11 +1075,11 @@@ /* more is a combination of MSG_MORE and MSG_SENDPAGE_NOTLAST */ flags |= more; - return kernel_sendpage(sock, page, offset, size, flags); + ret = kernel_sendpage(sock, page, offset, size, flags); + + if (trace_sock_send_length_enabled()) + call_trace_sock_send_length(sock->sk, ret, 0); + return ret; } static ssize_t sock_splice_read(struct file *file, loff_t *ppos, diff --combined net/sunrpc/svcsock.c index 91252adcae46,99eafe87b1d5..8bcc8c3ffbfe --- a/net/sunrpc/svcsock.c +++ b/net/sunrpc/svcsock.c @@@ -55,6 -55,7 +55,7 @@@ #include <linux/sunrpc/stats.h> #include <linux/sunrpc/xprt.h> + #include <trace/events/sock.h> #include <trace/events/sunrpc.h> #include "socklib.h" @@@ -252,8 -253,11 +253,8 @@@ static ssize_t svc_tcp_read_msg(struct clear_bit(XPT_DATA, &svsk->sk_xprt.xpt_flags); - for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) { - bvec[i].bv_page = rqstp->rq_pages[i]; - bvec[i].bv_len = PAGE_SIZE; - bvec[i].bv_offset = 0; - } + for (i = 0, t = 0; t < buflen; i++, t += PAGE_SIZE) + bvec_set_page(&bvec[i], rqstp->rq_pages[i], PAGE_SIZE, 0); rqstp->rq_respages = &rqstp->rq_pages[i]; rqstp->rq_next_page = rqstp->rq_respages + 1; @@@ -307,6 -311,8 +308,8 @@@ static void svc_data_ready(struct sock { struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; + trace_sk_data_ready(sk); + if (svsk) { /* Refer to svc_setup_socket() for details. */ rmb(); @@@ -684,6 -690,8 +687,8 @@@ static void svc_tcp_listen_data_ready(s { struct svc_sock *svsk = (struct svc_sock *)sk->sk_user_data; + trace_sk_data_ready(sk); + if (svsk) { /* Refer to svc_setup_socket() for details. */ rmb(); diff --combined net/tls/tls_sw.c index 7c5de4afbe99,6d0a534b7baa..782d3701b86f --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@@ -38,12 -38,12 +38,13 @@@ #include <linux/bug.h> #include <linux/sched/signal.h> #include <linux/module.h> +#include <linux/kernel.h> #include <linux/splice.h> #include <crypto/aead.h> #include <net/strparser.h> #include <net/tls.h> + #include <trace/events/sock.h> #include "tls.h" @@@ -58,7 -58,6 +59,7 @@@ struct tls_decrypt_arg }; struct tls_decrypt_ctx { + struct sock *sk; u8 iv[MAX_IV_SIZE]; u8 aad[TLS_MAX_AAD_SIZE]; u8 tail; @@@ -179,25 -178,18 +180,25 @@@ static int tls_padding_length(struct tl return sub; } -static void tls_decrypt_done(struct crypto_async_request *req, int err) +static void tls_decrypt_done(void *data, int err) { - struct aead_request *aead_req = (struct aead_request *)req; + struct aead_request *aead_req = data; + struct crypto_aead *aead = crypto_aead_reqtfm(aead_req); struct scatterlist *sgout = aead_req->dst; struct scatterlist *sgin = aead_req->src; struct tls_sw_context_rx *ctx; + struct tls_decrypt_ctx *dctx; struct tls_context *tls_ctx; struct scatterlist *sg; unsigned int pages; struct sock *sk; + int aead_size; + + aead_size = sizeof(*aead_req) + crypto_aead_reqsize(aead); + aead_size = ALIGN(aead_size, __alignof__(*dctx)); + dctx = (void *)((u8 *)aead_req + aead_size); - sk = (struct sock *)req->data; + sk = dctx->sk; tls_ctx = tls_get_ctx(sk); ctx = tls_sw_ctx_rx(tls_ctx); @@@ -249,7 -241,7 +250,7 @@@ static int tls_do_decryption(struct soc if (darg->async) { aead_request_set_callback(aead_req, CRYPTO_TFM_REQ_MAY_BACKLOG, - tls_decrypt_done, sk); + tls_decrypt_done, aead_req); atomic_inc(&ctx->decrypt_pending); } else { aead_request_set_callback(aead_req, @@@ -345,8 -337,6 +346,8 @@@ static struct tls_rec *tls_get_rec(stru sg_set_buf(&rec->sg_aead_out[0], rec->aad_space, prot->aad_size); sg_unmark_end(&rec->sg_aead_out[1]); + rec->sk = sk; + return rec; } @@@ -428,25 -418,22 +429,25 @@@ tx_err return rc; } -static void tls_encrypt_done(struct crypto_async_request *req, int err) +static void tls_encrypt_done(void *data, int err) { - struct aead_request *aead_req = (struct aead_request *)req; - struct sock *sk = req->data; - struct tls_context *tls_ctx = tls_get_ctx(sk); - struct tls_prot_info *prot = &tls_ctx->prot_info; - struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx); + struct tls_sw_context_tx *ctx; + struct tls_context *tls_ctx; + struct tls_prot_info *prot; + struct tls_rec *rec = data; struct scatterlist *sge; struct sk_msg *msg_en; - struct tls_rec *rec; bool ready = false; + struct sock *sk; int pending; - rec = container_of(aead_req, struct tls_rec, aead_req); msg_en = &rec->msg_encrypted; + sk = rec->sk; + tls_ctx = tls_get_ctx(sk); + prot = &tls_ctx->prot_info; + ctx = tls_sw_ctx_tx(tls_ctx); + sge = sk_msg_elem(msg_en, msg_en->sg.curr); sge->offset -= prot->prepend_size; sge->length += prot->prepend_size; @@@ -534,7 -521,7 +535,7 @@@ static int tls_do_encryption(struct soc data_len, rec->iv_data); aead_request_set_callback(aead_req, CRYPTO_TFM_REQ_MAY_BACKLOG, - tls_encrypt_done, sk); + tls_encrypt_done, rec); /* Add the record in tx_list */ list_add_tail((struct list_head *)&rec->list, &ctx->tx_list); @@@ -1499,7 -1486,6 +1500,7 @@@ static int tls_decrypt_sg(struct sock * * Both structs are variable length. */ aead_size = sizeof(*aead_req) + crypto_aead_reqsize(ctx->aead_recv); + aead_size = ALIGN(aead_size, __alignof__(*dctx)); mem = kmalloc(aead_size + struct_size(dctx, sg, n_sgin + n_sgout), sk->sk_allocation); if (!mem) { @@@ -1510,7 -1496,6 +1511,7 @@@ /* Segment the allocated memory */ aead_req = (struct aead_request *)mem; dctx = (struct tls_decrypt_ctx *)(mem + aead_size); + dctx->sk = sk; sgin = &dctx->sg[0]; sgout = &dctx->sg[n_sgin]; @@@ -2300,6 -2285,8 +2301,8 @@@ static void tls_data_ready(struct sock struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx); struct sk_psock *psock; + trace_sk_data_ready(sk); + tls_strp_data_ready(&ctx->strp); psock = sk_psock_get(sk); diff --combined net/unix/af_unix.c index 81ff98298996,0be25e712c28..347122c3575e --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@@ -112,6 -112,7 +112,7 @@@ #include <linux/mount.h> #include <net/checksum.h> #include <linux/security.h> + #include <linux/splice.h> #include <linux/freezer.h> #include <linux/file.h> #include <linux/btf_ids.h> @@@ -807,23 -808,23 +808,23 @@@ static int unix_count_nr_fds(struct soc static void unix_show_fdinfo(struct seq_file *m, struct socket *sock) { struct sock *sk = sock->sk; + unsigned char s_state; struct unix_sock *u; - int nr_fds; + int nr_fds = 0; if (sk) { + s_state = READ_ONCE(sk->sk_state); u = unix_sk(sk); - if (sock->type == SOCK_DGRAM) { - nr_fds = atomic_read(&u->scm_stat.nr_fds); - goto out_print; - } - unix_state_lock(sk); - if (sk->sk_state != TCP_LISTEN) + /* SOCK_STREAM and SOCK_SEQPACKET sockets never change their + * sk_state after switching to TCP_ESTABLISHED or TCP_LISTEN. + * SOCK_DGRAM is ordinary. So, no lock is needed. + */ + if (sock->type == SOCK_DGRAM || s_state == TCP_ESTABLISHED) nr_fds = atomic_read(&u->scm_stat.nr_fds); - else + else if (s_state == TCP_LISTEN) nr_fds = unix_count_nr_fds(sk); - unix_state_unlock(sk); - out_print: + seq_printf(m, "scm_fds: %u\n", nr_fds); } } @@@ -1190,7 -1191,7 +1191,7 @@@ static int unix_bind_bsd(struct sock *s unsigned int new_hash, old_hash = sk->sk_hash; struct unix_sock *u = unix_sk(sk); struct net *net = sock_net(sk); - struct user_namespace *ns; // barf... + struct mnt_idmap *idmap; struct unix_address *addr; struct dentry *dentry; struct path parent; @@@ -1217,10 -1218,10 +1218,10 @@@ /* * All right, let's create it. */ - ns = mnt_user_ns(parent.mnt); + idmap = mnt_idmap(parent.mnt); err = security_path_mknod(&parent, dentry, mode, 0); if (!err) - err = vfs_mknod(ns, d_inode(parent.dentry), dentry, mode, 0); + err = vfs_mknod(idmap, d_inode(parent.dentry), dentry, mode, 0); if (err) goto out_path; err = mutex_lock_interruptible(&u->bindlock); @@@ -1245,7 -1246,7 +1246,7 @@@ out_unlock err = -EINVAL; out_unlink: /* failed after successful mknod? unlink what we'd created... */ - vfs_unlink(ns, d_inode(parent.dentry), dentry, NULL); + vfs_unlink(idmap, d_inode(parent.dentry), dentry, NULL); out_path: done_path_create(&parent, dentry); out: diff --combined tools/testing/selftests/bpf/progs/profiler.inc.h index 7bd76b9e0f98,68a3fd7387a4..875513866032 --- a/tools/testing/selftests/bpf/progs/profiler.inc.h +++ b/tools/testing/selftests/bpf/progs/profiler.inc.h @@@ -156,10 -156,10 +156,10 @@@ probe_read_lim(void* dst, void* src, un { len = len < max ? len : max; if (len > 1) { - if (bpf_probe_read(dst, len, src)) + if (bpf_probe_read_kernel(dst, len, src)) return 0; } else if (len == 1) { - if (bpf_probe_read(dst, 1, src)) + if (bpf_probe_read_kernel(dst, 1, src)) return 0; } return len; @@@ -216,7 -216,8 +216,8 @@@ static INLINE void* read_full_cgroup_pa #endif for (int i = 0; i < MAX_CGROUPS_PATH_DEPTH; i++) { filepart_length = - bpf_probe_read_str(payload, MAX_PATH, BPF_CORE_READ(cgroup_node, name)); + bpf_probe_read_kernel_str(payload, MAX_PATH, + BPF_CORE_READ(cgroup_node, name)); if (!cgroup_node) return payload; if (cgroup_node == cgroup_root_node) @@@ -303,7 -304,8 +304,8 @@@ static INLINE void* populate_cgroup_inf cgroup_data->cgroup_full_length = 0; size_t cgroup_root_length = - bpf_probe_read_str(payload, MAX_PATH, BPF_CORE_READ(root_kernfs, name)); + bpf_probe_read_kernel_str(payload, MAX_PATH, + BPF_CORE_READ(root_kernfs, name)); barrier_var(cgroup_root_length); if (cgroup_root_length <= MAX_PATH) { barrier_var(cgroup_root_length); @@@ -312,7 -314,8 +314,8 @@@ } size_t cgroup_proc_length = - bpf_probe_read_str(payload, MAX_PATH, BPF_CORE_READ(proc_kernfs, name)); + bpf_probe_read_kernel_str(payload, MAX_PATH, + BPF_CORE_READ(proc_kernfs, name)); barrier_var(cgroup_proc_length); if (cgroup_proc_length <= MAX_PATH) { barrier_var(cgroup_proc_length); @@@ -395,7 -398,8 +398,8 @@@ static INLINE int trace_var_sys_kill(vo arr_struct = bpf_map_lookup_elem(&data_heap, &zero); if (arr_struct == NULL) return 0; - bpf_probe_read(&arr_struct->array[0], sizeof(arr_struct->array[0]), kill_data); + bpf_probe_read_kernel(&arr_struct->array[0], + sizeof(arr_struct->array[0]), kill_data); } else { int index = get_var_spid_index(arr_struct, spid); @@@ -409,8 -413,9 +413,9 @@@ #endif for (int i = 0; i < ARRAY_SIZE(arr_struct->array); i++) if (arr_struct->array[i].meta.pid == 0) { - bpf_probe_read(&arr_struct->array[i], - sizeof(arr_struct->array[i]), kill_data); + bpf_probe_read_kernel(&arr_struct->array[i], + sizeof(arr_struct->array[i]), + kill_data); bpf_map_update_elem(&var_tpid_to_data, &tpid, arr_struct, 0); @@@ -427,17 -432,17 +432,17 @@@ if (delta_sec < STALE_INFO) { kill_data->kill_count++; kill_data->last_kill_time = bpf_ktime_get_ns(); - bpf_probe_read(&arr_struct->array[index], - sizeof(arr_struct->array[index]), - kill_data); + bpf_probe_read_kernel(&arr_struct->array[index], + sizeof(arr_struct->array[index]), + kill_data); } else { struct var_kill_data_t* kill_data = get_var_kill_data(ctx, spid, tpid, sig); if (kill_data == NULL) return 0; - bpf_probe_read(&arr_struct->array[index], - sizeof(arr_struct->array[index]), - kill_data); + bpf_probe_read_kernel(&arr_struct->array[index], + sizeof(arr_struct->array[index]), + kill_data); } } bpf_map_update_elem(&var_tpid_to_data, &tpid, arr_struct, 0); @@@ -487,8 -492,9 +492,9 @@@ read_absolute_file_path_from_dentry(str #pragma unroll #endif for (int i = 0; i < MAX_PATH_DEPTH; i++) { - filepart_length = bpf_probe_read_str(payload, MAX_PATH, - BPF_CORE_READ(filp_dentry, d_name.name)); + filepart_length = + bpf_probe_read_kernel_str(payload, MAX_PATH, + BPF_CORE_READ(filp_dentry, d_name.name)); barrier_var(filepart_length); if (filepart_length > MAX_PATH) break; @@@ -572,7 -578,8 +578,8 @@@ ssize_t BPF_KPROBE(kprobe__proc_sys_wri sysctl_data->sysctl_val_length = 0; sysctl_data->sysctl_path_length = 0; - size_t sysctl_val_length = bpf_probe_read_str(payload, CTL_MAXNAME, buf); + size_t sysctl_val_length = bpf_probe_read_kernel_str(payload, + CTL_MAXNAME, buf); barrier_var(sysctl_val_length); if (sysctl_val_length <= CTL_MAXNAME) { barrier_var(sysctl_val_length); @@@ -580,8 -587,10 +587,10 @@@ payload += sysctl_val_length; } - size_t sysctl_path_length = bpf_probe_read_str(payload, MAX_PATH, - BPF_CORE_READ(filp, f_path.dentry, d_name.name)); + size_t sysctl_path_length = + bpf_probe_read_kernel_str(payload, MAX_PATH, + BPF_CORE_READ(filp, f_path.dentry, + d_name.name)); barrier_var(sysctl_path_length); if (sysctl_path_length <= MAX_PATH) { barrier_var(sysctl_path_length); @@@ -638,7 -647,8 +647,8 @@@ int raw_tracepoint__sched_process_exit( struct var_kill_data_t* past_kill_data = &arr_struct->array[i]; if (past_kill_data != NULL && past_kill_data->kill_target_pid == tpid) { - bpf_probe_read(kill_data, sizeof(*past_kill_data), past_kill_data); + bpf_probe_read_kernel(kill_data, sizeof(*past_kill_data), + past_kill_data); void* payload = kill_data->payload; size_t offset = kill_data->payload_length; if (offset >= MAX_METADATA_PAYLOAD_LEN + MAX_CGROUP_PAYLOAD_LEN) @@@ -656,8 -666,10 +666,10 @@@ payload += comm_length; } - size_t cgroup_proc_length = bpf_probe_read_str(payload, KILL_TARGET_LEN, - BPF_CORE_READ(proc_kernfs, name)); + size_t cgroup_proc_length = + bpf_probe_read_kernel_str(payload, + KILL_TARGET_LEN, + BPF_CORE_READ(proc_kernfs, name)); barrier_var(cgroup_proc_length); if (cgroup_proc_length <= KILL_TARGET_LEN) { barrier_var(cgroup_proc_length); @@@ -718,7 -730,8 +730,8 @@@ int raw_tracepoint__sched_process_exec( proc_exec_data->parent_start_time = BPF_CORE_READ(parent_task, start_time); const char* filename = BPF_CORE_READ(bprm, filename); - size_t bin_path_length = bpf_probe_read_str(payload, MAX_FILENAME_LEN, filename); + size_t bin_path_length = + bpf_probe_read_kernel_str(payload, MAX_FILENAME_LEN, filename); barrier_var(bin_path_length); if (bin_path_length <= MAX_FILENAME_LEN) { barrier_var(bin_path_length); @@@ -826,7 -839,7 +839,7 @@@ out SEC("kprobe/vfs_link") int BPF_KPROBE(kprobe__vfs_link, - struct dentry* old_dentry, struct user_namespace *mnt_userns, + struct dentry* old_dentry, struct mnt_idmap *idmap, struct inode* dir, struct dentry* new_dentry, struct inode** delegated_inode) { @@@ -922,7 -935,8 +935,8 @@@ int BPF_KPROBE(kprobe__vfs_symlink, str filemod_data->payload); payload = populate_cgroup_info(&filemod_data->cgroup_data, task, payload); - size_t len = bpf_probe_read_str(payload, MAX_FILEPATH_LENGTH, oldname); + size_t len = bpf_probe_read_kernel_str(payload, MAX_FILEPATH_LENGTH, + oldname); barrier_var(len); if (len <= MAX_FILEPATH_LENGTH) { barrier_var(len); -- LinuxNextTracking

1 0

Build check errors found: 2023-02-23
by postmaster＠open-mesh.org 23 Feb '23

23 Feb '23

Name of failed tests ==================== stable ------ * difference between net and batadv stable Output of different failed tests ================================ stable: difference between net and batadv stable ------------------------------------------------ net/Documentation/networking/batman-adv.rst | 2 net/net/batman-adv/bat_iv_ogm.c | 1 net/net/batman-adv/bat_v_elp.c | 1 net/net/batman-adv/bat_v_ogm.c | 5 net/net/batman-adv/distributed-arp-table.c | 2 net/net/batman-adv/gateway_common.c | 2 net/net/batman-adv/main.h | 2 net/net/batman-adv/multicast.c | 251 +------------------ net/net/batman-adv/multicast.h | 38 -- net/net/batman-adv/network-coding.c | 4 net/net/batman-adv/routing.c | 7 net/net/batman-adv/soft-interface.c | 26 - net/net/batman-adv/translation-table.c | 4 net/net/batman-adv/tvlv.c | 71 +++-- net/net/batman-adv/tvlv.h | 9 net/net/batman-adv/types.h | 6 16 files changed, 108 insertions(+), 323 deletions(-) Statistics ========== main ---- Failed tests: 0 Started build tests: 245 Tested Linux versions: 36 Tested configs: 110 stable ------ Failed tests: 1 Started build tests: 291 Tested Linux versions: 36 Tested configs: 116

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linux-merge February 2023