DynamicTablesPkg: GTDT updates for ACPI 6.3

[mirror_edk2.git] / IntelFspPkg / Library / BaseFspPlatformLib / FspPlatformMemory.c

diff --git a/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformMemory.c b/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
index 2f1c0b14e53b588c45e914fd44782b05de07f71d..84124654869f02b0b0a70fc639ae61936c3e423b 100644 (file)
--- a/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
+++ b/IntelFspPkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
@@ -1,19 +1,14 @@
 /** @file\r
 \r
-  Copyright (c) 2014, 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
-  http://opensource.org/licenses/bsd-license.php.\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  Copyright (c) 2014 - 2015, Intel Corporation. All rights reserved.<BR>\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 \r
 #include <PiPei.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/BaseMemoryLib.h>\r
+#include <Library/MemoryAllocationLib.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 #include <Library/HobLib.h>\r
@@ -67,7 +62,7 @@ FspGetSystemMemorySize (
 }\r
 \r
 /**\r
-  Migrate bootloader data before destroying CAR.\r
+  Migrate BootLoader data before destroying CAR.\r
 \r
 **/\r
 VOID\r
@@ -76,20 +71,25 @@ FspMigrateTemporaryMemory (
   VOID\r
  )\r
 {\r
-  FSP_INIT_RT_COMMON_BUFFER  *FspInitRtBuffer;\r
-  UINT32             BootLoaderTempRamStart;\r
-  UINT32             BootLoaderTempRamEnd;\r
-  UINT32             BootLoaderTempRamSize;\r
-  UINT32             OffsetGap;\r
-  UINT32             FspParamPtr;\r
-  FSP_INIT_PARAMS   *FspInitParams;\r
-  UINT32            *NewStackTop;\r
-  VOID              *BootLoaderTempRamHob;\r
-  VOID              *UpdDataRgnPtr;\r
-  VOID              *PlatformDataPtr;\r
-\r
-  //\r
-  // Get the temporary memory range used by the bootloader\r
+  FSP_INIT_RT_COMMON_BUFFER *FspInitRtBuffer;\r
+  UINT32                    BootLoaderTempRamStart;\r
+  UINT32                    BootLoaderTempRamEnd;\r
+  UINT32                    BootLoaderTempRamSize;\r
+  UINT32                    OffsetGap;\r
+  UINT32                    FspParamPtr;\r
+  FSP_INIT_PARAMS           *FspInitParams;\r
+  UINT32                    *NewStackTop;\r
+  VOID                      *BootLoaderTempRamHob;\r
+  UINT32                    UpdDataRgnPtr;\r
+  UINT32                    MemoryInitUpdPtr;\r
+  UINT32                    SiliconInitUpdPtr;\r
+  VOID                      *PlatformDataPtr;\r
+  UINT8                      ApiMode;\r
+    \r
+  ApiMode = GetFspApiCallingMode ();\r
+\r
+  //\r
+  // Get the temporary memory range used by the BootLoader\r
   //\r
   BootLoaderTempRamStart = PcdGet32(PcdTemporaryRamBase);\r
   BootLoaderTempRamSize  = PcdGet32(PcdTemporaryRamSize) - PcdGet32(PcdFspTemporaryRamSize);\r
@@ -98,17 +98,25 @@ FspMigrateTemporaryMemory (
   //\r
   // Build a Boot Loader Temporary Memory GUID HOB\r
   //\r
-  BootLoaderTempRamHob = BuildGuidHob (&gFspBootLoaderTemporaryMemoryGuid, BootLoaderTempRamSize);\r
+  if (ApiMode == 0) {\r
+    BootLoaderTempRamHob = BuildGuidHob (&gFspBootLoaderTemporaryMemoryGuid, BootLoaderTempRamSize);\r
+  } else {\r
+    BootLoaderTempRamHob = (VOID *)AllocatePages (EFI_SIZE_TO_PAGES (BootLoaderTempRamSize));\r
+  }\r
+  ASSERT(BootLoaderTempRamHob != NULL);\r
+\r
   CopyMem (BootLoaderTempRamHob, (VOID *)BootLoaderTempRamStart, BootLoaderTempRamSize);\r
   OffsetGap = (UINT32)BootLoaderTempRamHob - BootLoaderTempRamStart;\r
 \r
   //\r
   // Set a new stack frame for the continuation function\r
   //\r
-  FspInitParams   = (FSP_INIT_PARAMS *)GetFspApiParameter ();\r
-  FspInitRtBuffer = (FSP_INIT_RT_COMMON_BUFFER *)FspInitParams->RtBufferPtr;\r
-  NewStackTop     = (UINT32 *)FspInitRtBuffer->StackTop - 1;\r
-  SetFspCoreStackPointer (NewStackTop);\r
+  if (ApiMode == 0) {\r
+    FspInitParams   = (FSP_INIT_PARAMS *)GetFspApiParameter ();\r
+    FspInitRtBuffer = (FSP_INIT_RT_COMMON_BUFFER *)FspInitParams->RtBufferPtr;\r
+    NewStackTop     = (UINT32 *)FspInitRtBuffer->StackTop - 1;\r
+    SetFspCoreStackPointer (NewStackTop);\r
+  }\r
 \r
   //\r
   // Fix the FspInit Parameter Pointers to the new location.\r
@@ -138,9 +146,20 @@ FspMigrateTemporaryMemory (
   //\r
   // Update UPD pointer in FSP Global Data\r
   //\r
-  UpdDataRgnPtr = ((FSP_INIT_RT_COMMON_BUFFER *)FspInitParams->RtBufferPtr)->UpdDataRgnPtr;\r
-  if (UpdDataRgnPtr != NULL) {\r
-    SetFspUpdDataPointer (UpdDataRgnPtr);\r
+  if (ApiMode == 0) {\r
+    UpdDataRgnPtr = (UINT32)((UINT32 *)GetFspUpdDataPointer ());\r
+    if (UpdDataRgnPtr >= BootLoaderTempRamStart && UpdDataRgnPtr < BootLoaderTempRamEnd) {\r
+      MemoryInitUpdPtr = (UINT32)((UINT32 *)GetFspMemoryInitUpdDataPointer ());\r
+      SiliconInitUpdPtr = (UINT32)((UINT32 *)GetFspSiliconInitUpdDataPointer ());\r
+      SetFspUpdDataPointer ((VOID *)(UpdDataRgnPtr + OffsetGap));\r
+      SetFspMemoryInitUpdDataPointer ((VOID *)(MemoryInitUpdPtr + OffsetGap));\r
+      SetFspSiliconInitUpdDataPointer ((VOID *)(SiliconInitUpdPtr + OffsetGap));\r
+    }\r
+  } else {\r
+    MemoryInitUpdPtr = (UINT32)((UINT32 *)GetFspMemoryInitUpdDataPointer ());\r
+    if (MemoryInitUpdPtr >= BootLoaderTempRamStart && MemoryInitUpdPtr < BootLoaderTempRamEnd) {\r
+      SetFspMemoryInitUpdDataPointer ((VOID *)(MemoryInitUpdPtr + OffsetGap));\r
+    }\r
   }\r
 \r
   //\r
@@ -151,5 +170,4 @@ FspMigrateTemporaryMemory (
       ((UINT32)PlatformDataPtr <  BootLoaderTempRamEnd)) {\r
     SetFspPlatformDataPointer ((UINT8 *)PlatformDataPtr + OffsetGap);\r
   }\r
-\r
 }\r