Merge tag 'pci-v6.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci

Pull pci updates from Bjorn Helgaas:
 "Enumeration:

   - Use acpi_evaluate_dsm_typed() instead of open-coding _DSM
     evaluation to learn device characteristics (Andy Shevchenko)

   - Tidy multi-function header checks using new PCI_HEADER_TYPE_MASK
     definition (Ilpo Järvinen)

   - Simplify config access error checking in various drivers (Ilpo
     Järvinen)

   - Use pcie_capability_clear_word() (not
     pcie_capability_clear_and_set_word()) when only clearing (Ilpo
     Järvinen)

   - Add pci_get_base_class() to simplify finding devices using base
     class only (ignoring subclass and programming interface) (Sui
     Jingfeng)

   - Add pci_is_vga(), which includes ancient PCI_CLASS_NOT_DEFINED_VGA
     devices from before the Class Code was added to PCI (Sui Jingfeng)

   - Use pci_is_vga() for vgaarb, sysfs "boot_vga", virtio, qxl to
     include ancient VGA devices (Sui Jingfeng)

  Resource management:

   - Make pci_assign_unassigned_resources() non-init because sparc uses
     it after init (Randy Dunlap)

  Driver binding:

   - Retain .remove() and .probe() callbacks (previously __init) because
     sysfs may cause them to be called later (Uwe Kleine-König)

   - Prevent xHCI driver from claiming AMD VanGogh USB3 DRD device, so
     it can be claimed by dwc3 instead (Vicki Pfau)

  PCI device hotplug:

   - Add Ampere Altra Attention Indicator extension driver for acpiphp
     (D Scott Phillips)

  Power management:

   - Quirk VideoPropulsion Torrent QN16e with longer delay after reset
     (Lukas Wunner)

   - Prevent users from overriding drivers that say we shouldn't use
     D3cold (Lukas Wunner)

   - Avoid PME from D3hot/D3cold for AMD Rembrandt and Phoenix USB4
     because wakeup interrupts from those states don't work if amd-pmc
     has put the platform in a hardware sleep state (Mario Limonciello)

  IOMMU:

   - Disable ATS for Intel IPU E2000 devices with invalidation message
     endianness erratum (Bartosz Pawlowski)

  Error handling:

   - Factor out interrupt enable/disable into helpers (Kai-Heng Feng)

  Peer-to-peer DMA:

   - Fix flexible-array usage in struct pci_p2pdma_pagemap in case we
     ever use pagemaps with multiple entries (Gustavo A. R. Silva)

  ASPM:

   - Revert a change that broke when drivers disabled L1 and users later
     enabled an L1.x substate via sysfs, and fix a similar issue when
     users disabled L1 via sysfs (Heiner Kallweit)

  Endpoint framework:

   - Fix double free in __pci_epc_create() (Dan Carpenter)

   - Use IS_ERR_OR_NULL() to simplify endpoint core (Ruan Jinjie)

  Cadence PCIe controller driver:

   - Drop unused "is_rc" member (Li Chen)

  Freescale Layerscape PCIe controller driver:

   - Enable 64-bit addressing in endpoint mode (Guanhua Gao)

  Intel VMD host bridge driver:

   - Fix multi-function header check (Ilpo Järvinen)

  Microsoft Hyper-V host bridge driver:

   - Annotate struct hv_dr_state with __counted_by (Kees Cook)

  NVIDIA Tegra194 PCIe controller driver:

   - Drop setting of LNKCAP_MLW (max link width) since dw_pcie_setup()
     already does this via dw_pcie_link_set_max_link_width() (Yoshihiro
     Shimoda)

  Qualcomm PCIe controller driver:

   - Use PCIE_SPEED2MBS_ENC() to simplify encoding of link speed
     (Manivannan Sadhasivam)

   - Add a .write_dbi2() callback so DBI2 register writes, e.g., for
     setting the BAR size, work correctly (Manivannan Sadhasivam)

   - Enable ASPM for platforms that use 1.9.0 ops, because the PCI core
     doesn't enable ASPM states that haven't been enabled by the
     firmware (Manivannan Sadhasivam)

  Renesas R-Car Gen4 PCIe controller driver:

   - Add DesignWare core support (set max link width, EDMA_UNROLL flag,
     .pre_init(), .deinit(), etc) for use by R-Car Gen4 driver
     (Yoshihiro Shimoda)

   - Add driver and DT schema for DesignWare-based Renesas R-Car Gen4
     controller in both host and endpoint mode (Yoshihiro Shimoda)

  Xilinx NWL PCIe controller driver:

   - Update ECAM size to support 256 buses (Thippeswamy Havalige)

   - Stop setting bridge primary/secondary/subordinate bus numbers,
     since PCI core does this (Thippeswamy Havalige)

  Xilinx XDMA controller driver:

   - Add driver and DT schema for Zynq UltraScale+ MPSoCs devices with
     Xilinx XDMA Soft IP (Thippeswamy Havalige)

  Miscellaneous:

   - Use FIELD_GET()/FIELD_PREP() to simplify and reduce use of _SHIFT
     macros (Ilpo Järvinen, Bjorn Helgaas)

   - Remove logic_outb(), _outw(), outl() duplicate declarations (John
     Sanpe)

   - Replace unnecessary UTF-8 in Kconfig help text because menuconfig
     doesn't render it correctly (Liu Song)"

* tag 'pci-v6.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci: (102 commits)
  PCI: qcom-ep: Add dedicated callback for writing to DBI2 registers
  PCI: Simplify pcie_capability_clear_and_set_word() to ..._clear_word()
  PCI: endpoint: Fix double free in __pci_epc_create()
  PCI: xilinx-xdma: Add Xilinx XDMA Root Port driver
  dt-bindings: PCI: xilinx-xdma: Add schemas for Xilinx XDMA PCIe Root Port Bridge
  PCI: xilinx-cpm: Move IRQ definitions to a common header
  PCI: xilinx-nwl: Modify ECAM size to enable support for 256 buses
  PCI: xilinx-nwl: Rename the NWL_ECAM_VALUE_DEFAULT macro
  dt-bindings: PCI: xilinx-nwl: Modify ECAM size in the DT example
  PCI: xilinx-nwl: Remove redundant code that sets Type 1 header fields
  PCI: hotplug: Add Ampere Altra Attention Indicator extension driver
  PCI/AER: Factor out interrupt toggling into helpers
  PCI: acpiphp: Allow built-in drivers for Attention Indicators
  PCI/portdrv: Use FIELD_GET()
  PCI/VC: Use FIELD_GET()
  PCI/PTM: Use FIELD_GET()
  PCI/PME: Use FIELD_GET()
  PCI/ATS: Use FIELD_GET()
  PCI/ATS: Show PASID Capability register width in bitmasks
  PCI/ASPM: Fix L1 substate handling in aspm_attr_store_common()
  ...

diff --combined MAINTAINERS
index 3fd6fa3ea07396dc627f6c3a234e644ab6d44517,4115e648b4af174ff02cc5731930bd97822de804..994c62350b78861aad5c79915f128bb504bca8ad
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -378,9 -378,8 +378,9 @@@ F: drivers/acpi/viot.
  F:    include/linux/acpi_viot.h
  
  ACPI WMI DRIVER
 +M:    Armin Wolf <[email protected]>
  L:    [email protected]
 -S:    Orphan
 +S:    Maintained
  F:    Documentation/driver-api/wmi.rst
  F:    Documentation/wmi/
  F:    drivers/platform/x86/wmi.c
@@@ -471,6 -470,7 +471,6 @@@ F: drivers/hwmon/adm1029.
  ADM8211 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/admtek/adm8211.*
  
  ADP1653 FLASH CONTROLLER DRIVER
@@@ -1460,6 -1460,7 +1460,6 @@@ F:      drivers/hwmon/applesmc.
  APPLETALK NETWORK LAYER
  L:    [email protected]
  S:    Odd fixes
 -F:    drivers/net/appletalk/
  F:    include/linux/atalk.h
  F:    include/uapi/linux/atalk.h
  F:    net/appletalk/
@@@ -1584,17 -1585,6 +1584,17 @@@ F:    arch/arm/include/asm/arch_timer.
  F:    arch/arm64/include/asm/arch_timer.h
  F:    drivers/clocksource/arm_arch_timer.c
  
 +ARM GENERIC INTERRUPT CONTROLLER DRIVERS
 +M:    Marc Zyngier <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/interrupt-controller/arm,gic*
 +F:    arch/arm/include/asm/arch_gicv3.h
 +F:    arch/arm64/include/asm/arch_gicv3.h
 +F:    drivers/irqchip/irq-gic*.[ch]
 +F:    include/linux/irqchip/arm-gic*.h
 +F:    include/linux/irqchip/arm-vgic-info.h
 +
  ARM HDLCD DRM DRIVER
  M:    Liviu Dudau <[email protected]>
  S:    Supported
@@@ -1636,13 -1626,13 +1636,13 @@@ F:   drivers/gpu/drm/arm/display/include
  F:    drivers/gpu/drm/arm/display/komeda/
  
  ARM MALI PANFROST DRM DRIVER
 +M:    Boris Brezillon <[email protected]>
  M:    Rob Herring <[email protected]>
 -M:    Tomeu Vizoso <[email protected]>
  R:    Steven Price <[email protected]>
 -R:    Alyssa Rosenzweig <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/gpu/panfrost.rst
  F:    drivers/gpu/drm/panfrost/
  F:    include/uapi/drm/panfrost_drm.h
  
@@@ -1672,7 -1662,7 +1672,7 @@@ F:      arch/arm*/include/asm/perf_event.
  F:    arch/arm*/kernel/hw_breakpoint.c
  F:    arch/arm*/kernel/perf_*
  F:    drivers/perf/
 -F:    include/linux/perf/arm_pmu.h
 +F:    include/linux/perf/arm_pmu*.h
  
  ARM PORT
  M:    Russell King <[email protected]>
@@@ -1798,7 -1788,7 +1798,7 @@@ F:      drivers/irqchip/irq-owl-sirq.
  F:    drivers/mmc/host/owl-mmc.c
  F:    drivers/net/ethernet/actions/
  F:    drivers/pinctrl/actions/*
 -F:    drivers/soc/actions/
 +F:    drivers/pmdomain/actions/
  F:    include/dt-bindings/power/owl-*
  F:    include/dt-bindings/reset/actions,*
  F:    include/linux/soc/actions/
@@@ -1826,13 -1816,6 +1826,13 @@@ N:    allwinne
  N:    sun[x456789]i
  N:    sun[25]0i
  
 +ARM/AMD PENSANDO ARM64 ARCHITECTURE
 +M:    Brad Larson <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +S:    Supported
 +F:    Documentation/devicetree/bindings/*/amd,pensando*
 +F:    arch/arm64/boot/dts/amd/elba*
 +
  ARM/Amlogic Meson SoC CLOCK FRAMEWORK
  M:    Neil Armstrong <[email protected]>
  M:    Jerome Brunet <[email protected]>
@@@ -1872,7 -1855,7 +1872,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/pmdomain/amlogic/
  F:    drivers/mmc/host/meson*
  F:    drivers/phy/amlogic/
  F:    drivers/pinctrl/meson/
@@@ -1935,7 -1918,7 +1935,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/pmdomain/apple/
  F:    drivers/i2c/busses/i2c-pasemi-core.c
  F:    drivers/i2c/busses/i2c-pasemi-platform.c
  F:    drivers/iommu/apple-dart.c
