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

Commit 625ebc8a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Alistair Delva
Browse files

Revert "ANDROID: cpufreq: arch_topology: implement max frequency capping" 



This reverts commit 1bf760e9.

We want to back-out the eas-dev merge that happened in the tree after
5.3-rc1 as those patches "should" all be in Linus's tree now.

This is done to handle the merge conflicts with 5.4-rc1.

Cc: Todd Kjos <tkjos@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Id2e5decdfcfe8ba3fb150ef74f2315070cf13e9d
parent 6ab09372

drivers/base/arch_topology.c

+1 −24
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
#include <linux/cpuset.h>



DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;

DEFINE_PER_CPU(unsigned long, max_cpu_freq);

DEFINE_PER_CPU(unsigned long, max_freq_scale) = SCHED_CAPACITY_SCALE;



void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

			 unsigned long max_freq)
@@ -28,29 +26,8 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, 


	scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_freq;



	for_each_cpu(i, cpus) {

	for_each_cpu(i, cpus)

		per_cpu(freq_scale, i) = scale;

		per_cpu(max_cpu_freq, i) = max_freq;

	}

}



void arch_set_max_freq_scale(struct cpumask *cpus,

			     unsigned long policy_max_freq)

{

	unsigned long scale, max_freq;

	int cpu = cpumask_first(cpus);



	if (cpu > nr_cpu_ids)

		return;



	max_freq = per_cpu(max_cpu_freq, cpu);

	if (!max_freq)

		return;



	scale = (policy_max_freq << SCHED_CAPACITY_SHIFT) / max_freq;



	for_each_cpu(cpu, cpus)

		per_cpu(max_freq_scale, cpu) = scale;

}



DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;

drivers/cpufreq/cpufreq.c

+0 −8
Original line number Diff line number Diff line
@@ -153,12 +153,6 @@ __weak void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, 
}

EXPORT_SYMBOL_GPL(arch_set_freq_scale);



__weak void arch_set_max_freq_scale(struct cpumask *cpus,

				    unsigned long policy_max_freq)

{

}

EXPORT_SYMBOL_GPL(arch_set_max_freq_scale);



/*

 * This is a generic cpufreq init() routine which can be used by cpufreq

 * drivers of SMP systems. It will do following:
@@ -2422,8 +2416,6 @@ int cpufreq_set_policy(struct cpufreq_policy *policy, 
	policy->max = new_policy->max;

	trace_cpu_frequency_limits(policy);



	arch_set_max_freq_scale(policy->cpus, policy->max);



	policy->cached_target_freq = UINT_MAX;



	pr_debug("new min and max freqs are %u - %u kHz\n",

include/linux/arch_topology.h

+0 −8
Original line number Diff line number Diff line
@@ -33,12 +33,4 @@ unsigned long topology_get_freq_scale(int cpu) 
	return per_cpu(freq_scale, cpu);

}



DECLARE_PER_CPU(unsigned long, max_freq_scale);



static inline

unsigned long topology_get_max_freq_scale(struct sched_domain *sd, int cpu)

{

	return per_cpu(max_freq_scale, cpu);

}



#endif /* _LINUX_ARCH_TOPOLOGY_H_ */

include/linux/cpufreq.h

+0 −2
Original line number Diff line number Diff line
@@ -984,8 +984,6 @@ extern unsigned int arch_freq_get_on_cpu(int cpu); 


extern void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,

				unsigned long max_freq);

extern void arch_set_max_freq_scale(struct cpumask *cpus,

				    unsigned long policy_max_freq);



/* the following are really really optional */

extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;