I’ve added push label, it will be merged tomorrow. From: Lean Sheng Tan <sheng....@9elements.com> Sent: Monday, June 10, 2024 11:28 PM To: Witt, Sebastian <sebastian.w...@siemens.com> Cc: Guo, Gua <gua....@intel.com>; devel@edk2.groups.io; Rhodes, Sean <sean@starlabs.systems>; Lu, James <james...@intel.com>; Dong, Guo <guo.d...@intel.com> Subject: Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix LoadDxeCore for payload size > 16MB
Hi Gua/ Dong Guo, Do you know how to proceed? https://github.com/tianocore/edk2/pull/5732 Does the patch submitter have to actively rebase its patch? Best Regards, Lean Sheng Tan [http://static.9elements.com/logo-signature.png] 9elements GmbH, Kortumstraße 19-21, 44787 Bochum, Germany Email: sheng....@9elements.com<mailto:sheng....@9elements.com> Phone: +49 234 68 94 188<tel:+492346894188> Mobile: +49 176 76 113842<tel:+4917676113842> Registered office: Bochum Commercial register: Amtsgericht Bochum, HRB 17519 Management: Sebastian German, Eray Bazaar Data protection information according to Art. 13 GDPR<https://9elements.com/privacy> On Thu, 6 Jun 2024 at 15:38, Witt, Sebastian <sebastian.w...@siemens.com<mailto:sebastian.w...@siemens.com>> wrote: Done here: https://github.com/tianocore/edk2/pull/5732 Regards, Sebastian From: Guo, Gua <gua....@intel.com<mailto:gua....@intel.com>> Sent: Wednesday, 5 June 2024 16:22 To: Tan, Lean Sheng <sheng....@9elements.com<mailto:sheng....@9elements.com>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>; Witt, Sebastian (DI FA CTR IPC PRC2) <sebastian.w...@siemens.com<mailto:sebastian.w...@siemens.com>>; Rhodes, Sean <sean@starlabs.systems<mailto:sean@starlabs.systems>>; Lu, James <james...@intel.com<mailto:james...@intel.com>>; Dong, Guo <guo.d...@intel.com<mailto:guo.d...@intel.com>> Subject: Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix LoadDxeCore for payload size > 16MB Please send PR also. ________________________________ From: Lean Sheng Tan <sheng....@9elements.com<mailto:sheng....@9elements.com>> Sent: Wednesday, June 5, 2024 10:18:27 PM To: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>>; Witt, Sebastian <sebastian.w...@siemens.com<mailto:sebastian.w...@siemens.com>>; Guo, Gua <gua....@intel.com<mailto:gua....@intel.com>>; Rhodes, Sean <sean@starlabs.systems<mailto:sean@starlabs.systems>>; Lu, James <james...@intel.com<mailto:james...@intel.com>>; Dong, Guo <guo.d...@intel.com<mailto:guo.d...@intel.com>> Subject: Re: [edk2-devel] [PATCH] UefiPayloadPkg: Fix LoadDxeCore for payload size > 16MB + edk2 payload maintainers Best Regards, Lean Sheng Tan [Image removed by sender.] 9elements GmbH, Kortumstraße 19-21, 44787 Bochum, Germany Email: sheng....@9elements.com<mailto:sheng....@9elements.com> Phone: +49 234 68 94 188<tel:+492346894188> Mobile: +49 176 76 113842<tel:+4917676113842> Registered office: Bochum Commercial register: Amtsgericht Bochum, HRB 17519 Management: Sebastian German, Eray Bazaar Data protection information according to Art. 13 GDPR<https://9elements.com/privacy> On Mon, 3 Jun 2024 at 23:20, Witt, Sebastian via groups.io<http://groups.io/> <sebastian.witt=siemens....@groups.io<mailto:siemens....@groups.io>> wrote: Fix calculation of first section in FileFindSection for FILE2 headers in UefiPayloadEntry module. Signed-of-by: Sebastian Witt <sebastian.w...@siemens.com<mailto:sebastian.w...@siemens.com>> --- UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c b/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c index 898d610951..9cb6edefcf 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c +++ b/UefiPayloadPkg/UefiPayloadEntry/LoadDxeCore.c @@ -211,13 +211,14 @@ FileFindSection ( if (IS_FFS_FILE2 (FileHeader)) { FileSize = FFS_FILE2_SIZE (FileHeader); + Section = (EFI_COMMON_SECTION_HEADER *)(((EFI_FFS_FILE_HEADER2 *)FileHeader) + 1); } else { FileSize = FFS_FILE_SIZE (FileHeader); + Section = (EFI_COMMON_SECTION_HEADER *)(FileHeader + 1); } FileSize -= sizeof (EFI_FFS_FILE_HEADER); - Section = (EFI_COMMON_SECTION_HEADER *)(FileHeader + 1); Index = 0; while (Index < FileSize) { if (Section->Type == SectionType) { -- 2.39.2 -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#119537): https://edk2.groups.io/g/devel/message/119537 Mute This Topic: https://groups.io/mt/106471262/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
