[edk2-devel] [PATCH] MdeModulePkg: Fix device path when the boot manager menu is from different FV
Wu, Hao A
hao.a.wu at intel.com
Tue Jun 15 03:21:47 UTC 2021
> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu at intel.com>
> Sent: Wednesday, June 9, 2021 5:37 PM
> To: devel at edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang at intel.com>; Wu, Hao A <hao.a.wu at intel.com>;
> Gao, Zhichao <zhichao.gao at intel.com>; Ni, Ray <ray.ni at intel.com>
> Subject: [PATCH] MdeModulePkg: Fix device path when the boot manager
> menu is from different FV
>
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3441
>
> 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
>
> Cc: Jian J Wang <jian.j.wang at intel.com>
> Cc: Hao A Wu <hao.a.wu at intel.com>
> Cc: Zhichao Gao <zhichao.gao at intel.com>
> Cc: Ray Ni <ray.ni at intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu at intel.com>
> ---
> MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 28 +++-------------
> ------------
> 1 file changed, 3 insertions(+), 25 deletions(-)
>
> 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;
>
> UINTN DescriptionLength;
>
> EFI_DEVICE_PATH_PROTOCOL *DevicePath;
>
> - EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
>
> - MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
>
> UINTN HandleCount;
>
> EFI_HANDLE *Handles;
>
> UINTN Index;
>
> - VOID *Data;
>
> - UINTN DataSize;
>
>
>
> DevicePath = NULL;
>
> Description = NULL;
>
> @@ -2437,22 +2433,17 @@ BmRegisterBootManagerMenu (
> }
>
>
>
> if (DevicePath == NULL) {
>
> - Data = NULL;
>
> - Status = GetSectionFromAnyFv (
>
> + Status = GetFileDevicePathFromAnyFv (
>
> PcdGetPtr (PcdBootManagerMenuFile),
>
> EFI_SECTION_PE32,
>
> 0,
>
> - (VOID **) &Data,
>
> - &DataSize
>
> + &DevicePath
>
> );
>
> - if (Data != NULL) {
>
> - FreePool (Data);
>
> - }
>
> if (EFI_ERROR (Status)) {
>
> DEBUG ((EFI_D_WARN, "[Bds]BootManagerMenu FFS section can not be
> found, skip its boot option registration\n"));
>
> return EFI_NOT_FOUND;
>
> }
>
> -
>
> + ASSERT (DevicePath != NULL);
>
> //
>
> // Get BootManagerMenu application's description from EFI User
> Interface Section.
>
> //
>
> @@ -2466,19 +2457,6 @@ BmRegisterBootManagerMenu (
> if (EFI_ERROR (Status)) {
>
> Description = NULL;
>
> }
>
> -
>
> - EfiInitializeFwVolDevicepathNode (&FileNode, PcdGetPtr
> (PcdBootManagerMenuFile));
>
> - Status = gBS->HandleProtocol (
>
> - gImageHandle,
>
> - &gEfiLoadedImageProtocolGuid,
>
> - (VOID **) &LoadedImage
>
> - );
>
> - ASSERT_EFI_ERROR (Status);
>
> - DevicePath = AppendDevicePathNode (
>
> - DevicePathFromHandle (LoadedImage->DeviceHandle),
>
> - (EFI_DEVICE_PATH_PROTOCOL *) &FileNode
>
> - );
>
> - ASSERT (DevicePath != NULL);
>
> }
Acked-by: Hao A Wu <hao.a.wu at intel.com>
Best Regards,
Hao Wu
>
>
>
> Status = EfiBootManagerInitializeLoadOption (
>
> --
> 2.30.0.windows.2
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#76497): https://edk2.groups.io/g/devel/message/76497
Mute This Topic: https://groups.io/mt/83416683/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-
More information about the edk2-devel-archive
mailing list