]> Git Repo - linux.git/commitdiff
Merge tag 'char-misc-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <[email protected]>
Fri, 1 Sep 2023 16:53:54 +0000 (09:53 -0700)
committerLinus Torvalds <[email protected]>
Fri, 1 Sep 2023 16:53:54 +0000 (09:53 -0700)
Pull char/misc driver updates from Greg KH:
 "Here is the big set of char/misc and other small driver subsystem
  changes for 6.6-rc1.

  Stuff all over the place here, lots of driver updates and changes and
  new additions. Short summary is:

   - new IIO drivers and updates

   - Interconnect driver updates

   - fpga driver updates and additions

   - fsi driver updates

   - mei driver updates

   - coresight driver updates

   - nvmem driver updates

   - counter driver updates

   - lots of smaller misc and char driver updates and additions

  All of these have been in linux-next for a long time with no reported
  problems"

* tag 'char-misc-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (267 commits)
  nvmem: core: Notify when a new layout is registered
  nvmem: core: Do not open-code existing functions
  nvmem: core: Return NULL when no nvmem layout is found
  nvmem: core: Create all cells before adding the nvmem device
  nvmem: u-boot-env:: Replace zero-length array with DECLARE_FLEX_ARRAY() helper
  nvmem: sec-qfprom: Add Qualcomm secure QFPROM support
  dt-bindings: nvmem: sec-qfprom: Add bindings for secure qfprom
  dt-bindings: nvmem: Add compatible for QCM2290
  nvmem: Kconfig: Fix typo "drive" -> "driver"
  nvmem: Explicitly include correct DT includes
  nvmem: add new NXP QorIQ eFuse driver
  dt-bindings: nvmem: Add t1023-sfp efuse support
  dt-bindings: nvmem: qfprom: Add compatible for MSM8226
  nvmem: uniphier: Use devm_platform_get_and_ioremap_resource()
  nvmem: qfprom: do some cleanup
  nvmem: stm32-romem: Use devm_platform_get_and_ioremap_resource()
  nvmem: rockchip-efuse: Use devm_platform_get_and_ioremap_resource()
  nvmem: meson-mx-efuse: Convert to devm_platform_ioremap_resource()
  nvmem: lpc18xx_otp: Convert to devm_platform_ioremap_resource()
  nvmem: brcm_nvram: Use devm_platform_get_and_ioremap_resource()
  ...

1  2 
Documentation/devicetree/bindings/iio/frequency/adi,admv1014.yaml
MAINTAINERS
drivers/acpi/arm64/amba.c
drivers/android/binderfs.c
drivers/firmware/stratix10-rsu.c
drivers/hwmon/peci/dimmtemp.c

index d17601dbc498f0ce665af1a85fdf225396e5f6af,8e4c5ff0da1423646f68ea26f0be3fb694c17a51..39cc63a117625cf73cc1d62cdc6210afbb7bb675
@@@ -33,7 -33,7 +33,7 @@@ properties
      items:
        - const: lo_in
      description:
 -      External clock that provides the Local Oscilator input.
 +      External clock that provides the Local Oscillator input.
  
    vcm-supply:
      description:
@@@ -103,6 -103,14 +103,14 @@@ required
    - clocks
    - clock-names
    - vcm-supply
+   - vcc-if-bb-supply
+   - vcc-vga-supply
+   - vcc-vva-supply
+   - vcc-lna-3p3-supply
+   - vcc-lna-1p5-supply
+   - vcc-bg-supply
+   - vcc-quad-supply
+   - vcc-mixer-supply
  
  allOf:
    - $ref: /schemas/spi/spi-peripheral-props.yaml#
diff --combined MAINTAINERS
index 3956f37fd715d744d9805c7036ae036e29860e0f,8ac89758d009d1b50eed08e37533d430f1176a11..862931dc09d4f333a25b7f85a11e5af2cf69863f
@@@ -915,18 -915,6 +915,18 @@@ S:       Supporte
  F:    drivers/crypto/ccp/sev*
  F:    include/uapi/linux/psp-sev.h
  
 +AMD CRYPTOGRAPHIC COPROCESSOR (CCP) DRIVER - DBC SUPPORT
 +M:    Mario Limonciello <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/crypto/ccp/dbc.c
 +F:    drivers/crypto/ccp/dbc.h
 +F:    drivers/crypto/ccp/platform-access.c
 +F:    drivers/crypto/ccp/platform-access.h
 +F:    include/uapi/linux/psp-dbc.h
 +F:    tools/crypto/ccp/*.c
 +F:    tools/crypto/ccp/*.py
 +
  AMD DISPLAY CORE
  M:    Harry Wentland <[email protected]>
  M:    Leo Li <[email protected]>
@@@ -1018,7 -1006,7 +1018,7 @@@ AMD PMC DRIVE
  M:    Shyam Sundar S K <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    drivers/platform/x86/amd/pmc.c
 +F:    drivers/platform/x86/amd/pmc/
  
  AMD PMF DRIVER
  M:    Shyam Sundar S K <[email protected]>
@@@ -1570,10 -1558,9 +1570,10 @@@ M:    Olof Johansson <[email protected]
  M:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 +P:    Documentation/process/maintainer-soc.rst
  C:    irc://irc.libera.chat/armlinux
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
 -F:    Documentation/process/maintainer-soc.rst
 +F:    Documentation/process/maintainer-soc*.rst
  F:    arch/arm/boot/dts/Makefile
  F:    arch/arm64/boot/dts/Makefile
  
@@@ -1856,7 -1843,6 +1856,7 @@@ F:      Documentation/devicetree/bindings/ph
  F:    arch/arm/boot/dts/amlogic/
  F:    arch/arm/mach-meson/
  F:    arch/arm64/boot/dts/amlogic/
 +F:    drivers/genpd/amlogic/
  F:    drivers/mmc/host/meson*
  F:    drivers/phy/amlogic/
  F:    drivers/pinctrl/meson/
@@@ -1919,7 -1905,6 +1919,7 @@@ F:      drivers/bluetooth/hci_bcm4377.
  F:    drivers/clk/clk-apple-nco.c
  F:    drivers/cpufreq/apple-soc-cpufreq.c
  F:    drivers/dma/apple-admac.c
 +F:    drivers/genpd/apple/
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
@@@ -2436,7 -2421,6 +2436,7 @@@ F:      arch/arm/mach-ux500
  F:    drivers/clk/clk-nomadik.c
  F:    drivers/clocksource/clksrc-dbx500-prcmu.c
  F:    drivers/dma/ste_dma40*
 +F:    drivers/genpd/st/ste-ux500-pm-domain.c
  F:    drivers/hwspinlock/u8500_hsem.c
  F:    drivers/i2c/busses/i2c-nomadik.c
  F:    drivers/iio/adc/ab8500-gpadc.c
@@@ -2509,6 -2493,16 +2509,6 @@@ S:     Maintaine
  W:    http://www.digriz.org.uk/ts78xx/kernel
  F:    arch/arm/mach-orion5x/ts78xx-*
  
 -ARM/OXNAS platform support
 -M:    Neil Armstrong <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 -L:    [email protected] (moderated for non-subscribers)
 -S:    Maintained
 -F:    arch/arm/boot/dts/ox8*.dts*
 -F:    arch/arm/mach-oxnas/
 -F:    drivers/power/reset/oxnas-restart.c
 -N:    oxnas
 -
  ARM/QUALCOMM CHROMEBOOK SUPPORT
  R:    [email protected]
  F:    arch/arm64/boot/dts/qcom/sc7180*
@@@ -2599,7 -2593,6 +2599,7 @@@ F:      arch/arm/include/debug/renesas-scif.
  F:    arch/arm/mach-shmobile/
  F:    arch/arm64/boot/dts/renesas/
  F:    arch/riscv/boot/dts/renesas/
 +F:    drivers/genpd/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  K:    \brenesas,
@@@ -2642,7 -2635,6 +2642,7 @@@ R:      Alim Akhtar <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
  S:    Maintained
 +P:    Documentation/process/maintainer-soc-clean-dts.rst
  Q:    https://patchwork.kernel.org/project/linux-samsung-soc/list/
  B:    mailto:[email protected]
  C:    irc://irc.libera.chat/linux-exynos
@@@ -2937,13 -2929,14 +2937,13 @@@ M:   Sudeep Holla <[email protected]
  M:    Lorenzo Pieralisi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
 -F:    */*/*/vexpress*
 -F:    */*/vexpress*
 -F:    arch/arm/boot/dts/arm/vexpress*
 +N:    mps2
 +N:    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
 -N:    mps2
 +X:    drivers/cpufreq/vexpress-spc-cpufreq.c
 +X:    Documentation/devicetree/bindings/arm/arm,vexpress-juno.yaml
  
  ARM/VFP SUPPORT
  M:    Russell King <[email protected]>
