| Message ID | 20081028054944.77073DDF6D@ozlabs.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | b5ae5f911d221ad85090d6805ab9ab020f6e4703 |
| Delegated to: | Paul Mackerras |
| Headers | show |
--- linux-work.orig/arch/powerpc/kernel/pci-common.c 2008-10-28 14:04:45.000000000 +1100 +++ linux-work/arch/powerpc/kernel/pci-common.c 2008-10-28 14:04:57.000000000 +1100 @@ -1245,9 +1245,12 @@ static void pcibios_allocate_bus_resourc int i; struct resource *res, *pr; + pr_debug("PCI: Allocating bus resources for %04x:%02x...\n", + pci_domain_nr(bus), bus->number); + for (i = 0; i < PCI_BUS_NUM_RESOURCES; ++i) { if ((res = bus->resource[i]) == NULL || !res->flags - || res->start > res->end) + || res->start > res->end || res->parent) continue; if (bus->parent == NULL) pr = (res->flags & IORESOURCE_IO) ?
To properly fix PCI hotplug, it's useful to be able to make the fixup passes on all devices whether they were just hot plugged or already there. However, pcibios_allocate_bus_resources() wouldn't cope well with being called twice for a given bus. This patch makes it ignore resources that have already been allocated, along with adding a bit of debug output. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- arch/powerpc/kernel/pci-common.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)