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

3 files changed, 130 insertions, 18 deletions

diff --git a/Vlv2TbltDevicePkg/PlatformDxe/ExI.c b/Vlv2TbltDevicePkg/PlatformDxe/ExI.c
index 2dad89f60..603b44aa8 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);

diff --git a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
index dba84fb65..a1cd072c8 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
+++ b/Vlv2TbltDevicePkg/PlatformDxe/Platform.c
@@ -49,6 +49,8 @@ Abstract:
 #include <Protocol/GlobalNvsArea.h>

 #include <Protocol/IgdOpRegion.h>

 #include <Library/PcdLib.h>

+#include <Protocol/VariableLock.h>

+

 

 //

 // VLV2 GPIO GROUP OFFSET

@@ -200,6 +202,82 @@ InitRC6Policy(
   );

 

 

+EFI_STATUS

+EFIAPI

+SaveSetupRecoveryVar(

+  VOID

+  )

+{

+  EFI_STATUS                   Status = EFI_SUCCESS;

+  UINTN                        SizeOfNvStore = 0;

+  UINTN                        SizeOfSetupVar = 0;

+  SYSTEM_CONFIGURATION         *SetupData = NULL;

+  SYSTEM_CONFIGURATION         *RecoveryNvData = NULL;

+  EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock = NULL;

+

+

+  DEBUG ((EFI_D_INFO, "SaveSetupRecoveryVar() Entry \n"));

+  SizeOfNvStore = sizeof(SYSTEM_CONFIGURATION);

+  RecoveryNvData = AllocateZeroPool (sizeof(SYSTEM_CONFIGURATION));

+  if (NULL == RecoveryNvData) {

+    Status = EFI_OUT_OF_RESOURCES;

+    goto Exit; 

+  }

+  

+  Status = gRT->GetVariable(

+                L"SetupRecovery",

+                &gEfiNormalSetupGuid,

+                NULL,

+                &SizeOfNvStore,

+                RecoveryNvData

+                );

+  

+  if (EFI_ERROR (Status)) {

+    // Don't find the "SetupRecovery" variable.

+    // have to copy "Setup" variable to "SetupRecovery" variable.

+    SetupData = AllocateZeroPool (sizeof(SYSTEM_CONFIGURATION));

+    if (NULL == SetupData) {

+      Status = EFI_OUT_OF_RESOURCES;

+      goto Exit;      

+    }

+    SizeOfSetupVar = sizeof(SYSTEM_CONFIGURATION);

+    Status = gRT->GetVariable(

+                    NORMAL_SETUP_NAME,

+                    &gEfiNormalSetupGuid,

+                    NULL,

+                    &SizeOfSetupVar,

+                    SetupData

+                    );

+    ASSERT_EFI_ERROR (Status);

+    

+    Status = gRT->SetVariable (

+                    L"SetupRecovery",

+                    &gEfiNormalSetupGuid,

+                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+                    sizeof(SYSTEM_CONFIGURATION),

+                    SetupData

+                    );

+    ASSERT_EFI_ERROR (Status);

+

+    Status = gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NULL, (VOID **) &VariableLock);

+      if (!EFI_ERROR (Status)) {

+        Status = VariableLock->RequestToLock (VariableLock, L"SetupRecovery", &gEfiNormalSetupGuid);

+        ASSERT_EFI_ERROR (Status);

+    }

+    

+  }

+

+Exit:

+  if (RecoveryNvData)

+    FreePool (RecoveryNvData);

+  if (SetupData)

+    FreePool (SetupData);

+  

+  return Status;

+    

+}

+

+

 VOID

 TristateLpcGpioConfig (

   IN UINT32             Gpio_Mmio_Offset,

@@ -692,6 +770,10 @@ InitializePlatform (
   //

   InitializeObservableProtocol();

 

+  Status = SaveSetupRecoveryVar();

+  if (EFI_ERROR (Status)) {

+    DEBUG ((EFI_D_ERROR, "InitializePlatform() Save SetupRecovery variable failed \n"));

+  }

 

   VarSize = sizeof(SYSTEM_CONFIGURATION);

   Status = gRT->GetVariable(

@@ -701,8 +783,26 @@ InitializePlatform (
                   &VarSize,

                   &mSystemConfiguration

                   );

-

-

+  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,

+              &mSystemConfiguration

+              );

+    ASSERT_EFI_ERROR (Status);

+    Status = gRT->SetVariable (

+                    NORMAL_SETUP_NAME,

+                    &gEfiNormalSetupGuid,

+                    EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,

+                    sizeof(SYSTEM_CONFIGURATION),

+                    &mSystemConfiguration

+                    );    

+  }

+    

   Status = EfiCreateEventReadyToBootEx (

              TPL_CALLBACK,

              ReadyToBootFunction,

@@ -1394,12 +1494,7 @@ InitMfgAndConfigModeStateVar()
 {

   EFI_PLATFORM_SETUP_ID           *BootModeBuffer;

   VOID                            *HobList;

-  UINT16                          State;

 

-  //

-  // Variable initialization

-  //

-  State = FALSE;

 

   HobList = GetFirstGuidHob(&gEfiPlatformBootModeGuid);

   if (HobList != NULL) {

@@ -1416,16 +1511,8 @@ InitMfgAndConfigModeStateVar()
         mMfgMode = TRUE;

       }

 

-      //

-      // Check if in safe mode

-      //

-      if ( !CompareMem (

-              &BootModeBuffer->SetupName,

-              SAFE_SETUP_NAME,

-              StrSize (SAFE_SETUP_NAME)

-              ) ) {

-        State = TRUE;

-      }

+

+

   }

 

 }

@@ -1588,6 +1675,19 @@ UpdateDVMTSetup(
                   &SystemConfiguration

                   );

 

+  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.GraphicsDriverMemorySize < 4) && !EFI_ERROR(Status) ) {

     switch (SystemConfiguration.GraphicsDriverMemorySize){

       case 1:

diff --git a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
index 27216b787..63ccf0302 100644
--- a/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
+++ b/Vlv2TbltDevicePkg/PlatformDxe/PlatformDxe.inf
@@ -128,6 +128,7 @@
   gEfiCpuIo2ProtocolGuid

   gIgdOpRegionProtocolGuid

   gExitPmAuthProtocolGuid

+  gEdkiiVariableLockProtocolGuid

 

 [Pcd.common]

   gPlatformModuleTokenSpaceGuid.PcdPBTNDisableInterval