UefiCpuPkg/MpInitLib: Force sending INIT-SIPI-SIPI to reset APs

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / MpLib.c

diff --git a/UefiCpuPkg/Library/MpInitLib/MpLib.c b/UefiCpuPkg/Library/MpInitLib/MpLib.c
index 56b870e52748b42672b086666f73880df7f8af2d..9641e5e82c200f8f14154f17d258805730e9fcf7 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -899,7 +899,12 @@ ResetProcessorToIdleState (
 \r
   CpuMpData = GetCpuMpData ();\r
 \r
+  CpuMpData->InitFlag = ApInitReconfig;\r
   WakeUpAP (CpuMpData, FALSE, ProcessorNumber, NULL, NULL);\r
+  while (CpuMpData->FinishedCount < 1) {\r
+    CpuPause ();\r
+  }\r
+  CpuMpData->InitFlag = ApInitDone;\r
 \r
   SetApState (&CpuMpData->CpuData[ProcessorNumber], CpuStateIdle);\r
 }\r
@@ -1143,6 +1148,7 @@ MpInitLibInitialize (
   } else {\r
     MaxLogicalProcessorNumber = OldCpuMpData->CpuCount;\r
   }\r
+  ASSERT (MaxLogicalProcessorNumber != 0);\r
 \r
   AsmGetAddressMap (&AddressMap);\r
   ApResetVectorSize = AddressMap.RendezvousFunnelSize + sizeof (MP_CPU_EXCHANGE_INFO);\r
@@ -1209,10 +1215,12 @@ MpInitLibInitialize (
   MtrrGetAllMtrrs (&CpuMpData->MtrrTable);\r
 \r
   if (OldCpuMpData == NULL) {\r
-    //\r
-    // Wakeup all APs and calculate the processor count in system\r
-    //\r
-    CollectProcessorCount (CpuMpData);\r
+    if (MaxLogicalProcessorNumber > 1) {\r
+      //\r
+      // Wakeup all APs and calculate the processor count in system\r
+      //\r
+      CollectProcessorCount (CpuMpData);\r
+    }\r
   } else {\r
     //\r
     // APs have been wakeup before, just get the CPU Information\r
@@ -1238,19 +1246,21 @@ MpInitLibInitialize (
         sizeof (CPU_VOLATILE_REGISTERS)\r
         );\r
     }\r
-    //\r
-    // Wakeup APs to do some AP initialize sync\r
-    //\r
-    WakeUpAP (CpuMpData, TRUE, 0, ApInitializeSync, CpuMpData);\r
-    //\r
-    // Wait for all APs finished initialization\r
-    //\r
-    while (CpuMpData->FinishedCount < (CpuMpData->CpuCount - 1)) {\r
-      CpuPause ();\r
-    }\r
-    CpuMpData->InitFlag = ApInitDone;\r
-    for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
-      SetApState (&CpuMpData->CpuData[Index], CpuStateIdle);\r
+    if (MaxLogicalProcessorNumber > 1) {\r
+      //\r
+      // Wakeup APs to do some AP initialize sync\r
+      //\r
+      WakeUpAP (CpuMpData, TRUE, 0, ApInitializeSync, CpuMpData);\r
+      //\r
+      // Wait for all APs finished initialization\r
+      //\r
+      while (CpuMpData->FinishedCount < (CpuMpData->CpuCount - 1)) {\r
+        CpuPause ();\r
+      }\r
+      CpuMpData->InitFlag = ApInitDone;\r
+      for (Index = 0; Index < CpuMpData->CpuCount; Index++) {\r
+        SetApState (&CpuMpData->CpuData[Index], CpuStateIdle);\r
+      }\r
     }\r
   }\r
 \r