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

cpufreq: intel_pstate: Do not update global.turbo_disabled after initialization 

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



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

Intel-SIG: commit 0940f1a8011f cpufreq: intel_pstate: Do not update global.turbo_disabled.
Backport intel_pstate driver update for 6.6 from 6.11

The global.turbo_disabled is updated quite often, especially in the
passive mode in which case it is updated every time the scheduler calls
into the driver.  However, this is generally not necessary and it adds
MSR read overhead to scheduler code paths (and that particular MSR is
slow to read).

For this reason, make the driver read MSR_IA32_MISC_ENABLE_TURBO_DISABLE
just once at the cpufreq driver registration time and remove all of the
in-flight updates of global.turbo_disabled.

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 394b7fd7

drivers/cpufreq/intel_pstate.c

+8 −43
Original line number Diff line number Diff line
@@ -173,7 +173,6 @@ struct vid_data { 
 *			based on the MSR_IA32_MISC_ENABLE value and whether or

 *			not the maximum reported turbo P-state is different from

 *			the maximum reported non-turbo one.

 * @turbo_disabled_mf:	The @turbo_disabled value reflected by cpuinfo.max_freq.

 * @min_perf_pct:	Minimum capacity limit in percent of the maximum turbo

 *			P-state capacity.

 * @max_perf_pct:	Maximum capacity limit in percent of the maximum turbo
@@ -182,7 +181,6 @@ struct vid_data { 
struct global_params {

	bool no_turbo;

	bool turbo_disabled;

	bool turbo_disabled_mf;

	int max_perf_pct;

	int min_perf_pct;

};
@@ -590,12 +588,13 @@ static void intel_pstate_hybrid_hwp_adjust(struct cpudata *cpu) 
	cpu->pstate.min_pstate = intel_pstate_freq_to_hwp(cpu, freq);

}



static inline void update_turbo_state(void)

static bool turbo_is_disabled(void)

{

	u64 misc_en;



	rdmsrl(MSR_IA32_MISC_ENABLE, misc_en);

	global.turbo_disabled = misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE;



	return !!(misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE);

}



static int min_perf_pct_min(void)
@@ -1150,40 +1149,16 @@ 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_mf ?

	policy->cpuinfo.max_freq = global.turbo_disabled ?

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

	refresh_frequency_limits(policy);

}



static void intel_pstate_update_max_freq(unsigned int cpu)

{

	struct cpufreq_policy *policy = cpufreq_cpu_acquire(cpu);



	if (!policy)

		return;



	__intel_pstate_update_max_freq(all_cpu_data[cpu], policy);



	cpufreq_cpu_release(policy);

}



static void intel_pstate_update_limits(unsigned int cpu)

{

	mutex_lock(&intel_pstate_driver_lock);



	update_turbo_state();

	/*

	 * If turbo has been turned on or off globally, policy limits for

	 * all CPUs need to be updated to reflect that.

	 */

	if (global.turbo_disabled_mf != global.turbo_disabled) {

		global.turbo_disabled_mf = global.turbo_disabled;

		arch_set_max_freq_ratio(global.turbo_disabled);

		for_each_possible_cpu(cpu)

			intel_pstate_update_max_freq(cpu);

	} else {

	cpufreq_update_policy(cpu);

	}



	mutex_unlock(&intel_pstate_driver_lock);

}
@@ -1283,7 +1258,6 @@ static ssize_t show_no_turbo(struct kobject *kobj, 
		return -EAGAIN;

	}



	update_turbo_state();

	if (global.turbo_disabled)

		ret = sprintf(buf, "%u\n", global.turbo_disabled);

	else
@@ -1313,7 +1287,6 @@ static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b, 


	mutex_lock(&intel_pstate_limits_lock);



	update_turbo_state();

	if (global.turbo_disabled) {

		pr_notice_once("Turbo disabled by BIOS or unavailable on processor\n");

		mutex_unlock(&intel_pstate_limits_lock);
@@ -2280,8 +2253,6 @@ static void intel_pstate_adjust_pstate(struct cpudata *cpu) 
	struct sample *sample;

	int target_pstate;



	update_turbo_state();



	target_pstate = get_target_pstate(cpu);

	target_pstate = intel_pstate_prepare_request(cpu, target_pstate);

	trace_cpu_frequency(target_pstate * cpu->pstate.scaling, cpu->cpu);
@@ -2592,7 +2563,6 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) 
		 * be invoked on them.

		 */

		intel_pstate_clear_update_util_hook(policy->cpu);

		update_turbo_state();

		intel_pstate_set_pstate(cpu, pstate);

	} else {

		intel_pstate_set_update_util_hook(policy->cpu);
@@ -2636,7 +2606,6 @@ static void intel_pstate_verify_cpu_policy(struct cpudata *cpu, 
{

	int max_freq;



	update_turbo_state();

	if (hwp_active) {

		intel_pstate_get_hwp_cap(cpu);

		max_freq = global.no_turbo || global.turbo_disabled ?
@@ -2733,8 +2702,6 @@ static int __intel_pstate_cpu_init(struct cpufreq_policy *policy) 


	/* cpuinfo and default policy values */

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

	update_turbo_state();

	global.turbo_disabled_mf = global.turbo_disabled;

	policy->cpuinfo.max_freq = global.turbo_disabled ?

			cpu->pstate.max_freq : cpu->pstate.turbo_freq;
@@ -2900,8 +2867,6 @@ static int intel_cpufreq_target(struct cpufreq_policy *policy, 
	struct cpufreq_freqs freqs;

	int target_pstate;



	update_turbo_state();



	freqs.old = policy->cur;

	freqs.new = target_freq;
@@ -2923,8 +2888,6 @@ static unsigned int intel_cpufreq_fast_switch(struct cpufreq_policy *policy, 
	struct cpudata *cpu = all_cpu_data[policy->cpu];

	int target_pstate;



	update_turbo_state();



	target_pstate = intel_pstate_freq_to_hwp(cpu, target_freq);



	target_pstate = intel_cpufreq_update_pstate(policy, target_pstate, true);
@@ -2942,7 +2905,6 @@ 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;



	update_turbo_state();

	cap_pstate = global.turbo_disabled ? HWP_GUARANTEED_PERF(hwp_cap) :

					     HWP_HIGHEST_PERF(hwp_cap);
@@ -3130,6 +3092,9 @@ static int intel_pstate_register_driver(struct cpufreq_driver *driver) 


	memset(&global, 0, sizeof(global));

	global.max_perf_pct = 100;

	global.turbo_disabled = turbo_is_disabled();



	arch_set_max_freq_ratio(global.turbo_disabled);



	intel_pstate_driver = driver;

	ret = cpufreq_register_driver(intel_pstate_driver);