Re: [PATCH v2 1/4] arch/*/asm/io.h: add ioremap_cache() to all architectures

Similar to ioremap_wc() let architecture implementations optionally provide ioremap_cache(). As is, current ioremap_cache() users have architecture dependencies that prevent them from compiling on archs without ioremap_cache(). In some cases the architectures that have a cached ioremap() capability have an identifier other than "ioremap_cache". Allow drivers to compile with ioremap_cache() support and fallback to a safe / uncached ioremap otherwise.

diff --git a/arch/mn10300/include/asm/io.h b/arch/mn10300/include/asm/io.h index 07c5b4a3903b..dcab414f40df 100644 --- a/arch/mn10300/include/asm/io.h +++ b/arch/mn10300/include/asm/io.h @@ -283,6 +283,7 @@ static inline void __iomem *ioremap_nocache(unsigned long offset, unsigned long #define ioremap_wc ioremap_nocache #define ioremap_wt ioremap_nocache +#define ioremap_cache ioremap_nocache

From the comment in ioremap_nocache(), ioremap() may be cacheable in

diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index f56094cfdeff..a0665dfcab47 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -793,6 +793,14 @@ static inline void __iomem *ioremap_wt(phys_addr_t offset, size_t size) } #endif +#ifndef ioremap_cache +#define ioremap_cache ioremap_cache +static inline void __iomem *ioremap_cache(phys_addr_t offset, size_t size) +{ + return ioremap_nocache(offset, size);

+} +#endif + #ifndef iounmap #define iounmap iounmap diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h index d8f8622fa044..f0f30464cecd 100644 --- a/include/asm-generic/iomap.h +++ b/include/asm-generic/iomap.h @@ -70,6 +70,10 @@ extern void ioport_unmap(void __iomem *); #define ioremap_wt ioremap_nocache #endif +#ifndef ARCH_HAS_IOREMAP_CACHE +#define ioremap_cache ioremap_nocache