>v4:
> No content change but move this patch to be the first one
Cc: Star Zeng <star.z...@intel.com>
Cc: Eric Dong <eric.d...@intel.com>
Cc: Jiewen Yao <jiewen....@intel.com>
Suggested-by: Ayellet Wolman <ayellet.wol...@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Jian J Wang <jian.j.w...@intel.com>
Reviewed-by: Jiewen Yao <jiewen....@intel.com>
Regression-tested-by: Laszlo Ersek <ler...@redhat.com>
---
MdeModulePkg/MdeModulePkg.dec | 60 +++++++++++++++++++++++++++++++++++++++++++
MdeModulePkg/MdeModulePkg.uni | 58 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 118 insertions(+)
diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec
index 6f46d595de..856d67aceb 100644
--- a/MdeModulePkg/MdeModulePkg.dec
+++ b/MdeModulePkg/MdeModulePkg.dec
@@ -559,6 +559,9 @@
## Include/Protocol/SmmEndofS3Resume.h
gEdkiiSmmEndOfS3ResumeProtocolGuid = { 0x96f5296d, 0x05f7, 0x4f3c, {0x84,
0x67, 0xe4, 0x56, 0x89, 0x0e, 0x0c, 0xb5 } }
+ ## Include/Protocol/SmmMemoryAttribute.h
+ gEdkiiSmmMemoryAttributeProtocolGuid = { 0x69b792ea, 0x39ce, 0x402d, { 0xa2,
0xa6, 0xf7, 0x21, 0xde, 0x35, 0x1d, 0xfe } }
+
#
# [Error.gEfiMdeModulePkgTokenSpaceGuid]
# 0x80000001 | Invalid value provided.
@@ -889,6 +892,63 @@
# @Prompt Init Value in Temp Stack
gEfiMdeModulePkgTokenSpaceGuid.PcdInitValueInTempStack|0x5AA55AA5|UINT32|0x30001051
+ ## Indicates which type allocation need guard page.
+ # Below is bit mask for this PCD: (Order is same as UEFI spec)<BR>
+ # EfiReservedMemoryType 0x0000000000000001<BR>
+ # EfiLoaderCode 0x0000000000000002<BR>
+ # EfiLoaderData 0x0000000000000004<BR>
+ # EfiBootServicesCode 0x0000000000000008<BR>
+ # EfiBootServicesData 0x0000000000000010<BR>
+ # EfiRuntimeServicesCode 0x0000000000000020<BR>
+ # EfiRuntimeServicesData 0x0000000000000040<BR>
+ # EfiConventionalMemory 0x0000000000000080<BR>
+ # EfiUnusableMemory 0x0000000000000100<BR>
+ # EfiACPIReclaimMemory 0x0000000000000200<BR>
+ # EfiACPIMemoryNVS 0x0000000000000400<BR>
+ # EfiMemoryMappedIO 0x0000000000000800<BR>
+ # EfiMemoryMappedIOPortSpace 0x0000000000001000<BR>
+ # EfiPalCode 0x0000000000002000<BR>
+ # EfiPersistentMemory 0x0000000000004000<BR>
+ # OEM Reserved 0x4000000000000000<BR>
+ # OS Reserved 0x8000000000000000<BR>
+ # e.g. LoaderCode+LoaderData+BootServicesCode+BootServicesData are needed,
0x1E should be used.<BR>
+ # @Prompt The memory type mask for Page Guard.
+ gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPageType|0x0|UINT64|0x30001052
+
+ ## Indicates which type allocation need guard page.
+ # Below is bit mask for this PCD: (Order is same as UEFI spec)<BR>
+ # EfiReservedMemoryType 0x0000000000000001<BR>
+ # EfiLoaderCode 0x0000000000000002<BR>
+ # EfiLoaderData 0x0000000000000004<BR>
+ # EfiBootServicesCode 0x0000000000000008<BR>
+ # EfiBootServicesData 0x0000000000000010<BR>
+ # EfiRuntimeServicesCode 0x0000000000000020<BR>
+ # EfiRuntimeServicesData 0x0000000000000040<BR>
+ # EfiConventionalMemory 0x0000000000000080<BR>
+ # EfiUnusableMemory 0x0000000000000100<BR>
+ # EfiACPIReclaimMemory 0x0000000000000200<BR>
+ # EfiACPIMemoryNVS 0x0000000000000400<BR>
+ # EfiMemoryMappedIO 0x0000000000000800<BR>
+ # EfiMemoryMappedIOPortSpace 0x0000000000001000<BR>
+ # EfiPalCode 0x0000000000002000<BR>
+ # EfiPersistentMemory 0x0000000000004000<BR>
+ # OEM Reserved 0x4000000000000000<BR>
+ # OS Reserved 0x8000000000000000<BR>
+ # e.g. LoaderCode+LoaderData+BootServicesCode+BootServicesData are needed,
0x1E should be used.<BR>
+ # @Prompt The memory type mask for Pool Guard.
+ gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPoolType|0x0|UINT64|0x30001053
+
+ ## This mask is to control Heap Guard behavior.
+ # BIT0 - Enable UEFI page guard.<BR>
+ # BIT1 - Enable UEFI pool guard.<BR>
+ # BIT2 - Enable SMM page guard.<BR>
+ # BIT3 - Enable SMM pool guard.<BR>
+ # BIT7 - The direction of Guard Page for Pool Guard.
+ # 0 - The returned pool is adjacent to the bottom guard page.<BR>
+ # 1 - The returned pool is adjacent to the top guard page.<BR>
+ # @Prompt The Heap Guard feature mask
+ gEfiMdeModulePkgTokenSpaceGuid.PcdHeapGuardPropertyMask|0x0|UINT8|0x30001054
+
[PcdsFixedAtBuild, PcdsPatchableInModule]
## Dynamic type PCD can be registered callback function for Pcd setting
action.
# PcdMaxPeiPcdCallBackNumberPerPcdEntry indicates the maximum number of
callback function
diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni
index ce9de4897a..588905a9a1 100644
--- a/MdeModulePkg/MdeModulePkg.uni
+++ b/MdeModulePkg/MdeModulePkg.uni
@@ -1146,3 +1146,61 @@
"SEC fills the full temp stack with this values. When switch stack,
PeiCore can check\n"
"this value in the temp stack to know how many stack has been
used.\n"
+#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHeapGuardPageType_PROMPT
#language en-US "The memory type mask for Page Guard"
+
+#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHeapGuardPageType_HELP
#language en-US "Indicates which type allocation need guard page.\n"
+
" Below is bit mask for this PCD: (Order is same as UEFI spec)<BR>\n"
+
" EfiReservedMemoryType 0x0000000000000001\n"
+
" EfiLoaderCode 0x0000000000000002\n"
+
" EfiLoaderData 0x0000000000000004\n"
+
" EfiBootServicesCode 0x0000000000000008\n"
+
" EfiBootServicesData 0x0000000000000010\n"
+
" EfiRuntimeServicesCode 0x0000000000000020\n"
+
" EfiRuntimeServicesData 0x0000000000000040\n"
+
" EfiConventionalMemory 0x0000000000000080\n"
+
" EfiUnusableMemory 0x0000000000000100\n"
+
" EfiACPIReclaimMemory 0x0000000000000200\n"
+
" EfiACPIMemoryNVS 0x0000000000000400\n"
+
" EfiMemoryMappedIO 0x0000000000000800\n"
+
" EfiMemoryMappedIOPortSpace 0x0000000000001000\n"
+
" EfiPalCode 0x0000000000002000\n"
+
" EfiPersistentMemory 0x0000000000004000\n"
+
" OEM Reserved 0x4000000000000000\n"
+
" OS Reserved 0x8000000000000000\n"
+
" e.g. LoaderCode+LoaderData+BootServicesCode+BootServicesData are
needed, 0x1E should be used.<BR>"
+
+#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHeapGuardPoolType_PROMPT
#language en-US "The memory type mask for Pool Guard"
+
+#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHeapGuardPoolType_HELP
#language en-US "Indicates which type allocation need guard page.\n"
+
" Below is bit mask for this PCD: (Order is same as UEFI spec)<BR>\n"
+
" EfiReservedMemoryType 0x0000000000000001\n"
+
" EfiLoaderCode 0x0000000000000002\n"
+
" EfiLoaderData 0x0000000000000004\n"
+
" EfiBootServicesCode 0x0000000000000008\n"
+
" EfiBootServicesData 0x0000000000000010\n"
+
" EfiRuntimeServicesCode 0x0000000000000020\n"
+
" EfiRuntimeServicesData 0x0000000000000040\n"
+
" EfiConventionalMemory 0x0000000000000080\n"
+
" EfiUnusableMemory 0x0000000000000100\n"
+
" EfiACPIReclaimMemory 0x0000000000000200\n"
+
" EfiACPIMemoryNVS 0x0000000000000400\n"
+
" EfiMemoryMappedIO 0x0000000000000800\n"
+
" EfiMemoryMappedIOPortSpace 0x0000000000001000\n"
+
" EfiPalCode 0x0000000000002000\n"
+
" EfiPersistentMemory 0x0000000000004000\n"
+
" OEM Reserved 0x4000000000000000\n"
+
" OS Reserved 0x8000000000000000\n"
+
" e.g. LoaderCode+LoaderData+BootServicesCode+BootServicesData are
needed, 0x1E should be used.<BR>"
+
+
+#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHeapGuardPropertyMask_PROMPT
#language en-US "The Heap Guard feature mask"
+
+#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdHeapGuardPropertyMask_HELP
#language en-US "This mask is to control Heap Guard behavior.\n"
+
" BIT0 - Enable UEFI page guard.<BR>\n"
+
" BIT1 - Enable UEFI pool guard.<BR>\n"
+
" BIT2 - Enable SMM page guard.<BR>\n"
+
" BIT3 - Enable SMM pool guard.<BR>\n"
+
" BIT7 - The direction of Guard Page for Pool Guard.\n"
+
" 0 - The returned pool is adjacent to the bottom guard
page.<BR>\n"
+
" 1 - The returned pool is adjacent to the top guard
page.<BR>"
+
--
2.14.1.windows.1
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
