From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web08.13826.1605399531245367906 for ; Sat, 14 Nov 2020 16:18:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=ofFvH8QR; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: nathaniel.l.desimone@intel.com) IronPort-SDR: X1d4IRQQdW+TB70K52UYWyj6tfTcYJ0KakAhNc3qLzP0xSEgeZ7A03q32QUvFjYx12ITcdbqAo DEL3hZsPXOMw== X-IronPort-AV: E=McAfee;i="6000,8403,9805"; a="149876687" X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="149876687" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Nov 2020 16:18:43 -0800 IronPort-SDR: HtfwEhszatYHF5Ms0cuzK2+tU4ZA5Fj9n1Ei47uj0Un114GyvT81I+NqOUHE0aubDWwQvfiTMr 2AJ1ySsOz7KA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,479,1596524400"; d="scan'208";a="367107779" Received: from orsmsx605.amr.corp.intel.com ([10.22.229.18]) by FMSMGA003.fm.intel.com with ESMTP; 14 Nov 2020 16:18:22 -0800 Received: from orsmsx607.amr.corp.intel.com (10.22.229.20) by ORSMSX605.amr.corp.intel.com (10.22.229.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 14 Nov 2020 16:18:22 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX607.amr.corp.intel.com (10.22.229.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Sat, 14 Nov 2020 16:18:21 -0800 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.1713.5 via Frontend Transport; Sat, 14 Nov 2020 16:18:21 -0800 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.40) 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.1713.5; Sat, 14 Nov 2020 16:18:19 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l+2vmmgKufr0NeW3vVGU116EzDh0sN/9guBgzo44viQhgg7JsZx93TAx7PRMLUfIzuigMWBDxA63MwFz3wvwq/FE9thFaNeSG6+h80eOugNngbeqe+3UJkTVncs9UBctHmAYZ04EN8dEJbS/yBU0ndLcdWivjVpsU+KqaP5TidUVZZeF5jQMUwphaTwM91BSdzk55toCE1xmfvRN7bQZTEBmbqMFPkjNGEMXR6/qFNV84lhYyiXEi/Jw1NNwz+sX5nNOGFawCJH158zTQsOWgPV7F1b8jKk33+82xYwXGWSZJAZRecjdAc533qqGmNBSNPIn2T2alOpxlrNJ5ReBAQ== 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=eD7cf2iqKkmYKjg5RhxWFt8Ux6Ca37Q7ronmR0389ls=; b=FsTFx45P+pNrTRTkH3sb7NrQnQUe//MZD1dwSKBYa4ZSpC+QuesNVYLLFfOz9xCR5TbRDJazSXojezGDSMJGKzjM07s+FTHsm+VuyzIRbWSBxTIHi7Xs/QoZI/A6Ne8Tr8ta6QN3URLutYoFpGL6XH+asDy5MdTFX7oTK72Ve89+m9gUXjVvDvqP8ou+19mX1+MHmJhvsFWoKqUAa6tnaOnOdXqEVLvd9f3BPnWZmlUlm7GoX0Qa7ksDwAqVnKw/zlYYHKGai1CYggIDOo0saXgMoCImfRdbVXbR9RTfpvAmSKU9MaDwi/2VIRyKfSXK8Y0BQYKJLLZTBJelziHm7g== 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=eD7cf2iqKkmYKjg5RhxWFt8Ux6Ca37Q7ronmR0389ls=; b=ofFvH8QRw0zmrLSPaL6J1GZSHG4cLxXbUeOB7ld4JbPG3QxU6Mi3gfPvptWc9VuFrOXYLCNS2dHoSE3SWuqeweg6sGWgWqoD7+E/tNGKXUeVsvpmXYvHJQp4/Q2/TrB/4PitEhC25cdg0v64mqeDi2fs6rWg1xi/5EsI2TsktWA= Received: from MWHPR1101MB2160.namprd11.prod.outlook.com (2603:10b6:301:5b::12) by CO1PR11MB5059.namprd11.prod.outlook.com (2603:10b6:303:9a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.25; Sun, 15 Nov 2020 00:18:17 +0000 Received: from MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710]) by MWHPR1101MB2160.namprd11.prod.outlook.com ([fe80::3161:c00f:c5c5:f710%8]) with mapi id 15.20.3564.028; Sun, 15 Nov 2020 00:18:17 +0000 From: "Nate DeSimone" To: "Ma, Maurice" , "devel@edk2.groups.io" CC: "Ma, Maurice" , "Chiu, Chasel" , "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: AQHWuIhvMQgvEd1yk0CBCT7MJ4fJCKnIVifg Date: Sun, 15 Nov 2020 00:18:17 +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-reaction: no-action dlp-version: 11.5.1.3 dlp-product: dlpe-windows 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: [50.53.190.176] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d00d8a0c-d8ee-490f-d5e4-08d888fbf36a x-ms-traffictypediagnostic: CO1PR11MB5059: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:849; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Xrs7EWvgd4gD3FU5wU6FUDdNpHiWH4KcYn/flwW274DuDI8qThxi7jthZn1CemmyCROf4pmcrfE34gAmDIlc9NbSIYvCL9rolbCAo0JdkMSzmrug2LWAVNGCnWbeCQJVLV9hNf2OXFACPNaUYyFLmUaOzxLH3423YNNsKJtEaGunkkkliJ6YCWCP7rDOWOYOwR4culBh0qZ+jd15c9jYduQnYqrwg38bOkzUDiKC5rkBrPwWOJNf0jneO7RHSxTBC+6sXV8YFqxQVeimniGe1vgrQllskzus6PULXAHrpPd1lf6KN3bOq0tfO3JkJO8uOwL4B5tv1uwHW4s6+veL+Kv17r5R8QJDnUjRah5fdsWDhCRsk3kWZA6STmvVyEGsYtUe21cbuDIc3bCfpr1jcQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:MWHPR1101MB2160.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(376002)(346002)(396003)(136003)(366004)(39860400002)(8936002)(316002)(71200400001)(4326008)(66476007)(53546011)(66556008)(64756008)(66446008)(76116006)(66946007)(52536014)(107886003)(7696005)(6506007)(54906003)(110136005)(33656002)(5660300002)(478600001)(86362001)(26005)(2906002)(9686003)(186003)(19627235002)(83380400001)(55016002)(966005)(8676002);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: JuDXmq8pnndUQR2Bc0s2taG6mFmgtvAzd6Y2YKALa8PiKZa/ajaNToB+WJPzz0vVeI8vm/5OVpGkeK8tiigDCc6GnNR8dA+/Q4vQgWFBozLWHCPpxe1/39e1slZm0QD/Ff0LXabKBTrefYPu4OwHxailLf0JXXvFzEF4TK5u/U+mrfT/GfKzNwymp3oolvkAzdUvbBxaOZovN5Enw897UG0j68Hfm5w98xXsZF3G/fJO9ZySBDFhGOt3AtOsDZUNwwDR7IhllFH6C3ARsjyChjMrarlcDdGMfknXhtE0h1pfqbVu8mqv59AADuCnbscSC0EnoDRINq/zITiC9i+1s9XtzRqIyoFmHW6JpStLK8v66BAj0JgUZvmkhS6ju1abLN39mD0L3uhhKg93V/nNt3HQYxSB7gK2xW3hTFz7zR7q9p8cOcYljnmzkSujeDScBIE3WCYnlRRYGMzsrg1F21ZTj8u8yv7bf8hGcmWoun7l4hQdR5IMlak0CmOWdwRKQLbEaBLudQ2eBxCFnu9alqKlmnIRSrnTpa4/0v6Czcg27wfaj+565OXHhYudFnm0fW7nbt2OVHbarOVxPLpOxrntmIa9jpQOwC3GjlJYAsL/v3PAyW43kLY9cDg56KjuQB3uVHuTZttwbFXYtEjojHbrHiPwqB63pshuWPvX7n1lVwpEqclirZlRGLkSOnUj3h6IKH3gOO+pHrtDPfD5evTOnO5B7/2Xj97+cN9bsgipnujkiKS+HAjT2wGyBSOYrFuz/tz3JThCvyPdmdt+bKrcVpFThc1jykRufggOpGGuA9IaVESUqeak8nl15EArmZjKET/5iFT0EQ/dXrhrJltgWqAKMizYLPcLSwqXg0TCsw8mYHyOOZ1Ik2l3U773nlMzBZL20t779Fh6kpTNkA== MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MWHPR1101MB2160.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d00d8a0c-d8ee-490f-d5e4-08d888fbf36a X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Nov 2020 00:18:17.2949 (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: DI6qFG7KxbbCRoQRdW452IyJRFAXS5fzsdizSrVask5Z7rrG0n8CTJs9TYthm2S7oqt968F2QUc/CP7Oi2GeZI2RGcKCqzBymdstLgvlhWA= X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5059 Return-Path: nathaniel.l.desimone@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Pushed: https://github.com/tianocore/edk2/commit/d448574 > -----Original Message----- > From: Maurice Ma > Sent: Wednesday, November 11, 2020 4:11 PM > 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. > Since PE32+ image format defined ImageBase as 64bit, the current script w= ill > only 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 32bi= t > ImageBase field. The expected behavior is to update the full 64bit field.= This > patch 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+ > else:+ 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