* [PATCH v3] ArmPkg: Enable boot discovery policy for ARM package.
@ 2021-08-30 12:08 Grzegorz Bernacki
2021-08-30 14:24 ` Ard Biesheuvel
0 siblings, 1 reply; 2+ messages in thread
From: Grzegorz Bernacki @ 2021-08-30 12:08 UTC (permalink / raw)
To: devel
Cc: leif, ardb+tianocore, sami.mujawar, Samer.El-Haj-Mahmoud,
sunny.Wang, mw, Grzegorz Bernacki, Sunny Wang
This commit adds code which check BootDiscoveryPolicy variable and
calls Boot Policy Manager Protocol to connect device specified by
the variable. To enable that mechanism for platform
EfiMdeModulePkgTokenSpaceGuid.PcdBootDiscoveryPolicy PCD must be
added to DSC file and BootDiscoveryPolicyUiLib should be added to
UiApp libraries.
Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
Reviewed-by: Sunny Wang <sunny.wang@arm.com>
Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
---
Notes:
v2:
- fix error from CI
v3:
- use local variable DiscoveryPolicy to initialize BootDiscoveryPolicy
- coding style fixes
- run EfiBootManagerRefreshAllBootOption () only if BootDiscoveryPolicy
ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 5 +
ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 118 +++++++++++++++++++-
2 files changed, 122 insertions(+), 1 deletion(-)
diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
index 353d7a967b..86751b45f8 100644
--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
+++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
@@ -65,11 +65,15 @@
[Pcd]
gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
+ gEfiMdeModulePkgTokenSpaceGuid.PcdBootDiscoveryPolicy
[Guids]
+ gBootDiscoveryPolicyMgrFormsetGuid
gEdkiiNonDiscoverableEhciDeviceGuid
gEdkiiNonDiscoverableUhciDeviceGuid
gEdkiiNonDiscoverableXhciDeviceGuid
+ gEfiBootManagerPolicyNetworkGuid
+ gEfiBootManagerPolicyConnectAllGuid
gEfiFileInfoGuid
gEfiFileSystemInfoGuid
gEfiFileSystemVolumeLabelInfoIdGuid
@@ -79,6 +83,7 @@
[Protocols]
gEdkiiNonDiscoverableDeviceProtocolGuid
+ gEfiBootManagerPolicyProtocolGuid
gEfiDevicePathProtocolGuid
gEfiGraphicsOutputProtocolGuid
gEfiLoadedImageProtocolGuid
diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
index 5ceb23d822..1e4020487a 100644
--- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
+++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
@@ -2,9 +2,10 @@
Implementation for PlatformBootManagerLib library class interfaces.
Copyright (C) 2015-2016, Red Hat, Inc.
- Copyright (c) 2014 - 2019, ARM Ltd. All rights reserved.<BR>
+ Copyright (c) 2014 - 2021, ARM Ltd. All rights reserved.<BR>
Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
+ Copyright (c) 2021, Semihalf All rights reserved.<BR>
SPDX-License-Identifier: BSD-2-Clause-Patent
@@ -19,6 +20,7 @@
#include <Library/UefiBootManagerLib.h>
#include <Library/UefiLib.h>
#include <Library/UefiRuntimeServicesTableLib.h>
+#include <Protocol/BootManagerPolicy.h>
#include <Protocol/DevicePath.h>
#include <Protocol/EsrtManagement.h>
#include <Protocol/GraphicsOutput.h>
@@ -27,6 +29,7 @@
#include <Protocol/PciIo.h>
#include <Protocol/PciRootBridgeIo.h>
#include <Protocol/PlatformBootManager.h>
+#include <Guid/BootDiscoveryPolicy.h>
#include <Guid/EventGroup.h>
#include <Guid/NonDiscoverableDevice.h>
#include <Guid/TtyTerm.h>
@@ -703,6 +706,113 @@ HandleCapsules (
#define VERSION_STRING_PREFIX L"Tianocore/EDK2 firmware version "
+/**
+ This functions checks the value of BootDiscoverPolicy variable and
+ connect devices of class specified by that variable. Then it refreshes
+ Boot order for newly discovered boot device.
+
+ @retval EFI_SUCCESS Devices connected successfully or connection
+ not required.
+ @retval others Return values from GetVariable(), LocateProtocol()
+ and ConnectDeviceClass().
+**/
+STATIC
+EFI_STATUS
+BootDiscoveryPolicyHandler (
+ VOID
+ )
+{
+ EFI_STATUS Status;
+ UINT32 DiscoveryPolicy;
+ UINT32 DiscoveryPolicyOld;
+ UINTN Size;
+ EFI_BOOT_MANAGER_POLICY_PROTOCOL *BMPolicy;
+ EFI_GUID *Class;
+
+ Size = sizeof (DiscoveryPolicy);
+ Status = gRT->GetVariable (
+ BOOT_DISCOVERY_POLICY_VAR,
+ &gBootDiscoveryPolicyMgrFormsetGuid,
+ NULL,
+ &Size,
+ &DiscoveryPolicy
+ );
+ if (Status == EFI_NOT_FOUND) {
+ DiscoveryPolicy = PcdGet32 (PcdBootDiscoveryPolicy);
+ Status = PcdSet32S (PcdBootDiscoveryPolicy, DiscoveryPolicy);
+ if (Status == EFI_NOT_FOUND) {
+ return EFI_SUCCESS;
+ } else if (EFI_ERROR (Status)) {
+ return Status;
+ }
+ } else if (EFI_ERROR (Status)) {
+ return Status;
+ }
+
+ if (DiscoveryPolicy == BDP_CONNECT_MINIMAL) {
+ return EFI_SUCCESS;
+ }
+
+ switch (DiscoveryPolicy) {
+ case BDP_CONNECT_NET:
+ Class = &gEfiBootManagerPolicyNetworkGuid;
+ break;
+ case BDP_CONNECT_ALL:
+ Class = &gEfiBootManagerPolicyConnectAllGuid;
+ break;
+ default:
+ DEBUG ((
+ DEBUG_INFO,
+ "%a - Unexpected DiscoveryPolicy (0x%x). Run Minimal Discovery Policy\n",
+ __FUNCTION__,
+ DiscoveryPolicy
+ ));
+ return EFI_SUCCESS;
+ }
+
+ Status = gBS->LocateProtocol (
+ &gEfiBootManagerPolicyProtocolGuid,
+ NULL,
+ (VOID **)&BMPolicy
+ );
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_INFO, "%a - Failed to locate gEfiBootManagerPolicyProtocolGuid."
+ "Driver connect will be skipped.\n", __FUNCTION__));
+ return Status;
+ }
+
+ Status = BMPolicy->ConnectDeviceClass (BMPolicy, Class);
+ if (EFI_ERROR (Status)){
+ DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __FUNCTION__, Status));
+ return Status;
+ }
+
+ //
+ // Refresh Boot Options if Boot Discovery Policy has been changed
+ //
+ Size = sizeof (DiscoveryPolicyOld);
+ Status = gRT->GetVariable (
+ BOOT_DISCOVERY_POLICY_OLD_VAR,
+ &gBootDiscoveryPolicyMgrFormsetGuid,
+ NULL,
+ &Size,
+ &DiscoveryPolicyOld
+ );
+ if ((Status == EFI_NOT_FOUND) || (DiscoveryPolicyOld != DiscoveryPolicy)) {
+ EfiBootManagerRefreshAllBootOption ();
+
+ Status = gRT->SetVariable (
+ BOOT_DISCOVERY_POLICY_OLD_VAR,
+ &gBootDiscoveryPolicyMgrFormsetGuid,
+ EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
+ sizeof (DiscoveryPolicyOld),
+ &DiscoveryPolicy
+ );
+ }
+
+ return EFI_SUCCESS;
+}
+
/**
Do the platform specific action after the console is ready
Possible things that can be done in PlatformBootManagerAfterConsole:
@@ -753,6 +863,12 @@ PlatformBootManagerAfterConsole (
}
}
+ //
+ // Connect device specified by BootDiscoverPolicy variable and
+ // refresh Boot order for newly discovered boot devices
+ //
+ BootDiscoveryPolicyHandler ();
+
//
// On ARM, there is currently no reason to use the phased capsule
// update approach where some capsules are dispatched before EndOfDxe
--
2.25.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v3] ArmPkg: Enable boot discovery policy for ARM package.
2021-08-30 12:08 [PATCH v3] ArmPkg: Enable boot discovery policy for ARM package Grzegorz Bernacki
@ 2021-08-30 14:24 ` Ard Biesheuvel
0 siblings, 0 replies; 2+ messages in thread
From: Ard Biesheuvel @ 2021-08-30 14:24 UTC (permalink / raw)
To: Grzegorz Bernacki
Cc: devel, leif, ardb+tianocore, sami.mujawar, Samer.El-Haj-Mahmoud,
sunny.Wang, mw
On Mon, 30 Aug 2021 at 14:08, Grzegorz Bernacki <gjb@semihalf.com> wrote:
>
> This commit adds code which check BootDiscoveryPolicy variable and
> calls Boot Policy Manager Protocol to connect device specified by
> the variable. To enable that mechanism for platform
> EfiMdeModulePkgTokenSpaceGuid.PcdBootDiscoveryPolicy PCD must be
> added to DSC file and BootDiscoveryPolicyUiLib should be added to
> UiApp libraries.
>
> Signed-off-by: Grzegorz Bernacki <gjb@semihalf.com>
> Reviewed-by: Sunny Wang <sunny.wang@arm.com>
> Reviewed-by: Sami Mujawar <sami.mujawar@arm.com>
Merged as #1932
Thanks all,
> ---
>
> Notes:
> v2:
> - fix error from CI
>
> v3:
> - use local variable DiscoveryPolicy to initialize BootDiscoveryPolicy
> - coding style fixes
> - run EfiBootManagerRefreshAllBootOption () only if BootDiscoveryPolicy
>
> ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf | 5 +
> ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c | 118 +++++++++++++++++++-
> 2 files changed, 122 insertions(+), 1 deletion(-)
>
> diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> index 353d7a967b..86751b45f8 100644
> --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBootManagerLib.inf
> @@ -65,11 +65,15 @@
>
> [Pcd]
> gEfiMdePkgTokenSpaceGuid.PcdPlatformBootTimeOut
> + gEfiMdeModulePkgTokenSpaceGuid.PcdBootDiscoveryPolicy
>
> [Guids]
> + gBootDiscoveryPolicyMgrFormsetGuid
> gEdkiiNonDiscoverableEhciDeviceGuid
> gEdkiiNonDiscoverableUhciDeviceGuid
> gEdkiiNonDiscoverableXhciDeviceGuid
> + gEfiBootManagerPolicyNetworkGuid
> + gEfiBootManagerPolicyConnectAllGuid
> gEfiFileInfoGuid
> gEfiFileSystemInfoGuid
> gEfiFileSystemVolumeLabelInfoIdGuid
> @@ -79,6 +83,7 @@
>
> [Protocols]
> gEdkiiNonDiscoverableDeviceProtocolGuid
> + gEfiBootManagerPolicyProtocolGuid
> gEfiDevicePathProtocolGuid
> gEfiGraphicsOutputProtocolGuid
> gEfiLoadedImageProtocolGuid
> diff --git a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> index 5ceb23d822..1e4020487a 100644
> --- a/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> +++ b/ArmPkg/Library/PlatformBootManagerLib/PlatformBm.c
> @@ -2,9 +2,10 @@
> Implementation for PlatformBootManagerLib library class interfaces.
>
> Copyright (C) 2015-2016, Red Hat, Inc.
> - Copyright (c) 2014 - 2019, ARM Ltd. All rights reserved.<BR>
> + Copyright (c) 2014 - 2021, ARM Ltd. All rights reserved.<BR>
> Copyright (c) 2004 - 2018, Intel Corporation. All rights reserved.<BR>
> Copyright (c) 2016, Linaro Ltd. All rights reserved.<BR>
> + Copyright (c) 2021, Semihalf All rights reserved.<BR>
>
> SPDX-License-Identifier: BSD-2-Clause-Patent
>
> @@ -19,6 +20,7 @@
> #include <Library/UefiBootManagerLib.h>
> #include <Library/UefiLib.h>
> #include <Library/UefiRuntimeServicesTableLib.h>
> +#include <Protocol/BootManagerPolicy.h>
> #include <Protocol/DevicePath.h>
> #include <Protocol/EsrtManagement.h>
> #include <Protocol/GraphicsOutput.h>
> @@ -27,6 +29,7 @@
> #include <Protocol/PciIo.h>
> #include <Protocol/PciRootBridgeIo.h>
> #include <Protocol/PlatformBootManager.h>
> +#include <Guid/BootDiscoveryPolicy.h>
> #include <Guid/EventGroup.h>
> #include <Guid/NonDiscoverableDevice.h>
> #include <Guid/TtyTerm.h>
> @@ -703,6 +706,113 @@ HandleCapsules (
>
> #define VERSION_STRING_PREFIX L"Tianocore/EDK2 firmware version "
>
> +/**
> + This functions checks the value of BootDiscoverPolicy variable and
> + connect devices of class specified by that variable. Then it refreshes
> + Boot order for newly discovered boot device.
> +
> + @retval EFI_SUCCESS Devices connected successfully or connection
> + not required.
> + @retval others Return values from GetVariable(), LocateProtocol()
> + and ConnectDeviceClass().
> +**/
> +STATIC
> +EFI_STATUS
> +BootDiscoveryPolicyHandler (
> + VOID
> + )
> +{
> + EFI_STATUS Status;
> + UINT32 DiscoveryPolicy;
> + UINT32 DiscoveryPolicyOld;
> + UINTN Size;
> + EFI_BOOT_MANAGER_POLICY_PROTOCOL *BMPolicy;
> + EFI_GUID *Class;
> +
> + Size = sizeof (DiscoveryPolicy);
> + Status = gRT->GetVariable (
> + BOOT_DISCOVERY_POLICY_VAR,
> + &gBootDiscoveryPolicyMgrFormsetGuid,
> + NULL,
> + &Size,
> + &DiscoveryPolicy
> + );
> + if (Status == EFI_NOT_FOUND) {
> + DiscoveryPolicy = PcdGet32 (PcdBootDiscoveryPolicy);
> + Status = PcdSet32S (PcdBootDiscoveryPolicy, DiscoveryPolicy);
> + if (Status == EFI_NOT_FOUND) {
> + return EFI_SUCCESS;
> + } else if (EFI_ERROR (Status)) {
> + return Status;
> + }
> + } else if (EFI_ERROR (Status)) {
> + return Status;
> + }
> +
> + if (DiscoveryPolicy == BDP_CONNECT_MINIMAL) {
> + return EFI_SUCCESS;
> + }
> +
> + switch (DiscoveryPolicy) {
> + case BDP_CONNECT_NET:
> + Class = &gEfiBootManagerPolicyNetworkGuid;
> + break;
> + case BDP_CONNECT_ALL:
> + Class = &gEfiBootManagerPolicyConnectAllGuid;
> + break;
> + default:
> + DEBUG ((
> + DEBUG_INFO,
> + "%a - Unexpected DiscoveryPolicy (0x%x). Run Minimal Discovery Policy\n",
> + __FUNCTION__,
> + DiscoveryPolicy
> + ));
> + return EFI_SUCCESS;
> + }
> +
> + Status = gBS->LocateProtocol (
> + &gEfiBootManagerPolicyProtocolGuid,
> + NULL,
> + (VOID **)&BMPolicy
> + );
> + if (EFI_ERROR (Status)) {
> + DEBUG ((DEBUG_INFO, "%a - Failed to locate gEfiBootManagerPolicyProtocolGuid."
> + "Driver connect will be skipped.\n", __FUNCTION__));
> + return Status;
> + }
> +
> + Status = BMPolicy->ConnectDeviceClass (BMPolicy, Class);
> + if (EFI_ERROR (Status)){
> + DEBUG ((DEBUG_ERROR, "%a - ConnectDeviceClass returns - %r\n", __FUNCTION__, Status));
> + return Status;
> + }
> +
> + //
> + // Refresh Boot Options if Boot Discovery Policy has been changed
> + //
> + Size = sizeof (DiscoveryPolicyOld);
> + Status = gRT->GetVariable (
> + BOOT_DISCOVERY_POLICY_OLD_VAR,
> + &gBootDiscoveryPolicyMgrFormsetGuid,
> + NULL,
> + &Size,
> + &DiscoveryPolicyOld
> + );
> + if ((Status == EFI_NOT_FOUND) || (DiscoveryPolicyOld != DiscoveryPolicy)) {
> + EfiBootManagerRefreshAllBootOption ();
> +
> + Status = gRT->SetVariable (
> + BOOT_DISCOVERY_POLICY_OLD_VAR,
> + &gBootDiscoveryPolicyMgrFormsetGuid,
> + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS,
> + sizeof (DiscoveryPolicyOld),
> + &DiscoveryPolicy
> + );
> + }
> +
> + return EFI_SUCCESS;
> +}
> +
> /**
> Do the platform specific action after the console is ready
> Possible things that can be done in PlatformBootManagerAfterConsole:
> @@ -753,6 +863,12 @@ PlatformBootManagerAfterConsole (
> }
> }
>
> + //
> + // Connect device specified by BootDiscoverPolicy variable and
> + // refresh Boot order for newly discovered boot devices
> + //
> + BootDiscoveryPolicyHandler ();
> +
> //
> // On ARM, there is currently no reason to use the phased capsule
> // update approach where some capsules are dispatched before EndOfDxe
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-30 14:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-08-30 12:08 [PATCH v3] ArmPkg: Enable boot discovery policy for ARM package Grzegorz Bernacki
2021-08-30 14:24 ` Ard Biesheuvel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox