84 files changed, 2689 insertions, 702 deletions

diff --git a/Documentation/devicetree/bindings/pci/aardvark-pci.txt b/Documentation/devicetree/bindings/pci/aardvark-pci.txt
new file mode 100644
index 000000000000..bbcd9f4c501f
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/aardvark-pci.txt
@@ -0,0 +1,56 @@
+Aardvark PCIe controller
+
+This PCIe controller is used on the Marvell Armada 3700 ARM64 SoC.
+
+The Device Tree node describing an Aardvark PCIe controller must
+contain the following properties:
+
+ - compatible: Should be "marvell,armada-3700-pcie"
+ - reg: range of registers for the PCIe controller
+ - interrupts: the interrupt line of the PCIe controller
+ - #address-cells: set to <3>
+ - #size-cells: set to <2>
+ - device_type: set to "pci"
+ - ranges: ranges for the PCI memory and I/O regions
+ - #interrupt-cells: set to <1>
+ - msi-controller: indicates that the PCIe controller can itself
+   handle MSI interrupts
+ - msi-parent: pointer to the MSI controller to be used
+ - interrupt-map-mask and interrupt-map: standard PCI properties to
+   define the mapping of the PCIe interface to interrupt numbers.
+ - bus-range: PCI bus numbers covered
+
+In addition, the Device Tree describing an Aardvark PCIe controller
+must include a sub-node that describes the legacy interrupt controller
+built into the PCIe controller. This sub-node must have the following
+properties:
+
+ - interrupt-controller
+ - #interrupt-cells: set to <1>
+
+Example:
+
+        pcie0: pcie@d0070000 {
+                compatible = "marvell,armada-3700-pcie";
+                device_type = "pci";
+                status = "disabled";
+                reg = <0 0xd0070000 0 0x20000>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+                bus-range = <0x00 0xff>;
+                interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                #interrupt-cells = <1>;
+                msi-controller;
+                msi-parent = <&pcie0>;
+                ranges = <0x82000000 0 0xe8000000   0 0xe8000000 0 0x1000000 /* Port 0 MEM */
+                          0x81000000 0 0xe9000000   0 0xe9000000 0 0x10000>; /* Port 0 IO*/
+                interrupt-map-mask = <0 0 0 7>;
+                interrupt-map = <0 0 0 1 &pcie_intc 0>,
+                                <0 0 0 2 &pcie_intc 1>,
+                                <0 0 0 3 &pcie_intc 2>,
+                                <0 0 0 4 &pcie_intc 3>;
+                pcie_intc: interrupt-controller {
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                };
+        };
diff --git a/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt b/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt
new file mode 100644
index 000000000000..330a45b5f0b5
--- /dev/null
+++ b/Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt
@@ -0,0 +1,46 @@
+* Axis ARTPEC-6 PCIe interface
+
+This PCIe host controller is based on the Synopsys DesignWare PCIe IP
+and thus inherits all the common properties defined in designware-pcie.txt.
+
+Required properties:
+- compatible: "axis,artpec6-pcie", "snps,dw-pcie"
+- reg: base addresses and lengths of the PCIe controller (DBI),
+        the phy controller, and configuration address space.
+- reg-names: Must include the following entries:
+        - "dbi"
+        - "phy"
+        - "config"
+- interrupts: A list of interrupt outputs of the controller. Must contain an
+  entry for each entry in the interrupt-names property.
+- interrupt-names: Must include the following entries:
+        - "msi": The interrupt that is asserted when an MSI is received
+- axis,syscon-pcie: A phandle pointing to the ARTPEC-6 system controller,
+        used to enable and control the Synopsys IP.
+
+Example:
+
+        pcie@f8050000 {
+                compatible = "axis,artpec6-pcie", "snps,dw-pcie";
+                reg = <0xf8050000 0x2000
+                       0xf8040000 0x1000
+                       0xc0000000 0x1000>;
+                reg-names = "dbi", "phy", "config";
+                #address-cells = <3>;
+                #size-cells = <2>;
+                device_type = "pci";
+                          /* downstream I/O */
+                ranges = <0x81000000 0 0x00010000 0xc0010000 0 0x00010000
+                          /* non-prefetchable memory */
+                          0x82000000 0 0xc0020000 0xc0020000 0 0x1ffe0000>;
+                num-lanes = <2>;
+                interrupts = <GIC_SPI 148 IRQ_TYPE_LEVEL_HIGH>;
+                interrupt-names = "msi";
+                #interrupt-cells = <1>;
+                interrupt-map-mask = <0 0 0 0x7>;
+                interrupt-map = <0 0 0 1 &intc GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 2 &intc GIC_SPI 145 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 3 &intc GIC_SPI 146 IRQ_TYPE_LEVEL_HIGH>,
+                                <0 0 0 4 &intc GIC_SPI 147 IRQ_TYPE_LEVEL_HIGH>;
+                axis,syscon-pcie = <&syscon>;
+        };
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 82b42c958d1c..2102248005b5 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2998,6 +2998,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                 resource_alignment=
                                 Format:
                                 [<order of align>@][<domain>:]<bus>:<slot>.<func>[; ...]
+                                [<order of align>@]pci:<vendor>:<device>\
+                                                [:<subvendor>:<subdevice>][; ...]
                                 Specifies alignment and device to reassign
                                 aligned memory resources.
                                 If <order of align> is not specified,
@@ -3016,6 +3018,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                 hpmemsize=nn[KMG]       The fixed amount of bus space which is
                                 reserved for hotplug bridge's memory window.
                                 Default size is 2 megabytes.
+                hpbussize=nn    The minimum amount of additional bus numbers
+                                reserved for buses below a hotplug bridge.
+                                Default is 1.
                 realloc=        Enable/disable reallocating PCI bridge resources
                                 if allocations done by BIOS are too small to
                                 accommodate resources required by all child
@@ -3047,6 +3052,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                 compat  Treat PCIe ports as PCI-to-PCI bridges, disable the PCIe
                         ports driver.
 
+        pcie_port_pm=   [PCIE] PCIe port power management handling:
+                off     Disable power management of all PCIe ports
+                force   Forcibly enable power management of all PCIe ports
+
         pcie_pme=       [PCIE,PM] Native PCIe PME signaling options:
                 nomsi   Do not use MSI for native PCIe PME signaling (this makes
                         all PCIe root ports use INTx for all services).
diff --git a/MAINTAINERS b/MAINTAINERS
index ed42cb65a19b..b5aa111b0331 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8678,6 +8678,7 @@ L:	linux-pci@vger.kernel.org
 Q:      http://patchwork.ozlabs.org/project/linux-pci/list/
 T:      git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 S:      Supported
+F:      Documentation/devicetree/bindings/pci/
 F:      Documentation/PCI/
 F:      drivers/pci/
 F:      include/linux/pci*
@@ -8741,6 +8742,13 @@ L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
 S:      Maintained
 F:      drivers/pci/host/*mvebu*
 
+PCI DRIVER FOR AARDVARK (Marvell Armada 3700)
+M:      Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+L:      linux-pci@vger.kernel.org
+L:      linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S:      Maintained
+F:      drivers/pci/host/pci-aardvark.c
+
 PCI DRIVER FOR NVIDIA TEGRA
 M:      Thierry Reding <thierry.reding@gmail.com>
 L:      linux-tegra@vger.kernel.org
@@ -8823,6 +8831,15 @@ S:	Maintained
 F:      Documentation/devicetree/bindings/pci/xgene-pci-msi.txt
 F:      drivers/pci/host/pci-xgene-msi.c
 
+PCIE DRIVER FOR AXIS ARTPEC
+M:      Niklas Cassel <niklas.cassel@axis.com>
+M:      Jesper Nilsson <jesper.nilsson@axis.com>
+L:      linux-arm-kernel@axis.com
+L:      linux-pci@vger.kernel.org
+S:      Maintained
+F:      Documentation/devicetree/bindings/pci/axis,artpec*
+F:      drivers/pci/host/*artpec*
+
 PCIE DRIVER FOR HISILICON
 M:      Zhou Wang <wangzhou1@hisilicon.com>
 M:      Gabriele Paoloni <gabriele.paoloni@huawei.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 90542db1220d..354c167a2b42 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -715,7 +715,7 @@ config ARCH_VIRT
         depends on ARCH_MULTI_V7
         select ARM_AMBA
         select ARM_GIC
-        select ARM_GIC_V2M if PCI_MSI
+        select ARM_GIC_V2M if PCI
         select ARM_GIC_V3
         select ARM_PSCI
         select HAVE_ARM_ARCH_TIMER
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index 0070e8520cd4..2d88af5be45f 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -22,6 +22,7 @@ struct hw_pci {
         struct msi_controller *msi_ctrl;
         struct pci_ops  *ops;
         int             nr_controllers;
+        unsigned int    io_optional:1;
         void            **private_data;
         int             (*setup)(int nr, struct pci_sys_data *);
         struct pci_bus *(*scan)(int nr, struct pci_sys_data *);
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 05e61a2eeabe..2f0e07735d1d 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -410,7 +410,8 @@ static int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
         return irq;
 }
 
-static int pcibios_init_resources(int busnr, struct pci_sys_data *sys)
+static int pcibios_init_resource(int busnr, struct pci_sys_data *sys,
+                                 int io_optional)
 {
         int ret;
         struct resource_entry *window;
@@ -420,6 +421,14 @@ static int pcibios_init_resources(int busnr, struct pci_sys_data *sys)
                          &iomem_resource, sys->mem_offset);
         }
 
+        /*
+         * If a platform says I/O port support is optional, we don't add
+         * the default I/O space.  The platform is responsible for adding
+         * any I/O space it needs.
+         */
+        if (io_optional)
+                return 0;
+
         resource_list_for_each_entry(window, &sys->resources)
                 if (resource_type(window->res) == IORESOURCE_IO)
                         return 0;
@@ -466,7 +475,7 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
                 if (ret > 0) {
                         struct pci_host_bridge *host_bridge;
 
-                        ret = pcibios_init_resources(nr, sys);
+                        ret = pcibios_init_resource(nr, sys, hw->io_optional);
                         if (ret)  {
                                 kfree(sys);
                                 break;
@@ -515,25 +524,23 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
         list_for_each_entry(sys, &head, node) {
                 struct pci_bus *bus = sys->bus;
 
-                if (!pci_has_flag(PCI_PROBE_ONLY)) {
+                /*
+                 * We insert PCI resources into the iomem_resource and
+                 * ioport_resource trees in either pci_bus_claim_resources()
+                 * or pci_bus_assign_resources().
+                 */
+                if (pci_has_flag(PCI_PROBE_ONLY)) {
+                        pci_bus_claim_resources(bus);
+                } else {
                         struct pci_bus *child;
 
-                        /*
-                         * Size the bridge windows.
-                         */
                         pci_bus_size_bridges(bus);
-
-                        /*
-                         * Assign resources.
-                         */
                         pci_bus_assign_resources(bus);
 
                         list_for_each_entry(child, &bus->children, node)
                                 pcie_bus_configure_settings(child);
                 }
-                /*
-                 * Tell drivers about devices found.
-                 */
+
                 pci_bus_add_devices(bus);
         }
 }
@@ -590,18 +597,6 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
         return start;
 }
 
-/**
- * pcibios_enable_device - Enable I/O and memory.
- * @dev: PCI device to be enabled
- */
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-        if (pci_has_flag(PCI_PROBE_ONLY))
-                return 0;
-
-        return pci_enable_resources(dev, mask);
-}
-
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state, int write_combine)
 {
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5a0a691d4220..21d955de4181 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -3,6 +3,7 @@ config ARM64
         select ACPI_CCA_REQUIRED if ACPI
         select ACPI_GENERIC_GSI if ACPI
         select ACPI_REDUCED_HARDWARE_ONLY if ACPI
+        select ACPI_MCFG if ACPI
         select ARCH_HAS_DEVMEM_IS_ALLOWED
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select ARCH_HAS_ELF_RANDOMIZE
@@ -20,9 +21,9 @@ config ARM64
         select ARM_ARCH_TIMER
         select ARM_GIC
         select AUDIT_ARCH_COMPAT_GENERIC
-        select ARM_GIC_V2M if PCI_MSI
+        select ARM_GIC_V2M if PCI
         select ARM_GIC_V3
-        select ARM_GIC_V3_ITS if PCI_MSI
+        select ARM_GIC_V3_ITS if PCI
         select ARM_PSCI_FW
         select BUILDTIME_EXTABLE_SORT
         select CLONE_BACKWARDS
@@ -96,6 +97,7 @@ config ARM64
         select OF_EARLY_FLATTREE
         select OF_NUMA if NUMA && OF
         select OF_RESERVED_MEM
+        select PCI_ECAM if ACPI
         select PERF_USE_VMALLOC
         select POWER_RESET
         select POWER_SUPPLY
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-db.dts b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
index 86110a6ae330..1372e9a6aaa4 100644
--- a/arch/arm64/boot/dts/marvell/armada-3720-db.dts
+++ b/arch/arm64/boot/dts/marvell/armada-3720-db.dts
@@ -76,3 +76,8 @@
 &usb3 {
         status = "okay";
 };
+
+/* CON17 (PCIe) / CON12 (mini-PCIe) */
+&pcie0 {
+        status = "okay";
+};
diff --git a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
index 9e2efb882983..8a9cae9677bf 100644
--- a/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
+++ b/arch/arm64/boot/dts/marvell/armada-37xx.dtsi
@@ -141,5 +141,30 @@
                                       <0x1d40000 0x40000>; /* GICR */
                         };
                 };
+
+                pcie0: pcie@d0070000 {
+                        compatible = "marvell,armada-3700-pcie";
+                        device_type = "pci";
+                        status = "disabled";
+                        reg = <0 0xd0070000 0 0x20000>;
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        bus-range = <0x00 0xff>;
+                        interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
+                        #interrupt-cells = <1>;
+                        msi-parent = <&pcie0>;
+                        msi-controller;
+                        ranges = <0x82000000 0 0xe8000000   0 0xe8000000 0 0x1000000 /* Port 0 MEM */
+                                  0x81000000 0 0xe9000000   0 0xe9000000 0 0x10000>; /* Port 0 IO*/
+                        interrupt-map-mask = <0 0 0 7>;
+                        interrupt-map = <0 0 0 1 &pcie_intc 0>,
+                                        <0 0 0 2 &pcie_intc 1>,
+                                        <0 0 0 3 &pcie_intc 2>,
+                                        <0 0 0 4 &pcie_intc 3>;
+                        pcie_intc: interrupt-controller {
+                                interrupt-controller;
+                                #interrupt-cells = <1>;
+                        };
+                };
         };
 };
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 3c4e308b40a0..acf38722457b 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -17,6 +17,9 @@
 #include <linux/mm.h>
 #include <linux/of_pci.h>
 #include <linux/of_platform.h>
+#include <linux/pci.h>
+#include <linux/pci-acpi.h>
+#include <linux/pci-ecam.h>
 #include <linux/slab.h>
 
 /*
@@ -36,25 +39,17 @@ resource_size_t pcibios_align_resource(void *data, const struct resource *res,
         return res->start;
 }
 
-/**
- * pcibios_enable_device - Enable I/O and memory.
- * @dev: PCI device to be enabled
- * @mask: bitmask of BARs to enable
- */
-int pcibios_enable_device(struct pci_dev *dev, int mask)
-{
-        if (pci_has_flag(PCI_PROBE_ONLY))
-                return 0;
-
-        return pci_enable_resources(dev, mask);
-}
-
 /*
- * Try to assign the IRQ number from DT when adding a new device
+ * Try to assign the IRQ number when probing a new device
  */
-int pcibios_add_device(struct pci_dev *dev)
+int pcibios_alloc_irq(struct pci_dev *dev)
 {
-        dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
+        if (acpi_disabled)
+                dev->irq = of_irq_parse_and_map_pci(dev, 0, 0);
+#ifdef CONFIG_ACPI
+        else
+                return acpi_pci_irq_enable(dev);
+#endif
 
         return 0;
 }
@@ -65,13 +60,21 @@ int pcibios_add_device(struct pci_dev *dev)
 int raw_pci_read(unsigned int domain, unsigned int bus,
                   unsigned int devfn, int reg, int len, u32 *val)
 {
-        return -ENXIO;
+        struct pci_bus *b = pci_find_bus(domain, bus);
+
+        if (!b)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        return b->ops->read(b, devfn, reg, len, val);
 }
 
 int raw_pci_write(unsigned int domain, unsigned int bus,
                 unsigned int devfn, int reg, int len, u32 val)
 {
-        return -ENXIO;
+        struct pci_bus *b = pci_find_bus(domain, bus);
+
+        if (!b)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        return b->ops->write(b, devfn, reg, len, val);
 }
 
 #ifdef CONFIG_NUMA
@@ -85,10 +88,124 @@ EXPORT_SYMBOL(pcibus_to_node);
 #endif
 
 #ifdef CONFIG_ACPI
-/* Root bridge scanning */
+
+struct acpi_pci_generic_root_info {
+        struct acpi_pci_root_info       common;
+        struct pci_config_window        *cfg;   /* config space mapping */
+};
+
+int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
+{
+        struct pci_config_window *cfg = bus->sysdata;
+        struct acpi_device *adev = to_acpi_device(cfg->parent);
+        struct acpi_pci_root *root = acpi_driver_data(adev);
+
+        return root->segment;
+}
+
+int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
+{
+        if (!acpi_disabled) {
+                struct pci_config_window *cfg = bridge->bus->sysdata;
+                struct acpi_device *adev = to_acpi_device(cfg->parent);
+                ACPI_COMPANION_SET(&bridge->dev, adev);
+        }
+
+        return 0;
+}
+
+/*
+ * Lookup the bus range for the domain in MCFG, and set up config space
+ * mapping.
+ */
+static struct pci_config_window *
+pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
+{
+        struct resource *bus_res = &root->secondary;
+        u16 seg = root->segment;
+        struct pci_config_window *cfg;
+        struct resource cfgres;
+        unsigned int bsz;
+
+        /* Use address from _CBA if present, otherwise lookup MCFG */
+        if (!root->mcfg_addr)
+                root->mcfg_addr = pci_mcfg_lookup(seg, bus_res);
+
+        if (!root->mcfg_addr) {
+                dev_err(&root->device->dev, "%04x:%pR ECAM region not found\n",
+                        seg, bus_res);
+                return NULL;
+        }
+
+        bsz = 1 << pci_generic_ecam_ops.bus_shift;
+        cfgres.start = root->mcfg_addr + bus_res->start * bsz;
+        cfgres.end = cfgres.start + resource_size(bus_res) * bsz - 1;
+        cfgres.flags = IORESOURCE_MEM;
+        cfg = pci_ecam_create(&root->device->dev, &cfgres, bus_res,
+                              &pci_generic_ecam_ops);
+        if (IS_ERR(cfg)) {
+                dev_err(&root->device->dev, "%04x:%pR error %ld mapping ECAM\n",
+                        seg, bus_res, PTR_ERR(cfg));
+                return NULL;
+        }
+
+        return cfg;
+}
+
+/* release_info: free resources allocated by init_info */
+static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)
+{
+        struct acpi_pci_generic_root_info *ri;
+
+        ri = container_of(ci, struct acpi_pci_generic_root_info, common);
+        pci_ecam_free(ri->cfg);
+        kfree(ri);
+}
+
+static struct acpi_pci_root_ops acpi_pci_root_ops = {
+        .release_info = pci_acpi_generic_release_info,
+};
+
+/* Interface called from ACPI code to setup PCI host controller */
 struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
 {
-        /* TODO: Should be revisited when implementing PCI on ACPI */
-        return NULL;
+        int node = acpi_get_node(root->device->handle);
+        struct acpi_pci_generic_root_info *ri;
+        struct pci_bus *bus, *child;
+
+        ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node);
+        if (!ri)
+                return NULL;
+
+        ri->cfg = pci_acpi_setup_ecam_mapping(root);
+        if (!ri->cfg) {
+                kfree(ri);
+                return NULL;
+        }
+
+        acpi_pci_root_ops.pci_ops = &ri->cfg->ops->pci_ops;
+        bus = acpi_pci_root_create(root, &acpi_pci_root_ops, &ri->common,
+                                   ri->cfg);
+        if (!bus)
+                return NULL;
+
+        pci_bus_size_bridges(bus);
+        pci_bus_assign_resources(bus);
+
+        list_for_each_entry(child, &bus->children, node)
+                pcie_bus_configure_settings(child);
+
+        return bus;
 }
+
+void pcibios_add_bus(struct pci_bus *bus)
+{
+        acpi_pci_add_bus(bus);
+}
+
+void pcibios_remove_bus(struct pci_bus *bus)
+{
+        acpi_pci_remove_bus(bus);
+}
+
 #endif
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index fc3ecb55f1b2..2a120bb70e54 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -82,9 +82,6 @@ extern pgprot_t	pci_phys_mem_access_prot(struct file *file,
                                          pgprot_t prot);
 
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
-extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                                 const struct resource *rsrc,
-                                 resource_size_t *start, resource_size_t *end);
 
 extern void pcibios_setup_bus_devices(struct pci_bus *bus);
 extern void pcibios_setup_bus_self(struct pci_bus *bus);
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index 14cba600da7a..81556b843a8e 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -219,33 +219,6 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
 }
 
 /*
- * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci
- * device mapping.
- */
-static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
-                                      pgprot_t protection,
-                                      enum pci_mmap_state mmap_state,
-                                      int write_combine)
-{
-        pgprot_t prot = protection;
-
-        /* Write combine is always 0 on non-memory space mappings. On
-         * memory space, if the user didn't pass 1, we check for a
-         * "prefetchable" resource. This is a bit hackish, but we use
-         * this to workaround the inability of /sysfs to provide a write
-         * combine bit
-         */
-        if (mmap_state != pci_mmap_mem)
-                write_combine = 0;
-        else if (write_combine == 0) {
-                if (rp->flags & IORESOURCE_PREFETCH)
-                        write_combine = 1;
-        }
-
-        return pgprot_noncached(prot);
-}
-
-/*
  * This one is used by /dev/mem and fbdev who have no clue about the
  * PCI device, it tries to find the PCI device first and calls the
  * above routine
@@ -317,9 +290,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                 return -EINVAL;
 
         vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
-                                                  vma->vm_page_prot,
-                                                  mmap_state, write_combine);
+        vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                                vma->vm_end - vma->vm_start, vma->vm_page_prot);
@@ -473,39 +444,25 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
                           const struct resource *rsrc,
                           resource_size_t *start, resource_size_t *end)
 {
-        struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        resource_size_t offset = 0;
+        struct pci_bus_region region;
 
-        if (hose == NULL)
+        if (rsrc->flags & IORESOURCE_IO) {
+                pcibios_resource_to_bus(dev->bus, &region,
+                                        (struct resource *) rsrc);
+                *start = region.start;
+                *end = region.end;
                 return;
+        }
 
-        if (rsrc->flags & IORESOURCE_IO)
-                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
-
-        /* We pass a fully fixed up address to userland for MMIO instead of
-         * a BAR value because X is lame and expects to be able to use that
-         * to pass to /dev/mem !
+        /* We pass a CPU physical address to userland for MMIO instead of a
+         * BAR value because X is lame and expects to be able to use that
+         * to pass to /dev/mem!
          *
-         * That means that we'll have potentially 64 bits values where some
-         * userland apps only expect 32 (like X itself since it thinks only
-         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
-         * 32 bits CHRPs :-(
-         *
-         * Hopefully, the sysfs insterface is immune to that gunk. Once X
-         * has been fixed (and the fix spread enough), we can re-enable the
-         * 2 lines below and pass down a BAR value to userland. In that case
-         * we'll also have to re-enable the matching code in
-         * __pci_mmap_make_offset().
-         *
-         * BenH.
+         * That means we may have 64-bit values where some apps only expect
+         * 32 (like X itself since it thinks only Sparc has 64-bit MMIO).
          */
-#if 0
-        else if (rsrc->flags & IORESOURCE_MEM)
-                offset = hose->pci_mem_offset;
-#endif
-
-        *start = rsrc->start - offset;
-        *end = rsrc->end - offset;
+        *start = rsrc->start;
+        *end = rsrc->end;
 }
 
 /**
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index 86b239d9d75d..9b63cd41213d 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -80,16 +80,6 @@ extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
 
-static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                const struct resource *rsrc, resource_size_t *start,
-                resource_size_t *end)
-{
-        phys_addr_t size = resource_size(rsrc);
-
-        *start = fixup_bigphys_addr(rsrc->start, size);
-        *end = rsrc->start + size;
-}
-
 /*
  * Dynamic DMA mapping stuff.
  * MIPS has everything mapped statically.
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index f1b11f0dea2d..b4c02f29663e 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -112,7 +112,14 @@ static void pcibios_scanbus(struct pci_controller *hose)
                 need_domain_info = 1;
         }
 
-        if (!pci_has_flag(PCI_PROBE_ONLY)) {
+        /*
+         * We insert PCI resources into the iomem_resource and
+         * ioport_resource trees in either pci_bus_claim_resources()
+         * or pci_bus_assign_resources().
+         */
+        if (pci_has_flag(PCI_PROBE_ONLY)) {
+                pci_bus_claim_resources(bus);
+        } else {
                 pci_bus_size_bridges(bus);
                 pci_bus_assign_resources(bus);
         }
@@ -319,6 +326,16 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 EXPORT_SYMBOL(PCIBIOS_MIN_IO);
 EXPORT_SYMBOL(PCIBIOS_MIN_MEM);
 
