552c4653bf
Commit 8cd5601c50 ("sched/fair: Convert arch_scale_cpu_capacity() from
weak function to #define") changed the wiring which now has to be done
by associating arch_scale_cpu_capacity with the actual implementation
provided by the architecture.
Define arch_scale_cpu_capacity to use the arch_topology "driver"
function topology_get_cpu_scale() for the task scheduler's cpu-invariant
accounting instead of the default arch_scale_cpu_capacity() in
kernel/sched/sched.h.
Signed-off-by: Dietmar Eggemann <dietmar.eggemann@arm.com>
Acked-by: Vincent Guittot <vincent.guittot@linaro.org>
Acked-by: Russell King <rmk+kernel@armlinux.org.uk>
Tested-by: Juri Lelli <juri.lelli@arm.com>
Reviewed-by: Juri Lelli <juri.lelli@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
45 lines
1.1 KiB
C
45 lines
1.1 KiB
C
#ifndef _ASM_ARM_TOPOLOGY_H
|
|
#define _ASM_ARM_TOPOLOGY_H
|
|
|
|
#ifdef CONFIG_ARM_CPU_TOPOLOGY
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
struct cputopo_arm {
|
|
int thread_id;
|
|
int core_id;
|
|
int socket_id;
|
|
cpumask_t thread_sibling;
|
|
cpumask_t core_sibling;
|
|
};
|
|
|
|
extern struct cputopo_arm cpu_topology[NR_CPUS];
|
|
|
|
#define topology_physical_package_id(cpu) (cpu_topology[cpu].socket_id)
|
|
#define topology_core_id(cpu) (cpu_topology[cpu].core_id)
|
|
#define topology_core_cpumask(cpu) (&cpu_topology[cpu].core_sibling)
|
|
#define topology_sibling_cpumask(cpu) (&cpu_topology[cpu].thread_sibling)
|
|
|
|
void init_cpu_topology(void);
|
|
void store_cpu_topology(unsigned int cpuid);
|
|
const struct cpumask *cpu_coregroup_mask(int cpu);
|
|
|
|
#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
|
|
|
|
#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 */
|