Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

alpha: nautilus - fix hang on boot

Recently introduced generic pci_common_swizzle() relies on bus->self
being NULL for the root PCI bus. But on nautilus bus->self points to
the host bridge device, which is necessary as we do a root bus sizing
on this system. As a result, pci_common_swizzle() loops infinitely.
This worked until 2.6.29-rc1 because the alpha-specific swizzle routine
checked for bus->parent == NULL (instead of bus->self).

Fixed by clearing bus->self after bus sizing is done.

Signed-off-by: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ivan Kokshaysky and committed by
Linus Torvalds
2f88d151 70b66cbf

+4
+4
arch/alpha/kernel/sys_nautilus.c
··· 245 245 IRONGATE0->pci_mem = pci_mem; 246 246 247 247 pci_bus_assign_resources(bus); 248 + 249 + /* pci_common_swizzle() relies on bus->self being NULL 250 + for the root bus, so just clear it. */ 251 + bus->self = NULL; 248 252 pci_fixup_irqs(alpha_mv.pci_swizzle, alpha_mv.pci_map_irq); 249 253 } 250 254