 556269c138
			
		
	
	
	556269c138
	
	
	
		
			
			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: Toshi Kani <toshi.kani@hp.com> Signed-off-by: Borislav 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: Ingo Molnar <mingo@kernel.org>
		
			
				
	
	
		
			212 lines
		
	
	
	
		
			5.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			212 lines
		
	
	
	
		
			5.7 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| #ifndef _ASM_M32R_IO_H
 | |
| #define _ASM_M32R_IO_H
 | |
| 
 | |
| #include <linux/string.h>
 | |
| #include <linux/compiler.h>
 | |
| #include <asm/page.h>  /* __va */
 | |
| 
 | |
| #ifdef __KERNEL__
 | |
| 
 | |
| #define IO_SPACE_LIMIT  0xFFFFFFFF
 | |
| 
 | |
| /**
 | |
|  *	virt_to_phys	-	map virtual addresses to physical
 | |
|  *	@address: address to remap
 | |
|  *
 | |
|  *	The returned physical address is the physical (CPU) mapping for
 | |
|  *	the memory address given. It is only valid to use this function on
 | |
|  *	addresses directly mapped or allocated via kmalloc.
 | |
|  *
 | |
|  *	This function does not give bus mappings for DMA transfers. In
 | |
|  *	almost all conceivable cases a device driver should not be using
 | |
|  *	this function
 | |
|  */
 | |
| 
 | |
| static inline unsigned long virt_to_phys(volatile void * address)
 | |
| {
 | |
| 	return __pa(address);
 | |
| }
 | |
| 
 | |
| /**
 | |
|  *	phys_to_virt	-	map physical address to virtual
 | |
|  *	@address: address to remap
 | |
|  *
 | |
|  *	The returned virtual address is a current CPU mapping for
 | |
|  *	the memory address given. It is only valid to use this function on
 | |
|  *	addresses that have a kernel mapping
 | |
|  *
 | |
|  *	This function does not handle bus mappings for DMA transfers. In
 | |
|  *	almost all conceivable cases a device driver should not be using
 | |
|  *	this function
 | |
|  */
 | |
| 
 | |
| static inline void *phys_to_virt(unsigned long address)
 | |
| {
 | |
| 	return __va(address);
 | |
| }
 | |
| 
 | |
| extern void __iomem *
 | |
| __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
 | |
| 
 | |
| /**
 | |
|  *	ioremap		-	map bus memory into CPU space
 | |
|  *	@offset:	bus address of the memory
 | |
|  *	@size:		size of the resource to map
 | |
|  *
 | |
|  *	ioremap performs a platform specific sequence of operations to
 | |
|  *	make bus memory CPU accessible via the readb/readw/readl/writeb/
 | |
|  *	writew/writel functions and the other mmio helpers. The returned
 | |
|  *	address is not guaranteed to be usable directly as a virtual
 | |
|  *	address.
 | |
|  */
 | |
| 
 | |
| static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
 | |
| {
 | |
| 	return __ioremap(offset, size, 0);
 | |
| }
 | |
| 
 | |
| extern void iounmap(volatile void __iomem *addr);
 | |
| #define ioremap_nocache(off,size) ioremap(off,size)
 | |
| #define ioremap_wc ioremap_nocache
 | |
| #define ioremap_wt ioremap_nocache
 | |
| 
 | |
| /*
 | |
|  * IO bus memory addresses are also 1:1 with the physical address
 | |
|  */
 | |
| #define page_to_phys(page)	(page_to_pfn(page) << PAGE_SHIFT)
 | |
| #define page_to_bus	page_to_phys
 | |
| #define virt_to_bus	virt_to_phys
 | |
| 
 | |
| extern unsigned char _inb(unsigned long);
 | |
| extern unsigned short _inw(unsigned long);
 | |
| extern unsigned long _inl(unsigned long);
 | |
| extern unsigned char _inb_p(unsigned long);
 | |
| extern unsigned short _inw_p(unsigned long);
 | |
| extern unsigned long _inl_p(unsigned long);
 | |
| extern void _outb(unsigned char, unsigned long);
 | |
| extern void _outw(unsigned short, unsigned long);
 | |
| extern void _outl(unsigned long, unsigned long);
 | |
| extern void _outb_p(unsigned char, unsigned long);
 | |
| extern void _outw_p(unsigned short, unsigned long);
 | |
| extern void _outl_p(unsigned long, unsigned long);
 | |
| extern void _insb(unsigned int, void *, unsigned long);
 | |
| extern void _insw(unsigned int, void *, unsigned long);
 | |
| extern void _insl(unsigned int, void *, unsigned long);
 | |
| extern void _outsb(unsigned int, const void *, unsigned long);
 | |
