summaryrefslogtreecommitdiffstats
path: root/QuarkSocPkg
diff options
context:
space:
mode:
authorEric Dong <eric.dong@intel.com>2017-08-02 18:26:43 +0800
committerEric Dong <eric.dong@intel.com>2017-08-07 15:28:12 +0800
commit055fa1c6661dfb421568ab73ca6a7e4f723f60de (patch)
treecd8ff4dcf57dacf61a8c6de883e327d3114f14ab /QuarkSocPkg
parent8853c2afc51c2cab862acbef308f2588264e188b (diff)
downloadedk2-055fa1c6661dfb421568ab73ca6a7e4f723f60de.tar.gz
edk2-055fa1c6661dfb421568ab73ca6a7e4f723f60de.tar.bz2
edk2-055fa1c6661dfb421568ab73ca6a7e4f723f60de.zip
QuarkSocPkg MtrrLib: Enhance get mtrr mask logic.
In order to not use the deprecated macro, refine get mtrr mask value logic. Cc: Jeff Fan <jeff.fan@intel.com> Cc: Ruiyu Ni <ruiyu.ni@intel.com> Cc: Michael D Kinney <michael.d.kinney@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Eric Dong <eric.dong@intel.com> Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Diffstat (limited to 'QuarkSocPkg')
-rw-r--r--QuarkSocPkg/QuarkNorthCluster/Library/MtrrLib/MtrrLib.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/QuarkSocPkg/QuarkNorthCluster/Library/MtrrLib/MtrrLib.c b/QuarkSocPkg/QuarkNorthCluster/Library/MtrrLib/MtrrLib.c
index 58d8c0d4c4..2760427554 100644
--- a/QuarkSocPkg/QuarkNorthCluster/Library/MtrrLib/MtrrLib.c
+++ b/QuarkSocPkg/QuarkNorthCluster/Library/MtrrLib/MtrrLib.c
@@ -1036,13 +1036,12 @@ MtrrLibInitializeMtrrMask (
AsmCpuid (0x80000008, &RegEax, NULL, NULL, NULL);
PhysicalAddressBits = (UINT8) RegEax;
-
- *MtrrValidBitsMask = LShiftU64 (1, PhysicalAddressBits) - 1;
- *MtrrValidAddressMask = *MtrrValidBitsMask & 0xfffffffffffff000ULL;
} else {
- *MtrrValidBitsMask = MTRR_LIB_MSR_VALID_MASK;
- *MtrrValidAddressMask = MTRR_LIB_CACHE_VALID_ADDRESS;
+ PhysicalAddressBits = 36;
}
+
+ *MtrrValidBitsMask = LShiftU64 (1, PhysicalAddressBits) - 1;
+ *MtrrValidAddressMask = *MtrrValidBitsMask & 0xfffffffffffff000ULL;
}