lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ia64/PCI: convert to pci_create_root_bus() for correct root bus resources

Browse Source 
Convert from pci_create_bus() to pci_create_root_bus().  This way the root
bus resources are correct immediately.  This fixes the problem of "early"
and "header" quirks seeing incorrect root bus resources.

We can't use pci_scan_root_bus() because, like x86, ACPI hotplug currently
requires pci_bus_add_devices() in a separate host bridge .start() method.

v2: fix compile error by using window resource pointer instead

CC: Tony Luck <tony.luck@intel.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas
2011-10-28 16:26:31 -06:00
committed by Jesse Barnes
parent 79e77f27f5
commit e30f99222f
1 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
arch/ia64/pci/pci.c
View File

@@ -134,6 +134,7 @@ alloc_pci_controller (int seg)
struct pci_root_info { struct pci_root_info {
struct acpi_device *bridge; struct acpi_device *bridge;
struct pci_controller *controller; struct pci_controller *controller;
struct list_head resources;
char *name; char *name;
}; };
@@ -315,24 +316,13 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
&window->resource); &window->resource);
} }
return AE_OK;
}
static void __devinit
pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
{
int i;
pci_bus_remove_resources(bus);
for (i = 0; i < ctrl->windows; i++) {
struct resource *res = &ctrl->window[i].resource;
/* HP's firmware has a hack to work around a Windows bug. /* HP's firmware has a hack to work around a Windows bug.
* Ignore these tiny memory ranges */ * Ignore these tiny memory ranges */
if ((res->flags & IORESOURCE_MEM) && if (!((window->resource.flags & IORESOURCE_MEM) &&
(res->end - res->start < 16)) (window->resource.end - window->resource.start < 16)))
continue; pci_add_resource(&info->resources, &window->resource);
pci_bus_add_resource(bus, res, 0);
} return AE_OK;
} }
struct pci_bus * __devinit struct pci_bus * __devinit
@@ -343,6 +333,7 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
int bus = root->secondary.start; int bus = root->secondary.start;
struct pci_controller *controller; struct pci_controller *controller;
unsigned int windows = 0; unsigned int windows = 0;
struct pci_root_info info;
struct pci_bus *pbus; struct pci_bus *pbus;
char *name; char *name;
int pxm; int pxm;
@@ -359,11 +350,10 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
controller->node = pxm_to_node(pxm); controller->node = pxm_to_node(pxm);
#endif #endif
INIT_LIST_HEAD(&info.resources);
acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,
&windows); &windows);
if (windows) { if (windows) {
struct pci_root_info info;
controller->window = controller->window =
kmalloc_node(sizeof(*controller->window) * windows, kmalloc_node(sizeof(*controller->window) * windows,
GFP_KERNEL, controller->node); GFP_KERNEL, controller->node);
@@ -387,9 +377,12 @@ pci_acpi_scan_root(struct acpi_pci_root *root)
* should handle the case here, but it appears that IA64 hasn't * should handle the case here, but it appears that IA64 hasn't
* such quirk. So we just ignore the case now. * such quirk. So we just ignore the case now.
*/ */
pbus = pci_create_bus(NULL, bus, &pci_root_ops, controller); pbus = pci_create_root_bus(NULL, bus, &pci_root_ops, controller,
if (!pbus) &info.resources);
if (!pbus) {
pci_free_resource_list(&info.resources);
return NULL; return NULL;
}
pbus->subordinate = pci_scan_child_bus(pbus); pbus->subordinate = pci_scan_child_bus(pbus);
return pbus; return pbus;
@@ -507,14 +500,10 @@ pcibios_fixup_bus (struct pci_bus *b)
if (b->self) { if (b->self) {
pci_read_bridge_bases(b); pci_read_bridge_bases(b);
pcibios_fixup_bridge_resources(b->self); pcibios_fixup_bridge_resources(b->self);
} else {
pcibios_setup_root_windows(b, b->sysdata);
} }
list_for_each_entry(dev, &b->devices, bus_list) list_for_each_entry(dev, &b->devices, bus_list)
pcibios_fixup_device_resources(dev); pcibios_fixup_device_resources(dev);
platform_pci_fixup_bus(b); platform_pci_fixup_bus(b);
return;
} }
void pcibios_set_master (struct pci_dev *dev) void pcibios_set_master (struct pci_dev *dev)