From nobody Tue Feb 10 01:15:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+78073+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78073+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1626939881; cv=none; d=zohomail.com; s=zohoarc; b=OWiipsKWhVyODPFfsOht+SrfZMPxiqBzdyjBLaTTViO8aHlnzQ11OCQWYAXCn63fuAJp+W/2p+xsx9VGGyj4JxEYlYhfbLq84EWqh0JuRz+Cs8QiGG7vJBy+x9IZ2JPlBiOHb6WeZlrkQXf4BvcbLCDD5vS6JfkdcNoRdzctajs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1626939881; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=wG80t0vgtI6HUVLf+cMvmbkQ05KTRltc4L6O7uDabdI=; b=evbXIr16MRmOsy8WIjJKjXy23zjOD3wikLU8Oepqvmo/+a12ojjPV+wH1s1IzoX1EHgv8qKIOGXhRQ+oqQrykewAVWe9aAROP7olRGBxSU0cpeF3AUgQ48Rb82EpfnxvsYOSGIhcDvPmuKVQCt8lXa6EZlkOmol2U0Fr2ceSg58= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+78073+1787277+3901457@groups.io Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1626939881553339.10514731697765; Thu, 22 Jul 2021 00:44:41 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tctXYY1788612xsxVSP8fJKs; Thu, 22 Jul 2021 00:44:41 -0700 X-Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by mx.groups.io with SMTP id smtpd.web09.4873.1626939880394220426 for ; Thu, 22 Jul 2021 00:44:40 -0700 X-Received: by mail-lj1-f178.google.com with SMTP id t20so6238073ljd.2 for ; Thu, 22 Jul 2021 00:44:40 -0700 (PDT) X-Gm-Message-State: DMYXJDA4NnHrMEhvPhc4vYHsx1787277AA= X-Google-Smtp-Source: ABdhPJxX54zcOZTtpy5XdN+0azSrSKMFjCFZRQtCSEvflDrn8Lq4Z1/jKZD7fIzCI0RyDZP5dbIiWA== X-Received: by 2002:a2e:b522:: with SMTP id z2mr34147889ljm.278.1626939878180; Thu, 22 Jul 2021 00:44:38 -0700 (PDT) X-Received: from gilgamesh.lab.semihalf.net ([83.142.187.85]) by smtp.gmail.com with ESMTPSA id t72sm1917946lff.172.2021.07.22.00.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Jul 2021 00:44:37 -0700 (PDT) From: "Grzegorz Bernacki" To: devel@edk2.groups.io Cc: leif@nuviainc.com, ardb+tianocore@kernel.org, Samer.El-Haj-Mahmoud@arm.com, sunny.Wang@arm.com, mw@semihalf.com, upstream@semihalf.com, pete@akeo.ie, jian.j.wang@intel.com, hao.a.wu@intel.com, dandan.bi@intel.com, eric.dong@intel.com, Grzegorz Bernacki , Sunny Wang Subject: [edk2-devel] [edk2-platforms PATCH v4 2/2] Revert "Platform/RaspberryPi: Setup option for disabling Fast Boot" Date: Thu, 22 Jul 2021 09:44:25 +0200 Message-Id: <20210722074425.2274716-4-gjb@semihalf.com> In-Reply-To: <20210722074425.2274716-1-gjb@semihalf.com> References: <20210722074425.2274716-1-gjb@semihalf.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: 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,gjb@semihalf.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=1626939881; bh=yTcsewQgVQA6LWKVZ//61qQnbOgtP8TtwR1Zfeg+yUQ=; h=Cc:Date:From:Reply-To:Subject:To; b=loWIIomoHIWHY9FFM9Ve8sIvMit7QZ7jsp4l5GtmA8+MjWvt7pIBvG0AYimqZCom4ir NgWI0D/ROpF6XiULpuudGfgiHLhCuDLTOYYNLxz+c4DJ49dQpqpmnn928SYAnjuFarlW4 ZhQ3fexVHwSbgELMMCqB4L1Uu3yF6yKemb0= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1626939882697100014 Content-Type: text/plain; charset="utf-8" This reverts commit efdc159ef7c9f15581a0f63d755a1530ff475156. This commit is not longer required as Boot Discovery Policy has been implemented for RPi. Signed-off-by: Grzegorz Bernacki Reviewed-by: Sunny Wang --- Platform/RaspberryPi/RaspberryPi.dec = | 2 -- Platform/RaspberryPi/RPi3/RPi3.dsc = | 9 +-------- Platform/RaspberryPi/RPi4/RPi4.dsc = | 9 +-------- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf = | 3 +-- Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManagerLib= .inf | 1 - Platform/RaspberryPi/Include/ConfigVars.h = | 12 +----------- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr = | 16 +--------------- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c = | 11 +---------- Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c = | 15 ++------------- Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni = | 10 +--------- 10 files changed, 9 insertions(+), 79 deletions(-) diff --git a/Platform/RaspberryPi/RaspberryPi.dec b/Platform/RaspberryPi/Ra= spberryPi.dec index f1dd8ac0ed..2ca25ff9e6 100644 --- a/Platform/RaspberryPi/RaspberryPi.dec +++ b/Platform/RaspberryPi/RaspberryPi.dec @@ -2,7 +2,6 @@ # # Copyright (c) 2016, Linaro, Ltd. All rights reserved. # Copyright (c) 2017-2018, Andrei Warkentin -# Copyright (c) 2021, ARM Limited. All rights reserved. # # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -71,5 +70,4 @@ gRaspberryPiTokenSpaceGuid.PcdFanTemp|0|UINT32|0x0000001D gRaspberryPiTokenSpaceGuid.PcdPlatformResetDelay|0|UINT32|0x0000001E gRaspberryPiTokenSpaceGuid.PcdMmcEnableDma|0|UINT32|0x0000001F - gRaspberryPiTokenSpaceGuid.PcdBootPolicy|0|UINT32|0x00000020 gRaspberryPiTokenSpaceGuid.PcdUartInUse|1|UINT32|0x00000021 diff --git a/Platform/RaspberryPi/RPi3/RPi3.dsc b/Platform/RaspberryPi/RPi3= /RPi3.dsc index 53825bcf62..b6e3372c61 100644 --- a/Platform/RaspberryPi/RPi3/RPi3.dsc +++ b/Platform/RaspberryPi/RPi3/RPi3.dsc @@ -1,6 +1,6 @@ # @file # -# Copyright (c) 2011 - 2021, ARM Limited. All rights reserved. +# Copyright (c) 2011 - 2020, ARM Limited. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. # Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved. # Copyright (c) 2017 - 2018, Andrei Warkentin @@ -512,13 +512,6 @@ gRaspberryPiTokenSpaceGuid.PcdFanOnGpio|L"FanOnGpio"|gConfigDxeFormSetGu= id|0x0|0 gRaspberryPiTokenSpaceGuid.PcdFanTemp|L"FanTemp"|gConfigDxeFormSetGuid|0= x0|0 =20 - # - # Boot Policy - # 0 - Fast Boot - # 1 - Full Discovery (Connect All) - # - gRaspberryPiTokenSpaceGuid.PcdBootPolicy|L"BootPolicy"|gConfigDxeFormSet= Guid|0x0|1 - # # Reset-related. # diff --git a/Platform/RaspberryPi/RPi4/RPi4.dsc b/Platform/RaspberryPi/RPi4= /RPi4.dsc index 8b9beac64a..07f36e7f1b 100644 --- a/Platform/RaspberryPi/RPi4/RPi4.dsc +++ b/Platform/RaspberryPi/RPi4/RPi4.dsc @@ -1,6 +1,6 @@ # @file # -# Copyright (c) 2011 - 2021, ARM Limited. All rights reserved. +# Copyright (c) 2011 - 2020, ARM Limited. All rights reserved. # Copyright (c) 2017 - 2018, Andrei Warkentin # Copyright (c) 2015 - 2021, Intel Corporation. All rights reserved. # Copyright (c) 2014, Linaro Limited. All rights reserved. @@ -528,13 +528,6 @@ gRaspberryPiTokenSpaceGuid.PcdFanOnGpio|L"FanOnGpio"|gConfigDxeFormSetGu= id|0x0|0 gRaspberryPiTokenSpaceGuid.PcdFanTemp|L"FanTemp"|gConfigDxeFormSetGuid|0= x0|60 =20 - # - # Boot Policy - # 0 - Fast Boot - # 1 - Full Discovery (Connect All) - # - gRaspberryPiTokenSpaceGuid.PcdBootPolicy|L"BootPolicy"|gConfigDxeFormSet= Guid|0x0|1 - # # Reset-related. # diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf b/Platfor= m/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf index 597e1b4205..4bb2d08550 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.inf @@ -2,7 +2,7 @@ # # Component description file for the RasbperryPi DXE platform config driv= er. # -# Copyright (c) 2019 - 2021, ARM Limited. All rights reserved. +# Copyright (c) 2019 - 2020, ARM Limited. All rights reserved. # Copyright (c) 2018 - 2020, Andrei Warkentin # # SPDX-License-Identifier: BSD-2-Clause-Patent @@ -93,7 +93,6 @@ gRaspberryPiTokenSpaceGuid.PcdRamLimitTo3GB gRaspberryPiTokenSpaceGuid.PcdFanOnGpio gRaspberryPiTokenSpaceGuid.PcdFanTemp - gRaspberryPiTokenSpaceGuid.PcdBootPolicy gRaspberryPiTokenSpaceGuid.PcdUartInUse =20 [Depex] diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBo= otManagerLib.inf b/Platform/RaspberryPi/Library/PlatformBootManagerLib/Plat= formBootManagerLib.inf index 4ef2f791ae..c047364b28 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBootManag= erLib.inf @@ -64,7 +64,6 @@ gEfiMdeModulePkgTokenSpaceGuid.PcdBootDiscoveryPolicy=20 gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut gRaspberryPiTokenSpaceGuid.PcdSdIsArasan - gRaspberryPiTokenSpaceGuid.PcdBootPolicy =20 [Guids] gBootDiscoveryPolicyMgrFormsetGuid diff --git a/Platform/RaspberryPi/Include/ConfigVars.h b/Platform/Raspberry= Pi/Include/ConfigVars.h index 9ef62b7a6e..142317985a 100644 --- a/Platform/RaspberryPi/Include/ConfigVars.h +++ b/Platform/RaspberryPi/Include/ConfigVars.h @@ -1,7 +1,7 @@ /** @file * * Copyright (c) 2020, Andrei Warkentin - * Copyright (c) 2020 - 2021, ARM Limited. All rights reserved. + * Copyright (c) 2020, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -143,14 +143,4 @@ typedef struct { UINT32 EnableDma; } MMC_EMMC_DMA_VARSTORE_DATA; =20 -#define FAST_BOOT 0 -#define FULL_DISCOVERY 1 -typedef struct { - /* - * 0 - Fast Boot - * 1 - Full Discovery (Connect All) - */ - UINT32 BootPolicy; -} BOOT_POLICY_VARSTORE_DATA; - #endif /* CONFIG_VARS_H */ diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr b/Plat= form/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr index 759db6212f..fa34eab809 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.vfr @@ -1,7 +1,7 @@ /** @file * * Copyright (c) 2018 Andrei Warkentin - * Copyright (c) 2020 - 2021, ARM Limited. All rights reserved. + * Copyright (c) 2020, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -116,11 +116,6 @@ formset name =3D DisplayEnableSShot, guid =3D CONFIGDXE_FORM_SET_GUID; =20 - efivarstore BOOT_POLICY_VARSTORE_DATA, - attribute =3D EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME= _ACCESS | EFI_VARIABLE_NON_VOLATILE, - name =3D BootPolicy, - guid =3D CONFIGDXE_FORM_SET_GUID; - form formid =3D 1, title =3D STRING_TOKEN(STR_FORM_SET_TITLE); subtitle text =3D STRING_TOKEN(STR_NULL_STRING); @@ -195,14 +190,6 @@ formset option text =3D STRING_TOKEN(STR_ADVANCED_SYSTAB_DT), value = =3D SYSTEM_TABLE_MODE_DT, flags =3D DEFAULT; endoneof; =20 - oneof varid =3D BootPolicy.BootPolicy, - prompt =3D STRING_TOKEN(STR_BOOT_POLICY_PROMPT), - help =3D STRING_TOKEN(STR_BOOT_POLICY_HELP), - flags =3D NUMERIC_SIZE_4 | INTERACTIVE | RESET_REQUIRED, - option text =3D STRING_TOKEN(STR_FAST_BOOT), value =3D FAST_BO= OT , flags =3D 0; - option text =3D STRING_TOKEN(STR_FULL_DISCOVERY), value =3D FU= LL_DISCOVERY, flags =3D DEFAULT; - endoneof; - #if (RPI_MODEL =3D=3D 4) grayoutif NOT ideqval SystemTableMode.Mode =3D=3D SYSTEM_TABLE_MOD= E_ACPI; oneof varid =3D FanOnGpio.Enabled, @@ -233,7 +220,6 @@ formset minsize =3D 0, maxsize =3D ASSET_TAG_STR_MAX_LEN, endstring; - endform; =20 form formid =3D 0x1003, diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c b/Platform/= RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c index cf9880bd20..9e78cb47ad 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxe.c @@ -1,6 +1,6 @@ /** @file * - * Copyright (c) 2019 - 2021, ARM Limited. All rights reserved. + * Copyright (c) 2019 - 2020, ARM Limited. All rights reserved. * Copyright (c) 2018 - 2020, Andrei Warkentin * * SPDX-License-Identifier: BSD-2-Clause-Patent @@ -286,15 +286,6 @@ SetupVariables ( ); } =20 - Size =3D sizeof (UINT32); - Status =3D gRT->GetVariable (L"BootPolicy", - &gConfigDxeFormSetGuid, - NULL, &Size, &Var32); - if (EFI_ERROR (Status)) { - Status =3D PcdSet32S (PcdBootPolicy, PcdGet32 (PcdBootPolicy)); - ASSERT_EFI_ERROR (Status); - } - Size =3D sizeof (UINT32); Status =3D gRT->GetVariable (L"SdIsArasan", &gConfigDxeFormSetGuid, diff --git a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm= .c b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c index d944d1a38d..c8305ce4f5 100644 --- a/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c +++ b/Platform/RaspberryPi/Library/PlatformBootManagerLib/PlatformBm.c @@ -4,7 +4,7 @@ * Copyright (c) 2017-2018, Andrei Warkentin * Copyright (c) 2016, Linaro Ltd. All rights reserved. * Copyright (c) 2015-2016, Red Hat, Inc. - * Copyright (c) 2014-2021, ARM Ltd. All rights reserved. + * Copyright (c) 2014-2020, ARM Ltd. All rights reserved. * Copyright (c) 2004-2016, Intel Corporation. All rights reserved. * Copyright (c) 2021, Semihalf All rights reserved. * @@ -28,11 +28,10 @@ #include #include #include -#include =20 #include "PlatformBm.h" =20 -#define BOOT_PROMPT L"ESC (setup), F1 (shell), ENTER (boot)\n" +#define BOOT_PROMPT L"ESC (setup), F1 (shell), ENTER (boot)" =20 #define DP_NODE_LEN(Type) { (UINT8)sizeof (Type), (UINT8)(sizeof (Type) >>= 8) } =20 @@ -720,16 +719,6 @@ PlatformBootManagerAfterConsole ( Print (BOOT_PROMPT); } =20 - // - // Connect the rest of the devices if the boot polcy is set to Full disc= overy - // - if (PcdGet32 (PcdBootPolicy) =3D=3D FULL_DISCOVERY) { - DEBUG ((DEBUG_INFO, "Boot Policy is Full Discovery. Connect all device= s\n")); - EfiBootManagerConnectAll (); - } else if (PcdGet32 (PcdBootPolicy) =3D=3D FAST_BOOT) { - DEBUG ((DEBUG_INFO, "Boot Policy is Fast Boot. Skip connecting all dev= ices\n")); - } - Status =3D BootDiscoveryPolicyHandler (); if (EFI_ERROR(Status)) { DEBUG ((DEBUG_INFO, "Error applying Boot Discovery Policy:%r\n", Statu= s)); diff --git a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni b/Plat= form/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni index 81761d64bb..466fa852cb 100644 --- a/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni +++ b/Platform/RaspberryPi/Drivers/ConfigDxe/ConfigDxeHii.uni @@ -1,7 +1,7 @@ /** @file * * Copyright (c) 2018, Andrei Warkentin - * Copyright (c) 2020 - 2021, ARM Limited. All rights reserved. + * Copyright (c) 2020, ARM Limited. All rights reserved. * * SPDX-License-Identifier: BSD-2-Clause-Patent * @@ -60,14 +60,6 @@ #string STR_ADVANCED_ASSET_TAG_PROMPT #language en-US "Asset Tag" #string STR_ADVANCED_ASSET_TAG_HELP #language en-US "Set the system Asse= t Tag" =20 -#string STR_BOOT_POLICY_PROMPT #language en-US "Boot Policy" -#string STR_BOOT_POLICY_HELP #language en-US "When Fast Boot is s= elected, only required devices will be discovered for reducing " - "the boot time. " - "When Full Discovery= is selected, all the devices will be discovered for some " - "scenarios such as s= ystem deployment and diagnostic tests." -#string STR_FAST_BOOT #language en-US "Fast Boot" -#string STR_FULL_DISCOVERY #language en-US "Full Discovery" - /* * MMC/SD configuration. */ --=20 2.25.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 (#78073): https://edk2.groups.io/g/devel/message/78073 Mute This Topic: https://groups.io/mt/84374724/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-