+void pci_resource_to_user(const struct pci_dev *dev, int bar,
+                          const struct resource *rsrc, resource_size_t *start,
+                          resource_size_t *end)
+{
+        phys_addr_t size = resource_size(rsrc);
+
+        *start = fixup_bigphys_addr(rsrc->start, size);
+        *end = rsrc->start + size;
+}
+
 int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                         enum pci_mmap_state mmap_state, int write_combine)
 {
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index a6f3ac0d4602..e9bd6cf0212f 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -136,9 +136,6 @@ extern pgprot_t	pci_phys_mem_access_prot(struct file *file,
                                          pgprot_t prot);
 
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
-extern void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                                 const struct resource *rsrc,
-                                 resource_size_t *start, resource_size_t *end);
 
 extern resource_size_t pcibios_io_space_offset(struct pci_controller *hose);
 extern void pcibios_setup_bus_devices(struct pci_bus *bus);
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 0f7a60f1e9f6..6de6e0e96ce5 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -356,36 +356,6 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
 }
 
 /*
- * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci
- * device mapping.
- */
-static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,
-                                      pgprot_t protection,
-                                      enum pci_mmap_state mmap_state,
-                                      int write_combine)
-{
-
-        /* Write combine is always 0 on non-memory space mappings. On
-         * memory space, if the user didn't pass 1, we check for a
-         * "prefetchable" resource. This is a bit hackish, but we use
-         * this to workaround the inability of /sysfs to provide a write
-         * combine bit
-         */
-        if (mmap_state != pci_mmap_mem)
-                write_combine = 0;
-        else if (write_combine == 0) {
-                if (rp->flags & IORESOURCE_PREFETCH)
-                        write_combine = 1;
-        }
-
-        /* XXX would be nice to have a way to ask for write-through */
-        if (write_combine)
-                return pgprot_noncached_wc(protection);
-        else
-                return pgprot_noncached(protection);
-}
-
-/*
  * This one is used by /dev/mem and fbdev who have no clue about the
  * PCI device, it tries to find the PCI device first and calls the
  * above routine
@@ -458,9 +428,10 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                 return -EINVAL;
 
         vma->vm_pgoff = offset >> PAGE_SHIFT;
-        vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,
-                                                  vma->vm_page_prot,
-                                                  mmap_state, write_combine);
+        if (write_combine)
+                vma->vm_page_prot = pgprot_noncached_wc(vma->vm_page_prot);
+        else
+                vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
 
         ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
                                vma->vm_end - vma->vm_start, vma->vm_page_prot);
@@ -610,39 +581,25 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
                           const struct resource *rsrc,
                           resource_size_t *start, resource_size_t *end)
 {
-        struct pci_controller *hose = pci_bus_to_host(dev->bus);
-        resource_size_t offset = 0;
+        struct pci_bus_region region;
 
-        if (hose == NULL)
+        if (rsrc->flags & IORESOURCE_IO) {
+                pcibios_resource_to_bus(dev->bus, &region,
+                                        (struct resource *) rsrc);
+                *start = region.start;
+                *end = region.end;
                 return;
+        }
 
-        if (rsrc->flags & IORESOURCE_IO)
-                offset = (unsigned long)hose->io_base_virt - _IO_BASE;
-
-        /* We pass a fully fixed up address to userland for MMIO instead of
-         * a BAR value because X is lame and expects to be able to use that
-         * to pass to /dev/mem !
-         *
-         * That means that we'll have potentially 64 bits values where some
-         * userland apps only expect 32 (like X itself since it thinks only
-         * Sparc has 64 bits MMIO) but if we don't do that, we break it on
-         * 32 bits CHRPs :-(
-         *
-         * Hopefully, the sysfs insterface is immune to that gunk. Once X
-         * has been fixed (and the fix spread enough), we can re-enable the
-         * 2 lines below and pass down a BAR value to userland. In that case
-         * we'll also have to re-enable the matching code in
-         * __pci_mmap_make_offset().
+        /* We pass a CPU physical address to userland for MMIO instead of a
+         * BAR value because X is lame and expects to be able to use that
+         * to pass to /dev/mem!
          *
-         * BenH.
+         * That means we may have 64-bit values where some apps only expect
+         * 32 (like X itself since it thinks only Sparc has 64-bit MMIO).
          */
-#if 0
-        else if (rsrc->flags & IORESOURCE_MEM)
-                offset = hose->pci_mem_offset;
-#endif
-
-        *start = rsrc->start - offset;
-        *end = rsrc->end - offset;
+        *start = rsrc->start;
+        *end = rsrc->end;
 }
 
 /**
diff --git a/arch/sparc/include/asm/pci_64.h b/arch/sparc/include/asm/pci_64.h
index 022d16008a00..2303635158f5 100644
--- a/arch/sparc/include/asm/pci_64.h
+++ b/arch/sparc/include/asm/pci_64.h
@@ -55,9 +55,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 }
 
 #define HAVE_ARCH_PCI_RESOURCE_TO_USER
-void pci_resource_to_user(const struct pci_dev *dev, int bar,
-                          const struct resource *rsrc,
-                          resource_size_t *start, resource_size_t *end);
 #endif /* __KERNEL__ */
 
 #endif /* __SPARC64_PCI_H */
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index c2b202d763a1..9c1878f4fa9f 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -986,16 +986,18 @@ void pci_resource_to_user(const struct pci_dev *pdev, int bar,
                           const struct resource *rp, resource_size_t *start,
                           resource_size_t *end)
 {
-        struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;
-        unsigned long offset;
-
-        if (rp->flags & IORESOURCE_IO)
-                offset = pbm->io_space.start;
-        else
-                offset = pbm->mem_space.start;
+        struct pci_bus_region region;
 
-        *start = rp->start - offset;
-        *end = rp->end - offset;
+        /*
+         * "User" addresses are shown in /sys/devices/pci.../.../resource
+         * and /proc/bus/pci/devices and used as mmap offsets for
+         * /proc/bus/pci/BB/DD.F files (see proc_bus_pci_mmap()).
+         *
+         * On sparc, these are PCI bus addresses, i.e., raw BAR values.
+         */
+        pcibios_resource_to_bus(pdev->bus, &region, (struct resource *) rp);
+        *start = region.start;
+        *end = region.end;
 }
 
 void pcibios_set_master(struct pci_dev *dev)
diff --git a/arch/unicore32/kernel/pci.c b/arch/unicore32/kernel/pci.c
index d45fa5f3e9c4..62137d13c6f9 100644
--- a/arch/unicore32/kernel/pci.c
+++ b/arch/unicore32/kernel/pci.c
@@ -265,10 +265,8 @@ static int __init pci_common_init(void)
 
         pci_fixup_irqs(pci_common_swizzle, pci_puv3_map_irq);
 
-        if (!pci_has_flag(PCI_PROBE_ONLY)) {
-                pci_bus_size_bridges(puv3_bus);
-                pci_bus_assign_resources(puv3_bus);
-        }
+        pci_bus_size_bridges(puv3_bus);
+        pci_bus_assign_resources(puv3_bus);
         pci_bus_add_devices(puv3_bus);
         return 0;
 }
