UefiPayloadPkg: Update the function definition of HobConstructor

Update the function defination of HobConstructor to align the Phit Hob
structure.

Cc: Maurice Ma <maurice.ma@intel.com>
Cc: Guo Dong <guo.dong@intel.com>
Cc: Benjamin You <benjamin.you@intel.com>
Reviewed-by: Guo Dong <guo.dong@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>

diff --git a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c
index 23a749edf1fcada48aa7cca6858dc86e3bcf8d0e..768c3db770d6682ca6e2d20fc63a94332907a9af 100644 (file)
--- a/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c
+++ b/UefiPayloadPkg/Library/PayloadEntryHobLib/Hob.c
@@ -39,14 +39,14 @@ GetHobList (
 /**\r
   Build a Handoff Information Table HOB\r
 \r
-  This function initialize a HOB region from EfiMemoryBegin with length\r
-  EfiMemoryLength. And EfiFreeMemoryBottom and EfiFreeMemoryTop should\r
+  This function initialize a HOB region from EfiMemoryBegin to\r
+  EfiMemoryTop. And EfiFreeMemoryBottom and EfiFreeMemoryTop should\r
   be inside the HOB region.\r
 \r
-  @param[in] EfiMemoryBegin       Total memory start address\r
-  @param[in] EfiMemoryLength      Total memory length reported in handoff HOB.\r
-  @param[in] EfiFreeMemoryBottom  Free memory start address\r
-  @param[in] EfiFreeMemoryTop     Free memory end address.\r
+  @param[in] EfiMemoryBottom       Total memory start address\r
+  @param[in] EfiMemoryTop          Total memory end address.\r
+  @param[in] EfiFreeMemoryBottom   Free memory start address\r
+  @param[in] EfiFreeMemoryTop      Free memory end address.\r
 \r
   @return   The pointer to the handoff HOB table.\r
 \r
@@ -54,8 +54,8 @@ GetHobList (
 EFI_HOB_HANDOFF_INFO_TABLE*\r
 EFIAPI\r
 HobConstructor (\r
-  IN VOID   *EfiMemoryBegin,\r
-  IN UINTN  EfiMemoryLength,\r
+  IN VOID   *EfiMemoryBottom,\r
+  IN VOID   *EfiMemoryTop,\r
   IN VOID   *EfiFreeMemoryBottom,\r
   IN VOID   *EfiFreeMemoryTop\r
   )\r
@@ -77,11 +77,11 @@ HobConstructor (
   Hob->Version             = EFI_HOB_HANDOFF_TABLE_VERSION;\r
   Hob->BootMode            = BOOT_WITH_FULL_CONFIGURATION;\r
 \r
-  Hob->EfiMemoryTop        = (UINTN)EfiMemoryBegin + EfiMemoryLength;\r
-  Hob->EfiMemoryBottom     = (UINTN)EfiMemoryBegin;\r
-  Hob->EfiFreeMemoryTop    = (UINTN)EfiFreeMemoryTop;\r
-  Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS)(UINTN)(HobEnd+1);\r
-  Hob->EfiEndOfHobList     = (EFI_PHYSICAL_ADDRESS)(UINTN)HobEnd;\r
+  Hob->EfiMemoryTop        = (EFI_PHYSICAL_ADDRESS) EfiMemoryTop;\r
+  Hob->EfiMemoryBottom     = (EFI_PHYSICAL_ADDRESS) EfiMemoryBottom;\r
+  Hob->EfiFreeMemoryTop    = (EFI_PHYSICAL_ADDRESS) EfiFreeMemoryTop;\r
+  Hob->EfiFreeMemoryBottom = (EFI_PHYSICAL_ADDRESS) (UINTN) (HobEnd+1);\r
+  Hob->EfiEndOfHobList     = (EFI_PHYSICAL_ADDRESS) (UINTN) HobEnd;\r
 \r
   mHobList = Hob;\r
   return Hob;\r

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
index 19d2a8d3bd014b5aee2cc798f6e0107c8fc4d9f7..ed956c447ca76e14209828bca5a4ba83c3ed6b28 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.c
@@ -561,7 +561,6 @@ PayloadEntry (
   PHYSICAL_ADDRESS              DxeCoreEntryPoint;\r
   EFI_HOB_HANDOFF_INFO_TABLE    *HandoffHobTable;\r
   UINTN                         MemBase;\r
-  UINTN                         MemSize;\r
   UINTN                         HobMemBase;\r
   UINTN                         HobMemTop;\r
   EFI_PEI_HOB_POINTERS          Hob;\r
@@ -580,9 +579,7 @@ PayloadEntry (
   HobMemBase = ALIGN_VALUE (MemBase + PcdGet32 (PcdPayloadFdMemSize), SIZE_1MB);\r
   HobMemTop  = HobMemBase + FixedPcdGet32 (PcdSystemMemoryUefiRegionSize);\r
 \r
-  // DXE core assumes the memory below HOB region could be used, so include the FV region memory into HOB range.\r
-  MemSize    = HobMemTop - MemBase;\r
-  HandoffHobTable = HobConstructor ((VOID *)MemBase, MemSize, (VOID *)HobMemBase, (VOID *)HobMemTop);\r
+  HobConstructor ((VOID *)MemBase, (VOID *)HobMemTop, (VOID *)HobMemBase, (VOID *)HobMemTop);\r
 \r
   // Build HOB based on information from Bootloader\r
   Status = BuildHobFromBl ();\r

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
index 5a1b37be1646e611c2ca1aada56e59838eeabbdb..1ad7a37023a437a5e2905f5fe690195a2ab1151a 100644 (file)
--- a/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
+++ b/UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.h
@@ -93,14 +93,14 @@ UpdateStackHob (
 /**\r
   Build a Handoff Information Table HOB\r
 \r
-  This function initialize a HOB region from EfiMemoryBegin with length\r
-  EfiMemoryLength. And EfiFreeMemoryBottom and EfiFreeMemoryTop should\r
+  This function initialize a HOB region from EfiMemoryBegin to\r
+  EfiMemoryTop. And EfiFreeMemoryBottom and EfiFreeMemoryTop should\r
   be inside the HOB region.\r
 \r
-  @param[in] EfiMemoryBegin       Total memory start address\r
-  @param[in] EfiMemoryLength      Total memory length reported in handoff HOB.\r
-  @param[in] EfiFreeMemoryBottom  Free memory start address\r
-  @param[in] EfiFreeMemoryTop     Free memory end address.\r
+  @param[in] EfiMemoryBottom       Total memory start address\r
+  @param[in] EfiMemoryTop          Total memory end address.\r
+  @param[in] EfiFreeMemoryBottom   Free memory start address\r
+  @param[in] EfiFreeMemoryTop      Free memory end address.\r
 \r
   @return   The pointer to the handoff HOB table.\r
 \r
@@ -108,8 +108,8 @@ UpdateStackHob (
 EFI_HOB_HANDOFF_INFO_TABLE*\r
 EFIAPI\r
 HobConstructor (\r
-  IN VOID   *EfiMemoryBegin,\r
-  IN UINTN  EfiMemoryLength,\r
+  IN VOID   *EfiMemoryBottom,\r
+  IN VOID   *EfiMemoryTop,\r
   IN VOID   *EfiFreeMemoryBottom,\r
   IN VOID   *EfiFreeMemoryTop\r
   );\r