From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web11.5686.1623232203948259596 for ; Wed, 09 Jun 2021 02:50:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=atkfQwas; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ray.ni@intel.com) IronPort-SDR: 6Mnt1B+Tom1Lg+HvI/zpm8ThFroxn7Dd2eYSBjjHxBpE7/CkNK8pbJrn+fdV9pJEsd+tHlT4N8 +xfmBgu3vjpQ== X-IronPort-AV: E=McAfee;i="6200,9189,10009"; a="290671081" X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="290671081" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jun 2021 02:50:03 -0700 IronPort-SDR: t7bQp/K8XFFPGpz4GS8G6YvV5mq7aZCwe+AwK/onS5KGApeQPDwkFdOjAk68q6xGonVigDa9EC D/b6IDkz/Whg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.83,260,1616482800"; d="scan'208";a="448227820" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga008.jf.intel.com with ESMTP; 09 Jun 2021 02:50:03 -0700 Received: from fmsmsx609.amr.corp.intel.com (10.18.126.89) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Wed, 9 Jun 2021 02:50:02 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx609.amr.corp.intel.com (10.18.126.89) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4 via Frontend Transport; Wed, 9 Jun 2021 02:50:02 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.176) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.4; Wed, 9 Jun 2021 02:50:02 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JFqIXgj4byDWa0yHLJb2BEqN9cby2F6Z9gc9HsG6he8jL52ZTdWHTv/FuUWwM83ln6YCFyp7+UG1uShHcMdRd06W7EiZ/Fq/bx2LLtFHWcl01jNeEIgI/3YN1nvevJ6udLCKYba4U3bSK69V6x6c0WeStRpMUCas6lZg+pcGXVR7KpJRH/gjyuoGglnqNwNeCzYs0TStKVpCkSJczUUYebktvqub4VJIzz8/Hy+sl6OzEaK5F35wryC1Z7xoF6htHZphGDi6flElTBjRoTheh24nOJDGH5K3KkG7f3JGUwnlBezAqTEk9DkXGqZVNrz7fIoUv5UjL6Hgq15PsfWANg== 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=ZOza89cZePyweTsdww6LcxwqWefFT0mmZdSP4OdNc9w=; b=DHMKrMZrsI3NwX9OWTdCUByv8c2XGDcIB6FYiPPGd1WA8HPKSJJ/BV08/ElbZorBEMTK4RQIybBurwHRiE5y5UR3S7jhz4vxmC1gHlmKM0r16ZEiP9Qw74rU/o6QpevNmKeAFNulJUldL7HsfYjc8yNm2aYNeUMjMXybSVEErWRbMn2B8M7lIni1V2lPwiuHXSldhtQ4i4xBfPYhxT8h4MIFeDt4djpuHFSAAyz5xPTJJhzgZ1iEng21NimilraH/3W1KuYZsCYL5imG1fnxrr59S4PmC75rT4GgnN8M+O0l3GiR7+U4hWqm9W6A/GG+G84x84/nNuzZwSJz9pFSQQ== 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=ZOza89cZePyweTsdww6LcxwqWefFT0mmZdSP4OdNc9w=; b=atkfQwasqvKd9VK8rg6rTOX7/29WBqJXC63Yl5dL/ZLmTfLoqpH/AnnhgJqEKAyncMpCddz6a7tQDL2Ixxhs4w70eIa6PiQ/jOTJeawrdx8Bxb9PnGW1byz8eQEl9SmS/l67lh7K/3EjTbiwtpuOACN0R4vbDHxChnyjGdaVh4I= Received: from CO1PR11MB4930.namprd11.prod.outlook.com (2603:10b6:303:9b::11) by MW3PR11MB4585.namprd11.prod.outlook.com (2603:10b6:303:52::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Wed, 9 Jun 2021 09:50:01 +0000 Received: from CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::a439:f8ae:4699:718f]) by CO1PR11MB4930.namprd11.prod.outlook.com ([fe80::a439:f8ae:4699:718f%6]) with mapi id 15.20.4195.030; Wed, 9 Jun 2021 09:50:01 +0000 From: "Ni, Ray" To: "Liu, Zhiguang" , "devel@edk2.groups.io" CC: "Wang, Jian J" , "Wu, Hao A" , "Gao, Zhichao" 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: AQHXXRMryzLm7huvFEiarABR01sHOqsLb1Ag Date: Wed, 9 Jun 2021 09:50:01 +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 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.142.2] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4fd2ba55-9842-4ff2-b042-08d92b2bf35a x-ms-traffictypediagnostic: MW3PR11MB4585: 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: 0XjayJ2pkADQFW5SOSiCE5UWwwZUevpIEyrafObcWZuuSk4d5gYt9VPv4V7tZF190c7geudfLhzMuNnZqZTpRlem/Q34IqNBFszA+K0Gi+uQ35p+8Axe3DYqsvUDxztISIK8gIgLxr6hp6DjuN/VGLxbt7mvtL+uc6RwZEINv2Q0fqbST4oOOkUn/9qUO9J/qbm8aQgnbUHRjzaZTmD8dQW8ywtt5t8iEb2auywfY4Mbj3l41RHUVZ95p/Wjt+uwC5NFWHviIBSSDZrjqk+kXuk6UvvhPISSnLqx1v9b0Rs1503IrEczI5db5cpgWnJhAYK1UKkFzOo13lK9s3ZawKpRM44iBQMZc/RQPBCN7rrNDe/iHpQEsJe9QvbjogYXQoY9Lz8y8a0QwTDzwIAkhAWCqDOKB3ojDXoJ08jvyIqjlx9MJE/D4bRFN7Ca5uQ5IaSWHg0AKm/RLGBLENiqWtcMo5ww+ldck4W5Vrs5KdRcuyoA93EDaYE471Zkr5dJW06hVDmkIY4PNTIQ9CNC5HzYwfulPX/ko+xFdzFEVI/g44JDGqydp6vCRkbAkNyHLU3Rwf2I0pAmeGl4nSbE2nbQ3QQE5pUT7gJaBRqLUhy6Aqlleldln4MfWXce8vToZ0TH2o7MaRuxxULfWSeC5guwMN3UCeVllMGuOi1wTM5pUQSgqYMFs76ujOA16uzlgGors5/Q5eEY0qmYswY+LT0LwoP2L/LvdnhEYGfKy4Y= 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:(376002)(346002)(136003)(396003)(366004)(39860400002)(316002)(966005)(107886003)(71200400001)(186003)(76116006)(478600001)(26005)(2906002)(53546011)(66946007)(38100700002)(9686003)(66446008)(86362001)(5660300002)(33656002)(8936002)(4326008)(54906003)(110136005)(7696005)(8676002)(6506007)(55016002)(52536014)(64756008)(66556008)(66476007)(122000001)(83380400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?D7LjIKYgYAgtaoDpb4G/uTO+02PgZfNjgAMJS5WebFJMJqRo/QeiODxZn9Yu?= =?us-ascii?Q?KNazUnSd3BHRQHUlZHU6HD09djm93ZDWnQCiqvG8rE6fhA4GnXPgeKcxYEsX?= =?us-ascii?Q?SQIvBeBh3dWu83i0L0QRSzY5t2L5D21SscbJoLmPL4udy6knK16k6EYBsJ8j?= =?us-ascii?Q?xOtHNdGGEdBWuSXO5V5QQdIB04UTIHBcDozOijuHli4WwWKxWxMUrpj6cVQF?= =?us-ascii?Q?xFUz2c9REarLYQkZiL9EDWiSSU14BOF0h4vKA9a/Uxlv8V9UY26w7i6l+ZVB?= =?us-ascii?Q?j/D+T3TSTWHhpFmFdwxnljjK9m7BFogf7s/UeivEta4EFzNDQVsgcGC3jOyd?= =?us-ascii?Q?wrc/OqtN8ucwmaJ4ATDsGuRyR+l8DN07mozaLBGB5t5tErvp8Q2V5fbXoBMa?= =?us-ascii?Q?7CDC/C+K+dkFJ3vmHPNOk7W6GZ3AAh4oUoQD5j8jq5Gde7IzS3uE7rwK7H8d?= =?us-ascii?Q?kjPJgdnG1bwUseW+rhBcj59K70xtAowYD+S9PjJ+SUKOw/8ay/I2vxZs89jr?= =?us-ascii?Q?gnUZF8w+V1PPMv58O6xAq7wSFtUB8aBTWZ72kd9+k0asC7Ew2Ds9MpGk/jhy?= =?us-ascii?Q?ZGRG5DBupxdfhghVAAYAMQOEOEx/gplDI6BQFBpD4m6CabNQGLM8AdFXa5dt?= =?us-ascii?Q?GUgmWxzmtdTTWgPw7XVQi1O9yTzvelVm4NwEEMJ0Q5NOHLlVGgDslTjDxZfP?= =?us-ascii?Q?avHoFjKlUmlSj16xBGa2imOC0GhFh5+wXRnti/YRY/+2IqI50DNA6PPSrZoG?= =?us-ascii?Q?P8VSWVDhQWMXokZ4jKKiBluSrZaYB2MX5g3i5u0YP0CJEtr0qQPDg0SrM+1/?= =?us-ascii?Q?CWRW7PM2jRZBgglC1M4Q1/SGcYuTo86C6Ht1Qv1AA5OwX9LzD5Pc2an5v2sJ?= =?us-ascii?Q?iSaRLTPvNYLFg/0A8BcmpErNEyJBHZLY9CQvo06jXgiU3yvjed7doMS/2lWi?= =?us-ascii?Q?npoOrzit2KHnUY8pRg7cQlAvN0l7LoOfcIUt7brjt1nwKW/7SmFDWVcAHh3n?= =?us-ascii?Q?2h6hWqKupBFX2bWi2a/kNKlAZjFO0m8RpBStVe8fHteIi62MaCfb1fJp9mWP?= =?us-ascii?Q?LLs9G5uSEB+vAOz0s5/ME1gf2Nio9msr+IwyY0OWU13dmMCndw7YZz3s8nfV?= =?us-ascii?Q?hHf2vmCfzglJ/YW3tYCDrNLQB3DXXndAeLRzpz5f/tRPrud71c0WKJONt6dR?= =?us-ascii?Q?v4C1Ew2MxFM6y6skxz30qMyTA2aUk+KQo581ma5eXiQdEN5Uxa36jE5TPdNj?= =?us-ascii?Q?hSasxUhNikTG4GbrayGyRXqAx6NaYkojJzEPmZnAFl4NHcS733952m2VB9Mo?= =?us-ascii?Q?nKapyDAftr4iTmQI2g3DLyNj?= 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: 4fd2ba55-9842-4ff2-b042-08d92b2bf35a X-MS-Exchange-CrossTenant-originalarrivaltime: 09 Jun 2021 09:50:01.4099 (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: noP5pxV4RLsi8KwtKh1DIHf6XzvlrKehD+H9NmCDAPeXEjp2tzOcWNFimFI+Iu2LC2dsBjQhY/8p21mERFvAcg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR11MB4585 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: 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 > } >=20 >=20 >=20 > Status =3D EfiBootManagerInitializeLoadOption ( >=20 > -- > 2.30.0.windows.2