UefiCpuPkg/MpInitLib: save/restore original contents

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

diff --git a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
index fb1d48fad848f6d3d36fef81e97e93cc55c1a01a..5ce5788125c4ce5a603ba19ee5e3abb54ea1a299 100644 (file)
--- a/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
+++ b/UefiCpuPkg/Library/MpInitLib/PeiMpLib.c
@@ -1,7 +1,7 @@
 /** @file\r
   MP initialize support functions for PEI phase.\r
 \r
-  Copyright (c) 2016, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2016 - 2017, Intel Corporation. All rights reserved.<BR>\r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
   which accompanies this distribution.  The full text of the license may be found at\r
@@ -129,10 +129,8 @@ CpuMpEndOfPeiCallback (
       }\r
       Hob.Raw = GET_NEXT_HOB (Hob);\r
     }\r
-  } else {\r
-    CpuMpData->SaveRestoreFlag = TRUE;\r
-    RestoreWakeupBuffer (CpuMpData);\r
   }\r
+\r
   return EFI_SUCCESS;\r
 }\r
 \r
@@ -286,12 +284,8 @@ AllocateResetVector (
     CpuMpData->WakeupBuffer      = GetWakeupBuffer (ApResetVectorSize);\r
     CpuMpData->MpCpuExchangeInfo = (MP_CPU_EXCHANGE_INFO *) (UINTN)\r
                     (CpuMpData->WakeupBuffer + CpuMpData->AddressMap.RendezvousFunnelSize);\r
-    BackupAndPrepareWakeupBuffer (CpuMpData);\r
-  }\r
-\r
-  if (CpuMpData->SaveRestoreFlag) {\r
-    BackupAndPrepareWakeupBuffer (CpuMpData);\r
   }\r
+  BackupAndPrepareWakeupBuffer (CpuMpData);\r
 }\r
 \r
 /**\r
@@ -304,9 +298,7 @@ FreeResetVector (
   IN CPU_MP_DATA              *CpuMpData\r
   )\r
 {\r
-  if (CpuMpData->SaveRestoreFlag) {\r
-    RestoreWakeupBuffer (CpuMpData);\r
-  }\r
+  RestoreWakeupBuffer (CpuMpData);\r
 }\r
 \r
 /**\r