summaryrefslogtreecommitdiff
path: root/src/cpu/x86/lapic
diff options
context:
space:
mode:
Diffstat (limited to 'src/cpu/x86/lapic')
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c46
1 files changed, 1 insertions, 45 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index c35888a7fd..5f2b27b133 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -332,37 +332,6 @@ static void start_other_cpus(struct bus *cpu_bus, struct device *bsp_cpu)
}
-static void smm_other_cpus(struct bus *cpu_bus, struct device *bsp_cpu)
-{
- struct device *cpu;
- int pre_count = atomic_read(&active_cpus);
-
- /* Loop through the cpus once to let them run through SMM relocator */
-
- for (cpu = cpu_bus->children; cpu; cpu = cpu->sibling) {
- if (cpu->path.type != DEVICE_PATH_APIC)
- continue;
-
- printk(BIOS_ERR, "considering CPU 0x%02x for SMM init\n",
- cpu->path.apic.apic_id);
-
- if (cpu == bsp_cpu)
- continue;
-
- if (!cpu->enabled)
- continue;
-
- if (!start_cpu(cpu))
- /* Record the error in cpu? */
- printk(BIOS_ERR, "CPU 0x%02x would not start!\n",
- cpu->path.apic.apic_id);
-
- /* FIXME: endless loop */
- while (atomic_read(&active_cpus) != pre_count)
- ;
- }
-}
-
static void wait_other_cpus_stop(struct bus *cpu_bus)
{
struct device *cpu;
@@ -422,8 +391,7 @@ void initialize_cpus(struct bus *cpu_bus)
if (is_smp_boot())
copy_secondary_start_to_lowest_1M();
- if (!CONFIG(SERIALIZED_SMM_INITIALIZATION))
- smm_init();
+ smm_init();
/* Initialize the bootstrap processor */
cpu_initialize(0);
@@ -435,18 +403,6 @@ void initialize_cpus(struct bus *cpu_bus)
if (is_smp_boot())
wait_other_cpus_stop(cpu_bus);
- if (CONFIG(SERIALIZED_SMM_INITIALIZATION)) {
- /* At this point, all APs are sleeping:
- * smm_init() will queue a pending SMI on all cpus
- * and smm_other_cpus() will start them one by one */
- smm_init();
-
- if (is_smp_boot()) {
- last_cpu_index = 0;
- smm_other_cpus(cpu_bus, info->cpu);
- }
- }
-
smm_init_completion();
if (is_smp_boot())