UefiCpuPkg MpInitLib: Save/restore original WakeupBuffer for DxeMpLib

Current code always allocates/frees < 1MB WakeupBuffer for DxeMpLib
until ExitBootService, but the allocation may be failed at late
phase of the boot.

This patch is to always save/restore original WakeupBuffer for
DxeMpLib.

Sync from edk2 master: a6b3d753f98118ee547ae935b347f4f00fa67e7c

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Guo Mang <mang.guo@intel.com>

4 files changed, 111 insertions, 172 deletions

diff --git a/Core/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
index b393244e05..8099ee6888 100644
--- a/Core/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/DxeMpLib.c
@@ -1,7 +1,7 @@
 /** @file

   MP initialize support functions for DXE phase.

 

-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -75,72 +75,41 @@ SaveCpuMpData (
 }

 

 /**

-  Allocate reset vector buffer.

+  Get available system memory below 1MB by specified size.

 

-  @param[in, out]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-AllocateResetVector (

-  IN OUT CPU_MP_DATA          *CpuMpData

-  )

-{

-  EFI_STATUS            Status;

-  UINTN                 ApResetVectorSize;

-  EFI_PHYSICAL_ADDRESS  StartAddress;

+  @param[in] WakeupBufferSize   Wakeup buffer size required

 

-  if (CpuMpData->SaveRestoreFlag) {

-    BackupAndPrepareWakeupBuffer (CpuMpData);

-  } else {

-    ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +

-                        sizeof (MP_CPU_EXCHANGE_INFO);

-

-    StartAddress = BASE_1MB;

-    Status = gBS->AllocatePages (

-                    AllocateMaxAddress,

-                    EfiACPIMemoryNVS,

-                    EFI_SIZE_TO_PAGES (ApResetVectorSize),

-                    &StartAddress

-                    );

-    ASSERT_EFI_ERROR (Status);

-

-    CpuMpData->WakeupBuffer      = (UINTN) StartAddress;

-    CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)

-                  (CpuMpData->WakeupBuffer + CpuMpData->AddressMap.RendezvousFunnelSize);

-    //

-    // copy AP reset code in it

-    //

-    CopyMem (

-      (VOID *) CpuMpData->WakeupBuffer,

-      (VOID *) CpuMpData->AddressMap.RendezvousFunnelAddress,

-      CpuMpData->AddressMap.RendezvousFunnelSize

-      );

-  }

-}

-

-/**

-  Free AP reset vector buffer.

-

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

+  @retval other   Return wakeup buffer address below 1MB.

+  @retval -1      Cannot find free memory below 1MB.

 **/

-VOID

