Hi Chinni,
One minor feedback below. With that change...
Reviewed-by: Nate DeSimone <nathaniel.l.desim...@intel.com>
> -----Original Message-----
> From: Duggapu, Chinni B <chinni.b.dugg...@intel.com>
> Sent: Friday, April 5, 2024 10:06 AM
> To: devel@edk2.groups.io
> Cc: Chaganty, Rangasai V <rangasai.v.chaga...@intel.com>; Desimone,
> Nathaniel L <nathaniel.l.desim...@intel.com>; Chiu, Chasel
> <chasel.c...@intel.com>; Duggapu, Chinni B <chinni.b.dugg...@intel.com>
> Subject: [PATCH v6 1/3] IntelFsp2Pkg: Fsp T new ARCH UPD Support
>
> Changes to support spec changes
>
> 1. Remove usage of Pcd.
> 2. Change code to validate the Temporary Ram size input.
> 3. Consume the input saved in YMM Register
>
> Cc: Sai Chaganty <rangasai.v.chaga...@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desim...@intel.com>
> Cc: Chiu Chasel <chasel.c...@intel.com>
> Cc: Duggapu Chinni B <chinni.b.dugg...@intel.com>
>
>
> Signed-off-by: Duggapu Chinni B <chinni.b.dugg...@intel.com>
> ---
> IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf | 1 +
> IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf | 1 +
> .../FspSecCore/Ia32/Fsp24ApiEntryM.nasm | 1 -
> .../FspSecCore/Ia32/FspApiEntryM.nasm | 1 -
> .../FspSecCore/Ia32/FspApiEntryT.nasm | 60 +++++++++++++---
> .../FspSecCore/Ia32/SaveRestoreSseNasm.inc | 11 +++
> IntelFsp2Pkg/FspSecCore/SecFsp.c | 9 +++
> IntelFsp2Pkg/FspSecCore/SecFsp.h | 1 +
> IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm | 68 +++++++++++++++----
> IntelFsp2Pkg/Include/FspEas/FspApi.h | 12 +++-
> IntelFsp2Pkg/Include/Library/FspPlatformLib.h | 13 ++++
> .../Include/SaveRestoreSseAvxNasm.inc | 21 ++++++
> .../BaseFspPlatformLib/FspPlatformMemory.c | 38 +++++++++++
> 13 files changed, 211 insertions(+), 26 deletions(-)
>
> diff --git a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> index cb011f99f9..8cb0e6411f 100644
> --- a/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> +++ b/IntelFsp2Pkg/FspSecCore/Fsp24SecCoreM.inf
> @@ -60,6 +60,7 @@
> FspSecPlatformLib
> CpuLib
> FspMultiPhaseLib
> + FspPlatformLib
>
> [Pcd]
> gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES
> diff --git a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> index 8029832235..ef19c6ae78 100644
> --- a/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> +++ b/IntelFsp2Pkg/FspSecCore/FspSecCoreM.inf
> @@ -59,6 +59,7 @@
> FspCommonLib
> FspSecPlatformLib
> CpuLib
> + FspPlatformLib
>
> [Pcd]
> gIntelFsp2PkgTokenSpaceGuid.PcdTemporaryRamBase ## CONSUMES
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> index 15f8ecea83..5fa5c03569 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/Fsp24ApiEntryM.nasm
> @@ -11,7 +11,6 @@
> ; Following are fixed PCDs
> ;
> extern ASM_PFX(PcdGet32(PcdTemporaryRamBase))
> -extern ASM_PFX(PcdGet32(PcdTemporaryRamSize))
> extern ASM_PFX(PcdGet32(PcdFspTemporaryRamSize))
> extern ASM_PFX(PcdGet8 (PcdFspHeapSizePercentage))
>
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> index 61ab4612a3..861cce4d01 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryM.nasm
> @@ -11,7 +11,6 @@
> ; Following are fixed PCDs
> ;
> extern ASM_PFX(PcdGet32(PcdTemporaryRamBase))
> -extern ASM_PFX(PcdGet32(PcdTemporaryRamSize))
> extern ASM_PFX(PcdGet32(PcdFspTemporaryRamSize))
> extern ASM_PFX(PcdGet8 (PcdFspHeapSizePercentage))
>
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> index 900126b93b..088bd7ee7f 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
> @@ -109,7 +109,8 @@ struc LoadMicrocodeParamsFsp24
> .FsptArchReserved: resb 3
> .FsptArchLength: resd 1
> .FspDebugHandler resq 1
> - .FsptArchUpd: resd 4
> + .FspTemporaryRamSize: resd 1 ; Supported only if ArchRevison is
> >= 3
> + .FsptArchUpd: resd 3
> ; }
> ; FSPT_CORE_UPD {
> .MicrocodeCodeAddr: resq 1
> @@ -267,7 +268,7 @@ ASM_PFX(LoadMicrocodeDefault):
> cmp byte [esp + LoadMicrocodeParamsFsp22.FspUpdHeaderRevision], 2
> jb Fsp20UpdHeader
> cmp byte [esp + LoadMicrocodeParamsFsp22.FsptArchRevision], 2
> - je Fsp24UpdHeader
> + jae Fsp24UpdHeader
> jmp Fsp22UpdHeader
>
> Fsp20UpdHeader:
> @@ -405,7 +406,7 @@ CheckAddress:
> cmp byte [esp + LoadMicrocodeParamsFsp22.FspUpdHeaderRevision], 2
> jb Fsp20UpdHeader1
> cmp byte [esp + LoadMicrocodeParamsFsp22.FsptArchRevision], 2
> - je Fsp24UpdHeader1;
> + jae Fsp24UpdHeader1;
> jmp Fsp22UpdHeader1
>
> Fsp20UpdHeader1:
> @@ -497,7 +498,8 @@ ASM_PFX(EstablishStackFsp):
> ; Enable FSP STACK
> ;
> mov esp, DWORD [ASM_PFX(PcdGet32 (PcdTemporaryRamBase))]
> - add esp, DWORD [ASM_PFX(PcdGet32 (PcdTemporaryRamSize))]
> + LOAD_TEMPORARY_RAM_SIZE ecx
> + add esp, ecx
>
> push DATA_LEN_OF_MCUD ; Size of the data region
> push 4455434Dh ; Signature of the data region 'MCUD'
> @@ -506,7 +508,7 @@ ASM_PFX(EstablishStackFsp):
> cmp byte [edx + LoadMicrocodeParamsFsp22.FspUpdHeaderRevision], 2
> jb Fsp20UpdHeader2
> cmp byte [esp + LoadMicrocodeParamsFsp22.FsptArchRevision], 2
> - je Fsp24UpdHeader2
> + jae Fsp24UpdHeader2
> jmp Fsp22UpdHeader2
>
> Fsp20UpdHeader2:
> @@ -554,12 +556,13 @@ ContinueAfterUpdPush:
> ;
> ; Set ECX/EDX to the BootLoader temporary memory range
> ;
> - mov ecx, [ASM_PFX(PcdGet32 (PcdTemporaryRamBase))]
> - mov edx, ecx
> - add edx, [ASM_PFX(PcdGet32 (PcdTemporaryRamSize))]
> + mov edx, [ASM_PFX(PcdGet32 (PcdTemporaryRamBase))]
> + LOAD_TEMPORARY_RAM_SIZE ecx
> + add edx, ecx
> sub edx, [ASM_PFX(PcdGet32 (PcdFspReservedBufferSize))]
> + mov ecx, [ASM_PFX(PcdGet32 (PcdTemporaryRamBase))]
>
> - cmp ecx, edx ;If PcdFspReservedBufferSize >=
> PcdTemporaryRamSize, then error.
> + cmp ecx, edx ;If PcdFspReservedBufferSize >=
> TemporaryRamSize, then error.
> jb EstablishStackFspSuccess
> mov eax, 80000003h ;EFI_UNSUPPORTED
> jmp EstablishStackFspExit
> @@ -599,6 +602,45 @@ ASM_PFX(TempRamInitApi):
> CALL_EBP ASM_PFX(LoadUpdPointerToECX) ; ECX for UPD param
> SAVE_ECX ; save UPD param to slot 3 in xmm6
>
> + mov edx, ASM_PFX(PcdGet32 (PcdTemporaryRamSize))
> + mov edx, DWORD [edx]
> + ;
> + ; Read Fsp Arch2 revision
> + ;
> + cmp byte [ecx + LoadMicrocodeParamsFsp24.FsptArchRevision], 3
> + jb UseTemporaryRamSizePcd
> + ;
> + ; Read ARCH2 UPD input value.
> + ;
> + mov ebx, DWORD [ecx + LoadMicrocodeParamsFsp24.FspTemporaryRamSize]
> + ;
> + ; As per spec, if Bootloader pass zero, use Fsp defined Size
> + ;
> + cmp ebx, 0
> + jz UseTemporaryRamSizePcd
> +
> + xor eax, eax
> + mov ax, WORD [esi + 020h] ; Read ImageAttribute
> + test ax, 16 ; check if Bit4 is set
> + jnz ConsumeInputConfiguration
> + ;
> + ; Sometimes user may change input value even if it is not supported
> + ; return error if input is Non-Zero and not same as PcdTemporaryRamSize.
> + ;
> + cmp ebx, edx
> + je UseTemporaryRamSizePcd
> + mov eax, 080000002h ; RETURN_INVALID_PARAMETER
> + jmp TempRamInitExit
> +ConsumeInputConfiguration:
> + ;
> + ; Read ARCH2 UPD value and Save.
> + ;
> + SAVE_TEMPORARY_RAM_SIZE ebx
> + jmp GotTemporaryRamSize
> +UseTemporaryRamSizePcd:
> + SAVE_TEMPORARY_RAM_SIZE edx
> +GotTemporaryRamSize:
> + LOAD_ECX
> ;
> ; Sec Platform Init
> ;
> diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/SaveRestoreSseNasm.inc
> b/IntelFsp2Pkg/FspSecCore/Ia32/SaveRestoreSseNasm.inc
> index 016f943b43..4d6ec1e984 100644
> --- a/IntelFsp2Pkg/FspSecCore/Ia32/SaveRestoreSseNasm.inc
> +++ b/IntelFsp2Pkg/FspSecCore/Ia32/SaveRestoreSseNasm.inc
> @@ -128,6 +128,17 @@
> SXMMN xmm5, 1, eax
> %endmacro
>
> +;
> +; XMM5 slot 2 for TemporaryRamSize
> +;
> +%macro LOAD_TEMPORARY_RAM_SIZE 1
> + LXMMN xmm5, %1, 2
> + %endmacro
> +
> +%macro SAVE_TEMPORARY_RAM_SIZE 1
> + SXMMN xmm5, 2, %1
> + %endmacro
> +
> %macro ENABLE_SSE 0
> ;
> ; Initialize floating point units
> diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.c
> b/IntelFsp2Pkg/FspSecCore/SecFsp.c
> index 11be1f97ca..281d39a24b 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFsp.c
> +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.c
> @@ -54,6 +54,7 @@ SecGetPlatformData (
> UINT32 TopOfCar;
> UINT32 *StackPtr;
> UINT32 DwordSize;
> + UINT32 TemporaryRamSize;
>
> FspPlatformData = &FspData->PlatformData;
>
> @@ -67,12 +68,20 @@ SecGetPlatformData (
> FspPlatformData->MicrocodeRegionSize = 0;
> FspPlatformData->CodeRegionBase = 0;
> FspPlatformData->CodeRegionSize = 0;
> + TemporaryRamSize = 0;
>
> //
> // Pointer to the size field
> //
> TopOfCar = PcdGet32 (PcdTemporaryRamBase) + PcdGet32 (PcdTemporaryRamSize);
> StackPtr = (UINT32 *)(TopOfCar - sizeof (UINT32));
> + if ((*(StackPtr - 1) != FSP_MCUD_SIGNATURE) &&
> (FspData->FspInfoHeader->ImageAttribute & BIT4)) {
> + ReadTemporaryRamSize (PcdGet32 (PcdTemporaryRamBase), &TemporaryRamSize);
> + if (TemporaryRamSize) {
> + TopOfCar = PcdGet32 (PcdTemporaryRamBase) + TemporaryRamSize;
> + StackPtr = (UINT32 *)(TopOfCar - sizeof (UINT32));
> + }
> + }
>
> if (*(StackPtr - 1) == FSP_MCUD_SIGNATURE) {
> while (*StackPtr != 0) {
> diff --git a/IntelFsp2Pkg/FspSecCore/SecFsp.h
> b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> index 693af29f20..c05b46c750 100644
> --- a/IntelFsp2Pkg/FspSecCore/SecFsp.h
> +++ b/IntelFsp2Pkg/FspSecCore/SecFsp.h
> @@ -17,6 +17,7 @@
> #include <Library/BaseMemoryLib.h>
> #include <Library/FspCommonLib.h>
> #include <Library/FspSecPlatformLib.h>
> +#include <Library/FspPlatformLib.h>
>
> #define FSP_MCUD_SIGNATURE SIGNATURE_32 ('M', 'C', 'U', 'D')
> #define FSP_PER0_SIGNATURE SIGNATURE_32 ('P', 'E', 'R', '0')
> diff --git a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> index 698bb063a7..0402d1e893 100644
> --- a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> +++ b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
> @@ -16,6 +16,7 @@
> extern ASM_PFX(PcdGet32 (PcdTemporaryRamBase))
> extern ASM_PFX(PcdGet32 (PcdTemporaryRamSize))
> extern ASM_PFX(PcdGet32 (PcdFspReservedBufferSize))
> +extern ASM_PFX(PcdGet32 (PcdGlobalDataPointerAddress))
This extern is no longer used in your most recent patch series and can be
removed.
>
> ;
> ; Following functions will be provided in PlatformSecLib
> @@ -76,7 +77,8 @@ struc LoadMicrocodeParamsFsp24
> .FsptArchReserved: resb 3
> .FsptArchLength: resd 1
> .FspDebugHandler resq 1
> - .FsptArchUpd: resd 4
> + .FspTemporaryRamSize: resd 1 ; Supported only if ArchRevison is
> >= 3
> + .FsptArchUpd: resd 3
> ; }
> ; FSPT_CORE_UPD {
> .MicrocodeCodeAddr: resq 1
> @@ -163,7 +165,7 @@ ASM_PFX(LoadMicrocodeDefault):
> cmp byte [rsp + LoadMicrocodeParamsFsp24.FspUpdHeaderRevision], 2
> jb ParamError
> cmp byte [rsp + LoadMicrocodeParamsFsp24.FsptArchRevision], 2
> - jne ParamError
> + jb ParamError
>
> ; UPD structure is compliant with FSP spec 2.4
> mov rax, qword [rsp + LoadMicrocodeParamsFsp24.MicrocodeCodeSize]
> @@ -273,7 +275,7 @@ CheckAddress:
> cmp byte [rsp + LoadMicrocodeParamsFsp24.FspUpdHeaderRevision], 2
> jb ParamError
> cmp byte [rsp + LoadMicrocodeParamsFsp24.FsptArchRevision], 2
> - jne ParamError
> + jb ParamError
>
> ; UPD structure is compliant with FSP spec 2.4
> ; Is automatic size detection ?
> @@ -337,8 +339,8 @@ ASM_PFX(EstablishStackFsp):
> ;
> mov rax, ASM_PFX(PcdGet32 (PcdTemporaryRamBase))
> mov esp, DWORD[rax]
> - mov rax, ASM_PFX(PcdGet32 (PcdTemporaryRamSize))
> - add esp, DWORD[rax]
> + LOAD_TEMPORARY_RAM_SIZE rax
> + add esp, eax
>
> sub esp, 4
> mov dword[esp], DATA_LEN_OF_MCUD ; Size of the data region
> @@ -349,7 +351,7 @@ ASM_PFX(EstablishStackFsp):
> cmp byte [rdx + LoadMicrocodeParamsFsp24.FspUpdHeaderRevision], 2
> jb ParamError1
> cmp byte [rdx + LoadMicrocodeParamsFsp24.FsptArchRevision], 2
> - je Fsp24UpdHeader
> + jnb Fsp24UpdHeader
>
> ParamError1:
> mov rax, 08000000000000002h
> @@ -397,8 +399,8 @@ ContinueAfterUpdPush:
> ;
> mov rcx, ASM_PFX(PcdGet32 (PcdTemporaryRamBase))
> mov edx, [ecx]
> - mov rcx, ASM_PFX(PcdGet32 (PcdTemporaryRamSize))
> - add edx, [ecx]
> + LOAD_TEMPORARY_RAM_SIZE rcx
> + add edx, ecx
> mov rcx, ASM_PFX(PcdGet32 (PcdFspReservedBufferSize))
> sub edx, [ecx]
> mov rcx, ASM_PFX(PcdGet32 (PcdTemporaryRamBase))
> @@ -439,6 +441,14 @@ ASM_PFX(TempRamInitApi):
> ;
> SAVE_BFV rbp
>
> + ;
> + ; Save timestamp into YMM6
> + ;
> + rdtsc
> + shl rdx, 32
> + or rax, rdx
> + SAVE_TS rax
> +
> ;
> ; Save Input Parameter in YMM10
> ;
> @@ -455,14 +465,46 @@ ASM_PFX(TempRamInitApi):
> ParamValid:
> SAVE_RCX
>
> + mov rdx, ASM_PFX(PcdGet32 (PcdTemporaryRamSize))
> + mov edx, DWORD [rdx]
> ;
> - ; Save timestamp into YMM6
> + ; Read Fsp Arch2 revision
> ;
> - rdtsc
> - shl rdx, 32
> - or rax, rdx
> - SAVE_TS rax
> + cmp byte [ecx + LoadMicrocodeParamsFsp24.FsptArchRevision], 3
> + jb UseTemporaryRamSizePcd
> + ;
> + ; Read ARCH2 UPD input value.
> + ;
> + mov ebx, DWORD [ecx + LoadMicrocodeParamsFsp24.FspTemporaryRamSize]
> + ;
> + ; As per spec, if Bootloader pass zero, use Fsp defined Size
> + ;
> + cmp ebx, 0
> + jz UseTemporaryRamSizePcd
> +
> + xor rax, rax
> + mov ax, WORD [rsi + 020h] ; Read ImageAttribute
> + test ax, 16 ; check if Bit4 is set
> + jnz ConsumeInputConfiguration
> + ;
> + ; Sometimes user may change input value even if it is not supported
> + ; return error if input is Non-Zero and not same as PcdTemporaryRamSize.
> + ;
> + cmp ebx, edx
> + je UseTemporaryRamSizePcd
> + mov rax, 08000000000000002h ; RETURN_INVALID_PARAMETER
> + jmp TempRamInitExit
> +ConsumeInputConfiguration:
> + ;
> + ; Read ARCH2 UPD value and Save.
> + ; Only low-32 bits of rbx/rdx holds the temporary ram size.
> + ;
> + SAVE_TEMPORARY_RAM_SIZE rbx
> + jmp GotTemporaryRamSize
> +UseTemporaryRamSizePcd:
> + SAVE_TEMPORARY_RAM_SIZE rdx
>
> +GotTemporaryRamSize:
> ;
> ; Sec Platform Init
> ;
> diff --git a/IntelFsp2Pkg/Include/FspEas/FspApi.h
> b/IntelFsp2Pkg/Include/FspEas/FspApi.h
> index 40e063e944..e07aa401e6 100644
> --- a/IntelFsp2Pkg/Include/FspEas/FspApi.h
> +++ b/IntelFsp2Pkg/Include/FspEas/FspApi.h
> @@ -139,7 +139,7 @@ typedef struct {
> ///
> typedef struct {
> ///
> - /// Revision of the structure is 2 for this version of the specification.
> + /// Revision of the structure is 3 for this version of the specification.
> ///
> UINT8 Revision;
> UINT8 Reserved[3];
> @@ -152,7 +152,15 @@ typedef struct {
> /// occurring during FSP execution.
> ///
> EFI_PHYSICAL_ADDRESS FspDebugHandler;
> - UINT8 Reserved1[16];
> + ///
> + /// FspTemporaryRamSize is Optional & valid only when
> + /// FSP image attribute (BIT4) is set. If Programmed as Zero, Platform
> + /// recommended value will be used, otherwise input value will be used
> + /// to configure TemporaryRamSize. Refer FSP Integration guide for valid
> + /// TemporaryRamSize range for each platform.
> + ///
> + UINT32 FspTemporaryRamSize;
> + UINT8 Reserved1[12];
> } FSPT_ARCH2_UPD;
>
> ///
> diff --git a/IntelFsp2Pkg/Include/Library/FspPlatformLib.h
> b/IntelFsp2Pkg/Include/Library/FspPlatformLib.h
> index 081add6529..03eca5e1fc 100644
> --- a/IntelFsp2Pkg/Include/Library/FspPlatformLib.h
> +++ b/IntelFsp2Pkg/Include/Library/FspPlatformLib.h
> @@ -121,4 +121,17 @@ FspTempRamExitDone2 (
> IN EFI_STATUS Status
> );
>
> +/**
> + Calculate TemporaryRam Size using Base address
> +
> + @param[in] TemporaryRamBase the address of target memory
> + @param[out] TemporaryRamSize the size of target memory
> +**/
> +VOID
> +EFIAPI
> +ReadTemporaryRamSize (
> + IN UINT32 TemporaryRamBase,
> + OUT UINT32 *TemporaryRamSize
> + );
> +
> #endif
> diff --git a/IntelFsp2Pkg/Include/SaveRestoreSseAvxNasm.inc
> b/IntelFsp2Pkg/Include/SaveRestoreSseAvxNasm.inc
> index 002a5a1412..2168564e6d 100644
> --- a/IntelFsp2Pkg/Include/SaveRestoreSseAvxNasm.inc
> +++ b/IntelFsp2Pkg/Include/SaveRestoreSseAvxNasm.inc
> @@ -201,6 +201,27 @@
> movq rcx, xmm5
> %endmacro
>
> +;
> +; Save TemporaryRamSize to YMM10[192:255]
> +; arg 1:general purpose register which holds TemporaryRamSize
> +; Modified: XMM5 and YMM10[192:255]
> +;
> +%macro SAVE_TEMPORARY_RAM_SIZE 1
> + LYMMN ymm10, xmm5, 1
> + SXMMN xmm5, 1, %1
> + SYMMN ymm10, 1, xmm5
> + %endmacro
> +
> +;
> +; Restore TemporaryRamSize from YMM10[192:255]
> +; arg 1:general purpose register where to save TemporaryRamSize
> +; Modified: XMM5 and %1
> +;
> +%macro LOAD_TEMPORARY_RAM_SIZE 1
> + LYMMN ymm10, xmm5, 1
> + LXMMN xmm5, %1, 1
> + %endmacro
> +
> ;
> ; YMM7[128:191] for calling stack
> ; arg 1:Entry
> diff --git a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
> b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
> index 2573e4e421..4c5c1f824e 100644
> --- a/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
> +++ b/IntelFsp2Pkg/Library/BaseFspPlatformLib/FspPlatformMemory.c
> @@ -6,6 +6,7 @@
> **/
>
> #include <PiPei.h>
> +#include <Register/Intel/Msr.h>
> #include <Library/BaseLib.h>
> #include <Library/BaseMemoryLib.h>
> #include <Library/MemoryAllocationLib.h>
> @@ -119,3 +120,40 @@ FspGetSystemMemorySize (
> Hob.Raw = GET_NEXT_HOB (Hob);
> }
> }
> +
> +/**
> + Calculate TemporaryRam Size using Base address
> +
> + @param[in] TemporaryRamBase the address of target memory
> + @param[out] TemporaryRamSize the size of target memory
> +**/
> +VOID
> +EFIAPI
> +ReadTemporaryRamSize (
> + IN UINT32 TemporaryRamBase,
> + OUT UINT32 *TemporaryRamSize
> + )
> +{
> + MSR_IA32_MTRRCAP_REGISTER Msr;
> + UINT32 MsrNum;
> + UINT32 MsrNumEnd;
> +
> + if (TemporaryRamBase == 0) {
> + return ;
> + }
> +
> + *TemporaryRamSize = 0;
> + Msr.Uint64 = AsmReadMsr64(MSR_IA32_MTRRCAP);
> + MsrNumEnd = MSR_IA32_MTRR_PHYSBASE0 + (2 * (Msr.Bits.VCNT));
> +
> + for (MsrNum = MSR_IA32_MTRR_PHYSBASE0; MsrNum < MsrNumEnd; MsrNum += 2) {
> + if ((AsmReadMsr64 (MsrNum+1) & BIT11) != 0 ) {
> + if (TemporaryRamBase == (AsmReadMsr64 (MsrNum) & 0xFFFFF000)) {
> + *TemporaryRamSize = (~(AsmReadMsr64 (MsrNum+1) & 0xFFFFF000) + 1);
> + break;
> + }
> + }
> + }
> + return;
> +}
> +
> --
> 2.39.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#117501): https://edk2.groups.io/g/devel/message/117501
Mute This Topic: https://groups.io/mt/105352672/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