@@@ -1980,12 -1963,12 +1980,12 @@@ F:   drivers/irqchip/irq-aspeed-i2c-ic.
  
  ARM/ASPEED MACHINE SUPPORT
  M:    Joel Stanley <[email protected]>
 -R:    Andrew Jeffery <andrew@aj.id.au>
 +R:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  Q:    https://patchwork.ozlabs.org/project/linux-aspeed/list/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git
  F:    Documentation/devicetree/bindings/arm/aspeed/
  F:    arch/arm/boot/dts/aspeed/
  F:    arch/arm/mach-aspeed/
@@@ -2228,28 -2211,21 +2228,28 @@@ F:   arch/arm/boot/dts/ti/omap/omap3-igep
  ARM/INTEL IXP4XX ARM ARCHITECTURE
  M:    Linus Walleij <[email protected]>
  M:    Imre Kaloz <[email protected]>
 -M:    Krzysztof Halasa <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    Documentation/devicetree/bindings/arm/intel-ixp4xx.yaml
 -F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt
 +F:    Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml
  F:    Documentation/devicetree/bindings/interrupt-controller/intel,ixp4xx-interrupt.yaml
  F:    Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion*
 +F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
  F:    Documentation/devicetree/bindings/timer/intel,ixp4xx-timer.yaml
  F:    arch/arm/boot/dts/intel/ixp/
  F:    arch/arm/mach-ixp4xx/
  F:    drivers/bus/intel-ixp4xx-eb.c
 +F:    drivers/char/hw_random/ixp4xx-rng.c
  F:    drivers/clocksource/timer-ixp4xx.c
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  F:    drivers/gpio/gpio-ixp4xx.c
  F:    drivers/irqchip/irq-ixp4xx.c
 +F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 +F:    drivers/net/wan/ixp4xx_hss.c
 +F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 +F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 +F:    include/linux/soc/ixp4xx/npe.h
 +F:    include/linux/soc/ixp4xx/qmgr.h
  
  ARM/INTEL KEEMBAY ARCHITECTURE
  M:    Paul J. Murphy <[email protected]>
@@@ -2351,7 -2327,7 +2351,7 @@@ F:      drivers/rtc/rtc-mt7622.
  
  ARM/Mediatek SoC support
  M:    Matthias Brugger <[email protected]>
 -R:    AngeloGioacchino Del Regno <[email protected]>
 +M:    AngeloGioacchino Del Regno <[email protected]>
  L:    [email protected]
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
@@@ -2459,7 -2435,7 +2459,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/pmdomain/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
@@@ -2622,7 -2598,7 +2622,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/pmdomain/renesas/
  F:    drivers/soc/renesas/
  F:    include/linux/soc/renesas/
  K:    \brenesas,
@@@ -3082,7 -3058,7 +3082,7 @@@ F:      Documentation/devicetree/bindings/pe
  F:    drivers/peci/controller/peci-aspeed.c
  
  ASPEED PINCTRL DRIVERS
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3099,7 -3075,7 +3099,7 @@@ F:      drivers/irqchip/irq-aspeed-scu-ic.
  F:    include/dt-bindings/interrupt-controller/aspeed-scu-ic.h
  
  ASPEED SD/MMC DRIVER
 -M:    Andrew Jeffery <andrew@aj.id.au>
 +M:    Andrew Jeffery <andrew@codeconstruct.com.au>
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected] (moderated for non-subscribers)
  L:    [email protected]
@@@ -3368,7 -3344,7 +3368,7 @@@ AX.25 NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/ax25.h
  F:    include/uapi/linux/ax25.h
  F:    net/ax25/
@@@ -3488,14 -3464,6 +3488,14 @@@ W:    http://bcache.evilpiepirate.or
  C:    irc://irc.oftc.net/bcache
  F:    drivers/md/bcache/
  
 +BCACHEFS
 +M:    Kent Overstreet <[email protected]>
 +R:    Brian Foster <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    fs/bcachefs/
 +
  BDISP ST MEDIA DRIVER
  M:    Fabien Dessenne <[email protected]>
  L:    [email protected]
@@@ -3628,10 -3596,9 +3628,10 @@@ F:    Documentation/devicetree/bindings/ii
  F:    drivers/iio/accel/bma400*
  
  BPF JIT for ARM
 -M:    Shubham Bansal <[email protected]>
 +M:    Russell King <[email protected]>
 +M:    Puranjay Mohan <[email protected]>
  L:    [email protected]
 -S:    Odd Fixes
 +S:    Maintained
  F:    arch/arm/net/
  
  BPF JIT for ARM64
@@@ -3811,15 -3778,6 +3811,15 @@@ L:    [email protected]
  S:    Odd Fixes
  K:    (?:\b|_)bpf(?:\b|_)
  
 +BPF [NETKIT] (BPF-programmable network device)
 +M:    Daniel Borkmann <[email protected]>
 +M:    Nikolay Aleksandrov <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/net/netkit.c
 +F:    include/net/netkit.h
 +
  BPF [NETWORKING] (struct_ops, reuseport)
  M:    Martin KaFai Lau <[email protected]>
  L:    [email protected]
