Merge branches 'pci/arm64' and 'pci/host-hv' into next

* pci/arm64:
  PCI, of: Move PCI I/O space management to PCI core code
  PCI: generic, thunder: Use generic ECAM API
  PCI: Provide common functions for ECAM mapping

* pci/host-hv:
  PCI: hv: Add explicit barriers to config space access

diff --cc drivers/pci/host/Kconfig
Simple merge

diff --cc drivers/pci/host/pci-thunder-pem.c
index d4a7797614725d153776fc1c7ea079b6deeacbac,a7b61ce3511732af53cdd233509b92d3f25d01a4,cabb92a514ac85788d0d684f8032cfab0a42af40..9b8ab94f3c8c88dc2fac62f504e2ce1d0b04f8c6
--- 1/drivers/pci/host/pci-thunder-pem.c
--- 2/drivers/pci/host/pci-thunder-pem.c
--- 3/drivers/pci/host/pci-thunder-pem.c
+++ b/drivers/pci/host/pci-thunder-pem.c
@@@@ -208,13 -175,11 -187,12 +196,12 @@@@ static u32 thunder_pem_bridge_w1_bits(u
   static int thunder_pem_bridge_write(struct pci_bus *bus, unsigned int devfn,
                                    int where, int size, u32 val)
   {
- -     struct gen_pci *pci = bus->sysdata;
- -     struct thunder_pem_pci *pem_pci;
+ +     struct pci_config_window *cfg = bus->sysdata;
+ +     struct thunder_pem_pci *pem_pci = (struct thunder_pem_pci *)cfg->priv;
        u64 write_val, read_val;
 ++     u64 where_aligned = where & ~3ull;
        u32 mask = 0;
   
- -     pem_pci = container_of(pci, struct thunder_pem_pci, gen_pci);
   
        if (devfn != 0 || where >= 2048)
                return PCIBIOS_DEVICE_NOT_FOUND;

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

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