From 9173111b86dca292ff20058c2988707b6051eb21 Mon Sep 17 00:00:00 2001 From: Sabryna <107177028+ssbyna@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:41:19 +0800 Subject: [PATCH] feat: [ARLH] Enable UPDs to follow SiConfigData (#2249) PchLockDownBiosLock & PchLockDownGlobalSmi follow board SiCfgData Signed-off-by: Syahirah Sabryna --- .../FspsUpdUpdateLib/FspsUpdUpdateLib.c | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/Platform/ArrowlakeBoardPkg/Library/FspsUpdUpdateLib/FspsUpdUpdateLib.c b/Platform/ArrowlakeBoardPkg/Library/FspsUpdUpdateLib/FspsUpdUpdateLib.c index 03fed101..62cedf6d 100644 --- a/Platform/ArrowlakeBoardPkg/Library/FspsUpdUpdateLib/FspsUpdUpdateLib.c +++ b/Platform/ArrowlakeBoardPkg/Library/FspsUpdUpdateLib/FspsUpdUpdateLib.c @@ -592,16 +592,6 @@ UpdateFspConfig ( FspsConfig->PchLockDownGlobalSmi = 0x1; } - if (MtlIsSocM ()) { - DEBUG ((DEBUG_INFO, "Updated Soc M VMD Enabled WatchDog Disabled\n")); - FspsConfig->VmdEnable = 1; - FspsConfig->EnableTcoTimer = 0x0; - FspsConfig->WatchDogEnabled = 0x0; - } else { - FspsConfig->VmdEnable = 0; - FspsConfig->EnableTcoTimer = 0x1; - } - // PCH Flash protection FspsConfig->PchPwrOptEnable = 0x1; @@ -631,6 +621,18 @@ UpdateFspConfig ( FspsConfig->AmtEnabled = 0x1; FspsConfig->EnableTcoTimer = 0x1; + if (MtlIsSocM ()) { + DEBUG ((DEBUG_INFO, "Updated Soc M VMD Enabled WatchDog Disabled\n")); + FspsConfig->VmdEnable = 1; + FspsConfig->EnableTcoTimer = 0x0; + FspsConfig->WatchDogEnabled = 0x0; + FspsConfig->PchLockDownBiosLock = SiCfgData->PchLockDownBiosLock; + FspsConfig->PchLockDownGlobalSmi = SiCfgData->PchLockDownGlobalSmi; + } else { + FspsConfig->VmdEnable = 0; + FspsConfig->EnableTcoTimer = 0x1; + } + PowerCfgData = (POWER_CFG_DATA *) FindConfigDataByTag (CDATA_POWER_TAG); if (PowerCfgData == NULL) { DEBUG ((DEBUG_ERROR, "Missing power Cfg Data!\n"));