Use broadcast SIPI to startup siblings
The current code for initializing AP cpus has several shortcomings: - it assumes APIC IDs are sequential - it uses only the BSP for determining the AP count, which is bad if there's more than one physical CPU, and CPUs are of different type Note that the new code call cpu->ops->init() in parallel, and therefore some CPU code needs to be changed to address that. One example are old Intel HT enabled CPUs which can't do microcode update in parallel. Change-Id: Ic48a1ebab6a7c52aa76765f497268af09fa38c25 Signed-off-by: Sven Schnelle <svens@stackframe.org> Reviewed-on: http://review.coreboot.org/1139 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
This commit is contained in:
committed by
Ronald G. Minnich
parent
9ed1456eff
commit
042c1461fb
@@ -12,7 +12,6 @@ config CPU_SPECIFIC_OPTIONS
|
||||
select SSE2
|
||||
select UDELAY_LAPIC
|
||||
select SMM_TSEG
|
||||
#select AP_IN_SIPI_WAIT
|
||||
|
||||
config BOOTBLOCK_CPU_INIT
|
||||
string
|
||||
|
@@ -26,6 +26,7 @@
|
||||
#include <arch/acpigen.h>
|
||||
#include <arch/cpu.h>
|
||||
#include <cpu/x86/msr.h>
|
||||
#include <cpu/x86/lapic.h>
|
||||
#include <cpu/intel/acpi.h>
|
||||
#include <cpu/intel/speedstep.h>
|
||||
#include <cpu/intel/turbo.h>
|
||||
@@ -88,8 +89,8 @@ static int generate_cstate_entries(acpi_cstate_t *cstates,
|
||||
|
||||
static int generate_C_state_entries(void)
|
||||
{
|
||||
struct cpu_info *info;
|
||||
struct cpu_driver *cpu;
|
||||
struct device *cpu_dev;
|
||||
int len, lenif;
|
||||
device_t lapic;
|
||||
struct cpu_intel_model_206ax_config *conf = NULL;
|
||||
@@ -103,10 +104,10 @@ static int generate_C_state_entries(void)
|
||||
return 0;
|
||||
|
||||
/* Find CPU map of supported C-states */
|
||||
info = cpu_info();
|
||||
if (!info)
|
||||
cpu_dev = dev_find_lapic(lapicid());
|
||||
if (!cpu_dev)
|
||||
return 0;
|
||||
cpu = find_cpu_driver(info->cpu);
|
||||
cpu = find_cpu_driver(cpu_dev);
|
||||
if (!cpu || !cpu->cstates)
|
||||
return 0;
|
||||
|
||||
|
@@ -414,58 +414,6 @@ static void configure_mca(void)
|
||||
static unsigned ehci_debug_addr;
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Initialize any extra cores/threads in this package.
|
||||
*/
|
||||
static void intel_cores_init(device_t cpu)
|
||||
{
|
||||
struct cpuid_result result;
|
||||
unsigned cores, threads, i;
|
||||
|
||||
result = cpuid_ext(0xb, 0); /* Threads per core */
|
||||
threads = result.ebx & 0xff;
|
||||
|
||||
result = cpuid_ext(0xb, 1); /* Cores per package */
|
||||
cores = result.ebx & 0xff;
|
||||
|
||||
/* Only initialize extra cores from BSP */
|
||||
if (cpu->path.apic.apic_id)
|
||||
return;
|
||||
|
||||
printk(BIOS_DEBUG, "CPU: %u has %u cores %u threads\n",
|
||||
cpu->path.apic.apic_id, cores, threads);
|
||||
|
||||
for (i = 1; i < cores; ++i) {
|
||||
struct device_path cpu_path;
|
||||
device_t new;
|
||||
|
||||
/* Build the cpu device path */
|
||||
cpu_path.type = DEVICE_PATH_APIC;
|
||||
cpu_path.apic.apic_id =
|
||||
cpu->path.apic.apic_id + i;
|
||||
|
||||
/* Update APIC ID if no hyperthreading */
|
||||
if (threads == 1)
|
||||
cpu_path.apic.apic_id <<= 1;
|
||||
|
||||
/* Allocate the new cpu device structure */
|
||||
new = alloc_dev(cpu->bus, &cpu_path);
|
||||
if (!new)
|
||||
continue;
|
||||
|
||||
printk(BIOS_DEBUG, "CPU: %u has core %u\n",
|
||||
cpu->path.apic.apic_id,
|
||||
new->path.apic.apic_id);
|
||||
|
||||
/* Start the new cpu */
|
||||
if (!start_cpu(new)) {
|
||||
/* Record the error in cpu? */
|
||||
printk(BIOS_ERR, "CPU %u would not start!\n",
|
||||
new->path.apic.apic_id);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static void model_206ax_init(device_t cpu)
|
||||
{
|
||||
char processor_name[49];
|
||||
@@ -528,9 +476,6 @@ static void model_206ax_init(device_t cpu)
|
||||
|
||||
/* Enable Turbo */
|
||||
enable_turbo();
|
||||
|
||||
/* Start up extra cores */
|
||||
intel_cores_init(cpu);
|
||||
}
|
||||
|
||||
static struct device_operations cpu_dev_ops = {
|
||||
|
Reference in New Issue
Block a user