forked from Minki/linux
[POWERPC] Always hookup PHB IO resource even when empty
We must always hookup the pci_bus resource 0 to the PHB io_resource even if the latter is empty (the bus has no IO support). Otherwise, some other code will end up hooking it up to something bogus and the resource tree will end up being broken. This fixes boot on QS20 Cell blades where the IDE driver failed to allocate the IO resources due to breakage of the resource tree. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
335675a3a2
commit
9d5f49283b
@ -357,7 +357,6 @@ void __devinit scan_phb(struct pci_controller *hose)
|
||||
struct pci_bus *bus;
|
||||
struct device_node *node = hose->dn;
|
||||
int i, mode;
|
||||
struct resource *res;
|
||||
|
||||
DBG("PCI: Scanning PHB %s\n", node ? node->full_name : "<NO NAME>");
|
||||
|
||||
@ -375,12 +374,10 @@ void __devinit scan_phb(struct pci_controller *hose)
|
||||
pcibios_map_io_space(bus);
|
||||
|
||||
/* Wire up PHB bus resources */
|
||||
if (hose->io_resource.flags) {
|
||||
DBG("PCI: PHB IO resource = %016lx-%016lx [%lx]\n",
|
||||
hose->io_resource.start, hose->io_resource.end,
|
||||
hose->io_resource.flags);
|
||||
bus->resource[0] = res = &hose->io_resource;
|
||||
}
|
||||
DBG("PCI: PHB IO resource = %016lx-%016lx [%lx]\n",
|
||||
hose->io_resource.start, hose->io_resource.end,
|
||||
hose->io_resource.flags);
|
||||
bus->resource[0] = &hose->io_resource;
|
||||
for (i = 0; i < 3; ++i) {
|
||||
DBG("PCI: PHB MEM resource %d = %016lx-%016lx [%lx]\n", i,
|
||||
hose->mem_resources[i].start,
|
||||
|
Loading…
Reference in New Issue
Block a user