From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web11.40130.1669351509275473260 for ; Thu, 24 Nov 2022 20:45:09 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=LCAHQrMm; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: james.lu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1669351509; x=1700887509; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=JIGq16TBMU1qYqAR9YvRcpqZj9RlS/jIQllzm75XVzs=; b=LCAHQrMmQpzMxFiD7GuOVpED6pOx53EhULPfRP1uycqVitPNM3cljOio 68hqlzxIigHwxRdlzSOzkLvUDRhqJC/g8ISskhQbfh9PJKVNfpQP0VI20 mzGCY5diypPxluS/ideU3JwHyNLkyX/b+h2QZW4ydRI76L6zLtp7YGZoR sUjEHvwsAhKoWRAOyPllalJ0DsdtGZe+FA/C0P2XUghqAzc7bO6IQMQv6 woCr034CnY0BvF9iIfpZhwRMLr+y71CvK8TIMGwWP+nnqZzZgyMxwAzRQ h58f2RkVXqkGvUPDFZQhx1rSo2zwUoKif1RjatiGgDklaV9AE00urSbfa Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10541"; a="294792609" X-IronPort-AV: E=Sophos;i="5.96,192,1665471600"; d="scan'208";a="294792609" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Nov 2022 20:45:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10541"; a="644679287" X-IronPort-AV: E=Sophos;i="5.96,192,1665471600"; d="scan'208";a="644679287" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by fmsmga007.fm.intel.com with ESMTP; 24 Nov 2022 20:45:08 -0800 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX602.amr.corp.intel.com (10.22.229.15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Thu, 24 Nov 2022 20:45:08 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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; Thu, 24 Nov 2022 20:45:08 -0800 Received: from NAM02-SN1-obe.outbound.protection.outlook.com (104.47.57.40) by edgegateway.intel.com (134.134.137.103) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2375.31; Thu, 24 Nov 2022 20:45:07 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=O+hHkHyd1xMPB5ppZAK+rOEzeQ+YA4dRaZf3Yn/quAxRs9Olb0cfgy82oj6EA+Z6mjqkUMrgHsBWJyuGfTvt7ZV+KwKZfYJd/OmQjmjXDGIC8GfP8PfVzqIHs3m0klWcC8ETwNAuvpkS/oroVv0seDX8dlcxFCF2FLuaox+eV8ToFKiEt5gkjc6iKoFAWoRID3YH+2Ht7UBBSPqmoOTGb6d6I9uh0/UQEpN8vs3dChJDxIkZoQY+aPJHoUeNRoUzfPAS+0GtB33bjcoFJ5xcUGQ3uhrbaTQuuXhpjKVhfg861zJ4GhiVJZqPjsy2RQ6Zvn6vNjcg50yT7YF7tCA2IQ== 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=NFkHsU5kFYFc2gA9vc8vZsCll4fq/nYMPezNJTn6j6w=; b=YwmXxVwGY3jJ6G82YkKUDnYHDI7GFYJSP7zi7mmRFcz/Dg5RsXH0zY+DH33i0/M5ZViXC6Q55IQauErPjruSl6LQ2FMJLnfaBUL14N4SsmwJCoBTuAdqtfyKGlbUKHVYggUY42NWh2x15TWH7heRMyOhu7eqW32TwQv+ziDUJxZTKRfNfQCE5DUDld5+t4dV2YGufHmWCXTnFZW6D2OByC/S/JjsGw3+2lv7LW/jvseBAyZeaMWPkKMNXUgVrVopLV2MPezR1Gf/XT2tpLzvxRf+P+uhal3VXtjbUvgU9WJ98bGauwd+dvuYke6krbpzVb09Ju8PQxEEtZB32ZM1Xg== 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 CY4PR11MB1909.namprd11.prod.outlook.com (2603:10b6:903:11f::19) by SA2PR11MB4939.namprd11.prod.outlook.com (2603:10b6:806:115::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5857.20; Fri, 25 Nov 2022 04:45:05 +0000 Received: from CY4PR11MB1909.namprd11.prod.outlook.com ([fe80::e293:a555:2242:149a]) by CY4PR11MB1909.namprd11.prod.outlook.com ([fe80::e293:a555:2242:149a%10]) with mapi id 15.20.5857.019; Fri, 25 Nov 2022 04:45:04 +0000 From: "Lu, James" To: "Lin, MarsX" , "devel@edk2.groups.io" CC: "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Guo, Gua" Subject: Re: [PATCH] UefiPayloadPkg: Support multiple-firmware volume Thread-Topic: [PATCH] UefiPayloadPkg: Support multiple-firmware volume Thread-Index: AQHY/ylyTbsReITxPE6KM4BtJQ8Pzq5PEujw Date: Fri, 25 Nov 2022 04:45:04 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-001, en-US, zh-TW 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: CY4PR11MB1909:EE_|SA2PR11MB4939:EE_ x-ms-office365-filtering-correlation-id: 7da1efaf-2d21-4341-e369-08dace9fd239 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: C/LWf1ObVvrKVw5rmKf61lntBf8UCqMKpqLfo0iw7BeGDCTRRiECNTkeP/hxmZ6NPWXZ8x4iRtr6DOtj78x1810zYSd6a6UstWbVxYk5AAHoz9XYQJY7FyfR8/jKnOwBu4cPufFiv1yI4rhueIrTKYg8hKeHjNsfU9ZO7yvtPy06iB0nYvo0X1YLUHuczni+C/dA/OUagrvnHQ5Ej120wKfXwNFOoV5cVmfES22reE4ueIHdzWxOA8sOhTpqIMV3M889Xri7RZRT+b+4fg2n2AXHFvoTpvMXiVwWYMi8xDdZ0DJpC6d2mXkdcElvcjaQaBMeyzU1vb1PgvQv3GBRkmow4txahKxACJSQ6jEfED5qDihtuYiCa6nsDpmp3lriX67PHsrFHCEYQa4aCxemPyu9gKGfakNatdLfW+qyDaaJ6DmzYY2GVji608nmhIPaOk1ibHEjHNg+DnmOdV179/qGjkSnsAuk/+VoIw0xf3l05aYFBtZ43BeBJQD/ICqVZo+NBKGvwiBgP6k8/M18xagWMWwOYf+m5fIumWSrDNnto1wFhLWRDuwDdfUxO4ep+4WuLqlnhgLApzlo9aX7h/NRz75M8Xflm/+cfYMQggDbqQ9htTmzNzi10v/aMzMk1+QCYyx0hYyyrJz/JSUU9WD+clemTYwh1fiAMPTyovQNFepCJFGl0mb0R9Vgptk1DmvPCwbJV1ZDT1nEVk0HYujyAVkVYyLCV1qlBpFKWvk= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CY4PR11MB1909.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(396003)(376002)(136003)(39860400002)(366004)(451199015)(186003)(52536014)(76116006)(66946007)(41300700001)(8936002)(64756008)(66446008)(66556008)(8676002)(66476007)(53546011)(26005)(9686003)(4326008)(71200400001)(478600001)(110136005)(966005)(33656002)(55016003)(38070700005)(86362001)(83380400001)(2906002)(7696005)(6506007)(107886003)(316002)(54906003)(5660300002)(38100700002)(82960400001)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?vAwMXFR3NA7tw0yTuwAJ6tzacndL6ZojxyhD9D90mwmL3rHNqocEgctAGXYz?= =?us-ascii?Q?jnU8AKwTpZ0FB9b8u0470FggVrKLhQRh1ydNHN2Hx4NpXtDtpCZUYgPbmETO?= =?us-ascii?Q?gjqz/tRjhaxaNzY61Fw20CEXKKPmJ3QMF75ECxoXnX6GXs0J5kzN6Pr4kqww?= =?us-ascii?Q?PACwuxI74/4jdJ4R+TNO+9956zTh2v/FN+274gOISuzjzJdUQxpAGXIb+KDK?= =?us-ascii?Q?GFRQPtp1SSLXuMq3HCHYjVYab/WCHQ6F6wg0RYy0HdNrhuTvP7d0ymSmaVED?= =?us-ascii?Q?zkjGhvrt5yoElu1m2E9zIA9jKKL9eV1/vDTWYnB6EfF7Gmfy0kAWtr53izIP?= =?us-ascii?Q?tXA8MYj3bdit6qLHS2E1vSix/wNhg2y7YcZf9HwpsB45hypcdT/R0o4dCkrY?= =?us-ascii?Q?ThXBatCgYmsrabskV4+tWB2cUAx2FGSoW7V4WrBM7AZ48mztRFg7EJjqnRiy?= =?us-ascii?Q?adZIfT+z75JIVzi9qBFxQlSS3o7ViZgFnv6ZokqJVHsWo+odmHMDMEGBAEPx?= =?us-ascii?Q?EaW5E71E5yvhDdvsmMcP8NcVlbgvYuWGK2swZUjg64d5BYJ7rIKnUYemfPvh?= =?us-ascii?Q?/C3v1kJLt84aieSkLggV15Tk/iiIP1QNOPNN7CxRZmML0IgrAzTKYCHgmQNB?= =?us-ascii?Q?SIPfP7KmuQV9oDPCy5RcpNTdQlspIh89jVf9BeLdd0nT+PGgOolvF/ijgdxq?= =?us-ascii?Q?+WvoeFQMoAvqNQWKFjIXr4ivcMlxXS73XqGVF0u31Kfu484kcSuSnNUB8Bik?= =?us-ascii?Q?c4M30D/ciVRHoxthUPabTqwvM0XRNadxNgbpjTsR4F5k0CzqERfxpbJC14vY?= =?us-ascii?Q?iqnCV3DqspG5dGnRe482wYcHzvjWtebkyM/lZffNEyA8168OjBF2gcrvWXzO?= =?us-ascii?Q?AswhqMHfROAL9Dw07YZpDgGb1YOcfgUX3feA5nCwCsCUuNtNfG/h1MkIwzg6?= =?us-ascii?Q?nr8o9xvkvEi0yEwuRe/xwz4PuVTmREkl8HNlnTJtzZBGPLFdKXWGN6Voy1zS?= =?us-ascii?Q?TdsuMuN3i2jbOyXhl87VMLmTOF3lc92elhGo1NzvASkVWqUoaGyIju8+6RMS?= =?us-ascii?Q?vAVFeL7GFTEwZ2to0xjh90HZBJI4SwEqcE+v8De5NAQXN5eQkkcrfM01agUk?= =?us-ascii?Q?uSi9/uh2LM9vCDfVyocH/TGKi0SKfv3qvAot+o7/kcZU8TgqN/g1PmAqe1Dt?= =?us-ascii?Q?sHNoDJ/oD+70smgUOc6EwGg9LPQr/mxkX418OBzvmq79d2n7EnXkvwpo4iJn?= =?us-ascii?Q?2Q2BwJmJzDyDGjG5I1pDtyZhTcUY4eud6N4TDy1ghY0d1PeVkPLLuk6u1dIT?= =?us-ascii?Q?u6hzTFQfd9EU1ZOYNZrrFyiL2f/uA8k51nWGegH2Roy+BeCOAyill9GGbfaN?= =?us-ascii?Q?W95VWuUUxnId+cOEF9fQP4g05irk6e5T5MT6f2Aybm5kSqLPi5X0J6WlcPgf?= =?us-ascii?Q?/9uCJj/KEMnatLbOcW7Nezt8/wR4DexjFy5tx0/Gly+Wy9PbpNBzhAKzsNft?= =?us-ascii?Q?QUhi8hdNf5O9QzkUMMNVSjD8+3qG8mwQvnzokwzGMZK4XLZAI1kZ2J3xHFtf?= =?us-ascii?Q?+CvtHL96qA/dB5nM2BnsOeC3ZaVLCnlo9vq5ZWog?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CY4PR11MB1909.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7da1efaf-2d21-4341-e369-08dace9fd239 X-MS-Exchange-CrossTenant-originalarrivaltime: 25 Nov 2022 04:45:04.7696 (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: EMrxDl8rdtXApk58ILy235XzweKe0oJPf+YvdLqpIVPjjx93FCkWlHNVtm+249EipDplUrZQeEDCN61fXWPFfA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4939 Return-Path: james.lu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: James Lu -----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