Merge branch 'pci/portdrv'

  - move pcieport_if.h to drivers/pci/pcie/ to encapsulate it (Frederick
    Lawler)

  - merge pcieport_if.h into portdrv.h (Bjorn Helgaas)

  - move workaround for BIOS PME issue from portdrv to PCI core (Bjorn
    Helgaas)

  - completely disable portdrv with "pcie_ports=compat" (Bjorn Helgaas)

  - remove portdrv link order dependency (Bjorn Helgaas)

  - remove support for unused VC portdrv service (Bjorn Helgaas)

  - simplify portdrv feature permission checking (Bjorn Helgaas)

  - remove "pcie_hp=nomsi" parameter (use "pci=nomsi" instead) (Bjorn
    Helgaas)

  - remove unnecessary "pcie_ports=auto" parameter (Bjorn Helgaas)

  - use cached AER capability offset (Frederick Lawler)

  - don't enable DPC if BIOS hasn't granted AER control (Mika Westerberg)

  - rename pcie-dpc.c to dpc.c (Bjorn Helgaas)

* pci/portdrv:
  PCI/DPC: Rename from pcie-dpc.c to dpc.c
  PCI/DPC: Do not enable DPC if AER control is not allowed by the BIOS
  PCI/AER: Use cached AER Capability offset
  PCI/portdrv: Rename and reverse sense of pcie_ports_auto
  PCI/portdrv: Encapsulate pcie_ports_auto inside the port driver
  PCI/portdrv: Remove unnecessary "pcie_ports=auto" parameter
  PCI/portdrv: Remove "pcie_hp=nomsi" kernel parameter
  PCI/portdrv: Remove unnecessary include of <linux/pci-aspm.h>
  PCI/portdrv: Simplify PCIe feature permission checking
  PCI/portdrv: Remove unused PCIE_PORT_SERVICE_VC
  PCI/portdrv: Remove pcie_port_bus_type link order dependency
  PCI/portdrv: Disable port driver in compat mode
  PCI/PM: Clear PCIe PME Status bit for Root Complex Event Collectors
  PCI/PM: Clear PCIe PME Status bit in core, not PCIe port driver
  PCI/PM: Move pcie_clear_root_pme_status() to core
  PCI/portdrv: Merge pcieport_if.h into portdrv.h
  PCI/portdrv: Move pcieport_if.h to drivers/pci/pcie/

Conflicts:
	drivers/pci/pcie/Makefile
	drivers/pci/pcie/portdrv.h

diff --cc drivers/acpi/pci_root.c
Simple merge

diff --cc drivers/pci/pci-driver.c
Simple merge

diff --cc drivers/pci/pci.c
Simple merge

diff --cc drivers/pci/pci.h
Simple merge

diff --cc drivers/pci/pcie/Makefile
index 7d1648b,30557a5..800e1d4
--- 1/drivers/pci/pcie/Makefile
--- 2/drivers/pci/pcie/Makefile
+++ b/drivers/pci/pcie/Makefile
@@@ -1,14 -1,19 +1,13 @@@
  # SPDX-License-Identifier: GPL-2.0
  #
 -# Makefile for PCI-Express PORT Driver
 -#
 -
 -# Build PCI Express ASPM if needed
 -obj-$(CONFIG_PCIEASPM)                += aspm.o
 +# Makefile for PCI Express features and port driver
  
- pcieportdrv-y                 := portdrv_core.o portdrv_pci.o portdrv_bus.o
- pcieportdrv-$(CONFIG_ACPI)    += portdrv_acpi.o
+ pcieportdrv-y                 := portdrv_core.o portdrv_pci.o
  
  obj-$(CONFIG_PCIEPORTBUS)     += pcieportdrv.o
  
 -# Build PCI Express AER if needed
 +obj-$(CONFIG_PCIEASPM)                += aspm.o
  obj-$(CONFIG_PCIEAER)         += aer/
 -
 -obj-$(CONFIG_PCIE_PME) += pme.o
 -
 -obj-$(CONFIG_PCIE_DPC) += dpc.o
 -obj-$(CONFIG_PCIE_PTM) += ptm.o
 +obj-$(CONFIG_PCIE_PME)                += pme.o
- obj-$(CONFIG_PCIE_DPC)                += pcie-dpc.o
++obj-$(CONFIG_PCIE_DPC)                += dpc.o
 +obj-$(CONFIG_PCIE_PTM)                += ptm.o

diff --cc drivers/pci/pcie/aer/aerdrv.c
Simple merge

diff --cc drivers/pci/pcie/aer/aerdrv.h
Simple merge

diff --cc drivers/pci/pcie/aer/ecrc.c
Simple merge

diff --cc drivers/pci/pcie/portdrv.h
Simple merge

diff --cc drivers/pci/pcie/portdrv_core.c
Simple merge

diff --cc drivers/pci/pcie/portdrv_pci.c
Simple merge

diff --cc drivers/pci/probe.c
Simple merge

diff --cc include/linux/pci.h
Simple merge