[PATCH] Fix Geode LX timekeeping in generic build

[David Woodhouse <dwmw2@infradead.org>]

[-- Attachment #1: Type: text/plain, Size: 3306 bytes --]

In 2007, commit 07190a08eef36 ("Mark TSC on GeodeLX reliable") bypassed
verification of the TSC on Geode LX. However, this code (now in the
check_system_tsc_reliable() function in arch/x86/kernel/tsc.c) was only
present if CONFIG_MGEODE_LX was set. 

OpenWRT has recently started building its generic Geode target for
Geode GX, not LX, to include support for additional platforms. This
broke the timekeeping on LX-based devices, because the TSC wasn't
marked as reliable: https://dev.openwrt.org/ticket/20531

By adding a runtime check on is_geode_lx(), we can also include the fix
if CONFIG_MGEODEGX1 or CONFIG_X86_GENERIC are set, thus fixing the
problem.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Cc: stable@vger.kernel.org
---
I'm slightly concerned about bypassing verification though, when the
reason I *noticed* this issue is because the verification *failed*:

[    8.893307] xt_time: kernel timezone is -0000                                
[   14.522754] clocksource: timekeeping watchdog: Marking clocksource 'tsc' as unstable because the skew is too large:                                          
[   14.555090] clocksource:                       'pit' wd_now: eba5b2f7 wd_last: eb9ca2c8 mask: ffffffff                                                       
[   14.564406] clocksource:                       'tsc' cs_now: 29eb8ba17 cs_last: 28c61a5f6 mask: ffffffffffffffff                                             
[   14.598508] clocksource: Switched to clocksource pit  

If the bypass is supposed to be just an optimisation, surely this means
there's something else wrong? Or that bypassing the validation wasn't
the right thing to do in the first place?

FWIW the clock *does* run correctly if using the TSC, after applying
this patch. If I let it fall back to the PIT, it gains time wildly.

diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 7437b41..dc9af7a 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -21,6 +21,7 @@
 #include <asm/hypervisor.h>
 #include <asm/nmi.h>
 #include <asm/x86_init.h>
+#include <asm/geode.h>
 
 unsigned int __read_mostly cpu_khz;	/* TSC clocks / usec, not used here */
 EXPORT_SYMBOL(cpu_khz);
@@ -1013,15 +1014,17 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
 
 static void __init check_system_tsc_reliable(void)
 {
-#ifdef CONFIG_MGEODE_LX
-	/* RTSC counts during suspend */
+#if defined(CONFIG_MGEODEGX1) || defined(CONFIG_MGEODE_LX) || defined(CONFIG_X86_GENERIC)
+	if (is_geode_lx()) {
+		/* RTSC counts during suspend */
 #define RTSC_SUSP 0x100
-	unsigned long res_low, res_high;
+		unsigned long res_low, res_high;
 
-	rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
-	/* Geode_LX - the OLPC CPU has a very reliable TSC */
-	if (res_low & RTSC_SUSP)
-		tsc_clocksource_reliable = 1;
+		rdmsr_safe(MSR_GEODE_BUSCONT_CONF0, &res_low, &res_high);
+		/* Geode_LX - the OLPC CPU has a very reliable TSC */
+		if (res_low & RTSC_SUSP)
+			tsc_clocksource_reliable = 1;
+	}
 #endif
 	if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE))
 		tsc_clocksource_reliable = 1;



-- 
David Woodhouse                            Open Source Technology Centre
David.Woodhouse@intel.com                              Intel Corporation


[-- Attachment #2: smime.p7s --]
[-- Type: application/x-pkcs7-signature, Size: 5691 bytes --]