diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2007-12-11 14:48:18 +1100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-11 15:43:35 +1100 |
commit | 13dccb9e65dc0fa4de83e5bd5639f7a7f3f6fb9e (patch) | |
tree | e072ef034d6021359993253d1101ba7a03609760 /include/asm-powerpc | |
parent | 25e81f925d4be0a0f60520e1c3c1b5af744404e1 (diff) | |
download | op-kernel-dev-13dccb9e65dc0fa4de83e5bd5639f7a7f3f6fb9e.zip op-kernel-dev-13dccb9e65dc0fa4de83e5bd5639f7a7f3f6fb9e.tar.gz |
[POWERPC] Merge pci_process_bridge_OF_ranges()
This merges the 32-bit and 64-bit implementations of
pci_process_bridge_OF_ranges(). The new function is cleaner than both
the old ones, and supports 64 bits ranges on ppc32 which is necessary
for the 4xx port.
It also adds some better (hopefully) output to the kernel log which
should help diagnose problems and makes better use of existing OF
parsing helpers (avoiding a few bugs of both implementations along
the way).
There are still a few unfortunate ifdef's but there is no way around
these for now at least not until some other bits of the PCI code are
made common.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-powerpc')
-rw-r--r-- | include/asm-powerpc/pci-bridge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index f139f2a..8245e84 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h @@ -37,6 +37,9 @@ struct pci_controller { void *io_base_alloc; #endif resource_size_t io_base_phys; +#ifndef CONFIG_PPC64 + resource_size_t pci_io_size; +#endif /* Some machines (PReP) have a non 1:1 mapping of * the PCI memory space in the CPU bus space |