-FreeResetVector (

-  IN CPU_MP_DATA              *CpuMpData

+UINTN

+GetWakeupBuffer (

+  IN UINTN                WakeupBufferSize

   )

 {

-  EFI_STATUS            Status;

-  UINTN                 ApResetVectorSize;

-

-  if (CpuMpData->SaveRestoreFlag) {

-    RestoreWakeupBuffer (CpuMpData);

-  } else {

-    ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +

-                        sizeof (MP_CPU_EXCHANGE_INFO);

+  EFI_STATUS              Status;

+  EFI_PHYSICAL_ADDRESS    StartAddress;

+

+  StartAddress = BASE_1MB;

+  Status = gBS->AllocatePages (

+                  AllocateMaxAddress,

+                  EfiBootServicesData,

+                  EFI_SIZE_TO_PAGES (WakeupBufferSize),

+                  &StartAddress

+                  );

+  ASSERT_EFI_ERROR (Status);

+  if (!EFI_ERROR (Status)) {

     Status = gBS->FreePages(

-               (EFI_PHYSICAL_ADDRESS)CpuMpData->WakeupBuffer,

-               EFI_SIZE_TO_PAGES (ApResetVectorSize)

+               StartAddress,

+               EFI_SIZE_TO_PAGES (WakeupBufferSize)

                );

     ASSERT_EFI_ERROR (Status);

+    DEBUG ((DEBUG_INFO, "WakeupBufferStart = %x, WakeupBufferSize = %x\n",

+                        (UINTN) StartAddress, WakeupBufferSize));

+  } else {

+    StartAddress = (EFI_PHYSICAL_ADDRESS) -1;

   }

+  return (UINTN) StartAddress;

 }

 

 /**

@@ -299,7 +268,6 @@ MpInitChangeApLoopCallback (
   CPU_MP_DATA               *CpuMpData;

 

   CpuMpData = GetCpuMpData ();

-  CpuMpData->SaveRestoreFlag = TRUE;

   CpuMpData->PmCodeSegment = GetProtectedModeCS ();

   CpuMpData->ApLoopMode = PcdGet8 (PcdCpuApLoopMode);

   mNumberToFinish = CpuMpData->CpuCount - 1;

diff --git a/Core/UefiCpuPkg/Library/MpInitLib/MpLib.c b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.c
index df19b43bc0..2913844767 100644
--- a/Core/UefiCpuPkg/Library/MpInitLib/MpLib.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.c
@@ -1,7 +1,7 @@
 /** @file

   CPU MP Initialize Library common functions.

 

-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -794,7 +794,80 @@ TimedWaitForApFinish (
   IN UINT32                    FinishedApLimit,

   IN UINT32                    TimeLimit

   );

+/**

+  Get available system memory below 1MB by specified size.

+

+  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

+**/

+VOID

+BackupAndPrepareWakeupBuffer(

+  IN CPU_MP_DATA              *CpuMpData

+  )

+{

+  CopyMem (

+    (VOID *) CpuMpData->BackupBuffer,

+    (VOID *) CpuMpData->WakeupBuffer,

+    CpuMpData->BackupBufferSize

+    );

+  CopyMem (

+    (VOID *) CpuMpData->WakeupBuffer,

+    (VOID *) CpuMpData->AddressMap.RendezvousFunnelAddress,

+    CpuMpData->AddressMap.RendezvousFunnelSize

+    );

+}

+

+/**

+  Restore wakeup buffer data.

+

+  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

+**/

+VOID

+RestoreWakeupBuffer(

+  IN CPU_MP_DATA              *CpuMpData

+  )

+{

+  CopyMem (

+    (VOID *) CpuMpData->WakeupBuffer,

+    (VOID *) CpuMpData->BackupBuffer,

+    CpuMpData->BackupBufferSize

+    );

+}

+

+/**

+  Allocate reset vector buffer.

+

+  @param[in, out]  CpuMpData  The pointer to CPU MP Data structure.

+**/

+VOID

+AllocateResetVector (

+  IN OUT CPU_MP_DATA          *CpuMpData

+  )

+{

+  UINTN           ApResetVectorSize;

+

+  if (CpuMpData->WakeupBuffer == (UINTN) -1) {

+    ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +

+                          sizeof (MP_CPU_EXCHANGE_INFO);

+

+    CpuMpData->WakeupBuffer      = GetWakeupBuffer (ApResetVectorSize);

+    CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)

+                    (CpuMpData->WakeupBuffer + CpuMpData->AddressMap.RendezvousFunnelSize);

+  }

+  BackupAndPrepareWakeupBuffer (CpuMpData);

+}

+

+/**

+  Free AP reset vector buffer.

 

+  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

+**/

+VOID

+FreeResetVector (

+  IN CPU_MP_DATA              *CpuMpData

+  )

+{

+  RestoreWakeupBuffer (CpuMpData);

+}

 /**

   This function will be called by BSP to wakeup AP.

 

@@ -1353,7 +1426,6 @@ MpInitLibInitialize (
   CpuMpData->CpuApStackSize   = ApStackSize;

   CpuMpData->BackupBuffer     = BackupBufferAddr;

   CpuMpData->BackupBufferSize = ApResetVectorSize;

-  CpuMpData->SaveRestoreFlag  = FALSE;

   CpuMpData->WakeupBuffer     = (UINTN) -1;

   CpuMpData->CpuCount         = 1;

   CpuMpData->BspNumber        = 0;

@@ -2120,41 +2192,3 @@ GetCpuMpDataFromGuidedHob (
   return CpuMpData;

 }

 

-/**

-  Get available system memory below 1MB by specified size.

-

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-BackupAndPrepareWakeupBuffer(

-  IN CPU_MP_DATA              *CpuMpData

-  )

-{

-  CopyMem (

-    (VOID *) CpuMpData->BackupBuffer,

-    (VOID *) CpuMpData->WakeupBuffer,

-    CpuMpData->BackupBufferSize

-    );

-  CopyMem (

-    (VOID *) CpuMpData->WakeupBuffer,

-    (VOID *) CpuMpData->AddressMap.RendezvousFunnelAddress,

-    CpuMpData->AddressMap.RendezvousFunnelSize

-    );

-}

-

-/**

-  Restore wakeup buffer data.

-

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-RestoreWakeupBuffer(

-  IN CPU_MP_DATA              *CpuMpData

-  )

-{

-  CopyMem (

-    (VOID *) CpuMpData->WakeupBuffer,

-    (VOID *) CpuMpData->BackupBuffer,

-    CpuMpData->BackupBufferSize

-    );

-}

diff --git a/Core/UefiCpuPkg/Library/MpInitLib/MpLib.h b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.h
index ea56412cbc..ff0479655d 100644
--- a/Core/UefiCpuPkg/Library/MpInitLib/MpLib.h
+++ b/Core/UefiCpuPkg/Library/MpInitLib/MpLib.h
@@ -1,7 +1,7 @@
 /** @file

   Common header file for MP Initialize Library.

 

-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -201,7 +201,6 @@ struct _CPU_MP_DATA {
   UINTN                          WakeupBuffer;

   UINTN                          BackupBuffer;

   UINTN                          BackupBufferSize;

-  BOOLEAN                        SaveRestoreFlag;

 

   volatile UINT32                StartCount;

   volatile UINT32                FinishedCount;

@@ -310,24 +309,18 @@ SaveCpuMpData (
   IN CPU_MP_DATA   *CpuMpData

   );

 

-/**

-  Allocate reset vector buffer.

-

-  @param[in, out]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-AllocateResetVector (

-  IN OUT CPU_MP_DATA          *CpuMpData

-  );

 

 /**

-  Free AP reset vector buffer.

+  Get available system memory below 1MB by specified size.

 

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

+  @param[in] WakeupBufferSize   Wakeup buffer size required

+

+  @retval other   Return wakeup buffer address below 1MB.

+  @retval -1      Cannot find free memory below 1MB.

 **/

-VOID

-FreeResetVector (

-  IN CPU_MP_DATA              *CpuMpData

+UINTN

+GetWakeupBuffer (

+  IN UINTN                WakeupBufferSize

   );

 

 /**

@@ -543,26 +536,6 @@ IsMwaitSupport (
   );

 

 /**

-  Get available system memory below 1MB by specified size.

-

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-BackupAndPrepareWakeupBuffer(

-  IN CPU_MP_DATA              *CpuMpData

-  );

-

-/**

-  Restore wakeup buffer data.

-

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-RestoreWakeupBuffer(

-  IN CPU_MP_DATA              *CpuMpData

-  );

-

-/**

   Enable Debug Agent to support source debugging on AP function.

 

 **/

diff --git a/Core/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
index 9ee5aca57b..7ce5f723b1 100644
--- a/Core/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
+++ b/Core/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
@@ -1,7 +1,7 @@
 /** @file

   MP initialize support functions for PEI phase.

 

-  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>

+  Copyright (c) 2016 - 2018, Intel Corporation. All rights reserved.<BR>

   This program and the accompanying materials

   are licensed and made available under the terms and conditions of the BSD License

   which accompanies this distribution.  The full text of the license may be found at

@@ -188,42 +188,6 @@ GetWakeupBuffer (
 }

 

 /**

-  Allocate reset vector buffer.

-

-  @param[in, out]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-AllocateResetVector (

-  IN OUT CPU_MP_DATA          *CpuMpData

-  )

-{

-  UINTN           ApResetVectorSize;

-

-  if (CpuMpData->WakeupBuffer == (UINTN) -1) {

-    ApResetVectorSize = CpuMpData->AddressMap.RendezvousFunnelSize +

-                          sizeof (MP_CPU_EXCHANGE_INFO);

-

-    CpuMpData->WakeupBuffer      = GetWakeupBuffer (ApResetVectorSize);

-    CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)

-                    (CpuMpData->WakeupBuffer + CpuMpData->AddressMap.RendezvousFunnelSize);

-  }

-  BackupAndPrepareWakeupBuffer (CpuMpData);

-}

-

-/**

-  Free AP reset vector buffer.

-

-  @param[in]  CpuMpData  The pointer to CPU MP Data structure.

-**/

-VOID

-FreeResetVector (

-  IN CPU_MP_DATA              *CpuMpData

-  )

-{

-  RestoreWakeupBuffer (CpuMpData);

-}

-

-/**

   Checks APs status and updates APs status if needed.

 

 **/