2007-07-11 19:18:32 +00:00
|
|
|
/*
|
2010-07-20 01:32:04 +00:00
|
|
|
* Check for extended topology enumeration cpuid leaf 0xb and if it
|
|
|
|
* exists, use it for populating initial_apicid and cpu topology
|
|
|
|
* detection.
|
2007-07-11 19:18:32 +00:00
|
|
|
*/
|
|
|
|
|
2010-07-20 01:32:04 +00:00
|
|
|
#include <linux/cpu.h>
|
|
|
|
#include <asm/apic.h>
|
2008-05-08 07:18:43 +00:00
|
|
|
#include <asm/pat.h>
|
2007-07-11 19:18:32 +00:00
|
|
|
#include <asm/processor.h>
|
|
|
|
|
2008-08-23 15:47:10 +00:00
|
|
|
/* leaf 0xb SMT level */
|
|
|
|
#define SMT_LEVEL 0
|
|
|
|
|
|
|
|
/* leaf 0xb sub-leaf types */
|
|
|
|
#define INVALID_TYPE 0
|
|
|
|
#define SMT_TYPE 1
|
|
|
|
#define CORE_TYPE 2
|
|
|
|
|
|
|
|
#define LEAFB_SUBTYPE(ecx) (((ecx) >> 8) & 0xff)
|
|
|
|
#define BITS_SHIFT_NEXT_LEVEL(eax) ((eax) & 0x1f)
|
|
|
|
#define LEVEL_MAX_SIBLINGS(ebx) ((ebx) & 0xffff)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check for extended topology enumeration cpuid leaf 0xb and if it
|
|
|
|
* exists, use it for populating initial_apicid and cpu topology
|
|
|
|
* detection.
|
|
|
|
*/
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-18 22:23:59 +00:00
|
|
|
void detect_extended_topology(struct cpuinfo_x86 *c)
|
2008-08-23 15:47:10 +00:00
|
|
|
{
|
2009-01-27 16:07:08 +00:00
|
|
|
#ifdef CONFIG_SMP
|
2008-08-23 15:47:10 +00:00
|
|
|
unsigned int eax, ebx, ecx, edx, sub_index;
|
|
|
|
unsigned int ht_mask_width, core_plus_mask_width;
|
|
|
|
unsigned int core_select_mask, core_level_siblings;
|
2009-12-11 01:19:36 +00:00
|
|
|
static bool printed;
|
2008-08-23 15:47:10 +00:00
|
|
|
|
|
|
|
if (c->cpuid_level < 0xb)
|
|
|
|
return;
|
|
|
|
|
|
|
|
cpuid_count(0xb, SMT_LEVEL, &eax, &ebx, &ecx, &edx);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* check if the cpuid leaf 0xb is actually implemented.
|
|
|
|
*/
|
|
|
|
if (ebx == 0 || (LEAFB_SUBTYPE(ecx) != SMT_TYPE))
|
|
|
|
return;
|
|
|
|
|
|
|
|
set_cpu_cap(c, X86_FEATURE_XTOPOLOGY);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* initial apic id, which also represents 32-bit extended x2apic id.
|
|
|
|
*/
|
|
|
|
c->initial_apicid = edx;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Populate HT related information from sub-leaf level 0.
|
|
|
|
*/
|
|
|
|
core_level_siblings = smp_num_siblings = LEVEL_MAX_SIBLINGS(ebx);
|
|
|
|
core_plus_mask_width = ht_mask_width = BITS_SHIFT_NEXT_LEVEL(eax);
|
|
|
|
|
|
|
|
sub_index = 1;
|
|
|
|
do {
|
|
|
|
cpuid_count(0xb, sub_index, &eax, &ebx, &ecx, &edx);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Check for the Core type in the implemented sub leaves.
|
|
|
|
*/
|
|
|
|
if (LEAFB_SUBTYPE(ecx) == CORE_TYPE) {
|
|
|
|
core_level_siblings = LEVEL_MAX_SIBLINGS(ebx);
|
|
|
|
core_plus_mask_width = BITS_SHIFT_NEXT_LEVEL(eax);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
sub_index++;
|
|
|
|
} while (LEAFB_SUBTYPE(ecx) != INVALID_TYPE);
|
|
|
|
|
|
|
|
core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width;
|
|
|
|
|
2009-01-28 12:24:54 +00:00
|
|
|
c->cpu_core_id = apic->phys_pkg_id(c->initial_apicid, ht_mask_width)
|
2008-08-23 15:47:10 +00:00
|
|
|
& core_select_mask;
|
2009-01-28 12:24:54 +00:00
|
|
|
c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, core_plus_mask_width);
|
2008-12-19 02:09:21 +00:00
|
|
|
/*
|
|
|
|
* Reinit the apicid, now that we have extended initial_apicid.
|
|
|
|
*/
|
2009-01-28 12:24:54 +00:00
|
|
|
c->apicid = apic->phys_pkg_id(c->initial_apicid, 0);
|
2009-01-28 12:31:22 +00:00
|
|
|
|
2008-08-23 15:47:10 +00:00
|
|
|
c->x86_max_cores = (core_level_siblings / smp_num_siblings);
|
|
|
|
|
2009-12-11 01:19:36 +00:00
|
|
|
if (!printed) {
|
|
|
|
printk(KERN_INFO "CPU: Physical Processor ID: %d\n",
|
|
|
|
c->phys_proc_id);
|
|
|
|
if (c->x86_max_cores > 1)
|
|
|
|
printk(KERN_INFO "CPU: Processor Core ID: %d\n",
|
|
|
|
c->cpu_core_id);
|
|
|
|
printed = 1;
|
|
|
|
}
|
2008-08-23 15:47:10 +00:00
|
|
|
return;
|
2008-08-23 15:47:11 +00:00
|
|
|
#endif
|
2008-08-23 15:47:10 +00:00
|
|
|
}
|