/** @file\r
BDS Lib functions which relate with create or process the boot option.\r
\r
-Copyright (c) 2004 - 2013, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>\r
This program and the accompanying materials\r
are licensed and made available under the terms and conditions of the BSD License\r
which accompanies this distribution. The full text of the license may be found at\r
0,\r
NULL\r
);\r
+ //\r
+ // Deleting variable with existing variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// adjust boot order array\r
//\r
// If current BBS entry has its description then use it.\r
//\r
- StringDesc = (UINT8 *) (UINTN) ((CurBBSEntry->DescStringSegment << 4) + CurBBSEntry->DescStringOffset);\r
+ StringDesc = (UINT8 *) (((UINTN) CurBBSEntry->DescStringSegment << 4) + CurBBSEntry->DescStringOffset);\r
if (NULL != StringDesc) {\r
//\r
// Only get fisrt 32 characters, this is suggested by BBS spec\r
//\r
// Create new BBS device path node with description string\r
//\r
- UnicodeStrToAsciiStr (BootDesc, HelpString);\r
+ UnicodeStrToAsciiStrS (BootDesc, HelpString, sizeof (HelpString));\r
\r
StringLen = AsciiStrLen (HelpString);\r
NewBbsDevPathNode = AllocateZeroPool (sizeof (BBS_BBS_DEVICE_PATH) + StringLen);\r
return Status;\r
}\r
\r
- LegacyBios->GetBbsInfo (\r
- LegacyBios,\r
- &HddCount,\r
- &LocalHddInfo,\r
- &BbsCount,\r
- &LocalBbsTable\r
- );\r
-\r
BootOrder = BdsLibGetVariableAndSize (\r
L"BootOrder",\r
&gEfiGlobalVariableGuid,\r
&BootOrderSize\r
);\r
if (BootOrder == NULL) {\r
- BootOrderSize = 0;\r
+ return EFI_NOT_FOUND;\r
}\r
\r
+ LegacyBios->GetBbsInfo (\r
+ LegacyBios,\r
+ &HddCount,\r
+ &LocalHddInfo,\r
+ &BbsCount,\r
+ &LocalBbsTable\r
+ );\r
+\r
Index = 0;\r
while (Index < BootOrderSize / sizeof (UINT16)) {\r
UnicodeSPrint (BootOption, sizeof (BootOption), L"Boot%04x", BootOrder[Index]);\r
BootOrderSize,\r
BootOrder\r
);\r
- if (BootOrder != NULL) {\r
- FreePool (BootOrder);\r
- }\r
+ //\r
+ // Shrinking variable with existing variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
+ FreePool (BootOrder);\r
\r
return Status;\r
}\r
&BootOrder,\r
&BootOrderSize\r
);\r
- if (EFI_ERROR (Status)) {\r
- break;\r
+ if (!EFI_ERROR (Status)) {\r
+ ASSERT (BootOrder != NULL);\r
+ BbsIndex = Index;\r
+ OptionNumber = BootOrder[BootOrderSize / sizeof (UINT16) - 1];\r
}\r
- BbsIndex = Index;\r
- OptionNumber = BootOrder[BootOrderSize / sizeof (UINT16) - 1];\r
}\r
\r
ASSERT (BbsIndex == Index);\r
DevOrderPtr->Length = (UINT16) (sizeof (UINT16) + BEVCount * sizeof (UINT16));\r
DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) BdsFillDevOrderBuf (BbsTable, BBS_BEV_DEVICE, BbsCount, DevOrderPtr->Data);\r
\r
- ASSERT (TotalSize == (UINTN) ((UINT8 *) DevOrderPtr - (UINT8 *) DevOrder));\r
+ ASSERT (TotalSize == ((UINTN) DevOrderPtr - (UINTN) DevOrder));\r
\r
//\r
// Save device order for legacy boot device to variable.\r
Status = gRT->SetVariable (\r
VAR_LEGACY_DEV_ORDER,\r
&gEfiLegacyDevOrderVariableGuid,\r
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
TotalSize,\r
DevOrder\r
);\r
Status = gRT->SetVariable (\r
VAR_LEGACY_DEV_ORDER,\r
&gEfiLegacyDevOrderVariableGuid,\r
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
TotalSize,\r
NewDevOrder\r
);\r
break;\r
}\r
\r
- DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINT8 *) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
+ DevOrderPtr = (LEGACY_DEV_ORDER_ENTRY *) ((UINTN) DevOrderPtr + sizeof (BBS_TYPE) + DevOrderPtr->Length);\r
}\r
\r
if ((UINT8 *) DevOrderPtr >= (UINT8 *) DevOrder + DevOrderSize) {\r
}\r
}\r
\r
+ FreePool (DeviceType);\r
+\r
if (BootOrder != NULL) {\r
FreePool (BootOrder);\r
}\r
EFI_DEVICE_PATH_PROTOCOL *FilePath;\r
EFI_LOADED_IMAGE_PROTOCOL *ImageInfo;\r
EFI_DEVICE_PATH_PROTOCOL *WorkingDevicePath;\r
- EFI_ACPI_S3_SAVE_PROTOCOL *AcpiS3Save;\r
LIST_ENTRY TempBootLists;\r
EFI_BOOT_LOGO_PROTOCOL *BootLogo;\r
\r
+ Status = EFI_SUCCESS;\r
*ExitDataSize = 0;\r
*ExitData = NULL;\r
\r
- //\r
- // Notes: this code can be remove after the s3 script table\r
- // hook on the event EVT_SIGNAL_READY_TO_BOOT or\r
- // EVT_SIGNAL_LEGACY_BOOT\r
- //\r
- Status = gBS->LocateProtocol (&gEfiAcpiS3SaveProtocolGuid, NULL, (VOID **) &AcpiS3Save);\r
- if (!EFI_ERROR (Status)) {\r
- AcpiS3Save->S3Save (AcpiS3Save, NULL);\r
- }\r
//\r
// If it's Device Path that starts with a hard drive path, append it with the front part to compose a\r
// full device path\r
// In this case, "BootCurrent" is not created.\r
// Only create the BootCurrent variable when it points to a valid Boot#### variable.\r
//\r
- gRT->SetVariable (\r
+ SetVariableAndReportStatusCodeOnError (\r
L"BootCurrent",\r
&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
}\r
\r
//\r
- // Report Status Code to indicate ReadyToBoot event will be signalled\r
+ // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
//\r
- REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));\r
+ EfiSignalEventReadyToBoot();\r
\r
//\r
- // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
+ // Report Status Code to indicate ReadyToBoot event was signalled\r
//\r
- EfiSignalEventReadyToBoot();\r
+ REPORT_STATUS_CODE (EFI_PROGRESS_CODE, (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_READY_TO_BOOT_EVENT));\r
\r
//\r
// Expand USB Class or USB WWID device path node to be full device path of a USB\r
\r
//\r
// Clear Boot Current\r
+ // Deleting variable with current implementation shouldn't fail.\r
//\r
gRT->SetVariable (\r
L"BootCurrent",\r
&gEfiGlobalVariableGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS,\r
0,\r
- &Option->BootCurrent\r
+ NULL\r
);\r
\r
return Status;\r
// If exist, search the front path which point to partition node in the variable instants.\r
// If fail to find or HD_BOOT_DEVICE_PATH_VARIABLE_NAME not exist, reconnect all and search in all system\r
//\r
- CachedDevicePath = BdsLibGetVariableAndSize (\r
- HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
- &gHdBootDevicePathVariablGuid,\r
- &CachedDevicePathSize\r
- );\r
+ GetVariable2 (\r
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+ &gHdBootDevicePathVariablGuid,\r
+ (VOID **) &CachedDevicePath,\r
+ &CachedDevicePathSize\r
+ );\r
+\r
+ //\r
+ // Delete the invalid HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable.\r
+ //\r
+ if ((CachedDevicePath != NULL) && !IsDevicePathValid (CachedDevicePath, CachedDevicePathSize)) {\r
+ FreePool (CachedDevicePath);\r
+ CachedDevicePath = NULL;\r
+ Status = gRT->SetVariable (\r
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+ &gHdBootDevicePathVariablGuid,\r
+ 0,\r
+ 0,\r
+ NULL\r
+ );\r
+ ASSERT_EFI_ERROR (Status);\r
+ }\r
\r
if (CachedDevicePath != NULL) {\r
TempNewDevicePath = CachedDevicePath;\r
FreePool (TempNewDevicePath);\r
//\r
// Save the matching Device Path so we don't need to do a connect all next time\r
+ // Failure to set the variable only impacts the performance when next time expanding the short-form device path.\r
//\r
Status = gRT->SetVariable (\r
HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
&gHdBootDevicePathVariablGuid,\r
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (CachedDevicePath),\r
CachedDevicePath\r
);\r
\r
//\r
// Save the matching Device Path so we don't need to do a connect all next time\r
+ // Failure to set the variable only impacts the performance when next time expanding the short-form device path.\r
//\r
Status = gRT->SetVariable (\r
HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
&gHdBootDevicePathVariablGuid,\r
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (CachedDevicePath),\r
CachedDevicePath\r
);\r
BootOrderSize,\r
BootOrder\r
);\r
+ //\r
+ // Shrinking variable with existing variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
\r
FreePool (BootOrder);\r
\r
NULL\r
);\r
//\r
+ // Deleting variable with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
+ //\r
// Mark this boot option in boot order as deleted\r
//\r
BootOrder[Index] = 0xffff;\r
Index2 * sizeof (UINT16),\r
BootOrder\r
);\r
+ //\r
+ // Shrinking variable with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
\r
FreePool (BootOrder);\r
\r
AsciiStrSize (PlatLang),\r
PlatLang\r
);\r
- ASSERT_EFI_ERROR (Status);\r
+ //\r
+ // Failure to set the variable only impacts the performance next time enumerating the boot options.\r
+ //\r
\r
if (LastLang != NULL) {\r
FreePool (LastLang);\r
(VOID **) &BlkIo\r
);\r
//\r
- // skip the fixed block io then the removable block io\r
+ // skip the logical partition\r
//\r
- if (EFI_ERROR (Status) || (BlkIo->Media->RemovableMedia == Removable[RemovableIndex])) {\r
+ if (EFI_ERROR (Status) || BlkIo->Media->LogicalPartition) {\r
+ continue;\r
+ }\r
+\r
+ //\r
+ // firstly fixed block io then the removable block io\r
+ //\r
+ if (BlkIo->Media->RemovableMedia == Removable[RemovableIndex]) {\r
continue;\r
}\r
DevicePath = DevicePathFromHandle (BlockIoHandles[Index]);\r
break;\r
\r
case BDS_EFI_MESSAGE_MISC_BOOT:\r
+ default:\r
if (MiscNumber != 0) {\r
UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_MISC)), MiscNumber);\r
} else {\r
BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
MiscNumber++;\r
break;\r
-\r
- default:\r
- break;\r
}\r
}\r
}\r
VOID\r
)\r
{\r
+ EFI_STATUS Status;\r
UINT16 *BootNext;\r
UINTN BootNextSize;\r
CHAR16 Buffer[20];\r
// Clear the boot next variable first\r
//\r
if (BootNext != NULL) {\r
- gRT->SetVariable (\r
- L"BootNext",\r
- &gEfiGlobalVariableGuid,\r
- EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
- 0,\r
- BootNext\r
- );\r
+ Status = gRT->SetVariable (\r
+ L"BootNext",\r
+ &gEfiGlobalVariableGuid,\r
+ EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
+ 0,\r
+ NULL\r
+ );\r
+ //\r
+ // Deleting variable with current variable implementation shouldn't fail.\r
+ //\r
+ ASSERT_EFI_ERROR (Status);\r
\r
//\r
// Start to build the boot option and try to boot\r
ASSERT (BootOption != NULL);\r
BdsLibConnectDevicePath (BootOption->DevicePath);\r
BdsLibBootViaBootOption (BootOption, BootOption->DevicePath, &ExitDataSize, &ExitData);\r
+ FreePool(BootOption);\r
+ FreePool(BootNext);\r
}\r
\r
}\r
NewDevicePath = DevicePathFromHandle (FoundFvHandle);\r
EfiInitializeFwVolDevicepathNode (&FvFileNode, FileGuid);\r
NewDevicePath = AppendDevicePathNode (NewDevicePath, (EFI_DEVICE_PATH_PROTOCOL *) &FvFileNode);\r
+ ASSERT (NewDevicePath != NULL);\r
*DevicePath = NewDevicePath;\r
return EFI_SUCCESS;\r
}\r
projects / mirror_edk2.git / blobdiff