Skip to content

Commit f6ec529

Browse files
KAGA-KOKOopsiff
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 <fabstz-it@yahoo.fr> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Tested-by: Fab Stz <fabstz-it@yahoo.fr> Cc: All applicable <stable@vger.kernel.org> Closes: https://lore.kernel.org/all/10cf96aa-1276-4bd4-8966-c890377030c3@yahoo.fr Link: https://patch.msgid.link/87bjupfy7f.ffs@tglx Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> (cherry picked from commit 3b7d2d1)
1 parent 9e5d807 commit f6ec529

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

drivers/idle/intel_idle.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
#include <asm/nospec-branch.h>
5757
#include <asm/mwait.h>
5858
#include <asm/msr.h>
59+
#include <asm/tsc.h>
5960
#include <asm/fpu/api.h>
6061

6162
#define INTEL_IDLE_VERSION "0.5.1"
@@ -1707,6 +1708,9 @@ static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv)
17071708
if (intel_idle_state_needs_timer_stop(state))
17081709
state->flags |= CPUIDLE_FLAG_TIMER_STOP;
17091710

1711+
if (cx->type > ACPI_STATE_C1 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
1712+
mark_tsc_unstable("TSC halts in idle");
1713+
17101714
state->enter = intel_idle;
17111715
state->enter_s2idle = intel_idle_s2idle;
17121716
}

0 commit comments

Comments
 (0)