UefiCpuPkg/MtrrLib: IsMtrrSupported uses definitions in Msr.h

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 547f827e506a5ac826731245899078b3557047ce..b80519ba6d1dc740a40b1fe820e671402a6c7f41 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -18,6 +18,9 @@
 \r
 #include <Base.h>\r
 \r
+#include <Register/Cpuid.h>\r
+#include <Register/Msr.h>\r
+\r
 #include <Library/MtrrLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/CpuLib.h>\r
@@ -2124,26 +2127,25 @@ IsMtrrSupported (
   VOID\r
   )\r
 {\r
-  UINT32  RegEdx;\r
-  UINT64  MtrrCap;\r
+  CPUID_VERSION_INFO_EDX    Edx;\r
+  MSR_IA32_MTRRCAP_REGISTER MtrrCap;\r
 \r
   //\r
   // Check CPUID(1).EDX[12] for MTRR capability\r
   //\r
-  AsmCpuid (1, NULL, NULL, NULL, &RegEdx);\r
-  if (BitFieldRead32 (RegEdx, 12, 12) == 0) {\r
+  AsmCpuid (CPUID_VERSION_INFO, NULL, NULL, NULL, &Edx.Uint32);\r
+  if (Edx.Bits.MTRR == 0) {\r
     return FALSE;\r
   }\r
 \r
   //\r
-  // Check IA32_MTRRCAP.[0..7] for number of variable MTRRs and IA32_MTRRCAP[8] for\r
-  // fixed MTRRs existence. If number of variable MTRRs is zero, or fixed MTRRs do not\r
+  // Check number of variable MTRRs and fixed MTRRs existence.\r
+  // If number of variable MTRRs is zero, or fixed MTRRs do not\r
   // exist, return false.\r
   //\r
-  MtrrCap = AsmReadMsr64 (MTRR_LIB_IA32_MTRR_CAP);\r
-  if  ((BitFieldRead64 (MtrrCap, 0, 7) == 0) || (BitFieldRead64 (MtrrCap, 8, 8) == 0)) {\r
+  MtrrCap.Uint64 = AsmReadMsr64 (MSR_IA32_MTRRCAP);\r
+  if ((MtrrCap.Bits.VCNT == 0) || (MtrrCap.Bits.FIX == 0)) {\r
     return FALSE;\r
   }\r
-\r
   return TRUE;\r
 }\r