aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/kernel
diff options
context:
space:
mode:
authorMarcelo Tosatti <marcelo@kvack.org>2007-02-16 04:27:44 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-16 11:13:58 -0500
commit07190a08eef3666a8687070226c8d403c1d548b7 (patch)
tree20a9f7e9b6bf925a6721f88e438ec551fa8ce992 /arch/i386/kernel
parent5d8b34fdcb384161552d01ee8f34af5ff11f9684 (diff)
[PATCH] Mark TSC on GeodeLX reliable
The Geode can safely use the TSC for highres, since: 1) Does not support frequency scaling, 2) The TSC _does_ count when the CPU is halted. Furthermore, the Geode supports a mode called "suspension on halt", where Suspend mode (which interacts with the power management states) is entered. TSC counting during suspend mode is controlled by bit 8 of the Bus Controller Configuration Register #0 (thanks Tom!). 3) no SMP :) Check if "RTSC counts during suspension" and remove the requirement for verification, so the clocksource code can safely select it as an timesource for the highres timers subsystem. Signed-off-by: Marcelo Tosatti <marcelo@kvack.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Cc: john stultz <johnstul@us.ibm.com> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386/kernel')
-rw-r--r--arch/i386/kernel/tsc.c20
1 files changed, 20 insertions, 0 deletions
diff --git a/arch/i386/kernel/tsc.c b/arch/i386/kernel/tsc.c
index 22931d24027c..3082a418635c 100644
--- a/arch/i386/kernel/tsc.c
+++ b/arch/i386/kernel/tsc.c
@@ -364,6 +364,25 @@ __cpuinit int unsynchronized_tsc(void)
364 return tsc_unstable; 364 return tsc_unstable;
365} 365}
366 366
367/*
368 * Geode_LX - the OLPC CPU has a possibly a very reliable TSC
369 */
370#ifdef CONFIG_MGEODE_LX
371/* RTSC counts during suspend */
372#define RTSC_SUSP 0x100
373
374static void __init check_geode_tsc_reliable(void)
375{
376 unsigned long val;
377
378 rdmsrl(MSR_GEODE_BUSCONT_CONF0, val);
379 if ((val & RTSC_SUSP))
380 clocksource_tsc.flags &= ~CLOCK_SOURCE_MUST_VERIFY;
381}
382#else
383static inline void check_geode_tsc_reliable(void) { }
384#endif
385
367static int __init init_tsc_clocksource(void) 386static int __init init_tsc_clocksource(void)
368{ 387{
369 388
@@ -372,6 +391,7 @@ static int __init init_tsc_clocksource(void)
372 dmi_check_system(bad_tsc_dmi_table); 391 dmi_check_system(bad_tsc_dmi_table);
373 392
374 unsynchronized_tsc(); 393 unsynchronized_tsc();
394 check_geode_tsc_reliable();
375 current_tsc_khz = tsc_khz; 395 current_tsc_khz = tsc_khz;
376 clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz, 396 clocksource_tsc.mult = clocksource_khz2mult(current_tsc_khz,
377 clocksource_tsc.shift); 397 clocksource_tsc.shift);