From: Ingo Molnar <mingo@kernel.org>
Date: Tue, 4 Mar 2025 10:15:26 +0000 (+0100)
Subject: Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits
X-Git-Tag: v6.15-rc1~216^2~86^2~8^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'x86/urgent' into x86/cpu, to pick up dependent commits

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

1b4c36f9b11e4a68f6174d1b6542b50cd29cddd2
diff --cc drivers/idle/intel_idle.c
index e59073efb6fa4,0fdb1d1316c44..5687089e406a6
--- a/drivers/idle/intel_idle.c
+++ b/drivers/idle/intel_idle.c
@@@ -56,8 -56,8 +56,9 @@@
  #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>
  
  #define INTEL_IDLE_VERSION "0.5.1"
  
@@@ -1809,8 -1800,10 +1810,11 @@@ static void __init intel_idle_init_csta
  		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;
  	}
  }