@@@ -4068,7 -4026,7 +4068,7 @@@ F:      arch/mips/kernel/*bmips
  F:    drivers/irqchip/irq-bcm63*
  F:    drivers/irqchip/irq-bcm7*
  F:    drivers/irqchip/irq-brcmstb*
 -F:    drivers/genpd/bcm/bcm63xx-power.c
 +F:    drivers/pmdomain/bcm/bcm63xx-power.c
  F:    include/linux/bcm963xx_nvram.h
  F:    include/linux/bcm963xx_tag.h
  
@@@ -4124,7 -4082,7 +4124,7 @@@ F:      drivers/net/wireless/broadcom/brcm80
  
  BROADCOM BRCMSTB GPIO DRIVER
  M:    Doug Berger <[email protected]>
 -M:    Florian Fainelli <florian.fainelli@broadcom>
 +M:    Florian Fainelli <florian.fainelli@broadcom.com>
  R:    Broadcom internal kernel review list <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/gpio/brcm,brcmstb-gpio.yaml
@@@ -4290,7 -4248,7 +4290,7 @@@ R:      Broadcom internal kernel review lis
  L:    [email protected]
  S:    Maintained
  T:    git https://github.com/broadcom/stblinux.git
 -F:    drivers/genpd/bcm/bcm-pmb.c
 +F:    drivers/pmdomain/bcm/bcm-pmb.c
  F:    include/dt-bindings/soc/bcm-pmb.h
  
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
@@@ -4362,7 -4320,8 +4362,7 @@@ F:      drivers/net/ethernet/broadcom/bcmsys
  F:    drivers/net/ethernet/broadcom/unimac.h
  
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
 -M:    Siva Reddy Kallam <[email protected]>
 -M:    Prashant Sreedharan <[email protected]>
 +M:    Pavan Chebbi <[email protected]>
  M:    Michael Chan <[email protected]>
  L:    [email protected]
  S:    Supported
@@@ -4419,6 -4378,7 +4419,6 @@@ M:      David Sterba <[email protected]
  L:    [email protected]
  S:    Maintained
  W:    https://btrfs.readthedocs.io
 -W:    https://btrfs.wiki.kernel.org/
  Q:    https://patchwork.kernel.org/project/linux-btrfs/list/
  C:    irc://irc.libera.chat/btrfs
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git
@@@ -4835,13 -4795,6 +4835,13 @@@ X:    drivers/char/ipmi
  X:    drivers/char/random.c
  X:    drivers/char/tpm/
  
 +CHARGERLAB POWER-Z HARDWARE MONITOR DRIVER
 +M:    Thomas Weißschuh <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    Documentation/hwmon/powerz.rst
 +F:    drivers/hwmon/powerz.c
 +
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
  M:    Joe Perches <[email protected]>
@@@ -5098,14 -5051,6 +5098,14 @@@ T:    git git://git.kernel.org/pub/scm/lin
  F:    Documentation/devicetree/bindings/timer/
  F:    drivers/clocksource/
  
 +CLOSURES
 +M:    Kent Overstreet <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/closure.h
 +F:    lib/closure.c
 +
  CMPC ACPI DRIVER
  M:    Thadeu Lima de Souza Cascardo <[email protected]>
  M:    Daniel Oliveira Nascimento <[email protected]>
@@@ -5251,12 -5196,6 +5251,12 @@@ S:    Orpha
  W:    http://accessrunner.sourceforge.net/
  F:    drivers/usb/atm/cxacru.c
  
 +CONFIDENTIAL COMPUTING THREAT MODEL FOR X86 VIRTUALIZATION (SNP/TDX)
 +M:    Elena Reshetova <[email protected]>
 +M:    Carlos Bilbao <[email protected]>
 +S:    Maintained
 +F:    Documentation/security/snp-tdx-threat-model.rst
 +
  CONFIGFS
  M:    Joel Becker <[email protected]>
  M:    Christoph Hellwig <[email protected]>
@@@ -5371,6 -5310,12 +5371,6 @@@ M:     Bence Csókás <[email protected]
  S:    Maintained
  F:    drivers/i2c/busses/i2c-cp2615.c
  
 -CPMAC ETHERNET DRIVER
 -M:    Florian Fainelli <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/ti/cpmac.c
 -
  CPU FREQUENCY DRIVERS - VEXPRESS SPC ARM BIG LITTLE
  M:    Viresh Kumar <[email protected]>
  M:    Sudeep Holla <[email protected]>
@@@ -5654,7 -5599,7 +5654,7 @@@ M:      Andrew Donnellan <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/ABI/testing/sysfs-class-cxl
 -F:    Documentation/powerpc/cxl.rst
 +F:    Documentation/arch/powerpc/cxl.rst
  F:    arch/powerpc/platforms/powernv/pci-cxl.c
  F:    drivers/misc/cxl/
  F:    include/misc/cxl*
@@@ -5666,7 -5611,7 +5666,7 @@@ M:      Matthew R. Ochs <[email protected]
  M:    Uma Krishnan <[email protected]>
  L:    [email protected]
  S:    Supported
 -F:    Documentation/powerpc/cxlflash.rst
 +F:    Documentation/arch/powerpc/cxlflash.rst
  F:    drivers/scsi/cxlflash/
  F:    include/uapi/scsi/cxlflash_ioctl.h
  
@@@ -6041,9 -5986,8 +6041,9 @@@ F:      include/linux/devm-helpers.
  DEVICE-MAPPER  (LVM)
  M:    Alasdair Kergon <[email protected]>
  M:    Mike Snitzer <[email protected]>
 -M:    [email protected]
 -L:    [email protected]
 +M:    Mikulas Patocka <[email protected]>
 +M:    [email protected]
 +L:    [email protected]
  S:    Maintained
  W:    http://sources.redhat.com/dm
  Q:    http://patchwork.kernel.org/project/dm-devel/list/
@@@ -6172,11 -6116,11 +6172,11 @@@ F:   drivers/video/fbdev/udlfb.
  F:    include/video/udlfb.h
  
  DISTRIBUTED LOCK MANAGER (DLM)
 -M:    Christine Caulfield <ccaulfie@redhat.com>
 +M:    Alexander Aring <aahringo@redhat.com>
  M:    David Teigland <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    http://sources.redhat.com/cluster/
 +W:    https://pagure.io/dlm
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
  F:    fs/dlm/
  
@@@ -6189,7 -6133,6 +6189,7 @@@ L:      [email protected] (mode
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/driver-api/dma-buf.rst
 +F:    Documentation/userspace-api/dma-buf-alloc-exchange.rst
  F:    drivers/dma-buf/
  F:    include/linux/*fence.h
  F:    include/linux/dma-buf.h
@@@ -6392,17 -6335,6 +6392,17 @@@ F:    Documentation/networking/device_driv
  F:    drivers/net/ethernet/freescale/dpaa2/dpaa2-switch*
  F:    drivers/net/ethernet/freescale/dpaa2/dpsw*
  
 +DPLL SUBSYSTEM
 +M:    Vadim Fedorenko <[email protected]>
 +M:    Arkadiusz Kubalewski <[email protected]>
 +M:    Jiri Pirko <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    Documentation/driver-api/dpll.rst
 +F:    drivers/dpll/*
 +F:    include/linux/dpll.h
 +F:    include/uapi/linux/dpll.h
 +
  DRBD DRIVER
  M:    Philipp Reisner <[email protected]>
  M:    Lars Ellenberg <[email protected]>
@@@ -6682,7 -6614,6 +6682,7 @@@ S:      Maintaine
  B:    https://gitlab.freedesktop.org/drm/msm/-/issues
  T:    git https://gitlab.freedesktop.org/drm/msm.git
  F:    Documentation/devicetree/bindings/display/msm/
 +F:    drivers/gpu/drm/ci/xfails/msm*
  F:    drivers/gpu/drm/msm/
  F:    include/uapi/drm/msm_drm.h
  
@@@ -6715,9 -6646,9 +6715,9 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/panel/panel-novatek-nt36672a.c
  
  DRM DRIVER FOR NVIDIA GEFORCE/QUADRO GPUS
 -M:    Ben Skeggs <[email protected]>
  M:    Karol Herbst <[email protected]>
  M:    Lyude Paul <[email protected]>
 +M:    Danilo Krummrich <[email protected]>
  L:    [email protected]
  L:    [email protected]
  S:    Supported
@@@ -6818,7 -6749,7 +6818,7 @@@ F:      drivers/gpu/drm/panel/panel-sitronix
  DRM DRIVER FOR SITRONIX ST7703 PANELS
  M:    Guido Günther <[email protected]>
  R:    Purism Kernel Team <[email protected]>
 -R:    Ondrej Jirman <meg[email protected]>
 +R:    Ondrej Jirman <meg[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/panel/rocktech,jh057n00900.yaml
  F:    drivers/gpu/drm/panel/panel-sitronix-st7703.c
@@@ -6834,8 -6765,7 +6834,8 @@@ DRM DRIVER FOR SOLOMON SSD130X OLED DIS
  M:    Javier Martinez Canillas <[email protected]>
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 -F:    Documentation/devicetree/bindings/display/solomon,ssd1307fb.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd-common.yaml
 +F:    Documentation/devicetree/bindings/display/solomon,ssd13*.yaml
  F:    drivers/gpu/drm/solomon/ssd130x*
  
  DRM DRIVER FOR ST-ERICSSON MCDE
@@@ -6930,26 -6860,12 +6930,26 @@@ M:   Thomas Zimmermann <tzimmermann@suse.
  S:    Maintained
  W:    https://01.org/linuxgraphics/gfx-docs/maintainer-tools/drm-misc.html
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    Documentation/devicetree/bindings/display/
 +F:    Documentation/devicetree/bindings/gpu/
  F:    Documentation/gpu/
 -F:    drivers/gpu/drm/*
 +F:    drivers/gpu/drm/
  F:    drivers/gpu/vga/
 -F:    include/drm/drm*
 +F:    include/drm/drm
  F:    include/linux/vga*
 -F:    include/uapi/drm/drm*
 +F:    include/uapi/drm/
 +X:    drivers/gpu/drm/amd/
 +X:    drivers/gpu/drm/armada/
 +X:    drivers/gpu/drm/etnaviv/
 +X:    drivers/gpu/drm/exynos/
 +X:    drivers/gpu/drm/i915/
 +X:    drivers/gpu/drm/kmb/
 +X:    drivers/gpu/drm/mediatek/
 +X:    drivers/gpu/drm/msm/
 +X:    drivers/gpu/drm/nouveau/
 +X:    drivers/gpu/drm/radeon/
 +X:    drivers/gpu/drm/renesas/
 +X:    drivers/gpu/drm/tegra/
  
  DRM DRIVERS FOR ALLWINNER A10
  M:    Maxime Ripard <[email protected]>
@@@ -6970,7 -6886,6 +6970,7 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
  F:    Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
  F:    Documentation/gpu/meson.rst
 +F:    drivers/gpu/drm/ci/xfails/meson*
  F:    drivers/gpu/drm/meson/
  
  DRM DRIVERS FOR ATMEL HLCDC
@@@ -6994,9 -6909,7 +6994,9 @@@ T:      git git://anongit.freedesktop.org/dr
  F:    Documentation/devicetree/bindings/display/bridge/
  F:    drivers/gpu/drm/bridge/
  F:    drivers/gpu/drm/drm_bridge.c
 +F:    drivers/gpu/drm/drm_bridge_connector.c
  F:    include/drm/drm_bridge.h
 +F:    include/drm/drm_bridge_connector.h
  
  DRM DRIVERS FOR EXYNOS
  M:    Inki Dae <[email protected]>
@@@ -7020,12 -6933,10 +7020,12 @@@ F:   Documentation/devicetree/bindings/di
  F:    Documentation/devicetree/bindings/display/fsl,tcon.txt
  F:    drivers/gpu/drm/fsl-dcu/
  
 -DRM DRIVERS FOR FREESCALE IMX
 +DRM DRIVERS FOR FREESCALE IMX 5/6
  M:    Philipp Zabel <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
 +T:    git git://git.pengutronix.de/git/pza/linux
  F:    Documentation/devicetree/bindings/display/imx/
  F:    drivers/gpu/drm/imx/ipuv3/
  F:    drivers/gpu/ipu-v3/
@@@ -7044,7 -6955,7 +7044,7 @@@ DRM DRIVERS FOR GMA500 (Poulsbo, Moores
  M:    Patrik Jakobsson <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://github.com/patjak/drm-gma500
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    drivers/gpu/drm/gma500/
  
  DRM DRIVERS FOR HISILICON
@@@ -7083,7 -6994,6 +7083,7 @@@ L:      [email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Supported
  F:    Documentation/devicetree/bindings/display/mediatek/
 +F:    drivers/gpu/drm/ci/xfails/mediatek*
  F:    drivers/gpu/drm/mediatek/
  F:    drivers/phy/mediatek/phy-mtk-dp.c
  F:    drivers/phy/mediatek/phy-mtk-hdmi*
@@@ -7124,7 -7034,6 +7124,7 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/rockchip/
 +F:    drivers/gpu/drm/ci/xfails/rockchip*
  F:    drivers/gpu/drm/rockchip/
  
  DRM DRIVERS FOR STI
@@@ -7221,7 -7130,7 +7221,7 @@@ F:      Documentation/devicetree/bindings/di
  F:    drivers/gpu/drm/xlnx/
  
  DRM GPU SCHEDULER
 -M:    Luben Tuikov <luben.tuikov@amd.com>
 +M:    Luben Tuikov <ltuikov89@gmail.com>
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
@@@ -7230,7 -7139,6 +7230,7 @@@ F:      include/drm/gpu_scheduler.
  
  DRM PANEL DRIVERS
  M:    Neil Armstrong <[email protected]>
 +R:    Jessica Zhang <[email protected]>
  R:    Sam Ravnborg <[email protected]>
  L:    [email protected]
  S:    Maintained
@@@ -8186,7 -8094,7 +8186,7 @@@ F:      include/linux/arm_ffa.
  
  FIRMWARE LOADER (request_firmware)
  M:    Luis Chamberlain <[email protected]>
 -M:    Russ Weight <russ[email protected]>
 +M:    Russ Weight <russ[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/firmware_class/
@@@ -8708,8 -8616,6 +8708,8 @@@ L:      [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/kbuild/gcc-plugins.rst
 +F:    include/linux/stackleak.h
 +F:    kernel/stackleak.c
  F:    scripts/Makefile.gcc-plugins
  F:    scripts/gcc-plugins/
  
@@@ -8823,14 -8729,7 +8823,14 @@@ 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/
 +F:    drivers/pmdomain/
 +
 +GENERIC RADIX TREE
 +M:    Kent Overstreet <[email protected]>
 +S:    Supported
 +C:    irc://irc.oftc.net/bcache
 +F:    include/linux/generic-radix-tree.h
 +F:    lib/generic-radix-tree.c
  
  GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER
  M:    Eugen Hristev <[email protected]>
@@@ -8976,7 -8875,7 +8976,7 @@@ F:      drivers/gpio/gpio-mockup.
  F:    tools/testing/selftests/gpio/
  
  GPIO REGMAP
 -R:    Michael Walle <[email protected]>
 +M:    Michael Walle <[email protected]>
  S:    Maintained
  F:    drivers/gpio/gpio-regmap.c
  F:    include/linux/gpio/regmap.h
@@@ -9168,7 -9067,6 +9168,7 @@@ T:      git https://git.kernel.org/pub/scm/l
  F:    Documentation/ABI/testing/debugfs-driver-habanalabs
  F:    Documentation/ABI/testing/sysfs-driver-habanalabs
  F:    drivers/accel/habanalabs/
 +F:    include/linux/habanalabs/
  F:    include/trace/events/habanalabs.h
  F:    include/uapi/drm/habanalabs_accel.h
  
@@@ -9634,8 -9532,10 +9634,8 @@@ F:     Documentation/devicetree/bindings/ii
  F:    drivers/iio/pressure/mprls0025pa.c
  
  HOST AP DRIVER
 -M:    Jouni Malinen <[email protected]>
  L:    [email protected]
  S:    Obsolete
 -W:    http://w1.fi/hostap-driver.html
  F:    drivers/net/wireless/intersil/hostap/
  
  HP BIOSCFG DRIVER
@@@ -10035,6 -9935,12 +10035,6 @@@ F:   Documentation/driver-api/i3
  F:    drivers/i3c/
  F:    include/linux/i3c/
  
 -IA64 (Itanium) PLATFORM
 -L:    [email protected]
 -S:    Orphan
 -F:    Documentation/arch/ia64/
 -F:    arch/ia64/
 -
  IBM Operation Panel Input Driver
  M:    Eddie James <[email protected]>
  L:    [email protected]
@@@ -10530,6 -10436,7 +10530,6 @@@ F:   drivers/platform/x86/intel/atomisp2/
  
  INTEL BIOS SAR INT1092 DRIVER
  M:    Shravan Sudhakar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/platform/x86/intel/int1092/
@@@ -10569,7 -10476,6 +10569,7 @@@ C:   irc://irc.oftc.net/intel-gf
  T:    git git://anongit.freedesktop.org/drm-intel
  F:    Documentation/ABI/testing/sysfs-driver-intel-i915-hwmon
  F:    Documentation/gpu/i915.rst
 +F:    drivers/gpu/drm/ci/xfails/i915*
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
  F:    include/uapi/drm/i915_drm.h
@@@ -10717,6 -10623,22 +10717,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c
  
 -INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 -M:    Krzysztof Halasa <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/xscale/ixp4xx_eth.c
 -F:    drivers/net/wan/ixp4xx_hss.c
 -F:    drivers/soc/ixp4xx/ixp4xx-npe.c
 -F:    drivers/soc/ixp4xx/ixp4xx-qmgr.c
 -F:    include/linux/soc/ixp4xx/npe.h
 -F:    include/linux/soc/ixp4xx/qmgr.h
 -
 -INTEL IXP4XX RANDOM NUMBER GENERATOR SUPPORT
 -M:    Deepak Saxena <[email protected]>
 -S:    Maintained
 -F:    Documentation/devicetree/bindings/rng/intel,ixp46x-rng.yaml
 -F:    drivers/char/hw_random/ixp4xx-rng.c
 -
  INTEL KEEM BAY DRM DRIVER
  M:    Anitha Chrisanthus <[email protected]>
  M:    Edmund Dea <[email protected]>
@@@ -10780,7 -10702,7 +10780,7 @@@ F:   drivers/mfd/intel-m10-bmc
  F:    include/linux/mfd/intel-m10-bmc.h
  
  INTEL MAX10 BMC SECURE UPDATES
 -M:    Russ Weight <russell.h.weight@intel.com>
 +M:    Peter Colberg <peter.colberg@intel.com>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update
@@@ -10960,6 -10882,7 +10960,6 @@@ F:   drivers/platform/x86/intel/wmi/thund
  
  INTEL WWAN IOSM DRIVER
  M:    M Chetan Kumar <[email protected]>
 -M:    Intel Corporation <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wwan/iosm/
@@@ -11141,7 -11064,7 +11141,7 @@@ F:   Documentation/devicetree/bindings/so
  F:    sound/soc/codecs/sma*
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
 -M:    Marc Zyngier <[email protected]>
 +M:    Thomas Gleixner <[email protected]>
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    Documentation/core-api/irq/irq-domain.rst
@@@ -11160,6 -11083,7 +11160,6 @@@ F:   lib/group_cpus.
  
  IRQCHIP DRIVERS
  M:    Thomas Gleixner <[email protected]>
 -M:    Marc Zyngier <[email protected]>
  L:    [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
@@@ -11470,20 -11394,16 +11470,20 @@@ F:        usr
  
  KERNEL HARDENING (not covered by other areas)
  M:    Kees Cook <[email protected]>
 +R:    Gustavo A. R. Silva <[email protected]>
  L:    [email protected]
  S:    Supported
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git for-next/hardening
  F:    Documentation/ABI/testing/sysfs-kernel-oops_count
  F:    Documentation/ABI/testing/sysfs-kernel-warn_count
 +F:    arch/*/configs/hardening.config
  F:    include/linux/overflow.h
  F:    include/linux/randomize_kstack.h
 +F:    kernel/configs/hardening.config
  F:    mm/usercopy.c
  K:    \b(add|choose)_random_kstack_offset\b
  K:    \b__check_(object_size|heap_object)\b
 +K:    \b__counted_by\b
  
  KERNEL JANITORS
  L:    [email protected]
