Merge branch 'pci/host-vmd' into next

* pci/host-vmd:
  PCI: vmd: Fix suspend handlers defined-but-not-used warning
  PCI: vmd: Use SRCU as a local RCU to prevent delaying global RCU
  PCI: vmd: Remove unnecessary pci_set_drvdata()

diff --combined drivers/pci/host/Kconfig
index 117130968b80aa868eacae76d755c223291772b9,e020359b09bc5687cbfa71442018cd31b72331db..898d2c48239cd4f27e273bb7be3a6338e401702f
--- 1/drivers/pci/host/Kconfig
--- 2/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@@ -69,7 -69,7 +69,7 @@@ config PCI_IMX
  
  config PCI_TEGRA
        bool "NVIDIA Tegra PCIe controller"
 -      depends on ARCH_TEGRA && !ARM64
 +      depends on ARCH_TEGRA
        help
          Say Y here if you want support for the PCIe host controller found
          on NVIDIA Tegra SoCs.
@@@ -133,8 -133,8 +133,8 @@@ config PCIE_XILIN
  
  config PCI_XGENE
        bool "X-Gene PCIe controller"
 -      depends on ARCH_XGENE
 -      depends on OF
 +      depends on ARM64
 +      depends on OF || (ACPI && PCI_QUIRKS)
        select PCIEPORTBUS
        help
          Say Y here if you want internal PCI support on APM X-Gene SoC.
@@@ -240,16 -240,14 +240,16 @@@ config PCIE_QCO
  
  config PCI_HOST_THUNDER_PEM
        bool "Cavium Thunder PCIe controller to off-chip devices"
 -      depends on OF && ARM64
 +      depends on ARM64
 +      depends on OF || (ACPI && PCI_QUIRKS)
        select PCI_HOST_COMMON
        help
          Say Y here if you want PCIe support for CN88XX Cavium Thunder SoCs.
  
  config PCI_HOST_THUNDER_ECAM
        bool "Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon"
 -      depends on OF && ARM64
 +      depends on ARM64
 +      depends on OF || (ACPI && PCI_QUIRKS)
        select PCI_HOST_COMMON
        help
          Say Y here if you want ECAM support for CN88XX-Pass-1.x Cavium Thunder SoCs.
@@@ -278,7 -276,7 +278,7 @@@ config PCIE_ARTPEC
  
  config PCIE_ROCKCHIP
        bool "Rockchip PCIe controller"
 -      depends on ARCH_ROCKCHIP
 +      depends on ARCH_ROCKCHIP || COMPILE_TEST
        depends on OF
        depends on PCI_MSI_IRQ_DOMAIN
        select MFD_SYSCON
@@@ -288,7 -286,7 +288,7 @@@
          4 slots.
  
  config VMD
-       depends on PCI_MSI && X86_64
+       depends on PCI_MSI && X86_64 && SRCU
        tristate "Intel Volume Management Device Driver"
        default N
        ---help---