summaryrefslogtreecommitdiffstats
path: root/include/asm-arm/arch-orion5x
diff options
context:
space:
mode:
authorNicolas Pitre <nico@cam.org>2008-04-25 14:28:55 -0400
committerNicolas Pitre <nico@cam.org>2008-04-28 15:57:41 -0400
commitfd153abb01c3fbcc47cd4ac3c0bc8801cfcc0009 (patch)
tree938413e50e7a5afcd96f1c9a8d9c732f2397d758 /include/asm-arm/arch-orion5x
parentc5a1e8f7091c33c7f6b53f070d13380facab6607 (diff)
[ARM] Orion: fix ioremap() optimization
The ioremap() optimization used for internal register didn't cope with the fact that paddr + size can wrap to zero if the area extends to the end of the physical address space. Issue isolated by Sylver Bruneau <sylver.bruneau@googlemail.com>. Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'include/asm-arm/arch-orion5x')
-rw-r--r--include/asm-arm/arch-orion5x/io.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/include/asm-arm/arch-orion5x/io.h b/include/asm-arm/arch-orion5x/io.h
index 5148ab7ad1f..50f8c880220 100644
--- a/include/asm-arm/arch-orion5x/io.h
+++ b/include/asm-arm/arch-orion5x/io.h
@@ -20,11 +20,10 @@ static inline void __iomem *
__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)
{
void __iomem *retval;
-
- if (mtype == MT_DEVICE && size && paddr >= ORION5X_REGS_PHYS_BASE &&
- paddr + size <= ORION5X_REGS_PHYS_BASE + ORION5X_REGS_SIZE) {
- retval = (void __iomem *)ORION5X_REGS_VIRT_BASE +
- (paddr - ORION5X_REGS_PHYS_BASE);
+ unsigned long offs = paddr - ORION5X_REGS_PHYS_BASE;
+ if (mtype == MT_DEVICE && size && offs < ORION5X_REGS_SIZE &&
+ size <= ORION5X_REGS_SIZE && offs + size <= ORION5X_REGS_SIZE) {
+ retval = (void __iomem *)ORION5X_REGS_VIRT_BASE + offs;
} else {
retval = __arm_ioremap(paddr, size, mtype);
}