[PATCH 17/39] x86, PCI: put busn resource in pci_root_info for acpi path
From: Yinghai Lu <yinghai@kernel.org>
Date: 2012-02-29 23:14:41
Also in:
linux-pci, lkml
Subsystem:
acpi, pci subsystem, the rest, x86 architecture (32-bit and 64-bit) · Maintainers:
"Rafael J. Wysocki", Bjorn Helgaas, Linus Torvalds, Thomas Gleixner, Ingo Molnar, Borislav Petkov, Dave Hansen
will put it in resources list and pass it for create_root_bus Signed-off-by: Yinghai Lu <yinghai@kernel.org> --- arch/x86/pci/acpi.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index 2331ccb..ff5243e 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c@@ -12,7 +12,7 @@ struct pci_root_info { char name[16]; unsigned int res_num; struct resource *res; - int busnum; + struct resource busn; struct pci_sysdata sd; };
@@ -283,6 +283,9 @@ static void add_resources(struct pci_root_info *info, int i; struct resource *res, *root, *conflict; + if (info->busn.flags & IORESOURCE_BUS) + pci_add_resource(resources, &info->busn); + coalesce_windows(info, IORESOURCE_MEM); coalesce_windows(info, IORESOURCE_IO);
@@ -343,11 +346,17 @@ static void release_pci_root_info(struct pci_host_bridge *bridge) static void probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device, - int busnum, int domain) + int busnum, int busmax, int domain) { size_t size; + sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum); info->bridge = device; + info->busn.name = info->name; + info->busn.start = busnum; + info->busn.end = busmax; + info->busn.flags = IORESOURCE_BUS; + info->res_num = 0; acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_resource, info);
@@ -360,8 +369,6 @@ probe_pci_root_info(struct pci_root_info *info, struct acpi_device *device, if (!info->res) return; - sprintf(info->name, "PCI Bus %04x:%02x", domain, busnum); - acpi_walk_resources(device->handle, METHOD_NAME__CRS, setup_resource, info); }
@@ -372,6 +379,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) struct pci_root_info *info = NULL; int domain = root->segment; int busnum = root->secondary.start; + int busmax = root->secondary.end; LIST_HEAD(resources); struct pci_bus *bus; struct pci_sysdata *sd;
@@ -424,7 +432,7 @@ struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) memcpy(bus->sysdata, sd, sizeof(*sd)); kfree(info); } else { - probe_pci_root_info(info, device, busnum, domain); + probe_pci_root_info(info, device, busnum, busmax, domain); /* * _CRS with no apertures is normal, so only fall back to
--
1.7.7