UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / IntelFsp2Pkg / FspSecCore / SecFsp.c

diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c b/IntelFsp2Pkg/FspSecCore/SecFsp.c
index ae03fa228e7b01276fe67ed61144501cfe5e3fd2..11be1f97ca1560965bfa04f4c30059f84d5b3298 100644 (file)
--- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
+++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
@@ -1,6 +1,6 @@
 /** @file\r
 \r
-  Copyright (c) 2014 - 2020, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2014 - 2022, Intel Corporation. All rights reserved.<BR>\r
   SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
@@ -16,19 +16,20 @@
   @return                     FSP specific IDT gate descriptor.\r
 \r
 **/\r
-UINT64\r
+IA32_IDT_GATE_DESCRIPTOR\r
 FspGetExceptionHandler (\r
   IN  UINT64  IdtEntryTemplate\r
   )\r
 {\r
   UINT32                    Entry;\r
-  UINT64                    ExceptionHandler;\r
+  IA32_IDT_GATE_DESCRIPTOR  ExceptionHandler;\r
   IA32_IDT_GATE_DESCRIPTOR  *IdtGateDescriptor;\r
   FSP_INFO_HEADER           *FspInfoHeader;\r
 \r
-  FspInfoHeader                      = (FSP_INFO_HEADER *)AsmGetFspInfoHeader ();\r
-  ExceptionHandler                   = IdtEntryTemplate;\r
-  IdtGateDescriptor                  = (IA32_IDT_GATE_DESCRIPTOR *)&ExceptionHandler;\r
+  ZeroMem ((VOID *)&ExceptionHandler, sizeof (IA32_IDT_GATE_DESCRIPTOR));\r
+  FspInfoHeader                      = (FSP_INFO_HEADER *)(UINTN)AsmGetFspInfoHeader ();\r
+  *(UINT64 *) &ExceptionHandler      = IdtEntryTemplate;\r
+  IdtGateDescriptor                  = &ExceptionHandler;\r
   Entry                              = (IdtGateDescriptor->Bits.OffsetHigh << 16) | IdtGateDescriptor->Bits.OffsetLow;\r
   Entry                              = FspInfoHeader->ImageBase + FspInfoHeader->ImageSize - (~Entry + 1);\r
   IdtGateDescriptor->Bits.OffsetHigh = (UINT16)(Entry >> 16);\r
@@ -115,7 +116,7 @@ SecGetPlatformData (
 VOID\r
 FspGlobalDataInit (\r
   IN OUT  FSP_GLOBAL_DATA  *PeiFspData,\r
-  IN UINT32                BootLoaderStack,\r
+  IN UINTN                 BootLoaderStack,\r
   IN UINT8                 ApiIdx\r
   )\r
 {\r
@@ -130,10 +131,14 @@ FspGlobalDataInit (
   ZeroMem ((VOID *)PeiFspData, sizeof (FSP_GLOBAL_DATA));\r
 \r
   PeiFspData->Signature = FSP_GLOBAL_DATA_SIGNATURE;\r
-  PeiFspData->Version   = 0;\r
+  PeiFspData->Version   = FSP_GLOBAL_DATA_VERSION;\r
   PeiFspData->CoreStack = BootLoaderStack;\r
   PeiFspData->PerfIdx   = 2;\r
   PeiFspData->PerfSig   = FSP_PERFORMANCE_DATA_SIGNATURE;\r
+  //\r
+  // Cache FspHobList pointer passed by bootloader via ApiParameter2\r
+  //\r
+  PeiFspData->FspHobListPtr = (VOID **)GetFspApiParameter2 ();\r
 \r
   SetFspMeasurePoint (FSP_PERF_ID_API_FSP_MEMORY_INIT_ENTRY);\r
 \r
@@ -141,7 +146,7 @@ FspGlobalDataInit (
   // Get FSP Header offset\r
   // It may have multiple FVs, so look into the last one for FSP header\r
   //\r
-  PeiFspData->FspInfoHeader = (FSP_INFO_HEADER *)AsmGetFspInfoHeader ();\r
+  PeiFspData->FspInfoHeader = (FSP_INFO_HEADER *)(UINTN)AsmGetFspInfoHeader ();\r
   SecGetPlatformData (PeiFspData);\r
 \r
   //\r
@@ -154,7 +159,7 @@ FspGlobalDataInit (
   //\r
   FspmUpdDataPtr = (VOID *)GetFspApiParameter ();\r
   if (FspmUpdDataPtr == NULL) {\r
-    FspmUpdDataPtr = (VOID *)(PeiFspData->FspInfoHeader->ImageBase + PeiFspData->FspInfoHeader->CfgRegionOffset);\r
+    FspmUpdDataPtr = (VOID *)(UINTN)(PeiFspData->FspInfoHeader->ImageBase + PeiFspData->FspInfoHeader->CfgRegionOffset);\r
   }\r
 \r
   SetFspUpdDataPointer (FspmUpdDataPtr);\r
@@ -199,8 +204,12 @@ FspGlobalDataInit (
     ImageId, \\r
     (PeiFspData->FspInfoHeader->ImageRevision >> 24) & 0xFF, \\r
     (PeiFspData->FspInfoHeader->ImageRevision >> 16) & 0xFF, \\r
-    (PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF, \\r
-    PeiFspData->FspInfoHeader->ImageRevision & 0xFF\r
+    (PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \\r
+    (((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF) | (PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF00)) : \\r
+    ((PeiFspData->FspInfoHeader->ImageRevision >> 8) & 0xFF), \\r
+    (PeiFspData->FspInfoHeader->HeaderRevision >= 6) ? \\r
+    ((PeiFspData->FspInfoHeader->ImageRevision & 0xFF) | ((PeiFspData->FspInfoHeader->ExtendedImageRevision & 0xFF) << 8)) : \\r
+    (PeiFspData->FspInfoHeader->ImageRevision & 0xFF)\r
     ));\r
 }\r
 \r
@@ -213,7 +222,7 @@ FspGlobalDataInit (
 **/\r
 VOID\r
 FspDataPointerFixUp (\r
-  IN UINT32  OffsetGap\r
+  IN UINTN  OffsetGap\r
   )\r
 {\r
   FSP_GLOBAL_DATA  *NewFspData;\r