:x86_64 setup.c - printing cmp related boottime information
PATCH 1/1 :x86_64 setup.c - printing cmp related boottime information
Getting phys_proc_id and cpu_core_id information to be printed at boot time for AMD processors. Also matching the Node related boot time information that gets printed for Intel and AMD processors for NUMA configurations.
Signed-off-by Rohit Seth <[email protected]>
arch/x86_64/kernel/setup.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-)
arch/x86_64/kernel/setup.c +16 -18
@@ -922,15 +922,13 @@ }numa_set_node (cpu, node); -printk (KERN_INFO "CPU %d/%x(%d) -> Node %d -> Core %d\n" , - cpu, apicid, c->x86_max_cores, node, c->cpu_core_id); +printk (KERN_INFO "CPU %d/%x -> Node %d\n" , cpu, apicid, node);#endif #endif } -static int __init init_amd (struct cpuinfo_x86 *c) +static void __init init_amd (struct cpuinfo_x86 *c) { -int r;unsigned level;#ifdef CONFIG_SMP
@@ -963,8 +961,8 @@if (c->x86 >=6 )set_bit (X86_FEATURE_FXSAVE_LEAK , &c->x86_capability); - r =get_model_name (c); -if (!r) { + level =get_model_name (c); +if (!level) {switch (c->x86) {case 15 :/* Should distinguish Models here, but this is only
@@ -985,8 +983,6 @@/* Fix cpuid4 emulation for more */ num_cache_leaves =3 ; - -return r; }static void __cpuinit detect_ht (struct cpuinfo_x86 *c)
@@ -998,8 +994,10 @@cpuid (1 , &eax, &ebx, &ecx, &edx); -if (!cpu_has (c,X86_FEATURE_HT ) ||cpu_has (c,X86_FEATURE_CMP_LEGACY )) +if (!cpu_has (c,X86_FEATURE_HT ))return ; +if (cpu_has (c,X86_FEATURE_CMP_LEGACY )) + goto out; smp_num_siblings = (ebx &0xff0000 ) >>16 ;
@@ -1016,9 +1014,6 @@ index_msb =get_count_order (smp_num_siblings); c->phys_proc_id =phys_pkg_id (index_msb); -printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , - c->phys_proc_id); - smp_num_siblings = smp_num_siblings / c->x86_max_cores; index_msb =get_count_order (smp_num_siblings) ;
@@ -1027,11 +1022,13 @@ c->cpu_core_id =phys_pkg_id (index_msb) & ((1 << core_bits) - 1); - -if (c->x86_max_cores >1 ) -printk (KERN_INFO "CPU: Processor Core ID: %d\n" , - c->cpu_core_id); } +out: +if ((c->x86_max_cores * smp_num_siblings) >1 ) { +printk (KERN_INFO "CPU: Physical Processor ID: %d\n" , c->phys_proc_id); +printk (KERN_INFO "CPU: Processor Core ID: %d\n" , c->cpu_core_id); + } +#endif }
@@ -1058,16 +1055,17 @@#ifdef CONFIG_NUMA unsigned node;int cpu =smp_processor_id (); +int apicid =hard_smp_processor_id ();/* Don't do the funky fallback heuristics the AMD version employs for now. */ - node = apicid_to_node[hard_smp_processor_id ()]; + node = apicid_to_node[apicid];if (node ==NUMA_NO_NODE ) node =first_node (node_online_map);numa_set_node (cpu, node);if (acpi_numa >0 ) -printk (KERN_INFO "CPU %d -> Node %d\n" , cpu, node); +printk (KERN_INFO "CPU %d/%x -> Node %d\n" , cpu, apicid, node);#endif }
Quoted 4 lines · Rohit Seth
Getting
phys_proc_idandcpu_core_idinformation to be printed at boot time for AMD processors. Also matching the Node related boot time information that gets printed for Intel and AMD processors for NUMA configurations.
Added. Thanks.
-Andi