Date
1 - 3 of 3
[PATCH] UefiPayloadPkg: Support multiple-firmware volume
|
marsx.lin@...
From: MarsX Lin <marsx.lin@...>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4164 To support multiple FVs provided by UPL Cc: Guo Dong <guo.dong@...> Cc: Ray Ni <ray.ni@...> Cc: Sean Rhodes <sean@...> Cc: James Lu <james.lu@...> Cc: Gua Guo <gua.guo@...> Signed-off-by: MarsX Lin <marsx.lin@...> --- .../UefiPayloadEntry/UniversalPayloadEntry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/Uefi= PayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c index 09aee89680..9df7d3ee19 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c @@ -397,12 +397,21 @@ BuildHobs ( GuidHob =3D GetFirstGuidHob (&gUniversalPayloadExtraDataGuid);=0D ASSERT (GuidHob !=3D NULL);=0D ExtraData =3D (UNIVERSAL_PAYLOAD_EXTRA_DATA *)GET_GUID_HOB_DATA (GuidHob= );=0D - ASSERT (ExtraData->Count =3D=3D 1);=0D + DEBUG ((DEBUG_INFO, "Multiple Fv Count=3D%d\n", ExtraData->Count));=0D ASSERT (AsciiStrCmp (ExtraData->Entry[0].Identifier, "uefi_fv") =3D=3D 0= );=0D =0D *DxeFv =3D (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)ExtraData->Entry[0].Base= ;=0D ASSERT ((*DxeFv)->FvLength =3D=3D ExtraData->Entry[0].Size);=0D -=0D + //=0D + // support multiple FVs provided by UPL=0D + //=0D + for (UINT8 idx =3D 1; idx < ExtraData->Count ; idx++) {=0D + BuildFvHob (ExtraData->Entry[idx].Base, ExtraData->Entry[idx].Size);=0D + DEBUG ((DEBUG_INFO, "UPL Multiple fv[%d], Base=3D0x%x, size=3D0x%x\n",= =0D + idx,=0D + ExtraData->Entry[idx].Base,=0D + ExtraData->Entry[idx].Size));=0D + }=0D //=0D // Create guid hob for acpi board information=0D //=0D --=20 2.33.0.windows.2 |
|
|
|
Guo, Gua
Reviewed-by: Gua Guo <gua.guo@...>
toggle quoted message
Show quoted text
-----Original Message-----
From: Lin, MarsX <marsx.lin@...> Sent: Wednesday, November 23, 2022 6:50 PM To: devel@edk2.groups.io Cc: Lin, MarsX <marsx.lin@...>; Dong, Guo <guo.dong@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean <sean@...>; Lu, James <james.lu@...>; Guo, Gua <gua.guo@...> Subject: [PATCH] UefiPayloadPkg: Support multiple-firmware volume From: MarsX Lin <marsx.lin@...> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4164 To support multiple FVs provided by UPL Cc: Guo Dong <guo.dong@...> Cc: Ray Ni <ray.ni@...> Cc: Sean Rhodes <sean@...> Cc: James Lu <james.lu@...> Cc: Gua Guo <gua.guo@...> Signed-off-by: MarsX Lin <marsx.lin@...> --- .../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 |
|
|
|
Lu, James
Reviewed-by: James Lu <james.lu@...>
toggle quoted message
Show quoted text
-----Original Message-----
From: Lin, MarsX <marsx.lin@...> Sent: Wednesday, November 23, 2022 6:50 PM To: devel@edk2.groups.io Cc: Lin, MarsX <marsx.lin@...>; Dong, Guo <guo.dong@...>; Ni, Ray <ray.ni@...>; Rhodes, Sean <sean@...>; Lu, James <james.lu@...>; Guo, Gua <gua.guo@...> Subject: [PATCH] UefiPayloadPkg: Support multiple-firmware volume From: MarsX Lin <marsx.lin@...> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=4164 To support multiple FVs provided by UPL Cc: Guo Dong <guo.dong@...> Cc: Ray Ni <ray.ni@...> Cc: Sean Rhodes <sean@...> Cc: James Lu <james.lu@...> Cc: Gua Guo <gua.guo@...> Signed-off-by: MarsX Lin <marsx.lin@...> --- .../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 |
|
|