Thanks for checking and reviewing this, Ray and Jian. I attached my updated patch which addressed Zhichao's comment about the commit message and passed PatchCheck.py. Jian, since the change is just the commit message change (no code change), I didn't send an email to edk2-devel again. However, if resending an patch email to edk2-devel is needed, feel free to let me know. Regards, Sunny Wang -----Original Message----- From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Ni, Ray Sent: Wednesday, October 23, 2019 1:58 PM To: Wang, Jian J ; Wang, Sunny (HPS SW) ; Gao, Zhichao ; devel@edk2.groups.io; lersek@redhat.com; Wu, Hao A Cc: Li, Walon Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/BdsDxe: Make PlatformRecovery work regardless of OsIndications Importance: High With Zhichao's comments addressed, Reviewed-by: Ray Ni > -----Original Message----- > From: Wang, Jian J > Sent: Tuesday, October 22, 2019 9:27 PM > To: Wang, Sunny (HPS SW) ; Gao, Zhichao > ; devel@edk2.groups.io; lersek@redhat.com; Wu, > Hao A ; Ni, Ray > Cc: Li, Walon > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/BdsDxe: Make > PlatformRecovery work regardless of OsIndications > > I'm not familiar this part of code. Ray is expert. > > Acked-by: Jian J Wang > > > -----Original Message----- > > From: Wang, Sunny (HPS SW) > > Sent: Wednesday, October 16, 2019 5:43 PM > > To: Gao, Zhichao ; devel@edk2.groups.io; > > lersek@redhat.com; Wang, Jian J ; Wu, Hao A > > > > Cc: Ni, Ray ; Li, Walon ; Wang, > > Sunny (HPS SW) > > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/BdsDxe: Make > > PlatformRecovery work regardless of OsIndications > > > > Thanks for catching this, Laszlo. > > Thanks for the suggestion and information, Zhichao. Next time, I > > will definitely take care of this in the first place. > > > > Hi Jian and Hao, > > I forgot to add both of you in Cc. Sorry about that. I will send you > > guys a new patch with the updated commit message below. If you guys > > need me to resend an email to edk2-devel for the new patch, feel free to let me know. > > > > =============================================== > > MdeModulePkg/BdsDxe: Fix PlatformRecovery issue > > > > For now, PlatformRecovery doesn't work if OsIndications variable > > doesn't exist, which is wrong. > > According to the UEFI specification section 3.4.1 and 3.4.2, if > > processing of BootOrder does not result in success, the OsRecovery > > and PlatformRecovery options should still be processed regardless of > > the existence of the OsIndications variable. > > Therefore, update the code to check PcdPlatformRecoverySupport > > instead of the value of OsIndications variable (PlatformRecovery) to > > fix this issue. > > > > Cc: Jian J Wang > > Cc: Hao Wu > > Cc: Ray Ni > > Cc: Zhichao Gao > > Cc: Walon Li > > Signed-off-by: Sunny Wang > > ================================================= > > > > Regards, > > Sunny Wang > > > > -----Original Message----- > > From: Gao, Zhichao [mailto:zhichao.gao@intel.com] > > Sent: Wednesday, October 16, 2019 4:36 PM > > To: devel@edk2.groups.io; lersek@redhat.com; Wang, Sunny (HPS SW) > > > > Cc: Ni, Ray ; Li, Walon > > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/BdsDxe: Make > > PlatformRecovery work regardless of OsIndications > > Importance: High > > > > MdeModulePkg/BdsDxe: Do PlatformRecovery regardless of OsIndications > > > > According to the UEFI specification section 3.4.1 and 3.4.2, the > > OsRecovery and PlatformRecovery options should still be processed > > regardless of the value of OsIndications variable if processing of BootOrder does not result in success. > > Therefore, update the code to check PcdPlatformRecoverySupport > > instead of the value of OsIndications variable (PlatformRecovery). > > > > I suggest to use the above title because of the length limitation. > > And I also break the commit message into serval lines. > > Here is the development process for edk open source link: > > https://github.com/tianocore/tianocore.github.io/wiki/EDK-II-Develop > > ment- Process. That would help you to send a patch in a basic > > correct format. > > With the commit massage issue addressed, Reviewed-by: Zhichao Gao > > > > > > Thanks, > > Zhichao > > > > > -----Original Message----- > > > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf > > > Of Laszlo Ersek > > > Sent: Wednesday, October 16, 2019 4:02 PM > > > To: devel@edk2.groups.io; sunnywang@hpe.com > > > Cc: Ni, Ray ; Gao, Zhichao > > > ; Walon Li > > > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/BdsDxe: Make > > > PlatformRecovery work regardless of OsIndications > > > > > > On 10/16/19 09:40, Wang, Sunny (HPS SW) wrote: > > > > According to the UEFI specification section 3.4.1 and 3.4.2, the > > > > OsRecovery > > > and PlatformRecovery options should still be processed regardless > > > of the value of OsIndications variable if processing of BootOrder > > > does not result in success. Therefore, update the code to check > > > PcdPlatformRecoverySupport instead of the value of OsIndications > > > variable > > (PlatformRecovery). > > > > > > Please wrap the commit message to 74 characters. > > > > > > (Can be done on push, if the maintainer accepts the patch.) > > > > > > Thanks > > > Laszlo > > > > > > > > > > > Cc: Ray Ni > > > > Cc: Zhichao Gao > > > > Cc: Walon Li > > > > Signed-off-by: Sunny Wang > > > > --- > > > > MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 4 ++-- > > > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > > > > > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > > b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > > > index d6ec31118c..d387dbe7ac 100644 > > > > --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > > > +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > > > @@ -6,7 +6,7 @@ > > > > to enter BDS phase. > > > > > > > > Copyright (c) 2004 - 2019, Intel Corporation. All rights > > > > reserved.
> > > > -(C) Copyright 2016 Hewlett Packard Enterprise Development > > > > LP
> > > > +(C) Copyright 2016-2019 Hewlett Packard Enterprise Development > > > > +LP
> > > > (C) Copyright 2015 Hewlett-Packard Development Company, > > > > L.P.
> > > > SPDX-License-Identifier: BSD-2-Clause-Patent > > > > > > > > @@ -1069,7 +1069,7 @@ BdsEntry ( > > > > } > > > > > > > > if (!BootSuccess) { > > > > - if (PlatformRecovery) { > > > > + if (PcdGetBool (PcdPlatformRecoverySupport)) { > > > > LoadOptions = EfiBootManagerGetLoadOptions > > > > (&LoadOptionCount, > > > LoadOptionTypePlatformRecovery); > > > > ProcessLoadOptions (LoadOptions, LoadOptionCount); > > > > EfiBootManagerFreeLoadOptions (LoadOptions, > > > > LoadOptionCount); > > > > > > > > > > > > > > >