| extern void _outsw(unsigned int, const void *, unsigned long);
 | |
| extern void _outsl(unsigned int, const void *, unsigned long);
 | |
| 
 | |
| static inline unsigned char _readb(unsigned long addr)
 | |
| {
 | |
| 	return *(volatile unsigned char __force *)addr;
 | |
| }
 | |
| 
 | |
| static inline unsigned short _readw(unsigned long addr)
 | |
| {
 | |
| 	return *(volatile unsigned short __force *)addr;
 | |
| }
 | |
| 
 | |
| static inline unsigned long _readl(unsigned long addr)
 | |
| {
 | |
| 	return *(volatile unsigned long __force *)addr;
 | |
| }
 | |
| 
 | |
| static inline void _writeb(unsigned char b, unsigned long addr)
 | |
| {
 | |
| 	*(volatile unsigned char __force *)addr = b;
 | |
| }
 | |
| 
 | |
| static inline void _writew(unsigned short w, unsigned long addr)
 | |
| {
 | |
| 	*(volatile unsigned short __force *)addr = w;
 | |
| }
 | |
| 
 | |
| static inline void _writel(unsigned long l, unsigned long addr)
 | |
| {
 | |
| 	*(volatile unsigned long __force *)addr = l;
 | |
| }
 | |
| 
 | |
| #define inb     _inb
 | |
| #define inw     _inw
 | |
| #define inl     _inl
 | |
| #define outb    _outb
 | |
| #define outw    _outw
 | |
| #define outl    _outl
 | |
| 
 | |
| #define inb_p   _inb_p
 | |
| #define inw_p   _inw_p
 | |
| #define inl_p   _inl_p
 | |
| #define outb_p  _outb_p
 | |
| #define outw_p  _outw_p
 | |
| #define outl_p  _outl_p
 | |
| 
 | |
| #define insb    _insb
 | |
| #define insw    _insw
 | |
| #define insl    _insl
 | |
| #define outsb   _outsb
 | |
| #define outsw   _outsw
 | |
| #define outsl   _outsl
 | |
| 
 | |
| #define readb(addr)   _readb((unsigned long)(addr))
 | |
| #define readw(addr)   _readw((unsigned long)(addr))
 | |
| #define readl(addr)   _readl((unsigned long)(addr))
 | |
| #define __raw_readb readb
 | |
| #define __raw_readw readw
 | |
| #define __raw_readl readl
 | |
| #define readb_relaxed readb
 | |
| #define readw_relaxed readw
 | |
| #define readl_relaxed readl
 | |
| 
 | |
| #define writeb(val, addr)  _writeb((val), (unsigned long)(addr))
 | |
| #define writew(val, addr)  _writew((val), (unsigned long)(addr))
 | |
| #define writel(val, addr)  _writel((val), (unsigned long)(addr))
 | |
| #define __raw_writeb writeb
 | |
| #define __raw_writew writew
 | |
| #define __raw_writel writel
 | |
| #define writeb_relaxed writeb
 | |
| #define writew_relaxed writew
 | |
| #define writel_relaxed writel
 | |
| 
 | |
| #define ioread8 read
 | |
| #define ioread16 readw
 | |
| #define ioread32 readl
 | |
| #define iowrite8 writeb
 | |
| #define iowrite16 writew
 | |
| #define iowrite32 writel
 | |
| 
 | |
| #define mmiowb()
 | |
| 
 | |
| #define flush_write_buffers() do { } while (0)  /* M32R_FIXME */
 | |
| 
 | |
| static inline void
 | |
| memset_io(volatile void __iomem *addr, unsigned char val, int count)
 | |
| {
 | |
| 	memset((void __force *) addr, val, count);
 | |
| }
 | |
| 
 | |
| static inline void
 | |
| memcpy_fromio(void *dst, volatile void __iomem *src, int count)
 | |
| {
 | |
| 	memcpy(dst, (void __force *) src, count);
 | |
| }
 | |
| 
 | |
| static inline void
 | |
| memcpy_toio(volatile void __iomem *dst, const void *src, int count)
 | |
| {
 | |
| 	memcpy((void __force *) dst, src, count);
 | |
| }
 | |
| 
 | |
| /*
 | |
|  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
 | |
|  * access
 | |
|  */
 | |
| #define xlate_dev_mem_ptr(p)	__va(p)
 | |
| 
 | |
| /*
 | |
|  * Convert a virtual cached pointer to an uncached pointer
 | |
|  */
 | |
| #define xlate_dev_kmem_ptr(p)	p
 | |
| 
 | |
| #endif  /* __KERNEL__ */
 | |
| 
 | |
| #endif  /* _ASM_M32R_IO_H */
 |