diff options
| author | Arnd Bergmann <arnd.bergmann@de.ibm.com> | 2007-06-04 20:14:39 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-06-07 03:44:40 +0200 |
| commit | e7c40012b84f670ba57fe4a3f453ddecc8813e9b (patch) | |
| tree | e2f353ed68597ca43e2949d3de144c6a33beded3 | |
| parent | [POWERPC] spufs scheduler: Fix wakeup races (diff) | |
| download | linux-e7c40012b84f670ba57fe4a3f453ddecc8813e9b.tar.xz linux-e7c40012b84f670ba57fe4a3f453ddecc8813e9b.zip | |
[POWERPC] Fix pci_setup_phb_io_dynamic for pci_iomap
We had a problem on a system with only dynamically allocated
PCI buses (using of_pci_phb_driver) in combination with libata.
This setup ended up having no "primary" phb, which means
that pci_io_base never got initialized and all IO port
numbers are 64 bit numbers, which is larger than the
PIO_MASK limit.
Signed-off-by: Arnd Bergmann <arnd.bergmann@de.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/kernel/of_platform.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/of_platform.c b/arch/powerpc/kernel/of_platform.c index d501c23e5159..d454f61c9c7c 100644 --- a/arch/powerpc/kernel/of_platform.c +++ b/arch/powerpc/kernel/of_platform.c @@ -433,7 +433,7 @@ static int __devinit of_pci_phb_probe(struct of_device *dev, * Note also that we don't do ISA, this will also be fixed with a * more massive rework. */ - pci_setup_phb_io(phb, 0); + pci_setup_phb_io(phb, pci_io_base == 0); /* Init pci_dn data structures */ pci_devs_phb_init_dynamic(phb); |