UefiCpuPkg/MpInitLib: don't shadow the microcode patch twice.

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1982

MpInitLibInitialize in MpLib.c will be invoked on both PEI and DXE
CPU code, MicrocodeDetect would be performed twice and copy
Microcode from flash to memory twice as well, which consider as
duplicate work to lead longer boot time.
This patch just use microcode memory copied in PEI phase if exist.

Signed-off-by: Eric Dong <eric.dong@intel.com>
Reviewed-by: Ray Ni <ray.ni@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 572495ec3602bcd1c802897ea8c2561ba6e5e4a1..a1ad665564110cbeebb0d6570bdd4d2d2b926424 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1607,38 +1607,42 @@ MpInitLibInitialize (
   CpuMpData->SwitchBspFlag    = FALSE;\r
   CpuMpData->CpuData          = (CPU_AP_DATA *) (CpuMpData + 1);\r
   CpuMpData->CpuInfoInHob     = (UINT64) (UINTN) (CpuMpData->CpuData + MaxLogicalProcessorNumber);\r
-  CpuMpData->MicrocodePatchRegionSize = PcdGet64 (PcdCpuMicrocodePatchRegionSize);\r
-  //\r
-  // If platform has more than one CPU, relocate microcode to memory to reduce\r
-  // loading microcode time.\r
-  //\r
-  MicrocodePatchInRam = NULL;\r
-  if (MaxLogicalProcessorNumber > 1) {\r
-    MicrocodePatchInRam = AllocatePages (\r
-                            EFI_SIZE_TO_PAGES (\r
-                              (UINTN)CpuMpData->MicrocodePatchRegionSize\r
-                              )\r
-                            );\r
-  }\r
-  if (MicrocodePatchInRam == NULL) {\r
-    //\r
-    // there is only one processor, or no microcode patch is available, or\r
-    // memory allocation failed\r
-    //\r
-    CpuMpData->MicrocodePatchAddress = PcdGet64 (PcdCpuMicrocodePatchAddress);\r
-  } else {\r
+  if (OldCpuMpData == NULL) {\r
+    CpuMpData->MicrocodePatchRegionSize = PcdGet64 (PcdCpuMicrocodePatchRegionSize);\r
     //\r
-    // there are multiple processors, and a microcode patch is available, and\r
-    // memory allocation succeeded\r
+    // If platform has more than one CPU, relocate microcode to memory to reduce\r
+    // loading microcode time.\r
     //\r
-    CopyMem (\r
-      MicrocodePatchInRam,\r
-      (VOID *)(UINTN)PcdGet64 (PcdCpuMicrocodePatchAddress),\r
-      (UINTN)CpuMpData->MicrocodePatchRegionSize\r
-      );\r
-    CpuMpData->MicrocodePatchAddress = (UINTN)MicrocodePatchInRam;\r
+    MicrocodePatchInRam = NULL;\r
+    if (MaxLogicalProcessorNumber > 1) {\r
+      MicrocodePatchInRam = AllocatePages (\r
+                              EFI_SIZE_TO_PAGES (\r
+                                (UINTN)CpuMpData->MicrocodePatchRegionSize\r
+                                )\r
+                              );\r
+    }\r
+    if (MicrocodePatchInRam == NULL) {\r
+      //\r
+      // there is only one processor, or no microcode patch is available, or\r
+      // memory allocation failed\r
+      //\r
+      CpuMpData->MicrocodePatchAddress = PcdGet64 (PcdCpuMicrocodePatchAddress);\r
+    } else {\r
+      //\r
+      // there are multiple processors, and a microcode patch is available, and\r
+      // memory allocation succeeded\r
+      //\r
+      CopyMem (\r
+        MicrocodePatchInRam,\r
+        (VOID *)(UINTN)PcdGet64 (PcdCpuMicrocodePatchAddress),\r
+        (UINTN)CpuMpData->MicrocodePatchRegionSize\r
+        );\r
+      CpuMpData->MicrocodePatchAddress = (UINTN)MicrocodePatchInRam;\r
+    }\r
+  }else {\r
+    CpuMpData->MicrocodePatchRegionSize = OldCpuMpData->MicrocodePatchRegionSize;\r
+    CpuMpData->MicrocodePatchAddress    = OldCpuMpData->MicrocodePatchAddress;\r
   }\r
-\r
   InitializeSpinLock(&CpuMpData->MpLock);\r
 \r
   //\r