From acb2172d15ed793c8ae0484700d42dcc105f2ea1 Mon Sep 17 00:00:00 2001
From: Chen Fan <chen.fan.fnst@cn.fujitsu.com>
Date: Thu, 13 Nov 2014 18:28:20 +0000
Subject: 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
---
 UefiCpuPkg/CpuDxe/CpuMp.c | 128 ++++++++++++++++++++++++++++------------------
 1 file changed, 78 insertions(+), 50 deletions(-)

(limited to 'UefiCpuPkg')

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