@@ -279,9 +277,6 @@ char * __init pcibios_setup(char *str)
         if (!strcmp(str, "debug")) {
                 debug_pci = 1;
                 return NULL;
-        } else if (!strcmp(str, "firmware")) {
-                pci_add_flags(PCI_PROBE_ONLY);
-                return NULL;
         }
         return str;
 }
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 8196054fedb0..7b6a9d14c8c0 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -133,7 +133,7 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev)
         if (pci_probe & PCI_NOASSIGN_BARS) {
                 /*
                 * If the BIOS did not assign the BAR, zero out the
-                * resource so the kernel doesn't attmept to assign
+                * resource so the kernel doesn't attempt to assign
                 * it later on in pci_assign_unassigned_resources
                 */
                 for (bar = 0; bar <= PCI_STD_RESOURCE_END; bar++) {
diff --git a/arch/x86/pci/vmd.c b/arch/x86/pci/vmd.c
index 7792aba266df..fd582abfad91 100644
--- a/arch/x86/pci/vmd.c
+++ b/arch/x86/pci/vmd.c
@@ -119,10 +119,11 @@ static void vmd_compose_msi_msg(struct irq_data *data, struct msi_msg *msg)
 static void vmd_irq_enable(struct irq_data *data)
 {
         struct vmd_irq *vmdirq = data->chip_data;
+        unsigned long flags;
 
-        raw_spin_lock(&list_lock);
+        raw_spin_lock_irqsave(&list_lock, flags);
         list_add_tail_rcu(&vmdirq->node, &vmdirq->irq->irq_list);
-        raw_spin_unlock(&list_lock);
+        raw_spin_unlock_irqrestore(&list_lock, flags);
 
         data->chip->irq_unmask(data);
 }
@@ -130,12 +131,14 @@ static void vmd_irq_enable(struct irq_data *data)
 static void vmd_irq_disable(struct irq_data *data)
 {
         struct vmd_irq *vmdirq = data->chip_data;
+        unsigned long flags;
 
         data->chip->irq_mask(data);
 
-        raw_spin_lock(&list_lock);
+        raw_spin_lock_irqsave(&list_lock, flags);
         list_del_rcu(&vmdirq->node);
-        raw_spin_unlock(&list_lock);
+        INIT_LIST_HEAD_RCU(&vmdirq->node);
+        raw_spin_unlock_irqrestore(&list_lock, flags);
 }
 
 /*
@@ -166,16 +169,20 @@ static irq_hw_number_t vmd_get_hwirq(struct msi_domain_info *info,
  * XXX: We can be even smarter selecting the best IRQ once we solve the
  * affinity problem.
  */
-static struct vmd_irq_list *vmd_next_irq(struct vmd_dev *vmd)
+static struct vmd_irq_list *vmd_next_irq(struct vmd_dev *vmd, struct msi_desc *desc)
 {
-        int i, best = 0;
+        int i, best = 1;
+        unsigned long flags;
 
-        raw_spin_lock(&list_lock);
+        if (!desc->msi_attrib.is_msix || vmd->msix_count == 1)
+                return &vmd->irqs[0];
+
+        raw_spin_lock_irqsave(&list_lock, flags);
         for (i = 1; i < vmd->msix_count; i++)
                 if (vmd->irqs[i].count < vmd->irqs[best].count)
                         best = i;
         vmd->irqs[best].count++;
-        raw_spin_unlock(&list_lock);
+        raw_spin_unlock_irqrestore(&list_lock, flags);
 
         return &vmd->irqs[best];
 }
@@ -184,14 +191,15 @@ static int vmd_msi_init(struct irq_domain *domain, struct msi_domain_info *info,
                         unsigned int virq, irq_hw_number_t hwirq,
                         msi_alloc_info_t *arg)
 {
-        struct vmd_dev *vmd = vmd_from_bus(msi_desc_to_pci_dev(arg->desc)->bus);
+        struct msi_desc *desc = arg->desc;
+        struct vmd_dev *vmd = vmd_from_bus(msi_desc_to_pci_dev(desc)->bus);
         struct vmd_irq *vmdirq = kzalloc(sizeof(*vmdirq), GFP_KERNEL);
 
         if (!vmdirq)
                 return -ENOMEM;
 
         INIT_LIST_HEAD(&vmdirq->node);
-        vmdirq->irq = vmd_next_irq(vmd);
+        vmdirq->irq = vmd_next_irq(vmd, desc);
         vmdirq->virq = virq;
 
         irq_domain_set_info(domain, virq, vmdirq->irq->vmd_vector, info->chip,
@@ -203,11 +211,12 @@ static void vmd_msi_free(struct irq_domain *domain,
                         struct msi_domain_info *info, unsigned int virq)
 {
         struct vmd_irq *vmdirq = irq_get_chip_data(virq);
+        unsigned long flags;
 
         /* XXX: Potential optimization to rebalance */
-        raw_spin_lock(&list_lock);
+        raw_spin_lock_irqsave(&list_lock, flags);
         vmdirq->irq->count--;
-        raw_spin_unlock(&list_lock);
+        raw_spin_unlock_irqrestore(&list_lock, flags);
 
         kfree_rcu(vmdirq, rcu);
 }
@@ -261,7 +270,7 @@ static struct device *to_vmd_dev(struct device *dev)
 
 static struct dma_map_ops *vmd_dma_ops(struct device *dev)
 {
-        return to_vmd_dev(dev)->archdata.dma_ops;
+        return get_dma_ops(to_vmd_dev(dev));
 }
 
 static void *vmd_alloc(struct device *dev, size_t size, dma_addr_t *addr,
@@ -367,7 +376,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
 {
         struct dma_domain *domain = &vmd->dma_domain;
 
-        if (vmd->dev->dev.archdata.dma_ops)
+        if (get_dma_ops(&vmd->dev->dev))
                 del_dma_domain(domain);
 }
 
@@ -379,7 +388,7 @@ static void vmd_teardown_dma_ops(struct vmd_dev *vmd)
 
 static void vmd_setup_dma_ops(struct vmd_dev *vmd)
 {
-        const struct dma_map_ops *source = vmd->dev->dev.archdata.dma_ops;
+        const struct dma_map_ops *source = get_dma_ops(&vmd->dev->dev);
         struct dma_map_ops *dest = &vmd->dma_ops;
         struct dma_domain *domain = &vmd->dma_domain;
 
@@ -594,7 +603,7 @@ static int vmd_enable_domain(struct vmd_dev *vmd)
         sd->node = pcibus_to_node(vmd->dev->bus);
 
         vmd->irq_domain = pci_msi_create_irq_domain(NULL, &vmd_msi_domain_info,
-                                                    NULL);
+                                                    x86_vector_domain);
         if (!vmd->irq_domain)
                 return -ENODEV;
 
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index b7e2e776397d..f98c3287256e 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -217,6 +217,9 @@ config ACPI_PROCESSOR_IDLE
         bool
         select CPU_IDLE
 
+config ACPI_MCFG
+        bool
+
 config ACPI_CPPC_LIB
         bool
         depends on ACPI_PROCESSOR
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 251ce85a66fb..632e81feef69 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -40,6 +40,7 @@ acpi-$(CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC) += processor_pdc.o
 acpi-y                          += ec.o
 acpi-$(CONFIG_ACPI_DOCK)        += dock.o
 acpi-y                          += pci_root.o pci_link.o pci_irq.o
+obj-$(CONFIG_ACPI_MCFG)         += pci_mcfg.o
 acpi-y                          += acpi_lpss.o acpi_apd.o
 acpi-y                          += acpi_platform.o
 acpi-y                          += acpi_pnp.o
diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c
new file mode 100644
index 000000000000..b5b376e081f5
--- /dev/null
+++ b/drivers/acpi/pci_mcfg.c
@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2016 Broadcom
+ *      Author: Jayachandran C <jchandra@broadcom.com>
+ * Copyright (C) 2016 Semihalf
+ *      Author: Tomasz Nowicki <tn@semihalf.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation (the "GPL").
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License version 2 (GPLv2) for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * version 2 (GPLv2) along with this source code.
+ */
+
+#define pr_fmt(fmt) "ACPI: " fmt
+
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/pci-acpi.h>
+
+/* Structure to hold entries from the MCFG table */
+struct mcfg_entry {
+        struct list_head        list;
+        phys_addr_t             addr;
+        u16                     segment;
+        u8                      bus_start;
+        u8                      bus_end;
+};
+
+/* List to save MCFG entries */
+static LIST_HEAD(pci_mcfg_list);
+
+phys_addr_t pci_mcfg_lookup(u16 seg, struct resource *bus_res)
+{
+        struct mcfg_entry *e;
+
+        /*
+         * We expect exact match, unless MCFG entry end bus covers more than
+         * specified by caller.
+         */
+        list_for_each_entry(e, &pci_mcfg_list, list) {
+                if (e->segment == seg && e->bus_start == bus_res->start &&
+                    e->bus_end >= bus_res->end)
+                        return e->addr;
+        }
+
+        return 0;
+}
+
+static __init int pci_mcfg_parse(struct acpi_table_header *header)
+{
+        struct acpi_table_mcfg *mcfg;
+        struct acpi_mcfg_allocation *mptr;
+        struct mcfg_entry *e, *arr;
+        int i, n;
+
+        if (header->length < sizeof(struct acpi_table_mcfg))
+                return -EINVAL;
+
+        n = (header->length - sizeof(struct acpi_table_mcfg)) /
+                                        sizeof(struct acpi_mcfg_allocation);
+        mcfg = (struct acpi_table_mcfg *)header;
+        mptr = (struct acpi_mcfg_allocation *) &mcfg[1];
+
+        arr = kcalloc(n, sizeof(*arr), GFP_KERNEL);
+        if (!arr)
+                return -ENOMEM;
+
+        for (i = 0, e = arr; i < n; i++, mptr++, e++) {
+                e->segment = mptr->pci_segment;
+                e->addr =  mptr->address;
+                e->bus_start = mptr->start_bus_number;
+                e->bus_end = mptr->end_bus_number;
+                list_add(&e->list, &pci_mcfg_list);
+        }
+
+        pr_info("MCFG table detected, %d entries\n", n);
+        return 0;
+}
+
+/* Interface called by ACPI - parse and save MCFG table */
+void __init pci_mmcfg_late_init(void)
+{
+        int err = acpi_table_parse(ACPI_SIG_MCFG, pci_mcfg_parse);
+        if (err)
+                pr_err("Failed to parse MCFG (%d)\n", err);
+}
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index ae3fe4e64203..d144168d4ef9 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -720,6 +720,36 @@ next:
         }
 }
 
+static void acpi_pci_root_remap_iospace(struct resource_entry *entry)
+{
+#ifdef PCI_IOBASE
+        struct resource *res = entry->res;
+        resource_size_t cpu_addr = res->start;
+        resource_size_t pci_addr = cpu_addr - entry->offset;
+        resource_size_t length = resource_size(res);
+        unsigned long port;
+
+        if (pci_register_io_range(cpu_addr, length))
+                goto err;
+
+        port = pci_address_to_pio(cpu_addr);
+        if (port == (unsigned long)-1)
+                goto err;
+
+        res->start = port;
+        res->end = port + length - 1;
+        entry->offset = port - pci_addr;
+
+        if (pci_remap_iospace(res, cpu_addr) < 0)
+                goto err;
+
+        pr_info("Remapped I/O %pa to %pR\n", &cpu_addr, res);
+        return;
+err:
+        res->flags |= IORESOURCE_DISABLED;
+#endif
+}
+
 int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info)
 {
         int ret;
@@ -740,6 +770,9 @@ int acpi_pci_probe_root_resources(struct acpi_pci_root_info *info)
                         "no IO and memory resources present in _CRS\n");
         else {
                 resource_list_for_each_entry_safe(entry, tmp, list) {
+                        if (entry->res->flags & IORESOURCE_IO)
+                                acpi_pci_root_remap_iospace(entry);
+
                         if (entry->res->flags & IORESOURCE_DISABLED)
                                 resource_list_destroy_entry(entry);
                         else
@@ -811,6 +844,8 @@ static void acpi_pci_root_release_info(struct pci_host_bridge *bridge)
 
         resource_list_for_each_entry(entry, &bridge->windows) {
                 res = entry->res;
+                if (res->flags & IORESOURCE_IO)
+                        pci_unmap_iospace(res);
                 if (res->parent &&
                     (res->flags & (IORESOURCE_MEM | IORESOURCE_IO)))
                         release_resource(res);
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index fa33c50b0e5a..11ecb6cfb2e5 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -15,9 +15,9 @@ config ARM_GIC_MAX_NR
 
 config ARM_GIC_V2M
         bool
-        depends on ARM_GIC
-        depends on PCI && PCI_MSI
-        select PCI_MSI_IRQ_DOMAIN
+        depends on PCI
+        select ARM_GIC
+        select PCI_MSI
 
 config GIC_NON_BANKED
         bool
@@ -31,7 +31,8 @@ config ARM_GIC_V3
 
 config ARM_GIC_V3_ITS
         bool
-        select PCI_MSI_IRQ_DOMAIN
+        depends on PCI
+        depends on PCI_MSI
 
 config ARM_NVIC
         bool
@@ -56,13 +57,13 @@ config ARM_VIC_NR
 config ARMADA_370_XP_IRQ
         bool
         select GENERIC_IRQ_CHIP
-        select PCI_MSI_IRQ_DOMAIN if PCI_MSI
+        select PCI_MSI if PCI
 
 config ALPINE_MSI
         bool
-        depends on PCI && PCI_MSI
+        depends on PCI
+        select PCI_MSI
         select GENERIC_IRQ_CHIP
-        select PCI_MSI_IRQ_DOMAIN
 
 config ATMEL_AIC_IRQ
         bool
@@ -111,7 +112,6 @@ config HISILICON_IRQ_MBIGEN
         bool
         select ARM_GIC_V3
         select ARM_GIC_V3_ITS
-        select GENERIC_MSI_IRQ_DOMAIN
 
 config IMGPDC_IRQ
         bool
@@ -244,12 +244,10 @@ config IRQ_MXS
 
 config MVEBU_ODMI
         bool
-        select GENERIC_MSI_IRQ_DOMAIN
 
 config LS_SCFG_MSI
         def_bool y if SOC_LS1021A || ARCH_LAYERSCAPE
         depends on PCI && PCI_MSI
-        select PCI_MSI_IRQ_DOMAIN
 
 config PARTITION_PERCPU
         bool
diff --git a/drivers/misc/genwqe/card_base.c b/drivers/misc/genwqe/card_base.c
index 4cf8f82cfca2..a70b853fa2c9 100644
--- a/drivers/misc/genwqe/card_base.c
+++ b/drivers/misc/genwqe/card_base.c
@@ -182,7 +182,7 @@ static void genwqe_dev_free(struct genwqe_dev *cd)
  */
 static int genwqe_bus_reset(struct genwqe_dev *cd)
 {
-        int bars, rc = 0;
+        int rc = 0;
         struct pci_dev *pci_dev = cd->pci_dev;
         void __iomem *mmio;
 
@@ -193,8 +193,7 @@ static int genwqe_bus_reset(struct genwqe_dev *cd)
         cd->mmio = NULL;
         pci_iounmap(pci_dev, mmio);
 
-        bars = pci_select_bars(pci_dev, IORESOURCE_MEM);
-        pci_release_selected_regions(pci_dev, bars);
+        pci_release_mem_regions(pci_dev);
 
         /*
          * Firmware/BIOS might change memory mapping during bus reset.
@@ -218,7 +217,7 @@ static int genwqe_bus_reset(struct genwqe_dev *cd)
                             GENWQE_INJECT_GFIR_FATAL |
                             GENWQE_INJECT_GFIR_INFO);
 
-        rc = pci_request_selected_regions(pci_dev, bars, genwqe_driver_name);
+        rc = pci_request_mem_regions(pci_dev, genwqe_driver_name);
         if (rc) {
                 dev_err(&pci_dev->dev,
                         "[%s] err: request bars failed (%d)\n", __func__, rc);
@@ -1068,10 +1067,9 @@ static int genwqe_health_check_stop(struct genwqe_dev *cd)
  */
 static int genwqe_pci_setup(struct genwqe_dev *cd)
 {
-        int err, bars;
+        int err;
         struct pci_dev *pci_dev = cd->pci_dev;
 
-        bars = pci_select_bars(pci_dev, IORESOURCE_MEM);
         err = pci_enable_device_mem(pci_dev);
         if (err) {
                 dev_err(&pci_dev->dev,
@@ -1080,7 +1078,7 @@ static int genwqe_pci_setup(struct genwqe_dev *cd)
         }
 
         /* Reserve PCI I/O and memory resources */
-        err = pci_request_selected_regions(pci_dev, bars, genwqe_driver_name);
+        err = pci_request_mem_regions(pci_dev, genwqe_driver_name);
         if (err) {
                 dev_err(&pci_dev->dev,
                         "[%s] err: request bars failed (%d)\n", __func__, err);
@@ -1142,7 +1140,7 @@ static int genwqe_pci_setup(struct genwqe_dev *cd)
  out_iounmap:
         pci_iounmap(pci_dev, cd->mmio);
  out_release_resources:
-        pci_release_selected_regions(pci_dev, bars);
+        pci_release_mem_regions(pci_dev);
  err_disable_device:
         pci_disable_device(pci_dev);
  err_out:
@@ -1154,14 +1152,12 @@ static int genwqe_pci_setup(struct genwqe_dev *cd)
  */
 static void genwqe_pci_remove(struct genwqe_dev *cd)
 {
-        int bars;
         struct pci_dev *pci_dev = cd->pci_dev;
 
         if (cd->mmio)
                 pci_iounmap(pci_dev, cd->mmio);
 
-        bars = pci_select_bars(pci_dev, IORESOURCE_MEM);
-        pci_release_selected_regions(pci_dev, bars);
+        pci_release_mem_regions(pci_dev);
         pci_disable_device(pci_dev);
 }
 
diff --git a/drivers/net/ethernet/atheros/alx/main.c b/drivers/net/ethernet/atheros/alx/main.c
index c98acdc0d14f..ec157a0c5d2a 100644
--- a/drivers/net/ethernet/atheros/alx/main.c
+++ b/drivers/net/ethernet/atheros/alx/main.c
@@ -1284,7 +1284,7 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct alx_priv *alx;
         struct alx_hw *hw;
         bool phy_configured;
-        int bars, err;
+        int err;
 
         err = pci_enable_device_mem(pdev);
         if (err)
@@ -1304,11 +1304,10 @@ static int alx_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
         }
 
-        bars = pci_select_bars(pdev, IORESOURCE_MEM);
-        err = pci_request_selected_regions(pdev, bars, alx_drv_name);
+        err = pci_request_mem_regions(pdev, alx_drv_name);
         if (err) {
                 dev_err(&pdev->dev,
-                        "pci_request_selected_regions failed(bars:%d)\n", bars);
+                        "pci_request_mem_regions failed\n");
                 goto out_pci_disable;
         }
 
@@ -1434,7 +1433,7 @@ out_unmap:
 out_free_netdev:
         free_netdev(netdev);
 out_pci_release:
-        pci_release_selected_regions(pdev, bars);
+        pci_release_mem_regions(pdev);
 out_pci_disable:
         pci_disable_device(pdev);
         return err;
@@ -1453,8 +1452,7 @@ static void alx_remove(struct pci_dev *pdev)
 
         unregister_netdev(alx->dev);
         iounmap(hw->hw_addr);
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 
         pci_disable_pcie_error_reporting(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 75e60897b7e7..a2dfa2fbedd8 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7321,8 +7321,7 @@ err_flashmap:
 err_ioremap:
         free_netdev(netdev);
 err_alloc_etherdev:
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -7389,8 +7388,7 @@ static void e1000_remove(struct pci_dev *pdev)
         if ((adapter->hw.flash_address) &&
             (adapter->hw.mac.type < e1000_pch_spt))
                 iounmap(adapter->hw.flash_address);
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 
         free_netdev(netdev);
 
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index e05aca9bef0e..a5bccc801177 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -1869,10 +1869,7 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_dma;
         }
 
-        err = pci_request_selected_regions(pdev,
-                                           pci_select_bars(pdev,
-                                                           IORESOURCE_MEM),
-                                           fm10k_driver_name);
+        err = pci_request_mem_regions(pdev, fm10k_driver_name);
         if (err) {
                 dev_err(&pdev->dev,
                         "pci_request_selected_regions failed: %d\n", err);
@@ -1976,8 +1973,7 @@ err_sw_init:
 err_ioremap:
         free_netdev(netdev);
 err_alloc_netdev:
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -2025,8 +2021,7 @@ static void fm10k_remove(struct pci_dev *pdev)
 
         free_netdev(netdev);
 
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 
         pci_disable_pcie_error_reporting(pdev);
 
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 5ea22008d721..2e10d2341a29 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -10769,8 +10769,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         /* set up pci connections */
-        err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
-                                           IORESOURCE_MEM), i40e_driver_name);
+        err = pci_request_mem_regions(pdev, i40e_driver_name);
         if (err) {
                 dev_info(&pdev->dev,
                          "pci_request_selected_regions failed %d\n", err);
@@ -11267,8 +11266,7 @@ err_ioremap:
         kfree(pf);
 err_pf_alloc:
         pci_disable_pcie_error_reporting(pdev);
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -11379,8 +11377,7 @@ static void i40e_remove(struct pci_dev *pdev)
 
         iounmap(hw->hw_addr);
         kfree(pf);
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 
         pci_disable_pcie_error_reporting(pdev);
         pci_disable_device(pdev);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index ef3d642f5ff2..1c96fe83000a 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -2323,9 +2323,7 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 }
         }
 
-        err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
-                                           IORESOURCE_MEM),
-                                           igb_driver_name);
+        err = pci_request_mem_regions(pdev, igb_driver_name);
         if (err)
                 goto err_pci_reg;
 
@@ -2749,8 +2747,7 @@ err_sw_init:
 err_ioremap:
         free_netdev(netdev);
 err_alloc_etherdev:
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 err_pci_reg:
 err_dma:
         pci_disable_device(pdev);
@@ -2915,8 +2912,7 @@ static void igb_remove(struct pci_dev *pdev)
         pci_iounmap(pdev, adapter->io_addr);
         if (hw->flash_address)
                 iounmap(hw->flash_address);
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 
         kfree(adapter->shadow_vfta);
         free_netdev(netdev);
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 088c47cf27d9..162946838772 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -9331,8 +9331,7 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 pci_using_dac = 0;
         }
 
-        err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
-                                           IORESOURCE_MEM), ixgbe_driver_name);
+        err = pci_request_mem_regions(pdev, ixgbe_driver_name);
         if (err) {
                 dev_err(&pdev->dev,
                         "pci_request_selected_regions failed 0x%x\n", err);
@@ -9718,8 +9717,7 @@ err_ioremap:
         disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
         free_netdev(netdev);
 err_alloc_etherdev:
-        pci_release_selected_regions(pdev,
-                                     pci_select_bars(pdev, IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 err_pci_reg:
 err_dma:
         if (!adapter || disable_dev)
@@ -9786,8 +9784,7 @@ static void ixgbe_remove(struct pci_dev *pdev)
 
 #endif
         iounmap(adapter->io_addr);
-        pci_release_selected_regions(pdev, pci_select_bars(pdev,
-                                     IORESOURCE_MEM));
+        pci_release_mem_regions(pdev);
 
         e_dev_info("complete\n");
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 78dca3193ca4..7e4d81208da7 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1681,7 +1681,7 @@ static void nvme_dev_unmap(struct nvme_dev *dev)
 {
         if (dev->bar)
                 iounmap(dev->bar);
-        pci_release_regions(to_pci_dev(dev->dev));
+        pci_release_mem_regions(to_pci_dev(dev->dev));
 }
 
 static void nvme_pci_disable(struct nvme_dev *dev)
@@ -1909,13 +1909,9 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = {
 
 static int nvme_dev_map(struct nvme_dev *dev)
 {
-        int bars;
         struct pci_dev *pdev = to_pci_dev(dev->dev);
 
-        bars = pci_select_bars(pdev, IORESOURCE_MEM);
-        if (!bars)
-                return -ENODEV;
-        if (pci_request_selected_regions(pdev, bars, "nvme"))
+        if (pci_request_mem_regions(pdev, "nvme"))
                 return -ENODEV;
 
         dev->bar = ioremap(pci_resource_start(pdev, 0), 8192);
@@ -1924,7 +1920,7 @@ static int nvme_dev_map(struct nvme_dev *dev)
 
        return 0;
   release:
-       pci_release_regions(pdev);
+       pci_release_mem_regions(pdev);
        return -ENODEV;
 }
 
diff --git a/drivers/pci/Kconfig b/drivers/pci/Kconfig
index 56389be5d08b..67f9916ff14d 100644
--- a/drivers/pci/Kconfig
+++ b/drivers/pci/Kconfig
@@ -25,7 +25,7 @@ config PCI_MSI
            If you don't know what to do here, say Y.
 
 config PCI_MSI_IRQ_DOMAIN
-        bool
+        def_bool ARM || ARM64 || X86
         depends on PCI_MSI
         select GENERIC_MSI_IRQ_DOMAIN
 
diff --git a/drivers/pci/bus.c b/drivers/pci/bus.c
index dd7cdbee8029..c288e5a52575 100644
--- a/drivers/pci/bus.c
+++ b/drivers/pci/bus.c
@@ -91,6 +91,35 @@ void pci_bus_remove_resources(struct pci_bus *bus)
         }
 }
 
+int devm_request_pci_bus_resources(struct device *dev,
+                                   struct list_head *resources)
+{
+        struct resource_entry *win;
+        struct resource *parent, *res;
+        int err;
+
+        resource_list_for_each_entry(win, resources) {
+                res = win->res;
+                switch (resource_type(res)) {
+                case IORESOURCE_IO:
+                        parent = &ioport_resource;
+                        break;
+                case IORESOURCE_MEM:
+                        parent = &iomem_resource;
+                        break;
+                default:
+                        continue;
+                }
+
+                err = devm_request_resource(dev, parent, res);
+                if (err)
+                        return err;
+        }
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(devm_request_pci_bus_resources);
+
 static struct pci_bus_region pci_32_bit = {0, 0xffffffffULL};
 #ifdef CONFIG_PCI_BUS_ADDR_T_64BIT
 static struct pci_bus_region pci_64_bit = {0,
@@ -291,6 +320,7 @@ void pci_bus_add_device(struct pci_dev *dev)
         pci_fixup_device(pci_fixup_final, dev);
         pci_create_sysfs_dev_files(dev);
         pci_proc_attach_device(dev);
+        pci_bridge_d3_device_changed(dev);
 
         dev->match_driver = true;
         retval = device_attach(&dev->dev);
@@ -397,4 +427,3 @@ void pci_bus_put(struct pci_bus *bus)
                 put_device(&bus->dev);
 }
 EXPORT_SYMBOL(pci_bus_put);
-
diff --git a/drivers/pci/ecam.c b/drivers/pci/ecam.c
index f9832ad8efe2..66e0d718472f 100644
--- a/drivers/pci/ecam.c
+++ b/drivers/pci/ecam.c
@@ -19,10 +19,9 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pci.h>
+#include <linux/pci-ecam.h>
 #include <linux/slab.h>
 
-#include "ecam.h"
-
 /*
  * On 64-bit systems, we do a single ioremap for the whole config space
  * since we have enough virtual address range available.  On 32-bit, we
@@ -52,6 +51,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
         if (!cfg)
                 return ERR_PTR(-ENOMEM);
 
+        cfg->parent = dev;
         cfg->ops = ops;
         cfg->busr.start = busr->start;
         cfg->busr.end = busr->end;
@@ -95,7 +95,7 @@ struct pci_config_window *pci_ecam_create(struct device *dev,
         }
 
         if (ops->init) {
-                err = ops->init(dev, cfg);
+                err = ops->init(cfg);
                 if (err)
                         goto err_exit;
         }
diff --git a/drivers/pci/host/Kconfig b/drivers/pci/host/Kconfig
index 5d2374e4ee7f..9b485d873b0d 100644
--- a/drivers/pci/host/Kconfig
+++ b/drivers/pci/host/Kconfig
@@ -3,8 +3,9 @@ menu "PCI host controller drivers"
 
 config PCI_DRA7XX
         bool "TI DRA7xx PCIe controller"
-        select PCIE_DW
         depends on OF && HAS_IOMEM && TI_PIPE3
+        depends on PCI_MSI_IRQ_DOMAIN
+        select PCIE_DW
         help
          Enables support for the PCIe controller in the DRA7xx SoC.  There
          are two instances of PCIe controller in DRA7xx.  This controller can
@@ -16,11 +17,20 @@ config PCI_MVEBU
         depends on ARM
         depends on OF
 
+config PCI_AARDVARK
+        bool "Aardvark PCIe controller"
+        depends on ARCH_MVEBU && ARM64
+        depends on OF
+        depends on PCI_MSI_IRQ_DOMAIN
+        help
+         Add support for Aardvark 64bit PCIe Host Controller. This
+         controller is part of the South Bridge of the Marvel Armada
+         3700 SoC.
 
 config PCIE_XILINX_NWL
         bool "NWL PCIe Core"
         depends on ARCH_ZYNQMP
-        select PCI_MSI_IRQ_DOMAIN if PCI_MSI
+        depends on PCI_MSI_IRQ_DOMAIN
         help
          Say 'Y' here if you want kernel support for Xilinx
          NWL PCIe controller. The controller can act as Root Port
@@ -29,6 +39,7 @@ config PCIE_XILINX_NWL
 
 config PCIE_DW_PLAT
         bool "Platform bus based DesignWare PCIe Controller"
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIE_DW
         ---help---
          This selects the DesignWare PCIe controller support. Select this if
@@ -40,16 +51,19 @@ config PCIE_DW_PLAT
 
 config PCIE_DW
         bool
+        depends on PCI_MSI_IRQ_DOMAIN
 
 config PCI_EXYNOS
         bool "Samsung Exynos PCIe controller"
         depends on SOC_EXYNOS5440
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIEPORTBUS
         select PCIE_DW
 
 config PCI_IMX6
         bool "Freescale i.MX6 PCIe controller"
         depends on SOC_IMX6Q
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIEPORTBUS
         select PCIE_DW
 
@@ -72,8 +86,7 @@ config PCI_RCAR_GEN2
 config PCIE_RCAR
         bool "Renesas R-Car PCIe controller"
         depends on ARCH_RENESAS || (ARM && COMPILE_TEST)
-        select PCI_MSI
-        select PCI_MSI_IRQ_DOMAIN
+        depends on PCI_MSI_IRQ_DOMAIN
         help
           Say Y here if you want PCIe controller support on R-Car SoCs.
 
@@ -85,6 +98,7 @@ config PCI_HOST_GENERIC
         bool "Generic PCI host controller"
         depends on (ARM || ARM64) && OF
         select PCI_HOST_COMMON
+        select IRQ_DOMAIN
         help
           Say Y here if you want to support a simple generic PCI host
           controller, such as the one emulated by kvmtool.
@@ -92,6 +106,7 @@ config PCI_HOST_GENERIC
 config PCIE_SPEAR13XX
         bool "STMicroelectronics SPEAr PCIe controller"
         depends on ARCH_SPEAR13XX
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIEPORTBUS
         select PCIE_DW
         help
@@ -100,6 +115,7 @@ config PCIE_SPEAR13XX
 config PCI_KEYSTONE
         bool "TI Keystone PCIe controller"
         depends on ARCH_KEYSTONE
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIE_DW
         select PCIEPORTBUS
         help
@@ -120,7 +136,6 @@ config PCI_XGENE
         depends on ARCH_XGENE
         depends on OF
         select PCIEPORTBUS
-        select PCI_MSI_IRQ_DOMAIN if PCI_MSI
         help
           Say Y here if you want internal PCI support on APM X-Gene SoC.
           There are 5 internal PCIe ports available. Each port is GEN3 capable
@@ -128,7 +143,8 @@ config PCI_XGENE
 
 config PCI_XGENE_MSI
         bool "X-Gene v1 PCIe MSI feature"
-        depends on PCI_XGENE && PCI_MSI
+        depends on PCI_XGENE
+        depends on PCI_MSI_IRQ_DOMAIN
         default y
         help
           Say Y here if you want PCIe MSI support for the APM X-Gene v1 SoC.
@@ -137,6 +153,7 @@ config PCI_XGENE_MSI
 config PCI_LAYERSCAPE
         bool "Freescale Layerscape PCIe controller"
         depends on OF && (ARM || ARCH_LAYERSCAPE)
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIE_DW
         select MFD_SYSCON
         help
@@ -177,8 +194,7 @@ config PCIE_IPROC_BCMA
 config PCIE_IPROC_MSI
         bool "Broadcom iProc PCIe MSI support"
         depends on PCIE_IPROC_PLATFORM || PCIE_IPROC_BCMA
-        depends on PCI_MSI
-        select PCI_MSI_IRQ_DOMAIN
+        depends on PCI_MSI_IRQ_DOMAIN
         default ARCH_BCM_IPROC
         help
           Say Y here if you want to enable MSI support for Broadcom's iProc
@@ -195,8 +211,8 @@ config PCIE_ALTERA
 
 config PCIE_ALTERA_MSI
         bool "Altera PCIe MSI feature"
-        depends on PCIE_ALTERA && PCI_MSI
-        select PCI_MSI_IRQ_DOMAIN
+        depends on PCIE_ALTERA
+        depends on PCI_MSI_IRQ_DOMAIN
         help
           Say Y here if you want PCIe MSI support for the Altera FPGA.
           This MSI driver supports Altera MSI to GIC controller IP.
@@ -204,6 +220,7 @@ config PCIE_ALTERA_MSI
 config PCI_HISI
         depends on OF && ARM64
         bool "HiSilicon Hip05 and Hip06 SoCs PCIe controllers"
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIEPORTBUS
         select PCIE_DW
         help
@@ -213,6 +230,7 @@ config PCI_HISI
 config PCIE_QCOM
         bool "Qualcomm PCIe controller"
         depends on ARCH_QCOM && OF
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIE_DW
         select PCIEPORTBUS
         help
@@ -237,6 +255,7 @@ config PCI_HOST_THUNDER_ECAM
 config PCIE_ARMADA_8K
         bool "Marvell Armada-8K PCIe controller"
         depends on ARCH_MVEBU
+        depends on PCI_MSI_IRQ_DOMAIN
         select PCIE_DW
         select PCIEPORTBUS
         help
@@ -245,4 +264,14 @@ config PCIE_ARMADA_8K
           Designware hardware and therefore the driver re-uses the
           Designware core functions to implement the driver.
 
+config PCIE_ARTPEC6
+        bool "Axis ARTPEC-6 PCIe controller"
+        depends on MACH_ARTPEC6
+        depends on PCI_MSI_IRQ_DOMAIN
+        select PCIE_DW
+        select PCIEPORTBUS
+        help
+          Say Y here to enable PCIe controller support on Axis ARTPEC-6
+          SoCs.  This PCIe controller uses the DesignWare core.
+
 endmenu
diff --git a/drivers/pci/host/Makefile b/drivers/pci/host/Makefile
index 9c8698e89e96..88434101e4c4 100644
--- a/drivers/pci/host/Makefile
+++ b/drivers/pci/host/Makefile
@@ -5,6 +5,7 @@ obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o
 obj-$(CONFIG_PCI_IMX6) += pci-imx6.o
 obj-$(CONFIG_PCI_HYPERV) += pci-hyperv.o
 obj-$(CONFIG_PCI_MVEBU) += pci-mvebu.o
+obj-$(CONFIG_PCI_AARDVARK) += pci-aardvark.o
 obj-$(CONFIG_PCI_TEGRA) += pci-tegra.o
 obj-$(CONFIG_PCI_RCAR_GEN2) += pci-rcar-gen2.o
 obj-$(CONFIG_PCIE_RCAR) += pcie-rcar.o
@@ -29,3 +30,4 @@ obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o
 obj-$(CONFIG_PCI_HOST_THUNDER_ECAM) += pci-thunder-ecam.o
 obj-$(CONFIG_PCI_HOST_THUNDER_PEM) += pci-thunder-pem.o
 obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
+obj-$(CONFIG_PCIE_ARTPEC6) += pcie-artpec6.o
diff --git a/drivers/pci/host/pci-aardvark.c b/drivers/pci/host/pci-aardvark.c
new file mode 100644
index 000000000000..ef9893fa3176
--- /dev/null
+++ b/drivers/pci/host/pci-aardvark.c
@@ -0,0 +1,1001 @@
+/*
+ * Driver for the Aardvark PCIe controller, used on Marvell Armada
+ * 3700.
+ *
+ * Copyright (C) 2016 Marvell
+ *
+ * Author: Hezi Shahmoon <hezi.shahmoon@marvell.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/irq.h>
+#include <linux/irqdomain.h>
+#include <linux/kernel.h>
+#include <linux/pci.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/of_address.h>
+#include <linux/of_pci.h>
+
+/* PCIe core registers */
+#define PCIE_CORE_CMD_STATUS_REG                                0x4
+#define     PCIE_CORE_CMD_IO_ACCESS_EN                          BIT(0)
+#define     PCIE_CORE_CMD_MEM_ACCESS_EN                         BIT(1)
+#define     PCIE_CORE_CMD_MEM_IO_REQ_EN                         BIT(2)
+#define PCIE_CORE_DEV_CTRL_STATS_REG                            0xc8
+#define     PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE        (0 << 4)
+#define     PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT       5
+#define     PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE              (0 << 11)
+#define     PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT      12
+#define PCIE_CORE_LINK_CTRL_STAT_REG                            0xd0
+#define     PCIE_CORE_LINK_L0S_ENTRY                            BIT(0)
+#define     PCIE_CORE_LINK_TRAINING                             BIT(5)
+#define     PCIE_CORE_LINK_WIDTH_SHIFT                          20
+#define PCIE_CORE_ERR_CAPCTL_REG                                0x118
+#define     PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX                    BIT(5)
+#define     PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN                 BIT(6)
+#define     PCIE_CORE_ERR_CAPCTL_ECRC_CHCK                      BIT(7)
+#define     PCIE_CORE_ERR_CAPCTL_ECRC_CHCK_RCV                  BIT(8)
+
+/* PIO registers base address and register offsets */
+#define PIO_BASE_ADDR                           0x4000
+#define PIO_CTRL                                (PIO_BASE_ADDR + 0x0)
+#define   PIO_CTRL_TYPE_MASK                    GENMASK(3, 0)
+#define   PIO_CTRL_ADDR_WIN_DISABLE             BIT(24)
+#define PIO_STAT                                (PIO_BASE_ADDR + 0x4)
+#define   PIO_COMPLETION_STATUS_SHIFT           7
+#define   PIO_COMPLETION_STATUS_MASK            GENMASK(9, 7)
+#define   PIO_COMPLETION_STATUS_OK              0
+#define   PIO_COMPLETION_STATUS_UR              1
+#define   PIO_COMPLETION_STATUS_CRS             2
+#define   PIO_COMPLETION_STATUS_CA              4
+#define   PIO_NON_POSTED_REQ                    BIT(0)
+#define PIO_ADDR_LS                             (PIO_BASE_ADDR + 0x8)
+#define PIO_ADDR_MS                             (PIO_BASE_ADDR + 0xc)
+#define PIO_WR_DATA                             (PIO_BASE_ADDR + 0x10)
+#define PIO_WR_DATA_STRB                        (PIO_BASE_ADDR + 0x14)
+#define PIO_RD_DATA                             (PIO_BASE_ADDR + 0x18)
+#define PIO_START                               (PIO_BASE_ADDR + 0x1c)
+#define PIO_ISR                                 (PIO_BASE_ADDR + 0x20)
+#define PIO_ISRM                                (PIO_BASE_ADDR + 0x24)
+
+/* Aardvark Control registers */
+#define CONTROL_BASE_ADDR                       0x4800
+#define PCIE_CORE_CTRL0_REG                     (CONTROL_BASE_ADDR + 0x0)
+#define     PCIE_GEN_SEL_MSK                    0x3
+#define     PCIE_GEN_SEL_SHIFT                  0x0
+#define     SPEED_GEN_1                         0
+#define     SPEED_GEN_2                         1
+#define     SPEED_GEN_3                         2
+#define     IS_RC_MSK                           1
+#define     IS_RC_SHIFT                         2
+#define     LANE_CNT_MSK                        0x18
+#define     LANE_CNT_SHIFT                      0x3
+#define     LANE_COUNT_1                        (0 << LANE_CNT_SHIFT)
+#define     LANE_COUNT_2                        (1 << LANE_CNT_SHIFT)
+#define     LANE_COUNT_4                        (2 << LANE_CNT_SHIFT)
+#define     LANE_COUNT_8                        (3 << LANE_CNT_SHIFT)
+#define     LINK_TRAINING_EN                    BIT(6)
+#define     LEGACY_INTA                         BIT(28)
+#define     LEGACY_INTB                         BIT(29)
+#define     LEGACY_INTC                         BIT(30)
+#define     LEGACY_INTD                         BIT(31)
+#define PCIE_CORE_CTRL1_REG                     (CONTROL_BASE_ADDR + 0x4)
+#define     HOT_RESET_GEN                       BIT(0)
+#define PCIE_CORE_CTRL2_REG                     (CONTROL_BASE_ADDR + 0x8)
+#define     PCIE_CORE_CTRL2_RESERVED            0x7
+#define     PCIE_CORE_CTRL2_TD_ENABLE           BIT(4)
+#define     PCIE_CORE_CTRL2_STRICT_ORDER_ENABLE BIT(5)
+#define     PCIE_CORE_CTRL2_OB_WIN_ENABLE       BIT(6)
+#define     PCIE_CORE_CTRL2_MSI_ENABLE          BIT(10)
+#define PCIE_ISR0_REG                           (CONTROL_BASE_ADDR + 0x40)
+#define PCIE_ISR0_MASK_REG                      (CONTROL_BASE_ADDR + 0x44)
+#define     PCIE_ISR0_MSI_INT_PENDING           BIT(24)
+#define     PCIE_ISR0_INTX_ASSERT(val)          BIT(16 + (val))
+#define     PCIE_ISR0_INTX_DEASSERT(val)        BIT(20 + (val))
+#define     PCIE_ISR0_ALL_MASK                  GENMASK(26, 0)
+#define PCIE_ISR1_REG                           (CONTROL_BASE_ADDR + 0x48)
+#define PCIE_ISR1_MASK_REG                      (CONTROL_BASE_ADDR + 0x4C)
+#define     PCIE_ISR1_POWER_STATE_CHANGE        BIT(4)
+#define     PCIE_ISR1_FLUSH                     BIT(5)
+#define     PCIE_ISR1_ALL_MASK                  GENMASK(5, 4)
+#define PCIE_MSI_ADDR_LOW_REG                   (CONTROL_BASE_ADDR + 0x50)
+#define PCIE_MSI_ADDR_HIGH_REG                  (CONTROL_BASE_ADDR + 0x54)
+#define PCIE_MSI_STATUS_REG                     (CONTROL_BASE_ADDR + 0x58)
+#define PCIE_MSI_MASK_REG                       (CONTROL_BASE_ADDR + 0x5C)
+#define PCIE_MSI_PAYLOAD_REG                    (CONTROL_BASE_ADDR + 0x9C)
+
+/* PCIe window configuration */
+#define OB_WIN_BASE_ADDR                        0x4c00
+#define OB_WIN_BLOCK_SIZE                       0x20
+#define OB_WIN_REG_ADDR(win, offset)            (OB_WIN_BASE_ADDR + \
+                                                 OB_WIN_BLOCK_SIZE * (win) + \
+                                                 (offset))
+#define OB_WIN_MATCH_LS(win)                    OB_WIN_REG_ADDR(win, 0x00)
+#define OB_WIN_MATCH_MS(win)                    OB_WIN_REG_ADDR(win, 0x04)
+#define OB_WIN_REMAP_LS(win)                    OB_WIN_REG_ADDR(win, 0x08)
+#define OB_WIN_REMAP_MS(win)                    OB_WIN_REG_ADDR(win, 0x0c)
+#define OB_WIN_MASK_LS(win)                     OB_WIN_REG_ADDR(win, 0x10)
+#define OB_WIN_MASK_MS(win)                     OB_WIN_REG_ADDR(win, 0x14)
+#define OB_WIN_ACTIONS(win)                     OB_WIN_REG_ADDR(win, 0x18)
+
+/* PCIe window types */
+#define OB_PCIE_MEM                             0x0
+#define OB_PCIE_IO                              0x4
+
+/* LMI registers base address and register offsets */
+#define LMI_BASE_ADDR                           0x6000
+#define CFG_REG                                 (LMI_BASE_ADDR + 0x0)
+#define     LTSSM_SHIFT                         24
+#define     LTSSM_MASK                          0x3f
+#define     LTSSM_L0                            0x10
+#define     RC_BAR_CONFIG                       0x300
+
+/* PCIe core controller registers */
+#define CTRL_CORE_BASE_ADDR                     0x18000
+#define CTRL_CONFIG_REG                         (CTRL_CORE_BASE_ADDR + 0x0)
+#define     CTRL_MODE_SHIFT                     0x0
+#define     CTRL_MODE_MASK                      0x1
+#define     PCIE_CORE_MODE_DIRECT               0x0
+#define     PCIE_CORE_MODE_COMMAND              0x1
+
+/* PCIe Central Interrupts Registers */
+#define CENTRAL_INT_BASE_ADDR                   0x1b000
+#define HOST_CTRL_INT_STATUS_REG                (CENTRAL_INT_BASE_ADDR + 0x0)
+#define HOST_CTRL_INT_MASK_REG                  (CENTRAL_INT_BASE_ADDR + 0x4)
+#define     PCIE_IRQ_CMDQ_INT                   BIT(0)
+#define     PCIE_IRQ_MSI_STATUS_INT             BIT(1)
+#define     PCIE_IRQ_CMD_SENT_DONE              BIT(3)
+#define     PCIE_IRQ_DMA_INT                    BIT(4)
+#define     PCIE_IRQ_IB_DXFERDONE               BIT(5)
+#define     PCIE_IRQ_OB_DXFERDONE               BIT(6)
+#define     PCIE_IRQ_OB_RXFERDONE               BIT(7)
+#define     PCIE_IRQ_COMPQ_INT                  BIT(12)
+#define     PCIE_IRQ_DIR_RD_DDR_DET             BIT(13)
+#define     PCIE_IRQ_DIR_WR_DDR_DET             BIT(14)
+#define     PCIE_IRQ_CORE_INT                   BIT(16)
+#define     PCIE_IRQ_CORE_INT_PIO               BIT(17)
+#define     PCIE_IRQ_DPMU_INT                   BIT(18)
+#define     PCIE_IRQ_PCIE_MIS_INT               BIT(19)
+#define     PCIE_IRQ_MSI_INT1_DET               BIT(20)
+#define     PCIE_IRQ_MSI_INT2_DET               BIT(21)
+#define     PCIE_IRQ_RC_DBELL_DET               BIT(22)
+#define     PCIE_IRQ_EP_STATUS                  BIT(23)
+#define     PCIE_IRQ_ALL_MASK                   0xfff0fb
+#define     PCIE_IRQ_ENABLE_INTS_MASK           PCIE_IRQ_CORE_INT
+
+/* Transaction types */
+#define PCIE_CONFIG_RD_TYPE0                    0x8
+#define PCIE_CONFIG_RD_TYPE1                    0x9
+#define PCIE_CONFIG_WR_TYPE0                    0xa
+#define PCIE_CONFIG_WR_TYPE1                    0xb
+
+/* PCI_BDF shifts 8bit, so we need extra 4bit shift */
+#define PCIE_BDF(dev)                           (dev << 4)
+#define PCIE_CONF_BUS(bus)                      (((bus) & 0xff) << 20)
+#define PCIE_CONF_DEV(dev)                      (((dev) & 0x1f) << 15)
+#define PCIE_CONF_FUNC(fun)                     (((fun) & 0x7)  << 12)
+#define PCIE_CONF_REG(reg)                      ((reg) & 0xffc)
+#define PCIE_CONF_ADDR(bus, devfn, where)       \
+        (PCIE_CONF_BUS(bus) | PCIE_CONF_DEV(PCI_SLOT(devfn))    | \
+         PCIE_CONF_FUNC(PCI_FUNC(devfn)) | PCIE_CONF_REG(where))
+
+#define PIO_TIMEOUT_MS                  1
+
+#define LINK_WAIT_MAX_RETRIES           10
+#define LINK_WAIT_USLEEP_MIN            90000
+#define LINK_WAIT_USLEEP_MAX            100000
+
+#define LEGACY_IRQ_NUM                  4
+#define MSI_IRQ_NUM                     32
+
+struct advk_pcie {
+        struct platform_device *pdev;
+        void __iomem *base;
+        struct list_head resources;
+        struct irq_domain *irq_domain;
+        struct irq_chip irq_chip;
+        struct msi_controller msi;
+        struct irq_domain *msi_domain;
+        struct irq_chip msi_irq_chip;
+        DECLARE_BITMAP(msi_irq_in_use, MSI_IRQ_NUM);
+        struct mutex msi_used_lock;
+        u16 msi_msg;
+        int root_bus_nr;
+};
+
+static inline void advk_writel(struct advk_pcie *pcie, u32 val, u64 reg)
+{
+        writel(val, pcie->base + reg);
+}
+
+static inline u32 advk_readl(struct advk_pcie *pcie, u64 reg)
+{
+        return readl(pcie->base + reg);
+}
+
+static int advk_pcie_link_up(struct advk_pcie *pcie)
+{
+        u32 val, ltssm_state;
+
+        val = advk_readl(pcie, CFG_REG);
+        ltssm_state = (val >> LTSSM_SHIFT) & LTSSM_MASK;
+        return ltssm_state >= LTSSM_L0;
+}
+
+static int advk_pcie_wait_for_link(struct advk_pcie *pcie)
+{
+        int retries;
+
+        /* check if the link is up or not */
+        for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {
+                if (advk_pcie_link_up(pcie)) {
+                        dev_info(&pcie->pdev->dev, "link up\n");
+                        return 0;
+                }
+
+                usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);
+        }
+
+        dev_err(&pcie->pdev->dev, "link never came up\n");
+
+        return -ETIMEDOUT;
+}
+
+/*
+ * Set PCIe address window register which could be used for memory
+ * mapping.
+ */
+static void advk_pcie_set_ob_win(struct advk_pcie *pcie,
+                                 u32 win_num, u32 match_ms,
+                                 u32 match_ls, u32 mask_ms,
+                                 u32 mask_ls, u32 remap_ms,
+                                 u32 remap_ls, u32 action)
+{
+        advk_writel(pcie, match_ls, OB_WIN_MATCH_LS(win_num));
+        advk_writel(pcie, match_ms, OB_WIN_MATCH_MS(win_num));
+        advk_writel(pcie, mask_ms, OB_WIN_MASK_MS(win_num));
+        advk_writel(pcie, mask_ls, OB_WIN_MASK_LS(win_num));
+        advk_writel(pcie, remap_ms, OB_WIN_REMAP_MS(win_num));
+        advk_writel(pcie, remap_ls, OB_WIN_REMAP_LS(win_num));
+        advk_writel(pcie, action, OB_WIN_ACTIONS(win_num));
+        advk_writel(pcie, match_ls | BIT(0), OB_WIN_MATCH_LS(win_num));
+}
+
+static void advk_pcie_setup_hw(struct advk_pcie *pcie)
+{
+        u32 reg;
+        int i;
+
+        /* Point PCIe unit MBUS decode windows to DRAM space */
+        for (i = 0; i < 8; i++)
+                advk_pcie_set_ob_win(pcie, i, 0, 0, 0, 0, 0, 0, 0);
+
+        /* Set to Direct mode */
+        reg = advk_readl(pcie, CTRL_CONFIG_REG);
+        reg &= ~(CTRL_MODE_MASK << CTRL_MODE_SHIFT);
+        reg |= ((PCIE_CORE_MODE_DIRECT & CTRL_MODE_MASK) << CTRL_MODE_SHIFT);
+        advk_writel(pcie, reg, CTRL_CONFIG_REG);
+
+        /* Set PCI global control register to RC mode */
+        reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
+        reg |= (IS_RC_MSK << IS_RC_SHIFT);
+        advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+
+        /* Set Advanced Error Capabilities and Control PF0 register */
+        reg = PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX |
+                PCIE_CORE_ERR_CAPCTL_ECRC_CHK_TX_EN |
+                PCIE_CORE_ERR_CAPCTL_ECRC_CHCK |
+                PCIE_CORE_ERR_CAPCTL_ECRC_CHCK_RCV;
+        advk_writel(pcie, reg, PCIE_CORE_ERR_CAPCTL_REG);
+
+        /* Set PCIe Device Control and Status 1 PF0 register */
+        reg = PCIE_CORE_DEV_CTRL_STATS_RELAX_ORDER_DISABLE |
+                (7 << PCIE_CORE_DEV_CTRL_STATS_MAX_PAYLOAD_SZ_SHIFT) |
+                PCIE_CORE_DEV_CTRL_STATS_SNOOP_DISABLE |
+                PCIE_CORE_DEV_CTRL_STATS_MAX_RD_REQ_SIZE_SHIFT;
+        advk_writel(pcie, reg, PCIE_CORE_DEV_CTRL_STATS_REG);
+
+        /* Program PCIe Control 2 to disable strict ordering */
+        reg = PCIE_CORE_CTRL2_RESERVED |
+                PCIE_CORE_CTRL2_TD_ENABLE;
+        advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
+
+        /* Set GEN2 */
+        reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
+        reg &= ~PCIE_GEN_SEL_MSK;
+        reg |= SPEED_GEN_2;
+        advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+
+        /* Set lane X1 */
+        reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
+        reg &= ~LANE_CNT_MSK;
+        reg |= LANE_COUNT_1;
+        advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+
+        /* Enable link training */
+        reg = advk_readl(pcie, PCIE_CORE_CTRL0_REG);
+        reg |= LINK_TRAINING_EN;
+        advk_writel(pcie, reg, PCIE_CORE_CTRL0_REG);
+
+        /* Enable MSI */
+        reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
+        reg |= PCIE_CORE_CTRL2_MSI_ENABLE;
+        advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
+
+        /* Clear all interrupts */
+        advk_writel(pcie, PCIE_ISR0_ALL_MASK, PCIE_ISR0_REG);
+        advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_REG);
+        advk_writel(pcie, PCIE_IRQ_ALL_MASK, HOST_CTRL_INT_STATUS_REG);
+
+        /* Disable All ISR0/1 Sources */
+        reg = PCIE_ISR0_ALL_MASK;
+        reg &= ~PCIE_ISR0_MSI_INT_PENDING;
+        advk_writel(pcie, reg, PCIE_ISR0_MASK_REG);
+
+        advk_writel(pcie, PCIE_ISR1_ALL_MASK, PCIE_ISR1_MASK_REG);
+
+        /* Unmask all MSI's */
+        advk_writel(pcie, 0, PCIE_MSI_MASK_REG);
+
+        /* Enable summary interrupt for GIC SPI source */
+        reg = PCIE_IRQ_ALL_MASK & (~PCIE_IRQ_ENABLE_INTS_MASK);
+        advk_writel(pcie, reg, HOST_CTRL_INT_MASK_REG);
+
+        reg = advk_readl(pcie, PCIE_CORE_CTRL2_REG);
+        reg |= PCIE_CORE_CTRL2_OB_WIN_ENABLE;
+        advk_writel(pcie, reg, PCIE_CORE_CTRL2_REG);
+
+        /* Bypass the address window mapping for PIO */
+        reg = advk_readl(pcie, PIO_CTRL);
+        reg |= PIO_CTRL_ADDR_WIN_DISABLE;
+        advk_writel(pcie, reg, PIO_CTRL);
+
+        /* Start link training */
+        reg = advk_readl(pcie, PCIE_CORE_LINK_CTRL_STAT_REG);
+        reg |= PCIE_CORE_LINK_TRAINING;
+        advk_writel(pcie, reg, PCIE_CORE_LINK_CTRL_STAT_REG);
+
+        advk_pcie_wait_for_link(pcie);
+
+        reg = PCIE_CORE_LINK_L0S_ENTRY |
+                (1 << PCIE_CORE_LINK_WIDTH_SHIFT);
+        advk_writel(pcie, reg, PCIE_CORE_LINK_CTRL_STAT_REG);
+
+        reg = advk_readl(pcie, PCIE_CORE_CMD_STATUS_REG);
+        reg |= PCIE_CORE_CMD_MEM_ACCESS_EN |
+                PCIE_CORE_CMD_IO_ACCESS_EN |
+                PCIE_CORE_CMD_MEM_IO_REQ_EN;
+        advk_writel(pcie, reg, PCIE_CORE_CMD_STATUS_REG);
+}
+
+static void advk_pcie_check_pio_status(struct advk_pcie *pcie)
+{
+        u32 reg;
+        unsigned int status;
+        char *strcomp_status, *str_posted;
+
+        reg = advk_readl(pcie, PIO_STAT);
+        status = (reg & PIO_COMPLETION_STATUS_MASK) >>
+                PIO_COMPLETION_STATUS_SHIFT;
+
+        if (!status)
+                return;
+
+        switch (status) {
+        case PIO_COMPLETION_STATUS_UR:
+                strcomp_status = "UR";
+                break;
+        case PIO_COMPLETION_STATUS_CRS:
+                strcomp_status = "CRS";
+                break;
+        case PIO_COMPLETION_STATUS_CA:
+                strcomp_status = "CA";
+                break;
+        default:
+                strcomp_status = "Unknown";
+                break;
+        }
+
+        if (reg & PIO_NON_POSTED_REQ)
+                str_posted = "Non-posted";
+        else
+                str_posted = "Posted";
+
+        dev_err(&pcie->pdev->dev, "%s PIO Response Status: %s, %#x @ %#x\n",
+                str_posted, strcomp_status, reg, advk_readl(pcie, PIO_ADDR_LS));
+}
+
+static int advk_pcie_wait_pio(struct advk_pcie *pcie)
+{
+        unsigned long timeout;
+
+        timeout = jiffies + msecs_to_jiffies(PIO_TIMEOUT_MS);
+
+        while (time_before(jiffies, timeout)) {
+                u32 start, isr;
+
+                start = advk_readl(pcie, PIO_START);
+                isr = advk_readl(pcie, PIO_ISR);
+                if (!start && isr)
+                        return 0;
+        }
+
+        dev_err(&pcie->pdev->dev, "config read/write timed out\n");
+        return -ETIMEDOUT;
+}
+
+static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
+                             int where, int size, u32 *val)
+{
+        struct advk_pcie *pcie = bus->sysdata;
+        u32 reg;
+        int ret;
+
+        if (PCI_SLOT(devfn) != 0) {
+                *val = 0xffffffff;
+                return PCIBIOS_DEVICE_NOT_FOUND;
+        }
+
+        /* Start PIO */
+        advk_writel(pcie, 0, PIO_START);
+        advk_writel(pcie, 1, PIO_ISR);
+
+        /* Program the control register */
+        reg = advk_readl(pcie, PIO_CTRL);
+        reg &= ~PIO_CTRL_TYPE_MASK;
+        if (bus->number ==  pcie->root_bus_nr)
+                reg |= PCIE_CONFIG_RD_TYPE0;
+        else
+                reg |= PCIE_CONFIG_RD_TYPE1;
+        advk_writel(pcie, reg, PIO_CTRL);
+
+        /* Program the address registers */
+        reg = PCIE_BDF(devfn) | PCIE_CONF_REG(where);
+        advk_writel(pcie, reg, PIO_ADDR_LS);
+        advk_writel(pcie, 0, PIO_ADDR_MS);
+
+        /* Program the data strobe */
+        advk_writel(pcie, 0xf, PIO_WR_DATA_STRB);
+
+        /* Start the transfer */
+        advk_writel(pcie, 1, PIO_START);
+
+        ret = advk_pcie_wait_pio(pcie);
+        if (ret < 0)
+                return PCIBIOS_SET_FAILED;
+
+        advk_pcie_check_pio_status(pcie);
+
+        /* Get the read result */
+        *val = advk_readl(pcie, PIO_RD_DATA);
+        if (size == 1)
+                *val = (*val >> (8 * (where & 3))) & 0xff;
+        else if (size == 2)
+                *val = (*val >> (8 * (where & 3))) & 0xffff;
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
+                                int where, int size, u32 val)
+{
+        struct advk_pcie *pcie = bus->sysdata;
+        u32 reg;
+        u32 data_strobe = 0x0;
+        int offset;
+        int ret;
+
+        if (PCI_SLOT(devfn) != 0)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        if (where % size)
+                return PCIBIOS_SET_FAILED;
+
+        /* Start PIO */
+        advk_writel(pcie, 0, PIO_START);
+        advk_writel(pcie, 1, PIO_ISR);
+
+        /* Program the control register */
+        reg = advk_readl(pcie, PIO_CTRL);
+        reg &= ~PIO_CTRL_TYPE_MASK;
+        if (bus->number == pcie->root_bus_nr)
+                reg |= PCIE_CONFIG_WR_TYPE0;
+        else
+                reg |= PCIE_CONFIG_WR_TYPE1;
+        advk_writel(pcie, reg, PIO_CTRL);
+
+        /* Program the address registers */
+        reg = PCIE_CONF_ADDR(bus->number, devfn, where);
+        advk_writel(pcie, reg, PIO_ADDR_LS);
+        advk_writel(pcie, 0, PIO_ADDR_MS);
+
+        /* Calculate the write strobe */
+        offset      = where & 0x3;
+        reg         = val << (8 * offset);
+        data_strobe = GENMASK(size - 1, 0) << offset;
+
+        /* Program the data register */
+        advk_writel(pcie, reg, PIO_WR_DATA);
+
+        /* Program the data strobe */
+        advk_writel(pcie, data_strobe, PIO_WR_DATA_STRB);
+
+        /* Start the transfer */
+        advk_writel(pcie, 1, PIO_START);
+
+        ret = advk_pcie_wait_pio(pcie);
+        if (ret < 0)
+                return PCIBIOS_SET_FAILED;
+
+        advk_pcie_check_pio_status(pcie);
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops advk_pcie_ops = {
+        .read = advk_pcie_rd_conf,
+        .write = advk_pcie_wr_conf,
+};
+
+static int advk_pcie_alloc_msi(struct advk_pcie *pcie)
+{
+        int hwirq;
+
+        mutex_lock(&pcie->msi_used_lock);
+        hwirq = find_first_zero_bit(pcie->msi_irq_in_use, MSI_IRQ_NUM);
+        if (hwirq >= MSI_IRQ_NUM)
+                hwirq = -ENOSPC;
+        else
+                set_bit(hwirq, pcie->msi_irq_in_use);
+        mutex_unlock(&pcie->msi_used_lock);
+
+        return hwirq;
+}
+
+static void advk_pcie_free_msi(struct advk_pcie *pcie, int hwirq)
+{
+        mutex_lock(&pcie->msi_used_lock);
+        if (!test_bit(hwirq, pcie->msi_irq_in_use))
+                dev_err(&pcie->pdev->dev, "trying to free unused MSI#%d\n",
+                        hwirq);
+        else
+                clear_bit(hwirq, pcie->msi_irq_in_use);
+        mutex_unlock(&pcie->msi_used_lock);
+}
+
+static int advk_pcie_setup_msi_irq(struct msi_controller *chip,
+                                   struct pci_dev *pdev,
+                                   struct msi_desc *desc)
+{
+        struct advk_pcie *pcie = pdev->bus->sysdata;
+        struct msi_msg msg;
+        int virq, hwirq;
+        phys_addr_t msi_msg_phys;
+
+        /* We support MSI, but not MSI-X */
+        if (desc->msi_attrib.is_msix)
+                return -EINVAL;
+
+        hwirq = advk_pcie_alloc_msi(pcie);
+        if (hwirq < 0)
+                return hwirq;
+
+        virq = irq_create_mapping(pcie->msi_domain, hwirq);
+        if (!virq) {
+                advk_pcie_free_msi(pcie, hwirq);
+                return -EINVAL;
+        }
+
+        irq_set_msi_desc(virq, desc);
+
+        msi_msg_phys = virt_to_phys(&pcie->msi_msg);
+
+        msg.address_lo = lower_32_bits(msi_msg_phys);
+        msg.address_hi = upper_32_bits(msi_msg_phys);
+        msg.data = virq;
+
+        pci_write_msi_msg(virq, &msg);
+
+        return 0;
+}
+
+static void advk_pcie_teardown_msi_irq(struct msi_controller *chip,
+                                       unsigned int irq)
+{
+        struct irq_data *d = irq_get_irq_data(irq);
+        struct msi_desc *msi = irq_data_get_msi_desc(d);
+        struct advk_pcie *pcie = msi_desc_to_pci_sysdata(msi);
+        unsigned long hwirq = d->hwirq;
+
+        irq_dispose_mapping(irq);
+        advk_pcie_free_msi(pcie, hwirq);
+}
+
+static int advk_pcie_msi_map(struct irq_domain *domain,
+                             unsigned int virq, irq_hw_number_t hw)
+{
+        struct advk_pcie *pcie = domain->host_data;
+
+        irq_set_chip_and_handler(virq, &pcie->msi_irq_chip,
+                                 handle_simple_irq);
+
+        return 0;
+}
+
+static const struct irq_domain_ops advk_pcie_msi_irq_ops = {
+        .map = advk_pcie_msi_map,
+};
+
+static void advk_pcie_irq_mask(struct irq_data *d)
+{
+        struct advk_pcie *pcie = d->domain->host_data;
+        irq_hw_number_t hwirq = irqd_to_hwirq(d);
+        u32 mask;
+
+        mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
+        mask |= PCIE_ISR0_INTX_ASSERT(hwirq);
+        advk_writel(pcie, mask, PCIE_ISR0_MASK_REG);
+}
+
+static void advk_pcie_irq_unmask(struct irq_data *d)
+{
+        struct advk_pcie *pcie = d->domain->host_data;
+        irq_hw_number_t hwirq = irqd_to_hwirq(d);
+        u32 mask;
+
+        mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
+        mask &= ~PCIE_ISR0_INTX_ASSERT(hwirq);
+        advk_writel(pcie, mask, PCIE_ISR0_MASK_REG);
+}
+
+static int advk_pcie_irq_map(struct irq_domain *h,
+                             unsigned int virq, irq_hw_number_t hwirq)
+{
+        struct advk_pcie *pcie = h->host_data;
+
+        advk_pcie_irq_mask(irq_get_irq_data(virq));
+        irq_set_status_flags(virq, IRQ_LEVEL);
+        irq_set_chip_and_handler(virq, &pcie->irq_chip,
+                                 handle_level_irq);
+        irq_set_chip_data(virq, pcie);
+
+        return 0;
+}
+
+static const struct irq_domain_ops advk_pcie_irq_domain_ops = {
+        .map = advk_pcie_irq_map,
+        .xlate = irq_domain_xlate_onecell,
+};
+
+static int advk_pcie_init_msi_irq_domain(struct advk_pcie *pcie)
+{
+        struct device *dev = &pcie->pdev->dev;
+        struct device_node *node = dev->of_node;
+        struct irq_chip *msi_irq_chip;
+        struct msi_controller *msi;
+        phys_addr_t msi_msg_phys;
+        int ret;
+
+        msi_irq_chip = &pcie->msi_irq_chip;
+
+        msi_irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-msi",
+                                            dev_name(dev));
+        if (!msi_irq_chip->name)
+                return -ENOMEM;
+
+        msi_irq_chip->irq_enable = pci_msi_unmask_irq;
+        msi_irq_chip->irq_disable = pci_msi_mask_irq;
+        msi_irq_chip->irq_mask = pci_msi_mask_irq;
+        msi_irq_chip->irq_unmask = pci_msi_unmask_irq;
+
+        msi = &pcie->msi;
+
+        msi->setup_irq = advk_pcie_setup_msi_irq;
+        msi->teardown_irq = advk_pcie_teardown_msi_irq;
+        msi->of_node = node;
+
+        mutex_init(&pcie->msi_used_lock);
+
+        msi_msg_phys = virt_to_phys(&pcie->msi_msg);
+
+        advk_writel(pcie, lower_32_bits(msi_msg_phys),
+                    PCIE_MSI_ADDR_LOW_REG);
+        advk_writel(pcie, upper_32_bits(msi_msg_phys),
+                    PCIE_MSI_ADDR_HIGH_REG);
+
+        pcie->msi_domain =
+                irq_domain_add_linear(NULL, MSI_IRQ_NUM,
+                                      &advk_pcie_msi_irq_ops, pcie);
+        if (!pcie->msi_domain)
+                return -ENOMEM;
+
+        ret = of_pci_msi_chip_add(msi);
+        if (ret < 0) {
+                irq_domain_remove(pcie->msi_domain);
+                return ret;
+        }
+
+        return 0;
+}
+
+static void advk_pcie_remove_msi_irq_domain(struct advk_pcie *pcie)
+{
+        of_pci_msi_chip_remove(&pcie->msi);
+        irq_domain_remove(pcie->msi_domain);
+}
+
+static int advk_pcie_init_irq_domain(struct advk_pcie *pcie)
+{
+        struct device *dev = &pcie->pdev->dev;
+        struct device_node *node = dev->of_node;
+        struct device_node *pcie_intc_node;
+        struct irq_chip *irq_chip;
+
+        pcie_intc_node =  of_get_next_child(node, NULL);
+        if (!pcie_intc_node) {
+                dev_err(dev, "No PCIe Intc node found\n");
+                return -ENODEV;
+        }
+
+        irq_chip = &pcie->irq_chip;
+
+        irq_chip->name = devm_kasprintf(dev, GFP_KERNEL, "%s-irq",
+                                        dev_name(dev));
+        if (!irq_chip->name) {
+                of_node_put(pcie_intc_node);
+                return -ENOMEM;
+        }
+
+        irq_chip->irq_mask = advk_pcie_irq_mask;
+        irq_chip->irq_mask_ack = advk_pcie_irq_mask;
+        irq_chip->irq_unmask = advk_pcie_irq_unmask;
+
+        pcie->irq_domain =
+                irq_domain_add_linear(pcie_intc_node, LEGACY_IRQ_NUM,
+                                      &advk_pcie_irq_domain_ops, pcie);
+        if (!pcie->irq_domain) {
+                dev_err(dev, "Failed to get a INTx IRQ domain\n");
+                of_node_put(pcie_intc_node);
+                return -ENOMEM;
+        }
+
+        return 0;
+}
+
+static void advk_pcie_remove_irq_domain(struct advk_pcie *pcie)
+{
+        irq_domain_remove(pcie->irq_domain);
+}
+
+static void advk_pcie_handle_msi(struct advk_pcie *pcie)
+{
+        u32 msi_val, msi_mask, msi_status, msi_idx;
+        u16 msi_data;
+
+        msi_mask = advk_readl(pcie, PCIE_MSI_MASK_REG);
+        msi_val = advk_readl(pcie, PCIE_MSI_STATUS_REG);
+        msi_status = msi_val & ~msi_mask;
+
+        for (msi_idx = 0; msi_idx < MSI_IRQ_NUM; msi_idx++) {
+                if (!(BIT(msi_idx) & msi_status))
+                        continue;
+
+                advk_writel(pcie, BIT(msi_idx), PCIE_MSI_STATUS_REG);
+                msi_data = advk_readl(pcie, PCIE_MSI_PAYLOAD_REG) & 0xFF;
+                generic_handle_irq(msi_data);
+        }
+
+        advk_writel(pcie, PCIE_ISR0_MSI_INT_PENDING,
+                    PCIE_ISR0_REG);
+}
+
+static void advk_pcie_handle_int(struct advk_pcie *pcie)
+{
+        u32 val, mask, status;
+        int i, virq;
+
+        val = advk_readl(pcie, PCIE_ISR0_REG);
+        mask = advk_readl(pcie, PCIE_ISR0_MASK_REG);
+        status = val & ((~mask) & PCIE_ISR0_ALL_MASK);
+
+        if (!status) {
+                advk_writel(pcie, val, PCIE_ISR0_REG);
+                return;
+        }
+
+        /* Process MSI interrupts */
+        if (status & PCIE_ISR0_MSI_INT_PENDING)
+                advk_pcie_handle_msi(pcie);
+
+        /* Process legacy interrupts */
+        for (i = 0; i < LEGACY_IRQ_NUM; i++) {
+                if (!(status & PCIE_ISR0_INTX_ASSERT(i)))
+                        continue;
+
+                advk_writel(pcie, PCIE_ISR0_INTX_ASSERT(i),
+                            PCIE_ISR0_REG);
+
+                virq = irq_find_mapping(pcie->irq_domain, i);
+                generic_handle_irq(virq);
+        }
+}
+
+static irqreturn_t advk_pcie_irq_handler(int irq, void *arg)
+{
+        struct advk_pcie *pcie = arg;
+        u32 status;
+
+        status = advk_readl(pcie, HOST_CTRL_INT_STATUS_REG);
+        if (!(status & PCIE_IRQ_CORE_INT))
+                return IRQ_NONE;
+
+        advk_pcie_handle_int(pcie);
+
+        /* Clear interrupt */
+        advk_writel(pcie, PCIE_IRQ_CORE_INT, HOST_CTRL_INT_STATUS_REG);
+
+        return IRQ_HANDLED;
+}
+
+static int advk_pcie_parse_request_of_pci_ranges(struct advk_pcie *pcie)
+{
+        int err, res_valid = 0;
+        struct device *dev = &pcie->pdev->dev;
+        struct device_node *np = dev->of_node;
+        struct resource_entry *win;
+        resource_size_t iobase;
+
+        INIT_LIST_HEAD(&pcie->resources);
+
+        err = of_pci_get_host_bridge_resources(np, 0, 0xff, &pcie->resources,
+                                               &iobase);
+        if (err)
+                return err;
+
+        err = devm_request_pci_bus_resources(dev, &pcie->resources);
+        if (err)
+                goto out_release_res;
+
+        resource_list_for_each_entry(win, &pcie->resources) {
+                struct resource *res = win->res;
+
+                switch (resource_type(res)) {
+                case IORESOURCE_IO:
+                        advk_pcie_set_ob_win(pcie, 1,
+                                             upper_32_bits(res->start),
+                                             lower_32_bits(res->start),
+                                             0, 0xF8000000, 0,
+                                             lower_32_bits(res->start),
+                                             OB_PCIE_IO);
+                        err = pci_remap_iospace(res, iobase);
+                        if (err)
+                                dev_warn(dev, "error %d: failed to map resource %pR\n",
+                                         err, res);
+                        break;
+                case IORESOURCE_MEM:
+                        advk_pcie_set_ob_win(pcie, 0,
+                                             upper_32_bits(res->start),
+                                             lower_32_bits(res->start),
+                                             0x0, 0xF8000000, 0,
+                                             lower_32_bits(res->start),
+                                             (2 << 20) | OB_PCIE_MEM);
+                        res_valid |= !(res->flags & IORESOURCE_PREFETCH);
+                        break;
+                case IORESOURCE_BUS:
+                        pcie->root_bus_nr = res->start;
+                        break;
+                }
+        }
+
+        if (!res_valid) {
+                dev_err(dev, "non-prefetchable memory resource required\n");
+                err = -EINVAL;
+                goto out_release_res;
+        }
+
+        return 0;
+
+out_release_res:
+        pci_free_resource_list(&pcie->resources);
+        return err;
+}
+
+static int advk_pcie_probe(struct platform_device *pdev)
+{
+        struct advk_pcie *pcie;
+        struct resource *res;
+        struct pci_bus *bus, *child;
+        struct msi_controller *msi;
+        struct device_node *msi_node;
+        int ret, irq;
+
+        pcie = devm_kzalloc(&pdev->dev, sizeof(struct advk_pcie),
+                            GFP_KERNEL);
+        if (!pcie)
+                return -ENOMEM;
+
+        pcie->pdev = pdev;
+        platform_set_drvdata(pdev, pcie);
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        pcie->base = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(pcie->base)) {
+                dev_err(&pdev->dev, "Failed to map registers\n");
+                return PTR_ERR(pcie->base);
+        }
+
+        irq = platform_get_irq(pdev, 0);
+        ret = devm_request_irq(&pdev->dev, irq, advk_pcie_irq_handler,
+                               IRQF_SHARED | IRQF_NO_THREAD, "advk-pcie",
+                               pcie);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to register interrupt\n");
+                return ret;
+        }
+
+        ret = advk_pcie_parse_request_of_pci_ranges(pcie);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to parse resources\n");
+                return ret;
+        }
+
+        advk_pcie_setup_hw(pcie);
+
+        ret = advk_pcie_init_irq_domain(pcie);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to initialize irq\n");
+                return ret;
+        }
+
+        ret = advk_pcie_init_msi_irq_domain(pcie);
+        if (ret) {
+                dev_err(&pdev->dev, "Failed to initialize irq\n");
+                advk_pcie_remove_irq_domain(pcie);
+                return ret;
+        }
+
+        msi_node = of_parse_phandle(pdev->dev.of_node, "msi-parent", 0);
+        if (msi_node)
+                msi = of_pci_find_msi_chip_by_node(msi_node);
+        else
+                msi = NULL;
+
+        bus = pci_scan_root_bus_msi(&pdev->dev, 0, &advk_pcie_ops,
+                                    pcie, &pcie->resources, &pcie->msi);
+        if (!bus) {
+                advk_pcie_remove_msi_irq_domain(pcie);
+                advk_pcie_remove_irq_domain(pcie);
+                return -ENOMEM;
+        }
+
+        pci_bus_assign_resources(bus);
+
+        list_for_each_entry(child, &bus->children, node)
+                pcie_bus_configure_settings(child);
+
+        pci_bus_add_devices(bus);
+
+        return 0;
+}
+
+static const struct of_device_id advk_pcie_of_match_table[] = {
+        { .compatible = "marvell,armada-3700-pcie", },
+        {},
+};
+
+static struct platform_driver advk_pcie_driver = {
+        .driver = {
+                .name = "advk-pcie",
+                .of_match_table = advk_pcie_of_match_table,
+                /* Driver unloading/unbinding currently not supported */
+                .suppress_bind_attrs = true,
+        },
+        .probe = advk_pcie_probe,
+};
+builtin_platform_driver(advk_pcie_driver);
diff --git a/drivers/pci/host/pci-dra7xx.c b/drivers/pci/host/pci-dra7xx.c
index f441130407e7..81b3949a26db 100644
--- a/drivers/pci/host/pci-dra7xx.c
+++ b/drivers/pci/host/pci-dra7xx.c
@@ -181,14 +181,14 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)
 
         if (!pcie_intc_node) {
                 dev_err(dev, "No PCIe Intc node found\n");
-                return PTR_ERR(pcie_intc_node);
+                return -ENODEV;
         }
 
         pp->irq_domain = irq_domain_add_linear(pcie_intc_node, 4,
                                                &intx_domain_ops, pp);
         if (!pp->irq_domain) {
                 dev_err(dev, "Failed to get a INTx IRQ domain\n");
-                return PTR_ERR(pp->irq_domain);
+                return -ENODEV;
         }
 
         return 0;
