Re: [PATCH] UefiPayloadPkg: Support multiple-firmware volume

["Guo, Gua" <gua.guo@intel.com>]

Reviewed-by: Gua Guo <gua.guo@intel.com>  

-----Original Message-----
From: Lin, MarsX <marsx.lin@intel.com> 
Sent: Wednesday, November 23, 2022 6:50 PM
To: devel@edk2.groups.io
Cc: Lin, MarsX <marsx.lin@intel.com>; Dong, Guo <guo.dong@intel.com>; Ni, Ray <ray.ni@intel.com>; Rhodes, Sean <sean@starlabs.systems>; Lu, James <james.lu@intel.com>; Guo, Gua <gua.guo@intel.com>
Subject: [PATCH] UefiPayloadPkg: Support multiple-firmware volume

From: MarsX Lin <marsx.lin@intel.com>

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4164

To support multiple FVs provided by UPL

Cc: Guo Dong <guo.dong@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Sean Rhodes <sean@starlabs.systems>
Cc: James Lu <james.lu@intel.com>
Cc: Gua Guo <gua.guo@intel.com>

Signed-off-by: MarsX Lin <marsx.lin@intel.com>
---
 .../UefiPayloadEntry/UniversalPayloadEntry.c        | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
index 09aee89680..9df7d3ee19 100644
--- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
+++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c
@@ -397,12 +397,21 @@ BuildHobs (
   GuidHob = GetFirstGuidHob (&gUniversalPayloadExtraDataGuid);

   ASSERT (GuidHob != NULL);

   ExtraData = (UNIVERSAL_PAYLOAD_EXTRA_DATA *)GET_GUID_HOB_DATA (GuidHob);

-  ASSERT (ExtraData->Count == 1);

+  DEBUG ((DEBUG_INFO, "Multiple Fv Count=%d\n", ExtraData->Count));

   ASSERT (AsciiStrCmp (ExtraData->Entry[0].Identifier, "uefi_fv") == 0);

 

   *DxeFv = (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)ExtraData->Entry[0].Base;

   ASSERT ((*DxeFv)->FvLength == ExtraData->Entry[0].Size);

-

+  //

+  // support multiple FVs provided by UPL

+  //

+  for (UINT8 idx = 1; idx < ExtraData->Count ; idx++) {

+    BuildFvHob (ExtraData->Entry[idx].Base, ExtraData->Entry[idx].Size);

+    DEBUG ((DEBUG_INFO, "UPL Multiple fv[%d], Base=0x%x, size=0x%x\n",

+    idx,

+    ExtraData->Entry[idx].Base,

+    ExtraData->Entry[idx].Size));

+  }

   //

   // Create guid hob for acpi board information

   //

-- 
2.33.0.windows.2