@@@ -12177,7 -12097,7 +12177,7 @@@ F:   Documentation/ABI/stable/sysfs-firmw
  F:    Documentation/devicetree/bindings/i2c/i2c-opal.txt
  F:    Documentation/devicetree/bindings/powerpc/
  F:    Documentation/devicetree/bindings/rtc/rtc-opal.txt
 -F:    Documentation/powerpc/
 +F:    Documentation/arch/powerpc/
  F:    arch/powerpc/
  F:    drivers/*/*/*pasemi*
  F:    drivers/*/*pasemi*
@@@ -12533,14 -12453,6 +12533,14 @@@ F: drivers/hwmon/ltc2947-i2c.
  F:    drivers/hwmon/ltc2947-spi.c
  F:    drivers/hwmon/ltc2947.h
  
 +LTC2991 HARDWARE MONITOR DRIVER
 +M:    Antoniu Miclaus <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +W:    https://ez.analog.com/linux-software-drivers
 +F:    Documentation/devicetree/bindings/hwmon/adi,ltc2991.yaml
 +F:    drivers/hwmon/ltc2991.c
 +
  LTC2983 IIO TEMPERATURE DRIVER
  M:    Nuno Sá <[email protected]>
  L:    [email protected]
@@@ -13592,6 -13504,7 +13592,6 @@@ F:   net/dsa/tag_mtk.
  
  MEDIATEK T7XX 5G WWAN MODEM DRIVER
  M:    Chandrashekar Devegowda <[email protected]>
 -M:    Intel Corporation <[email protected]>
  R:    Chiranjeevi Rapolu <[email protected]>
  R:    Liu Haijun <[email protected]>
  R:    M Chetan Kumar <[email protected]>
@@@ -13612,7 -13525,7 +13612,7 @@@ F:   drivers/usb/mtu3
  
  MEGACHIPS STDPXXXX-GE-B850V3-FW LVDS/DP++ BRIDGES
  M:    Peter Senna Tschudin <[email protected]>
 -M:    Martin Donnelly <martin.donnell[email protected]>
 +M:    Ian Ray <ian.ra[email protected]>
  M:    Martyn Welch <[email protected]>
  S:    Maintained
  F:    Documentation/devicetree/bindings/display/bridge/megachips-stdpxxxx-ge-b850v3-fw.txt
@@@ -13704,7 -13617,6 +13704,7 @@@ F:   drivers/net/ethernet/mellanox/mlxfw
  
  MELLANOX HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Vadim Pasternak <[email protected]>
  L:    [email protected]
@@@ -13935,10 -13847,9 +13935,10 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/staging/media/meson/vdec/
  
  METHODE UDPU SUPPORT
 -M:    Vladimir Vid <vladimir.vid@sartura.hr>
 +M:    Robert Marko <robert.marko@sartura.hr>
  S:    Maintained
 -F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts
 +F:    arch/arm64/boot/dts/marvell/armada-3720-uDPU.*
  
  MHI BUS
  M:    Manivannan Sadhasivam <[email protected]>
@@@ -14117,7 -14028,7 +14117,7 @@@ F:   Documentation/devicetree/bindings/ii
  F:    drivers/iio/adc/mcp3911.c
  
  MICROCHIP MMC/SD/SDIO MCI DRIVER
 -M:    Ludovic Desroches <ludovic.desroche[email protected]>
 +M:    Aubin Constans <aubin.constan[email protected]>
  S:    Maintained
  F:    drivers/mmc/host/atmel-mci.c
  
@@@ -14300,7 -14211,6 +14300,7 @@@ F:   drivers/platform/surface/surface_gpe
  
  MICROSOFT SURFACE HARDWARE PLATFORM SUPPORT
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  M:    Maximilian Luz <[email protected]>
  L:    [email protected]
@@@ -14436,11 -14346,9 +14436,11 @@@ MIPS/LOONGSON1 ARCHITECTUR
  M:    Keguang Zhang <[email protected]>
  L:    [email protected]
  S:    Maintained
 +F:    Documentation/devicetree/bindings/*/loongson,ls1*.yaml
  F:    arch/mips/include/asm/mach-loongson32/
  F:    arch/mips/loongson32/
  F:    drivers/*/*loongson1*
 +F:    drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
  
  MIPS/LOONGSON2EF ARCHITECTURE
  M:    Jiaxun Yang <[email protected]>
@@@ -14468,11 -14376,6 +14468,11 @@@ W: https://linuxtv.or
  T:    git git://linuxtv.org/media_tree.git
  F:    drivers/media/radio/radio-miropcm20*
  
 +MITSUMI MM8013 FG DRIVER
 +M:    Konrad Dybcio <[email protected]>
 +F:    Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml
 +F:    drivers/power/supply/mm8013.c
 +
  MMP SUPPORT
  R:    Lubomir Rintel <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -14527,7 -14430,7 +14527,7 @@@ L:   [email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-next
  F:    include/linux/kmod.h
 -F:    include/linux/module.h
 +F:    include/linux/module*.h
  F:    kernel/module/
  F:    lib/test_kmod.c
  F:    scripts/module*
@@@ -14854,7 -14757,7 +14854,7 @@@ NETROM NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/netrom.h
  F:    include/uapi/linux/netrom.h
  F:    net/netrom/
@@@ -15043,7 -14946,7 +15043,7 @@@ K:   macse
  K:    \bmdo_
  
  NETWORKING [MPTCP]
 -M:    Matthieu Baerts <matt[email protected]>
 +M:    Matthieu Baerts <matt[email protected]>
  M:    Mat Martineau <[email protected]>
  L:    [email protected]
  L:    [email protected]
@@@ -15052,11 -14955,10 +15052,11 @@@ W:        https://github.com/multipath-tcp/mpt
  B:    https://github.com/multipath-tcp/mptcp_net-next/issues
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export-net
  T:    git https://github.com/multipath-tcp/mptcp_net-next.git export
 +F:    Documentation/netlink/specs/mptcp.yaml
  F:    Documentation/networking/mptcp-sysctl.rst
  F:    include/net/mptcp.h
  F:    include/trace/events/mptcp.h
 -F:    include/uapi/linux/mptcp.h
 +F:    include/uapi/linux/mptcp*.h
  F:    net/mptcp/
  F:    tools/testing/selftests/bpf/*/*mptcp*.c
  F:    tools/testing/selftests/net/mptcp/
@@@ -15229,7 -15131,7 +15229,7 @@@ NOLIBC HEADER FIL
  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
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git
  F:    tools/include/nolibc/
  F:    tools/testing/selftests/nolibc/
  
@@@ -15449,7 -15351,6 +15449,7 @@@ M:   Laurentiu Palcu <laurentiu.palcu@oss
  R:    Lucas Stach <[email protected]>
  L:    [email protected]
  S:    Maintained
 +T:    git git://anongit.freedesktop.org/drm/drm-misc
  F:    Documentation/devicetree/bindings/display/imx/nxp,imx8mq-dcss.yaml
  F:    drivers/gpu/drm/imx/dcss/
  
@@@ -15559,13 -15460,6 +15559,13 @@@ F: include/linux/objagg.
  F:    lib/objagg.c
  F:    lib/test_objagg.c
  
 +OBJPOOL
 +M:    Matt Wu <[email protected]>
 +S:    Supported
 +F:    include/linux/objpool.h
 +F:    lib/objpool.c
 +F:    lib/test_objpool.c
 +
  OBJTOOL
  M:    Josh Poimboeuf <[email protected]>
  M:    Peter Zijlstra <[email protected]>
@@@ -16077,7 -15971,6 +16077,7 @@@ F:   Documentation/ABI/testing/sysfs-firm
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 +F:    tools/testing/selftests/dt/
  K:    of_overlay_notifier_
  K:    of_overlay_fdt_apply
  K:    of_overlay_remove
@@@ -16376,6 -16269,11 +16376,6 @@@ L:  [email protected]
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCDP - PRIMARY CONSOLE AND DEBUG PORT
 -M:    Khalid Aziz <[email protected]>
 -S:    Maintained
 -F:    drivers/firmware/pcdp.*
 -
  PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
  M:    Thomas Petazzoni <[email protected]>
  M:    Pali Rohár <[email protected]>
