From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from APC01-TYZ-obe.outbound.protection.outlook.com (APC01-TYZ-obe.outbound.protection.outlook.com [40.107.117.86]) by mx.groups.io with SMTP id smtpd.web11.10078.1683699785403995100 for ; Tue, 09 May 2023 23:23:06 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@insyde.com header.s=selector1 header.b=BTt7o+cn; spf=pass (domain: insyde.com, ip: 40.107.117.86, mailfrom: wendy.liao@insyde.com) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=BketvsmC1aQrhVK71RNnKPVLmZABBWx4kEErMsoOfGQZYgUG1/BH6SjGWb7XXZSrrw1Pk9zqqP3aPb/Sia7MF2FuJWfBSvDFR7cIicjE5LXk2jWz9aR9JVF2PG+Vf8tkqQXg0/k71z/3k/MB4rY4T25e5CYb9tykCyYyJIuNfnMDvDmruQiGv+vQEr8M26N8OBufV66HZRvCFbwJepj4mZBb2b/Uayw7X1KYYYT1TKuXC+Z8gBd3LpgKHaOT1C+hwLJ4JwHlNalMyXd7avI02+6rgzZAloDDUT9/kFbPFadEum590c1UVSeCzImyfX9eY4F+4DFiyYQR+jIjrKtNEw== 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=yIOvBvW8Cy6fJ7L8coPrxCWAmpjhRqy71dHCEkxVcbQ=; b=DlyDjTGVvQ1yckLv5y4A1BuALymGFppOU7eLeIz8gtTvnqqAokuQHnJmi+C2N9E6hQgUOXrvL8zquCpCc1XI7TVEgtsZYaNQcAa6DewpUGRBUt+41q/aOfMQPjNMCoueOvkxkMycB7R2FhZWXh9ZcmpYI/BeKQQwbFMQphnDM8Bg7qRYCi+QsVww4cuAlK4mRHqZprtDhOnEFS1hYCGlP2Q5+ZK3IB3l97jpgvfAaDAu8uE6M9ZLEd0YN8lfgjTsQu9zD6mAQqDZqAfuWOwXPnYx8subTVklPVVFnaNfgebJdsu3r5pT0fBSLB56jRAGEzNHex4V4/wTTolFEmcYWw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=insyde.com; dmarc=pass action=none header.from=insyde.com; dkim=pass header.d=insyde.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=insyde.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=yIOvBvW8Cy6fJ7L8coPrxCWAmpjhRqy71dHCEkxVcbQ=; b=BTt7o+cnxh27GSnesTiQHcDsnMTDhdGLg0e9nW/ODgztWqGA69n/8DyW92JcaMcpBg64rIcLAeCXzk+wg2DBbtxdKUGUIDLNxJTD3/mee7L03gwSvWvxhgj5HH0xOL2U7J2UwpjnW6TRPiA+Tv6Jboyw/uk/ShWMk1TR78DZ6xDE4+dQzP+RUFkiIYlMqFtUnt6OttfhDv308YzJrbeGJwbv4uyVi8renmE6CHs3X5cKGvc0RtQ+tQtITWT80ZuMqWkCVJ937SCQhsKL66qTy+uhpAXoI+qsFRmkkB6b6cIhADefm+KHj6fLtZuTlLHJJDjXg2kXgcnn6CLz08/0jw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=insyde.com; Received: from TY2PR02MB4446.apcprd02.prod.outlook.com (2603:1096:404:8008::11) by SEZPR02MB6368.apcprd02.prod.outlook.com (2603:1096:101:123::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6387.18; Wed, 10 May 2023 06:23:00 +0000 Received: from TY2PR02MB4446.apcprd02.prod.outlook.com ([fe80::dbd4:4017:1c57:23d7]) by TY2PR02MB4446.apcprd02.prod.outlook.com ([fe80::dbd4:4017:1c57:23d7%3]) with mapi id 15.20.6387.018; Wed, 10 May 2023 06:22:59 +0000 Message-ID: Date: Wed, 10 May 2023 14:22:56 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 From: Wendy Liao Subject: [PATCH] MdeModulePkg/Core/Pei: set AprioriCount=0 before walking through next FV To: devel@edk2.groups.io CC: Leon Chen , Tim Lewis X-ClientProxiedBy: SG2PR06CA0208.apcprd06.prod.outlook.com (2603:1096:4:68::16) To TY2PR02MB4446.apcprd02.prod.outlook.com (2603:1096:404:8008::11) Return-Path: wendy.liao@insyde.com MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: TY2PR02MB4446:EE_|SEZPR02MB6368:EE_ X-MS-Office365-Filtering-Correlation-Id: 4b83cb20-cf19-4d8b-1096-08db511f005c X-LD-Processed: 8c8c18f6-76e9-4eeb-9238-a7b3da7871d8,ExtAddr X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: S7f+JJGV+GYeuwJTK92WW6/TVdsjQ1xw23c738139fvHbw3j3Bzhd7j6QSG+CWlzo3XMiErrFc9B0BYaFHbpfvjgjMmWQNlj3iiYmCbALPE/0UmNQdwYUyzb55nsW5AfshJV1h0AswNY4Xz2Wv3I9sYiYQWdkMQyU2M2UJ0XFr73wBFqNR/pzgRxFPqWdSk02yG+83kas09C0TNm4nt6hnv3XubeL13pmFjb6frPbcKxGKD+yNW9vUxuz1BuaCaSyZflPI0UPA2xX0Df7+ssfBsqnCD2zTsFaKwt/AxxWnSujxO6OKjf/EIaVeN669im+U70/q26ePuqeHUWaSSlxxEQzCnBLXcJrCij84MlM0K28aAThphxqRV3RJauR+lHOPpc1O22TCHV1GNpFmxCAHWYwkc4UzgcJm+LFMkZfPXV9CKLPpltAGbHe6Fou77phUF3LRoYRTpiczq5DQ0TMsedB/6yNbOEXuXgbiSGcqbXXeTOWTBBFhUera+we3hlUlRyhhz6Ym50I1DZqNBxxygUcHIaTQ8+A+qMPFN0sumSn6SHyBd2cfp4XqhHQ2v7mXv4aHU5Nviam28H0mUrerEiwXIGJ4kKhrA1gWdXXmeiAER8eXxaJ9tWwDjHgX+c750edKFu2ctHVUON6lRjSw== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:TY2PR02MB4446.apcprd02.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(136003)(39860400002)(376002)(366004)(396003)(346002)(451199021)(31686004)(36756003)(5660300002)(44832011)(41300700001)(31696002)(316002)(66946007)(8676002)(8936002)(66476007)(86362001)(66556008)(6916009)(2906002)(83380400001)(6486002)(4326008)(6512007)(54906003)(186003)(26005)(107886003)(478600001)(6506007)(2616005)(38100700002)(6666004)(45980500001)(43740500002);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3a2inGDtjhHUNCLqksu0jR1AR3iE4Ucz4GXUFca/X71Es/vOj6IR/e6jqbx4?= =?us-ascii?Q?YIRtzr8/gMQyT2DTO2sCB9PF6M0cYW2e77W3cv0VwBOfp08/rURGBT6pnyym?= =?us-ascii?Q?u2Mpu0vBd8WklH4qNbYPlrz3f32AKt9lU7Mp70GKqfJyhqqu9yvxCoQM7UQq?= =?us-ascii?Q?uW3cf+2vw3Q7pNPtbgikyxhXB8jq/x2yipz9RkMEv5tZU7WLzvIBPtRqI9cI?= =?us-ascii?Q?vA4cQYZ/QvJrLVjszu/qiecysXqrWQ8CwMB+y1ZK79YRObfQqyu6IUdnU285?= =?us-ascii?Q?tf56EItauvkendHA8idx4GtefUO2Wn/ItLkmmDJBxWmGLix6Hu+bcPPhsgub?= =?us-ascii?Q?GzpXySLm0pobTP0J7zRRLBC0FM2+s5ecQHL2UM9BZAgeNDP583vKq66HhxfX?= =?us-ascii?Q?ALm2z7mC9cI1oP7KVfV/bmiU3iRzbKJdd/PzB6er2rHxGWJCiIJjr+GuYr2Q?= =?us-ascii?Q?sAoD/Lw+Vs578Y9oC3awKHig8zZiX0PLjXrIl8jdlpeGzNwNqXcZH1BWs3nf?= =?us-ascii?Q?BzTIN5s+pgTSUHxoTPksEqOYyCogUFaUOkbHOaIHcfwDOWmaQNcK+9DvkFg+?= =?us-ascii?Q?kgvIzHRX3zRfxvgfmOSUBnkbZtIAFTOpn7nLHAvggpvBO6LwX3y7JP+gHaE+?= =?us-ascii?Q?D9T2q1gUAE86wCTqRf0xY216/eEDC/72Sa5LyVvTA2wFOzECc0GEYCqc4PSP?= =?us-ascii?Q?Hqxnk+IvnrgAHxmbFLTswiQB01YWretQz00w/uBEYzrvRnZep3ZboBRpYlyC?= =?us-ascii?Q?KwvNCfdus/RJL6VjA17NPzGgXSJWIQAudmhBACX5/rjmvKPMn063JindDvhE?= =?us-ascii?Q?XYcI/sqn+sBir9FUZTk4TVM2mR4r2IvEaSdFVuDFbqrNrxieXzzHfPjvK10T?= =?us-ascii?Q?8a+LrU0fGJTvyO1C43Xiaya1aqdoVHFUCDCaMSQr0kufxBAohiQzUFryvlvX?= =?us-ascii?Q?9gGdwf23T9e7GkJI0TM81qst447nIFYNursXXrAwP1p9BBfR8YpTa5nHgCSy?= =?us-ascii?Q?Fm2W+69tYJhmsRbmlcv2542NoJLtnsy82Z8YQaVGKlzpRN3vId2IsQiwE93i?= =?us-ascii?Q?SkKka8CGU1TXoLDvkqI1sDUDUBr1iluzGIYZ81GrAMMxe9F5m7mGxYO+uO33?= =?us-ascii?Q?RC/pF4m5TKTMH2irFJRd8bA3KdVrbcisIAo1yxWEEhOe97g5g7xsgDhFhm9P?= =?us-ascii?Q?iikIbFY2t+5QsDWO2afAcuVwB+dwYyFmsu0OSdAr3Rlt61BhY3eQuyFNxnqt?= =?us-ascii?Q?VkFS+Y1HirYIufdshLEM2vAMRy4XMbzX7sSdV8Rrs908JqO58EOQURcWNgbc?= =?us-ascii?Q?aDG3vlxRQbGgahzE5z2aud7cOEyGzpTe0af+xb6LeXtwb8l3nfYe+vT/vFB+?= =?us-ascii?Q?INC18nGueKFNYCYNrZd8uH/Q2DblowTXoMgE7za0WbpMTkodWJFRsM3ofKAN?= =?us-ascii?Q?Q88yKnHrQKaFv6pwM7Ro/Hlj8MIqBiETSE5GgDGp0CFXiaTpyubBwty3iVnQ?= =?us-ascii?Q?ukJ8aDBrl4eTjffYt6chSgQY2Vxw0f9ImhyVorVpnByOUmShB7S93IrUneMf?= =?us-ascii?Q?frD6WE9z0jzKT3CMBxN9YY6CMNYWwMdoOcDtlKsm?= X-OriginatorOrg: insyde.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4b83cb20-cf19-4d8b-1096-08db511f005c X-MS-Exchange-CrossTenant-AuthSource: TY2PR02MB4446.apcprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2023 06:22:59.6559 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8c8c18f6-76e9-4eeb-9238-a7b3da7871d8 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 9p20usqlLt1xWxXnSSdfYxHlPxnYSOmZQLlygA9bEjLfN7TA/m20gQGMsoeJPQ3dQ1+QGUCA2rsFrzbKQRhBtg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEZPR02MB6368 Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3D4438 The main dispatch loop in PeiDispatcher() goes through each FV and calls DiscoverPeimsAndOrderWithApriori() to search Apriori file to reorder all PEIMs then do the PEIM dispatched. DiscoverPeimsAndOrderWithApriori() calculates Apriori file count for every FV once and set Private->AprioriCount, but Private->AprioriCount doesn't be set to 0 before dispatch loop walking through the next FV. It causes the peim which sort on less than Private->AprioriCount and depex is not satisfied would be dispatched when dispatch loop go through to a scaned FV, even the peim is not set in APRIORI file. Cc: Leon Chen Cc: Tim Lewis Reported-by: Esther Lee Signed-off-by: Wendy Liao --- =C2=A0MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 1 + =C2=A01 file changed, 1 insertion(+) diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c=20 b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c index d8284f9f4f..5f32ebb560 100644 --- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c +++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c @@ -1630,6 +1630,7 @@ PeiDispatcher ( =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Private->CurrentFileHandle=C2=A0=C2= =A0=C2=A0 =3D NULL; =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Private->CurrentPeimCount=C2=A0=C2=A0= =C2=A0=C2=A0 =3D 0; =C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Private->CurrentFvFileHandles =3D NUL= L; +=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 Private->AprioriCount=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D 0; =C2=A0=C2=A0=C2=A0=C2=A0 } =C2=A0=C2=A0=C2=A0=C2=A0 // --=20 2.29.2.windows.2