if it's in recovery mode, variable region is unreliable, so the ReadOnlyVariable2Ppi should return EFI_NOT_FOUND

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

3 files changed, 177 insertions, 8 deletions

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.c b/MdeModulePkg/Universal/Variable/Pei/Variable.c
index 26cbe60d67..320d4526c7 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.c
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.c
@@ -3,7 +3,7 @@
   Implement ReadOnly Variable Services required by PEIM and install

   PEI ReadOnly Varaiable2 PPI. These services operates the non volatile storage space.

 

-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -32,6 +32,17 @@ EFI_PEI_PPI_DESCRIPTOR     mPpiListVariable = {
   &mVariablePpi

 };

 

+EFI_PEI_READ_ONLY_VARIABLE2_PPI mVariablePpiRecovery = {

+  PeiGetVariableRecovery,

+  PeiGetNextVariableNameRecovery

+};

+

+EFI_PEI_PPI_DESCRIPTOR     mPpiListVariableRecovery = {

+  (EFI_PEI_PPI_DESCRIPTOR_PPI | EFI_PEI_PPI_DESCRIPTOR_TERMINATE_LIST),

+  &gEfiPeiReadOnlyVariable2PpiGuid,

+  &mVariablePpiRecovery

+};

+

 EFI_GUID mEfiVariableIndexTableGuid = EFI_VARIABLE_INDEX_TABLE_GUID;

 

 

