From 0cc2ce432771a2625214973c471461e7df9c4a12 Mon Sep 17 00:00:00 2001 From: Kyösti Mälkki Date: Fri, 18 Aug 2017 11:46:32 +0300 Subject: arch/x86: Clean up CONFIG_SMP and MAX_CPUS test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7c138758707f87c0d7a827b6887c7752d3714cde Signed-off-by: Kyösti Mälkki Reviewed-on: https://review.coreboot.org/21088 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans Reviewed-by: Aaron Durbin --- src/cpu/x86/lapic/Makefile.inc | 2 +- src/cpu/x86/lapic/lapic_cpu_init.c | 46 +++++++++++++++++--------------------- src/cpu/x86/lapic/secondary.S | 2 -- 3 files changed, 22 insertions(+), 28 deletions(-) (limited to 'src/cpu/x86/lapic') diff --git a/src/cpu/x86/lapic/Makefile.inc b/src/cpu/x86/lapic/Makefile.inc index 9df2c5fad1..e02dcdd3a2 100644 --- a/src/cpu/x86/lapic/Makefile.inc +++ b/src/cpu/x86/lapic/Makefile.inc @@ -1,6 +1,6 @@ ramstage-y += lapic.c ramstage-y += lapic_cpu_init.c -ramstage-y += secondary.S +ramstage-$(CONFIG_SMP) += secondary.S romstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c ramstage-$(CONFIG_UDELAY_LAPIC) += apic_timer.c bootblock-y += boot_cpu.c diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index ce4d0f588e..3500a8ac93 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -36,7 +36,6 @@ #include #include -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 /* This is a lot more paranoid now, since Linux can NOT handle * being told there is a CPU when none exists. So any errors * will return 0, meaning no CPU. @@ -255,7 +254,7 @@ static atomic_t active_cpus = ATOMIC_INIT(1); * start_cpu returns. */ -static spinlock_t start_cpu_lock = SPIN_LOCK_UNLOCKED; +DECLARE_SPIN_LOCK(start_cpu_lock); static unsigned int last_cpu_index = 0; static void *stacks[CONFIG_MAX_CPUS]; volatile unsigned long secondary_stack; @@ -527,12 +526,10 @@ static void wait_other_cpus_stop(struct bus *cpu_bus) } printk(BIOS_DEBUG, "All AP CPUs stopped (%ld loops)\n", loopcount); checkstack(_estack, 0); - for (i = 1; i <= last_cpu_index; i++) + for (i = 1; i < CONFIG_MAX_CPUS && i <= last_cpu_index; i++) checkstack((void *)stacks[i] + CONFIG_STACK_SIZE, i); } -#endif /* CONFIG_SMP */ - void initialize_cpus(struct bus *cpu_bus) { struct device_path cpu_path; @@ -557,45 +554,44 @@ void initialize_cpus(struct bus *cpu_bus) /* Find the device structure for the boot CPU */ info->cpu = alloc_find_dev(cpu_bus, &cpu_path); -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 // why here? In case some day we can start core1 in amd_sibling_init - copy_secondary_start_to_lowest_1M(); -#endif + if (is_smp_boot()) + copy_secondary_start_to_lowest_1M(); -#if IS_ENABLED(CONFIG_HAVE_SMI_HANDLER) if (!IS_ENABLED(CONFIG_SERIALIZED_SMM_INITIALIZATION)) smm_init(); -#endif -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 /* start all aps at first, so we can init ECC all together */ - if (IS_ENABLED(CONFIG_PARALLEL_CPU_INIT)) + if (is_smp_boot() && IS_ENABLED(CONFIG_PARALLEL_CPU_INIT)) start_other_cpus(cpu_bus, info->cpu); -#endif /* Initialize the bootstrap processor */ cpu_initialize(0); -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 - if (!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*/ - wait_other_cpus_stop(cpu_bus); -#endif + /* Now wait the rest of the cpus stop*/ + wait_other_cpus_stop(cpu_bus); + } if (IS_ENABLED(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_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 - last_cpu_index = 0; - smm_other_cpus(cpu_bus, info->cpu); -#endif + + if (is_smp_boot()) { + last_cpu_index = 0; + smm_other_cpus(cpu_bus, info->cpu); + } } -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 - recover_lowest_1M(); -#endif + if (is_smp_boot()) + recover_lowest_1M(); +} + +/* Platform-specific code for SMI handler overrides this. */ +__attribute__((weak)) void smm_init(void) +{ } diff --git a/src/cpu/x86/lapic/secondary.S b/src/cpu/x86/lapic/secondary.S index 27ee697db1..671114ac9b 100644 --- a/src/cpu/x86/lapic/secondary.S +++ b/src/cpu/x86/lapic/secondary.S @@ -14,7 +14,6 @@ #include #include -#if IS_ENABLED(CONFIG_SMP) && CONFIG_MAX_CPUS > 1 .text .globl _secondary_start, _secondary_start_end, _secondary_gdt_addr .balign 4096 @@ -80,4 +79,3 @@ __ap_protected_start: jmp 1b .code32 -#endif -- cgit v1.2.3