MdeModulePkg Variable: Merge from Auth Variable driver in SecurityPkg

What to do:
1. Merge from Auth Variable driver in SecurityPkg to Variable drive in
MdeModulePkg. Then the merged Variable driver in MdeModulePkg will
link to AuthVariableLib and TpmMeasurementLib.
AuthVariableLibNull and TpmMeasurementLibNull in MdeModulePkg
could be used for non auth variable support.
AuthVariableLib and DxeTpmMeasurementLib in SecurityPkg
may be used for auth variable support.

Why to do:
1. Remove code duplication and reduce maintenance effort.
After auth variable service separated from Auth Variable driver in SecurityPkg
to AuthVariableLib. The remaining code logic of Auth Variable driver in SecurityPkg
will be almost same with Variable driver in MdeModulePkg. Now it is to
merge them.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17765 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 21 insertions, 15 deletions

diff --git a/MdeModulePkg/Include/Guid/SmmVariableCommon.h b/MdeModulePkg/Include/Guid/SmmVariableCommon.h
index e92ab7fe79..734eb19681 100644
--- a/MdeModulePkg/Include/Guid/SmmVariableCommon.h
+++ b/MdeModulePkg/Include/Guid/SmmVariableCommon.h
@@ -2,12 +2,12 @@
   The file defined some common structures used for communicating between SMM variable module and SMM variable wrapper module.

 

 Copyright (c) 2011 - 2015, 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 that accompanies this distribution.  

+This program and the accompanying materials are licensed and made available under

+the terms and conditions of the BSD License that accompanies this distribution.

 The full text of the license may be found at

-http://opensource.org/licenses/bsd-license.php.                                            

+http://opensource.org/licenses/bsd-license.php.

 

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

 WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

 

 **/

@@ -23,8 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 extern EFI_GUID gSmmVariableWriteGuid;

 

 //

-// This structure is used for SMM variable. the collected statistics data is saved in SMRAM. It can be got from 

-// SMI handler. The communication buffer should be: 

+// This structure is used for SMM variable. the collected statistics data is saved in SMRAM. It can be got from

+// SMI handler. The communication buffer should be:

 // EFI_SMM_COMMUNICATE_HEADER + SMM_VARIABLE_COMMUNICATE_HEADER + payload.

 //

 typedef struct {

@@ -39,26 +39,26 @@ typedef struct {
 #define SMM_VARIABLE_FUNCTION_GET_VARIABLE            1

 //

 // The payload for this function is SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME.

-// 

+//

 #define SMM_VARIABLE_FUNCTION_GET_NEXT_VARIABLE_NAME  2

 //

 // The payload for this function is SMM_VARIABLE_COMMUNICATE_ACCESS_VARIABLE.

-// 

+//

 #define SMM_VARIABLE_FUNCTION_SET_VARIABLE            3

 //

 // The payload for this function is SMM_VARIABLE_COMMUNICATE_QUERY_VARIABLE_INFO.

-// 

+//

 #define SMM_VARIABLE_FUNCTION_QUERY_VARIABLE_INFO     4

 //

 // It is a notify event, no extra payload for this function.

-// 

+//

 #define SMM_VARIABLE_FUNCTION_READY_TO_BOOT           5

 //

 // It is a notify event, no extra payload for this function.

-// 

+//

 #define SMM_VARIABLE_FUNCTION_EXIT_BOOT_SERVICE       6

 //

-// The payload for this function is VARIABLE_INFO_ENTRY. The GUID in EFI_SMM_COMMUNICATE_HEADER 

+// The payload for this function is VARIABLE_INFO_ENTRY. The GUID in EFI_SMM_COMMUNICATE_HEADER

 // is gEfiSmmVariableProtocolGuid.

 //

 #define SMM_VARIABLE_FUNCTION_GET_STATISTICS          7

@@ -71,6 +71,8 @@ typedef struct {
 

 #define SMM_VARIABLE_FUNCTION_VAR_CHECK_VARIABLE_PROPERTY_GET  10

 

+#define SMM_VARIABLE_FUNCTION_GET_PAYLOAD_SIZE        11

+

 ///

 /// Size of SMM communicate header, without including the payload.

 ///

@@ -88,7 +90,7 @@ typedef struct {
   EFI_GUID    Guid;

   UINTN       DataSize;

   UINTN       NameSize;

-  UINT32      Attributes;  

+  UINT32      Attributes;

   CHAR16      Name[1];

 } SMM_VARIABLE_COMMUNICATE_ACCESS_VARIABLE;

 

@@ -108,7 +110,7 @@ typedef struct {
   UINT64          MaximumVariableStorageSize;

   UINT64          RemainingVariableStorageSize;

   UINT64          MaximumVariableSize;

-  UINT32          Attributes; 

+  UINT32          Attributes;

 } SMM_VARIABLE_COMMUNICATE_QUERY_VARIABLE_INFO;

 

 typedef SMM_VARIABLE_COMMUNICATE_GET_NEXT_VARIABLE_NAME SMM_VARIABLE_COMMUNICATE_LOCK_VARIABLE;

@@ -120,4 +122,8 @@ typedef struct {
   CHAR16                        Name[1];

 } SMM_VARIABLE_COMMUNICATE_VAR_CHECK_VARIABLE_PROPERTY;

 

-#endif // _SMM_VARIABLE_COMMON_H_
\ No newline at end of file
+typedef struct {

+  UINTN                         VariablePayloadSize;

+} SMM_VARIABLE_COMMUNICATE_GET_PAYLOAD_SIZE;

+

+#endif // _SMM_VARIABLE_COMMON_H_