OvmfPkg/QemuVideoDxe/VbeShim: handle PAM1 register on Q35 correctly

[mirror_edk2.git] / UefiCpuPkg / CpuDxe / CpuPageTable.c

diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTable.c
index 65f607a90c3d1b31cae5017e628b664fda6742aa..2c61e7503e234eae95b2ec646ae926d297fc5ba8 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuPageTable.c
+++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c
@@ -193,12 +193,9 @@ GetCurrentPagingContext (
     AsmCpuid (0x80000001, NULL, NULL, NULL, &RegEdx);\r
     if ((RegEdx & BIT20) != 0) {\r
       // XD supported\r
-      if ((AsmReadMsr64 (0x000001A0) & BIT34) == 0) {\r
-        // XD enabled\r
-        if ((AsmReadMsr64 (0xC0000080) & BIT11) != 0) {\r
-          // XD activated\r
-          PagingContext->ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED;\r
-        }\r
+      if ((AsmReadMsr64 (0xC0000080) & BIT11) != 0) {\r
+        // XD activated\r
+        PagingContext->ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED;\r
       }\r
     }\r
     if ((RegEdx & BIT26) != 0) {\r
@@ -637,10 +634,10 @@ ConvertMemoryPageAttributes (
   switch(CurrentPagingContext.MachineType) {\r
   case IMAGE_FILE_MACHINE_I386:\r
     if (CurrentPagingContext.ContextData.Ia32.PageTableBase == 0) {\r
-      DEBUG ((DEBUG_ERROR, "PageTable is 0!\n"));\r
       if (Attributes == 0) {\r
         return EFI_SUCCESS;\r
       } else {\r
+        DEBUG ((DEBUG_ERROR, "PageTable is 0!\n"));\r
         return EFI_UNSUPPORTED;\r
       }\r
     }\r