diff options
| author | Ingo Molnar <[email protected]> | 2025-03-04 10:15:26 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2025-03-04 10:15:26 +0000 |
| commit | 1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2 (patch) | |
| tree | 735b11a744d0acd18a1d7b7a4a5fa63fc6d23b92 /drivers/idle/intel_idle.c | |
| parent | x86/cpu: Log CPU flag cmdline hacks more verbosely (diff) | |
| parent | x86/cpu: Properly parse CPUID leaf 0x2 TLB descriptor 0x63 (diff) | |
| download | kernel-1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2.tar.gz kernel-1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2.zip | |
Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'drivers/idle/intel_idle.c')
| -rw-r--r-- | drivers/idle/intel_idle.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index e59073efb6fa..5687089e406a 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -56,6 +56,7 @@ #include <asm/intel-family.h> #include <asm/mwait.h> #include <asm/spec-ctrl.h> +#include <asm/tsc.h> #include <asm/fpu/api.h> #include <asm/smp.h> @@ -1809,6 +1810,9 @@ static void __init intel_idle_init_cstates_acpi(struct cpuidle_driver *drv) if (intel_idle_state_needs_timer_stop(state)) state->flags |= CPUIDLE_FLAG_TIMER_STOP; + if (cx->type > ACPI_STATE_C1 && !boot_cpu_has(X86_FEATURE_NONSTOP_TSC)) + mark_tsc_unstable("TSC halts in idle"); + state->enter = intel_idle; state->enter_dead = intel_idle_enter_dead; state->enter_s2idle = intel_idle_s2idle; |