diff --git a/drivers/pci/host/pci-host-common.c b/drivers/pci/host/pci-host-common.c
index 8cba7ab73df9..9d9d34e959b6 100644
--- a/drivers/pci/host/pci-host-common.c
+++ b/drivers/pci/host/pci-host-common.c
@@ -20,10 +20,9 @@
 #include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
+#include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
 
-#include "../ecam.h"
-
 static int gen_pci_parse_request_of_pci_ranges(struct device *dev,
                        struct list_head *resources, struct resource **bus_range)
 {
@@ -36,44 +35,34 @@ static int gen_pci_parse_request_of_pci_ranges(struct device *dev,
         if (err)
                 return err;
 
+        err = devm_request_pci_bus_resources(dev, resources);
+        if (err)
+                return err;
+
         resource_list_for_each_entry(win, resources) {
-                struct resource *parent, *res = win->res;
+                struct resource *res = win->res;
 
                 switch (resource_type(res)) {
                 case IORESOURCE_IO:
-                        parent = &ioport_resource;
                         err = pci_remap_iospace(res, iobase);
-                        if (err) {
+                        if (err)
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
-                                continue;
-                        }
                         break;
                 case IORESOURCE_MEM:
-                        parent = &iomem_resource;
                         res_valid |= !(res->flags & IORESOURCE_PREFETCH);
                         break;
                 case IORESOURCE_BUS:
                         *bus_range = res;
-                default:
-                        continue;
+                        break;
                 }
-
-                err = devm_request_resource(dev, parent, res);
-                if (err)
-                        goto out_release_res;
-        }
-
-        if (!res_valid) {
-                dev_err(dev, "non-prefetchable memory resource required\n");
-                err = -EINVAL;
-                goto out_release_res;
         }
 
-        return 0;
+        if (res_valid)
+                return 0;
 
-out_release_res:
-        return err;
+        dev_err(dev, "non-prefetchable memory resource required\n");
+        return -EINVAL;
 }
 
 static void gen_pci_unmap_cfg(void *ptr)
@@ -155,7 +144,14 @@ int pci_host_common_probe(struct platform_device *pdev,
 
         pci_fixup_irqs(pci_common_swizzle, of_irq_parse_and_map_pci);
 
-        if (!pci_has_flag(PCI_PROBE_ONLY)) {
+        /*
+         * We insert PCI resources into the iomem_resource and
+         * ioport_resource trees in either pci_bus_claim_resources()
+         * or pci_bus_assign_resources().
+         */
+        if (pci_has_flag(PCI_PROBE_ONLY)) {
+                pci_bus_claim_resources(bus);
+        } else {
                 pci_bus_size_bridges(bus);
                 pci_bus_assign_resources(bus);
 
diff --git a/drivers/pci/host/pci-host-generic.c b/drivers/pci/host/pci-host-generic.c
index 6eaceab1bf04..c05ea9d72f69 100644
--- a/drivers/pci/host/pci-host-generic.c
+++ b/drivers/pci/host/pci-host-generic.c
@@ -20,13 +20,12 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
+#include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
 
-#include "../ecam.h"
-
 static struct pci_ecam_ops gen_pci_cfg_cam_bus_ops = {
         .bus_shift      = 16,
         .pci_ops        = {
@@ -46,8 +45,6 @@ static const struct of_device_id gen_pci_of_match[] = {
         { },
 };
 
-MODULE_DEVICE_TABLE(of, gen_pci_of_match);
-
 static int gen_pci_probe(struct platform_device *pdev)
 {
         const struct of_device_id *of_id;
@@ -66,8 +63,4 @@ static struct platform_driver gen_pci_driver = {
         },
         .probe = gen_pci_probe,
 };
-module_platform_driver(gen_pci_driver);
-
-MODULE_DESCRIPTION("Generic PCI host driver");
-MODULE_AUTHOR("Will Deacon <will.deacon@arm.com>");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(gen_pci_driver);
diff --git a/drivers/pci/host/pci-keystone.c b/drivers/pci/host/pci-keystone.c
index 6b8301ef21ca..8ba28834d470 100644
--- a/drivers/pci/host/pci-keystone.c
+++ b/drivers/pci/host/pci-keystone.c
@@ -17,7 +17,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/irqdomain.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/msi.h>
 #include <linux/of_irq.h>
 #include <linux/of.h>
@@ -360,7 +360,6 @@ static const struct of_device_id ks_pcie_of_match[] = {
         },
         { },
 };
-MODULE_DEVICE_TABLE(of, ks_pcie_of_match);
 
 static int __exit ks_pcie_remove(struct platform_device *pdev)
 {
@@ -439,9 +438,4 @@ static struct platform_driver ks_pcie_driver __refdata = {
                 .of_match_table = of_match_ptr(ks_pcie_of_match),
         },
 };
-
-module_platform_driver(ks_pcie_driver);
-
-MODULE_AUTHOR("Murali Karicheri <m-karicheri2@ti.com>");
-MODULE_DESCRIPTION("Keystone PCIe host controller driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(ks_pcie_driver);
diff --git a/drivers/pci/host/pci-layerscape.c b/drivers/pci/host/pci-layerscape.c
index a21e229d95e0..114ba819277a 100644
--- a/drivers/pci/host/pci-layerscape.c
+++ b/drivers/pci/host/pci-layerscape.c
@@ -12,7 +12,7 @@
 
 #include <linux/kernel.h>
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of_pci.h>
 #include <linux/of_platform.h>
 #include <linux/of_irq.h>
@@ -211,7 +211,6 @@ static const struct of_device_id ls_pcie_of_match[] = {
         { .compatible = "fsl,ls2085a-pcie", .data = &ls2080_drvdata },
         { },
 };
-MODULE_DEVICE_TABLE(of, ls_pcie_of_match);
 
 static int __init ls_add_pcie_port(struct pcie_port *pp,
                                    struct platform_device *pdev)
@@ -275,9 +274,4 @@ static struct platform_driver ls_pcie_driver = {
                 .of_match_table = ls_pcie_of_match,
         },
 };
-
-module_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);
-
-MODULE_AUTHOR("Minghuan Lian <Minghuan.Lian@freescale.com>");
-MODULE_DESCRIPTION("Freescale Layerscape PCIe host controller driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver_probe(ls_pcie_driver, ls_pcie_probe);
diff --git a/drivers/pci/host/pci-mvebu.c b/drivers/pci/host/pci-mvebu.c
index 6b451df6502c..307f81d6b479 100644
--- a/drivers/pci/host/pci-mvebu.c
+++ b/drivers/pci/host/pci-mvebu.c
@@ -1,6 +1,8 @@
 /*
  * PCIe driver for Marvell Armada 370 and Armada XP SoCs
  *
+ * Author: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
@@ -11,7 +13,7 @@
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/mbus.h>
 #include <linux/msi.h>
 #include <linux/slab.h>
@@ -839,25 +841,22 @@ static struct pci_ops mvebu_pcie_ops = {
 static int mvebu_pcie_setup(int nr, struct pci_sys_data *sys)
 {
         struct mvebu_pcie *pcie = sys_to_pcie(sys);
-        int i;
+        int err, i;
 
         pcie->mem.name = "PCI MEM";
         pcie->realio.name = "PCI I/O";
 
-        if (request_resource(&iomem_resource, &pcie->mem))
-                return 0;
-
-        if (resource_size(&pcie->realio) != 0) {
-                if (request_resource(&ioport_resource, &pcie->realio)) {
-                        release_resource(&pcie->mem);
-                        return 0;
-                }
+        if (resource_size(&pcie->realio) != 0)
                 pci_add_resource_offset(&sys->resources, &pcie->realio,
                                         sys->io_offset);
-        }
+
         pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
         pci_add_resource(&sys->resources, &pcie->busn);
 
+        err = devm_request_pci_bus_resources(&pcie->pdev->dev, &sys->resources);
+        if (err)
+                return 0;
+
         for (i = 0; i < pcie->nports; i++) {
                 struct mvebu_pcie_port *port = &pcie->ports[i];
 
@@ -1298,7 +1297,6 @@ static const struct of_device_id mvebu_pcie_of_match_table[] = {
         { .compatible = "marvell,kirkwood-pcie", },
         {},
 };
-MODULE_DEVICE_TABLE(of, mvebu_pcie_of_match_table);
 
 static const struct dev_pm_ops mvebu_pcie_pm_ops = {
         SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mvebu_pcie_suspend, mvebu_pcie_resume)
@@ -1314,8 +1312,4 @@ static struct platform_driver mvebu_pcie_driver = {
         },
         .probe = mvebu_pcie_probe,
 };
-module_platform_driver(mvebu_pcie_driver);
-
-MODULE_AUTHOR("Thomas Petazzoni <thomas.petazzoni@free-electrons.com>");
-MODULE_DESCRIPTION("Marvell EBU PCIe driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(mvebu_pcie_driver);
diff --git a/drivers/pci/host/pci-rcar-gen2.c b/drivers/pci/host/pci-rcar-gen2.c
index 9980a4bdae7e..597566f96f5e 100644
--- a/drivers/pci/host/pci-rcar-gen2.c
+++ b/drivers/pci/host/pci-rcar-gen2.c
@@ -4,6 +4,8 @@
  * Copyright (C) 2013 Renesas Solutions Corp.
  * Copyright (C) 2013 Cogent Embedded, Inc.
  *
+ * Author: Valentine Barshak <valentine.barshak@cogentembedded.com>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
@@ -14,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/io.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
 #include <linux/pci.h>
@@ -97,7 +98,6 @@
 struct rcar_pci_priv {
         struct device *dev;
         void __iomem *reg;
-        struct resource io_res;
         struct resource mem_res;
         struct resource *cfg_res;
         unsigned busnr;
@@ -194,6 +194,7 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys)
         struct rcar_pci_priv *priv = sys->private_data;
         void __iomem *reg = priv->reg;
         u32 val;
+        int ret;
 
         pm_runtime_enable(priv->dev);
         pm_runtime_get_sync(priv->dev);
@@ -273,8 +274,10 @@ static int rcar_pci_setup(int nr, struct pci_sys_data *sys)
                 rcar_pci_setup_errirq(priv);
 
         /* Add PCI resources */
-        pci_add_resource(&sys->resources, &priv->io_res);
         pci_add_resource(&sys->resources, &priv->mem_res);
+        ret = devm_request_pci_bus_resources(priv->dev, &sys->resources);
+        if (ret < 0)
+                return ret;
 
         /* Setup bus number based on platform device id / of bus-range */
         sys->busnr = priv->busnr;
@@ -371,14 +374,6 @@ static int rcar_pci_probe(struct platform_device *pdev)
                 return -ENOMEM;
 
         priv->mem_res = *mem_res;
-        /*
-         * The controller does not support/use port I/O,
-         * so setup a dummy port I/O region here.
-         */
-        priv->io_res.start = priv->mem_res.start;
-        priv->io_res.end = priv->mem_res.end;
-        priv->io_res.flags = IORESOURCE_IO;
-
         priv->cfg_res = cfg_res;
 
         priv->irq = platform_get_irq(pdev, 0);
@@ -421,6 +416,7 @@ static int rcar_pci_probe(struct platform_device *pdev)
         hw_private[0] = priv;
         memset(&hw, 0, sizeof(hw));
         hw.nr_controllers = ARRAY_SIZE(hw_private);
+        hw.io_optional = 1;
         hw.private_data = hw_private;
         hw.map_irq = rcar_pci_map_irq;
         hw.ops = &rcar_pci_ops;
@@ -437,8 +433,6 @@ static struct of_device_id rcar_pci_of_match[] = {
         { },
 };
 
-MODULE_DEVICE_TABLE(of, rcar_pci_of_match);
-
 static struct platform_driver rcar_pci_driver = {
         .driver = {
                 .name = "pci-rcar-gen2",
@@ -447,9 +441,4 @@ static struct platform_driver rcar_pci_driver = {
         },
         .probe = rcar_pci_probe,
 };
-
-module_platform_driver(rcar_pci_driver);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("Renesas R-Car Gen2 internal PCI");
-MODULE_AUTHOR("Valentine Barshak <valentine.barshak@cogentembedded.com>");
+builtin_platform_driver(rcar_pci_driver);
diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index c388468c202a..6de0757b11e4 100644
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -9,6 +9,8 @@
  *
  * Bits taken from arch/arm/mach-dove/pcie.c
  *
+ * Author: Thierry Reding <treding@nvidia.com>
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
@@ -32,7 +34,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
@@ -183,26 +185,26 @@
 
 #define AFI_PEXBIAS_CTRL_0              0x168
 
-#define RP_VEND_XP      0x00000F00
+#define RP_VEND_XP      0x00000f00
 #define  RP_VEND_XP_DL_UP       (1 << 30)
 
-#define RP_PRIV_MISC    0x00000FE0
-#define  RP_PRIV_MISC_PRSNT_MAP_EP_PRSNT (0xE << 0)
-#define  RP_PRIV_MISC_PRSNT_MAP_EP_ABSNT (0xF << 0)
+#define RP_PRIV_MISC    0x00000fe0
+#define  RP_PRIV_MISC_PRSNT_MAP_EP_PRSNT (0xe << 0)
+#define  RP_PRIV_MISC_PRSNT_MAP_EP_ABSNT (0xf << 0)
 
 #define RP_LINK_CONTROL_STATUS                  0x00000090
 #define  RP_LINK_CONTROL_STATUS_DL_LINK_ACTIVE  0x20000000
 #define  RP_LINK_CONTROL_STATUS_LINKSTAT_MASK   0x3fff0000
 
-#define PADS_CTL_SEL            0x0000009C
+#define PADS_CTL_SEL            0x0000009c
 
-#define PADS_CTL                0x000000A0
+#define PADS_CTL                0x000000a0
 #define  PADS_CTL_IDDQ_1L       (1 << 0)
 #define  PADS_CTL_TX_DATA_EN_1L (1 << 6)
 #define  PADS_CTL_RX_DATA_EN_1L (1 << 10)
 
-#define PADS_PLL_CTL_TEGRA20                    0x000000B8
-#define PADS_PLL_CTL_TEGRA30                    0x000000B4
+#define PADS_PLL_CTL_TEGRA20                    0x000000b8
+#define PADS_PLL_CTL_TEGRA30                    0x000000b4
 #define  PADS_PLL_CTL_RST_B4SM                  (1 << 1)
 #define  PADS_PLL_CTL_LOCKDET                   (1 << 8)
 #define  PADS_PLL_CTL_REFCLK_MASK               (0x3 << 16)
@@ -214,9 +216,9 @@
 #define  PADS_PLL_CTL_TXCLKREF_DIV5             (1 << 20)
 #define  PADS_PLL_CTL_TXCLKREF_BUF_EN           (1 << 22)
 
-#define PADS_REFCLK_CFG0                        0x000000C8
-#define PADS_REFCLK_CFG1                        0x000000CC
-#define PADS_REFCLK_BIAS                        0x000000D0
+#define PADS_REFCLK_CFG0                        0x000000c8
+#define PADS_REFCLK_CFG1                        0x000000cc
+#define PADS_REFCLK_BIAS                        0x000000d0
 
 /*
  * Fields in PADS_REFCLK_CFG*. Those registers form an array of 16-bit
@@ -228,15 +230,6 @@
 #define PADS_REFCLK_CFG_PREDI_SHIFT             8  /* 11:8 */
 #define PADS_REFCLK_CFG_DRVI_SHIFT              12 /* 15:12 */
 
-/* Default value provided by HW engineering is 0xfa5c */
-#define PADS_REFCLK_CFG_VALUE \
-        ( \
-                (0x17 << PADS_REFCLK_CFG_TERM_SHIFT)   | \
-                (0    << PADS_REFCLK_CFG_E_TERM_SHIFT) | \
-                (0xa  << PADS_REFCLK_CFG_PREDI_SHIFT)  | \
-                (0xf  << PADS_REFCLK_CFG_DRVI_SHIFT)     \
-        )
-
 struct tegra_msi {
         struct msi_controller chip;
         DECLARE_BITMAP(used, INT_PCI_MSI_NR);
@@ -252,6 +245,8 @@ struct tegra_pcie_soc_data {
         unsigned int msi_base_shift;
         u32 pads_pll_ctl;
         u32 tx_ref_sel;
+        u32 pads_refclk_cfg0;
+        u32 pads_refclk_cfg1;
         bool has_pex_clkreq_en;
         bool has_pex_bias_ctrl;
         bool has_intr_prsnt_sense;
@@ -274,7 +269,6 @@ struct tegra_pcie {
         struct list_head buses;
         struct resource *cs;
 
-        struct resource all;
         struct resource io;
         struct resource pio;
         struct resource mem;
@@ -623,30 +617,21 @@ static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
         sys->mem_offset = pcie->offset.mem;
         sys->io_offset = pcie->offset.io;
 
-        err = devm_request_resource(pcie->dev, &pcie->all, &pcie->io);
-        if (err < 0)
-                return err;
-
-        err = devm_request_resource(pcie->dev, &ioport_resource, &pcie->pio);
-        if (err < 0)
-                return err;
-
-        err = devm_request_resource(pcie->dev, &pcie->all, &pcie->mem);
+        err = devm_request_resource(pcie->dev, &iomem_resource, &pcie->io);
         if (err < 0)
                 return err;
 
-        err = devm_request_resource(pcie->dev, &pcie->all, &pcie->prefetch);
-        if (err)
-                return err;
-
         pci_add_resource_offset(&sys->resources, &pcie->pio, sys->io_offset);
         pci_add_resource_offset(&sys->resources, &pcie->mem, sys->mem_offset);
         pci_add_resource_offset(&sys->resources, &pcie->prefetch,
                                 sys->mem_offset);
         pci_add_resource(&sys->resources, &pcie->busn);
 
-        pci_ioremap_io(pcie->pio.start, pcie->io.start);
+        err = devm_request_pci_bus_resources(pcie->dev, &sys->resources);
+        if (err < 0)
+                return err;
 
+        pci_remap_iospace(&pcie->pio, pcie->io.start);
         return 1;
 }
 
@@ -838,12 +823,6 @@ static int tegra_pcie_phy_enable(struct tegra_pcie *pcie)
         value |= PADS_PLL_CTL_RST_B4SM;
         pads_writel(pcie, value, soc->pads_pll_ctl);
 
-        /* Configure the reference clock driver */
-        value = PADS_REFCLK_CFG_VALUE | (PADS_REFCLK_CFG_VALUE << 16);
-        pads_writel(pcie, value, PADS_REFCLK_CFG0);
-        if (soc->num_ports > 2)
-                pads_writel(pcie, PADS_REFCLK_CFG_VALUE, PADS_REFCLK_CFG1);
-
         /* wait for the PLL to lock */
         err = tegra_pcie_pll_wait(pcie, 500);
         if (err < 0) {
@@ -927,6 +906,7 @@ static int tegra_pcie_port_phy_power_off(struct tegra_pcie_port *port)
 
 static int tegra_pcie_phy_power_on(struct tegra_pcie *pcie)
 {
+        const struct tegra_pcie_soc_data *soc = pcie->soc_data;
         struct tegra_pcie_port *port;
         int err;
 
@@ -952,6 +932,12 @@ static int tegra_pcie_phy_power_on(struct tegra_pcie *pcie)
                 }
         }
 
+        /* Configure the reference clock driver */
+        pads_writel(pcie, soc->pads_refclk_cfg0, PADS_REFCLK_CFG0);
+
+        if (soc->num_ports > 2)
+                pads_writel(pcie, soc->pads_refclk_cfg1, PADS_REFCLK_CFG1);
+
         return 0;
 }
 
@@ -1822,12 +1808,6 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
         struct resource res;
         int err;
 
-        memset(&pcie->all, 0, sizeof(pcie->all));
-        pcie->all.flags = IORESOURCE_MEM;
-        pcie->all.name = np->full_name;
-        pcie->all.start = ~0;
-        pcie->all.end = 0;
-
         if (of_pci_range_parser_init(&parser, np)) {
                 dev_err(pcie->dev, "missing \"ranges\" property\n");
                 return -EINVAL;
@@ -1880,18 +1860,8 @@ static int tegra_pcie_parse_dt(struct tegra_pcie *pcie)
                         }
                         break;
                 }
-
-                if (res.start <= pcie->all.start)
-                        pcie->all.start = res.start;
-
-                if (res.end >= pcie->all.end)
-                        pcie->all.end = res.end;
         }
 
-        err = devm_request_resource(pcie->dev, &iomem_resource, &pcie->all);
-        if (err < 0)
-                return err;
-
         err = of_pci_parse_bus_range(np, &pcie->busn);
         if (err < 0) {
                 dev_err(pcie->dev, "failed to parse ranges property: %d\n",
@@ -2078,6 +2048,7 @@ static const struct tegra_pcie_soc_data tegra20_pcie_data = {
         .msi_base_shift = 0,
         .pads_pll_ctl = PADS_PLL_CTL_TEGRA20,
         .tx_ref_sel = PADS_PLL_CTL_TXCLKREF_DIV10,
+        .pads_refclk_cfg0 = 0xfa5cfa5c,
         .has_pex_clkreq_en = false,
         .has_pex_bias_ctrl = false,
         .has_intr_prsnt_sense = false,
@@ -2090,6 +2061,8 @@ static const struct tegra_pcie_soc_data tegra30_pcie_data = {
         .msi_base_shift = 8,
         .pads_pll_ctl = PADS_PLL_CTL_TEGRA30,
         .tx_ref_sel = PADS_PLL_CTL_TXCLKREF_BUF_EN,
+        .pads_refclk_cfg0 = 0xfa5cfa5c,
+        .pads_refclk_cfg1 = 0xfa5cfa5c,
         .has_pex_clkreq_en = true,
         .has_pex_bias_ctrl = true,
         .has_intr_prsnt_sense = true,
@@ -2102,6 +2075,7 @@ static const struct tegra_pcie_soc_data tegra124_pcie_data = {
         .msi_base_shift = 8,
         .pads_pll_ctl = PADS_PLL_CTL_TEGRA30,
         .tx_ref_sel = PADS_PLL_CTL_TXCLKREF_BUF_EN,
+        .pads_refclk_cfg0 = 0x44ac44ac,
         .has_pex_clkreq_en = true,
         .has_pex_bias_ctrl = true,
         .has_intr_prsnt_sense = true,
@@ -2115,7 +2089,6 @@ static const struct of_device_id tegra_pcie_of_match[] = {
         { .compatible = "nvidia,tegra20-pcie", .data = &tegra20_pcie_data },
         { },
 };
-MODULE_DEVICE_TABLE(of, tegra_pcie_of_match);
 
 static void *tegra_pcie_ports_seq_start(struct seq_file *s, loff_t *pos)
 {
@@ -2249,8 +2222,6 @@ static int tegra_pcie_probe(struct platform_device *pdev)
         if (err < 0)
                 return err;
 
-        pcibios_min_mem = 0;
-
         err = tegra_pcie_get_resources(pcie);
         if (err < 0) {
                 dev_err(&pdev->dev, "failed to request resources: %d\n", err);
@@ -2306,8 +2277,4 @@ static struct platform_driver tegra_pcie_driver = {
         },
         .probe = tegra_pcie_probe,
 };
-module_platform_driver(tegra_pcie_driver);
-
-MODULE_AUTHOR("Thierry Reding <treding@nvidia.com>");
-MODULE_DESCRIPTION("NVIDIA Tegra PCIe driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(tegra_pcie_driver);
diff --git a/drivers/pci/host/pci-thunder-ecam.c b/drivers/pci/host/pci-thunder-ecam.c
index 540d030613eb..d50a3dc2d8db 100644
--- a/drivers/pci/host/pci-thunder-ecam.c
+++ b/drivers/pci/host/pci-thunder-ecam.c
@@ -7,14 +7,13 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/ioport.h>
 #include <linux/of_pci.h>
 #include <linux/of.h>
+#include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
 
-#include "../ecam.h"
-
 static void set_val(u32 v, int where, int size, u32 *val)
 {
         int shift = (where & 3) * 8;
@@ -360,7 +359,6 @@ static const struct of_device_id thunder_ecam_of_match[] = {
         { .compatible = "cavium,pci-host-thunder-ecam" },
         { },
 };
-MODULE_DEVICE_TABLE(of, thunder_ecam_of_match);
 
 static int thunder_ecam_probe(struct platform_device *pdev)
 {
@@ -374,7 +372,4 @@ static struct platform_driver thunder_ecam_driver = {
         },
         .probe = thunder_ecam_probe,
 };
-module_platform_driver(thunder_ecam_driver);
-
-MODULE_DESCRIPTION("Thunder ECAM PCI host driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(thunder_ecam_driver);
diff --git a/drivers/pci/host/pci-thunder-pem.c b/drivers/pci/host/pci-thunder-pem.c
index 9b8ab94f3c8c..6abaf80ffb39 100644
--- a/drivers/pci/host/pci-thunder-pem.c
+++ b/drivers/pci/host/pci-thunder-pem.c
@@ -15,13 +15,12 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
+#include <linux/pci-ecam.h>
 #include <linux/platform_device.h>
 
-#include "../ecam.h"
-
 #define PEM_CFG_WR 0x28
 #define PEM_CFG_RD 0x30
 
@@ -285,8 +284,9 @@ static int thunder_pem_config_write(struct pci_bus *bus, unsigned int devfn,
         return pci_generic_config_write(bus, devfn, where, size, val);
 }
 
-static int thunder_pem_init(struct device *dev, struct pci_config_window *cfg)
+static int thunder_pem_init(struct pci_config_window *cfg)
 {
+        struct device *dev = cfg->parent;
         resource_size_t bar4_start;
         struct resource *res_pem;
         struct thunder_pem_pci *pem_pci;
@@ -346,7 +346,6 @@ static const struct of_device_id thunder_pem_of_match[] = {
         { .compatible = "cavium,pci-host-thunder-pem" },
         { },
 };
-MODULE_DEVICE_TABLE(of, thunder_pem_of_match);
 
 static int thunder_pem_probe(struct platform_device *pdev)
 {
@@ -360,7 +359,4 @@ static struct platform_driver thunder_pem_driver = {
         },
         .probe = thunder_pem_probe,
 };
-module_platform_driver(thunder_pem_driver);
-
-MODULE_DESCRIPTION("Thunder PEM PCIe host driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(thunder_pem_driver);
diff --git a/drivers/pci/host/pci-versatile.c b/drivers/pci/host/pci-versatile.c
index f843a72dc51c..f234405770ab 100644
--- a/drivers/pci/host/pci-versatile.c
+++ b/drivers/pci/host/pci-versatile.c
@@ -80,21 +80,21 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
         if (err)
                 return err;
 
+        err = devm_request_pci_bus_resources(dev, res);
+        if (err)
+                goto out_release_res;
+
         resource_list_for_each_entry(win, res) {
-                struct resource *parent, *res = win->res;
+                struct resource *res = win->res;
 
                 switch (resource_type(res)) {
                 case IORESOURCE_IO:
-                        parent = &ioport_resource;
                         err = pci_remap_iospace(res, iobase);
-                        if (err) {
+                        if (err)
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
-                                continue;
-                        }
                         break;
                 case IORESOURCE_MEM:
-                        parent = &iomem_resource;
                         res_valid |= !(res->flags & IORESOURCE_PREFETCH);
 
                         writel(res->start >> 28, PCI_IMAP(mem));
@@ -102,23 +102,14 @@ static int versatile_pci_parse_request_of_pci_ranges(struct device *dev,
                         mem++;
 
                         break;
-                case IORESOURCE_BUS:
-                default:
-                        continue;
                 }
-
-                err = devm_request_resource(dev, parent, res);
-                if (err)
-                        goto out_release_res;
         }
 
-        if (!res_valid) {
-                dev_err(dev, "non-prefetchable memory resource required\n");
-                err = -EINVAL;
-                goto out_release_res;
-        }
+        if (res_valid)
+                return 0;
 
-        return 0;
+        dev_err(dev, "non-prefetchable memory resource required\n");
+        err = -EINVAL;
 
 out_release_res:
         pci_free_resource_list(res);
diff --git a/drivers/pci/host/pci-xgene.c b/drivers/pci/host/pci-xgene.c
index ae00ce22d5a6..a81273c23341 100644
--- a/drivers/pci/host/pci-xgene.c
+++ b/drivers/pci/host/pci-xgene.c
@@ -21,7 +21,7 @@
 #include <linux/io.h>
 #include <linux/jiffies.h>
 #include <linux/memblock.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -540,14 +540,20 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev)
         if (ret)
                 return ret;
 
+        ret = devm_request_pci_bus_resources(&pdev->dev, &res);
+        if (ret)
+                goto error;
+
         ret = xgene_pcie_setup(port, &res, iobase);
         if (ret)
-                return ret;
+                goto error;
 
         bus = pci_create_root_bus(&pdev->dev, 0,
                                         &xgene_pcie_ops, port, &res);
-        if (!bus)
-                return -ENOMEM;
+        if (!bus) {
+                ret = -ENOMEM;
+                goto error;
+        }
 
         pci_scan_child_bus(bus);
         pci_assign_unassigned_bus_resources(bus);
@@ -555,6 +561,10 @@ static int xgene_pcie_probe_bridge(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, port);
         return 0;
+
+error:
+        pci_free_resource_list(&res);
+        return ret;
 }
 
 static const struct of_device_id xgene_pcie_match_table[] = {
@@ -569,8 +579,4 @@ static struct platform_driver xgene_pcie_driver = {
         },
         .probe = xgene_pcie_probe_bridge,
 };
-module_platform_driver(xgene_pcie_driver);
-
-MODULE_AUTHOR("Tanmay Inamdar <tinamdar@apm.com>");
-MODULE_DESCRIPTION("APM X-Gene PCIe driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(xgene_pcie_driver);
diff --git a/drivers/pci/host/pcie-altera.c b/drivers/pci/host/pcie-altera.c
index dbac6fb3f0bd..2b7837650db8 100644
--- a/drivers/pci/host/pcie-altera.c
+++ b/drivers/pci/host/pcie-altera.c
@@ -61,6 +61,8 @@
 #define TLP_LOOP                        500
 #define RP_DEVFN                        0
 
+#define LINK_UP_TIMEOUT                 5000
+
 #define INTX_NUM                        4
 
 #define DWORD_MASK                      3
@@ -81,9 +83,30 @@ struct tlp_rp_regpair_t {
         u32 reg1;
 };
 
+static inline void cra_writel(struct altera_pcie *pcie, const u32 value,
+                              const u32 reg)
+{
+        writel_relaxed(value, pcie->cra_base + reg);
+}
+
+static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)
+{
+        return readl_relaxed(pcie->cra_base + reg);
+}
+
+static bool altera_pcie_link_is_up(struct altera_pcie *pcie)
+{
+        return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0);
+}
+
 static void altera_pcie_retrain(struct pci_dev *dev)
 {
         u16 linkcap, linkstat;
+        struct altera_pcie *pcie = dev->bus->sysdata;
+        int timeout =  0;
+
+        if (!altera_pcie_link_is_up(pcie))
+                return;
 
         /*
          * Set the retrain bit if the PCIe rootport support > 2.5GB/s, but
@@ -95,9 +118,16 @@ static void altera_pcie_retrain(struct pci_dev *dev)
                 return;
 
         pcie_capability_read_word(dev, PCI_EXP_LNKSTA, &linkstat);
-        if ((linkstat & PCI_EXP_LNKSTA_CLS) == PCI_EXP_LNKSTA_CLS_2_5GB)
+        if ((linkstat & PCI_EXP_LNKSTA_CLS) == PCI_EXP_LNKSTA_CLS_2_5GB) {
                 pcie_capability_set_word(dev, PCI_EXP_LNKCTL,
                                          PCI_EXP_LNKCTL_RL);
+                while (!altera_pcie_link_is_up(pcie)) {
+                        timeout++;
+                        if (timeout > LINK_UP_TIMEOUT)
+                                break;
+                        udelay(5);
+                }
+        }
 }
 DECLARE_PCI_FIXUP_EARLY(0x1172, PCI_ANY_ID, altera_pcie_retrain);
 
@@ -120,17 +150,6 @@ static bool altera_pcie_hide_rc_bar(struct pci_bus *bus, unsigned int  devfn,
         return false;
 }
 
-static inline void cra_writel(struct altera_pcie *pcie, const u32 value,
-                              const u32 reg)
-{
-        writel_relaxed(value, pcie->cra_base + reg);
-}
-
-static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)
-{
-        return readl_relaxed(pcie->cra_base + reg);
-}
-
 static void tlp_write_tx(struct altera_pcie *pcie,
                          struct tlp_rp_regpair_t *tlp_rp_regdata)
 {
@@ -139,11 +158,6 @@ static void tlp_write_tx(struct altera_pcie *pcie,
         cra_writel(pcie, tlp_rp_regdata->ctrl, RP_TX_CNTRL);
 }
 
-static bool altera_pcie_link_is_up(struct altera_pcie *pcie)
-{
-        return !!((cra_readl(pcie, RP_LTSSM) & RP_LTSSM_MASK) == LTSSM_L0);
-}
-
 static bool altera_pcie_valid_config(struct altera_pcie *pcie,
                                      struct pci_bus *bus, int dev)
 {
@@ -415,11 +429,6 @@ static void altera_pcie_isr(struct irq_desc *desc)
         chained_irq_exit(chip, desc);
 }
 
-static void altera_pcie_release_of_pci_ranges(struct altera_pcie *pcie)
-{
-        pci_free_resource_list(&pcie->resources);
-}
-
 static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
 {
         int err, res_valid = 0;
@@ -432,33 +441,25 @@ static int altera_pcie_parse_request_of_pci_ranges(struct altera_pcie *pcie)
         if (err)
                 return err;
 
+        err = devm_request_pci_bus_resources(dev, &pcie->resources);
+        if (err)
+                goto out_release_res;
+
         resource_list_for_each_entry(win, &pcie->resources) {
-                struct resource *parent, *res = win->res;
+                struct resource *res = win->res;
 
-                switch (resource_type(res)) {
-                case IORESOURCE_MEM:
-                        parent = &iomem_resource;
+                if (resource_type(res) == IORESOURCE_MEM)
                         res_valid |= !(res->flags & IORESOURCE_PREFETCH);
-                        break;
-                default:
-                        continue;
-                }
-
-                err = devm_request_resource(dev, parent, res);
-                if (err)
-                        goto out_release_res;
         }
 
-        if (!res_valid) {
-                dev_err(dev, "non-prefetchable memory resource required\n");
-                err = -EINVAL;
-                goto out_release_res;
-        }
+        if (res_valid)
+                return 0;
 
-        return 0;
+        dev_err(dev, "non-prefetchable memory resource required\n");
+        err = -EINVAL;
 
 out_release_res:
-        altera_pcie_release_of_pci_ranges(pcie);
+        pci_free_resource_list(&pcie->resources);
         return err;
 }
 
diff --git a/drivers/pci/host/pcie-armada8k.c b/drivers/pci/host/pcie-armada8k.c
index 55723567b5d4..0f4f570068e3 100644
--- a/drivers/pci/host/pcie-armada8k.c
+++ b/drivers/pci/host/pcie-armada8k.c
@@ -5,6 +5,9 @@
  *
  * Copyright (C) 2016 Marvell Technology Group Ltd.
  *
+ * Author: Yehuda Yitshak <yehuday@marvell.com>
+ * Author: Shadi Ammouri <shadi@marvell.com>
+ *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
@@ -14,7 +17,7 @@
 #include <linux/delay.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of.h>
 #include <linux/pci.h>
 #include <linux/phy/phy.h>
@@ -244,7 +247,6 @@ static const struct of_device_id armada8k_pcie_of_match[] = {
         { .compatible = "marvell,armada8k-pcie", },
         {},
 };
-MODULE_DEVICE_TABLE(of, armada8k_pcie_of_match);
 
 static struct platform_driver armada8k_pcie_driver = {
         .probe          = armada8k_pcie_probe,
@@ -253,10 +255,4 @@ static struct platform_driver armada8k_pcie_driver = {
                 .of_match_table = of_match_ptr(armada8k_pcie_of_match),
         },
 };
-
-module_platform_driver(armada8k_pcie_driver);
-
-MODULE_DESCRIPTION("Armada 8k PCIe host controller driver");
-MODULE_AUTHOR("Yehuda Yitshak <yehuday@marvell.com>");
-MODULE_AUTHOR("Shadi Ammouri <shadi@marvell.com>");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(armada8k_pcie_driver);
diff --git a/drivers/pci/host/pcie-artpec6.c b/drivers/pci/host/pcie-artpec6.c
new file mode 100644
index 000000000000..16ba70b7ec65
--- /dev/null
+++ b/drivers/pci/host/pcie-artpec6.c
@@ -0,0 +1,280 @@
+/*
+ * PCIe host controller driver for Axis ARTPEC-6 SoC
+ *
+ * Author: Niklas Cassel <niklas.cassel@axis.com>
+ *
+ * Based on work done by Phil Edworthy <phil@edworthys.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/resource.h>
+#include <linux/signal.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/mfd/syscon.h>
+#include <linux/regmap.h>
+
+#include "pcie-designware.h"
+
+#define to_artpec6_pcie(x)      container_of(x, struct artpec6_pcie, pp)
+
+struct artpec6_pcie {
+        struct pcie_port        pp;
+        struct regmap           *regmap;
+        void __iomem            *phy_base;
+};
+
+/* PCIe Port Logic registers (memory-mapped) */
+#define PL_OFFSET                       0x700
+#define PCIE_PHY_DEBUG_R0               (PL_OFFSET + 0x28)
+#define PCIE_PHY_DEBUG_R1               (PL_OFFSET + 0x2c)
+
+#define MISC_CONTROL_1_OFF              (PL_OFFSET + 0x1bc)
+#define  DBI_RO_WR_EN                   1
+
+/* ARTPEC-6 specific registers */
+#define PCIECFG                         0x18
+#define  PCIECFG_DBG_OEN                (1 << 24)
+#define  PCIECFG_CORE_RESET_REQ         (1 << 21)
+#define  PCIECFG_LTSSM_ENABLE           (1 << 20)
+#define  PCIECFG_CLKREQ_B               (1 << 11)
+#define  PCIECFG_REFCLK_ENABLE          (1 << 10)
+#define  PCIECFG_PLL_ENABLE             (1 << 9)
+#define  PCIECFG_PCLK_ENABLE            (1 << 8)
+#define  PCIECFG_RISRCREN               (1 << 4)
+#define  PCIECFG_MODE_TX_DRV_EN         (1 << 3)
+#define  PCIECFG_CISRREN                (1 << 2)
+#define  PCIECFG_MACRO_ENABLE           (1 << 0)
+
+#define NOCCFG                          0x40
+#define NOCCFG_ENABLE_CLK_PCIE          (1 << 4)
+#define NOCCFG_POWER_PCIE_IDLEACK       (1 << 3)
+#define NOCCFG_POWER_PCIE_IDLE          (1 << 2)
+#define NOCCFG_POWER_PCIE_IDLEREQ       (1 << 1)
+
+#define PHY_STATUS                      0x118
+#define PHY_COSPLLLOCK                  (1 << 0)
+
+#define ARTPEC6_CPU_TO_BUS_ADDR         0x0fffffff
+
+static int artpec6_pcie_establish_link(struct pcie_port *pp)
+{
+        struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pp);
+        u32 val;
+        unsigned int retries;
+
+        /* Hold DW core in reset */
+        regmap_read(artpec6_pcie->regmap, PCIECFG, &val);
+        val |= PCIECFG_CORE_RESET_REQ;
+        regmap_write(artpec6_pcie->regmap, PCIECFG, val);
+
+        regmap_read(artpec6_pcie->regmap, PCIECFG, &val);
+        val |=  PCIECFG_RISRCREN |      /* Receiver term. 50 Ohm */
+                PCIECFG_MODE_TX_DRV_EN |
+                PCIECFG_CISRREN |       /* Reference clock term. 100 Ohm */
+                PCIECFG_MACRO_ENABLE;
+        val |= PCIECFG_REFCLK_ENABLE;
+        val &= ~PCIECFG_DBG_OEN;
+        val &= ~PCIECFG_CLKREQ_B;
+        regmap_write(artpec6_pcie->regmap, PCIECFG, val);
+        usleep_range(5000, 6000);
+
+        regmap_read(artpec6_pcie->regmap, NOCCFG, &val);
+        val |= NOCCFG_ENABLE_CLK_PCIE;
+        regmap_write(artpec6_pcie->regmap, NOCCFG, val);
+        usleep_range(20, 30);
+
+        regmap_read(artpec6_pcie->regmap, PCIECFG, &val);
+        val |= PCIECFG_PCLK_ENABLE | PCIECFG_PLL_ENABLE;
+        regmap_write(artpec6_pcie->regmap, PCIECFG, val);
+        usleep_range(6000, 7000);
+
+        regmap_read(artpec6_pcie->regmap, NOCCFG, &val);
+        val &= ~NOCCFG_POWER_PCIE_IDLEREQ;
+        regmap_write(artpec6_pcie->regmap, NOCCFG, val);
+
+        retries = 50;
+        do {
+                usleep_range(1000, 2000);
+                regmap_read(artpec6_pcie->regmap, NOCCFG, &val);
+                retries--;
+        } while (retries &&
+                (val & (NOCCFG_POWER_PCIE_IDLEACK | NOCCFG_POWER_PCIE_IDLE)));
+
+        retries = 50;
+        do {
+                usleep_range(1000, 2000);
+                val = readl(artpec6_pcie->phy_base + PHY_STATUS);
+                retries--;
+        } while (retries && !(val & PHY_COSPLLLOCK));
+
+        /* Take DW core out of reset */
+        regmap_read(artpec6_pcie->regmap, PCIECFG, &val);
+        val &= ~PCIECFG_CORE_RESET_REQ;
+        regmap_write(artpec6_pcie->regmap, PCIECFG, val);
+        usleep_range(100, 200);
+
+        /*
+         * Enable writing to config regs. This is required as the Synopsys
+         * driver changes the class code. That register needs DBI write enable.
+         */
+        writel(DBI_RO_WR_EN, pp->dbi_base + MISC_CONTROL_1_OFF);
+
+        pp->io_base &= ARTPEC6_CPU_TO_BUS_ADDR;
+        pp->mem_base &= ARTPEC6_CPU_TO_BUS_ADDR;
+        pp->cfg0_base &= ARTPEC6_CPU_TO_BUS_ADDR;
+        pp->cfg1_base &= ARTPEC6_CPU_TO_BUS_ADDR;
+
+        /* setup root complex */
+        dw_pcie_setup_rc(pp);
+
+        /* assert LTSSM enable */
+        regmap_read(artpec6_pcie->regmap, PCIECFG, &val);
+        val |= PCIECFG_LTSSM_ENABLE;
+        regmap_write(artpec6_pcie->regmap, PCIECFG, val);
+
+        /* check if the link is up or not */
+        if (!dw_pcie_wait_for_link(pp))
+                return 0;
+
+        dev_dbg(pp->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
+                readl(pp->dbi_base + PCIE_PHY_DEBUG_R0),
+                readl(pp->dbi_base + PCIE_PHY_DEBUG_R1));
+
+        return -ETIMEDOUT;
+}
+
+static void artpec6_pcie_enable_interrupts(struct pcie_port *pp)
+{
+        if (IS_ENABLED(CONFIG_PCI_MSI))
+                dw_pcie_msi_init(pp);
+}
+
+static void artpec6_pcie_host_init(struct pcie_port *pp)
+{
+        artpec6_pcie_establish_link(pp);
+        artpec6_pcie_enable_interrupts(pp);
+}
+
+static int artpec6_pcie_link_up(struct pcie_port *pp)
+{
+        u32 rc;
+
+        /*
+         * Get status from Synopsys IP
+         * link is debug bit 36, debug register 1 starts at bit 32
+         */
+        rc = readl(pp->dbi_base + PCIE_PHY_DEBUG_R1) & (0x1 << (36 - 32));
+        if (rc)
+                return 1;
+
+        return 0;
+}
+
+static struct pcie_host_ops artpec6_pcie_host_ops = {
+        .link_up = artpec6_pcie_link_up,
+        .host_init = artpec6_pcie_host_init,
+};
+
+static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg)
+{
+        struct pcie_port *pp = arg;
+
+        return dw_handle_msi_irq(pp);
+}
+
+static int __init artpec6_add_pcie_port(struct pcie_port *pp,
+                                        struct platform_device *pdev)
+{
+        int ret;
+
+        if (IS_ENABLED(CONFIG_PCI_MSI)) {
+                pp->msi_irq = platform_get_irq_byname(pdev, "msi");
+                if (pp->msi_irq <= 0) {
+                        dev_err(&pdev->dev, "failed to get MSI irq\n");
+                        return -ENODEV;
+                }
+
+                ret = devm_request_irq(&pdev->dev, pp->msi_irq,
+                                       artpec6_pcie_msi_handler,
+                                       IRQF_SHARED | IRQF_NO_THREAD,
+                                       "artpec6-pcie-msi", pp);
+                if (ret) {
+                        dev_err(&pdev->dev, "failed to request MSI irq\n");
+                        return ret;
+                }
+        }
+
+        pp->root_bus_nr = -1;
+        pp->ops = &artpec6_pcie_host_ops;
+
+        ret = dw_pcie_host_init(pp);
+        if (ret) {
+                dev_err(&pdev->dev, "failed to initialize host\n");
+                return ret;
+        }
+
+        return 0;
+}
+
+static int artpec6_pcie_probe(struct platform_device *pdev)
+{
+        struct artpec6_pcie *artpec6_pcie;
+        struct pcie_port *pp;
+        struct resource *dbi_base;
+        struct resource *phy_base;
+        int ret;
+
+        artpec6_pcie = devm_kzalloc(&pdev->dev, sizeof(*artpec6_pcie),
+                                    GFP_KERNEL);
+        if (!artpec6_pcie)
+                return -ENOMEM;
+
+        pp = &artpec6_pcie->pp;
+        pp->dev = &pdev->dev;
+
+        dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
+        pp->dbi_base = devm_ioremap_resource(&pdev->dev, dbi_base);
+        if (IS_ERR(pp->dbi_base))
+                return PTR_ERR(pp->dbi_base);
+
+        phy_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
+        artpec6_pcie->phy_base = devm_ioremap_resource(&pdev->dev, phy_base);
+        if (IS_ERR(artpec6_pcie->phy_base))
+                return PTR_ERR(artpec6_pcie->phy_base);
+
+        artpec6_pcie->regmap =
+                syscon_regmap_lookup_by_phandle(pdev->dev.of_node,
+                                                "axis,syscon-pcie");
+        if (IS_ERR(artpec6_pcie->regmap))
+                return PTR_ERR(artpec6_pcie->regmap);
+
+        ret = artpec6_add_pcie_port(pp, pdev);
+        if (ret < 0)
+                return ret;
+
+        platform_set_drvdata(pdev, artpec6_pcie);
+        return 0;
+}
+
+static const struct of_device_id artpec6_pcie_of_match[] = {
+        { .compatible = "axis,artpec6-pcie", },
+        {},
+};
+
+static struct platform_driver artpec6_pcie_driver = {
+        .probe = artpec6_pcie_probe,
+        .driver = {
+                .name   = "artpec6-pcie",
+                .of_match_table = artpec6_pcie_of_match,
+        },
+};
+builtin_platform_driver(artpec6_pcie_driver);
diff --git a/drivers/pci/host/pcie-designware-plat.c b/drivers/pci/host/pcie-designware-plat.c
index b3500994d08a..c8079dc81c10 100644
--- a/drivers/pci/host/pcie-designware-plat.c
+++ b/drivers/pci/host/pcie-designware-plat.c
@@ -14,7 +14,7 @@
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/of_gpio.h>
 #include <linux/pci.h>
 #include <linux/platform_device.h>
@@ -121,7 +121,6 @@ static const struct of_device_id dw_plat_pcie_of_match[] = {
         { .compatible = "snps,dw-pcie", },
         {},
 };
-MODULE_DEVICE_TABLE(of, dw_plat_pcie_of_match);
 
 static struct platform_driver dw_plat_pcie_driver = {
         .driver = {
@@ -130,9 +129,4 @@ static struct platform_driver dw_plat_pcie_driver = {
         },
         .probe = dw_plat_pcie_probe,
 };
-
-module_platform_driver(dw_plat_pcie_driver);
-
-MODULE_AUTHOR("Joao Pinto <Joao.Pinto@synopsys.com>");
-MODULE_DESCRIPTION("Synopsys PCIe host controller glue platform driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(dw_plat_pcie_driver);
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index aafd766546f3..12afce19890b 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -452,6 +452,10 @@ int dw_pcie_host_init(struct pcie_port *pp)
         if (ret)
                 return ret;
 
+        ret = devm_request_pci_bus_resources(&pdev->dev, &res);
+        if (ret)
+                goto error;
+
         /* Get the I/O and memory ranges from DT */
         resource_list_for_each_entry(win, &res) {
                 switch (resource_type(win->res)) {
@@ -461,11 +465,9 @@ int dw_pcie_host_init(struct pcie_port *pp)
                         pp->io_size = resource_size(pp->io);
                         pp->io_bus_addr = pp->io->start - win->offset;
                         ret = pci_remap_iospace(pp->io, pp->io_base);
-                        if (ret) {
+                        if (ret)
                                 dev_warn(pp->dev, "error %d: failed to map resource %pR\n",
                                          ret, pp->io);
-                                continue;
-                        }
                         break;
                 case IORESOURCE_MEM:
                         pp->mem = win->res;
@@ -483,8 +485,6 @@ int dw_pcie_host_init(struct pcie_port *pp)
                 case IORESOURCE_BUS:
                         pp->busn = win->res;
                         break;
-                default:
-                        continue;
                 }
         }
 
@@ -493,7 +493,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                         resource_size(pp->cfg));
                 if (!pp->dbi_base) {
                         dev_err(pp->dev, "error with ioremap\n");
-                        return -ENOMEM;
+                        ret = -ENOMEM;
+                        goto error;
                 }
         }
 
@@ -504,7 +505,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                                 pp->cfg0_size);
                 if (!pp->va_cfg0_base) {
                         dev_err(pp->dev, "error with ioremap in function\n");
-                        return -ENOMEM;
+                        ret = -ENOMEM;
+                        goto error;
                 }
         }
 
@@ -513,7 +515,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                                 pp->cfg1_size);
                 if (!pp->va_cfg1_base) {
                         dev_err(pp->dev, "error with ioremap\n");
-                        return -ENOMEM;
+                        ret = -ENOMEM;
+                        goto error;
                 }
         }
 
@@ -528,7 +531,8 @@ int dw_pcie_host_init(struct pcie_port *pp)
                                                 &dw_pcie_msi_chip);
                         if (!pp->irq_domain) {
                                 dev_err(pp->dev, "irq domain init failed\n");
-                                return -ENXIO;
+                                ret = -ENXIO;
+                                goto error;
                         }
 
                         for (i = 0; i < MAX_MSI_IRQS; i++)
@@ -536,7 +540,7 @@ int dw_pcie_host_init(struct pcie_port *pp)
                 } else {
                         ret = pp->ops->msi_host_init(pp, &dw_pcie_msi_chip);
                         if (ret < 0)
-                                return ret;
+                                goto error;
                 }
         }
 
@@ -552,8 +556,10 @@ int dw_pcie_host_init(struct pcie_port *pp)
         } else
                 bus = pci_scan_root_bus(pp->dev, pp->root_bus_nr, &dw_pcie_ops,
                                         pp, &res);
-        if (!bus)
-                return -ENOMEM;
+        if (!bus) {
+                ret = -ENOMEM;
+                goto error;
+        }
 
         if (pp->ops->scan_bus)
                 pp->ops->scan_bus(pp);
@@ -571,6 +577,10 @@ int dw_pcie_host_init(struct pcie_port *pp)
 
         pci_bus_add_devices(bus);
         return 0;
+
+error:
+        pci_free_resource_list(&res);
+        return ret;
 }
 
 static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
diff --git a/drivers/pci/host/pcie-hisi.c b/drivers/pci/host/pcie-hisi.c
index 3e98d4edae2d..7ee9dfcc45fb 100644
--- a/drivers/pci/host/pcie-hisi.c
+++ b/drivers/pci/host/pcie-hisi.c
@@ -12,7 +12,7 @@
  * published by the Free Software Foundation.
  */
 #include <linux/interrupt.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/mfd/syscon.h>
 #include <linux/of_address.h>
 #include <linux/of_pci.h>
@@ -235,9 +235,6 @@ static const struct of_device_id hisi_pcie_of_match[] = {
         {},
 };
 
-
-MODULE_DEVICE_TABLE(of, hisi_pcie_of_match);
-
 static struct platform_driver hisi_pcie_driver = {
         .probe  = hisi_pcie_probe,
         .driver = {
@@ -245,10 +242,4 @@ static struct platform_driver hisi_pcie_driver = {
                    .of_match_table = hisi_pcie_of_match,
         },
 };
-
-module_platform_driver(hisi_pcie_driver);
-
-MODULE_AUTHOR("Zhou Wang <wangzhou1@hisilicon.com>");
-MODULE_AUTHOR("Dacai Zhu <zhudacai@hisilicon.com>");
-MODULE_AUTHOR("Gabriele Paoloni <gabriele.paoloni@huawei.com>");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(hisi_pcie_driver);
diff --git a/drivers/pci/host/pcie-iproc.c b/drivers/pci/host/pcie-iproc.c
index a576aeeb22da..e167b2f0098d 100644
--- a/drivers/pci/host/pcie-iproc.c
+++ b/drivers/pci/host/pcie-iproc.c
@@ -462,6 +462,10 @@ int iproc_pcie_setup(struct iproc_pcie *pcie, struct list_head *res)
         if (!pcie || !pcie->dev || !pcie->base)
                 return -EINVAL;
 
+        ret = devm_request_pci_bus_resources(pcie->dev, res);
+        if (ret)
+                return ret;
+
         ret = phy_init(pcie->phy);
         if (ret) {
                 dev_err(pcie->dev, "unable to initialize PCIe PHY\n");
diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index 35092188039b..65db7a221509 100644
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -7,6 +7,8 @@
  *  arch/sh/drivers/pci/ops-sh7786.c
  *  Copyright (C) 2009 - 2011  Paul Mundt
  *
+ * Author: Phil Edworthy <phil.edworthy@renesas.com>
+ *
  * This file is licensed under the terms of the GNU General Public
  * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
@@ -18,7 +20,7 @@
 #include <linux/irq.h>
 #include <linux/irqdomain.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
+#include <linux/init.h>
 #include <linux/msi.h>
 #include <linux/of_address.h>
 #include <linux/of_irq.h>
@@ -936,12 +938,6 @@ static const struct of_device_id rcar_pcie_of_match[] = {
         { .compatible = "renesas,pcie-r8a7795", .data = rcar_pcie_hw_init },
         {},
 };
-MODULE_DEVICE_TABLE(of, rcar_pcie_of_match);
-
-static void rcar_pcie_release_of_pci_ranges(struct rcar_pcie *pci)
-{
-        pci_free_resource_list(&pci->resources);
-}
 
 static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci)
 {
@@ -955,37 +951,25 @@ static int rcar_pcie_parse_request_of_pci_ranges(struct rcar_pcie *pci)
         if (err)
                 return err;
 
+        err = devm_request_pci_bus_resources(dev, &pci->resources);
+        if (err)
+                goto out_release_res;
+
         resource_list_for_each_entry(win, &pci->resources) {
-                struct resource *parent, *res = win->res;
+                struct resource *res = win->res;
 
-                switch (resource_type(res)) {
-                case IORESOURCE_IO:
-                        parent = &ioport_resource;
+                if (resource_type(res) == IORESOURCE_IO) {
                         err = pci_remap_iospace(res, iobase);
-                        if (err) {
+                        if (err)
                                 dev_warn(dev, "error %d: failed to map resource %pR\n",
                                          err, res);
-                                continue;
-                        }
-                        break;
-                case IORESOURCE_MEM:
-                        parent = &iomem_resource;
-                        break;
-
-                case IORESOURCE_BUS:
-                default:
-                        continue;
                 }
-
-                err = devm_request_resource(dev, parent, res);
-                if (err)
-                        goto out_release_res;
         }
 
         return 0;
 
 out_release_res:
-        rcar_pcie_release_of_pci_ranges(pci);
+        pci_free_resource_list(&pci->resources);
         return err;
 }
 
@@ -1073,8 +1057,4 @@ static struct platform_driver rcar_pcie_driver = {
         },
         .probe = rcar_pcie_probe,
 };
-module_platform_driver(rcar_pcie_driver);
-
-MODULE_AUTHOR("Phil Edworthy <phil.edworthy@renesas.com>");
-MODULE_DESCRIPTION("Renesas R-Car PCIe driver");
-MODULE_LICENSE("GPL v2");
+builtin_platform_driver(rcar_pcie_driver);
diff --git a/drivers/pci/host/pcie-xilinx-nwl.c b/drivers/pci/host/pcie-xilinx-nwl.c
index 3479d30e2be8..0b597d9190b4 100644
--- a/drivers/pci/host/pcie-xilinx-nwl.c
+++ b/drivers/pci/host/pcie-xilinx-nwl.c
@@ -825,27 +825,33 @@ static int nwl_pcie_probe(struct platform_device *pdev)
 
         err = of_pci_get_host_bridge_resources(node, 0, 0xff, &res, &iobase);
         if (err) {
-                pr_err("Getting bridge resources failed\n");
+                dev_err(pcie->dev, "Getting bridge resources failed\n");
                 return err;
         }
 
+        err = devm_request_pci_bus_resources(pcie->dev, &res);
+        if (err)
+                goto error;
+
         err = nwl_pcie_init_irq_domain(pcie);
         if (err) {
                 dev_err(pcie->dev, "Failed creating IRQ Domain\n");
-                return err;
+                goto error;
         }
 
         bus = pci_create_root_bus(&pdev->dev, pcie->root_busno,
                                   &nwl_pcie_ops, pcie, &res);
-        if (!bus)
-                return -ENOMEM;
+        if (!bus) {
+                err = -ENOMEM;
+                goto error;
+        }
 
         if (IS_ENABLED(CONFIG_PCI_MSI)) {
                 err = nwl_pcie_enable_msi(pcie, bus);
                 if (err < 0) {
                         dev_err(&pdev->dev,
                                 "failed to enable MSI support: %d\n", err);
-                        return err;
+                        goto error;
                 }
         }
         pci_scan_child_bus(bus);
@@ -855,6 +861,10 @@ static int nwl_pcie_probe(struct platform_device *pdev)
         pci_bus_add_devices(bus);
         platform_set_drvdata(pdev, pcie);
         return 0;
+
+error:
+        pci_free_resource_list(&res);
+        return err;
 }
 
 static int nwl_pcie_remove(struct platform_device *pdev)
diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 65f0fe0c2eaf..a30e01639557 100644
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -550,7 +550,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
         pcie_intc_node = of_get_next_child(node, NULL);
         if (!pcie_intc_node) {
                 dev_err(dev, "No PCIe Intc node found\n");
-                return PTR_ERR(pcie_intc_node);
+                return -ENODEV;
         }
 
         port->irq_domain = irq_domain_add_linear(pcie_intc_node, 4,
@@ -558,7 +558,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
                                                  port);
         if (!port->irq_domain) {
                 dev_err(dev, "Failed to get a INTx IRQ domain\n");
-                return PTR_ERR(port->irq_domain);
+                return -ENODEV;
         }
 
         /* Setup MSI */
@@ -569,7 +569,7 @@ static int xilinx_pcie_init_irq_domain(struct xilinx_pcie_port *port)
                                                          &xilinx_pcie_msi_chip);
                 if (!port->irq_domain) {
                         dev_err(dev, "Failed to get a MSI IRQ domain\n");
-                        return PTR_ERR(port->irq_domain);
+                        return -ENODEV;
                 }
 
                 xilinx_pcie_enable_msi(port);
@@ -660,7 +660,6 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
         struct xilinx_pcie_port *port;
         struct device *dev = &pdev->dev;
         struct pci_bus *bus;
-
         int err;
         resource_size_t iobase = 0;
         LIST_HEAD(res);
@@ -694,10 +693,17 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
                 dev_err(dev, "Getting bridge resources failed\n");
                 return err;
         }
+
+        err = devm_request_pci_bus_resources(dev, &res);
+        if (err)
+                goto error;
+
         bus = pci_create_root_bus(&pdev->dev, 0,
                                   &xilinx_pcie_ops, port, &res);
-        if (!bus)
-                return -ENOMEM;
+        if (!bus) {
+                err = -ENOMEM;
+                goto error;
+        }
 
 #ifdef CONFIG_PCI_MSI
         xilinx_pcie_msi_chip.dev = port->dev;
@@ -712,6 +718,10 @@ static int xilinx_pcie_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, port);
 
         return 0;
+
+error:
+        pci_free_resource_list(&res);
+        return err;
 }
 
 /**
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index fa49f9143b80..6a33ddcfa20b 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -675,6 +675,8 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
         if (bridge->is_going_away)
                 return;
 
+        pm_runtime_get_sync(&bridge->pci_dev->dev);
+
         list_for_each_entry(slot, &bridge->slots, node) {
                 struct pci_bus *bus = slot->bus;
                 struct pci_dev *dev, *tmp;
@@ -694,6 +696,8 @@ static void acpiphp_check_bridge(struct acpiphp_bridge *bridge)
                         disable_slot(slot);
                 }
         }
+
+        pm_runtime_put(&bridge->pci_dev->dev);
 }
 
 /*
diff --git a/drivers/pci/hotplug/pciehp_hpc.c b/drivers/pci/hotplug/pciehp_hpc.c
index 5c24e938042f..08e84d61874e 100644
--- a/drivers/pci/hotplug/pciehp_hpc.c
+++ b/drivers/pci/hotplug/pciehp_hpc.c
@@ -546,6 +546,10 @@ static irqreturn_t pcie_isr(int irq, void *dev_id)
         u8 present;
         bool link;
 
+        /* Interrupts cannot originate from a controller that's asleep */
+        if (pdev->current_state == PCI_D3cold)
+                return IRQ_NONE;
+
         /*
          * In order to guarantee that all interrupt events are
          * serviced, we need to re-inspect Slot Status register after
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index d7ffd66814bb..e39a67c8ef39 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -777,7 +777,7 @@ static int pci_pm_suspend_noirq(struct device *dev)
 
         if (!pci_dev->state_saved) {
                 pci_save_state(pci_dev);
-                if (!pci_has_subordinate(pci_dev))
+                if (pci_power_manageable(pci_dev))
                         pci_prepare_to_sleep(pci_dev);
         }
 
@@ -1144,7 +1144,6 @@ static int pci_pm_runtime_suspend(struct device *dev)
                 return -ENOSYS;
 
         pci_dev->state_saved = false;
-        pci_dev->no_d3cold = false;
         error = pm->runtime_suspend(dev);
         if (error) {
                 /*
@@ -1161,8 +1160,6 @@ static int pci_pm_runtime_suspend(struct device *dev)
 
                 return error;
         }
-        if (!pci_dev->d3cold_allowed)
-                pci_dev->no_d3cold = true;
 
         pci_fixup_device(pci_fixup_suspend, pci_dev);
 
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c
index d319a9ca9b7b..bcd10c795284 100644
--- a/drivers/pci/pci-sysfs.c
+++ b/drivers/pci/pci-sysfs.c
@@ -406,6 +406,11 @@ static ssize_t d3cold_allowed_store(struct device *dev,
                 return -EINVAL;
 
         pdev->d3cold_allowed = !!val;
+        if (pdev->d3cold_allowed)
+                pci_d3cold_enable(pdev);
+        else
+                pci_d3cold_disable(pdev);
+
         pm_runtime_resume(dev);
 
         return count;
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index c8b4dbdd1bdd..9a6bc77ce3aa 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -7,8 +7,10 @@
  *      Copyright 1997 -- 2000 Martin Mares <mj@ucw.cz>
  */
 
+#include <linux/acpi.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
+#include <linux/dmi.h>
 #include <linux/init.h>
 #include <linux/of.h>
 #include <linux/of_pci.h>
@@ -25,7 +27,9 @@
 #include <linux/device.h>
 #include <linux/pm_runtime.h>
 #include <linux/pci_hotplug.h>
+#include <linux/vmalloc.h>
 #include <asm/setup.h>
+#include <asm/dma.h>
 #include <linux/aer.h>
 #include "pci.h"
 
@@ -81,6 +85,9 @@ unsigned long pci_cardbus_mem_size = DEFAULT_CARDBUS_MEM_SIZE;
 unsigned long pci_hotplug_io_size  = DEFAULT_HOTPLUG_IO_SIZE;
 unsigned long pci_hotplug_mem_size = DEFAULT_HOTPLUG_MEM_SIZE;
 
+#define DEFAULT_HOTPLUG_BUS_SIZE        1
+unsigned long pci_hotplug_bus_size = DEFAULT_HOTPLUG_BUS_SIZE;
+
 enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_DEFAULT;
 
 /*
@@ -101,6 +108,21 @@ unsigned int pcibios_max_latency = 255;
 /* If set, the PCIe ARI capability will not be used. */
 static bool pcie_ari_disabled;
 
+/* Disable bridge_d3 for all PCIe ports */
+static bool pci_bridge_d3_disable;
+/* Force bridge_d3 for all PCIe ports */
+static bool pci_bridge_d3_force;
+
+static int __init pcie_port_pm_setup(char *str)
+{
+        if (!strcmp(str, "off"))
+                pci_bridge_d3_disable = true;
+        else if (!strcmp(str, "force"))
+                pci_bridge_d3_force = true;
+        return 1;
+}
+__setup("pcie_port_pm=", pcie_port_pm_setup);
+
 /**
  * pci_bus_max_busnr - returns maximum PCI bus number of given bus' children
  * @bus: pointer to PCI bus structure to search
@@ -2156,6 +2178,164 @@ void pci_config_pm_runtime_put(struct pci_dev *pdev)
 }
 
 /**
+ * pci_bridge_d3_possible - Is it possible to put the bridge into D3
+ * @bridge: Bridge to check
+ *
+ * This function checks if it is possible to move the bridge to D3.
+ * Currently we only allow D3 for recent enough PCIe ports.
+ */
+static bool pci_bridge_d3_possible(struct pci_dev *bridge)
+{
+        unsigned int year;
+
+        if (!pci_is_pcie(bridge))
+                return false;
+
+        switch (pci_pcie_type(bridge)) {
+        case PCI_EXP_TYPE_ROOT_PORT:
+        case PCI_EXP_TYPE_UPSTREAM:
+        case PCI_EXP_TYPE_DOWNSTREAM:
+                if (pci_bridge_d3_disable)
+                        return false;
+                if (pci_bridge_d3_force)
+                        return true;
+
+                /*
+                 * It should be safe to put PCIe ports from 2015 or newer
+                 * to D3.
+                 */
+                if (dmi_get_date(DMI_BIOS_DATE, &year, NULL, NULL) &&
+                    year >= 2015) {
+                        return true;
+                }
+                break;
+        }
+
+        return false;
+}
+
+static int pci_dev_check_d3cold(struct pci_dev *dev, void *data)
+{
+        bool *d3cold_ok = data;
+        bool no_d3cold;
+
+        /*
+         * The device needs to be allowed to go D3cold and if it is wake
+         * capable to do so from D3cold.
+         */
+        no_d3cold = dev->no_d3cold || !dev->d3cold_allowed ||
+                (device_may_wakeup(&dev->dev) && !pci_pme_capable(dev, PCI_D3cold)) ||
+                !pci_power_manageable(dev);
+
+        *d3cold_ok = !no_d3cold;
+
+        return no_d3cold;
+}
+
+/*
+ * pci_bridge_d3_update - Update bridge D3 capabilities
+ * @dev: PCI device which is changed
+ * @remove: Is the device being removed
+ *
+ * Update upstream bridge PM capabilities accordingly depending on if the
+ * device PM configuration was changed or the device is being removed.  The
+ * change is also propagated upstream.
+ */
+static void pci_bridge_d3_update(struct pci_dev *dev, bool remove)
+{
+        struct pci_dev *bridge;
+        bool d3cold_ok = true;
+
+        bridge = pci_upstream_bridge(dev);
+        if (!bridge || !pci_bridge_d3_possible(bridge))
+                return;
+
+        pci_dev_get(bridge);
+        /*
+         * If the device is removed we do not care about its D3cold
+         * capabilities.
+         */
+        if (!remove)
+                pci_dev_check_d3cold(dev, &d3cold_ok);
+
+        if (d3cold_ok) {
+                /*
+                 * We need to go through all children to find out if all of
+                 * them can still go to D3cold.
+                 */
+                pci_walk_bus(bridge->subordinate, pci_dev_check_d3cold,
+                             &d3cold_ok);
+        }
+
+        if (bridge->bridge_d3 != d3cold_ok) {
+                bridge->bridge_d3 = d3cold_ok;
+                /* Propagate change to upstream bridges */
+                pci_bridge_d3_update(bridge, false);
+        }
+
+        pci_dev_put(bridge);
+}
+
+/**
+ * pci_bridge_d3_device_changed - Update bridge D3 capabilities on change
+ * @dev: PCI device that was changed
+ *
+ * If a device is added or its PM configuration, such as is it allowed to
+ * enter D3cold, is changed this function updates upstream bridge PM
+ * capabilities accordingly.
+ */
+void pci_bridge_d3_device_changed(struct pci_dev *dev)
+{
+        pci_bridge_d3_update(dev, false);
+}
+
+/**
+ * pci_bridge_d3_device_removed - Update bridge D3 capabilities on remove
+ * @dev: PCI device being removed
+ *
+ * Function updates upstream bridge PM capabilities based on other devices
+ * still left on the bus.
+ */
+void pci_bridge_d3_device_removed(struct pci_dev *dev)
+{
+        pci_bridge_d3_update(dev, true);
+}
+
+/**
+ * pci_d3cold_enable - Enable D3cold for device
+ * @dev: PCI device to handle
+ *
+ * This function can be used in drivers to enable D3cold from the device
+ * they handle.  It also updates upstream PCI bridge PM capabilities
+ * accordingly.
+ */
+void pci_d3cold_enable(struct pci_dev *dev)
+{
+        if (dev->no_d3cold) {
+                dev->no_d3cold = false;
+                pci_bridge_d3_device_changed(dev);
+        }
+}
+EXPORT_SYMBOL_GPL(pci_d3cold_enable);
+
+/**
+ * pci_d3cold_disable - Disable D3cold for device
+ * @dev: PCI device to handle
+ *
+ * This function can be used in drivers to disable D3cold from the device
+ * they handle.  It also updates upstream PCI bridge PM capabilities
+ * accordingly.
+ */
+void pci_d3cold_disable(struct pci_dev *dev)
+{
+        if (!dev->no_d3cold) {
+                dev->no_d3cold = true;
+                pci_bridge_d3_device_changed(dev);
+        }
+}
+EXPORT_SYMBOL_GPL(pci_d3cold_disable);
+
+/**
  * pci_pm_init - Initialize PM functions of given PCI device
  * @dev: PCI device to handle.
  */
@@ -2189,6 +2369,7 @@ void pci_pm_init(struct pci_dev *dev)
         dev->pm_cap = pm;
         dev->d3_delay = PCI_PM_D3_WAIT;
         dev->d3cold_delay = PCI_PM_D3COLD_WAIT;
+        dev->bridge_d3 = pci_bridge_d3_possible(dev);
         dev->d3cold_allowed = true;
 
         dev->d1_support = false;
@@ -3165,6 +3346,23 @@ int __weak pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr)
 #endif
 }
 
