diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 10:29:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-06 10:29:33 -0700 |
| commit | dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5 (patch) | |
| tree | 8dd0a19bc2fd65e05fe7678babbd9a95e53d727b /arch/mips/kernel/cpu-probe.c | |
| parent | 23c1fb52961bc24bd3a8078eefc49eed533b2b38 (diff) | |
| parent | 4b3e975e4a06f1710693c5aa51b8f98facfa9863 (diff) | |
| download | kernel_samsung_smdk4412-dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5.zip kernel_samsung_smdk4412-dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5.tar.gz kernel_samsung_smdk4412-dadde13ad86bf45bc71f0663a6ce3dfe5dd4ecc5.tar.bz2 | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix scheduling latency issue on 24K, 34K and 74K cores
[MIPS] Add macros to encode processor revisions.
[MIPS] RM7000: Enable ICACHE_REFILLS_WORKAROUND_WAR.
[MIPS] SMTC: Fix cut'n'paste bug in Kconfig.debug
[MIPS] Change libgcc-style functions from lib-y to obj-y
[MIPS] Fix timer/performance interrupt detection
[MIPS] AP/SP: Avoid triggering the 34K E125 performance issue
[MIPS] 64-bit TO_PHYS_MASK macro for RM9000 processors
Diffstat (limited to 'arch/mips/kernel/cpu-probe.c')
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c index 0fc90ba..b12eeee 100644 --- a/arch/mips/kernel/cpu-probe.c +++ b/arch/mips/kernel/cpu-probe.c @@ -137,13 +137,24 @@ static inline void check_wait(void) case CPU_4KEC: case CPU_4KSC: case CPU_5KC: - case CPU_24K: case CPU_25KF: + case CPU_PR4450: + cpu_wait = r4k_wait; + break; + + case CPU_24K: case CPU_34K: + cpu_wait = r4k_wait; + if (read_c0_config7() & MIPS_CONF7_WII) + cpu_wait = r4k_wait_irqoff; + break; + case CPU_74K: - case CPU_PR4450: cpu_wait = r4k_wait; + if ((c->processor_id & 0xff) >= PRID_REV_ENCODE_332(2, 1, 0)) + cpu_wait = r4k_wait_irqoff; break; + case CPU_TX49XX: cpu_wait = r4k_wait_irqoff; break; |