xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 0cfe39fe40.

Upstream has an equivalent feature now, drop the Android-specific
version.

Bug: 120440300
Signed-off-by: Quentin Perret <qperret@google.com>
Change-Id: Id1b2ad9249fb3441082cad34872d237b32b19b82
This commit is contained in:
Quentin Perret
2020-04-06 16:44:16 +01:00
committed by Greg Kroah-Hartman
parent 5c0602fc4a
commit c65b550185
4 changed files with 1 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/base/arch_topology.c
View File

@@ -26,8 +26,6 @@ __weak bool arch_freq_counters_available(struct cpumask *cpus)
return false; return false;
} }
DEFINE_PER_CPU(unsigned long, freq_scale) = SCHED_CAPACITY_SCALE; 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, void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,
unsigned long max_freq) unsigned long max_freq)
@@ -45,29 +43,8 @@ void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,
scale = (cur_freq << SCHED_CAPACITY_SHIFT) / max_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(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; DEFINE_PER_CPU(unsigned long, cpu_scale) = SCHED_CAPACITY_SCALE;

8
drivers/cpufreq/cpufreq.c
View File

@@ -161,12 +161,6 @@ __weak void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,
} }
EXPORT_SYMBOL_GPL(arch_set_freq_scale); 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 * This is a generic cpufreq init() routine which can be used by cpufreq
* drivers of SMP systems. It will do following: * drivers of SMP systems. It will do following:
@@ -2444,8 +2438,6 @@ static int cpufreq_set_policy(struct cpufreq_policy *policy,
policy->max = new_data.max; policy->max = new_data.max;
trace_cpu_frequency_limits(policy); trace_cpu_frequency_limits(policy);
arch_set_max_freq_scale(policy->cpus, policy->max);
policy->cached_target_freq = UINT_MAX; policy->cached_target_freq = UINT_MAX;
pr_debug("new min and max freqs are %u - %u kHz\n", pr_debug("new min and max freqs are %u - %u kHz\n",

9
include/linux/arch_topology.h
View File

@@ -30,15 +30,6 @@ static inline unsigned long topology_get_freq_scale(int cpu)
return per_cpu(freq_scale, cpu); return per_cpu(freq_scale, cpu);
} }
DECLARE_PER_CPU(unsigned long, max_freq_scale);
struct sched_domain;
static inline
unsigned long topology_get_max_freq_scale(struct sched_domain *sd, int cpu)
{
return per_cpu(max_freq_scale, cpu);
}
bool arch_freq_counters_available(struct cpumask *cpus); bool arch_freq_counters_available(struct cpumask *cpus);
DECLARE_PER_CPU(unsigned long, thermal_pressure); DECLARE_PER_CPU(unsigned long, thermal_pressure);

2
include/linux/cpufreq.h
View File

@@ -992,8 +992,6 @@ extern unsigned int arch_freq_get_on_cpu(int cpu);
extern void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq, extern void arch_set_freq_scale(struct cpumask *cpus, unsigned long cur_freq,
unsigned long max_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 */ /* the following are really really optional */
extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs; extern struct freq_attr cpufreq_freq_attr_scaling_available_freqs;