Commit 139ff713 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Jia, Yingbao
Browse files

cpufreq: intel_pstate: Replace three global.turbo_disabled checks 

mainline inclusion
from mainline-v6.10
commit f32587dcbe5f40e160d8de262add6abab79356a7
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=f32587dcbe5f40e160d8de262add6abab79356a7



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

Intel-SIG: commit f32587dcbe5f cpufreq: intel_pstate: Replace three global.turbo_disabled checks.
Backport intel_pstate driver update for 6.6 from 6.11

Replace the global.turbo_disabled in __intel_pstate_update_max_freq() with
a global.no_turbo one to make store_no_turbo() actually update the maximum
CPU frequency on the trubo preference changes, which needs to be consistent
with arch_set_max_freq_ratio() called from there.

For more consistency, replace the global.turbo_disabled checks in
__intel_pstate_cpu_init() and intel_cpufreq_adjust_perf() with
global.no_turbo checks either.

Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Acked-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
[ Yingbao Jia: amend commit log ]
Signed-off-by: default avatarYingbao Jia <yingbao.jia@intel.com>
parent 52df8f78

drivers/cpufreq/intel_pstate.c

+5 −4
Original line number Diff line number Diff line
@@ -1149,7 +1149,7 @@ static void intel_pstate_update_policies(void) 
static void __intel_pstate_update_max_freq(struct cpudata *cpudata,

					   struct cpufreq_policy *policy)

{

	policy->cpuinfo.max_freq = global.turbo_disabled ?

	policy->cpuinfo.max_freq = READ_ONCE(global.no_turbo) ?

			cpudata->pstate.max_freq : cpudata->pstate.turbo_freq;

	refresh_frequency_limits(policy);

}
@@ -2703,7 +2703,7 @@ static int __intel_pstate_cpu_init(struct cpufreq_policy *policy) 


	/* cpuinfo and default policy values */

	policy->cpuinfo.min_freq = cpu->pstate.min_freq;

	policy->cpuinfo.max_freq = global.turbo_disabled ?

	policy->cpuinfo.max_freq = READ_ONCE(global.no_turbo) ?

			cpu->pstate.max_freq : cpu->pstate.turbo_freq;



	policy->min = policy->cpuinfo.min_freq;
@@ -2906,7 +2906,8 @@ static void intel_cpufreq_adjust_perf(unsigned int cpunum, 
	int old_pstate = cpu->pstate.current_pstate;

	int cap_pstate, min_pstate, max_pstate, target_pstate;



	cap_pstate = global.turbo_disabled ? HWP_GUARANTEED_PERF(hwp_cap) :

	cap_pstate = READ_ONCE(global.no_turbo) ?

					HWP_GUARANTEED_PERF(hwp_cap) :

					HWP_HIGHEST_PERF(hwp_cap);



	/* Optimization: Avoid unnecessary divisions. */