From 9381dd0cbfb1cd3479410e714107750ad12c8763 Mon Sep 17 00:00:00 2001 From: Matt DeVillier Date: Wed, 11 Jun 2025 09:11:44 -0500 Subject: [PATCH] soc/intel/meteorlake: Make TME_KEY_REGENERATION_ON_WARM_BOOT selectable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rather than always enabling TME_KEY_REGENERATION_ON_WARM_BOOT, allow it to be deselected but default to Y. Enabling it causes issues on boards which use S3 suspend (vs S0ix), so allow it to be deselected so those boards don't have to disable TME entirely. TEST=build/boot starlabs/starbook_mtl, verify S3 resume works properly with TME_KEY_REGENERATION_ON_WARM_BOOT deselected. Change-Id: I60de19eddf7c2d8bc390b718b7cb1bf7d0267d47 Signed-off-by: Matt DeVillier Reviewed-on: https://review.coreboot.org/c/coreboot/+/88054 Reviewed-by: Sean Rhodes Tested-by: build bot (Jenkins) Reviewed-by: Jérémy Compostella --- src/soc/intel/meteorlake/Kconfig | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/soc/intel/meteorlake/Kconfig b/src/soc/intel/meteorlake/Kconfig index cbab6a7f7c..050ddfcd3f 100644 --- a/src/soc/intel/meteorlake/Kconfig +++ b/src/soc/intel/meteorlake/Kconfig @@ -99,7 +99,6 @@ config SOC_INTEL_METEORLAKE select SOC_INTEL_MEM_MAPPED_PM_CONFIGURATION select SSE2 select SUPPORT_CPU_UCODE_IN_CBFS - select TME_KEY_REGENERATION_ON_WARM_BOOT if INTEL_TME select TSC_MONOTONIC_TIMER select UDELAY_TSC select UDK_202302_BINDING @@ -470,4 +469,7 @@ config SKIP_SEND_CONNECT_TOPOLOGY_CMD Mainboards which use firmware connection manager may also wish to select this as needed. +config TME_KEY_REGENERATION_ON_WARM_BOOT + default y if INTEL_TME + endif