[Patch V3] MdeModulePkg: Retrive boot manager menu from any fv

[Patch V3] MdeModulePkg: Retrive boot manager menu from any fv

[Zhiguang Liu]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3384

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.

Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao A Wu <hao.a.wu@intel.com>
Cc: Zhichao Gao <zhichao.gao@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
---
 MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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.
 
 Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
-Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2011 - 2021, Intel Corporation. All rights reserved.<BR>
 (C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP<BR>
 SPDX-License-Identifier: BSD-2-Clause-Patent
 
@@ -2385,7 +2385,8 @@ EfiBootManagerRefreshAllBootOption (
   This function is called to get or create the boot option for the Boot Manager Menu.
 
   The Boot Manager Menu is shown after successfully booting a boot option.
-  Assume the BootManagerMenuFile is in the same FV as the module links to this library.
+  This function will first try to search the BootManagerMenuFile is in the same FV as
+  the module links to this library. If fails, it will search in all FVs.
 
   @param  BootOption    Return the boot option of the Boot Manager Menu
 
@@ -2437,7 +2438,7 @@ BmRegisterBootManagerMenu (
 
   if (DevicePath == NULL) {
     Data = NULL;
-    Status = GetSectionFromFv (
+    Status = GetSectionFromAnyFv (
                PcdGetPtr (PcdBootManagerMenuFile),
                EFI_SECTION_PE32,
                0,
@@ -2455,7 +2456,7 @@ BmRegisterBootManagerMenu (
     //
     // Get BootManagerMenu application's description from EFI User Interface Section.
     //
-    Status = GetSectionFromFv (
+    Status = GetSectionFromAnyFv (
                PcdGetPtr (PcdBootManagerMenuFile),
                EFI_SECTION_USER_INTERFACE,
                0,
-- 
2.30.0.windows.2

Re: [Patch V3] MdeModulePkg: Retrive boot manager menu from any fv

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni@intel.com>


> -----Original Message-----
> From: Liu, Zhiguang <zhiguang.liu@intel.com>
> Sent: Tuesday, May 11, 2021 10:32 AM
> To: devel@edk2.groups.io
> Cc: Wang, Jian J <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>;
> Gao, Zhichao <zhichao.gao@intel.com>; Ni, Ray <ray.ni@intel.com>
> Subject: [Patch V3] MdeModulePkg: Retrive boot manager menu from any fv
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3384
> 
> 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.
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao A Wu <hao.a.wu@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Ray Ni <ray.ni@intel.com>
> Reviewed-by: Hao A Wu <hao.a.wu@intel.com>
> Signed-off-by: Zhiguang Liu <zhiguang.liu@intel.com>
> ---
>  MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> 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.
> 
> 
> 
>  Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
> 
> -Copyright (c) 2011 - 2020, Intel Corporation. All rights reserved.<BR>
> 
> +Copyright (c) 2011 - 2021, Intel Corporation. All rights reserved.<BR>
> 
>  (C) Copyright 2015-2021 Hewlett Packard Enterprise Development LP<BR>
> 
>  SPDX-License-Identifier: BSD-2-Clause-Patent
> 
> 
> 
> @@ -2385,7 +2385,8 @@ EfiBootManagerRefreshAllBootOption (
>    This function is called to get or create the boot option for the Boot Manager
> Menu.
> 
> 
> 
>    The Boot Manager Menu is shown after successfully booting a boot option.
> 
> -  Assume the BootManagerMenuFile is in the same FV as the module links to
> this library.
> 
> +  This function will first try to search the BootManagerMenuFile is in the
> same FV as
> 
> +  the module links to this library. If fails, it will search in all FVs.
> 
> 
> 
>    @param  BootOption    Return the boot option of the Boot Manager Menu
> 
> 
> 
> @@ -2437,7 +2438,7 @@ BmRegisterBootManagerMenu (
> 
> 
>    if (DevicePath == NULL) {
> 
>      Data = NULL;
> 
> -    Status = GetSectionFromFv (
> 
> +    Status = GetSectionFromAnyFv (
> 
>                 PcdGetPtr (PcdBootManagerMenuFile),
> 
>                 EFI_SECTION_PE32,
> 
>                 0,
> 
> @@ -2455,7 +2456,7 @@ BmRegisterBootManagerMenu (
>      //
> 
>      // Get BootManagerMenu application's description from EFI User
> Interface Section.
> 
>      //
> 
> -    Status = GetSectionFromFv (
> 
> +    Status = GetSectionFromAnyFv (
> 
>                 PcdGetPtr (PcdBootManagerMenuFile),
> 
>                 EFI_SECTION_USER_INTERFACE,
> 
>                 0,
> 
> --
> 2.30.0.windows.2