From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.33356.1671664044136237613 for ; Wed, 21 Dec 2022 15:07:24 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=QOMj2Xup; spf=pass (domain: intel.com, ip: 134.134.136.24, 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=1671664044; x=1703200044; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=HSoMuAfnou3lslm1GCwVDObz15s+vwi8rRxTUHqubxQ=; b=QOMj2XupYJd7D3anrPsjXam0fhuwkeZAkwBlxTJPTILJpSm/4ibvlWTp rdkaoCAkg6UgvJPEW9diOcTjDJ2z+z2Hm759xLAxHhskOc8sI8BZnN7JY svkGCKDB/D8YwhOTdsLbUxLaLyc/xpootWjsNLE8oMh0nEQf8YhqhddVH 3zvzWDfWIOIvBVaWbtPCn+PHF4x2bygGRqY6DAwVyDqjvN9euDBKfIxfR iVS5Ci2GiqvVhaVv0fo6a54SW3HRGHBmKKpB7sHlllKJGQGHPq2fGzJ3B gYAuUc+A0DMS880hlgpc3dJt+ps3vcBhvZohtEwuZ7Ni7tI2GRY0xMNFQ g==; X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="321172645" X-IronPort-AV: E=Sophos;i="5.96,263,1665471600"; d="scan'208";a="321172645" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Dec 2022 15:07:10 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10568"; a="896999952" X-IronPort-AV: E=Sophos;i="5.96,263,1665471600"; d="scan'208";a="896999952" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga006.fm.intel.com with ESMTP; 21 Dec 2022 15:07:10 -0800 Received: from orsmsx603.amr.corp.intel.com (10.22.229.16) 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.2507.16; Wed, 21 Dec 2022 15:07:09 -0800 Received: from ORSEDG602.ED.cps.intel.com (10.7.248.7) 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.2507.16 via Frontend Transport; Wed, 21 Dec 2022 15:07:09 -0800 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.168) 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 15:07:09 -0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nxfddEcI+XmaXmVpQeb51v2CKqFwmo+AP9p4JhNZWfCQ0rok/yrqAsAIpNJEo+qMQ+bEyvBjyNMi7H9laxz52Reb0RnNO7SghVcvWwQAO0140Gs2ULMmgWNquCCWTxqRzuHs1BQshXm8f3XWhrwRYsD9pdR/iat7TNKhGjeaT2LkDaOKhaH2IzHEQiKCaCVyiZRk4BjBLA5e6dwJHfvYRmcNBY0Tc8pZeROKEfZ0kOEQnrlwicuUeifcFXhEt7YRNGyV9hLcDYtr1VTI8wF/UzEnbYF6ty+NFn8UyIzKigQmKZ1cmWpdaVsi6e7wZ3JT15m64hZ10igXHveHwvgxGQ== 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=ulQam9V36srNZlohvuIXPjzqW+hFceraCUJjf7rINd8=; b=CtiMG+r53ATR0ffBJlje1gt1HSeSL96dGm4YsSOaejGGYym5f5E18YHtAVmXV+WEwt7U0W6V3pmtE7u0F3KSrIZMlwtEP5/K40OOdQXUuixqXN7EWl3tKqG7uQVG6Ybp6oBXv/tWwFEoNcoJaMCYPe4L491d2ansmnQYuuwSLSSdWgKLD8trYnU9euYo/7XVak6lRUXT5kDksmh24gJbVpaH0HAEI0Pk7ff7gyc6jjQZ45yQJyBEVVBPeoZaq9Rtwxx5BTuUSsp6zRkIi0ILAIgY2rr+6mglUhR+mrsH/te9dq98KrWszaC49zJ+4pW6cutWZBv1/dJPP5VRpY8YJw== 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 BN9PR11MB5529.namprd11.prod.outlook.com (2603:10b6:408:102::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5924.16; Wed, 21 Dec 2022 23:07:07 +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.5924.016; Wed, 21 Dec 2022 23:07:07 +0000 From: "Guo, Gua" To: "Dong, Guo" , "devel@edk2.groups.io" CC: "Ni, Ray" , "Rhodes, Sean" , "Lu, James" 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: AQHZFYKty3BiwW9kb0GgGP5b4/dlea549r9A Date: Wed, 21 Dec 2022 23:07:06 +0000 Message-ID: References: <20221221212433.1028-1-guo.dong@intel.com> In-Reply-To: <20221221212433.1028-1-guo.dong@intel.com> 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_|BN9PR11MB5529:EE_ x-ms-office365-filtering-correlation-id: 49e856fc-eff1-45e6-5dd2-08dae3a814da 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: +6T38Wr2rYeBpr08efhU2a9RYFBpnshVYbhduWFf+anZrCnW9PapY61xJd3iohJXPVCGNlwUL8ybcZfFMgwjgtnk480ncIa5/vQIvbGpHWt6YufeuWMaQDydryBR9FrqlaGGPhlCHi/XAv5GBC/T2V9gc7M+EtftkJC/DYXC7dQJHX5o5vFPa51serG/oXEU183ZaEzQ0lqVQk987r9GU9Cw7/miMnZg9ce2wkJnNz9YDl8ujdPNRixGdk5o7JtAnnwUQN0FiPcsINONNP9D3vmuivePmT4oVJ1BRzHNPE5Hp1CTCPtPaB4zUGSkFOCsgL7E7ajuPk5sOThdLdigliSnlti4tpsbXqogPb3QEFZHmpN+sVGcnvN3veBd9y+NmF2WvhBIjBrtBPHUQlUCUsNibuupI8dliJy3lKimVHtvcdv75vcHAWTT8rkOuxhnIv9Fqo/xBsqkXnWj3tMrZ+fhIzFHXavGh6b0RkP6Nz2A75TpRq5bsGBrxim9o3CQRDKvsDtupfycBRm/RUZCuXpjqhKSm4Q8yCP3PVVKZyxoRWHGy2sZfQLwHC2ghcOW1tIS35KC+cgJHndQd//iGEo6LBAW+3L+HZvl2XFupFOqNGKtyXTSPa9eQCLfsKPNIIrwqATaNiyLcPnr3aj3JjQBglsA0IGfeu3y7jFDIHLcKTdhMKYUle8anRq2E6fbV0LmLj/olYeBI61BIS5RKw== 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)(366004)(136003)(346002)(39860400002)(376002)(396003)(451199015)(41300700001)(66446008)(4326008)(52536014)(66476007)(8676002)(5660300002)(55016003)(66946007)(76116006)(38070700005)(2906002)(66556008)(86362001)(110136005)(54906003)(316002)(64756008)(33656002)(38100700002)(122000001)(8936002)(82960400001)(71200400001)(83380400001)(186003)(7696005)(6506007)(107886003)(9686003)(478600001)(26005)(53546011);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?PnKk9aXO8H+mNUMKrDMMhwkyZ+c/njpi5H5xmqi1roourH+dN/L/Xkla+6lt?= =?us-ascii?Q?eHf5yLdVUcsqQgbDjn9efQJTovIog5JDPj0nkQAwEE1Ao7RgGdhhMEI3dXXL?= =?us-ascii?Q?SvNcwcRhBfawTBeD5hvownEX2w8p8/7p2JvCOGKwIvL2/SaCnBZfJgKjQ6of?= =?us-ascii?Q?yS0aGJkPYt9sJ8AhhJCA1ZZk58qqB8JzG9HgLhYSJPkUsxnNZhdLTR3xrL+x?= =?us-ascii?Q?0OZpPCulA+XEu44GnBEmtSljf/4ozh4xm0XXLa6289dyhSIHHkQk6Z/tAX8x?= =?us-ascii?Q?YHuV/AJz20Cas+ZsFoAXwV6LjJvqxVpO+/YGfJeQXB44Wc6EyM4e//aY+4St?= =?us-ascii?Q?I2n0AjnxMkfJ+O1C3e0vhZrySqpH/GcIPJ4uKuLkNsInVvYWbCSEhyf1pOab?= =?us-ascii?Q?DBSgs1uX42jEvTKeAGtmBtl9didvzGg47SJ7vbPXd9D0XGYP9AHemQmBjKAr?= =?us-ascii?Q?HKJf6CySTnOuFGROGs5tkTM2Wo0MDbccVA8g73PQCxWR+HbM4e//AT2M951K?= =?us-ascii?Q?IKei96WDCJeyl8tuqizYolE3eV2XPC9YgnK/Mvw/m9QCGYPCATsHBWnG8O+U?= =?us-ascii?Q?cvnIEtEoFSm6kZS8Y+MssYeM+TXi4bfRRuwsJ7+IEEEOb6fP8TL6+HdSK6h2?= =?us-ascii?Q?Qv5qrZVF2pz5SPHRgm8jPAQclp+LvAnwvihh/zzB1clnKXuzqqlpQCjLcX4G?= =?us-ascii?Q?w+yLUWOsIk8NU3xUrULz0aCwf59e0SLuD44YKE9pa7OFtw0rUr6VywzRGxud?= =?us-ascii?Q?/egDt2vqgRSLjvazwbzW6X97wfLswNxjfVw7W2AWlwj4b6bqC1+IWTkRBako?= =?us-ascii?Q?nTa1ClDaS0fZfncvhRK5IN9wtKuZmNQz1k/LiBKtZVWlMl3g+Bdxh9oMSevl?= =?us-ascii?Q?nn3BCeZVzlRVpuR2IsA2xHc5cHY44Te4GP4kpJ2CLuEid5ZDRgzbDa78HpYQ?= =?us-ascii?Q?wG+PpHYbdVQOgDb32axOtOLlWRhWLND05H9c5sgDEOZWyI9mwo2SurCvC4Nu?= =?us-ascii?Q?a/UiTfHSqF35FV/HV6YSKPaqASu2KnQ4tVLN/yiUObVgRGEehovGEIzkQYoF?= =?us-ascii?Q?GBSi9yZDUpQFGToJiAXoKGDE2qhX4WmxEYnhcHlCCiODg/0eK46rbSDoAnw4?= =?us-ascii?Q?DqOP8v1xOs271xxhnI2sl/Gc0eWL46nkpVd/8QCSf5uVpe8ZcrMaaLv1CrqE?= =?us-ascii?Q?vOEXAdUYE6HaEtlZpcKNa9sgQnA3GcH/3TFdeSVR8VfmVu6tvEvFIWgDPSTh?= =?us-ascii?Q?Aj+gMyCWJY8uzYkQBC0sMu0rOoeDJbsRqufeli5mDkXQY8La2rt/H8B7r9f4?= =?us-ascii?Q?zHjJbsFgv/2gHuHhzCjNP6E8a8tSWQM/7y2ZY2dY8W/0OoMSedTRXQm4qbVW?= =?us-ascii?Q?wy57zUBWEUi4T/BsE7s2zhCQ4qAh7qNPXhufGlX2N7JRDIF05+m9TClB6vQT?= =?us-ascii?Q?76yP0r6+WqJ/eePMGLm39uAW/hQimEmpP06tfwLlJirI6qM0Jy44c5GRD/pa?= =?us-ascii?Q?Q+3peJg8+XX4AFCQmkkuox1+LVUqK7GciCp2y8BuQ3Mr+63gT+JA1a4+9iVj?= =?us-ascii?Q?8b5MC1cy7KCqFgHubQc=3D?= 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: 49e856fc-eff1-45e6-5dd2-08dae3a814da X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Dec 2022 23:07:07.0056 (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: mNFKx9vAWMS9uplXmauTxuGoua5rfVUhR3J6MVvzzsdxniSxhi9pTFeTeq/yU0WzcyIaAwiW6ajUkN0e3G4WDw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR11MB5529 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: =20 -----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