[XS] Change in coreboot[main]: soc/intel/meteorlake: Don't generate a TME on S3 exit

[Matt DeVillier (Code Review)]

Matt DeVillier has submitted this change. ( https://review.coreboot.org/c/coreboot/+/86625?usp=email )

Change subject: soc/intel/meteorlake: Don't generate a TME on S3 exit
......................................................................

soc/intel/meteorlake: Don't generate a TME on S3 exit

Generate a new TME key will cause S3 exit to fail, so
don't do it.

Change-Id: Ie19cb7f11ad633405a9fc3c1faf1c3cc53113f51
Signed-off-by: Sean Rhodes 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/86625
Tested-by: build bot (Jenkins) 
Reviewed-by: Subrata Banik 
---
M src/soc/intel/meteorlake/romstage/fsp_params.c
1 file changed, 2 insertions(+), 1 deletion(-)

Approvals:
  build bot (Jenkins): Verified
  Subrata Banik: Looks good to me, approved

diff --git a/src/soc/intel/meteorlake/romstage/fsp_params.c b/src/soc/intel/meteorlake/romstage/fsp_params.c
index dd9d2b5..8e49afa 100644
--- a/src/soc/intel/meteorlake/romstage/fsp_params.c
+++ b/src/soc/intel/meteorlake/romstage/fsp_params.c
@@ -1,5 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */

+#include <acpi/acpi.h>
 #include <assert.h>
 #include <bootmode.h>
 #include <console/console.h>
@@ -190,7 +191,7 @@
 static void fill_tme_params(FSP_M_CONFIG *m_cfg)
 {
    m_cfg->TmeEnable = CONFIG(INTEL_TME) && is_tme_supported();
-	if (!m_cfg->TmeEnable)
+	if (!m_cfg->TmeEnable || acpi_is_wakeup_s3())
    	return;
    m_cfg->GenerateNewTmeKey = CONFIG(TME_KEY_REGENERATION_ON_WARM_BOOT) &&
    		 CONFIG(SOC_INTEL_COMMON_BASECODE_RAMTOP);