mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-28 11:18:45 +07:00
25980c7a79
The following commit:
14533a16c4 ("thermal/cpu-cooling, sched/core: Move the arch_set_thermal_pressure() API to generic scheduler code")
moved the definition of arch_set_thermal_pressure() to sched/core.c, but
kept its declaration in linux/arch_topology.h. When building e.g. an x86
kernel with CONFIG_SCHED_THERMAL_PRESSURE=y, cpufreq_cooling.c ends up
getting the declaration of arch_set_thermal_pressure() from
include/linux/arch_topology.h, which is somewhat awkward.
On top of this, sched/core.c unconditionally defines
o The thermal_pressure percpu variable
o arch_set_thermal_pressure()
while arch_scale_thermal_pressure() does nothing unless redefined by the
architecture.
arch_*() functions are meant to be defined by architectures, so revert the
aforementioned commit and re-implement it in a way that keeps
arch_set_thermal_pressure() architecture-definable, and doesn't define the
thermal pressure percpu variable for kernels that don't need
it (CONFIG_SCHED_THERMAL_PRESSURE=n).
Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20200712165917.9168-2-valentin.schneider@arm.com
33 lines
921 B
C
33 lines
921 B
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _ASM_ARM_TOPOLOGY_H
|
|
#define _ASM_ARM_TOPOLOGY_H
|
|
|
|
#ifdef CONFIG_ARM_CPU_TOPOLOGY
|
|
|
|
#include <linux/cpumask.h>
|
|
#include <linux/arch_topology.h>
|
|
|
|
/* Replace task scheduler's default frequency-invariant accounting */
|
|
#define arch_scale_freq_capacity topology_get_freq_scale
|
|
|
|
/* Replace task scheduler's default cpu-invariant accounting */
|
|
#define arch_scale_cpu_capacity topology_get_cpu_scale
|
|
|
|
/* Enable topology flag updates */
|
|
#define arch_update_cpu_topology topology_update_cpu_topology
|
|
|
|
/* Replace task scheduler's default thermal pressure API */
|
|
#define arch_scale_thermal_pressure topology_get_thermal_pressure
|
|
#define arch_set_thermal_pressure topology_set_thermal_pressure
|
|
|
|
#else
|
|
|
|
static inline void init_cpu_topology(void) { }
|
|
static inline void store_cpu_topology(unsigned int cpuid) { }
|
|
|
|
#endif
|
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
#endif /* _ASM_ARM_TOPOLOGY_H */
|