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

Commit 0646dd35 authored by Chris Redpath's avatar Chris Redpath Committed by Andres Oportus
Browse files

UPSTREAM: cpufreq: schedutil: move cached_raw_freq to struct sugov_policy 



cached_raw_freq applies to the entire cpufreq policy and not individual
CPUs. Apart from wasting per-cpu memory, it is actually wrong to keep it
in struct sugov_cpu as we may end up comparing next_freq with a stale
cached_raw_freq of a random CPU.

Move cached_raw_freq to struct sugov_policy.

Fixes: 5cbea46984d6 (cpufreq: schedutil: map raw required frequency to driver frequency)
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry-picked from 6c4f0fa643cb9e775dcc976e3db00d649468ff1d)
Signed-off-by: default avatarChris Redpath <chris.redpath@arm.com>
Change-Id: Ie91420f710819b383947f9031da9be1f3bb7f636
parent 69fc7578

kernel/sched/cpufreq_schedutil.c

+4 −4
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ struct sugov_policy { 
	s64 up_rate_delay_ns;

	s64 down_rate_delay_ns;

	unsigned int next_freq;

	unsigned int cached_raw_freq;



	/* The next fields are only needed if fast switch cannot be used. */

	struct irq_work irq_work;
@@ -63,7 +64,6 @@ struct sugov_cpu { 
	struct update_util_data update_util;

	struct sugov_policy *sg_policy;



	unsigned int cached_raw_freq;

	unsigned long iowait_boost;

	unsigned long iowait_boost_max;

	u64 last_update;
@@ -180,9 +180,9 @@ static unsigned int get_next_freq(struct sugov_cpu *sg_cpu, unsigned long util, 


	freq = (freq + (freq >> 2)) * util / max;



	if (freq == sg_cpu->cached_raw_freq && sg_policy->next_freq != UINT_MAX)

	if (freq == sg_policy->cached_raw_freq && sg_policy->next_freq != UINT_MAX)

		return sg_policy->next_freq;

	sg_cpu->cached_raw_freq = freq;

	sg_policy->cached_raw_freq = freq;

	return cpufreq_driver_resolve_freq(policy, freq);

}
@@ -687,6 +687,7 @@ static int sugov_start(struct cpufreq_policy *policy) 
	sg_policy->next_freq = UINT_MAX;

	sg_policy->work_in_progress = false;

	sg_policy->need_freq_update = false;

	sg_policy->cached_raw_freq = 0;



	for_each_cpu(cpu, policy->cpus) {

		struct sugov_cpu *sg_cpu = &per_cpu(sugov_cpu, cpu);
@@ -697,7 +698,6 @@ static int sugov_start(struct cpufreq_policy *policy) 
			sg_cpu->max = 0;

			sg_cpu->flags = SCHED_CPUFREQ_DL;

			sg_cpu->last_update = 0;

			sg_cpu->cached_raw_freq = 0;

			sg_cpu->iowait_boost = 0;

			sg_cpu->iowait_boost_max = policy->cpuinfo.max_freq;

			cpufreq_add_update_util_hook(cpu, &sg_cpu->update_util,