diff options
author | Anton Blanchard <anton@samba.org> | 2011-05-08 17:41:59 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-05-19 00:30:42 -0400 |
commit | be135f40899cb3334faa7d2e27025055da311ec4 (patch) | |
tree | 8dd20fc82c239562a16fdf9d8f32065e9927b231 /arch/powerpc/mm | |
parent | f5f0307f42d39a51a925ca4841f76a2f2ea330ff (diff) |
powerpc: Add ioremap_wc
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>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/pgtable_32.c | 8 | ||||
-rw-r--r-- | arch/powerpc/mm/pgtable_64.c | 11 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/powerpc/mm/pgtable_32.c b/arch/powerpc/mm/pgtable_32.c index 8dc41c0157fe..fca98f8fb600 100644 --- a/arch/powerpc/mm/pgtable_32.c +++ b/arch/powerpc/mm/pgtable_32.c | |||
@@ -133,6 +133,14 @@ ioremap(phys_addr_t addr, unsigned long size) | |||
133 | EXPORT_SYMBOL(ioremap); | 133 | EXPORT_SYMBOL(ioremap); |
134 | 134 | ||
135 | void __iomem * | 135 | void __iomem * |
136 | ioremap_wc(phys_addr_t addr, unsigned long size) | ||
137 | { | ||
138 | return __ioremap_caller(addr, size, _PAGE_NO_CACHE, | ||
139 | __builtin_return_address(0)); | ||
140 | } | ||
141 | EXPORT_SYMBOL(ioremap_wc); | ||
142 | |||
143 | void __iomem * | ||
136 | ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags) | 144 | ioremap_flags(phys_addr_t addr, unsigned long size, unsigned long flags) |
137 | { | 145 | { |
138 | /* writeable implies dirty for kernel addresses */ | 146 | /* writeable implies dirty for kernel addresses */ |
diff --git a/arch/powerpc/mm/pgtable_64.c b/arch/powerpc/mm/pgtable_64.c index 88927a05cdc2..1146fc6e8921 100644 --- a/arch/powerpc/mm/pgtable_64.c +++ b/arch/powerpc/mm/pgtable_64.c | |||
@@ -255,6 +255,16 @@ void __iomem * ioremap(phys_addr_t addr, unsigned long size) | |||
255 | return __ioremap_caller(addr, size, flags, caller); | 255 | return __ioremap_caller(addr, size, flags, caller); |
256 | } | 256 | } |
257 | 257 | ||
258 | void __iomem * ioremap_wc(phys_addr_t addr, unsigned long size) | ||
259 | { | ||
260 | unsigned long flags = _PAGE_NO_CACHE; | ||
261 | void *caller = __builtin_return_address(0); | ||
262 | |||
263 | if (ppc_md.ioremap) | ||
264 | return ppc_md.ioremap(addr, size, flags, caller); | ||
265 | return __ioremap_caller(addr, size, flags, caller); | ||
266 | } | ||
267 | |||
258 | void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size, | 268 | void __iomem * ioremap_flags(phys_addr_t addr, unsigned long size, |
259 | unsigned long flags) | 269 | unsigned long flags) |
260 | { | 270 | { |
@@ -311,6 +321,7 @@ void iounmap(volatile void __iomem *token) | |||
311 | } | 321 | } |
312 | 322 | ||
313 | EXPORT_SYMBOL(ioremap); | 323 | EXPORT_SYMBOL(ioremap); |
324 | EXPORT_SYMBOL(ioremap_wc); | ||
314 | EXPORT_SYMBOL(ioremap_flags); | 325 | EXPORT_SYMBOL(ioremap_flags); |
315 | EXPORT_SYMBOL(__ioremap); | 326 | EXPORT_SYMBOL(__ioremap); |
316 | EXPORT_SYMBOL(__ioremap_at); | 327 | EXPORT_SYMBOL(__ioremap_at); |