+/**
+ *      pci_unmap_iospace - Unmap the memory mapped I/O space
+ *      @res: resource to be unmapped
+ *
+ *      Unmap the CPU virtual address @res from virtual address space.
+ *      Only architectures that have memory mapped IO functions defined
+ *      (and the PCI_IOBASE value defined) should call this function.
+ */
+void pci_unmap_iospace(struct resource *res)
+{
+#if defined(PCI_IOBASE) && defined(CONFIG_MMU)
+        unsigned long vaddr = (unsigned long)PCI_IOBASE + res->start;
+
+        unmap_kernel_range(vaddr, resource_size(res));
+#endif
+}
+
 static void __pci_set_master(struct pci_dev *dev, bool enable)
 {
         u16 old_cmd, cmd;
@@ -4755,6 +4953,7 @@ static DEFINE_SPINLOCK(resource_alignment_lock);
 static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
 {
         int seg, bus, slot, func, align_order, count;
+        unsigned short vendor, device, subsystem_vendor, subsystem_device;
         resource_size_t align = 0;
         char *p;
 
@@ -4768,28 +4967,55 @@ static resource_size_t pci_specified_resource_alignment(struct pci_dev *dev)
                 } else {
                         align_order = -1;
                 }
-                if (sscanf(p, "%x:%x:%x.%x%n",
-                        &seg, &bus, &slot, &func, &count) != 4) {
-                        seg = 0;
-                        if (sscanf(p, "%x:%x.%x%n",
-                                        &bus, &slot, &func, &count) != 3) {
-                                /* Invalid format */
-                                printk(KERN_ERR "PCI: Can't parse resource_alignment parameter: %s\n",
-                                        p);
+                if (strncmp(p, "pci:", 4) == 0) {
+                        /* PCI vendor/device (subvendor/subdevice) ids are specified */
+                        p += 4;
+                        if (sscanf(p, "%hx:%hx:%hx:%hx%n",
+                                &vendor, &device, &subsystem_vendor, &subsystem_device, &count) != 4) {
+                                if (sscanf(p, "%hx:%hx%n", &vendor, &device, &count) != 2) {
+                                        printk(KERN_ERR "PCI: Can't parse resource_alignment parameter: pci:%s\n",
+                                                p);
+                                        break;
+                                }
+                                subsystem_vendor = subsystem_device = 0;
+                        }
+                        p += count;
+                        if ((!vendor || (vendor == dev->vendor)) &&
+                                (!device || (device == dev->device)) &&
+                                (!subsystem_vendor || (subsystem_vendor == dev->subsystem_vendor)) &&
+                                (!subsystem_device || (subsystem_device == dev->subsystem_device))) {
+                                if (align_order == -1)
+                                        align = PAGE_SIZE;
+                                else
+                                        align = 1 << align_order;
+                                /* Found */
                                 break;
                         }
                 }
-                p += count;
-                if (seg == pci_domain_nr(dev->bus) &&
-                        bus == dev->bus->number &&
-                        slot == PCI_SLOT(dev->devfn) &&
-                        func == PCI_FUNC(dev->devfn)) {
-                        if (align_order == -1)
-                                align = PAGE_SIZE;
-                        else
-                                align = 1 << align_order;
-                        /* Found */
-                        break;
+                else {
+                        if (sscanf(p, "%x:%x:%x.%x%n",
+                                &seg, &bus, &slot, &func, &count) != 4) {
+                                seg = 0;
+                                if (sscanf(p, "%x:%x.%x%n",
+                                                &bus, &slot, &func, &count) != 3) {
+                                        /* Invalid format */
+                                        printk(KERN_ERR "PCI: Can't parse resource_alignment parameter: %s\n",
+                                                p);
+                                        break;
+                                }
+                        }
+                        p += count;
+                        if (seg == pci_domain_nr(dev->bus) &&
+                                bus == dev->bus->number &&
+                                slot == PCI_SLOT(dev->devfn) &&
+                                func == PCI_FUNC(dev->devfn)) {
+                                if (align_order == -1)
+                                        align = PAGE_SIZE;
+                                else
+                                        align = 1 << align_order;
+                                /* Found */
+                                break;
+                        }
                 }
                 if (*p != ';' && *p != ',') {
                         /* End of param or invalid format */
@@ -4897,7 +5123,7 @@ static ssize_t pci_resource_alignment_store(struct bus_type *bus,
         return pci_set_resource_alignment_param(buf, count);
 }
 
-BUS_ATTR(resource_alignment, 0644, pci_resource_alignment_show,
+static BUS_ATTR(resource_alignment, 0644, pci_resource_alignment_show,
                                         pci_resource_alignment_store);
 
 static int __init pci_resource_alignment_sysfs_init(void)
@@ -4923,7 +5149,7 @@ int pci_get_new_domain_nr(void)
 }
 
 #ifdef CONFIG_PCI_DOMAINS_GENERIC
-void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
+static int of_pci_bus_find_domain_nr(struct device *parent)
 {
         static int use_dt_domains = -1;
         int domain = -1;
@@ -4967,7 +5193,13 @@ void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent)
                 domain = -1;
         }
 
-        bus->domain_nr = domain;
+        return domain;
+}
+
+int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent)
+{
+        return acpi_disabled ? of_pci_bus_find_domain_nr(parent) :
+                               acpi_pci_bus_find_domain_nr(bus);
 }
 #endif
 #endif
@@ -5021,6 +5253,11 @@ static int __init pci_setup(char *str)
                                 pci_hotplug_io_size = memparse(str + 9, &str);
                         } else if (!strncmp(str, "hpmemsize=", 10)) {
                                 pci_hotplug_mem_size = memparse(str + 10, &str);
+                        } else if (!strncmp(str, "hpbussize=", 10)) {
+                                pci_hotplug_bus_size =
+                                        simple_strtoul(str + 10, &str, 0);
+                                if (pci_hotplug_bus_size > 0xff)
+                                        pci_hotplug_bus_size = DEFAULT_HOTPLUG_BUS_SIZE;
                         } else if (!strncmp(str, "pcie_bus_tune_off", 17)) {
                                 pcie_bus_config = PCIE_BUS_TUNE_OFF;
                         } else if (!strncmp(str, "pcie_bus_safe", 13)) {
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h
index a814bbb80fcb..9730c474b016 100644
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@ -82,6 +82,8 @@ void pci_pm_init(struct pci_dev *dev);
 void pci_ea_init(struct pci_dev *dev);
 void pci_allocate_cap_save_buffers(struct pci_dev *dev);
 void pci_free_cap_save_buffers(struct pci_dev *dev);
+void pci_bridge_d3_device_changed(struct pci_dev *dev);
+void pci_bridge_d3_device_removed(struct pci_dev *dev);
 
 static inline void pci_wakeup_event(struct pci_dev *dev)
 {
@@ -94,6 +96,15 @@ static inline bool pci_has_subordinate(struct pci_dev *pci_dev)
         return !!(pci_dev->subordinate);
 }
 
+static inline bool pci_power_manageable(struct pci_dev *pci_dev)
+{
+        /*
+         * Currently we allow normal PCI devices and PCI bridges transition
+         * into D3 if their bridge_d3 is set.
+         */
+        return !pci_has_subordinate(pci_dev) || pci_dev->bridge_d3;
+}
+
 struct pci_vpd_ops {
         ssize_t (*read)(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
         ssize_t (*write)(struct pci_dev *dev, loff_t pos, size_t count, const void *buf);
diff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig
index 22ca6412bd15..7fcea75afa4c 100644
--- a/drivers/pci/pcie/Kconfig
+++ b/drivers/pci/pcie/Kconfig
@@ -83,7 +83,7 @@ config PCIE_PME
         depends on PCIEPORTBUS && PM
 
 config PCIE_DPC
-        tristate "PCIe Downstream Port Containment support"
+        bool "PCIe Downstream Port Containment support"
         depends on PCIEPORTBUS
         default n
         help
@@ -92,6 +92,3 @@ config PCIE_DPC
           will be handled by the DPC driver.  If your system doesn't
           have this capability or you do not want to use this feature,
           it is safe to answer N.
-
-          To compile this driver as a module, choose M here: the module
-          will be called pcie-dpc.
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c
index 2dfe7fdb77e7..0ec649d961d7 100644
--- a/drivers/pci/pcie/aspm.c
+++ b/drivers/pci/pcie/aspm.c
@@ -139,7 +139,7 @@ static void pcie_set_clkpm_nocheck(struct pcie_link_state *link, int enable)
 static void pcie_set_clkpm(struct pcie_link_state *link, int enable)
 {
         /* Don't enable Clock PM if the link is not Clock PM capable */
-        if (!link->clkpm_capable && enable)
+        if (!link->clkpm_capable)
                 enable = 0;
         /* Need nothing if the specified equals to current state */
         if (link->clkpm_enabled == enable)
diff --git a/drivers/pci/pcie/pcie-dpc.c b/drivers/pci/pcie/pcie-dpc.c
index ab552f1bc08f..250f87861786 100644
--- a/drivers/pci/pcie/pcie-dpc.c
+++ b/drivers/pci/pcie/pcie-dpc.c
@@ -15,8 +15,8 @@
 
 struct dpc_dev {
         struct pcie_device      *dev;
-        struct work_struct      work;
-        int                     cap_pos;
+        struct work_struct      work;
+        int                     cap_pos;
 };
 
 static void dpc_wait_link_inactive(struct pci_dev *pdev)
@@ -89,7 +89,7 @@ static int dpc_probe(struct pcie_device *dev)
         int status;
         u16 ctl, cap;
 
-        dpc = kzalloc(sizeof(*dpc), GFP_KERNEL);
+        dpc = devm_kzalloc(&dev->device, sizeof(*dpc), GFP_KERNEL);
         if (!dpc)
                 return -ENOMEM;
 
@@ -98,11 +98,12 @@ static int dpc_probe(struct pcie_device *dev)
         INIT_WORK(&dpc->work, interrupt_event_handler);
         set_service_data(dev, dpc);
 
-        status = request_irq(dev->irq, dpc_irq, IRQF_SHARED, "pcie-dpc", dpc);
+        status = devm_request_irq(&dev->device, dev->irq, dpc_irq, IRQF_SHARED,
+                                  "pcie-dpc", dpc);
         if (status) {
                 dev_warn(&dev->device, "request IRQ%d failed: %d\n", dev->irq,
                          status);
-                goto out;
+                return status;
         }
 
         pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CAP, &cap);
@@ -117,9 +118,6 @@ static int dpc_probe(struct pcie_device *dev)
                 FLAG(cap, PCI_EXP_DPC_CAP_SW_TRIGGER), (cap >> 8) & 0xf,
                 FLAG(cap, PCI_EXP_DPC_CAP_DL_ACTIVE));
         return status;
- out:
-        kfree(dpc);
-        return status;
 }
 
 static void dpc_remove(struct pcie_device *dev)
@@ -131,14 +129,11 @@ static void dpc_remove(struct pcie_device *dev)
         pci_read_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, &ctl);
         ctl &= ~(PCI_EXP_DPC_CTL_EN_NONFATAL | PCI_EXP_DPC_CTL_INT_EN);
         pci_write_config_word(pdev, dpc->cap_pos + PCI_EXP_DPC_CTL, ctl);
-
-        free_irq(dev->irq, dpc);
-        kfree(dpc);
 }
 
 static struct pcie_port_service_driver dpcdriver = {
         .name           = "dpc",
-        .port_type      = PCI_EXP_TYPE_ROOT_PORT | PCI_EXP_TYPE_DOWNSTREAM,
+        .port_type      = PCIE_ANY_PORT,
         .service        = PCIE_PORT_SERVICE_DPC,
         .probe          = dpc_probe,
         .remove         = dpc_remove,
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 32d4d0a3d20e..e9270b4026f3 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -11,6 +11,7 @@
 #include <linux/kernel.h>
 #include <linux/errno.h>
 #include <linux/pm.h>
+#include <linux/pm_runtime.h>
 #include <linux/string.h>
 #include <linux/slab.h>
 #include <linux/pcieport_if.h>
@@ -342,6 +343,8 @@ static int pcie_device_init(struct pci_dev *pdev, int service, int irq)
                 return retval;
         }
 
