Skip to content

Commit 48848d5

Browse files
KAGA-KOKOgregkh
authored andcommitted
intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly
commit c157d35 upstream. The Intel idle driver is preferred over the ACPI processor idle driver, but fails to implement the work around for Core2 generation CPUs, where the TSC stops in C2 and deeper C-states. This causes stalls and boot delays, when the clocksource watchdog does not catch the unstable TSC before the CPU goes deep idle for the first time. The ACPI driver marks the TSC unstable when it detects that the CPU supports C2 or deeper and the CPU does not have a non-stop TSC. Add the equivivalent work around to the Intel idle driver to cure that. Fixes: 1873495 ("intel_idle: Use ACPI _CST for processor models without C-state tables") Reported-by: Fab Stz <[email protected]> Signed-off-by: Thomas Gleixner <[email protected]> Tested-by: Fab Stz <[email protected]> Cc: All applicable <[email protected]> Closes: https://lore.kernel.org/all/[email protected] Link: https://patch.msgid.link/87bjupfy7f.ffs@tglx Signed-off-by: Rafael J. Wysocki <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 4117c72 commit 48848d5

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/idle/intel_idle.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
#include <asm/intel-family.h>
5656
#include <asm/mwait.h>
5757
#include <asm/spec-ctrl.h>
58+
#include <asm/tsc.h>
5859
#include <asm/fpu/api.h>
5960

6061
#define INTEL_IDLE_VERSION "0.5.1"
@@ -1749,6 +1750,9 @@ static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv)
17491750
if (intel_idle_state_needs_timer_stop(state))
17501751
state->flags |= CPUIDLE_FLAG_TIMER_STOP;
17511752

1753+
if (cx->type > ACPI_STATE_C1 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
1754+
mark_tsc_unstable("TSC halts in idle");
1755+
17521756
state->enter = intel_idle;
17531757
state->enter_s2idle = intel_idle_s2idle;
17541758
}

0 commit comments

Comments
 (0)