[coreboot] New patch to review for coreboot: 62a9147 print CPU index on CPU initialization messages

[Sven Schnelle (svens@stackframe.org)]

Sven Schnelle (svens at stackframe.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/1176

-gerrit

commit 62a9147685c7716eed051dbd7341c2f8a18501d8
Author: Sven Schnelle <svens at stackframe.org>
Date:   Thu Jul 5 23:15:19 2012 +0200

    print CPU index on CPU initialization messages
    
    Change-Id: I533259f9aa985487e9146959fcc3da9b07570441
    Signed-off-by: Sven Schnelle <svens at stackframe.org>
---
 src/arch/x86/lib/cpu.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/arch/x86/lib/cpu.c b/src/arch/x86/lib/cpu.c
index 2d64be9..a5d1eb4 100644
--- a/src/arch/x86/lib/cpu.c
+++ b/src/arch/x86/lib/cpu.c
@@ -249,10 +249,9 @@ void cpu_initialize(struct bus *cpu_bus, int index)
 	struct device *cpu;
 	struct cpuinfo_x86 c;
 	struct device_path cpu_path;
-	unsigned char id = lapicid();
 
 	cpu_path.type = DEVICE_PATH_APIC;
-	cpu_path.apic.apic_id = id;
+	cpu_path.apic.apic_id = lapicid();
 	cpu_path.apic.index = index;
 
 #if CONFIG_SMP
@@ -262,16 +261,16 @@ void cpu_initialize(struct bus *cpu_bus, int index)
 #if CONFIG_SMP
 	spin_unlock(&start_cpu_lock);
 #endif
-	printk(BIOS_DEBUG, "Initializing CPU #%d\n", id);
+	printk(BIOS_DEBUG, "Initializing CPU #%d (APIC ID %lu)\n", index, lapicid());
 
 	/* Find what type of cpu we are dealing with */
 	identify_cpu(cpu);
-	printk(BIOS_DEBUG, "CPU: vendor %s device %x\n",
+	printk(BIOS_DEBUG, "CPU%d: vendor %s device %x\n", index,
 		cpu_vendor_name(cpu->vendor), cpu->device);
 
 	get_fms(&c, cpu->device);
 
-	printk(BIOS_DEBUG, "CPU: family %02x, model %02x, stepping %02x\n",
+	printk(BIOS_DEBUG, "CPU%d: family %02x, model %02x, stepping %02x\n", index,
 		c.x86, c.x86_model, c.x86_mask);
 
 	/* Lookup the cpu's operations */
@@ -283,7 +282,7 @@ void cpu_initialize(struct bus *cpu_bus, int index)
 		set_cpu_ops(cpu);
 		cpu->device += c.x86_mask;
 		if(!cpu->ops) die("Unknown cpu");
-		printk(BIOS_DEBUG, "Using generic cpu ops (good)\n");
+		printk(BIOS_DEBUG, "CPU%d: Using generic cpu ops (good)\n", index);
 	}
 
 	/* Initialize the cpu */
@@ -293,7 +292,7 @@ void cpu_initialize(struct bus *cpu_bus, int index)
 		cpu->ops->init(cpu);
 	}
 
-	printk(BIOS_INFO, "CPU #%d initialized\n", id);
+	printk(BIOS_INFO, "CPU #%d initialized\n", index);
 
 	return;
 }