Great work thanks Ted! Reviewed-by: Nate DeSimone From: devel@edk2.groups.io on behalf of Kuo, Ted Date: Friday, April 15, 2022 at 1:38 AM To: devel@edk2.groups.io Subject: [edk2-devel][PATCH v5 0/8] Support PEI 64bit in IntelFsp2Pkg and IntelFsp2WrapperPkg REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3893 Currently PEI drivers/libraries only support 32bit in IntelFsp2Pkg and IntelFsp2WrapperPkg. The patches below are needed to support these drivers/libraries in 64bit. V2 changes: 1.Change FSPM_UPD_COMMON2 to FSPM_UPD_COMMON_FSP24 in FspApiEntryM.nasm. 2.Add FSPx_UPD_COMMON_FSP24 in FspApi.h. 3.Add 3 additional patches for supporting X64 in IntelFsp2WrapperPkg. V3 changes: 1.Update FSPT_ARCH2_UPD and add FSPT_CORE_UPD back. 2.Use 0xFFFFFFFF instead of MAX_ADDRESS to reflect the default of FspData. 3.Remove EnableMultiPhaseMemoryInit from FSPM_ARCH2_UPD. 4.Bump GenCfgOpt version to 0.57. V4 changes: 1.Added EFIAPI to SwapStack and PEI_CORE_ENTRY. 2.Cast FspData from pointer to UINTN and then from UINTN to UINT32. 3.Corrected few typos. Ted Kuo (8): IntelFsp2Pkg: X64 compatible changes to support PEI in 64bit IntelFsp2Pkg: Add FSPx_ARCH2_UPD support for X64 IntelFsp2Pkg: Update FSP_GLOBAL_DATA and FSP_PLAT_DATA for X64 IntelFsp2Pkg: FspSecCore support for X64 IntelFsp2Pkg: SecFspSecPlatformLibNull support for X64 IntelFsp2WrapperPkg: Adopt FSPM_UPD_COMMON_FSP24 for X64 IntelFsp2WrapperPkg: BaseFspWrapperApiLib support for X64 IntelFsp2WrapperPkg: SecFspWrapperPlatformSecLibSample support for X64 V5 1.Extend Copyright year to 2022 for the modified files 2.Check FSPM_UPD_COMMON_FSP24.Revision before configuring FSP stack. 3.Treat both MAX_ADDRESS and MAX_UINT32 as invalid address for FSP global data in FspApiCallingCheck(). 4.Remove EnableMultiPhaseSiliconInit from FSPS_ARCH2_UPD. 5.Add an additional ExcludedSpecificUpd1 to exclude FSPx_ARCH2_UPD in GenCfgOpt.py tool. IntelFsp2Pkg/FspNotifyPhase/FspNotifyPhasePeim.c | 3 +- IntelFsp2Pkg/FspSecCore/Fsp22SecCoreS.inf | 10 +- IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 11 +- IntelFsp2Pkg/FspSecCore/FspSecCoreS.inf | 10 +- IntelFsp2Pkg/FspSecCore/FspSecCoreT.inf | 12 +- .../FspSecCore/Ia32/FspApiEntryCommon.nasm | 6 +- IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm | 32 +- IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm | 98 +++- IntelFsp2Pkg/FspSecCore/Ia32/ReadEsp.nasm | 10 +- IntelFsp2Pkg/FspSecCore/Ia32/Stack.nasm | 12 +- IntelFsp2Pkg/FspSecCore/SecFsp.c | 12 +- IntelFsp2Pkg/FspSecCore/SecFsp.h | 4 +- IntelFsp2Pkg/FspSecCore/SecFspApiChk.c | 10 +- IntelFsp2Pkg/FspSecCore/SecMain.c | 10 +- IntelFsp2Pkg/FspSecCore/SecMain.h | 20 +- IntelFsp2Pkg/FspSecCore/X64/Fsp22ApiEntryS.nasm | 103 +++++ IntelFsp2Pkg/FspSecCore/X64/FspApiEntryCommon.nasm | 76 ++++ IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm | 271 +++++++++++ IntelFsp2Pkg/FspSecCore/X64/FspApiEntryS.nasm | 67 +++ IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm | 495 +++++++++++++++++++++ IntelFsp2Pkg/FspSecCore/X64/FspHelper.nasm | 34 ++ IntelFsp2Pkg/FspSecCore/X64/MicrocodeLoadNasm.inc | 11 + IntelFsp2Pkg/FspSecCore/X64/ReadRsp.nasm | 22 + IntelFsp2Pkg/FspSecCore/X64/Stack.nasm | 73 +++ IntelFsp2Pkg/Include/FspEas/FspApi.h | 139 +++++- IntelFsp2Pkg/Include/FspGlobalData.h | 53 ++- IntelFsp2Pkg/Include/Guid/FspHeaderFile.h | 16 +- IntelFsp2Pkg/Include/SaveRestoreSseAvxNasm.inc | 284 ++++++++++++ IntelFsp2Pkg/IntelFsp2Pkg.dsc | 4 +- .../Library/BaseFspCommonLib/FspCommonLib.c | 6 +- .../BaseFspSwitchStackLib/FspSwitchStackLib.c | 3 +- .../Library/BaseFspSwitchStackLib/X64/Stack.nasm | 5 +- .../SecFspSecPlatformLibNull/Ia32/Flat32.nasm | 4 +- .../SecFspSecPlatformLibNull.inf | 8 +- .../SecFspSecPlatformLibNull/X64/Long64.nasm | 31 ++ .../SecFspSecPlatformLibNull/X64/SecCarInit.nasm | 40 ++ IntelFsp2Pkg/Tools/GenCfgOpt.py | 7 +- .../FspmWrapperPeim/FspmWrapperPeim.c | 27 +- .../BaseFspWrapperApiLib/FspWrapperApiLib.c | 44 +- .../BaseFspWrapperApiLib/IA32/DispatchExecute.c | 23 +- .../BaseFspWrapperApiLib/X64/DispatchExecute.c | 47 +- .../{Ia32 => }/Fsp.h | 0 .../Ia32/Stack.nasm | 8 +- .../SecFspWrapperPlatformSecLibSample.inf | 9 +- .../SecRamInitData.c | 24 +- .../X64/PeiCoreEntry.nasm | 149 +++++++ .../X64/SecEntry.nasm | 171 +++++++ .../X64/Stack.nasm | 73 +++ 48 files changed, 2446 insertions(+), 141 deletions(-) create mode 100644 IntelFsp2Pkg/FspSecCore/X64/Fsp22ApiEntryS.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/FspApiEntryCommon.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/FspApiEntryM.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/FspApiEntryS.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/FspHelper.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/MicrocodeLoadNasm.inc create mode 100644 IntelFsp2Pkg/FspSecCore/X64/ReadRsp.nasm create mode 100644 IntelFsp2Pkg/FspSecCore/X64/Stack.nasm create mode 100644 IntelFsp2Pkg/Include/SaveRestoreSseAvxNasm.inc create mode 100644 IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/X64/Long64.nasm create mode 100644 IntelFsp2Pkg/Library/SecFspSecPlatformLibNull/X64/SecCarInit.nasm rename IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/{Ia32 => }/Fsp.h (100%) create mode 100644 IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64/PeiCoreEntry.nasm create mode 100644 IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64/SecEntry.nasm create mode 100644 IntelFsp2WrapperPkg/Library/SecFspWrapperPlatformSecLibSample/X64/Stack.nasm -- 2.16.2.windows.1