Commit ce5a3a8e authored by Ionela Voinescu's avatar Ionela Voinescu Committed by Zeng Heng
Browse files

cppc_cpufreq: use policy->cpu as driver of frequency setting 

mainline inclusion
from mainline-v5.11-rc1
commit d2641a5c
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8TPP6

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d2641a5c3d5ecaa1078225e493c7fed821715a04



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

Considering only the currently supported coordination types (ANY, HW,
NONE), this change only makes a difference for the ANY type, when
policy->cpu is hotplugged out. In that case the new policy->cpu will
be different from ((struct cppc_cpudata *)policy->driver_data)->cpu.

While in this case the controls of *ANY* CPU could be used to drive
frequency changes, it's more consistent to use policy->cpu as the
leading CPU, as used in all other cppc_cpufreq functions. Additionally,
the debug prints in cppc_set_perf() would no longer create confusion
when referring to a CPU that is hotplugged out.

Signed-off-by: default avatarIonela Voinescu <ionela.voinescu@arm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Tested-by: default avatarMian Yousaf Kaukab <ykaukab@suse.de>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent 8aa11dc8

drivers/cpufreq/cppc_cpufreq.c

+3 −2
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, 
		unsigned int relation)

{

	struct cppc_cpudata *cpu_data = all_cpu_data[policy->cpu];

	unsigned int cpu = policy->cpu;

	struct cpufreq_freqs freqs;

	u32 desired_perf;

	int ret = 0;
@@ -170,12 +171,12 @@ static int cppc_cpufreq_set_target(struct cpufreq_policy *policy, 
	freqs.new = target_freq;



	cpufreq_freq_transition_begin(policy, &freqs);

	ret = cppc_set_perf(cpu_data->cpu, &cpu_data->perf_ctrls);

	ret = cppc_set_perf(cpu, &cpu_data->perf_ctrls);

	cpufreq_freq_transition_end(policy, &freqs, ret != 0);



	if (ret)

		pr_debug("Failed to set target on CPU:%d. ret:%d\n",

				cpu_data->cpu, ret);

				cpu, ret);



	return ret;

}