From 5307f12e9c624b42563ad1717be552805f864fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Niew=C3=B6hner?= Date: Sun, 19 Sep 2021 00:32:37 +0200 Subject: [PATCH] soc/intel/{common,tgl,adl}: guard TME Kconfig option by SoC support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently, Intel TME (Total Memory Encryption) can be enabled regardless of SoC support. Add a Kconfig to guard the option depending on actual support. Signed-off-by: Michael Niewöhner Change-Id: Ia20152bb0fc56b0aec3019c592dd6d484829aefe Reviewed-on: https://review.coreboot.org/c/coreboot/+/57762 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel Reviewed-by: Nico Huber --- src/soc/intel/alderlake/Kconfig | 1 + src/soc/intel/common/block/cpu/Kconfig | 7 +++++++ src/soc/intel/tigerlake/Kconfig | 1 + 3 files changed, 9 insertions(+) diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 915dd3f381..b87861b281 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -18,6 +18,7 @@ config CPU_SPECIFIC_OPTIONS select CACHE_MRC_SETTINGS select CPU_INTEL_COMMON select CPU_INTEL_FIRMWARE_INTERFACE_TABLE + select CPU_SUPPORTS_INTEL_TME select CPU_SUPPORTS_PM_TIMER_EMULATION select DRIVERS_USB_ACPI select FSP_COMPRESS_FSP_S_LZ4 diff --git a/src/soc/intel/common/block/cpu/Kconfig b/src/soc/intel/common/block/cpu/Kconfig index 342edb5937..378b6a244c 100644 --- a/src/soc/intel/common/block/cpu/Kconfig +++ b/src/soc/intel/common/block/cpu/Kconfig @@ -101,8 +101,15 @@ config USE_INTEL_FSP_TO_CALL_COREBOOT_PUBLISH_MP_PPI This option allows FSP to make use of MP services PPI published by coreboot to perform multiprocessor initialization. +config CPU_SUPPORTS_INTEL_TME + bool + default n + help + Select this if the SoC supports Intel Total Memory Encryption (TME). + config INTEL_TME bool "Total Memory Encryption (TME)/Multi-key TME (MKTME)" + depends on CPU_SUPPORTS_INTEL_TME default n help Enable Total Memory Encryption (TME)/Multi-key TME (MKTME). The spec is diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 35d8603741..d308a1b103 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -16,6 +16,7 @@ config CPU_SPECIFIC_OPTIONS select CACHE_MRC_SETTINGS select CPU_INTEL_COMMON select CPU_INTEL_FIRMWARE_INTERFACE_TABLE + select CPU_SUPPORTS_INTEL_TME select CPU_SUPPORTS_PM_TIMER_EMULATION select DRIVERS_USB_ACPI select FAST_SPI_SUPPORTS_EXT_BIOS_WINDOW