On Fri, 28 Jan 2022 at 14:16, <[email protected]> wrote: > > From: Pierre Gondois <[email protected]> > > 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. > For the edk2 repository, commit cae735f61328 ("ArmPkg: Enable boot > discovery policy for ARM package.") adds a mechanism to check for > the boot discovery policy. When the following are available: > - gEfiBootManagerPolicyProtocolGuid protocol > - BOOT_DISCOVERY_POLICY_VAR variable > this allows to choose whether devices need to be connected during > boot. > > During boot on ARM platforms, all devices are connected if there > are no valid boot options. If the UEFI shell is added as a valid > boot option, some devices won't be connected. The BootDiscoveryPolicy > will allow to manually configure this. > > For all ARM platforms, add: > - BootManagerPolicyDxe module to Bds phase > - BootDiscoveryPolicyUiLib to UiApp module > - PcdBootDiscoveryPolicy Pcd > > Signed-off-by: Pierre Gondois <[email protected]>
Reviewed-by: Ard Biesheuvel <[email protected]> Pushed as b9d6ddebe1a9..1bbfeb030a55 Thanks, > --- > Platform/ARM/JunoPkg/ArmJuno.dsc | 2 ++ > Platform/ARM/JunoPkg/ArmJuno.fdf | 1 + > Platform/ARM/Morello/MorelloPlatform.dsc.inc | 2 ++ > Platform/ARM/Morello/MorelloPlatformFvp.fdf | 1 + > Platform/ARM/N1Sdp/N1SdpPlatform.dsc | 2 ++ > Platform/ARM/N1Sdp/N1SdpPlatform.fdf | 1 + > Platform/ARM/SgiPkg/SgiPlatform.dsc.inc | 2 ++ > Platform/ARM/SgiPkg/SgiPlatform.fdf | 1 + > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc | 2 ++ > Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf | 1 + > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc | 2 ++ > Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf | 1 + > Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc | 7 +++++++ > 13 files changed, 25 insertions(+) > > diff --git a/Platform/ARM/JunoPkg/ArmJuno.dsc > b/Platform/ARM/JunoPkg/ArmJuno.dsc > index 3b7a63b6437a..f7ce397633f6 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.dsc > +++ b/Platform/ARM/JunoPkg/ArmJuno.dsc > @@ -362,12 +362,14 @@ [Components.common] > # > # Bds > # > + MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > MdeModulePkg/Application/UiApp/UiApp.inf { > <LibraryClasses> > + > NULL|MdeModulePkg/Library/BootDiscoveryPolicyUiLib/BootDiscoveryPolicyUiLib.inf > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > diff --git a/Platform/ARM/JunoPkg/ArmJuno.fdf > b/Platform/ARM/JunoPkg/ArmJuno.fdf > index f70d30c6a9d9..c9d51c65ffdb 100644 > --- a/Platform/ARM/JunoPkg/ArmJuno.fdf > +++ b/Platform/ARM/JunoPkg/ArmJuno.fdf > @@ -221,6 +221,7 @@ [FV.FvMain] > # > # Bds > # > + INF MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > diff --git a/Platform/ARM/Morello/MorelloPlatform.dsc.inc > b/Platform/ARM/Morello/MorelloPlatform.dsc.inc > index dccd22248318..1c93246a5273 100644 > --- a/Platform/ARM/Morello/MorelloPlatform.dsc.inc > +++ b/Platform/ARM/Morello/MorelloPlatform.dsc.inc > @@ -204,12 +204,14 @@ [Components.common] > FatPkg/EnhancedFatDxe/Fat.inf > > # Bds > + MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Application/UiApp/UiApp.inf { > <LibraryClasses> > + > NULL|MdeModulePkg/Library/BootDiscoveryPolicyUiLib/BootDiscoveryPolicyUiLib.inf > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > diff --git a/Platform/ARM/Morello/MorelloPlatformFvp.fdf > b/Platform/ARM/Morello/MorelloPlatformFvp.fdf > index 851ee3159b3d..5f2af05c8bfc 100644 > --- a/Platform/ARM/Morello/MorelloPlatformFvp.fdf > +++ b/Platform/ARM/Morello/MorelloPlatformFvp.fdf > @@ -143,6 +143,7 @@ [FV.FvMain] > INF Platform/ARM/Morello/Drivers/PlatformDxe/PlatformDxeFvp.inf > > # Bds > + INF MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > INF MdeModulePkg/Application/UiApp/UiApp.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc > b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc > index 8dac1bc54c36..865dd04deb09 100644 > --- a/Platform/ARM/N1Sdp/N1SdpPlatform.dsc > +++ b/Platform/ARM/N1Sdp/N1SdpPlatform.dsc > @@ -238,12 +238,14 @@ [Components.common] > FatPkg/EnhancedFatDxe/Fat.inf > > # Bds > + MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Application/UiApp/UiApp.inf { > <LibraryClasses> > + > NULL|MdeModulePkg/Library/BootDiscoveryPolicyUiLib/BootDiscoveryPolicyUiLib.inf > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > diff --git a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf > b/Platform/ARM/N1Sdp/N1SdpPlatform.fdf > index 6ede2b7fc894..09f1e0e0073b 100644 > --- a/Platform/ARM/N1Sdp/N1SdpPlatform.fdf > +++ b/Platform/ARM/N1Sdp/N1SdpPlatform.fdf > @@ -160,6 +160,7 @@ [FV.FvMain] > INF Platform/ARM/N1Sdp/Drivers/PlatformDxe/PlatformDxe.inf > > # Bds > + INF MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > INF MdeModulePkg/Application/UiApp/UiApp.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > index 4fe3ccf9a530..582efb0114c6 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > +++ b/Platform/ARM/SgiPkg/SgiPlatform.dsc.inc > @@ -318,12 +318,14 @@ [Components.common] > # > # Bds > # > + MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Application/UiApp/UiApp.inf { > <LibraryClasses> > + > NULL|MdeModulePkg/Library/BootDiscoveryPolicyUiLib/BootDiscoveryPolicyUiLib.inf > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > diff --git a/Platform/ARM/SgiPkg/SgiPlatform.fdf > b/Platform/ARM/SgiPkg/SgiPlatform.fdf > index 8227ae03330c..21eeb3706ba0 100644 > --- a/Platform/ARM/SgiPkg/SgiPlatform.fdf > +++ b/Platform/ARM/SgiPkg/SgiPlatform.fdf > @@ -187,6 +187,7 @@ [FV.FvMain] > # > # Bds > # > + INF MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > INF MdeModulePkg/Application/UiApp/UiApp.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > index e06a2a47f091..cb9d2d4287e3 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.dsc > @@ -267,12 +267,14 @@ [Components.common] > # > # Bds > # > + MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > MdeModulePkg/Application/UiApp/UiApp.inf { > <LibraryClasses> > + > NULL|MdeModulePkg/Library/BootDiscoveryPolicyUiLib/BootDiscoveryPolicyUiLib.inf > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > index f98de162e634..8ca70a248d09 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-CTA15-A7.fdf > @@ -153,6 +153,7 @@ [FV.FvMain] > # > # Bds > # > + INF MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > index cf7350649edb..8561c21fab5a 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.dsc > @@ -328,12 +328,14 @@ [Components.common] > # > # Bds > # > + MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > MdeModulePkg/Application/UiApp/UiApp.inf { > <LibraryClasses> > + > NULL|MdeModulePkg/Library/BootDiscoveryPolicyUiLib/BootDiscoveryPolicyUiLib.inf > NULL|MdeModulePkg/Library/DeviceManagerUiLib/DeviceManagerUiLib.inf > NULL|MdeModulePkg/Library/BootManagerUiLib/BootManagerUiLib.inf > > NULL|MdeModulePkg/Library/BootMaintenanceManagerUiLib/BootMaintenanceManagerUiLib.inf > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > index 7635cb7a8406..a7d048273b37 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > +++ b/Platform/ARM/VExpressPkg/ArmVExpress-FVP-AArch64.fdf > @@ -161,6 +161,7 @@ [FV.FvMain] > # > # Bds > # > + INF MdeModulePkg/Universal/BootManagerPolicyDxe/BootManagerPolicyDxe.inf > INF MdeModulePkg/Universal/DevicePathDxe/DevicePathDxe.inf > INF MdeModulePkg/Universal/DisplayEngineDxe/DisplayEngineDxe.inf > INF MdeModulePkg/Universal/SetupBrowserDxe/SetupBrowserDxe.inf > diff --git a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > index d6f31ecda42f..9f739b374c91 100644 > --- a/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > +++ b/Platform/ARM/VExpressPkg/ArmVExpress.dsc.inc > @@ -264,6 +264,13 @@ [BuildOptions] > # > > ################################################################################ > > +[PcdsDynamicHii.common.DEFAULT] > + # Possible values are: > + # 0: Connect Minimal Devices > + # 1: Connect Network Devices > + # 2: Connect All Devices > + > gEfiMdeModulePkgTokenSpaceGuid.PcdBootDiscoveryPolicy|L"BootDiscoveryPolicy"|gBootDiscoveryPolicyMgrFormsetGuid|0|0 > + > [PcdsFeatureFlag.common] > gEfiMdePkgTokenSpaceGuid.PcdComponentNameDisable|TRUE > gEfiMdePkgTokenSpaceGuid.PcdDriverDiagnosticsDisable|TRUE > -- > 2.25.1 > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#86163): https://edk2.groups.io/g/devel/message/86163 Mute This Topic: https://groups.io/mt/88744015/21656 Group Owner: [email protected] Unsubscribe: https://edk2.groups.io/g/devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
