Commit 08d8c65e authored by Viresh Kumar's avatar Viresh Kumar Committed by Rafael J. Wysocki
Browse files

cpufreq: Move traces and update to policy->cur to cpufreq core 



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: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
parent 96f60cdd

drivers/cpufreq/cpufreq.c

+7 −0
Original line number Diff line number Diff line
@@ -2068,6 +2068,7 @@ unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy, 
					unsigned int target_freq)

{

	unsigned int freq;

	int cpu;



	target_freq = clamp_val(target_freq, policy->min, policy->max);

	freq = cpufreq_driver->fast_switch(policy, target_freq);
@@ -2075,10 +2076,16 @@ unsigned int cpufreq_driver_fast_switch(struct cpufreq_policy *policy, 
	if (!freq)

		return 0;



	policy->cur = freq;

	arch_set_freq_scale(policy->related_cpus, freq,

			    policy->cpuinfo.max_freq);

	cpufreq_stats_record_transition(policy, freq);



	if (trace_cpu_frequency_enabled()) {

		for_each_cpu(cpu, policy->cpus)

			trace_cpu_frequency(freq, cpu);

	}



	return freq;

}

EXPORT_SYMBOL_GPL(cpufreq_driver_fast_switch);

kernel/sched/cpufreq_schedutil.c

+1 −11
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE