Commit 9bf93c83 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Jia, Yingbao
Browse files

cpufreq: intel_pstate: Replace boot_cpu_has() 

mainline inclusion
from mainline-v6.11
commit acfc429e42f09524653af52998548cd9317892a6
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/IB6QC4
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=acfc429e42f09524653af52998548cd9317892a6



-------------------------------------------------

Intel-SIG: commit acfc429e42f0 cpufreq: intel_pstate: Replace boot_cpu_has().
Backport intel_pstate driver update for 6.6 from 6.11

Replace boot_cpu_has() with cpu_feature_enabled().

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://patch.msgid.link/20240624162714.1431182-1-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 23a79cb0

drivers/cpufreq/intel_pstate.c

+2 −2
Original line number Diff line number Diff line
@@ -1628,7 +1628,7 @@ void notify_hwp_interrupt(void) 
	unsigned long flags;

	u64 value;



	if (!hwp_active || !boot_cpu_has(X86_FEATURE_HWP_NOTIFY))

	if (!hwp_active || !cpu_feature_enabled(X86_FEATURE_HWP_NOTIFY))

		return;



	rdmsrl_safe(MSR_HWP_STATUS, &value);
@@ -1657,7 +1657,7 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata) 
	unsigned long flags;

	bool cancel_work;



	if (!boot_cpu_has(X86_FEATURE_HWP_NOTIFY))

	if (!cpu_feature_enabled(X86_FEATURE_HWP_NOTIFY))

		return;



	/* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */