diff options
| author | Star Zeng <star.zeng@intel.com> | 2017-12-07 17:00:48 +0800 |
|---|---|---|
| committer | Star Zeng <star.zeng@intel.com> | 2017-12-08 12:29:24 +0800 |
| commit | 1015fb3c1beb27eabd77e97f06f6b1012bacf3d8 (patch) | |
| tree | 177694519c28f96cb3b75fc320f4ff9af50ee7f7 /UefiCpuPkg/UefiCpuPkg.uni | |
| parent | 5d0e003c8ce2616c763f8edd4ac18f560d418e76 (diff) | |
| download | edk2-1015fb3c1beb27eabd77e97f06f6b1012bacf3d8.tar.gz edk2-1015fb3c1beb27eabd77e97f06f6b1012bacf3d8.tar.bz2 edk2-1015fb3c1beb27eabd77e97f06f6b1012bacf3d8.zip | |
UefiCpuPkg PiSmmCpuDxeSmm: SMM profile and static paging mutual exclusion
SMM profile and static paging could not be enabled at the same time,
this patch is to add check and comments to make sure it.
Similar comments are also added for the case of static paging and
heap guard for SMM.
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Eric Dong <eric.dong@intel.com>
Cc: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Star Zeng <star.zeng@intel.com>
Reviewed-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Diffstat (limited to 'UefiCpuPkg/UefiCpuPkg.uni')
| -rw-r--r-- | UefiCpuPkg/UefiCpuPkg.uni | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/UefiCpuPkg/UefiCpuPkg.uni b/UefiCpuPkg/UefiCpuPkg.uni index 9472b185e4..a7073b10c8 100644 --- a/UefiCpuPkg/UefiCpuPkg.uni +++ b/UefiCpuPkg/UefiCpuPkg.uni @@ -53,7 +53,10 @@ #string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuSmmProfileEnable_PROMPT #language en-US "Enable SMM Profile"
-#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuSmmProfileEnable_HELP #language en-US "Indicates if SMM Profile will be enabled. If enabled, instruction executions in and data accesses to memory outside of SMRAM will be logged. This PCD is only for validation purpose. It should be set to false in production.<BR><BR>\n"
+#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuSmmProfileEnable_HELP #language en-US "Indicates if SMM Profile will be enabled.\n"
+ "If enabled, instruction executions in and data accesses to memory outside of SMRAM will be logged.\n"
+ "It could not be enabled at the same time with SMM static page table feature (PcdCpuSmmStaticPageTable).\n"
+ "This PCD is only for validation purpose. It should be set to false in production.<BR><BR>\n"
"TRUE - SMM Profile will be enabled.<BR>\n"
"FALSE - SMM Profile will be disabled.<BR>"
@@ -150,8 +153,11 @@ #string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuSmmStaticPageTable_PROMPT #language en-US "Use static page table for all memory in SMM."
#string STR_gUefiCpuPkgTokenSpaceGuid_PcdCpuSmmStaticPageTable_HELP #language en-US "Indicates if SMM uses static page table.\n"
- "If enabled, SMM will not use on-demand paging. SMM will build static page table for all memory.<BR><BR>\n"
- "This flag only impacts X64 build, because SMM alway builds static page table for IA32.\n"
+ "If enabled, SMM will not use on-demand paging. SMM will build static page table for all memory.\n"
+ "This flag only impacts X64 build, because SMM always builds static page table for IA32.\n"
+ "It could not be enabled at the same time with SMM profile feature (PcdCpuSmmProfileEnable).\n"
+ "It could not be enabled also at the same time with heap guard feature for SMM\n"
+ "(PcdHeapGuardPropertyMask in MdeModulePkg).<BR><BR>\n"
"TRUE - SMM uses static page table for all memory.<BR>\n"
"FALSE - SMM uses static page table for below 4G memory and use on-demand paging for above 4G memory.<BR>"
|