The patch titled
x86_64 setup.c: print cmp related boottime information
has been removed from the -mm tree. Its filename is
x86_64-setupc-print-cmp-related-boottime-information.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86_64 setup.c: print cmp related boottime information
From: Rohit Seth <rohitseth@xxxxxxxxxx>
Get phys_proc_id and cpu_core_id information to be printed at boot time for
AMD processors. Also match the Node related boot time information that gets
printed for Intel and AMD processors for NUMA configurations.
Signed-off-by: Rohit Seth <rohitseth@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/x86_64/kernel/setup.c | 34 ++++++++++++++++------------------
1 file changed, 16 insertions(+), 18 deletions(-)
diff -puN arch/x86_64/kernel/setup.c~x86_64-setupc-print-cmp-related-boottime-information arch/x86_64/kernel/setup.c
--- devel/arch/x86_64/kernel/setup.c~x86_64-setupc-print-cmp-related-boottime-information 2006-06-09 00:42:53.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/setup.c 2006-06-09 00:42:53.000000000 -0700
@@ -826,15 +826,13 @@ static void __init amd_detect_cmp(struct
}
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
@@ -867,8 +865,8 @@ static int __init init_amd(struct cpuinf
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
@@ -889,8 +887,6 @@ static int __init init_amd(struct cpuinf
/* Fix cpuid4 emulation for more */
num_cache_leaves = 3;
-
- return r;
}
static void __cpuinit detect_ht(struct cpuinfo_x86 *c)
@@ -902,8 +898,10 @@ static void __cpuinit detect_ht(struct c
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;
@@ -920,9 +918,6 @@ static void __cpuinit detect_ht(struct c
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) ;
@@ -931,11 +926,13 @@ static void __cpuinit detect_ht(struct c
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
}
@@ -962,16 +959,17 @@ static void srat_detect_node(void)
#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
}
_
Patches currently in -mm which might be from rohitseth@xxxxxxxxxx are
i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86.patch
i386-moving-phys_proc_id-and-cpu_core_id-to-cpuinfo_x86-warning-fix.patch
i386-fix-get_segment_eip-with-vm86.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
