Use atomic AsmDisableCache() and AsmDisableCache() functions instead of AsmWriteCr0() and AsmWbinvd() calls

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@9998 6f19259b-4bc3-4df7-8a09-765794883524

1 files changed, 14 insertions, 20 deletions

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 1a8ffc2cd..3c3115c8a 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -144,28 +144,27 @@ PreMtrrChange (
   //

   // Enter no fill cache mode, CD=1(Bit30), NW=0 (Bit29)

   //

-  Value = AsmReadCr0 ();

-  Value = (UINTN) BitFieldWrite64 (Value, 30, 30, 1);

-  Value = (UINTN) BitFieldWrite64 (Value, 29, 29, 0);

-  AsmWriteCr0 (Value);

-  //

-  // Flush cache

-  //

-  AsmWbinvd ();

+  AsmDisableCache ();

+

   //

-  // Clear PGE flag Bit 7

+  // Save original CR4 value and clear PGE flag (Bit 7)

   //

   Value = AsmReadCr4 ();

-  AsmWriteCr4 ((UINTN) BitFieldWrite64 (Value, 7, 7, 0));

+  AsmWriteCr4 (Value & (~BIT7));

+

   //

   // Flush all TLBs

   //

   CpuFlushTlb ();

+

   //

   // Disable Mtrrs

   //

   AsmMsrBitFieldWrite64 (MTRR_LIB_IA32_MTRR_DEF_TYPE, 10, 11, 0);

 

+  //

+  // Return original CR4 value

+  //

   return Value;

 }

 

@@ -184,30 +183,25 @@ PostMtrrChange (
   UINTN Cr4

   )

 {

-  UINTN  Value;

-

   //

   // Enable Cache MTRR

   //

   AsmMsrBitFieldWrite64 (MTRR_LIB_IA32_MTRR_DEF_TYPE, 10, 11, 3);

 

   //

-  // Flush all TLBs and cache the second time

+  // Flush all TLBs 

   //

-  AsmWbinvd ();

   CpuFlushTlb ();

 

   //

   // Enable Normal Mode caching CD=NW=0, CD(Bit30), NW(Bit29)

   //

-  Value = AsmReadCr0 ();

-  Value = (UINTN) BitFieldWrite64 (Value, 30, 30, 0);

-  Value = (UINTN) BitFieldWrite64 (Value, 29, 29, 0);

-  AsmWriteCr0 (Value);

+  AsmEnableCache ();

 

+  //

+  // Restore original CR4 value

+  //

   AsmWriteCr4 (Cr4);

-

-  return ;

 }