x86/topology: Make __max_die_per_package available unconditionally
commit5.4-rM2-2.2.x-imx-squashed1eb8f690bc
upstream. Move it outside of CONFIG_SMP in order to avoid ifdeffery at the usage sites. Fixes:76e2fc63ca
("x86/cpu/amd: Set __max_die_per_package on AMD") Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Reported-by: kernel test robot <lkp@intel.com> Signed-off-by: Borislav Petkov <bp@suse.de> Link: https://lkml.kernel.org/r/20210114111814.5346-1-bp@alien8.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
parent
cdb4ce96fd
commit
d1a9cd1dc5
|
@ -110,6 +110,8 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
|
||||||
#define topology_die_id(cpu) (cpu_data(cpu).cpu_die_id)
|
#define topology_die_id(cpu) (cpu_data(cpu).cpu_die_id)
|
||||||
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
|
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
|
||||||
|
|
||||||
|
extern unsigned int __max_die_per_package;
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
#define topology_die_cpumask(cpu) (per_cpu(cpu_die_map, cpu))
|
#define topology_die_cpumask(cpu) (per_cpu(cpu_die_map, cpu))
|
||||||
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
|
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
|
||||||
|
@ -118,8 +120,6 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
|
||||||
extern unsigned int __max_logical_packages;
|
extern unsigned int __max_logical_packages;
|
||||||
#define topology_max_packages() (__max_logical_packages)
|
#define topology_max_packages() (__max_logical_packages)
|
||||||
|
|
||||||
extern unsigned int __max_die_per_package;
|
|
||||||
|
|
||||||
static inline int topology_max_die_per_package(void)
|
static inline int topology_max_die_per_package(void)
|
||||||
{
|
{
|
||||||
return __max_die_per_package;
|
return __max_die_per_package;
|
||||||
|
|
|
@ -25,10 +25,10 @@
|
||||||
#define BITS_SHIFT_NEXT_LEVEL(eax) ((eax) & 0x1f)
|
#define BITS_SHIFT_NEXT_LEVEL(eax) ((eax) & 0x1f)
|
||||||
#define LEVEL_MAX_SIBLINGS(ebx) ((ebx) & 0xffff)
|
#define LEVEL_MAX_SIBLINGS(ebx) ((ebx) & 0xffff)
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
|
||||||
unsigned int __max_die_per_package __read_mostly = 1;
|
unsigned int __max_die_per_package __read_mostly = 1;
|
||||||
EXPORT_SYMBOL(__max_die_per_package);
|
EXPORT_SYMBOL(__max_die_per_package);
|
||||||
|
|
||||||
|
#ifdef CONFIG_SMP
|
||||||
/*
|
/*
|
||||||
* Check if given CPUID extended toplogy "leaf" is implemented
|
* Check if given CPUID extended toplogy "leaf" is implemented
|
||||||
*/
|
*/
|
||||||
|
|
Loading…
Reference in New Issue