IntelFsp2Pkg/GenCfgOpt.py: Support UPD offset auto assignment

[mirror_edk2.git] / MdeModulePkg / MdeModulePkg.dec

diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 492b67d2513eab70e2e32beb11c1bb649b0b5833..6037504fa789d4ca96d45bf3a776dd77bc17a909 100644 (file)
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -260,6 +260,9 @@
   gSmmPerformanceProtocolGuid    = { 0xf866226a, 0xeaa5, 0x4f5a, { 0xa9, 0xa,  0x6c, 0xfb, 0xa5, 0x7c, 0x58, 0x8e } }\r
   gPerformanceExProtocolGuid     = { 0x1ea81bec, 0xf01a, 0x4d98, { 0xa2, 0x1,  0x4a, 0x61, 0xce, 0x2f, 0xc0, 0x22 } }\r
   gSmmPerformanceExProtocolGuid  = { 0x931fc048, 0xc71d, 0x4455, { 0x89, 0x30, 0x47, 0x6,  0x30, 0xe3, 0xe,  0xe5 } }\r
+  #  Include/Guid/PerformanceMeasurement.h\r
+  gEdkiiPerformanceMeasurementProtocolGuid      = { 0xc85d06be, 0x5f75, 0x48ce, { 0xa8, 0x0f, 0x12, 0x36, 0xba, 0x3b, 0x87, 0xb1 } }\r
+  gEdkiiSmmPerformanceMeasurementProtocolGuid   = { 0xd56b6d73, 0x1a7b, 0x4015, { 0x9b, 0xb4, 0x7b, 0x07, 0x17, 0x29, 0xed, 0x24 } }\r
 \r
   ## Guid is defined for CRC32 encapsulation scheme.\r
   #  Include/Guid/Crc32GuidedSectionExtraction.h\r
@@ -929,7 +932,8 @@
   #  If enabled, accessing NULL address in UEFI or SMM code can be caught.<BR><BR>\r
   #    BIT0    - Enable NULL pointer detection for UEFI.<BR>\r
   #    BIT1    - Enable NULL pointer detection for SMM.<BR>\r
-  #    BIT2..6 - Reserved for future uses.<BR>\r
+  #    BIT2..5 - Reserved for future uses.<BR>\r
+  #    BIT6    - Enable non-stop mode.<BR>\r
   #    BIT7    - Disable NULL pointer detection just after EndOfDxe. <BR>\r
   #              This is a workaround for those unsolvable NULL access issues in\r
   #              OptionROM, boot loader, etc. It can also help to avoid unnecessary\r
@@ -1011,6 +1015,7 @@
   #   BIT1 - Enable UEFI pool guard.<BR>\r
   #   BIT2 - Enable SMM page guard.<BR>\r
   #   BIT3 - Enable SMM pool guard.<BR>\r
+  #   BIT6 - Enable non-stop mode.<BR>\r
   #   BIT7 - The direction of Guard Page for Pool Guard.\r
   #          0 - The returned pool is near the tail guard page.<BR>\r
   #          1 - The returned pool is near the head guard page.<BR>\r
@@ -1283,17 +1288,23 @@
   ## Set image protection policy. The policy is bitwise.\r
   #  If a bit is set, the image will be protected by DxeCore if it is aligned.\r
   #   The code section becomes read-only, and the data section becomes non-executable.\r
-  #  If a bit is clear, the image will not be protected.<BR><BR>\r
+  #  If a bit is clear, nothing will be done to image code/data sections.<BR><BR>\r
   #    BIT0       - Image from unknown device. <BR>\r
   #    BIT1       - Image from firmware volume.<BR>\r
+  #  <BR>\r
+  #  Note: If a bit is cleared, the data section could be still non-executable if\r
+  #  PcdDxeNxMemoryProtectionPolicy is enabled for EfiLoaderData, EfiBootServicesData\r
+  #  and/or EfiRuntimeServicesData.<BR>\r
+  #  <BR>\r
   # @Prompt Set image protection policy.\r
   # @ValidRange 0x80000002 | 0x00000000 - 0x0000001F\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdImageProtectionPolicy|0x00000002|UINT32|0x00001047\r
 \r
   ## Set DXE memory protection policy. The policy is bitwise.\r
   #  If a bit is set, memory regions of the associated type will be mapped\r
-  #  non-executable.<BR><BR>\r
-  #\r
+  #  non-executable.<BR>\r
+  #  If a bit is cleared, nothing will be done to associated type of memory.<BR>\r
+  #  <BR>\r
   # Below is bit mask for this PCD: (Order is same as UEFI spec)<BR>\r
   #  EfiReservedMemoryType          0x0001<BR>\r
   #  EfiLoaderCode                  0x0002<BR>\r
@@ -1760,11 +1771,11 @@
 \r
   ## SMBIOS version.\r
   # @Prompt SMBIOS version.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0301|UINT16|0x00010055\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosVersion|0x0302|UINT16|0x00010055\r
 \r
   ## SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.\r
   # @Prompt SMBIOS Docrev field in SMBIOS 3.0 (64-bit) Entry Point Structure.\r
-  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x1|UINT8|0x0001006A\r
+  gEfiMdeModulePkgTokenSpaceGuid.PcdSmbiosDocRev|0x0|UINT8|0x0001006A\r
 \r
   ## SMBIOS produce method.\r
   #  BIT0 set indicates 32-bit entry point and table are produced.<BR>\r
@@ -1885,8 +1896,13 @@
   #  For the DxeIpl and the DxeCore are both X64, set NX for stack feature also require PcdDxeIplBuildPageTables be TRUE.<BR>\r
   #  For the DxeIpl and the DxeCore are both IA32 (PcdDxeIplSwitchToLongMode is FALSE), set NX for stack feature also require\r
   #  IA32 PAE is supported and Execute Disable Bit is available.<BR>\r
-  #   TRUE  - to set NX for stack.<BR>\r
-  #   FALSE - Not to set NX for stack.<BR>\r
+  #  <BR>\r
+  #   TRUE  - Set NX for stack.<BR>\r
+  #   FALSE - Do nothing for stack.<BR>\r
+  #  <BR>\r
+  #  Note: If this PCD is set to FALSE, NX could be still applied to stack due to PcdDxeNxMemoryProtectionPolicy enabled for\r
+  #  EfiBootServicesData.<BR>\r
+  #  <BR>\r
   # @Prompt Set NX for stack.\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdSetNxForStack|FALSE|BOOLEAN|0x0001006f\r
 \r
@@ -1903,7 +1919,7 @@
   gEfiMdeModulePkgTokenSpaceGuid.PcdAcpiS3Enable|TRUE|BOOLEAN|0x01100000\r
 \r
   ## Specify memory size for boot script executor stack usage in S3 phase.\r
-  #  The default size 32K. When changing the value make sure the memory size is large enough \r
+  #  The default size 32K. When changing the value make sure the memory size is large enough\r
   #  to meet boot script executor requirement in the S3 phase.\r
   # @Prompt Reserved S3 Boot Script Stack ACPI Memory Size\r
   gEfiMdeModulePkgTokenSpaceGuid.PcdS3BootScriptStackSize|0x8000|UINT32|0x02000000\r