public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: Laszlo Ersek <lersek@redhat.com>
To: Ruiyu Ni <ruiyu.ni@intel.com>, edk2-devel@lists.01.org
Cc: Eric Dong <eric.dong@intel.com>
Subject: Re: [PATCH v3 6/7] MdeModulePkg/BdsDxe: Revert "fall back to UI loop before hanging"
Date: Tue, 3 Jul 2018 17:28:41 +0200	[thread overview]
Message-ID: <9972e907-55a4-f262-0e67-1de9e1b391f2@redhat.com> (raw)
In-Reply-To: <20180703063743.373172-7-ruiyu.ni@intel.com>

On 07/03/18 08:37, Ruiyu Ni wrote:
> Commit d1de487dd2e77f4741abcbd71d19a8c93971fda0
> "MdeModulePkg/BdsDxe: fall back to a Boot Manager Menu loop before
>  hanging"
> changed BDS core to fall back to UI loop when no bootable option
> can be launched.
> Now since PlatformBootManagerUnableToBoot() is added, the commit
> can be reverted.
> 
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
> Cc: Eric Dong <eric.dong@intel.com>
> Cc: Laszlo Ersek <lersek@redhat.com>
> ---
>  MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 60 +++-----------------------------
>  1 file changed, 4 insertions(+), 56 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> index 49e403e181..39b643c77a 100644
> --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c
> @@ -634,55 +634,6 @@ BdsFormalizeEfiGlobalVariable (
>    BdsFormalizeOSIndicationVariable ();
>  }
>  
> -/**
> -  Enter an infinite loop of calling the Boot Manager Menu.
> -
> -  This is a last resort alternative to BdsEntry() giving up for good. This
> -  function never returns.
> -
> -  @param[in] BootManagerMenu  The EFI_BOOT_MANAGER_LOAD_OPTION located and/or
> -                              created by the EfiBootManagerGetBootManagerMenu()
> -                              call in BdsEntry().
> -**/
> -VOID
> -BdsBootManagerMenuLoop (
> -  IN EFI_BOOT_MANAGER_LOAD_OPTION *BootManagerMenu
> -  )
> -{
> -  EFI_INPUT_KEY Key;
> -
> -  //
> -  // Normally BdsDxe does not print anything to the system console, but this is
> -  // a last resort -- the end-user will likely not see any DEBUG messages
> -  // logged in this situation.
> -  //
> -  // AsciiPrint() will NULL-check gST->ConOut internally. We check gST->ConIn
> -  // here to see if it makes sense to request and wait for a keypress.
> -  //
> -  if (gST->ConIn != NULL) {
> -    AsciiPrint (
> -      "%a: No bootable option or device was found.\n"
> -      "%a: Press any key to enter the Boot Manager Menu.\n",
> -      gEfiCallerBaseName,
> -      gEfiCallerBaseName
> -      );
> -    BdsWaitForSingleEvent (gST->ConIn->WaitForKey, 0);
> -
> -    //
> -    // Drain any queued keys.
> -    //
> -    while (!EFI_ERROR (gST->ConIn->ReadKeyStroke (gST->ConIn, &Key))) {
> -      //
> -      // just throw away Key
> -      //
> -    }
> -  }
> -
> -  for (;;) {
> -    EfiBootManagerBoot (BootManagerMenu);
> -  }
> -}
> -
>  /**
>  
>    Service routine for BdsInstance->Entry(). Devices are connected, the
> @@ -1081,19 +1032,16 @@ BdsEntry (
>      } while (BootSuccess);
>    }
>  
> +  if (BootManagerMenuStatus != EFI_NOT_FOUND) {
> +    EfiBootManagerFreeLoadOption (&BootManagerMenu);
> +  }
> +
>    if (!BootSuccess) {
>      LoadOptions = EfiBootManagerGetLoadOptions (&LoadOptionCount, LoadOptionTypePlatformRecovery);
>      ProcessLoadOptions (LoadOptions, LoadOptionCount);
>      EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount);
>    }
>  
> -  //
> -  // If BootManagerMenu is available, fall back to it indefinitely.
> -  //
> -  if (BootManagerMenuStatus != EFI_NOT_FOUND) {
> -    BdsBootManagerMenuLoop (&BootManagerMenu);
> -  }
> -
>    DEBUG ((EFI_D_ERROR, "[Bds] Unable to boot!\n"));
>    CpuDeadLoop ();
>  }
> 

Reviewed-by: Laszlo Ersek <lersek@redhat.com>


  reply	other threads:[~2018-07-03 15:28 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-07-03  6:37 [PATCH v3 0/7] Add platform hook for ultimate boot failure Ruiyu Ni
2018-07-03  6:37 ` [PATCH v3 1/7] MdeModulePkg/PlatformBootManager: Add PlatformBootManagerUnableToBoot Ruiyu Ni
2018-07-03 15:27   ` Laszlo Ersek
2018-07-03  6:37 ` [PATCH v3 2/7] CorebootPayload/PlatformBDS: Impl PlatformBootManagerUnableToBoot Ruiyu Ni
2018-07-03 22:58   ` You, Benjamin
2018-07-03  6:37 ` [PATCH v3 3/7] OvmfPkg/PlatformBds: Implement PlatformBootManagerUnableToBoot Ruiyu Ni
2018-07-03 15:37   ` Laszlo Ersek
2018-07-04  1:27     ` Ni, Ruiyu
2018-07-03  6:37 ` [PATCH v3 4/7] Nt32Pkg/PlatformBDS: " Ruiyu Ni
2018-07-04  1:09   ` Wu, Hao A
2018-07-03  6:37 ` [PATCH v3 5/7] QuarkPlatform/PlatformBDS: " Ruiyu Ni
2018-07-03  6:37 ` [PATCH v3 6/7] MdeModulePkg/BdsDxe: Revert "fall back to UI loop before hanging" Ruiyu Ni
2018-07-03 15:28   ` Laszlo Ersek [this message]
2018-07-03  6:37 ` [PATCH v3 7/7] MdeModulePkg/BdsDxe: Call PlatformBootManagerUnableToBoot() Ruiyu Ni
2018-07-03 15:29   ` Laszlo Ersek
2018-07-03 15:52 ` [PATCH v3 0/7] Add platform hook for ultimate boot failure Laszlo Ersek
2018-07-04  1:08   ` Ni, Ruiyu
2018-07-04  1:46     ` Ni, Ruiyu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-list from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9972e907-55a4-f262-0e67-1de9e1b391f2@redhat.com \
    --to=devel@edk2.groups.io \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox