dasharo/edk2
0
0
Fork 0
mirror of https://github.com/Dasharo/edk2.git synced 2026-06-13 10:16:24 -07:00
Code Issues Packages Projects Releases Wiki Activity

DasharoPayloadPkg: Reduce FV boot option registering redundancy

Browse Source 
The RegisterFvBootOption and UnregisterFvBootOption functions shared
a lot of code. Merge those two functions into a new SyncFvBootOption
which checks for file presence and registers the option accordingly or
removes it if the file does not exist or should be removed explicitly.

Signed-off-by: Michał Żygowski <michal.zygowski@3mdeb.com>
This commit is contained in:
Michał Żygowski
2025-02-26 13:27:57 +01:00
parent b33fd05d83
commit ee0bb1bb61
1 changed files with 40 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DasharoPayloadPkg/Library/PlatformBootManagerLib/PlatformBootManager.c
+40 -105
View File
@@ -100,11 +100,11 @@ PlatformFindLoadOption (
}
VOID
PlatformRegisterFvBootOption (
SyncFvBootOption (
EFI_GUID *FileGuid,
CHAR16 *Description,
UINT32 Attributes,
BOOLEAN BootNow
BOOLEAN BootNow,
BOOLEAN Remove
)
{
EFI_STATUS Status;
@@ -148,7 +148,7 @@ PlatformRegisterFvBootOption (
&NewOption,
LoadOptionNumberUnassigned,
LoadOptionTypeBoot,
Attributes,
LOAD_OPTION_ACTIVE,
Description,
DevicePath,
NULL,
@@ -157,8 +157,8 @@ PlatformRegisterFvBootOption (
ASSERT_EFI_ERROR (Status);
FreePool (DevicePath);
// No need to guard here, because an error would be displayed on the screen
// if file is not found.
// No need to check if the file exists here, because EfiBootManager will
// print a message on the screen if file was not found.
if (BootNow)
EfiBootManagerBoot (&NewOption);
@@ -170,78 +170,21 @@ PlatformRegisterFvBootOption (
&NewOption, BootOptions, BootOptionCount
);
if (OptionIndex == -1 && FileExists) {
if (OptionIndex == -1 && FileExists && !Remove) {
// Option does not exist yet and the file exists, so add new option
Status = EfiBootManagerAddLoadOptionVariable (&NewOption, MAX_UINTN);
ASSERT_EFI_ERROR (Status);
} else if (OptionIndex != -1 && !FileExists) {
// Option exists but no longer in the image. Remove it from boot option list.
Status = EfiBootManagerDeleteLoadOptionVariable (BootOptions[OptionIndex].OptionNumber,
} else if (OptionIndex != -1) {
if (Remove || !FileExists) {
// Option exists and the file does not exists, or we explicitly asked to
// remove it from boot option list.
Status = EfiBootManagerDeleteLoadOptionVariable (BootOptions[OptionIndex].OptionNumber,
BootOptions[OptionIndex].OptionType);
ASSERT_EFI_ERROR (Status);
}
}
EfiBootManagerFreeLoadOption (&NewOption);
EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
}
VOID
PlatformUnregisterFvBootOption (
EFI_GUID *FileGuid,
CHAR16 *Description,
UINT32 Attributes
)
{
EFI_STATUS Status;
INTN OptionIndex;
EFI_BOOT_MANAGER_LOAD_OPTION NewOption;
EFI_BOOT_MANAGER_LOAD_OPTION *BootOptions;
UINTN BootOptionCount;
MEDIA_FW_VOL_FILEPATH_DEVICE_PATH FileNode;
EFI_LOADED_IMAGE_PROTOCOL *LoadedImage;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
Status = gBS->HandleProtocol (
gImageHandle,
&gEfiLoadedImageProtocolGuid,
(VOID **) &LoadedImage
);
ASSERT_EFI_ERROR (Status);
EfiInitializeFwVolDevicepathNode (&FileNode, FileGuid);
DevicePath = DevicePathFromHandle (LoadedImage->DeviceHandle);
ASSERT (DevicePath != NULL);
DevicePath = AppendDevicePathNode (
DevicePath,
(EFI_DEVICE_PATH_PROTOCOL *) &FileNode
);
ASSERT (DevicePath != NULL);
Status = EfiBootManagerInitializeLoadOption (
&NewOption,
LoadOptionNumberUnassigned,
LoadOptionTypeBoot,
Attributes,
Description,
DevicePath,
NULL,
0
);
ASSERT_EFI_ERROR (Status);
FreePool (DevicePath);
BootOptions = EfiBootManagerGetLoadOptions (
&BootOptionCount, LoadOptionTypeBoot
);
OptionIndex = EfiBootManagerFindLoadOption (
&NewOption, BootOptions, BootOptionCount
);
if (OptionIndex >= 0 && OptionIndex < BootOptionCount) {
Status = EfiBootManagerDeleteLoadOptionVariable (BootOptions[OptionIndex].OptionNumber,
BootOptions[OptionIndex].OptionType);
ASSERT_EFI_ERROR (Status);
}
EfiBootManagerFreeLoadOption (&NewOption);
EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);
}
@@ -1737,48 +1680,40 @@ PlatformBootManagerAfterConsole (
//
if (FUMEnabled) {
DEBUG((DEBUG_INFO, "Registering iPXE boot option for FUM\n"));
PlatformRegisterFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
LOAD_OPTION_ACTIVE,
TRUE);
SyncFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
TRUE,
FALSE);
} else if (mFastBoot) {
DEBUG((DEBUG_INFO, "Unregistering iPXE boot option on fast boot path\n"));
PlatformUnregisterFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
LOAD_OPTION_ACTIVE);
} else if ((Status != EFI_NOT_FOUND) && (VarSize == sizeof(NetBootEnabled))) {
if (NetBootEnabled) {
DEBUG((DEBUG_INFO, "Registering iPXE boot option by variable\n"));
PlatformRegisterFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
LOAD_OPTION_ACTIVE,
FALSE);
} else {
DEBUG((DEBUG_INFO, "Unregistering iPXE boot option by variable\n"));
PlatformUnregisterFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
LOAD_OPTION_ACTIVE);
}
} else if ((Status == EFI_NOT_FOUND) && FixedPcdGetBool(PcdDefaultNetworkBootEnable)) {
DEBUG((DEBUG_INFO, "Registering iPXE boot option by policy\n"));
PlatformRegisterFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
LOAD_OPTION_ACTIVE,
FALSE);
SyncFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
FALSE,
TRUE);
} else if (!EFI_ERROR (Status) && (VarSize == sizeof(NetBootEnabled))) {
DEBUG((DEBUG_INFO, "Registering iPXE boot option by variable: %sbled\n",
NetBootEnabled ? L"en" : L"dis"));
SyncFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
FALSE,
!NetBootEnabled);
} else {
DEBUG((DEBUG_INFO, "Unregistering iPXE boot option\n"));
PlatformUnregisterFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
LOAD_OPTION_ACTIVE);
DEBUG((DEBUG_INFO, "Registering iPXE boot option by policy: %sbled\n",
FixedPcdGetBool(PcdDefaultNetworkBootEnable) ? L"en" : L"dis"));
SyncFvBootOption (PcdGetPtr (PcdiPXEFile),
(CHAR16 *) PcdGetPtr(PcdiPXEOptionName),
FALSE,
!FixedPcdGetBool(PcdDefaultNetworkBootEnable));
}
//
// Register UEFI Shell
//
DEBUG((DEBUG_INFO, "Registering UEFI Shell boot option\n"));
PlatformRegisterFvBootOption (PcdGetPtr (PcdShellFile),
L"UEFI Shell",
LOAD_OPTION_ACTIVE,
FALSE);
SyncFvBootOption (PcdGetPtr (PcdShellFile),
L"UEFI Shell",
FALSE,
FALSE);
BootMenuKey = GetKeyStringFromScanCode (FixedPcdGet16(PcdBootMenuKey), L"F12");
SetupMenuKey = GetKeyStringFromScanCode (FixedPcdGet16(PcdSetupMenuKey), L"ESC");