[v1] UefiCpuPkg/CpuDxe: Remove MSR_IA32_MISC_ENABLE check

[edk2] [PATCH] UefiCpuPkg/CpuDxe: Remove MSR_IA32_MISC_ENABLE check

Jeff Fan posted 1 patch 7 years, 1 month ago

Diff against v1
Download mbox

Failed in applying to current master (apply log)

UefiCpuPkg/CpuDxe/CpuPageTable.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)

Expand all Fold all

[edk2] [PATCH] UefiCpuPkg/CpuDxe: Remove MSR_IA32_MISC_ENABLE check

Posted by Jeff Fan 7 years, 1 month ago

The architectural MSR MSR_IA32_MISC_ENABLE is not supported by AMD processors.
Because reading CPUID.80000001H:EDK[20] is enough to check if XD feature is
supported or not, we just remove checking MSR_IA32_MISC_ENABLE(0x1A0).

Cc: Anthony PERARD <anthony.perard@citrix.com>
Cc: Jiewen Yao <jiewen.yao@citrix.com>
Cc: Feng Tian <feng.tian@citrix.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jeff Fan <jeff.fan@intel.com>
---
 UefiCpuPkg/CpuDxe/CpuPageTable.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/UefiCpuPkg/CpuDxe/CpuPageTable.c b/UefiCpuPkg/CpuDxe/CpuPageTable.c
index 65f607a..ab664b4 100644
--- a/UefiCpuPkg/CpuDxe/CpuPageTable.c
+++ b/UefiCpuPkg/CpuDxe/CpuPageTable.c
@@ -193,12 +193,9 @@ GetCurrentPagingContext (
     AsmCpuid (0x80000001, NULL, NULL, NULL, &RegEdx);
     if ((RegEdx & BIT20) != 0) {
       // XD supported
-      if ((AsmReadMsr64 (0x000001A0) & BIT34) == 0) {
-        // XD enabled
-        if ((AsmReadMsr64 (0xC0000080) & BIT11) != 0) {
-          // XD activated
-          PagingContext->ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED;
-        }
+      if ((AsmReadMsr64 (0xC0000080) & BIT11) != 0) {
+        // XD activated
+        PagingContext->ContextData.Ia32.Attributes |= PAGE_TABLE_LIB_PAGING_CONTEXT_IA32_X64_ATTRIBUTES_XD_ACTIVATED;
       }
     }
     if ((RegEdx & BIT26) != 0) {
-- 
2.9.3.windows.2

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel