From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 08FB1941C2B for ; Mon, 28 Aug 2023 20:31:07 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Olzj9K5fOHSa07YzRuDYlq4cbrh+d+//Nl4N9i54GgA=; c=relaxed/simple; d=groups.io; h=ARC-Seal:ARC-Message-Signature:ARC-Authentication-Results:From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1693254666; v=1; b=KlmOLjlX86M9YpOege9/pj9U2m/hpa6vw3nxVyvZPRQqMtqu4u1XmyUMLMobVvvU7w8tr6Wj qlpHvwNFfMeX8/XPauwio2Pvf1EthYYKiAxfqWlt7nl8InA+7M8X1PREe6/nCAbvnPWH831YSJc HHa02Lofk539T3lYsD8C4BFQ= X-Received: by 127.0.0.2 with SMTP id L5YwYY7687511xrquzR94TNP; Mon, 28 Aug 2023 13:31:06 -0700 X-Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.2266.1693254665542575642 for ; Mon, 28 Aug 2023 13:31:06 -0700 X-IronPort-AV: E=McAfee;i="6600,9927,10816"; a="360199661" X-IronPort-AV: E=Sophos;i="6.02,208,1688454000"; d="scan'208";a="360199661" X-Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2023 13:31:04 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10816"; a="803842595" X-IronPort-AV: E=Sophos;i="6.02,208,1688454000"; d="scan'208";a="803842595" X-Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga008.fm.intel.com with ESMTP; 28 Aug 2023 13:31:04 -0700 X-Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27; Mon, 28 Aug 2023 13:31:04 -0700 X-Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.27 via Frontend Transport; Mon, 28 Aug 2023 13:31:04 -0700 X-Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.46) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.27; Mon, 28 Aug 2023 13:31:04 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SkcwU+KBvw00DWTxynjl9xgJJjoj/ML956Qz6UQWPtOsHHSe4GDkc+QdwP1NWYwlMitMuLVD/PtJW1DbBhYrAnLi3j9OwLkSg60Wi/Ui/Mso5X6xnyorFD+4VI7t2HD5O0640377Zhu/Aqbmj7vaY5bpByf8Hz6Tm/ybiifl8vrrYjN+7xLUp4iaJnd2eDuYwsuxkAY7thZYfBYkaHW1rmtoV30D1UfFCSPigtbe569/l0+8m6Dz4NFqGsyeXZg8NbR94nxSKbU6FUo63mgKTFtoLFfI2ii0eH1vhzF/fzoihJTcISo+2+pRrPoB8+dgCpk0XFuhyQgYRbB9LOCpWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YNLOf6OT6SSWxkq/36Ww4wbCnBKGoVNr0pjZHhOCW8A=; b=bh9musSubDHTavE7iGnPRM2zPtC4wOvfRaJ/zAoCUHpg4Mw9ICb0UqSfTV+3RFJyj3pUZE/wYpWzZ+Kmjkr/2Weu+HdkdwKG0TW6oB8j0YzsisbLOzc7AzCiwYa+ywiKATTzf0f7XeaA4+i9BRnc0Njw4WsxwF7zoJfdS5/b7dvTV23R1Iec+VpKUYW2pZcU7n47L8SZKlQg7fcuYQbaP7T6hj2Esrjnfa6RzbH+c6eU7UUmGkFy/VdY+6F54SuWqKfFGZ3djRlq4ZcAcCzTvV2fg9XWkvQt+mDkVr3H2QCMQP5RuCqbGnG2AxaDRVGBGw0s1xui8hzN7SILOHN7BQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none X-Received: from BN9PR11MB5483.namprd11.prod.outlook.com (2603:10b6:408:104::10) by SA2PR11MB4826.namprd11.prod.outlook.com (2603:10b6:806:11c::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6699.34; Mon, 28 Aug 2023 20:31:02 +0000 X-Received: from BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::380d:dcf6:c4b:d48b]) by BN9PR11MB5483.namprd11.prod.outlook.com ([fe80::380d:dcf6:c4b:d48b%4]) with mapi id 15.20.6699.034; Mon, 28 Aug 2023 20:31:02 +0000 From: "Chiu, Chasel" To: "Kuo, Ted" , "devel@edk2.groups.io" CC: "Desimone, Nathaniel L" , "Zeng, Star" , "S, Ashraf Ali" , "Duggapu, Chinni B" , "Ng, Ray Han Lim" , "Mohapatra, Susovan" Subject: Re: [edk2-devel][PATCH v2] IntelFsp2Pkg: Support child FV in SplitFspBin.py Thread-Topic: [edk2-devel][PATCH v2] IntelFsp2Pkg: Support child FV in SplitFspBin.py Thread-Index: AQHZuvPJ4eDuzZscaEWDSI+chmdR1rAAZx8A Date: Mon, 28 Aug 2023 20:31:02 +0000 Message-ID: References: <72954adb273dbf636be248eaee8a35477eae3c50.1689848378.git.ted.kuo@intel.com> In-Reply-To: <72954adb273dbf636be248eaee8a35477eae3c50.1689848378.git.ted.kuo@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BN9PR11MB5483:EE_|SA2PR11MB4826:EE_ x-ms-office365-filtering-correlation-id: 22b0df73-84d9-407f-fc95-08dba805b268 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: LMtB1zISUepG0bBvzzG/mMaOw/xaAManQE0A+CVn+LhOqiVIpNeOhbsjcYcsbfilCLaZCg7+B11uK0kTKR7Qz8knPdQ2mPK+Zu/qWvYIXj5fqSod4gE8bGBfbrI7LG7IZg4VJTbsSNuTPOVJP720W8qOSxpV8eTOHHxkSEMZW3UIT0abtjScPUdxhNALQTT+Dlk0U6izVOcewtEKWWh1FpncQErhmdtlrpV1h9/zHr5is8YUpd6bNbbfvdRWWXtu6EmikQ8RavHHTy9fnVB3e3CHNgxw9VqhSbYplilUZn5zdxkaTuz6xtuCLL0KwQN9RsHVxqymefCTOjcVqZiFPmAVe76jCjL9VXSI2El/1eEQlhJBUoq3ZdMx7fbwxJ1nqHRcCu9J6ndWjjbHAmyW8Zz4kh43ltRApKA0oVVqr5LYhf/qcOgWn5qE2g5afjQDdMsZKHLk2hEdCFUqny0kaVW/zdI91wxO0cWV8C8PzUUlWdBBqweAWWUfigXfSmGLdie9Gw49aeM1DvP41Bk5Gd1PN10m+nzhp7oCuv3gBGBuSG5P32YYm2kPUxI5z4WXrtO50vLFaQ4vNKVVX0eCetYHhr26HF7XKqYVfz8whOyKW15C2YJhTNeX3F6n7TibnGkL+NLipjKzieAgvF/rZiRcza29JMzAwZ+e0OVaVaYhxvuzqj6dnsfU1Qm9m4eg x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?4H1GnlMGdP0Vgd03PVY9r2qXEwLEzgEMTPAMg693KLlok/32vuw76DtICegk?= =?us-ascii?Q?GTgDZyWGvSw+Nnfbv8o9zCSYn6hBwz8LKtwPQSUmhQ5tOjjurJzu4y7u+IPu?= =?us-ascii?Q?qFU5+WlMWjFDsZD/A9wfklM7Sk6wfUgP/E93h9M803AaS3UDD6v5F5Z4u4vx?= =?us-ascii?Q?QleAwXthHljPKbtVb4yPedEySv9PqE1XnEprndtr0Asg46hjA0sT51esCfb7?= =?us-ascii?Q?J16IfLqT+IOh+INY2x5h2L6RyyPMiPIag3JdzM1hNfsVXZUZ4tL3owOM0DFn?= =?us-ascii?Q?xuhFFhLsjLnptjQ1fdjQgXm9VaPD2Hy3t0yRIY8aJpuco1cRAmExaulnoqpE?= =?us-ascii?Q?vNlELeFHEhyUBuUDoKdWVpJhEH9QdAIA4GiQtLJh2Qo8ngfi4qyVhPOR9/g2?= =?us-ascii?Q?X/pYpfMhsTla/xgdJBW7uB8iN7eO3tVuXBV7hJCVLHy8BNIoPVkn36OsQW8z?= =?us-ascii?Q?gS/Vtu2LSOP/tsVqPtvZRHXNQ/pN0/JNgCwHPzJnyIZBBtHq/KbIIuYdbXyU?= =?us-ascii?Q?2Xtk7M7l8XnA9X3b6oHy30pkKFRXwuxNiL16mQh/HI1HgCwO0ETigUkZjpA8?= =?us-ascii?Q?yy1tQnjU24APHOX4CSAkPkG7BZAoCiJRQvbO2KzsPlZ96nmk/Hlr8G/oRuCw?= =?us-ascii?Q?rnGfrofroFHUXEnhKl/RKhF/WjcCd4Oj+DhM7sEuuuHYq5xLXiiMUKh30rTT?= =?us-ascii?Q?8vqsPMtcPfsjgaZ9gS3cqBG/xEdxUUijteuQfy3k2jSK0Xv9ETFTYczOsVlF?= =?us-ascii?Q?zWm/QWZq1LSlzMTXpzd0E9Af1XPrPI6Uk6fO5/4lqnETzCQGnFPIumB0bs38?= =?us-ascii?Q?unYXtDWGDxe24s4UtA/H+O4uqZB7moiFzvVFqFYPiOtSpmwBiBSfHPXrCjda?= =?us-ascii?Q?2kyfaU0kC0P5g5wAYj8BqVfRPTnC5r0BOY6Tj+BSVd+dhaOmhQNcKFWq1Wlb?= =?us-ascii?Q?SesZwzgDafta7BJRvFRBe4A/zC4nU9rzN9dkZ7OZ1fLweQywcEr2VXgkS5uS?= =?us-ascii?Q?2J0DQO+8Mz6fh25jpWPUJ0huqiZp2GCu4/mfEtClDGbKgpXecnsEe0xmqzPN?= =?us-ascii?Q?WBO7ERpro7/ulCOd+SXGfM5muulCtmn0Vu3U06/d0hhpmDvlc0T2M96wvDNW?= =?us-ascii?Q?5rK/BkMCp6jbkE32Mw0T7F8DTDyijGx/GTIPDM/h2IFZsbcvsX7FT1+u7NjT?= =?us-ascii?Q?oWbkNPM4MARQnaospSkkBcQZlpRFz+KH/OKcwxTMYUahCTcU2M1lDp/UVKSz?= =?us-ascii?Q?YpwSpzbmACGnCDDv0UzqhP4oiwwpYzIgLD1aKsotAtxUUVq59kMqZ5eeRoKc?= =?us-ascii?Q?5aRM8vWTbanffyU7EmQuxwtwaU0dUG4gMfYjND7S4OOrpZfrK/qLtPBdoj9w?= =?us-ascii?Q?3TuzIq82irHfAf7QaTYR5C7542wIUAXIcMSitGlsRw6Q8JS+N8IsfqY29wWr?= =?us-ascii?Q?LNISxRvep45jyMCCyqY6RjmLIB8mlurTo0wqQTUj45EOJkAKPuYIZWgQuJB6?= =?us-ascii?Q?a56zj3LhFpTKkO//rrcuZKgSUYs/Vz1xJZr+t9pBjSZ9/cKzX8NPNEYDXzXk?= =?us-ascii?Q?VX7Ao6UVbdslrJjV9wWENClMYzGP76A7Du+rzSgN?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN9PR11MB5483.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22b0df73-84d9-407f-fc95-08dba805b268 X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Aug 2023 20:31:02.4462 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: aVvokqCxKZrdyHqN41Hf3cPEfm99zpxm7+4RMMqhDVjQ/WankZiH3lRGjRc0z7iN+osZOptTO6yLtM9STX0fDQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4826 X-OriginatorOrg: intel.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,chasel.chiu@intel.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: NLUsZmU9VKTkpCDI5mleFrDGx7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=KlmOLjlX; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=intel.com (policy=none); spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io Merged: https://github.com/tianocore/edk2/commit/2c7fd32676272e22ed44fdfc8fa7e47f5c= 7a93b8 Thanks, Chasel > -----Original Message----- > From: Kuo, Ted > Sent: Thursday, July 20, 2023 3:20 AM > To: devel@edk2.groups.io > Cc: Chiu, Chasel ; Desimone, Nathaniel L > ; Zeng, Star ; S, As= hraf > Ali ; Duggapu, Chinni B ; > Ng, Ray Han Lim ; Mohapatra, Susovan > > Subject: [edk2-devel][PATCH v2] IntelFsp2Pkg: Support child FV in SplitFs= pBin.py >=20 > https://bugzilla.tianocore.org/show_bug.cgi?id=3D4502 > Update SplitFspBin.py to support child FV in FSP binary. Without the patc= h, the > tool won't be able to rebase the images in child FV in FSP binary. >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Star Zeng > Cc: Ashraf Ali S > Cc: Chinni B Duggapu > Cc: Ray Han Lim Ng > Cc: Susovan Mohapatra > Signed-off-by: Ted Kuo > --- > IntelFsp2Pkg/Tools/SplitFspBin.py | 44 ++++++++++++++++++++++++++----- > 1 file changed, 37 insertions(+), 7 deletions(-) >=20 > diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py b/IntelFsp2Pkg/Tools/Split= FspBin.py > index 419e5ba985..558eaf401a 100644 > --- a/IntelFsp2Pkg/Tools/SplitFspBin.py > +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py > @@ -469,6 +469,7 @@ class FirmwareVolume: > else: self.FvExtHdr =3D None self.FfsList = =3D []+ self.ChildFvList =3D > [] def ParseFv(self): fvsize =3D len(self.FvData)@@ -483,8 += 484,30 @@ class > FirmwareVolume: > offset =3D fvsize else: ffs = =3D FirmwareFile (offset, > self.FvData[offset:offset + int(ffshdr.Size)])- ffs.ParseF= fs()- > self.FfsList.append(ffs)+ # check if there is child fv+ = childfvfound > =3D 0+ if (ffs.FfsHdr.Type =3D=3D > EFI_FV_FILETYPE.FIRMWARE_VOLUME_IMAGE):+ csoffset =3D = offset + > sizeof (EFI_FFS_FILE_HEADER)+ csoffset =3D AlignPtr(cs= offset, 4)+ > # find fv section+ while csoffset < (offset + int(ffs.= FfsHdr.Size)):+ > cshdr =3D EFI_COMMON_SECTION_HEADER.from_buffer (self.FvData, csoffset)+ > if (cshdr.Type =3D=3D EFI_SECTION_TYPE.FIRMWARE_VOLUME_IMAGE):+ > childfvfound =3D 1+ break+ = else:+ # > check next section+ csoffset +=3D int(cshdr.Si= ze)+ > csoffset =3D AlignPtr(csoffset, 4)+ if (childfvfound):+ = childfvoffset > =3D csoffset + sizeof (EFI_COMMON_SECTION_HEADER)+ chi= ldfvhdr =3D > EFI_FIRMWARE_VOLUME_HEADER.from_buffer (self.FvData, childfvoffset)+ > childfv =3D FirmwareVolume (childfvoffset, self.FvData[childfvoffset:chil= dfvoffset + > int(childfvhdr.FvLength)])+ childfv.ParseFv ()+ > self.ChildFvList.append(childfv)+ else:+ = ffs.ParseFfs()+ > self.FfsList.append(ffs) offset +=3D int(ffshdr.Size) = offset =3D > AlignPtr(offset) @@ -789,6 +812,13 @@ def SplitFspBin (fspfile, outdir, > nametemplate): > hfsp.write(fv.FvData) hfsp.close() +def GetImageFrom= Fv (fd, > parentfvoffset, fv, imglist):+ for ffs in fv.FfsList:+ for sec = in ffs.SecList:+ > if sec.SecHdr.Type in [EFI_SECTION_TYPE.TE, EFI_SECTION_TYPE.PE32]: # T= E or > PE32+ offset =3D fd.Offset + parentfvoffset + fv.Offset + = ffs.Offset + > sec.Offset + sizeof(sec.SecHdr)+ imglist.append ((offset, = len(sec.SecData) > - sizeof(sec.SecHdr)))+ def RebaseFspBin (FspBinary, FspComponent, FspBas= e, > OutputDir, OutputFile): fd =3D FirmwareDevice(0, FspBinary) fd.Pa= rseFd ()@@ - > 832,11 +862,11 @@ def RebaseFspBin (FspBinary, FspComponent, FspBase, > OutputDir, OutputFile): > imglist =3D [] for fvidx in fsp.FvIdxList: f= v =3D fd.FvList[fvidx]- for > ffs in fv.FfsList:- for sec in ffs.SecList:- = if sec.SecHdr.Type in > [EFI_SECTION_TYPE.TE, EFI_SECTION_TYPE.PE32]: # TE or PE32- > offset =3D fd.Offset + fv.Offset + ffs.Offset + sec.Offset + sizeof(sec.S= ecHdr)- > imglist.append ((offset, len(sec.SecData) - sizeof(sec.SecHdr)))+ > GetImageFromFv (fd, 0, fv, imglist)+ # get image from child fv= + for > childfv in fv.ChildFvList:+ print ("Get image from child f= v of fv%d, parent > fv offset: 0x%x" % (fvidx, fv.Offset))+ GetImageFromFv (fd= , fv.Offset, > childfv, imglist) fcount =3D 0 pcount =3D 0-- > 2.40.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#108066): https://edk2.groups.io/g/devel/message/108066 Mute This Topic: https://groups.io/mt/100252890/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-