summaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2022-01-29 14:05:58 +0200
committerFelix Held <felix-coreboot@felixheld.de>2022-02-01 20:35:02 +0000
commit894f6f8229a7bb479c523ce4bcbf927f2d1f1d5b (patch)
tree83ea0df2c41150f2daa8ccbf717a923a1f71d064 /src/cpu/x86
parentbab9d72f1528610a0200a5afb7e7ebc35ffe99aa (diff)
cpu/x86/smm: Add SMM_LEGACY_ASEG
Followup will allow use of PARALLEL_MP with SMM_ASEG so some guards need to be adjusted. Change-Id: If032ce2be4749559db0d46ab5ae422afa7666785 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/61480 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/Kconfig6
-rw-r--r--src/cpu/x86/lapic/lapic_cpu_init.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig
index d021564126..86f31e05c7 100644
--- a/src/cpu/x86/Kconfig
+++ b/src/cpu/x86/Kconfig
@@ -114,6 +114,12 @@ config SMM_TSEG
default y
depends on !(NO_SMM || SMM_ASEG)
+config SMM_LEGACY_ASEG
+ bool
+ default y if HAVE_SMI_HANDLER && SMM_ASEG && LEGACY_SMP_INIT
+ help
+ SMM support without PARALLEL_MP, to be deprecated.
+
if SMM_TSEG
config SMM_MODULE_HEAP_SIZE
diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c
index 5f2b27b133..7780be26ec 100644
--- a/src/cpu/x86/lapic/lapic_cpu_init.c
+++ b/src/cpu/x86/lapic/lapic_cpu_init.c
@@ -391,7 +391,8 @@ void initialize_cpus(struct bus *cpu_bus)
if (is_smp_boot())
copy_secondary_start_to_lowest_1M();
- smm_init();
+ if (CONFIG(SMM_LEGACY_ASEG))
+ smm_init();
/* Initialize the bootstrap processor */
cpu_initialize(0);
@@ -403,7 +404,8 @@ void initialize_cpus(struct bus *cpu_bus)
if (is_smp_boot())
wait_other_cpus_stop(cpu_bus);
- smm_init_completion();
+ if (CONFIG(SMM_LEGACY_ASEG))
+ smm_init_completion();
if (is_smp_boot())
recover_lowest_1M();