From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28])
 by mx.groups.io with SMTP id smtpd.web10.2870.1571212924415000851
 for <devel@edk2.groups.io>;
 Wed, 16 Oct 2019 01:02:04 -0700
Authentication-Results: mx.groups.io;
 dkim=missing; spf=pass (domain: redhat.com, ip: 209.132.183.28, mailfrom: lersek@redhat.com)
Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])
	(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.redhat.com (Postfix) with ESMTPS id ED6D44ACA7;
	Wed, 16 Oct 2019 08:02:03 +0000 (UTC)
Received: from lacos-laptop-7.usersys.redhat.com (ovpn-116-232.ams2.redhat.com [10.36.116.232])
	by smtp.corp.redhat.com (Postfix) with ESMTP id B9FA2601A3;
	Wed, 16 Oct 2019 08:02:02 +0000 (UTC)
Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/BdsDxe: Make PlatformRecovery work regardless of OsIndications
To: devel@edk2.groups.io, sunnywang@hpe.com
Cc: Ray Ni <ray.ni@intel.com>, Zhichao Gao <zhichao.gao@intel.com>,
 Walon Li <walon.li@hpe.com>
References: <20191016074007.17572-1-sunnywang@hpe.com>
From: "Laszlo Ersek" <lersek@redhat.com>
Message-ID: <573f0624-50c5-1f12-ed4a-a4747339c839@redhat.com>
Date: Wed, 16 Oct 2019 10:02:01 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.9.1
MIME-Version: 1.0
In-Reply-To: <20191016074007.17572-1-sunnywang@hpe.com>
X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11
X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Wed, 16 Oct 2019 08:02:04 +0000 (UTC)
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit

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 <ray.ni@intel.com>
> Cc: Zhichao Gao <zhichao.gao@intel.com>
> Cc: Walon Li <walon.li@hpe.com>
> Signed-off-by: Sunny Wang <sunnywang@hpe.com>
> ---
>  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.<BR>
> -(C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>
> +(C) Copyright 2016-2019 Hewlett Packard Enterprise Development LP<BR>
>  (C) Copyright 2015 Hewlett-Packard Development Company, L.P.<BR>
>  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);
>