x86: Support always running TSC on Intel CPUs
hpa/Ingo,
Haven't seen any comments on the patches here. Can you push it along in case there are no issues.
Thaks,
Venki
Quoted 156 lines
-----Original Message-----
From: Pallipadi, Venkatesh
Sent: Tuesday, November 25, 2008 3:58 PM
To: [email protected]; [email protected]; [email protected]
Cc: [email protected]; [email protected]; Pallipadi, Venkatesh
Subject: [patch 1/2] x86: Support always running TSC on Intel CPUsAdd support for
CPUID_0x80000007_Bit8on Intel CPUs as well. This bit means
that the TSC is invariant with C/P/T states and always runs at constant frequency.With Intel CPUs, we have 3 classes
* CPUs where TSC runs at constant rate and does not stop n C-states
* CPUs where TSC runs at constant rate, but will stop in C2/C3 states
* CPUs where TSC rate will vary based on P/T-states and TSC will stop in
C2/C3 states.To cover these 3, one feature bit (
CONSTANT_TSC) is not enough. So, add a
second bit (ALWAYSRUNS_TSC).CONSTANT_TSCindicates that the TSC runs at
constant frequency irrespective of P/T-states, andALWAYSRUNS_TSCindicates
that TSC does not stop in deep C-states (C2 and beyond).
CPUID_0x8000000_Bit8indicates both these feature bit can be set. We still haveCONSTANT_TSCset andALWAYSRUNS_TSCnot set on some older Intel
CPUs, based on model checks for earlier CPUs. We can use TSC on such CPUs
for time, as long as those CPUs do not support/enter deep C-states.Signed-off-by Venkatesh Pallipadi <[email protected]>---
arch/x86/include/asm/cpufeature.h | 1 + arch/x86/kernel/cpu/amd.c | 9 +++++++-- arch/x86/kernel/cpu/intel.c | 10 ++++++++++ arch/x86/kernel/process.c | 2 +- drivers/acpi/processor_idle.c | 6 +++--- 5 files changed, 22 insertions(+), 6 deletions(-)Index:
tip/arch/x86/kernel/cpu/amd.c
===================================================================
---tip.orig/arch/x86/kernel/cpu/amd.c2008-11-25
13:36:30.000000000 -0800
+++tip/arch/x86/kernel/cpu/amd.c2008-11-25
13:46:06.000000000 -0800(quoted diff) +2
-2@@ -283,9 +283,14 @@ static void __cpuinit early_init_amd(str { early_init_amd_mc(c); - /* c->x86_power is 8000_0007 edx. Bit 8 is constant TSC */ - if (c->x86_power & (1<<8)) + /* + * c->x86_power is 8000_0007 edx. Bit 8 is TSC runs atconstant rate
(quoted diff) +3
-0+ * with P/T states and does not stop in deep C-states + */ + if (c->x86_power & (1 << 8)) {set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);(quoted diff) +2
-0+ set_cpu_cap(c, X86_FEATURE_ALWAYSRUNS_TSC); + }#ifdef CONFIG_X86_64 set_cpu_cap(c, X86_FEATURE_SYSCALL32);Index:
tip/arch/x86/kernel/cpu/intel.c
===================================================================
---tip.orig/arch/x86/kernel/cpu/intel.c2008-11-25
13:36:30.000000000 -0800
+++tip/arch/x86/kernel/cpu/intel.c2008-11-25
13:46:06.000000000 -0800(quoted diff) +3
-0@@ -41,6 +41,16 @@ static void __cpuinit early_init_intel(s if (c->x86 == 15 && c->x86_cache_alignment == 64) c->x86_cache_alignment = 128; #endif + + /* + * c->x86_power is 8000_0007 edx. Bit 8 is TSC runs atconstant rate
(quoted diff) +7
-0+ * with P/T states and does not stop in deep C-states + */ + if (c->x86_power & (1 << 8)) { + set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC); + set_cpu_cap(c, X86_FEATURE_ALWAYSRUNS_TSC); + } +}
#ifdef
CONFIG_X86_32
Index:tip/drivers/acpi/processor_idle.c
===================================================================
---tip.orig/drivers/acpi/processor_idle.c2008-11-25
13:36:30.000000000 -0800
+++tip/drivers/acpi/processor_idle.c2008-11-25
13:46:06.000000000 -0800(quoted diff) +3
-3@@ -374,15 +374,15 @@ static int tsc_halts_in_c(int state) { switch (boot_cpu_data.x86_vendor) { case X86_VENDOR_AMD: + case X86_VENDOR_INTEL: /* * AMD Fam10h TSC will tick in all * C/P/S0/S1 states when this bit is set. */ - if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) + if (boot_cpu_has(X86_FEATURE_ALWAYSRUNS_TSC)) return 0; + /*FALL THROUGH*/ - case X86_VENDOR_INTEL: - /* Several cases known where TSC halts in C2 too */ default: return state > ACPI_STATE_C1; }Index:
tip/arch/x86/include/asm/cpufeature.h
===================================================================
---tip.orig/arch/x86/include/asm/cpufeature.h2008-11-25
13:36:30.000000000 -0800
+++tip/arch/x86/include/asm/cpufeature.h2008-11-25
13:47:09.000000000 -0800(quoted diff) +0
-0@@ -92,6 +92,7 @@ #define X86_FEATURE_AMDC1E (3*32+21) /* AMD C1E detected */ #define X86_FEATURE_XTOPOLOGY (3*32+22) /* cpu topology enumextensions */
#defineX86_FEATURE_TSC_RELIABLE(3*32+23) /* TSC is known to be reliable */
+#defineX86_FEATURE_ALWAYSRUNS_TSC(3*32+24) /* TSC does not stop in C state *//* Intel-defined CPU features, CPUID level
0x00000001(ecx), word 4 */
#defineX86_FEATURE_XMM3(4*32+ 0) /* "pni" SSE-3 */
Index:tip/arch/x86/kernel/process.c
===================================================================
---tip.orig/arch/x86/kernel/process.c2008-11-25
13:36:30.000000000 -0800
+++tip/arch/x86/kernel/process.c2008-11-25
13:46:06.000000000 -0800(quoted diff) +1
-1@@ -286,7 +286,7 @@ static void c1e_idle(void) rdmsr(MSR_K8_INT_PENDING_MSG, lo, hi); if (lo & K8_INTP_C1E_ACTIVE_MASK) { c1e_detected = 1; - if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) + if (!boot_cpu_has(X86_FEATURE_ALWAYSRUNS_TSC)) mark_tsc_unstable("TSC halt in AMD C1E"); printk(KERN_INFO "System has AMD C1Eenabled\n"); set_cpu_cap(&boot_cpu_data, X86_FEATURE_AMDC1E);
Quoted 4 lines · Venkatesh
hpa/Ingo,
Haven't seen any comments on the patches here. Can you push it along in case there are no issues.
Hi Venki,
Sorry about that -- I think you know what's up on my end :) Will look at it as soon as I can.
-hpa
Quoted 10 lines · H. Peter Anvin
Quoted 4 lines · Venkatesh
hpa/Ingo,
Haven't seen any comments on the patches here. Can you push it along in case there are no issues.
Hi Venki,
Sorry about that -- I think you know what's up on my end :) Will look at it as soon as I can.
okay - i queued it up in x86/tsc. It looked sane last time too, just the 'NOSTOP_TSC' name sucked. I changed it to NONSTOP_TSC - hopefully we wont ever need a REALLY_NON_STOP_TSC distinction in the future ;-)
Ingo