UefiCpuPkg/CpuDxe: introduce ResetApStackless()

If timeout expires before AP returns from Procedure, the AP should
be terminated, we introduce ResetApStackLess() to send init IPI
to let AP exit Procedurce and re-available.

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

diff --git a/UefiCpuPkg/CpuDxe/ApStartup.c b/UefiCpuPkg/CpuDxe/ApStartup.c
index 801f7f8611fd77c63730b1f110c8a505ab4981a0..7613b47942cc47b01e3d4f1b2a4e27023fd96818 100644 (file)
--- a/UefiCpuPkg/CpuDxe/ApStartup.c
+++ b/UefiCpuPkg/CpuDxe/ApStartup.c
@@ -328,3 +328,20 @@ StartApsStackless (
   return EFI_SUCCESS;\r
 }\r
 \r
+/**\r
+  Resets the Application Processor and directs it to jump to the\r
+  specified routine.\r
+\r
+  The processor jumps to this code in flat mode, but the processor's\r
+  stack is not initialized.\r
+\r
+  @param ProcessorId           the AP of ProcessorId was reset\r
+**/\r
+VOID\r
+ResetApStackless (\r
+  IN UINT32 ProcessorId\r
+  )\r
+{\r
+  SendInitSipiSipi (ProcessorId,\r
+                    (UINT32)(UINTN)(VOID*) StartupCode);\r
+}\r

diff --git a/UefiCpuPkg/CpuDxe/CpuMp.c b/UefiCpuPkg/CpuDxe/CpuMp.c
index 029e8d43317beb026a7726101f219dfb14c80006..13fcda58597bf25bf622e1ce0a8e7e726f642a71 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuMp.c
+++ b/UefiCpuPkg/CpuDxe/CpuMp.c
@@ -25,6 +25,7 @@ VOID *mCommonStack = 0;
 VOID *mTopOfApCommonStack = 0;\r
 VOID *mApStackStart = 0;\r
 \r
+BOOLEAN mAPsAlreadyInitFinished = FALSE;\r
 volatile BOOLEAN mStopCheckAllAPsStatus = TRUE;\r
 \r
 EFI_MP_SERVICES_PROTOCOL  mMpServicesTemplate = {\r
@@ -1112,6 +1113,7 @@ ResetProcessorToIdleState (
   IN CPU_DATA_BLOCK  *CpuData\r
   )\r
 {\r
+  ResetApStackless ((UINT32)CpuData->Info.ProcessorId);\r
 }\r
 \r
 /**\r
@@ -1138,6 +1140,14 @@ ProcessorToIdleState (
 \r
   AsmApDoneWithCommonStack ();\r
 \r
+  //\r
+  // Avoid forcibly reset AP caused the AP State is not updated.\r
+  //\r
+  GetMpSpinLock (CpuData);\r
+  CpuData->State = CpuStateIdle;\r
+  CpuData->Procedure = NULL;\r
+  ReleaseMpSpinLock (CpuData);\r
+\r
   while (TRUE) {\r
     GetMpSpinLock (CpuData);\r
     ProcedureArgument = CpuData->Parameter;\r
@@ -1319,13 +1329,27 @@ ApEntryPointInC (
   VOID\r
   )\r
 {\r
-  VOID* TopOfApStack;\r
+  VOID*           TopOfApStack;\r
+  UINTN           ProcessorNumber;\r
 \r
-  FillInProcessorInformation (FALSE, mMpSystemData.NumberOfProcessors);\r
-  TopOfApStack  = (UINT8*)mApStackStart + gApStackSize;\r
-  mApStackStart = TopOfApStack;\r
+  if (!mAPsAlreadyInitFinished) {\r
+    FillInProcessorInformation (FALSE, mMpSystemData.NumberOfProcessors);\r
+    TopOfApStack  = (UINT8*)mApStackStart + gApStackSize;\r
+    mApStackStart = TopOfApStack;\r
 \r
-  mMpSystemData.NumberOfProcessors++;\r
+    //\r
+    // Store the Stack address, when reset the AP, We can found the original address.\r
+    //\r
+    mMpSystemData.CpuDatas[mMpSystemData.NumberOfProcessors].TopOfStack = TopOfApStack;\r
+    mMpSystemData.NumberOfProcessors++;\r
+    mMpSystemData.NumberOfEnabledProcessors++;\r
+  } else {\r
+    WhoAmI (&mMpServicesTemplate, &ProcessorNumber);\r
+    //\r
+    // Get the original stack address.\r
+    //\r
+    TopOfApStack = mMpSystemData.CpuDatas[ProcessorNumber].TopOfStack;\r
+  }\r
 \r
   SwitchStack (\r
     (SWITCH_STACK_ENTRY_POINT)(UINTN)ProcessorToIdleState,\r
@@ -1462,6 +1486,8 @@ InitializeMpSupport (
     return;\r
   }\r
 \r
+  mAPsAlreadyInitFinished = TRUE;\r
+\r
   if (mMpSystemData.NumberOfProcessors < gMaxLogicalProcessorNumber) {\r
     FreePages (mApStackStart, EFI_SIZE_TO_PAGES (\r
                                 (gMaxLogicalProcessorNumber - mMpSystemData.NumberOfProcessors) *\r

diff --git a/UefiCpuPkg/CpuDxe/CpuMp.h b/UefiCpuPkg/CpuDxe/CpuMp.h
index 2b1717d4107453b39d73c703443476d731bf3380..4254419a933c3ed3af749e5dac5a0cb998b6d665 100644 (file)
--- a/UefiCpuPkg/CpuDxe/CpuMp.h
+++ b/UefiCpuPkg/CpuDxe/CpuMp.h
@@ -99,6 +99,7 @@ typedef struct {
   EFI_EVENT                      WaitEvent;\r
   BOOLEAN                        TimeoutActive;\r
   EFI_EVENT                      CheckThisAPEvent;\r
+  VOID                           *TopOfStack;\r
 } CPU_DATA_BLOCK;\r
 \r
 /**\r
@@ -622,5 +623,19 @@ FreeApStartupCode (
   VOID\r
   );\r
 \r
+/**\r
+  Resets the Application Processor and directs it to jump to the\r
+  specified routine.\r
+\r
+  The processor jumps to this code in flat mode, but the processor's\r
+  stack is not initialized.\r
+\r
+  @param ProcessorId           the AP of ProcessorId was reset\r
+**/\r
+VOID\r
+ResetApStackless (\r
+  IN UINT32 ProcessorId\r
+  );\r
+\r
 #endif // _CPU_MP_H_\r
 \r