Add IntelFsp2Pkg and IntelFsp2WrapperPkg.
Add FSP2.0 support. This series of patch is to support FSP2.0 specification at https://firmware.intel.com/sites/default/files/FSP_EAS_v2.0_Draft%20External.pdf Some major updates include: 1) One FSP binary is separated to multiple components: FSP-T, FSP-M, FSP-S, and optional FSP-O. Each component has its own configuration data region. 2) All FSP-APIs use same UPD format - FSP_UPD_HEADER. 3) Add EnumInitPhaseEndOfFirmware notifyphase. 4) FSP1.1/FSP1.0 compatibility is NOT maintained. 5) We also add rename Fsp* to FspWrapper* in IntelFsp2WrapperPkg, to indicate that it is for FspWrapper only. IntelFspPkg and IntelFspWrapperPkg will be deprecated. The new Intel platform will follow FSP2.0 and use IntelFsp2Pkg and IntelFsp2WrapperPkg. The old platform can still use IntelFspPkg and IntelFspWrapperPkg for compatibility consideration. Cc: Giri P Mudusuru <giri.p.mudusuru@intel.com> Cc: Maurice Ma <maurice.ma@intel.com> Cc: Ravi P Rangarajan <ravi.p.rangarajan@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Jiewen Yao <jiewen.yao@intel.com> Reviewed-by: Giri P Mudusuru <giri.p.mudusuru@intel.com> Reviewed-by: Maurice Ma <maurice.ma@intel.com> Reviewed-by: Ravi P Rangarajan <ravi.p.rangarajan@intel.com>
This commit is contained in:
Jiewen Yao
161
IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c
Normal file
161
IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.c
Normal file
@@ -0,0 +1,161 @@
|
||||
/** @file
|
||||
This will be invoked only once. It will call FspMemoryInit API,
|
||||
register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi
|
||||
notify to call FspSiliconInit API.
|
||||
|
||||
Copyright (c) 2014 - 2016, 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
|
||||
http://opensource.org/licenses/bsd-license.php.
|
||||
|
||||
THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
|
||||
**/
|
||||
|
||||
|
||||
#include <PiPei.h>
|
||||
|
||||
#include <Library/PeimEntryPoint.h>
|
||||
#include <Library/PeiServicesLib.h>
|
||||
#include <Library/PeiServicesTablePointerLib.h>
|
||||
#include <Library/BaseLib.h>
|
||||
#include <Library/DebugLib.h>
|
||||
#include <Library/BaseMemoryLib.h>
|
||||
#include <Library/MemoryAllocationLib.h>
|
||||
#include <Library/HobLib.h>
|
||||
#include <Library/PcdLib.h>
|
||||
#include <Library/TimerLib.h>
|
||||
#include <Library/PerformanceLib.h>
|
||||
#include <Library/FspWrapperPlatformLib.h>
|
||||
#include <Library/FspWrapperHobProcessLib.h>
|
||||
#include <Library/FspWrapperApiLib.h>
|
||||
|
||||
#include <Ppi/FspSiliconInitDone.h>
|
||||
#include <Ppi/EndOfPeiPhase.h>
|
||||
#include <Ppi/MemoryDiscovered.h>
|
||||
#include <Ppi/SecPlatformInformation.h>
|
||||
#include <Library/PlatformSecLib.h>
|
||||
#include <Library/FspWrapperApiTestLib.h>
|
||||
#include <FspEas.h>
|
||||
|
||||
extern EFI_GUID gFspHobGuid;
|
||||
|
||||
/**
|
||||
Call FspMemoryInit API.
|
||||
|
||||
@return Status returned by FspMemoryInit API.
|
||||
**/
|
||||
EFI_STATUS
|
||||
PeiFspMemoryInit (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
FSP_INFO_HEADER *FspmHeaderPtr;
|
||||
EFI_STATUS Status;
|
||||
UINT64 TimeStampCounterStart;
|
||||
VOID *FspHobListPtr;
|
||||
VOID *HobData;
|
||||
FSPM_UPD_COMMON *FspmUpdDataPtr;
|
||||
UINTN *SourceData;
|
||||
|
||||
DEBUG ((DEBUG_INFO, "PeiFspMemoryInit enter\n"));
|
||||
|
||||
FspHobListPtr = NULL;
|
||||
|
||||
//
|
||||
// Copy default FSP-M UPD data from Flash
|
||||
//
|
||||
FspmHeaderPtr = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
|
||||
FspmUpdDataPtr = (FSPM_UPD_COMMON *)AllocateZeroPool ((UINTN)FspmHeaderPtr->CfgRegionSize);
|
||||
ASSERT (FspmUpdDataPtr != NULL);
|
||||
SourceData = (UINTN *)((UINTN)FspmHeaderPtr->ImageBase + (UINTN)FspmHeaderPtr->CfgRegionOffset);
|
||||
CopyMem (FspmUpdDataPtr, SourceData, (UINTN)FspmHeaderPtr->CfgRegionSize);
|
||||
|
||||
DEBUG ((DEBUG_INFO, "FspWrapperPlatformInitPreMem enter\n"));
|
||||
UpdateFspmUpdData ((VOID *)FspmUpdDataPtr);
|
||||
DEBUG ((DEBUG_INFO, " NvsBufferPtr - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.NvsBufferPtr));
|
||||
DEBUG ((DEBUG_INFO, " StackBase - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.StackBase));
|
||||
DEBUG ((DEBUG_INFO, " StackSize - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.StackSize));
|
||||
DEBUG ((DEBUG_INFO, " BootLoaderTolumSize - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.BootLoaderTolumSize));
|
||||
DEBUG ((DEBUG_INFO, " BootMode - 0x%x\n", FspmUpdDataPtr->FspmArchUpd.BootMode));
|
||||
DEBUG ((DEBUG_INFO, " HobListPtr - 0x%x\n", &FspHobListPtr));
|
||||
|
||||
TimeStampCounterStart = AsmReadTsc ();
|
||||
Status = CallFspMemoryInit (FspmUpdDataPtr, &FspHobListPtr);
|
||||
// Create hobs after memory initialization and not in temp RAM. Hence passing the recorded timestamp here
|
||||
PERF_START_EX(&gFspApiPerformanceGuid, "EventRec", NULL, TimeStampCounterStart, 0xD000);
|
||||
PERF_END_EX(&gFspApiPerformanceGuid, "EventRec", NULL, 0, 0xD07F);
|
||||
DEBUG ((DEBUG_INFO, "Total time spent executing FspMemoryInitApi: %d millisecond\n", DivU64x32 (GetTimeInNanoSecond (AsmReadTsc () - TimeStampCounterStart), 1000000)));
|
||||
if (EFI_ERROR(Status)) {
|
||||
DEBUG ((DEBUG_ERROR, "ERROR - Failed to execute FspMemoryInitApi(), Status = %r\n", Status));
|
||||
}
|
||||
DEBUG((DEBUG_INFO, "FspMemoryInit status: 0x%x\n", Status));
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
|
||||
Status = TestFspMemoryInitApiOutput (FspmUpdDataPtr, &FspHobListPtr);
|
||||
if (EFI_ERROR (Status)) {
|
||||
DEBUG ((DEBUG_ERROR, "ERROR - TestFspMemoryInitApiOutput () fail, Status = %r\n", Status));
|
||||
}
|
||||
|
||||
DEBUG ((DEBUG_INFO, " FspHobListPtr (returned) - 0x%x\n", FspHobListPtr));
|
||||
ASSERT (FspHobListPtr != NULL);
|
||||
|
||||
PostFspmHobProcess (FspHobListPtr);
|
||||
|
||||
//
|
||||
// FspHobList is not complete at this moment.
|
||||
// Save FspHobList pointer to hob, so that it can be got later
|
||||
//
|
||||
HobData = BuildGuidHob (
|
||||
&gFspHobGuid,
|
||||
sizeof (VOID *)
|
||||
);
|
||||
ASSERT (HobData != NULL);
|
||||
CopyMem (HobData, &FspHobListPtr, sizeof (FspHobListPtr));
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
||||
/**
|
||||
Do FSP initialization.
|
||||
|
||||
@return FSP initialization status.
|
||||
**/
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
FspmWrapperInit (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
|
||||
Status = PeiFspMemoryInit ();
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
|
||||
return Status;
|
||||
}
|
||||
|
||||
/**
|
||||
This is the entrypoint of PEIM
|
||||
|
||||
@param[in] FileHandle Handle of the file being invoked.
|
||||
@param[in] PeiServices Describes the list of possible PEI Services.
|
||||
|
||||
@retval EFI_SUCCESS if it completed successfully.
|
||||
**/
|
||||
EFI_STATUS
|
||||
EFIAPI
|
||||
FspmWrapperPeimEntryPoint (
|
||||
IN EFI_PEI_FILE_HANDLE FileHandle,
|
||||
IN CONST EFI_PEI_SERVICES **PeiServices
|
||||
)
|
||||
{
|
||||
DEBUG((DEBUG_INFO, "FspmWrapperPeimEntryPoint\n"));
|
||||
|
||||
FspmWrapperInit ();
|
||||
|
||||
return EFI_SUCCESS;
|
||||
}
|
||||
77
IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
Normal file
77
IntelFsp2WrapperPkg/FspmWrapperPeim/FspmWrapperPeim.inf
Normal file
@@ -0,0 +1,77 @@
|
||||
## @file
|
||||
# FSP-M wrapper PEI Module
|
||||
#
|
||||
# This PEIM initialize FSP.
|
||||
# This will be invoked only once. It will call FspMemoryInit API,
|
||||
# register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi
|
||||
# notify to call FspSiliconInit API.
|
||||
#
|
||||
# Copyright (c) 2014 - 2016, 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
|
||||
# http://opensource.org/licenses/bsd-license.php.
|
||||
# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
|
||||
#
|
||||
##
|
||||
|
||||
[Defines]
|
||||
INF_VERSION = 0x00010017
|
||||
BASE_NAME = FspmWrapperPeim
|
||||
FILE_GUID = 9FAAD0FF-0E0C-4885-A738-BAB4E4FA1E66
|
||||
VERSION_STRING = 1.0
|
||||
MODULE_TYPE = PEIM
|
||||
ENTRY_POINT = FspmWrapperPeimEntryPoint
|
||||
|
||||
#
|
||||
# The following information is for reference only and not required by the build tools.
|
||||
#
|
||||
# VALID_ARCHITECTURES = IA32
|
||||
#
|
||||
|
||||
[LibraryClasses]
|
||||
PeimEntryPoint
|
||||
PeiServicesLib
|
||||
PeiServicesTablePointerLib
|
||||
BaseLib
|
||||
BaseMemoryLib
|
||||
MemoryAllocationLib
|
||||
DebugLib
|
||||
HobLib
|
||||
FspWrapperPlatformLib
|
||||
FspWrapperHobProcessLib
|
||||
DebugAgentLib
|
||||
UefiCpuLib
|
||||
PeCoffGetEntryPointLib
|
||||
PeCoffExtraActionLib
|
||||
PerformanceLib
|
||||
TimerLib
|
||||
FspWrapperApiLib
|
||||
FspWrapperApiTestLib
|
||||
|
||||
[Packages]
|
||||
MdePkg/MdePkg.dec
|
||||
MdeModulePkg/MdeModulePkg.dec
|
||||
UefiCpuPkg/UefiCpuPkg.dec
|
||||
IntelFsp2Pkg/IntelFsp2Pkg.dec
|
||||
IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dec
|
||||
|
||||
[Pcd]
|
||||
gFspWrapperTokenSpaceGuid.PcdFspmBaseAddress ## CONSUMES
|
||||
|
||||
[Sources]
|
||||
FspmWrapperPeim.c
|
||||
|
||||
[Ppis]
|
||||
gTopOfTemporaryRamPpiGuid ## PRODUCES
|
||||
gEfiEndOfPeiSignalPpiGuid ## PRODUCES
|
||||
gEfiPeiMemoryDiscoveredPpiGuid ## PRODUCES
|
||||
|
||||
[Guids]
|
||||
gFspHobGuid ## PRODUCES ## HOB
|
||||
gFspApiPerformanceGuid ## CONSUMES ## GUID
|
||||
|
||||
[Depex]
|
||||
gEfiPeiMasterBootModePpiGuid
|
||||
Reference in New Issue
Block a user