Skip to content

Commit

Permalink
Orion: only map peripheral register space once
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lennert Buytenhek authored and Nicolas Pitre committed Mar 27, 2008
1 parent b590bc5 commit 1419468
Showing 1 changed file with 26 additions and 0 deletions.
26 changes: 26 additions & 0 deletions include/asm-arm/arch-orion/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 1419468

Please sign in to comment.