summaryrefslogtreecommitdiff
path: root/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
diff options
context:
space:
mode:
authorTim He <tim.he@intel.com>2015-06-11 02:50:20 +0000
committertimhe <timhe@Edk2>2015-06-11 02:50:20 +0000
commit620f289162b08d319fe1e73b3c7e2baff6b388e4 (patch)
treedb0955f5012f93e7aca96b11c6f39b0da158fafc /Vlv2TbltDevicePkg/PlatformDxe/ExI.c
parent2a697cb579972d1b849c396499dd0a1d2e911d35 (diff)
downloadedk2-platforms-620f289162b08d319fe1e73b3c7e2baff6b388e4.tar.xz
Sync the branch changes to trunk.
Update the FCE tool to remove “runtime access” . and recovery "Setup" variable in case of “Setup” variable size is incorrect somehow. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Tim He <tim.he@intel.com> Reviewed-by: David Wei <david.wei@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17620 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'Vlv2TbltDevicePkg/PlatformDxe/ExI.c')
-rw-r--r--Vlv2TbltDevicePkg/PlatformDxe/ExI.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/Vlv2TbltDevicePkg/PlatformDxe/ExI.c b/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
index 2dad89f606..603b44aa82 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
@@ -73,7 +73,18 @@ InitExI (
&SystemConfiguration
);
- ASSERT_EFI_ERROR(Status);
+ if (EFI_ERROR (Status) || VarSize != sizeof(SYSTEM_CONFIGURATION)) {
+ //The setup variable is corrupted
+ VarSize = sizeof(SYSTEM_CONFIGURATION);
+ Status = gRT->GetVariable(
+ L"SetupRecovery",
+ &gEfiNormalSetupGuid,
+ NULL,
+ &VarSize,
+ &SystemConfiguration
+ );
+ ASSERT_EFI_ERROR (Status);
+ }
if (SystemConfiguration.ExISupport == 1) {
MmioOr32 ((UINTN) (GetPmcBase() + R_PCH_PMC_MTPMC1), (UINT32) BIT0+BIT1+BIT2);