GNUBoot/coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cpu/qemu-x86: Add the option to have no SMM

Browse source 
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>
This commit is contained in:
Arthur Heymans 2020-12-01 14:10:42 +01:00
parent d0e9538f88
commit d79e48570c
3 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/cpu/qemu-x86/Kconfig
View file

@ -5,10 +5,29 @@ config CPU_QEMU_X86
select UDELAY_TSC select UDELAY_TSC
select TSC_MONOTONIC_TIMER select TSC_MONOTONIC_TIMER
select UNKNOWN_TSC_RATE select UNKNOWN_TSC_RATE
select SMM_ASEG
if CPU_QEMU_X86 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 config CPU_QEMU_X86_64
bool "Experimental 64bit support" bool "Experimental 64bit support"
select ARCH_ALL_STAGES_X86_64 select ARCH_ALL_STAGES_X86_64

1
src/mainboard/emulation/qemu-i440fx/Kconfig
View file

@ -14,6 +14,7 @@ config BOARD_SPECIFIC_OPTIONS
select MAINBOARD_HAS_NATIVE_VGA_INIT select MAINBOARD_HAS_NATIVE_VGA_INIT
select MAINBOARD_FORCE_NATIVE_VGA_INIT select MAINBOARD_FORCE_NATIVE_VGA_INIT
select HAVE_ASAN_IN_ROMSTAGE select HAVE_ASAN_IN_ROMSTAGE
select NO_SMM
config VBOOT config VBOOT
select VBOOT_MUST_REQUEST_DISPLAY select VBOOT_MUST_REQUEST_DISPLAY

4
src/southbridge/intel/i82801ix/Kconfig
View file

@ -3,7 +3,7 @@
config SOUTHBRIDGE_INTEL_I82801IX config SOUTHBRIDGE_INTEL_I82801IX
bool bool
select ACPI_INTEL_HARDWARE_SLEEP_VALUES select ACPI_INTEL_HARDWARE_SLEEP_VALUES
select HAVE_SMI_HANDLER select HAVE_SMI_HANDLER if !NO_SMM
select HAVE_USBDEBUG_OPTIONS select HAVE_USBDEBUG_OPTIONS
select INTEL_DESCRIPTOR_MODE_CAPABLE select INTEL_DESCRIPTOR_MODE_CAPABLE
select IOAPIC select IOAPIC
@ -15,7 +15,7 @@ config SOUTHBRIDGE_INTEL_I82801IX
select SOUTHBRIDGE_INTEL_COMMON_RTC select SOUTHBRIDGE_INTEL_COMMON_RTC
select SOUTHBRIDGE_INTEL_COMMON_SMBUS select SOUTHBRIDGE_INTEL_COMMON_SMBUS
select SOUTHBRIDGE_INTEL_COMMON_EARLY_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_SPI_ICH9 if !BOARD_EMULATION_QEMU_X86_Q35
select SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG select SOUTHBRIDGE_INTEL_COMMON_USB_DEBUG
select SOUTHBRIDGE_INTEL_COMMON_WATCHDOG select SOUTHBRIDGE_INTEL_COMMON_WATCHDOG