+        pm_runtime_no_callbacks(device);
+
         return 0;
 }
 
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c
index be35da2e105e..70d7ad8c6d17 100644
--- a/drivers/pci/pcie/portdrv_pci.c
+++ b/drivers/pci/pcie/portdrv_pci.c
@@ -93,6 +93,26 @@ static int pcie_port_resume_noirq(struct device *dev)
         return 0;
 }
 
+static int pcie_port_runtime_suspend(struct device *dev)
+{
+        return to_pci_dev(dev)->bridge_d3 ? 0 : -EBUSY;
+}
+
+static int pcie_port_runtime_resume(struct device *dev)
+{
+        return 0;
+}
+
+static int pcie_port_runtime_idle(struct device *dev)
+{
+        /*
+         * Assume the PCI core has set bridge_d3 whenever it thinks the port
+         * should be good to go to D3.  Everything else, including moving
+         * the port to D3, is handled by the PCI core.
+         */
+        return to_pci_dev(dev)->bridge_d3 ? 0 : -EBUSY;
+}
+
 static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .suspend        = pcie_port_device_suspend,
         .resume         = pcie_port_device_resume,
@@ -101,6 +121,9 @@ static const struct dev_pm_ops pcie_portdrv_pm_ops = {
         .poweroff       = pcie_port_device_suspend,
         .restore        = pcie_port_device_resume,
         .resume_noirq   = pcie_port_resume_noirq,
+        .runtime_suspend = pcie_port_runtime_suspend,
+        .runtime_resume = pcie_port_runtime_resume,
+        .runtime_idle   = pcie_port_runtime_idle,
 };
 
 #define PCIE_PORTDRV_PM_OPS     (&pcie_portdrv_pm_ops)
