From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: Laszlo Ersek <lersek@redhat.com>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Julien Grall <julien.grall@linaro.org>
Subject: [PATCH v4 7/9] ArmVirtPkg/PlatformBDS: Implement PlatformBootManagerUnableToBoot
Date: Wed, 4 Jul 2018 09:50:55 +0800 [thread overview]
Message-ID: <20180704015057.35908-8-ruiyu.ni@intel.com> (raw)
In-Reply-To: <20180704015057.35908-1-ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Julien Grall <julien.grall@linaro.org>
---
.../Library/PlatformBootManagerLib/PlatformBm.c | 62 +++++++++++++++++++++-
1 file changed, 61 insertions(+), 1 deletion(-)
diff --git a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 62cce6a01e..bb07f5e22b 100644
--- a/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmVirtPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -3,7 +3,7 @@
Copyright (C) 2015-2016, Red Hat, Inc.
Copyright (c) 2014, ARM Ltd. All rights reserved.<BR>
- Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.<BR>
+ Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials are licensed and made available
under the terms and conditions of the BSD License which accompanies this
@@ -865,3 +865,63 @@ PlatformBootManagerWaitCallback (
0
);
}
+
+/**
+ The function is called when no boot option could be launched,
+ including platform recovery options and options pointing to applications
+ built into firmware volumes.
+
+ If this function returns, BDS attempts to enter an infinite loop.
+**/
+VOID
+EFIAPI
+PlatformBootManagerUnableToBoot (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ EFI_INPUT_KEY Key;
+ EFI_BOOT_MANAGER_LOAD_OPTION BootManagerMenu;
+ UINTN Index;
+
+ //
+ // BootManagerMenu doesn't contain the correct information when return status
+ // is EFI_NOT_FOUND.
+ //
+ Status = EfiBootManagerGetBootManagerMenu (&BootManagerMenu);
+ if (EFI_ERROR (Status)) {
+ return;
+ }
+ //
+ // 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
+ );
+ Status = gBS->WaitForEvent (1, &gST->ConIn->WaitForKey, &Index);
+ ASSERT_EFI_ERROR (Status);
+ ASSERT (Index == 0);
+
+ //
+ // Drain any queued keys.
+ //
+ while (!EFI_ERROR (gST->ConIn->ReadKeyStroke (gST->ConIn, &Key))) {
+ //
+ // just throw away Key
+ //
+ }
+ }
+
+ for (;;) {
+ EfiBootManagerBoot (&BootManagerMenu);
+ }
+}
--
2.16.1.windows.1
next prev parent reply other threads:[~2018-07-04 1:51 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-04 1:50 [PATCH v4 0/9] Add platform hook for ultimate boot failure Ruiyu Ni
2018-07-04 1:50 ` [PATCH v4 1/9] MdeModulePkg/PlatformBootManager: Add PlatformBootManagerUnableToBoot Ruiyu Ni
2018-07-04 3:39 ` Wang, Sunny (HPS SW)
2018-07-04 1:50 ` [PATCH v4 2/9] CorebootPayload/PlatformBDS: Impl PlatformBootManagerUnableToBoot Ruiyu Ni
2018-07-04 1:50 ` [PATCH v4 3/9] OvmfPkg/PlatformBds: Implement PlatformBootManagerUnableToBoot Ruiyu Ni
2018-07-04 1:50 ` [PATCH v4 4/9] Nt32Pkg/PlatformBDS: " Ruiyu Ni
2018-07-04 1:50 ` [PATCH v4 5/9] QuarkPlatform/PlatformBDS: " Ruiyu Ni
2018-07-04 1:50 ` [PATCH v4 6/9] ArmPkg/PlatformBDS: " Ruiyu Ni
2018-07-11 14:21 ` Ard Biesheuvel
2018-07-16 9:07 ` Ni, Ruiyu
2018-07-16 11:01 ` Ard Biesheuvel
2018-07-04 1:50 ` Ruiyu Ni [this message]
2018-07-05 12:06 ` [PATCH v4 7/9] ArmVirtPkg/PlatformBDS: " Laszlo Ersek
2018-07-04 1:50 ` [PATCH v4 8/9] MdeModulePkg/BdsDxe: Revert "fall back to UI loop before hanging" Ruiyu Ni
2018-07-04 3:39 ` Wang, Sunny (HPS SW)
2018-07-04 1:50 ` [PATCH v4 9/9] MdeModulePkg/BdsDxe: Call PlatformBootManagerUnableToBoot() Ruiyu Ni
2018-07-04 3:39 ` Wang, Sunny (HPS SW)
2018-07-04 1:55 ` [PATCH v4 0/9] Add platform hook for ultimate boot failure Ni, Ruiyu
2018-07-05 12:07 ` Laszlo Ersek
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=20180704015057.35908-8-ruiyu.ni@intel.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