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>

src/cpu/amd/agesa/family15tn/Makefile.inc

@@ -9,4 +9,4 @@ ramstage-y += model_15_init.c
 smm-y += udelay.c
 
 subdirs-y += ../../mtrr
-subdirs-y += ../../smm
+subdirs-$(CONFIG_SMM_LEGACY_ASEG) += ../../smm

src/cpu/amd/smm/Makefile.inc

@@ -1,2 +1,2 @@
 
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smm_init.c
+ramstage-y += smm_init.c

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

src/cpu/x86/lapic/lapic_cpu_init.c

@@ -391,6 +391,7 @@ void initialize_cpus(struct bus *cpu_bus)
 	if (is_smp_boot())
 		copy_secondary_start_to_lowest_1M();
 
+	if (CONFIG(SMM_LEGACY_ASEG))
 		smm_init();
 
 	/* Initialize the bootstrap processor */
@@ -403,6 +404,7 @@ void initialize_cpus(struct bus *cpu_bus)
 	if (is_smp_boot())
 		wait_other_cpus_stop(cpu_bus);
 
+	if (CONFIG(SMM_LEGACY_ASEG))
 		smm_init_completion();
 
 	if (is_smp_boot())

src/include/cpu/x86/smi_deprecated.h

@@ -3,16 +3,8 @@
 #ifndef __X86_SMI_DEPRECATED_H__
 #define __X86_SMI_DEPRECATED_H__
 
-#include <stdint.h>
-
-#if CONFIG(PARALLEL_MP) || !CONFIG(HAVE_SMI_HANDLER)
-/* Empty stubs for platforms without SMI handlers. */
-static inline void smm_init(void) { }
-static inline void smm_init_completion(void) { }
-#else
 void smm_init(void);
 void smm_init_completion(void);
-#endif
 
 /* Entry from smmhandler.S. */
 void smi_handler(void);

src/southbridge/intel/i82801dx/Makefile.inc

@@ -11,10 +11,8 @@ ramstage-y += lpc.c
 ramstage-y += usb.c
 ramstage-y += usb2.c
 
-ifeq ($(CONFIG_SMM_ASEG),y)
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += smi.c
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += ../../../cpu/x86/smm/smmrelocate.S
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += ../../../cpu/x86/smm/smmrelocate.S
-endif
 
 smm-y += smihandler.c
 

src/southbridge/intel/i82801dx/lpc.c

@@ -279,7 +279,7 @@ static void lpc_init(struct device *dev)
 	/* Don't allow evil boot loaders, kernels, or
 	 * userspace applications to deceive us:
 	 */
-	if (CONFIG(HAVE_SMI_HANDLER) && !CONFIG(PARALLEL_MP))
+	if (CONFIG(SMM_LEGACY_ASEG))
 		aseg_smm_lock();
 }
 

src/southbridge/intel/i82801ix/Makefile.inc

@@ -28,10 +28,8 @@ ifneq ($(CONFIG_BOARD_EMULATION_QEMU_X86_Q35),y)
 ramstage-y += madt.c
 endif
 
-ifeq ($(CONFIG_SMM_ASEG),y)
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += smi.c
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += smi.c
+ramstage-$(CONFIG_SMM_LEGACY_ASEG) += ../../../cpu/x86/smm/smmrelocate.S
-ramstage-$(CONFIG_HAVE_SMI_HANDLER) += ../../../cpu/x86/smm/smmrelocate.S
-endif
 
 CPPFLAGS_common += -I$(src)/southbridge/intel/i82801ix/include
 

src/southbridge/intel/i82801ix/lpc.c

@@ -378,7 +378,7 @@ static void lpc_init(struct device *dev)
 	/* Don't allow evil boot loaders, kernels, or
 	 * userspace applications to deceive us:
 	 */
-	if (CONFIG(HAVE_SMI_HANDLER) && !CONFIG(PARALLEL_MP))
+	if (CONFIG(SMM_LEGACY_ASEG))
 		aseg_smm_lock();
 }
 

src/southbridge/intel/i82801ix/smihandler.c

@@ -9,7 +9,7 @@
 
 #include <soc/nvs.h>
 
-#if !CONFIG(SMM_TSEG)
+#if CONFIG(SMM_LEGACY_ASEG)
 /* For qemu/x86-q35 to build properly. */
 struct global_nvs *gnvs;
 #endif