From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web09.16075.1605141464873170952 for ; Wed, 11 Nov 2020 16:37:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=qqkS+gAI; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: chasel.chiu@intel.com) IronPort-SDR: xtZpwU9/o+zFp8SpP0VB/hN7iGrxCb7Oe9E0SywcrCIj8f0Bn1eZ4X+c1/Ui5qVdr/MqbAnPlv nGEVdcNA88+A== X-IronPort-AV: E=McAfee;i="6000,8403,9802"; a="150089307" X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="150089307" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 Nov 2020 16:37:35 -0800 IronPort-SDR: CL8Vt/EL1Oi6y9C9h6Og0b7S7B7hqFLtog+shpKw6G5yYPhBI4Uyjtjxh5aU9kIdTk74CDVzXg a+5lv/BDguAw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,471,1596524400"; d="scan'208";a="531920669" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga005.fm.intel.com with ESMTP; 11 Nov 2020 16:37:35 -0800 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 11 Nov 2020 16:37:35 -0800 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Wed, 11 Nov 2020 16:37:35 -0800 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5 via Frontend Transport; Wed, 11 Nov 2020 16:37:35 -0800 Received: from NAM02-BL2-obe.outbound.protection.outlook.com (104.47.38.59) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.1713.5; Wed, 11 Nov 2020 16:37:34 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iQeCl3TP5YZYxKDALUziZhbayG2IQ/kj4+ivZvzqEenxPO9DWaCMplRt03jwx/XzfAAKiwFQEdtZbo21IKthj6WP6qRwZgmkPW8CNi3bk026+VRejmT5llnNZVFgCJTCxvBloNjMWW8dN02BHvc3xjnJi7kPU9IFusCaXVSb8g79D3TRFaAur7ZvstS5j3gU25HBS0W9krg5AvYAL4Wue5RNI8fvR5QkNPZbAYG1b8jl+FEzkjOKydb5gugfq+50N5eInTOeGWBmOcP1khiFvDsJ86qAKMGrTIFMJG/9dSvWeZjMK3/bpAVmdKmXO2PqdA+M8Kiqa0i3fd9WVXyT/w== 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-SenderADCheck; bh=Do0ReEt5RWj13aPkJKeCmoGyXXKx+EtrYz/s2U/kIgQ=; b=YCmYN/sEzMsurhO5ugMGdZMYsPI85mlTxyc/wfzpu2lTXWtU/3kIyizhlkBRPkAPUxyUBVKRcU+gM8uVeDtYiDu+75zwovbUALmLwU8lfJh015/g7RX3WT6/RUue6iUTNJXMfgLL67oT2tudQHE0V8a88ie+6lDZVxK4QSCo8c+dv6h0i7qJk7y/qKREmhaxMA9kiNVww9oQ65l0zG+FJBypINBmaurg7y21hBf/yBVvT6eEI24jsDmYAbmvCIwFUYuhH1h3XuOKuhUiT1UNuyK6ysGpTvcUIRKu4sbqv6/Eu7d+fXThyyiKwL2FujDjoMNaOU3o4iBpGrIDPLsBtw== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Do0ReEt5RWj13aPkJKeCmoGyXXKx+EtrYz/s2U/kIgQ=; b=qqkS+gAIezqtVQ/EN55I5+PBV0uAejx3cUmZWHIWNgwgJjdztg2zrGPh/JLQLNZalmWtxRurAlSsK8zzMiAQV6ziWOX/hXwtNL0uwqQDHTm4D5BhOLEnUm9GeoQp0VXcyMNdUBcKfsYauIm8X4xPETjN3n2oEakTAo5FMI+sseY= Received: from SN6PR11MB2814.namprd11.prod.outlook.com (2603:10b6:805:55::15) by SA0PR11MB4733.namprd11.prod.outlook.com (2603:10b6:806:9a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3541.21; Thu, 12 Nov 2020 00:37:33 +0000 Received: from SN6PR11MB2814.namprd11.prod.outlook.com ([fe80::4540:a6b5:b0bc:9d82]) by SN6PR11MB2814.namprd11.prod.outlook.com ([fe80::4540:a6b5:b0bc:9d82%4]) with mapi id 15.20.3499.032; Thu, 12 Nov 2020 00:37:33 +0000 From: "Chiu, Chasel" To: "Ma, Maurice" , "devel@edk2.groups.io" CC: "Ma, Maurice" , "Desimone, Nathaniel L" , "Zeng, Star" Subject: Re: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Thread-Topic: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ image Thread-Index: AQHWuIhvsluS452L+UeHfvbPS0LLr6nDpsiw Date: Thu, 12 Nov 2020 00:37:33 +0000 Message-ID: References: <6799c7ce4aff0db1d5d0c6afe2901fb10bc939a9.1605139779.git.maurice.ma@intel.com> In-Reply-To: <6799c7ce4aff0db1d5d0c6afe2901fb10bc939a9.1605139779.git.maurice.ma@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [180.217.106.160] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 57818351-944f-452e-4263-08d886a3255b x-ms-traffictypediagnostic: SA0PR11MB4733: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:3631; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: vfSe8CChTnTPLJPZBoBD01FSArray3FgkutGMq/WL7FwaF1EnQg1NGNQhG5yo9wdk9M6PH4nj25oZY4Vvly86O6uhR43y0hpFu1nIZ1MrR2mc21YpbegI8MQriQqCiSN8viSOSMCoyGhb73lRytgG/XXBisbiIPp0sad5d8cUYgL01Uv3rNVpUmF09A7Ghs0jN5UTzvP6CehyViJ45UjL6PSm4puXFF/v6eCVkDn4lMOqwrpDPkI87OdHOFdBzIOmcTW5MTc20QzRh/qBDdNumbKwv9VSQR26MBs1w4aoVTS7xgQvtOmJvqJL2XCiuWTK8b3T8AGhUNmCjJzbVdCDA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:SN6PR11MB2814.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(39860400002)(376002)(366004)(346002)(396003)(136003)(478600001)(8936002)(76116006)(66476007)(66946007)(55016002)(8676002)(110136005)(54906003)(83380400001)(64756008)(9686003)(107886003)(2906002)(5660300002)(316002)(71200400001)(52536014)(4326008)(19627235002)(26005)(66556008)(33656002)(66446008)(6506007)(86362001)(7696005)(186003)(53546011);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: D4KlROfgzvSSYIzyoeSpjD5gT3NY/D0FZb9Vap6DGfVtm4VVqHWrulp+uqywRFBP0MZSvdUkKfGWVcgB3HFGj9Px4PMGNEkDDCoZ0bsnHOjnUZHBKDkIPz4jqijg+6kQVbrjAvQ+zE+FmTQe6wjlm3OGkKCrkJ4xmHWszxv74fZbJLXTkZ/sl27gTOYiCv4f8cWrLdPHMyN+WDXaCLW/Y6VeMhLExpVhg+vnd6AGnWVPT57GrOunO7NjvVhYaVxplpKo88ENcCq5ucqVqTUp5VI8q1H4lL++U4437HPUGjzeIuKqsgsP5Scd7TLANA4iHVJXGe6RzkZ290xnBScX9+IJ9gzDFRyguoQFnuVqg9KncCzSUKirhIuLSKT573+QC0UNyc2vxphXJkA+t2mdjmYTdDtOkuULJ0fzE2IVIxGLAx3Rk8d+Y/mijamvj+fixnScsUq5/xoXmgY0gpOTXBMyF1hbtUEwquWou0qfpvukGInzmDMnnQHLzn64IuBF5bARWBvBnrHkBh/69piXeevxuwdZjHMg4ymuVHzSxjc43vVe8TjfM9OHfWFM0Y6W61rHv5OoUvCB0EVJuelfmRVGfsvbURC79chZBAKeKNiuRXMDbQ/u3LWIQIfl6ZT1LKciGcfoSb2qwKWYj74Aeg== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: SN6PR11MB2814.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 57818351-944f-452e-4263-08d886a3255b X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Nov 2020 00:37:33.5815 (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: LkCnrUA2Qx8pItSiZKW67Q6Fg4pkmJe1HfxqfGzijQW74NC6Y+MNolDiJ3jmNTIK3JA8NxHGAYiiWeAu7lH44A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR11MB4733 Return-Path: chasel.chiu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Chasel Chiu > -----Original Message----- > From: Maurice Ma > Sent: Thursday, November 12, 2020 8:11 AM > To: devel@edk2.groups.io > Cc: Ma, Maurice ; Chiu, Chasel > ; Desimone, Nathaniel L > ; Zeng, Star > Subject: [PATCH] IntelFsp2Pkg: Fix FSP binary rebasing issue for PE32+ im= age >=20 > Current FSP rebasing script SplitFspBin.py has support for both > PE32 and PE32+ image formats. However, while updating the ImageBase field= in > the image header, it always assumed the ImageBase field is 32bit long. Si= nce > PE32+ image format defined ImageBase as 64bit, the current script will on= ly > update the lower 32bit value and leave the upper 32bit untouched. It does= not > work well for PE32+ image that requires update in the upper 32bit ImageBa= se > field. The expected behavior is to update the full 64bit field. This patc= h > implemented this fix. >=20 > Signed-off-by: Maurice Ma >=20 > Cc: Chasel Chiu > Cc: Nate DeSimone > Cc: Star Zeng > --- > IntelFsp2Pkg/Tools/SplitFspBin.py | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) >=20 > diff --git a/IntelFsp2Pkg/Tools/SplitFspBin.py > b/IntelFsp2Pkg/Tools/SplitFspBin.py > index 3c0d5af1b6..24272e82af 100644 > --- a/IntelFsp2Pkg/Tools/SplitFspBin.py > +++ b/IntelFsp2Pkg/Tools/SplitFspBin.py > @@ -677,8 +677,12 @@ class PeTeImage: > else: offset =3D self.Offset + self.DosHdr.e_lfanew= offset +=3D > EFI_IMAGE_NT_HEADERS32.OptionalHeader.offset- offset +=3D > EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset- size =3D > EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size+ if > self.PeHdr.OptionalHeader.PePlusOptHdr.Magic =3D=3D 0x20b: # PE32+ image+ > offset +=3D EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.offset+ > size =3D EFI_IMAGE_OPTIONAL_HEADER32_PLUS.ImageBase.size+ e= lse:+ > offset +=3D EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.offset+ = size =3D > EFI_IMAGE_OPTIONAL_HEADER32.ImageBase.size value =3D > Bytes2Val(fdbin[offset:offset+size]) + delta fdbin[offset:offset+= size] =3D > Val2Bytes(value, size)-- > 2.29.2.windows.1