@@ -57,15 +68,16 @@ PeimInitializeVariableServices (
   EFI_STATUS    Status;

 

   //

-  // Check if this is recovery boot path. If no, publish the variable access capability

-  // to other modules. If yes, the content of variable area is not reliable. Therefore,

-  // in this case we should not provide variable service to other pei modules. 

+  // Check if this is recovery boot path.

+  // If no, provide other modules the access capability to variable area in NV storage.

+  // If yes, the content of variable area is not reliable. Therefore,

+  // we provide a dummy ReadOnlyVariable2Ppi interface to other pei modules.

   // 

   Status = (*PeiServices)->GetBootMode (PeiServices, &BootMode);

   ASSERT_EFI_ERROR (Status);

   

   if (BootMode == BOOT_IN_RECOVERY_MODE) {

-    return EFI_UNSUPPORTED;

+    return PeiServicesInstallPpi (&mPpiListVariableRecovery);

   }

 

   return PeiServicesInstallPpi (&mPpiListVariable);

@@ -672,3 +684,84 @@ PeiGetNextVariableName (
 

   return EFI_NOT_FOUND;

 }

+

+/**

+  This service retrieves a variable's value using its name and GUID.

+

+  Read the specified variable from the UEFI variable store. If the Data 

+  buffer is too small to hold the contents of the variable, the error

+  EFI_BUFFER_TOO_SMALL is returned and DataSize is set to the required buffer

+  size to obtain the data.

+

+  @param  This                  A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.

+  @param  VariableName          A pointer to a null-terminated string that is the variable's name.

+  @param  VariableGuid          A pointer to an EFI_GUID that is the variable's GUID. The combination of

+                                VariableGuid and VariableName must be unique.

+  @param  Attributes            If non-NULL, on return, points to the variable's attributes.

+  @param  DataSize              On entry, points to the size in bytes of the Data buffer.

+                                On return, points to the size of the data returned in Data.

+  @param  Data                  Points to the buffer which will hold the returned variable value.

+

+  @retval EFI_SUCCESS           The variable was read successfully.

+  @retval EFI_NOT_FOUND         The variable could not be found.

+  @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data. 

+                                DataSize is updated with the size required for 

+                                the specified variable.

+  @retval EFI_INVALID_PARAMETER VariableName, VariableGuid, DataSize or Data is NULL.

+  @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiGetVariableRecovery (

+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

+  IN CONST  CHAR16                          *VariableName,

+  IN CONST  EFI_GUID                        *VariableGuid,

+  OUT       UINT32                          *Attributes,

+  IN OUT    UINTN                           *DataSize,

+  OUT       VOID                            *Data

+  )

+{

+  return EFI_NOT_FOUND;

+}

+

+/**

+  Return the next variable name and GUID.

+

+  This function is called multiple times to retrieve the VariableName 

+  and VariableGuid of all variables currently available in the system. 

+  On each call, the previous results are passed into the interface, 

+  and, on return, the interface returns the data for the next 

+  interface. When the entire variable list has been returned, 

+  EFI_NOT_FOUND is returned.

+

+  @param  This              A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.

+

+  @param  VariableNameSize  On entry, points to the size of the buffer pointed to by VariableName.

+  @param  VariableName      On entry, a pointer to a null-terminated string that is the variable's name.

+                            On return, points to the next variable's null-terminated name string.

+

+  @param  VariableGuid      On entry, a pointer to an UEFI _GUID that is the variable's GUID. 

+                            On return, a pointer to the next variable's GUID.

+

+  @retval EFI_SUCCESS           The variable was read successfully.

+  @retval EFI_NOT_FOUND         The variable could not be found.

+  @retval EFI_BUFFER_TOO_SMALL  The VariableNameSize is too small for the resulting

+                                data. VariableNameSize is updated with the size

+                                required for the specified variable.

+  @retval EFI_INVALID_PARAMETER VariableName, VariableGuid or

+                                VariableNameSize is NULL.

+  @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiGetNextVariableNameRecovery (

+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

+  IN OUT UINTN                              *VariableNameSize,

+  IN OUT CHAR16                             *VariableName,

+  IN OUT EFI_GUID                           *VariableGuid

+  )

+{

+  return EFI_NOT_FOUND;

+}

diff --git a/MdeModulePkg/Universal/Variable/Pei/Variable.h b/MdeModulePkg/Universal/Variable/Pei/Variable.h
index 963a50b961..ea217dbdf0 100644
--- a/MdeModulePkg/Universal/Variable/Pei/Variable.h
+++ b/MdeModulePkg/Universal/Variable/Pei/Variable.h
@@ -3,7 +3,7 @@
   The internal header file includes the common header files, defines

   internal structure and functions used by PeiVariable module.

 

-Copyright (c) 2006 - 2008, Intel Corporation. All rights reserved.<BR>

+Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 This program and the accompanying materials

 are licensed and made available under the terms and conditions of the BSD License

 which accompanies this distribution.  The full text of the license may be found at

@@ -153,4 +153,80 @@ PeiGetNextVariableName (
   IN OUT EFI_GUID                           *VariableGuid

   );

 

+

+/**

+  This service retrieves a variable's value using its name and GUID.

+

+  Read the specified variable from the UEFI variable store. If the Data 

+  buffer is too small to hold the contents of the variable, the error

+  EFI_BUFFER_TOO_SMALL is returned and DataSize is set to the required buffer

+  size to obtain the data.

+

+  @param  This                  A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.

+  @param  VariableName          A pointer to a null-terminated string that is the variable's name.

+  @param  VariableGuid          A pointer to an EFI_GUID that is the variable's GUID. The combination of

+                                VariableGuid and VariableName must be unique.

+  @param  Attributes            If non-NULL, on return, points to the variable's attributes.

+  @param  DataSize              On entry, points to the size in bytes of the Data buffer.

+                                On return, points to the size of the data returned in Data.

+  @param  Data                  Points to the buffer which will hold the returned variable value.

+

+  @retval EFI_SUCCESS           The variable was read successfully.

+  @retval EFI_NOT_FOUND         The variable could not be found.

+  @retval EFI_BUFFER_TOO_SMALL  The DataSize is too small for the resulting data. 

+                                DataSize is updated with the size required for 

+                                the specified variable.

+  @retval EFI_INVALID_PARAMETER VariableName, VariableGuid, DataSize or Data is NULL.

+  @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiGetVariableRecovery (

+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

+  IN CONST  CHAR16                          *VariableName,

+  IN CONST  EFI_GUID                        *VariableGuid,

+  OUT       UINT32                          *Attributes,

+  IN OUT    UINTN                           *DataSize,

+  OUT       VOID                            *Data

+  );

+

+/**

+  Return the next variable name and GUID.

+

+  This function is called multiple times to retrieve the VariableName 

+  and VariableGuid of all variables currently available in the system. 

+  On each call, the previous results are passed into the interface, 

+  and, on return, the interface returns the data for the next 

+  interface. When the entire variable list has been returned, 

+  EFI_NOT_FOUND is returned.

+

+  @param  This              A pointer to this instance of the EFI_PEI_READ_ONLY_VARIABLE2_PPI.

+

+  @param  VariableNameSize  On entry, points to the size of the buffer pointed to by VariableName.

+  @param  VariableName      On entry, a pointer to a null-terminated string that is the variable's name.

+                            On return, points to the next variable's null-terminated name string.

+

+  @param  VariableGuid      On entry, a pointer to an UEFI _GUID that is the variable's GUID. 

+                            On return, a pointer to the next variable's GUID.

+

+  @retval EFI_SUCCESS           The variable was read successfully.

+  @retval EFI_NOT_FOUND         The variable could not be found.

+  @retval EFI_BUFFER_TOO_SMALL  The VariableNameSize is too small for the resulting

+                                data. VariableNameSize is updated with the size

+                                required for the specified variable.

+  @retval EFI_INVALID_PARAMETER VariableName, VariableGuid or

+                                VariableNameSize is NULL.

+  @retval EFI_DEVICE_ERROR      The variable could not be retrieved because of a device error.

+

+**/

+EFI_STATUS

+EFIAPI

+PeiGetNextVariableNameRecovery (

+  IN CONST  EFI_PEI_READ_ONLY_VARIABLE2_PPI *This,

+  IN OUT UINTN                              *VariableNameSize,

+  IN OUT CHAR16                             *VariableName,

+  IN OUT EFI_GUID                           *VariableGuid

+  );

+

 #endif

diff --git a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
index 0f3a831da8..a368ba9613 100644
--- a/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
+++ b/MdeModulePkg/Universal/Variable/Pei/VariablePei.inf
@@ -3,7 +3,7 @@
 #  Implement ReadOnly Variable Services required by PEIM and install

 #  PEI ReadOnly Varaiable2 PPI. These services operates the non-volatile storage space.

 #

-#  Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>

+#  Copyright (c) 2006 - 2011, Intel Corporation. All rights reserved.<BR>

 #  This program and the accompanying materials

 #  are licensed and made available under the terms and conditions of the BSD License

 #  which accompanies this distribution. The full text of the license may be found at

@@ -56,7 +56,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableBase64  ## CONSUMES

 

 [Depex]

-  TRUE

+  gEfiPeiMasterBootModePpiGuid

 

 #

 #  [BootMode]