diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-10-27 19:48:44 +0000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-11-06 09:26:05 +1100 |
| commit | b5ae5f911d221ad85090d6805ab9ab020f6e4703 (patch) | |
| tree | c3d9ff10fc1f8b6cd0984f908774c5ea4eeef333 /arch/powerpc/kernel/pci-common.c | |
| parent | 57b066ff4ec53a0ac7cbf7fb363bb670cf58ddae (diff) | |
| download | op-kernel-dev-b5ae5f911d221ad85090d6805ab9ab020f6e4703.zip op-kernel-dev-b5ae5f911d221ad85090d6805ab9ab020f6e4703.tar.gz | |
powerpc/pci: Make pcibios_allocate_bus_resources more robust
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 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>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/pci-common.c')
| -rw-r--r-- | arch/powerpc/kernel/pci-common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index 0eaabd4..f965397 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c @@ -1243,9 +1243,12 @@ void pcibios_allocate_bus_resources(struct pci_bus *bus) 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) ? |
