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 C8736211F8866 for ; Fri, 29 Jun 2018 05:49:57 -0700 (PDT) Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0726A401EF1D; Fri, 29 Jun 2018 12:49:57 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-43.rdu2.redhat.com [10.10.120.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 613B72026D68; Fri, 29 Jun 2018 12:49:56 +0000 (UTC) To: Ruiyu Ni , edk2-devel@lists.01.org References: <20180629060548.100012-1-ruiyu.ni@intel.com> From: Laszlo Ersek Message-ID: <05aad720-fda7-f267-6104-43acff467dfc@redhat.com> Date: Fri, 29 Jun 2018 14:49:55 +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: <20180629060548.100012-1-ruiyu.ni@intel.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 29 Jun 2018 12:49:57 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 29 Jun 2018 12:49:57 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH] OvmfPkg/BDS: Provide platform callback for ultimate boot failure 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: Fri, 29 Jun 2018 12:49:58 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Hi Ray, thanks a lot for this patch, I have some small logic requests: On 06/29/18 08:05, Ruiyu Ni wrote: > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Ruiyu Ni > Cc: Laszlo Ersek > --- > .../Library/PlatformBootManagerLib/BdsPlatform.c | 56 ++++++++++++++++++++-- > 1 file changed, 51 insertions(+), 5 deletions(-) > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index 57870cb856..3b59ba9397 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -1,7 +1,7 @@ > /** @file > Platform BDS customizations. > > - 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 > distribution. The full text of the license may be found at > @@ -337,6 +337,50 @@ SaveS3BootScript ( > // > // BDS Platform Functions > // > + > +VOID > +EFIAPI > +UnableToBoot ( > + VOID > + ) > +{ > + EFI_STATUS Status; > + UINTN Index; > + EFI_INPUT_KEY Key; > + EFI_BOOT_MANAGER_LOAD_OPTION BootManagerMenu; > + // > + // 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 > + // > + } > + } > + > + Status = EfiBootManagerGetBootManagerMenu (&BootManagerMenu); (1) In order to preserve the previous behavior, can you please move this function call to the top of UnableToBoot(), and return silently if the boot manager menu is not found? That will cause generic BDS to hang at once (silently), which is identical to the previous behavior. I'd like to preserve that. > + if (!EFI_ERROR (Status)) { > + while (TRUE) { > + EfiBootManagerBoot (&BootManagerMenu); > + } > + } > +} > + > /** > Do the platform init, can be customized by OEM/IBV > > @@ -410,6 +454,8 @@ PlatformBootManagerBeforeConsole ( > > PlatformRegisterOptionsAndKeys (); > > + EfiBootManagerRegisterUnableToBootHandler (UnableToBoot); > + > // > // Install both VIRTIO_DEVICE_PROTOCOL and (dependent) EFI_RNG_PROTOCOL > // instances on Virtio PCI RNG devices. > @@ -1531,14 +1577,14 @@ PlatformBootManagerAfterConsole ( > // > PlatformBdsConnectSequence (); > > - EfiBootManagerRefreshAllBootOption (); > + //EfiBootManagerRefreshAllBootOption (); > > // > // Register UEFI Shell > // > - PlatformRegisterFvBootOption ( > - PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > - ); > + //PlatformRegisterFvBootOption ( > + // PcdGetPtr (PcdShellFile), L"EFI Internal Shell", LOAD_OPTION_ACTIVE > + // ); > > RemoveStaleFvFileOptions (); > SetBootOrderFromQemu (); > (2) I think the changes you did to PlatformBootManagerAfterConsole() were for your local testing; can you please remove them from the patch? I hope we can commit the next version of this patch, and then I will port it to "ArmVirtPkg/Library/PlatformBootManagerLib" as well. Many thanks! Laszlo