Merge branch 'pm-cpufreq-fixes' into fixes

rafaeljw · rafaeljw · commit 56560905d9e9 · 2025-04-30T16:29:23.000+02:00
* pm-cpufreq-fixes:
  cpufreq: intel_pstate: Unchecked MSR aceess in legacy mode
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
@@ -598,6 +598,9 @@ static bool turbo_is_disabled(void)
 {
 	u64 misc_en;
 
+	if (!cpu_feature_enabled(X86_FEATURE_IDA))
+		return true;
+
 	rdmsrl(MSR_IA32_MISC_ENABLE, misc_en);
 
 	return !!(misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);

Original file line number	Diff line number	Diff line change
`@@ -598,6 +598,9 @@ static bool turbo_is_disabled(void)`
`598`	`598`	`{`
`599`	`599`	`u64 misc_en;`
`600`	`600`
	`601`	`+ if (!cpu_feature_enabled(X86_FEATURE_IDA))`
	`602`	`+ return true;`
	`603`	`+`
`601`	`604`	`rdmsrl(MSR_IA32_MISC_ENABLE, misc_en);`
`602`	`605`
`603`	`606`	`return !!(misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);`