@@@ -3692,7 -3685,6 +3692,7 @@@ F:      include/linux/filter.
  F:    include/linux/tnum.h
  F:    kernel/bpf/core.c
  F:    kernel/bpf/dispatcher.c
 +F:    kernel/bpf/mprog.c
  F:    kernel/bpf/syscall.c
  F:    kernel/bpf/tnum.c
  F:    kernel/bpf/trampoline.c
@@@ -3703,7 -3695,7 +3703,7 @@@ R:      David Vernet <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 -F:    Documentation/bpf/instruction-set.rst
 +F:    Documentation/bpf/standardization/
  
  BPF [GENERAL] (Safe Dynamic Programs and Tools)
  M:    Alexei Starovoitov <[email protected]>
@@@ -3711,7 -3703,7 +3711,7 @@@ M:      Daniel Borkmann <[email protected]
  M:    Andrii Nakryiko <[email protected]>
  R:    Martin KaFai Lau <[email protected]>
  R:    Song Liu <[email protected]>
 -R:    Yonghong Song <y[email protected]>
 +R:    Yonghong Song <y[email protected]>
  R:    John Fastabend <[email protected]>
  R:    KP Singh <[email protected]>
  R:    Stanislav Fomichev <[email protected]>
@@@ -3750,7 -3742,7 +3750,7 @@@ F:      tools/lib/bpf
  F:    tools/testing/selftests/bpf/
  
  BPF [ITERATOR]
 -M:    Yonghong Song <y[email protected]>
 +M:    Yonghong Song <y[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    kernel/bpf/*iter.c
  S:    Maintained
  F:    kernel/bpf/bpf_struct*
  
 -BPF [NETWORKING] (tc BPF, sock_addr)
 +BPF [NETWORKING] (tcx & tc BPF, sock_addr)
  M:    Martin KaFai Lau <[email protected]>
  M:    Daniel Borkmann <[email protected]>
  R:    John Fastabend <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
 +F:    include/net/tcx.h
 +F:    kernel/bpf/tcx.c
  F:    net/core/filter.c
  F:    net/sched/act_bpf.c
  F:    net/sched/cls_bpf.c
@@@ -3846,15 -3836,6 +3846,15 @@@ S:    Maintaine
  F:    kernel/bpf/stackmap.c
  F:    kernel/trace/bpf_trace.c
  
 +BROADCOM ASP 2.0 ETHERNET DRIVER
 +M:    Justin Chen <[email protected]>
 +M:    Florian Fainelli <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/devicetree/bindings/net/brcm,asp-v2.0.yaml
 +F:    drivers/net/ethernet/broadcom/asp2/
 +
  BROADCOM B44 10/100 ETHERNET DRIVER
  M:    Michael Chan <[email protected]>
  L:    [email protected]
@@@ -4027,7 -4008,7 +4027,7 @@@ F:      arch/mips/kernel/*bmips
  F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
 -F:    drivers/soc/bcm/bcm63xx
 +F:    drivers/genpd/bcm/bcm63xx-power.c
  F:    include/linux/bcm963xx_nvram.h
  F:    include/linux/bcm963xx_tag.h
  
@@@ -4145,7 -4126,7 +4145,7 @@@ BROADCOM BCM6348/BCM6358 SPI controlle
  M:    Jonas Gorski <[email protected]>
  L:    [email protected]
  S:    Odd Fixes
 -F:    Documentation/devicetree/bindings/spi/spi-bcm63xx.txt
 +F:    Documentation/devicetree/bindings/spi/brcm,bcm63xx-spi.yaml
  F:    drivers/spi/spi-bcm63xx.c
  
  BROADCOM ETHERNET PHY DRIVERS
@@@ -4214,7 -4195,7 +4214,7 @@@ BROADCOM KONA GPIO DRIVE
  M:    Ray Jui <[email protected]>
  R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
 -F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/brcm,kona-gpio.yaml
  F:    drivers/gpio/gpio-bcm-kona.c
  
  BROADCOM MPI3 STORAGE CONTROLLER DRIVER
@@@ -4249,7 -4230,7 +4249,7 @@@ R:      Broadcom internal kernel review lis
  L:    [email protected]
  S:    Maintained
  T:    git https://github.com/broadcom/stblinux.git
 -F:    drivers/soc/bcm/bcm63xx/bcm-pmb.c
 +F:    drivers/genpd/bcm/bcm-pmb.c
  F:    include/dt-bindings/soc/bcm-pmb.h
  
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@@ -4838,7 -4819,6 +4838,7 @@@ F:      drivers/input/touchscreen/chipone_ic
  
  CHROME HARDWARE PLATFORM SUPPORT
  M:    Benson Leung <[email protected]>
 +M:    Tzung-Bi Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git
@@@ -4906,11 -4886,7 +4906,11 @@@ L:    [email protected] (moderat
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/sound/cirrus,cs*
 +F:    drivers/mfd/cs42l43*
 +F:    drivers/pinctrl/cirrus/pinctrl-cs42l43*
 +F:    drivers/spi/spi-cs42l43*
  F:    include/dt-bindings/sound/cs*
 +F:    include/linux/mfd/cs42l43*
  F:    include/sound/cs*
  F:    sound/pci/hda/cs*
  F:    sound/pci/hda/hda_cs_dsp_ctl.*
@@@ -5393,7 -5369,7 +5393,7 @@@ M:      Kukjin Kim <[email protected]
  R:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    arch/arm/mach-exynos/pm.c
  F:    drivers/cpuidle/cpuidle-exynos.c
  F:    include/linux/platform_data/cpuidle-exynos.h
@@@ -6033,7 -6009,7 +6033,7 @@@ F:      Documentation/devicetree/bindings/mf
  F:    Documentation/devicetree/bindings/mfd/dlg,da90*.yaml
  F:    Documentation/devicetree/bindings/regulator/da92*.txt
  F:    Documentation/devicetree/bindings/regulator/dlg,da9*.yaml
 -F:    Documentation/devicetree/bindings/regulator/slg51000.txt
 +F:    Documentation/devicetree/bindings/regulator/dlg,slg51000.yaml
  F:    Documentation/devicetree/bindings/sound/da[79]*.txt
  F:    Documentation/devicetree/bindings/thermal/da90??-thermal.txt
  F:    Documentation/devicetree/bindings/watchdog/da90??-wdt.txt
@@@ -6175,9 -6151,10 +6175,9 @@@ F:     kernel/dma
  DMA-BUF HEAPS FRAMEWORK
  M:    Sumit Semwal <[email protected]>
  R:    Benjamin Gaignard <[email protected]>
 -R:    Liam Mark <[email protected]>
 -R:    Laura Abbott <[email protected]>
  R:    Brian Starkey <[email protected]>
  R:    John Stultz <[email protected]>
 +R:    T.J. Mercier <[email protected]>
  L:    [email protected]
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
@@@ -6237,7 -6214,6 +6237,7 @@@ DOCUMENTATION PROCES
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/maintainer/
  F:    Documentation/process/
  
  DOCUMENTATION REPORTING ISSUES
@@@ -6420,7 -6396,6 +6420,7 @@@ F:      drivers/gpu/drm/aspeed
  DRM DRIVER FOR AST SERVER GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  R:    Thomas Zimmermann <[email protected]>
 +R:    Jocelyn Falempe <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6572,7 -6547,6 +6572,7 @@@ F:      drivers/gpu/drm/panel/panel-mantix-m
  DRM DRIVER FOR MGA G200 GRAPHICS CHIPS
  M:    Dave Airlie <[email protected]>
  R:    Thomas Zimmermann <[email protected]>
 +R:    Jocelyn Falempe <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -6972,13 -6946,6 +6972,13 @@@ T:    git git://anongit.freedesktop.org/dr
  F:    drivers/gpu/drm/lima/
  F:    include/uapi/drm/lima_drm.h
  
 +DRM DRIVERS FOR LOONGSON
 +M:    Sui Jingfeng <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/loongson/
 +
  DRM DRIVERS FOR MEDIATEK
  M:    Chun-Kuang Hu <[email protected]>
  M:    Philipp Zabel <[email protected]>
@@@ -7048,7 -7015,7 +7048,7 @@@ F:      drivers/gpu/drm/st
  
  DRM DRIVERS FOR TI KEYSTONE
  M:    Jyri Sarha <[email protected]>
 -M:    Tomi Valkeinen <tom[email protected]>
 +M:    Tomi Valkeinen <tom[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7059,18 -7026,16 +7059,18 @@@ F:   drivers/gpu/drm/tidss
  
  DRM DRIVERS FOR TI LCDC
  M:    Jyri Sarha <[email protected]>
 -R:    Tomi Valkeinen <[email protected]>
 +M:    Tomi Valkeinen <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/tilcdc/
  F:    drivers/gpu/drm/tilcdc/
  
  DRM DRIVERS FOR TI OMAP
 -M:    Tomi Valkeinen <tom[email protected]>
 +M:    Tomi Valkeinen <tom[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/ti/
  F:    drivers/gpu/drm/omapdrm/
  
  S:    Supported
  F:    drivers/mmc/host/cqhci*
  
 +EMS CPC-PCI CAN DRIVER
 +M:    Gerhard Uttenthaler <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/can/sja1000/ems_pci.c
 +
  EMULEX 10Gbps iSCSI - OneConnect DRIVER
  M:    Ketan Mukadam <[email protected]>
  L:    [email protected]
@@@ -7774,7 -7732,6 +7774,7 @@@ F:      include/linux/mii.
  F:    include/linux/of_net.h
  F:    include/linux/phy.h
  F:    include/linux/phy_fixed.h
 +F:    include/linux/phylib_stubs.h
  F:    include/linux/platform_data/mdio-bcm-unimac.h
  F:    include/linux/platform_data/mdio-gpio.h
  F:    include/trace/events/mdio.h
@@@ -8394,6 -8351,7 +8394,6 @@@ L:      [email protected]
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/freescale/fs_enet/
 -F:    include/linux/fs_enet_pd.h
  
  FREESCALE SOC SOUND DRIVERS
  M:    Shengjiu Wang <[email protected]>
@@@ -8444,6 -8402,13 +8444,6 @@@ F:     Documentation/power/freezing-of-task
  F:    include/linux/freezer.h
  F:    kernel/freezer.c
  
 -FRONTSWAP API
 -M:    Konrad Rzeszutek Wilk <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    include/linux/frontswap.h
 -F:    mm/frontswap.c
 -
  FS-CACHE: LOCAL CACHING FOR NETWORK FILESYSTEMS
  M:    David Howells <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -8708,13 -8673,6 +8708,13 @@@ F:    Documentation/devicetree/bindings/po
  F:    drivers/base/power/domain*.c
  F:    include/linux/pm_domain.h
  
 +GENERIC PM DOMAIN PROVIDERS
 +M:    Ulf Hansson <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git
 +F:    drivers/genpd/
 +
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <[email protected]>
  L:    [email protected]
@@@ -8863,7 -8821,6 +8863,7 @@@ R:      Michael Walle <[email protected]
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
 +K:    (devm_)?gpio_regmap_(un)?register
  
  GPIO SUBSYSTEM
  M:    Linus Walleij <[email protected]>
@@@ -9357,7 -9314,7 +9357,7 @@@ F:      drivers/crypto/hisilicon/hpre/hpre_c
  F:    drivers/crypto/hisilicon/hpre/hpre_main.c
  
  HISILICON HNS3 PMU DRIVER
 -M:    Guangbin Huang <huangguangbin2@huawei.com>
 +M:    Jijie Shao <shaojijie@huawei.com>
  S:    Supported
  F:    Documentation/admin-guide/perf/hns3-pmu.rst
  F:    drivers/perf/hisilicon/hns3_pmu.c
@@@ -9370,13 -9327,6 +9370,13 @@@ W:    https://www.hisilicon.co
  F:    Documentation/devicetree/bindings/i2c/hisilicon,ascend910-i2c.yaml
  F:    drivers/i2c/busses/i2c-hisi.c
  
 +HISILICON KUNPENG SOC HCCS DRIVER
 +M:    Huisong Li <[email protected]>
 +S:    Maintained
 +F:    Documentation/ABI/testing/sysfs-devices-platform-kunpeng_hccs
 +F:    drivers/soc/hisilicon/kunpeng_hccs.c
 +F:    drivers/soc/hisilicon/kunpeng_hccs.h
 +
  HISILICON LPC BUS DRIVER
  M:    Jay Fang <[email protected]>
  S:    Maintained
@@@ -9402,7 -9352,7 +9402,7 @@@ F:      Documentation/devicetree/bindings/ne
  F:    drivers/net/ethernet/hisilicon/
  
  HISILICON PMU DRIVER
 -M:    Shaokun Zhang <zhangshaokun@hisilicon.com>
 +M:    Yicong Yang <yangyicong@hisilicon.com>
  M:    Jonathan Cameron <[email protected]>
  S:    Supported
  W:    http://www.hisilicon.com
@@@ -9522,12 -9472,6 +9522,12 @@@ S:    Obsolet
  W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
 +HP BIOSCFG DRIVER
 +M:    Jorge Lopez <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/hp/hp-bioscfg/
 +
  HP COMPAQ TC1100 TABLET WMI EXTRAS DRIVER
  L:    [email protected]
  S:    Orphan
@@@ -9559,12 -9503,6 +9559,12 @@@ S:    Maintaine
  W:    http://artax.karlin.mff.cuni.cz/~mikulas/vyplody/hpfs/index-e.cgi
  F:    fs/hpfs/
  
 +HS3001 Hardware Temperature and Humidity Sensor
 +M:    Andre Werner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/hwmon/hs3001.c
 +
  HSI SUBSYSTEM
  M:    Sebastian Reichel <[email protected]>
  S:    Maintained
@@@ -10808,7 -10746,6 +10808,7 @@@ INTEL TPMI DRIVE
  M:    Srinivas Pandruvada <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/ABI/testing/debugfs-tpmi
  F:    drivers/platform/x86/intel/tpmi.c
  F:    include/linux/intel_tpmi.h
  
@@@ -10993,6 -10930,7 +10993,6 @@@ F:   include/linux/io_uring_types.
  F:    include/trace/events/io_uring.h
  F:    include/uapi/linux/io_uring.h
  F:    io_uring/
 -F:    tools/io_uring/
  
  IPMI SUBSYSTEM
  M:    Corey Minyard <[email protected]>
@@@ -11454,8 -11392,6 +11454,8 @@@ T:   git git://git.kernel.org/pub/scm/lin
  F:    Documentation/dev-tools/kunit/
  F:    include/kunit/
  F:    lib/kunit/
 +F:    rust/kernel/kunit.rs
 +F:    scripts/rustdoc_test_*
  F:    tools/testing/kunit/
  
  KERNEL USERMODE HELPER
@@@ -12315,8 -12251,8 +12315,8 @@@ R:   WANG Xuerui <[email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git
 -F:    Documentation/loongarch/
 -F:    Documentation/translations/zh_CN/loongarch/
 +F:    Documentation/arch/loongarch/
 +F:    Documentation/translations/zh_CN/arch/loongarch/
  F:    arch/loongarch/
  F:    drivers/*/*loongarch*
  
@@@ -12342,16 -12278,6 +12342,16 @@@ F: Documentation/devicetree/bindings/cl
  F:    drivers/clk/clk-loongson2.c
  F:    include/dt-bindings/clock/loongson,ls2k-clk.h
  
 +LOONGSON SPI DRIVER
 +M:    Yinbo Zhu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/spi/loongson,ls2k-spi.yaml
 +F:    drivers/spi/spi-loongson-core.c
 +F:    drivers/spi/spi-loongson-pci.c
 +F:    drivers/spi/spi-loongson-plat.c
 +F:    drivers/spi/spi-loongson.h
 +
  LOONGSON-2 SOC SERIES GUTS DRIVER
  M:    Yinbo Zhu <[email protected]>
  L:    [email protected]
@@@ -12359,13 -12285,6 +12359,13 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/hwinfo/loongson,ls2k-chipid.yaml
  F:    drivers/soc/loongson/loongson2_guts.c
  
 +LOONGSON-2 SOC SERIES PM DRIVER
 +M:    Yinbo Zhu <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/soc/loongson/loongson,ls2k-pmc.yaml
 +F:    drivers/soc/loongson/loongson2_pm.c
 +
  LOONGSON-2 SOC SERIES PINCTRL DRIVER
  M:    zhanghongchen <[email protected]>
  M:    Yinbo Zhu <[email protected]>
@@@ -12915,7 -12834,7 +12915,7 @@@ F:   drivers/power/supply/max77976_charge
  MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/power/supply/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/power/supply/maxim,max77693.yaml
@@@ -12926,7 -12845,7 +12926,7 @@@ MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS 
  M:    Chanwoo Choi <[email protected]>
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/*/maxim,max14577.yaml
  F:    Documentation/devicetree/bindings/*/maxim,max77686.yaml
@@@ -14007,12 -13926,14 +14007,14 @@@ F:        drivers/nvmem/microchip-otpc.
  F:    include/dt-bindings/nvmem/microchip,sama7g5-otpc.h
  
  MICROCHIP PCI1XXXX GP DRIVER
+ M:    Vaibhaav Ram T.L <[email protected]>
  M:    Kumaravel Thiagarajan <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.c
  F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gp.h
  F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c
+ F:    drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_otpe2p.c
  
  MICROCHIP PCI1XXXX I2C DRIVER
  M:    Tharun Kumar P <[email protected]>
@@@ -14258,7 -14179,7 +14260,7 @@@ W:   http://www.linux-mips.org
  Q:    https://patchwork.kernel.org/project/linux-mips/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git
  F:    Documentation/devicetree/bindings/mips/
 -F:    Documentation/mips/
 +F:    Documentation/arch/mips/
  F:    arch/mips/
  F:    drivers/platform/mips/
  F:    include/dt-bindings/mips/
@@@ -14729,7 -14650,7 +14731,7 @@@ F:   drivers/rtc/rtc-ntxec.
  F:    include/linux/mfd/ntxec.h
  
  NETRONOME ETHERNET DRIVERS
 -M:    Simon Horman <simon.horman@corigine.com>
 +M:    Louis Peens <louis.peens@corigine.com>
  R:    Jakub Kicinski <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -14892,16 -14813,6 +14894,16 @@@ F: net/netfilter/xt_CONNSECMARK.
  F:    net/netfilter/xt_SECMARK.c
  F:    net/netlabel/
  
 +NETWORKING [MACSEC]
 +M:    Sabrina Dubroca <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/net/macsec.c
 +F:    include/net/macsec.h
 +F:    include/uapi/linux/if_macsec.h
 +K:    macsec
 +K:    \bmdo_
 +
  NETWORKING [MPTCP]
  M:    Matthieu Baerts <[email protected]>
  M:    Mat Martineau <[email protected]>
@@@ -14924,6 -14835,7 +14926,6 @@@ NETWORKING [TCP
  M:    Eric Dumazet <[email protected]>
  L:    [email protected]
  S:    Maintained
 -F:    include/linux/net_mm.h
  F:    include/linux/tcp.h
  F:    include/net/tcp.h
  F:    include/trace/events/tcp.h
@@@ -15086,7 -14998,6 +15088,7 @@@ F:   include/linux/power/bq27xxx_battery.
  
  NOLIBC HEADER FILE
  M:    Willy Tarreau <[email protected]>
 +M:    Thomas Weißschuh <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wtarreau/nolibc.git
  F:    tools/include/nolibc/
@@@ -15613,7 -15524,6 +15615,7 @@@ W:   http://www.muru.com/linux/omap
  W:    http://linux.omap.com/
  Q:    http://patchwork.kernel.org/project/linux-omap/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git
 +F:    Documentation/devicetree/bindings/arm/ti/omap.yaml
  F:    arch/arm/configs/omap2plus_defconfig
  F:    arch/arm/mach-omap2/
  F:    drivers/bus/ti-sysc.c
@@@ -16102,7 -16012,7 +16104,7 @@@ M:   Ilias Apalodimas <ilias.apalodimas@l
  L:    [email protected]
  S:    Supported
  F:    Documentation/networking/page_pool.rst
 -F:    include/net/page_pool.h
 +F:    include/net/page_pool/
  F:    include/trace/events/page_pool.h
  F:    net/core/page_pool.c
  
@@@ -17131,7 -17041,7 +17133,7 @@@ L:   [email protected] (subscriber
  S:    Maintained
  W:    http://wiki.enneenne.com/index.php/LinuxPPS_support
  F:    Documentation/ABI/testing/sysfs-pps
 -F:    Documentation/devicetree/bindings/pps/pps-gpio.txt
 +F:    Documentation/devicetree/bindings/pps/pps-gpio.yaml
  F:    Documentation/driver-api/pps.rst
  F:    drivers/pps/
  F:    include/linux/pps*.h
@@@ -17147,7 -17057,6 +17149,7 @@@ F:   drivers/net/ppp/pptp.
  PRESSURE STALL INFORMATION (PSI)
  M:    Johannes Weiner <[email protected]>
  M:    Suren Baghdasaryan <[email protected]>
 +R:    Peter Ziljstra <[email protected]>
  S:    Maintained
  F:    include/linux/psi*
  F:    kernel/sched/psi.c
@@@ -17255,13 -17164,6 +17257,13 @@@ F: drivers/ptp/
  F:    include/linux/ptp_cl*
  K:    (?:\b|_)ptp(?:\b|_)
  
 +PTP MOCKUP CLOCK SUPPORT
 +M:    Vladimir Oltean <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/ptp/ptp_mock.c
 +F:    include/linux/ptp_mock.h
 +
  PTP VIRTUAL CLOCK SUPPORT
  M:    Yangbo Lu <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
 -F:    drivers/soc/qcom/cpr.c
 +F:    drivers/genpd/qcom/cpr.c
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:    Ilia Lin <[email protected]>
@@@ -18120,7 -18022,7 +18122,7 @@@ F:   include/linux/regmap.
  
  REISERFS FILE SYSTEM
  L:    [email protected]
 -S:    Supported
 +S:    Obsolete
  F:    fs/reiserfs/
  
  REMOTE PROCESSOR (REMOTEPROC) SUBSYSTEM
@@@ -18661,8 -18563,6 +18663,8 @@@ R:   Boqun Feng <[email protected]
  R:    Gary Guo <[email protected]>
  R:    Björn Roy Baron <[email protected]>
  R:    Benno Lossin <[email protected]>
 +R:    Andreas Hindborg <[email protected]>
 +R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    https://github.com/Rust-for-Linux/linux
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
  F:    Documentation/driver-api/s390-drivers.rst
 -F:    Documentation/s390/
 +F:    Documentation/arch/s390/
  F:    arch/s390/
  F:    drivers/s390/
  F:    drivers/watchdog/diag288_wdt.c
@@@ -18765,7 -18665,7 +18767,7 @@@ M:   Niklas Schnelle <[email protected].
  M:    Gerald Schaefer <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/s390/pci.rst
 +F:    Documentation/arch/s390/pci.rst
  F:    arch/s390/pci/
  F:    drivers/pci/hotplug/s390_pci_hpc.c
  
@@@ -18782,7 -18682,7 +18784,7 @@@ M:   Halil Pasic <[email protected]
  M:    Jason Herne <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/s390/vfio-ap*
 +F:    Documentation/arch/s390/vfio-ap*
  F:    drivers/s390/crypto/vfio_ap*
  
  S390 VFIO-CCW DRIVER
@@@ -18792,7 -18692,7 +18794,7 @@@ R:   Halil Pasic <[email protected]
  L:    [email protected]
  L:    [email protected]
  S:    Supported
 -F:    Documentation/s390/vfio-ccw.rst
 +F:    Documentation/arch/s390/vfio-ccw.rst
  F:    drivers/s390/cio/vfio_ccw*
  F:    include/uapi/linux/vfio_ccw.h
  
@@@ -18898,7 -18798,7 +18900,7 @@@ SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVE
  M:    Krzysztof Kozlowski <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  B:    mailto:[email protected]
  F:    Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml
  F:    Documentation/devicetree/bindings/mfd/samsung,s2m*.yaml
@@@ -18970,7 -18870,7 +18972,7 @@@ M:   Tomasz Figa <[email protected]
  M:    Chanwoo Choi <[email protected]>
  R:    Alim Akhtar <[email protected]>
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git
  F:    Documentation/devicetree/bindings/clock/samsung,*.yaml
@@@ -19334,6 -19234,13 +19336,6 @@@ F:  Documentation/devicetree/bindings/se
  F:    drivers/tty/serdev/
  F:    include/linux/serdev.h
  
 -SERIAL DRIVERS
 -M:    Greg Kroah-Hartman <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/serial/
 -F:    drivers/tty/serial/
 -
  SERIAL IR RECEIVER
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -19385,6 -19292,7 +19387,6 @@@ F:   drivers/misc/sgi-gru
  SGI XP/XPC/XPNET DRIVER
  M:    Robin Holt <[email protected]>
  M:    Steve Wahl <[email protected]>
 -R:    Mike Travis <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
@@@ -19503,32 -19411,6 +19505,32 @@@ F: drivers/media/mmc/siano
  F:    drivers/media/usb/siano/
  F:    drivers/media/usb/siano/
  
 +SIEMENS IPC LED DRIVERS
 +M:    Gerd Haeussler <[email protected]>
 +M:    Xing Tong Wu <[email protected]>
 +M:    Tobias Schaffner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/leds/simple/
 +
 +SIEMENS IPC PLATFORM DRIVERS
 +M:    Gerd Haeussler <[email protected]>
 +M:    Xing Tong Wu <[email protected]>
 +M:    Tobias Schaffner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/platform/x86/siemens/
 +F:    include/linux/platform_data/x86/simatic-ipc-base.h
 +F:    include/linux/platform_data/x86/simatic-ipc.h
 +
 +SIEMENS IPC WATCHDOG DRIVERS
 +M:    Gerd Haeussler <[email protected]>
 +M:    Xing Tong Wu <[email protected]>
 +M:    Tobias Schaffner <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/watchdog/simatic-ipc-wdt.c
 +
  SIFIVE DRIVERS
  M:    Palmer Dabbelt <[email protected]>
  M:    Paul Walmsley <[email protected]>
@@@ -19721,6 -19603,13 +19723,6 @@@ M:  Nicolas Pitre <[email protected]
  S:    Odd Fixes
  F:    drivers/net/ethernet/smsc/smc91x.*
  
 -SMM665 HARDWARE MONITOR DRIVER
 -M:    Guenter Roeck <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    Documentation/hwmon/smm665.rst
 -F:    drivers/hwmon/smm665.c
 -
  SMSC EMC2103 HARDWARE MONITOR DRIVER
  M:    Steve Glendinning <[email protected]>
  L:    [email protected]
@@@ -20403,18 -20292,6 +20405,18 @@@ S: Supporte
  F:    Documentation/devicetree/bindings/mmc/starfive*
  F:    drivers/mmc/host/dw_mmc-starfive.c
  
 +STARFIVE JH7110 PLL CLOCK DRIVER
 +M:    Xingyu Wu <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/clock/starfive,jh7110-pll.yaml
 +F:    drivers/clk/starfive/clk-starfive-jh7110-pll.c
 +
 +STARFIVE JH7110 SYSCON
 +M:    William Qiu <[email protected]>
 +M:    Xingyu Wu <[email protected]>
 +S:    Supported
 +F:    Documentation/devicetree/bindings/soc/starfive/starfive,jh7110-syscon.yaml
 +
  STARFIVE JH7110 TDM DRIVER
  M:    Walker Chen <[email protected]>
  S:    Maintained
@@@ -20457,14 -20334,13 +20459,14 @@@ STARFIVE JH71XX PMU CONTROLLER DRIVE
  M:    Walker Chen <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/soc/starfive/jh71xx_pmu.c
 +F:    drivers/genpd/starfive/jh71xx-pmu.c
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
  M:    Conor Dooley <[email protected]>
  S:    Maintained
  T:    git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/
 +F:    Documentation/devicetree/bindings/soc/starfive/
  F:    drivers/soc/starfive/
  
  STARFIVE TRNG DRIVER
@@@ -21193,39 -21069,6 +21195,39 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml
  F:    sound/soc/ti/
  
 +TEXAS INSTRUMENTS AUDIO (ASoC/HDA) DRIVERS
 +M:    Shenghao Ding <[email protected]>
 +M:    Kevin Lu <[email protected]>
 +M:    Baojun Xu <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/sound/tas2552.txt
 +F:    Documentation/devicetree/bindings/sound/tas2562.yaml
 +F:    Documentation/devicetree/bindings/sound/tas2770.yaml
 +F:    Documentation/devicetree/bindings/sound/tas27xx.yaml
 +F:    Documentation/devicetree/bindings/sound/ti,pcm1681.txt
 +F:    Documentation/devicetree/bindings/sound/ti,pcm3168a.yaml
 +F:    Documentation/devicetree/bindings/sound/ti,tlv320*.yaml
 +F:    Documentation/devicetree/bindings/sound/tlv320adcx140.yaml
 +F:    Documentation/devicetree/bindings/sound/tlv320aic31xx.txt
 +F:    Documentation/devicetree/bindings/sound/tpa6130a2.txt
 +F:    include/sound/tas2*.h
 +F:    include/sound/tlv320*.h
 +F:    include/sound/tpa6130a2-plat.h
 +F:    sound/pci/hda/tas2781_hda_i2c.c
 +F:    sound/soc/codecs/pcm1681.c
 +F:    sound/soc/codecs/pcm1789*.*
 +F:    sound/soc/codecs/pcm179x*.*
 +F:    sound/soc/codecs/pcm186x*.*
 +F:    sound/soc/codecs/pcm3008.*
 +F:    sound/soc/codecs/pcm3060*.*
 +F:    sound/soc/codecs/pcm3168a*.*
 +F:    sound/soc/codecs/pcm5102a.c
 +F:    sound/soc/codecs/pcm512x*.*
 +F:    sound/soc/codecs/tas2*.*
 +F:    sound/soc/codecs/tlv320*.*
 +F:    sound/soc/codecs/tpa6130a2.*
 +
  TEXAS INSTRUMENTS DMA DRIVERS
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected]
@@@ -21274,7 -21117,7 +21276,7 @@@ F:   drivers/irqchip/irq-ti-sci-inta.
  F:    drivers/irqchip/irq-ti-sci-intr.c
  F:    drivers/reset/reset-ti-sci.c
  F:    drivers/soc/ti/ti_sci_inta_msi.c
 -F:    drivers/soc/ti/ti_sci_pm_domains.c
 +F:    drivers/genpd/ti/ti_sci_pm_domains.c
  F:    include/dt-bindings/soc/ti,sci_pm_domain.h
  F:    include/linux/soc/ti/ti_sci_inta_msi.h
  F:    include/linux/soc/ti/ti_sci_protocol.h
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git
 +F:    drivers/genpd/ti/omap_prm.c
  F:    drivers/soc/ti/*
  
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
@@@ -21796,22 -21638,27 +21798,22 @@@ F:        kernel/trace/trace_osnoise.
  F:    kernel/trace/trace_sched_wakeup.c
  
  TRADITIONAL CHINESE DOCUMENTATION
 -M:    Hu Haowen <[email protected]>
 -L:    [email protected] (moderated for non-subscribers)
 +M:    Hu Haowen <[email protected]>
  S:    Maintained
  W:    https://github.com/srcres258/linux-doc
  T:    git git://github.com/srcres258/linux-doc.git doc-zh-tw
  F:    Documentation/translations/zh_TW/
  
 -TTY LAYER
 +TTY LAYER AND SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  M:    Jiri Slaby <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git
 +F:    Documentation/devicetree/bindings/serial/
  F:    Documentation/driver-api/serial/
  F:    drivers/tty/
 -F:    drivers/tty/serial/serial_base.h
 -F:    drivers/tty/serial/serial_base_bus.c
 -F:    drivers/tty/serial/serial_core.c
 -F:    drivers/tty/serial/serial_ctrl.c
 -F:    drivers/tty/serial/serial_port.c
  F:    include/linux/selection.h
  F:    include/linux/serial.h
  F:    include/linux/serial_core.h
@@@ -22515,13 -22362,6 +22517,13 @@@ S: Maintaine
  P:    Documentation/driver-api/vfio-pci-device-specific-driver-acceptance.rst
  F:    drivers/vfio/pci/*/
  
 +VFIO PDS PCI DRIVER
 +M:    Brett Creeley <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/networking/device_drivers/ethernet/amd/pds_vfio_pci.rst
 +F:    drivers/vfio/pci/pds/
 +
  VFIO PLATFORM DRIVER
  M:    Eric Auger <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/block/virtio_blk.c
  F:    drivers/scsi/virtio_scsi.c
 -F:    drivers/vhost/scsi.c
  F:    include/uapi/linux/virtio_blk.h
  F:    include/uapi/linux/virtio_scsi.h
  
@@@ -22743,16 -22584,6 +22745,16 @@@ F: include/linux/vhost_iotlb.
  F:    include/uapi/linux/vhost.h
  F:    kernel/vhost_task.c
  
 +VIRTIO HOST (VHOST-SCSI)
 +M:    "Michael S. Tsirkin" <[email protected]>
 +M:    Jason Wang <[email protected]>
 +M:    Mike Christie <[email protected]>
 +R:    Paolo Bonzini <[email protected]>
 +R:    Stefan Hajnoczi <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/vhost/scsi.c
 +
  VIRTIO I2C DRIVER
  M:    Conghui Chen <[email protected]>
  M:    Viresh Kumar <[email protected]>
@@@ -23070,7 -22901,6 +23072,7 @@@ S:   Maintaine
  W:    https://www.net-swift.com
  F:    Documentation/networking/device_drivers/ethernet/wangxun/*
  F:    drivers/net/ethernet/wangxun/
 +F:    drivers/net/pcs/pcs-xpcs-wx.c
  
  WATCHDOG DEVICE DRIVERS
  M:    Wim Van Sebroeck <[email protected]>
@@@ -23145,10 -22975,8 +23147,10 @@@ S: Orpha
  F:    drivers/net/wireless/legacy/wl3501*
  
  WMI BINARY MOF DRIVER
 -L:    [email protected]
 -S:    Orphan
 +M:    Armin Wolf <[email protected]>
 +R:    Thomas Weißschuh <[email protected]>
 +L:    [email protected]
 +S:    Maintained
  F:    Documentation/ABI/stable/sysfs-platform-wmi-bmof
  F:    Documentation/wmi/devices/wmi-bmof.rst
  F:    drivers/platform/x86/wmi-bmof.c
@@@ -23323,8 -23151,7 +23325,8 @@@ F:   arch/x86/platfor
  
  X86 PLATFORM UV HPE SUPERDOME FLEX
  M:    Steve Wahl <[email protected]>
 -R:    Mike Travis <[email protected]>
 +R:    Justin Ernst <[email protected]>
 +R:    Kyle Meyer <[email protected]>
  R:    Dimitri Sivanich <[email protected]>
  R:    Russ Anderson <[email protected]>
  S:    Supported
@@@ -23511,14 -23338,12 +23513,14 @@@ F:        include/xen/arm/swiotlb-xen.
  F:    include/xen/swiotlb-xen.h
  
  XFS FILESYSTEM
 -M:    Darrick J. Wong <[email protected]>
 +M:    Chandan Babu R <[email protected]>
 +R:    Darrick J. Wong <[email protected]>
  L:    [email protected]
  S:    Supported
  W:    http://xfs.org/
  C:    irc://irc.oftc.net/xfs
  T:    git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git
 +P:    Documentation/filesystems/xfs-maintainer-entry-profile.rst
  F:    Documentation/ABI/testing/sysfs-fs-xfs
  F:    Documentation/admin-guide/xfs.rst
  F:    Documentation/filesystems/xfs-delayed-logging-design.rst
index b2a7631d7ac7538218d010982fd1a87cc8d829f7,0000000000000000000000000000000000000000..60be8ee1dbdc6c13c21f500d3e0cbc6375af25a2
mode 100644,000000..100644
--- /dev/null
@@@ -1,130 -1,0 +1,129 @@@
-       {"ARMHC500", 0}, /* ARM CoreSight ETM4x */
 +// SPDX-License-Identifier: GPL-2.0-only
 +
 +/*
 + * ACPI support for platform bus type.
 + *
 + * Copyright (C) 2015, Linaro Ltd
 + * Author: Graeme Gregory <[email protected]>
 + */
 +
 +#include <linux/acpi.h>
 +#include <linux/amba/bus.h>
 +#include <linux/clkdev.h>
 +#include <linux/clk-provider.h>
 +#include <linux/device.h>
 +#include <linux/err.h>
 +#include <linux/ioport.h>
 +#include <linux/kernel.h>
 +#include <linux/module.h>
 +
 +#include "init.h"
 +
 +static const struct acpi_device_id amba_id_list[] = {
 +      {"ARMH0061", 0}, /* PL061 GPIO Device */
 +      {"ARMH0330", 0}, /* ARM DMA Controller DMA-330 */
 +      {"ARMHC501", 0}, /* ARM CoreSight ETR */
 +      {"ARMHC502", 0}, /* ARM CoreSight STM */
 +      {"ARMHC503", 0}, /* ARM CoreSight Debug */
 +      {"ARMHC979", 0}, /* ARM CoreSight TPIU */
 +      {"ARMHC97C", 0}, /* ARM CoreSight SoC-400 TMC, SoC-600 ETF/ETB */
 +      {"ARMHC98D", 0}, /* ARM CoreSight Dynamic Replicator */
 +      {"ARMHC9CA", 0}, /* ARM CoreSight CATU */
 +      {"ARMHC9FF", 0}, /* ARM CoreSight Dynamic Funnel */
 +      {"", 0},
 +};
 +
 +static void amba_register_dummy_clk(void)
 +{
 +      static struct clk *amba_dummy_clk;
 +
 +      /* If clock already registered */
 +      if (amba_dummy_clk)
 +              return;
 +
 +      amba_dummy_clk = clk_register_fixed_rate(NULL, "apb_pclk", NULL, 0, 0);
 +      clk_register_clkdev(amba_dummy_clk, "apb_pclk", NULL);
 +}
 +
 +static int amba_handler_attach(struct acpi_device *adev,
 +                              const struct acpi_device_id *id)
 +{
 +      struct acpi_device *parent = acpi_dev_parent(adev);
 +      struct amba_device *dev;
 +      struct resource_entry *rentry;
 +      struct list_head resource_list;
 +      bool address_found = false;
 +      int irq_no = 0;
 +      int ret;
 +
 +      /* If the ACPI node already has a physical device attached, skip it. */
 +      if (adev->physical_node_count)
 +              return 0;
 +
 +      dev = amba_device_alloc(dev_name(&adev->dev), 0, 0);
 +      if (!dev) {
 +              dev_err(&adev->dev, "%s(): amba_device_alloc() failed\n",
 +                      __func__);
 +              return -ENOMEM;
 +      }
 +
 +      INIT_LIST_HEAD(&resource_list);
 +      ret = acpi_dev_get_resources(adev, &resource_list, NULL, NULL);
 +      if (ret < 0)
 +              goto err_free;
 +
 +      list_for_each_entry(rentry, &resource_list, node) {
 +              switch (resource_type(rentry->res)) {
 +              case IORESOURCE_MEM:
 +                      if (!address_found) {
 +                              dev->res = *rentry->res;
 +                              dev->res.name = dev_name(&dev->dev);
 +                              address_found = true;
 +                      }
 +                      break;
 +              case IORESOURCE_IRQ:
 +                      if (irq_no < AMBA_NR_IRQS)
 +                              dev->irq[irq_no++] = rentry->res->start;
 +                      break;
 +              default:
 +                      dev_warn(&adev->dev, "Invalid resource\n");
 +                      break;
 +              }
 +      }
 +
 +      acpi_dev_free_resource_list(&resource_list);
 +
 +      /*
 +       * If the ACPI node has a parent and that parent has a physical device
 +       * attached to it, that physical device should be the parent of
 +       * the amba device we are about to create.
 +       */
 +      if (parent)
 +              dev->dev.parent = acpi_get_first_physical_node(parent);
 +
 +      ACPI_COMPANION_SET(&dev->dev, adev);
 +
 +      ret = amba_device_add(dev, &iomem_resource);
 +      if (ret) {
 +              dev_err(&adev->dev, "%s(): amba_device_add() failed (%d)\n",
 +                     __func__, ret);
 +              goto err_free;
 +      }
 +
 +      return 1;
 +
 +err_free:
 +      amba_device_put(dev);
 +      return ret;
 +}
 +
 +static struct acpi_scan_handler amba_handler = {
 +      .ids = amba_id_list,
 +      .attach = amba_handler_attach,
 +};
 +
 +void __init acpi_amba_init(void)
 +{
 +      amba_register_dummy_clk();
 +      acpi_scan_add_handler(&amba_handler);
 +}
index faebe9f5412a1ef636f3813f99008f9563faf62c,90f497c3ff068dd0e5df7be9c1980e7674478a7c..81effec17b3d63ab95d4cdb19826168b9d4ac46d
@@@ -19,7 -19,6 +19,6 @@@
  #include <linux/mutex.h>
  #include <linux/mount.h>
  #include <linux/fs_parser.h>
- #include <linux/radix-tree.h>
  #include <linux/sched.h>
  #include <linux/seq_file.h>
  #include <linux/slab.h>
@@@ -153,7 -152,7 +152,7 @@@ static int binderfs_binder_device_creat
                goto err;
  
        inode->i_ino = minor + INODE_OFFSET;
 -      inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
 +      inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
        init_special_inode(inode, S_IFCHR | 0600,
                           MKDEV(MAJOR(binderfs_dev), minor));
        inode->i_fop = &binder_fops;
@@@ -432,7 -431,7 +431,7 @@@ static int binderfs_binder_ctl_create(s
        }
  
        inode->i_ino = SECOND_INODE;
 -      inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
 +      inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
        init_special_inode(inode, S_IFCHR | 0600,
                           MKDEV(MAJOR(binderfs_dev), minor));
        inode->i_fop = &binder_ctl_fops;
@@@ -474,7 -473,7 +473,7 @@@ static struct inode *binderfs_make_inod
        if (ret) {
                ret->i_ino = iunique(sb, BINDERFS_MAX_MINOR + INODE_OFFSET);
                ret->i_mode = mode;
 -              ret->i_atime = ret->i_mtime = ret->i_ctime = current_time(ret);
 +              ret->i_atime = ret->i_mtime = inode_set_ctime_current(ret);
        }
        return ret;
  }
@@@ -703,7 -702,7 +702,7 @@@ static int binderfs_fill_super(struct s
        inode->i_ino = FIRST_INODE;
        inode->i_fop = &simple_dir_operations;
        inode->i_mode = S_IFDIR | 0755;
 -      inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
 +      inode->i_mtime = inode->i_atime = inode_set_ctime_current(inode);
        inode->i_op = &binderfs_dir_inode_operations;
        set_nlink(inode, 2);
  
index ab30747053802030ddec99b5468857093bcd770b,fbc54533ad99c3016e292e8072ba9819eebc92e1..4f7a7abada48a6b5deadd226ed8d60738c20b6cd
@@@ -10,6 -10,7 +10,6 @@@
  #include <linux/module.h>
  #include <linux/mutex.h>
  #include <linux/of.h>
 -#include <linux/of_platform.h>
  #include <linux/platform_device.h>
  #include <linux/firmware/intel/stratix10-svc-client.h>
  #include <linux/string.h>
  #define INVALID_RETRY_COUNTER         0xFF
  #define INVALID_DCMF_VERSION          0xFF
  #define INVALID_DCMF_STATUS           0xFFFFFFFF
+ #define INVALID_SPT_ADDRESS           0x0
+ #define RSU_GET_SPT_CMD                       0x5A
+ #define RSU_GET_SPT_RESP_LEN          (4 * sizeof(unsigned int))
  
  typedef void (*rsu_callback)(struct stratix10_svc_client *client,
                             struct stratix10_svc_cb_data *data);
@@@ -58,6 -63,9 +62,9 @@@
   * @dcmf_status.dcmf3: dcmf3 status
   * @retry_counter: the current image's retry counter
   * @max_retry: the preset max retry value
+  * @spt0_address: address of spt0
+  * @spt1_address: address of spt1
+  * @get_spt_response_buf: response from sdm for get_spt command
   */
  struct stratix10_rsu_priv {
        struct stratix10_svc_chan *chan;
  
        unsigned int retry_counter;
        unsigned int max_retry;
+       unsigned long spt0_address;
+       unsigned long spt1_address;
+       unsigned int *get_spt_response_buf;
  };
  
  /**
@@@ -258,6 -271,36 +270,36 @@@ static void rsu_dcmf_status_callback(st
        complete(&priv->completion);
  }
  
+ static void rsu_get_spt_callback(struct stratix10_svc_client *client,
+                                struct stratix10_svc_cb_data *data)
+ {
+       struct stratix10_rsu_priv *priv = client->priv;
+       unsigned long *mbox_err = (unsigned long *)data->kaddr1;
+       unsigned long *resp_len = (unsigned long *)data->kaddr2;
+       if (data->status != BIT(SVC_STATUS_OK) || (*mbox_err) ||
+           (*resp_len != RSU_GET_SPT_RESP_LEN))
+               goto error;
+       priv->spt0_address = priv->get_spt_response_buf[0];
+       priv->spt0_address <<= 32;
+       priv->spt0_address |= priv->get_spt_response_buf[1];
+       priv->spt1_address = priv->get_spt_response_buf[2];
+       priv->spt1_address <<= 32;
+       priv->spt1_address |= priv->get_spt_response_buf[3];
+       goto complete;
+ error:
+       dev_err(client->dev, "failed to get SPTs\n");
+ complete:
+       stratix10_svc_free_memory(priv->chan, priv->get_spt_response_buf);
+       priv->get_spt_response_buf = NULL;
+       complete(&priv->completion);
+ }
  /**
   * rsu_send_msg() - send a message to Intel service layer
   * @priv: pointer to rsu private data
@@@ -287,6 -330,14 +329,14 @@@ static int rsu_send_msg(struct stratix1
        if (arg)
                msg.arg[0] = arg;
  
+       if (command == COMMAND_MBOX_SEND_CMD) {
+               msg.arg[1] = 0;
+               msg.payload = NULL;
+               msg.payload_length = 0;
+               msg.payload_output = priv->get_spt_response_buf;
+               msg.payload_length_output = RSU_GET_SPT_RESP_LEN;
+       }
        ret = stratix10_svc_send(priv->chan, &msg);
        if (ret < 0)
                goto status_done;
@@@ -571,6 -622,34 +621,34 @@@ static ssize_t notify_store(struct devi
        return count;
  }
  
+ static ssize_t spt0_address_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+ {
+       struct stratix10_rsu_priv *priv = dev_get_drvdata(dev);
+       if (!priv)
+               return -ENODEV;
+       if (priv->spt0_address == INVALID_SPT_ADDRESS)
+               return -EIO;
+       return scnprintf(buf, PAGE_SIZE, "0x%08lx\n", priv->spt0_address);
+ }
+ static ssize_t spt1_address_show(struct device *dev,
+                                struct device_attribute *attr, char *buf)
+ {
+       struct stratix10_rsu_priv *priv = dev_get_drvdata(dev);
+       if (!priv)
+               return -ENODEV;
+       if (priv->spt1_address == INVALID_SPT_ADDRESS)
+               return -EIO;
+       return scnprintf(buf, PAGE_SIZE, "0x%08lx\n", priv->spt1_address);
+ }
  static DEVICE_ATTR_RO(current_image);
  static DEVICE_ATTR_RO(fail_image);
  static DEVICE_ATTR_RO(state);
@@@ -589,6 -668,8 +667,8 @@@ static DEVICE_ATTR_RO(dcmf2_status)
  static DEVICE_ATTR_RO(dcmf3_status);
  static DEVICE_ATTR_WO(reboot_image);
  static DEVICE_ATTR_WO(notify);
+ static DEVICE_ATTR_RO(spt0_address);
+ static DEVICE_ATTR_RO(spt1_address);
  
  static struct attribute *rsu_attrs[] = {
        &dev_attr_current_image.attr,
        &dev_attr_dcmf3_status.attr,
        &dev_attr_reboot_image.attr,
        &dev_attr_notify.attr,
+       &dev_attr_spt0_address.attr,
+       &dev_attr_spt1_address.attr,
        NULL
  };
  
@@@ -638,11 -721,13 +720,13 @@@ static int stratix10_rsu_probe(struct p
        priv->dcmf_version.dcmf1 = INVALID_DCMF_VERSION;
        priv->dcmf_version.dcmf2 = INVALID_DCMF_VERSION;
        priv->dcmf_version.dcmf3 = INVALID_DCMF_VERSION;
-       priv->max_retry = INVALID_RETRY_COUNTER;
        priv->dcmf_status.dcmf0 = INVALID_DCMF_STATUS;
        priv->dcmf_status.dcmf1 = INVALID_DCMF_STATUS;
        priv->dcmf_status.dcmf2 = INVALID_DCMF_STATUS;
        priv->dcmf_status.dcmf3 = INVALID_DCMF_STATUS;
+       priv->max_retry = INVALID_RETRY_COUNTER;
+       priv->spt0_address = INVALID_SPT_ADDRESS;
+       priv->spt1_address = INVALID_SPT_ADDRESS;
  
        mutex_init(&priv->lock);
        priv->chan = stratix10_svc_request_channel_byname(&priv->client,
                stratix10_svc_free_channel(priv->chan);
        }
  
+       priv->get_spt_response_buf =
+               stratix10_svc_allocate_memory(priv->chan, RSU_GET_SPT_RESP_LEN);
+       if (IS_ERR(priv->get_spt_response_buf)) {
+               dev_err(dev, "failed to allocate get spt buffer\n");
+       } else {
+               ret = rsu_send_msg(priv, COMMAND_MBOX_SEND_CMD,
+                                  RSU_GET_SPT_CMD, rsu_get_spt_callback);
+               if (ret) {
+                       dev_err(dev, "Error, getting SPT table %i\n", ret);
+                       stratix10_svc_free_channel(priv->chan);
+               }
+       }
        return ret;
  }
  
index ce89da3937a0f9793ba3362ac9c65c78e73ce86b,b235879bbd9cc083c63671ac3287f025a3b5ee41..5ca4d04e4b14abf73bfd8962e7777a91845980b7
@@@ -30,6 -30,8 +30,8 @@@
  #define DIMM_IDX_MAX_ON_ICX   2
  #define CHAN_RANK_MAX_ON_ICXD 4
  #define DIMM_IDX_MAX_ON_ICXD  2
+ #define CHAN_RANK_MAX_ON_SPR  8
+ #define DIMM_IDX_MAX_ON_SPR   2
  
  #define CHAN_RANK_MAX         CHAN_RANK_MAX_ON_HSX
  #define DIMM_IDX_MAX          DIMM_IDX_MAX_ON_HSX
@@@ -219,21 -221,19 +221,21 @@@ static int check_populated_dimms(struc
  {
        int chan_rank_max = priv->gen_info->chan_rank_max;
        int dimm_idx_max = priv->gen_info->dimm_idx_max;
 -      u32 chan_rank_empty = 0;
 -      u32 dimm_mask = 0;
 -      int chan_rank, dimm_idx, ret;
 +      DECLARE_BITMAP(dimm_mask, DIMM_NUMS_MAX);
 +      DECLARE_BITMAP(chan_rank_empty, CHAN_RANK_MAX);
 +
 +      int chan_rank, dimm_idx, ret, i;
        u32 pcs;
  
 -      BUILD_BUG_ON(BITS_PER_TYPE(chan_rank_empty) < CHAN_RANK_MAX);
 -      BUILD_BUG_ON(BITS_PER_TYPE(dimm_mask) < DIMM_NUMS_MAX);
        if (chan_rank_max * dimm_idx_max > DIMM_NUMS_MAX) {
                WARN_ONCE(1, "Unsupported number of DIMMs - chan_rank_max: %d, dimm_idx_max: %d",
                          chan_rank_max, dimm_idx_max);
                return -EINVAL;
        }
  
 +      bitmap_zero(dimm_mask, DIMM_NUMS_MAX);
 +      bitmap_zero(chan_rank_empty, CHAN_RANK_MAX);
 +
        for (chan_rank = 0; chan_rank < chan_rank_max; chan_rank++) {
                ret = peci_pcs_read(priv->peci_dev, PECI_PCS_DDR_DIMM_TEMP, chan_rank, &pcs);
                if (ret) {
                         * detection to be performed at a later point in time.
                         */
                        if (ret == -EINVAL) {
 -                              chan_rank_empty |= BIT(chan_rank);
 +                              bitmap_set(chan_rank_empty, chan_rank, 1);
                                continue;
                        }
  
  
                for (dimm_idx = 0; dimm_idx < dimm_idx_max; dimm_idx++)
                        if (__dimm_temp(pcs, dimm_idx))
 -                              dimm_mask |= BIT(chan_rank * dimm_idx_max + dimm_idx);
 +                              bitmap_set(dimm_mask, chan_rank * dimm_idx_max + dimm_idx, 1);
        }
  
        /*
         * host platform boot. Retrying a couple of times lets us make sure
         * that the state is persistent.
         */
 -      if (chan_rank_empty == GENMASK(chan_rank_max - 1, 0)) {
 +      if (bitmap_full(chan_rank_empty, chan_rank_max)) {
                if (priv->no_dimm_retry_count < NO_DIMM_RETRY_COUNT_MAX) {
                        priv->no_dimm_retry_count++;
  
         * It's possible that memory training is not done yet. In this case we
         * defer the detection to be performed at a later point in time.
         */
 -      if (!dimm_mask) {
 +      if (bitmap_empty(dimm_mask, DIMM_NUMS_MAX)) {
                priv->no_dimm_retry_count = 0;
                return -EAGAIN;
        }
  
 -      dev_dbg(priv->dev, "Scanned populated DIMMs: %#x\n", dimm_mask);
 +      for_each_set_bit(i, dimm_mask, DIMM_NUMS_MAX) {
 +              dev_dbg(priv->dev, "Found DIMM%#x\n", i);
 +      }
  
 -      bitmap_from_arr32(priv->dimm_mask, &dimm_mask, DIMM_NUMS_MAX);
 +      bitmap_copy(priv->dimm_mask, dimm_mask, DIMM_NUMS_MAX);
  
        return 0;
  }
@@@ -534,6 -532,43 +536,43 @@@ read_thresholds_icx(struct peci_dimmtem
        return 0;
  }
  
+ static int
+ read_thresholds_spr(struct peci_dimmtemp *priv, int dimm_order, int chan_rank, u32 *data)
+ {
+       u32 reg_val;
+       u64 offset;
+       int ret;
+       u8 dev;
+       ret = peci_ep_pci_local_read(priv->peci_dev, 0, 30, 0, 2, 0xd4, &reg_val);
+       if (ret || !(reg_val & BIT(31)))
+               return -ENODATA; /* Use default or previous value */
+       ret = peci_ep_pci_local_read(priv->peci_dev, 0, 30, 0, 2, 0xd0, &reg_val);
+       if (ret)
+               return -ENODATA; /* Use default or previous value */
+       /*
+        * Device 26, Offset 219a8: IMC 0 channel 0 -> rank 0
+        * Device 26, Offset 299a8: IMC 0 channel 1 -> rank 1
+        * Device 27, Offset 219a8: IMC 1 channel 0 -> rank 2
+        * Device 27, Offset 299a8: IMC 1 channel 1 -> rank 3
+        * Device 28, Offset 219a8: IMC 2 channel 0 -> rank 4
+        * Device 28, Offset 299a8: IMC 2 channel 1 -> rank 5
+        * Device 29, Offset 219a8: IMC 3 channel 0 -> rank 6
+        * Device 29, Offset 299a8: IMC 3 channel 1 -> rank 7
+        */
+       dev = 26 + chan_rank / 2;
+       offset = 0x219a8 + dimm_order * 4 + (chan_rank % 2) * 0x8000;
+       ret = peci_mmio_read(priv->peci_dev, 0, GET_CPU_SEG(reg_val), GET_CPU_BUS(reg_val),
+                            dev, 0, offset, data);
+       if (ret)
+               return ret;
+       return 0;
+ }
  static const struct dimm_info dimm_hsx = {
        .chan_rank_max  = CHAN_RANK_MAX_ON_HSX,
        .dimm_idx_max   = DIMM_IDX_MAX_ON_HSX,
@@@ -576,6 -611,13 +615,13 @@@ static const struct dimm_info dimm_icx
        .read_thresholds = &read_thresholds_icx,
  };
  
+ static const struct dimm_info dimm_spr = {
+       .chan_rank_max  = CHAN_RANK_MAX_ON_SPR,
+       .dimm_idx_max   = DIMM_IDX_MAX_ON_SPR,
+       .min_peci_revision = 0x40,
+       .read_thresholds = &read_thresholds_spr,
+ };
  static const struct auxiliary_device_id peci_dimmtemp_ids[] = {
        {
                .name = "peci_cpu.dimmtemp.hsx",
                .name = "peci_cpu.dimmtemp.icxd",
                .driver_data = (kernel_ulong_t)&dimm_icxd,
        },
+       {
+               .name = "peci_cpu.dimmtemp.spr",
+               .driver_data = (kernel_ulong_t)&dimm_spr,
+       },
        { }
  };
  MODULE_DEVICE_TABLE(auxiliary, peci_dimmtemp_ids);
This page took 0.273926 seconds and 4 git commands to generate.