aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-orion/io.h
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-03-27 14:51:41 -0400
committerNicolas Pitre <nico@marvell.com>2008-03-27 14:51:41 -0400
commit1419468ab548f990b172740d77b5c1032a790114 (patch)
tree379b8bff9d3a5ad53d0d254374ff0074aa20a4e6 /include/asm-arm/arch-orion/io.h
parentOrion: move I/O macros out of orion.h (diff)
downloadlinux-dev-1419468ab548f990b172740d77b5c1032a790114.tar.xz
linux-dev-1419468ab548f990b172740d77b5c1032a790114.zip
Orion: only map peripheral register space once
Save some TLB entries by making ioremap() return pointers into the boot-time Orion peripheral iotable mapping whenever someone tries to ioremap any part of the Orion peripheral register space. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com> Reviewed-by: Nicolas Pitre <nico@marvell.com> Reviewed-by: Tzachi Perelstein <tzachi@marvell.com> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to '')
-rw-r--r--include/asm-arm/arch-orion/io.h26
1 files changed, 26 insertions, 0 deletions
diff --git a/include/asm-arm/arch-orion/io.h b/include/asm-arm/arch-orion/io.h
index 42abd297ae5f..486dc04d7643 100644
--- a/include/asm-arm/arch-orion/io.h
+++ b/include/asm-arm/arch-orion/io.h
@@ -16,11 +16,37 @@
#define IO_SPACE_LIMIT 0xffffffff
#define IO_SPACE_REMAP ORION_PCI_SYS_IO_BASE
+static inline void __iomem *
+__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)
+{
+ void __iomem *retval;
+
+ if (mtype == MT_DEVICE && size && paddr >= ORION_REGS_PHYS_BASE &&
+ paddr + size <= ORION_REGS_PHYS_BASE + ORION_REGS_SIZE) {
+ retval = (void __iomem *)ORION_REGS_VIRT_BASE +
+ (paddr - ORION_REGS_PHYS_BASE);
+ } else {
+ retval = __arm_ioremap(paddr, size, mtype);
+ }
+
+ return retval;
+}
+
+static inline void
+__arch_iounmap(void __iomem *addr)
+{
+ if (addr < (void __iomem *)ORION_REGS_VIRT_BASE ||
+ addr >= (void __iomem *)(ORION_REGS_VIRT_BASE + ORION_REGS_SIZE))
+ __iounmap(addr);
+}
+
static inline void __iomem *__io(unsigned long addr)
{
return (void __iomem *)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)