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

Commit 4ecbd88b authored by Quentin Perret's avatar Quentin Perret Committed by Greg Kroah-Hartman
Browse files

cpufreq: scmi: Fix frequency invariance in slow path 



commit 0e141d1c65c1dd31c914eb2e11651adcc1a15912 upstream.

The scmi-cpufreq driver calls the arch_set_freq_scale() callback on
frequency changes to provide scale-invariant load-tracking signals to
the scheduler. However, in the slow path, it does so while specifying
the current and max frequencies in different units, hence resulting in a
broken freq_scale factor.

Fix this by passing all frequencies in KHz, as stored in the CPUFreq
frequency table.

Fixes: 99d6bdf3 (cpufreq: add support for CPU DVFS based on SCMI message protocol)
Signed-off-by: default avatarQuentin Perret <quentin.perret@arm.com>
Acked-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Acked-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Cc: 4.17+ <stable@vger.kernel.org> # v4.17+
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f64231cb

drivers/cpufreq/scmi-cpufreq.c

+2 −2
Original line number Diff line number Diff line
@@ -52,9 +52,9 @@ scmi_cpufreq_set_target(struct cpufreq_policy *policy, unsigned int index) 
	int ret;

	struct scmi_data *priv = policy->driver_data;

	struct scmi_perf_ops *perf_ops = handle->perf_ops;

	u64 freq = policy->freq_table[index].frequency * 1000;

	u64 freq = policy->freq_table[index].frequency;



	ret = perf_ops->freq_set(handle, priv->domain_id, freq, false);

	ret = perf_ops->freq_set(handle, priv->domain_id, freq * 1000, false);

	if (!ret)

		arch_set_freq_scale(policy->related_cpus, freq,

				    policy->cpuinfo.max_freq);