diff options
| author | Nicolas Pitre <nico@cam.org> | 2009-05-26 22:06:25 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nico@cam.org> | 2009-06-08 13:04:56 -0400 |
| commit | 797b2c80e8e111bc9673fc5e6c67ac03e8b7c7ef (patch) | |
| tree | 242f8218121cd4bc89c49e8981052885965e0f6b /arch/arm/mach-kirkwood | |
| parent | 96e7d211b46ce838ceca5d9734d6e166cfafdef4 (diff) | |
| download | linux-3.10-797b2c80e8e111bc9673fc5e6c67ac03e8b7c7ef.tar.gz linux-3.10-797b2c80e8e111bc9673fc5e6c67ac03e8b7c7ef.tar.bz2 linux-3.10-797b2c80e8e111bc9673fc5e6c67ac03e8b7c7ef.zip | |
[ARM] Kirkwood: only map peripheral register space once
Just like commit 1419468ab548, let's save some TLB entries by making
ioremap() return pointers into the boot-time Kirkwood peripheral
iotable mapping whenever someone tries to ioremap any part of the Kirkwood
peripheral register space.
Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/mach-kirkwood')
| -rw-r--r-- | arch/arm/mach-kirkwood/include/mach/io.h | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/io.h b/arch/arm/mach-kirkwood/include/mach/io.h index be07be0ef52..a643a846d5f 100644 --- a/arch/arm/mach-kirkwood/include/mach/io.h +++ b/arch/arm/mach-kirkwood/include/mach/io.h @@ -19,6 +19,31 @@ static inline void __iomem *__io(unsigned long addr) + KIRKWOOD_PCIE_IO_VIRT_BASE); } +static inline void __iomem * +__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype) +{ + void __iomem *retval; + unsigned long offs = paddr - KIRKWOOD_REGS_PHYS_BASE; + if (mtype == MT_DEVICE && size && offs < KIRKWOOD_REGS_SIZE && + size <= KIRKWOOD_REGS_SIZE && offs + size <= KIRKWOOD_REGS_SIZE) { + retval = (void __iomem *)KIRKWOOD_REGS_VIRT_BASE + offs; + } else { + retval = __arm_ioremap(paddr, size, mtype); + } + + return retval; +} + +static inline void +__arch_iounmap(void __iomem *addr) +{ + if (addr < (void __iomem *)KIRKWOOD_REGS_VIRT_BASE || + addr >= (void __iomem *)(KIRKWOOD_REGS_VIRT_BASE + KIRKWOOD_REGS_SIZE)) + __iounmap(addr); +} + +#define __arch_ioremap(p, s, m) __arch_ioremap(p, s, m) +#define __arch_iounmap(a) __arch_iounmap(a) #define __io(a) __io(a) #define __mem_pci(a) (a) |