Skip to content

Commit

Permalink
x86: remove explicit C3 TSC check on 64bit
Browse files Browse the repository at this point in the history
Trust the ACPI code to disable TSC instead when C3 is used.

AMD Fam10h does not disable TSC in any C states so the
check was incorrect there anyways after the change
to handle this like Intel on AMD too.

This allows to use the TSC when C3 is disabled in software
(acpi.max_c_state=2), but the BIOS supports it anyways.

Match i386 behaviour.

Cc: lenb@kernel.org

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
  • Loading branch information
Andi Kleen authored and Ingo Molnar committed Jan 30, 2008
1 parent 51fc97b commit 32c7553
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions arch/x86/kernel/tsc_64.c
Original file line number Diff line number Diff line change
Expand Up @@ -273,15 +273,8 @@ __cpuinit int unsynchronized_tsc(void)
return 1;
#endif

if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC)) {
#ifdef CONFIG_ACPI
/* But TSC doesn't tick in C3 so don't use it there */
if (acpi_gbl_FADT.header.length > 0 &&
acpi_gbl_FADT.C3latency < 1000)
return 1;
#endif
if (boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
return 0;
}

/* Assume multi socket systems are not synchronized */
return num_present_cpus() > 1;
Expand Down

0 comments on commit 32c7553

Please sign in to comment.