From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web08.4639.1623727314935473963 for ; Mon, 14 Jun 2021 20:21:55 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=hew9zREP; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: hao.a.wu@intel.com) IronPort-SDR: C58BjPWpAjrTdrYvpIDwABgW4xMu1OmeEyfHVumUSqjNqmxy3U0579ivrDyykN8FGYgnWIp5RY BGU6i7P0qrFw== X-IronPort-AV: E=McAfee;i="6200,9189,10015"; a="185609707" X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="185609707" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2021 20:21:51 -0700 IronPort-SDR: aGPHJc1eOU0UqeKdLBO57N3jXn14dYyj6ObvE4dJtXPX1RiuuI2xr9GIAkhxc5f9MPI7WmKzNu v1H3G3avOE4A== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,275,1616482800"; d="scan'208";a="415272093" Received: from orsmsx606.amr.corp.intel.com ([10.22.229.19]) by fmsmga007.fm.intel.com with ESMTP; 14 Jun 2021 20:21:50 -0700 Received: from orsmsx602.amr.corp.intel.com (10.22.229.15) by ORSMSX606.amr.corp.intel.com (10.22.229.19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Mon, 14 Jun 2021 20:21:49 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) 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.2242.4 via Frontend Transport; Mon, 14 Jun 2021 20:21:49 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.107) 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.2242.4; Mon, 14 Jun 2021 20:21:49 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DzoKSVt7j4fuGC5CZVo7hKe4hU3o60apDksw66oR1D8RUHFTAFoRQphPN9woqKTlXQSHAaaDK91zgRb0onht0XMMT8qp3q1dN/KH63/xA5v6VYSMNogXtk3o4lAiuUJPsU1N8gLUVVJPS/k8tC2bHxquq/WeJTwl+ZPjI5vXCS/VXzUivj/YLgiFX+2oNu1ItiJjfJ7kTQRi/+d/clK66fHMxZzPUiCAjSjA7Hyo+HTq0f5BVyaKh8WJicJHq86D7+gg6a9k9pdkyVZidnjY8NQrpTkCJDQQF0GOwlP0gOXm3M7ZAJg5UaAnH1HmsYbFYit9jGa5QuoQQXvJ+qXTtQ== 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=6dZVpWC7j7F5WqenFbg60AxC6HraNMnwowzXSciwZPU=; b=h9+rJUXnJebocEZBC3CS6kNvFqH9wfALGlDeMiuJKZB0y2oWat7/nYuXTO8FdKX/2c98+j63lawVDGN/DScrcTX7wVvTr92ycL63yeVrNdSxmT4VMEyTk88EVhMjQTrHJcZxaiqTHJ9q34NKAFONYeTl9eJbjAfxh0w+amgP0crAyvkLXTjpTh7Nw/2QB7UCFfoqXuDQ6EsdBAixJgobM+UTHFrmpMadwF0klbEb6woAimEOZiMvD99yGQ3Uv6iTCwPYTT1oV7s76TPpmxXIPiAddSZML1CoIGoenPFdwrKxgfSUcXZStnIOH2sRBVIceU3BVPgBdPTBY+9nbScjpg== 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=6dZVpWC7j7F5WqenFbg60AxC6HraNMnwowzXSciwZPU=; b=hew9zREPpFYvIyaUtpctqoy8aZfvgpxfUgRH0Yp5ttmyTlKFzz+yQROeMnwgb96agLs8J1NfD2L1HNutjQg+EGGwT4cdAcHQY0sLxK4EuRJhz5nQCbAiIAflrr22nXyKJumW6x9SCV16bCH9tW0jftyZ/s6oYJEMCdUcimp3Lns= Received: from BN8PR11MB3666.namprd11.prod.outlook.com (2603:10b6:408:8c::19) by BN8PR11MB3666.namprd11.prod.outlook.com (2603:10b6:408:8c::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.25; Tue, 15 Jun 2021 03:21:48 +0000 Received: from BN8PR11MB3666.namprd11.prod.outlook.com ([fe80::cd58:25ce:5017:619d]) by BN8PR11MB3666.namprd11.prod.outlook.com ([fe80::cd58:25ce:5017:619d%5]) with mapi id 15.20.4219.025; Tue, 15 Jun 2021 03:21:48 +0000 From: "Wu, Hao A" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Gao, Zhichao" , "Ni, Ray" Subject: Re: [PATCH] MdeModulePkg: Fix device path when the boot manager menu is from different FV Thread-Topic: [PATCH] MdeModulePkg: Fix device path when the boot manager menu is from different FV Thread-Index: AQHXXRMr/U/e1fXu+UqxEHlXwZnLmqsUcOXQ Date: Tue, 15 Jun 2021 03:21:47 +0000 Message-ID: References: <20210609093708.2450-1-zhiguang.liu@intel.com> In-Reply-To: <20210609093708.2450-1-zhiguang.liu@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.5.1.3 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.142.16] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2513622e-f6aa-4b38-c8c4-08d92facb5ea x-ms-traffictypediagnostic: BN8PR11MB3666: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:949; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: Ih6WBcvHVA0z06F3JuUih6UUS80v0qn+WfEyNBNiFg0Jk+H4rLfwrkRG6kaomsN2kbr84ojkMUhbY6tYUhSzof5zl9MEDTFEGuctlhAyrRgJNKtr+9ASlZBeROma6l53gmWHjMLXeGIAuUHUR6PtAvuZ/tQT414Z7O9g7akq9ullL6pb58OhcZHoxX9uR72UyubMM71al3zpK0oexNDqIb0lQXcoBD1ideim7Tgw7U4FMafe7lU/BHr2zVwrbwOtbHVb0oodZ0m3f88+maYp1SYQ1mFcDZxaMklTL3ee7dtEYrt7ODzKtxoNI/mhR/cggqjQ1faeKaLC8doSvyWms5ndif5ZjstRfghdO8brjTawGMruCuiM59oJkn4GChVCV8ohgYk1vcHrPAZia5N1FSH11LYrqndPRmwNGigoYXH8WXJONrgs/37Z2DZiso7fsr+DE27N+BFuSHHQmgVNvBre+vImt6LVt9ED12CamTDnEIfa0G70A3DzhweCVrawSqThaYrDDMUAjiHwcXZG8TY4ODJEGsm5NVVMiHNdZ/RTR9pZC8rJkWFM7jngViGi78qKz0+kTsUJhy66GJg6o2ytazKVhWivLVR6Rr/xaTvADmOtw9Yfjq+DoQHZnvGb2xMl/FAkg+B4nn8hUZU6JA0/RQ6Jbag0iQoRQKZqkiCkqPbeRA9OU2ob2UeZnIDjXcXDVCijWLKURf+7w1PEEt12ziQFIfS9P7qU8p9M4Uk= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN8PR11MB3666.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(396003)(346002)(136003)(376002)(39860400002)(66946007)(86362001)(8676002)(66556008)(66476007)(478600001)(4326008)(64756008)(2906002)(122000001)(38100700002)(76116006)(8936002)(66446008)(53546011)(110136005)(33656002)(54906003)(966005)(83380400001)(107886003)(5660300002)(71200400001)(316002)(55016002)(186003)(26005)(52536014)(7696005)(6506007)(9686003);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?OG9IKfCIUXm1Yw41pWouruDdWXNgDlIuTA9kF2PnEJtbh8pkRGt3+ULgQIkX?= =?us-ascii?Q?ZSvR0Mxllk8HEeEZs7joBamXW3NPKsN44c/Ym8l6vuPWzfKT43rqAexYVEKx?= =?us-ascii?Q?B+mxn2Mt9p52PYn6CfDUbBIEve9B/7FrR8fudqwwC0SBVSsD4B603BOHmASw?= =?us-ascii?Q?hVeTSXsWcLRc9XBuNmNhqhEvf6qUOc5p076eiHeEAXzwanilkC1Fwh7wPbUk?= =?us-ascii?Q?3AfXOiJXWA72FzFU2wxGcSnIzHaB0xkI2dVXybNsn8TMNugwmMO/qoZcXxZX?= =?us-ascii?Q?LMbn8ctVmV2B0rA9CFWI2lxYGwvMiJj+jMN1++ft9Pea0YXFraTDUas4VuxL?= =?us-ascii?Q?RrH2mNWSjfs1G/oyjuzLTIzOXuL/9rjN9VJ+Pqln/ziH7uANvza2514yRNRt?= =?us-ascii?Q?6gILzuFtBW8wVZFCIH+aQYoGESbzf2zTbV5zXG9owBb+oGjSHBXk2UTzN3iW?= =?us-ascii?Q?0q46tMJkUIcqTGL6A322SIzw7YzkrteWgajZJEbB5SDQCNlBDF3pMF0t8ma6?= =?us-ascii?Q?azAxneN9mnhclj9P86fAGs1DupLRqrq5LQSq/LBBFT/dagAi9UzLQtvWylaX?= =?us-ascii?Q?FLMqBdRXDIWBrUekMvJmJPt3sl0fdi0GfyYkWJWVbEMJ4gI2QQshV8P/xHHU?= =?us-ascii?Q?k2z0bvNF2fI7LkBYX41RyukcsAIT8QjjR9l+VgSowWPantPKKamOHnZmzrwa?= =?us-ascii?Q?UI4bFSehBcfInXatx/CasPBrG3PqZM5LfESAuwV1/F9lFgvKCw+6DkD2fgCi?= =?us-ascii?Q?iIL5xSqwXIkB3koyMsWdNkg3ZMKvmmesKVcS2I7cKj6ifYnsiSGlnR4e0yul?= =?us-ascii?Q?/7yoFBHIeiT65t54qLfq0iN9lvEIBQVijcW5gR896hViHNZYRLIWQHGA1qNu?= =?us-ascii?Q?1e8imHudPArqF5L7sJwRIcMzsNR1YhH5HS8t2pwWn39upSCZWhWKUrlicFC7?= =?us-ascii?Q?8f+b9hOnDWRNTG8mBGO5r9a6R8gdWUhNnlM6X9mM2ScWlXmAw+/J8JvnGo8W?= =?us-ascii?Q?2/exkrsAA59t4Y/pvqAPAIKxk25S64eipIFwW0NBrio8+yRQbzQnVQ1QOXL9?= =?us-ascii?Q?R/5u1vkbhJSlytD42a1/5IW6elflvwNeIVfZurHpe93bySgQi3cq7WRWv7pE?= =?us-ascii?Q?XzHpe5pzgKSetAOo/2yOyRDLcK+hoMBRu1caN5E29dhBRFohkuBGHIoojg8X?= =?us-ascii?Q?GzCJPv/Wa/TFGvhmi6IQqGmFHnPJ6V9mnVkTNXXiqZ9J/yUOox04eiqZecE2?= =?us-ascii?Q?+KJ/tFsB7NpGN/li8pueko3LtRQ7UXVwAFIEwMZXuKDB0fhPWwmo6D/UlYdt?= =?us-ascii?Q?xDZ5+BEIcLLCIxoiXnP7Ct2j?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN8PR11MB3666.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2513622e-f6aa-4b38-c8c4-08d92facb5ea X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Jun 2021 03:21:48.0630 (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: rDm+jbwxUaC3ic4T0F8l2y8feOZouGhMxRPZlaRbWcRonc0M8WyEpCGC5o2zebOLT878XRSijws3/M00gttg8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR11MB3666 Return-Path: hao.a.wu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable > -----Original Message----- > From: Liu, Zhiguang > Sent: Wednesday, June 9, 2021 5:37 PM > To: devel@edk2.groups.io > Cc: Wang, Jian J ; Wu, Hao A ; > Gao, Zhichao ; Ni, Ray > Subject: [PATCH] MdeModulePkg: Fix device path when the boot manager > menu is from different FV >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3441 >=20 > When the boot manager menu is from different FV, the current logic still = use > the > device path of the FV as the module links to this library >=20 > Cc: Jian J Wang > Cc: Hao A Wu > Cc: Zhichao Gao > Cc: Ray Ni > Signed-off-by: Zhiguang Liu > --- > MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 28 +++------------- > ------------ > 1 file changed, 3 insertions(+), 25 deletions(-) >=20 > diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > index bef41ae102..95d185b639 100644 > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > @@ -2405,13 +2405,9 @@ BmRegisterBootManagerMenu ( > CHAR16 *Description; >=20 > UINTN DescriptionLength; >=20 > EFI_DEVICE_PATH_PROTOCOL *DevicePath; >=20 > - EFI_LOADED_IMAGE_PROTOCOL *LoadedImage; >=20 > - MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode; >=20 > UINTN HandleCount; >=20 > EFI_HANDLE *Handles; >=20 > UINTN Index; >=20 > - VOID *Data; >=20 > - UINTN DataSize; >=20 >=20 >=20 > DevicePath =3D NULL; >=20 > Description =3D NULL; >=20 > @@ -2437,22 +2433,17 @@ BmRegisterBootManagerMenu ( > } >=20 >=20 >=20 > if (DevicePath =3D=3D NULL) { >=20 > - Data =3D NULL; >=20 > - Status =3D GetSectionFromAnyFv ( >=20 > + Status =3D GetFileDevicePathFromAnyFv ( >=20 > PcdGetPtr (PcdBootManagerMenuFile), >=20 > EFI_SECTION_PE32, >=20 > 0, >=20 > - (VOID **) &Data, >=20 > - &DataSize >=20 > + &DevicePath >=20 > ); >=20 > - if (Data !=3D NULL) { >=20 > - FreePool (Data); >=20 > - } >=20 > if (EFI_ERROR (Status)) { >=20 > DEBUG ((EFI_D_WARN, "[Bds]BootManagerMenu FFS section can not be > found, skip its boot option registration\n")); >=20 > return EFI_NOT_FOUND; >=20 > } >=20 > - >=20 > + ASSERT (DevicePath !=3D NULL); >=20 > // >=20 > // Get BootManagerMenu application's description from EFI User > Interface Section. >=20 > // >=20 > @@ -2466,19 +2457,6 @@ BmRegisterBootManagerMenu ( > if (EFI_ERROR (Status)) { >=20 > Description =3D NULL; >=20 > } >=20 > - >=20 > - EfiInitializeFwVolDevicepathNode (&FileNode, PcdGetPtr > (PcdBootManagerMenuFile)); >=20 > - Status =3D gBS->HandleProtocol ( >=20 > - gImageHandle, >=20 > - &gEfiLoadedImageProtocolGuid, >=20 > - (VOID **) &LoadedImage >=20 > - ); >=20 > - ASSERT_EFI_ERROR (Status); >=20 > - DevicePath =3D AppendDevicePathNode ( >=20 > - DevicePathFromHandle (LoadedImage->DeviceHandle), >=20 > - (EFI_DEVICE_PATH_PROTOCOL *) &FileNode >=20 > - ); >=20 > - ASSERT (DevicePath !=3D NULL); >=20 > } Acked-by: Hao A Wu Best Regards, Hao Wu >=20 >=20 >=20 > Status =3D EfiBootManagerInitializeLoadOption ( >=20 > -- > 2.30.0.windows.2