/** @file\r
BDS Lib functions which relate with create or process the boot option.\r
\r
-Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2012, 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
BOOLEAN mEnumBootDevice = FALSE;\r
EFI_HII_HANDLE gBdsLibStringPackHandle = NULL;\r
\r
-///\r
-/// This GUID is used for an EFI Variable that stores the front device pathes\r
-/// for a partial device path that starts with the HD node.\r
-///\r
-EFI_GUID mHdBootVariablePrivateGuid = { 0xfab7e9e1, 0x39dd, 0x4f2b, { 0x84, 0x8, 0xe2, 0xe, 0x90, 0x6c, 0xb6, 0xde } };\r
-\r
-///\r
-/// This GUID is used for register UNI string.\r
-///\r
-EFI_GUID mBdsLibStringPackGuid = { 0x3b4d9b23, 0x95ac, 0x44f6, { 0x9f, 0xcd, 0xe, 0x95, 0x94, 0x58, 0x6c, 0x72 } };\r
-\r
-///\r
-/// This GUID is used for Set/Get platform language into/from variable at last time enumeration to ensure the enumeration will\r
-/// only execute once.\r
-///\r
-EFI_GUID mBdsLibLastLangGuid = { 0xe8c545b, 0xa2ee, 0x470d, { 0x8e, 0x26, 0xbd, 0xa1, 0xa1, 0x3c, 0xa, 0xa3 } };\r
-\r
/**\r
The constructor function register UNI strings into imageHandle.\r
\r
{\r
\r
gBdsLibStringPackHandle = HiiAddPackages (\r
- &mBdsLibStringPackGuid,\r
+ &gBdsLibStringPackageGuid,\r
&ImageHandle,\r
GenericBdsLibStrings,\r
NULL\r
// could be installed for this USB device.\r
//\r
BdsLibConnectDevicePath (FullDevicePath);\r
+ REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
Status = gBS->LoadImage (\r
TRUE,\r
gImageHandle,\r
//\r
FullDevicePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);\r
if (FullDevicePath != NULL) {\r
+ REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
Status = gBS->LoadImage (\r
TRUE,\r
gImageHandle,\r
)\r
{\r
EFI_STATUS Status;\r
+ EFI_STATUS StatusLogo;\r
EFI_HANDLE Handle;\r
EFI_HANDLE ImageHandle;\r
EFI_DEVICE_PATH_PROTOCOL *FilePath;\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
//\r
// Record the performance data for End of BDS\r
}\r
}\r
\r
- //\r
- // Expand USB Class or USB WWID drive path node to full device path.\r
- //\r
- ImageHandle = BdsExpandUsbShortFormDevicePath (DevicePath);\r
-\r
- //\r
- // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
- //\r
- EfiSignalEventReadyToBoot();\r
-\r
- //\r
- // Adjust the different type memory page number just before booting\r
- // and save the updated info into the variable for next boot to use\r
- //\r
- BdsSetMemoryTypeInformationVariable ();\r
-\r
-\r
//\r
// Set Boot Current\r
//\r
);\r
}\r
\r
+ //\r
+ // Signal the EVT_SIGNAL_READY_TO_BOOT event\r
+ //\r
+ EfiSignalEventReadyToBoot();\r
+\r
+ //\r
+ // Expand USB Class or USB WWID device path node to be full device path of a USB\r
+ // device in platform then load the boot file on this full device path and get the\r
+ // image handle.\r
+ //\r
+ ImageHandle = BdsExpandUsbShortFormDevicePath (DevicePath);\r
+\r
+ //\r
+ // Adjust the different type memory page number just before booting\r
+ // and save the updated info into the variable for next boot to use\r
+ //\r
+ BdsSetMemoryTypeInformationVariable ();\r
+\r
//\r
// By expanding the USB Class or WWID device path, the ImageHandle has returnned.\r
// Here get the ImageHandle for the non USB class or WWID device path.\r
\r
DEBUG_CODE_END();\r
\r
+ //\r
+ // Report status code for OS Loader LoadImage.\r
+ //\r
+ REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
Status = gBS->LoadImage (\r
TRUE,\r
gImageHandle,\r
//\r
FilePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);\r
if (FilePath != NULL) {\r
+ REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderLoad));\r
Status = gBS->LoadImage (\r
TRUE,\r
gImageHandle,\r
WriteBootToOsPerformanceData ();\r
);\r
\r
+ //\r
+ // Report status code for OS Loader StartImage.\r
+ //\r
+ REPORT_STATUS_CODE (EFI_PROGRESS_CODE, PcdGet32 (PcdProgressCodeOsLoaderStart));\r
+\r
Status = gBS->StartImage (ImageHandle, ExitDataSize, ExitData);\r
DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Image Return Status = %r\n", Status));\r
\r
gBS->SetWatchdogTimer (0x0000, 0x0000, 0x0000, NULL);\r
\r
Done:\r
+ //\r
+ // Set Logo status invalid after trying one boot option\r
+ //\r
+ BootLogo = NULL;\r
+ StatusLogo = gBS->LocateProtocol (&gEfiBootLogoProtocolGuid, NULL, (VOID **) &BootLogo);\r
+ if (!EFI_ERROR (StatusLogo) && (BootLogo != NULL)) {\r
+ BootLogo->SetBootLogo (BootLogo, NULL, 0, 0, 0, 0);\r
+ }\r
+\r
//\r
// Clear Boot Current\r
//\r
\r
FullDevicePath = NULL;\r
//\r
- // Check if there is prestore 'HDDP' variable.\r
+ // Check if there is prestore HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable.\r
// If exist, search the front path which point to partition node in the variable instants.\r
- // If fail to find or 'HDDP' not exist, reconnect all and search in all system\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
- L"HDDP",\r
- &mHdBootVariablePrivateGuid,\r
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+ &gHdBootDevicePathVariablGuid,\r
&CachedDevicePathSize\r
);\r
\r
FullDevicePath = AppendDevicePath (Instance, DevicePath);\r
\r
//\r
- // Adjust the 'HDDP' instances sequence if the matched one is not first one.\r
+ // Adjust the HD_BOOT_DEVICE_PATH_VARIABLE_NAME instances sequence if the matched one is not first one.\r
//\r
if (NeedAdjust) {\r
//\r
// Save the matching Device Path so we don't need to do a connect all next time\r
//\r
Status = gRT->SetVariable (\r
- L"HDDP",\r
- &mHdBootVariablePrivateGuid,\r
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+ &gHdBootDevicePathVariablGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (CachedDevicePath),\r
CachedDevicePath\r
}\r
\r
//\r
- // If we get here we fail to find or 'HDDP' not exist, and now we need\r
+ // If we get here we fail to find or HD_BOOT_DEVICE_PATH_VARIABLE_NAME not exist, and now we need\r
// to search all devices in the system for a matched partition\r
//\r
BdsLibConnectAllDriversToAllControllers ();\r
FullDevicePath = AppendDevicePath (BlockIoDevicePath, DevicePath);\r
\r
//\r
- // Save the matched partition device path in 'HDDP' variable\r
+ // Save the matched partition device path in HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable\r
//\r
if (CachedDevicePath != NULL) {\r
//\r
- // Save the matched partition device path as first instance of 'HDDP' variable\r
+ // Save the matched partition device path as first instance of HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable\r
//\r
if (BdsLibMatchDevicePaths (CachedDevicePath, BlockIoDevicePath)) {\r
TempNewDevicePath = CachedDevicePath;\r
}\r
//\r
// Here limit the device path instance number to 12, which is max number for a system support 3 IDE controller\r
- // If the user try to boot many OS in different HDs or partitions, in theory, the 'HDDP' variable maybe become larger and larger.\r
+ // If the user try to boot many OS in different HDs or partitions, in theory, \r
+ // the HD_BOOT_DEVICE_PATH_VARIABLE_NAME variable maybe become larger and larger.\r
//\r
InstanceNum = 0;\r
ASSERT (CachedDevicePath != NULL);\r
// Save the matching Device Path so we don't need to do a connect all next time\r
//\r
Status = gRT->SetVariable (\r
- L"HDDP",\r
- &mHdBootVariablePrivateGuid,\r
+ HD_BOOT_DEVICE_PATH_VARIABLE_NAME,\r
+ &gHdBootDevicePathVariablGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
GetDevicePathSize (CachedDevicePath),\r
CachedDevicePath\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
+ if (!ValidateOption(BootOptionVar, BootOptionSize)) {\r
+ BdsDeleteBootOption (BootOrder[Index], BootOrder, &BootOrderSize);\r
+ FreePool (BootOptionVar);\r
+ Index++;\r
+ continue;\r
+ }\r
+\r
TempPtr = BootOptionVar;\r
TempPtr += sizeof (UINT32) + sizeof (UINT16);\r
TempPtr += StrSize ((CHAR16 *) TempPtr);\r
EFI_DEVICE_PATH_PROTOCOL *OptionDevicePath;\r
UINT8 *TempPtr;\r
CHAR16 *Description;\r
+ BOOLEAN Corrupted;\r
\r
- Status = EFI_SUCCESS;\r
- BootOrder = NULL;\r
- BootOrderSize = 0;\r
+ Status = EFI_SUCCESS;\r
+ BootOrder = NULL;\r
+ Description = NULL;\r
+ OptionDevicePath = NULL;\r
+ BootOrderSize = 0;\r
+ Corrupted = FALSE;\r
\r
//\r
// Check "BootOrder" variable firstly, this variable hold the number of boot options\r
return EFI_OUT_OF_RESOURCES;\r
}\r
\r
- TempPtr = BootOptionVar;\r
- TempPtr += sizeof (UINT32) + sizeof (UINT16);\r
- Description = (CHAR16 *) TempPtr;\r
- TempPtr += StrSize ((CHAR16 *) TempPtr);\r
- OptionDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) TempPtr;\r
+ if (!ValidateOption(BootOptionVar, BootOptionSize)) {\r
+ Corrupted = TRUE;\r
+ } else {\r
+ TempPtr = BootOptionVar;\r
+ TempPtr += sizeof (UINT32) + sizeof (UINT16);\r
+ Description = (CHAR16 *) TempPtr;\r
+ TempPtr += StrSize ((CHAR16 *) TempPtr);\r
+ OptionDevicePath = (EFI_DEVICE_PATH_PROTOCOL *) TempPtr;\r
\r
- //\r
- // Skip legacy boot option (BBS boot device)\r
- //\r
- if ((DevicePathType (OptionDevicePath) == BBS_DEVICE_PATH) &&\r
- (DevicePathSubType (OptionDevicePath) == BBS_BBS_DP)) {\r
- FreePool (BootOptionVar);\r
- Index++;\r
- continue;\r
+ //\r
+ // Skip legacy boot option (BBS boot device)\r
+ //\r
+ if ((DevicePathType (OptionDevicePath) == BBS_DEVICE_PATH) &&\r
+ (DevicePathSubType (OptionDevicePath) == BBS_BBS_DP)) {\r
+ FreePool (BootOptionVar);\r
+ Index++;\r
+ continue;\r
+ }\r
}\r
\r
- if (!BdsLibIsValidEFIBootOptDevicePathExt (OptionDevicePath, FALSE, Description)) {\r
+ if (Corrupted || !BdsLibIsValidEFIBootOptDevicePathExt (OptionDevicePath, FALSE, Description)) {\r
//\r
// Delete this invalid boot option "Boot####"\r
//\r
// Mark this boot option in boot order as deleted\r
//\r
BootOrder[Index] = 0xffff;\r
+ Corrupted = FALSE;\r
}\r
\r
FreePool (BootOptionVar);\r
{\r
EFI_STATUS Status;\r
UINT16 FloppyNumber;\r
+ UINT16 HarddriveNumber;\r
UINT16 CdromNumber;\r
UINT16 UsbNumber;\r
UINT16 MiscNumber;\r
EFI_IMAGE_OPTIONAL_HEADER_UNION HdrData;\r
EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION Hdr;\r
\r
- FloppyNumber = 0;\r
- CdromNumber = 0;\r
- UsbNumber = 0;\r
- MiscNumber = 0;\r
- ScsiNumber = 0;\r
- PlatLang = NULL;\r
- LastLang = NULL;\r
+ FloppyNumber = 0;\r
+ HarddriveNumber = 0;\r
+ CdromNumber = 0;\r
+ UsbNumber = 0;\r
+ MiscNumber = 0;\r
+ ScsiNumber = 0;\r
+ PlatLang = NULL;\r
+ LastLang = NULL;\r
ZeroMem (Buffer, sizeof (Buffer));\r
\r
//\r
// device from the boot order variable\r
//\r
if (mEnumBootDevice) {\r
- LastLang = GetVariable (L"LastEnumLang", &mBdsLibLastLangGuid);\r
+ LastLang = GetVariable (LAST_ENUM_LANGUAGE_VARIABLE_NAME, &gLastEnumLangGuid);\r
PlatLang = GetEfiGlobalVariable (L"PlatformLang");\r
ASSERT (PlatLang != NULL);\r
if ((LastLang != NULL) && (AsciiStrCmp (LastLang, PlatLang) == 0)) {\r
return Status;\r
} else {\r
Status = gRT->SetVariable (\r
- L"LastEnumLang",\r
- &mBdsLibLastLangGuid,\r
+ LAST_ENUM_LANGUAGE_VARIABLE_NAME,\r
+ &gLastEnumLangGuid,\r
EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_NON_VOLATILE,\r
AsciiStrSize (PlatLang),\r
PlatLang\r
break;\r
\r
//\r
- // Assume a removable SATA device should be the DVD/CD device\r
+ // Assume a removable SATA device should be the DVD/CD device, a fixed SATA device should be the Hard Drive device.\r
//\r
case BDS_EFI_MESSAGE_ATAPI_BOOT:\r
case BDS_EFI_MESSAGE_SATA_BOOT:\r
- if (CdromNumber != 0) {\r
- UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)), CdromNumber);\r
+ if (BlkIo->Media->RemovableMedia) {\r
+ if (CdromNumber != 0) {\r
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)), CdromNumber);\r
+ } else {\r
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)));\r
+ }\r
+ CdromNumber++;\r
} else {\r
- UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_CD_DVD)));\r
+ if (HarddriveNumber != 0) {\r
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s %d", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_HARDDRIVE)), HarddriveNumber);\r
+ } else {\r
+ UnicodeSPrint (Buffer, sizeof (Buffer), L"%s", BdsLibGetStringById (STRING_TOKEN (STR_DESCRIPTION_HARDDRIVE)));\r
+ }\r
+ HarddriveNumber++;\r
}\r
DEBUG ((DEBUG_INFO | DEBUG_LOAD, "Buffer: %S\n", Buffer));\r
BdsLibBuildOptionFromHandle (BlockIoHandles[Index], BdsBootOptionList, Buffer);\r
- CdromNumber++;\r
break;\r
\r
case BDS_EFI_MESSAGE_USB_DEVICE_BOOT:\r
)\r
{\r
EFI_STATUS Status;\r
+ EFI_TPL OldTpl;\r
EFI_DEVICE_PATH_PROTOCOL *UpdatedDevicePath;\r
EFI_DEVICE_PATH_PROTOCOL *DupDevicePath;\r
EFI_HANDLE Handle;\r
\r
UpdatedDevicePath = DevicePath;\r
\r
+ //\r
+ // Enter to critical section to protect the acquired BlockIo instance \r
+ // from getting released due to the USB mass storage hotplug event\r
+ //\r
+ OldTpl = gBS->RaiseTPL (TPL_CALLBACK);\r
+\r
//\r
// Check whether the device is connected\r
//\r
// Get BlockIo protocol and check removable attribute\r
//\r
Status = gBS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);\r
+ ASSERT_EFI_ERROR (Status);\r
+\r
//\r
// Issue a dummy read to the device to check for media change.\r
// When the removable media is changed, any Block IO read/write will\r
FreePool(SimpleFileSystemHandles);\r
}\r
\r
+ gBS->RestoreTPL (OldTpl);\r
+\r
return ReturnHandle;\r
}\r
\r
projects / mirror_edk2.git / blobdiff