openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

MIPS: merge __ioremap_mode into ioremap_prot 

There is no reason to have two ioremap with flags interfaces.  Merge
the historic mips __ioremap_mode into ioremap_prot which is a generic
kernel interface.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
This commit is contained in:
Christoph Hellwig 2020-04-16 17:00:08 +02:00 committed by Thomas Bogendoerfer
parent d399157283
commit 5c9ff5709d
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
arch/mips/include/asm/io.h
View File

@ -156,9 +156,17 @@ static inline void *isa_bus_to_virt(unsigned long address)
extern void __iomem * __ioremap(phys_addr_t offset, phys_addr_t size, unsigned long flags); extern void __iomem * __ioremap(phys_addr_t offset, phys_addr_t size, unsigned long flags);
extern void __iounmap(const volatile void __iomem *addr); extern void __iounmap(const volatile void __iomem *addr);
static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long size, /*
unsigned long flags) * ioremap_prot - map bus memory into CPU space
* @offset: bus address of the memory
* @size: size of the resource to map
* ioremap_prot gives the caller control over cache coherency attributes (CCA)
*/
static inline void __iomem *ioremap_prot(phys_addr_t offset,
unsigned long size, unsigned long prot_val)
{ {
unsigned long flags = prot_val & _CACHE_MASK;
void __iomem *addr = plat_ioremap(offset, size, flags); void __iomem *addr = plat_ioremap(offset, size, flags);
if (addr) if (addr)
@ -202,18 +210,6 @@ static inline void __iomem * __ioremap_mode(phys_addr_t offset, unsigned long si
#undef __IS_LOW512 #undef __IS_LOW512
} }
/*
* ioremap_prot - map bus memory into CPU space
* @offset: bus address of the memory
* @size: size of the resource to map
* ioremap_prot gives the caller control over cache coherency attributes (CCA)
*/
static inline void __iomem *ioremap_prot(phys_addr_t offset,
unsigned long size, unsigned long prot_val) {
return __ioremap_mode(offset, size, prot_val & _CACHE_MASK);
}
/* /*
* ioremap - map bus memory into CPU space * ioremap - map bus memory into CPU space
* @offset: bus address of the memory * @offset: bus address of the memory
@ -226,7 +222,7 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,
* address. * address.
*/ */
#define ioremap(offset, size) \ #define ioremap(offset, size) \
__ioremap_mode((offset), (size), _CACHE_UNCACHED) ioremap_prot((offset), (size), _CACHE_UNCACHED)
#define ioremap_uc ioremap #define ioremap_uc ioremap
/* /*
@ -245,7 +241,7 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,
* memory-like regions on I/O busses. * memory-like regions on I/O busses.
*/ */
#define ioremap_cache(offset, size) \ #define ioremap_cache(offset, size) \
__ioremap_mode((offset), (size), _page_cachable_default) ioremap_prot((offset), (size), _page_cachable_default)
/* /*
* ioremap_wc - map bus memory into CPU space * ioremap_wc - map bus memory into CPU space
@ -266,7 +262,7 @@ static inline void __iomem *ioremap_prot(phys_addr_t offset,
* _CACHE_UNCACHED option (see cpu_probe() method). * _CACHE_UNCACHED option (see cpu_probe() method).
*/ */
#define ioremap_wc(offset, size) \ #define ioremap_wc(offset, size) \
__ioremap_mode((offset), (size), boot_cpu_data.writecombine) ioremap_prot((offset), (size), boot_cpu_data.writecombine)
static inline void iounmap(const volatile void __iomem *addr) static inline void iounmap(const volatile void __iomem *addr)
{ {