UefiCpuPkg/MtrrLib: Don't report OutOfResource when MTRR is enough

[mirror_edk2.git] / UefiCpuPkg / Library / MtrrLib / MtrrLib.c

diff --git a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
index 9d1927262a4edee650bd18621fac69cba7f73738..cf1af29936ad85846bcaf198445386ac4c2a5bb4 100644 (file)
--- a/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
+++ b/UefiCpuPkg/Library/MtrrLib/MtrrLib.c
@@ -851,6 +851,8 @@ MtrrLibGetMtrrNumber (
   UINT64  SubtractiveLength;\r
   UINT64  BaseAlignment;\r
   UINT32  Index;\r
+  UINT64  OriginalBaseAddress;\r
+  UINT64  OriginalLength;\r
 \r
   *SubLeft = 0;\r
   *SubRight = 0;\r
@@ -861,6 +863,9 @@ MtrrLibGetMtrrNumber (
   // Get the optimal left subtraction solution.\r
   //\r
   if (BaseAddress != 0) {\r
+\r
+    OriginalBaseAddress    = BaseAddress;\r
+    OriginalLength         = Length;\r
     SubtractiveBaseAddress = 0;\r
     SubtractiveLength      = 0;\r
     //\r
@@ -915,7 +920,10 @@ MtrrLibGetMtrrNumber (
     //\r
     if (*SubLeft != 0) {\r
       BaseAddress = SubtractiveBaseAddress;\r
-      Length = SubtractiveLength;\r
+      Length      = SubtractiveLength;\r
+    } else {\r
+      BaseAddress = OriginalBaseAddress;\r
+      Length      = OriginalLength;\r
     }\r
   }\r
 \r