X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFspWrapperPkg%2FFspInitPei%2FFspInitPei.c;h=17a646836ab770e5426baf8201565c0b95e061f6;hp=823f1bbef8664cbf5efa87115772e4d4f8c05ac1;hb=d8043ce905a5832f911361ef30be28765afbdc6b;hpb=a33a2f62218e6e49a25d63474b7fe423d8ee4b71

diff --git a/IntelFspWrapperPkg/FspInitPei/FspInitPei.c b/IntelFspWrapperPkg/FspInitPei/FspInitPei.c
index 823f1bbef8..17a646836a 100644
--- a/IntelFspWrapperPkg/FspInitPei/FspInitPei.c
+++ b/IntelFspWrapperPkg/FspInitPei/FspInitPei.c
@@ -1,9 +1,7 @@
 /** @file
-  This PEIM will be invoked twice by pei core. In 1st entry, it will call FspInit API.
-  In 2nd entry, it will parse the hoblist from fsp and report them into pei core.
-  This file contains the main entrypoint of the PEIM.
+  This PEIM initialize FSP.
 
-  Copyright (c) 2014, Intel Corporation. All rights reserved.<BR>
+  Copyright (c) 2014 - 2015, 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
@@ -17,111 +15,6 @@
 
 #include "FspInitPei.h"
 
-/**
-  FSP Init continuation function.
-  Control will be returned to this callback function after FspInit API call.
-
-  @param[in] Status      Status of the FSP INIT API
-  @param[in] HobListPtr  Pointer to the HOB data structure defined in the PI specification.
-
-**/
-VOID
-ContinuationFunc (
-  IN FSP_STATUS Status,
-  IN VOID       *HobListPtr
-  )
-{
-  EFI_BOOT_MODE             BootMode;
-  UINT64                    StackSize;
-  EFI_PHYSICAL_ADDRESS      StackBase;
-
-  DEBUG ((DEBUG_INFO, "ContinuationFunc - %r\n", Status));
-  DEBUG ((DEBUG_INFO, "HobListPtr - 0x%x\n", HobListPtr));
-
-  if (Status != FSP_SUCCESS) {
-    CpuDeadLoop ();
-  }
-
-  //
-  // Can not call any PeiServices
-  //
-  BootMode = GetBootMode ();
-
-  GetStackInfo (BootMode, TRUE, &StackBase, &StackSize);
-  DEBUG ((DEBUG_INFO, "StackBase - 0x%x\n", StackBase));
-  DEBUG ((DEBUG_INFO, "StackSize - 0x%x\n", StackSize));
-  CallPeiCoreEntryPoint (
-    HobListPtr,
-    (VOID *)(UINTN)StackBase,
-    (VOID *)(UINTN)(StackBase + StackSize)
-    );
-}
-
-/**
-  Call FspInit API.
-
-  @param[in] FspHeader FSP header pointer.
-**/
-VOID
-SecFspInit (
-  IN FSP_INFO_HEADER *FspHeader
-  )
-{
-  FSP_INIT_PARAMS           FspInitParams;
-  FSP_INIT_RT_COMMON_BUFFER FspRtBuffer;
-  UINT8                     FspUpdRgn[FixedPcdGet32 (PcdMaxUpdRegionSize)];
-  UINT32                    UpdRegionSize;
-  EFI_BOOT_MODE             BootMode;
-  UINT64                    StackSize;
-  EFI_PHYSICAL_ADDRESS      StackBase;
-  FSP_STATUS                FspStatus;
-
-  DEBUG ((DEBUG_INFO, "SecFspInit enter\n"));
-
-  PeiServicesGetBootMode (&BootMode);
-  DEBUG ((DEBUG_INFO, "BootMode - 0x%x\n", BootMode));
-
-  GetStackInfo (BootMode, FALSE, &StackBase, &StackSize);
-  DEBUG ((DEBUG_INFO, "StackBase - 0x%x\n", StackBase));
-  DEBUG ((DEBUG_INFO, "StackSize - 0x%x\n", StackSize));
-
-  ZeroMem (&FspRtBuffer, sizeof(FspRtBuffer));
-  FspRtBuffer.StackTop = (UINT32 *)(UINTN)(StackBase + StackSize);
-
-  FspRtBuffer.BootMode = BootMode;
-
-  /* Platform override any UPD configs */
-  UpdRegionSize = GetUpdRegionSize();
-  DEBUG ((DEBUG_INFO, "UpdRegionSize - 0x%x\n", UpdRegionSize));
-  DEBUG ((DEBUG_INFO, "sizeof(FspUpdRgn) - 0x%x\n", sizeof(FspUpdRgn)));
-  ASSERT(sizeof(FspUpdRgn) >= UpdRegionSize);
-  ZeroMem (FspUpdRgn, UpdRegionSize);
-  FspRtBuffer.UpdDataRgnPtr = UpdateFspUpdConfigs (FspUpdRgn);
-
-  ZeroMem (&FspInitParams, sizeof(FspInitParams));
-  FspInitParams.NvsBufferPtr = GetNvsBuffer ();
-  DEBUG ((DEBUG_INFO, "NvsBufferPtr - 0x%x\n", FspInitParams.NvsBufferPtr));
-  FspInitParams.RtBufferPtr  = (VOID *)&FspRtBuffer;
-  FspInitParams.ContinuationFunc = (CONTINUATION_PROC)ContinuationFunc;
-
-  SaveSecContext (GetPeiServicesTablePointer ());
-
-  DEBUG ((DEBUG_INFO, "FspInitParams      - 0x%x\n", &FspInitParams));
-  DEBUG ((DEBUG_INFO, "  NvsBufferPtr     - 0x%x\n", FspInitParams.NvsBufferPtr));
-  DEBUG ((DEBUG_INFO, "  RtBufferPtr      - 0x%x\n", FspInitParams.RtBufferPtr));
-  DEBUG ((DEBUG_INFO, "    StackTop       - 0x%x\n", FspRtBuffer.StackTop));
-  DEBUG ((DEBUG_INFO, "    BootMode       - 0x%x\n", FspRtBuffer.BootMode));
-  DEBUG ((DEBUG_INFO, "    UpdDataRgnPtr  - 0x%x\n", FspRtBuffer.UpdDataRgnPtr));
-  DEBUG ((DEBUG_INFO, "  ContinuationFunc - 0x%x\n", FspInitParams.ContinuationFunc));
-
-  FspStatus = CallFspInit (FspHeader, &FspInitParams);
-  //
-  // Should never return
-  //
-  DEBUG((DEBUG_ERROR, "FSP Init failed, status: 0x%x\n", FspStatus));
-  CpuDeadLoop ();
-}
-
 /**
   This is the entrypoint of PEIM
 
@@ -138,50 +31,31 @@ FspPeiEntryPoint (
   )
 {
   FSP_INFO_HEADER      *FspHeader;
-  EFI_STATUS           Status;
-  FSP_INIT_DONE_PPI    *FspInitDone;
-  VOID                 *FspHobList;
-  EFI_BOOT_MODE        BootMode;
+  UINT8                PcdFspApiVersion;
 
   DEBUG ((DEBUG_INFO, "FspPeiEntryPoint\n"));
+  PcdFspApiVersion = 1;
 
-  Status = PeiServicesLocatePpi (
-             &gFspInitDonePpiGuid,
-             0,
-             NULL,
-             (VOID **) &FspInitDone
-             );
-  if (EFI_ERROR (Status)) {
-    //
-    // 1st entry
-    //
-    DEBUG ((DEBUG_INFO, "1st entry\n"));
-    FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase));
-    DEBUG ((DEBUG_INFO, "FspHeader - 0x%x\n", FspHeader));
-    if (FspHeader == NULL) {
-      return EFI_DEVICE_ERROR;
-    }
+  FspHeader = FspFindFspHeader (PcdGet32 (PcdFlashFvFspBase));
+  DEBUG ((DEBUG_INFO, "FspHeader - 0x%x\n", FspHeader));
+  if (FspHeader == NULL) {
+    return EFI_DEVICE_ERROR;
+  }
 
-    SecFspInit (FspHeader);
+  if ((PcdGet8 (PcdFspApiVersion) >= 2) &&
+      (FspHeader->HeaderRevision >= FSP_HEADER_REVISION_2) &&
+      (FspHeader->ApiEntryNum >= 6) &&
+      (FspHeader->FspMemoryInitEntryOffset != 0) &&
+      (FspHeader->TempRamExitEntryOffset != 0) &&
+      (FspHeader->FspSiliconInitEntryOffset != 0) ) {
+    PcdFspApiVersion = FSP_HEADER_REVISION_2;
+  }
+  DEBUG ((DEBUG_INFO, "PcdFspApiVersion - 0x%x\n", PcdFspApiVersion));
 
-    //
-    // Never return here
-    //
-    CpuDeadLoop ();
+  if (PcdFspApiVersion == FSP_HEADER_REVISION_1) {
+    PeiFspInitV1 (FspHeader);
   } else {
-    //
-    // 2nd entry
-    //
-    DEBUG ((DEBUG_INFO, "2nd entry\n"));
-    Status = FspInitDone->GetFspHobList (PeiServices, FspInitDone, &FspHobList);
-    DEBUG ((DEBUG_INFO, "FspHobList - 0x%x\n", FspHobList));
-    FspHobProcess (FspHobList);
-
-    PeiServicesGetBootMode (&BootMode);
-    if (BootMode == BOOT_ON_S3_RESUME) {
-      Status = PeiServicesNotifyPpi (&mS3EndOfPeiNotifyDesc);
-      ASSERT_EFI_ERROR (Status);
-    }
+    PeiFspInitV2 (FspHeader);
   }
 
   return EFI_SUCCESS;