From nobody Sat May 4 21:05:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42625+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42625+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1561002283; cv=none; d=zoho.com; s=zohoarc; b=cgUXeuOo3La+24Kv56NULU73Dj6sj2fF592dUCdL0WXEiw9Y3pKGO10wVooGF+4jfLODFQN+59l/AxK+nVBI7wFE2d52RF+8EPlQAO39RCVWLd6n6UKU50yU78nZ8DLvLAGS05A/iCG+t8CwgUqnHXbej6FnNDFpk0yhMCk55xQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561002283; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=2fkXub0rS8wFfkQZDi5ENTeEZObz1SHG52fXZvGcvRA=; b=BMRxmYnBblu4Ochmq5JDvx70Zc2rDBl8rTkModTve1EjnLK+0x3whVMI0rBm8XpO5tJN0f1cmAMpHfMHOJJjdUckfTkvar6ZDPxI6nMq37b+9UGbZxc0pMflOZq3ZUx5qRWr7ksq9q9cvC0SDUzWQ6QiM3BY+hubNiozRezYW4M= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42625+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561002283047380.87329257690453; Wed, 19 Jun 2019 20:44:43 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Wed, 19 Jun 2019 20:44:42 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jun 2019 20:44:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,395,1557212400"; d="scan'208";a="181774804" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by fmsmga001.fm.intel.com with ESMTP; 19 Jun 2019 20:44:39 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Bret Barkelew , Jian J Wang , Hao Wu , Ray Ni , Star Zeng , Liming Gao , Sean Brogan , Michael Turner Subject: [edk2-devel] [PATCH v5 1/2] MdeModulePkg: Add a pcd to set the OS indications bit Date: Thu, 20 Jun 2019 11:44:00 +0800 Message-Id: <20190620034401.7932-2-zhichao.gao@intel.com> In-Reply-To: <20190620034401.7932-1-zhichao.gao@intel.com> References: <20190620034401.7932-1-zhichao.gao@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhichao.gao@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1561002282; bh=sDPeq2MeJSrC/hN3gfvsxg9LMTH3mkAJA1UjKQfhSOg=; h=Cc:Date:From:Reply-To:Subject:To; b=EcmU54wfBM8XMdGUa6ACiE7AcyJ4QXVnvoTR5yEhBfJyKZDfsHm5GaC7Vd+C6rVMsb0 KjD2ZEoWXsmWR9motZUmpPaLbYs0I9qvQ+3C5a+U4C9/mXwH8k1muiHWjBl0Jkx0+1mAi SBWrQ6ee94TqGLvr1+kcVMA1/EF+JwDn/u4= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: Bret Barkelew REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1678 Add a pcd PcdPlatformRecoverySupport to conditionally set an OS indications bit and set the 'PlatformRecovery####' variable. This pcd would also control whether the BDS support platform recovery or not. Update the uni file to add the prompt and help string base on the description in dec file. Cc: Jian J Wang Cc: Hao Wu Cc: Ray Ni Cc: Star Zeng Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew Signed-off-by: Zhichao Gao Reviewed-by: Hao A Wu --- MdeModulePkg/MdeModulePkg.dec | 6 ++++++ MdeModulePkg/MdeModulePkg.uni | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/MdeModulePkg/MdeModulePkg.dec b/MdeModulePkg/MdeModulePkg.dec index 2dee139ba3..ab51392262 100644 --- a/MdeModulePkg/MdeModulePkg.dec +++ b/MdeModulePkg/MdeModulePkg.dec @@ -1640,6 +1640,12 @@ # @Prompt Reset on memory type information change. gEfiMdeModulePkgTokenSpaceGuid.PcdResetOnMemoryTypeInformationChange|TRU= E|BOOLEAN|0x00010056 =20 + ## Indicates if the BDS supports Platform Recovery.

