From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mx.groups.io with SMTP id smtpd.web09.2849.1615859682320194570 for ; Mon, 15 Mar 2021 18:54:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=JXNZqgIe; spf=pass (domain: intel.com, ip: 192.55.52.120, mailfrom: gregx.yeh@intel.com) IronPort-SDR: AAsC35x2CcTLr7JS81SzcG8qPY1cqt/ah2pX9wniwq4TshkNx+w3B5AuWK9y63ePQywhill6cs vd3bWZOZZXqQ== X-IronPort-AV: E=McAfee;i="6000,8403,9924"; a="186805950" X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="186805950" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2021 18:54:40 -0700 IronPort-SDR: YUFPv7IiHN0KEPGkI3qZIQX6Bdpa5sk1CYknDLcXR65tmAP5CP1nbmjuAWMP3+r/pTMaEwUJNq 1Iz19zEiO0/w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.81,251,1610438400"; d="scan'208";a="511228024" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga001.fm.intel.com with ESMTP; 15 Mar 2021 18:54:40 -0700 Received: from orsmsx609.amr.corp.intel.com (10.22.229.22) 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.2106.2; Mon, 15 Mar 2021 18:54:40 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx609.amr.corp.intel.com (10.22.229.22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Mon, 15 Mar 2021 18:54:40 -0700 Received: from NAM04-DM6-obe.outbound.protection.outlook.com (104.47.73.48) 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.2106.2; Mon, 15 Mar 2021 18:54:39 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=mgoQ2uPE5XPrDy3LQlNUfp07FLsRjs0dCNSpJudt+7eAFdOSHqHdFbroDhtuO9We7O0yS41abnilypTfEqgjpsA5vz1sbBmcKqBFxE+vsvR2Z/GKH2Hi/9hAN9OCe0tgoq26eU2CuFRGikezl/7YOBR1hpIfoJw5zvlgX4bLAOm3SjaVL20ubx0nKWRaRAHr70gCjMCxZ5Knmn3nmB9cepMFEkSq4QAVLM0YLdLUNyGkuIoT15UXg3MTiBSMIwhe6tB11ACteKtjcz2YjnUWXeoWfkPzPgy8ZY8IfLG/9ScCzIs7LD4y/FHJh1TU74OcOQuvTS0CRAEunTTJLUJKBA== 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=11FVs3ktmKcRVHKfcqrDyPPsct/NKXwnXO8lDva0YdY=; b=BqRhrbTLHTKnV6+6Hn3OhTrJagpwRSEIyf6rD442HcSC7y0lRO8ahml+9XafCF40NikHObbcb1qXv0KyIcmkzKMwnChvhVZKMmOELKhjsUKbXgzZG/FnVvL1HZit98BsjaOs/FcxZgBQTgD1ZtKk5S9mSL2EE5Uu7OM5vrcHF0/EgiU8xuwtKjyo4oemxOiKBdPR6hjhWcURNus382pFn0hZ0ut14GnIWyIXAYfIEX96i+7nT77vLRicuwt8NWBHgMUAWf0VAMKzOcSN/xIH756xX+K94nelj8Ovyz0rsINSyfximGF8ULTMgk54lW2J/rYeuWZ+bhpz/CmGVUA/Bg== 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=11FVs3ktmKcRVHKfcqrDyPPsct/NKXwnXO8lDva0YdY=; b=JXNZqgIeog+hn34FDt1IackfH1xatVBePXEkGaVuoQ8o/2cYGpJBaMqjOyCzoeIa17FIQQ7gpVpzIv+3/WX5yNvGlx8JAUF4JRn+qP63lWJLk9ZwTBWp5XqrEZ4PpVM1yDy22DQ50h+p8bdQIMotRiQJ8ZikDwyol06zLooaWgw= Received: from BYAPR11MB3368.namprd11.prod.outlook.com (2603:10b6:a03:1b::13) by BYAPR11MB3158.namprd11.prod.outlook.com (2603:10b6:a03:1c::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3933.32; Tue, 16 Mar 2021 01:54:38 +0000 Received: from BYAPR11MB3368.namprd11.prod.outlook.com ([fe80::22:4e44:faab:4dac]) by BYAPR11MB3368.namprd11.prod.outlook.com ([fe80::22:4e44:faab:4dac%5]) with mapi id 15.20.3933.032; Tue, 16 Mar 2021 01:54:38 +0000 From: "GregX Yeh" To: "Feng, Bob C" , "devel@edk2.groups.io" , Yunhua Feng CC: Liming Gao Subject: Re: [PATCH] [edk2-staging] BaseTools/FMMT: Replace file failure when FV level over 2 Thread-Topic: [PATCH] [edk2-staging] BaseTools/FMMT: Replace file failure when FV level over 2 Thread-Index: AQHXFVHee5nf56AOnE2kZ7LYe1W1YKqEfJRAgAFmjVA= Date: Tue, 16 Mar 2021 01:54:38 +0000 Message-ID: References: <20210310020528.1924-1-gregx.yeh@intel.com> In-Reply-To: Accept-Language: zh-TW, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: 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: [192.55.52.220] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7e12ff57-87f0-46ed-2c5f-08d8e81e7561 x-ms-traffictypediagnostic: BYAPR11MB3158: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:962; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: KbKk4OVaZ+n/Bm/ZtQSBeobQmaU3a2RKNX/u03Diut+i4lrHgeP85tZwmhJ8UMLHL9py8MHWzWEHA/Y+nSYp1fcgpz83WHCynEjSOZKsh6kow9InGVaNF19wA9ocXkiWK6g/jCBKnPDC7ZuzW2w6v9P5j4WeC+HMq00AZJKKIlUcySvNyBQfwVjnJpyqlzSbRkOeixFji1hWjLs4MlyQhY+VC5TieE/rihIqNJGRGVimWTGAN90ZuhOye24fUJsSDIg7s7jp6y1lxO3pimurn/EFWXJsKNdTVLo7A6fRQFUyIk9weEK+gJuFNXaJSMMZukkoy9vjkDIMPoPa8f2n4hXyRgBBjK3+uFzurpYNkssXC9Sc4uyIUA7zWSeBHABGaw9ohF5caNwlEBdmdjrJnwbr/tPZugowffFLCrcc6T5VIYzeTYggP1T8G9XYzgYegnu0ECeKiedb5w10FH+xN5gZk8CPycWt2yuqzz+hL//8vIb7i/lSYlp0/190NuSJk2U4bbiO8uVIXjDQfRCM+t2SE7tdl248HwstmAibVQyR6dmXP2Zcmnv2gPzeqlcm x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BYAPR11MB3368.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(396003)(376002)(366004)(136003)(39860400002)(346002)(66476007)(2906002)(55016002)(478600001)(6506007)(33656002)(76116006)(64756008)(66446008)(9686003)(110136005)(186003)(316002)(66556008)(8676002)(7696005)(5660300002)(71200400001)(4326008)(53546011)(26005)(8936002)(52536014)(66946007)(86362001)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?FHfrL6CBkRlYtCSDfvdOexWrlCphoJEBQs86wWuamlI6gpt9oAxZPi7K11Tu?= =?us-ascii?Q?kyuH3LsCjx7XlT51JI/Mo/5CdiYDyEiBsORpDCeHkV2tD3gWGE81B5FwJbDa?= =?us-ascii?Q?ptsHPLJEIb1D9d9KSoInD0mHjt+gBYSxHr0omC9/j7AcCQk9+N6qQEZq0jj4?= =?us-ascii?Q?v81z65xAnamI3LJp+SdNmifk6nZY7ux8cN6FCQXfN9ARMKqpy/NBbXfk2NeW?= =?us-ascii?Q?WBDtJoD8dC7yZJCdKNI2oME+x7eigloGqWqdphaxsrFcbIAoIpsGCYV7O9W0?= =?us-ascii?Q?Rc6uzIAhbzD+d4Rv8Tjoi7hublxDg3irVrkGRARvkW1lIQ7sVg2XnKms6wuU?= =?us-ascii?Q?tQ9ffyqS4ObHJ2G6PetgfHaH0LftlfpRsDzx9TxHlv34yRqMZW4TthySBlFv?= =?us-ascii?Q?TperimVeikE7Zm/UYMNyddYIPVQevqkN2hr4Qpb/CSLy8zySI9zoFwWqyRTJ?= =?us-ascii?Q?JOs9dwViT3T2XrtkTo63oN5iQU8PhokVZAgXPshdJAaYsS7lN3XXa9RLD/+P?= =?us-ascii?Q?ifYT+57ANpHHxirF0xoW3aL/U0dBGvZmkJVVmfTOMqj4Jav5gn/tXHzbXZtG?= =?us-ascii?Q?U5ynCG0gPYHQPi6QGIRlgXtb3BZn12CKpu1bvwFTzCQGXXP3ewbHoPw5yP2n?= =?us-ascii?Q?IrqsgmqANv+8/6JImkTy18BftmqpxMHEdiJ+OTuiYtPDoqDp6SOJ8hkrAYfA?= =?us-ascii?Q?FGJZYPV1rOyHMlZ6eba8TJ2wX3vKqLdSma+L48scc3PLVHC1DNnXeWrubylB?= =?us-ascii?Q?2Rzbblsu+/mNfZPTvlfwIEk2WnSR3KspEr00GWF1klDActbTE9n4WnGBjtL/?= =?us-ascii?Q?5geBVtqyMfoMHefLZdf8DbLwjT5i5Ry8uyy2CO54ZButqI2VKwBf6HdZRvDR?= =?us-ascii?Q?5NUQXiLfHn0csbwDj9pNo5QDj7LHr86dEYv2Zvq0nMjfrPksmx04F0Mlypwb?= =?us-ascii?Q?E7b7jZnrWXk9lmc3Z7R4tZzjsekP7iemk8DWUIzU15OB9XTBI7yPL9kkh0ZB?= =?us-ascii?Q?ZnxKS253yOjfZtad11CZX4k6sBM0PVq8hMC7N2JtVqptAYGOvVxbz5xTiN4x?= =?us-ascii?Q?wqyGu1eXKub0X2pT1P6NFH8TjNVFq8g8vfCJjRrMkmy/AEin35nUyAIs3T4R?= =?us-ascii?Q?fnfg705+ojm0jJ6GZcmD2xPKD81tmVPjahmPzHDm4tHPYMRMYIUYYxo9Ke5J?= =?us-ascii?Q?jIv9ORBObsAVyyFkvb6BjQSiRKuAzJjBDTopBWugT5118PeGrwJNcifd0Np7?= =?us-ascii?Q?naOrtodTvnt3a7wjrepUn+RUmLwmGzIlEB8pwGhenItpyBLkpIQGByYokDsz?= =?us-ascii?Q?8iUQ/HELlAZ41Cbqtb21G4Hf?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BYAPR11MB3368.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7e12ff57-87f0-46ed-2c5f-08d8e81e7561 X-MS-Exchange-CrossTenant-originalarrivaltime: 16 Mar 2021 01:54:38.8271 (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: FsM+AZSDdh6g3lPpgMb7TZFPRDsAsv28hL27krjSfQhYL1qbsiTjp6RYwT6a9ofA0ZqqT4HmWhhLwT7rE8RvjQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3158 Return-Path: gregx.yeh@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hi Bob, I have created new patch file. PatchCheck is pass. Using Git send-email send to edk2.group.io=20 Thanks, Greg -----Original Message----- From: Feng, Bob C =20 Sent: Monday, March 15, 2021 12:35 PM To: Yeh, GregX ; devel@edk2.groups.io; Yunhua Feng Cc: Liming Gao Subject: RE: [PATCH] [edk2-staging] BaseTools/FMMT: Replace file failure wh= en FV level over 2 Hi Greg, Please use BaseTools\Scripts\PatchCheck.py to check this patch. There are s= ome lines code format invalid. The logic looks good to me. Yunhua, could you please double check, I remember you have concerns about t= he previous version of this patch. Thanks, Bob -----Original Message----- From: Yeh, GregX Sent: Wednesday, March 10, 2021 10:05 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Liming Gao Subject: [PATCH] [edk2-staging] BaseTools/FMMT: Replace file failure when F= V level over 2 Fixed replace file failure when FFS in multiple level FV and FV level over = 2 Signed-off-by: GregX Yeh Cc: Bob Feng Cc: Liming Gao --- BaseTools/Source/C/FMMT/FmmtLib.c | 56 ++++++++++++++++++++++++++---------= ---- 1 file changed, 37 insertions(+), 19 deletions(-) diff --git a/BaseTools/Source/C/FMMT/FmmtLib.c b/BaseTools/Source/C/FMMT/Fm= mtLib.c index b945e9b63d..26df0181c7 100644 --- a/BaseTools/Source/C/FMMT/FmmtLib.c +++ b/BaseTools/Source/C/FMMT/FmmtLib.c @@ -494,7 +494,7 @@ LibReadFvHeader ( if ((FvLevel -1) =3D=3D 0) { printf ("\n%s :\n", FvName); } else { - printf ("%sChild FV named FV%d of %s\n", BlankSpace, FvCount, FvName= ); + printf ("\n%sChild FV named FV%d of %s\n", BlankSpace, FvCount,=20 + FvName); } } =20 @@ -502,7 +502,7 @@ LibReadFvHeader ( // Print FV header information // if (ViewFlag) { - printf ("\n%sAttributes: %X\n", BlankSpace, (unsigned) Volu= meHeader->Attributes); + printf ("%sAttributes: %X\n", BlankSpace, (unsigned) Volume= Header->Attributes); printf ("%sTotal Volume Size: 0x%08X\n", BlankSpace, (unsigned) Vo= lumeHeader->FvLength); printf ("%sFree Volume Size: 0x%08X\n", BlankSpace, (unsigned) (V= olumeHeader->FvLength - GetFreeOffset(InputFv))); } @@ -789,7 +789,8 @@ LibParseSection ( UINT8 *FvCount, BOOLEAN ViewFlag, BOOLEAN ErasePolarity, - BOOLEAN *IsFfsGenerated + BOOLEAN *IsFfsGenerated, + BOOLEAN IsFfs ) { UINT32 ParsedLength; @@ -997,8 +998,12 @@ LibParseSection ( break; =20 case EFI_SECTION_COMPRESSION: - if (FirstInFlag) { - Level ++; + if (IsFfs){ + Level ++; + } else { + if (FirstInFlag) { + Level ++; + } } NumberOfSections ++; =20 @@ -1159,7 +1164,9 @@ LibParseSection ( FvCount, ViewFlag, ErasePolarity, - IsFfsGenerated); + IsFfsGenerated, + FALSE + ); =20 if (CompressionType =3D=3D EFI_STANDARD_COMPRESSION) { // @@ -1181,8 +1188,12 @@ LibParseSection ( // looks up the appropriate tool to use for extracting // a GUID defined FV section. // - if (FirstInFlag) { + if (IsFfs) { Level ++; + } else { + if (FirstInFlag) { + Level ++; + } } NumberOfSections++; EncapDataNeedUpdata =3D TRUE; @@ -1216,7 +1227,8 @@ LibParseSection ( FvCount, ViewFlag, ErasePolarity, - IsFfsGenerated + IsFfsGenerated, + FALSE ); if (EFI_ERROR(Status)) { Error(NULL, 0, 0003, "parse of decoded GUIDED section failed", N= ULL); @@ -1471,7 +1483,8 @@ LibParseSection ( FvCount, ViewFlag, ErasePolarity, - IsFfsGenerated + IsFfsGenerated, + FALSE ); if (EFI_ERROR (Status)) { Error (NULL, 0, 0003, "parse of decoded GUIDED section failed", = NULL); @@ -1491,7 +1504,8 @@ LibParseSection ( FvCount, ViewFlag, ErasePolarity, - IsFfsGenerated + IsFfsGenerated, + FALSE ); if (ExtractionTool !=3D NULL) { free (ExtractionTool); @@ -2016,7 +2030,7 @@ LibGetFileInfo ( =20 LocalEncapData->Level =3D Level; LocalEncapData->Type =3D FMMT_ENCAP_TREE_FFS; - LocalEncapData->FvExtHeader =3D NULL; + LocalEncapData->FvExtHeader =3D NULL; LocalEncapData->Depex =3D NULL; LocalEncapData->DepexLen =3D 0; LocalEncapData->UiNameSize =3D 0; @@ -2099,7 +2113,8 @@ LibGetFileInfo ( FvCount, ViewFlag, ErasePolarity, - &IsGeneratedFfs + &IsGeneratedFfs, + TRUE ); } if (EFI_ERROR (Status)) { @@ -4198,10 +4213,13 @@ LibEncapNewFvFile( UINT32 header; UINT8 AlignN; UINT8 AlignV[1] =3D {0xFF}; + UINT32 EntryFvId; + AlignN =3D 0; Id =3D 0; InputFileSize =3D 0; TmpFileSize =3D 0; + AlignmentFileSize =3D 0; EncapFvIndex =3D 0; Index =3D 0; OuterIndex =3D 0; @@ -4224,7 +4242,7 @@ LibEncapNewFvFile( IsLargeFile =3D FALSE; OutputFileSize =3D 0; LargeFileSize =3D 0x1000000; - + EntryFvId =3D 0; =20 OutputFileNameList =3D (FFS_INFORMATION *)malloc(sizeof(FFS_INFORMATION)= ); if (OutputFileNameList =3D=3D NULL) { @@ -4261,6 +4279,9 @@ LibEncapNewFvFile( LocalEncapData =3D CurrentEncapData; if (LocalEncapData =3D=3D NULL) { LocalEncapData =3D FvInFd->EncapData; + EntryFvId =3D 0xFFFFFFFF; + } else { + EntryFvId =3D LocalEncapData->FvId; } Level =3D LocalEncapData->Level; Type =3D LocalEncapData->Type; @@ -4274,7 +4295,7 @@ LibEncapNewFvFile( LocalEncapDataNext =3D LocalEncapDataTemp->NextNode; if (LocalEncapDataNext !=3D NULL && LocalEncapDataNext->NextNo= de !=3D NULL) { =20 - LibEncapNewFvFile(FvInFd, TemDir, LocalEncapDataTemp, 1, &= ChildFileNameList); + LibEncapNewFvFile(FvInFd, TemDir,=20 + LocalEncapDataTemp,LocalEncapDataTemp->Level - 1, &ChildFileNameList); ChildFileNameList->ParentLevel =3D LocalEncapDataTemp->Lev= el -1; if (FvInFd->ChildFvFFS =3D=3D NULL) { FvInFd->ChildFvFFS =3D ChildFileNameList; @@ -4329,7 += 4350,7 @@ LibEncapNewFvFile( } else { LocalEncapData =3D CurrentEncapData; while (LocalEncapData !=3D NULL) { - if (Level_Break > 1 && LocalEncapData->Type =3D=3D FMMT_ENCAP_TREE_F= FS) { + if ((LocalEncapData->FvId > EntryFvId) && (LocalEncapData->Type=20 + =3D=3D FMMT_ENCAP_TREE_FFS)) { LocalEncapDataTemp =3D LocalEncapData->RightNode; while (LocalEncapDataTemp !=3D NULL) { LocalEncapDataNext =3D LocalEncapDataTemp->NextNode; @@ -4818,= 6 +4839,7 @@ LibEncapNewFvFile( memcpy((char *)OutputFileNameList->FFSName, (char *)OutputFileName, = strlen(OutputFileName)+1); OutputFileNameList->IsFFS =3D TRUE; OutputFileNameList->ParentLevel =3D ParentLevel - 1; + OutputFileNameList->InFvId =3D Id; if (OutputFileNameList->Next =3D=3D NULL){ break; } @@ -5077,10 +5099,6 @@ LibEncapNewFvFile( if (CurrentEncapData =3D=3D NULL) { LocalEncapData =3D FvInFd->EncapData; } else { - if (OutputFileNameList !=3D NULL && OutputFileNameList->FFSName != =3D NULL && OutputFileNameList->IsFFS =3D=3D TRUE) { - *OutputFile =3D OutputFileNameList; - return EFI_SUCCESS; - } LocalEncapData =3D CurrentEncapData; } ParentLevel -=3D 1; -- 2.16.2.windows.1