From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 17 May 2016 19:35:46 +0000 (-0500)
Subject: Merge branches 'pci/arm64' and 'pci/host-hv' into next
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e257ef55ce51d7ec399193ee85acda8b8759d930;p=linux-beck.git

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
---

e257ef55ce51d7ec399193ee85acda8b8759d930
diff --cc drivers/pci/host/pci-thunder-pem.c
index d4a779761472,a7b61ce35117,cabb92a514ac..9b8ab94f3c8c
--- a/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;