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.37379.1671677376246695004 for ; Wed, 21 Dec 2022 18:49:36 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=fjyPnaCJ; 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=1671677376; x=1703213376; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=Yn4K87c40YuTUVFo8FgIyvtozjTavtK8VFAbwl38Klc=; b=fjyPnaCJfnmd3HtNYspZU20ojXVOZEU6zBvXfFyCYe/YIzS2vbmkxe2a vY2Sp0kQ9FYzoRWIieVZcr53UIr5UerXBZkDJ6VPJ8J9nkVlLzkB2UFXq Ruu3u7M2XOEyioLVdVSQeFac91xs8LNisda6Sd3CVSX25+tuncGMdy7ct i51N6hWxATZ10OZNqEPSLOFAYgss7i0cjvtHf2357QMVLjM7/pd/Dsj/Y hyUCQeUy/xbZqtqK4F56B+v+b8bE1yyS6ufDvT/dkuz1V0Xif3+0x1eVs vlGermZp539Qar62/YWDUGAIlxm8mUWb37OXD3QJRcQBdhvu153ccJstx g==; X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="300363774" X-IronPort-AV: E=Sophos;i="5.96,264,1665471600"; d="scan'208";a="300363774" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2022 18:49:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="775901541" X-IronPort-AV: E=Sophos;i="5.96,264,1665471600"; d="scan'208";a="775901541" Received: from orsmsx602.amr.corp.intel.com ([10.22.229.15]) by orsmga004.jf.intel.com with ESMTP; 21 Dec 2022 18:49:35 -0800 Received: from orsmsx611.amr.corp.intel.com (10.22.229.24) 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.2507.16; Wed, 21 Dec 2022 18:49:35 -0800 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX611.amr.corp.intel.com (10.22.229.24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.16; Wed, 21 Dec 2022 18:49:34 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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.2507.16 via Frontend Transport; Wed, 21 Dec 2022 18:49:34 -0800 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (104.47.57.176) 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.2507.16; Wed, 21 Dec 2022 18:49:34 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OqIakzD2lWr6s/pm4ufNcUu+0wTWZI6jqbwF0i+fp1QPbgB+6TDXZ9hFDUzaDCp5QQktDTm5pvX5Mdzy0j7jcrZ2sfU5CTEAMbv9GZiux1ykG3AwZVq+15utBZij40E9f5yxC522cxQSB6M24cIhtctPQGDOSjrcFEocbMNHszY2B1HHCxqNHg0fMfoV7hU2J+P4153KAe5aN5Ko4t6KXUcp37sbbJjTn4RhQBdeRsl1tPycXrmCU1zUE10oCgZ6v4xEUFqZr37iMz78elta6zacW12Ui+wQA4UXmQSTBfUiiWSrEeejzgxMeIoXk9R7O5oE0MHXG2nRbcH84N9K9g== 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=yEnAbgg4KytPDrqdUAdy2L7nKnrYntm3oIQEPJ4Y4y8=; b=iaewRoTjfDLSJHVT4Cjike87+Lr1Mjej2QkWMiudbr09R72PY12WRprw2EiF9bJaG5+wlmm3J2hub61JPylUoEn3AkIqooqpXVRKkdNT6uI4G7DwSTWpzldUgMU+TvDkAAys3UpkAkvvwRiufN0TuSAvtyuZfJ+rsUIqk2cBO6FaVCejP1RRxRIRCpp5jAWjxjTZiRS9aFU+QaAcG4HcakCIOSM3ZC84b5JUkqnVToCY6l+YgA1Jov24OtTcvnOxzHVTdWV+4glR0YpY4abR5sWwVnLxC8tjU/bq5rtDbbesq1IERwXEcEU7FhX2bheunpn6beqymzbaS2mCt9zWQA== 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 BN6PR11MB1908.namprd11.prod.outlook.com (2603:10b6:404:103::13) by CY8PR11MB7136.namprd11.prod.outlook.com (2603:10b6:930:60::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Thu, 22 Dec 2022 02:49:32 +0000 Received: from BN6PR11MB1908.namprd11.prod.outlook.com ([fe80::7f2f:e7db:3253:e5db]) by BN6PR11MB1908.namprd11.prod.outlook.com ([fe80::7f2f:e7db:3253:e5db%4]) with mapi id 15.20.5924.016; Thu, 22 Dec 2022 02:49:31 +0000 From: "Lu, James" To: "Dong, Guo" , "devel@edk2.groups.io" CC: "Ni, Ray" , "Rhodes, Sean" , "Guo, Gua" Subject: Re: [edk2-devel][PATCH] UefiPayloadPkg: Fix boot issue for non-universal payload Thread-Topic: [edk2-devel][PATCH] UefiPayloadPkg: Fix boot issue for non-universal payload Thread-Index: AQHZFYKtCnVkbc65EEeCKVM/6wwKA655NOcQ Date: Thu, 22 Dec 2022 02:49:31 +0000 Message-ID: References: <20221221212433.1028-1-guo.dong@intel.com> In-Reply-To: <20221221212433.1028-1-guo.dong@intel.com> 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: BN6PR11MB1908:EE_|CY8PR11MB7136:EE_ x-ms-office365-filtering-correlation-id: 550f7aaf-dd3e-4db2-f8b4-08dae3c726f7 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: Gzla/L9o3y1vzq4jmC2lwMrDY89YmYI2WSMWwi541UjO1FuuJ5n7qV/x5KiIMutNDLbNbhjmKmmg5yXgLoJCVxT2ZHupim2d4dl1IK+GivYNAE/x15MUaMdv5LfoZy2RyZqJnzDjFaeI35fab8vf6K3CyggPyc/MMr+3k9Kd+IfHq/ac896h4b1yJ8hYDN1uNlsPmA9MrIARTGRWVQNscv94LUvHRVmbEopb1BKpQpFudme6ZRrabR7lWUEjBTD6m0HYAUV5aMgUqG8biQNfbo0b/1gnDmiT8XZgY9hpvO9NE9eRB/+Gme27/Sqkn3wTnXsZqcVe4KY6vXvl0G48b+MBEsq5RQmra7CjCJAa+kdRj51Fyot5leUbYGobumrKgbk7pHkDlQ9VWCsj7oRzByRJaaRxdAACHk/+mkXNklp3kddLUxNN/XVwYwaADt+i8ID9JwkHYLkpRVgvwjF5KcmDJLJPGHZsWLkq+iyj2VMdxwz6iNerbPMLVTg4u3NjpALlpb7KTpXAAa6kHCWtvUYHJWHR4VSShfmGnEoQ2b8rO8CtgKmROqczSRE1xqax6cmdb8yxoDDZriCQn6f4SBFE2HsWDna2J1V16R4hplX4LGHmKq4acOHtwkyGnW3NdzjkCCTOy3uvCnhhEI8qsYWErWPEJ1SdldlGEyCgQfzED+fsTpvOglAzFa6ZqGSa2HrI9mb7lSV14cHCKL1h9g== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN6PR11MB1908.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230022)(346002)(39860400002)(366004)(136003)(376002)(396003)(451199015)(8676002)(54906003)(5660300002)(66946007)(66476007)(110136005)(52536014)(66556008)(76116006)(2906002)(64756008)(66446008)(71200400001)(478600001)(9686003)(41300700001)(53546011)(26005)(6506007)(107886003)(186003)(7696005)(86362001)(83380400001)(55016003)(33656002)(38070700005)(82960400001)(38100700002)(316002)(4326008)(8936002)(122000001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?9KYZEphFixuJCnjtEfdevY7H5JXMMauA2ZegDnZ7bcHbcWO1U3sC5Qx8R2rp?= =?us-ascii?Q?El3Jm9wQQM6x2w+d+lMRq5jO72eF/UvjVC+SzDUbx4BNoqs8IboUIBWgeHlY?= =?us-ascii?Q?aPrZfOC9WzVIT65+a0mgKFJtiMTkAGCU7exYcaBhMXM9XtO+70LJXUE5ULDK?= =?us-ascii?Q?1eh8sMJ3B4ZBHKq8WqRXx/qk7hir8FTzmE5QBsI/41OqBrrqvVpzUbTbpXCI?= =?us-ascii?Q?/R/EIpu75/gAcN+9UpwfU03DfbzoZAxJzcF19obBxAP/AoMGvoAAjVbep/+T?= =?us-ascii?Q?Wirr3yypts2qXvAZuBq+Notg1B3a81xDnBOhnyZb8dWP6ejNHkbY43c70rIV?= =?us-ascii?Q?ybjJeWdmIP3iqW6l52+Bf1amv7uurKXahbOnG8+j862ZzF3b8gbeaezC7dTT?= =?us-ascii?Q?LLNUUeaBdLhkeR6JkAqGJq5Ituzq+WqC6KwBvF06ak5sVJ8kgiuTnI6pOKwH?= =?us-ascii?Q?G2d2A08bRjss2Limel7itj9IM0nEtugVV05MZ5HvelYoutC55muRL7liCnlN?= =?us-ascii?Q?3jKI7h155PI1Z4jKN59VIPJUvZH11dy+8Qthvyw9oXU6n2Af144RZH3pwapm?= =?us-ascii?Q?+5cPfM2XuNgEQdCgyCGcB9mqY8Kk2QlLHpuC62r9r0WFGKC0GE7V30YuFJSg?= =?us-ascii?Q?rqh3yd3H2slVm7ZztmVm5n4Qb9xC0+weWsPiszVUSspzMibf4KW1qaNiqQed?= =?us-ascii?Q?FrcpGshvTXmFYcDvtArZ6bdwNf4sp2suy7URFFr657UqqUqW60eDdBJuGNKr?= =?us-ascii?Q?0a6xkCgCVEWruSlzJ0lJHxEsmPXDc7vweYJxQR2SlodqiFJuszmu3G9/4Htf?= =?us-ascii?Q?4vw6p5fjKNf/pdxYPKtUZ4/Hsn4G0KK5a+gM92DGSaCntnx/8JR67SI6NFtH?= =?us-ascii?Q?fIdgQxJNhxscnySbbNXUtwc5Yt1ZoKExneuaqLi5dqdm99g0Elf7nn8GLX5L?= =?us-ascii?Q?sc5YTt3XkCbshX3roMTkFpSHRzMVvyimlokxomVsvGoIj/d+Y6wvJ1JUgpgc?= =?us-ascii?Q?wKKGJw3NhzaqIdWsuqsMkrfsY8Ht+Wfm6Z8mSqivdUe+SboUEd2q1z7qhrN8?= =?us-ascii?Q?VvLrzEwGfbsRxoiWX2wEGLBlgO8JKgcy+D/ktgj1LaYuV73oWfmdEZ6HyltP?= =?us-ascii?Q?nhPuc7bpPChSWNW6tAUd/hNx0G839WiwwjhSxP7VnB83I6G6ovuEqKE2VbeF?= =?us-ascii?Q?3RANU3bZTMr5T3qjAQk8yYd4FTF3TTaO1RTLDb9SReC7NqswBHtkK0awnQzn?= =?us-ascii?Q?nV3ERnMvMJUozs0KA0zKcNSJI/VrI7Vaxtmq5Z7xYl+06Jq7bQ+LzOTyVqS0?= =?us-ascii?Q?ul3Xv80amgF1BsN/+cankOl99gWIcznU1+pQd6K9Vm8uLIVZ+OE0vWixot6S?= =?us-ascii?Q?bOxABI+dn+EwS346+VVHDNydD8VifgOQqSiZL6uNJvWXmqRGIMEg6pkrxEPt?= =?us-ascii?Q?zmuETFRGen0fUbYT2V9xZhN6/8jHadq8vTAdqh/1ha/4OU9p4GqQGeCE6ZzR?= =?us-ascii?Q?ZHcxtjpMHqSaTp18q4Sm0NoUYOFrTBlOthbFbpJoXelmyHfJ+kiOoJzKO0+M?= =?us-ascii?Q?9Bkfeqi5HHkEYpaCrsHZwVQM3wigad4z/3TDB3Z2?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN6PR11MB1908.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 550f7aaf-dd3e-4db2-f8b4-08dae3c726f7 X-MS-Exchange-CrossTenant-originalarrivaltime: 22 Dec 2022 02:49:31.7503 (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: eBav+6gLUkokLD6qlcgPq28jJNGP+3nc5ydprSKc5J+5b4gSd48FCoCpgO9V2JDq5jr7aNONlRgxSxef9jQpcQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY8PR11MB7136 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: Dong, Guo =20 Sent: Thursday, December 22, 2022 5:25 AM To: devel@edk2.groups.io Cc: Dong, Guo ; Ni, Ray ; Rhodes, Sea= n ; Lu, James ; Guo, Gua Subject: [edk2-devel][PATCH] UefiPayloadPkg: Fix boot issue for non-univers= al payload From: Guo Dong BDS module was moved from DXEFV to newly created BDSFV recently. Non-universal UEFI payload doesn't support multiple FV, so it failed to boo= t since BDS module could not be found. This patch add BDS back to DXEFV when UNIVERSAL_PAYLOAD is not set. Cc: Ray Ni Cc: Sean Rhodes Cc: James Lu Cc: Gua Guo Signed-off-by: Guo Dong --- UefiPayloadPkg/UefiPayloadPkg.fdf | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/UefiPayloadPkg.fdf b/UefiPayloadPkg/UefiPayload= Pkg.fdf index 94ba922244..ee7d718b3f 100644 --- a/UefiPayloadPkg/UefiPayloadPkg.fdf +++ b/UefiPayloadPkg/UefiPayloadPkg.fdf @@ -59,9 +59,6 @@ INF UefiPayloadPkg/UefiPayloadEntry/UefiPayloadEntry.inf FILE FV_IMAGE =3D 4E35FD93-9C72-4c15-8C4B-E77F1DB2D793 { SECTION FV_IM= AGE =3D DXEFV }-FILE FV_IMAGE =3D FBE6C1E3-2F80-4770-88B0-494186E3346F {- = SECTION FV_IMAGE =3D BDSFV-} ###########################################= ##################################### [FV.BDSFV]@@ -277,6 +274,10 @@ INF M= deModulePkg/Universal/Acpi/AcpiPlatformDxe/AcpiPlatformDxe.inf INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphics= ResourceTableDxe.inf !endif +!if $(UNIVERSAL_PAYLOAD) =3D=3D FALSE+INF MdeM= odulePkg/Universal/BdsDxe/BdsDxe.inf+!endif+ # # UEFI network modules #-- 2.35.1.windows.2