diff options
| author | Valentine Barshak <vbarshak@ru.mvista.com> | 2007-10-08 22:51:24 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-10-12 14:05:17 +1000 |
| commit | d94bad827d9a0df939a0e7ed081a2780b9f72c4b (patch) | |
| tree | ee4d5dd0c9bcaf49438eb3660baf246482281764 | |
| parent | 8087ebd5a121ac6bf5a8eba2459c01d3659c3e31 (diff) | |
| download | linux-stable-d94bad827d9a0df939a0e7ed081a2780b9f72c4b.tar.gz linux-stable-d94bad827d9a0df939a0e7ed081a2780b9f72c4b.tar.bz2 linux-stable-d94bad827d9a0df939a0e7ed081a2780b9f72c4b.zip | |
[POWERPC] PCI: Add 64-bit physical address support to setup_indirect_pci
Add 64-bit physical address support to setup_indirect_pci().
Signed-off-by: Valentine Barshak <vbarshak@ru.mvista.com>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
| -rw-r--r-- | arch/powerpc/sysdev/indirect_pci.c | 6 | ||||
| -rw-r--r-- | include/asm-powerpc/pci-bridge.h | 3 |
2 files changed, 6 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index b5d068204aa3..cfbd2aae93e8 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c @@ -149,9 +149,11 @@ static struct pci_ops indirect_pci_ops = }; void __init -setup_indirect_pci(struct pci_controller* hose, u32 cfg_addr, u32 cfg_data, u32 flags) +setup_indirect_pci(struct pci_controller* hose, + resource_size_t cfg_addr, + resource_size_t cfg_data, u32 flags) { - unsigned long base = cfg_addr & PAGE_MASK; + resource_size_t base = cfg_addr & PAGE_MASK; void __iomem *mbase; mbase = ioremap(base, PAGE_SIZE); diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index e909769b6410..dc318458b5fe 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h @@ -98,7 +98,8 @@ extern int early_find_capability(struct pci_controller *hose, int bus, int dev_fn, int cap); extern void setup_indirect_pci(struct pci_controller* hose, - u32 cfg_addr, u32 cfg_data, u32 flags); + resource_size_t cfg_addr, + resource_size_t cfg_data, u32 flags); extern void setup_grackle(struct pci_controller *hose); extern void __init update_bridge_resource(struct pci_dev *dev, struct resource *res); |