UefiCpuPkg/MpService: move settimer out to InitMpSystemData

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Reviewed-by: Jeff Fan <jeff.fan@intel.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16362 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c
index 1b449a7a8de5bd78c2338f68fa9f6d025d8bdd5b..7ceda3550dd86ce9b090cc61f788009b41c0d8d6 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuMp.c
+++ b/UefiCpuPkg/CpuDxe/CpuMp.c
@@ -25,6 +25,8 @@ VOID *mCommonStack = 0;
 VOID *mTopOfApCommonStack = 0;\r
 VOID *mApStackStart = 0;\r
 \r
+volatile BOOLEAN mStopCheckAllAPsStatus = TRUE;\r
+\r
 EFI_MP_SERVICES_PROTOCOL  mMpServicesTemplate = {\r
   GetNumberOfProcessors,\r
   GetProcessorInfo,\r
@@ -637,6 +639,11 @@ StartupAllAPs (
     }\r
   }\r
 \r
+  //\r
+  // temporarily stop checkAllAPsStatus for initialize parameters.\r
+  //\r
+  mStopCheckAllAPsStatus = TRUE;\r
+\r
   mMpSystemData.Procedure         = Procedure;\r
   mMpSystemData.ProcedureArgument = ProcedureArgument;\r
   mMpSystemData.WaitEvent         = WaitEvent;\r
@@ -686,13 +693,13 @@ StartupAllAPs (
     }\r
   }\r
 \r
