From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.93, mailfrom: ray.ni@intel.com) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by groups.io with SMTP; Tue, 09 Apr 2019 02:32:09 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Apr 2019 02:32:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,328,1549958400"; d="scan'208";a="336231492" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga005.fm.intel.com with ESMTP; 09 Apr 2019 02:32:08 -0700 Received: from fmsmsx153.amr.corp.intel.com (10.18.125.6) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 9 Apr 2019 02:32:08 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX153.amr.corp.intel.com (10.18.125.6) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 9 Apr 2019 02:32:08 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.92]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.42]) with mapi id 14.03.0415.000; Tue, 9 Apr 2019 17:32:06 +0800 From: "Ni, Ray" To: "Gao, Zhichao" , "'devel@edk2.groups.io'" CC: Bret Barkelew , "Wang, Jian J" , "Zeng, Star" , "Gao, Liming" , Sean Brogan , "Michael Turner" Subject: Re: [PATCH 2/2] MdeModulePkg/BdsDxe: Use a pcd to set OS indications bit Thread-Topic: [PATCH 2/2] MdeModulePkg/BdsDxe: Use a pcd to set OS indications bit Thread-Index: AQHU6Rfyc/ibt9jRSkeXH7mvjl+IP6YznECAgAAAkcA= Date: Tue, 9 Apr 2019 09:32:06 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C0DBCD8@SHSMSX104.ccr.corp.intel.com> References: <20190402054945.9712-1-zhichao.gao@intel.com> <20190402054945.9712-3-zhichao.gao@intel.com> <734D49CCEBEEF84792F5B80ED585239D5C0DBCB4@SHSMSX104.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5C0DBCB4@SHSMSX104.ccr.corp.intel.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 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Resend to groups.io. > -----Original Message----- > From: Ni, Ray > Sent: Tuesday, April 9, 2019 5:31 PM > To: Gao, Zhichao ; edk2-devel@lists.01.org > Cc: Bret Barkelew ; Wang, Jian J > ; Zeng, Star ; Gao, Liming > ; Sean Brogan ; > Michael Turner > Subject: RE: [PATCH 2/2] MdeModulePkg/BdsDxe: Use a pcd to set OS > indications bit >=20 > Zhichao, > In the very bottom of BdsEntry(), below code is always executed no matter > the PCD is true or false. > I don't think that's the right behavior. >=20 > if (!BootSuccess) { > LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, > LoadOptionTypePlatformRecovery); > ProcessLoadOptions (LoadOptions, LoadOptionCount); > EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); > } >=20 > > -----Original Message----- > > From: Gao, Zhichao > > Sent: Tuesday, April 2, 2019 1:50 PM > > To: edk2-devel@lists.01.org > > Cc: Bret Barkelew ; Wang, Jian J > > ; Ni, Ray ; Zeng, Star > > ; Gao, Liming ; Sean Brogan > > ; Michael Turner > > > > Subject: [PATCH 2/2] MdeModulePkg/BdsDxe: Use a pcd to set OS > > indications bit > > > > From: Bret Barkelew > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1678 > > > > Use the pcd PcdPlatformRecoverySupport to control whether to set the > > PlatformRecovery#### variable and whether to set the > > EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY bit of variable > > "OsIndicationsSupported". > > > > Cc: Jian J Wang > > Cc: Ray Ni > > Cc: Star Zeng > > Cc: Liming Gao > > Cc: Sean Brogan > > Cc: Michael Turner > > Cc: Bret Barkelew > > Contributed-under: TianoCore Contribution Agreement 1.1 > > Signed-off-by: Zhichao Gao > > --- > > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 1 + > > MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 74 +++++++++++++-------- > -- > > - > > 2 files changed, 41 insertions(+), 34 deletions(-) > > > > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > > b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > > index 82eb8aafc6..9caabbce7f 100644 > > --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > > +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > > @@ -101,6 +101,7 @@ > > gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand > > ## CONSUMES > > gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable = ## > > SOMETIMES_CONSUMES > > gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed = ## > > CONSUMES > > + gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformRecoverySupport > > ## CONSUMES > > > > [Depex] > > TRUE > > diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > index 8946d79ab2..ade77adb7d 100644 > > --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c > > @@ -552,10 +552,14 @@ BdsFormalizeOSIndicationVariable ( > > // > > Status =3D EfiBootManagerGetBootManagerMenu (&BootManagerMenu); > > if (Status !=3D EFI_NOT_FOUND) { > > - OsIndicationSupport =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI | > > EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY; > > + OsIndicationSupport =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI; > > EfiBootManagerFreeLoadOption (&BootManagerMenu); > > } else { > > - OsIndicationSupport =3D > > EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY; > > + OsIndicationSupport =3D 0; > > + } > > + > > + if (PcdGetBool (PcdPlatformRecoverySupport)) { > > + OsIndicationSupport |=3D > > EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY; > > } > > > > Status =3D gRT->SetVariable ( > > @@ -769,41 +773,43 @@ BdsEntry ( > > // > > InitializeLanguage (TRUE); > > > > - // > > - // System firmware must include a PlatformRecovery#### variable > > specifying > > - // a short-form File Path Media Device Path containing the platform > > default > > - // file path for removable media > > - // > > - FilePath =3D FileDevicePath (NULL, EFI_REMOVABLE_MEDIA_FILE_NAME); > > - Status =3D EfiBootManagerInitializeLoadOption ( > > - &LoadOption, > > - LoadOptionNumberUnassigned, > > - LoadOptionTypePlatformRecovery, > > - LOAD_OPTION_ACTIVE, > > - L"Default PlatformRecovery", > > - FilePath, > > - NULL, > > - 0 > > - ); > > - ASSERT_EFI_ERROR (Status); > > - LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, > > LoadOptionTypePlatformRecovery); > > - if (EfiBootManagerFindLoadOption (&LoadOption, LoadOptions, > > LoadOptionCount) =3D=3D -1) { > > - for (Index =3D 0; Index < LoadOptionCount; Index++) { > > - // > > - // The PlatformRecovery#### options are sorted by OptionNumber. > > - // Find the the smallest unused number as the new OptionNumber. > > - // > > - if (LoadOptions[Index].OptionNumber !=3D Index) { > > - break; > > + if (PcdGetBool (PcdPlatformRecoverySupport)) { > > + // > > + // System firmware must include a PlatformRecovery#### variable > > specifying > > + // a short-form File Path Media Device Path containing the > > + platform > > default > > + // file path for removable media > > + // > > + FilePath =3D FileDevicePath (NULL, EFI_REMOVABLE_MEDIA_FILE_NAME); > > + Status =3D EfiBootManagerInitializeLoadOption ( > > + &LoadOption, > > + LoadOptionNumberUnassigned, > > + LoadOptionTypePlatformRecovery, > > + LOAD_OPTION_ACTIVE, > > + L"Default PlatformRecovery", > > + FilePath, > > + NULL, > > + 0 > > + ); > > + ASSERT_EFI_ERROR (Status); > > + LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, > > LoadOptionTypePlatformRecovery); > > + if (EfiBootManagerFindLoadOption (&LoadOption, LoadOptions, > > LoadOptionCount) =3D=3D -1) { > > + for (Index =3D 0; Index < LoadOptionCount; Index++) { > > + // > > + // The PlatformRecovery#### options are sorted by OptionNumber= . > > + // Find the the smallest unused number as the new OptionNumber= . > > + // > > + if (LoadOptions[Index].OptionNumber !=3D Index) { > > + break; > > + } > > } > > + LoadOption.OptionNumber =3D Index; > > + Status =3D EfiBootManagerLoadOptionToVariable (&LoadOption); > > + ASSERT_EFI_ERROR (Status); > > } > > - LoadOption.OptionNumber =3D Index; > > - Status =3D EfiBootManagerLoadOptionToVariable (&LoadOption); > > - ASSERT_EFI_ERROR (Status); > > + EfiBootManagerFreeLoadOption (&LoadOption); > > + FreePool (FilePath); > > + EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); > > } > > - EfiBootManagerFreeLoadOption (&LoadOption); > > - FreePool (FilePath); > > - EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); > > > > // > > // Report Status Code to indicate connecting drivers will happen > > -- > > 2.21.0.windows.1