From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id D71DD20972157 for ; Thu, 5 Jul 2018 05:06:34 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 973B38577C; Thu, 5 Jul 2018 12:06:33 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-21.rdu2.redhat.com [10.10.120.21]) by smtp.corp.redhat.com (Postfix) with ESMTP id E22577C3F; Thu, 5 Jul 2018 12:06:32 +0000 (UTC) To: Ruiyu Ni , edk2-devel@lists.01.org References: <20180704015057.35908-1-ruiyu.ni@intel.com> <20180704015057.35908-8-ruiyu.ni@intel.com> From: Laszlo Ersek Message-ID: Date: Thu, 5 Jul 2018 14:06:32 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <20180704015057.35908-8-ruiyu.ni@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 05 Jul 2018 12:06:33 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.2]); Thu, 05 Jul 2018 12:06:33 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v4 7/9] ArmVirtPkg/PlatformBDS: Implement PlatformBootManagerUnableToBoot X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jul 2018 12:06:35 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit On 07/04/18 03:50, Ruiyu Ni wrote: > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Laszlo Ersek > Cc: Ard Biesheuvel > Cc: Julien Grall > --- > .../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.
> - Copyright (c) 2004 - 2016, Intel Corporation. All rights reserved.
> + Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
> > 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); > + } > +} > Reviewed-by: Laszlo Ersek Thank you, Ray! Laszlo