summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur Heymans <arthur@aheymans.xyz>2020-12-01 14:10:42 +0100
committerArthur Heymans <arthur@aheymans.xyz>2020-12-04 11:11:17 +0000
commitd79e48570c78600313351988ae5940cd4e9aa0e0 (patch)
tree158d15b088513c0859b2e7d7364bc40ac2c0e7d9
parentd0e9538f88fa150262201debb421d45d38503061 (diff)
downloadcoreboot-d79e48570c78600313351988ae5940cd4e9aa0e0.tar.xz
cpu/qemu-x86: Add the option to have no SMM
Qemu i440fx does not support an smihandler at the moment. Change-Id: I5526b19b8294042a49e5bca61036e47db01fd28a Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/48208 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Patrick Rudolph <siro@das-labor.org>
-rw-r--r--src/cpu/qemu-x86/Kconfig21
-rw-r--r--src/mainboard/emulation/qemu-i440fx/Kconfig1
-rw-r--r--src/southbridge/intel/i82801ix/Kconfig4
3 files changed, 23 insertions, 3 deletions
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig
index 87d02fc030..c7ba631c81 100644
--- a/src/cpu/qemu-x86/Kconfig
+++ b/src/cpu/qemu-x86/Kconfig
@@ -5,10 +5,29 @@ config CPU_QEMU_X86
select UDELAY_TSC
select TSC_MONOTONIC_TIMER
select UNKNOWN_TSC_RATE
- select SMM_ASEG
if CPU_QEMU_X86
+# coreboot i440fx does not support SMM
+choice
+ prompt "SMM support"
+ default CPU_QEMU_X86_ASEG_SMM
+ depends on BOARD_EMULATION_QEMU_X86_Q35
+
+config CPU_QEMU_X86_NO_SMM
+ bool "No SMM"
+ select NO_SMM
+
+config CPU_QEMU_X86_ASEG_SMM
+ bool "SMM in ASEG"
+ select SMM_ASEG
+
+#config CPU_QEMU_X86_TSEG_SMM
+# bool "SMM in TSEG"
+# select SMM_TSEG
+
+endchoice
+
config CPU_QEMU_X86_64
bool "Experimental 64bit support"
select ARCH_ALL_STAGES_X86_64
diff --git a/src/mainboard/emulation/qemu-i440fx/Kconfig b/src/mainboard/emulation/qemu-i440fx/Kconfig
index 9187b05d22..62c23ca5af 100644
--- a/src/mainboard/emulation/qemu-i440fx/Kconfig
+++ b/src/mainboard/emulation/qemu-i440fx/Kconfig
@@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_FORCE_NATIVE_VGA_INIT
select HAVE_ASAN_IN_ROMSTAGE
+ select NO_SMM
config VBOOT
select VBOOT_MUST_REQUEST_DISPLAY
diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig
index e1405cfbe0..11a6d39938 100644
--- a/src/southbridge/intel/i82801ix/Kconfig
+++ b/src/southbridge/intel/i82801ix/Kconfig
@@ -3,7 +3,7 @@
config SOUTHBRIDGE_INTEL_I82801IX
bool
select ACPI_INTEL_HARDWARE_SLEEP_VALUES
- select HAVE_SMI_HANDLER
+ select HAVE_SMI_HANDLER if !NO_SMM
select HAVE_USBDEBUG_OPTIONS
select INTEL_DESCRIPTOR_MODE_CAPABLE
select IOAPIC
@@ -15,7 +15,7 @@ config SOUTHBRIDGE_INTEL_I82801IX
select SOUTHBRIDGE_INTEL_COMMON_RTC
select SOUTHBRIDGE_INTEL_COMMON_SMBUS
select SOUTHBRIDGE_INTEL_COMMON_EARLY_SMBUS
- select SOUTHBRIDGE_INTEL_COMMON_SMM
+ select SOUTHBRIDGE_INTEL_COMMON_SMM if !NO_SMM
select SOUTHBRIDGE_INTEL_COMMON_SPI_ICH9 if !BOARD_EMULATION_QEMU_X86_Q35
select SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG
select SOUTHBRIDGE_INTEL_COMMON_WATCHDOG