From 086a91c05c5426fd21c15c94ad008df9c7c01a20 Mon Sep 17 00:00:00 2001 From: Angel Pons Date: Mon, 15 Aug 2022 18:32:00 +0200 Subject: [PATCH] soc/intel: Unravel `INTEL_TME` Kconfig option The `INTEL_TME` Kconfig option has a prompt, which means it is meant to be user-configurable. However, it has been selected from Alder Lake and Meteor Lake Kconfig, so `INTEL_TME` cannot be disabled on them. Replace the `select INTEL_TME` statements with default values in order for this option to be user-configurable on all platforms that support it. Change-Id: Ib37c108fcc1004840b82be18fd23c340a68ca748 Signed-off-by: Angel Pons Reviewed-on: https://review.coreboot.org/c/coreboot/+/66756 Reviewed-by: Nico Huber Reviewed-by: Subrata Banik Tested-by: build bot (Jenkins) Reviewed-by: Kapil Porwal Reviewed-by: Tarun Tuli --- src/soc/intel/alderlake/Kconfig | 1 - src/soc/intel/common/block/cpu/Kconfig | 2 +- src/soc/intel/meteorlake/Kconfig | 1 - src/soc/intel/tigerlake/Kconfig | 3 +++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/soc/intel/alderlake/Kconfig b/src/soc/intel/alderlake/Kconfig index 50fadefda8..937e3dbdea 100644 --- a/src/soc/intel/alderlake/Kconfig +++ b/src/soc/intel/alderlake/Kconfig @@ -71,7 +71,6 @@ config CPU_SPECIFIC_OPTIONS select INTEL_GMA_ACPI select INTEL_GMA_ADD_VBT if RUN_FSP_GOP select INTEL_GMA_OPREGION_2_1 - select INTEL_TME select MRC_SETTINGS_PROTECT select PARALLEL_MP_AP_WORK select PLATFORM_USES_FSP2_2 diff --git a/src/soc/intel/common/block/cpu/Kconfig b/src/soc/intel/common/block/cpu/Kconfig index ea81457466..d42824c4ce 100644 --- a/src/soc/intel/common/block/cpu/Kconfig +++ b/src/soc/intel/common/block/cpu/Kconfig @@ -110,7 +110,7 @@ config CPU_SUPPORTS_INTEL_TME config INTEL_TME bool "Total Memory Encryption (TME)/Multi-key TME (MKTME)" depends on CPU_SUPPORTS_INTEL_TME - default n + default y help Enable Total Memory Encryption (TME)/Multi-key TME (MKTME). The spec is available at "https://software.intel.com/sites/default/files/managed/a5 diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index a407be76ce..0550d734ef 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -34,7 +34,6 @@ config CPU_SPECIFIC_OPTIONS select INTEL_DESCRIPTOR_MODE_CAPABLE select INTEL_GMA_ACPI select INTEL_GMA_ADD_VBT if RUN_FSP_GOP - select INTEL_TME select IOAPIC select MICROCODE_BLOB_UNDISCLOSED select MRC_SETTINGS_PROTECT diff --git a/src/soc/intel/tigerlake/Kconfig b/src/soc/intel/tigerlake/Kconfig index 2f8c6d9500..7966a87e39 100644 --- a/src/soc/intel/tigerlake/Kconfig +++ b/src/soc/intel/tigerlake/Kconfig @@ -145,6 +145,9 @@ config IED_REGION_SIZE hex default 0x400000 +config INTEL_TME + default n + config HEAP_SIZE hex default 0x10000