From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.88; helo=mga01.intel.com; envelope-from=yonghong.zhu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 791262116823B for ; Mon, 15 Oct 2018 03:23:55 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Oct 2018 03:23:55 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.54,384,1534834800"; d="scan'208";a="241411483" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by orsmga004.jf.intel.com with ESMTP; 15 Oct 2018 03:23:54 -0700 Received: from fmsmsx121.amr.corp.intel.com (10.18.125.36) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 15 Oct 2018 03:23:54 -0700 Received: from shsmsx104.ccr.corp.intel.com (10.239.4.70) by fmsmsx121.amr.corp.intel.com (10.18.125.36) with Microsoft SMTP Server (TLS) id 14.3.319.2; Mon, 15 Oct 2018 03:23:54 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.111]) by SHSMSX104.ccr.corp.intel.com ([169.254.5.183]) with mapi id 14.03.0319.002; Mon, 15 Oct 2018 18:22:57 +0800 From: "Zhu, Yonghong" To: "Feng, YunhuaX" , "edk2-devel@lists.01.org" CC: "Gao, Liming" , "Zhu, Yonghong" Thread-Topic: [PATCH 1/1] BaseTools: Fix regression boot hang issue by commit 0e982cf03dd5 Thread-Index: AdRkZf2nYLUgSxXuT9iEWrUV+dGhBQACl3FwAAAih+A= Date: Mon, 15 Oct 2018 10:22:56 +0000 Message-ID: References: <47C64442C08CCD4089DC43B6B5E46BC48EF3E4@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 1/1] BaseTools: Fix regression boot hang issue by commit 0e982cf03dd5 X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 15 Oct 2018 10:23:55 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable I pushed this patch first since it helped to fix the critical bug. Version: SHA-1: 272ecccd793c8fb12f4f356ada18a870c2426603 Best Regards, Zhu Yonghong -----Original Message----- From: Zhu, Yonghong=20 Sent: Monday, October 15, 2018 6:18 PM To: Feng, YunhuaX ; edk2-devel@lists.01.org Cc: Gao, Liming ; Zhu, Yonghong Subject: RE: [PATCH 1/1] BaseTools: Fix regression boot hang issue by commi= t 0e982cf03dd5 Reviewed-by: Yonghong Zhu =20 Best Regards, Zhu Yonghong -----Original Message----- From: Feng, YunhuaX=20 Sent: Monday, October 15, 2018 5:04 PM To: edk2-devel@lists.01.org Cc: Zhu, Yonghong ; Gao, Liming Subject: [PATCH 1/1] BaseTools: Fix regression boot hang issue by commit 0e= 982cf03dd5 Fix regression boot hang issue by commit 0e982cf03dd5023b90def60c3656e5e181= 35ebac Cc: Liming Gao Cc: Yonghong Zhu Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Yunhua Feng --- BaseTools/Source/Python/GenFds/Fv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/GenFds/Fv.py b/BaseTools/Source/Python= /GenFds/Fv.py index 510f2834a8..c66fc38327 100644 --- a/BaseTools/Source/Python/GenFds/Fv.py +++ b/BaseTools/Source/Python/GenFds/Fv.py @@ -202,12 +202,12 @@ class FV (FvClassObject): Signature =3D FvHeaderBuffer[0x28:0x32] if Signature and Signature.startswith('_FVH'): GenFdsGlobalVariable.VerboseLogger("\nGenerate %s FV S= uccessfully" % self.UiFvName) GenFdsGlobalVariable.SharpCounter =3D 0 =20 - Buffer.write(FvFileObj.read()) FvFileObj.seek(0) + Buffer.write(FvFileObj.read()) # FV alignment position. FvAlignmentValue =3D 1 << (ord(FvHeaderBuffer[0x2E]) &= 0x1F) if FvAlignmentValue >=3D 0x400: if FvAlignmentValue >=3D 0x100000: if FvAlignmentValue >=3D 0x1000000: --=20 2.12.2.windows.2