+  mStopCheckAllAPsStatus = FALSE;\r
+\r
   if (WaitEvent != NULL) {\r
-    Status = gBS->SetTimer (\r
-                    mMpSystemData.CheckAllAPsEvent,\r
-                    TimerPeriodic,\r
-                    EFI_TIMER_PERIOD_MICROSECONDS (100)\r
-                    );\r
-    return Status;\r
+    //\r
+    // non blocking\r
+    //\r
+    return EFI_SUCCESS;\r
   }\r
 \r
   while (TRUE) {\r
@@ -819,7 +826,6 @@ StartupThisAP (
   )\r
 {\r
   CPU_DATA_BLOCK        *CpuData;\r
-  EFI_STATUS            Status;\r
 \r
   CpuData = NULL;\r
 \r
@@ -849,6 +855,11 @@ StartupThisAP (
     return EFI_NOT_READY;\r
   }\r
 \r
+  //\r
+  // temporarily stop checkAllAPsStatus for initialize parameters.\r
+  //\r
+  mStopCheckAllAPsStatus = TRUE;\r
+\r
   SetApState (CpuData, CpuStateReady);\r
 \r
   SetApProcedure (CpuData, Procedure, ProcedureArgument);\r
@@ -858,16 +869,13 @@ StartupThisAP (
   CpuData->TimeoutActive = !!(TimeoutInMicroseconds);\r
   CpuData->Finished = Finished;\r
 \r
+  mStopCheckAllAPsStatus = FALSE;\r
+\r
   if (WaitEvent != NULL) {\r
     //\r
     // Non Blocking\r
     //\r
-    Status = gBS->SetTimer (\r
-                    CpuData->CheckThisAPEvent,\r
-                    TimerPeriodic,\r
-                    EFI_TIMER_PERIOD_MICROSECONDS (100)\r
-                    );\r
-    return Status;\r
+    return EFI_SUCCESS;\r
   }\r
 \r
   //\r
@@ -1194,11 +1202,9 @@ CheckThisAPStatus (
   return;\r
 \r
 out:\r
-  gBS->SetTimer (CpuData->CheckThisAPEvent, TimerCancel, 0);\r
-  if (CpuData->WaitEvent) {\r
-    gBS->SignalEvent (CpuData->WaitEvent);\r
-    CpuData->WaitEvent = NULL;\r
-  }\r
+  CpuData->TimeoutActive = FALSE;\r
+  gBS->SignalEvent (CpuData->WaitEvent);\r
+  CpuData->WaitEvent = NULL;\r
 }\r
 \r
 /**\r
@@ -1218,36 +1224,62 @@ CheckAllAPsStatus (
   IN  VOID             *Context\r
   )\r
 {\r
+  CPU_DATA_BLOCK *CpuData;\r
+  UINTN          Number;\r
+\r
   if (mMpSystemData.TimeoutActive) {\r
     mMpSystemData.Timeout -= gPollInterval;\r
   }\r
 \r
-  CheckAndUpdateAllAPsToIdleState ();\r
+  if (mStopCheckAllAPsStatus) {\r
+    return;\r
+  }\r
 \r
-  //\r
-  // task timeout\r
-  //\r
-  if (mMpSystemData.TimeoutActive && mMpSystemData.Timeout < 0) {\r
-    ResetAllFailedAPs();\r
+  if (mMpSystemData.WaitEvent != NULL) {\r
+    CheckAndUpdateAllAPsToIdleState ();\r
     //\r
-    // force exit\r
+    // task timeout\r
     //\r
-    mMpSystemData.FinishCount = mMpSystemData.StartCount;\r
-  }\r
-\r
-  if (mMpSystemData.FinishCount != mMpSystemData.StartCount) {\r
-    return;\r
-  }\r
+    if (mMpSystemData.TimeoutActive && mMpSystemData.Timeout < 0) {\r
+      ResetAllFailedAPs();\r
+      //\r
+      // force exit\r
+      //\r
+      mMpSystemData.FinishCount = mMpSystemData.StartCount;\r
+    }\r
 \r
-  gBS->SetTimer (\r
-         mMpSystemData.CheckAllAPsEvent,\r
-         TimerCancel,\r
-         0\r
-         );\r
+    if (mMpSystemData.FinishCount != mMpSystemData.StartCount) {\r
+      return;\r
+    }\r
 \r
-  if (mMpSystemData.WaitEvent) {\r
+    mMpSystemData.TimeoutActive = FALSE;\r
     gBS->SignalEvent (mMpSystemData.WaitEvent);\r
     mMpSystemData.WaitEvent = NULL;\r
+    mStopCheckAllAPsStatus = TRUE;\r
+  }\r
+\r
+  //\r
+  // check each AP status for StartupThisAP\r
+  //\r
+  for (Number = 0; Number < mMpSystemData.NumberOfProcessors; Number++) {\r
+    CpuData = &mMpSystemData.CpuDatas[Number];\r
+    if (TestCpuStatusFlag (CpuData, PROCESSOR_AS_BSP_BIT)) {\r
+      //\r
+      // Skip BSP\r
+      //\r
+      continue;\r
+    }\r
+\r
+    if (!TestCpuStatusFlag (CpuData, PROCESSOR_ENABLED_BIT)) {\r
+      //\r
+      // Skip Disabled processors\r
+      //\r
+      continue;\r
+    }\r
+\r
+    if (CpuData->WaitEvent) {\r
+      CheckThisAPStatus (NULL, (VOID *)CpuData);\r
+    }\r
   }\r
 }\r
 \r
@@ -1324,8 +1356,6 @@ InitMpSystemData (
   VOID\r
   )\r
 {\r
-  UINTN          ProcessorNumber;\r
-  CPU_DATA_BLOCK *CpuData;\r
   EFI_STATUS     Status;\r
 \r
   ZeroMem (&mMpSystemData, sizeof (MP_SYSTEM_DATA));\r
@@ -1345,17 +1375,15 @@ InitMpSystemData (
                   );\r
   ASSERT_EFI_ERROR (Status);\r
 \r
-  for (ProcessorNumber = 0; ProcessorNumber < gMaxLogicalProcessorNumber; ProcessorNumber++) {\r
-    CpuData = &mMpSystemData.CpuDatas[ProcessorNumber];\r
-    Status = gBS->CreateEvent (\r
-                    EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
-                    TPL_CALLBACK,\r
-                    CheckThisAPStatus,\r
-                    (VOID *) CpuData,\r
-                    &CpuData->CheckThisAPEvent\r
-                    );\r
-    ASSERT_EFI_ERROR (Status);\r
-  }\r
+  //\r
+  // Set timer to check all APs status.\r
+  //\r
+  Status = gBS->SetTimer (\r
+                  mMpSystemData.CheckAllAPsEvent,\r
+                  TimerPeriodic,\r
+                  EFI_TIMER_PERIOD_MICROSECONDS (100)\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
 \r
   //\r
   // BSP\r