1. Invoke InstallConfigurationTable () in OnReadyToBoot() to avoid the new registered table may be NULL.

2. For SMM variable driver, it doesn’t need to mark the variable storage region of the FLASH as RUNTIME, so only keep it for non-SMM variable driver. 


git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11212 6f19259b-4bc3-4df7-8a09-765794883524

2 files changed, 31 insertions, 26 deletions

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
index 8bf585a72a..9da00f1275 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.c
@@ -2259,9 +2259,6 @@ VariableWriteServiceInitialize (
   VARIABLE_STORE_HEADER           *VariableStoreHeader;

   UINTN                           Index;

   UINT8                           Data;

-  EFI_GCD_MEMORY_SPACE_DESCRIPTOR GcdDescriptor;

-  EFI_PHYSICAL_ADDRESS            BaseAddress;

-  UINT64                          Length;

   EFI_PHYSICAL_ADDRESS            VariableStoreBase;

   UINT64                          VariableStoreLength;

 

@@ -2291,26 +2288,6 @@ VariableWriteServiceInitialize (
     }

   }

 

-  //

-  // Mark the variable storage region of the FLASH as RUNTIME.

-  //

-  BaseAddress = VariableStoreBase & (~EFI_PAGE_MASK);

-  Length      = VariableStoreLength + (VariableStoreBase - BaseAddress);

-  Length      = (Length + EFI_PAGE_SIZE - 1) & (~EFI_PAGE_MASK);

-

-  Status      = gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor);

-  if (EFI_ERROR (Status)) {

-    DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n"));

-  } else {

-    Status = gDS->SetMemorySpaceAttributes (

-                    BaseAddress,

-                    Length,

-                    GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME

-                    );

-    if (EFI_ERROR (Status)) {

-      DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n"));

-    }

-  }

   return EFI_SUCCESS;

 }

 

diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
index 70723b320f..86028beca9 100644
--- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
+++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
@@ -255,6 +255,9 @@ OnReadyToBoot (
   )

 {

   ReclaimForOS ();

+  if (FeaturePcdGet (PcdVariableCollectStatistics)) {

+    gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);

+  }

 }

 

 

@@ -279,6 +282,11 @@ FtwNotificationEvent (
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL      *FvbProtocol;

   EFI_FAULT_TOLERANT_WRITE_PROTOCOL       *FtwProtocol;

   EFI_PHYSICAL_ADDRESS                    NvStorageVariableBase;

+  EFI_GCD_MEMORY_SPACE_DESCRIPTOR         GcdDescriptor;

+  EFI_PHYSICAL_ADDRESS                    BaseAddress;

+  UINT64                                  Length;

+  EFI_PHYSICAL_ADDRESS                    VariableStoreBase;

+  UINT64                                  VariableStoreLength;

 

   //

   // Ensure FTW protocol is installed.

@@ -300,6 +308,29 @@ FtwNotificationEvent (
     return ;

   }

   mVariableModuleGlobal->FvbInstance = FvbProtocol;

+

+  //

+  // Mark the variable storage region of the FLASH as RUNTIME.

+  //

+  VariableStoreBase   = mVariableModuleGlobal->VariableGlobal.NonVolatileVariableBase;

+  VariableStoreLength = ((VARIABLE_STORE_HEADER *)(UINTN)VariableStoreBase)->Size;

+  BaseAddress = VariableStoreBase & (~EFI_PAGE_MASK);

+  Length      = VariableStoreLength + (VariableStoreBase - BaseAddress);

+  Length      = (Length + EFI_PAGE_SIZE - 1) & (~EFI_PAGE_MASK);

+

+  Status      = gDS->GetMemorySpaceDescriptor (BaseAddress, &GcdDescriptor);

+  if (EFI_ERROR (Status)) {

+    DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n"));

+  } else {

+    Status = gDS->SetMemorySpaceAttributes (

+                    BaseAddress,

+                    Length,

+                    GcdDescriptor.Attributes | EFI_MEMORY_RUNTIME

+                    );

+    if (EFI_ERROR (Status)) {

+      DEBUG ((DEBUG_WARN, "Variable driver failed to add EFI_MEMORY_RUNTIME attribute to Flash.\n"));

+    }

+  }

   

   Status = VariableWriteServiceInitialize ();

   ASSERT_EFI_ERROR (Status);

@@ -395,9 +426,6 @@ VariableServiceInitialize (
              &ReadyToBootEvent

              );

 

-  if (FeaturePcdGet (PcdVariableCollectStatistics)) {

-    gBS->InstallConfigurationTable (&gEfiVariableGuid, gVariableInfo);

-  }

   return EFI_SUCCESS;

 }