Arthur Heymans has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
cpu/qemu-x86: Add the option to have no SMM
Change-Id: I5526b19b8294042a49e5bca61036e47db01fd28a Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/cpu/qemu-x86/Kconfig M src/southbridge/intel/i82801ix/Kconfig 2 files changed, 20 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/48208/1
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig index 87d02fc..8ccf437 100644 --- a/src/cpu/qemu-x86/Kconfig +++ b/src/cpu/qemu-x86/Kconfig @@ -5,10 +5,27 @@ select UDELAY_TSC select TSC_MONOTONIC_TIMER select UNKNOWN_TSC_RATE - select SMM_ASEG
if CPU_QEMU_X86
+choice + prompt "SMM support" + default CPU_QEMU_X86_ASEG_SMM + +config CPU_QEMU_X86_NO_SMM + bool "No SMM" + select NO_SMM + +config CPU_QEMU_X86_ASEG_SMM + bool "SMM ASEG" + select SMM_ASEG + +#config CPU_QEMU_X86_TSEG_SMM +# bool "SMM TSEG" +# select SMM_TSEG + +endchoice + config CPU_QEMU_X86_64 bool "Experimental 64bit support" select ARCH_ALL_STAGES_X86_64 diff --git a/src/southbridge/intel/i82801ix/Kconfig b/src/southbridge/intel/i82801ix/Kconfig index e1405cf..11a6d39 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 @@ 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
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
Patch Set 1:
(1 comment)
https://review.coreboot.org/c/coreboot/+/48208/1/src/cpu/qemu-x86/Kconfig File src/cpu/qemu-x86/Kconfig:
https://review.coreboot.org/c/coreboot/+/48208/1/src/cpu/qemu-x86/Kconfig@20 PS1, Line 20: bool "SMM ASEG" SMM in ASEG
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
Patch Set 1: Code-Review+2
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48208
to look at the new patch set (#3).
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
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 --- M src/cpu/qemu-x86/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/southbridge/intel/i82801ix/Kconfig 3 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/48208/3
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48208
to look at the new patch set (#4).
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
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 --- M src/cpu/qemu-x86/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/southbridge/intel/i82801ix/Kconfig 3 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/48208/4
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
Patch Set 4: Code-Review+2
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48208
to look at the new patch set (#5).
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
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 --- M src/cpu/qemu-x86/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/southbridge/intel/i82801ix/Kconfig 3 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/48208/5
Hello build bot (Jenkins), Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48208
to look at the new patch set (#6).
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
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 --- M src/cpu/qemu-x86/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/southbridge/intel/i82801ix/Kconfig 3 files changed, 23 insertions(+), 3 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/08/48208/6
Patrick Rudolph has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
Patch Set 6: Code-Review+2
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
Patch Set 6:
(1 comment)
https://review.coreboot.org/c/coreboot/+/48208/1/src/cpu/qemu-x86/Kconfig File src/cpu/qemu-x86/Kconfig:
https://review.coreboot.org/c/coreboot/+/48208/1/src/cpu/qemu-x86/Kconfig@20 PS1, Line 20: bool "SMM ASEG"
SMM in ASEG
Done
Arthur Heymans has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48208 )
Change subject: cpu/qemu-x86: Add the option to have no SMM ......................................................................
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 --- M src/cpu/qemu-x86/Kconfig M src/mainboard/emulation/qemu-i440fx/Kconfig M src/southbridge/intel/i82801ix/Kconfig 3 files changed, 23 insertions(+), 3 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Rudolph: Looks good to me, approved
diff --git a/src/cpu/qemu-x86/Kconfig b/src/cpu/qemu-x86/Kconfig index 87d02fc..c7ba631 100644 --- a/src/cpu/qemu-x86/Kconfig +++ b/src/cpu/qemu-x86/Kconfig @@ -5,10 +5,29 @@ 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 9187b05..62c23ca 100644 --- a/src/mainboard/emulation/qemu-i440fx/Kconfig +++ b/src/mainboard/emulation/qemu-i440fx/Kconfig @@ -14,6 +14,7 @@ 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 e1405cf..11a6d39 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 @@ 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
-
Arthur Heymans (Code Review) -
Patrick Rudolph (Code Review)