mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-10 12:57:06 +09:00
Revert "ANDROID: cpufreq: Max freq invariant scheduler load-tracking and cpu capacity support"
This reverts commit 4eb92977b2.
Change-Id: I54be27771b58b630c12925ce40d5651cee135b2d
Signed-off-by: Quentin Perret <quentin.perret@arm.com>
This commit is contained in:
@@ -315,14 +315,12 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
|
||||
*********************************************************************/
|
||||
|
||||
static DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE;
|
||||
static DEFINE_PER_CPU(unsigned long, max_freq_scale) = SCHED_CAPACITY_SCALE;
|
||||
|
||||
static void
|
||||
scale_freq_capacity(struct cpufreq_policy *policy, struct cpufreq_freqs *freqs)
|
||||
{
|
||||
unsigned long cur = freqs ? freqs->new : policy->cur;
|
||||
unsigned long scale = (cur << SCHED_CAPACITY_SHIFT) / policy->max;
|
||||
struct cpufreq_cpuinfo *cpuinfo = &policy->cpuinfo;
|
||||
int cpu;
|
||||
|
||||
pr_debug("cpus %*pbl cur/cur max freq %lu/%u kHz freq scale %lu\n",
|
||||
@@ -330,18 +328,6 @@ scale_freq_capacity(struct cpufreq_policy *policy, struct cpufreq_freqs *freqs)
|
||||
|
||||
for_each_cpu(cpu, policy->cpus)
|
||||
per_cpu(freq_scale, cpu) = scale;
|
||||
|
||||
if (freqs)
|
||||
return;
|
||||
|
||||
scale = (policy->max << SCHED_CAPACITY_SHIFT) / cpuinfo->max_freq;
|
||||
|
||||
pr_debug("cpus %*pbl cur max/max freq %u/%u kHz max freq scale %lu\n",
|
||||
cpumask_pr_args(policy->cpus), policy->max, cpuinfo->max_freq,
|
||||
scale);
|
||||
|
||||
for_each_cpu(cpu, policy->cpus)
|
||||
per_cpu(max_freq_scale, cpu) = scale;
|
||||
}
|
||||
|
||||
unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu)
|
||||
@@ -349,11 +335,6 @@ unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu)
|
||||
return per_cpu(freq_scale, cpu);
|
||||
}
|
||||
|
||||
unsigned long cpufreq_scale_max_freq_capacity(int cpu)
|
||||
{
|
||||
return per_cpu(max_freq_scale, cpu);
|
||||
}
|
||||
|
||||
static void __cpufreq_notify_transition(struct cpufreq_policy *policy,
|
||||
struct cpufreq_freqs *freqs, unsigned int state)
|
||||
{
|
||||
|
||||
@@ -932,5 +932,4 @@ int cpufreq_generic_init(struct cpufreq_policy *policy,
|
||||
|
||||
struct sched_domain;
|
||||
unsigned long cpufreq_scale_freq_capacity(struct sched_domain *sd, int cpu);
|
||||
unsigned long cpufreq_scale_max_freq_capacity(int cpu);
|
||||
#endif /* _LINUX_CPUFREQ_H */
|
||||
|
||||
Reference in New Issue
Block a user