diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2007-09-14 14:08:43 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2007-09-14 14:08:43 -0400 |
commit | 50da469a79fa2152d824f25f5ad5962f4af4343d (patch) | |
tree | e05ba4976480cda10dca6aa5bae8b90784040eea /arch | |
parent | 8df5beac2aa15b18a912ab585e1b86e748eda9ad (diff) |
[MIPS] 20Kc: Disable use of WAIT instruction.
Another issue with 20Kc's WAIT, waiting for more details. With the
2.6.23 release immindent simply disable the use of WAIT instead of a
more fancy workaround.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/kernel/cpu-probe.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 06448a9656dc..3e004161ebd5 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c | |||
@@ -199,7 +199,14 @@ static inline void check_wait(void) | |||
199 | if ((c->processor_id & 0xff) <= 0x64) | 199 | if ((c->processor_id & 0xff) <= 0x64) |
200 | break; | 200 | break; |
201 | 201 | ||
202 | cpu_wait = r4k_wait; | 202 | /* |
203 | * Another rev is incremeting c0_count at a reduced clock | ||
204 | * rate while in WAIT mode. So we basically have the choice | ||
205 | * between using the cp0 timer as clocksource or avoiding | ||
206 | * the WAIT instruction. Until more details are known, | ||
207 | * disable the use of WAIT for 20Kc entirely. | ||
208 | cpu_wait = r4k_wait; | ||
209 | */ | ||
203 | break; | 210 | break; |
204 | case CPU_RM9000: | 211 | case CPU_RM9000: |
205 | if ((c->processor_id & 0x00ff) >= 0x40) | 212 | if ((c->processor_id & 0x00ff) >= 0x40) |