UefiCpuPkg/MpInitLib: Update AP information when BSP switched

[mirror_edk2.git] / UefiCpuPkg / Library / MpInitLib / DxeMpLib.c

diff --git a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index 42d320ff8a6efc59256aef03e38ec4613f312ef5..7f3900b4c10d8fb577da5714cddf43e6bae5601e 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
@@ -22,8 +22,9 @@
 CPU_MP_DATA      *mCpuMpData = NULL;\r
 EFI_EVENT        mCheckAllApsEvent = NULL;\r
 EFI_EVENT        mMpInitExitBootServicesEvent = NULL;\r
+EFI_EVENT        mLegacyBootEvent = NULL;\r
 volatile BOOLEAN mStopCheckAllApsStatus = TRUE;\r
-\r
+VOID             *mReservedApLoopFunc = NULL;\r
 \r
 /**\r
   Get the pointer to CPU MP Data structure.\r
@@ -66,29 +67,33 @@ AllocateResetVector (
   UINTN                 ApResetVectorSize;\r
   EFI_PHYSICAL_ADDRESS  StartAddress;\r
 \r
-  ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +\r
-                      sizeof (MP_CPU_EXCHANGE_INFO);\r
-\r
-  StartAddress = BASE_1MB;\r
-  Status = gBS->AllocatePages (\r
-                  AllocateMaxAddress,\r
-                  EfiACPIMemoryNVS,\r
-                  EFI_SIZE_TO_PAGES (ApResetVectorSize),\r
-                  &StartAddress\r
-                  );\r
-  ASSERT_EFI_ERROR (Status);\r
-\r
-  CpuMpData->WakeupBuffer      = (UINTN) StartAddress;\r
-  CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)\r
+  if (CpuMpData->SaveRestoreFlag) {\r
+    BackupAndPrepareWakeupBuffer (CpuMpData);\r
+  } else {\r
+    ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +\r
+                        sizeof (MP_CPU_EXCHANGE_INFO);\r
+\r
+    StartAddress = BASE_1MB;\r
+    Status = gBS->AllocatePages (\r
+                    AllocateMaxAddress,\r
+                    EfiACPIMemoryNVS,\r
+                    EFI_SIZE_TO_PAGES (ApResetVectorSize),\r
+                    &StartAddress\r
+                    );\r
+    ASSERT_EFI_ERROR (Status);\r
+\r
+    CpuMpData->WakeupBuffer      = (UINTN) StartAddress;\r
+    CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)\r
                   (CpuMpData->WakeupBuffer + CpuMpData->AddressMap.RendezvousFunnelSize);\r
-  //\r
-  // copy AP reset code in it\r
-  //\r
-  CopyMem (\r
-    (VOID *) CpuMpData->WakeupBuffer,\r
-    (VOID *) CpuMpData->AddressMap.RendezvousFunnelAddress,\r
-    CpuMpData->AddressMap.RendezvousFunnelSize\r
-    );\r
+    //\r
+    // copy AP reset code in it\r
+    //\r
+    CopyMem (\r
+      (VOID *) CpuMpData->WakeupBuffer,\r
+      (VOID *) CpuMpData->AddressMap.RendezvousFunnelAddress,\r
+      CpuMpData->AddressMap.RendezvousFunnelSize\r
+      );\r
+  }\r
 }\r
 \r
 /**\r
@@ -103,13 +108,18 @@ FreeResetVector (
 {\r
   EFI_STATUS            Status;\r
   UINTN                 ApResetVectorSize;\r
-  ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +\r
-                      sizeof (MP_CPU_EXCHANGE_INFO);\r
-  Status = gBS->FreePages(\r
-             (EFI_PHYSICAL_ADDRESS)CpuMpData->WakeupBuffer,\r
-             EFI_SIZE_TO_PAGES (ApResetVectorSize)\r
-             );\r
-  ASSERT_EFI_ERROR (Status);\r
+\r
+  if (CpuMpData->SaveRestoreFlag) {\r
+    RestoreWakeupBuffer (CpuMpData);\r
+  } else {\r
+    ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +\r
+                        sizeof (MP_CPU_EXCHANGE_INFO);\r
+    Status = gBS->FreePages(\r
+               (EFI_PHYSICAL_ADDRESS)CpuMpData->WakeupBuffer,\r
+               EFI_SIZE_TO_PAGES (ApResetVectorSize)\r
+               );\r
+    ASSERT_EFI_ERROR (Status);\r
+  }\r
 }\r
 \r
 /**\r
@@ -163,7 +173,7 @@ CheckAndUpdateApsStatus (
 /**\r
   Checks APs' status periodically.\r
 \r
-  This function is triggerred by timer perodically to check the\r
+  This function is triggered by timer periodically to check the\r
   state of APs for StartupAllAPs() and StartupThisAP() executed\r
   in non-blocking mode.\r
 \r
@@ -189,7 +199,7 @@ CheckApsStatus (
 /**\r
   Get Protected mode code segment from current GDT table.\r
 \r
-  @returen  Protected mode code segment value.\r
+  @return  Protected mode code segment value.\r
 **/\r
 UINT16\r
 GetProtectedModeCS (\r
@@ -252,26 +262,19 @@ RelocateApLoop (
 **/\r
 VOID\r
 EFIAPI\r
-MpInitExitBootServicesCallback (\r
+MpInitChangeApLoopCallback (\r
   IN EFI_EVENT                Event,\r
   IN VOID                     *Context\r
   )\r
 {\r
   CPU_MP_DATA               *CpuMpData;\r
-  VOID                      *ReservedApLoopFunc;\r
-  //\r
-  // Avoid APs access invalid buff data which allocated by BootServices,\r
-  // so we will allocate reserved data for AP loop code.\r
-  //\r
+\r
   CpuMpData = GetCpuMpData ();\r
+  CpuMpData->SaveRestoreFlag = TRUE;\r
   CpuMpData->PmCodeSegment = GetProtectedModeCS ();\r
   CpuMpData->ApLoopMode = PcdGet8 (PcdCpuApLoopMode);\r
-  ReservedApLoopFunc = AllocateReservedCopyPool (\r
-                         CpuMpData->AddressMap.RelocateApLoopFuncSize,\r
-                         CpuMpData->AddressMap.RelocateApLoopFuncAddress\r
-                         );\r
-  WakeUpAP (CpuMpData, TRUE, 0, RelocateApLoop, ReservedApLoopFunc);\r
-  DEBUG ((DEBUG_INFO, "MpInitExitBootServicesCallback() done!\n"));\r
+  WakeUpAP (CpuMpData, TRUE, 0, RelocateApLoop, mReservedApLoopFunc);\r
+  DEBUG ((DEBUG_INFO, "%a() done!\n", __FUNCTION__));\r
 }\r
 \r
 /**\r
@@ -284,10 +287,42 @@ InitMpGlobalData (
   IN CPU_MP_DATA               *CpuMpData\r
   )\r
 {\r
-  EFI_STATUS     Status;\r
+  EFI_STATUS                 Status;\r
+  EFI_PHYSICAL_ADDRESS       Address;\r
 \r
   SaveCpuMpData (CpuMpData);\r
 \r
+  if (CpuMpData->CpuCount == 1) {\r
+    //\r
+    // If only BSP exists, return\r
+    //\r
+    return;\r
+  }\r
+\r
+  //\r
+  // Avoid APs access invalid buffer data which allocated by BootServices,\r
+  // so we will allocate reserved data for AP loop code. We also need to\r
+  // allocate this buffer below 4GB due to APs may be transferred to 32bit\r
+  // protected mode on long mode DXE.\r
+  // Allocating it in advance since memory services are not available in\r
+  // Exit Boot Services callback function.\r
+  //\r
+  Address = BASE_4GB - 1;\r
+  Status  = gBS->AllocatePages (\r
+                   AllocateMaxAddress,\r
+                   EfiReservedMemoryType,\r
+                   EFI_SIZE_TO_PAGES (sizeof (CpuMpData->AddressMap.RelocateApLoopFuncSize)),\r
+                   &Address\r
+                   );\r
+  ASSERT_EFI_ERROR (Status);\r
+  mReservedApLoopFunc = (VOID *) (UINTN) Address;\r
+  ASSERT (mReservedApLoopFunc != NULL);\r
+  CopyMem (\r
+    mReservedApLoopFunc,\r
+    CpuMpData->AddressMap.RelocateApLoopFuncAddress,\r
+    CpuMpData->AddressMap.RelocateApLoopFuncSize\r
+    );\r
+\r
   Status = gBS->CreateEvent (\r
                   EVT_TIMER | EVT_NOTIFY_SIGNAL,\r
                   TPL_NOTIFY,\r
@@ -306,14 +341,25 @@ InitMpGlobalData (
                   AP_CHECK_INTERVAL\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
+\r
   Status = gBS->CreateEvent (\r
                   EVT_SIGNAL_EXIT_BOOT_SERVICES,\r
                   TPL_CALLBACK,\r
-                  MpInitExitBootServicesCallback,\r
+                  MpInitChangeApLoopCallback,\r
                   NULL,\r
                   &mMpInitExitBootServicesEvent\r
                   );\r
   ASSERT_EFI_ERROR (Status);\r
+\r
+  Status = gBS->CreateEventEx (\r
+                  EVT_NOTIFY_SIGNAL,\r
+                  TPL_CALLBACK,\r
+                  MpInitChangeApLoopCallback,\r
+                  NULL,\r
+                  &gEfiEventLegacyBootGuid,\r
+                  &mLegacyBootEvent\r
+                  );\r
+  ASSERT_EFI_ERROR (Status);\r
 }\r
 \r
 /**\r