+ # TRUE - BDS supports Platform Recovery.
+ # FALSE - BDS does not support Platform Recovery.
+ # @Prompt Support Platform Recovery. + gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformRecoverySupport|TRUE|BOOLEAN|0= x00010078 + ## Specify the foreground color for Subtile text in HII Form Browser. Th= e default value is EFI_BLUE. # Only following values defined in UEFI specification are valid:

# 0x00 (EFI_BLACK)
diff --git a/MdeModulePkg/MdeModulePkg.uni b/MdeModulePkg/MdeModulePkg.uni index ed8ac9eadc..eda1fc043e 100644 --- a/MdeModulePkg/MdeModulePkg.uni +++ b/MdeModulePkg/MdeModulePkg.uni @@ -445,6 +445,12 @@ = "TRUE - Resets system when memory type inform= ation changes.
\n" = "FALSE - Does not reset system when memory typ= e information changes.
" =20 +#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPlatformRecoverySupport_PROM= PT #language en-US "Support Platform Recovery" + +#string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdPlatformRecoverySupport_HELP= #language en-US "Indicates if the BDS supports Platform Recovery.

= \n" + = "TRUE - BDS supports Platform Recovery.
\n" + = "FALSE - BDS does not support Platform Recovery.
" + #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdBrowserSubtitleTextColor_PRO= MPT #language en-US "Foreground color for browser subtitle" =20 #string STR_gEfiMdeModulePkgTokenSpaceGuid_PcdBrowserSubtitleTextColor_HEL= P #language en-US "Specify the foreground color for Subtitle text in HII F= orm Browser. The default value is EFI_BLUE. Only following values defined i= n UEFI specification are valid:

