diff options
author | Thiemo Seufer <ths@networkno.de> | 2005-09-09 16:26:54 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2005-10-29 14:32:18 -0400 |
commit | 10a3dabddd79473130c6ded7f7cef1d55fccc115 (patch) | |
tree | 8563bee83ef4b13ca1ca0f9141949437f0c7510f | |
parent | 02fe2c9ce3159f62339f30dfe62aeb6e4aa75d6e (diff) |
Add/Fix missing bit of R4600 hit cacheop workaround.
Signed-off-by: Thiemo Seufer <ths@networkno.de>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/mm/c-r4k.c | 1 | ||||
-rw-r--r-- | arch/mips/mm/pg-r4k.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c index 586baf29fe88..aa87ae552170 100644 --- a/arch/mips/mm/c-r4k.c +++ b/arch/mips/mm/c-r4k.c | |||
@@ -481,6 +481,7 @@ static inline void local_r4k_flush_icache_range(void *args) | |||
481 | if (end - start > dcache_size) { | 481 | if (end - start > dcache_size) { |
482 | r4k_blast_dcache(); | 482 | r4k_blast_dcache(); |
483 | } else { | 483 | } else { |
484 | R4600_HIT_CACHEOP_WAR_IMPL; | ||
484 | addr = start & ~(dc_lsize - 1); | 485 | addr = start & ~(dc_lsize - 1); |
485 | aend = (end - 1) & ~(dc_lsize - 1); | 486 | aend = (end - 1) & ~(dc_lsize - 1); |
486 | 487 | ||
diff --git a/arch/mips/mm/pg-r4k.c b/arch/mips/mm/pg-r4k.c index c9e6ee2a8a23..f51e180072e3 100644 --- a/arch/mips/mm/pg-r4k.c +++ b/arch/mips/mm/pg-r4k.c | |||
@@ -209,7 +209,7 @@ static inline void build_cdex_p(void) | |||
209 | } | 209 | } |
210 | 210 | ||
211 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) | 211 | if (R4600_V2_HIT_CACHEOP_WAR && cpu_is_r4600_v2_x()) |
212 | build_insn_word(0x8c200000); /* lw $zero, ($at) */ | 212 | build_insn_word(0x3c01a000); /* lui $at, 0xa000 */ |
213 | 213 | ||
214 | mi.c_format.opcode = cache_op; | 214 | mi.c_format.opcode = cache_op; |
215 | mi.c_format.rs = 4; /* $a0 */ | 215 | mi.c_format.rs = 4; /* $a0 */ |