Commit 14ebe690 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fix from Rafael Wysocki:
 "Fix the handling of processors that stop the TSC in deeper C-states in
  the intel_idle driver (Thomas Gleixner)"

* tag 'pm-6.14-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  intel_idle: Handle older CPUs, which stop the TSC in deeper C states, correctly
parents 7a566889 c157d351

drivers/idle/intel_idle.c

+4 −0
Original line number Diff line number Diff line
@@ -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>



#define INTEL_IDLE_VERSION "0.5.1"
@@ -1799,6 +1800,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_s2idle = intel_idle_s2idle;

	}