\n" --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42625): https://edk2.groups.io/g/devel/message/42625 Mute This Topic: https://groups.io/mt/32140506/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Sat May 4 21:05:25 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+42626+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42626+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1561002287; cv=none; d=zoho.com; s=zohoarc; b=PRiENGD4sIc+/I+mEuN2Nwl4mSxTnb65xz/ewG4tXe4YbPeVA7kP06NMhRbNKkcQxwgJejhq7r+0Wke0kleKEdXCGSLyfmFNNH6qX1FwYBmJz2CMMDzPqD1UKmCIaagmirCQaGJiq1KlBSg/nzate/JTDdBjkFdZKobrQ2ECfp8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561002287; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To:ARC-Authentication-Results; bh=spQv6sArvJlYkMAsb//aUOVXz0uS23UdYSlUC79bRSk=; b=cVp9WsaupYJA2DlE+phqI99iaE6W4NPr1EgiuMPeyApKJiIsL10nu7FrAolc6HDIZedvASHUVsLHlC0lji1ZmXtsbH6islY53eU94W4XoJ7DNEF3JAtXwSP2Lz5YoA/6SarUXy+I0QfiRb5wgDYYmIaLqi7ZvT7SO6HiERwnLIY= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=pass; spf=pass (zoho.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+42626+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1561002286947933.4918842863619; Wed, 19 Jun 2019 20:44:46 -0700 (PDT) Return-Path: X-Received: from mga05.intel.com (mga05.intel.com []) by groups.io with SMTP; Wed, 19 Jun 2019 20:44:46 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Jun 2019 20:44:45 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.63,395,1557212400"; d="scan'208";a="181774811" X-Received: from fieedk001.ccr.corp.intel.com ([10.239.33.119]) by fmsmga001.fm.intel.com with ESMTP; 19 Jun 2019 20:44:42 -0700 From: "Gao, Zhichao" To: devel@edk2.groups.io Cc: Jian J Wang , Hao Wu , Ray Ni , Star Zeng , Liming Gao , Sean Brogan , Michael Turner , Bret Barkelew Subject: [edk2-devel] [PATCH v5 2/2] MdeModulePkg/BdsDxe: Use a pcd to control PlatformRecovery Date: Thu, 20 Jun 2019 11:44:01 +0800 Message-Id: <20190620034401.7932-3-zhichao.gao@intel.com> In-Reply-To: <20190620034401.7932-1-zhichao.gao@intel.com> References: <20190620034401.7932-1-zhichao.gao@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,zhichao.gao@intel.com Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1561002286; bh=Mx7d8u6AL3UydG5bu+4M7EP6mHVCm0jxppnot5lR8c0=; h=Cc:Date:From:Reply-To:Subject:To; b=B2kwpgn2FtyHYXOk9m1v/E8qrNliEvMNUhLAAh6hDfrOwRS6A27/qKxrRVxiX9qs/Wq /1Qu1CfHG+LF0c6EUaY36FsbbuSHT6kCBoEgyPk4+yYOu/7uSo/BJVgq9DG/XEQalDjRo UAaJRaRniC93j3jgj50hOg6IomvmHqjPZew= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1678 Use the PcdPlatformRecoverySupport to control the function of platform recovery in BDS. First, set the variable's ("OsIndicationsSupported") EFI_OS_INDICATIONS_START_PLATFORM_RECOVERY bit base on the pcd. It would affect the variable "OsIndications". While the platform does not support the platform recovery, it is inappropriate to set a PlatformRecovery#### variable. So skip setting the variable. But it should remain the behavior of booting from a default file path (such as \EFI\BOOT\BOOTX64.EFI) to be compatible with the previous version UEFI spec. Add memory check before build platform default boot option. If fail to allocate memory for the defualt boot file path, put the system into dead loop to indicate it is unable to boot. Cc: Jian J Wang Cc: Hao Wu Cc: Ray Ni Cc: Star Zeng Cc: Liming Gao Cc: Sean Brogan Cc: Michael Turner Cc: Bret Barkelew Signed-off-by: Zhichao Gao Reviewed-by: Hao A Wu --- MdeModulePkg/Universal/BdsDxe/BdsDxe.inf | 3 +- MdeModulePkg/Universal/BdsDxe/BdsEntry.c | 71 +++++++++++++++--------- 2 files changed, 47 insertions(+), 27 deletions(-) diff --git a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf b/MdeModulePkg/Univer= sal/BdsDxe/BdsDxe.inf index 6913389d34..7f94ca17df 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf +++ b/MdeModulePkg/Universal/BdsDxe/BdsDxe.inf @@ -5,7 +5,7 @@ # gEfiBdsArchProtocolGuid. After DxeCore finish dispatching, DxeCore will= invoke Entry # interface of protocol gEfiBdsArchProtocolGuid, then BDS phase is entere= d. # -# Copyright (c) 2008 - 2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2008 - 2019, Intel Corporation. All rights reserved.
# SPDX-License-Identifier: BSD-2-Clause-Patent # ## @@ -95,6 +95,7 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdConInConnectOnDemand ## C= ONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdErrorCodeSetVariable ## S= OMETIMES_CONSUMES gEfiMdeModulePkgTokenSpaceGuid.PcdTestKeyUsed ## C= ONSUMES + gEfiMdeModulePkgTokenSpaceGuid.PcdPlatformRecoverySupport ## C= ONSUMES =20 [Depex] TRUE diff --git a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c b/MdeModulePkg/Univer= sal/BdsDxe/BdsEntry.c index 9d312bd982..4f3168b62a 100644 --- a/MdeModulePkg/Universal/BdsDxe/BdsEntry.c +++ b/MdeModulePkg/Universal/BdsDxe/BdsEntry.c @@ -5,7 +5,7 @@ After DxeCore finish DXE phase, gEfiBdsArchProtocolGuid->BdsEntry will b= e invoked to enter BDS phase. =20 -Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2019, Intel Corporation. All rights reserved.
(C) Copyright 2016 Hewlett Packard Enterprise Development LP
(C) Copyright 2015 Hewlett-Packard Development Company, L.P.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -546,10 +546,14 @@ BdsFormalizeOSIndicationVariable ( // Status =3D EfiBootManagerGetBootManagerMenu (&BootManagerMenu); if (Status !=3D EFI_NOT_FOUND) { - OsIndicationSupport =3D EFI_OS_INDICATIONS_BOOT_TO_FW_UI | EFI_OS_INDI= CATIONS_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; } =20 Status =3D gRT->SetVariable ( @@ -662,6 +666,7 @@ BdsEntry ( BOOLEAN BootSuccess; EFI_DEVICE_PATH_PROTOCOL *FilePath; EFI_STATUS BootManagerMenuStatus; + EFI_BOOT_MANAGER_LOAD_OPTION PlatformDefaultBootOption; =20 HotkeyTriggered =3D NULL; Status =3D EFI_SUCCESS; @@ -763,14 +768,13 @@ BdsEntry ( // InitializeLanguage (TRUE); =20 - // - // System firmware must include a PlatformRecovery#### variable specifyi= ng - // a short-form File Path Media Device Path containing the platform defa= ult - // file path for removable media - // FilePath =3D FileDevicePath (NULL, EFI_REMOVABLE_MEDIA_FILE_NAME); + if (FilePath =3D=3D NULL) { + DEBUG ((DEBUG_ERROR, "Fail to allocate memory for defualt boot file pa= th. Unable to boot.\n")); + CpuDeadLoop (); + } Status =3D EfiBootManagerInitializeLoadOption ( - &LoadOption, + &PlatformDefaultBootOption, LoadOptionNumberUnassigned, LoadOptionTypePlatformRecovery, LOAD_OPTION_ACTIVE, @@ -780,24 +784,31 @@ BdsEntry ( 0 ); ASSERT_EFI_ERROR (Status); - LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, LoadOpti= onTypePlatformRecovery); - if (EfiBootManagerFindLoadOption (&LoadOption, LoadOptions, LoadOptionCo= unt) =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; + + // + // System firmware must include a PlatformRecovery#### variable specifyi= ng + // a short-form File Path Media Device Path containing the platform defa= ult + // file path for removable media if the platform supports Platform Recov= ery. + // + if (PcdGetBool (PcdPlatformRecoverySupport)) { + LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, LoadOp= tionTypePlatformRecovery); + if (EfiBootManagerFindLoadOption (&PlatformDefaultBootOption, LoadOpti= ons, 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; + } } + PlatformDefaultBootOption.OptionNumber =3D Index; + Status =3D EfiBootManagerLoadOptionToVariable (&PlatformDefaultBootO= ption); + ASSERT_EFI_ERROR (Status); } - LoadOption.OptionNumber =3D Index; - Status =3D EfiBootManagerLoadOptionToVariable (&LoadOption); - ASSERT_EFI_ERROR (Status); + EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); } - EfiBootManagerFreeLoadOption (&LoadOption); FreePool (FilePath); - EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); =20 // // Report Status Code to indicate connecting drivers will happen @@ -1043,10 +1054,18 @@ BdsEntry ( } =20 if (!BootSuccess) { - LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, LoadOp= tionTypePlatformRecovery); - ProcessLoadOptions (LoadOptions, LoadOptionCount); - EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); + if (PlatformRecovery) { + LoadOptions =3D EfiBootManagerGetLoadOptions (&LoadOptionCount, Load= OptionTypePlatformRecovery); + ProcessLoadOptions (LoadOptions, LoadOptionCount); + EfiBootManagerFreeLoadOptions (LoadOptions, LoadOptionCount); + } else { + // + // When platform recovery is not enabled, still boot to platform def= ault file path. + // + EfiBootManagerProcessLoadOption (&PlatformDefaultBootOption); + } } + EfiBootManagerFreeLoadOption (&PlatformDefaultBootOption); =20 DEBUG ((EFI_D_ERROR, "[Bds] Unable to boot!\n")); PlatformBootManagerUnableToBoot (); --=20 2.21.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42626): https://edk2.groups.io/g/devel/message/42626 Mute This Topic: https://groups.io/mt/32140507/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-