Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5ae5f91 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 57b066ff

arch/powerpc/kernel/pci-common.c

+4 −1
Original line number Diff line number Diff line
@@ -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) ?