Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 556269c1 authored by Toshi Kani's avatar Toshi Kani Committed by Ingo Molnar
Browse files

arch/*/io.h: Add ioremap_wt() to all architectures 



Add ioremap_wt() to all arch-specific asm/io.h headers which
define ioremap_wc() locally. These headers do not include
<asm-generic/iomap.h>. Some of them include <asm-generic/io.h>,
but ioremap_wt() is defined for consistency since they define
all ioremap_xxx locally.

In all architectures without Write-Through support, ioremap_wt()
is defined indentical to ioremap_nocache().

frv and m68k already have ioremap_writethrough(). On those we
add ioremap_wt() indetical to ioremap_writethrough() and defines
ARCH_HAS_IOREMAP_WT in both architectures.

The ioremap_wt() interface is exported to drivers.

Signed-off-by: default avatarToshi Kani <toshi.kani@hp.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Elliott@hp.com
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Luis R. Rodriguez <mcgrof@suse.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: arnd@arndb.de
Cc: hch@lst.de
Cc: hmh@hmh.eng.br
Cc: jgross@suse.com
Cc: konrad.wilk@oracle.com
Cc: linux-mm <linux-mm@kvack.org>
Cc: linux-nvdimm@lists.01.org
Cc: stefan.bader@canonical.com
Cc: yigal@plexistor.com
Link: http://lkml.kernel.org/r/1433436928-31903-9-git-send-email-bp@alien8.de


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent d838270e

arch/arc/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ extern void iounmap(const void __iomem *addr); 


#define ioremap_nocache(phy, sz)	ioremap(phy, sz)

#define ioremap_wc(phy, sz)		ioremap(phy, sz)

#define ioremap_wt(phy, sz)		ioremap(phy, sz)



/* Change struct page to physical address */

#define page_to_phys(page)		(page_to_pfn(page) << PAGE_SHIFT)

arch/arm/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ extern void _memset_io(volatile void __iomem *, int, size_t); 
#define ioremap_nocache(cookie,size)	__arm_ioremap((cookie), (size), MT_DEVICE)

#define ioremap_cache(cookie,size)	__arm_ioremap((cookie), (size), MT_DEVICE_CACHED)

#define ioremap_wc(cookie,size)		__arm_ioremap((cookie), (size), MT_DEVICE_WC)

#define ioremap_wt(cookie,size)		__arm_ioremap((cookie), (size), MT_DEVICE)

#define iounmap				__arm_iounmap



/*

arch/arm64/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -170,6 +170,7 @@ extern void __iomem *ioremap_cache(phys_addr_t phys_addr, size_t size); 
#define ioremap(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define ioremap_nocache(addr, size)	__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define ioremap_wc(addr, size)		__ioremap((addr), (size), __pgprot(PROT_NORMAL_NC))

#define ioremap_wt(addr, size)		__ioremap((addr), (size), __pgprot(PROT_DEVICE_nGnRE))

#define iounmap				__iounmap



/*

arch/avr32/include/asm/io.h

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ extern void __iounmap(void __iomem *addr); 
	__iounmap(addr)



#define ioremap_wc ioremap_nocache

#define ioremap_wt ioremap_nocache



#define cached(addr) P1SEGADDR(addr)

#define uncached(addr) P2SEGADDR(addr)

arch/frv/include/asm/io.h

+7 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 


#ifdef __KERNEL__



#define ARCH_HAS_IOREMAP_WT



#include <linux/types.h>

#include <asm/virtconvert.h>

#include <asm/string.h>
@@ -270,6 +272,11 @@ static inline void __iomem *ioremap_writethrough(unsigned long physaddr, unsigne 
	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);

}



static inline void __iomem *ioremap_wt(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_WRITETHROUGH);

}



static inline void __iomem *ioremap_fullcache(unsigned long physaddr, unsigned long size)

{

	return __ioremap(physaddr, size, IOMAP_FULL_CACHING);