diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 609aca5c3e..06a361bd84 100644
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -486,18 +486,10 @@ ProgramFixedMtrr (
   //
   // We found the fixed MTRR to be programmed
   //
-  for (ByteShift = 0; ByteShift < 8; ByteShift++) {
-    if (*Base ==
-         (
-           mMtrrLibFixedMtrrTable[MsrNum].BaseAddress +
-           (ByteShift * mMtrrLibFixedMtrrTable[MsrNum].Length)
-         )
-       ) {
-      break;
-    }
-  }
+  ByteShift = ((UINT32)*Base - mMtrrLibFixedMtrrTable[MsrNum].BaseAddress)
+               / mMtrrLibFixedMtrrTable[MsrNum].Length;
 
-  if (ByteShift == 8) {
+  if (ByteShift >= 8) {
     return RETURN_UNSUPPORTED;
   }