From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.2764.1620795601590967321 for ; Tue, 11 May 2021 22:00:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=aBidd7eU; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: ray.ni@intel.com) IronPort-SDR: tTzXEjeH7BFc52rDRtzS2TO7YmKUuJfFd1VUBYDEwjPxAqsKi8sbKfOt2kk1V6NDh2aimkf103 AiOD05sf3W8w== X-IronPort-AV: E=McAfee;i="6200,9189,9981"; a="260872704" X-IronPort-AV: E=Sophos;i="5.82,293,1613462400"; d="scan'208";a="260872704" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 11 May 2021 22:00:00 -0700 IronPort-SDR: ntodUU052HJh0gvruZKU+fg1oIxnSvmM78ey+7Pm/dyrNS26eBXqegC/AVntYK+hqU7UXcjiuY R9yr9G8gv53A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.82,293,1613462400"; d="scan'208";a="469238956" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga002.fm.intel.com with ESMTP; 11 May 2021 22:00:00 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Tue, 11 May 2021 21:59:59 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2 via Frontend Transport; Tue, 11 May 2021 21:59:59 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.176) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2106.2; Tue, 11 May 2021 21:59:57 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S2U8p5smwKVXGvsFOMfdrkl8PIDcQdqxDDTFbirw5r2xeBuBL+o+AHkjY6meQCny4CpvihHnA43R1TPOBAAvkrvrpGiZO23anXpq8qeswYyTqIYwO5wbR57WARc2OzHgmVh0nhA/ZA0AFRovT4Fvwa7p/ntf2/vn7Nh9z+je5TNDezg+HuAADzb8p2KMVNEcvPxCG8pxZxIt4QapnYJxVRuJ/Hu4wLbYLz3nCidyj9w6yYUFsX2j2fUoTfx7t7C++BQX8ZXaTH9OOCNau7HmlE/rsqIWLtmkqEqPTzRF0iUWLXL9Q3fXnf+FXu9vQrOYoOF6IzEatYtM+1GuoPCKzA== 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-SenderADCheck; bh=uulvhCi3sLzJiTSkALntmtiDVx0VMD+p6wfadbJ6uyY=; b=SfHicHUJq23uLBZ/spvX4+NX0+h2v7nARelbYyrBOwOeyDtJZ5Y1oLFCKM/v5Req+lu+x7HTYr/uN1GJQ3lOgdlO+Jrecg8NwSxJjV25+z9TnGaTW7k4amoLLF8cbOhOyONBql3y7PgEfanwqR3dth623kiBr9Twhlk1SnQyaMMjP9D4aOstJtHM0DSDRSPhNSl+o1sDtIZcRep/tvkCMjA7U+aGu9zK/YfbzG0GomWZcql5iqQEZ4DxFrOE4lYeXQQ3dt7ieHmu17eZDijI6HsTsk8S4bfTJDUjkXg/IoPlnhhTorl+Cxe9R1hpDrQe84mbLYA7oCINFlvQiCeJsA== 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 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=uulvhCi3sLzJiTSkALntmtiDVx0VMD+p6wfadbJ6uyY=; b=aBidd7eU7BuhaLBXaFHraLpnlSs7C+K8q5LqRfPmGv4v8VM57ue6ITy0FvDHaYmB1FmvB9z1ZjxnqW7Xd+Vl823VtMfllg41N5ni5Hta3xN2R7988wVIxkaoaPhjGwdV95Ps4j794nQcr6HO8StkLPtssjW8cAeA9OiR+nI7BH4= Received: from CO1PR11MB4930.namprd11.prod.outlook.com (2603:10b6:303:9b::11) by CO1PR11MB5089.namprd11.prod.outlook.com (2603:10b6:303:9b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.26; Wed, 12 May 2021 04:59:56 +0000 Received: from CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::59d6:8b94:55bf:36e7]) by CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::59d6:8b94:55bf:36e7%5]) with mapi id 15.20.4108.031; Wed, 12 May 2021 04:59:56 +0000 From: "Ni, Ray" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Wu, Hao A" , "Gao, Zhichao" Subject: Re: [Patch V3] MdeModulePkg: Retrive boot manager menu from any fv Thread-Topic: [Patch V3] MdeModulePkg: Retrive boot manager menu from any fv Thread-Index: AQHXRg3fPqSJoD/6vEqq6CPRXA4O5arfSxGg Date: Wed, 12 May 2021 04:59:55 +0000 Message-ID: References: <20210511023149.1201-1-zhiguang.liu@intel.com> In-Reply-To: <20210511023149.1201-1-zhiguang.liu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.147.194] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4f072d8e-a7bb-4744-cb30-08d91502c95c x-ms-traffictypediagnostic: CO1PR11MB5089: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2150; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: VEGI9ICrkDs7hWc3m7539BkgziMgBVHMD6BVRnF6Io9KDwJBtNbUq38HkAKf9aWwEEIpeH51MehnYx6z0Cv0l6wkLh0GqV8aQOieF1eDHjovcQ+R7nYBD9/E7eSwZ5Hq1OUnkwJfoAW0h23S8HjDD313lsV/jyj2HN0rX+gfoCwtqVUUS9EwiBK6RiHgaO0OtIE4xhOiJ2lFMaw8AFJqEh9fAPUxAE99gutudY+EFb6GKtMz8O7pUpd9ItvifW9ekGz8RiHNFBt1civH4WTrpiE10YE2gzOTR8uYHR6pBEvG43aHA2WQ9Jnq4RjVPPz0nznHK2/nupFOImNWHdvyxqH94dajjrPPJ9QwZEUB/qcw80wLrS5pfth/Kwa/iDmECobShhOQUnad6buJ97GGv3d9He+qvQDVwb2Eeg3SvZh+7TCmN8IPXqtujp7kRenAuH5p067XJXFG7eY+p7fhWCH3LrG53+mw22d6WmFxzU9O4XLHrIrK72VfQzQuFB7i+bic6AIiw7rdjBug+4hvLvox7wanC3qOhzp72dA+vsO7WnmyuRAjP3kBbLfLFaxiZ59EU+m4S209mgNg1Ark7e2iwUeeZdaQbipUJ06ix2Gjz1tesW6JT1ZVJYxc0ra2qYWpeKiEfo7GZo2G5uqbxkPkoIEEzX8KRDN4xDR9ArOLUfr8Zuj747f26AuYD5rY x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CO1PR11MB4930.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(136003)(346002)(396003)(376002)(39860400002)(8676002)(38100700002)(33656002)(55016002)(26005)(4326008)(107886003)(53546011)(6506007)(9686003)(71200400001)(122000001)(7696005)(478600001)(64756008)(66446008)(66946007)(52536014)(54906003)(66556008)(110136005)(8936002)(66476007)(316002)(2906002)(86362001)(76116006)(186003)(83380400001)(5660300002)(966005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?us-ascii?Q?3zsjAYMEAA+97NnXxPaM6mwbH65l8A8PUp0bxANwa0NCCw8SUpLTibJbbDzs?= =?us-ascii?Q?24S6+fPqLfxJSzIJs/0z3g/xW/N5T6kiaO/Wt/+08Tv49TqIGB2/IaqDCxHR?= =?us-ascii?Q?Q+mWms6tz3zmHYuZl5Jcw8Xz7yrEj91VmS6TKNRsT2sWlZQkgKOAUy1bLMTa?= =?us-ascii?Q?tp/cNqJDXRqQsLuQRBXJJrYMLWvvakRmHs4SzXoDzjpUUIvENaEgfNdAEzMi?= =?us-ascii?Q?B3FQ4Ctv6sTsI3893OqpPLNdIiD97cu4ubNdOY4+w6cjPGNF2/wG0rb5n7FY?= =?us-ascii?Q?pefu9icDZ3YeO5+lf8PcX24VbsgSAq1YIFJE8Nc4EdMbZyYPKccdaMT0LVh+?= =?us-ascii?Q?UDwWlxCUixV3RJQKb0RG7MQ/3tth+BXQdLhs/YgM19sxhE5SWLvbkDVVjciT?= =?us-ascii?Q?Zl0rDjKZT5uYDRJw/cBBDSSfKiRoOqhrWnJpWWM0FLqA4YnmP4Jq6Ub4P1kI?= =?us-ascii?Q?qM8RiIy8cAs5ZaWOw3oCGUQGv+J4w3vTMmRVtaLKdOZi4MNXn7/OZRNvoNvK?= =?us-ascii?Q?CKNtCIuCShT/RBOrcH7U4IFt+HnvkrdKGBIlPGYahu8JYTlWetC+4nHwKBQe?= =?us-ascii?Q?OUJUm3wzmc8DYTM+96Kv6cCfIJ2HgltX0mXWLz3cK1JL1ZQQJwTuI76pBuTZ?= =?us-ascii?Q?1B8ahD8/6YTV0i3TkYYtkuAENuTGUujeXD2ATE+ymXNAMR/DGU6tyYivcpj9?= =?us-ascii?Q?xdf1TkpUqbaKzpq9/5NtDJGA39rlFfaE9tXCFRDcuuqLYENE8RL+eZqxS1B3?= =?us-ascii?Q?WxvAiI2zKFc1g3+EbmoZP3nc1ISb3POVjrfINlQf/5mR0DK3aj7jDi6+XiCz?= =?us-ascii?Q?ByWc9kI3BMoyv1vwqmTziG56kw/xb1hq5xnfiFna9PKkYYSHcAUwEEOooy9w?= =?us-ascii?Q?n7r8M55l4RTD/8f20cunsvMH4GGSSOyXWedt5lqnO4DPGkOCDWIxcHmfZbZb?= =?us-ascii?Q?CyrIPh030Br1gkb5jnLAwGTdCZnVP88uxnOeXwI57KVioqUVbFMpS90TwPsP?= =?us-ascii?Q?CWF+QK3yCS+W2yfUhv/Ii5xiFHrzCkb34hw+C6fCv2uFemYUn0UhBJGTgEZR?= =?us-ascii?Q?crHjJ8YUeNXuDSkhlAkL3cYwbG0PeUgYiYSIvsBVeDHBEQNU6GApu7foOvks?= =?us-ascii?Q?bIt3IHjhr0FccQeKd1sIhLAAlTz9bnH/btF7+7xqpLPgbWZAia68KC4joowY?= =?us-ascii?Q?6XRwCjDdyhEZElkxkD1gr+/yKj51asb7OLllb7DNuiAB5iKMhycwXfnvwxMO?= =?us-ascii?Q?JEhGSPJgcoSrT41+SYPjZssfC1ylkmbZRyr3Hd2ooZu4L/YfUkz5vSFPg/Fi?= =?us-ascii?Q?1Yq5c4wXyT0+Io5zn4PzG4cS?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CO1PR11MB4930.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f072d8e-a7bb-4744-cb30-08d91502c95c X-MS-Exchange-CrossTenant-originalarrivaltime: 12 May 2021 04:59:55.9506 (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: oW/otthXeClbum8gnTwut6zP16GSXsNVq0xbTBE3LksbkA/gzCWpXqCDyAToMZ1jLHAYyat5e403fwLgKD2PVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR11MB5089 Return-Path: ray.ni@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Ray Ni > -----Original Message----- > From: Liu, Zhiguang > Sent: Tuesday, May 11, 2021 10:32 AM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Wu, Hao A ; > Gao, Zhichao ; Ni, Ray > Subject: [Patch V3] MdeModulePkg: Retrive boot manager menu from any fv >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3384 >=20 > Currently, UefiBootManagerLib has the below assumption: > Assume the BootManagerMenuFile is in the same FV as the module links to > this library. > It has some limitation now, so remove the assumption. >=20 > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Zhichao Gao > Cc: Ray Ni > Reviewed-by: Hao A Wu > Signed-off-by: Zhiguang Liu > --- > MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) >=20 > diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > index 6cc34d29c0..bef41ae102 100644 > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > @@ -2,7 +2,7 @@ > Library functions which relates with booting. >=20 >=20 >=20 > Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved. >=20 > -Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.
>=20 > +Copyright (c) 2011 - 2021, Intel Corporation. All rights reserved.
>=20 > (C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP
>=20 > SPDX-License-Identifier: BSD-2-Clause-Patent >=20 >=20 >=20 > @@ -2385,7 +2385,8 @@ EfiBootManagerRefreshAllBootOption ( > This function is called to get or create the boot option for the Boot = Manager > Menu. >=20 >=20 >=20 > The Boot Manager Menu is shown after successfully booting a boot optio= n. >=20 > - Assume the BootManagerMenuFile is in the same FV as the module links t= o > this library. >=20 > + This function will first try to search the BootManagerMenuFile is in t= he > same FV as >=20 > + the module links to this library. If fails, it will search in all FVs. >=20 >=20 >=20 > @param BootOption Return the boot option of the Boot Manager Menu >=20 >=20 >=20 > @@ -2437,7 +2438,7 @@ BmRegisterBootManagerMenu ( >=20 >=20 > if (DevicePath =3D=3D NULL) { >=20 > Data =3D NULL; >=20 > - Status =3D GetSectionFromFv ( >=20 > + Status =3D GetSectionFromAnyFv ( >=20 > PcdGetPtr (PcdBootManagerMenuFile), >=20 > EFI_SECTION_PE32, >=20 > 0, >=20 > @@ -2455,7 +2456,7 @@ BmRegisterBootManagerMenu ( > // >=20 > // Get BootManagerMenu application's description from EFI User > Interface Section. >=20 > // >=20 > - Status =3D GetSectionFromFv ( >=20 > + Status =3D GetSectionFromAnyFv ( >=20 > PcdGetPtr (PcdBootManagerMenuFile), >=20 > EFI_SECTION_USER_INTERFACE, >=20 > 0, >=20 > -- > 2.30.0.windows.2