UefiCpuPkg/CpuMpPei: Wake up APs by proper method

[mirror_edk2.git] / UefiCpuPkg / CpuMpPei / CpuMpPei.c

diff --git a/UefiCpuPkg/CpuMpPei/CpuMpPei.c b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
index ba82ba42184d606d6dc19256459c775872c31d51..950d61cc4853797dd3b6f67879481d9114d5a351 100644 (file)
--- a/UefiCpuPkg/CpuMpPei/CpuMpPei.c
+++ b/UefiCpuPkg/CpuMpPei/CpuMpPei.c
@@ -399,7 +399,7 @@ ApCFunction (
   @param PeiCpuMpData       Pointer to PEI CPU MP Data\r
   @param Broadcast          TRUE:  Send broadcast IPI to all APs\r
                             FALSE: Send IPI to AP by ApicId\r
-  @param ApicId             Apic ID for the processor to be waked\r
+  @param ProcessorNumber    The handle number of specified processor\r
   @param Procedure          The function to be invoked by AP\r
   @param ProcedureArgument  The argument to be passed into AP function\r
 **/\r
@@ -407,12 +407,13 @@ VOID
 WakeUpAP (\r
   IN PEI_CPU_MP_DATA           *PeiCpuMpData,\r
   IN BOOLEAN                   Broadcast,\r
-  IN UINT32                    ApicId,\r
+  IN UINTN                     ProcessorNumber,\r
   IN EFI_AP_PROCEDURE          Procedure,              OPTIONAL\r
   IN VOID                      *ProcedureArgument      OPTIONAL\r
   )\r
 {\r
   volatile MP_CPU_EXCHANGE_INFO    *ExchangeInfo;\r
+  UINTN                            Index;\r
 \r
   PeiCpuMpData->ApFunction         = (UINTN) Procedure;\r
   PeiCpuMpData->ApFunctionArgument = (UINTN) ProcedureArgument;\r
@@ -436,12 +437,40 @@ WakeUpAP (
   CopyMem ((VOID *)&ExchangeInfo->GdtrProfile, &mGdt, sizeof(mGdt));\r
   AsmReadIdtr ((IA32_DESCRIPTOR *) &ExchangeInfo->IdtrProfile);\r
 \r
-  if (Broadcast) {\r
-    SendInitSipiSipiAllExcludingSelf ((UINT32) ExchangeInfo->BufferStart);\r
-  } else {\r
-    SendInitSipiSipi (ApicId, (UINT32) ExchangeInfo->BufferStart);\r
+  if (PeiCpuMpData->ApLoopMode == ApInMwaitLoop) {\r
+    //\r
+    // Get AP target C-state each time when waking up AP,\r
+    // for it maybe updated by platform again\r
+    //\r
+    PeiCpuMpData->ApTargetCState = PcdGet8 (PcdCpuApTargetCstate);\r
   }\r
 \r
+  //\r
+  // Wakeup APs per AP loop state\r
+  //\r
+  if (PeiCpuMpData->ApLoopMode == ApInHltLoop || PeiCpuMpData->InitFlag) {\r
+    if (Broadcast) {\r
+      SendInitSipiSipiAllExcludingSelf ((UINT32) ExchangeInfo->BufferStart);\r
+    } else {\r
+      SendInitSipiSipi (\r
+        PeiCpuMpData->CpuData[ProcessorNumber].ApicId,\r
+        (UINT32) ExchangeInfo->BufferStart\r
+        );\r
+    }\r
+  } else if ((PeiCpuMpData->ApLoopMode == ApInMwaitLoop) ||\r
+             (PeiCpuMpData->ApLoopMode == ApInRunLoop)) {\r
+    if (Broadcast) {\r
+      for (Index = 0; Index < PeiCpuMpData->CpuCount; Index++) {\r
+        if (Index != PeiCpuMpData->BspNumber) {\r
+          *(PeiCpuMpData->CpuData[Index].StartupApSignal) = WAKEUP_AP_SIGNAL;\r
+        }\r
+      }\r
+    } else {\r
+      *(PeiCpuMpData->CpuData[ProcessorNumber].StartupApSignal) = WAKEUP_AP_SIGNAL;\r
+    }\r
+  } else {\r
+    ASSERT (FALSE);\r
+  }\r
   return ;\r
 }\r
 \r
@@ -600,7 +629,7 @@ CountProcessorNumber (
     if (PeiCpuMpData->X2ApicEnable) {\r
       DEBUG ((EFI_D_INFO, "Force x2APIC mode!\n"));\r
       //\r
-      // Send 2nd broadcast IPI to all APs to enable x2APIC mode\r
+      // Wakeup all APs to enable x2APIC mode\r
       //\r
       WakeUpAP (PeiCpuMpData, TRUE, 0, ApFuncEnableX2Apic, NULL);\r
       //\r