[edk2-devel] [PATCH v2] IntelFsp2Pkg: FSP should support input UPD as NULL.
Kuo, Ted
ted.kuo at intel.com
Fri Nov 4 01:56:16 UTC 2022
Reviewed-by: Ted Kuo <ted.kuo at intel.com>
-----Original Message-----
From: Chiu, Chasel <chasel.chiu at intel.com>
Sent: Friday, November 4, 2022 1:02 AM
To: Kuo, Ted <ted.kuo at intel.com>; devel at edk2.groups.io
Cc: Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Zeng, Star <star.zeng at intel.com>
Subject: RE: [edk2-devel] [PATCH v2] IntelFsp2Pkg: FSP should support input UPD as NULL.
Hi Ted,
Please see my reply below inline.
Thanks,
Chasel
> -----Original Message-----
> From: Kuo, Ted <ted.kuo at intel.com>
> Sent: Wednesday, November 2, 2022 7:32 PM
> To: devel at edk2.groups.io; Chiu, Chasel <chasel.chiu at intel.com>
> Cc: Desimone, Nathaniel L <nathaniel.l.desimone at intel.com>; Zeng, Star
> <star.zeng at intel.com>
> Subject: RE: [edk2-devel] [PATCH v2] IntelFsp2Pkg: FSP should support
> input UPD as NULL.
>
> Hi Chasel,
>
> I have few comments. Please find [Ted] inline.
>
> Thanks,
> Ted
>
> -----Original Message-----
> From: devel at edk2.groups.io <devel at edk2.groups.io> On Behalf Of Chiu,
> Chasel
> Sent: Wednesday, November 2, 2022 1:46 PM
> To: devel at edk2.groups.io
> Cc: Chiu, Chasel <chasel.chiu at intel.com>; Desimone, Nathaniel L
> <nathaniel.l.desimone at intel.com>; Zeng, Star <star.zeng at intel.com>
> Subject: [edk2-devel] [PATCH v2] IntelFsp2Pkg: FSP should support
> input UPD as NULL.
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4114
>
> FSP specification supports input UPD as NULL cases which FSP will use
> built- in UPD region instead.
> FSP should not return INVALID_PARAMETER in such cases.
>
> In FSP-T entry point case, the valid FSP-T UPD region pointer will be
> passed to platform FSP code to consume.
> In FSP-M and FSP-S cases, valid UPD pointer will be decided when
> updating corresponding pointer field in FspGlobalData.
>
> Cc: Nate DeSimone <nathaniel.l.desimone at intel.com>
> Cc: Star Zeng <star.zeng at intel.com>
> Signed-off-by: Chasel Chiu <chasel.chiu at intel.com>
> ---
> IntelFsp2Pkg/FspSecCore/SecFspApiChk.c | 12 ++++++++++--
> IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm | 73
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++------
> ------------
> IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm | 40
> ++++++++++++++++++++++++++--------------
> 3 files changed, 91 insertions(+), 34 deletions(-)
>
> diff --git a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
> b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
> index a44fbf2a50..5f59938518 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
> +++ b/IntelFsp2Pkg/FspSecCore/SecFspApiChk.c
> @@ -44,6 +44,8 @@ FspApiCallingCheck (
> //
> if (((UINTN)FspData != MAX_ADDRESS) && ((UINTN)FspData !=
> MAX_UINT32)) {
> Status = EFI_UNSUPPORTED;
> + } else if (ApiParam == NULL) {
> + Status = EFI_SUCCESS;
> } else if (EFI_ERROR (FspUpdSignatureCheck (ApiIdx, ApiParam))) {
> Status = EFI_INVALID_PARAMETER;
> }
> @@ -67,9 +69,13 @@ FspApiCallingCheck (
> } else {
> if (FspData->Signature != FSP_GLOBAL_DATA_SIGNATURE) {
> Status = EFI_UNSUPPORTED;
> - } else if (EFI_ERROR (FspUpdSignatureCheck (FspSiliconInitApiIndex,
> ApiParam))) {
> - Status = EFI_INVALID_PARAMETER;
> } else if (ApiIdx == FspSiliconInitApiIndex) {
> + if (ApiParam == NULL) {
> + Status = EFI_SUCCESS;
> + } else if (EFI_ERROR (FspUpdSignatureCheck
> + (FspSiliconInitApiIndex,
> ApiParam))) {
> + Status = EFI_INVALID_PARAMETER;
> + }
> +
> //
> // Reset MultiPhase NumberOfPhases to zero
> //
> @@ -89,6 +95,8 @@ FspApiCallingCheck (
> } else {
> if (FspData->Signature != FSP_GLOBAL_DATA_SIGNATURE) {
> Status = EFI_UNSUPPORTED;
> + } else if (ApiParam == NULL) {
> + Status = EFI_SUCCESS;
> } else if (EFI_ERROR (FspUpdSignatureCheck (FspSmmInitApiIndex,
> ApiParam))) {
> Status = EFI_INVALID_PARAMETER;
> }
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> index 61030a843b..73821ad22a 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> @@ -21,7 +21,7 @@ extern ASM_PFX(PcdGet32
> (PcdFspReservedBufferSize))
> ; Following functions will be provided in PlatformSecLib ; extern
> ASM_PFX(AsmGetFspBaseAddress) -extern
> ASM_PFX(AsmGetFspInfoHeader)
> +extern ASM_PFX(AsmGetFspInfoHeaderNoStack)
> ;extern ASM_PFX(LoadMicrocode) ; @todo: needs a weak
> implementation
> extern ASM_PFX(SecPlatformInit) ; @todo: needs a weak implementation
> extern ASM_PFX(SecCarInit)
> @@ -160,6 +160,47 @@ endstruc
> RET_ESI_EXT mm7
> %endmacro
>
> +%macro CALL_EDI 1
> +
> + mov edi, %%ReturnAddress
> + jmp %1
> +%%ReturnAddress:
> +
> +%endmacro
> +
> +%macro CALL_EBP 1
> + mov ebp, %%ReturnAddress
> + jmp %1
> +%%ReturnAddress:
> +%endmacro
> +
> +%macro RET_EBP 0
> + jmp ebp ; restore EIP from EBP
> +%endmacro
> +
> +;
> +; Load UPD region pointer in ECX
> +;
> +global ASM_PFX(LoadUpdPointerToECX)
> +ASM_PFX(LoadUpdPointerToECX):
> + ;
> + ; esp + 4 is input UPD parameter
> + ; If esp + 4 is NULL the default UPD should be used
> + ; ecx will be the UPD region that should be used
> + ;
> + mov ecx, dword [esp + 4]
> + cmp ecx, 0
> + jnz ParamValid
> +
> + ;
> + ; Fall back to default UPD region
> + ;
> + CALL_EDI ASM_PFX(AsmGetFspInfoHeaderNoStack)
> + mov ecx, DWORD [eax + 01Ch] ; Read FsptImageBaseAddress
> + add ecx, DWORD [eax + 024h] ; Get Cfg Region base address =
> FsptImageBaseAddress + CfgRegionOffset
> +ParamValid:
> + RET_EBP
> +
> ;
> ; @todo: The strong/weak implementation does not work.
> ; This needs to be reviewed later.
> @@ -187,10 +228,9 @@ endstruc
> global ASM_PFX(LoadMicrocodeDefault)
> ASM_PFX(LoadMicrocodeDefault):
> ; Inputs:
> - ; esp -> LoadMicrocodeParams pointer
> + ; ecx -> UPD region contains LoadMicrocodeParams pointer
> ; Register Usage:
> - ; esp Preserved
> - ; All others destroyed
> + ; All are destroyed
> ; Assumptions:
> ; No memory available, stack is hard-coded and used for return address
> ; Executed by SBSP and NBSP
> @@ -201,12 +241,9 @@ ASM_PFX(LoadMicrocodeDefault):
> ;
> movd ebp, mm7
>
> + mov esp, ecx ; ECX has been assigned to UPD region
> cmp esp, 0
> [Ted]: do we still need to check esp here?
Yes, typically ESP now should never be zero, but I keep it there because original code having this check and this check is nice to have in case unexpected things happening (like FSP with wrong header info).
> jz ParamError
> - mov eax, dword [esp + 4] ; Parameter pointer
> - cmp eax, 0
> - jz ParamError
> - mov esp, eax
>
> ; skip loading Microcode if the MicrocodeCodeSize is zero
> ; and report error if size is less than 2k @@ -444,13 +481,15 @@ Done:
> Exit2:
> jmp ebp
>
> -
> +;
> +; EstablishStackFsp: EDI should be preserved cross this function ;
> global ASM_PFX(EstablishStackFsp)
> ASM_PFX(EstablishStackFsp):
> ;
> ; Save parameter pointer in edx
> ;
> - mov edx, dword [esp + 4]
> + mov edx, ecx ; ECX has been assigned to UPD region
>
> ;
> ; Enable FSP STACK
> @@ -555,39 +594,37 @@ ASM_PFX(TempRamInitApi):
> SAVE_EAX
> SAVE_EDX
>
> - ;
> - ; Check Parameter
> - ;
> - mov eax, dword [esp + 4]
> - cmp eax, 0
> - mov eax, 80000002h
> - jz TempRamInitExit
> -
> ;
> ; Sec Platform Init
> ;
> + CALL_EBP ASM_PFX(LoadUpdPointerToECX) ; ECX for UPD param
> CALL_MMX ASM_PFX(SecPlatformInit)
> cmp eax, 0
> jnz TempRamInitExit
>
> ; Load microcode
> LOAD_ESP
> [Ted]: Do we still need to restore ESP before calling function since
> we're using ecx to pass parameter?
ECX and ESP may be corrupted by any sub-function so here we need to restore both of them.
> + CALL_EBP ASM_PFX(LoadUpdPointerToECX) ; ECX for UPD param
> CALL_MMX ASM_PFX(LoadMicrocodeDefault)
> SXMMN xmm6, 3, eax ;Save microcode return status in ECX-SLOT
> 3 in xmm6.
> ;@note If return value eax is not 0, microcode did not load, but
> continue and attempt to boot.
>
> ; Call Sec CAR Init
> LOAD_ESP
> [Ted]: Do we still need to restore ESP before calling function since
> we're
ECX and ESP may be corrupted by any sub-function so here we need to restore both of them.
> using ecx to pass parameter?
> + CALL_EBP ASM_PFX(LoadUpdPointerToECX) ; ECX for UPD param
> CALL_MMX ASM_PFX(SecCarInit)
> cmp eax, 0
> jnz TempRamInitExit
>
> LOAD_ESP
> [Ted]: Do we still need to restore ESP before calling function since
> we're
ECX and ESP may be corrupted by any sub-function so here we need to restore both of them.
> using ecx to pass parameter?
> + CALL_EBP ASM_PFX(LoadUpdPointerToECX) ; ECX for UPD param
> + mov edi, ecx ; Save UPD param to EDI for later code use
> CALL_MMX ASM_PFX(EstablishStackFsp)
> cmp eax, 0
> jnz TempRamInitExit
>
> LXMMN xmm6, eax, 3 ;Restore microcode status if no CAR init error
> from ECX-SLOT 3 in xmm6.
> + SXMMN xmm6, 3, edi ;Save FSP-T UPD parameter pointer in ECX-SLOT
> 3 in xmm6.
>
> TempRamInitExit:
> mov bl, al ; save al data in bl
> diff --git a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> index 7dd89c531a..cdebe90fab 100644
> --- a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> @@ -21,7 +21,7 @@ extern ASM_PFX(PcdGet32
> (PcdFspReservedBufferSize))
> ; Following functions will be provided in PlatformSecLib ; extern
> ASM_PFX(AsmGetFspBaseAddress) -extern
> ASM_PFX(AsmGetFspInfoHeader)
> +extern ASM_PFX(AsmGetFspInfoHeaderNoStack)
> ;extern ASM_PFX(LoadMicrocode) ; @todo: needs a weak
> implementation
> extern ASM_PFX(SecPlatformInit) ; @todo: needs a weak implementation
> extern ASM_PFX(SecCarInit)
> @@ -87,6 +87,14 @@ struc LoadMicrocodeParamsFsp24
> .size:
> endstruc
>
> +%macro CALL_RDI 1
> +
> + mov rdi, %%ReturnAddress
> + jmp %1
> +%%ReturnAddress:
> +
> +%endmacro
> +
> ;
> ; @todo: The strong/weak implementation does not work.
> ; This needs to be reviewed later.
> @@ -116,8 +124,7 @@ ASM_PFX(LoadMicrocodeDefault):
> ; Inputs:
> ; rcx -> LoadMicrocodeParams pointer
> ; Register Usage:
> - ; rsp Preserved
> - ; All others destroyed
> + ; All are destroyed
> ; Assumptions:
> ; No memory available, stack is hard-coded and used for return address
> ; Executed by SBSP and NBSP
> @@ -420,10 +427,6 @@ ASM_PFX(TempRamInitApi):
> ENABLE_SSE
> ENABLE_AVX
> ;
> - ; Save Input Parameter in YMM10
> - ;
> - SAVE_RCX
> - ;
> ; Save RBP, RBX, RSI, RDI and RSP in YMM7, YMM8 and YMM6
> ;
> SAVE_REGS
> @@ -433,6 +436,22 @@ ASM_PFX(TempRamInitApi):
> ;
> SAVE_BFV rbp
>
> + ;
> + ; Save Input Parameter in YMM10
> + ;
> + cmp rcx, 0
> + jnz ParamValid
> +
> + ;
> + ; Fall back to default UPD
> + ;
> + CALL_RDI ASM_PFX(AsmGetFspInfoHeaderNoStack)
> + xor rcx, rcx
> + mov ecx, DWORD [rax + 01Ch] ; Read FsptImageBaseAddress
> + add ecx, DWORD [rax + 024h] ; Get Cfg Region base address =
> FsptImageBaseAddress + CfgRegionOffset
> +ParamValid:
> + SAVE_RCX
> +
> ;
> ; Save timestamp into YMM6
> ;
> @@ -441,13 +460,6 @@ ASM_PFX(TempRamInitApi):
> or rax, rdx
> SAVE_TS rax
>
> - ;
> - ; Check Parameter
> - ;
> - cmp rcx, 0
> - mov rcx, 08000000000000002h
> - jz TempRamInitExit
> -
> ;
> ; Sec Platform Init
> ;
> --
> 2.35.0.windows.1
>
>
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#95854):
> https://edk2.groups.io/g/devel/message/95854
> Mute This Topic: https://groups.io/mt/94728678/1862468
> Group Owner: devel+owner at edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub [ted.kuo at intel.com]
> - =-=-=-=-=-=
>
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#95936): https://edk2.groups.io/g/devel/message/95936
Mute This Topic: https://groups.io/mt/94728678/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list