summaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2018-04-26 20:09:54 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2018-04-28 14:55:25 +0000
commitfdca65572e29cfc6ed9842dd6b802ca0e6461421 (patch)
tree93951abfcbd751af304e7ea92e7a284df4c5ead6 /src/cpu/x86
parent5e7ad65f6f2583b1f8e46848918e36a31928f7c9 (diff)
downloadcoreboot-fdca65572e29cfc6ed9842dd6b802ca0e6461421.tar.xz
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>
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 825739c6df..382b6e4014 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -568,12 +568,12 @@ void initialize_cpus(struct bus *cpu_bus)
/* Initialize the bootstrap processor */
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);
- /* 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);
- }
if (IS_ENABLED(CONFIG_SERIALIZED_SMM_INITIALIZATION)) {
/* At this point, all APs are sleeping: