UefiCpuPkg: Remove PcdCpuSmmStaticPageTable

[mirror_edk2.git] / UefiCpuPkg / UefiCpuPkg.dec

diff --git a/UefiCpuPkg/UefiCpuPkg.dec b/UefiCpuPkg/UefiCpuPkg.dec
index 83acd3361282ccfaf7703b02f890b57179218cd9..031a2ccd680ace8663b9b49e24d23065632ae5d7 100644 (file)
--- a/UefiCpuPkg/UefiCpuPkg.dec
+++ b/UefiCpuPkg/UefiCpuPkg.dec
@@ -81,7 +81,8 @@
 [PcdsFeatureFlag]\r
   ## Indicates if SMM Profile will be enabled.\r
   #  If enabled, instruction executions in and data accesses to memory outside of SMRAM will be logged.\r
-  #  It could not be enabled at the same time with SMM static page table feature (PcdCpuSmmStaticPageTable).\r
+  #  In X64 build, it could not be enabled when PcdCpuSmmRestrictedMemoryAccess is TRUE.\r
+  #  In IA32 build, the page table memory is not marked as read-only when it is enabled.\r
   #  This PCD is only for validation purpose. It should be set to false in production.<BR><BR>\r
   #   TRUE  - SMM Profile will be enabled.<BR>\r
   #   FALSE - SMM Profile will be disabled.<BR>\r
@@ -246,17 +247,6 @@
   # @Prompt The specified AP target C-state for Mwait.\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuApTargetCstate|0|UINT8|0x00000007\r
 \r
-  ## Indicates if SMM uses static page table.\r
-  #  If enabled, SMM will not use on-demand paging. SMM will build static page table for all memory.\r
-  #  This flag only impacts X64 build, because SMM always builds static page table for IA32.\r
-  #  It could not be enabled at the same time with SMM profile feature (PcdCpuSmmProfileEnable).\r
-  #  It could not be enabled also at the same time with heap guard feature for SMM\r
-  #  (PcdHeapGuardPropertyMask in MdeModulePkg).<BR><BR>\r
-  #   TRUE  - SMM uses static page table for all memory.<BR>\r
-  #   FALSE - SMM uses static page table for below 4G memory and use on-demand paging for above 4G memory.<BR>\r
-  # @Prompt Use static page table for all memory in SMM.\r
-  gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmStaticPageTable|TRUE|BOOLEAN|0x3213210D\r
-\r
   ## Specifies timeout value in microseconds for the BSP in SMM to wait for all APs to come into SMM.\r
   # @Prompt AP synchronization timeout value in SMM.\r
   gUefiCpuPkgTokenSpaceGuid.PcdCpuSmmApSyncTimeout|1000000|UINT64|0x32132104\r
@@ -285,6 +275,11 @@
   #  The PCD value is considered as constantly TRUE in IA32 platforms.\r
   #  When the PCD value is TRUE, page table is initialized to cover all memory spaces\r
   #  and the memory occupied by page table is protected by page table itself as read-only.\r
+  #  In X64 build, it cannot be enabled at the same time with SMM profile feature (PcdCpuSmmProfileEnable).\r
+  #  In X64 build, it could not be enabled also at the same time with heap guard feature for SMM\r
+  #  (PcdHeapGuardPropertyMask in MdeModulePkg).\r
+  #  In IA32 build, page table memory is not marked as read-only when either SMM profile feature (PcdCpuSmmProfileEnable)\r
+  #  or heap guard feature for SMM (PcdHeapGuardPropertyMask in MdeModulePkg) is enabled.\r
   #   TRUE  - Access to non-SMRAM memory is restricted to reserved, runtime and ACPI NVS type after SmmReadyToLock.<BR>\r
   #   FALSE - Access to any type of non-SMRAM memory after SmmReadyToLock is allowed.<BR>\r
   # @Prompt Access to non-SMRAM memory is restricted to reserved, runtime and ACPI NVS type after SmmReadyToLock.\r