diff options
| author | Max Filippov <jcmvbkbc@gmail.com> | 2012-09-17 05:44:39 +0400 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2012-10-03 15:11:35 -0700 |
| commit | 02f3774877382bac52972a677c2c5fbd3532a1a1 (patch) | |
| tree | bf1616d9b12c1e3c8addec69787e9ff28e7a16b5 /arch/xtensa/include | |
| parent | af42e970b6097a34cb2b93ec4c12c2a226b1d008 (diff) | |
| download | linux-02f3774877382bac52972a677c2c5fbd3532a1a1.tar.bz2 | |
xtensa: fix ioremap
- fix ioremap_nocache to actually return non-cacheable address
- add explicit ioremap_cache
- fix KIO aperture checking arithmetic
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
Diffstat (limited to 'arch/xtensa/include')
| -rw-r--r-- | arch/xtensa/include/asm/io.h | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h index 4beb43c087d3..4f66dfc103a5 100644 --- a/arch/xtensa/include/asm/io.h +++ b/arch/xtensa/include/asm/io.h @@ -67,12 +67,12 @@ static inline void * phys_to_virt(unsigned long address) * Return the virtual (cached) address for the specified bus memory. * Note that we currently don't support any address outside the KIO segment. */ - -static inline void *ioremap(unsigned long offset, unsigned long size) +static inline void __iomem *ioremap_nocache(unsigned long offset, + unsigned long size) { #ifdef CONFIG_MMU if (offset >= XCHAL_KIO_PADDR - && offset < XCHAL_KIO_PADDR + XCHAL_KIO_SIZE) + && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_BYPASS_VADDR); else BUG(); @@ -81,11 +81,12 @@ static inline void *ioremap(unsigned long offset, unsigned long size) #endif } -static inline void *ioremap_nocache(unsigned long offset, unsigned long size) +static inline void __iomem *ioremap_cache(unsigned long offset, + unsigned long size) { #ifdef CONFIG_MMU if (offset >= XCHAL_KIO_PADDR - && offset < XCHAL_KIO_PADDR + XCHAL_KIO_SIZE) + && offset - XCHAL_KIO_PADDR < XCHAL_KIO_SIZE) return (void*)(offset-XCHAL_KIO_PADDR+XCHAL_KIO_CACHED_VADDR); else BUG(); @@ -94,7 +95,14 @@ static inline void *ioremap_nocache(unsigned long offset, unsigned long size) #endif } -static inline void iounmap(void *addr) +#define ioremap_wc ioremap_nocache + +static inline void __iomem *ioremap(unsigned long offset, unsigned long size) +{ + return ioremap_nocache(offset, size); +} + +static inline void iounmap(volatile void __iomem *addr) { } |