UefiCpuPkg/CpuDxe: Enable protection for newly added page table

[mirror_edk2.git] / OvmfPkg / SmmAccess / SmmAccessPei.c

diff --git a/OvmfPkg/SmmAccess/SmmAccessPei.c b/OvmfPkg/SmmAccess/SmmAccessPei.c
index a4ce610a4650ecaea91e9ffbc55a32bfa476f7c3..21119f80eefae3f44f033837d0fd347d0a9b8229 100644 (file)
--- a/OvmfPkg/SmmAccess/SmmAccessPei.c
+++ b/OvmfPkg/SmmAccess/SmmAccessPei.c
@@ -318,8 +318,9 @@ SmmAccessPeiEntryPoint (
   //\r
   // Set TSEG Memory Base.\r
   //\r
+  InitQ35TsegMbytes ();\r
   PciWrite32 (DRAMC_REGISTER_Q35 (MCH_TSEGMB),\r
-    (TopOfLowRamMb - FixedPcdGet8 (PcdQ35TsegMbytes)) << MCH_TSEGMB_MB_SHIFT);\r
+    (TopOfLowRamMb - mQ35TsegMbytes) << MCH_TSEGMB_MB_SHIFT);\r
 \r
   //\r
   // Set TSEG size, and disable TSEG visibility outside of SMM. Note that the\r
@@ -327,9 +328,10 @@ SmmAccessPeiEntryPoint (
   // *restricted* to SMM.\r
   //\r
   EsmramcVal &= ~(UINT32)MCH_ESMRAMC_TSEG_MASK;\r
-  EsmramcVal |= FixedPcdGet8 (PcdQ35TsegMbytes) == 8 ? MCH_ESMRAMC_TSEG_8MB :\r
-                FixedPcdGet8 (PcdQ35TsegMbytes) == 2 ? MCH_ESMRAMC_TSEG_2MB :\r
-                MCH_ESMRAMC_TSEG_1MB;\r
+  EsmramcVal |= mQ35TsegMbytes == 8 ? MCH_ESMRAMC_TSEG_8MB :\r
+                mQ35TsegMbytes == 2 ? MCH_ESMRAMC_TSEG_2MB :\r
+                mQ35TsegMbytes == 1 ? MCH_ESMRAMC_TSEG_1MB :\r
+                MCH_ESMRAMC_TSEG_EXT;\r
   EsmramcVal |= MCH_ESMRAMC_T_EN;\r
   PciWrite8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC), EsmramcVal);\r
 \r