GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Abort cpu_initialize if we detect that we've lost a race. 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2032 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Steven J. Magnani 2005-09-14 13:53:45 +00:00
parent 059182cc4f
commit eccc357ea0
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/arch/i386/lib/cpu.c
View File

@ -231,22 +231,32 @@ void cpu_initialize(void)
die("CPU: missing cpu device structure"); die("CPU: missing cpu device structure");
} }
/* Find what type of cpu we are dealing with */ // Check that we haven't been passed bad information as the result of a race
identify_cpu(cpu); // (i.e. BSP timed out while waiting for us to load secondary_stack)
printk_debug("CPU: vendor %s device %x\n",
cpu_vendor_name(cpu->vendor), cpu->device);
/* Lookup the cpu's operations */ if (cpu->path.u.apic.apic_id != lapicid()) {
set_cpu_ops(cpu); printk_err("CPU #%d Initialization FAILED: APIC ID mismatch (%u != %u)\n",
info->index, cpu->path.u.apic.apic_id, lapicid());
// return without setting initialized flag
} else {
/* Find what type of cpu we are dealing with */
identify_cpu(cpu);
printk_debug("CPU: vendor %s device %x\n",
cpu_vendor_name(cpu->vendor), cpu->device);
/* Initialize the cpu */ /* Lookup the cpu's operations */
if (cpu->ops && cpu->ops->init) { set_cpu_ops(cpu);
cpu->enabled = 1;
cpu->initialized = 1; /* Initialize the cpu */
cpu->ops->init(cpu); if (cpu->ops && cpu->ops->init) {
cpu->enabled = 1;
cpu->initialized = 1;
cpu->ops->init(cpu);
}
printk_info("CPU #%d Initialized\n", info->index);
} }
printk_info("CPU #%d Initialized\n", info->index);
return; return;
} }