lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc: Add ioremap_wc

Browse Source 
Add ioremap_wc so drivers can request write combining on kernel
mappings.

Signed-off-by: Anton Blanchard <anton@samba.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Anton Blanchard
2011-05-08 21:41:59 +00:00
committed by Benjamin Herrenschmidt
parent f5f0307f42
commit be135f4089
3 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/powerpc/include/asm/io.h
View File

@@ -2,6 +2,8 @@
#define _ASM_POWERPC_IO_H #define _ASM_POWERPC_IO_H
#ifdef __KERNEL__ #ifdef __KERNEL__
#define ARCH_HAS_IOREMAP_WC
/* /*
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@@ -628,6 +630,8 @@ static inline void iosync(void)
* *
* * ioremap_nocache is identical to ioremap * * ioremap_nocache is identical to ioremap
* *
* * ioremap_wc enables write combining
*
* * iounmap undoes such a mapping and can be hooked * * iounmap undoes such a mapping and can be hooked
* *
* * __ioremap_at (and the pending __iounmap_at) are low level functions to * * __ioremap_at (and the pending __iounmap_at) are low level functions to
@@ -648,6 +652,7 @@ static inline void iosync(void)
extern void __iomem *ioremap(phys_addr_t address, unsigned long size); extern void __iomem *ioremap(phys_addr_t address, unsigned long size);
extern void __iomem *ioremap_flags(phys_addr_t address, unsigned long size, extern void __iomem *ioremap_flags(phys_addr_t address, unsigned long size,
unsigned long flags); unsigned long flags);
extern void __iomem *ioremap_wc(phys_addr_t address, unsigned long size);
#define ioremap_nocache(addr, size) ioremap((addr), (size)) #define ioremap_nocache(addr, size) ioremap((addr), (size))
#define ioremap_prot(addr, size, prot) ioremap_flags((addr), (size), (prot)) #define ioremap_prot(addr, size, prot) ioremap_flags((addr), (size), (prot))

8
arch/powerpc/mm/pgtable_32.c
View File

@@ -132,6 +132,14 @@ ioremap(phys_addr_t addr, unsigned long size)
} }
EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(ioremap);
void __iomem *
ioremap_wc(phys_addr_t addr, unsigned long size)
{
return __ioremap_caller(addr, size, _PAGE_NO_CACHE,
__builtin_return_address(0));
}
EXPORT_SYMBOL(ioremap_wc);
void __iomem * void __iomem *
ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags) ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags)
{ {

11
arch/powerpc/mm/pgtable_64.c
View File

@@ -255,6 +255,16 @@ void __iomem * ioremap(phys_addr_t addr, unsigned long size)
return __ioremap_caller(addr, size, flags, caller); return __ioremap_caller(addr, size, flags, caller);
} }
void __iomem * ioremap_wc(phys_addr_t addr, unsigned long size)
{
unsigned long flags = _PAGE_NO_CACHE;
void *caller = __builtin_return_address(0);
if (ppc_md.ioremap)
return ppc_md.ioremap(addr, size, flags, caller);
return __ioremap_caller(addr, size, flags, caller);
}
void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size, void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size,
unsigned long flags) unsigned long flags)
{ {
@@ -311,6 +321,7 @@ void iounmap(volatile void __iomem *token)
} }
EXPORT_SYMBOL(ioremap); EXPORT_SYMBOL(ioremap);
EXPORT_SYMBOL(ioremap_wc);
EXPORT_SYMBOL(ioremap_flags); EXPORT_SYMBOL(ioremap_flags);
EXPORT_SYMBOL(__ioremap); EXPORT_SYMBOL(__ioremap);
EXPORT_SYMBOL(__ioremap_at); EXPORT_SYMBOL(__ioremap_at);