UefiCpuPkg/MpService: avoid next timer getting into CheckAllAPsStatus()

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@16364 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c
index a37e45aebdeb0959be07cd69f8c50ad1c61ae071..3e30d7417d4f0ea88739911544cfb2984e30ba41 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuMp.c
+++ b/UefiCpuPkg/CpuDxe/CpuMp.c
@@ -1231,6 +1231,7 @@ CheckAllAPsStatus (
 {\r
   CPU_DATA_BLOCK *CpuData;\r
   UINTN          Number;\r
+  EFI_STATUS     Status;\r
 \r
   if (mMpSystemData.TimeoutActive) {\r
     mMpSystemData.Timeout -= gPollInterval;\r
@@ -1240,6 +1241,16 @@ CheckAllAPsStatus (
     return;\r
   }\r
 \r
+  //\r
+  // avoid next timer enter.\r
+  //\r
+  Status = gBS->SetTimer (\r
+                  mMpSystemData.CheckAllAPsEvent,\r
+                  TimerCancel,\r
+                  0\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
+\r
   if (mMpSystemData.WaitEvent != NULL) {\r
     CheckAndUpdateAllAPsToIdleState ();\r
     //\r
@@ -1254,13 +1265,15 @@ CheckAllAPsStatus (
     }\r
 \r
     if (mMpSystemData.FinishCount != mMpSystemData.StartCount) {\r
-      return;\r
+      goto EXIT;\r
     }\r
 \r
     mMpSystemData.TimeoutActive = FALSE;\r
     gBS->SignalEvent (mMpSystemData.WaitEvent);\r
     mMpSystemData.WaitEvent = NULL;\r
     mStopCheckAllAPsStatus = TRUE;\r
+\r
+    goto EXIT;\r
   }\r
 \r
   //\r
@@ -1286,6 +1299,14 @@ CheckAllAPsStatus (
       CheckThisAPStatus (NULL, (VOID *)CpuData);\r
     }\r
   }\r
+\r
+EXIT:\r
+  Status = gBS->SetTimer (\r
+                  mMpSystemData.CheckAllAPsEvent,\r
+                  TimerPeriodic,\r
+                  EFI_TIMER_PERIOD_MICROSECONDS (100)\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
 /**\r