From d63595c3c91624f258f291adee329724edeac12e Mon Sep 17 00:00:00 2001 From: Zhiguang Liu Date: Sun, 25 Apr 2021 15:50:46 +0800 Subject: UefiPayloadPkg: Update the function definition of HobConstructor Update the function defination of HobConstructor to align the Phit Hob structure. Cc: Maurice Ma Cc: Guo Dong Cc: Benjamin You Reviewed-by: Guo Dong Signed-off-by: Zhiguang Liu --- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c | 5 +---- UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 12 deletions(-) (limited to 'UefiPayloadPkg/UefiPayloadEntry') diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c index 19d2a8d3bd..ed956c447c 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c @@ -561,7 +561,6 @@ PayloadEntry ( PHYSICAL_ADDRESS DxeCoreEntryPoint; EFI_HOB_HANDOFF_INFO_TABLE *HandoffHobTable; UINTN MemBase; - UINTN MemSize; UINTN HobMemBase; UINTN HobMemTop; EFI_PEI_HOB_POINTERS Hob; @@ -580,9 +579,7 @@ PayloadEntry ( HobMemBase = ALIGN_VALUE (MemBase + PcdGet32 (PcdPayloadFdMemSize), SIZE_1MB); HobMemTop = HobMemBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize); - // DXE core assumes the memory below HOB region could be used, so include the FV region memory into HOB range. - MemSize = HobMemTop - MemBase; - HandoffHobTable = HobConstructor ((VOID *)MemBase, MemSize, (VOID *)HobMemBase, (VOID *)HobMemTop); + HobConstructor ((VOID *)MemBase, (VOID *)HobMemTop, (VOID *)HobMemBase, (VOID *)HobMemTop); // Build HOB based on information from Bootloader Status = BuildHobFromBl (); diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h index 5a1b37be16..1ad7a37023 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h +++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h @@ -93,14 +93,14 @@ UpdateStackHob ( /** Build a Handoff Information Table HOB - This function initialize a HOB region from EfiMemoryBegin with length - EfiMemoryLength. And EfiFreeMemoryBottom and EfiFreeMemoryTop should + This function initialize a HOB region from EfiMemoryBegin to + EfiMemoryTop. And EfiFreeMemoryBottom and EfiFreeMemoryTop should be inside the HOB region. - @param[in] EfiMemoryBegin Total memory start address - @param[in] EfiMemoryLength Total memory length reported in handoff HOB. - @param[in] EfiFreeMemoryBottom Free memory start address - @param[in] EfiFreeMemoryTop Free memory end address. + @param[in] EfiMemoryBottom Total memory start address + @param[in] EfiMemoryTop Total memory end address. + @param[in] EfiFreeMemoryBottom Free memory start address + @param[in] EfiFreeMemoryTop Free memory end address. @return The pointer to the handoff HOB table. @@ -108,8 +108,8 @@ UpdateStackHob ( EFI_HOB_HANDOFF_INFO_TABLE* EFIAPI HobConstructor ( - IN VOID *EfiMemoryBegin, - IN UINTN EfiMemoryLength, + IN VOID *EfiMemoryBottom, + IN VOID *EfiMemoryTop, IN VOID *EfiFreeMemoryBottom, IN VOID *EfiFreeMemoryTop ); -- cgit v1.2.3