Update, and push @4d05a4b709ce52d4649698f887a1358246fa4437 >-----Original Message----- >From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of >Laszlo Ersek >Sent: Monday, October 14, 2019 10:45 PM >To: Gao, Liming <liming....@intel.com>; Pete Batard <p...@akeo.ie> >Cc: devel@edk2.groups.io; af...@apple.com >Subject: Re: [edk2-devel] [PATCH 1/1] MdeModulePkg/BdsDxe: Fix calling >PlatformBootManagerWaitCallback on 0 > >Hi Liming, > >On 10/12/19 03:44, Gao, Liming wrote: >> Reviewed-by: Liming Gao <liming....@intel.com> > >can you please add > > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=2266 > >to the commit message, before pushing this? > >(I'm not giving R-b or A-b myself, because I shouldn't approve code >whose authorship is attributed to me. I obviously agree with the patch.) > >Thanks all, >Laszlo > >>> -----Original Message----- >>> From: Pete Batard [mailto:p...@akeo.ie] >>> Sent: Friday, October 11, 2019 11:44 PM >>> To: devel@edk2.groups.io >>> Cc: af...@apple.com; ler...@redhat.com; Gao, Liming ><liming....@intel.com> >>> Subject: [PATCH 1/1] MdeModulePkg/BdsDxe: Fix calling >>> PlatformBootManagerWaitCallback on 0 >>> >>> From: Laszlo Ersek <ler...@redhat.com> >>> >>> Commit 2de1f611be06ded3a59726a4052a9039be7d459b introduced a >>> regression >>> whereas platforms that did set PcdPlatformBootTimeOut to 0 are now >getting >>> an unexpected call to PlatformBootManagerWaitCallback(). >>> >>> This patch also ensures that, if PcdPlatformBootTimeOut is 0xFFFF we don't >>> call PlatformBootManagerWaitCallback() with a zero argument as doing so >>> would produce an unwarranted jump to full progress completion which is >>> likely to throw off users. >>> >>> Signed-off-by: Pete Batard <p...@akeo.ie> >>> --- >>> MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 12 +++++++++++- >>> 1 file changed, 11 insertions(+), 1 deletion(-) >>> >>> diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>> b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>> index 7968a58f3454..d6ec31118c1f 100644 >>> --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>> +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c >>> @@ -341,7 +341,17 @@ BdsWait ( >>> TimeoutRemain--; >>> } >>> } >>> - PlatformBootManagerWaitCallback (0); >>> + >>> + // >>> + // If the platform configured a nonzero and finite time-out, and we have >>> + // actually reached that, report 100% completion to the platform. >>> + // >>> + // Note that the (TimeoutRemain == 0) condition excludes >>> + // PcdPlatformBootTimeOut=0xFFFF, and that's deliberate. >>> + // >>> + if (PcdGet16 (PcdPlatformBootTimeOut) != 0 && TimeoutRemain == 0) { >>> + PlatformBootManagerWaitCallback (0); >>> + } >>> DEBUG ((EFI_D_INFO, "[Bds]Exit the waiting!\n")); >>> } >>> > >
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#48950): https://edk2.groups.io/g/devel/message/48950 Mute This Topic: https://groups.io/mt/34494978/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-