arch/x86: Fix call for wait_other_cpus_stop()

Fix regression after commit
   0cc2ce4 arch/x86: Clean up CONFIG_SMP and MAX_CPUS test

In case PARALLEL_CPU_INIT=y BSP CPU no longer waited for APs to stop
before proceeding to next bootstates or device initialization.

Change-Id: Ie47e7896ed3d57d98a3ce6766e5c37b6dc22523b
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/25874
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
Kyösti Mälkki 2018-04-26 20:09:54 +03:00
parent 5e7ad65f6f
commit fdca65572e
1 changed files with 3 additions and 3 deletions

View File

@ -568,12 +568,12 @@ void initialize_cpus(struct bus *cpu_bus)
/* Initialize the bootstrap processor */ /* Initialize the bootstrap processor */
cpu_initialize(0); cpu_initialize(0);
if (is_smp_boot() && !IS_ENABLED(CONFIG_PARALLEL_CPU_INIT)) { if (is_smp_boot() && !IS_ENABLED(CONFIG_PARALLEL_CPU_INIT))
start_other_cpus(cpu_bus, info->cpu); start_other_cpus(cpu_bus, info->cpu);
/* Now wait the rest of the cpus stop*/ /* Now wait the rest of the cpus stop*/
if (is_smp_boot())
wait_other_cpus_stop(cpu_bus); wait_other_cpus_stop(cpu_bus);
}
if (IS_ENABLED(CONFIG_SERIALIZED_SMM_INITIALIZATION)) { if (IS_ENABLED(CONFIG_SERIALIZED_SMM_INITIALIZATION)) {
/* At this point, all APs are sleeping: /* At this point, all APs are sleeping: