From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.43; helo=mga05.intel.com; envelope-from=ruiyu.ni@intel.com; receiver=edk2-devel@lists.01.org Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 1A2232035BB16 for ; Wed, 22 Nov 2017 19:39:33 -0800 (PST) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Nov 2017 19:43:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,438,1505804400"; d="scan'208";a="4872080" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by FMSMGA003.fm.intel.com with ESMTP; 22 Nov 2017 19:43:49 -0800 Received: from fmsmsx115.amr.corp.intel.com (10.18.116.19) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 22 Nov 2017 19:43:49 -0800 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx115.amr.corp.intel.com (10.18.116.19) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 22 Nov 2017 19:43:49 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.93]) with mapi id 14.03.0319.002; Thu, 23 Nov 2017 11:43:47 +0800 From: "Ni, Ruiyu" To: Laszlo Ersek , edk2-devel-01 CC: Ard Biesheuvel , "Justen, Jordan L" , "Dong, Eric" , "Zeng, Star" Thread-Topic: [PATCH 1/5] MdeModulePkg/BdsDxe: fall back to a Boot Manager Menu loop before hanging Thread-Index: AQHTY+3hXMnoMuSQKU6YP09xQRQjF6MhUjUQ Date: Thu, 23 Nov 2017 03:43:46 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BACE10C@SHSMSX104.ccr.corp.intel.com> References: <20171122235849.4177-1-lersek@redhat.com> <20171122235849.4177-2-lersek@redhat.com> In-Reply-To: <20171122235849.4177-2-lersek@redhat.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 1/5] MdeModulePkg/BdsDxe: fall back to a Boot Manager Menu loop before hanging X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Nov 2017 03:39:33 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Thanks for the patch. It follows the idea described in: https://lists.01.org/pipermail/edk2-devel/2017-April/010294.html. Reviewed-by: Ruiyu Ni Thanks/Ray > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Thursday, November 23, 2017 7:59 AM > To: edk2-devel-01 > Cc: Ard Biesheuvel ; Justen, Jordan L > ; Ni, Ruiyu ; Dong, Eric > ; Zeng, Star > Subject: [PATCH 1/5] MdeModulePkg/BdsDxe: fall back to a Boot Manager > Menu loop before hanging >=20 > Under the following scenario: >=20 > - no UEFI bootable application available anywhere in the system, > - ... not even for the default platform recovery option, > - no shell is built into the firmware image, > - but UiApp is available in the firmware image, >=20 > we should preferably not just hang in BdsEntry() with: >=20 > DEBUG ((EFI_D_ERROR, "[Bds] Unable to boot!\n")); > CpuDeadLoop (); >=20 > while the user sits at the TianoCore logo page, wondering what's going on= . > Print an informative message to the console, wait for a keypress, and the= n > return to the Boot Manager Menu forever. >=20 > Cc: Ard Biesheuvel > Cc: Jordan Justen > Cc: Ruiyu Ni > Cc: Eric Dong > Cc: Star Zeng > Ref: https://bugzilla.redhat.com/show_bug.cgi?id=3D1515418 > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3D513 > Suggested-by: Ruiyu Ni > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Laszlo Ersek > --- > MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 60 ++++++++++++++++++- > - > 1 file changed, 56 insertions(+), 4 deletions(-) >=20 > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > index dccc49090219..2b24755ac368 100644 > --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > @@ -676,24 +676,73 @@ BdsAllocateMemoryForPerformanceData ( > // > // Mark L"PerfDataMemAddr" variable to read-only if the Variable Loc= k > protocol exists > // Still lock it even the variable cannot be saved to prevent it's s= et by 3rd > party code. > // > Status =3D gBS->LocateProtocol (&gEdkiiVariableLockProtocolGuid, NUL= L, > (VOID **) &VariableLock); > if (!EFI_ERROR (Status)) { > Status =3D VariableLock->RequestToLock (VariableLock, > L"PerfDataMemAddr", &gPerformanceProtocolGuid); > ASSERT_EFI_ERROR (Status); > } > } > } >=20 > +/** > + 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 EfiBootManagerGetBootManage= rMenu() > + 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 !=3D 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); > + } > +} > + > /** >=20 > Service routine for BdsInstance->Entry(). Devices are connected, the > consoles are initialized, and the boot options are tried. >=20 > @param This Protocol Instance structure. >=20 > **/ > VOID > EFIAPI > BdsEntry ( > IN EFI_BDS_ARCH_PROTOCOL *This > @@ -1079,34 +1128,37 @@ BdsEntry ( > } >=20 > do { > // > // Retry to boot if any of the boot succeeds > // > LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, > LoadOptionTypeBoot); > BootSuccess =3D BootBootOptions (LoadOptions, LoadOptionCount, > (BootManagerMenuStatus !=3D EFI_NOT_FOUND) ? &BootManagerMenu : > NULL); > EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); > } while (BootSuccess); > } >=20 > - if (BootManagerMenuStatus !=3D EFI_NOT_FOUND) { > - EfiBootManagerFreeLoadOption (&BootManagerMenu); > - } > - > if (!BootSuccess) { > LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, > LoadOptionTypePlatformRecovery); > ProcessLoadOptions (LoadOptions, LoadOptionCount); > EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); > } >=20 > + // > + // If BootManagerMenu is available, fall back to it indefinitely. > + // > + if (BootManagerMenuStatus !=3D EFI_NOT_FOUND) { > + BdsBootManagerMenuLoop (&BootManagerMenu); } > + > DEBUG ((EFI_D_ERROR, "[Bds] Unable to boot!\n")); > CpuDeadLoop (); > } >=20 > /** > Set the variable and report the error through status code upon failure= . >=20 > @param VariableName A Null-terminated string that is the na= me of > the vendor's variable. > Each VariableName is unique for each Ve= ndorGuid. > VariableName must > contain 1 or more characters. If Variab= leName is an empty > string, > then EFI_INVALID_PARAMETER is returned. > @param VendorGuid A unique identifier for the vendor. > -- > 2.14.1.3.gb7cf6e02401b >=20