1 files changed, 43 insertions, 24 deletions

diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index acf38722457b..4f0e3ebfea4b 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -114,6 +114,19 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
         return 0;
 }
 
+static int pci_acpi_root_prepare_resources(struct acpi_pci_root_info *ci)
+{
+        struct resource_entry *entry, *tmp;
+        int status;
+
+        status = acpi_pci_probe_root_resources(ci);
+        resource_list_for_each_entry_safe(entry, tmp, &ci->resources) {
+                if (!(entry->res->flags & IORESOURCE_WINDOW))
+                        resource_list_destroy_entry(entry);
+        }
+        return status;
+}
+
 /*
  * Lookup the bus range for the domain in MCFG, and set up config space
  * mapping.
@@ -121,31 +134,33 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge)
 static struct pci_config_window *
 pci_acpi_setup_ecam_mapping(struct acpi_pci_root *root)
 {
+        struct device *dev = &root->device->dev;
         struct resource *bus_res = &root->secondary;
         u16 seg = root->segment;
-        struct pci_config_window *cfg;
+        struct pci_ecam_ops *ecam_ops;
         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);
+        struct acpi_device *adev;
+        struct pci_config_window *cfg;
+        int ret;
 
-        if (!root->mcfg_addr) {
-                dev_err(&root->device->dev, "%04x:%pR ECAM region not found\n",
-                        seg, bus_res);
+        ret = pci_mcfg_lookup(root, &cfgres, &ecam_ops);
+        if (ret) {
+                dev_err(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);
+        adev = acpi_resource_consumer(&cfgres);
+        if (adev)
+                dev_info(dev, "ECAM area %pR reserved by %s\n", &cfgres,
+                         dev_name(&adev->dev));
+        else
+                dev_warn(dev, FW_BUG "ECAM area %pR not reserved in ACPI namespace\n",
+                         &cfgres);
+
+        cfg = pci_ecam_create(dev, &cfgres, bus_res, ecam_ops);
         if (IS_ERR(cfg)) {
-                dev_err(&root->device->dev, "%04x:%pR error %ld mapping ECAM\n",
-                        seg, bus_res, PTR_ERR(cfg));
+                dev_err(dev, "%04x:%pR error %ld mapping ECAM\n", seg, bus_res,
+                        PTR_ERR(cfg));
                 return NULL;
         }
 
@@ -159,33 +174,37 @@ static void pci_acpi_generic_release_info(struct acpi_pci_root_info *ci)
 
         ri = container_of(ci, struct acpi_pci_generic_root_info, common);
         pci_ecam_free(ri->cfg);
+        kfree(ci->ops);
         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)
 {
         int node = acpi_get_node(root->device->handle);
         struct acpi_pci_generic_root_info *ri;
         struct pci_bus *bus, *child;
+        struct acpi_pci_root_ops *root_ops;
 
         ri = kzalloc_node(sizeof(*ri), GFP_KERNEL, node);
         if (!ri)
                 return NULL;
 
+        root_ops = kzalloc_node(sizeof(*root_ops), GFP_KERNEL, node);
+        if (!root_ops)
+                return NULL;
+
         ri->cfg = pci_acpi_setup_ecam_mapping(root);
         if (!ri->cfg) {
                 kfree(ri);
+                kfree(root_ops);
                 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);
+        root_ops->release_info = pci_acpi_generic_release_info;
+        root_ops->prepare_resources = pci_acpi_root_prepare_resources;
+        root_ops->pci_ops = &ri->cfg->ops->pci_ops;
+        bus = acpi_pci_root_create(root, root_ops, &ri->common, ri->cfg);
         if (!bus)
                 return NULL;