Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-07 22:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

arch_topology: Remove unused topology_set_thermal_pressure() and related

Browse Source 
There is no need of this function (and related) since code has been
converted to use the new arch_update_thermal_pressure() API. The old
code can be removed.

Signed-off-by: Lukasz Luba <lukasz.luba@arm.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
This commit is contained in:
Lukasz Luba 2021-11-09 19:57:14 +00:00 committed by Viresh Kumar
parent 0258cb19c7
commit 7e97b3dc25
6 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/topology.h
View File

@ -23,7 +23,6 @@
/* Replace task scheduler's default thermal pressure API */ /* Replace task scheduler's default thermal pressure API */
#define arch_scale_thermal_pressure topology_get_thermal_pressure #define arch_scale_thermal_pressure topology_get_thermal_pressure
#define arch_set_thermal_pressure topology_set_thermal_pressure
#define arch_update_thermal_pressure topology_update_thermal_pressure #define arch_update_thermal_pressure topology_update_thermal_pressure
#else #else

1
arch/arm64/include/asm/topology.h
View File

@ -32,7 +32,6 @@ void update_freq_counters_refs(void);
/* Replace task scheduler's default thermal pressure API */ /* Replace task scheduler's default thermal pressure API */
#define arch_scale_thermal_pressure topology_get_thermal_pressure #define arch_scale_thermal_pressure topology_get_thermal_pressure
#define arch_set_thermal_pressure topology_set_thermal_pressure
#define arch_update_thermal_pressure topology_update_thermal_pressure #define arch_update_thermal_pressure topology_update_thermal_pressure
#include <asm-generic/topology.h> #include <asm-generic/topology.h>

17
drivers/base/arch_topology.c
View File

@ -156,16 +156,6 @@ void topology_set_cpu_scale(unsigned int cpu, unsigned long capacity)
DEFINE_PER_CPU(unsigned long, thermal_pressure); DEFINE_PER_CPU(unsigned long, thermal_pressure);
void topology_set_thermal_pressure(const struct cpumask *cpus,
unsigned long th_pressure)
{
int cpu;
for_each_cpu(cpu, cpus)
WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);
}
EXPORT_SYMBOL_GPL(topology_set_thermal_pressure);
/** /**
* topology_update_thermal_pressure() - Update thermal pressure for CPUs * topology_update_thermal_pressure() - Update thermal pressure for CPUs
* @cpus : The related CPUs for which capacity has been reduced * @cpus : The related CPUs for which capacity has been reduced
@ -183,7 +173,7 @@ EXPORT_SYMBOL_GPL(topology_set_thermal_pressure);
void topology_update_thermal_pressure(const struct cpumask *cpus, void topology_update_thermal_pressure(const struct cpumask *cpus,
unsigned long capped_freq) unsigned long capped_freq)
{ {
unsigned long max_capacity, capacity; unsigned long max_capacity, capacity, th_pressure;
u32 max_freq; u32 max_freq;
int cpu; int cpu;
@ -203,7 +193,10 @@ void topology_update_thermal_pressure(const struct cpumask *cpus,
else else
capacity = mult_frac(max_capacity, capped_freq, max_freq); capacity = mult_frac(max_capacity, capped_freq, max_freq);
arch_set_thermal_pressure(cpus, max_capacity - capacity); th_pressure = max_capacity - capacity;
for_each_cpu(cpu, cpus)
WRITE_ONCE(per_cpu(thermal_pressure, cpu), th_pressure);
} }
EXPORT_SYMBOL_GPL(topology_update_thermal_pressure); EXPORT_SYMBOL_GPL(topology_update_thermal_pressure);

3
include/linux/arch_topology.h
View File

@ -56,9 +56,6 @@ static inline unsigned long topology_get_thermal_pressure(int cpu)
return per_cpu(thermal_pressure, cpu); return per_cpu(thermal_pressure, cpu);
} }
void topology_set_thermal_pressure(const struct cpumask *cpus,
unsigned long th_pressure);
void topology_update_thermal_pressure(const struct cpumask *cpus, void topology_update_thermal_pressure(const struct cpumask *cpus,
unsigned long capped_freq); unsigned long capped_freq);

7
include/linux/sched/topology.h
View File

@ -266,13 +266,6 @@ unsigned long arch_scale_thermal_pressure(int cpu)
} }
#endif #endif
#ifndef arch_set_thermal_pressure
static __always_inline
void arch_set_thermal_pressure(const struct cpumask *cpus,
unsigned long th_pressure)
{ }
#endif
#ifndef arch_update_thermal_pressure #ifndef arch_update_thermal_pressure
static __always_inline static __always_inline
void arch_update_thermal_pressure(const struct cpumask *cpus, void arch_update_thermal_pressure(const struct cpumask *cpus,

2
init/Kconfig
View File

@ -550,7 +550,7 @@ config SCHED_THERMAL_PRESSURE
i.e. put less load on throttled CPUs than on non/less throttled ones. i.e. put less load on throttled CPUs than on non/less throttled ones.
This requires the architecture to implement This requires the architecture to implement
arch_set_thermal_pressure() and arch_scale_thermal_pressure(). arch_update_thermal_pressure() and arch_scale_thermal_pressure().
config BSD_PROCESS_ACCT config BSD_PROCESS_ACCT
bool "BSD Process Accounting" bool "BSD Process Accounting"