IntelFsp2Pkg: Correct Assumption of FspInfoheader

It is assumed that the address of FspInfoheader is present in rsi while reading ImageAttribute. Reading and retrieving the FspInfoheader address to correct this. Signed-off-by: Aravind P R <[email protected]>
tianocore · Jan 29, 2025 · 438cc3a · 438cc3a
1 parent 7c5ec51
commit 438cc3a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm b/IntelFsp2Pkg/FspSecCore/Ia32/FspApiEntryT.nasm
@@ -600,6 +600,7 @@ ASM_PFX(TempRamInitApi):
   SAVE_EDX
 
   CALL_EBP  ASM_PFX(LoadUpdPointerToECX) ; ECX for UPD param
+  mov       esi, eax                     ; save FspInfoHeader to esi
   SAVE_ECX                               ; save UPD param to slot 3 in xmm6
 
   mov       edx, ASM_PFX(PcdGet32 (PcdTemporaryRamSize))

diff --git a/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm b/IntelFsp2Pkg/FspSecCore/X64/FspApiEntryT.nasm
@@ -464,6 +464,13 @@ ASM_PFX(TempRamInitApi):
 ParamValid:
   SAVE_RCX
 
+  ;
+  ; Get FspInfoHeader address
+  ;
+  CALL_RDI  ASM_PFX(AsmGetFspInfoHeaderNoStack)
+  mov       rsi, rax
+  LOAD_RCX
+
   mov       rdx, ASM_PFX(PcdGet32 (PcdTemporaryRamSize))
   mov       edx, DWORD [rdx]
   ;