Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64897b20 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

cpufreq: intel_pstate: Fix policy data management in passive mode 



The policy->cpuinfo.max_freq and policy->max updates in
intel_cpufreq_turbo_update() are excessive as they are done for no
good reason and may lead to problems in principle, so they should be
dropped.  However, after dropping them intel_cpufreq_turbo_update()
becomes almost entirely pointless, because the check made by it is
made again down the road in intel_pstate_prepare_request().  The
only thing in it that still needs to be done is the call to
update_turbo_state(), so drop intel_cpufreq_turbo_update() altogether
and make its callers invoke update_turbo_state() directly instead of
it.

In addition to that, fix intel_cpufreq_verify_policy() so that it
checks global.no_turbo in addition to global.turbo_disabled when
updating policy->cpuinfo.max_freq to make it consistent with
intel_pstate_verify_policy().

Fixes: 001c76f0 (cpufreq: intel_pstate: Generic governors support)
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 7de32556

drivers/cpufreq/intel_pstate.c

+6 −23
Original line number Diff line number Diff line
@@ -2257,7 +2257,7 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy) 
	struct cpudata *cpu = all_cpu_data[policy->cpu];



	update_turbo_state();

	policy->cpuinfo.max_freq = global.turbo_disabled ?

	policy->cpuinfo.max_freq = global.no_turbo || global.turbo_disabled ?

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



	cpufreq_verify_within_cpu_limits(policy);
@@ -2265,26 +2265,6 @@ static int intel_cpufreq_verify_policy(struct cpufreq_policy *policy) 
	return 0;

}



static unsigned int intel_cpufreq_turbo_update(struct cpudata *cpu,

					       struct cpufreq_policy *policy,

					       unsigned int target_freq)

{

	unsigned int max_freq;



	update_turbo_state();



	max_freq = global.no_turbo || global.turbo_disabled ?

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

	policy->cpuinfo.max_freq = max_freq;

	if (policy->max > max_freq)

		policy->max = max_freq;



	if (target_freq > max_freq)

		target_freq = max_freq;



	return target_freq;

}



static int intel_cpufreq_target(struct cpufreq_policy *policy,

				unsigned int target_freq,

				unsigned int relation)
@@ -2293,8 +2273,10 @@ 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 = intel_cpufreq_turbo_update(cpu, policy, target_freq);

	freqs.new = target_freq;



	cpufreq_freq_transition_begin(policy, &freqs);

	switch (relation) {
@@ -2326,7 +2308,8 @@ static unsigned int intel_cpufreq_fast_switch(struct cpufreq_policy *policy, 
	struct cpudata *cpu = all_cpu_data[policy->cpu];

	int target_pstate;



	target_freq = intel_cpufreq_turbo_update(cpu, policy, target_freq);

	update_turbo_state();



	target_pstate = DIV_ROUND_UP(target_freq, cpu->pstate.scaling);

	target_pstate = intel_pstate_prepare_request(cpu, target_pstate);

	intel_pstate_update_pstate(cpu, target_pstate);