@@@ -16526,6 -16424,7 +16526,7 @@@ L:   [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pci/*rcar*
  F:    drivers/pci/controller/*rcar*
+ F:    drivers/pci/controller/dwc/*rcar*
  
  PCI DRIVER FOR SAMSUNG EXYNOS
  M:    Jingoo Han <[email protected]>
@@@ -16593,7 -16492,7 +16594,7 @@@ R:   Oliver O'Halloran <[email protected]
  L:    [email protected]
  S:    Supported
  F:    Documentation/PCI/pci-error-recovery.rst
 -F:    Documentation/powerpc/eeh-pci-error-recovery.rst
 +F:    Documentation/arch/powerpc/eeh-pci-error-recovery.rst
  F:    arch/powerpc/include/*/eeh*.h
  F:    arch/powerpc/kernel/eeh*.c
  F:    arch/powerpc/platforms/*/eeh*.c
@@@ -17703,7 -17602,6 +17704,7 @@@ M:   Kalle Valo <[email protected]
  M:    Jeff Johnson <[email protected]>
  L:    [email protected]
  S:    Supported
 +W:    https://wireless.wiki.kernel.org/en/users/Drivers/ath12k
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
  F:    drivers/net/wireless/ath/ath12k/
  
@@@ -17783,7 -17681,7 +17784,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/power/avs/qcom,cpr.yaml
 -F:    drivers/genpd/qcom/cpr.c
 +F:    drivers/pmdomain/qcom/cpr.c
  
  QUALCOMM CPUFREQ DRIVER MSM8996/APQ8096
  M:    Ilia Lin <[email protected]>
@@@ -17903,18 -17801,6 +17904,18 @@@ S: Maintaine
  F:    Documentation/devicetree/bindings/mtd/qcom,nandc.yaml
  F:    drivers/mtd/nand/raw/qcom_nandc.c
  
 +QUALCOMM QSEECOM DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom.c
 +
 +QUALCOMM QSEECOM UEFISECAPP DRIVER
 +M:    Maximilian Luz <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/firmware/qcom/qcom_qseecom_uefisecapp.c
 +
  QUALCOMM RMNET DRIVER
  M:    Subash Abhinov Kasiviswanathan <[email protected]>
  M:    Sean Tranchetti <[email protected]>
@@@ -17977,7 -17863,6 +17978,7 @@@ C:   irc://irc.oftc.net/radeo
  T:    git https://gitlab.freedesktop.org/agd5f/linux.git
  F:    Documentation/gpu/amdgpu/
  F:    drivers/gpu/drm/amd/
 +F:    drivers/gpu/drm/ci/xfails/amd*
  F:    drivers/gpu/drm/radeon/
  F:    include/uapi/drm/amdgpu_drm.h
  F:    include/uapi/drm/radeon_drm.h
@@@ -18042,6 -17927,7 +18043,6 @@@ F:   arch/mips/boot/dts/ralink/mt7621
  
  RALINK RT2X00 WIRELESS LAN DRIVER
  M:    Stanislaw Gruszka <[email protected]>
 -M:    Helmut Schaa <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    drivers/net/wireless/ralink/rt2x00/
@@@ -18246,6 -18132,8 +18247,6 @@@ REALTEK WIRELESS DRIVER (rtlwifi family
  M:    Ping-Ke Shih <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
  F:    drivers/net/wireless/realtek/rtlwifi/
  
  REALTEK WIRELESS DRIVER (rtw88)
@@@ -18531,7 -18419,7 +18532,7 @@@ L:   [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-riscv/list/
  C:    irc://irc.libera.chat/riscv
 -P:    Documentation/riscv/patch-acceptance.rst
 +P:    Documentation/arch/riscv/patch-acceptance.rst
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git
  F:    arch/riscv/
  N:    riscv
@@@ -18721,7 -18609,7 +18722,7 @@@ ROSE NETWORK LAYE
  M:    Ralf Baechle <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    http://www.linux-ax25.org/
 +W:    https://linux-ax25.in-berlin.de
  F:    include/net/rose.h
  F:    include/uapi/linux/rose.h
  F:    net/rose/
@@@ -18773,6 -18661,7 +18774,6 @@@ F:   drivers/media/dvb-frontends/rtl2832_
  RTL8180 WIRELESS DRIVER
  L:    [email protected]
  S:    Orphan
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8180/
  
  RTL8187 WIRELESS DRIVER
@@@ -18780,12 -18669,14 +18781,12 @@@ M:        Hin-Tak Leung <[email protected]
  M:    Larry Finger <[email protected]>
  L:    [email protected]
  S:    Maintained
 -W:    https://wireless.wiki.kernel.org/
  F:    drivers/net/wireless/realtek/rtl818x/rtl8187/
  
  RTL8XXXU WIRELESS DRIVER (rtl8xxxu)
  M:    Jes Sorensen <[email protected]>
  L:    [email protected]
  S:    Maintained
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jes/linux.git rtl8xxxu-devel
  F:    drivers/net/wireless/realtek/rtl8xxxu/
  
  RTRS TRANSPORT DRIVERS
@@@ -18818,10 -18709,9 +18819,10 @@@ R: Andreas Hindborg <a.hindborg@samsung
  R:    Alice Ryhl <[email protected]>
  L:    [email protected]
  S:    Supported
 -W:    https://github.com/Rust-for-Linux/linux
 +W:    https://rust-for-linux.com
  B:    https://github.com/Rust-for-Linux/linux/issues
  C:    zulip://rust-for-linux.zulipchat.com
 +P:    https://rust-for-linux.com/contributing
  T:    git https://github.com/Rust-for-Linux/linux.git rust-next
  F:    Documentation/rust/
  F:    rust/
@@@ -19356,8 -19246,7 +19357,8 @@@ F:   Documentation/devicetree/bindings/mm
  F:    drivers/mmc/host/sdhci*
  
  SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) MICROCHIP DRIVER
 -M:    Eugen Hristev <[email protected]>
 +M:    Aubin Constans <[email protected]>
 +R:    Eugen Hristev <[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/sdhci-of-at91.c
@@@ -19514,7 -19403,6 +19515,7 @@@ F:   drivers/net/ethernet/sfc
  
  SFCTEMP HWMON DRIVER
  M:    Emil Renner Berthing <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/hwmon/starfive,jh71x0-temp.yaml
@@@ -20176,13 -20064,6 +20177,13 @@@ F: drivers/char/sonypi.
  F:    drivers/platform/x86/sony-laptop.c
  F:    include/linux/sony-laptop.h
  
 +SOPHGO DEVICETREES
 +M:    Chao Wei <[email protected]>
 +M:    Chen Wang <[email protected]>
 +S:    Maintained
 +F:    arch/riscv/boot/dts/sophgo/
 +F:    Documentation/devicetree/bindings/riscv/sophgo.yaml
 +
  SOUND
  M:    Jaroslav Kysela <[email protected]>
  M:    Takashi Iwai <[email protected]>
@@@ -20609,7 -20490,6 +20610,7 @@@ F:   include/dt-bindings/clock/starfive?j
  STARFIVE JH71X0 PINCTRL DRIVERS
  M:    Emil Renner Berthing <[email protected]>
  M:    Jianlong Huang <[email protected]>
 +M:    Hal Feng <[email protected]>
  L:    [email protected]
  S:    Maintained
  F:    Documentation/devicetree/bindings/pinctrl/starfive,jh71*.yaml
@@@ -20633,10 -20513,9 +20634,10 @@@ F: drivers/usb/cdns3/cdns3-starfive.
  
  STARFIVE JH71XX PMU CONTROLLER DRIVER
  M:    Walker Chen <[email protected]>
 +M:    Changhuang Liang <[email protected]>
  S:    Supported
  F:    Documentation/devicetree/bindings/power/starfive*
 -F:    drivers/genpd/starfive/jh71xx-pmu.c
 +F:    drivers/pmdomain/starfive/
  F:    include/dt-bindings/power/starfive,jh7110-pmu.h
  
  STARFIVE SOC DRIVERS
@@@ -20644,6 -20523,7 +20645,6 @@@ 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
  M:    Jia Jie Ho <[email protected]>
@@@ -21024,7 -20904,6 +21025,7 @@@ F:   drivers/clk/clk-sc[mp]i.
  F:    drivers/cpufreq/sc[mp]i-cpufreq.c
  F:    drivers/firmware/arm_scmi/
  F:    drivers/firmware/arm_scpi.c
 +F:    drivers/pmdomain/arm/
  F:    drivers/powercap/arm_scmi_powercap.c
  F:    drivers/regulator/scmi-regulator.c
  F:    drivers/reset/reset-scmi.c
@@@ -21461,7 -21340,7 +21462,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/genpd/ti/ti_sci_pm_domains.c
 +F:    drivers/pmdomain/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
@@@ -21484,8 -21363,8 +21485,8 @@@ F:   drivers/media/radio/radio-raremono.
  THERMAL
  M:    Rafael J. Wysocki <[email protected]>
  M:    Daniel Lezcano <[email protected]>
 -R:    Amit Kucheria <[email protected]>
  R:    Zhang Rui <[email protected]>
 +R:    Lukasz Luba <[email protected]>
  L:    [email protected]
  S:    Supported
  Q:    https://patchwork.kernel.org/project/linux-pm/list/
@@@ -21703,7 -21582,7 +21704,7 @@@ L:   [email protected]
  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/pmdomain/ti/omap_prm.c
  F:    drivers/soc/ti/*
  
  TI LM49xxx FAMILY ASoC CODEC DRIVERS
@@@ -21779,6 -21658,7 +21780,6 @@@ L:   [email protected]
  S:    Orphan
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl12xx
  W:    https://wireless.wiki.kernel.org/en/users/Drivers/wl1251
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx.git
  F:    drivers/net/wireless/ti/
  
  TIMEKEEPING, CLOCKSOURCE CORE, NTP, ALARMTIMER
@@@ -21952,11 -21832,9 +21953,11 @@@ W: https://www.tq-group.com/en/products
  F:    arch/arm/boot/dts/imx*mba*.dts*
  F:    arch/arm/boot/dts/imx*tqma*.dts*
  F:    arch/arm/boot/dts/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/fsl-*tqml*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*mba*.dts*
  F:    arch/arm64/boot/dts/freescale/imx*tqma*.dts*
  F:    arch/arm64/boot/dts/freescale/mba*.dtsi
 +F:    arch/arm64/boot/dts/freescale/tqml*.dts*
  F:    drivers/gpio/gpio-tqmx86.c
  F:    drivers/mfd/tqmx86.c
  F:    drivers/watchdog/tqmx86_wdt.c
@@@ -22969,7 -22847,6 +22970,7 @@@ L:   [email protected]
  L:    [email protected]
  S:    Maintained
  T:    git git://anongit.freedesktop.org/drm/drm-misc
 +F:    drivers/gpu/drm/ci/xfails/virtio*
  F:    drivers/gpu/drm/virtio/
  F:    include/uapi/linux/virtio_gpu.h
  
@@@ -23163,7 -23040,7 +23164,7 @@@ F:   drivers/scsi/vmw_pvscsi.
  F:    drivers/scsi/vmw_pvscsi.h
  
  VMWARE VIRTUAL PTP CLOCK DRIVER
 -M:    Deep Shah <sdeep@vmware.com>
 +M:    Jeff Sipek <jsipek@vmware.com>
  R:    Ajay Kaher <[email protected]>
  R:    Alexey Makhalov <[email protected]>
  R:    VMware PV-Drivers Reviewers <[email protected]>
@@@ -23548,11 -23425,9 +23549,11 @@@ F: drivers/platform/x86/x86-android-tab
  
  X86 PLATFORM DRIVERS
  M:    Hans de Goede <[email protected]>
 +M:    Ilpo Järvinen <[email protected]>
  M:    Mark Gross <[email protected]>
  L:    [email protected]
  S:    Maintained
 +Q:    https://patchwork.kernel.org/project/platform-driver-x86/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git
  F:    drivers/platform/olpc/
  F:    drivers/platform/x86/
@@@ -23810,11 -23685,6 +23811,11 @@@ F: Documentation/devicetree/bindings/gp
  F:    drivers/gpio/gpio-xilinx.c
  F:    drivers/gpio/gpio-zynq.c
  
 +XILINX LL TEMAC ETHERNET DRIVER
 +L:    [email protected]
 +S:    Orphan
 +F:    drivers/net/ethernet/xilinx/ll_temac*
 +
  XILINX PWM DRIVER
  M:    Sean Anderson <[email protected]>
  S:    Maintained
@@@ -23847,13 -23717,6 +23848,13 @@@ F: Documentation/devicetree/bindings/me
  F:    drivers/media/platform/xilinx/
  F:    include/uapi/linux/xilinx-v4l2-controls.h
  
 +XILINX VERSAL EDAC DRIVER
 +M:    Shubhrajyoti Datta <[email protected]>
 +M:    Sai Krishna Potthuri <[email protected]>
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml
 +F:    drivers/edac/versal_edac.c
 +
  XILINX WATCHDOG DRIVER
  M:    Srinivas Neeli <[email protected]>
  R:    Shubhrajyoti Datta <[email protected]>

diff --combined drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
index d62e497586357da349c9f8ae57709cd5309783bc,327e2fd2401fe1967ab117dee9f609072716766c..4da82fc64fef458ab78e1642b5e1fa2f73405ff7
--- 1/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
--- 2/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c
@@@ -68,7 -68,7 +68,7 @@@ struct amdgpu_acpi_xcc_info 
  struct amdgpu_acpi_dev_info {
        struct list_head list;
        struct list_head xcc_list;
 -      uint16_t bdf;
 +      uint32_t sbdf;
        uint16_t supp_xcp_mode;
        uint16_t xcp_mode;
        uint16_t mem_mode;
@@@ -927,7 -927,7 +927,7 @@@ static acpi_status amdgpu_acpi_get_node
  #endif
  }
  
 -static struct amdgpu_acpi_dev_info *amdgpu_acpi_get_dev(u16 bdf)
 +static struct amdgpu_acpi_dev_info *amdgpu_acpi_get_dev(u32 sbdf)
  {
        struct amdgpu_acpi_dev_info *acpi_dev;
  
@@@ -935,14 -935,14 +935,14 @@@
                return NULL;
  
        list_for_each_entry(acpi_dev, &amdgpu_acpi_dev_list, list)
 -              if (acpi_dev->bdf == bdf)
 +              if (acpi_dev->sbdf == sbdf)
                        return acpi_dev;
  
        return NULL;
  }
  
  static int amdgpu_acpi_dev_init(struct amdgpu_acpi_dev_info **dev_info,
 -                              struct amdgpu_acpi_xcc_info *xcc_info, u16 bdf)
 +                              struct amdgpu_acpi_xcc_info *xcc_info, u32 sbdf)
  {
        struct amdgpu_acpi_dev_info *tmp;
        union acpi_object *obj;
@@@ -955,7 -955,7 +955,7 @@@
  
        INIT_LIST_HEAD(&tmp->xcc_list);
        INIT_LIST_HEAD(&tmp->list);
 -      tmp->bdf = bdf;
 +      tmp->sbdf = sbdf;
  
        obj = acpi_evaluate_dsm_typed(xcc_info->handle, &amd_xcc_dsm_guid, 0,
                                      AMD_XCC_DSM_GET_SUPP_MODE, NULL,
@@@ -1007,7 -1007,7 +1007,7 @@@
  
        DRM_DEBUG_DRIVER(
                "New dev(%x): Supported xcp mode: %x curr xcp_mode : %x mem mode : %x, tmr base: %llx tmr size: %llx  ",
 -              tmp->bdf, tmp->supp_xcp_mode, tmp->xcp_mode, tmp->mem_mode,
 +              tmp->sbdf, tmp->supp_xcp_mode, tmp->xcp_mode, tmp->mem_mode,
                tmp->tmr_base, tmp->tmr_size);
        list_add_tail(&tmp->list, &amdgpu_acpi_dev_list);
        *dev_info = tmp;
@@@ -1023,7 -1023,7 +1023,7 @@@ out
  }
  
  static int amdgpu_acpi_get_xcc_info(struct amdgpu_acpi_xcc_info *xcc_info,
 -                                  u16 *bdf)
 +                                  u32 *sbdf)
  {
        union acpi_object *obj;
        acpi_status status;
@@@ -1054,10 -1054,8 +1054,10 @@@
        xcc_info->phy_id = (obj->integer.value >> 32) & 0xFF;
        /* xcp node of this xcc [47:40] */
        xcc_info->xcp_node = (obj->integer.value >> 40) & 0xFF;
 +      /* PF domain of this xcc [31:16] */
 +      *sbdf = (obj->integer.value) & 0xFFFF0000;
        /* PF bus/dev/fn of this xcc [63:48] */
 -      *bdf = (obj->integer.value >> 48) & 0xFFFF;
 +      *sbdf |= (obj->integer.value >> 48) & 0xFFFF;
        ACPI_FREE(obj);
        obj = NULL;
  
@@@ -1081,7 -1079,7 +1081,7 @@@ static int amdgpu_acpi_enumerate_xcc(vo
        struct acpi_device *acpi_dev;
        char hid[ACPI_ID_LEN];
        int ret, id;
 -      u16 bdf;
 +      u32 sbdf;
  
        INIT_LIST_HEAD(&amdgpu_acpi_dev_list);
        xa_init(&numa_info_xa);
@@@ -1109,16 -1107,16 +1109,16 @@@
                xcc_info->handle = acpi_device_handle(acpi_dev);
                acpi_dev_put(acpi_dev);
  
 -              ret = amdgpu_acpi_get_xcc_info(xcc_info, &bdf);
 +              ret = amdgpu_acpi_get_xcc_info(xcc_info, &sbdf);
                if (ret) {
                        kfree(xcc_info);
                        continue;
                }
  
 -              dev_info = amdgpu_acpi_get_dev(bdf);
 +              dev_info = amdgpu_acpi_get_dev(sbdf);
  
                if (!dev_info)
 -                      ret = amdgpu_acpi_dev_init(&dev_info, xcc_info, bdf);
 +                      ret = amdgpu_acpi_dev_init(&dev_info, xcc_info, sbdf);
  
                if (ret == -ENOMEM)
                        return ret;
@@@ -1138,14 -1136,13 +1138,14 @@@ int amdgpu_acpi_get_tmr_info(struct amd
                             u64 *tmr_size)
  {
        struct amdgpu_acpi_dev_info *dev_info;
 -      u16 bdf;
 +      u32 sbdf;
  
        if (!tmr_offset || !tmr_size)
                return -EINVAL;
  
 -      bdf = pci_dev_id(adev->pdev);
 -      dev_info = amdgpu_acpi_get_dev(bdf);
 +      sbdf = (pci_domain_nr(adev->pdev->bus) << 16);
 +      sbdf |= pci_dev_id(adev->pdev);
 +      dev_info = amdgpu_acpi_get_dev(sbdf);
        if (!dev_info)
                return -ENOENT;
  
@@@ -1160,14 -1157,13 +1160,14 @@@ int amdgpu_acpi_get_mem_info(struct amd
  {
        struct amdgpu_acpi_dev_info *dev_info;
        struct amdgpu_acpi_xcc_info *xcc_info;
 -      u16 bdf;
 +      u32 sbdf;
  
        if (!numa_info)
                return -EINVAL;
  
 -      bdf = pci_dev_id(adev->pdev);
 -      dev_info = amdgpu_acpi_get_dev(bdf);
 +      sbdf = (pci_domain_nr(adev->pdev->bus) << 16);
 +      sbdf |= pci_dev_id(adev->pdev);
 +      dev_info = amdgpu_acpi_get_dev(sbdf);
        if (!dev_info)
                return -ENOENT;
  
@@@ -1393,14 -1389,11 +1393,11 @@@ void amdgpu_acpi_detect(void
        struct pci_dev *pdev = NULL;
        int ret;
  
-       while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
-               if (!atif->handle)
-                       amdgpu_atif_pci_probe_handle(pdev);
-               if (!atcs->handle)
-                       amdgpu_atcs_pci_probe_handle(pdev);
-       }
+       while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
+               if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&
+                   (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))
+                       continue;
  
-       while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
                if (!atif->handle)
                        amdgpu_atif_pci_probe_handle(pdev);
                if (!atcs->handle)

diff --combined drivers/gpu/drm/qxl/qxl_drv.c
index a4144c62ca93909edb20d056a21ed48038ac73fd,b94411ae17f213bcb09a6df4197f2889e32db9cf..46de4f171970b61571ab56fb237826d33c5303c5
--- 1/drivers/gpu/drm/qxl/qxl_drv.c
--- 2/drivers/gpu/drm/qxl/qxl_drv.c
+++ b/drivers/gpu/drm/qxl/qxl_drv.c
@@@ -68,11 -68,6 +68,6 @@@ module_param_named(num_heads, qxl_num_c
  static struct drm_driver qxl_driver;
  static struct pci_driver qxl_pci_driver;
  
- static bool is_vga(struct pci_dev *pdev)
- {
-       return pdev->class == PCI_CLASS_DISPLAY_VGA << 8;
- }
- 
  static int
  qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
  {
@@@ -100,7 -95,7 +95,7 @@@
        if (ret)
                goto disable_pci;
  
-       if (is_vga(pdev) && pdev->revision < 5) {
+       if (pci_is_vga(pdev) && pdev->revision < 5) {
                ret = vga_get_interruptible(pdev, VGA_RSRC_LEGACY_IO);
                if (ret) {
                        DRM_ERROR("can't get legacy vga ioports\n");
@@@ -131,7 -126,7 +126,7 @@@ modeset_cleanup
  unload:
        qxl_device_fini(qdev);
  put_vga:
-       if (is_vga(pdev) && pdev->revision < 5)
+       if (pci_is_vga(pdev) && pdev->revision < 5)
                vga_put(pdev, VGA_RSRC_LEGACY_IO);
  disable_pci:
        pci_disable_device(pdev);
@@@ -159,16 -154,10 +154,16 @@@ qxl_pci_remove(struct pci_dev *pdev
  
        drm_dev_unregister(dev);
        drm_atomic_helper_shutdown(dev);
-       if (is_vga(pdev) && pdev->revision < 5)
+       if (pci_is_vga(pdev) && pdev->revision < 5)
                vga_put(pdev, VGA_RSRC_LEGACY_IO);
  }
  
 +static void
 +qxl_pci_shutdown(struct pci_dev *pdev)
 +{
 +      drm_atomic_helper_shutdown(pci_get_drvdata(pdev));
 +}
 +
  DEFINE_DRM_GEM_FOPS(qxl_fops);
  
  static int qxl_drm_freeze(struct drm_device *dev)
@@@ -275,7 -264,6 +270,7 @@@ static struct pci_driver qxl_pci_drive
         .id_table = pciidlist,
         .probe = qxl_pci_probe,
         .remove = qxl_pci_remove,
 +       .shutdown = qxl_pci_shutdown,
         .driver.pm = &qxl_pm_ops,
  };
  

diff --combined drivers/pci/controller/dwc/pcie-qcom.c
index 64420ecc24d1c38c45fc838e5b635495564172d3,c324c3daaa5a2a372f357e3e0c6d71244a5f1766..6902e97719d1366d754c20f3d28a0482db48500e
--- 1/drivers/pci/controller/dwc/pcie-qcom.c
--- 2/drivers/pci/controller/dwc/pcie-qcom.c
+++ b/drivers/pci/controller/dwc/pcie-qcom.c
@@@ -43,6 -43,7 +43,6 @@@
  #define PARF_PHY_REFCLK                               0x4c
  #define PARF_CONFIG_BITS                      0x50
  #define PARF_DBI_BASE_ADDR                    0x168
 -#define PARF_SLV_ADDR_SPACE_SIZE_2_3_3                0x16c /* Register offset specific to IP ver 2.3.3 */
  #define PARF_MHI_CLOCK_RESET_CTRL             0x174
  #define PARF_AXI_MSTR_WR_ADDR_HALT            0x178
  #define PARF_AXI_MSTR_WR_ADDR_HALT_V2         0x1a8
@@@ -147,6 -148,9 +147,9 @@@
  
  #define QCOM_PCIE_CRC8_POLYNOMIAL             (BIT(2) | BIT(1) | BIT(0))
  
+ #define QCOM_PCIE_LINK_SPEED_TO_BW(speed) \
+               Mbps_to_icc(PCIE_SPEED2MBS_ENC(pcie_link_speed[speed]))
+ 
  #define QCOM_PCIE_1_0_0_MAX_CLOCKS            4
  struct qcom_pcie_resources_1_0_0 {
        struct clk_bulk_data clks[QCOM_PCIE_1_0_0_MAX_CLOCKS];
@@@ -218,6 -222,7 +221,7 @@@ struct qcom_pcie_ops 
        int (*get_resources)(struct qcom_pcie *pcie);
        int (*init)(struct qcom_pcie *pcie);
        int (*post_init)(struct qcom_pcie *pcie);
+       void (*host_post_init)(struct qcom_pcie *pcie);
        void (*deinit)(struct qcom_pcie *pcie);
        void (*ltssm_enable)(struct qcom_pcie *pcie);
        int (*config_sid)(struct qcom_pcie *pcie);
@@@ -796,7 -801,8 +800,7 @@@ static int qcom_pcie_post_init_2_3_3(st
        u16 offset = dw_pcie_find_capability(pci, PCI_CAP_ID_EXP);
        u32 val;
  
 -      writel(SLV_ADDR_SPACE_SZ,
 -              pcie->parf + PARF_SLV_ADDR_SPACE_SIZE_2_3_3);
 +      writel(SLV_ADDR_SPACE_SZ, pcie->parf + PARF_SLV_ADDR_SPACE_SIZE);
  
        val = readl(pcie->parf + PARF_PHY_CTRL);
        val &= ~PHY_TEST_PWR_DOWN;
@@@ -962,6 -968,22 +966,22 @@@ static int qcom_pcie_post_init_2_7_0(st
        return 0;
  }
  
+ static int qcom_pcie_enable_aspm(struct pci_dev *pdev, void *userdata)
+ {
+       /* Downstream devices need to be in D0 state before enabling PCI PM substates */
+       pci_set_power_state(pdev, PCI_D0);
+       pci_enable_link_state(pdev, PCIE_LINK_STATE_ALL);
+ 
+       return 0;
+ }
+ 
+ static void qcom_pcie_host_post_init_2_7_0(struct qcom_pcie *pcie)
+ {
+       struct dw_pcie_rp *pp = &pcie->pci->pp;
+ 
+       pci_walk_bus(pp->bridge->bus, qcom_pcie_enable_aspm, NULL);
+ }
+ 
  static void qcom_pcie_deinit_2_7_0(struct qcom_pcie *pcie)
  {
        struct qcom_pcie_resources_2_7_0 *res = &pcie->res.v2_7_0;
@@@ -1214,9 -1236,19 +1234,19 @@@ static void qcom_pcie_host_deinit(struc
        pcie->cfg->ops->deinit(pcie);
  }
  
+ static void qcom_pcie_host_post_init(struct dw_pcie_rp *pp)
+ {
+       struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
+       struct qcom_pcie *pcie = to_qcom_pcie(pci);
+ 
+       if (pcie->cfg->ops->host_post_init)
+               pcie->cfg->ops->host_post_init(pcie);
+ }
+ 
  static const struct dw_pcie_host_ops qcom_pcie_dw_ops = {
        .host_init      = qcom_pcie_host_init,
        .host_deinit    = qcom_pcie_host_deinit,
+       .host_post_init = qcom_pcie_host_post_init,
  };
  
  /* Qcom IP rev.: 2.1.0        Synopsys IP rev.: 4.01a */
@@@ -1278,6 -1310,7 +1308,7 @@@ static const struct qcom_pcie_ops ops_1
        .get_resources = qcom_pcie_get_resources_2_7_0,
        .init = qcom_pcie_init_2_7_0,
        .post_init = qcom_pcie_post_init_2_7_0,
+       .host_post_init = qcom_pcie_host_post_init_2_7_0,
        .deinit = qcom_pcie_deinit_2_7_0,
        .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable,
        .config_sid = qcom_pcie_config_sid_1_9_0,
@@@ -1345,7 -1378,7 +1376,7 @@@ static int qcom_pcie_icc_init(struct qc
         * Set an initial peak bandwidth corresponding to single-lane Gen 1
         * for the pcie-mem path.
         */
-       ret = icc_set_bw(pcie->icc_mem, 0, MBps_to_icc(250));
+       ret = icc_set_bw(pcie->icc_mem, 0, QCOM_PCIE_LINK_SPEED_TO_BW(1));
        if (ret) {
                dev_err(pci->dev, "failed to set interconnect bandwidth: %d\n",
                        ret);
@@@ -1358,7 -1391,7 +1389,7 @@@
  static void qcom_pcie_icc_update(struct qcom_pcie *pcie)
  {
        struct dw_pcie *pci = pcie->pci;
-       u32 offset, status, bw;
+       u32 offset, status;
        int speed, width;
        int ret;
  
@@@ -1375,22 -1408,7 +1406,7 @@@
        speed = FIELD_GET(PCI_EXP_LNKSTA_CLS, status);
        width = FIELD_GET(PCI_EXP_LNKSTA_NLW, status);
  
-       switch (speed) {
-       case 1:
-               bw = MBps_to_icc(250);
-               break;
-       case 2:
-               bw = MBps_to_icc(500);
-               break;
-       default:
-               WARN_ON_ONCE(1);
-               fallthrough;
-       case 3:
-               bw = MBps_to_icc(985);
-               break;
-       }
- 
-       ret = icc_set_bw(pcie->icc_mem, 0, width * bw);
+       ret = icc_set_bw(pcie->icc_mem, 0, width * QCOM_PCIE_LINK_SPEED_TO_BW(speed));
        if (ret) {
                dev_err(pci->dev, "failed to set interconnect bandwidth: %d\n",
                        ret);

diff --combined drivers/pci/pcie/aer.c
index 40d84cb0c601efba6b8a33f498c092652ea3a5f7,5706019ea90892f487ee3f26501ed69c46f8299f..dcd35993004e301f431fd13cef84911e7ad834c2
--- 1/drivers/pci/pcie/aer.c
--- 2/drivers/pci/pcie/aer.c
+++ b/drivers/pci/pcie/aer.c
@@@ -29,7 -29,6 +29,7 @@@
  #include <linux/kfifo.h>
  #include <linux/slab.h>
  #include <acpi/apei.h>
 +#include <acpi/ghes.h>
  #include <ras/ras_event.h>
  
  #include "../pci.h"
@@@ -230,7 -229,6 +230,7 @@@ int pcie_aer_is_native(struct pci_dev *
  
        return pcie_ports_native || host->native_aer;
  }
 +EXPORT_SYMBOL_NS_GPL(pcie_aer_is_native, CXL);
  
  static int pci_enable_pcie_error_reporting(struct pci_dev *dev)
  {
@@@ -998,15 -996,6 +998,15 @@@ static void aer_recover_work_func(struc
                        continue;
                }
                cper_print_aer(pdev, entry.severity, entry.regs);
 +              /*
 +               * Memory for aer_capability_regs(entry.regs) is being allocated from the
 +               * ghes_estatus_pool to protect it from overwriting when multiple sections
 +               * are present in the error status. Thus free the same after processing
 +               * the data.
 +               */
 +              ghes_estatus_pool_region_free((unsigned long)entry.regs,
 +                                            sizeof(struct aer_capability_regs));
 +
                if (entry.severity == AER_NONFATAL)
                        pcie_do_recovery(pdev, pci_channel_io_normal,
                                         aer_root_reset);
@@@ -1224,6 -1213,28 +1224,28 @@@ static irqreturn_t aer_irq(int irq, voi
        return IRQ_WAKE_THREAD;
  }
  
+ static void aer_enable_irq(struct pci_dev *pdev)
+ {
+       int aer = pdev->aer_cap;
+       u32 reg32;
+ 
+       /* Enable Root Port's interrupt in response to error messages */
+       pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
+       reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
+       pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);
+ }
+ 
+ static void aer_disable_irq(struct pci_dev *pdev)
+ {
+       int aer = pdev->aer_cap;
+       u32 reg32;
+ 
+       /* Disable Root's interrupt in response to error messages */
+       pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
+       reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
+       pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);
+ }
+ 
  /**
   * aer_enable_rootport - enable Root Port's interrupts when receiving messages
   * @rpc: pointer to a Root Port data structure
@@@ -1253,10 -1264,7 +1275,7 @@@ static void aer_enable_rootport(struct 
        pci_read_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS, &reg32);
        pci_write_config_dword(pdev, aer + PCI_ERR_UNCOR_STATUS, reg32);
  
-       /* Enable Root Port's interrupt in response to error messages */
-       pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
-       reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
-       pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);
+       aer_enable_irq(pdev);
  }
  
  /**
@@@ -1271,10 -1279,7 +1290,7 @@@ static void aer_disable_rootport(struc
        int aer = pdev->aer_cap;
        u32 reg32;
  
-       /* Disable Root's interrupt in response to error messages */
-       pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, &reg32);
-       reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
-       pci_write_config_dword(pdev, aer + PCI_ERR_ROOT_COMMAND, reg32);
+       aer_disable_irq(pdev);
  
        /* Clear Root's error status reg */
        pci_read_config_dword(pdev, aer + PCI_ERR_ROOT_STATUS, &reg32);
@@@ -1369,12 -1374,8 +1385,8 @@@ static pci_ers_result_t aer_root_reset(
         */
        aer = root ? root->aer_cap : 0;
  
-       if ((host->native_aer || pcie_ports_native) && aer) {
-               /* Disable Root's interrupt in response to error messages */
-               pci_read_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, &reg32);
-               reg32 &= ~ROOT_PORT_INTR_ON_MESG_MASK;
-               pci_write_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, reg32);
-       }
+       if ((host->native_aer || pcie_ports_native) && aer)
+               aer_disable_irq(root);
  
        if (type == PCI_EXP_TYPE_RC_EC || type == PCI_EXP_TYPE_RC_END) {
                rc = pcie_reset_flr(dev, PCI_RESET_DO_RESET);
@@@ -1393,10 -1394,7 +1405,7 @@@
                pci_read_config_dword(root, aer + PCI_ERR_ROOT_STATUS, &reg32);
                pci_write_config_dword(root, aer + PCI_ERR_ROOT_STATUS, reg32);
  
-               /* Enable Root Port's interrupt in response to error messages */
-               pci_read_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, &reg32);
-               reg32 |= ROOT_PORT_INTR_ON_MESG_MASK;
-               pci_write_config_dword(root, aer + PCI_ERR_ROOT_COMMAND, reg32);
+               aer_enable_irq(root);
        }
  
        return rc ? PCI_ERS_RESULT_DISCONNECT : PCI_ERS_RESULT_RECOVERED;

diff --combined drivers/pci/vgaarb.c
index a771b2259f216b23c222caaa7bfc97004d26f18c,feca96fc4255b4227802a97577de2dde50cc756e..78748e8d2dbae6e5d631ca97c9cae860e98a9c06
--- 1/drivers/pci/vgaarb.c
--- 2/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@@ -556,7 -556,7 +556,7 @@@ EXPORT_SYMBOL(vga_put)
  
  static bool vga_is_firmware_default(struct pci_dev *pdev)
  {
 -#if defined(CONFIG_X86) || defined(CONFIG_IA64)
 +#if defined(CONFIG_X86)
        u64 base = screen_info.lfb_base;
        u64 size = screen_info.lfb_size;
        struct resource *r;
@@@ -764,10 -764,6 +764,6 @@@ static bool vga_arbiter_add_pci_device(
        struct pci_dev *bridge;
        u16 cmd;
  
-       /* Only deal with VGA class devices */
-       if ((pdev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
-               return false;
- 
        /* Allocate structure */
        vgadev = kzalloc(sizeof(struct vga_device), GFP_KERNEL);
        if (vgadev == NULL) {
@@@ -1503,6 -1499,10 +1499,10 @@@ static int pci_notify(struct notifier_b
  
        vgaarb_dbg(dev, "%s\n", __func__);
  
+       /* Only deal with VGA class devices */
+       if (!pci_is_vga(pdev))
+               return 0;
+ 
        /*
         * For now, we're only interested in devices added and removed.
         * I didn't test this thing here, so someone needs to double check
@@@ -1550,8 -1550,10 +1550,10 @@@ static int __init vga_arb_device_init(v
        pdev = NULL;
        while ((pdev =
                pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-                              PCI_ANY_ID, pdev)) != NULL)
-               vga_arbiter_add_pci_device(pdev);
+                              PCI_ANY_ID, pdev)) != NULL) {
+               if (pci_is_vga(pdev))
+                       vga_arbiter_add_pci_device(pdev);
+       }
  
        pr_info("loaded\n");
        return rc;

diff --combined include/linux/pci.h
index b56417276042dc9dd5707e24f9d5c6cc09bd6bfd,ee4b91d2b37355332d3677633e582d81fc1d36c6..60ca768bc8679f4ff135f2d0364e46b5e7ab4fb9
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -713,6 -713,30 +713,30 @@@ static inline bool pci_is_bridge(struc
                dev->hdr_type == PCI_HEADER_TYPE_CARDBUS;
  }
  
+ /**
+  * pci_is_vga - check if the PCI device is a VGA device
+  *
+  * The PCI Code and ID Assignment spec, r1.15, secs 1.4 and 1.1, define
+  * VGA Base Class and Sub-Classes:
+  *
+  *   03 00  PCI_CLASS_DISPLAY_VGA      VGA-compatible or 8514-compatible
+  *   00 01  PCI_CLASS_NOT_DEFINED_VGA  VGA-compatible (before Class Code)
+  *
+  * Return true if the PCI device is a VGA device and uses the legacy VGA
+  * resources ([mem 0xa0000-0xbffff], [io 0x3b0-0x3bb], [io 0x3c0-0x3df] and
+  * aliases).
+  */
+ static inline bool pci_is_vga(struct pci_dev *pdev)
+ {
+       if ((pdev->class >> 8) == PCI_CLASS_DISPLAY_VGA)
+               return true;
+ 
+       if ((pdev->class >> 8) == PCI_CLASS_NOT_DEFINED_VGA)
+               return true;
+ 
+       return false;
+ }
+ 
  #define for_each_pci_bridge(dev, bus)                         \
        list_for_each_entry(dev, &bus->devices, bus_list)       \
                if (!pci_is_bridge(dev)) {} else
@@@ -1181,6 -1205,8 +1205,8 @@@ struct pci_dev *pci_get_slot(struct pci
  struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus,
                                            unsigned int devfn);
  struct pci_dev *pci_get_class(unsigned int class, struct pci_dev *from);
+ struct pci_dev *pci_get_base_class(unsigned int class, struct pci_dev *from);
+ 
  int pci_dev_present(const struct pci_device_id *ids);
  
  int pci_bus_read_config_byte(struct pci_bus *bus, unsigned int devfn,
@@@ -1624,8 -1650,6 +1650,8 @@@ struct msix_entry 
        u16     entry;  /* Driver uses to specify entry, OS writes */
  };
  
 +struct msi_domain_template;
 +
  #ifdef CONFIG_PCI_MSI
  int pci_msi_vec_count(struct pci_dev *dev);
  void pci_disable_msi(struct pci_dev *dev);
@@@ -1658,11 -1682,6 +1684,11 @@@ void pci_msix_free_irq(struct pci_dev *
  void pci_free_irq_vectors(struct pci_dev *dev);
  int pci_irq_vector(struct pci_dev *dev, unsigned int nr);
  const struct cpumask *pci_irq_get_affinity(struct pci_dev *pdev, int vec);
 +bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
 +                         unsigned int hwsize, void *data);
 +struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
 +                               const struct irq_affinity_desc *affdesc);
 +void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
  
  #else
  static inline int pci_msi_vec_count(struct pci_dev *dev) { return -ENOSYS; }
@@@ -1726,25 -1745,6 +1752,25 @@@ static inline const struct cpumask *pci
  {
        return cpu_possible_mask;
  }
 +
 +static inline bool pci_create_ims_domain(struct pci_dev *pdev,
 +                                       const struct msi_domain_template *template,
 +                                       unsigned int hwsize, void *data)
 +{ return false; }
 +
 +static inline struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev,
 +                                             union msi_instance_cookie *icookie,
 +                                             const struct irq_affinity_desc *affdesc)
 +{
 +      struct msi_map map = { .index = -ENOSYS, };
 +
 +      return map;
 +}
 +
 +static inline void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map)
 +{
 +}
 +
  #endif
  
  /**
@@@ -1950,6 -1950,9 +1976,9 @@@ static inline struct pci_dev *pci_get_c
                                            struct pci_dev *from)
  { return NULL; }
  
+ static inline struct pci_dev *pci_get_base_class(unsigned int class,
+                                                struct pci_dev *from)
+ { return NULL; }
  
  static inline int pci_dev_present(const struct pci_device_id *ids)
  { return 0; }
@@@ -2642,6 -2645,14 +2671,6 @@@ static inline bool pci_is_thunderbolt_a
  void pci_uevent_ers(struct pci_dev *pdev, enum  pci_ers_result err_type);
  #endif
  
 -struct msi_domain_template;
 -
 -bool pci_create_ims_domain(struct pci_dev *pdev, const struct msi_domain_template *template,
 -                         unsigned int hwsize, void *data);
 -struct msi_map pci_ims_alloc_irq(struct pci_dev *pdev, union msi_instance_cookie *icookie,
 -                               const struct irq_affinity_desc *affdesc);
 -void pci_ims_free_irq(struct pci_dev *pdev, struct msi_map map);
 -
  #include <linux/dma-mapping.h>
  
  #define pci_printk(level, pdev, fmt, arg...) \

diff --combined include/linux/pci_ids.h
index 91c1f6d5b44fd9f8311c922537ecf163608501c1,3a8e24e9a93f90194ef5f94a7236ade8a2621e6f..275799b5f535cf0b487c9b5990bb662a3af86211
--- 1/include/linux/pci_ids.h
--- 2/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@@ -180,8 -180,6 +180,8 @@@
  #define PCI_DEVICE_ID_BERKOM_A4T              0xffa4
  #define PCI_DEVICE_ID_BERKOM_SCITEL_QUADRO    0xffa8
  
 +#define PCI_VENDOR_ID_ITTIM           0x0b48
 +
  #define PCI_VENDOR_ID_COMPAQ          0x0e11
  #define PCI_DEVICE_ID_COMPAQ_TOKENRING        0x0508
  #define PCI_DEVICE_ID_COMPAQ_TACHYON  0xa0fc
@@@ -581,7 -579,7 +581,8 @@@
  #define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3 0x12c3
  #define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb
  #define PCI_DEVICE_ID_AMD_MI200_DF_F3 0x14d3
 +#define PCI_DEVICE_ID_AMD_MI300_DF_F3 0x152b
+ #define PCI_DEVICE_ID_AMD_VANGOGH_USB 0x163a
  #define PCI_DEVICE_ID_AMD_CNB17H_F3   0x1703
  #define PCI_DEVICE_ID_AMD_LANCE               0x2000
  #define PCI_DEVICE_ID_AMD_LANCE_HOME  0x2001

diff --combined sound/pci/hda/hda_intel.c
index ca765ac4765f4a27b77f81f466b647a9699f068d,0b5136fddbca055afda1c7b03e0dbc0a5f1a48a4..508c39bf4610dac246edda64ff76f4c0c2713b12
--- 1/sound/pci/hda/hda_intel.c
--- 2/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@@ -1417,17 -1417,11 +1417,11 @@@ static bool atpx_present(void
        acpi_handle dhandle, atpx_handle;
        acpi_status status;
  
-       while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_VGA << 8, pdev)) != NULL) {
-               dhandle = ACPI_HANDLE(&pdev->dev);
-               if (dhandle) {
-                       status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);
-                       if (ACPI_SUCCESS(status)) {
-                               pci_dev_put(pdev);
-                               return true;
-                       }
-               }
-       }
-       while ((pdev = pci_get_class(PCI_CLASS_DISPLAY_OTHER << 8, pdev)) != NULL) {
+       while ((pdev = pci_get_base_class(PCI_BASE_CLASS_DISPLAY, pdev))) {
+               if ((pdev->class != PCI_CLASS_DISPLAY_VGA << 8) &&
+                   (pdev->class != PCI_CLASS_DISPLAY_OTHER << 8))
+                       continue;
+ 
                dhandle = ACPI_HANDLE(&pdev->dev);
                if (dhandle) {
                        status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);
@@@ -2211,7 -2205,6 +2205,7 @@@ static const struct snd_pci_quirk power
        SND_PCI_QUIRK(0x8086, 0x2068, "Intel NUC7i3BNB", 0),
        /* https://bugzilla.kernel.org/show_bug.cgi?id=198611 */
        SND_PCI_QUIRK(0x17aa, 0x2227, "Lenovo X1 Carbon 3rd Gen", 0),
 +      SND_PCI_QUIRK(0x17aa, 0x316e, "Lenovo ThinkCentre M70q", 0),
        /* https://bugzilla.redhat.com/show_bug.cgi?id=1689623 */
        SND_PCI_QUIRK(0x17aa, 0x367b, "Lenovo IdeaCentre B550", 0),
        /* https://bugzilla.redhat.com/show_bug.cgi?id=1572975 */