@@ -134,16 +157,39 @@ static int pcie_portdrv_probe(struct pci_dev *dev,
                 return status;
 
         pci_save_state(dev);
+
         /*
-         * D3cold may not work properly on some PCIe port, so disable
-         * it by default.
+         * Prevent runtime PM if the port is advertising support for PCIe
+         * hotplug.  Otherwise the BIOS hotplug SMI code might not be able
+         * to enumerate devices behind this port properly (the port is
+         * powered down preventing all config space accesses to the
+         * subordinate devices).  We can't be sure for native PCIe hotplug
+         * either so prevent that as well.
          */
-        dev->d3cold_allowed = false;
+        if (!dev->is_hotplug_bridge) {
+                /*
+                 * Keep the port resumed 100ms to make sure things like
+                 * config space accesses from userspace (lspci) will not
+                 * cause the port to repeatedly suspend and resume.
+                 */
+                pm_runtime_set_autosuspend_delay(&dev->dev, 100);
+                pm_runtime_use_autosuspend(&dev->dev);
+                pm_runtime_mark_last_busy(&dev->dev);
+                pm_runtime_put_autosuspend(&dev->dev);
+                pm_runtime_allow(&dev->dev);
+        }
+
         return 0;
 }
 
 static void pcie_portdrv_remove(struct pci_dev *dev)
 {
+        if (!dev->is_hotplug_bridge) {
+                pm_runtime_forbid(&dev->dev);
+                pm_runtime_get_noresume(&dev->dev);
+                pm_runtime_dont_use_autosuspend(&dev->dev);
+        }
+
         pcie_port_device_remove(dev);
 }
 
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 8e3ef720997d..93f280df3428 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -16,6 +16,7 @@
 #include <linux/aer.h>
 #include <linux/acpi.h>
 #include <linux/irqdomain.h>
