fd153abb01
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>
68 lines
1.8 KiB
C
68 lines
1.8 KiB
C
/*
|
|
* include/asm-arm/arch-orion5x/io.h
|
|
*
|
|
* Tzachi Perelstein <tzachi@marvell.com>
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
|
|
#ifndef __ASM_ARCH_IO_H
|
|
#define __ASM_ARCH_IO_H
|
|
|
|
#include "orion5x.h"
|
|
|
|
#define IO_SPACE_LIMIT 0xffffffff
|
|
#define IO_SPACE_REMAP ORION5X_PCI_SYS_IO_BASE
|
|
|
|
static inline void __iomem *
|
|
__arch_ioremap(unsigned long paddr, size_t size, unsigned int mtype)
|
|
{
|
|
void __iomem *retval;
|
|
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);
|
|
}
|
|
|
|
return retval;
|
|
}
|
|
|
|
static inline void
|
|
__arch_iounmap(void __iomem *addr)
|
|
{
|
|
if (addr < (void __iomem *)ORION5X_REGS_VIRT_BASE ||
|
|
addr >= (void __iomem *)(ORION5X_REGS_VIRT_BASE + ORION5X_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)
|
|
|
|
|
|
/*****************************************************************************
|
|
* Helpers to access Orion registers
|
|
****************************************************************************/
|
|
#define orion5x_read(r) __raw_readl(r)
|
|
#define orion5x_write(r, val) __raw_writel(val, r)
|
|
|
|
/*
|
|
* These are not preempt-safe. Locks, if needed, must be taken
|
|
* care of by the caller.
|
|
*/
|
|
#define orion5x_setbits(r, mask) orion5x_write((r), orion5x_read(r) | (mask))
|
|
#define orion5x_clrbits(r, mask) orion5x_write((r), orion5x_read(r) & ~(mask))
|
|
|
|
|
|
#endif
|