REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1300
Provides PCD selection for FSP Wrapper to support Dispatch
mode. Also PcdFspmBaseAddress should support Dynamic for
recovery scenario (multiple FSP-M binary in flash)
Test: Verified on internal platform and both API and
DISPATCH modes booted successfully.
Cc: Jiewen Yao <Jiewen.yao@intel.com>
Cc: Desimone Nathaniel L <nathaniel.l.desimone@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Chasel Chiu <chasel.chiu@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
notify to call FspSiliconInit API.\r
\r
register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
notify to call FspSiliconInit API.\r
\r
- Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
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
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
FspHobListPtr = NULL;\r
FspmUpdDataPtr = NULL;\r
\r
FspHobListPtr = NULL;\r
FspmUpdDataPtr = NULL;\r
\r
- FspmHeaderPtr = (FSP_INFO_HEADER *)FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));\r
+ FspmHeaderPtr = (FSP_INFO_HEADER *) FspFindFspHeader (PcdGet32 (PcdFspmBaseAddress));
DEBUG ((DEBUG_INFO, "FspmHeaderPtr - 0x%x\n", FspmHeaderPtr));\r
if (FspmHeaderPtr == NULL) {\r
return EFI_DEVICE_ERROR;\r
DEBUG ((DEBUG_INFO, "FspmHeaderPtr - 0x%x\n", FspmHeaderPtr));\r
if (FspmHeaderPtr == NULL) {\r
return EFI_DEVICE_ERROR;\r
{\r
EFI_STATUS Status;\r
\r
{\r
EFI_STATUS Status;\r
\r
- Status = PeiFspMemoryInit ();\r
- ASSERT_EFI_ERROR (Status);\r
+ Status = EFI_SUCCESS;
+
+ if (FixedPcdGet8 (PcdFspModeSelection) == 1) {
+ Status = PeiFspMemoryInit ();
+ ASSERT_EFI_ERROR (Status);
+ } else {
+ PeiServicesInstallFvInfoPpi (
+ NULL,
+ (VOID *)(UINTN) PcdGet32 (PcdFspmBaseAddress),
+ (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspmBaseAddress))->FvLength,
+ NULL,
+ NULL
+ );
+ }
# register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
# notify to call FspSiliconInit API.\r
#\r
# register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
# notify to call FspSiliconInit API.\r
#\r
-# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2018, 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
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
[Pcd]\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress ## CONSUMES\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress ## CONSUMES\r
[Pcd]\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress ## CONSUMES\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspmUpdDataAddress ## CONSUMES\r
+ gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection ## CONSUMES
\r
[Sources]\r
FspmWrapperPeim.c\r
\r
[Sources]\r
FspmWrapperPeim.c\r
register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
notify to call FspSiliconInit API.\r
\r
register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
notify to call FspSiliconInit API.\r
\r
- Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+ Copyright (c) 2014 - 2018, Intel Corporation. All rights reserved.<BR>
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
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
{\r
DEBUG ((DEBUG_INFO, "FspsWrapperPeimEntryPoint\n"));\r
\r
{\r
DEBUG ((DEBUG_INFO, "FspsWrapperPeimEntryPoint\n"));\r
\r
+ if (FixedPcdGet8 (PcdFspModeSelection) == 1) {
+ FspsWrapperInit ();
+ } else {
+ PeiServicesInstallFvInfoPpi (
+ NULL,
+ (VOID *)(UINTN) PcdGet32 (PcdFspsBaseAddress),
+ (UINT32)((EFI_FIRMWARE_VOLUME_HEADER *) (UINTN) PcdGet32 (PcdFspsBaseAddress))->FvLength,
+ NULL,
+ NULL
+ );
+ }
\r
return EFI_SUCCESS;\r
}\r
\r
return EFI_SUCCESS;\r
}\r
# register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
# notify to call FspSiliconInit API.\r
#\r
# register TemporaryRamDonePpi to call TempRamExit API, and register MemoryDiscoveredPpi\r
# notify to call FspSiliconInit API.\r
#\r
-# Copyright (c) 2014 - 2017, Intel Corporation. All rights reserved.<BR>\r
+# Copyright (c) 2014 - 2018, 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
#\r
# This program and the accompanying materials\r
# are licensed and made available under the terms and conditions of the BSD License\r
[Pcd]\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress ## CONSUMES\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress ## CONSUMES\r
[Pcd]\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress ## CONSUMES\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspsUpdDataAddress ## CONSUMES\r
+ gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection ## CONSUMES
\r
[Guids]\r
gFspHobGuid ## CONSUMES ## HOB\r
\r
[Guids]\r
gFspHobGuid ## CONSUMES ## HOB\r
## Indicate the PEI memory size platform want to report\r
gIntelFsp2WrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize|0x3000000|UINT32|0x40000005\r
\r
## Indicate the PEI memory size platform want to report\r
gIntelFsp2WrapperTokenSpaceGuid.PcdPeiRecoveryMinMemSize|0x3000000|UINT32|0x40000005\r
\r
- ## This is the base address of FSP-T/M/S\r
+ ## This is the base address of FSP-T
gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0x00000000|UINT32|0x00000300\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFsptBaseAddress|0x00000000|UINT32|0x00000300\r
- gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0x00000000|UINT32|0x00000301\r
\r
## This PCD indicates if FSP APIs are skipped from FSP wrapper.<BR><BR>\r
# If a bit is set, that means this FSP API is skipped.<BR>\r
\r
## This PCD indicates if FSP APIs are skipped from FSP wrapper.<BR><BR>\r
# If a bit is set, that means this FSP API is skipped.<BR>\r
# @Prompt Skip FSP API from FSP wrapper.\r
gIntelFsp2WrapperTokenSpaceGuid.PcdSkipFspApi|0x00000000|UINT32|0x40000009\r
\r
# @Prompt Skip FSP API from FSP wrapper.\r
gIntelFsp2WrapperTokenSpaceGuid.PcdSkipFspApi|0x00000000|UINT32|0x40000009\r
\r
+ ## This PCD decides how Wrapper code utilizes FSP
+ # 0: DISPATCH mode (FSP Wrapper will load PeiCore from FSP without calling FSP API)
+ # 1: API mode (FSP Wrapper will call FSP API)
+ #
+ gIntelFsp2WrapperTokenSpaceGuid.PcdFspModeSelection|0x00000001|UINT8|0x4000000A
+
[PcdsFixedAtBuild, PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx]\r
[PcdsFixedAtBuild, PcdsPatchableInModule,PcdsDynamic,PcdsDynamicEx]\r
+ #
+ ## These are the base address of FSP-M/S
+ #
+ gIntelFsp2WrapperTokenSpaceGuid.PcdFspmBaseAddress|0x00000000|UINT32|0x00001000
gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0x00000000|UINT32|0x00001001\r
#\r
# To provide flexibility for platform to pre-allocate FSP UPD buffer\r
gIntelFsp2WrapperTokenSpaceGuid.PcdFspsBaseAddress|0x00000000|UINT32|0x00001001\r
#\r
# To provide flexibility for platform to pre-allocate FSP UPD buffer\r