From: jyao1 <jyao1>
Date: Sun, 28 Sep 2014 01:07:13 +0000 (+0000)
Subject: Fix an issue on FixedMtreProgramming - AND/OR mask incorrect.
X-Git-Tag: edk2-stable201903~10828
X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=90be22219668cae514cdb56934cb139089367dae

Fix an issue on FixedMtreProgramming - AND/OR mask incorrect.

Contributed-under: TianoCore Contribution Agreement 1.0

signed-off by: Yao, Jiewen <jiewen.yao@intel.com>
reviewed by: Rangarajan, Ravi P <ravi.p.rangarajan@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16181 6f19259b-4bc3-4df7-8a09-765794883524
---

diff --git a/IntelFspPkg/Library/BaseCacheLib/CacheLib.c b/IntelFspPkg/Library/BaseCacheLib/CacheLib.c
index 5c77962393..40d404dd69 100644
--- a/IntelFspPkg/Library/BaseCacheLib/CacheLib.c
+++ b/IntelFspPkg/Library/BaseCacheLib/CacheLib.c
@@ -381,7 +381,7 @@ ProgramFixedMtrr (
     *Len -= mFixedMtrrTable[MsrNum].Length;
     *Base += mFixedMtrrTable[MsrNum].Length;
   }
-  TempQword = AsmReadMsr64 (mFixedMtrrTable[MsrNum].Msr) & (~ClearMask | OrMask);
+  TempQword = (AsmReadMsr64 (mFixedMtrrTable[MsrNum].Msr) & (~ClearMask)) | OrMask;
   AsmWriteMsr64 (mFixedMtrrTable[MsrNum].Msr, TempQword);
 
   return EFI_SUCCESS;