X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=SecurityPkg%2FSecurityPkg.dec;h=b0ef20b05b33df2da69cecd54e892a5675bb0c65;hb=7ae77cee9627f417b3bbcc3334d3823ff248a3f5;hp=7bbc1e67c6bd6b13a38fa6d01115b46000e4070f;hpb=4610b23ab10942d140eb51c4bdbefc5f896979ad;p=mirror_edk2.git

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 7bbc1e67c6..b0ef20b05b 100644
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -20,8 +20,8 @@
   DEC_SPECIFICATION              = 0x00010005
   PACKAGE_NAME                   = SecurityPkg
   PACKAGE_UNI_FILE               = SecurityPkg.uni
-  PACKAGE_GUID                   = 24369CAC-6AA6-4fb8-88DB-90BF061668AD
-  PACKAGE_VERSION                = 0.94
+  PACKAGE_GUID                   = 4EFC4F66-6219-4427-B780-FB99F470767F
+  PACKAGE_VERSION                = 0.95
 
 [Includes]
   Include
@@ -62,10 +62,6 @@
   ##  @libraryclass  Provides TPM Interface Specification (TIS) interfaces for TPM command.
   #
   TpmCommLib|Include/Library/TpmCommLib.h
-    
-  ##  @libraryclass  Provides common interfaces about TPM measurement for other modules.
-  #
-  TpmMeasurementLib|Include/Library/TpmMeasurementLib.h
   
   ##  @libraryclass  Provides interfaces to handle TPM 2.0 request.
   #
@@ -80,10 +76,6 @@
   # Include/Guid/SecurityPkgTokenSpace.h
   gEfiSecurityPkgTokenSpaceGuid      = { 0xd3fb176, 0x9569, 0x4d51, { 0xa3, 0xef, 0x7d, 0x61, 0xc6, 0x4f, 0xea, 0xba }}
 
-  ## Guid acted as the authenticated variable store header's signature, and to specify the variable list entries put in the EFI system table.
-  #  Include/Guid/AuthenticatedVariableFormat.h
-  gEfiAuthenticatedVariableGuid      = { 0xaaf32c78, 0x947b, 0x439a, { 0xa1, 0x80, 0x2e, 0x14, 0x4e, 0xc3, 0x77, 0x92 } }
-
   ## GUID used to "SecureBootEnable" variable for the Secure Boot feature enable/disable.
   #  This variable is used for allowing a physically present user to disable Secure Boot via firmware setup without the possession of PKpriv.
   #  Include/Guid/AuthenticatedVariableFormat.h
@@ -112,6 +104,10 @@
   #  Include/Guid/TcgEventHob.h
   gTcgEventEntryHobGuid              = { 0x2b9ffb52, 0x1b13, 0x416f, { 0xa8, 0x7b, 0xbc, 0x93, 0xd, 0xef, 0x92, 0xa8 }}
 
+  ## HOB GUID used to record TPM device error.
+  #  Include/Guid/TcgEventHob.h
+  gTpmErrorHobGuid                   = { 0xef598499, 0xb25e, 0x473a, { 0xbf, 0xaf, 0xe7, 0xe5, 0x7d, 0xce, 0x82, 0xc4 }}
+
   ## HOB GUID used to pass all PEI measured FV info to DXE Driver.
   #  Include/Guid/MeasuredFvHob.h
   gMeasuredFvHobGuid                 = { 0xb2360b42, 0x7173, 0x420a, { 0x86, 0x96, 0x46, 0xca, 0x6b, 0xab, 0x10, 0x60 }}
@@ -177,6 +173,10 @@
   # Include/Ppi/TpmInitialized.h
   gPeiTpmInitializedPpiGuid      = { 0xe9db0d58, 0xd48d, 0x47f6, { 0x9c, 0x6e, 0x6f, 0x40, 0xe8, 0x6c, 0x7b, 0x41 }}
 
+  ## The PPI GUID for that TPM initialization is done. TPM initialization may be success or fail.
+  # Include/Ppi/TpmInitialized.h
+  gPeiTpmInitializationDonePpiGuid = { 0xa030d115, 0x54dd, 0x447b, { 0x90, 0x64, 0xf2, 0x6, 0x88, 0x3d, 0x7c, 0xcc }}
+
   ## Include/Ppi/FirmwareVolumeInfoMeasurementExcluded.h
   gEfiPeiFirmwareVolumeInfoMeasurementExcludedPpiGuid = { 0x6e056ff9, 0xc695, 0x4364, { 0x9e, 0x2c, 0x61, 0x26, 0xf5, 0xce, 0xea, 0xae } }
 
@@ -184,6 +184,7 @@
 # [Error.gEfiSecurityPkgTokenSpaceGuid]
 #   0x80000001 | Invalid value provided.
 #   0x80000002 | Reserved bits must be set to zero.
+#   0x80000003 | Incorrect progress or error code provided.
 #
 
 [PcdsFixedAtBuild, PcdsPatchableInModule]
@@ -253,6 +254,12 @@
   # @Prompt Select platform type.
   # @ValidRange 0x80000001 | 0x00 - 0x1 
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmPlatformClass|0|UINT8|0x00000006
+  
+  ## Progress Code for TPM device subclass definitions.<BR><BR>
+  #  EFI_PERIPHERAL_TPM  = (EFI_PERIPHERAL | 0x000D0000) = 0x010D0000<BR>
+  # @Prompt Status Code for TPM device definitions
+  # @ValidList  0x80000003 | 0x010D0000
+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice|0x010D0000|UINT32|0x00000007
 
 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]
   ## Indicates the presence or absence of the platform operator during firmware booting.
@@ -331,6 +338,7 @@
   #  TPM_DEVICE_INTERFACE_NONE means disable.<BR>
   #  TPM_DEVICE_INTERFACE_TPM12 means TPM 1.2 DTPM.<BR>
   #  TPM_DEVICE_INTERFACE_DTPM2 means TPM 2.0 DTPM.<BR>
+  #  Other GUID value means other TPM 2.0 device.<BR>
   # @Prompt TPM device type identifier
   gEfiSecurityPkgTokenSpaceGuid.PcdTpmInstanceGuid |{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }|VOID*|0x0001000F