On Thu, Feb 04, 2021 at 16:49:03 +0100, Ard Biesheuvel wrote:
> > > + gEfiMdeModulePkgTokenSpaceGuid.PcdEmuVariableNvModeEnable
> > > gEfiMdeModulePkgTokenSpaceGuid.PcdFirmwareVersionString
> > > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate
> > > gEfiMdePkgTokenSpaceGuid.PcdUartDefaultDataBits
> > > diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> > > b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> > > index 9905cad22908..5ceb23d822e5 100644
> > > --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> > > +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> > > @@ -848,11 +848,15 @@ PlatformBootManagerUnableToBoot (
> > > // If the number of configured boot options has changed, reboot
> > > // the system so the new boot options will be taken into account
> > > // while executing the ordinary BDS bootflow sequence.
> > > + // *Unless* persistent varstore is being emulated, since we would
> > > + // then end up in an endless reboot loop.
> > > //
> > > - if (NewBootOptionCount != OldBootOptionCount) {
> > > - DEBUG ((DEBUG_WARN, "%a: rebooting after refreshing all boot
> > > options\n",
> > > - __FUNCTION__));
> > > - gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
> > > + if (!PcdGetBool (PcdEmuVariableNvModeEnable)) {
> > > + if (NewBootOptionCount != OldBootOptionCount) {
> > > + DEBUG ((DEBUG_WARN, "%a: rebooting after refreshing all boot
> > > options\n",
> > > + __FUNCTION__));
> > > + gRT->ResetSystem (EfiResetCold, EFI_SUCCESS, 0, NULL);
> > > + }
> > > }
> > >
> > > Status = EfiBootManagerGetBootManagerMenu (&BootManagerMenu);
> > >
> >
> > At the level where I commented on v1 -- i.e., totally superficially --:
> >
> > Acked-by: Laszlo Ersek <ler...@redhat.com>
> >
> > Ard should please review this patch for the logic change.
> >
>
> Reviewed-by: Ard Biesheuvel <a...@kernel.org>
Thanks!
Pushed as 1b6c3a94eca7.
/
Leif
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#71258): https://edk2.groups.io/g/devel/message/71258
Mute This Topic: https://groups.io/mt/80379806/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
