From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web11.13015.1669252275394716128 for ; Wed, 23 Nov 2022 17:11:15 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=l00w8FXd; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: gua.guo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669252275; x=1700788275; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=elM9c1jWN1O89AQfqTBLVL9lTakETwptJ1obh+52ZlQ=; b=l00w8FXdOgti2aAFBdQS1O6lvSiklYpSP/4X38OAUp5ExMsV1FZgbVc9 s0tpG81r+YOE+ZrC/PeI6FDbXVHrHLF2HwPPbKRDtFX8Tro462KhybZB5 CCctBlV+Z+vDLr66snJsP2Kn6VjJ8D+sAfzCxByP3mGwz775/RugpnofV Hn4phB4OyuUzJbuGp8WYsavWazpem5JUE95+1aQAjusea8S/yIXvRDt8s Hohj0yL7tCQkzwb0aW5qS4PKyHchoCivRah6vhehUONkqlv7X2u8meydD BN9Smlm8x+63DyWYQQnc0QMPPTeYreNc2aUqp1JBeYwycC2KPQijjjSWw Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="314224818" X-IronPort-AV: E=Sophos;i="5.96,189,1665471600"; d="scan'208";a="314224818" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Nov 2022 17:11:15 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10540"; a="673061677" X-IronPort-AV: E=Sophos;i="5.96,189,1665471600"; d="scan'208";a="673061677" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by orsmga008.jf.intel.com with ESMTP; 23 Nov 2022 17:11:14 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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.2375.31; Wed, 23 Nov 2022 17:11:14 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) 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.2375.31; Wed, 23 Nov 2022 17:11:14 -0800 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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.2375.31 via Frontend Transport; Wed, 23 Nov 2022 17:11:14 -0800 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Wed, 23 Nov 2022 17:11:05 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FqbEbypyq4w6k2nlcpwQM+Dmms2/dflRk+7z2Ifn2hleCbbSLg5JLDQFPgNkJlgxPEuFnTD7gEdEh+qFcfqvaeLg9DlC0qM6O05wC2m61PBjV8jwjbv4TWGPGUsIQ25NWSHGqb1BWMga6N1sqE9H/2LmOdAZDlrZ+asy36Agpir7RCEQ3nMXmO523M7tmKSxH/XvD3jGi2AeLVvij4slC9BzagZRM8/OghfD4EtGPPBOM3bAhgV8bGPg/k7IvwL0T7Fr43HFgarG8HlqIbR8EyjXQ6vFW/Xs0ie6s4Yo+IZZXjtPjRmI16qI9DlKeb/SJI0Q8NOXIljB8pvXKya3ZA== 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=yF//9x5vKvfe0ltzH1V8t5SVt7lKdlviv/ltZaUAQ1k=; b=iAHU1LVd3Gh1AsnBP2SYCCZWKPCN7A7urjrnzzsafc22Rsuzy/U5MT7QHBH8au1y7G7i0f1OOMB3PgcXNs7ZOzHNQcp1hJufIUg6B8xamNn1vE82AZuKyjpccRblNkqRamcHN8kNK5ijMExcBWhdUFAzRwu659z9Vj+3Elov3T4M7FZy32xSdisZ/pXpKNI+n5kkzFzGy+tWR8OQ3hKo/YoLErcUDVjtuw4KEfu/+zcvlFL2R/y+92FOa6YmyNW3XTRq5FDg/ELeILbt0+HyBv0qOJAxTSPzUNjbAUfGbrY+xnXj8JtwPZyhoyTMx+mnDGPWS1rgji6Vwslp36tyCg== 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 Received: from BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by PH0PR11MB5045.namprd11.prod.outlook.com (2603:10b6:510:3f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.18; Thu, 24 Nov 2022 01:10:56 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::eb2d:a316:8bcd:3fb6]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::eb2d:a316:8bcd:3fb6%8]) with mapi id 15.20.5857.017; Thu, 24 Nov 2022 01:10:56 +0000 From: "Guo, Gua" To: "Lin, MarsX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" Subject: Re: [PATCH] UefiPayloadPkg: Support multiple-firmware volume Thread-Topic: [PATCH] UefiPayloadPkg: Support multiple-firmware volume Thread-Index: AQHY/ylyNFhniMRgT0C8uXO/5MNkwq5NRKmA Date: Thu, 24 Nov 2022 01:10:55 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: BL1PR11MB5478:EE_|PH0PR11MB5045:EE_ x-ms-office365-filtering-correlation-id: 4e34704e-c67a-4a17-f1e4-08dacdb8bd40 x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: UttyOJsIW9FEvYZqjbjXAWmtibTvzryX02aM685N2ybrhUXIUnER6wcpIOdEyrLHJ1rCmKp0AurhudVDN/gsGLPNVCgI7OCjxchl6sKKc9yznq742c4WYXz9ZN1mkBZ4rM1qhR8/isheDpIeYMIZlO8/SmB0Zn1b641DAxoF1/AszYhyOm9aqJpyjvb/XBE1fZbfRxVFdSWTvvka5D3yTOa5i0NzJUDLDjxBNg+3pjXJwvtgHUxM1rL5p99WuTlkDaJuDh5bQxBkLerF/80vh2r/moSR7tA1Oyvr3HsX8tWpWgmb8DoLlLvIYjoTwvAdQM5p40xiH0CVfEK3XU/jlIFoCiYY3kHW11x+KYxl+gTzSil9ywgAputn64LTcwDg8oBxi6wzWfabWHyNjLMLZwSHXKbLRftcfJtPXKAhN7c8ixMWTKWkB9fqjMYVFRWTfBZI8cjp2z7IOmgtv6GYBPiF0wJFqpwW812svbQGwdOYUu9ZV4sbqtqhcYZkVxb0mk/eNftt1YF1LiS5f1cFefFVSQcJt0+JD6Gq1BySePGSsRFWaDUDgdvUwV6tkLzafwZAJxTR1qAyqxR0GZTXt45fRk0hAH3CXjW27sy597wmpkDLXFpl8VBqXaqsatjQ5sSUieNt+vTKbj1fyCW0+5nqdoVzCBZjWUQqWzKNfVJWgzKNPe4+URv5XuZ9jR1xzSUiIFInue92ewua49GfaYwtUWpyxfiSr1V1kYc7S8U= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5478.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(396003)(39860400002)(366004)(346002)(376002)(136003)(451199015)(26005)(83380400001)(9686003)(38100700002)(122000001)(82960400001)(38070700005)(55016003)(2906002)(5660300002)(8936002)(966005)(53546011)(71200400001)(478600001)(107886003)(64756008)(6506007)(66556008)(66946007)(66446008)(110136005)(66476007)(8676002)(54906003)(76116006)(41300700001)(52536014)(316002)(7696005)(4326008)(186003)(33656002)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?WfC+V2RtCksir+8Dg7cb3bZLv3kOr3lcbXWO8LBeuRSQwXAYMdOjqbA/xOSm?= =?us-ascii?Q?zacljMn5AVBCCPEX9+CRRQCbct8EzGehNwJgSlTT9k8vznr7MuceJM5ziecN?= =?us-ascii?Q?XznF3haDIzCWGsiH8eEWpJygI8n/7yriaifHWYaizvVu4NjY8x71CKi49YWd?= =?us-ascii?Q?ss3va7QyROkowGxXt6JLlm/qqvDXHEvgHlls4lEP5qyZe/+b5HJ071yxG9UT?= =?us-ascii?Q?/NYJMGSNaXuFOi2APq0hiDPmc0ORYKpS7Vdnn90FuDNXI4jAqhS9U9Fs/V3B?= =?us-ascii?Q?D4AODDi4q/KSGcrfLeszpztKeHbvfEp0fXh3+hwVG4dbsyFObW3NzLOxeuJ0?= =?us-ascii?Q?D2B6HwGz4WPFLcWFRgirkPFhDeJ/eHPyr2LDIuXjnTaBaalPB090oITCYe43?= =?us-ascii?Q?EJrKgJdQg4xYtS8dYy4dLUFTyBp+aaXcc67KK3o0czfon16wNd1vj6JKPxiG?= =?us-ascii?Q?zPKc2KFgViW17VD/D9hYX1ERaXRtjDk1elWo8p7QxaDsXr/lvudxZtziZbgw?= =?us-ascii?Q?hPJ5jPAJPrHZVgkIfZs2YJqbXQQE2nLUHtFryvrsoWfvh4mQw3wzqIXL0dH1?= =?us-ascii?Q?MiHx3SjY639PmJTd/puYAJaM0w6V2pOMZkDd9YyEOE+KVP0X+dJsvP5cEx3m?= =?us-ascii?Q?JFXsu0SQ1k5poqxWNhd0tSwDYj0TaTyox4QDNE4gNcX4UTWn/uoe4cUC2H4D?= =?us-ascii?Q?qPpcP3ujtX/D9qPgaaPD9UiyxDBfN/xL4XwdtSEzQlbroKn4ZXmyOjR+ACJ+?= =?us-ascii?Q?QG+/vOlvj+QEI3c8HB0q6bj3SACAaBm/L2f/bxDhtic636fZElKXhaRd7kpl?= =?us-ascii?Q?fAmZuzDYkIaW+fF60HIHQp7AyoRJ4DNN2HU/3Y/gCzmXEhFNZeXok3Z5JQN0?= =?us-ascii?Q?VnpBlcJvduiRdEC6JEEET/o1OOzLPVNDLlaIsqiUuVpcIOqXUOIhb3hp9sIL?= =?us-ascii?Q?s5QKZ8hGGoN/GGuHYOrOwZWb3+dnsVnsjhMsHzbzqVgzqZBi6tXPdVhX0Q8/?= =?us-ascii?Q?xF0pbfGZC8HdFQcU9SzVdtRiTpw7H0vBTeFJeJ70U+BQBmplqccF+25qsSvV?= =?us-ascii?Q?cBR80Pn9TVS2RsHZivEEfcPGLZjXO0o5wft+Ie410VeM999tkMJJTA1p+nG0?= =?us-ascii?Q?ovckrUUUOe1H9rVhLX5tai8YuA2iwh8sJuBwf0sDwvy9CMawahfqFuGgTghg?= =?us-ascii?Q?wDiGimzsPQunnGhjjXPWQzNi5RnoON4hm8TEe3ncdEYxliPAxVo9VWRPT3Bp?= =?us-ascii?Q?IHsA6Pkcyq4W7AJ4Grdjq4HZ2n9pySleP4nzRpmlA31qKsgXyDinYLfPleDa?= =?us-ascii?Q?RL8K72jzjQQBsEeMDwvKKpuzZiUAssnG6tDL+1gmbZNXhklGPkrOwawhvcME?= =?us-ascii?Q?X4sYCDXXt43o4P0fmGvAMHMpU2au2f/7JvI954xw3DY8EKqudRwC5yeafp6e?= =?us-ascii?Q?hWVxBSGYp7ODq9u1F8/gKA2G27X3pCcR2Td0NMTZDj7IZKTL0V2gr7zvPGKP?= =?us-ascii?Q?zKVWcsYXfihGhZGL0YpHHYv4pJdKt3y19ILiVX5etHreyMGcV+dsO/yVDumX?= =?us-ascii?Q?YRDUPHSAJPkILp+DlDQ2rMmCAzttVpcB1YFip42E?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e34704e-c67a-4a17-f1e4-08dacdb8bd40 X-MS-Exchange-CrossTenant-originalarrivaltime: 24 Nov 2022 01:10:55.8859 (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: VyBqsB3zC4wDHHukuBkbzge0XtxQSLjLP/jd6tVmNzmL9hMKXVMWWrvekXolSZhIbrZe37kxlacf0w221yiX8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5045 Return-Path: gua.guo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Gua Guo =20 -----Original Message----- From: Lin, MarsX =20 Sent: Wednesday, November 23, 2022 6:50 PM To: devel@edk2.groups.io Cc: Lin, MarsX ; Dong, Guo ; Ni, R= ay ; Rhodes, Sean ; Lu, James ; Guo, Gua Subject: [PATCH] UefiPayloadPkg: Support multiple-firmware volume From: MarsX Lin REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4164 To support multiple FVs provided by UPL Cc: Guo Dong Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: MarsX Lin --- .../UefiPayloadEntry/UniversalPayloadEntry.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c b/Uefi= PayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c index 09aee89680..9df7d3ee19 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c +++ b/UefiPayloadPkg/UefiPayloadEntry/UniversalPayloadEntry.c @@ -397,12 +397,21 @@ BuildHobs ( GuidHob =3D GetFirstGuidHob (&gUniversalPayloadExtraDataGuid); ASSERT (GuidHob !=3D NULL); ExtraData =3D (UNIVERSAL_PAYLOAD_EXTRA_DATA *)GET_GUID_HOB_DATA (GuidHob= ); - ASSERT (ExtraData->Count =3D=3D 1); + DEBUG ((DEBUG_INFO, "Multiple Fv Count=3D%d\n", ExtraData->Count)); ASSERT (AsciiStrCmp (ExtraData->Entry[0].Identifier, "uefi_fv") =3D=3D 0= ); =20 *DxeFv =3D (EFI_FIRMWARE_VOLUME_HEADER *)(UINTN)ExtraData->Entry[0].Base= ; ASSERT ((*DxeFv)->FvLength =3D=3D ExtraData->Entry[0].Size); - + // + // support multiple FVs provided by UPL + // + for (UINT8 idx =3D 1; idx < ExtraData->Count ; idx++) { + BuildFvHob (ExtraData->Entry[idx].Base, ExtraData->Entry[idx].Size); + DEBUG ((DEBUG_INFO, "UPL Multiple fv[%d], Base=3D0x%x, size=3D0x%x\n", + idx, + ExtraData->Entry[idx].Base, + ExtraData->Entry[idx].Size)); + } // // Create guid hob for acpi board information // --=20 2.33.0.windows.2