diff options
author | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 01:05:52 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2006-09-27 01:05:52 -0400 |
commit | fdfc74f9fcebdda14609159d5010b758a9409acf (patch) | |
tree | 191532cb703383768cc198a41503e412578921bb /arch/sh | |
parent | 36efc35447154317f9ffc5163a1793b5f7ff3de1 (diff) |
sh: Support for SH-4A memory barriers.
SH-4A supports 'synco' as a barrier, sprinkle it around
the cache ops as necessary..
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/mm/cache-sh4.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/sh/mm/cache-sh4.c b/arch/sh/mm/cache-sh4.c index 94c05d09c3f7..846b63d6f5e8 100644 --- a/arch/sh/mm/cache-sh4.c +++ b/arch/sh/mm/cache-sh4.c | |||
@@ -184,6 +184,7 @@ void flush_cache_sigtramp(unsigned long addr) | |||
184 | i++, index += cpu_data->icache.way_incr) | 184 | i++, index += cpu_data->icache.way_incr) |
185 | ctrl_outl(0, index); /* Clear out Valid-bit */ | 185 | ctrl_outl(0, index); /* Clear out Valid-bit */ |
186 | back_to_P1(); | 186 | back_to_P1(); |
187 | wmb(); | ||
187 | local_irq_restore(flags); | 188 | local_irq_restore(flags); |
188 | } | 189 | } |
189 | 190 | ||
@@ -223,6 +224,8 @@ void flush_dcache_page(struct page *page) | |||
223 | flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x2000, phys); | 224 | flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x2000, phys); |
224 | flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x3000, phys); | 225 | flush_cache_4096(CACHE_OC_ADDRESS_ARRAY | 0x3000, phys); |
225 | } | 226 | } |
227 | |||
228 | wmb(); | ||
226 | } | 229 | } |
227 | 230 | ||
228 | static inline void flush_icache_all(void) | 231 | static inline void flush_icache_all(void) |
@@ -247,6 +250,7 @@ void flush_dcache_all(void) | |||
247 | __flush_dcache_all(); | 250 | __flush_dcache_all(); |
248 | else | 251 | else |
249 | __flush_dcache_all_ex(); | 252 | __flush_dcache_all_ex(); |
253 | wmb(); | ||
250 | } | 254 | } |
251 | 255 | ||
252 | void flush_cache_all(void) | 256 | void flush_cache_all(void) |
@@ -377,5 +381,6 @@ void flush_icache_user_range(struct vm_area_struct *vma, | |||
377 | struct page *page, unsigned long addr, int len) | 381 | struct page *page, unsigned long addr, int len) |
378 | { | 382 | { |
379 | flush_cache_page(vma, addr, page_to_pfn(page)); | 383 | flush_cache_page(vma, addr, page_to_pfn(page)); |
384 | mb(); | ||
380 | } | 385 | } |
381 | 386 | ||