+#include <linux/pm_runtime.h>
 #include "pci.h"
 
 #define CARDBUS_LATENCY_TIMER   176     /* secondary latency timer */
@@ -832,6 +833,12 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
         u8 primary, secondary, subordinate;
         int broken = 0;
 
+        /*
+         * Make sure the bridge is powered on to be able to access config
+         * space of devices below it.
+         */
+        pm_runtime_get_sync(&dev->dev);
+
         pci_read_config_dword(dev, PCI_PRIMARY_BUS, &buses);
         primary = buses & 0xFF;
         secondary = (buses >> 8) & 0xFF;
@@ -1012,6 +1019,8 @@ int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
 out:
         pci_write_config_word(dev, PCI_BRIDGE_CONTROL, bctl);
 
+        pm_runtime_put(&dev->dev);
+
         return max;
 }
 EXPORT_SYMBOL(pci_scan_bridge);
@@ -2077,6 +2086,15 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
                 }
 
         /*
+         * Make sure a hotplug bridge has at least the minimum requested
+         * number of buses.
+         */
+        if (bus->self && bus->self->is_hotplug_bridge && pci_hotplug_bus_size) {
+                if (max - bus->busn_res.start < pci_hotplug_bus_size - 1)
+                        max = bus->busn_res.start + pci_hotplug_bus_size - 1;
+        }
+
+        /*
          * We've scanned the bus and so we know all about what's on
          * the other side of any bridges that may be on this bus plus
          * any devices.
@@ -2127,7 +2145,9 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
         b->sysdata = sysdata;
         b->ops = ops;
         b->number = b->busn_res.start = bus;
-        pci_bus_assign_domain_nr(b, parent);
+#ifdef CONFIG_PCI_DOMAINS_GENERIC
+        b->domain_nr = pci_bus_find_domain_nr(b, parent);
+#endif
         b2 = pci_find_bus(pci_domain_nr(b), bus);
         if (b2) {
                 /* If we already got to this bus through a different bridge, ignore it */
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c
index 3f155e78513f..2408abe4ee8c 100644
--- a/drivers/pci/proc.c
+++ b/drivers/pci/proc.c
@@ -231,7 +231,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
 {
         struct pci_dev *dev = PDE_DATA(file_inode(file));
         struct pci_filp_private *fpriv = file->private_data;
-        int i, ret;
+        int i, ret, write_combine;
 
         if (!capable(CAP_SYS_RAWIO))
                 return -EPERM;
@@ -245,9 +245,12 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
         if (i >= PCI_ROM_RESOURCE)
                 return -ENODEV;
 
+        if (fpriv->mmap_state == pci_mmap_mem)
+                write_combine = fpriv->write_combine;
+        else
+                write_combine = 0;
         ret = pci_mmap_page_range(dev, vma,
-                                  fpriv->mmap_state,
-                                  fpriv->write_combine);
+                                  fpriv->mmap_state, write_combine);
         if (ret < 0)
                 return ret;
 
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c
index ee72ebe18f4b..37ff0158e45f 100644
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -3189,13 +3189,15 @@ static void quirk_no_bus_reset(struct pci_dev *dev)
 }
 
 /*
- * Atheros AR93xx chips do not behave after a bus reset.  The device will
- * throw a Link Down error on AER-capable systems and regardless of AER,
- * config space of the device is never accessible again and typically
- * causes the system to hang or reset when access is attempted.
+ * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset.
+ * The device will throw a Link Down error on AER-capable systems and
+ * regardless of AER, config space of the device is never accessible again
+ * and typically causes the system to hang or reset when access is attempted.
  * http://www.spinics.net/lists/linux-pci/msg34797.html
  */
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0030, quirk_no_bus_reset);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x0032, quirk_no_bus_reset);
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_ATHEROS, 0x003c, quirk_no_bus_reset);
 
 static void quirk_no_pm_reset(struct pci_dev *dev)
 {
@@ -3711,6 +3713,9 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9172,
 /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c59 */
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x917a,
                          quirk_dma_func1_alias);
+/* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c78 */
+DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x9182,
+                         quirk_dma_func1_alias);
 /* https://bugzilla.kernel.org/show_bug.cgi?id=42679#c46 */
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MARVELL_EXT, 0x91a0,
                          quirk_dma_func1_alias);
@@ -3747,6 +3752,9 @@ static const struct pci_device_id fixed_dma_alias_tbl[] = {
         { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x0285,
                          PCI_VENDOR_ID_ADAPTEC2, 0x02bb), /* Adaptec 3405 */
           .driver_data = PCI_DEVFN(1, 0) },
+        { PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x0285,
+                         PCI_VENDOR_ID_ADAPTEC2, 0x02bc), /* Adaptec 3805 */
+          .driver_data = PCI_DEVFN(1, 0) },
         { 0 }
 };
 
@@ -4087,6 +4095,7 @@ static const struct pci_dev_acs_enabled {
         { PCI_VENDOR_ID_AMD, 0x7809, pci_quirk_amd_sb_acs },
         { PCI_VENDOR_ID_SOLARFLARE, 0x0903, pci_quirk_mf_endpoint_acs },
         { PCI_VENDOR_ID_SOLARFLARE, 0x0923, pci_quirk_mf_endpoint_acs },
+        { PCI_VENDOR_ID_SOLARFLARE, 0x0A03, pci_quirk_mf_endpoint_acs },
         { PCI_VENDOR_ID_INTEL, 0x10C6, pci_quirk_mf_endpoint_acs },
         { PCI_VENDOR_ID_INTEL, 0x10DB, pci_quirk_mf_endpoint_acs },
         { PCI_VENDOR_ID_INTEL, 0x10DD, pci_quirk_mf_endpoint_acs },
diff --git a/drivers/pci/remove.c b/drivers/pci/remove.c
index 8982026637d5..d1ef7acf6930 100644
--- a/drivers/pci/remove.c
+++ b/drivers/pci/remove.c
@@ -96,6 +96,8 @@ static void pci_remove_bus_device(struct pci_dev *dev)
                 dev->subordinate = NULL;
         }
 
+        pci_bridge_d3_device_removed(dev);
+
         pci_destroy_dev(dev);
 }
 
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 55641a39a3e9..1d1a2c952c35 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1423,6 +1423,74 @@ void pci_bus_assign_resources(const struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pci_bus_assign_resources);
 
+static void pci_claim_device_resources(struct pci_dev *dev)
+{
+        int i;
+
+        for (i = 0; i < PCI_BRIDGE_RESOURCES; i++) {
+                struct resource *r = &dev->resource[i];
+
+                if (!r->flags || r->parent)
+                        continue;
+
+                pci_claim_resource(dev, i);
+        }
+}
+
+static void pci_claim_bridge_resources(struct pci_dev *dev)
+{
+        int i;
+
+        for (i = PCI_BRIDGE_RESOURCES; i < PCI_NUM_RESOURCES; i++) {
+                struct resource *r = &dev->resource[i];
+
+                if (!r->flags || r->parent)
+                        continue;
+
+                pci_claim_bridge_resource(dev, i);
+        }
+}
+
+static void pci_bus_allocate_dev_resources(struct pci_bus *b)
+{
+        struct pci_dev *dev;
+        struct pci_bus *child;
+
+        list_for_each_entry(dev, &b->devices, bus_list) {
+                pci_claim_device_resources(dev);
+
+                child = dev->subordinate;
+                if (child)
+                        pci_bus_allocate_dev_resources(child);
+        }
+}
+
+static void pci_bus_allocate_resources(struct pci_bus *b)
+{
+        struct pci_bus *child;
+
+        /*
+         * Carry out a depth-first search on the PCI bus
+         * tree to allocate bridge apertures. Read the
+         * programmed bridge bases and recursively claim
+         * the respective bridge resources.
+         */
+        if (b->self) {
+                pci_read_bridge_bases(b);
+                pci_claim_bridge_resources(b->self);
+        }
+
+        list_for_each_entry(child, &b->children, node)
+                pci_bus_allocate_resources(child);
+}
+
+void pci_bus_claim_resources(struct pci_bus *b)
+{
+        pci_bus_allocate_resources(b);
+        pci_bus_allocate_dev_resources(b);
+}
+EXPORT_SYMBOL(pci_bus_claim_resources);
+
 static void __pci_bridge_assign_resources(const struct pci_dev *bridge,
                                           struct list_head *add_head,
                                           struct list_head *fail_head)
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c
index b43f7ac9812c..3a0f3a4ee944 100644
--- a/drivers/scsi/lpfc/lpfc_init.c
+++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -4775,20 +4775,17 @@ static int
 lpfc_enable_pci_dev(struct lpfc_hba *phba)
 {
         struct pci_dev *pdev;
-        int bars = 0;
 
         /* Obtain PCI device reference */
         if (!phba->pcidev)
                 goto out_error;
         else
                 pdev = phba->pcidev;
-        /* Select PCI BARs */
-        bars = pci_select_bars(pdev, IORESOURCE_MEM);
         /* Enable PCI device */
         if (pci_enable_device_mem(pdev))
                 goto out_error;
         /* Request PCI resource for the device */
-        if (pci_request_selected_regions(pdev, bars, LPFC_DRIVER_NAME))
+        if (pci_request_mem_regions(pdev, LPFC_DRIVER_NAME))
                 goto out_disable_device;
         /* Set up device as PCI master and save state for EEH */
         pci_set_master(pdev);
@@ -4805,7 +4802,7 @@ out_disable_device:
         pci_disable_device(pdev);
 out_error:
         lpfc_printf_log(phba, KERN_ERR, LOG_INIT,
-                        "1401 Failed to enable pci device, bars:x%x\n", bars);
+                        "1401 Failed to enable pci device\n");
         return -ENODEV;
 }
 
@@ -4820,17 +4817,14 @@ static void
 lpfc_disable_pci_dev(struct lpfc_hba *phba)
 {
         struct pci_dev *pdev;
-        int bars;
 
         /* Obtain PCI device reference */
         if (!phba->pcidev)
                 return;
         else
                 pdev = phba->pcidev;
-        /* Select PCI BARs */
-        bars = pci_select_bars(pdev, IORESOURCE_MEM);
         /* Release PCI resource and disable PCI device */
-        pci_release_selected_regions(pdev, bars);
+        pci_release_mem_regions(pdev);
         pci_disable_device(pdev);
 
         return;
@@ -9722,7 +9716,6 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
         struct lpfc_vport **vports;
         struct lpfc_hba   *phba = vport->phba;
         int i;
-        int bars = pci_select_bars(pdev, IORESOURCE_MEM);
 
         spin_lock_irq(&phba->hbalock);
         vport->load_flag |= FC_UNLOADING;
@@ -9797,7 +9790,7 @@ lpfc_pci_remove_one_s3(struct pci_dev *pdev)
 
         lpfc_hba_free(phba);
 
-        pci_release_selected_regions(pdev, bars);
+        pci_release_mem_regions(pdev);
         pci_disable_device(pdev);
 }
 
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index 48672fac7ff3..ac352fe391f4 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -382,7 +382,7 @@ static int xhci_pci_suspend(struct usb_hcd *hcd, bool do_wakeup)
          * need to have the registers polled during D3, so avoid D3cold.
          */
         if (xhci->quirks & XHCI_COMP_MODE_QUIRK)
-                pdev->no_d3cold = true;
+                pci_d3cold_disable(pdev);
 
         if (xhci->quirks & XHCI_PME_STUCK_QUIRK)
                 xhci_pme_quirk(hcd);
diff --git a/include/linux/pci-acpi.h b/include/linux/pci-acpi.h
index 89ab0572dbc6..7d63a66e8ed4 100644
--- a/include/linux/pci-acpi.h
+++ b/include/linux/pci-acpi.h
@@ -24,6 +24,8 @@ static inline acpi_status pci_acpi_remove_pm_notifier(struct acpi_device *dev)
 }
 extern phys_addr_t acpi_pci_root_get_mcfg_addr(acpi_handle handle);
 
+extern phys_addr_t pci_mcfg_lookup(u16 domain, struct resource *bus_res);
+
 static inline acpi_handle acpi_find_root_bridge_handle(struct pci_dev *pdev)
 {
         struct pci_bus *pbus = pdev->bus;
diff --git a/drivers/pci/ecam.h b/include/linux/pci-ecam.h
index 9878bebd45bb..7adad206b1f4 100644
--- a/drivers/pci/ecam.h
+++ b/include/linux/pci-ecam.h
@@ -27,8 +27,7 @@ struct pci_config_window;
 struct pci_ecam_ops {
         unsigned int                    bus_shift;
         struct pci_ops                  pci_ops;
-        int                             (*init)(struct device *,
-                                                struct pci_config_window *);
+        int                             (*init)(struct pci_config_window *);
 };
 
 /*
@@ -45,6 +44,7 @@ struct pci_config_window {
                 void __iomem            *win;   /* 64-bit single mapping */
                 void __iomem            **winp; /* 32-bit per-bus mapping */
         };
+        struct device                   *parent;/* ECAM res was from this dev */
 };
 
 /* create and free pci_config_window */
diff --git a/include/linux/pci.h b/include/linux/pci.h
index b67e4df20801..1fed5927b08a 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -101,6 +101,10 @@ enum {
         DEVICE_COUNT_RESOURCE = PCI_NUM_RESOURCES,
 };
 
+/*
+ * pci_power_t values must match the bits in the Capabilities PME_Support
+ * and Control/Status PowerState fields in the Power Management capability.
+ */
 typedef int __bitwise pci_power_t;
 
 #define PCI_D0          ((pci_power_t __force) 0)
@@ -116,7 +120,7 @@ extern const char *pci_power_names[];
 
 static inline const char *pci_power_name(pci_power_t state)
 {
-        return pci_power_names[1 + (int) state];
+        return pci_power_names[1 + (__force int) state];
 }
 
 #define PCI_PM_D2_DELAY         200
@@ -294,6 +298,7 @@ struct pci_dev {
         unsigned int    d2_support:1;   /* Low power state D2 is supported */
         unsigned int    no_d1d2:1;      /* D1 and D2 are forbidden */
         unsigned int    no_d3cold:1;    /* D3cold is forbidden */
+        unsigned int    bridge_d3:1;    /* Allow D3 for bridge */
         unsigned int    d3cold_allowed:1;       /* D3cold is allowed by user */
         unsigned int    mmio_always_on:1;       /* disallow turning off io/mem
                                                    decoding during bar sizing */
@@ -1083,6 +1088,8 @@ int pci_back_from_sleep(struct pci_dev *dev);
 bool pci_dev_run_wake(struct pci_dev *dev);
 bool pci_check_pme_status(struct pci_dev *dev);
 void pci_pme_wakeup_bus(struct pci_bus *bus);
+void pci_d3cold_enable(struct pci_dev *dev);
+void pci_d3cold_disable(struct pci_dev *dev);
 
 static inline int pci_enable_wake(struct pci_dev *dev, pci_power_t state,
                                   bool enable)
@@ -1114,6 +1121,7 @@ int pci_set_vpd_size(struct pci_dev *dev, size_t len);
 /* Helper functions for low-level code (drivers/pci/setup-[bus,res].c) */
 resource_size_t pcibios_retrieve_fw_addr(struct pci_dev *dev, int idx);
 void pci_bus_assign_resources(const struct pci_bus *bus);
+void pci_bus_claim_resources(struct pci_bus *bus);
 void pci_bus_size_bridges(struct pci_bus *bus);
 int pci_claim_resource(struct pci_dev *, int);
 int pci_claim_bridge_resource(struct pci_dev *bridge, int i);
@@ -1143,9 +1151,12 @@ void pci_add_resource(struct list_head *resources, struct resource *res);
 void pci_add_resource_offset(struct list_head *resources, struct resource *res,
                              resource_size_t offset);
 void pci_free_resource_list(struct list_head *resources);
-void pci_bus_add_resource(struct pci_bus *bus, struct resource *res, unsigned int flags);
+void pci_bus_add_resource(struct pci_bus *bus, struct resource *res,
+                          unsigned int flags);
 struct resource *pci_bus_resource_n(const struct pci_bus *bus, int n);
 void pci_bus_remove_resources(struct pci_bus *bus);
+int devm_request_pci_bus_resources(struct device *dev,
+                                   struct list_head *resources);
 
 #define pci_bus_for_each_resource(bus, res, i)                          \
         for (i = 0;                                                     \
@@ -1167,6 +1178,7 @@ int pci_register_io_range(phys_addr_t addr, resource_size_t size);
 unsigned long pci_address_to_pio(phys_addr_t addr);
 phys_addr_t pci_pio_to_address(unsigned long pio);
 int pci_remap_iospace(const struct resource *res, phys_addr_t phys_addr);
+void pci_unmap_iospace(struct resource *res);
 
 static inline pci_bus_addr_t pci_bus_address(struct pci_dev *pdev, int bar)
 {
@@ -1389,12 +1401,13 @@ static inline int pci_domain_nr(struct pci_bus *bus)
 {
         return bus->domain_nr;
 }
-void pci_bus_assign_domain_nr(struct pci_bus *bus, struct device *parent);
+#ifdef CONFIG_ACPI
+int acpi_pci_bus_find_domain_nr(struct pci_bus *bus);
 #else
-static inline void pci_bus_assign_domain_nr(struct pci_bus *bus,
-                                        struct device *parent)
-{
-}
+static inline int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
+{ return 0; }
+#endif
+int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent);
 #endif
 
 /* some architectures require additional setup to direct VGA traffic */
@@ -1402,6 +1415,34 @@ typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
                       unsigned int command_bits, u32 flags);
 void pci_register_set_vga_state(arch_set_vga_state_t func);
 
+static inline int
+pci_request_io_regions(struct pci_dev *pdev, const char *name)
+{
+        return pci_request_selected_regions(pdev,
+                            pci_select_bars(pdev, IORESOURCE_IO), name);
+}
+
+static inline void
+pci_release_io_regions(struct pci_dev *pdev)
+{
+        return pci_release_selected_regions(pdev,
+                            pci_select_bars(pdev, IORESOURCE_IO));
+}
+
+static inline int
+pci_request_mem_regions(struct pci_dev *pdev, const char *name)
+{
+        return pci_request_selected_regions(pdev,
+                            pci_select_bars(pdev, IORESOURCE_MEM), name);
+}
+
+static inline void
+pci_release_mem_regions(struct pci_dev *pdev)
+{
+        return pci_release_selected_regions(pdev,
+                            pci_select_bars(pdev, IORESOURCE_MEM));
+}
+
 #else /* CONFIG_PCI is not enabled */
 
 static inline void pci_set_flags(int flags) { }
@@ -1554,7 +1595,11 @@ static inline const char *pci_name(const struct pci_dev *pdev)
 /* Some archs don't want to expose struct resource to userland as-is
  * in sysfs and /proc
  */
-#ifndef HAVE_ARCH_PCI_RESOURCE_TO_USER
+#ifdef HAVE_ARCH_PCI_RESOURCE_TO_USER
+void pci_resource_to_user(const struct pci_dev *dev, int bar,
+                          const struct resource *rsrc,
+                          resource_size_t *start, resource_size_t *end);
+#else
 static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,
                 const struct resource *rsrc, resource_size_t *start,
                 resource_size_t *end)
@@ -1706,6 +1751,7 @@ extern u8 pci_cache_line_size;
 
 extern unsigned long pci_hotplug_io_size;
 extern unsigned long pci_hotplug_mem_size;
+extern unsigned long pci_hotplug_bus_size;
 
 /* Architecture-specific versions may override these (weak) */
 void pcibios_disable_device(struct pci_dev *dev);
@@ -1722,7 +1768,7 @@ void pcibios_free_irq(struct pci_dev *dev);
 extern struct dev_pm_ops pcibios_pm_ops;
 #endif
 
-#ifdef CONFIG_PCI_MMCONFIG
+#if defined(CONFIG_PCI_MMCONFIG) || defined(CONFIG_ACPI_MCFG)
 void __init pci_mmcfg_early_init(void);
 void __init pci_mmcfg_late_init(void);
 #else