forked from Minki/linux
d1e57508fb
Mainly merge all different per-cpu arrays into a single array which holds all topology information per logical cpu. Also fix the broken core vs socket variable naming and simplify the locking a bit. When running in environments without topology information also invent book, socket and core ids, so that not all ids are zero. Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
72 lines
1.7 KiB
C
72 lines
1.7 KiB
C
#ifndef _ASM_S390_TOPOLOGY_H
|
|
#define _ASM_S390_TOPOLOGY_H
|
|
|
|
#include <linux/cpumask.h>
|
|
|
|
struct sysinfo_15_1_x;
|
|
struct cpu;
|
|
|
|
#ifdef CONFIG_SCHED_BOOK
|
|
|
|
struct cpu_topology_s390 {
|
|
unsigned short core_id;
|
|
unsigned short socket_id;
|
|
unsigned short book_id;
|
|
cpumask_t core_mask;
|
|
cpumask_t book_mask;
|
|
};
|
|
|
|
extern struct cpu_topology_s390 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_mask)
|
|
#define topology_book_id(cpu) (cpu_topology[cpu].book_id)
|
|
#define topology_book_cpumask(cpu) (&cpu_topology[cpu].book_mask)
|
|
|
|
#define mc_capable() 1
|
|
|
|
static inline const struct cpumask *cpu_coregroup_mask(int cpu)
|
|
{
|
|
return &cpu_topology[cpu].core_mask;
|
|
}
|
|
|
|
static inline const struct cpumask *cpu_book_mask(int cpu)
|
|
{
|
|
return &cpu_topology[cpu].book_mask;
|
|
}
|
|
|
|
int topology_cpu_init(struct cpu *);
|
|
int topology_set_cpu_management(int fc);
|
|
void topology_schedule_update(void);
|
|
void store_topology(struct sysinfo_15_1_x *info);
|
|
void topology_expect_change(void);
|
|
|
|
#else /* CONFIG_SCHED_BOOK */
|
|
|
|
static inline void topology_schedule_update(void) { }
|
|
static inline int topology_cpu_init(struct cpu *cpu) { return 0; }
|
|
static inline void topology_expect_change(void) { }
|
|
|
|
#endif /* CONFIG_SCHED_BOOK */
|
|
|
|
#define POLARIZATION_UNKNOWN (-1)
|
|
#define POLARIZATION_HRZ (0)
|
|
#define POLARIZATION_VL (1)
|
|
#define POLARIZATION_VM (2)
|
|
#define POLARIZATION_VH (3)
|
|
|
|
#ifdef CONFIG_SCHED_BOOK
|
|
void s390_init_cpu_topology(void);
|
|
#else
|
|
static inline void s390_init_cpu_topology(void)
|
|
{
|
|
};
|
|
#endif
|
|
|
|
#define SD_BOOK_INIT SD_CPU_INIT
|
|
|
|
#include <asm-generic/topology.h>
|
|
|
|
#endif /* _ASM_S390_TOPOLOGY_H */
|