UefiCpuPkg/PiSmmCpu: Enable 5L paging only when phy addr line > 48

[mirror_edk2.git] / SecurityPkg / SecurityPkg.dec

diff --git a/SecurityPkg/SecurityPkg.dec b/SecurityPkg/SecurityPkg.dec
index 3314f1854be474034a3a855ad3abde1b3faca54d..ce2a9d33a4f23305700fc625b0083aab3df1e794 100644 (file)
--- a/SecurityPkg/SecurityPkg.dec
+++ b/SecurityPkg/SecurityPkg.dec
@@ -188,6 +188,9 @@
   ## Include/Ppi/FirmwareVolumeInfoPrehashedFV.h\r
   gEdkiiPeiFirmwareVolumeInfoPrehashedFvPpiGuid = { 0x3ce1e631, 0x7008, 0x477c, { 0xad, 0xa7, 0x5d, 0xcf, 0xc7, 0xc1, 0x49, 0x4b } }\r
 \r
+  ## Include/Ppi/FirmwareVolumeInfoStoredHashFv.h\r
+  gEdkiiPeiFirmwareVolumeInfoStoredHashFvPpiGuid = {0x7f5e4e31, 0x81b1, 0x47e5, { 0x9e, 0x21, 0x1e, 0x4b, 0x5b, 0xc2, 0xf6, 0x1d } }\r
+\r
 #\r
 # [Error.gEfiSecurityPkgTokenSpaceGuid]\r
 #   0x80000001 | Invalid value provided.\r
@@ -257,6 +260,12 @@
   # @ValidList  0x80000003 | 0x010D0000\r
   gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeSubClassTpmDevice|0x010D0000|UINT32|0x00000007\r
 \r
+  ## Progress Code for FV verification result.<BR><BR>\r
+  #  (EFI_SOFTWARE_PEI_MODULE | EFI_SUBCLASS_SPECIFIC | XXX)\r
+  # @Prompt Status Code for FV verification result\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeFvVerificationPass|0x0303100A|UINT32|0x00010030\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdStatusCodeFvVerificationFail|0x0303100B|UINT32|0x00010031\r
+\r
 [PcdsFixedAtBuild, PcdsPatchableInModule, PcdsDynamic, PcdsDynamicEx]\r
   ## Image verification policy for OptionRom. Only following values are valid:<BR><BR>\r
   #  NOTE: Do NOT use 0x5 and 0x2 since it violates the UEFI specification and has been removed.<BR>\r
@@ -422,11 +431,17 @@
   # @Prompt Possible TPM2 Interrupt Number buffer\r
   gEfiSecurityPkgTokenSpaceGuid.PcdTpm2PossibleIrqNumBuf|{0x00, 0x00, 0x00, 0x00}|VOID*|0x0001001D\r
 \r
-  ## Indicates if Opal DXE driver skip unlock device flow.<BR><BR>\r
-  #   TRUE  - Skip unlock device flow.<BR>\r
-  #   FALSE - Does not skip unlock device flow.<BR>\r
-  # @Prompt Skip Opal DXE driver unlock device flow.\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalDxeUnlock|FALSE|BOOLEAN|0x00010020\r
+  ## Indicates if Opal DXE driver skip password prompt.<BR><BR>\r
+  #   TRUE  - Skip password prompt.<BR>\r
+  #   FALSE - Does not skip password prompt.<BR>\r
+  # @Prompt Skip Opal DXE driver password prompt.\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdSkipOpalPasswordPrompt|FALSE|BOOLEAN|0x00010020\r
+\r
+  ## Indicates if Hdd Password driver skip password prompt.<BR><BR>\r
+  #   TRUE  - Skip password prompt.<BR>\r
+  #   FALSE - Does not skip password prompt.<BR>\r
+  # @Prompt Skip Hdd Password prompt.\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdSkipHddPasswordPrompt|FALSE|BOOLEAN|0x00010021\r
 \r
 [PcdsDynamic, PcdsDynamicEx]\r
 \r
@@ -438,9 +453,10 @@
   #    BIT1  -  SHA256.<BR>\r
   #    BIT2  -  SHA384.<BR>\r
   #    BIT3  -  SHA512.<BR>\r
+  #    BIT4  -  SM3_256.<BR>\r
   # @Prompt Hash mask for TPM 2.0\r
-  # @ValidRange 0x80000001 | 0x00000000 - 0x0000000F\r
-  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000000F|UINT32|0x00010010\r
+  # @ValidRange 0x80000001 | 0x00000000 - 0x0000001F\r
+  gEfiSecurityPkgTokenSpaceGuid.PcdTpm2HashMask|0x0000001F|UINT32|0x00010010\r
 \r
   ## This PCD indicated final BIOS supported Hash mask.\r
   #    Bios may choose to register a subset of PcdTpm2HashMask.\r