[PATCH 4/4] cpufreq: Move traces and update to policy->cur to cpufreq core

Viresh Kumar
2020-09-02T07:25:29Z

The cpufreq core handles the updates to policy->cur and recording of
cpufreq trace events for all the governors except schedutil's fast
switch case.

Move that as well to cpufreq core for consistency and readability.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
---
drivers/cpufreq/cpufreq.c | 14 ++++++++++++--
kernel/sched/cpufreq_schedutil.c | 12 +-----------
2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
index d5fe64e96be9..bc930f6ecff6 100644
--- a/drivers/cpufreq/cpufreq.c
+++ b/drivers/cpufreq/cpufreq.c
@@ -2056,11 +2056,21 @@ EXPORT_SYMBOL(cpufreq_unregister_notifier);
unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy,
unsigned int target_freq)
{
+ int cpu;
+
target_freq = clamp_val(target_freq, policy->min, policy->max);
target_freq = cpufreq_driver->fast_switch(policy, target_freq);

- if (target_freq)
- cpufreq_stats_record_transition(policy, target_freq);
+ if (!target_freq)
+ return 0;
+
+ policy->cur = target_freq;
+ cpufreq_stats_record_transition(policy, target_freq);
+
+ if (trace_cpu_frequency_enabled()) {
+ for_each_cpu(cpu, policy->cpus)
+ trace_cpu_frequency(target_freq, cpu);
+ }

return target_freq;
}
diff --git a/kernel/sched/cpufreq_schedutil.c b/kernel/sched/cpufreq_schedutil.c
index e39008242cf4..28f6d1ad608b 100644
--- a/kernel/sched/cpufreq_schedutil.c
+++ b/kernel/sched/cpufreq_schedutil.c
@@ -115,21 +115,11 @@ static void sugov_fast_switch(struct sugov_policy *sg_policy, u64 time,
unsigned int next_freq)
{
struct cpufreq_policy *policy = sg_policy->policy;
- int cpu;

if (!sugov_update_next_freq(sg_policy, time, next_freq))
return;

- next_freq = cpufreq_driver_fast_switch(policy, next_freq);
- if (!next_freq)
- return;
-
- policy->cur = next_freq;
-
- if (trace_cpu_frequency_enabled()) {
- for_each_cpu(cpu, policy->cpus)
- trace_cpu_frequency(next_freq, cpu);
- }
+ cpufreq_driver_fast_switch(policy, next_freq);
}

static void sugov_deferred_update(struct sugov_policy *sg_policy, u64 time,
--
2.25.0.rc1.19.g042ed3e048af