Commit 0550d9d1 authored by Atsushi Nemoto's avatar Atsushi Nemoto Committed by Ralf Baechle

[MIPS] Remove redundant r4k_blast_icache() calls

r4k_flush_cache_all() and r4k_flush_cache_mm() case: these are noop if
the CPU did not have dc_aliases.  It would mean we do not need to care
about icache here.

r4k_flush_cache_range case: if r4k_flush_cache_mm() did not need to
care about icache, it would be same for this function.
Signed-off-by: default avatarAtsushi Nemoto <anemo@mba.ocn.ne.jp>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent e5679882
...@@ -323,7 +323,6 @@ static void __init r4k_blast_scache_setup(void) ...@@ -323,7 +323,6 @@ static void __init r4k_blast_scache_setup(void)
static inline void local_r4k_flush_cache_all(void * args) static inline void local_r4k_flush_cache_all(void * args)
{ {
r4k_blast_dcache(); r4k_blast_dcache();
r4k_blast_icache();
} }
static void r4k_flush_cache_all(void) static void r4k_flush_cache_all(void)
...@@ -359,21 +358,19 @@ static void r4k___flush_cache_all(void) ...@@ -359,21 +358,19 @@ static void r4k___flush_cache_all(void)
static inline void local_r4k_flush_cache_range(void * args) static inline void local_r4k_flush_cache_range(void * args)
{ {
struct vm_area_struct *vma = args; struct vm_area_struct *vma = args;
int exec;
if (!(cpu_context(smp_processor_id(), vma->vm_mm))) if (!(cpu_context(smp_processor_id(), vma->vm_mm)))
return; return;
exec = vma->vm_flags & VM_EXEC; r4k_blast_dcache();
if (cpu_has_dc_aliases || exec)
r4k_blast_dcache();
if (exec)
r4k_blast_icache();
} }
static void r4k_flush_cache_range(struct vm_area_struct *vma, static void r4k_flush_cache_range(struct vm_area_struct *vma,
unsigned long start, unsigned long end) unsigned long start, unsigned long end)
{ {
if (!cpu_has_dc_aliases)
return;
r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1); r4k_on_each_cpu(local_r4k_flush_cache_range, vma, 1, 1);
} }
...@@ -385,7 +382,6 @@ static inline void local_r4k_flush_cache_mm(void * args) ...@@ -385,7 +382,6 @@ static inline void local_r4k_flush_cache_mm(void * args)
return; return;
r4k_blast_dcache(); r4k_blast_dcache();
r4k_blast_icache();
/* /*
* Kludge alert. For obscure reasons R4000SC and R4400SC go nuts if we * Kludge alert. For obscure reasons R4000SC and R4400SC go nuts if we
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment