X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=IntelFrameworkModulePkg%2FUniversal%2FBdsDxe%2FDeviceMngr%2FDeviceManager.c;h=6cb9d6b7ab07de5da771e4f26c430822a03a860e;hp=dfc1b887a7acbca3c346e994f150ce43ba826a90;hb=847240774030f9da79140a9d515a64ec817eb6eb;hpb=20e73140285bd449d0f3f4502f8fce0efd93a66c
diff --git a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
index dfc1b887a7..6cb9d6b7ab 100644
--- a/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
+++ b/IntelFrameworkModulePkg/Universal/BdsDxe/DeviceMngr/DeviceManager.c
@@ -1,7 +1,7 @@
/** @file
The platform device manager reference implementation
-Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.
+Copyright (c) 2004 - 2011, Intel Corporation. All rights reserved.
This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at
@@ -34,9 +34,6 @@ DEVICE_MANAGER_CALLBACK_DATA gDeviceManagerPrivate = {
#define MAX_MAC_ADDRESS_NODE_LIST_LEN 10
-EFI_GUID mDeviceManagerGuid = DEVICE_MANAGER_FORMSET_GUID;
-EFI_GUID mDriverHealthGuid = DRIVER_HEALTH_FORMSET_GUID;
-
//
// Which Mac Address string is select
// it will decide what menu need to show in the NETWORK_DEVICE_FORM_ID form.
@@ -72,10 +69,7 @@ HII_VENDOR_DEVICE_PATH mDeviceManagerHiiVendorDevicePath = {
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {102579A0-3686-466e-ACD8-80C087044F4A}
- //
- { 0x102579a0, 0x3686, 0x466e, { 0xac, 0xd8, 0x80, 0xc0, 0x87, 0x4, 0x4f, 0x4a } }
+ DEVICE_MANAGER_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -97,10 +91,7 @@ HII_VENDOR_DEVICE_PATH mDriverHealthHiiVendorDevicePath = {
(UINT8) ((sizeof (VENDOR_DEVICE_PATH)) >> 8)
}
},
- //
- // {D8F76651-1675-4986-BED4-3824B2F1F4C8}
- //
- { 0xd8f76651, 0x1675, 0x4986, { 0xbe, 0xd4, 0x38, 0x24, 0xb2, 0xf1, 0xf4, 0xc8 } }
+ DRIVER_HEALTH_FORMSET_GUID
},
{
END_DEVICE_PATH_TYPE,
@@ -141,20 +132,19 @@ DeviceManagerCallback (
)
{
UINTN CurIndex;
-
- if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {
+
+ if (Action != EFI_BROWSER_ACTION_CHANGING) {
//
- // Do nothing for UEFI OPEN/CLOSE Action
+ // All other action return unsupported.
//
- return EFI_SUCCESS;
+ return EFI_UNSUPPORTED;
}
- if ((Value == NULL) || (ActionRequest == NULL)) {
+ if (Value == NULL) {
return EFI_INVALID_PARAMETER;
}
gCallbackKey = QuestionId;
-
if ((QuestionId < MAX_KEY_SECTION_LEN + NETWORK_DEVICE_LIST_KEY_OFFSET) && (QuestionId >= NETWORK_DEVICE_LIST_KEY_OFFSET)) {
//
// If user select the mac address, need to record mac address string to support next form show.
@@ -165,11 +155,6 @@ DeviceManagerCallback (
}
}
}
-
- //
- // Request to exit SendForm(), so as to switch to selected form
- //
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
return EFI_SUCCESS;
}
@@ -589,7 +574,6 @@ IsNeedAddNetworkMenu (
EFI_STATUS Status;
UINTN EntryCount;
UINTN Index;
- EFI_HII_HANDLE HiiDeviceManagerHandle;
EFI_HANDLE DriverHandle;
EFI_HANDLE ControllerHandle;
EFI_DEVICE_PATH_PROTOCOL *DevicePath;
@@ -598,7 +582,6 @@ IsNeedAddNetworkMenu (
EFI_OPEN_PROTOCOL_INFORMATION_ENTRY *OpenInfoBuffer;
BOOLEAN IsNeedAdd;
- HiiDeviceManagerHandle = gDeviceManagerPrivate.HiiHandle;
IsNeedAdd = FALSE;
OpenInfoBuffer = NULL;
if ((Handle == NULL) || (ItemCount == NULL)) {
@@ -776,7 +759,7 @@ CallDeviceManager (
// Publish our HII data.
//
HiiHandle = HiiAddPackages (
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
gDeviceManagerPrivate.DriverHandle,
DeviceManagerVfrBin,
BdsDxeStrings,
@@ -883,13 +866,13 @@ CallDeviceManager (
//
if (!AddNetworkMenu) {
AddNetworkMenu = TRUE;
- HiiCreateActionOpCode (
+ HiiCreateGotoOpCode (
StartOpCodeHandle,
- (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID,
+ INVALID_FORM_ID,
STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_TITLE),
STRING_TOKEN (STR_FORM_NETWORK_DEVICE_LIST_HELP),
EFI_IFR_FLAG_CALLBACK,
- 0
+ (EFI_QUESTION_ID) QUESTION_NETWORK_DEVICE_ID
);
}
} else if (mNextShowFormId == NETWORK_DEVICE_LIST_FORM_ID) {
@@ -897,13 +880,13 @@ CallDeviceManager (
// In network device list form, same mac address device only show one menu.
//
while (AddItemCount > 0) {
- HiiCreateActionOpCode (
+ HiiCreateGotoOpCode (
StartOpCodeHandle,
- mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId,
+ INVALID_FORM_ID,
mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].PromptId,
STRING_TOKEN (STR_NETWORK_DEVICE_HELP),
EFI_IFR_FLAG_CALLBACK,
- 0
+ mMacDeviceList.NodeList[mMacDeviceList.CurListLen - AddItemCount].QuestionId
);
AddItemCount -= 1;
}
@@ -911,13 +894,13 @@ CallDeviceManager (
//
// In network device form, only the selected mac address device need to be show.
//
- HiiCreateActionOpCode (
+ HiiCreateGotoOpCode (
StartOpCodeHandle,
- (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),
+ INVALID_FORM_ID,
Token,
TokenHelp,
EFI_IFR_FLAG_CALLBACK,
- 0
+ (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)
);
}
} else {
@@ -926,13 +909,13 @@ CallDeviceManager (
// Not network device process, only need to show at device manger form.
//
if (mNextShowFormId == DEVICE_MANAGER_FORM_ID) {
- HiiCreateActionOpCode (
+ HiiCreateGotoOpCode (
StartOpCodeHandle,
- (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET),
+ INVALID_FORM_ID,
Token,
TokenHelp,
EFI_IFR_FLAG_CALLBACK,
- 0
+ (EFI_QUESTION_ID) (Index + DEVICE_KEY_OFFSET)
);
}
}
@@ -954,14 +937,14 @@ CallDeviceManager (
// If driver health protocol is installed, create Driver Health subtitle and entry
//
HiiCreateSubTitleOpCode (StartOpCodeHandle, STRING_TOKEN (STR_DM_DRIVER_HEALTH_TITLE), 0, 0, 0);
- HiiCreateActionOpCode (
- StartOpCodeHandle, // Container for dynamic created opcodes
- DEVICE_MANAGER_KEY_DRIVER_HEALTH, // Question ID
+ HiiCreateGotoOpCode (
+ StartOpCodeHandle,
+ DRIVER_HEALTH_FORM_ID,
STRING_TOKEN(STR_DRIVER_HEALTH_ALL_HEALTHY), // Prompt text
STRING_TOKEN(STR_DRIVER_HEALTH_STATUS_HELP), // Help text
- EFI_IFR_FLAG_CALLBACK, // Question flag
- 0 // Action String ID
- );
+ EFI_IFR_FLAG_CALLBACK,
+ DEVICE_MANAGER_KEY_DRIVER_HEALTH // Question ID
+ );
//
// Check All Driver health status
@@ -981,7 +964,7 @@ CallDeviceManager (
HiiUpdateForm (
HiiHandle,
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
mNextShowFormId,
StartOpCodeHandle,
EndOpCodeHandle
@@ -992,7 +975,7 @@ CallDeviceManager (
gFormBrowser2,
&HiiHandle,
1,
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
mNextShowFormId,
NULL,
&ActionRequest
@@ -1109,25 +1092,25 @@ DriverHealthCallback (
OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest
)
{
- if ((Action == EFI_BROWSER_ACTION_FORM_OPEN) || (Action == EFI_BROWSER_ACTION_FORM_CLOSE)) {
+ if (Action == EFI_BROWSER_ACTION_CHANGED) {
+ if ((Value == NULL) || (ActionRequest == NULL)) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ gCallbackKey = QuestionId;
+
//
- // Do nothing for UEFI OPEN/CLOSE Action
+ // Request to exit SendForm(), so as to switch to selected form
//
- return EFI_SUCCESS;
- }
+ *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
- if ((Value == NULL) || (ActionRequest == NULL)) {
- return EFI_INVALID_PARAMETER;
+ return EFI_SUCCESS;
}
- gCallbackKey = QuestionId;
-
//
- // Request to exit SendForm(), so as to switch to selected form
+ // All other action return unsupported.
//
- *ActionRequest = EFI_BROWSER_ACTION_REQUEST_EXIT;
-
- return EFI_SUCCESS;
+ return EFI_UNSUPPORTED;
}
/**
@@ -1167,10 +1150,9 @@ CallDriverHealth (
DRIVER_HEALTH_INFO *DriverHealthInfo;
LIST_ENTRY *Link;
EFI_DEVICE_PATH_PROTOCOL *DriverDevicePath;
- UINTN Length;
+ BOOLEAN RebootRequired;
Index = 0;
- Length = 0;
DriverHealthInfo = NULL;
DriverDevicePath = NULL;
InitializeListHead (&DriverHealthList);
@@ -1181,7 +1163,7 @@ CallDriverHealth (
// Publish Driver Health HII data.
//
HiiHandle = HiiAddPackages (
- &mDeviceManagerGuid,
+ &gDeviceManagerFormSetGuid,
gDeviceManagerPrivate.DriverHealthHandle,
DriverHealthVfrBin,
BdsDxeStrings,
@@ -1292,44 +1274,36 @@ CallDriverHealth (
DriverHealthInfo->MessageList->StringId,
NULL
);
- //
- // Assert if can not retrieve the message string
- //
- ASSERT (TmpString != NULL);
- StrnCat (String, TmpString, StrLen (TmpString));
- FreePool (TmpString);
} else {
//
// Update the string will be displayed base on the driver's health status
//
switch(DriverHealthInfo->HealthStatus) {
case EfiDriverHealthStatusRepairRequired:
- Length = StrLen (GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED)));
- StrnCat (String, GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED)), Length);
+ TmpString = GetStringById (STRING_TOKEN (STR_REPAIR_REQUIRED));
break;
case EfiDriverHealthStatusConfigurationRequired:
- Length = StrLen (GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED)));
- StrnCat (String, GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED)), Length);
+ TmpString = GetStringById (STRING_TOKEN (STR_CONFIGURATION_REQUIRED));
break;
case EfiDriverHealthStatusFailed:
- Length = StrLen (GetStringById (STRING_TOKEN (STR_OPERATION_FAILED)));
- StrnCat (String, GetStringById (STRING_TOKEN (STR_OPERATION_FAILED)), Length);
+ TmpString = GetStringById (STRING_TOKEN (STR_OPERATION_FAILED));
break;
case EfiDriverHealthStatusReconnectRequired:
- Length = StrLen (GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED)));
- StrnCat (String, GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED)), Length);
+ TmpString = GetStringById (STRING_TOKEN (STR_RECONNECT_REQUIRED));
break;
case EfiDriverHealthStatusRebootRequired:
- Length = StrLen (GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED)));
- StrnCat (String, GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED)), Length);
+ TmpString = GetStringById (STRING_TOKEN (STR_REBOOT_REQUIRED));
break;
default:
- Length = StrLen (GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY)));
- StrnCat (String, GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY)), Length);
+ TmpString = GetStringById (STRING_TOKEN (STR_DRIVER_HEALTH_HEALTHY));
break;
}
}
+ ASSERT (TmpString != NULL);
+ StrCat (String, TmpString);
+ FreePool (TmpString);
+
Token = HiiSetString (HiiHandle, 0, String, NULL);
FreePool (String);
@@ -1387,7 +1361,7 @@ CallDriverHealth (
Status = HiiUpdateForm (
HiiHandle,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
StartOpCodeHandle,
EndOpCodeHandle
@@ -1397,7 +1371,7 @@ CallDriverHealth (
Status = HiiUpdateForm (
HiiHandle,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
StartOpCodeHandleRepair,
EndOpCodeHandleRepair
@@ -1410,7 +1384,7 @@ CallDriverHealth (
gFormBrowser2,
&HiiHandle,
1,
- &mDriverHealthGuid,
+ &gDriverHealthFormSetGuid,
DRIVER_HEALTH_FORM_ID,
NULL,
&ActionRequest
@@ -1439,15 +1413,20 @@ CallDriverHealth (
//
// Process the driver's healthy status for the specify module
//
+ RebootRequired = FALSE;
ProcessSingleControllerHealth (
DriverHealthInfo->DriverHealth,
DriverHealthInfo->ControllerHandle,
DriverHealthInfo->ChildHandle,
DriverHealthInfo->HealthStatus,
&(DriverHealthInfo->MessageList),
- DriverHealthInfo->HiiHandle
- );
- break;
+ DriverHealthInfo->HiiHandle,
+ &RebootRequired
+ );
+ if (RebootRequired) {
+ gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
+ }
+ break;
}
Index++;
Link = GetNextNode (&DriverHealthList, Link);
@@ -1934,15 +1913,17 @@ PlaformHealthStatusCheck (
ChildHandle. This is an optional parameter that may be NULL.
@param FormHiiHandle The HII handle for an HII form associated with the
controller specified by ControllerHandle and ChildHandle.
+ @param RebootRequired Indicate whether a reboot is required to repair the controller.
**/
VOID
ProcessSingleControllerHealth (
- IN EFI_DRIVER_HEALTH_PROTOCOL *DriverHealth,
- IN EFI_HANDLE ControllerHandle, OPTIONAL
- IN EFI_HANDLE ChildHandle, OPTIONAL
- IN EFI_DRIVER_HEALTH_STATUS HealthStatus,
- IN EFI_DRIVER_HEALTH_HII_MESSAGE **MessageList, OPTIONAL
- IN EFI_HII_HANDLE FormHiiHandle
+ IN EFI_DRIVER_HEALTH_PROTOCOL *DriverHealth,
+ IN EFI_HANDLE ControllerHandle, OPTIONAL
+ IN EFI_HANDLE ChildHandle, OPTIONAL
+ IN EFI_DRIVER_HEALTH_STATUS HealthStatus,
+ IN EFI_DRIVER_HEALTH_HII_MESSAGE **MessageList, OPTIONAL
+ IN EFI_HII_HANDLE FormHiiHandle,
+ IN OUT BOOLEAN *RebootRequired
)
{
EFI_STATUS Status;
@@ -1954,8 +1935,8 @@ ProcessSingleControllerHealth (
// reach a terminal status. The status from EfiDriverHealthStatusRepairRequired after repair
// will be in (Health, Failed, Configuration Required).
//
- while( LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired ||
- LocalHealthStatus == EfiDriverHealthStatusRepairRequired) {
+ while(LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired ||
+ LocalHealthStatus == EfiDriverHealthStatusRepairRequired) {
if (LocalHealthStatus == EfiDriverHealthStatusRepairRequired) {
Status = DriverHealth->Repair (
@@ -1971,16 +1952,23 @@ ProcessSingleControllerHealth (
// (Healthy, Reboot Required, Failed, Reconnect Required, Repair Required).
//
if (LocalHealthStatus == EfiDriverHealthStatusConfigurationRequired) {
- Status = gFormBrowser2->SendForm (
- gFormBrowser2,
- &FormHiiHandle,
- 1,
- &gEfiHiiDriverHealthFormsetGuid,
- 0,
- NULL,
- NULL
- );
- ASSERT( !EFI_ERROR (Status));
+ if (FormHiiHandle != NULL) {
+ Status = gFormBrowser2->SendForm (
+ gFormBrowser2,
+ &FormHiiHandle,
+ 1,
+ &gEfiHiiDriverHealthFormsetGuid,
+ 0,
+ NULL,
+ NULL
+ );
+ ASSERT( !EFI_ERROR (Status));
+ } else {
+ //
+ // Exit the loop in case no FormHiiHandle is supplied to prevent dead-loop
+ //
+ break;
+ }
}
Status = DriverHealth->GetHealthStatus (
@@ -1991,11 +1979,11 @@ ProcessSingleControllerHealth (
NULL,
&FormHiiHandle
);
- ASSERT_EFI_ERROR (Status);
+ ASSERT_EFI_ERROR (Status);
- if (*MessageList != NULL) {
+ if (*MessageList != NULL) {
ProcessMessages (*MessageList);
- }
+ }
}
//
@@ -2010,7 +1998,7 @@ ProcessSingleControllerHealth (
// Check for RebootRequired or ReconnectRequired
//
if (LocalHealthStatus == EfiDriverHealthStatusRebootRequired) {
- gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
+ *RebootRequired = TRUE;
}
//
@@ -2019,12 +2007,13 @@ ProcessSingleControllerHealth (
if (LocalHealthStatus == EfiDriverHealthStatusReconnectRequired) {
Status = gBS->DisconnectController (ControllerHandle, NULL, NULL);
if (EFI_ERROR (Status)) {
- //
- // Disconnect failed. Need to promote reconnect to a reboot.
- //
- gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
+ //
+ // Disconnect failed. Need to promote reconnect to a reboot.
+ //
+ *RebootRequired = TRUE;
+ } else {
+ gBS->ConnectController (ControllerHandle, NULL, NULL, TRUE);
}
- gBS->ConnectController (ControllerHandle, NULL, NULL, TRUE);
}
}
@@ -2117,12 +2106,16 @@ PlatformRepairAll (
{
DRIVER_HEALTH_INFO *DriverHealthInfo;
LIST_ENTRY *Link;
+ BOOLEAN RebootRequired;
ASSERT (DriverHealthList != NULL);
- Link = GetFirstNode (DriverHealthList);
+ RebootRequired = FALSE;
- while (!IsNull (DriverHealthList, Link)) {
+ for ( Link = GetFirstNode (DriverHealthList)
+ ; !IsNull (DriverHealthList, Link)
+ ; Link = GetNextNode (DriverHealthList, Link)
+ ) {
DriverHealthInfo = DEVICE_MANAGER_HEALTH_INFO_FROM_LINK (Link);
//
// Do driver health status operation by each link node
@@ -2130,15 +2123,18 @@ PlatformRepairAll (
ASSERT (DriverHealthInfo != NULL);
ProcessSingleControllerHealth (
- DriverHealthInfo->DriverHealth,
- DriverHealthInfo->ControllerHandle,
- DriverHealthInfo->ChildHandle,
- DriverHealthInfo->HealthStatus,
- &(DriverHealthInfo->MessageList),
- DriverHealthInfo->HiiHandle
- );
+ DriverHealthInfo->DriverHealth,
+ DriverHealthInfo->ControllerHandle,
+ DriverHealthInfo->ChildHandle,
+ DriverHealthInfo->HealthStatus,
+ &(DriverHealthInfo->MessageList),
+ DriverHealthInfo->HiiHandle,
+ &RebootRequired
+ );
+ }
- Link = GetNextNode (DriverHealthList, Link);
+ if (RebootRequired) {
+ gRT->ResetSystem (EfiResetWarm, EFI_SUCCESS, 0, NULL);
}
}