[PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[Sean Rhodes]

Internal eMMC devices often show multiple entries, so skip
any after the initial entry.

Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Signed-off-by: Sean Rhodes <sean@starlabs.systems>
---
 MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
index 962892d38f..e21ac2c510 100644
--- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
+++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
@@ -2175,12 +2175,14 @@ BmEnumerateBootOptions (
   EFI_BLOCK_IO_PROTOCOL         *BlkIo;
   UINTN                         Removable;
   UINTN                         Index;
+  UINTN                         EmmcCount;
   CHAR16                        *Description;
 
   ASSERT (BootOptionCount != NULL);
 
   *BootOptionCount = 0;
   BootOptions      = NULL;
+  EmmcCount        = 0;
 
   //
   // Parse removable block io followed by fixed block io
@@ -2219,6 +2221,16 @@ BmEnumerateBootOptions (
       }
 
       Description = BmGetBootDescription (Handles[Index]);
+      //
+      // Skip secondary entries for internal eMMC devices
+      //
+      if (StrCmp(Description, L"eMMC Device") == 0) {
+        EmmcCount++;
+        if (EmmcCount > 1) {
+          continue;
+        }
+      }
+
       BootOptions = ReallocatePool (
                       sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) * (*BootOptionCount),
                       sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) * (*BootOptionCount + 1),
-- 
2.32.0

回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[gaoliming]

Is this the generic logic for all eMMC device? If yes, can you point the
statement in public spec for eMMC entries?

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sean Rhodes
> 发送时间: 2022年2月1日 5:01
> 收件人: devel@edk2.groups.io
> 抄送: Sean Rhodes <sean@starlabs.systems>; Matt DeVillier
> <matt.devillier@gmail.com>
> 主题: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary
> eMMC entries
> 
> Internal eMMC devices often show multiple entries, so skip
> any after the initial entry.
> 
> Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
> Signed-off-by: Sean Rhodes <sean@starlabs.systems>
> ---
>  MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> index 962892d38f..e21ac2c510 100644
> --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c
> @@ -2175,12 +2175,14 @@ BmEnumerateBootOptions (
>    EFI_BLOCK_IO_PROTOCOL         *BlkIo;
> 
>    UINTN                         Removable;
> 
>    UINTN                         Index;
> 
> +  UINTN                         EmmcCount;
> 
>    CHAR16                        *Description;
> 
> 
> 
>    ASSERT (BootOptionCount != NULL);
> 
> 
> 
>    *BootOptionCount = 0;
> 
>    BootOptions      = NULL;
> 
> +  EmmcCount        = 0;
> 
> 
> 
>    //
> 
>    // Parse removable block io followed by fixed block io
> 
> @@ -2219,6 +2221,16 @@ BmEnumerateBootOptions (
>        }
> 
> 
> 
>        Description = BmGetBootDescription (Handles[Index]);
> 
> +      //
> 
> +      // Skip secondary entries for internal eMMC devices
> 
> +      //
> 
> +      if (StrCmp(Description, L"eMMC Device") == 0) {
> 
> +        EmmcCount++;
> 
> +        if (EmmcCount > 1) {
> 
> +          continue;
> 
> +        }
> 
> +      }
> 
> +
> 
>        BootOptions = ReallocatePool (
> 
>                        sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) *
> (*BootOptionCount),
> 
>                        sizeof (EFI_BOOT_MANAGER_LOAD_OPTION) *
> (*BootOptionCount + 1),
> 
> --
> 2.32.0
> 
> 
> 
> -=-=-=-=-=-=
> Groups.io Links: You receive all messages sent to this group.
> View/Reply Online (#86264): https://edk2.groups.io/g/devel/message/86264
> Mute This Topic: https://groups.io/mt/88818205/4905953
> Group Owner: devel+owner@edk2.groups.io
> Unsubscribe: https://edk2.groups.io/g/devel/unsub
> [gaoliming@byosoft.com.cn]
> -=-=-=-=-=-=
> 

Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[Sean Rhodes]

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

Hi Liming

It's not based on spec, just behaviour seen with coreboot and UefiPayloadPkg. I can wrap it in a build option if that would be preferable?

Thanks
Sean

[-- Attachment #2: Type: text/html, Size: 189 bytes --]

Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[Sean Rhodes]

[-- Attachment #1.1: Type: text/plain, Size: 142 bytes --]

Hi Liming

This is how the entries appear for multiple MMC drives. Can you advise how you'd like me to adjust the patch?

Thanks

Sean

[-- Attachment #1.2: Type: text/html, Size: 231 bytes --]

[-- Attachment #2: MMCentries.jpg --]
[-- Type: image/jpeg, Size: 65469 bytes --]

回复: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[gaoliming]

[-- Attachment #1.1: Type: text/plain, Size: 660 bytes --]

Sean:

 You can implement the platform driver to install gEdkiiPlatformBootManagerProtocolGuid customize the boot option. This way doesn’t impact the generic UefiBootManagerLib.

 

Thanks

Liming

发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Sean Rhodes
发送时间: 2022年3月21日 17:41
收件人: Sean Rhodes <sean@starlabs.systems>; devel@edk2.groups.io
主题: Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

 

Hi Liming

This is how the entries appear for multiple MMC drives. Can you advise how you'd like me to adjust the patch?

Thanks

Sean





[-- Attachment #1.2: Type: text/html, Size: 4215 bytes --]

[-- Attachment #2: image001.jpg --]
[-- Type: image/jpeg, Size: 65561 bytes --]

Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[Ni, Ray]

[-- Attachment #1.1: Type: text/plain, Size: 1310 bytes --]

Sean,
Below function is called to make sure the description for each boot option doesn’t equal. Can you investigate why it doesn’t work for eMMC?
  BmMakeBootOptionDescriptionUnique (BootOptions, *BootOptionCount);

From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of gaoliming
Sent: Friday, April 1, 2022 10:09 AM
To: devel@edk2.groups.io; Rhodes, Sean <sean@starlabs.systems>
Subject: 回复: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

Sean:
 You can implement the platform driver to install gEdkiiPlatformBootManagerProtocolGuid customize the boot option. This way doesn’t impact the generic UefiBootManagerLib.

Thanks
Liming
发件人: devel@edk2.groups.io<mailto:devel@edk2.groups.io> <devel@edk2.groups.io<mailto:devel@edk2.groups.io>> 代表 Sean Rhodes
发送时间: 2022年3月21日 17:41
收件人: Sean Rhodes <sean@starlabs.systems<mailto:sean@starlabs.systems>>; devel@edk2.groups.io<mailto:devel@edk2.groups.io>
主题: Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

Hi Liming

This is how the entries appear for multiple MMC drives. Can you advise how you'd like me to adjust the patch?

Thanks

Sean
[cid:image001.jpg@01D845B1.D0991190]


[-- Attachment #1.2: Type: text/html, Size: 6155 bytes --]

[-- Attachment #2: image001.jpg --]
[-- Type: image/jpeg, Size: 65619 bytes --]

Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[Sheng Lean Tan]

[-- Attachment #1.1: Type: text/plain, Size: 780 bytes --]

Hi Liming,
Mind to help on this? This patch has been hanging on for a long time :(
Thank you.

Best Regards,
*Lean Sheng Tan*



9elements GmbH, Kortumstraße 19-21, 44787 Bochum, Germany
Email: sheng.tan@9elements.com
Phone: *+49 234 68 94 188 <+492346894188>*
Mobile: *+49 176 76 113842 <+4917676113842>*

Registered office: Bochum
Commercial register: Amtsgericht Bochum, HRB 17519
Management: Sebastian German, Eray Bazaar

Data protection information according to Art. 13 GDPR
<https://9elements.com/privacy>


On Mon, 21 Mar 2022 at 10:41, Sean Rhodes <sean@starlabs.systems> wrote:

> Hi Liming
>
> This is how the entries appear for multiple MMC drives. Can you advise how
> you'd like me to adjust the patch?
>
> Thanks
>
> Sean
> 
>
>

[-- Attachment #1.2: Type: text/html, Size: 3090 bytes --]

[-- Attachment #2: MMCentries.jpg --]
[-- Type: image/jpeg, Size: 65561 bytes --]

Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

[Ni, Ray]

[-- Attachment #1.1: Type: text/plain, Size: 1419 bytes --]

Sean,
Below function is called to make sure the description for each boot option doesn’t equal. Can you investigate why it doesn’t work for eMMC?
  BmMakeBootOptionDescriptionUnique (BootOptions, *BootOptionCount);


From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Sheng Lean Tan
Sent: Tuesday, May 17, 2022 8:19 PM
To: devel@edk2.groups.io; Rhodes, Sean <sean@starlabs.systems>
Subject: Re: [edk2-devel] 回复: [edk2-devel] [PATCH 43/43] MdeModulePkg/BmBoot: skip secondary eMMC entries

Hi Liming,
Mind to help on this? This patch has been hanging on for a long time :(
Thank you.

Best Regards,
Lean Sheng Tan

[http://static.9elements.com/logo-signature.png]
9elements GmbH, Kortumstraße 19-21, 44787 Bochum, Germany
Email: sheng.tan@9elements.com<mailto:sheng.tan@9elements.com>
Phone: +49 234 68 94 188<tel:+492346894188>
Mobile: +49 176 76 113842<tel:+4917676113842>

Registered office: Bochum
Commercial register: Amtsgericht Bochum, HRB 17519
Management: Sebastian German, Eray Bazaar

Data protection information according to Art. 13 GDPR<https://9elements.com/privacy>


On Mon, 21 Mar 2022 at 10:41, Sean Rhodes <sean@starlabs.systems<mailto:sean@starlabs.systems>> wrote:
Hi Liming

This is how the entries appear for multiple MMC drives. Can you advise how you'd like me to adjust the patch?

Thanks

Sean
[cid:image001.jpg@01D86A39.4B0D42B0]


[-- Attachment #1.2: Type: text/html, Size: 8132 bytes --]

[-- Attachment #2: image001.jpg --]
[-- Type: image/jpeg, Size: 65619 bytes --]